JBossWS SVN: r9308 - stack/cxf/trunk.
by jbossws-commits＠lists.jboss.org
Author: richard.opalka(a)jboss.com
Date: 2009-02-13 17:07:32 -0500 (Fri, 13 Feb 2009)
New Revision: 9308
Modified:
stack/cxf/trunk/pom.xml
Log:
[JBWS-2505] fix property name
Modified: stack/cxf/trunk/pom.xml
===================================================================
--- stack/cxf/trunk/pom.xml 2009-02-13 22:06:48 UTC (rev 9307)
+++ stack/cxf/trunk/pom.xml 2009-02-13 22:07:32 UTC (rev 9308)
@@ -53,8 +53,8 @@
<jbossws.jboss500.version>3.1.0-SNAPSHOT</jbossws.jboss500.version>
<!-- JBWS-2505 -->
<!-- START -->
+ <jbossws.jboss501.version>3.1.0-SNAPSHOT</jbossws.jboss501.version>
<jbossws.jboss510.version>3.1.0-SNAPSHOT</jbossws.jboss510.version>
- <jbossws.jboss510.version>3.1.0-SNAPSHOT</jbossws.jboss510.version>
<jbossws.jboss600.version>3.1.0-SNAPSHOT</jbossws.jboss600.version>
<!-- END -->
<cxf.version>2.1.4</cxf.version>
15 years, 10 months
JBossWS SVN: r9307 - container/jboss50/branches/jboss501.
by jbossws-commits＠lists.jboss.org
Author: richard.opalka(a)jboss.com
Date: 2009-02-13 17:06:48 -0500 (Fri, 13 Feb 2009)
New Revision: 9307
Modified:
container/jboss50/branches/jboss501/pom.xml
Log:
fix version
Modified: container/jboss50/branches/jboss501/pom.xml
===================================================================
--- container/jboss50/branches/jboss501/pom.xml 2009-02-13 22:00:49 UTC (rev 9306)
+++ container/jboss50/branches/jboss501/pom.xml 2009-02-13 22:06:48 UTC (rev 9307)
@@ -6,7 +6,7 @@
<groupId>org.jboss.ws</groupId>
<artifactId>jbossws-jboss501x</artifactId>
- <version>3.0.6-SNAPSHOT</version>
+ <version>3.1.0-SNAPSHOT</version>
<!-- Parent -->
<parent>
15 years, 10 months
JBossWS SVN: r9305 - in container/jboss50/branches/jboss501: src/main/java/org/jboss/wsf/container/jboss50/transport and 1 other directory.
by jbossws-commits＠lists.jboss.org
Author: richard.opalka(a)jboss.com
Date: 2009-02-13 16:45:53 -0500 (Fri, 13 Feb 2009)
New Revision: 9305
Modified:
container/jboss50/branches/jboss501/pom.xml
container/jboss50/branches/jboss501/src/main/java/org/jboss/wsf/container/jboss50/transport/DynamicEndpointDeploymentAspect.java
Log:
[JBAS-6496] sync with AS code base
Modified: container/jboss50/branches/jboss501/pom.xml
===================================================================
--- container/jboss50/branches/jboss501/pom.xml 2009-02-13 21:30:24 UTC (rev 9304)
+++ container/jboss50/branches/jboss501/pom.xml 2009-02-13 21:45:53 UTC (rev 9305)
@@ -33,13 +33,14 @@
-->
<jboss.version>5.0.1-SNAPSHOT</jboss.version>
<jboss.ejb3.version>1.0.0</jboss.ejb3.version>
- <jboss.deployers.version>2.0.3.GA</jboss.deployers.version>
+ <jboss.deployers.version>2.2.0-SNAPSHOT</jboss.deployers.version>
<jboss.jbossxb.version>2.0.0.GA</jboss.jbossxb.version>
<jboss.metadata.version>1.0.0.CR16</jboss.metadata.version>
- <jboss.microcontainer.version>2.0.2.GA</jboss.microcontainer.version>
+ <jboss.microcontainer.version>2.2.0-SNAPSHOT</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>
+ <jboss.security.version>2.0.2.SP6</jboss.security.version>
+ <jboss.vfs.version>2.2.0-SNAPSHOT</jboss.vfs.version>
+ <jboss.cl.version>2.0.3-SNAPSHOT</jboss.cl.version>
</properties>
<!-- DependencyManagement -->
@@ -56,6 +57,11 @@
<version>${jbossws.spi.version}</version>
</dependency>
<dependency>
+ <groupId>org.jboss.cl</groupId>
+ <artifactId>jboss-classloading</artifactId>
+ <version>${jboss.cl.version}</version>
+ </dependency>
+ <dependency>
<groupId>org.jboss</groupId>
<artifactId>jboss-reflect</artifactId>
<version>${jboss.reflect.version}</version>
@@ -181,6 +187,10 @@
<artifactId>jboss-vfs</artifactId>
</dependency>
<dependency>
+ <groupId>org.jboss.cl</groupId>
+ <artifactId>jboss-classloading</artifactId>
+ </dependency>
+ <dependency>
<groupId>org.jboss</groupId>
<artifactId>jboss-reflect</artifactId>
</dependency>
Modified: container/jboss50/branches/jboss501/src/main/java/org/jboss/wsf/container/jboss50/transport/DynamicEndpointDeploymentAspect.java
===================================================================
--- container/jboss50/branches/jboss501/src/main/java/org/jboss/wsf/container/jboss50/transport/DynamicEndpointDeploymentAspect.java 2009-02-13 21:30:24 UTC (rev 9304)
+++ container/jboss50/branches/jboss501/src/main/java/org/jboss/wsf/container/jboss50/transport/DynamicEndpointDeploymentAspect.java 2009-02-13 21:45:53 UTC (rev 9305)
@@ -26,6 +26,8 @@
import javax.xml.ws.WebServiceException;
+import org.jboss.classloading.spi.dependency.ClassLoading;
+import org.jboss.classloading.spi.dependency.Module;
import org.jboss.deployers.client.plugins.deployment.AbstractDeployment;
import org.jboss.deployers.client.spi.DeployerClient;
import org.jboss.deployers.client.spi.DeploymentFactory;
@@ -85,6 +87,7 @@
mutableAttachments.addAttachment("org.jboss.web.explicitDocBase", "/", String.class);
mutableAttachments.addAttachment(ClassLoaderFactory.class, new ContextClassLoaderFactory(epLoader));
mutableAttachments.addAttachment(JBossWebMetaData.class, jbwmd);
+ mutableAttachments.addAttachment(Module.class, ClassLoading.getModuleForClassLoader(epLoader));
mainDeployer.deploy(deployment);
deployments.put(contextRoot, deployment);
15 years, 10 months
JBossWS SVN: r9304 - container/jboss50/branches.
by jbossws-commits＠lists.jboss.org
Author: richard.opalka(a)jboss.com
Date: 2009-02-13 16:30:24 -0500 (Fri, 13 Feb 2009)
New Revision: 9304
Added:
container/jboss50/branches/jboss501/
Removed:
container/jboss50/branches/jboss501CR1/
Log:
refactoring branch name
Copied: container/jboss50/branches/jboss501 (from rev 9303, container/jboss50/branches/jboss501CR1)
15 years, 10 months
JBossWS SVN: r9303 - container/jboss50/branches.
by jbossws-commits＠lists.jboss.org
Author: richard.opalka(a)jboss.com
Date: 2009-02-13 16:29:55 -0500 (Fri, 13 Feb 2009)
New Revision: 9303
Added:
container/jboss50/branches/jboss500/
Removed:
container/jboss50/branches/jboss50x/
Log:
refactoring branch name
Copied: container/jboss50/branches/jboss500 (from rev 9302, container/jboss50/branches/jboss50x)
15 years, 10 months
JBossWS SVN: r9302 - in stack/metro/trunk: modules/management and 4 other directories.
by jbossws-commits＠lists.jboss.org
Author: richard.opalka(a)jboss.com
Date: 2009-02-13 16:24:17 -0500 (Fri, 13 Feb 2009)
New Revision: 9302
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/scripts/assembly-deploy-artifacts.xml
Log:
[JBWS-2505] rollback
Modified: stack/metro/trunk/modules/management/pom.xml
===================================================================
--- stack/metro/trunk/modules/management/pom.xml 2009-02-13 21:18:35 UTC (rev 9301)
+++ stack/metro/trunk/modules/management/pom.xml 2009-02-13 21:24:17 UTC (rev 9302)
@@ -52,7 +52,6 @@
</dependency>
<!-- [JBWS-2505] -->
<!-- START -->
- <!--
<dependency>
<groupId>org.jboss.ws</groupId>
<artifactId>jbossws-jboss501x</artifactId>
@@ -68,7 +67,6 @@
<artifactId>jbossws-jboss600x</artifactId>
<scope>runtime</scope>
</dependency>
- -->
<!-- END -->
<dependency>
<groupId>org.jboss.jaxr</groupId>
@@ -77,7 +75,7 @@
<type>sar</type>
</dependency>
</dependencies>
-
+
<!-- Build -->
<build>
<plugins>
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 2009-02-13 21:18:35 UTC (rev 9301)
+++ stack/metro/trunk/modules/resources/src/main/resources/resources/jbossws-deploy-macros.xml 2009-02-13 21:24:17 UTC (rev 9302)
@@ -252,9 +252,7 @@
<patternset refid="jbossws.client.patternset"/>
<!-- JBWS-2505 -->
<!-- START -->
- <!--
<include name="**/jbossws-(a){jbossid}.jar"/>
- -->
<!-- END -->
</fileset>
</copy>
@@ -272,9 +270,7 @@
<patternset refid="jbossws.client.patternset"/>
<!-- JBWS-2505 -->
<!-- START -->
- <!--
<include name="**/jbossws-(a){jbossid}.jar"/>
- -->
<!-- END -->
</fileset>
</copy>
@@ -292,9 +288,7 @@
<patternset refid="jbossws.client.patternset"/>
<!-- JBWS-2505 -->
<!-- START -->
- <!--
<include name="**/jbossws-(a){jbossid}.jar"/>
- -->
<!-- END -->
</fileset>
</copy>
@@ -525,21 +519,17 @@
<include name="**/jbossws-framework.jar"/>
<!-- JBWS-2505 -->
<!-- START -->
- <!--
<include name="**/jbossws-(a){jbossid}.jar"/>
- -->
<!-- END -->
</fileset>
</copy>
<!-- JBWS-2505 -->
<!-- START -->
- <!--
<copy todir="@{targetdir}/META-INF" flatten="true" overwrite="true">
<fileset dir="@{artifactsdir}/resources/jbossws-@{jbossid}">
<include name="**/jbossws-deployer-jboss-beans.xml"/>
</fileset>
</copy>
- -->
<!-- END -->
</sequential>
</macrodef>
@@ -567,21 +557,17 @@
<include name="**/jbossws-framework.jar"/>
<!-- JBWS-2505 -->
<!-- START -->
- <!--
<include name="**/jbossws-(a){jbossid}.jar"/>
- -->
<!-- END -->
</fileset>
</copy>
<!-- JBWS-2505 -->
<!-- START -->
- <!--
<copy todir="@{targetdir}/META-INF" flatten="true" overwrite="true">
<fileset dir="@{artifactsdir}/resources/jbossws-@{jbossid}">
<include name="**/jbossws-deployer-jboss-beans.xml"/>
</fileset>
</copy>
- -->
<!-- END -->
</sequential>
</macrodef>
@@ -609,21 +595,17 @@
<include name="**/jbossws-framework.jar"/>
<!-- JBWS-2505 -->
<!-- START -->
- <!--
<include name="**/jbossws-(a){jbossid}.jar"/>
- -->
<!-- END -->
</fileset>
</copy>
<!-- JBWS-2505 -->
<!-- START -->
- <!--
<copy todir="@{targetdir}/META-INF" flatten="true" overwrite="true">
<fileset dir="@{artifactsdir}/resources/jbossws-@{jbossid}">
<include name="**/jbossws-deployer-jboss-beans.xml"/>
</fileset>
</copy>
- -->
<!-- END -->
</sequential>
</macrodef>
@@ -783,7 +765,6 @@
<!-- JBWS-2505 -->
<!-- START -->
<!-- delete stale container integration jars -->
- <!--
<delete>
<fileset dir="${jboss.server.home}">
<include name="**/jbossws-jboss*.jar"/>
@@ -792,7 +773,6 @@
<include name="jbossws-jboss*.jar"/>
</fileset>
</delete>
- -->
<!-- END -->
<!-- delete content of last deployment -->
@@ -824,7 +804,6 @@
<!-- JBWS-2505 -->
<!-- START -->
<!-- delete stale container integration jars -->
- <!--
<delete>
<fileset dir="${jboss.server.home}">
<include name="**/jbossws-jboss*.jar"/>
@@ -833,7 +812,6 @@
<include name="jbossws-jboss*.jar"/>
</fileset>
</delete>
- -->
<!-- END -->
<!-- delete content of last deployment -->
@@ -865,7 +843,6 @@
<!-- JBWS-2505 -->
<!-- START -->
<!-- delete stale container integration jars -->
- <!--
<delete>
<fileset dir="${jboss.server.home}">
<include name="**/jbossws-jboss*.jar"/>
@@ -874,7 +851,6 @@
<include name="jbossws-jboss*.jar"/>
</fileset>
</delete>
- -->
<!-- END -->
<!-- delete content of last deployment -->
Modified: stack/metro/trunk/modules/server/pom.xml
===================================================================
--- stack/metro/trunk/modules/server/pom.xml 2009-02-13 21:18:35 UTC (rev 9301)
+++ stack/metro/trunk/modules/server/pom.xml 2009-02-13 21:24:17 UTC (rev 9302)
@@ -192,7 +192,6 @@
</artifactItem>
<!-- JBWS-2505 -->
<!-- START -->
- <!--
<artifactItem>
<groupId>org.jboss.ws</groupId>
<artifactId>jbossws-jboss501x</artifactId>
@@ -217,7 +216,6 @@
<type>zip</type>
<outputDirectory>${project.build.directory}/resources/jbossws-jboss600</outputDirectory>
</artifactItem>
- -->
<!-- END -->
</artifactItems>
</configuration>
Modified: stack/metro/trunk/modules/testsuite/pom.xml
===================================================================
--- stack/metro/trunk/modules/testsuite/pom.xml 2009-02-13 21:18:35 UTC (rev 9301)
+++ stack/metro/trunk/modules/testsuite/pom.xml 2009-02-13 21:24:17 UTC (rev 9302)
@@ -495,11 +495,11 @@
<dependencies>
<!-- JBWS-2505 -->
<!-- START -->
- <!--dependency>
+ <dependency>
<groupId>org.jboss.ws</groupId>
<artifactId>jbossws-jboss501x</artifactId>
- </dependency-->
- <dependency>
+ </dependency>
+ <!--dependency>
<groupId>org.jboss.jbossas</groupId>
<artifactId>jboss-as-webservices</artifactId>
<version>${jboss.version}</version>
@@ -509,7 +509,7 @@
<artifactId>jbosssx</artifactId>
</exclusion>
</exclusions>
- </dependency>
+ </dependency-->
<!-- END -->
<dependency>
<groupId>org.hibernate</groupId>
@@ -570,11 +570,11 @@
<dependencies>
<!-- JBWS-2505 -->
<!-- START -->
- <!--dependency>
+ <dependency>
<groupId>org.jboss.ws</groupId>
<artifactId>jbossws-jboss510x</artifactId>
- </dependency-->
- <dependency>
+ </dependency>
+ <!--dependency>
<groupId>org.jboss.jbossas</groupId>
<artifactId>jboss-as-webservices</artifactId>
<version>${jboss.version}</version>
@@ -584,7 +584,7 @@
<artifactId>jbosssx</artifactId>
</exclusion>
</exclusions>
- </dependency>
+ </dependency-->
<!-- END -->
<dependency>
<groupId>org.hibernate</groupId>
@@ -645,11 +645,11 @@
<dependencies>
<!-- JBWS-2505 -->
<!-- START -->
- <!--dependency>
+ <dependency>
<groupId>org.jboss.ws</groupId>
<artifactId>jbossws-jboss600x</artifactId>
- </dependency-->
- <dependency>
+ </dependency>
+ <!--dependency>
<groupId>org.jboss.jbossas</groupId>
<artifactId>jboss-as-webservices</artifactId>
<version>${jboss.version}</version>
@@ -659,7 +659,7 @@
<artifactId>jbosssx</artifactId>
</exclusion>
</exclusions>
- </dependency>
+ </dependency-->
<!-- END -->
<dependency>
<groupId>org.hibernate</groupId>
Modified: stack/metro/trunk/pom.xml
===================================================================
--- stack/metro/trunk/pom.xml 2009-02-13 21:18:35 UTC (rev 9301)
+++ stack/metro/trunk/pom.xml 2009-02-13 21:24:17 UTC (rev 9302)
@@ -54,11 +54,9 @@
<jbossws.jboss500.version>3.1.0-SNAPSHOT</jbossws.jboss500.version>
<!-- JBWS-2505 -->
<!-- START -->
- <!--
<jbossws.jboss501.version>3.1.0-SNAPSHOT</jbossws.jboss501.version>
<jbossws.jboss510.version>3.1.0-SNAPSHOT</jbossws.jboss510.version>
<jbossws.jboss600.version>3.1.0-SNAPSHOT</jbossws.jboss600.version>
- -->
<!-- END -->
<jboss.common.version>1.2.1.GA</jboss.common.version>
<commons.logging.version>1.1.1</commons.logging.version>
@@ -155,7 +153,6 @@
</dependency>
<!-- JBWS-2505 -->
<!-- START -->
- <!--
<dependency>
<groupId>org.jboss.ws</groupId>
<artifactId>jbossws-jboss501x</artifactId>
@@ -192,7 +189,6 @@
<classifier>resources</classifier>
<type>zip</type>
</dependency>
- -->
<!-- END -->
<!-- provided apis -->
Modified: stack/metro/trunk/src/main/scripts/assembly-deploy-artifacts.xml
===================================================================
--- stack/metro/trunk/src/main/scripts/assembly-deploy-artifacts.xml 2009-02-13 21:18:35 UTC (rev 9301)
+++ stack/metro/trunk/src/main/scripts/assembly-deploy-artifacts.xml 2009-02-13 21:24:17 UTC (rev 9302)
@@ -99,7 +99,6 @@
</dependencySet>
<!-- JBWS-2505 -->
<!-- START -->
- <!--
<dependencySet>
<outputDirectory>lib</outputDirectory>
<outputFileNameMapping>jbossws-jboss501.${module.extension}</outputFileNameMapping>
@@ -130,7 +129,6 @@
<include>org.jboss.ws:jbossws-jboss600x:jar</include>
</includes>
</dependencySet>
- -->
<!-- END -->
</dependencySets>
</binaries>
15 years, 10 months
JBossWS SVN: r9301 - in stack/cxf/trunk: src/main/scripts and 1 other directory.
by jbossws-commits＠lists.jboss.org
Author: richard.opalka(a)jboss.com
Date: 2009-02-13 16:18:35 -0500 (Fri, 13 Feb 2009)
New Revision: 9301
Modified:
stack/cxf/trunk/pom.xml
stack/cxf/trunk/src/main/scripts/assembly-deploy-artifacts.xml
Log:
[JBWS-2505] rollback
Modified: stack/cxf/trunk/pom.xml
===================================================================
--- stack/cxf/trunk/pom.xml 2009-02-13 21:17:48 UTC (rev 9300)
+++ stack/cxf/trunk/pom.xml 2009-02-13 21:18:35 UTC (rev 9301)
@@ -53,11 +53,9 @@
<jbossws.jboss500.version>3.1.0-SNAPSHOT</jbossws.jboss500.version>
<!-- JBWS-2505 -->
<!-- START -->
- <!--
<jbossws.jboss510.version>3.1.0-SNAPSHOT</jbossws.jboss510.version>
<jbossws.jboss510.version>3.1.0-SNAPSHOT</jbossws.jboss510.version>
<jbossws.jboss600.version>3.1.0-SNAPSHOT</jbossws.jboss600.version>
- -->
<!-- END -->
<cxf.version>2.1.4</cxf.version>
<cxf.stax.version>1.0.1</cxf.stax.version>
@@ -156,7 +154,6 @@
</dependency>
<!-- JBWS-2505 -->
<!-- START -->
- <!--
<dependency>
<groupId>org.jboss.ws</groupId>
<artifactId>jbossws-jboss501x</artifactId>
@@ -193,7 +190,6 @@
<classifier>resources</classifier>
<type>zip</type>
</dependency>
- -->
<!-- END -->
<!-- provided apis -->
Modified: stack/cxf/trunk/src/main/scripts/assembly-deploy-artifacts.xml
===================================================================
--- stack/cxf/trunk/src/main/scripts/assembly-deploy-artifacts.xml 2009-02-13 21:17:48 UTC (rev 9300)
+++ stack/cxf/trunk/src/main/scripts/assembly-deploy-artifacts.xml 2009-02-13 21:18:35 UTC (rev 9301)
@@ -111,7 +111,6 @@
</dependencySet>
<!-- [JBWS-2505] -->
<!-- START -->
- <!--
<dependencySet>
<outputDirectory>lib</outputDirectory>
<outputFileNameMapping>jbossws-jboss501.${module.extension}</outputFileNameMapping>
@@ -142,7 +141,6 @@
<include>org.jboss.ws:jbossws-jboss600x:jar</include>
</includes>
</dependencySet>
- -->
<!-- END -->
</dependencySets>
</binaries>
15 years, 10 months
JBossWS SVN: r9300 - in stack/cxf/trunk/modules: resources/src/main/resources/resources and 2 other directories.
by jbossws-commits＠lists.jboss.org
Author: richard.opalka(a)jboss.com
Date: 2009-02-13 16:17:48 -0500 (Fri, 13 Feb 2009)
New Revision: 9300
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
Log:
[JBWS-2505] rollback
Modified: stack/cxf/trunk/modules/management/pom.xml
===================================================================
--- stack/cxf/trunk/modules/management/pom.xml 2009-02-13 21:11:39 UTC (rev 9299)
+++ stack/cxf/trunk/modules/management/pom.xml 2009-02-13 21:17:48 UTC (rev 9300)
@@ -52,7 +52,6 @@
</dependency>
<!-- [JBWS-2505] -->
<!-- START -->
- <!--
<dependency>
<groupId>org.jboss.ws</groupId>
<artifactId>jbossws-jboss501x</artifactId>
@@ -68,7 +67,6 @@
<artifactId>jbossws-jboss600x</artifactId>
<scope>runtime</scope>
</dependency>
- -->
<!-- END -->
<dependency>
<groupId>org.jboss.jaxr</groupId>
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 2009-02-13 21:11:39 UTC (rev 9299)
+++ stack/cxf/trunk/modules/resources/src/main/resources/resources/jbossws-deploy-macros.xml 2009-02-13 21:17:48 UTC (rev 9300)
@@ -248,9 +248,7 @@
<patternset refid="jbossws.client.patternset"/>
<!-- [JBWS-2505] -->
<!-- START -->
- <!--
<include name="**/jbossws-(a){jbossid}.jar"/>
- -->
<!-- END -->
</fileset>
</copy>
@@ -268,9 +266,7 @@
<patternset refid="jbossws.client.patternset"/>
<!-- [JBWS-2505] -->
<!-- START -->
- <!--
<include name="**/jbossws-(a){jbossid}.jar"/>
- -->
<!-- END -->
</fileset>
</copy>
@@ -288,9 +284,7 @@
<patternset refid="jbossws.client.patternset"/>
<!-- [JBWS-2505] -->
<!-- START -->
- <!--
<include name="**/jbossws-(a){jbossid}.jar"/>
- -->
<!-- END -->
</fileset>
</copy>
@@ -524,21 +518,17 @@
<include name="**/jbossws-framework.jar"/>
<!-- [JBWS-2505] -->
<!-- START -->
- <!--
<include name="**/jbossws-(a){jbossid}.jar"/>
- -->
<!-- END -->
</fileset>
</copy>
<!-- [JBWS-2505] -->
<!-- START -->
- <!--
<copy todir="@{targetdir}/META-INF" flatten="true" overwrite="true">
<fileset dir="@{artifactsdir}/resources/jbossws-@{jbossid}">
<include name="**/jbossws-deployer-jboss-beans.xml"/>
</fileset>
</copy>
- -->
<!-- END -->
</sequential>
</macrodef>
@@ -566,21 +556,17 @@
<include name="**/jbossws-framework.jar"/>
<!-- [JBWS-2505] -->
<!-- START -->
- <!--
<include name="**/jbossws-(a){jbossid}.jar"/>
- -->
<!-- END -->
</fileset>
</copy>
<!-- [JBWS-2505] -->
<!-- START -->
- <!--
<copy todir="@{targetdir}/META-INF" flatten="true" overwrite="true">
<fileset dir="@{artifactsdir}/resources/jbossws-@{jbossid}">
<include name="**/jbossws-deployer-jboss-beans.xml"/>
</fileset>
</copy>
- -->
<!-- END -->
</sequential>
</macrodef>
@@ -608,21 +594,17 @@
<include name="**/jbossws-framework.jar"/>
<!-- [JBWS-2505] -->
<!-- START -->
- <!--
<include name="**/jbossws-(a){jbossid}.jar"/>
- -->
<!-- END -->
</fileset>
</copy>
<!-- [JBWS-2505] -->
<!-- START -->
- <!--
<copy todir="@{targetdir}/META-INF" flatten="true" overwrite="true">
<fileset dir="@{artifactsdir}/resources/jbossws-@{jbossid}">
<include name="**/jbossws-deployer-jboss-beans.xml"/>
</fileset>
</copy>
- -->
<!-- END -->
</sequential>
</macrodef>
@@ -781,7 +763,6 @@
<!-- [JBWS-2505] -->
<!-- START -->
<!-- delete stale container integration jars -->
- <!--
<delete>
<fileset dir="${jboss.server.home}">
<include name="**/jbossws-jboss*.jar"/>
@@ -790,7 +771,6 @@
<include name="jbossws-jboss*.jar"/>
</fileset>
</delete>
- -->
<!-- END -->
<!-- delete content of last deployment -->
@@ -822,7 +802,6 @@
<!-- [JBWS-2505] -->
<!-- START -->
<!-- delete stale container integration jars -->
- <!--
<delete>
<fileset dir="${jboss.server.home}">
<include name="**/jbossws-jboss*.jar"/>
@@ -831,7 +810,6 @@
<include name="jbossws-jboss*.jar"/>
</fileset>
</delete>
- -->
<!-- END -->
<!-- delete content of last deployment -->
@@ -863,7 +841,6 @@
<!-- [JBWS-2505] -->
<!-- START -->
<!-- delete stale container integration jars -->
- <!--
<delete>
<fileset dir="${jboss.server.home}">
<include name="**/jbossws-jboss*.jar"/>
@@ -872,7 +849,6 @@
<include name="jbossws-jboss*.jar"/>
</fileset>
</delete>
- -->
<!-- END -->
<!-- delete content of last deployment -->
Modified: stack/cxf/trunk/modules/server/pom.xml
===================================================================
--- stack/cxf/trunk/modules/server/pom.xml 2009-02-13 21:11:39 UTC (rev 9299)
+++ stack/cxf/trunk/modules/server/pom.xml 2009-02-13 21:17:48 UTC (rev 9300)
@@ -243,7 +243,6 @@
</artifactItem>
<!-- JBWS-2505 -->
<!-- START -->
- <!--
<artifactItem>
<groupId>org.jboss.ws</groupId>
<artifactId>jbossws-jboss501x</artifactId>
@@ -268,7 +267,6 @@
<type>zip</type>
<outputDirectory>${project.build.directory}/resources/jbossws-jboss600</outputDirectory>
</artifactItem>
- -->
<!-- END -->
</artifactItems>
</configuration>
Modified: stack/cxf/trunk/modules/testsuite/pom.xml
===================================================================
--- stack/cxf/trunk/modules/testsuite/pom.xml 2009-02-13 21:11:39 UTC (rev 9299)
+++ stack/cxf/trunk/modules/testsuite/pom.xml 2009-02-13 21:17:48 UTC (rev 9300)
@@ -464,11 +464,11 @@
<dependencies>
<!-- [JBWS-2505] -->
<!-- START -->
- <!--dependency>
+ <dependency>
<groupId>org.jboss.ws</groupId>
<artifactId>jbossws-jboss501x</artifactId>
- </dependency-->
- <dependency>
+ </dependency>
+ <!--dependency>
<groupId>org.jboss.jbossas</groupId>
<artifactId>jboss-as-webservices</artifactId>
<version>${jboss.version}</version>
@@ -478,7 +478,7 @@
<artifactId>jbosssx</artifactId>
</exclusion>
</exclusions>
- </dependency>
+ </dependency-->
<!-- END -->
<dependency>
<groupId>org.jboss.jbossas</groupId>
@@ -534,11 +534,11 @@
<dependencies>
<!-- [JBWS-2505] -->
<!-- START -->
- <!--dependency>
+ <dependency>
<groupId>org.jboss.ws</groupId>
<artifactId>jbossws-jboss510x</artifactId>
- </dependency-->
- <dependency>
+ </dependency>
+ <!--dependency>
<groupId>org.jboss.jbossas</groupId>
<artifactId>jboss-as-webservices</artifactId>
<version>${jboss.version}</version>
@@ -548,7 +548,7 @@
<artifactId>jbosssx</artifactId>
</exclusion>
</exclusions>
- </dependency>
+ </dependency-->
<!-- END -->
<dependency>
<groupId>org.jboss.jbossas</groupId>
@@ -604,11 +604,11 @@
<dependencies>
<!-- [JBWS-2505] -->
<!-- START -->
- <!--dependency>
+ <dependency>
<groupId>org.jboss.ws</groupId>
<artifactId>jbossws-jboss600x</artifactId>
- </dependency-->
- <dependency>
+ </dependency>
+ <!--dependency>
<groupId>org.jboss.jbossas</groupId>
<artifactId>jboss-as-webservices</artifactId>
<version>${jboss.version}</version>
@@ -618,7 +618,7 @@
<artifactId>jbosssx</artifactId>
</exclusion>
</exclusions>
- </dependency>
+ </dependency-->
<!-- END -->
<dependency>
<groupId>org.jboss.jbossas</groupId>
15 years, 10 months
JBossWS SVN: r9299 - in stack/native/trunk: modules/core and 4 other directories.
by jbossws-commits＠lists.jboss.org
Author: richard.opalka(a)jboss.com
Date: 2009-02-13 16:11:39 -0500 (Fri, 13 Feb 2009)
New Revision: 9299
Added:
stack/native/trunk/modules/testsuite/test-excludes-jboss501.txt
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/scripts/assembly-deploy-artifacts.xml
Log:
[JBWS-2505] rollback
Modified: stack/native/trunk/modules/core/pom.xml
===================================================================
--- stack/native/trunk/modules/core/pom.xml 2009-02-13 20:19:52 UTC (rev 9298)
+++ stack/native/trunk/modules/core/pom.xml 2009-02-13 21:11:39 UTC (rev 9299)
@@ -225,7 +225,6 @@
</artifactItem>
<!-- [JBWS-2505] -->
<!-- START -->
- <!--
<artifactItem>
<groupId>org.jboss.ws</groupId>
<artifactId>jbossws-jboss501x</artifactId>
@@ -250,7 +249,6 @@
<type>zip</type>
<outputDirectory>${project.build.directory}/resources/jbossws-jboss600</outputDirectory>
</artifactItem>
- -->
<!-- END -->
</artifactItems>
</configuration>
Modified: stack/native/trunk/modules/management/pom.xml
===================================================================
--- stack/native/trunk/modules/management/pom.xml 2009-02-13 20:19:52 UTC (rev 9298)
+++ stack/native/trunk/modules/management/pom.xml 2009-02-13 21:11:39 UTC (rev 9299)
@@ -52,7 +52,6 @@
</dependency>
<!-- [JBWS-2505] -->
<!-- START -->
- <!--
<dependency>
<groupId>org.jboss.ws</groupId>
<artifactId>jbossws-jboss501x</artifactId>
@@ -68,7 +67,6 @@
<artifactId>jbossws-jboss600x</artifactId>
<scope>runtime</scope>
</dependency>
- -->
<!-- END -->
<dependency>
<groupId>org.jboss.jaxr</groupId>
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 2009-02-13 20:19:52 UTC (rev 9298)
+++ stack/native/trunk/modules/resources/src/main/resources/resources/jbossws-deploy-macros.xml 2009-02-13 21:11:39 UTC (rev 9299)
@@ -225,9 +225,7 @@
<patternset refid="jbossws.client.patternset"/>
<!-- JBWS-2505 -->
<!-- START -->
- <!--
<include name="**/jbossws-(a){jbossid}.jar"/>
- -->
<!-- END -->
</fileset>
</copy>
@@ -245,9 +243,7 @@
<patternset refid="jbossws.client.patternset"/>
<!-- JBWS-2505 -->
<!-- START -->
- <!--
<include name="**/jbossws-(a){jbossid}.jar"/>
- -->
<!-- END -->
</fileset>
</copy>
@@ -265,9 +261,7 @@
<patternset refid="jbossws.client.patternset"/>
<!-- JBWS-2505 -->
<!-- START -->
- <!--
<include name="**/jbossws-(a){jbossid}.jar"/>
- -->
<!-- END -->
</fileset>
</copy>
@@ -511,21 +505,17 @@
<include name="**/jbossws-framework.jar"/>
<!-- [JBWS-2505] -->
<!-- START -->
- <!--
<include name="**/jbossws-(a){jbossid}.jar"/>
- -->
<!-- END -->
</fileset>
</copy>
<!-- [JBWS-2505] -->
<!-- START -->
- <!--
<copy todir="@{targetdir}/META-INF" flatten="true" overwrite="true">
<fileset dir="@{artifactsdir}/resources/jbossws-@{jbossid}">
<include name="**/jbossws-deployer-jboss-beans.xml"/>
</fileset>
</copy>
- -->
<!-- END -->
</sequential>
</macrodef>
@@ -558,21 +548,17 @@
<include name="**/jbossws-framework.jar"/>
<!-- [JBWS-2505] -->
<!-- START -->
- <!--
<include name="**/jbossws-(a){jbossid}.jar"/>
- -->
<!-- END -->
</fileset>
</copy>
<!-- [JBWS-2505] -->
<!-- START -->
- <!--
<copy todir="@{targetdir}/META-INF" flatten="true" overwrite="true">
<fileset dir="@{artifactsdir}/resources/jbossws-@{jbossid}">
<include name="**/jbossws-deployer-jboss-beans.xml"/>
</fileset>
</copy>
- -->
<!-- END -->
</sequential>
</macrodef>
@@ -605,21 +591,17 @@
<include name="**/jbossws-framework.jar"/>
<!-- [JBWS-2505] -->
<!-- START -->
- <!--
<include name="**/jbossws-(a){jbossid}.jar"/>
- -->
<!-- END -->
</fileset>
</copy>
<!-- [JBWS-2505] -->
<!-- START -->
- <!--
<copy todir="@{targetdir}/META-INF" flatten="true" overwrite="true">
<fileset dir="@{artifactsdir}/resources/jbossws-@{jbossid}">
<include name="**/jbossws-deployer-jboss-beans.xml"/>
</fileset>
</copy>
- -->
<!-- END -->
</sequential>
</macrodef>
@@ -784,7 +766,6 @@
<!-- [JBWS-2505] -->
<!-- START -->
<!-- delete stale container integration jars -->
- <!--
<delete>
<fileset dir="${jboss.server.home}">
<include name="**/jbossws-jboss*.jar"/>
@@ -793,7 +774,6 @@
<include name="jbossws-jboss*.jar"/>
</fileset>
</delete>
- -->
<!-- END -->
<!-- delete content of last deployment -->
@@ -825,7 +805,6 @@
<!-- [JBWS-2505] -->
<!-- START -->
<!-- delete stale container integration jars -->
- <!--
<delete>
<fileset dir="${jboss.server.home}">
<include name="**/jbossws-jboss*.jar"/>
@@ -834,7 +813,6 @@
<include name="jbossws-jboss*.jar"/>
</fileset>
</delete>
- -->
<!-- END -->
<!-- delete content of last deployment -->
@@ -866,7 +844,6 @@
<!-- [JBWS-2505] -->
<!-- START -->
<!-- delete stale container integration jars -->
- <!--
<delete>
<fileset dir="${jboss.server.home}">
<include name="**/jbossws-jboss*.jar"/>
@@ -875,7 +852,6 @@
<include name="jbossws-jboss*.jar"/>
</fileset>
</delete>
- -->
<!-- END -->
<!-- delete content of last deployment -->
Modified: stack/native/trunk/modules/testsuite/pom.xml
===================================================================
--- stack/native/trunk/modules/testsuite/pom.xml 2009-02-13 20:19:52 UTC (rev 9298)
+++ stack/native/trunk/modules/testsuite/pom.xml 2009-02-13 21:11:39 UTC (rev 9299)
@@ -480,22 +480,22 @@
<dependencies>
<!-- [JBWS-2505] -->
<!-- START -->
- <!--dependency>
+ <dependency>
<groupId>org.jboss.ws</groupId>
<artifactId>jbossws-jboss501x</artifactId>
<exclusions>
- <exclusion> Exclude old jaxws impl transitive dependency brought in by jboss-metadata
+ <exclusion> <!-- Exclude old jaxws impl transitive dependency brought in by jboss-metadata -->
<groupId>jboss.jbossws</groupId>
<artifactId>jboss-jaxws</artifactId>
</exclusion>
</exclusions>
- </dependency-->
- <dependency>
+ </dependency>
+ <!--dependency>
<groupId>org.jboss.jbossas</groupId>
<artifactId>jboss-as-webservices</artifactId>
<version>${jboss.version}</version>
<exclusions>
- <exclusion> <!-- Exclude old jaxws impl transitive dependency brought in by jboss-metadata -->
+ <exclusion> Exclude old jaxws impl transitive dependency brought in by jboss-metadata
<groupId>jboss.jbossws</groupId>
<artifactId>jboss-jaxws</artifactId>
</exclusion>
@@ -504,7 +504,7 @@
<artifactId>jbosssx</artifactId>
</exclusion>
</exclusions>
- </dependency>
+ </dependency-->
<!-- END -->
<dependency>
<groupId>org.hibernate</groupId>
@@ -570,22 +570,22 @@
<dependencies>
<!-- [JBWS-2505] -->
<!-- START -->
- <!--dependency>
+ <dependency>
<groupId>org.jboss.ws</groupId>
<artifactId>jbossws-jboss510x</artifactId>
<exclusions>
- <exclusion> Exclude old jaxws impl transitive dependency brought in by jboss-metadata
+ <exclusion> <!-- Exclude old jaxws impl transitive dependency brought in by jboss-metadata -->
<groupId>jboss.jbossws</groupId>
<artifactId>jboss-jaxws</artifactId>
</exclusion>
</exclusions>
- </dependency-->
- <dependency>
+ </dependency>
+ <!--dependency>
<groupId>org.jboss.jbossas</groupId>
<artifactId>jboss-as-webservices</artifactId>
<version>${jboss.version}</version>
<exclusions>
- <exclusion> <!-- Exclude old jaxws impl transitive dependency brought in by jboss-metadata -->
+ <exclusion> Exclude old jaxws impl transitive dependency brought in by jboss-metadata
<groupId>jboss.jbossws</groupId>
<artifactId>jboss-jaxws</artifactId>
</exclusion>
@@ -594,7 +594,7 @@
<artifactId>jbosssx</artifactId>
</exclusion>
</exclusions>
- </dependency>
+ </dependency-->
<!-- END -->
<dependency>
<groupId>org.hibernate</groupId>
@@ -660,22 +660,22 @@
<dependencies>
<!-- [JBWS-2505] -->
<!-- START -->
- <!--dependency>
+ <dependency>
<groupId>org.jboss.ws</groupId>
<artifactId>jbossws-jboss600x</artifactId>
<exclusions>
- <exclusion> Exclude old jaxws impl transitive dependency brought in by jboss-metadata
+ <exclusion> <!-- Exclude old jaxws impl transitive dependency brought in by jboss-metadata -->
<groupId>jboss.jbossws</groupId>
<artifactId>jboss-jaxws</artifactId>
</exclusion>
</exclusions>
- </dependency-->
- <dependency>
+ </dependency>
+ <!--dependency>
<groupId>org.jboss.jbossas</groupId>
<artifactId>jboss-as-webservices</artifactId>
<version>${jboss.version}</version>
<exclusions>
- <exclusion> <!-- Exclude old jaxws impl transitive dependency brought in by jboss-metadata -->
+ <exclusion> Exclude old jaxws impl transitive dependency brought in by jboss-metadata
<groupId>jboss.jbossws</groupId>
<artifactId>jboss-jaxws</artifactId>
</exclusion>
@@ -684,7 +684,7 @@
<artifactId>jbosssx</artifactId>
</exclusion>
</exclusions>
- </dependency>
+ </dependency-->
<!-- END -->
<dependency>
<groupId>org.hibernate</groupId>
Added: stack/native/trunk/modules/testsuite/test-excludes-jboss501.txt
===================================================================
--- stack/native/trunk/modules/testsuite/test-excludes-jboss501.txt (rev 0)
+++ stack/native/trunk/modules/testsuite/test-excludes-jboss501.txt 2009-02-13 21:11:39 UTC (rev 9299)
@@ -0,0 +1,14 @@
+# Exclude endpoints with AS42 @SecurityDomain
+org/jboss/test/ws/jaxws/samples/securityDomain/SecureEndpointImpl.*
+org/jboss/test/ws/jaxws/samples/news/SecureNewspaperSWAEndpoint.*
+org/jboss/test/ws/jaxws/samples/news/SecureNewspaperMTOMEndpoint.*
+
+# UsernameTokenHTTPSTestCase requires keystore & trustore in jboss-web tomcat configuration
+org/jboss/test/ws/interop/nov2007/wsse/UsernameTokenHTTPSTestCase.*
+
+# [EJBTHREE-1152] service-ref in ejb-jar.xml is ignored
+org/jboss/test/ws/jaxws/samples/serviceref/ServiceRefEJBTestCase.*
+
+# [JBWS-2217] Fix BPEL jaxrpc samples
+org/jboss/test/ws/jaxrpc/samples/wsbpel/hello/*TestCase.*
+
Property changes on: stack/native/trunk/modules/testsuite/test-excludes-jboss501.txt
___________________________________________________________________
Name: svn:executable
+ *
Modified: stack/native/trunk/pom.xml
===================================================================
--- stack/native/trunk/pom.xml 2009-02-13 20:19:52 UTC (rev 9298)
+++ stack/native/trunk/pom.xml 2009-02-13 21:11:39 UTC (rev 9299)
@@ -57,11 +57,9 @@
<jbossws.jboss500.version>3.1.0-SNAPSHOT</jbossws.jboss500.version>
<!-- [JBWS-2505] -->
<!-- START -->
- <!--
<jbossws.jboss501.version>3.1.0-SNAPSHOT</jbossws.jboss501.version>
<jbossws.jboss510.version>3.1.0-SNAPSHOT</jbossws.jboss510.version>
<jbossws.jboss600.version>3.1.0-SNAPSHOT</jbossws.jboss600.version>
- -->
<!-- END -->
<codehaus.jettison.version>1.0-RC2</codehaus.jettison.version>
<commons.logging.version>1.1.1</commons.logging.version>
@@ -161,7 +159,6 @@
</dependency>
<!-- [JBWS-2505] -->
<!-- START -->
- <!--
<dependency>
<groupId>org.jboss.ws</groupId>
<artifactId>jbossws-jboss501x</artifactId>
@@ -198,7 +195,6 @@
<classifier>resources</classifier>
<type>zip</type>
</dependency>
- -->
<!-- END -->
<!-- provided apis -->
<dependency>
Modified: stack/native/trunk/src/main/scripts/assembly-deploy-artifacts.xml
===================================================================
--- stack/native/trunk/src/main/scripts/assembly-deploy-artifacts.xml 2009-02-13 20:19:52 UTC (rev 9298)
+++ stack/native/trunk/src/main/scripts/assembly-deploy-artifacts.xml 2009-02-13 21:11:39 UTC (rev 9299)
@@ -102,7 +102,6 @@
</dependencySet>
<!-- [JBWS-2505] -->
<!-- START -->
- <!--
<dependencySet>
<outputDirectory>lib</outputDirectory>
<outputFileNameMapping>jbossws-jboss501.${module.extension}</outputFileNameMapping>
@@ -133,7 +132,6 @@
<include>org.jboss.ws:jbossws-jboss600x:jar</include>
</includes>
</dependencySet>
- -->
<!-- END -->
</dependencySets>
</binaries>
15 years, 10 months