geronimo-scm mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From jdil...@apache.org
Subject svn commit: r422569 - in /geronimo/sandbox/svkmerge/trunk: ./ assemblies/j2ee-jetty-server/ assemblies/j2ee-tomcat-server/ assemblies/zzzzj2ee-installer/ configs/axis-deployer/ configs/axis/ configs/client-deployer/ configs/javamail/ configs/rmi-naming...
Date Sun, 16 Jul 2006 23:23:19 GMT
Author: jdillon
Date: Sun Jul 16 16:23:18 2006
New Revision: 422569

URL: http://svn.apache.org/viewvc?rev=422569&view=rev
Log:
Sync svkmerge/trunk to the latest trunk

Added:
    geronimo/sandbox/svkmerge/trunk/modules/interceptor/project.properties   (with props)
Removed:
    geronimo/sandbox/svkmerge/trunk/modules/javamail-transport/
Modified:
    geronimo/sandbox/svkmerge/trunk/   (props changed)
    geronimo/sandbox/svkmerge/trunk/assemblies/j2ee-jetty-server/project.xml
    geronimo/sandbox/svkmerge/trunk/assemblies/j2ee-tomcat-server/project.xml
    geronimo/sandbox/svkmerge/trunk/assemblies/zzzzj2ee-installer/project.xml
    geronimo/sandbox/svkmerge/trunk/configs/axis-deployer/project.properties
    geronimo/sandbox/svkmerge/trunk/configs/axis/project.properties
    geronimo/sandbox/svkmerge/trunk/configs/client-deployer/project.properties
    geronimo/sandbox/svkmerge/trunk/configs/javamail/project.xml
    geronimo/sandbox/svkmerge/trunk/configs/rmi-naming/project.xml
    geronimo/sandbox/svkmerge/trunk/configs/sharedlib/project.properties
    geronimo/sandbox/svkmerge/trunk/configs/unavailable-client-deployer/project.properties
    geronimo/sandbox/svkmerge/trunk/configs/unavailable-ejb-deployer/project.properties
    geronimo/sandbox/svkmerge/trunk/configs/unavailable-webservices-deployer/project.properties
    geronimo/sandbox/svkmerge/trunk/etc/project.properties
    geronimo/sandbox/svkmerge/trunk/modules/activation/project.xml
    geronimo/sandbox/svkmerge/trunk/modules/activemq-embedded-rar/project.properties
    geronimo/sandbox/svkmerge/trunk/modules/axis/project.xml
    geronimo/sandbox/svkmerge/trunk/modules/mail/pom.xml
    geronimo/sandbox/svkmerge/trunk/modules/mail/project.xml
    geronimo/sandbox/svkmerge/trunk/modules/pom.xml
    geronimo/sandbox/svkmerge/trunk/modules/system/src/java/org/apache/geronimo/system/sharedlib/SharedLib.java
    geronimo/sandbox/svkmerge/trunk/modules/upgrade/src/test-data/appclient_dep_1.xml
    geronimo/sandbox/svkmerge/trunk/modules/upgrade/src/test-data/appclient_dep_1_result.xml
    geronimo/sandbox/svkmerge/trunk/pom.xml

Propchange: geronimo/sandbox/svkmerge/trunk/
------------------------------------------------------------------------------
--- svk:merge (original)
+++ svk:merge Sun Jul 16 16:23:18 2006
@@ -1,2 +1,2 @@
 13f79535-47bb-0310-9956-ffa450edef68:/geronimo/sandbox/svkmerge/m2migration:419395
-13f79535-47bb-0310-9956-ffa450edef68:/geronimo/trunk:421362
+13f79535-47bb-0310-9956-ffa450edef68:/geronimo/trunk:422567

Modified: geronimo/sandbox/svkmerge/trunk/assemblies/j2ee-jetty-server/project.xml
URL: http://svn.apache.org/viewvc/geronimo/sandbox/svkmerge/trunk/assemblies/j2ee-jetty-server/project.xml?rev=422569&r1=422568&r2=422569&view=diff
==============================================================================
--- geronimo/sandbox/svkmerge/trunk/assemblies/j2ee-jetty-server/project.xml (original)
+++ geronimo/sandbox/svkmerge/trunk/assemblies/j2ee-jetty-server/project.xml Sun Jul 16 16:23:18
2006
@@ -25,7 +25,7 @@
     <description>An assembly of Geronimo into a J2EE Server using Jetty as the web
container</description>
 
     <dependencies>
