Index: lams_webct_integration/build.properties
===================================================================
RCS file: /usr/local/cvsroot/lams_webct_integration/build.properties,v
diff -u -r1.4 -r1.5
--- lams_webct_integration/build.properties	20 Dec 2007 00:51:49 -0000	1.4
+++ lams_webct_integration/build.properties	8 Jan 2008 02:48:55 -0000	1.5
@@ -4,8 +4,8 @@
 # WEBCT SETTINGS	 
 #############################
 
-# Location of WebCt Domain Directory
-webctDomainDir=C:/bea815/weblogic81/config/WebCTDomain/
+# Location of WebCt deployablecomponents directory
+webctDeployableComponentsDir=C:/bea815/weblogic81/config/WebCTDomain/deployablecomponents
 
 ##############################
 
Index: lams_webct_integration/build.xml
===================================================================
RCS file: /usr/local/cvsroot/lams_webct_integration/build.xml,v
diff -u -r1.5 -r1.6
--- lams_webct_integration/build.xml	20 Dec 2007 00:51:49 -0000	1.5
+++ lams_webct_integration/build.xml	8 Jan 2008 02:48:55 -0000	1.6
@@ -10,6 +10,7 @@
 	
 
 	<property name="build" value="${basedir}/build"/>
+	<property name="package" value="${basedir}/package"/>
 	<property name="build.web" value="${build}/web"/>
 	<property name="build.lib" value="${build}/lib"/>
 	<property name="build.webinf" value="${build}/WEB-INF"/>
@@ -26,11 +27,15 @@
 	<property name="src" value="${basedir}/src/org/"/>
 	<property name="web" value="${basedir}/web"/>
 	<property name="webinf" value="${basedir}/WEB-INF"/>
-	<property name="deploy.dir" value="${webctDomainDir}/deployablecomponents/lams2" />
-	<property name="jarfile" value="${build}/${product}-${version}.jar"/>
+	<property name="deploy.dir" value="${webctDeployableComponentsDir}/lams2" />
+	<property name="jar" value="${product}-${version}.jar"/>
+	<property name="jarfile" value="${build}/${jar}"/>
 	
+	<property name="package.dir" value="${package}/${product}-${version}/"/>
+	<property name="package.db" value="${package.dir}/db/"/>
+	<property name="package.deploy" value="${package.dir}/deploy/"/>
+	<property name="package.lib" value="${package.dir}/lib"/>
 	
-	
 	<path id="project.classpath">
 		<!-- If Eclipse is not used, this should be ${build.classes} -->
 		<pathelement location="${classes}" />
@@ -57,7 +62,46 @@
 	<!-- ================================================================ -->
 	<!-- making the jar packages						    	          -->
 	<!-- ================================================================ -->
-   <target name="compile" depends="clean, preparedirs" description="compile java sources">
+   
+	
+	<target name="copy" description="Copy files to build dir">
+		<copy todir="${build}" overwrite="true">
+   			<fileset dir="${basedir}">
+   			      <include name="DeployableComponentConfig.xml"/>
+   			</fileset>
+   			<filterset>
+   				<filter token="dbUrl" value="${dbUrl}" />
+   				<filter token="dbPort" value="${dbPort}" />
+   				<filter token="dbName" value="${dbName}" />
+   				<filter token="dbUser" value="${dbUser}" />
+   				<filter token="dbDriver" value="${dbDriver}" />
+   				<filter token="dbTable" value="${dbTable}" />
+   				<filter token="dbPass" value="${dbPass}" />
+   				<filter token="lamsServerUrl" value="${lamsServerUrl}" />
+   				<filter token="serverId" value="${serverId}" />
+   				<filter token="secretKey" value="${secretKey}" />
+   				<filter token="reqSrc" value="${reqSrc}" />
+   				<filter token="imgUrl" value="${imgUrl}" />
+   			</filterset>
+	   			
+	   	</copy>
+	   	
+	   	<copy todir="${build.web}" overwrite="true">
+   	   			<fileset dir="${web}" />
+   	   	</copy>	
+   	
+		<copy todir="${build}/web/lib/tigra" overwrite="true">
+			
+			<fileset dir="${basedir}/web/lib/tigra">
+				<include name="tree_tpl.js"/>
+		   	</fileset>
+			<filterset>
+				<filter token="imgUrl" value="${imgUrl}" />
+			</filterset>
+		</copy>
+	</target>
+		
+	<target name="compile" depends="clean, preparedirs" description="compile java sources">
    		<javac srcdir="${src}"
          	 	destdir="${build}" 
    				deprecation="on" 
