svn commit: r426519 - in /geronimo/sandbox/svkmerge/m2migration/etc: ./ project.properties

[jd...@apache.org]

Author: jdillon
Date: Fri Jul 28 06:25:01 2006
New Revision: 426519

URL: http://svn.apache.org/viewvc?rev=426519&view=rev
Log:
 r426@Bliss (orig r422569):  jdillon | 2006-07-16 16:23:18 -0700
 Sync svkmerge/trunk to the latest trunk

Modified:
    geronimo/sandbox/svkmerge/m2migration/etc/   (props changed)
    geronimo/sandbox/svkmerge/m2migration/etc/project.properties

Propchange: geronimo/sandbox/svkmerge/m2migration/etc/
------------------------------------------------------------------------------
--- svk:merge (original)
+++ svk:merge Fri Jul 28 06:25:01 2006
@@ -1 +1 @@
-13f79535-47bb-0310-9956-ffa450edef68:/geronimo/sandbox/svkmerge/trunk/etc:420380
+13f79535-47bb-0310-9956-ffa450edef68:/geronimo/sandbox/svkmerge/trunk/etc:422569

Modified: geronimo/sandbox/svkmerge/m2migration/etc/project.properties
URL: http://svn.apache.org/viewvc/geronimo/sandbox/svkmerge/m2migration/etc/project.properties?rev=426519&r1=426518&r2=426519&view=diff
==============================================================================
--- geronimo/sandbox/svkmerge/m2migration/etc/project.properties (original)
+++ geronimo/sandbox/svkmerge/m2migration/etc/project.properties Fri Jul 28 06:25:01 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.