You are viewing a plain text version of this content. The canonical link for it is here.
Posted to scm@geronimo.apache.org by dw...@apache.org on 2007/08/14 15:29:19 UTC
svn commit: r565741 - in /geronimo/server/trunk: ./
applications/geronimo-examples/geronimo-jsp-examples/src/main/webapp/WEB-INF/
applications/geronimo-examples/geronimo-servlet-examples/src/main/webapp/WEB-INF/
applications/geronimo-remote-deploy/src/...
Author: dwoods
Date: Tue Aug 14 06:29:18 2007
New Revision: 565741
URL: http://svn.apache.org/viewvc?view=rev&rev=565741
Log:
GERONIMO-3409 Several geronimo-web.xml files still use a 2.0-SNAPSHOT depend. One testsuite file has a hard-coded depend on a 2.0 module. Need to upgrade to geronimo.components vers=2.0.1, which is hard-coded to 2.0 in configs\client-transaction\pom.xml
Modified:
geronimo/server/trunk/applications/geronimo-examples/geronimo-jsp-examples/src/main/webapp/WEB-INF/geronimo-web.xml
geronimo/server/trunk/applications/geronimo-examples/geronimo-servlet-examples/src/main/webapp/WEB-INF/geronimo-web.xml
geronimo/server/trunk/applications/geronimo-remote-deploy/src/main/webapp/WEB-INF/geronimo-web.xml
geronimo/server/trunk/applications/geronimo-welcome/src/main/webapp/WEB-INF/geronimo-web.xml
geronimo/server/trunk/configs/client-transaction/pom.xml
geronimo/server/trunk/pom.xml
geronimo/server/trunk/testsuite/deployment-testsuite/jca-cms-tests/jca-cms-war/pom.xml
Modified: geronimo/server/trunk/applications/geronimo-examples/geronimo-jsp-examples/src/main/webapp/WEB-INF/geronimo-web.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/applications/geronimo-examples/geronimo-jsp-examples/src/main/webapp/WEB-INF/geronimo-web.xml?view=diff&rev=565741&r1=565740&r2=565741
==============================================================================
--- geronimo/server/trunk/applications/geronimo-examples/geronimo-jsp-examples/src/main/webapp/WEB-INF/geronimo-web.xml (original)
+++ geronimo/server/trunk/applications/geronimo-examples/geronimo-jsp-examples/src/main/webapp/WEB-INF/geronimo-web.xml Tue Aug 14 06:29:18 2007
@@ -25,7 +25,7 @@
<dep:moduleId>
<dep:groupId>org.apache.geronimo.applications.examples</dep:groupId>
<dep:artifactId>geronimo-jsp-examples</dep:artifactId>
- <dep:version>2.0-SNAPSHOT</dep:version>
+ <dep:version>2.1-SNAPSHOT</dep:version>
</dep:moduleId>
<dep:dependencies/>
<dep:hidden-classes/>
Modified: geronimo/server/trunk/applications/geronimo-examples/geronimo-servlet-examples/src/main/webapp/WEB-INF/geronimo-web.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/applications/geronimo-examples/geronimo-servlet-examples/src/main/webapp/WEB-INF/geronimo-web.xml?view=diff&rev=565741&r1=565740&r2=565741
==============================================================================
--- geronimo/server/trunk/applications/geronimo-examples/geronimo-servlet-examples/src/main/webapp/WEB-INF/geronimo-web.xml (original)
+++ geronimo/server/trunk/applications/geronimo-examples/geronimo-servlet-examples/src/main/webapp/WEB-INF/geronimo-web.xml Tue Aug 14 06:29:18 2007
@@ -25,7 +25,7 @@
<dep:moduleId>
<dep:groupId>org.apache.geronimo.applications.examples</dep:groupId>
<dep:artifactId>geronimo-servlet-examples</dep:artifactId>
- <dep:version>2.0-SNAPSHOT</dep:version>
+ <dep:version>2.1-SNAPSHOT</dep:version>
</dep:moduleId>
<dep:dependencies/>
<dep:hidden-classes/>
Modified: geronimo/server/trunk/applications/geronimo-remote-deploy/src/main/webapp/WEB-INF/geronimo-web.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/applications/geronimo-remote-deploy/src/main/webapp/WEB-INF/geronimo-web.xml?view=diff&rev=565741&r1=565740&r2=565741
==============================================================================
--- geronimo/server/trunk/applications/geronimo-remote-deploy/src/main/webapp/WEB-INF/geronimo-web.xml (original)
+++ geronimo/server/trunk/applications/geronimo-remote-deploy/src/main/webapp/WEB-INF/geronimo-web.xml Tue Aug 14 06:29:18 2007
@@ -26,7 +26,7 @@
<dep:moduleId>
<dep:groupId>org.apache.geronimo.applications</dep:groupId>
<dep:artifactId>geronimo-remote-deploy</dep:artifactId>
- <dep:version>2.0-SNAPSHOT</dep:version>
+ <dep:version>2.1-SNAPSHOT</dep:version>
</dep:moduleId>
<dep:dependencies/>
<dep:hidden-classes/>
Modified: geronimo/server/trunk/applications/geronimo-welcome/src/main/webapp/WEB-INF/geronimo-web.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/applications/geronimo-welcome/src/main/webapp/WEB-INF/geronimo-web.xml?view=diff&rev=565741&r1=565740&r2=565741
==============================================================================
--- geronimo/server/trunk/applications/geronimo-welcome/src/main/webapp/WEB-INF/geronimo-web.xml (original)
+++ geronimo/server/trunk/applications/geronimo-welcome/src/main/webapp/WEB-INF/geronimo-web.xml Tue Aug 14 06:29:18 2007
@@ -24,7 +24,7 @@
<dep:moduleId>
<dep:groupId>org.apache.geronimo.applications</dep:groupId>
<dep:artifactId>welcome</dep:artifactId>
- <dep:version>2.0-SNAPSHOT</dep:version>
+ <dep:version>2.1-SNAPSHOT</dep:version>
</dep:moduleId>
<dep:dependencies/>
<dep:hidden-classes/>
Modified: geronimo/server/trunk/configs/client-transaction/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/configs/client-transaction/pom.xml?view=diff&rev=565741&r1=565740&r2=565741
==============================================================================
--- geronimo/server/trunk/configs/client-transaction/pom.xml (original)
+++ geronimo/server/trunk/configs/client-transaction/pom.xml Tue Aug 14 06:29:18 2007
@@ -60,7 +60,6 @@
<dependency>
<groupId>org.apache.geronimo.components</groupId>
<artifactId>geronimo-connector</artifactId>
- <version>2.0-SNAPSHOT</version>
</dependency>
<dependency>
Modified: geronimo/server/trunk/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/pom.xml?view=diff&rev=565741&r1=565740&r2=565741
==============================================================================
--- geronimo/server/trunk/pom.xml (original)
+++ geronimo/server/trunk/pom.xml Tue Aug 14 06:29:18 2007
@@ -25,7 +25,7 @@
<parent>
<groupId>org.apache.geronimo.genesis.config</groupId>
<artifactId>project-config</artifactId>
- <version>1.2-SNAPSHOT</version>
+ <version>1.2</version>
</parent>
<groupId>org.apache.geronimo</groupId>
@@ -85,7 +85,7 @@
<cxfVersion>2.0-incubator</cxfVersion>
- <axis2Version>SNAPSHOT</axis2Version>
+ <axis2Version>1.3</axis2Version>
<axiomVersion>1.2.5</axiomVersion>
</properties>
@@ -245,13 +245,13 @@
<dependency>
<groupId>org.apache.geronimo.components</groupId>
<artifactId>geronimo-connector</artifactId>
- <version>2.0-SNAPSHOT</version>
+ <version>2.0.1</version>
</dependency>
<dependency>
<groupId>org.apache.geronimo.components</groupId>
<artifactId>geronimo-connector</artifactId>
- <version>2.0-SNAPSHOT</version>
+ <version>2.0.1</version>
<classifier>tests</classifier>
<scope>test</scope>
</dependency>
@@ -259,15 +259,19 @@
<dependency>
<groupId>org.apache.geronimo.components</groupId>
<artifactId>geronimo-transaction</artifactId>
- <version>2.0-SNAPSHOT</version>
+ <version>2.0.1</version>
</dependency>
-
<dependency>
<groupId>org.apache.openjpa</groupId>
<artifactId>openjpa</artifactId>
<version>1.0.0-SNAPSHOT</version>
</dependency>
+ <dependency>
+ <groupId>org.apache.openjpa</groupId>
+ <artifactId>openjpa-persistence-jdbc</artifactId>
+ <version>1.0.0-SNAPSHOT</version>
+ </dependency>
<dependency>
<groupId>net.sourceforge.serp</groupId>
@@ -290,7 +294,7 @@
<dependency>
<groupId>org.apache.xbean</groupId>
<artifactId>xbean-reflect</artifactId>
- <version>3.1-SNAPSHOT</version>
+ <version>3.1</version>
</dependency>
<dependency>
@@ -340,6 +344,12 @@
</dependency>
<dependency>
+ <groupId>org.codehaus.swizzle</groupId>
+ <artifactId>swizzle-stream</artifactId>
+ <version>1.0.1</version>
+ </dependency>
+
+ <dependency>
<groupId>org.codehaus.castor</groupId>
<artifactId>castor</artifactId>
<version>1.0.5</version>
@@ -778,6 +788,29 @@
<dependency>
<groupId>org.apache.openejb</groupId>
<artifactId>openejb-axis</artifactId>
+ <version>${openejbVersion}</version>
+ </dependency>
+
+ <dependency>
+ <groupId>org.apache.openejb</groupId>
+ <artifactId>openejb-server</artifactId>
+ <version>${openejbVersion}</version>
+ </dependency>
+
+ <dependency>
+ <groupId>org.apache.openejb</groupId>
+ <artifactId>openejb-loader</artifactId>
+ <version>${openejbVersion}</version>
+ </dependency>
+
+ <dependency>
+ <groupId>org.apache.openejb</groupId>
+ <artifactId>openejb-jee</artifactId>
+ <version>${openejbVersion}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.openejb</groupId>
+ <artifactId>openejb-javaagent</artifactId>
<version>${openejbVersion}</version>
</dependency>
Modified: geronimo/server/trunk/testsuite/deployment-testsuite/jca-cms-tests/jca-cms-war/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/testsuite/deployment-testsuite/jca-cms-tests/jca-cms-war/pom.xml?view=diff&rev=565741&r1=565740&r2=565741
==============================================================================
--- geronimo/server/trunk/testsuite/deployment-testsuite/jca-cms-tests/jca-cms-war/pom.xml (original)
+++ geronimo/server/trunk/testsuite/deployment-testsuite/jca-cms-tests/jca-cms-war/pom.xml Tue Aug 14 06:29:18 2007
@@ -55,7 +55,7 @@
<dependency>
<groupId>org.apache.geronimo.modules</groupId>
<artifactId>geronimo-security</artifactId>
- <version>2.0-SNAPSHOT</version>
+ <version>${version}</version>
<scope>provided</scope>
</dependency>
</dependencies>