[jbossws-commits] JBossWS SVN: r18776 - in stack/cxf/trunk/modules/testsuite/cxf-tests: src/test/java/org/jboss/test/ws/jaxws/samples/asynch and 3 other directories.

Author: asoldano Date: 2014-07-03 11:43:16 -0400 (Thu, 03 Jul 2014) New Revision: 18776 Added: stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/samples/wsse/policy/oasis/DeploymentArchives.java stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/samples/wsse/policy/trust/DeploymentArchives.java 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/asynch/AsynchTestCase.java stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/samples/wsdd/WSDiscoveryTestCase.java stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/samples/wsse/policy/oasis/WSSecurityPolicyExamples21xTestCase.java stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/samples/wsse/policy/oasis/WSSecurityPolicyExamples22xTestCase.java stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/samples/wsse/policy/oasis/WSSecurityPolicyExamples23xTestCase.java stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/samples/wsse/policy/trust/WSTrustActAsTestCase.java stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/samples/wsse/policy/trust/WSTrustHolderOfKeyTestCase.java stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/samples/wsse/policy/trust/WSTrustOnBehalfOfTestCase.java stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/samples/wsse/policy/trust/WSTrustPicketLinkTestCase.java stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/samples/wsse/policy/trust/WSTrustTestCase.java Log: [JBWS-3711] WIP 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-07-03 12:20:47 UTC (rev 18775) +++ stack/cxf/trunk/modules/testsuite/cxf-tests/scripts/cxf-samples-jars-jaxws.xml 2014-07-03 15:43:16 UTC (rev 18776) @@ -30,18 +30,6 @@ <mkdir dir="${tests.output.dir}/test-libs"/> - <!-- jaxws-samples-asynch --> - <war - warfile="${tests.output.dir}/test-libs/jaxws-samples-asynch.war" - webxml="${tests.output.dir}/test-resources/jaxws/samples/asynch/WEB-INF/web.xml"> - <classes dir="${tests.output.dir}/test-classes"> - <include name="org/jboss/test/ws/jaxws/samples/asynch/EndpointImpl*.class"/> - </classes> - <manifest> - <attribute name="Dependencies" value="org.apache.cxf"/> - </manifest> - </war> - <!-- jaxws-samples-mtom --> <war warfile="${tests.output.dir}/test-libs/jaxws-samples-mtom.war" @@ -65,28 +53,6 @@ </classes> </war> - <!-- jaxws-samples-wsdd --> - <war - warfile="${tests.output.dir}/test-libs/jaxws-samples-wsdd.war" needxmlfile='false'> - <classes dir="${tests.output.dir}/test-classes"> - <include name="org/jboss/test/ws/jaxws/samples/wsdd/ServiceIface.class"/> - <include name="org/jboss/test/ws/jaxws/samples/wsdd/ServiceImpl.class"/> - </classes> - <webinf dir="${tests.output.dir}/test-resources/jaxws/samples/wsdd/WEB-INF"> - <include name="jboss-webservices.xml"/> - </webinf> - </war> - <war - warfile="${tests.output.dir}/test-libs/jaxws-samples-wsdd2.war" needxmlfile='false'> - <classes dir="${tests.output.dir}/test-classes"> - <include name="org/jboss/test/ws/jaxws/samples/wsdd/ServiceIface.class"/> - <include name="org/jboss/test/ws/jaxws/samples/wsdd/*ServiceImpl.class"/> - </classes> - <webinf dir="${tests.output.dir}/test-resources/jaxws/samples/wsdd/WEB-INF"> - <include name="jboss-webservices.xml"/> - </webinf> - </war> - <!-- jaxws-samples-wsrm --> <war warfile="${tests.output.dir}/test-libs/jaxws-samples-wsrm-api.war" @@ -102,101 +68,6 @@ </manifest> </war> - <!-- jaxws-samples-wsse-policy-oasis-21x --> - <war - warfile="${tests.output.dir}/test-libs/jaxws-samples-wsse-policy-oasis-21x.war" needxmlfile='false'> - <classes dir="${tests.output.dir}/test-classes"> - <include name="org/jboss/test/ws/jaxws/samples/wsse/policy/oasis/ServiceIface.class"/> - <include name="org/jboss/test/ws/jaxws/samples/wsse/policy/oasis/Service21*Impl.class"/> - <include name="org/jboss/test/ws/jaxws/samples/wsse/policy/jaxws/Say*.class"/> - <include name="org/jboss/test/ws/jaxws/samples/wsse/policy/oasis/ServerUsernamePasswordCallback.class"/> - </classes> - <webinf dir="${tests.output.dir}/test-resources/jaxws/samples/wsse/policy/oasis/WEB-INF"> - <include name="wsdl/*.xsd"/> - <include name="wsdl/SecurityService21x.wsdl"/> - </webinf> - <zipfileset dir="${tests.output.dir}/test-resources/jaxws/samples/wsse/policy/oasis/WEB-INF" prefix="WEB-INF/classes"> - <include name="bob.jks" /> - <include name="bob.properties" /> - </zipfileset> - <manifest> - <attribute name="Dependencies" value="org.jboss.ws.cxf.jbossws-cxf-client"/> - </manifest> - </war> - - <!-- jaxws-samples-wsse-policy-oasis-22x --> - <war - warfile="${tests.output.dir}/test-libs/jaxws-samples-wsse-policy-oasis-22x.war" needxmlfile='false'> - <classes dir="${tests.output.dir}/test-classes"> - <include name="org/jboss/test/ws/jaxws/samples/wsse/policy/oasis/ServiceIface.class"/> - <include name="org/jboss/test/ws/jaxws/samples/wsse/policy/oasis/Service22*Impl.class"/> - <include name="org/jboss/test/ws/jaxws/samples/wsse/policy/jaxws/Say*.class"/> - <include name="org/jboss/test/ws/jaxws/samples/wsse/policy/oasis/KeystorePasswordCallback.class"/> - </classes> - <webinf dir="${tests.output.dir}/test-resources/jaxws/samples/wsse/policy/oasis/WEB-INF"> - <include name="wsdl/*.xsd"/> - <include name="wsdl/SecurityService.wsdl"/> - </webinf> - <zipfileset dir="${tests.output.dir}/test-resources/jaxws/samples/wsse/policy/oasis/WEB-INF" prefix="WEB-INF/classes"> - <include name="bob.jks" /> - <include name="bob.properties" /> - </zipfileset> - <manifest> - <attribute name="Dependencies" value="org.jboss.ws.cxf.jbossws-cxf-client"/> - </manifest> - </war> - - <!-- jaxws-samples-wsse-policy-oasis-23x --> - <war - warfile="${tests.output.dir}/test-libs/jaxws-samples-wsse-policy-oasis-23x.war" needxmlfile='false'> - <classes dir="${tests.output.dir}/test-classes"> - <include name="org/jboss/test/ws/jaxws/samples/wsse/policy/oasis/ServiceIface.class"/> - <include name="org/jboss/test/ws/jaxws/samples/wsse/policy/oasis/Service23*Impl.class"/> - <include name="org/jboss/test/ws/jaxws/samples/wsse/policy/jaxws/Say*.class"/> - <include name="org/jboss/test/ws/jaxws/samples/wsse/policy/oasis/KeystorePasswordCallback.class"/> - </classes> - <webinf dir="${tests.output.dir}/test-resources/jaxws/samples/wsse/policy/oasis/WEB-INF"> - <include name="wsdl/*.xsd"/> - <include name="wsdl/SecurityService23x.wsdl"/> - </webinf> - <zipfileset dir="${tests.output.dir}/test-resources/jaxws/samples/wsse/policy/oasis/WEB-INF" prefix="WEB-INF/classes"> - <include name="bob.jks" /> - <include name="bob.properties" /> - </zipfileset> - <manifest> - <attribute name="Dependencies" value="org.jboss.ws.cxf.jbossws-cxf-client"/> - </manifest> - </war> - - <!-- jaxws-samples-wsse-policy-oasis-client --> - <jar destfile="${tests.output.dir}/test-libs/jaxws-samples-wsse-policy-oasis-client.jar"> - <metainf dir="${tests.output.dir}/test-resources/jaxws/samples/wsse/policy/oasis/META-INF"> - <include name="alice.properties" /> - <include name="alice.jks" /> - </metainf> - </jar> - - <!-- jaxws-samples-wsse-policy-secconv - <war - warfile="${tests.output.dir}/test-libs/jaxws-samples-wsse-policy-secconv.war" needxmlfile='false'> - <classes dir="${tests.output.dir}/test-classes"> - <include name="org/jboss/test/ws/jaxws/samples/wsse/policy/secconv/ServiceIface.class"/> - <include name="org/jboss/test/ws/jaxws/samples/wsse/policy/secconv/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/secconv/KeystorePasswordCallback.class"/> - </classes> - <webinf dir="${tests.output.dir}/test-resources/jaxws/samples/wsse/policy/secconv/WEB-INF"> - <include name="wsdl/*"/> - </webinf> - <zipfileset dir="${tests.output.dir}/test-resources/jaxws/samples/wsse/policy/secconv/WEB-INF" prefix="WEB-INF/classes"> - <include name="bob.jks" /> - <include name="bob.properties" /> - </zipfileset> - <manifest> - <attribute name="Dependencies" value="org.jboss.ws.cxf.jbossws-cxf-client"/> - </manifest> - </war> --> - <!-- jaxws-samples-wsse-policy-secconv-client --> <jar destfile="${tests.output.dir}/test-libs/jaxws-samples-wsse-policy-secconv-client.jar"> <metainf dir="${tests.output.dir}/test-resources/jaxws/samples/wsse/policy/secconv/META-INF"> @@ -373,242 +244,6 @@ </metainf> </jar> - <!-- jaxws-samples-wsse-policy-trust --> - <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/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/service/ServerCallbackHandler.class"/> - </classes> - <webinf dir="${tests.output.dir}/test-resources/jaxws/samples/wsse/policy/trust/WEB-INF"> - <include name="wsdl/Security*"/> - </webinf> - <zipfileset dir="${tests.output.dir}/test-resources/jaxws/samples/wsse/policy/trust/WEB-INF" prefix="WEB-INF/classes"> - <include name="servicestore.jks" /> - <include name="serviceKeystore.properties" /> - </zipfileset> - <manifest> - <attribute name="Dependencies" value="org.jboss.ws.cxf.jbossws-cxf-client"/> - </manifest> - </war> - - <!-- jaxws-samples-wsse-policy-trust-sts --> - <war - 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/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*"/> - <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="stsKeystore.properties" /> - </zipfileset> - <manifest> - <attribute name="Dependencies" value="org.jboss.ws.cxf.jbossws-cxf-client,org.apache.cxf.impl annotations"/> <!-- cxf impl required to extend STS impl --> - </manifest> - </war> - - <!-- jaxws-samples-wsse-policy-trust-client --> - <jar destfile="${tests.output.dir}/test-libs/jaxws-samples-wsse-policy-trust-client.jar"> - <metainf dir="${tests.output.dir}/test-resources/jaxws/samples/wsse/policy/trust/META-INF"> - <include name="clientKeystore.properties" /> - <include name="clientstore.jks" /> - </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"/> - <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-sts-bearer --> - <war - warfile="${tests.output.dir}/test-libs/jaxws-samples-wsse-policy-trust-sts-bearer.war" - webxml="${tests.output.dir}/test-resources/jaxws/samples/wsse/policy/trust/WEB-INF/bearer/web.xml"> - <classes dir="${tests.output.dir}/test-classes"> - <include name="org/jboss/test/ws/jaxws/samples/wsse/policy/trust/stsbearer/SampleSTSBearer.class"/> - <include name="org/jboss/test/ws/jaxws/samples/wsse/policy/trust/stsbearer/STSBearerCallbackHandler.class"/> - </classes> - <webinf dir="${tests.output.dir}/test-resources/jaxws/samples/wsse/policy/trust/WEB-INF"> - <include name="wsdl/bearer-ws-trust*"/> - <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="stsKeystore.properties" /> - </zipfileset> - <manifest> - <attribute name="Dependencies" value="org.jboss.ws.cxf.jbossws-cxf-client,org.apache.cxf.impl annotations"/> <!-- cxf impl required to extend STS impl --> - </manifest> - </war> - - <!-- jaxws-samples-wsse-policy-trust-bearer --> - <war - warfile="${tests.output.dir}/test-libs/jaxws-samples-wsse-policy-trust-bearer.war" needxmlfile='false'> - <classes dir="${tests.output.dir}/test-classes"> - <include name="org/jboss/test/ws/jaxws/samples/wsse/policy/trust/bearer/BearerIface.class"/> - <include name="org/jboss/test/ws/jaxws/samples/wsse/policy/trust/bearer/BearerImpl.class"/> - <include name="org/jboss/test/ws/jaxws/samples/wsse/policy/jaxws/Say*.class"/> - </classes> - <webinf dir="${tests.output.dir}/test-resources/jaxws/samples/wsse/policy/trust/WEB-INF"> - <include name="wsdl/BearerService.wsdl"/> - <include name="wsdl/BearerService_schema1.xsd"/> - </webinf> - <zipfileset dir="${tests.output.dir}/test-resources/jaxws/samples/wsse/policy/trust/WEB-INF" prefix="WEB-INF/classes"> - <include name="servicestore.jks" /> - <include name="serviceKeystore.properties" /> - </zipfileset> - <manifest> - <attribute name="Dependencies" value="org.jboss.ws.cxf.jbossws-cxf-client"/> - </manifest> - </war> - - <!-- jaxws-samples-wsse-policy-trust-sts-holderofkey --> - <war - warfile="${tests.output.dir}/test-libs/jaxws-samples-wsse-policy-trust-sts-holderofkey.war" - webxml="${tests.output.dir}/test-resources/jaxws/samples/wsse/policy/trust/WEB-INF/holderofkey/web.xml"> - <classes dir="${tests.output.dir}/test-classes"> - <include name="org/jboss/test/ws/jaxws/samples/wsse/policy/trust/stsholderofkey/SampleSTSHolderOfKey.class"/> - <include name="org/jboss/test/ws/jaxws/samples/wsse/policy/trust/stsholderofkey/STSHolderOfKeyCallbackHandler.class"/> - </classes> - <webinf dir="${tests.output.dir}/test-resources/jaxws/samples/wsse/policy/trust/WEB-INF"> - <include name="wsdl/holderofkey-ws-trust*"/> - <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="stsKeystore.properties" /> - </zipfileset> - <manifest> - <attribute name="Dependencies" value="org.jboss.ws.cxf.jbossws-cxf-client,org.apache.cxf.impl annotations"/> <!-- cxf impl required to extend STS impl --> - </manifest> - </war> - - - <!-- jaxws-samples-wsse-policy-trust-holderofkey --> - <war - warfile="${tests.output.dir}/test-libs/jaxws-samples-wsse-policy-trust-holderofkey.war" needxmlfile='false'> - <classes dir="${tests.output.dir}/test-classes"> - <include name="org/jboss/test/ws/jaxws/samples/wsse/policy/trust/holderofkey/HolderOfKey*.class"/> - <include name="org/jboss/test/ws/jaxws/samples/wsse/policy/jaxws/Say*.class"/> - </classes> - <webinf dir="${tests.output.dir}/test-resources/jaxws/samples/wsse/policy/trust/WEB-INF"> - <include name="wsdl/HolderOfKeyService.wsdl"/> - <include name="wsdl/HolderOfKeyService_schema1.xsd"/> - </webinf> - <zipfileset dir="${tests.output.dir}/test-resources/jaxws/samples/wsse/policy/trust/WEB-INF" prefix="WEB-INF/classes"> - <include name="servicestore.jks" /> - <include name="serviceKeystore.properties" /> - </zipfileset> - <manifest> - <attribute name="Dependencies" value="org.jboss.ws.cxf.jbossws-cxf-client"/> - </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/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 --> <war warfile="${tests.output.dir}/test-libs/jaxws-samples-wsse-policy-username-unsecure-transport.war" @@ -649,117 +284,6 @@ </manifest> </war> - <!-- jaxws-samples-wsse-policy-username-jaas - <war - warfile="${tests.output.dir}/test-libs/jaxws-samples-wsse-policy-username-jaas.war" - webxml="${tests.output.dir}/test-resources/jaxws/samples/wsse/policy/jaas/auth/WEB-INF/web.xml"> - <classes dir="${tests.output.dir}/test-classes"> - <include name="org/jboss/test/ws/jaxws/samples/wsse/policy/jaas/Service*.class"/> - <include name="org/jboss/test/ws/jaxws/samples/wsse/policy/jaxws/*.class"/> - <include name="org/jboss/test/ws/jaxws/samples/wsse/policy/jaas/POJOEndpointAuthorizationInterceptor.class"/> - </classes> - <webinf dir="${tests.output.dir}/test-resources/jaxws/samples/wsse/policy/jaas/auth/WEB-INF"> - <include name="jaxws-endpoint-config.xml"/> - <include name="jboss-web.xml"/> - <include name="wsdl/*"/> - </webinf> - <manifest> - <attribute name="Dependencies" value="org.jboss.ws.cxf.jbossws-cxf-client,org.apache.cxf.impl"/> - </manifest> - </war> --> - - <!-- jaxws-samples-wsse-policy-username-jaspi - <war - warfile="${tests.output.dir}/test-libs/jaxws-samples-wsse-policy-username-endpoint-jaspi.war" - webxml="${tests.output.dir}/test-resources/jaxws/samples/wsse/policy/jaspi/WEB-INF/web.xml"> - <classes dir="${tests.output.dir}/test-classes"> - <include name="org/jboss/test/ws/jaxws/samples/wsse/policy/jaspi/ServiceIface.class"/> - <include name="org/jboss/test/ws/jaxws/samples/wsse/policy/jaspi/ServiceEndpointImpl.class"/> - <include name="org/jboss/test/ws/jaxws/samples/wsse/policy/jaxws/*.class"/> - </classes> - <webinf dir="${tests.output.dir}/test-resources/jaxws/samples/wsse/policy/jaspi/WEB-INF"> - <include name="jaxws-*.xml"/> - <include name="wsdl/*"/> - </webinf> - <manifest> - <attribute name="Dependencies" value="org.jboss.ws.cxf.jbossws-cxf-client,org.apache.cxf.impl"/> - </manifest> - </war> --> - - <!-- jaxws-samples-wsse-policy-username-jaspi-jbossws - <war - warfile="${tests.output.dir}/test-libs/jaxws-samples-wsse-policy-username-jbws-jaspi.war" - webxml="${tests.output.dir}/test-resources/jaxws/samples/wsse/policy/jaspi/WEB-INF2/web.xml"> - <classes dir="${tests.output.dir}/test-classes"> - <include name="org/jboss/test/ws/jaxws/samples/wsse/policy/jaspi/ServiceIface.class"/> - <include name="org/jboss/test/ws/jaxws/samples/wsse/policy/jaspi/ServiceImpl.class"/> - <include name="org/jboss/test/ws/jaxws/samples/wsse/policy/jaxws/*.class"/> - </classes> - <webinf dir="${tests.output.dir}/test-resources/jaxws/samples/wsse/policy/jaspi/WEB-INF2"> - <include name="jboss-*.xml"/> - <include name="wsdl/*"/> - </webinf> - <manifest> - <attribute name="Dependencies" value="org.jboss.ws.cxf.jbossws-cxf-client,org.apache.cxf.impl"/> - </manifest> - </war> --> - - <!-- jaxws-samples-wsse-policy-username-jaspi-client - <war - warfile="${tests.output.dir}/test-libs/jaxws-samples-wsse-policy-username-jaspi-client.war" needxmlfile="false"> - <classes dir="${tests.output.dir}/test-classes"> - <include name="org/jboss/test/ws/jaxws/samples/wsse/policy/jaspi/Helper.class"/> - <include name="org/jboss/test/ws/jaxws/samples/wsse/policy/jaspi/ServiceIface.class"/> - <include name="org/jboss/test/ws/jaxws/samples/wsse/policy/jaspi/UsernamePasswordCallback.class"/> - <include name="org/jboss/test/ws/jaxws/samples/wsse/policy/jaxws/*.class"/> - <include name="org/jboss/wsf/test/TestServlet.class"/> - <include name="org/jboss/wsf/test/ClientHelper.class"/> - </classes> - <classes dir="${tests.output.dir}/test-resources/jaxws/samples/wsse/policy/jaspi"> - <include name="META-INF/jaxws-client-config.xml"/> - </classes> - <manifest> - <attribute name="Dependencies" value="org.jboss.ws.cxf.jbossws-cxf-client,org.apache.cxf.impl"/> - </manifest> - </war> --> - - <!-- jaxws-samples-wsse-policy-username-jaas-digest - <war - warfile="${tests.output.dir}/test-libs/jaxws-samples-wsse-policy-username-jaas-digest.war" - webxml="${tests.output.dir}/test-resources/jaxws/samples/wsse/policy/jaas/digest/WEB-INF/web.xml"> - <classes dir="${tests.output.dir}/test-classes"> - <include name="org/jboss/test/ws/jaxws/samples/wsse/policy/jaas/Service*.class"/> - <include name="org/jboss/test/ws/jaxws/samples/wsse/policy/jaxws/*.class"/> - <include name="org/jboss/test/ws/jaxws/samples/wsse/policy/jaas/POJOEndpointAuthorizationInterceptor.class"/> - </classes> - <webinf dir="${tests.output.dir}/test-resources/jaxws/samples/wsse/policy/jaas/digest/WEB-INF"> - <include name="jaxws-endpoint-config.xml"/> - <include name="jboss-web.xml"/> - <include name="wsdl/*"/> - </webinf> - <manifest> - <attribute name="Dependencies" value="org.jboss.ws.cxf.jbossws-cxf-client,org.apache.cxf.impl"/> - </manifest> - </war> --> - - <!-- jaxws-samples-wsse-policy-username-jaas-ejb - <jar destfile="${tests.output.dir}/test-libs/jaxws-samples-wsse-policy-username-jaas-ejb.jar"> - <fileset dir="${tests.output.dir}/test-classes"> - <include name="org/jboss/test/ws/jaxws/samples/wsse/policy/jaas/EJB*.class"/> - <include name="org/jboss/test/ws/jaxws/samples/wsse/policy/jaas/ServiceIface.class"/> - <include name="org/jboss/test/ws/jaxws/samples/wsse/policy/jaxws/*.class"/> - </fileset> - <metainf dir="${tests.output.dir}/test-resources/jaxws/samples/wsse/policy/jaas/ejb/META-INF"> - <include name="wsdl/*"/> - <include name="jaxws-endpoint-config.xml"/> - </metainf> - <manifest> - <attribute name="Dependencies" value="org.jboss.ws.cxf.jbossws-cxf-client"/> - </manifest> - </jar> --> - - <!-- Please add alphabetically --> - </target> </project> Modified: stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/samples/asynch/AsynchTestCase.java =================================================================== --- stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/samples/asynch/AsynchTestCase.java 2014-07-03 12:20:47 UTC (rev 18775) +++ stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/samples/asynch/AsynchTestCase.java 2014-07-03 15:43:16 UTC (rev 18776) @@ -21,7 +21,10 @@ */ package org.jboss.test.ws.jaxws.samples.asynch; +import java.io.File; import java.net.URL; +import java.util.LinkedList; +import java.util.List; import java.util.concurrent.Future; import javax.xml.namespace.QName; @@ -31,8 +34,11 @@ import junit.framework.Test; +import org.jboss.shrinkwrap.api.asset.StringAsset; import org.jboss.wsf.test.JBossWSCXFTestSetup; import org.jboss.wsf.test.JBossWSTest; +import org.jboss.wsf.test.JBossWSTestHelper; +import org.jboss.wsf.test.JBossWSTestHelper.BaseDeployment; /** * Asynchronous web services test case (both client and server side async) @@ -44,9 +50,22 @@ { private String endpointAddress = "http://" + getServerHost() + ":8080/jaxws-samples-asynch"; + public static BaseDeployment<?>[] createDeployments() { + List<BaseDeployment<?>> list = new LinkedList<BaseDeployment<?>>(); + list.add(new JBossWSTestHelper.WarDeployment("jaxws-samples-asynch.war") { { + archive + .setManifest(new StringAsset("Manifest-Version: 1.0\n" + + "Dependencies: org.apache.cxf\n")) + .addClass(org.jboss.test.ws.jaxws.samples.asynch.EndpointImpl.class) + .setWebXML(new File(JBossWSTestHelper.getTestResourcesDir() + "/jaxws/samples/asynch/WEB-INF/web.xml")); + } + }); + return list.toArray(new BaseDeployment<?>[list.size()]); + } + public static Test suite() { - return new JBossWSCXFTestSetup(AsynchTestCase.class, "jaxws-samples-asynch.war"); + return new JBossWSCXFTestSetup(AsynchTestCase.class, JBossWSTestHelper.writeToFile(createDeployments())); } public void testAsyncEndpoint() throws Exception Modified: stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/samples/wsdd/WSDiscoveryTestCase.java =================================================================== --- stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/samples/wsdd/WSDiscoveryTestCase.java 2014-07-03 12:20:47 UTC (rev 18775) +++ stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/samples/wsdd/WSDiscoveryTestCase.java 2014-07-03 15:43:16 UTC (rev 18776) @@ -21,6 +21,7 @@ */ package org.jboss.test.ws.jaxws.samples.wsdd; +import java.io.File; import java.net.URL; import java.util.ArrayList; import java.util.LinkedList; @@ -41,6 +42,8 @@ import org.apache.cxf.ws.discovery.wsdl.ScopesType; import org.jboss.wsf.test.JBossWSCXFTestSetup; import org.jboss.wsf.test.JBossWSTest; +import org.jboss.wsf.test.JBossWSTestHelper; +import org.jboss.wsf.test.JBossWSTestHelper.BaseDeployment; /** * WS-Discovery 1.1 sample @@ -52,9 +55,31 @@ { private static final int TIMEOUT = Integer.getInteger(WSDiscoveryTestCase.class.getName() + ".timeout", 2000); + public static BaseDeployment<?>[] createDeployments() { + List<BaseDeployment<?>> list = new LinkedList<BaseDeployment<?>>(); + list.add(new JBossWSTestHelper.WarDeployment("jaxws-samples-wsdd2.war") { { + archive + .addManifest() + .addClass(org.jboss.test.ws.jaxws.samples.wsdd.AnotherServiceImpl.class) + .addClass(org.jboss.test.ws.jaxws.samples.wsdd.ServiceIface.class) + .addClass(org.jboss.test.ws.jaxws.samples.wsdd.ServiceImpl.class) + .addAsWebInfResource(new File(JBossWSTestHelper.getTestResourcesDir() + "/jaxws/samples/wsdd/WEB-INF/jboss-webservices.xml"), "jboss-webservices.xml"); + } + }); + list.add(new JBossWSTestHelper.WarDeployment("jaxws-samples-wsdd.war") { { + archive + .addManifest() + .addClass(org.jboss.test.ws.jaxws.samples.wsdd.ServiceIface.class) + .addClass(org.jboss.test.ws.jaxws.samples.wsdd.ServiceImpl.class) + .addAsWebInfResource(new File(JBossWSTestHelper.getTestResourcesDir() + "/jaxws/samples/wsdd/WEB-INF/jboss-webservices.xml"), "jboss-webservices.xml"); + } + }); + return list.toArray(new BaseDeployment<?>[list.size()]); + } + public static Test suite() { - return new JBossWSCXFTestSetup(WSDiscoveryTestCase.class, "jaxws-samples-wsdd.war,jaxws-samples-wsdd2.war"); + return new JBossWSCXFTestSetup(WSDiscoveryTestCase.class, JBossWSTestHelper.writeToFile(createDeployments())); } public void testProbeAndResolve() throws Exception Added: stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/samples/wsse/policy/oasis/DeploymentArchives.java =================================================================== --- stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/samples/wsse/policy/oasis/DeploymentArchives.java (rev 0) +++ stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/samples/wsse/policy/oasis/DeploymentArchives.java 2014-07-03 15:43:16 UTC (rev 18776) @@ -0,0 +1,106 @@ +/* + * 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.test.ws.jaxws.samples.wsse.policy.oasis; + +import java.io.File; + +import org.jboss.shrinkwrap.api.asset.StringAsset; +import org.jboss.wsf.test.JBossWSTestHelper; + +public final class DeploymentArchives +{ + public static final String CLIENT_JAR = JBossWSTestHelper.writeToFile(new JBossWSTestHelper.JarDeployment("jaxws-samples-wsse-policy-oasis-client.jar") { { + archive + .addManifest() + .addAsManifestResource(new File(JBossWSTestHelper.getTestResourcesDir() + "/jaxws/samples/wsse/policy/oasis/META-INF/alice.jks"), "alice.jks") + .addAsManifestResource(new File(JBossWSTestHelper.getTestResourcesDir() + "/jaxws/samples/wsse/policy/oasis/META-INF/alice.properties"), "alice.properties"); + } + }); + + public static final String SERVER_22X_WAR = JBossWSTestHelper.writeToFile(new JBossWSTestHelper.WarDeployment("jaxws-samples-wsse-policy-oasis-22x.war") { { + archive + .setManifest(new StringAsset("Manifest-Version: 1.0\n" + + "Dependencies: org.jboss.ws.cxf.jbossws-cxf-client\n")) + .addClass(org.jboss.test.ws.jaxws.samples.wsse.policy.jaxws.SayHello.class) + .addClass(org.jboss.test.ws.jaxws.samples.wsse.policy.jaxws.SayHelloResponse.class) + .addClass(org.jboss.test.ws.jaxws.samples.wsse.policy.oasis.KeystorePasswordCallback.class) + .addClass(org.jboss.test.ws.jaxws.samples.wsse.policy.oasis.Service221Impl.class) + .addClass(org.jboss.test.ws.jaxws.samples.wsse.policy.oasis.Service222Impl.class) + .addClass(org.jboss.test.ws.jaxws.samples.wsse.policy.oasis.Service223Impl.class) + .addClass(org.jboss.test.ws.jaxws.samples.wsse.policy.oasis.Service224Impl.class) + .addClass(org.jboss.test.ws.jaxws.samples.wsse.policy.oasis.ServiceIface.class) + .addAsWebInfResource(new File(JBossWSTestHelper.getTestResourcesDir() + "/jaxws/samples/wsse/policy/oasis/WEB-INF/bob.jks"), "classes/bob.jks") + .addAsWebInfResource(new File(JBossWSTestHelper.getTestResourcesDir() + "/jaxws/samples/wsse/policy/oasis/WEB-INF/bob.properties"), "classes/bob.properties") + .addAsWebInfResource(new File(JBossWSTestHelper.getTestResourcesDir() + "/jaxws/samples/wsse/policy/oasis/WEB-INF/wsdl/SecurityService.wsdl"), "wsdl/SecurityService.wsdl") + .addAsWebInfResource(new File(JBossWSTestHelper.getTestResourcesDir() + "/jaxws/samples/wsse/policy/oasis/WEB-INF/wsdl/SecurityService_schema1.xsd"), "wsdl/SecurityService_schema1.xsd"); + } + }); + + public static final String SERVER_21X_WAR = JBossWSTestHelper.writeToFile(new JBossWSTestHelper.WarDeployment("jaxws-samples-wsse-policy-oasis-21x.war") { { + archive + .setManifest(new StringAsset("Manifest-Version: 1.0\n" + + "Dependencies: org.jboss.ws.cxf.jbossws-cxf-client\n")) + .addClass(org.jboss.test.ws.jaxws.samples.wsse.policy.jaxws.SayHello.class) + .addClass(org.jboss.test.ws.jaxws.samples.wsse.policy.jaxws.SayHelloResponse.class) + .addClass(org.jboss.test.ws.jaxws.samples.wsse.policy.oasis.ServerUsernamePasswordCallback.class) + .addClass(org.jboss.test.ws.jaxws.samples.wsse.policy.oasis.Service2111Impl.class) + .addClass(org.jboss.test.ws.jaxws.samples.wsse.policy.oasis.Service2112Impl.class) + .addClass(org.jboss.test.ws.jaxws.samples.wsse.policy.oasis.Service2113Impl.class) + .addClass(org.jboss.test.ws.jaxws.samples.wsse.policy.oasis.Service2121Impl.class) + .addClass(org.jboss.test.ws.jaxws.samples.wsse.policy.oasis.Service213Impl.class) + .addClass(org.jboss.test.ws.jaxws.samples.wsse.policy.oasis.Service214Impl.class) + .addClass(org.jboss.test.ws.jaxws.samples.wsse.policy.oasis.ServiceIface.class) + .addAsWebInfResource(new File(JBossWSTestHelper.getTestResourcesDir() + "/jaxws/samples/wsse/policy/oasis/WEB-INF/bob.jks"), "classes/bob.jks") + .addAsWebInfResource(new File(JBossWSTestHelper.getTestResourcesDir() + "/jaxws/samples/wsse/policy/oasis/WEB-INF/bob.properties"), "classes/bob.properties") + .addAsWebInfResource(new File(JBossWSTestHelper.getTestResourcesDir() + "/jaxws/samples/wsse/policy/oasis/WEB-INF/wsdl/SecurityService21x.wsdl"), "wsdl/SecurityService21x.wsdl") + .addAsWebInfResource(new File(JBossWSTestHelper.getTestResourcesDir() + "/jaxws/samples/wsse/policy/oasis/WEB-INF/wsdl/SecurityService_schema1.xsd"), "wsdl/SecurityService_schema1.xsd"); + } + }); + + public static final String SERVER_23X_WAR = JBossWSTestHelper.writeToFile(new JBossWSTestHelper.WarDeployment("jaxws-samples-wsse-policy-oasis-23x.war") { { + archive + .setManifest(new StringAsset("Manifest-Version: 1.0\n" + + "Dependencies: org.jboss.ws.cxf.jbossws-cxf-client\n")) + .addClass(org.jboss.test.ws.jaxws.samples.wsse.policy.jaxws.SayHello.class) + .addClass(org.jboss.test.ws.jaxws.samples.wsse.policy.jaxws.SayHelloResponse.class) + .addClass(org.jboss.test.ws.jaxws.samples.wsse.policy.oasis.KeystorePasswordCallback.class) + .addClass(org.jboss.test.ws.jaxws.samples.wsse.policy.oasis.Service2311Impl.class) + .addClass(org.jboss.test.ws.jaxws.samples.wsse.policy.oasis.Service2312Impl.class) + .addClass(org.jboss.test.ws.jaxws.samples.wsse.policy.oasis.Service2313Impl.class) + .addClass(org.jboss.test.ws.jaxws.samples.wsse.policy.oasis.Service2314Impl.class) + .addClass(org.jboss.test.ws.jaxws.samples.wsse.policy.oasis.Service2315Impl.class) + .addClass(org.jboss.test.ws.jaxws.samples.wsse.policy.oasis.Service2321Impl.class) + .addClass(org.jboss.test.ws.jaxws.samples.wsse.policy.oasis.Service2322Impl.class) + .addClass(org.jboss.test.ws.jaxws.samples.wsse.policy.oasis.Service2323Impl.class) + .addClass(org.jboss.test.ws.jaxws.samples.wsse.policy.oasis.Service2324Impl.class) + .addClass(org.jboss.test.ws.jaxws.samples.wsse.policy.oasis.ServiceIface.class) + .addAsWebInfResource(new File(JBossWSTestHelper.getTestResourcesDir() + "/jaxws/samples/wsse/policy/oasis/WEB-INF/bob.jks"), "classes/bob.jks") + .addAsWebInfResource(new File(JBossWSTestHelper.getTestResourcesDir() + "/jaxws/samples/wsse/policy/oasis/WEB-INF/bob.properties"), "classes/bob.properties") + .addAsWebInfResource(new File(JBossWSTestHelper.getTestResourcesDir() + "/jaxws/samples/wsse/policy/oasis/WEB-INF/wsdl/SecurityService23x.wsdl"), "wsdl/SecurityService23x.wsdl") + .addAsWebInfResource(new File(JBossWSTestHelper.getTestResourcesDir() + "/jaxws/samples/wsse/policy/oasis/WEB-INF/wsdl/SecurityService_schema1.xsd"), "wsdl/SecurityService_schema1.xsd"); + } + }); + + private DeploymentArchives() { + //NOOP + } +} Property changes on: stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/samples/wsse/policy/oasis/DeploymentArchives.java ___________________________________________________________________ Added: svn:keywords + Rev Date Added: svn:eol-style + native Modified: stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/samples/wsse/policy/oasis/WSSecurityPolicyExamples21xTestCase.java =================================================================== --- stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/samples/wsse/policy/oasis/WSSecurityPolicyExamples21xTestCase.java 2014-07-03 12:20:47 UTC (rev 18775) +++ stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/samples/wsse/policy/oasis/WSSecurityPolicyExamples21xTestCase.java 2014-07-03 15:43:16 UTC (rev 18776) @@ -60,7 +60,7 @@ System.setProperty("org.jboss.security.ignoreHttpsHost", "true"); */ JBossWSCXFTestSetup setup = new JBossWSCXFTestSetup(WSSecurityPolicyExamples21xTestCase.class, - "jaxws-samples-wsse-policy-oasis-21x.war,jaxws-samples-wsse-policy-oasis-client.jar"); + DeploymentArchives.SERVER_21X_WAR + " " + DeploymentArchives.CLIENT_JAR); Map<String, String> sslOptions = new HashMap<String, String>(); sslOptions.put("server-identity.ssl.keystore-path", System.getProperty("org.jboss.ws.testsuite.server.keystore")); sslOptions.put("server-identity.ssl.keystore-password", "changeit"); Modified: stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/samples/wsse/policy/oasis/WSSecurityPolicyExamples22xTestCase.java =================================================================== --- stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/samples/wsse/policy/oasis/WSSecurityPolicyExamples22xTestCase.java 2014-07-03 12:20:47 UTC (rev 18775) +++ stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/samples/wsse/policy/oasis/WSSecurityPolicyExamples22xTestCase.java 2014-07-03 15:43:16 UTC (rev 18776) @@ -53,7 +53,7 @@ public static Test suite() { return new JBossWSCXFTestSetup(WSSecurityPolicyExamples22xTestCase.class, - "jaxws-samples-wsse-policy-oasis-22x.war,jaxws-samples-wsse-policy-oasis-client.jar"); + DeploymentArchives.SERVER_22X_WAR + " " + DeploymentArchives.CLIENT_JAR); } /** Modified: stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/samples/wsse/policy/oasis/WSSecurityPolicyExamples23xTestCase.java =================================================================== --- stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/samples/wsse/policy/oasis/WSSecurityPolicyExamples23xTestCase.java 2014-07-03 12:20:47 UTC (rev 18775) +++ stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/samples/wsse/policy/oasis/WSSecurityPolicyExamples23xTestCase.java 2014-07-03 15:43:16 UTC (rev 18776) @@ -64,7 +64,7 @@ System.setProperty("org.jboss.security.ignoreHttpsHost", "true"); */ JBossWSCXFTestSetup setup = new JBossWSCXFTestSetup(WSSecurityPolicyExamples23xTestCase.class, - "jaxws-samples-wsse-policy-oasis-23x.war,jaxws-samples-wsse-policy-oasis-client.jar"); + DeploymentArchives.SERVER_23X_WAR + " " + DeploymentArchives.CLIENT_JAR); Map<String, String> sslOptions = new HashMap<String, String>(); sslOptions.put("server-identity.ssl.keystore-path", System.getProperty("org.jboss.ws.testsuite.server.keystore")); sslOptions.put("server-identity.ssl.keystore-password", "changeit"); Added: stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/samples/wsse/policy/trust/DeploymentArchives.java =================================================================== --- stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/samples/wsse/policy/trust/DeploymentArchives.java (rev 0) +++ stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/samples/wsse/policy/trust/DeploymentArchives.java 2014-07-03 15:43:16 UTC (rev 18776) @@ -0,0 +1,187 @@ +/* + * 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.test.ws.jaxws.samples.wsse.policy.trust; + +import java.io.File; + +import org.jboss.shrinkwrap.api.asset.StringAsset; +import org.jboss.wsf.test.JBossWSTestHelper; + +public final class DeploymentArchives +{ + public static final String STS_WAR = JBossWSTestHelper.writeToFile(new JBossWSTestHelper.WarDeployment("jaxws-samples-wsse-policy-trust-sts.war") { { + archive + .setManifest(new StringAsset("Manifest-Version: 1.0\n" + + "Dependencies: org.jboss.ws.cxf.jbossws-cxf-client,org.apache.cxf.impl annotations\n")) //cxf impl required to extend STS impl + .addClass(org.jboss.test.ws.jaxws.samples.wsse.policy.trust.sts.STSCallbackHandler.class) + .addClass(org.jboss.test.ws.jaxws.samples.wsse.policy.trust.sts.SampleSTS.class) + .addAsWebInfResource(new File(JBossWSTestHelper.getTestResourcesDir() + "/jaxws/samples/wsse/policy/trust/WEB-INF/jboss-web.xml"), "jboss-web.xml") + .addAsWebInfResource(new File(JBossWSTestHelper.getTestResourcesDir() + "/jaxws/samples/wsse/policy/trust/WEB-INF/wsdl/ws-trust-1.4-service.wsdl"), "wsdl/ws-trust-1.4-service.wsdl") + .addAsWebInfResource(new File(JBossWSTestHelper.getTestResourcesDir() + "/jaxws/samples/wsse/policy/trust/WEB-INF/stsstore.jks"), "classes/stsstore.jks") + .addAsWebInfResource(new File(JBossWSTestHelper.getTestResourcesDir() + "/jaxws/samples/wsse/policy/trust/WEB-INF/stsKeystore.properties"), "classes/stsKeystore.properties") + .setWebXML(new File(JBossWSTestHelper.getTestResourcesDir() + "/jaxws/samples/wsse/policy/trust/WEB-INF/web.xml")); + } + }); + + public static final String SERVER_WAR = JBossWSTestHelper.writeToFile(new JBossWSTestHelper.WarDeployment("jaxws-samples-wsse-policy-trust.war") { { + archive + .setManifest(new StringAsset("Manifest-Version: 1.0\n" + + "Dependencies: org.jboss.ws.cxf.jbossws-cxf-client\n")) + .addClass(org.jboss.test.ws.jaxws.samples.wsse.policy.jaxws.SayHello.class) + .addClass(org.jboss.test.ws.jaxws.samples.wsse.policy.jaxws.SayHelloResponse.class) + .addClass(org.jboss.test.ws.jaxws.samples.wsse.policy.trust.service.ServerCallbackHandler.class) + .addClass(org.jboss.test.ws.jaxws.samples.wsse.policy.trust.service.ServiceIface.class) + .addClass(org.jboss.test.ws.jaxws.samples.wsse.policy.trust.service.ServiceImpl.class) + .addAsWebInfResource(new File(JBossWSTestHelper.getTestResourcesDir() + "/jaxws/samples/wsse/policy/trust/WEB-INF/wsdl/SecurityService.wsdl"), "wsdl/SecurityService.wsdl") + .addAsWebInfResource(new File(JBossWSTestHelper.getTestResourcesDir() + "/jaxws/samples/wsse/policy/trust/WEB-INF/wsdl/SecurityService_schema1.xsd"), "wsdl/SecurityService_schema1.xsd") + .addAsWebInfResource(new File(JBossWSTestHelper.getTestResourcesDir() + "/jaxws/samples/wsse/policy/trust/WEB-INF/servicestore.jks"), "classes/servicestore.jks") + .addAsWebInfResource(new File(JBossWSTestHelper.getTestResourcesDir() + "/jaxws/samples/wsse/policy/trust/WEB-INF/serviceKeystore.properties"), "classes/serviceKeystore.properties"); + } + }); + + public static final String CLIENT_JAR = JBossWSTestHelper.writeToFile(new JBossWSTestHelper.JarDeployment("jaxws-samples-wsse-policy-trust-client.jar") { { + archive + .addManifest() + .addAsManifestResource(new File(JBossWSTestHelper.getTestResourcesDir() + "/jaxws/samples/wsse/policy/trust/META-INF/clientKeystore.properties"), "clientKeystore.properties") + .addAsManifestResource(new File(JBossWSTestHelper.getTestResourcesDir() + "/jaxws/samples/wsse/policy/trust/META-INF/clientstore.jks"), "clientstore.jks"); + } + }); + + public static final String SERVER_ACTAS_WAR = JBossWSTestHelper.writeToFile(new JBossWSTestHelper.WarDeployment("jaxws-samples-wsse-policy-trust-actas.war") { { + archive + .setManifest(new StringAsset("Manifest-Version: 1.0\n" + + "Dependencies: org.jboss.ws.cxf.jbossws-cxf-client, org.apache.cxf.impl\n")) + .addClass(org.jboss.test.ws.jaxws.samples.wsse.policy.jaxws.SayHello.class) + .addClass(org.jboss.test.ws.jaxws.samples.wsse.policy.jaxws.SayHelloResponse.class) + .addClass(org.jboss.test.ws.jaxws.samples.wsse.policy.trust.actas.ActAsCallbackHandler.class) + .addClass(org.jboss.test.ws.jaxws.samples.wsse.policy.trust.actas.ActAsServiceIface.class) + .addClass(org.jboss.test.ws.jaxws.samples.wsse.policy.trust.actas.ActAsServiceImpl.class) + .addClass(org.jboss.test.ws.jaxws.samples.wsse.policy.trust.service.ServiceIface.class) + .addClass(org.jboss.test.ws.jaxws.samples.wsse.policy.trust.shared.WSTrustAppUtils.class) + .addAsWebInfResource(new File(JBossWSTestHelper.getTestResourcesDir() + "/jaxws/samples/wsse/policy/trust/WEB-INF/wsdl/ActAsService.wsdl"), "wsdl/ActAsService.wsdl") + .addAsWebInfResource(new File(JBossWSTestHelper.getTestResourcesDir() + "/jaxws/samples/wsse/policy/trust/WEB-INF/wsdl/ActAsService_schema1.xsd"), "wsdl/ActAsService_schema1.xsd") + .addAsWebInfResource(new File(JBossWSTestHelper.getTestResourcesDir() + "/jaxws/samples/wsse/policy/trust/WEB-INF/actasstore.jks"), "classes/actasstore.jks") + .addAsWebInfResource(new File(JBossWSTestHelper.getTestResourcesDir() + "/jaxws/samples/wsse/policy/trust/WEB-INF/actasKeystore.properties"), "classes/actasKeystore.properties") + .addAsManifestResource(new File(JBossWSTestHelper.getTestResourcesDir() + "/jaxws/samples/wsse/policy/trust/META-INF/clientstore.jks"), "clientstore.jks") + .addAsManifestResource(new File(JBossWSTestHelper.getTestResourcesDir() + "/jaxws/samples/wsse/policy/trust/META-INF/clientKeystore.properties"), "clientKeystore.properties") + .addAsManifestResource(new File(JBossWSTestHelper.getTestResourcesDir() + "/jaxws/samples/wsse/policy/trust/META-INF/permissions.xml"), "permissions.xml"); + } + }); + + public static final String SERVER_ONBEHALFOF_WAR = JBossWSTestHelper.writeToFile(new JBossWSTestHelper.WarDeployment("jaxws-samples-wsse-policy-trust-onbehalfof.war") { { + archive + .setManifest(new StringAsset("Manifest-Version: 1.0\n" + + "Dependencies: org.jboss.ws.cxf.jbossws-cxf-client, org.apache.cxf.impl\n")) + .addClass(org.jboss.test.ws.jaxws.samples.wsse.policy.jaxws.SayHello.class) + .addClass(org.jboss.test.ws.jaxws.samples.wsse.policy.jaxws.SayHelloResponse.class) + .addClass(org.jboss.test.ws.jaxws.samples.wsse.policy.trust.onbehalfof.OnBehalfOfCallbackHandler.class) + .addClass(org.jboss.test.ws.jaxws.samples.wsse.policy.trust.onbehalfof.OnBehalfOfServiceIface.class) + .addClass(org.jboss.test.ws.jaxws.samples.wsse.policy.trust.onbehalfof.OnBehalfOfServiceImpl.class) + .addClass(org.jboss.test.ws.jaxws.samples.wsse.policy.trust.service.ServiceIface.class) + .addClass(org.jboss.test.ws.jaxws.samples.wsse.policy.trust.shared.WSTrustAppUtils.class) + .addAsWebInfResource(new File(JBossWSTestHelper.getTestResourcesDir() + "/jaxws/samples/wsse/policy/trust/WEB-INF/wsdl/OnBehalfOfService.wsdl"), "wsdl/OnBehalfOfService.wsdl") + .addAsWebInfResource(new File(JBossWSTestHelper.getTestResourcesDir() + "/jaxws/samples/wsse/policy/trust/WEB-INF/wsdl/OnBehalfOfService_schema1.xsd"), "wsdl/OnBehalfOfService_schema1.xsd") + .addAsWebInfResource(new File(JBossWSTestHelper.getTestResourcesDir() + "/jaxws/samples/wsse/policy/trust/WEB-INF/actasstore.jks"), "classes/actasstore.jks") + .addAsWebInfResource(new File(JBossWSTestHelper.getTestResourcesDir() + "/jaxws/samples/wsse/policy/trust/WEB-INF/actasKeystore.properties"), "classes/actasKeystore.properties") + .addAsManifestResource(new File(JBossWSTestHelper.getTestResourcesDir() + "/jaxws/samples/wsse/policy/trust/META-INF/clientstore.jks"), "clientstore.jks") + .addAsManifestResource(new File(JBossWSTestHelper.getTestResourcesDir() + "/jaxws/samples/wsse/policy/trust/META-INF/clientKeystore.properties"), "clientKeystore.properties") + .addAsManifestResource(new File(JBossWSTestHelper.getTestResourcesDir() + "/jaxws/samples/wsse/policy/trust/META-INF/permissions.xml"), "permissions.xml"); + } + }); + + public static final String STS_HOLDEROFKEY_WAR = JBossWSTestHelper.writeToFile(new JBossWSTestHelper.WarDeployment("jaxws-samples-wsse-policy-trust-sts-holderofkey.war") { { + archive + .setManifest(new StringAsset("Manifest-Version: 1.0\n" + + "Dependencies: org.jboss.ws.cxf.jbossws-cxf-client,org.apache.cxf.impl annotations\n")) //cxf impl required to extend STS impl + .addClass(org.jboss.test.ws.jaxws.samples.wsse.policy.trust.stsholderofkey.STSHolderOfKeyCallbackHandler.class) + .addClass(org.jboss.test.ws.jaxws.samples.wsse.policy.trust.stsholderofkey.SampleSTSHolderOfKey.class) + .addAsWebInfResource(new File(JBossWSTestHelper.getTestResourcesDir() + "/jaxws/samples/wsse/policy/trust/WEB-INF/jboss-web.xml"), "jboss-web.xml") + .addAsWebInfResource(new File(JBossWSTestHelper.getTestResourcesDir() + "/jaxws/samples/wsse/policy/trust/WEB-INF/wsdl/holderofkey-ws-trust-1.4-service.wsdl"), "wsdl/holderofkey-ws-trust-1.4-service.wsdl") + .addAsWebInfResource(new File(JBossWSTestHelper.getTestResourcesDir() + "/jaxws/samples/wsse/policy/trust/WEB-INF/stsstore.jks"), "classes/stsstore.jks") + .addAsWebInfResource(new File(JBossWSTestHelper.getTestResourcesDir() + "/jaxws/samples/wsse/policy/trust/WEB-INF/stsKeystore.properties"), "classes/stsKeystore.properties") + .setWebXML(new File(JBossWSTestHelper.getTestResourcesDir() + "/jaxws/samples/wsse/policy/trust/WEB-INF/holderofkey/web.xml")); + } + }); + + public static final String SERVER_HOLDEROFKEY_WAR = JBossWSTestHelper.writeToFile(new JBossWSTestHelper.WarDeployment("jaxws-samples-wsse-policy-trust-holderofkey.war") { { + archive + .setManifest(new StringAsset("Manifest-Version: 1.0\n" + + "Dependencies: org.jboss.ws.cxf.jbossws-cxf-client\n")) + .addClass(org.jboss.test.ws.jaxws.samples.wsse.policy.jaxws.SayHello.class) + .addClass(org.jboss.test.ws.jaxws.samples.wsse.policy.jaxws.SayHelloResponse.class) + .addClass(org.jboss.test.ws.jaxws.samples.wsse.policy.trust.holderofkey.HolderOfKeyCallbackHandler.class) + .addClass(org.jboss.test.ws.jaxws.samples.wsse.policy.trust.holderofkey.HolderOfKeyIface.class) + .addClass(org.jboss.test.ws.jaxws.samples.wsse.policy.trust.holderofkey.HolderOfKeyImpl.class) + .addAsWebInfResource(new File(JBossWSTestHelper.getTestResourcesDir() + "/jaxws/samples/wsse/policy/trust/WEB-INF/wsdl/HolderOfKeyService.wsdl"), "wsdl/HolderOfKeyService.wsdl") + .addAsWebInfResource(new File(JBossWSTestHelper.getTestResourcesDir() + "/jaxws/samples/wsse/policy/trust/WEB-INF/wsdl/HolderOfKeyService_schema1.xsd"), "wsdl/HolderOfKeyService_schema1.xsd") + .addAsWebInfResource(new File(JBossWSTestHelper.getTestResourcesDir() + "/jaxws/samples/wsse/policy/trust/WEB-INF/servicestore.jks"), "classes/servicestore.jks") + .addAsWebInfResource(new File(JBossWSTestHelper.getTestResourcesDir() + "/jaxws/samples/wsse/policy/trust/WEB-INF/serviceKeystore.properties"), "classes/serviceKeystore.properties"); + } + }); + + public static final String STS_PICKETLINK_WAR = JBossWSTestHelper.writeToFile(new JBossWSTestHelper.WarDeployment("jaxws-samples-wsse-policy-trustPicketLink-sts.war") { { + archive + .setManifest(new StringAsset("Manifest-Version: 1.0\n" + + "Dependencies: org.jboss.ws.cxf.jbossws-cxf-client,org.picketlink\n")) + .addClass(org.jboss.test.ws.jaxws.samples.wsse.policy.trust.picketlink.PicketLinkSTService.class) + .addClass(org.jboss.test.ws.jaxws.samples.wsse.policy.trust.sts.STSCallbackHandler.class) + .addAsWebInfResource(new File(JBossWSTestHelper.getTestResourcesDir() + "/jaxws/samples/wsse/policy/trust/WEB-INF/jboss-web.xml"), "jboss-web.xml") + .addAsWebInfResource(new File(JBossWSTestHelper.getTestResourcesDir() + "/jaxws/samples/wsse/policy/trust/WEB-INF/wsdl/PicketLinkSTS.wsdl"), "wsdl/PicketLinkSTS.wsdl") + .addAsWebInfResource(new File(JBossWSTestHelper.getTestResourcesDir() + "/jaxws/samples/wsse/policy/trust/WEB-INF/stsstore.jks"), "classes/stsstore.jks") + .addAsWebInfResource(new File(JBossWSTestHelper.getTestResourcesDir() + "/jaxws/samples/wsse/policy/trust/WEB-INF/picketlink-sts.xml"), "classes/picketlink-sts.xml") + .addAsWebInfResource(new File(JBossWSTestHelper.getTestResourcesDir() + "/jaxws/samples/wsse/policy/trust/WEB-INF/stsKeystore.properties"), "classes/stsKeystore.properties"); + } + }); + + public static final String STS_BEARER_WAR = JBossWSTestHelper.writeToFile(new JBossWSTestHelper.WarDeployment("jaxws-samples-wsse-policy-trust-sts-bearer.war") { { + archive + .setManifest(new StringAsset("Manifest-Version: 1.0\n" + + "Dependencies: org.jboss.ws.cxf.jbossws-cxf-client,org.apache.cxf.impl annotations\n")) //cxf impl required to extend STS impl + .addClass(org.jboss.test.ws.jaxws.samples.wsse.policy.trust.stsbearer.STSBearerCallbackHandler.class) + .addClass(org.jboss.test.ws.jaxws.samples.wsse.policy.trust.stsbearer.SampleSTSBearer.class) + .addAsWebInfResource(new File(JBossWSTestHelper.getTestResourcesDir() + "/jaxws/samples/wsse/policy/trust/WEB-INF/jboss-web.xml"), "jboss-web.xml") + .addAsWebInfResource(new File(JBossWSTestHelper.getTestResourcesDir() + "/jaxws/samples/wsse/policy/trust/WEB-INF/wsdl/bearer-ws-trust-1.4-service.wsdl"), "wsdl/bearer-ws-trust-1.4-service.wsdl") + .addAsWebInfResource(new File(JBossWSTestHelper.getTestResourcesDir() + "/jaxws/samples/wsse/policy/trust/WEB-INF/stsstore.jks"), "classes/stsstore.jks") + .addAsWebInfResource(new File(JBossWSTestHelper.getTestResourcesDir() + "/jaxws/samples/wsse/policy/trust/WEB-INF/stsKeystore.properties"), "classes/stsKeystore.properties") + .setWebXML(new File(JBossWSTestHelper.getTestResourcesDir() + "/jaxws/samples/wsse/policy/trust/WEB-INF/bearer/web.xml")); + } + }); + + public static final String SERVER_BEARER_WAR = JBossWSTestHelper.writeToFile(new JBossWSTestHelper.WarDeployment("jaxws-samples-wsse-policy-trust-bearer.war") { { + archive + .setManifest(new StringAsset("Manifest-Version: 1.0\n" + + "Dependencies: org.jboss.ws.cxf.jbossws-cxf-client\n")) + .addClass(org.jboss.test.ws.jaxws.samples.wsse.policy.jaxws.SayHello.class) + .addClass(org.jboss.test.ws.jaxws.samples.wsse.policy.jaxws.SayHelloResponse.class) + .addClass(org.jboss.test.ws.jaxws.samples.wsse.policy.trust.bearer.BearerIface.class) + .addClass(org.jboss.test.ws.jaxws.samples.wsse.policy.trust.bearer.BearerImpl.class) + .addAsWebInfResource(new File(JBossWSTestHelper.getTestResourcesDir() + "/jaxws/samples/wsse/policy/trust/WEB-INF/wsdl/BearerService.wsdl"), "wsdl/BearerService.wsdl") + .addAsWebInfResource(new File(JBossWSTestHelper.getTestResourcesDir() + "/jaxws/samples/wsse/policy/trust/WEB-INF/wsdl/BearerService_schema1.xsd"), "wsdl/BearerService_schema1.xsd") + .addAsWebInfResource(new File(JBossWSTestHelper.getTestResourcesDir() + "/jaxws/samples/wsse/policy/trust/WEB-INF/servicestore.jks"), "classes/servicestore.jks") + .addAsWebInfResource(new File(JBossWSTestHelper.getTestResourcesDir() + "/jaxws/samples/wsse/policy/trust/WEB-INF/serviceKeystore.properties"), "classes/serviceKeystore.properties"); + } + }); + + private DeploymentArchives() { + //NOOP + } +} Property changes on: stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/samples/wsse/policy/trust/DeploymentArchives.java ___________________________________________________________________ Added: svn:keywords + Rev Date Added: svn:eol-style + native Modified: stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/samples/wsse/policy/trust/WSTrustActAsTestCase.java =================================================================== --- stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/samples/wsse/policy/trust/WSTrustActAsTestCase.java 2014-07-03 12:20:47 UTC (rev 18775) +++ stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/samples/wsse/policy/trust/WSTrustActAsTestCase.java 2014-07-03 15:43:16 UTC (rev 18776) @@ -46,7 +46,7 @@ { //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"); + DeploymentArchives.CLIENT_JAR + " " + DeploymentArchives.STS_WAR + " " + DeploymentArchives.SERVER_WAR + " " + DeploymentArchives.SERVER_ACTAS_WAR); } /** Modified: stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/samples/wsse/policy/trust/WSTrustHolderOfKeyTestCase.java =================================================================== --- stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/samples/wsse/policy/trust/WSTrustHolderOfKeyTestCase.java 2014-07-03 12:20:47 UTC (rev 18775) +++ stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/samples/wsse/policy/trust/WSTrustHolderOfKeyTestCase.java 2014-07-03 15:43:16 UTC (rev 18776) @@ -45,14 +45,11 @@ */ public class WSTrustHolderOfKeyTestCase extends JBossWSTest { - private final String serviceURL = "https://" + getServerHost() - + ":8443/jaxws-samples-wsse-policy-trust-holderofkey/HolderOfKeyService"; - public static Test suite() { //deploy client, STS and service; start a security domain to be used by the STS for authenticating client JBossWSCXFTestSetup testSetup = WSTrustTestUtils.getTestSetup(WSTrustHolderOfKeyTestCase.class, - "jaxws-samples-wsse-policy-trust-client.jar jaxws-samples-wsse-policy-trust-sts-holderofkey.war jaxws-samples-wsse-policy-trust-holderofkey.war"); + DeploymentArchives.CLIENT_JAR + " " + DeploymentArchives.STS_HOLDEROFKEY_WAR + " " + DeploymentArchives.SERVER_HOLDEROFKEY_WAR); // setup the https connector in the server config file. Map<String, String> sslOptions = new HashMap<String, String>(); @@ -75,7 +72,7 @@ BusFactory.setThreadDefaultBus(bus); final QName serviceName = new QName("http://www.jboss.org/jbossws/ws-extensions/holderofkeywssecur...;, "HolderOfKeyService"); - final URL wsdlURL = new URL(serviceURL + "?wsdl"); + final URL wsdlURL = new URL("https://" + getServerHost() + ":8443/jaxws-samples-wsse-policy-trust-holderofkey/HolderOfKeyService?wsdl"); Service service = Service.create(wsdlURL, serviceName); HolderOfKeyIface proxy = (HolderOfKeyIface) service.getPort(HolderOfKeyIface.class); Modified: stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/samples/wsse/policy/trust/WSTrustOnBehalfOfTestCase.java =================================================================== --- stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/samples/wsse/policy/trust/WSTrustOnBehalfOfTestCase.java 2014-07-03 12:20:47 UTC (rev 18775) +++ stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/samples/wsse/policy/trust/WSTrustOnBehalfOfTestCase.java 2014-07-03 15:43:16 UTC (rev 18776) @@ -46,7 +46,7 @@ { //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"); + DeploymentArchives.CLIENT_JAR + " " + DeploymentArchives.STS_WAR + " " + DeploymentArchives.SERVER_WAR + " " + DeploymentArchives.SERVER_ONBEHALFOF_WAR); } /** Modified: stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/samples/wsse/policy/trust/WSTrustPicketLinkTestCase.java =================================================================== --- stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/samples/wsse/policy/trust/WSTrustPicketLinkTestCase.java 2014-07-03 12:20:47 UTC (rev 18775) +++ stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/samples/wsse/policy/trust/WSTrustPicketLinkTestCase.java 2014-07-03 15:43:16 UTC (rev 18776) @@ -42,14 +42,11 @@ */ public final class WSTrustPicketLinkTestCase extends JBossWSTest { - private final String serviceURL = "http://" + getServerHost() + ":8080/jaxws-samples-wsse-policy-trust/SecurityService"; - private final String stsURL = "http://" + getServerHost() + ":8080/jaxws-samples-wsse-policy-trustPicketLink-sts/PicketLinkSTS"; - 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(WSTrustPicketLinkTestCase.class, - "jaxws-samples-wsse-policy-trust-client.jar jaxws-samples-wsse-policy-trustPicketLink-sts.war jaxws-samples-wsse-policy-trust.war"); + DeploymentArchives.CLIENT_JAR + " " + DeploymentArchives.STS_PICKETLINK_WAR + " " + DeploymentArchives.SERVER_WAR); } public void test() throws Exception @@ -60,13 +57,14 @@ BusFactory.setThreadDefaultBus(bus); final QName serviceName = new QName("http://www.jboss.org/jbossws/ws-extensions/wssecuritypolicy";, "SecurityService"); - final URL wsdlURL = new URL(serviceURL + "?wsdl"); + final URL wsdlURL = new URL("http://" + getServerHost() + ":8080/jaxws-samples-wsse-policy-trust/SecurityService?wsdl"); Service service = Service.create(wsdlURL, serviceName); ServiceIface proxy = (ServiceIface) service.getPort(ServiceIface.class); final QName stsServiceName = new QName("urn:picketlink:identity-federation:sts", "PicketLinkSTS"); final QName stsPortName = new QName("urn:picketlink:identity-federation:sts", "PicketLinkSTSPort"); - WSTrustTestUtils.setupWsseAndSTSClient(proxy, bus, stsURL + "?wsdl", stsServiceName, stsPortName); + WSTrustTestUtils.setupWsseAndSTSClient(proxy, bus, "http://" + getServerHost() + ":8080/jaxws-samples-wsse-policy-trustPicketLink-sts/PicketLinkSTS?wsdl", + stsServiceName, stsPortName); try { assertEquals("WS-Trust Hello World!", proxy.sayHello()); Modified: stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/samples/wsse/policy/trust/WSTrustTestCase.java =================================================================== --- stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/samples/wsse/policy/trust/WSTrustTestCase.java 2014-07-03 12:20:47 UTC (rev 18775) +++ stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/samples/wsse/policy/trust/WSTrustTestCase.java 2014-07-03 15:43:16 UTC (rev 18776) @@ -51,7 +51,7 @@ { //deploy client, STS and service; start a security domain to be used by the STS for authenticating client return WSTrustTestUtils.getTestSetup(WSTrustTestCase.class, - "jaxws-samples-wsse-policy-trust-client.jar jaxws-samples-wsse-policy-trust-sts.war jaxws-samples-wsse-policy-trust.war"); + DeploymentArchives.CLIENT_JAR + " " + DeploymentArchives.STS_WAR + " " + DeploymentArchives.SERVER_WAR); } /**