Index: lams_common/conf/language/lams/ApplicationResources.properties
===================================================================
RCS file: /usr/local/cvsroot/lams_common/conf/language/lams/ApplicationResources.properties,v
diff -u -r1.12 -r1.13
--- lams_common/conf/language/lams/ApplicationResources.properties	11 Apr 2008 01:12:37 -0000	1.12
+++ lams_common/conf/language/lams/ApplicationResources.properties	28 Apr 2008 06:51:42 -0000	1.13
@@ -6,7 +6,7 @@
  
 #=================== labels for LAMS Common =================# 
 
-msg.import.file.format  =The import file must be a .zip file exported from LAMS 2 or above, or a .las file exported from LAMS 1.0.2.
+msg.import.file.format  =The import file must be a LAMS format .zip file exported from LAMS 2 or above, or a .las file exported from LAMS 1.0.2. You cannot import a design exported using the IMS Learning Design format.
 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.
 validation.error.outputTransitionType1  =This activity has no output transition
 error.import.matching.tool.not.found  =The activity with signature {0} is skipped because a matching tool cannot be found.
Index: lams_common/conf/language/lams/ApplicationResources_en_AU.properties
===================================================================
RCS file: /usr/local/cvsroot/lams_common/conf/language/lams/ApplicationResources_en_AU.properties,v
diff -u -r1.12 -r1.13
--- lams_common/conf/language/lams/ApplicationResources_en_AU.properties	11 Apr 2008 01:12:37 -0000	1.12
+++ lams_common/conf/language/lams/ApplicationResources_en_AU.properties	28 Apr 2008 06:51:42 -0000	1.13
@@ -6,7 +6,7 @@
  
 #=================== labels for LAMS Common =================# 
 
-msg.import.file.format  =The import file must be a .zip file exported from LAMS 2 or above, or a .las file exported from LAMS 1.0.2.
+msg.import.file.format  =The import file must be a LAMS format .zip file exported from LAMS 2 or above, or a .las file exported from LAMS 1.0.2. You cannot import a design exported using the IMS Learning Design format.
 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.
 validation.error.outputTransitionType1  =This activity has no output transition
 error.import.matching.tool.not.found  =The activity with signature {0} is skipped because a matching tool cannot be found.
Index: lams_common/src/java/org/lamsfoundation/lams/learningdesign/service/ExportToolContentService.java
===================================================================
RCS file: /usr/local/cvsroot/lams_common/src/java/org/lamsfoundation/lams/learningdesign/service/ExportToolContentService.java,v
diff -u -r1.81 -r1.82
--- lams_common/src/java/org/lamsfoundation/lams/learningdesign/service/ExportToolContentService.java	17 Apr 2008 05:06:34 -0000	1.81
+++ lams_common/src/java/org/lamsfoundation/lams/learningdesign/service/ExportToolContentService.java	28 Apr 2008 06:51:17 -0000	1.82
@@ -924,7 +924,12 @@
 	            // String ldPath = ZipFileUtil.expandZip(file.getInputStream(),filename);
             	String ldPath = ZipFileUtil.expandZip(new FileInputStream(designFile) ,filename);
 	            
-	            ldId = importLearningDesignV2(ldPath,importer,workspaceFolderUid,toolsErrorMsgs);
+    			File fullFilePath = new File(FileUtil.getFullPath(ldPath,LEARNING_DESIGN_FILE_NAME));
+    			if ( fullFilePath.canRead() ) {
+    				ldId = importLearningDesignV2(ldPath,importer,workspaceFolderUid,toolsErrorMsgs);
+    			} else { 
+                	badFileType(ldErrorMsgs, filename,"Learning design file not found.");
+    			}
             } else {
             	badFileType(ldErrorMsgs, filename,"Unexpected extension");
             }