portals-jetspeed-dev mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From rwat...@apache.org
Subject svn commit: r386564 [1/2] - in /portals/jetspeed-2/trunk: ./ app-servers/ applications/demo/ applications/j2-admin/ applications/jetspeed/ applications/rss/rss-war/ components/capability/ components/cm/ components/deploy-tool/ components/file-cache/ co...
Date Fri, 17 Mar 2006 07:54:48 GMT
Author: rwatler
Date: Thu Mar 16 23:54:45 2006
New Revision: 386564

URL: http://svn.apache.org/viewcvs?rev=386564&view=rev
Log:
Maven2 checkpoint commit: implemented various build modes including, (hotdeploy, minimum, and nodatabase)

Modified:
    portals/jetspeed-2/trunk/app-servers/build.xml
    portals/jetspeed-2/trunk/app-servers/pom.xml
    portals/jetspeed-2/trunk/applications/demo/pom.xml
    portals/jetspeed-2/trunk/applications/j2-admin/pom.xml
    portals/jetspeed-2/trunk/applications/jetspeed/build.xml
    portals/jetspeed-2/trunk/applications/jetspeed/pom.xml
    portals/jetspeed-2/trunk/applications/rss/rss-war/pom.xml
    portals/jetspeed-2/trunk/components/capability/pom.xml
    portals/jetspeed-2/trunk/components/cm/pom.xml
    portals/jetspeed-2/trunk/components/deploy-tool/pom.xml
    portals/jetspeed-2/trunk/components/file-cache/pom.xml
    portals/jetspeed-2/trunk/components/header-resource/pom.xml
    portals/jetspeed-2/trunk/components/id-generator/pom.xml
    portals/jetspeed-2/trunk/components/jetspeed/pom.xml
    portals/jetspeed-2/trunk/components/locator/pom.xml
    portals/jetspeed-2/trunk/components/page-manager/pom.xml
    portals/jetspeed-2/trunk/components/portal-site/pom.xml
    portals/jetspeed-2/trunk/components/portal/pom.xml
    portals/jetspeed-2/trunk/components/portlet-factory/pom.xml
    portals/jetspeed-2/trunk/components/prefs/pom.xml
    portals/jetspeed-2/trunk/components/profiler/pom.xml
    portals/jetspeed-2/trunk/components/rdbms/pom.xml
    portals/jetspeed-2/trunk/components/registry/pom.xml
    portals/jetspeed-2/trunk/components/rewriter/pom.xml
    portals/jetspeed-2/trunk/components/search/pom.xml
    portals/jetspeed-2/trunk/components/security-schema/pom.xml
    portals/jetspeed-2/trunk/components/security/pom.xml
    portals/jetspeed-2/trunk/components/serializer/pom.xml
    portals/jetspeed-2/trunk/components/sso/pom.xml
    portals/jetspeed-2/trunk/components/statistics/pom.xml
    portals/jetspeed-2/trunk/components/web-content/pom.xml
    portals/jetspeed-2/trunk/components/webapp-logging/pom.xml
    portals/jetspeed-2/trunk/etc/build.xml
    portals/jetspeed-2/trunk/etc/pom.xml
    portals/jetspeed-2/trunk/layout-portlets/layout-portlets-war/pom.xml
    portals/jetspeed-2/trunk/pom.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=386564&r1=386563&r2=386564&view=diff
==============================================================================
--- portals/jetspeed-2/trunk/app-servers/build.xml (original)
+++ portals/jetspeed-2/trunk/app-servers/build.xml Thu Mar 16 23:54:45 2006
@@ -20,7 +20,10 @@
 
     <!-- Properties -->
 
+    <property name="org.apache.jetspeed.deploy.enable" value="true"/>
     <property name="org.apache.jetspeed.deploy.skip" value="false"/>
+    <property name="org.apache.jetspeed.deploy.target" value="none"/>
+    <property name="org.apache.jetspeed.deploy.type" value="full"/>
     <property name="org.apache.jetspeed.server.home" value=""/>
     <property name="org.apache.jetspeed.catalina.version.major" value=""/>
     <property name="org.apache.jetspeed.production.database.default.name" value=""/>
@@ -36,16 +39,25 @@
     <property name="portlet-api.version" value=""/>
     <property name="org.apache.derby.version" value=""/>
     <property name="hsqldb.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=""/>
 
     <!-- Usage -->
 
     <target name="help">
         <echo message="Buildfile for the app-servers maven POM."/>
-        <echo message="Usage: ant [ tomcat ]"/>
+        <echo message="Usage: ant [ deploy ]"/>
         <echo message="Where:"/>
-        <echo message="    tomcat - deploy to the tomcat app server."/>
+        <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-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:"/>
+        <echo message="    org.apache.jetspeed.deploy.enable=${org.apache.jetspeed.deploy.enable}"/>
         <echo message="    org.apache.jetspeed.deploy.skip=${org.apache.jetspeed.deploy.skip}"/>
+        <echo message="    org.apache.jetspeed.deploy.target=${org.apache.jetspeed.deploy.target}"/>
+        <echo message="    org.apache.jetspeed.deploy.type=${org.apache.jetspeed.deploy.type}"/>
         <echo message="    org.apache.jetspeed.server.home=${org.apache.jetspeed.server.home}"/>
         <echo message="    org.apache.jetspeed.catalina.version.major=${org.apache.jetspeed.catalina.version.major}"/>
         <echo message="    org.apache.jetspeed.production.database.default.name=${org.apache.jetspeed.production.database.default.name}"/>
@@ -61,6 +73,84 @@
         <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="    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}"/>
