geronimo-scm mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From pmcma...@apache.org
Subject svn commit: r574332 [1/2] - in /geronimo/plugins: activemq/trunk/activemq-jetty/ activemq/trunk/activemq-tomcat/ console/trunk/ console/trunk/console-base-portlets/ console/trunk/console-core/ console/trunk/console-ear/ console/trunk/console-jetty/ con...
Date Mon, 10 Sep 2007 18:51:12 GMT
Author: pmcmahan
Date: Mon Sep 10 11:51:10 2007
New Revision: 574332

URL: http://svn.apache.org/viewvc?rev=574332&view=rev
Log:
GERONIMO-3413 update the poms for the admin console plugins to take advantage of the latest improvements to the
car-maven-plugin.  mainly this involves removing certain bits from the car plugin's configuration section so that
the dependencies and other fields can be inherited from the main section of the pom that is processed by maven.


Modified:
    geronimo/plugins/activemq/trunk/activemq-jetty/pom.xml
    geronimo/plugins/activemq/trunk/activemq-tomcat/pom.xml
    geronimo/plugins/console/trunk/console-base-portlets/pom.xml
    geronimo/plugins/console/trunk/console-core/pom.xml
    geronimo/plugins/console/trunk/console-ear/pom.xml
    geronimo/plugins/console/trunk/console-jetty/pom.xml
    geronimo/plugins/console/trunk/console-portal-driver/pom.xml
    geronimo/plugins/console/trunk/console-tomcat/pom.xml
    geronimo/plugins/console/trunk/pom.xml
    geronimo/plugins/debugviews/trunk/debugviews-jetty/pom.xml
    geronimo/plugins/debugviews/trunk/debugviews-portlets/pom.xml
    geronimo/plugins/debugviews/trunk/debugviews-tomcat/pom.xml
    geronimo/plugins/debugviews/trunk/pom.xml
    geronimo/plugins/jee-management/trunk/jee-management-jetty/pom.xml
    geronimo/plugins/jee-management/trunk/jee-management-tomcat/pom.xml
    geronimo/plugins/plancreator/trunk/plancreator-jetty/pom.xml
    geronimo/plugins/plancreator/trunk/plancreator-portlets/pom.xml
    geronimo/plugins/plancreator/trunk/plancreator-tomcat/pom.xml
    geronimo/plugins/plancreator/trunk/pom.xml
    geronimo/plugins/pluto/trunk/pluto-support/pom.xml
    geronimo/plugins/pluto/trunk/pom.xml
    geronimo/plugins/system-database/trunk/pom.xml
    geronimo/plugins/system-database/trunk/system-database-jetty/pom.xml
    geronimo/plugins/system-database/trunk/system-database-portlets/pom.xml
    geronimo/plugins/system-database/trunk/system-database-tomcat/pom.xml

Modified: geronimo/plugins/activemq/trunk/activemq-jetty/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/plugins/activemq/trunk/activemq-jetty/pom.xml?rev=574332&r1=574331&r2=574332&view=diff
==============================================================================
--- geronimo/plugins/activemq/trunk/activemq-jetty/pom.xml (original)
+++ geronimo/plugins/activemq/trunk/activemq-jetty/pom.xml Mon Sep 10 11:51:10 2007
@@ -31,7 +31,7 @@
 
     <groupId>org.apache.geronimo.plugins</groupId>
     <artifactId>activemq-jetty</artifactId>
-    <name>ActiveMQ :: Configuration for Jetty</name>
+    <name>ActiveMQ :: Jetty plugin</name>
     <packaging>car</packaging>
 
     <dependencies>
@@ -41,11 +41,12 @@
             <artifactId>activemq-portlets</artifactId>
             <version>${version}</version>
             <type>war</type>
+            <scope>provided</scope>
         </dependency>
 
         <dependency>
             <groupId>org.apache.geronimo.plugins</groupId>
-            <artifactId>pluto-support</artifactId>
+            <artifactId>console-jetty</artifactId>
             <version>1.0-SNAPSHOT</version>
             <type>car</type>
         </dependency>
@@ -119,116 +120,35 @@
                     <module>
                         <groupId>org.apache.geronimo.plugins</groupId>
                         <artifactId>activemq-portlets</artifactId>
+                        <version>${version}</version>
                         <type>war</type>
                     </module>
-                    <name>ActiveMQ -- Jetty</name>
                     <category>Application</category>
-                    <description>
-                       ActiveMQ for Jetty
-                    </description>
-                    <url>http://geronimo.apache.org/</url>
-                    <author>The Apache Geronimo development community</author>
                     <osiApproved>true</osiApproved>
                     <geronimoVersions>
-                        <value>2.0.1</value>
                         <value>2.1-SNAPSHOT</value>
                     </geronimoVersions>
-                    <obsoletes>
-                        <moduleId>
-                            <groupId>org.apache.geronimo.plugins</groupId>
-                            <artifactId>activemq-jetty</artifactId>
-                        </moduleId>
-                    </obsoletes>
-                    <dependencies>
-                        <dependency>
-                            <groupId>org.apache.geronimo.plugins</groupId>
-                            <artifactId>pluto-support</artifactId>
-                            <version>1.0-SNAPSHOT</version>
-                            <type>car</type>
-                        </dependency>
-
-                        <dependency>
-                            <groupId>org.apache.geronimo.configs</groupId>
-                            <artifactId>connector-deployer</artifactId>
-                            <version>${geronimoVersion}</version>
-                            <type>car</type>
-                        </dependency>
-
-                        <dependency>
-                            <groupId>org.apache.geronimo.configs</groupId>
-                            <artifactId>activemq-ra</artifactId>
-                            <version>${geronimoVersion}</version>
-                            <type>car</type>
-                        </dependency>
-
-                        <dependency>
-                            <groupId>org.apache.geronimo.configs</groupId>
-                            <artifactId>geronimo-gbean-deployer</artifactId>
-                            <version>${geronimoVersion}</version>
-                            <type>car</type>
-                        </dependency>
-
-                        <dependency>
-                            <groupId>org.apache.geronimo.modules</groupId>
-                            <artifactId>geronimo-kernel</artifactId>
-                            <version>${geronimoVersion}</version>
-                            <type>jar</type>
-                        </dependency>
-
-                        <dependency>
-                            <groupId>org.apache.geronimo.modules</groupId>
-                            <artifactId>geronimo-management</artifactId>
-                            <version>${geronimoVersion}</version>
-                            <type>jar</type>
-                        </dependency>
-
-                        <dependency>
-                            <groupId>org.apache.geronimo.modules</groupId>
-                            <artifactId>geronimo-deploy-jsr88</artifactId>
-                            <version>${geronimoVersion}</version>
-                            <type>jar</type>
-                        </dependency>
-
-                        <dependency>
-                            <groupId>org.apache.geronimo.modules</groupId>
-                            <artifactId>geronimo-activemq-ra</artifactId>
-                            <version>${geronimoVersion}</version>
-                            <type>rar</type>
-                        </dependency>
-
-                       <dependency>
-                           <groupId>org.apache.geronimo.configs</groupId>
-                           <artifactId>jsr88-rar-configurer</artifactId>
-                           <version>${geronimoVersion}</version>
-                           <type>car</type>
-                       </dependency>
-                    </dependencies>
+                    <useMavenDependencies>
+                        <value>true</value>
+                        <includeVersion>true</includeVersion>
+                    </useMavenDependencies>
                     <instance>
                         <plugin-artifact>
                             <prerequisite>
                                 <id>
-                                    <groupId>org.apache.geronimo.plugins</groupId>
-                                    <artifactId>pluto-support</artifactId>
-                                </id>
-                                <resource-type>Portal</resource-type>
-                                <description>Pluto portal cantainer support in Geronimo</description>
-                            </prerequisite>
-                            <prerequisite>
-                                <id>
                                     <groupId>org.apache.geronimo.configs</groupId>
                                     <artifactId>jetty6</artifactId>
                                 </id>
                                 <resource-type>Web Container</resource-type>
                                 <description>
                                     This version of the plugin works with the Geronimo/Jetty distribution.
-                                    It is not intended to run in the Geronimo/Tomcat distribution.
-                                    There is a separate version of this plugin that works with Tomcat.
-                                    Please install the version appropriate to your Geronimo distribution.
                                 </description>
                             </prerequisite>
                             <source-repository>http://people.apache.org/repo/m2-snapshot-repository/</source-repository>
                             <source-repository>http://people.apache.org/repo/m2-incubating-repository/</source-repository>
                             <source-repository>http://repo1.maven.org/maven2/</source-repository>
+                            <!-- temporary repo for console-jetty dependency until snaps are deployed to the snapshot repo -->
+                            <source-repository>http://people.apache.org/~pmcmahan/maven2/</source-repository>
                         </plugin-artifact>
                     </instance>
                 </configuration>

