You are viewing a plain text version of this content. The canonical link for it is here.
Posted to jetspeed-dev@portals.apache.org by rw...@apache.org on 2009/06/29 06:55:20 UTC
svn commit: r789208 - in /portals/jetspeed-2/portal/branches/JETSPEED-2.1.3-POSTRELEASE/installer/etc: ant-installer/antinstall-config-demo.xml ant-installer/antinstall-config.xml database/build.xml

Author: rwatler
Date: Mon Jun 29 04:55:20 2009
New Revision: 789208

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

Modified:
    portals/jetspeed-2/portal/branches/JETSPEED-2.1.3-POSTRELEASE/installer/etc/ant-installer/antinstall-config-demo.xml
    portals/jetspeed-2/portal/branches/JETSPEED-2.1.3-POSTRELEASE/installer/etc/ant-installer/antinstall-config.xml
    portals/jetspeed-2/portal/branches/JETSPEED-2.1.3-POSTRELEASE/installer/etc/database/build.xml

Modified: portals/jetspeed-2/portal/branches/JETSPEED-2.1.3-POSTRELEASE/installer/etc/ant-installer/antinstall-config-demo.xml
URL: http://svn.apache.org/viewvc/portals/jetspeed-2/portal/branches/JETSPEED-2.1.3-POSTRELEASE/installer/etc/ant-installer/antinstall-config-demo.xml?rev=789208&r1=789207&r2=789208&view=diff
==============================================================================
--- portals/jetspeed-2/portal/branches/JETSPEED-2.1.3-POSTRELEASE/installer/etc/ant-installer/antinstall-config-demo.xml (original)
+++ portals/jetspeed-2/portal/branches/JETSPEED-2.1.3-POSTRELEASE/installer/etc/ant-installer/antinstall-config-demo.xml Mon Jun 29 04:55:20 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="setupNoDB" />
     <comment displayText="Jetspeed Enterprise Portal version 2.1.3" bold="true" />

Modified: portals/jetspeed-2/portal/branches/JETSPEED-2.1.3-POSTRELEASE/installer/etc/ant-installer/antinstall-config.xml
URL: http://svn.apache.org/viewvc/portals/jetspeed-2/portal/branches/JETSPEED-2.1.3-POSTRELEASE/installer/etc/ant-installer/antinstall-config.xml?rev=789208&r1=789207&r2=789208&view=diff
==============================================================================
--- portals/jetspeed-2/portal/branches/JETSPEED-2.1.3-POSTRELEASE/installer/etc/ant-installer/antinstall-config.xml (original)
+++ portals/jetspeed-2/portal/branches/JETSPEED-2.1.3-POSTRELEASE/installer/etc/ant-installer/antinstall-config.xml Mon Jun 29 04:55:20 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="setupNoDB" />
     <comment displayText="Jetspeed Enterprise Portal version 2.1.3" bold="true" />

Modified: portals/jetspeed-2/portal/branches/JETSPEED-2.1.3-POSTRELEASE/installer/etc/database/build.xml
URL: http://svn.apache.org/viewvc/portals/jetspeed-2/portal/branches/JETSPEED-2.1.3-POSTRELEASE/installer/etc/database/build.xml?rev=789208&r1=789207&r2=789208&view=diff
==============================================================================
--- portals/jetspeed-2/portal/branches/JETSPEED-2.1.3-POSTRELEASE/installer/etc/database/build.xml (original)
+++ portals/jetspeed-2/portal/branches/JETSPEED-2.1.3-POSTRELEASE/installer/etc/database/build.xml Mon Jun 29 04:55:20 2009
@@ -136,7 +136,7 @@
     <echo>Export Jetspeed database to ${exportDataDir}/j2-prefs-data.xml</echo>
 
     <mkdir dir="${exportDataDir}"/>
-    <java classname="org.apache.jetspeed.serializer.JetspeedSerializerApplication" fork="yes">
+    <java classname="org.apache.jetspeed.serializer.JetspeedSerializerApplication" fork="yes" maxmemory="${jvmMaxMemory}" failonerror="yes">
       <classpath refid="assemblyClasspath"/>
       <arg line="-E &quot;${exportDataDir}/j2-data.xml&quot; 
         -O &quot;ALL&quot;
@@ -151,7 +151,7 @@
 
     <echo>Export Jetspeed database to ${exportDataDir}/j2-prefs-data.xml</echo>
 
-    <java classname="org.apache.jetspeed.serializer.JetspeedSerializerApplication" fork="yes">
+    <java classname="org.apache.jetspeed.serializer.JetspeedSerializerApplication" fork="yes" maxmemory="${jvmMaxMemory}" failonerror="yes">
       <classpath refid="assemblyClasspath"/>
       <arg line="-E &quot;${exportDataDir}/j2-prefs-data.xml&quot;
         -O &quot;PREFS&quot;
