portals-jetspeed-dev mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From rwat...@apache.org
Subject svn commit: r399848 [2/3] - in /portals/jetspeed-2/trunk: ./ ant-tasks/ app-servers/ applications/ applications/demo/ applications/gems/ applications/j2-admin/ applications/rss/ applications/rss/rss-jar/ applications/rss/rss-war/ commons/ components/ c...
Date Thu, 04 May 2006 20:24:28 GMT
Modified: portals/jetspeed-2/trunk/components/sso/pom.xml
URL: http://svn.apache.org/viewcvs/portals/jetspeed-2/trunk/components/sso/pom.xml?rev=399848&r1=399847&r2=399848&view=diff
==============================================================================
--- portals/jetspeed-2/trunk/components/sso/pom.xml (original)
+++ portals/jetspeed-2/trunk/components/sso/pom.xml Thu May  4 13:24:19 2006
@@ -21,16 +21,17 @@
          xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
 
     <modelVersion>4.0.0</modelVersion>
+    <prerequisites>
+        <maven>2.0.4</maven>
+    </prerequisites>
 
     <!-- POM Identification -->
 
-    <groupId>org.apache.portals.jetspeed-2</groupId>
-    <version>2.1-dev</version>
     <artifactId>jetspeed-sso</artifactId>
     <parent>
         <groupId>org.apache.portals.jetspeed-2</groupId>
-        <version>2.1-dev</version>
         <artifactId>components</artifactId>
+        <version>2.1-dev</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
     <packaging>jar</packaging>
@@ -101,37 +102,6 @@
                         </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/statistics/pom.xml
URL: http://svn.apache.org/viewcvs/portals/jetspeed-2/trunk/components/statistics/pom.xml?rev=399848&r1=399847&r2=399848&view=diff
==============================================================================
--- portals/jetspeed-2/trunk/components/statistics/pom.xml (original)
+++ portals/jetspeed-2/trunk/components/statistics/pom.xml Thu May  4 13:24:19 2006
@@ -21,16 +21,17 @@
          xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
 
     <modelVersion>4.0.0</modelVersion>
+    <prerequisites>
+        <maven>2.0.4</maven>
+    </prerequisites>
 
     <!-- POM Identification -->
 
-    <groupId>org.apache.portals.jetspeed-2</groupId>
-    <version>2.1-dev</version>
     <artifactId>jetspeed-statistics</artifactId>
     <parent>
         <groupId>org.apache.portals.jetspeed-2</groupId>
-        <version>2.1-dev</version>
         <artifactId>components</artifactId>
+        <version>2.1-dev</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
     <packaging>jar</packaging>
@@ -116,37 +117,6 @@
                         </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/web-content/pom.xml
URL: http://svn.apache.org/viewcvs/portals/jetspeed-2/trunk/components/web-content/pom.xml?rev=399848&r1=399847&r2=399848&view=diff
==============================================================================
--- portals/jetspeed-2/trunk/components/web-content/pom.xml (original)
+++ portals/jetspeed-2/trunk/components/web-content/pom.xml Thu May  4 13:24:19 2006
@@ -21,16 +21,17 @@
          xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
 
     <modelVersion>4.0.0</modelVersion>
+    <prerequisites>
+        <maven>2.0.4</maven>
+    </prerequisites>
 
     <!-- POM Identification -->
 
-    <groupId>org.apache.portals.jetspeed-2</groupId>
-    <version>2.1-dev</version>
     <artifactId>jetspeed-web-content</artifactId>
     <parent>
         <groupId>org.apache.portals.jetspeed-2</groupId>
-        <version>2.1-dev</version>
         <artifactId>components</artifactId>
+        <version>2.1-dev</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
     <packaging>jar</packaging>
@@ -97,37 +98,6 @@
                         </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/webapp-logging/pom.xml
URL: http://svn.apache.org/viewcvs/portals/jetspeed-2/trunk/components/webapp-logging/pom.xml?rev=399848&r1=399847&r2=399848&view=diff
==============================================================================
--- portals/jetspeed-2/trunk/components/webapp-logging/pom.xml (original)
+++ portals/jetspeed-2/trunk/components/webapp-logging/pom.xml Thu May  4 13:24:19 2006
@@ -21,16 +21,17 @@
          xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
 
     <modelVersion>4.0.0</modelVersion>
+    <prerequisites>
+        <maven>2.0.4</maven>
+    </prerequisites>
 
     <!-- POM Identification -->
 
-    <groupId>org.apache.portals.jetspeed-2</groupId>
-    <version>2.1-dev</version>
     <artifactId>jetspeed-webapp-logging</artifactId>
     <parent>
         <groupId>org.apache.portals.jetspeed-2</groupId>
-        <version>2.1-dev</version>
         <artifactId>components</artifactId>
+        <version>2.1-dev</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
     <packaging>jar</packaging>
@@ -92,37 +93,6 @@
                         </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/content-server/pom.xml
URL: http://svn.apache.org/viewcvs/portals/jetspeed-2/trunk/content-server/pom.xml?rev=399848&r1=399847&r2=399848&view=diff
==============================================================================
--- portals/jetspeed-2/trunk/content-server/pom.xml (original)
+++ portals/jetspeed-2/trunk/content-server/pom.xml Thu May  4 13:24:19 2006
@@ -21,16 +21,17 @@
          xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
 
     <modelVersion>4.0.0</modelVersion>
+    <prerequisites>
+        <maven>2.0.4</maven>
+    </prerequisites>
 
     <!-- POM Identification -->
 
-    <groupId>org.apache.portals.jetspeed-2</groupId>
-    <version>2.1-dev</version>
     <artifactId>content-server</artifactId>
     <parent>
         <groupId>org.apache.portals.jetspeed-2</groupId>
-        <version>2.1-dev</version>
         <artifactId>jetspeed-2</artifactId>
+        <version>2.1-dev</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
     <packaging>jar</packaging>

Modified: portals/jetspeed-2/trunk/etc/build.xml
URL: http://svn.apache.org/viewcvs/portals/jetspeed-2/trunk/etc/build.xml?rev=399848&r1=399847&r2=399848&view=diff
==============================================================================
--- portals/jetspeed-2/trunk/etc/build.xml (original)
+++ portals/jetspeed-2/trunk/etc/build.xml Thu May  4 13:24:19 2006
@@ -34,7 +34,8 @@
 
     <property name="org.apache.jetspeed.source.sql" value="${basedir}/sql"/>
     <property name="org.apache.jetspeed.database.source.sql" value="${org.apache.jetspeed.source.sql}/${org.apache.jetspeed.database.default.name}"/>
