JBossWS SVN: r8843 - stack/metro/trunk.
by jbossws-commits@lists.jboss.org
Author: richard.opalka(a)jboss.com
Date: 2008-12-09 06:40:42 -0500 (Tue, 09 Dec 2008)
New Revision: 8843
Modified:
stack/metro/trunk/pom.xml
Log:
fix typo
Modified: stack/metro/trunk/pom.xml
===================================================================
--- stack/metro/trunk/pom.xml 2008-12-09 08:58:10 UTC (rev 8842)
+++ stack/metro/trunk/pom.xml 2008-12-09 11:40:42 UTC (rev 8843)
@@ -63,7 +63,7 @@
<jaxrpc.api.version>1.1</jaxrpc.api.version>
<jboss.jaxr.version>1.2.1.GA</jboss.jaxr.version>
<apache.scout.version>0.7rc2</apache.scout.version>
- <juddi.version>0.9rc4</juddi.version>
+ <juddi.version>0.9RC4</juddi.version>
<sun.fastinfoset.version>1.2.2</sun.fastinfoset.version>
<sun.sjsxp.version>1.0.1</sun.sjsxp.version>
<sun.http-transport.version>2.1.3</sun.http-transport.version>
16 years, 1 month
JBossWS SVN: r8842 - stack/native/trunk.
by jbossws-commits@lists.jboss.org
Author: richard.opalka(a)jboss.com
Date: 2008-12-09 03:58:10 -0500 (Tue, 09 Dec 2008)
New Revision: 8842
Modified:
stack/native/trunk/pom.xml
Log:
[JBWS-2402] rollback
Modified: stack/native/trunk/pom.xml
===================================================================
--- stack/native/trunk/pom.xml 2008-12-09 08:57:40 UTC (rev 8841)
+++ stack/native/trunk/pom.xml 2008-12-09 08:58:10 UTC (rev 8842)
@@ -68,9 +68,9 @@
<jboss.jaxbintros.version>1.0.0.GA</jboss.jaxbintros.version>
<jboss.logging.version>2.0.5.GA</jboss.logging.version>
<jboss.remoting.version>2.5.0.SP2</jboss.remoting.version>
- <jboss.jaxr.version>2.0.0.RC6</jboss.jaxr.version>
+ <jboss.jaxr.version>1.2.1.GA</jboss.jaxr.version>
<apache.scout.version>0.7rc2</apache.scout.version>
- <juddi.version>2.0rc5</juddi.version>
+ <juddi.version>0.9rc4</juddi.version>
<sun.fastinfoset.version>1.2.2</sun.fastinfoset.version>
<sun.jaxws.version>2.1.3</sun.jaxws.version>
<woodstox.version>3.2.6</woodstox.version>
16 years, 1 month
JBossWS SVN: r8841 - stack/metro/trunk.
by jbossws-commits@lists.jboss.org
Author: richard.opalka(a)jboss.com
Date: 2008-12-09 03:57:40 -0500 (Tue, 09 Dec 2008)
New Revision: 8841
Modified:
stack/metro/trunk/pom.xml
Log:
[JBWS-2402] rollback
Modified: stack/metro/trunk/pom.xml
===================================================================
--- stack/metro/trunk/pom.xml 2008-12-08 17:35:11 UTC (rev 8840)
+++ stack/metro/trunk/pom.xml 2008-12-09 08:57:40 UTC (rev 8841)
@@ -61,9 +61,9 @@
<jaxb.api.version>2.1</jaxb.api.version>
<jaxb.impl.version>2.1.9</jaxb.impl.version>
<jaxrpc.api.version>1.1</jaxrpc.api.version>
- <jboss.jaxr.version>2.0.0.RC6</jboss.jaxr.version>
+ <jboss.jaxr.version>1.2.1.GA</jboss.jaxr.version>
<apache.scout.version>0.7rc2</apache.scout.version>
- <juddi.version>2.0rc5</juddi.version>
+ <juddi.version>0.9rc4</juddi.version>
<sun.fastinfoset.version>1.2.2</sun.fastinfoset.version>
<sun.sjsxp.version>1.0.1</sun.sjsxp.version>
<sun.http-transport.version>2.1.3</sun.http-transport.version>
16 years, 1 month
JBossWS SVN: r8840 - in stack/native/trunk: modules/management and 3 other directories.
by jbossws-commits@lists.jboss.org
Author: richard.opalka(a)jboss.com
Date: 2008-12-08 12:35:11 -0500 (Mon, 08 Dec 2008)
New Revision: 8840
Modified:
stack/native/trunk/modules/management/pom.xml
stack/native/trunk/modules/resources/src/main/resources/resources/jbossws-deploy-macros.xml
stack/native/trunk/modules/testsuite/pom.xml
stack/native/trunk/pom.xml
stack/native/trunk/src/main/scripts/assembly-deploy-artifacts.xml
Log:
[JBWS-2402] switch to Scout 0.7rc2 that doesn't introduce XML Beans dependency
Modified: stack/native/trunk/modules/management/pom.xml
===================================================================
--- stack/native/trunk/modules/management/pom.xml 2008-12-08 16:14:19 UTC (rev 8839)
+++ stack/native/trunk/modules/management/pom.xml 2008-12-08 17:35:11 UTC (rev 8840)
@@ -64,11 +64,6 @@
<scope>runtime</scope>
<type>sar</type>
</dependency>
- <dependency>
- <groupId>apache-xmlbeans</groupId>
- <artifactId>xmlbeans</artifactId>
- <scope>runtime</scope>
- </dependency>
</dependencies>
<!-- Build -->
Modified: stack/native/trunk/modules/resources/src/main/resources/resources/jbossws-deploy-macros.xml
===================================================================
--- stack/native/trunk/modules/resources/src/main/resources/resources/jbossws-deploy-macros.xml 2008-12-08 16:14:19 UTC (rev 8839)
+++ stack/native/trunk/modules/resources/src/main/resources/resources/jbossws-deploy-macros.xml 2008-12-08 17:35:11 UTC (rev 8840)
@@ -240,7 +240,6 @@
<fileset dir="@{thirdpartydir}">
<include name="**/juddi.jar"/>
<include name="**/scout.jar"/>
- <include name="**/xmlbeans.jar"/>
</fileset>
</copy>
</sequential>
Modified: stack/native/trunk/modules/testsuite/pom.xml
===================================================================
--- stack/native/trunk/modules/testsuite/pom.xml 2008-12-08 16:14:19 UTC (rev 8839)
+++ stack/native/trunk/modules/testsuite/pom.xml 2008-12-08 17:35:11 UTC (rev 8840)
@@ -87,12 +87,6 @@
<scope>test</scope>
</dependency>
<dependency>
- <groupId>apache-xmlbeans</groupId>
- <artifactId>xmlbeans</artifactId>
- <version>2.2.0</version>
- <scope>test</scope>
- </dependency>
- <dependency>
<groupId>org.jboss.jaxr</groupId>
<artifactId>juddi-saaj</artifactId>
<version>${jboss.jaxr.version}</version>
Modified: stack/native/trunk/pom.xml
===================================================================
--- stack/native/trunk/pom.xml 2008-12-08 16:14:19 UTC (rev 8839)
+++ stack/native/trunk/pom.xml 2008-12-08 17:35:11 UTC (rev 8840)
@@ -69,8 +69,7 @@
<jboss.logging.version>2.0.5.GA</jboss.logging.version>
<jboss.remoting.version>2.5.0.SP2</jboss.remoting.version>
<jboss.jaxr.version>2.0.0.RC6</jboss.jaxr.version>
- <apache.scout.version>1.0rc1</apache.scout.version>
- <apache.xmlbeans.version>2.2.0</apache.xmlbeans.version>
+ <apache.scout.version>0.7rc2</apache.scout.version>
<juddi.version>2.0rc5</juddi.version>
<sun.fastinfoset.version>1.2.2</sun.fastinfoset.version>
<sun.jaxws.version>2.1.3</sun.jaxws.version>
@@ -296,11 +295,6 @@
<version>${apache.scout.version}</version>
</dependency>
<dependency>
- <groupId>apache-xmlbeans</groupId>
- <artifactId>xmlbeans</artifactId>
- <version>${apache.xmlbeans.version}</version>
- </dependency>
- <dependency>
<groupId>juddi</groupId>
<artifactId>juddi</artifactId>
<version>${juddi.version}</version>
Modified: stack/native/trunk/src/main/scripts/assembly-deploy-artifacts.xml
===================================================================
--- stack/native/trunk/src/main/scripts/assembly-deploy-artifacts.xml 2008-12-08 16:14:19 UTC (rev 8839)
+++ stack/native/trunk/src/main/scripts/assembly-deploy-artifacts.xml 2008-12-08 17:35:11 UTC (rev 8840)
@@ -87,7 +87,6 @@
<include>org.jboss.ws:jbossws-jboss500:jar</include>
<include>org.jboss.jaxr:juddi-service:sar</include>
<include>apache-scout:scout:jar</include>
- <include>apache-xmlbeans:xmlbeans:jar</include>
<include>juddi:juddi:jar</include>
</includes>
</dependencySet>
16 years, 1 month
JBossWS SVN: r8839 - in stack/metro/trunk: src/main/scripts and 1 other directory.
by jbossws-commits@lists.jboss.org
Author: richard.opalka(a)jboss.com
Date: 2008-12-08 11:14:19 -0500 (Mon, 08 Dec 2008)
New Revision: 8839
Modified:
stack/metro/trunk/modules/resources/src/main/resources/resources/jbossws-deploy-macros.xml
stack/metro/trunk/src/main/scripts/assembly-deploy-artifacts.xml
Log:
[JBWS-2402] removing XML Beans dependency
Modified: stack/metro/trunk/modules/resources/src/main/resources/resources/jbossws-deploy-macros.xml
===================================================================
--- stack/metro/trunk/modules/resources/src/main/resources/resources/jbossws-deploy-macros.xml 2008-12-08 16:09:38 UTC (rev 8838)
+++ stack/metro/trunk/modules/resources/src/main/resources/resources/jbossws-deploy-macros.xml 2008-12-08 16:14:19 UTC (rev 8839)
@@ -257,7 +257,6 @@
<fileset dir="@{thirdpartydir}">
<include name="**/juddi.jar"/>
<include name="**/scout.jar"/>
- <include name="**/xmlbeans.jar"/>
</fileset>
</copy>
</sequential>
Modified: stack/metro/trunk/src/main/scripts/assembly-deploy-artifacts.xml
===================================================================
--- stack/metro/trunk/src/main/scripts/assembly-deploy-artifacts.xml 2008-12-08 16:09:38 UTC (rev 8838)
+++ stack/metro/trunk/src/main/scripts/assembly-deploy-artifacts.xml 2008-12-08 16:14:19 UTC (rev 8839)
@@ -84,7 +84,6 @@
<include>org.jboss.ws:jbossws-jboss500:jar</include>
<include>org.jboss.jaxr:juddi-service:sar</include>
<include>apache-scout:scout:jar</include>
- <include>apache-xmlbeans:xmlbeans:jar</include>
<include>juddi:juddi:jar</include>
</includes>
</dependencySet>
16 years, 1 month
JBossWS SVN: r8838 - in stack/metro/trunk: modules/management and 1 other directories.
by jbossws-commits@lists.jboss.org
Author: richard.opalka(a)jboss.com
Date: 2008-12-08 11:09:38 -0500 (Mon, 08 Dec 2008)
New Revision: 8838
Modified:
stack/metro/trunk/modules/management/pom.xml
stack/metro/trunk/modules/testsuite/pom.xml
stack/metro/trunk/pom.xml
Log:
[JBWS-2402] switch to Scout 0.7rc2 that doesn't introduce XML Beans dependency
Modified: stack/metro/trunk/modules/management/pom.xml
===================================================================
--- stack/metro/trunk/modules/management/pom.xml 2008-12-08 13:09:07 UTC (rev 8837)
+++ stack/metro/trunk/modules/management/pom.xml 2008-12-08 16:09:38 UTC (rev 8838)
@@ -64,11 +64,6 @@
<scope>runtime</scope>
<type>sar</type>
</dependency>
- <dependency>
- <groupId>apache-xmlbeans</groupId>
- <artifactId>xmlbeans</artifactId>
- <scope>runtime</scope>
- </dependency>
</dependencies>
<!-- Build -->
Modified: stack/metro/trunk/modules/testsuite/pom.xml
===================================================================
--- stack/metro/trunk/modules/testsuite/pom.xml 2008-12-08 13:09:07 UTC (rev 8837)
+++ stack/metro/trunk/modules/testsuite/pom.xml 2008-12-08 16:09:38 UTC (rev 8838)
@@ -83,12 +83,6 @@
<scope>test</scope>
</dependency>
<dependency>
- <groupId>apache-xmlbeans</groupId>
- <artifactId>xmlbeans</artifactId>
- <version>${apache.xmlbeans.version}</version>
- <scope>test</scope>
- </dependency>
- <dependency>
<groupId>juddi</groupId>
<artifactId>juddi</artifactId>
<version>${juddi.version}</version>
Modified: stack/metro/trunk/pom.xml
===================================================================
--- stack/metro/trunk/pom.xml 2008-12-08 13:09:07 UTC (rev 8837)
+++ stack/metro/trunk/pom.xml 2008-12-08 16:09:38 UTC (rev 8838)
@@ -62,8 +62,7 @@
<jaxb.impl.version>2.1.9</jaxb.impl.version>
<jaxrpc.api.version>1.1</jaxrpc.api.version>
<jboss.jaxr.version>2.0.0.RC6</jboss.jaxr.version>
- <apache.scout.version>1.0rc1</apache.scout.version>
- <apache.xmlbeans.version>2.2.0</apache.xmlbeans.version>
+ <apache.scout.version>0.7rc2</apache.scout.version>
<juddi.version>2.0rc5</juddi.version>
<sun.fastinfoset.version>1.2.2</sun.fastinfoset.version>
<sun.sjsxp.version>1.0.1</sun.sjsxp.version>
@@ -309,11 +308,6 @@
<version>${commons.logging.version}</version>
</dependency>
<dependency>
- <groupId>apache-xmlbeans</groupId>
- <artifactId>xmlbeans</artifactId>
- <version>${apache.xmlbeans.version}</version>
- </dependency>
- <dependency>
<groupId>wsdl4j</groupId>
<artifactId>wsdl4j</artifactId>
<version>${wsdl4j.version}</version>
16 years, 1 month
JBossWS SVN: r8837 - in stack/native/trunk: modules/core and 5 other directories.
by jbossws-commits@lists.jboss.org
Author: richard.opalka(a)jboss.com
Date: 2008-12-08 08:09:07 -0500 (Mon, 08 Dec 2008)
New Revision: 8837
Modified:
stack/native/trunk/modules/core/pom.xml
stack/native/trunk/modules/management/pom.xml
stack/native/trunk/modules/resources/src/main/resources/resources/jbossws-deploy-macros.xml
stack/native/trunk/modules/testsuite/pom.xml
stack/native/trunk/pom.xml
stack/native/trunk/src/main/distro/build-deploy.xml
stack/native/trunk/src/main/distro/build-setup.xml
stack/native/trunk/src/main/scripts/assembly-deploy-artifacts.xml
Log:
switch Native to new AS container integrations
Modified: stack/native/trunk/modules/core/pom.xml
===================================================================
--- stack/native/trunk/modules/core/pom.xml 2008-12-08 11:55:56 UTC (rev 8836)
+++ stack/native/trunk/modules/core/pom.xml 2008-12-08 13:09:07 UTC (rev 8837)
@@ -213,7 +213,7 @@
<!-- START -->
<artifactItem>
<groupId>org.jboss.ws</groupId>
- <artifactId>jbossws-jboss500CR2</artifactId>
+ <artifactId>jbossws-jboss500</artifactId>
<version>${jbossws.jboss500.version}</version>
<classifier>resources</classifier>
<type>zip</type>
@@ -221,7 +221,7 @@
</artifactItem>
<artifactItem>
<groupId>org.jboss.ws</groupId>
- <artifactId>jbossws-jboss500x</artifactId>
+ <artifactId>jbossws-jboss501CR1</artifactId>
<version>${jbossws.jboss501.version}</version>
<classifier>resources</classifier>
<type>zip</type>
Modified: stack/native/trunk/modules/management/pom.xml
===================================================================
--- stack/native/trunk/modules/management/pom.xml 2008-12-08 11:55:56 UTC (rev 8836)
+++ stack/native/trunk/modules/management/pom.xml 2008-12-08 13:09:07 UTC (rev 8837)
@@ -49,12 +49,12 @@
<!-- START -->
<dependency>
<groupId>org.jboss.ws</groupId>
- <artifactId>jbossws-jboss500CR2</artifactId>
+ <artifactId>jbossws-jboss500</artifactId>
<scope>runtime</scope>
</dependency>
<dependency>
<groupId>org.jboss.ws</groupId>
- <artifactId>jbossws-jboss500x</artifactId>
+ <artifactId>jbossws-jboss501CR1</artifactId>
<scope>runtime</scope>
</dependency>
<!-- END -->
Modified: stack/native/trunk/modules/resources/src/main/resources/resources/jbossws-deploy-macros.xml
===================================================================
--- stack/native/trunk/modules/resources/src/main/resources/resources/jbossws-deploy-macros.xml 2008-12-08 11:55:56 UTC (rev 8836)
+++ stack/native/trunk/modules/resources/src/main/resources/resources/jbossws-deploy-macros.xml 2008-12-08 13:09:07 UTC (rev 8837)
@@ -363,20 +363,10 @@
<macro-deploy-juddi-sar targetdir="${installserver}/deploy/juddi-service.sar" thirdpartydir="${thirdpartydir}"/>
</target>
- <target name="deploy-jbossws-native500" depends="check-parameters,deploy-jbossws-endorsed">
+ <target name="deploy-jbossws-native50" depends="check-parameters,deploy-jbossws-endorsed">
<macro-deploy-jbossws-bin targetdir="${installserver}/../../bin" artifactsdir="${artifactsdir}"/>
<macro-deploy-jbossws-client50 targetdir="${installserver}/../../client" thirdpartydir="${thirdpartydir}" jbossid="${jbossid}"/>
<macro-deploy-jbossws-lib50 targetdir="${installserver}/../../lib" thirdpartydir="${thirdpartydir}"/>
- <macro-deploy-jbossws-server-lib50 targetdir="${installserver}/lib" thirdpartydir="${thirdpartydir}" jbossid="${jbossid}"/>
- <macro-deploy-jbossws-sar50 targetdir="${installserver}/deploy/jbossws.sar" artifactsdir="${artifactsdir}" thirdpartydir="${thirdpartydir}" jbossid="${jbossid}"/>
- <macro-deploy-jbossws-deployers50 targetdir="${installserver}/deployers/jbossws.deployer/" artifactsdir="${artifactsdir}" thirdpartydir="${thirdpartydir}" jbossid="${jbossid}"/>
- <macro-deploy-juddi-sar targetdir="${installserver}/deploy/juddi-service.sar" thirdpartydir="${thirdpartydir}"/>
- </target>
-
- <target name="deploy-jbossws-native501" depends="check-parameters,deploy-jbossws-endorsed">
- <macro-deploy-jbossws-bin targetdir="${installserver}/../../bin" artifactsdir="${artifactsdir}"/>
- <macro-deploy-jbossws-client50 targetdir="${installserver}/../../client" thirdpartydir="${thirdpartydir}" jbossid="${jbossid}"/>
- <macro-deploy-jbossws-lib50 targetdir="${installserver}/../../lib" thirdpartydir="${thirdpartydir}"/>
<macro-deploy-jbossws-server-lib50 targetdir="${installserver}/../../common/lib" thirdpartydir="${thirdpartydir}" jbossid="${jbossid}"/> <!-- Please note the "../../common" to use common server lib! -->
<macro-deploy-jbossws-sar50 targetdir="${installserver}/deploy/jbossws.sar" artifactsdir="${artifactsdir}" thirdpartydir="${thirdpartydir}" jbossid="${jbossid}"/>
<macro-deploy-jbossws-deployers50 targetdir="${installserver}/deployers/jbossws.deployer/" artifactsdir="${artifactsdir}" thirdpartydir="${thirdpartydir}" jbossid="${jbossid}"/>
Modified: stack/native/trunk/modules/testsuite/pom.xml
===================================================================
--- stack/native/trunk/modules/testsuite/pom.xml 2008-12-08 11:55:56 UTC (rev 8836)
+++ stack/native/trunk/modules/testsuite/pom.xml 2008-12-08 13:09:07 UTC (rev 8837)
@@ -25,6 +25,7 @@
<wsdl.publish.location>${project.build.directory}/wsdl-publish</wsdl.publish.location>
<hibernate.version>3.2.4.sp1</hibernate.version>
<endpoint.servlet>org.jboss.wsf.stack.jbws.EndpointServlet</endpoint.servlet>
+ <jboss.javaee.version>5.0.0.GA</jboss.javaee.version>
</properties>
<!-- Modules -->
@@ -407,7 +408,7 @@
<profile>
<id>jboss500</id>
<properties>
- <jboss.version>5.0.0.CR2</jboss.version>
+ <jboss.version>5.0.0.GA</jboss.version>
<jbossws.integration.target>jboss500</jbossws.integration.target>
</properties>
<dependencies>
@@ -415,7 +416,7 @@
<!-- START -->
<dependency>
<groupId>org.jboss.ws</groupId>
- <artifactId>jbossws-jboss500CR2</artifactId>
+ <artifactId>jbossws-jboss500</artifactId>
</dependency>
<!--dependency>
<groupId>org.jboss.jbossas</groupId>
@@ -432,6 +433,12 @@
<groupId>org.jboss.jbossas</groupId>
<artifactId>jboss-as-ejb3</artifactId>
<version>${jboss.version}</version>
+ <exclusions>
+ <exclusion>
+ <groupId>org.jboss.security</groupId>
+ <artifactId>jbosssx</artifactId>
+ </exclusion>
+ </exclusions>
</dependency>
<dependency>
<groupId>org.jboss.jbossas</groupId>
@@ -441,7 +448,7 @@
<dependency>
<groupId>org.jboss.javaee</groupId>
<artifactId>jboss-javaee</artifactId>
- <version>${jboss.version}</version>
+ <version>${jboss.javaee.version}</version>
</dependency>
</dependencies>
<build>
@@ -460,7 +467,7 @@
<!-- TODO: replace with maven dependencies -->
<additionalClasspathElements>
<additionalClasspathElement>${jboss.home}/client/jbossall-client.jar</additionalClasspathElement>
- <additionalClasspathElement>${jboss.home}/server/default/lib/jboss-ejb3-core.jar</additionalClasspathElement>
+ <additionalClasspathElement>${jboss.home}/common/lib/jboss-ejb3-core.jar</additionalClasspathElement>
</additionalClasspathElements>
</configuration>
</plugin>
@@ -475,7 +482,7 @@
<profile>
<id>jboss501</id>
<properties>
- <jboss.version>5.0.0-SNAPSHOT</jboss.version>
+ <jboss.version>5.0.1-SNAPSHOT</jboss.version>
<jbossws.integration.target>jboss501</jbossws.integration.target>
</properties>
<dependencies>
@@ -483,7 +490,7 @@
<!-- START -->
<dependency>
<groupId>org.jboss.ws</groupId>
- <artifactId>jbossws-jboss500x</artifactId>
+ <artifactId>jbossws-jboss501CR1</artifactId>
</dependency>
<!--dependency>
<groupId>org.jboss.jbossas</groupId>
@@ -500,6 +507,12 @@
<groupId>org.jboss.jbossas</groupId>
<artifactId>jboss-as-ejb3</artifactId>
<version>${jboss.version}</version>
+ <exclusions>
+ <exclusion>
+ <groupId>org.jboss.security</groupId>
+ <artifactId>jbosssx</artifactId>
+ </exclusion>
+ </exclusions>
</dependency>
<dependency>
<groupId>org.jboss.jbossas</groupId>
@@ -509,7 +522,7 @@
<dependency>
<groupId>org.jboss.javaee</groupId>
<artifactId>jboss-javaee</artifactId>
- <version>${jboss.version}</version>
+ <version>${jboss.javaee.version}</version>
</dependency>
</dependencies>
<build>
Modified: stack/native/trunk/pom.xml
===================================================================
--- stack/native/trunk/pom.xml 2008-12-08 11:55:56 UTC (rev 8836)
+++ stack/native/trunk/pom.xml 2008-12-08 13:09:07 UTC (rev 8837)
@@ -146,28 +146,28 @@
<classifier>resources</classifier>
<type>zip</type>
</dependency>
- <!-- [JBWS-2263] -->
- <!-- START -->
<dependency>
<groupId>org.jboss.ws</groupId>
- <artifactId>jbossws-jboss500CR2</artifactId>
+ <artifactId>jbossws-jboss500</artifactId>
<version>${jbossws.jboss500.version}</version>
</dependency>
<dependency>
<groupId>org.jboss.ws</groupId>
- <artifactId>jbossws-jboss500CR2</artifactId>
+ <artifactId>jbossws-jboss500</artifactId>
<version>${jbossws.jboss500.version}</version>
<classifier>resources</classifier>
<type>zip</type>
</dependency>
+ <!-- [JBWS-2263] -->
+ <!-- START -->
<dependency>
<groupId>org.jboss.ws</groupId>
- <artifactId>jbossws-jboss500x</artifactId>
+ <artifactId>jbossws-jboss501CR1</artifactId>
<version>${jbossws.jboss501.version}</version>
</dependency>
<dependency>
<groupId>org.jboss.ws</groupId>
- <artifactId>jbossws-jboss500x</artifactId>
+ <artifactId>jbossws-jboss501CR1</artifactId>
<version>${jbossws.jboss501.version}</version>
<classifier>resources</classifier>
<type>zip</type>
Modified: stack/native/trunk/src/main/distro/build-deploy.xml
===================================================================
--- stack/native/trunk/src/main/distro/build-deploy.xml 2008-12-08 11:55:56 UTC (rev 8836)
+++ stack/native/trunk/src/main/distro/build-deploy.xml 2008-12-08 13:09:07 UTC (rev 8837)
@@ -96,9 +96,9 @@
<!-- Prepare Deployment Structure JBoss-5.0.x -->
<!-- ================================================================== -->
- <target name="deploy-structure-jboss500" depends="prepare-deploy">
+ <target name="deploy-structure-jboss50" depends="prepare-deploy">
<delete dir="${deploy.structure}"/>
- <antcall target="deploy-jbossws-native500" inheritall="false">
+ <antcall target="deploy-jbossws-native50" inheritall="false">
<param name="installserver" value="${deploy.structure}/server/${jboss.server.instance}"/>
<param name="jbossid" value="${jbossws.integration.target}"/>
<param name="artifactsdir" value="${deploy.artifacts.dir}"/>
@@ -107,17 +107,6 @@
<macro-create-deploy-conf deploystructure="${deploy.structure}"/>
</target>
- <target name="deploy-structure-jboss501" depends="prepare-deploy">
- <delete dir="${deploy.structure}"/>
- <antcall target="deploy-jbossws-native501" inheritall="false">
- <param name="installserver" value="${deploy.structure}/server/${jboss.server.instance}"/>
- <param name="jbossid" value="${jbossws.integration.target}"/>
- <param name="artifactsdir" value="${deploy.artifacts.dir}"/>
- <param name="thirdpartydir" value="${deploy.artifacts.dir}"/>
- </antcall>
- <macro-create-deploy-conf deploystructure="${deploy.structure}"/>
- </target>
-
<!-- ================================================================== -->
<!-- Deployment JBoss500 -->
<!-- ================================================================== -->
@@ -127,7 +116,7 @@
<echo message="jbossws.integration.target=${jbossws.integration.target}" file="${target.properties.file}"/>
</target>
- <target name="deploy-jboss500" depends="undeploy-jboss500,deploy-structure-jboss500" description="Deploy jbossws to jboss500">
+ <target name="deploy-jboss500" depends="undeploy-jboss500,deploy-structure-jboss50" description="Deploy jbossws to jboss500">
<fail message="Not available: ${jboss500.available.file}" unless="jboss500.available"/>
<copy todir="${jboss500.home}" overwrite="true">
<fileset dir="${deploy.structure}"/>
@@ -137,7 +126,7 @@
<target name="undeploy-jboss500" depends="target-jboss500,init" description="Remove jbossws from jboss500">
<fail message="Not available: ${jboss500.available.file}" unless="jboss500.available"/>
- <macro-undeploy-jbossws50 targetdir="${jboss500.server.deploy}/jbossws.sar" defaultconf="${jbossws.default.deploy.conf}"/>
+ <macro-undeploy-jbossws50 targetdir="${jboss500.server.deploy}/jbossws.sar" defaultconf="${jbossws.as5.default.deploy.conf}"/>
</target>
<!-- ================================================================== -->
@@ -149,7 +138,7 @@
<echo message="jbossws.integration.target=${jbossws.integration.target}" file="${target.properties.file}"/>
</target>
- <target name="deploy-jboss501" depends="undeploy-jboss501,deploy-structure-jboss501" description="Deploy jbossws to jboss501">
+ <target name="deploy-jboss501" depends="undeploy-jboss501,deploy-structure-jboss50" description="Deploy jbossws to jboss501">
<fail message="Not available: ${jboss501.available.file}" unless="jboss501.available"/>
<copy todir="${jboss501.home}" overwrite="true">
<fileset dir="${deploy.structure}"/>
@@ -159,7 +148,7 @@
<target name="undeploy-jboss501" depends="target-jboss501,init" description="Remove jbossws from jboss501">
<fail message="Not available: ${jboss501.available.file}" unless="jboss501.available"/>
- <macro-undeploy-jbossws50 targetdir="${jboss501.server.deploy}/jbossws.sar" defaultconf="${jbossws.as5.default.deploy.conf}"/> <!-- Using AS5 default deploy.conf -->
+ <macro-undeploy-jbossws50 targetdir="${jboss501.server.deploy}/jbossws.sar" defaultconf="${jbossws.as5.default.deploy.conf}"/>
</target>
<!-- ================================================================== -->
Modified: stack/native/trunk/src/main/distro/build-setup.xml
===================================================================
--- stack/native/trunk/src/main/distro/build-setup.xml 2008-12-08 11:55:56 UTC (rev 8836)
+++ stack/native/trunk/src/main/distro/build-setup.xml 2008-12-08 13:09:07 UTC (rev 8837)
@@ -42,14 +42,14 @@
<property name="jboss500.lib" value="${jboss500.home}/lib"/>
<property name="jboss500.client" value="${jboss500.home}/client"/>
<property name="jboss500.server" value="${jboss500.home}/server/${jboss.server.instance}"/>
- <property name="jboss500.server.lib" value="${jboss500.server}/lib"/>
+ <property name="jboss500.server.lib" value="${jboss500.home}/common/lib"/>
<property name="jboss500.server.deploy" value="${jboss500.server}/deploy"/>
<property name="jboss500.server.deployers" value="${jboss500.server}/deployers"/>
<property name="jboss501.lib" value="${jboss501.home}/lib"/>
<property name="jboss501.client" value="${jboss501.home}/client"/>
<property name="jboss501.server" value="${jboss501.home}/server/${jboss.server.instance}"/>
- <property name="jboss501.server.lib" value="${jboss501.home}/common/lib"/> <!-- Using AS5 common server lib -->
+ <property name="jboss501.server.lib" value="${jboss501.home}/common/lib"/>
<property name="jboss501.server.deploy" value="${jboss501.server}/deploy"/>
<property name="jboss501.server.deployers" value="${jboss501.server}/deployers"/>
Modified: stack/native/trunk/src/main/scripts/assembly-deploy-artifacts.xml
===================================================================
--- stack/native/trunk/src/main/scripts/assembly-deploy-artifacts.xml 2008-12-08 11:55:56 UTC (rev 8836)
+++ stack/native/trunk/src/main/scripts/assembly-deploy-artifacts.xml 2008-12-08 13:09:07 UTC (rev 8837)
@@ -84,6 +84,7 @@
<include>org.jboss.ws:jbossws-framework:jar</include>
<include>org.jboss.ws:jbossws-jboss422:jar</include>
<include>org.jboss.ws:jbossws-jboss423:jar</include>
+ <include>org.jboss.ws:jbossws-jboss500:jar</include>
<include>org.jboss.jaxr:juddi-service:sar</include>
<include>apache-scout:scout:jar</include>
<include>apache-xmlbeans:xmlbeans:jar</include>
@@ -104,22 +105,12 @@
<!-- START -->
<dependencySet>
<outputDirectory>lib</outputDirectory>
- <outputFileNameMapping>jbossws-jboss500.${module.extension}</outputFileNameMapping>
- <useStrictFiltering>true</useStrictFiltering>
- <scope>runtime</scope>
- <unpack>false</unpack>
- <includes>
- <include>org.jboss.ws:jbossws-jboss500CR2:jar</include>
- </includes>
- </dependencySet>
- <dependencySet>
- <outputDirectory>lib</outputDirectory>
<outputFileNameMapping>jbossws-jboss501.${module.extension}</outputFileNameMapping>
<useStrictFiltering>true</useStrictFiltering>
<scope>runtime</scope>
<unpack>false</unpack>
<includes>
- <include>org.jboss.ws:jbossws-jboss500x:jar</include>
+ <include>org.jboss.ws:jbossws-jboss501CR1:jar</include>
</includes>
</dependencySet>
<!-- END -->
16 years, 1 month
JBossWS SVN: r8836 - in stack/cxf/trunk: modules/management and 5 other directories.
by jbossws-commits@lists.jboss.org
Author: richard.opalka(a)jboss.com
Date: 2008-12-08 06:55:56 -0500 (Mon, 08 Dec 2008)
New Revision: 8836
Modified:
stack/cxf/trunk/modules/management/pom.xml
stack/cxf/trunk/modules/resources/src/main/resources/resources/jbossws-deploy-macros.xml
stack/cxf/trunk/modules/server/pom.xml
stack/cxf/trunk/modules/testsuite/pom.xml
stack/cxf/trunk/pom.xml
stack/cxf/trunk/src/main/distro/build-deploy.xml
stack/cxf/trunk/src/main/distro/build-setup.xml
stack/cxf/trunk/src/main/scripts/assembly-deploy-artifacts.xml
Log:
switch CXF to new AS container integrations
Modified: stack/cxf/trunk/modules/management/pom.xml
===================================================================
--- stack/cxf/trunk/modules/management/pom.xml 2008-12-08 10:56:15 UTC (rev 8835)
+++ stack/cxf/trunk/modules/management/pom.xml 2008-12-08 11:55:56 UTC (rev 8836)
@@ -49,12 +49,12 @@
<!-- START -->
<dependency>
<groupId>org.jboss.ws</groupId>
- <artifactId>jbossws-jboss500CR2</artifactId>
+ <artifactId>jbossws-jboss500</artifactId>
<scope>runtime</scope>
</dependency>
<dependency>
<groupId>org.jboss.ws</groupId>
- <artifactId>jbossws-jboss500x</artifactId>
+ <artifactId>jbossws-jboss501CR1</artifactId>
<scope>runtime</scope>
</dependency>
<!-- END -->
Modified: stack/cxf/trunk/modules/resources/src/main/resources/resources/jbossws-deploy-macros.xml
===================================================================
--- stack/cxf/trunk/modules/resources/src/main/resources/resources/jbossws-deploy-macros.xml 2008-12-08 10:56:15 UTC (rev 8835)
+++ stack/cxf/trunk/modules/resources/src/main/resources/resources/jbossws-deploy-macros.xml 2008-12-08 11:55:56 UTC (rev 8836)
@@ -339,19 +339,10 @@
<macro-deploy-jbossws-cxf42-sar targetdir="${installserver}/deploy/jbossws.sar" artifactsdir="${artifactsdir}" thirdpartydir="${thirdpartydir}" jbossid="${jbossid}"/>
</target>
- <target name="deploy-jbossws-cxf500" depends="check-parameters,deploy-jbossws-endorsed">
+ <target name="deploy-jbossws-cxf50" depends="check-parameters,deploy-jbossws-endorsed">
<macro-deploy-jbossws-bin targetdir="${installserver}/../../bin" artifactsdir="${artifactsdir}"/>
<macro-deploy-jbossws-client50 targetdir="${installserver}/../../client" thirdpartydir="${thirdpartydir}" jbossid="${jbossid}"/>
<macro-deploy-jbossws-lib50 targetdir="${installserver}/../../lib" thirdpartydir="${thirdpartydir}"/>
- <macro-deploy-jbossws-server-lib50 targetdir="${installserver}/lib" thirdpartydir="${thirdpartydir}" jbossid="${jbossid}"/>
- <macro-deploy-jbossws-cxf50-sar targetdir="${installserver}/deploy/jbossws.sar" artifactsdir="${artifactsdir}" thirdpartydir="${thirdpartydir}" jbossid="${jbossid}"/>
- <macro-deploy-jbossws-deployers50 targetdir="${installserver}/deployers/jbossws.deployer/" artifactsdir="${artifactsdir}" thirdpartydir="${thirdpartydir}" jbossid="${jbossid}"/>
- </target>
-
- <target name="deploy-jbossws-cxf501" depends="check-parameters,deploy-jbossws-endorsed">
- <macro-deploy-jbossws-bin targetdir="${installserver}/../../bin" artifactsdir="${artifactsdir}"/>
- <macro-deploy-jbossws-client50 targetdir="${installserver}/../../client" thirdpartydir="${thirdpartydir}" jbossid="${jbossid}"/>
- <macro-deploy-jbossws-lib50 targetdir="${installserver}/../../lib" thirdpartydir="${thirdpartydir}"/>
<macro-deploy-jbossws-server-lib50 targetdir="${installserver}/../../common/lib" thirdpartydir="${thirdpartydir}" jbossid="${jbossid}"/> <!-- Please note the "../../common" to use common server lib! -->
<macro-deploy-jbossws-cxf50-sar targetdir="${installserver}/deploy/jbossws.sar" artifactsdir="${artifactsdir}" thirdpartydir="${thirdpartydir}" jbossid="${jbossid}"/>
<macro-deploy-jbossws-deployers50 targetdir="${installserver}/deployers/jbossws.deployer/" artifactsdir="${artifactsdir}" thirdpartydir="${thirdpartydir}" jbossid="${jbossid}"/>
Modified: stack/cxf/trunk/modules/server/pom.xml
===================================================================
--- stack/cxf/trunk/modules/server/pom.xml 2008-12-08 10:56:15 UTC (rev 8835)
+++ stack/cxf/trunk/modules/server/pom.xml 2008-12-08 11:55:56 UTC (rev 8836)
@@ -189,7 +189,7 @@
<!-- START -->
<artifactItem>
<groupId>org.jboss.ws</groupId>
- <artifactId>jbossws-jboss500CR2</artifactId>
+ <artifactId>jbossws-jboss500</artifactId>
<version>${jbossws.jboss500.version}</version>
<classifier>resources</classifier>
<type>zip</type>
@@ -197,7 +197,7 @@
</artifactItem>
<artifactItem>
<groupId>org.jboss.ws</groupId>
- <artifactId>jbossws-jboss500x</artifactId>
+ <artifactId>jbossws-jboss501CR1</artifactId>
<version>${jbossws.jboss501.version}</version>
<classifier>resources</classifier>
<type>zip</type>
Modified: stack/cxf/trunk/modules/testsuite/pom.xml
===================================================================
--- stack/cxf/trunk/modules/testsuite/pom.xml 2008-12-08 10:56:15 UTC (rev 8835)
+++ stack/cxf/trunk/modules/testsuite/pom.xml 2008-12-08 11:55:56 UTC (rev 8836)
@@ -24,6 +24,7 @@
<wsdl.publish.location>${project.build.directory}/wsdl-publish</wsdl.publish.location>
<hibernate.version>3.2.4.sp1</hibernate.version>
<asm.version>2.2.3</asm.version>
+ <jboss.javaee.version>5.0.0.GA</jboss.javaee.version>
</properties>
<!-- Modules -->
@@ -374,7 +375,7 @@
<profile>
<id>jboss500</id>
<properties>
- <jboss.version>5.0.0.CR2</jboss.version>
+ <jboss.version>5.0.0.GA</jboss.version>
<jbossws.integration.target>jboss500</jbossws.integration.target>
<endpoint.servlet>org.jboss.wsf.stack.cxf.CXFServletExt</endpoint.servlet>
</properties>
@@ -383,7 +384,7 @@
<!-- START -->
<dependency>
<groupId>org.jboss.ws</groupId>
- <artifactId>jbossws-jboss500CR2</artifactId>
+ <artifactId>jbossws-jboss500</artifactId>
</dependency>
<!--dependency>
<groupId>org.jboss.jbossas</groupId>
@@ -395,11 +396,17 @@
<groupId>org.jboss.jbossas</groupId>
<artifactId>jboss-as-ejb3</artifactId>
<version>${jboss.version}</version>
+ <exclusions>
+ <exclusion>
+ <groupId>org.jboss.security</groupId>
+ <artifactId>jbosssx</artifactId>
+ </exclusion>
+ </exclusions>
</dependency>
<dependency>
<groupId>org.jboss.javaee</groupId>
<artifactId>jboss-javaee</artifactId>
- <version>${jboss.version}</version>
+ <version>${jboss.javaee.version}</version>
</dependency>
</dependencies>
<build>
@@ -418,7 +425,7 @@
<!-- TODO: replace with maven dependencies -->
<additionalClasspathElements>
<additionalClasspathElement>${jboss.home}/client/jbossall-client.jar</additionalClasspathElement>
- <additionalClasspathElement>${jboss.home}/server/default/lib/jboss-ejb3-core.jar</additionalClasspathElement>
+ <additionalClasspathElement>${jboss.home}/common/lib/jboss-ejb3-core.jar</additionalClasspathElement>
</additionalClasspathElements>
</configuration>
</plugin>
@@ -433,7 +440,7 @@
<profile>
<id>jboss501</id>
<properties>
- <jboss.version>5.0.0-SNAPSHOT</jboss.version>
+ <jboss.version>5.0.1-SNAPSHOT</jboss.version>
<jbossws.integration.target>jboss501</jbossws.integration.target>
<endpoint.servlet>org.jboss.wsf.stack.cxf.CXFServletExt</endpoint.servlet>
</properties>
@@ -442,7 +449,7 @@
<!-- START -->
<dependency>
<groupId>org.jboss.ws</groupId>
- <artifactId>jbossws-jboss500x</artifactId>
+ <artifactId>jbossws-jboss501CR1</artifactId>
</dependency>
<!--dependency>
<groupId>org.jboss.jbossas</groupId>
@@ -454,11 +461,17 @@
<groupId>org.jboss.jbossas</groupId>
<artifactId>jboss-as-ejb3</artifactId>
<version>${jboss.version}</version>
+ <exclusions>
+ <exclusion>
+ <groupId>org.jboss.security</groupId>
+ <artifactId>jbosssx</artifactId>
+ </exclusion>
+ </exclusions>
</dependency>
<dependency>
<groupId>org.jboss.javaee</groupId>
<artifactId>jboss-javaee</artifactId>
- <version>${jboss.version}</version>
+ <version>${jboss.javaee.version}</version>
</dependency>
</dependencies>
<build>
Modified: stack/cxf/trunk/pom.xml
===================================================================
--- stack/cxf/trunk/pom.xml 2008-12-08 10:56:15 UTC (rev 8835)
+++ stack/cxf/trunk/pom.xml 2008-12-08 11:55:56 UTC (rev 8836)
@@ -132,28 +132,28 @@
<classifier>resources</classifier>
<type>zip</type>
</dependency>
- <!-- JBWS-2263 -->
- <!-- START -->
<dependency>
<groupId>org.jboss.ws</groupId>
- <artifactId>jbossws-jboss500CR2</artifactId>
+ <artifactId>jbossws-jboss500</artifactId>
<version>${jbossws.jboss500.version}</version>
</dependency>
<dependency>
<groupId>org.jboss.ws</groupId>
- <artifactId>jbossws-jboss500CR2</artifactId>
+ <artifactId>jbossws-jboss500</artifactId>
<version>${jbossws.jboss500.version}</version>
<classifier>resources</classifier>
<type>zip</type>
</dependency>
+ <!-- JBWS-2263 -->
+ <!-- START -->
<dependency>
<groupId>org.jboss.ws</groupId>
- <artifactId>jbossws-jboss500x</artifactId>
+ <artifactId>jbossws-jboss501CR1</artifactId>
<version>${jbossws.jboss501.version}</version>
</dependency>
<dependency>
<groupId>org.jboss.ws</groupId>
- <artifactId>jbossws-jboss500x</artifactId>
+ <artifactId>jbossws-jboss501CR1</artifactId>
<version>${jbossws.jboss501.version}</version>
<classifier>resources</classifier>
<type>zip</type>
Modified: stack/cxf/trunk/src/main/distro/build-deploy.xml
===================================================================
--- stack/cxf/trunk/src/main/distro/build-deploy.xml 2008-12-08 10:56:15 UTC (rev 8835)
+++ stack/cxf/trunk/src/main/distro/build-deploy.xml 2008-12-08 11:55:56 UTC (rev 8836)
@@ -96,9 +96,9 @@
<!-- Prepare Deployment Structure JBoss-5.0.x -->
<!-- ================================================================== -->
- <target name="deploy-structure-jboss500" depends="prepare-deploy">
+ <target name="deploy-structure-jboss50" depends="prepare-deploy">
<delete dir="${deploy.structure}"/>
- <antcall target="deploy-jbossws-cxf500" inheritall="false">
+ <antcall target="deploy-jbossws-cxf50" inheritall="false">
<param name="installserver" value="${deploy.structure}/server/${jboss.server.instance}"/>
<param name="jbossid" value="${jbossws.integration.target}"/>
<param name="artifactsdir" value="${deploy.artifacts.dir}"/>
@@ -107,17 +107,6 @@
<macro-create-deploy-conf deploystructure="${deploy.structure}"/>
</target>
- <target name="deploy-structure-jboss501" depends="prepare-deploy">
- <delete dir="${deploy.structure}"/>
- <antcall target="deploy-jbossws-cxf501" inheritall="false">
- <param name="installserver" value="${deploy.structure}/server/${jboss.server.instance}"/>
- <param name="jbossid" value="${jbossws.integration.target}"/>
- <param name="artifactsdir" value="${deploy.artifacts.dir}"/>
- <param name="thirdpartydir" value="${deploy.artifacts.dir}"/>
- </antcall>
- <macro-create-deploy-conf deploystructure="${deploy.structure}"/>
- </target>
-
<!-- ================================================================== -->
<!-- Deployment JBoss500 -->
<!-- ================================================================== -->
@@ -127,7 +116,7 @@
<echo message="jbossws.integration.target=${jbossws.integration.target}" file="${target.properties.file}"/>
</target>
- <target name="deploy-jboss500" depends="undeploy-jboss500,deploy-structure-jboss500" description="Deploy jbossws to jboss500">
+ <target name="deploy-jboss500" depends="undeploy-jboss500,deploy-structure-jboss50" description="Deploy jbossws to jboss500">
<fail message="Not available: ${jboss500.available.file}" unless="jboss500.available"/>
<copy todir="${jboss500.home}" overwrite="true">
<fileset dir="${deploy.structure}"/>
@@ -137,7 +126,7 @@
<target name="undeploy-jboss500" depends="target-jboss500,init" description="Remove jbossws from jboss500">
<fail message="Not available: ${jboss500.available.file}" unless="jboss500.available"/>
- <macro-undeploy-jbossws50 targetdir="${jboss500.server.deploy}/jbossws.sar" defaultconf="${jbossws.default.deploy.conf}"/>
+ <macro-undeploy-jbossws50 targetdir="${jboss500.server.deploy}/jbossws.sar" defaultconf="${jbossws.as5.default.deploy.conf}"/>
</target>
<!-- ================================================================== -->
@@ -149,7 +138,7 @@
<echo message="jbossws.integration.target=${jbossws.integration.target}" file="${target.properties.file}"/>
</target>
- <target name="deploy-jboss501" depends="undeploy-jboss501,deploy-structure-jboss501" description="Deploy jbossws to jboss501">
+ <target name="deploy-jboss501" depends="undeploy-jboss501,deploy-structure-jboss50" description="Deploy jbossws to jboss501">
<fail message="Not available: ${jboss501.available.file}" unless="jboss501.available"/>
<copy todir="${jboss501.home}" overwrite="true">
<fileset dir="${deploy.structure}"/>
@@ -159,7 +148,7 @@
<target name="undeploy-jboss501" depends="target-jboss501,init" description="Remove jbossws from jboss501">
<fail message="Not available: ${jboss501.available.file}" unless="jboss501.available"/>
- <macro-undeploy-jbossws50 targetdir="${jboss501.server.deploy}/jbossws.sar" defaultconf="${jbossws.as5.default.deploy.conf}"/> <!-- Using AS5 default deploy.conf -->
+ <macro-undeploy-jbossws50 targetdir="${jboss501.server.deploy}/jbossws.sar" defaultconf="${jbossws.as5.default.deploy.conf}"/>
</target>
<!-- ================================================================== -->
Modified: stack/cxf/trunk/src/main/distro/build-setup.xml
===================================================================
--- stack/cxf/trunk/src/main/distro/build-setup.xml 2008-12-08 10:56:15 UTC (rev 8835)
+++ stack/cxf/trunk/src/main/distro/build-setup.xml 2008-12-08 11:55:56 UTC (rev 8836)
@@ -42,7 +42,7 @@
<property name="jboss500.lib" value="${jboss500.home}/lib"/>
<property name="jboss500.client" value="${jboss500.home}/client"/>
<property name="jboss500.server" value="${jboss500.home}/server/${jboss.server.instance}"/>
- <property name="jboss500.server.lib" value="${jboss500.server}/lib"/>
+ <property name="jboss500.server.lib" value="${jboss500.home}/common/lib"/>
<property name="jboss500.server.deploy" value="${jboss500.server}/deploy"/>
<property name="jboss500.server.deployers" value="${jboss500.server}/deployers"/>
Modified: stack/cxf/trunk/src/main/scripts/assembly-deploy-artifacts.xml
===================================================================
--- stack/cxf/trunk/src/main/scripts/assembly-deploy-artifacts.xml 2008-12-08 10:56:15 UTC (rev 8835)
+++ stack/cxf/trunk/src/main/scripts/assembly-deploy-artifacts.xml 2008-12-08 11:55:56 UTC (rev 8836)
@@ -78,6 +78,7 @@
<include>org.jboss.ws:jbossws-framework:jar</include>
<include>org.jboss.ws:jbossws-jboss422:jar</include>
<include>org.jboss.ws:jbossws-jboss423:jar</include>
+ <include>org.jboss.ws:jbossws-jboss500:jar</include>
<include>jboss.jaxr:juddi-service:sar</include>
</includes>
</dependencySet>
@@ -95,22 +96,12 @@
<!-- START -->
<dependencySet>
<outputDirectory>lib</outputDirectory>
- <outputFileNameMapping>jbossws-jboss500.${module.extension}</outputFileNameMapping>
- <useStrictFiltering>true</useStrictFiltering>
- <scope>runtime</scope>
- <unpack>false</unpack>
- <includes>
- <include>org.jboss.ws:jbossws-jboss500CR2:jar</include>
- </includes>
- </dependencySet>
- <dependencySet>
- <outputDirectory>lib</outputDirectory>
<outputFileNameMapping>jbossws-jboss501.${module.extension}</outputFileNameMapping>
<useStrictFiltering>true</useStrictFiltering>
<scope>runtime</scope>
<unpack>false</unpack>
<includes>
- <include>org.jboss.ws:jbossws-jboss500x:jar</include>
+ <include>org.jboss.ws:jbossws-jboss501CR1:jar</include>
</includes>
</dependencySet>
<!-- END -->
16 years, 1 month
JBossWS SVN: r8835 - in stack/metro/trunk: modules/management and 5 other directories.
by jbossws-commits@lists.jboss.org
Author: richard.opalka(a)jboss.com
Date: 2008-12-08 05:56:15 -0500 (Mon, 08 Dec 2008)
New Revision: 8835
Modified:
stack/metro/trunk/modules/management/pom.xml
stack/metro/trunk/modules/resources/src/main/resources/resources/jbossws-deploy-macros.xml
stack/metro/trunk/modules/server/pom.xml
stack/metro/trunk/modules/testsuite/pom.xml
stack/metro/trunk/pom.xml
stack/metro/trunk/src/main/distro/build-deploy.xml
stack/metro/trunk/src/main/distro/build-setup.xml
stack/metro/trunk/src/main/scripts/assembly-deploy-artifacts.xml
Log:
switch Metro to new AS container integrations
Modified: stack/metro/trunk/modules/management/pom.xml
===================================================================
--- stack/metro/trunk/modules/management/pom.xml 2008-12-05 19:09:21 UTC (rev 8834)
+++ stack/metro/trunk/modules/management/pom.xml 2008-12-08 10:56:15 UTC (rev 8835)
@@ -49,12 +49,12 @@
<!-- START -->
<dependency>
<groupId>org.jboss.ws</groupId>
- <artifactId>jbossws-jboss500CR2</artifactId>
+ <artifactId>jbossws-jboss500</artifactId>
<scope>runtime</scope>
</dependency>
<dependency>
<groupId>org.jboss.ws</groupId>
- <artifactId>jbossws-jboss500x</artifactId>
+ <artifactId>jbossws-jboss501CR1</artifactId>
<scope>runtime</scope>
</dependency>
<!-- END -->
Modified: stack/metro/trunk/modules/resources/src/main/resources/resources/jbossws-deploy-macros.xml
===================================================================
--- stack/metro/trunk/modules/resources/src/main/resources/resources/jbossws-deploy-macros.xml 2008-12-05 19:09:21 UTC (rev 8834)
+++ stack/metro/trunk/modules/resources/src/main/resources/resources/jbossws-deploy-macros.xml 2008-12-08 10:56:15 UTC (rev 8835)
@@ -372,20 +372,10 @@
<macro-deploy-juddi-sar targetdir="${installserver}/deploy/juddi-service.sar" thirdpartydir="${thirdpartydir}"/>
</target>
- <target name="deploy-jbossws-metro500" depends="check-parameters,deploy-jbossws-endorsed">
+ <target name="deploy-jbossws-metro50" depends="check-parameters,deploy-jbossws-endorsed">
<macro-deploy-jbossws-bin targetdir="${installserver}/../../bin" artifactsdir="${artifactsdir}"/>
<macro-deploy-jbossws-client50 targetdir="${installserver}/../../client" thirdpartydir="${thirdpartydir}" jbossid="${jbossid}"/>
<macro-deploy-jbossws-lib50 targetdir="${installserver}/../../lib" thirdpartydir="${thirdpartydir}"/>
- <macro-deploy-jbossws-server-lib50 targetdir="${installserver}/lib" thirdpartydir="${thirdpartydir}" jbossid="${jbossid}"/>
- <macro-deploy-jbossws-sar50 targetdir="${installserver}/deploy/jbossws.sar" artifactsdir="${artifactsdir}" thirdpartydir="${thirdpartydir}" jbossid="${jbossid}"/>
- <macro-deploy-jbossws-deployers50 targetdir="${installserver}/deployers/jbossws.deployer/" artifactsdir="${artifactsdir}" thirdpartydir="${thirdpartydir}" jbossid="${jbossid}"/>
- <macro-deploy-juddi-sar targetdir="${installserver}/deploy/juddi-service.sar" thirdpartydir="${thirdpartydir}"/>
- </target>
-
- <target name="deploy-jbossws-metro501" depends="check-parameters,deploy-jbossws-endorsed">
- <macro-deploy-jbossws-bin targetdir="${installserver}/../../bin" artifactsdir="${artifactsdir}"/>
- <macro-deploy-jbossws-client50 targetdir="${installserver}/../../client" thirdpartydir="${thirdpartydir}" jbossid="${jbossid}"/>
- <macro-deploy-jbossws-lib50 targetdir="${installserver}/../../lib" thirdpartydir="${thirdpartydir}"/>
<macro-deploy-jbossws-server-lib50 targetdir="${installserver}/../../common/lib" thirdpartydir="${thirdpartydir}" jbossid="${jbossid}"/> <!-- Please note the "../../common" to use common server lib! -->
<macro-deploy-jbossws-sar50 targetdir="${installserver}/deploy/jbossws.sar" artifactsdir="${artifactsdir}" thirdpartydir="${thirdpartydir}" jbossid="${jbossid}"/>
<macro-deploy-jbossws-deployers50 targetdir="${installserver}/deployers/jbossws.deployer/" artifactsdir="${artifactsdir}" thirdpartydir="${thirdpartydir}" jbossid="${jbossid}"/>
Modified: stack/metro/trunk/modules/server/pom.xml
===================================================================
--- stack/metro/trunk/modules/server/pom.xml 2008-12-05 19:09:21 UTC (rev 8834)
+++ stack/metro/trunk/modules/server/pom.xml 2008-12-08 10:56:15 UTC (rev 8835)
@@ -186,7 +186,7 @@
<!-- START -->
<artifactItem>
<groupId>org.jboss.ws</groupId>
- <artifactId>jbossws-jboss500CR2</artifactId>
+ <artifactId>jbossws-jboss500</artifactId>
<version>${jbossws.jboss500.version}</version>
<classifier>resources</classifier>
<type>zip</type>
@@ -194,7 +194,7 @@
</artifactItem>
<artifactItem>
<groupId>org.jboss.ws</groupId>
- <artifactId>jbossws-jboss500x</artifactId>
+ <artifactId>jbossws-jboss501CR1</artifactId>
<version>${jbossws.jboss501.version}</version>
<classifier>resources</classifier>
<type>zip</type>
Modified: stack/metro/trunk/modules/testsuite/pom.xml
===================================================================
--- stack/metro/trunk/modules/testsuite/pom.xml 2008-12-05 19:09:21 UTC (rev 8834)
+++ stack/metro/trunk/modules/testsuite/pom.xml 2008-12-08 10:56:15 UTC (rev 8835)
@@ -25,6 +25,7 @@
<wsdl.publish.location>${project.build.directory}/wsdl-publish</wsdl.publish.location>
<hibernate.version>3.2.4.sp1</hibernate.version>
<endpoint.servlet>org.jboss.wsf.stack.metro.EndpointServlet</endpoint.servlet>
+ <jboss.javaee.version>5.0.0.GA</jboss.javaee.version>
</properties>
<!-- Modules -->
@@ -433,7 +434,7 @@
<profile>
<id>jboss500</id>
<properties>
- <jboss.version>5.0.0.CR2</jboss.version>
+ <jboss.version>5.0.0.GA</jboss.version>
<jbossws.integration.target>jboss500</jbossws.integration.target>
</properties>
<dependencies>
@@ -441,7 +442,7 @@
<!-- START -->
<dependency>
<groupId>org.jboss.ws</groupId>
- <artifactId>jbossws-jboss500CR2</artifactId>
+ <artifactId>jbossws-jboss500</artifactId>
</dependency>
<!--dependency>
<groupId>org.jboss.jbossas</groupId>
@@ -458,11 +459,17 @@
<groupId>org.jboss.jbossas</groupId>
<artifactId>jboss-as-ejb3</artifactId>
<version>${jboss.version}</version>
+ <exclusions>
+ <exclusion>
+ <groupId>org.jboss.security</groupId>
+ <artifactId>jbosssx</artifactId>
+ </exclusion>
+ </exclusions>
</dependency>
<dependency>
<groupId>org.jboss.javaee</groupId>
<artifactId>jboss-javaee</artifactId>
- <version>${jboss.version}</version>
+ <version>${jboss.javaee.version}</version>
</dependency>
</dependencies>
<build>
@@ -481,7 +488,7 @@
<!-- TODO: replace with maven dependencies -->
<additionalClasspathElements>
<additionalClasspathElement>${jboss.home}/client/jbossall-client.jar</additionalClasspathElement>
- <additionalClasspathElement>${jboss.home}/server/default/lib/jboss-ejb3-core.jar</additionalClasspathElement>
+ <additionalClasspathElement>${jboss.home}/common/lib/jboss-ejb3-core.jar</additionalClasspathElement>
</additionalClasspathElements>
</configuration>
</plugin>
@@ -496,7 +503,7 @@
<profile>
<id>jboss501</id>
<properties>
- <jboss.version>5.0.0-SNAPSHOT</jboss.version>
+ <jboss.version>5.0.1-SNAPSHOT</jboss.version>
<jbossws.integration.target>jboss501</jbossws.integration.target>
</properties>
<dependencies>
@@ -504,7 +511,7 @@
<!-- START -->
<dependency>
<groupId>org.jboss.ws</groupId>
- <artifactId>jbossws-jboss500x</artifactId>
+ <artifactId>jbossws-jboss501CR1</artifactId>
</dependency>
<!--dependency>
<groupId>org.jboss.jbossas</groupId>
@@ -521,11 +528,17 @@
<groupId>org.jboss.jbossas</groupId>
<artifactId>jboss-as-ejb3</artifactId>
<version>${jboss.version}</version>
+ <exclusions>
+ <exclusion>
+ <groupId>org.jboss.security</groupId>
+ <artifactId>jbosssx</artifactId>
+ </exclusion>
+ </exclusions>
</dependency>
<dependency>
<groupId>org.jboss.javaee</groupId>
<artifactId>jboss-javaee</artifactId>
- <version>${jboss.version}</version>
+ <version>${jboss.javaee.version}</version>
</dependency>
</dependencies>
<build>
Modified: stack/metro/trunk/pom.xml
===================================================================
--- stack/metro/trunk/pom.xml 2008-12-05 19:09:21 UTC (rev 8834)
+++ stack/metro/trunk/pom.xml 2008-12-08 10:56:15 UTC (rev 8835)
@@ -138,28 +138,28 @@
<classifier>resources</classifier>
<type>zip</type>
</dependency>
- <!-- JBWS-2263 -->
- <!-- START -->
<dependency>
<groupId>org.jboss.ws</groupId>
- <artifactId>jbossws-jboss500CR2</artifactId>
+ <artifactId>jbossws-jboss500</artifactId>
<version>${jbossws.jboss500.version}</version>
</dependency>
<dependency>
<groupId>org.jboss.ws</groupId>
- <artifactId>jbossws-jboss500CR2</artifactId>
+ <artifactId>jbossws-jboss500</artifactId>
<version>${jbossws.jboss500.version}</version>
<classifier>resources</classifier>
<type>zip</type>
</dependency>
+ <!-- JBWS-2263 -->
+ <!-- START -->
<dependency>
<groupId>org.jboss.ws</groupId>
- <artifactId>jbossws-jboss500x</artifactId>
+ <artifactId>jbossws-jboss501CR1</artifactId>
<version>${jbossws.jboss501.version}</version>
</dependency>
<dependency>
<groupId>org.jboss.ws</groupId>
- <artifactId>jbossws-jboss500x</artifactId>
+ <artifactId>jbossws-jboss501CR1</artifactId>
<version>${jbossws.jboss501.version}</version>
<classifier>resources</classifier>
<type>zip</type>
Modified: stack/metro/trunk/src/main/distro/build-deploy.xml
===================================================================
--- stack/metro/trunk/src/main/distro/build-deploy.xml 2008-12-05 19:09:21 UTC (rev 8834)
+++ stack/metro/trunk/src/main/distro/build-deploy.xml 2008-12-08 10:56:15 UTC (rev 8835)
@@ -102,9 +102,9 @@
<!-- Prepare Deployment Structure JBoss-5.0.x -->
<!-- ================================================================== -->
- <target name="deploy-structure-jboss500" depends="prepare-deploy">
+ <target name="deploy-structure-jboss50" depends="prepare-deploy">
<delete dir="${deploy.structure}"/>
- <antcall target="deploy-jbossws-metro500" inheritall="false">
+ <antcall target="deploy-jbossws-metro50" inheritall="false">
<param name="installserver" value="${deploy.structure}/server/${jboss.server.instance}"/>
<param name="jbossid" value="${jbossws.integration.target}"/>
<param name="artifactsdir" value="${deploy.artifacts.dir}"/>
@@ -113,17 +113,6 @@
<macro-create-deploy-conf deploystructure="${deploy.structure}"/>
</target>
- <target name="deploy-structure-jboss501" depends="prepare-deploy">
- <delete dir="${deploy.structure}"/>
- <antcall target="deploy-jbossws-metro501" inheritall="false">
- <param name="installserver" value="${deploy.structure}/server/${jboss.server.instance}"/>
- <param name="jbossid" value="${jbossws.integration.target}"/>
- <param name="artifactsdir" value="${deploy.artifacts.dir}"/>
- <param name="thirdpartydir" value="${deploy.artifacts.dir}"/>
- </antcall>
- <macro-create-deploy-conf deploystructure="${deploy.structure}"/>
- </target>
-
<!-- ================================================================== -->
<!-- Deployment JBoss500 -->
<!-- ================================================================== -->
@@ -135,7 +124,7 @@
<echo message="jboss.server.instance=${jboss.server.instance}${line.separator}" file="${target.properties.file}" append="true"/>
</target>
- <target name="deploy-jboss500" depends="undeploy-jboss500,deploy-structure-jboss500" description="Deploy jbossws to jboss500">
+ <target name="deploy-jboss500" depends="undeploy-jboss500,deploy-structure-jboss50" description="Deploy jbossws to jboss500">
<fail message="Not available: ${jboss500.available.file}" unless="jboss500.available"/>
<copy todir="${jboss500.home}" overwrite="true">
<fileset dir="${deploy.structure}"/>
@@ -145,7 +134,7 @@
<target name="undeploy-jboss500" depends="target-jboss500,init" description="Remove jbossws from jboss500">
<fail message="Not available: ${jboss500.available.file}" unless="jboss500.available"/>
- <macro-undeploy-jbossws50 targetdir="${jboss500.server.deploy}/jbossws.sar" defaultconf="${jbossws.default.deploy.conf}"/>
+ <macro-undeploy-jbossws50 targetdir="${jboss500.server.deploy}/jbossws.sar" defaultconf="${jbossws.as5.default.deploy.conf}"/>
</target>
<!-- ================================================================== -->
@@ -159,7 +148,7 @@
<echo message="jboss.server.instance=${jboss.server.instance}${line.separator}" file="${target.properties.file}" append="true"/>
</target>
- <target name="deploy-jboss501" depends="undeploy-jboss501,deploy-structure-jboss501" description="Deploy jbossws to jboss501">
+ <target name="deploy-jboss501" depends="undeploy-jboss501,deploy-structure-jboss50" description="Deploy jbossws to jboss501">
<fail message="Not available: ${jboss501.available.file}" unless="jboss501.available"/>
<copy todir="${jboss501.home}" overwrite="true">
<fileset dir="${deploy.structure}"/>
@@ -169,7 +158,7 @@
<target name="undeploy-jboss501" depends="target-jboss501,init" description="Remove jbossws from jboss501">
<fail message="Not available: ${jboss501.available.file}" unless="jboss501.available"/>
- <macro-undeploy-jbossws50 targetdir="${jboss501.server.deploy}/jbossws.sar" defaultconf="${jbossws.as5.default.deploy.conf}"/> <!-- Using AS5 default deploy.conf -->
+ <macro-undeploy-jbossws50 targetdir="${jboss501.server.deploy}/jbossws.sar" defaultconf="${jbossws.as5.default.deploy.conf}"/>
</target>
<!-- ================================================================== -->
Modified: stack/metro/trunk/src/main/distro/build-setup.xml
===================================================================
--- stack/metro/trunk/src/main/distro/build-setup.xml 2008-12-05 19:09:21 UTC (rev 8834)
+++ stack/metro/trunk/src/main/distro/build-setup.xml 2008-12-08 10:56:15 UTC (rev 8835)
@@ -41,7 +41,7 @@
<property name="jboss500.lib" value="${jboss500.home}/lib"/>
<property name="jboss500.client" value="${jboss500.home}/client"/>
<property name="jboss500.server" value="${jboss500.home}/server/${jboss.server.instance}"/>
- <property name="jboss500.server.lib" value="${jboss500.server}/lib"/>
+ <property name="jboss500.server.lib" value="${jboss500.home}/common/lib"/>
<property name="jboss500.server.deploy" value="${jboss500.server}/deploy"/>
<property name="jboss500.server.deployers" value="${jboss500.server}/deployers"/>
Modified: stack/metro/trunk/src/main/scripts/assembly-deploy-artifacts.xml
===================================================================
--- stack/metro/trunk/src/main/scripts/assembly-deploy-artifacts.xml 2008-12-05 19:09:21 UTC (rev 8834)
+++ stack/metro/trunk/src/main/scripts/assembly-deploy-artifacts.xml 2008-12-08 10:56:15 UTC (rev 8835)
@@ -81,6 +81,7 @@
<include>org.jboss.ws:jbossws-framework:jar</include>
<include>org.jboss.ws:jbossws-jboss422:jar</include>
<include>org.jboss.ws:jbossws-jboss423:jar</include>
+ <include>org.jboss.ws:jbossws-jboss500:jar</include>
<include>org.jboss.jaxr:juddi-service:sar</include>
<include>apache-scout:scout:jar</include>
<include>apache-xmlbeans:xmlbeans:jar</include>
@@ -101,22 +102,12 @@
<!-- START -->
<dependencySet>
<outputDirectory>lib</outputDirectory>
- <outputFileNameMapping>jbossws-jboss500.${module.extension}</outputFileNameMapping>
- <useStrictFiltering>true</useStrictFiltering>
- <scope>runtime</scope>
- <unpack>false</unpack>
- <includes>
- <include>org.jboss.ws:jbossws-jboss500CR2:jar</include>
- </includes>
- </dependencySet>
- <dependencySet>
- <outputDirectory>lib</outputDirectory>
<outputFileNameMapping>jbossws-jboss501.${module.extension}</outputFileNameMapping>
<useStrictFiltering>true</useStrictFiltering>
<scope>runtime</scope>
<unpack>false</unpack>
<includes>
- <include>org.jboss.ws:jbossws-jboss500x:jar</include>
+ <include>org.jboss.ws:jbossws-jboss501CR1:jar</include>
</includes>
</dependencySet>
<!-- END -->
16 years, 1 month
JBossWS SVN: r8834 - in container/jboss50: branches/jboss501CR1 and 1 other directories.
by jbossws-commits@lists.jboss.org
Author: richard.opalka(a)jboss.com
Date: 2008-12-05 14:09:21 -0500 (Fri, 05 Dec 2008)
New Revision: 8834
Modified:
container/jboss50/branches/jboss500GA/pom.xml
container/jboss50/branches/jboss501CR1/pom.xml
container/jboss50/trunk/pom.xml
Log:
sync with AS tags/branches/trunk
Modified: container/jboss50/branches/jboss500GA/pom.xml
===================================================================
--- container/jboss50/branches/jboss500GA/pom.xml 2008-12-05 18:38:08 UTC (rev 8833)
+++ container/jboss50/branches/jboss500GA/pom.xml 2008-12-05 19:09:21 UTC (rev 8834)
@@ -2,9 +2,9 @@
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
<modelVersion>4.0.0</modelVersion>
- <name>JBoss Web Services - Container JBoss-5.0.0.x</name>
+ <name>JBoss Web Services - Container JBoss-5.0.0.GA</name>
<groupId>org.jboss.ws</groupId>
- <artifactId>jbossws-jboss500CR2</artifactId>
+ <artifactId>jbossws-jboss500</artifactId>
<version>3.0.5-SNAPSHOT</version>
@@ -17,29 +17,28 @@
<!-- Source Control Management -->
<scm>
- <connection>scm:svn:http://anonsvn.jboss.org/repos/jbossws/container/jboss50/branches...</connection>
- <developerConnection>scm:svn:https://svn.jboss.org/repos/jbossws/container/jboss50/branches/jb...</developerConnection>
- <url>http://fisheye.jboss.com/viewrep/JBossWS/container/jboss50/branches/jboss...</url>
+ <connection>scm:svn:http://anonsvn.jboss.org/repos/jbossws/container/jboss50/branches...</connection>
+ <developerConnection>scm:svn:https://svn.jboss.org/repos/jbossws/container/jboss50/branches/jb...</developerConnection>
+ <url>http://fisheye.jboss.com/viewrep/JBossWS/container/jboss50/branches/jboss...</url>
</scm>
<!-- Properties -->
<properties>
<jbossws.common.version>1.0.8-SNAPSHOT</jbossws.common.version>
<jbossws.spi.version>1.0.7-SNAPSHOT</jbossws.spi.version>
-
<!--
- JBoss component versions taken from
- http://repository.jboss.org/maven2/org/jboss/jbossas/jboss-as-component-m...
+ JBoss component versions taken from
+ http://repository.jboss.org/maven2/org/jboss/jbossas/jboss-as-component-m...
-->
- <jboss.version>5.0.0.CR2</jboss.version>
- <jboss.ejb3.version>1.0.0-Beta3</jboss.ejb3.version>
- <jboss.deployers.version>2.0.0.CR1</jboss.deployers.version>
- <jboss.jbossxb.version>2.0.0.CR15</jboss.jbossxb.version>
- <jboss.metadata.version>1.0.0.CR1</jboss.metadata.version>
- <jboss.microcontainer.version>2.0.0.CR1</jboss.microcontainer.version>
- <jboss.reflect.version>2.0.0.CR1</jboss.reflect.version>
- <jboss.security.version>2.0.2.CR6</jboss.security.version>
- <jboss.vfs.version>2.0.0.CR1</jboss.vfs.version>
+ <jboss.version>5.0.0.GA</jboss.version>
+ <jboss.ejb3.version>1.0.0-Beta10</jboss.ejb3.version>
+ <jboss.deployers.version>2.0.3.GA</jboss.deployers.version>
+ <jboss.jbossxb.version>2.0.0.GA</jboss.jbossxb.version>
+ <jboss.metadata.version>1.0.0.CR11</jboss.metadata.version>
+ <jboss.microcontainer.version>2.0.2.GA</jboss.microcontainer.version>
+ <jboss.reflect.version>2.0.2.GA</jboss.reflect.version>
+ <jboss.security.version>2.0.2.SP3</jboss.security.version>
+ <jboss.vfs.version>2.0.0.GA</jboss.vfs.version>
</properties>
<!-- DependencyManagement -->
Modified: container/jboss50/branches/jboss501CR1/pom.xml
===================================================================
--- container/jboss50/branches/jboss501CR1/pom.xml 2008-12-05 18:38:08 UTC (rev 8833)
+++ container/jboss50/branches/jboss501CR1/pom.xml 2008-12-05 19:09:21 UTC (rev 8834)
@@ -2,9 +2,9 @@
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
<modelVersion>4.0.0</modelVersion>
- <name>JBoss Web Services - Container JBoss-5.0.0.x</name>
+ <name>JBoss Web Services - Container JBoss-5.0.1.CR1</name>
<groupId>org.jboss.ws</groupId>
- <artifactId>jbossws-jboss500CR2</artifactId>
+ <artifactId>jbossws-jboss501CR1</artifactId>
<version>3.0.5-SNAPSHOT</version>
@@ -17,9 +17,9 @@
<!-- Source Control Management -->
<scm>
- <connection>scm:svn:http://anonsvn.jboss.org/repos/jbossws/container/jboss50/branches...</connection>
- <developerConnection>scm:svn:https://svn.jboss.org/repos/jbossws/container/jboss50/branches/jb...</developerConnection>
- <url>http://fisheye.jboss.com/viewrep/JBossWS/container/jboss50/branches/jboss...</url>
+ <connection>scm:svn:http://anonsvn.jboss.org/repos/jbossws/container/jboss50/branches...</connection>
+ <developerConnection>scm:svn:https://svn.jboss.org/repos/jbossws/container/jboss50/branches/jb...</developerConnection>
+ <url>http://fisheye.jboss.com/viewrep/JBossWS/container/jboss50/branches/jboss...</url>
</scm>
<!-- Properties -->
@@ -28,18 +28,18 @@
<jbossws.spi.version>1.0.7-SNAPSHOT</jbossws.spi.version>
<!--
- JBoss component versions taken from
- http://repository.jboss.org/maven2/org/jboss/jbossas/jboss-as-component-m...
+ JBoss component versions taken from
+ http://snapshots.jboss.org/maven2/org/jboss/jbossas/jboss-as-component-ma...
-->
- <jboss.version>5.0.0.CR2</jboss.version>
- <jboss.ejb3.version>1.0.0-Beta3</jboss.ejb3.version>
- <jboss.deployers.version>2.0.0.CR1</jboss.deployers.version>
- <jboss.jbossxb.version>2.0.0.CR15</jboss.jbossxb.version>
- <jboss.metadata.version>1.0.0.CR1</jboss.metadata.version>
- <jboss.microcontainer.version>2.0.0.CR1</jboss.microcontainer.version>
- <jboss.reflect.version>2.0.0.CR1</jboss.reflect.version>
- <jboss.security.version>2.0.2.CR6</jboss.security.version>
- <jboss.vfs.version>2.0.0.CR1</jboss.vfs.version>
+ <jboss.version>5.0.1-SNAPSHOT</jboss.version>
+ <jboss.ejb3.version>1.0.0-Beta10</jboss.ejb3.version>
+ <jboss.deployers.version>2.0.3.GA</jboss.deployers.version>
+ <jboss.jbossxb.version>2.0.0.GA</jboss.jbossxb.version>
+ <jboss.metadata.version>1.0.0.CR11</jboss.metadata.version>
+ <jboss.microcontainer.version>2.0.2.GA</jboss.microcontainer.version>
+ <jboss.reflect.version>2.0.2.GA</jboss.reflect.version>
+ <jboss.security.version>2.0.2.SP3</jboss.security.version>
+ <jboss.vfs.version>2.0.0.GA</jboss.vfs.version>
</properties>
<!-- DependencyManagement -->
Modified: container/jboss50/trunk/pom.xml
===================================================================
--- container/jboss50/trunk/pom.xml 2008-12-05 18:38:08 UTC (rev 8833)
+++ container/jboss50/trunk/pom.xml 2008-12-05 19:09:21 UTC (rev 8834)
@@ -2,9 +2,9 @@
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
<modelVersion>4.0.0</modelVersion>
- <name>JBoss Web Services - Container JBoss-5.0.0.x</name>
+ <name>JBoss Web Services - Container JBoss-5.1.0.x</name>
<groupId>org.jboss.ws</groupId>
- <artifactId>jbossws-jboss500x</artifactId>
+ <artifactId>jbossws-jboss510x</artifactId>
<version>3.0.5-SNAPSHOT</version>
@@ -28,17 +28,17 @@
<jbossws.spi.version>1.0.7-SNAPSHOT</jbossws.spi.version>
<!--
- JBoss component versions taken from
- http://snapshots.jboss.org/maven2/org/jboss/jbossas/jboss-as-component-ma...
+ JBoss component versions taken from
+ http://snapshots.jboss.org/maven2/org/jboss/jbossas/jboss-as-component-ma...
-->
- <jboss.version>5.0.0-SNAPSHOT</jboss.version>
- <jboss.ejb3.version>1.0.0-Beta8</jboss.ejb3.version>
- <jboss.deployers.version>2.0.0.GA</jboss.deployers.version>
+ <jboss.version>5.1.0-SNAPSHOT</jboss.version>
+ <jboss.ejb3.version>1.0.0-Beta10</jboss.ejb3.version>
+ <jboss.deployers.version>2.0.3.GA</jboss.deployers.version>
<jboss.jbossxb.version>2.0.0.GA</jboss.jbossxb.version>
- <jboss.metadata.version>1.0.0.CR7</jboss.metadata.version>
- <jboss.microcontainer.version>2.0.1.GA</jboss.microcontainer.version>
+ <jboss.metadata.version>1.0.0.CR11</jboss.metadata.version>
+ <jboss.microcontainer.version>2.0.2.GA</jboss.microcontainer.version>
<jboss.reflect.version>2.0.2.GA</jboss.reflect.version>
- <jboss.security.version>2.0.2.SP2</jboss.security.version>
+ <jboss.security.version>2.0.2.SP3</jboss.security.version>
<jboss.vfs.version>2.0.0.GA</jboss.vfs.version>
</properties>
16 years, 1 month