You are viewing a plain text version of this content. The canonical link for it is here.
Posted to scm@geronimo.apache.org by jd...@apache.org on 2006/07/19 03:22:45 UTC
svn commit: r423324 - in /geronimo/sandbox/svkmerge/m2migration/assemblies:
./ j2ee-jetty-server/ j2ee-jetty-server/src/var/log/ j2ee-tomcat-server/
j2ee-tomcat-server/src/var/log/ minimal-jetty-server/src/var/log/
minimal-tomcat-server/src/var/log/ zz...
Author: jdillon
Date: Tue Jul 18 18:22:44 2006
New Revision: 423324
URL: http://svn.apache.org/viewvc?rev=423324&view=rev
Log:
Sync from trunk
Removed:
geronimo/sandbox/svkmerge/m2migration/assemblies/j2ee-jetty-server/src/var/log/deployer-log4j.properties
geronimo/sandbox/svkmerge/m2migration/assemblies/j2ee-tomcat-server/src/var/log/deployer-log4j.properties
geronimo/sandbox/svkmerge/m2migration/assemblies/minimal-jetty-server/src/var/log/deployer-log4j.properties
geronimo/sandbox/svkmerge/m2migration/assemblies/minimal-tomcat-server/src/var/log/deployer-log4j.properties
geronimo/sandbox/svkmerge/m2migration/assemblies/zzzzj2ee-installer/src/var/log/deployer-log4j.properties
Modified:
geronimo/sandbox/svkmerge/m2migration/assemblies/ (props changed)
geronimo/sandbox/svkmerge/m2migration/assemblies/j2ee-jetty-server/project.xml
geronimo/sandbox/svkmerge/m2migration/assemblies/j2ee-tomcat-server/project.xml
geronimo/sandbox/svkmerge/m2migration/assemblies/zzzzj2ee-installer/project.xml
Propchange: geronimo/sandbox/svkmerge/m2migration/assemblies/
------------------------------------------------------------------------------
--- svk:merge (added)
+++ svk:merge Tue Jul 18 18:22:44 2006
@@ -0,0 +1 @@
+13f79535-47bb-0310-9956-ffa450edef68:/geronimo/sandbox/svkmerge/trunk/assemblies:423294
Modified: geronimo/sandbox/svkmerge/m2migration/assemblies/j2ee-jetty-server/project.xml
URL: http://svn.apache.org/viewvc/geronimo/sandbox/svkmerge/m2migration/assemblies/j2ee-jetty-server/project.xml?rev=423324&r1=423323&r2=423324&view=diff
==============================================================================
--- geronimo/sandbox/svkmerge/m2migration/assemblies/j2ee-jetty-server/project.xml (original)
+++ geronimo/sandbox/svkmerge/m2migration/assemblies/j2ee-jetty-server/project.xml Tue Jul 18 18:22:44 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/m2migration/assemblies/j2ee-tomcat-server/project.xml
URL: http://svn.apache.org/viewvc/geronimo/sandbox/svkmerge/m2migration/assemblies/j2ee-tomcat-server/project.xml?rev=423324&r1=423323&r2=423324&view=diff
==============================================================================
--- geronimo/sandbox/svkmerge/m2migration/assemblies/j2ee-tomcat-server/project.xml (original)
+++ geronimo/sandbox/svkmerge/m2migration/assemblies/j2ee-tomcat-server/project.xml Tue Jul 18 18:22:44 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/m2migration/assemblies/zzzzj2ee-installer/project.xml
URL: http://svn.apache.org/viewvc/geronimo/sandbox/svkmerge/m2migration/assemblies/zzzzj2ee-installer/project.xml?rev=423324&r1=423323&r2=423324&view=diff
==============================================================================
--- geronimo/sandbox/svkmerge/m2migration/assemblies/zzzzj2ee-installer/project.xml (original)
+++ geronimo/sandbox/svkmerge/m2migration/assemblies/zzzzj2ee-installer/project.xml Tue Jul 18 18:22:44 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>