geronimo-scm mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From pmcma...@apache.org
Subject svn commit: r572777 - in /geronimo/plugins/console/trunk: ./ console-base-portlets/ console-jetty/ console-jetty/src/main/plan/ console-jetty/src/main/resources/ console-jetty/src/plan/ console-tomcat/ console-tomcat/src/main/plan/ console-tomcat/src/m...
Date Tue, 04 Sep 2007 19:23:01 GMT
Author: pmcmahan
Date: Tue Sep  4 12:23:00 2007
New Revision: 572777

URL: http://svn.apache.org/viewvc?rev=572777&view=rev
Log:
GERONIMO-3413 use the car maven plugin to generate the geronimo-plugin.xml for the admin console
remove some unneeded pom entries


Added:
    geronimo/plugins/console/trunk/console-jetty/src/main/plan/
      - copied from r568727, geronimo/plugins/console/trunk/console-jetty/src/plan/
    geronimo/plugins/console/trunk/console-jetty/src/main/plan/plan.xml
      - copied unchanged from r572776, geronimo/plugins/console/trunk/console-jetty/src/plan/plan.xml
    geronimo/plugins/console/trunk/console-tomcat/src/main/plan/
      - copied from r568727, geronimo/plugins/console/trunk/console-tomcat/src/plan/
    geronimo/plugins/console/trunk/console-tomcat/src/main/plan/plan.xml
      - copied unchanged from r572776, geronimo/plugins/console/trunk/console-tomcat/src/plan/plan.xml
Removed:
    geronimo/plugins/console/trunk/console-jetty/src/main/resources/
    geronimo/plugins/console/trunk/console-jetty/src/plan/
    geronimo/plugins/console/trunk/console-tomcat/src/main/resources/
    geronimo/plugins/console/trunk/console-tomcat/src/plan/
Modified:
    geronimo/plugins/console/trunk/console-base-portlets/pom.xml
    geronimo/plugins/console/trunk/console-jetty/pom.xml
    geronimo/plugins/console/trunk/console-tomcat/pom.xml
    geronimo/plugins/console/trunk/pom.xml

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=572777&r1=572776&r2=572777&view=diff
==============================================================================
--- geronimo/plugins/console/trunk/console-base-portlets/pom.xml (original)
+++ geronimo/plugins/console/trunk/console-base-portlets/pom.xml Tue Sep  4 12:23:00 2007
@@ -79,12 +79,6 @@
         </dependency>
         
         <dependency>
-            <groupId>commons-digester</groupId>
-            <artifactId>commons-digester</artifactId>
-            <scope>provided</scope>
-        </dependency>
-        
-        <dependency>
             <groupId>commons-io</groupId>
             <artifactId>commons-io</artifactId>
         </dependency>

Modified: geronimo/plugins/console/trunk/console-jetty/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/plugins/console/trunk/console-jetty/pom.xml?rev=572777&r1=572776&r2=572777&view=diff
==============================================================================
--- geronimo/plugins/console/trunk/console-jetty/pom.xml (original)
+++ geronimo/plugins/console/trunk/console-jetty/pom.xml Tue Sep  4 12:23:00 2007
@@ -42,26 +42,22 @@
             <version>${version}</version>
             <type>ear</type>
         </dependency>
-
         <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>
             <type>car</type>
         </dependency>
-
 	<dependency>
             <groupId>org.apache.geronimo.modules</groupId>
             <artifactId>geronimo-deploy-jsr88</artifactId>
         </dependency>
-
-	<dependency>
+        <dependency>
             <groupId>org.apache.geronimo.configs</groupId>
             <artifactId>j2ee-security</artifactId>
             <type>car</type>
@@ -88,11 +84,83 @@
                         <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>
+                    <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>
+                    <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/console/trunk/console-tomcat/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/plugins/console/trunk/console-tomcat/pom.xml?rev=572777&r1=572776&r2=572777&view=diff
==============================================================================
--- geronimo/plugins/console/trunk/console-tomcat/pom.xml (original)
+++ geronimo/plugins/console/trunk/console-tomcat/pom.xml Tue Sep  4 12:23:00 2007
@@ -42,26 +42,22 @@
             <version>${version}</version>
             <type>ear</type>
         </dependency>
-
         <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>
             <type>car</type>
         </dependency>
-
 	<dependency>
             <groupId>org.apache.geronimo.modules</groupId>
             <artifactId>geronimo-deploy-jsr88</artifactId>
         </dependency>
-
-	<dependency>
+        <dependency>
             <groupId>org.apache.geronimo.configs</groupId>
             <artifactId>j2ee-security</artifactId>
             <type>car</type>
@@ -88,11 +84,83 @@
                         <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>
+                    <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>
+                    <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/console/trunk/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/plugins/console/trunk/pom.xml?rev=572777&r1=572776&r2=572777&view=diff
==============================================================================
--- geronimo/plugins/console/trunk/pom.xml (original)
+++ geronimo/plugins/console/trunk/pom.xml Tue Sep  4 12:23:00 2007
@@ -55,10 +55,15 @@
               as the maven-release-plugin will not update this value.
         -->
         <version>1.0-SNAPSHOT</version>
+        <activemqVersion>4.1.1</activemqVersion>
+        <commonsFileUploadVersion>1.1.1</commonsFileUploadVersion>
+        <commonsIoVersion>1.1</commonsIoVersion>
+        <dwrVersion>2.0.1</dwrVersion>
+        <geronimoJmsSpecVersion>1.1</geronimoJmsSpecVersion>
+        <geronimoServletSpecVersion>1.1</geronimoServletSpecVersion>
         <geronimoVersion>2.1-SNAPSHOT</geronimoVersion>
