You are viewing a plain text version of this content. The canonical link for it is here.
Posted to scm@geronimo.apache.org by ga...@apache.org on 2008/06/25 22:26:53 UTC
svn commit: r671646 - in /geronimo/server/trunk:
framework/configs/jee-specs/ plugins/concurrent/concurrent/
testsuite/concurrent-testsuite/concurrent-ejb/src/main/resources/META-INF/
testsuite/concurrent-testsuite/concurrent-war/src/main/webapp/WEB-INF/
Author: gawor
Date: Wed Jun 25 13:26:53 2008
New Revision: 671646
URL: http://svn.apache.org/viewvc?rev=671646&view=rev
Log:
make concurrent-deployer work in offline mode
Modified:
geronimo/server/trunk/framework/configs/jee-specs/pom.xml
geronimo/server/trunk/plugins/concurrent/concurrent/pom.xml
geronimo/server/trunk/testsuite/concurrent-testsuite/concurrent-ejb/src/main/resources/META-INF/openejb-jar.xml
geronimo/server/trunk/testsuite/concurrent-testsuite/concurrent-war/src/main/webapp/WEB-INF/geronimo-web.xml
Modified: geronimo/server/trunk/framework/configs/jee-specs/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/framework/configs/jee-specs/pom.xml?rev=671646&r1=671645&r2=671646&view=diff
==============================================================================
--- geronimo/server/trunk/framework/configs/jee-specs/pom.xml (original)
+++ geronimo/server/trunk/framework/configs/jee-specs/pom.xml Wed Jun 25 13:26:53 2008
@@ -122,6 +122,11 @@
<artifactId>geronimo-servlet_2.5_spec</artifactId>
</dependency>
+ <dependency>
+ <groupId>org.apache.geronimo.specs</groupId>
+ <artifactId>geronimo-concurrent_1.0_spec</artifactId>
+ </dependency>
+
<!-- WS API -->
<!--
@@ -322,6 +327,11 @@
<artifactId>geronimo-jdbc</artifactId>
<type>jar</type>
</dependency>
+ <dependency>
+ <groupId>org.apache.geronimo.specs</groupId>
+ <artifactId>geronimo-concurrent_1.0_spec</artifactId>
+ <type>jar</type>
+ </dependency>
</dependencies>
</configuration>
Modified: geronimo/server/trunk/plugins/concurrent/concurrent/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/concurrent/concurrent/pom.xml?rev=671646&r1=671645&r2=671646&view=diff
==============================================================================
--- geronimo/server/trunk/plugins/concurrent/concurrent/pom.xml (original)
+++ geronimo/server/trunk/plugins/concurrent/concurrent/pom.xml Wed Jun 25 13:26:53 2008
@@ -47,11 +47,6 @@
</dependency>
<dependency>
- <groupId>org.apache.geronimo.specs</groupId>
- <artifactId>geronimo-concurrent_1.0_spec</artifactId>
- </dependency>
-
- <dependency>
<groupId>org.apache.geronimo.modules</groupId>
<artifactId>geronimo-concurrent-management</artifactId>
<version>${version}</version>
@@ -78,10 +73,33 @@
<artifactId>car-maven-plugin</artifactId>
<configuration>
<useMavenDependencies>
- <value>true</value>
- <includeVersion>true</includeVersion>
+ <value>false</value>
</useMavenDependencies>
<category>Core</category>
+ <dependencies>
+ <dependency>
+ <groupId>org.apache.geronimo.modules</groupId>
+ <artifactId>geronimo-concurrent-management</artifactId>
+ <type>jar</type>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.geronimo.modules</groupId>
+ <artifactId>geronimo-concurrent-core</artifactId>
+ <type>jar</type>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.geronimo.modules</groupId>
+ <artifactId>geronimo-concurrent</artifactId>
+ <type>jar</type>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.geronimo.configs</groupId>
+ <artifactId>transaction</artifactId>
+ <type>car</type>
+ <import>classes</import>
+ </dependency>
+ </dependencies>
+
</configuration>
</plugin>
</plugins>
Modified: geronimo/server/trunk/testsuite/concurrent-testsuite/concurrent-ejb/src/main/resources/META-INF/openejb-jar.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/testsuite/concurrent-testsuite/concurrent-ejb/src/main/resources/META-INF/openejb-jar.xml?rev=671646&r1=671645&r2=671646&view=diff
==============================================================================
--- geronimo/server/trunk/testsuite/concurrent-testsuite/concurrent-ejb/src/main/resources/META-INF/openejb-jar.xml (original)
+++ geronimo/server/trunk/testsuite/concurrent-testsuite/concurrent-ejb/src/main/resources/META-INF/openejb-jar.xml Wed Jun 25 13:26:53 2008
@@ -27,15 +27,6 @@
<dep:version>${version}</dep:version>
<dep:type>jar</dep:type>
</dep:moduleId>
-
- <dep:dependencies>
- <dep:dependency>
- <dep:groupId>org.apache.geronimo.configs</dep:groupId>
- <dep:artifactId>concurrent</dep:artifactId>
- <dep:version>2.2-SNAPSHOT</dep:version>
- <dep:type>car</dep:type>
- </dep:dependency>
- </dep:dependencies>
</dep:environment>
<enterprise-beans>
Modified: geronimo/server/trunk/testsuite/concurrent-testsuite/concurrent-war/src/main/webapp/WEB-INF/geronimo-web.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/testsuite/concurrent-testsuite/concurrent-war/src/main/webapp/WEB-INF/geronimo-web.xml?rev=671646&r1=671645&r2=671646&view=diff
==============================================================================
--- geronimo/server/trunk/testsuite/concurrent-testsuite/concurrent-war/src/main/webapp/WEB-INF/geronimo-web.xml (original)
+++ geronimo/server/trunk/testsuite/concurrent-testsuite/concurrent-war/src/main/webapp/WEB-INF/geronimo-web.xml Wed Jun 25 13:26:53 2008
@@ -24,16 +24,6 @@
<dep:version>1.0</dep:version>
<dep:type>war</dep:type>
</dep:moduleId>
-
- <dep:dependencies>
- <dep:dependency>
- <dep:groupId>org.apache.geronimo.configs</dep:groupId>
- <dep:artifactId>concurrent</dep:artifactId>
- <dep:version>2.2-SNAPSHOT</dep:version>
- <dep:type>car</dep:type>
- </dep:dependency>
- </dep:dependencies>
-
</dep:environment>
<security-realm-name>geronimo-admin</security-realm-name>