Index: unix_installer/upgrader-package/build.xml
===================================================================
RCS file: /usr/local/cvsroot/unix_installer/upgrader-package/build.xml,v
diff -u -r1.9 -r1.10
--- unix_installer/upgrader-package/build.xml	5 May 2009 05:59:12 -0000	1.9
+++ unix_installer/upgrader-package/build.xml	4 Jan 2011 18:52:30 -0000	1.10
@@ -2,9 +2,9 @@
 
 <project name="Unix-Updater-Build-Script" default="build" basedir=".">
 
- 	<property name="VERSION" value="2.3" />
+ 	<property name="VERSION" value="2.3.5" />
  	<property name="PACKAGE-ROOT" value="build/lams-unix-updater-${VERSION}" />
-	<property name="LAMS_PROJECT_ROOT" value="../.." />
+	<property name="LAMS_PROJECT_ROOT" value="/usr/local/lams2/" />
 	<property name="TOOLS" value="tools" />
 	<property name="db.username" value="lams" />
 	<property name="db.password" value="lamsdemo" />
@@ -38,7 +38,7 @@
 		    <arg line="ant-scripts" />
 		    <arg line="assembly" />
 			<arg line="conf" />
-			<arg line="language-pack" />
+<!--			<arg line="language-pack" /> -->
 			<arg line="sql-scripts" />
 			<arg line="tools" />
 			<arg line="license" />
@@ -48,6 +48,11 @@
 			<arg line="lams.properties" />
 			<arg line="${PACKAGE-ROOT}" />
 		</exec>
+
+		<!-- Change permissions to executables -->
+		<chmod file="${PACKAGE-ROOT}/ant/bin/ant" perm="ugo+rx"/>
+		<chmod file="${PACKAGE-ROOT}/update-lams.sh" perm="ugo+rx"/>
+
 		
 		<!-- Remove all the CVS directories -->
         <exec executable="/bin/bash" failonerror="true">
@@ -79,26 +84,6 @@
 			<param name="tool.sig" value="laasse10" /> 
 		</antcall>
 		
-        <antcall target="copy-tool-deploy-package"> 
-            <param name="tool.dir" value="lams_tool_images" /> 
-            <param name="tool.sig" value="laimag10" /> 
-        </antcall>	
-		
-        <antcall target="copy-tool-deploy-package"> 
-            <param name="tool.dir" value="lams_tool_mindmap" /> 
-            <param name="tool.sig" value="lamind10" /> 
-        </antcall>	
-		
-        <antcall target="copy-tool-deploy-package"> 
-            <param name="tool.dir" value="lams_tool_pixlr" /> 
-            <param name="tool.sig" value="lapixl10" /> 
-        </antcall>	
-		
-        <antcall target="copy-tool-deploy-package"> 
-            <param name="tool.dir" value="lams_tool_videorecorder" /> 
-            <param name="tool.sig" value="lavidr10" /> 
-        </antcall>	
-		
     </target>
 	
     <target name="copy-tool-deploy-package" description="Copies the tools deploy packages after it has been built">
Index: unix_installer/upgrader-package/lams.properties
===================================================================
RCS file: /usr/local/cvsroot/unix_installer/upgrader-package/lams.properties,v
diff -u -r1.11 -r1.12
--- unix_installer/upgrader-package/lams.properties	26 May 2009 01:53:37 -0000	1.11
+++ unix_installer/upgrader-package/lams.properties	4 Jan 2011 18:52:30 -0000	1.12
@@ -122,9 +122,9 @@
 SQL_JAR=mysql-connector-java-5.0.8-bin.jar
 
 # The version of this LAMS updater
-LAMS_VERSION=2.3
-LAMS_SERVER_VERSION=2.3.0.200905220000
-LAMS_LANGUAGE_VERSION=2009-05-22
+LAMS_VERSION=2.3.5
+LAMS_SERVER_VERSION=2.3.5.201012150000
+LAMS_LANGUAGE_VERSION=2009-12-15
 
 #########################################################################################
 
