build.xml

rwatler Sun, 28 Jun 2009 21:55:36 -0700

Author: rwatler
Date: Mon Jun 29 04:55:06 2009
New Revision: 789207

URL: http://svn.apache.org/viewvc?rev=789207&view=rev
Log:
JS2-1034: add installer page to specify import/export JVM memory size


Modified:
    
portals/jetspeed-2/portal/trunk/jetspeed-installer/etc/ant-installer/antinstall-config-min.xml
    
portals/jetspeed-2/portal/trunk/jetspeed-installer/etc/ant-installer/antinstall-config.xml
    portals/jetspeed-2/portal/trunk/jetspeed-installer/etc/database/build.xml

Modified: 
portals/jetspeed-2/portal/trunk/jetspeed-installer/etc/ant-installer/antinstall-config-min.xml
URL: 
http://svn.apache.org/viewvc/portals/jetspeed-2/portal/trunk/jetspeed-installer/etc/ant-installer/antinstall-config-min.xml?rev=789207&r1=789206&r2=789207&view=diff
==============================================================================
--- 
portals/jetspeed-2/portal/trunk/jetspeed-installer/etc/ant-installer/antinstall-config-min.xml
 (original)
+++ 
portals/jetspeed-2/portal/trunk/jetspeed-installer/etc/ant-installer/antinstall-config-min.xml
 Mon Jun 29 04:55:06 2009
@@ -73,6 +73,13 @@
       displayText="Enter temporary directory"/>
   </page>
 
+  <page type="input" name="jvmProperties" displayText="JVM memory size" 
ifProperty="(${operation}=importdb) OR (${operation}=exportdb)">
+    <comment displayText="Enter maximum memory size of the import/export JVM 
process;" />
+    <comment displayText="large data sets will often require additional 
memory." />
+    <comment displayText="" />
+    <validated property="jvmMaxMemory" defaultValue="512m" displayText="Enter 
JVM memory size" regex="^[0-9][0-9]*[mgk]$"/>
+  </page>
+
   <page type="input" name="requiredComponents" displayText="Components 
selection" ifProperty="${operation}=install">
     <hidden property="setupDBAntTarget" value="runSetupNoDB" />
     <comment displayText="Jetspeed Enterprise Portal version 2.2.1-SNAPSHOT" 
bold="true" />

Modified: 
portals/jetspeed-2/portal/trunk/jetspeed-installer/etc/ant-installer/antinstall-config.xml
URL: 
http://svn.apache.org/viewvc/portals/jetspeed-2/portal/trunk/jetspeed-installer/etc/ant-installer/antinstall-config.xml?rev=789207&r1=789206&r2=789207&view=diff
==============================================================================
--- 
portals/jetspeed-2/portal/trunk/jetspeed-installer/etc/ant-installer/antinstall-config.xml
 (original)
+++ 
portals/jetspeed-2/portal/trunk/jetspeed-installer/etc/ant-installer/antinstall-config.xml
 Mon Jun 29 04:55:06 2009
@@ -73,6 +73,13 @@
       displayText="Enter temporary directory"/>
   </page>
 
+  <page type="input" name="jvmProperties" displayText="JVM memory size" 
ifProperty="(${operation}=importdb) OR (${operation}=exportdb)">
+    <comment displayText="Enter maximum memory size of the import/export JVM 
process;" />
+    <comment displayText="large data sets will often require additional 
memory." />
+    <comment displayText="" />
+    <validated property="jvmMaxMemory" defaultValue="512m" displayText="Enter 
JVM memory size" regex="^[0-9][0-9]*[mgk]$"/>
+  </page>
+
   <page type="input" name="requiredComponents" displayText="Components 
selection" ifProperty="${operation}=install">
     <hidden property="setupDBAntTarget" value="runSetupNoDB" />
     <comment displayText="Jetspeed Enterprise Portal version 2.2.1-SNAPSHOT" 
bold="true" />

Modified: 
portals/jetspeed-2/portal/trunk/jetspeed-installer/etc/database/build.xml
URL: 
http://svn.apache.org/viewvc/portals/jetspeed-2/portal/trunk/jetspeed-installer/etc/database/build.xml?rev=789207&r1=789206&r2=789207&view=diff
==============================================================================
--- portals/jetspeed-2/portal/trunk/jetspeed-installer/etc/database/build.xml 
(original)
+++ portals/jetspeed-2/portal/trunk/jetspeed-installer/etc/database/build.xml 
Mon Jun 29 04:55:06 2009
@@ -119,7 +119,7 @@
         <echo>Export Jetspeed database to ${exportDataDir}/j2-data.xml</echo>
 
         <mkdir dir="${exportDataDir}"/>
-        <java 
classname="org.apache.jetspeed.tools.db.serializer.JetspeedSerializerApplicationImpl"
 fork="yes">