@@ -169,7 +169,7 @@
     <mkdir dir="${exportDataDir}/pages"/>
     <property name="org.apache.jetspeed.page.import.configuration" value="${basedir}/import/export.properties"/>
     <property name="org.apache.jetspeed.page.import.pages" value="${exportDataDir}/pages"/>
-    <java classname="org.apache.jetspeed.page.PageImporter" fork="yes" dir="${basedir}">
+    <java classname="org.apache.jetspeed.page.PageImporter" fork="yes" dir="${basedir}" maxmemory="${jvmMaxMemory}" failonerror="yes">
       <classpath refid="import-classpath"/>
       <syspropertyset refid="import.syspropertyset.id"/>
     </java>
@@ -211,7 +211,7 @@
 
     <echo>Import Jetspeed database from ${importDataDir}/j2-data.xml</echo>
 
-    <java classname="org.apache.jetspeed.serializer.JetspeedSerializerApplication" fork="yes">
+    <java classname="org.apache.jetspeed.serializer.JetspeedSerializerApplication" fork="yes" maxmemory="${jvmMaxMemory}" failonerror="yes">
       <classpath refid="assemblyClasspath"/>
       <arg line="-I &quot;${importDataDir}/j2-data.xml&quot; 
         -O &quot;ALL&quot;
@@ -229,7 +229,7 @@
 
     <echo>Import Jetspeed database from ${importDataDir}/j2-prefs-data.xml</echo>
 
-    <java classname="org.apache.jetspeed.serializer.JetspeedSerializerApplication" fork="yes">
+    <java classname="org.apache.jetspeed.serializer.JetspeedSerializerApplication" fork="yes" maxmemory="${jvmMaxMemory}" failonerror="yes">
       <classpath refid="assemblyClasspath"/>
       <arg line="-I &quot;${importDataDir}/j2-prefs-data.xml&quot; 
         -O &quot;PREFS&quot;
@@ -249,7 +249,7 @@
 
     <property name="org.apache.jetspeed.page.import.configuration" value="${basedir}/import/import.properties"/>
     <property name="org.apache.jetspeed.page.import.pages" value="${importDataDir}/pages"/>
-    <java classname="org.apache.jetspeed.page.PageImporter" fork="yes" dir="${basedir}">
+    <java classname="org.apache.jetspeed.page.PageImporter" fork="yes" dir="${basedir}" maxmemory="${jvmMaxMemory}" failonerror="yes">
       <classpath refid="import-classpath"/>
       <syspropertyset refid="import.syspropertyset.id"/>
     </java>
@@ -357,7 +357,7 @@
   <target name="seedDB" depends="setupAssemblyAndPaths">
 
     <echo>Seeding the database</echo>
-    <java classname="org.apache.jetspeed.serializer.JetspeedSerializerApplication" fork="yes">
+    <java classname="org.apache.jetspeed.serializer.JetspeedSerializerApplication" fork="yes" failonerror="yes">
       <classpath refid="assemblyClasspath"/>
       <arg line="-I &quot;${basedir}/j2-seed.xml&quot; 
         -a &quot;${basedir}/../webapps/${portalName}&quot;
@@ -409,7 +409,7 @@
 
   <target name='sqlDerbyDB'>
     <echo>Excuting file: ${databaseScript}</echo>
-    <java classname="org.apache.jetspeed.anttasks.ExecuteJavaSQL" fork="yes">
+    <java classname="org.apache.jetspeed.anttasks.ExecuteJavaSQL" fork="yes" failonerror="yes">
       <classpath>
         <fileset dir="${basedir}/../shared/lib">
           <include name="**/*.jar" />
@@ -464,7 +464,7 @@
     <echo>Importing database pages</echo>
     <property name="org.apache.jetspeed.page.import.configuration" value="${basedir}/import/import.properties"/>
     <property name="org.apache.jetspeed.page.import.pages" value="${jetspeedWebinfDir}/pages"/>
-    <java classname="org.apache.jetspeed.page.PageImporter" fork="yes" dir="${basedir}">
+    <java classname="org.apache.jetspeed.page.PageImporter" fork="yes" dir="${basedir}" failonerror="yes">
       <classpath refid="import-classpath"/>
       <syspropertyset refid="import.syspropertyset.id"/>
     </java>



---------------------------------------------------------------------
To unsubscribe, e-mail: jetspeed-dev-unsubscribe@portals.apache.org
For additional commands, e-mail: jetspeed-dev-help@portals.apache.org