geronimo-scm mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From jdil...@apache.org
Subject svn commit: r614375 - in /geronimo/server/trunk: ./ assemblies/geronimo-boilerplate-minimal/ assemblies/geronimo-boilerplate-minimal/src/main/assembly/ components/ framework/configs/ framework/configs/transformer-agent/ framework/configs/transformer-ag...
Date Tue, 22 Jan 2008 23:34:46 GMT
Author: jdillon
Date: Tue Jan 22 15:34:28 2008
New Revision: 614375

URL: http://svn.apache.org/viewvc?rev=614375&view=rev
Log:
(GERONIMO-3747) Moved muck from components/* to more appropriate locations

Added:
    geronimo/server/trunk/framework/configs/transformer-agent/
      - copied from r614365, geronimo/server/trunk/components/transformer-agent/
    geronimo/server/trunk/framework/configs/transformer-agent/LICENSE.txt
      - copied unchanged from r614374, geronimo/server/trunk/components/transformer-agent/LICENSE.txt
    geronimo/server/trunk/framework/configs/transformer-agent/NOTICE.txt
      - copied unchanged from r614374, geronimo/server/trunk/components/transformer-agent/NOTICE.txt
    geronimo/server/trunk/framework/configs/transformer-agent/pom.xml
      - copied, changed from r614374, geronimo/server/trunk/components/transformer-agent/pom.xml
    geronimo/server/trunk/framework/configs/transformer-agent/src/
      - copied from r614374, geronimo/server/trunk/components/transformer-agent/src/
    geronimo/server/trunk/framework/configs/upgrade/
      - copied from r614365, geronimo/server/trunk/components/upgrade/
    geronimo/server/trunk/framework/configs/upgrade/LICENSE.txt
      - copied unchanged from r614374, geronimo/server/trunk/components/upgrade/LICENSE.txt
    geronimo/server/trunk/framework/configs/upgrade/NOTICE.txt
      - copied unchanged from r614374, geronimo/server/trunk/components/upgrade/NOTICE.txt
    geronimo/server/trunk/framework/configs/upgrade/pom.xml
      - copied, changed from r614374, geronimo/server/trunk/components/upgrade/pom.xml
    geronimo/server/trunk/framework/configs/upgrade/src/
      - copied from r614374, geronimo/server/trunk/components/upgrade/src/
    geronimo/server/trunk/plugins/spring/
      - copied from r614365, geronimo/server/trunk/components/spring/
    geronimo/server/trunk/plugins/spring/LICENSE.txt
      - copied unchanged from r614374, geronimo/server/trunk/components/spring/LICENSE.txt
    geronimo/server/trunk/plugins/spring/NOTICE.txt
      - copied unchanged from r614374, geronimo/server/trunk/components/spring/NOTICE.txt
    geronimo/server/trunk/plugins/spring/pom.xml
      - copied, changed from r614374, geronimo/server/trunk/components/spring/pom.xml
    geronimo/server/trunk/plugins/spring/src/
      - copied from r614374, geronimo/server/trunk/components/spring/src/
Removed:
    geronimo/server/trunk/components/
Modified:
    geronimo/server/trunk/assemblies/geronimo-boilerplate-minimal/pom.xml
    geronimo/server/trunk/assemblies/geronimo-boilerplate-minimal/src/main/assembly/boilerplate.xml
    geronimo/server/trunk/framework/configs/pom.xml
    geronimo/server/trunk/framework/modules/geronimo-system/src/test/java/org/apache/geronimo/system/configuration/LocalAttributeManagerReadWriteTest.java
    geronimo/server/trunk/plugins/pom.xml
    geronimo/server/trunk/pom.xml

Modified: geronimo/server/trunk/assemblies/geronimo-boilerplate-minimal/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/assemblies/geronimo-boilerplate-minimal/pom.xml?rev=614375&r1=614374&r2=614375&view=diff
==============================================================================
--- geronimo/server/trunk/assemblies/geronimo-boilerplate-minimal/pom.xml (original)
+++ geronimo/server/trunk/assemblies/geronimo-boilerplate-minimal/pom.xml Tue Jan 22 15:34:28
2008
@@ -231,7 +231,7 @@
         </dependency>
 
         <dependency>
-            <groupId>org.apache.geronimo.configs</groupId>
+            <groupId>org.apache.geronimo.framework</groupId>
             <artifactId>transformer-agent</artifactId>
             <version>${version}</version>
             <type>car</type>

Modified: geronimo/server/trunk/assemblies/geronimo-boilerplate-minimal/src/main/assembly/boilerplate.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/assemblies/geronimo-boilerplate-minimal/src/main/assembly/boilerplate.xml?rev=614375&r1=614374&r2=614375&view=diff
==============================================================================
--- geronimo/server/trunk/assemblies/geronimo-boilerplate-minimal/src/main/assembly/boilerplate.xml
(original)
+++ geronimo/server/trunk/assemblies/geronimo-boilerplate-minimal/src/main/assembly/boilerplate.xml
Tue Jan 22 15:34:28 2008
@@ -117,7 +117,7 @@
             <outputFileNameMapping>jpa.jar</outputFileNameMapping>
             <useStrictFiltering>true</useStrictFiltering>
             <includes>
-                <include>org.apache.geronimo.configs:transformer-agent</include>
+                <include>org.apache.geronimo.framework:transformer-agent</include>
             </includes>
         </dependencySet>
 

Modified: geronimo/server/trunk/framework/configs/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/framework/configs/pom.xml?rev=614375&r1=614374&r2=614375&view=diff
==============================================================================
--- geronimo/server/trunk/framework/configs/pom.xml (original)
+++ geronimo/server/trunk/framework/configs/pom.xml Tue Jan 22 15:34:28 2008
@@ -49,6 +49,8 @@
         <module>server-security-config</module>
         <module>shutdown</module>
         <module>upgrade-cli</module>
+        <module>upgrade</module>
+        <module>transformer-agent</module>
     </modules>
     
     <build>

Copied: geronimo/server/trunk/framework/configs/transformer-agent/pom.xml (from r614374, geronimo/server/trunk/components/transformer-agent/pom.xml)
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/framework/configs/transformer-agent/pom.xml?p2=geronimo/server/trunk/framework/configs/transformer-agent/pom.xml&p1=geronimo/server/trunk/components/transformer-agent/pom.xml&r1=614374&r2=614375&rev=614375&view=diff
==============================================================================
--- geronimo/server/trunk/components/transformer-agent/pom.xml (original)
+++ geronimo/server/trunk/framework/configs/transformer-agent/pom.xml Tue Jan 22 15:34:28
2008
@@ -23,14 +23,13 @@
     <modelVersion>4.0.0</modelVersion>
     
     <parent>
-        <groupId>org.apache.geronimo.components</groupId>
-        <artifactId>components</artifactId>
+        <groupId>org.apache.geronimo.framework</groupId>
+        <artifactId>configs</artifactId>
         <version>2.1-SNAPSHOT</version>
     </parent>
     
-    <groupId>org.apache.geronimo.configs</groupId>
     <artifactId>transformer-agent</artifactId>
-    <name>Geronimo Components :: Transformer Agent</name>
+    <name>Geronimo Framework, Configs :: Transformer Agent</name>
     <packaging>car</packaging>
 
     <description>Geronimo class transformer registry agent.</description>
@@ -76,7 +75,6 @@
                         <value>true</value>
                         <includeVersion>true</includeVersion>
                     </useMavenDependencies>
-                    
                 </configuration>
             </plugin>
         </plugins>

Copied: geronimo/server/trunk/framework/configs/upgrade/pom.xml (from r614374, geronimo/server/trunk/components/upgrade/pom.xml)
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/framework/configs/upgrade/pom.xml?p2=geronimo/server/trunk/framework/configs/upgrade/pom.xml&p1=geronimo/server/trunk/components/upgrade/pom.xml&r1=614374&r2=614375&rev=614375&view=diff
==============================================================================
--- geronimo/server/trunk/components/upgrade/pom.xml (original)
+++ geronimo/server/trunk/framework/configs/upgrade/pom.xml Tue Jan 22 15:34:28 2008
@@ -21,16 +21,15 @@
 <project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
 
     <modelVersion>4.0.0</modelVersion>
-
+    
     <parent>
-        <groupId>org.apache.geronimo.components</groupId>
-        <artifactId>components</artifactId>
+        <groupId>org.apache.geronimo.framework</groupId>
+        <artifactId>configs</artifactId>
         <version>2.1-SNAPSHOT</version>
     </parent>
     
-    <groupId>org.apache.geronimo.configs</groupId>
     <artifactId>upgrade</artifactId>
-    <name>Geronimo Components :: Plan Upgrade</name>
+    <name>Geronimo Framework, Configs :: Plan Upgrade</name>
     <packaging>car</packaging>
     
     <dependencies>

Modified: geronimo/server/trunk/framework/modules/geronimo-system/src/test/java/org/apache/geronimo/system/configuration/LocalAttributeManagerReadWriteTest.java
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/framework/modules/geronimo-system/src/test/java/org/apache/geronimo/system/configuration/LocalAttributeManagerReadWriteTest.java?rev=614375&r1=614374&r2=614375&view=diff
==============================================================================
--- geronimo/server/trunk/framework/modules/geronimo-system/src/test/java/org/apache/geronimo/system/configuration/LocalAttributeManagerReadWriteTest.java
(original)
+++ geronimo/server/trunk/framework/modules/geronimo-system/src/test/java/org/apache/geronimo/system/configuration/LocalAttributeManagerReadWriteTest.java
Tue Jan 22 15:34:28 2008
@@ -161,7 +161,7 @@
                     "    <ns2:module name=\"org.apache.geronimo.plugins/console-jetty/2.1-SNAPSHOT/car\"/>\n"
+
                     "    <ns2:module name=\"org.apache.geronimo.plugins/pluto-support/2.1-SNAPSHOT/car\"/>\n"
+
                     "    <ns2:module name=\"org.apache.geronimo.configs/spring/2.1-SNAPSHOT/car\"/>\n"
+
-                    "    <ns2:module name=\"org.apache.geronimo.configs/transformer-agent/2.1-SNAPSHOT/car\"/>\n"
+
+                    "    <ns2:module name=\"org.apache.geronimo.framework/transformer-agent/2.1-SNAPSHOT/car\"/>\n"
+
                     "    <ns2:module name=\"org.apache.geronimo.configs/remote-deploy-jetty/2.1-SNAPSHOT/car\"/>\n"
+
                     "    <ns2:module name=\"org.apache.geronimo.configs/cxf-ejb/2.1-SNAPSHOT/car\"/>\n"
+
                     "    <ns2:module name=\"org.apache.geronimo.configs/cxf/2.1-SNAPSHOT/car\"/>\n"
+

Modified: geronimo/server/trunk/plugins/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/pom.xml?rev=614375&r1=614374&r2=614375&view=diff
==============================================================================
--- geronimo/server/trunk/plugins/pom.xml (original)
+++ geronimo/server/trunk/plugins/pom.xml Tue Jan 22 15:34:28 2008
@@ -69,6 +69,7 @@
         <module>system-database</module>
         <module>tomcat</module>
         <module>webservices</module>
+        <module>spring</module>
     </modules>
     
     <build>

Copied: geronimo/server/trunk/plugins/spring/pom.xml (from r614374, geronimo/server/trunk/components/spring/pom.xml)
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/spring/pom.xml?p2=geronimo/server/trunk/plugins/spring/pom.xml&p1=geronimo/server/trunk/components/spring/pom.xml&r1=614374&r2=614375&rev=614375&view=diff
==============================================================================
--- geronimo/server/trunk/components/spring/pom.xml (original)
+++ geronimo/server/trunk/plugins/spring/pom.xml Tue Jan 22 15:34:28 2008
@@ -23,14 +23,14 @@
     <modelVersion>4.0.0</modelVersion>
 
     <parent>
-        <groupId>org.apache.geronimo.components</groupId>
-        <artifactId>components</artifactId>
+        <groupId>org.apache.geronimo.plugins</groupId>
+        <artifactId>plugins</artifactId>
         <version>2.1-SNAPSHOT</version>
     </parent>
     
     <groupId>org.apache.geronimo.configs</groupId>
     <artifactId>spring</artifactId>
-    <name>Geronimo Components :: Spring</name>
+    <name>Geronimo Plugins, Spring</name>
     <packaging>car</packaging>
 
     <description>

Modified: geronimo/server/trunk/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/pom.xml?rev=614375&r1=614374&r2=614375&view=diff
==============================================================================
--- geronimo/server/trunk/pom.xml (original)
+++ geronimo/server/trunk/pom.xml Tue Jan 22 15:34:28 2008
@@ -2321,7 +2321,6 @@
                 <module>buildsupport</module>
                 <module>testsupport</module>
                 <module>framework</module>
-                <module>components</module>
                 <module>plugins</module>
                 <module>applications</module>
                 <module>assemblies</module>
@@ -2337,7 +2336,6 @@
                 <module>buildsupport</module>
                 <module>testsupport</module>
                 <module>framework</module>
-                <module>components</module>
                 <module>plugins</module>
                 <module>applications</module>
                 <module>assemblies</module>
@@ -2413,7 +2411,6 @@
 
             <modules>
               <module>framework/configs</module>
-              <module>components</module>
               <module>plugins</module>
               <module>applications</module>
               <module>assemblies</module>
@@ -2435,7 +2432,6 @@
                 <module>buildsupport</module>
                 <module>testsupport</module>
                 <module>framework</module>
-                <module>components</module>
                 <module>plugins</module>
                 <module>applications</module>
             </modules>



Mime
View raw message