Index: lams_admin/conf/language/ApplicationResources.properties
===================================================================
RCS file: /usr/local/cvsroot/lams_admin/conf/language/Attic/ApplicationResources.properties,v
diff -u
--- /dev/null	1 Jan 1970 00:00:00 -0000
+++ lams_admin/conf/language/ApplicationResources.properties	10 Apr 2006 11:03:44 -0000	1.1
@@ -0,0 +1,29 @@
+# CVS ID: $Id$
+# Language strings for the Admin classes and screens.
+
+#=========================List jobs in Quartz===========================#
+title.job.list = Jobs
+lable.job.name= Job name
+lable.job.start.date=Job start date
+lable.job.description=Job description
+
+#=========================Error Messages===========================#
+error.authorisation=You are not authorised to do this. 
+error.newpassword.mismatch=Your new passwords don't match each other.
+error.oldpassword.mismatch=Your old password is not correct.
+
+#===================== Main Sysadmin Screen ======================#
+sysadmin.manage.config.file=Manage Configuration File
+sysadmin.batch.heading=Batch Tasks
+sysadmin.batch.description=These need to be converted to batch jobs, able to be run from cron.
+sysadmin.batch.temp.file.delete=Delete old temporary files
+sysadmin.batch.preview.delete=Delete old Preview lessons
+
+#===================== Cache Screen ==============================#
+cache.title=Cache Management
+cache.entries.title=Cache Nodes
+cache.explanation1=Listed below are the current nodes in the cache. This keeps certain common objects in memory to speed up LAMS. It is managed automatically and should not require any intervention. However, if the system appears to be keeping "old values" e.g. an old first name, try clearing all the nodes in the cache. Once cleared, LAMS will reload the objects from the database. 
+cache.explanation2=Warning: Removing nodes will reduce the performance of the LAMS server. After a while, the cache will build up again and LAMS will run as usual.   
+cache.explanation3=Warning: If you remove a node, you will remove the node and all its child nodes. 
+cache.button.remove=Remove
+
Fisheye: Tag 1.2 refers to a dead (removed) revision in file `lams_admin/conf/language/applicationResources.properties'.
Fisheye: No comparison available.  Pass `N' to diff?
Index: lams_admin/conf/xdoclet/struts-message-resources.xml
===================================================================
RCS file: /usr/local/cvsroot/lams_admin/conf/xdoclet/struts-message-resources.xml,v
diff -u -r1.2 -r1.3
--- lams_admin/conf/xdoclet/struts-message-resources.xml	4 Nov 2005 06:04:35 -0000	1.2
+++ lams_admin/conf/xdoclet/struts-message-resources.xml	10 Apr 2006 11:03:44 -0000	1.3
@@ -1 +1 @@
-    <message-resources parameter="org.lamsfoundation.lams.admin.applicationResources"/>
+    <message-resources parameter="org.lamsfoundation.lams.admin.ApplicationResources"/>
Index: lams_admin/web/WEB-INF/web.xml
===================================================================
RCS file: /usr/local/cvsroot/lams_admin/web/WEB-INF/Attic/web.xml,v
diff -u -r1.8 -r1.9
--- lams_admin/web/WEB-INF/web.xml	3 Apr 2006 12:49:05 -0000	1.8
+++ lams_admin/web/WEB-INF/web.xml	10 Apr 2006 11:03:44 -0000	1.9
@@ -23,7 +23,7 @@
 	</param-value>
 </context-param>
 
-<filter>
+  <filter>
        <filter-name>SystemSessionFilter</filter-name>
          <filter-class>
 		   org.lamsfoundation.lams.web.session.SystemSessionFilter
@@ -48,7 +48,7 @@
 	</init-param>
 </filter>
 