-        <!-- plugin we use --> 
+        <!-- plugin we use -->
         <dependency>
             <groupId>geronimo</groupId>
             <artifactId>geronimo-assembly-plugin</artifactId>
@@ -292,7 +292,7 @@
                 <geronimo.assemble>install</geronimo.assemble>
             </properties>
         </dependency>
-        <!-- unpack --> 
+        <!-- unpack -->
         <dependency>
             <groupId>geronimo</groupId>
             <artifactId>geronimo-scripts</artifactId>
@@ -359,7 +359,7 @@
                 <geronimo.assemble>library</geronimo.assemble>
             </properties>
         </dependency>
- 
+
        <dependency>
             <groupId>geronimo</groupId>
             <artifactId>geronimo-kernel</artifactId>
@@ -368,7 +368,7 @@
                 <geronimo.assemble>library</geronimo.assemble>
             </properties>
         </dependency>
- 
+
         <dependency>
             <groupId>geronimo</groupId>
             <artifactId>geronimo-system</artifactId>
@@ -639,7 +639,7 @@
         <dependency>
             <groupId>org.apache.geronimo.specs</groupId>
             <artifactId>geronimo-javamail_1.3.1_spec</artifactId>
-            <version>${geronimo_spec_javamail_version}</version>
+            <version>${geronimo_spec_javamail_13_version}</version>
         </dependency>
         <dependency>
             <groupId>org.apache.geronimo.specs</groupId>
@@ -701,14 +701,14 @@
         <dependency>
             <groupId>antlr</groupId>
             <artifactId>antlr</artifactId>
-            <version>${antlr_version}</version>                             
                           
+            <version>${antlr_version}</version>
         </dependency>
 
         <dependency>
             <!--what is using this? -->
             <groupId>asm</groupId>
             <artifactId>asm</artifactId>
-            <version>${asm_version}</version>                               
                         
+            <version>${asm_version}</version>
         </dependency>
 
         <dependency>
@@ -1018,7 +1018,7 @@
         </dependency>
 
         <!-- Specification dependencies to preload into the repository -->
-        
+
         <!-- Geronimo modules to preload into the repository -->
         <dependency>
             <groupId>geronimo</groupId>

Modified: geronimo/sandbox/svkmerge/trunk/assemblies/j2ee-tomcat-server/project.xml
URL: http://svn.apache.org/viewvc/geronimo/sandbox/svkmerge/trunk/assemblies/j2ee-tomcat-server/project.xml?rev=422569&r1=422568&r2=422569&view=diff
==============================================================================
--- geronimo/sandbox/svkmerge/trunk/assemblies/j2ee-tomcat-server/project.xml (original)
+++ geronimo/sandbox/svkmerge/trunk/assemblies/j2ee-tomcat-server/project.xml Sun Jul 16 16:23:18
2006
@@ -25,7 +25,7 @@
     <description>An assembly of Geronimo into a J2EE Server using Tomcat for the web
container</description>
 
     <dependencies>
-        <!-- plugin we use --> 
+        <!-- plugin we use -->
         <dependency>
             <groupId>geronimo</groupId>
             <artifactId>geronimo-assembly-plugin</artifactId>
@@ -292,7 +292,7 @@
                 <geronimo.assemble>install</geronimo.assemble>
             </properties>
         </dependency>
-        <!-- unpack --> 
+        <!-- unpack -->
         <dependency>
             <groupId>geronimo</groupId>
             <artifactId>geronimo-scripts</artifactId>
@@ -359,7 +359,7 @@
                 <geronimo.assemble>library</geronimo.assemble>
             </properties>
         </dependency>
- 
+
        <dependency>
             <groupId>geronimo</groupId>
             <artifactId>geronimo-kernel</artifactId>
@@ -368,7 +368,7 @@
                 <geronimo.assemble>library</geronimo.assemble>
             </properties>
         </dependency>
- 
+
         <dependency>
             <groupId>geronimo</groupId>
             <artifactId>geronimo-system</artifactId>
@@ -639,7 +639,7 @@
         <dependency>
             <groupId>org.apache.geronimo.specs</groupId>
             <artifactId>geronimo-javamail_1.3.1_spec</artifactId>
-            <version>${geronimo_spec_javamail_version}</version>
+            <version>${geronimo_spec_javamail_13_version}</version>
         </dependency>
         <dependency>
             <groupId>org.apache.geronimo.specs</groupId>
@@ -702,14 +702,14 @@
         <dependency>
             <groupId>antlr</groupId>
             <artifactId>antlr</artifactId>
-            <version>${antlr_version}</version>                             
                           
