Index: lams_build/3rdParty.userlibraries =================================================================== RCS file: /usr/local/cvsroot/lams_build/3rdParty.userlibraries,v diff -u -r1.40 -r1.41 --- lams_build/3rdParty.userlibraries 25 Mar 2009 20:50:39 -0000 1.40 +++ lams_build/3rdParty.userlibraries 16 Apr 2009 07:57:32 -0000 1.41 @@ -39,7 +39,7 @@ - + Index: lams_build/common.properties =================================================================== RCS file: /usr/local/cvsroot/lams_build/common.properties,v diff -u -r1.34 -r1.35 --- lams_build/common.properties 12 Aug 2008 04:45:00 -0000 1.34 +++ lams_build/common.properties 16 Apr 2009 07:57:32 -0000 1.35 @@ -49,7 +49,7 @@ db.encoding=utf8 db.username=lams db.password=lamsdemo -db.driver.jar=${sharedlib}/mysql/mysql-connector-java-3.1.12-bin.jar +db.driver.jar=${sharedlib}/mysql/mysql-connector-java-5.0.8-bin.jar db.scripts=${basedir}/db/sql db.schema= db.catalog= Index: lams_build/liblist.txt =================================================================== RCS file: /usr/local/cvsroot/lams_build/liblist.txt,v diff -u -r1.7 -r1.8 --- lams_build/liblist.txt 30 Oct 2008 01:25:30 -0000 1.7 +++ lams_build/liblist.txt 16 Apr 2009 07:57:32 -0000 1.8 @@ -50,7 +50,7 @@ log4j log4j-1.2.13.jar 1.2.13 -mysql mysql-connector-java-3.1.12-bin.jar 3.1.12-bin +mysql mysql-connector-java-5.0.8-bin.jar 5.0.8-bin odmg odmg-3.0.jar 3.0 Index: lams_build/conf/j2ee/lams.application.xml =================================================================== RCS file: /usr/local/cvsroot/lams_build/conf/j2ee/lams.application.xml,v diff -u -r1.12 -r1.13 --- lams_build/conf/j2ee/lams.application.xml 9 Apr 2009 05:03:02 -0000 1.12 +++ lams_build/conf/j2ee/lams.application.xml 16 Apr 2009 07:57:32 -0000 1.13 @@ -170,7 +170,7 @@ slf4j-log4j12-1.5.2.jar - mysql-connector-java-3.1.12-bin.jar + mysql-connector-java-5.0.8-bin.jar odmg-3.0.jar @@ -261,4 +261,4 @@ - \ No newline at end of file + Index: lams_build/conf/j2ee/rams.application.xml =================================================================== RCS file: /usr/local/cvsroot/lams_build/conf/j2ee/Attic/rams.application.xml,v diff -u -r1.10 -r1.11 --- lams_build/conf/j2ee/rams.application.xml 9 Apr 2009 05:03:02 -0000 1.10 +++ lams_build/conf/j2ee/rams.application.xml 16 Apr 2009 07:57:32 -0000 1.11 @@ -170,7 +170,7 @@ slf4j-log4j12-1.5.2.jar - mysql-connector-java-3.1.12-bin.jar + mysql-connector-java-5.0.8-bin.jar odmg-3.0.jar @@ -261,4 +261,4 @@ - \ No newline at end of file + Index: lams_build/deploy-tool/deploy.bat =================================================================== RCS file: /usr/local/cvsroot/lams_build/deploy-tool/deploy.bat,v diff -u -r1.3 -r1.4 --- lams_build/deploy-tool/deploy.bat 17 Jun 2008 10:59:40 -0000 1.3 +++ lams_build/deploy-tool/deploy.bat 16 Apr 2009 07:57:32 -0000 1.4 @@ -1,2 +1,2 @@ -java -classpath lib/lams-tool-deploy.jar;lib/commons-configuration-1.1.jar;lib/commons-lang-2.0.jar;lib/commons-collections.jar;lib/commons-logging.jar;lib/commons-io-1.0.jar;lib/commons-dbutils-1.0.jar;lib/mysql-connector-java-3.1.12-bin.jar;lib/xstream-1.1.2.ja +java -classpath lib/lams-tool-deploy.jar;lib/commons-configuration-1.1.jar;lib/commons-lang-2.0.jar;lib/commons-collections.jar;lib/commons-logging.jar;lib/commons-io-1.0.jar;lib/commons-dbutils-1.0.jar;lib/mysql-connector-java-5.0.8-bin.jar;lib/xstream-1.1.2.ja r org.lamsfoundation.lams.tool.deploy.Deploy ./deploy.properties True Index: lams_build/deploy-tool/deploy.sh =================================================================== RCS file: /usr/local/cvsroot/lams_build/deploy-tool/deploy.sh,v diff -u -r1.3 -r1.4 --- lams_build/deploy-tool/deploy.sh 17 Jun 2008 10:59:40 -0000 1.3 +++ lams_build/deploy-tool/deploy.sh 16 Apr 2009 07:57:32 -0000 1.4 @@ -1,3 +1,3 @@ #!/bin/sh -java -classpath lib/lams-tool-deploy.jar:lib/commons-configuration-1.1.jar:lib/commons-lang-2.0.jar:lib/commons-collections.jar:lib/commons-logging.jar:lib/commons-io-1.0.jar:lib/commons-dbutils-1.0.jar:lib/mysql-connector-java-3.1.12-bin.jar;lib/xstream-1.1.2.ja +java -classpath lib/lams-tool-deploy.jar:lib/commons-configuration-1.1.jar:lib/commons-lang-2.0.jar:lib/commons-collections.jar:lib/commons-logging.jar:lib/commons-io-1.0.jar:lib/commons-dbutils-1.0.jar:lib/mysql-connector-java-5.0.8-bin.jar;lib/xstream-1.1.2.ja r org.lamsfoundation.lams.tool.deploy.Deploy ./deploy.properties True Index: lams_build/deploy-tool/lib/mysql-connector-java-5.0.8-bin.jar =================================================================== RCS file: /usr/local/cvsroot/lams_build/deploy-tool/lib/mysql-connector-java-5.0.8-bin.jar,v diff -u Binary files differ Index: lams_build/lib/mysql/mysql-connector-java-5.0.8-bin.jar =================================================================== RCS file: /usr/local/cvsroot/lams_build/lib/mysql/mysql-connector-java-5.0.8-bin.jar,v diff -u Binary files differ Index: lams_common/db/sql/updatescripts/Alter21Integration.java =================================================================== RCS file: /usr/local/cvsroot/lams_common/db/sql/updatescripts/Attic/Alter21Integration.java,v diff -u -r1.3 -r1.4 --- lams_common/db/sql/updatescripts/Alter21Integration.java 15 Nov 2007 00:53:00 -0000 1.3 +++ lams_common/db/sql/updatescripts/Alter21Integration.java 16 Apr 2009 07:59:55 -0000 1.4 @@ -45,7 +45,7 @@ if (args.length < 3) { System.out.println("Usage: java Alter21Integration DB_NAME DB_USERNAME DB_PASSWORD"); - System.out.println("Make sure mysql-connector-java-3.x.x-bin.jar is in your classpath."); + System.out.println("Make sure mysql-connector-java-5.0.x-bin.jar is in your classpath."); System.exit(1); } Index: lams_tool_deploy/.classpath =================================================================== RCS file: /usr/local/cvsroot/lams_tool_deploy/.classpath,v diff -u -r1.3 -r1.4 --- lams_tool_deploy/.classpath 30 Oct 2008 03:48:32 -0000 1.3 +++ lams_tool_deploy/.classpath 16 Apr 2009 07:58:13 -0000 1.4 @@ -9,7 +9,7 @@ - + Index: lams_tool_deploy/deploy.bat =================================================================== RCS file: /usr/local/cvsroot/lams_tool_deploy/Attic/deploy.bat,v diff -u -r1.1 -r1.2 --- lams_tool_deploy/deploy.bat 15 Jun 2005 03:55:07 -0000 1.1 +++ lams_tool_deploy/deploy.bat 16 Apr 2009 07:58:13 -0000 1.2 @@ -1 +1 @@ -java -classpath lib/lams-tool-deploy.jar;lib/commons-configuration-1.1.jar;lib/commons-lang-2.0.jar;lib/commons-collections.jar;lib/commons-logging.jar;lib/commons-io-1.0.jar;lib/commons-dbutils-1.0.jar;lib/mysql-connector-java-3.1.7-bin.jar org.lamsfoundation.lams.tool.deploy.Deploy ./deploy.properties +java -classpath lib/lams-tool-deploy.jar;lib/commons-configuration-1.1.jar;lib/commons-lang-2.0.jar;lib/commons-collections.jar;lib/commons-logging.jar;lib/commons-io-1.0.jar;lib/commons-dbutils-1.0.jar;lib/mysql-connector-java-5.0.8-bin.jar org.lamsfoundation.lams.tool.deploy.Deploy ./deploy.properties Index: lams_tool_deploy/deploy.sh =================================================================== RCS file: /usr/local/cvsroot/lams_tool_deploy/Attic/deploy.sh,v diff -u -r1.1 -r1.2 --- lams_tool_deploy/deploy.sh 15 Jun 2005 03:55:07 -0000 1.1 +++ lams_tool_deploy/deploy.sh 16 Apr 2009 07:58:13 -0000 1.2 @@ -1,4 +1,4 @@ #!/bin/sh -java -classpath lib/lams-tool-deploy.jar:lib/commons-configuration-1.1.jar:lib/commons-lang-2.0.jar:lib/commons-collections.jar:lib/commons-logging.jar:lib/commons-io-1.0.jar:lib/commons-dbutils-1.0.jar:lib/mysql-connector-java-3.1.7-bin.jar org.lamsfoundation.lams.tool.deploy.Deploy ./deploy.properties +java -classpath lib/lams-tool-deploy.jar:lib/commons-configuration-1.1.jar:lib/commons-lang-2.0.jar:lib/commons-collections.jar:lib/commons-logging.jar:lib/commons-io-1.0.jar:lib/commons-dbutils-1.0.jar:lib/mysql-connector-java-5.0.8-bin.jar org.lamsfoundation.lams.tool.deploy.Deploy ./deploy.properties Index: lams_tool_deploy/lib/mysql/mysql-connector-java-5.0.8-bin.jar =================================================================== RCS file: /usr/local/cvsroot/lams_tool_deploy/lib/mysql/Attic/mysql-connector-java-5.0.8-bin.jar,v diff -u Binary files differ Index: lams_tool_deploy/nbproject/project.xml =================================================================== RCS file: /usr/local/cvsroot/lams_tool_deploy/nbproject/project.xml,v diff -u -r1.2 -r1.3 --- lams_tool_deploy/nbproject/project.xml 5 Apr 2005 05:43:08 -0000 1.2 +++ lams_tool_deploy/nbproject/project.xml 16 Apr 2009 07:58:14 -0000 1.3 @@ -58,12 +58,12 @@ src/java - lib/ant/ant.jar:lib/jakarta-commmons/commons-dbutils-1.0.jar:lib/mysql/mysql-connector-java-3.1.7-bin.jar:lib/jakarta-commmons/commons-configuration-1.1.jar:lib/jakarta-commmons/commons-lang-2.0.jar:lib/jakarta-commmons/commons-collections-3.1.jar:lib/jakarta-commmons/commons-logging.jar:lib/jakarta-commmons/commons-io-1.0.jar + lib/ant/ant.jar:lib/jakarta-commmons/commons-dbutils-1.0.jar:lib/mysql/mysql-connector-java-5.0.8-bin.jar:lib/jakarta-commmons/commons-configuration-1.1.jar:lib/jakarta-commmons/commons-lang-2.0.jar:lib/jakarta-commmons/commons-collections-3.1.jar:lib/jakarta-commmons/commons-logging.jar:lib/jakarta-commmons/commons-io-1.0.jar 1.4 test/java - src/java:lib/ant/ant.jar:lib/jakarta-commmons/commons-dbutils-1.0.jar:lib/mysql/mysql-connector-java-3.1.7-bin.jar:lib/junit/junit.jar:lib/jakarta-commmons/commons-configuration-1.1.jar:lib/jakarta-commmons/commons-lang-2.0.jar:lib/jakarta-commmons/commons-collections-3.1.jar:lib/jakarta-commmons/commons-logging.jar:lib/jakarta-commmons/commons-io-1.0.jar + src/java:lib/ant/ant.jar:lib/jakarta-commmons/commons-dbutils-1.0.jar:lib/mysql/mysql-connector-java-5.0.8-bin.jar:lib/junit/junit.jar:lib/jakarta-commmons/commons-configuration-1.1.jar:lib/jakarta-commmons/commons-lang-2.0.jar:lib/jakarta-commmons/commons-collections-3.1.jar:lib/jakarta-commmons/commons-logging.jar:lib/jakarta-commmons/commons-io-1.0.jar 1.4 Index: lams_tool_forum/lib/lib-jars.text.txt =================================================================== RCS file: /usr/local/cvsroot/lams_tool_forum/lib/lib-jars.text.txt,v diff -u -r1.2 -r1.3 --- lams_tool_forum/lib/lib-jars.text.txt 8 Jul 2005 02:35:02 -0000 1.2 +++ lams_tool_forum/lib/lib-jars.text.txt 16 Apr 2009 08:02:34 -0000 1.3 @@ -14,7 +14,7 @@ commons-collections-3.1 dom4j-1.4 log4j -mysql-connector-java-3.1.8-bin +mysql-connector-java-5.0.8-bin jta commons-beanutils commons-validator Index: lams_tool_nb/conf/middlegen/mysql.xml =================================================================== RCS file: /usr/local/cvsroot/lams_tool_nb/conf/middlegen/mysql.xml,v diff -u -r1.1 -r1.2 --- lams_tool_nb/conf/middlegen/mysql.xml 7 Jun 2005 05:52:18 -0000 1.1 +++ lams_tool_nb/conf/middlegen/mysql.xml 16 Apr 2009 07:59:02 -0000 1.2 @@ -7,7 +7,7 @@ --> - +