Index: lams_contentrepository/src/java/org/lamsfoundation/lams/contentrepository/service/SimpleRepository.java
===================================================================
diff -u -rc2832a80af353cc0d1dfcbec1683e009c23f3a1a -r02736c0c2d48d544c38aeecb76d71992fecffad7
--- lams_contentrepository/src/java/org/lamsfoundation/lams/contentrepository/service/SimpleRepository.java	(.../SimpleRepository.java)	(revision c2832a80af353cc0d1dfcbec1683e009c23f3a1a)
+++ lams_contentrepository/src/java/org/lamsfoundation/lams/contentrepository/service/SimpleRepository.java	(.../SimpleRepository.java)	(revision 02736c0c2d48d544c38aeecb76d71992fecffad7)
@@ -635,7 +635,7 @@
 	 		    	String tempRoot = FileUtil.createTempDirectory("export_package");
 	 		    	for(IVersionedNode child:children){
 	 		    		String path = child.getPath();
-	 		    		String fullname= tempRoot + File.separator + path;
+	 		    		String fullname= FileUtil.getFullPath(tempRoot,path);
 	 		    		
 	 		    		//if folder does not exist, create first.
 	 		    		FileUtil.createDirectory(FileUtil.getFileDirectory(fullname));
@@ -646,7 +646,7 @@
 	 					IValue prop = node.getProperty(PropertyName.FILENAME);
 	 					toFileName = prop != null ? prop.getString() : null;
 	 					FileUtil.createDirectory(FileUtil.TEMP_DIR);
-	 					toFileName =  FileUtil.TEMP_DIR + File.separator + toFileName; 
+	 					toFileName =  FileUtil.getFullPath(FileUtil.TEMP_DIR,toFileName); 
 	 				}
 	 		    	ZipFileUtil.createZipFile(FileUtil.getFileName(toFileName),tempRoot,FileUtil.getFileDirectory(toFileName));
 	 		    }
@@ -681,7 +681,7 @@
 			IValue prop = node.getProperty(PropertyName.FILENAME);
 			toFileName = prop != null ? prop.getString() : null;
 			FileUtil.createDirectory(FileUtil.TEMP_DIR);
-			toFileName =  FileUtil.TEMP_DIR + File.separator + toFileName; 
+			toFileName =  FileUtil.getFullPath(FileUtil.TEMP_DIR,toFileName); 
 		}
 		OutputStream os = new FileOutputStream(toFileName);
 		byte[] out  = new byte[8 * 1024];