Index: lams_common/src/java/org/lamsfoundation/lams/util/WebUtil.java
===================================================================
RCS file: /usr/local/cvsroot/lams_common/src/java/org/lamsfoundation/lams/util/WebUtil.java,v
diff -u -r1.17 -r1.18
--- lams_common/src/java/org/lamsfoundation/lams/util/WebUtil.java	4 Oct 2006 08:13:01 -0000	1.17
+++ lams_common/src/java/org/lamsfoundation/lams/util/WebUtil.java	4 Oct 2006 08:56:34 -0000	1.18
@@ -443,5 +443,12 @@
     }
     
 
+    /** Convert any newslines in a string to <BR/>. If input = null, returns null. */
+    public static String convertNewlines(String input) {
+    	if ( input != null )
+    		return input.replaceAll("[\n\r\f]", "<BR/>");
+    	else
+    		return null;
+    }
 
 }
\ No newline at end of file
Index: lams_tool_chat/src/java/org/lamsfoundation/lams/tool/chat/service/ChatService.java
===================================================================
RCS file: /usr/local/cvsroot/lams_tool_chat/src/java/org/lamsfoundation/lams/tool/chat/service/ChatService.java,v
diff -u -r1.34 -r1.35
--- lams_tool_chat/src/java/org/lamsfoundation/lams/tool/chat/service/ChatService.java	4 Oct 2006 00:15:41 -0000	1.34
+++ lams_tool_chat/src/java/org/lamsfoundation/lams/tool/chat/service/ChatService.java	4 Oct 2006 08:56:16 -0000	1.35
@@ -94,6 +94,7 @@
 import org.lamsfoundation.lams.usermanagement.dto.UserDTO;
 import org.lamsfoundation.lams.util.Configuration;
 import org.lamsfoundation.lams.util.ConfigurationKeys;
+import org.lamsfoundation.lams.util.WebUtil;
 import org.lamsfoundation.lams.util.audit.IAuditService;
 import org.lamsfoundation.lams.util.wddx.WDDXProcessor;
 import org.lamsfoundation.lams.util.wddx.WDDXProcessorConversionException;
@@ -1105,7 +1106,7 @@
     	chat.setDefineLater(Boolean.FALSE);
     	chat.setFilterKeywords(null);
     	chat.setFilteringEnabled(Boolean.FALSE);
-    	chat.setInstructions((String)importValues.get(ToolContentImport102Manager.CONTENT_BODY));
+    	chat.setInstructions(WebUtil.convertNewlines((String)importValues.get(ToolContentImport102Manager.CONTENT_BODY)));
     	chat.setLockOnFinished(Boolean.FALSE);
     	chat.setOfflineInstructions(null);
     	chat.setOnlineInstructions(null);
Index: lams_tool_forum/src/java/org/lamsfoundation/lams/tool/forum/service/ForumService.java
===================================================================
RCS file: /usr/local/cvsroot/lams_tool_forum/src/java/org/lamsfoundation/lams/tool/forum/service/ForumService.java,v
diff -u -r1.77 -r1.78
--- lams_tool_forum/src/java/org/lamsfoundation/lams/tool/forum/service/ForumService.java	4 Oct 2006 03:05:18 -0000	1.77
+++ lams_tool_forum/src/java/org/lamsfoundation/lams/tool/forum/service/ForumService.java	4 Oct 2006 08:56:05 -0000	1.78
@@ -94,6 +94,7 @@
 import org.lamsfoundation.lams.usermanagement.dto.UserDTO;
 import org.lamsfoundation.lams.usermanagement.service.IUserManagementService;
 import org.lamsfoundation.lams.util.MessageService;
+import org.lamsfoundation.lams.util.WebUtil;
 import org.lamsfoundation.lams.util.audit.IAuditService;
 import org.lamsfoundation.lams.util.wddx.WDDXProcessor;
 import org.lamsfoundation.lams.util.wddx.WDDXProcessorConversionException;
@@ -852,8 +853,8 @@
 	    	toolContentObj.setContentId(toolContentId);
 	    	toolContentObj.setContentInUse(Boolean.FALSE);
 	    	toolContentObj.setCreated(now);