Modified: geronimo/plugins/activemq/trunk/activemq-tomcat/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/plugins/activemq/trunk/activemq-tomcat/pom.xml?rev=574332&r1=574331&r2=574332&view=diff
==============================================================================
--- geronimo/plugins/activemq/trunk/activemq-tomcat/pom.xml (original)
+++ geronimo/plugins/activemq/trunk/activemq-tomcat/pom.xml Mon Sep 10 11:51:10 2007
@@ -31,7 +31,7 @@
 
     <groupId>org.apache.geronimo.plugins</groupId>
     <artifactId>activemq-tomcat</artifactId>
-    <name>ActiveMQ :: Configuration for Tomcat</name>
+    <name>ActiveMQ :: Tomcat plugin</name>
     <packaging>car</packaging>
 
     <dependencies>
@@ -41,11 +41,12 @@
             <artifactId>activemq-portlets</artifactId>
             <version>${version}</version>
             <type>war</type>
+            <scope>provided</scope>
         </dependency>
 
         <dependency>
             <groupId>org.apache.geronimo.plugins</groupId>
-            <artifactId>pluto-support</artifactId>
+            <artifactId>console-tomcat</artifactId>
             <version>1.0-SNAPSHOT</version>
             <type>car</type>
         </dependency>
@@ -119,116 +120,35 @@
                     <module>
                         <groupId>org.apache.geronimo.plugins</groupId>
                         <artifactId>activemq-portlets</artifactId>
+                        <version>${version}</version>
                         <type>war</type>
                     </module>
-                    <name>ActiveMQ -- Tomcat</name>
                     <category>Application</category>
-                    <description>
-                       ActiveMQ for Tomcat
-                    </description>
-                    <url>http://geronimo.apache.org/</url>
-                    <author>The Apache Geronimo development community</author>
                     <osiApproved>true</osiApproved>
                     <geronimoVersions>
-                        <value>2.0.1</value>
                         <value>2.1-SNAPSHOT</value>
                     </geronimoVersions>
-                    <obsoletes>
-                        <moduleId>
-                            <groupId>org.apache.geronimo.plugins</groupId>
-                            <artifactId>activemq-tomcat</artifactId>
-                        </moduleId>
-                    </obsoletes>
-                    <dependencies>
-                        <dependency>
-                            <groupId>org.apache.geronimo.plugins</groupId>
-                            <artifactId>pluto-support</artifactId>
-                            <version>1.0-SNAPSHOT</version>
-                            <type>car</type>
-                        </dependency>
-
-                        <dependency>
-                            <groupId>org.apache.geronimo.configs</groupId>
-                            <artifactId>connector-deployer</artifactId>
-                            <version>${geronimoVersion}</version>
-                            <type>car</type>
-                        </dependency>
-
-                        <dependency>
-                            <groupId>org.apache.geronimo.configs</groupId>
-                            <artifactId>activemq-ra</artifactId>
-                            <version>${geronimoVersion}</version>
-                            <type>car</type>
-                        </dependency>
-
-                        <dependency>
-                            <groupId>org.apache.geronimo.configs</groupId>
-                            <artifactId>geronimo-gbean-deployer</artifactId>
-                            <version>${geronimoVersion}</version>
-                            <type>car</type>
-                        </dependency>
-
-                        <dependency>
-                            <groupId>org.apache.geronimo.modules</groupId>
-                            <artifactId>geronimo-kernel</artifactId>
-                            <version>${geronimoVersion}</version>
-                            <type>jar</type>
-                        </dependency>
-
-                        <dependency>
-                            <groupId>org.apache.geronimo.modules</groupId>
-                            <artifactId>geronimo-management</artifactId>
-                            <version>${geronimoVersion}</version>
-                            <type>jar</type>
-                        </dependency>
-
-                        <dependency>
-                            <groupId>org.apache.geronimo.modules</groupId>
-                            <artifactId>geronimo-deploy-jsr88</artifactId>
-                            <version>${geronimoVersion}</version>
-                            <type>jar</type>
-                        </dependency>
-
-                        <dependency>
-                            <groupId>org.apache.geronimo.modules</groupId>
-                            <artifactId>geronimo-activemq-ra</artifactId>
-                            <version>${geronimoVersion}</version>
-                            <type>rar</type>
-                        </dependency>
-
-                       <dependency>
-                           <groupId>org.apache.geronimo.configs</groupId>
-                           <artifactId>jsr88-rar-configurer</artifactId>
-                           <version>${geronimoVersion}</version>
-                           <type>car</type>
-                       </dependency>
-                    </dependencies>
+                    <useMavenDependencies>
+                        <value>true</value>
+                        <includeVersion>true</includeVersion>
+                    </useMavenDependencies>
                     <instance>
                         <plugin-artifact>
                             <prerequisite>
                                 <id>
-                                    <groupId>org.apache.geronimo.plugins</groupId>
-                                    <artifactId>pluto-support</artifactId>
-                                </id>
-                                <resource-type>Portal</resource-type>
-                                <description>Pluto portal cantainer support in Geronimo</description>
-                            </prerequisite>
-                            <prerequisite>
-                                <id>
                                     <groupId>org.apache.geronimo.configs</groupId>
                                     <artifactId>tomcat6</artifactId>
                                 </id>
                                 <resource-type>Web Container</resource-type>
                                 <description>
                                     This version of the plugin works with the Geronimo/Tomcat distribution.
-                                    It is not intended to run in the Geronimo/Jetty distribution.
-                                    There is a separate version of this plugin that works with Jetty.
-                                    Please install the version appropriate to your Geronimo distribution.
                                 </description>
                             </prerequisite>
                             <source-repository>http://people.apache.org/repo/m2-snapshot-repository/</source-repository>
                             <source-repository>http://people.apache.org/repo/m2-incubating-repository/</source-repository>
                             <source-repository>http://repo1.maven.org/maven2/</source-repository>
+                            <!-- temporary repo for console-tomcat dependency until snaps are deployed to the snapshot repo -->
+                            <source-repository>http://people.apache.org/~pmcmahan/maven2/</source-repository>
                         </plugin-artifact>
                     </instance>
                 </configuration>

Modified: geronimo/plugins/console/trunk/console-base-portlets/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/plugins/console/trunk/console-base-portlets/pom.xml?rev=574332&r1=574331&r2=574332&view=diff
==============================================================================
--- geronimo/plugins/console/trunk/console-base-portlets/pom.xml (original)
+++ geronimo/plugins/console/trunk/console-base-portlets/pom.xml Mon Sep 10 11:51:10 2007
@@ -30,7 +30,7 @@
     </parent>
 
     <artifactId>console-base-portlets</artifactId>
-    <name>Geronimo Administration Console Plugin :: Base Portlets</name>
+    <name>Administration Console :: Base Portlets</name>
     <packaging>war</packaging>
 
     <dependencies>

Modified: geronimo/plugins/console/trunk/console-core/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/plugins/console/trunk/console-core/pom.xml?rev=574332&r1=574331&r2=574332&view=diff
==============================================================================
--- geronimo/plugins/console/trunk/console-core/pom.xml (original)
+++ geronimo/plugins/console/trunk/console-core/pom.xml Mon Sep 10 11:51:10 2007
@@ -30,7 +30,7 @@
     </parent>
 
     <artifactId>console-core</artifactId>
-    <name>Geronimo Administration Console Plugin :: Core Classes</name>
+    <name>Administration Console :: Core Classes</name>
     
     <dependencies>
         

Modified: geronimo/plugins/console/trunk/console-ear/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/plugins/console/trunk/console-ear/pom.xml?rev=574332&r1=574331&r2=574332&view=diff
==============================================================================
--- geronimo/plugins/console/trunk/console-ear/pom.xml (original)
+++ geronimo/plugins/console/trunk/console-ear/pom.xml Mon Sep 10 11:51:10 2007
@@ -30,7 +30,7 @@
     </parent>
 
     <artifactId>console-ear</artifactId>
-    <name>Geronimo Administration Console Plugin :: EAR</name>
+    <name>Administration Console :: EAR</name>
     <packaging>ear</packaging>
     
     <dependencies>

Modified: geronimo/plugins/console/trunk/console-jetty/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/plugins/console/trunk/console-jetty/pom.xml?rev=574332&r1=574331&r2=574332&view=diff
==============================================================================
--- geronimo/plugins/console/trunk/console-jetty/pom.xml (original)
+++ geronimo/plugins/console/trunk/console-jetty/pom.xml Mon Sep 10 11:51:10 2007
@@ -31,7 +31,7 @@
 
     <groupId>org.apache.geronimo.plugins</groupId>
     <artifactId>console-jetty</artifactId>
-    <name>Geronimo Administration Console Plugin :: Configuration for Jetty</name>
+    <name>Administration Console :: Jetty plugin</name>
     <packaging>car</packaging>
 
     <dependencies>