+            <version>${antlr_version}</version>
         </dependency>
 
         <dependency>
             <!--what is using this? -->
             <groupId>asm</groupId>
             <artifactId>asm</artifactId>
-            <version>${asm_version}</version>                               
                         
+            <version>${asm_version}</version>
         </dependency>
 
         <dependency>
@@ -1035,7 +1035,7 @@
         </dependency>
 
         <!-- Specification dependencies to preload into the repository -->
-        
+
         <!-- Geronimo modules to preload into the repository -->
         <dependency>
             <groupId>geronimo</groupId>

Modified: geronimo/sandbox/svkmerge/trunk/assemblies/zzzzj2ee-installer/project.xml
URL: http://svn.apache.org/viewvc/geronimo/sandbox/svkmerge/trunk/assemblies/zzzzj2ee-installer/project.xml?rev=422569&r1=422568&r2=422569&view=diff
==============================================================================
--- geronimo/sandbox/svkmerge/trunk/assemblies/zzzzj2ee-installer/project.xml (original)
+++ geronimo/sandbox/svkmerge/trunk/assemblies/zzzzj2ee-installer/project.xml Sun Jul 16 16:23:18
2006
@@ -796,7 +796,7 @@
         <dependency>
             <groupId>org.apache.geronimo.specs</groupId>
             <artifactId>geronimo-javamail_1.3.1_spec</artifactId>
-            <version>${geronimo_spec_javamail_version}</version>
+            <version>${geronimo_spec_javamail_13_version}</version>
             <properties>
                 <geronimo.assemble>repository</geronimo.assemble>
             </properties>
@@ -841,7 +841,7 @@
                 <geronimo.assemble>repository</geronimo.assemble>
             </properties>
         </dependency>
-        <!-- 
+        <!--
         #<dependency>
         #    <groupId>org.apache.geronimo.specs</groupId>
         #    <artifactId>geronimo-qname_1.1_spec</artifactId>

Modified: geronimo/sandbox/svkmerge/trunk/configs/axis-deployer/project.properties
URL: http://svn.apache.org/viewvc/geronimo/sandbox/svkmerge/trunk/configs/axis-deployer/project.properties?rev=422569&r1=422568&r2=422569&view=diff
==============================================================================
--- geronimo/sandbox/svkmerge/trunk/configs/axis-deployer/project.properties (original)
+++ geronimo/sandbox/svkmerge/trunk/configs/axis-deployer/project.properties Sun Jul 16 16:23:18
2006
@@ -19,4 +19,8 @@
 ## $Rev$ $Date$
 ##
 
+# ensure eclipse project name is unique (used in eclipse plugin V1.11 onwards)
+# Also will cause all config projects to be grouped together when imported into eclipse.
+maven.eclipse.project.name=${geronimo.maven.eclipse.configs.project.prefix}${pom.artifactId}
+
 maven.multiproject.type=car

Modified: geronimo/sandbox/svkmerge/trunk/configs/axis/project.properties
URL: http://svn.apache.org/viewvc/geronimo/sandbox/svkmerge/trunk/configs/axis/project.properties?rev=422569&r1=422568&r2=422569&view=diff
==============================================================================
--- geronimo/sandbox/svkmerge/trunk/configs/axis/project.properties (original)
+++ geronimo/sandbox/svkmerge/trunk/configs/axis/project.properties Sun Jul 16 16:23:18 2006
@@ -19,6 +19,10 @@
 ## $Rev$ $Date$
 ##
 
+# ensure eclipse project name is unique (used in eclipse plugin V1.11 onwards)
+# Also will cause all config projects to be grouped together when imported into eclipse.
+maven.eclipse.project.name=${geronimo.maven.eclipse.configs.project.prefix}${pom.artifactId}
+
 maven.multiproject.type=car
 
 PlanHTTPPort=8080

Modified: geronimo/sandbox/svkmerge/trunk/configs/client-deployer/project.properties
URL: http://svn.apache.org/viewvc/geronimo/sandbox/svkmerge/trunk/configs/client-deployer/project.properties?rev=422569&r1=422568&r2=422569&view=diff
==============================================================================
--- geronimo/sandbox/svkmerge/trunk/configs/client-deployer/project.properties (original)
+++ geronimo/sandbox/svkmerge/trunk/configs/client-deployer/project.properties Sun Jul 16
16:23:18 2006
@@ -19,5 +19,9 @@
 ## $Rev$ $Date$
 ##
 