+    </target>
+
+    <!-- Deployment Classification -->
+
+    <target name="deploy" depends="test-deploy-target, test-deploy-type, test-deploy-skip" unless="org.apache.jetspeed.skip">
+
+        <!-- invoke deployment targets -->
+        <antcall target="unsupported-deploy"/>
+        <antcall target="tomcat-deploy"/>
+ 
+    </target>
+
+    <target name="hot-deploy" depends="test-deploy-target, test-deploy-type, test-deploy-skip" unless="org.apache.jetspeed.skip">
+
+        <!-- invoke deployment targets -->
+        <antcall target="unsupported-deploy"/>
+        <antcall target="tomcat-hot-deploy"/>
+ 
+    </target>
+
+    <target name="hot-deploy-jar" depends="test-deploy-target, test-deploy-type, test-deploy-skip" unless="org.apache.jetspeed.skip">
+
+        <!-- invoke deployment targets -->
+        <antcall target="unsupported-deploy"/>
+        <antcall target="tomcat-hot-deploy-jar"/>
+ 
+    </target>
+
+    <target name="hot-deploy-war" depends="test-deploy-target, test-deploy-type, test-deploy-skip" unless="org.apache.jetspeed.skip">
+
+        <!-- invoke deployment targets -->
+        <antcall target="unsupported-deploy"/>
+        <antcall target="tomcat-hot-deploy-war"/>
+ 
+    </target>
+
+    <target name="test-deploy-target">
+        <condition property="org.apache.jetspeed.tomcat">
+            <equals arg1="${org.apache.jetspeed.deploy.target}" arg2="tomcat"/>
+        </condition>
+        <condition property="org.apache.jetspeed.unsupported">
+            <not>
+                <or>
+                    <equals arg1="${org.apache.jetspeed.deploy.target}" arg2="none"/>
+                    <equals arg1="${org.apache.jetspeed.deploy.target}" arg2="tomcat"/>
+                </or>
+            </not>
+        </condition>
+    </target>
+
+    <target name="test-deploy-type">
+        <condition property="org.apache.jetspeed.deploy.full">
+            <equals arg1="${org.apache.jetspeed.deploy.type}" arg2="full"/>
+        </condition>
+        <condition property="org.apache.jetspeed.deploy.min">
+            <or>
+                <equals arg1="${org.apache.jetspeed.deploy.type}" arg2="min"/>
+                <equals arg1="${org.apache.jetspeed.deploy.type}" arg2="full"/>
+            </or>
+        </condition>
+    </target>
+
+    <target name="test-deploy-skip">
+        <condition property="org.apache.jetspeed.skip">
+            <or>
+                <equals arg1="${org.apache.jetspeed.deploy.skip}" arg2="true"/>
+                <not>
+                    <equals arg1="${org.apache.jetspeed.deploy.enable}" arg2="true"/>
+                </not>
+            </or>
+        </condition>
+    </target>
+
+    <target name="unsupported-deploy" if="org.apache.jetspeed.unsupported">
+        <fail message="Unsupported deployment target: ${org.apache.jetspeed.deploy.target}."/>
     </target>
 
     <!-- Additional Task Definitions -->
@@ -69,9 +159,9 @@
 
     <!-- Tomcat Deployment -->
 
-    <target name="tomcat" depends="deploy-skip, tomcat-5-5" unless="org.apache.jetspeed.skip">
+    <target name="tomcat-deploy" depends="tomcat-5-5" if="org.apache.jetspeed.tomcat">
 
-        <!-- Deploy provided libraries in shared/lib -->
+        <!-- deploy provided libraries in shared/lib -->
         <delete>
             <fileset dir="${org.apache.jetspeed.server.home}/shared/lib">
                 <include name="pluto-*.jar"/>
@@ -102,10 +192,10 @@
             <fileset refid="shared.lib.dependencies.id"/>
         </copy>
 
-        <!-- Deploy embedded database in shared/lib -->
+        <!-- deploy embedded database in shared/lib -->
         <antcall target="tomcat-embedded-database"/>
 
-        <!-- Deploy jetspeed applications -->
+        <!-- deploy jetspeed application -->
         <delete dir="${org.apache.jetspeed.server.home}/webapps/jetspeed"/>
         <delete>
             <fileset dir="${org.apache.jetspeed.server.home}/webapps">
@@ -124,71 +214,7 @@
         </copy>
         <unjar src="${org.apache.jetspeed.server.home}/webapps/jetspeed.war" dest="${org.apache.jetspeed.server.home}/webapps/jetspeed"/>
 
-        <!-- Deploy portlet and layout applications -->
-        <delete dir="${org.apache.jetspeed.server.home}/webapps/demo"/>
-        <delete dir="${org.apache.jetspeed.server.home}/webapps/j2-admin"/>
-        <delete dir="${org.apache.jetspeed.server.home}/webapps/jpetstore"/>
-        <delete dir="${org.apache.jetspeed.server.home}/webapps/jsf-demo"/>
-        <delete dir="${org.apache.jetspeed.server.home}/webapps/perl"/>
-        <delete dir="${org.apache.jetspeed.server.home}/webapps/php"/>
-        <delete dir="${org.apache.jetspeed.server.home}/webapps/rss"/>
-        <delete>
-            <fileset dir="${org.apache.jetspeed.server.home}/webapps">
-                <include name="demo.war"/>
-                <include name="j2-admin.war"/>
-                <include name="jpetstore.war"/>
-                <include name="jsf-demo.war"/>
-                <include name="perl.war"/>
-                <include name="php.war"/>
-                <include name="rss.war"/>
-            </fileset>
-        </delete>
-        <delete>
-            <fileset dir="${org.apache.jetspeed.server.home}/conf/Catalina/localhost">
-                <include name="j2-admin.xml"/>
-                <include name="jpetstore.xml"/>
-            </fileset>
-        </delete>
-        <dependencies filesetId="portletapp.dependencies.id" useScope="runtime">
-            <dependency groupId="${org.apache.jetspeed.groupid}"
-                        artifactId="demo"
-                        version="${org.apache.jetspeed.version}"
-                        type="war"/>
-            <dependency groupId="${org.apache.jetspeed.groupid}"
-                        artifactId="j2-admin"
-                        version="${org.apache.jetspeed.version}"
-                        type="war"/>
-            <dependency groupId="${org.apache.jetspeed.groupid}"
-                        artifactId="jetspeed-layouts"
-                        version="${org.apache.jetspeed.version}"
-                        type="war"/>
-            <dependency groupId="org.apache.portals.bridges"
-                        artifactId="jpetstore"
-                        version="${org.apache.portals.bridges.version}"
-                        type="war"/>
-            <dependency groupId="org.apache.portals.bridges"
-                        artifactId="jsf-demo"
-                        version="${org.apache.portals.bridges.version}"
-                        type="war"/>
-            <dependency groupId="org.apache.portals.bridges"
-                        artifactId="perl"
-                        version="${org.apache.portals.bridges.version}"
-                        type="war"/>
-            <dependency groupId="org.apache.portals.bridges"
-                        artifactId="php"
-                        version="${org.apache.portals.bridges.version}"
-                        type="war"/>
-            <dependency groupId="${org.apache.jetspeed.groupid}"
-                        artifactId="rss"
-                        version="${org.apache.jetspeed.version}"
-                        type="war"/>
-        </dependencies>
-        <copy todir="${org.apache.jetspeed.server.home}/webapps/jetspeed/WEB-INF/deploy">
-            <fileset refid="portletapp.dependencies.id"/>
-            <mapper type="regexp" from=".*[/\\]([^/\\]*)-(?:(?:${org.apache.jetspeed.version})|(?:${org.apache.portals.bridges.version})).war" to="\1.war"/>
-        </copy>
-
-        <!-- Generate and deploy application context file -->
+        <!-- generate and deploy jetspeed application context file -->
         <delete file="${org.apache.jetspeed.server.home}/conf/Catalina/localhost/jetspeed.xml"/>
         <copy todir="${org.apache.jetspeed.server.home}/conf/Catalina/localhost">
             <fileset dir="${basedir}/../etc/conf/tomcat">