@@ -41,6 +41,7 @@
             <artifactId>console-ear</artifactId>
             <version>${version}</version>
             <type>ear</type>
+            <scope>provided</scope>
         </dependency>
         <dependency>
             <groupId>org.apache.geronimo.plugins</groupId>
@@ -84,81 +85,37 @@
                         <deploymentConfig>${jetty6Deployer}</deploymentConfig>
                         <deploymentConfig>${jasperDeployer}</deploymentConfig>
                     </deploymentConfigs>
-                    <name>Administration Console -- Jetty</name>
                     <module>
                         <groupId>org.apache.geronimo.plugins</groupId>
                         <artifactId>console-ear</artifactId>
                         <version>${version}</version>
                         <type>ear</type>
                     </module>
-                    <category>Application</category>
-                    <description>
-                       Geronimo Administration Console for Jetty
-                    </description>
-                    <url>http://geronimo.apache.org/</url>
-                    <author>The Apache Geronimo development community</author>
+                    <category>Applications</category>
                     <osiApproved>true</osiApproved>
                     <geronimoVersions>
-                        <value>2.0.1</value>
                         <value>2.1-SNAPSHOT</value>
                     </geronimoVersions>
-                    <obsoletes>
-                        <moduleId>
-                            <groupId>org.apache.geronimo.plugins</groupId>
-                            <artifactId>console-jetty</artifactId>
-                        </moduleId>
-                    </obsoletes>
-                    <dependencies>
-                        <dependency>
-                            <groupId>org.apache.geronimo.plugins</groupId>
-                            <artifactId>pluto-support</artifactId>
-                            <version>1.0-SNAPSHOT</version>
-                            <type>car</type>
-                        </dependency>
-                        <dependency>
-                            <groupId>org.apache.geronimo.configs</groupId>
-                            <artifactId>geronimo-gbean-deployer</artifactId>
-                            <version>${geronimoVersion}</version>
-                            <type>car</type>
-                        </dependency>
-                        <dependency>
-                            <groupId>org.apache.geronimo.modules</groupId>
-                            <artifactId>geronimo-deploy-jsr88</artifactId>
-                            <version>${geronimoVersion}</version>
-                            <type>jar</type>
-                        </dependency>
-                        <dependency>
-                            <groupId>org.apache.geronimo.configs</groupId>
-                            <artifactId>j2ee-security</artifactId>
-                            <version>${geronimoVersion}</version>
-                            <type>car</type>
-                        </dependency>
-                    </dependencies>
+                    <useMavenDependencies>
+                        <value>true</value>
+                        <includeVersion>true</includeVersion>
+                    </useMavenDependencies>
                     <instance>
                         <plugin-artifact>
                             <prerequisite>
                                 <id>
-                                    <groupId>org.apache.geronimo.plugins</groupId>
-                                    <artifactId>pluto-support</artifactId>
-                                </id>
-                                <resource-type>Portal</resource-type>
-                                <description>Pluto portal cantainer support in Geronimo</description>
-                            </prerequisite>
-                            <prerequisite>
-                                <id>
                                     <groupId>org.apache.geronimo.configs</groupId>
                                     <artifactId>jetty6</artifactId>
                                 </id>
                                 <resource-type>Web Container</resource-type>
                                 <description>
                                     This version of the plugin works with the Geronimo/Jetty distribution.
-                                    It is not intended to run in the Geronimo/Tomcat distribution.
-                                    There is a separate version of this plugin that works with Tomcat.
-                                    Please install the version appropriate to your Geronimo distribution.
                                 </description>
                             </prerequisite>
                             <source-repository>http://people.apache.org/repo/m2-snapshot-repository/</source-repository>
                             <source-repository>http://repo1.maven.org/maven2/</source-repository>
+                            <!-- temporary repo for pluto-support dependency until snaps are deployed to the snapshot repo -->
+                            <source-repository>http://people.apache.org/~pmcmahan/maven2/</source-repository>
                         </plugin-artifact>
                     </instance>
                 </configuration>

Modified: geronimo/plugins/console/trunk/console-portal-driver/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/plugins/console/trunk/console-portal-driver/pom.xml?rev=574332&r1=574331&r2=574332&view=diff
==============================================================================
--- geronimo/plugins/console/trunk/console-portal-driver/pom.xml (original)
+++ geronimo/plugins/console/trunk/console-portal-driver/pom.xml Mon Sep 10 11:51:10 2007
@@ -31,7 +31,7 @@
 
     <artifactId>console-portal-driver</artifactId>
     <packaging>war</packaging>
-    <name>Geronimo Administration Console Plugin :: Pluto Portal Driver</name>
+    <name>Administration Console :: Pluto Portal Driver</name>
 
     <dependencies>
     

Modified: geronimo/plugins/console/trunk/console-tomcat/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/plugins/console/trunk/console-tomcat/pom.xml?rev=574332&r1=574331&r2=574332&view=diff
==============================================================================
--- geronimo/plugins/console/trunk/console-tomcat/pom.xml (original)
+++ geronimo/plugins/console/trunk/console-tomcat/pom.xml Mon Sep 10 11:51:10 2007
@@ -31,7 +31,7 @@
 
     <groupId>org.apache.geronimo.plugins</groupId>
     <artifactId>console-tomcat</artifactId>
-    <name>Geronimo Administration Console Plugin :: Configuration for Tomcat</name>
+    <name>Administration Console :: Tomcat plugin</name>
     <packaging>car</packaging>
 
     <dependencies>
@@ -41,6 +41,7 @@
             <artifactId>console-ear</artifactId>
             <version>${version}</version>
             <type>ear</type>
+            <scope>provided</scope>
         </dependency>
         <dependency>
             <groupId>org.apache.geronimo.plugins</groupId>
@@ -84,81 +85,37 @@
                         <deploymentConfig>${tomcatDeployer}</deploymentConfig>
                         <deploymentConfig>${jasperDeployer}</deploymentConfig>
                     </deploymentConfigs>
-                    <name>Administration Console -- Tomcat</name>
                     <module>
                         <groupId>org.apache.geronimo.plugins</groupId>
                         <artifactId>console-ear</artifactId>
                         <version>${version}</version>
                         <type>ear</type>
                     </module>
-                    <category>Application</category>
-                    <description>
-                       Geronimo Administration Console for Tomcat
-                    </description>
-                    <url>http://geronimo.apache.org/</url>
-                    <author>The Apache Geronimo development community</author>
+                    <category>Applications</category>
                     <osiApproved>true</osiApproved>
                     <geronimoVersions>
-                        <value>2.0.1</value>
                         <value>2.1-SNAPSHOT</value>
                     </geronimoVersions>
-                    <obsoletes>
-                        <moduleId>
-                            <groupId>org.apache.geronimo.plugins</groupId>
-                            <artifactId>console-tomcat</artifactId>
-                        </moduleId>
-                    </obsoletes>
-                    <dependencies>
-                        <dependency>
-                            <groupId>org.apache.geronimo.plugins</groupId>
-                            <artifactId>pluto-support</artifactId>
-                            <version>1.0-SNAPSHOT</version>
-                            <type>car</type>
-                        </dependency>
-                        <dependency>
-                            <groupId>org.apache.geronimo.configs</groupId>
-                            <artifactId>geronimo-gbean-deployer</artifactId>
-                            <version>${geronimoVersion}</version>
-                            <type>car</type>
-                        </dependency>
-                        <dependency>
-                            <groupId>org.apache.geronimo.modules</groupId>
-                            <artifactId>geronimo-deploy-jsr88</artifactId>
-                            <version>${geronimoVersion}</version>
-                            <type>jar</type>
-                        </dependency>
-                        <dependency>
-                            <groupId>org.apache.geronimo.configs</groupId>
-                            <artifactId>j2ee-security</artifactId>
-                            <version>${geronimoVersion}</version>
-                            <type>car</type>
-                        </dependency>
-                    </dependencies>
+                    <useMavenDependencies>
+                        <value>true</value>
+                        <includeVersion>true</includeVersion>
+                    </useMavenDependencies>
                     <instance>
                         <plugin-artifact>
                             <prerequisite>
                                 <id>
-                                    <groupId>org.apache.geronimo.plugins</groupId>
-                                    <artifactId>pluto-support</artifactId>
-                                </id>
-                                <resource-type>Portal</resource-type>
-                                <description>Pluto portal cantainer support in Geronimo</description>
-                            </prerequisite>
-                            <prerequisite>
-                                <id>
                                     <groupId>org.apache.geronimo.configs</groupId>
                                     <artifactId>tomcat6</artifactId>
                                 </id>
                                 <resource-type>Web Container</resource-type>
                                 <description>
                                     This version of the plugin works with the Geronimo/Tomcat distribution.