+# ensure eclipse project name is unique (used in eclipse plugin V1.11 onwards)
+# Also will cause all config projects to be grouped together when imported into eclipse.
+maven.eclipse.project.name=${geronimo.maven.eclipse.configs.project.prefix}${pom.artifactId}
+
 maven.multiproject.type=car
 

Modified: geronimo/sandbox/svkmerge/trunk/configs/javamail/project.xml
URL: http://svn.apache.org/viewvc/geronimo/sandbox/svkmerge/trunk/configs/javamail/project.xml?rev=422569&r1=422568&r2=422569&view=diff
==============================================================================
--- geronimo/sandbox/svkmerge/trunk/configs/javamail/project.xml (original)
+++ geronimo/sandbox/svkmerge/trunk/configs/javamail/project.xml Sun Jul 16 16:23:18 2006
@@ -62,9 +62,9 @@
         </dependency>
 
         <dependency>
-            <groupId>geronimo</groupId>
-            <artifactId>geronimo-javamail-transport</artifactId>
-            <version>${pom.currentVersion}</version>
+            <groupId>org.apache.geronimo.javamail</groupId>
+            <artifactId>geronimo-javamail_1.3.1_provider</artifactId>
+            <version>${geronimo_javamail_provider_13_version}</version>
             <properties>
                  <geronimo.dependency>true</geronimo.dependency>
              </properties>
@@ -73,7 +73,7 @@
         <dependency>
             <groupId>org.apache.geronimo.specs</groupId>
             <artifactId>geronimo-javamail_1.3.1_spec</artifactId>
-            <version>${geronimo_spec_javamail_version}</version>
+            <version>${geronimo_spec_javamail_13_version}</version>
             <properties>
                  <geronimo.dependency>true</geronimo.dependency>
              </properties>

Modified: geronimo/sandbox/svkmerge/trunk/configs/rmi-naming/project.xml
URL: http://svn.apache.org/viewvc/geronimo/sandbox/svkmerge/trunk/configs/rmi-naming/project.xml?rev=422569&r1=422568&r2=422569&view=diff
==============================================================================
--- geronimo/sandbox/svkmerge/trunk/configs/rmi-naming/project.xml (original)
+++ geronimo/sandbox/svkmerge/trunk/configs/rmi-naming/project.xml Sun Jul 16 16:23:18 2006
@@ -111,7 +111,7 @@
         <dependency>
             <groupId>org.apache.geronimo.specs</groupId>
             <artifactId>geronimo-javamail_1.3.1_spec</artifactId>
-            <version>${geronimo_spec_javamail_version}</version>
+            <version>${geronimo_spec_javamail_13_version}</version>
             <properties>
                  <geronimo.dependency>true</geronimo.dependency>
              </properties>

Modified: geronimo/sandbox/svkmerge/trunk/configs/sharedlib/project.properties
URL: http://svn.apache.org/viewvc/geronimo/sandbox/svkmerge/trunk/configs/sharedlib/project.properties?rev=422569&r1=422568&r2=422569&view=diff
==============================================================================
--- geronimo/sandbox/svkmerge/trunk/configs/sharedlib/project.properties (original)
+++ geronimo/sandbox/svkmerge/trunk/configs/sharedlib/project.properties Sun Jul 16 16:23:18
2006
@@ -15,6 +15,10 @@
 ##   limitations under the License.
 ##
 
+# ensure eclipse project name is unique (used in eclipse plugin V1.11 onwards)
+# Also will cause all config projects to be grouped together when imported into eclipse.
+maven.eclipse.project.name=${geronimo.maven.eclipse.configs.project.prefix}${pom.artifactId}
+
 maven.multiproject.type=car
 
 

Modified: geronimo/sandbox/svkmerge/trunk/configs/unavailable-client-deployer/project.properties
URL: http://svn.apache.org/viewvc/geronimo/sandbox/svkmerge/trunk/configs/unavailable-client-deployer/project.properties?rev=422569&r1=422568&r2=422569&view=diff
==============================================================================
--- geronimo/sandbox/svkmerge/trunk/configs/unavailable-client-deployer/project.properties
(original)
+++ geronimo/sandbox/svkmerge/trunk/configs/unavailable-client-deployer/project.properties
Sun Jul 16 16:23:18 2006
@@ -19,5 +19,10 @@
 ## $Rev$ $Date$
 ##
 
+# ensure eclipse project name is unique (used in eclipse plugin V1.11 onwards)
+# Also will cause all config projects to be grouped together when imported into eclipse.
+maven.eclipse.project.name=${geronimo.maven.eclipse.configs.project.prefix}${pom.artifactId}
+
+
 maven.multiproject.type=car
 

