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 2006/03/30 09:30:58 UTC
svn commit: r390021 - in /portals/jetspeed-2/trunk: app-servers/ commons/
jetspeed-api/
maven-archetypes/portal/src/archetype/archetype-resources/app-servers/
Author: rwatler
Date: Wed Mar 29 23:30:55 2006
New Revision: 390021
URL: http://svn.apache.org/viewcvs?rev=390021&view=rev
Log:
Maven2 checkpoint: shared component deployment/hot deployment cleanup
Modified:
portals/jetspeed-2/trunk/app-servers/build.xml
portals/jetspeed-2/trunk/app-servers/pom.xml
portals/jetspeed-2/trunk/app-servers/tomcat-build.xml
portals/jetspeed-2/trunk/commons/pom.xml
portals/jetspeed-2/trunk/jetspeed-api/pom.xml
portals/jetspeed-2/trunk/maven-archetypes/portal/src/archetype/archetype-resources/app-servers/build.xml
portals/jetspeed-2/trunk/maven-archetypes/portal/src/archetype/archetype-resources/app-servers/pom.xml
portals/jetspeed-2/trunk/maven-archetypes/portal/src/archetype/archetype-resources/app-servers/tomcat-build.xml
Modified: portals/jetspeed-2/trunk/app-servers/build.xml
URL: http://svn.apache.org/viewcvs/portals/jetspeed-2/trunk/app-servers/build.xml?rev=390021&r1=390020&r2=390021&view=diff
==============================================================================
--- portals/jetspeed-2/trunk/app-servers/build.xml (original)
+++ portals/jetspeed-2/trunk/app-servers/build.xml Wed Mar 29 23:30:55 2006
@@ -52,10 +52,11 @@
<target name="help">
<echo message="Buildfile for the app-servers maven POM."/>
- <echo message="Usage: ant [ deploy | hot-deploy | hot-deploy-jar | hot-deploy-war ]"/>
+ <echo message="Usage: ant [ deploy | hot-deploy | hot-deploy-shared-jar | hot-deploy-jar | hot-deploy-war ]"/>
<echo message="Where:"/>
<echo message=" deploy - deploy to the target app server."/>
<echo message=" hot-deploy - hot deploy content and applications to the target app server."/>
+ <echo message=" hot-deploy-shared-jar - hot deploy shared component jar to the target app server."/>
<echo message=" hot-deploy-jar - hot deploy component jar to the target app server."/>
<echo message=" hot-deploy-war - hot deploy application war to the target app server."/>
<echo message="Configuration:"/>
@@ -104,6 +105,13 @@
</target>
+ <target name="hot-deploy-shared-jar" depends="test-deploy-target, test-deploy-skip" unless="org.apache.jetspeed.skip">
+
+ <antcall target="unsupported-deploy"/>
+ <antcall target="invoke-hot-deploy-shared-jar"/>
+
+ </target>
+
<target name="hot-deploy-jar" depends="test-deploy-target, test-deploy-skip" unless="org.apache.jetspeed.skip">
<antcall target="unsupported-deploy"/>
@@ -198,6 +206,8 @@
value="${org.apache.jetspeed.groupid}"/>
<property name="org.apache.jetspeed.version"
value="${org.apache.jetspeed.version}"/>
+ <property name="org.apache.portals.bridges.common.version"
+ value="${org.apache.portals.bridges.common.version}"/>
<property name="org.apache.portals.bridges.jpetstore.version"
value="${org.apache.portals.bridges.jpetstore.version}"/>
<property name="org.apache.portals.bridges.jsf-demo.version"
@@ -206,6 +216,21 @@
value="${org.apache.portals.bridges.perl.version}"/>
<property name="org.apache.portals.bridges.php.version"
value="${org.apache.portals.bridges.php.version}"/>
+ <property name="org.apache.pluto.version"
+ value="${org.apache.pluto.version}"/>
+ <property name="portlet-api.version"
+ value="${portlet-api.version}"/>
+ </ant>
+ </target>
+
+ <target name="invoke-hot-deploy-shared-jar" unless="org.apache.jetspeed.unsupported">
+ <ant antfile="${basedir}/${org.apache.jetspeed.deploy.target}-build.xml" dir="${basedir}" target="hot-deploy-shared-jar" inheritall="off">
+ <property name="org.apache.jetspeed.deploy.groupid"
+ value="${org.apache.jetspeed.deploy.groupid}"/>
+ <property name="org.apache.jetspeed.deploy.artifactid"
+ value="${org.apache.jetspeed.deploy.artifactid}"/>
+ <property name="org.apache.jetspeed.deploy.version"
+ value="${org.apache.jetspeed.deploy.version}"/>
</ant>
</target>
Modified: portals/jetspeed-2/trunk/app-servers/pom.xml
URL: http://svn.apache.org/viewcvs/portals/jetspeed-2/trunk/app-servers/pom.xml?rev=390021&r1=390020&r2=390021&view=diff
==============================================================================
--- portals/jetspeed-2/trunk/app-servers/pom.xml (original)
+++ portals/jetspeed-2/trunk/app-servers/pom.xml Wed Mar 29 23:30:55 2006
@@ -121,6 +121,8 @@
value="${pom.groupId}"/>
<property name="org.apache.jetspeed.version"
value="${pom.version}"/>
+ <property name="org.apache.portals.bridges.common.version"
+ value="${org.apache.portals.bridges.common.version}"/>
<property name="org.apache.portals.bridges.jpetstore.version"
value="${org.apache.portals.bridges.jpetstore.version}"/>
<property name="org.apache.portals.bridges.jsf-demo.version"
@@ -129,6 +131,10 @@
value="${org.apache.portals.bridges.perl.version}"/>
<property name="org.apache.portals.bridges.php.version"
value="${org.apache.portals.bridges.php.version}"/>
+ <property name="org.apache.pluto.version"
+ value="${org.apache.pluto.version}"/>
+ <property name="portlet-api.version"
+ value="${portlet-api.version}"/>
</ant>
</tasks>
Modified: portals/jetspeed-2/trunk/app-servers/tomcat-build.xml
URL: http://svn.apache.org/viewcvs/portals/jetspeed-2/trunk/app-servers/tomcat-build.xml?rev=390021&r1=390020&r2=390021&view=diff
==============================================================================
--- portals/jetspeed-2/trunk/app-servers/tomcat-build.xml (original)
+++ portals/jetspeed-2/trunk/app-servers/tomcat-build.xml Wed Mar 29 23:30:55 2006
@@ -49,10 +49,11 @@
<target name="help">
<echo message="Buildfile for the app-servers Tomcat deployment."/>
- <echo message="Usage: ant [ deploy | hot-deploy | hot-deploy-jar | hot-deploy-war ]"/>
+ <echo message="Usage: ant [ deploy | hot-deploy | hot-deploy-shared-jar | hot-deploy-jar | hot-deploy-war ]"/>
<echo message="Where:"/>
<echo message=" deploy - deploy to Tomcat app server."/>
<echo message=" hot-deploy - hot deploy content and applications Tomcat app server."/>
+ <echo message=" hot-deploy-shared-jar - hot deploy shared component jar Tomcat app server."/>
<echo message=" hot-deploy-jar - hot deploy component jar Tomcat app server."/>
<echo message=" hot-deploy-war - hot deploy application war Tomcat app server."/>
<echo message="Configuration:"/>
@@ -91,35 +92,7 @@
<target name="deploy" depends="version-5-5, test-embedded-database, test-deploy-type">
<!-- deploy provided libraries in shared/lib -->
- <delete>
- <fileset dir="${org.apache.jetspeed.server.home}/shared/lib">
- <include name="pluto-*.jar"/>
- <include name="portals-bridges-common-*.jar"/>
- <include name="jetspeed-commons-*.jar"/>
- <include name="jetspeed-api-*.jar"/>
- <include name="portlet-api-*.jar"/>
- </fileset>
- </delete>
- <dependencies filesetId="shared.lib.dependencies.id" useScope="runtime">
- <dependency groupId="org.apache.pluto"
- artifactId="pluto"
- version="${org.apache.pluto.version}"/>
- <dependency groupId="org.apache.portals.bridges"
- artifactId="portals-bridges-common"
- version="${org.apache.portals.bridges.common.version}"/>
- <dependency groupId="${org.apache.jetspeed.groupid}"
- artifactId="jetspeed-commons"
- version="${org.apache.jetspeed.version}"/>
- <dependency groupId="${org.apache.jetspeed.groupid}"
- artifactId="jetspeed-api"
- version="${org.apache.jetspeed.version}"/>
- <dependency groupId="portlet-api"
- artifactId="portlet-api"
- version="${portlet-api.version}"/>
- </dependencies>
- <copy todir="${org.apache.jetspeed.server.home}/shared/lib" flatten="on">
- <fileset refid="shared.lib.dependencies.id"/>
- </copy>
+ <antcall target="deploy-shared-components"/>
<!-- deploy embedded database in shared/lib -->
<antcall target="embedded-database-derby"/>
@@ -170,6 +143,9 @@
<target name="hot-deploy" depends="test-deploy-type">
+ <!-- hot deploy provided libraries in shared/lib -->
+ <antcall target="hot-deploy-shared-components"/>
+
<!-- hot deploy templates content -->
<copy todir="${org.apache.jetspeed.server.home}/webapps/jetspeed/WEB-INF/templates">
<fileset dir="${basedir}/../src/webapp/WEB-INF/templates"/>
@@ -190,6 +166,19 @@
</target>
+ <target name="hot-deploy-shared-jar">
+ <!-- hot deploy shared component -->
+ <dependencies filesetId="shared.lib.dependencies.id" useScope="runtime">
+ <dependency groupId="${org.apache.jetspeed.deploy.groupid}"
+ artifactId="${org.apache.jetspeed.deploy.artifactid}"
+ version="${org.apache.jetspeed.deploy.version}"/>
+ </dependencies>
+ <!-- copy the artifact and any dependencies -->
+ <copy todir="${org.apache.jetspeed.server.home}/shared/lib" flatten="on">
+ <fileset refid="shared.lib.dependencies.id"/>
+ </copy>
+ </target>
+
<target name="hot-deploy-jar">
<!-- hot deploy component -->
<dependencies filesetId="component.dependencies.id" useScope="runtime">
@@ -272,8 +261,22 @@
</condition>
</target>
+ <target name="deploy-shared-components">
+ <!-- deploy embedded derby database in shared/lib -->
+ <delete>
+ <fileset dir="${org.apache.jetspeed.server.home}/shared/lib">
+ <include name="pluto-*.jar"/>
+ <include name="portals-bridges-common-*.jar"/>
+ <include name="jetspeed-commons-*.jar"/>
+ <include name="jetspeed-api-*.jar"/>
+ <include name="portlet-api-*.jar"/>
+ </fileset>
+ </delete>
+ <antcall target="hot-deploy-shared-components"/>
+ </target>
+
<target name="embedded-database-derby" if="org.apache.jetspeed.production.database.is.derby.embedded">
- <!-- Deploy embedded derby database in shared/lib -->
+ <!-- deploy embedded derby database in shared/lib -->
<delete>
<fileset dir="${org.apache.jetspeed.server.home}/shared/lib">
<include name="derby-*.jar"/>
@@ -290,7 +293,7 @@
</target>
<target name="embedded-database-hsql" if="org.apache.jetspeed.production.database.is.hsql.embedded">
- <!-- Deploy embedded hsql database in shared/lib -->
+ <!-- deploy embedded hsql database in shared/lib -->
<delete>
<fileset dir="${org.apache.jetspeed.server.home}/shared/lib">
<include name="hsqldb-*.jar"/>
@@ -346,6 +349,35 @@
</fileset>
</delete>
<antcall target="hot-deploy-full-apps"/>
+ </target>
+
+ <target name="hot-deploy-shared-components">
+ <!-- hot deploy shared components -->
+ <antcall target="hot-deploy-shared-jar">
+ <param name="org.apache.jetspeed.deploy.groupid" value="org.apache.pluto"/>
+ <param name="org.apache.jetspeed.deploy.artifactid" value="pluto"/>
+ <param name="org.apache.jetspeed.deploy.version" value="${org.apache.pluto.version}"/>
+ </antcall>
+ <antcall target="hot-deploy-shared-jar">
+ <param name="org.apache.jetspeed.deploy.groupid" value="org.apache.portals.bridges"/>
+ <param name="org.apache.jetspeed.deploy.artifactid" value="portals-bridges-common"/>
+ <param name="org.apache.jetspeed.deploy.version" value="${org.apache.portals.bridges.common.version}"/>
+ </antcall>
+ <antcall target="hot-deploy-shared-jar">
+ <param name="org.apache.jetspeed.deploy.groupid" value="${org.apache.jetspeed.groupid}"/>
+ <param name="org.apache.jetspeed.deploy.artifactid" value="jetspeed-commons"/>
+ <param name="org.apache.jetspeed.deploy.version" value="${org.apache.jetspeed.version}"/>
+ </antcall>
+ <antcall target="hot-deploy-shared-jar">
+ <param name="org.apache.jetspeed.deploy.groupid" value="${org.apache.jetspeed.groupid}"/>
+ <param name="org.apache.jetspeed.deploy.artifactid" value="jetspeed-api"/>
+ <param name="org.apache.jetspeed.deploy.version" value="${org.apache.jetspeed.version}"/>
+ </antcall>
+ <antcall target="hot-deploy-shared-jar">
+ <param name="org.apache.jetspeed.deploy.groupid" value="portlet-api"/>
+ <param name="org.apache.jetspeed.deploy.artifactid" value="portlet-api"/>
+ <param name="org.apache.jetspeed.deploy.version" value="${portlet-api.version}"/>
+ </antcall>
</target>
<target name="hot-deploy-min-pages" if="org.apache.jetspeed.deploy.min.pages">
Modified: portals/jetspeed-2/trunk/commons/pom.xml
URL: http://svn.apache.org/viewcvs/portals/jetspeed-2/trunk/commons/pom.xml?rev=390021&r1=390020&r2=390021&view=diff
==============================================================================
--- portals/jetspeed-2/trunk/commons/pom.xml (original)
+++ portals/jetspeed-2/trunk/commons/pom.xml Wed Mar 29 23:30:55 2006
@@ -51,6 +51,75 @@
</dependencies>
+ <!-- Build Configuration -->
+
+ <build>
+ <plugins>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-antrun-plugin</artifactId>
+ <executions>
+ <execution>
+ <id>hot-deploy-shared-component</id>
+ <phase>install</phase>
+ <configuration>
+ <tasks>
+ <ant target="hot-deploy-shared-jar" antfile="build.xml" dir="${basedir}/../app-servers" inheritall="off">
+ <property name="org.apache.jetspeed.deploy.enable"
+ value="${org.apache.jetspeed.env.hotdeploy}"/>
+ <property name="org.apache.jetspeed.deploy.target"
+ value="${org.apache.jetspeed.env.deploy.target}"/>
+ <property name="org.apache.jetspeed.server.home"
+ value="${org.apache.jetspeed.server.home}"/>
+ <property name="org.apache.jetspeed.deploy.groupid"
+ value="${pom.groupId}"/>
+ <property name="org.apache.jetspeed.deploy.artifactid"
+ value="${pom.artifactId}"/>
+ <property name="org.apache.jetspeed.deploy.version"
+ value="${pom.version}"/>
+ </ant>
+ </tasks>
+ </configuration>
+ <goals>
+ <goal>run</goal>
+ </goals>
+ </execution>
+ </executions>
+ <!--
+ Bug: All plugin dependencies must be copied to the first instance
+ of the maven-antrun-plugin run, (e.g. to the root pom), since the
+ first set of deps sticks for the entire maven2 execution cycle.
+ Bug: Plugin dependencies are not propagated from pluginManagement.
+ Bug: Versions must be specified here and not in dependencyManagement.
+
+ Note: All three ant dependencies are listed to keep nodeps in sync.
+ -->
+ <dependencies>
+ <dependency>
+ <groupId>ant</groupId>
+ <artifactId>ant</artifactId>
+ <version>${ant.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>ant</groupId>
+ <artifactId>ant-launcher</artifactId>
+ <version>${ant.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>ant</groupId>
+ <artifactId>ant-nodeps</artifactId>
+ <version>${ant.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.maven</groupId>
+ <artifactId>maven-artifact-ant</artifactId>
+ <version>${org.apache.maven.artifact.ant.version}</version>
+ </dependency>
+ </dependencies>
+ </plugin>
+ </plugins>
+ </build>
+
<!-- Project Information -->
<scm>
Modified: portals/jetspeed-2/trunk/jetspeed-api/pom.xml
URL: http://svn.apache.org/viewcvs/portals/jetspeed-2/trunk/jetspeed-api/pom.xml?rev=390021&r1=390020&r2=390021&view=diff
==============================================================================
--- portals/jetspeed-2/trunk/jetspeed-api/pom.xml (original)
+++ portals/jetspeed-2/trunk/jetspeed-api/pom.xml Wed Mar 29 23:30:55 2006
@@ -39,6 +39,75 @@
Core API for implementing Jetspeed.
</description>
+ <!-- Build Configuration -->
+
+ <build>
+ <plugins>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-antrun-plugin</artifactId>
+ <executions>
+ <execution>
+ <id>hot-deploy-shared-component</id>
+ <phase>install</phase>
+ <configuration>
+ <tasks>
+ <ant target="hot-deploy-shared-jar" antfile="build.xml" dir="${basedir}/../app-servers" inheritall="off">
+ <property name="org.apache.jetspeed.deploy.enable"
+ value="${org.apache.jetspeed.env.hotdeploy}"/>
+ <property name="org.apache.jetspeed.deploy.target"
+ value="${org.apache.jetspeed.env.deploy.target}"/>
+ <property name="org.apache.jetspeed.server.home"
+ value="${org.apache.jetspeed.server.home}"/>
+ <property name="org.apache.jetspeed.deploy.groupid"
+ value="${pom.groupId}"/>
+ <property name="org.apache.jetspeed.deploy.artifactid"
+ value="${pom.artifactId}"/>
+ <property name="org.apache.jetspeed.deploy.version"
+ value="${pom.version}"/>
+ </ant>
+ </tasks>
+ </configuration>
+ <goals>
+ <goal>run</goal>
+ </goals>
+ </execution>
+ </executions>
+ <!--
+ Bug: All plugin dependencies must be copied to the first instance
+ of the maven-antrun-plugin run, (e.g. to the root pom), since the
+ first set of deps sticks for the entire maven2 execution cycle.
+ Bug: Plugin dependencies are not propagated from pluginManagement.
+ Bug: Versions must be specified here and not in dependencyManagement.
+
+ Note: All three ant dependencies are listed to keep nodeps in sync.
+ -->
+ <dependencies>
+ <dependency>
+ <groupId>ant</groupId>
+ <artifactId>ant</artifactId>
+ <version>${ant.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>ant</groupId>
+ <artifactId>ant-launcher</artifactId>
+ <version>${ant.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>ant</groupId>
+ <artifactId>ant-nodeps</artifactId>
+ <version>${ant.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.maven</groupId>
+ <artifactId>maven-artifact-ant</artifactId>
+ <version>${org.apache.maven.artifact.ant.version}</version>
+ </dependency>
+ </dependencies>
+ </plugin>
+ </plugins>
+ </build>
+
<!-- Project Information -->
<scm>
Modified: portals/jetspeed-2/trunk/maven-archetypes/portal/src/archetype/archetype-resources/app-servers/build.xml
URL: http://svn.apache.org/viewcvs/portals/jetspeed-2/trunk/maven-archetypes/portal/src/archetype/archetype-resources/app-servers/build.xml?rev=390021&r1=390020&r2=390021&view=diff
==============================================================================
--- portals/jetspeed-2/trunk/maven-archetypes/portal/src/archetype/archetype-resources/app-servers/build.xml (original)
+++ portals/jetspeed-2/trunk/maven-archetypes/portal/src/archetype/archetype-resources/app-servers/build.xml Wed Mar 29 23:30:55 2006
@@ -38,6 +38,8 @@
<property name="portlet-api.version" value=""/>
<property name="org.apache.derby.version" value=""/>
<property name="hsqldb.version" value=""/>
+ <property name="portal.groupid" value=""/>
+ <property name="portal.version" value=""/>
<property name="org.apache.jetspeed.deploy.groupid" value=""/>
<property name="org.apache.jetspeed.deploy.artifactid" value=""/>
<property name="org.apache.jetspeed.deploy.version" value=""/>
@@ -46,10 +48,11 @@
<target name="help">
<echo message="Buildfile for the app-servers maven POM."/>
- <echo message="Usage: ant [ deploy | hot-deploy | hot-deploy-jar | hot-deploy-war ]"/>
+ <echo message="Usage: ant [ deploy | hot-deploy | hot-deploy-shared-jar | hot-deploy-jar | hot-deploy-war ]"/>
<echo message="Where:"/>
<echo message=" deploy - deploy to the target app server."/>
<echo message=" hot-deploy - hot deploy content and applications to the target app server."/>
+ <echo message=" hot-deploy-shared-jar - hot deploy shared component jar to the target app server."/>
<echo message=" hot-deploy-jar - hot deploy component jar to the target app server."/>
<echo message=" hot-deploy-war - hot deploy application war to the target app server."/>
<echo message="Configuration:"/>
@@ -71,6 +74,8 @@
<echo message=" portlet-api.version=${portlet-api.version}"/>
<echo message=" org.apache.derby.version=${org.apache.derby.version}"/>
<echo message=" hsqldb.version=${hsqldb.version}"/>
+ <echo message=" portal.groupid=${portal.groupid}"/>
+ <echo message=" portal.version=${portal.version}"/>
<echo message=" org.apache.jetspeed.deploy.groupid=${org.apache.jetspeed.deploy.groupid}"/>
<echo message=" org.apache.jetspeed.deploy.artifactid=${org.apache.jetspeed.deploy.artifactid}"/>
<echo message=" org.apache.jetspeed.deploy.version=${org.apache.jetspeed.deploy.version}"/>
@@ -92,6 +97,13 @@
</target>
+ <target name="hot-deploy-shared-jar" depends="test-deploy-target, test-deploy-skip" unless="org.apache.jetspeed.skip">
+
+ <antcall target="unsupported-deploy"/>
+ <antcall target="invoke-hot-deploy-shared-jar"/>
+
+ </target>
+
<target name="hot-deploy-jar" depends="test-deploy-target, test-deploy-skip" unless="org.apache.jetspeed.skip">
<antcall target="unsupported-deploy"/>
@@ -161,6 +173,10 @@
value="${org.apache.derby.version}"/>
<property name="hsqldb.version"
value="${hsqldb.version}"/>
+ <property name="portal.groupid"
+ value="${portal.groupid}"/>
+ <property name="portal.version"
+ value="${portal.version}"/>
</ant>
</target>
@@ -172,6 +188,27 @@
value="${org.apache.jetspeed.groupid}"/>
<property name="org.apache.jetspeed.version"
value="${org.apache.jetspeed.version}"/>
+ <property name="org.apache.portals.bridges.common.version"
+ value="${org.apache.portals.bridges.common.version}"/>
+ <property name="org.apache.pluto.version"
+ value="${org.apache.pluto.version}"/>
+ <property name="portlet-api.version"
+ value="${portlet-api.version}"/>
+ <property name="portal.groupid"
+ value="${portal.groupid}"/>
+ <property name="portal.version"
+ value="${portal.version}"/>
+ </ant>
+ </target>
+
+ <target name="invoke-hot-deploy-shared-jar" unless="org.apache.jetspeed.unsupported">
+ <ant antfile="${basedir}/${org.apache.jetspeed.deploy.target}-build.xml" dir="${basedir}" target="hot-deploy-shared-jar" inheritall="off">
+ <property name="org.apache.jetspeed.deploy.groupid"
+ value="${org.apache.jetspeed.deploy.groupid}"/>
+ <property name="org.apache.jetspeed.deploy.artifactid"
+ value="${org.apache.jetspeed.deploy.artifactid}"/>
+ <property name="org.apache.jetspeed.deploy.version"
+ value="${org.apache.jetspeed.deploy.version}"/>
</ant>
</target>
Modified: portals/jetspeed-2/trunk/maven-archetypes/portal/src/archetype/archetype-resources/app-servers/pom.xml
URL: http://svn.apache.org/viewcvs/portals/jetspeed-2/trunk/maven-archetypes/portal/src/archetype/archetype-resources/app-servers/pom.xml?rev=390021&r1=390020&r2=390021&view=diff
==============================================================================
--- portals/jetspeed-2/trunk/maven-archetypes/portal/src/archetype/archetype-resources/app-servers/pom.xml (original)
+++ portals/jetspeed-2/trunk/maven-archetypes/portal/src/archetype/archetype-resources/app-servers/pom.xml Wed Mar 29 23:30:55 2006
@@ -90,6 +90,10 @@
value="${org.apache.derby.version}"/>
<property name="hsqldb.version"
value="${hsqldb.version}"/>
+ <property name="portal.groupid"
+ value="${pom.groupId}"/>
+ <property name="portal.version"
+ value="${pom.version}"/>
</ant>
<!-- hot deployment to app server -->
@@ -104,6 +108,16 @@
value="org.apache.portals.jetspeed-2"/>
<property name="org.apache.jetspeed.version"
value="${org.apache.portals.jetspeed-2.version}"/>
+ <property name="org.apache.portals.bridges.common.version"
+ value="${org.apache.portals.bridges.common.version}"/>
+ <property name="org.apache.pluto.version"
+ value="${org.apache.pluto.version}"/>
+ <property name="portlet-api.version"
+ value="${portlet-api.version}"/>
+ <property name="portal.groupid"
+ value="${pom.groupId}"/>
+ <property name="portal.version"
+ value="${pom.version}"/>
</ant>
</tasks>
Modified: portals/jetspeed-2/trunk/maven-archetypes/portal/src/archetype/archetype-resources/app-servers/tomcat-build.xml
URL: http://svn.apache.org/viewcvs/portals/jetspeed-2/trunk/maven-archetypes/portal/src/archetype/archetype-resources/app-servers/tomcat-build.xml?rev=390021&r1=390020&r2=390021&view=diff
==============================================================================
--- portals/jetspeed-2/trunk/maven-archetypes/portal/src/archetype/archetype-resources/app-servers/tomcat-build.xml (original)
+++ portals/jetspeed-2/trunk/maven-archetypes/portal/src/archetype/archetype-resources/app-servers/tomcat-build.xml Wed Mar 29 23:30:55 2006
@@ -35,6 +35,8 @@
<property name="portlet-api.version" value=""/>
<property name="org.apache.derby.version" value=""/>
<property name="hsqldb.version" value=""/>
+ <property name="portal.groupid" value=""/>
+ <property name="portal.version" value=""/>
<property name="org.apache.jetspeed.deploy.groupid" value=""/>
<property name="org.apache.jetspeed.deploy.artifactid" value=""/>
<property name="org.apache.jetspeed.deploy.version" value=""/>
@@ -43,10 +45,11 @@
<target name="help">
<echo message="Buildfile for the app-servers Tomcat deployment."/>
- <echo message="Usage: ant [ deploy | hot-deploy | hot-deploy-jar | hot-deploy-war ]"/>
+ <echo message="Usage: ant [ deploy | hot-deploy | hot-deploy-shared-jar | hot-deploy-jar | hot-deploy-war ]"/>
<echo message="Where:"/>
<echo message=" deploy - deploy to Tomcat app server."/>
<echo message=" hot-deploy - hot deploy content and applications Tomcat app server."/>
+ <echo message=" hot-deploy-shared-jar - hot deploy shared component jar Tomcat app server."/>
<echo message=" hot-deploy-jar - hot deploy component jar Tomcat app server."/>
<echo message=" hot-deploy-war - hot deploy application war Tomcat app server."/>
<echo message="Configuration:"/>
@@ -65,6 +68,8 @@
<echo message=" portlet-api.version=${portlet-api.version}"/>
<echo message=" org.apache.derby.version=${org.apache.derby.version}"/>
<echo message=" hsqldb.version=${hsqldb.version}"/>
+ <echo message=" portal.groupid=${portal.groupid}"/>
+ <echo message=" portal.version=${portal.version}"/>
<echo message=" org.apache.jetspeed.deploy.groupid=${org.apache.jetspeed.deploy.groupid}"/>
<echo message=" org.apache.jetspeed.deploy.artifactid=${org.apache.jetspeed.deploy.artifactid}"/>
<echo message=" org.apache.jetspeed.deploy.version=${org.apache.jetspeed.deploy.version}"/>
@@ -79,35 +84,7 @@
<target name="deploy" depends="version-5-5, test-embedded-database">
<!-- deploy provided libraries in shared/lib -->
- <delete>
- <fileset dir="${org.apache.jetspeed.server.home}/shared/lib">
- <include name="pluto-*.jar"/>
- <include name="portals-bridges-common-*.jar"/>
- <include name="jetspeed-commons-*.jar"/>
- <include name="jetspeed-api-*.jar"/>
- <include name="portlet-api-*.jar"/>
- </fileset>
- </delete>
- <dependencies filesetId="shared.lib.dependencies.id" useScope="runtime">
- <dependency groupId="org.apache.pluto"
- artifactId="pluto"
- version="${org.apache.pluto.version}"/>
- <dependency groupId="org.apache.portals.bridges"
- artifactId="portals-bridges-common"
- version="${org.apache.portals.bridges.common.version}"/>
- <dependency groupId="${org.apache.jetspeed.groupid}"
- artifactId="jetspeed-commons"
- version="${org.apache.jetspeed.version}"/>
- <dependency groupId="${org.apache.jetspeed.groupid}"
- artifactId="jetspeed-api"
- version="${org.apache.jetspeed.version}"/>
- <dependency groupId="portlet-api"
- artifactId="portlet-api"
- version="${portlet-api.version}"/>
- </dependencies>
- <copy todir="${org.apache.jetspeed.server.home}/shared/lib" flatten="on">
- <fileset refid="shared.lib.dependencies.id"/>
- </copy>
+ <antcall target="deploy-shared-components"/>
<!-- deploy embedded database in shared/lib -->
<antcall target="embedded-database-derby"/>
@@ -157,6 +134,9 @@
<target name="hot-deploy">
+ <!-- hot deploy provided libraries in shared/lib -->
+ <antcall target="hot-deploy-shared-components"/>
+
<!-- hot deploy content -->
<copy todir="${org.apache.jetspeed.server.home}/webapps/${artifactId}">
<fileset dir="${basedir}/../portal/src/webapp">
@@ -206,6 +186,19 @@
</target>
+ <target name="hot-deploy-shared-jar">
+ <!-- hot deploy shared component -->
+ <dependencies filesetId="shared.lib.dependencies.id" useScope="runtime">
+ <dependency groupId="${org.apache.jetspeed.deploy.groupid}"
+ artifactId="${org.apache.jetspeed.deploy.artifactid}"
+ version="${org.apache.jetspeed.deploy.version}"/>
+ </dependencies>
+ <!-- copy the artifact and any dependencies -->
+ <copy todir="${org.apache.jetspeed.server.home}/shared/lib" flatten="on">
+ <fileset refid="shared.lib.dependencies.id"/>
+ </copy>
+ </target>
+
<target name="hot-deploy-jar">
<!-- hot deploy component -->
<dependencies filesetId="component.dependencies.id" useScope="runtime">
@@ -258,6 +251,20 @@
</condition>
</target>
+ <target name="deploy-shared-components">
+ <!-- deploy embedded derby database in shared/lib -->
+ <delete>
+ <fileset dir="${org.apache.jetspeed.server.home}/shared/lib">
+ <include name="pluto-*.jar"/>
+ <include name="portals-bridges-common-*.jar"/>
+ <include name="jetspeed-commons-*.jar"/>
+ <include name="jetspeed-api-*.jar"/>
+ <include name="portlet-api-*.jar"/>
+ </fileset>
+ </delete>
+ <antcall target="hot-deploy-shared-components"/>
+ </target>
+
<target name="embedded-database-derby" if="org.apache.jetspeed.production.database.is.derby.embedded">
<!-- Deploy embedded derby database in shared/lib -->
<delete>
@@ -306,6 +313,35 @@
</fileset>
</delete>
<antcall target="hot-deploy-apps"/>
+ </target>
+
+ <target name="hot-deploy-shared-components">
+ <!-- hot deploy shared components -->
+ <antcall target="hot-deploy-shared-jar">
+ <param name="org.apache.jetspeed.deploy.groupid" value="org.apache.pluto"/>
+ <param name="org.apache.jetspeed.deploy.artifactid" value="pluto"/>
+ <param name="org.apache.jetspeed.deploy.version" value="${org.apache.pluto.version}"/>
+ </antcall>
+ <antcall target="hot-deploy-shared-jar">
+ <param name="org.apache.jetspeed.deploy.groupid" value="org.apache.portals.bridges"/>
+ <param name="org.apache.jetspeed.deploy.artifactid" value="portals-bridges-common"/>
+ <param name="org.apache.jetspeed.deploy.version" value="${org.apache.portals.bridges.common.version}"/>
+ </antcall>
+ <antcall target="hot-deploy-shared-jar">
+ <param name="org.apache.jetspeed.deploy.groupid" value="${org.apache.jetspeed.groupid}"/>
+ <param name="org.apache.jetspeed.deploy.artifactid" value="jetspeed-commons"/>
+ <param name="org.apache.jetspeed.deploy.version" value="${org.apache.jetspeed.version}"/>
+ </antcall>
+ <antcall target="hot-deploy-shared-jar">
+ <param name="org.apache.jetspeed.deploy.groupid" value="${org.apache.jetspeed.groupid}"/>
+ <param name="org.apache.jetspeed.deploy.artifactid" value="jetspeed-api"/>
+ <param name="org.apache.jetspeed.deploy.version" value="${org.apache.jetspeed.version}"/>
+ </antcall>
+ <antcall target="hot-deploy-shared-jar">
+ <param name="org.apache.jetspeed.deploy.groupid" value="portlet-api"/>
+ <param name="org.apache.jetspeed.deploy.artifactid" value="portlet-api"/>
+ <param name="org.apache.jetspeed.deploy.version" value="${portlet-api.version}"/>
+ </antcall>
</target>
<target name="hot-deploy-apps">
---------------------------------------------------------------------
To unsubscribe, e-mail: jetspeed-dev-unsubscribe@portals.apache.org
For additional commands, e-mail: jetspeed-dev-help@portals.apache.org