@@ -205,25 +231,20 @@
             <mapper type="merge" to="jetspeed.xml"/>
         </copy>
 
-    </target>
+        <!-- deploy portlet and layout applications -->
+        <antcall target="tomcat-deploy-min-apps"/>
+        <antcall target="tomcat-deploy-full-apps"/>
 
-    <target name="tomcat-embedded-database" depends="test-embedded-database, tomcat-embedded-database-derby, tomcat-embedded-database-hsql"/>
+    </target>
 
-    <target name="test-embedded-database">
-        <condition property="org.apache.jetspeed.production.database.is.derby.embedded">
-            <and>
-                <equals arg1="${org.apache.jetspeed.production.database.default.name}" arg2="derby"/>
-                <equals arg1="${org.apache.jetspeed.production.database.jdbc.drivers.path}" arg2=""/>
-            </and>
-        </condition>
-        <condition property="org.apache.jetspeed.production.database.is.hsql.embedded">
-            <and>
-                <equals arg1="${org.apache.jetspeed.production.database.default.name}" arg2="hsql"/>
-                <equals arg1="${org.apache.jetspeed.production.database.jdbc.drivers.path}" arg2=""/>
-            </and>
+    <target name="tomcat-5-5">
+        <condition property="org.apache.jetspeed.tomcat.5.5">
+            <equals arg1="${org.apache.jetspeed.catalina.version.major}" arg2="5.5"/>
         </condition>
     </target>
 
+    <target name="tomcat-embedded-database" depends="test-embedded-database, tomcat-embedded-database-derby, tomcat-embedded-database-hsql"/>
+
     <target name="tomcat-embedded-database-derby" if="org.apache.jetspeed.production.database.is.derby.embedded">
         <!-- Deploy embedded derby database in shared/lib -->
         <delete>
@@ -258,17 +279,183 @@
         </copy>
     </target>
 
-    <!-- Utility Targets -->
+    <target name="tomcat-deploy-min-apps" if="org.apache.jetspeed.deploy.min">
+        <!-- deploy minimal set of portlet and layout applications -->
+        <delete dir="${org.apache.jetspeed.server.home}/webapps/j2-admin"/>
+        <delete>
+            <fileset dir="${org.apache.jetspeed.server.home}/webapps">
+                <include name="j2-admin.war"/>
+            </fileset>
+        </delete>
+        <delete>
+            <fileset dir="${org.apache.jetspeed.server.home}/conf/Catalina/localhost">
+                <include name="j2-admin.xml"/>
+            </fileset>
+        </delete>
+        <antcall target="tomcat-hot-deploy-min-apps"/>
+    </target>
 
-    <target name="deploy-skip">
-        <condition property="org.apache.jetspeed.skip">
-            <equals arg1="${org.apache.jetspeed.deploy.skip}" arg2="true"/>
-        </condition>
+    <target name="tomcat-deploy-full-apps" if="org.apache.jetspeed.deploy.full">
+        <!-- deploy additional set of portlet applications -->
+        <delete dir="${org.apache.jetspeed.server.home}/webapps/demo"/>
+        <delete dir="${org.apache.jetspeed.server.home}/webapps/jpetstore"/>
+        <delete dir="${org.apache.jetspeed.server.home}/webapps/jsf-demo"/>
+        <delete dir="${org.apache.jetspeed.server.home}/webapps/perl"/>
+        <delete dir="${org.apache.jetspeed.server.home}/webapps/php"/>
+        <delete dir="${org.apache.jetspeed.server.home}/webapps/rss"/>
+        <delete>
+            <fileset dir="${org.apache.jetspeed.server.home}/webapps">
+                <include name="demo.war"/>
+                <include name="jpetstore.war"/>
+                <include name="jsf-demo.war"/>
+                <include name="perl.war"/>
+                <include name="php.war"/>
+                <include name="rss.war"/>
+            </fileset>
+        </delete>
+        <delete>
+            <fileset dir="${org.apache.jetspeed.server.home}/conf/Catalina/localhost">
+                <include name="jpetstore.xml"/>
+            </fileset>
+        </delete>
+        <antcall target="tomcat-hot-deploy-full-apps"/>
     </target>
 