+        <java 
classname="org.apache.jetspeed.tools.db.serializer.JetspeedSerializerApplicationImpl"
 fork="yes" maxmemory="${jvmMaxMemory}" failonerror="yes">
             <classpath refid="installationClasspath"/>
             <syspropertyset refid="installationProps"/>
             <arg line="-E &quot;${exportDataDir}/j2-data.xml&quot; 
@@ -131,7 +131,7 @@
         <echo>Export Jetspeed database pages to ${exportDataDir}/pages 
directory</echo>
 
         <mkdir dir="${exportDataDir}/pages"/>
-        <java 
classname="org.apache.jetspeed.tools.page.serializer.JetspeedPageSerializerApplicationImpl"
 fork="yes">
+        <java 
classname="org.apache.jetspeed.tools.page.serializer.JetspeedPageSerializerApplicationImpl"
 fork="yes" maxmemory="${jvmMaxMemory}" failonerror="yes">
             <classpath refid="installationClasspath"/>
             <syspropertyset refid="installationProps"/>
             <arg line="-E &quot;/&quot;
@@ -177,7 +177,7 @@
 
         <echo>Import Jetspeed database from ${importDataDir}/j2-data.xml</echo>
 
-        <java 
classname="org.apache.jetspeed.tools.db.serializer.JetspeedSerializerApplicationImpl"
 fork="yes">
+        <java 
classname="org.apache.jetspeed.tools.db.serializer.JetspeedSerializerApplicationImpl"
 fork="yes" maxmemory="${jvmMaxMemory}" failonerror="yes">
             <classpath refid="installationClasspath"/>
             <syspropertyset refid="installationProps"/>
             <arg line="-I &quot;${importDataDir}/j2-data.xml&quot; 
@@ -191,7 +191,7 @@
 
         <echo>Import Jetspeed database from 
${importDataDir}/j2-prefs-data.xml</echo>
 
-        <java 
classname="org.apache.jetspeed.tools.db.serializer.JetspeedSerializerApplicationImpl"
 fork="yes">
+        <java 
classname="org.apache.jetspeed.tools.db.serializer.JetspeedSerializerApplicationImpl"
 fork="yes" maxmemory="${jvmMaxMemory}" failonerror="yes">
             <classpath refid="installationClasspath"/>
             <syspropertyset refid="installationProps"/>
             <arg line="-I &quot;${importDataDir}/j2-prefs-data.xml&quot; 
@@ -205,7 +205,7 @@
 
         <echo>Import Jetspeed database pages from ${importDataDir}/pages 
directory</echo>
 
-        <java 
classname="org.apache.jetspeed.tools.page.serializer.JetspeedPageSerializerApplicationImpl"
 fork="yes">
+        <java 
classname="org.apache.jetspeed.tools.page.serializer.JetspeedPageSerializerApplicationImpl"
 fork="yes" maxmemory="${jvmMaxMemory}" failonerror="yes">
             <classpath refid="installationClasspath"/>
             <syspropertyset refid="installationProps"/>
             <arg line="-I &quot;/&quot;
@@ -236,7 +236,7 @@
         <delete dir="${basedir}/derby/productiondb" quiet="true" />
         <echo>Executing file ${basedir}/derby/create-schema.sql</echo>
 
-        <java classname="org.apache.jetspeed.anttasks.ExecuteJavaSQL" 
fork="yes">
+        <java classname="org.apache.jetspeed.anttasks.ExecuteJavaSQL" 
fork="yes" failonerror="yes">
             <classpath refid="installationClasspath"/>
             <arg line="driver=&quot;${_jdbc.driver.class}&quot; 
               url=&quot;${_jdbc.url}&quot;
@@ -313,7 +313,7 @@
 
         <echo>Seeding the database</echo>
 
-        <java 
classname="org.apache.jetspeed.tools.db.serializer.JetspeedSerializerApplicationImpl"
 fork="yes">
+        <java 
classname="org.apache.jetspeed.tools.db.serializer.JetspeedSerializerApplicationImpl"
 fork="yes" failonerror="yes">
             <classpath refid="installationClasspath"/>
             <syspropertyset refid="installationProps"/>
             <arg line="-I &quot;${basedir}/resources/j2-seed.xml&quot; 
@@ -328,7 +328,7 @@
 
         <echo>Importing psml into the database</echo>
 
-        <java 
classname="org.apache.jetspeed.tools.page.serializer.JetspeedPageSerializerApplicationImpl"
 fork="yes">
+        <java 
classname="org.apache.jetspeed.tools.page.serializer.JetspeedPageSerializerApplicationImpl"
 fork="yes" failonerror="yes">
             <classpath refid="installationClasspath"/>
             <syspropertyset refid="installationProps"/>
             <arg line="-I &quot;/&quot;



---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]

svn commit: r789207 - in /portals/jetspeed-2/portal/trunk/jetspeed-installer/etc: ant-installer/antinstall-config-min.xml ant-installer/antinstall-config.xml database/build.xml

Reply via email to