JBossWS SVN: r18343 - in stack/native/branches/jbossws-native-4.1.x/modules: dist and 4 other directories.
by jbossws-commits@lists.jboss.org
Author: asoldano
Date: 2014-02-12 11:00:35 -0500 (Wed, 12 Feb 2014)
New Revision: 18343
Modified:
stack/native/branches/jbossws-native-4.1.x/modules/core/pom.xml
stack/native/branches/jbossws-native-4.1.x/modules/dist/pom.xml
stack/native/branches/jbossws-native-4.1.x/modules/resources/pom.xml
stack/native/branches/jbossws-native-4.1.x/modules/services/pom.xml
stack/native/branches/jbossws-native-4.1.x/modules/testsuite/native-tests/pom.xml
stack/native/branches/jbossws-native-4.1.x/modules/testsuite/pom.xml
Log:
Fixing poms to move to next dev cycle (fixes incomplete commit at rev 18019)
Modified: stack/native/branches/jbossws-native-4.1.x/modules/core/pom.xml
===================================================================
--- stack/native/branches/jbossws-native-4.1.x/modules/core/pom.xml 2014-02-12 14:52:25 UTC (rev 18342)
+++ stack/native/branches/jbossws-native-4.1.x/modules/core/pom.xml 2014-02-12 16:00:35 UTC (rev 18343)
@@ -9,7 +9,7 @@
<parent>
<groupId>org.jboss.ws.native</groupId>
<artifactId>jbossws-native</artifactId>
- <version>4.1.2-SNAPSHOT</version>
+ <version>4.1.3-SNAPSHOT</version>
<relativePath>../../pom.xml</relativePath>
</parent>
Modified: stack/native/branches/jbossws-native-4.1.x/modules/dist/pom.xml
===================================================================
--- stack/native/branches/jbossws-native-4.1.x/modules/dist/pom.xml 2014-02-12 14:52:25 UTC (rev 18342)
+++ stack/native/branches/jbossws-native-4.1.x/modules/dist/pom.xml 2014-02-12 16:00:35 UTC (rev 18343)
@@ -9,7 +9,7 @@
<parent>
<groupId>org.jboss.ws.native</groupId>
<artifactId>jbossws-native</artifactId>
- <version>4.1.2-SNAPSHOT</version>
+ <version>4.1.3-SNAPSHOT</version>
<relativePath>../../pom.xml</relativePath>
</parent>
Modified: stack/native/branches/jbossws-native-4.1.x/modules/resources/pom.xml
===================================================================
--- stack/native/branches/jbossws-native-4.1.x/modules/resources/pom.xml 2014-02-12 14:52:25 UTC (rev 18342)
+++ stack/native/branches/jbossws-native-4.1.x/modules/resources/pom.xml 2014-02-12 16:00:35 UTC (rev 18343)
@@ -9,7 +9,7 @@
<parent>
<groupId>org.jboss.ws.native</groupId>
<artifactId>jbossws-native</artifactId>
- <version>4.1.2-SNAPSHOT</version>
+ <version>4.1.3-SNAPSHOT</version>
<relativePath>../../pom.xml</relativePath>
</parent>
Modified: stack/native/branches/jbossws-native-4.1.x/modules/services/pom.xml
===================================================================
--- stack/native/branches/jbossws-native-4.1.x/modules/services/pom.xml 2014-02-12 14:52:25 UTC (rev 18342)
+++ stack/native/branches/jbossws-native-4.1.x/modules/services/pom.xml 2014-02-12 16:00:35 UTC (rev 18343)
@@ -9,7 +9,7 @@
<parent>
<groupId>org.jboss.ws.native</groupId>
<artifactId>jbossws-native</artifactId>
- <version>4.1.2-SNAPSHOT</version>
+ <version>4.1.3-SNAPSHOT</version>
<relativePath>../../pom.xml</relativePath>
</parent>
Modified: stack/native/branches/jbossws-native-4.1.x/modules/testsuite/native-tests/pom.xml
===================================================================
--- stack/native/branches/jbossws-native-4.1.x/modules/testsuite/native-tests/pom.xml 2014-02-12 14:52:25 UTC (rev 18342)
+++ stack/native/branches/jbossws-native-4.1.x/modules/testsuite/native-tests/pom.xml 2014-02-12 16:00:35 UTC (rev 18343)
@@ -9,7 +9,7 @@
<parent>
<groupId>org.jboss.ws.native</groupId>
<artifactId>jbossws-native-testsuite</artifactId>
- <version>4.1.2-SNAPSHOT</version>
+ <version>4.1.3-SNAPSHOT</version>
<relativePath>../pom.xml</relativePath>
</parent>
Modified: stack/native/branches/jbossws-native-4.1.x/modules/testsuite/pom.xml
===================================================================
--- stack/native/branches/jbossws-native-4.1.x/modules/testsuite/pom.xml 2014-02-12 14:52:25 UTC (rev 18342)
+++ stack/native/branches/jbossws-native-4.1.x/modules/testsuite/pom.xml 2014-02-12 16:00:35 UTC (rev 18343)
@@ -9,7 +9,7 @@
<parent>
<groupId>org.jboss.ws.native</groupId>
<artifactId>jbossws-native</artifactId>
- <version>4.1.2-SNAPSHOT</version>
+ <version>4.1.3-SNAPSHOT</version>
<relativePath>../../pom.xml</relativePath>
</parent>
10 years, 2 months
JBossWS SVN: r18342 - in stack/native/branches/jbossws-native-3.1.2: modules/client and 5 other directories.
by jbossws-commits@lists.jboss.org
Author: asoldano
Date: 2014-02-12 09:52:25 -0500 (Wed, 12 Feb 2014)
New Revision: 18342
Modified:
stack/native/branches/jbossws-native-3.1.2/modules/client/pom.xml
stack/native/branches/jbossws-native-3.1.2/modules/core/pom.xml
stack/native/branches/jbossws-native-3.1.2/modules/resources/src/main/resources/bin/wsconsume.bat
stack/native/branches/jbossws-native-3.1.2/modules/resources/src/main/resources/bin/wsconsume.sh
stack/native/branches/jbossws-native-3.1.2/modules/resources/src/main/resources/bin/wsprovide.bat
stack/native/branches/jbossws-native-3.1.2/modules/resources/src/main/resources/bin/wsprovide.sh
stack/native/branches/jbossws-native-3.1.2/modules/resources/src/main/resources/bin/wsrunclient.bat
stack/native/branches/jbossws-native-3.1.2/modules/resources/src/main/resources/bin/wsrunclient.sh
stack/native/branches/jbossws-native-3.1.2/modules/resources/src/main/resources/bin/wstools.bat
stack/native/branches/jbossws-native-3.1.2/modules/resources/src/main/resources/bin/wstools.sh
stack/native/branches/jbossws-native-3.1.2/modules/resources/src/main/resources/resources/jbossws-deploy-macros.xml
stack/native/branches/jbossws-native-3.1.2/pom.xml
stack/native/branches/jbossws-native-3.1.2/src/main/distro/build-project-gen.xml
stack/native/branches/jbossws-native-3.1.2/src/main/distro/build.xml
stack/native/branches/jbossws-native-3.1.2/src/main/scripts/assembly-deploy-artifacts.xml
Log:
Replacing javax.xml:jaxrpc-api with org.jboss.spec.javax.xml.rpc:jboss-jaxrpc-api_1.1_spec (there's already a redirect in the pom for the former, but that does not work properly with the maven assemply plugin)
Modified: stack/native/branches/jbossws-native-3.1.2/modules/client/pom.xml
===================================================================
--- stack/native/branches/jbossws-native-3.1.2/modules/client/pom.xml 2014-02-12 14:11:48 UTC (rev 18341)
+++ stack/native/branches/jbossws-native-3.1.2/modules/client/pom.xml 2014-02-12 14:52:25 UTC (rev 18342)
@@ -21,8 +21,8 @@
<version>${version}</version>
</dependency>
<dependency>
- <groupId>javax.xml</groupId>
- <artifactId>jaxrpc-api</artifactId>
+ <groupId>org.jboss.spec.javax.xml.rpc</groupId>
+ <artifactId>jboss-jaxrpc-api_1.1_spec</artifactId>
</dependency>
<dependency>
<groupId>org.jboss.logging</groupId>
@@ -37,7 +37,7 @@
<configuration>
<archive>
<manifestEntries>
- <Class-Path>jbossws-spi.jar jbossws-common.jar jbossws-framework.jar jbossws-native-core.jar jbossws-native-factories.jar jaxrpc-api.jar jaxws-api.jar jsr181-api.jar saaj-api.jar activation.jar commons-logging.jar concurrent.jar javassist.jar jaxb-api.jar jaxb-impl.jar mail.jar jboss-logging-spi.jar jboss-logging-log4j.jar jcl-over-slf4j.jar slf4j-api.jar slf4j-jboss-logging.jar jbosssx-client.jar jboss-javaee.jar jboss-remoting.jar jboss-xml-binding.jar jbossxb.jar netty.jar policy.jar stax-api.jar wsdl4j.jar</Class-Path>
+ <Class-Path>jbossws-spi.jar jbossws-common.jar jbossws-framework.jar jbossws-native-core.jar jbossws-native-factories.jar jboss-jaxrpc-api_1.1_spec.jar jaxws-api.jar jsr181-api.jar saaj-api.jar activation.jar commons-logging.jar concurrent.jar javassist.jar jaxb-api.jar jaxb-impl.jar mail.jar jboss-logging-spi.jar jboss-logging-log4j.jar jcl-over-slf4j.jar slf4j-api.jar slf4j-jboss-logging.jar jbosssx-client.jar jboss-javaee.jar jboss-remoting.jar jboss-xml-binding.jar jbossxb.jar netty.jar policy.jar stax-api.jar wsdl4j.jar</Class-Path>
</manifestEntries>
</archive>
</configuration>
Modified: stack/native/branches/jbossws-native-3.1.2/modules/core/pom.xml
===================================================================
--- stack/native/branches/jbossws-native-3.1.2/modules/core/pom.xml 2014-02-12 14:11:48 UTC (rev 18341)
+++ stack/native/branches/jbossws-native-3.1.2/modules/core/pom.xml 2014-02-12 14:52:25 UTC (rev 18342)
@@ -31,8 +31,8 @@
<artifactId>jbossws-spi</artifactId>
</dependency>
<dependency>
- <groupId>javax.xml</groupId>
- <artifactId>jaxrpc-api</artifactId>
+ <groupId>org.jboss.spec.javax.xml.rpc</groupId>
+ <artifactId>jboss-jaxrpc-api_1.1_spec</artifactId>
</dependency>
<dependency>
<groupId>javax.xml.soap</groupId>
Modified: stack/native/branches/jbossws-native-3.1.2/modules/resources/src/main/resources/bin/wsconsume.bat
===================================================================
--- stack/native/branches/jbossws-native-3.1.2/modules/resources/src/main/resources/bin/wsconsume.bat 2014-02-12 14:11:48 UTC (rev 18341)
+++ stack/native/branches/jbossws-native-3.1.2/modules/resources/src/main/resources/bin/wsconsume.bat 2014-02-12 14:52:25 UTC (rev 18342)
@@ -50,7 +50,7 @@
set WSCONSUME_CLASSPATH=%WSCONSUME_CLASSPATH%;%JBOSS_HOME%/client/jboss-xml-binding.jar
set WSCONSUME_CLASSPATH=%WSCONSUME_CLASSPATH%;%JBOSS_HOME%/client/jbossws-native-client.jar
set WSCONSUME_CLASSPATH=%WSCONSUME_CLASSPATH%;%JBOSS_HOME%/client/jbossws-native-core.jar
-set WSCONSUME_CLASSPATH=%WSCONSUME_CLASSPATH%;%JBOSS_HOME%/client/jaxrpc-api.jar
+set WSCONSUME_CLASSPATH=%WSCONSUME_CLASSPATH%;%JBOSS_HOME%/client/jboss-jaxrpc-api_1.1_spec.jar
set WSCONSUME_CLASSPATH=%WSCONSUME_CLASSPATH%;%JBOSS_HOME%/client/saaj-api.jar
rem Force use of IPv4 stack
Modified: stack/native/branches/jbossws-native-3.1.2/modules/resources/src/main/resources/bin/wsconsume.sh
===================================================================
--- stack/native/branches/jbossws-native-3.1.2/modules/resources/src/main/resources/bin/wsconsume.sh 2014-02-12 14:11:48 UTC (rev 18341)
+++ stack/native/branches/jbossws-native-3.1.2/modules/resources/src/main/resources/bin/wsconsume.sh 2014-02-12 14:52:25 UTC (rev 18342)
@@ -76,7 +76,7 @@
WSCONSUME_CLASSPATH="$WSCONSUME_CLASSPATH:$JBOSS_HOME/client/jboss-xml-binding.jar"
WSCONSUME_CLASSPATH="$WSCONSUME_CLASSPATH:$JBOSS_HOME/client/jbossws-native-client.jar"
WSCONSUME_CLASSPATH="$WSCONSUME_CLASSPATH:$JBOSS_HOME/client/jbossws-native-core.jar"
-WSCONSUME_CLASSPATH="$WSCONSUME_CLASSPATH:$JBOSS_HOME/client/jaxrpc-api.jar"
+WSCONSUME_CLASSPATH="$WSCONSUME_CLASSPATH:$JBOSS_HOME/client/jboss-jaxrpc-api_1.1_spec.jar"
WSCONSUME_CLASSPATH="$WSCONSUME_CLASSPATH:$JBOSS_HOME/client/saaj-api.jar"
###
Modified: stack/native/branches/jbossws-native-3.1.2/modules/resources/src/main/resources/bin/wsprovide.bat
===================================================================
--- stack/native/branches/jbossws-native-3.1.2/modules/resources/src/main/resources/bin/wsprovide.bat 2014-02-12 14:11:48 UTC (rev 18341)
+++ stack/native/branches/jbossws-native-3.1.2/modules/resources/src/main/resources/bin/wsprovide.bat 2014-02-12 14:52:25 UTC (rev 18342)
@@ -49,7 +49,7 @@
set WSPROVIDE_CLASSPATH=%WSPROVIDE_CLASSPATH%;%JBOSS_HOME%/client/jbossall-client.jar
set WSPROVIDE_CLASSPATH=%WSPROVIDE_CLASSPATH%;%JBOSS_HOME%/client/jbossws-native-client.jar
set WSPROVIDE_CLASSPATH=%WSPROVIDE_CLASSPATH%;%JBOSS_HOME%/client/jbossws-native-core.jar
-set WSPROVIDE_CLASSPATH=%WSPROVIDE_CLASSPATH%;%JBOSS_HOME%/client/jaxrpc-api.jar
+set WSPROVIDE_CLASSPATH=%WSPROVIDE_CLASSPATH%;%JBOSS_HOME%/client/jboss-jaxrpc-api_1.1_spec.jar
set WSPROVIDE_CLASSPATH=%WSPROVIDE_CLASSPATH%;%JBOSS_HOME%/client/saaj-api.jar
set WSPROVIDE_CLASSPATH=%WSPROVIDE_CLASSPATH%;%JBOSS_HOME%/client/wsdl4j.jar
Modified: stack/native/branches/jbossws-native-3.1.2/modules/resources/src/main/resources/bin/wsprovide.sh
===================================================================
--- stack/native/branches/jbossws-native-3.1.2/modules/resources/src/main/resources/bin/wsprovide.sh 2014-02-12 14:11:48 UTC (rev 18341)
+++ stack/native/branches/jbossws-native-3.1.2/modules/resources/src/main/resources/bin/wsprovide.sh 2014-02-12 14:52:25 UTC (rev 18342)
@@ -75,7 +75,7 @@
WSPROVIDE_CLASSPATH="$WSPROVIDE_CLASSPATH:$JBOSS_HOME/client/jbossall-client.jar"
WSPROVIDE_CLASSPATH="$WSPROVIDE_CLASSPATH:$JBOSS_HOME/client/jbossws-native-client.jar"
WSPROVIDE_CLASSPATH="$WSPROVIDE_CLASSPATH:$JBOSS_HOME/client/jbossws-native-core.jar"
-WSPROVIDE_CLASSPATH="$WSPROVIDE_CLASSPATH:$JBOSS_HOME/client/jaxrpc-api.jar"
+WSPROVIDE_CLASSPATH="$WSPROVIDE_CLASSPATH:$JBOSS_HOME/client/jboss-jaxrpc-api_1.1_spec.jar"
WSPROVIDE_CLASSPATH="$WSPROVIDE_CLASSPATH:$JBOSS_HOME/client/saaj-api.jar"
WSPROVIDE_CLASSPATH="$WSPROVIDE_CLASSPATH:$JBOSS_HOME/client/wsdl4j.jar"
Modified: stack/native/branches/jbossws-native-3.1.2/modules/resources/src/main/resources/bin/wsrunclient.bat
===================================================================
--- stack/native/branches/jbossws-native-3.1.2/modules/resources/src/main/resources/bin/wsrunclient.bat 2014-02-12 14:11:48 UTC (rev 18341)
+++ stack/native/branches/jbossws-native-3.1.2/modules/resources/src/main/resources/bin/wsrunclient.bat 2014-02-12 14:52:25 UTC (rev 18342)
@@ -54,7 +54,7 @@
set WSRUNCLIENT_CLASSPATH=%WSRUNCLIENT_CLASSPATH%;%JBOSS_HOME%/client/jbossws-common.jar
set WSRUNCLIENT_CLASSPATH=%WSRUNCLIENT_CLASSPATH%;%JBOSS_HOME%/client/jbossws-native-client.jar
set WSRUNCLIENT_CLASSPATH=%WSRUNCLIENT_CLASSPATH%;%JBOSS_HOME%/client/jbossws-native-core.jar
-set WSRUNCLIENT_CLASSPATH=%WSRUNCLIENT_CLASSPATH%;%JBOSS_HOME%/client/jaxrpc-api.jar
+set WSRUNCLIENT_CLASSPATH=%WSRUNCLIENT_CLASSPATH%;%JBOSS_HOME%/client/jboss-jaxrpc-api_1.1_spec.jar
set WSRUNCLIENT_CLASSPATH=%WSRUNCLIENT_CLASSPATH%;%JBOSS_HOME%/client/saaj-api.jar
set WSRUNCLIENT_CLASSPATH=%WSRUNCLIENT_CLASSPATH%;%JBOSS_HOME%/client/jbossws-spi.jar
set WSRUNCLIENT_CLASSPATH=%WSRUNCLIENT_CLASSPATH%;%JBOSS_HOME%/client/FastInfoset.jar
Modified: stack/native/branches/jbossws-native-3.1.2/modules/resources/src/main/resources/bin/wsrunclient.sh
===================================================================
--- stack/native/branches/jbossws-native-3.1.2/modules/resources/src/main/resources/bin/wsrunclient.sh 2014-02-12 14:11:48 UTC (rev 18341)
+++ stack/native/branches/jbossws-native-3.1.2/modules/resources/src/main/resources/bin/wsrunclient.sh 2014-02-12 14:52:25 UTC (rev 18342)
@@ -73,7 +73,7 @@
WSRUNCLIENT_CLASSPATH="$WSRUNCLIENT_CLASSPATH:$JBOSS_HOME/client/jbossws-common.jar"
WSRUNCLIENT_CLASSPATH="$WSRUNCLIENT_CLASSPATH:$JBOSS_HOME/client/jbossws-native-client.jar"
WSRUNCLIENT_CLASSPATH="$WSRUNCLIENT_CLASSPATH:$JBOSS_HOME/client/jbossws-native-core.jar"
-WSRUNCLIENT_CLASSPATH="$WSRUNCLIENT_CLASSPATH:$JBOSS_HOME/client/jaxrpc-api.jar"
+WSRUNCLIENT_CLASSPATH="$WSRUNCLIENT_CLASSPATH:$JBOSS_HOME/client/jboss-jaxrpc-api_1.1_spec.jar"
WSRUNCLIENT_CLASSPATH="$WSRUNCLIENT_CLASSPATH:$JBOSS_HOME/client/saaj-api.jar"
WSRUNCLIENT_CLASSPATH="$WSRUNCLIENT_CLASSPATH:$JBOSS_HOME/client/jbossws-spi.jar"
WSRUNCLIENT_CLASSPATH="$WSRUNCLIENT_CLASSPATH:$JBOSS_HOME/client/FastInfoset.jar"
Modified: stack/native/branches/jbossws-native-3.1.2/modules/resources/src/main/resources/bin/wstools.bat
===================================================================
--- stack/native/branches/jbossws-native-3.1.2/modules/resources/src/main/resources/bin/wstools.bat 2014-02-12 14:11:48 UTC (rev 18341)
+++ stack/native/branches/jbossws-native-3.1.2/modules/resources/src/main/resources/bin/wstools.bat 2014-02-12 14:52:25 UTC (rev 18342)
@@ -39,7 +39,7 @@
set WSTOOLS_CLASSPATH=%WSTOOLS_CLASSPATH%;%JBOSS_HOME%/client/jboss-xml-binding.jar
set WSTOOLS_CLASSPATH=%WSTOOLS_CLASSPATH%;%JBOSS_HOME%/client/jbossws-native-client.jar
set WSTOOLS_CLASSPATH=%WSTOOLS_CLASSPATH%;%JBOSS_HOME%/client/jbossws-native-core.jar
-set WSTOOLS_CLASSPATH=%WSTOOLS_CLASSPATH%;%JBOSS_HOME%/client/jaxrpc-api.jar
+set WSTOOLS_CLASSPATH=%WSTOOLS_CLASSPATH%;%JBOSS_HOME%/client/jboss-jaxrpc-api_1.1_spec.jar
set WSTOOLS_CLASSPATH=%WSTOOLS_CLASSPATH%;%JBOSS_HOME%/client/saaj-api.jar
rem Force use of IPv4 stack
Modified: stack/native/branches/jbossws-native-3.1.2/modules/resources/src/main/resources/bin/wstools.sh
===================================================================
--- stack/native/branches/jbossws-native-3.1.2/modules/resources/src/main/resources/bin/wstools.sh 2014-02-12 14:11:48 UTC (rev 18341)
+++ stack/native/branches/jbossws-native-3.1.2/modules/resources/src/main/resources/bin/wstools.sh 2014-02-12 14:52:25 UTC (rev 18342)
@@ -61,7 +61,7 @@
WSTOOLS_CLASSPATH="$WSTOOLS_CLASSPATH:$JBOSS_HOME/client/jboss-xml-binding.jar"
WSTOOLS_CLASSPATH="$WSTOOLS_CLASSPATH:$JBOSS_HOME/client/jbossws-native-client.jar"
WSTOOLS_CLASSPATH="$WSTOOLS_CLASSPATH:$JBOSS_HOME/client/jbossws-native-core.jar"
-WSTOOLS_CLASSPATH="$WSTOOLS_CLASSPATH:$JBOSS_HOME/client/jaxrpc-api.jar"
+WSTOOLS_CLASSPATH="$WSTOOLS_CLASSPATH:$JBOSS_HOME/client/jboss-jaxrpc-api_1.1_spec.jar"
WSTOOLS_CLASSPATH="$WSTOOLS_CLASSPATH:$JBOSS_HOME/client/saaj-api.jar"
Modified: stack/native/branches/jbossws-native-3.1.2/modules/resources/src/main/resources/resources/jbossws-deploy-macros.xml
===================================================================
--- stack/native/branches/jbossws-native-3.1.2/modules/resources/src/main/resources/resources/jbossws-deploy-macros.xml 2014-02-12 14:11:48 UTC (rev 18341)
+++ stack/native/branches/jbossws-native-3.1.2/modules/resources/src/main/resources/resources/jbossws-deploy-macros.xml 2014-02-12 14:52:25 UTC (rev 18342)
@@ -42,7 +42,7 @@
<include name="**/jbossws-native-core.jar"/>
<include name="**/jbossws-native-factories.jar"/>
<include name="**/jbossws-spi.jar"/>
- <include name="**/jaxrpc-api.jar"/>
+ <include name="**/jboss-jaxrpc-api_1.1_spec.jar"/>
<include name="**/saaj-api.jar"/>
<include name="**/jettison.jar"/>
<include name="**/stax-api.jar"/>
@@ -65,7 +65,7 @@
<patternset id="jbossws.server.lib.patternset">
<include name="**/jbossws-common.jar"/>
<include name="**/jbossws-framework.jar"/>
- <include name="**/jaxrpc-api.jar"/>
+ <include name="**/jboss-jaxrpc-api_1.1_spec.jar"/>
<include name="**/jaxws-api.jar"/>
<include name="**/jsr181-api.jar"/>
<include name="**/jbossws-native-factories.jar"/>
Modified: stack/native/branches/jbossws-native-3.1.2/pom.xml
===================================================================
--- stack/native/branches/jbossws-native-3.1.2/pom.xml 2014-02-12 14:11:48 UTC (rev 18341)
+++ stack/native/branches/jbossws-native-3.1.2/pom.xml 2014-02-12 14:52:25 UTC (rev 18342)
@@ -58,7 +58,7 @@
<javassist.version>3.9.0.GA</javassist.version>
<jaxws.api.version>2.1-1</jaxws.api.version>
<jsr181.api.version>1.0-MR1</jsr181.api.version>
- <jaxrpc.api.version>1.1</jaxrpc.api.version>
+ <jaxrpc.api.version>1.0.0.Final</jaxrpc.api.version>
<saaj.api.version>1.3</saaj.api.version>
<jaxb.api.version>2.1</jaxb.api.version>
<jaxb.impl.version>2.1.12.patch01</jaxb.impl.version>
@@ -243,8 +243,8 @@
<version>${jsr181.api.version}</version>
</dependency>
<dependency>
- <groupId>javax.xml</groupId>
- <artifactId>jaxrpc-api</artifactId>
+ <groupId>org.jboss.spec.javax.xml.rpc</groupId>
+ <artifactId>jboss-jaxrpc-api_1.1_spec</artifactId>
<version>${jaxrpc.api.version}</version>
<exclusions>
<exclusion>
Modified: stack/native/branches/jbossws-native-3.1.2/src/main/distro/build-project-gen.xml
===================================================================
--- stack/native/branches/jbossws-native-3.1.2/src/main/distro/build-project-gen.xml 2014-02-12 14:11:48 UTC (rev 18341)
+++ stack/native/branches/jbossws-native-3.1.2/src/main/distro/build-project-gen.xml 2014-02-12 14:52:25 UTC (rev 18342)
@@ -109,7 +109,7 @@
<pathelement location="${jboss.client}/jaxb-api.jar"/>
<pathelement location="${jboss.client}/jbossws-common.jar"/>
<pathelement location="${jboss.client}/jbossws-spi.jar"/>
- <pathelement location="${jboss.client}/jaxrpc-api.jar"/>
+ <pathelement location="${jboss.client}/jboss-jaxrpc-api_1.1_spec.jar"/>
<pathelement location="${jboss.client}/saaj-api.jar"/>
<pathelement location="${jboss.client}/jbossws-native-factories.jar"/>
<pathelement location="${jboss.client}/jbossws-native-core.jar"/>
Modified: stack/native/branches/jbossws-native-3.1.2/src/main/distro/build.xml
===================================================================
--- stack/native/branches/jbossws-native-3.1.2/src/main/distro/build.xml 2014-02-12 14:11:48 UTC (rev 18341)
+++ stack/native/branches/jbossws-native-3.1.2/src/main/distro/build.xml 2014-02-12 14:52:25 UTC (rev 18342)
@@ -59,7 +59,7 @@
<path id="ws.stack.classpath">
<!-- Move the native API to the front of the classpath -->
- <pathelement location="${thirdparty.dir}/jaxrpc-api.jar"/>
+ <pathelement location="${thirdparty.dir}/jboss-jaxrpc-api_1.1_spec.jar"/>
<pathelement location="${thirdparty.dir}/saaj-api.jar"/>
<fileset dir="${thirdparty.dir}"/>
</path>
Modified: stack/native/branches/jbossws-native-3.1.2/src/main/scripts/assembly-deploy-artifacts.xml
===================================================================
--- stack/native/branches/jbossws-native-3.1.2/src/main/scripts/assembly-deploy-artifacts.xml 2014-02-12 14:11:48 UTC (rev 18341)
+++ stack/native/branches/jbossws-native-3.1.2/src/main/scripts/assembly-deploy-artifacts.xml 2014-02-12 14:52:25 UTC (rev 18342)
@@ -41,7 +41,7 @@
<include>jboss.jaxbintros:jboss-jaxb-intros:jar</include>
<include>org.jboss.ws:jbossws-common:jar</include>
<include>org.jboss.ws:jbossws-spi:jar</include>
- <include>javax.xml:jaxrpc-api:jar</include>
+ <include>org.jboss.spec.javax.xml.rpc:jboss-jaxrpc-api_1.1_spec</include>
<include>javax.xml.ws:jaxws-api:jar</include>
<include>javax.jws:jsr181-api</include>
<include>org.jboss.ws.native:jbossws-native-factories:jar</include>
10 years, 2 months
JBossWS SVN: r18341 - stack/native/branches/jbossws-native-3.1.2/modules/core/src/main/java/org/jboss/ws/core/client.
by jbossws-commits@lists.jboss.org
Author: asoldano
Date: 2014-02-12 09:11:48 -0500 (Wed, 12 Feb 2014)
New Revision: 18341
Modified:
stack/native/branches/jbossws-native-3.1.2/modules/core/src/main/java/org/jboss/ws/core/client/FastInfosetConnectionHTTP.java
stack/native/branches/jbossws-native-3.1.2/modules/core/src/main/java/org/jboss/ws/core/client/HTTPProtocolConnection.java
stack/native/branches/jbossws-native-3.1.2/modules/core/src/main/java/org/jboss/ws/core/client/JsonConnectionHTTP.java
stack/native/branches/jbossws-native-3.1.2/modules/core/src/main/java/org/jboss/ws/core/client/SOAPProtocolConnectionHTTP.java
Log:
[JBPAPP-10655] Fixing FastInfoset regression + adding some @Override annotation to prevent similar problems in the future
Modified: stack/native/branches/jbossws-native-3.1.2/modules/core/src/main/java/org/jboss/ws/core/client/FastInfosetConnectionHTTP.java
===================================================================
--- stack/native/branches/jbossws-native-3.1.2/modules/core/src/main/java/org/jboss/ws/core/client/FastInfosetConnectionHTTP.java 2014-02-12 13:18:39 UTC (rev 18340)
+++ stack/native/branches/jbossws-native-3.1.2/modules/core/src/main/java/org/jboss/ws/core/client/FastInfosetConnectionHTTP.java 2014-02-12 14:11:48 UTC (rev 18341)
@@ -40,11 +40,13 @@
*/
public class FastInfosetConnectionHTTP extends SOAPProtocolConnectionHTTP
{
- public UnMarshaller getUnmarshaller()
+ @Override
+ public UnMarshaller getUnmarshaller(boolean oneway)
{
return new FastInfosetUnMarshaller();
}
+ @Override
public Marshaller getMarshaller()
{
return new FastInfosetMarshaller();
Modified: stack/native/branches/jbossws-native-3.1.2/modules/core/src/main/java/org/jboss/ws/core/client/HTTPProtocolConnection.java
===================================================================
--- stack/native/branches/jbossws-native-3.1.2/modules/core/src/main/java/org/jboss/ws/core/client/HTTPProtocolConnection.java 2014-02-12 13:18:39 UTC (rev 18340)
+++ stack/native/branches/jbossws-native-3.1.2/modules/core/src/main/java/org/jboss/ws/core/client/HTTPProtocolConnection.java 2014-02-12 14:11:48 UTC (rev 18341)
@@ -31,11 +31,13 @@
*/
public class HTTPProtocolConnection extends HTTPRemotingConnection
{
+ @Override
public UnMarshaller getUnmarshaller(boolean oneway)
{
return new HTTPMessageUnMarshaller();
}
+ @Override
public Marshaller getMarshaller()
{
return new HTTPMessageMarshaller();
Modified: stack/native/branches/jbossws-native-3.1.2/modules/core/src/main/java/org/jboss/ws/core/client/JsonConnectionHTTP.java
===================================================================
--- stack/native/branches/jbossws-native-3.1.2/modules/core/src/main/java/org/jboss/ws/core/client/JsonConnectionHTTP.java 2014-02-12 13:18:39 UTC (rev 18340)
+++ stack/native/branches/jbossws-native-3.1.2/modules/core/src/main/java/org/jboss/ws/core/client/JsonConnectionHTTP.java 2014-02-12 14:11:48 UTC (rev 18341)
@@ -41,11 +41,13 @@
*/
public class JsonConnectionHTTP extends HTTPRemotingConnection
{
+ @Override
public UnMarshaller getUnmarshaller(boolean oneway)
{
return new JsonMessageUnMarshaller();
}
+ @Override
public Marshaller getMarshaller()
{
return new JsonMessageMarshaller();
Modified: stack/native/branches/jbossws-native-3.1.2/modules/core/src/main/java/org/jboss/ws/core/client/SOAPProtocolConnectionHTTP.java
===================================================================
--- stack/native/branches/jbossws-native-3.1.2/modules/core/src/main/java/org/jboss/ws/core/client/SOAPProtocolConnectionHTTP.java 2014-02-12 13:18:39 UTC (rev 18340)
+++ stack/native/branches/jbossws-native-3.1.2/modules/core/src/main/java/org/jboss/ws/core/client/SOAPProtocolConnectionHTTP.java 2014-02-12 14:11:48 UTC (rev 18341)
@@ -46,6 +46,7 @@
*/
public class SOAPProtocolConnectionHTTP extends HTTPRemotingConnection
{
+ @Override
public UnMarshaller getUnmarshaller(boolean oneway)
{
if(oneway)
@@ -54,11 +55,13 @@
return new SOAPMessageUnMarshallerHTTP();
}
+ @Override
public Marshaller getMarshaller()
{
return new SOAPMessageMarshaller();
}
+ @Override
public MessageAbstraction invoke(MessageAbstraction reqMessage, Object endpoint, boolean oneway) throws IOException
{
try
@@ -82,6 +85,7 @@
}
}
+ @Override
protected void populateHeaders(MessageAbstraction reqMessage, Map<String, Object> metadata)
{
super.populateHeaders(reqMessage, metadata);
10 years, 2 months
JBossWS SVN: r18340 - in stack/cxf/branches/jaspi/modules: client/src/main/java/org/jboss/wsf/stack/cxf/client/jaspi and 10 other directories.
by jbossws-commits@lists.jboss.org
Author: asoldano
Date: 2014-02-12 08:18:39 -0500 (Wed, 12 Feb 2014)
New Revision: 18340
Modified:
stack/cxf/branches/jaspi/modules/client/src/main/java/org/jboss/wsf/stack/cxf/Loggers.java
stack/cxf/branches/jaspi/modules/client/src/main/java/org/jboss/wsf/stack/cxf/client/jaspi/JaspiClientAuthenticator.java
stack/cxf/branches/jaspi/modules/client/src/main/java/org/jboss/wsf/stack/cxf/client/jaspi/JaspiClientInInterceptor.java
stack/cxf/branches/jaspi/modules/client/src/main/java/org/jboss/wsf/stack/cxf/client/jaspi/JaspiClientOutInterceptor.java
stack/cxf/branches/jaspi/modules/client/src/main/java/org/jboss/wsf/stack/cxf/client/jaspi/module/SOAPClientAuthModule.java
stack/cxf/branches/jaspi/modules/jaspi/src/main/java/org/jboss/wsf/stack/cxf/jaspi/config/JBossWSAuthConfigProvider.java
stack/cxf/branches/jaspi/modules/jaspi/src/main/java/org/jboss/wsf/stack/cxf/jaspi/config/JBossWSClientAuthConfig.java
stack/cxf/branches/jaspi/modules/jaspi/src/main/java/org/jboss/wsf/stack/cxf/jaspi/config/JBossWSClientAuthContext.java
stack/cxf/branches/jaspi/modules/jaspi/src/main/java/org/jboss/wsf/stack/cxf/jaspi/config/JBossWSServerAuthConfig.java
stack/cxf/branches/jaspi/modules/server/src/main/java/org/jboss/wsf/stack/cxf/configuration/BusHolder.java
stack/cxf/branches/jaspi/modules/server/src/main/java/org/jboss/wsf/stack/cxf/configuration/NonSpringBusHolder.java
stack/cxf/branches/jaspi/modules/server/src/main/java/org/jboss/wsf/stack/cxf/configuration/ServerBeanCustomizer.java
stack/cxf/branches/jaspi/modules/server/src/main/java/org/jboss/wsf/stack/cxf/configuration/SpringBusHolder.java
stack/cxf/branches/jaspi/modules/server/src/main/java/org/jboss/wsf/stack/cxf/deployment/aspect/BusDeploymentAspect.java
stack/cxf/branches/jaspi/modules/server/src/main/java/org/jboss/wsf/stack/cxf/interceptor/JaspiSeverInInterceptor.java
stack/cxf/branches/jaspi/modules/server/src/main/java/org/jboss/wsf/stack/cxf/interceptor/JaspiSeverOutInterceptor.java
stack/cxf/branches/jaspi/modules/server/src/main/java/org/jboss/wsf/stack/cxf/jaspi/JaspiServerAuthenticator.java
stack/cxf/branches/jaspi/modules/server/src/main/java/org/jboss/wsf/stack/cxf/jaspi/module/UsernameTokenServerAuthModule.java
stack/cxf/branches/jaspi/modules/server/src/main/java/org/jboss/wsf/stack/cxf/security/authentication/JaspiSubjectCreatingInterceptor.java
stack/cxf/branches/jaspi/modules/server/src/test/java/org/jboss/wsf/stack/cxf/configuration/BusHolderTest.java
stack/cxf/branches/jaspi/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/cxf/jbws3098/BusHolderLifeCycleTestCase.java
Log:
Bunch of minor improvements (making final what should actually be and some refactoring)
Modified: stack/cxf/branches/jaspi/modules/client/src/main/java/org/jboss/wsf/stack/cxf/Loggers.java
===================================================================
--- stack/cxf/branches/jaspi/modules/client/src/main/java/org/jboss/wsf/stack/cxf/Loggers.java 2014-02-12 10:18:01 UTC (rev 18339)
+++ stack/cxf/branches/jaspi/modules/client/src/main/java/org/jboss/wsf/stack/cxf/Loggers.java 2014-02-12 13:18:39 UTC (rev 18340)
@@ -235,5 +235,5 @@
@LogMessage(level = WARN)
@Message(id = 24104, value = "Can not create Jaspi ServerAuthContext for security domain '%s'")
- void cannotCreateServerAuthContext(String securityDomain);
+ void cannotCreateServerAuthContext(String securityDomain, @Cause Throwable cause);
}
Modified: stack/cxf/branches/jaspi/modules/client/src/main/java/org/jboss/wsf/stack/cxf/client/jaspi/JaspiClientAuthenticator.java
===================================================================
--- stack/cxf/branches/jaspi/modules/client/src/main/java/org/jboss/wsf/stack/cxf/client/jaspi/JaspiClientAuthenticator.java 2014-02-12 10:18:01 UTC (rev 18339)
+++ stack/cxf/branches/jaspi/modules/client/src/main/java/org/jboss/wsf/stack/cxf/client/jaspi/JaspiClientAuthenticator.java 2014-02-12 13:18:39 UTC (rev 18340)
@@ -24,9 +24,9 @@
public class JaspiClientAuthenticator
{
public static final String JASPI_SECURITY_DOMAIN = "jaspi.security.domain";
- private ClientAuthConfig clientConfig;
- private String securityDomain;
- private JASPIAuthenticationInfo jpi;
+ private final ClientAuthConfig clientConfig;
+ private final String securityDomain;
+ private final JASPIAuthenticationInfo jpi;
public JaspiClientAuthenticator(ClientAuthConfig clientConfig, String securityDomain, JASPIAuthenticationInfo jpi)
{
@@ -46,6 +46,7 @@
serverContextProperties.put("security-domain", securityDomain);
serverContextProperties.put("jaspi-policy", jpi);
Subject clientSubject = new Subject();
+ @SuppressWarnings("unused")
AuthStatus authStatus = null;
try
{
@@ -79,6 +80,7 @@
serverContextProperties.put("security-domain", securityDomain);
serverContextProperties.put("jaspi-policy", jpi);
Subject clientSubject = new Subject();
+ @SuppressWarnings("unused")
AuthStatus authStatus = null;
try
{
Modified: stack/cxf/branches/jaspi/modules/client/src/main/java/org/jboss/wsf/stack/cxf/client/jaspi/JaspiClientInInterceptor.java
===================================================================
--- stack/cxf/branches/jaspi/modules/client/src/main/java/org/jboss/wsf/stack/cxf/client/jaspi/JaspiClientInInterceptor.java 2014-02-12 10:18:01 UTC (rev 18339)
+++ stack/cxf/branches/jaspi/modules/client/src/main/java/org/jboss/wsf/stack/cxf/client/jaspi/JaspiClientInInterceptor.java 2014-02-12 13:18:39 UTC (rev 18340)
@@ -33,7 +33,8 @@
*/
public class JaspiClientInInterceptor extends AbstractSoapInterceptor
{
- private JaspiClientAuthenticator authManager;
+ private final JaspiClientAuthenticator authManager;
+
public JaspiClientInInterceptor(JaspiClientAuthenticator authManager)
{
super(Phase.POST_PROTOCOL_ENDING);
Modified: stack/cxf/branches/jaspi/modules/client/src/main/java/org/jboss/wsf/stack/cxf/client/jaspi/JaspiClientOutInterceptor.java
===================================================================
--- stack/cxf/branches/jaspi/modules/client/src/main/java/org/jboss/wsf/stack/cxf/client/jaspi/JaspiClientOutInterceptor.java 2014-02-12 10:18:01 UTC (rev 18339)
+++ stack/cxf/branches/jaspi/modules/client/src/main/java/org/jboss/wsf/stack/cxf/client/jaspi/JaspiClientOutInterceptor.java 2014-02-12 13:18:39 UTC (rev 18340)
@@ -40,7 +40,8 @@
*/
public class JaspiClientOutInterceptor extends AbstractSoapInterceptor
{
- private JaspiClientAuthenticator authManager;
+ private final JaspiClientAuthenticator authManager;
+
public JaspiClientOutInterceptor(JaspiClientAuthenticator authManager)
{
super(Phase.PRE_PROTOCOL);
Modified: stack/cxf/branches/jaspi/modules/client/src/main/java/org/jboss/wsf/stack/cxf/client/jaspi/module/SOAPClientAuthModule.java
===================================================================
--- stack/cxf/branches/jaspi/modules/client/src/main/java/org/jboss/wsf/stack/cxf/client/jaspi/module/SOAPClientAuthModule.java 2014-02-12 10:18:01 UTC (rev 18339)
+++ stack/cxf/branches/jaspi/modules/client/src/main/java/org/jboss/wsf/stack/cxf/client/jaspi/module/SOAPClientAuthModule.java 2014-02-12 13:18:39 UTC (rev 18340)
@@ -32,16 +32,8 @@
import javax.security.auth.message.MessageInfo;
import javax.security.auth.message.MessagePolicy;
import javax.security.auth.message.module.ClientAuthModule;
-import javax.xml.soap.SOAPException;
import javax.xml.soap.SOAPMessage;
-import org.apache.cxf.binding.soap.SoapMessage;
-import org.apache.cxf.binding.soap.SoapVersion;
-import org.apache.cxf.binding.soap.SoapVersionFactory;
-import org.apache.cxf.message.Exchange;
-import org.apache.cxf.message.ExchangeImpl;
-import org.apache.cxf.message.MessageImpl;
-import org.apache.ws.security.WSSConfig;
import org.jboss.security.SimplePrincipal;
/**
Modified: stack/cxf/branches/jaspi/modules/jaspi/src/main/java/org/jboss/wsf/stack/cxf/jaspi/config/JBossWSAuthConfigProvider.java
===================================================================
--- stack/cxf/branches/jaspi/modules/jaspi/src/main/java/org/jboss/wsf/stack/cxf/jaspi/config/JBossWSAuthConfigProvider.java 2014-02-12 10:18:01 UTC (rev 18339)
+++ stack/cxf/branches/jaspi/modules/jaspi/src/main/java/org/jboss/wsf/stack/cxf/jaspi/config/JBossWSAuthConfigProvider.java 2014-02-12 13:18:39 UTC (rev 18340)
@@ -35,7 +35,7 @@
*/
public class JBossWSAuthConfigProvider implements AuthConfigProvider
{
- private Properties contextProperties;
+ private final Properties contextProperties;
public JBossWSAuthConfigProvider(Properties props, AuthConfigFactory factory)
{
Modified: stack/cxf/branches/jaspi/modules/jaspi/src/main/java/org/jboss/wsf/stack/cxf/jaspi/config/JBossWSClientAuthConfig.java
===================================================================
--- stack/cxf/branches/jaspi/modules/jaspi/src/main/java/org/jboss/wsf/stack/cxf/jaspi/config/JBossWSClientAuthConfig.java 2014-02-12 10:18:01 UTC (rev 18339)
+++ stack/cxf/branches/jaspi/modules/jaspi/src/main/java/org/jboss/wsf/stack/cxf/jaspi/config/JBossWSClientAuthConfig.java 2014-02-12 13:18:39 UTC (rev 18340)
@@ -58,7 +58,7 @@
{
@SuppressWarnings("rawtypes")
- private List modules = new ArrayList();
+ private final List modules = new ArrayList();
private CallbackHandler callbackHandler;
@SuppressWarnings("rawtypes")
Modified: stack/cxf/branches/jaspi/modules/jaspi/src/main/java/org/jboss/wsf/stack/cxf/jaspi/config/JBossWSClientAuthContext.java
===================================================================
--- stack/cxf/branches/jaspi/modules/jaspi/src/main/java/org/jboss/wsf/stack/cxf/jaspi/config/JBossWSClientAuthContext.java 2014-02-12 10:18:01 UTC (rev 18339)
+++ stack/cxf/branches/jaspi/modules/jaspi/src/main/java/org/jboss/wsf/stack/cxf/jaspi/config/JBossWSClientAuthContext.java 2014-02-12 13:18:39 UTC (rev 18340)
@@ -21,9 +21,7 @@
*/
package org.jboss.wsf.stack.cxf.jaspi.config;
-
import java.util.ArrayList;
-import java.util.HashMap;
import java.util.List;
import java.util.Map;
@@ -41,9 +39,9 @@
* @author <a href="ema(a)redhat.com">Jim Ma</a>
*/
public class JBossWSClientAuthContext implements ClientAuthContext {
- private List<ClientAuthModule> modules = new ArrayList<ClientAuthModule>();
+ private final List<ClientAuthModule> modules;
@SuppressWarnings("rawtypes")
- private Map<String, Map> moduleOptionsByName = new HashMap<String, Map>();
+ private final Map<String, Map> moduleOptionsByName;
protected List<ControlFlag> controlFlags = new ArrayList<ControlFlag>();
@SuppressWarnings("rawtypes")
Modified: stack/cxf/branches/jaspi/modules/jaspi/src/main/java/org/jboss/wsf/stack/cxf/jaspi/config/JBossWSServerAuthConfig.java
===================================================================
--- stack/cxf/branches/jaspi/modules/jaspi/src/main/java/org/jboss/wsf/stack/cxf/jaspi/config/JBossWSServerAuthConfig.java 2014-02-12 10:18:01 UTC (rev 18339)
+++ stack/cxf/branches/jaspi/modules/jaspi/src/main/java/org/jboss/wsf/stack/cxf/jaspi/config/JBossWSServerAuthConfig.java 2014-02-12 13:18:39 UTC (rev 18340)
@@ -56,9 +56,9 @@
* @author <a href="ema(a)redhat.com">Jim Ma</a>
*/
public class JBossWSServerAuthConfig extends JBossServerAuthConfig {
- private CallbackHandler callbackHandler = new JBossCallbackHandler();
+ private final CallbackHandler callbackHandler = new JBossCallbackHandler();
@SuppressWarnings("rawtypes")
- private List modules = new ArrayList();
+ private final List modules = new ArrayList();
@SuppressWarnings("rawtypes")
public JBossWSServerAuthConfig(String layer, String appContext,
Modified: stack/cxf/branches/jaspi/modules/server/src/main/java/org/jboss/wsf/stack/cxf/configuration/BusHolder.java
===================================================================
--- stack/cxf/branches/jaspi/modules/server/src/main/java/org/jboss/wsf/stack/cxf/configuration/BusHolder.java 2014-02-12 10:18:01 UTC (rev 18339)
+++ stack/cxf/branches/jaspi/modules/server/src/main/java/org/jboss/wsf/stack/cxf/configuration/BusHolder.java 2014-02-12 13:18:39 UTC (rev 18340)
@@ -24,8 +24,14 @@
import java.util.HashMap;
import java.util.List;
import java.util.Map;
+import java.util.Properties;
import java.util.Map.Entry;
+import javax.security.auth.message.config.AuthConfigFactory;
+import javax.security.auth.message.config.AuthConfigProvider;
+import javax.security.auth.message.config.ServerAuthConfig;
+import javax.security.auth.message.config.ServerAuthContext;
+
import org.apache.cxf.Bus;
import org.apache.cxf.buslifecycle.BusLifeCycleListener;
import org.apache.cxf.buslifecycle.BusLifeCycleManager;
@@ -48,6 +54,12 @@
import org.apache.cxf.ws.policy.AlternativeSelector;
import org.apache.cxf.ws.policy.PolicyEngine;
import org.apache.cxf.ws.policy.selector.MaximalAlternativeSelector;
+import org.jboss.security.auth.callback.JBossCallbackHandler;
+import org.jboss.security.auth.login.AuthenticationInfo;
+import org.jboss.security.auth.login.BaseAuthenticationInfo;
+import org.jboss.security.auth.login.JASPIAuthenticationInfo;
+import org.jboss.security.config.ApplicationPolicy;
+import org.jboss.security.config.SecurityConfiguration;
import org.jboss.ws.api.annotation.PolicySets;
import org.jboss.ws.api.binding.BindingCustomization;
import org.jboss.wsf.spi.deployment.AnnotationsInfo;
@@ -55,6 +67,7 @@
import org.jboss.wsf.spi.deployment.Endpoint;
import org.jboss.wsf.spi.deployment.UnifiedVirtualFile;
import org.jboss.wsf.spi.metadata.webservices.JBossWebservicesMetaData;
+import org.jboss.wsf.stack.cxf.Loggers;
import org.jboss.wsf.stack.cxf.client.Constants;
import org.jboss.wsf.stack.cxf.deployment.WSDLFilePublisher;
import org.jboss.wsf.stack.cxf.extensions.policy.PolicySetsAnnotationListener;
@@ -65,6 +78,8 @@
import org.jboss.wsf.stack.cxf.interceptor.JaspiSeverOutInterceptor;
import org.jboss.wsf.stack.cxf.interceptor.NsCtxSelectorStoreInterceptor;
import org.jboss.wsf.stack.cxf.jaspi.JaspiServerAuthenticator;
+import org.jboss.wsf.stack.cxf.jaspi.config.JBossWSAuthConfigProvider;
+import org.jboss.wsf.stack.cxf.jaspi.config.JBossWSAuthConstants;
import org.jboss.wsf.stack.cxf.management.InstrumentationManagerExtImpl;
import org.jboss.wsf.stack.cxf.transport.JBossWSDestinationRegistryImpl;
@@ -103,8 +118,7 @@
* @param wsmd The current JBossWebservicesMetaData, if any
* @param dep The current deployment
*/
- public void configure(ResourceResolver resolver, Configurer configurer, JBossWebservicesMetaData wsmd, Deployment dep, JaspiServerAuthenticator authenticator)
-
+ public void configure(ResourceResolver resolver, Configurer configurer, JBossWebservicesMetaData wsmd, Deployment dep)
{
bus.setProperty(org.jboss.wsf.stack.cxf.client.Constants.DEPLOYMENT_BUS, true);
busHolderListener = new BusHolderLifeCycleListener();
@@ -118,6 +132,7 @@
setInterceptors(bus, props);
+ final JaspiServerAuthenticator authenticator = getJaspiAuthenticator(dep, wsmd);
if (authenticator != null) {
bus.getInInterceptors().add(new JaspiSeverInInterceptor(authenticator));
bus.getOutInterceptors().add(new JaspiSeverOutInterceptor(authenticator));
@@ -291,6 +306,52 @@
return selector;
}
+ private JaspiServerAuthenticator getJaspiAuthenticator(Deployment dep, JBossWebservicesMetaData wsmd) {
+ String securityDomain = null;
+ if (wsmd != null) {
+ securityDomain = wsmd.getProperty(JaspiServerAuthenticator.JASPI_SECURITY_DOMAIN);
+ }
+ if (securityDomain == null) {
+ return null;
+ }
+ ApplicationPolicy appPolicy = SecurityConfiguration.getApplicationPolicy(securityDomain);
+ if (appPolicy == null) {
+ Loggers.ROOT_LOGGER.noApplicationPolicy(securityDomain);
+ return null;
+ }
+ BaseAuthenticationInfo bai = appPolicy.getAuthenticationInfo();
+ if (bai == null || bai instanceof AuthenticationInfo) {
+ Loggers.ROOT_LOGGER.noJaspiApplicationPolicy(securityDomain);
+ return null;
+ }
+ JASPIAuthenticationInfo jai = (JASPIAuthenticationInfo) bai;
+
+ String contextRoot = dep.getService().getContextRoot();
+ String appId = "localhost " + contextRoot;
+ AuthConfigFactory factory = AuthConfigFactory.getFactory();
+ Properties properties = new Properties();
+ AuthConfigProvider provider = new JBossWSAuthConfigProvider(properties, factory);
+ provider = factory.getConfigProvider(JBossWSAuthConstants.SOAP_LAYER, appId, null);
+
+ JBossCallbackHandler callbackHandler = new JBossCallbackHandler();
+ try
+ {
+ ServerAuthConfig serverConfig = provider.getServerAuthConfig(JBossWSAuthConstants.SOAP_LAYER, appId, callbackHandler);
+ Properties serverContextProperties = new Properties();
+ serverContextProperties.put("security-domain", securityDomain);
+ serverContextProperties.put("jaspi-policy", jai);
+ serverContextProperties.put(Bus.class, bus);
+ String authContextID = dep.getSimpleName();
+ ServerAuthContext sctx = serverConfig.getAuthContext(authContextID, null, serverContextProperties);
+ return new JaspiServerAuthenticator(sctx);
+ }
+ catch (Exception e)
+ {
+ Loggers.DEPLOYMENT_LOGGER.cannotCreateServerAuthContext(securityDomain, e);
+ }
+ return null;
+ }
+
private static AutomaticWorkQueue createWorkQueue(String name, Map<String, String> props) {
int mqs = parseInt(props.get(Constants.CXF_QUEUE_MAX_QUEUE_SIZE_PROP), 256);
int initialThreads = parseInt(props.get(Constants.CXF_QUEUE_INITIAL_THREADS_PROP), 0);
Modified: stack/cxf/branches/jaspi/modules/server/src/main/java/org/jboss/wsf/stack/cxf/configuration/NonSpringBusHolder.java
===================================================================
--- stack/cxf/branches/jaspi/modules/server/src/main/java/org/jboss/wsf/stack/cxf/configuration/NonSpringBusHolder.java 2014-02-12 10:18:01 UTC (rev 18339)
+++ stack/cxf/branches/jaspi/modules/server/src/main/java/org/jboss/wsf/stack/cxf/configuration/NonSpringBusHolder.java 2014-02-12 13:18:39 UTC (rev 18340)
@@ -46,7 +46,6 @@
import org.jboss.wsf.stack.cxf.client.configuration.JBossWSNonSpringConfigurer;
import org.jboss.wsf.stack.cxf.deployment.EndpointImpl;
import org.jboss.wsf.stack.cxf.deployment.WSDLFilePublisher;
-import org.jboss.wsf.stack.cxf.jaspi.JaspiServerAuthenticator;
import org.jboss.wsf.stack.cxf.metadata.services.DDBeans;
import org.jboss.wsf.stack.cxf.metadata.services.DDEndpoint;
@@ -85,13 +84,13 @@
*/
@Override
- public void configure(ResourceResolver resolver, Configurer configurer, JBossWebservicesMetaData wsmd, Deployment dep, JaspiServerAuthenticator authenticator)
+ public void configure(ResourceResolver resolver, Configurer configurer, JBossWebservicesMetaData wsmd, Deployment dep)
{
if (configured)
{
throw Messages.MESSAGES.busAlreadyConfigured(bus);
}
- super.configure(resolver, configurer, wsmd, dep, authenticator);
+ super.configure(resolver, configurer, wsmd, dep);
for (DDEndpoint dde : metadata.getEndpoints())
Modified: stack/cxf/branches/jaspi/modules/server/src/main/java/org/jboss/wsf/stack/cxf/configuration/ServerBeanCustomizer.java
===================================================================
--- stack/cxf/branches/jaspi/modules/server/src/main/java/org/jboss/wsf/stack/cxf/configuration/ServerBeanCustomizer.java 2014-02-12 10:18:01 UTC (rev 18339)
+++ stack/cxf/branches/jaspi/modules/server/src/main/java/org/jboss/wsf/stack/cxf/configuration/ServerBeanCustomizer.java 2014-02-12 13:18:39 UTC (rev 18340)
@@ -176,11 +176,7 @@
}
}
- if (endpoint.getProperties().get(JaspiServerAuthenticator.JASPI_SECURITY_DOMAIN) != null) {
- String jaspiSecurityDomain = (String)endpoint.getProperties().get(JaspiServerAuthenticator.JASPI_SECURITY_DOMAIN);
- addJaspiInterceptor(endpoint, jaspiSecurityDomain);
- }
-
+ addJaspiInterceptors(endpoint);
}
}
@@ -216,8 +212,8 @@
this.epConfigFile = epConfigFile;
}
-
- private void addJaspiInterceptor(EndpointImpl endpoint, String securityDomain) {
+ private void addJaspiInterceptors(EndpointImpl endpoint) {
+ String securityDomain = (String)endpoint.getProperties().get(JaspiServerAuthenticator.JASPI_SECURITY_DOMAIN);
if (securityDomain == null) {
return;
}
@@ -256,7 +252,7 @@
}
catch (Exception e)
{
- Loggers.DEPLOYMENT_LOGGER.cannotCreateServerAuthContext(securityDomain);
+ Loggers.DEPLOYMENT_LOGGER.cannotCreateServerAuthContext(securityDomain, e);
}
}
Modified: stack/cxf/branches/jaspi/modules/server/src/main/java/org/jboss/wsf/stack/cxf/configuration/SpringBusHolder.java
===================================================================
--- stack/cxf/branches/jaspi/modules/server/src/main/java/org/jboss/wsf/stack/cxf/configuration/SpringBusHolder.java 2014-02-12 10:18:01 UTC (rev 18339)
+++ stack/cxf/branches/jaspi/modules/server/src/main/java/org/jboss/wsf/stack/cxf/configuration/SpringBusHolder.java 2014-02-12 13:18:39 UTC (rev 18340)
@@ -46,7 +46,6 @@
import org.jboss.wsf.stack.cxf.client.configuration.JBossWSSpringBusFactory;
import org.jboss.wsf.stack.cxf.client.configuration.JBossWSSpringConfigurer;
import org.jboss.wsf.stack.cxf.deployment.WSDLFilePublisher;
-import org.jboss.wsf.stack.cxf.jaspi.JaspiServerAuthenticator;
import org.jboss.wsf.stack.cxf.spring.handler.NamespaceHandlerResolver;
import org.jboss.wsf.stack.cxf.spring.parser.JaxwsEndpointDefinitionParser.JBossWSSpringEndpointImpl;
import org.springframework.beans.factory.xml.XmlBeanDefinitionReader;
@@ -126,15 +125,14 @@
* @param dep The current deployment
*/
@Override
- public void configure(ResourceResolver resolver, Configurer configurer, JBossWebservicesMetaData wsmd, Deployment dep, JaspiServerAuthenticator authenticator)
-
+ public void configure(ResourceResolver resolver, Configurer configurer, JBossWebservicesMetaData wsmd, Deployment dep)
{
if (configured)
{
throw MESSAGES.busAlreadyConfigured(ctx);
}
- super.configure(resolver, configurer, wsmd, dep, authenticator);
+ super.configure(resolver, configurer, wsmd, dep);
GenericApplicationContext jbosswsCxfContext = null;
//load stuff from provided jbossws-cxf.xml DD
Modified: stack/cxf/branches/jaspi/modules/server/src/main/java/org/jboss/wsf/stack/cxf/deployment/aspect/BusDeploymentAspect.java
===================================================================
--- stack/cxf/branches/jaspi/modules/server/src/main/java/org/jboss/wsf/stack/cxf/deployment/aspect/BusDeploymentAspect.java 2014-02-12 10:18:01 UTC (rev 18339)
+++ stack/cxf/branches/jaspi/modules/server/src/main/java/org/jboss/wsf/stack/cxf/deployment/aspect/BusDeploymentAspect.java 2014-02-12 13:18:39 UTC (rev 18340)
@@ -24,23 +24,11 @@
import java.io.IOException;
import java.net.URL;
import java.util.Map;
-import java.util.Properties;
-import javax.security.auth.message.config.AuthConfigFactory;
-import javax.security.auth.message.config.AuthConfigProvider;
-import javax.security.auth.message.config.ServerAuthConfig;
-import javax.security.auth.message.config.ServerAuthContext;
import javax.xml.ws.spi.Provider;
-import org.apache.cxf.Bus;
import org.apache.cxf.BusFactory;
import org.apache.cxf.configuration.Configurer;
-import org.jboss.security.auth.callback.JBossCallbackHandler;
-import org.jboss.security.auth.login.AuthenticationInfo;
-import org.jboss.security.auth.login.BaseAuthenticationInfo;
-import org.jboss.security.auth.login.JASPIAuthenticationInfo;
-import org.jboss.security.config.ApplicationPolicy;
-import org.jboss.security.config.SecurityConfiguration;
import org.jboss.ws.api.binding.BindingCustomization;
import org.jboss.ws.common.integration.AbstractDeploymentAspect;
import org.jboss.ws.common.integration.WSConstants;
@@ -51,15 +39,11 @@
import org.jboss.wsf.spi.deployment.ResourceResolver;
import org.jboss.wsf.spi.metadata.j2ee.JSEArchiveMetaData;
import org.jboss.wsf.spi.metadata.webservices.JBossWebservicesMetaData;
-import org.jboss.wsf.stack.cxf.Loggers;
import org.jboss.wsf.stack.cxf.client.configuration.JBossWSBusFactory;
import org.jboss.wsf.stack.cxf.configuration.BusHolder;
import org.jboss.wsf.stack.cxf.configuration.NonSpringBusHolder;
import org.jboss.wsf.stack.cxf.configuration.SpringBusHolder;
import org.jboss.wsf.stack.cxf.deployment.WSDLFilePublisher;
-import org.jboss.wsf.stack.cxf.jaspi.JaspiServerAuthenticator;
-import org.jboss.wsf.stack.cxf.jaspi.config.JBossWSAuthConfigProvider;
-import org.jboss.wsf.stack.cxf.jaspi.config.JBossWSAuthConstants;
import org.jboss.wsf.stack.cxf.metadata.services.DDBeans;
import org.jboss.wsf.stack.cxf.resolver.JBossWSResourceResolver;
@@ -147,11 +131,9 @@
epConfigFile = wsmd.getConfigFile();
}
- JaspiServerAuthenticator jaspiAuthenticator = getJaspiAuthenticator(dep, wsmd, holder.getBus());
-
Configurer configurer = holder.createServerConfigurer(dep.getAttachment(BindingCustomization.class),
new WSDLFilePublisher(aDep), dep.getService().getEndpoints(), aDep.getRootFile(), epConfigName, epConfigFile);
- holder.configure(resolver, configurer, wsmd, dep, jaspiAuthenticator);
+ holder.configure(resolver, configurer, wsmd, dep);
dep.addAttachment(BusHolder.class, holder);
if (holder instanceof SpringBusHolder)
@@ -168,56 +150,7 @@
SecurityActions.setContextClassLoader(origClassLoader);
}
}
-
- private JaspiServerAuthenticator getJaspiAuthenticator(Deployment dep, JBossWebservicesMetaData wsmd, Bus bus) {
- String securityDomain = null;
- if (wsmd != null) {
- securityDomain = wsmd.getProperty(JaspiServerAuthenticator.JASPI_SECURITY_DOMAIN);
- }
- if (securityDomain == null) {
- return null;
- }
- ApplicationPolicy appPolicy = SecurityConfiguration.getApplicationPolicy(securityDomain);
- if (appPolicy == null) {
- Loggers.ROOT_LOGGER.noApplicationPolicy(securityDomain);
- return null;
- }
- BaseAuthenticationInfo bai = appPolicy.getAuthenticationInfo();
- if (bai == null || bai instanceof AuthenticationInfo) {
- Loggers.ROOT_LOGGER.noJaspiApplicationPolicy(securityDomain);
- return null;
- }
- JASPIAuthenticationInfo jai = (JASPIAuthenticationInfo) bai;
-
- String contextRoot = dep.getService().getContextRoot();
- String appId = "localhost " + contextRoot;
- AuthConfigFactory factory = AuthConfigFactory.getFactory();
- Properties properties = new Properties();
- AuthConfigProvider provider = new JBossWSAuthConfigProvider(properties, factory);
- provider = factory.getConfigProvider(JBossWSAuthConstants.SOAP_LAYER, appId, null);
-
- JBossCallbackHandler callbackHandler = new JBossCallbackHandler();
- try
- {
- ServerAuthConfig serverConfig = provider.getServerAuthConfig(JBossWSAuthConstants.SOAP_LAYER, appId, callbackHandler);
- Properties serverContextProperties = new Properties();
- serverContextProperties.put("security-domain", securityDomain);
- serverContextProperties.put("jaspi-policy", jai);
- serverContextProperties.put(Bus.class, bus);
- String authContextID = dep.getSimpleName();
- ServerAuthContext sctx = serverConfig.getAuthContext(authContextID, null, serverContextProperties);
- return new JaspiServerAuthenticator(sctx);
- }
- catch (Exception e)
- {
- Loggers.DEPLOYMENT_LOGGER.cannotCreateServerAuthContext(securityDomain);
- }
-
- return null;
-
- }
-
private static URL getResourceUrl(final ResourceResolver resolver, final String resourcePath)
{
try
Modified: stack/cxf/branches/jaspi/modules/server/src/main/java/org/jboss/wsf/stack/cxf/interceptor/JaspiSeverInInterceptor.java
===================================================================
--- stack/cxf/branches/jaspi/modules/server/src/main/java/org/jboss/wsf/stack/cxf/interceptor/JaspiSeverInInterceptor.java 2014-02-12 10:18:01 UTC (rev 18339)
+++ stack/cxf/branches/jaspi/modules/server/src/main/java/org/jboss/wsf/stack/cxf/interceptor/JaspiSeverInInterceptor.java 2014-02-12 13:18:39 UTC (rev 18340)
@@ -41,7 +41,8 @@
*/
public class JaspiSeverInInterceptor extends AbstractSoapInterceptor
{
- private JaspiServerAuthenticator authManager;
+ private final JaspiServerAuthenticator authManager;
+
public JaspiSeverInInterceptor(JaspiServerAuthenticator authManager)
{
super(Phase.PRE_PROTOCOL);
Modified: stack/cxf/branches/jaspi/modules/server/src/main/java/org/jboss/wsf/stack/cxf/interceptor/JaspiSeverOutInterceptor.java
===================================================================
--- stack/cxf/branches/jaspi/modules/server/src/main/java/org/jboss/wsf/stack/cxf/interceptor/JaspiSeverOutInterceptor.java 2014-02-12 10:18:01 UTC (rev 18339)
+++ stack/cxf/branches/jaspi/modules/server/src/main/java/org/jboss/wsf/stack/cxf/interceptor/JaspiSeverOutInterceptor.java 2014-02-12 13:18:39 UTC (rev 18340)
@@ -41,7 +41,7 @@
*/
public class JaspiSeverOutInterceptor extends AbstractSoapInterceptor
{
- private JaspiServerAuthenticator authManager;
+ private final JaspiServerAuthenticator authManager;
private static final SAAJOutInterceptor SAAJ_OUT = new SAAJOutInterceptor();
public JaspiSeverOutInterceptor(JaspiServerAuthenticator authManager)
@@ -91,9 +91,7 @@
return;
}
authManager.secureResponse(message);
-
}
-
}
}
Modified: stack/cxf/branches/jaspi/modules/server/src/main/java/org/jboss/wsf/stack/cxf/jaspi/JaspiServerAuthenticator.java
===================================================================
--- stack/cxf/branches/jaspi/modules/server/src/main/java/org/jboss/wsf/stack/cxf/jaspi/JaspiServerAuthenticator.java 2014-02-12 10:18:01 UTC (rev 18339)
+++ stack/cxf/branches/jaspi/modules/server/src/main/java/org/jboss/wsf/stack/cxf/jaspi/JaspiServerAuthenticator.java 2014-02-12 13:18:39 UTC (rev 18340)
@@ -45,7 +45,7 @@
*/
public class JaspiServerAuthenticator {
public static final String JASPI_SECURITY_DOMAIN = "jaspi.security.domain";
- private ServerAuthContext sctx;
+ private final ServerAuthContext sctx;
public JaspiServerAuthenticator(ServerAuthContext sctx) {
this.sctx = sctx;
Modified: stack/cxf/branches/jaspi/modules/server/src/main/java/org/jboss/wsf/stack/cxf/jaspi/module/UsernameTokenServerAuthModule.java
===================================================================
--- stack/cxf/branches/jaspi/modules/server/src/main/java/org/jboss/wsf/stack/cxf/jaspi/module/UsernameTokenServerAuthModule.java 2014-02-12 10:18:01 UTC (rev 18339)
+++ stack/cxf/branches/jaspi/modules/server/src/main/java/org/jboss/wsf/stack/cxf/jaspi/module/UsernameTokenServerAuthModule.java 2014-02-12 13:18:39 UTC (rev 18340)
@@ -42,19 +42,17 @@
*/
public class UsernameTokenServerAuthModule extends AbstractServerAuthModule
{
- private String securityDomainName = null;
- private javax.xml.ws.Endpoint endpoint = null;
- private Bus bus = null;
- private InterceptorProvider ip = null;
+ private final String securityDomainName;
@SuppressWarnings("rawtypes")
public void initialize(MessagePolicy requestPolicy, MessagePolicy responsePolicy, CallbackHandler handler, Map options) throws AuthException
{
super.initialize(requestPolicy, responsePolicy, handler, options);
- endpoint = (javax.xml.ws.Endpoint)options.get(javax.xml.ws.Endpoint.class);
+ final javax.xml.ws.Endpoint endpoint = (javax.xml.ws.Endpoint)options.get(javax.xml.ws.Endpoint.class);
+ InterceptorProvider ip = null;
if (endpoint == null && options.get(Bus.class) != null)
{
- bus = (Bus)options.get(Bus.class);
+ final Bus bus = (Bus)options.get(Bus.class);
bus.setProperty(SecurityConstants.VALIDATE_TOKEN, false);
ip = (InterceptorProvider)bus;
}
@@ -74,6 +72,7 @@
{
supportedTypes.add(Object.class);
supportedTypes.add(SOAPMessage.class);
+ securityDomainName = null;
}
public UsernameTokenServerAuthModule(String lmshName)
Modified: stack/cxf/branches/jaspi/modules/server/src/main/java/org/jboss/wsf/stack/cxf/security/authentication/JaspiSubjectCreatingInterceptor.java
===================================================================
--- stack/cxf/branches/jaspi/modules/server/src/main/java/org/jboss/wsf/stack/cxf/security/authentication/JaspiSubjectCreatingInterceptor.java 2014-02-12 10:18:01 UTC (rev 18339)
+++ stack/cxf/branches/jaspi/modules/server/src/main/java/org/jboss/wsf/stack/cxf/security/authentication/JaspiSubjectCreatingInterceptor.java 2014-02-12 13:18:39 UTC (rev 18340)
@@ -13,14 +13,12 @@
import org.apache.ws.security.WSUsernameTokenPrincipal;
import org.jboss.security.auth.callback.JBossCallbackHandler;
import org.jboss.security.plugins.JBossAuthenticationManager;
-import org.jboss.wsf.spi.deployment.Endpoint;
-import org.jboss.wsf.spi.security.SecurityDomainContext;
import org.jboss.wsf.stack.cxf.Loggers;
import org.jboss.wsf.stack.cxf.Messages;
public class JaspiSubjectCreatingInterceptor extends SubjectCreatingPolicyInterceptor
{
- private JBossAuthenticationManager authenticationManger;
+ private final JBossAuthenticationManager authenticationManger;
public JaspiSubjectCreatingInterceptor(String securityDomain) {
super();
@@ -31,8 +29,6 @@
@Override
public void handleMessage(Message message) throws Fault
{
- Endpoint ep = message.getExchange().get(Endpoint.class);
- SecurityDomainContext sdc = ep.getSecurityDomainContext();
SecurityContext context = message.get(SecurityContext.class);
if (context == null || context.getUserPrincipal() == null)
{
@@ -50,7 +46,7 @@
throw Messages.MESSAGES.unsupportedTokenType(token.getTokenType());
}
UsernameToken ut = (UsernameToken) token;
- subject = helper.createSubject(authenticationManger,ut.getName(), ut.getPassword(), ut.isHashed(), ut.getNonce(), ut.getCreatedTime());
+ subject = helper.createSubject(authenticationManger, ut.getName(), ut.getPassword(), ut.isHashed(), ut.getNonce(), ut.getCreatedTime());
}
else
@@ -61,7 +57,7 @@
throw Messages.MESSAGES.couldNotGetSubjectInfo();
}
WSUsernameTokenPrincipal up = (WSUsernameTokenPrincipal) p;
- subject = createSubject(sdc, up.getName(), up.getPassword(), up.isPasswordDigest(), up.getNonce(), up.getCreatedTime());
+ subject = helper.createSubject(authenticationManger, up.getName(), up.getPassword(), up.isPasswordDigest(), up.getNonce(), up.getCreatedTime());
}
Principal principal = getPrincipal(context.getUserPrincipal(), subject);
Modified: stack/cxf/branches/jaspi/modules/server/src/test/java/org/jboss/wsf/stack/cxf/configuration/BusHolderTest.java
===================================================================
--- stack/cxf/branches/jaspi/modules/server/src/test/java/org/jboss/wsf/stack/cxf/configuration/BusHolderTest.java 2014-02-12 10:18:01 UTC (rev 18339)
+++ stack/cxf/branches/jaspi/modules/server/src/test/java/org/jboss/wsf/stack/cxf/configuration/BusHolderTest.java 2014-02-12 13:18:39 UTC (rev 18340)
@@ -69,7 +69,7 @@
}
BusHolder holder = new NonSpringBusHolder(new DDBeans());
try {
- holder.configure(null, null, wsmd, new DefaultDeploymentModelFactory().newDeployment("testDeployment", null), null);
+ holder.configure(null, null, wsmd, new DefaultDeploymentModelFactory().newDeployment("testDeployment", null));
return holder.getBus().getExtension(PolicyEngine.class).getAlternativeSelector().getClass().getName();
} finally {
holder.close();
Modified: stack/cxf/branches/jaspi/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/cxf/jbws3098/BusHolderLifeCycleTestCase.java
===================================================================
--- stack/cxf/branches/jaspi/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/cxf/jbws3098/BusHolderLifeCycleTestCase.java 2014-02-12 10:18:01 UTC (rev 18339)
+++ stack/cxf/branches/jaspi/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/cxf/jbws3098/BusHolderLifeCycleTestCase.java 2014-02-12 13:18:39 UTC (rev 18340)
@@ -64,7 +64,7 @@
Bus bus = holder.getBus();
TestLifeCycleListener listener = new TestLifeCycleListener();
bus.getExtension(BusLifeCycleManager.class).registerLifeCycleListener(listener);
- holder.configure(null, null, null, new DefaultDeploymentModelFactory().newDeployment("testDeployment", null), null);
+ holder.configure(null, null, null, new DefaultDeploymentModelFactory().newDeployment("testDeployment", null));
holder.close();
assertEquals("preShutdown method on listener should be called exactly once; number of actual calls: "
+ listener.getCount(), 1, listener.getCount());
@@ -75,7 +75,7 @@
Bus bus = holder.getBus();
TestLifeCycleListener listener = new TestLifeCycleListener();
bus.getExtension(BusLifeCycleManager.class).registerLifeCycleListener(listener);
- holder.configure(null, null, null, new DefaultDeploymentModelFactory().newDeployment("testDeployment", null), null);
+ holder.configure(null, null, null, new DefaultDeploymentModelFactory().newDeployment("testDeployment", null));
bus.shutdown(true);
holder.close();
assertEquals("preShutdown method on listener should be called exactly once; number of actual calls: "
@@ -87,7 +87,7 @@
Bus bus = holder.getBus();
TestLifeCycleListener listener = new TestLifeCycleListener();
bus.getExtension(BusLifeCycleManager.class).registerLifeCycleListener(listener);
- holder.configure(null, null, null, new DefaultDeploymentModelFactory().newDeployment("testDeployment", null), null);
+ holder.configure(null, null, null, new DefaultDeploymentModelFactory().newDeployment("testDeployment", null));
assertEquals("preShutdown method on listener shouldn't be called before holder is closed: number of actual calls: "
+ listener.getCount(), 0, listener.getCount());
holder.close();
10 years, 2 months
JBossWS SVN: r18339 - in stack/cxf/branches/jaspi/modules/testsuite/cxf-tests: src/test/java/org/jboss/test/ws/jaxws/cxf/jbws3098 and 1 other directory.
by jbossws-commits@lists.jboss.org
Author: asoldano
Date: 2014-02-12 05:18:01 -0500 (Wed, 12 Feb 2014)
New Revision: 18339
Modified:
stack/cxf/branches/jaspi/modules/testsuite/cxf-tests/scripts/cxf-samples-jars-jaxws.xml
stack/cxf/branches/jaspi/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/cxf/jbws3098/BusHolderLifeCycleTestCase.java
Log:
Fixing testsuite / compilation issue
Modified: stack/cxf/branches/jaspi/modules/testsuite/cxf-tests/scripts/cxf-samples-jars-jaxws.xml
===================================================================
--- stack/cxf/branches/jaspi/modules/testsuite/cxf-tests/scripts/cxf-samples-jars-jaxws.xml 2014-02-11 09:07:45 UTC (rev 18338)
+++ stack/cxf/branches/jaspi/modules/testsuite/cxf-tests/scripts/cxf-samples-jars-jaxws.xml 2014-02-12 10:18:01 UTC (rev 18339)
@@ -594,7 +594,7 @@
<!-- jaxws-samples-wsse-policy-username -->
<war
- warfile="${tests.output.dir}/test-libs/jaxws-samples--username.war"
+ warfile="${tests.output.dir}/test-libs/jaxws-samples-wsse-policy-username.war"
webxml="${tests.output.dir}/test-resources/jaxws/samples/wsse/policy/basic/username/WEB-INF/web.xml">
<classes dir="${tests.output.dir}/test-classes">
<include name="org/jboss/test/ws/jaxws/samples/wsse/policy/basic/Service*.class"/>
Modified: stack/cxf/branches/jaspi/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/cxf/jbws3098/BusHolderLifeCycleTestCase.java
===================================================================
--- stack/cxf/branches/jaspi/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/cxf/jbws3098/BusHolderLifeCycleTestCase.java 2014-02-11 09:07:45 UTC (rev 18338)
+++ stack/cxf/branches/jaspi/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/cxf/jbws3098/BusHolderLifeCycleTestCase.java 2014-02-12 10:18:01 UTC (rev 18339)
@@ -26,11 +26,7 @@
import org.apache.cxf.Bus;
import org.apache.cxf.buslifecycle.BusLifeCycleListener;
import org.apache.cxf.buslifecycle.BusLifeCycleManager;
-<<<<<<< .working
-import org.jboss.wsf.spi.deployment.Deployment;
-=======
import org.jboss.ws.common.deployment.DefaultDeploymentModelFactory;
->>>>>>> .merge-right.r18336
import org.jboss.wsf.stack.cxf.client.util.SpringUtils;
import org.jboss.wsf.stack.cxf.configuration.BusHolder;
import org.jboss.wsf.stack.cxf.configuration.NonSpringBusHolder;
10 years, 2 months
JBossWS SVN: r18338 - in stack/cxf/branches/jaspi: modules/addons and 58 other directories.
by jbossws-commits@lists.jboss.org
Author: jim.ma
Date: 2014-02-11 04:07:45 -0500 (Tue, 11 Feb 2014)
New Revision: 18338
Added:
stack/cxf/branches/jaspi/modules/addons/transports/http/undertow/
stack/cxf/branches/jaspi/modules/client/src/main/java/org/jboss/wsf/stack/cxf/client/socket/
stack/cxf/branches/jaspi/modules/resources/src/main/resources/modules/wildfly800/org/jboss/ws/cxf/jbossws-cxf-transports-undertow/
stack/cxf/branches/jaspi/modules/resources/src/main/resources/modules/wildfly800/org/jboss/ws/jaxws-undertow-httpspi/
stack/cxf/branches/jaspi/modules/server/src/main/java/org/jboss/wsf/stack/cxf/transport/JBossWSDestinationRegistryImpl.java
stack/cxf/branches/jaspi/modules/testsuite/cxf-spring-tests/src/test/java/org/jboss/test/ws/jaxws/cxf/jbws3670/
stack/cxf/branches/jaspi/modules/testsuite/cxf-spring-tests/src/test/resources/jaxws/cxf/jbws3670/
stack/cxf/branches/jaspi/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/cxf/clientConfig/CXFClientConfigurationTestCaseForked.java
stack/cxf/branches/jaspi/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/cxf/jbws3745/
stack/cxf/branches/jaspi/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/samples/wsse/policy/trust/WSTrustActAsTestCase.java
stack/cxf/branches/jaspi/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/samples/wsse/policy/trust/WSTrustOnBehalfOfTestCase.java
stack/cxf/branches/jaspi/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/samples/wsse/policy/trust/actas/
stack/cxf/branches/jaspi/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/samples/wsse/policy/trust/onbehalfof/
stack/cxf/branches/jaspi/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/samples/wsse/policy/trust/picketlink/
stack/cxf/branches/jaspi/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/samples/wsse/policy/trust/service/
stack/cxf/branches/jaspi/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/samples/wsse/policy/trust/shared/
stack/cxf/branches/jaspi/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/samples/wsse/policy/trust/sts/
stack/cxf/branches/jaspi/modules/testsuite/cxf-tests/src/test/java/org/jboss/wsf/test/CryptoHelper.java
stack/cxf/branches/jaspi/modules/testsuite/cxf-tests/src/test/resources/jaxws/cxf/clientConfig/META-INF/permissions.xml
stack/cxf/branches/jaspi/modules/testsuite/cxf-tests/src/test/resources/jaxws/cxf/jbws3745/
stack/cxf/branches/jaspi/modules/testsuite/cxf-tests/src/test/resources/jaxws/samples/schemavalidation/META-INF/permissions.xml
stack/cxf/branches/jaspi/modules/testsuite/cxf-tests/src/test/resources/jaxws/samples/wsse/policy/trust/META-INF/permissions.xml
stack/cxf/branches/jaspi/modules/testsuite/cxf-tests/src/test/resources/jaxws/samples/wsse/policy/trust/WEB-INF/actasKeystore.properties
stack/cxf/branches/jaspi/modules/testsuite/cxf-tests/src/test/resources/jaxws/samples/wsse/policy/trust/WEB-INF/actasstore.jks
stack/cxf/branches/jaspi/modules/testsuite/cxf-tests/src/test/resources/jaxws/samples/wsse/policy/trust/WEB-INF/wsdl/ActAsService.wsdl
stack/cxf/branches/jaspi/modules/testsuite/cxf-tests/src/test/resources/jaxws/samples/wsse/policy/trust/WEB-INF/wsdl/ActAsService_schema1.xsd
stack/cxf/branches/jaspi/modules/testsuite/cxf-tests/src/test/resources/jaxws/samples/wsse/policy/trust/WEB-INF/wsdl/OnBehalfOfService.wsdl
stack/cxf/branches/jaspi/modules/testsuite/cxf-tests/src/test/resources/jaxws/samples/wsse/policy/trust/WEB-INF/wsdl/OnBehalfOfService_schema1.xsd
stack/cxf/branches/jaspi/modules/testsuite/shared-tests/src/test/java/org/jboss/test/ws/jaxws/clientConfig/ClientConfigurationTestCaseForked.java
stack/cxf/branches/jaspi/modules/testsuite/shared-tests/src/test/java/org/jboss/test/ws/jaxws/jbws3753/
stack/cxf/branches/jaspi/modules/testsuite/shared-tests/src/test/resources/jaxws/clientConfig/META-INF/permissions.xml
stack/cxf/branches/jaspi/modules/testsuite/shared-tests/src/test/resources/jaxws/jbws3753/
stack/cxf/branches/jaspi/modules/testsuite/shared-tests/src/test/resources/jaxws/samples/eardeployment/META-INF/
stack/cxf/branches/jaspi/modules/testsuite/shared-tests/src/test/resources/publish/META-INF/
stack/cxf/branches/jaspi/modules/testsuite/test-utils/src/main/java/org/jboss/wsf/test/CryptoCheckMain.java
Removed:
stack/cxf/branches/jaspi/modules/resources/src/main/resources/modules/jboss710/
stack/cxf/branches/jaspi/modules/resources/src/main/resources/modules/wildfly800/org/jboss/ws/cxf/jbossws-cxf-transports-httpserver/
stack/cxf/branches/jaspi/modules/resources/src/main/resources/modules/wildfly800/org/jboss/ws/jaxws-jboss-httpserver-httpspi/
stack/cxf/branches/jaspi/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/samples/wsse/policy/trust/ClientCallbackHandler.java
stack/cxf/branches/jaspi/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/samples/wsse/policy/trust/PicketLinkSTService.java
stack/cxf/branches/jaspi/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/samples/wsse/policy/trust/STSCallbackHandler.java
stack/cxf/branches/jaspi/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/samples/wsse/policy/trust/SampleSTS.java
stack/cxf/branches/jaspi/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/samples/wsse/policy/trust/ServerCallbackHandler.java
stack/cxf/branches/jaspi/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/samples/wsse/policy/trust/ServiceIface.java
stack/cxf/branches/jaspi/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/samples/wsse/policy/trust/ServiceImpl.java
stack/cxf/branches/jaspi/modules/testsuite/src/test/resources/jboss712/
stack/cxf/branches/jaspi/modules/testsuite/src/test/resources/jboss713/
Modified:
stack/cxf/branches/jaspi/
stack/cxf/branches/jaspi/build.xml
stack/cxf/branches/jaspi/modules/addons/pom.xml
stack/cxf/branches/jaspi/modules/client/pom.xml
stack/cxf/branches/jaspi/modules/client/src/main/java/org/jboss/wsf/stack/cxf/Loggers.java
stack/cxf/branches/jaspi/modules/client/src/main/java/org/jboss/wsf/stack/cxf/Messages.java
stack/cxf/branches/jaspi/modules/client/src/main/java/org/jboss/wsf/stack/cxf/client/ProviderImpl.java
stack/cxf/branches/jaspi/modules/dist/pom.xml
stack/cxf/branches/jaspi/modules/dist/src/main/distro/Install.txt
stack/cxf/branches/jaspi/modules/dist/src/main/distro/ant.properties.example
stack/cxf/branches/jaspi/modules/dist/src/main/distro/build-deploy.xml
stack/cxf/branches/jaspi/modules/dist/src/main/distro/build-setup.xml
stack/cxf/branches/jaspi/modules/dist/src/main/distro/build-testsuite.xml
stack/cxf/branches/jaspi/modules/dist/src/main/distro/build.xml
stack/cxf/branches/jaspi/modules/dist/src/main/scripts/assembly-deploy-artifacts.xml
stack/cxf/branches/jaspi/modules/resources/pom.xml
stack/cxf/branches/jaspi/modules/resources/src/main/resources/modules/wildfly800/org/jboss/as/webservices/server/integration/main/module.xml
stack/cxf/branches/jaspi/modules/resources/src/main/resources/modules/wildfly800/org/jboss/ws/cxf/jbossws-cxf-client/main/module.xml
stack/cxf/branches/jaspi/modules/resources/src/main/resources/modules/wildfly800/org/jboss/ws/cxf/jbossws-cxf-server/main/module.xml
stack/cxf/branches/jaspi/modules/resources/src/main/resources/modules/wildfly800/org/jboss/ws/jaxws-client/main/module.xml
stack/cxf/branches/jaspi/modules/resources/src/main/resources/resources/jbossws-deploy-macros.xml
stack/cxf/branches/jaspi/modules/resources/src/main/resources/resources/modules-deploy.conf
stack/cxf/branches/jaspi/modules/server/src/main/java/org/jboss/wsf/stack/cxf/RequestHandlerImpl.java
stack/cxf/branches/jaspi/modules/server/src/main/java/org/jboss/wsf/stack/cxf/configuration/BusHolder.java
stack/cxf/branches/jaspi/modules/server/src/main/java/org/jboss/wsf/stack/cxf/configuration/NonSpringBusHolder.java
stack/cxf/branches/jaspi/modules/server/src/main/java/org/jboss/wsf/stack/cxf/configuration/ServerBeanCustomizer.java
stack/cxf/branches/jaspi/modules/server/src/main/java/org/jboss/wsf/stack/cxf/configuration/SpringBusHolder.java
stack/cxf/branches/jaspi/modules/server/src/main/java/org/jboss/wsf/stack/cxf/deployment/WSDLFilePublisher.java
stack/cxf/branches/jaspi/modules/server/src/main/java/org/jboss/wsf/stack/cxf/deployment/aspect/BusDeploymentAspect.java
stack/cxf/branches/jaspi/modules/server/src/main/java/org/jboss/wsf/stack/cxf/metadata/MetadataBuilder.java
stack/cxf/branches/jaspi/modules/server/src/main/java/org/jboss/wsf/stack/cxf/transport/ServletHelper.java
stack/cxf/branches/jaspi/modules/server/src/main/scripts/antrun-beans-config.xml
stack/cxf/branches/jaspi/modules/server/src/test/java/org/jboss/wsf/stack/cxf/configuration/BusHolderTest.java
stack/cxf/branches/jaspi/modules/testsuite/cxf-spring-tests/scripts/cxf-jars-jaxws.xml
stack/cxf/branches/jaspi/modules/testsuite/cxf-tests/scripts/cxf-jars-jaxws.xml
stack/cxf/branches/jaspi/modules/testsuite/cxf-tests/scripts/cxf-samples-jars-jaxws.xml
stack/cxf/branches/jaspi/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/cxf/clientConfig/CXFClientConfigurationTestCase.java
stack/cxf/branches/jaspi/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/cxf/clientConfig/Helper.java
stack/cxf/branches/jaspi/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/cxf/clientConfig/TestUtils.java
stack/cxf/branches/jaspi/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/cxf/jbws3098/BusHolderLifeCycleTestCase.java
stack/cxf/branches/jaspi/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/cxf/jbws3648/PolicyAttachmentTestCase.java
stack/cxf/branches/jaspi/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/samples/schemavalidation/DefaultSchemaValidationTestCaseForked.java
stack/cxf/branches/jaspi/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/samples/schemavalidation/Helper.java
stack/cxf/branches/jaspi/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/samples/wsdd/WSDiscoveryTestCase.java
stack/cxf/branches/jaspi/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/samples/wsse/policy/basic/AnnotatedSignEncryptTestCase.java
stack/cxf/branches/jaspi/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/samples/wsse/policy/basic/SignEncryptHelper.java
stack/cxf/branches/jaspi/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/samples/wsse/policy/oasis/WSSecurityPolicyExamples22xTestCase.java
stack/cxf/branches/jaspi/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/samples/wsse/policy/oasis/WSSecurityPolicyExamples23xTestCase.java
stack/cxf/branches/jaspi/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/samples/wsse/policy/trust/WSTrustPicketLinkTestCase.java
stack/cxf/branches/jaspi/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/samples/wsse/policy/trust/WSTrustTestCase.java
stack/cxf/branches/jaspi/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/samples/wsse/policy/trust/WSTrustTestUtils.java
stack/cxf/branches/jaspi/modules/testsuite/cxf-tests/src/test/resources/jaxws/samples/wsse/policy/trust/META-INF/clientstore.jks
stack/cxf/branches/jaspi/modules/testsuite/cxf-tests/src/test/resources/jaxws/samples/wsse/policy/trust/WEB-INF/jbossws-roles.properties
stack/cxf/branches/jaspi/modules/testsuite/cxf-tests/src/test/resources/jaxws/samples/wsse/policy/trust/WEB-INF/jbossws-users.properties
stack/cxf/branches/jaspi/modules/testsuite/cxf-tests/src/test/resources/jaxws/samples/wsse/policy/trust/WEB-INF/web.xml
stack/cxf/branches/jaspi/modules/testsuite/pom.xml
stack/cxf/branches/jaspi/modules/testsuite/shared-tests/src/test/ant-import/build-jars-jaxws.xml
stack/cxf/branches/jaspi/modules/testsuite/shared-tests/src/test/ant-import/build-samples-jaxws.xml
stack/cxf/branches/jaspi/modules/testsuite/shared-tests/src/test/java/org/jboss/test/ws/jaxws/clientConfig/ClientConfigurationTestCase.java
stack/cxf/branches/jaspi/modules/testsuite/shared-tests/src/test/java/org/jboss/test/ws/jaxws/clientConfig/Helper.java
stack/cxf/branches/jaspi/modules/testsuite/shared-tests/src/test/java/org/jboss/test/ws/jaxws/clientConfig/TestUtils.java
stack/cxf/branches/jaspi/modules/testsuite/shared-tests/src/test/java/org/jboss/test/ws/jaxws/jbws2241/JBWS2241TestCase.java
stack/cxf/branches/jaspi/modules/testsuite/shared-tests/src/test/java/org/jboss/test/ws/publish/EndpointPublishServlet.java
stack/cxf/branches/jaspi/modules/testsuite/test-utils/pom.xml
stack/cxf/branches/jaspi/modules/testsuite/test-utils/src/main/java/org/jboss/wsf/test/JBossWSTest.java
stack/cxf/branches/jaspi/modules/testsuite/test-utils/src/main/java/org/jboss/wsf/test/JBossWSTestHelper.java
stack/cxf/branches/jaspi/pom.xml
Log:
svn merge cxf trunk
Property changes on: stack/cxf/branches/jaspi
___________________________________________________________________
Modified: svn:mergeinfo
- /stack/cxf/branches/asoldano:14032-14050,14068
/stack/cxf/branches/ropalka:16301-16305,16966-17008
/stack/cxf/branches/ropalka_JBWS-3550:16747-16757
/stack/cxf/trunk:18054-18152
+ /stack/cxf/branches/asoldano:14032-14050,14068
/stack/cxf/branches/ropalka:16301-16305,16966-17008
/stack/cxf/branches/ropalka_JBWS-3550:16747-16757
/stack/cxf/trunk:18054-18336
Modified: stack/cxf/branches/jaspi/build.xml
===================================================================
--- stack/cxf/branches/jaspi/build.xml 2014-02-11 09:00:46 UTC (rev 18337)
+++ stack/cxf/branches/jaspi/build.xml 2014-02-11 09:07:45 UTC (rev 18338)
@@ -68,12 +68,6 @@
<arg line="${maven.opts} help:effective-settings"/>
</exec>
<xmlproperty file="${dist.output.dir}/effective-settings.xml" keeproot="false"/>
- <condition property="jboss712.home" value="${profiles.profile.properties.jboss712.home}">
- <isset property="profiles.profile.properties.jboss712.home"/>
- </condition>
- <condition property="jboss713.home" value="${profiles.profile.properties.jboss713.home}">
- <isset property="profiles.profile.properties.jboss713.home"/>
- </condition>
<condition property="jboss720.home" value="${profiles.profile.properties.jboss720.home}">
<isset property="profiles.profile.properties.jboss720.home"/>
</condition>
@@ -82,16 +76,10 @@
</condition>
- <fail message="Application server home not set, jboss712.home=value, jboss713.home=value, jboss720.home=value or wildfly800.home=value to set">
+ <fail message="Application server home not set, jboss720.home=value or wildfly800.home=value to set">
<condition>
<and>
<not>
- <isset property="jboss712.home"/>
- </not>
- <not>
- <isset property="jboss713.home"/>
- </not>
- <not>
<isset property="jboss720.home"/>
</not>
<not>
@@ -102,8 +90,6 @@
</fail>
<echo/>
- <echo message="jboss712.home=${jboss712.home}"/>
- <echo message="jboss713.home=${jboss713.home}"/>
<echo message="jboss720.home=${jboss720.home}"/>
<echo message="wildfly800.home=${wildfly800.home}"/>
</target>
Modified: stack/cxf/branches/jaspi/modules/addons/pom.xml
===================================================================
--- stack/cxf/branches/jaspi/modules/addons/pom.xml 2014-02-11 09:00:46 UTC (rev 18337)
+++ stack/cxf/branches/jaspi/modules/addons/pom.xml 2014-02-11 09:07:45 UTC (rev 18338)
@@ -17,6 +17,7 @@
<!-- Modules -->
<modules>
<module>transports/http/httpserver</module>
+ <module>transports/http/undertow</module>
<module>transports/udp</module>
</modules>
Property changes on: stack/cxf/branches/jaspi/modules/addons/transports/http/undertow
___________________________________________________________________
Added: svn:ignore
+ target
.project
.classpath
.settings
Modified: stack/cxf/branches/jaspi/modules/client/pom.xml
===================================================================
--- stack/cxf/branches/jaspi/modules/client/pom.xml 2014-02-11 09:00:46 UTC (rev 18337)
+++ stack/cxf/branches/jaspi/modules/client/pom.xml 2014-02-11 09:07:45 UTC (rev 18338)
@@ -228,9 +228,16 @@
<dependency>
<groupId>org.jboss.spec.javax.security.auth.message</groupId>
<artifactId>jboss-jaspi-api_1.1_spec</artifactId>
+ </dependency>
+ <!-- [JBWS-3722] Explicit JAXB dependencies to ensure the dependency management from jbossws-cxf pom.xml applies -->
+ <dependency>
+ <groupId>com.sun.xml.bind</groupId>
+ <artifactId>jaxb-impl</artifactId>
</dependency>
-
-
+ <dependency>
+ <groupId>com.sun.xml.bind</groupId>
+ <artifactId>jaxb-xjc</artifactId>
+ </dependency>
<!-- jboss provided -->
<dependency>
<groupId>org.jboss</groupId>
Modified: stack/cxf/branches/jaspi/modules/client/src/main/java/org/jboss/wsf/stack/cxf/Loggers.java
===================================================================
--- stack/cxf/branches/jaspi/modules/client/src/main/java/org/jboss/wsf/stack/cxf/Loggers.java 2014-02-11 09:00:46 UTC (rev 18337)
+++ stack/cxf/branches/jaspi/modules/client/src/main/java/org/jboss/wsf/stack/cxf/Loggers.java 2014-02-11 09:07:45 UTC (rev 18338)
@@ -210,15 +210,30 @@
void unknownJAXWSClientBusStrategy(String strategy);
@LogMessage(level = WARN)
- @Message(id = 24097, value = "No application policy found for security domain '%s'")
+ @Message(id = 24097, value = "Could not delete wsdl file %s")
+ void couldNotDeleteWsdlFile(String filename);
+
+ @LogMessage(level = DEBUG)
+ @Message(id = 24098, value = "Deleted wsdl file %s")
+ void deletedWsdlFile(String filename);
+
+ @LogMessage(level = WARN)
+ @Message(id = 24099, value = "Could not create wsdl data path.")
+ void couldNotCreateWsdlDataPath();
+
+ @LogMessage(level = WARN)
+ @Message(id = 24100, value = "Could not delete wsdl directory %s")
+ void couldNotDeleteWsdlDirectory(String filename);
+
+ @LogMessage(level = WARN)
+ @Message(id = 24102, value = "No application policy found for security domain '%s'")
void noApplicationPolicy(String securityDomain);
@LogMessage(level = WARN)
- @Message(id = 24098, value = "No JASPIAuthenticationInfo found for security domain '%s'")
+ @Message(id = 24103, value = "No JASPIAuthenticationInfo found for security domain '%s'")
void noJaspiApplicationPolicy(String securityDomain);
@LogMessage(level = WARN)
- @Message(id = 24099, value = "Can not create Jaspi ServerAuthContext for security domain '%s'")
+ @Message(id = 24104, value = "Can not create Jaspi ServerAuthContext for security domain '%s'")
void cannotCreateServerAuthContext(String securityDomain);
-
}
Modified: stack/cxf/branches/jaspi/modules/client/src/main/java/org/jboss/wsf/stack/cxf/Messages.java
===================================================================
--- stack/cxf/branches/jaspi/modules/client/src/main/java/org/jboss/wsf/stack/cxf/Messages.java 2014-02-11 09:00:46 UTC (rev 18337)
+++ stack/cxf/branches/jaspi/modules/client/src/main/java/org/jboss/wsf/stack/cxf/Messages.java 2014-02-11 09:07:45 UTC (rev 18338)
@@ -35,6 +35,7 @@
import org.jboss.logging.MessageBundle;
import org.jboss.wsf.spi.deployment.Deployment;
import org.jboss.wsf.spi.deployment.DeploymentType;
+import org.jboss.wsf.spi.deployment.WSFDeploymentException;
/**
* JBossWS-CXF exception messages
@@ -220,5 +221,8 @@
@Message(id = 24096, value = "Multiple incompatible JAXWS client Bus features provided")
IllegalArgumentException incompatibleJAXWSClientBusFeatureProvided();
+
+ @Message(id = 24101, value = "Could not find endpoint config name: %s")
+ WSFDeploymentException couldNotFindEndpointConfigName(String name);
}
Modified: stack/cxf/branches/jaspi/modules/client/src/main/java/org/jboss/wsf/stack/cxf/client/ProviderImpl.java
===================================================================
--- stack/cxf/branches/jaspi/modules/client/src/main/java/org/jboss/wsf/stack/cxf/client/ProviderImpl.java 2014-02-11 09:00:46 UTC (rev 18337)
+++ stack/cxf/branches/jaspi/modules/client/src/main/java/org/jboss/wsf/stack/cxf/client/ProviderImpl.java 2014-02-11 09:07:45 UTC (rev 18338)
@@ -32,13 +32,8 @@
import java.security.PrivilegedAction;
import java.util.List;
import java.util.Map;
-import java.util.Properties;
import java.util.concurrent.Executor;
-import javax.security.auth.message.config.AuthConfigFactory;
-import javax.security.auth.message.config.AuthConfigProvider;
-import javax.security.auth.message.config.ClientAuthConfig;
-import javax.security.auth.message.config.ServerAuthConfig;
import javax.xml.bind.JAXBContext;
import javax.xml.namespace.QName;
import javax.xml.transform.Source;
@@ -60,30 +55,17 @@
import org.apache.cxf.jaxws.DispatchImpl;
import org.apache.cxf.jaxws.ServiceImpl;
import org.apache.cxf.ws.addressing.EndpointReferenceType;
-import org.jboss.security.auth.callback.JBossCallbackHandler;
-import org.jboss.security.auth.login.AuthenticationInfo;
-import org.jboss.security.auth.login.BaseAuthenticationInfo;
-import org.jboss.security.auth.login.JASPIAuthenticationInfo;
-import org.jboss.security.config.ApplicationPolicy;
-import org.jboss.security.config.SecurityConfiguration;
import org.jboss.ws.api.configuration.AbstractClientFeature;
+import org.jboss.ws.common.management.AbstractServerConfig;
import org.jboss.ws.common.utils.DelegateClassLoader;
-import org.jboss.wsf.spi.SPIProvider;
import org.jboss.wsf.spi.classloading.ClassLoaderProvider;
-import org.jboss.wsf.spi.deployment.Deployment;
import org.jboss.wsf.spi.management.ServerConfig;
-import org.jboss.wsf.spi.management.ServerConfigFactory;
import org.jboss.wsf.spi.metadata.config.ClientConfig;
import org.jboss.wsf.stack.cxf.Loggers;
import org.jboss.wsf.stack.cxf.Messages;
import org.jboss.wsf.stack.cxf.client.configuration.CXFClientConfigurer;
import org.jboss.wsf.stack.cxf.client.configuration.HandlerChainSortInterceptor;
import org.jboss.wsf.stack.cxf.client.configuration.JBossWSBusFactory;
-import org.jboss.wsf.stack.cxf.client.jaspi.JaspiClientAuthenticator;
-import org.jboss.wsf.stack.cxf.client.jaspi.JaspiClientInInterceptor;
-import org.jboss.wsf.stack.cxf.client.jaspi.JaspiClientOutInterceptor;
-import org.jboss.wsf.stack.cxf.jaspi.config.JBossWSAuthConfigProvider;
-import org.jboss.wsf.stack.cxf.jaspi.config.JBossWSAuthConstants;
import org.w3c.dom.Element;
/**
@@ -183,16 +165,6 @@
*/
public class ProviderImpl extends org.apache.cxf.jaxws22.spi.ProviderImpl
{
- private static final boolean jbossModulesEnv;
- private static ServerConfig serverConfig = null;
- private static boolean serverConfigInit = false;
-
- static {
- //check if running in a JBoss Modules environment: the jbossws-cxf and cxf classes come
- //from different classloader when using jboss-modules (no flat classloader)
- jbossModulesEnv = (ProviderImpl.class.getClassLoader() != org.apache.cxf.jaxws22.spi.ProviderImpl.class.getClassLoader());
- }
-
@Override
protected org.apache.cxf.jaxws.EndpointImpl createEndpointImpl(Bus bus, String bindingId, Object implementor,
WebServiceFeature... features)
@@ -604,16 +576,15 @@
Client client = obj instanceof DispatchImpl<?> ? ((DispatchImpl<?>)obj).getClient() : ClientProxy.getClient(obj);
client.getOutInterceptors().add(new HandlerChainSortInterceptor(binding));
-
- if (jbossModulesEnv) { //optimization for avoiding checking for a server config when we know for sure we're out-of-container
+
+ if (ClassLoaderProvider.isSet()) { //optimization for avoiding checking for a server config when we know for sure we're out-of-container
ServerConfig sc = getServerConfig();
if (sc != null) {
- for (ClientConfig config : sc.getClientConfigs()) {
- if (config.getConfigName().equals(ClientConfig.STANDARD_CLIENT_CONFIG)) {
- CXFClientConfigurer helper = new CXFClientConfigurer();
- helper.setupConfigHandlers(binding, config);
- helper.setConfigProperties(client, config.getProperties());
- }
+ ClientConfig config = sc.getClientConfig(ClientConfig.STANDARD_CLIENT_CONFIG);
+ if (config != null) {
+ CXFClientConfigurer helper = new CXFClientConfigurer();
+ helper.setupConfigHandlers(binding, config);
+ helper.setConfigProperties(client, config.getProperties());
}
}
}
@@ -625,23 +596,13 @@
}
}
}
- }
-
- //lazy get the server config (and try once per classloader only)
- private static synchronized ServerConfig getServerConfig()
- {
- if (!serverConfigInit)
- {
- try {
- final ClassLoader cl = ClassLoaderProvider.getDefaultProvider().getServerIntegrationClassLoader();
- serverConfig = SPIProvider.getInstance().getSPI(ServerConfigFactory.class, cl).getServerConfig();
- } catch (Exception e) {
- Loggers.ROOT_LOGGER.cannotRetrieveServerConfigIgnoreForClients(e);
- } finally {
- serverConfigInit = true;
+
+ private static ServerConfig getServerConfig() {
+ if(System.getSecurityManager() == null) {
+ return AbstractServerConfig.getServerIntegrationServerConfig();
}
+ return AccessController.doPrivileged(AbstractServerConfig.GET_SERVER_INTEGRATION_SERVER_CONFIG);
}
- return serverConfig;
}
Modified: stack/cxf/branches/jaspi/modules/dist/pom.xml
===================================================================
--- stack/cxf/branches/jaspi/modules/dist/pom.xml 2014-02-11 09:00:46 UTC (rev 18337)
+++ stack/cxf/branches/jaspi/modules/dist/pom.xml 2014-02-11 09:07:45 UTC (rev 18338)
@@ -36,28 +36,20 @@
<dependency>
<groupId>org.jboss.ws.cxf</groupId>
- <artifactId>jbossws-cxf-transports-udp</artifactId>
+ <artifactId>jbossws-cxf-transports-undertow</artifactId>
<version>${project.version}</version>
</dependency>
<dependency>
<groupId>org.jboss.ws.cxf</groupId>
- <artifactId>jbossws-cxf-resources</artifactId>
- <version>${project.version}</version>
- <classifier>jboss712</classifier>
+ <artifactId>jbossws-cxf-transports-udp</artifactId>
+ <version>${project.version}</version>
</dependency>
<dependency>
<groupId>org.jboss.ws.cxf</groupId>
<artifactId>jbossws-cxf-resources</artifactId>
<version>${project.version}</version>
- <classifier>jboss713</classifier>
- </dependency>
-
- <dependency>
- <groupId>org.jboss.ws.cxf</groupId>
- <artifactId>jbossws-cxf-resources</artifactId>
- <version>${project.version}</version>
<classifier>jboss720</classifier>
</dependency>
@@ -132,16 +124,6 @@
<!-- container integration -->
<dependency>
<groupId>org.jboss.ws</groupId>
- <artifactId>jbossws-jboss712-server-integration</artifactId>
- <scope>provided</scope>
- </dependency>
- <dependency>
- <groupId>org.jboss.ws</groupId>
- <artifactId>jbossws-jboss713-server-integration</artifactId>
- <scope>provided</scope>
- </dependency>
- <dependency>
- <groupId>org.jboss.ws</groupId>
<artifactId>jbossws-jboss720-server-integration</artifactId>
<scope>provided</scope>
</dependency>
@@ -204,12 +186,6 @@
<configuration>
<target>
<mkdir dir="${basedir}/target/exclude-file" />
- <xslt style="${basedir}/src/main/distro/test-exclude.xsl" in="../testsuite/pom.xml" out="${basedir}/target/exclude-file/test-excludes-jboss712.txt">
- <param name="targetName" expression="jboss712" />
- </xslt>
- <xslt style="${basedir}/src/main/distro/test-exclude.xsl" in="../testsuite/pom.xml" out="${basedir}/target/exclude-file/test-excludes-jboss713.txt">
- <param name="targetName" expression="jboss713" />
- </xslt>
<xslt style="${basedir}/src/main/distro/test-exclude.xsl" in="../testsuite/pom.xml" out="${basedir}/target/exclude-file/test-excludes-jboss720.txt">
<param name="targetName" expression="jboss720" />
</xslt>
@@ -244,16 +220,6 @@
<!-- Libraries required for running binary distro testsuite and not available on server-->
<dependency>
<groupId>org.jboss.ws</groupId>
- <artifactId>jbossws-jboss712-tests-integration</artifactId>
- <scope>provided</scope>
- </dependency>
- <dependency>
- <groupId>org.jboss.ws</groupId>
- <artifactId>jbossws-jboss713-tests-integration</artifactId>
- <scope>provided</scope>
- </dependency>
- <dependency>
- <groupId>org.jboss.ws</groupId>
<artifactId>jbossws-jboss720-tests-integration</artifactId>
<scope>provided</scope>
</dependency>
Modified: stack/cxf/branches/jaspi/modules/dist/src/main/distro/Install.txt
===================================================================
--- stack/cxf/branches/jaspi/modules/dist/src/main/distro/Install.txt 2014-02-11 09:00:46 UTC (rev 18337)
+++ stack/cxf/branches/jaspi/modules/dist/src/main/distro/Install.txt 2014-02-11 09:07:45 UTC (rev 18338)
@@ -13,8 +13,6 @@
2.) Modify the target container location in ant.properties
3.) Execute one of the following
- ant deploy-jboss712
- ant deploy-jboss713
ant deploy-jboss720
ant deploy-wildfly800
@@ -22,7 +20,7 @@
server. In order to do that, please add the -Dspring=true property option when
running the ant script:
- ant -Dspring=true deploy-jboss713
+ ant -Dspring=true deploy-jboss720
Please note Spring is required for advanced configuration only, whenever users
want to provide their own jbossws-cxf.xml Spring configuration file.
Modified: stack/cxf/branches/jaspi/modules/dist/src/main/distro/ant.properties.example
===================================================================
--- stack/cxf/branches/jaspi/modules/dist/src/main/distro/ant.properties.example 2014-02-11 09:00:46 UTC (rev 18337)
+++ stack/cxf/branches/jaspi/modules/dist/src/main/distro/ant.properties.example 2014-02-11 09:07:45 UTC (rev 18338)
@@ -3,13 +3,11 @@
#
# Optional JBoss Home
-jboss712.home=(a)jboss712.home@
-jboss713.home=(a)jboss713.home@
jboss720.home=(a)jboss720.home@
wildfly800.home=(a)wildfly800.home@
# The JBoss server under test. This can be [jboss712|jboss713|jboss720|wildfly800]
-jbossws.integration.target=jboss713
+jbossws.integration.target=jboss720
# The JBoss settings
jboss.bind.address=localhost
Modified: stack/cxf/branches/jaspi/modules/dist/src/main/distro/build-deploy.xml
===================================================================
--- stack/cxf/branches/jaspi/modules/dist/src/main/distro/build-deploy.xml 2014-02-11 09:00:46 UTC (rev 18337)
+++ stack/cxf/branches/jaspi/modules/dist/src/main/distro/build-deploy.xml 2014-02-11 09:07:45 UTC (rev 18338)
@@ -25,98 +25,6 @@
<project>
<!-- ================================================================== -->
- <!-- Prepare Deployment Structure JBoss-7.1.x -->
- <!-- ================================================================== -->
-
- <target name="deploy-structure-jboss71x" depends="prepare-deploy">
- <delete dir="${deploy.structure}"/>
-
- <path id="jboss.ant.tasks.classpath">
- <fileset dir="${deploy.artifacts.dir}">
- <include name="**/jbossws-common-tools.jar"/>
- <include name="**/jandex.jar"/>
- </fileset>
- </path>
- <taskdef name="installModules" classname="org.jboss.ws.tools.ant.InstallModulesTask" classpathref="jboss.ant.tasks.classpath"/>
- <taskdef name="jandex" classname="org.jboss.jandex.JandexAntTask" classpathref="jboss.ant.tasks.classpath"/>
-
- <jandex run="true" verbose="false" newJar="true">
- <fileset dir="${deploy.artifacts.dir}/lib">
- <include name="cxf*security.jar"/>
- </fileset>
- </jandex>
- <antcall target="deploy-jbossws-cxf-modules-as7" inheritall="false">
- <param name="installserver" value="${deploy.structure}/modules"/>
- <param name="thirdpartydir" value="${deploy.artifacts.dir}"/>
- <param name="jbossid" value="${jbossws.integration.target}"/>
- <param name="modules-jbossid" value="jboss710"/>
- </antcall>
- <copy toDir="${deploy.structure}/modules">
- <fileset dir="${deploy.artifacts.dir}/modules/jboss710">
- <include name="**/jboss/as/webservices/**/module.xml"/>
- </fileset>
- </copy>
- </target>
-
- <!-- ================================================================== -->
- <!-- Deployment jboss712 -->
- <!-- ================================================================== -->
-
- <target name="target-jboss712">
- <property name="jbossws.integration.target" value="jboss712"/>
- <echo message="jbossws.integration.target=${jbossws.integration.target}" file="${target.properties.file}"/>
- </target>
-
- <target name="deploy-jboss712" depends="undeploy-jboss712,deploy-structure-jboss71x,check-spring,install-spring-module71x" description="Deploy jbossws to jboss712">
- <fail message="Not available: ${jboss712.available.file}" unless="jboss712.available"/>
- <copy todir="${jboss712.home}" overwrite="true" verbose="true">
- <fileset dir="${deploy.structure}">
- <exclude name="**/jboss/as/webservices/**/module.xml"/>
- </fileset>
- </copy>
- <!-- Install org/jboss/as/webservices module.xml separately since it needs to reference libs already on the AS -->
- <installModules targetDir="${jboss712.home}/modules">
- <fileset dir="${deploy.structure}/modules">
- <include name="**/jboss/as/webservices/**/module.xml"/>
- </fileset>
- </installModules>
- </target>
-
- <target name="undeploy-jboss712" depends="target-jboss712,init" description="Remove jbossws from jboss712">
- <fail message="Not available: ${jboss712.available.file}" unless="jboss712.available"/>
- <macro-undeploy-jbossws-modules targetdir="${jboss712.home}/modules" defaultmodulesconf="${jbossws.default.modules.conf}" modifyjbossintegration="true"/>
- </target>
-
- <!-- ================================================================== -->
- <!-- Deployment jboss713 -->
- <!-- ================================================================== -->
-
- <target name="target-jboss713">
- <property name="jbossws.integration.target" value="jboss713"/>
- <echo message="jbossws.integration.target=${jbossws.integration.target}" file="${target.properties.file}"/>
- </target>
-
- <target name="deploy-jboss713" depends="undeploy-jboss713,deploy-structure-jboss71x,check-spring,install-spring-module71x" description="Deploy jbossws to jboss713">
- <fail message="Not available: ${jboss713.available.file}" unless="jboss713.available"/>
- <copy todir="${jboss713.home}" overwrite="true" verbose="true">
- <fileset dir="${deploy.structure}">
- <exclude name="**/jboss/as/webservices/**/module.xml"/>
- </fileset>
- </copy>
- <!-- Install org/jboss/as/webservices module.xml separately since it needs to reference libs already on the AS -->
- <installModules targetDir="${jboss713.home}/modules">
- <fileset dir="${deploy.structure}/modules">
- <include name="**/jboss/as/webservices/**/module.xml"/>
- </fileset>
- </installModules>
- </target>
-
- <target name="undeploy-jboss713" depends="target-jboss713,init" description="Remove jbossws from jboss713">
- <fail message="Not available: ${jboss713.available.file}" unless="jboss713.available"/>
- <macro-undeploy-jbossws-modules targetdir="${jboss713.home}/modules" defaultmodulesconf="${jbossws.default.modules.conf}" modifyjbossintegration="true"/>
- </target>
-
- <!-- ================================================================== -->
<!-- Prepare Deployment Structure JBoss-7.2.x -->
<!-- ================================================================== -->
@@ -254,14 +162,6 @@
</condition>
</target>
- <target name="install-spring-module71x" if="spring-required">
- <antcall target="deploy-spring-module" inheritall="false">
- <param name="installserver" value="${deploy.structure}/modules"/>
- <param name="thirdpartydir" value="${deploy.artifacts.dir}"/>
- <param name="modules-jbossid" value="jboss710"/>
- </antcall>
- </target>
-
<target name="install-spring-module72x" if="spring-required">
<antcall target="deploy-spring-module" inheritall="false">
<param name="installserver" value="${deploy.structure}/modules/system/layers/base"/>
Modified: stack/cxf/branches/jaspi/modules/dist/src/main/distro/build-setup.xml
===================================================================
--- stack/cxf/branches/jaspi/modules/dist/src/main/distro/build-setup.xml 2014-02-11 09:00:46 UTC (rev 18337)
+++ stack/cxf/branches/jaspi/modules/dist/src/main/distro/build-setup.xml 2014-02-11 09:07:45 UTC (rev 18338)
@@ -33,13 +33,9 @@
<!-- Load jbossws.integration.target properties -->
<property file="${target.properties.file}"/>
- <property name="jboss712.available.file" value="${jboss712.home}/jboss-modules.jar"/>
- <property name="jboss713.available.file" value="${jboss713.home}/jboss-modules.jar"/>
<property name="jboss720.available.file" value="${jboss720.home}/jboss-modules.jar"/>
<property name="wildfly800.available.file" value="${wildfly800.home}/jboss-modules.jar"/>
- <available property="jboss712.available" file="${jboss712.available.file}"/>
- <available property="jboss713.available" file="${jboss713.available.file}"/>
<available property="jboss720.available" file="${jboss720.available.file}"/>
<available property="wildfly800.available" file="${wildfly800.available.file}"/>
Modified: stack/cxf/branches/jaspi/modules/dist/src/main/distro/build-testsuite.xml
===================================================================
--- stack/cxf/branches/jaspi/modules/dist/src/main/distro/build-testsuite.xml 2014-02-11 09:00:46 UTC (rev 18337)
+++ stack/cxf/branches/jaspi/modules/dist/src/main/distro/build-testsuite.xml 2014-02-11 09:07:45 UTC (rev 18338)
@@ -31,12 +31,6 @@
<target name="tests-prepare" depends="prepare">
<!-- Define jboss.home -->
- <condition property="jboss.home" value="${jboss712.home}">
- <equals arg1="${jbossws.integration.target}" arg2="jboss712"/>
- </condition>
- <condition property="jboss.home" value="${jboss713.home}">
- <equals arg1="${jbossws.integration.target}" arg2="jboss713"/>
- </condition>
<condition property="jboss.home" value="${jboss720.home}">
<equals arg1="${jbossws.integration.target}" arg2="jboss720"/>
</condition>
@@ -120,7 +114,7 @@
</tstamp>
</target>
- <target name="tests-classpath" depends="tests-classpath-jboss71x,tests-classpath-jboss72x,tests-classpath-wildfly80x">
+ <target name="tests-classpath" depends="tests-classpath-jboss72x,tests-classpath-wildfly80x">
<path id="tests.javac.classpath">
<path refid="ws.stack.classpath"/>
<path refid="integration.target.javac.classpath"/>
@@ -130,169 +124,6 @@
<path refid="integration.target.client.classpath"/>
</path>
</target>
-
- <target name="tests-classpath-jboss71x" depends="tests-prepare" if="jbossws.integration.jboss71x">
-
- <!-- Java Endorsed -->
- <condition property="endorsed.dirs" value="${jboss.home}/modules/javax/xml/ws/api/main/">
- <isset property="jboss.home"/>
- </condition>
-
- <path id="integration.target.javac.classpath">
- <fileset dir="${jboss.home}/modules/javax/activation/api/main/">
- <include name="activation-*.jar"/>
- </fileset>
- <fileset dir="${jboss.home}/modules/javax/mail/api/main/">
- <include name="mail-*.jar"/>
- </fileset>
- <fileset dir="${jboss.home}/modules/org/jboss/common-core/main/">
- <include name="jboss-common-core-*.jar"/>
- </fileset>
- <fileset dir="${jboss.home}/modules/org/jboss/logging/main/">
- <include name="jboss-logging-*.jar"/>
- </fileset>
- <fileset dir="${jboss.home}/modules/org/picketlink/main/">
- <include name="picketlink-core*.jar"/>
- </fileset>
- <fileset dir="${jboss.home}/modules/javax/ejb/api/main/">
- <include name="jboss-ejb-api_3.1_spec-*.jar"/>
- </fileset>
- <fileset dir="${jboss.home}/modules/org/jboss/ejb3/main/">
- <include name="jboss-ejb3-ext-api-*.jar"/>
- </fileset>
- <fileset dir="${jboss.home}/modules/javax/servlet/api/main/">
- <include name="jboss-servlet-api_3.0_spec-*.jar"/>
- </fileset>
- <fileset dir="${jboss.home}/modules/javax/annotation/api/main/">
- <include name="jboss-annotations-api_1.1_spec-*.jar"/>
- </fileset>
- </path>
-
- <!--
- The 's.client.classpath' contains jars that are available in the target container's client directory.
- There jars apply to all supported stacks. It MUST NOT contains jars from a local thirdparty dir.
-
- The 'ws.stack.classpath' contains jars that come with a specific stack distribution.
- The 's.extra.classpath' contains stack specific jars that are needed to run the stack specific tests.
- -->
- <path id="integration.target.client.classpath">
- <!-- included from thirdparty local dir as it's not installed on AS - START -->
- <pathelement location="${thirdparty.dir}/jbossws-${jbossws.integration.target}-tests-integration.jar"/>
- <!-- included from thirdparty local dir as it's not installed on AS - END -->
- <pathelement location="${jboss.home}/jboss-modules.jar"/>
- <fileset dir="${jboss.home}/modules/org/jboss/logging/main/">
- <include name="jboss-logging-*.jar"/>
- </fileset>
- <fileset dir="${jboss.home}/modules/org/jboss/as/controller/main/">
- <include name="jboss-as-controller-*.jar"/>
- </fileset>
- <fileset dir="${jboss.home}/modules/org/jboss/as/controller-client/main/">
- <include name="jboss-as-controller-client-*.jar"/>
- </fileset>
- <fileset dir="${jboss.home}/modules/org/jboss/as/server/main/">
- <include name="jboss-as-server-*.jar"/>
- </fileset>
- <fileset dir="${jboss.home}/modules/org/jboss/as/protocol/main/">
- <include name="jboss-as-protocol-*.jar"/>
- </fileset>
- <fileset dir="${jboss.home}/modules/org/jboss/dmr/main/">
- <include name="jboss-dmr-*.jar"/>
- </fileset>
- <fileset dir="${jboss.home}/modules/org/jboss/marshalling/main/">
- <include name="jboss-marshalling-*.jar"/>
- </fileset>
- <fileset dir="${jboss.home}/modules/org/slf4j/main/">
- <include name="slf4j-api-*.jar"/>
- </fileset>
- <fileset dir="${jboss.home}/modules/org/slf4j/jcl-over-slf4j/main/">
- <include name="jcl-over-slf4j-*.jar"/>
- </fileset>
- <fileset dir="${jboss.home}/modules/org/slf4j/impl/main/">
- <include name="slf4j-jboss-logmanager-*.jar"/>
- </fileset>
- <fileset dir="${jboss.home}/modules/org/jboss/logmanager/main/">
- <include name="jboss-logmanager-*.jar"/>
- </fileset>
- <fileset dir="${jboss.home}/modules/org/apache/log4j/main/">
- <include name="log4j-*.jar"/>
- </fileset>
- <fileset dir="${jboss.home}/modules/javax/mail/api/main/">
- <include name="mail-*.jar"/>
- </fileset>
- <fileset dir="${jboss.home}/modules/javax/servlet/api/main/">
- <include name="jboss-servlet-api_3.0_spec-*.jar"/>
- </fileset>
- <fileset dir="${jboss.home}/modules/javax/transaction/api/main/">
- <include name="jboss-transaction-api_1.1_spec-*.jar"/>
- </fileset>
- <fileset dir="${jboss.home}/modules/org/jboss/threads/main/">
- <include name="jboss-threads-*.jar"/>
- </fileset>
- <fileset dir="${jboss.home}/modules/org/picketbox/main/">
- <include name="picketbox-*.jar"/>
- </fileset>
- <fileset dir="${jboss.home}/modules/org/picketlink/main/">
- <include name="picketlink-core*.jar"/>
- </fileset>
- <fileset dir="${jboss.home}/modules/javax/ejb/api/main/">
- <include name="jboss-ejb-api_3.1_spec-*.jar"/>
- </fileset>
- <fileset dir="${jboss.home}/modules/org/jboss/ejb-client/main/">
- <include name="jboss-ejb-client-*.jar"/>
- </fileset>
- <fileset dir="${jboss.home}/modules/org/apache/xerces/main/">
- <include name="xercesImpl-*.jar"/>
- </fileset>
- <fileset dir="${jboss.home}/modules/org/jboss/common-core/main/">
- <include name="jboss-common-core-*.jar"/>
- </fileset>
- <fileset dir="${jboss.home}/modules/org/javassist/main/">
- <include name="javassist-*.jar"/>
- </fileset>
- <fileset dir="${jboss.home}/modules/javax/security/jacc/api/main/">
- <include name="jboss-jacc-api*.jar"/>
- </fileset>
- <fileset dir="${jboss.home}/modules/org/jboss/remoting3/main/">
- <include name="jboss-remoting-*.jar"/>
- </fileset>
- <fileset dir="${jboss.home}/modules/org/jboss/marshalling/river/main/">
- <include name="jboss-marshalling-river-*.jar"/>
- </fileset>
- <fileset dir="${jboss.home}/modules/org/jboss/remoting3/remoting-jmx/main/">
- <include name="remoting-jmx-*.jar"/>
- </fileset>
- <fileset dir="${jboss.home}/modules/org/jboss/sasl/main/">
- <include name="jboss-sasl-*.jar"/>
- </fileset>
- <fileset dir="${jboss.home}/modules/org/jboss/netty/main/">
- <include name="netty-*.jar"/>
- </fileset>
- <fileset dir="${jboss.home}/modules/org/jboss/xb/main/">
- <include name="jbossxb-*.jar"/>
- </fileset>
- <fileset dir="${jboss.home}/modules/org/joda/time/main/">
- <include name="joda-time-*.jar"/>
- </fileset>
- <fileset dir="${jboss.home}/modules/org/apache/xalan/main/">
- <include name="serializer-*.jar"/>
- <include name="xalan-*.jar"/>
- </fileset>
- <fileset dir="${jboss.home}/modules/org/codehaus/woodstox/main/">
- <include name="woodstox-core-asl-*.jar"/>
- <include name="stax2-api-*.jar"/>
- </fileset>
- <fileset dir="${jboss.home}/modules/org/jboss/xnio/main/">
- <include name="xnio-api-*.jar"/>
- </fileset>
- <fileset dir="${jboss.home}/modules/org/jboss/xnio/nio/main/">
- <include name="xnio-nio-*.jar"/>
- </fileset>
- <fileset dir="${jboss.home}/modules/org/jboss/remote-naming/main/">
- <include name="jboss-remote-naming-*.jar"/>
- </fileset>
- <pathelement location="${tools.jar}"/>
- </path>
- </target>
<target name="tests-classpath-jboss72x" depends="tests-prepare" if="jbossws.integration.jboss72x">
@@ -339,6 +170,8 @@
The 's.extra.classpath' contains stack specific jars that are needed to run the stack specific tests.
-->
<path id="integration.target.client.classpath">
+ <!-- Use httpserver based transport -->
+ <pathelement location="${thirdparty.dir}/jbossws-cxf-transports-httpserver.jar"/>
<!-- included from thirdparty local dir as it's not installed on AS - START -->
<pathelement location="${thirdparty.dir}/jbossws-${jbossws.integration.target}-tests-integration.jar"/>
<!-- included from thirdparty local dir as it's not installed on AS - END -->
@@ -502,6 +335,8 @@
The 's.extra.classpath' contains stack specific jars that are needed to run the stack specific tests.
-->
<path id="integration.target.client.classpath">
+ <!-- Use undertow based transport -->
+ <pathelement location="${thirdparty.dir}/jbossws-cxf-transports-undertow.jar"/>
<!-- included from thirdparty local dir as it's not installed on AS - START -->
<pathelement location="${thirdparty.dir}/jbossws-${jbossws.integration.target}-tests-integration.jar"/>
<!-- included from thirdparty local dir as it's not installed on AS - END -->
@@ -596,7 +431,7 @@
<fileset dir="${jboss.home}/modules/system/layers/base/org/jboss/sasl/main/">
<include name="jboss-sasl-*.jar"/>
</fileset>
- <fileset dir="${jboss.home}/modules/system/layers/base/org/jboss/netty/main/">
+ <fileset dir="${jboss.home}/modules/system/layers/base/io/netty/main/">
<include name="netty-*.jar"/>
</fileset>
<fileset dir="${jboss.home}/modules/system/layers/base/org/jboss/xb/main/">
Modified: stack/cxf/branches/jaspi/modules/dist/src/main/distro/build.xml
===================================================================
--- stack/cxf/branches/jaspi/modules/dist/src/main/distro/build.xml 2014-02-11 09:00:46 UTC (rev 18337)
+++ stack/cxf/branches/jaspi/modules/dist/src/main/distro/build.xml 2014-02-11 09:07:45 UTC (rev 18338)
@@ -57,13 +57,6 @@
<fail message="jbossws.integration.target not set" unless="jbossws.integration.target"/>
<echo message="integration.target=${jbossws.integration.target}"/>
- <condition property="jbossws.integration.jboss71x" value="true">
- <or>
- <equals arg1="${jbossws.integration.target}" arg2="jboss712"/>
- <equals arg1="${jbossws.integration.target}" arg2="jboss713"/>
- </or>
- </condition>
-
<condition property="jbossws.integration.jboss72x" value="true">
<or>
<equals arg1="${jbossws.integration.target}" arg2="jboss720"/>
@@ -96,6 +89,9 @@
<exclude name="**/jbossws-native-services.jar"/>
<exclude name="**/jbossws-jboss*.jar"/>
<exclude name="**/jbossws-wildfly*.jar"/>
+ <!-- httpserver vs undertow transport selection in build-testsuite (container specific) -->
+ <exclude name="**/jbossws-cxf-transports-httpserver.jar"/>
+ <exclude name="**/jbossws-cxf-transports-undertow.jar"/>
</fileset>
<fileset dir="${thirdparty.dir}">
<exclude name="**/jbossws*.jar"/>
Modified: stack/cxf/branches/jaspi/modules/dist/src/main/scripts/assembly-deploy-artifacts.xml
===================================================================
--- stack/cxf/branches/jaspi/modules/dist/src/main/scripts/assembly-deploy-artifacts.xml 2014-02-11 09:00:46 UTC (rev 18337)
+++ stack/cxf/branches/jaspi/modules/dist/src/main/scripts/assembly-deploy-artifacts.xml 2014-02-11 09:07:45 UTC (rev 18338)
@@ -34,11 +34,14 @@
<include>org.jboss.ws.cxf:jbossws-cxf-factories:jar</include>
<include>org.jboss.ws.cxf:jbossws-cxf-server:jar</include>
<include>org.jboss.ws.cxf:jbossws-cxf-transports-httpserver:jar</include>
+ <include>org.jboss.ws.cxf:jbossws-cxf-transports-undertow:jar</include>
<include>org.jboss.ws.cxf:jbossws-cxf-transports-udp:jar</include>
<include>org.jboss.ws.native:jbossws-native-core:jar</include>
<include>org.jboss.ws.native:jbossws-native-services:jar</include>
<include>org.jboss.ws.projects:jaxws-jboss-httpserver-httpspi:jar</include>
+ <include>org.jboss.ws.projects:jaxws-undertow-httpspi:jar</include>
<include>org.jboss.com.sun.httpserver:httpserver:jar</include>
+ <include>io.undertow:undertow-core:jar</include>
<include>org.apache.cxf:cxf-*</include>
<include>org.apache.cxf.services.sts:cxf-services-sts-core:jar</include>
<include>org.apache.cxf.services.ws-discovery:cxf-services-ws-discovery-api:jar</include>
Modified: stack/cxf/branches/jaspi/modules/resources/pom.xml
===================================================================
--- stack/cxf/branches/jaspi/modules/resources/pom.xml 2014-02-11 09:00:46 UTC (rev 18337)
+++ stack/cxf/branches/jaspi/modules/resources/pom.xml 2014-02-11 09:07:45 UTC (rev 18338)
@@ -51,24 +51,6 @@
<phase>package</phase>
</execution>
<execution>
- <id>jboss712</id>
- <goals><goal>jar</goal></goals>
- <phase>package</phase>
- <configuration>
- <classifier>jboss712</classifier>
- <classesDirectory>${project.build.directory}/classes/resources/jbossws-jboss712/jbossws.beans</classesDirectory>
- </configuration>
- </execution>
- <execution>
- <id>jboss713</id>
- <goals><goal>jar</goal></goals>
- <phase>package</phase>
- <configuration>
- <classifier>jboss713</classifier>
- <classesDirectory>${project.build.directory}/classes/resources/jbossws-jboss713/jbossws.beans</classesDirectory>
- </configuration>
- </execution>
- <execution>
<id>jboss720</id>
<goals><goal>jar</goal></goals>
<phase>package</phase>
Modified: stack/cxf/branches/jaspi/modules/resources/src/main/resources/modules/wildfly800/org/jboss/as/webservices/server/integration/main/module.xml
===================================================================
--- stack/cxf/branches/jaspi/modules/resources/src/main/resources/modules/wildfly800/org/jboss/as/webservices/server/integration/main/module.xml 2014-02-11 09:00:46 UTC (rev 18337)
+++ stack/cxf/branches/jaspi/modules/resources/src/main/resources/modules/wildfly800/org/jboss/as/webservices/server/integration/main/module.xml 2014-02-11 09:07:45 UTC (rev 18338)
@@ -50,7 +50,7 @@
</exports>
</module>
<module name="org.jboss.ws.cxf.jbossws-cxf-factories" services="export" export="true"/>
- <module name="org.jboss.ws.cxf.jbossws-cxf-transports-httpserver" export="true">
+ <module name="org.jboss.ws.cxf.jbossws-cxf-transports-undertow" export="true">
<imports>
<include path="META-INF/cxf"/>
<include path="META-INF"/>
@@ -97,5 +97,11 @@
<include path="META-INF"/>
</exports>
</module>
+ <module name="org.jboss.xts">
+ <imports>
+ <include path="com.arjuna.mw.wst11.client"/>
+ <include path="org.jboss.jbossts.txbridge.outbound"/>
+ </imports>
+ </module>
</dependencies>
</module>
Modified: stack/cxf/branches/jaspi/modules/resources/src/main/resources/modules/wildfly800/org/jboss/ws/cxf/jbossws-cxf-client/main/module.xml
===================================================================
--- stack/cxf/branches/jaspi/modules/resources/src/main/resources/modules/wildfly800/org/jboss/ws/cxf/jbossws-cxf-client/main/module.xml 2014-02-11 09:00:46 UTC (rev 18337)
+++ stack/cxf/branches/jaspi/modules/resources/src/main/resources/modules/wildfly800/org/jboss/ws/cxf/jbossws-cxf-client/main/module.xml 2014-02-11 09:07:45 UTC (rev 18338)
@@ -44,7 +44,7 @@
<module name="org.jboss.ws.cxf.jbossws-cxf-factories" services="export" />
<!-- Apache CXF APIs only -->
<module name="org.apache.cxf" export="true" />
- <module name="org.jboss.ws.cxf.jbossws-cxf-transports-httpserver" export="true" services="export" />
+ <module name="org.jboss.ws.cxf.jbossws-cxf-transports-undertow" export="true" services="export" />
<module name="org.jboss.ws.cxf.jbossws-cxf-transports-udp" export="true" services="export" />
<module name="org.jboss.jaxbintros" export="true"/>
<module name="javax.security.auth.message.api" export="true"/>
Modified: stack/cxf/branches/jaspi/modules/resources/src/main/resources/modules/wildfly800/org/jboss/ws/cxf/jbossws-cxf-server/main/module.xml
===================================================================
--- stack/cxf/branches/jaspi/modules/resources/src/main/resources/modules/wildfly800/org/jboss/ws/cxf/jbossws-cxf-server/main/module.xml 2014-02-11 09:00:46 UTC (rev 18337)
+++ stack/cxf/branches/jaspi/modules/resources/src/main/resources/modules/wildfly800/org/jboss/ws/cxf/jbossws-cxf-server/main/module.xml 2014-02-11 09:07:45 UTC (rev 18338)
@@ -53,7 +53,7 @@
<include path="META-INF"/>
</imports>
</module>
- <module name="org.jboss.ws.cxf.jbossws-cxf-transports-httpserver" services="import">
+ <module name="org.jboss.ws.cxf.jbossws-cxf-transports-undertow" services="import">
<imports>
<include path="META-INF/cxf"/> <!-- required to also pull in the bus extensions from META-INF -->
<include path="META-INF"/>
Modified: stack/cxf/branches/jaspi/modules/resources/src/main/resources/modules/wildfly800/org/jboss/ws/jaxws-client/main/module.xml
===================================================================
--- stack/cxf/branches/jaspi/modules/resources/src/main/resources/modules/wildfly800/org/jboss/ws/jaxws-client/main/module.xml 2014-02-11 09:00:46 UTC (rev 18337)
+++ stack/cxf/branches/jaspi/modules/resources/src/main/resources/modules/wildfly800/org/jboss/ws/jaxws-client/main/module.xml 2014-02-11 09:07:45 UTC (rev 18338)
@@ -50,7 +50,7 @@
<include path="META-INF"/>
</imports>
</module>
- <module name="org.jboss.ws.cxf.jbossws-cxf-transports-httpserver" services="import">
+ <module name="org.jboss.ws.cxf.jbossws-cxf-transports-undertow" services="import">
<imports>
<include path="META-INF/cxf"/> <!-- required to also pull in the bus extensions from META-INF -->
<include path="META-INF"/>
Modified: stack/cxf/branches/jaspi/modules/resources/src/main/resources/resources/jbossws-deploy-macros.xml
===================================================================
--- stack/cxf/branches/jaspi/modules/resources/src/main/resources/resources/jbossws-deploy-macros.xml 2014-02-11 09:00:46 UTC (rev 18337)
+++ stack/cxf/branches/jaspi/modules/resources/src/main/resources/resources/jbossws-deploy-macros.xml 2014-02-11 09:07:45 UTC (rev 18338)
@@ -41,9 +41,9 @@
<include name="**/jbossws-cxf-jaspi.jar"/>
</fileset>
</copy>
- <copy todir="@{targetdir}/org/jboss/ws/jaxws-jboss-httpserver-httpspi/main" flatten="false" overwrite="true">
+ <copy todir="@{targetdir}/org/jboss/ws/jaxws-undertow-httpspi/main" flatten="false" overwrite="true">
<fileset dir="@{thirdpartydir}/lib">
- <include name="**/jaxws-jboss-httpserver-httpspi.jar"/>
+ <include name="**/jaxws-undertow-httpspi.jar"/>
</fileset>
</copy>
<copy todir="@{targetdir}/org/jboss/ws/cxf/jbossws-cxf-server/main" flatten="false" overwrite="true">
@@ -56,9 +56,9 @@
<include name="**/jbossws-cxf-factories.jar"/>
</fileset>
</copy>
- <copy todir="@{targetdir}/org/jboss/ws/cxf/jbossws-cxf-transports-httpserver/main" flatten="false" overwrite="true">
+ <copy todir="@{targetdir}/org/jboss/ws/cxf/jbossws-cxf-transports-undertow/main" flatten="false" overwrite="true">
<fileset dir="@{thirdpartydir}/lib">
- <include name="**/jbossws-cxf-transports-httpserver.jar"/>
+ <include name="**/jbossws-cxf-transports-undertow.jar"/>
</fileset>
</copy>
<copy todir="@{targetdir}/org/jboss/ws/cxf/jbossws-cxf-transports-udp/main" flatten="false" overwrite="true">
Modified: stack/cxf/branches/jaspi/modules/resources/src/main/resources/resources/modules-deploy.conf
===================================================================
--- stack/cxf/branches/jaspi/modules/resources/src/main/resources/resources/modules-deploy.conf 2014-02-11 09:00:46 UTC (rev 18337)
+++ stack/cxf/branches/jaspi/modules/resources/src/main/resources/resources/modules-deploy.conf 2014-02-11 09:07:45 UTC (rev 18338)
@@ -1 +1 @@
-org/apache/cxf/**, org/apache/neethi/**, org/apache/ws/commons/xmlschema/**, org/jboss/ws/cxf/**, org/jboss/ws/api/**, org/jboss/ws/common/**, org/jboss/ws/jaxws-client/**, org/jboss/ws/jaxws-jboss-httpserver-httpspi/**, org/jboss/ws/saaj-impl/**, org/jboss/ws/spi/**, org/jboss/ws/tools/**, org/opensaml/**, org/springframework/spring/**, org/jboss/ws/native/**
\ No newline at end of file
+org/apache/cxf/**, org/apache/neethi/**, org/apache/ws/commons/xmlschema/**, org/jboss/ws/cxf/**, org/jboss/ws/api/**, org/jboss/ws/common/**, org/jboss/ws/jaxws-client/**, org/jboss/ws/jaxws-jboss-httpserver-httpspi/**, org/jboss/ws/jaxws-undertow-httpspi/**,org/jboss/ws/saaj-impl/**, org/jboss/ws/spi/**, org/jboss/ws/tools/**, org/opensaml/**, org/springframework/spring/**, org/jboss/ws/native/**
Modified: stack/cxf/branches/jaspi/modules/server/src/main/java/org/jboss/wsf/stack/cxf/RequestHandlerImpl.java
===================================================================
--- stack/cxf/branches/jaspi/modules/server/src/main/java/org/jboss/wsf/stack/cxf/RequestHandlerImpl.java 2014-02-11 09:00:46 UTC (rev 18337)
+++ stack/cxf/branches/jaspi/modules/server/src/main/java/org/jboss/wsf/stack/cxf/RequestHandlerImpl.java 2014-02-11 09:07:45 UTC (rev 18338)
@@ -24,9 +24,12 @@
import java.io.IOException;
import java.io.InputStream;
import java.io.OutputStream;
+import java.io.Writer;
import java.net.MalformedURLException;
import java.net.URL;
+import java.security.AccessController;
import java.util.Collection;
+import java.util.regex.Pattern;
import javax.servlet.ServletConfig;
import javax.servlet.ServletContext;
@@ -52,6 +55,7 @@
import org.jboss.wsf.spi.invocation.InvocationContext;
import org.jboss.wsf.spi.invocation.RequestHandler;
import org.jboss.wsf.spi.management.EndpointMetrics;
+import org.jboss.wsf.spi.management.ServerConfig;
import org.jboss.wsf.stack.cxf.addressRewrite.SoapAddressRewriteHelper;
import org.jboss.wsf.stack.cxf.configuration.BusHolder;
@@ -64,7 +68,8 @@
*/
public class RequestHandlerImpl implements RequestHandler
{
- private static RequestHandlerImpl me = new RequestHandlerImpl();
+ private static final RequestHandlerImpl me = new RequestHandlerImpl();
+ private static final Pattern pathPattern = Pattern.compile("/{2,}");
RequestHandlerImpl()
{
@@ -131,33 +136,30 @@
{
throw Messages.MESSAGES.cannotObtainRegistry(DestinationRegistry.class.getName());
}
+ requestURI = pathPattern.matcher(requestURI).replaceAll("/");
+ //first try looking up the destination in the registry map
+ final AbstractHTTPDestination dest = destRegistry.getDestinationForPath(requestURI, true);
+ if (dest != null) {
+ return dest;
+ }
+ //if there's no direct match, iterate on the destinations to see if there's valid "catch-all" destination
+ //(servlet-based endpoints, with "/*" url-pattern in web.xml)
Collection<AbstractHTTPDestination> destinations = destRegistry.getDestinations();
AbstractHTTPDestination returnValue = null;
for (AbstractHTTPDestination destination : destinations)
{
- EndpointInfo endpointInfo = destination.getEndpointInfo();
- String address = endpointInfo.getAddress();
-
- String path = address;
+ String path = destination.getEndpointInfo().getAddress();
try
{
- path = new URL(address).getPath();
+ path = new URL(path).getPath();
}
catch (MalformedURLException ex)
{
// ignore
}
- if (path != null)
- {
- if (requestURI.equals(path))
- {
- return destination; // exact match
- }
- else if (requestURI.startsWith(path))
- {
- returnValue = destination; // fallback
- }
+ if (path != null && requestURI.startsWith(path)) {
+ returnValue = destination;
}
}
@@ -191,7 +193,7 @@
* @throws ServletException if some problem occurs
*/
private final boolean handleQuery(HttpServletRequest req, HttpServletResponse res, AbstractHTTPDestination dest, Bus bus)
- throws ServletException
+ throws ServletException, IOException
{
final String queryString = req.getQueryString();
if ((null != queryString) && (queryString.length() > 0))
@@ -201,8 +203,7 @@
final String ctxUri = req.getRequestURI();
final String baseUri = req.getRequestURL().toString() + "?" + queryString;
final EndpointInfo endpointInfo = dest.getEndpointInfo();
- final boolean autoRewrite = SoapAddressRewriteHelper.isAutoRewriteOn(
- AbstractServerConfig.getServerIntegrationServerConfig());
+ final boolean autoRewrite = SoapAddressRewriteHelper.isAutoRewriteOn(getServerConfig());
endpointInfo.setProperty(WSDLGetUtils.AUTO_REWRITE_ADDRESS, autoRewrite);
endpointInfo.setProperty(WSDLGetUtils.AUTO_REWRITE_ADDRESS_ALL, autoRewrite);
@@ -226,9 +227,26 @@
}
}
}
+ else if ("GET".equals(req.getMethod()))
+ {
+ //reject HTTP GET without query string (only support messages sent w/ POST)
+ res.setStatus(405);
+ res.setContentType("text/plain");
+ Writer out = res.getWriter();
+ out.write("HTTP GET not supported");
+ out.close();
+ return true;
+ }
return false;
}
+
+ private static ServerConfig getServerConfig() {
+ if(System.getSecurityManager() == null) {
+ return AbstractServerConfig.getServerIntegrationServerConfig();
+ }
+ return AccessController.doPrivileged(AbstractServerConfig.GET_SERVER_INTEGRATION_SERVER_CONFIG);
+ }
private long initRequestMetrics(Endpoint endpoint)
{
Modified: stack/cxf/branches/jaspi/modules/server/src/main/java/org/jboss/wsf/stack/cxf/configuration/BusHolder.java
===================================================================
--- stack/cxf/branches/jaspi/modules/server/src/main/java/org/jboss/wsf/stack/cxf/configuration/BusHolder.java 2014-02-11 09:00:46 UTC (rev 18337)
+++ stack/cxf/branches/jaspi/modules/server/src/main/java/org/jboss/wsf/stack/cxf/configuration/BusHolder.java 2014-02-11 09:07:45 UTC (rev 18338)
@@ -40,6 +40,7 @@
import org.apache.cxf.resource.ResourceResolver;
import org.apache.cxf.service.factory.FactoryBeanListener;
import org.apache.cxf.service.factory.FactoryBeanListenerManager;
+import org.apache.cxf.transport.http.DestinationRegistry;
import org.apache.cxf.workqueue.AutomaticWorkQueue;
import org.apache.cxf.workqueue.AutomaticWorkQueueImpl;
import org.apache.cxf.workqueue.WorkQueueManager;
@@ -47,7 +48,10 @@
import org.apache.cxf.ws.policy.AlternativeSelector;
import org.apache.cxf.ws.policy.PolicyEngine;
import org.apache.cxf.ws.policy.selector.MaximalAlternativeSelector;
+import org.jboss.ws.api.annotation.PolicySets;
import org.jboss.ws.api.binding.BindingCustomization;
+import org.jboss.wsf.spi.deployment.AnnotationsInfo;
+import org.jboss.wsf.spi.deployment.Deployment;
import org.jboss.wsf.spi.deployment.Endpoint;
import org.jboss.wsf.spi.deployment.UnifiedVirtualFile;
import org.jboss.wsf.spi.metadata.webservices.JBossWebservicesMetaData;
@@ -62,6 +66,7 @@
import org.jboss.wsf.stack.cxf.interceptor.NsCtxSelectorStoreInterceptor;
import org.jboss.wsf.stack.cxf.jaspi.JaspiServerAuthenticator;
import org.jboss.wsf.stack.cxf.management.InstrumentationManagerExtImpl;
+import org.jboss.wsf.stack.cxf.transport.JBossWSDestinationRegistryImpl;
/**
* A wrapper of the Bus for performing most of the configurations required on it by JBossWS
@@ -96,9 +101,10 @@
* @param resolver The ResourceResolver to configure, if any
* @param configurer The JBossWSCXFConfigurer to install in the bus, if any
* @param wsmd The current JBossWebservicesMetaData, if any
- * @param depRuntimeClassLoader The current deployment classloader
+ * @param dep The current deployment
*/
- public void configure(ResourceResolver resolver, Configurer configurer, JBossWebservicesMetaData wsmd, ClassLoader depRuntimeClassLoader, JaspiServerAuthenticator authenticator)
+ public void configure(ResourceResolver resolver, Configurer configurer, JBossWebservicesMetaData wsmd, Deployment dep, JaspiServerAuthenticator authenticator)
+
{
bus.setProperty(org.jboss.wsf.stack.cxf.client.Constants.DEPLOYMENT_BUS, true);
busHolderListener = new BusHolderLifeCycleListener();
@@ -123,12 +129,19 @@
{
bus.getExtension(PolicyEngine.class).setAlternativeSelector(getAlternativeSelector(props));
}
+ if (bus.getExtension(DestinationRegistry.class) == null)
+ {
+ bus.setExtension(new JBossWSDestinationRegistryImpl(), DestinationRegistry.class);
+ }
setCXFManagement(bus, props); //*first* enabled cxf management if required, *then* add anything else which could be manageable (e.g. work queues)
setAdditionalWorkQueues(bus, props);
setWSDiscovery(bus, props);
- policySetsListener = new PolicySetsAnnotationListener(depRuntimeClassLoader);
- bus.getExtension(FactoryBeanListenerManager.class).addListener(policySetsListener);
+ AnnotationsInfo ai = dep.getAttachment(AnnotationsInfo.class);
+ if (ai == null || ai.hasAnnotatedClasses(PolicySets.class.getName())) {
+ policySetsListener = new PolicySetsAnnotationListener(dep.getRuntimeClassLoader());
+ bus.getExtension(FactoryBeanListenerManager.class).addListener(policySetsListener);
+ }
}
Modified: stack/cxf/branches/jaspi/modules/server/src/main/java/org/jboss/wsf/stack/cxf/configuration/NonSpringBusHolder.java
===================================================================
--- stack/cxf/branches/jaspi/modules/server/src/main/java/org/jboss/wsf/stack/cxf/configuration/NonSpringBusHolder.java 2014-02-11 09:00:46 UTC (rev 18337)
+++ stack/cxf/branches/jaspi/modules/server/src/main/java/org/jboss/wsf/stack/cxf/configuration/NonSpringBusHolder.java 2014-02-11 09:07:45 UTC (rev 18338)
@@ -37,6 +37,7 @@
import org.apache.cxf.ws.addressing.WSAddressingFeature;
import org.apache.cxf.ws.rm.RMManager;
import org.jboss.ws.api.binding.BindingCustomization;
+import org.jboss.wsf.spi.deployment.Deployment;
import org.jboss.wsf.spi.deployment.Endpoint;
import org.jboss.wsf.spi.deployment.UnifiedVirtualFile;
import org.jboss.wsf.spi.metadata.webservices.JBossWebservicesMetaData;
@@ -80,17 +81,19 @@
* @param resolver The ResourceResolver to configure, if any
* @param configurer The JBossWSCXFConfigurer to install in the bus, if any
* @param wsmd The current JBossWebservicesMetaData, if any
- * @param depRuntimeClassLoader The current deployment classloader
+ * @param dep The current deployment
*/
-
- public void configure(ResourceResolver resolver, Configurer configurer, JBossWebservicesMetaData wsmd, ClassLoader depRuntimeClassLoader, JaspiServerAuthenticator authenticator)
+
+ @Override
+ public void configure(ResourceResolver resolver, Configurer configurer, JBossWebservicesMetaData wsmd, Deployment dep, JaspiServerAuthenticator authenticator)
{
if (configured)
{
throw Messages.MESSAGES.busAlreadyConfigured(bus);
}
- super.configure(resolver, configurer, wsmd, depRuntimeClassLoader, authenticator);
+ super.configure(resolver, configurer, wsmd, dep, authenticator);
+
for (DDEndpoint dde : metadata.getEndpoints())
{
EndpointImpl endpoint = new EndpointImpl(bus, newInstance(dde.getImplementor()));
Modified: stack/cxf/branches/jaspi/modules/server/src/main/java/org/jboss/wsf/stack/cxf/configuration/ServerBeanCustomizer.java
===================================================================
--- stack/cxf/branches/jaspi/modules/server/src/main/java/org/jboss/wsf/stack/cxf/configuration/ServerBeanCustomizer.java 2014-02-11 09:00:46 UTC (rev 18337)
+++ stack/cxf/branches/jaspi/modules/server/src/main/java/org/jboss/wsf/stack/cxf/configuration/ServerBeanCustomizer.java 2014-02-11 09:07:45 UTC (rev 18338)
@@ -1,6 +1,6 @@
/*
* JBoss, Home of Professional Open Source.
- * Copyright 2011, Red Hat Middleware LLC, and individual contributors
+ * Copyright 2013, Red Hat Middleware LLC, and individual contributors
* as indicated by the @author tags. See the copyright.txt file in the
* distribution for a full listing of individual contributors.
*
@@ -22,6 +22,7 @@
package org.jboss.wsf.stack.cxf.configuration;
import java.io.IOException;
+import java.security.AccessController;
import java.util.List;
import java.util.Properties;
@@ -152,14 +153,12 @@
if (configFile == null)
{
//use endpoint configs from AS domain
- ServerConfig sc = AbstractServerConfig.getServerIntegrationServerConfig();
- for (org.jboss.wsf.spi.metadata.config.EndpointConfig config : sc.getEndpointConfigs())
- {
- if (config.getConfigName().equals(configName))
- {
- endpoint.setEndpointConfig(config);
- break;
- }
+ ServerConfig sc = getServerConfig();
+ org.jboss.wsf.spi.metadata.config.EndpointConfig config = sc.getEndpointConfig(configName);
+ if (config != null) {
+ endpoint.setEndpointConfig(config);
+ } else {
+ throw Messages.MESSAGES.couldNotFindEndpointConfigName(configName);
}
}
else
@@ -185,6 +184,13 @@
}
}
+ private static ServerConfig getServerConfig() {
+ if(System.getSecurityManager() == null) {
+ return AbstractServerConfig.getServerIntegrationServerConfig();
+ }
+ return AccessController.doPrivileged(AbstractServerConfig.GET_SERVER_INTEGRATION_SERVER_CONFIG);
+ }
+
public void setDeploymentRoot(UnifiedVirtualFile deploymentRoot)
{
this.deploymentRoot = deploymentRoot;
Modified: stack/cxf/branches/jaspi/modules/server/src/main/java/org/jboss/wsf/stack/cxf/configuration/SpringBusHolder.java
===================================================================
--- stack/cxf/branches/jaspi/modules/server/src/main/java/org/jboss/wsf/stack/cxf/configuration/SpringBusHolder.java 2014-02-11 09:00:46 UTC (rev 18337)
+++ stack/cxf/branches/jaspi/modules/server/src/main/java/org/jboss/wsf/stack/cxf/configuration/SpringBusHolder.java 2014-02-11 09:07:45 UTC (rev 18338)
@@ -39,6 +39,7 @@
import org.apache.cxf.transport.http.HttpDestinationFactory;
import org.apache.cxf.transport.servlet.ServletDestinationFactory;
import org.jboss.ws.api.binding.BindingCustomization;
+import org.jboss.wsf.spi.deployment.Deployment;
import org.jboss.wsf.spi.deployment.Endpoint;
import org.jboss.wsf.spi.deployment.UnifiedVirtualFile;
import org.jboss.wsf.spi.metadata.webservices.JBossWebservicesMetaData;
@@ -122,16 +123,18 @@
* @param configurer The JBossWSCXFConfigurer to install in the bus, if any
* @param dep The current JBossWS-SPI Deployment
* @param wsmd The current JBossWebservicesMetaData, if any
- * @param depRuntimeClassLoader The current deployment classloader
+ * @param dep The current deployment
*/
@Override
- public void configure(ResourceResolver resolver, Configurer configurer, JBossWebservicesMetaData wsmd, ClassLoader depRuntimeClassLoader, JaspiServerAuthenticator authenticator)
+ public void configure(ResourceResolver resolver, Configurer configurer, JBossWebservicesMetaData wsmd, Deployment dep, JaspiServerAuthenticator authenticator)
+
{
if (configured)
{
throw MESSAGES.busAlreadyConfigured(ctx);
}
- super.configure(resolver, configurer, wsmd, depRuntimeClassLoader, authenticator);
+
+ super.configure(resolver, configurer, wsmd, dep, authenticator);
GenericApplicationContext jbosswsCxfContext = null;
//load stuff from provided jbossws-cxf.xml DD
Modified: stack/cxf/branches/jaspi/modules/server/src/main/java/org/jboss/wsf/stack/cxf/deployment/WSDLFilePublisher.java
===================================================================
--- stack/cxf/branches/jaspi/modules/server/src/main/java/org/jboss/wsf/stack/cxf/deployment/WSDLFilePublisher.java 2014-02-11 09:00:46 UTC (rev 18337)
+++ stack/cxf/branches/jaspi/modules/server/src/main/java/org/jboss/wsf/stack/cxf/deployment/WSDLFilePublisher.java 2014-02-11 09:07:45 UTC (rev 18338)
@@ -90,6 +90,8 @@
// Publish XMLSchema imports
publishSchemaImports(wsdlPublishURL, doc.getDocumentElement(), published, expLocation);
+
+ dep.addAttachment(WSDLFilePublisher.class, this);
}
else
{
@@ -105,7 +107,48 @@
throw Messages.MESSAGES.cannotPublishWSDLTo(serviceName, wsdlFile, e);
}
}
-
+
+ public void unpublishWsdlFiles()
+ {
+ String deploymentName = dep.getCanonicalName();
+
+ if (deploymentName.startsWith("http://"))
+ {
+ deploymentName = deploymentName.replace("http://", "http-");
+ }
+
+ try {
+
+ File publishDir = new File(serverConfig.getServerDataDir().getCanonicalPath()
+ + "/wsdl/" + deploymentName);
+ if (publishDir.exists())
+ {
+ File[] wsdlFileList = publishDir.listFiles();
+ if (wsdlFileList != null)
+ {
+ for (int i = 0; i < wsdlFileList.length; i++)
+ {
+ File f = wsdlFileList[i];
+ if (f.delete())
+ {
+ Loggers.DEPLOYMENT_LOGGER.deletedWsdlFile(f.getAbsolutePath());
+ } else {
+ Loggers.DEPLOYMENT_LOGGER.couldNotDeleteWsdlFile(f.getAbsolutePath());
+ }
+ }
+ }
+ }
+
+ if (!publishDir.delete())
+ {
+ Loggers.DEPLOYMENT_LOGGER.couldNotDeleteWsdlDirectory(publishDir.getAbsolutePath());
+ }
+
+ } catch (IOException e) {
+ Loggers.DEPLOYMENT_LOGGER.couldNotCreateWsdlDataPath();
+ }
+ }
+
private static Document getWsdlDocument(Bus bus, Definition def) throws WSDLException
{
WSDLWriter wsdlWriter = bus.getExtension(WSDLManager.class).getWSDLFactory().newWSDLWriter();
Modified: stack/cxf/branches/jaspi/modules/server/src/main/java/org/jboss/wsf/stack/cxf/deployment/aspect/BusDeploymentAspect.java
===================================================================
--- stack/cxf/branches/jaspi/modules/server/src/main/java/org/jboss/wsf/stack/cxf/deployment/aspect/BusDeploymentAspect.java 2014-02-11 09:00:46 UTC (rev 18337)
+++ stack/cxf/branches/jaspi/modules/server/src/main/java/org/jboss/wsf/stack/cxf/deployment/aspect/BusDeploymentAspect.java 2014-02-11 09:07:45 UTC (rev 18338)
@@ -47,6 +47,7 @@
import org.jboss.ws.common.utils.DelegateClassLoader;
import org.jboss.wsf.spi.deployment.ArchiveDeployment;
import org.jboss.wsf.spi.deployment.Deployment;
+import org.jboss.wsf.spi.deployment.Endpoint;
import org.jboss.wsf.spi.deployment.ResourceResolver;
import org.jboss.wsf.spi.metadata.j2ee.JSEArchiveMetaData;
import org.jboss.wsf.spi.metadata.webservices.JBossWebservicesMetaData;
@@ -90,6 +91,12 @@
if (holder != null)
{
holder.close();
+
+ WSDLFilePublisher wsdlFilePublisher = dep.getAttachment(WSDLFilePublisher.class);
+ if (wsdlFilePublisher != null)
+ {
+ wsdlFilePublisher.unpublishWsdlFiles();
+ }
}
}
@@ -144,8 +151,16 @@
Configurer configurer = holder.createServerConfigurer(dep.getAttachment(BindingCustomization.class),
new WSDLFilePublisher(aDep), dep.getService().getEndpoints(), aDep.getRootFile(), epConfigName, epConfigFile);
- holder.configure(resolver, configurer, wsmd, dep.getRuntimeClassLoader(), jaspiAuthenticator);
+ holder.configure(resolver, configurer, wsmd, dep, jaspiAuthenticator);
+
dep.addAttachment(BusHolder.class, holder);
+ if (holder instanceof SpringBusHolder)
+ {
+ for (Endpoint endpoint : dep.getService().getEndpoints())
+ {
+ endpoint.setProperty("SpringBus", true);
+ }
+ }
}
finally
{
Modified: stack/cxf/branches/jaspi/modules/server/src/main/java/org/jboss/wsf/stack/cxf/metadata/MetadataBuilder.java
===================================================================
--- stack/cxf/branches/jaspi/modules/server/src/main/java/org/jboss/wsf/stack/cxf/metadata/MetadataBuilder.java 2014-02-11 09:00:46 UTC (rev 18337)
+++ stack/cxf/branches/jaspi/modules/server/src/main/java/org/jboss/wsf/stack/cxf/metadata/MetadataBuilder.java 2014-02-11 09:07:45 UTC (rev 18338)
@@ -25,6 +25,7 @@
import static org.jboss.wsf.stack.cxf.Messages.MESSAGES;
import java.net.URL;
+import java.security.AccessController;
import java.util.HashMap;
import java.util.LinkedList;
import java.util.List;
@@ -282,7 +283,7 @@
if (wsdlLocation == null) {
wsdlLocation = ddep.getAnnotationWsdlLocation();
}
- final ServerConfig sc = AbstractServerConfig.getServerIntegrationServerConfig();
+ final ServerConfig sc = getServerConfig();
if (wsdlLocation != null) {
URL wsdlUrl = dep.getResourceResolver().resolveFailSafe(wsdlLocation);
if (wsdlUrl != null) {
@@ -320,6 +321,13 @@
}
}
+ private static ServerConfig getServerConfig() {
+ if(System.getSecurityManager() == null) {
+ return AbstractServerConfig.getServerIntegrationServerConfig();
+ }
+ return AccessController.doPrivileged(AbstractServerConfig.GET_SERVER_INTEGRATION_SERVER_CONFIG);
+ }
+
/**
* Extracts the typeNS given the package name
* Algorithm is based on the one specified in JAXWS v2.0 spec
Copied: stack/cxf/branches/jaspi/modules/server/src/main/java/org/jboss/wsf/stack/cxf/transport/JBossWSDestinationRegistryImpl.java (from rev 18336, stack/cxf/trunk/modules/server/src/main/java/org/jboss/wsf/stack/cxf/transport/JBossWSDestinationRegistryImpl.java)
===================================================================
--- stack/cxf/branches/jaspi/modules/server/src/main/java/org/jboss/wsf/stack/cxf/transport/JBossWSDestinationRegistryImpl.java (rev 0)
+++ stack/cxf/branches/jaspi/modules/server/src/main/java/org/jboss/wsf/stack/cxf/transport/JBossWSDestinationRegistryImpl.java 2014-02-11 09:07:45 UTC (rev 18338)
@@ -0,0 +1,70 @@
+/*
+ * JBoss, Home of Professional Open Source.
+ * Copyright 2014, Red Hat Middleware LLC, and individual contributors
+ * as indicated by the @author tags. See the copyright.txt file in the
+ * distribution for a full listing of individual contributors.
+ *
+ * This is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU Lesser General Public License as
+ * published by the Free Software Foundation; either version 2.1 of
+ * the License, or (at your option) any later version.
+ *
+ * This software is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this software; if not, write to the Free
+ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
+ * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
+ */
+package org.jboss.wsf.stack.cxf.transport;
+
+import java.net.MalformedURLException;
+import java.net.URL;
+
+import org.apache.cxf.transport.http.DestinationRegistryImpl;
+
+/**
+ * A JBossWS version of the CXF DestinationRegistryImpl that registers destinations
+ * with different key values.
+ *
+ * @author alessio.soldano(a)jboss.com
+ * @since 23-Jan-2014
+ *
+ */
+public class JBossWSDestinationRegistryImpl extends DestinationRegistryImpl
+{
+
+ /**
+ * Return a real path value, removing the protocol, host and port
+ * if specified.
+ *
+ * @param path
+ * @return trimmed path
+ */
+ @Override
+ public String getTrimmedPath(String path)
+ {
+ if (path == null)
+ {
+ return "/";
+ }
+ if (!path.startsWith("/"))
+ {
+ try
+ {
+ path = new URL(path).getPath();
+ }
+ catch (MalformedURLException ex)
+ {
+ // ignore
+ }
+ if (!path.startsWith("/")) {
+ path = "/" + path;
+ }
+ }
+ return path;
+ }
+}
Modified: stack/cxf/branches/jaspi/modules/server/src/main/java/org/jboss/wsf/stack/cxf/transport/ServletHelper.java
===================================================================
--- stack/cxf/branches/jaspi/modules/server/src/main/java/org/jboss/wsf/stack/cxf/transport/ServletHelper.java 2014-02-11 09:00:46 UTC (rev 18337)
+++ stack/cxf/branches/jaspi/modules/server/src/main/java/org/jboss/wsf/stack/cxf/transport/ServletHelper.java 2014-02-11 09:07:45 UTC (rev 18338)
@@ -115,16 +115,6 @@
public static void callPreDestroy(Endpoint endpoint)
{
- ServerFactoryBean factory = endpoint.getAttachment(ServerFactoryBean.class);
- if (factory != null)
- {
- if (isJaxwsJseEndpoint(endpoint) && factory.getServiceBean() != null)
- {
- final Reference epReference = endpoint.getInstanceProvider().getInstance(factory.getServiceBean().getClass().getName());
- final Object epInstance = epReference.getValue();
- InjectionHelper.callPreDestroyMethod(epInstance);
- }
- }
}
public static void callRequestHandler(HttpServletRequest req, HttpServletResponse res, ServletContext ctx, Bus bus,
Modified: stack/cxf/branches/jaspi/modules/server/src/main/scripts/antrun-beans-config.xml
===================================================================
--- stack/cxf/branches/jaspi/modules/server/src/main/scripts/antrun-beans-config.xml 2014-02-11 09:00:46 UTC (rev 18337)
+++ stack/cxf/branches/jaspi/modules/server/src/main/scripts/antrun-beans-config.xml 2014-02-11 09:07:45 UTC (rev 18338)
@@ -31,24 +31,6 @@
<copy
file="${src.dir}/jbossws-cxf-config-as7.xml"
- tofile="${dest.dir}/jbossws-jboss712/jbossws.beans/META-INF/stack-specific-deployment-aspects.xml"
- />
- <copy
- file="${src.dir}/jbossws-jaxrpc-config-as7.xml"
- tofile="${dest.dir}/jbossws-jboss712/jbossws.beans/META-INF/jaxrpc-deployment-aspects.xml"
- />
-
- <copy
- file="${src.dir}/jbossws-cxf-config-as7.xml"
- tofile="${dest.dir}/jbossws-jboss713/jbossws.beans/META-INF/stack-specific-deployment-aspects.xml"
- />
- <copy
- file="${src.dir}/jbossws-jaxrpc-config-as7.xml"
- tofile="${dest.dir}/jbossws-jboss713/jbossws.beans/META-INF/jaxrpc-deployment-aspects.xml"
- />
-
- <copy
- file="${src.dir}/jbossws-cxf-config-as7.xml"
tofile="${dest.dir}/jbossws-jboss720/jbossws.beans/META-INF/stack-specific-deployment-aspects.xml"
/>
<copy
Modified: stack/cxf/branches/jaspi/modules/server/src/test/java/org/jboss/wsf/stack/cxf/configuration/BusHolderTest.java
===================================================================
--- stack/cxf/branches/jaspi/modules/server/src/test/java/org/jboss/wsf/stack/cxf/configuration/BusHolderTest.java 2014-02-11 09:00:46 UTC (rev 18337)
+++ stack/cxf/branches/jaspi/modules/server/src/test/java/org/jboss/wsf/stack/cxf/configuration/BusHolderTest.java 2014-02-11 09:07:45 UTC (rev 18338)
@@ -21,11 +21,15 @@
*/
package org.jboss.wsf.stack.cxf.configuration;
+import java.util.HashMap;
+import java.util.Map;
+
import junit.framework.TestCase;
import org.apache.cxf.ws.policy.PolicyEngine;
import org.apache.cxf.ws.policy.selector.FirstAlternativeSelector;
import org.apache.cxf.ws.policy.selector.MaximalAlternativeSelector;
+import org.jboss.ws.common.deployment.DefaultDeploymentModelFactory;
import org.jboss.wsf.spi.metadata.webservices.JBossWebservicesMetaData;
import org.jboss.wsf.stack.cxf.client.Constants;
import org.jboss.wsf.stack.cxf.metadata.services.DDBeans;
@@ -59,12 +63,13 @@
private static String setupPropertyAndGetAlternativeSelector(String alternative) {
JBossWebservicesMetaData wsmd = null;
if (alternative != null) {
- wsmd = new JBossWebservicesMetaData(null);
- wsmd.setProperty(Constants.CXF_POLICY_ALTERNATIVE_SELECTOR_PROP, alternative);
+ Map<String, String> props = new HashMap<String, String>();
+ props.put(Constants.CXF_POLICY_ALTERNATIVE_SELECTOR_PROP, alternative);
+ wsmd = new JBossWebservicesMetaData(null, null, null, null, props, null, null);
}
BusHolder holder = new NonSpringBusHolder(new DDBeans());
try {
- holder.configure(null, null, wsmd, null, null);
+ holder.configure(null, null, wsmd, new DefaultDeploymentModelFactory().newDeployment("testDeployment", null), null);
return holder.getBus().getExtension(PolicyEngine.class).getAlternativeSelector().getClass().getName();
} finally {
holder.close();
Modified: stack/cxf/branches/jaspi/modules/testsuite/cxf-spring-tests/scripts/cxf-jars-jaxws.xml
===================================================================
--- stack/cxf/branches/jaspi/modules/testsuite/cxf-spring-tests/scripts/cxf-jars-jaxws.xml 2014-02-11 09:00:46 UTC (rev 18337)
+++ stack/cxf/branches/jaspi/modules/testsuite/cxf-spring-tests/scripts/cxf-jars-jaxws.xml 2014-02-11 09:07:45 UTC (rev 18338)
@@ -152,6 +152,16 @@
<attribute name="Dependencies" value="org.apache.cxf,org.jboss.ws.cxf.jbossws-cxf-server"/>
</manifest>
</war>
+ <!-- jaxws-cxf-jbws-3670-->
+ <war warfile="${tests.output.dir}/test-libs/jaxws-cxf-jbws3670.war" webxml="${tests.output.dir}/test-resources/jaxws/cxf/jbws3670/WEB-INF/web.xml">
+ <classes dir="${tests.output.dir}/test-classes">
+ <include name="org/jboss/test/ws/jaxws/cxf/jbws3670/HelloWorldService*.class"/>
+ <include name="org/jboss/test/ws/jaxws/cxf/jbws3670/TestBean.class"/>
+ </classes>
+ <webinf dir="${tests.output.dir}/test-resources/jaxws/cxf/jbws3670/WEB-INF">
+ <include name="jbossws-cxf.xml"/>
+ </webinf>
+ </war>
<!-- jaxws-cxf-jms-api -->
<war warfile="${tests.output.dir}/test-libs/jaxws-cxf-jms-api.war"
Modified: stack/cxf/branches/jaspi/modules/testsuite/cxf-tests/scripts/cxf-jars-jaxws.xml
===================================================================
--- stack/cxf/branches/jaspi/modules/testsuite/cxf-tests/scripts/cxf-jars-jaxws.xml 2014-02-11 09:00:46 UTC (rev 18337)
+++ stack/cxf/branches/jaspi/modules/testsuite/cxf-tests/scripts/cxf-jars-jaxws.xml 2014-02-11 09:07:45 UTC (rev 18338)
@@ -120,6 +120,9 @@
<classes dir="${tests.output.dir}/test-resources/jaxws/cxf/clientConfig">
<include name="META-INF/jaxws-client-config.xml"/>
</classes>
+ <zipfileset dir="${tests.output.dir}/test-resources/jaxws/cxf/clientConfig/META-INF" prefix="META-INF">
+ <include name="permissions.xml"/>
+ </zipfileset>
<manifest>
<attribute name="Dependencies" value="org.apache.cxf.impl"/> <!-- Apache CXF impl required for testing purposes -->
</manifest>
@@ -488,6 +491,14 @@
</fileset>
</jar>
+ <!-- jaxws-cxf-jbws3745 -->
+ <war destfile="${tests.output.dir}/test-libs/jaxws-cxf-jbws3745.war"
+ webxml="${tests.output.dir}/test-resources/jaxws/cxf/jbws3745/WEB-INF/web.xml">
+ <classes dir="${tests.output.dir}/test-classes">
+ <include name="org/jboss/test/ws/jaxws/cxf/jbws3745/SimpleService*.class" />
+ </classes>
+ </war>
+
<!-- jaxws-cxf-logging -->
<jar destfile="${tests.output.dir}/test-libs/jaxws-cxf-logging.jar">
<fileset dir="${tests.output.dir}/test-classes">
Modified: stack/cxf/branches/jaspi/modules/testsuite/cxf-tests/scripts/cxf-samples-jars-jaxws.xml
===================================================================
--- stack/cxf/branches/jaspi/modules/testsuite/cxf-tests/scripts/cxf-samples-jars-jaxws.xml 2014-02-11 09:00:46 UTC (rev 18337)
+++ stack/cxf/branches/jaspi/modules/testsuite/cxf-tests/scripts/cxf-samples-jars-jaxws.xml 2014-02-11 09:07:45 UTC (rev 18338)
@@ -90,6 +90,9 @@
<include name="client.wsdl" />
<include name="validatingClient.wsdl" />
</zipfileset>
+ <zipfileset dir="${tests.output.dir}/test-resources/jaxws/samples/schemavalidation/META-INF" prefix="META-INF">
+ <include name="permissions.xml"/>
+ </zipfileset>
</war>
<jar destfile="${tests.output.dir}/test-libs/jaxws-samples-schemavalidation-client.jar">
<metainf dir="${tests.output.dir}/test-resources/jaxws/samples/schemavalidation/META-INF">
@@ -389,6 +392,7 @@
<war warfile="${tests.output.dir}/test-libs/jaxws-samples-wsse-policy-sign-encrypt-client.war" needxmlfile='false'>
<classes dir="${tests.output.dir}/test-classes">
<include name="org/jboss/wsf/test/ClientHelper.class"/>
+ <include name="org/jboss/wsf/test/CryptoHelper.class"/>
<include name="org/jboss/wsf/test/TestServlet.class"/>
<include name="org/jboss/test/ws/jaxws/samples/wsse/policy/basic/SignEncryptHelper.class"/>
<include name="org/jboss/test/ws/jaxws/samples/wsse/policy/basic/ServiceIface.class"/>
@@ -418,10 +422,10 @@
<war
warfile="${tests.output.dir}/test-libs/jaxws-samples-wsse-policy-trust.war" needxmlfile='false'>
<classes dir="${tests.output.dir}/test-classes">
- <include name="org/jboss/test/ws/jaxws/samples/wsse/policy/trust/ServiceIface.class"/>
- <include name="org/jboss/test/ws/jaxws/samples/wsse/policy/trust/ServiceImpl.class"/>
+ <include name="org/jboss/test/ws/jaxws/samples/wsse/policy/trust/service/ServiceIface.class"/>
+ <include name="org/jboss/test/ws/jaxws/samples/wsse/policy/trust/service/ServiceImpl.class"/>
<include name="org/jboss/test/ws/jaxws/samples/wsse/policy/jaxws/Say*.class"/>
- <include name="org/jboss/test/ws/jaxws/samples/wsse/policy/trust/ServerCallbackHandler.class"/>
+ <include name="org/jboss/test/ws/jaxws/samples/wsse/policy/trust/service/ServerCallbackHandler.class"/>
</classes>
<webinf dir="${tests.output.dir}/test-resources/jaxws/samples/wsse/policy/trust/WEB-INF">
<include name="wsdl/Security*"/>
@@ -440,8 +444,8 @@
warfile="${tests.output.dir}/test-libs/jaxws-samples-wsse-policy-trust-sts.war"
webxml="${tests.output.dir}/test-resources/jaxws/samples/wsse/policy/trust/WEB-INF/web.xml">
<classes dir="${tests.output.dir}/test-classes">
- <include name="org/jboss/test/ws/jaxws/samples/wsse/policy/trust/SampleSTS.class"/>
- <include name="org/jboss/test/ws/jaxws/samples/wsse/policy/trust/STSCallbackHandler.class"/>
+ <include name="org/jboss/test/ws/jaxws/samples/wsse/policy/trust/sts/SampleSTS.class"/>
+ <include name="org/jboss/test/ws/jaxws/samples/wsse/policy/trust/sts/STSCallbackHandler.class"/>
</classes>
<webinf dir="${tests.output.dir}/test-resources/jaxws/samples/wsse/policy/trust/WEB-INF">
<include name="wsdl/ws-trust*"/>
@@ -464,25 +468,106 @@
</metainf>
</jar>
+
+ <!-- jaxws-samples-wsse-policy-trust-actas -->
+ <war
+ warfile="${tests.output.dir}/test-libs/jaxws-samples-wsse-policy-trust-actas.war"
+ needxmlfile='false'>
+ <classes dir="${tests.output.dir}/test-classes">
+ <include
+ name="org/jboss/test/ws/jaxws/samples/wsse/policy/trust/actas/ActAs*.class"/>
+ <include
+ name="org/jboss/test/ws/jaxws/samples/wsse/policy/jaxws/Say*.class"/>
+ <include
+ name="org/jboss/test/ws/jaxws/samples/wsse/policy/trust/service/ServiceIface.class"/>
+ <include
+ name="org/jboss/test/ws/jaxws/samples/wsse/policy/trust/shared/WSTrustAppUtils.class"/>
+ </classes>
+ <webinf
+ dir="${tests.output.dir}/test-resources/jaxws/samples/wsse/policy/trust/WEB-INF">
+ <include name="wsdl/ActAs*"/>
+ </webinf>
+ <zipfileset
+ dir="${tests.output.dir}/test-resources/jaxws/samples/wsse/policy/trust/WEB-INF"
+ prefix="WEB-INF/classes">
+ <include name="actasstore.jks"/>
+ <include name="actasKeystore.properties"/>
+ </zipfileset>
+ <zipfileset
+ dir="${tests.output.dir}/test-resources/jaxws/samples/wsse/policy/trust/META-INF"
+ prefix="META-INF">
+ <include name="clientstore.jks"/>
+ <include name="clientKeystore.properties"/>
+ <include name="permissions.xml"/>
+ </zipfileset>
+ <manifest>
+ <attribute name="Dependencies"
+ value="org.jboss.ws.cxf.jbossws-cxf-client, org.apache.cxf.impl"/>
+ </manifest>
+ </war>
+
+ <!--jaxws-samples-wsse-policy-trust-onbehalfof -->
+ <war
+ warfile="${tests.output.dir}/test-libs/jaxws-samples-wsse-policy-trust-onbehalfof.war"
+ needxmlfile='false'>
+ <classes dir="${tests.output.dir}/test-classes">
+ <include
+ name="org/jboss/test/ws/jaxws/samples/wsse/policy/trust/onbehalfof/OnBehalfOf*.class"/>
+ <include
+ name="org/jboss/test/ws/jaxws/samples/wsse/policy/jaxws/Say*.class"/>
+ <include
+ name="org/jboss/test/ws/jaxws/samples/wsse/policy/trust/service/ServiceIface.class"/>
+ <include
+ name="org/jboss/test/ws/jaxws/samples/wsse/policy/trust/shared/WSTrustAppUtils.class"/>
+ </classes>
+ <webinf
+ dir="${tests.output.dir}/test-resources/jaxws/samples/wsse/policy/trust/WEB-INF">
+ <include name="wsdl/OnBehalfOf*"/>
+ </webinf>
+ <zipfileset
+ dir="${tests.output.dir}/test-resources/jaxws/samples/wsse/policy/trust/WEB-INF"
+ prefix="WEB-INF/classes">
+ <include name="actasstore.jks"/>
+ <include name="actasKeystore.properties"/>
+ </zipfileset>
+ <zipfileset
+ dir="${tests.output.dir}/test-resources/jaxws/samples/wsse/policy/trust/META-INF"
+ prefix="META-INF">
+ <include name="clientstore.jks"/>
+ <include name="clientKeystore.properties"/>
+ </zipfileset>
+ <manifest>
+ <attribute name="Dependencies"
+ value="org.jboss.ws.cxf.jbossws-cxf-client, org.apache.cxf.impl"/>
+ </manifest>
+ </war>
+
<!-- jaxws-samples-wsse-policy-trustPicketLink-sts -->
<war
- warfile="${tests.output.dir}/test-libs/jaxws-samples-wsse-policy-trustPicketLink-sts.war" needxmlfile='false'>
- <classes dir="${tests.output.dir}/test-classes">
- <include name="org/jboss/test/ws/jaxws/samples/wsse/policy/trust/PicketLinkSTService.class"/>
- <include name="org/jboss/test/ws/jaxws/samples/wsse/policy/trust/STSCallbackHandler.class"/>
- </classes>
- <webinf dir="${tests.output.dir}/test-resources/jaxws/samples/wsse/policy/trust/WEB-INF">
- <include name="wsdl/PicketLinkSTS.wsdl"/>
- <include name="jboss-web.xml"/>
- </webinf>
- <zipfileset dir="${tests.output.dir}/test-resources/jaxws/samples/wsse/policy/trust/WEB-INF" prefix="WEB-INF/classes">
- <include name="stsstore.jks" />
- <include name="picketlink-sts.xml" />
- <include name="stsKeystore.properties" />
- </zipfileset>
- <manifest>
- <attribute name="Dependencies" value="org.jboss.ws.cxf.jbossws-cxf-client,org.picketlink"/>
- </manifest>
+ warfile="${tests.output.dir}/test-libs/jaxws-samples-wsse-policy-trustPicketLink-sts.war"
+ needxmlfile='false'>
+ <classes dir="${tests.output.dir}/test-classes">
+ <include
+ name="org/jboss/test/ws/jaxws/samples/wsse/policy/trust/picketlink/PicketLinkSTService.class"/>
+ <include
+ name="org/jboss/test/ws/jaxws/samples/wsse/policy/trust/sts/STSCallbackHandler.class"/>
+ </classes>
+ <webinf
+ dir="${tests.output.dir}/test-resources/jaxws/samples/wsse/policy/trust/WEB-INF">
+ <include name="wsdl/PicketLinkSTS.wsdl"/>
+ <include name="jboss-web.xml"/>
+ </webinf>
+ <zipfileset
+ dir="${tests.output.dir}/test-resources/jaxws/samples/wsse/policy/trust/WEB-INF"
+ prefix="WEB-INF/classes">
+ <include name="stsstore.jks"/>
+ <include name="picketlink-sts.xml"/>
+ <include name="stsKeystore.properties"/>
+ </zipfileset>
+ <manifest>
+ <attribute name="Dependencies"
+ value="org.jboss.ws.cxf.jbossws-cxf-client,org.picketlink"/>
+ </manifest>
</war>
<!-- jaxws-samples-wsse-policy-username-unsecure-transport -->
Modified: stack/cxf/branches/jaspi/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/cxf/clientConfig/CXFClientConfigurationTestCase.java
===================================================================
--- stack/cxf/branches/jaspi/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/cxf/clientConfig/CXFClientConfigurationTestCase.java 2014-02-11 09:00:46 UTC (rev 18337)
+++ stack/cxf/branches/jaspi/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/cxf/clientConfig/CXFClientConfigurationTestCase.java 2014-02-11 09:07:45 UTC (rev 18338)
@@ -100,45 +100,7 @@
public void testConfigurationChangeOnDispatchInContainer() throws Exception {
assertEquals("1", runTestInContainer("testConfigurationChangeOnDispatch"));
}
-
- /**
- * Verifies the default client configuration from AS model is used
- *
- * @throws Exception
- */
- public void testDefaultClientConfigurationInContainer() throws Exception {
- if (!isTargetJBoss71()) {
- assertEquals("1", runTestInContainer("testDefaultClientConfiguration"));
- }
- }
- public void testDefaultClientConfigurationOnDispatchInContainer() throws Exception {
- if (!isTargetJBoss71()) {
- assertEquals("1", runTestInContainer("testDefaultClientConfigurationOnDispatch"));
- }
- }
-
- /**
- * Verifies a client configuration from AS model can be set
- *
- * @throws Exception
- */
- public void testCustomClientConfigurationInContainer() throws Exception {
- assertEquals("1", runTestInContainer("testCustomClientConfiguration"));
- }
-
- public void testCustomClientConfigurationOnDispatchInContainer() throws Exception {
- assertEquals("1", runTestInContainer("testCustomClientConfigurationOnDispatch"));
- }
-
- public void testCustomClientConfigurationUsingFeatureInContainer() throws Exception {
- assertEquals("1", runTestInContainer("testCustomClientConfigurationUsingFeature"));
- }
-
- public void testCustomClientConfigurationOnDispatchUsingFeatureInContainer() throws Exception {
- assertEquals("1", runTestInContainer("testCustomClientConfigurationOnDispatchUsingFeature"));
- }
-
// -------------------------
private Helper getHelper() {
Copied: stack/cxf/branches/jaspi/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/cxf/clientConfig/CXFClientConfigurationTestCaseForked.java (from rev 18336, stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/cxf/clientConfig/CXFClientConfigurationTestCaseForked.java)
===================================================================
--- stack/cxf/branches/jaspi/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/cxf/clientConfig/CXFClientConfigurationTestCaseForked.java (rev 0)
+++ stack/cxf/branches/jaspi/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/cxf/clientConfig/CXFClientConfigurationTestCaseForked.java 2014-02-11 09:07:45 UTC (rev 18338)
@@ -0,0 +1,90 @@
+/*
+ * JBoss, Home of Professional Open Source.
+ * Copyright 2013, Red Hat Middleware LLC, and individual contributors
+ * as indicated by the @author tags. See the copyright.txt file in the
+ * distribution for a full listing of individual contributors.
+ *
+ * This is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU Lesser General Public License as
+ * published by the Free Software Foundation; either version 2.1 of
+ * the License, or (at your option) any later version.
+ *
+ * This software is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this software; if not, write to the Free
+ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
+ * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
+ */
+package org.jboss.test.ws.jaxws.cxf.clientConfig;
+
+import java.io.BufferedReader;
+import java.io.InputStreamReader;
+import java.net.URL;
+
+import junit.framework.Test;
+
+import org.jboss.wsf.test.JBossWSTest;
+import org.jboss.wsf.test.JBossWSTestSetup;
+
+/**
+ * Verifies client configuration setup (in-container tests, relying on AS model)
+ *
+ * @author alessio.soldano(a)jboss.com
+ * @since 31-May-2012
+ */
+public class CXFClientConfigurationTestCaseForked extends JBossWSTest
+{
+ public static Test suite()
+ {
+ return new JBossWSTestSetup(CXFClientConfigurationTestCaseForked.class, "jaxws-cxf-clientConfig.war,jaxws-cxf-clientConfig-client.jar,jaxws-cxf-clientConfig-inContainer-client.war");
+ }
+
+ /**
+ * Verifies the default client configuration from AS model is used
+ *
+ * @throws Exception
+ */
+ public void testDefaultClientConfigurationInContainer() throws Exception {
+ assertEquals("1", runTestInContainer("testDefaultClientConfiguration"));
+ }
+
+ public void testDefaultClientConfigurationOnDispatchInContainer() throws Exception {
+ assertEquals("1", runTestInContainer("testDefaultClientConfigurationOnDispatch"));
+ }
+
+ /**
+ * Verifies a client configuration from AS model can be set
+ *
+ * @throws Exception
+ */
+ public void testCustomClientConfigurationInContainer() throws Exception {
+ assertEquals("1", runTestInContainer("testCustomClientConfiguration"));
+ }
+
+ public void testCustomClientConfigurationOnDispatchInContainer() throws Exception {
+ assertEquals("1", runTestInContainer("testCustomClientConfigurationOnDispatch"));
+ }
+
+ public void testCustomClientConfigurationUsingFeatureInContainer() throws Exception {
+ assertEquals("1", runTestInContainer("testCustomClientConfigurationUsingFeature"));
+ }
+
+ public void testCustomClientConfigurationOnDispatchUsingFeatureInContainer() throws Exception {
+ assertEquals("1", runTestInContainer("testCustomClientConfigurationOnDispatchUsingFeature"));
+ }
+
+ // -------------------------
+
+ private String runTestInContainer(String test) throws Exception
+ {
+ URL url = new URL("http://" + getServerHost()
+ + ":8080/jaxws-cxf-clientConfig-inContainer-client?path=/jaxws-cxf-clientConfig/EndpointImpl&method=" + test
+ + "&helper=" + Helper.class.getName());
+ BufferedReader br = new BufferedReader(new InputStreamReader(url.openStream()));
+ return br.readLine();
+ }
+}
Modified: stack/cxf/branches/jaspi/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/cxf/clientConfig/Helper.java
===================================================================
--- stack/cxf/branches/jaspi/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/cxf/clientConfig/Helper.java 2014-02-11 09:00:46 UTC (rev 18337)
+++ stack/cxf/branches/jaspi/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/cxf/clientConfig/Helper.java 2014-02-11 09:07:45 UTC (rev 18338)
@@ -22,6 +22,8 @@
package org.jboss.test.ws.jaxws.cxf.clientConfig;
import java.net.URL;
+import java.util.HashMap;
+import java.util.Map;
import javax.xml.namespace.QName;
import javax.xml.soap.SOAPMessage;
@@ -34,6 +36,7 @@
import org.jboss.ws.api.configuration.ClientConfigFeature;
import org.jboss.ws.api.configuration.ClientConfigUtil;
import org.jboss.ws.api.configuration.ClientConfigurer;
+import org.jboss.wsf.spi.metadata.config.ClientConfig;
import org.jboss.wsf.test.ClientHelper;
/**
@@ -139,11 +142,15 @@
public boolean testDefaultClientConfiguration() throws Exception
{
final URL wsdlURL = new URL(address + "?wsdl");
+ final ClientConfig defaultClientConfig = TestUtils.getAndVerifyDefaultClientConfiguration();
// -- modify default conf --
try
{
- TestUtils.getAndVerifyDefaultClientConfiguration().setProperty("propA", "valueA");
+
+ final Map<String, String> props = new HashMap<String, String>();
+ props.put("propA", "valueA");
+ TestUtils.registerClientConfigAndReload(new ClientConfig(defaultClientConfig.getConfigName(), null, null, props, null));
// --
Service service = Service.create(wsdlURL, serviceName);
@@ -154,7 +161,7 @@
finally
{
// -- restore default conf --
- TestUtils.cleanupClientConfig();
+ TestUtils.registerClientConfigAndReload(defaultClientConfig);
// --
}
}
@@ -162,11 +169,14 @@
public boolean testDefaultClientConfigurationOnDispatch() throws Exception
{
final URL wsdlURL = new URL(address + "?wsdl");
+ final ClientConfig defaultClientConfig = TestUtils.getAndVerifyDefaultClientConfiguration();
// -- modify default conf --
try
{
- TestUtils.getAndVerifyDefaultClientConfiguration().setProperty("propA", "valueA");
+ final Map<String, String> props = new HashMap<String, String>();
+ props.put("propA", "valueA");
+ TestUtils.registerClientConfigAndReload(new ClientConfig(defaultClientConfig.getConfigName(), null, null, props, null));
// --
Service service = Service.create(wsdlURL, serviceName);
@@ -177,7 +187,7 @@
finally
{
// -- restore default conf --
- TestUtils.cleanupClientConfig();
+ TestUtils.registerClientConfigAndReload(defaultClientConfig);
// --
}
}
Modified: stack/cxf/branches/jaspi/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/cxf/clientConfig/TestUtils.java
===================================================================
--- stack/cxf/branches/jaspi/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/cxf/clientConfig/TestUtils.java 2014-02-11 09:00:46 UTC (rev 18337)
+++ stack/cxf/branches/jaspi/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/cxf/clientConfig/TestUtils.java 2014-02-11 09:07:45 UTC (rev 18338)
@@ -1,6 +1,6 @@
/*
* JBoss, Home of Professional Open Source.
- * Copyright 2012, Red Hat Middleware LLC, and individual contributors
+ * Copyright 2013, Red Hat Middleware LLC, and individual contributors
* as indicated by the @author tags. See the copyright.txt file in the
* distribution for a full listing of individual contributors.
*
@@ -21,7 +21,7 @@
*/
package org.jboss.test.ws.jaxws.cxf.clientConfig;
-import java.util.Iterator;
+import java.util.Collections;
import java.util.Map;
import org.jboss.wsf.spi.SPIProvider;
@@ -41,12 +41,7 @@
{
public static ClientConfig getAndVerifyDefaultClientConfiguration() throws Exception {
ServerConfig sc = getServerConfig();
- ClientConfig defaultConfig = null;
- for (ClientConfig c : sc.getClientConfigs()) {
- if (ClientConfig.STANDARD_CLIENT_CONFIG.equals(c.getConfigName())) {
- defaultConfig = c;
- }
- }
+ ClientConfig defaultConfig = sc.getClientConfig(ClientConfig.STANDARD_CLIENT_CONFIG);
if (defaultConfig == null) {
throw new Exception("Missing AS client config '" + ClientConfig.STANDARD_CLIENT_CONFIG + "'!");
}
@@ -57,45 +52,21 @@
return defaultConfig;
}
- public static void cleanupClientConfig() throws Exception {
+ public static void registerClientConfigAndReload(ClientConfig config) {
ServerConfig sc = getServerConfig();
- ClientConfig defaultConfig = null;
- for (ClientConfig c : sc.getClientConfigs()) {
- if (ClientConfig.STANDARD_CLIENT_CONFIG.equals(c.getConfigName())) {
- defaultConfig = c;
- }
- }
- if (defaultConfig == null) {
- throw new Exception("Missing AS client config '" + ClientConfig.STANDARD_CLIENT_CONFIG + "'!");
- }
- Map<String, String> props = defaultConfig.getProperties();
- if (props == null || props.isEmpty()) {
- throw new Exception("'" + ClientConfig.STANDARD_CLIENT_CONFIG + "' property set is already empty!");
- }
- props.clear();
+ sc.registerClientConfig(config);
+ sc.reloadClientConfigs();
}
public static void addTestCaseClientConfiguration(String testConfigName) {
- ClientConfig config = new ClientConfig();
- config.setConfigName(testConfigName);
- config.setProperty("propT", "valueT");
- getServerConfig().addClientConfig(config);
+ ClientConfig config = new ClientConfig(testConfigName, null, null, Collections.singletonMap("propT", "valueT"), null);
+ registerClientConfigAndReload(config);
}
public static void removeTestCaseClientConfiguration(String testConfigName) {
ServerConfig sc = getServerConfig();
- Iterator<ClientConfig> it = sc.getClientConfigs().iterator();
- ClientConfig toBeRemoved = null;
- while (it.hasNext()) {
- ClientConfig c = it.next();
- if (testConfigName.equals(c.getConfigName())) {
- toBeRemoved = c;
- break;
- }
- }
- if (toBeRemoved != null) {
- sc.getClientConfigs().remove(toBeRemoved);
- }
+ sc.unregisterClientConfig(new ClientConfig(testConfigName, null, null, null, null));
+ sc.reloadClientConfigs();
}
private static ServerConfig getServerConfig()
Modified: stack/cxf/branches/jaspi/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/cxf/jbws3098/BusHolderLifeCycleTestCase.java
===================================================================
--- stack/cxf/branches/jaspi/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/cxf/jbws3098/BusHolderLifeCycleTestCase.java 2014-02-11 09:00:46 UTC (rev 18337)
+++ stack/cxf/branches/jaspi/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/cxf/jbws3098/BusHolderLifeCycleTestCase.java 2014-02-11 09:07:45 UTC (rev 18338)
@@ -26,7 +26,11 @@
import org.apache.cxf.Bus;
import org.apache.cxf.buslifecycle.BusLifeCycleListener;
import org.apache.cxf.buslifecycle.BusLifeCycleManager;
+<<<<<<< .working
import org.jboss.wsf.spi.deployment.Deployment;
+=======
+import org.jboss.ws.common.deployment.DefaultDeploymentModelFactory;
+>>>>>>> .merge-right.r18336
import org.jboss.wsf.stack.cxf.client.util.SpringUtils;
import org.jboss.wsf.stack.cxf.configuration.BusHolder;
import org.jboss.wsf.stack.cxf.configuration.NonSpringBusHolder;
@@ -64,7 +68,7 @@
Bus bus = holder.getBus();
TestLifeCycleListener listener = new TestLifeCycleListener();
bus.getExtension(BusLifeCycleManager.class).registerLifeCycleListener(listener);
- holder.configure(null, null, null, null, null);
+ holder.configure(null, null, null, new DefaultDeploymentModelFactory().newDeployment("testDeployment", null), null);
holder.close();
assertEquals("preShutdown method on listener should be called exactly once; number of actual calls: "
+ listener.getCount(), 1, listener.getCount());
@@ -75,7 +79,7 @@
Bus bus = holder.getBus();
TestLifeCycleListener listener = new TestLifeCycleListener();
bus.getExtension(BusLifeCycleManager.class).registerLifeCycleListener(listener);
- holder.configure(null, null, null, null, null);
+ holder.configure(null, null, null, new DefaultDeploymentModelFactory().newDeployment("testDeployment", null), null);
bus.shutdown(true);
holder.close();
assertEquals("preShutdown method on listener should be called exactly once; number of actual calls: "
@@ -87,7 +91,7 @@
Bus bus = holder.getBus();
TestLifeCycleListener listener = new TestLifeCycleListener();
bus.getExtension(BusLifeCycleManager.class).registerLifeCycleListener(listener);
- holder.configure(null, null, null, null, null);
+ holder.configure(null, null, null, new DefaultDeploymentModelFactory().newDeployment("testDeployment", null), null);
assertEquals("preShutdown method on listener shouldn't be called before holder is closed: number of actual calls: "
+ listener.getCount(), 0, listener.getCount());
holder.close();
Modified: stack/cxf/branches/jaspi/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/cxf/jbws3648/PolicyAttachmentTestCase.java
===================================================================
--- stack/cxf/branches/jaspi/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/cxf/jbws3648/PolicyAttachmentTestCase.java 2014-02-11 09:00:46 UTC (rev 18337)
+++ stack/cxf/branches/jaspi/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/cxf/jbws3648/PolicyAttachmentTestCase.java 2014-02-11 09:07:45 UTC (rev 18338)
@@ -36,6 +36,7 @@
import org.apache.cxf.interceptor.LoggingInInterceptor;
import org.apache.cxf.ws.security.SecurityConstants;
import org.jboss.wsf.stack.cxf.client.UseThreadBusFeature;
+import org.jboss.wsf.test.CryptoHelper;
import org.jboss.wsf.test.JBossWSCXFTestSetup;
import org.jboss.wsf.test.JBossWSTest;
@@ -91,7 +92,11 @@
EndpointFour proxy = (EndpointFour)service.getPort(EndpointFour.class);
setupWsse((BindingProvider)proxy);
- assertEquals("Foo4", proxy.echo("Foo4"));
+ try {
+ assertEquals("Foo4", proxy.echo("Foo4"));
+ } catch (Exception e) {
+ throw CryptoHelper.checkAndWrapException(e);
+ }
final String m = bos.toString();
assertTrue("WS-Addressing was not enabled!", m.contains("http://www.w3.org/2005/08/addressing") && m.contains("http://www.w3.org/2005/08/addressing/anonymous"));
assertTrue("WS-Security was not enabled!", m.contains("http://www.w3.org/2001/04/xmlenc#rsa-1_5") && m.contains("http://www.w3.org/2001/04/xmlenc#aes256-cbc"));
Modified: stack/cxf/branches/jaspi/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/samples/schemavalidation/DefaultSchemaValidationTestCaseForked.java
===================================================================
--- stack/cxf/branches/jaspi/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/samples/schemavalidation/DefaultSchemaValidationTestCaseForked.java 2014-02-11 09:00:46 UTC (rev 18337)
+++ stack/cxf/branches/jaspi/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/samples/schemavalidation/DefaultSchemaValidationTestCaseForked.java 2014-02-11 09:07:45 UTC (rev 18338)
@@ -55,13 +55,11 @@
* @throws Exception
*/
public void testDefaultClientValidation() throws Exception {
- if (!isTargetJBoss71()) {
- try {
- JBossWSTestHelper.deploy("jaxws-samples-schemavalidation.war");
- assertEquals("1", runInContainer("testDefaultClientValidation"));
- } finally {
- JBossWSTestHelper.undeploy("jaxws-samples-schemavalidation.war");
- }
+ try {
+ JBossWSTestHelper.deploy("jaxws-samples-schemavalidation.war");
+ assertEquals("1", runInContainer("testDefaultClientValidation"));
+ } finally {
+ JBossWSTestHelper.undeploy("jaxws-samples-schemavalidation.war");
}
}
Modified: stack/cxf/branches/jaspi/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/samples/schemavalidation/Helper.java
===================================================================
--- stack/cxf/branches/jaspi/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/samples/schemavalidation/Helper.java 2014-02-11 09:00:46 UTC (rev 18337)
+++ stack/cxf/branches/jaspi/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/samples/schemavalidation/Helper.java 2014-02-11 09:07:45 UTC (rev 18338)
@@ -22,7 +22,7 @@
package org.jboss.test.ws.jaxws.samples.schemavalidation;
import java.net.URL;
-import java.util.List;
+import java.util.HashMap;
import java.util.Map;
import javax.xml.namespace.QName;
@@ -48,6 +48,8 @@
{
private String address;
+ private static final EndpointConfig defaultEndpointConfig = getServerConfig().getEndpointConfig(EndpointConfig.STANDARD_ENDPOINT_CONFIG);
+
public boolean testDefaultClientValidation() throws Exception
{
// first verify schema validation is not enabled yet: a wsdl with schema restrictions is used on client side,
@@ -69,10 +71,11 @@
return false;
}
+ final ClientConfig defClientConfig = (ClientConfig)getAndVerifyDefaultConfiguration(true);
// then modify default conf to enable default client schema validation
try
{
- modifyDefaultClientConfiguration(getAndVerifyDefaultConfiguration(true));
+ modifyDefaultConfiguration(true);
service = Service.create(wsdlURL, serviceName);
proxy = (Hello) service.getPort(portName, Hello.class);
@@ -95,18 +98,19 @@
finally
{
// -- restore default conf --
- cleanupConfig(true);
+ registerClientConfigAndReload(defClientConfig);
// --
}
}
public boolean enableDefaultEndpointSchemaValidation() throws Exception {
- modifyDefaultClientConfiguration(getAndVerifyDefaultConfiguration(false));
+ getAndVerifyDefaultConfiguration(false);
+ modifyDefaultConfiguration(false);
return true;
}
public boolean disableDefaultEndpointSchemaValidation() throws Exception {
- cleanupConfig(false);
+ registerEndpointConfigAndReload(defaultEndpointConfig);
return true;
}
@@ -116,16 +120,9 @@
this.address = address;
}
- protected static AbstractCommonConfig getAndVerifyDefaultConfiguration(boolean client) throws Exception {
- ServerConfig sc = getServerConfig();
- AbstractCommonConfig defaultConfig = null;
- final List<? extends AbstractCommonConfig> cfgs = client ? sc.getClientConfigs() : sc.getEndpointConfigs();
+ protected AbstractCommonConfig getAndVerifyDefaultConfiguration(boolean client) throws Exception {
final String DEFCFG = client ? ClientConfig.STANDARD_CLIENT_CONFIG : EndpointConfig.STANDARD_ENDPOINT_CONFIG;
- for (AbstractCommonConfig c : cfgs) {
- if (DEFCFG.equals(c.getConfigName())) {
- defaultConfig = c;
- }
- }
+ final AbstractCommonConfig defaultConfig = client ? getServerConfig().getClientConfig(DEFCFG) : defaultEndpointConfig;
if (defaultConfig == null) {
throw new Exception("Missing AS config '" + DEFCFG + "'!");
}
@@ -136,30 +133,28 @@
return defaultConfig;
}
- protected static void modifyDefaultClientConfiguration(AbstractCommonConfig defaultConfig) {
- defaultConfig.setProperty("schema-validation-enabled", "true");
+ protected static void modifyDefaultConfiguration(final boolean client) {
+ final Map<String, String> props = new HashMap<String, String>();
+ props.put("schema-validation-enabled", "true");
+ if (client) {
+ registerClientConfigAndReload(new ClientConfig(ClientConfig.STANDARD_CLIENT_CONFIG, null, null, props, null));
+ } else {
+ registerEndpointConfigAndReload(new EndpointConfig(EndpointConfig.STANDARD_ENDPOINT_CONFIG, null, null, props, null));
+ }
}
- protected static void cleanupConfig(boolean client) throws Exception {
+ protected static void registerClientConfigAndReload(ClientConfig config) {
ServerConfig sc = getServerConfig();
- AbstractCommonConfig defaultConfig = null;
- final List<? extends AbstractCommonConfig> cfgs = client ? sc.getClientConfigs() : sc.getEndpointConfigs();
- final String DEFCFG = client ? ClientConfig.STANDARD_CLIENT_CONFIG : EndpointConfig.STANDARD_ENDPOINT_CONFIG;
- for (AbstractCommonConfig c : cfgs) {
- if (DEFCFG.equals(c.getConfigName())) {
- defaultConfig = c;
- }
- }
- if (defaultConfig == null) {
- throw new Exception("Missing AS config '" + DEFCFG + "'!");
- }
- Map<String, String> props = defaultConfig.getProperties();
- if (props == null || props.isEmpty()) {
- throw new Exception("'" + DEFCFG + "' is already empty!");
- }
- props.clear();
+ sc.registerClientConfig(config);
+ sc.reloadClientConfigs();
}
+ protected static void registerEndpointConfigAndReload(EndpointConfig config) {
+ ServerConfig sc = getServerConfig();
+ sc.registerEndpointConfig(config);
+ sc.reloadEndpointConfigs();
+ }
+
private static ServerConfig getServerConfig()
{
final ClassLoader cl = ClassLoaderProvider.getDefaultProvider().getServerIntegrationClassLoader();
Modified: stack/cxf/branches/jaspi/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/samples/wsdd/WSDiscoveryTestCase.java
===================================================================
--- stack/cxf/branches/jaspi/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/samples/wsdd/WSDiscoveryTestCase.java 2014-02-11 09:00:46 UTC (rev 18337)
+++ stack/cxf/branches/jaspi/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/samples/wsdd/WSDiscoveryTestCase.java 2014-02-11 09:07:45 UTC (rev 18338)
@@ -21,6 +21,8 @@
*/
package org.jboss.test.ws.jaxws.samples.wsdd;
+import java.net.URL;
+import java.util.ArrayList;
import java.util.LinkedList;
import java.util.List;
@@ -34,7 +36,6 @@
import org.apache.cxf.BusFactory;
import org.apache.cxf.ws.discovery.WSDiscoveryClient;
import org.apache.cxf.ws.discovery.wsdl.ProbeMatchType;
-import org.apache.cxf.ws.discovery.wsdl.ProbeMatchesType;
import org.apache.cxf.ws.discovery.wsdl.ProbeType;
import org.apache.cxf.ws.discovery.wsdl.ResolveMatchType;
import org.apache.cxf.ws.discovery.wsdl.ScopesType;
@@ -65,11 +66,10 @@
ProbeType pt = new ProbeType();
ScopesType scopes = new ScopesType();
pt.setScopes(scopes);
- ProbeMatchesType pmts = client.probe(pt, TIMEOUT);
- assertNotNull(pmts);
- assertEquals(3, pmts.getProbeMatch().size());
+ List<ProbeMatchType> pmts = filterProbeMatchesForHost(client.probe(pt, TIMEOUT).getProbeMatch(), getServerHost());
+
List<ResolveMatchType> rmts = new LinkedList<ResolveMatchType>();
- for (ProbeMatchType pmt : pmts.getProbeMatch()) {
+ for (ProbeMatchType pmt : pmts) {
W3CEndpointReference epr = pmt.getEndpointReference();
ResolveMatchType rmt = client.resolve(epr, TIMEOUT);
assertNotNull("Could not resolve (timeout = " + TIMEOUT + " ms) reference: " + epr, rmt);
@@ -86,6 +86,34 @@
}
}
+ private List<ProbeMatchType> filterProbeMatchesForHost(List<ProbeMatchType> probes, String serverHost)
+ {
+ final List<ProbeMatchType> filtered = new ArrayList<ProbeMatchType>();
+ for (ProbeMatchType probeMatchType : probes)
+ {
+ final List<String> addresses = probeMatchType.getXAddrs();
+ if (addresses == null || addresses.isEmpty()) {
+ //add Probe Match if it has no address (which is optional and might be omitted on probe match result)
+ filtered.add(probeMatchType);
+ } else {
+ for (String addr : addresses) {
+ try {
+ final URL url = new URL(addr);
+ //add Probe Match only if it's from the current serverHost (for test purposes we do not want
+ //to consider match results that might be coming from other services on the same network)
+ if (url.getHost().contains(serverHost)) {
+ filtered.add(probeMatchType);
+ break;
+ }
+ } catch (Exception e) {
+ //ignore and move on
+ }
+ }
+ }
+ }
+ return filtered;
+ }
+
public void testInvocation() throws Exception
{
Bus bus = null;
@@ -96,11 +124,10 @@
ProbeType pt = new ProbeType();
ScopesType scopes = new ScopesType();
pt.setScopes(scopes);
- ProbeMatchesType pmts = client.probe(pt, TIMEOUT);
- assertNotNull(pmts);
- assertEquals(3, pmts.getProbeMatch().size());
+ List<ProbeMatchType> pmts = filterProbeMatchesForHost(client.probe(pt, TIMEOUT).getProbeMatch(), getServerHost());
+
List<ResolveMatchType> rmts = new LinkedList<ResolveMatchType>();
- for (ProbeMatchType pmt : pmts.getProbeMatch()) {
+ for (ProbeMatchType pmt : pmts) {
W3CEndpointReference epr = pmt.getEndpointReference();
ResolveMatchType rmt = client.resolve(epr, TIMEOUT);
assertNotNull("Could not resolve (timeout = " + TIMEOUT + " ms) reference: " + epr, rmt);
Modified: stack/cxf/branches/jaspi/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/samples/wsse/policy/basic/AnnotatedSignEncryptTestCase.java
===================================================================
--- stack/cxf/branches/jaspi/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/samples/wsse/policy/basic/AnnotatedSignEncryptTestCase.java 2014-02-11 09:00:46 UTC (rev 18337)
+++ stack/cxf/branches/jaspi/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/samples/wsse/policy/basic/AnnotatedSignEncryptTestCase.java 2014-02-11 09:07:45 UTC (rev 18338)
@@ -32,6 +32,7 @@
import junit.framework.Test;
import org.apache.cxf.ws.security.SecurityConstants;
+import org.jboss.wsf.test.CryptoHelper;
import org.jboss.wsf.test.JBossWSCXFTestSetup;
import org.jboss.wsf.test.JBossWSTest;
@@ -69,12 +70,16 @@
public void test() throws Exception
{
- QName serviceName = new QName("http://www.jboss.org/jbossws/ws-extensions/wssecuritypolicy", "AnnotatedSecurityService");
- URL wsdlURL = new URL(serviceURL + "?wsdl");
- Service service = Service.create(wsdlURL, serviceName);
- AnnotatedServiceIface proxy = (AnnotatedServiceIface)service.getPort(AnnotatedServiceIface.class);
- setupWsse(proxy);
- assertEquals("Secure Hello World!", proxy.sayHello());
+ try {
+ QName serviceName = new QName("http://www.jboss.org/jbossws/ws-extensions/wssecuritypolicy", "AnnotatedSecurityService");
+ URL wsdlURL = new URL(serviceURL + "?wsdl");
+ Service service = Service.create(wsdlURL, serviceName);
+ AnnotatedServiceIface proxy = (AnnotatedServiceIface)service.getPort(AnnotatedServiceIface.class);
+ setupWsse(proxy);
+ assertEquals("Secure Hello World!", proxy.sayHello());
+ } catch (Exception e) {
+ throw CryptoHelper.checkAndWrapException(e);
+ }
}
private void setupWsse(AnnotatedServiceIface proxy)
Modified: stack/cxf/branches/jaspi/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/samples/wsse/policy/basic/SignEncryptHelper.java
===================================================================
--- stack/cxf/branches/jaspi/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/samples/wsse/policy/basic/SignEncryptHelper.java 2014-02-11 09:00:46 UTC (rev 18337)
+++ stack/cxf/branches/jaspi/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/samples/wsse/policy/basic/SignEncryptHelper.java 2014-02-11 09:07:45 UTC (rev 18338)
@@ -34,6 +34,7 @@
import org.apache.cxf.ws.security.SecurityConstants;
import org.jboss.ws.api.configuration.ClientConfigUtil;
import org.jboss.wsf.test.ClientHelper;
+import org.jboss.wsf.test.CryptoHelper;
public class SignEncryptHelper implements ClientHelper
{
@@ -91,7 +92,7 @@
}
catch (SOAPFaultException e)
{
- throw new Exception("Please check that the Bouncy Castle provider is installed.", e);
+ throw CryptoHelper.checkAndWrapException(e);
}
}
Modified: stack/cxf/branches/jaspi/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/samples/wsse/policy/oasis/WSSecurityPolicyExamples22xTestCase.java
===================================================================
--- stack/cxf/branches/jaspi/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/samples/wsse/policy/oasis/WSSecurityPolicyExamples22xTestCase.java 2014-02-11 09:00:46 UTC (rev 18337)
+++ stack/cxf/branches/jaspi/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/samples/wsse/policy/oasis/WSSecurityPolicyExamples22xTestCase.java 2014-02-11 09:07:45 UTC (rev 18338)
@@ -31,6 +31,7 @@
import org.apache.cxf.ws.security.SecurityConstants;
import org.jboss.test.ws.jaxws.samples.wsse.policy.basic.KeystorePasswordCallback;
+import org.jboss.wsf.test.CryptoHelper;
import org.jboss.wsf.test.JBossWSCXFTestSetup;
import org.jboss.wsf.test.JBossWSTest;
@@ -68,7 +69,11 @@
Service service = Service.create(new URL(serviceURL + "SecurityService221?wsdl"), serviceName);
ServiceIface proxy = (ServiceIface)service.getPort(new QName(NS, "SecurityService221Port"), ServiceIface.class);
setupWsse(proxy);
- assertTrue(proxy.sayHello().equals("Hello - (WSS1.0) X.509 Certificates, Sign, Encrypt"));
+ try {
+ assertTrue(proxy.sayHello().equals("Hello - (WSS1.0) X.509 Certificates, Sign, Encrypt"));
+ } catch (Exception e) {
+ throw CryptoHelper.checkAndWrapException(e);
+ }
}
/**
@@ -86,7 +91,11 @@
Service service = Service.create(new URL(serviceURL + "SecurityService222?wsdl"), serviceName);
ServiceIface proxy = (ServiceIface)service.getPort(new QName(NS, "SecurityService222Port"), ServiceIface.class);
setupWsse(proxy);
- assertTrue(proxy.sayHello().equals("Hello - (WSS1.0) Mutual Authentication with X.509 Certificates, Sign, Encrypt"));
+ try {
+ assertTrue(proxy.sayHello().equals("Hello - (WSS1.0) Mutual Authentication with X.509 Certificates, Sign, Encrypt"));
+ } catch (Exception e) {
+ throw CryptoHelper.checkAndWrapException(e);
+ }
}
/**
@@ -104,7 +113,11 @@
Service service = Service.create(new URL(serviceURL + "SecurityService223?wsdl"), serviceName);
ServiceIface proxy = (ServiceIface)service.getPort(new QName(NS, "SecurityService223Port"), ServiceIface.class);
setupWsse(proxy);
- assertTrue(proxy.sayHello().equals("Hello - (WSS1.1) Anonymous with X.509 Certificates, Sign, Encrypt"));
+ try {
+ assertTrue(proxy.sayHello().equals("Hello - (WSS1.1) Anonymous with X.509 Certificates, Sign, Encrypt"));
+ } catch (Exception e) {
+ throw CryptoHelper.checkAndWrapException(e);
+ }
}
/**
@@ -122,7 +135,11 @@
Service service = Service.create(new URL(serviceURL + "SecurityService224?wsdl"), serviceName);
ServiceIface proxy = (ServiceIface)service.getPort(new QName(NS, "SecurityService224Port"), ServiceIface.class);
setupWsse(proxy);
- assertTrue(proxy.sayHello().equals("Hello - (WSS1.1) Mutual Authentication with X.509 Certificates, Sign, Encrypt"));
+ try {
+ assertTrue(proxy.sayHello().equals("Hello - (WSS1.1) Mutual Authentication with X.509 Certificates, Sign, Encrypt"));
+ } catch (Exception e) {
+ throw CryptoHelper.checkAndWrapException(e);
+ }
}
private void setupWsse(ServiceIface proxy)
Modified: stack/cxf/branches/jaspi/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/samples/wsse/policy/oasis/WSSecurityPolicyExamples23xTestCase.java
===================================================================
--- stack/cxf/branches/jaspi/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/samples/wsse/policy/oasis/WSSecurityPolicyExamples23xTestCase.java 2014-02-11 09:00:46 UTC (rev 18337)
+++ stack/cxf/branches/jaspi/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/samples/wsse/policy/oasis/WSSecurityPolicyExamples23xTestCase.java 2014-02-11 09:07:45 UTC (rev 18338)
@@ -32,6 +32,7 @@
import junit.framework.Test;
import org.apache.cxf.ws.security.SecurityConstants;
+import org.jboss.wsf.test.CryptoHelper;
import org.jboss.wsf.test.JBossWSCXFTestSetup;
import org.jboss.wsf.test.JBossWSTest;
@@ -155,7 +156,11 @@
reqCtx.put(SecurityConstants.ENCRYPT_PROPERTIES, Thread.currentThread().getContextClassLoader().getResource("META-INF/alice.properties"));
reqCtx.put(SecurityConstants.SIGNATURE_USERNAME, "alice");
reqCtx.put(SecurityConstants.ENCRYPT_USERNAME, "bob");
- assertTrue(proxy.sayHello().equals("Hello - (WSS1.0) SAML1.1 Sender Vouches with X.509 Certificates, Sign, Optional Encrypt"));
+ try {
+ assertTrue(proxy.sayHello().equals("Hello - (WSS1.0) SAML1.1 Sender Vouches with X.509 Certificates, Sign, Optional Encrypt"));
+ } catch (Exception e) {
+ throw CryptoHelper.checkAndWrapException(e);
+ }
}
/**
@@ -177,7 +182,11 @@
reqCtx.put(SecurityConstants.SIGNATURE_USERNAME, "alice");
reqCtx.put(SecurityConstants.ENCRYPT_USERNAME, "bob");
reqCtx.put(SecurityConstants.SELF_SIGN_SAML_ASSERTION, "true");
- assertTrue(proxy.sayHello().equals("Hello - (WSS1.0) SAML1.1 Holder of Key, Sign, Optional Encrypt"));
+ try {
+ assertTrue(proxy.sayHello().equals("Hello - (WSS1.0) SAML1.1 Holder of Key, Sign, Optional Encrypt"));
+ } catch (Exception e) {
+ throw CryptoHelper.checkAndWrapException(e);
+ }
}
/**
@@ -257,6 +266,10 @@
reqCtx.put(SecurityConstants.ENCRYPT_PROPERTIES, Thread.currentThread().getContextClassLoader().getResource("META-INF/alice.properties"));
reqCtx.put(SecurityConstants.SIGNATURE_USERNAME, "alice");
reqCtx.put(SecurityConstants.ENCRYPT_USERNAME, "bob");
- assertTrue(proxy.sayHello().equals("Hello - (WSS1.1) SAML1.1/2.0 Sender Vouches with X.509 Certificate, Sign, Encrypt"));
+ try {
+ assertTrue(proxy.sayHello().equals("Hello - (WSS1.1) SAML1.1/2.0 Sender Vouches with X.509 Certificate, Sign, Encrypt"));
+ } catch (Exception e) {
+ throw CryptoHelper.checkAndWrapException(e);
+ }
}
}
Deleted: stack/cxf/branches/jaspi/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/samples/wsse/policy/trust/ClientCallbackHandler.java
===================================================================
--- stack/cxf/branches/jaspi/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/samples/wsse/policy/trust/ClientCallbackHandler.java 2014-02-11 09:00:46 UTC (rev 18337)
+++ stack/cxf/branches/jaspi/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/samples/wsse/policy/trust/ClientCallbackHandler.java 2014-02-11 09:07:45 UTC (rev 18338)
@@ -1,50 +0,0 @@
-/**
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-package org.jboss.test.ws.jaxws.samples.wsse.policy.trust;
-
-import java.io.IOException;
-import javax.security.auth.callback.Callback;
-import javax.security.auth.callback.CallbackHandler;
-import javax.security.auth.callback.UnsupportedCallbackException;
-import org.apache.ws.security.WSPasswordCallback;
-
-public class ClientCallbackHandler implements CallbackHandler {
-
- public void handle(Callback[] callbacks) throws IOException,
- UnsupportedCallbackException {
- for (int i = 0; i < callbacks.length; i++) {
- if (callbacks[i] instanceof WSPasswordCallback) {
- WSPasswordCallback pc = (WSPasswordCallback) callbacks[i];
- if ("myclientkey".equals(pc.getIdentifier())) {
- pc.setPassword("ckpass");
- break;
- } else if ("alice".equals(pc.getIdentifier())) {
- pc.setPassword("clarinet");
- break;
- } else if ("bob".equals(pc.getIdentifier())) {
- pc.setPassword("trombone");
- break;
- } else if ("eve".equals(pc.getIdentifier())) {
- pc.setPassword("evekpass");
- break;
- }
- }
- }
- }
-}
Deleted: stack/cxf/branches/jaspi/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/samples/wsse/policy/trust/PicketLinkSTService.java
===================================================================
--- stack/cxf/branches/jaspi/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/samples/wsse/policy/trust/PicketLinkSTService.java 2014-02-11 09:00:46 UTC (rev 18337)
+++ stack/cxf/branches/jaspi/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/samples/wsse/policy/trust/PicketLinkSTService.java 2014-02-11 09:07:45 UTC (rev 18338)
@@ -1,59 +0,0 @@
-/*
- * JBoss, Home of Professional Open Source.
- * Copyright 2012, Red Hat Middleware LLC, and individual contributors
- * as indicated by the @author tags. See the copyright.txt file in the
- * distribution for a full listing of individual contributors.
- *
- * This is free software; you can redistribute it and/or modify it
- * under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation; either version 2.1 of
- * the License, or (at your option) any later version.
- *
- * This software is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this software; if not, write to the Free
- * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
- * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
- */
-package org.jboss.test.ws.jaxws.samples.wsse.policy.trust;
-
-import javax.annotation.Resource;
-import javax.xml.ws.Service;
-import javax.xml.ws.ServiceMode;
-import javax.xml.ws.WebServiceContext;
-import javax.xml.ws.WebServiceProvider;
-
-import org.apache.cxf.annotations.EndpointProperties;
-import org.apache.cxf.annotations.EndpointProperty;
-import org.apache.cxf.interceptor.InInterceptors;
-import org.picketlink.identity.federation.core.wstrust.PicketLinkSTS;
-
-/**
- * A Security Token Service implementation extending default PicketLink one
- *
- * @author <a href="mailto:sguilhen@redhat.com">Stefan Guilhen</a>
- * @author <a href="mailto:pskopek@redhat.com">Peter Skopek</a>
- * @author <a href="mailto:alessio.soldano@jboss.com">Alessio Soldano</a>
- */
-@WebServiceProvider(serviceName = "PicketLinkSTS", portName = "PicketLinkSTSPort", targetNamespace = "urn:picketlink:identity-federation:sts", wsdlLocation = "WEB-INF/wsdl/PicketLinkSTS.wsdl")
-@ServiceMode(value = Service.Mode.MESSAGE)
-//be sure to have dependency on org.apache.cxf module when on AS7, otherwise Apache CXF annotations are ignored
-@EndpointProperties(value = {
- @EndpointProperty(key = "ws-security.signature.username", value = "mystskey"),
- @EndpointProperty(key = "ws-security.signature.properties", value = "stsKeystore.properties"),
- @EndpointProperty(key = "ws-security.callback-handler", value = "org.jboss.test.ws.jaxws.samples.wsse.policy.trust.STSCallbackHandler"),
- @EndpointProperty(key = "ws-security.validate.token", value = "false") //to let the JAAS integration deal with validation through the interceptor below
-})
-@InInterceptors(interceptors = {"org.jboss.wsf.stack.cxf.security.authentication.SubjectCreatingPolicyInterceptor"})
-public class PicketLinkSTService extends PicketLinkSTS
-{
- @Resource
- public void setWSC(WebServiceContext wctx) {
- this.context = wctx;
- }
-
-}
Deleted: stack/cxf/branches/jaspi/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/samples/wsse/policy/trust/STSCallbackHandler.java
===================================================================
--- stack/cxf/branches/jaspi/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/samples/wsse/policy/trust/STSCallbackHandler.java 2014-02-11 09:00:46 UTC (rev 18337)
+++ stack/cxf/branches/jaspi/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/samples/wsse/policy/trust/STSCallbackHandler.java 2014-02-11 09:07:45 UTC (rev 18338)
@@ -1,39 +0,0 @@
-/**
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-package org.jboss.test.ws.jaxws.samples.wsse.policy.trust;
-
-import java.util.HashMap;
-import java.util.Map;
-
-import org.jboss.wsf.stack.cxf.extensions.security.PasswordCallbackHandler;
-
-public class STSCallbackHandler extends PasswordCallbackHandler
-{
- public STSCallbackHandler()
- {
- super(getInitMap());
- }
-
- private static Map<String, String> getInitMap()
- {
- Map<String, String> passwords = new HashMap<String, String>();
- passwords.put("mystskey", "stskpass");
- return passwords;
- }
-}
Deleted: stack/cxf/branches/jaspi/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/samples/wsse/policy/trust/SampleSTS.java
===================================================================
--- stack/cxf/branches/jaspi/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/samples/wsse/policy/trust/SampleSTS.java 2014-02-11 09:00:46 UTC (rev 18337)
+++ stack/cxf/branches/jaspi/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/samples/wsse/policy/trust/SampleSTS.java 2014-02-11 09:07:45 UTC (rev 18338)
@@ -1,85 +0,0 @@
-/*
- * JBoss, Home of Professional Open Source.
- * Copyright 2012, Red Hat Middleware LLC, and individual contributors
- * as indicated by the @author tags. See the copyright.txt file in the
- * distribution for a full listing of individual contributors.
- *
- * This is free software; you can redistribute it and/or modify it
- * under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation; either version 2.1 of
- * the License, or (at your option) any later version.
- *
- * This software is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this software; if not, write to the Free
- * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
- * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
- */
-package org.jboss.test.ws.jaxws.samples.wsse.policy.trust;
-
-import java.util.Arrays;
-import java.util.LinkedList;
-import java.util.List;
-
-import javax.xml.ws.WebServiceProvider;
-
-import org.apache.cxf.annotations.EndpointProperties;
-import org.apache.cxf.annotations.EndpointProperty;
-import org.apache.cxf.interceptor.InInterceptors;
-import org.apache.cxf.sts.StaticSTSProperties;
-import org.apache.cxf.sts.operation.TokenIssueOperation;
-import org.apache.cxf.sts.operation.TokenValidateOperation;
-import org.apache.cxf.sts.service.ServiceMBean;
-import org.apache.cxf.sts.service.StaticService;
-import org.apache.cxf.sts.token.provider.SAMLTokenProvider;
-import org.apache.cxf.sts.token.validator.SAMLTokenValidator;
-import org.apache.cxf.ws.security.sts.provider.SecurityTokenServiceProvider;
-
-@WebServiceProvider(serviceName = "SecurityTokenService",
- portName = "UT_Port",
- targetNamespace = "http://docs.oasis-open.org/ws-sx/ws-trust/200512/",
- wsdlLocation = "WEB-INF/wsdl/ws-trust-1.4-service.wsdl")
-//be sure to have dependency on org.apache.cxf module when on AS7, otherwise Apache CXF annotations are ignored
-@EndpointProperties(value = {
- @EndpointProperty(key = "ws-security.signature.username", value = "mystskey"),
- @EndpointProperty(key = "ws-security.signature.properties", value = "stsKeystore.properties"),
- @EndpointProperty(key = "ws-security.callback-handler", value = "org.jboss.test.ws.jaxws.samples.wsse.policy.trust.STSCallbackHandler"),
- @EndpointProperty(key = "ws-security.validate.token", value = "false") //to let the JAAS integration deal with validation through the interceptor below
-})
-@InInterceptors(interceptors = {"org.jboss.wsf.stack.cxf.security.authentication.SubjectCreatingPolicyInterceptor"})
-public class SampleSTS extends SecurityTokenServiceProvider
-{
- public SampleSTS() throws Exception
- {
- super();
-
- StaticSTSProperties props = new StaticSTSProperties();
- props.setSignatureCryptoProperties("stsKeystore.properties");
- props.setSignatureUsername("mystskey");
- props.setCallbackHandlerClass(STSCallbackHandler.class.getName());
- props.setIssuer("DoubleItSTSIssuer");
-
- List<ServiceMBean> services = new LinkedList<ServiceMBean>();
- StaticService service = new StaticService();
- service.setEndpoints(Arrays.asList("http://localhost:(\\d)*/jaxws-samples-wsse-policy-trust/SecurityService",
- "http://\\[::1\\]:(\\d)*/jaxws-samples-wsse-policy-trust/SecurityService",
- "http://\\[0:0:0:0:0:0:0:1\\]:(\\d)*/jaxws-samples-wsse-policy-trust/SecurityService"));
- services.add(service);
-
- TokenIssueOperation issueOperation = new TokenIssueOperation();
- issueOperation.setServices(services);
- issueOperation.getTokenProviders().add(new SAMLTokenProvider());
- issueOperation.setStsProperties(props);
-
- TokenValidateOperation validateOperation = new TokenValidateOperation();
- validateOperation.getTokenValidators().add(new SAMLTokenValidator());
- validateOperation.setStsProperties(props);
-
- this.setIssueOperation(issueOperation);
- this.setValidateOperation(validateOperation);
- }
-}
Deleted: stack/cxf/branches/jaspi/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/samples/wsse/policy/trust/ServerCallbackHandler.java
===================================================================
--- stack/cxf/branches/jaspi/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/samples/wsse/policy/trust/ServerCallbackHandler.java 2014-02-11 09:00:46 UTC (rev 18337)
+++ stack/cxf/branches/jaspi/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/samples/wsse/policy/trust/ServerCallbackHandler.java 2014-02-11 09:07:45 UTC (rev 18338)
@@ -1,40 +0,0 @@
-/**
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-package org.jboss.test.ws.jaxws.samples.wsse.policy.trust;
-
-import java.util.HashMap;
-import java.util.Map;
-
-import org.jboss.wsf.stack.cxf.extensions.security.PasswordCallbackHandler;
-
-public class ServerCallbackHandler extends PasswordCallbackHandler
-{
-
- public ServerCallbackHandler()
- {
- super(getInitMap());
- }
-
- private static Map<String, String> getInitMap()
- {
- Map<String, String> passwords = new HashMap<String, String>();
- passwords.put("myservicekey", "skpass");
- return passwords;
- }
-}
Deleted: stack/cxf/branches/jaspi/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/samples/wsse/policy/trust/ServiceIface.java
===================================================================
--- stack/cxf/branches/jaspi/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/samples/wsse/policy/trust/ServiceIface.java 2014-02-11 09:00:46 UTC (rev 18337)
+++ stack/cxf/branches/jaspi/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/samples/wsse/policy/trust/ServiceIface.java 2014-02-11 09:07:45 UTC (rev 18338)
@@ -1,35 +0,0 @@
-/*
- * JBoss, Home of Professional Open Source.
- * Copyright 2012, Red Hat Middleware LLC, and individual contributors
- * as indicated by the @author tags. See the copyright.txt file in the
- * distribution for a full listing of individual contributors.
- *
- * This is free software; you can redistribute it and/or modify it
- * under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation; either version 2.1 of
- * the License, or (at your option) any later version.
- *
- * This software is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this software; if not, write to the Free
- * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
- * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
- */
-package org.jboss.test.ws.jaxws.samples.wsse.policy.trust;
-
-import javax.jws.WebMethod;
-import javax.jws.WebService;
-
-@WebService
-(
- targetNamespace = "http://www.jboss.org/jbossws/ws-extensions/wssecuritypolicy"
-)
-public interface ServiceIface
-{
- @WebMethod
- String sayHello();
-}
Deleted: stack/cxf/branches/jaspi/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/samples/wsse/policy/trust/ServiceImpl.java
===================================================================
--- stack/cxf/branches/jaspi/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/samples/wsse/policy/trust/ServiceImpl.java 2014-02-11 09:00:46 UTC (rev 18337)
+++ stack/cxf/branches/jaspi/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/samples/wsse/policy/trust/ServiceImpl.java 2014-02-11 09:07:45 UTC (rev 18338)
@@ -1,49 +0,0 @@
-/*
- * JBoss, Home of Professional Open Source.
- * Copyright 2012, Red Hat Middleware LLC, and individual contributors
- * as indicated by the @author tags. See the copyright.txt file in the
- * distribution for a full listing of individual contributors.
- *
- * This is free software; you can redistribute it and/or modify it
- * under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation; either version 2.1 of
- * the License, or (at your option) any later version.
- *
- * This software is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this software; if not, write to the Free
- * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
- * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
- */
-package org.jboss.test.ws.jaxws.samples.wsse.policy.trust;
-
-import javax.jws.WebService;
-
-import org.apache.cxf.annotations.EndpointProperties;
-import org.apache.cxf.annotations.EndpointProperty;
-
-@WebService
-(
- portName = "SecurityServicePort",
- serviceName = "SecurityService",
- wsdlLocation = "WEB-INF/wsdl/SecurityService.wsdl",
- targetNamespace = "http://www.jboss.org/jbossws/ws-extensions/wssecuritypolicy",
- endpointInterface = "org.jboss.test.ws.jaxws.samples.wsse.policy.trust.ServiceIface"
-)
-@EndpointProperties(value = {
- @EndpointProperty(key = "ws-security.signature.username", value = "myservicekey"),
- @EndpointProperty(key = "ws-security.signature.properties", value = "serviceKeystore.properties"),
- @EndpointProperty(key = "ws-security.encryption.properties", value = "serviceKeystore.properties"),
- @EndpointProperty(key = "ws-security.callback-handler", value = "org.jboss.test.ws.jaxws.samples.wsse.policy.trust.ServerCallbackHandler")
-})
-public class ServiceImpl implements ServiceIface
-{
- public String sayHello()
- {
- return "WS-Trust Hello World!";
- }
-}
Copied: stack/cxf/branches/jaspi/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/samples/wsse/policy/trust/WSTrustActAsTestCase.java (from rev 18336, stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/samples/wsse/policy/trust/WSTrustActAsTestCase.java)
===================================================================
--- stack/cxf/branches/jaspi/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/samples/wsse/policy/trust/WSTrustActAsTestCase.java (rev 0)
+++ stack/cxf/branches/jaspi/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/samples/wsse/policy/trust/WSTrustActAsTestCase.java 2014-02-11 09:07:45 UTC (rev 18338)
@@ -0,0 +1,84 @@
+/*
+ * JBoss, Home of Professional Open Source.
+ * Copyright 2012, Red Hat Middleware LLC, and individual contributors
+ * as indicated by the @author tags. See the copyright.txt file in the
+ * distribution for a full listing of individual contributors.
+ *
+ * This is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU Lesser General Public License as
+ * published by the Free Software Foundation; either version 2.1 of
+ * the License, or (at your option) any later version.
+ *
+ * This software is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this software; if not, write to the Free
+ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
+ * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
+ */
+package org.jboss.test.ws.jaxws.samples.wsse.policy.trust;
+
+import junit.framework.Test;
+import org.apache.cxf.Bus;
+import org.apache.cxf.BusFactory;
+import org.jboss.test.ws.jaxws.samples.wsse.policy.trust.actas.ActAsServiceIface;
+import org.jboss.wsf.test.JBossWSTest;
+
+import javax.xml.namespace.QName;
+import javax.xml.ws.BindingProvider;
+import javax.xml.ws.Service;
+import java.net.URL;
+
+/**
+ * A demo of using WS-Trust ActAs extension.
+ *
+ * User: rsearls(a)redhat.com
+ * Date: 1/26/14
+ */
+public class WSTrustActAsTestCase extends JBossWSTest
+{
+ private final String serviceURL = "http://" + getServerHost() + ":8080/jaxws-samples-wsse-policy-trust-actas/ActAsService";
+ private final String stsURL = "http://" + getServerHost() + ":8080/jaxws-samples-wsse-policy-trust-sts/SecurityTokenService";
+
+ public static Test suite()
+ {
+ //deploy client, STS and service; start a security domain to be used by the STS for authenticating client
+ return WSTrustTestUtils.getTestSetup(WSTrustActAsTestCase.class,
+ "jaxws-samples-wsse-policy-trust-client.jar jaxws-samples-wsse-policy-trust-sts.war jaxws-samples-wsse-policy-trust.war jaxws-samples-wsse-policy-trust-actas.war");
+ }
+
+ /**
+ * Request a security token that allows it to act as if it were somebody else.
+ *
+ * @throws Exception
+ */
+ public void testActAs() throws Exception
+ {
+ Bus bus = BusFactory.newInstance().createBus();
+ try
+ {
+ BusFactory.setThreadDefaultBus(bus);
+
+ final QName serviceName = new QName("http://www.jboss.org/jbossws/ws-extensions/actaswssecuritypolicy", "ActAsService");
+ final URL wsdlURL = new URL(serviceURL + "?wsdl");
+ Service service = Service.create(wsdlURL, serviceName);
+ ActAsServiceIface proxy = (ActAsServiceIface) service.getPort(ActAsServiceIface.class);
+
+ /* TODO explain why this is not needed for setup and then remove
+ final QName stsServiceName = new QName("http://docs.oasis-open.org/ws-sx/ws-trust/200512/", "SecurityTokenService");
+ final QName stsPortName = new QName("http://docs.oasis-open.org/ws-sx/ws-trust/200512/", "UT_Port");
+ */
+ WSTrustTestUtils.setupWsseAndSTSClientActAs((BindingProvider) proxy, bus);
+
+ assertEquals("ActAs WS-Trust Hello World!", proxy.sayHello());
+ }
+ finally
+ {
+ bus.shutdown(true);
+ }
+ }
+
+}
Copied: stack/cxf/branches/jaspi/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/samples/wsse/policy/trust/WSTrustOnBehalfOfTestCase.java (from rev 18336, stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/samples/wsse/policy/trust/WSTrustOnBehalfOfTestCase.java)
===================================================================
--- stack/cxf/branches/jaspi/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/samples/wsse/policy/trust/WSTrustOnBehalfOfTestCase.java (rev 0)
+++ stack/cxf/branches/jaspi/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/samples/wsse/policy/trust/WSTrustOnBehalfOfTestCase.java 2014-02-11 09:07:45 UTC (rev 18338)
@@ -0,0 +1,84 @@
+/*
+ * JBoss, Home of Professional Open Source.
+ * Copyright 2012, Red Hat Middleware LLC, and individual contributors
+ * as indicated by the @author tags. See the copyright.txt file in the
+ * distribution for a full listing of individual contributors.
+ *
+ * This is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU Lesser General Public License as
+ * published by the Free Software Foundation; either version 2.1 of
+ * the License, or (at your option) any later version.
+ *
+ * This software is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this software; if not, write to the Free
+ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
+ * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
+ */
+package org.jboss.test.ws.jaxws.samples.wsse.policy.trust;
+
+import junit.framework.Test;
+import org.apache.cxf.Bus;
+import org.apache.cxf.BusFactory;
+import org.jboss.test.ws.jaxws.samples.wsse.policy.trust.onbehalfof.OnBehalfOfServiceIface;
+import org.jboss.wsf.test.JBossWSTest;
+
+import javax.xml.namespace.QName;
+import javax.xml.ws.BindingProvider;
+import javax.xml.ws.Service;
+import java.net.URL;
+
+/**
+ * A demo of using WS-Trust ActAs extension.
+ *
+ * User: rsearls(a)redhat.com
+ * Date: 1/26/14
+ */
+public class WSTrustOnBehalfOfTestCase extends JBossWSTest
+{
+ private final String serviceURL = "http://" + getServerHost() + ":8080/jaxws-samples-wsse-policy-trust-onbehalfof/OnBehalfOfService";
+ private final String stsURL = "http://" + getServerHost() + ":8080/jaxws-samples-wsse-policy-trust-sts/SecurityTokenService";
+
+ public static Test suite()
+ {
+ //deploy client, STS and service; start a security domain to be used by the STS for authenticating client
+ return WSTrustTestUtils.getTestSetup(WSTrustOnBehalfOfTestCase.class,
+ "jaxws-samples-wsse-policy-trust-client.jar jaxws-samples-wsse-policy-trust-sts.war jaxws-samples-wsse-policy-trust.war jaxws-samples-wsse-policy-trust-onbehalfof.war");
+ }
+
+ /**
+ * Request a security token that allows it to act on behalf of somebody else.
+ *
+ * @throws Exception
+ */
+ public void testOnBehalfOf() throws Exception
+ {
+ Bus bus = BusFactory.newInstance().createBus();
+ try
+ {
+ BusFactory.setThreadDefaultBus(bus);
+
+ final QName serviceName = new QName("http://www.jboss.org/jbossws/ws-extensions/onbehalfofwssecuritypolicy", "OnBehalfOfService");
+ final URL wsdlURL = new URL(serviceURL + "?wsdl");
+ Service service = Service.create(wsdlURL, serviceName);
+ OnBehalfOfServiceIface proxy = (OnBehalfOfServiceIface) service.getPort(OnBehalfOfServiceIface.class);
+
+ /* TODO explain why this is not needed for setup and then remove
+ final QName stsServiceName = new QName("http://docs.oasis-open.org/ws-sx/ws-trust/200512/", "SecurityTokenService");
+ final QName stsPortName = new QName("http://docs.oasis-open.org/ws-sx/ws-trust/200512/", "UT_Port");
+ */
+ WSTrustTestUtils.setupWsseAndSTSClientOnBehalfOf((BindingProvider) proxy, bus);
+
+ assertEquals("OnBehalfOf WS-Trust Hello World!", proxy.sayHello());
+ }
+ finally
+ {
+ bus.shutdown(true);
+ }
+ }
+
+}
Modified: stack/cxf/branches/jaspi/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/samples/wsse/policy/trust/WSTrustPicketLinkTestCase.java
===================================================================
--- stack/cxf/branches/jaspi/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/samples/wsse/policy/trust/WSTrustPicketLinkTestCase.java 2014-02-11 09:00:46 UTC (rev 18337)
+++ stack/cxf/branches/jaspi/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/samples/wsse/policy/trust/WSTrustPicketLinkTestCase.java 2014-02-11 09:07:45 UTC (rev 18338)
@@ -30,7 +30,9 @@
import org.apache.cxf.Bus;
import org.apache.cxf.BusFactory;
+import org.jboss.wsf.test.CryptoHelper;
import org.jboss.wsf.test.JBossWSTest;
+import org.jboss.test.ws.jaxws.samples.wsse.policy.trust.service.ServiceIface;
/**
* WS-Trust test case using PicketLink implementation of STS
@@ -66,7 +68,11 @@
final QName stsPortName = new QName("urn:picketlink:identity-federation:sts", "PicketLinkSTSPort");
WSTrustTestUtils.setupWsseAndSTSClient(proxy, bus, stsURL + "?wsdl", stsServiceName, stsPortName);
- assertEquals("WS-Trust Hello World!", proxy.sayHello());
+ try {
+ assertEquals("WS-Trust Hello World!", proxy.sayHello());
+ } catch (Exception e) {
+ throw CryptoHelper.checkAndWrapException(e);
+ }
}
finally
{
Modified: stack/cxf/branches/jaspi/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/samples/wsse/policy/trust/WSTrustTestCase.java
===================================================================
--- stack/cxf/branches/jaspi/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/samples/wsse/policy/trust/WSTrustTestCase.java 2014-02-11 09:00:46 UTC (rev 18337)
+++ stack/cxf/branches/jaspi/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/samples/wsse/policy/trust/WSTrustTestCase.java 2014-02-11 09:07:45 UTC (rev 18338)
@@ -30,7 +30,9 @@
import org.apache.cxf.Bus;
import org.apache.cxf.BusFactory;
+import org.jboss.wsf.test.CryptoHelper;
import org.jboss.wsf.test.JBossWSTest;
+import org.jboss.test.ws.jaxws.samples.wsse.policy.trust.service.ServiceIface;
/**
* WS-Trust test case
@@ -72,8 +74,12 @@
final QName stsServiceName = new QName("http://docs.oasis-open.org/ws-sx/ws-trust/200512/", "SecurityTokenService");
final QName stsPortName = new QName("http://docs.oasis-open.org/ws-sx/ws-trust/200512/", "UT_Port");
WSTrustTestUtils.setupWsseAndSTSClient(proxy, bus, stsURL + "?wsdl", stsServiceName, stsPortName);
-
- assertEquals("WS-Trust Hello World!", proxy.sayHello());
+
+ try {
+ assertEquals("WS-Trust Hello World!", proxy.sayHello());
+ } catch (Exception e) {
+ throw CryptoHelper.checkAndWrapException(e);
+ }
}
finally
{
@@ -100,11 +106,71 @@
WSTrustTestUtils.setupWsse(proxy, bus);
+ try {
+ assertEquals("WS-Trust Hello World!", proxy.sayHello());
+ } catch (Exception e) {
+ throw CryptoHelper.checkAndWrapException(e);
+ }
+ }
+ finally
+ {
+ bus.shutdown(true);
+ }
+ }
+
+ /**
+ * No CallbackHandler is provided in STSCLient. Username and password provided instead.
+ *
+ * @throws Exception
+ */
+ public void testNoClientCallback() throws Exception {
+ Bus bus = BusFactory.newInstance().createBus();
+ try {
+ BusFactory.setThreadDefaultBus(bus);
+
+ final QName serviceName = new QName("http://www.jboss.org/jbossws/ws-extensions/wssecuritypolicy", "SecurityService");
+ final URL wsdlURL = new URL(serviceURL + "?wsdl");
+ Service service = Service.create(wsdlURL, serviceName);
+ ServiceIface proxy = (ServiceIface) service.getPort(ServiceIface.class);
+
+ final QName stsServiceName = new QName("http://docs.oasis-open.org/ws-sx/ws-trust/200512/", "SecurityTokenService");
+ final QName stsPortName = new QName("http://docs.oasis-open.org/ws-sx/ws-trust/200512/", "UT_Port");
+ WSTrustTestUtils.setupWsseAndSTSClientNoCallbackHandler(proxy, bus, stsURL + "?wsdl", stsServiceName, stsPortName);
+
assertEquals("WS-Trust Hello World!", proxy.sayHello());
+ } finally {
+ bus.shutdown(true);
}
+ }
+
+ /**
+ * No SIGNATURE_USERNAME is provided to the service. Service will use the
+ * client's keystore alias in its place.
+ *
+ * @throws Exception
+ */
+ public void testNoSignatureUsername() throws Exception
+ {
+ Bus bus = BusFactory.newInstance().createBus();
+ try
+ {
+ BusFactory.setThreadDefaultBus(bus);
+
+ final QName serviceName = new QName("http://www.jboss.org/jbossws/ws-extensions/wssecuritypolicy", "SecurityService");
+ final URL wsdlURL = new URL(serviceURL + "?wsdl");
+ Service service = Service.create(wsdlURL, serviceName);
+ ServiceIface proxy = (ServiceIface) service.getPort(ServiceIface.class);
+
+ final QName stsServiceName = new QName("http://docs.oasis-open.org/ws-sx/ws-trust/200512/", "SecurityTokenService");
+ final QName stsPortName = new QName("http://docs.oasis-open.org/ws-sx/ws-trust/200512/", "UT_Port");
+ WSTrustTestUtils.setupWsseAndSTSClientNoSignatureUsername(proxy, bus, stsURL + "?wsdl", stsServiceName, stsPortName);
+
+ assertEquals("WS-Trust Hello World!", proxy.sayHello());
+ }
finally
{
bus.shutdown(true);
}
}
+
}
Modified: stack/cxf/branches/jaspi/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/samples/wsse/policy/trust/WSTrustTestUtils.java
===================================================================
--- stack/cxf/branches/jaspi/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/samples/wsse/policy/trust/WSTrustTestUtils.java 2014-02-11 09:00:46 UTC (rev 18337)
+++ stack/cxf/branches/jaspi/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/samples/wsse/policy/trust/WSTrustTestUtils.java 2014-02-11 09:07:45 UTC (rev 18338)
@@ -30,8 +30,11 @@
import org.apache.cxf.Bus;
import org.apache.cxf.ws.security.SecurityConstants;
import org.apache.cxf.ws.security.trust.STSClient;
+import org.jboss.test.ws.jaxws.samples.wsse.policy.trust.shared.ClientCallbackHandler;
+import org.jboss.test.ws.jaxws.samples.wsse.policy.trust.shared.UsernameTokenCallbackHandler;
import org.jboss.wsf.test.JBossWSCXFTestSetup;
import org.jboss.wsf.test.JBossWSTestHelper;
+import org.jboss.test.ws.jaxws.samples.wsse.policy.trust.service.ServiceIface;
/**
* Some client util methods for WS-Trust testcases
@@ -56,12 +59,170 @@
public static void setupWsseAndSTSClient(ServiceIface proxy, Bus bus, String stsWsdlLocation, QName stsService, QName stsPort)
{
Map<String, Object> ctx = ((BindingProvider) proxy).getRequestContext();
+ setServiceContextAttributes(ctx);
+ ctx.put(SecurityConstants.STS_CLIENT, createSTSClient(bus, stsWsdlLocation, stsService, stsPort));
+ }
+
+ public static void setupWsse(ServiceIface proxy, Bus bus)
+ {
+ Map<String, Object> ctx = ((BindingProvider) proxy).getRequestContext();
+ setServiceContextAttributes(ctx);
+ ctx.put(appendIssuedTokenSuffix(SecurityConstants.USERNAME), "alice");
+ ctx.put(appendIssuedTokenSuffix(SecurityConstants.CALLBACK_HANDLER), new ClientCallbackHandler());
+ ctx.put(appendIssuedTokenSuffix(SecurityConstants.ENCRYPT_PROPERTIES), Thread.currentThread().getContextClassLoader().getResource("META-INF/clientKeystore.properties"));
+ ctx.put(appendIssuedTokenSuffix(SecurityConstants.ENCRYPT_USERNAME), "mystskey");
+ ctx.put(appendIssuedTokenSuffix(SecurityConstants.STS_TOKEN_USERNAME), "myclientkey");
+ ctx.put(appendIssuedTokenSuffix(SecurityConstants.STS_TOKEN_PROPERTIES), Thread.currentThread().getContextClassLoader().getResource("META-INF/clientKeystore.properties"));
+ ctx.put(appendIssuedTokenSuffix(SecurityConstants.STS_TOKEN_USE_CERT_FOR_KEYINFO), "true");
+ }
+
+
+ /**
+ * A PASSWORD is provided in place of the ClientCallbackHandler in the
+ * STSClient. A USERNAME and PASSWORD is required by CXF in the msg.
+ *
+ * @param proxy
+ * @param bus
+ * @param stsWsdlLocation
+ * @param stsService
+ * @param stsPort
+ * @see org.apache.cxf.ws.security.SecurityConstants#PASSWORD
+ */
+ public static void setupWsseAndSTSClientNoCallbackHandler(ServiceIface proxy, Bus bus, String stsWsdlLocation, QName stsService, QName stsPort) {
+ Map<String, Object> ctx = ((BindingProvider) proxy).getRequestContext();
+ setServiceContextAttributes(ctx);
+
+ STSClient stsClient = new STSClient(bus);
+ if (stsWsdlLocation != null) {
+ stsClient.setWsdlLocation(stsWsdlLocation);
+ stsClient.setServiceQName(stsService);
+ stsClient.setEndpointQName(stsPort);
+ }
+ Map<String, Object> props = stsClient.getProperties();
+ props.put(SecurityConstants.USERNAME, "alice");
+ props.put(SecurityConstants.PASSWORD, "clarinet");
+ props.put(SecurityConstants.ENCRYPT_PROPERTIES, Thread.currentThread().getContextClassLoader().getResource("META-INF/clientKeystore.properties"));
+ props.put(SecurityConstants.ENCRYPT_USERNAME, "mystskey");
+ props.put(SecurityConstants.STS_TOKEN_USERNAME, "myclientkey");
+ props.put(SecurityConstants.STS_TOKEN_PROPERTIES, Thread.currentThread().getContextClassLoader().getResource("META-INF/clientKeystore.properties"));
+ props.put(SecurityConstants.STS_TOKEN_USE_CERT_FOR_KEYINFO, "true");
+ ctx.put(SecurityConstants.STS_CLIENT, stsClient);
+ }
+
+ /**
+ * Uses the SIGNATURE_PROPERTIES keystore's "alias name" as the SIGNATURE_USERNAME when
+ * USERNAME and SIGNATURE_USERNAME is not provided.
+ *
+ * @param proxy
+ * @param bus
+ * @param stsWsdlLocation
+ * @param stsService
+ * @param stsPort
+ * @see org.apache.cxf.ws.security.SecurityConstants#SIGNATURE_PROPERTIES
+ */
+ public static void setupWsseAndSTSClientNoSignatureUsername(ServiceIface proxy, Bus bus, String stsWsdlLocation, QName stsService, QName stsPort) {
+ Map<String, Object> ctx = ((BindingProvider) proxy).getRequestContext();
ctx.put(SecurityConstants.CALLBACK_HANDLER, new ClientCallbackHandler());
ctx.put(SecurityConstants.SIGNATURE_PROPERTIES, Thread.currentThread().getContextClassLoader().getResource("META-INF/clientKeystore.properties"));
ctx.put(SecurityConstants.ENCRYPT_PROPERTIES, Thread.currentThread().getContextClassLoader().getResource("META-INF/clientKeystore.properties"));
+ ctx.put(SecurityConstants.ENCRYPT_USERNAME, "myservicekey");
+
+ ctx.put(SecurityConstants.STS_CLIENT, createSTSClient(bus, stsWsdlLocation, stsService, stsPort));
+ }
+
+ /**
+ * Request a security token that allows it to act as if it were somebody else.
+ *
+ * @param proxy
+ * @param bus
+ */
+ public static void setupWsseAndSTSClientActAs(BindingProvider proxy, Bus bus) {
+
+ Map<String, Object> ctx = proxy.getRequestContext();
+
+ ctx.put(SecurityConstants.CALLBACK_HANDLER, new ClientCallbackHandler());
+ ctx.put(SecurityConstants.ENCRYPT_PROPERTIES, Thread.currentThread().getContextClassLoader().getResource("META-INF/clientKeystore.properties"));
+ ctx.put(SecurityConstants.ENCRYPT_USERNAME, "myactaskey");
+ ctx.put(SecurityConstants.SIGNATURE_PROPERTIES, Thread.currentThread().getContextClassLoader().getResource("META-INF/clientKeystore.properties"));
ctx.put(SecurityConstants.SIGNATURE_USERNAME, "myclientkey");
- ctx.put(SecurityConstants.ENCRYPT_USERNAME, "myservicekey");
+
+
+ UsernameTokenCallbackHandler ch = new UsernameTokenCallbackHandler();
+ String str = ch.getUsernameTokenString("myactaskey", null);
+ //System.out.println("##ut: " + str);
+
+ //String tmpStr ="<wsse:UsernameToken xmlns:wsse=\"http://docs.oasis-open.org/wss/2004/01/oasis-200401-wss-wssecurity-secext..." xmlns:wsu=\"http://docs.oasis-open.org/wss/2004/01/oasis-200401-wss-wssecurity-utilit..." wsu:Id=\"id-myactaskey\"> <wsse:Username>myactaskey</wsse:Username> </wsse:UsernameToken>";
+ ctx.put(SecurityConstants.STS_TOKEN_ACT_AS, /*tmpStr*/str);
+
+
STSClient stsClient = new STSClient(bus);
+ Map<String, Object> props = stsClient.getProperties();
+ props.put(SecurityConstants.USERNAME, "bob");
+ props.put(SecurityConstants.CALLBACK_HANDLER, new ClientCallbackHandler());
+ props.put(SecurityConstants.ENCRYPT_PROPERTIES, Thread.currentThread().getContextClassLoader().getResource("META-INF/clientKeystore.properties"));
+ props.put(SecurityConstants.ENCRYPT_USERNAME, "mystskey");
+ props.put(SecurityConstants.STS_TOKEN_USERNAME, "myclientkey");
+ props.put(SecurityConstants.STS_TOKEN_PROPERTIES, Thread.currentThread().getContextClassLoader().getResource("META-INF/clientKeystore.properties"));
+ props.put(SecurityConstants.STS_TOKEN_USE_CERT_FOR_KEYINFO, "true");
+
+ ctx.put(SecurityConstants.STS_CLIENT, stsClient);
+ }
+
+ //-
+
+ /**
+ * Request a security token that allows it to act on the behalf of somebody else.
+ *
+ * @param proxy
+ * @param bus
+ */
+ public static void setupWsseAndSTSClientOnBehalfOf(BindingProvider proxy, Bus bus) {
+
+ Map<String, Object> ctx = proxy.getRequestContext();
+
+ ctx.put(SecurityConstants.CALLBACK_HANDLER, new ClientCallbackHandler());
+ ctx.put(SecurityConstants.ENCRYPT_PROPERTIES, Thread.currentThread().getContextClassLoader().getResource("META-INF/clientKeystore.properties"));
+ ctx.put(SecurityConstants.ENCRYPT_USERNAME, "myactaskey");
+ ctx.put(SecurityConstants.SIGNATURE_PROPERTIES, Thread.currentThread().getContextClassLoader().getResource("META-INF/clientKeystore.properties"));
+ ctx.put(SecurityConstants.SIGNATURE_USERNAME, "myclientkey");
+ ctx.put(SecurityConstants.USERNAME,"alice");
+ ctx.put(SecurityConstants.PASSWORD, "clarinet");
+
+ STSClient stsClient = new STSClient(bus);
+ stsClient.setOnBehalfOf(new UsernameTokenCallbackHandler());
+
+ Map<String, Object> props = stsClient.getProperties();
+ props.put(SecurityConstants.CALLBACK_HANDLER, new ClientCallbackHandler());
+ props.put(SecurityConstants.ENCRYPT_PROPERTIES, Thread.currentThread().getContextClassLoader().getResource("META-INF/clientKeystore.properties"));
+ props.put(SecurityConstants.ENCRYPT_USERNAME, "mystskey");
+ props.put(SecurityConstants.STS_TOKEN_USERNAME, "myclientkey");
+ props.put(SecurityConstants.STS_TOKEN_PROPERTIES, Thread.currentThread().getContextClassLoader().getResource("META-INF/clientKeystore.properties"));
+ props.put(SecurityConstants.STS_TOKEN_USE_CERT_FOR_KEYINFO, "true");
+
+ ctx.put(SecurityConstants.STS_CLIENT, stsClient);
+ }
+
+
+ private static String appendIssuedTokenSuffix(String prop)
+ {
+ return prop + ".it";
+ }
+
+ /**
+ * Create and configure an STSClient for use by service ServiceImpl.
+ *
+ * Whenever an "<sp:IssuedToken>" policy is configured on a WSDL port, as is the
+ * case for ServiceImpl, a STSClient must be created and configured in
+ * order for the service to connect to the STS-server to obtain a token.
+ *
+ * @param bus
+ * @param stsWsdlLocation
+ * @param stsService
+ * @param stsPort
+ * @return
+ */
+ private static STSClient createSTSClient(Bus bus, String stsWsdlLocation, QName stsService, QName stsPort){
+ STSClient stsClient = new STSClient(bus);
if (stsWsdlLocation != null) {
stsClient.setWsdlLocation(stsWsdlLocation);
stsClient.setServiceQName(stsService);
@@ -75,28 +236,14 @@
props.put(SecurityConstants.STS_TOKEN_USERNAME, "myclientkey");
props.put(SecurityConstants.STS_TOKEN_PROPERTIES, Thread.currentThread().getContextClassLoader().getResource("META-INF/clientKeystore.properties"));
props.put(SecurityConstants.STS_TOKEN_USE_CERT_FOR_KEYINFO, "true");
- ctx.put(SecurityConstants.STS_CLIENT, stsClient);
+ return stsClient;
}
-
- public static void setupWsse(ServiceIface proxy, Bus bus)
- {
- Map<String, Object> ctx = ((BindingProvider) proxy).getRequestContext();
+
+ private static void setServiceContextAttributes(Map<String, Object> ctx){
ctx.put(SecurityConstants.CALLBACK_HANDLER, new ClientCallbackHandler());
ctx.put(SecurityConstants.SIGNATURE_PROPERTIES, Thread.currentThread().getContextClassLoader().getResource("META-INF/clientKeystore.properties"));
ctx.put(SecurityConstants.ENCRYPT_PROPERTIES, Thread.currentThread().getContextClassLoader().getResource("META-INF/clientKeystore.properties"));
ctx.put(SecurityConstants.SIGNATURE_USERNAME, "myclientkey");
ctx.put(SecurityConstants.ENCRYPT_USERNAME, "myservicekey");
- ctx.put(appendIssuedTokenSuffix(SecurityConstants.USERNAME), "alice");
- ctx.put(appendIssuedTokenSuffix(SecurityConstants.CALLBACK_HANDLER), new ClientCallbackHandler());
- ctx.put(appendIssuedTokenSuffix(SecurityConstants.ENCRYPT_PROPERTIES), Thread.currentThread().getContextClassLoader().getResource("META-INF/clientKeystore.properties"));
- ctx.put(appendIssuedTokenSuffix(SecurityConstants.ENCRYPT_USERNAME), "mystskey");
- ctx.put(appendIssuedTokenSuffix(SecurityConstants.STS_TOKEN_USERNAME), "myclientkey");
- ctx.put(appendIssuedTokenSuffix(SecurityConstants.STS_TOKEN_PROPERTIES), Thread.currentThread().getContextClassLoader().getResource("META-INF/clientKeystore.properties"));
- ctx.put(appendIssuedTokenSuffix(SecurityConstants.STS_TOKEN_USE_CERT_FOR_KEYINFO), "true");
}
-
- private static String appendIssuedTokenSuffix(String prop)
- {
- return prop + ".it";
- }
}
Copied: stack/cxf/branches/jaspi/modules/testsuite/cxf-tests/src/test/java/org/jboss/wsf/test/CryptoHelper.java (from rev 18336, stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/java/org/jboss/wsf/test/CryptoHelper.java)
===================================================================
--- stack/cxf/branches/jaspi/modules/testsuite/cxf-tests/src/test/java/org/jboss/wsf/test/CryptoHelper.java (rev 0)
+++ stack/cxf/branches/jaspi/modules/testsuite/cxf-tests/src/test/java/org/jboss/wsf/test/CryptoHelper.java 2014-02-11 09:07:45 UTC (rev 18338)
@@ -0,0 +1,55 @@
+/*
+ * JBoss, Home of Professional Open Source.
+ * Copyright 2014, Red Hat Middleware LLC, and individual contributors
+ * as indicated by the @author tags. See the copyright.txt file in the
+ * distribution for a full listing of individual contributors.
+ *
+ * This is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU Lesser General Public License as
+ * published by the Free Software Foundation; either version 2.1 of
+ * the License, or (at your option) any later version.
+ *
+ * This software is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this software; if not, write to the Free
+ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
+ * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
+ */
+package org.jboss.wsf.test;
+
+import java.security.NoSuchAlgorithmException;
+
+import org.apache.cxf.binding.soap.SoapFault;
+
+public final class CryptoHelper
+{
+ public static Exception checkAndWrapException(Exception e) throws Exception {
+ if (!isBouncyCastleAvailable()) {
+ return new Exception("Bouncy Castle JCE provider does not seem to be properly installed; either install it " +
+ "or run the testuite with -Dexclude-integration-tests-BC-related=true to exclude this test.", e);
+ } else if(!isUnlimitedStrengthCryptographyAvailable()) {
+ return new Exception("JCE unlimited strength cryptography extension does not seem to be properly installed; either install it " +
+ "or run the testuite with '-Dexclude-integration-tests-unlimited-strength-related=true' to exclude this test.", e);
+ } else if (e.getCause() != null && e.getCause() instanceof SoapFault && e.getMessage() != null && e.getMessage().contains("algorithm")) {
+ return new Exception("Please check for Bouncy Castle JCE provider and JCE unlimited strenght cryptography extension availability on server side.", e);
+ } else {
+ return e;
+ }
+ }
+
+ public static boolean isBouncyCastleAvailable() {
+ return java.security.Security.getProvider("BC") != null;
+ }
+
+ public static boolean isUnlimitedStrengthCryptographyAvailable() {
+ try {
+ return (javax.crypto.Cipher.getMaxAllowedKeyLength("RC5") >= 256);
+ } catch (NoSuchAlgorithmException e) {
+ throw new RuntimeException(e);
+ }
+ }
+}
Copied: stack/cxf/branches/jaspi/modules/testsuite/cxf-tests/src/test/resources/jaxws/cxf/clientConfig/META-INF/permissions.xml (from rev 18336, stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/resources/jaxws/cxf/clientConfig/META-INF/permissions.xml)
===================================================================
--- stack/cxf/branches/jaspi/modules/testsuite/cxf-tests/src/test/resources/jaxws/cxf/clientConfig/META-INF/permissions.xml (rev 0)
+++ stack/cxf/branches/jaspi/modules/testsuite/cxf-tests/src/test/resources/jaxws/cxf/clientConfig/META-INF/permissions.xml 2014-02-11 09:07:45 UTC (rev 18338)
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="UTF-8"?>
+
+<permissions xmlns="http://xmlns.jcp.org/xml/ns/javaee"
+ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xsi:schemaLocation="http://xmlns.jcp.org/xml/ns/javaee http://xmlns.jcp.org/xml/ns/javaee/permissions_7.xsd"
+ version="7">
+ <permission>
+ <class-name>java.lang.RuntimePermission</class-name>
+ <name>org.jboss.as.server.LOOKUP_CURRENT_SERVICE_CONTAINER</name>
+ </permission>
+</permissions>
Copied: stack/cxf/branches/jaspi/modules/testsuite/cxf-tests/src/test/resources/jaxws/samples/schemavalidation/META-INF/permissions.xml (from rev 18336, stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/resources/jaxws/samples/schemavalidation/META-INF/permissions.xml)
===================================================================
--- stack/cxf/branches/jaspi/modules/testsuite/cxf-tests/src/test/resources/jaxws/samples/schemavalidation/META-INF/permissions.xml (rev 0)
+++ stack/cxf/branches/jaspi/modules/testsuite/cxf-tests/src/test/resources/jaxws/samples/schemavalidation/META-INF/permissions.xml 2014-02-11 09:07:45 UTC (rev 18338)
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="UTF-8"?>
+
+<permissions xmlns="http://xmlns.jcp.org/xml/ns/javaee"
+ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xsi:schemaLocation="http://xmlns.jcp.org/xml/ns/javaee http://xmlns.jcp.org/xml/ns/javaee/permissions_7.xsd"
+ version="7">
+ <permission>
+ <class-name>java.lang.RuntimePermission</class-name>
+ <name>org.jboss.as.server.LOOKUP_CURRENT_SERVICE_CONTAINER</name>
+ </permission>
+</permissions>
Modified: stack/cxf/branches/jaspi/modules/testsuite/cxf-tests/src/test/resources/jaxws/samples/wsse/policy/trust/META-INF/clientstore.jks
===================================================================
(Binary files differ)
Copied: stack/cxf/branches/jaspi/modules/testsuite/cxf-tests/src/test/resources/jaxws/samples/wsse/policy/trust/META-INF/permissions.xml (from rev 18336, stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/resources/jaxws/samples/wsse/policy/trust/META-INF/permissions.xml)
===================================================================
--- stack/cxf/branches/jaspi/modules/testsuite/cxf-tests/src/test/resources/jaxws/samples/wsse/policy/trust/META-INF/permissions.xml (rev 0)
+++ stack/cxf/branches/jaspi/modules/testsuite/cxf-tests/src/test/resources/jaxws/samples/wsse/policy/trust/META-INF/permissions.xml 2014-02-11 09:07:45 UTC (rev 18338)
@@ -0,0 +1,29 @@
+<?xml version="1.0" encoding="UTF-8"?>
+
+<permissions xmlns="http://xmlns.jcp.org/xml/ns/javaee"
+ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xsi:schemaLocation="http://xmlns.jcp.org/xml/ns/javaee http://xmlns.jcp.org/xml/ns/javaee/permissions_7.xsd"
+ version="7">
+ <permission>
+ <class-name>java.lang.RuntimePermission</class-name>
+ <name>getClassLoader</name>
+ </permission>
+ <permission>
+ <class-name>java.lang.RuntimePermission</class-name>
+ <name>createClassLoader</name>
+ </permission>
+ <permission>
+ <class-name>java.lang.RuntimePermission</class-name>
+ <name>accessDeclaredMembers</name>
+ </permission>
+ <permission>
+ <class-name>java.util.PropertyPermission</class-name>
+ <name>jboss.bind.address</name>
+ <actions>read</actions>
+ </permission>
+ <permission>
+ <class-name>java.net.SocketPermission</class-name>
+ <name>*</name>
+ <actions>connect,resolve</actions>
+ </permission>
+</permissions>
Copied: stack/cxf/branches/jaspi/modules/testsuite/cxf-tests/src/test/resources/jaxws/samples/wsse/policy/trust/WEB-INF/actasKeystore.properties (from rev 18336, stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/resources/jaxws/samples/wsse/policy/trust/WEB-INF/actasKeystore.properties)
===================================================================
--- stack/cxf/branches/jaspi/modules/testsuite/cxf-tests/src/test/resources/jaxws/samples/wsse/policy/trust/WEB-INF/actasKeystore.properties (rev 0)
+++ stack/cxf/branches/jaspi/modules/testsuite/cxf-tests/src/test/resources/jaxws/samples/wsse/policy/trust/WEB-INF/actasKeystore.properties 2014-02-11 09:07:45 UTC (rev 18338)
@@ -0,0 +1,23 @@
+#
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements. See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership. The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License. You may obtain a copy of the License at
+#
+# http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied. See the License for the
+# specific language governing permissions and limitations
+# under the License.
+#
+org.apache.ws.security.crypto.provider=org.apache.ws.security.components.crypto.Merlin
+org.apache.ws.security.crypto.merlin.keystore.type=jks
+org.apache.ws.security.crypto.merlin.keystore.password=aapass
+org.apache.ws.security.crypto.merlin.keystore.alias=myactaskey
+org.apache.ws.security.crypto.merlin.keystore.file=actasstore.jks
Copied: stack/cxf/branches/jaspi/modules/testsuite/cxf-tests/src/test/resources/jaxws/samples/wsse/policy/trust/WEB-INF/actasstore.jks (from rev 18336, stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/resources/jaxws/samples/wsse/policy/trust/WEB-INF/actasstore.jks)
===================================================================
--- stack/cxf/branches/jaspi/modules/testsuite/cxf-tests/src/test/resources/jaxws/samples/wsse/policy/trust/WEB-INF/actasstore.jks (rev 0)
+++ stack/cxf/branches/jaspi/modules/testsuite/cxf-tests/src/test/resources/jaxws/samples/wsse/policy/trust/WEB-INF/actasstore.jks 2014-02-11 09:07:45 UTC (rev 18338)
@@ -0,0 +1,49 @@
+����
+myactaskey
++*
+Y�*���Lɧ^طf��$�}r��?�/��DE�ʒ�3C��@f�C�;����]<'B2g9Q'X:�8v.LbT{o�9
+.Sample ActAs Web Service -- NOT FOR PRODUCTION10U
+IT Department10U
+www.actas.com0
+140127183414Z
+231206183414Z0��10 UUS1
+0UOhio10
+UDayton1705U
+.Sample ActAs Web Service -- NOT FOR PRODUCTION10U
+IT Department10U
+www.actas.com0�"0
+ *�H��
+
+�
+�̑�����G/�R�������v;+7���9��3-�7
+¦
+��M��i�&��#���I�iꝟ��}�\����;��~MO��R��k{�@[��r6��m�}�kd
+\����:�>���a�f3a\��ہ[�?Ab�� ��8����e��9����_
+ Sample STS -- NOT FOR PRODUCTION10U
+IT Department10Uwww.sts.com10 *�H��
+ sts(a)sts.com0
+110209183813Z
+210206183813Z0��10 UUS10UMaryland10U Baltimore1)0'U
+ Sample STS -- NOT FOR PRODUCTION10U
+IT Department10Uwww.sts.com10 *�H��
+ sts@sts.com0��0
+ *�H��
+
+ Sample STS -- NOT FOR PRODUCTION10U
+IT Department10Uwww.sts.com10 *�H��
+ sts@sts.com�
+���k�㕱:��z�}Rd�g�k�q���o�X�m���m�Avls�\Y��3
\ No newline at end of file
Modified: stack/cxf/branches/jaspi/modules/testsuite/cxf-tests/src/test/resources/jaxws/samples/wsse/policy/trust/WEB-INF/jbossws-roles.properties
===================================================================
--- stack/cxf/branches/jaspi/modules/testsuite/cxf-tests/src/test/resources/jaxws/samples/wsse/policy/trust/WEB-INF/jbossws-roles.properties 2014-02-11 09:00:46 UTC (rev 18337)
+++ stack/cxf/branches/jaspi/modules/testsuite/cxf-tests/src/test/resources/jaxws/samples/wsse/policy/trust/WEB-INF/jbossws-roles.properties 2014-02-11 09:07:45 UTC (rev 18338)
@@ -1,2 +1,3 @@
# A sample roles.properties file for use with the UsersRolesLoginModule
-alice=friend
\ No newline at end of file
+alice=friend
+bob=friend
\ No newline at end of file
Modified: stack/cxf/branches/jaspi/modules/testsuite/cxf-tests/src/test/resources/jaxws/samples/wsse/policy/trust/WEB-INF/jbossws-users.properties
===================================================================
--- stack/cxf/branches/jaspi/modules/testsuite/cxf-tests/src/test/resources/jaxws/samples/wsse/policy/trust/WEB-INF/jbossws-users.properties 2014-02-11 09:00:46 UTC (rev 18337)
+++ stack/cxf/branches/jaspi/modules/testsuite/cxf-tests/src/test/resources/jaxws/samples/wsse/policy/trust/WEB-INF/jbossws-users.properties 2014-02-11 09:07:45 UTC (rev 18338)
@@ -1,2 +1,3 @@
# A sample users.properties file for use with the UsersRolesLoginModule
alice=clarinet
+bob=trombone
Modified: stack/cxf/branches/jaspi/modules/testsuite/cxf-tests/src/test/resources/jaxws/samples/wsse/policy/trust/WEB-INF/web.xml
===================================================================
--- stack/cxf/branches/jaspi/modules/testsuite/cxf-tests/src/test/resources/jaxws/samples/wsse/policy/trust/WEB-INF/web.xml 2014-02-11 09:00:46 UTC (rev 18337)
+++ stack/cxf/branches/jaspi/modules/testsuite/cxf-tests/src/test/resources/jaxws/samples/wsse/policy/trust/WEB-INF/web.xml 2014-02-11 09:07:45 UTC (rev 18338)
@@ -6,7 +6,7 @@
xsi:schemaLocation="http://java.sun.com/xml/ns/javaee http://java.sun.com/xml/ns/javaee/web-app_2_5.xsd">
<servlet>
<servlet-name>TestSecurityTokenService</servlet-name>
- <servlet-class>org.jboss.test.ws.jaxws.samples.wsse.policy.trust.SampleSTS</servlet-class>
+ <servlet-class>org.jboss.test.ws.jaxws.samples.wsse.policy.trust.sts.SampleSTS</servlet-class>
</servlet>
<servlet-mapping>
<servlet-name>TestSecurityTokenService</servlet-name>
Copied: stack/cxf/branches/jaspi/modules/testsuite/cxf-tests/src/test/resources/jaxws/samples/wsse/policy/trust/WEB-INF/wsdl/ActAsService.wsdl (from rev 18336, stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/resources/jaxws/samples/wsse/policy/trust/WEB-INF/wsdl/ActAsService.wsdl)
===================================================================
--- stack/cxf/branches/jaspi/modules/testsuite/cxf-tests/src/test/resources/jaxws/samples/wsse/policy/trust/WEB-INF/wsdl/ActAsService.wsdl (rev 0)
+++ stack/cxf/branches/jaspi/modules/testsuite/cxf-tests/src/test/resources/jaxws/samples/wsse/policy/trust/WEB-INF/wsdl/ActAsService.wsdl 2014-02-11 09:07:45 UTC (rev 18338)
@@ -0,0 +1,165 @@
+<?xml version="1.0" encoding="UTF-8" standalone="yes"?>
+<definitions targetNamespace="http://www.jboss.org/jbossws/ws-extensions/actaswssecuritypolicy" name="ActAsService"
+ xmlns:tns="http://www.jboss.org/jbossws/ws-extensions/actaswssecuritypolicy"
+ xmlns:xsd="http://www.w3.org/2001/XMLSchema"
+ xmlns:soap="http://schemas.xmlsoap.org/wsdl/soap/"
+ xmlns="http://schemas.xmlsoap.org/wsdl/"
+ xmlns:wsp="http://www.w3.org/ns/ws-policy"
+ xmlns:wsam="http://www.w3.org/2007/05/addressing/metadata"
+ xmlns:wsu="http://docs.oasis-open.org/wss/2004/01/oasis-200401-wss-wssecurity-utilit..."
+ xmlns:wsaws="http://www.w3.org/2005/08/addressing"
+ xmlns:sp="http://docs.oasis-open.org/ws-sx/ws-securitypolicy/200702"
+ xmlns:t="http://docs.oasis-open.org/ws-sx/ws-trust/200512">
+ <types>
+ <xsd:schema>
+ <xsd:import namespace="http://www.jboss.org/jbossws/ws-extensions/actaswssecuritypolicy"
+ schemaLocation="ActAsService_schema1.xsd"/>
+ </xsd:schema>
+ </types>
+ <message name="sayHello">
+ <part name="parameters" element="tns:sayHello"/>
+ </message>
+ <message name="sayHelloResponse">
+ <part name="parameters" element="tns:sayHelloResponse"/>
+ </message>
+ <portType name="ActAsServiceIface">
+ <operation name="sayHello">
+ <input message="tns:sayHello"/>
+ <output message="tns:sayHelloResponse"/>
+ </operation>
+ </portType>
+ <binding name="ActAsServicePortBinding" type="tns:ActAsServiceIface">
+ <wsp:PolicyReference URI="#AsymmetricSAML2Policy" />
+ <soap:binding transport="http://schemas.xmlsoap.org/soap/http" style="document"/>
+ <operation name="sayHello">
+ <soap:operation soapAction=""/>
+ <input>
+ <soap:body use="literal"/>
+ <wsp:PolicyReference URI="#Input_Policy" />
+ </input>
+ <output>
+ <soap:body use="literal"/>
+ <wsp:PolicyReference URI="#Output_Policy" />
+ </output>
+ </operation>
+ </binding>
+ <service name="ActAsService">
+ <port name="ActAsServicePort" binding="tns:ActAsServicePortBinding">
+ <soap:address location="http://@jboss.bind.address@:8080/jaxws-samples-wsse-policy-trust-actas/ActAsService"/>
+ </port>
+ </service>
+
+ <wsp:Policy wsu:Id="AsymmetricSAML2Policy">
+ <wsp:ExactlyOne>
+ <wsp:All>
+ <wsam:Addressing wsp:Optional="false">
+ <wsp:Policy />
+ </wsam:Addressing>
+ <sp:AsymmetricBinding>
+ <wsp:Policy>
+ <sp:InitiatorToken>
+ <wsp:Policy>
+ <sp:IssuedToken
+ sp:IncludeToken="http://docs.oasis-open.org/ws-sx/ws-securitypolicy/200702/IncludeToken/Al...">
+ <sp:RequestSecurityTokenTemplate>
+ <t:TokenType>http://docs.oasis-open.org/wss/oasis-wss-saml-token-profile-1.1#SAMLV2.0</t:TokenType>
+ <t:KeyType>http://docs.oasis-open.org/ws-sx/ws-trust/200512/PublicKey</t:KeyType>
+ </sp:RequestSecurityTokenTemplate>
+ <wsp:Policy>
+ <sp:RequireInternalReference />
+ </wsp:Policy>
+ <sp:Issuer>
+ <wsaws:Address>http://@jboss.bind.address@:8080/jaxws-samples-wsse-policy-trust-sts/SecurityTokenService</wsaws:Address>
+ <wsaws:Metadata xmlns:wsdli="http://www.w3.org/2006/01/wsdl-instance"
+ wsdli:wsdlLocation="http://@jboss.bind.address@:8080/jaxws-samples-wsse-policy-trust-sts/SecurityTokenService?wsdl">
+ <wsaw:ServiceName xmlns:wsaw="http://www.w3.org/2006/05/addressing/wsdl"
+ xmlns:stsns="http://docs.oasis-open.org/ws-sx/ws-trust/200512/"
+ EndpointName="UT_Port">stsns:SecurityTokenService</wsaw:ServiceName>
+ </wsaws:Metadata>
+ </sp:Issuer>
+ </sp:IssuedToken>
+ </wsp:Policy>
+ </sp:InitiatorToken>
+ <sp:RecipientToken>
+ <wsp:Policy>
+ <sp:X509Token
+ sp:IncludeToken="http://docs.oasis-open.org/ws-sx/ws-securitypolicy/200702/IncludeToken/Never">
+ <wsp:Policy>
+ <sp:WssX509V3Token10 />
+ <sp:RequireIssuerSerialReference />
+ </wsp:Policy>
+ </sp:X509Token>
+ </wsp:Policy>
+ </sp:RecipientToken>
+ <sp:Layout>
+ <wsp:Policy>
+ <sp:Lax />
+ </wsp:Policy>
+ </sp:Layout>
+ <sp:IncludeTimestamp />
+ <sp:OnlySignEntireHeadersAndBody />
+ <sp:AlgorithmSuite>
+ <wsp:Policy>
+ <sp:Basic256 />
+ </wsp:Policy>
+ </sp:AlgorithmSuite>
+ </wsp:Policy>
+ </sp:AsymmetricBinding>
+ <sp:Wss11>
+ <wsp:Policy>
+ <sp:MustSupportRefIssuerSerial />
+ <sp:MustSupportRefThumbprint />
+ <sp:MustSupportRefEncryptedKey />
+ </wsp:Policy>
+ </sp:Wss11>
+ <sp:Trust13>
+ <wsp:Policy>
+ <sp:MustSupportIssuedTokens />
+ <sp:RequireClientEntropy />
+ <sp:RequireServerEntropy />
+ </wsp:Policy>
+ </sp:Trust13>
+ </wsp:All>
+ </wsp:ExactlyOne>
+ </wsp:Policy>
+
+ <wsp:Policy wsu:Id="Input_Policy">
+ <wsp:ExactlyOne>
+ <wsp:All>
+ <sp:EncryptedParts>
+ <sp:Body />
+ </sp:EncryptedParts>
+ <sp:SignedParts>
+ <sp:Body />
+ <sp:Header Name="To" Namespace="http://www.w3.org/2005/08/addressing" />
+ <sp:Header Name="From" Namespace="http://www.w3.org/2005/08/addressing" />
+ <sp:Header Name="FaultTo" Namespace="http://www.w3.org/2005/08/addressing" />
+ <sp:Header Name="ReplyTo" Namespace="http://www.w3.org/2005/08/addressing" />
+ <sp:Header Name="MessageID" Namespace="http://www.w3.org/2005/08/addressing" />
+ <sp:Header Name="RelatesTo" Namespace="http://www.w3.org/2005/08/addressing" />
+ <sp:Header Name="Action" Namespace="http://www.w3.org/2005/08/addressing" />
+ </sp:SignedParts>
+ </wsp:All>
+ </wsp:ExactlyOne>
+ </wsp:Policy>
+
+ <wsp:Policy wsu:Id="Output_Policy">
+ <wsp:ExactlyOne>
+ <wsp:All>
+ <sp:EncryptedParts>
+ <sp:Body />
+ </sp:EncryptedParts>
+ <sp:SignedParts>
+ <sp:Body />
+ <sp:Header Name="To" Namespace="http://www.w3.org/2005/08/addressing" />
+ <sp:Header Name="From" Namespace="http://www.w3.org/2005/08/addressing" />
+ <sp:Header Name="FaultTo" Namespace="http://www.w3.org/2005/08/addressing" />
+ <sp:Header Name="ReplyTo" Namespace="http://www.w3.org/2005/08/addressing" />
+ <sp:Header Name="MessageID" Namespace="http://www.w3.org/2005/08/addressing" />
+ <sp:Header Name="RelatesTo" Namespace="http://www.w3.org/2005/08/addressing" />
+ <sp:Header Name="Action" Namespace="http://www.w3.org/2005/08/addressing" />
+ </sp:SignedParts>
+ </wsp:All>
+ </wsp:ExactlyOne>
+ </wsp:Policy>
+</definitions>
Copied: stack/cxf/branches/jaspi/modules/testsuite/cxf-tests/src/test/resources/jaxws/samples/wsse/policy/trust/WEB-INF/wsdl/ActAsService_schema1.xsd (from rev 18336, stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/resources/jaxws/samples/wsse/policy/trust/WEB-INF/wsdl/ActAsService_schema1.xsd)
===================================================================
--- stack/cxf/branches/jaspi/modules/testsuite/cxf-tests/src/test/resources/jaxws/samples/wsse/policy/trust/WEB-INF/wsdl/ActAsService_schema1.xsd (rev 0)
+++ stack/cxf/branches/jaspi/modules/testsuite/cxf-tests/src/test/resources/jaxws/samples/wsse/policy/trust/WEB-INF/wsdl/ActAsService_schema1.xsd 2014-02-11 09:07:45 UTC (rev 18338)
@@ -0,0 +1,20 @@
+<?xml version="1.0" encoding="UTF-8" standalone="yes"?>
+<xs:schema version="1.0" targetNamespace="http://www.jboss.org/jbossws/ws-extensions/actaswssecuritypolicy"
+ xmlns:tns="http://www.jboss.org/jbossws/ws-extensions/actaswssecuritypolicy"
+ xmlns:xs="http://www.w3.org/2001/XMLSchema">
+
+ <xs:element name="sayHello" type="tns:sayHello"/>
+
+ <xs:element name="sayHelloResponse" type="tns:sayHelloResponse"/>
+
+ <xs:complexType name="sayHello">
+ <xs:sequence/>
+ </xs:complexType>
+
+ <xs:complexType name="sayHelloResponse">
+ <xs:sequence>
+ <xs:element name="return" type="xs:string" minOccurs="0"/>
+ </xs:sequence>
+ </xs:complexType>
+</xs:schema>
+
Copied: stack/cxf/branches/jaspi/modules/testsuite/cxf-tests/src/test/resources/jaxws/samples/wsse/policy/trust/WEB-INF/wsdl/OnBehalfOfService.wsdl (from rev 18336, stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/resources/jaxws/samples/wsse/policy/trust/WEB-INF/wsdl/OnBehalfOfService.wsdl)
===================================================================
--- stack/cxf/branches/jaspi/modules/testsuite/cxf-tests/src/test/resources/jaxws/samples/wsse/policy/trust/WEB-INF/wsdl/OnBehalfOfService.wsdl (rev 0)
+++ stack/cxf/branches/jaspi/modules/testsuite/cxf-tests/src/test/resources/jaxws/samples/wsse/policy/trust/WEB-INF/wsdl/OnBehalfOfService.wsdl 2014-02-11 09:07:45 UTC (rev 18338)
@@ -0,0 +1,165 @@
+<?xml version="1.0" encoding="UTF-8" standalone="yes"?>
+<definitions targetNamespace="http://www.jboss.org/jbossws/ws-extensions/onbehalfofwssecuritypolicy" name="OnBehalfOfService"
+ xmlns:tns="http://www.jboss.org/jbossws/ws-extensions/onbehalfofwssecuritypolicy"
+ xmlns:xsd="http://www.w3.org/2001/XMLSchema"
+ xmlns:soap="http://schemas.xmlsoap.org/wsdl/soap/"
+ xmlns="http://schemas.xmlsoap.org/wsdl/"
+ xmlns:wsp="http://www.w3.org/ns/ws-policy"
+ xmlns:wsam="http://www.w3.org/2007/05/addressing/metadata"
+ xmlns:wsu="http://docs.oasis-open.org/wss/2004/01/oasis-200401-wss-wssecurity-utilit..."
+ xmlns:wsaws="http://www.w3.org/2005/08/addressing"
+ xmlns:sp="http://docs.oasis-open.org/ws-sx/ws-securitypolicy/200702"
+ xmlns:t="http://docs.oasis-open.org/ws-sx/ws-trust/200512">
+ <types>
+ <xsd:schema>
+ <xsd:import namespace="http://www.jboss.org/jbossws/ws-extensions/onbehalfofwssecuritypolicy"
+ schemaLocation="OnBehalfOfService_schema1.xsd"/>
+ </xsd:schema>
+ </types>
+ <message name="sayHello">
+ <part name="parameters" element="tns:sayHello"/>
+ </message>
+ <message name="sayHelloResponse">
+ <part name="parameters" element="tns:sayHelloResponse"/>
+ </message>
+ <portType name="OnBehalfOfServiceIface">
+ <operation name="sayHello">
+ <input message="tns:sayHello"/>
+ <output message="tns:sayHelloResponse"/>
+ </operation>
+ </portType>
+ <binding name="OnBehalfOfServicePortBinding" type="tns:OnBehalfOfServiceIface">
+ <wsp:PolicyReference URI="#AsymmetricSAML2Policy" />
+ <soap:binding transport="http://schemas.xmlsoap.org/soap/http" style="document"/>
+ <operation name="sayHello">
+ <soap:operation soapAction=""/>
+ <input>
+ <soap:body use="literal"/>
+ <wsp:PolicyReference URI="#Input_Policy" />
+ </input>
+ <output>
+ <soap:body use="literal"/>
+ <wsp:PolicyReference URI="#Output_Policy" />
+ </output>
+ </operation>
+ </binding>
+ <service name="OnBehalfOfService">
+ <port name="OnBehalfOfServicePort" binding="tns:OnBehalfOfServicePortBinding">
+ <soap:address location="http://@jboss.bind.address@:8080/jaxws-samples-wsse-policy-trust-onbehalfof/OnBehalfOfService"/>
+ </port>
+ </service>
+
+ <wsp:Policy wsu:Id="AsymmetricSAML2Policy">
+ <wsp:ExactlyOne>
+ <wsp:All>
+ <wsam:Addressing wsp:Optional="false">
+ <wsp:Policy />
+ </wsam:Addressing>
+ <sp:AsymmetricBinding>
+ <wsp:Policy>
+ <sp:InitiatorToken>
+ <wsp:Policy>
+ <sp:IssuedToken
+ sp:IncludeToken="http://docs.oasis-open.org/ws-sx/ws-securitypolicy/200702/IncludeToken/Al...">
+ <sp:RequestSecurityTokenTemplate>
+ <t:TokenType>http://docs.oasis-open.org/wss/oasis-wss-saml-token-profile-1.1#SAMLV2.0</t:TokenType>
+ <t:KeyType>http://docs.oasis-open.org/ws-sx/ws-trust/200512/PublicKey</t:KeyType>
+ </sp:RequestSecurityTokenTemplate>
+ <wsp:Policy>
+ <sp:RequireInternalReference />
+ </wsp:Policy>
+ <sp:Issuer>
+ <wsaws:Address>http://@jboss.bind.address@:8080/jaxws-samples-wsse-policy-trust-sts/SecurityTokenService</wsaws:Address>
+ <wsaws:Metadata xmlns:wsdli="http://www.w3.org/2006/01/wsdl-instance"
+ wsdli:wsdlLocation="http://@jboss.bind.address@:8080/jaxws-samples-wsse-policy-trust-sts/SecurityTokenService?wsdl">
+ <wsaw:ServiceName xmlns:wsaw="http://www.w3.org/2006/05/addressing/wsdl"
+ xmlns:stsns="http://docs.oasis-open.org/ws-sx/ws-trust/200512/"
+ EndpointName="UT_Port">stsns:SecurityTokenService</wsaw:ServiceName>
+ </wsaws:Metadata>
+ </sp:Issuer>
+ </sp:IssuedToken>
+ </wsp:Policy>
+ </sp:InitiatorToken>
+ <sp:RecipientToken>
+ <wsp:Policy>
+ <sp:X509Token
+ sp:IncludeToken="http://docs.oasis-open.org/ws-sx/ws-securitypolicy/200702/IncludeToken/Never">
+ <wsp:Policy>
+ <sp:WssX509V3Token10 />
+ <sp:RequireIssuerSerialReference />
+ </wsp:Policy>
+ </sp:X509Token>
+ </wsp:Policy>
+ </sp:RecipientToken>
+ <sp:Layout>
+ <wsp:Policy>
+ <sp:Lax />
+ </wsp:Policy>
+ </sp:Layout>
+ <sp:IncludeTimestamp />
+ <sp:OnlySignEntireHeadersAndBody />
+ <sp:AlgorithmSuite>
+ <wsp:Policy>
+ <sp:Basic256 />
+ </wsp:Policy>
+ </sp:AlgorithmSuite>
+ </wsp:Policy>
+ </sp:AsymmetricBinding>
+ <sp:Wss11>
+ <wsp:Policy>
+ <sp:MustSupportRefIssuerSerial />
+ <sp:MustSupportRefThumbprint />
+ <sp:MustSupportRefEncryptedKey />
+ </wsp:Policy>
+ </sp:Wss11>
+ <sp:Trust13>
+ <wsp:Policy>
+ <sp:MustSupportIssuedTokens />
+ <sp:RequireClientEntropy />
+ <sp:RequireServerEntropy />
+ </wsp:Policy>
+ </sp:Trust13>
+ </wsp:All>
+ </wsp:ExactlyOne>
+ </wsp:Policy>
+
+ <wsp:Policy wsu:Id="Input_Policy">
+ <wsp:ExactlyOne>
+ <wsp:All>
+ <sp:EncryptedParts>
+ <sp:Body />
+ </sp:EncryptedParts>
+ <sp:SignedParts>
+ <sp:Body />
+ <sp:Header Name="To" Namespace="http://www.w3.org/2005/08/addressing" />
+ <sp:Header Name="From" Namespace="http://www.w3.org/2005/08/addressing" />
+ <sp:Header Name="FaultTo" Namespace="http://www.w3.org/2005/08/addressing" />
+ <sp:Header Name="ReplyTo" Namespace="http://www.w3.org/2005/08/addressing" />
+ <sp:Header Name="MessageID" Namespace="http://www.w3.org/2005/08/addressing" />
+ <sp:Header Name="RelatesTo" Namespace="http://www.w3.org/2005/08/addressing" />
+ <sp:Header Name="Action" Namespace="http://www.w3.org/2005/08/addressing" />
+ </sp:SignedParts>
+ </wsp:All>
+ </wsp:ExactlyOne>
+ </wsp:Policy>
+
+ <wsp:Policy wsu:Id="Output_Policy">
+ <wsp:ExactlyOne>
+ <wsp:All>
+ <sp:EncryptedParts>
+ <sp:Body />
+ </sp:EncryptedParts>
+ <sp:SignedParts>
+ <sp:Body />
+ <sp:Header Name="To" Namespace="http://www.w3.org/2005/08/addressing" />
+ <sp:Header Name="From" Namespace="http://www.w3.org/2005/08/addressing" />
+ <sp:Header Name="FaultTo" Namespace="http://www.w3.org/2005/08/addressing" />
+ <sp:Header Name="ReplyTo" Namespace="http://www.w3.org/2005/08/addressing" />
+ <sp:Header Name="MessageID" Namespace="http://www.w3.org/2005/08/addressing" />
+ <sp:Header Name="RelatesTo" Namespace="http://www.w3.org/2005/08/addressing" />
+ <sp:Header Name="Action" Namespace="http://www.w3.org/2005/08/addressing" />
+ </sp:SignedParts>
+ </wsp:All>
+ </wsp:ExactlyOne>
+ </wsp:Policy>
+</definitions>
Copied: stack/cxf/branches/jaspi/modules/testsuite/cxf-tests/src/test/resources/jaxws/samples/wsse/policy/trust/WEB-INF/wsdl/OnBehalfOfService_schema1.xsd (from rev 18336, stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/resources/jaxws/samples/wsse/policy/trust/WEB-INF/wsdl/OnBehalfOfService_schema1.xsd)
===================================================================
--- stack/cxf/branches/jaspi/modules/testsuite/cxf-tests/src/test/resources/jaxws/samples/wsse/policy/trust/WEB-INF/wsdl/OnBehalfOfService_schema1.xsd (rev 0)
+++ stack/cxf/branches/jaspi/modules/testsuite/cxf-tests/src/test/resources/jaxws/samples/wsse/policy/trust/WEB-INF/wsdl/OnBehalfOfService_schema1.xsd 2014-02-11 09:07:45 UTC (rev 18338)
@@ -0,0 +1,20 @@
+<?xml version="1.0" encoding="UTF-8" standalone="yes"?>
+<xs:schema version="1.0" targetNamespace="http://www.jboss.org/jbossws/ws-extensions/onbehalfofwssecuritypolicy"
+ xmlns:tns="http://www.jboss.org/jbossws/ws-extensions/onbehalfofwssecuritypolicy"
+ xmlns:xs="http://www.w3.org/2001/XMLSchema">
+
+ <xs:element name="sayHello" type="tns:sayHello"/>
+
+ <xs:element name="sayHelloResponse" type="tns:sayHelloResponse"/>
+
+ <xs:complexType name="sayHello">
+ <xs:sequence/>
+ </xs:complexType>
+
+ <xs:complexType name="sayHelloResponse">
+ <xs:sequence>
+ <xs:element name="return" type="xs:string" minOccurs="0"/>
+ </xs:sequence>
+ </xs:complexType>
+</xs:schema>
+
Modified: stack/cxf/branches/jaspi/modules/testsuite/pom.xml
===================================================================
--- stack/cxf/branches/jaspi/modules/testsuite/pom.xml 2014-02-11 09:00:46 UTC (rev 18337)
+++ stack/cxf/branches/jaspi/modules/testsuite/pom.xml 2014-02-11 09:07:45 UTC (rev 18338)
@@ -101,25 +101,6 @@
<artifactId>commons-logging</artifactId>
</dependency>
<dependency>
- <groupId>org.littleshoot</groupId>
- <artifactId>littleproxy</artifactId>
- <version>${org.littleshoot.littleproxy.version}</version>
- <exclusions>
- <exclusion>
- <groupId>org.slf4j</groupId>
- <artifactId>slf4j-api</artifactId>
- </exclusion>
- <exclusion>
- <groupId>org.slf4j</groupId>
- <artifactId>slf4j-log4j12</artifactId>
- </exclusion>
- <exclusion>
- <groupId>net.sf.ehcache</groupId>
- <artifactId>ehcache-core</artifactId>
- </exclusion>
- </exclusions>
- </dependency>
- <dependency>
<groupId>org.bouncycastle</groupId>
<artifactId>bcprov-jdk16</artifactId>
<version>${bc.version}</version>
@@ -614,146 +595,6 @@
</profile>
<!--
- Name: jboss712
- Descr: JBoss-7.1.2 specific options
- -->
- <profile>
- <id>jboss712</id>
- <properties>
- <jboss.version>${jboss712.version}</jboss.version>
- <jbossws.integration.target>jboss712</jbossws.integration.target>
- </properties>
- <dependencies>
- <dependency>
- <groupId>org.jboss.ws</groupId>
- <artifactId>jbossws-jboss712-tests-integration</artifactId>
- </dependency>
- </dependencies>
- <build>
- <plugins>
- <plugin>
- <artifactId>maven-compiler-plugin</artifactId>
- <configuration>
- <compilerArguments>
- <endorseddirs>${project.build.directory}/endorsed</endorseddirs>
- </compilerArguments>
- </configuration>
- </plugin>
- <plugin>
- <artifactId>maven-surefire-plugin</artifactId>
- <configuration>
- <argLine>${surefire.jvm.args} ${surefire.jvm.management.args} ${surefire.default-mgmt-serurity.args} -Djava.endorsed.dirs=${project.build.directory}/endorsed</argLine>
- <excludes>
- <!--# [CXF-1519] Explicitly set the namespace of a WebFault-->
- <exclude>org/jboss/test/ws/jaxws/jbws1904/**</exclude>
-
- <!--# [CXF-2006] RespectBinding feature and not understood required extensibility elements-->
- <exclude>org/jboss/test/ws/jaxws/jbws2449/**</exclude>
-
- <!--# [JBWS-2561] XOP request not properly inlined-->
- <exclude>org/jboss/test/ws/jaxws/samples/xop/doclit/XOPHandlerTestCase.*</exclude>
-
- <!--# [JBWS-2480] Soap attachments are dropped on server response-->
- <exclude>org/jboss/test/ws/jaxws/jbws1283/**</exclude>
-
- <!-- # [JBWS-3493] WS-Trust tests w/ PicketLink STS require PL 2.1.2.Final or greater -->
- <exclude>org/jboss/test/ws/jaxws/samples/wsse/policy/trust/WSTrustPicketLinkTestCase*</exclude>
-
- <!-- # Tests migrated from JBossWS-Native specific testsuite which are meant to pass with JBossWS-CXF too, but are still to be fixed -->
- <exclude>org/jboss/test/ws/jaxws/jbws2978/**</exclude>
-
- <!--# [JBWS-3441] Support CDI interceptors for POJO JAX-WS services -->
- <exclude>org/jboss/test/ws/jaxws/jbws3441/**</exclude>
-
- <!--# [AS7-537] Fixed on AS 8 or greater -->
- <exclude>org/jboss/test/ws/jaxws/cxf/noIntegration/AS7537TestCase**</exclude>
-
- <!--# [JBWS-3560] fastinfoset module is required in as712 -->
- <exclude>org/jboss/test/ws/jaxws/cxf/fastinfoset/FastInfosetTestCase*</exclude>
-
- <!--# [WFLY-308] Provide facility for running ejb3 ws endpoints authorization independently -->
- <exclude>org/jboss/test/ws/jaxws/handlerauth/HandlerAuthTestCase*</exclude>
-
- <!-- Manually setup KDC before run this test-->
- <exclude>org/jboss/test/ws/jaxws/samples/wsse/kerberos/*TestCase*</exclude>
- </excludes>
- </configuration>
- </plugin>
- </plugins>
- </build>
- </profile>
-
- <!--
- Name: jboss713
- Descr: JBoss-7.1.3 specific options
- -->
- <profile>
- <id>jboss713</id>
- <properties>
- <jboss.version>${jboss713.version}</jboss.version>
- <jbossws.integration.target>jboss713</jbossws.integration.target>
- </properties>
- <dependencies>
- <dependency>
- <groupId>org.jboss.ws</groupId>
- <artifactId>jbossws-jboss713-tests-integration</artifactId>
- </dependency>
- </dependencies>
- <build>
- <plugins>
- <plugin>
- <artifactId>maven-compiler-plugin</artifactId>
- <configuration>
- <compilerArguments>
- <endorseddirs>${project.build.directory}/endorsed</endorseddirs>
- </compilerArguments>
- </configuration>
- </plugin>
- <plugin>
- <artifactId>maven-surefire-plugin</artifactId>
- <configuration>
- <argLine>${surefire.jvm.args} ${surefire.jvm.management.args} ${surefire.default-mgmt-serurity.args} -Djava.endorsed.dirs=${project.build.directory}/endorsed</argLine>
- <excludes>
- <!--# [CXF-1519] Explicitly set the namespace of a WebFault-->
- <exclude>org/jboss/test/ws/jaxws/jbws1904/**</exclude>
-
- <!--# [CXF-2006] RespectBinding feature and not understood required extensibility elements-->
- <exclude>org/jboss/test/ws/jaxws/jbws2449/**</exclude>
-
- <!--# [JBWS-2561] XOP request not properly inlined-->
- <exclude>org/jboss/test/ws/jaxws/samples/xop/doclit/XOPHandlerTestCase.*</exclude>
-
- <!--# [JBWS-2480] Soap attachments are dropped on server response-->
- <exclude>org/jboss/test/ws/jaxws/jbws1283/**</exclude>
-
- <!-- # [JBWS-3493] WS-Trust tests w/ PicketLink STS require PL 2.1.2.Final or greater -->
- <exclude>org/jboss/test/ws/jaxws/samples/wsse/policy/trust/WSTrustPicketLinkTestCase*</exclude>
-
- <!-- # Tests migrated from JBossWS-Native specific testsuite which are meant to pass with JBossWS-CXF too, but are still to be fixed -->
- <exclude>org/jboss/test/ws/jaxws/jbws2978/**</exclude>
-
- <!--# [JBWS-3441] Support CDI interceptors for POJO JAX-WS services -->
- <exclude>org/jboss/test/ws/jaxws/jbws3441/**</exclude>
-
- <!--# [AS7-537] Fixed on AS 8 or greater -->
- <exclude>org/jboss/test/ws/jaxws/cxf/noIntegration/AS7537TestCase**</exclude>
-
- <!--# [JBWS-3560] fastinfoset module is required in as713 -->
- <exclude>org/jboss/test/ws/jaxws/cxf/fastinfoset/FastInfosetTestCase*</exclude>
-
- <!--# [WFLY-308] Provide facility for running ejb3 ws endpoints authorization independently -->
- <exclude>org/jboss/test/ws/jaxws/handlerauth/HandlerAuthTestCase*</exclude>
-
- <!-- Manually setup KDC before run this test-->
- <exclude>org/jboss/test/ws/jaxws/samples/wsse/kerberos/*TestCase*</exclude>
- </excludes>
- </configuration>
- </plugin>
- </plugins>
- </build>
- </profile>
-
- <!--
Name: jboss720
Descr: JBoss-7.2.0 specific options
-->
@@ -768,6 +609,26 @@
<groupId>org.jboss.ws</groupId>
<artifactId>jbossws-jboss720-tests-integration</artifactId>
</dependency>
+ <!-- LittleProxy depencency declared in this profile as other profiles require different exclusions -->
+ <dependency>
+ <groupId>org.littleshoot</groupId>
+ <artifactId>littleproxy</artifactId>
+ <version>${org.littleshoot.littleproxy.version}</version>
+ <exclusions>
+ <exclusion>
+ <groupId>org.slf4j</groupId>
+ <artifactId>slf4j-api</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>org.slf4j</groupId>
+ <artifactId>slf4j-log4j12</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>net.sf.ehcache</groupId>
+ <artifactId>ehcache-core</artifactId>
+ </exclusion>
+ </exclusions>
+ </dependency>
</dependencies>
<build>
<plugins>
@@ -838,6 +699,31 @@
<artifactId>wildfly-webservices-tests-integration</artifactId>
<version>${jboss.version}</version>
</dependency>
+ <!-- LittleProxy depencency declared in this profile as other profiles require different exclusions -->
+ <dependency>
+ <groupId>org.littleshoot</groupId>
+ <artifactId>littleproxy</artifactId>
+ <version>${org.littleshoot.littleproxy.version}</version>
+ <exclusions>
+ <exclusion>
+ <groupId>org.slf4j</groupId>
+ <artifactId>slf4j-api</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>org.slf4j</groupId>
+ <artifactId>slf4j-log4j12</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>net.sf.ehcache</groupId>
+ <artifactId>ehcache-core</artifactId>
+ </exclusion>
+ <!-- Let the container messaging subsystem control the Netty dependency version -->
+ <exclusion>
+ <groupId>io.netty</groupId>
+ <artifactId>netty-all</artifactId>
+ </exclusion>
+ </exclusions>
+ </dependency>
</dependencies>
<build>
<plugins>
@@ -877,6 +763,9 @@
<!-- Manually setup KDC before run this test-->
<exclude>org/jboss/test/ws/jaxws/samples/wsse/kerberos/*TestCase*</exclude>
+
+ <!-- # [JBWS-3620]:Enable it after the fix merged to upstream-->
+ <exclude>org/jboss/test/ws/jaxws/cxf/jbws3670/*TestCase*</exclude>
</excludes>
</configuration>
</plugin>
Modified: stack/cxf/branches/jaspi/modules/testsuite/shared-tests/src/test/ant-import/build-jars-jaxws.xml
===================================================================
--- stack/cxf/branches/jaspi/modules/testsuite/shared-tests/src/test/ant-import/build-jars-jaxws.xml 2014-02-11 09:00:46 UTC (rev 18337)
+++ stack/cxf/branches/jaspi/modules/testsuite/shared-tests/src/test/ant-import/build-jars-jaxws.xml 2014-02-11 09:07:45 UTC (rev 18338)
@@ -32,6 +32,28 @@
<target name="build-jars-jaxws" description="Build the deployments.">
+ <!-- endpoint-publish.war -->
+ <war warfile="${tests.output.dir}/test-libs/endpoint-publish.war" needxmlfile='false'>
+ <classes dir="${tests.output.dir}/test-classes">
+ <include name="org/jboss/test/ws/publish/**/*.class"/>
+ <include name="org/jboss/test/ws/publish/EndpointImpl5.xml"/>
+ <include name="org/jboss/test/ws/publish/TestService.xml"/>
+ <exclude name="org/jboss/test/ws/publish/*TestCase.class"/>
+ </classes>
+ <classes dir="${tests.output.dir}/test-classes/org/jboss/test/ws/publish">
+ <include name="WEB-INF/wsdl/**" />
+ </classes>
+ <webinf dir="${tests.output.dir}/test-resources/publish/WEB-INF">
+ <include name="wsdl/**"/>
+ </webinf>
+ <zipfileset dir="${tests.output.dir}/test-resources/publish/META-INF" prefix="META-INF">
+ <include name="permissions.xml"/>
+ </zipfileset>
+ <manifest>
+ <attribute name="Dependencies" value="org.jboss.ws.common" />
+ </manifest>
+ </war>
+
<!-- jaxws-anonymous -->
<war warfile="${tests.output.dir}/test-libs/jaxws-anonymous.war" webxml="${tests.output.dir}/test-resources/jaxws/anonymous/WEB-INF/web.xml">
<classes dir="${tests.output.dir}/test-classes">
@@ -130,6 +152,9 @@
<classes dir="${tests.output.dir}/test-resources/jaxws/clientConfig">
<include name="META-INF/jaxws-client-config.xml" />
</classes>
+ <zipfileset dir="${tests.output.dir}/test-resources/jaxws/clientConfig/META-INF" prefix="META-INF">
+ <include name="permissions.xml"/>
+ </zipfileset>
<manifest>
<attribute name="Dependencies" value="org.jboss.ws.common" />
</manifest>
@@ -777,19 +802,6 @@
<include name="jboss-webservices.xml" />
</metainf>
</jar>
- <jar jarfile="${tests.output.dir}/test-libs/jaxws-jbws2241-as71.jar">
- <fileset dir="${tests.output.dir}/test-classes">
- <include name="org/jboss/test/ws/jaxws/jbws2241/EJB3Bean.class" />
- <include name="org/jboss/test/ws/jaxws/jbws2241/EJB3RemoteInterface.class" />
- <include name="org/jboss/test/ws/jaxws/jbws2241/EndpointInterface.class" />
- <include name="org/jboss/test/ws/jaxws/jbws2241/EndpointService.class" />
- </fileset>
- <metainf dir="${tests.output.dir}/test-resources/jaxws/jbws2241/META-INF-as71">
- <include name="jboss.xml" />
- <include name="jboss-ejb3.xml" />
- <include name="jboss-webservices.xml" />
- </metainf>
- </jar>
<!-- jaxws-jbws2250 -->
<war warfile="${tests.output.dir}/test-libs/jaxws-jbws2250.war" webxml="${tests.output.dir}/test-resources/jaxws/jbws2250/WEB-INF/web.xml">
@@ -1379,6 +1391,13 @@
</classes>
</war>
+ <!-- jaxws-jbws3753 -->
+ <war destfile="${tests.output.dir}/test-libs/jaxws-jbws3753.war" webxml="${tests.output.dir}/test-resources/jaxws/jbws3753/WEB-INF/web.xml">
+ <classes dir="${tests.output.dir}/test-classes">
+ <include name="org/jboss/test/ws/jaxws/jbws3753/Service*.class" />
+ </classes>
+ </war>
+
<war warfile="${tests.output.dir}/test-libs/jaxws-jbws3367-usecase2.war" needxmlfile="false">
<classes dir="${tests.output.dir}/test-classes">
<include name="org/jboss/test/ws/jaxws/jbws3367/EndpointIface.class" />
Modified: stack/cxf/branches/jaspi/modules/testsuite/shared-tests/src/test/ant-import/build-samples-jaxws.xml
===================================================================
--- stack/cxf/branches/jaspi/modules/testsuite/shared-tests/src/test/ant-import/build-samples-jaxws.xml 2014-02-11 09:00:46 UTC (rev 18337)
+++ stack/cxf/branches/jaspi/modules/testsuite/shared-tests/src/test/ant-import/build-samples-jaxws.xml 2014-02-11 09:07:45 UTC (rev 18338)
@@ -111,6 +111,11 @@
<include name="jaxws-samples-eardeployment-ejb3.jar"/>
<include name="jaxws-samples-eardeployment-pojo.war"/>
</fileset>
+ <zipfileset
+ dir="${tests.output.dir}/test-resources/jaxws/samples/eardeployment/META-INF"
+ prefix="META-INF">
+ <include name="permissions.xml"/>
+ </zipfileset>
</jar>
<!-- jaxws-samples-exception -->
@@ -548,25 +553,6 @@
</classes>
</war>
- <!-- endpoint-publish.war -->
- <war warfile="${tests.output.dir}/test-libs/endpoint-publish.war" needxmlfile='false'>
- <classes dir="${tests.output.dir}/test-classes">
- <include name="org/jboss/test/ws/publish/**/*.class"/>
- <include name="org/jboss/test/ws/publish/EndpointImpl5.xml"/>
- <include name="org/jboss/test/ws/publish/TestService.xml"/>
- <exclude name="org/jboss/test/ws/publish/*TestCase.class"/>
- </classes>
- <classes dir="${tests.output.dir}/test-classes/org/jboss/test/ws/publish" erroronmissingdir="false">
- <include name="WEB-INF/wsdl/**" />
- </classes>
- <webinf dir="${tests.output.dir}/test-resources/publish/WEB-INF" erroronmissingdir="false">
- <include name="wsdl/**"/>
- </webinf>
- <manifest>
- <attribute name="Dependencies" value="org.jboss.ws.common" />
- </manifest>
- </war>
-
<!-- management-recording-as7.jar -->
<jar destfile="${tests.output.dir}/test-libs/management-recording-as7.jar">
<fileset dir="${tests.output.dir}/test-classes">
Modified: stack/cxf/branches/jaspi/modules/testsuite/shared-tests/src/test/java/org/jboss/test/ws/jaxws/clientConfig/ClientConfigurationTestCase.java
===================================================================
--- stack/cxf/branches/jaspi/modules/testsuite/shared-tests/src/test/java/org/jboss/test/ws/jaxws/clientConfig/ClientConfigurationTestCase.java 2014-02-11 09:00:46 UTC (rev 18337)
+++ stack/cxf/branches/jaspi/modules/testsuite/shared-tests/src/test/java/org/jboss/test/ws/jaxws/clientConfig/ClientConfigurationTestCase.java 2014-02-11 09:07:45 UTC (rev 18338)
@@ -1,6 +1,6 @@
/*
* JBoss, Home of Professional Open Source.
- * Copyright 2012, Red Hat Middleware LLC, and individual contributors
+ * Copyright 2013, Red Hat Middleware LLC, and individual contributors
* as indicated by the @author tags. See the copyright.txt file in the
* distribution for a full listing of individual contributors.
*
@@ -116,44 +116,6 @@
assertEquals("1", runTestInContainer("testConfigurationChangeOnDispatch"));
}
- /**
- * Verifies the default client configuration from AS model is used
- *
- * @throws Exception
- */
- public void testDefaultClientConfigurationInContainer() throws Exception {
- if (!isTargetJBoss71()) {
- assertEquals("1", runTestInContainer("testDefaultClientConfiguration"));
- }
- }
-
- public void testDefaultClientConfigurationOnDispatchInContainer() throws Exception {
- if (!isTargetJBoss71()) {
- assertEquals("1", runTestInContainer("testDefaultClientConfigurationOnDispatch"));
- }
- }
-
- /**
- * Verifies a client configuration from AS model can be set
- *
- * @throws Exception
- */
- public void testCustomClientConfigurationInContainer() throws Exception {
- assertEquals("1", runTestInContainer("testCustomClientConfiguration"));
- }
-
- public void testCustomClientConfigurationOnDispatchInContainer() throws Exception {
- assertEquals("1", runTestInContainer("testCustomClientConfigurationOnDispatch"));
- }
-
- public void testCustomClientConfigurationUsingFeatureInContainer() throws Exception {
- assertEquals("1", runTestInContainer("testCustomClientConfigurationUsingFeature"));
- }
-
- public void testCustomClientConfigurationOnDispatchUsingFeatureInContainer() throws Exception {
- assertEquals("1", runTestInContainer("testCustomClientConfigurationOnDispatchUsingFeature"));
- }
-
// -------------------------
private Helper getHelper() {
Copied: stack/cxf/branches/jaspi/modules/testsuite/shared-tests/src/test/java/org/jboss/test/ws/jaxws/clientConfig/ClientConfigurationTestCaseForked.java (from rev 18336, stack/cxf/trunk/modules/testsuite/shared-tests/src/test/java/org/jboss/test/ws/jaxws/clientConfig/ClientConfigurationTestCaseForked.java)
===================================================================
--- stack/cxf/branches/jaspi/modules/testsuite/shared-tests/src/test/java/org/jboss/test/ws/jaxws/clientConfig/ClientConfigurationTestCaseForked.java (rev 0)
+++ stack/cxf/branches/jaspi/modules/testsuite/shared-tests/src/test/java/org/jboss/test/ws/jaxws/clientConfig/ClientConfigurationTestCaseForked.java 2014-02-11 09:07:45 UTC (rev 18338)
@@ -0,0 +1,90 @@
+/*
+ * JBoss, Home of Professional Open Source.
+ * Copyright 2013, Red Hat Middleware LLC, and individual contributors
+ * as indicated by the @author tags. See the copyright.txt file in the
+ * distribution for a full listing of individual contributors.
+ *
+ * This is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU Lesser General Public License as
+ * published by the Free Software Foundation; either version 2.1 of
+ * the License, or (at your option) any later version.
+ *
+ * This software is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this software; if not, write to the Free
+ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
+ * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
+ */
+package org.jboss.test.ws.jaxws.clientConfig;
+
+import java.io.BufferedReader;
+import java.io.InputStreamReader;
+import java.net.URL;
+
+import junit.framework.Test;
+
+import org.jboss.wsf.test.JBossWSTest;
+import org.jboss.wsf.test.JBossWSTestSetup;
+
+/**
+ * Verifies client configuration setup (in-container tests, relying on AS model)
+ *
+ * @author alessio.soldano(a)jboss.com
+ * @since 31-May-2012
+ */
+public class ClientConfigurationTestCaseForked extends JBossWSTest
+{
+ public static Test suite()
+ {
+ return new JBossWSTestSetup(ClientConfigurationTestCaseForked.class, "jaxws-clientConfig.war,jaxws-clientConfig-client.jar, jaxws-clientConfig-inContainer-client.war");
+ }
+
+ /**
+ * Verifies the default client configuration from AS model is used
+ *
+ * @throws Exception
+ */
+ public void testDefaultClientConfigurationInContainer() throws Exception {
+ assertEquals("1", runTestInContainer("testDefaultClientConfiguration"));
+ }
+
+ public void testDefaultClientConfigurationOnDispatchInContainer() throws Exception {
+ assertEquals("1", runTestInContainer("testDefaultClientConfigurationOnDispatch"));
+ }
+
+ /**
+ * Verifies a client configuration from AS model can be set
+ *
+ * @throws Exception
+ */
+ public void testCustomClientConfigurationInContainer() throws Exception {
+ assertEquals("1", runTestInContainer("testCustomClientConfiguration"));
+ }
+
+ public void testCustomClientConfigurationOnDispatchInContainer() throws Exception {
+ assertEquals("1", runTestInContainer("testCustomClientConfigurationOnDispatch"));
+ }
+
+ public void testCustomClientConfigurationUsingFeatureInContainer() throws Exception {
+ assertEquals("1", runTestInContainer("testCustomClientConfigurationUsingFeature"));
+ }
+
+ public void testCustomClientConfigurationOnDispatchUsingFeatureInContainer() throws Exception {
+ assertEquals("1", runTestInContainer("testCustomClientConfigurationOnDispatchUsingFeature"));
+ }
+
+ // -------------------------
+
+ private String runTestInContainer(String test) throws Exception
+ {
+ URL url = new URL("http://" + getServerHost()
+ + ":8080/jaxws-clientConfig-inContainer-client?path=/jaxws-clientConfig/EndpointImpl&method=" + test
+ + "&helper=" + Helper.class.getName());
+ BufferedReader br = new BufferedReader(new InputStreamReader(url.openStream()));
+ return br.readLine();
+ }
+}
Modified: stack/cxf/branches/jaspi/modules/testsuite/shared-tests/src/test/java/org/jboss/test/ws/jaxws/clientConfig/Helper.java
===================================================================
--- stack/cxf/branches/jaspi/modules/testsuite/shared-tests/src/test/java/org/jboss/test/ws/jaxws/clientConfig/Helper.java 2014-02-11 09:00:46 UTC (rev 18337)
+++ stack/cxf/branches/jaspi/modules/testsuite/shared-tests/src/test/java/org/jboss/test/ws/jaxws/clientConfig/Helper.java 2014-02-11 09:07:45 UTC (rev 18338)
@@ -38,6 +38,7 @@
import org.jboss.ws.api.configuration.ClientConfigUtil;
import org.jboss.ws.api.configuration.ClientConfigurer;
import org.jboss.ws.common.DOMUtils;
+import org.jboss.wsf.spi.metadata.config.ClientConfig;
/**
* Verifies client configuration setup
@@ -213,11 +214,12 @@
{
QName serviceName = new QName("http://clientConfig.jaxws.ws.test.jboss.org/", "EndpointImplService");
URL wsdlURL = new URL(address + "?wsdl");
+ final ClientConfig defaultClientConfig = TestUtils.getAndVerifyDefaultClientConfiguration();
// -- modify default conf --
try
{
- TestUtils.modifyDefaultClientConfiguration(TestUtils.getAndVerifyDefaultClientConfiguration());
+ TestUtils.changeDefaultClientConfiguration();
// --
Service service = Service.create(wsdlURL, serviceName);
@@ -235,7 +237,7 @@
finally
{
// -- restore default conf --
- TestUtils.cleanupClientConfig();
+ TestUtils.setClientConfigAndReload(defaultClientConfig);
// --
}
}
@@ -246,11 +248,12 @@
QName serviceName = new QName("http://clientConfig.jaxws.ws.test.jboss.org/", "EndpointImplService");
QName portName = new QName("http://clientConfig.jaxws.ws.test.jboss.org/", "EndpointPort");
URL wsdlURL = new URL(address + "?wsdl");
+ final ClientConfig defaultClientConfig = TestUtils.getAndVerifyDefaultClientConfiguration();
// -- modify default conf --
try
{
- TestUtils.modifyDefaultClientConfiguration(TestUtils.getAndVerifyDefaultClientConfiguration());
+ TestUtils.changeDefaultClientConfiguration();
// --
Service service = Service.create(wsdlURL, serviceName);
@@ -269,7 +272,7 @@
finally
{
// -- restore default conf --
- TestUtils.cleanupClientConfig();
+ TestUtils.setClientConfigAndReload(defaultClientConfig);
// --
}
}
Modified: stack/cxf/branches/jaspi/modules/testsuite/shared-tests/src/test/java/org/jboss/test/ws/jaxws/clientConfig/TestUtils.java
===================================================================
--- stack/cxf/branches/jaspi/modules/testsuite/shared-tests/src/test/java/org/jboss/test/ws/jaxws/clientConfig/TestUtils.java 2014-02-11 09:00:46 UTC (rev 18337)
+++ stack/cxf/branches/jaspi/modules/testsuite/shared-tests/src/test/java/org/jboss/test/ws/jaxws/clientConfig/TestUtils.java 2014-02-11 09:07:45 UTC (rev 18338)
@@ -1,6 +1,6 @@
/*
* JBoss, Home of Professional Open Source.
- * Copyright 2012, Red Hat Middleware LLC, and individual contributors
+ * Copyright 2013, Red Hat Middleware LLC, and individual contributors
* as indicated by the @author tags. See the copyright.txt file in the
* distribution for a full listing of individual contributors.
*
@@ -21,7 +21,7 @@
*/
package org.jboss.test.ws.jaxws.clientConfig;
-import java.util.Iterator;
+import java.util.Collections;
import java.util.LinkedList;
import java.util.List;
@@ -46,12 +46,7 @@
{
public static ClientConfig getAndVerifyDefaultClientConfiguration() throws Exception {
ServerConfig sc = getServerConfig();
- ClientConfig defaultConfig = null;
- for (ClientConfig c : sc.getClientConfigs()) {
- if (ClientConfig.STANDARD_CLIENT_CONFIG.equals(c.getConfigName())) {
- defaultConfig = c;
- }
- }
+ ClientConfig defaultConfig = sc.getClientConfig(ClientConfig.STANDARD_CLIENT_CONFIG);
if (defaultConfig == null) {
throw new Exception("Missing AS client config '" + ClientConfig.STANDARD_CLIENT_CONFIG + "'!");
}
@@ -63,65 +58,33 @@
return defaultConfig;
}
- public static void modifyDefaultClientConfiguration(ClientConfig defaultConfig) {
- UnifiedHandlerChainMetaData uhcmd = new UnifiedHandlerChainMetaData();
- UnifiedHandlerMetaData handler = new UnifiedHandlerMetaData();
- handler.setHandlerClass("org.jboss.test.ws.jaxws.clientConfig.LogHandler");
- handler.setHandlerName("Log Handler");
- uhcmd.addHandler(handler);
- List<UnifiedHandlerChainMetaData> postHC = new LinkedList<UnifiedHandlerChainMetaData>();
- postHC.add(uhcmd);
- defaultConfig.setPostHandlerChains(postHC);
+ public static void changeDefaultClientConfiguration() {
+ UnifiedHandlerMetaData handler = new UnifiedHandlerMetaData("org.jboss.test.ws.jaxws.clientConfig.LogHandler", "Log Handler", null, null, null, null);
+ UnifiedHandlerChainMetaData uhcmd = new UnifiedHandlerChainMetaData(null, null, null, Collections.singletonList(handler), false, null);
+ List<UnifiedHandlerChainMetaData> postHC = Collections.singletonList(uhcmd);
+
+ ClientConfig newDefaultClientConfig = new ClientConfig(ClientConfig.STANDARD_CLIENT_CONFIG, null, postHC, null, null);
+ setClientConfigAndReload(newDefaultClientConfig);
}
- public static void cleanupClientConfig() throws Exception {
+ public static void setClientConfigAndReload(ClientConfig config) {
ServerConfig sc = getServerConfig();
- ClientConfig defaultConfig = null;
- for (ClientConfig c : sc.getClientConfigs()) {
- if (ClientConfig.STANDARD_CLIENT_CONFIG.equals(c.getConfigName())) {
- defaultConfig = c;
- }
- }
- if (defaultConfig == null) {
- throw new Exception("Missing AS client config '" + ClientConfig.STANDARD_CLIENT_CONFIG + "'!");
- }
- List<UnifiedHandlerChainMetaData> preHC = defaultConfig.getPreHandlerChains();
- List<UnifiedHandlerChainMetaData> postHC = defaultConfig.getPostHandlerChains();
- if ((preHC == null || preHC.isEmpty()) && (postHC == null || postHC.isEmpty())) {
- throw new Exception("'" + ClientConfig.STANDARD_CLIENT_CONFIG + "' is already empty!");
- }
- defaultConfig.setPostHandlerChains(null);
- defaultConfig.setPreHandlerChains(null);
+ sc.registerClientConfig(config);
+ sc.reloadClientConfigs();
}
public static void addTestCaseClientConfiguration(String testConfigName) {
- UnifiedHandlerChainMetaData uhcmd = new UnifiedHandlerChainMetaData();
- UnifiedHandlerMetaData handler = new UnifiedHandlerMetaData();
- handler.setHandlerClass("org.jboss.test.ws.jaxws.clientConfig.RoutingHandler");
- handler.setHandlerName("Routing Handler");
- uhcmd.addHandler(handler);
- ClientConfig config = new ClientConfig();
- config.setConfigName(testConfigName);
+ UnifiedHandlerMetaData handler = new UnifiedHandlerMetaData("org.jboss.test.ws.jaxws.clientConfig.RoutingHandler", "Routing Handler", null, null, null, null);
+ UnifiedHandlerChainMetaData uhcmd = new UnifiedHandlerChainMetaData(null, null, null, Collections.singletonList(handler), false, null);
List<UnifiedHandlerChainMetaData> preHC = new LinkedList<UnifiedHandlerChainMetaData>();
preHC.add(uhcmd);
- config.setPreHandlerChains(preHC);
- getServerConfig().addClientConfig(config);
+ setClientConfigAndReload(new ClientConfig(testConfigName, preHC, null, null, null));
}
public static void removeTestCaseClientConfiguration(String testConfigName) {
ServerConfig sc = getServerConfig();
- Iterator<ClientConfig> it = sc.getClientConfigs().iterator();
- ClientConfig toBeRemoved = null;
- while (it.hasNext()) {
- ClientConfig c = it.next();
- if (testConfigName.equals(c.getConfigName())) {
- toBeRemoved = c;
- break;
- }
- }
- if (toBeRemoved != null) {
- sc.getClientConfigs().remove(toBeRemoved);
- }
+ sc.unregisterClientConfig(new ClientConfig(testConfigName, null, null, null, null));
+ sc.reloadClientConfigs();
}
private static ServerConfig getServerConfig()
Modified: stack/cxf/branches/jaspi/modules/testsuite/shared-tests/src/test/java/org/jboss/test/ws/jaxws/jbws2241/JBWS2241TestCase.java
===================================================================
--- stack/cxf/branches/jaspi/modules/testsuite/shared-tests/src/test/java/org/jboss/test/ws/jaxws/jbws2241/JBWS2241TestCase.java 2014-02-11 09:00:46 UTC (rev 18337)
+++ stack/cxf/branches/jaspi/modules/testsuite/shared-tests/src/test/java/org/jboss/test/ws/jaxws/jbws2241/JBWS2241TestCase.java 2014-02-11 09:07:45 UTC (rev 18338)
@@ -43,7 +43,7 @@
{
public static Test suite()
{
- return new JBossWSTestSetup(JBWS2241TestCase.class, isTargetJBoss71() ? "jaxws-jbws2241-as71.jar" : "jaxws-jbws2241.jar", true);
+ return new JBossWSTestSetup(JBWS2241TestCase.class, "jaxws-jbws2241.jar", true);
}
private EndpointInterface getPort(String user, String pwd) throws MalformedURLException {
Modified: stack/cxf/branches/jaspi/modules/testsuite/shared-tests/src/test/java/org/jboss/test/ws/publish/EndpointPublishServlet.java
===================================================================
--- stack/cxf/branches/jaspi/modules/testsuite/shared-tests/src/test/java/org/jboss/test/ws/publish/EndpointPublishServlet.java 2014-02-11 09:00:46 UTC (rev 18337)
+++ stack/cxf/branches/jaspi/modules/testsuite/shared-tests/src/test/java/org/jboss/test/ws/publish/EndpointPublishServlet.java 2014-02-11 09:07:45 UTC (rev 18338)
@@ -144,31 +144,28 @@
// | /some/complex/pattern/* | foo.Bar | some.complex.pattern | used pattern url with dots instead of / and removed all wildcards |
// +-------------------------+----------------+----------------------+-------------------------------------------------------------------+
private WebservicesMetaData createMetaData() {
- WebservicesMetaData metadata = new WebservicesMetaData();
- WebserviceDescriptionMetaData webserviceDescription = new WebserviceDescriptionMetaData(metadata);
- metadata.addWebserviceDescription(webserviceDescription);
- webserviceDescription.setWsdlFile("WEB-INF/wsdl/EndpointImpl4.xml");
- PortComponentMetaData portComponent = new PortComponentMetaData(webserviceDescription);
- portComponent.setPortComponentName("PortComponent4"); //unique ID
- portComponent.setServiceEndpointInterface("org.jboss.test.ws.publish.EndpointImpl4");
- portComponent.setWsdlPort(new QName("http://publish.ws.test.jboss.org/", "EndpointPort4"));
- portComponent.setWsdlService(new QName("http://publish.ws.test.jboss.org/", "EndpointService4"));
- // mandatory servlet link (because endpoint is POJO) - needed for proper matching of endpoint with WebservicesMD
- portComponent.setServletLink("pattern4");
- // if endpoint ^ would be EJB, users have to use setEjbLink() method instead
- webserviceDescription.addPortComponent(portComponent);
- WebserviceDescriptionMetaData webserviceDescription2 = new WebserviceDescriptionMetaData(metadata);
- metadata.addWebserviceDescription(webserviceDescription2);
- webserviceDescription2.setWsdlFile("org/jboss/test/ws/publish/EndpointImpl5.xml"); //test JBWS-3540
- PortComponentMetaData portComponent2 = new PortComponentMetaData(webserviceDescription2);
- portComponent2.setPortComponentName("PortComponent5"); //unique ID
- portComponent2.setServiceEndpointInterface("org.jboss.test.ws.publish.EndpointImpl5");
- portComponent2.setWsdlPort(new QName("http://publish.ws.test.jboss.org/", "EndpointPort5"));
- portComponent2.setWsdlService(new QName("http://publish.ws.test.jboss.org/", "EndpointService5"));
- // mandatory servlet link (because endpoint is POJO) - needed for proper matching of endpoint with WebservicesMD
- portComponent2.setServletLink("pattern5");
- // if endpoint ^ would be EJB, users have to use setEjbLink() method instead
- webserviceDescription2.addPortComponent(portComponent2);
+ PortComponentMetaData portComponent = new PortComponentMetaData("PortComponent4", //unique ID
+ new QName("http://publish.ws.test.jboss.org/","EndpointPort4"),
+ "org.jboss.test.ws.publish.EndpointImpl4",
+ null, // if endpoint ^ was an EJB, user would have to use this parameter to set ejbLink
+ "pattern4", // mandatory servlet link (because endpoint is POJO) - needed for proper matching of endpoint with WebservicesMD
+ null, null,
+ new QName("http://publish.ws.test.jboss.org/", "EndpointService4"),
+ null, null);
+ WebserviceDescriptionMetaData webserviceDescription = new WebserviceDescriptionMetaData(null, "WEB-INF/wsdl/EndpointImpl4.xml", null, portComponent);
+
+ PortComponentMetaData portComponent2 = new PortComponentMetaData("PortComponent5", //unique ID
+ new QName("http://publish.ws.test.jboss.org/","EndpointPort5"),
+ "org.jboss.test.ws.publish.EndpointImpl5",
+ null, // if endpoint ^ was an EJB, user would have to use this parameter to set ejbLink
+ "pattern5", // mandatory servlet link (because endpoint is POJO) - needed for proper matching of endpoint with WebservicesMD
+ null, null,
+ new QName("http://publish.ws.test.jboss.org/", "EndpointService5"),
+ null, null);
+ WebserviceDescriptionMetaData webserviceDescription2 = new WebserviceDescriptionMetaData(null, "org/jboss/test/ws/publish/EndpointImpl5.xml", //test JBWS-3540
+ null, portComponent2);
+
+ WebservicesMetaData metadata = new WebservicesMetaData(null, new WebserviceDescriptionMetaData[]{webserviceDescription, webserviceDescription2});
return metadata;
}
Copied: stack/cxf/branches/jaspi/modules/testsuite/shared-tests/src/test/resources/jaxws/clientConfig/META-INF/permissions.xml (from rev 18336, stack/cxf/trunk/modules/testsuite/shared-tests/src/test/resources/jaxws/clientConfig/META-INF/permissions.xml)
===================================================================
--- stack/cxf/branches/jaspi/modules/testsuite/shared-tests/src/test/resources/jaxws/clientConfig/META-INF/permissions.xml (rev 0)
+++ stack/cxf/branches/jaspi/modules/testsuite/shared-tests/src/test/resources/jaxws/clientConfig/META-INF/permissions.xml 2014-02-11 09:07:45 UTC (rev 18338)
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="UTF-8"?>
+
+<permissions xmlns="http://xmlns.jcp.org/xml/ns/javaee"
+ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xsi:schemaLocation="http://xmlns.jcp.org/xml/ns/javaee http://xmlns.jcp.org/xml/ns/javaee/permissions_7.xsd"
+ version="7">
+ <permission>
+ <class-name>java.lang.RuntimePermission</class-name>
+ <name>org.jboss.as.server.LOOKUP_CURRENT_SERVICE_CONTAINER</name>
+ </permission>
+</permissions>
Modified: stack/cxf/branches/jaspi/modules/testsuite/test-utils/pom.xml
===================================================================
--- stack/cxf/branches/jaspi/modules/testsuite/test-utils/pom.xml 2014-02-11 09:00:46 UTC (rev 18337)
+++ stack/cxf/branches/jaspi/modules/testsuite/test-utils/pom.xml 2014-02-11 09:07:45 UTC (rev 18338)
@@ -32,4 +32,26 @@
</dependency>
</dependencies>
+ <build>
+ <plugins>
+ <plugin>
+ <groupId>org.codehaus.mojo</groupId>
+ <artifactId>exec-maven-plugin</artifactId>
+ <version>1.2.1</version>
+ <executions>
+ <execution>
+ <id>check-bc-and-unlimited-crypto</id>
+ <phase>pre-integration-test</phase>
+ <goals>
+ <goal>java</goal>
+ </goals>
+ <configuration>
+ <mainClass>org.jboss.wsf.test.CryptoCheckMain</mainClass>
+ </configuration>
+ </execution>
+ </executions>
+ </plugin>
+ </plugins>
+ </build>
+
</project>
Copied: stack/cxf/branches/jaspi/modules/testsuite/test-utils/src/main/java/org/jboss/wsf/test/CryptoCheckMain.java (from rev 18336, stack/cxf/trunk/modules/testsuite/test-utils/src/main/java/org/jboss/wsf/test/CryptoCheckMain.java)
===================================================================
--- stack/cxf/branches/jaspi/modules/testsuite/test-utils/src/main/java/org/jboss/wsf/test/CryptoCheckMain.java (rev 0)
+++ stack/cxf/branches/jaspi/modules/testsuite/test-utils/src/main/java/org/jboss/wsf/test/CryptoCheckMain.java 2014-02-11 09:07:45 UTC (rev 18338)
@@ -0,0 +1,19 @@
+package org.jboss.wsf.test;
+
+/**
+ *
+ * @author Rostislav Svoboda
+ */
+public class CryptoCheckMain
+{
+
+ public static void main(String[] args) throws Exception
+ {
+ System.out.println("XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX");
+ System.out.println("JCE unlimited strength cryptography: " + ((javax.crypto.Cipher.getMaxAllowedKeyLength("RC5") < 256)?"NOT ":"") + "INSTALLED" );
+ System.out.println("Bouncy Castle JCE Provider: " + ((java.security.Security.getProvider("BC") == null)?"NOT ":"") + "INSTALLED" );
+ System.out.println("XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX");
+ }
+
+}
+
Modified: stack/cxf/branches/jaspi/modules/testsuite/test-utils/src/main/java/org/jboss/wsf/test/JBossWSTest.java
===================================================================
--- stack/cxf/branches/jaspi/modules/testsuite/test-utils/src/main/java/org/jboss/wsf/test/JBossWSTest.java 2014-02-11 09:00:46 UTC (rev 18337)
+++ stack/cxf/branches/jaspi/modules/testsuite/test-utils/src/main/java/org/jboss/wsf/test/JBossWSTest.java 2014-02-11 09:07:45 UTC (rev 18338)
@@ -207,11 +207,6 @@
return JBossWSTestHelper.isTargetJBoss7();
}
- public static boolean isTargetJBoss71()
- {
- return JBossWSTestHelper.isTargetJBoss71();
- }
-
public static boolean isTargetJBoss72()
{
return JBossWSTestHelper.isTargetJBoss72();
Modified: stack/cxf/branches/jaspi/modules/testsuite/test-utils/src/main/java/org/jboss/wsf/test/JBossWSTestHelper.java
===================================================================
--- stack/cxf/branches/jaspi/modules/testsuite/test-utils/src/main/java/org/jboss/wsf/test/JBossWSTestHelper.java 2014-02-11 09:00:46 UTC (rev 18337)
+++ stack/cxf/branches/jaspi/modules/testsuite/test-utils/src/main/java/org/jboss/wsf/test/JBossWSTestHelper.java 2014-02-11 09:07:45 UTC (rev 18338)
@@ -151,36 +151,18 @@
return target.startsWith("jboss7");
}
- public static boolean isTargetJBoss71()
- {
- String target = getIntegrationTarget();
- return target.startsWith("jboss71");
- }
-
public static boolean isTargetJBoss72()
{
String target = getIntegrationTarget();
return target.startsWith("jboss72");
}
- @Deprecated
- public static boolean isTargetJBoss8()
- {
- return isTargetJBoss8();
- }
-
public static boolean isTargetWildFly8()
{
String target = getIntegrationTarget();
return target.startsWith("wildfly8");
}
- @Deprecated
- public static boolean isTargetJBoss80()
- {
- return isTargetWildFly80();
- }
-
public static boolean isTargetWildFly80()
{
String target = getIntegrationTarget();
Modified: stack/cxf/branches/jaspi/pom.xml
===================================================================
--- stack/cxf/branches/jaspi/pom.xml 2014-02-11 09:00:46 UTC (rev 18337)
+++ stack/cxf/branches/jaspi/pom.xml 2014-02-11 09:07:45 UTC (rev 18338)
@@ -64,16 +64,12 @@
<jbossws.spi.version>2.3.0-SNAPSHOT</jbossws.spi.version>
<jbossws.common.version>2.3.0-SNAPSHOT</jbossws.common.version>
<jbossws.common.tools.version>1.2.0.Final</jbossws.common.tools.version>
- <jbossws.jboss712.version>4.2.1.Final</jbossws.jboss712.version>
- <jbossws.jboss713.version>4.2.1.Final</jbossws.jboss713.version>
<jbossws.jboss720.version>4.3.0-SNAPSHOT</jbossws.jboss720.version>
<jbossws.native.version>4.1.2.Final</jbossws.native.version>
- <jboss712.version>7.1.2.Final</jboss712.version>
- <jboss713.version>7.1.3.Final</jboss713.version>
<jboss720.version>7.2.0.Final</jboss720.version>
- <wildfly800.version>8.0.0.Beta2-SNAPSHOT</wildfly800.version>
+ <wildfly800.version>8.0.0.Final-SNAPSHOT</wildfly800.version>
<ejb.api.version>1.0.2.Final</ejb.api.version>
- <cxf.version>2.7.8</cxf.version>
+ <cxf.version>2.7.10</cxf.version>
<cxf.asm.version>3.3.1</cxf.asm.version>
<cxf.xjcplugins.version>2.6.1</cxf.xjcplugins.version>
<jboss.common.core.version>2.2.17.GA</jboss.common.core.version>
@@ -84,9 +80,11 @@
<picketbox.version>4.0.17.Final</picketbox.version>
<picketlink.version>2.1.7.Final</picketlink.version>
<jaxws-jboss-httpserver-httpspi.version>1.0.1.GA</jaxws-jboss-httpserver-httpspi.version>
+ <jaxws-undertow-httpspi.version>1.0.1-SNAPSHOT</jaxws-undertow-httpspi.version>
<httpserver.version>1.0.0.Final</httpserver.version>
+ <io.undertow.version>1.0.0.Beta33</io.undertow.version>
<jaxb.api.version>1.0.4.Final</jaxb.api.version>
- <jaxb.impl.version>2.2.5</jaxb.impl.version>
+ <jaxb.impl.version>2.2.6</jaxb.impl.version>
<jaxrpc.api.version>1.0.1.Final</jaxrpc.api.version>
<jaxws.api.version>2.0.2.Final</jaxws.api.version>
<jsr181.api.version>1.0-MR1</jsr181.api.version>
@@ -105,7 +103,7 @@
<velocity.version>1.7</velocity.version>
<xerces.version>2.9.1</xerces.version>
<xmlsec.version>1.5.6</xmlsec.version>
- <wss4j.version>1.6.13</wss4j.version>
+ <wss4j.version>1.6.14</wss4j.version>
<wstx.version>4.2.0</wstx.version>
<spring.version>3.0.7.RELEASE</spring.version>
<shrinkwrap.version>1.1.3</shrinkwrap.version>
@@ -140,26 +138,6 @@
</dependency>
<dependency>
<groupId>org.jboss.ws</groupId>
- <artifactId>jbossws-jboss712-server-integration</artifactId>
- <version>${jbossws.jboss712.version}</version>
- </dependency>
- <dependency>
- <groupId>org.jboss.ws</groupId>
- <artifactId>jbossws-jboss712-tests-integration</artifactId>
- <version>${jbossws.jboss712.version}</version>
- </dependency>
- <dependency>
- <groupId>org.jboss.ws</groupId>
- <artifactId>jbossws-jboss713-server-integration</artifactId>
- <version>${jbossws.jboss713.version}</version>
- </dependency>
- <dependency>
- <groupId>org.jboss.ws</groupId>
- <artifactId>jbossws-jboss713-tests-integration</artifactId>
- <version>${jbossws.jboss713.version}</version>
- </dependency>
- <dependency>
- <groupId>org.jboss.ws</groupId>
<artifactId>jbossws-jboss720-server-integration</artifactId>
<version>${jbossws.jboss720.version}</version>
</dependency>
@@ -178,6 +156,11 @@
<artifactId>jaxws-jboss-httpserver-httpspi</artifactId>
<version>${jaxws-jboss-httpserver-httpspi.version}</version>
</dependency>
+ <dependency>
+ <groupId>org.jboss.ws.projects</groupId>
+ <artifactId>jaxws-undertow-httpspi</artifactId>
+ <version>${jaxws-undertow-httpspi.version}</version>
+ </dependency>
<!-- CXF dependencies -->
<dependency>
@@ -972,6 +955,17 @@
<version>${httpserver.version}</version>
</dependency>
<dependency>
+ <groupId>io.undertow</groupId>
+ <artifactId>undertow-core</artifactId>
+ <version>${io.undertow.version}</version>
+ <exclusions>
+ <exclusion>
+ <groupId>io.undertow</groupId>
+ <artifactId>undertow-build-config</artifactId>
+ </exclusion>
+ </exclusions>
+ </dependency>
+ <dependency>
<groupId>org.opensaml</groupId>
<artifactId>opensaml</artifactId>
<version>${opensaml.version}</version>
@@ -1365,34 +1359,10 @@
</profile>
<!--
- Name: jboss712
- Descr: JBoss-7.1.2 specific options
+ Name: jboss720
+ Descr: JBoss-7.2.0 specific options
-->
<profile>
- <id>jboss712</id>
- <properties>
- <jbossws.integration.target>jboss712</jbossws.integration.target>
- <jboss.home>${jboss712.home}</jboss.home>
- </properties>
- </profile>
-
- <!--
- Name: jboss713
- Descr: JBoss-7.1.3 specific options
- -->
- <profile>
- <id>jboss713</id>
- <properties>
- <jbossws.integration.target>jboss713</jbossws.integration.target>
- <jboss.home>${jboss713.home}</jboss.home>
- </properties>
- </profile>
-
- <!--
- Name: jboss711
- Descr: JBoss-7.1.1 specific options
- -->
- <profile>
<id>jboss720</id>
<properties>
<jbossws.integration.target>jboss720</jbossws.integration.target>
10 years, 2 months
JBossWS SVN: r18337 - stack/cxf/branches/jaspi/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/samples/wsse/policy/jaspi.
by jbossws-commits@lists.jboss.org
Author: jim.ma
Date: 2014-02-11 04:00:46 -0500 (Tue, 11 Feb 2014)
New Revision: 18337
Added:
stack/cxf/branches/jaspi/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/samples/wsse/policy/jaspi/Helper.java
Log:
Add the missing file
Added: stack/cxf/branches/jaspi/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/samples/wsse/policy/jaspi/Helper.java
===================================================================
--- stack/cxf/branches/jaspi/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/samples/wsse/policy/jaspi/Helper.java (rev 0)
+++ stack/cxf/branches/jaspi/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/samples/wsse/policy/jaspi/Helper.java 2014-02-11 09:00:46 UTC (rev 18337)
@@ -0,0 +1,60 @@
+/*
+ * JBoss, Home of Professional Open Source.
+ * Copyright 2011, Red Hat Middleware LLC, and individual contributors
+ * as indicated by the @author tags. See the copyright.txt file in the
+ * distribution for a full listing of individual contributors.
+ *
+ * This is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU Lesser General Public License as
+ * published by the Free Software Foundation; either version 2.1 of
+ * the License, or (at your option) any later version.
+ *
+ * This software is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this software; if not, write to the Free
+ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
+ * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
+ */
+package org.jboss.test.ws.jaxws.samples.wsse.policy.jaspi;
+
+import java.net.URL;
+
+import javax.xml.namespace.QName;
+import javax.xml.ws.BindingProvider;
+import javax.xml.ws.Service;
+
+import org.apache.cxf.ws.security.SecurityConstants;
+import org.jboss.ws.api.configuration.ClientConfigUtil;
+import org.jboss.wsf.stack.cxf.client.jaspi.module.SOAPClientAuthModule;
+import org.jboss.wsf.test.ClientHelper;
+
+public class Helper implements ClientHelper
+{
+ private String address;
+
+ public boolean testJaspiClient() throws Exception
+ {
+
+ QName serviceName = new QName("http://www.jboss.org/jbossws/ws-extensions/wssecuritypolicy", "SecurityService");
+ URL wsdlURL = new URL(address + "?wsdl");
+ Service service = Service.create(wsdlURL, serviceName);
+ ServiceIface proxy = (ServiceIface)service.getPort(ServiceIface.class);
+ ClientConfigUtil.setConfigProperties(proxy, "META-INF/jaxws-client-config.xml", "jaspiSecurityDomain");
+ ((BindingProvider)proxy).getRequestContext().put(SecurityConstants.USERNAME, "kermit");
+ ((BindingProvider)proxy).getRequestContext()
+ .put(SecurityConstants.CALLBACK_HANDLER, "org.jboss.test.ws.jaxws.samples.wsse.policy.jaspi.UsernamePasswordCallback");
+
+ proxy.sayHello();
+ return SOAPClientAuthModule.log.equals("secureRequest");
+ }
+
+ public void setTargetEndpoint(String address)
+ {
+ this.address = address;
+
+ }
+}
\ No newline at end of file
Property changes on: stack/cxf/branches/jaspi/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/samples/wsse/policy/jaspi/Helper.java
___________________________________________________________________
Added: svn:keywords
+ Rev Date
Added: svn:eol-style
+ native
10 years, 2 months
JBossWS SVN: r18336 - in thirdparty/cxf/branches/cxf-2.2.12: tools/javato/ws/src/test/java/org/apache/cxf/tools/fortest/exception and 1 other directories.
by jbossws-commits@lists.jboss.org
Author: jim.ma
Date: 2014-02-10 21:57:55 -0500 (Mon, 10 Feb 2014)
New Revision: 18336
Added:
thirdparty/cxf/branches/cxf-2.2.12/tools/javato/ws/src/test/java/org/apache/cxf/tools/fortest/exception/Cl1ToCl2Adapter.java
thirdparty/cxf/branches/cxf-2.2.12/tools/javato/ws/src/test/java/org/apache/cxf/tools/fortest/exception/MyClass1.java
thirdparty/cxf/branches/cxf-2.2.12/tools/javato/ws/src/test/java/org/apache/cxf/tools/fortest/exception/MyClass2.java
thirdparty/cxf/branches/cxf-2.2.12/tools/javato/ws/src/test/java/org/apache/cxf/tools/fortest/exception/TypeAdapterEcho.java
thirdparty/cxf/branches/cxf-2.2.12/tools/javato/ws/src/test/java/org/apache/cxf/tools/fortest/exception/TypeAdapterException.java
Modified:
thirdparty/cxf/branches/cxf-2.2.12/rt/databinding/jaxb/src/main/java/org/apache/cxf/jaxb/JAXBContextInitializer.java
thirdparty/cxf/branches/cxf-2.2.12/tools/javato/ws/src/test/java/org/apache/cxf/tools/java2wsdl/processor/JavaToProcessorTest.java
Log:
[JBPAPP-10973][CXF-5219]:@XmlJavaTypeAdapter ignored for exception members
Modified: thirdparty/cxf/branches/cxf-2.2.12/rt/databinding/jaxb/src/main/java/org/apache/cxf/jaxb/JAXBContextInitializer.java
===================================================================
--- thirdparty/cxf/branches/cxf-2.2.12/rt/databinding/jaxb/src/main/java/org/apache/cxf/jaxb/JAXBContextInitializer.java 2014-02-10 11:02:18 UTC (rev 18335)
+++ thirdparty/cxf/branches/cxf-2.2.12/rt/databinding/jaxb/src/main/java/org/apache/cxf/jaxb/JAXBContextInitializer.java 2014-02-11 02:57:55 UTC (rev 18336)
@@ -366,6 +366,14 @@
Field fields[] = cls.getDeclaredFields();
for (Field f : fields) {
if (isFieldAccepted(f, accessType)) {
+ XmlJavaTypeAdapter xjta = Utils.getFieldXJTA(f);
+ if (xjta != null) {
+ Type t = Utils.getTypeFromXmlAdapter(xjta);
+ if (t != null) {
+ addType(t);
+ continue;
+ }
+ }
addType(f.getGenericType());
}
}
@@ -376,6 +384,14 @@
Method methods[] = cls.getDeclaredMethods();
for (Method m : methods) {
if (isMethodAccepted(m, accessType)) {
+ XmlJavaTypeAdapter xjta = Utils.getMethodXJTA(m);
+ if (xjta != null) {
+ Type t = Utils.getTypeFromXmlAdapter(xjta);
+ if (t != null) {
+ addType(t);
+ continue;
+ }
+ }
addType(m.getGenericReturnType());
for (Type t : m.getGenericParameterTypes()) {
addType(t);
Added: thirdparty/cxf/branches/cxf-2.2.12/tools/javato/ws/src/test/java/org/apache/cxf/tools/fortest/exception/Cl1ToCl2Adapter.java
===================================================================
--- thirdparty/cxf/branches/cxf-2.2.12/tools/javato/ws/src/test/java/org/apache/cxf/tools/fortest/exception/Cl1ToCl2Adapter.java (rev 0)
+++ thirdparty/cxf/branches/cxf-2.2.12/tools/javato/ws/src/test/java/org/apache/cxf/tools/fortest/exception/Cl1ToCl2Adapter.java 2014-02-11 02:57:55 UTC (rev 18336)
@@ -0,0 +1,37 @@
+/**
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+package org.apache.cxf.tools.fortest.exception;
+
+import javax.xml.bind.annotation.adapters.XmlAdapter;
+
+public class Cl1ToCl2Adapter extends XmlAdapter<MyClass2, MyClass1> {
+ @Override
+ public MyClass1 unmarshal(MyClass2 v) throws Exception {
+ MyClass1 mc1 = new MyClass1();
+ mc1.setName(v.getFile());
+ return mc1;
+ }
+
+ @Override
+ public MyClass2 marshal(MyClass1 v) throws Exception {
+ MyClass2 mc2 = new MyClass2();
+ mc2.setFile(v.getName());
+ return mc2;
+ }
+}
Property changes on: thirdparty/cxf/branches/cxf-2.2.12/tools/javato/ws/src/test/java/org/apache/cxf/tools/fortest/exception/Cl1ToCl2Adapter.java
___________________________________________________________________
Added: svn:keywords
+ Rev Date
Added: svn:eol-style
+ native
Added: thirdparty/cxf/branches/cxf-2.2.12/tools/javato/ws/src/test/java/org/apache/cxf/tools/fortest/exception/MyClass1.java
===================================================================
--- thirdparty/cxf/branches/cxf-2.2.12/tools/javato/ws/src/test/java/org/apache/cxf/tools/fortest/exception/MyClass1.java (rev 0)
+++ thirdparty/cxf/branches/cxf-2.2.12/tools/javato/ws/src/test/java/org/apache/cxf/tools/fortest/exception/MyClass1.java 2014-02-11 02:57:55 UTC (rev 18336)
@@ -0,0 +1,32 @@
+/**
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+package org.apache.cxf.tools.fortest.exception;
+
+public class MyClass1 {
+ private String name;
+
+ public String getName() {
+ return this.name;
+ }
+
+ public void setName(String name) {
+ this.name = name;
+ }
+
+}
Property changes on: thirdparty/cxf/branches/cxf-2.2.12/tools/javato/ws/src/test/java/org/apache/cxf/tools/fortest/exception/MyClass1.java
___________________________________________________________________
Added: svn:keywords
+ Rev Date
Added: svn:eol-style
+ native
Added: thirdparty/cxf/branches/cxf-2.2.12/tools/javato/ws/src/test/java/org/apache/cxf/tools/fortest/exception/MyClass2.java
===================================================================
--- thirdparty/cxf/branches/cxf-2.2.12/tools/javato/ws/src/test/java/org/apache/cxf/tools/fortest/exception/MyClass2.java (rev 0)
+++ thirdparty/cxf/branches/cxf-2.2.12/tools/javato/ws/src/test/java/org/apache/cxf/tools/fortest/exception/MyClass2.java 2014-02-11 02:57:55 UTC (rev 18336)
@@ -0,0 +1,31 @@
+/**
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+package org.apache.cxf.tools.fortest.exception;
+
+public class MyClass2 {
+ private String file;
+
+ public String getFile() {
+ return this.file;
+ }
+
+ public void setFile(String file) {
+ this.file = file;
+ }
+}
Property changes on: thirdparty/cxf/branches/cxf-2.2.12/tools/javato/ws/src/test/java/org/apache/cxf/tools/fortest/exception/MyClass2.java
___________________________________________________________________
Added: svn:keywords
+ Rev Date
Added: svn:eol-style
+ native
Added: thirdparty/cxf/branches/cxf-2.2.12/tools/javato/ws/src/test/java/org/apache/cxf/tools/fortest/exception/TypeAdapterEcho.java
===================================================================
--- thirdparty/cxf/branches/cxf-2.2.12/tools/javato/ws/src/test/java/org/apache/cxf/tools/fortest/exception/TypeAdapterEcho.java (rev 0)
+++ thirdparty/cxf/branches/cxf-2.2.12/tools/javato/ws/src/test/java/org/apache/cxf/tools/fortest/exception/TypeAdapterEcho.java 2014-02-11 02:57:55 UTC (rev 18336)
@@ -0,0 +1,26 @@
+/**
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+package org.apache.cxf.tools.fortest.exception;
+
+import javax.jws.WebService;
+
+@WebService
+public interface TypeAdapterEcho {
+ void test() throws TypeAdapterException;
+}
Property changes on: thirdparty/cxf/branches/cxf-2.2.12/tools/javato/ws/src/test/java/org/apache/cxf/tools/fortest/exception/TypeAdapterEcho.java
___________________________________________________________________
Added: svn:keywords
+ Rev Date
Added: svn:eol-style
+ native
Added: thirdparty/cxf/branches/cxf-2.2.12/tools/javato/ws/src/test/java/org/apache/cxf/tools/fortest/exception/TypeAdapterException.java
===================================================================
--- thirdparty/cxf/branches/cxf-2.2.12/tools/javato/ws/src/test/java/org/apache/cxf/tools/fortest/exception/TypeAdapterException.java (rev 0)
+++ thirdparty/cxf/branches/cxf-2.2.12/tools/javato/ws/src/test/java/org/apache/cxf/tools/fortest/exception/TypeAdapterException.java 2014-02-11 02:57:55 UTC (rev 18336)
@@ -0,0 +1,36 @@
+/**
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+package org.apache.cxf.tools.fortest.exception;
+
+import javax.xml.bind.annotation.adapters.XmlJavaTypeAdapter;
+
+public class TypeAdapterException extends Exception {
+ private static final long serialVersionUID = 1L;
+
+ private MyClass1 adapted;
+
+ @XmlJavaTypeAdapter(Cl1ToCl2Adapter.class)
+ public MyClass1 getAdapted() {
+ return this.adapted;
+ }
+
+ public void setAdapted(MyClass1 adapted) {
+ this.adapted = adapted;
+ }
+}
Property changes on: thirdparty/cxf/branches/cxf-2.2.12/tools/javato/ws/src/test/java/org/apache/cxf/tools/fortest/exception/TypeAdapterException.java
___________________________________________________________________
Added: svn:keywords
+ Rev Date
Added: svn:eol-style
+ native
Modified: thirdparty/cxf/branches/cxf-2.2.12/tools/javato/ws/src/test/java/org/apache/cxf/tools/java2wsdl/processor/JavaToProcessorTest.java
===================================================================
--- thirdparty/cxf/branches/cxf-2.2.12/tools/javato/ws/src/test/java/org/apache/cxf/tools/java2wsdl/processor/JavaToProcessorTest.java 2014-02-10 11:02:18 UTC (rev 18335)
+++ thirdparty/cxf/branches/cxf-2.2.12/tools/javato/ws/src/test/java/org/apache/cxf/tools/java2wsdl/processor/JavaToProcessorTest.java 2014-02-11 02:57:55 UTC (rev 18336)
@@ -21,7 +21,9 @@
import java.io.File;
import java.net.URI;
+import java.util.HashMap;
import java.util.List;
+import java.util.Map;
import javax.wsdl.Definition;
import javax.wsdl.Port;
@@ -30,12 +32,15 @@
import org.w3c.dom.Document;
import org.w3c.dom.Element;
+import org.w3c.dom.Node;
import org.apache.cxf.common.WSDLConstants;
import org.apache.cxf.common.util.StringUtils;
import org.apache.cxf.helpers.DOMUtils;
import org.apache.cxf.helpers.WSDLHelper;
import org.apache.cxf.helpers.XMLUtils;
+import org.apache.cxf.helpers.XPathUtils;
+import org.apache.cxf.staxutils.StaxUtils;
import org.apache.cxf.tools.common.ProcessorTestBase;
import org.apache.cxf.tools.common.ToolConstants;
import org.apache.cxf.tools.common.ToolContext;
@@ -625,4 +630,33 @@
assertTrue(xsd, xsd.indexOf("ref=") == -1);
}
+
+ @Test
+ public void testExceptionTypeAdapter() throws Exception {
+ env.put(ToolConstants.CFG_OUTPUTFILE, output.getPath() + "/exception-type-adapter.wsdl");
+ env.put(ToolConstants.CFG_CLASSNAME, "org.apache.cxf.tools.fortest.exception.TypeAdapterEcho");
+ env.put(ToolConstants.CFG_VERBOSE, ToolConstants.CFG_VERBOSE);
+ try {
+ processor.setEnvironment(env);
+ processor.process();
+ } catch (Exception e) {
+ e.printStackTrace();
+ }
+
+ File wsdlFile = new File(output, "exception-type-adapter.wsdl");
+ assertTrue(wsdlFile.exists());
+ Document doc = StaxUtils.read(new java.io.FileInputStream(wsdlFile));
+ Map<String, String> map = new HashMap<String, String>();
+ map.put("xsd", "http://www.w3.org/2001/XMLSchema");
+ XPathUtils util = new XPathUtils(map);
+ Node nd = util.getValueNode("//xsd:complexType[@name='myClass2']", doc);
+ assertNotNull(nd);
+
+ nd = util.getValueNode("//xsd:element[@name='adapted']", doc);
+ assertNotNull(nd);
+
+ String at = ((Element)nd).getAttribute("type");
+ assertTrue(at.contains("myClass2"));
+ assertEquals("true", ((Element)nd).getAttribute("nillable"));
+ }
}
10 years, 2 months
JBossWS SVN: r18335 - in stack/cxf/tags/jbossws-cxf-4.3.0.Beta2: modules/addons and 13 other directories.
by jbossws-commits@lists.jboss.org
Author: asoldano
Date: 2014-02-10 06:02:18 -0500 (Mon, 10 Feb 2014)
New Revision: 18335
Modified:
stack/cxf/tags/jbossws-cxf-4.3.0.Beta2/modules/addons/pom.xml
stack/cxf/tags/jbossws-cxf-4.3.0.Beta2/modules/addons/transports/http/httpserver/pom.xml
stack/cxf/tags/jbossws-cxf-4.3.0.Beta2/modules/addons/transports/http/undertow/pom.xml
stack/cxf/tags/jbossws-cxf-4.3.0.Beta2/modules/addons/transports/udp/pom.xml
stack/cxf/tags/jbossws-cxf-4.3.0.Beta2/modules/client/pom.xml
stack/cxf/tags/jbossws-cxf-4.3.0.Beta2/modules/dist/pom.xml
stack/cxf/tags/jbossws-cxf-4.3.0.Beta2/modules/endorsed/pom.xml
stack/cxf/tags/jbossws-cxf-4.3.0.Beta2/modules/resources/pom.xml
stack/cxf/tags/jbossws-cxf-4.3.0.Beta2/modules/server/pom.xml
stack/cxf/tags/jbossws-cxf-4.3.0.Beta2/modules/testsuite/cxf-spring-tests/pom.xml
stack/cxf/tags/jbossws-cxf-4.3.0.Beta2/modules/testsuite/cxf-tests/pom.xml
stack/cxf/tags/jbossws-cxf-4.3.0.Beta2/modules/testsuite/pom.xml
stack/cxf/tags/jbossws-cxf-4.3.0.Beta2/modules/testsuite/shared-tests/pom.xml
stack/cxf/tags/jbossws-cxf-4.3.0.Beta2/modules/testsuite/test-utils/pom.xml
stack/cxf/tags/jbossws-cxf-4.3.0.Beta2/pom.xml
Log:
Fixing poms
Modified: stack/cxf/tags/jbossws-cxf-4.3.0.Beta2/modules/addons/pom.xml
===================================================================
--- stack/cxf/tags/jbossws-cxf-4.3.0.Beta2/modules/addons/pom.xml 2014-02-10 10:45:18 UTC (rev 18334)
+++ stack/cxf/tags/jbossws-cxf-4.3.0.Beta2/modules/addons/pom.xml 2014-02-10 11:02:18 UTC (rev 18335)
@@ -10,7 +10,7 @@
<parent>
<groupId>org.jboss.ws.cxf</groupId>
<artifactId>jbossws-cxf</artifactId>
- <version>4.3.0-SNAPSHOT</version>
+ <version>4.3.0.Beta2</version>
<relativePath>../../pom.xml</relativePath>
</parent>
Modified: stack/cxf/tags/jbossws-cxf-4.3.0.Beta2/modules/addons/transports/http/httpserver/pom.xml
===================================================================
--- stack/cxf/tags/jbossws-cxf-4.3.0.Beta2/modules/addons/transports/http/httpserver/pom.xml 2014-02-10 10:45:18 UTC (rev 18334)
+++ stack/cxf/tags/jbossws-cxf-4.3.0.Beta2/modules/addons/transports/http/httpserver/pom.xml 2014-02-10 11:02:18 UTC (rev 18335)
@@ -8,7 +8,7 @@
<parent>
<groupId>org.jboss.ws.cxf</groupId>
<artifactId>jbossws-cxf-addons</artifactId>
- <version>4.3.0-SNAPSHOT</version>
+ <version>4.3.0.Beta2</version>
<relativePath>../../../pom.xml</relativePath>
</parent>
Modified: stack/cxf/tags/jbossws-cxf-4.3.0.Beta2/modules/addons/transports/http/undertow/pom.xml
===================================================================
--- stack/cxf/tags/jbossws-cxf-4.3.0.Beta2/modules/addons/transports/http/undertow/pom.xml 2014-02-10 10:45:18 UTC (rev 18334)
+++ stack/cxf/tags/jbossws-cxf-4.3.0.Beta2/modules/addons/transports/http/undertow/pom.xml 2014-02-10 11:02:18 UTC (rev 18335)
@@ -8,7 +8,7 @@
<parent>
<groupId>org.jboss.ws.cxf</groupId>
<artifactId>jbossws-cxf-addons</artifactId>
- <version>4.3.0-SNAPSHOT</version>
+ <version>4.3.0.Beta2</version>
<relativePath>../../../pom.xml</relativePath>
</parent>
Modified: stack/cxf/tags/jbossws-cxf-4.3.0.Beta2/modules/addons/transports/udp/pom.xml
===================================================================
--- stack/cxf/tags/jbossws-cxf-4.3.0.Beta2/modules/addons/transports/udp/pom.xml 2014-02-10 10:45:18 UTC (rev 18334)
+++ stack/cxf/tags/jbossws-cxf-4.3.0.Beta2/modules/addons/transports/udp/pom.xml 2014-02-10 11:02:18 UTC (rev 18335)
@@ -8,7 +8,7 @@
<parent>
<groupId>org.jboss.ws.cxf</groupId>
<artifactId>jbossws-cxf-addons</artifactId>
- <version>4.3.0-SNAPSHOT</version>
+ <version>4.3.0.Beta2</version>
<relativePath>../../pom.xml</relativePath>
</parent>
Modified: stack/cxf/tags/jbossws-cxf-4.3.0.Beta2/modules/client/pom.xml
===================================================================
--- stack/cxf/tags/jbossws-cxf-4.3.0.Beta2/modules/client/pom.xml 2014-02-10 10:45:18 UTC (rev 18334)
+++ stack/cxf/tags/jbossws-cxf-4.3.0.Beta2/modules/client/pom.xml 2014-02-10 11:02:18 UTC (rev 18335)
@@ -8,7 +8,7 @@
<parent>
<groupId>org.jboss.ws.cxf</groupId>
<artifactId>jbossws-cxf</artifactId>
- <version>4.3.0-SNAPSHOT</version>
+ <version>4.3.0.Beta2</version>
<relativePath>../../pom.xml</relativePath>
</parent>
Modified: stack/cxf/tags/jbossws-cxf-4.3.0.Beta2/modules/dist/pom.xml
===================================================================
--- stack/cxf/tags/jbossws-cxf-4.3.0.Beta2/modules/dist/pom.xml 2014-02-10 10:45:18 UTC (rev 18334)
+++ stack/cxf/tags/jbossws-cxf-4.3.0.Beta2/modules/dist/pom.xml 2014-02-10 11:02:18 UTC (rev 18335)
@@ -8,7 +8,7 @@
<parent>
<groupId>org.jboss.ws.cxf</groupId>
<artifactId>jbossws-cxf</artifactId>
- <version>4.3.0-SNAPSHOT</version>
+ <version>4.3.0.Beta2</version>
<relativePath>../../pom.xml</relativePath>
</parent>
Modified: stack/cxf/tags/jbossws-cxf-4.3.0.Beta2/modules/endorsed/pom.xml
===================================================================
--- stack/cxf/tags/jbossws-cxf-4.3.0.Beta2/modules/endorsed/pom.xml 2014-02-10 10:45:18 UTC (rev 18334)
+++ stack/cxf/tags/jbossws-cxf-4.3.0.Beta2/modules/endorsed/pom.xml 2014-02-10 11:02:18 UTC (rev 18335)
@@ -9,7 +9,7 @@
<parent>
<groupId>org.jboss.ws.cxf</groupId>
<artifactId>jbossws-cxf</artifactId>
- <version>4.3.0-SNAPSHOT</version>
+ <version>4.3.0.Beta2</version>
<relativePath>../../pom.xml</relativePath>
</parent>
Modified: stack/cxf/tags/jbossws-cxf-4.3.0.Beta2/modules/resources/pom.xml
===================================================================
--- stack/cxf/tags/jbossws-cxf-4.3.0.Beta2/modules/resources/pom.xml 2014-02-10 10:45:18 UTC (rev 18334)
+++ stack/cxf/tags/jbossws-cxf-4.3.0.Beta2/modules/resources/pom.xml 2014-02-10 11:02:18 UTC (rev 18335)
@@ -9,7 +9,7 @@
<parent>
<groupId>org.jboss.ws.cxf</groupId>
<artifactId>jbossws-cxf</artifactId>
- <version>4.3.0-SNAPSHOT</version>
+ <version>4.3.0.Beta2</version>
<relativePath>../../pom.xml</relativePath>
</parent>
Modified: stack/cxf/tags/jbossws-cxf-4.3.0.Beta2/modules/server/pom.xml
===================================================================
--- stack/cxf/tags/jbossws-cxf-4.3.0.Beta2/modules/server/pom.xml 2014-02-10 10:45:18 UTC (rev 18334)
+++ stack/cxf/tags/jbossws-cxf-4.3.0.Beta2/modules/server/pom.xml 2014-02-10 11:02:18 UTC (rev 18335)
@@ -9,7 +9,7 @@
<parent>
<groupId>org.jboss.ws.cxf</groupId>
<artifactId>jbossws-cxf</artifactId>
- <version>4.3.0-SNAPSHOT</version>
+ <version>4.3.0.Beta2</version>
<relativePath>../../pom.xml</relativePath>
</parent>
Modified: stack/cxf/tags/jbossws-cxf-4.3.0.Beta2/modules/testsuite/cxf-spring-tests/pom.xml
===================================================================
--- stack/cxf/tags/jbossws-cxf-4.3.0.Beta2/modules/testsuite/cxf-spring-tests/pom.xml 2014-02-10 10:45:18 UTC (rev 18334)
+++ stack/cxf/tags/jbossws-cxf-4.3.0.Beta2/modules/testsuite/cxf-spring-tests/pom.xml 2014-02-10 11:02:18 UTC (rev 18335)
@@ -10,7 +10,7 @@
<parent>
<groupId>org.jboss.ws.cxf</groupId>
<artifactId>jbossws-cxf-testsuite</artifactId>
- <version>4.3.0-SNAPSHOT</version>
+ <version>4.3.0.Beta2</version>
<relativePath>../pom.xml</relativePath>
</parent>
Modified: stack/cxf/tags/jbossws-cxf-4.3.0.Beta2/modules/testsuite/cxf-tests/pom.xml
===================================================================
--- stack/cxf/tags/jbossws-cxf-4.3.0.Beta2/modules/testsuite/cxf-tests/pom.xml 2014-02-10 10:45:18 UTC (rev 18334)
+++ stack/cxf/tags/jbossws-cxf-4.3.0.Beta2/modules/testsuite/cxf-tests/pom.xml 2014-02-10 11:02:18 UTC (rev 18335)
@@ -10,7 +10,7 @@
<parent>
<groupId>org.jboss.ws.cxf</groupId>
<artifactId>jbossws-cxf-testsuite</artifactId>
- <version>4.3.0-SNAPSHOT</version>
+ <version>4.3.0.Beta2</version>
<relativePath>../pom.xml</relativePath>
</parent>
Modified: stack/cxf/tags/jbossws-cxf-4.3.0.Beta2/modules/testsuite/pom.xml
===================================================================
--- stack/cxf/tags/jbossws-cxf-4.3.0.Beta2/modules/testsuite/pom.xml 2014-02-10 10:45:18 UTC (rev 18334)
+++ stack/cxf/tags/jbossws-cxf-4.3.0.Beta2/modules/testsuite/pom.xml 2014-02-10 11:02:18 UTC (rev 18335)
@@ -10,7 +10,7 @@
<parent>
<groupId>org.jboss.ws.cxf</groupId>
<artifactId>jbossws-cxf</artifactId>
- <version>4.3.0-SNAPSHOT</version>
+ <version>4.3.0.Beta2</version>
<relativePath>../../pom.xml</relativePath>
</parent>
Modified: stack/cxf/tags/jbossws-cxf-4.3.0.Beta2/modules/testsuite/shared-tests/pom.xml
===================================================================
--- stack/cxf/tags/jbossws-cxf-4.3.0.Beta2/modules/testsuite/shared-tests/pom.xml 2014-02-10 10:45:18 UTC (rev 18334)
+++ stack/cxf/tags/jbossws-cxf-4.3.0.Beta2/modules/testsuite/shared-tests/pom.xml 2014-02-10 11:02:18 UTC (rev 18335)
@@ -10,7 +10,7 @@
<parent>
<groupId>org.jboss.ws.cxf</groupId>
<artifactId>jbossws-cxf-testsuite</artifactId>
- <version>4.3.0-SNAPSHOT</version>
+ <version>4.3.0.Beta2</version>
<relativePath>../pom.xml</relativePath>
</parent>
Modified: stack/cxf/tags/jbossws-cxf-4.3.0.Beta2/modules/testsuite/test-utils/pom.xml
===================================================================
--- stack/cxf/tags/jbossws-cxf-4.3.0.Beta2/modules/testsuite/test-utils/pom.xml 2014-02-10 10:45:18 UTC (rev 18334)
+++ stack/cxf/tags/jbossws-cxf-4.3.0.Beta2/modules/testsuite/test-utils/pom.xml 2014-02-10 11:02:18 UTC (rev 18335)
@@ -10,7 +10,7 @@
<parent>
<groupId>org.jboss.ws.cxf</groupId>
<artifactId>jbossws-cxf-testsuite</artifactId>
- <version>4.3.0-SNAPSHOT</version>
+ <version>4.3.0.Beta2</version>
<relativePath>../pom.xml</relativePath>
</parent>
Modified: stack/cxf/tags/jbossws-cxf-4.3.0.Beta2/pom.xml
===================================================================
--- stack/cxf/tags/jbossws-cxf-4.3.0.Beta2/pom.xml 2014-02-10 10:45:18 UTC (rev 18334)
+++ stack/cxf/tags/jbossws-cxf-4.3.0.Beta2/pom.xml 2014-02-10 11:02:18 UTC (rev 18335)
@@ -32,7 +32,7 @@
<description>JBossWS CXF stack</description>
- <version>4.3.0-SNAPSHOT</version>
+ <version>4.3.0.Beta2</version>
<!-- Parent -->
<parent>
@@ -43,9 +43,9 @@
<!-- Source Control Management -->
<scm>
- <connection>scm:svn:http://anonsvn.jboss.org/repos/jbossws/stack/cxf/trunk</connection>
- <developerConnection>scm:svn:https://svn.jboss.org/repos/jbossws/stack/cxf/trunk</developerConnection>
- <url>http://fisheye.jboss.com/viewrep/JBossWS/stack/cxf/trunk</url>
+ <connection>scm:svn:http://anonsvn.jboss.org/repos/jbossws/stack/cxf/tags/jbossws-cxf...</connection>
+ <developerConnection>scm:svn:https://svn.jboss.org/repos/jbossws/stack/cxf/tags/jbossws-cxf-4....</developerConnection>
+ <url>http://fisheye.jboss.com/viewrep/JBossWS/stack/cxf/tags/jbossws-cxf-4.3.0...</url>
</scm>
<!-- Modules -->
@@ -60,10 +60,10 @@
<!-- Properties -->
<properties>
<jbossws.api.version>1.0.2.Final</jbossws.api.version>
- <jbossws.spi.version>2.3.0-SNAPSHOT</jbossws.spi.version>
- <jbossws.common.version>2.3.0-SNAPSHOT</jbossws.common.version>
+ <jbossws.spi.version>2.3.0.Beta3</jbossws.spi.version>
+ <jbossws.common.version>2.3.0.Beta2</jbossws.common.version>
<jbossws.common.tools.version>1.2.0.Final</jbossws.common.tools.version>
- <jbossws.jboss720.version>4.3.0-SNAPSHOT</jbossws.jboss720.version>
+ <jbossws.jboss720.version>4.3.0.Beta2</jbossws.jboss720.version>
<jbossws.native.version>4.1.2.Final</jbossws.native.version>
<jboss720.version>7.2.0.Final</jboss720.version>
<wildfly800.version>8.0.0.Final-SNAPSHOT</wildfly800.version>
@@ -79,7 +79,7 @@
<picketbox.version>4.0.17.Final</picketbox.version>
<picketlink.version>2.1.7.Final</picketlink.version>
<jaxws-jboss-httpserver-httpspi.version>1.0.1.GA</jaxws-jboss-httpserver-httpspi.version>
- <jaxws-undertow-httpspi.version>1.0.1-SNAPSHOT</jaxws-undertow-httpspi.version>
+ <jaxws-undertow-httpspi.version>1.0.1.Beta1</jaxws-undertow-httpspi.version>
<httpserver.version>1.0.0.Final</httpserver.version>
<io.undertow.version>1.0.0.Beta33</io.undertow.version>
<jaxb.api.version>1.0.4.Final</jaxb.api.version>
10 years, 2 months