Modified: geronimo/sandbox/svkmerge/trunk/configs/unavailable-ejb-deployer/project.properties
URL: http://svn.apache.org/viewvc/geronimo/sandbox/svkmerge/trunk/configs/unavailable-ejb-deployer/project.properties?rev=422569&r1=422568&r2=422569&view=diff
==============================================================================
--- geronimo/sandbox/svkmerge/trunk/configs/unavailable-ejb-deployer/project.properties (original)
+++ geronimo/sandbox/svkmerge/trunk/configs/unavailable-ejb-deployer/project.properties Sun
Jul 16 16:23:18 2006
@@ -19,6 +19,10 @@
 ## $Rev$ $Date$
 ##
 
+# ensure eclipse project name is unique (used in eclipse plugin V1.11 onwards)
+# Also will cause all config projects to be grouped together when imported into eclipse.
+maven.eclipse.project.name=${geronimo.maven.eclipse.configs.project.prefix}${pom.artifactId}
+
 maven.multiproject.type=car
 
 # just use basic GBean deployer

Modified: geronimo/sandbox/svkmerge/trunk/configs/unavailable-webservices-deployer/project.properties
URL: http://svn.apache.org/viewvc/geronimo/sandbox/svkmerge/trunk/configs/unavailable-webservices-deployer/project.properties?rev=422569&r1=422568&r2=422569&view=diff
==============================================================================
--- geronimo/sandbox/svkmerge/trunk/configs/unavailable-webservices-deployer/project.properties
(original)
+++ geronimo/sandbox/svkmerge/trunk/configs/unavailable-webservices-deployer/project.properties
Sun Jul 16 16:23:18 2006
@@ -19,6 +19,10 @@
 ## $Rev$ $Date$
 ##
 
+# ensure eclipse project name is unique (used in eclipse plugin V1.11 onwards)
+# Also will cause all config projects to be grouped together when imported into eclipse.
+maven.eclipse.project.name=${geronimo.maven.eclipse.configs.project.prefix}${pom.artifactId}
+
 maven.multiproject.type=car
 
 # just use basic GBean deployer

Modified: geronimo/sandbox/svkmerge/trunk/etc/project.properties
URL: http://svn.apache.org/viewvc/geronimo/sandbox/svkmerge/trunk/etc/project.properties?rev=422569&r1=422568&r2=422569&view=diff
==============================================================================
--- geronimo/sandbox/svkmerge/trunk/etc/project.properties (original)
+++ geronimo/sandbox/svkmerge/trunk/etc/project.properties Sun Jul 16 16:23:18 2006
@@ -112,7 +112,7 @@
 geronimo_spec_j2ee_deployment_version=1.0.1
 geronimo_spec_j2ee_jacc_version=1.0.1
 geronimo_spec_j2ee_management_version=1.0.1
-geronimo_spec_javamail_version=1.1
+geronimo_spec_javamail_13_version=1.2-SNAPSHOT
 geronimo_spec_jaxr_version=1.0.1
 geronimo_spec_jaxrpc_version=1.0.1
 geronimo_spec_jcache_version=1.1
@@ -123,6 +123,8 @@
 geronimo_spec_saaj_version=1.0.1
 geronimo_spec_servlet_version=1.0.1
 
+geronimo_javamail_provider_13_version=1.0-SNAPSHOT
+
 ant_version=1.6.5
 antlr_version=2.7.2
 apacheds_version=0.9.2
@@ -217,20 +219,20 @@
 #####################################################
 
 # prefix if set would be used for all generated eclipse projects (e.g. you could place a
version in here)
-geronimo.maven.eclipse.project.prefix=
+geronimo.maven.eclipse.project.prefix=GTrunk-
 
 # applications projects already have geronimo- as a prefix on their artifactId
-geronimo.maven.eclipse.applications.project.prefix=${geronimo.maven.eclipse.project.prefix}
+geronimo.maven.eclipse.applications.project.prefix=${geronimo.maven.eclipse.project.prefix}app-
 
 # assembly projects already have geronimo- as a prefix on their artifactId
-geronimo.maven.eclipse.assemblies.project.prefix=${geronimo.maven.eclipse.project.prefix}
+geronimo.maven.eclipse.assemblies.project.prefix=${geronimo.maven.eclipse.project.prefix}assembly-
 
-# configs projects don't have geronimo- as a prefix on their artifactId 
+# configs projects don't have geronimo- as a prefix on their artifactId
 # therefore there can be conflicts with other projects (e.g. the activemq config)
