Re: svn commit: r421872 - in /geronimo/trunk: ./ assemblies/j2ee-jetty-server/ assemblies/j2ee-tomcat-server/ assemblies/zzzzj2ee-installer/ configs/javamail/ configs/rmi-naming/ etc/ modules/ modules

2006-07-16 Thread Jason Dillon
According to peeps on repository@ (and this pom http://www.apache.org/ 
dist/maven-repository/org/apache/apache/2/apache-2.pom) these are the  
official m2 repos:


Releases: http://www.apache.org/dist/maven-repository
Snapshots: http://people.apache.org/maven-snapshot-repository

There was some talk about moving releases to people... dunno when  
that will happen though.


I've pushed out a snap of Genesis and am testing a push of 1.2- 
SNAPSHOT of G now.


Seems to work fine, we should configure the specs to use the same  
config (if they aren't already).


--jason


On Jul 15, 2006, at 6:20 PM, Matt Hogstrom wrote:


I think the official repos are:

www/people.apache.org/java-repository is M1 and
www/people.apache.org/maven-repository is M2

These are the SNAPSHOT repos anyway.  Clear as mud now :)

Jason Dillon wrote:

On Jul 14, 2006, at 11:08 AM, Rick McGuire wrote:

Jason Dillon wrote:

Where are the Javamail-1.3 1.2-SNAPSHOT artifacts deployed?
I'm not sure they are yet.  This is the level built if you build  
the specs freshly.  What's the process of getting the snapshots  
published?
Dunno... I need to know that too soon to start getting genesis and  
g 1.2-SNAPSHOTS published w/m2.
I'm still kinda confused as to which are the official Apache m1 +  
m2 repositories.

--jason




Re: svn commit: r421872 - in /geronimo/trunk: ./ assemblies/j2ee-jetty-server/ assemblies/j2ee-tomcat-server/ assemblies/zzzzj2ee-installer/ configs/javamail/ configs/rmi-naming/ etc/ modules/ modules

2006-07-15 Thread Matt Hogstrom

I think the official repos are:

www/people.apache.org/java-repository is M1 and
www/people.apache.org/maven-repository is M2

These are the SNAPSHOT repos anyway.  Clear as mud now :)

Jason Dillon wrote:

On Jul 14, 2006, at 11:08 AM, Rick McGuire wrote:

Jason Dillon wrote:

Where are the Javamail-1.3 1.2-SNAPSHOT artifacts deployed?
I'm not sure they are yet.  This is the level built if you build the 
specs freshly.  What's the process of getting the snapshots published?


Dunno... I need to know that too soon to start getting genesis and g 
1.2-SNAPSHOTS published w/m2.


I'm still kinda confused as to which are the official Apache m1 + m2 
repositories.


--jason






Re: svn commit: r421872 - in /geronimo/trunk: ./ assemblies/j2ee-jetty-server/ assemblies/j2ee-tomcat-server/ assemblies/zzzzj2ee-installer/ configs/javamail/ configs/rmi-naming/ etc/ modules/ modules

2006-07-14 Thread Jason Dillon

Where are the Javamail-1.3 1.2-SNAPSHOT artifacts deployed?

--jason


On Jul 14, 2006, at 4:26 AM, [EMAIL PROTECTED] wrote:


Author: rickmcguire
Date: Fri Jul 14 04:26:41 2006
New Revision: 421872

URL: http://svn.apache.org/viewvc?rev=421872view=rev
Log:
GERONIMO-2147 Remove javamail-transport from Geronimo build and  
replace with javamail-provider dependency.



Removed:
geronimo/trunk/modules/javamail-transport/
Modified:
geronimo/trunk/assemblies/j2ee-jetty-server/project.xml
geronimo/trunk/assemblies/j2ee-tomcat-server/project.xml
geronimo/trunk/assemblies/j2ee-installer/project.xml
geronimo/trunk/configs/javamail/project.xml
geronimo/trunk/configs/rmi-naming/project.xml
geronimo/trunk/etc/project.properties
geronimo/trunk/modules/activation/project.xml
geronimo/trunk/modules/axis/project.xml
geronimo/trunk/modules/mail/pom.xml
geronimo/trunk/modules/mail/project.xml
geronimo/trunk/modules/pom.xml
geronimo/trunk/modules/upgrade/src/test-data/appclient_dep_1.xml
geronimo/trunk/modules/upgrade/src/test-data/ 
appclient_dep_1_result.xml

