geronimo-scm mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From d...@apache.org
Subject svn commit: r429506 - in /geronimo/branches/dain/notcm: ./ configs/j2ee-system/ m2-assemblies/geronimo-jetty-j2ee/src/main/assembly/ m2-assemblies/geronimo-jetty-minimal/src/main/assembly/ m2-assemblies/geronimo-tomcat-j2ee/src/main/assembly/ m2-assemb...
Date Mon, 07 Aug 2006 22:54:24 GMT
Author: dain
Date: Mon Aug  7 15:54:23 2006
New Revision: 429506

URL: http://svn.apache.org/viewvc?rev=429506&view=rev
Log:
Added backport-concurrent-util to manifest classpath of server.jar and lib dir
Merged Jason's change to fix logging

Modified:
    geronimo/branches/dain/notcm/configs/j2ee-system/pom.xml
    geronimo/branches/dain/notcm/m2-assemblies/geronimo-jetty-j2ee/src/main/assembly/bin.xml
    geronimo/branches/dain/notcm/m2-assemblies/geronimo-jetty-minimal/src/main/assembly/bin.xml
    geronimo/branches/dain/notcm/m2-assemblies/geronimo-tomcat-j2ee/src/main/assembly/bin.xml
    geronimo/branches/dain/notcm/m2-assemblies/geronimo-tomcat-minimal/src/main/assembly/bin.xml
    geronimo/branches/dain/notcm/modules/kernel/pom.xml
    geronimo/branches/dain/notcm/pom.xml

Modified: geronimo/branches/dain/notcm/configs/j2ee-system/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/branches/dain/notcm/configs/j2ee-system/pom.xml?rev=429506&r1=429505&r2=429506&view=diff
==============================================================================
--- geronimo/branches/dain/notcm/configs/j2ee-system/pom.xml (original)
+++ geronimo/branches/dain/notcm/configs/j2ee-system/pom.xml Mon Aug  7 15:54:23 2006
@@ -68,6 +68,7 @@
                         <element>../lib/geronimo-kernel-${pom.version}.jar</element>
                         <element>../lib/geronimo-system-${pom.version}.jar</element>
                         <element>../lib/geronimo-util-${pom.version}.jar</element>
+                        <element>../lib/backport-util-concurrent-${backportUtilVersion}.jar</element>
                         <element>../lib/cglib-nodep-${cglibVersion}.jar</element>
                         <element>../lib/concurrent-${concurrentVersion}.jar</element>
                         <element>../lib/commons-cli-${commonsCliVersion}.jar</element>

Modified: geronimo/branches/dain/notcm/m2-assemblies/geronimo-jetty-j2ee/src/main/assembly/bin.xml
URL: http://svn.apache.org/viewvc/geronimo/branches/dain/notcm/m2-assemblies/geronimo-jetty-j2ee/src/main/assembly/bin.xml?rev=429506&r1=429505&r2=429506&view=diff
==============================================================================
--- geronimo/branches/dain/notcm/m2-assemblies/geronimo-jetty-j2ee/src/main/assembly/bin.xml
(original)
+++ geronimo/branches/dain/notcm/m2-assemblies/geronimo-jetty-j2ee/src/main/assembly/bin.xml
Mon Aug  7 15:54:23 2006
@@ -38,6 +38,7 @@
         <dependencySet>
             <outputDirectory>lib</outputDirectory>
             <includes>
+                <include>backport-util-concurrent:backport-util-concurrent</include>
                 <include>cglib:cglib-nodep</include>
                 <include>commons-cli:commons-cli</include>
                 <include>commons-logging:commons-logging</include>

Modified: geronimo/branches/dain/notcm/m2-assemblies/geronimo-jetty-minimal/src/main/assembly/bin.xml
URL: http://svn.apache.org/viewvc/geronimo/branches/dain/notcm/m2-assemblies/geronimo-jetty-minimal/src/main/assembly/bin.xml?rev=429506&r1=429505&r2=429506&view=diff
==============================================================================
--- geronimo/branches/dain/notcm/m2-assemblies/geronimo-jetty-minimal/src/main/assembly/bin.xml
(original)
+++ geronimo/branches/dain/notcm/m2-assemblies/geronimo-jetty-minimal/src/main/assembly/bin.xml
Mon Aug  7 15:54:23 2006
@@ -38,6 +38,7 @@
         <dependencySet>
             <outputDirectory>lib</outputDirectory>
             <includes>
