Return-Path: 
 <scm-return-21737-apmail-geronimo-scm-archive=geronimo.apache.org@geronimo.apache.org>
Delivered-To: apmail-geronimo-scm-archive@www.apache.org
Received: (qmail 92519 invoked from network); 4 Sep 2007 20:06:27 -0000
Received: from hermes.apache.org (HELO mail.apache.org) (140.211.11.2)
  by minotaur.apache.org with SMTP; 4 Sep 2007 20:06:27 -0000
Received: (qmail 81389 invoked by uid 500); 4 Sep 2007 20:06:22 -0000
Delivered-To: apmail-geronimo-scm-archive@geronimo.apache.org
Received: (qmail 81350 invoked by uid 500); 4 Sep 2007 20:06:22 -0000
Mailing-List: contact scm-help@geronimo.apache.org; run by ezmlm
Precedence: bulk
list-help: <mailto:scm-help@geronimo.apache.org>
list-unsubscribe: <mailto:scm-unsubscribe@geronimo.apache.org>
List-Post: <mailto:scm@geronimo.apache.org>
Reply-To: dev@geronimo.apache.org
List-Id: <scm.geronimo.apache.org>
Delivered-To: mailing list scm@geronimo.apache.org
Received: (qmail 81334 invoked by uid 99); 4 Sep 2007 20:06:22 -0000
Received: from nike.apache.org (HELO nike.apache.org) (192.87.106.230)
    by apache.org (qpsmtpd/0.29) with ESMTP; Tue, 04 Sep 2007 13:06:22 -0700
X-ASF-Spam-Status: No, hits=-100.0 required=10.0
	tests=ALL_TRUSTED
X-Spam-Check-By: apache.org
Received: from [140.211.11.3] (HELO eris.apache.org) (140.211.11.3)
    by apache.org (qpsmtpd/0.29) with ESMTP; Tue, 04 Sep 2007 20:07:31 +0000
Received: by eris.apache.org (Postfix, from userid 65534)
	id 7711F1A9832; Tue,  4 Sep 2007 13:05:54 -0700 (PDT)
Content-Type: text/plain; charset="utf-8"
MIME-Version: 1.0
Content-Transfer-Encoding: 7bit
Subject: svn commit: r572805 - in /geronimo/plugins/debugviews/trunk: ./
 debugviews-jetty/ debugviews-jetty/src/main/plan/
 debugviews-jetty/src/main/resources/ debugviews-jetty/src/plan/
 debugviews-tomcat/ debugviews-tomcat/src/main/plan/ debugviews-tomcat/src/...
Date: Tue, 04 Sep 2007 20:05:53 -0000
To: scm@geronimo.apache.org
From: pmcmahan@apache.org
X-Mailer: svnmailer-1.0.8
Message-Id: <20070904200554.7711F1A9832@eris.apache.org>
X-Virus-Checked: Checked by ClamAV on apache.org

Author: pmcmahan
Date: Tue Sep  4 13:05:52 2007
New Revision: 572805

URL: http://svn.apache.org/viewvc?rev=572805&view=rev
Log:
GERONIMO-3413 use the car maven plugin to generate the geronimo-plugin.xml for the debug views

Added:
    geronimo/plugins/debugviews/trunk/debugviews-jetty/src/main/plan/
      - copied from r568727, geronimo/plugins/debugviews/trunk/debugviews-jetty/src/plan/
    geronimo/plugins/debugviews/trunk/debugviews-jetty/src/main/plan/plan.xml
      - copied unchanged from r572804, geronimo/plugins/debugviews/trunk/debugviews-jetty/src/plan/plan.xml
    geronimo/plugins/debugviews/trunk/debugviews-tomcat/src/main/plan/
      - copied from r568727, geronimo/plugins/debugviews/trunk/debugviews-tomcat/src/plan/
    geronimo/plugins/debugviews/trunk/debugviews-tomcat/src/main/plan/plan.xml
      - copied unchanged from r572804, geronimo/plugins/debugviews/trunk/debugviews-tomcat/src/plan/plan.xml
Removed:
    geronimo/plugins/debugviews/trunk/debugviews-jetty/src/main/resources/
    geronimo/plugins/debugviews/trunk/debugviews-jetty/src/plan/
    geronimo/plugins/debugviews/trunk/debugviews-tomcat/src/main/resources/
    geronimo/plugins/debugviews/trunk/debugviews-tomcat/src/plan/