Index: unix_installer/upgrader-package/license
===================================================================
RCS file: /usr/local/cvsroot/unix_installer/upgrader-package/license,v
diff -u -r1.4 -r1.5
--- unix_installer/upgrader-package/license	5 May 2009 05:59:11 -0000	1.4
+++ unix_installer/upgrader-package/license	4 Jan 2011 18:52:30 -0000	1.5
@@ -1,41 +1,47 @@
-LAMS 2.3 is released under the GPL license detailed below.  This package
+LAMS 2.3.5 is released under the GPL license detailed below.  This package
 also includes other libraries/packages, whose respective licenses are
 detailed below.
 
 Library/Package				License
 --------------------------------------------------------------------------------
-antlr.jar				Antlr 3 License
+aspirin.jar				Apache License 2.0
+batik-1.7.ja				Apache License 2.0
+dnsjava-2.0.6.jar				BSD License
+wrapper.jar				Silver Egg Techology License (see license-wrapper.txt)
+antlr.jar					Antlr 3 License
 axis-ant.jar 				Apache License 2.0
-axis.jar				Apache License 2.0
+axis.jar					Apache License 2.0
 cglib-nodep-2.1_2.jar			Apache License 2.0
 cglib_jboss404GA.jar			Apache License 2.0
 commons-beanutils.jar			Apache License 2.0
 commons-codec-1.3.jar			Apache License 2.0
 commons-collections.jar			Apache License 2.0
 commons-digester.jar			Apache License 2.0
-commons-discovery-0.2.jar		Apache Software License 1.1
+commons-discovery-0.2.jar			Apache Software License 1.1
 commons-fileupload.jar			Apache Software License 1.1
 commons-lang-2.0.jar			Apache Software License 1.1
 commons-logging.jar			Apache License 2.0
 commons-validator.jar			Apache License 2.0
-FCKeditor-2.3.jar			CDL Closed Distribution License
+FCKeditor-2.3.jar				CDL Closed Distribution License
 gnujaxp.jar				GNU General Public License
 hibernate3.jar				GNU General Public License
 jakarta-oro.jar				Apache Software License 1.1
-jaxrpc.jar				GNU Lesser General Public Licence
+jaxrpc.jar					CDDL (Common Development and 
+					Distribution License 1.0)
+JBoss 4.0.2				GNU Lesser General Public Licence
 jboss-cache.jar				GNU Lesser General Public Licence
-jboss-common.jar			GNU Lesser General Public Licence
+jboss-common.jar				GNU Lesser General Public Licence
 jboss-jmx.jar				GNU Lesser General Public Licence
-jboss-system.jar			GNU Lesser General Public Licence
-jcommon-1.0.0.jar			GNU Lesser General Public Licence
-jdom.jar				Jdom Jar License
-jfreechart-1.0.1.jar			GNU Lesser General Public Licence
+jboss-system.jar				GNU Lesser General Public Licence
+jcommon-1.0.0.jar				GNU Lesser General Public Licence
+jdom.jar					Jdom Jar License
+jfreechart-1.0.1.jar				GNU Lesser General Public Licence
 jgroups.jar				GNU Lesser General Public Licence
 jmock-2003-03-19.jar			jMock Project License
-joda-time-0.98.jar			Joda Software License 1.0
+joda-time-0.98.jar				Joda Software License 1.0
 jsMath					Apache License 2.0
-jstl.jar				JSTL License 1.1
-log4j-1.2.13.jar			Apache Software License 1.1
+jstl.jar					JSTL License 1.1
+log4j-1.2.13.jar				Apache Software License 1.1
 mysql-connector-				(CDDL Common Development and 
   java-3.1.12-bin-jar	    		Distribution License 1.0)
 odmg-3.0.jar				ODMG 2.0 
@@ -44,32 +50,32 @@
 quartz.jar				Apache License 2.0
 saaj.jar					(CDDL Common Development and 
 					Distribution License 1.0)
