You are viewing a plain text version of this content. The canonical link for it is here.
Posted to scm@geronimo.apache.org by jl...@apache.org on 2006/04/01 02:03:27 UTC

svn commit: r390546 [2/2] - in /geronimo/trunk: ./ applications/ assemblies/ configs/ modules/ modules/activation/ modules/activemq-embedded-rar/ modules/axis-builder/ modules/axis/ modules/client-builder/ modules/client/ modules/common/ modules/connec...

Modified: geronimo/trunk/modules/webservices/pom.xml
URL: http://svn.apache.org/viewcvs/geronimo/trunk/modules/webservices/pom.xml?rev=390546&r1=390545&r2=390546&view=diff
==============================================================================
--- geronimo/trunk/modules/webservices/pom.xml (original)
+++ geronimo/trunk/modules/webservices/pom.xml Fri Mar 31 16:03:23 2006
@@ -21,30 +21,29 @@
 <project>
   <modelVersion>4.0.0</modelVersion>
   <parent>
-    <groupId>org.apache.geronimo</groupId>
-    <artifactId>geronimo</artifactId>
+    <groupId>org.apache.geronimo.modules</groupId>
+    <artifactId>modules-parent</artifactId>
     <version>1.2-SNAPSHOT</version>
   </parent>
-  <groupId>org.apache.geronimo</groupId>
   <artifactId>geronimo-webservices</artifactId>
   <version>${geronimoVersion}</version>
   <name>Geronimo :: Web Services</name>
   <description>Geronimo Web Services</description>
   <dependencies>
     <dependency>
-      <groupId>org.apache.geronimo</groupId>
+      <groupId>org.apache.geronimo.modules</groupId>
       <artifactId>geronimo-common</artifactId>
     </dependency>
     <dependency>
-      <groupId>org.apache.geronimo</groupId>
+      <groupId>org.apache.geronimo.modules</groupId>
       <artifactId>geronimo-kernel</artifactId>
     </dependency>
     <dependency>
-        <groupId>org.apache.geronimo</groupId>
+        <groupId>org.apache.geronimo.modules</groupId>
         <artifactId>geronimo-interceptor</artifactId>
     </dependency>
     <dependency>
-      <groupId>org.apache.geronimo</groupId>
+      <groupId>org.apache.geronimo.modules</groupId>
       <artifactId>geronimo-j2ee</artifactId>
     </dependency>
     <dependency>

Added: geronimo/trunk/plugins/pom.xml
URL: http://svn.apache.org/viewcvs/geronimo/trunk/plugins/pom.xml?rev=390546&view=auto
==============================================================================
--- geronimo/trunk/plugins/pom.xml (added)
+++ geronimo/trunk/plugins/pom.xml Fri Mar 31 16:03:23 2006
@@ -0,0 +1,36 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+  
+    Copyright 2006 The Apache Software Foundation
+    
+    Licensed under the Apache License, Version 2.0 (the "License");
+    you may not use this file except in compliance with the License.
+    You may obtain a copy of the License at
+    
+       http://www.apache.org/licenses/LICENSE-2.0
+    
+    Unless required by applicable law or agreed to in writing, software
+    distributed under the License is distributed on an "AS IS" BASIS,
+    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+    See the License for the specific language governing permissions and
+    limitations under the License.
+-->
+
+<!-- $Rev$ $Date$ -->
+
+<project>
+  <parent>
+    <groupId>org.apache.geronimo</groupId>
+    <artifactId>geronimo-parent</artifactId>
+    <version>1.2-SNAPSHOT</version>
+  </parent>
+
+  <modelVersion>4.0.0</modelVersion>
+  <groupId>org.apache.geronimo.plugins</groupId>
+  <artifactId>plugins-parent</artifactId>
+  <version>${geronimoVersion}</version>
+  <packaging>pom</packaging>
+  <name>Geronimo Plugins</name>
+  <description>Geronimo Plugins</description>
+
+</project>

Propchange: geronimo/trunk/plugins/pom.xml
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: geronimo/trunk/plugins/pom.xml
------------------------------------------------------------------------------
    svn:keywords = Date Rev

Propchange: geronimo/trunk/plugins/pom.xml
------------------------------------------------------------------------------
    svn:mime-type = text/xml

Modified: geronimo/trunk/pom.xml
URL: http://svn.apache.org/viewcvs/geronimo/trunk/pom.xml?rev=390546&r1=390545&r2=390546&view=diff
==============================================================================
--- geronimo/trunk/pom.xml (original)
+++ geronimo/trunk/pom.xml Fri Mar 31 16:03:23 2006
@@ -21,10 +21,10 @@
 <project>
   <modelVersion>4.0.0</modelVersion>
   <groupId>org.apache.geronimo</groupId>
-  <artifactId>geronimo</artifactId>
+  <artifactId>geronimo-parent</artifactId>
+  <version>1.2-SNAPSHOT</version>
   <packaging>pom</packaging>
   <name>Geronimo</name>
-  <version>1.2-SNAPSHOT</version>
   <description>Geronimo parent</description>
   <url>http://geronimo.apache.org</url>
 
