geronimo-scm mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From jdil...@apache.org
Subject svn commit: r423336 - in /geronimo/sandbox/svkmerge/m2migration/configs: ./ axis-deployer/ axis/ client-deployer/ javamail/ rmi-naming/ sharedlib/ unavailable-client-deployer/ unavailable-ejb-deployer/ unavailable-webservices-deployer/
Date Wed, 19 Jul 2006 01:47:15 GMT
Author: jdillon
Date: Tue Jul 18 18:47:14 2006
New Revision: 423336

URL: http://svn.apache.org/viewvc?rev=423336&view=rev
Log:
Sync from trunk

Modified:
    geronimo/sandbox/svkmerge/m2migration/configs/   (props changed)
    geronimo/sandbox/svkmerge/m2migration/configs/axis-deployer/project.properties
    geronimo/sandbox/svkmerge/m2migration/configs/axis/project.properties
    geronimo/sandbox/svkmerge/m2migration/configs/client-deployer/project.properties
    geronimo/sandbox/svkmerge/m2migration/configs/javamail/project.xml
    geronimo/sandbox/svkmerge/m2migration/configs/rmi-naming/project.xml
    geronimo/sandbox/svkmerge/m2migration/configs/sharedlib/project.properties
    geronimo/sandbox/svkmerge/m2migration/configs/unavailable-client-deployer/project.properties
    geronimo/sandbox/svkmerge/m2migration/configs/unavailable-ejb-deployer/project.properties
    geronimo/sandbox/svkmerge/m2migration/configs/unavailable-webservices-deployer/project.properties

Propchange: geronimo/sandbox/svkmerge/m2migration/configs/
------------------------------------------------------------------------------
--- svk:merge (added)
+++ svk:merge Tue Jul 18 18:47:14 2006
@@ -0,0 +1 @@
+13f79535-47bb-0310-9956-ffa450edef68:/geronimo/sandbox/svkmerge/trunk/configs:422569

Modified: geronimo/sandbox/svkmerge/m2migration/configs/axis-deployer/project.properties
URL: http://svn.apache.org/viewvc/geronimo/sandbox/svkmerge/m2migration/configs/axis-deployer/project.properties?rev=423336&r1=423335&r2=423336&view=diff
==============================================================================
--- geronimo/sandbox/svkmerge/m2migration/configs/axis-deployer/project.properties (original)
+++ geronimo/sandbox/svkmerge/m2migration/configs/axis-deployer/project.properties Tue Jul
18 18:47:14 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/m2migration/configs/axis/project.properties
URL: http://svn.apache.org/viewvc/geronimo/sandbox/svkmerge/m2migration/configs/axis/project.properties?rev=423336&r1=423335&r2=423336&view=diff
==============================================================================
--- geronimo/sandbox/svkmerge/m2migration/configs/axis/project.properties (original)
+++ geronimo/sandbox/svkmerge/m2migration/configs/axis/project.properties Tue Jul 18 18:47:14
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/m2migration/configs/client-deployer/project.properties
URL: http://svn.apache.org/viewvc/geronimo/sandbox/svkmerge/m2migration/configs/client-deployer/project.properties?rev=423336&r1=423335&r2=423336&view=diff
==============================================================================
--- geronimo/sandbox/svkmerge/m2migration/configs/client-deployer/project.properties (original)
+++ geronimo/sandbox/svkmerge/m2migration/configs/client-deployer/project.properties Tue Jul
18 18:47:14 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/m2migration/configs/javamail/project.xml
URL: http://svn.apache.org/viewvc/geronimo/sandbox/svkmerge/m2migration/configs/javamail/project.xml?rev=423336&r1=423335&r2=423336&view=diff
==============================================================================
--- geronimo/sandbox/svkmerge/m2migration/configs/javamail/project.xml (original)
+++ geronimo/sandbox/svkmerge/m2migration/configs/javamail/project.xml Tue Jul 18 18:47:14
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/m2migration/configs/rmi-naming/project.xml
URL: http://svn.apache.org/viewvc/geronimo/sandbox/svkmerge/m2migration/configs/rmi-naming/project.xml?rev=423336&r1=423335&r2=423336&view=diff
==============================================================================
--- geronimo/sandbox/svkmerge/m2migration/configs/rmi-naming/project.xml (original)
+++ geronimo/sandbox/svkmerge/m2migration/configs/rmi-naming/project.xml Tue Jul 18 18:47:14
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/m2migration/configs/sharedlib/project.properties
URL: http://svn.apache.org/viewvc/geronimo/sandbox/svkmerge/m2migration/configs/sharedlib/project.properties?rev=423336&r1=423335&r2=423336&view=diff
==============================================================================
--- geronimo/sandbox/svkmerge/m2migration/configs/sharedlib/project.properties (original)
+++ geronimo/sandbox/svkmerge/m2migration/configs/sharedlib/project.properties Tue Jul 18
18:47:14 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/m2migration/configs/unavailable-client-deployer/project.properties
URL: http://svn.apache.org/viewvc/geronimo/sandbox/svkmerge/m2migration/configs/unavailable-client-deployer/project.properties?rev=423336&r1=423335&r2=423336&view=diff
==============================================================================
--- geronimo/sandbox/svkmerge/m2migration/configs/unavailable-client-deployer/project.properties
(original)
+++ geronimo/sandbox/svkmerge/m2migration/configs/unavailable-client-deployer/project.properties
Tue Jul 18 18:47:14 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/m2migration/configs/unavailable-ejb-deployer/project.properties
URL: http://svn.apache.org/viewvc/geronimo/sandbox/svkmerge/m2migration/configs/unavailable-ejb-deployer/project.properties?rev=423336&r1=423335&r2=423336&view=diff
==============================================================================
--- geronimo/sandbox/svkmerge/m2migration/configs/unavailable-ejb-deployer/project.properties
(original)
+++ geronimo/sandbox/svkmerge/m2migration/configs/unavailable-ejb-deployer/project.properties
Tue Jul 18 18:47:14 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/m2migration/configs/unavailable-webservices-deployer/project.properties
URL: http://svn.apache.org/viewvc/geronimo/sandbox/svkmerge/m2migration/configs/unavailable-webservices-deployer/project.properties?rev=423336&r1=423335&r2=423336&view=diff
==============================================================================
--- geronimo/sandbox/svkmerge/m2migration/configs/unavailable-webservices-deployer/project.properties
(original)
+++ geronimo/sandbox/svkmerge/m2migration/configs/unavailable-webservices-deployer/project.properties
Tue Jul 18 18:47:14 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



Mime
View raw message