-smack.jar				Apache License 2.0
+smack.jar					Apache License 2.0
 smackx.jar				Apache License 2.0
-spring.jar				Apache License 2.0
+spring.jar					Apache License 2.0
 standard.jar				Apache License 2.0
 struts-el.jar				Apache License 2.0
-struts.jar				Apache License 2.0	
-wddx.jar				GNU General Public License
-wsdl4j-1.5.1.jar			CPL Common Public License 0.5 
-xml-writer-0.2.jar			XML-Write License
+struts.jar					Apache License 2.0	
+wddx.jar					GNU General Public License
+wsdl4j-1.5.1.jar				CPL Common Public License 0.5 
+xml-writer-0.2.jar				XML-Write License
 xom-1.0.b3.jar				GNU Lesser General Public License
 xpp3-1.1.3.4d_b4.jar			XPP3 License
 xstream-1.1.jar				xstream Licanse
 
-SHARE RECOURCES LIBRARY LICENSES
+SHARE RESOURCES LIBRARY LICENSES
 castor-0.9.5.3-xml.jar			Castor License
-jdom.jar				Jdom Jar License
+jdom.jar					Jdom Jar License
 moonunitsrc.jar				Reload License
 reload-diva.jar				Reload License
-reload-editor.jar			Reload License
+reload-editor.jar				Reload License
 reload-jdom.jar				Reload License
-reload-moonunit.jar			Reload License
+reload-moonunit.jar				Reload License
 xercesImpl.jar 				Apache Software License 1.1
 xml-apis.jar 				Apache Software License 1.1
 jaxen-full.jar 				Jaxen Jar License (The Werken 
 					Company)
-sax.jar 				Public Domain
+sax.jar 					Public Domain
 saxpath.jar				Jaxen Jar License (The Werken 
 					Company)
 --------------------------------------------------------------------------------
@@ -2600,4 +2606,4 @@
  * <http://www.apache.org/>.
  */
  
-  ========================================================
+  ========================================================
\ No newline at end of file
Index: unix_installer/upgrader-package/readme
===================================================================
RCS file: /usr/local/cvsroot/unix_installer/upgrader-package/readme,v
diff -u -r1.13 -r1.14
Binary files differ
Index: unix_installer/upgrader-package/update-lams.sh
===================================================================
RCS file: /usr/local/cvsroot/unix_installer/upgrader-package/update-lams.sh,v
diff -u -r1.15 -r1.16
Binary files differ
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.15 -r1.16
--- unix_installer/upgrader-package/ant-scripts/update-lams.xml	26 May 2009 01:52:10 -0000	1.15
+++ unix_installer/upgrader-package/ant-scripts/update-lams.xml	4 Jan 2011 18:52:30 -0000	1.16
@@ -29,70 +29,28 @@
 	
     <!-- Main Task, calls all the other tasks -->
     <target name="update-lams" description="Runs the entire update process">
-        <!--<antcall target="configure-jboss" />-->
-        <!--<antcall target="copy-core-jars-wars" />-->
     	
-    	
-        <antcall target="update-core-database" />
-        <!-- <target="update-mysql-ds" /> -->
+<!-- 
+        <antcall target="copy-core-jars-wars" />
         <antcall target="update-lams-www-war" />
     	<antcall target="update-lams-central-war" />
-    	
-    	<antcall target="deploy-new-tools" />
-    	
-    	<antcall target="update-application-xml" />
-    	
-    	<antcall target="update-2.3-specific"/>
-    	
         <antcall target="language-pack" />
+-->
+    	<antcall target="deploy-new-tools" />
         <antcall target="set-lams-configuration" />
     </target>
 