@@ -127,7 +127,7 @@
       |
     -->
     <activeIoVersion>2.0-r118</activeIoVersion>
-    <activeMqVersion>3.2</activeMqVersion>
+    <activeMqVersion>4.0-SNAPSHOT</activeMqVersion>
     <antlrVersion>2.7.2</antlrVersion>
     <apachedsVersion>0.9.2</apachedsVersion>
     <asmVersion>1.4.3</asmVersion>
@@ -458,152 +458,152 @@
         |
       -->
       <dependency>
-        <groupId>org.apache.geronimo</groupId>
+        <groupId>org.apache.geronimo.modules</groupId>
         <artifactId>geronimo-activation</artifactId>
         <version>${geronimoVersion}</version>
       </dependency>
       <dependency>
-        <groupId>org.apache.geronimo</groupId>
+        <groupId>org.apache.geronimo.modules</groupId>
         <artifactId>geronimo-client</artifactId>
         <version>${geronimoVersion}</version>
       </dependency>
       <dependency>
-        <groupId>org.apache.geronimo</groupId>
+        <groupId>org.apache.geronimo.modules</groupId>
         <artifactId>geronimo-common</artifactId>
         <version>${geronimoVersion}</version>
       </dependency>
       <dependency>
-        <groupId>org.apache.geronimo</groupId>
+        <groupId>org.apache.geronimo.modules</groupId>
         <artifactId>geronimo-connector</artifactId>
         <version>${geronimoVersion}</version>
       </dependency>
       <dependency>
-        <groupId>org.apache.geronimo</groupId>
+        <groupId>org.apache.geronimo.modules</groupId>
         <artifactId>geronimo-connector-builder</artifactId>
         <version>${geronimoVersion}</version>
       </dependency>
       <dependency>
-        <groupId>org.apache.geronimo</groupId>
+        <groupId>org.apache.geronimo.modules</groupId>
         <artifactId>geronimo-core</artifactId>
         <version>${geronimoVersion}</version>
       </dependency>
       <dependency>
-        <groupId>org.apache.geronimo</groupId>
+        <groupId>org.apache.geronimo.modules</groupId>
         <artifactId>geronimo-deploy-config</artifactId>
         <version>${geronimoVersion}</version>
       </dependency>
       <dependency>
-        <groupId>org.apache.geronimo</groupId>
+        <groupId>org.apache.geronimo.modules</groupId>
         <artifactId>geronimo-deploy-jsr88</artifactId>
         <version>${geronimoVersion}</version>
       </dependency>
       <dependency>
-        <groupId>org.apache.geronimo</groupId>
+        <groupId>org.apache.geronimo.modules</groupId>
         <artifactId>geronimo-deploy-tool</artifactId>
         <version>${geronimoVersion}</version>
       </dependency>
       <dependency>
-        <groupId>org.apache.geronimo</groupId>
+        <groupId>org.apache.geronimo.modules</groupId>
         <artifactId>geronimo-deployment</artifactId>
         <version>${geronimoVersion}</version>
       </dependency>
       <dependency>
-        <groupId>org.apache.geronimo</groupId>
+        <groupId>org.apache.geronimo.modules</groupId>
         <artifactId>geronimo-derby</artifactId>
         <version>${geronimoVersion}</version>
       </dependency>
       <dependency>
-        <groupId>org.apache.geronimo</groupId>
+        <groupId>org.apache.geronimo.modules</groupId>
         <artifactId>geronimo-j2ee</artifactId>
         <version>${geronimoVersion}</version>
       </dependency>
       <dependency>
-        <groupId>org.apache.geronimo</groupId>
+        <groupId>org.apache.geronimo.modules</groupId>
         <artifactId>geronimo-j2ee-builder</artifactId>
         <version>${geronimoVersion}</version>
       </dependency>
       <dependency>
-        <groupId>org.apache.geronimo</groupId>
+        <groupId>org.apache.geronimo.modules</groupId>
         <artifactId>geronimo-j2ee-schema</artifactId>
         <version>${geronimoVersion}</version>
       </dependency>
       <dependency>
-        <groupId>org.apache.geronimo</groupId>
+        <groupId>org.apache.geronimo.modules</groupId>
         <artifactId>geronimo-kernel</artifactId>
         <version>${geronimoVersion}</version>
       </dependency>
       <dependency>
-        <groupId>org.apache.geronimo</groupId>
+        <groupId>org.apache.geronimo.modules</groupId>
         <artifactId>geronimo-interceptor</artifactId>
         <version>${geronimoVersion}</version>
       </dependency>
       <dependency>
-        <groupId>org.apache.geronimo</groupId>
+        <groupId>org.apache.geronimo.modules</groupId>
         <artifactId>geronimo-management</artifactId>
         <version>${geronimoVersion}</version>
       </dependency>
       <dependency>
-        <groupId>org.apache.geronimo</groupId>
+        <groupId>org.apache.geronimo.modules</groupId>
         <artifactId>geronimo-naming</artifactId>
         <version>${geronimoVersion}</version>
       </dependency>
       <dependency>
