geronimo-scm mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From djen...@apache.org
Subject svn commit: r290770 - /geronimo/trunk/modules/assembly/maven.xml
Date Wed, 21 Sep 2005 18:09:42 GMT
Author: djencks
Date: Wed Sep 21 11:09:39 2005
New Revision: 290770

URL: http://svn.apache.org/viewcvs?rev=290770&view=rev
Log:
Add back in database generation for juddi, this time it works on osx 10.3

Modified:
    geronimo/trunk/modules/assembly/maven.xml

Modified: geronimo/trunk/modules/assembly/maven.xml
URL: http://svn.apache.org/viewcvs/geronimo/trunk/modules/assembly/maven.xml?rev=290770&r1=290769&r2=290770&view=diff
==============================================================================
--- geronimo/trunk/modules/assembly/maven.xml (original)
+++ geronimo/trunk/modules/assembly/maven.xml Wed Sep 21 11:09:39 2005
@@ -199,13 +199,13 @@
         <ant:mkdir dir="${geronimo.assembly.dir}/var/ldap"/>
 
         <!-- Add tomcat files -->
-<!--        <j:if test="${context.getVariable('geronimo.web.container').equals('tomcat')}">-->
-            <ant:copy todir="${geronimo.assembly.dir}/var/catalina/conf"
-                file="${project.root}/modules/tomcat/src/var/web.xml"/>
-            <ant:copy todir="${geronimo.assembly.dir}/var/catalina/ROOT">
-                <ant:fileset dir="${project.root}/modules/tomcat/src/var/ROOT"/>
-            </ant:copy>
-<!--        </j:if>-->
+        <!--        <j:if test="${context.getVariable('geronimo.web.container').equals('tomcat')}">-->
+        <ant:copy todir="${geronimo.assembly.dir}/var/catalina/conf"
+            file="${project.root}/modules/tomcat/src/var/web.xml"/>
+        <ant:copy todir="${geronimo.assembly.dir}/var/catalina/ROOT">
+            <ant:fileset dir="${project.root}/modules/tomcat/src/var/ROOT"/>
+        </ant:copy>
+        <!--        </j:if>-->
 
         <!-- Load the repository -->
         <ant:mkdir dir="${geronimo.assembly.dir}/repository"/>
@@ -269,8 +269,8 @@
         <j:set var="PlanCOSNamingHost" value="localhost"/>
         <j:set var="PlanCOSNamingPort" value="1050"/>
         <!-- why aren't these used? -->
-<!--        <j:set var="PlanORBHost" value="0.0.0.0"/>-->
-<!--        <j:set var="PlanORBPort" value="2001"/>-->
+        <!--        <j:set var="PlanORBHost" value="0.0.0.0"/>-->
+        <!--        <j:set var="PlanORBPort" value="2001"/>-->
         <j:set var="PlanORBSSLHost" value="0.0.0.0"/>
         <j:set var="PlanORBSSLPort" value="2001"/>
         <j:set var="PlanActiveMQPort" value="61616"/>
@@ -468,6 +468,7 @@
         <!-- ============================================== -->
 
         <attainGoal name="online.deploy"/>
+        <attainGoal name="init-database"/>
 
         <!-- Prepare the Installer directory -->
         <ant:copy todir="${basedir}/target/installer">
@@ -743,17 +744,30 @@
     <!--        </j:if>-->
     <!--    </goal>-->
 
-    <!-- this does not appear to be used -->
-    <!--    <goal name="init-database">-->
-    <!--        <j:invokeStatic className="java.lang.System" method="setProperty">-->
-    <!--            <j:arg type="java.lang.String" value="derby.system.home"/>-->
-    <!--            <j:arg type="java.lang.String" value="${derby.system.home}"/>-->
-    <!--        </j:invokeStatic>-->
-    <!--        <ant:sql driver="org.apache.derby.jdbc.EmbeddedDriver" url="jdbc:derby:SystemDatabase;create=true"
userid="" password="">-->
-    <!--            <ant:fileset dir="src/sql"/>-->
-    <!--            <ant:classpath>-->
-    <!--                <ant:pathelement location="${maven.repo.local}/org.apache.derby/jars/derby-${derby_version}.jar"/>-->
-    <!--            </ant:classpath>-->
-    <!--        </ant:sql>-->
-    <!--    </goal>-->
+    <!--     this does not appear to be used -->
+    <goal name="init-database">
+        <ant:delete dir="${derby.system.home}"/>
+        <ant:mkdir dir="${derby.system.home}"/>
+
+        <!-- setup the lame system properties that derby needs -->
+        <j:invokeStatic className="java.lang.System" method="setProperty">
+            <j:arg type="java.lang.String" value="derby.system.home"/>
+            <j:arg type="java.lang.String" value="${derby.system.home}"/>
+        </j:invokeStatic>
+        <j:invokeStatic className="java.lang.System" method="setProperty">
+            <j:arg type="java.lang.String" value="derby.storage.fileSyncTransactionLog"/>
+            <j:arg type="java.lang.String" value="true"/>
+        </j:invokeStatic>
+        <ant:sql driver="org.apache.derby.jdbc.EmbeddedDriver"
+            url="jdbc:derby:SystemDatabase;create=true"
+            userid="" password=""
+            autocommit="true"
+            onerror="abort"
+            delimiter=";">
+            <ant:fileset dir="src/sql"/>
+            <ant:classpath>
+                <ant:pathelement location="${maven.repo.local}/org.apache.derby/jars/derby-${derby_version}.jar"/>
+            </ant:classpath>
+        </ant:sql>
+    </goal>
 </project>



Mime
View raw message