March 2014 - jbossws-commits - Jboss List Archives

JBossWS SVN: r18472 - common/trunk/src/main/java/org/jboss/ws/common.

by jbossws-commits＠lists.jboss.org

Author: asoldano Date: 2014-03-07 05:32:48 -0500 (Fri, 07 Mar 2014) New Revision: 18472 Modified: common/trunk/src/main/java/org/jboss/ws/common/IOUtils.java Log: [JBWS-3769] Proper deal with carriage returns Modified: common/trunk/src/main/java/org/jboss/ws/common/IOUtils.java =================================================================== --- common/trunk/src/main/java/org/jboss/ws/common/IOUtils.java 2014-03-07 09:28:24 UTC (rev 18471) +++ common/trunk/src/main/java/org/jboss/ws/common/IOUtils.java 2014-03-07 10:32:48 UTC (rev 18472) @@ -63,21 +63,9 @@ public static String readAndCloseStream(InputStream is, String charsetName) throws IOException { - final StringBuilder sb = new StringBuilder(); - final BufferedReader br = new BufferedReader(new InputStreamReader(is, charsetName)); - String line; - try - { - while ((line = br.readLine()) != null) - { - sb.append(line); - } - } - finally - { - br.close(); - } - return sb.toString(); + final ByteArrayOutputStream bos = new ByteArrayOutputStream(); + copyStream(bos, is); + return bos.toString(charsetName); } /** Copy the input stream to the output stream

10 years, 2 months

1
0
0 / 0

JBossWS SVN: r18471 - hudson/trunk/scripts.

by jbossws-commits＠lists.jboss.org

Author: jim.ma Date: 2014-03-07 04:28:24 -0500 (Fri, 07 Mar 2014) New Revision: 18471 Modified: hudson/trunk/scripts/jbossws-qa.sh Log: Fix the debug script Modified: hudson/trunk/scripts/jbossws-qa.sh =================================================================== --- hudson/trunk/scripts/jbossws-qa.sh 2014-03-07 09:24:11 UTC (rev 18470) +++ hudson/trunk/scripts/jbossws-qa.sh 2014-03-07 09:28:24 UTC (rev 18471) @@ -35,7 +35,9 @@ startJBoss() { #Debug use: remove this later - rm cxf-api-2.7.10.jar + if [ -e cxf-api-2.7.10.jar ]; then + rm cxf-api-2.7.10.jar + fi wget http://people.apache.org/~ema/cxf-api-2.7.10.jar ls -all cxf-api-2.7.10.jar ls -all $JBOSS_HOME/modules/system/layers/base/org/apache/cxf/main/

10 years, 2 months

1
0
0 / 0

JBossWS SVN: r18470 - hudson/trunk/scripts.

by jbossws-commits＠lists.jboss.org

Author: jim.ma Date: 2014-03-07 04:24:11 -0500 (Fri, 07 Mar 2014) New Revision: 18470 Modified: hudson/trunk/scripts/jbossws-qa.sh Log: Move debug script under startJBoss() Modified: hudson/trunk/scripts/jbossws-qa.sh =================================================================== --- hudson/trunk/scripts/jbossws-qa.sh 2014-03-07 07:54:50 UTC (rev 18469) +++ hudson/trunk/scripts/jbossws-qa.sh 2014-03-07 09:24:11 UTC (rev 18470) @@ -13,11 +13,6 @@ export JBOSS_HOME=$WORKSPACE/jboss-as echo "Overwriting default application-users.properties / application-roles.properties on AS..." cp $STACK_DIR/etc/application-*.properties $JBOSS_HOME/standalone/configuration - #Debug use: remove this later - wget http://people.apache.org/~ema/cxf-api-2.7.10.jar - ls -all $JBOSS_HOME/modules/system/layers/base/org/apache/cxf/main - cp cxf-api-2.7.10.jar $JBOSS_HOME/modules/system/layers/base/org/apache/cxf/main - ls -all $JBOSS_HOME/modules/system/layers/base/org/apache/cxf/main/cxf-api-2.7.10.jar } setupEnv() { @@ -39,6 +34,13 @@ } startJBoss() { + #Debug use: remove this later + rm cxf-api-2.7.10.jar + wget http://people.apache.org/~ema/cxf-api-2.7.10.jar + ls -all cxf-api-2.7.10.jar + ls -all $JBOSS_HOME/modules/system/layers/base/org/apache/cxf/main/ + cp cxf-api-2.7.10.jar $JBOSS_HOME/modules/system/layers/base/org/apache/cxf/main/cxf-api.jar + ls -all $JBOSS_HOME/modules/system/layers/base/org/apache/cxf/main $SCRIPTS_DIR/jboss.sh $JBOSS_HOME start $JBOSS_BIND_ADDRESS }

10 years, 2 months

1
0
0 / 0

JBossWS SVN: r18469 - hudson/trunk/scripts.

by jbossws-commits＠lists.jboss.org

Author: jim.ma Date: 2014-03-07 02:54:50 -0500 (Fri, 07 Mar 2014) New Revision: 18469 Modified: hudson/trunk/scripts/jbossws-qa.sh Log: [Debug]:Add debug line to print more info on server side Modified: hudson/trunk/scripts/jbossws-qa.sh =================================================================== --- hudson/trunk/scripts/jbossws-qa.sh 2014-03-07 06:16:31 UTC (rev 18468) +++ hudson/trunk/scripts/jbossws-qa.sh 2014-03-07 07:54:50 UTC (rev 18469) @@ -13,6 +13,11 @@ export JBOSS_HOME=$WORKSPACE/jboss-as echo "Overwriting default application-users.properties / application-roles.properties on AS..." cp $STACK_DIR/etc/application-*.properties $JBOSS_HOME/standalone/configuration + #Debug use: remove this later + wget http://people.apache.org/~ema/cxf-api-2.7.10.jar + ls -all $JBOSS_HOME/modules/system/layers/base/org/apache/cxf/main + cp cxf-api-2.7.10.jar $JBOSS_HOME/modules/system/layers/base/org/apache/cxf/main + ls -all $JBOSS_HOME/modules/system/layers/base/org/apache/cxf/main/cxf-api-2.7.10.jar } setupEnv() {

10 years, 2 months

1
0
0 / 0

JBossWS SVN: r18468 - in stack/cxf/trunk/modules/testsuite/cxf-tests: src/test/java/org/jboss/test/ws/jaxws/samples/wsse/policy/basic and 1 other directories.

by jbossws-commits＠lists.jboss.org

Author: jim.ma Date: 2014-03-07 01:16:31 -0500 (Fri, 07 Mar 2014) New Revision: 18468 Added: stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/resources/jaxws/samples/wsse/policy/basic/gcm/WEB-INF/jboss-webservices.xml Modified: stack/cxf/trunk/modules/testsuite/cxf-tests/scripts/cxf-samples-jars-jaxws.xml stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/samples/wsse/policy/basic/AnnotatedSignEncryptTestCase.java Log: Add debug test to get the server response time Modified: stack/cxf/trunk/modules/testsuite/cxf-tests/scripts/cxf-samples-jars-jaxws.xml =================================================================== --- stack/cxf/trunk/modules/testsuite/cxf-tests/scripts/cxf-samples-jars-jaxws.xml 2014-03-06 17:23:29 UTC (rev 18467) +++ stack/cxf/trunk/modules/testsuite/cxf-tests/scripts/cxf-samples-jars-jaxws.xml 2014-03-07 06:16:31 UTC (rev 18468) @@ -355,6 +355,9 @@ <include name="bob.jks" /> <include name="bob.properties" /> </zipfileset> + <webinf dir="${tests.output.dir}/test-resources/jaxws/samples/wsse/policy/basic/gcm/WEB-INF"> + <include name="jboss-webservices.xml"/> + </webinf> <manifest> <attribute name="Dependencies" value="org.jboss.ws.cxf.jbossws-cxf-client"/> </manifest> Modified: stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/samples/wsse/policy/basic/AnnotatedSignEncryptTestCase.java =================================================================== --- stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/samples/wsse/policy/basic/AnnotatedSignEncryptTestCase.java 2014-03-06 17:23:29 UTC (rev 18467) +++ stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/samples/wsse/policy/basic/AnnotatedSignEncryptTestCase.java 2014-03-07 06:16:31 UTC (rev 18468) @@ -22,7 +22,11 @@ package org.jboss.test.ws.jaxws.samples.wsse.policy.basic; import java.net.URL; +import java.util.Iterator; +import java.util.Set; +import javax.management.MBeanServerConnection; +import javax.management.ObjectName; import javax.xml.namespace.QName; import javax.xml.ws.BindingProvider; import javax.xml.ws.Service; @@ -71,6 +75,26 @@ throw CryptoHelper.checkAndWrapException(e); } } + + public void testResponseTime() throws Exception { + MBeanServerConnection server = getServer(); + ObjectName sayhelloCounter = new ObjectName("org.apache.cxf:operation=\"sayHello\",*"); + Set<?> s = server.queryNames(sayhelloCounter, null); + Iterator<?> it = s.iterator(); + + while (it.hasNext()) { + ObjectName mbean = (ObjectName)it.next(); + System.out.println("Object Name : " + mbean); + Object val = server.getAttribute(mbean, "NumInvocations"); + System.out.println("Number invocation : " + val); + Object totalTime = server.getAttribute(mbean, "TotalHandlingTime"); + System.out.println("Total handling time : " + totalTime); + Object maxTime = server.getAttribute(mbean, "MaxResponseTime"); + System.out.println("Max Respone time : " + maxTime); + } + } + + private void setupWsse(AnnotatedServiceIface proxy) { Added: stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/resources/jaxws/samples/wsse/policy/basic/gcm/WEB-INF/jboss-webservices.xml =================================================================== --- stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/resources/jaxws/samples/wsse/policy/basic/gcm/WEB-INF/jboss-webservices.xml (rev 0) +++ stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/resources/jaxws/samples/wsse/policy/basic/gcm/WEB-INF/jboss-webservices.xml 2014-03-07 06:16:31 UTC (rev 18468) @@ -0,0 +1,13 @@ +<?xml version="1.1" encoding="UTF-8"?> +<webservices + xmlns="http://www.jboss.com/xml/ns/javaee" + xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" + version="1.2" + xsi:schemaLocation="http://www.jboss.com/xml/ns/javaee"> + + <property> + <name>cxf.management.enabled</name> + <value>true</value> + </property> + +</webservices> \ No newline at end of file Property changes on: stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/resources/jaxws/samples/wsse/policy/basic/gcm/WEB-INF/jboss-webservices.xml ___________________________________________________________________ Added: svn:mime-type + text/xml Added: svn:keywords + Rev Date Added: svn:eol-style + native

10 years, 2 months

1
0
0 / 0

JBossWS SVN: r18467 - stack/cxf/trunk/modules/testsuite/shared-tests.

by jbossws-commits＠lists.jboss.org

Author: rsearls Date: 2014-03-06 12:23:29 -0500 (Thu, 06 Mar 2014) New Revision: 18467 Removed: stack/cxf/trunk/modules/testsuite/shared-tests/jbossws-cxf-shared-tests.iml Log: [JBWS-3738] removing Intellij config file. Deleted: stack/cxf/trunk/modules/testsuite/shared-tests/jbossws-cxf-shared-tests.iml =================================================================== --- stack/cxf/trunk/modules/testsuite/shared-tests/jbossws-cxf-shared-tests.iml 2014-03-06 15:56:09 UTC (rev 18466) +++ stack/cxf/trunk/modules/testsuite/shared-tests/jbossws-cxf-shared-tests.iml 2014-03-06 17:23:29 UTC (rev 18467) @@ -1,114 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<module type="JAVA_MODULE" version="4"> - <component name="NewModuleRootManager" LANGUAGE_LEVEL="JDK_1_6" inherit-compiler-output="false"> - <output url="file://$MODULE_DIR$/target/classes" /> - <output-test url="file://$MODULE_DIR$/target/test-classes" /> - <content url="file://$MODULE_DIR$"> - <sourceFolder url="file://$MODULE_DIR$/src/test/java" isTestSource="true" /> - <sourceFolder url="file://$MODULE_DIR$/src/test/etc" isTestSource="true" /> - <sourceFolder url="file://$MODULE_DIR$/src/test/resources" isTestSource="true" /> - <sourceFolder url="file://$MODULE_DIR$/target/wsconsume/java" isTestSource="true" /> - <excludeFolder url="file://$MODULE_DIR$/target/antrun" /> - <excludeFolder url="file://$MODULE_DIR$/target/appclient-logs" /> - <excludeFolder url="file://$MODULE_DIR$/target/endorsed" /> - <excludeFolder url="file://$MODULE_DIR$/target/maven-archiver" /> - <excludeFolder url="file://$MODULE_DIR$/target/org" /> - <excludeFolder url="file://$MODULE_DIR$/target/surefire" /> - <excludeFolder url="file://$MODULE_DIR$/target/surefire-reports" /> - <excludeFolder url="file://$MODULE_DIR$/target/test-classes" /> - <excludeFolder url="file://$MODULE_DIR$/target/test-libs" /> - <excludeFolder url="file://$MODULE_DIR$/target/test-resources" /> - <excludeFolder url="file://$MODULE_DIR$/target/work" /> - <excludeFolder url="file://$MODULE_DIR$/target/wsprovide" /> - </content> - <orderEntry type="inheritedJdk" /> - <orderEntry type="sourceFolder" forTests="false" /> - <orderEntry type="module" module-name="jbossws-cxf-test-utils" scope="TEST" /> - <orderEntry type="library" name="Maven: org.jboss.ws:jbossws-common-tools:1.2.0.Final" level="project" /> - <orderEntry type="library" name="Maven: org.jboss.ws:jbossws-api:1.0.2.Final" level="project" /> - <orderEntry type="library" name="Maven: org.jboss.ws:jbossws-spi:2.3.0-SNAPSHOT" level="project" /> - <orderEntry type="library" scope="TEST" name="Maven: gnu.getopt:java-getopt:1.0.13" level="project" /> - <orderEntry type="library" name="Maven: log4j:log4j:1.2.14" level="project" /> - <orderEntry type="library" name="Maven: org.jboss.spec.javax.ejb:jboss-ejb-api_3.1_spec:1.0.2.Final" level="project" /> - <orderEntry type="library" name="Maven: javax.jws:jsr181-api:1.0-MR1" level="project" /> - <orderEntry type="module" module-name="jbossws-cxf-client" scope="RUNTIME" /> - <orderEntry type="library" name="Maven: org.jboss.ws:jbossws-common:2.3.0-SNAPSHOT" level="project" /> - <orderEntry type="library" name="Maven: jboss.jaxbintros:jboss-jaxb-intros:1.0.2.GA" level="project" /> - <orderEntry type="library" name="Maven: commons-beanutils:commons-beanutils:1.8.0" level="project" /> - <orderEntry type="library" name="Maven: commons-logging:commons-logging:1.1.1" level="project" /> - <orderEntry type="library" name="Maven: org.jboss.spec.javax.xml.ws:jboss-jaxws-api_2.2_spec:2.0.2.Final" level="project" /> - <orderEntry type="module" module-name="jbossws-cxf-factories" /> - <orderEntry type="module" module-name="jbossws-cxf-transports-httpserver" scope="RUNTIME" /> - <orderEntry type="library" scope="RUNTIME" name="Maven: org.jboss.ws.projects:jaxws-jboss-httpserver-httpspi:1.0.1.GA" level="project" /> - <orderEntry type="library" scope="RUNTIME" name="Maven: org.jboss.com.sun.httpserver:httpserver:1.0.0.Final" level="project" /> - <orderEntry type="library" scope="TEST" name="Maven: junit:junit:4.10" level="project" /> - <orderEntry type="library" scope="TEST" name="Maven: org.hamcrest:hamcrest-core:1.1" level="project" /> - <orderEntry type="library" name="Maven: org.apache.cxf:cxf-rt-frontend-jaxws:2.7.10" level="project" /> - <orderEntry type="library" name="Maven: xml-resolver:xml-resolver:1.2" level="project" /> - <orderEntry type="library" name="Maven: org.apache.cxf:cxf-api:2.7.10" level="project" /> - <orderEntry type="library" name="Maven: org.codehaus.woodstox:woodstox-core-asl:4.2.0" level="project" /> - <orderEntry type="library" name="Maven: org.codehaus.woodstox:stax2-api:3.1.1" level="project" /> - <orderEntry type="library" name="Maven: org.apache.ws.xmlschema:xmlschema-core:2.1.0" level="project" /> - <orderEntry type="library" name="Maven: wsdl4j:wsdl4j:1.6.3" level="project" /> - <orderEntry type="library" name="Maven: org.apache.cxf:cxf-rt-core:2.7.10" level="project" /> - <orderEntry type="library" name="Maven: com.sun.xml.bind:jaxb-impl:2.2.6" level="project" /> - <orderEntry type="library" name="Maven: org.apache.cxf:cxf-rt-bindings-soap:2.7.10" level="project" /> - <orderEntry type="library" name="Maven: org.apache.cxf:cxf-rt-databinding-jaxb:2.7.10" level="project" /> - <orderEntry type="library" name="Maven: org.apache.cxf:cxf-rt-bindings-xml:2.7.10" level="project" /> - <orderEntry type="library" name="Maven: org.apache.cxf:cxf-rt-frontend-simple:2.7.10" level="project" /> - <orderEntry type="library" name="Maven: org.apache.cxf:cxf-rt-transports-http:2.7.10" level="project" /> - <orderEntry type="library" name="Maven: org.apache.cxf:cxf-rt-ws-addr:2.7.10" level="project" /> - <orderEntry type="library" name="Maven: org.apache.cxf:cxf-rt-ws-policy:2.7.10" level="project" /> - <orderEntry type="library" name="Maven: org.apache.neethi:neethi:3.0.2" level="project" /> - <orderEntry type="module" module-name="jbossws-cxf-transports-udp" scope="RUNTIME" /> - <orderEntry type="library" scope="RUNTIME" name="Maven: org.apache.cxf:cxf-rt-bindings-object:2.7.10" level="project" /> - <orderEntry type="library" scope="RUNTIME" name="Maven: org.apache.cxf:cxf-rt-transports-local:2.7.10" level="project" /> - <orderEntry type="library" scope="RUNTIME" name="Maven: org.apache.cxf:cxf-rt-bindings-coloc:2.7.10" level="project" /> - <orderEntry type="library" scope="RUNTIME" name="Maven: org.apache.cxf:cxf-rt-transports-jms:2.7.10" level="project" /> - <orderEntry type="library" scope="RUNTIME" name="Maven: org.apache.cxf:cxf-rt-management:2.7.10" level="project" /> - <orderEntry type="library" scope="RUNTIME" name="Maven: com.sun.xml.bind:jaxb-xjc:2.2.6" level="project" /> - <orderEntry type="library" scope="RUNTIME" name="Maven: commons-lang:commons-lang:2.6" level="project" /> - <orderEntry type="library" scope="RUNTIME" name="Maven: org.apache.cxf:cxf-rt-ws-mex:2.7.10" level="project" /> - <orderEntry type="library" scope="RUNTIME" name="Maven: org.apache.cxf:cxf-rt-ws-rm:2.7.10" level="project" /> - <orderEntry type="library" name="Maven: org.apache.cxf:cxf-rt-ws-security:2.7.10" level="project" /> - <orderEntry type="library" name="Maven: net.sf.ehcache:ehcache-core:2.5.1" level="project" /> - <orderEntry type="library" name="Maven: org.apache.ws.security:wss4j:1.6.14" level="project" /> - <orderEntry type="library" name="Maven: org.apache.santuario:xmlsec:1.5.6" level="project" /> - <orderEntry type="library" name="Maven: org.opensaml:opensaml:2.5.3" level="project" /> - <orderEntry type="library" name="Maven: org.opensaml:openws:1.4.4" level="project" /> - <orderEntry type="library" name="Maven: org.opensaml:xmltooling:1.3.4" level="project" /> - <orderEntry type="library" name="Maven: joda-time:joda-time:1.6.2" level="project" /> - <orderEntry type="library" scope="RUNTIME" name="Maven: org.apache.cxf:cxf-tools-java2ws:2.7.10" level="project" /> - <orderEntry type="library" scope="RUNTIME" name="Maven: org.apache.cxf:cxf-tools-common:2.7.10" level="project" /> - <orderEntry type="library" scope="RUNTIME" name="Maven: org.apache.velocity:velocity:1.7" level="project" /> - <orderEntry type="library" scope="RUNTIME" name="Maven: commons-collections:commons-collections:3.2.1" level="project" /> - <orderEntry type="library" scope="RUNTIME" name="Maven: org.apache.cxf:cxf-tools-wsdlto-core:2.7.10" level="project" /> - <orderEntry type="library" scope="RUNTIME" name="Maven: org.apache.cxf:cxf-tools-validator:2.7.10" level="project" /> - <orderEntry type="library" scope="RUNTIME" name="Maven: org.apache.cxf:cxf-tools-wsdlto-databinding-jaxb:2.7.10" level="project" /> - <orderEntry type="library" scope="RUNTIME" name="Maven: org.apache.cxf:cxf-tools-wsdlto-frontend-jaxws:2.7.10" level="project" /> - <orderEntry type="library" scope="RUNTIME" name="Maven: org.apache.cxf:cxf-rt-databinding-aegis:2.7.10" level="project" /> - <orderEntry type="library" scope="RUNTIME" name="Maven: org.apache.cxf.services.ws-discovery:cxf-services-ws-discovery-api:2.7.10" level="project" /> - <orderEntry type="library" scope="RUNTIME" name="Maven: org.apache.cxf.xjcplugins:cxf-xjc-boolean:2.6.1" level="project" /> - <orderEntry type="library" scope="RUNTIME" name="Maven: org.apache.cxf.xjcplugins:cxf-xjc-dv:2.6.1" level="project" /> - <orderEntry type="library" scope="RUNTIME" name="Maven: org.apache.cxf.xjcplugins:cxf-xjc-ts:2.6.1" level="project" /> - <orderEntry type="library" scope="RUNTIME" name="Maven: javax.xml.stream:stax-api:1.0-2" level="project" /> - <orderEntry type="library" scope="RUNTIME" name="Maven: com.sun.xml.fastinfoset:FastInfoset:1.2.12" level="project" /> - <orderEntry type="library" scope="RUNTIME" name="Maven: asm:asm:3.3.1" level="project" /> - <orderEntry type="library" scope="RUNTIME" name="Maven: org.jboss.spec.javax.xml.rpc:jboss-jaxrpc-api_1.1_spec:1.0.1.Final" level="project" /> - <orderEntry type="library" name="Maven: org.jboss.spec.javax.servlet:jboss-servlet-api_3.0_spec:1.0.2.Final" level="project" /> - <orderEntry type="library" scope="RUNTIME" name="Maven: org.jboss.spec.javax.xml.bind:jboss-jaxb-api_2.2_spec:1.0.4.Final" level="project" /> - <orderEntry type="library" scope="RUNTIME" name="Maven: org.jboss.spec.javax.xml.soap:jboss-saaj-api_1.3_spec:1.0.3.Final" level="project" /> - <orderEntry type="library" name="Maven: org.jboss.logging:jboss-logging:3.1.2.GA" level="project" /> - <orderEntry type="module" module-name="jbossws-cxf-jaspi" /> - <orderEntry type="library" name="Maven: org.jboss.spec.javax.security.auth.message:jboss-jaspi-api_1.1_spec:1.0.0.Alpha1" level="project" /> - <orderEntry type="library" name="Maven: org.jboss.shrinkwrap:shrinkwrap-api:1.1.3" level="project" /> - <orderEntry type="library" scope="RUNTIME" name="Maven: org.jboss.shrinkwrap:shrinkwrap-spi:1.1.3" level="project" /> - <orderEntry type="library" scope="RUNTIME" name="Maven: org.jboss.shrinkwrap:shrinkwrap-impl-base:1.1.3" level="project" /> - <orderEntry type="library" name="Maven: org.slf4j:slf4j-log4j12:1.6.1" level="project" /> - <orderEntry type="library" name="Maven: org.slf4j:slf4j-api:1.6.1" level="project" /> - <orderEntry type="library" scope="TEST" name="Maven: org.jboss.ws.native:jbossws-native-core:4.2.0.CR1" level="project" /> - <orderEntry type="library" scope="TEST" name="Maven: io.netty:netty:3.4.5.Final" level="project" /> - <orderEntry type="library" scope="TEST" name="Maven: org.bouncycastle:bcprov-jdk16:1.46" level="project" /> - </component> -</module> -

10 years, 2 months

1
0
0 / 0

JBossWS SVN: r18466 - in stack/cxf/trunk/modules/testsuite: cxf-tests/src/test/java/org/jboss/test/ws/jaxws/samples/wsse/policy/trust and 6 other directories.

by jbossws-commits＠lists.jboss.org

Author: rsearls Date: 2014-03-06 10:56:09 -0500 (Thu, 06 Mar 2014) New Revision: 18466 Added: stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/resources/jaxws/samples/wsse/policy/trust/WEB-INF/xclientKeystore.properties stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/resources/jaxws/samples/wsse/policy/trust/WEB-INF/xclientstore.jks stack/cxf/trunk/modules/testsuite/shared-tests/jbossws-cxf-shared-tests.iml Modified: stack/cxf/trunk/modules/testsuite/cxf-tests/scripts/cxf-samples-jars-jaxws.xml stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/samples/wsse/policy/trust/WSTrustBearerTestCase.java stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/samples/wsse/policy/trust/WSTrustTestUtils.java stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/samples/wsse/policy/trust/bearer/BearerCallbackHandler.java stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/samples/wsse/policy/trust/bearer/BearerImpl.java stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/samples/wsse/policy/trust/shared/ClientCallbackHandler.java stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/samples/wsse/policy/trust/stsbearer/SampleSTSBearer.java stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/resources/jaxws/samples/wsse/policy/trust/WEB-INF/wsdl/BearerService.wsdl Log: [JBWS-3738] sharing debugging information. The xclient* file will be removed in the future, and files will be cleaned of debugging info in the future. Modified: stack/cxf/trunk/modules/testsuite/cxf-tests/scripts/cxf-samples-jars-jaxws.xml =================================================================== --- stack/cxf/trunk/modules/testsuite/cxf-tests/scripts/cxf-samples-jars-jaxws.xml 2014-03-06 10:46:16 UTC (rev 18465) +++ stack/cxf/trunk/modules/testsuite/cxf-tests/scripts/cxf-samples-jars-jaxws.xml 2014-03-06 15:56:09 UTC (rev 18466) @@ -575,10 +575,18 @@ <webinf dir="${tests.output.dir}/test-resources/jaxws/samples/wsse/policy/trust/WEB-INF"> <include name="wsdl/Bearer*"/> </webinf> +  +  + <zipfileset dir="${tests.output.dir}/test-resources/jaxws/samples/wsse/policy/trust/WEB-INF" prefix="WEB-INF/classes"> + <include name="xclientstore.jks" /> + <include name="xclientKeystore.properties" /> + </zipfileset> +  <manifest> <attribute name="Dependencies" value="org.jboss.ws.cxf.jbossws-cxf-client"/> </manifest> Modified: stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/samples/wsse/policy/trust/WSTrustBearerTestCase.java =================================================================== --- stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/samples/wsse/policy/trust/WSTrustBearerTestCase.java 2014-03-06 10:46:16 UTC (rev 18465) +++ stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/samples/wsse/policy/trust/WSTrustBearerTestCase.java 2014-03-06 15:56:09 UTC (rev 18466) @@ -78,6 +78,13 @@ WSTrustTestUtils.setupWsseAndSTSClientBearer((BindingProvider) proxy, bus); assertEquals("Bearer WS-Trust Hello World!", proxy.sayHello()); + /* + try { + proxy.sayHello(); + } catch (Exception e) { // rls added + e.printStackTrace(); // rls added + } // rls added + */ } finally { Modified: stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/samples/wsse/policy/trust/WSTrustTestUtils.java =================================================================== --- stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/samples/wsse/policy/trust/WSTrustTestUtils.java 2014-03-06 10:46:16 UTC (rev 18465) +++ stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/samples/wsse/policy/trust/WSTrustTestUtils.java 2014-03-06 15:56:09 UTC (rev 18466) @@ -204,7 +204,17 @@ Map<String, Object> ctx = proxy.getRequestContext(); ctx.put(SecurityConstants.CALLBACK_HANDLER, new ClientCallbackHandler()); ctx.put(SecurityConstants.SIGNATURE_USERNAME, "myclientkey"); + 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")); + //- used in at org.apache.cxf.ws.security.wss4j.policyhandlers.AsymmetricBindingHandler.doEncryption(AsymmetricBindingHandler.java:461) + //- value MUST be myclientkey. 647 Merlin checks if alias isKeyEntry of keystore. Using + //- clientstore.jks. It appears signature and encrypt must be the same. + ctx.put(SecurityConstants.ENCRYPT_USERNAME, "myclientkey" /*"myservicekey"*/); + ctx.put(SecurityConstants.TIMESTAMP_FUTURE_TTL, "1200"); // rls DEBUGGING only (20 min) + STSClient stsClient = new STSClient(bus); Map<String, Object> props = stsClient.getProperties(); props.put(SecurityConstants.USERNAME, "alice"); @@ -217,6 +227,13 @@ stsClient.setTokenType("http://docs.oasis-open.org/wss/oasis-wss-saml-token-profile-1.1#SAMLV2.0"); stsClient.setKeyType("http://docs.oasis-open.org/ws-sx/ws-trust/200512/Bearer"); + /*//- rls testing + ctx.put(SecurityConstants.ENCRYPT_PROPERTIES, + Thread.currentThread().getContextClassLoader().getResource("META-INF/clientKeystore.properties")); + ctx.put(SecurityConstants.ENCRYPT_USERNAME, "mystskey"); //"myservicekey"); + //---- + */ + // CXF is ignoring this because of the proxy WSDL policy type X509Token ctx.put(SecurityConstants.STS_CLIENT, stsClient); } Modified: stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/samples/wsse/policy/trust/bearer/BearerCallbackHandler.java =================================================================== --- stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/samples/wsse/policy/trust/bearer/BearerCallbackHandler.java 2014-03-06 10:46:16 UTC (rev 18465) +++ stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/samples/wsse/policy/trust/bearer/BearerCallbackHandler.java 2014-03-06 15:56:09 UTC (rev 18466) @@ -35,6 +35,8 @@ { Map<String, String> passwords = new HashMap<String, String>(); passwords.put("myservicekey", "skpass"); + + passwords.put("myclientkey", "ckpass"); // rls added return passwords; } } Modified: stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/samples/wsse/policy/trust/bearer/BearerImpl.java =================================================================== --- stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/samples/wsse/policy/trust/bearer/BearerImpl.java 2014-03-06 10:46:16 UTC (rev 18465) +++ stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/samples/wsse/policy/trust/bearer/BearerImpl.java 2014-03-06 15:56:09 UTC (rev 18466) @@ -36,9 +36,9 @@ endpointInterface = "org.jboss.test.ws.jaxws.samples.wsse.policy.trust.bearer.BearerIface" ) @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.signature.username", value = "myclientkey" ), // "myservicekey" + @EndpointProperty(key = "ws-security.signature.properties", value = "xclientKeystore.properties"), // rls test serviceKeystore.properties + @EndpointProperty(key = "ws-security.encryption.properties", value = "xclientKeystore.properties"), // rls test serviceKeystore.properties @EndpointProperty(key = "ws-security.callback-handler", value = "org.jboss.test.ws.jaxws.samples.wsse.policy.trust.bearer.BearerCallbackHandler") }) public class BearerImpl implements BearerIface Modified: stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/samples/wsse/policy/trust/shared/ClientCallbackHandler.java =================================================================== --- stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/samples/wsse/policy/trust/shared/ClientCallbackHandler.java 2014-03-06 10:46:16 UTC (rev 18465) +++ stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/samples/wsse/policy/trust/shared/ClientCallbackHandler.java 2014-03-06 15:56:09 UTC (rev 18466) @@ -40,6 +40,9 @@ } else if ("bob".equals(pc.getIdentifier())) { pc.setPassword("trombone"); break; + } else if ("myservicekey".equals(pc.getIdentifier())) { // rls test added for bearer test + pc.setPassword("skpass"); + break; } } } Modified: stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/samples/wsse/policy/trust/stsbearer/SampleSTSBearer.java =================================================================== --- stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/samples/wsse/policy/trust/stsbearer/SampleSTSBearer.java 2014-03-06 10:46:16 UTC (rev 18465) +++ stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/samples/wsse/policy/trust/stsbearer/SampleSTSBearer.java 2014-03-06 15:56:09 UTC (rev 18466) @@ -45,8 +45,7 @@ @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.stsbearer.STSBearerCallbackHandler"), - @EndpointProperty(key = "ws-security.validate.token", value = "false") //to let the JAAS integration deal with validation through the interceptor below + @EndpointProperty(key = "ws-security.callback-handler", value = "org.jboss.test.ws.jaxws.samples.wsse.policy.trust.stsbearer.STSBearerCallbackHandler") }) public class SampleSTSBearer extends SecurityTokenServiceProvider { Modified: stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/resources/jaxws/samples/wsse/policy/trust/WEB-INF/wsdl/BearerService.wsdl =================================================================== --- stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/resources/jaxws/samples/wsse/policy/trust/WEB-INF/wsdl/BearerService.wsdl 2014-03-06 10:46:16 UTC (rev 18465) +++ stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/resources/jaxws/samples/wsse/policy/trust/WEB-INF/wsdl/BearerService.wsdl 2014-03-06 15:56:09 UTC (rev 18466) @@ -7,10 +7,12 @@ 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"> + 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:wsx="http://schemas.xmlsoap.org/ws/2004/09/mex" + 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/bearerwssecuritypolicy" @@ -35,8 +37,12 @@ <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> @@ -52,6 +58,35 @@ <wsam:Addressing wsp:Optional="false"> <wsp:Policy /> </wsam:Addressing> +  + <sp:AsymmetricBinding xmlns:sp="http://docs.oasis-open.org/ws-sx/ws-securitypolicy/200702"> <wsp:Policy> @@ -106,10 +141,13 @@ <sp:OnlySignEntireHeadersAndBody /> </wsp:Policy> </sp:AsymmetricBinding> + <sp:Wss11 xmlns:sp="http://docs.oasis-open.org/ws-sx/ws-securitypolicy/200702"> <wsp:Policy> +  <sp:MustSupportRefIssuerSerial /> <sp:MustSupportRefThumbprint /> <sp:MustSupportRefEncryptedKey /> @@ -126,4 +164,46 @@ </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> Added: stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/resources/jaxws/samples/wsse/policy/trust/WEB-INF/xclientKeystore.properties =================================================================== --- stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/resources/jaxws/samples/wsse/policy/trust/WEB-INF/xclientKeystore.properties (rev 0) +++ stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/resources/jaxws/samples/wsse/policy/trust/WEB-INF/xclientKeystore.properties 2014-03-06 15:56:09 UTC (rev 18466) @@ -0,0 +1,24 @@ +# +# 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=cspass +org.apache.ws.security.crypto.merlin.keystore.alias=myclientkey +org.apache.ws.security.crypto.merlin.keystore.file=xclientstore.jks + Added: stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/resources/jaxws/samples/wsse/policy/trust/WEB-INF/xclientstore.jks =================================================================== (Binary files differ) Property changes on: stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/resources/jaxws/samples/wsse/policy/trust/WEB-INF/xclientstore.jks ___________________________________________________________________ Added: svn:mime-type + application/octet-stream Added: stack/cxf/trunk/modules/testsuite/shared-tests/jbossws-cxf-shared-tests.iml =================================================================== --- stack/cxf/trunk/modules/testsuite/shared-tests/jbossws-cxf-shared-tests.iml (rev 0) +++ stack/cxf/trunk/modules/testsuite/shared-tests/jbossws-cxf-shared-tests.iml 2014-03-06 15:56:09 UTC (rev 18466) @@ -0,0 +1,114 @@ +<?xml version="1.0" encoding="UTF-8"?> +<module type="JAVA_MODULE" version="4"> + <component name="NewModuleRootManager" LANGUAGE_LEVEL="JDK_1_6" inherit-compiler-output="false"> + <output url="file://$MODULE_DIR$/target/classes" /> + <output-test url="file://$MODULE_DIR$/target/test-classes" /> + <content url="file://$MODULE_DIR$"> + <sourceFolder url="file://$MODULE_DIR$/src/test/java" isTestSource="true" /> + <sourceFolder url="file://$MODULE_DIR$/src/test/etc" isTestSource="true" /> + <sourceFolder url="file://$MODULE_DIR$/src/test/resources" isTestSource="true" /> + <sourceFolder url="file://$MODULE_DIR$/target/wsconsume/java" isTestSource="true" /> + <excludeFolder url="file://$MODULE_DIR$/target/antrun" /> + <excludeFolder url="file://$MODULE_DIR$/target/appclient-logs" /> + <excludeFolder url="file://$MODULE_DIR$/target/endorsed" /> + <excludeFolder url="file://$MODULE_DIR$/target/maven-archiver" /> + <excludeFolder url="file://$MODULE_DIR$/target/org" /> + <excludeFolder url="file://$MODULE_DIR$/target/surefire" /> + <excludeFolder url="file://$MODULE_DIR$/target/surefire-reports" /> + <excludeFolder url="file://$MODULE_DIR$/target/test-classes" /> + <excludeFolder url="file://$MODULE_DIR$/target/test-libs" /> + <excludeFolder url="file://$MODULE_DIR$/target/test-resources" /> + <excludeFolder url="file://$MODULE_DIR$/target/work" /> + <excludeFolder url="file://$MODULE_DIR$/target/wsprovide" /> + </content> + <orderEntry type="inheritedJdk" /> + <orderEntry type="sourceFolder" forTests="false" /> + <orderEntry type="module" module-name="jbossws-cxf-test-utils" scope="TEST" /> + <orderEntry type="library" name="Maven: org.jboss.ws:jbossws-common-tools:1.2.0.Final" level="project" /> + <orderEntry type="library" name="Maven: org.jboss.ws:jbossws-api:1.0.2.Final" level="project" /> + <orderEntry type="library" name="Maven: org.jboss.ws:jbossws-spi:2.3.0-SNAPSHOT" level="project" /> + <orderEntry type="library" scope="TEST" name="Maven: gnu.getopt:java-getopt:1.0.13" level="project" /> + <orderEntry type="library" name="Maven: log4j:log4j:1.2.14" level="project" /> + <orderEntry type="library" name="Maven: org.jboss.spec.javax.ejb:jboss-ejb-api_3.1_spec:1.0.2.Final" level="project" /> + <orderEntry type="library" name="Maven: javax.jws:jsr181-api:1.0-MR1" level="project" /> + <orderEntry type="module" module-name="jbossws-cxf-client" scope="RUNTIME" /> + <orderEntry type="library" name="Maven: org.jboss.ws:jbossws-common:2.3.0-SNAPSHOT" level="project" /> + <orderEntry type="library" name="Maven: jboss.jaxbintros:jboss-jaxb-intros:1.0.2.GA" level="project" /> + <orderEntry type="library" name="Maven: commons-beanutils:commons-beanutils:1.8.0" level="project" /> + <orderEntry type="library" name="Maven: commons-logging:commons-logging:1.1.1" level="project" /> + <orderEntry type="library" name="Maven: org.jboss.spec.javax.xml.ws:jboss-jaxws-api_2.2_spec:2.0.2.Final" level="project" /> + <orderEntry type="module" module-name="jbossws-cxf-factories" /> + <orderEntry type="module" module-name="jbossws-cxf-transports-httpserver" scope="RUNTIME" /> + <orderEntry type="library" scope="RUNTIME" name="Maven: org.jboss.ws.projects:jaxws-jboss-httpserver-httpspi:1.0.1.GA" level="project" /> + <orderEntry type="library" scope="RUNTIME" name="Maven: org.jboss.com.sun.httpserver:httpserver:1.0.0.Final" level="project" /> + <orderEntry type="library" scope="TEST" name="Maven: junit:junit:4.10" level="project" /> + <orderEntry type="library" scope="TEST" name="Maven: org.hamcrest:hamcrest-core:1.1" level="project" /> + <orderEntry type="library" name="Maven: org.apache.cxf:cxf-rt-frontend-jaxws:2.7.10" level="project" /> + <orderEntry type="library" name="Maven: xml-resolver:xml-resolver:1.2" level="project" /> + <orderEntry type="library" name="Maven: org.apache.cxf:cxf-api:2.7.10" level="project" /> + <orderEntry type="library" name="Maven: org.codehaus.woodstox:woodstox-core-asl:4.2.0" level="project" /> + <orderEntry type="library" name="Maven: org.codehaus.woodstox:stax2-api:3.1.1" level="project" /> + <orderEntry type="library" name="Maven: org.apache.ws.xmlschema:xmlschema-core:2.1.0" level="project" /> + <orderEntry type="library" name="Maven: wsdl4j:wsdl4j:1.6.3" level="project" /> + <orderEntry type="library" name="Maven: org.apache.cxf:cxf-rt-core:2.7.10" level="project" /> + <orderEntry type="library" name="Maven: com.sun.xml.bind:jaxb-impl:2.2.6" level="project" /> + <orderEntry type="library" name="Maven: org.apache.cxf:cxf-rt-bindings-soap:2.7.10" level="project" /> + <orderEntry type="library" name="Maven: org.apache.cxf:cxf-rt-databinding-jaxb:2.7.10" level="project" /> + <orderEntry type="library" name="Maven: org.apache.cxf:cxf-rt-bindings-xml:2.7.10" level="project" /> + <orderEntry type="library" name="Maven: org.apache.cxf:cxf-rt-frontend-simple:2.7.10" level="project" /> + <orderEntry type="library" name="Maven: org.apache.cxf:cxf-rt-transports-http:2.7.10" level="project" /> + <orderEntry type="library" name="Maven: org.apache.cxf:cxf-rt-ws-addr:2.7.10" level="project" /> + <orderEntry type="library" name="Maven: org.apache.cxf:cxf-rt-ws-policy:2.7.10" level="project" /> + <orderEntry type="library" name="Maven: org.apache.neethi:neethi:3.0.2" level="project" /> + <orderEntry type="module" module-name="jbossws-cxf-transports-udp" scope="RUNTIME" /> + <orderEntry type="library" scope="RUNTIME" name="Maven: org.apache.cxf:cxf-rt-bindings-object:2.7.10" level="project" /> + <orderEntry type="library" scope="RUNTIME" name="Maven: org.apache.cxf:cxf-rt-transports-local:2.7.10" level="project" /> + <orderEntry type="library" scope="RUNTIME" name="Maven: org.apache.cxf:cxf-rt-bindings-coloc:2.7.10" level="project" /> + <orderEntry type="library" scope="RUNTIME" name="Maven: org.apache.cxf:cxf-rt-transports-jms:2.7.10" level="project" /> + <orderEntry type="library" scope="RUNTIME" name="Maven: org.apache.cxf:cxf-rt-management:2.7.10" level="project" /> + <orderEntry type="library" scope="RUNTIME" name="Maven: com.sun.xml.bind:jaxb-xjc:2.2.6" level="project" /> + <orderEntry type="library" scope="RUNTIME" name="Maven: commons-lang:commons-lang:2.6" level="project" /> + <orderEntry type="library" scope="RUNTIME" name="Maven: org.apache.cxf:cxf-rt-ws-mex:2.7.10" level="project" /> + <orderEntry type="library" scope="RUNTIME" name="Maven: org.apache.cxf:cxf-rt-ws-rm:2.7.10" level="project" /> + <orderEntry type="library" name="Maven: org.apache.cxf:cxf-rt-ws-security:2.7.10" level="project" /> + <orderEntry type="library" name="Maven: net.sf.ehcache:ehcache-core:2.5.1" level="project" /> + <orderEntry type="library" name="Maven: org.apache.ws.security:wss4j:1.6.14" level="project" /> + <orderEntry type="library" name="Maven: org.apache.santuario:xmlsec:1.5.6" level="project" /> + <orderEntry type="library" name="Maven: org.opensaml:opensaml:2.5.3" level="project" /> + <orderEntry type="library" name="Maven: org.opensaml:openws:1.4.4" level="project" /> + <orderEntry type="library" name="Maven: org.opensaml:xmltooling:1.3.4" level="project" /> + <orderEntry type="library" name="Maven: joda-time:joda-time:1.6.2" level="project" /> + <orderEntry type="library" scope="RUNTIME" name="Maven: org.apache.cxf:cxf-tools-java2ws:2.7.10" level="project" /> + <orderEntry type="library" scope="RUNTIME" name="Maven: org.apache.cxf:cxf-tools-common:2.7.10" level="project" /> + <orderEntry type="library" scope="RUNTIME" name="Maven: org.apache.velocity:velocity:1.7" level="project" /> + <orderEntry type="library" scope="RUNTIME" name="Maven: commons-collections:commons-collections:3.2.1" level="project" /> + <orderEntry type="library" scope="RUNTIME" name="Maven: org.apache.cxf:cxf-tools-wsdlto-core:2.7.10" level="project" /> + <orderEntry type="library" scope="RUNTIME" name="Maven: org.apache.cxf:cxf-tools-validator:2.7.10" level="project" /> + <orderEntry type="library" scope="RUNTIME" name="Maven: org.apache.cxf:cxf-tools-wsdlto-databinding-jaxb:2.7.10" level="project" /> + <orderEntry type="library" scope="RUNTIME" name="Maven: org.apache.cxf:cxf-tools-wsdlto-frontend-jaxws:2.7.10" level="project" /> + <orderEntry type="library" scope="RUNTIME" name="Maven: org.apache.cxf:cxf-rt-databinding-aegis:2.7.10" level="project" /> + <orderEntry type="library" scope="RUNTIME" name="Maven: org.apache.cxf.services.ws-discovery:cxf-services-ws-discovery-api:2.7.10" level="project" /> + <orderEntry type="library" scope="RUNTIME" name="Maven: org.apache.cxf.xjcplugins:cxf-xjc-boolean:2.6.1" level="project" /> + <orderEntry type="library" scope="RUNTIME" name="Maven: org.apache.cxf.xjcplugins:cxf-xjc-dv:2.6.1" level="project" /> + <orderEntry type="library" scope="RUNTIME" name="Maven: org.apache.cxf.xjcplugins:cxf-xjc-ts:2.6.1" level="project" /> + <orderEntry type="library" scope="RUNTIME" name="Maven: javax.xml.stream:stax-api:1.0-2" level="project" /> + <orderEntry type="library" scope="RUNTIME" name="Maven: com.sun.xml.fastinfoset:FastInfoset:1.2.12" level="project" /> + <orderEntry type="library" scope="RUNTIME" name="Maven: asm:asm:3.3.1" level="project" /> + <orderEntry type="library" scope="RUNTIME" name="Maven: org.jboss.spec.javax.xml.rpc:jboss-jaxrpc-api_1.1_spec:1.0.1.Final" level="project" /> + <orderEntry type="library" name="Maven: org.jboss.spec.javax.servlet:jboss-servlet-api_3.0_spec:1.0.2.Final" level="project" /> + <orderEntry type="library" scope="RUNTIME" name="Maven: org.jboss.spec.javax.xml.bind:jboss-jaxb-api_2.2_spec:1.0.4.Final" level="project" /> + <orderEntry type="library" scope="RUNTIME" name="Maven: org.jboss.spec.javax.xml.soap:jboss-saaj-api_1.3_spec:1.0.3.Final" level="project" /> + <orderEntry type="library" name="Maven: org.jboss.logging:jboss-logging:3.1.2.GA" level="project" /> + <orderEntry type="module" module-name="jbossws-cxf-jaspi" /> + <orderEntry type="library" name="Maven: org.jboss.spec.javax.security.auth.message:jboss-jaspi-api_1.1_spec:1.0.0.Alpha1" level="project" /> + <orderEntry type="library" name="Maven: org.jboss.shrinkwrap:shrinkwrap-api:1.1.3" level="project" /> + <orderEntry type="library" scope="RUNTIME" name="Maven: org.jboss.shrinkwrap:shrinkwrap-spi:1.1.3" level="project" /> + <orderEntry type="library" scope="RUNTIME" name="Maven: org.jboss.shrinkwrap:shrinkwrap-impl-base:1.1.3" level="project" /> + <orderEntry type="library" name="Maven: org.slf4j:slf4j-log4j12:1.6.1" level="project" /> + <orderEntry type="library" name="Maven: org.slf4j:slf4j-api:1.6.1" level="project" /> + <orderEntry type="library" scope="TEST" name="Maven: org.jboss.ws.native:jbossws-native-core:4.2.0.CR1" level="project" /> + <orderEntry type="library" scope="TEST" name="Maven: io.netty:netty:3.4.5.Final" level="project" /> + <orderEntry type="library" scope="TEST" name="Maven: org.bouncycastle:bcprov-jdk16:1.46" level="project" /> + </component> +</module> +

10 years, 2 months

1
0
0 / 0

JBossWS SVN: r18465 - stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/samples/wsrm/client.

by jbossws-commits＠lists.jboss.org

Author: asoldano Date: 2014-03-06 05:46:16 -0500 (Thu, 06 Mar 2014) New Revision: 18465 Modified: stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/samples/wsrm/client/WSReliableMessagingWithAPITestCase.java Log: Refactoring WS-RM test to shutdown the bus after use, to prevent WS-RM protocol messages failing after the endpoint has been removed due to the test having been completed. Modified: stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/samples/wsrm/client/WSReliableMessagingWithAPITestCase.java =================================================================== --- stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/samples/wsrm/client/WSReliableMessagingWithAPITestCase.java 2014-03-06 09:28:41 UTC (rev 18464) +++ stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/samples/wsrm/client/WSReliableMessagingWithAPITestCase.java 2014-03-06 10:46:16 UTC (rev 18465) @@ -29,6 +29,8 @@ import junit.framework.Test; +import org.apache.cxf.Bus; +import org.apache.cxf.BusFactory; import org.jboss.wsf.test.JBossWSCXFTestSetup; import org.jboss.test.ws.jaxws.samples.wsrm.generated.SimpleService; import org.jboss.wsf.test.JBossWSTest; @@ -43,28 +45,28 @@ public final class WSReliableMessagingWithAPITestCase extends JBossWSTest { private final String serviceURL = "http://" + getServerHost() + ":8080/jaxws-samples-wsrm-api/SimpleService"; - private SimpleService proxy; public static Test suite() { return new JBossWSCXFTestSetup(WSReliableMessagingWithAPITestCase.class, "jaxws-samples-wsrm-api.war"); } - @Override - protected void setUp() throws Exception - { - super.setUp(); - QName serviceName = new QName("http://www.jboss.org/jbossws/ws-extensions/wsrm", "SimpleService"); - URL wsdlURL = getResourceURL("jaxws/samples/wsrm/WEB-INF/wsdl/SimpleService.wsdl"); - Service service = Service.create(wsdlURL, serviceName); - proxy = (SimpleService)service.getPort(SimpleService.class); - ((BindingProvider)proxy).getRequestContext().put(BindingProvider.ENDPOINT_ADDRESS_PROPERTY, serviceURL); - } - public void test() throws Exception { - proxy.ping(); // one way call - assertEquals("Hello World!", proxy.echo("Hello World!")); // request response call + final Bus bus = BusFactory.newInstance().createBus(); + BusFactory.setThreadDefaultBus(bus); + try { + QName serviceName = new QName("http://www.jboss.org/jbossws/ws-extensions/wsrm", "SimpleService"); + URL wsdlURL = getResourceURL("jaxws/samples/wsrm/WEB-INF/wsdl/SimpleService.wsdl"); + Service service = Service.create(wsdlURL, serviceName); + SimpleService proxy = (SimpleService)service.getPort(SimpleService.class); + ((BindingProvider)proxy).getRequestContext().put(BindingProvider.ENDPOINT_ADDRESS_PROPERTY, serviceURL); + + proxy.ping(); // one way call + assertEquals("Hello World!", proxy.echo("Hello World!")); // request response call + } finally { + bus.shutdown(true); + } } }

10 years, 2 months

1
0
0 / 0

JBossWS SVN: r18464 - stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/samples/wsse/policy/basic.

by jbossws-commits＠lists.jboss.org

Author: asoldano Date: 2014-03-06 04:28:41 -0500 (Thu, 06 Mar 2014) New Revision: 18464 Modified: stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/samples/wsse/policy/basic/JavaFirstServiceImpl.java Log: Use @EndpointProperty annotation instead of @EndpointConfig to have an example of endpoint not using JBoss annotations Modified: stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/samples/wsse/policy/basic/JavaFirstServiceImpl.java =================================================================== --- stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/samples/wsse/policy/basic/JavaFirstServiceImpl.java 2014-03-05 10:52:15 UTC (rev 18463) +++ stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/samples/wsse/policy/basic/JavaFirstServiceImpl.java 2014-03-06 09:28:41 UTC (rev 18464) @@ -23,8 +23,9 @@ import javax.jws.WebService; +import org.apache.cxf.annotations.EndpointProperties; +import org.apache.cxf.annotations.EndpointProperty; import org.apache.cxf.annotations.Policy; -import org.jboss.ws.api.annotation.EndpointConfig; @WebService ( @@ -34,7 +35,10 @@ targetNamespace = "http://www.jboss.org/jbossws/ws-extensions/wssecuritypolicy" ) @Policy(placement = Policy.Placement.BINDING, uri = "JavaFirstPolicy.xml") -@EndpointConfig(configFile = "WEB-INF/jaxws-endpoint-config.xml", configName = "Custom WS-Security Endpoint") +@EndpointProperties(value = { + @EndpointProperty(key = "ws-security.callback-handler", value = "org.jboss.test.ws.jaxws.samples.wsse.policy.basic.ServerUsernamePasswordCallback") + } +) public class JavaFirstServiceImpl //Not extending JavaFirstServiceIface for testing purposes only, to avoid having to //move the @Policy annotation in the interface, which is also used on client side. {

10 years, 2 months

1
0
0 / 0

JBossWS SVN: r18463 - container/wildfly80/branches/jbossws-wildfly800/server-integration/src/main/java/org/jboss/as/webservices/dmr.

by jbossws-commits＠lists.jboss.org

Author: asoldano Date: 2014-03-05 05:52:15 -0500 (Wed, 05 Mar 2014) New Revision: 18463 Modified: container/wildfly80/branches/jbossws-wildfly800/server-integration/src/main/java/org/jboss/as/webservices/dmr/WSSubsystemAdd.java Log: [WFLY-3061] Use readResourceFromRoot(PathAddress address, boolean recursive) Modified: container/wildfly80/branches/jbossws-wildfly800/server-integration/src/main/java/org/jboss/as/webservices/dmr/WSSubsystemAdd.java =================================================================== --- container/wildfly80/branches/jbossws-wildfly800/server-integration/src/main/java/org/jboss/as/webservices/dmr/WSSubsystemAdd.java 2014-03-05 10:50:40 UTC (rev 18462) +++ container/wildfly80/branches/jbossws-wildfly800/server-integration/src/main/java/org/jboss/as/webservices/dmr/WSSubsystemAdd.java 2014-03-05 10:52:15 UTC (rev 18463) @@ -139,8 +139,7 @@ } private static boolean isJMXSubsystemAvailable(final OperationContext context) { - //context.readResourceFromRoot(PathAddress.pathAddress(PathElement.pathElement(SUBSYSTEM, JMXExtension.SUBSYSTEM_NAME))) != null - Resource root = context.readResourceFromRoot(PathAddress.pathAddress(PathAddress.EMPTY_ADDRESS)); + Resource root = context.readResourceFromRoot(PathAddress.pathAddress(PathAddress.EMPTY_ADDRESS), false); return root.hasChild(PathElement.pathElement(SUBSYSTEM, JMXExtension.SUBSYSTEM_NAME)); } }

10 years, 2 months

1
0
0 / 0

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

jbossws-commits March 2014