-                                    It is not intended to run in the Geronimo/Jetty distribution.
-                                    There is a separate version of this plugin that works with Jetty.
-                                    Please install the version appropriate to your Geronimo distribution.
                                 </description>
                             </prerequisite>
                             <source-repository>http://people.apache.org/repo/m2-snapshot-repository/</source-repository>
                             <source-repository>http://repo1.maven.org/maven2/</source-repository>
+                            <!-- temporary repo for pluto-support dependency until snaps are deployed to the snapshot repo -->
+                            <source-repository>http://people.apache.org/~pmcmahan/maven2/</source-repository>
                         </plugin-artifact>
                     </instance>
                 </configuration>

Modified: geronimo/plugins/console/trunk/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/plugins/console/trunk/pom.xml?rev=574332&r1=574331&r2=574332&view=diff
==============================================================================
--- geronimo/plugins/console/trunk/pom.xml (original)
+++ geronimo/plugins/console/trunk/pom.xml Mon Sep 10 11:51:10 2007
@@ -30,7 +30,7 @@
 
     <groupId>org.apache.geronimo.plugins</groupId>
     <artifactId>console</artifactId>
-    <name>Geronimo Administration Console Plugin</name>
+    <name>Administration Console</name>
     <packaging>pom</packaging>
 
     <version>1.0-SNAPSHOT</version>

Modified: geronimo/plugins/debugviews/trunk/debugviews-jetty/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/plugins/debugviews/trunk/debugviews-jetty/pom.xml?rev=574332&r1=574331&r2=574332&view=diff
==============================================================================
--- geronimo/plugins/debugviews/trunk/debugviews-jetty/pom.xml (original)
+++ geronimo/plugins/debugviews/trunk/debugviews-jetty/pom.xml Mon Sep 10 11:51:10 2007
@@ -31,7 +31,7 @@
 
     <groupId>org.apache.geronimo.plugins</groupId>
     <artifactId>debugviews-jetty</artifactId>
-    <name>Geronimo Debug Views :: Configuration for Jetty</name>
+    <name>Debug Views :: Jetty plugin</name>
     <packaging>car</packaging>
 
     <dependencies>
@@ -41,11 +41,12 @@
             <artifactId>debugviews-portlets</artifactId>
             <version>${version}</version>
             <type>war</type>
+            <scope>provided</scope>
         </dependency>
 
         <dependency>
             <groupId>org.apache.geronimo.plugins</groupId>
-            <artifactId>pluto-support</artifactId>
+            <artifactId>console-jetty</artifactId>
             <version>1.0-SNAPSHOT</version>
             <type>car</type>
         </dependency>
@@ -108,7 +109,6 @@
                         <deploymentConfig>${jetty6Deployer}</deploymentConfig>
                         <deploymentConfig>${jasperDeployer}</deploymentConfig>
                     </deploymentConfigs>
-                    <name>Debug Views -- Jetty</name>
                     <module>
                         <groupId>org.apache.geronimo.plugins</groupId>
                         <artifactId>debugviews-portlets</artifactId>
@@ -116,96 +116,30 @@
                         <type>war</type>
                     </module>
                     <category>Application</category>
-                    <description>
-                       Debug Views plugin for Jetty
-                    </description>
-                    <url>http://geronimo.apache.org/</url>
-                    <author>The Apache Geronimo development community</author>
                     <osiApproved>true</osiApproved>
                     <geronimoVersions>
-                        <value>2.0.1</value>
                         <value>2.1-SNAPSHOT</value>
                     </geronimoVersions>
-                    <obsoletes>
-                        <moduleId>
-                            <groupId>org.apache.geronimo.plugins</groupId>
-                            <artifactId>debugviews-jetty</artifactId>
-                        </moduleId>
-                    </obsoletes>
-                    <dependencies>
-                        <dependency>
-                            <groupId>org.apache.geronimo.plugins</groupId>
-                            <artifactId>pluto-support</artifactId>
-                            <version>1.0-SNAPSHOT</version>
-                            <type>car</type>
-                        </dependency>
-                        <dependency>
-                            <groupId>org.apache.geronimo.configs</groupId>
-                            <artifactId>geronimo-gbean-deployer</artifactId>
-                            <version>${geronimoVersion}</version>
-                            <type>car</type>
-                        </dependency>
-                        <dependency>
-                            <groupId>org.apache.geronimo.configs</groupId>
-                            <artifactId>dojo-jetty6</artifactId>
-                            <version>${geronimoVersion}</version>
-                            <type>car</type>
-                        </dependency>
-                        <dependency>
-                            <groupId>org.apache.xbean</groupId>
-                            <artifactId>xbean-naming</artifactId>
-                            <version>${xbeanVersion}</version>
-                        </dependency>
-                        <dependency>
-                            <groupId>org.apache.geronimo.modules</groupId>
-                            <artifactId>geronimo-kernel</artifactId>
-                            <version>${geronimoVersion}</version>
-                            <type>jar</type>
-                        </dependency>
-                        <dependency>
-                            <groupId>org.apache.geronimo.modules</groupId>
-                            <artifactId>geronimo-management</artifactId>
-                            <version>${geronimoVersion}</version>
-                            <type>jar</type>
-                        </dependency>
-                        <dependency>
-                            <groupId>org.apache.geronimo.specs</groupId>
-                            <artifactId>geronimo-servlet_2.5_spec</artifactId>
-                            <version>${geronimoServletSpecVersion}</version>
-                            <type>jar</type>
-                        </dependency>
-                        <dependency>
-                            <groupId>org.apache.geronimo.modules</groupId>
-                            <artifactId>geronimo-j2ee</artifactId>
-                            <version>${geronimoVersion}</version>
-                            <type>jar</type>
-                        </dependency>
-                    </dependencies>
+                    <useMavenDependencies>
+                        <value>true</value>
+                        <includeVersion>true</includeVersion>
+                    </useMavenDependencies>
                     <instance>
                         <plugin-artifact>
                             <prerequisite>
                                 <id>
-                                    <groupId>org.apache.geronimo.plugins</groupId>
-                                    <artifactId>pluto-support</artifactId>
-                                </id>
-                                <resource-type>Portal</resource-type>
-                                <description>Pluto portal cantainer support in Geronimo</description>
-                            </prerequisite>
-                            <prerequisite>
-                                <id>
                                     <groupId>org.apache.geronimo.configs</groupId>
                                     <artifactId>jetty6</artifactId>
                                 </id>
                                 <resource-type>Web Container</resource-type>
                                 <description>
                                     This version of the plugin works with the Geronimo/Jetty distribution.
-                                    It is not intended to run in the Geronimo/Tomcat distribution.
-                                    There is a separate version of this plugin that works with Tomcat.
-                                    Please install the version appropriate to your Geronimo distribution.
                                 </description>
                             </prerequisite>
                             <source-repository>http://people.apache.org/repo/m2-snapshot-repository/</source-repository>
                             <source-repository>http://repo1.maven.org/maven2/</source-repository>
+                            <!-- temporary repo for console-jetty dependency until snaps are deployed to the snapshot repo -->
+                            <source-repository>http://people.apache.org/~pmcmahan/maven2/</source-repository>
                         </plugin-artifact>
                     </instance>
                 </configuration>

Modified: geronimo/plugins/debugviews/trunk/debugviews-portlets/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/plugins/debugviews/trunk/debugviews-portlets/pom.xml?rev=574332&r1=574331&r2=574332&view=diff
==============================================================================
--- geronimo/plugins/debugviews/trunk/debugviews-portlets/pom.xml (original)
+++ geronimo/plugins/debugviews/trunk/debugviews-portlets/pom.xml Mon Sep 10 11:51:10 2007
@@ -30,7 +30,7 @@
     </parent>
 
     <artifactId>debugviews-portlets</artifactId>
-    <name>Geronimo Debug Views :: Admin Console Portlets</name>
+    <name>Debug Views :: Admin Console Portlets</name>
     <packaging>war</packaging>
 
     <dependencies>

Modified: geronimo/plugins/debugviews/trunk/debugviews-tomcat/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/plugins/debugviews/trunk/debugviews-tomcat/pom.xml?rev=574332&r1=574331&r2=574332&view=diff
==============================================================================
--- geronimo/plugins/debugviews/trunk/debugviews-tomcat/pom.xml (original)
+++ geronimo/plugins/debugviews/trunk/debugviews-tomcat/pom.xml Mon Sep 10 11:51:10 2007
@@ -31,7 +31,7 @@
 
     <groupId>org.apache.geronimo.plugins</groupId>
     <artifactId>debugviews-tomcat</artifactId>
-    <name>Geronimo Debug Views :: Configuration for Tomcat</name>
+    <name>Debug Views :: Tomcat plugin</name>
     <packaging>car</packaging>
 
     <dependencies>
@@ -41,11 +41,12 @@
             <artifactId>debugviews-portlets</artifactId>
             <version>${version}</version>
             <type>war</type>
