Index: lams_build/3rdParty.userlibraries =================================================================== diff -u -r49cb26ada930a59687956591672498c7f5613d34 -r3cae36fc3c73c4ce595adc48b7ef2f8ac166daaf --- lams_build/3rdParty.userlibraries (.../3rdParty.userlibraries) (revision 49cb26ada930a59687956591672498c7f5613d34) +++ lams_build/3rdParty.userlibraries (.../3rdParty.userlibraries) (revision 3cae36fc3c73c4ce595adc48b7ef2f8ac166daaf) @@ -39,7 +39,7 @@ - + Index: lams_build/common.properties =================================================================== diff -u -r2db2e607da0bf52401be6be673481039dca129e5 -r3cae36fc3c73c4ce595adc48b7ef2f8ac166daaf --- lams_build/common.properties (.../common.properties) (revision 2db2e607da0bf52401be6be673481039dca129e5) +++ lams_build/common.properties (.../common.properties) (revision 3cae36fc3c73c4ce595adc48b7ef2f8ac166daaf) @@ -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/conf/j2ee/lams.application.xml =================================================================== diff -u -r8176135403562bdf207f9477805d0e092915312a -r3cae36fc3c73c4ce595adc48b7ef2f8ac166daaf --- lams_build/conf/j2ee/lams.application.xml (.../lams.application.xml) (revision 8176135403562bdf207f9477805d0e092915312a) +++ lams_build/conf/j2ee/lams.application.xml (.../lams.application.xml) (revision 3cae36fc3c73c4ce595adc48b7ef2f8ac166daaf) @@ -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 =================================================================== diff -u -r8176135403562bdf207f9477805d0e092915312a -r3cae36fc3c73c4ce595adc48b7ef2f8ac166daaf --- lams_build/conf/j2ee/rams.application.xml (.../rams.application.xml) (revision 8176135403562bdf207f9477805d0e092915312a) +++ lams_build/conf/j2ee/rams.application.xml (.../rams.application.xml) (revision 3cae36fc3c73c4ce595adc48b7ef2f8ac166daaf) @@ -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 =================================================================== diff -u -rcb5bbc45ef754c690404ea7e85806386462f4c5e -r3cae36fc3c73c4ce595adc48b7ef2f8ac166daaf --- lams_build/deploy-tool/deploy.bat (.../deploy.bat) (revision cb5bbc45ef754c690404ea7e85806386462f4c5e) +++ lams_build/deploy-tool/deploy.bat (.../deploy.bat) (revision 3cae36fc3c73c4ce595adc48b7ef2f8ac166daaf) @@ -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 =================================================================== diff -u -rcb5bbc45ef754c690404ea7e85806386462f4c5e -r3cae36fc3c73c4ce595adc48b7ef2f8ac166daaf --- lams_build/deploy-tool/deploy.sh (.../deploy.sh) (revision cb5bbc45ef754c690404ea7e85806386462f4c5e) +++ lams_build/deploy-tool/deploy.sh (.../deploy.sh) (revision 3cae36fc3c73c4ce595adc48b7ef2f8ac166daaf) @@ -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-3.1.12-bin.jar =================================================================== diff -u -rf8355425628e9962bafaea9c14df2d36886f1935 -r3cae36fc3c73c4ce595adc48b7ef2f8ac166daaf Binary files differ Index: lams_build/deploy-tool/lib/mysql-connector-java-5.0.8-bin.jar =================================================================== diff -u Binary files differ Index: lams_build/lib/mysql/mysql-connector-java-3.1.12-bin.jar =================================================================== diff -u -rfefb5ab526d3ecf67cecb9622bc1c321e2e6a6ef -r3cae36fc3c73c4ce595adc48b7ef2f8ac166daaf Binary files differ Index: lams_build/lib/mysql/mysql-connector-java-5.0.8-bin.jar =================================================================== diff -u Binary files differ Index: lams_build/liblist.txt =================================================================== diff -u -rdcd39f80c701c5edb1c4663e0c163d8b4c417d2a -r3cae36fc3c73c4ce595adc48b7ef2f8ac166daaf --- lams_build/liblist.txt (.../liblist.txt) (revision dcd39f80c701c5edb1c4663e0c163d8b4c417d2a) +++ lams_build/liblist.txt (.../liblist.txt) (revision 3cae36fc3c73c4ce595adc48b7ef2f8ac166daaf) @@ -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_common/db/sql/updatescripts/Alter21Integration.java =================================================================== diff -u -r6324a77dea1b81e3184b64356fd708f08f2bd0ca -r3cae36fc3c73c4ce595adc48b7ef2f8ac166daaf --- lams_common/db/sql/updatescripts/Alter21Integration.java (.../Alter21Integration.java) (revision 6324a77dea1b81e3184b64356fd708f08f2bd0ca) +++ lams_common/db/sql/updatescripts/Alter21Integration.java (.../Alter21Integration.java) (revision 3cae36fc3c73c4ce595adc48b7ef2f8ac166daaf) @@ -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 =================================================================== diff -u -r406cdd685f03fa39a0ea0c85bde60f7b268bc05d -r3cae36fc3c73c4ce595adc48b7ef2f8ac166daaf --- lams_tool_deploy/.classpath (.../.classpath) (revision 406cdd685f03fa39a0ea0c85bde60f7b268bc05d) +++ lams_tool_deploy/.classpath (.../.classpath) (revision 3cae36fc3c73c4ce595adc48b7ef2f8ac166daaf) @@ -9,7 +9,7 @@ - + Index: lams_tool_deploy/deploy.bat =================================================================== diff -u -r60f8ad90ac03834ede1c4a45585f7f117d5844de -r3cae36fc3c73c4ce595adc48b7ef2f8ac166daaf --- lams_tool_deploy/deploy.bat (.../deploy.bat) (revision 60f8ad90ac03834ede1c4a45585f7f117d5844de) +++ lams_tool_deploy/deploy.bat (.../deploy.bat) (revision 3cae36fc3c73c4ce595adc48b7ef2f8ac166daaf) @@ -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 =================================================================== diff -u -r60f8ad90ac03834ede1c4a45585f7f117d5844de -r3cae36fc3c73c4ce595adc48b7ef2f8ac166daaf --- lams_tool_deploy/deploy.sh (.../deploy.sh) (revision 60f8ad90ac03834ede1c4a45585f7f117d5844de) +++ lams_tool_deploy/deploy.sh (.../deploy.sh) (revision 3cae36fc3c73c4ce595adc48b7ef2f8ac166daaf) @@ -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-3.1.7-bin.jar =================================================================== diff -u -ra174a94fcb9db22380a89926f460afbef0216c91 -r3cae36fc3c73c4ce595adc48b7ef2f8ac166daaf Binary files differ Index: lams_tool_deploy/lib/mysql/mysql-connector-java-5.0.8-bin.jar =================================================================== diff -u Binary files differ Index: lams_tool_deploy/nbproject/project.xml =================================================================== diff -u -r5a1e4424a7fee54a37abf1504b699077bd9f41fa -r3cae36fc3c73c4ce595adc48b7ef2f8ac166daaf --- lams_tool_deploy/nbproject/project.xml (.../project.xml) (revision 5a1e4424a7fee54a37abf1504b699077bd9f41fa) +++ lams_tool_deploy/nbproject/project.xml (.../project.xml) (revision 3cae36fc3c73c4ce595adc48b7ef2f8ac166daaf) @@ -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 =================================================================== diff -u -r60c650cc1ac8f6af6aa7e1381256e718896159ba -r3cae36fc3c73c4ce595adc48b7ef2f8ac166daaf --- lams_tool_forum/lib/lib-jars.text.txt (.../lib-jars.text.txt) (revision 60c650cc1ac8f6af6aa7e1381256e718896159ba) +++ lams_tool_forum/lib/lib-jars.text.txt (.../lib-jars.text.txt) (revision 3cae36fc3c73c4ce595adc48b7ef2f8ac166daaf) @@ -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 =================================================================== diff -u -ra766c8fe51dfa314947b20ef98e525d63b328fbe -r3cae36fc3c73c4ce595adc48b7ef2f8ac166daaf --- lams_tool_nb/conf/middlegen/mysql.xml (.../mysql.xml) (revision a766c8fe51dfa314947b20ef98e525d63b328fbe) +++ lams_tool_nb/conf/middlegen/mysql.xml (.../mysql.xml) (revision 3cae36fc3c73c4ce595adc48b7ef2f8ac166daaf) @@ -7,7 +7,7 @@ --> - +