@@ -114,6 +158,49 @@
 			<fileset dir="${build}" />					
 		</jar>	
   	</target>
+			
+	<target name="create-install-package" depends="package" description="creates jar file">
+		<mkdir dir="${package.dir}"/>
+		<mkdir dir="${package.lib}"/>
+		<mkdir dir="${package.deploy}"/>
+		
+		<copy todir="${package.lib}" overwrite="false">
+   			<fileset dir="${lib}">
+   				<include name="commons-codec-1.3.jar" />
+   				<include name="authmoduledata_ce_1.4.jar" />
+   				<include name="mysql-connector-java-3.1.12-bin.jar" />
+   				<include name="xercesImpl.jar" />
+   			</fileset>
+		</copy>
+		
+		<copy todir="${package.db}" overwrite="false">
+   			<fileset dir="db" />
+   				
+		</copy>
+
+		<copy todir="${package.deploy}" overwrite="true">
+			<fileset dir="${build}">
+				<exclude name="lib" />
+				<exclude name="DeployableComponentConfig.xml" />
+				<exclude name="${jar}" />
+				<exclude name="CVS" />
+			</fileset>
+		</copy>
+		
+		<copy todir="${package.dir}" overwrite="true">
+			<fileset dir="${basedir}">
+				<include name="readme.txt" />
+				<include name="license.txt" />
+				<include name="release_notes.txt" />
+			</fileset>
+		</copy>
+		
+		<zip destfile="${package}/${product}-${version}.zip"
+		       basedir="${package.dir}"
+		       excludes="CVS"
+		/>
+		
+  	</target>	
 	
 	<target name="deploy" depends="package" description="creates jar file">
 		<copy todir="${deploy.dir}" overwrite="true" file="${jarfile}" />
@@ -125,15 +212,11 @@
    				<!-- include name="sqljdbc.jar" / -->
    				<include name="mysql-connector-java-3.1.12-bin.jar" />
    			</fileset>
-		</copy>
-	
-		
+		</copy>	
 	</target>
 		
 		
 	<target name="create-table">
-		<echo>${dbUrl}</echo>
-		
 		<sql 
 			driver="${dbDriver}"
 			classpath="${dbDriverClassPath}"
Index: lams_webct_integration/lib/axis.jar
===================================================================
RCS file: /usr/local/cvsroot/lams_webct_integration/lib/axis.jar,v
diff -u
Binary files differ
Index: lams_webct_integration/lib/xercesImpl.jar
===================================================================
RCS file: /usr/local/cvsroot/lams_webct_integration/lib/xercesImpl.jar,v
diff -u
Binary files differ
Index: lams_webct_integration/src/org/lamsfoundation/integration/dao/LamsLessonDaoMySqlJDBC.java
===================================================================
RCS file: /usr/local/cvsroot/lams_webct_integration/src/org/lamsfoundation/integration/dao/LamsLessonDaoMySqlJDBC.java,v
diff -u -r1.2 -r1.3
--- lams_webct_integration/src/org/lamsfoundation/integration/dao/LamsLessonDaoMySqlJDBC.java	20 Dec 2007 00:51:49 -0000	1.2
+++ lams_webct_integration/src/org/lamsfoundation/integration/dao/LamsLessonDaoMySqlJDBC.java	8 Jan 2008 02:50:23 -0000	1.3
@@ -85,6 +85,7 @@
 		catch (Exception e)
 		{
 			e.printStackTrace();
+			log.error("Problem getting database connection.", e);
 		}