-geronimo.maven.eclipse.configs.project.prefix=${geronimo.maven.eclipse.project.prefix}geronimo-configs-
+geronimo.maven.eclipse.configs.project.prefix=${geronimo.maven.eclipse.project.prefix}config-
 
 # modules projects already have geronimo- as a prefix on their artifactId
-geronimo.maven.eclipse.modules.project.prefix=${geronimo.maven.eclipse.project.prefix}
+geronimo.maven.eclipse.modules.project.prefix=${geronimo.maven.eclipse.project.prefix}module-
 
 # Note that the geronimo plugins do not use this file, so to set their eclipse project prefix
 # you need to set the "geronimo.maven.eclipse.plugins.project.prefix" property elsewhere.

Modified: geronimo/sandbox/svkmerge/trunk/modules/activation/project.xml
URL: http://svn.apache.org/viewvc/geronimo/sandbox/svkmerge/trunk/modules/activation/project.xml?rev=422569&r1=422568&r2=422569&view=diff
==============================================================================
--- geronimo/sandbox/svkmerge/trunk/modules/activation/project.xml (original)
+++ geronimo/sandbox/svkmerge/trunk/modules/activation/project.xml Sun Jul 16 16:23:18 2006
@@ -55,7 +55,7 @@
         <dependency>
             <groupId>org.apache.geronimo.specs</groupId>
             <artifactId>geronimo-javamail_1.3.1_spec</artifactId>
-            <version>${geronimo_spec_javamail_version}</version>
+            <version>${geronimo_spec_javamail_13_version}</version>
         </dependency>
 
     </dependencies>

Modified: geronimo/sandbox/svkmerge/trunk/modules/activemq-embedded-rar/project.properties
URL: http://svn.apache.org/viewvc/geronimo/sandbox/svkmerge/trunk/modules/activemq-embedded-rar/project.properties?rev=422569&r1=422568&r2=422569&view=diff
==============================================================================
--- geronimo/sandbox/svkmerge/trunk/modules/activemq-embedded-rar/project.properties (original)
+++ geronimo/sandbox/svkmerge/trunk/modules/activemq-embedded-rar/project.properties Sun Jul
16 16:23:18 2006
@@ -1,4 +1,9 @@
 # -------------------------------------------------------------------
 # Build Properties
 # -------------------------------------------------------------------
+
+# ensure eclipse project name is unique (used in eclipse plugin V1.11 onwards)
+# Also will cause all config projects to be grouped together when imported into eclipse.
+maven.eclipse.project.name=${geronimo.maven.eclipse.modules.project.prefix}${pom.artifactId}
+
 maven.multiproject.type=rar

Modified: geronimo/sandbox/svkmerge/trunk/modules/axis/project.xml
URL: http://svn.apache.org/viewvc/geronimo/sandbox/svkmerge/trunk/modules/axis/project.xml?rev=422569&r1=422568&r2=422569&view=diff
==============================================================================
--- geronimo/sandbox/svkmerge/trunk/modules/axis/project.xml (original)
+++ geronimo/sandbox/svkmerge/trunk/modules/axis/project.xml Sun Jul 16 16:23:18 2006
@@ -128,7 +128,7 @@
         <dependency>
             <groupId>org.apache.geronimo.specs</groupId>
             <artifactId>geronimo-javamail_1.3.1_spec</artifactId>
-            <version>${geronimo_spec_javamail_version}</version>
+            <version>${geronimo_spec_javamail_13_version}</version>
             <properties>
                  <geronimo.dependency>true</geronimo.dependency>
              </properties>

Added: geronimo/sandbox/svkmerge/trunk/modules/interceptor/project.properties
URL: http://svn.apache.org/viewvc/geronimo/sandbox/svkmerge/trunk/modules/interceptor/project.properties?rev=422569&view=auto
==============================================================================
--- geronimo/sandbox/svkmerge/trunk/modules/interceptor/project.properties (added)
+++ geronimo/sandbox/svkmerge/trunk/modules/interceptor/project.properties Sun Jul 16 16:23:18
2006
@@ -0,0 +1,6 @@
+##
+## $Rev$ $Date$
+##
+
+# set eclipse project name (used in eclipse plugin V1.11 onwards)
+maven.eclipse.project.name=${geronimo.maven.eclipse.modules.project.prefix}${pom.artifactId}

Propchange: geronimo/sandbox/svkmerge/trunk/modules/interceptor/project.properties
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: geronimo/sandbox/svkmerge/trunk/modules/interceptor/project.properties
------------------------------------------------------------------------------
    svn:keywords = Date Author Id Revision HeadURL

