Index: unix_installer/upgrader-package/ant-scripts/update-lams.xml
===================================================================
RCS file: /usr/local/cvsroot/unix_installer/upgrader-package/ant-scripts/update-lams.xml,v
diff -u -r1.13 -r1.14
--- unix_installer/upgrader-package/ant-scripts/update-lams.xml	1 Dec 2008 03:29:42 -0000	1.13
+++ unix_installer/upgrader-package/ant-scripts/update-lams.xml	5 May 2009 05:58:59 -0000	1.14
@@ -42,7 +42,7 @@
     	
     	<antcall target="update-application-xml" />
     	
-    	<antcall target="update-2.2-specific"/>
+    	<antcall target="update-2.3-specific"/>
     	
         <antcall target="language-pack" />
         <antcall target="set-lams-configuration" />
@@ -166,12 +166,12 @@
         	<arg value="${DB_NAME}"/>
         	<arg value="${SQL_URL}"/>
         	<classpath>
-                <pathelement path="../bin:../tools/lib/mysql-connector-java-3.1.12-bin.jar"/>
+                <pathelement path="../bin:../tools/lib/mysql-connector-java-5.0.8-bin.jar"/>
             </classpath>
         </java>
 		
         <sql driver="com.mysql.jdbc.Driver" 
-            classpath="../tools/lib/mysql-connector-java-3.1.12-bin.jar" 
+            classpath="../tools/lib/mysql-connector-java-5.0.8-bin.jar" 
             url="${SQL_URL}" 
             userid="${DB_USER}" 
             password="${DB_PASS}"
@@ -205,23 +205,23 @@
     	
     	<echo>Deploying new tools</echo>
     	
-    	<!-- ============= 2.2 Tools ============== -->
+    	<!-- ============= 2.3 Tools ============== -->
     	<antcall target="deploy-new-tool">
-    	   	<param name="signature" value="ladaco10"/>
+    	   	<param name="signature" value="laasse10"/>
     	</antcall>
     	<antcall target="deploy-new-tool">
-    	   	<param name="signature" value="lagmap10"/>
+    	   	<param name="signature" value="laimag10"/>
     	</antcall>
     	<antcall target="deploy-new-tool">
-    	   	<param name="signature" value="lasprd10"/>
+    	   	<param name="signature" value="lamind10"/>
     	</antcall>
     	<antcall target="deploy-new-tool">
-    	   	<param name="signature" value="lawiki10"/>
+    	   	<param name="signature" value="lapixl10"/>
     	</antcall>
     	<antcall target="deploy-new-tool">
-    	   	<param name="signature" value="laddim10"/>
+    	   	<param name="signature" value="lavidr10"/>
     	</antcall>
-    	<!-- ============= 2.2 Tools ============== -->
+    	<!-- ============= 2.3 Tools ============== -->
     	
     	<antcall target="compress-wars"/>
     </target>
@@ -247,29 +247,15 @@
         </ant>
 	</target>
 	
-	<target name="update-2.2-specific" description="Does updates specific to 2.2, delete after 2.2">
-		
-		<!-- Copy new context.xml -->
-		<copy todir="${DEPLOY_DIR}/jbossweb-tomcat55.sar" overwrite="true">
-            <fileset dir="../conf">
-                <include name="context.xml"/>
-            </fileset>
-        </copy>
-		
-		<!-- update jboss-cache and jgroups and jboss-serialization jars -->
-		<copy todir="${DEFAULT_DIR}/lib" overwrite="true">
-            <fileset dir="../assembly">
-                <include name="jboss-cache.jar"/>
-            	<include name="jgroups.jar"/>
-                <include name="jboss-serialization.jar"/>
-            </fileset>
-        </copy>
-	</target>
-	
+	<target name="update-2.3-specific" description="Does updates specific to 2.3, delete after 2.3">
+		<!-- Add pixlr dir to lams-www -->
+		<mkdir dir="${EAR_DIR}/lams-www/images/pixlr"/>
+		<copy file="../tools/lapixl10/blank.jpg" todir="${EAR_DIR}/lams-www.war/images/pixlr"/>
+	</target>	
 
     <target name="set-lams-configuration" description="Updates the lams_configuration table with all the settings from lams.properties">
         <sql driver="com.mysql.jdbc.Driver" 