+            <scope>provided</scope>
         </dependency>
 
         <dependency>
             <groupId>org.apache.geronimo.plugins</groupId>
-            <artifactId>pluto-support</artifactId>
+            <artifactId>console-tomcat</artifactId>
             <version>1.0-SNAPSHOT</version>
             <type>car</type>
         </dependency>
@@ -108,7 +109,6 @@
                         <deploymentConfig>${tomcatDeployer}</deploymentConfig>
                         <deploymentConfig>${jasperDeployer}</deploymentConfig>
                     </deploymentConfigs>
-                    <name>Debug Views -- Tomcat</name>
                     <module>
                         <groupId>org.apache.geronimo.plugins</groupId>
                         <artifactId>debugviews-portlets</artifactId>
@@ -116,96 +116,30 @@
                         <type>war</type>
                     </module>
                     <category>Application</category>
-                    <description>
-                       Debug Views plugin for Tomcat
-                    </description>
-                    <url>http://geronimo.apache.org/</url>
-                    <author>The Apache Geronimo development community</author>
                     <osiApproved>true</osiApproved>
                     <geronimoVersions>
-                        <value>2.0.1</value>
                         <value>2.1-SNAPSHOT</value>
                     </geronimoVersions>
-                    <obsoletes>
-                        <moduleId>
-                            <groupId>org.apache.geronimo.plugins</groupId>
-                            <artifactId>debugviews-tomcat</artifactId>
-                        </moduleId>
-                    </obsoletes>
-                    <dependencies>
-                        <dependency>
-                            <groupId>org.apache.geronimo.plugins</groupId>
-                            <artifactId>pluto-support</artifactId>
-                            <version>1.0-SNAPSHOT</version>
-                            <type>car</type>
-                        </dependency>
-                        <dependency>
-                            <groupId>org.apache.geronimo.configs</groupId>
-                            <artifactId>geronimo-gbean-deployer</artifactId>
-                            <version>${geronimoVersion}</version>
-                            <type>car</type>
-                        </dependency>
-                        <dependency>
-                            <groupId>org.apache.geronimo.configs</groupId>
-                            <artifactId>dojo-tomcat</artifactId>
-                            <version>${geronimoVersion}</version>
-                            <type>car</type>
-                        </dependency>
-                        <dependency>
-                            <groupId>org.apache.xbean</groupId>
-                            <artifactId>xbean-naming</artifactId>
-                            <version>${xbeanVersion}</version>
-                        </dependency>
-                        <dependency>
-                            <groupId>org.apache.geronimo.modules</groupId>
-                            <artifactId>geronimo-kernel</artifactId>
-                            <version>${geronimoVersion}</version>
-                            <type>jar</type>
-                        </dependency>
-                        <dependency>
-                            <groupId>org.apache.geronimo.modules</groupId>
-                            <artifactId>geronimo-management</artifactId>
-                            <version>${geronimoVersion}</version>
-                            <type>jar</type>
-                        </dependency>
-                        <dependency>
-                            <groupId>org.apache.geronimo.specs</groupId>
-                            <artifactId>geronimo-servlet_2.5_spec</artifactId>
-                            <version>${geronimoServletSpecVersion}</version>
-                            <type>jar</type>
-                        </dependency>
-                        <dependency>
-                            <groupId>org.apache.geronimo.modules</groupId>
-                            <artifactId>geronimo-j2ee</artifactId>
-                            <version>${geronimoVersion}</version>
-                            <type>jar</type>
-                        </dependency>
-                    </dependencies>
+                    <useMavenDependencies>
+                        <value>true</value>
+                        <includeVersion>true</includeVersion>
+                    </useMavenDependencies>
                     <instance>
                         <plugin-artifact>
                             <prerequisite>
                                 <id>
-                                    <groupId>org.apache.geronimo.plugins</groupId>
-                                    <artifactId>pluto-support</artifactId>
-                                </id>
-                                <resource-type>Portal</resource-type>
-                                <description>Pluto portal cantainer support in Geronimo</description>
-                            </prerequisite>
-                            <prerequisite>
-                                <id>
                                     <groupId>org.apache.geronimo.configs</groupId>
                                     <artifactId>tomcat6</artifactId>
                                 </id>
                                 <resource-type>Web Container</resource-type>
                                 <description>
                                     This version of the plugin works with the Geronimo/Tomcat distribution.
-                                    It is not intended to run in the Geronimo/Jetty distribution.
-                                    There is a separate version of this plugin that works with Jetty.
-                                    Please install the version appropriate to your Geronimo distribution.
                                 </description>
                             </prerequisite>
                             <source-repository>http://people.apache.org/repo/m2-snapshot-repository/</source-repository>
                             <source-repository>http://repo1.maven.org/maven2/</source-repository>
+                            <!-- temporary repo for console-tomcat dependency until snaps are deployed to the snapshot repo -->
+                            <source-repository>http://people.apache.org/~pmcmahan/maven2/</source-repository>
                         </plugin-artifact>
                     </instance>
                 </configuration>

Modified: geronimo/plugins/debugviews/trunk/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/plugins/debugviews/trunk/pom.xml?rev=574332&r1=574331&r2=574332&view=diff
==============================================================================
--- geronimo/plugins/debugviews/trunk/pom.xml (original)
+++ geronimo/plugins/debugviews/trunk/pom.xml Mon Sep 10 11:51:10 2007
@@ -30,7 +30,7 @@
 
     <groupId>org.apache.geronimo.plugins</groupId>
     <artifactId>debugviews</artifactId>
-    <name>Geronimo Debug Views</name>
+    <name>Debug Views</name>
     <packaging>pom</packaging>
 
     <version>1.0-SNAPSHOT</version>

Modified: geronimo/plugins/jee-management/trunk/jee-management-jetty/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/plugins/jee-management/trunk/jee-management-jetty/pom.xml?rev=574332&r1=574331&r2=574332&view=diff
==============================================================================
--- geronimo/plugins/jee-management/trunk/jee-management-jetty/pom.xml (original)
+++ geronimo/plugins/jee-management/trunk/jee-management-jetty/pom.xml Mon Sep 10 11:51:10 2007
@@ -31,7 +31,7 @@
 
     <groupId>org.apache.geronimo.plugins</groupId>
     <artifactId>jee-management-jetty</artifactId>
-    <name>Java EE Management :: Configuration for Jetty</name>
+    <name>Java EE Management :: Jetty plugin</name>
     <packaging>car</packaging>
 
     <dependencies>
@@ -41,6 +41,7 @@
             <artifactId>jee-management-portlets</artifactId>
             <version>${version}</version>
             <type>war</type>
+            <scope>provided</scope>
         </dependency>
 
         <dependency>
@@ -89,86 +90,34 @@
                     <module>
                         <groupId>org.apache.geronimo.plugins</groupId>
                         <artifactId>jee-management-portlets</artifactId>
-                        <type>war</type>
-                    </module>
-                    <name>JEE Management Views -- Jetty</name>
-                    <module>
-                        <groupId>org.apache.geronimo.plugins</groupId>
-                        <artifactId>jee-management-portlets</artifactId>
                         <version>${version}</version>
                         <type>war</type>
                     </module>
                     <category>Application</category>
-                    <description>
-                       JEE Management Views plugin
-                    </description>
-                    <url>http://geronimo.apache.org/</url>
-                    <author>The Apache Geronimo development community</author>
                     <osiApproved>true</osiApproved>
                     <geronimoVersions>
-                        <value>2.0.1</value>
                         <value>2.1-SNAPSHOT</value>
                     </geronimoVersions>
-                    <obsoletes>
-                        <moduleId>
-                            <groupId>org.apache.geronimo.plugins</groupId>
-                            <artifactId>jee-management-jetty</artifactId>
-                        </moduleId>
-                    </obsoletes>
-                    <dependencies>
-                        <dependency>
-                            <groupId>org.apache.geronimo.plugins</groupId>
-                            <artifactId>pluto-support</artifactId>
-                            <version>1.0-SNAPSHOT</version>
-                            <type>car</type>
-                        </dependency>
-
-                        <dependency>
-                            <groupId>org.apache.geronimo.modules</groupId>
-                            <artifactId>geronimo-kernel</artifactId>
-                            <version>${geronimoVersion}</version>
-                            <type>jar</type>
-                        </dependency>
-
-                        <dependency>
-                            <groupId>org.apache.geronimo.modules</groupId>
-                            <artifactId>geronimo-management</artifactId>
-                            <version>${geronimoVersion}</version>
-                            <type>jar</type>
-                        </dependency>
-
-                        <dependency>
-                            <groupId>org.apache.geronimo.modules</groupId>
-                            <artifactId>geronimo-deploy-jsr88</artifactId>
-                            <version>${geronimoVersion}</version>
-                            <type>jar</type>
-                        </dependency>
-                    </dependencies>
+                    <useMavenDependencies>
+                        <value>true</value>
+                        <includeVersion>true</includeVersion>
+                    </useMavenDependencies>
                     <instance>
                         <plugin-artifact>
                             <prerequisite>
                                 <id>