+                <include>backport-util-concurrent:backport-util-concurrent</include>
                 <include>cglib:cglib-nodep</include>
                 <include>commons-cli:commons-cli</include>
                 <include>commons-logging:commons-logging</include>

Modified: geronimo/branches/dain/notcm/m2-assemblies/geronimo-tomcat-j2ee/src/main/assembly/bin.xml
URL: http://svn.apache.org/viewvc/geronimo/branches/dain/notcm/m2-assemblies/geronimo-tomcat-j2ee/src/main/assembly/bin.xml?rev=429506&r1=429505&r2=429506&view=diff
==============================================================================
--- geronimo/branches/dain/notcm/m2-assemblies/geronimo-tomcat-j2ee/src/main/assembly/bin.xml
(original)
+++ geronimo/branches/dain/notcm/m2-assemblies/geronimo-tomcat-j2ee/src/main/assembly/bin.xml
Mon Aug  7 15:54:23 2006
@@ -38,6 +38,7 @@
         <dependencySet>
             <outputDirectory>lib</outputDirectory>
             <includes>
+                <include>backport-util-concurrent:backport-util-concurrent</include>
                 <include>cglib:cglib-nodep</include>
                 <include>commons-cli:commons-cli</include>
                 <include>commons-logging:commons-logging</include>

Modified: geronimo/branches/dain/notcm/m2-assemblies/geronimo-tomcat-minimal/src/main/assembly/bin.xml
URL: http://svn.apache.org/viewvc/geronimo/branches/dain/notcm/m2-assemblies/geronimo-tomcat-minimal/src/main/assembly/bin.xml?rev=429506&r1=429505&r2=429506&view=diff
==============================================================================
--- geronimo/branches/dain/notcm/m2-assemblies/geronimo-tomcat-minimal/src/main/assembly/bin.xml
(original)
+++ geronimo/branches/dain/notcm/m2-assemblies/geronimo-tomcat-minimal/src/main/assembly/bin.xml
Mon Aug  7 15:54:23 2006
@@ -38,6 +38,7 @@
         <dependencySet>
             <outputDirectory>lib</outputDirectory>
             <includes>
+                <include>backport-util-concurrent:backport-util-concurrent</include>
                 <include>cglib:cglib-nodep</include>
                 <include>commons-cli:commons-cli</include>
                 <include>commons-logging:commons-logging</include>

Modified: geronimo/branches/dain/notcm/modules/kernel/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/branches/dain/notcm/modules/kernel/pom.xml?rev=429506&r1=429505&r2=429506&view=diff
==============================================================================
--- geronimo/branches/dain/notcm/modules/kernel/pom.xml (original)
+++ geronimo/branches/dain/notcm/modules/kernel/pom.xml Mon Aug  7 15:54:23 2006
@@ -100,6 +100,7 @@
             
             <resource>
                 <directory>src/META-INF</directory>
+                <targetPath>META-INF</targetPath>
             </resource>
         </resources>
     </build>

Modified: geronimo/branches/dain/notcm/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/branches/dain/notcm/pom.xml?rev=429506&r1=429505&r2=429506&view=diff
==============================================================================
--- geronimo/branches/dain/notcm/pom.xml (original)
+++ geronimo/branches/dain/notcm/pom.xml Mon Aug  7 15:54:23 2006
@@ -55,6 +55,7 @@
         <asn1Version>0.3.2</asn1Version>
         <apachedsVersion>0.9.2</apachedsVersion>
         <activeMqVersion>3.2.4-SNAPSHOT</activeMqVersion>
+        <backportUtilVersion>2.0_01_pd</backportUtilVersion>
         <commonsCliVersion>1.0</commonsCliVersion>
         <commonsLoggingVersion>1.0.4</commonsLoggingVersion>
         <cglibVersion>2.1_3</cglibVersion>
@@ -222,7 +223,7 @@
             <dependency>
                 <groupId>backport-util-concurrent</groupId>
                 <artifactId>backport-util-concurrent</artifactId>
-                <version>2.0_01_pd</version>
+                <version>${backportUtilVersion}</version>
             </dependency>
             
             <dependency>



Mime
View raw message