-    <target name="tomcat-5-5">
-        <condition property="org.apache.jetspeed.tomcat.5.5">
-            <equals arg1="${org.apache.jetspeed.catalina.version.major}" arg2="5.5"/>
+    <target name="tomcat-hot-deploy" if="org.apache.jetspeed.tomcat">
+
+        <!-- hot deploy templates content -->
+        <copy todir="${org.apache.jetspeed.server.home}/webapps/jetspeed/WEB-INF/templates">
+            <fileset dir="${basedir}/../src/webapp/WEB-INF/templates"/>
+        </copy>
+
+        <!-- hot deploy portlet and layout applications -->
+        <antcall target="tomcat-hot-deploy-min-apps"/>
+        <antcall target="tomcat-hot-deploy-full-apps"/>
+
+        <!-- hot deploy pages content -->
+        <antcall target="tomcat-hot-deploy-min-pages"/>
+        <antcall target="tomcat-hot-deploy-full-pages"/>
+
+        <!-- hot deploy decorations content -->
+        <copy todir="${org.apache.jetspeed.server.home}/webapps/jetspeed/decorations">
+            <fileset dir="${basedir}/../src/webapp/decorations"/>
+        </copy>
+
+    </target>
+
+    <target name="tomcat-hot-deploy-min-pages" if="org.apache.jetspeed.deploy.min">
+        <!-- hot deploy minimum pages content -->
+        <copy todir="${org.apache.jetspeed.server.home}/webapps/jetspeed/WEB-INF/pages">
+            <fileset dir="${basedir}/../src/webapp/WEB-INF/pages">
+                <include name="Administrative/**"/>
+                <include name="page.security"/>
+                <include name="my-account.psml"/>
+            </fileset>
+        </copy>
+        <copy file="${basedir}/../src/webapp/WEB-INF/pages/minimal-default-page.psml"
+              tofile="${org.apache.jetspeed.server.home}/webapps/jetspeed/WEB-INF/pages/default-page.psml"/>
+        <replace file="${org.apache.jetspeed.server.home}/webapps/jetspeed/WEB-INF/pages/default-page.psml"
+                 token=" hidden=&quot;true&quot;"/>
+    </target>
+
+    <target name="tomcat-hot-deploy-full-pages" if="org.apache.jetspeed.deploy.full">
+        <!-- hot deploy full pages content -->
+        <copy todir="${org.apache.jetspeed.server.home}/webapps/jetspeed/WEB-INF/pages">
+            <fileset dir="${basedir}/../src/webapp/WEB-INF/pages"/>
+        </copy>
+    </target>
+
+    <target name="tomcat-hot-deploy-full-apps" if="org.apache.jetspeed.deploy.full">
+        <!-- hot deploy additional set of portlet applications -->
+        <antcall target="tomcat-hot-deploy-war">
+            <param name="org.apache.jetspeed.deploy.groupid" value="${org.apache.jetspeed.groupid}"/>
+            <param name="org.apache.jetspeed.deploy.artifactid" value="demo"/>
+            <param name="org.apache.jetspeed.deploy.version" value="${org.apache.jetspeed.version}"/>
+        </antcall>
+        <antcall target="tomcat-hot-deploy-war">
+            <param name="org.apache.jetspeed.deploy.groupid" value="org.apache.portals.bridges"/>
+            <param name="org.apache.jetspeed.deploy.artifactid" value="jpetstore"/>
+            <param name="org.apache.jetspeed.deploy.version" value="${org.apache.portals.bridges.version}"/>
+        </antcall>
+        <antcall target="tomcat-hot-deploy-war">
+            <param name="org.apache.jetspeed.deploy.groupid" value="org.apache.portals.bridges"/>
+            <param name="org.apache.jetspeed.deploy.artifactid" value="jsf-demo"/>
+            <param name="org.apache.jetspeed.deploy.version" value="${org.apache.portals.bridges.version}"/>
+        </antcall>
+        <antcall target="tomcat-hot-deploy-war">
+            <param name="org.apache.jetspeed.deploy.groupid" value="org.apache.portals.bridges"/>
+            <param name="org.apache.jetspeed.deploy.artifactid" value="perl"/>
+            <param name="org.apache.jetspeed.deploy.version" value="${org.apache.portals.bridges.version}"/>
+        </antcall>
+        <antcall target="tomcat-hot-deploy-war">
+            <param name="org.apache.jetspeed.deploy.groupid" value="org.apache.portals.bridges"/>
+            <param name="org.apache.jetspeed.deploy.artifactid" value="php"/>
+            <param name="org.apache.jetspeed.deploy.version" value="${org.apache.portals.bridges.version}"/>
+        </antcall>
+        <antcall target="tomcat-hot-deploy-war">
+            <param name="org.apache.jetspeed.deploy.groupid" value="${org.apache.jetspeed.groupid}"/>
+            <param name="org.apache.jetspeed.deploy.artifactid" value="rss"/>
+            <param name="org.apache.jetspeed.deploy.version" value="${org.apache.jetspeed.version}"/>
+        </antcall>
+    </target>
+
+    <target name="tomcat-hot-deploy-min-apps" if="org.apache.jetspeed.deploy.min">
+        <!-- hot deploy minimal set of portlet and layout applications -->
+        <antcall target="tomcat-hot-deploy-war">
+            <param name="org.apache.jetspeed.deploy.groupid" value="${org.apache.jetspeed.groupid}"/>
+            <param name="org.apache.jetspeed.deploy.artifactid" value="jetspeed-layouts"/>
+            <param name="org.apache.jetspeed.deploy.version" value="${org.apache.jetspeed.version}"/>
+        </antcall>
+        <antcall target="tomcat-hot-deploy-war">
+            <param name="org.apache.jetspeed.deploy.groupid" value="${org.apache.jetspeed.groupid}"/>
+            <param name="org.apache.jetspeed.deploy.artifactid" value="j2-admin"/>
+            <param name="org.apache.jetspeed.deploy.version" value="${org.apache.jetspeed.version}"/>
+        </antcall>
+    </target>
+
+    <target name="tomcat-hot-deploy-jar">
+        <!-- hot deploy component -->
+        <dependencies filesetId="component.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 only the artifact and ignore dependencies using mapper -->
+        <copy todir="${org.apache.jetspeed.server.home}/webapps/jetspeed/WEB-INF/lib">
+            <fileset refid="component.dependencies.id"/>
+            <mapper type="regexp" from=".*[/\\]([^/\\]*${org.apache.jetspeed.deploy.artifactid})-${org.apache.jetspeed.deploy.version}.jar" to="\1.jar"/>
+        </copy>
+    </target>
+
+    <target name="tomcat-hot-deploy-war">
+        <!-- hot deploy portlet or layout application -->
+        <dependencies filesetId="portletapp.dependencies.id" useScope="runtime">
+            <dependency groupId="${org.apache.jetspeed.deploy.groupid}"
+                        artifactId="${org.apache.jetspeed.deploy.artifactid}"
+                        version="${org.apache.jetspeed.deploy.version}"
+                        type="war"/>
+        </dependencies>
+        <!-- copy only the artifact and ignore dependencies using mapper -->
+        <copy todir="${org.apache.jetspeed.server.home}/webapps/jetspeed/WEB-INF/deploy">
+            <fileset refid="portletapp.dependencies.id"/>
+            <mapper type="regexp" from=".*[/\\]([^/\\]*${org.apache.jetspeed.deploy.artifactid})-${org.apache.jetspeed.deploy.version}.war" to="\1.war"/>
+        </copy>
+    </target>
+
+    <!-- Utility Targets -->
+
+    <target name="test-embedded-database">
+        <condition property="org.apache.jetspeed.production.database.is.derby.embedded">
+            <and>
+                <equals arg1="${org.apache.jetspeed.production.database.default.name}" arg2="derby"/>
+                <equals arg1="${org.apache.jetspeed.production.database.jdbc.drivers.path}" arg2=""/>
+            </and>
+        </condition>
+        <condition property="org.apache.jetspeed.production.database.is.hsql.embedded">
+            <and>
+                <equals arg1="${org.apache.jetspeed.production.database.default.name}" arg2="hsql"/>
+                <equals arg1="${org.apache.jetspeed.production.database.jdbc.drivers.path}" arg2=""/>
+            </and>
         </condition>
     </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=386564&r1=386563&r2=386564&view=diff
