Index: lams_build/conf/unix/jboss/jbossweb/war-deployers-jboss-beans.xml
===================================================================
RCS file: /usr/local/cvsroot/lams_build/conf/unix/jboss/jbossweb/war-deployers-jboss-beans.xml,v
diff -u -r1.1.2.1 -r1.1.2.2
--- lams_build/conf/unix/jboss/jbossweb/war-deployers-jboss-beans.xml	13 May 2009 09:37:54 -0000	1.1.2.1
+++ lams_build/conf/unix/jboss/jbossweb/war-deployers-jboss-beans.xml	26 May 2009 15:04:42 -0000	1.1.2.2
@@ -188,13 +188,18 @@
            model.
       -->
       <property name="java2ClassLoadingCompliance">false</property>
-      <!-- A flag indicating if the JBoss Loader should be used. This loader
+      
+      <!-- This is NO LONGER supported this way and it will be completely removed for 6.x.
+           See JBAS-6914 for how you can achieve the same in 5.x with new MC JBossCL layer. 
+
+           A flag indicating if the JBoss Loader should be used. This loader
            uses a unified class loader as the class loader rather than the tomcat
            specific class loader.
            The default is false to ensure that wars have isolated class loading
            for duplicate jars and jsp files.
+      <property name="useJBossWebLoader">false</property>
       -->
-      <property name="useJBossWebLoader">true</property>
+      
       <!-- The list of package prefixes that should not be loaded without
          delegating to the parent class loader before trying the web app
          class loader. The packages listed here are those tha are used by
Index: lams_build/conf/windows/jboss/jbossweb/war-deployers-jboss-beans.xml
===================================================================
RCS file: /usr/local/cvsroot/lams_build/conf/windows/jboss/jbossweb/war-deployers-jboss-beans.xml,v
diff -u -r1.1.2.1 -r1.1.2.2
--- lams_build/conf/windows/jboss/jbossweb/war-deployers-jboss-beans.xml	13 May 2009 09:37:54 -0000	1.1.2.1
+++ lams_build/conf/windows/jboss/jbossweb/war-deployers-jboss-beans.xml	26 May 2009 15:04:43 -0000	1.1.2.2
@@ -188,13 +188,18 @@
            model.
       -->
       <property name="java2ClassLoadingCompliance">false</property>
-      <!-- A flag indicating if the JBoss Loader should be used. This loader
+      
+      <!-- This is NO LONGER supported this way and it will be completely removed for 6.x.
+           See JBAS-6914 for how you can achieve the same in 5.x with new MC JBossCL layer. 
+
+           A flag indicating if the JBoss Loader should be used. This loader
            uses a unified class loader as the class loader rather than the tomcat
            specific class loader.
            The default is false to ensure that wars have isolated class loading
            for duplicate jars and jsp files.
+      <property name="useJBossWebLoader">false</property>
       -->
-      <property name="useJBossWebLoader">true</property>
+      
       <!-- The list of package prefixes that should not be loaded without
          delegating to the parent class loader before trying the web app
          class loader. The packages listed here are those tha are used by
Index: lams_build/lib/jbossweb/jbossweb.jar
===================================================================
RCS file: /usr/local/cvsroot/lams_build/lib/jbossweb/Attic/jbossweb.jar,v
diff -u -r1.1.2.1 -r1.1.2.2
Binary files differ
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.20 -r1.20.4.1
--- lams_central/src/java/org/lamsfoundation/lams/authoring/authoringApplicationContext.xml	26 Mar 2009 10:00:34 -0000	1.20
+++ lams_central/src/java/org/lamsfoundation/lams/authoring/authoringApplicationContext.xml	26 May 2009 15:02:36 -0000	1.20.4.1
@@ -80,6 +80,11 @@
 				<prop key="setup*">PROPAGATION_REQUIRED</prop>
 				<prop key="finish*">PROPAGATION_REQUIRED</prop>
 				<prop key="remove*">PROPAGATION_REQUIRED</prop>
+				<prop key="add*">PROPAGATION_REQUIRED</prop>
+				<prop key="delete*">PROPAGATION_REQUIRED</prop>
+				<prop key="insert*">PROPAGATION_REQUIRED</prop>
+				<prop key="rename*">PROPAGATION_REQUIRED</prop>
+				<prop key="get*">PROPAGATION_REQUIRED,readOnly</prop>
 			</props>
 		</property>
 	</bean>