geronimo/trunk/pom.xml

Modified: geronimo/trunk/assemblies/j2ee-jetty-server/project.xml
URL: http://svn.apache.org/viewvc/geronimo/trunk/assemblies/j2ee- 
jetty-server/project.xml?rev=421872r1=421871r2=421872view=diff
== 


--- geronimo/trunk/assemblies/j2ee-jetty-server/project.xml (original)
+++ geronimo/trunk/assemblies/j2ee-jetty-server/project.xml Fri Jul  
14 04:26:41 2006

@@ -25,7 +25,7 @@
 descriptionAn assembly of Geronimo into a J2EE Server using  
Jetty as the web container/description


 dependencies
-!-- plugin we use --
+!-- plugin we use --
 dependency
 groupIdgeronimo/groupId
 artifactIdgeronimo-assembly-plugin/artifactId
@@ -292,7 +292,7 @@
 geronimo.assembleinstall/geronimo.assemble
 /properties
 /dependency
-!-- unpack --
+!-- unpack --
 dependency
 groupIdgeronimo/groupId
 artifactIdgeronimo-scripts/artifactId
@@ -359,7 +359,7 @@
 geronimo.assemblelibrary/geronimo.assemble
 /properties
 /dependency
-
+
dependency
 groupIdgeronimo/groupId
 artifactIdgeronimo-kernel/artifactId
@@ -368,7 +368,7 @@
 geronimo.assemblelibrary/geronimo.assemble
 /properties
 /dependency
-
+
 dependency
 groupIdgeronimo/groupId
 artifactIdgeronimo-system/artifactId
@@ -639,7 +639,7 @@
 dependency
 groupIdorg.apache.geronimo.specs/groupId
 artifactIdgeronimo-javamail_1.3.1_spec/artifactId
-version${geronimo_spec_javamail_version}/version
+version${geronimo_spec_javamail_13_version}/version
 /dependency
 dependency
 groupIdorg.apache.geronimo.specs/groupId
@@ -701,14 +701,14 @@
 dependency
 groupIdantlr/groupId
 artifactIdantlr/artifactId
-version${antlr_version}/version
+version${antlr_version}/version
 /dependency

 dependency
 !--what is using this? --
 groupIdasm/groupId
 artifactIdasm/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
 groupIdgeronimo/groupId

Modified: geronimo/trunk/assemblies/j2ee-tomcat-server/project.xml
URL: http://svn.apache.org/viewvc/geronimo/trunk/assemblies/j2ee- 
tomcat-server/project.xml?rev=421872r1=421871r2=421872view=diff
== 

--- geronimo/trunk/assemblies/j2ee-tomcat-server/project.xml  
(original)
+++ geronimo/trunk/assemblies/j2ee-tomcat-server/project.xml Fri  
Jul 14 04:26:41 2006

@@ -25,7 +25,7 @@
 descriptionAn assembly of Geronimo into a J2EE Server using  
Tomcat for the web container/description


 dependencies
-!-- plugin we use --
+!-- plugin we use --
 dependency
 groupIdgeronimo/groupId
 artifactIdgeronimo-assembly-plugin/artifactId
@@ -292,7 +292,7 @@
 geronimo.assembleinstall/geronimo.assemble
 /properties
 /dependency
-!-- unpack --
+!-- unpack --
 dependency
 groupIdgeronimo/groupId
 artifactIdgeronimo-scripts/artifactId
@@ -359,7 +359,7 @@
 geronimo.assemblelibrary/geronimo.assemble
 /properties
 /dependency
-
+
dependency
 groupIdgeronimo/groupId