==============================================================================
--- portals/jetspeed-2/trunk/app-servers/pom.xml (original)
+++ portals/jetspeed-2/trunk/app-servers/pom.xml Thu Mar 16 23:54:45 2006
@@ -56,9 +56,15 @@
                         <phase>install</phase>
                         <configuration>
                             <tasks>
-                                <ant target="${org.apache.jetspeed.env.deploy.target}" antfile="build.xml" dir="${basedir}" inheritAll="off">
+
+                                <!-- normal deployment to app server -->
+                                <ant target="deploy" antfile="build.xml" dir="${basedir}" inheritAll="off">
                                     <property name="org.apache.jetspeed.deploy.skip"
-                                              value="${org.apache.jetspeed.env.skip.production}"/>
+                                              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.deploy.type"
+                                              value="${org.apache.jetspeed.env.deploy.type}"/>
                                     <property name="org.apache.jetspeed.server.home"
                                               value="${org.apache.jetspeed.server.home}"/>
                                     <property name="org.apache.jetspeed.catalina.version.major"
@@ -90,6 +96,25 @@
                                     <property name="hsqldb.version"
                                               value="${hsqldb.version}"/>
                                 </ant>
+
+                                <!-- hot deployment to app server -->
+                                <ant target="hot-deploy" antfile="build.xml" dir="${basedir}" 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.deploy.type"
+                                              value="${org.apache.jetspeed.env.deploy.type}"/>
+                                    <property name="org.apache.jetspeed.server.home"
+                                              value="${org.apache.jetspeed.server.home}"/>
+                                    <property name="org.apache.jetspeed.groupid"
+                                              value="${pom.groupId}"/>
+                                    <property name="org.apache.jetspeed.version"
+                                              value="${pom.version}"/>
+                                    <property name="org.apache.portals.bridges.version"
+                                              value="${org.apache.portals.bridges.version}"/>
+                                </ant>
+
                             </tasks>
                         </configuration>
                         <goals>

Modified: portals/jetspeed-2/trunk/applications/demo/pom.xml
URL: http://svn.apache.org/viewcvs/portals/jetspeed-2/trunk/applications/demo/pom.xml?rev=386564&r1=386563&r2=386564&view=diff
==============================================================================
--- portals/jetspeed-2/trunk/applications/demo/pom.xml (original)
+++ portals/jetspeed-2/trunk/applications/demo/pom.xml Thu Mar 16 23:54:45 2006
@@ -108,6 +108,75 @@
 
     </dependencies>
 
+    <!-- Build Configuration -->
+
+    <build>
+        <plugins>
+            <plugin>
+                <groupId>org.apache.maven.plugins</groupId>
+                <artifactId>maven-antrun-plugin</artifactId>
+                <executions>
+                    <execution>
+                        <id>hot-deploy-application</id>
+                        <phase>install</phase>
+                        <configuration>
+                            <tasks>
+                                <ant target="hot-deploy-war" antfile="../../app-servers/build.xml" dir="${basedir}" 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/applications/j2-admin/pom.xml
URL: http://svn.apache.org/viewcvs/portals/jetspeed-2/trunk/applications/j2-admin/pom.xml?rev=386564&r1=386563&r2=386564&view=diff
==============================================================================
--- portals/jetspeed-2/trunk/applications/j2-admin/pom.xml (original)
+++ portals/jetspeed-2/trunk/applications/j2-admin/pom.xml Thu Mar 16 23:54:45 2006
@@ -135,6 +135,75 @@
 
     </dependencies>
 