Modified:
    geronimo/plugins/debugviews/trunk/debugviews-jetty/pom.xml
    geronimo/plugins/debugviews/trunk/debugviews-tomcat/pom.xml
    geronimo/plugins/debugviews/trunk/pom.xml

Modified: geronimo/plugins/debugviews/trunk/debugviews-jetty/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/plugins/debugviews/trunk/debugviews-jetty/pom.xml?rev=572805&r1=572804&r2=572805&view=diff
==============================================================================
--- geronimo/plugins/debugviews/trunk/debugviews-jetty/pom.xml (original)
+++ geronimo/plugins/debugviews/trunk/debugviews-jetty/pom.xml Tue Sep  4 13:05:52 2007
@@ -108,11 +108,106 @@
                         <deploymentConfig>${jetty6Deployer}</deploymentConfig>
                         <deploymentConfig>${jasperDeployer}</deploymentConfig>
                     </deploymentConfigs>
+                    <name>Debug Views -- Jetty</name>
                     <module>
                         <groupId>org.apache.geronimo.plugins</groupId>
                         <artifactId>debugviews-portlets</artifactId>
+                        <version>${version}</version>
                         <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>
+                    <prerequisites>
+                        <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>
+                    </prerequisites>
+                    <sourceRepositories>
+                        <value>http://people.apache.org/repo/m2-snapshot-repository/</value>
+                        <value>http://repo1.maven.org/maven2/</value>
+                    </sourceRepositories>
                 </configuration>
             </plugin>
         </plugins>

Modified: geronimo/plugins/debugviews/trunk/debugviews-tomcat/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/plugins/debugviews/trunk/debugviews-tomcat/pom.xml?rev=572805&r1=572804&r2=572805&view=diff
==============================================================================
--- geronimo/plugins/debugviews/trunk/debugviews-tomcat/pom.xml (original)
+++ geronimo/plugins/debugviews/trunk/debugviews-tomcat/pom.xml Tue Sep  4 13:05:52 2007
@@ -108,11 +108,106 @@
                         <deploymentConfig>${tomcatDeployer}</deploymentConfig>
                         <deploymentConfig>${jasperDeployer}</deploymentConfig>
                     </deploymentConfigs>
+                    <name>Debug Views -- Tomcat</name>
                     <module>
                         <groupId>org.apache.geronimo.plugins</groupId>
                         <artifactId>debugviews-portlets</artifactId>
+                        <version>${version}</version>
                         <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>
+                    <prerequisites>
+                        <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>
+                    </prerequisites>
+                    <sourceRepositories>
+                        <value>http://people.apache.org/repo/m2-snapshot-repository/</value>
+                        <value>http://repo1.maven.org/maven2/</value>
+                    </sourceRepositories>
                 </configuration>
             </plugin>
         </plugins>

Modified: geronimo/plugins/debugviews/trunk/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/plugins/debugviews/trunk/pom.xml?rev=572805&r1=572804&r2=572805&view=diff
==============================================================================
--- geronimo/plugins/debugviews/trunk/pom.xml (original)
+++ geronimo/plugins/debugviews/trunk/pom.xml Tue Sep  4 13:05:52 2007
@@ -55,9 +55,11 @@
               as the maven-release-plugin will not update this value.
         -->
         <version>1.0-SNAPSHOT</version>
+        <consoleVersion>1.0-SNAPSHOT</consoleVersion>
         <geronimoVersion>2.1-SNAPSHOT</geronimoVersion>
+        <geronimoServletSpecVersion>1.1</geronimoServletSpecVersion>
         <plutoVersion>1.2.0-SNAPSHOT</plutoVersion>
-        <consoleVersion>1.0-SNAPSHOT</consoleVersion>
+        <xbeanVersion>3.0.1</xbeanVersion>
 
         <!-- deployers needed to create the CAR files -->
         <gbeanDeployer>org.apache.geronimo.configs/geronimo-gbean-deployer/${geronimoVersion}/car</gbeanDeployer>
@@ -97,7 +99,7 @@
             <dependency>
                 <groupId>org.apache.geronimo.specs</groupId>
                 <artifactId>geronimo-servlet_2.5_spec</artifactId>
-                <version>1.1-SNAPSHOT</version>
+                <version>${geronimoServletSpecVersion}</version>
             </dependency>
 
             <dependency>
@@ -109,7 +111,7 @@
             <dependency>
                 <groupId>org.apache.xbean</groupId>
                 <artifactId>xbean-naming</artifactId>
-                <version>3.0.1</version>
+                <version>${xbeanVersion}</version>
             </dependency>
 
             <dependency>