Index: lams_build/build.xml
===================================================================
RCS file: /usr/local/cvsroot/lams_build/build.xml,v
diff -u -r1.79.2.1.2.3 -r1.79.2.1.2.4
--- lams_build/build.xml	22 May 2009 11:58:19 -0000	1.79.2.1.2.3
+++ lams_build/build.xml	1 Jun 2009 18:11:04 -0000	1.79.2.1.2.4
@@ -531,68 +531,74 @@
 		
 	</target>
 	
-	<target name="slim-jboss" description="makes a backup and removes unnecessary services from JBoss 4.0.2;
-		do not run it twice, otherwise you will need to copy standardjboss.xml and ejb-deployer.xml
-		from the original JBoss distribution and then build the whole LAMS project">
+	<target name="slim-jboss" description="makes a backup and removes unnecessary services from JBoss 5; do not run twice!">
 		<!-- Backup -->
 		<copy todir="${jboss.server.instance}/slim-backup/deploy">
 			<fileset dir="${jboss.ear.deploy}/">
-				<include name="ejb-deployer.xml"/>
-				<include name="client-deployer-service.xml"/>
+				<include name="ejb2-container-jboss-beans.xml"/>
+				<include name="ejb2-timer-service.xml"/>
+				<include name="ejb3-connectors-jboss-beans.xml"/>
+				<include name="ejb3-container-jboss-beans.xml"/>
+				<include name="ejb3-interceptors-aop.xml"/>
+				<include name="ejb3-timerservice-jboss-beans.xml"/>
+				<include name="jsr88-service.xml"/>
+				<include name="monitoring-service.xml"/>
+				<include name="profileservice-jboss-beans.xml"/>
 				<include name="schedule-manager-service.xml"/>
 				<include name="scheduler-service.xml"/>
-				<include name="bsh-deployer.xml"/>
-				<include name="jboss-aop.deployer/"/>
-				<include name="jboss-ws4ee.sar/"/>
+				<include name="transaction-service.xml"/>
+				<include name="jbossws.sar/"/>
+				<include name="profileservice-secured.jar/"/>
+				<include name="admin-console.war/"/>
+				<include name="xnio-provider.jar/"/>
 				<include name="jmx-console.war/"/>
 				<include name="http-invoker.sar/"/>
 			</fileset>
 		</copy>
 		
-		<copy todir="${jboss.server.instance}/slim-backup/conf">
-			<fileset dir="${jboss.server.instance}/conf">
-				<include name="jboss-service.xml"/>
-				<include name="standardjboss.xml"/>
+		<copy todir="${jboss.server.instance}/slim-backup/deployers">
+			<fileset dir="${jboss.server.instance}/deployers">
+				<include name="jsr77-deployers-jboss-beans.xml"/>
+				<include name="logbridge-jboss-beans.xml"/>
+				<include name="jbossws.deployer/"/>
+				<include name="seam.deployer/"/>
 			</fileset>
 		</copy>
 		
-		<copy todir="${jboss.server.instance}/slim-backup/lib">
-			<fileset dir="${jboss.server.instance.lib}">
-				<include name="autonumber-plugin.jar"/>
-				<include name="bcel.jar"/>
-				<include name="jboss-jaxrpc.jar"/>
-				<include name="jboss-saaj.jar"/>
-				<include name="scheduler-plugin.jar"/>
-				<include name="scheduler-plugin-example.jar"/>
-				<include name="bsh-1.3.0.jar"/>
-				<include name="bsh-deployer.jar"/>
+		<copy todir="${jboss.server.instance}/slim-backup/conf">
+			<fileset dir="${jboss.server.instance}/conf">
+				<include name="bootstrap.xml"/>
 			</fileset>
 		</copy>
 		
 		<!-- Configuring -->
-		<copy overwrite="yes" file="${conf.jboss}/ejb-deployer.slim.xml" tofile="${jboss.ear.deploy}/ejb-deployer.xml" />
-		<copy overwrite="yes" file="${conf.jboss}/jboss-service.slim.xml" tofile="${jboss.server.instance}/conf/jboss-service.xml" />
-		<copy overwrite="yes" file="${conf.jboss}/standardjboss.slim.xml" tofile="${jboss.server.instance}/conf/standardjboss.xml" />
+		<copy overwrite="yes" file="${conf.jboss}/bootstrap.slim.xml" tofile="${jboss.server.instance}/conf/bootstrap.xml" />
 		
