svn commit: r512881 - /portals/jetspeed-2/trunk/installer2/build.xml

[ate]

Author: ate
Date: Wed Feb 28 10:03:57 2007
New Revision: 512881

URL: http://svn.apache.org/viewvc?view=rev&rev=512881
Log:
First part of a major overhaul of the installer.
This fixes:
- dropping exisiting tables before trying to create anew
- make sure Spring sees the assembly resource directories as file resources 
(this fixes Linux resource resolving) for db-seed

More improvements and fixes will follow later, but this should make it possible 
to actually install Jetspeed

Modified:
    portals/jetspeed-2/trunk/installer2/build.xml

Modified: portals/jetspeed-2/trunk/installer2/build.xml
URL: 
http://svn.apache.org/viewvc/portals/jetspeed-2/trunk/installer2/build.xml?view=diff&rev=512881&r1=512880&r2=512881
==============================================================================
--- portals/jetspeed-2/trunk/installer2/build.xml (original)
+++ portals/jetspeed-2/trunk/installer2/build.xml Wed Feb 28 10:03:57 2007
@@ -60,7 +60,18 @@
                </target>
        
           <target name="generateStandardDb" unless="fork.db">
-               <echo>starting Db generation</echo>
+               <echo>cleaning up possible exiting Db</echo>
+                 <sql driver="${jdbcDriverClass}" url="${jdbcUrl}" 
userid="${dbUser}"
+                         password="${dbPassword}"
+                         src="${basedir}/database/drop.sql"
+                         autocommit="true"
+                         onerror="continue"
+                         print="yes" output="outputfile.txt">
+                         <classpath>
+                                 <pathelement location="${jdbcDriverJar}"/>
+                         </classpath>
+                 </sql>
+               <echo>starting Db generation</echo>
                <sql driver="${jdbcDriverClass}" url="${jdbcUrl}" 
userid="${dbUser}"
                    password="${dbPassword}"
                    src="${basedir}/database/${dbName}/schema/phase1-schema.sql"
@@ -213,7 +224,7 @@
       </fileset>
     </copy>
 
-       <echo> running seed with data: ${DATAFILE}  arguments: -b 
${assemblyDir}/boot/ -c ${assemblyDir}/  database-url: 
${org.apache.jetspeed.database.url}</echo>
+       <echo> running seed with data: ${DATAFILE}  arguments: -b 
${assemblyDir}/boot/ -c ${assemblyDir}/  database-url: ${jdbcUrl}</echo>
        
        
     <java 
classname="org.apache.jetspeed.serializer.JetspeedSerializerApplication" 
fork="yes">
@@ -236,7 +247,7 @@
           <pathelement location="${jetspeedDir}/WEB-INF/classes"/>
         </classpath>
                
-        <arg line="-I &quot;${DATAFILE}&quot; -a ${jetspeedDir} -b 
${assemblyDir}/boot/ -c ${assemblyDir}/ -dc ${jdbcDriverClass} -ds ${jdbcUrl} 
-du ${dbUser} -dp ${dbPassword}"/>  
+        <arg line="-I &quot;${DATAFILE}&quot; -a ${jetspeedDir} -b 
file:${assemblyDir}/boot/ -c file:${assemblyDir}/ -dc ${jdbcDriverClass} -ds 
${jdbcUrl} -du ${dbUser} -dp ${dbPassword}"/>  
     </java>
    </target>
 



---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]