-        <groupId>org.apache.geronimo</groupId>
+        <groupId>org.apache.geronimo.modules</groupId>
         <artifactId>geronimo-naming-builder</artifactId>
         <version>${geronimoVersion}</version>
       </dependency>
       <dependency>
-        <groupId>org.apache.geronimo</groupId>
+        <groupId>org.apache.geronimo.modules</groupId>
         <artifactId>geronimo-security</artifactId>
         <version>${geronimoVersion}</version>
       </dependency>
       <dependency>
-        <groupId>org.apache.geronimo</groupId>
+        <groupId>org.apache.geronimo.modules</groupId>
         <artifactId>geronimo-security-builder</artifactId>
         <version>${geronimoVersion}</version>
       </dependency>
       <dependency>
-        <groupId>org.apache.geronimo</groupId>
+        <groupId>org.apache.geronimo.modules</groupId>
         <artifactId>geronimo-service-builder</artifactId>
         <version>${geronimoVersion}</version>
       </dependency>
       <dependency>
-        <groupId>org.apache.geronimo</groupId>
+        <groupId>org.apache.geronimo.modules</groupId>
         <artifactId>geronimo-system</artifactId>
         <version>${geronimoVersion}</version>
       </dependency>
       <dependency>
-        <groupId>org.apache.geronimo</groupId>
+        <groupId>org.apache.geronimo.modules</groupId>
         <artifactId>geronimo-test-ddbean</artifactId>
         <version>${geronimoVersion}</version>
       </dependency>
       <dependency>
-        <groupId>org.apache.geronimo</groupId>
+        <groupId>org.apache.geronimo.modules</groupId>
         <artifactId>geronimo-transaction</artifactId>
         <version>${geronimoVersion}</version>
       </dependency>
       <dependency>
-        <groupId>org.apache.geronimo</groupId>
+        <groupId>org.apache.geronimo.modules</groupId>
         <artifactId>geronimo-util</artifactId>
         <version>${geronimoVersion}</version>
       </dependency>
       <dependency>
-        <groupId>org.apache.geronimo</groupId>
+        <groupId>org.apache.geronimo.modules</groupId>
         <artifactId>geronimo-web-builder</artifactId>
         <version>${geronimoVersion}</version>
       </dependency>
       <dependency>
-        <groupId>org.apache.geronimo</groupId>
+        <groupId>org.apache.geronimo.modules</groupId>
         <artifactId>geronimo-webservices</artifactId>
         <version>${geronimoVersion}</version>
       </dependency>
       <dependency>
-        <groupId>org.apache.geronimo</groupId>
+        <groupId>org.apache.geronimo.modules</groupId>
         <artifactId>geronimo-axis</artifactId>
         <version>${geronimoVersion}</version>
       </dependency>
       <dependency>
-        <groupId>org.apache.geronimo</groupId>
+        <groupId>org.apache.geronimo.modules</groupId>
         <artifactId>geronimo-axis-builder</artifactId>
         <version>${geronimoVersion}</version>
       </dependency>
@@ -756,54 +756,11 @@
         <activeByDefault>true</activeByDefault>
       </activation>
       <modules>
-        <module>modules/activation</module>
-        <module>modules/activemq-embedded-rar</module>
-        <module>modules/axis</module>
-        <module>modules/axis-builder</module>
-        <module>modules/client</module>
-        <module>modules/client-builder</module>
-        <module>modules/common</module>
-        <module>modules/connector</module>
-        <module>modules/connector-builder</module>
-        <module>modules/converter</module>
-        <module>modules/core</module>
-        <module>modules/deploy-config</module>
-        <module>modules/deploy-jsr88</module>
-        <module>modules/deploy-tool</module>
-        <module>modules/deployment</module>
-        <module>modules/derby</module>
-        <module>modules/directory</module>
-        <module>modules/hot-deploy</module>
-        <module>modules/installer-processing</module>
-        <module>modules/installer-support</module>
-        <module>modules/interceptor</module>
-        <module>modules/j2ee</module>
-        <module>modules/j2ee-builder</module>
-        <module>modules/j2ee-schema</module>
-        <module>modules/jetty</module>
-        <module>modules/jetty-builder</module>
-        <module>modules/javamail-transport</module>
-        <module>modules/jmx-remoting</module>
-        <module>modules/kernel</module>
-        <module>modules/management</module>
-        <module>modules/mail</module>
-        <module>modules/naming</module>
-        <module>modules/naming-builder</module>
-        <module>modules/scripts</module>
-        <module>modules/security</module>
-        <module>modules/security-builder</module>
-        <module>modules/service-builder</module>
-        <module>modules/session</module>
-        <module>modules/spring</module>
-        <module>modules/system</module>
-        <module>modules/test-ddbean</module>
-        <module>modules/timer</module>
-        <module>modules/tomcat</module>
-        <module>modules/tomcat-builder</module>
-        <module>modules/transaction</module>
-        <module>modules/util</module>
-        <module>modules/web-builder</module>
-        <module>modules/webservices</module>
+        <module>plugins</module>
+        <module>modules</module>
+        <module>configs</module>
+        <module>applications</module>
+        <module>assemblies</module>
       </modules>
     </profile>
     <profile>