Author: objectiser Date: 2010-06-16 06:23:32 -0400 (Wed, 16 Jun 2010) New Revision: 750 Added: trunk/integration-tests/src/test/java/org/jboss/soa/bpel/tests/samples/QuickstartBPELSecureServiceTestCase.java trunk/integration-tests/src/test/java/org/jboss/soa/bpel/tests/samples/secureservice/ trunk/integration-tests/src/test/java/org/jboss/soa/bpel/tests/samples/secureservice/ClientUsernamePasswordCallback.java trunk/integration-tests/src/test/resources/samples/Quickstart_bpel_secure_service/messages/harness_request1.xml trunk/integration-tests/src/test/resources/samples/Quickstart_bpel_secure_service_testharness/ trunk/integration-tests/src/test/resources/samples/Quickstart_bpel_secure_service_testharness/build.xml trunk/integration-tests/src/test/resources/samples/Quickstart_bpel_secure_service_testharness/war/ trunk/integration-tests/src/test/resources/samples/Quickstart_bpel_secure_service_testharness/war/resources/ trunk/integration-tests/src/test/resources/samples/Quickstart_bpel_secure_service_testharness/war/resources/WEB-INF/ trunk/integration-tests/src/test/resources/samples/Quickstart_bpel_secure_service_testharness/war/resources/WEB-INF/classes/ trunk/integration-tests/src/test/resources/samples/Quickstart_bpel_secure_service_testharness/war/resources/WEB-INF/etc/ trunk/integration-tests/src/test/resources/samples/Quickstart_bpel_secure_service_testharness/war/resources/WEB-INF/etc/Client_Encrypt.properties trunk/integration-tests/src/test/resources/samples/Quickstart_bpel_secure_service_testharness/war/resources/WEB-INF/etc/Client_Sign.properties trunk/integration-tests/src/test/resources/samples/Quickstart_bpel_secure_service_testharness/war/resources/WEB-INF/jbossws-cxf.xml trunk/integration-tests/src/test/resources/samples/Quickstart_bpel_secure_service_testharness/war/resources/WEB-INF/keystore/ trunk/integration-tests/src/test/resources/samples/Quickstart_bpel_secure_service_testharness/war/resources/WEB-INF/keystore/client-keystore.jks trunk/integration-tests/src/test/resources/samples/Quickstart_bpel_secure_service_testharness/war/resources/WEB-INF/keystore/client-truststore.jks trunk/integration-tests/src/test/resources/samples/Quickstart_bpel_secure_service_testharness/war/resources/WEB-INF/lib/ trunk/integration-tests/src/test/resources/samples/Quickstart_bpel_secure_service_testharness/war/resources/WEB-INF/web.xml trunk/integration-tests/src/test/resources/samples/Quickstart_bpel_secure_service_testharness/war/resources/WEB-INF/wssec.xml trunk/integration-tests/src/test/resources/samples/Quickstart_bpel_secure_service_testharness/war/src/ trunk/integration-tests/src/test/resources/samples/Quickstart_bpel_secure_service_testharness/war/src/org/ trunk/integration-tests/src/test/resources/samples/Quickstart_bpel_secure_service_testharness/war/src/org/jboss/ trunk/integration-tests/src/test/resources/samples/Quickstart_bpel_secure_service_testharness/war/src/org/jboss/soa/ trunk/integration-tests/src/test/resources/samples/Quickstart_bpel_secure_service_testharness/war/src/org/jboss/soa/bpel/ trunk/integration-tests/src/test/resources/samples/Quickstart_bpel_secure_service_testharness/war/src/org/jboss/soa/bpel/tests/ trunk/integration-tests/src/test/resources/samples/Quickstart_bpel_secure_service_testharness/war/src/org/jboss/soa/bpel/tests/harness/ trunk/integration-tests/src/test/resources/samples/Quickstart_bpel_secure_service_testharness/war/src/org/jboss/soa/bpel/tests/harness/ObjectFactory.java trunk/integration-tests/src/test/resources/samples/Quickstart_bpel_secure_service_testharness/war/src/org/jboss/soa/bpel/tests/harness/RunTest.java trunk/integration-tests/src/test/resources/samples/Quickstart_bpel_secure_service_testharness/war/src/org/jboss/soa/bpel/tests/harness/RunTestResponse.java trunk/integration-tests/src/test/resources/samples/Quickstart_bpel_secure_service_testharness/war/src/org/jboss/soa/bpel/tests/harness/SecureServiceTestHarness.java trunk/integration-tests/src/test/resources/samples/Quickstart_bpel_secure_service_testharness/war/src/org/jboss/soa/bpel/tests/harness/SecureServiceTestHarnessImpl.java trunk/integration-tests/src/test/resources/samples/Quickstart_bpel_secure_service_testharness/war/src/org/jboss/soa/bpel/tests/harness/SecureServiceTestHarnessService.java trunk/integration-tests/src/test/resources/samples/Quickstart_bpel_secure_service_testharness/war/src/org/jboss/soa/bpel/tests/harness/SecureServiceTestHarness_SecureServiceTestHarnessPort_Client.java trunk/integration-tests/src/test/resources/samples/Quickstart_bpel_secure_service_testharness/war/src/org/jboss/soa/bpel/tests/harness/SecureServiceTestHarness_SecureServiceTestHarnessPort_Server.java trunk/integration-tests/src/test/resources/samples/Quickstart_bpel_secure_service_testharness/war/src/org/jboss/soa/bpel/tests/harness/package-info.java trunk/integration-tests/src/test/resources/samples/Quickstart_bpel_secure_service_testharness/war/view/ trunk/integration-tests/src/test/resources/samples/Quickstart_bpel_secure_service_testharness/war/view/index.jsp trunk/integration-tests/src/test/resources/samples/Quickstart_bpel_secure_service_testharness/wsdl/ trunk/integration-tests/src/test/resources/samples/Quickstart_bpel_secure_service_testharness/wsdl/SecureServiceTestHarnessService.wsdl Modified: trunk/integration-tests/build.xml trunk/integration-tests/pom.xml trunk/integration-tests/src/test/resources/samples/Quickstart_bpel_secure_service/build.xml trunk/integration-tests/src/test/resources/samples/Quickstart_bpel_secure_service/client/resources/etc/Client_Encrypt.properties trunk/integration-tests/src/test/resources/samples/Quickstart_bpel_secure_service/client/resources/etc/Client_Sign.properties trunk/integration-tests/src/test/resources/samples/Quickstart_bpel_secure_service/client/resources/wssec.xml trunk/pom.xml Log: Added secure-service integration test. Modified: trunk/integration-tests/build.xml =================================================================== --- trunk/integration-tests/build.xml 2010-06-16 03:19:07 UTC (rev 749) +++ trunk/integration-tests/build.xml 2010-06-16 10:23:32 UTC (rev 750) @@ -6,6 +6,10 @@ <property file="${riftsaw.test.deployment.properties}" /> + <condition property="is.cxf.ws.stack"> + <equals arg1="${ws.stack}" arg2="cxf"/> + </condition> + <condition property="is.ojdbc.available"> <available file="${basedir}/../distribution/target/libs/ojdbc14.jar" /> </condition> @@ -127,7 +131,6 @@ <ant antfile="src/test/resources/samples/Quickstart_bpel_hello_world_extended_timeout/build.xml" /> <ant antfile="src/test/resources/samples/Quickstart_bpel_hello_world_header_ode/build.xml" /> <ant antfile="src/test/resources/samples/Quickstart_bpel_hello_world_header_wsdl/build.xml" /> - <ant antfile="src/test/resources/samples/Quickstart_bpel_secure_invoke/build.xml" /> <ant antfile="src/test/resources/samples/Quickstart_bpel_simple_correlation/build.xml" /> <ant antfile="src/test/resources/samples/Quickstart_bpel_simple_correlation_with_oneway/build.xml" /> <ant antfile="src/test/resources/samples/Quickstart_bpel_simple_invoke/build.xml" /> @@ -155,5 +158,13 @@ <ant antfile="src/test/resources/tutorials/BluePrint4/build.xml" /> <ant antfile="src/test/resources/tutorials/BluePrint5/build.xml" /> + <antcall target="package-tests-ws-stack" /> </target> + + <target name="package-tests-ws-stack" if="is.cxf.ws.stack" > + <ant antfile="src/test/resources/samples/Quickstart_bpel_secure_invoke/build.xml" /> + <ant antfile="src/test/resources/samples/Quickstart_bpel_secure_service/build.xml" /> + <ant antfile="src/test/resources/samples/Quickstart_bpel_secure_service_testharness/build.xml" /> + </target> + </project> Modified: trunk/integration-tests/pom.xml =================================================================== --- trunk/integration-tests/pom.xml 2010-06-16 03:19:07 UTC (rev 749) +++ trunk/integration-tests/pom.xml 2010-06-16 10:23:32 UTC (rev 750) @@ -150,6 +150,283 @@ <version>1.2.13</version> <scope>test</scope> </dependency> + + <!-- CXF dependencies (copied from jbossws project) --> + <dependency> + <groupId>org.apache.cxf</groupId> + <artifactId>cxf-rt-ws-security</artifactId> + <version>${cxf.version}</version> + <scope>test</scope> + <exclusions> + <exclusion> + <groupId>javax.xml.soap</groupId> + <artifactId>saaj-api</artifactId> + </exclusion> + </exclusions> + </dependency> + <dependency> + <groupId>org.apache.cxf</groupId> + <artifactId>cxf-rt-bindings-soap</artifactId> + <version>${cxf.version}</version> + <scope>test</scope> + <exclusions> + <exclusion> + <groupId>javax.xml.bind</groupId> + <artifactId>jaxb-api</artifactId> + </exclusion> + <exclusion> + <groupId>javax.xml.soap</groupId> + <artifactId>saaj-api</artifactId> + </exclusion> + <exclusion> + <groupId>org.apache.geronimo.specs</groupId> + <artifactId>geronimo-activation_1.1_spec</artifactId> + </exclusion> + <exclusion> + <groupId>org.apache.geronimo.specs</groupId> + <artifactId>geronimo-javamail_1.4_spec</artifactId> + </exclusion> + <exclusion> + <groupId>org.apache.geronimo.specs</groupId> + <artifactId>geronimo-annotation_1.0_spec</artifactId> + </exclusion> + </exclusions> + </dependency> + <dependency> + <groupId>org.apache.cxf</groupId> + <artifactId>cxf-rt-bindings-http</artifactId> + <version>${cxf.version}</version> + <scope>test</scope> + <exclusions> + <exclusion> + <groupId>javax.xml.bind</groupId> + <artifactId>jaxb-api</artifactId> + </exclusion> + <exclusion> + <groupId>org.apache.geronimo.specs</groupId> + <artifactId>geronimo-activation_1.1_spec</artifactId> + </exclusion> + </exclusions> + </dependency> + <dependency> + <groupId>org.apache.cxf</groupId> + <artifactId>cxf-rt-bindings-object</artifactId> + <version>${cxf.version}</version> + <scope>test</scope> + </dependency> + <dependency> + <groupId>org.apache.cxf</groupId> + <artifactId>cxf-rt-bindings-coloc</artifactId> + <version>${cxf.version}</version> + <scope>test</scope> + <exclusions> + <exclusion> + <groupId>org.apache.geronimo.specs</groupId> + <artifactId>geronimo-javamail_1.4_spec</artifactId> + </exclusion> + <exclusion> + <groupId>org.apache.geronimo.specs</groupId> + <artifactId>geronimo-jaxws_2.1_spec</artifactId> + </exclusion> + <exclusion> + <groupId>com.sun.xml.fastinfoset</groupId> + <artifactId>FastInfoset</artifactId> + </exclusion> + </exclusions> + </dependency> + <dependency> + <groupId>org.apache.cxf</groupId> + <artifactId>cxf-rt-bindings-corba</artifactId> + <version>${cxf.version}</version> + <scope>test</scope> + <exclusions> + <exclusion> + <groupId>javax.xml.bind</groupId> + <artifactId>jaxb-api</artifactId> + </exclusion> + <exclusion> + <groupId>org.apache.geronimo.specs</groupId> + <artifactId>geronimo-annotation_1.0_spec</artifactId> + </exclusion> + <exclusion> + <groupId>org.apache.geronimo.specs</groupId> + <artifactId>geronimo-stax-api_1.0_spec</artifactId> + </exclusion> + </exclusions> + </dependency> + <dependency> + <groupId>org.apache.cxf</groupId> + <artifactId>cxf-rt-frontend-jaxws</artifactId> + <version>${cxf.version}</version> + <scope>test</scope> + <exclusions> + <exclusion> + <groupId>javax.xml.soap</groupId> + <artifactId>saaj-api</artifactId> + </exclusion> + <exclusion> + <groupId>org.apache.geronimo.specs</groupId> + <artifactId>geronimo-activation_1.1_spec</artifactId> + </exclusion> + <exclusion> + <groupId>org.apache.geronimo.specs</groupId> + <artifactId>geronimo-ws-metadata_2.0_spec</artifactId> + </exclusion> + <exclusion> + <groupId>org.apache.geronimo.specs</groupId> + <artifactId>geronimo-jaxws_2.1_spec</artifactId> + </exclusion> + <exclusion> + <groupId>asm</groupId> + <artifactId>asm</artifactId> + </exclusion> + </exclusions> + </dependency> + <dependency> + <groupId>org.apache.cxf</groupId> + <artifactId>cxf-rt-transports-http</artifactId> + <version>${cxf.version}</version> + <scope>test</scope> + </dependency> + <dependency> + <groupId>org.apache.cxf</groupId> + <artifactId>cxf-rt-transports-http-jetty</artifactId> + <version>${cxf.version}</version> + <scope>test</scope> + <exclusions> + <exclusion> + <groupId>org.slf4j</groupId> + <artifactId>slf4j-jdk14</artifactId> + </exclusion> + </exclusions> + </dependency> + <dependency> + <groupId>org.apache.cxf</groupId> + <artifactId>cxf-rt-transports-jms</artifactId> + <version>${cxf.version}</version> + <scope>test</scope> + <exclusions> + <exclusion> + <groupId>org.apache.geronimo.specs</groupId> + <artifactId>geronimo-activation_1.1_spec</artifactId> + </exclusion> + <exclusion> + <groupId>org.apache.geronimo.specs</groupId> + <artifactId>geronimo-jms_1.1_spec</artifactId> + </exclusion> + </exclusions> + </dependency> + <dependency> + <groupId>org.apache.cxf</groupId> + <artifactId>cxf-rt-transports-local</artifactId> + <version>${cxf.version}</version> + <scope>test</scope> + </dependency> + <dependency> + <groupId>org.apache.cxf</groupId> + <artifactId>cxf-rt-ws-rm</artifactId> + <version>${cxf.version}</version> + <scope>test</scope> + <exclusions> + <exclusion> + <groupId>org.apache.geronimo.specs</groupId> + <artifactId>geronimo-jaxws_2.1_spec</artifactId> + </exclusion> + </exclusions> + </dependency> + <dependency> + <groupId>org.apache.cxf</groupId> + <artifactId>cxf-rt-ws-policy</artifactId> + <version>${cxf.version}</version> + <scope>test</scope> + <exclusions> + <exclusion> + <groupId>org.apache.geronimo.specs</groupId> + <artifactId>geronimo-annotation_1.0_spec</artifactId> + </exclusion> + <exclusion> + <groupId>org.apache.geronimo.specs</groupId> + <artifactId>geronimo-jaxws_2.1_spec</artifactId> + </exclusion> + </exclusions> + </dependency> + <dependency> + <groupId>org.apache.cxf</groupId> + <artifactId>cxf-tools-java2ws</artifactId> + <version>${cxf.version}</version> + <scope>test</scope> + <exclusions> + <exclusion> + <groupId>javax.xml.bind</groupId> + <artifactId>jaxb-api</artifactId> + </exclusion> + <exclusion> + <groupId>javax.xml.soap</groupId> + <artifactId>saaj-api</artifactId> + </exclusion> + <exclusion> + <groupId>org.apache.geronimo.specs</groupId> + <artifactId>geronimo-jaxws_2.1_spec</artifactId> + </exclusion> + </exclusions> + </dependency> + <dependency> + <groupId>org.apache.cxf</groupId> + <artifactId>cxf-tools-wsdlto-core</artifactId> + <version>${cxf.version}</version> + <scope>test</scope> + <exclusions> + <exclusion> + <groupId>javax.xml.soap</groupId> + <artifactId>saaj-api</artifactId> + </exclusion> + <exclusion> + <groupId>org.apache.geronimo.specs</groupId> + <artifactId>geronimo-jaxws_2.1_spec</artifactId> + </exclusion> + <exclusion> + <groupId>org.apache.geronimo.specs</groupId> + <artifactId>geronimo-stax-api_1.0_spec</artifactId> + </exclusion> + </exclusions> + </dependency> + <dependency> + <groupId>org.apache.cxf</groupId> + <artifactId>cxf-tools-wsdlto-databinding-jaxb</artifactId> + <version>${cxf.version}</version> + <scope>test</scope> + </dependency> + <dependency> + <groupId>org.apache.cxf</groupId> + <artifactId>cxf-tools-wsdlto-frontend-jaxws</artifactId> + <version>${cxf.version}</version> + <scope>test</scope> + </dependency> + <dependency> + <groupId>org.apache.cxf.xjcplugins</groupId> + <artifactId>cxf-xjc-boolean</artifactId> + <version>${cxf.version}</version> + <scope>test</scope> + </dependency> + <dependency> + <groupId>org.apache.cxf.xjcplugins</groupId> + <artifactId>cxf-xjc-bug671</artifactId> + <version>${cxf.version}</version> + <scope>test</scope> + </dependency> + <dependency> + <groupId>org.apache.cxf</groupId> + <artifactId>cxf-xjc-dv</artifactId> + <version>${cxf.version}</version> + <scope>test</scope> + </dependency> + <dependency> + <groupId>org.apache.cxf</groupId> + <artifactId>cxf-xjc-ts</artifactId> + <version>${cxf.version}</version> + <scope>test</scope> + </dependency> + </dependencies> <build> <plugins> @@ -177,6 +454,7 @@ value="${maven.dependency.org.jboss.soa.bpel.runtime.jb-bpel-store.jar.path}" /> <property name="dependency.rosetta.aop" value="${maven.dependency.org.jboss.soa.bpel.dependencies.esb.aop.rosetta.aop.path}" /> + <ant antfile="${basedir}/build.xml"> <target name="unpack-distribution" /> </ant> @@ -243,6 +521,7 @@ <artifactId>maven-surefire-plugin</artifactId> <configuration> <additionalClasspathElements> + <additionalClasspathElement>${basedir}/src/test/resources</additionalClasspathElement> <additionalClasspathElement>${basedir}/src/test/resources/conf</additionalClasspathElement> <additionalClasspathElement>${basedir}/target/rosetta.aop</additionalClasspathElement> </additionalClasspathElements> Added: trunk/integration-tests/src/test/java/org/jboss/soa/bpel/tests/samples/QuickstartBPELSecureServiceTestCase.java =================================================================== --- trunk/integration-tests/src/test/java/org/jboss/soa/bpel/tests/samples/QuickstartBPELSecureServiceTestCase.java (rev 0) +++ trunk/integration-tests/src/test/java/org/jboss/soa/bpel/tests/samples/QuickstartBPELSecureServiceTestCase.java 2010-06-16 10:23:32 UTC (rev 750) @@ -0,0 +1,80 @@ +/* + * JBoss, Home of Professional Open Source. + * Copyright 2006, 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.soa.bpel.tests.samples; + +import org.jboss.soa.bpel.tests.RiftSawTest; +import org.jboss.soa.bpel.tests.RiftSawTestSetup; + +import java.io.File; +import java.net.MalformedURLException; +import java.net.URL; +import java.util.HashMap; +import java.util.Map; + +import javax.xml.namespace.QName; +import javax.xml.soap.MessageFactory; +import javax.xml.soap.SOAPMessage; +import javax.xml.ws.Dispatch; +import javax.xml.ws.Service; + +import org.apache.cxf.Bus; +import org.apache.cxf.bus.spring.SpringBusFactory; +import org.apache.cxf.ws.security.wss4j.WSS4JInInterceptor; +import org.apache.cxf.ws.security.wss4j.WSS4JOutInterceptor; + +import junit.framework.Test; + +/** + * Test case for running the Quickstart_bpel_secure_service sample. + */ +public class QuickstartBPELSecureServiceTestCase extends RiftSawTest { + + private static final String TEST_NAME = "Quickstart_bpel_secure_service"; + private static final QName SERVICE_NAME = new QName("http://www.jboss.org/bpel/examples/wsdl";, "SecureHelloService"); + private static final QName TH_SERVICE_NAME = new QName("http://harness.tests.bpel.soa.jboss.org/";, "SecureServiceTestHarnessService"); + + public QuickstartBPELSecureServiceTestCase() { + super(TEST_NAME); + } + + public static Test suite() { + if (System.getProperty("ws.stack","native").equals("cxf")) { + return(new RiftSawTestSetup(QuickstartBPELSecureServiceTestCase.class, + TEST_NAME, "Quickstart_bpel_secure_service-1.jar,Quickstart_bpel_secure_service_testharness.war")); + } else { + return(null); + } + } + + public void testSendHello() throws Exception { + if (System.getProperty("ws.stack","native").equals("cxf") == false) { + return; + } + + String result=sendSOAPMessage("harness_request1.xml", + "http://127.0.0.1:8080/Quickstart_bpel_secure_service_testharness/SecureServiceTestHarnessWS"); + + if (result.contains("<return>true</return>") == false) { + fail("Failed to receive successful response from remote test harness"); + } + } +} Added: trunk/integration-tests/src/test/java/org/jboss/soa/bpel/tests/samples/secureservice/ClientUsernamePasswordCallback.java =================================================================== --- trunk/integration-tests/src/test/java/org/jboss/soa/bpel/tests/samples/secureservice/ClientUsernamePasswordCallback.java (rev 0) +++ trunk/integration-tests/src/test/java/org/jboss/soa/bpel/tests/samples/secureservice/ClientUsernamePasswordCallback.java 2010-06-16 10:23:32 UTC (rev 750) @@ -0,0 +1,74 @@ +/** + * Licensed to the Apache Software Foundation (ASF) under one + * or more contributor license agreements. See the NOTICE file + * distributed with this work for additional information + * regarding copyright ownership. The ASF licenses this file + * to you under the Apache License, Version 2.0 (the + * "License"); you may not use this file except in compliance + * with the License. You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, + * software distributed under the License is distributed on an + * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY + * KIND, either express or implied. See the License for the + * specific language governing permissions and limitations + * under the License. + */ +package org.jboss.soa.bpel.tests.samples.secureservice; + +import java.io.IOException; +import java.util.HashMap; +import java.util.Map; + +import javax.security.auth.callback.Callback; +import javax.security.auth.callback.CallbackHandler; +import javax.security.auth.callback.UnsupportedCallbackException; + +import org.apache.ws.security.WSPasswordCallback; + +/** + */ + +public class ClientUsernamePasswordCallback implements CallbackHandler { + + private Map<String, String> passwords = + new HashMap<String, String>(); + + public ClientUsernamePasswordCallback() { + passwords.put("Alice", "ecilA"); + passwords.put("abcd", "dcba"); + passwords.put("clientx509v1", "storepassword"); + passwords.put("serverx509v1", "storepassword"); + } + + /** + * Here, we attempt to get the password from the private + * alias/passwords map. + */ + public void handle(Callback[] callbacks) throws IOException, UnsupportedCallbackException { + for (int i = 0; i < callbacks.length; i++) { + WSPasswordCallback pc = (WSPasswordCallback)callbacks[i]; + +System.out.println("GPB: Check identifier="+pc.getIdentifier()); + String pass = passwords.get(pc.getIdentifier()); + if (pass != null) { + pc.setPassword(pass); + return; + } + } + + // + // Password not found + // + throw new IOException(); + } + + /** + * Add an alias/password pair to the callback mechanism. + */ + public void setAliasPassword(String alias, String password) { + passwords.put(alias, password); + } +} Modified: trunk/integration-tests/src/test/resources/samples/Quickstart_bpel_secure_service/build.xml =================================================================== --- trunk/integration-tests/src/test/resources/samples/Quickstart_bpel_secure_service/build.xml 2010-06-16 03:19:07 UTC (rev 749) +++ trunk/integration-tests/src/test/resources/samples/Quickstart_bpel_secure_service/build.xml 2010-06-16 10:23:32 UTC (rev 750) @@ -38,10 +38,14 @@ <target name="deploy" depends="compileserver" > <echo>Deploy ${ant.project.name}</echo> - <jar destfile="${deploy.dir}/${sample.jar.name}" > + <jar destfile="${deploy.dir}/${ant.project.name}/${sample.jar.name}" > <fileset dir="${test.dir}/bpelContent"/> <fileset dir="${server.build.dir}"/> </jar> + + <copy todir="${deploy.dir}/${ant.project.name}"> + <fileset dir="${test.dir}/messages"/> + </copy> </target> <target name="undeploy"> Modified: trunk/integration-tests/src/test/resources/samples/Quickstart_bpel_secure_service/client/resources/etc/Client_Encrypt.properties =================================================================== --- trunk/integration-tests/src/test/resources/samples/Quickstart_bpel_secure_service/client/resources/etc/Client_Encrypt.properties 2010-06-16 03:19:07 UTC (rev 749) +++ trunk/integration-tests/src/test/resources/samples/Quickstart_bpel_secure_service/client/resources/etc/Client_Encrypt.properties 2010-06-16 10:23:32 UTC (rev 750) @@ -2,4 +2,4 @@ org.apache.ws.security.crypto.merlin.keystore.type=jks org.apache.ws.security.crypto.merlin.keystore.password=storepassword org.apache.ws.security.crypto.merlin.keystore.alias=serverx509v1 -org.apache.ws.security.crypto.merlin.file=keystore/client-truststore.jks \ No newline at end of file +org.apache.ws.security.crypto.merlin.file=samples/Quickstart_bpel_secure_service/client/resources/keystore/client-truststore.jks \ No newline at end of file Modified: trunk/integration-tests/src/test/resources/samples/Quickstart_bpel_secure_service/client/resources/etc/Client_Sign.properties =================================================================== --- trunk/integration-tests/src/test/resources/samples/Quickstart_bpel_secure_service/client/resources/etc/Client_Sign.properties 2010-06-16 03:19:07 UTC (rev 749) +++ trunk/integration-tests/src/test/resources/samples/Quickstart_bpel_secure_service/client/resources/etc/Client_Sign.properties 2010-06-16 10:23:32 UTC (rev 750) @@ -2,5 +2,5 @@ org.apache.ws.security.crypto.merlin.keystore.type=jks org.apache.ws.security.crypto.merlin.keystore.password=storepassword org.apache.ws.security.crypto.merlin.keystore.alias=clientx509v1 -org.apache.ws.security.crypto.merlin.file=keystore/client-keystore.jks +org.apache.ws.security.crypto.merlin.file=samples/Quickstart_bpel_secure_service/client/resources/keystore/client-keystore.jks Modified: trunk/integration-tests/src/test/resources/samples/Quickstart_bpel_secure_service/client/resources/wssec.xml =================================================================== --- trunk/integration-tests/src/test/resources/samples/Quickstart_bpel_secure_service/client/resources/wssec.xml 2010-06-16 03:19:07 UTC (rev 749) +++ trunk/integration-tests/src/test/resources/samples/Quickstart_bpel_secure_service/client/resources/wssec.xml 2010-06-16 10:23:32 UTC (rev 750) @@ -42,8 +42,8 @@ <entry key="action" value="UsernameToken Timestamp Signature"/> <entry key="passwordType" value="PasswordDigest"/> <entry key="user" value="clientx509v1"/> - <entry key="passwordCallbackClass" value="org.jboss.test.ws.jaxws.samples.wsse.ClientUsernamePasswordCallback"/> - <entry key="signaturePropFile" value="etc/Client_Sign.properties"/> + <entry key="passwordCallbackClass" value="org.jboss.soa.bpel.tests.samples.secureservice.ClientUsernamePasswordCallback"/> + <entry key="signaturePropFile" value="samples/Quickstart_bpel_secure_service/client/resources/etc/Client_Sign.properties"/> <entry key="signatureKeyIdentifier" value="DirectReference"/> <entry key="signatureParts" value="{Element}{http://docs.oasis-open.org/wss/2004/01/oasis-200401... </map> @@ -57,8 +57,8 @@ <entry key="action" value="UsernameToken Timestamp Signature"/> <entry key="passwordType" value="PasswordText"/> <entry key="user" value="serverx509v1"/> - <entry key="passwordCallbackClass" value="org.jboss.test.ws.jaxws.samples.wsse.ClientUsernamePasswordCallback"/> - <entry key="signaturePropFile" value="etc/Client_Encrypt.properties"/> + <entry key="passwordCallbackClass" value="org.jboss.soa.bpel.tests.samples.secureservice.ClientUsernamePasswordCallback"/> + <entry key="signaturePropFile" value="samples/Quickstart_bpel_secure_service/client/resources/etc/Client_Encrypt.properties"/> <entry key="signatureKeyIdentifier" value="DirectReference"/> </map> </constructor-arg> Added: trunk/integration-tests/src/test/resources/samples/Quickstart_bpel_secure_service/messages/harness_request1.xml =================================================================== --- trunk/integration-tests/src/test/resources/samples/Quickstart_bpel_secure_service/messages/harness_request1.xml (rev 0) +++ trunk/integration-tests/src/test/resources/samples/Quickstart_bpel_secure_service/messages/harness_request1.xml 2010-06-16 10:23:32 UTC (rev 750) @@ -0,0 +1,8 @@ +<soapenv:Envelope xmlns:soapenv="http://schemas.xmlsoap.org/soap/envelope/" xmlns:har="http://harness.tests.bpel.soa.jboss.org/"> + <soapenv:Header/> + <soapenv:Body> + <har:runTest> + <arg0>0</arg0> + </har:runTest> + </soapenv:Body> +</soapenv:Envelope> \ No newline at end of file Added: trunk/integration-tests/src/test/resources/samples/Quickstart_bpel_secure_service_testharness/build.xml =================================================================== --- trunk/integration-tests/src/test/resources/samples/Quickstart_bpel_secure_service_testharness/build.xml (rev 0) +++ trunk/integration-tests/src/test/resources/samples/Quickstart_bpel_secure_service_testharness/build.xml 2010-06-16 10:23:32 UTC (rev 750) @@ -0,0 +1,74 @@ +<project name="Quickstart_bpel_secure_service_testharness" default="deploy" basedir="."> + + <description> + ${ant.project.name} + ${line.separator} + </description> + + <property name="version" value="1" /> + + <property name="server.dir" value="${org.jboss.as.home}/server/${org.jboss.as.config}"/> + <property name="conf.dir" value="${server.dir}/conf"/> + + <property name="project.under.test" value="Quickstart_bpel_secure_service" /> + + <property name="deploy.dir" value="${basedir}/target/tests"/> + <property name="test.dir" value="${basedir}/src/test/resources/samples/${ant.project.name}" /> + + <property name="sample.jar.name" value="${ant.project.name}-${version}.jar" /> + + <property name="war.build.dir" location="${deploy.dir}/${ant.project.name}/build/war/classes"/> + + <path id="compile-classpath"> + <fileset dir="${org.jboss.as.home}/client" includes="*.jar" /> <!-- Required for JMS Client Code. --> + </path> + <property name="compile-classpath" refid="compile-classpath"/> + + <target name="makewar" description="make war"> + <!-- Compile... --> + <mkdir dir="${war.build.dir}" /> + <javac fork="true" srcdir="${test.dir}/war/src" destdir="${war.build.dir}" debug="true"> + <classpath> + <path refid="compile-classpath" /> + <fileset dir="${test.dir}/war/resources/WEB-INF/lib" includes="*.jar" /> + </classpath> + </javac> + + <!-- War... --> + <war warfile="${deploy.dir}/${project.under.test}/${ant.project.name}.war" + webxml="${test.dir}/war/resources/WEB-INF/web.xml"> + <webinf dir="${test.dir}/war/resources/WEB-INF"> + <include name="jboss-web.xml"/> + <include name="wssec.xml"/> + </webinf> + <classes dir="${war.build.dir}" includes="**/*.class"/> + <classes dir="${test.dir}/war/resources/WEB-INF" includes="wssec.xml"/> + <classes dir="${test.dir}/war/resources/WEB-INF"> + <include name="etc/*"/> + <include name="keystore/*"/> + </classes> + <fileset dir="${test.dir}/war/view"> + <include name="**/*"/> + </fileset> + <classes dir="${test.dir}"> + <include name="juddi.properties"/> + </classes> + </war> + </target> + + <target name="deploywar" depends="makewar" > + </target> + + <target name="undeploywar"> + <delete file="${deploy.dir}/${project.under.test}/${ant.project.name}.war"/> + </target> + + <target name="deploy" depends="deploywar" > + <echo>Deploy ${ant.project.name}</echo> + </target> + + <target name="undeploy" depends="undeploywar" > + <echo>Undeploy ${ant.project.name}</echo> + </target> + +</project> Added: trunk/integration-tests/src/test/resources/samples/Quickstart_bpel_secure_service_testharness/war/resources/WEB-INF/etc/Client_Encrypt.properties =================================================================== --- trunk/integration-tests/src/test/resources/samples/Quickstart_bpel_secure_service_testharness/war/resources/WEB-INF/etc/Client_Encrypt.properties (rev 0) +++ trunk/integration-tests/src/test/resources/samples/Quickstart_bpel_secure_service_testharness/war/resources/WEB-INF/etc/Client_Encrypt.properties 2010-06-16 10:23:32 UTC (rev 750) @@ -0,0 +1,5 @@ +org.apache.ws.security.crypto.provider=org.apache.ws.security.components.crypto.Merlin +org.apache.ws.security.crypto.merlin.keystore.type=jks +org.apache.ws.security.crypto.merlin.keystore.password=storepassword +org.apache.ws.security.crypto.merlin.keystore.alias=serverx509v1 +org.apache.ws.security.crypto.merlin.file=keystore/client-truststore.jks \ No newline at end of file Added: trunk/integration-tests/src/test/resources/samples/Quickstart_bpel_secure_service_testharness/war/resources/WEB-INF/etc/Client_Sign.properties =================================================================== --- trunk/integration-tests/src/test/resources/samples/Quickstart_bpel_secure_service_testharness/war/resources/WEB-INF/etc/Client_Sign.properties (rev 0) +++ trunk/integration-tests/src/test/resources/samples/Quickstart_bpel_secure_service_testharness/war/resources/WEB-INF/etc/Client_Sign.properties 2010-06-16 10:23:32 UTC (rev 750) @@ -0,0 +1,6 @@ +org.apache.ws.security.crypto.provider=org.apache.ws.security.components.crypto.Merlin +org.apache.ws.security.crypto.merlin.keystore.type=jks +org.apache.ws.security.crypto.merlin.keystore.password=storepassword +org.apache.ws.security.crypto.merlin.keystore.alias=clientx509v1 +org.apache.ws.security.crypto.merlin.file=keystore/client-keystore.jks + Added: trunk/integration-tests/src/test/resources/samples/Quickstart_bpel_secure_service_testharness/war/resources/WEB-INF/jbossws-cxf.xml =================================================================== --- trunk/integration-tests/src/test/resources/samples/Quickstart_bpel_secure_service_testharness/war/resources/WEB-INF/jbossws-cxf.xml (rev 0) +++ trunk/integration-tests/src/test/resources/samples/Quickstart_bpel_secure_service_testharness/war/resources/WEB-INF/jbossws-cxf.xml 2010-06-16 10:23:32 UTC (rev 750) @@ -0,0 +1,20 @@ +<beans + xmlns='http://www.springframework.org/schema/beans' + xmlns:xsi='http://www.w3.org/2001/XMLSchema-instance' + xmlns:beans='http://www.springframework.org/schema/beans' + xmlns:jaxws='http://cxf.apache.org/jaxws' + xsi:schemaLocation='http://cxf.apache.org/core + http://cxf.apache.org/schemas/core.xsd + http://www.springframework.org/schema/beans + http://www.springframework.org/schema/beans/spring-beans-2.0.xsd + http://cxf.apache.org/jaxws + http://cxf.apache.org/schemas/jaxws.xsd'> + + <jaxws:endpoint + id='SecureServiceTestHarnessWS' + address='http://@jboss.bind.address@:8080/Quickstart_bpel_secure_service_testharness/SecureServiceTestHarnessWS' + implementor='org.jboss.soa.bpel.tests.harness.SecureServiceTestHarnessImpl'> + </jaxws:endpoint> + + +</beans> Added: trunk/integration-tests/src/test/resources/samples/Quickstart_bpel_secure_service_testharness/war/resources/WEB-INF/keystore/client-keystore.jks =================================================================== (Binary files differ) Property changes on: trunk/integration-tests/src/test/resources/samples/Quickstart_bpel_secure_service_testharness/war/resources/WEB-INF/keystore/client-keystore.jks ___________________________________________________________________ Name: svn:mime-type + application/octet-stream Added: trunk/integration-tests/src/test/resources/samples/Quickstart_bpel_secure_service_testharness/war/resources/WEB-INF/keystore/client-truststore.jks =================================================================== (Binary files differ) Property changes on: trunk/integration-tests/src/test/resources/samples/Quickstart_bpel_secure_service_testharness/war/resources/WEB-INF/keystore/client-truststore.jks ___________________________________________________________________ Name: svn:mime-type + application/octet-stream Added: trunk/integration-tests/src/test/resources/samples/Quickstart_bpel_secure_service_testharness/war/resources/WEB-INF/web.xml =================================================================== --- trunk/integration-tests/src/test/resources/samples/Quickstart_bpel_secure_service_testharness/war/resources/WEB-INF/web.xml (rev 0) +++ trunk/integration-tests/src/test/resources/samples/Quickstart_bpel_secure_service_testharness/war/resources/WEB-INF/web.xml 2010-06-16 10:23:32 UTC (rev 750) @@ -0,0 +1,18 @@ +<?xml version="1.0" encoding="UTF-8"?> + + +<web-app xmlns="http://java.sun.com/xml/ns/j2ee" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" + xsi:schemaLocation="http://java.sun.com/xml/ns/j2ee http://java.sun.com/xml/ns/j2ee/web-app_2_4.xsd" + version="2.4"> + + <servlet> + <servlet-name>SecureServiceTestHarnessWS</servlet-name> + <servlet-class>org.jboss.soa.bpel.tests.harness.SecureServiceTestHarnessImpl</servlet-class> + </servlet> + + <servlet-mapping> + <servlet-name>SecureServiceTestHarnessWS</servlet-name> + <url-pattern>/SecureServiceTestHarnessWS</url-pattern> + </servlet-mapping> + +</web-app> Added: trunk/integration-tests/src/test/resources/samples/Quickstart_bpel_secure_service_testharness/war/resources/WEB-INF/wssec.xml =================================================================== --- trunk/integration-tests/src/test/resources/samples/Quickstart_bpel_secure_service_testharness/war/resources/WEB-INF/wssec.xml (rev 0) +++ trunk/integration-tests/src/test/resources/samples/Quickstart_bpel_secure_service_testharness/war/resources/WEB-INF/wssec.xml 2010-06-16 10:23:32 UTC (rev 750) @@ -0,0 +1,79 @@ +<?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:cxf="http://cxf.apache.org/core" + xmlns:wsa="http://cxf.apache.org/ws/addressing" + xmlns:http="http://cxf.apache.org/transports/http/configuration" + xmlns:wsrm-policy="http://schemas.xmlsoap.org/ws/2005/02/rm/policy&q... + xmlns:wsrm-mgr="http://cxf.apache.org/ws/rm/manager" + xmlns:beans='http://www.springframework.org/schema/beans' + xmlns:jaxws='http://cxf.apache.org/jaxws' + xmlns:ns1='http://secure_invoke/helloworld' + xsi:schemaLocation=" + http://cxf.apache.org/core http://cxf.apache.org/schemas/core.xsd + http://cxf.apache.org/transports/http/configuration http://cxf.apache.org/schemas/configuration/http-conf.xsd + http://schemas.xmlsoap.org/ws/2005/02/rm/policy http://schemas.xmlsoap.org/ws/2005/02/rm/wsrm-policy.xsd + http://cxf.apache.org/ws/rm/manager http://cxf.apache.org/schemas/configuration/wsrm-manager.xsd + 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"> + + <bean id="UsernameTokenSign_Request" class="org.apache.cxf.ws.security.wss4j.WSS4JOutInterceptor" + name="{http://secure_invoke/helloworld}SecureHelloWorldPort.Request" > + <constructor-arg> + <map> + <entry key="action" value="UsernameToken Timestamp Signature"/> + <entry key="passwordType" value="PasswordDigest"/> + <entry key="user" value="clientx509v1"/> + <entry key="passwordCallbackClass" value="org.jboss.test.ws.jaxws.samples.wsse.ClientUsernamePasswordCallback"/> + <entry key="signaturePropFile" value="etc/Client_Sign.properties"/> + <entry key="signatureKeyIdentifier" value="DirectReference"/> + <entry key="signatureParts" value="{Element}{http://docs.oasis-open.org/wss/2004/01/oasis-200401... + </map> + </constructor-arg> + </bean> + + <bean id="UsernameTokenSign_Response" class="org.apache.cxf.ws.security.wss4j.WSS4JInInterceptor" + name="{http://secure_invoke/helloworld}SecureHelloWorldPort.Response" > + <constructor-arg> + <map> + <entry key="action" value="UsernameToken Timestamp Signature"/> + <entry key="passwordType" value="PasswordText"/> + <entry key="user" value="serverx509v1"/> + <entry key="passwordCallbackClass" value="org.jboss.test.ws.jaxws.samples.wsse.ClientUsernamePasswordCallback"/> + <entry key="signaturePropFile" value="etc/Client_Encrypt.properties"/> + <entry key="signatureKeyIdentifier" value="DirectReference"/> + </map> + </constructor-arg> + </bean> + + + <cxf:bus> + <cxf:outInterceptors> + <ref bean="UsernameTokenSign_Request"/> + <bean class="org.apache.cxf.binding.soap.saaj.SAAJOutInterceptor"/> + </cxf:outInterceptors> + <cxf:inInterceptors> + <ref bean="UsernameTokenSign_Response"/> + <bean class="org.apache.cxf.binding.soap.saaj.SAAJInInterceptor"/> + </cxf:inInterceptors> + </cxf:bus> + +</beans> Added: trunk/integration-tests/src/test/resources/samples/Quickstart_bpel_secure_service_testharness/war/src/org/jboss/soa/bpel/tests/harness/ObjectFactory.java =================================================================== --- trunk/integration-tests/src/test/resources/samples/Quickstart_bpel_secure_service_testharness/war/src/org/jboss/soa/bpel/tests/harness/ObjectFactory.java (rev 0) +++ trunk/integration-tests/src/test/resources/samples/Quickstart_bpel_secure_service_testharness/war/src/org/jboss/soa/bpel/tests/harness/ObjectFactory.java 2010-06-16 10:23:32 UTC (rev 750) @@ -0,0 +1,71 @@ + +package org.jboss.soa.bpel.tests.harness; + +import javax.xml.bind.JAXBElement; +import javax.xml.bind.annotation.XmlElementDecl; +import javax.xml.bind.annotation.XmlRegistry; +import javax.xml.namespace.QName; + + +/** + * This object contains factory methods for each + * Java content interface and Java element interface + * generated in the org.jboss.soa.bpel.tests.harness package. + * <p>An ObjectFactory allows you to programatically + * construct new instances of the Java representation + * for XML content. The Java representation of XML + * content can consist of schema derived interfaces + * and classes representing the binding of schema + * type definitions, element declarations and model + * groups. Factory methods for each of these are + * provided in this class. + * + */ +@XmlRegistry +public class ObjectFactory { + + private final static QName _RunTest_QNAME = new QName("http://harness.tests.bpel.soa.jboss.org/";, "runTest"); + private final static QName _RunTestResponse_QNAME = new QName("http://harness.tests.bpel.soa.jboss.org/";, "runTestResponse"); + + /** + * Create a new ObjectFactory that can be used to create new instances of schema derived classes for package: org.jboss.soa.bpel.tests.harness + * + */ + public ObjectFactory() { + } + + /** + * Create an instance of {@link RunTestResponse } + * + */ + public RunTestResponse createRunTestResponse() { + return new RunTestResponse(); + } + + /** + * Create an instance of {@link RunTest } + * + */ + public RunTest createRunTest() { + return new RunTest(); + } + + /** + * Create an instance of {@link JAXBElement }{@code <}{@link RunTest }{@code >}} + * + */ + @XmlElementDecl(namespace = "http://harness.tests.bpel.soa.jboss.org/", name = "runTest") + public JAXBElement<RunTest> createRunTest(RunTest value) { + return new JAXBElement<RunTest>(_RunTest_QNAME, RunTest.class, null, value); + } + + /** + * Create an instance of {@link JAXBElement }{@code <}{@link RunTestResponse }{@code >}} + * + */ + @XmlElementDecl(namespace = "http://harness.tests.bpel.soa.jboss.org/", name = "runTestResponse") + public JAXBElement<RunTestResponse> createRunTestResponse(RunTestResponse value) { + return new JAXBElement<RunTestResponse>(_RunTestResponse_QNAME, RunTestResponse.class, null, value); + } + +} Added: trunk/integration-tests/src/test/resources/samples/Quickstart_bpel_secure_service_testharness/war/src/org/jboss/soa/bpel/tests/harness/RunTest.java =================================================================== --- trunk/integration-tests/src/test/resources/samples/Quickstart_bpel_secure_service_testharness/war/src/org/jboss/soa/bpel/tests/harness/RunTest.java (rev 0) +++ trunk/integration-tests/src/test/resources/samples/Quickstart_bpel_secure_service_testharness/war/src/org/jboss/soa/bpel/tests/harness/RunTest.java 2010-06-16 10:23:32 UTC (rev 750) @@ -0,0 +1,52 @@ + +package org.jboss.soa.bpel.tests.harness; + +import javax.xml.bind.annotation.XmlAccessType; +import javax.xml.bind.annotation.XmlAccessorType; +import javax.xml.bind.annotation.XmlType; + + +/** + * <p>Java class for runTest complex type. + * + * <p>The following schema fragment specifies the expected content contained within this class. + * + * <pre> + * &lt;complexType name="runTest"> + * &lt;complexContent> + * &lt;restriction base="{http://www.w3.org/2001/XMLSchema}anyType"> + * &lt;sequence> + * &lt;element name="arg0" type="{http://www.w3.org/2001/XMLSchema}int"/> + * &lt;/sequence> + * &lt;/restriction> + * &lt;/complexContent> + * &lt;/complexType> + * </pre> + * + * + */ +(a)XmlAccessorType(XmlAccessType.FIELD) +@XmlType(name = "runTest", propOrder = { + "arg0" +}) +public class RunTest { + + protected int arg0; + + /** + * Gets the value of the arg0 property. + * + */ + public int getArg0() { + return arg0; + } + + /** + * Sets the value of the arg0 property. + * + */ + public void setArg0(int value) { + this.arg0 = value; + } + +} Added: trunk/integration-tests/src/test/resources/samples/Quickstart_bpel_secure_service_testharness/war/src/org/jboss/soa/bpel/tests/harness/RunTestResponse.java =================================================================== --- trunk/integration-tests/src/test/resources/samples/Quickstart_bpel_secure_service_testharness/war/src/org/jboss/soa/bpel/tests/harness/RunTestResponse.java (rev 0) +++ trunk/integration-tests/src/test/resources/samples/Quickstart_bpel_secure_service_testharness/war/src/org/jboss/soa/bpel/tests/harness/RunTestResponse.java 2010-06-16 10:23:32 UTC (rev 750) @@ -0,0 +1,54 @@ + +package org.jboss.soa.bpel.tests.harness; + +import javax.xml.bind.annotation.XmlAccessType; +import javax.xml.bind.annotation.XmlAccessorType; +import javax.xml.bind.annotation.XmlElement; +import javax.xml.bind.annotation.XmlType; + + +/** + * <p>Java class for runTestResponse complex type. + * + * <p>The following schema fragment specifies the expected content contained within this class. + * + * <pre> + * &lt;complexType name="runTestResponse"> + * &lt;complexContent> + * &lt;restriction base="{http://www.w3.org/2001/XMLSchema}anyType"> + * &lt;sequence> + * &lt;element name="return" type="{http://www.w3.org/2001/XMLSchema}boolean"/> + * &lt;/sequence> + * &lt;/restriction> + * &lt;/complexContent> + * &lt;/complexType> + * </pre> + * + * + */ +(a)XmlAccessorType(XmlAccessType.FIELD) +@XmlType(name = "runTestResponse", propOrder = { + "_return" +}) +public class RunTestResponse { + + @XmlElement(name = "return") + protected boolean _return; + + /** + * Gets the value of the return property. + * + */ + public boolean isReturn() { + return _return; + } + + /** + * Sets the value of the return property. + * + */ + public void setReturn(boolean value) { + this._return = value; + } + +} Added: trunk/integration-tests/src/test/resources/samples/Quickstart_bpel_secure_service_testharness/war/src/org/jboss/soa/bpel/tests/harness/SecureServiceTestHarness.java =================================================================== --- trunk/integration-tests/src/test/resources/samples/Quickstart_bpel_secure_service_testharness/war/src/org/jboss/soa/bpel/tests/harness/SecureServiceTestHarness.java (rev 0) +++ trunk/integration-tests/src/test/resources/samples/Quickstart_bpel_secure_service_testharness/war/src/org/jboss/soa/bpel/tests/harness/SecureServiceTestHarness.java 2010-06-16 10:23:32 UTC (rev 750) @@ -0,0 +1,30 @@ +package org.jboss.soa.bpel.tests.harness; + +import javax.jws.WebMethod; +import javax.jws.WebParam; +import javax.jws.WebResult; +import javax.jws.WebService; +import javax.xml.bind.annotation.XmlSeeAlso; +import javax.xml.ws.RequestWrapper; +import javax.xml.ws.ResponseWrapper; + +/** + * This class was generated by Apache CXF 2.2.6 + * Mon Jun 14 11:12:40 BST 2010 + * Generated source version: 2.2.6 + * + */ + +@WebService(targetNamespace = "http://harness.tests.bpel.soa.jboss.org/", name = "SecureServiceTestHarness") +(a)XmlSeeAlso({ObjectFactory.class}) +public interface SecureServiceTestHarness { + + @WebResult(name = "return", targetNamespace = "") + @RequestWrapper(localName = "runTest", targetNamespace = "http://harness.tests.bpel.soa.jboss.org/", className = "org.jboss.soa.bpel.tests.harness.RunTest") + @ResponseWrapper(localName = "runTestResponse", targetNamespace = "http://harness.tests.bpel.soa.jboss.org/", className = "org.jboss.soa.bpel.tests.harness.RunTestResponse") + @WebMethod + public boolean runTest( + @WebParam(name = "arg0", targetNamespace = "") + int arg0 + ); +} Added: trunk/integration-tests/src/test/resources/samples/Quickstart_bpel_secure_service_testharness/war/src/org/jboss/soa/bpel/tests/harness/SecureServiceTestHarnessImpl.java =================================================================== --- trunk/integration-tests/src/test/resources/samples/Quickstart_bpel_secure_service_testharness/war/src/org/jboss/soa/bpel/tests/harness/SecureServiceTestHarnessImpl.java (rev 0) +++ trunk/integration-tests/src/test/resources/samples/Quickstart_bpel_secure_service_testharness/war/src/org/jboss/soa/bpel/tests/harness/SecureServiceTestHarnessImpl.java 2010-06-16 10:23:32 UTC (rev 750) @@ -0,0 +1,98 @@ + +/** + * Please modify this class to meet your needs + * This class is not complete + */ + +package org.jboss.soa.bpel.tests.harness; + +import java.util.logging.Logger; +import javax.jws.WebMethod; +import javax.jws.WebParam; +import javax.jws.WebResult; +import javax.jws.WebService; +import javax.xml.bind.annotation.XmlSeeAlso; +import javax.xml.ws.RequestWrapper; +import javax.xml.ws.ResponseWrapper; + +import java.io.File; +import java.net.MalformedURLException; +import java.net.URL; +import java.util.HashMap; +import java.util.Map; + +import javax.xml.namespace.QName; +import javax.xml.soap.MessageFactory; +import javax.xml.soap.SOAPMessage; +import javax.xml.ws.Dispatch; +import javax.xml.ws.Service; + +import org.apache.cxf.Bus; +import org.apache.cxf.bus.spring.SpringBusFactory; +import org.apache.cxf.ws.security.wss4j.WSS4JInInterceptor; +import org.apache.cxf.ws.security.wss4j.WSS4JOutInterceptor; + +/** + * This class was generated by Apache CXF 2.2.6 + * Mon Jun 14 11:12:40 BST 2010 + * Generated source version: 2.2.6 + * + */ + +(a)javax.jws.WebService( + serviceName = "SecureServiceTestHarnessService", + portName = "SecureServiceTestHarnessPort", + targetNamespace = "http://harness.tests.bpel.soa.jboss.org/", + endpointInterface = "org.jboss.soa.bpel.tests.harness.SecureServiceTestHarness") + +public class SecureServiceTestHarnessImpl implements SecureServiceTestHarness { + + private static final QName SERVICE_NAME = new QName("http://www.jboss.org/bpel/examples/wsdl";, "SecureHelloService"); + + private static final Logger LOG = Logger.getLogger(SecureServiceTestHarnessImpl.class.getName()); + + /* (non-Javadoc) + * @see org.jboss.soa.bpel.tests.harness.SecureServiceTestHarness#runTest(int arg0 )* + */ + public boolean runTest(int arg0) { + LOG.info("Executing operation runTest("+arg0+")"); + + try { + SpringBusFactory bf = new SpringBusFactory(); + URL busFile = SecureServiceTestHarnessImpl.class.getResource("/wssec.xml"); + + Bus bus = bf.createBus(busFile.toString()); + bf.setThreadDefaultBus(bus); + + QName portName=new QName("http://www.jboss.org/bpel/examples/wsdl";, "SecureHelloPort"); + + URL wsdlURL = new URL("http://127.0.0.1:8080/Quickstart_bpel_secure_serviceWS?wsdl"); + + Service service = Service.create(wsdlURL, SERVICE_NAME); + Dispatch<SOAPMessage> dispatcher = service.createDispatch( + portName, SOAPMessage.class, Service.Mode.MESSAGE); + + MessageFactory factory = MessageFactory.newInstance(); + + String str="<soapenv:Envelope xmlns:soapenv=\"http://schemas.xmlsoap.org/soap/envelope/\" xmlns:wsdl=\"http://www.jboss.org/bpel/examples/wsdl\">"+ + "<soapenv:Header/><soapenv:Body><wsdl:hello><TestPart>Hello</TestPart></wsdl:hello></soapenv:Body></soapenv:Envelope>"; + + java.io.InputStream is=new java.io.ByteArrayInputStream(str.getBytes()); + + SOAPMessage soapReq1 = factory.createMessage(null, is); + + System.out.println("Invoking server through Dispatch interface using SOAPMessage"); + SOAPMessage soapResp = dispatcher.invoke(soapReq1); + + String result=soapResp.getSOAPBody().getTextContent(); + + System.out.println("Response from server: " + result); + + return result.contains("Hello World"); + } catch (Exception ex) { + ex.printStackTrace(); + throw new RuntimeException(ex); + } + } + +} Added: trunk/integration-tests/src/test/resources/samples/Quickstart_bpel_secure_service_testharness/war/src/org/jboss/soa/bpel/tests/harness/SecureServiceTestHarnessService.java =================================================================== --- trunk/integration-tests/src/test/resources/samples/Quickstart_bpel_secure_service_testharness/war/src/org/jboss/soa/bpel/tests/harness/SecureServiceTestHarnessService.java (rev 0) +++ trunk/integration-tests/src/test/resources/samples/Quickstart_bpel_secure_service_testharness/war/src/org/jboss/soa/bpel/tests/harness/SecureServiceTestHarnessService.java 2010-06-16 10:23:32 UTC (rev 750) @@ -0,0 +1,77 @@ + +/* + * + */ + +package org.jboss.soa.bpel.tests.harness; + +import java.net.MalformedURLException; +import java.net.URL; +import javax.xml.namespace.QName; +import javax.xml.ws.WebEndpoint; +import javax.xml.ws.WebServiceClient; +import javax.xml.ws.WebServiceFeature; +import javax.xml.ws.Service; + +/** + * This class was generated by Apache CXF 2.2.6 + * Mon Jun 14 11:12:40 BST 2010 + * Generated source version: 2.2.6 + * + */ + + +@WebServiceClient(name = "SecureServiceTestHarnessService", + wsdlLocation = "file:/home/gbrown/dev/riftsaw/workspace/TestHarness/wsdl/SecureServiceTestHarnessService.wsdl", + targetNamespace = "http://harness.tests.bpel.soa.jboss.org/") +public class SecureServiceTestHarnessService extends Service { + + public final static URL WSDL_LOCATION; + public final static QName SERVICE = new QName("http://harness.tests.bpel.soa.jboss.org/";, "SecureServiceTestHarnessService"); + public final static QName SecureServiceTestHarnessPort = new QName("http://harness.tests.bpel.soa.jboss.org/";, "SecureServiceTestHarnessPort"); + static { + URL url = null; + try { + url = new URL("file:/home/gbrown/dev/riftsaw/workspace/TestHarness/wsdl/SecureServiceTestHarnessService.wsdl"); + } catch (MalformedURLException e) { + System.err.println("Can not initialize the default wsdl from file:/home/gbrown/dev/riftsaw/workspace/TestHarness/wsdl/SecureServiceTestHarnessService.wsdl"); + // e.printStackTrace(); + } + WSDL_LOCATION = url; + } + + public SecureServiceTestHarnessService(URL wsdlLocation) { + super(wsdlLocation, SERVICE); + } + + public SecureServiceTestHarnessService(URL wsdlLocation, QName serviceName) { + super(wsdlLocation, serviceName); + } + + public SecureServiceTestHarnessService() { + super(WSDL_LOCATION, SERVICE); + } + + /** + * + * @return + * returns SecureServiceTestHarness + */ + @WebEndpoint(name = "SecureServiceTestHarnessPort") + public SecureServiceTestHarness getSecureServiceTestHarnessPort() { + return super.getPort(SecureServiceTestHarnessPort, SecureServiceTestHarness.class); + } + + /** + * + * @param features + * A list of {@link javax.xml.ws.WebServiceFeature} to configure on the proxy. Supported features not in the <code>features</code> parameter will have their default values. + * @return + * returns SecureServiceTestHarness + */ + @WebEndpoint(name = "SecureServiceTestHarnessPort") + public SecureServiceTestHarness getSecureServiceTestHarnessPort(WebServiceFeature... features) { + return super.getPort(SecureServiceTestHarnessPort, SecureServiceTestHarness.class, features); + } + +} Added: trunk/integration-tests/src/test/resources/samples/Quickstart_bpel_secure_service_testharness/war/src/org/jboss/soa/bpel/tests/harness/SecureServiceTestHarness_SecureServiceTestHarnessPort_Client.java =================================================================== --- trunk/integration-tests/src/test/resources/samples/Quickstart_bpel_secure_service_testharness/war/src/org/jboss/soa/bpel/tests/harness/SecureServiceTestHarness_SecureServiceTestHarnessPort_Client.java (rev 0) +++ trunk/integration-tests/src/test/resources/samples/Quickstart_bpel_secure_service_testharness/war/src/org/jboss/soa/bpel/tests/harness/SecureServiceTestHarness_SecureServiceTestHarnessPort_Client.java 2010-06-16 10:23:32 UTC (rev 750) @@ -0,0 +1,65 @@ + +package org.jboss.soa.bpel.tests.harness; + +/** + * Please modify this class to meet your needs + * This class is not complete + */ + +import java.io.File; +import java.net.MalformedURLException; +import java.net.URL; +import javax.xml.namespace.QName; +import javax.jws.WebMethod; +import javax.jws.WebParam; +import javax.jws.WebResult; +import javax.jws.WebService; +import javax.xml.bind.annotation.XmlSeeAlso; +import javax.xml.ws.RequestWrapper; +import javax.xml.ws.ResponseWrapper; + +/** + * This class was generated by Apache CXF 2.2.6 + * Mon Jun 14 11:12:40 BST 2010 + * Generated source version: 2.2.6 + * + */ + +public final class SecureServiceTestHarness_SecureServiceTestHarnessPort_Client { + + private static final QName SERVICE_NAME = new QName("http://harness.tests.bpel.soa.jboss.org/";, "SecureServiceTestHarnessService"); + + private SecureServiceTestHarness_SecureServiceTestHarnessPort_Client() { + } + + public static void main(String args[]) throws Exception { + URL wsdlURL = SecureServiceTestHarnessService.WSDL_LOCATION; + if (args.length > 0) { + File wsdlFile = new File(args[0]); + try { + if (wsdlFile.exists()) { + wsdlURL = wsdlFile.toURI().toURL(); + } else { + wsdlURL = new URL(args[0]); + } + } catch (MalformedURLException e) { + e.printStackTrace(); + } + } + + SecureServiceTestHarnessService ss = new SecureServiceTestHarnessService(wsdlURL, SERVICE_NAME); + SecureServiceTestHarness port = ss.getSecureServiceTestHarnessPort(); + + { + System.out.println("Invoking runTest..."); + int _runTest_arg0 = 0; + boolean _runTest__return = port.runTest(_runTest_arg0); + System.out.println("runTest.result=" + _runTest__return); + + + } + + System.exit(0); + } + +} Added: trunk/integration-tests/src/test/resources/samples/Quickstart_bpel_secure_service_testharness/war/src/org/jboss/soa/bpel/tests/harness/SecureServiceTestHarness_SecureServiceTestHarnessPort_Server.java =================================================================== --- trunk/integration-tests/src/test/resources/samples/Quickstart_bpel_secure_service_testharness/war/src/org/jboss/soa/bpel/tests/harness/SecureServiceTestHarness_SecureServiceTestHarnessPort_Server.java (rev 0) +++ trunk/integration-tests/src/test/resources/samples/Quickstart_bpel_secure_service_testharness/war/src/org/jboss/soa/bpel/tests/harness/SecureServiceTestHarness_SecureServiceTestHarnessPort_Server.java 2010-06-16 10:23:32 UTC (rev 750) @@ -0,0 +1,30 @@ + +package org.jboss.soa.bpel.tests.harness; + +import javax.xml.ws.Endpoint; + +/** + * This class was generated by Apache CXF 2.2.6 + * Mon Jun 14 11:12:40 BST 2010 + * Generated source version: 2.2.6 + * + */ + +public class SecureServiceTestHarness_SecureServiceTestHarnessPort_Server{ + + protected SecureServiceTestHarness_SecureServiceTestHarnessPort_Server() throws Exception { + System.out.println("Starting Server"); + Object implementor = new SecureServiceTestHarnessImpl(); + String address = "http://localhost:9090/SecureServiceTestHarnessPort"; + Endpoint.publish(address, implementor); + } + + public static void main(String args[]) throws Exception { + new SecureServiceTestHarness_SecureServiceTestHarnessPort_Server(); + System.out.println("Server ready..."); + + Thread.sleep(5 * 60 * 1000); + System.out.println("Server exiting"); + System.exit(0); + } +} Added: trunk/integration-tests/src/test/resources/samples/Quickstart_bpel_secure_service_testharness/war/src/org/jboss/soa/bpel/tests/harness/package-info.java =================================================================== --- trunk/integration-tests/src/test/resources/samples/Quickstart_bpel_secure_service_testharness/war/src/org/jboss/soa/bpel/tests/harness/package-info.java (rev 0) +++ trunk/integration-tests/src/test/resources/samples/Quickstart_bpel_secure_service_testharness/war/src/org/jboss/soa/bpel/tests/harness/package-info.java 2010-06-16 10:23:32 UTC (rev 750) @@ -0,0 +1,2 @@ +(a)javax.xml.bind.annotation.XmlSchema(namespace = "http://harness.tests.bpel.soa.jboss.org/") +package org.jboss.soa.bpel.tests.harness; Added: trunk/integration-tests/src/test/resources/samples/Quickstart_bpel_secure_service_testharness/war/view/index.jsp =================================================================== --- trunk/integration-tests/src/test/resources/samples/Quickstart_bpel_secure_service_testharness/war/view/index.jsp (rev 0) +++ trunk/integration-tests/src/test/resources/samples/Quickstart_bpel_secure_service_testharness/war/view/index.jsp 2010-06-16 10:23:32 UTC (rev 750) @@ -0,0 +1,9 @@ +<html> + <body> + This is just a place holder.<br> + Verify the that the WS has been deployed by hitting + <a href="http://localhost:8080/jbossws"> + http://localhost:8080/jbossws + </a> + </body> +</html> \ No newline at end of file Added: trunk/integration-tests/src/test/resources/samples/Quickstart_bpel_secure_service_testharness/wsdl/SecureServiceTestHarnessService.wsdl =================================================================== --- trunk/integration-tests/src/test/resources/samples/Quickstart_bpel_secure_service_testharness/wsdl/SecureServiceTestHarnessService.wsdl (rev 0) +++ trunk/integration-tests/src/test/resources/samples/Quickstart_bpel_secure_service_testharness/wsdl/SecureServiceTestHarnessService.wsdl 2010-06-16 10:23:32 UTC (rev 750) @@ -0,0 +1,52 @@ +<?xml version="1.0" encoding="UTF-8"?> +<wsdl:definitions name="SecureServiceTestHarnessService" targetNamespace="http://harness.tests.bpel.soa.jboss.org/" xmlns:wsdl="http://schemas.xmlsoap.org/wsdl/" xmlns:tns="http://harness.tests.bpel.soa.jboss.org/" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:soap="http://schemas.xmlsoap.org/wsdl/soap/"> + <wsdl:types> +<xs:schema xmlns:xs="http://www.w3.org/2001/XMLSchema" xmlns:tns="http://harness.tests.bpel.soa.jboss.org/" elementFormDefault="unqualified" targetNamespace="http://harness.tests.bpel.soa.jboss.org/" version="1.0"> +<xs:element name="runTest" type="tns:runTest"/> +<xs:element name="runTestResponse" type="tns:runTestResponse"/> +<xs:complexType name="runTest"> +<xs:sequence> +<xs:element name="arg0" type="xs:int"/> +</xs:sequence> +</xs:complexType> +<xs:complexType name="runTestResponse"> +<xs:sequence> +<xs:element name="return" type="xs:boolean"/> +</xs:sequence> +</xs:complexType> +</xs:schema> + </wsdl:types> + <wsdl:message name="runTest"> + <wsdl:part name="parameters" element="tns:runTest"> + </wsdl:part> + </wsdl:message> + <wsdl:message name="runTestResponse"> + <wsdl:part name="parameters" element="tns:runTestResponse"> + </wsdl:part> + </wsdl:message> + <wsdl:portType name="SecureServiceTestHarness"> + <wsdl:operation name="runTest"> + <wsdl:input name="runTest" message="tns:runTest"> + </wsdl:input> + <wsdl:output name="runTestResponse" message="tns:runTestResponse"> + </wsdl:output> + </wsdl:operation> + </wsdl:portType> + <wsdl:binding name="SecureServiceTestHarnessServiceSoapBinding" type="tns:SecureServiceTestHarness"> + <soap:binding style="document" transport="http://schemas.xmlsoap.org/soap/http"/> + <wsdl:operation name="runTest"> + <soap:operation soapAction="" style="document"/> + <wsdl:input name="runTest"> + <soap:body use="literal"/> + </wsdl:input> + <wsdl:output name="runTestResponse"> + <soap:body use="literal"/> + </wsdl:output> + </wsdl:operation> + </wsdl:binding> + <wsdl:service name="SecureServiceTestHarnessService"> + <wsdl:port name="SecureServiceTestHarnessPort" binding="tns:SecureServiceTestHarnessServiceSoapBinding"> + <soap:address location="http://127.0.0.1:8080/Quickstart_bpel_secure_service_testharness/SecureServiceTestHarnessWS"/> + </wsdl:port> + </wsdl:service> +</wsdl:definitions> Modified: trunk/pom.xml =================================================================== --- trunk/pom.xml 2010-06-16 03:19:07 UTC (rev 749) +++ trunk/pom.xml 2010-06-16 10:23:32 UTC (rev 750) @@ -72,7 +72,8 @@ </profiles> <properties> - <riftsaw.ode.version>2.2.0-SNAPSHOT</riftsaw.ode.version> + <riftsaw.ode.version>2.1.0.CR1</riftsaw.ode.version> <!-- This version needs to change when trunk requires + ODE changes, but for now we reuse the 2.1.0.CR1 version --> <riftsaw.engine.version>2.2.0-SNAPSHOT</riftsaw.engine.version> <bpm.console.version>2.1</bpm.console.version> <commons.logging.version>1.1.1</commons.logging.version> @@ -88,7 +89,7 @@ <commons.codec.version>1.3</commons.codec.version> <xerces.version>2.9.0</xerces.version> <commons.httpclient.version>3.1</commons.httpclient.version> - <cxf.version>2.2.8</cxf.version> + <cxf.version>2.2.6</cxf.version> </properties> <dependencyManagement>