Index: lams_build/3rdParty.userlibraries
===================================================================
RCS file: /usr/local/cvsroot/lams_build/3rdParty.userlibraries,v
diff -u -r1.40 -r1.40.2.1
--- lams_build/3rdParty.userlibraries	25 Mar 2009 20:50:39 -0000	1.40
+++ lams_build/3rdParty.userlibraries	16 Apr 2009 08:14:16 -0000	1.40.2.1
@@ -39,7 +39,7 @@
 <archive javadoc="http://velocity.apache.org/engine/releases/velocity-1.4/api/" path="/lams_build/lib/middlegen/velocity-1.4-dev.jar"/>
 <archive path="/lams_build/lib/middlegen/middlegen-2.1.jar"/>
 <archive path="/lams_build/lib/middlegen/middlegen-hibernate-plugin-2.1.jar"/>
-<archive path="/lams_build/lib/mysql/mysql-connector-java-3.1.12-bin.jar"/>
+<archive path="/lams_build/lib/mysql/mysql-connector-java-5.0.8-bin.jar"/>
 <archive path="/lams_build/lib/odmg/odmg-3.0.jar"/>
 <archive path="/lams_build/lib/quartz/quartz.jar"/>
 <archive javadoc="http://static.springframework.org/spring/docs/1.2.x/api/" path="/lams_build/lib/spring/spring.jar" source="/lams_build/lib/spring/src/spring-framework-1.2.8-src.zip"/>
Index: lams_build/common.properties
===================================================================
RCS file: /usr/local/cvsroot/lams_build/common.properties,v
diff -u -r1.34 -r1.34.6.1
--- lams_build/common.properties	12 Aug 2008 04:45:00 -0000	1.34
+++ lams_build/common.properties	16 Apr 2009 08:14:17 -0000	1.34.6.1
@@ -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.7.6.1
--- lams_build/liblist.txt	30 Oct 2008 01:25:30 -0000	1.7
+++ lams_build/liblist.txt	16 Apr 2009 08:14:17 -0000	1.7.6.1
@@ -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.12.2.1
--- 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 08:14:17 -0000	1.12.2.1
@@ -170,7 +170,7 @@
 		<java>slf4j-log4j12-1.5.2.jar</java>
 	</module>
 	<module>
-		<java>mysql-connector-java-3.1.12-bin.jar</java>
+		<java>mysql-connector-java-5.0.8-bin.jar</java>
 	</module>
 	<module>
 		<java>odmg-3.0.jar</java>
@@ -261,4 +261,4 @@
     <!--  End Third Party JAR Files -->
     
     <!--  Tools -->
- </application>
\ No newline at end of file
+ </application>
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.10.2.1
--- 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 08:14:17 -0000	1.10.2.1
@@ -170,7 +170,7 @@
 		<java>slf4j-log4j12-1.5.2.jar</java>
 	</module>
 	<module>
-		<java>mysql-connector-java-3.1.12-bin.jar</java>
+		<java>mysql-connector-java-5.0.8-bin.jar</java>
 	</module>
 	<module>
 		<java>odmg-3.0.jar</java>
@@ -261,4 +261,4 @@
     <!--  End Third Party JAR Files -->
     
     <!--  Tools -->
- </application>
\ No newline at end of file
+ </application>
Index: lams_build/deploy-tool/deploy.bat
===================================================================
RCS file: /usr/local/cvsroot/lams_build/deploy-tool/deploy.bat,v
diff -u -r1.3 -r1.3.6.1
--- lams_build/deploy-tool/deploy.bat	17 Jun 2008 10:59:40 -0000	1.3
+++ lams_build/deploy-tool/deploy.bat	16 Apr 2009 08:14:17 -0000	1.3.6.1
@@ -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.3.6.1
--- lams_build/deploy-tool/deploy.sh	17 Jun 2008 10:59:40 -0000	1.3
+++ lams_build/deploy-tool/deploy.sh	16 Apr 2009 08:14:17 -0000	1.3.6.1
@@ -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 -r1.1.2.1 -r1.1.2.2
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 -r1.1.2.1 -r1.1.2.2
Binary files differ
Index: lams_tool_deploy/.classpath
===================================================================
RCS file: /usr/local/cvsroot/lams_tool_deploy/.classpath,v
diff -u -r1.3 -r1.3.6.1
--- lams_tool_deploy/.classpath	30 Oct 2008 03:48:32 -0000	1.3
+++ lams_tool_deploy/.classpath	16 Apr 2009 08:15:02 -0000	1.3.6.1
@@ -9,7 +9,7 @@
 	<classpathentry kind="lib" path="lib/jakarta-commmons/commons-lang-2.0.jar"/>
 	<classpathentry kind="lib" path="lib/jakarta-commmons/commons-logging.jar"/>
 	<classpathentry kind="lib" path="lib/junit/junit.jar"/>
