Author: richard.opalka(a)jboss.com Date: 2009-05-29 09:25:20 -0400 (Fri, 29 May 2009) New Revision: 10146 Added: stack/cxf/branches/jbossws-cxf-3.1.2/modules/testsuite/cxf-tests/src/test/resources/jaxws/cxf/interop/wstrust10/META-INF/scenario10/ stack/cxf/branches/jbossws-cxf-3.1.2/modules/testsuite/cxf-tests/src/test/resources/jaxws/cxf/interop/wstrust10/META-INF/scenario10/cxf.xml stack/cxf/branches/jbossws-cxf-3.1.2/modules/testsuite/cxf-tests/src/test/resources/jaxws/cxf/interop/wstrust10/META-INF/scenario2/ stack/cxf/branches/jbossws-cxf-3.1.2/modules/testsuite/cxf-tests/src/test/resources/jaxws/cxf/interop/wstrust10/META-INF/scenario2/cxf.xml stack/cxf/branches/jbossws-cxf-3.1.2/modules/testsuite/cxf-tests/src/test/resources/jaxws/cxf/interop/wstrust10/META-INF/scenario5/ stack/cxf/branches/jbossws-cxf-3.1.2/modules/testsuite/cxf-tests/src/test/resources/jaxws/cxf/interop/wstrust10/META-INF/scenario5/cxf.xml stack/cxf/branches/jbossws-cxf-3.1.2/modules/testsuite/cxf-tests/src/test/resources/jaxws/cxf/interop/wstrust10/META-INF/scenario6/ stack/cxf/branches/jbossws-cxf-3.1.2/modules/testsuite/cxf-tests/src/test/resources/jaxws/cxf/interop/wstrust10/META-INF/scenario6/cxf.xml stack/cxf/branches/jbossws-cxf-3.1.2/modules/testsuite/cxf-tests/src/test/resources/jaxws/cxf/interop/wstrust10/META-INF/scenario9/ stack/cxf/branches/jbossws-cxf-3.1.2/modules/testsuite/cxf-tests/src/test/resources/jaxws/cxf/interop/wstrust10/META-INF/scenario9/cxf.xml Removed: stack/cxf/branches/jbossws-cxf-3.1.2/modules/testsuite/cxf-tests/src/test/resources/jaxws/cxf/interop/wstrust10/META-INF/scenario10-client-config.xml stack/cxf/branches/jbossws-cxf-3.1.2/modules/testsuite/cxf-tests/src/test/resources/jaxws/cxf/interop/wstrust10/META-INF/scenario2-client-config.xml stack/cxf/branches/jbossws-cxf-3.1.2/modules/testsuite/cxf-tests/src/test/resources/jaxws/cxf/interop/wstrust10/META-INF/scenario5-client-config.xml stack/cxf/branches/jbossws-cxf-3.1.2/modules/testsuite/cxf-tests/src/test/resources/jaxws/cxf/interop/wstrust10/META-INF/scenario6-client-config.xml stack/cxf/branches/jbossws-cxf-3.1.2/modules/testsuite/cxf-tests/src/test/resources/jaxws/cxf/interop/wstrust10/META-INF/scenario9-client-config.xml Modified: stack/cxf/branches/jbossws-cxf-3.1.2/modules/testsuite/cxf-tests/scripts/cxf-jars-jaxws.xml stack/cxf/branches/jbossws-cxf-3.1.2/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/cxf/interop/wstrust10/AsymmetricBindingClientTestCase.java stack/cxf/branches/jbossws-cxf-3.1.2/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/cxf/interop/wstrust10/SymmetricBindingClientTestCase.java Log: [JBWS-2661] fixing wstrust interop - could you Alessio have a look why exception is thrown? Feel free to rollback this commit Modified: stack/cxf/branches/jbossws-cxf-3.1.2/modules/testsuite/cxf-tests/scripts/cxf-jars-jaxws.xml =================================================================== --- stack/cxf/branches/jbossws-cxf-3.1.2/modules/testsuite/cxf-tests/scripts/cxf-jars-jaxws.xml 2009-05-29 13:21:21 UTC (rev 10145) +++ stack/cxf/branches/jbossws-cxf-3.1.2/modules/testsuite/cxf-tests/scripts/cxf-jars-jaxws.xml 2009-05-29 13:25:20 UTC (rev 10146) @@ -33,12 +33,51 @@ </war> <!-- jaxws-cxf-interop-wstrust10-client --> - <jar destfile="${tests.output.dir}/test-libs/jaxws-cxf-interop-wstrust10-client.jar"> + <jar destfile="${tests.output.dir}/test-libs/jaxws-cxf-interop-wstrust10-scenario2-client.jar"> <metainf dir="${tests.output.dir}/test-resources/jaxws/cxf/interop/wstrust10/META-INF"> <include name="**/*" /> </metainf> + <metainf dir="${tests.output.dir}/test-resources/jaxws/cxf/interop/wstrust10/META-INF/scenario2"> + <include name="cxf.xml" /> + </metainf> </jar> + <jar destfile="${tests.output.dir}/test-libs/jaxws-cxf-interop-wstrust10-scenario5-client.jar"> + <metainf dir="${tests.output.dir}/test-resources/jaxws/cxf/interop/wstrust10/META-INF"> + <include name="**/*" /> + </metainf> + <metainf dir="${tests.output.dir}/test-resources/jaxws/cxf/interop/wstrust10/META-INF/scenario5"> + <include name="cxf.xml" /> + </metainf> + </jar> + + <jar destfile="${tests.output.dir}/test-libs/jaxws-cxf-interop-wstrust10-scenario6-client.jar"> + <metainf dir="${tests.output.dir}/test-resources/jaxws/cxf/interop/wstrust10/META-INF"> + <include name="**/*" /> + </metainf> + <metainf dir="${tests.output.dir}/test-resources/jaxws/cxf/interop/wstrust10/META-INF/scenario6"> + <include name="cxf.xml" /> + </metainf> + </jar> + + <jar destfile="${tests.output.dir}/test-libs/jaxws-cxf-interop-wstrust10-scenario9-client.jar"> + <metainf dir="${tests.output.dir}/test-resources/jaxws/cxf/interop/wstrust10/META-INF"> + <include name="**/*" /> + </metainf> + <metainf dir="${tests.output.dir}/test-resources/jaxws/cxf/interop/wstrust10/META-INF/scenario9"> + <include name="cxf.xml" /> + </metainf> + </jar> + + <jar destfile="${tests.output.dir}/test-libs/jaxws-cxf-interop-wstrust10-scenario10-client.jar"> + <metainf dir="${tests.output.dir}/test-resources/jaxws/cxf/interop/wstrust10/META-INF"> + <include name="**/*" /> + </metainf> + <metainf dir="${tests.output.dir}/test-resources/jaxws/cxf/interop/wstrust10/META-INF/scenario10"> + <include name="cxf.xml" /> + </metainf> + </jar> + <!-- jaxws-cxf-wsrm-basic-doc --> <war warfile="${tests.output.dir}/test-libs/jaxws-cxf-wsrm-basic-doc.war" webxml="${tests.output.dir}/test-resources/jaxws/cxf/wsrm/basic-doc/WEB-INF/web.xml"> <classes dir="${tests.output.dir}/test-classes"> Modified: stack/cxf/branches/jbossws-cxf-3.1.2/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/cxf/interop/wstrust10/AsymmetricBindingClientTestCase.java =================================================================== --- stack/cxf/branches/jbossws-cxf-3.1.2/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/cxf/interop/wstrust10/AsymmetricBindingClientTestCase.java 2009-05-29 13:21:21 UTC (rev 10145) +++ stack/cxf/branches/jbossws-cxf-3.1.2/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/cxf/interop/wstrust10/AsymmetricBindingClientTestCase.java 2009-05-29 13:25:20 UTC (rev 10146) @@ -29,9 +29,6 @@ import junit.framework.Test; -import org.apache.cxf.Bus; -import org.apache.cxf.BusFactory; -import org.apache.cxf.bus.spring.SpringBusFactory; import org.jboss.test.ws.jaxws.cxf.interop.wstrust10.interopbaseaddress.interop.IPingService; import org.jboss.wsf.test.JBossWSTest; import org.jboss.wsf.test.JBossWSTestSetup; @@ -47,66 +44,59 @@ */ public class AsymmetricBindingClientTestCase extends JBossWSTest { - private Bus bus; - public static Test suite() { - return new JBossWSTestSetup(AsymmetricBindingClientTestCase.class, "jaxws-cxf-interop-wstrust10-client.jar"); + return new JBossWSTestSetup(AsymmetricBindingClientTestCase.class, ""); } public void testScenario9() throws Exception { - this.loadBus("scenario9"); - QName serviceName = new QName("http://tempuri.org/";, "AsymmetricFederatedService"); - Service service = Service.create(getServiceURL(), serviceName); - QName portName = new QName("http://tempuri.org/";, "Scenario_9_IssuedTokenForCertificate_MutualCertificate11"); - IPingService proxy = service.getPort(portName, IPingService.class); + this.deploy("jaxws-cxf-interop-wstrust10-scenario9-client.jar"); try { - assertEquals("Hi!", proxy.echo("Hi!")); + QName serviceName = new QName("http://tempuri.org/";, "AsymmetricFederatedService"); + Service service = Service.create(getServiceURL(), serviceName); + QName portName = new QName("http://tempuri.org/";, "Scenario_9_IssuedTokenForCertificate_MutualCertificate11"); + IPingService proxy = service.getPort(portName, IPingService.class); + try + { + assertEquals("Hi!", proxy.echo("Hi!")); + } + catch (SOAPFaultException e) + { + throw new Exception("Please check that the Bouncy Castle provider is installed.", e); + } } - catch (SOAPFaultException e) + finally { - throw new Exception("Please check that the Bouncy Castle provider is installed.", e); + this.undeploy("jaxws-cxf-interop-wstrust10-scenario9-client.jar"); } } public void testScenario10() throws Exception { - this.loadBus("scenario10"); - QName serviceName = new QName("http://tempuri.org/";, "AsymmetricFederatedService"); - Service service = Service.create(getServiceURL(), serviceName); - QName portName = new QName("http://tempuri.org/";, "Scenario_10_IssuedTokenForCertificateSecureConversation_MutualCertificate11"); - IPingService proxy = service.getPort(portName, IPingService.class); + this.deploy("jaxws-cxf-interop-wstrust10-scenario10-client.jar"); try { - assertEquals("Hi!", proxy.echo("Hi!")); + QName serviceName = new QName("http://tempuri.org/";, "AsymmetricFederatedService"); + Service service = Service.create(getServiceURL(), serviceName); + QName portName = new QName("http://tempuri.org/";, "Scenario_10_IssuedTokenForCertificateSecureConversation_MutualCertificate11"); + IPingService proxy = service.getPort(portName, IPingService.class); + try + { + assertEquals("Hi!", proxy.echo("Hi!")); + } + catch (SOAPFaultException e) + { + throw new Exception("Please check that the Bouncy Castle provider is installed.", e); + } } - catch (SOAPFaultException e) + finally { - throw new Exception("Please check that the Bouncy Castle provider is installed.", e); + this.undeploy("jaxws-cxf-interop-wstrust10-scenario10-client.jar"); } } - private void loadBus(String scenario) throws Exception - { - System.out.println("Loading bus for " + scenario + "..."); - SpringBusFactory busFactory = new SpringBusFactory(); - URL cxfConfig = getResourceURL("jaxws/cxf/interop/wstrust10/META-INF/" + scenario + "-client-config.xml"); - bus = busFactory.createBus(cxfConfig); - BusFactory.setDefaultBus(bus); - } - - @Override - protected void tearDown() throws Exception - { - System.out.println("... bus teardown"); - if (bus != null) - bus.shutdown(true); - - super.tearDown(); - } - private URL getServiceURL() throws Exception { return getResourceURL("jaxws/cxf/interop/wstrust10/META-INF/wsdl/WsTrustAsym.wsdl"); Modified: stack/cxf/branches/jbossws-cxf-3.1.2/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/cxf/interop/wstrust10/SymmetricBindingClientTestCase.java =================================================================== --- stack/cxf/branches/jbossws-cxf-3.1.2/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/cxf/interop/wstrust10/SymmetricBindingClientTestCase.java 2009-05-29 13:21:21 UTC (rev 10145) +++ stack/cxf/branches/jbossws-cxf-3.1.2/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/cxf/interop/wstrust10/SymmetricBindingClientTestCase.java 2009-05-29 13:25:20 UTC (rev 10146) @@ -29,9 +29,6 @@ import junit.framework.Test; -import org.apache.cxf.Bus; -import org.apache.cxf.BusFactory; -import org.apache.cxf.bus.spring.SpringBusFactory; import org.jboss.test.ws.jaxws.cxf.interop.wstrust10.interopbaseaddress.interop.IPingService; import org.jboss.wsf.test.JBossWSTest; import org.jboss.wsf.test.JBossWSTestSetup; @@ -46,85 +43,86 @@ */ public class SymmetricBindingClientTestCase extends JBossWSTest { - private Bus bus; - public static Test suite() { - return new JBossWSTestSetup(SymmetricBindingClientTestCase.class, "jaxws-cxf-interop-wstrust10-client.jar"); + return new JBossWSTestSetup(SymmetricBindingClientTestCase.class, ""); } public void testScenario2() throws Exception { - this.loadBus("scenario2"); - QName serviceName = new QName("http://tempuri.org/";, "SymmetricFederatedService"); - Service service = Service.create(getServiceURL(), serviceName); - QName portName = new QName("http://tempuri.org/";, "Scenario_2_IssuedToken_MutualCertificate10"); - IPingService proxy = service.getPort(portName, IPingService.class); + this.deploy("jaxws-cxf-interop-wstrust10-scenario2-client.jar"); try { - assertEquals("Hi!", proxy.echo("Hi!")); + QName serviceName = new QName("http://tempuri.org/";, "SymmetricFederatedService"); + Service service = Service.create(getServiceURL(), serviceName); + QName portName = new QName("http://tempuri.org/";, "Scenario_2_IssuedToken_MutualCertificate10"); + IPingService proxy = service.getPort(portName, IPingService.class); + try + { + assertEquals("Hi!", proxy.echo("Hi!")); + } + catch (SOAPFaultException e) + { + throw new Exception("Please check that the Bouncy Castle provider is installed.", e); + } } - catch (SOAPFaultException e) + finally { - throw new Exception("Please check that the Bouncy Castle provider is installed.", e); + this.undeploy("jaxws-cxf-interop-wstrust10-scenario2-client.jar"); } } public void testScenario5() throws Exception { - this.loadBus("scenario5"); - QName serviceName = new QName("http://tempuri.org/";, "SymmetricFederatedService"); - Service service = Service.create(getServiceURL(), serviceName); - QName portName = new QName("http://tempuri.org/";, "Scenario_5_IssuedTokenForCertificate_MutualCertificate11"); - IPingService proxy = service.getPort(portName, IPingService.class); + this.deploy("jaxws-cxf-interop-wstrust10-scenario5-client.jar"); try { - assertEquals("Hi!", proxy.echo("Hi!")); + QName serviceName = new QName("http://tempuri.org/";, "SymmetricFederatedService"); + Service service = Service.create(getServiceURL(), serviceName); + QName portName = new QName("http://tempuri.org/";, "Scenario_5_IssuedTokenForCertificate_MutualCertificate11"); + IPingService proxy = service.getPort(portName, IPingService.class); + try + { + assertEquals("Hi!", proxy.echo("Hi!")); + } + catch (SOAPFaultException e) + { + throw new Exception("Please check that the Bouncy Castle provider is installed.", e); + } } - catch (SOAPFaultException e) + finally { - throw new Exception("Please check that the Bouncy Castle provider is installed.", e); + this.undeploy("jaxws-cxf-interop-wstrust10-scenario5-client.jar"); } } public void testScenario6() throws Exception { - this.loadBus("scenario6"); - QName serviceName = new QName("http://tempuri.org/";, "SymmetricFederatedService"); - Service service = Service.create(getServiceURL(), serviceName); - QName portName = new QName("http://tempuri.org/";, "Scenario_6_IssuedTokenForCertificateSecureConversation_MutualCertificate11"); - IPingService proxy = service.getPort(portName, IPingService.class); + this.deploy("jaxws-cxf-interop-wstrust10-scenario6-client.jar"); try { - assertEquals("Hi!", proxy.echo("Hi!")); + QName serviceName = new QName("http://tempuri.org/";, "SymmetricFederatedService"); + Service service = Service.create(getServiceURL(), serviceName); + QName portName = new QName("http://tempuri.org/";, "Scenario_6_IssuedTokenForCertificateSecureConversation_MutualCertificate11"); + IPingService proxy = service.getPort(portName, IPingService.class); + try + { + assertEquals("Hi!", proxy.echo("Hi!")); + } + catch (SOAPFaultException e) + { + throw new Exception("Please check that the Bouncy Castle provider is installed.", e); + } } - catch (SOAPFaultException e) + finally { - throw new Exception("Please check that the Bouncy Castle provider is installed.", e); + this.undeploy("jaxws-cxf-interop-wstrust10-scenario6-client.jar"); } } - private void loadBus(String scenario) throws Exception - { - System.out.println("Loading bus for " + scenario + "..."); - SpringBusFactory busFactory = new SpringBusFactory(); - URL cxfConfig = getResourceURL("jaxws/cxf/interop/wstrust10/META-INF/" + scenario + "-client-config.xml"); - bus = busFactory.createBus(cxfConfig); - BusFactory.setDefaultBus(bus); - } - - @Override - protected void tearDown() throws Exception - { - System.out.println("... bus teardown"); - if (bus != null) - bus.shutdown(true); - - super.tearDown(); - } - private URL getServiceURL() throws Exception { return getResourceURL("jaxws/cxf/interop/wstrust10/META-INF/wsdl/WsTrustSym.wsdl"); } + } Added: stack/cxf/branches/jbossws-cxf-3.1.2/modules/testsuite/cxf-tests/src/test/resources/jaxws/cxf/interop/wstrust10/META-INF/scenario10/cxf.xml =================================================================== --- stack/cxf/branches/jbossws-cxf-3.1.2/modules/testsuite/cxf-tests/src/test/resources/jaxws/cxf/interop/wstrust10/META-INF/scenario10/cxf.xml (rev 0) +++ stack/cxf/branches/jbossws-cxf-3.1.2/modules/testsuite/cxf-tests/src/test/resources/jaxws/cxf/interop/wstrust10/META-INF/scenario10/cxf.xml 2009-05-29 13:25:20 UTC (rev 10146) @@ -0,0 +1,64 @@ +<?xml version="1.0" encoding="UTF-8"?> +<!-- + 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. +--> +<beans xmlns="http://www.springframework.org/schema/beans" + xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" + xmlns:http="http://cxf.apache.org/transports/http/configuration" + xmlns:jaxws="http://cxf.apache.org/jaxws" + xmlns:cxf="http://cxf.apache.org/core" + xmlns:p="http://cxf.apache.org/policy" + xmlns:sec="http://cxf.apache.org/configuration/security" + xsi:schemaLocation=" + http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans.xsd + http://cxf.apache.org/jaxws http://cxf.apache.org/schemas/jaxws.xsd + http://cxf.apache.org/transports/http/configuration http://cxf.apache.org/schemas/configuration/http-conf.xsd + http://cxf.apache.org/configuration/security http://cxf.apache.org/schemas/configuration/security.xsd + http://cxf.apache.org/core http://cxf.apache.org/schemas/core.xsd + http://cxf.apache.org/policy http://cxf.apache.org/schemas/policy.xsd" +> + <cxf:bus> + <cxf:features> + <p:policies/> + <cxf:logging/> + </cxf:features> + </cxf:bus> + + <!-- Scenario 10 --> + <bean name="{http://tempuri.org/}Scenario_10_IssuedTokenForCertificateSecu... + class="org.apache.cxf.ws.security.trust.STSClient" abstract="true"> + <property name="wsdlLocation" value="META-INF/wsdl/STSAsym.wsdl"/> + <property name="serviceName" value="{http://tempuri.org/}SecurityTokenService"/> + <property name="endpointName" value="{http://tempuri.org/}WSHttpBinding_ISecurityTokenService3&quo... + <property name="properties"> + <map> + <entry key="ws-security.callback-handler" value="org.jboss.test.ws.jaxws.cxf.interop.wstrust10.KeystorePasswordCallback"/> + <entry key="ws-security.signature.properties" value="META-INF/etc/wssip.properties"/> + <entry key="ws-security.encryption.properties" value="META-INF/etc/wssip.properties"/> + <entry key="ws-security.sts.token.properties" value="META-INF/etc/wssip.properties"/> + <entry key="ws-security.sts.token.properties.decrypt" value="META-INF/etc/bob.properties"/> + </map> + </property> + </bean> + <jaxws:client name="{http://tempuri.org/}Scenario_10_IssuedTokenForCertificateSecu... createdFromAPI="true"> + <jaxws:properties> + <entry key="ws-security.callback-handler.sct" value="org.jboss.test.ws.jaxws.cxf.interop.wstrust10.KeystorePasswordCallback"/> + <entry key="ws-security.encryption.properties.sct" value="META-INF/etc/bob.properties"/> + </jaxws:properties> + </jaxws:client> +</beans> Deleted: stack/cxf/branches/jbossws-cxf-3.1.2/modules/testsuite/cxf-tests/src/test/resources/jaxws/cxf/interop/wstrust10/META-INF/scenario10-client-config.xml =================================================================== --- stack/cxf/branches/jbossws-cxf-3.1.2/modules/testsuite/cxf-tests/src/test/resources/jaxws/cxf/interop/wstrust10/META-INF/scenario10-client-config.xml 2009-05-29 13:21:21 UTC (rev 10145) +++ stack/cxf/branches/jbossws-cxf-3.1.2/modules/testsuite/cxf-tests/src/test/resources/jaxws/cxf/interop/wstrust10/META-INF/scenario10-client-config.xml 2009-05-29 13:25:20 UTC (rev 10146) @@ -1,64 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<!-- - 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. ---> -<beans xmlns="http://www.springframework.org/schema/beans" - xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" - xmlns:http="http://cxf.apache.org/transports/http/configuration" - xmlns:jaxws="http://cxf.apache.org/jaxws" - xmlns:cxf="http://cxf.apache.org/core" - xmlns:p="http://cxf.apache.org/policy" - xmlns:sec="http://cxf.apache.org/configuration/security" - xsi:schemaLocation=" - http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans.xsd - http://cxf.apache.org/jaxws http://cxf.apache.org/schemas/jaxws.xsd - http://cxf.apache.org/transports/http/configuration http://cxf.apache.org/schemas/configuration/http-conf.xsd - http://cxf.apache.org/configuration/security http://cxf.apache.org/schemas/configuration/security.xsd - http://cxf.apache.org/core http://cxf.apache.org/schemas/core.xsd - http://cxf.apache.org/policy http://cxf.apache.org/schemas/policy.xsd" -> - <cxf:bus> - <cxf:features> - <p:policies/> - <cxf:logging/> - </cxf:features> - </cxf:bus> - - <!-- Scenario 10 --> - <bean name="{http://tempuri.org/}Scenario_10_IssuedTokenForCertificateSecu... - class="org.apache.cxf.ws.security.trust.STSClient" abstract="true"> - <property name="wsdlLocation" value="META-INF/wsdl/STSAsym.wsdl"/> - <property name="serviceName" value="{http://tempuri.org/}SecurityTokenService"/> - <property name="endpointName" value="{http://tempuri.org/}WSHttpBinding_ISecurityTokenService3&quo... - <property name="properties"> - <map> - <entry key="ws-security.callback-handler" value="org.jboss.test.ws.jaxws.cxf.interop.wstrust10.KeystorePasswordCallback"/> - <entry key="ws-security.signature.properties" value="META-INF/etc/wssip.properties"/> - <entry key="ws-security.encryption.properties" value="META-INF/etc/wssip.properties"/> - <entry key="ws-security.sts.token.properties" value="META-INF/etc/wssip.properties"/> - <entry key="ws-security.sts.token.properties.decrypt" value="META-INF/etc/bob.properties"/> - </map> - </property> - </bean> - <jaxws:client name="{http://tempuri.org/}Scenario_10_IssuedTokenForCertificateSecu... createdFromAPI="true"> - <jaxws:properties> - <entry key="ws-security.callback-handler.sct" value="org.jboss.test.ws.jaxws.cxf.interop.wstrust10.KeystorePasswordCallback"/> - <entry key="ws-security.encryption.properties.sct" value="META-INF/etc/bob.properties"/> - </jaxws:properties> - </jaxws:client> -</beans> Added: stack/cxf/branches/jbossws-cxf-3.1.2/modules/testsuite/cxf-tests/src/test/resources/jaxws/cxf/interop/wstrust10/META-INF/scenario2/cxf.xml =================================================================== --- stack/cxf/branches/jbossws-cxf-3.1.2/modules/testsuite/cxf-tests/src/test/resources/jaxws/cxf/interop/wstrust10/META-INF/scenario2/cxf.xml (rev 0) +++ stack/cxf/branches/jbossws-cxf-3.1.2/modules/testsuite/cxf-tests/src/test/resources/jaxws/cxf/interop/wstrust10/META-INF/scenario2/cxf.xml 2009-05-29 13:25:20 UTC (rev 10146) @@ -0,0 +1,39 @@ +<?xml version="1.0" encoding="UTF-8"?> +<beans xmlns="http://www.springframework.org/schema/beans" + xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" + xmlns:http="http://cxf.apache.org/transports/http/configuration" + xmlns:jaxws="http://cxf.apache.org/jaxws" + xmlns:cxf="http://cxf.apache.org/core" + xmlns:p="http://cxf.apache.org/policy" + xmlns:sec="http://cxf.apache.org/configuration/security" + xsi:schemaLocation=" + http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans.xsd + http://cxf.apache.org/jaxws http://cxf.apache.org/schemas/jaxws.xsd + http://cxf.apache.org/transports/http/configuration http://cxf.apache.org/schemas/configuration/http-conf.xsd + http://cxf.apache.org/configuration/security http://cxf.apache.org/schemas/configuration/security.xsd + http://cxf.apache.org/core http://cxf.apache.org/schemas/core.xsd + http://cxf.apache.org/policy http://cxf.apache.org/schemas/policy.xsd" +> + <cxf:bus> + <cxf:features> + <p:policies/> + <cxf:logging/> + </cxf:features> + </cxf:bus> + + <!-- Scenario 2 --> + <bean name="{http://tempuri.org/}Scenario_2_IssuedToken_MutualCertificate1... + class="org.apache.cxf.ws.security.trust.STSClient" abstract="true"> + <property name="wsdlLocation" value="META-INF/wsdl/STSSym.wsdl"/> + <property name="serviceName" value="{http://tempuri.org/}SecurityTokenService"/> + <property name="endpointName" value="{http://tempuri.org/}CustomBinding_ISecurityTokenService1&quo... + <property name="properties"> + <map> + <entry key="ws-security.callback-handler" value="org.jboss.test.ws.jaxws.cxf.interop.wstrust10.KeystorePasswordCallback"/> + <entry key="ws-security.signature.properties" value="META-INF/etc/alice.properties"/> + <entry key="ws-security.encryption.properties" value="META-INF/etc/wssip.properties"/> + <entry key="ws-security.sts.token.properties" value="META-INF/etc/bob.properties"/> + </map> + </property> + </bean> +</beans> Deleted: stack/cxf/branches/jbossws-cxf-3.1.2/modules/testsuite/cxf-tests/src/test/resources/jaxws/cxf/interop/wstrust10/META-INF/scenario2-client-config.xml =================================================================== --- stack/cxf/branches/jbossws-cxf-3.1.2/modules/testsuite/cxf-tests/src/test/resources/jaxws/cxf/interop/wstrust10/META-INF/scenario2-client-config.xml 2009-05-29 13:21:21 UTC (rev 10145) +++ stack/cxf/branches/jbossws-cxf-3.1.2/modules/testsuite/cxf-tests/src/test/resources/jaxws/cxf/interop/wstrust10/META-INF/scenario2-client-config.xml 2009-05-29 13:25:20 UTC (rev 10146) @@ -1,39 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<beans xmlns="http://www.springframework.org/schema/beans" - xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" - xmlns:http="http://cxf.apache.org/transports/http/configuration" - xmlns:jaxws="http://cxf.apache.org/jaxws" - xmlns:cxf="http://cxf.apache.org/core" - xmlns:p="http://cxf.apache.org/policy" - xmlns:sec="http://cxf.apache.org/configuration/security" - xsi:schemaLocation=" - http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans.xsd - http://cxf.apache.org/jaxws http://cxf.apache.org/schemas/jaxws.xsd - http://cxf.apache.org/transports/http/configuration http://cxf.apache.org/schemas/configuration/http-conf.xsd - http://cxf.apache.org/configuration/security http://cxf.apache.org/schemas/configuration/security.xsd - http://cxf.apache.org/core http://cxf.apache.org/schemas/core.xsd - http://cxf.apache.org/policy http://cxf.apache.org/schemas/policy.xsd" -> - <cxf:bus> - <cxf:features> - <p:policies/> - <cxf:logging/> - </cxf:features> - </cxf:bus> - - <!-- Scenario 2 --> - <bean name="{http://tempuri.org/}Scenario_2_IssuedToken_MutualCertificate1... - class="org.apache.cxf.ws.security.trust.STSClient" abstract="true"> - <property name="wsdlLocation" value="META-INF/wsdl/STSSym.wsdl"/> - <property name="serviceName" value="{http://tempuri.org/}SecurityTokenService"/> - <property name="endpointName" value="{http://tempuri.org/}CustomBinding_ISecurityTokenService1&quo... - <property name="properties"> - <map> - <entry key="ws-security.callback-handler" value="org.jboss.test.ws.jaxws.cxf.interop.wstrust10.KeystorePasswordCallback"/> - <entry key="ws-security.signature.properties" value="META-INF/etc/alice.properties"/> - <entry key="ws-security.encryption.properties" value="META-INF/etc/wssip.properties"/> - <entry key="ws-security.sts.token.properties" value="META-INF/etc/bob.properties"/> - </map> - </property> - </bean> -</beans> Added: stack/cxf/branches/jbossws-cxf-3.1.2/modules/testsuite/cxf-tests/src/test/resources/jaxws/cxf/interop/wstrust10/META-INF/scenario5/cxf.xml =================================================================== --- stack/cxf/branches/jbossws-cxf-3.1.2/modules/testsuite/cxf-tests/src/test/resources/jaxws/cxf/interop/wstrust10/META-INF/scenario5/cxf.xml (rev 0) +++ stack/cxf/branches/jbossws-cxf-3.1.2/modules/testsuite/cxf-tests/src/test/resources/jaxws/cxf/interop/wstrust10/META-INF/scenario5/cxf.xml 2009-05-29 13:25:20 UTC (rev 10146) @@ -0,0 +1,63 @@ +<?xml version="1.0" encoding="UTF-8"?> +<!-- + 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. +--> +<beans xmlns="http://www.springframework.org/schema/beans" + xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" + xmlns:http="http://cxf.apache.org/transports/http/configuration" + xmlns:jaxws="http://cxf.apache.org/jaxws" + xmlns:cxf="http://cxf.apache.org/core" + xmlns:p="http://cxf.apache.org/policy" + xmlns:sec="http://cxf.apache.org/configuration/security" + xsi:schemaLocation=" + http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans.xsd + http://cxf.apache.org/jaxws http://cxf.apache.org/schemas/jaxws.xsd + http://cxf.apache.org/transports/http/configuration http://cxf.apache.org/schemas/configuration/http-conf.xsd + http://cxf.apache.org/configuration/security http://cxf.apache.org/schemas/configuration/security.xsd + http://cxf.apache.org/core http://cxf.apache.org/schemas/core.xsd + http://cxf.apache.org/policy http://cxf.apache.org/schemas/policy.xsd" +> + <cxf:bus> + <cxf:features> + <p:policies/> + <cxf:logging/> + </cxf:features> + </cxf:bus> + + <!-- Scenario 5 --> + <bean name="{http://tempuri.org/}Scenario_5_IssuedTokenForCertificate_Mutu... + class="org.apache.cxf.ws.security.trust.STSClient" abstract="true"> + <property name="wsdlLocation" value="META-INF/wsdl/STSSym.wsdl"/> + <property name="serviceName" value="{http://tempuri.org/}SecurityTokenService"/> + <property name="endpointName" value="{http://tempuri.org/}CustomBinding_ISecurityTokenService1&quo... + <property name="properties"> + <map> + <entry key="ws-security.callback-handler" value="org.jboss.test.ws.jaxws.cxf.interop.wstrust10.KeystorePasswordCallback"/> + <entry key="ws-security.signature.properties" value="META-INF/etc/alice.properties"/> + <entry key="ws-security.encryption.properties" value="META-INF/etc/wssip.properties"/> + <entry key="ws-security.sts.token.properties" value="META-INF/etc/bob.properties"/> + </map> + </property> + </bean> + <jaxws:client name="{http://tempuri.org/}Scenario_5_IssuedTokenForCertificate_Mutu... createdFromAPI="true"> + <jaxws:properties> + <entry key="ws-security.callback-handler" value="org.jboss.test.ws.jaxws.cxf.interop.wstrust10.KeystorePasswordCallback"/> + <entry key="ws-security.encryption.properties" value="META-INF/etc/bob.properties"/> + </jaxws:properties> + </jaxws:client> +</beans> Deleted: stack/cxf/branches/jbossws-cxf-3.1.2/modules/testsuite/cxf-tests/src/test/resources/jaxws/cxf/interop/wstrust10/META-INF/scenario5-client-config.xml =================================================================== --- stack/cxf/branches/jbossws-cxf-3.1.2/modules/testsuite/cxf-tests/src/test/resources/jaxws/cxf/interop/wstrust10/META-INF/scenario5-client-config.xml 2009-05-29 13:21:21 UTC (rev 10145) +++ stack/cxf/branches/jbossws-cxf-3.1.2/modules/testsuite/cxf-tests/src/test/resources/jaxws/cxf/interop/wstrust10/META-INF/scenario5-client-config.xml 2009-05-29 13:25:20 UTC (rev 10146) @@ -1,63 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<!-- - 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. ---> -<beans xmlns="http://www.springframework.org/schema/beans" - xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" - xmlns:http="http://cxf.apache.org/transports/http/configuration" - xmlns:jaxws="http://cxf.apache.org/jaxws" - xmlns:cxf="http://cxf.apache.org/core" - xmlns:p="http://cxf.apache.org/policy" - xmlns:sec="http://cxf.apache.org/configuration/security" - xsi:schemaLocation=" - http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans.xsd - http://cxf.apache.org/jaxws http://cxf.apache.org/schemas/jaxws.xsd - http://cxf.apache.org/transports/http/configuration http://cxf.apache.org/schemas/configuration/http-conf.xsd - http://cxf.apache.org/configuration/security http://cxf.apache.org/schemas/configuration/security.xsd - http://cxf.apache.org/core http://cxf.apache.org/schemas/core.xsd - http://cxf.apache.org/policy http://cxf.apache.org/schemas/policy.xsd" -> - <cxf:bus> - <cxf:features> - <p:policies/> - <cxf:logging/> - </cxf:features> - </cxf:bus> - - <!-- Scenario 5 --> - <bean name="{http://tempuri.org/}Scenario_5_IssuedTokenForCertificate_Mutu... - class="org.apache.cxf.ws.security.trust.STSClient" abstract="true"> - <property name="wsdlLocation" value="META-INF/wsdl/STSSym.wsdl"/> - <property name="serviceName" value="{http://tempuri.org/}SecurityTokenService"/> - <property name="endpointName" value="{http://tempuri.org/}CustomBinding_ISecurityTokenService1&quo... - <property name="properties"> - <map> - <entry key="ws-security.callback-handler" value="org.jboss.test.ws.jaxws.cxf.interop.wstrust10.KeystorePasswordCallback"/> - <entry key="ws-security.signature.properties" value="META-INF/etc/alice.properties"/> - <entry key="ws-security.encryption.properties" value="META-INF/etc/wssip.properties"/> - <entry key="ws-security.sts.token.properties" value="META-INF/etc/bob.properties"/> - </map> - </property> - </bean> - <jaxws:client name="{http://tempuri.org/}Scenario_5_IssuedTokenForCertificate_Mutu... createdFromAPI="true"> - <jaxws:properties> - <entry key="ws-security.callback-handler" value="org.jboss.test.ws.jaxws.cxf.interop.wstrust10.KeystorePasswordCallback"/> - <entry key="ws-security.encryption.properties" value="META-INF/etc/bob.properties"/> - </jaxws:properties> - </jaxws:client> -</beans> Added: stack/cxf/branches/jbossws-cxf-3.1.2/modules/testsuite/cxf-tests/src/test/resources/jaxws/cxf/interop/wstrust10/META-INF/scenario6/cxf.xml =================================================================== --- stack/cxf/branches/jbossws-cxf-3.1.2/modules/testsuite/cxf-tests/src/test/resources/jaxws/cxf/interop/wstrust10/META-INF/scenario6/cxf.xml (rev 0) +++ stack/cxf/branches/jbossws-cxf-3.1.2/modules/testsuite/cxf-tests/src/test/resources/jaxws/cxf/interop/wstrust10/META-INF/scenario6/cxf.xml 2009-05-29 13:25:20 UTC (rev 10146) @@ -0,0 +1,63 @@ +<?xml version="1.0" encoding="UTF-8"?> +<!-- + 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. +--> +<beans xmlns="http://www.springframework.org/schema/beans" + xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" + xmlns:http="http://cxf.apache.org/transports/http/configuration" + xmlns:jaxws="http://cxf.apache.org/jaxws" + xmlns:cxf="http://cxf.apache.org/core" + xmlns:p="http://cxf.apache.org/policy" + xmlns:sec="http://cxf.apache.org/configuration/security" + xsi:schemaLocation=" + http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans.xsd + http://cxf.apache.org/jaxws http://cxf.apache.org/schemas/jaxws.xsd + http://cxf.apache.org/transports/http/configuration http://cxf.apache.org/schemas/configuration/http-conf.xsd + http://cxf.apache.org/configuration/security http://cxf.apache.org/schemas/configuration/security.xsd + http://cxf.apache.org/core http://cxf.apache.org/schemas/core.xsd + http://cxf.apache.org/policy http://cxf.apache.org/schemas/policy.xsd" +> + <cxf:bus> + <cxf:features> + <p:policies/> + <cxf:logging/> + </cxf:features> + </cxf:bus> + + <!-- Scenario 6 --> + <bean name="{http://tempuri.org/}Scenario_6_IssuedTokenForCertificateSecur... + class="org.apache.cxf.ws.security.trust.STSClient" abstract="true"> + <property name="wsdlLocation" value="META-INF/wsdl/STSSym.wsdl"/> + <property name="serviceName" value="{http://tempuri.org/}SecurityTokenService"/> + <property name="endpointName" value="{http://tempuri.org/}CustomBinding_ISecurityTokenService1&quo... + <property name="properties"> + <map> + <entry key="ws-security.callback-handler" value="org.jboss.test.ws.jaxws.cxf.interop.wstrust10.KeystorePasswordCallback"/> + <entry key="ws-security.signature.properties" value="META-INF/etc/alice.properties"/> + <entry key="ws-security.encryption.properties" value="META-INF/etc/wssip.properties"/> + <entry key="ws-security.sts.token.properties" value="META-INF/etc/bob.properties"/> + </map> + </property> + </bean> + <jaxws:client name="{http://tempuri.org/}Scenario_6_IssuedTokenForCertificateSecur... createdFromAPI="true"> + <jaxws:properties> + <entry key="ws-security.callback-handler.sct" value="org.jboss.test.ws.jaxws.cxf.interop.wstrust10.KeystorePasswordCallback"/> + <entry key="ws-security.encryption.properties.sct" value="META-INF/etc/bob.properties"/> + </jaxws:properties> + </jaxws:client> +</beans> Deleted: stack/cxf/branches/jbossws-cxf-3.1.2/modules/testsuite/cxf-tests/src/test/resources/jaxws/cxf/interop/wstrust10/META-INF/scenario6-client-config.xml =================================================================== --- stack/cxf/branches/jbossws-cxf-3.1.2/modules/testsuite/cxf-tests/src/test/resources/jaxws/cxf/interop/wstrust10/META-INF/scenario6-client-config.xml 2009-05-29 13:21:21 UTC (rev 10145) +++ stack/cxf/branches/jbossws-cxf-3.1.2/modules/testsuite/cxf-tests/src/test/resources/jaxws/cxf/interop/wstrust10/META-INF/scenario6-client-config.xml 2009-05-29 13:25:20 UTC (rev 10146) @@ -1,63 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<!-- - 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. ---> -<beans xmlns="http://www.springframework.org/schema/beans" - xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" - xmlns:http="http://cxf.apache.org/transports/http/configuration" - xmlns:jaxws="http://cxf.apache.org/jaxws" - xmlns:cxf="http://cxf.apache.org/core" - xmlns:p="http://cxf.apache.org/policy" - xmlns:sec="http://cxf.apache.org/configuration/security" - xsi:schemaLocation=" - http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans.xsd - http://cxf.apache.org/jaxws http://cxf.apache.org/schemas/jaxws.xsd - http://cxf.apache.org/transports/http/configuration http://cxf.apache.org/schemas/configuration/http-conf.xsd - http://cxf.apache.org/configuration/security http://cxf.apache.org/schemas/configuration/security.xsd - http://cxf.apache.org/core http://cxf.apache.org/schemas/core.xsd - http://cxf.apache.org/policy http://cxf.apache.org/schemas/policy.xsd" -> - <cxf:bus> - <cxf:features> - <p:policies/> - <cxf:logging/> - </cxf:features> - </cxf:bus> - - <!-- Scenario 6 --> - <bean name="{http://tempuri.org/}Scenario_6_IssuedTokenForCertificateSecur... - class="org.apache.cxf.ws.security.trust.STSClient" abstract="true"> - <property name="wsdlLocation" value="META-INF/wsdl/STSSym.wsdl"/> - <property name="serviceName" value="{http://tempuri.org/}SecurityTokenService"/> - <property name="endpointName" value="{http://tempuri.org/}CustomBinding_ISecurityTokenService1&quo... - <property name="properties"> - <map> - <entry key="ws-security.callback-handler" value="org.jboss.test.ws.jaxws.cxf.interop.wstrust10.KeystorePasswordCallback"/> - <entry key="ws-security.signature.properties" value="META-INF/etc/alice.properties"/> - <entry key="ws-security.encryption.properties" value="META-INF/etc/wssip.properties"/> - <entry key="ws-security.sts.token.properties" value="META-INF/etc/bob.properties"/> - </map> - </property> - </bean> - <jaxws:client name="{http://tempuri.org/}Scenario_6_IssuedTokenForCertificateSecur... createdFromAPI="true"> - <jaxws:properties> - <entry key="ws-security.callback-handler.sct" value="org.jboss.test.ws.jaxws.cxf.interop.wstrust10.KeystorePasswordCallback"/> - <entry key="ws-security.encryption.properties.sct" value="META-INF/etc/bob.properties"/> - </jaxws:properties> - </jaxws:client> -</beans> Added: stack/cxf/branches/jbossws-cxf-3.1.2/modules/testsuite/cxf-tests/src/test/resources/jaxws/cxf/interop/wstrust10/META-INF/scenario9/cxf.xml =================================================================== --- stack/cxf/branches/jbossws-cxf-3.1.2/modules/testsuite/cxf-tests/src/test/resources/jaxws/cxf/interop/wstrust10/META-INF/scenario9/cxf.xml (rev 0) +++ stack/cxf/branches/jbossws-cxf-3.1.2/modules/testsuite/cxf-tests/src/test/resources/jaxws/cxf/interop/wstrust10/META-INF/scenario9/cxf.xml 2009-05-29 13:25:20 UTC (rev 10146) @@ -0,0 +1,64 @@ +<?xml version="1.0" encoding="UTF-8"?> +<!-- + 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. +--> +<beans xmlns="http://www.springframework.org/schema/beans" + xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" + xmlns:http="http://cxf.apache.org/transports/http/configuration" + xmlns:jaxws="http://cxf.apache.org/jaxws" + xmlns:cxf="http://cxf.apache.org/core" + xmlns:p="http://cxf.apache.org/policy" + xmlns:sec="http://cxf.apache.org/configuration/security" + xsi:schemaLocation=" + http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans.xsd + http://cxf.apache.org/jaxws http://cxf.apache.org/schemas/jaxws.xsd + http://cxf.apache.org/transports/http/configuration http://cxf.apache.org/schemas/configuration/http-conf.xsd + http://cxf.apache.org/configuration/security http://cxf.apache.org/schemas/configuration/security.xsd + http://cxf.apache.org/core http://cxf.apache.org/schemas/core.xsd + http://cxf.apache.org/policy http://cxf.apache.org/schemas/policy.xsd" +> + <cxf:bus> + <cxf:features> + <p:policies/> + <cxf:logging/> + </cxf:features> + </cxf:bus> + + <!-- Scenario 9 --> + <bean name="{http://tempuri.org/}Scenario_9_IssuedTokenForCertificate_Mutu... + class="org.apache.cxf.ws.security.trust.STSClient" abstract="true"> + <property name="wsdlLocation" value="META-INF/wsdl/STSAsym.wsdl"/> + <property name="serviceName" value="{http://tempuri.org/}SecurityTokenService"/> + <property name="endpointName" value="{http://tempuri.org/}WSHttpBinding_ISecurityTokenService2&quo... + <property name="properties"> + <map> + <entry key="ws-security.callback-handler" value="org.jboss.test.ws.jaxws.cxf.interop.wstrust10.KeystorePasswordCallback"/> + <entry key="ws-security.signature.properties" value="META-INF/etc/wssip.properties"/> + <entry key="ws-security.encryption.properties" value="META-INF/etc/wssip.properties"/> + <entry key="ws-security.sts.token.properties" value="META-INF/etc/wssip.properties"/> + <entry key="ws-security.sts.token.properties.decrypt" value="META-INF/etc/bob.properties"/> + </map> + </property> + </bean> + <jaxws:client name="{http://tempuri.org/}Scenario_9_IssuedTokenForCertificate_Mutu... createdFromAPI="true"> + <jaxws:properties> + <entry key="ws-security.callback-handler" value="org.jboss.test.ws.jaxws.cxf.interop.wstrust10.KeystorePasswordCallback"/> + <entry key="ws-security.encryption.properties" value="META-INF/etc/bob.properties"/> + </jaxws:properties> + </jaxws:client> +</beans> Deleted: stack/cxf/branches/jbossws-cxf-3.1.2/modules/testsuite/cxf-tests/src/test/resources/jaxws/cxf/interop/wstrust10/META-INF/scenario9-client-config.xml =================================================================== --- stack/cxf/branches/jbossws-cxf-3.1.2/modules/testsuite/cxf-tests/src/test/resources/jaxws/cxf/interop/wstrust10/META-INF/scenario9-client-config.xml 2009-05-29 13:21:21 UTC (rev 10145) +++ stack/cxf/branches/jbossws-cxf-3.1.2/modules/testsuite/cxf-tests/src/test/resources/jaxws/cxf/interop/wstrust10/META-INF/scenario9-client-config.xml 2009-05-29 13:25:20 UTC (rev 10146) @@ -1,64 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<!-- - 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. ---> -<beans xmlns="http://www.springframework.org/schema/beans" - xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" - xmlns:http="http://cxf.apache.org/transports/http/configuration" - xmlns:jaxws="http://cxf.apache.org/jaxws" - xmlns:cxf="http://cxf.apache.org/core" - xmlns:p="http://cxf.apache.org/policy" - xmlns:sec="http://cxf.apache.org/configuration/security" - xsi:schemaLocation=" - http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans.xsd - http://cxf.apache.org/jaxws http://cxf.apache.org/schemas/jaxws.xsd - http://cxf.apache.org/transports/http/configuration http://cxf.apache.org/schemas/configuration/http-conf.xsd - http://cxf.apache.org/configuration/security http://cxf.apache.org/schemas/configuration/security.xsd - http://cxf.apache.org/core http://cxf.apache.org/schemas/core.xsd - http://cxf.apache.org/policy http://cxf.apache.org/schemas/policy.xsd" -> - <cxf:bus> - <cxf:features> - <p:policies/> - <cxf:logging/> - </cxf:features> - </cxf:bus> - - <!-- Scenario 9 --> - <bean name="{http://tempuri.org/}Scenario_9_IssuedTokenForCertificate_Mutu... - class="org.apache.cxf.ws.security.trust.STSClient" abstract="true"> - <property name="wsdlLocation" value="META-INF/wsdl/STSAsym.wsdl"/> - <property name="serviceName" value="{http://tempuri.org/}SecurityTokenService"/> - <property name="endpointName" value="{http://tempuri.org/}WSHttpBinding_ISecurityTokenService2&quo... - <property name="properties"> - <map> - <entry key="ws-security.callback-handler" value="org.jboss.test.ws.jaxws.cxf.interop.wstrust10.KeystorePasswordCallback"/> - <entry key="ws-security.signature.properties" value="META-INF/etc/wssip.properties"/> - <entry key="ws-security.encryption.properties" value="META-INF/etc/wssip.properties"/> - <entry key="ws-security.sts.token.properties" value="META-INF/etc/wssip.properties"/> - <entry key="ws-security.sts.token.properties.decrypt" value="META-INF/etc/bob.properties"/> - </map> - </property> - </bean> - <jaxws:client name="{http://tempuri.org/}Scenario_9_IssuedTokenForCertificate_Mutu... createdFromAPI="true"> - <jaxws:properties> - <entry key="ws-security.callback-handler" value="org.jboss.test.ws.jaxws.cxf.interop.wstrust10.KeystorePasswordCallback"/> - <entry key="ws-security.encryption.properties" value="META-INF/etc/bob.properties"/> - </jaxws:properties> - </jaxws:client> -</beans>