Property changes on: .
___________________________________________________________________
Name: svn:ignore
   + .project


Index: scorm-impl/service/src/java/org/sakaiproject/scorm/service/impl/AbstractResourceService.java
===================================================================
--- scorm-impl/service/src/java/org/sakaiproject/scorm/service/impl/AbstractResourceService.java	(revision 51602)
+++ scorm-impl/service/src/java/org/sakaiproject/scorm/service/impl/AbstractResourceService.java	(working copy)
@@ -37,10 +37,12 @@
 	protected String getMimeType(String name) {
 		String mimeType = new MimetypesFileTypeMap().getContentType(name);
 		
-		if (name.endsWith(".css"))
+		if (name.endsWith(".css;charset=UTF-8"))
 			mimeType = "text/css";
 		else if (name.endsWith(".swf"))
 			mimeType = "application/x-Shockwave-Flash";
+		else if (name.endsWith(".js"))
+			mimeType = "text/javascript;charset=UTF-8";
 		
 		return mimeType;
 	}
Index: scorm-impl/service/src/java/org/sakaiproject/scorm/service/sakai/impl/SakaiResourceService.java
===================================================================
--- scorm-impl/service/src/java/org/sakaiproject/scorm/service/sakai/impl/SakaiResourceService.java	(revision 51602)
+++ scorm-impl/service/src/java/org/sakaiproject/scorm/service/sakai/impl/SakaiResourceService.java	(working copy)
@@ -2,6 +2,7 @@
 
 import java.io.ByteArrayOutputStream;
 import java.io.InputStream;
+import java.io.OutputStreamWriter;
 import java.util.LinkedList;
 import java.util.List;
 import java.util.UUID;
@@ -368,7 +369,14 @@
 			
 			outStream.close();
 			
-			resource.setContent(outStream.toByteArray());
+			//convert resource content to UTF-8 charset
+			String resourceContent = new String(outStream.toByteArray());
+			ByteArrayOutputStream encodedStream = new ByteArrayOutputStream();
+			OutputStreamWriter ow = new OutputStreamWriter(encodedStream, "UTF-8");
+			ow.write(resourceContent);
+			ow.close();
+			
+			resource.setContent(encodedStream.toByteArray());
 			resource.setContentType(getMimeType(entry.getName()));
 			resource.setHidden();
 						
@@ -374,6 +382,7 @@
 						
 			ResourcePropertiesEdit props = resource.getPropertiesEdit();
 			props.addProperty(ResourceProperties.PROP_DISPLAY_NAME, getDisplayName(entry.getName()));
+			props.addProperty(ResourceProperties.PROP_CONTENT_ENCODING, "UTF-8");
 			
 			contentService().commitResource(resource);
 			
Index: scorm-tool/src/java/org/sakaiproject/scorm/ui/player/components/res/scorm-sjax.js
===================================================================
--- scorm-tool/src/java/org/sakaiproject/scorm/ui/player/components/res/scorm-sjax.js	(revision 51602)
+++ scorm-tool/src/java/org/sakaiproject/scorm/ui/player/components/res/scorm-sjax.js	(working copy)
@@ -183,7 +183,7 @@
 		}  
 	}
 	
-	transport.abort;
+	transport.abort();
 		
 	return resultValue;
 };