Index: lams_central/src/java/org/lamsfoundation/lams/workspace/workspaceApplicationContext.xml
===================================================================
RCS file: /usr/local/cvsroot/lams_central/src/java/org/lamsfoundation/lams/workspace/workspaceApplicationContext.xml,v
diff -u -r1.9 -r1.9.4.1
--- lams_central/src/java/org/lamsfoundation/lams/workspace/workspaceApplicationContext.xml	26 Mar 2009 10:00:34 -0000	1.9
+++ lams_central/src/java/org/lamsfoundation/lams/workspace/workspaceApplicationContext.xml	26 May 2009 15:02:36 -0000	1.9.4.1
@@ -38,7 +38,9 @@
 				<prop key="copy*">PROPAGATION_REQUIRED</prop>
 				<prop key="rename*">PROPAGATION_REQUIRED</prop>
 				<prop key="delete*">PROPAGATION_REQUIRED</prop>				
-				<prop key="move*">PROPAGATION_REQUIRED</prop>				
+				<prop key="move*">PROPAGATION_REQUIRED</prop>	
+				<prop key="create*">PROPAGATION_REQUIRED</prop>
+				<prop key="get*">PROPAGATION_REQUIRED,readOnly</prop>			
 			</props>
 		</property>
 	</bean>
Index: lams_common/src/java/org/lamsfoundation/lams/applicationContext.xml
===================================================================
RCS file: /usr/local/cvsroot/lams_common/src/java/org/lamsfoundation/lams/applicationContext.xml,v
diff -u -r1.7.4.2 -r1.7.4.3
--- lams_common/src/java/org/lamsfoundation/lams/applicationContext.xml	25 May 2009 18:16:14 -0000	1.7.4.2
+++ lams_common/src/java/org/lamsfoundation/lams/applicationContext.xml	26 May 2009 15:02:19 -0000	1.7.4.3
@@ -48,14 +48,12 @@
 		<property name="jndiName"><value>java:jdbc/lams-ds</value></property>
 	</bean>
 
-	<!--  Transaction manager for all transactions involving the core classes or the content repository. -->
+	<!--  Transaction manager for all transactions involving the core classes or the content repository. 
+		  For JBoss 5, it has been changed to Hibernate Transaction Manager, instead of JTA.
 	