-	    	toolContentObj.setDefineLater(Boolean.FALSE);
-	    	toolContentObj.setInstructions((String)importValues.get(ToolContentImport102Manager.CONTENT_BODY));
+	    	toolContentObj.setDefineLater(Boolean.FALSE);		    	
+	    	toolContentObj.setInstructions(WebUtil.convertNewlines((String)importValues.get(ToolContentImport102Manager.CONTENT_BODY)));
 	    	toolContentObj.setLimitedChar(5000); // this is the default value
    	    	toolContentObj.setReflectOnActivity(Boolean.FALSE);
 	    	toolContentObj.setReflectInstructions(null);
@@ -922,7 +923,7 @@
 	    			message.setUpdated(msgDate);
 	    			message.setLastReplyDate(msgDate);
 	    			message.setSubject((String)messageMap.get(ToolContentImport102Manager.CONTENT_TITLE));
-	    			message.setBody((String)messageMap.get(ToolContentImport102Manager.CONTENT_MB_TOPIC_MESSAGE));
+	    			message.setBody(WebUtil.convertNewlines((String)messageMap.get(ToolContentImport102Manager.CONTENT_MB_TOPIC_MESSAGE)));
 	    			// ignore the old subject field - it wasn't updated by the old interface.
 	    			message.setHideFlag(Boolean.FALSE);
 	    			message.setIsAnonymous(Boolean.FALSE);
Index: lams_tool_lamc/src/java/org/lamsfoundation/lams/tool/mc/service/McServicePOJO.java
===================================================================
RCS file: /usr/local/cvsroot/lams_tool_lamc/src/java/org/lamsfoundation/lams/tool/mc/service/McServicePOJO.java,v
diff -u -r1.81 -r1.82
--- lams_tool_lamc/src/java/org/lamsfoundation/lams/tool/mc/service/McServicePOJO.java	4 Oct 2006 03:04:52 -0000	1.81
+++ lams_tool_lamc/src/java/org/lamsfoundation/lams/tool/mc/service/McServicePOJO.java	4 Oct 2006 08:55:51 -0000	1.82
@@ -82,6 +82,7 @@
 import org.lamsfoundation.lams.usermanagement.User;
 import org.lamsfoundation.lams.usermanagement.dto.UserDTO;
 import org.lamsfoundation.lams.usermanagement.service.IUserManagementService;
+import org.lamsfoundation.lams.util.WebUtil;
 import org.lamsfoundation.lams.util.audit.IAuditService;
 import org.lamsfoundation.lams.util.wddx.WDDXProcessor;
 import org.lamsfoundation.lams.util.wddx.WDDXProcessorConversionException;
@@ -2509,7 +2510,7 @@
     	toolContentObj.setCreatedBy(user.getUserID().longValue());
     	toolContentObj.setCreationDate(now);
     	toolContentObj.setDefineLater(Boolean.FALSE.booleanValue());
-    	toolContentObj.setInstructions((String)importValues.get(ToolContentImport102Manager.CONTENT_BODY));
+    	toolContentObj.setInstructions(WebUtil.convertNewlines((String)importValues.get(ToolContentImport102Manager.CONTENT_BODY)));
     	toolContentObj.setOfflineInstructions(null);
     	toolContentObj.setOnlineInstructions(null);
  	    toolContentObj.setReflect(Boolean.FALSE);
@@ -2567,7 +2568,7 @@
 		question.setDisplayOrder( WDDXProcessor.convertToInteger(questionMap, ToolContentImport102Manager.CONTENT_Q_ORDER) );
 		
 		question.setFeedback((String)questionMap.get(CONTENT_Q_FEEDBACK));
-		question.setQuestion((String)questionMap.get(CONTENT_Q_QUESTION));
+		question.setQuestion(WebUtil.convertNewlines((String)questionMap.get(CONTENT_Q_QUESTION)));
 		
 		// In 1.0.2 all questions are implicitly assumed to be 1 and be of equal weight
 		// I think the weights are actually ignored, so just set to 0 (FM) 
Index: lams_tool_laqa/src/java/org/lamsfoundation/lams/tool/qa/service/QaServicePOJO.java
===================================================================
RCS file: /usr/local/cvsroot/lams_tool_laqa/src/java/org/lamsfoundation/lams/tool/qa/service/QaServicePOJO.java,v
diff -u -r1.69 -r1.70
--- lams_tool_laqa/src/java/org/lamsfoundation/lams/tool/qa/service/QaServicePOJO.java	3 Oct 2006 06:57:14 -0000	1.69
+++ lams_tool_laqa/src/java/org/lamsfoundation/lams/tool/qa/service/QaServicePOJO.java	4 Oct 2006 08:54:58 -0000	1.70
@@ -78,6 +78,7 @@
 import org.lamsfoundation.lams.usermanagement.User;
 import org.lamsfoundation.lams.usermanagement.dto.UserDTO;
 import org.lamsfoundation.lams.usermanagement.service.IUserManagementService;
