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 [2/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
Modified: portals/jetspeed-2/trunk/components/portal/pom.xml
URL: http://svn.apache.org/viewcvs/portals/jetspeed-2/trunk/components/portal/pom.xml?rev=386564&r1=386563&r2=386564&view=diff
==============================================================================
--- portals/jetspeed-2/trunk/components/portal/pom.xml (original)
+++ portals/jetspeed-2/trunk/components/portal/pom.xml Thu Mar 16 23:54:45 2006
@@ -212,6 +212,71 @@
                 <directory>../../src/webapp/WEB-INF/assembly</directory>
             </testResource>
         </testResources>
+
+        <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 -->

Modified: portals/jetspeed-2/trunk/components/portlet-factory/pom.xml
URL: http://svn.apache.org/viewcvs/portals/jetspeed-2/trunk/components/portlet-factory/pom.xml?rev=386564&r1=386563&r2=386564&view=diff
==============================================================================
--- portals/jetspeed-2/trunk/components/portlet-factory/pom.xml (original)
+++ portals/jetspeed-2/trunk/components/portlet-factory/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/prefs/pom.xml
URL: http://svn.apache.org/viewcvs/portals/jetspeed-2/trunk/components/prefs/pom.xml?rev=386564&r1=386563&r2=386564&view=diff
==============================================================================
--- portals/jetspeed-2/trunk/components/prefs/pom.xml (original)
+++ portals/jetspeed-2/trunk/components/prefs/pom.xml Thu Mar 16 23:54:45 2006
@@ -71,6 +71,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/profiler/pom.xml
URL: http://svn.apache.org/viewcvs/portals/jetspeed-2/trunk/components/profiler/pom.xml?rev=386564&r1=386563&r2=386564&view=diff
==============================================================================
--- portals/jetspeed-2/trunk/components/profiler/pom.xml (original)
+++ portals/jetspeed-2/trunk/components/profiler/pom.xml Thu Mar 16 23:54:45 2006
@@ -67,6 +67,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/rdbms/pom.xml
URL: http://svn.apache.org/viewcvs/portals/jetspeed-2/trunk/components/rdbms/pom.xml?rev=386564&r1=386563&r2=386564&view=diff
==============================================================================
--- portals/jetspeed-2/trunk/components/rdbms/pom.xml (original)
+++ portals/jetspeed-2/trunk/components/rdbms/pom.xml Thu Mar 16 23:54:45 2006
@@ -72,6 +72,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/registry/pom.xml
URL: http://svn.apache.org/viewcvs/portals/jetspeed-2/trunk/components/registry/pom.xml?rev=386564&r1=386563&r2=386564&view=diff
==============================================================================
--- portals/jetspeed-2/trunk/components/registry/pom.xml (original)
+++ portals/jetspeed-2/trunk/components/registry/pom.xml Thu Mar 16 23:54:45 2006
@@ -111,6 +111,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/rewriter/pom.xml
URL: http://svn.apache.org/viewcvs/portals/jetspeed-2/trunk/components/rewriter/pom.xml?rev=386564&r1=386563&r2=386564&view=diff
==============================================================================
--- portals/jetspeed-2/trunk/components/rewriter/pom.xml (original)
+++ portals/jetspeed-2/trunk/components/rewriter/pom.xml Thu Mar 16 23:54:45 2006
@@ -74,6 +74,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/search/pom.xml
URL: http://svn.apache.org/viewcvs/portals/jetspeed-2/trunk/components/search/pom.xml?rev=386564&r1=386563&r2=386564&view=diff
==============================================================================
--- portals/jetspeed-2/trunk/components/search/pom.xml (original)
+++ portals/jetspeed-2/trunk/components/search/pom.xml Thu Mar 16 23:54:45 2006
@@ -59,6 +59,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/security-schema/pom.xml
URL: http://svn.apache.org/viewcvs/portals/jetspeed-2/trunk/components/security-schema/pom.xml?rev=386564&r1=386563&r2=386564&view=diff
==============================================================================
--- portals/jetspeed-2/trunk/components/security-schema/pom.xml (original)
+++ portals/jetspeed-2/trunk/components/security-schema/pom.xml Thu Mar 16 23:54:45 2006
@@ -60,6 +60,75 @@
 
     </build>
 
+    <!-- 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/security/pom.xml
URL: http://svn.apache.org/viewcvs/portals/jetspeed-2/trunk/components/security/pom.xml?rev=386564&r1=386563&r2=386564&view=diff
==============================================================================
--- portals/jetspeed-2/trunk/components/security/pom.xml (original)
+++ portals/jetspeed-2/trunk/components/security/pom.xml Thu Mar 16 23:54:45 2006
@@ -109,6 +109,69 @@
                     </includes>
                 </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/serializer/pom.xml
URL: http://svn.apache.org/viewcvs/portals/jetspeed-2/trunk/components/serializer/pom.xml?rev=386564&r1=386563&r2=386564&view=diff
==============================================================================
--- portals/jetspeed-2/trunk/components/serializer/pom.xml (original)
+++ portals/jetspeed-2/trunk/components/serializer/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/sso/pom.xml
URL: http://svn.apache.org/viewcvs/portals/jetspeed-2/trunk/components/sso/pom.xml?rev=386564&r1=386563&r2=386564&view=diff
==============================================================================
--- portals/jetspeed-2/trunk/components/sso/pom.xml (original)
+++ portals/jetspeed-2/trunk/components/sso/pom.xml Thu Mar 16 23:54:45 2006
@@ -67,6 +67,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/statistics/pom.xml
URL: http://svn.apache.org/viewcvs/portals/jetspeed-2/trunk/components/statistics/pom.xml?rev=386564&r1=386563&r2=386564&view=diff
==============================================================================
--- portals/jetspeed-2/trunk/components/statistics/pom.xml (original)
+++ portals/jetspeed-2/trunk/components/statistics/pom.xml Thu Mar 16 23:54:45 2006
@@ -82,6 +82,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/web-content/pom.xml
URL: http://svn.apache.org/viewcvs/portals/jetspeed-2/trunk/components/web-content/pom.xml?rev=386564&r1=386563&r2=386564&view=diff
==============================================================================
--- portals/jetspeed-2/trunk/components/web-content/pom.xml (original)
+++ portals/jetspeed-2/trunk/components/web-content/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/webapp-logging/pom.xml
URL: http://svn.apache.org/viewcvs/portals/jetspeed-2/trunk/components/webapp-logging/pom.xml?rev=386564&r1=386563&r2=386564&view=diff
==============================================================================
--- portals/jetspeed-2/trunk/components/webapp-logging/pom.xml (original)
+++ portals/jetspeed-2/trunk/components/webapp-logging/pom.xml Thu Mar 16 23:54:45 2006
@@ -58,6 +58,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/etc/build.xml
URL: http://svn.apache.org/viewcvs/portals/jetspeed-2/trunk/etc/build.xml?rev=386564&r1=386563&r2=386564&view=diff
==============================================================================
--- portals/jetspeed-2/trunk/etc/build.xml (original)
+++ portals/jetspeed-2/trunk/etc/build.xml Thu Mar 16 23:54:45 2006
@@ -20,6 +20,7 @@
 
     <!-- Properties -->
 
+    <property name="org.apache.jetspeed.database.enable" value="true"/>
     <property name="org.apache.jetspeed.database.skip" value="false"/>
     <property name="org.apache.jetspeed.database.default.name" value=""/>
     <property name="org.apache.jetspeed.database.url" value=""/>
@@ -57,6 +58,7 @@
         <echo message="    populate-db - build and minimally populate database instance."/>
         <echo message="    populate-db-userinfo - build and populate database instance with default users."/>
         <echo message="Configuration:"/>
+        <echo message="    org.apache.jetspeed.database.enable=${org.apache.jetspeed.database.enable}"/>
         <echo message="    org.apache.jetspeed.database.skip=${org.apache.jetspeed.database.skip}"/>
         <echo message="    org.apache.jetspeed.database.default.name=${org.apache.jetspeed.database.default.name}"/>
         <echo message="    org.apache.jetspeed.database.url=${org.apache.jetspeed.database.url}"/>
@@ -292,7 +294,12 @@
 
     <target name="populate-skip">
         <condition property="org.apache.jetspeed.skip">
-            <equals arg1="${org.apache.jetspeed.database.skip}" arg2="true"/>
+            <or>
+                <equals arg1="${org.apache.jetspeed.database.skip}" arg2="true"/>
+                <not>
+                    <equals arg1="${org.apache.jetspeed.database.enable}" arg2="true"/>
+                </not>
+            </or>
         </condition>
     </target>
 

Modified: portals/jetspeed-2/trunk/etc/pom.xml
URL: http://svn.apache.org/viewcvs/portals/jetspeed-2/trunk/etc/pom.xml?rev=386564&r1=386563&r2=386564&view=diff
==============================================================================
--- portals/jetspeed-2/trunk/etc/pom.xml (original)
+++ portals/jetspeed-2/trunk/etc/pom.xml Thu Mar 16 23:54:45 2006
@@ -138,6 +138,8 @@
                         <configuration>
                             <tasks>
                                 <ant target="populate-db-userinfo" antfile="build.xml" dir="${basedir}" inheritRefs="on">
+                                    <property name="org.apache.jetspeed.database.enable"
+                                              value="${org.apache.jetspeed.env.deploy.db}"/>
                                     <property name="org.apache.jetspeed.database.skip"
                                               value="${org.apache.jetspeed.env.skip.production}"/>
                                     <property name="org.apache.jetspeed.database.default.name"

Modified: portals/jetspeed-2/trunk/layout-portlets/layout-portlets-war/pom.xml
URL: http://svn.apache.org/viewcvs/portals/jetspeed-2/trunk/layout-portlets/layout-portlets-war/pom.xml?rev=386564&r1=386563&r2=386564&view=diff
==============================================================================
--- portals/jetspeed-2/trunk/layout-portlets/layout-portlets-war/pom.xml (original)
+++ portals/jetspeed-2/trunk/layout-portlets/layout-portlets-war/pom.xml Thu Mar 16 23:54:45 2006
@@ -36,6 +36,24 @@
     <packaging>war</packaging>
     <name>Jetspeed-2 Layout Portlets WAR</name>
 
+    <!-- Dependencies -->
+
+    <dependencies>
+
+        <!-- Runtime Dependencies -->
+        <dependency>
+            <groupId>${pom.groupId}</groupId>
+            <artifactId>jetspeed-layout-portlets</artifactId>
+            <scope>runtime</scope>
+        </dependency>
+        <dependency>
+            <groupId>log4j</groupId>
+            <artifactId>log4j</artifactId>
+            <scope>runtime</scope>
+        </dependency>
+
+    </dependencies>
+
     <!-- Build Configuration -->
 
     <build>
@@ -56,24 +74,72 @@
             </plugins>
         </pluginManagement>    
 
-    </build>
+        <!-- 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>
 
-    <!-- Dependencies -->
-
-    <dependencies>
-
-        <!-- Runtime Dependencies -->
-        <dependency>
-            <groupId>${pom.groupId}</groupId>
-            <artifactId>jetspeed-layout-portlets</artifactId>
-            <scope>runtime</scope>
-        </dependency>
-        <dependency>
-            <groupId>log4j</groupId>
-            <artifactId>log4j</artifactId>
-            <scope>runtime</scope>
-        </dependency>
-
-    </dependencies>
+    </build>
 
 </project>

Modified: portals/jetspeed-2/trunk/pom.xml
URL: http://svn.apache.org/viewcvs/portals/jetspeed-2/trunk/pom.xml?rev=386564&r1=386563&r2=386564&view=diff
==============================================================================
--- portals/jetspeed-2/trunk/pom.xml (original)
+++ portals/jetspeed-2/trunk/pom.xml Thu Mar 16 23:54:45 2006
@@ -64,6 +64,39 @@
             </properties>
         </profile>
 
+        <!-- Full Deployment Profile -->
+        <profile>
+            <id>full</id>
+            <properties>
+                <org.apache.jetspeed.env.deploy.type>full</org.apache.jetspeed.env.deploy.type>
+            </properties>
+        </profile>
+
+        <!-- Min Deployment Profile -->
+        <profile>
+            <id>min</id>
+            <properties>
+                <org.apache.jetspeed.env.deploy.type>min</org.apache.jetspeed.env.deploy.type>
+            </properties>
+        </profile>
+
+        <!-- NoDB Deployment Profile -->
+        <profile>
+            <id>nodb</id>
+            <properties>
+                <org.apache.jetspeed.env.deploy.db>false</org.apache.jetspeed.env.deploy.db>
+            </properties>
+        </profile>
+
+        <!-- Hot Deployment Profile -->
+        <profile>
+            <id>hot</id>
+            <properties>
+                <org.apache.jetspeed.env.deploy.db>false</org.apache.jetspeed.env.deploy.db>
+                <org.apache.jetspeed.env.hotdeploy>true</org.apache.jetspeed.env.hotdeploy>
+            </properties>
+        </profile>
+
     </profiles>
 
     <!-- Properties -->
@@ -74,7 +107,10 @@
         <maven.test.skip>true</maven.test.skip>
         <org.apache.jetspeed.env.skip.test>true</org.apache.jetspeed.env.skip.test>
         <org.apache.jetspeed.env.skip.production>true</org.apache.jetspeed.env.skip.production>
-        <org.apache.jetspeed.env.deploy.target>tomcat</org.apache.jetspeed.env.deploy.target>
+        <org.apache.jetspeed.env.deploy.target>none</org.apache.jetspeed.env.deploy.target>
+        <org.apache.jetspeed.env.deploy.type>full</org.apache.jetspeed.env.deploy.type>
+        <org.apache.jetspeed.env.deploy.db>true</org.apache.jetspeed.env.deploy.db>
+        <org.apache.jetspeed.env.hotdeploy>false</org.apache.jetspeed.env.hotdeploy>
 
         <!-- Dependency Version Properties -->
         <ant.version>1.6.5</ant.version>
@@ -504,11 +540,23 @@
                 <groupId>commons-pool</groupId>
                 <artifactId>commons-pool</artifactId>
                 <version>${commons-pool.version}</version>
+                <exclusions>
+                    <exclusion>
+                        <groupId>xerces</groupId>
+                        <artifactId>xercesImpl</artifactId>
+                    </exclusion>
+                </exclusions>
             </dependency>
             <dependency>
                 <groupId>commons-dbcp</groupId>
                 <artifactId>commons-dbcp</artifactId>
                 <version>${commons-dbcp.version}</version>
+                <exclusions>
+                    <exclusion>
+                        <groupId>xerces</groupId>
+                        <artifactId>xercesImpl</artifactId>
+                    </exclusion>
+                </exclusions>
             </dependency>
             <dependency>
                 <groupId>commons-digester</groupId>



---------------------------------------------------------------------
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