May 2012 - jbossws-commits - Jboss List Archives

JBossWS SVN: r16236 - in stack/cxf/trunk/modules/testsuite: cxf-tests/scripts and 6 other directories.

by jbossws-commits＠lists.jboss.org

Author: alessio.soldano(a)jboss.com Date: 2012-05-08 06:48:49 -0400 (Tue, 08 May 2012) New Revision: 16236 Added: stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/samples/wsse/policy/trustPicketLink/ stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/samples/wsse/policy/trustPicketLink/ClientCallbackHandler.java stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/samples/wsse/policy/trustPicketLink/PicketLinkSTService.java stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/samples/wsse/policy/trustPicketLink/ServerCallbackHandler.java stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/samples/wsse/policy/trustPicketLink/ServiceIface.java stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/samples/wsse/policy/trustPicketLink/ServiceImpl.java stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/samples/wsse/policy/trustPicketLink/WSTrustPicketLinkTestCase.java stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/resources/jaxws/samples/wsse/policy/trustPicketLink/ stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/resources/jaxws/samples/wsse/policy/trustPicketLink/WEB-INF/ stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/resources/jaxws/samples/wsse/policy/trustPicketLink/WEB-INF/jboss-web.xml stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/resources/jaxws/samples/wsse/policy/trustPicketLink/WEB-INF/picketlink-sts.xml stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/resources/jaxws/samples/wsse/policy/trustPicketLink/WEB-INF/stsstore.jks stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/resources/jaxws/samples/wsse/policy/trustPicketLink/WEB-INF/web.xml stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/resources/jaxws/samples/wsse/policy/trustPicketLink/WEB-INF/wsdl/ stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/resources/jaxws/samples/wsse/policy/trustPicketLink/WEB-INF/wsdl/PicketLinkSTS.wsdl Modified: stack/cxf/trunk/modules/testsuite/cxf-tests/scripts/cxf-samples-jars-jaxws.xml stack/cxf/trunk/modules/testsuite/pom.xml Log: [JBWs-3493] Initial WS-Trust test using PicketLink STS impl. Test currently excluded as it needs PL 2.1.2 Modified: stack/cxf/trunk/modules/testsuite/cxf-tests/scripts/cxf-samples-jars-jaxws.xml =================================================================== --- stack/cxf/trunk/modules/testsuite/cxf-tests/scripts/cxf-samples-jars-jaxws.xml 2012-05-08 10:36:47 UTC (rev 16235) +++ stack/cxf/trunk/modules/testsuite/cxf-tests/scripts/cxf-samples-jars-jaxws.xml 2012-05-08 10:48:49 UTC (rev 16236) @@ -254,6 +254,26 @@ </metainf> </jar> +  + <war + warfile="${tests.output.dir}/test-libs/jaxws-samples-wsse-policy-trustPicketLink-sts.war" + webxml="${tests.output.dir}/test-resources/jaxws/samples/wsse/policy/trustPicketLink/WEB-INF/web.xml"> + <classes dir="${tests.output.dir}/test-classes"> + <include name="org/jboss/test/ws/jaxws/samples/wsse/policy/trustPicketLink/PicketLinkSTService.class"/> + </classes> + <webinf dir="${tests.output.dir}/test-resources/jaxws/samples/wsse/policy/trustPicketLink/WEB-INF"> + <include name="wsdl/PicketLinkSTS.wsdl"/> + <include name="jboss-web.xml"/>  + </webinf> + <zipfileset dir="${tests.output.dir}/test-resources/jaxws/samples/wsse/policy/trustPicketLink/WEB-INF" prefix="WEB-INF/classes"> + <include name="stsstore.jks" /> + <include name="picketlink-sts.xml" /> + </zipfileset> + <manifest> + <attribute name="Dependencies" value="org.picketlink"/> + </manifest> + </war> +  <war warfile="${tests.output.dir}/test-libs/jaxws-samples-wsse-policy-username-unsecure-transport.war" Added: stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/samples/wsse/policy/trustPicketLink/ClientCallbackHandler.java =================================================================== --- stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/samples/wsse/policy/trustPicketLink/ClientCallbackHandler.java (rev 0) +++ stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/samples/wsse/policy/trustPicketLink/ClientCallbackHandler.java 2012-05-08 10:48:49 UTC (rev 16236) @@ -0,0 +1,53 @@ +/* + * JBoss, Home of Professional Open Source. + * Copyright 2012, Red Hat Middleware LLC, and individual contributors + * as indicated by the @author tags. See the copyright.txt file in the + * distribution for a full listing of individual contributors. + * + * This is free software; you can redistribute it and/or modify it + * under the terms of the GNU Lesser General Public License as + * published by the Free Software Foundation; either version 2.1 of + * the License, or (at your option) any later version. + * + * This software is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this software; if not, write to the Free + * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA + * 02110-1301 USA, or see the FSF site: http://www.fsf.org. + */ +package org.jboss.test.ws.jaxws.samples.wsse.policy.trustPicketLink; + +import java.io.IOException; +import javax.security.auth.callback.Callback; +import javax.security.auth.callback.CallbackHandler; +import javax.security.auth.callback.UnsupportedCallbackException; +import org.apache.ws.security.WSPasswordCallback; + +public class ClientCallbackHandler implements CallbackHandler { + + public void handle(Callback[] callbacks) throws IOException, + UnsupportedCallbackException { + for (int i = 0; i < callbacks.length; i++) { + if (callbacks[i] instanceof WSPasswordCallback) { + WSPasswordCallback pc = (WSPasswordCallback) callbacks[i]; + if ("myclientkey".equals(pc.getIdentifier())) { + pc.setPassword("ckpass"); + break; + } else if ("alice".equals(pc.getIdentifier())) { + pc.setPassword("clarinet"); + break; + } else if ("bob".equals(pc.getIdentifier())) { + pc.setPassword("trombone"); + break; + } else if ("eve".equals(pc.getIdentifier())) { + pc.setPassword("evekpass"); + break; + } + } + } + } +} Added: stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/samples/wsse/policy/trustPicketLink/PicketLinkSTService.java =================================================================== --- stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/samples/wsse/policy/trustPicketLink/PicketLinkSTService.java (rev 0) +++ stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/samples/wsse/policy/trustPicketLink/PicketLinkSTService.java 2012-05-08 10:48:49 UTC (rev 16236) @@ -0,0 +1,48 @@ +/* + * JBoss, Home of Professional Open Source. + * Copyright 2012, Red Hat Middleware LLC, and individual contributors + * as indicated by the @author tags. See the copyright.txt file in the + * distribution for a full listing of individual contributors. + * + * This is free software; you can redistribute it and/or modify it + * under the terms of the GNU Lesser General Public License as + * published by the Free Software Foundation; either version 2.1 of + * the License, or (at your option) any later version. + * + * This software is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this software; if not, write to the Free + * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA + * 02110-1301 USA, or see the FSF site: http://www.fsf.org. + */ +package org.jboss.test.ws.jaxws.samples.wsse.policy.trustPicketLink; + +import javax.annotation.Resource; +import javax.xml.ws.Service; +import javax.xml.ws.ServiceMode; +import javax.xml.ws.WebServiceContext; +import javax.xml.ws.WebServiceProvider; + +import org.picketlink.identity.federation.core.wstrust.PicketLinkSTS; + +/** + * A Security Token Service implementation extending default PicketLink one + * + * @author <a href="mailto:sguilhen@redhat.com">Stefan Guilhen</a> + * @author <a href="mailto:pskopek@redhat.com">Peter Skopek</a> + * @author <a href="mailto:alessio.soldano@jboss.com">Alessio Soldano</a> + */ +@WebServiceProvider(serviceName = "PicketLinkSTS", portName = "PicketLinkSTSPort", targetNamespace = "urn:picketlink:identity-federation:sts", wsdlLocation = "WEB-INF/wsdl/PicketLinkSTS.wsdl") +@ServiceMode(value = Service.Mode.MESSAGE) +public class PicketLinkSTService extends PicketLinkSTS +{ + @Resource + public void setWSC(WebServiceContext wctx) { + this.context = wctx; + } + +} Added: stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/samples/wsse/policy/trustPicketLink/ServerCallbackHandler.java =================================================================== --- stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/samples/wsse/policy/trustPicketLink/ServerCallbackHandler.java (rev 0) +++ stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/samples/wsse/policy/trustPicketLink/ServerCallbackHandler.java 2012-05-08 10:48:49 UTC (rev 16236) @@ -0,0 +1,44 @@ +/* + * JBoss, Home of Professional Open Source. + * Copyright 2012, Red Hat Middleware LLC, and individual contributors + * as indicated by the @author tags. See the copyright.txt file in the + * distribution for a full listing of individual contributors. + * + * This is free software; you can redistribute it and/or modify it + * under the terms of the GNU Lesser General Public License as + * published by the Free Software Foundation; either version 2.1 of + * the License, or (at your option) any later version. + * + * This software is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this software; if not, write to the Free + * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA + * 02110-1301 USA, or see the FSF site: http://www.fsf.org. + */ +package org.jboss.test.ws.jaxws.samples.wsse.policy.trustPicketLink; + +import java.io.IOException; +import javax.security.auth.callback.Callback; +import javax.security.auth.callback.CallbackHandler; +import javax.security.auth.callback.UnsupportedCallbackException; +import org.apache.ws.security.WSPasswordCallback; + +public class ServerCallbackHandler implements CallbackHandler { + + public void handle(Callback[] callbacks) throws IOException, + UnsupportedCallbackException { + for (int i = 0; i < callbacks.length; i++) { + if (callbacks[i] instanceof WSPasswordCallback) { // CXF + WSPasswordCallback pc = (WSPasswordCallback) callbacks[i]; + if ("myservicekey".equals(pc.getIdentifier())) { + pc.setPassword("skpass"); + break; + } + } + } + } +} Added: stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/samples/wsse/policy/trustPicketLink/ServiceIface.java =================================================================== --- stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/samples/wsse/policy/trustPicketLink/ServiceIface.java (rev 0) +++ stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/samples/wsse/policy/trustPicketLink/ServiceIface.java 2012-05-08 10:48:49 UTC (rev 16236) @@ -0,0 +1,35 @@ +/* + * JBoss, Home of Professional Open Source. + * Copyright 2012, Red Hat Middleware LLC, and individual contributors + * as indicated by the @author tags. See the copyright.txt file in the + * distribution for a full listing of individual contributors. + * + * This is free software; you can redistribute it and/or modify it + * under the terms of the GNU Lesser General Public License as + * published by the Free Software Foundation; either version 2.1 of + * the License, or (at your option) any later version. + * + * This software is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this software; if not, write to the Free + * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA + * 02110-1301 USA, or see the FSF site: http://www.fsf.org. + */ +package org.jboss.test.ws.jaxws.samples.wsse.policy.trustPicketLink; + +import javax.jws.WebMethod; +import javax.jws.WebService; + +@WebService +( + targetNamespace = "http://www.jboss.org/jbossws/ws-extensions/wssecuritypolicy" +) +public interface ServiceIface +{ + @WebMethod + String sayHello(); +} Added: stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/samples/wsse/policy/trustPicketLink/ServiceImpl.java =================================================================== --- stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/samples/wsse/policy/trustPicketLink/ServiceImpl.java (rev 0) +++ stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/samples/wsse/policy/trustPicketLink/ServiceImpl.java 2012-05-08 10:48:49 UTC (rev 16236) @@ -0,0 +1,49 @@ +/* + * JBoss, Home of Professional Open Source. + * Copyright 2012, Red Hat Middleware LLC, and individual contributors + * as indicated by the @author tags. See the copyright.txt file in the + * distribution for a full listing of individual contributors. + * + * This is free software; you can redistribute it and/or modify it + * under the terms of the GNU Lesser General Public License as + * published by the Free Software Foundation; either version 2.1 of + * the License, or (at your option) any later version. + * + * This software is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this software; if not, write to the Free + * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA + * 02110-1301 USA, or see the FSF site: http://www.fsf.org. + */ +package org.jboss.test.ws.jaxws.samples.wsse.policy.trustPicketLink; + +import javax.jws.WebService; + +import org.apache.cxf.annotations.EndpointProperties; +import org.apache.cxf.annotations.EndpointProperty; + +@WebService +( + portName = "SecurityServicePort", + serviceName = "SecurityService", + wsdlLocation = "WEB-INF/wsdl/SecurityService.wsdl", + targetNamespace = "http://www.jboss.org/jbossws/ws-extensions/wssecuritypolicy", + endpointInterface = "org.jboss.test.ws.jaxws.samples.wsse.policy.trustPicketLink.ServiceIface" +) +@EndpointProperties(value = { + @EndpointProperty(key = "ws-security.signature.username", value = "myservicekey"), + @EndpointProperty(key = "ws-security.signature.properties", value = "serviceKeystore.properties"), + @EndpointProperty(key = "ws-security.encryption.properties", value = "serviceKeystore.properties"), + @EndpointProperty(key = "ws-security.callback-handler", value = "org.jboss.test.ws.jaxws.samples.wsse.policy.trustPicketLink.ServerCallbackHandler") +}) +public class ServiceImpl implements ServiceIface +{ + public String sayHello() + { + return "WS-Trust Hello World!"; + } +} Added: stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/samples/wsse/policy/trustPicketLink/WSTrustPicketLinkTestCase.java =================================================================== --- stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/samples/wsse/policy/trustPicketLink/WSTrustPicketLinkTestCase.java (rev 0) +++ stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/samples/wsse/policy/trustPicketLink/WSTrustPicketLinkTestCase.java 2012-05-08 10:48:49 UTC (rev 16236) @@ -0,0 +1,121 @@ +/* + * JBoss, Home of Professional Open Source. + * Copyright 2012, Red Hat Middleware LLC, and individual contributors + * as indicated by the @author tags. See the copyright.txt file in the + * distribution for a full listing of individual contributors. + * + * This is free software; you can redistribute it and/or modify it + * under the terms of the GNU Lesser General Public License as + * published by the Free Software Foundation; either version 2.1 of + * the License, or (at your option) any later version. + * + * This software is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this software; if not, write to the Free + * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA + * 02110-1301 USA, or see the FSF site: http://www.fsf.org. + */ +package org.jboss.test.ws.jaxws.samples.wsse.policy.trustPicketLink; + +import java.net.URL; +import java.util.HashMap; +import java.util.Map; + +import javax.xml.namespace.QName; +import javax.xml.ws.BindingProvider; +import javax.xml.ws.Service; + +import junit.framework.Test; + +import org.apache.cxf.Bus; +import org.apache.cxf.BusFactory; +import org.apache.cxf.configuration.security.AuthorizationPolicy; +import org.apache.cxf.transport.http.HTTPConduit; +import org.apache.cxf.ws.security.SecurityConstants; +import org.apache.cxf.ws.security.trust.STSClient; +import org.jboss.wsf.test.JBossWSCXFTestSetup; +import org.jboss.wsf.test.JBossWSTest; + +/** + * WS-Trust test case using PicketLink implementation of STS + * + * @author alessio.soldano(a)jboss.com + * @since 30-Apr-2012 + */ +public final class WSTrustPicketLinkTestCase extends JBossWSTest +{ + private final String serviceURL = "http://" + getServerHost() + ":8080/jaxws-samples-wsse-policy-trust/SecurityService"; + private final String stsURL = "http://" + getServerHost() + ":8080/jaxws-samples-wsse-policy-trustPicketLink-sts/PicketLinkSTS"; + + public static Test suite() + { + //deploy client, STS and service; start a security domain to be used by the STS for authenticating client + JBossWSCXFTestSetup testSetup = new JBossWSCXFTestSetup( + WSTrustPicketLinkTestCase.class, "jaxws-samples-wsse-policy-trust-client.jar jaxws-samples-wsse-policy-trustPicketLink-sts.war jaxws-samples-wsse-policy-trust.war", true); + Map<String, String> authenticationOptions = new HashMap<String, String>(); + authenticationOptions.put("usersProperties", + getResourceFile("jaxws/samples/wsse/policy/trust/WEB-INF/jbossws-users.properties").getAbsolutePath()); + authenticationOptions.put("rolesProperties", + getResourceFile("jaxws/samples/wsse/policy/trust/WEB-INF/jbossws-roles.properties").getAbsolutePath()); + authenticationOptions.put("unauthenticatedIdentity", "anonymous"); + testSetup.addSecurityDomainRequirement("JBossWS-trustPicketLink-sts", authenticationOptions); + return testSetup; + } + + public void test() throws Exception + { + Bus bus = BusFactory.newInstance().createBus(); + try + { + BusFactory.setThreadDefaultBus(bus); + + QName serviceName = new QName("http://www.jboss.org/jbossws/ws-extensions/wssecuritypolicy", "SecurityService"); + URL wsdlURL = new URL(serviceURL + "?wsdl"); + Service service = Service.create(wsdlURL, serviceName); + ServiceIface proxy = (ServiceIface) service.getPort(ServiceIface.class); + setupWsse(proxy, bus); + assertEquals("WS-Trust Hello World!", proxy.sayHello()); + } + finally + { + bus.shutdown(true); + } + } + + private void setupWsse(ServiceIface proxy, Bus bus) throws Exception + { + Map<String, Object> ctx = ((BindingProvider) proxy).getRequestContext(); + ctx.put(SecurityConstants.CALLBACK_HANDLER, new ClientCallbackHandler()); + ctx.put(SecurityConstants.SIGNATURE_PROPERTIES, Thread.currentThread().getContextClassLoader().getResource("META-INF/clientKeystore.properties")); + ctx.put(SecurityConstants.ENCRYPT_PROPERTIES, Thread.currentThread().getContextClassLoader().getResource("META-INF/clientKeystore.properties")); + ctx.put(SecurityConstants.SIGNATURE_USERNAME, "myclientkey"); + ctx.put(SecurityConstants.ENCRYPT_USERNAME, "myservicekey"); + STSClient stsClient = new STSClient(bus); + stsClient.setWsdlLocation(stsURL + "?wsdl"); + stsClient.setServiceQName(new QName("urn:picketlink:identity-federation:sts", "PicketLinkSTS")); + stsClient.setEndpointQName(new QName("urn:picketlink:identity-federation:sts", "PicketLinkSTSPort")); + Map<String, Object> props = stsClient.getProperties(); +// props.put(SecurityConstants.USERNAME, "alice"); +// props.put(SecurityConstants.CALLBACK_HANDLER, new ClientCallbackHandler()); +// props.put(SecurityConstants.ENCRYPT_PROPERTIES, Thread.currentThread().getContextClassLoader().getResource("META-INF/clientKeystore.properties")); +// props.put(SecurityConstants.ENCRYPT_USERNAME, "mystskey"); + props.put(SecurityConstants.STS_TOKEN_USERNAME, "myclientkey"); + props.put(SecurityConstants.STS_TOKEN_PROPERTIES, Thread.currentThread().getContextClassLoader().getResource("META-INF/clientKeystore.properties")); + props.put(SecurityConstants.STS_TOKEN_USE_CERT_FOR_KEYINFO, "true"); + + //set http basic auth to workaround PicketLink STS requiring username to be set in context; this needs to be performed in a CXF specific way, + //as the CXF STSClient does not support setting up basic auth by simple BindingProvider.USERNAME_PROPERTY/USERNAME_PASSWORD setup + HTTPConduit conduit = (HTTPConduit)stsClient.getClient().getConduit(); + AuthorizationPolicy authPolicy = new AuthorizationPolicy(); + authPolicy.setAuthorizationType("BASIC"); + authPolicy.setUserName("alice"); + authPolicy.setPassword("clarinet"); + conduit.setAuthorization(authPolicy); + + ctx.put(SecurityConstants.STS_CLIENT, stsClient); + } +} Added: stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/resources/jaxws/samples/wsse/policy/trustPicketLink/WEB-INF/jboss-web.xml =================================================================== --- stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/resources/jaxws/samples/wsse/policy/trustPicketLink/WEB-INF/jboss-web.xml (rev 0) +++ stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/resources/jaxws/samples/wsse/policy/trustPicketLink/WEB-INF/jboss-web.xml 2012-05-08 10:48:49 UTC (rev 16236) @@ -0,0 +1,7 @@ +<?xml version="1.0" encoding="UTF-8"?> + +<!DOCTYPE jboss-web PUBLIC "-//JBoss//DTD Web Application 2.4//EN" "http://www.jboss.org/j2ee/dtd/jboss-web_4_0.dtd"> + +<jboss-web> + <security-domain>java:/jaas/JBossWS-trustPicketLink-sts</security-domain> +</jboss-web> Added: stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/resources/jaxws/samples/wsse/policy/trustPicketLink/WEB-INF/picketlink-sts.xml =================================================================== --- stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/resources/jaxws/samples/wsse/policy/trustPicketLink/WEB-INF/picketlink-sts.xml (rev 0) +++ stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/resources/jaxws/samples/wsse/policy/trustPicketLink/WEB-INF/picketlink-sts.xml 2012-05-08 10:48:49 UTC (rev 16236) @@ -0,0 +1,24 @@ +<PicketLinkSTS xmlns="urn:picketlink:identity-federation:config:1.0" + STSName="PicketLinkSTS" TokenTimeout="7200" EncryptToken="false"> + <KeyProvider ClassName="org.picketlink.identity.federation.core.impl.KeyStoreKeyManager"> + <Auth Key="KeyStoreURL" Value="stsstore.jks"/> + <Auth Key="KeyStorePass" Value="stsspass"/> + <Auth Key="SigningKeyAlias" Value="mystskey"/> + <Auth Key="SigningKeyPass" Value="stskpass"/> + <ValidatingAlias Key="http://localhost:8080/jaxws-samples-wsse-policy-trust/SecurityService" Value="myservicekey"/> + </KeyProvider> + <TokenProviders> + <TokenProvider ProviderClass="org.picketlink.identity.federation.core.wstrust.plugins.saml.SAML11TokenProvider" + TokenType="http://docs.oasis-open.org/wss/oasis-wss-saml-token-profile-1.1#SAMLV1.1" + TokenElement="Assertion" + TokenElementNS="urn:oasis:names:tc:SAML:1.0:assertion"/> + <TokenProvider ProviderClass="org.picketlink.identity.federation.core.wstrust.plugins.saml.SAML20TokenProvider" + TokenType="http://docs.oasis-open.org/wss/oasis-wss-saml-token-profile-1.1#SAMLV2.0" + TokenElement="Assertion" + TokenElementNS="urn:oasis:names:tc:SAML:2.0:assertion"/> + </TokenProviders> + <ServiceProviders> + <ServiceProvider Endpoint="http://services.testcorp.org/provider1" TokenType="http://docs.oasis-open.org/wss/oasis-wss-saml-token-profile-1.1#SAMLV2.0" + TruststoreAlias="service1"/> + </ServiceProviders> +</PicketLinkSTS> Added: stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/resources/jaxws/samples/wsse/policy/trustPicketLink/WEB-INF/stsstore.jks =================================================================== (Binary files differ) Property changes on: stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/resources/jaxws/samples/wsse/policy/trustPicketLink/WEB-INF/stsstore.jks ___________________________________________________________________ Added: svn:mime-type + application/octet-stream Added: stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/resources/jaxws/samples/wsse/policy/trustPicketLink/WEB-INF/web.xml =================================================================== --- stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/resources/jaxws/samples/wsse/policy/trustPicketLink/WEB-INF/web.xml (rev 0) +++ stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/resources/jaxws/samples/wsse/policy/trustPicketLink/WEB-INF/web.xml 2012-05-08 10:48:49 UTC (rev 16236) @@ -0,0 +1,38 @@ +<?xml version="1.0" encoding="UTF-8"?> +<web-app + version="3.0" + xmlns="http://java.sun.com/xml/ns/javaee" + xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" + xsi:schemaLocation="http://java.sun.com/xml/ns/javaee http://java.sun.com/xml/ns/javaee/web-app_3_0.xsd"> + + <servlet> + <servlet-name>PicketLinkSTS</servlet-name> + <servlet-class>org.jboss.test.ws.jaxws.samples.wsse.policy.trustPicketLink.PicketLinkSTService</servlet-class> + </servlet> + <servlet-mapping> + <servlet-name>PicketLinkSTS</servlet-name> + <url-pattern>/*</url-pattern> + </servlet-mapping> + + <security-constraint> + <web-resource-collection> + <web-resource-name>PicketLinkSTSService</web-resource-name> + <url-pattern>/*</url-pattern> + <http-method>POST</http-method> + </web-resource-collection> + <auth-constraint> + <role-name>friend</role-name> + </auth-constraint> + <user-data-constraint> + <transport-guarantee>NONE</transport-guarantee> + </user-data-constraint> + </security-constraint> + <login-config> + <auth-method>BASIC</auth-method> + <realm-name>Security Realm</realm-name> + </login-config> + <security-role> + <role-name>friend</role-name> + </security-role> + +</web-app> \ No newline at end of file Added: stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/resources/jaxws/samples/wsse/policy/trustPicketLink/WEB-INF/wsdl/PicketLinkSTS.wsdl =================================================================== --- stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/resources/jaxws/samples/wsse/policy/trustPicketLink/WEB-INF/wsdl/PicketLinkSTS.wsdl (rev 0) +++ stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/resources/jaxws/samples/wsse/policy/trustPicketLink/WEB-INF/wsdl/PicketLinkSTS.wsdl 2012-05-08 10:48:49 UTC (rev 16236) @@ -0,0 +1,51 @@ +<?xml version="1.0"?> +<wsdl:definitions name="PicketLinkSTS" targetNamespace="urn:picketlink:identity-federation:sts" + xmlns:tns="urn:picketlink:identity-federation:sts" + xmlns:xsd="http://www.w3.org/2001/XMLSchema" + xmlns:wsdl="http://schemas.xmlsoap.org/wsdl/" + xmlns:wsap10="http://www.w3.org/2006/05/addressing/wsdl" + xmlns:soap12="http://schemas.xmlsoap.org/wsdl/soap12/"> + <wsdl:types> + <xs:schema targetNamespace="urn:picketlink:identity-federation:sts" + xmlns:tns="urn:picketlink:identity-federation:sts" + xmlns:xs="http://www.w3.org/2001/XMLSchema" + version="1.0" elementFormDefault="qualified"> + <xs:element name="MessageBody"> + <xs:complexType> + <xs:sequence> + <xs:any minOccurs="0" maxOccurs="unbounded" namespace="##any"/> + </xs:sequence> + </xs:complexType> + </xs:element> + </xs:schema> + </wsdl:types> + <wsdl:message name="RequestSecurityToken"> + <wsdl:part name="rstMessage" element="tns:MessageBody"/> + </wsdl:message> + <wsdl:message name="RequestSecurityTokenResponse"> + <wsdl:part name="rstrMessage" element="tns:MessageBody"/> + </wsdl:message> + <wsdl:portType name="SecureTokenService"> + <wsdl:operation name="IssueToken"> + <wsdl:input wsap10:Action="http://docs.oasis-open.org/ws-sx/ws-trust/200512/RST/Issue" message="tns:RequestSecurityToken"/> + <wsdl:output wsap10:Action="http://docs.oasis-open.org/ws-sx/ws-trust/200512/RSTR/Issue" message="tns:RequestSecurityTokenResponse"/> + </wsdl:operation> + </wsdl:portType> + <wsdl:binding name="STSBinding" type="tns:SecureTokenService"> + <soap12:binding transport="http://schemas.xmlsoap.org/soap/http"/> + <wsdl:operation name="IssueToken"> + <soap12:operation soapAction="http://docs.oasis-open.org/ws-sx/ws-trust/200512/RST/Issue" style="document"/> + <wsdl:input> + <soap12:body use="literal"/> + </wsdl:input> + <wsdl:output> + <soap12:body use="literal"/> + </wsdl:output> + </wsdl:operation> + </wsdl:binding> + <wsdl:service name="PicketLinkSTS"> + <wsdl:port name="PicketLinkSTSPort" binding="tns:STSBinding"> + <soap12:address location="http://localhost:8080/picketlink-sts/PicketLinkSTS"/> + </wsdl:port> + </wsdl:service> +</wsdl:definitions> Modified: stack/cxf/trunk/modules/testsuite/pom.xml =================================================================== --- stack/cxf/trunk/modules/testsuite/pom.xml 2012-05-08 10:36:47 UTC (rev 16235) +++ stack/cxf/trunk/modules/testsuite/pom.xml 2012-05-08 10:48:49 UTC (rev 16236) @@ -749,6 +749,9 @@  <exclude>org/jboss/test/ws/jaxws/cxf/spring/ClientSpringAppTestCase*</exclude> +  + <exclude>org/jboss/test/ws/jaxws/samples/wsse/policy/trustPicketLink/**</exclude> +  <exclude>org/jboss/test/ws/jaxws/jbws2259/**</exclude> <exclude>org/jboss/test/ws/jaxws/jbws2978/**</exclude> @@ -957,6 +960,9 @@  <exclude>org/jboss/test/ws/jaxws/samples/wsse/UsernameAuthorizationCustomFileTestCase*</exclude> +  + <exclude>org/jboss/test/ws/jaxws/samples/wsse/policy/trustPicketLink/**</exclude> +  <exclude>org/jboss/test/ws/jaxws/samples/jaxr/**</exclude> @@ -1178,6 +1184,9 @@  <exclude>org/jboss/test/ws/jaxws/samples/wsse/UsernameAuthorizationCustomFileTestCase*</exclude> +  + <exclude>org/jboss/test/ws/jaxws/samples/wsse/policy/trustPicketLink/**</exclude> +  <exclude>org/jboss/test/ws/jaxws/samples/jaxr/**</exclude> @@ -1395,6 +1404,9 @@  <exclude>org/jboss/test/ws/jaxws/cxf/jms/**</exclude> <exclude>org/jboss/test/ws/jaxws/cxf/jms_http/**</exclude> + +  + <exclude>org/jboss/test/ws/jaxws/samples/wsse/policy/trustPicketLink/**</exclude>  <exclude>org/jboss/test/ws/jaxws/samples/jaxr/**</exclude>

12 years, 7 months

1
0
0 / 0

JBossWS SVN: r16235 - in stack/cxf/trunk: modules/testsuite/cxf-spring-tests and 1 other directories.

by jbossws-commits＠lists.jboss.org

Author: alessio.soldano(a)jboss.com Date: 2012-05-08 06:36:47 -0400 (Tue, 08 May 2012) New Revision: 16235 Modified: stack/cxf/trunk/modules/testsuite/cxf-spring-tests/pom.xml stack/cxf/trunk/modules/testsuite/cxf-tests/pom.xml stack/cxf/trunk/pom.xml Log: [JBWS-3493] Adding test dependency to PicketLink and cleaning up dependency tree a bit by using the picketbox coming from picketlink Modified: stack/cxf/trunk/modules/testsuite/cxf-spring-tests/pom.xml =================================================================== --- stack/cxf/trunk/modules/testsuite/cxf-spring-tests/pom.xml 2012-05-04 08:30:05 UTC (rev 16234) +++ stack/cxf/trunk/modules/testsuite/cxf-spring-tests/pom.xml 2012-05-08 10:36:47 UTC (rev 16235) @@ -21,15 +21,9 @@ <version>${project.version}</version> </dependency> <dependency> - <groupId>org.picketbox</groupId> - <artifactId>picketbox-bare</artifactId> + <groupId>org.picketlink</groupId> + <artifactId>picketlink-core</artifactId> <scope>test</scope> - <exclusions> - <exclusion> - <groupId>org.jboss.logging</groupId> - <artifactId>jboss-logging-spi</artifactId> - </exclusion> - </exclusions> </dependency> <dependency> <groupId>org.springframework</groupId> Modified: stack/cxf/trunk/modules/testsuite/cxf-tests/pom.xml =================================================================== --- stack/cxf/trunk/modules/testsuite/cxf-tests/pom.xml 2012-05-04 08:30:05 UTC (rev 16234) +++ stack/cxf/trunk/modules/testsuite/cxf-tests/pom.xml 2012-05-08 10:36:47 UTC (rev 16235) @@ -27,15 +27,9 @@ <version>${project.version}</version> </dependency> <dependency> - <groupId>org.picketbox</groupId> - <artifactId>picketbox-bare</artifactId> + <groupId>org.picketlink</groupId> + <artifactId>picketlink-core</artifactId> <scope>test</scope> - <exclusions> - <exclusion> - <groupId>org.jboss.logging</groupId> - <artifactId>jboss-logging-spi</artifactId> - </exclusion> - </exclusions> </dependency> <dependency> <groupId>junit</groupId> Modified: stack/cxf/trunk/pom.xml =================================================================== --- stack/cxf/trunk/pom.xml 2012-05-04 08:30:05 UTC (rev 16234) +++ stack/cxf/trunk/pom.xml 2012-05-08 10:36:47 UTC (rev 16235) @@ -82,7 +82,7 @@ <jboss.security.spi.version>2.0.4.SP4</jboss.security.spi.version> <jboss.security.sx.version>2.0.4</jboss.security.sx.version> <jboss.xb.version>2.0.3.GA</jboss.xb.version> - <picketbox.version>4.0.6.Beta1</picketbox.version> + <picketlink.version>2.1.1.Final</picketlink.version> <jaxws-jboss-httpserver-httpspi.version>1.0.2-SNAPSHOT</jaxws-jboss-httpserver-httpspi.version> <httpserver.version>1.0.0.Final</httpserver.version> <jaxb.api.version>1.0.3.Final</jaxb.api.version> @@ -1181,22 +1181,6 @@ <scope>provided</scope> </dependency> <dependency> - <groupId>org.picketbox</groupId> - <artifactId>picketbox-bare</artifactId> - <version>${picketbox.version}</version> - <scope>provided</scope> - <exclusions> - <exclusion> - <groupId>org.jboss.security</groupId> - <artifactId>jboss-security-spi</artifactId> - </exclusion> - <exclusion> - <groupId>org.jboss.security</groupId> - <artifactId>jbosssx</artifactId> - </exclusion> - </exclusions> - </dependency> - <dependency> <groupId>org.jboss.security</groupId> <artifactId>jboss-security-spi</artifactId> <version>${jboss.security.spi.version}</version> @@ -1282,7 +1266,15 @@ <artifactId>easymockclassextension</artifactId> <version>2.4</version> </dependency> + +  <dependency> + <groupId>org.picketlink</groupId> + <artifactId>picketlink-core</artifactId> + <version>${picketlink.version}</version> + <scope>test</scope> + </dependency> + <dependency> <groupId>junit</groupId> <artifactId>junit</artifactId> <version>4.10</version>

12 years, 7 months

1
0
0 / 0

JBossWS SVN: r16234 - shared-testsuite/branches/jbossws-shared-testsuite-4.0.x/src/main/java/org/jboss/wsf/test.

by jbossws-commits＠lists.jboss.org

Author: jim.ma Date: 2012-05-04 04:30:05 -0400 (Fri, 04 May 2012) New Revision: 16234 Modified: shared-testsuite/branches/jbossws-shared-testsuite-4.0.x/src/main/java/org/jboss/wsf/test/AppclientHelper.java Log: [JBPAPP-8897,JBPAPP-8895]:Fix test failures on windows Modified: shared-testsuite/branches/jbossws-shared-testsuite-4.0.x/src/main/java/org/jboss/wsf/test/AppclientHelper.java =================================================================== --- shared-testsuite/branches/jbossws-shared-testsuite-4.0.x/src/main/java/org/jboss/wsf/test/AppclientHelper.java 2012-05-04 08:18:39 UTC (rev 16233) +++ shared-testsuite/branches/jbossws-shared-testsuite-4.0.x/src/main/java/org/jboss/wsf/test/AppclientHelper.java 2012-05-04 08:30:05 UTC (rev 16234) @@ -122,9 +122,9 @@ final ProcessBuilder pb = new ProcessBuilder().command(args); // always propagate IPv6 related properties final StringBuilder javaOptsValue = new StringBuilder(); - javaOptsValue.append("\"-Djboss.bind.address=").append(undoIPv6Brackets(System.getProperty("jboss.bind.address", "localhost"))).append("\" "); - javaOptsValue.append("\"-Djava.net.preferIPv4Stack=").append(System.getProperty("java.net.preferIPv4Stack", "true")).append("\" "); - javaOptsValue.append("\"-Djava.net.preferIPv6Addresses=").append(System.getProperty("java.net.preferIPv6Addresses", "false")).append("\" "); + javaOptsValue.append("-Djboss.bind.address=").append(undoIPv6Brackets(System.getProperty("jboss.bind.address", "localhost"))).append(" "); + javaOptsValue.append("-Djava.net.preferIPv4Stack=").append(System.getProperty("java.net.preferIPv4Stack", "true")).append(" "); + javaOptsValue.append("-Djava.net.preferIPv6Addresses=").append(System.getProperty("java.net.preferIPv6Addresses", "false")).append(" "); pb.environment().put("JAVA_OPTS", javaOptsValue.toString()); ap.process = pb.start(); ap.log = new FileOutputStream(new File(getAppclientOutputDir(), appclientShortName + ".log-" + System.currentTimeMillis()));

12 years, 7 months

1
0
0 / 0

JBossWS SVN: r16233 - shared-testsuite/branches/jbossws-shared-testsuite-4.0.x.

by jbossws-commits＠lists.jboss.org

Author: jim.ma Date: 2012-05-04 04:18:39 -0400 (Fri, 04 May 2012) New Revision: 16233 Modified: shared-testsuite/branches/jbossws-shared-testsuite-4.0.x/ Log: Revert svnmerge init to simply use svn merge to maintian the branch Property changes on: shared-testsuite/branches/jbossws-shared-testsuite-4.0.x ___________________________________________________________________ Deleted: svnmerge-integrated - /shared-testsuite/trunk:1-15941

12 years, 7 months

1
0
0 / 0

JBossWS SVN: r16232 - shared-testsuite/branches/jbossws-shared-testsuite-4.0.x.

by jbossws-commits＠lists.jboss.org

Author: jim.ma Date: 2012-05-04 03:59:40 -0400 (Fri, 04 May 2012) New Revision: 16232 Modified: shared-testsuite/branches/jbossws-shared-testsuite-4.0.x/ Log: svnmerge init Property changes on: shared-testsuite/branches/jbossws-shared-testsuite-4.0.x ___________________________________________________________________ Added: svnmerge-integrated + /shared-testsuite/trunk:1-15941

12 years, 7 months

1
0
0 / 0

JBossWS SVN: r16231 - shared-testsuite/trunk/src/main/java/org/jboss/wsf/test.

by jbossws-commits＠lists.jboss.org

Author: jim.ma Date: 2012-05-04 03:12:04 -0400 (Fri, 04 May 2012) New Revision: 16231 Modified: shared-testsuite/trunk/src/main/java/org/jboss/wsf/test/AppclientHelper.java Log: Fix appclient start on windows Modified: shared-testsuite/trunk/src/main/java/org/jboss/wsf/test/AppclientHelper.java =================================================================== --- shared-testsuite/trunk/src/main/java/org/jboss/wsf/test/AppclientHelper.java 2012-05-04 06:11:07 UTC (rev 16230) +++ shared-testsuite/trunk/src/main/java/org/jboss/wsf/test/AppclientHelper.java 2012-05-04 07:12:04 UTC (rev 16231) @@ -127,9 +127,9 @@ final ProcessBuilder pb = new ProcessBuilder().command(args); // always propagate IPv6 related properties final StringBuilder javaOptsValue = new StringBuilder(); - javaOptsValue.append("\"-Djboss.bind.address=").append(undoIPv6Brackets(System.getProperty("jboss.bind.address", "localhost"))).append("\" "); - javaOptsValue.append("\"-Djava.net.preferIPv4Stack=").append(System.getProperty("java.net.preferIPv4Stack", "true")).append("\" "); - javaOptsValue.append("\"-Djava.net.preferIPv6Addresses=").append(System.getProperty("java.net.preferIPv6Addresses", "false")).append("\" "); + javaOptsValue.append("-Djboss.bind.address=").append(undoIPv6Brackets(System.getProperty("jboss.bind.address", "localhost"))).append(" "); + javaOptsValue.append("-Djava.net.preferIPv4Stack=").append(System.getProperty("java.net.preferIPv4Stack", "true")).append(" "); + javaOptsValue.append("-Djava.net.preferIPv6Addresses=").append(System.getProperty("java.net.preferIPv6Addresses", "false")).append(" "); pb.environment().put("JAVA_OPTS", javaOptsValue.toString()); ap.process = pb.start(); ap.log = new FileOutputStream(new File(getAppclientOutputDir(), appclientShortName + ".log-" + System.currentTimeMillis())); @@ -177,7 +177,7 @@ int countOfAttempts = 0; final int maxCountOfAttempts = 120; // max wait time: 2 minutes while (!os.toString().contains(patternToMatch)) - { + { Thread.sleep(1000); if (countOfAttempts++ == maxCountOfAttempts) {

12 years, 7 months

1
0
0 / 0

JBossWS SVN: r16230 - stack/cxf/trunk/modules/testsuite.

by jbossws-commits＠lists.jboss.org

Author: ropalka Date: 2012-05-04 02:11:07 -0400 (Fri, 04 May 2012) New Revision: 16230 Modified: stack/cxf/trunk/modules/testsuite/pom.xml Log: sync. AS7 dependencies Modified: stack/cxf/trunk/modules/testsuite/pom.xml =================================================================== --- stack/cxf/trunk/modules/testsuite/pom.xml 2012-05-04 06:04:34 UTC (rev 16229) +++ stack/cxf/trunk/modules/testsuite/pom.xml 2012-05-04 06:11:07 UTC (rev 16230) @@ -1224,7 +1224,7 @@ <dependency> <groupId>org.jboss</groupId> <artifactId>jboss-remote-naming</artifactId> - <version>1.0.2.Final</version> + <version>1.0.3.Final</version> </dependency> <dependency> <groupId>javax.mail</groupId> @@ -1233,7 +1233,7 @@ <dependency> <groupId>org.jboss</groupId> <artifactId>jboss-ejb-client</artifactId> - <version>1.0.4.Final</version> + <version>1.0.8.Final</version> <exclusions> <exclusion> <groupId>org.jboss.remoting3</groupId> @@ -1319,25 +1319,25 @@ <dependency> <groupId>org.jboss.remotingjmx</groupId> <artifactId>remoting-jmx</artifactId> - <version>1.0.2.Final</version> + <version>1.0.3.Final</version> <scope>test</scope> </dependency> <dependency> <groupId>org.jboss.remoting3</groupId> <artifactId>jboss-remoting</artifactId> - <version>3.2.2.GA</version> + <version>3.2.4.GA</version> <scope>test</scope> </dependency> <dependency> <groupId>org.hornetq</groupId> <artifactId>hornetq-jms</artifactId> - <version>2.2.13.Final</version> + <version>2.2.16.Final</version> <scope>test</scope> </dependency> <dependency> <groupId>org.hornetq</groupId> <artifactId>hornetq-core</artifactId> - <version>2.2.13.Final</version> + <version>2.2.16.Final</version> <scope>test</scope> </dependency> </dependencies>

12 years, 7 months

1
0
0 / 0

JBossWS SVN: r16229 - stack/native/trunk/modules/testsuite.

by jbossws-commits＠lists.jboss.org

Author: ropalka Date: 2012-05-04 02:04:34 -0400 (Fri, 04 May 2012) New Revision: 16229 Modified: stack/native/trunk/modules/testsuite/pom.xml Log: sync. AS7 dependencies Modified: stack/native/trunk/modules/testsuite/pom.xml =================================================================== --- stack/native/trunk/modules/testsuite/pom.xml 2012-05-03 11:20:02 UTC (rev 16228) +++ stack/native/trunk/modules/testsuite/pom.xml 2012-05-04 06:04:34 UTC (rev 16229) @@ -303,13 +303,7 @@ </exclusion> </exclusions> </dependency> -  <dependency> - <groupId>org.jboss.ejb3</groupId> - <artifactId>jboss-ejb3-ext-api</artifactId> - <version>2.0.0-beta-1</version> - </dependency> - <dependency> <groupId>org.jboss.remotingjmx</groupId> <artifactId>remoting-jmx</artifactId> <version>1.0.2.Final</version> @@ -374,12 +368,12 @@ <dependency> <groupId>org.jboss</groupId> <artifactId>jboss-remote-naming</artifactId> - <version>1.0.2.Final</version> + <version>1.0.3.Final</version> </dependency> <dependency> <groupId>org.jboss</groupId> <artifactId>jboss-ejb-client</artifactId> - <version>1.0.4.Final</version> + <version>1.0.8.Final</version> <exclusions> <exclusion> <groupId>org.jboss.remoting3</groupId> @@ -391,22 +385,16 @@ </exclusion> </exclusions> </dependency> -  <dependency> - <groupId>org.jboss.ejb3</groupId> - <artifactId>jboss-ejb3-ext-api</artifactId> - <version>2.0.0-beta-1</version> - </dependency> - <dependency> <groupId>org.jboss.remotingjmx</groupId> <artifactId>remoting-jmx</artifactId> - <version>1.0.2.Final</version> + <version>1.0.3.Final</version> <scope>test</scope> </dependency> <dependency> <groupId>org.jboss.remoting3</groupId> <artifactId>jboss-remoting</artifactId> - <version>3.2.2.GA</version> + <version>3.2.4.GA</version> <scope>test</scope> </dependency> </dependencies>

12 years, 7 months

1
0
0 / 0

JBossWS SVN: r16228 - stack/native/trunk/modules/core/src/main/java/org/jboss/ws/core/soap.

by jbossws-commits＠lists.jboss.org

Author: ropalka Date: 2012-05-03 07:20:02 -0400 (Thu, 03 May 2012) New Revision: 16228 Modified: stack/native/trunk/modules/core/src/main/java/org/jboss/ws/core/soap/Message.properties stack/native/trunk/modules/core/src/main/java/org/jboss/ws/core/soap/NodeImpl.java Log: [JBWS-3470] fixing infinite loop in NodeImpl Modified: stack/native/trunk/modules/core/src/main/java/org/jboss/ws/core/soap/Message.properties =================================================================== --- stack/native/trunk/modules/core/src/main/java/org/jboss/ws/core/soap/Message.properties 2012-04-30 10:29:18 UTC (rev 16227) +++ stack/native/trunk/modules/core/src/main/java/org/jboss/ws/core/soap/Message.properties 2012-05-03 11:20:02 UTC (rev 16228) @@ -41,8 +41,8 @@ INCONSISTENT_NODE=Inconsistent node, child lists not synchronized CANNOT_FIND_REFCHILD=Cannot find refChild in list of javax.xml.soap.Node children -NO_SOAP_PARENT=Inconsistent node, has a DOM parent but no SOAP parent [{0}] {1} -NOT_IDENTICAL_WITH_DOM_PARENT=Inconsistent node, SOAP parent is not identical with DOM parent [{0}] {1} +NO_SOAP_PARENT=Inconsistent node, has a DOM parent but no SOAP parent [{0}] +NOT_IDENTICAL_WITH_DOM_PARENT=Inconsistent node, SOAP parent is not identical with DOM parent [{0}] UNABLE_TO_CREATE_FAULT_DETAIL=Unable to create fault detail UNSUPPORTED_ENCODING=Unsupported encoding: {0} CANNOT_WRITE_SOAP_ELEMENT=Cannot write SOAP element Modified: stack/native/trunk/modules/core/src/main/java/org/jboss/ws/core/soap/NodeImpl.java =================================================================== --- stack/native/trunk/modules/core/src/main/java/org/jboss/ws/core/soap/NodeImpl.java 2012-04-30 10:29:18 UTC (rev 16227) +++ stack/native/trunk/modules/core/src/main/java/org/jboss/ws/core/soap/NodeImpl.java 2012-05-03 11:20:02 UTC (rev 16228) @@ -585,9 +585,9 @@ { org.w3c.dom.Node domParent = domNode.getParentNode(); if (domParent != null && soapParent == null) - throw new WSException(BundleUtils.getMessage(bundle, "NO_SOAP_PARENT", new Object[]{ this , DOMWriter.printNode(this, false)})); + throw new WSException(BundleUtils.getMessage(bundle, "NO_SOAP_PARENT", new Object[]{ this })); if (domParent != null && soapParent != null && domParent != soapParent.domNode) - throw new WSException(BundleUtils.getMessage(bundle, "NOT_IDENTICAL_WITH_DOM_PARENT", new Object[]{ this , DOMWriter.printNode(this, false)})); + throw new WSException(BundleUtils.getMessage(bundle, "NOT_IDENTICAL_WITH_DOM_PARENT", new Object[]{ this })); } // END org.w3c.dom.Node *******************************************************************************************

12 years, 8 months

1
0
0 / 0

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

jbossws-commits May 2012