geronimo-scm mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From jdil...@apache.org
Subject svn commit: r421519 - in /geronimo/sandbox/svkmerge/m2migration: configs/j2ee-system/pom.xml pom.xml
Date Thu, 13 Jul 2006 06:58:39 GMT
Author: jdillon
Date: Wed Jul 12 23:58:39 2006
New Revision: 421519

URL: http://svn.apache.org/viewvc?rev=421519&view=rev
Log:
Add concurrent to the manifest of j2ee-system, required to start the server

Modified:
    geronimo/sandbox/svkmerge/m2migration/configs/j2ee-system/pom.xml
    geronimo/sandbox/svkmerge/m2migration/pom.xml

Modified: geronimo/sandbox/svkmerge/m2migration/configs/j2ee-system/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/sandbox/svkmerge/m2migration/configs/j2ee-system/pom.xml?rev=421519&r1=421518&r2=421519&view=diff
==============================================================================
--- geronimo/sandbox/svkmerge/m2migration/configs/j2ee-system/pom.xml (original)
+++ geronimo/sandbox/svkmerge/m2migration/configs/j2ee-system/pom.xml Wed Jul 12 23:58:39
2006
@@ -62,15 +62,19 @@
                 <groupId>org.apache.geronimo.plugins</groupId>
                 <artifactId>geronimo-packaging-plugin</artifactId>
                 <configuration>
-                    <!-- uses default DeploymentConfig=geronimo-gbean-deployer -->
-                    <!-- written to Manifest.mf -->
-                    <classPath>\
+                    <!--
+                    
+                    FIXME: Use <classPath><element>...</element> tp configure
the manifest's classpath
+                    
+                    -->
+                    <classPath>
                         ../lib/geronimo-qname_1.1_spec-${geronimoSpecQnameVersion}.jar \
                         ../lib/geronimo-common-${pom.version}.jar \
                         ../lib/geronimo-kernel-${pom.version}.jar \
                         ../lib/geronimo-system-${pom.version}.jar \
                         ../lib/geronimo-util-${pom.version}.jar \
                         ../lib/cglib-nodep-${cglibVersion}.jar \
+                        ../lib/concurrent-${concurrentVersion}.jar \
                         ../lib/commons-cli-${commonsCliVersion}.jar \
                         ../lib/commons-logging-${commonsLoggingVersion}.jar \
                         ../lib/log4j-${log4jVersion}.jar \
@@ -79,11 +83,10 @@
                         ../lib/endorsed/xercesImpl-${xercesVersion}.jar \
                         ../lib/endorsed/xmlParserAPIs-${xmlParserApisVersion}.jar \
                         ../lib/xpp3-${xpp3Version}.jar \
-                        ../lib/xstream-${xstreamVersion}.jar</classPath>
-                     <mainClass>org.apache.geronimo.system.main.Daemon</mainClass>
-                     <logLevel>DEBUG</logLevel>
-                     <!-- default endorsedDirs and extensionDirs -->
-                     <!-- default explicitResolutionLocation -->
+                        ../lib/xstream-${xstreamVersion}.jar
+                    </classPath>
+                    <mainClass>org.apache.geronimo.system.main.Daemon</mainClass>
+                    <logLevel>DEBUG</logLevel>
                 </configuration>
             </plugin>
         </plugins>

Modified: geronimo/sandbox/svkmerge/m2migration/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/sandbox/svkmerge/m2migration/pom.xml?rev=421519&r1=421518&r2=421519&view=diff
==============================================================================
--- geronimo/sandbox/svkmerge/m2migration/pom.xml (original)
+++ geronimo/sandbox/svkmerge/m2migration/pom.xml Wed Jul 12 23:58:39 2006
@@ -94,6 +94,7 @@
         <geronimoSpecQnameVersion>1.0.1</geronimoSpecQnameVersion>
         <geronimoSpecJ2eeDeploymentVersion>1.0.1</geronimoSpecJ2eeDeploymentVersion>
         <geronimoSpecJmsVersion>1.0.1</geronimoSpecJmsVersion>
+        <concurrentVersion>1.3.4</concurrentVersion>
     </properties>
     
     <dependencyManagement>
@@ -251,7 +252,7 @@
             <dependency>
                 <groupId>concurrent</groupId>
                 <artifactId>concurrent</artifactId>
-                <version>1.3.4</version>
+                <version>${concurrentVersion}</version>
             </dependency>
             
             <dependency>



Mime
View raw message