Propchange: geronimo/sandbox/svkmerge/trunk/modules/interceptor/project.properties
------------------------------------------------------------------------------
    svn:mime-type = text/plain

Modified: geronimo/sandbox/svkmerge/trunk/modules/mail/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/sandbox/svkmerge/trunk/modules/mail/pom.xml?rev=422569&r1=422568&r2=422569&view=diff
==============================================================================
--- geronimo/sandbox/svkmerge/trunk/modules/mail/pom.xml (original)
+++ geronimo/sandbox/svkmerge/trunk/modules/mail/pom.xml Sun Jul 16 16:23:18 2006
@@ -71,6 +71,11 @@
         </dependency>
 
         <dependency>
+            <groupId>org.apache.geronimo.javamail</groupId>
+            <artifactId>geronimo-javamail_1.3.1_provider</artifactId>
+        </dependency>
+
+        <dependency>
             <groupId>org.apache.geronimo.specs</groupId>
             <artifactId>geronimo-activation_1.0.2_spec</artifactId>
         </dependency>

Modified: geronimo/sandbox/svkmerge/trunk/modules/mail/project.xml
URL: http://svn.apache.org/viewvc/geronimo/sandbox/svkmerge/trunk/modules/mail/project.xml?rev=422569&r1=422568&r2=422569&view=diff
==============================================================================
--- geronimo/sandbox/svkmerge/trunk/modules/mail/project.xml (original)
+++ geronimo/sandbox/svkmerge/trunk/modules/mail/project.xml Sun Jul 16 16:23:18 2006
@@ -64,7 +64,13 @@
         <dependency>
             <groupId>org.apache.geronimo.specs</groupId>
             <artifactId>geronimo-javamail_1.3.1_spec</artifactId>
-            <version>${geronimo_spec_javamail_version}</version>
+            <version>${geronimo_spec_javamail_13_version}</version>
+        </dependency>
+
+        <dependency>
+            <groupId>org.apache.geronimo.javamail</groupId>
+            <artifactId>geronimo-javamail_1.3.1_provider</artifactId>
+            <version>${geronimo_javamail_provider_13_version}</version>
         </dependency>
 
         <dependency>

Modified: geronimo/sandbox/svkmerge/trunk/modules/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/sandbox/svkmerge/trunk/modules/pom.xml?rev=422569&r1=422568&r2=422569&view=diff
==============================================================================
--- geronimo/sandbox/svkmerge/trunk/modules/pom.xml (original)
+++ geronimo/sandbox/svkmerge/trunk/modules/pom.xml Sun Jul 16 16:23:18 2006
@@ -63,7 +63,6 @@
         <module>j2ee-schema</module>
         <module>jetty</module>
         <module>jetty-builder</module>
-        <module>javamail-transport</module>
         <module>jmx-remoting</module>
         <module>kernel</module>
         <module>management</module>