Re: svn commit: r421872 - in /geronimo/trunk: ./ assemblies/j2ee-jetty-server/ assemblies/j2ee-tomcat-server/ assemblies/zzzzj2ee-installer/ configs/javamail/ configs/rmi-naming/ etc/ modules/ modules

2006-07-14 Thread Rick McGuire

Jason Dillon wrote:

Where are the Javamail-1.3 1.2-SNAPSHOT artifacts deployed?
I'm not sure they are yet.  This is the level built if you build the 
specs freshly.  What's the process of getting the snapshots published?


Rick



--jason


On Jul 14, 2006, at 4:26 AM, [EMAIL PROTECTED] wrote:


Author: rickmcguire
Date: Fri Jul 14 04:26:41 2006
New Revision: 421872

URL: http://svn.apache.org/viewvc?rev=421872view=rev
Log:
GERONIMO-2147 Remove javamail-transport from Geronimo build and 
replace with javamail-provider dependency.



Removed:
geronimo/trunk/modules/javamail-transport/
Modified:
geronimo/trunk/assemblies/j2ee-jetty-server/project.xml
geronimo/trunk/assemblies/j2ee-tomcat-server/project.xml
geronimo/trunk/assemblies/j2ee-installer/project.xml
geronimo/trunk/configs/javamail/project.xml
geronimo/trunk/configs/rmi-naming/project.xml
geronimo/trunk/etc/project.properties
geronimo/trunk/modules/activation/project.xml
geronimo/trunk/modules/axis/project.xml
geronimo/trunk/modules/mail/pom.xml
geronimo/trunk/modules/mail/project.xml
geronimo/trunk/modules/pom.xml
geronimo/trunk/modules/upgrade/src/test-data/appclient_dep_1.xml

geronimo/trunk/modules/upgrade/src/test-data/appclient_dep_1_result.xml

geronimo/trunk/pom.xml

Modified: geronimo/trunk/assemblies/j2ee-jetty-server/project.xml
URL: 
http://svn.apache.org/viewvc/geronimo/trunk/assemblies/j2ee-jetty-server/project.xml?rev=421872r1=421871r2=421872view=diff 

== 


--- geronimo/trunk/assemblies/j2ee-jetty-server/project.xml (original)
+++ geronimo/trunk/assemblies/j2ee-jetty-server/project.xml Fri Jul 
14 04:26:41 2006

@@ -25,7 +25,7 @@
 descriptionAn assembly of Geronimo into a J2EE Server using 
Jetty as the web container/description


 dependencies
-!-- plugin we use --
+!-- plugin we use --
 dependency
 groupIdgeronimo/groupId
 artifactIdgeronimo-assembly-plugin/artifactId
@@ -292,7 +292,7 @@
 geronimo.assembleinstall/geronimo.assemble
 /properties
 /dependency
-!-- unpack --
+!-- unpack --
 dependency
 groupIdgeronimo/groupId
 artifactIdgeronimo-scripts/artifactId
@@ -359,7 +359,7 @@
 geronimo.assemblelibrary/geronimo.assemble
 /properties
 /dependency
-
+
dependency
 groupIdgeronimo/groupId
 artifactIdgeronimo-kernel/artifactId
@@ -368,7 +368,7 @@
 geronimo.assemblelibrary/geronimo.assemble
 /properties
 /dependency
-
+
 dependency
 groupIdgeronimo/groupId
 artifactIdgeronimo-system/artifactId
@@ -639,7 +639,7 @@
 dependency
 groupIdorg.apache.geronimo.specs/groupId
 artifactIdgeronimo-javamail_1.3.1_spec/artifactId
-version${geronimo_spec_javamail_version}/version
+version${geronimo_spec_javamail_13_version}/version
 /dependency
 dependency
 groupIdorg.apache.geronimo.specs/groupId
@@ -701,14 +701,14 @@
 dependency
 groupIdantlr/groupId
 artifactIdantlr/artifactId