-	<classpathentry kind="lib" path="lib/mysql/mysql-connector-java-3.1.7-bin.jar"/>
+	<classpathentry kind="lib" path="lib/mysql/mysql-connector-java-5.0.8-bin.jar"/>
 	<classpathentry kind="lib" path="test/file/test-dummy.jar"/>
 	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/>
 	<classpathentry kind="lib" path="lib/jakarta-commmons/commons-collections.jar"/>
Index: lams_tool_deploy/deploy.bat
===================================================================
RCS file: /usr/local/cvsroot/lams_tool_deploy/Attic/deploy.bat,v
diff -u -r1.1 -r1.1.6.1
--- lams_tool_deploy/deploy.bat	15 Jun 2005 03:55:07 -0000	1.1
+++ lams_tool_deploy/deploy.bat	16 Apr 2009 08:15:02 -0000	1.1.6.1
@@ -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.1.6.1
--- lams_tool_deploy/deploy.sh	15 Jun 2005 03:55:07 -0000	1.1
+++ lams_tool_deploy/deploy.sh	16 Apr 2009 08:15:02 -0000	1.1.6.1
@@ -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 -r1.1.2.1 -r1.1.2.2
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.2.6.1
--- lams_tool_deploy/nbproject/project.xml	5 Apr 2005 05:43:08 -0000	1.2
+++ lams_tool_deploy/nbproject/project.xml	16 Apr 2009 08:15:02 -0000	1.2.6.1
@@ -58,12 +58,12 @@
         <java-data xmlns="http://www.netbeans.org/ns/freeform-project-java/1">
             <compilation-unit>
                 <package-root>src/java</package-root>
-                <classpath mode="compile">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</classpath>
+                <classpath mode="compile">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</classpath>
                 <source-level>1.4</source-level>
             </compilation-unit>
             <compilation-unit>
                 <package-root>test/java</package-root>
-                <classpath mode="compile">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</classpath>
+                <classpath mode="compile">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</classpath>
                 <source-level>1.4</source-level>
             </compilation-unit>
         </java-data>
Index: lams_tool_forum/conf/language/lams/ApplicationResources.properties
===================================================================
RCS file: /usr/local/cvsroot/lams_tool_forum/conf/language/lams/ApplicationResources.properties,v
diff -u -r1.31.4.1 -r1.31.4.2
--- lams_tool_forum/conf/language/lams/ApplicationResources.properties	15 Apr 2009 04:49:46 -0000	1.31.4.1
+++ lams_tool_forum/conf/language/lams/ApplicationResources.properties	16 Apr 2009 08:16:52 -0000	1.31.4.2
@@ -2,7 +2,11 @@
 #language code: en 
 #locale code: AU 
 
+<<<<<<< ApplicationResources.properties
  # CVS ID: $Id$ Exported from the LAMS Community by Ernie Ghiglione on Fri Nov 14 12:01:43 GMT 2008 
+=======
+ # CVS ID: $Id$ Exported from the LAMS Community by Ernie Ghiglione on Fri Nov 14 12:01:43 GMT 2008 
+>>>>>>> 1.33
  
 #=================== labels for Forum =================# 
 