-
-    <target name="configure-jboss" description="Copying jboss-cash.jar and jgroups.jar from server/all/lib to ${DEFAULT_DIR}/lib">
-        <echo message="Copying jboss-cache.jar and jgroups.jar from ${JBOSS_DIR}/server/all/lib to ${DEFAULT_DIR}/lib"/>
-        <copy file="${JBOSS_DIR}/server/all/lib/jboss-cache.jar" todir="${DEFAULT_DIR}/lib" failonerror="true" overwrite="true" />
-        <copy file="${JBOSS_DIR}/server/all/lib/jgroups.jar" todir="${DEFAULT_DIR}/lib" failonerror="true" overwrite="true" />
-
-        <copy todir="${JBOSS_DIR}/bin" overwrite="true" failonerror="true">
-            <fileset dir="../bin/">
-                <include name="run-lams.sh" />
-            </fileset>
-            <filterset> 
-                <filter token="JAVA_HOME" value="${JDK_DIR}" />
-            </filterset>
-        </copy>
-
-        <chmod file="${JBOSS_DIR}/bin/run-lams.sh" perm="755"/>
-    </target>
-
     <target name="copy-core-jars-wars" description="Overwrites lams.ear files built from assemble-ear ant task. Does not deploy tools">
         <echo message="Overwriting assembled files into the deploy directory"/>
         <copy todir="${DEPLOY_DIR}/lams.ear" overwrite="true">
             <fileset dir="../assembly/lams.ear" >
                 <exclude name="*.bak"/>
                 <exclude name="*.tmp"/>
-                <exclude name="**/lams-www.war/**"/>
-                <exclude name="**/META-INF/**"/>
-                <exclude name="**/lams-dictionary.jar/org/lamsfoundation/lams/library/**"/>
             </fileset>
         </copy>
-
-        <copy todir="${DEFAULT_DIR}/lib" overwrite="true">
-            <fileset dir="../assembly">
-                <include name="lams-valve.jar"/>
-                <include name="lams-session.jar"/>
-            </fileset>
-        </copy> 
-    
         <echo message="lams.ear successfully updated"/>
     </target>
 
-    <target name="update-core-database" description="Runs the sql scripts required to update the database">
-        <echo>Updating core database</echo>
-        <ant antfile="update-core-database.xml" output="../log/update-core-database.log" target="update-core-database" />
-    </target>
-
     <target name="update-lams-www-war" description="Updates files in lams-www.war">
         <echo>Updating lams-www.war</echo>
 
@@ -181,10 +139,6 @@
             <transaction src="../sql-scripts/updateLocales.sql" />
         </sql>
 
-		<!--
-    	<ant antfile="language-pack.xml" output="../log/language-pack.log" target="update-languages" inheritAll="true">
-        </ant>
-        -->
     </target>
 
 
@@ -205,23 +159,10 @@
     	
     	<echo>Deploying new tools</echo>
     	
-    	<!-- ============= 2.3 Tools ============== -->
+    	<!-- ============= 2.3.5 Tools ============== -->
     	<antcall target="deploy-new-tool">
-    	   	<param name="signature" value="laasse10"/>
+    	   	<param name="signature" value="eueadv10"/>
     	</antcall>
-    	<antcall target="deploy-new-tool">
-    	   	<param name="signature" value="laimag10"/>
-    	</antcall>
-    	<antcall target="deploy-new-tool">
-    	   	<param name="signature" value="lamind10"/>
-    	</antcall>
-    	<antcall target="deploy-new-tool">
-    	   	<param name="signature" value="lapixl10"/>
-    	</antcall>
-    	<antcall target="deploy-new-tool">
-    	   	<param name="signature" value="lavidr10"/>
-    	</antcall>
-    	<!-- ============= 2.3 Tools ============== -->
     	
     	<!--<antcall target="compress-wars"/>-->
     </target>
@@ -240,18 +181,6 @@
             <property name="prop.path" value="${signature}"/>
         </ant>
    	</target>
-	
-	<target name="update-application-xml" description="Updates application.xml to include all required modules for the current version">
-		<ant antfile="update-deploy-tools.xml" output="../log/update-application-xml.log" target="update-application-xml">
-            <property name="prop.path" value="lachat11"/>
-        </ant>
-	</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.war/images/pixlr"/>
-		<copy file="../tools/lapixl10/blank.jpg" todir="${EAR_DIR}/lams-www.war/images/pixlr" verbose="true"/>
-	</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" 
@@ -265,89 +194,4 @@
             <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>