-version${antlr_version}/version
+version${antlr_version}/version
 /dependency

 dependency
 !--what is using this? --
 groupIdasm/groupId
 artifactIdasm/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
 groupIdgeronimo/groupId

Modified: geronimo/trunk/assemblies/j2ee-tomcat-server/project.xml
URL: 
http://svn.apache.org/viewvc/geronimo/trunk/assemblies/j2ee-tomcat-server/project.xml?rev=421872r1=421871r2=421872view=diff 

== 


--- geronimo/trunk/assemblies/j2ee-tomcat-server/project.xml (original)
+++ geronimo/trunk/assemblies/j2ee-tomcat-server/project.xml Fri Jul 
14 04:26:41 2006

@@ -25,7 +25,7 @@
 descriptionAn assembly of Geronimo into a J2EE Server using 
Tomcat for the web container/description


 dependencies
-!-- plugin we use --
+!-- plugin we use --
 dependency
 groupIdgeronimo/groupId
 artifactIdgeronimo-assembly-plugin/artifactId
@@ -292,7 +292,7 @@
 geronimo.assembleinstall/geronimo.assemble
 /properties
 /dependency
-!-- unpack --
+!-- unpack --
 dependency
 groupIdgeronimo/groupId
 artifactIdgeronimo-scripts/artifactId
@@ -359,7 +359,7 @@
 

Re: svn commit: r421872 - in /geronimo/trunk: ./ assemblies/j2ee-jetty-server/ assemblies/j2ee-tomcat-server/ assemblies/zzzzj2ee-installer/ configs/javamail/ configs/rmi-naming/ etc/ modules/ modules

2006-07-14 Thread Jason Dillon

On Jul 14, 2006, at 11:08 AM, Rick McGuire wrote:

Jason Dillon wrote:

Where are the Javamail-1.3 1.2-SNAPSHOT artifacts deployed?
I'm not sure they are yet.  This is the level built if you build  
the specs freshly.  What's the process of getting the snapshots  
published?


Dunno... I need to know that too soon to start getting genesis and g  
1.2-SNAPSHOTS published w/m2.


I'm still kinda confused as to which are the official Apache m1 + m2  
repositories.


--jason



Re: svn commit: r421872 - in /geronimo/trunk: ./ assemblies/j2ee-jetty-server/ assemblies/j2ee-tomcat-server/ assemblies/zzzzj2ee-installer/ configs/javamail/ configs/rmi-naming/ etc/ modules/ modules

2006-07-14 Thread Kevan Miller
We've been letting the GBuild builds push out the Maven 1 artifacts.  
I was just working on getting the javamail spec into gbuild, since  
this is killing the Geronimo 1.2 build.


We need some process for getting Maven 2 artifacts deployed. Jason,  
didn't you have some ideas on how to get that done? Tuscany would  
like our fixed Commonj spec to be published to a Maven 2 repo...


--kevan

On Jul 14, 2006, at 2:14 PM, Jason Dillon wrote:


On Jul 14, 2006, at 11:08 AM, Rick McGuire wrote:

Jason Dillon wrote:

Where are the Javamail-1.3 1.2-SNAPSHOT artifacts deployed?
I'm not sure they are yet.  This is the level built if you build  
the specs freshly.  What's the process of getting the snapshots  
published?


Dunno... I need to know that too soon to start getting genesis and  
g 1.2-SNAPSHOTS published w/m2.


I'm still kinda confused as to which are the official Apache m1 +  
m2 repositories.


--jason





Re: svn commit: r421872 - in /geronimo/trunk: ./ assemblies/j2ee-jetty-server/ assemblies/j2ee-tomcat-server/ assemblies/zzzzj2ee-installer/ configs/javamail/ configs/rmi-naming/ etc/ modules/ modules

2006-07-14 Thread Jason Dillon

I have not had a chance to look into this more.

I'm going to ping repository@ and see what the current official  
locations are for m2 artifacts (release + snapshot + sync to central).


--jason


On Jul 14, 2006, at 12:33 PM, Kevan Miller wrote:

We've been letting the GBuild builds push out the Maven 1  
artifacts. I was just working on getting the javamail spec into  
gbuild, since this is killing the Geronimo 1.2 build.


We need some process for getting Maven 2 artifacts deployed. Jason,  
didn't you have some ideas on how to get that done? Tuscany would  
like our fixed Commonj spec to be published to a Maven 2 repo...


--kevan

On Jul 14, 2006, at 2:14 PM, Jason Dillon wrote:


On Jul 14, 2006, at 11:08 AM, Rick McGuire wrote:

Jason Dillon wrote:

Where are the Javamail-1.3 1.2-SNAPSHOT artifacts deployed?
I'm not sure they are yet.  This is the level built if you build  
the specs freshly.  What's the process of getting the snapshots  
published?


Dunno... I need to know that too soon to start getting genesis and  
g 1.2-SNAPSHOTS published w/m2.


I'm still kinda confused as to which are the official Apache m1 +  
m2 repositories.


--jason







Re: svn commit: r421872 - in /geronimo/trunk: ./ assemblies/j2ee-jetty-server/ assemblies/j2ee-tomcat-server/ assemblies/zzzzj2ee-installer/ configs/javamail/ configs/rmi-naming/ etc/ modules/ modules

2006-07-14 Thread Kevan Miller

Thanks.

BTW, the new Javamail 1.3.1 spec has been built on continuum. It  
should be synced up w/ people.apache.org, shortly...


--kevan

On Jul 14, 2006, at 5:42 PM, Jason Dillon wrote:


I have not had a chance to look into this more.

I'm going to ping repository@ and see what the current official  
locations are for m2 artifacts (release + snapshot + sync to central).


--jason


On Jul 14, 2006, at 12:33 PM, Kevan Miller wrote:

We've been letting the GBuild builds push out the Maven 1  
artifacts. I was just working on getting the javamail spec into  
gbuild, since this is killing the Geronimo 1.2 build.


We need some process for getting Maven 2 artifacts deployed.  
Jason, didn't you have some ideas on how to get that done? Tuscany  
would like our fixed Commonj spec to be published to a Maven 2  
repo...


--kevan

On Jul 14, 2006, at 2:14 PM, Jason Dillon wrote:


On Jul 14, 2006, at 11:08 AM, Rick McGuire wrote:

Jason Dillon wrote:

Where are the Javamail-1.3 1.2-SNAPSHOT artifacts deployed?
I'm not sure they are yet.  This is the level built if you build  
the specs freshly.  What's the process of getting the snapshots  
published?


Dunno... I need to know that too soon to start getting genesis  
and g 1.2-SNAPSHOTS published w/m2.


I'm still kinda confused as to which are the official Apache m1 +  
m2 repositories.


--jason









Re: svn commit: r421872 - in /geronimo/trunk: ./ assemblies/j2ee-jetty-server/ assemblies/j2ee-tomcat-server/ assemblies/zzzzj2ee-installer/ configs/javamail/ configs/rmi-naming/ etc/ modules/ modules

2006-07-14 Thread Jason Dillon

What URL on people.* ?

--jason


On Jul 14, 2006, at 2:54 PM, Kevan Miller wrote:


Thanks.

BTW, the new Javamail 1.3.1 spec has been built on continuum. It  
should be synced up w/ people.apache.org, shortly...


--kevan

On Jul 14, 2006, at 5:42 PM, Jason Dillon wrote:


I have not had a chance to look into this more.

I'm going to ping repository@ and see what the current official  
locations are for m2 artifacts (release + snapshot + sync to  
central).


--jason


On Jul 14, 2006, at 12:33 PM, Kevan Miller wrote:

We've been letting the GBuild builds push out the Maven 1  
artifacts. I was just working on getting the javamail spec into  
gbuild, since this is killing the Geronimo 1.2 build.


We need some process for getting Maven 2 artifacts deployed.  
Jason, didn't you have some ideas on how to get that done?  
Tuscany would like our fixed Commonj spec to be published to a  
Maven 2 repo...


--kevan