+import org.lamsfoundation.lams.util.WebUtil;
 import org.lamsfoundation.lams.util.audit.IAuditService;
 import org.lamsfoundation.lams.util.wddx.WDDXProcessor;
 import org.lamsfoundation.lams.util.wddx.WDDXProcessorConversionException;
@@ -2123,7 +2124,8 @@
     	
     	// set up question from body 	
     	QaQueContent question = new QaQueContent();
-    	question.setQuestion((String)importValues.get(ToolContentImport102Manager.CONTENT_BODY));
+    	String content = WebUtil.convertNewlines((String)importValues.get(ToolContentImport102Manager.CONTENT_BODY));
+    	question.setQuestion(content);
     	question.setDisplayOrder(1);
     	question.setQaContent(toolContentObj);
     	toolContentObj.getQaQueContents().add(question);
Index: lams_tool_larsrc/src/java/org/lamsfoundation/lams/tool/rsrc/service/ResourceServiceImpl.java
===================================================================
RCS file: /usr/local/cvsroot/lams_tool_larsrc/src/java/org/lamsfoundation/lams/tool/rsrc/service/ResourceServiceImpl.java,v
diff -u -r1.48 -r1.49
--- lams_tool_larsrc/src/java/org/lamsfoundation/lams/tool/rsrc/service/ResourceServiceImpl.java	3 Oct 2006 06:57:39 -0000	1.48
+++ lams_tool_larsrc/src/java/org/lamsfoundation/lams/tool/rsrc/service/ResourceServiceImpl.java	4 Oct 2006 08:54:40 -0000	1.49
@@ -98,6 +98,7 @@
 import org.lamsfoundation.lams.usermanagement.dto.UserDTO;
 import org.lamsfoundation.lams.usermanagement.service.IUserManagementService;
 import org.lamsfoundation.lams.util.MessageService;
+import org.lamsfoundation.lams.util.WebUtil;
 import org.lamsfoundation.lams.util.audit.IAuditService;
 import org.lamsfoundation.lams.util.wddx.WDDXProcessor;
 import org.lamsfoundation.lams.util.wddx.WDDXProcessorConversionException;
@@ -1010,7 +1011,7 @@
 	    	toolContentObj.setContentInUse(Boolean.FALSE);
 	    	toolContentObj.setCreated(now);
 	    	toolContentObj.setDefineLater(Boolean.FALSE);
-	    	toolContentObj.setInstructions((String)importValues.get(ToolContentImport102Manager.CONTENT_BODY));
+	    	toolContentObj.setInstructions(WebUtil.convertNewlines((String)importValues.get(ToolContentImport102Manager.CONTENT_BODY)));
 	    	toolContentObj.setOfflineInstructions(null);
 	    	toolContentObj.setOnlineInstructions(null);
 	    	toolContentObj.setRunOffline(Boolean.FALSE);
Index: lams_tool_nb/src/java/org/lamsfoundation/lams/tool/noticeboard/service/NoticeboardServicePOJO.java
===================================================================
RCS file: /usr/local/cvsroot/lams_tool_nb/src/java/org/lamsfoundation/lams/tool/noticeboard/service/NoticeboardServicePOJO.java,v
diff -u -r1.36 -r1.37
--- lams_tool_nb/src/java/org/lamsfoundation/lams/tool/noticeboard/service/NoticeboardServicePOJO.java	3 Oct 2006 06:59:02 -0000	1.36
+++ lams_tool_nb/src/java/org/lamsfoundation/lams/tool/noticeboard/service/NoticeboardServicePOJO.java	4 Oct 2006 08:53:50 -0000	1.37
@@ -40,15 +40,15 @@
 import org.lamsfoundation.lams.learningdesign.service.ExportToolContentException;
 import org.lamsfoundation.lams.learningdesign.service.IExportToolContentService;
 import org.lamsfoundation.lams.learningdesign.service.ImportToolContentException;
+import org.lamsfoundation.lams.notebook.model.NotebookEntry;
+import org.lamsfoundation.lams.notebook.service.ICoreNotebookService;
 import org.lamsfoundation.lams.tool.ToolContentImport102Manager;
 import org.lamsfoundation.lams.tool.ToolContentManager;
 import org.lamsfoundation.lams.tool.ToolSessionExportOutputData;
 import org.lamsfoundation.lams.tool.ToolSessionManager;
 import org.lamsfoundation.lams.tool.exception.DataMissingException;
 import org.lamsfoundation.lams.tool.exception.SessionDataExistsException;
 import org.lamsfoundation.lams.tool.exception.ToolException;