Modified: geronimo/sandbox/svkmerge/trunk/modules/system/src/java/org/apache/geronimo/system/sharedlib/SharedLib.java
URL: http://svn.apache.org/viewvc/geronimo/sandbox/svkmerge/trunk/modules/system/src/java/org/apache/geronimo/system/sharedlib/SharedLib.java?rev=422569&r1=422568&r2=422569&view=diff
==============================================================================
--- geronimo/sandbox/svkmerge/trunk/modules/system/src/java/org/apache/geronimo/system/sharedlib/SharedLib.java
(original)
+++ geronimo/sandbox/svkmerge/trunk/modules/system/src/java/org/apache/geronimo/system/sharedlib/SharedLib.java
Sun Jul 16 16:23:18 2006
@@ -48,7 +48,9 @@
                 String classesDir = classesDirs[i];
                 File dir = serverInfo.resolve(classesDir);
                 if (!dir.exists()) {
-                    throw new IllegalArgumentException("Classes dir does not exist: " + dir);
+                    if (!dir.mkdirs()) {
+                        throw new IllegalArgumentException("Failed to create classes dir:
" + dir);
+                    }
                 }
                 if (!dir.isDirectory()) {
                     throw new IllegalArgumentException("Classes dir is not a directory: "
+ dir);
@@ -65,7 +67,9 @@
                 String libDir = libDirs[i];
                 File dir = serverInfo.resolve(libDir);
                 if (!dir.exists()) {
-                    throw new IllegalArgumentException("Lib dir does not exist: " + dir);
+                    if (!dir.mkdirs()) {
+                        throw new IllegalArgumentException("Failed to create lib dir: " +
dir);
+                    }
                 }
                 if (!dir.isDirectory()) {
                     throw new IllegalArgumentException("Lib dir is not a directory: " + dir);

Modified: geronimo/sandbox/svkmerge/trunk/modules/upgrade/src/test-data/appclient_dep_1.xml
URL: http://svn.apache.org/viewvc/geronimo/sandbox/svkmerge/trunk/modules/upgrade/src/test-data/appclient_dep_1.xml?rev=422569&r1=422568&r2=422569&view=diff
==============================================================================
--- geronimo/sandbox/svkmerge/trunk/modules/upgrade/src/test-data/appclient_dep_1.xml (original)
+++ geronimo/sandbox/svkmerge/trunk/modules/upgrade/src/test-data/appclient_dep_1.xml Sun
Jul 16 16:23:18 2006
@@ -30,12 +30,12 @@
                 <groupId>org.apache.geronimo.specs</groupId>
                 <type>jar</type>
                 <artifactId>geronimo-activation_1.0.2_spec</artifactId>
-                <version>${geronimo_spec_javamail_version}</version>
+                <version>${geronimo_spec_activation_version}</version>
             </dependency>
             <dependency>
                 <groupId>org.apache.geronimo.specs</groupId>
                 <artifactId>geronimo-javamail_1.3.1_spec</artifactId>
-                <version>${geronimo_spec_javamail_version}</version>
+                <version>${geronimo_spec_javamail_13_version}</version>
             </dependency>
 
             <resource-ref xmlns="http://geronimo.apache.org/xml/ns/naming">

Modified: geronimo/sandbox/svkmerge/trunk/modules/upgrade/src/test-data/appclient_dep_1_result.xml
URL: http://svn.apache.org/viewvc/geronimo/sandbox/svkmerge/trunk/modules/upgrade/src/test-data/appclient_dep_1_result.xml?rev=422569&r1=422568&r2=422569&view=diff
==============================================================================
--- geronimo/sandbox/svkmerge/trunk/modules/upgrade/src/test-data/appclient_dep_1_result.xml
(original)
+++ geronimo/sandbox/svkmerge/trunk/modules/upgrade/src/test-data/appclient_dep_1_result.xml
Sun Jul 16 16:23:18 2006
@@ -67,7 +67,7 @@
           <dep:dependency>
             <dep:groupId>org.apache.geronimo.specs</dep:groupId>
             <dep:artifactId>geronimo-javamail_1.3.1_spec</dep:artifactId>
-            <dep:version>${geronimo_spec_javamail_version}</dep:version>
+            <dep:version>${geronimo_spec_javamail_13_version}</dep:version>
             <dep:type>jar</dep:type>
           </dep:dependency>
         </dep:dependencies>

Modified: geronimo/sandbox/svkmerge/trunk/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/sandbox/svkmerge/trunk/pom.xml?rev=422569&r1=422568&r2=422569&view=diff
==============================================================================
--- geronimo/sandbox/svkmerge/trunk/pom.xml (original)
+++ geronimo/sandbox/svkmerge/trunk/pom.xml Sun Jul 16 16:23:18 2006
@@ -115,7 +115,7 @@
         <geronimoSpecJ2eeDeploymentVersion>1.0.1</geronimoSpecJ2eeDeploymentVersion>
         <geronimoSpecJ2eeJaccVersion>1.0.1</geronimoSpecJ2eeJaccVersion>
         <geronimoSpecJ2eeManagementVersion>1.0.1</geronimoSpecJ2eeManagementVersion>
-        <geronimoSpecJavamailVersion>1.1</geronimoSpecJavamailVersion>
+        <geronimoSpecJavamail13Version>1.2-SNAPSHOT</geronimoSpecJavamail13Version>
         <geronimoSpecJaxrVersion>1.0.1</geronimoSpecJaxrVersion>
         <geronimoSpecJaxrpcVersion>1.0.1</geronimoSpecJaxrpcVersion>
         <geronimoSpecJmsVersion>1.0.1</geronimoSpecJmsVersion>
@@ -270,7 +270,7 @@
             <dependency>
                 <groupId>org.apache.geronimo.specs</groupId>
                 <artifactId>geronimo-javamail_1.3.1_spec</artifactId>
-                <version>${geronimoSpecJavamailVersion}</version>
+                <version>${geronimoSpecJavamail13Version}</version>
             </dependency>
 
             <dependency>



Mime
View raw message