-	<!--  If your code calls classes in the content repository or in the core, and your data needs   -->
-	<!--  to be consistent with the rest of the system (and what data doesn't.... ), then you 		 -->
-	<!--  must use this transaction manager. If you do not, then the core code data changes will be  -->
-	<!--  committed independent of your changes. 			 										 -->
-	<!--  "autodetectTransactionManager" defaults to true so we don't need to include it.  		 	 -->
-	<!--  But remember all application servers do not have the same JNDI name for their transaction manager! -->
+		  "autodetectTransactionManager" defaults to true so we don't need to include it.  		 	
+	  	  But remember all application servers do not have the same JNDI name for their transaction manager!
+	 -->
 	<bean id="transactionManager" class="org.springframework.orm.hibernate3.HibernateTransactionManager">
 		<property name="sessionFactory"><ref bean="coreSessionFactory"/></property>
 	</bean>
Index: lams_common/src/java/org/lamsfoundation/lams/toolApplicationContext.xml
===================================================================
RCS file: /usr/local/cvsroot/lams_common/src/java/org/lamsfoundation/lams/toolApplicationContext.xml,v
diff -u -r1.7 -r1.7.4.1
--- lams_common/src/java/org/lamsfoundation/lams/toolApplicationContext.xml	26 Mar 2009 10:00:35 -0000	1.7
+++ lams_common/src/java/org/lamsfoundation/lams/toolApplicationContext.xml	26 May 2009 15:02:19 -0000	1.7.4.1
@@ -51,11 +51,11 @@
 		<property name="target"><ref local="lamsCoreToolServiceTarget"/></property>
 		<property name="transactionAttributes">
 			<props>
-				<prop key="createToolSession">PROPAGATION_REQUIRED</prop>
-				<prop key="createToolSessions">PROPAGATION_REQUIRED</prop>
+				<prop key="createToolSession*">PROPAGATION_REQUIRED</prop>
 				<prop key="notifyTool*">PROPAGATION_REQUIRED</prop>
 			    <prop key="update*">PROPAGATION_REQUIRED</prop>
-			    <prop key="get*">PROPAGATION_REQUIRED</prop>
+			    <prop key="remove*">PROPAGATION_REQUIRED</prop>
+			    <prop key="get*">PROPAGATION_REQUIRED,readOnly</prop>
 			</props>
 		</property>
 	</bean>   	
@@ -71,6 +71,7 @@
 			</property>
 		<property name="transactionAttributes">
 			<props>
+				<prop key="save*">PROPAGATION_REQUIRED</prop>
 				<prop key="get*">PROPAGATION_REQUIRED,readOnly</prop>
 			</props>
 		</property>
Index: lams_gradebook/src/java/org/lamsfoundation/lams/gradebook/gradebookApplicationContext.xml
===================================================================
RCS file: /usr/local/cvsroot/lams_gradebook/src/java/org/lamsfoundation/lams/gradebook/gradebookApplicationContext.xml,v
diff -u -r1.1.2.2 -r1.1.2.2.2.1
--- lams_gradebook/src/java/org/lamsfoundation/lams/gradebook/gradebookApplicationContext.xml	22 Apr 2009 06:39:06 -0000	1.1.2.2
+++ lams_gradebook/src/java/org/lamsfoundation/lams/gradebook/gradebookApplicationContext.xml	26 May 2009 15:02:14 -0000	1.1.2.2.2.1
@@ -19,18 +19,9 @@
 		<property name ="transactionManager"><ref bean ="transactionManager"/></property>
 		<property name ="target"><ref bean="gradebookServiceTarget"/></property>
 		<property name="transactionAttributes">
-			<props>	
-				<prop key="save*">PROPAGATION_REQUIRED</prop>
-				<prop key="store*">PROPAGATION_REQUIRED</prop>
-				<prop key="copy*">PROPAGATION_REQUIRED</prop>
+			<props>
 				<prop key="update*">PROPAGATION_REQUIRED</prop>
-				<prop key="validate*">PROPAGATION_REQUIRED</prop>
-				<prop key="setup*">PROPAGATION_REQUIRED</prop>
-				<prop key="finish*">PROPAGATION_REQUIRED</prop>
-				<prop key="remove*">PROPAGATION_REQUIRED</prop>		
-				<prop key="retrieve*">PROPAGATION_REQUIRED</prop>	
-				<prop key="add*">PROPAGATION_REQUIRED</prop>	
-				<prop key="get*">PROPAGATION_REQUIRED</prop>
+				<prop key="get*">PROPAGATION_REQUIRED,readOnly</prop>
 			</props>
 		</property>
 	</bean>
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.24.2.1 -r1.24.2.1.2.1
--- lams_learning/src/java/org/lamsfoundation/lams/learning/learningApplicationContext.xml	22 Apr 2009 06:39:05 -0000	1.24.2.1
+++ lams_learning/src/java/org/lamsfoundation/lams/learning/learningApplicationContext.xml	26 May 2009 15:02:27 -0000	1.24.2.1.2.1
@@ -43,7 +43,7 @@
 		<property name="transactionAttributes">
 			<props>
 				<prop key="joinLesson">PROPAGATION_REQUIRED</prop>
-				<prop key="calculateProgress">PROPAGATION_REQUIRED</prop>
+				<prop key="calculate*">PROPAGATION_REQUIRED</prop>
 				<prop key="chooseActivity">PROPAGATION_REQUIRED</prop>
 				<prop key="moveToActivity">PROPAGATION_REQUIRED</prop>
 				<prop key="completeToolSession">PROPAGATION_REQUIRED</prop>
@@ -53,7 +53,9 @@
 				<prop key="knockGate">PROPAGATION_REQUIRED</prop>
 				<prop key="determineBranch">PROPAGATION_REQUIRED</prop>				
 				<prop key="selectBranch">PROPAGATION_REQUIRED</prop>
-				<prop key="calculateMaxNumberOfLearnersPerGroup">PROPAGATION_REQUIRED</prop>			
+				<prop key="create*">PROPAGATION_REQUIRED</prop>
+				<prop key="learner*">PROPAGATION_REQUIRED</prop>
+				<prop key="get*">PROPAGATION_REQUIRED,readOnly</prop>
    			</props>
 		</property>
 	</bean> 
Index: lams_learning/src/java/org/lamsfoundation/lams/learning/service/LearnerService.java
===================================================================
RCS file: /usr/local/cvsroot/lams_learning/src/java/org/lamsfoundation/lams/learning/service/LearnerService.java,v
diff -u -r1.96.4.3.2.2 -r1.96.4.3.2.3
--- lams_learning/src/java/org/lamsfoundation/lams/learning/service/LearnerService.java	25 May 2009 18:16:03 -0000	1.96.4.3.2.2
+++ lams_learning/src/java/org/lamsfoundation/lams/learning/service/LearnerService.java	26 May 2009 15:02:27 -0000	1.96.4.3.2.3
@@ -973,6 +973,12 @@
 	     * This exception should never occur, as lamsCoreToolService.createToolSession is now synchronized.
 	     * Nevertheless, it sometimes occurs, so additional security measures stay.
 	     */
+	    try {
+		Thread.sleep(2000);
+	    } catch (InterruptedException e1) {
+		// do nothing, it does not hurt us
+	    }
+
 	    toolSession = lamsCoreToolService.createToolSession(learner, toolActivity, lesson);
 	}
 	if (toolSession != null) {
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.30 -r1.30.4.1
--- lams_monitoring/src/java/org/lamsfoundation/lams/monitoring/monitoringApplicationContext.xml	26 Mar 2009 10:00:35 -0000	1.30
+++ lams_monitoring/src/java/org/lamsfoundation/lams/monitoring/monitoringApplicationContext.xml	26 May 2009 15:04:49 -0000	1.30.4.1
@@ -53,24 +53,20 @@
 		<property name="target"><ref local="monitoringServiceTarget"/></property>
 		<property name="transactionAttributes">
 			<props>
-				<prop key="initializeLesson">PROPAGATION_REQUIRED</prop>
-				<prop key="createLessonClassForLessonWDDX">PROPAGATION_REQUIRED</prop>
-				<prop key="createLessonClassForLesson">PROPAGATION_REQUIRED</prop>
-				<prop key="startLesson*">PROPAGATION_REQUIRED</prop>
-				<prop key="archiveLesson">PROPAGATION_REQUIRED</prop>
-				<prop key="unarchiveLesson">PROPAGATION_REQUIRED</prop>
-				<prop key="finishLesson">PROPAGATION_REQUIRED</prop>
-				<prop key="suspendLesson">PROPAGATION_REQUIRED</prop>
-				<prop key="unsuspendLesson">PROPAGATION_REQUIRED</prop>
+				<prop key="initializeLesson*">PROPAGATION_REQUIRED</prop>
+				<prop key="create*">PROPAGATION_REQUIRED</prop>
+				<prop key="start*">PROPAGATION_REQUIRED</prop>
+				<prop key="finishLesson*">PROPAGATION_REQUIRED</prop>
+				<prop key="*suspendLesson">PROPAGATION_REQUIRED</prop>
 				<prop key="remove*">PROPAGATION_REQUIRED</prop>
 				<prop key="add*">PROPAGATION_REQUIRED</prop>
-				<prop key="openGate">PROPAGATION_REQUIRED</prop>
+				<prop key="*archive*">PROPAGATION_REQUIRED</prop>
+				<prop key="open*">PROPAGATION_REQUIRED</prop>
 				<prop key="runGateScheduler">PROPAGATION_REQUIRED</prop>
 				<prop key="closeGate">PROPAGATION_REQUIRED</prop>
-				<prop key="createPreviewClassForLesson">PROPAGATION_REQUIRED</prop>
-				<prop key="deletePreviewLesson">PROPAGATION_REQUIRES_NEW</prop>
-				<prop key="deleteAllOldPreviewLessons">PROPAGATION_REQUIRED</prop>
+				<prop key="delete*">PROPAGATION_REQUIRED</prop>
 				<prop key="setLearnerPortfolioAvailable">PROPAGATION_REQUIRED</prop>
+				<prop key="check*">PROPAGATION_REQUIRED,readOnly</prop>
 			</props>
 		</property>
 	</bean>