-                                    <groupId>org.apache.geronimo.plugins</groupId>
-                                    <artifactId>pluto-support</artifactId>
-                                </id>
-                                <resource-type>Portal</resource-type>
-                                <description>Pluto portal cantainer support in Geronimo</description>
-                            </prerequisite>
-                            <prerequisite>
-                                <id>
                                     <groupId>org.apache.geronimo.configs</groupId>
                                     <artifactId>jetty6</artifactId>
                                 </id>
                                 <resource-type>Web Container</resource-type>
                                 <description>
                                     This version of the plugin works with the Geronimo/Jetty distribution.
-                                    It is not intended to run in the Geronimo/Tomcat distribution.
-                                    There is a separate version of this plugin that works with Tomcat.
-                                    Please install the version appropriate to your Geronimo distribution.
                                 </description>
                             </prerequisite>
                             <source-repository>http://people.apache.org/repo/m2-snapshot-repository/</source-repository>
                             <source-repository>http://repo1.maven.org/maven2/</source-repository>
+                            <!-- temporary repo for console-jetty dependency until snaps are deployed to the snapshot repo -->
+                            <source-repository>http://people.apache.org/~pmcmahan/maven2/</source-repository>
                         </plugin-artifact>
                     </instance>
                 </configuration>

Modified: geronimo/plugins/jee-management/trunk/jee-management-tomcat/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/plugins/jee-management/trunk/jee-management-tomcat/pom.xml?rev=574332&r1=574331&r2=574332&view=diff
==============================================================================
--- geronimo/plugins/jee-management/trunk/jee-management-tomcat/pom.xml (original)
+++ geronimo/plugins/jee-management/trunk/jee-management-tomcat/pom.xml Mon Sep 10 11:51:10 2007
@@ -31,7 +31,7 @@
 
     <groupId>org.apache.geronimo.plugins</groupId>
     <artifactId>jee-management-tomcat</artifactId>
-    <name>Java EE Management :: Configuration for Tomcat</name>
+    <name>Java EE Management :: Tomcat plugin</name>
     <packaging>car</packaging>
 
     <dependencies>
@@ -41,6 +41,7 @@
             <artifactId>jee-management-portlets</artifactId>
             <version>${version}</version>
             <type>war</type>
+            <scope>provided</scope>
         </dependency>
 
         <dependency>
@@ -89,86 +90,34 @@
                     <module>
                         <groupId>org.apache.geronimo.plugins</groupId>
                         <artifactId>jee-management-portlets</artifactId>
-                        <type>war</type>
-                    </module>
-                    <name>JEE Management Views -- Tomcat</name>
-                    <module>
-                        <groupId>org.apache.geronimo.plugins</groupId>
-                        <artifactId>jee-management-portlets</artifactId>
                         <version>${version}</version>
                         <type>war</type>
                     </module>
                     <category>Application</category>
-                    <description>
-                       JEE Management Views plugin
-                    </description>
-                    <url>http://geronimo.apache.org/</url>
-                    <author>The Apache Geronimo development community</author>
                     <osiApproved>true</osiApproved>
                     <geronimoVersions>
-                        <value>2.0.1</value>
                         <value>2.1-SNAPSHOT</value>
                     </geronimoVersions>
-                    <obsoletes>
-                        <moduleId>
-                            <groupId>org.apache.geronimo.plugins</groupId>
-                            <artifactId>jee-management-tomcat</artifactId>
-                        </moduleId>
-                    </obsoletes>
-                    <dependencies>
-                        <dependency>
-                            <groupId>org.apache.geronimo.plugins</groupId>
-                            <artifactId>pluto-support</artifactId>
-                            <version>1.0-SNAPSHOT</version>
-                            <type>car</type>
-                        </dependency>
-
-                        <dependency>
-                            <groupId>org.apache.geronimo.modules</groupId>
-                            <artifactId>geronimo-kernel</artifactId>
-                            <version>${geronimoVersion}</version>
-                            <type>jar</type>
-                        </dependency>
-
-                        <dependency>
-                            <groupId>org.apache.geronimo.modules</groupId>
-                            <artifactId>geronimo-management</artifactId>
-                            <version>${geronimoVersion}</version>
-                            <type>jar</type>
-                        </dependency>
-
-                        <dependency>
-                            <groupId>org.apache.geronimo.modules</groupId>
-                            <artifactId>geronimo-deploy-jsr88</artifactId>
-                            <version>${geronimoVersion}</version>
-                            <type>jar</type>
-                        </dependency>
-                    </dependencies>
+                    <useMavenDependencies>
+                        <value>true</value>
+                        <includeVersion>true</includeVersion>
+                    </useMavenDependencies>
                     <instance>
                         <plugin-artifact>
                             <prerequisite>
                                 <id>
-                                    <groupId>org.apache.geronimo.plugins</groupId>
-                                    <artifactId>pluto-support</artifactId>
-                                </id>
-                                <resource-type>Portal</resource-type>
-                                <description>Pluto portal cantainer support in Geronimo</description>
-                            </prerequisite>
-                            <prerequisite>
-                                <id>
                                     <groupId>org.apache.geronimo.configs</groupId>
                                     <artifactId>tomcat6</artifactId>
                                 </id>
                                 <resource-type>Web Container</resource-type>
                                 <description>
                                     This version of the plugin works with the Geronimo/Tomcat distribution.
-                                    It is not intended to run in the Geronimo/Jetty distribution.
-                                    There is a separate version of this plugin that works with Jetty.
-                                    Please install the version appropriate to your Geronimo distribution.
                                 </description>
                             </prerequisite>
                             <source-repository>http://people.apache.org/repo/m2-snapshot-repository/</source-repository>
                             <source-repository>http://repo1.maven.org/maven2/</source-repository>
+                            <!-- temporary repo for console-tomcat dependency until snaps are deployed to the snapshot repo -->
+                            <source-repository>http://people.apache.org/~pmcmahan/maven2/</source-repository>
                         </plugin-artifact>
                     </instance>
                 </configuration>

Modified: geronimo/plugins/plancreator/trunk/plancreator-jetty/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/plugins/plancreator/trunk/plancreator-jetty/pom.xml?rev=574332&r1=574331&r2=574332&view=diff
==============================================================================
--- geronimo/plugins/plancreator/trunk/plancreator-jetty/pom.xml (original)
+++ geronimo/plugins/plancreator/trunk/plancreator-jetty/pom.xml Mon Sep 10 11:51:10 2007
@@ -31,7 +31,7 @@
 
     <groupId>org.apache.geronimo.plugins</groupId>
     <artifactId>plancreator-jetty</artifactId>
-    <name>Geronimo Plan Creator :: Configuration for Jetty</name>
+    <name>Deployment Plan Creator :: Jetty plugin</name>
     <packaging>car</packaging>
 
     <dependencies>
@@ -41,6 +41,7 @@
             <artifactId>plancreator-portlets</artifactId>
             <version>${version}</version>
             <type>war</type>
+            <scope>provided</scope>
         </dependency>
 
         <dependency>
@@ -95,93 +96,34 @@
                     <module>
                         <groupId>org.apache.geronimo.plugins</groupId>
                         <artifactId>plancreator-portlets</artifactId>
-                        <type>war</type>
-                    </module>
-                    <name>Plan Creator -- Jetty</name>
-                    <module>
-                        <groupId>org.apache.geronimo.plugins</groupId>
-                        <artifactId>plancreator-portlets</artifactId>
                         <version>${version}</version>
                         <type>war</type>
                     </module>
                     <category>Application</category>
-                    <description>
-                       Plan Creator plugin for Jetty
-                    </description>
-                    <url>http://geronimo.apache.org/</url>
-                    <author>The Apache Geronimo development community</author>
                     <osiApproved>true</osiApproved>
                     <geronimoVersions>
-                        <value>2.0.1</value>
                         <value>2.1-SNAPSHOT</value>
                     </geronimoVersions>