Index: unix_installer/upgrader-package/java/backup.java
===================================================================
RCS file: /usr/local/cvsroot/unix_installer/upgrader-package/java/backup.java,v
diff -u -r1.4 -r1.5
--- unix_installer/upgrader-package/java/backup.java	20 Nov 2008 23:22:49 -0000	1.4
+++ unix_installer/upgrader-package/java/backup.java	4 Jan 2011 18:52:30 -0000	1.5
@@ -30,7 +30,7 @@
 		{
 			System.out.println("Copying files from " + jbossdir + "/ to " + backupdir + "/jboss-4.0.2/ ...");
 			copyFiles(jbossdir + "/", backupdir+"/jboss-4.0.2/");
-			copyFiles(etcdir + "/", backupdir+"/ectlams2/");
+			copyFiles(etcdir + "/", backupdir+"/etc-lams2/");
 			copyFiles(repositoryDir + "/", backupdir+"/repository/");
 			System.out.println("Done.\n");
 		}
@@ -201,7 +201,7 @@
 		try
 		{
 			FileWriter outfile = new FileWriter("bin/lamsdump.sql");
-			outfile.write(mysqldir+ "/mysqldump -u" +dbuser+ " -p" +dbpass+ " -h" +dbhost+ " -P" +dbport+
+			outfile.write(mysqldir+ "/mysqldump --hex-blob -u" +dbuser+ " -p" +dbpass+ " -h" +dbhost+ " -P" +dbport+
 					" " +dbname+ " > " +backupdir+ "/dump.sql");
 			outfile.close();
 		}
Index: unix_installer/upgrader-package/sql-scripts/setLamsConfiguration.sql
===================================================================
RCS file: /usr/local/cvsroot/unix_installer/upgrader-package/sql-scripts/setLamsConfiguration.sql,v
diff -u -r1.9 -r1.10
Binary files differ
Index: unix_installer/upgrader-package/sql-scripts/updateLocales.sql
===================================================================
RCS file: /usr/local/cvsroot/unix_installer/upgrader-package/sql-scripts/updateLocales.sql,v
diff -u -r1.5 -r1.6
--- unix_installer/upgrader-package/sql-scripts/updateLocales.sql	26 May 2009 01:53:15 -0000	1.5
+++ unix_installer/upgrader-package/sql-scripts/updateLocales.sql	4 Jan 2011 18:57:40 -0000	1.6
@@ -1,23 +1 @@
--- Fixing Japanese language string. See LDEV-1702
--- checks if the languages in the language pack exist
--- inserts rows into lams_supported_locale iff the languages dont exist
-drop table if exists locale_temp;
-
-create table locale_temp  (
-     language_iso_code VARCHAR(2) NOT NULL
-     , country_iso_code VARCHAR(2)
-     , description VARCHAR(255) NOT NULL
-     , direction VARCHAR(3) NOT NULL
-     , combined VARCHAR(5) NOT NULL
-     , fckeditor_code VARCHAR(10) 
-)TYPE=InnoDB;
-
--- the combined column must be 'language_iso_code,country_iso_code' or 'language_iso_code'. It must match the value
--- given by SELECT CONCAT_WS(',',l.language_iso_code,l.country_iso_code) FROM lams_supported_locale l
-
-INSERT INTO lams_supported_locale (language_iso_code, country_iso_code, description, direction, fckeditor_code) 
-(SELECT t.language_iso_code, t.country_iso_code, t.description, t.direction, t.fckeditor_code
-FROM locale_temp t WHERE t.combined NOT IN
-(SELECT CONCAT_WS(',',l.language_iso_code,l.country_iso_code) FROM lams_supported_locale l));
-drop table if exists locale_temp;
-
+-- No updates for locales in LAMS 2.3.5 (check previous version if needed)
\ No newline at end of file