On Jul 14, 2006, at 2:14 PM, Jason Dillon wrote:


On Jul 14, 2006, at 11:08 AM, Rick McGuire wrote:

Jason Dillon wrote:

Where are the Javamail-1.3 1.2-SNAPSHOT artifacts deployed?
I'm not sure they are yet.  This is the level built if you  
build the specs freshly.  What's the process of getting the  
snapshots published?


Dunno... I need to know that too soon to start getting genesis  
and g 1.2-SNAPSHOTS published w/m2.


I'm still kinda confused as to which are the official Apache m1  
+ m2 repositories.


--jason











Re: svn commit: r421872 - in /geronimo/trunk: ./ assemblies/j2ee-jetty-server/ assemblies/j2ee-tomcat-server/ assemblies/zzzzj2ee-installer/ configs/javamail/ configs/rmi-naming/ etc/ modules/ modules

2006-07-14 Thread Kevan Miller


On Jul 14, 2006, at 6:02 PM, Jason Dillon wrote:


What URL on people.* ?


The M1 SNAPSHOT repo -- http://people.apache.org/repository/ 
org.apache.geronimo.specs/jars/


It's not there yet. I'm not sure how frequent the rsync runs...

--kevan



--jason


On Jul 14, 2006, at 2:54 PM, Kevan Miller wrote:


Thanks.

BTW, the new Javamail 1.3.1 spec has been built on continuum. It  
should be synced up w/ people.apache.org, shortly...


--kevan

On Jul 14, 2006, at 5:42 PM, Jason Dillon wrote:


I have not had a chance to look into this more.

I'm going to ping repository@ and see what the current official  
locations are for m2 artifacts (release + snapshot + sync to  
central).


--jason


On Jul 14, 2006, at 12:33 PM, Kevan Miller wrote:

We've been letting the GBuild builds push out the Maven 1  
artifacts. I was just working on getting the javamail spec into  
gbuild, since this is killing the Geronimo 1.2 build.


We need some process for getting Maven 2 artifacts deployed.  
Jason, didn't you have some ideas on how to get that done?  
Tuscany would like our fixed Commonj spec to be published to a  
Maven 2 repo...


--kevan

On Jul 14, 2006, at 2:14 PM, Jason Dillon wrote:


On Jul 14, 2006, at 11:08 AM, Rick McGuire wrote:

Jason Dillon wrote:

Where are the Javamail-1.3 1.2-SNAPSHOT artifacts deployed?
I'm not sure they are yet.  This is the level built if you  
build the specs freshly.  What's the process of getting the  
snapshots published?


Dunno... I need to know that too soon to start getting genesis  
and g 1.2-SNAPSHOTS published w/m2.


I'm still kinda confused as to which are the official Apache m1  
+ m2 repositories.


--jason













Re: svn commit: r421872 - in /geronimo/trunk: ./ assemblies/j2ee-jetty-server/ assemblies/j2ee-tomcat-server/ assemblies/zzzzj2ee-installer/ configs/javamail/ configs/rmi-naming/ etc/ modules/ modules

2006-07-14 Thread Jason Dillon
I will apply this to m2migration once we have the latest specs  
published to the m2 repo.