-        <junitVersion>3.8.2</junitVersion>
         <plutoVersion>1.2.0-SNAPSHOT</plutoVersion>
-        <springVersion>2.0.2</springVersion>
+        <portletApiVersion>1.0</portletApiVersion>
 
         <!-- deployers needed to create the CAR files -->
         <gbeanDeployer>org.apache.geronimo.configs/geronimo-gbean-deployer/${geronimoVersion}/car</gbeanDeployer>
@@ -172,64 +177,9 @@
             </dependency>
 
             <dependency>
-                <artifactId>junit</artifactId>
-                <groupId>junit</groupId>
-                <version>${junitVersion}</version>
-            </dependency>
-
-            <dependency>
-                <groupId>org.apache.pluto</groupId>
-                <artifactId>pluto-container</artifactId>
-                <version>${plutoVersion}</version>
-            </dependency>
-
-            <dependency>
-                <groupId>org.apache.pluto</groupId>
-                <artifactId>pluto-taglib</artifactId>
-                <version>${plutoVersion}</version>
-            </dependency>
-
-            <dependency>
                 <groupId>javax.portlet</groupId>
                 <artifactId>portlet-api</artifactId>
-                <version>1.0</version>
-            </dependency>
-
-            <dependency>
-                <groupId>commons-digester</groupId>
-                <artifactId>commons-digester</artifactId>
-                <version>1.8</version>
-            </dependency>
-
-            <dependency>
-                <groupId>commons-beanutils</groupId>
-                <artifactId>commons-beanutils</artifactId>
-                <version>1.7.0</version>
-            </dependency>
-
-            <dependency>
-                <groupId>commons-logging</groupId>
-                <artifactId>commons-logging-api</artifactId>
-                <version>1.0.4</version>
-            </dependency>
-
-            <dependency>
-                <groupId>org.apache.pluto</groupId>
-                <artifactId>pluto-descriptor-impl</artifactId>
-                <version>${plutoVersion}</version>
-            </dependency>
-
-            <dependency>
-                <groupId>org.apache.pluto</groupId>
-                <artifactId>pluto-descriptor-api</artifactId>
-                <version>${plutoVersion}</version>
-            </dependency>
-
-            <dependency>
-                <groupId>org.apache.geronimo.configs</groupId>
-                <artifactId>jee-specs</artifactId>
-                <version>${geronimoVersion}</version>
-                <type>car</type>
+                <version>${portletApiVersion}</version>
             </dependency>
 
             <dependency>
@@ -266,73 +216,37 @@
             <dependency>
                 <groupId>org.apache.geronimo.specs</groupId>
                 <artifactId>geronimo-jms_1.1_spec</artifactId>
-                <version>1.1</version>
-            </dependency>
-
-            <dependency>
-                <groupId>org.codehaus.castor</groupId>
-                <artifactId>castor</artifactId>
-                <version>1.1.1</version>
+                <version>${geronimoJmsSpecVersion}</version>
             </dependency>
 
             <dependency>
                 <groupId>commons-io</groupId>
                 <artifactId>commons-io</artifactId>
-                <version>1.1</version>
-            </dependency>
-
-            <dependency>
-                <groupId>commons-collections</groupId>
-                <artifactId>commons-collections</artifactId>
-                <version>3.1</version>
+                <version>${commonsIoVersion}</version>
             </dependency>
 
             <dependency>
                 <groupId>org.apache.geronimo.specs</groupId>
                 <artifactId>geronimo-servlet_2.5_spec</artifactId>
-                <version>1.1-SNAPSHOT</version>
+                <version>${geronimoServletSpecVersion}</version>
             </dependency>
 
             <dependency>
                 <groupId>org.apache.activemq</groupId>
                 <artifactId>activemq-core</artifactId>
-                <version>4.1.1</version>
+                <version>${activemqVersion}</version>
             </dependency>
 
             <dependency>
                 <groupId>commons-fileupload</groupId>
                 <artifactId>commons-fileupload</artifactId>
-                <version>1.1.1</version>
+                <version>${commonsFileUploadVersion}</version>
             </dependency>
 
            <dependency>
                 <groupId>org.directwebremoting</groupId>
                 <artifactId>dwr</artifactId>
-                <version>2.0.1</version>
-            </dependency>
-
-            <dependency>
-                <groupId>org.springframework</groupId>
-                <artifactId>spring-beans</artifactId>
-                <version>${springVersion}</version>
-            </dependency>
-
-            <dependency>
-                <groupId>org.springframework</groupId>
-                <artifactId>spring-context</artifactId>
-                <version>${springVersion}</version>
-            </dependency>
-
-            <dependency>
-                <groupId>org.springframework</groupId>
-                <artifactId>spring-core</artifactId>
-                <version>${springVersion}</version>
-            </dependency>
-
-            <dependency>
-                <groupId>org.springframework</groupId>
-                <artifactId>spring-web</artifactId>
-                <version>${springVersion}</version>
+                <version>${dwrVersion}</version>
             </dependency>
 
             <dependency>
@@ -375,12 +289,6 @@
             <dependency>
                 <groupId>org.apache.geronimo.modules</groupId>
                 <artifactId>geronimo-security-builder</artifactId>
-                <version>${geronimoVersion}</version>
-            </dependency>
-
-            <dependency>
-                <groupId>org.apache.geronimo.modules</groupId>
-                <artifactId>geronimo-connector-builder</artifactId>
                 <version>${geronimoVersion}</version>
             </dependency>
 



Mime
View raw message