+    <!-- Build Configuration -->
+
+    <build>
+        <plugins>
+            <plugin>
+                <groupId>org.apache.maven.plugins</groupId>
+                <artifactId>maven-antrun-plugin</artifactId>
+                <executions>
+                    <execution>
+                        <id>hot-deploy-application</id>
+                        <phase>install</phase>
+                        <configuration>
+                            <tasks>
+                                <ant target="hot-deploy-war" antfile="../../app-servers/build.xml" dir="${basedir}" 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/applications/jetspeed/build.xml
URL: http://svn.apache.org/viewcvs/portals/jetspeed-2/trunk/applications/jetspeed/build.xml?rev=386564&r1=386563&r2=386564&view=diff
==============================================================================
--- portals/jetspeed-2/trunk/applications/jetspeed/build.xml (original)
+++ portals/jetspeed-2/trunk/applications/jetspeed/build.xml Thu Mar 16 23:54:45 2006
@@ -20,6 +20,7 @@
 
     <!-- Properties -->
 
+    <property name="org.apache.jetspeed.deploy.type" value="full"/>
     <property name="org.apache.jetspeed.catalina.version.major" value=""/>
     <property name="org.apache.jetspeed.services.autodeployment.server" value=""/>
     <property name="org.apache.jetspeed.services.autodeployment.port" value=""/>
@@ -34,6 +35,7 @@
         <echo message="Where:"/>
         <echo message="    configure - setup runtime configuration for jetspeed."/>
         <echo message="Configuration:"/>
+        <echo message="    org.apache.jetspeed.deploy.type=${org.apache.jetspeed.deploy.type}"/>
         <echo message="    org.apache.jetspeed.catalina.version.major=${org.apache.jetspeed.catalina.version.major}"/>
         <echo message="    org.apache.jetspeed.services.autodeployment.server=${org.apache.jetspeed.services.autodeployment.server}"/>
         <echo message="    org.apache.jetspeed.services.autodeployment.port=${org.apache.jetspeed.services.autodeployment.port}"/>
@@ -43,16 +45,54 @@
 
     <!-- Jetspeed Configuration -->
 
-    <target name="configure">
+    <target name="configure" depends="test-deploy-type">
 
         <!-- Build webapp resources -->        
         <delete dir="${basedir}/target/webapp"/>
         <mkdir dir="${basedir}/target/webapp"/>
         <copy todir="${basedir}/target/webapp">
-            <fileset dir="${basedir}/../../src/webapp"/>
+            <fileset dir="${basedir}/../../src/webapp">
+                <exclude name="WEB-INF/conf/jetspeed.properties"/>
+                <exclude name="WEB-INF/pages/**"/>
+            </fileset>
         </copy>
+        <antcall target="configure-min-resources"/>
+        <antcall target="configure-full-resources"/>
 
-        <!-- Configure runtime configuration propertiee resource -->
+        <!-- Build OJB resources -->        
+        <mkdir dir="${basedir}/target/webapp/WEB-INF/classes"/>
+        <copy todir="${basedir}/target/webapp/WEB-INF/classes">
+            <fileset dir="${basedir}/../../etc/db-ojb"/>
+        </copy>
+
+    </target>
+
+    <target name="configure-min-resources" if="org.apache.jetspeed.deploy.min">
+        <!-- configure minimal resources -->
+        <mkdir dir="${basedir}/target/webapp/WEB-INF/pages"/>
+        <copy todir="${basedir}/target/webapp/WEB-INF/pages">
+            <fileset dir="${basedir}/../../src/webapp/WEB-INF/pages">
+                <include name="Administrative/**"/>
+                <include name="page.security"/>
+                <include name="my-account.psml"/>
+            </fileset>
+        </copy>
+        <copy file="${basedir}/../../src/webapp/WEB-INF/pages/minimal-default-page.psml"
+              tofile="${basedir}/target/webapp/WEB-INF/pages/default-page.psml"/>
+        <replace file="${basedir}/target/webapp/WEB-INF/pages/default-page.psml"
+                 token=" hidden=&quot;true&quot;"/>
+    </target>
+
+    <target name="configure-full-resources" if="org.apache.jetspeed.deploy.full">
+        <!-- configure full resources -->
+        <mkdir dir="${basedir}/target/webapp/WEB-INF/pages"/>
+        <copy todir="${basedir}/target/webapp/WEB-INF/pages">
+            <fileset dir="${basedir}/../../src/webapp/WEB-INF/pages"/>
+        </copy>
+        <copy file="${basedir}/../../src/webapp/WEB-INF/conf/jetspeed.properties"
+              todir="${basedir}/target/webapp/WEB-INF/conf"/>
+
+        <!-- configure runtime configuration properties resource -->
         <replace file="${basedir}/target/webapp/WEB-INF/conf/jetspeed.properties">
             <replacefilter token="@AUTODEPLOYMENT_SERVER@"
                            value="${org.apache.jetspeed.services.autodeployment.server}"/>
@@ -65,13 +105,15 @@
             <replacefilter token="autodeployment.port=8080"
                            value="autodeployment.port=${org.apache.jetspeed.services.autodeployment.port}"/>
         </replace>
+    </target>
 
-        <!-- Build OJB resources -->        
-        <mkdir dir="${basedir}/target/webapp/WEB-INF/classes"/>
-        <copy todir="${basedir}/target/webapp/WEB-INF/classes">
-            <fileset dir="${basedir}/../../etc/db-ojb"/>
-        </copy>
-
+    <target name="test-deploy-type">
+        <condition property="org.apache.jetspeed.deploy.full">
+            <equals arg1="${org.apache.jetspeed.deploy.type}" arg2="full"/>
+        </condition>
+        <condition property="org.apache.jetspeed.deploy.min">
+            <equals arg1="${org.apache.jetspeed.deploy.type}" arg2="min"/>
+        </condition>
     </target>
 
 </project>

