You are viewing a plain text version of this content. The canonical link for it is here.
Posted to scm@geronimo.apache.org by li...@apache.org on 2008/10/07 21:19:11 UTC
svn commit: r702591 - in /geronimo/server/trunk/plugingroups: ./
javaee5-jetty/ javaee5-jetty/src/main/history/ javaee5-tomcat/
javaee5-tomcat/src/main/history/ persistence/ web-jetty/ web-tomcat/
webservices-axis2/ webservices-cxf/
Author: linsun
Date: Tue Oct 7 12:19:10 2008
New Revision: 702591
URL: http://svn.apache.org/viewvc?rev=702591&view=rev
Log:
some modification to the javaee5 plugin groups and some format changes
Modified:
geronimo/server/trunk/plugingroups/javaee5-jetty/pom.xml
geronimo/server/trunk/plugingroups/javaee5-jetty/src/main/history/dependencies.xml
geronimo/server/trunk/plugingroups/javaee5-tomcat/pom.xml
geronimo/server/trunk/plugingroups/javaee5-tomcat/src/main/history/dependencies.xml
geronimo/server/trunk/plugingroups/persistence/pom.xml
geronimo/server/trunk/plugingroups/pom.xml
geronimo/server/trunk/plugingroups/web-jetty/pom.xml
geronimo/server/trunk/plugingroups/web-tomcat/pom.xml
geronimo/server/trunk/plugingroups/webservices-axis2/pom.xml
geronimo/server/trunk/plugingroups/webservices-cxf/pom.xml
Modified: geronimo/server/trunk/plugingroups/javaee5-jetty/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/plugingroups/javaee5-jetty/pom.xml?rev=702591&r1=702590&r2=702591&view=diff
==============================================================================
--- geronimo/server/trunk/plugingroups/javaee5-jetty/pom.xml (original)
+++ geronimo/server/trunk/plugingroups/javaee5-jetty/pom.xml Tue Oct 7 12:19:10 2008
@@ -31,10 +31,10 @@
<artifactId>javaee5-jetty</artifactId>
<packaging>car</packaging>
- <name>Geronimo Plugin Group :: JavaEE 5 Tomcat</name>
+ <name>Geronimo Plugin Group :: JavaEE 5 Jetty</name>
<description>
- This plugin group provides JavaEE 5 Tomcat functionality.
+ This plugin group provides JavaEE 5 Jetty functionality.
</description>
<dependencies>
@@ -55,6 +55,13 @@
<dependency>
<groupId>org.apache.geronimo.plugingroups</groupId>
+ <artifactId>console-jetty</artifactId>
+ <version>${version}</version>
+ <type>car</type>
+ </dependency>
+
+ <dependency>
+ <groupId>org.apache.geronimo.plugingroups</groupId>
<artifactId>ejb</artifactId>
<version>${version}</version>
<type>car</type>
@@ -125,6 +132,20 @@
</dependency>
<dependency>
+ <groupId>org.apache.geronimo.configs</groupId>
+ <artifactId>uddi-jetty6</artifactId>
+ <version>${version}</version>
+ <type>car</type>
+ </dependency>
+
+ <dependency>
+ <groupId>org.apache.geronimo.configs</groupId>
+ <artifactId>welcome-jetty</artifactId>
+ <version>${version}</version>
+ <type>car</type>
+ </dependency>
+
+ <dependency>
<groupId>org.apache.geronimo.framework</groupId>
<artifactId>jmx-security</artifactId>
<version>${version}</version>
@@ -133,7 +154,7 @@
<dependency>
<groupId>org.apache.geronimo.plugins</groupId>
- <artifactId>debugviews-console-tomcat</artifactId>
+ <artifactId>debugviews-console-jetty</artifactId>
<version>${version}</version>
<type>car</type>
</dependency>
Modified: geronimo/server/trunk/plugingroups/javaee5-jetty/src/main/history/dependencies.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/plugingroups/javaee5-jetty/src/main/history/dependencies.xml?rev=702591&r1=702590&r2=702591&view=diff
==============================================================================
--- geronimo/server/trunk/plugingroups/javaee5-jetty/src/main/history/dependencies.xml (original)
+++ geronimo/server/trunk/plugingroups/javaee5-jetty/src/main/history/dependencies.xml Tue Oct 7 12:19:10 2008
@@ -2,7 +2,7 @@
<plugin-artifact xmlns:ns2="http://geronimo.apache.org/xml/ns/attributes-1.2" xmlns="http://geronimo.apache.org/xml/ns/plugins-1.3">
<module-id>
<groupId>org.apache.geronimo.plugingroups</groupId>
- <artifactId>tomcat-javaee5</artifactId>
+ <artifactId>javaee5-jetty</artifactId>
<version>2.2-SNAPSHOT</version>
<type>car</type>
</module-id>
@@ -12,6 +12,11 @@
<type>car</type>
</dependency>
<dependency>
+ <groupId>org.apache.geronimo.configs</groupId>
+ <artifactId>uddi-jetty6</artifactId>
+ <type>car</type>
+ </dependency>
+ <dependency>
<groupId>org.apache.geronimo.plugingroups</groupId>
<artifactId>persistence</artifactId>
<type>car</type>
@@ -22,6 +27,11 @@
<type>car</type>
</dependency>
<dependency>
+ <groupId>org.apache.geronimo.plugins</groupId>
+ <artifactId>debugviews-console-jetty</artifactId>
+ <type>car</type>
+ </dependency>
+ <dependency>
<groupId>org.apache.geronimo.plugingroups</groupId>
<artifactId>client</artifactId>
<type>car</type>
@@ -32,11 +42,6 @@
<type>car</type>
</dependency>
<dependency>
- <groupId>org.apache.geronimo.plugins</groupId>
- <artifactId>debugviews-console-tomcat</artifactId>
- <type>car</type>
- </dependency>
- <dependency>
<groupId>org.apache.geronimo.framework</groupId>
<artifactId>jmx-security</artifactId>
<type>car</type>
@@ -58,11 +63,21 @@
</dependency>
<dependency>
<groupId>org.apache.geronimo.configs</groupId>
+ <artifactId>welcome-jetty</artifactId>
+ <type>car</type>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.geronimo.configs</groupId>
<artifactId>javamail</artifactId>
<type>car</type>
</dependency>
<dependency>
<groupId>org.apache.geronimo.plugingroups</groupId>
+ <artifactId>console-jetty</artifactId>
+ <type>car</type>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.geronimo.plugingroups</groupId>
<artifactId>webservices-axis2</artifactId>
<type>car</type>
</dependency>
Modified: geronimo/server/trunk/plugingroups/javaee5-tomcat/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/plugingroups/javaee5-tomcat/pom.xml?rev=702591&r1=702590&r2=702591&view=diff
==============================================================================
--- geronimo/server/trunk/plugingroups/javaee5-tomcat/pom.xml (original)
+++ geronimo/server/trunk/plugingroups/javaee5-tomcat/pom.xml Tue Oct 7 12:19:10 2008
@@ -55,6 +55,13 @@
<dependency>
<groupId>org.apache.geronimo.plugingroups</groupId>
+ <artifactId>console-tomcat</artifactId>
+ <version>${version}</version>
+ <type>car</type>
+ </dependency>
+
+ <dependency>
+ <groupId>org.apache.geronimo.plugingroups</groupId>
<artifactId>ejb</artifactId>
<version>${version}</version>
<type>car</type>
@@ -125,17 +132,25 @@
</dependency>
<dependency>
- <groupId>org.apache.geronimo.framework</groupId>
- <artifactId>jmx-security</artifactId>
+ <groupId>org.apache.geronimo.configs</groupId>
+ <artifactId>uddi-tomcat</artifactId>
<version>${version}</version>
<type>car</type>
</dependency>
<dependency>
- <groupId>org.apache.geronimo.plugins</groupId>
- <artifactId>debugviews-console-tomcat</artifactId>
+ <groupId>org.apache.geronimo.configs</groupId>
+ <artifactId>welcome-tomcat</artifactId>
<version>${version}</version>
<type>car</type>
</dependency>
+
+ <dependency>
+ <groupId>org.apache.geronimo.framework</groupId>
+ <artifactId>jmx-security</artifactId>
+ <version>${version}</version>
+ <type>car</type>
+ </dependency>
+
</dependencies>
</project>
Modified: geronimo/server/trunk/plugingroups/javaee5-tomcat/src/main/history/dependencies.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/plugingroups/javaee5-tomcat/src/main/history/dependencies.xml?rev=702591&r1=702590&r2=702591&view=diff
==============================================================================
--- geronimo/server/trunk/plugingroups/javaee5-tomcat/src/main/history/dependencies.xml (original)
+++ geronimo/server/trunk/plugingroups/javaee5-tomcat/src/main/history/dependencies.xml Tue Oct 7 12:19:10 2008
@@ -2,12 +2,17 @@
<plugin-artifact xmlns:ns2="http://geronimo.apache.org/xml/ns/attributes-1.2" xmlns="http://geronimo.apache.org/xml/ns/plugins-1.3">
<module-id>
<groupId>org.apache.geronimo.plugingroups</groupId>
- <artifactId>tomcat-javaee5</artifactId>
+ <artifactId>javaee5-tomcat</artifactId>
<version>2.2-SNAPSHOT</version>
<type>car</type>
</module-id>
<dependency>
<groupId>org.apache.geronimo.plugingroups</groupId>
+ <artifactId>console-tomcat</artifactId>
+ <type>car</type>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.geronimo.plugingroups</groupId>
<artifactId>webservices-cxf</artifactId>
<type>car</type>
</dependency>
@@ -17,6 +22,11 @@
<type>car</type>
</dependency>
<dependency>
+ <groupId>org.apache.geronimo.configs</groupId>
+ <artifactId>uddi-tomcat</artifactId>
+ <type>car</type>
+ </dependency>
+ <dependency>
<groupId>org.apache.geronimo.plugingroups</groupId>
<artifactId>clustering-tomcat</artifactId>
<type>car</type>
@@ -37,11 +47,6 @@
<type>car</type>
</dependency>
<dependency>
- <groupId>org.apache.geronimo.plugins</groupId>
- <artifactId>debugviews-console-tomcat</artifactId>
- <type>car</type>
- </dependency>
- <dependency>
<groupId>org.apache.geronimo.framework</groupId>
<artifactId>jmx-security</artifactId>
<type>car</type>
@@ -67,6 +72,11 @@
<type>car</type>
</dependency>
<dependency>
+ <groupId>org.apache.geronimo.configs</groupId>
+ <artifactId>welcome-tomcat</artifactId>
+ <type>car</type>
+ </dependency>
+ <dependency>
<groupId>org.apache.geronimo.plugingroups</groupId>
<artifactId>ejb</artifactId>
<type>car</type>
Modified: geronimo/server/trunk/plugingroups/persistence/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/plugingroups/persistence/pom.xml?rev=702591&r1=702590&r2=702591&view=diff
==============================================================================
--- geronimo/server/trunk/plugingroups/persistence/pom.xml (original)
+++ geronimo/server/trunk/plugingroups/persistence/pom.xml Tue Oct 7 12:19:10 2008
@@ -51,6 +51,6 @@
<version>${version}</version>
<type>car</type>
</dependency>
-</dependencies>
+ </dependencies>
</project>
Modified: geronimo/server/trunk/plugingroups/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/plugingroups/pom.xml?rev=702591&r1=702590&r2=702591&view=diff
==============================================================================
--- geronimo/server/trunk/plugingroups/pom.xml (original)
+++ geronimo/server/trunk/plugingroups/pom.xml Tue Oct 7 12:19:10 2008
@@ -34,6 +34,8 @@
<module>clustering</module>
<module>clustering-jetty</module>
<module>clustering-tomcat</module>
+ <module>console-jetty</module>
+ <module>console-tomcat</module>
<module>ejb</module>
<module>framework</module>
<module>javaee5-jetty</module>
Modified: geronimo/server/trunk/plugingroups/web-jetty/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/plugingroups/web-jetty/pom.xml?rev=702591&r1=702590&r2=702591&view=diff
==============================================================================
--- geronimo/server/trunk/plugingroups/web-jetty/pom.xml (original)
+++ geronimo/server/trunk/plugingroups/web-jetty/pom.xml Tue Oct 7 12:19:10 2008
@@ -44,7 +44,6 @@
<version>${version}</version>
<type>car</type>
</dependency>
-
<dependency>
<groupId>org.apache.geronimo.framework</groupId>
<artifactId>upgrade-cli</artifactId>
@@ -118,7 +117,6 @@
<version>${version}</version>
<type>car</type>
</dependency>
-
-</dependencies>
+ </dependencies>
</project>
Modified: geronimo/server/trunk/plugingroups/web-tomcat/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/plugingroups/web-tomcat/pom.xml?rev=702591&r1=702590&r2=702591&view=diff
==============================================================================
--- geronimo/server/trunk/plugingroups/web-tomcat/pom.xml (original)
+++ geronimo/server/trunk/plugingroups/web-tomcat/pom.xml Tue Oct 7 12:19:10 2008
@@ -44,7 +44,6 @@
<version>${version}</version>
<type>car</type>
</dependency>
-
<dependency>
<groupId>org.apache.geronimo.framework</groupId>
<artifactId>upgrade-cli</artifactId>
@@ -118,7 +117,6 @@
<version>${version}</version>
<type>car</type>
</dependency>
-
-</dependencies>
+ </dependencies>
</project>
Modified: geronimo/server/trunk/plugingroups/webservices-axis2/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/plugingroups/webservices-axis2/pom.xml?rev=702591&r1=702590&r2=702591&view=diff
==============================================================================
--- geronimo/server/trunk/plugingroups/webservices-axis2/pom.xml (original)
+++ geronimo/server/trunk/plugingroups/webservices-axis2/pom.xml Tue Oct 7 12:19:10 2008
@@ -65,6 +65,6 @@
<version>${version}</version>
<type>jar</type>
</dependency>
-</dependencies>
+ </dependencies>
</project>
Modified: geronimo/server/trunk/plugingroups/webservices-cxf/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/plugingroups/webservices-cxf/pom.xml?rev=702591&r1=702590&r2=702591&view=diff
==============================================================================
--- geronimo/server/trunk/plugingroups/webservices-cxf/pom.xml (original)
+++ geronimo/server/trunk/plugingroups/webservices-cxf/pom.xml Tue Oct 7 12:19:10 2008
@@ -65,6 +65,6 @@
<version>${version}</version>
<type>jar</type>
</dependency>
-</dependencies>
+ </dependencies>
</project>