-import org.lamsfoundation.lams.notebook.model.NotebookEntry;
-import org.lamsfoundation.lams.notebook.service.ICoreNotebookService;
 import org.lamsfoundation.lams.tool.noticeboard.NbApplicationException;
 import org.lamsfoundation.lams.tool.noticeboard.NoticeboardAttachment;
 import org.lamsfoundation.lams.tool.noticeboard.NoticeboardConstants;
@@ -61,6 +61,7 @@
 import org.lamsfoundation.lams.tool.noticeboard.dao.INoticeboardUserDAO;
 import org.lamsfoundation.lams.tool.service.ILamsToolService;
 import org.lamsfoundation.lams.usermanagement.dto.UserDTO;
+import org.lamsfoundation.lams.util.WebUtil;
 import org.springframework.dao.DataAccessException;
 
 
@@ -1058,7 +1059,8 @@
     {
     	Date now = new Date();
     	NoticeboardContent toolContentObj = new NoticeboardContent();
-    	toolContentObj.setContent((String)importValues.get(ToolContentImport102Manager.CONTENT_BODY));
+    	String content = WebUtil.convertNewlines((String)importValues.get(ToolContentImport102Manager.CONTENT_BODY));
+    	toolContentObj.setContent(content);
     	toolContentObj.setContentInUse(false);
     	toolContentObj.setCreatorUserId(user.getUserID().longValue());
     	toolContentObj.setDateCreated(now);
Index: lams_tool_notebook/src/java/org/lamsfoundation/lams/tool/notebook/service/NotebookService.java
===================================================================
RCS file: /usr/local/cvsroot/lams_tool_notebook/src/java/org/lamsfoundation/lams/tool/notebook/service/NotebookService.java,v
diff -u -r1.8 -r1.9
--- lams_tool_notebook/src/java/org/lamsfoundation/lams/tool/notebook/service/NotebookService.java	3 Oct 2006 06:59:39 -0000	1.8
+++ lams_tool_notebook/src/java/org/lamsfoundation/lams/tool/notebook/service/NotebookService.java	4 Oct 2006 08:53:36 -0000	1.9
@@ -72,6 +72,7 @@
 import org.lamsfoundation.lams.tool.notebook.util.NotebookToolContentHandler;
 import org.lamsfoundation.lams.tool.service.ILamsToolService;
 import org.lamsfoundation.lams.usermanagement.dto.UserDTO;
+import org.lamsfoundation.lams.util.WebUtil;
 import org.lamsfoundation.lams.util.audit.IAuditService;
 
 /**
@@ -510,7 +511,7 @@
     	notebook.setCreateBy(new Long(user.getUserID().longValue()));
     	notebook.setCreateDate(now);
     	notebook.setDefineLater(Boolean.FALSE);
-    	notebook.setInstructions((String)importValues.get(ToolContentImport102Manager.CONTENT_BODY));
+    	notebook.setInstructions(WebUtil.convertNewlines((String)importValues.get(ToolContentImport102Manager.CONTENT_BODY)));
     	notebook.setLockOnFinished(Boolean.TRUE);
     	notebook.setOfflineInstructions(null);
     	notebook.setOnlineInstructions(null);
Index: lams_tool_sbmt/src/java/org/lamsfoundation/lams/tool/sbmt/service/SubmitFilesService.java
===================================================================
RCS file: /usr/local/cvsroot/lams_tool_sbmt/src/java/org/lamsfoundation/lams/tool/sbmt/service/SubmitFilesService.java,v
diff -u -r1.66 -r1.67
--- lams_tool_sbmt/src/java/org/lamsfoundation/lams/tool/sbmt/service/SubmitFilesService.java	3 Oct 2006 06:59:52 -0000	1.66
+++ lams_tool_sbmt/src/java/org/lamsfoundation/lams/tool/sbmt/service/SubmitFilesService.java	4 Oct 2006 08:53:20 -0000	1.67
@@ -91,6 +91,7 @@
 import org.lamsfoundation.lams.usermanagement.dto.UserDTO;
 import org.lamsfoundation.lams.usermanagement.service.IUserManagementService;
 import org.lamsfoundation.lams.usermanagement.util.LastNameAlphabeticComparator;
+import org.lamsfoundation.lams.util.WebUtil;
 import org.springframework.dao.DataAccessException;
 
 /**
@@ -791,7 +792,7 @@
     	toolContentObj.setContentInUse(Boolean.FALSE);
     	toolContentObj.setCreated(now);
     	toolContentObj.setDefineLater(Boolean.FALSE);
-    	toolContentObj.setInstruction((String)importValues.get(ToolContentImport102Manager.CONTENT_BODY));
+    	toolContentObj.setInstruction(WebUtil.convertNewlines((String)importValues.get(ToolContentImport102Manager.CONTENT_BODY)));
     	toolContentObj.setOfflineInstruction(null);
     	toolContentObj.setOnlineInstruction(null);
     	toolContentObj.setRunOffline(Boolean.FALSE);
Index: lams_tool_scribe/src/java/org/lamsfoundation/lams/tool/scribe/service/ScribeService.java
===================================================================
RCS file: /usr/local/cvsroot/lams_tool_scribe/src/java/org/lamsfoundation/lams/tool/scribe/service/ScribeService.java,v
diff -u -r1.7 -r1.8
--- lams_tool_scribe/src/java/org/lamsfoundation/lams/tool/scribe/service/ScribeService.java	4 Oct 2006 06:06:30 -0000	1.7
+++ lams_tool_scribe/src/java/org/lamsfoundation/lams/tool/scribe/service/ScribeService.java	4 Oct 2006 08:52:54 -0000	1.8
@@ -76,6 +76,7 @@
 import org.lamsfoundation.lams.tool.scribe.util.ScribeToolContentHandler;
 import org.lamsfoundation.lams.tool.service.ILamsToolService;
 import org.lamsfoundation.lams.usermanagement.dto.UserDTO;
+import org.lamsfoundation.lams.util.WebUtil;
 import org.lamsfoundation.lams.util.audit.IAuditService;
 import org.lamsfoundation.lams.util.wddx.WDDXProcessor;
 import org.lamsfoundation.lams.util.wddx.WDDXProcessorConversionException;
@@ -624,7 +625,7 @@
     		for (int i=0; i < headings.length ; i++) {
     			ScribeHeading sHeading = new ScribeHeading();
     			sHeading.setDisplayOrder(i);
-    			sHeading.setHeadingText(headings[i]);
+    			sHeading.setHeadingText(WebUtil.convertNewlines(headings[i]));
     			sHeading.setScribe(scribe);
 				set.add(sHeading);
     		}
Index: lams_tool_vote/src/java/org/lamsfoundation/lams/tool/vote/service/VoteServicePOJO.java
===================================================================
RCS file: /usr/local/cvsroot/lams_tool_vote/src/java/org/lamsfoundation/lams/tool/vote/service/VoteServicePOJO.java,v
diff -u -r1.50 -r1.51
--- lams_tool_vote/src/java/org/lamsfoundation/lams/tool/vote/service/VoteServicePOJO.java	4 Oct 2006 00:12:49 -0000	1.50
+++ lams_tool_vote/src/java/org/lamsfoundation/lams/tool/vote/service/VoteServicePOJO.java	4 Oct 2006 08:51:52 -0000	1.51
@@ -82,6 +82,7 @@
 import org.lamsfoundation.lams.usermanagement.User;
 import org.lamsfoundation.lams.usermanagement.dto.UserDTO;
 import org.lamsfoundation.lams.usermanagement.service.IUserManagementService;
+import org.lamsfoundation.lams.util.WebUtil;
 import org.lamsfoundation.lams.util.audit.IAuditService;
 import org.lamsfoundation.lams.util.wddx.WDDXProcessor;
 import org.lamsfoundation.lams.util.wddx.WDDXProcessorConversionException;
@@ -2205,7 +2206,7 @@
     	toolContentObj.setCreatedBy(user.getUserID().longValue());
     	toolContentObj.setCreationDate(now);
     	toolContentObj.setDefineLater(Boolean.FALSE);
-    	toolContentObj.setInstructions((String)importValues.get(ToolContentImport102Manager.CONTENT_BODY));
+    	toolContentObj.setInstructions(WebUtil.convertNewlines((String)importValues.get(ToolContentImport102Manager.CONTENT_BODY)));
     	toolContentObj.setOfflineInstructions(null);
     	toolContentObj.setOnlineInstructions(null);
     	toolContentObj.setReflectionSubject(null);