+		<delete file="ejb2-container-jboss-beans.xml"/>
+		<delete file="{jboss.ear.deploy}ejb2-timer-service.xml"/>
+		<delete file="{jboss.ear.deploy}ejb3-connectors-jboss-beans.xml"/>
+		<delete file="{jboss.ear.deploy}ejb3-container-jboss-beans.xml"/>
+		<delete file="{jboss.ear.deploy}ejb3-interceptors-aop.xml"/>
+		<delete file="{jboss.ear.deploy}ejb3-timerservice-jboss-beans.xml"/>
+		<delete file="{jboss.ear.deploy}jsr88-service.xml"/>
+		<delete file="{jboss.ear.deploy}monitoring-service.xml"/>
+		<delete file="{jboss.ear.deploy}profileservice-jboss-beans.xml"/>
+		<delete file="{jboss.ear.deploy}schedule-manager-service.xml"/>
+		<delete file="{jboss.ear.deploy}scheduler-service.xml"/>
+		<delete file="{jboss.ear.deploy}transaction-service.xml"/>
 		
-		<delete dir="${jboss.ear.deploy}jboss-aop.deployer" />
-		<delete dir="${jboss.ear.deploy}/jboss-ws4ee.sar" />
-		<delete dir="${jboss.ear.deploy}/jmx-console.war"/>
-		<delete dir="${jboss.ear.deploy}/http-invoker.sar"/>
+		<delete dir="{jboss.ear.deploy}jbossws.sar/"/>
+		<delete dir="{jboss.ear.deploy}profileservice-secured.jar/"/>
+		<delete dir="{jboss.ear.deploy}admin-console.war/"/>
+		<delete dir="{jboss.ear.deploy}xnio-provider.jar/"/>
+		<delete dir="{jboss.ear.deploy}jmx-console.war/"/>
+		<delete dir="{jboss.ear.deploy}http-invoker.sar/"/>
 		
-		<delete file="${jboss.ear.deploy}/client-deployer-service.xml"/>
-		<delete file="${jboss.ear.deploy}/schedule-manager-service.xml"/>
-		<delete file="${jboss.ear.deploy}/scheduler-service.xml"/>
-		<delete file="${jboss.ear.deploy}/bsh-deployer.xml"/>
+		<delete file="${jboss.server.instance}/deployers/jsr77-deployers-jboss-beans.xml"/>
+		<delete file="${jboss.server.instance}/deployers/logbridge-jboss-beans.xml"/>
 		
-		<delete file="${jboss.server.instance.lib}/autonumber-plugin.jar"/>
-		<delete file="${jboss.server.instance.lib}/bcel.jar"/>
-		<delete file="${jboss.server.instance.lib}/jboss-jaxrpc.jar"/>
-		<delete file="${jboss.server.instance.lib}/jboss-saaj.jar"/>
-		<delete file="${jboss.server.instance.lib}/scheduler-plugin.jar"/>
-		<delete file="${jboss.server.instance.lib}/scheduler-plugin-example.jar"/>
-		<delete file="${jboss.server.instance.lib}/bsh-1.3.0.jar"/>
-		<delete file="${jboss.server.instance.lib}/bsh-deployer.jar"/>
+		<delete dir="${jboss.server.instance}/deployers/jbossws.deployer"/>
+		<delete dir="${jboss.server.instance}/deployers/seam.deployer"/>
 	</target>
 	
 	<target name="slim-jboss-revert" description="reverts changes made by slim-jboss task">
@@ -608,8 +614,8 @@
 			</fileset>
 		</copy>
 		
-		<copy overwrite="yes" todir="${jboss.server.instance.lib}">
-			<fileset dir="${jboss.server.instance}/slim-backup/lib">
+		<copy overwrite="yes" todir="${jboss.server.instance}/deployers">
+			<fileset dir="${jboss.server.instance}/slim-backup/deployers">
 				<include name="*"/>
 			</fileset>
 		</copy>
Fisheye: Tag 1.1 refers to a dead (removed) revision in file `lams_build/conf/unix/jboss/bootstrap.slim.xml'.
Fisheye: No comparison available.  Pass `N' to diff?
Fisheye: Tag 1.1 refers to a dead (removed) revision in file `lams_build/conf/windows/jboss/bootstrap.slim.xml'.
Fisheye: No comparison available.  Pass `N' to diff?
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.4.1 -r1.20.4.2
--- lams_central/src/java/org/lamsfoundation/lams/authoring/authoringApplicationContext.xml	26 May 2009 15:02:36 -0000	1.20.4.1
+++ lams_central/src/java/org/lamsfoundation/lams/authoring/authoringApplicationContext.xml	1 Jun 2009 18:11:11 -0000	1.20.4.2
@@ -84,6 +84,7 @@
 				<prop key="delete*">PROPAGATION_REQUIRED</prop>
 				<prop key="insert*">PROPAGATION_REQUIRED</prop>
 				<prop key="rename*">PROPAGATION_REQUIRED</prop>
+				<prop key="getToolOutputDefinitions">PROPAGATION_REQUIRED</prop>
 				<prop key="get*">PROPAGATION_REQUIRED,readOnly</prop>
 			</props>
 		</property>