-                    <obsoletes>
-                        <moduleId>
-                            <groupId>org.apache.geronimo.plugins</groupId>
-                            <artifactId>plancreator-jetty</artifactId>
-                        </moduleId>
-                    </obsoletes>
-                    <dependencies>
-                        <dependency>
-                            <groupId>org.apache.geronimo.plugins</groupId>
-                            <artifactId>pluto-support</artifactId>
-                            <version>1.0-SNAPSHOT</version>
-                            <type>car</type>
-                        </dependency>
-
-                        <dependency>
-                            <groupId>org.apache.geronimo.modules</groupId>
-                            <artifactId>geronimo-management</artifactId>
-                            <version>${geronimoVersion}</version>
-                            <type>jar</type>
-                        </dependency>
-
-                        <dependency>
-                            <groupId>org.apache.geronimo.configs</groupId>
-                            <artifactId>connector-deployer</artifactId>
-                            <version>${geronimoVersion}</version>
-                            <type>car</type>
-                        </dependency>
-
-                        <dependency>
-                            <groupId>org.apache.geronimo.modules</groupId>
-                            <artifactId>geronimo-deploy-jsr88</artifactId>
-                            <version>${geronimoVersion}</version>
-                            <type>jar</type>
-                        </dependency>
-
-                        <dependency>
-                            <groupId>org.apache.geronimo.modules</groupId>
-                            <artifactId>geronimo-test-ddbean</artifactId>
-                            <version>${geronimoVersion}</version>
-                            <type>jar</type>
-                        </dependency>
-                    </dependencies>
+                    <useMavenDependencies>
+                        <value>true</value>
+                        <includeVersion>true</includeVersion>
+                    </useMavenDependencies>
                     <instance>
                         <plugin-artifact>
                             <prerequisite>
                                 <id>
-                                    <groupId>org.apache.geronimo.plugins</groupId>
-                                    <artifactId>pluto-support</artifactId>
-                                </id>
-                                <resource-type>Portal</resource-type>
-                                <description>Pluto portal cantainer support in Geronimo</description>
-                            </prerequisite>
-                            <prerequisite>
-                                <id>
                                     <groupId>org.apache.geronimo.configs</groupId>
                                     <artifactId>jetty6</artifactId>
                                 </id>
                                 <resource-type>Web Container</resource-type>
                                 <description>
                                     This version of the plugin works with the Geronimo/Jetty distribution.
-                                    It is not intended to run in the Geronimo/Tomcat distribution.
-                                    There is a separate version of this plugin that works with Tomcat.
-                                    Please install the version appropriate to your Geronimo distribution.
                                 </description>
                             </prerequisite>
                             <source-repository>http://people.apache.org/repo/m2-snapshot-repository/</source-repository>
                             <source-repository>http://repo1.maven.org/maven2/</source-repository>
+                            <!-- temporary repo for console-jetty dependency until snaps are deployed to the snapshot repo -->
+                            <source-repository>http://people.apache.org/~pmcmahan/maven2/</source-repository>
                         </plugin-artifact>
                     </instance>
                 </configuration>

Modified: geronimo/plugins/plancreator/trunk/plancreator-portlets/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/plugins/plancreator/trunk/plancreator-portlets/pom.xml?rev=574332&r1=574331&r2=574332&view=diff
==============================================================================
--- geronimo/plugins/plancreator/trunk/plancreator-portlets/pom.xml (original)
+++ geronimo/plugins/plancreator/trunk/plancreator-portlets/pom.xml Mon Sep 10 11:51:10 2007
@@ -30,7 +30,7 @@
     </parent>
 
     <artifactId>plancreator-portlets</artifactId>
-    <name>Geronimo Plan Creator :: Admin Console Portlets</name>
+    <name>Deployment Plan Creator :: Admin Console Portlets</name>
     <packaging>war</packaging>
 
     <dependencies>

Modified: geronimo/plugins/plancreator/trunk/plancreator-tomcat/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/plugins/plancreator/trunk/plancreator-tomcat/pom.xml?rev=574332&r1=574331&r2=574332&view=diff
==============================================================================
--- geronimo/plugins/plancreator/trunk/plancreator-tomcat/pom.xml (original)
+++ geronimo/plugins/plancreator/trunk/plancreator-tomcat/pom.xml Mon Sep 10 11:51:10 2007
@@ -31,7 +31,7 @@
 
     <groupId>org.apache.geronimo.plugins</groupId>
     <artifactId>plancreator-tomcat</artifactId>
-    <name>Geronimo Plan Creator :: Configuration for Tomcat</name>
+    <name>Deployment Plan Creator :: Tomcat plugin</name>
     <packaging>car</packaging>
 
     <dependencies>
@@ -41,6 +41,7 @@
             <artifactId>plancreator-portlets</artifactId>
             <version>${version}</version>
             <type>war</type>
+            <scope>provided</scope>
         </dependency>
 
         <dependency>
@@ -95,93 +96,37 @@
                     <module>
                         <groupId>org.apache.geronimo.plugins</groupId>
                         <artifactId>plancreator-portlets</artifactId>
-                        <type>war</type>
-                    </module>
-                    <name>Plan Creator -- Tomcat</name>
-                    <module>
-                        <groupId>org.apache.geronimo.plugins</groupId>
-                        <artifactId>plancreator-portlets</artifactId>
                         <version>${version}</version>
                         <type>war</type>
                     </module>
                     <category>Application</category>
                     <description>
-                       Plan Creator plugin for Tomcat
+                       Plan creator plugin for Tomcat
                     </description>
-                    <url>http://geronimo.apache.org/</url>
-                    <author>The Apache Geronimo development community</author>
                     <osiApproved>true</osiApproved>
                     <geronimoVersions>
-                        <value>2.0.1</value>
                         <value>2.1-SNAPSHOT</value>
                     </geronimoVersions>
-                    <obsoletes>
-                        <moduleId>
-                            <groupId>org.apache.geronimo.plugins</groupId>
-                            <artifactId>plancreator-tomcat</artifactId>
-                        </moduleId>
-                    </obsoletes>
-                    <dependencies>
-                        <dependency>
-                            <groupId>org.apache.geronimo.plugins</groupId>
-                            <artifactId>pluto-support</artifactId>
-                            <version>1.0-SNAPSHOT</version>
-                            <type>car</type>
-                        </dependency>
-
-                        <dependency>
-                            <groupId>org.apache.geronimo.modules</groupId>
-                            <artifactId>geronimo-management</artifactId>
-                            <version>${geronimoVersion}</version>
-                            <type>jar</type>
-                        </dependency>
-
-                        <dependency>
-                            <groupId>org.apache.geronimo.configs</groupId>
-                            <artifactId>connector-deployer</artifactId>
-                            <version>${geronimoVersion}</version>
-                            <type>car</type>
-                        </dependency>
-
-                        <dependency>
-                            <groupId>org.apache.geronimo.modules</groupId>
-                            <artifactId>geronimo-deploy-jsr88</artifactId>
-                            <version>${geronimoVersion}</version>
-                            <type>jar</type>
-                        </dependency>
-
-                        <dependency>
-                            <groupId>org.apache.geronimo.modules</groupId>
-                            <artifactId>geronimo-test-ddbean</artifactId>
-                            <version>${geronimoVersion}</version>
-                            <type>jar</type>
-                        </dependency>
-                    </dependencies>
+                    <useMavenDependencies>
+                        <value>true</value>
+                        <includeVersion>true</includeVersion>
+                    </useMavenDependencies>
                     <instance>
                         <plugin-artifact>
                             <prerequisite>
                                 <id>
-                                    <groupId>org.apache.geronimo.plugins</groupId>
-                                    <artifactId>pluto-support</artifactId>
-                                </id>
-                                <resource-type>Portal</resource-type>
-                                <description>Pluto portal cantainer support in Geronimo</description>
-                            </prerequisite>
-                            <prerequisite>
-                                <id>
                                     <groupId>org.apache.geronimo.configs</groupId>
                                     <artifactId>tomcat6</artifactId>
                                 </id>
                                 <resource-type>Web Container</resource-type>
                                 <description>
                                     This version of the plugin works with the Geronimo/Tomcat distribution.
-                                    It is not intended to run in the Geronimo/Jetty distribution.
-                                    There is a separate version of this plugin that works with Jetty.
-                                    Please install the version appropriate to your Geronimo distribution.
                                 </description>
                             </prerequisite>
                             <source-repository>http://people.apache.org/repo/m2-snapshot-repository/</source-repository>
                             <source-repository>http://repo1.maven.org/maven2/</source-repository>
+                            <!-- temporary repo for console-tomcat dependency until snaps are deployed to the snapshot repo -->
+                            <source-repository>http://people.apache.org/~pmcmahan/maven2/</source-repository>
                         </plugin-artifact>
                     </instance>
                 </configuration>

Modified: geronimo/plugins/plancreator/trunk/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/plugins/plancreator/trunk/pom.xml?rev=574332&r1=574331&r2=574332&view=diff
==============================================================================
--- geronimo/plugins/plancreator/trunk/pom.xml (original)
+++ geronimo/plugins/plancreator/trunk/pom.xml Mon Sep 10 11:51:10 2007
@@ -30,13 +30,13 @@
 
     <groupId>org.apache.geronimo.plugins</groupId>
     <artifactId>plancreator</artifactId>
-    <name>Geronimo Plan Creator</name>
+    <name>Deployment Plan Creator</name>
     <packaging>pom</packaging>
 
     <version>1.0-SNAPSHOT</version>
 
     <description>
-        Geronimo plan creator
+        Geronimo deployment plan creator
     </description>
 
     <scm>

