Author: taylor
Date: Thu Dec 8 13:41:08 2005
New Revision: 355225
URL: http://svn.apache.org/viewcvs?rev=355225&view=rev
Log:
multiple db support, patch from Chris Schaefer
PLEASE TEST
Modified:
portals/jetspeed-2/trunk/installer2/build-installer.xml
portals/jetspeed-2/trunk/maven-plugin/plugin.jelly
Modified: portals/jetspeed-2/trunk/installer2/build-installer.xml
URL:
http://svn.apache.org/viewcvs/portals/jetspeed-2/trunk/installer2/build-installer.xml?rev=355225&r1=355224&r2=355225&view=diff
==============================================================================
--- portals/jetspeed-2/trunk/installer2/build-installer.xml (original)
+++ portals/jetspeed-2/trunk/installer2/build-installer.xml Thu Dec 8 13:41:08
2005
@@ -53,8 +53,10 @@
<!-- get the base tomcat install -->
<!-- first download the zip files -->
<echo> now downloading tomcat installs.. this may take a while </echo>
+<!--
<get usetimestamp="true" dest="./apache-tomcat-5.5.12.zip"
src="http://www.ibiblio.org/pub/mirrors/apache/tomcat/tomcat-5/v5.5.12/bin/apache-tomcat-5.5.12.zip";
/>
<get usetimestamp="true" dest="./apache-tomcat-5.5.12-compat.zip"
src="http://www.ibiblio.org/pub/mirrors/apache/tomcat/tomcat-5/v5.5.12/bin/apache-tomcat-5.5.12-compat.zip";
/>
+-->
<!-- now unzip them -->
<echo> done with downloads, now unzipping </echo>
<unzip src="./apache-tomcat-5.5.12.zip" dest="./apache-tomcat" />
@@ -89,7 +91,7 @@
<fileset dir="${maven.repo.local}/org.apache.pluto/jars/" >
<include name="**/pluto*.jar" />
</fileset>
- <fileset dir="${maven.repo.local}/portals-bridges/jars/" >
+ <fileset dir="${maven.repo.local}/${bridges.groupId}/jars/" >
<include name="**/portals-bridges-common-*.jar" />
</fileset>
<fileset dir="${maven.repo.local}/org.apache.derby/jars/" >
@@ -126,24 +128,26 @@
</fileset>
<!-- these are the "fancy" installs from bridges -->
</copy>
+ <echo> copy files from bridges from
${maven.repo.local}/${bridges.groupId} </echo>
+ <echo> file : perl-${portals.bridges.perl.version}.war </echo>
<copy tofile="portlet_apps/perl.war">
- <fileset dir="${maven.repo.local}/portals-bridges/wars/" >
+ <fileset dir="${maven.repo.local}/${bridges.groupId}/wars/" >
<filename name="perl-${portals.bridges.perl.version}.war" />
</fileset>
</copy>
<copy tofile="portlet_apps/php.war">
- <fileset dir="${maven.repo.local}/portals-bridges/wars/" >
+ <fileset dir="${maven.repo.local}/${bridges.groupId}/wars/" >
<filename name="php-${portals.bridges.php.version}.war" />
</fileset>
</copy>
<copy tofile="portlet_apps/jsf-demo.war">
- <fileset dir="${maven.repo.local}/portals-bridges/wars/" >
+ <fileset dir="${maven.repo.local}/${bridges.groupId}/wars/" >
<filename name="jsf-demo-${portals.bridges.jsf.version}.war"
/>
</fileset>
</copy>
<copy tofile="portlet_apps/jpetstore.war">
- <fileset dir="${maven.repo.local}/portals-bridges/wars/" >
- <filename name="jpetstore-0.4-dev.war" />
+ <fileset dir="${maven.repo.local}/${bridges.groupId}/wars/" >
+ <filename
name="jpetstore-${portals.bridges.jpetstore.version}.war" />
</fileset>
</copy>
@@ -180,11 +184,13 @@
</zipfileset>
</zip>
</target>
+ <target name="cleanDLs" >
+ <delete file="./apache-tomcat-5.5.12.zip" failonerror="false" />
+ <delete file="./apache-tomcat-5.5.12-compat.zip"
failonerror="false" />
+ </target>
<target name="clean">
<delete dir="Jetspeed_Portal" failonerror="false" />
<delete dir="temp" failonerror="false" />
- <delete file="./apache-tomcat-5.5.12.zip" failonerror="false" />
- <delete file="./apache-tomcat-5.5.12-compat.zip"
failonerror="false" />
<delete file="installpack.zip" failonerror="false" />
<delete file="Jetspeed2.0-install.jar" failonerror="false" />
<delete file="Jetspeed2.0-MultiDB-install.jar"
failonerror="false" />
Modified: portals/jetspeed-2/trunk/maven-plugin/plugin.jelly
URL:
http://svn.apache.org/viewcvs/portals/jetspeed-2/trunk/maven-plugin/plugin.jelly?rev=355225&r1=355224&r2=355225&view=diff
==============================================================================
--- portals/jetspeed-2/trunk/maven-plugin/plugin.jelly (original)
+++ portals/jetspeed-2/trunk/maven-plugin/plugin.jelly Thu Dec 8 13:41:08 2005
@@ -945,6 +945,37 @@
</j:if>
</goal>
+ <goal name="j2:buildMultiDbSQL" >
+ <!-- this task builds up ALL the sql for each of the different possible
database systems. The installer may need these -->
+ <!-- it's done this way because the portal.conf.sql task clears the
directory before running -->
+ <delete dir="installer2/temp-portal-sql" />
+ <j:set var="org.apache.jetspeed.production.database.default.name"
value="derby"/>
+ <attainGoal name="j2:portal.conf.sql"/>
+ <!-- now copy this output to the side -->
+ <copy todir="installer2/temp-portal-sql" >
+ <fileset dir="${portal.sql.target.dir}"/>
+ </copy>
+ <j:set var="org.apache.jetspeed.production.database.default.name"
value="mysql"/>
+ <attainGoal name="j2:portal.conf.sql"/>
+ <copy todir="installer2/temp-portal-sql" >
+ <fileset dir="${portal.sql.target.dir}"/>
+ </copy>
+ <j:set var="org.apache.jetspeed.production.database.default.name"
value="mssql"/>
+ <attainGoal name="j2:portal.conf.sql"/>
+ <copy todir="installer2/temp-portal-sql" >
+ <fileset dir="${portal.sql.target.dir}"/>
+ </copy>
+ <j:set var="org.apache.jetspeed.production.database.default.name"
value="oracle"/>
+ <attainGoal name="j2:portal.conf.sql"/>
+ <copy todir="installer2/temp-portal-sql" >
+ <fileset dir="${portal.sql.target.dir}"/>
+ </copy>
+ <copy todir="${portal.sql.target.dir}" >
+ <fileset dir="installer2/temp-portal-sql"/>
+ </copy>
+
+ </goal>
+
<goal name="j2:buildDerbyInstaller">
<ant:property name="install.name" value="Jetspeed2.0-derby" />
<ant:copy file="${basedir}/installer2/antinstall-config-derby.xml"
tofile="${basedir}/installer2/antinstall-config.xml" overwrite="true" />
@@ -952,6 +983,7 @@
</goal>
<goal name="j2:buildMultiInstaller">
+ <attainGoal name="j2:buildMultiDbSQL" />
<ant:property name="install.name" value="Jetspeed2.0-MultiDB" />
<ant:copy file="${basedir}/installer2/antinstall-config-multi.xml"
tofile="${basedir}/installer2/antinstall-config.xml" overwrite="true" />
<ant:ant dir="${basedir}/installer2" antfile="build-installer.xml"
target="selfextract" />
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
