Index: lams_build/lib/lams/lams.jar
===================================================================
diff -u -r66c453cb9ccc5964de6f0919b493345e29c37229 -r5232ce9610078d8e7e337f8d6a45c15de63df73d
Binary files differ
Index: lams_common/src/java/org/lamsfoundation/lams/learningdesign/service/ExportToolContentService.java
===================================================================
diff -u -rb75443299a653dcc13db9c7ec5ae28cc80b691c3 -r5232ce9610078d8e7e337f8d6a45c15de63df73d
--- lams_common/src/java/org/lamsfoundation/lams/learningdesign/service/ExportToolContentService.java	(.../ExportToolContentService.java)	(revision b75443299a653dcc13db9c7ec5ae28cc80b691c3)
+++ lams_common/src/java/org/lamsfoundation/lams/learningdesign/service/ExportToolContentService.java	(.../ExportToolContentService.java)	(revision 5232ce9610078d8e7e337f8d6a45c15de63df73d)
@@ -40,6 +40,7 @@
 import java.lang.reflect.InvocationTargetException;
 import java.lang.reflect.Method;
 import java.lang.reflect.Proxy;
+import java.net.URLEncoder;
 import java.util.ArrayList;
 import java.util.Comparator;
 import java.util.Date;
@@ -322,13 +323,11 @@
 	public String exportLearningDesign(Long learningDesignId, List<String> toolsErrorMsgs) throws ExportToolContentException{
 		try {
 			//root temp directory, put target zip file
+			String targetZipFileName = null;
 			String rootDir = FileUtil.createTempDirectory(EXPORT_TOOLCONTNET_FOLDER_SUFFIX);
 			String contentDir = FileUtil.getFullPath(rootDir, "content");
 			FileUtil.createDirectory(contentDir);
 			
-			//zip file name with full path
-			String targetZipFileName = EXPORT_TOOLCONTNET_ZIP_PREFIX + learningDesignId + EXPORT_TOOLCONTNET_ZIP_SUFFIX;
-			
 			//learing design file name with full path
 			String ldFileName = FileUtil.getFullPath(contentDir,LEARNING_DESIGN_FILE_NAME);
 			Writer ldFile = new OutputStreamWriter(new FileOutputStream(ldFileName),"UTF-8"); 
@@ -384,6 +383,9 @@
 				throw new ExportToolContentException(e);
 			}
 			
+			// zip file name with full path
+			targetZipFileName = URLEncoder.encode(ldDto.getTitle() + EXPORT_TOOLCONTNET_ZIP_SUFFIX, "UTF-8");
+			
 			log.debug("Create export content target zip file. File name is " + targetZipFileName);
 			//create zip file and return zip full file name
 			return ZipFileUtil.createZipFile(targetZipFileName, contentDir,rootDir);