-    <property name="org.apache.jetspeed.database.target.sql" value="${basedir}/target/sql/${org.apache.jetspeed.database.default.name}"/>
+    <property name="org.apache.jetspeed.database.target.sql.root" value="${basedir}/target/sql"/>
+    <property name="org.apache.jetspeed.database.target.sql" value="${org.apache.jetspeed.database.target.sql.root}/${org.apache.jetspeed.database.default.name}"/>
 
     <property name="torque.contextProperties" value=""/>
     <property name="torque.runOnlyOnSchemaChange" value="true"/>
@@ -52,9 +53,10 @@
 
     <target name="help">
         <echo message="Buildfile for the etc maven POM."/>
-        <echo message="Usage: ant [ schema | populate-db | populate-db-userinfo ]"/>
+        <echo message="Usage: ant [ clean-schema | schema | populate-db | populate-db-userinfo ]"/>
         <echo message="Where:"/>
-        <echo message="    schema - build schema for database."/>
+        <echo message="    clean-schema - clean schemas for all databases."/>
+        <echo message="    schema - build schema for database if not already built."/>
         <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:"/>
@@ -78,10 +80,17 @@
 
     <!-- Schema Generation -->
 
-    <target name="schema" depends="test-database-default-name, test-database-filter-drops">
+    <target name="clean-schema">
+
+        <!-- clean target directories -->
+        <delete dir="${org.apache.jetspeed.database.target.sql.root}"/>
+
+    </target>
+
+    <target name="schema" depends="test-database-default-name, test-database-filter-drops, test-database-target-sql"
+            unless="org.apache.jetspeed.database.target.sql.exists">
 
         <!-- make target directory -->
-        <delete dir="${org.apache.jetspeed.database.target.sql}"/>
         <mkdir dir="${org.apache.jetspeed.database.target.sql}"/>
 
         <!-- copy general sql -->
@@ -145,6 +154,11 @@
                 <equals arg1="${org.apache.jetspeed.database.default.name}" arg2="derby"/>
             </or>
         </condition>
+    </target>
+
+    <target name="test-database-target-sql">
+        <available file="${org.apache.jetspeed.database.target.sql}"
+                   property="org.apache.jetspeed.database.target.sql.exists"/>
     </target>
 
     <target name="schema-mssql" if="org.apache.jetspeed.database.is.mssql">

Modified: portals/jetspeed-2/trunk/etc/import/pom.xml
URL: http://svn.apache.org/viewcvs/portals/jetspeed-2/trunk/etc/import/pom.xml?rev=399848&r1=399847&r2=399848&view=diff
==============================================================================
--- portals/jetspeed-2/trunk/etc/import/pom.xml (original)
+++ portals/jetspeed-2/trunk/etc/import/pom.xml Thu May  4 13:24:19 2006
@@ -21,16 +21,17 @@
          xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
 
     <modelVersion>4.0.0</modelVersion>
+    <prerequisites>
+        <maven>2.0.4</maven>
+    </prerequisites>
 
     <!-- POM Identification -->
 
-    <groupId>org.apache.portals.jetspeed-2</groupId>
-    <version>2.1-dev</version>
     <artifactId>import</artifactId>
     <parent>
         <groupId>org.apache.portals.jetspeed-2</groupId>
-        <version>2.1-dev</version>
         <artifactId>jetspeed-2</artifactId>
+        <version>2.1-dev</version>
         <relativePath>../../pom.xml</relativePath>
     </parent>
     <packaging>pom</packaging>
@@ -126,37 +127,6 @@
                     </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/etc/pom.xml
URL: http://svn.apache.org/viewcvs/portals/jetspeed-2/trunk/etc/pom.xml?rev=399848&r1=399847&r2=399848&view=diff
==============================================================================
--- portals/jetspeed-2/trunk/etc/pom.xml (original)
+++ portals/jetspeed-2/trunk/etc/pom.xml Thu May  4 13:24:19 2006
@@ -21,16 +21,17 @@
          xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
 
     <modelVersion>4.0.0</modelVersion>
+    <prerequisites>
+        <maven>2.0.4</maven>
+    </prerequisites>
 
     <!-- POM Identification -->
 
-    <groupId>org.apache.portals.jetspeed-2</groupId>
-    <version>2.1-dev</version>
     <artifactId>etc</artifactId>
     <parent>
         <groupId>org.apache.portals.jetspeed-2</groupId>
-        <version>2.1-dev</version>
         <artifactId>jetspeed-2</artifactId>
+        <version>2.1-dev</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
     <packaging>pom</packaging>
@@ -85,10 +86,15 @@
                         <phase>compile</phase>
                         <configuration>
                             <tasks>
+                                <ant target="clean-schema" antfile="build.xml" dir="${basedir}" inheritall="off"/>
                                 <ant target="schema" antfile="build.xml" dir="${basedir}" inheritall="off">
                                     <property name="org.apache.jetspeed.database.default.name"
                                               value="${org.apache.jetspeed.test.database.default.name}"/>
                                 </ant>
+                                <ant target="schema" antfile="build.xml" dir="${basedir}" inheritall="off">
+                                    <property name="org.apache.jetspeed.database.default.name"
+                                              value="${org.apache.jetspeed.production.database.default.name}"/>
+                                </ant>
                             </tasks>
                         </configuration>
                         <goals>
@@ -169,62 +175,6 @@
                     </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>torque</groupId>
