You are viewing a plain text version of this content. The canonical link for it is here.
Posted to scm@geronimo.apache.org by ri...@apache.org on 2007/09/26 12:22:30 UTC

svn commit: r579564 - in /geronimo/server/trunk: configs/client/pom.xml configs/client/src/main/plan/plan.xml configs/javamail/src/main/plan/plan.xml configs/jee-specs/pom.xml modules/geronimo-activation/ modules/pom.xml pom.xml

Author: rickmcguire
Date: Wed Sep 26 03:22:26 2007
New Revision: 579564

URL: http://svn.apache.org/viewvc?rev=579564&view=rev
Log:
GERONIMO-3485 The code in the geronimo-acivation server module should be moved into the javamail provider package

Remove the geronimo-activation module from server and switch the javamail dependency to the 1.3-SNAPSHOT version containing the activation handlers. 


Removed:
    geronimo/server/trunk/modules/geronimo-activation/
Modified:
    geronimo/server/trunk/configs/client/pom.xml
    geronimo/server/trunk/configs/client/src/main/plan/plan.xml
    geronimo/server/trunk/configs/javamail/src/main/plan/plan.xml
    geronimo/server/trunk/configs/jee-specs/pom.xml
    geronimo/server/trunk/modules/pom.xml
    geronimo/server/trunk/pom.xml

Modified: geronimo/server/trunk/configs/client/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/configs/client/pom.xml?rev=579564&r1=579563&r2=579564&view=diff
==============================================================================
--- geronimo/server/trunk/configs/client/pom.xml (original)
+++ geronimo/server/trunk/configs/client/pom.xml Wed Sep 26 03:22:26 2007
@@ -58,12 +58,6 @@
 
         <dependency>
             <groupId>org.apache.geronimo.modules</groupId>
-            <artifactId>geronimo-activation</artifactId>
-            <version>${version}</version>
-        </dependency>
-
-        <dependency>
-            <groupId>org.apache.geronimo.modules</groupId>
             <artifactId>geronimo-interceptor</artifactId>
             <version>${version}</version>
         </dependency>

Modified: geronimo/server/trunk/configs/client/src/main/plan/plan.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/configs/client/src/main/plan/plan.xml?rev=579564&r1=579563&r2=579564&view=diff
==============================================================================
--- geronimo/server/trunk/configs/client/src/main/plan/plan.xml (original)
+++ geronimo/server/trunk/configs/client/src/main/plan/plan.xml Wed Sep 26 03:22:26 2007
@@ -45,13 +45,6 @@
       </dependency>
       <dependency>
         <groupId>org.apache.geronimo.modules</groupId>
-        <artifactId>geronimo-activation</artifactId>
-        <version>2.1-SNAPSHOT</version>
-        <type>jar</type>
-        <import>classes</import>
-      </dependency>
-      <dependency>
-        <groupId>org.apache.geronimo.modules</groupId>
         <artifactId>geronimo-j2ee</artifactId>
         <version>2.1-SNAPSHOT</version>
         <type>jar</type>

Modified: geronimo/server/trunk/configs/javamail/src/main/plan/plan.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/configs/javamail/src/main/plan/plan.xml?rev=579564&r1=579563&r2=579564&view=diff
==============================================================================
--- geronimo/server/trunk/configs/javamail/src/main/plan/plan.xml (original)
+++ geronimo/server/trunk/configs/javamail/src/main/plan/plan.xml Wed Sep 26 03:22:26 2007
@@ -33,7 +33,7 @@
       <dependency>
         <groupId>org.apache.geronimo.javamail</groupId>
         <artifactId>geronimo-javamail_1.4_mail</artifactId>
-        <version>1.2</version>
+        <version>1.3-SNAPSHOT</version>
         <type>jar</type>
         <import>classes</import>
       </dependency>

Modified: geronimo/server/trunk/configs/jee-specs/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/configs/jee-specs/pom.xml?rev=579564&r1=579563&r2=579564&view=diff
==============================================================================
--- geronimo/server/trunk/configs/jee-specs/pom.xml (original)
+++ geronimo/server/trunk/configs/jee-specs/pom.xml Wed Sep 26 03:22:26 2007
@@ -265,7 +265,7 @@
                         <dependency>
                             <groupId>org.apache.geronimo.javamail</groupId>
                             <artifactId>geronimo-javamail_1.4_mail</artifactId>
-                            <version>1.2</version>
+                            <version>1.3-SNAPSHOT</version>
                             <type>jar</type>
                         </dependency>
                         <dependency>

Modified: geronimo/server/trunk/modules/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/modules/pom.xml?rev=579564&r1=579563&r2=579564&view=diff
==============================================================================
--- geronimo/server/trunk/modules/pom.xml (original)
+++ geronimo/server/trunk/modules/pom.xml Wed Sep 26 03:22:26 2007
@@ -40,7 +40,6 @@
     </dependencies>
     
     <modules>
-        <module>geronimo-activation</module>
         <module>geronimo-activemq-ra</module>
         <module>geronimo-activemq</module>
         <module>geronimo-activemq-management</module>

Modified: geronimo/server/trunk/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/pom.xml?rev=579564&r1=579563&r2=579564&view=diff
==============================================================================
--- geronimo/server/trunk/pom.xml (original)
+++ geronimo/server/trunk/pom.xml Wed Sep 26 03:22:26 2007
@@ -152,7 +152,7 @@
             <dependency>
                 <groupId>org.apache.geronimo.javamail</groupId>
                 <artifactId>geronimo-javamail_1.4_mail</artifactId>
-                <version>1.2</version>
+                <version>1.3-SNAPSHOT</version>
             </dependency>
 
             <dependency>