-<filter-mapping>
+  <filter-mapping>
     <filter-name>SystemSessionFilter</filter-name>
      <url-pattern>/*</url-pattern>
 </filter-mapping>
Index: lams_admin/web/WEB-INF/struts/struts-config.xml
===================================================================
RCS file: /usr/local/cvsroot/lams_admin/web/WEB-INF/struts/Attic/struts-config.xml,v
diff -u -r1.7 -r1.8
--- lams_admin/web/WEB-INF/struts/struts-config.xml	17 Mar 2006 04:34:19 -0000	1.7
+++ lams_admin/web/WEB-INF/struts/struts-config.xml	10 Apr 2006 11:03:44 -0000	1.8
@@ -216,7 +216,7 @@
 
    <!-- Define your Struts controller in a file called struts-controller.xml and place it in your merge directory. -->
 
-      <message-resources parameter="org.lamsfoundation.lams.admin.applicationResources"/>
+      <message-resources parameter="org.lamsfoundation.lams.admin.ApplicationResources"/>
 
 <plug-in className="org.apache.struts.tiles.TilesPlugin">
 	<set-property property="definitions-config"
Index: lams_central/conf/language/ApplicationResources.properties
===================================================================
RCS file: /usr/local/cvsroot/lams_central/conf/language/Attic/ApplicationResources.properties,v
diff -u
--- /dev/null	1 Jan 1970 00:00:00 -0000
+++ lams_central/conf/language/ApplicationResources.properties	10 Apr 2006 11:05:19 -0000	1.1
@@ -0,0 +1,58 @@
+# CVS ID: $Id$
+# Language strings for the Authoring and Workspace classes. Mostly error messages.
+
+#=========================Error Messages===========================#
+error.authorisation=You are not authorised to do this. 
+error.newpassword.mismatch=Your new passwords don't match each other.
+error.oldpassword.mismatch=Your old password is not correct.
+
+# Flash related messages 
+
+flash.validation.error.other=Other Error
+flash.validation.error.transitionNoActivityBeforeOrAfter=A Transition must have an activity before or after the transition
+flash.validation.error.activityWithNoTransition=An activity must have an input or output transition
+flash.validation.error.inputTransitionType1=There is more than one activity with no input transition
+flash.validation.error.inputTransitionType2=No activities are missing their input transition.
+flash.validation.error.outputTransitionType1=There is more than one activity with no output transition
+flash.validation.error.outputTransitionType2=No activities are missing their output transition.
+flash.validation.error.GroupingRequired=Grouping is required
+flash.validation.error.GroupingNotRequired=Grouping is not supported
+flash.validation.error.GroupingSelected=Grouping is selected but does not exist
+flash.validation.error.OptionalActivity=An Optional Activity must have one or more activities
+flash.validation.error.OptionalActivityOrderId=This Optional Activity has invalid order ids
+flash.validation.error.illegalScheduleGateOffsetsType1=A Schedule Gate cannot have equal start and end time offsets.
+flash.validation.error.illegalScheduleGateOffsetsType2=A Schedule Gate cannot have the start time offset greater than end time offset
+#
+invalid.wddx.packet=Invalid Object in WDDX packet. Error was {0}.
+no.such.learningdesign.exist=No Learning Design with learning_design_id of:{0} exists.
+no.such.user.exist=No such User with a user_id of: {0} exists.
+no.such.workspace.exist=No such WorkspaceFolder with workspace_folder_id of:{0} exists.
+#====================================================================#
+#=========================WorkingSpace labels===========================#
+#====================================================================#
+delete.resource.error=Cannot delete the resource: {0}
+delete.resource.error.value.miss=deleteResource(Long resourceID, String resourceType, Integer userID) requires a value for resourceID, resourceType and userID.
+delete.lesson.error=LAMS does not support deleting a lesson via the workspace interface.
+delete.folder.error=Cannot delete this folder as it is the Root folder.
+delete.learningdesign.error=Cannot delete design with learning_design_id of : {0} as it is READ ONLY.
+folder.delete=Folder deleted:{0}
+copy.resource.error=Cannot copy the resource:{0}
+copy.resource.error.value.miss=copyResource(Long resourceID,Integer targetFolderID, String resourceType, Integer userID) requires a value for resourceID, targetFolderID, resourceType and userID
+copy.no.support=LAMS does not support copying a file via the workspace interface.
+unable.copy=Unable to copy learning design due to an error{0}. 
+no.such.user=No such user with a userID of {0} exists.
+no.such.workspace=No such workspaceFolder with a workspace_folder_id of {0} exists.
+learningdesign.delete=Learning Design deleted:{0}
+learningdesign.readonly=Cannot delete design with learning_design_id of:{0} as it is READ ONLY.
+move.resource.error=Cannot move the resource:{0}
+move.resrouce.error.value.miss=moveResource(Long resourceID,Integer targetFolderID, String resourceType, Integer userID) requires a value for resourceID, targetFolderID, resourceType and userID
+unsupport.move=LAMS does not support moving a file via the workspace interface. 
+creating.workspace.folder.error= Exception occured while creating workspaceFolderContent:{0}.
+resource.already.exist="The resource {0} already exists in the repository: {1}.
+no.such.content="No such content with versionID of {0} found in repository {1}.
+content.delete.success=Content Successfully deleted.
+rename.resource.error=Cannot rename the resource: {0}
+rename.resource.error.miss.vaue=renameResource(Long resourceID,Integer newName, String resourceType, Integer userID) requires a value for resourceID, targetFolderID, resourceType and userID.
+rename.resource.unspport=LAMS does not support renaming a file via the workspace interface.
+folder.already.exist=A folder with given name '{0}' already exists.
+can.not.rename.root.folder=Cannot rename the ROOT folder.
\ No newline at end of file
Fisheye: Tag 1.2 refers to a dead (removed) revision in file `lams_central/conf/language/applicationResources.properties'.
Fisheye: No comparison available.  Pass `N' to diff?
Index: lams_central/conf/xdoclet/struts-message-resources.xml
===================================================================
RCS file: /usr/local/cvsroot/lams_central/conf/xdoclet/struts-message-resources.xml,v
diff -u -r1.1 -r1.2
--- lams_central/conf/xdoclet/struts-message-resources.xml	6 Sep 2005 04:57:21 -0000	1.1
+++ lams_central/conf/xdoclet/struts-message-resources.xml	10 Apr 2006 11:05:19 -0000	1.2
@@ -1 +1 @@
-  <message-resources    parameter="org.lamsfoundation.lams.applicationResources"/>
\ No newline at end of file
+  <message-resources    parameter="org.lamsfoundation.lams.ApplicationResources"/>
\ No newline at end of file
Index: lams_central/src/java/org/lamsfoundation/lams/authoring/authoringApplicationContext.xml
===================================================================
RCS file: /usr/local/cvsroot/lams_central/src/java/org/lamsfoundation/lams/authoring/authoringApplicationContext.xml,v
diff -u -r1.8 -r1.9
--- lams_central/src/java/org/lamsfoundation/lams/authoring/authoringApplicationContext.xml	3 Apr 2006 05:48:41 -0000	1.8
+++ lams_central/src/java/org/lamsfoundation/lams/authoring/authoringApplicationContext.xml	10 Apr 2006 11:05:19 -0000	1.9
@@ -13,7 +13,7 @@
 		<property name="messageSource">
 			<bean id="messageSource" class="org.springframework.context.support.ResourceBundleMessageSource">
 				<property name="basename">
-					<value>org.lamsfoundation.lams.central.applicationResources</value>
+					<value>org.lamsfoundation.lams.central.ApplicationResources</value>
 				</property>
 			</bean>
 		</property>
Index: lams_central/src/java/org/lamsfoundation/lams/authoring/service/AuthoringService.java
===================================================================
RCS file: /usr/local/cvsroot/lams_central/src/java/org/lamsfoundation/lams/authoring/service/AuthoringService.java,v
diff -u -r1.24 -r1.25
--- lams_central/src/java/org/lamsfoundation/lams/authoring/service/AuthoringService.java	3 Apr 2006 23:28:17 -0000	1.24
+++ lams_central/src/java/org/lamsfoundation/lams/authoring/service/AuthoringService.java	10 Apr 2006 11:05:19 -0000	1.25
@@ -559,16 +559,17 @@
 							+" message file "+activity.getLanguageFile()+". Activity Message source not available");
 				}
 
-				// update the tool field
-				languageFilename = activity.getToolLanguageFile();
-				toolMessageSource = toolActMessageService.getMessageService(languageFilename);
-				if ( toolMessageSource != null ) {
-					activity.setToolDisplayName(toolMessageSource.getMessage(Tool.I18N_DISPLAY_NAME,null,activity.getToolDisplayName(),locale));
-				} else {
-					log.warn("Unable to internationalise the library activity "+activity.getActivityID()+" "+activity.getTitle()
+				// update the tool field - note only tool activities have a tool entry.
+				if ( activity.getActivityTypeID()!=null && Activity.TOOL_ACTIVITY_TYPE == activity.getActivityTypeID().intValue() ) {
+					languageFilename = activity.getToolLanguageFile();
+					toolMessageSource = toolActMessageService.getMessageService(languageFilename);
+					if ( toolMessageSource != null ) {
+						activity.setToolDisplayName(toolMessageSource.getMessage(Tool.I18N_DISPLAY_NAME,null,activity.getToolDisplayName(),locale));
+					} else {
+						log.warn("Unable to internationalise the library activity "+activity.getActivityID()+" "+activity.getTitle()
 							+" message file "+activity.getLanguageFile()+". Tool Message source not available");
+					}
 				}
-				
 			} else {
 				log.warn("Unable to internationalise the library activity "+activity.getActivityID()+" "+activity.getTitle()
 						+". No message file supplied.");
Index: lams_central/web/WEB-INF/struts/struts-config.xml
===================================================================
RCS file: /usr/local/cvsroot/lams_central/web/WEB-INF/struts/Attic/struts-config.xml,v
diff -u -r1.8 -r1.9
--- lams_central/web/WEB-INF/struts/struts-config.xml	27 Mar 2006 22:15:17 -0000	1.8
+++ lams_central/web/WEB-INF/struts/struts-config.xml	10 Apr 2006 11:05:19 -0000	1.9
@@ -159,7 +159,7 @@
 
    <!-- Define your Struts controller in a file called struts-controller.xml and place it in your merge directory. -->
 
-    <message-resources    parameter="org.lamsfoundation.lams.applicationResources"/>
+    <message-resources    parameter="org.lamsfoundation.lams.ApplicationResources"/>
 
   <plug-in className="org.apache.struts.tiles.TilesPlugin">
 	<set-property property="definitions-config"
Index: lams_common/conf/language/ApplicationResources.properties
===================================================================
RCS file: /usr/local/cvsroot/lams_common/conf/language/Attic/ApplicationResources.properties,v
diff -u
--- /dev/null	1 Jan 1970 00:00:00 -0000
+++ lams_common/conf/language/ApplicationResources.properties	10 Apr 2006 11:06:13 -0000	1.1
@@ -0,0 +1,31 @@
+# CVS ID: $Id$
+# Resources for parameter 'org.lamsfoundation.lams.applicationResources'
+
+#====================================================================#
+#=========================Common labels===========================#
+#====================================================================#
+
+#=========================Error Messages===========================#
+
+# Validation messages 
+
+validation.error.other=Other Error
+validation.error.transitionNoActivityBeforeOrAfter=A Transition must have an activity before or after the transition
+validation.error.activityWithNoTransition=An activity must have an input or output transition
+validation.error.inputTransitionType1=There is more than one activity with no input transition
+validation.error.inputTransitionType2=No activities are missing their input transition.
+validation.error.outputTransitionType1=There is more than one activity with no output transition
+validation.error.outputTransitionType2=No activities are missing their output transition.
+validation.error.GroupingRequired=Grouping is required
+validation.error.GroupingNotRequired=Grouping is not supported
+validation.error.GroupingSelected=Grouping is selected but does not exist
+validation.error.OptionalActivity=An Optional Activity must have one or more activities
+validation.error.OptionalActivityOrderId=This Optional Activity has invalid order ids
+validation.error.illegalScheduleGateOffsetsType1=A Schedule Gate cannot have equal start and end time offsets.
+validation.error.illegalScheduleGateOffsetsType2=A Schedule Gate cannot have the start time offset greater than end time offset
+
+# Theme Service messages
+theme.service.setTheme.saved=User theme saved.
+theme.service.setTheme.type.invalid=Invalid theme type.
+theme.service.setTheme.noSuchTheme=No such theme exists.
+theme.service.setTheme.noSuchUser=No such User exists.
\ No newline at end of file
Fisheye: Tag 1.3 refers to a dead (removed) revision in file `lams_common/conf/language/applicationResources.properties'.
Fisheye: No comparison available.  Pass `N' to diff?
Index: lams_common/src/java/org/lamsfoundation/lams/commonContext.xml
===================================================================
RCS file: /usr/local/cvsroot/lams_common/src/java/org/lamsfoundation/lams/commonContext.xml,v
diff -u -r1.13 -r1.14
--- lams_common/src/java/org/lamsfoundation/lams/commonContext.xml	9 Apr 2006 03:34:31 -0000	1.13
+++ lams_common/src/java/org/lamsfoundation/lams/commonContext.xml	10 Apr 2006 11:06:13 -0000	1.14
@@ -13,7 +13,7 @@
 		<property name="messageSource">
 			<bean id="messageSource" class="org.springframework.context.support.ResourceBundleMessageSource">
 				<property name="basename">
-					<value>org.lamsfoundation.lams.applicationResources</value>
+					<value>org.lamsfoundation.lams.ApplicationResources</value>
 				</property>										
 			</bean>
 		</property>
Index: lams_contentrepository/conf/language/ApplicationResources.properties
===================================================================
RCS file: /usr/local/cvsroot/lams_contentrepository/conf/language/ApplicationResources.properties,v
diff -u
--- /dev/null	1 Jan 1970 00:00:00 -0000
+++ lams_contentrepository/conf/language/ApplicationResources.properties	10 Apr 2006 11:07:08 -0000	1.1
@@ -0,0 +1,13 @@
+# CVS ID: $Id$
+# Language strings for the Admin classes and screens.
+
+# Used for the demo pages - not used for the standard LAMS application.
+errors.mandatory={0} must not be empty.
+errors.filedirmandatory=Either a file must be uploaded or a directory selected.
+error.login=Unable to login to repository. Error: {0}.
+error.noTicket=The ticket is missing from the session. Unable to access the repository.
+error.entryStringNeeded=The file that "starts" the content is required when there is a zip file to be unpacked.
+error.uuidMissing=No node has been selected.
+error.repositoryUnexpected=The repository has returned an unexpected value. {0}
+exception.repository=An error occured involving the repository. {0}
+
Fisheye: Tag 1.2 refers to a dead (removed) revision in file `lams_contentrepository/conf/language/applicationResources.properties'.
Fisheye: No comparison available.  Pass `N' to diff?
Index: lams_contentrepository/conf/xdoclet/struts-message-resources.xml
===================================================================
RCS file: /usr/local/cvsroot/lams_contentrepository/conf/xdoclet/struts-message-resources.xml,v
diff -u -r1.2 -r1.3
--- lams_contentrepository/conf/xdoclet/struts-message-resources.xml	5 Apr 2006 23:24:18 -0000	1.2
+++ lams_contentrepository/conf/xdoclet/struts-message-resources.xml	10 Apr 2006 11:07:08 -0000	1.3
@@ -1 +1 @@
-   <message-resources parameter="org.lamsfoundation.lams.contentrepository.applicationResources"/>
+   <message-resources parameter="org.lamsfoundation.lams.contentrepository.ApplicationResources"/>
Index: lams_learning/conf/language/ApplicationResources.properties
===================================================================
RCS file: /usr/local/cvsroot/lams_learning/conf/language/Attic/ApplicationResources.properties,v
diff -u
--- /dev/null	1 Jan 1970 00:00:00 -0000
+++ lams_learning/conf/language/ApplicationResources.properties	10 Apr 2006 11:08:17 -0000	1.1
@@ -0,0 +1,28 @@
+# CVS ID: $Id$
+# Language strings for the Progress Engine related classes and screens. Mostly error messages.
+
+message.activity.loading=The next task is loading. Please wait....
+message.lesson.finished=Congratulations, you have finished.
+message.lesson.finishedCont=You have now completed your learning activity. Please log out or select a new session from the Available Sessions Panel
+message.activity.parallel.partialComplete=You have to complete the other task before progressing to the next activity....
+message.activity.parallel.noFrames=Your browser does not handle frames!
+message.activity.options.noActivitySelected=Please select an activity from the list
+message.activity.options.activityCount=You must complete at least {0} of these {1} activities.
+message.activity.options.note=<u><b>Note</b></u>: Once you finish any of the above activities you can revisit them by using the progress bar on the left.
+
+label.activity.options.choose=Choose
+label.activity.finish=Finish
+
+## Export Portfolio Functionality
+error.system.exportPortfolio=An internal error has occurred with the Export Portfolio Functionality. If reporting this error, please report: <br/> <b>{0}</b>
+error.system.learner=An internal error has occurred with the Learner Environment. If reporting this error, please report: <br/> <b>{0}</b>
+error.system.export=<font color\='red'>A system exception has occured and the portfolio could not be generated. Please contact Lams International technical support.</font>
+error.message.404=The page you have requested can not be found.
+
+# HTML used to create main export page. The lesson name is inserted at {0} and the list of activities are inserted at {1} 
+export.html.mainPage=<html><head><title>Export Portfolio</title><link href="default.css" rel="stylesheet" type="text/css"></head><body><h1>Export Portfolio</h1><h2>Lesson: {0} </h2><h4>Activities</h4>{1}</body></html>
+# HTML used to create main export page when an portfolio is not available due to system constraints. 
+export.html.exportFailed=<html><head><title>Export Portfolio</title><link href="default.css" rel="stylesheet" type="text/css"></head><body><h1>Export Portfolio Failed</h1>This sequence does not support portfolio exports</body></html>
+# HTML used to create the export portfolio activity page when an activity does not support export portfolio (stops it being just a blank page) 
+export.html.exportNotSupported=<html><head><title>Export Portfolio Unsupported</title><link href="default.css" rel="stylesheet" type="text/css"></head><body><p>Export Portfolio for this activity is unsupported</p></body></html>
+
Fisheye: Tag 1.3 refers to a dead (removed) revision in file `lams_learning/conf/language/LearningResources.properties'.
Fisheye: No comparison available.  Pass `N' to diff?
Index: lams_learning/conf/xdoclet/struts-message-resources.xml
===================================================================
RCS file: /usr/local/cvsroot/lams_learning/conf/xdoclet/struts-message-resources.xml,v
diff -u -r1.5 -r1.6
--- lams_learning/conf/xdoclet/struts-message-resources.xml	7 Apr 2006 00:35:19 -0000	1.5
+++ lams_learning/conf/xdoclet/struts-message-resources.xml	10 Apr 2006 11:08:17 -0000	1.6
@@ -1,2 +1,2 @@
 
-<message-resources parameter="org.lamsfoundation.lams.learning.LearningResources" />
+<message-resources parameter="org.lamsfoundation.lams.learning.ApplicationResources" />
Index: lams_learning/conf/xdoclet/web-settings.xml
===================================================================
RCS file: /usr/local/cvsroot/lams_learning/conf/xdoclet/web-settings.xml,v
diff -u -r1.16 -r1.17
--- lams_learning/conf/xdoclet/web-settings.xml	7 Apr 2006 00:35:19 -0000	1.16
+++ lams_learning/conf/xdoclet/web-settings.xml	10 Apr 2006 11:08:17 -0000	1.17
@@ -1,7 +1,7 @@
 
 <context-param>
   	<param-name>javax.servlet.jsp.jstl.fmt.localizationContext</param-name>
-  	<param-value>org.lamsfoundation.lams.learning.LearningResources</param-value>
+  	<param-value>org.lamsfoundation.lams.learning.ApplicationResources</param-value>
 </context-param>
 <context-param>
 	<param-name>contextConfigLocation</param-name>
Index: lams_learning/src/java/org/lamsfoundation/lams/learning/learningApplicationContext.xml
===================================================================
RCS file: /usr/local/cvsroot/lams_learning/src/java/org/lamsfoundation/lams/learning/learningApplicationContext.xml,v
diff -u -r1.10 -r1.11
--- lams_learning/src/java/org/lamsfoundation/lams/learning/learningApplicationContext.xml	8 Mar 2006 12:03:51 -0000	1.10
+++ lams_learning/src/java/org/lamsfoundation/lams/learning/learningApplicationContext.xml	10 Apr 2006 11:08:17 -0000	1.11
@@ -13,7 +13,7 @@
 		<property name="messageSource">
 			<bean id="messageSource" class="org.springframework.context.support.ResourceBundleMessageSource">
 				<property name="basename">
-					<value>org.lamsfoundation.lams.learning.LearningResources</value>
+					<value>org.lamsfoundation.lams.learning.ApplicationResources</value>
 				</property>
 			</bean>
 		</property>
Index: lams_learning/web/WEB-INF/web.xml
===================================================================
RCS file: /usr/local/cvsroot/lams_learning/web/WEB-INF/Attic/web.xml,v
diff -u -r1.22 -r1.23
--- lams_learning/web/WEB-INF/web.xml	7 Apr 2006 00:35:19 -0000	1.22
+++ lams_learning/web/WEB-INF/web.xml	10 Apr 2006 11:08:17 -0000	1.23
@@ -3,7 +3,7 @@
 <web-app  xmlns="http://java.sun.com/xml/ns/j2ee" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://java.sun.com/xml/ns/j2ee http://java.sun.com/xml/ns/j2ee/web-app_2_4.xsd" version="2.4">
 <context-param>
   	<param-name>javax.servlet.jsp.jstl.fmt.localizationContext</param-name>
-  	<param-value>org.lamsfoundation.lams.learning.LearningResources</param-value>
+  	<param-value>org.lamsfoundation.lams.learning.ApplicationResources</param-value>
 </context-param>
 <context-param>
 	<param-name>contextConfigLocation</param-name>
Index: lams_monitoring/conf/language/ApplicationResources.properties
===================================================================
RCS file: /usr/local/cvsroot/lams_monitoring/conf/language/Attic/ApplicationResources.properties,v
diff -u
--- /dev/null	1 Jan 1970 00:00:00 -0000
+++ lams_monitoring/conf/language/ApplicationResources.properties	10 Apr 2006 11:07:56 -0000	1.1
@@ -0,0 +1,18 @@
+# CVS ID: $Id: ApplicationResources.properties,v 1.1 2006/04/10 11:07:56 fmalikoff Exp $
+# Language strings for the Monitoring classes and screens. Mostly error messages.
+
+label.synch.gate=Synch Gate
+label.permission.gate=Permission Gate
+label.schedule.gate=Schedule Gate
+lable.description=Description 
+
+#========== Deleted Preview Message Screen =======================#
+preview.deleted.title=Preview Data Deleted
+preview.deleted.message=Preview data for {0} lesson(s) has been deleted.
+
+#Flashmessage 
+NO.SUCH.LESSON=No such Lesson with a lessonID of : {0} exists.
+INVALID.ACTIVITYID=Invalid activityID :{0}.
+INVALID.ACTIVITYID.USER=Invalid activityID/User : {0}  :  {1}.
+INVALID.ACTIVITYID.TYPE=Invalid Activity type: {0}. Only ToolActivity allowed.
+INVALID.ACTIVITYID.LESSONID=Invalid activityID/lessonID : {0} : {1}.
\ No newline at end of file
Fisheye: Tag 1.2 refers to a dead (removed) revision in file `lams_monitoring/conf/language/MonitoringResources.properties'.
Fisheye: No comparison available.  Pass `N' to diff?
Index: lams_monitoring/conf/xdoclet/struts-message-resources.xml
===================================================================
RCS file: /usr/local/cvsroot/lams_monitoring/conf/xdoclet/struts-message-resources.xml,v
diff -u -r1.2 -r1.3
--- lams_monitoring/conf/xdoclet/struts-message-resources.xml	6 Apr 2006 06:33:52 -0000	1.2
+++ lams_monitoring/conf/xdoclet/struts-message-resources.xml	10 Apr 2006 11:07:56 -0000	1.3
@@ -1 +1 @@
-<message-resources parameter="org.lamsfoundation.lams.monitoring.MonitoringResources" />
+<message-resources parameter="org.lamsfoundation.lams.monitoring.ApplicationResources" />
Index: lams_monitoring/conf/xdoclet/web-settings.xml
===================================================================
RCS file: /usr/local/cvsroot/lams_monitoring/conf/xdoclet/web-settings.xml,v
diff -u -r1.11 -r1.12
--- lams_monitoring/conf/xdoclet/web-settings.xml	6 Apr 2006 06:33:52 -0000	1.11
+++ lams_monitoring/conf/xdoclet/web-settings.xml	10 Apr 2006 11:07:56 -0000	1.12
@@ -1,6 +1,6 @@
 <context-param>
   	<param-name>javax.servlet.jsp.jstl.fmt.localizationContext</param-name>
-  	<param-value>org.lamsfoundation.lams.monitoring.MonitoringResources</param-value>
+  	<param-value>org.lamsfoundation.lams.monitoring.ApplicationResources</param-value>
 </context-param>
 <context-param>
 	<param-name>contextConfigLocation</param-name>
Index: lams_monitoring/src/java/org/lamsfoundation/lams/monitoring/monitoringApplicationContext.xml
===================================================================
RCS file: /usr/local/cvsroot/lams_monitoring/src/java/org/lamsfoundation/lams/monitoring/monitoringApplicationContext.xml,v
diff -u -r1.17 -r1.18
--- lams_monitoring/src/java/org/lamsfoundation/lams/monitoring/monitoringApplicationContext.xml	7 Apr 2006 00:35:37 -0000	1.17
+++ lams_monitoring/src/java/org/lamsfoundation/lams/monitoring/monitoringApplicationContext.xml	10 Apr 2006 11:07:56 -0000	1.18
@@ -14,7 +14,7 @@
 		<property name="messageSource">
 			<bean id="messageSource" class="org.springframework.context.support.ResourceBundleMessageSource">
 				<property name="basename">
-					<value>org.lamsfoundation.lams.monitoring.MonitoringResources</value>
+					<value>org.lamsfoundation.lams.monitoring.ApplicationResources</value>
 				</property>
 			</bean>
 		</property>
Index: lams_monitoring/web/WEB-INF/web.xml
===================================================================
RCS file: /usr/local/cvsroot/lams_monitoring/web/WEB-INF/Attic/web.xml,v
diff -u -r1.20 -r1.21
--- lams_monitoring/web/WEB-INF/web.xml	6 Apr 2006 06:33:52 -0000	1.20
+++ lams_monitoring/web/WEB-INF/web.xml	10 Apr 2006 11:07:56 -0000	1.21
@@ -3,7 +3,7 @@
 <web-app  xmlns="http://java.sun.com/xml/ns/j2ee" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://java.sun.com/xml/ns/j2ee http://java.sun.com/xml/ns/j2ee/web-app_2_4.xsd" version="2.4">
  <context-param>
   	<param-name>javax.servlet.jsp.jstl.fmt.localizationContext</param-name>
-  	<param-value>org.lamsfoundation.lams.monitoring.MonitoringResources</param-value>
+  	<param-value>org.lamsfoundation.lams.monitoring.ApplicationResources</param-value>
 </context-param>
 <context-param>
 	<param-name>contextConfigLocation</param-name>
Index: lams_monitoring/web/WEB-INF/struts/struts-config.xml
===================================================================
RCS file: /usr/local/cvsroot/lams_monitoring/web/WEB-INF/struts/Attic/struts-config.xml,v
diff -u -r1.9 -r1.10
--- lams_monitoring/web/WEB-INF/struts/struts-config.xml	6 Apr 2006 06:33:52 -0000	1.9
+++ lams_monitoring/web/WEB-INF/struts/struts-config.xml	10 Apr 2006 11:07:56 -0000	1.10
@@ -146,7 +146,7 @@
 
    <!-- Define your Struts controller in a file called struts-controller.xml and place it in your merge directory. -->
 
-  <message-resources parameter="org.lamsfoundation.lams.monitoring.MonitoringResources" />
+  <message-resources parameter="org.lamsfoundation.lams.monitoring.ApplicationResources" />
 
   <!-- ===================== Plugin Definition  ======================== -->
 <plug-in className="org.apache.struts.tiles.TilesPlugin">
Index: lams_tool_example/conf/xdoclet/struts-message-resources.xml
===================================================================
RCS file: /usr/local/cvsroot/lams_tool_example/conf/xdoclet/struts-message-resources.xml,v
diff -u -r1.1 -r1.2
--- lams_tool_example/conf/xdoclet/struts-message-resources.xml	21 Mar 2006 04:34:56 -0000	1.1
+++ lams_tool_example/conf/xdoclet/struts-message-resources.xml	10 Apr 2006 11:09:06 -0000	1.2
@@ -1 +1 @@
-  <message-resources    parameter="org.lamsfoundation.lams.tool.example.applicationResources"/>
\ No newline at end of file
+  <message-resources    parameter="org.lamsfoundation.lams.tool.example.ApplicationResources"/>
\ No newline at end of file
Index: lams_tool_example/conf/xdoclet/web-settings.xml
===================================================================
RCS file: /usr/local/cvsroot/lams_tool_example/conf/xdoclet/web-settings.xml,v
diff -u -r1.4 -r1.5
--- lams_tool_example/conf/xdoclet/web-settings.xml	28 Mar 2006 05:48:27 -0000	1.4
+++ lams_tool_example/conf/xdoclet/web-settings.xml	10 Apr 2006 11:09:06 -0000	1.5
@@ -2,7 +2,7 @@
 
 <context-param>
 	<param-name>javax.servlet.jsp.jstl.fmt.localizationContext</param-name>
-  	<param-value>org.lamsfoundation.lams.tool.example.applicationResources</param-value>
+  	<param-value>org.lamsfoundation.lams.tool.example.ApplicationResources</param-value>
 </context-param>
 
 <context-param>