Index: unix_installer/installer-package/ant-scripts/.createdabase.xml.swp
===================================================================
diff -u
Binary files differ
Index: unix_installer/installer-package/ant-scripts/configure-database.xml
===================================================================
diff -u
--- unix_installer/installer-package/ant-scripts/configure-database.xml	(revision 0)
+++ unix_installer/installer-package/ant-scripts/configure-database.xml	(revision a2f8b16b34b729e4cb97f9444102144c68a17dc1)
@@ -0,0 +1,45 @@
+<project name="create-database" basedir="." >
+	<!-- begin properties *******************************************************************************************-->
+	<!-- import properties from the specified file -->
+
+	<property file="../lams.properties"/>
+	
+	<target name="create-database" description="Create the core lams database">
+		<copy todir="../database" overwrite="true">
+			<fileset dir="../sql-scripts">
+				<include name="create-database.sql"/>
+			</fileset>
+			<filterset>
+				<filter token="DB_NAME" value="${DB_NAME}" />
+                		<filter token="DB_USER" value="${DB_USER}" />
+                		<filter token="DB_PASS" value="${DB_PASS}" />
+				<filter token="SQL_GRANT" value="${SQL_GRANT}" />
+			</filterset>
+		</copy>
+
+		<sql driver="com.mysql.jdbc.Driver" 
+			classpath="../assembly/lams.ear/mysql-connector-java-3.1.12-bin.jar" 
+			url="${MYSQL_DB_URL}" 
+			userid="root" 
+			password="${DB_ROOT_PASSWORD}"
+			encoding="utf8"
+			onerror="continue">
+			<transaction src="../database/create-database.sql" />
+                </sql>
+
+	</target>
+
+	
+	<target name="fill-database" description="fills the database">
+		<sql driver="com.mysql.jdbc.Driver"
+                        classpath="../assembly/lams.ear/mysql-connector-java-3.1.12-bin.jar"
+                        url="${SQL_URL}"
+                        userid="${DB_USER}"
+                        password="${DB_PASS}"
+                        encoding="utf8"
+                        onerror="continue">
+                        <transaction src="../database/lams.dump" />
+                        <transaction src="../sql-scripts/setLamsConfiguration.sql"/>
+                </sql>
+	</target>
+</project>
Index: unix_installer/installer-package/ant-scripts/configure-deploy.xml
===================================================================
diff -u -r0965ee8a6bd49be2d53cad08225f707b32a61674 -ra2f8b16b34b729e4cb97f9444102144c68a17dc1
--- unix_installer/installer-package/ant-scripts/configure-deploy.xml	(.../configure-deploy.xml)	(revision 0965ee8a6bd49be2d53cad08225f707b32a61674)
+++ unix_installer/installer-package/ant-scripts/configure-deploy.xml	(.../configure-deploy.xml)	(revision a2f8b16b34b729e4cb97f9444102144c68a17dc1)
@@ -48,6 +48,7 @@
 				<filter token="DB_NAME" value="${DB_NAME}" />
 				<filter token="DB_USER" value="${DB_USER}" />
 				<filter token="DB_PASS" value="${DB_PASS}" />
+				<filter token="MYSQL_HOST" value="${SQL_HOST}" />
 			</filterset>
 		</copy>
 		<copy overwrite="true" todir="${DEPLOY_DIR}" failonerror="true">
@@ -56,7 +57,7 @@
 			</fileset>
 		</copy>
 
-		<copy overwrite="true" todir="${EAR_DIR}/jbossweb-tomcat55.sar/META-INF" failonerror="true">
+		<copy overwrite="true" todir="${DEPLOY_DIR}/jbossweb-tomcat55.sar/META-INF" failonerror="true">
 			<fileset dir="${JBOSS_CONF}/tomcat">
 				<include name="jboss-service.xml" />
 			</fileset>
@@ -77,13 +78,13 @@
 			</fileset>
 		</copy>
 
-		<copy overwrite="true" todir="${EAR_DIR}/jbossweb-tomcat55.sar/conf" failonerror="true">
+		<copy overwrite="true" todir="${DEPLOY_DIR}/jbossweb-tomcat55.sar/conf" failonerror="true">
 			 <fileset dir="${JBOSS_CONF}/tomcat">
 				 <include name="web.xml" />
 			 </fileset>
 		</copy>
 		
-		<copy overwrite="yes" todir="${BINDIR}">
+		<copy overwrite="true" todir="${BINDIR}">
                         <fileset dir="bin">
                                 <include name="run-lams.sh" />
                         </fileset>
Index: unix_installer/installer-package/ant-scripts/update-configuration.xml
===================================================================
diff -u
--- unix_installer/installer-package/ant-scripts/update-configuration.xml	(revision 0)
+++ unix_installer/installer-package/ant-scripts/update-configuration.xml	(revision a2f8b16b34b729e4cb97f9444102144c68a17dc1)
@@ -0,0 +1,12 @@
+<projcet name="
+	<target name="import-db">
+		<sql driver="com.mysql.jdbc.Driver" 
+			classpath="${EARDIR}/mysql-connector-java-3.1.12-bin.jar" 
+			url="jdbc:mysql://localhost/${DB_NAME}?characterEncoding=UTF-8" 
+			userid="${DB_USER}" 
+			password="${DB_PASS}"
+			encoding="utf8">
+			<transaction src="${TEMP}/dump.sql" />
+			<transaction src="${INSTDIR}/update_lams_configuration.sql" />
+		</sql>
+	</target>
Index: unix_installer/installer-package/ant-scripts/version.properties
===================================================================
diff -u -r0965ee8a6bd49be2d53cad08225f707b32a61674 -ra2f8b16b34b729e4cb97f9444102144c68a17dc1
--- unix_installer/installer-package/ant-scripts/version.properties	(.../version.properties)	(revision 0965ee8a6bd49be2d53cad08225f707b32a61674)
+++ unix_installer/installer-package/ant-scripts/version.properties	(.../version.properties)	(revision a2f8b16b34b729e4cb97f9444102144c68a17dc1)
@@ -1,5 +1,5 @@
 # Version identifiers for this installer
-LAMS_VERSION=2.0.2
-SERVER_VERSION=2.0.2.200703220556
-LANG_VERSION=2007-04-15
+LAMS_VERSION=2.0.4
+SERVER_VERSION=2.0.4.200706211047
+LANG_VERSION=2007-06-01