-            classpath="${DEPLOY_DIR}/lams.ear/mysql-connector-java-3.1.12-bin.jar" 
+            classpath="${DEPLOY_DIR}/lams.ear/mysql-connector-java-5.0.8-bin.jar" 
             url="${SQL_URL}" 
             userid="${DB_USER}" 
             password="${DB_PASS}"
@@ -279,5 +265,89 @@
             <transaction src="../sql-scripts/setLamsConfiguration.sql" />
         </sql>
     </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">
+		<!-- Backup -->
+		<copy todir="${DEFAULT_DIR}/slim-backup/deploy">
+			<fileset dir="${DEPLOY_DIR}/">
+				<include name="ejb-deployer.xml"/>
+				<include name="client-deployer-service.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="jmx-console.war/"/>
+				<include name="http-invoker.sar/"/>
+			</fileset>
+		</copy>
+		
+		<copy todir="${DEFAULT_DIR}/slim-backup/conf">
+			<fileset dir="${DEFAULT_DIR}/conf">
+				<include name="jboss-service.xml"/>
+				<include name="standardjboss.xml"/>
+			</fileset>
+		</copy>
+		
+		<copy todir="${DEFAULT_DIR}/slim-backup/lib">
+			<fileset dir="${DEFAULT_DIR}/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"/>
+			</fileset>
+		</copy>
+		
+		<!-- Configuring -->
+		<property name="JBOSS_CONF_DIR" value="${basedir}/../conf/unix/jboss/"></property>
+		<copy overwrite="yes" file="${JBOSS_CONF_DIR}/ejb-deployer.slim.xml" tofile="${DEPLOY_DIR}/ejb-deployer.xml" />
+		<copy overwrite="yes" file="${JBOSS_CONF_DIR}/jboss-service.slim.xml" tofile="${DEFAULT_DIR}/conf/jboss-service.xml" />
+		<copy overwrite="yes" file="${JBOSS_CONF_DIR}/standardjboss.slim.xml" tofile="${DEFAULT_DIR}/conf/standardjboss.xml" />
+		
+		
+		<delete dir="${DEPLOY_DIR}jboss-aop.deployer" />
+		<delete dir="${DEPLOY_DIR}/jboss-ws4ee.sar" />
+		<delete dir="${DEPLOY_DIR}/jmx-console.war"/>
+		<delete dir="${DEPLOY_DIR}/http-invoker.sar"/>
+		
+		<delete file="${DEPLOY_DIR}/client-deployer-service.xml"/>
+		<delete file="${DEPLOY_DIR}/schedule-manager-service.xml"/>
+		<delete file="${DEPLOY_DIR}/scheduler-service.xml"/>
+		<delete file="${DEPLOY_DIR}/bsh-deployer.xml"/>
+		
+		<delete file="${DEFAULT_DIR}/lib/autonumber-plugin.jar"/>
+		<delete file="${DEFAULT_DIR}/lib/bcel.jar"/>
+		<delete file="${DEFAULT_DIR}/lib/jboss-jaxrpc.jar"/>
+		<delete file="${DEFAULT_DIR}/lib/jboss-saaj.jar"/>
+		<delete file="${DEFAULT_DIR}/lib/scheduler-plugin.jar"/>
+		<delete file="${DEFAULT_DIR}/lib/scheduler-plugin-example.jar"/>
+		<delete file="${DEFAULT_DIR}/lib/bsh-1.3.0.jar"/>
+		<delete file="${DEFAULT_DIR}/lib/bsh-deployer.jar"/>
+	</target>
+	
+	<target name="slim-jboss-revert" description="reverts changes made by slim-jboss task">
+		<copy overwrite="yes" todir="${DEPLOY_DIR}">
+			<fileset dir="${DEFAULT_DIR}/slim-backup/deploy/">
+				<include name="*/"/>
+			</fileset>
+		</copy>
+		
+		<copy overwrite="yes" todir="${DEFAULT_DIR}/conf">
+			<fileset dir="${DEFAULT_DIR}/slim-backup/conf">
+				<include name="*.xml"/>
+			</fileset>
+		</copy>
+		
+		<copy overwrite="yes" todir="${DEFAULT_DIR}/lib">
+			<fileset dir="${DEFAULT_DIR}/slim-backup/lib">
+				<include name="*"/>
+			</fileset>
+		</copy>
+	</target>
 </project>