Else we will have to bootstrap the specs... :-(

--jason


On Jul 14, 2006, at 4:26 AM, [EMAIL PROTECTED] wrote:


Author: rickmcguire
Date: Fri Jul 14 04:26:41 2006
New Revision: 421872

URL: http://svn.apache.org/viewvc?rev=421872view=rev
Log:
GERONIMO-2147 Remove javamail-transport from Geronimo build and  
replace with javamail-provider dependency.



Removed:
geronimo/trunk/modules/javamail-transport/
Modified:
geronimo/trunk/assemblies/j2ee-jetty-server/project.xml
geronimo/trunk/assemblies/j2ee-tomcat-server/project.xml
geronimo/trunk/assemblies/j2ee-installer/project.xml
geronimo/trunk/configs/javamail/project.xml
geronimo/trunk/configs/rmi-naming/project.xml
geronimo/trunk/etc/project.properties
geronimo/trunk/modules/activation/project.xml
geronimo/trunk/modules/axis/project.xml
geronimo/trunk/modules/mail/pom.xml
geronimo/trunk/modules/mail/project.xml
geronimo/trunk/modules/pom.xml
geronimo/trunk/modules/upgrade/src/test-data/appclient_dep_1.xml
geronimo/trunk/modules/upgrade/src/test-data/ 
appclient_dep_1_result.xml

geronimo/trunk/pom.xml

Modified: geronimo/trunk/assemblies/j2ee-jetty-server/project.xml
URL: http://svn.apache.org/viewvc/geronimo/trunk/assemblies/j2ee- 
jetty-server/project.xml?rev=421872r1=421871r2=421872view=diff
== 


--- geronimo/trunk/assemblies/j2ee-jetty-server/project.xml (original)
+++ geronimo/trunk/assemblies/j2ee-jetty-server/project.xml Fri Jul  
14 04:26:41 2006

@@ -25,7 +25,7 @@
 descriptionAn assembly of Geronimo into a J2EE Server using  
Jetty as the web container/description


 dependencies
-!-- plugin we use --
+!-- plugin we use --
 dependency
 groupIdgeronimo/groupId
 artifactIdgeronimo-assembly-plugin/artifactId
@@ -292,7 +292,7 @@
 geronimo.assembleinstall/geronimo.assemble
 /properties
 /dependency
-!-- unpack --
+!-- unpack --
 dependency
 groupIdgeronimo/groupId
 artifactIdgeronimo-scripts/artifactId
@@ -359,7 +359,7 @@
 geronimo.assemblelibrary/geronimo.assemble
 /properties
 /dependency
-
+
dependency
 groupIdgeronimo/groupId
 artifactIdgeronimo-kernel/artifactId
@@ -368,7 +368,7 @@
 geronimo.assemblelibrary/geronimo.assemble
 /properties
 /dependency
-
+
 dependency
 groupIdgeronimo/groupId
 artifactIdgeronimo-system/artifactId
@@ -639,7 +639,7 @@
 dependency
 groupIdorg.apache.geronimo.specs/groupId
 artifactIdgeronimo-javamail_1.3.1_spec/artifactId
-version${geronimo_spec_javamail_version}/version
+version${geronimo_spec_javamail_13_version}/version
 /dependency
 dependency
 groupIdorg.apache.geronimo.specs/groupId
@@ -701,14 +701,14 @@
 dependency
 groupIdantlr/groupId
 artifactIdantlr/artifactId
-version${antlr_version}/version
+version${antlr_version}/version
 /dependency

 dependency
 !--what is using this? --
 groupIdasm/groupId
 artifactIdasm/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
 groupIdgeronimo/groupId

Modified: geronimo/trunk/assemblies/j2ee-tomcat-server/project.xml
URL: http://svn.apache.org/viewvc/geronimo/trunk/assemblies/j2ee- 
tomcat-server/project.xml?rev=421872r1=421871r2=421872view=diff
== 

--- geronimo/trunk/assemblies/j2ee-tomcat-server/project.xml  
(original)
+++ geronimo/trunk/assemblies/j2ee-tomcat-server/project.xml Fri  
Jul 14 04:26:41 2006

@@ -25,7 +25,7 @@
 descriptionAn assembly of Geronimo into a J2EE Server using  
Tomcat for the web container/description


 dependencies
-!-- plugin we use --
+!-- plugin we use --
 dependency
 groupIdgeronimo/groupId
 artifactIdgeronimo-assembly-plugin/artifactId
@@ -292,7 +292,7 @@
 geronimo.assembleinstall/geronimo.assemble
 /properties
 /dependency
-!-- unpack --
+!-- unpack --
 dependency
 groupIdgeronimo/groupId
 artifactIdgeronimo-scripts/artifactId
@@ -359,7 +359,7 @@
 geronimo.assemblelibrary/geronimo.assemble
 /properties