Author: taylor
Date: Tue Feb 27 02:08:03 2007
New Revision: 512202
URL: http://svn.apache.org/viewvc?view=rev&rev=512202
Log:
installer for 2.1
- min and full installer support
contribution from Hajo Birthelmer
Added:
portals/jetspeed-2/trunk/installer2/antinstall-config-full.xml
portals/jetspeed-2/trunk/installer2/antinstall-config-min.xml
Removed:
portals/jetspeed-2/trunk/installer2/antinstall-config-derby.xml
portals/jetspeed-2/trunk/installer2/antinstall-config-multi.xml
Modified:
portals/jetspeed-2/trunk/installer2/build-installer.xml
portals/jetspeed-2/trunk/installer2/build.xml
portals/jetspeed-2/trunk/maven-plugin/plugin.jelly
Added: portals/jetspeed-2/trunk/installer2/antinstall-config-full.xml
URL:
http://svn.apache.org/viewvc/portals/jetspeed-2/trunk/installer2/antinstall-config-full.xml?view=auto&rev=512202
==============================================================================
(empty)
Added: portals/jetspeed-2/trunk/installer2/antinstall-config-min.xml
URL:
http://svn.apache.org/viewvc/portals/jetspeed-2/trunk/installer2/antinstall-config-min.xml?view=auto&rev=512202
==============================================================================
(empty)
Modified: portals/jetspeed-2/trunk/installer2/build-installer.xml
URL:
http://svn.apache.org/viewvc/portals/jetspeed-2/trunk/installer2/build-installer.xml?view=diff&rev=512202&r1=512201&r2=512202
==============================================================================
--- portals/jetspeed-2/trunk/installer2/build-installer.xml (original)
+++ portals/jetspeed-2/trunk/installer2/build-installer.xml Tue Feb 27 02:08:03
2007
@@ -1,202 +1,413 @@
-<?xml version="1.0"?>
-<!--
-This Ant script is used to package parts of the demo app to create an installer
-the selfextract target shows an example of creating a self extracting jar for
the demo app
-run with ...
-ant -Dmaven.local.repo=XXX -buildfile build-demo.xml
-
--->
-
-<project name="Create Jetspeed 2.1 Installer Zip Build" default="selfextract"
basedir=".">
-<target name="selfextract" depends="clean,copystuff,buildZipPack">
-
- <copy todir="./selfextract">
- <fileset dir="installclasspath">
- <include name="resources/*"/>
- </fileset>
- </copy>
- <copy todir="./selfextract">
- <fileset dir=".">
- <include name="build.xml"/>
- <include name="antinstall-config.xml"/>
- <include name="installpack.zip"/>
- </fileset>
- <fileset dir="portlet_apps"/>
- </copy>
- <copy todir="./selfextract/portlet_apps">
- <fileset dir="portlet_apps"/>
- </copy>
- <copy todir="./selfextract/temp">
- <fileset dir="temp"/>
- </copy>
- <copy todir="./selfextract/database">
- <fileset dir="database"/>
- </copy>
- <echo message="Building Jetspeed 2.1 SELFEXTRACT"/>
- <jar file="./${install.name}-install.jar" compress="true">
- <manifest>
- <attribute name="Manifest-Version" value="1.0"/>
- <attribute name="Main-Class"
value="org.tp23.antinstaller.selfextract.SelfExtractor"/>
- <attribute name="Look-And-Feel"
value="org.tp23.jgoodies.plaf.plastic.PlasticXPLookAndFeel"/>
- </manifest>
- <fileset dir="selfextract">
- <include name="**/*"/>
- </fileset>
- <zipgroupfileset dir="installlib" includes="*.jar"/>
- </jar>
-</target>
-
-<target name="copystuff" >
- <!-- this target assumes we're located in the top level of jetspeed-2 -->
- <delete dir="Jetspeed_Portal" />
- <delete dir="portlet_apps" />
- <!-- 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="./tomcat-5.5.20.zip"
src="http://www.bluesunrise.com/maven/tomcat/dist/tomcat-5.5.20.zip"; />
<!-- TODO: renable for Java 1.4 support
- <get usetimestamp="true" dest="./tomcat-5.5.20-compat.zip"
src="http://www.bluesunrise.com/maven/tomcat/dist/tomcat-5.5.20.zip"; />
-->
- <!-- now unzip them -->
- <echo> done with downloads, now unzipping </echo>
- <unzip src="./tomcat-5.5.20.zip" dest="./tomcat-5.5.20" />
<!--
- <unzip src="./tomcat-5.5.20-compat.zip" dest="./tomcat-compat-5.5.20" />
-->
- <copy todir="Jetspeed_Portal" >
- <fileset dir="tomcat-5.5.20" >
- <include name="**/*" />
- </fileset>
<!--
- <fileset dir="tomcat-5.5.20" >
- <include name="**/*" />
- </fileset>
-->
- </copy>
- <echo> updating tomcat users </echo>
- <copy file="tomcat-users.xml" tofile="Jetspeed_Portal/conf/tomcat-users.xml"
overwrite="true" />
<echo> replacing startup files with ones with larger heap size </echo>
<copy file="catalina.sh" tofile="Jetspeed_Portal/bin/catalina.sh"
overwrite="true" />
<copy file="catalina.bat" tofile="Jetspeed_Portal/bin/catalina.bat"
overwrite="true" />
- <echo> done with tomcat users </echo>
- <mkdir dir="temp" />
- <copy todir="temp" >
- <fileset dir="../etc/conf/tomcat/" >
- <filename name="**/jetspeed-tomcat-5.5.xml" />
- </fileset>
- </copy>
- <mkdir dir="Jetspeed_Portal/webapps/jetspeed/WEB-INF/deploy" />
- <mkdir dir="Jetspeed_Portal/temp" />
- <mkdir dir="Jetspeed_Portal/shared/classes" />
- <mkdir dir="Jetspeed_Portal/shared/lib" />
- <touch file="Jetspeed_Portal/logs/catalina.out" />
- <touch file="Jetspeed_Portal/temp/zipsucks" />
- <touch file="Jetspeed_Portal/webapps/jetspeed/WEB-INF/deploy/zipsucks" />
-
- <!-- setup the shared/lib dir with stuff -->
- <copy todir="Jetspeed_Portal/shared/lib" >
- <fileset dir="${maven.repo.local}/org.apache.pluto/jars/" >
- <include name="pluto-${pluto.version}.jar" />
- </fileset>
- <fileset dir="${maven.repo.local}/${bridges.groupId}/jars/" >
- <include
name="portals-bridges-common-${portals.bridges.common.version}.jar" />
- </fileset>
- <fileset dir="${maven.repo.local}/org.apache.derby/jars/" >
- <include name="derby-${derby.version}.jar" />
- </fileset>
- <fileset
dir="${maven.repo.local}/${org.apache.jetspeed.portal.groupId}/jars/" >
- <include name="jetspeed-commons-${jetspeed.version}.jar" />
- <include name="jetspeed-api-${jetspeed.version}.jar" />
- </fileset>
- <fileset dir="${maven.repo.local}/portlet-api/jars/" >
- <include name="portlet-api-${portlet.api.version}.jar" />
- </fileset>
- </copy>
-
- <!-- get the jetspeed war -->
- <echo> now copying jetspeed war </echo>
- <copy todir="Jetspeed_Portal/webapps/" >
- <fileset dir="../target" >
- <include name="**/jetspeed.war" />
- </fileset>
- </copy>
- <echo > now copying other wars </echo>
- <!-- get all the OTHER wars -->
- <copy todir="portlet_apps" >
- <!-- these are the basic installs from jetspeed -->
- <fileset dir="../applications/demo/target" >
- <filename name="*.war" />
- </fileset>
- <fileset dir="../applications/j2-admin/target" >
- <filename name="*.war" />
- </fileset>
- <fileset dir="../applications/rss/target" >
- <filename name="*.war" />
- </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}/${bridges.groupId}/wars/" >
- <filename name="perl-${portals.bridges.perl.version}.war" />
- </fileset>
- </copy>
- <copy tofile="portlet_apps/php.war">
- <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}/${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}/${bridges.groupId}/wars/" >
- <filename
name="jpetstore-${portals.bridges.jpetstore.version}.war" />
- </fileset>
-
- </copy>
- <copy todir="portlet_apps" >
- <fileset dir="../layout-portlets/target" >
- <include name="*.war" />
- </fileset>
- </copy>
- <!-- get the database scripts -->
- <copy todir="database" >
- <fileset dir="../target/portal-sql" >
- <include name="**/*.sql" />
- </fileset>
- </copy>
<copy file='database/populate-userinfo-for-default-psml.sql'
tofile="database/derby/populate-userinfo-for-default-psml.sql"/>
- </target>
-
-<!-- N.B.
-this target does nothing in the deployed version
-and exists for preparing the files to deploy to sourceforge
--->
- <target name="buildZipPack" depends="copystuff" >
- <zip file="./installpack.zip">
- <zipfileset dir="./Jetspeed_Portal">
- <!--
- <include name="bin/**/*"/>
- <include name="classes/**/*"/>
- <include name="config/**/*"/>
- <include name="doc/**/*"/>
- <include name="src/**/*"/>
- <include name="README.txt"/>
- <include name="DEMO-README.txt"/>
- <exclude name="**/CVS/*"/>
- -->
- </zipfileset>
- </zip>
- </target>
- <target name="cleanDLs" >
- <delete file="./tomcat-5.5.20.zip" failonerror="false" />
- <delete file="./tomcat-5.5.20-compat.zip" failonerror="false" />
- </target>
- <target name="clean">
- <delete dir="Jetspeed_Portal" failonerror="false" />
- <delete dir="temp" failonerror="false" />
- <delete file="installpack.zip" failonerror="false" />
- <delete file="Jetspeed2.1-install.jar" failonerror="false" />
- <delete file="Jetspeed2.1-MultiDB-install.jar"
failonerror="false" />
- <delete file="Jetspeed2.1-derby-install.jar" failonerror="false"
/>
- <delete dir="tomcat" failonerror="false" />
- <delete dir="tomcat-compat" failonerror="false" />
- <delete dir="selfextract" failonerror="false" />
- <delete dir="database" failonerror="false" />
- <delete dir="portlet_apps" failonerror="false" />
- </target>
-</project>
+<?xml version="1.0"?>
+
+<!--
+
+This Ant script is used to package parts of the demo app to create an installer
+
+the selfextract target shows an example of creating a self extracting jar for
the demo app
+
+run with ...
+
+ant -Dmaven.local.repo=XXX -buildfile build-demo.xml
+
+
+
+-->
+
+
+
+<project name="Create Jetspeed 2.1 Installer Zip Build" default="selfextract"
basedir=".">
+
+ <target name="selfextract" depends="clean,copystuff,buildZipPack">
+
+
+
+ <copy todir="./selfextract">
+
+ <fileset dir="installclasspath">
+
+ <include name="resources/*" />
+
+ </fileset>
+
+ </copy>
+
+ <copy todir="./selfextract">
+
+ <fileset dir=".">
+
+ <include name="build.xml" />
+
+ <include name="antinstall-config.xml" />
+
+ <include name="installpack.zip" />
+
+ </fileset>
+
+ <fileset dir="portlet_apps" />
+
+ </copy>
+
+ <copy todir="./selfextract/portlet_apps">
+
+ <fileset dir="portlet_apps" />
+
+ </copy>
+
+ <copy todir="./selfextract/temp">
+
+ <fileset dir="temp" />
+
+ </copy>
+
+ <copy todir="./selfextract/database">
+
+ <fileset dir="database" />
+
+ </copy>
+
+ <echo message="Building Jetspeed 2.1 SELFEXTRACT" />
+
+ <jar file="./${install.name}-install.jar" compress="true">
+
+ <manifest>
+
+ <attribute name="Manifest-Version" value="1.0"
/>
+
+ <attribute name="Main-Class"
value="org.tp23.antinstaller.selfextract.SelfExtractor" />
+
+ <attribute name="Look-And-Feel"
value="org.tp23.jgoodies.plaf.plastic.PlasticXPLookAndFeel" />
+
+ </manifest>
+
+ <fileset dir="selfextract">
+
+ <include name="**/*" />
+
+ </fileset>
+
+ <zipgroupfileset dir="installlib" includes="*.jar" />
+
+ </jar>
+
+ </target>
+
+
+
+ <target name="copystuff">
+
+ <!-- this target assumes we're located in the top level of
jetspeed-2 -->
+
+ <delete dir="Jetspeed_Portal" />
+
+ <delete dir="portlet_apps" />
+
+ <!-- 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="./tomcat-5.5.20.zip"
src="http://www.bluesunrise.com/maven/tomcat/dist/tomcat-5.5.20.zip"; />
+ <!-- TODO: renable for Java 1.4 support
+ <get usetimestamp="true" dest="./tomcat-5.5.20-compat.zip"
src="http://www.bluesunrise.com/maven/tomcat/dist/tomcat-5.5.20.zip"; />
+ -->
+ <!-- now unzip them -->
+
+ <echo> done with downloads, now unzipping </echo>
+
+ <unzip src="./tomcat-5.5.20.zip" dest="./tomcat-5.5.20" />
+ <!--
+ <unzip src="./tomcat-5.5.20-compat.zip" dest="./tomcat-compat-5.5.20" />
+ -->
+ <copy todir="Jetspeed_Portal">
+
+ <fileset dir="tomcat-5.5.20">
+
+ <include name="**/*" />
+
+ </fileset>
+ <!--
+ <fileset dir="tomcat-5.5.20" >
+
+ <include name="**/*" />
+
+ </fileset>
+-->
+ </copy>
+
+ <echo> updating tomcat users </echo>
+
+ <copy file="tomcat-users.xml"
tofile="Jetspeed_Portal/conf/tomcat-users.xml" overwrite="true" />
+
+ <echo> replacing startup files with ones with larger heap size
</echo>
+ <copy file="catalina.sh"
tofile="Jetspeed_Portal/bin/catalina.sh" overwrite="true" />
+ <copy file="catalina.bat"
tofile="Jetspeed_Portal/bin/catalina.bat" overwrite="true" />
+
+ <echo> done with tomcat users </echo>
+
+ <mkdir dir="temp" />
+
+ <copy todir="temp">
+
+ <fileset dir="../etc/conf/tomcat/">
+
+ <filename name="**/jetspeed-tomcat-5.5.xml" />
+
+ </fileset>
+
+ </copy>
+
+ <mkdir dir="Jetspeed_Portal/webapps/jetspeed/WEB-INF/deploy" />
+
+ <mkdir dir="Jetspeed_Portal/temp" />
+
+ <mkdir dir="Jetspeed_Portal/temp_install" />
+
+ <mkdir dir="Jetspeed_Portal/shared/classes" />
+
+ <mkdir dir="Jetspeed_Portal/shared/lib" />
+
+ <touch file="Jetspeed_Portal/logs/catalina.out" />
+
+
+
+
+ <!-- setup the shared/lib dir with stuff -->
+
+ <copy todir="Jetspeed_Portal/shared/lib">
+
+ <fileset
dir="${maven.repo.local}/org.apache.pluto/jars/">
+
+ <include name="pluto-${pluto.version}.jar" />
+
+ </fileset>
+
+ <fileset
dir="${maven.repo.local}/${bridges.groupId}/jars/">
+ <include
name="portals-bridges-common-${portals.bridges.common.version}.jar" />
+
+ </fileset>
+
+ <fileset
dir="${maven.repo.local}/org.apache.derby/jars/">
+
+ <include name="derby-${derby.version}.jar" />
+
+ </fileset>
+
+ <fileset
dir="${maven.repo.local}/${org.apache.jetspeed.portal.groupId}/jars/">
+
+ <include
name="jetspeed-commons-${jetspeed.version}.jar" />
+
+ <include
name="jetspeed-api-${jetspeed.version}.jar" />
+
+ </fileset>
+
+ <fileset dir="${maven.repo.local}/portlet-api/jars/">
+
+ <include
name="portlet-api-${portlet.api.version}.jar" />
+
+ </fileset>
+
+ </copy>
+
+
+ <copy todir="Jetspeed_Portal/temp_install">
+ <fileset dir="${maven.repo.local}/tyrex/jars/">
+
+ <include name="tyrex-1.0.1.jar" />
+
+ </fileset>
+ <fileset
dir="${maven.repo.local}/${org.apache.jetspeed.portal.groupId}/jars/">
+
+ <include
name="ant-tasks-${jetspeed.version}.jar" />
+
+ </fileset>
+ </copy>
+
+
+ <!-- get the jetspeed war -->
+
+ <echo> now copying jetspeed war </echo>
+
+ <copy todir="Jetspeed_Portal/webapps/">
+
+ <fileset dir="../target">
+
+ <include name="**/jetspeed.war" />
+
+ </fileset>
+
+ </copy>
+
+
+ <echo> now copying the admin war </echo>
+
+ <copy todir="portlet_apps">
+
+ <fileset dir="../applications/j2-admin/target">
+
+ <filename name="*.war" />
+
+ </fileset>
+ </copy>
+
+
+ <echo> - portlet_apps </echo>
+
+ <copy todir="portlet_apps">
+
+ <fileset dir="../layout-portlets/target">
+
+ <include name="*.war" />
+
+ </fileset>
+
+ </copy>
+
+ <!-- get the database scripts -->
+
+ <echo> - database scripts </echo>
+
+
+ <copy todir="database">
+
+ <fileset dir="../target/portal-sql">
+
+ <include name="**/*.sql" />
+ <include name="**/*.xml" />
+ </fileset>
+
+ </copy>
+
+ <antcall target="copyDemos" />
+
+ </target>
+
+ <target name="copyDemos" unless="install.minOnly">
+
+ <echo> now copying other wars </echo>
+
+ <!-- get all the OTHER wars -->
+
+ <echo> - applications </echo>
+
+ <copy todir="portlet_apps">
+
+ <!-- these are the basic installs from jetspeed -->
+
+ <fileset dir="../applications/demo/target">
+
+ <filename name="*.war" />
+
+ </fileset>
+
+
+ <fileset dir="../applications/rss/target">
+
+ <filename name="*.war" />
+
+ </fileset>
+
+ <!-- these are the "fancy" installs from bridges -->
+
+ </copy>
+
+ <echo> - jsf-demo groupid = ${bridges.groupId},
jsf-version=${portals.bridges.jsf.version} </echo>
+
+
+ <copy tofile="portlet_apps/jsf-demo.war">
+
+ <fileset
dir="${maven.repo.local}/${bridges.groupId}/wars/">
+ <!-- <filename
name="jsf-demo-${portals.bridges.jsf.version}.war" /> -->
+ <filename name="jsf-demo-1.0.war" />
+
+ </fileset>
+
+ </copy>
+ <echo> - jsf-demo groupid = ${bridges.groupId},
jpetstore-version=${portals.bridges.jpetstore.version} </echo>
+
+ <copy tofile="portlet_apps/jpetstore.war">
+
+ <fileset
dir="${maven.repo.local}/${bridges.groupId}/wars/">
+ <!-- <filename
name="jpetstore-${portals.bridges.jpetstore.version}.war" /> -->
+ <filename name="jpetstore-1.0.war" />
+ </fileset>
+
+
+
+ </copy>
+ </target>
+
+
+ <!-- N.B.
+
+this target does nothing in the deployed version
+
+and exists for preparing the files to deploy to sourceforge
+
+-->
+
+ <target name="buildZipPack" depends="copystuff">
+
+ <zip file="./installpack.zip">
+
+ <zipfileset dir="./Jetspeed_Portal">
+
+ <!--
+
+ <include name="bin/**/*"/>
+
+ <include name="classes/**/*"/>
+
+ <include name="config/**/*"/>
+
+ <include name="doc/**/*"/>
+
+ <include name="src/**/*"/>
+
+ <include name="README.txt"/>
+
+ <include name="DEMO-README.txt"/>
+
+ <exclude name="**/CVS/*"/>
+
+ -->
+
+ </zipfileset>
+
+ </zip>
+
+ </target>
+
+ <target name="cleanDLs">
+ <delete file="./tomcat-5.5.20.zip" failonerror="false" />
+ <delete file="./tomcat-5.5.20-compat.zip" failonerror="false" />
+ </target>
+ <target name="clean">
+
+ <delete dir="Jetspeed_Portal" failonerror="false" />
+
+ <delete dir="temp" failonerror="false" />
+
+ <delete file="installpack.zip" failonerror="false" />
+
+ <delete file="Jetspeed2.1-install.jar" failonerror="false" />
+
+ <delete file="Jetspeed2.1-Full-install.jar" failonerror="false"
/>
+
+ <delete file="Jetspeed2.1-Min-install.jar" failonerror="false"
/>
+
+ <delete dir="tomcat" failonerror="false" />
+
+ <delete dir="tomcat-compat" failonerror="false" />
+
+ <delete dir="selfextract" failonerror="false" />
+
+ <delete dir="database" failonerror="false" />
+
+ <delete dir="portlet_apps" failonerror="false" />
+
+ </target>
+
+</project>
+
Modified: portals/jetspeed-2/trunk/installer2/build.xml
URL:
http://svn.apache.org/viewvc/portals/jetspeed-2/trunk/installer2/build.xml?view=diff&rev=512202&r1=512201&r2=512202
==============================================================================
--- portals/jetspeed-2/trunk/installer2/build.xml (original)
+++ portals/jetspeed-2/trunk/installer2/build.xml Tue Feb 27 02:08:03 2007
@@ -1,142 +1,283 @@
-<project name="JetspeedInstaller" default="install" basedir="${basedir}">
-
- <property name="jetspeedDir" value="${installDir}/webapps/jetspeed" />
- <property name="portletAppsDir" value="${installDir}/portlet_apps"/>
- <property name="dbName" value="derby"/>
- <property name="dbUser" value=""/>
- <property name="dbPassword" value=""/>
- <property name="jdbcUrl"
value="jdbc:derby:${installDir}/webapps/jetspeed/WEB-INF/productiondb;create=true"/>
- <property name="jdbcDriverClass"
value="org.apache.derby.jdbc.EmbeddedDriver"/>
-
-
- <target name="install" >
- <echo>basic install starting</echo>
- <mkdir dir="${basedir}/temp"/>
- <unzip src="installpack.zip" dest="${basedir}/temp"/>
- <echo>install unpack done</echo>
-
- <echo> moving stuff from the temp dir </echo>
- <echo>now configuring</echo>
- <copy todir="${installDir}" overwrite="true">
- <fileset dir="${basedir}/temp">
- <exclude name="**/jetspeed.xml"/>
- </fileset>
- </copy>
-
- <echo>unpacking jetspeed war</echo>
- <unwar src="${installDir}/webapps/jetspeed.war"
dest="${installDir}/webapps/jetspeed" />
- <copy file="temp/jetspeed-tomcat-5.5.xml"
- tofile="${installDir}/conf/Catalina/localhost/jetspeed.xml"
overwrite="true">
- <filterset begintoken="@" endtoken="@">
- <filter token="CONTEXT" value="jetspeed"/>
- <filter token="USERNAME" value="${dbUser}"/>
- <filter token="PASSWORD" value="${dbPassword}"/>
- <filter token="DRIVER" value="${jdbcDriverClass}"/>
- <filter token="URL" value="${jdbcUrl}"/>
- </filterset>
- </copy>
-
- <echo>copying database driver jar</echo>
- <!-- place db jar in shared.. we assume the Catalina will not need to
talk to this -->
- <copy failonerror="false" file="${jdbcDriverJar}"
todir="${installDir}/shared/lib" overwrite="true" />
- <echo>fixing permissions</echo>
- <chmod perm="700" dir="${installDir}/bin" includes="**/*.sh"/>
- <echo>basic install finished</echo>
- </target>
-
- <target name="generateDb">
- <echo>starting Db generation</echo>
- <sql driver="${jdbcDriverClass}" url="${jdbcUrl}" userid="${dbUser}"
- password="${dbPassword}"
- src="${basedir}/database/${dbName}/schema/phase1-schema.sql"
- print="yes" output="outputfile.txt">
- <classpath>
- <pathelement location="${jdbcDriverJar}"/>
- </classpath>
- </sql>
- <sql driver="${jdbcDriverClass}" url="${jdbcUrl}" userid="${dbUser}"
- password="${dbPassword}"
- src="${basedir}/database/${dbName}/schema/phase2-schema.sql"
- print="yes" output="outputfile.txt">
- <classpath>
- <pathelement location="${jdbcDriverJar}"/>
- </classpath>
- </sql>
- <sql driver="${jdbcDriverClass}" url="${jdbcUrl}" userid="${dbUser}"
- password="${dbPassword}"
- src="${basedir}/database/${dbName}/schema/phase3ojb-schema.sql"
- print="yes" output="outputfile.txt">
- <classpath>
- <pathelement location="${jdbcDriverJar}"/>
- </classpath>
- </sql>
- <sql driver="${jdbcDriverClass}" url="${jdbcUrl}" userid="${dbUser}"
- password="${dbPassword}"
- src="${basedir}/database/${dbName}/schema/prefs-schema.sql"
- print="yes" output="outputfile.txt">
- <classpath>
- <pathelement location="${jdbcDriverJar}"/>
- </classpath>
- </sql>
- <sql driver="${jdbcDriverClass}" url="${jdbcUrl}" userid="${dbUser}"
- password="${dbPassword}"
- src="${basedir}/database/${dbName}/schema/registry-schema.sql"
- print="yes" output="outputfile.txt">
- <classpath>
- <pathelement location="${jdbcDriverJar}"/>
- </classpath>
- </sql>
- <sql driver="${jdbcDriverClass}" url="${jdbcUrl}" userid="${dbUser}"
- password="${dbPassword}"
- src="${basedir}/database/${dbName}/schema/security-schema.sql"
- print="yes" output="outputfile.txt">
- <classpath>
- <pathelement location="${jdbcDriverJar}"/>
- </classpath>
- </sql>
- <sql driver="${jdbcDriverClass}" url="${jdbcUrl}" userid="${dbUser}"
- password="${dbPassword}"
-
src="${basedir}/database/${dbName}/populate-userinfo-for-default-psml.sql"
- print="yes" output="outputfile.txt">
- <classpath>
- <pathelement location="${jdbcDriverJar}"/>
- </classpath>
- </sql>
- <sql driver="${jdbcDriverClass}" url="${jdbcUrl}" userid="${dbUser}"
- password="${dbPassword}"
- src="${basedir}/database/populate-db-default.sql" print="yes"
- output="outputfile.txt">
- <classpath>
- <pathelement location="${jdbcDriverJar}"/>
- </classpath>
- </sql>
- <echo>DB generation done!</echo>
- </target>
-
- <target name="layoutPortlets">
- <copy todir="${installDir}/webapps/jetspeed/WEB-INF/deploy"
file="${basedir}/portlet_apps/jetspeed-layouts.war" />
- </target>
- <target name="demoPortlets">
- <copy todir="${installDir}/webapps/jetspeed/WEB-INF/deploy"
file="${basedir}/portlet_apps/demo.war" />
- </target>
- <target name="j2admin">
- <copy
todir="${installDir}/webapps/jetspeed/WEB-INF/deploy"
file="${basedir}/portlet_apps/j2-admin.war" />
- <delete
file="${installDir}/webapps/jetspeed/WEB-INF/deploy/zipsucks" />
- </target>
- <target name="jpetstorePortlets">
- <copy
todir="${installDir}/webapps/jetspeed/WEB-INF/deploy"
file="${basedir}/portlet_apps/jpetstore.war" />
- </target>
- <target name="jsfPortlets">
- <copy
todir="${installDir}/webapps/jetspeed/WEB-INF/deploy"
file="${basedir}/portlet_apps/jsf-demo.war" />
- </target>
- <target name="perlPortlets">
- <copy todir="${installDir}/webapps/jetspeed/WEB-INF/deploy"
file="${basedir}/portlet_apps/perl.war" />
- </target>
- <target name="phpPortlets">
- <copy todir="${installDir}/webapps/jetspeed/WEB-INF/deploy"
file="${basedir}/portlet_apps/php.war" />
- </target>
- <target name="rssPortlets">
- <copy todir="${installDir}/webapps/jetspeed/WEB-INF/deploy"
file="${basedir}/portlet_apps/rss.war" />
- </target>
-
-</project>
+<project name="JetspeedInstaller" default="install" basedir="${basedir}">
+
+ <property name="jetspeedDir" value="${installDir}/webapps/jetspeed" />
+ <property name="portletAppsDir" value="${installDir}/portlet_apps"/>
+ <property name="dbName" value="derby"/>
+ <property name="dbUser" value=""/>
+ <property name="dbPassword" value=""/>
+ <property name="jdbcUrl"
value="jdbc:derby:${installDir}/webapps/jetspeed/WEB-INF/productiondb;create=true"/>
+ <property name="jdbcDriverClass"
value="org.apache.derby.jdbc.EmbeddedDriver"/>
+
+
+ <target name="install" >
+ <echo>basic install starting</echo>
+ <mkdir dir="${basedir}/temp"/>
+ <unzip src="installpack.zip" dest="${basedir}/temp"/>
+
+
+ <condition property="fork.db" value="true">
+ <equals arg1="${dbName}" arg2="derby"/>
+ </condition>
+
+ <property name="DATAFILE" value="${basedir}/database/j2-seed.xml"/>
+
+ <echo>install unpack done</echo>
+
+ <echo> moving stuff from the temp dir </echo>
+ <echo>now configuring</echo>
+ <copy todir="${installDir}" overwrite="true">
+ <fileset dir="${basedir}/temp">
+ <exclude name="**/jetspeed.xml"/>
+ </fileset>
+ </copy>
+
+ <echo>unpacking jetspeed war</echo>
+ <unwar src="${installDir}/webapps/jetspeed.war"
dest="${installDir}/webapps/jetspeed" />
+ <copy file="temp/jetspeed-tomcat-5.5.xml"
+ tofile="${installDir}/conf/Catalina/localhost/jetspeed.xml"
overwrite="true">
+ <filterset begintoken="@" endtoken="@">
+ <filter token="CONTEXT" value="jetspeed"/>
+ <filter token="USERNAME" value="${dbUser}"/>
+ <filter token="PASSWORD" value="${dbPassword}"/>
+ <filter token="DRIVER" value="${jdbcDriverClass}"/>
+ <filter token="URL" value="${jdbcUrl}"/>
+ </filterset>
+ </copy>
+
+ <echo>copying database driver jar</echo>
+ <!-- place db jar in shared.. we assume the Catalina will not need to
talk to this -->
+ <copy failonerror="false" file="${jdbcDriverJar}"
todir="${installDir}/shared/lib" overwrite="true" />
+ <echo>fixing permissions</echo>
+ <chmod perm="700" dir="${installDir}/bin" includes="**/*.sh"/>
+ <echo>basic install finished</echo>
+ </target>
+
+ <target name="MinInstall">
+
+ <property name="DATAFILE"
value="${basedir}/database/min/j2-seed.xml"/>
+ <echo>resetting DATAFILE for seed data to
${DATAFILE}</echo>
+
+ </target>
+
+ <target name="generateStandardDb" unless="fork.db">
+ <echo>starting Db generation</echo>
+ <sql driver="${jdbcDriverClass}" url="${jdbcUrl}"
userid="${dbUser}"
+ password="${dbPassword}"
+ src="${basedir}/database/${dbName}/schema/phase1-schema.sql"
+ print="yes" output="outputfile.txt">
+ <classpath>
+ <pathelement location="${jdbcDriverJar}"/>
+ </classpath>
+ </sql>
+ <sql driver="${jdbcDriverClass}" url="${jdbcUrl}"
userid="${dbUser}"
+ password="${dbPassword}"
+ src="${basedir}/database/${dbName}/schema/phase2-schema.sql"
+ print="yes" output="outputfile.txt">
+ <classpath>
+ <pathelement location="${jdbcDriverJar}"/>
+ </classpath>
+ </sql>
+ <sql driver="${jdbcDriverClass}" url="${jdbcUrl}"
userid="${dbUser}"
+ password="${dbPassword}"
+
src="${basedir}/database/${dbName}/schema/phase3ojb-schema.sql"
+ print="yes" output="outputfile.txt">
+ <classpath>
+ <pathelement location="${jdbcDriverJar}"/>
+ </classpath>
+ </sql>
+ <sql driver="${jdbcDriverClass}" url="${jdbcUrl}"
userid="${dbUser}"
+ password="${dbPassword}"
+ src="${basedir}/database/${dbName}/schema/prefs-schema.sql"
+ print="yes" output="outputfile.txt">
+ <classpath>
+ <pathelement location="${jdbcDriverJar}"/>
+ </classpath>
+ </sql>
+ <sql driver="${jdbcDriverClass}" url="${jdbcUrl}"
userid="${dbUser}"
+ password="${dbPassword}"
+
src="${basedir}/database/${dbName}/schema/registry-schema.sql"
+ print="yes" output="outputfile.txt">
+ <classpath>
+ <pathelement location="${jdbcDriverJar}"/>
+ </classpath>
+ </sql>
+ <sql driver="${jdbcDriverClass}" url="${jdbcUrl}"
userid="${dbUser}"
+ password="${dbPassword}"
+
src="${basedir}/database/${dbName}/schema/security-schema.sql"
+ print="yes" output="outputfile.txt">
+ <classpath>
+ <pathelement location="${jdbcDriverJar}"/>
+ </classpath>
+ </sql>
+ <echo>DB generation done!</echo>
+ </target>
+
+
+
+
+
+ <target name="generateDerby" if="fork.db">
+ <antcall target="createDerbyDB">
+ <param name="databaseScript"
value="${basedir}/database/${dbName}/schema/phase1-schema.sql"/>
+ </antcall>
+ <antcall target="createDerbyDB">
+ <param name="databaseScript"
value="${basedir}/database/${dbName}/schema/phase2-schema.sql"/>
+ </antcall>
+ <antcall target="createDerbyDB">
+ <param name="databaseScript"
value="${basedir}/database/${dbName}/schema/phase3ojb-schema.sql"/>
+ </antcall>
+ <antcall target="createDerbyDB">
+ <param name="databaseScript"
value="${basedir}/database/${dbName}/schema/prefs-schema.sql"/>
+ </antcall>
+ <antcall target="createDerbyDB">
+ <param name="databaseScript"
value="${basedir}/database/${dbName}/schema/registry-schema.sql"/>
+ </antcall>
+ <antcall target="createDerbyDB">
+ <param name="databaseScript"
value="${basedir}/database/${dbName}/schema/security-schema.sql"/>
+ </antcall>
+
+ </target>
+
+
+ <target name="generateDb" depends="generateStandardDb, generateDerby" >
+ </target>
+
+ <target name="layoutPortlets">
+ <copy todir="${installDir}/webapps/jetspeed/WEB-INF/deploy"
file="${basedir}/portlet_apps/jetspeed-layouts.war" />
+ </target>
+ <target name="demoPortlets">
+ <copy todir="${installDir}/webapps/jetspeed/WEB-INF/deploy"
file="${basedir}/portlet_apps/demo.war" />
+ </target>
+ <target name="j2admin">
+ <copy
todir="${installDir}/webapps/jetspeed/WEB-INF/deploy"
file="${basedir}/portlet_apps/j2-admin.war" />
+ </target>
+ <target name="jpetstorePortlets">
+ <copy
todir="${installDir}/webapps/jetspeed/WEB-INF/deploy"
file="${basedir}/portlet_apps/jpetstore.war" />
+ </target>
+ <target name="jsfPortlets">
+ <copy
todir="${installDir}/webapps/jetspeed/WEB-INF/deploy"
file="${basedir}/portlet_apps/jsf-demo.war" />
+ </target>
+ <target name="perlPortlets">
+ <copy todir="${installDir}/webapps/jetspeed/WEB-INF/deploy"
file="${basedir}/portlet_apps/perl.war" />
+ </target>
+ <target name="phpPortlets">
+ <copy todir="${installDir}/webapps/jetspeed/WEB-INF/deploy"
file="${basedir}/portlet_apps/php.war" />
+ </target>
+ <target name="rssPortlets">
+ <copy todir="${installDir}/webapps/jetspeed/WEB-INF/deploy"
file="${basedir}/portlet_apps/rss.war" />
+ </target>
+
+
+
+ <!-- ============== Data-Serializer for seed data============== -->
+ <target name='populateDB'>
+
+ <mkdir dir="${basedir}/temp/dbseed"/>
+
+ <property name="assemblyDir" value="${basedir}/temp/dbseed/assembly"/>
+
+
+ <echo> Data-Serializer based on ${assemblyDir}</echo>
+
+ <!-- copy assembly files -->
+ <mkdir dir="${assemblyDir}"/>
+ <copy todir="${assemblyDir}" overwrite="true" failonerror="true">
+ <fileset dir="${installDir}/webapps/jetspeed/WEB-INF/assembly">
+ <include name="security*.xml"/>
+ <include name="capabilities.xml"/>
+ <include name="prefs.xml"/>
+ <include name="profiler.xml"/>
+ <include name="registry.xml"/>
+ <include name="transaction.xml"/>
+ <include name="cache.xml"/>
+ </fileset>
+ </copy>
+
+
+ <copy todir="${assemblyDir}" overwrite="true"
failonerror="true">
+ <fileset
dir="${installDir}/webapps/jetspeed/WEB-INF/assembly/alternate/">
+ <include name="request-context.xml"/>
+ </fileset>
+ </copy>
+
+
+
+ <!-- copy boot files -->
+
+
+ <mkdir dir="${assemblyDir}/boot"/>
+
+ <copy todir="${assemblyDir}/boot" overwrite="true" failonerror="true">
+ <fileset dir="${jetspeedDir}/WEB-INF/assembly/boot">
+ <include name="*.xml"/>
+ </fileset>
+ </copy>
+
+ <echo> running seed with data: ${DATAFILE} arguments: -b
${assemblyDir}/boot/ -c ${assemblyDir}/ database-url:
${org.apache.jetspeed.database.url}</echo>
+
+
+ <java
classname="org.apache.jetspeed.serializer.JetspeedSerializerApplication"
fork="yes">
+ <classpath>
+ <pathelement path="${classpath}"/>
+ <fileset dir="${installDir}/shared/lib">
+ <include name="**/*.jar"/>
+ </fileset>
+ <fileset dir="${jetspeedDir}/WEB-INF/lib">
+ <include name="**/*.jar"/>
+ </fileset>
+ <fileset dir="${installDir}/temp_install">
+ <include name="**/*.jar"/>
+ </fileset>
+ <fileset dir="${installDir}/common/lib">
+ <include name="**/*.jar"/>
+ </fileset>
+ <pathelement location="${jdbcDriverJar}"/>
+ <pathelement location="${installDir}/shared/classes"/>
+ <pathelement location="${jetspeedDir}/WEB-INF/classes"/>
+ </classpath>
+
+ <arg line="-I "${DATAFILE}" -a ${jetspeedDir} -b
${assemblyDir}/boot/ -c ${assemblyDir}/ -dc ${jdbcDriverClass} -ds ${jdbcUrl}
-du ${dbUser} -dp ${dbPassword}"/>
+ </java>
+ </target>
+
+ <!-- ============== Data-Serializer for seed data============== -->
+ <target name='createDerbyDB'>
+
+
+ <echo> createDerbyDB for ${databaseScript}</echo>
+
+
+
+ <java classname="org.apache.jetspeed.anttasks.ExecuteJavaSQL"
fork="yes">
+ <classpath>
+ <pathelement path="${classpath}"/>
+ <fileset dir="${installDir}/shared/lib">
+ <include name="**/*.jar"/>
+ </fileset>
+ <fileset dir="${jetspeedDir}/WEB-INF/lib">
+ <include name="**/*.jar"/>
+ </fileset>
+ <fileset dir="${installDir}/temp_install">
+ <include name="**/*.jar"/>
+ </fileset>
+ <fileset dir="${installDir}/common/lib">
+ <include name="**/*.jar"/>
+ </fileset>
+ <pathelement location="${jdbcDriverJar}"/>
+ <pathelement location="${installDir}/shared/classes"/>
+ <pathelement location="${jetspeedDir}/WEB-INF/classes"/>
+ </classpath>
+
+
+ <arg line="driver=${jdbcDriverClass}
+ url=${jdbcUrl}
+ userid=${dbUser}
+ password=${dbPassword}
+ src="${databaseScript}" autocommit=true
+ onerror=abort"/>
+ </java>
+
+ </target>
+
+
+</project>
Modified: portals/jetspeed-2/trunk/maven-plugin/plugin.jelly
URL:
http://svn.apache.org/viewvc/portals/jetspeed-2/trunk/maven-plugin/plugin.jelly?view=diff&rev=512202&r1=512201&r2=512202
==============================================================================
--- portals/jetspeed-2/trunk/maven-plugin/plugin.jelly (original)
+++ portals/jetspeed-2/trunk/maven-plugin/plugin.jelly Tue Feb 27 02:08:03 2007
@@ -1063,7 +1063,7 @@
</j:if>
</goal>
- <goal name="j2:buildMultiDbSQL" >
+ <goal name="j2:buildDbSQL" >
<!-- 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" />
@@ -1100,16 +1100,18 @@
</goal>
- <goal name="j2:buildDerbyInstaller">
- <ant:property name="install.name" value="Jetspeed2.1-derby" />
- <ant:copy file="${basedir}/installer2/antinstall-config-derby.xml"
tofile="${basedir}/installer2/antinstall-config.xml" overwrite="true" />
+ <goal name="j2:buildMinInstaller">
+ <attainGoal name="j2:buildDbSQL" />
+ <ant:property name="install.name" value="Jetspeed2.1-Min" />
+ <ant:copy file="${basedir}/installer2/antinstall-config-min.xml"
tofile="${basedir}/installer2/antinstall-config.xml" overwrite="true" />
+ <ant:property name="install.minOnly" value="true" />
<ant:ant dir="${basedir}/installer2" antfile="build-installer.xml"
target="selfextract" />
</goal>
- <goal name="j2:buildMultiInstaller">
- <attainGoal name="j2:buildMultiDbSQL" />
- <ant:property name="install.name" value="Jetspeed2.1-MultiDB" />
- <ant:copy file="${basedir}/installer2/antinstall-config-multi.xml"
tofile="${basedir}/installer2/antinstall-config.xml" overwrite="true" />
+ <goal name="j2:buildFullInstaller">
+ <attainGoal name="j2:buildDbSQL" />
+ <ant:property name="install.name" value="Jetspeed2.1-Full" />
+ <ant:copy file="${basedir}/installer2/antinstall-config-full.xml"
tofile="${basedir}/installer2/antinstall-config.xml" overwrite="true" />
<ant:ant dir="${basedir}/installer2" antfile="build-installer.xml"
target="selfextract" />
</goal>
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
