Index: lams_common/conf/language/ApplicationResources.properties =================================================================== RCS file: /usr/local/cvsroot/lams_common/conf/language/Attic/ApplicationResources.properties,v diff -u -r1.16 -r1.17 --- lams_common/conf/language/ApplicationResources.properties 3 Nov 2006 05:15:58 -0000 1.16 +++ lams_common/conf/language/ApplicationResources.properties 2 Dec 2006 08:00:12 -0000 1.17 @@ -35,6 +35,6 @@ error.import.matching.tool.not.found =The activity with signature {0} is skipped because a matching tool cannot be found. error.import.tool.service.fail =Unable to import tool content for tool {0}. Caused by {1}. error.no.valid.tool =No valid tools in this learning design. +import.shareresources.warning=The sequence contains one or more Share Resources activities. Please check these activities as any file or uploaded websites in the activity will be invalid and will cause an error for the learners. Links to external websites should not cause any errors. - #======= End labels: Exported 29 labels for en AU ===== Index: lams_common/src/java/org/lamsfoundation/lams/learningdesign/service/LD102Importer.java =================================================================== RCS file: /usr/local/cvsroot/lams_common/src/java/org/lamsfoundation/lams/learningdesign/service/LD102Importer.java,v diff -u -r1.23 -r1.24 --- lams_common/src/java/org/lamsfoundation/lams/learningdesign/service/LD102Importer.java 29 Nov 2006 06:48:49 -0000 1.23 +++ lams_common/src/java/org/lamsfoundation/lams/learningdesign/service/LD102Importer.java 2 Dec 2006 08:00:01 -0000 1.24 @@ -85,6 +85,7 @@ private static final String MSG_KEY_PERM_GATE = "imported.permission.gate.title"; private static final String MSG_KEY_SYNC_GATE = "imported.synchronise.gate.title"; + private static final String MSG_KEY_SR_WARNING = "import.shareresources.warning"; private static final String MSG_KEY_VALIDATION_ERROR = "error.import.validation"; private Logger log = Logger.getLogger(LD102Importer.class); @@ -106,6 +107,7 @@ private Date createDate = new Date(); private User importer = null; private UserDTO importerDTO = null; // pass the dto to tools, rather than the real user object + private boolean needShareResourcesWarning = false; /** * Store relationship between an activity and its grouping for processing after all the activities have been process. @@ -405,6 +407,9 @@ throw new ImportToolContentException("Invalid packet format - it is not a learning design packet. See log for details."); } + if (needShareResourcesWarning) { + toolsErrorMsgs.add(messageService.getMessage(MSG_KEY_SR_WARNING)); + } return(ldInProgress != null ? ldInProgress.getLearningDesignId() : null); } @@ -1032,6 +1037,9 @@ return null; } + if ( WDDXTAGS102.TOOL_TYPE_URL_CONTENT.equals(toolType) ) { + needShareResourcesWarning = true; + } activity.setTitle( overrideTitle != null ? overrideTitle : toolTitle); activity.setDescription( overrideDescription != null ? overrideDescription : toolDescription); Index: lams_common/src/java/org/lamsfoundation/lams/learningdesign/service/WDDXTAGS102.java =================================================================== RCS file: /usr/local/cvsroot/lams_common/src/java/org/lamsfoundation/lams/learningdesign/service/WDDXTAGS102.java,v diff -u -r1.2 -r1.3 --- lams_common/src/java/org/lamsfoundation/lams/learningdesign/service/WDDXTAGS102.java 17 Sep 2006 06:14:16 -0000 1.2 +++ lams_common/src/java/org/lamsfoundation/lams/learningdesign/service/WDDXTAGS102.java 2 Dec 2006 08:00:01 -0000 1.3 @@ -129,6 +129,7 @@ public static final String CONTENT_URL_RUNTIME_LEARNER_SUBMIT_FILE = "runtimeSubmissionLearnerFile"; public static final String CONTENT_URL_URLS = "urls"; + public static final String TOOL_TYPE_URL_CONTENT = "urlcontent"; public static final String CONTENT_URL_URL_SHOWBUTTONS = "showbuttons"; public static final String CONTENT_URL_URL_VIEW_ORDER = "order"; public static final String CONTENT_URL_URL_TITLE = "title";