Modified: portals/jetspeed-2/trunk/applications/jetspeed/pom.xml
URL: http://svn.apache.org/viewcvs/portals/jetspeed-2/trunk/applications/jetspeed/pom.xml?rev=386564&r1=386563&r2=386564&view=diff
==============================================================================
--- portals/jetspeed-2/trunk/applications/jetspeed/pom.xml (original)
+++ portals/jetspeed-2/trunk/applications/jetspeed/pom.xml Thu Mar 16 23:54:45 2006
@@ -70,6 +70,8 @@
                         <configuration>
                             <tasks>
                                 <ant target="configure" antfile="build.xml" dir="${basedir}" inheritAll="off">
+                                    <property name="org.apache.jetspeed.deploy.type"
+                                              value="${org.apache.jetspeed.env.deploy.type}"/>
                                     <property name="org.apache.jetspeed.catalina.version.major"
                                               value="${org.apache.jetspeed.catalina.version.major}"/>
                                     <property name="org.apache.jetspeed.services.autodeployment.server"

Modified: portals/jetspeed-2/trunk/applications/rss/rss-war/pom.xml
URL: http://svn.apache.org/viewcvs/portals/jetspeed-2/trunk/applications/rss/rss-war/pom.xml?rev=386564&r1=386563&r2=386564&view=diff
==============================================================================
--- portals/jetspeed-2/trunk/applications/rss/rss-war/pom.xml (original)
+++ portals/jetspeed-2/trunk/applications/rss/rss-war/pom.xml Thu Mar 16 23:54:45 2006
@@ -36,28 +36,6 @@
     <packaging>war</packaging>
     <name>Jetspeed-2 RSS Application WAR</name>
 
-    <!-- Build Configuration -->
-
-    <build>
-
-        <!-- Plugin Configuration -->
-        <pluginManagement>    
-            <plugins>
-
-                <!-- WAR plugin -->
-                <plugin>
-                    <groupId>org.apache.maven.plugins</groupId>
-                    <artifactId>maven-war-plugin</artifactId>
-                    <configuration>
-                        <warSourceDirectory>../src/webapp</warSourceDirectory>
-                    </configuration>
-                </plugin> 
-
-            </plugins>
-        </pluginManagement>    
-
-    </build>
-
     <!-- Dependencies -->
 
     <dependencies>
@@ -90,5 +68,93 @@
         </dependency>
 
     </dependencies>
+
+    <!-- Build Configuration -->
+
+    <build>
+
+        <!-- Plugin Configuration -->
+        <pluginManagement>    
+            <plugins>
+
+                <!-- WAR plugin -->
+                <plugin>
+                    <groupId>org.apache.maven.plugins</groupId>
+                    <artifactId>maven-war-plugin</artifactId>
+                    <configuration>
+                        <warSourceDirectory>../src/webapp</warSourceDirectory>
+                    </configuration>
+                </plugin> 
+
+            </plugins>
+        </pluginManagement>    
+
+        <!-- Plugins -->
+        <plugins>
+            <plugin>
+                <groupId>org.apache.maven.plugins</groupId>
+                <artifactId>maven-antrun-plugin</artifactId>
+                <executions>
+                    <execution>
+                        <id>hot-deploy-application</id>
+                        <phase>install</phase>
+                        <configuration>
+                            <tasks>
+                                <ant target="hot-deploy-war" antfile="../../../app-servers/build.xml" dir="${basedir}" 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>

Modified: portals/jetspeed-2/trunk/components/capability/pom.xml
URL: http://svn.apache.org/viewcvs/portals/jetspeed-2/trunk/components/capability/pom.xml?rev=386564&r1=386563&r2=386564&view=diff
==============================================================================
--- portals/jetspeed-2/trunk/components/capability/pom.xml (original)
+++ portals/jetspeed-2/trunk/components/capability/pom.xml Thu Mar 16 23:54:45 2006
@@ -61,6 +61,75 @@
 
     </dependencies>
 
+    <!-- Build Configuration -->
+
+    <build>
+        <plugins>
+            <plugin>
+                <groupId>org.apache.maven.plugins</groupId>
+                <artifactId>maven-antrun-plugin</artifactId>
+                <executions>
+                    <execution>
+                        <id>hot-deploy-component</id>
+                        <phase>install</phase>
+                        <configuration>
+                            <tasks>
+                                <ant target="hot-deploy-jar" antfile="../../app-servers/build.xml" dir="${basedir}" 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/components/cm/pom.xml
URL: http://svn.apache.org/viewcvs/portals/jetspeed-2/trunk/components/cm/pom.xml?rev=386564&r1=386563&r2=386564&view=diff
==============================================================================
--- portals/jetspeed-2/trunk/components/cm/pom.xml (original)
+++ portals/jetspeed-2/trunk/components/cm/pom.xml Thu Mar 16 23:54:45 2006
@@ -116,6 +116,69 @@
                     </excludes>
                 </configuration>
             </plugin>
+
+            <plugin>
+                <groupId>org.apache.maven.plugins</groupId>
+                <artifactId>maven-antrun-plugin</artifactId>
+                <executions>
+                    <execution>
+                        <id>hot-deploy-component</id>
+                        <phase>install</phase>
+                        <configuration>
+                            <tasks>
+                                <ant target="hot-deploy-jar" antfile="../../app-servers/build.xml" dir="${basedir}" 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>
 

Modified: portals/jetspeed-2/trunk/components/deploy-tool/pom.xml
URL: http://svn.apache.org/viewcvs/portals/jetspeed-2/trunk/components/deploy-tool/pom.xml?rev=386564&r1=386563&r2=386564&view=diff
==============================================================================
--- portals/jetspeed-2/trunk/components/deploy-tool/pom.xml (original)
+++ portals/jetspeed-2/trunk/components/deploy-tool/pom.xml Thu Mar 16 23:54:45 2006
@@ -83,7 +83,64 @@
                             <goal>run</goal>
                         </goals>
                     </execution>
+
+                    <execution>
+                        <id>hot-deploy-component</id>
+                        <phase>install</phase>
+                        <configuration>
+                            <tasks>
+                                <ant target="hot-deploy-jar" antfile="../../app-servers/build.xml" dir="${basedir}" 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>