-                        <artifactId>torque</artifactId>
-                        <version>${torque.version}</version>
-                        <exclusions>
-                            <exclusion>
-                                <groupId>jndi</groupId>
-                                <artifactId>jndi</artifactId>
-                            </exclusion>
-                            <exclusion>
-                                <groupId>javax.sql</groupId>
-                                <artifactId>jdbc-stdext</artifactId>
-                            </exclusion>
-                        </exclusions>
-                    </dependency>
-                    <dependency>
-                        <groupId>torque</groupId>
-                        <artifactId>torque-gen</artifactId>
-                        <version>${torque.version}</version>
-                    </dependency>
-                    <dependency>
-                        <groupId>torque</groupId>
-                        <artifactId>torque-gen-templates</artifactId>
-                        <version>${torque.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/jetspeed-api/pom.xml
URL: http://svn.apache.org/viewcvs/portals/jetspeed-2/trunk/jetspeed-api/pom.xml?rev=399848&r1=399847&r2=399848&view=diff
==============================================================================
--- portals/jetspeed-2/trunk/jetspeed-api/pom.xml (original)
+++ portals/jetspeed-2/trunk/jetspeed-api/pom.xml Thu May  4 13:24:19 2006
@@ -21,16 +21,17 @@
          xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
 
     <modelVersion>4.0.0</modelVersion>
+    <prerequisites>
+        <maven>2.0.4</maven>
+    </prerequisites>
 
     <!-- POM Identification -->
 
-    <groupId>org.apache.portals.jetspeed-2</groupId>
-    <version>2.1-dev</version>
     <artifactId>jetspeed-api</artifactId>
     <parent>
         <groupId>org.apache.portals.jetspeed-2</groupId>
-        <version>2.1-dev</version>
         <artifactId>jetspeed-2</artifactId>
+        <version>2.1-dev</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
     <packaging>jar</packaging>
@@ -73,37 +74,6 @@
                         </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/layout-portlets/layout-portlets-jar/pom.xml
URL: http://svn.apache.org/viewcvs/portals/jetspeed-2/trunk/layout-portlets/layout-portlets-jar/pom.xml?rev=399848&r1=399847&r2=399848&view=diff
==============================================================================
--- portals/jetspeed-2/trunk/layout-portlets/layout-portlets-jar/pom.xml (original)
+++ portals/jetspeed-2/trunk/layout-portlets/layout-portlets-jar/pom.xml Thu May  4 13:24:19 2006
@@ -21,16 +21,17 @@
          xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
 
     <modelVersion>4.0.0</modelVersion>
+    <prerequisites>
+        <maven>2.0.4</maven>
+    </prerequisites>
 
     <!-- POM Identification -->
 
-    <groupId>org.apache.portals.jetspeed-2</groupId>
-    <version>2.1-dev</version>
     <artifactId>jetspeed-layout-portlets</artifactId>
     <parent>
         <groupId>org.apache.portals.jetspeed-2</groupId>
-        <version>2.1-dev</version>
         <artifactId>layout-portlets</artifactId>
+        <version>2.1-dev</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
     <packaging>jar</packaging>

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=399848&r1=399847&r2=399848&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 May  4 13:24:19 2006
@@ -21,16 +21,17 @@
          xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
 
     <modelVersion>4.0.0</modelVersion>
+    <prerequisites>
+        <maven>2.0.4</maven>
+    </prerequisites>
 
     <!-- POM Identification -->
 
-    <groupId>org.apache.portals.jetspeed-2</groupId>
-    <version>2.1-dev</version>
     <artifactId>jetspeed-layouts</artifactId>
     <parent>
         <groupId>org.apache.portals.jetspeed-2</groupId>
-        <version>2.1-dev</version>
         <artifactId>layout-portlets</artifactId>
+        <version>2.1-dev</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
     <packaging>war</packaging>
@@ -106,37 +107,6 @@
                         </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>
 

Modified: portals/jetspeed-2/trunk/layout-portlets/pom.xml
URL: http://svn.apache.org/viewcvs/portals/jetspeed-2/trunk/layout-portlets/pom.xml?rev=399848&r1=399847&r2=399848&view=diff
==============================================================================
--- portals/jetspeed-2/trunk/layout-portlets/pom.xml (original)
+++ portals/jetspeed-2/trunk/layout-portlets/pom.xml Thu May  4 13:24:19 2006
@@ -21,16 +21,17 @@
          xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
 
     <modelVersion>4.0.0</modelVersion>
+    <prerequisites>
+        <maven>2.0.4</maven>
+    </prerequisites>
 
     <!-- POM Identification -->
 
-    <groupId>org.apache.portals.jetspeed-2</groupId>
-    <version>2.1-dev</version>
     <artifactId>layout-portlets</artifactId>
     <parent>
         <groupId>org.apache.portals.jetspeed-2</groupId>
-        <version>2.1-dev</version>
         <artifactId>jetspeed-2</artifactId>
+        <version>2.1-dev</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
     <packaging>pom</packaging>

Modified: portals/jetspeed-2/trunk/maven-archetypes/application/pom.xml
URL: http://svn.apache.org/viewcvs/portals/jetspeed-2/trunk/maven-archetypes/application/pom.xml?rev=399848&r1=399847&r2=399848&view=diff
==============================================================================
--- portals/jetspeed-2/trunk/maven-archetypes/application/pom.xml (original)
+++ portals/jetspeed-2/trunk/maven-archetypes/application/pom.xml Thu May  4 13:24:19 2006
@@ -21,16 +21,17 @@
          xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
 
     <modelVersion>4.0.0</modelVersion>
+    <prerequisites>
+        <maven>2.0.4</maven>
+    </prerequisites>
 
     <!-- POM Identification -->
 
-    <groupId>org.apache.portals.jetspeed-2</groupId>
-    <version>2.1-dev</version>
     <artifactId>application-archetype</artifactId>
     <parent>
         <groupId>org.apache.portals.jetspeed-2</groupId>
-        <version>2.1-dev</version>
         <artifactId>maven-archetypes</artifactId>
+        <version>2.1-dev</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
     <packaging>jar</packaging>

Modified: portals/jetspeed-2/trunk/maven-archetypes/application/src/archetype/META-INF/archetype.xml
URL: http://svn.apache.org/viewcvs/portals/jetspeed-2/trunk/maven-archetypes/application/src/archetype/META-INF/archetype.xml?rev=399848&r1=399847&r2=399848&view=diff
==============================================================================
--- portals/jetspeed-2/trunk/maven-archetypes/application/src/archetype/META-INF/archetype.xml (original)
+++ portals/jetspeed-2/trunk/maven-archetypes/application/src/archetype/META-INF/archetype.xml Thu May  4 13:24:19 2006
@@ -24,6 +24,7 @@
     <resources>
         <resource>pom.xml</resource>
         <resource>src/webapp/logs/pa.log</resource>
+        <resource>src/webapp/META-INF/context.xml</resource>
         <resource>src/webapp/WEB-INF/c-rt.tld</resource>
         <resource>src/webapp/WEB-INF/c.tld</resource>
         <resource>src/webapp/WEB-INF/jetspeed-portlet.xml</resource>

Modified: portals/jetspeed-2/trunk/maven-archetypes/application/src/archetype/archetype-resources/pom.xml
URL: http://svn.apache.org/viewcvs/portals/jetspeed-2/trunk/maven-archetypes/application/src/archetype/archetype-resources/pom.xml?rev=399848&r1=399847&r2=399848&view=diff
==============================================================================
--- portals/jetspeed-2/trunk/maven-archetypes/application/src/archetype/archetype-resources/pom.xml (original)
+++ portals/jetspeed-2/trunk/maven-archetypes/application/src/archetype/archetype-resources/pom.xml Thu May  4 13:24:19 2006
@@ -21,16 +21,17 @@
          xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
 
     <modelVersion>4.0.0</modelVersion>
+    <prerequisites>
+        <maven>2.0.4</maven>
+    </prerequisites>
 
     <!-- POM Identification -->
 
-    <groupId>${groupId}</groupId>
-    <version>${version}</version>
     <artifactId>${artifactId}</artifactId>
     <parent>
         <groupId>${groupId}</groupId>
-        <version>${version}</version>
         <artifactId>portal-applications</artifactId>
+        <version>${version}</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
     <packaging>war</packaging>
@@ -86,6 +87,11 @@
             <scope>runtime</scope>
         </dependency>
         <dependency>
+            <groupId>commons-collections</groupId>
+            <artifactId>commons-collections</artifactId>
+            <scope>runtime</scope>
+        </dependency>
+        <dependency>
             <groupId>log4j</groupId>
             <artifactId>log4j</artifactId>
             <scope>runtime</scope>
@@ -150,37 +156,6 @@
                         </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>
 

Added: portals/jetspeed-2/trunk/maven-archetypes/application/src/archetype/archetype-resources/src/webapp/META-INF/context.xml
URL: http://svn.apache.org/viewcvs/portals/jetspeed-2/trunk/maven-archetypes/application/src/archetype/archetype-resources/src/webapp/META-INF/context.xml?rev=399848&view=auto
==============================================================================
--- portals/jetspeed-2/trunk/maven-archetypes/application/src/archetype/archetype-resources/src/webapp/META-INF/context.xml (added)
+++ portals/jetspeed-2/trunk/maven-archetypes/application/src/archetype/archetype-resources/src/webapp/META-INF/context.xml Thu May  4 13:24:19 2006
@@ -0,0 +1,18 @@
+<!--
+Copyright 2006 The Apache Software Foundation
+
+Licensed under the Apache License, Version 2.0 (the "License");
+you may not use this file except in compliance with the License.
+You may obtain a copy of the License at
+
+    http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing, software
+distributed under the License is distributed on an "AS IS" BASIS,
+WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+See the License for the specific language governing permissions and
+limitations under the License.
+
+  $Id$
+-->
+<Context crossContext="true"/>

Propchange: portals/jetspeed-2/trunk/maven-archetypes/application/src/archetype/archetype-resources/src/webapp/META-INF/context.xml
------------------------------------------------------------------------------
    svn:eol-style = native

Modified: portals/jetspeed-2/trunk/maven-archetypes/application/src/archetype/archetype-resources/src/webapp/WEB-INF/velocity/toolbox.xml
URL: http://svn.apache.org/viewcvs/portals/jetspeed-2/trunk/maven-archetypes/application/src/archetype/archetype-resources/src/webapp/WEB-INF/velocity/toolbox.xml?rev=399848&r1=399847&r2=399848&view=diff
==============================================================================
--- portals/jetspeed-2/trunk/maven-archetypes/application/src/archetype/archetype-resources/src/webapp/WEB-INF/velocity/toolbox.xml (original)
+++ portals/jetspeed-2/trunk/maven-archetypes/application/src/archetype/archetype-resources/src/webapp/WEB-INF/velocity/toolbox.xml Thu May  4 13:24:19 2006
@@ -27,5 +27,10 @@
     <scope>request</scope>
     <class>org.apache.velocity.tools.view.tools.ParameterParser</class>
   </tool>
+  <tool>
+    <key>esc</key>
+    <scope>application</scope>
+    <class>org.apache.velocity.tools.generic.EscapeTool</class>
+  </tool>
 
 </toolbox>

Modified: portals/jetspeed-2/trunk/maven-archetypes/component/pom.xml
URL: http://svn.apache.org/viewcvs/portals/jetspeed-2/trunk/maven-archetypes/component/pom.xml?rev=399848&r1=399847&r2=399848&view=diff
==============================================================================
--- portals/jetspeed-2/trunk/maven-archetypes/component/pom.xml (original)
+++ portals/jetspeed-2/trunk/maven-archetypes/component/pom.xml Thu May  4 13:24:19 2006
@@ -21,16 +21,17 @@
          xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
 
     <modelVersion>4.0.0</modelVersion>
+    <prerequisites>
+        <maven>2.0.4</maven>
+    </prerequisites>
 
     <!-- POM Identification -->
 
-    <groupId>org.apache.portals.jetspeed-2</groupId>
-    <version>2.1-dev</version>
     <artifactId>component-archetype</artifactId>
     <parent>
         <groupId>org.apache.portals.jetspeed-2</groupId>
-        <version>2.1-dev</version>
         <artifactId>maven-archetypes</artifactId>
+        <version>2.1-dev</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
     <packaging>jar</packaging>

Modified: portals/jetspeed-2/trunk/maven-archetypes/component/src/archetype/archetype-resources/pom.xml
URL: http://svn.apache.org/viewcvs/portals/jetspeed-2/trunk/maven-archetypes/component/src/archetype/archetype-resources/pom.xml?rev=399848&r1=399847&r2=399848&view=diff
==============================================================================
--- portals/jetspeed-2/trunk/maven-archetypes/component/src/archetype/archetype-resources/pom.xml (original)
+++ portals/jetspeed-2/trunk/maven-archetypes/component/src/archetype/archetype-resources/pom.xml Thu May  4 13:24:19 2006
@@ -21,16 +21,17 @@
          xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
 
     <modelVersion>4.0.0</modelVersion>
+    <prerequisites>
+        <maven>2.0.4</maven>
+    </prerequisites>
 
     <!-- POM Identification -->
 
-    <groupId>${groupId}</groupId>
-    <version>${version}</version>
     <artifactId>${artifactId}</artifactId>
     <parent>
         <groupId>${groupId}</groupId>
-        <version>${version}</version>
         <artifactId>portal-components</artifactId>
+        <version>${version}</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
     <packaging>jar</packaging>

Modified: portals/jetspeed-2/trunk/maven-archetypes/pom.xml
URL: http://svn.apache.org/viewcvs/portals/jetspeed-2/trunk/maven-archetypes/pom.xml?rev=399848&r1=399847&r2=399848&view=diff
==============================================================================
--- portals/jetspeed-2/trunk/maven-archetypes/pom.xml (original)
+++ portals/jetspeed-2/trunk/maven-archetypes/pom.xml Thu May  4 13:24:19 2006
@@ -21,16 +21,17 @@
          xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
 
     <modelVersion>4.0.0</modelVersion>
+    <prerequisites>
+        <maven>2.0.4</maven>
+    </prerequisites>
 
     <!-- POM Identification -->
 
-    <groupId>org.apache.portals.jetspeed-2</groupId>
-    <version>2.1-dev</version>
     <artifactId>maven-archetypes</artifactId>
     <parent>
         <groupId>org.apache.portals.jetspeed-2</groupId>
-        <version>2.1-dev</version>
         <artifactId>jetspeed-2</artifactId>
+        <version>2.1-dev</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
     <packaging>pom</packaging>

Modified: portals/jetspeed-2/trunk/maven-archetypes/portal-component/pom.xml
URL: http://svn.apache.org/viewcvs/portals/jetspeed-2/trunk/maven-archetypes/portal-component/pom.xml?rev=399848&r1=399847&r2=399848&view=diff
==============================================================================
--- portals/jetspeed-2/trunk/maven-archetypes/portal-component/pom.xml (original)
+++ portals/jetspeed-2/trunk/maven-archetypes/portal-component/pom.xml Thu May  4 13:24:19 2006
@@ -21,16 +21,17 @@
          xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
 
     <modelVersion>4.0.0</modelVersion>
+    <prerequisites>
+        <maven>2.0.4</maven>
+    </prerequisites>
 
     <!-- POM Identification -->
 
-    <groupId>org.apache.portals.jetspeed-2</groupId>
-    <version>2.1-dev</version>
     <artifactId>portal-component-archetype</artifactId>
     <parent>
         <groupId>org.apache.portals.jetspeed-2</groupId>
-        <version>2.1-dev</version>
         <artifactId>maven-archetypes</artifactId>
+        <version>2.1-dev</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
     <packaging>jar</packaging>

Modified: portals/jetspeed-2/trunk/maven-archetypes/portal-component/src/archetype/archetype-resources/pom.xml
URL: http://svn.apache.org/viewcvs/portals/jetspeed-2/trunk/maven-archetypes/portal-component/src/archetype/archetype-resources/pom.xml?rev=399848&r1=399847&r2=399848&view=diff
==============================================================================
--- portals/jetspeed-2/trunk/maven-archetypes/portal-component/src/archetype/archetype-resources/pom.xml (original)
+++ portals/jetspeed-2/trunk/maven-archetypes/portal-component/src/archetype/archetype-resources/pom.xml Thu May  4 13:24:19 2006
@@ -21,16 +21,17 @@
          xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
 
     <modelVersion>4.0.0</modelVersion>
+    <prerequisites>
+        <maven>2.0.4</maven>
+    </prerequisites>
 
     <!-- POM Identification -->
 
-    <groupId>${groupId}</groupId>
-    <version>${version}</version>
     <artifactId>${artifactId}</artifactId>
     <parent>
         <groupId>${groupId}</groupId>
-        <version>${version}</version>
         <artifactId>portal-components</artifactId>
+        <version>${version}</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
     <packaging>jar</packaging>
@@ -113,37 +114,6 @@
                         </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>
 

Modified: portals/jetspeed-2/trunk/maven-archetypes/portal-resources/pom.xml
URL: http://svn.apache.org/viewcvs/portals/jetspeed-2/trunk/maven-archetypes/portal-resources/pom.xml?rev=399848&r1=399847&r2=399848&view=diff
==============================================================================
--- portals/jetspeed-2/trunk/maven-archetypes/portal-resources/pom.xml (original)
+++ portals/jetspeed-2/trunk/maven-archetypes/portal-resources/pom.xml Thu May  4 13:24:19 2006
@@ -21,16 +21,17 @@
          xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
 
     <modelVersion>4.0.0</modelVersion>
+    <prerequisites>
+        <maven>2.0.4</maven>
+    </prerequisites>
 
     <!-- POM Identification -->
 
-    <groupId>org.apache.portals.jetspeed-2</groupId>
-    <version>2.1-dev</version>
     <artifactId>portal-archetype-resources</artifactId>
     <parent>
         <groupId>org.apache.portals.jetspeed-2</groupId>
-        <version>2.1-dev</version>
         <artifactId>maven-archetypes</artifactId>
+        <version>2.1-dev</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
     <packaging>jar</packaging>
@@ -60,32 +61,6 @@
                         </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 ant dependencies are listed to keep ant-tasks 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>${pom.groupId}</groupId>
-                        <artifactId>ant-tasks</artifactId>
-                        <version>${pom.version}</version>
-                    </dependency>
-                </dependencies>
             </plugin>
         </plugins>
     </build>

Modified: portals/jetspeed-2/trunk/maven-archetypes/portal/pom.xml
URL: http://svn.apache.org/viewcvs/portals/jetspeed-2/trunk/maven-archetypes/portal/pom.xml?rev=399848&r1=399847&r2=399848&view=diff
==============================================================================
--- portals/jetspeed-2/trunk/maven-archetypes/portal/pom.xml (original)
+++ portals/jetspeed-2/trunk/maven-archetypes/portal/pom.xml Thu May  4 13:24:19 2006
@@ -21,16 +21,17 @@
          xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
 
     <modelVersion>4.0.0</modelVersion>
+    <prerequisites>
+        <maven>2.0.4</maven>
+    </prerequisites>
 
     <!-- POM Identification -->
 
-    <groupId>org.apache.portals.jetspeed-2</groupId>
-    <version>2.1-dev</version>
     <artifactId>portal-archetype</artifactId>
     <parent>
         <groupId>org.apache.portals.jetspeed-2</groupId>
-        <version>2.1-dev</version>
         <artifactId>maven-archetypes</artifactId>
+        <version>2.1-dev</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
     <packaging>jar</packaging>
@@ -65,32 +66,6 @@
                         </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 ant dependencies are listed to keep ant-tasks 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>${pom.groupId}</groupId>
-                        <artifactId>ant-tasks</artifactId>
-                        <version>${pom.version}</version>
-                    </dependency>
-                </dependencies>
             </plugin>
         </plugins>
     </build>

Modified: portals/jetspeed-2/trunk/maven-archetypes/portal/src/archetype/archetype-resources/app-servers/pom.xml
URL: http://svn.apache.org/viewcvs/portals/jetspeed-2/trunk/maven-archetypes/portal/src/archetype/archetype-resources/app-servers/pom.xml?rev=399848&r1=399847&r2=399848&view=diff
==============================================================================
--- portals/jetspeed-2/trunk/maven-archetypes/portal/src/archetype/archetype-resources/app-servers/pom.xml (original)
+++ portals/jetspeed-2/trunk/maven-archetypes/portal/src/archetype/archetype-resources/app-servers/pom.xml Thu May  4 13:24:19 2006
@@ -21,16 +21,17 @@
          xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
 
     <modelVersion>4.0.0</modelVersion>
+    <prerequisites>
+        <maven>2.0.4</maven>
+    </prerequisites>
 
     <!-- POM Identification -->
 
-    <groupId>${groupId}</groupId>
-    <version>${version}</version>
     <artifactId>portal-app-servers</artifactId>
     <parent>
         <groupId>${groupId}</groupId>
-        <version>${version}</version>
         <artifactId>${artifactId}</artifactId>
+        <version>${version}</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
     <packaging>pom</packaging>
@@ -128,37 +129,6 @@
                     </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>
 

Modified: portals/jetspeed-2/trunk/maven-archetypes/portal/src/archetype/archetype-resources/applications/pom.xml
URL: http://svn.apache.org/viewcvs/portals/jetspeed-2/trunk/maven-archetypes/portal/src/archetype/archetype-resources/applications/pom.xml?rev=399848&r1=399847&r2=399848&view=diff
==============================================================================
--- portals/jetspeed-2/trunk/maven-archetypes/portal/src/archetype/archetype-resources/applications/pom.xml (original)
+++ portals/jetspeed-2/trunk/maven-archetypes/portal/src/archetype/archetype-resources/applications/pom.xml Thu May  4 13:24:19 2006
@@ -21,16 +21,17 @@
          xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
 
     <modelVersion>4.0.0</modelVersion>
+    <prerequisites>
+        <maven>2.0.4</maven>
+    </prerequisites>
 
     <!-- POM Identification -->
 
-    <groupId>${groupId}</groupId>
-    <version>${version}</version>
     <artifactId>portal-applications</artifactId>
     <parent>
         <groupId>${groupId}</groupId>
-        <version>${version}</version>
         <artifactId>${artifactId}</artifactId>
+        <version>${version}</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
     <packaging>pom</packaging>

Modified: portals/jetspeed-2/trunk/maven-archetypes/portal/src/archetype/archetype-resources/components/pom.xml
URL: http://svn.apache.org/viewcvs/portals/jetspeed-2/trunk/maven-archetypes/portal/src/archetype/archetype-resources/components/pom.xml?rev=399848&r1=399847&r2=399848&view=diff
==============================================================================
--- portals/jetspeed-2/trunk/maven-archetypes/portal/src/archetype/archetype-resources/components/pom.xml (original)
+++ portals/jetspeed-2/trunk/maven-archetypes/portal/src/archetype/archetype-resources/components/pom.xml Thu May  4 13:24:19 2006
@@ -21,16 +21,17 @@
          xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
 
     <modelVersion>4.0.0</modelVersion>
+    <prerequisites>
+        <maven>2.0.4</maven>
+    </prerequisites>
 
     <!-- POM Identification -->
 
-    <groupId>${groupId}</groupId>
-    <version>${version}</version>
     <artifactId>portal-components</artifactId>
     <parent>
         <groupId>${groupId}</groupId>
-        <version>${version}</version>
         <artifactId>${artifactId}</artifactId>
+        <version>${version}</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
     <packaging>pom</packaging>

Modified: portals/jetspeed-2/trunk/maven-archetypes/portal/src/archetype/archetype-resources/etc/build.xml
URL: http://svn.apache.org/viewcvs/portals/jetspeed-2/trunk/maven-archetypes/portal/src/archetype/archetype-resources/etc/build.xml?rev=399848&r1=399847&r2=399848&view=diff
==============================================================================
--- portals/jetspeed-2/trunk/maven-archetypes/portal/src/archetype/archetype-resources/etc/build.xml (original)
+++ portals/jetspeed-2/trunk/maven-archetypes/portal/src/archetype/archetype-resources/etc/build.xml Thu May  4 13:24:19 2006
@@ -34,7 +34,8 @@
 
     <property name="org.apache.jetspeed.source.sql" value="${basedir}/sql"/>
     <property name="org.apache.jetspeed.database.source.sql" value="${org.apache.jetspeed.source.sql}/${org.apache.jetspeed.database.default.name}"/>
-    <property name="org.apache.jetspeed.database.target.sql" value="${basedir}/target/sql/${org.apache.jetspeed.database.default.name}"/>
+    <property name="org.apache.jetspeed.database.target.sql.root" value="${basedir}/target/sql"/>
+    <property name="org.apache.jetspeed.database.target.sql" value="${org.apache.jetspeed.database.target.sql.root}/${org.apache.jetspeed.database.default.name}"/>
 
     <property name="torque.contextProperties" value=""/>
     <property name="torque.runOnlyOnSchemaChange" value="true"/>
@@ -52,9 +53,10 @@
 
     <target name="help">
         <echo message="Buildfile for the etc maven POM."/>
-        <echo message="Usage: ant [ schema | populate-db | populate-db-userinfo ]"/>
+        <echo message="Usage: ant [ clean-schema | schema | populate-db | populate-db-userinfo ]"/>
         <echo message="Where:"/>
-        <echo message="    schema - build schema for database."/>
+        <echo message="    clean-schema - clean schemas for all databases."/>
+        <echo message="    schema - build schema for database if not already built."/>
         <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:"/>
@@ -78,10 +80,17 @@
 
     <!-- Schema Generation -->
 
-    <target name="schema" depends="test-database-default-name, test-database-filter-drops">
+    <target name="clean-schema">
+
+        <!-- clean target directories -->
+        <delete dir="${org.apache.jetspeed.database.target.sql.root}"/>
+
+    </target>
+
+    <target name="schema" depends="test-database-default-name, test-database-filter-drops, test-database-target-sql"
+            unless="org.apache.jetspeed.database.target.sql.exists">
 
         <!-- make target directory -->
-        <delete dir="${org.apache.jetspeed.database.target.sql}"/>
         <mkdir dir="${org.apache.jetspeed.database.target.sql}"/>
 
         <!-- copy general sql -->
@@ -147,6 +156,11 @@
         </condition>
     </target>
 
+    <target name="test-database-target-sql">
+        <available file="${org.apache.jetspeed.database.target.sql}"
+                   property="org.apache.jetspeed.database.target.sql.exists"/>
+    </target>
+
     <target name="schema-mssql" if="org.apache.jetspeed.database.is.mssql">
         <antcall target="torque-gen">
             <param name="torque.database" value="mssql"/>
@@ -257,7 +271,7 @@
 
     <!-- Populate Database -->
 
-    <target name="populate-db" depends="populate-skip" unless="org.apache.jetspeed.skip">
+    <target name="populate-db" depends="test-populate-skip" unless="org.apache.jetspeed.skip">
 
         <!-- execute drop scripts -->
         <antcall target="sql-execute" inheritall="on" inheritrefs="on">
@@ -293,16 +307,7 @@
 
     </target>
 
-    <target name="populate-skip">
-        <condition property="org.apache.jetspeed.skip">
-            <or>
-                <equals arg1="${org.apache.jetspeed.database.skip}" arg2="true"/>
-                <not>
-                    <equals arg1="${org.apache.jetspeed.database.enable}" arg2="true"/>
-                </not>
-            </or>
-        </condition>
-    </target>
+    <!-- SQL Execution -->
 
     <target name="sql-execute" depends="sql-test-database-classpath, sql-execute-drivers-path, sql-execute-derby, sql-execute-hsql"/>
 
@@ -417,6 +422,19 @@
                 <include name="${database.arg.scripts}"/>
             </fileset> 
         </sql>
+    </target>
+
+    <!-- Utilities -->
+
+    <target name="test-populate-skip">
+        <condition property="org.apache.jetspeed.skip">
+            <or>
+                <equals arg1="${org.apache.jetspeed.database.skip}" arg2="true"/>
+                <not>
+                    <equals arg1="${org.apache.jetspeed.database.enable}" arg2="true"/>
+                </not>
+            </or>
+        </condition>
     </target>
 
 </project>

Modified: portals/jetspeed-2/trunk/maven-archetypes/portal/src/archetype/archetype-resources/etc/pom.xml
URL: http://svn.apache.org/viewcvs/portals/jetspeed-2/trunk/maven-archetypes/portal/src/archetype/archetype-resources/etc/pom.xml?rev=399848&r1=399847&r2=399848&view=diff
==============================================================================
--- portals/jetspeed-2/trunk/maven-archetypes/portal/src/archetype/archetype-resources/etc/pom.xml (original)
+++ portals/jetspeed-2/trunk/maven-archetypes/portal/src/archetype/archetype-resources/etc/pom.xml Thu May  4 13:24:19 2006
@@ -21,16 +21,17 @@
          xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
 
     <modelVersion>4.0.0</modelVersion>
+    <prerequisites>
+        <maven>2.0.4</maven>
+    </prerequisites>
 
     <!-- POM Identification -->
 
-    <groupId>${groupId}</groupId>
-    <version>${version}</version>
     <artifactId>portal-etc</artifactId>
     <parent>
         <groupId>${groupId}</groupId>
-        <version>${version}</version>
         <artifactId>${artifactId}</artifactId>
+        <version>${version}</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
     <packaging>pom</packaging>
@@ -81,9 +82,10 @@
                         <phase>compile</phase>
                         <configuration>
                             <tasks>
+                                <ant target="clean-schema" antfile="build.xml" dir="${basedir}" inheritall="off"/>
                                 <ant target="schema" antfile="build.xml" dir="${basedir}" inheritall="off">
                                     <property name="org.apache.jetspeed.database.default.name"
-                                              value="${org.apache.jetspeed.test.database.default.name}"/>
+                                              value="${org.apache.jetspeed.production.database.default.name}"/>
                                 </ant>
                             </tasks>
                         </configuration>
@@ -130,62 +132,6 @@
                     </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>torque</groupId>
-                        <artifactId>torque</artifactId>
-                        <version>${torque.version}</version>
-                        <exclusions>
-                            <exclusion>
-                                <groupId>jndi</groupId>
-                                <artifactId>jndi</artifactId>
-                            </exclusion>
-                            <exclusion>
-                                <groupId>javax.sql</groupId>
-                                <artifactId>jdbc-stdext</artifactId>
-                            </exclusion>
-                        </exclusions>
-                    </dependency>
-                    <dependency>
-                        <groupId>torque</groupId>
-                        <artifactId>torque-gen</artifactId>
-                        <version>${torque.version}</version>
-                    </dependency>
-                    <dependency>
-                        <groupId>torque</groupId>
-                        <artifactId>torque-gen-templates</artifactId>
-                        <version>${torque.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/maven-archetypes/portal/src/archetype/archetype-resources/pom.xml
URL: http://svn.apache.org/viewcvs/portals/jetspeed-2/trunk/maven-archetypes/portal/src/archetype/archetype-resources/pom.xml?rev=399848&r1=399847&r2=399848&view=diff
==============================================================================
--- portals/jetspeed-2/trunk/maven-archetypes/portal/src/archetype/archetype-resources/pom.xml (original)
+++ portals/jetspeed-2/trunk/maven-archetypes/portal/src/archetype/archetype-resources/pom.xml Thu May  4 13:24:19 2006
@@ -22,7 +22,7 @@
 
     <modelVersion>4.0.0</modelVersion>
     <prerequisites>
-        <maven>2.0.2</maven>
+        <maven>2.0.4</maven>
     </prerequisites>
 
     <!-- POM Identification -->
@@ -90,17 +90,22 @@
         <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 -->
+        <!-- Build Dependency Version Properties -->
         <ant.version>1.6.5</ant.version>
+        <junit.version>3.8.1</junit.version>
+        <org.apache.maven.artifact.ant.version>2.0.4</org.apache.maven.artifact.ant.version>
+        <org.apache.maven.plugins.maven-surefire-plugin.version>2.1.3</org.apache.maven.plugins.maven-surefire-plugin.version>
+        <torque.version>3.2-rc3</torque.version>
+
+        <!-- Project Dependency Version Properties -->
+        <commons-collections.version>3.0</commons-collections.version>
         <commons-digester.version>1.5</commons-digester.version>
         <commons-logging.version>1.0.3</commons-logging.version>
         <hsqldb.version>1.8.0.2</hsqldb.version>
         <javax.servlet.jstl.version>1.0.6</javax.servlet.jstl.version>
         <javax.servlet.version>2.3</javax.servlet.version>
-        <junit.version>3.8.1</junit.version>
         <log4j.version>1.2.8</log4j.version>
         <org.apache.derby.version>10.1.1.0</org.apache.derby.version>
-        <org.apache.maven.artifact.ant.version>2.0.1</org.apache.maven.artifact.ant.version>
         <org.apache.pluto.version>1.0.1</org.apache.pluto.version>
         <org.apache.portals.bridges.common.version>1.0.1-dev</org.apache.portals.bridges.common.version>
         <org.apache.portals.bridges.velocity.version>1.0</org.apache.portals.bridges.velocity.version>
@@ -108,8 +113,7 @@
         <portlet-api.version>1.0</portlet-api.version>
         <taglibs-request.version>1.0.1</taglibs-request.version>
         <taglibs-standard.version>1.0.6</taglibs-standard.version>
-        <torque.version>3.2-rc3</torque.version>
-        <velocity-tools.version>1.1</velocity-tools.version>
+        <velocity-tools.version>1.2</velocity-tools.version>
         <velocity.version>1.4</velocity.version>
 
     </properties>
@@ -390,6 +394,11 @@
                 <version>${log4j.version}</version>
             </dependency>
             <dependency>
+                <groupId>commons-collections</groupId>
+                <artifactId>commons-collections</artifactId>
+                <version>${commons-collections.version}</version>
+            </dependency>
+            <dependency>
                 <groupId>commons-digester</groupId>
                 <artifactId>commons-digester</artifactId>
                 <version>${commons-digester.version}</version>
@@ -467,6 +476,13 @@
                 <version>${org.apache.portals.bridges.velocity.version}</version>
             </dependency>
 
+            <!-- Ant -->
+            <dependency>
+                <groupId>ant</groupId>
+                <artifactId>ant</artifactId>
+                <version>${ant.version}</version>
+            </dependency>
+
         </dependencies>
     </dependencyManagement>    
 
@@ -525,6 +541,7 @@
                 <plugin>
                     <groupId>org.apache.maven.plugins</groupId>
                     <artifactId>maven-surefire-plugin</artifactId>
+                    <version>${org.apache.maven.plugins.maven-surefire-plugin.version}</version>
                     <configuration>
                         <includes>
                             <include>**/Test*.java</include>
@@ -541,80 +558,68 @@
                     </configuration>
                 </plugin> 
 
-            </plugins>
-        </pluginManagement>    
+                <!-- antrun plugin -->
+                <plugin>
+                    <groupId>org.apache.maven.plugins</groupId>
+                    <artifactId>maven-antrun-plugin</artifactId>
+                    <dependencies>
 
-        <!--
-            Bug: All plugin dependencies must be copied to the first instance
-            of the maven-antrun-plugin run, (e.g. here in 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.
-        -->
-        <plugins>
-            <plugin>
-                <groupId>org.apache.maven.plugins</groupId>
-                <artifactId>maven-antrun-plugin</artifactId>
-                <inherited>false</inherited>
-                <dependencies>
-
-                    <!-- Ant -->
-                    <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>
-
-                    <!-- Maven AntLib -->
-                    <dependency>
-                        <groupId>org.apache.maven</groupId>
-                        <artifactId>maven-artifact-ant</artifactId>
-                        <version>${org.apache.maven.artifact.ant.version}</version>
-                    </dependency>
-
-                    <!-- Torque -->
-                    <dependency>
-                        <groupId>torque</groupId>
-                        <artifactId>torque</artifactId>
-                        <version>${torque.version}</version>
-                        <exclusions>
-                            <exclusion>
-                                <groupId>jndi</groupId>
-                                <artifactId>jndi</artifactId>
-                            </exclusion>
-                            <exclusion>
-                                <groupId>javax.sql</groupId>
-                                <artifactId>jdbc-stdext</artifactId>
-                            </exclusion>
-                        </exclusions>
-                    </dependency>
-                    <dependency>
-                        <groupId>torque</groupId>
-                        <artifactId>torque-gen</artifactId>
-                        <version>${torque.version}</version>
-                    </dependency>
-                    <dependency>
-                        <groupId>torque</groupId>
-                        <artifactId>torque-gen-templates</artifactId>
-                        <version>${torque.version}</version>
-                    </dependency>
-
-                </dependencies>
-            </plugin>
-        </plugins>
+                        <!-- Ant -->
+                        <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>
+
+                        <!-- Maven AntLib -->
+                        <dependency>
+                            <groupId>org.apache.maven</groupId>
+                            <artifactId>maven-artifact-ant</artifactId>
+                            <version>${org.apache.maven.artifact.ant.version}</version>
+                        </dependency>
+
+                        <!-- Torque -->
+                        <dependency>
+                            <groupId>torque</groupId>
+                            <artifactId>torque</artifactId>
+                            <version>${torque.version}</version>
+                            <exclusions>
+                                <exclusion>
+                                    <groupId>jndi</groupId>
+                                    <artifactId>jndi</artifactId>
+                                </exclusion>
+                                <exclusion>
+                                    <groupId>javax.sql</groupId>
+                                    <artifactId>jdbc-stdext</artifactId>
+                                </exclusion>
+                            </exclusions>
+                        </dependency>
+                        <dependency>
+                            <groupId>torque</groupId>
+                            <artifactId>torque-gen</artifactId>
+                            <version>${torque.version}</version>
+                        </dependency>
+                        <dependency>
+                            <groupId>torque</groupId>
+                            <artifactId>torque-gen-templates</artifactId>
+                            <version>${torque.version}</version>
+                        </dependency>
 
+                    </dependencies>
+                </plugin>
+
+            </plugins>
+        </pluginManagement>    
     </build>
 
     <!-- Global Dependencies -->

Modified: portals/jetspeed-2/trunk/maven-archetypes/portal/src/archetype/archetype-resources/portal/pom.xml
URL: http://svn.apache.org/viewcvs/portals/jetspeed-2/trunk/maven-archetypes/portal/src/archetype/archetype-resources/portal/pom.xml?rev=399848&r1=399847&r2=399848&view=diff
==============================================================================
--- portals/jetspeed-2/trunk/maven-archetypes/portal/src/archetype/archetype-resources/portal/pom.xml (original)
+++ portals/jetspeed-2/trunk/maven-archetypes/portal/src/archetype/archetype-resources/portal/pom.xml Thu May  4 13:24:19 2006
@@ -21,16 +21,17 @@
          xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
 
     <modelVersion>4.0.0</modelVersion>
+    <prerequisites>
+        <maven>2.0.4</maven>
+    </prerequisites>
 
     <!-- POM Identification -->
 
-    <groupId>${groupId}</groupId>
-    <version>${version}</version>
     <artifactId>${artifactId}-portal</artifactId>
     <parent>
         <groupId>${groupId}</groupId>
-        <version>${version}</version>
         <artifactId>${artifactId}</artifactId>
+        <version>${version}</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
     <packaging>war</packaging>
@@ -93,37 +94,6 @@
                     </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>
 

Modified: portals/jetspeed-2/trunk/maven-archetypes/shared-component/pom.xml
URL: http://svn.apache.org/viewcvs/portals/jetspeed-2/trunk/maven-archetypes/shared-component/pom.xml?rev=399848&r1=399847&r2=399848&view=diff
==============================================================================
--- portals/jetspeed-2/trunk/maven-archetypes/shared-component/pom.xml (original)
+++ portals/jetspeed-2/trunk/maven-archetypes/shared-component/pom.xml Thu May  4 13:24:19 2006
@@ -21,16 +21,17 @@
          xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
 
     <modelVersion>4.0.0</modelVersion>
+    <prerequisites>
+        <maven>2.0.4</maven>
+    </prerequisites>
 
     <!-- POM Identification -->
 
-    <groupId>org.apache.portals.jetspeed-2</groupId>
-    <version>2.1-dev</version>
     <artifactId>shared-component-archetype</artifactId>
     <parent>
         <groupId>org.apache.portals.jetspeed-2</groupId>
-        <version>2.1-dev</version>
         <artifactId>maven-archetypes</artifactId>
+        <version>2.1-dev</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
     <packaging>jar</packaging>

Modified: portals/jetspeed-2/trunk/maven-archetypes/shared-component/src/archetype/archetype-resources/pom.xml
URL: http://svn.apache.org/viewcvs/portals/jetspeed-2/trunk/maven-archetypes/shared-component/src/archetype/archetype-resources/pom.xml?rev=399848&r1=399847&r2=399848&view=diff
==============================================================================
--- portals/jetspeed-2/trunk/maven-archetypes/shared-component/src/archetype/archetype-resources/pom.xml (original)
+++ portals/jetspeed-2/trunk/maven-archetypes/shared-component/src/archetype/archetype-resources/pom.xml Thu May  4 13:24:19 2006
@@ -21,16 +21,17 @@
          xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
 
     <modelVersion>4.0.0</modelVersion>
+    <prerequisites>
+        <maven>2.0.4</maven>
+    </prerequisites>
 
     <!-- POM Identification -->
 
-    <groupId>${groupId}</groupId>
-    <version>${version}</version>
     <artifactId>${artifactId}</artifactId>
     <parent>
         <groupId>${groupId}</groupId>
-        <version>${version}</version>
         <artifactId>portal-components</artifactId>
+        <version>${version}</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
     <packaging>jar</packaging>
@@ -111,37 +112,6 @@
                         </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>
 



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