11:45 a.m.
Author: asoldano
Date: 2014-08-28 05:45:49 -0400 (Thu, 28 Aug 2014)
New Revision: 18879
Modified:
stack/cxf/branches/jbossws-cxf-4.3.x/modules/dist/pom.xml
stack/cxf/branches/jbossws-cxf-4.3.x/modules/dist/src/main/distro/build-deploy.xml
stack/cxf/branches/jbossws-cxf-4.3.x/modules/dist/src/main/distro/build.xml
stack/cxf/branches/jbossws-cxf-4.3.x/modules/dist/src/main/scripts/assembly-deploy-artifacts.xml
stack/cxf/branches/jbossws-cxf-4.3.x/modules/testsuite/pom.xml
stack/cxf/branches/jbossws-cxf-4.3.x/pom.xml
Log:
Fixed 810 ASIL
Modified: stack/cxf/branches/jbossws-cxf-4.3.x/modules/dist/pom.xml
===================================================================
--- stack/cxf/branches/jbossws-cxf-4.3.x/modules/dist/pom.xml 2014-08-28 09:28:31 UTC (rev
18878)
+++ stack/cxf/branches/jbossws-cxf-4.3.x/modules/dist/pom.xml 2014-08-28 09:45:49 UTC (rev
18879)
@@ -140,6 +140,11 @@
<scope>provided</scope>
</dependency>
<dependency>
+ <groupId>org.jboss.ws</groupId>
+ <artifactId>jbossws-wildfly810-server-integration</artifactId>
+ <scope>provided</scope>
+ </dependency>
+ <dependency>
<groupId>org.jboss</groupId>
<artifactId>jandex</artifactId>
</dependency>
@@ -244,8 +249,8 @@
<scope>provided</scope>
</dependency>
<dependency>
- <groupId>org.wildfly</groupId>
- <artifactId>wildfly-webservices-tests-integration</artifactId>
+ <groupId>org.jboss.ws</groupId>
+ <artifactId>jbossws-wildfly810-tests-integration</artifactId>
<scope>provided</scope>
</dependency>
</dependencies>
Modified:
stack/cxf/branches/jbossws-cxf-4.3.x/modules/dist/src/main/distro/build-deploy.xml
===================================================================
---
stack/cxf/branches/jbossws-cxf-4.3.x/modules/dist/src/main/distro/build-deploy.xml 2014-08-28
09:28:31 UTC (rev 18878)
+++
stack/cxf/branches/jbossws-cxf-4.3.x/modules/dist/src/main/distro/build-deploy.xml 2014-08-28
09:45:49 UTC (rev 18879)
@@ -177,7 +177,7 @@
<target name="undeploy-wildfly810"
depends="target-wildfly810,init" description="Remove jbossws from
wildfly810">
<fail message="Not available: ${wildfly810.available.file}"
unless="wildfly810.available"/>
- <macro-undeploy-jbossws-modules
targetdir="${wildfly810.home}/modules/system/layers/base"
defaultmodulesconf="${jbossws.default.modules.conf}"
modifyjbossintegration="false"/>
+ <macro-undeploy-jbossws-modules
targetdir="${wildfly810.home}/modules/system/layers/base"
defaultmodulesconf="${jbossws.default.modules.conf}"
modifyjbossintegration="true"/>
</target>
<!-- ================================================================== -->
Modified: stack/cxf/branches/jbossws-cxf-4.3.x/modules/dist/src/main/distro/build.xml
===================================================================
--- stack/cxf/branches/jbossws-cxf-4.3.x/modules/dist/src/main/distro/build.xml 2014-08-28
09:28:31 UTC (rev 18878)
+++ stack/cxf/branches/jbossws-cxf-4.3.x/modules/dist/src/main/distro/build.xml 2014-08-28
09:45:49 UTC (rev 18879)
@@ -73,11 +73,11 @@
<property name="deploy.structure"
value="${output.dir}/deploy-${jbossws.integration.target}"/>
<property name="excludesfile"
value="${tests.dir}/resources/test-excludes-${jbossws.integration.target}.txt"/>
- <condition property="remote.port" value="8080"
else="4447">
- <isset property="jbossws.integration.wildfly80x"/>
+ <condition property="remote.port" value="4447"
else="8080">
+ <isset property="jbossws.integration.jboss72x"/>
</condition>
- <condition property="remote.protocol" value="http-remoting"
else="remote">
- <isset property="jbossws.integration.wildfly80x"/>
+ <condition property="remote.protocol" value="remote"
else="http-remoting">
+ <isset property="jbossws.integration.jboss72x"/>
</condition>
</target>
Modified:
stack/cxf/branches/jbossws-cxf-4.3.x/modules/dist/src/main/scripts/assembly-deploy-artifacts.xml
===================================================================
---
stack/cxf/branches/jbossws-cxf-4.3.x/modules/dist/src/main/scripts/assembly-deploy-artifacts.xml 2014-08-28
09:28:31 UTC (rev 18878)
+++
stack/cxf/branches/jbossws-cxf-4.3.x/modules/dist/src/main/scripts/assembly-deploy-artifacts.xml 2014-08-28
09:45:49 UTC (rev 18879)
@@ -106,7 +106,7 @@
</dependencySet>
- <dependencySet>
+<!-- <dependencySet>
<outputDirectory>deploy-artifacts/lib</outputDirectory>
<unpack>false</unpack>
<includes>
@@ -115,7 +115,7 @@
<outputFileNameMapping>jbossws-wildfly810-tests-integration.jar</outputFileNameMapping>
<scope>provided</scope>
<useProjectArtifact>false</useProjectArtifact>
- </dependencySet>
+ </dependencySet> -->
<dependencySet>
<outputDirectory>deploy-artifacts/lib</outputDirectory>
Modified: stack/cxf/branches/jbossws-cxf-4.3.x/modules/testsuite/pom.xml
===================================================================
--- stack/cxf/branches/jbossws-cxf-4.3.x/modules/testsuite/pom.xml 2014-08-28 09:28:31 UTC
(rev 18878)
+++ stack/cxf/branches/jbossws-cxf-4.3.x/modules/testsuite/pom.xml 2014-08-28 09:45:49 UTC
(rev 18879)
@@ -821,9 +821,8 @@
</properties>
<dependencies>
<dependency>
- <groupId>org.wildfly</groupId>
- <artifactId>wildfly-webservices-tests-integration</artifactId>
- <version>${jboss.version}</version>
+ <groupId>org.jboss.ws</groupId>
+ <artifactId>jbossws-wildfly810-tests-integration</artifactId>
</dependency>
<!-- LittleProxy depencency declared in this profile as other profiles require
different exclusions -->
<dependency>
@@ -887,6 +886,10 @@
<!-- # [JBWS-3620] Authentication failures w/ Undertow -->
<exclude>org/jboss/test/ws/jaxws/cxf/httpauth/HelloDigestTestCase*</exclude>
+ <!-- [JBWS-3686] Restore WSTrustActAsTestCase and
WSTrustOnBehalfOfTestCase -->
+
<exclude>org/jboss/test/ws/jaxws/samples/wsse/policy/trust/WSTrustActAsTestCase.*</exclude>
+
<exclude>org/jboss/test/ws/jaxws/samples/wsse/policy/trust/WSTrustOnBehalfOfTestCase.*</exclude>
+
<!-- Manually setup KDC before run this test-->
<exclude>org/jboss/test/ws/jaxws/samples/wsse/kerberos/*TestCase*</exclude>
</excludes>
Modified: stack/cxf/branches/jbossws-cxf-4.3.x/pom.xml
===================================================================
--- stack/cxf/branches/jbossws-cxf-4.3.x/pom.xml 2014-08-28 09:28:31 UTC (rev 18878)
+++ stack/cxf/branches/jbossws-cxf-4.3.x/pom.xml 2014-08-28 09:45:49 UTC (rev 18879)
@@ -62,14 +62,15 @@
<properties>
<jbossws.api.version>1.0.2.Final</jbossws.api.version>
<jbossws.spi.version>2.3.0.Final</jbossws.spi.version>
- <jbossws.common.version>2.3.0.Final</jbossws.common.version>
+ <jbossws.common.version>2.3.1-SNAPSHOT</jbossws.common.version>
<jbossws.common.tools.version>1.2.0.Final</jbossws.common.tools.version>
<jbossws.jboss720.version>4.3.0.Final</jbossws.jboss720.version>
<jbossws.wildfly800.version>4.3.0.Final</jbossws.wildfly800.version>
+ <jbossws.wildfly810.version>4.3.1-SNAPSHOT</jbossws.wildfly810.version>
<jbossws.native.version>4.2.0.Final</jbossws.native.version>
<jboss720.version>7.2.0.Final</jboss720.version>
<wildfly800.version>8.0.0.Final</wildfly800.version>
- <wildfly810.version>8.1.0.Final-SNAPSHOT</wildfly810.version>
+ <wildfly810.version>8.1.0.Final</wildfly810.version>
<ejb.api.version>1.0.2.Final</ejb.api.version>
<cxf.version>2.7.12</cxf.version>
<cxf.asm.version>3.3.1</cxf.asm.version>
@@ -160,11 +161,16 @@
<version>${jbossws.wildfly800.version}</version>
</dependency>
<dependency>
- <groupId>org.wildfly</groupId>
- <artifactId>wildfly-webservices-tests-integration</artifactId>
- <version>${wildfly810.version}</version>
+ <groupId>org.jboss.ws</groupId>
+ <artifactId>jbossws-wildfly810-server-integration</artifactId>
+ <version>${jbossws.wildfly810.version}</version>
</dependency>
<dependency>
+ <groupId>org.jboss.ws</groupId>
+ <artifactId>jbossws-wildfly810-tests-integration</artifactId>
+ <version>${jbossws.wildfly810.version}</version>
+ </dependency>
+ <dependency>
<groupId>org.jboss.ws.projects</groupId>
<artifactId>jaxws-jboss-httpserver-httpspi</artifactId>
<version>${jaxws-jboss-httpserver-httpspi.version}</version>