Modified: portals/jetspeed-2/trunk/components/file-cache/pom.xml
URL: http://svn.apache.org/viewcvs/portals/jetspeed-2/trunk/components/file-cache/pom.xml?rev=386564&r1=386563&r2=386564&view=diff
==============================================================================
--- portals/jetspeed-2/trunk/components/file-cache/pom.xml (original)
+++ portals/jetspeed-2/trunk/components/file-cache/pom.xml Thu Mar 16 23:54:45 2006
@@ -63,6 +63,75 @@
 
     </dependencies>
 
+    <!-- Build Configuration -->
+
+    <build>
+        <plugins>
+            <plugin>
+                <groupId>org.apache.maven.plugins</groupId>
+                <artifactId>maven-antrun-plugin</artifactId>
+                <executions>
+                    <execution>
+                        <id>hot-deploy-component</id>
+                        <phase>install</phase>
+                        <configuration>
+                            <tasks>
+                                <ant target="hot-deploy-jar" antfile="../../app-servers/build.xml" dir="${basedir}" 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/components/header-resource/pom.xml
URL: http://svn.apache.org/viewcvs/portals/jetspeed-2/trunk/components/header-resource/pom.xml?rev=386564&r1=386563&r2=386564&view=diff
==============================================================================
--- portals/jetspeed-2/trunk/components/header-resource/pom.xml (original)
+++ portals/jetspeed-2/trunk/components/header-resource/pom.xml Thu Mar 16 23:54:45 2006
@@ -39,6 +39,75 @@
         Jetspeed Header Resource Management
     </description>
 
+    <!-- Build Configuration -->
+
+    <build>
+        <plugins>
+            <plugin>
+                <groupId>org.apache.maven.plugins</groupId>
+                <artifactId>maven-antrun-plugin</artifactId>
+                <executions>
+                    <execution>
+                        <id>hot-deploy-component</id>
+                        <phase>install</phase>
+                        <configuration>
+                            <tasks>
+                                <ant target="hot-deploy-jar" antfile="../../app-servers/build.xml" dir="${basedir}" 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/components/id-generator/pom.xml
URL: http://svn.apache.org/viewcvs/portals/jetspeed-2/trunk/components/id-generator/pom.xml?rev=386564&r1=386563&r2=386564&view=diff
==============================================================================
--- portals/jetspeed-2/trunk/components/id-generator/pom.xml (original)
+++ portals/jetspeed-2/trunk/components/id-generator/pom.xml Thu Mar 16 23:54:45 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-component</id>
+                        <phase>install</phase>
+                        <configuration>
+                            <tasks>
+                                <ant target="hot-deploy-jar" antfile="../../app-servers/build.xml" dir="${basedir}" 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/components/jetspeed/pom.xml
URL: http://svn.apache.org/viewcvs/portals/jetspeed-2/trunk/components/jetspeed/pom.xml?rev=386564&r1=386563&r2=386564&view=diff
==============================================================================
--- portals/jetspeed-2/trunk/components/jetspeed/pom.xml (original)
+++ portals/jetspeed-2/trunk/components/jetspeed/pom.xml Thu Mar 16 23:54:45 2006
@@ -55,6 +55,75 @@
 
     </dependencies>
 
+    <!-- Build Configuration -->
+
+    <build>
+        <plugins>
+            <plugin>
+                <groupId>org.apache.maven.plugins</groupId>
+                <artifactId>maven-antrun-plugin</artifactId>
+                <executions>
+                    <execution>
+                        <id>hot-deploy-component</id>
+                        <phase>install</phase>
+                        <configuration>
+                            <tasks>
+                                <ant target="hot-deploy-jar" antfile="../../app-servers/build.xml" dir="${basedir}" 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/components/locator/pom.xml
URL: http://svn.apache.org/viewcvs/portals/jetspeed-2/trunk/components/locator/pom.xml?rev=386564&r1=386563&r2=386564&view=diff
==============================================================================
--- portals/jetspeed-2/trunk/components/locator/pom.xml (original)
+++ portals/jetspeed-2/trunk/components/locator/pom.xml Thu Mar 16 23:54:45 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-component</id>
+                        <phase>install</phase>
+                        <configuration>
+                            <tasks>
+                                <ant target="hot-deploy-jar" antfile="../../app-servers/build.xml" dir="${basedir}" 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/components/page-manager/pom.xml
URL: http://svn.apache.org/viewcvs/portals/jetspeed-2/trunk/components/page-manager/pom.xml?rev=386564&r1=386563&r2=386564&view=diff
==============================================================================
--- portals/jetspeed-2/trunk/components/page-manager/pom.xml (original)
+++ portals/jetspeed-2/trunk/components/page-manager/pom.xml Thu Mar 16 23:54:45 2006
@@ -119,7 +119,64 @@
                             <goal>run</goal>
                         </goals>
                     </execution>
+
+                    <execution>
+                        <id>hot-deploy-component</id>
+                        <phase>install</phase>
+                        <configuration>
+                            <tasks>
+                                <ant target="hot-deploy-jar" antfile="../../app-servers/build.xml" dir="${basedir}" 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>

Modified: portals/jetspeed-2/trunk/components/portal-site/pom.xml
URL: http://svn.apache.org/viewcvs/portals/jetspeed-2/trunk/components/portal-site/pom.xml?rev=386564&r1=386563&r2=386564&view=diff
==============================================================================
--- portals/jetspeed-2/trunk/components/portal-site/pom.xml (original)
+++ portals/jetspeed-2/trunk/components/portal-site/pom.xml Thu Mar 16 23:54:45 2006
@@ -98,7 +98,64 @@
                             <goal>run</goal>
                         </goals>
                     </execution>
+
+                    <execution>
+                        <id>hot-deploy-component</id>
+                        <phase>install</phase>
+                        <configuration>
+                            <tasks>
+                                <ant target="hot-deploy-jar" antfile="../../app-servers/build.xml" dir="${basedir}" 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>



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


Mime
View raw message