Index: lams_tool_forum/conf/language/lams/ApplicationResources_en_AU.properties
===================================================================
RCS file: /usr/local/cvsroot/lams_tool_forum/conf/language/lams/ApplicationResources_en_AU.properties,v
diff -u -r1.28.4.1 -r1.28.4.2
--- lams_tool_forum/conf/language/lams/ApplicationResources_en_AU.properties	15 Apr 2009 04:49:46 -0000	1.28.4.1
+++ lams_tool_forum/conf/language/lams/ApplicationResources_en_AU.properties	16 Apr 2009 08:16:52 -0000	1.28.4.2
@@ -2,7 +2,11 @@
 #language code: en 
 #locale code: AU 
 
+<<<<<<< ApplicationResources_en_AU.properties
  # CVS ID: $Id$ Exported from the LAMS Community by Ernie Ghiglione on Fri Nov 14 12:01:43 GMT 2008 
+=======
+ # CVS ID: $Id$ Exported from the LAMS Community by Ernie Ghiglione on Fri Nov 14 12:01:43 GMT 2008 
+>>>>>>> 1.30
  
 #=================== labels for Forum =================# 
 
Index: lams_tool_forum/conf/language/lams/ApplicationResources_it_IT.properties
===================================================================
RCS file: /usr/local/cvsroot/lams_tool_forum/conf/language/lams/ApplicationResources_it_IT.properties,v
diff -u -r1.7.6.1 -r1.7.6.2
--- lams_tool_forum/conf/language/lams/ApplicationResources_it_IT.properties	14 Apr 2009 02:45:58 -0000	1.7.6.1
+++ lams_tool_forum/conf/language/lams/ApplicationResources_it_IT.properties	16 Apr 2009 08:16:53 -0000	1.7.6.2
@@ -2,7 +2,11 @@
 #language code: it 
 #locale code: IT 
 
+<<<<<<< ApplicationResources_it_IT.properties
  # CVS ID: $Id$ Exported from the LAMS Community by Ernie Ghiglione on Mon Apr 13 08:45:03 CST 2009 
+=======
+ # CVS ID: $Id$ Exported from the LAMS Community by Ernie Ghiglione on Mon Apr 13 08:45:03 CST 2009 
+>>>>>>> 1.8
  
 #=================== labels for Forum =================# 
 
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.2.8.1
--- 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:16:53 -0000	1.2.8.1
@@ -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/language/lams/ApplicationResources_el_GR.properties
===================================================================
RCS file: /usr/local/cvsroot/lams_tool_nb/conf/language/lams/ApplicationResources_el_GR.properties,v
diff -u -r1.21.6.1 -r1.21.6.2
--- lams_tool_nb/conf/language/lams/ApplicationResources_el_GR.properties	14 Apr 2009 02:44:19 -0000	1.21.6.1
+++ lams_tool_nb/conf/language/lams/ApplicationResources_el_GR.properties	16 Apr 2009 08:15:48 -0000	1.21.6.2
@@ -2,7 +2,11 @@
 #language code: el 
 #locale code: GR 
 
+<<<<<<< ApplicationResources_el_GR.properties
  # CVS ID: $Id$ Exported from the LAMS Community by Ernie Ghiglione on Mon Apr 13 08:50:03 CST 2009 
+=======
+ # CVS ID: $Id$ Exported from the LAMS Community by Ernie Ghiglione on Mon Apr 13 08:50:03 CST 2009 
+>>>>>>> 1.22
  
 #=================== labels for Noticeboard =================# 
 
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.1.8.1
--- 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 08:15:48 -0000	1.1.8.1
@@ -7,7 +7,7 @@
    <property name="database.script.file"           value="${src.dir}/sql/${name}-mysql.sql"/>
   -->
   
-   <property name="database.driver.file"           value="${sharedlib}/mysql/mysql-connector-java-3.1.7-bin.jar"/>
+   <property name="database.driver.file"           value="${sharedlib}/mysql/mysql-connector-java-5.0.8-bin.jar"/>
    <property name="database.driver.classpath"      value="${database.driver.file}"/>
    <property name="database.driver"                value="org.gjt.mm.mysql.Driver"/>
    <property name="database.url"                   value="jdbc:mysql://localhost/"/>