Modified: geronimo/plugins/pluto/trunk/pluto-support/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/plugins/pluto/trunk/pluto-support/pom.xml?rev=574332&r1=574331&r2=574332&view=diff
==============================================================================
--- geronimo/plugins/pluto/trunk/pluto-support/pom.xml (original)
+++ geronimo/plugins/pluto/trunk/pluto-support/pom.xml Mon Sep 10 11:51:10 2007
@@ -31,7 +31,7 @@
 
     <artifactId>pluto-support</artifactId>
     <packaging>car</packaging>
-    <name>Pluto Plugin :: Container Configuration for Geronimo</name>
+    <name>Pluto :: Container support plugin</name>
 
     <dependencies>
     
@@ -137,155 +137,26 @@
                 <configuration>
                     <deploymentConfigs>
                         <deploymentConfig>${gbeanDeployer}</deploymentConfig>
-                        <deploymentConfig>${j2eeDeployer}</deploymentConfig>
                     </deploymentConfigs>
-                    <name>Pluto Support for Geronimo</name>
-                    <module>
-                        <groupId>org.apache.geronimo.plugins</groupId>
-                        <artifactId>pluto-support</artifactId>
-                        <version>${version}</version>
-                        <type>car</type>
-                    </module>
                     <category>Portals</category>
-                    <url>http://geronimo.apache.org/</url>
-                    <author>The Apache development community</author>
                     <description>
-                      Pluto portal container for Geronimo.  This configuration provides the components
-                      for portal applications that are shared across the web container.
+                      Pluto portal container support for Geronimo.  This configuration provides the components
+                      for portlet applications that are shared across the web container.
                     </description>
                     <osiApproved>true</osiApproved>
                     <geronimoVersions>
-                        <value>2.0.1</value>
                         <value>2.1-SNAPSHOT</value>
                     </geronimoVersions>
-                    <obsoletes>
-                        <moduleId>
-                            <groupId>org.apache.geronimo.plugins</groupId>
-                            <artifactId>pluto-support</artifactId>
-                        </moduleId>
-                    </obsoletes>
-                    <dependencies>
-                        <dependency>
-                            <groupId>org.apache.pluto</groupId>
-                            <artifactId>pluto-portal-driver</artifactId>
-                            <version>${plutoVersion}</version>
-                            <type>jar</type>
-                        </dependency>
-                        <dependency>
-                            <groupId>org.apache.pluto</groupId>
-                            <artifactId>pluto-portal-driver-impl</artifactId>
-                            <version>${plutoVersion}</version>
-                            <type>jar</type>
-                        </dependency>
-                        <dependency>
-                            <groupId>org.apache.pluto</groupId>
-                            <artifactId>pluto-container</artifactId>
-                            <version>${plutoVersion}</version>
-                            <type>jar</type>
-                        </dependency>
-                        <dependency>
-                            <groupId>org.apache.pluto</groupId>
-                            <artifactId>pluto-descriptor-api</artifactId>
-                            <version>${plutoVersion}</version>
-                            <type>jar</type>
-                        </dependency>
-                        <dependency>
-                            <groupId>org.apache.pluto</groupId>
-                            <artifactId>pluto-descriptor-impl</artifactId>
-                            <version>${plutoVersion}</version>
-                            <type>jar</type>
-                        </dependency>
-                        <dependency>
-                            <groupId>org.apache.pluto</groupId>
-                            <artifactId>pluto-taglib</artifactId>
-                            <version>${plutoVersion}</version>
-                            <type>jar</type>
-                        </dependency>
-                        <dependency>
-                            <groupId>commons-logging</groupId>
-                            <artifactId>commons-logging-api</artifactId>
-                            <version>${commonsLoggingVersion}</version>
-                            <type>jar</type>
-                        </dependency>
-                        <dependency>
-                            <groupId>commons-beanutils</groupId>
-                            <artifactId>commons-beanutils</artifactId>
-                            <version>${commonsBeanUtilsVersion}</version>
-                            <type>jar</type>
-                        </dependency>
-                        <dependency>
-                            <groupId>commons-collections</groupId>
-                            <artifactId>commons-collections</artifactId>
-                            <version>${commonsCollectionsVersion}</version>
-                            <type>jar</type>
-                        </dependency>
-                        <dependency>
-                            <groupId>javax.portlet</groupId>
-                            <artifactId>portlet-api</artifactId>
-                            <version>${portletApiVersion}</version>
-                            <type>jar</type>
-                        </dependency>
-                        <dependency>
-                            <groupId>org.apache.geronimo.configs</groupId>
-                            <artifactId>jee-specs</artifactId>
-                            <version>${geronimoVersion}</version>
-                            <type>car</type>
-                        </dependency>
-                        <dependency>
-                            <groupId>org.codehaus.castor</groupId>
-                            <artifactId>castor</artifactId>
-                            <version>${castorVersion}</version>
-                            <type>jar</type>
-                        </dependency>
-                        <dependency>
-                            <groupId>org.apache.geronimo.plugins</groupId>
-                            <artifactId>geronimo-pluto</artifactId>
-                            <version>${version}</version>
-                            <type>jar</type>
-                        </dependency>
-                        <dependency>
-                            <groupId>org.springframework</groupId>
-                            <artifactId>spring-beans</artifactId>
-                            <version>${springVersion}</version>
-                            <type>jar</type>
-                        </dependency>
-                        <dependency>
-                            <groupId>org.springframework</groupId>
-                            <artifactId>spring-context</artifactId>
-                            <version>${springVersion}</version>
-                            <type>jar</type>
-                        </dependency>
-                        <dependency>
-                            <groupId>org.springframework</groupId>
-                            <artifactId>spring-core</artifactId>
-                            <version>${springVersion}</version>
-                            <type>jar</type>
-                        </dependency>
-                        <dependency>
-                            <groupId>org.springframework</groupId>
-                            <artifactId>spring-web</artifactId>
-                            <version>${springVersion}</version>
-                            <type>jar</type>
-                        </dependency>
-                        <dependency>
-                            <groupId>commons-digester</groupId>
-                            <artifactId>commons-digester</artifactId>
-                            <version>${commonsDigesterVersion}</version>
-                            <type>jar</type>
-                        </dependency>
-                    </dependencies>
+                    <useMavenDependencies>
+                        <value>true</value>
+                        <includeVersion>true</includeVersion>
+                    </useMavenDependencies>
                     <instance>
                         <plugin-artifact>
-                            <prerequisite>
-                                <id>
-                                    <groupId>org.apache.geronimo.configs</groupId>
-                                    <artifactId>jasper</artifactId>
-                                </id>
-                                <resource-type>Web Container</resource-type>
-                                <description>The Jasper subsystem</description>
-                            </prerequisite>
                             <source-repository>http://people.apache.org/repo/m2-snapshot-repository/</source-repository>
                             <source-repository>http://repo1.maven.org/maven2/</source-repository>
+                            <!-- temporary repo for geronimo-pluto dependency until snaps are deployed to the snapshot repo -->
+                            <source-repository>http://people.apache.org/~pmcmahan/maven2/</source-repository>
                         </plugin-artifact>
                     </instance>
                 </configuration>

Modified: geronimo/plugins/pluto/trunk/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/plugins/pluto/trunk/pom.xml?rev=574332&r1=574331&r2=574332&view=diff
==============================================================================
--- geronimo/plugins/pluto/trunk/pom.xml (original)
+++ geronimo/plugins/pluto/trunk/pom.xml Mon Sep 10 11:51:10 2007
@@ -30,7 +30,7 @@
 
     <groupId>org.apache.geronimo.plugins</groupId>
     <artifactId>pluto</artifactId>
-    <name>Pluto Plugin</name>
+    <name>Pluto</name>
     <packaging>pom</packaging>
 
     <version>1.0-SNAPSHOT</version>
@@ -503,7 +503,7 @@
 
         <site>
             <id>geronimo-website</id>
-            <url>scp://people.apache.org/www/geronimo.apache.org/maven/portals</url>
+            <url>scp://people.apache.org/www/geronimo.apache.org/maven/pluto</url>
         </site>
     </distributionManagement>
 

Modified: geronimo/plugins/system-database/trunk/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/plugins/system-database/trunk/pom.xml?rev=574332&r1=574331&r2=574332&view=diff
==============================================================================
--- geronimo/plugins/system-database/trunk/pom.xml (original)
+++ geronimo/plugins/system-database/trunk/pom.xml Mon Sep 10 11:51:10 2007
@@ -30,7 +30,7 @@
 
     <groupId>org.apache.geronimo.plugins</groupId>
     <artifactId>system-database</artifactId>
-    <name>Geronimo System Database</name>
+    <name>System Database</name>
     <packaging>pom</packaging>
 
     <version>1.0-SNAPSHOT</version>



Mime
View raw message