[jbossws-commits] JBossWS SVN: r18599 - in stack/cxf/trunk: modules/addons and 53 other directories.

Author: asoldano Date: 2014-04-29 10:31:40 -0400 (Tue, 29 Apr 2014) New Revision: 18599 Added: stack/cxf/trunk/modules/client/src/main/java/org/jboss/wsf/stack/cxf/client/serviceref/SecurityActions.java Removed: stack/cxf/trunk/modules/client/src/main/resources/META-INF/tools-plugin.xml stack/cxf/trunk/modules/client/src/main/resources/META-INF/tools.service.validator.xml stack/cxf/trunk/modules/client/src/main/resources/META-INF/wsdl.plugin.xml Modified: stack/cxf/trunk/modules/addons/pom.xml stack/cxf/trunk/modules/addons/transports/http/httpserver/pom.xml stack/cxf/trunk/modules/addons/transports/http/undertow/pom.xml stack/cxf/trunk/modules/addons/transports/udp/pom.xml stack/cxf/trunk/modules/addons/transports/udp/src/main/java/org/jboss/wsf/stack/cxf/addons/transports/udp/UDPTransportFactory.java stack/cxf/trunk/modules/client/pom.xml stack/cxf/trunk/modules/client/src/main/java/org/jboss/wsf/stack/cxf/client/configuration/BeanCustomizer.java stack/cxf/trunk/modules/client/src/main/java/org/jboss/wsf/stack/cxf/client/serviceref/CXFHandlerResolverImpl.java stack/cxf/trunk/modules/client/src/main/java/org/jboss/wsf/stack/cxf/extensions/addressing/map/CXFMAPBuilder.java stack/cxf/trunk/modules/client/src/main/java/org/jboss/wsf/stack/cxf/extensions/policy/PolicyAttachment.java stack/cxf/trunk/modules/client/src/main/java/org/jboss/wsf/stack/cxf/extensions/security/PasswordCallbackHandler.java stack/cxf/trunk/modules/client/src/main/java/org/jboss/wsf/stack/cxf/saaj/SOAPConnectionImpl.java stack/cxf/trunk/modules/dist/pom.xml stack/cxf/trunk/modules/dist/src/main/scripts/assembly-deploy-artifacts.xml stack/cxf/trunk/modules/endorsed/pom.xml stack/cxf/trunk/modules/jaspi/pom.xml stack/cxf/trunk/modules/resources/pom.xml stack/cxf/trunk/modules/resources/src/main/resources/modules/jboss720/org/apache/cxf/impl/main/module.xml stack/cxf/trunk/modules/resources/src/main/resources/modules/jboss720/org/apache/cxf/main/module.xml stack/cxf/trunk/modules/resources/src/main/resources/modules/jboss720/org/apache/santuario/xmlsec/main/module.xml stack/cxf/trunk/modules/resources/src/main/resources/modules/jboss720/org/apache/ws/security/main/module.xml stack/cxf/trunk/modules/resources/src/main/resources/modules/wildfly800/org/apache/cxf/impl/main/module.xml stack/cxf/trunk/modules/resources/src/main/resources/modules/wildfly800/org/apache/cxf/main/module.xml stack/cxf/trunk/modules/resources/src/main/resources/modules/wildfly800/org/apache/santuario/xmlsec/main/module.xml stack/cxf/trunk/modules/resources/src/main/resources/modules/wildfly800/org/apache/ws/security/main/module.xml stack/cxf/trunk/modules/resources/src/main/resources/resources/jbossws-deploy-macros.xml stack/cxf/trunk/modules/resources/src/main/resources/resources/modules-deploy.conf stack/cxf/trunk/modules/server/pom.xml stack/cxf/trunk/modules/server/src/main/java/org/jboss/wsf/stack/cxf/JBossWSInvoker.java stack/cxf/trunk/modules/server/src/main/java/org/jboss/wsf/stack/cxf/RequestHandlerImpl.java stack/cxf/trunk/modules/server/src/main/java/org/jboss/wsf/stack/cxf/config/CXFStackConfigFactory.java stack/cxf/trunk/modules/server/src/main/java/org/jboss/wsf/stack/cxf/configuration/BusHolder.java stack/cxf/trunk/modules/server/src/main/java/org/jboss/wsf/stack/cxf/configuration/ServerBeanCustomizer.java stack/cxf/trunk/modules/server/src/main/java/org/jboss/wsf/stack/cxf/security/authentication/AutenticationMgrSubjectCreatingInterceptor.java stack/cxf/trunk/modules/server/src/main/java/org/jboss/wsf/stack/cxf/security/authentication/SubjectCreatingInterceptor.java stack/cxf/trunk/modules/server/src/main/java/org/jboss/wsf/stack/cxf/security/authentication/SubjectCreatingPolicyInterceptor.java stack/cxf/trunk/modules/server/src/main/java/org/jboss/wsf/stack/cxf/security/authentication/SubjectCreator.java stack/cxf/trunk/modules/server/src/test/java/org/jboss/wsf/stack/cxf/JBossWSInvokerTest.java stack/cxf/trunk/modules/testsuite/cxf-spring-tests/pom.xml stack/cxf/trunk/modules/testsuite/cxf-spring-tests/src/test/java/org/jboss/test/ws/jaxws/samples/wsse/UsernamePasswordCallback.java stack/cxf/trunk/modules/testsuite/cxf-spring-tests/src/test/java/org/jboss/test/ws/jaxws/samples/wsseDigest/UsernamePasswordCallback.java stack/cxf/trunk/modules/testsuite/cxf-spring-tests/src/test/java/org/jboss/test/ws/jaxws/samples/wsseEJB/UsernamePasswordCallback.java stack/cxf/trunk/modules/testsuite/cxf-spring-tests/src/test/java/org/jboss/test/ws/jaxws/samples/wssePolicy/UsernamePasswordCallback.java stack/cxf/trunk/modules/testsuite/cxf-tests/pom.xml stack/cxf/trunk/modules/testsuite/cxf-tests/scripts/cxf-jars-jaxws.xml stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/cxf/jbws3516/JBWS3516TestCase.java stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/cxf/jbws3648/KeystorePasswordCallback.java stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/cxf/jbws3773/JBWS3773TestCase.java stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/cxf/udp/UDPEndpointAPITestCase.java stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/samples/wsse/policy/basic/UsernamePasswordCallback.java stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/samples/wsse/policy/jaas/UsernameDigestPasswordCallback.java stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/samples/wsse/policy/jaas/UsernamePasswordCallback.java stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/samples/wsse/policy/jaspi/UsernamePasswordCallback.java stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/samples/wsse/policy/oasis/SamlCallbackHandler.java stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/samples/wsse/policy/oasis/UsernamePasswordCallback.java stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/samples/wsse/policy/oasis/WSSecurityPolicyExamples23xTestCase.java stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/samples/wsse/policy/trust/shared/ClientCallbackHandler.java stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/samples/wsse/policy/trust/shared/UsernameTokenCallbackHandler.java stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/resources/jaxws/samples/wsse/policy/basic/sign/META-INF-server/wsdl/SecurityService.wsdl stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/resources/jaxws/samples/wsse/policy/basic/sign/WEB-INF/wsdl/SecurityService.wsdl stack/cxf/trunk/modules/testsuite/pom.xml stack/cxf/trunk/modules/testsuite/shared-tests/pom.xml stack/cxf/trunk/modules/testsuite/test-utils/pom.xml stack/cxf/trunk/pom.xml Log: [JBWS-3686] Initial changes to upgrade to Apache CXF 3.0.0; build moved to 5.0.0-SNAPSHOT Modified: stack/cxf/trunk/modules/addons/pom.xml =================================================================== --- stack/cxf/trunk/modules/addons/pom.xml 2014-04-29 14:08:32 UTC (rev 18598) +++ stack/cxf/trunk/modules/addons/pom.xml 2014-04-29 14:31:40 UTC (rev 18599) @@ -10,7 +10,7 @@ <parent> <groupId>org.jboss.ws.cxf</groupId> <artifactId>jbossws-cxf</artifactId> - <version>4.3.1-SNAPSHOT</version> + <version>5.0.0-SNAPSHOT</version> <relativePath>../../pom.xml</relativePath> </parent> Modified: stack/cxf/trunk/modules/addons/transports/http/httpserver/pom.xml =================================================================== --- stack/cxf/trunk/modules/addons/transports/http/httpserver/pom.xml 2014-04-29 14:08:32 UTC (rev 18598) +++ stack/cxf/trunk/modules/addons/transports/http/httpserver/pom.xml 2014-04-29 14:31:40 UTC (rev 18599) @@ -8,7 +8,7 @@ <parent> <groupId>org.jboss.ws.cxf</groupId> <artifactId>jbossws-cxf-addons</artifactId> - <version>4.3.1-SNAPSHOT</version> + <version>5.0.0-SNAPSHOT</version> <relativePath>../../../pom.xml</relativePath> </parent> @@ -47,10 +47,6 @@ </dependency> <dependency> <groupId>org.springframework</groupId> - <artifactId>spring-asm</artifactId> - </dependency> - <dependency> - <groupId>org.springframework</groupId> <artifactId>spring-beans</artifactId> </dependency> <dependency> Modified: stack/cxf/trunk/modules/addons/transports/http/undertow/pom.xml =================================================================== --- stack/cxf/trunk/modules/addons/transports/http/undertow/pom.xml 2014-04-29 14:08:32 UTC (rev 18598) +++ stack/cxf/trunk/modules/addons/transports/http/undertow/pom.xml 2014-04-29 14:31:40 UTC (rev 18599) @@ -8,7 +8,7 @@ <parent> <groupId>org.jboss.ws.cxf</groupId> <artifactId>jbossws-cxf-addons</artifactId> - <version>4.3.1-SNAPSHOT</version> + <version>5.0.0-SNAPSHOT</version> <relativePath>../../../pom.xml</relativePath> </parent> @@ -36,10 +36,6 @@ </dependency> <dependency> <groupId>org.springframework</groupId> - <artifactId>spring-asm</artifactId> - </dependency> - <dependency> - <groupId>org.springframework</groupId> <artifactId>spring-beans</artifactId> </dependency> <dependency> Modified: stack/cxf/trunk/modules/addons/transports/udp/pom.xml =================================================================== --- stack/cxf/trunk/modules/addons/transports/udp/pom.xml 2014-04-29 14:08:32 UTC (rev 18598) +++ stack/cxf/trunk/modules/addons/transports/udp/pom.xml 2014-04-29 14:31:40 UTC (rev 18599) @@ -8,7 +8,7 @@ <parent> <groupId>org.jboss.ws.cxf</groupId> <artifactId>jbossws-cxf-addons</artifactId> - <version>4.3.1-SNAPSHOT</version> + <version>5.0.0-SNAPSHOT</version> <relativePath>../../pom.xml</relativePath> </parent> Modified: stack/cxf/trunk/modules/addons/transports/udp/src/main/java/org/jboss/wsf/stack/cxf/addons/transports/udp/UDPTransportFactory.java =================================================================== --- stack/cxf/trunk/modules/addons/transports/udp/src/main/java/org/jboss/wsf/stack/cxf/addons/transports/udp/UDPTransportFactory.java 2014-04-29 14:08:32 UTC (rev 18598) +++ stack/cxf/trunk/modules/addons/transports/udp/src/main/java/org/jboss/wsf/stack/cxf/addons/transports/udp/UDPTransportFactory.java 2014-04-29 14:31:40 UTC (rev 18599) @@ -30,8 +30,6 @@ import java.util.logging.Level; import java.util.logging.Logger; -import javax.annotation.Resource; - import org.apache.cxf.Bus; import org.apache.cxf.common.injection.NoJSR250Annotations; import org.apache.cxf.common.logging.LogUtils; @@ -44,7 +42,7 @@ import org.apache.cxf.ws.addressing.AttributedURIType; import org.apache.cxf.ws.addressing.EndpointReferenceType; -@NoJSR250Annotations(unlessNull = { "bus" }) +@NoJSR250Annotations public class UDPTransportFactory extends AbstractTransportFactory implements DestinationFactory, ConduitInitiator { @@ -64,22 +62,16 @@ this(null); } public UDPTransportFactory(Bus b) { - super(DEFAULT_NAMESPACES, null); - bus = b; - register(); + super(DEFAULT_NAMESPACES); } - @Resource(name = "cxf") - public void setBus(Bus b) { - super.setBus(b); + public Destination getDestination(EndpointInfo ei, Bus bus) throws IOException { + return getDestination(ei, null, bus); } - public Destination getDestination(EndpointInfo ei) throws IOException { - return getDestination(ei, null); - } - protected Destination getDestination(EndpointInfo ei, - EndpointReferenceType reference) + EndpointReferenceType reference, + Bus bus) throws IOException { if (reference == null) { reference = createReference(ei); @@ -88,11 +80,11 @@ } - public Conduit getConduit(EndpointInfo ei) throws IOException { - return getConduit(ei, null); + public Conduit getConduit(EndpointInfo ei, Bus bus) throws IOException { + return getConduit(ei, null, bus); } - public Conduit getConduit(EndpointInfo ei, EndpointReferenceType target) throws IOException { + public Conduit getConduit(EndpointInfo ei, EndpointReferenceType target, Bus bus) throws IOException { LOG.log(Level.FINE, "Creating conduit for {0}", ei.getAddress()); if (target == null) { target = createReference(ei); Modified: stack/cxf/trunk/modules/client/pom.xml =================================================================== --- stack/cxf/trunk/modules/client/pom.xml 2014-04-29 14:08:32 UTC (rev 18598) +++ stack/cxf/trunk/modules/client/pom.xml 2014-04-29 14:31:40 UTC (rev 18599) @@ -8,7 +8,7 @@ <parent> <groupId>org.jboss.ws.cxf</groupId> <artifactId>jbossws-cxf</artifactId> - <version>4.3.1-SNAPSHOT</version> + <version>5.0.0-SNAPSHOT</version> <relativePath>../../pom.xml</relativePath> </parent> @@ -165,10 +165,6 @@ </dependency> <dependency> <groupId>org.springframework</groupId> - <artifactId>spring-asm</artifactId> - </dependency> - <dependency> - <groupId>org.springframework</groupId> <artifactId>spring-beans</artifactId> </dependency> <dependency> Modified: stack/cxf/trunk/modules/client/src/main/java/org/jboss/wsf/stack/cxf/client/configuration/BeanCustomizer.java =================================================================== --- stack/cxf/trunk/modules/client/src/main/java/org/jboss/wsf/stack/cxf/client/configuration/BeanCustomizer.java 2014-04-29 14:08:32 UTC (rev 18598) +++ stack/cxf/trunk/modules/client/src/main/java/org/jboss/wsf/stack/cxf/client/configuration/BeanCustomizer.java 2014-04-29 14:31:40 UTC (rev 18599) @@ -26,7 +26,7 @@ import org.apache.cxf.frontend.AbstractWSDLBasedEndpointFactory; import org.apache.cxf.frontend.ClientProxyFactoryBean; import org.apache.cxf.jaxb.JAXBDataBinding; -import org.apache.cxf.service.factory.ReflectionServiceFactoryBean; +import org.apache.cxf.wsdl.service.factory.ReflectionServiceFactoryBean; import org.apache.cxf.transport.http.HTTPConduit; import org.jboss.ws.api.binding.BindingCustomization; import org.jboss.ws.api.binding.JAXBBindingCustomization; Modified: stack/cxf/trunk/modules/client/src/main/java/org/jboss/wsf/stack/cxf/client/serviceref/CXFHandlerResolverImpl.java =================================================================== --- stack/cxf/trunk/modules/client/src/main/java/org/jboss/wsf/stack/cxf/client/serviceref/CXFHandlerResolverImpl.java 2014-04-29 14:08:32 UTC (rev 18598) +++ stack/cxf/trunk/modules/client/src/main/java/org/jboss/wsf/stack/cxf/client/serviceref/CXFHandlerResolverImpl.java 2014-04-29 14:31:40 UTC (rev 18599) @@ -40,9 +40,12 @@ */ package org.jboss.wsf.stack.cxf.client.serviceref; +import static org.jboss.wsf.stack.cxf.Loggers.DEPLOYMENT_LOGGER; import static org.jboss.wsf.stack.cxf.Messages.MESSAGES; import java.io.File; + +import org.jboss.ws.common.DOMUtils; import org.jboss.wsf.spi.metadata.ParserConstants; import java.io.IOException; @@ -55,9 +58,13 @@ import java.util.Map; import java.util.regex.Pattern; +import javax.xml.XMLConstants; import javax.xml.bind.JAXBContext; import javax.xml.bind.JAXBException; import javax.xml.namespace.QName; +import javax.xml.parsers.DocumentBuilder; +import javax.xml.parsers.DocumentBuilderFactory; +import javax.xml.parsers.ParserConfigurationException; import javax.xml.ws.WebServiceException; import javax.xml.ws.handler.Handler; import javax.xml.ws.handler.HandlerResolver; @@ -66,7 +73,6 @@ import org.apache.cxf.Bus; import org.apache.cxf.common.injection.ResourceInjector; -import org.apache.cxf.helpers.XMLUtils; import org.apache.cxf.jaxws.handler.HandlerChainBuilder; import org.apache.cxf.jaxws.javaee.PortComponentHandlerType; import org.apache.cxf.resource.DefaultResourceManager; @@ -89,6 +95,7 @@ private final Class<?> clazz; private final ClassLoader classLoader; private final Bus bus; + private static DocumentBuilder builder; public CXFHandlerResolverImpl(Bus bus, String handlerFile, Class<?> clazz) { @@ -151,7 +158,7 @@ throw MESSAGES.handlerConfigFileNotFound(handlerFile); } - Document doc = XMLUtils.parse(is); + Document doc = getDocumentBuilder().parse(is); Element el = doc.getDocumentElement(); if (!ParserConstants.JAVAEE_NS.equals(el.getNamespaceURI()) || !ParserConstants.HANDLER_CHAINS.equals(el.getLocalName())) { @@ -196,7 +203,7 @@ if (cur instanceof Element) { el = (Element)cur; if (!el.getNamespaceURI().equals(ParserConstants.JAVAEE_NS)) { - String xml = XMLUtils.toString(el); + String xml = "{" + el.getNamespaceURI() + "}" + el.getLocalName(); throw MESSAGES.invalidElementInHandler(handlerFile, xml); } String name = el.getLocalName(); @@ -370,5 +377,35 @@ } return context; } + + private static synchronized DocumentBuilder getDocumentBuilder() + { + if (builder == null) + { + final ClassLoader classLoader = SecurityActions.getContextClassLoader(); + SecurityActions.setContextClassLoader(CXFHandlerResolverImpl.class.getClassLoader()); + try + { + DocumentBuilderFactory factory = DocumentBuilderFactory.newInstance(); + factory.setValidating(false); + factory.setNamespaceAware(true); + factory.setExpandEntityReferences(false); + try + { + factory.setFeature(XMLConstants.FEATURE_SECURE_PROCESSING, true); + } + catch (ParserConfigurationException pce) + { + DEPLOYMENT_LOGGER.error(pce); + } + builder = DOMUtils.newDocumentBuilder(factory); + } + finally + { + SecurityActions.setContextClassLoader(classLoader); + } + } + return builder; + } } Copied: stack/cxf/trunk/modules/client/src/main/java/org/jboss/wsf/stack/cxf/client/serviceref/SecurityActions.java (from rev 18594, stack/cxf/branches/asoldano/modules/client/src/main/java/org/jboss/wsf/stack/cxf/client/serviceref/SecurityActions.java) =================================================================== --- stack/cxf/trunk/modules/client/src/main/java/org/jboss/wsf/stack/cxf/client/serviceref/SecurityActions.java (rev 0) +++ stack/cxf/trunk/modules/client/src/main/java/org/jboss/wsf/stack/cxf/client/serviceref/SecurityActions.java 2014-04-29 14:31:40 UTC (rev 18599) @@ -0,0 +1,101 @@ +/* + * JBoss, Home of Professional Open Source. + * Copyright 2013, 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.wsf.stack.cxf.client.serviceref; + +import java.security.AccessController; +import java.security.PrivilegedAction; + +/** + * + * @author alessio.soldano(a)jboss.com + * @since 03-Oct-2013 + * + */ +class SecurityActions +{ + /** + * Get context classloader. + * + * @return the current context classloader + */ + static ClassLoader getContextClassLoader() + { + SecurityManager sm = System.getSecurityManager(); + if (sm == null) + { + return Thread.currentThread().getContextClassLoader(); + } + else + { + return AccessController.doPrivileged(new PrivilegedAction<ClassLoader>() + { + public ClassLoader run() + { + return Thread.currentThread().getContextClassLoader(); + } + }); + } + } + + /** + * Set context classloader. + * + * @param classLoader the classloader + */ + static void setContextClassLoader(final ClassLoader classLoader) + { + if (System.getSecurityManager() == null) + { + Thread.currentThread().setContextClassLoader(classLoader); + } + else + { + AccessController.doPrivileged(new PrivilegedAction<Object>() + { + public Object run() + { + Thread.currentThread().setContextClassLoader(classLoader); + return null; + } + }); + } + } + + /** + * Return the current value of the specified system property + * + * @param name + * @param defaultValue + * @return + */ + static String getSystemProperty(final String name, final String defaultValue) + { + PrivilegedAction<String> action = new PrivilegedAction<String>() + { + public String run() + { + return System.getProperty(name, defaultValue); + } + }; + return AccessController.doPrivileged(action); + } +} Modified: stack/cxf/trunk/modules/client/src/main/java/org/jboss/wsf/stack/cxf/extensions/addressing/map/CXFMAPBuilder.java =================================================================== --- stack/cxf/trunk/modules/client/src/main/java/org/jboss/wsf/stack/cxf/extensions/addressing/map/CXFMAPBuilder.java 2014-04-29 14:08:32 UTC (rev 18598) +++ stack/cxf/trunk/modules/client/src/main/java/org/jboss/wsf/stack/cxf/extensions/addressing/map/CXFMAPBuilder.java 2014-04-29 14:31:40 UTC (rev 18599) @@ -25,7 +25,6 @@ import javax.xml.namespace.QName; -import org.apache.cxf.ws.addressing.AddressingBuilder; import org.apache.cxf.ws.addressing.AddressingConstants; import org.apache.cxf.ws.addressing.AddressingProperties; import org.apache.cxf.ws.addressing.AttributedURIType; @@ -47,8 +46,6 @@ */ public class CXFMAPBuilder implements MAPBuilder { - private AddressingBuilder addressingBuilder; - private static MAPBuilder theBuilder = new CXFMAPBuilder(); public static MAPBuilder getBuilder() @@ -58,13 +55,11 @@ private CXFMAPBuilder() { - AddressingBuilder implementation = AddressingBuilder.getAddressingBuilder(); - this.addressingBuilder = implementation; } public MAP newMap() { - AddressingProperties implementation = addressingBuilder.newAddressingProperties(); + AddressingProperties implementation = new AddressingProperties(); return new CXFMAP(implementation); } @@ -89,7 +84,7 @@ AddressingProperties implementation = (AddressingProperties)ctx.get(CXFMAPConstants.CLIENT_ADDRESSING_PROPERTIES_OUTBOUND); if (implementation == null) { - implementation = addressingBuilder.newAddressingProperties(); + implementation = new AddressingProperties(); ctx.put(CXFMAPConstants.CLIENT_ADDRESSING_PROPERTIES, implementation); ctx.put(CXFMAPConstants.CLIENT_ADDRESSING_PROPERTIES_OUTBOUND, implementation); } @@ -104,7 +99,7 @@ public MAPConstants newConstants() { - AddressingConstants implementation = addressingBuilder.newAddressingConstants(); + AddressingConstants implementation = new AddressingConstants(); return new CXFMAPConstants(implementation); } Modified: stack/cxf/trunk/modules/client/src/main/java/org/jboss/wsf/stack/cxf/extensions/policy/PolicyAttachment.java =================================================================== --- stack/cxf/trunk/modules/client/src/main/java/org/jboss/wsf/stack/cxf/extensions/policy/PolicyAttachment.java 2014-04-29 14:08:32 UTC (rev 18598) +++ stack/cxf/trunk/modules/client/src/main/java/org/jboss/wsf/stack/cxf/extensions/policy/PolicyAttachment.java 2014-04-29 14:31:40 UTC (rev 18599) @@ -84,7 +84,11 @@ } finally { - StaxUtils.close(reader); + try { + StaxUtils.close(reader); + } catch (Exception e) { + //ignore + } if (is != null) { try { is.close(); Modified: stack/cxf/trunk/modules/client/src/main/java/org/jboss/wsf/stack/cxf/extensions/security/PasswordCallbackHandler.java =================================================================== --- stack/cxf/trunk/modules/client/src/main/java/org/jboss/wsf/stack/cxf/extensions/security/PasswordCallbackHandler.java 2014-04-29 14:08:32 UTC (rev 18598) +++ stack/cxf/trunk/modules/client/src/main/java/org/jboss/wsf/stack/cxf/extensions/security/PasswordCallbackHandler.java 2014-04-29 14:31:40 UTC (rev 18599) @@ -28,8 +28,9 @@ import javax.security.auth.callback.Callback; import javax.security.auth.callback.CallbackHandler; import javax.security.auth.callback.UnsupportedCallbackException; -import org.apache.ws.security.WSPasswordCallback; +import org.apache.wss4j.common.ext.WSPasswordCallback; + public class PasswordCallbackHandler implements CallbackHandler { Modified: stack/cxf/trunk/modules/client/src/main/java/org/jboss/wsf/stack/cxf/saaj/SOAPConnectionImpl.java =================================================================== --- stack/cxf/trunk/modules/client/src/main/java/org/jboss/wsf/stack/cxf/saaj/SOAPConnectionImpl.java 2014-04-29 14:08:32 UTC (rev 18598) +++ stack/cxf/trunk/modules/client/src/main/java/org/jboss/wsf/stack/cxf/saaj/SOAPConnectionImpl.java 2014-04-29 14:31:40 UTC (rev 18599) @@ -79,7 +79,7 @@ // sent SOAPMessage try { - final Conduit c = ci.getConduit(info); + final Conduit c = ci.getConduit(info, BusFactory.getThreadDefaultBus(false)); //TODO verify bus Map<String, List<String>> outHeaders = new HashMap<String, List<String>>(); @@ -147,7 +147,7 @@ // sent GET request try { - final Conduit c = ci.getConduit(info); + final Conduit c = ci.getConduit(info, BusFactory.getThreadDefaultBus(false)); //TODO verify bus if (c instanceof HTTPConduit) { Deleted: stack/cxf/trunk/modules/client/src/main/resources/META-INF/tools-plugin.xml =================================================================== --- stack/cxf/trunk/modules/client/src/main/resources/META-INF/tools-plugin.xml 2014-04-29 14:08:32 UTC (rev 18598) +++ stack/cxf/trunk/modules/client/src/main/resources/META-INF/tools-plugin.xml 2014-04-29 14:31:40 UTC (rev 18599) @@ -1,56 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<!-- -Licensed to the Apache Software Foundation (ASF) under one -or more contributor license agreements. See the NOTICE file -distributed with this work for additional information -regarding copyright ownership. The ASF licenses this file -to you under the Apache License, Version 2.0 (the -"License"); you may not use this file except in compliance -with the License. You may obtain a copy of the License at - -http://www.apache.org/licenses/LICENSE-2.0 - -Unless required by applicable law or agreed to in writing, -software distributed under the License is distributed on an -"AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY -KIND, either express or implied. See the License for the -specific language governing permissions and limitations -under the License. ---> -<plugin xmlns="http://cxf.apache.org/tools/plugin" name="default" version="" provider="cxf.apache.org"> - <frontend name="jaxws" package="org.apache.cxf.tools.wsdlto.frontend.jaxws" profile="JAXWSProfile"> - <container name="JAXWSContainer" toolspec="jaxws-toolspec.xml" /> - <processor name="WSDLToJavaProcessor" package="org.apache.cxf.tools.wsdlto.frontend.jaxws.processor" /> - <builder name="JAXWSDefinitionBuilder" package="org.apache.cxf.tools.wsdlto.frontend.jaxws.wsdl11" /> - <generators package="org.apache.cxf.tools.wsdlto.frontend.jaxws.generators"> - <generator name="AntGenerator" /> - <generator name="ClientGenerator" /> - <generator name="FaultGenerator" /> - <generator name="ImplGenerator" /> - <generator name="SEIGenerator" /> - <generator name="ServerGenerator" /> - <generator name="ServiceGenerator" /> - </generators> - </frontend> - <frontend name="jaxws21" package="org.apache.cxf.tools.wsdlto.frontend.jaxws" profile="JAXWSProfile"> - <container name="JAXWS21Container" toolspec="jaxws-toolspec.xml" /> - <processor name="WSDLToJavaProcessor" package="org.apache.cxf.tools.wsdlto.frontend.jaxws.processor" /> - <builder name="JAXWSDefinitionBuilder" package="org.apache.cxf.tools.wsdlto.frontend.jaxws.wsdl11" /> - <generators package="org.apache.cxf.tools.wsdlto.frontend.jaxws.generators"> - <generator name="AntGenerator" /> - <generator name="ClientGenerator" /> - <generator name="FaultGenerator" /> - <generator name="ImplGenerator" /> - <generator name="SEIGenerator" /> - <generator name="ServerGenerator" /> - <generator name="JAXWS21ServiceGenerator" /> - </generators> - </frontend> - <databinding name="jaxb" package="org.apache.cxf.tools.wsdlto.databinding.jaxb" profile="JAXBDataBinding" /> - <databinding name="xmlbeans" package="org.apache.cxf.xmlbeans.tools" profile="XMLBeansToolingDataBinding" /> - <databinding name="jibx" package="org.apache.cxf.jibx.tools" profile="JibxToolingDataBinding" /> - <databinding name="sdo" package="org.apache.cxf.sdo.tools" profile="SDODatabinding" /> - <databinding name="sdo-dynamic" package="org.apache.cxf.sdo.tools" profile="SDODatabinding" /> - <databinding name="sdo-static" package="org.apache.cxf.sdo.tools" profile="SDODatabinding" /> -</plugin> - Deleted: stack/cxf/trunk/modules/client/src/main/resources/META-INF/tools.service.validator.xml =================================================================== --- stack/cxf/trunk/modules/client/src/main/resources/META-INF/tools.service.validator.xml 2014-04-29 14:08:32 UTC (rev 18598) +++ stack/cxf/trunk/modules/client/src/main/resources/META-INF/tools.service.validator.xml 2014-04-29 14:31:40 UTC (rev 18599) @@ -1,27 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<!-- - Licensed to the Apache Software Foundation (ASF) under one - or more contributor license agreements. See the NOTICE file - distributed with this work for additional information - regarding copyright ownership. The ASF licenses this file - to you under the Apache License, Version 2.0 (the - "License"); you may not use this file except in compliance - with the License. You may obtain a copy of the License at - - http://www.apache.org/licenses/LICENSE-2.0 - - Unless required by applicable law or agreed to in writing, - software distributed under the License is distributed on an - "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY - KIND, either express or implied. See the License for the - specific language governing permissions and limitations - under the License. ---> -<!DOCTYPE properties SYSTEM "http://java.sun.com/dtd/properties.dtd"> - -<properties> - <entry key="UniqueBodyValidator">org.apache.cxf.tools.wsdlto.frontend.jaxws.validator.UniqueBodyValidator</entry> - <entry key="WrapperStyleNameCollisionValidator">org.apache.cxf.tools.wsdlto.frontend.jaxws.validator.WrapperStyleNameCollisionValidator</entry> - <entry key="XMLFormatValidator">org.apache.cxf.binding.xml.XMLFormatValidator</entry> -</properties> - Deleted: stack/cxf/trunk/modules/client/src/main/resources/META-INF/wsdl.plugin.xml =================================================================== --- stack/cxf/trunk/modules/client/src/main/resources/META-INF/wsdl.plugin.xml 2014-04-29 14:08:32 UTC (rev 18598) +++ stack/cxf/trunk/modules/client/src/main/resources/META-INF/wsdl.plugin.xml 2014-04-29 14:31:40 UTC (rev 18599) @@ -1,30 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<!-- - Licensed to the Apache Software Foundation (ASF) under one - or more contributor license agreements. See the NOTICE file - distributed with this work for additional information - regarding copyright ownership. The ASF licenses this file - to you under the Apache License, Version 2.0 (the - "License"); you may not use this file except in compliance - with the License. You may obtain a copy of the License at - - http://www.apache.org/licenses/LICENSE-2.0 - - Unless required by applicable law or agreed to in writing, - software distributed under the License is distributed on an - "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY - KIND, either express or implied. See the License for the - specific language governing permissions and limitations - under the License. ---> -<!DOCTYPE properties SYSTEM "http://java.sun.com/dtd/properties.dtd"> - -<properties> - <entry key="soap-javax.wsdl.Port">org.apache.cxf.binding.soap.wsdl11.SoapAddressPlugin</entry> - <entry key="xml-javax.wsdl.Port">org.apache.cxf.binding.xml.wsdl11.HttpAddressPlugin</entry> - <entry key="xml-javax.wsdl.Binding">org.apache.cxf.binding.xml.wsdl11.XmlBindingPlugin</entry> - <entry key="xml-javax.wsdl.BindingInput">org.apache.cxf.binding.xml.wsdl11.XmlIoPlugin</entry> - <entry key="xml-javax.wsdl.BindingOutput">org.apache.cxf.binding.xml.wsdl11.XmlIoPlugin</entry> - <entry key="jms-javax.wsdl.Port">org.apache.cxf.transport.jms.wsdl11.JmsTransportPlugin</entry> -</properties> - Modified: stack/cxf/trunk/modules/dist/pom.xml =================================================================== --- stack/cxf/trunk/modules/dist/pom.xml 2014-04-29 14:08:32 UTC (rev 18598) +++ stack/cxf/trunk/modules/dist/pom.xml 2014-04-29 14:31:40 UTC (rev 18599) @@ -8,7 +8,7 @@ <parent> <groupId>org.jboss.ws.cxf</groupId> <artifactId>jbossws-cxf</artifactId> - <version>4.3.1-SNAPSHOT</version> + <version>5.0.0-SNAPSHOT</version> <relativePath>../../pom.xml</relativePath> </parent> @@ -96,10 +96,6 @@ </dependency> <dependency> <groupId>org.springframework</groupId> - <artifactId>spring-asm</artifactId> - </dependency> - <dependency> - <groupId>org.springframework</groupId> <artifactId>spring-beans</artifactId> </dependency> <dependency> Modified: stack/cxf/trunk/modules/dist/src/main/scripts/assembly-deploy-artifacts.xml =================================================================== --- stack/cxf/trunk/modules/dist/src/main/scripts/assembly-deploy-artifacts.xml 2014-04-29 14:08:32 UTC (rev 18598) +++ stack/cxf/trunk/modules/dist/src/main/scripts/assembly-deploy-artifacts.xml 2014-04-29 14:31:40 UTC (rev 18599) @@ -55,7 +55,8 @@ <include>org.apache.neethi:neethi:jar</include> <include>wsdl4j:wsdl4j:jar</include> <include>org.apache.ws.xmlschema:xmlschema-core:jar</include> - <include>org.apache.ws.security:wss4j:jar</include> + <include>org.apache.wss4j:wss4j-*:jar</include> + <include>org.jasypt:jasypt:jar</include> <include>org.apache.santuario:xmlsec:jar</include> <include>asm:asm:jar</include> <include>org.apache.velocity:velocity:jar</include> @@ -77,7 +78,6 @@ <unpack>false</unpack> <includes> <include>org.springframework:spring-aop:jar</include> - <include>org.springframework:spring-asm:jar</include> <include>org.springframework:spring-beans:jar</include> <include>org.springframework:spring-context:jar</include> <include>org.springframework:spring-core:jar</include> Modified: stack/cxf/trunk/modules/endorsed/pom.xml =================================================================== --- stack/cxf/trunk/modules/endorsed/pom.xml 2014-04-29 14:08:32 UTC (rev 18598) +++ stack/cxf/trunk/modules/endorsed/pom.xml 2014-04-29 14:31:40 UTC (rev 18599) @@ -9,7 +9,7 @@ <parent> <groupId>org.jboss.ws.cxf</groupId> <artifactId>jbossws-cxf</artifactId> - <version>4.3.1-SNAPSHOT</version> + <version>5.0.0-SNAPSHOT</version> <relativePath>../../pom.xml</relativePath> </parent> Modified: stack/cxf/trunk/modules/jaspi/pom.xml =================================================================== --- stack/cxf/trunk/modules/jaspi/pom.xml 2014-04-29 14:08:32 UTC (rev 18598) +++ stack/cxf/trunk/modules/jaspi/pom.xml 2014-04-29 14:31:40 UTC (rev 18599) @@ -9,7 +9,7 @@ <parent> <groupId>org.jboss.ws.cxf</groupId> <artifactId>jbossws-cxf</artifactId> - <version>4.3.1-SNAPSHOT</version> + <version>5.0.0-SNAPSHOT</version> <relativePath>../../pom.xml</relativePath> </parent> Modified: stack/cxf/trunk/modules/resources/pom.xml =================================================================== --- stack/cxf/trunk/modules/resources/pom.xml 2014-04-29 14:08:32 UTC (rev 18598) +++ stack/cxf/trunk/modules/resources/pom.xml 2014-04-29 14:31:40 UTC (rev 18599) @@ -9,7 +9,7 @@ <parent> <groupId>org.jboss.ws.cxf</groupId> <artifactId>jbossws-cxf</artifactId> - <version>4.3.1-SNAPSHOT</version> + <version>5.0.0-SNAPSHOT</version> <relativePath>../../pom.xml</relativePath> </parent> Modified: stack/cxf/trunk/modules/resources/src/main/resources/modules/jboss720/org/apache/cxf/impl/main/module.xml =================================================================== --- stack/cxf/trunk/modules/resources/src/main/resources/modules/jboss720/org/apache/cxf/impl/main/module.xml 2014-04-29 14:08:32 UTC (rev 18598) +++ stack/cxf/trunk/modules/resources/src/main/resources/modules/jboss720/org/apache/cxf/impl/main/module.xml 2014-04-29 14:31:40 UTC (rev 18599) @@ -49,6 +49,7 @@ <module name="org.apache.ws.xmlschema" /> <module name="org.apache.ws.security" /> <module name="org.apache.santuario.xmlsec" /> + <module name="org.codehaus.woodstox" /> <module name="org.joda.time" /> <module name="org.opensaml" /> <module name="org.springframework.spring" optional="true"> Modified: stack/cxf/trunk/modules/resources/src/main/resources/modules/jboss720/org/apache/cxf/main/module.xml =================================================================== --- stack/cxf/trunk/modules/resources/src/main/resources/modules/jboss720/org/apache/cxf/main/module.xml 2014-04-29 14:08:32 UTC (rev 18598) +++ stack/cxf/trunk/modules/resources/src/main/resources/modules/jboss720/org/apache/cxf/main/module.xml 2014-04-29 14:31:40 UTC (rev 18599) @@ -38,10 +38,15 @@ <module name="asm.asm" /> <module name="javax.api" /> <module name="javax.annotation.api" /> + <module name="javax.jws.api" /> <module name="javax.mail.api" /> + <module name="javax.resource.api" /> <module name="javax.wsdl4j.api" /> <module name="javax.xml.bind.api" services="import"/> <module name="com.sun.xml.bind" services="import"/> + <module name="javax.xml.soap.api" /> + <module name="javax.xml.stream.api" /> + <module name="javax.xml.ws.api" /> <module name="org.apache.neethi" /> <module name="org.apache.ws.xmlschema" /> <module name="org.codehaus.woodstox" /> Modified: stack/cxf/trunk/modules/resources/src/main/resources/modules/jboss720/org/apache/santuario/xmlsec/main/module.xml =================================================================== --- stack/cxf/trunk/modules/resources/src/main/resources/modules/jboss720/org/apache/santuario/xmlsec/main/module.xml 2014-04-29 14:08:32 UTC (rev 18598) +++ stack/cxf/trunk/modules/resources/src/main/resources/modules/jboss720/org/apache/santuario/xmlsec/main/module.xml 2014-04-29 14:31:40 UTC (rev 18599) @@ -40,5 +40,8 @@ <module name="javax.api" /> <module name="org.apache.commons.logging" /> <module name="org.apache.xalan" /> + <module name="org.slf4j" /> + <module name="javax.xml.bind.api" services="import"/> + <module name="com.sun.xml.bind" services="import"/> </dependencies> </module> Modified: stack/cxf/trunk/modules/resources/src/main/resources/modules/jboss720/org/apache/ws/security/main/module.xml =================================================================== --- stack/cxf/trunk/modules/resources/src/main/resources/modules/jboss720/org/apache/ws/security/main/module.xml 2014-04-29 14:08:32 UTC (rev 18598) +++ stack/cxf/trunk/modules/resources/src/main/resources/modules/jboss720/org/apache/ws/security/main/module.xml 2014-04-29 14:31:40 UTC (rev 18599) @@ -30,10 +30,13 @@ <dependencies> <module name="javax.api" /> <module name="javax.xml.rpc.api" /> + <module name="org.apache.commons.codec" /> <module name="org.apache.commons.logging" /> + <module name="org.apache.neethi" /> <module name="org.apache.santuario.xmlsec" /> <module name="org.apache.xalan" /> <module name="org.joda.time" /> <module name="org.opensaml" /> + <module name="org.slf4j" /> </dependencies> </module> Modified: stack/cxf/trunk/modules/resources/src/main/resources/modules/wildfly800/org/apache/cxf/impl/main/module.xml =================================================================== --- stack/cxf/trunk/modules/resources/src/main/resources/modules/wildfly800/org/apache/cxf/impl/main/module.xml 2014-04-29 14:08:32 UTC (rev 18598) +++ stack/cxf/trunk/modules/resources/src/main/resources/modules/wildfly800/org/apache/cxf/impl/main/module.xml 2014-04-29 14:31:40 UTC (rev 18599) @@ -49,6 +49,7 @@ <module name="org.apache.ws.xmlschema" /> <module name="org.apache.ws.security" /> <module name="org.apache.santuario.xmlsec" /> + <module name="org.codehaus.woodstox" /> <module name="org.joda.time" /> <module name="org.opensaml" /> <module name="org.springframework.spring" optional="true"> Modified: stack/cxf/trunk/modules/resources/src/main/resources/modules/wildfly800/org/apache/cxf/main/module.xml =================================================================== --- stack/cxf/trunk/modules/resources/src/main/resources/modules/wildfly800/org/apache/cxf/main/module.xml 2014-04-29 14:08:32 UTC (rev 18598) +++ stack/cxf/trunk/modules/resources/src/main/resources/modules/wildfly800/org/apache/cxf/main/module.xml 2014-04-29 14:31:40 UTC (rev 18599) @@ -38,10 +38,15 @@ <module name="asm.asm" /> <module name="javax.api" /> <module name="javax.annotation.api" /> + <module name="javax.jws.api" /> <module name="javax.mail.api" /> + <module name="javax.resource.api" /> <module name="javax.wsdl4j.api" /> <module name="javax.xml.bind.api" services="import"/> <module name="com.sun.xml.bind" services="import"/> + <module name="javax.xml.soap.api" /> + <module name="javax.xml.stream.api" /> + <module name="javax.xml.ws.api" /> <module name="com.sun.xml.fastinfoset"/> <module name="org.apache.neethi" /> <module name="org.apache.ws.xmlschema" /> Modified: stack/cxf/trunk/modules/resources/src/main/resources/modules/wildfly800/org/apache/santuario/xmlsec/main/module.xml =================================================================== --- stack/cxf/trunk/modules/resources/src/main/resources/modules/wildfly800/org/apache/santuario/xmlsec/main/module.xml 2014-04-29 14:08:32 UTC (rev 18598) +++ stack/cxf/trunk/modules/resources/src/main/resources/modules/wildfly800/org/apache/santuario/xmlsec/main/module.xml 2014-04-29 14:31:40 UTC (rev 18599) @@ -40,5 +40,8 @@ <module name="javax.api" /> <module name="org.apache.commons.logging" /> <module name="org.apache.xalan" /> + <module name="org.slf4j" /> + <module name="javax.xml.bind.api" services="import"/> + <module name="com.sun.xml.bind" services="import"/> </dependencies> </module> Modified: stack/cxf/trunk/modules/resources/src/main/resources/modules/wildfly800/org/apache/ws/security/main/module.xml =================================================================== --- stack/cxf/trunk/modules/resources/src/main/resources/modules/wildfly800/org/apache/ws/security/main/module.xml 2014-04-29 14:08:32 UTC (rev 18598) +++ stack/cxf/trunk/modules/resources/src/main/resources/modules/wildfly800/org/apache/ws/security/main/module.xml 2014-04-29 14:31:40 UTC (rev 18599) @@ -30,10 +30,13 @@ <dependencies> <module name="javax.api" /> <module name="javax.xml.rpc.api" /> + <module name="org.apache.commons.codec" /> <module name="org.apache.commons.logging" /> + <module name="org.apache.neethi" /> <module name="org.apache.santuario.xmlsec" /> <module name="org.apache.xalan" /> <module name="org.joda.time" /> <module name="org.opensaml" /> + <module name="org.slf4j" /> </dependencies> </module> Modified: stack/cxf/trunk/modules/resources/src/main/resources/resources/jbossws-deploy-macros.xml =================================================================== --- stack/cxf/trunk/modules/resources/src/main/resources/resources/jbossws-deploy-macros.xml 2014-04-29 14:08:32 UTC (rev 18598) +++ stack/cxf/trunk/modules/resources/src/main/resources/resources/jbossws-deploy-macros.xml 2014-04-29 14:31:40 UTC (rev 18599) @@ -68,13 +68,13 @@ </copy> <copy todir="@{targetdir}/org/apache/cxf/main" flatten="false" overwrite="true"> <fileset dir="@{thirdpartydir}/lib"> - <include name="**/cxf-api*.jar"/> + <include name="**/cxf-core*.jar"/> </fileset> </copy> <copy todir="@{targetdir}/org/apache/cxf/impl/main" flatten="false" overwrite="true"> <fileset dir="@{thirdpartydir}/lib"> <include name="**/cxf-*.jar"/> - <exclude name="**/cxf-api*.jar"/> + <exclude name="**/cxf-core*.jar"/> </fileset> </copy> <copy todir="@{targetdir}/org/jboss/ws/api/main" flatten="false" overwrite="true"> @@ -109,7 +109,8 @@ </copy> <copy todir="@{targetdir}/org/apache/ws/security/main" flatten="false" overwrite="true"> <fileset dir="@{thirdpartydir}/lib"> - <include name="**/wss4j.jar"/> + <include name="**/wss4j-*.jar"/> + <include name="**/jasypt.jar"/> </fileset> </copy> <copy todir="@{targetdir}/org/apache/ws/xmlschema/main" flatten="false" overwrite="true"> @@ -190,13 +191,13 @@ </copy> <copy todir="@{targetdir}/org/apache/cxf/main" flatten="false" overwrite="true"> <fileset dir="@{thirdpartydir}/lib"> - <include name="**/cxf-api*.jar"/> + <include name="**/cxf-core*.jar"/> </fileset> </copy> <copy todir="@{targetdir}/org/apache/cxf/impl/main" flatten="false" overwrite="true"> <fileset dir="@{thirdpartydir}/lib"> <include name="**/cxf-*.jar"/> - <exclude name="**/cxf-api*.jar"/> + <exclude name="**/cxf-core*.jar"/> </fileset> </copy> <copy todir="@{targetdir}/org/jboss/ws/api/main" flatten="false" overwrite="true"> @@ -231,7 +232,8 @@ </copy> <copy todir="@{targetdir}/org/apache/ws/security/main" flatten="false" overwrite="true"> <fileset dir="@{thirdpartydir}/lib"> - <include name="**/wss4j.jar"/> + <include name="**/wss4j-*.jar"/> + <include name="**/jasypt.jar"/> </fileset> </copy> <copy todir="@{targetdir}/org/apache/ws/xmlschema/main" flatten="false" overwrite="true"> Modified: stack/cxf/trunk/modules/resources/src/main/resources/resources/modules-deploy.conf =================================================================== --- stack/cxf/trunk/modules/resources/src/main/resources/resources/modules-deploy.conf 2014-04-29 14:08:32 UTC (rev 18598) +++ stack/cxf/trunk/modules/resources/src/main/resources/resources/modules-deploy.conf 2014-04-29 14:31:40 UTC (rev 18599) @@ -1 +1 @@ -org/apache/cxf/**, org/apache/neethi/**, org/apache/ws/commons/xmlschema/**, org/jboss/ws/cxf/**, org/jboss/ws/api/**, org/jboss/ws/common/**, org/jboss/ws/jaxws-client/**, org/jboss/ws/jaxws-jboss-httpserver-httpspi/**, org/jboss/ws/jaxws-undertow-httpspi/**,org/jboss/ws/saaj-impl/**, org/jboss/ws/spi/**, org/jboss/ws/tools/**, org/opensaml/**, org/springframework/spring/**, org/jboss/ws/native/** +org/apache/cxf/**, org/apache/ws/security/**, org/apache/neethi/**, org/apache/ws/commons/xmlschema/**, org/jboss/ws/cxf/**, org/jboss/ws/api/**, org/jboss/ws/common/**, org/jboss/ws/jaxws-client/**, org/jboss/ws/jaxws-jboss-httpserver-httpspi/**, org/jboss/ws/jaxws-undertow-httpspi/**,org/jboss/ws/saaj-impl/**, org/jboss/ws/spi/**, org/jboss/ws/tools/**, org/opensaml/**, org/springframework/spring/**, org/jboss/ws/native/** Modified: stack/cxf/trunk/modules/server/pom.xml =================================================================== --- stack/cxf/trunk/modules/server/pom.xml 2014-04-29 14:08:32 UTC (rev 18598) +++ stack/cxf/trunk/modules/server/pom.xml 2014-04-29 14:31:40 UTC (rev 18599) @@ -9,7 +9,7 @@ <parent> <groupId>org.jboss.ws.cxf</groupId> <artifactId>jbossws-cxf</artifactId> - <version>4.3.1-SNAPSHOT</version> + <version>5.0.0-SNAPSHOT</version> <relativePath>../../pom.xml</relativePath> </parent> @@ -169,10 +169,6 @@ </dependency> <dependency> <groupId>org.springframework</groupId> - <artifactId>spring-asm</artifactId> - </dependency> - <dependency> - <groupId>org.springframework</groupId> <artifactId>spring-beans</artifactId> </dependency> <dependency> Modified: stack/cxf/trunk/modules/server/src/main/java/org/jboss/wsf/stack/cxf/JBossWSInvoker.java =================================================================== --- stack/cxf/trunk/modules/server/src/main/java/org/jboss/wsf/stack/cxf/JBossWSInvoker.java 2014-04-29 14:08:32 UTC (rev 18598) +++ stack/cxf/trunk/modules/server/src/main/java/org/jboss/wsf/stack/cxf/JBossWSInvoker.java 2014-04-29 14:31:40 UTC (rev 18599) @@ -126,7 +126,7 @@ } else if (o != null) { params = new MessageContentsList(o); } - return invoke(exchange, targetBean, adjustMethodAndParams(md.getMethod(bop), exchange, params), params); + return invoke(exchange, targetBean, adjustMethodAndParams(md.getMethod(bop), exchange, params, targetBean.getClass()), params); } /** Modified: stack/cxf/trunk/modules/server/src/main/java/org/jboss/wsf/stack/cxf/RequestHandlerImpl.java =================================================================== --- stack/cxf/trunk/modules/server/src/main/java/org/jboss/wsf/stack/cxf/RequestHandlerImpl.java 2014-04-29 14:08:32 UTC (rev 18598) +++ stack/cxf/trunk/modules/server/src/main/java/org/jboss/wsf/stack/cxf/RequestHandlerImpl.java 2014-04-29 14:31:40 UTC (rev 18599) @@ -47,8 +47,6 @@ import org.apache.cxf.transport.http.AbstractHTTPDestination; import org.apache.cxf.transport.http.DestinationRegistry; import org.apache.cxf.transport.http.HTTPTransportFactory; -import org.apache.cxf.transports.http.QueryHandler; -import org.apache.cxf.transports.http.QueryHandlerRegistry; import org.jboss.util.NotImplementedException; import org.jboss.ws.common.management.AbstractServerConfig; import org.jboss.wsf.spi.deployment.Endpoint; @@ -83,33 +81,53 @@ public void handleHttpRequest(Endpoint ep, HttpServletRequest req, HttpServletResponse res, ServletContext context) throws ServletException, IOException { + final boolean isGet = "GET".equals(req.getMethod()); + final boolean isGetWithQueryString = isGet && hasQueryString(req); + if (isGet && !isGetWithQueryString) + { + //reject HTTP GET without query string (only support messages sent w/ POST) + res.setStatus(405); + res.setContentType("text/plain"); + Writer out = res.getWriter(); + out.write("HTTP GET not supported"); + out.close(); + return; + } + + Long beginTime = initRequestMetrics(ep); Bus bus = ep.getService().getDeployment().getAttachment(BusHolder.class).getBus(); AbstractHTTPDestination dest = findDestination(req, bus); - - boolean requestHandled = handleQuery(req, res, dest, bus); - if (false == requestHandled) + HttpServletResponseWrapper response = new HttpServletResponseWrapper(res); + try { - Long beginTime = initRequestMetrics(ep); - HttpServletResponseWrapper response = new HttpServletResponseWrapper(res); - try - { - ServletConfig cfg = (ServletConfig)context.getAttribute(ServletConfig.class.getName()); - dest.invoke(cfg, context, req, response); + ServletConfig cfg = (ServletConfig)context.getAttribute(ServletConfig.class.getName()); + if (isGetWithQueryString) { + final EndpointInfo endpointInfo = dest.getEndpointInfo(); + final boolean autoRewrite = SoapAddressRewriteHelper.isAutoRewriteOn(getServerConfig()); + endpointInfo.setProperty(WSDLGetUtils.AUTO_REWRITE_ADDRESS, autoRewrite); + endpointInfo.setProperty(WSDLGetUtils.AUTO_REWRITE_ADDRESS_ALL, autoRewrite); } - catch (IOException e) - { - throw new ServletException(e); - } - if (response.getStatus() < 500) - { - processResponseMetrics(ep, beginTime); - } - else - { - processFaultMetrics(ep, beginTime); - } + dest.invoke(cfg, context, req, response); } + catch (IOException e) + { + throw new ServletException(e); + } + if (response.getStatus() < 500) + { + processResponseMetrics(ep, beginTime); + } + else + { + processFaultMetrics(ep, beginTime); + } } + + private boolean hasQueryString(HttpServletRequest req) + { + final String queryString = req.getQueryString(); + return ((null != queryString) && (queryString.length() > 0)); + } public void handleRequest(Endpoint endpoint, InputStream inStream, OutputStream outStream, InvocationContext context) { @@ -182,67 +200,12 @@ throw Messages.MESSAGES.cannotObtainDestinationFactoryForHttpTransport(e); } return null; - } - - /** - * When request includes query it tries to lookup the query handler and tries to handle the request message - * @param req request - * @param res response - * @param dest destination - * @return true if there was a query handler that successfully handled the request, false otherwise - * @throws ServletException if some problem occurs - */ - private final boolean handleQuery(HttpServletRequest req, HttpServletResponse res, AbstractHTTPDestination dest, Bus bus) - throws ServletException, IOException - { - final String queryString = req.getQueryString(); - if ((null != queryString) && (queryString.length() > 0)) - { - final QueryHandlerRegistry qhr = bus.getExtension(QueryHandlerRegistry.class); - if (qhr != null) { - final String ctxUri = req.getRequestURI(); - final String baseUri = req.getRequestURL().toString() + "?" + queryString; - final EndpointInfo endpointInfo = dest.getEndpointInfo(); - final boolean autoRewrite = SoapAddressRewriteHelper.isAutoRewriteOn(getServerConfig()); - endpointInfo.setProperty(WSDLGetUtils.AUTO_REWRITE_ADDRESS, autoRewrite); - endpointInfo.setProperty(WSDLGetUtils.AUTO_REWRITE_ADDRESS_ALL, autoRewrite); - - for (QueryHandler queryHandler : qhr.getHandlers()) - { - if (queryHandler.isRecognizedQuery(baseUri, ctxUri, endpointInfo)) - { - res.setContentType(queryHandler.getResponseContentType(baseUri, ctxUri)); - try - { - OutputStream out = res.getOutputStream(); - queryHandler.writeResponse(baseUri, ctxUri, endpointInfo, out); - out.flush(); - return true; - } - catch (Exception e) - { - throw new ServletException(e); - } - } - } - } - } - else if ("GET".equals(req.getMethod())) - { - //reject HTTP GET without query string (only support messages sent w/ POST) - res.setStatus(405); - res.setContentType("text/plain"); - Writer out = res.getWriter(); - out.write("HTTP GET not supported"); - out.close(); - return true; - } - - return false; } - private static ServerConfig getServerConfig() { - if(System.getSecurityManager() == null) { + private static ServerConfig getServerConfig() + { + if (System.getSecurityManager() == null) + { return AbstractServerConfig.getServerIntegrationServerConfig(); } return AccessController.doPrivileged(AbstractServerConfig.GET_SERVER_INTEGRATION_SERVER_CONFIG); Modified: stack/cxf/trunk/modules/server/src/main/java/org/jboss/wsf/stack/cxf/config/CXFStackConfigFactory.java =================================================================== --- stack/cxf/trunk/modules/server/src/main/java/org/jboss/wsf/stack/cxf/config/CXFStackConfigFactory.java 2014-04-29 14:08:32 UTC (rev 18598) +++ stack/cxf/trunk/modules/server/src/main/java/org/jboss/wsf/stack/cxf/config/CXFStackConfigFactory.java 2014-04-29 14:31:40 UTC (rev 18599) @@ -26,7 +26,7 @@ import java.security.AccessController; import java.security.PrivilegedAction; -import org.apache.ws.security.WSSConfig; +import org.apache.wss4j.dom.WSSConfig; import org.jboss.wsf.spi.classloading.ClassLoaderProvider; import org.jboss.wsf.spi.management.StackConfig; import org.jboss.wsf.spi.management.StackConfigFactory; Modified: stack/cxf/trunk/modules/server/src/main/java/org/jboss/wsf/stack/cxf/configuration/BusHolder.java =================================================================== --- stack/cxf/trunk/modules/server/src/main/java/org/jboss/wsf/stack/cxf/configuration/BusHolder.java 2014-04-29 14:08:32 UTC (rev 18598) +++ stack/cxf/trunk/modules/server/src/main/java/org/jboss/wsf/stack/cxf/configuration/BusHolder.java 2014-04-29 14:31:40 UTC (rev 18599) @@ -1,6 +1,6 @@ /* * JBoss, Home of Professional Open Source. - * Copyright 2012, Red Hat Middleware LLC, and individual contributors + * Copyright 2014, Red Hat Middleware LLC, and individual contributors * as indicated by the @author tags. See the copyright.txt file in the * distribution for a full listing of individual contributors. * @@ -40,7 +40,6 @@ import org.apache.cxf.resource.ResourceResolver; import org.apache.cxf.service.factory.FactoryBeanListener; import org.apache.cxf.service.factory.FactoryBeanListenerManager; -import org.apache.cxf.transport.http.DestinationRegistry; import org.apache.cxf.workqueue.AutomaticWorkQueue; import org.apache.cxf.workqueue.AutomaticWorkQueueImpl; import org.apache.cxf.workqueue.WorkQueueManager; @@ -69,7 +68,6 @@ import org.jboss.wsf.stack.cxf.interceptor.NsCtxSelectorStoreInterceptor; import org.jboss.wsf.stack.cxf.management.InstrumentationManagerExtImpl; import org.jboss.wsf.stack.cxf.security.authentication.AutenticationMgrSubjectCreatingInterceptor; -import org.jboss.wsf.stack.cxf.transport.JBossWSDestinationRegistryImpl; /** * A wrapper of the Bus for performing most of the configurations required on it by JBossWS @@ -143,10 +141,6 @@ { bus.getExtension(PolicyEngine.class).setAlternativeSelector(getAlternativeSelector(props)); } - if (bus.getExtension(DestinationRegistry.class) == null) - { - bus.setExtension(new JBossWSDestinationRegistryImpl(), DestinationRegistry.class); - } setCXFManagement(bus, props); //*first* enabled cxf management if required, *then* add anything else which could be manageable (e.g. work queues) setAdditionalWorkQueues(bus, props); setWSDiscovery(bus, props); Modified: stack/cxf/trunk/modules/server/src/main/java/org/jboss/wsf/stack/cxf/configuration/ServerBeanCustomizer.java =================================================================== --- stack/cxf/trunk/modules/server/src/main/java/org/jboss/wsf/stack/cxf/configuration/ServerBeanCustomizer.java 2014-04-29 14:08:32 UTC (rev 18598) +++ stack/cxf/trunk/modules/server/src/main/java/org/jboss/wsf/stack/cxf/configuration/ServerBeanCustomizer.java 2014-04-29 14:31:40 UTC (rev 18599) @@ -26,6 +26,8 @@ import java.util.List; import org.apache.cxf.frontend.ServerFactoryBean; +import org.apache.cxf.transport.http.DestinationRegistry; +import org.apache.cxf.transport.http.HTTPTransportFactory; import org.jboss.ws.api.annotation.EndpointConfig; import org.jboss.ws.api.util.ServiceLoader; import org.jboss.ws.common.management.AbstractServerConfig; @@ -43,6 +45,7 @@ import org.jboss.wsf.stack.cxf.deployment.EndpointImpl; import org.jboss.wsf.stack.cxf.deployment.WSDLFilePublisher; import org.jboss.wsf.stack.cxf.security.authentication.AutenticationMgrSubjectCreatingInterceptor; +import org.jboss.wsf.stack.cxf.transport.JBossWSDestinationRegistryImpl; /** * @@ -88,6 +91,13 @@ } } } + if (beanInstance instanceof HTTPTransportFactory) { + HTTPTransportFactory factory = (HTTPTransportFactory) beanInstance; + DestinationRegistry oldRegistry = factory.getRegistry(); + if (!(oldRegistry instanceof JBossWSDestinationRegistryImpl)) { + factory.setRegistry(new JBossWSDestinationRegistryImpl()); + } + } super.customize(beanInstance); } Modified: stack/cxf/trunk/modules/server/src/main/java/org/jboss/wsf/stack/cxf/security/authentication/AutenticationMgrSubjectCreatingInterceptor.java =================================================================== --- stack/cxf/trunk/modules/server/src/main/java/org/jboss/wsf/stack/cxf/security/authentication/AutenticationMgrSubjectCreatingInterceptor.java 2014-04-29 14:08:32 UTC (rev 18598) +++ stack/cxf/trunk/modules/server/src/main/java/org/jboss/wsf/stack/cxf/security/authentication/AutenticationMgrSubjectCreatingInterceptor.java 2014-04-29 14:31:40 UTC (rev 18599) @@ -31,7 +31,7 @@ import org.apache.cxf.interceptor.Fault; import org.apache.cxf.message.Message; import org.apache.cxf.security.SecurityContext; -import org.apache.ws.security.WSUsernameTokenPrincipal; +import org.apache.wss4j.common.principal.UsernameTokenPrincipal; import org.jboss.security.plugins.JBossAuthenticationManager; import org.jboss.wsf.stack.cxf.Loggers; import org.jboss.wsf.stack.cxf.Messages; @@ -79,10 +79,10 @@ { //Try authenticating using WSS4J internal info (previously set into SecurityContext by WSS4JInInterceptor) Principal p = context.getUserPrincipal(); - if (!(p instanceof WSUsernameTokenPrincipal)) { + if (!(p instanceof UsernameTokenPrincipal)) { throw Messages.MESSAGES.couldNotGetSubjectInfo(); } - WSUsernameTokenPrincipal up = (WSUsernameTokenPrincipal) p; + UsernameTokenPrincipal up = (UsernameTokenPrincipal) p; subject = helper.createSubject(authenticationManger, up.getName(), up.getPassword(), up.isPasswordDigest(), up.getNonce(), up.getCreatedTime()); } Modified: stack/cxf/trunk/modules/server/src/main/java/org/jboss/wsf/stack/cxf/security/authentication/SubjectCreatingInterceptor.java =================================================================== --- stack/cxf/trunk/modules/server/src/main/java/org/jboss/wsf/stack/cxf/security/authentication/SubjectCreatingInterceptor.java 2014-04-29 14:08:32 UTC (rev 18598) +++ stack/cxf/trunk/modules/server/src/main/java/org/jboss/wsf/stack/cxf/security/authentication/SubjectCreatingInterceptor.java 2014-04-29 14:31:40 UTC (rev 18599) @@ -42,11 +42,11 @@ import org.apache.cxf.security.SecurityContext; import org.apache.cxf.ws.security.wss4j.PolicyBasedWSS4JInInterceptor; import org.apache.cxf.ws.security.wss4j.WSS4JInInterceptor; -import org.apache.ws.security.WSSecurityEngine; -import org.apache.ws.security.WSSecurityException; -import org.apache.ws.security.handler.RequestData; -import org.apache.ws.security.validate.UsernameTokenValidator; -import org.apache.ws.security.validate.Validator; +import org.apache.wss4j.common.ext.WSSecurityException; +import org.apache.wss4j.dom.WSSecurityEngine; +import org.apache.wss4j.dom.handler.RequestData; +import org.apache.wss4j.dom.validate.UsernameTokenValidator; +import org.apache.wss4j.dom.validate.Validator; import org.jboss.wsf.spi.deployment.Endpoint; import org.jboss.wsf.spi.security.SecurityDomainContext; import org.jboss.wsf.stack.cxf.security.nonce.NonceStore; @@ -158,13 +158,13 @@ { String errorMessage = "Failed Authentication : Subject has not been created"; LOG.severe(errorMessage); - throw new WSSecurityException(errorMessage, ex); + throw new WSSecurityException(WSSecurityException.ErrorCode.FAILED_AUTHENTICATION); } if (subject == null || subject.getPrincipals().size() == 0 || !checkUserPrincipal(subject.getPrincipals(), name)) { String errorMessage = "Failed Authentication : Invalid Subject"; LOG.severe(errorMessage); - throw new WSSecurityException(errorMessage); + throw new WSSecurityException(WSSecurityException.ErrorCode.FAILED_AUTHENTICATION); } msg.put(Subject.class, subject); } @@ -192,7 +192,7 @@ @Override protected void verifyCustomPassword( - org.apache.ws.security.message.token.UsernameToken usernameToken, + org.apache.wss4j.dom.message.token.UsernameToken usernameToken, RequestData data ) throws WSSecurityException { SubjectCreatingInterceptor.this.setSubject( @@ -202,7 +202,7 @@ @Override protected void verifyPlaintextPassword( - org.apache.ws.security.message.token.UsernameToken usernameToken, + org.apache.wss4j.dom.message.token.UsernameToken usernameToken, RequestData data ) throws WSSecurityException { SubjectCreatingInterceptor.this.setSubject( @@ -212,11 +212,11 @@ @Override protected void verifyDigestPassword( - org.apache.ws.security.message.token.UsernameToken usernameToken, + org.apache.wss4j.dom.message.token.UsernameToken usernameToken, RequestData data ) throws WSSecurityException { if (!supportDigestPasswords) { - throw new WSSecurityException(WSSecurityException.FAILED_AUTHENTICATION); + throw new WSSecurityException(WSSecurityException.ErrorCode.FAILED_AUTHENTICATION); } String user = usernameToken.getName(); String password = usernameToken.getPassword(); @@ -230,7 +230,7 @@ @Override protected void verifyUnknownPassword( - org.apache.ws.security.message.token.UsernameToken usernameToken, + org.apache.wss4j.dom.message.token.UsernameToken usernameToken, RequestData data ) throws WSSecurityException { SubjectCreatingInterceptor.this.setSubject( Modified: stack/cxf/trunk/modules/server/src/main/java/org/jboss/wsf/stack/cxf/security/authentication/SubjectCreatingPolicyInterceptor.java =================================================================== --- stack/cxf/trunk/modules/server/src/main/java/org/jboss/wsf/stack/cxf/security/authentication/SubjectCreatingPolicyInterceptor.java 2014-04-29 14:08:32 UTC (rev 18598) +++ stack/cxf/trunk/modules/server/src/main/java/org/jboss/wsf/stack/cxf/security/authentication/SubjectCreatingPolicyInterceptor.java 2014-04-29 14:31:40 UTC (rev 18599) @@ -35,7 +35,7 @@ import org.apache.cxf.phase.AbstractPhaseInterceptor; import org.apache.cxf.phase.Phase; import org.apache.cxf.security.SecurityContext; -import org.apache.ws.security.WSUsernameTokenPrincipal; +import org.apache.wss4j.common.principal.UsernameTokenPrincipal; import org.jboss.wsf.spi.deployment.Endpoint; import org.jboss.wsf.spi.security.SecurityDomainContext; import org.jboss.wsf.stack.cxf.Loggers; @@ -88,17 +88,17 @@ { //Try authenticating using WSS4J internal info (previously set into SecurityContext by WSS4JInInterceptor) Principal p = context.getUserPrincipal(); - if (!(p instanceof WSUsernameTokenPrincipal)) { + if (!(p instanceof UsernameTokenPrincipal)) { throw Messages.MESSAGES.couldNotGetSubjectInfo(); } - WSUsernameTokenPrincipal up = (WSUsernameTokenPrincipal) p; + UsernameTokenPrincipal up = (UsernameTokenPrincipal) p; subject = createSubject(sdc, up.getName(), up.getPassword(), up.isPasswordDigest(), up.getNonce(), up.getCreatedTime()); } Principal principal = getPrincipal(context.getUserPrincipal(), subject); message.put(SecurityContext.class, createSecurityContext(principal, subject)); } - + protected Subject createSubject(SecurityDomainContext sdc, String name, String password, boolean isDigest, String nonce, String creationTime) { Subject subject = null; @@ -117,6 +117,24 @@ return subject; } + protected Subject createSubject(SecurityDomainContext sdc, String name, String password, boolean isDigest, byte[] nonce, String creationTime) + { + Subject subject = null; + try + { + subject = helper.createSubject(sdc, name, password, isDigest, nonce, creationTime); + } + catch (Exception ex) + { + throw Messages.MESSAGES.authenticationFailedSubjectNotCreated(ex); + } + if (subject == null || subject.getPrincipals().size() == 0) + { + throw Messages.MESSAGES.authenticationFailedSubjectInvalid(); + } + return subject; + } + protected Principal getPrincipal(Principal originalPrincipal, Subject subject) { Principal[] ps = subject.getPrincipals().toArray(new Principal[] Modified: stack/cxf/trunk/modules/server/src/main/java/org/jboss/wsf/stack/cxf/security/authentication/SubjectCreator.java =================================================================== --- stack/cxf/trunk/modules/server/src/main/java/org/jboss/wsf/stack/cxf/security/authentication/SubjectCreator.java 2014-04-29 14:08:32 UTC (rev 18598) +++ stack/cxf/trunk/modules/server/src/main/java/org/jboss/wsf/stack/cxf/security/authentication/SubjectCreator.java 2014-04-29 14:31:40 UTC (rev 18599) @@ -24,6 +24,7 @@ import static org.jboss.wsf.stack.cxf.Loggers.SECURITY_LOGGER; import static org.jboss.wsf.stack.cxf.Messages.MESSAGES; +import java.io.ByteArrayOutputStream; import java.security.AccessController; import java.security.PrivilegedAction; import java.security.Principal; @@ -62,6 +63,13 @@ private boolean decodeNonce = true; + public Subject createSubject(SecurityDomainContext ctx, String name, String password, boolean isDigest, byte[] nonce, String created) + { + //TODO, revisit + final String sNonce = convertNonce(nonce); + return createSubject(ctx, name, password, isDigest, sNonce, created); + } + public Subject createSubject(SecurityDomainContext ctx, String name, String password, boolean isDigest, String nonce, String created) { if (isDigest) @@ -125,6 +133,12 @@ } return subject; } + public Subject createSubject(JBossAuthenticationManager manager, String name, String password, boolean isDigest, byte[] nonce, String created) + { + //TODO revisit + final String sNonce = convertNonce(nonce); + return createSubject(manager, name, password, isDigest, sNonce, created); + } //TODO:refactor this public Subject createSubject(JBossAuthenticationManager manager, String name, String password, boolean isDigest, String nonce, String created) { @@ -184,6 +198,28 @@ return subject; } + private String convertNonce(byte[] nonce) + { + //TODO, revisit + try + { + if (nonce != null) + { + ByteArrayOutputStream bos = new ByteArrayOutputStream(); + bos.write(nonce); + return bos.toString(); + } + else + { + return null; + } + } + catch (Exception e) + { + throw new RuntimeException(e); + } + } + protected void verifyUsernameToken(String nonce, String created) { Modified: stack/cxf/trunk/modules/server/src/test/java/org/jboss/wsf/stack/cxf/JBossWSInvokerTest.java =================================================================== --- stack/cxf/trunk/modules/server/src/test/java/org/jboss/wsf/stack/cxf/JBossWSInvokerTest.java 2014-04-29 14:08:32 UTC (rev 18598) +++ stack/cxf/trunk/modules/server/src/test/java/org/jboss/wsf/stack/cxf/JBossWSInvokerTest.java 2014-04-29 14:31:40 UTC (rev 18599) @@ -60,6 +60,7 @@ public void testMessageContextThreadLocal() { TestInvoker invoker = new TestInvoker(); + invoker.setTargetBean(this); //just to avoid internal NPE Exchange exchange = getTestExchange(); Object obj = invoker.invoke(exchange, null); String res = obj instanceof List<?> ? ((List<?>)obj).get(0).toString() : obj.toString(); Modified: stack/cxf/trunk/modules/testsuite/cxf-spring-tests/pom.xml =================================================================== --- stack/cxf/trunk/modules/testsuite/cxf-spring-tests/pom.xml 2014-04-29 14:08:32 UTC (rev 18598) +++ stack/cxf/trunk/modules/testsuite/cxf-spring-tests/pom.xml 2014-04-29 14:31:40 UTC (rev 18599) @@ -10,7 +10,7 @@ <parent> <groupId>org.jboss.ws.cxf</groupId> <artifactId>jbossws-cxf-testsuite</artifactId> - <version>4.3.1-SNAPSHOT</version> + <version>5.0.0-SNAPSHOT</version> <relativePath>../pom.xml</relativePath> </parent> @@ -32,10 +32,6 @@ </dependency> <dependency> <groupId>org.springframework</groupId> - <artifactId>spring-asm</artifactId> - </dependency> - <dependency> - <groupId>org.springframework</groupId> <artifactId>spring-beans</artifactId> </dependency> <dependency> Modified: stack/cxf/trunk/modules/testsuite/cxf-spring-tests/src/test/java/org/jboss/test/ws/jaxws/samples/wsse/UsernamePasswordCallback.java =================================================================== --- stack/cxf/trunk/modules/testsuite/cxf-spring-tests/src/test/java/org/jboss/test/ws/jaxws/samples/wsse/UsernamePasswordCallback.java 2014-04-29 14:08:32 UTC (rev 18598) +++ stack/cxf/trunk/modules/testsuite/cxf-spring-tests/src/test/java/org/jboss/test/ws/jaxws/samples/wsse/UsernamePasswordCallback.java 2014-04-29 14:31:40 UTC (rev 18599) @@ -26,8 +26,9 @@ import javax.security.auth.callback.Callback; import javax.security.auth.callback.CallbackHandler; import javax.security.auth.callback.UnsupportedCallbackException; -import org.apache.ws.security.WSPasswordCallback; +import org.apache.wss4j.common.ext.WSPasswordCallback; + public class UsernamePasswordCallback implements CallbackHandler { public void handle(Callback[] callbacks) throws IOException, UnsupportedCallbackException Modified: stack/cxf/trunk/modules/testsuite/cxf-spring-tests/src/test/java/org/jboss/test/ws/jaxws/samples/wsseDigest/UsernamePasswordCallback.java =================================================================== --- stack/cxf/trunk/modules/testsuite/cxf-spring-tests/src/test/java/org/jboss/test/ws/jaxws/samples/wsseDigest/UsernamePasswordCallback.java 2014-04-29 14:08:32 UTC (rev 18598) +++ stack/cxf/trunk/modules/testsuite/cxf-spring-tests/src/test/java/org/jboss/test/ws/jaxws/samples/wsseDigest/UsernamePasswordCallback.java 2014-04-29 14:31:40 UTC (rev 18599) @@ -26,8 +26,9 @@ import javax.security.auth.callback.Callback; import javax.security.auth.callback.CallbackHandler; import javax.security.auth.callback.UnsupportedCallbackException; -import org.apache.ws.security.WSPasswordCallback; +import org.apache.wss4j.common.ext.WSPasswordCallback; + public class UsernamePasswordCallback implements CallbackHandler { public void handle(Callback[] callbacks) throws IOException, UnsupportedCallbackException Modified: stack/cxf/trunk/modules/testsuite/cxf-spring-tests/src/test/java/org/jboss/test/ws/jaxws/samples/wsseEJB/UsernamePasswordCallback.java =================================================================== --- stack/cxf/trunk/modules/testsuite/cxf-spring-tests/src/test/java/org/jboss/test/ws/jaxws/samples/wsseEJB/UsernamePasswordCallback.java 2014-04-29 14:08:32 UTC (rev 18598) +++ stack/cxf/trunk/modules/testsuite/cxf-spring-tests/src/test/java/org/jboss/test/ws/jaxws/samples/wsseEJB/UsernamePasswordCallback.java 2014-04-29 14:31:40 UTC (rev 18599) @@ -26,8 +26,9 @@ import javax.security.auth.callback.Callback; import javax.security.auth.callback.CallbackHandler; import javax.security.auth.callback.UnsupportedCallbackException; -import org.apache.ws.security.WSPasswordCallback; +import org.apache.wss4j.common.ext.WSPasswordCallback; + public class UsernamePasswordCallback implements CallbackHandler { public void handle(Callback[] callbacks) throws IOException, UnsupportedCallbackException Modified: stack/cxf/trunk/modules/testsuite/cxf-spring-tests/src/test/java/org/jboss/test/ws/jaxws/samples/wssePolicy/UsernamePasswordCallback.java =================================================================== --- stack/cxf/trunk/modules/testsuite/cxf-spring-tests/src/test/java/org/jboss/test/ws/jaxws/samples/wssePolicy/UsernamePasswordCallback.java 2014-04-29 14:08:32 UTC (rev 18598) +++ stack/cxf/trunk/modules/testsuite/cxf-spring-tests/src/test/java/org/jboss/test/ws/jaxws/samples/wssePolicy/UsernamePasswordCallback.java 2014-04-29 14:31:40 UTC (rev 18599) @@ -26,8 +26,9 @@ import javax.security.auth.callback.Callback; import javax.security.auth.callback.CallbackHandler; import javax.security.auth.callback.UnsupportedCallbackException; -import org.apache.ws.security.WSPasswordCallback; +import org.apache.wss4j.common.ext.WSPasswordCallback; + public class UsernamePasswordCallback implements CallbackHandler { public void handle(Callback[] callbacks) throws IOException, UnsupportedCallbackException Modified: stack/cxf/trunk/modules/testsuite/cxf-tests/pom.xml =================================================================== --- stack/cxf/trunk/modules/testsuite/cxf-tests/pom.xml 2014-04-29 14:08:32 UTC (rev 18598) +++ stack/cxf/trunk/modules/testsuite/cxf-tests/pom.xml 2014-04-29 14:31:40 UTC (rev 18599) @@ -10,7 +10,7 @@ <parent> <groupId>org.jboss.ws.cxf</groupId> <artifactId>jbossws-cxf-testsuite</artifactId> - <version>4.3.1-SNAPSHOT</version> + <version>5.0.0-SNAPSHOT</version> <relativePath>../pom.xml</relativePath> </parent> @@ -125,11 +125,6 @@ <artifactItems> <artifactItem> <groupId>org.springframework</groupId> - <artifactId>spring-asm</artifactId> - <version>${test.spring.version}</version> - </artifactItem> - <artifactItem> - <groupId>org.springframework</groupId> <artifactId>spring-beans</artifactId> <version>${test.spring.version}</version> </artifactItem> @@ -158,6 +153,11 @@ <artifactId>spring-aop</artifactId> <version>${test.spring.version}</version> </artifactItem> + <artifactItem> + <groupId>org.springframework</groupId> + <artifactId>spring-asm</artifactId> + <version>${test.spring.version}</version> + </artifactItem> </artifactItems> <outputDirectory>target/spring</outputDirectory> </configuration> Modified: stack/cxf/trunk/modules/testsuite/cxf-tests/scripts/cxf-jars-jaxws.xml =================================================================== --- stack/cxf/trunk/modules/testsuite/cxf-tests/scripts/cxf-jars-jaxws.xml 2014-04-29 14:08:32 UTC (rev 18598) +++ stack/cxf/trunk/modules/testsuite/cxf-tests/scripts/cxf-jars-jaxws.xml 2014-04-29 14:31:40 UTC (rev 18599) @@ -575,6 +575,11 @@ <attribute name="Dependencies" value="org.jboss.ws.common,org.jboss.ws.cxf.jbossws-cxf-client services"/> </manifest> </war> + <jar destfile="${tests.output.dir}/test-libs/jaxws-cxf-udp-api-client.jar"> + <metainf dir="${tests.output.dir}/test-resources/jaxws/cxf/udp/META-INF"> + <include name="wsdl/*" /> + </metainf> + </jar> <!-- jaxws-cxf-servletCtx --> <war warfile="${tests.output.dir}/test-libs/jaxws-cxf-servletCtx.war" needxmlfile='false'> Modified: stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/cxf/jbws3516/JBWS3516TestCase.java =================================================================== --- stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/cxf/jbws3516/JBWS3516TestCase.java 2014-04-29 14:08:32 UTC (rev 18598) +++ stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/cxf/jbws3516/JBWS3516TestCase.java 2014-04-29 14:31:40 UTC (rev 18599) @@ -35,7 +35,6 @@ import org.apache.cxf.ws.addressing.AttributedURIType; import org.apache.cxf.ws.addressing.EndpointReferenceType; import org.apache.cxf.ws.addressing.JAXWSAConstants; -import org.apache.cxf.ws.addressing.impl.AddressingPropertiesImpl; import org.jboss.ws.common.IOUtils; import org.jboss.wsf.test.JBossWSTest; import org.jboss.wsf.test.JBossWSTestSetup; @@ -52,7 +51,7 @@ public void testOneWayFaultTo() throws Exception { Greeter greeter = initPort(); - AddressingProperties addrProperties = new AddressingPropertiesImpl(); + AddressingProperties addrProperties = new AddressingProperties(); EndpointReferenceType faultTo = new EndpointReferenceType(); AttributedURIType epr = new AttributedURIType(); epr.setValue("http://" + getServerHost() + ":8080/jaxws-cxf-jbws3516/target/faultTo"); @@ -81,7 +80,7 @@ { Greeter greeter = initPort(); - AddressingProperties addrProperties = new AddressingPropertiesImpl(); + AddressingProperties addrProperties = new AddressingProperties(); EndpointReferenceType faultTo = new EndpointReferenceType(); AttributedURIType epr = new AttributedURIType(); Modified: stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/cxf/jbws3648/KeystorePasswordCallback.java =================================================================== --- stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/cxf/jbws3648/KeystorePasswordCallback.java 2014-04-29 14:08:32 UTC (rev 18598) +++ stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/cxf/jbws3648/KeystorePasswordCallback.java 2014-04-29 14:31:40 UTC (rev 18599) @@ -28,8 +28,9 @@ import javax.security.auth.callback.Callback; import javax.security.auth.callback.CallbackHandler; import javax.security.auth.callback.UnsupportedCallbackException; -import org.apache.ws.security.WSPasswordCallback; +import org.apache.wss4j.common.ext.WSPasswordCallback; + public class KeystorePasswordCallback implements CallbackHandler { Modified: stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/cxf/jbws3773/JBWS3773TestCase.java =================================================================== --- stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/cxf/jbws3773/JBWS3773TestCase.java 2014-04-29 14:08:32 UTC (rev 18598) +++ stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/cxf/jbws3773/JBWS3773TestCase.java 2014-04-29 14:31:40 UTC (rev 18599) @@ -35,7 +35,6 @@ import org.apache.cxf.ws.addressing.AttributedURIType; import org.apache.cxf.ws.addressing.EndpointReferenceType; import org.apache.cxf.ws.addressing.JAXWSAConstants; -import org.apache.cxf.ws.addressing.impl.AddressingPropertiesImpl; import org.jboss.ws.common.IOUtils; import org.jboss.wsf.test.JBossWSTest; import org.jboss.wsf.test.JBossWSTestSetup; @@ -51,7 +50,7 @@ { Greeter greeter = initPort(); - AddressingProperties addrProperties = new AddressingPropertiesImpl(); + AddressingProperties addrProperties = new AddressingProperties(); EndpointReferenceType replyTo = new EndpointReferenceType(); AttributedURIType replyToURI = new AttributedURIType(); Modified: stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/cxf/udp/UDPEndpointAPITestCase.java =================================================================== --- stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/cxf/udp/UDPEndpointAPITestCase.java 2014-04-29 14:08:32 UTC (rev 18598) +++ stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/cxf/udp/UDPEndpointAPITestCase.java 2014-04-29 14:31:40 UTC (rev 18599) @@ -49,7 +49,7 @@ { public static Test suite() { - return new JBossWSCXFTestSetup(UDPEndpointAPITestCase.class, "jaxws-cxf-udp-api.war"); + return new JBossWSCXFTestSetup(UDPEndpointAPITestCase.class, "jaxws-cxf-udp-api.war,jaxws-cxf-udp-api-client.jar"); } public void testServerSide() throws Exception Modified: stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/samples/wsse/policy/basic/UsernamePasswordCallback.java =================================================================== --- stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/samples/wsse/policy/basic/UsernamePasswordCallback.java 2014-04-29 14:08:32 UTC (rev 18598) +++ stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/samples/wsse/policy/basic/UsernamePasswordCallback.java 2014-04-29 14:31:40 UTC (rev 18599) @@ -26,8 +26,9 @@ import javax.security.auth.callback.Callback; import javax.security.auth.callback.CallbackHandler; import javax.security.auth.callback.UnsupportedCallbackException; -import org.apache.ws.security.WSPasswordCallback; +import org.apache.wss4j.common.ext.WSPasswordCallback; + public class UsernamePasswordCallback implements CallbackHandler { public void handle(Callback[] callbacks) throws IOException, UnsupportedCallbackException Modified: stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/samples/wsse/policy/jaas/UsernameDigestPasswordCallback.java =================================================================== --- stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/samples/wsse/policy/jaas/UsernameDigestPasswordCallback.java 2014-04-29 14:08:32 UTC (rev 18598) +++ stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/samples/wsse/policy/jaas/UsernameDigestPasswordCallback.java 2014-04-29 14:31:40 UTC (rev 18599) @@ -26,8 +26,9 @@ import javax.security.auth.callback.Callback; import javax.security.auth.callback.CallbackHandler; import javax.security.auth.callback.UnsupportedCallbackException; -import org.apache.ws.security.WSPasswordCallback; +import org.apache.wss4j.common.ext.WSPasswordCallback; + public class UsernameDigestPasswordCallback implements CallbackHandler { public void handle(Callback[] callbacks) throws IOException, UnsupportedCallbackException Modified: stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/samples/wsse/policy/jaas/UsernamePasswordCallback.java =================================================================== --- stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/samples/wsse/policy/jaas/UsernamePasswordCallback.java 2014-04-29 14:08:32 UTC (rev 18598) +++ stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/samples/wsse/policy/jaas/UsernamePasswordCallback.java 2014-04-29 14:31:40 UTC (rev 18599) @@ -26,8 +26,9 @@ import javax.security.auth.callback.Callback; import javax.security.auth.callback.CallbackHandler; import javax.security.auth.callback.UnsupportedCallbackException; -import org.apache.ws.security.WSPasswordCallback; +import org.apache.wss4j.common.ext.WSPasswordCallback; + public class UsernamePasswordCallback implements CallbackHandler { public void handle(Callback[] callbacks) throws IOException, UnsupportedCallbackException Modified: stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/samples/wsse/policy/jaspi/UsernamePasswordCallback.java =================================================================== --- stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/samples/wsse/policy/jaspi/UsernamePasswordCallback.java 2014-04-29 14:08:32 UTC (rev 18598) +++ stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/samples/wsse/policy/jaspi/UsernamePasswordCallback.java 2014-04-29 14:31:40 UTC (rev 18599) @@ -26,8 +26,9 @@ import javax.security.auth.callback.Callback; import javax.security.auth.callback.CallbackHandler; import javax.security.auth.callback.UnsupportedCallbackException; -import org.apache.ws.security.WSPasswordCallback; +import org.apache.wss4j.common.ext.WSPasswordCallback; + public class UsernamePasswordCallback implements CallbackHandler { public void handle(Callback[] callbacks) throws IOException, UnsupportedCallbackException Modified: stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/samples/wsse/policy/oasis/SamlCallbackHandler.java =================================================================== --- stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/samples/wsse/policy/oasis/SamlCallbackHandler.java 2014-04-29 14:08:32 UTC (rev 18598) +++ stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/samples/wsse/policy/oasis/SamlCallbackHandler.java 2014-04-29 14:31:40 UTC (rev 18599) @@ -10,17 +10,18 @@ import javax.security.auth.callback.CallbackHandler; import javax.security.auth.callback.UnsupportedCallbackException; -import org.apache.ws.security.components.crypto.Crypto; -import org.apache.ws.security.components.crypto.CryptoFactory; -import org.apache.ws.security.components.crypto.CryptoType; -import org.apache.ws.security.saml.ext.SAMLCallback; -import org.apache.ws.security.saml.ext.bean.AttributeBean; -import org.apache.ws.security.saml.ext.bean.AttributeStatementBean; -import org.apache.ws.security.saml.ext.bean.KeyInfoBean; -import org.apache.ws.security.saml.ext.bean.KeyInfoBean.CERT_IDENTIFIER; -import org.apache.ws.security.saml.ext.bean.SubjectBean; -import org.apache.ws.security.saml.ext.builder.SAML1Constants; -import org.apache.ws.security.saml.ext.builder.SAML2Constants; +import org.apache.wss4j.common.crypto.Crypto; +import org.apache.wss4j.common.crypto.CryptoFactory; +import org.apache.wss4j.common.crypto.CryptoType; +import org.apache.wss4j.common.ext.WSSecurityException; +import org.apache.wss4j.common.saml.SAMLCallback; +import org.apache.wss4j.common.saml.bean.AttributeBean; +import org.apache.wss4j.common.saml.bean.AttributeStatementBean; +import org.apache.wss4j.common.saml.bean.KeyInfoBean; +import org.apache.wss4j.common.saml.bean.KeyInfoBean.CERT_IDENTIFIER; +import org.apache.wss4j.common.saml.bean.SubjectBean; +import org.apache.wss4j.common.saml.builder.SAML1Constants; +import org.apache.wss4j.common.saml.builder.SAML2Constants; import org.opensaml.common.SAMLVersion; public class SamlCallbackHandler implements CallbackHandler @@ -28,6 +29,8 @@ private String confirmationMethod = SAML2Constants.CONF_BEARER; private boolean saml2; + + private boolean signed; public SamlCallbackHandler() { @@ -88,9 +91,21 @@ attributeBean.setSimpleName("subject-role"); attributeBean.setQualifiedName("http://custom-ns"); } - attributeBean.setAttributeValues(Collections.singletonList("system-user")); + + attributeBean.addAttributeValue("system-user"); attrBean.setSamlAttributes(Collections.singletonList(attributeBean)); callback.setAttributeStatementData(Collections.singletonList(attrBean)); + + try { + String file = "META-INF/alice.properties"; + Crypto crypto = CryptoFactory.getInstance(file); + callback.setIssuerCrypto(crypto); + callback.setIssuerKeyName("alice"); + callback.setIssuerKeyPassword("password"); + callback.setSignAssertion(signed); + } catch (WSSecurityException e) { + throw new IOException(e); + } } } } @@ -119,4 +134,13 @@ return keyInfo; } + public boolean isSigned() + { + return signed; + } + + public void setSigned(boolean signed) + { + this.signed = signed; + } } Modified: stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/samples/wsse/policy/oasis/UsernamePasswordCallback.java =================================================================== --- stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/samples/wsse/policy/oasis/UsernamePasswordCallback.java 2014-04-29 14:08:32 UTC (rev 18598) +++ stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/samples/wsse/policy/oasis/UsernamePasswordCallback.java 2014-04-29 14:31:40 UTC (rev 18599) @@ -26,8 +26,9 @@ import javax.security.auth.callback.Callback; import javax.security.auth.callback.CallbackHandler; import javax.security.auth.callback.UnsupportedCallbackException; -import org.apache.ws.security.WSPasswordCallback; +import org.apache.wss4j.common.ext.WSPasswordCallback; + public class UsernamePasswordCallback implements CallbackHandler { public void handle(Callback[] callbacks) throws IOException, UnsupportedCallbackException Modified: stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/samples/wsse/policy/oasis/WSSecurityPolicyExamples23xTestCase.java =================================================================== --- stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/samples/wsse/policy/oasis/WSSecurityPolicyExamples23xTestCase.java 2014-04-29 14:08:32 UTC (rev 18598) +++ stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/samples/wsse/policy/oasis/WSSecurityPolicyExamples23xTestCase.java 2014-04-29 14:31:40 UTC (rev 18599) @@ -130,11 +130,11 @@ Map<String, Object> reqCtx = ((BindingProvider) proxy).getRequestContext(); SamlCallbackHandler cbh = new SamlCallbackHandler(); cbh.setConfirmationMethod("urn:oasis:names:tc:SAML:1.0:cm:holder-of-key"); + cbh.setSigned(true); reqCtx.put(SecurityConstants.SAML_CALLBACK_HANDLER, cbh); reqCtx.put(SecurityConstants.SIGNATURE_PROPERTIES, Thread.currentThread().getContextClassLoader().getResource("META-INF/alice.properties")); reqCtx.put(SecurityConstants.SIGNATURE_USERNAME, "alice"); reqCtx.put(SecurityConstants.CALLBACK_HANDLER, new KeystorePasswordCallback()); - reqCtx.put(SecurityConstants.SELF_SIGN_SAML_ASSERTION, "true"); assertTrue(proxy.sayHello().equals("Hello - (WSS1.0) SAML1.1 Assertion (HK) over SSL")); } @@ -175,13 +175,13 @@ Map<String, Object> reqCtx = ((BindingProvider) proxy).getRequestContext(); SamlCallbackHandler cbh = new SamlCallbackHandler(); cbh.setConfirmationMethod("urn:oasis:names:tc:SAML:1.0:cm:holder-of-key"); + cbh.setSigned(true); reqCtx.put(SecurityConstants.SAML_CALLBACK_HANDLER, cbh); reqCtx.put(SecurityConstants.CALLBACK_HANDLER, new KeystorePasswordCallback()); reqCtx.put(SecurityConstants.SIGNATURE_PROPERTIES, Thread.currentThread().getContextClassLoader().getResource("META-INF/alice.properties")); reqCtx.put(SecurityConstants.ENCRYPT_PROPERTIES, Thread.currentThread().getContextClassLoader().getResource("META-INF/alice.properties")); reqCtx.put(SecurityConstants.SIGNATURE_USERNAME, "alice"); reqCtx.put(SecurityConstants.ENCRYPT_USERNAME, "bob"); - reqCtx.put(SecurityConstants.SELF_SIGN_SAML_ASSERTION, "true"); try { assertTrue(proxy.sayHello().equals("Hello - (WSS1.0) SAML1.1 Holder of Key, Sign, Optional Encrypt")); } catch (Exception e) { @@ -240,11 +240,11 @@ SamlCallbackHandler cbh = new SamlCallbackHandler(); cbh.setConfirmationMethod("urn:oasis:names:tc:SAML:2.0:cm:holder-of-key"); cbh.setSaml2(true); + cbh.setSigned(true); reqCtx.put(SecurityConstants.SAML_CALLBACK_HANDLER, cbh); reqCtx.put(SecurityConstants.SIGNATURE_PROPERTIES, Thread.currentThread().getContextClassLoader().getResource("META-INF/alice.properties")); reqCtx.put(SecurityConstants.SIGNATURE_USERNAME, "alice"); reqCtx.put(SecurityConstants.CALLBACK_HANDLER, new KeystorePasswordCallback()); - reqCtx.put(SecurityConstants.SELF_SIGN_SAML_ASSERTION, "true"); assertTrue(proxy.sayHello().equals("Hello - (WSS1.1) SAML2.0 HoK over SSL")); } Modified: stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/samples/wsse/policy/trust/shared/ClientCallbackHandler.java =================================================================== --- stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/samples/wsse/policy/trust/shared/ClientCallbackHandler.java 2014-04-29 14:08:32 UTC (rev 18598) +++ stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/samples/wsse/policy/trust/shared/ClientCallbackHandler.java 2014-04-29 14:31:40 UTC (rev 18599) @@ -22,8 +22,9 @@ import javax.security.auth.callback.Callback; import javax.security.auth.callback.CallbackHandler; import javax.security.auth.callback.UnsupportedCallbackException; -import org.apache.ws.security.WSPasswordCallback; +import org.apache.wss4j.common.ext.WSPasswordCallback; + public class ClientCallbackHandler implements CallbackHandler { public void handle(Callback[] callbacks) throws IOException, Modified: stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/samples/wsse/policy/trust/shared/UsernameTokenCallbackHandler.java =================================================================== --- stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/samples/wsse/policy/trust/shared/UsernameTokenCallbackHandler.java 2014-04-29 14:08:32 UTC (rev 18598) +++ stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/samples/wsse/policy/trust/shared/UsernameTokenCallbackHandler.java 2014-04-29 14:31:40 UTC (rev 18599) @@ -25,8 +25,8 @@ import org.apache.cxf.message.Message; import org.apache.cxf.ws.security.SecurityConstants; import org.apache.cxf.ws.security.trust.delegation.DelegationCallback; -import org.apache.ws.security.WSConstants; -import org.apache.ws.security.message.token.UsernameToken; +import org.apache.wss4j.dom.WSConstants; +import org.apache.wss4j.dom.message.token.UsernameToken; import org.w3c.dom.Document; import org.w3c.dom.Node; import org.w3c.dom.Element; Modified: stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/resources/jaxws/samples/wsse/policy/basic/sign/META-INF-server/wsdl/SecurityService.wsdl =================================================================== --- stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/resources/jaxws/samples/wsse/policy/basic/sign/META-INF-server/wsdl/SecurityService.wsdl 2014-04-29 14:08:32 UTC (rev 18598) +++ stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/resources/jaxws/samples/wsse/policy/basic/sign/META-INF-server/wsdl/SecurityService.wsdl 2014-04-29 14:31:40 UTC (rev 18599) @@ -54,7 +54,7 @@ <wsp:Policy> <sp:X509Token sp:IncludeToken='http://schemas.xmlsoap.org/ws/2005/07/securitypolicy... <wsp:Policy> - <sp:WssX509V3Token10 /> + <sp:WssX509V1Token10 /> </wsp:Policy> </sp:X509Token> </wsp:Policy> @@ -63,7 +63,7 @@ <wsp:Policy> <sp:X509Token sp:IncludeToken='http://schemas.xmlsoap.org/ws/2005/07/securitypolicy... <wsp:Policy> - <sp:WssX509V3Token10 /> + <sp:WssX509V1Token10 /> </wsp:Policy> </sp:X509Token> </wsp:Policy> Modified: stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/resources/jaxws/samples/wsse/policy/basic/sign/WEB-INF/wsdl/SecurityService.wsdl =================================================================== --- stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/resources/jaxws/samples/wsse/policy/basic/sign/WEB-INF/wsdl/SecurityService.wsdl 2014-04-29 14:08:32 UTC (rev 18598) +++ stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/resources/jaxws/samples/wsse/policy/basic/sign/WEB-INF/wsdl/SecurityService.wsdl 2014-04-29 14:31:40 UTC (rev 18599) @@ -54,7 +54,7 @@ <wsp:Policy> <sp:X509Token sp:IncludeToken='http://schemas.xmlsoap.org/ws/2005/07/securitypolicy... <wsp:Policy> - <sp:WssX509V3Token10 /> + <sp:WssX509V1Token10 /> </wsp:Policy> </sp:X509Token> </wsp:Policy> @@ -63,7 +63,7 @@ <wsp:Policy> <sp:X509Token sp:IncludeToken='http://schemas.xmlsoap.org/ws/2005/07/securitypolicy... <wsp:Policy> - <sp:WssX509V3Token10 /> + <sp:WssX509V1Token10 /> </wsp:Policy> </sp:X509Token> </wsp:Policy> Modified: stack/cxf/trunk/modules/testsuite/pom.xml =================================================================== --- stack/cxf/trunk/modules/testsuite/pom.xml 2014-04-29 14:08:32 UTC (rev 18598) +++ stack/cxf/trunk/modules/testsuite/pom.xml 2014-04-29 14:31:40 UTC (rev 18599) @@ -10,7 +10,7 @@ <parent> <groupId>org.jboss.ws.cxf</groupId> <artifactId>jbossws-cxf</artifactId> - <version>4.3.1-SNAPSHOT</version> + <version>5.0.0-SNAPSHOT</version> <relativePath>../../pom.xml</relativePath> </parent> @@ -594,10 +594,6 @@ </dependency> <dependency> <groupId>org.springframework</groupId> - <artifactId>spring-asm</artifactId> - </dependency> - <dependency> - <groupId>org.springframework</groupId> <artifactId>spring-beans</artifactId> </dependency> <dependency> Modified: stack/cxf/trunk/modules/testsuite/shared-tests/pom.xml =================================================================== --- stack/cxf/trunk/modules/testsuite/shared-tests/pom.xml 2014-04-29 14:08:32 UTC (rev 18598) +++ stack/cxf/trunk/modules/testsuite/shared-tests/pom.xml 2014-04-29 14:31:40 UTC (rev 18599) @@ -10,7 +10,7 @@ <parent> <groupId>org.jboss.ws.cxf</groupId> <artifactId>jbossws-cxf-testsuite</artifactId> - <version>4.3.1-SNAPSHOT</version> + <version>5.0.0-SNAPSHOT</version> <relativePath>../pom.xml</relativePath> </parent> Modified: stack/cxf/trunk/modules/testsuite/test-utils/pom.xml =================================================================== --- stack/cxf/trunk/modules/testsuite/test-utils/pom.xml 2014-04-29 14:08:32 UTC (rev 18598) +++ stack/cxf/trunk/modules/testsuite/test-utils/pom.xml 2014-04-29 14:31:40 UTC (rev 18599) @@ -10,7 +10,7 @@ <parent> <groupId>org.jboss.ws.cxf</groupId> <artifactId>jbossws-cxf-testsuite</artifactId> - <version>4.3.1-SNAPSHOT</version> + <version>5.0.0-SNAPSHOT</version> <relativePath>../pom.xml</relativePath> </parent> Modified: stack/cxf/trunk/pom.xml =================================================================== --- stack/cxf/trunk/pom.xml 2014-04-29 14:08:32 UTC (rev 18598) +++ stack/cxf/trunk/pom.xml 2014-04-29 14:31:40 UTC (rev 18599) @@ -32,7 +32,7 @@ <description>JBossWS CXF stack</description> - <version>4.3.1-SNAPSHOT</version> + <version>5.0.0-SNAPSHOT</version> <!-- Parent --> <parent> @@ -71,9 +71,9 @@ <wildfly800.version>8.0.0.Final</wildfly800.version> <wildfly801.version>8.0.1.Final-SNAPSHOT</wildfly801.version> <ejb.api.version>1.0.2.Final</ejb.api.version> - <cxf.version>2.7.11</cxf.version> + <cxf.version>3.0.0-SNAPSHOT</cxf.version> <cxf.asm.version>3.3.1</cxf.asm.version> - <cxf.xjcplugins.version>2.6.1</cxf.xjcplugins.version> + <cxf.xjcplugins.version>2.7.0</cxf.xjcplugins.version> <jboss.common.core.version>2.2.17.GA</jboss.common.core.version> <jboss-logging.version>3.1.2.GA</jboss-logging.version> <jboss-logging-processor.version>1.0.3.Final</jboss-logging-processor.version> @@ -96,18 +96,18 @@ <log4j.version>1.2.16</log4j.version> <activation.version>1.1</activation.version> <fastinfoset.version>1.2.12</fastinfoset.version> - <neethi.version>3.0.2</neethi.version> - <opensaml.version>2.5.3</opensaml.version> + <neethi.version>3.0.3</neethi.version> + <opensaml.version>2.6.0</opensaml.version> <saaj.api.version>1.0.3.Final</saaj.api.version> <servlet.api.version>1.0.2.Final</servlet.api.version> <stax.api.version>1.0-2</stax.api.version> <jms.api.version>1.0.1.Final</jms.api.version> <velocity.version>1.7</velocity.version> <xerces.version>2.9.1</xerces.version> - <xmlsec.version>1.5.6</xmlsec.version> - <wss4j.version>1.6.15</wss4j.version> + <xmlsec.version>2.0.0-SNAPSHOT</xmlsec.version> + <wss4j.version>2.0.0-SNAPSHOT</wss4j.version> <wstx.version>4.2.0</wstx.version> - <spring.version>3.0.7.RELEASE</spring.version> + <spring.version>3.2.8.RELEASE</spring.version> <shrinkwrap.version>1.1.3</shrinkwrap.version> <jaspi.api.version>1.0.0.Alpha1</jaspi.api.version> <javax.inject.version>1</javax.inject.version> @@ -186,6 +186,10 @@ <artifactId>saaj-api</artifactId> </exclusion> <exclusion> + <groupId>org.apache.geronimo.specs</groupId> + <artifactId>geronimo-javamail_1.4_spec</artifactId> + </exclusion> + <exclusion> <groupId>org.slf4j</groupId> <artifactId>slf4j-api</artifactId> </exclusion> @@ -252,10 +256,6 @@ </exclusion> <exclusion> <groupId>org.springframework</groupId> - <artifactId>spring-asm</artifactId> - </exclusion> - <exclusion> - <groupId>org.springframework</groupId> <artifactId>spring-beans</artifactId> </exclusion> <exclusion> @@ -319,10 +319,6 @@ </exclusion> <exclusion> <groupId>org.springframework</groupId> - <artifactId>spring-asm</artifactId> - </exclusion> - <exclusion> - <groupId>org.springframework</groupId> <artifactId>spring-beans</artifactId> </exclusion> <exclusion> @@ -358,10 +354,6 @@ </exclusion> <exclusion> <groupId>org.springframework</groupId> - <artifactId>spring-asm</artifactId> - </exclusion> - <exclusion> - <groupId>org.springframework</groupId> <artifactId>spring-beans</artifactId> </exclusion> <exclusion> @@ -401,10 +393,6 @@ </exclusion> <exclusion> <groupId>org.springframework</groupId> - <artifactId>spring-asm</artifactId> - </exclusion> - <exclusion> - <groupId>org.springframework</groupId> <artifactId>spring-beans</artifactId> </exclusion> <exclusion> @@ -443,15 +431,15 @@ <artifactId>geronimo-jms_1.1_spec</artifactId> </exclusion> <exclusion> + <groupId>org.apache.geronimo.specs</groupId> + <artifactId>geronimo-jta_1.1_spec</artifactId> + </exclusion> + <exclusion> <groupId>org.springframework</groupId> <artifactId>spring-aop</artifactId> </exclusion> <exclusion> <groupId>org.springframework</groupId> - <artifactId>spring-asm</artifactId> - </exclusion> - <exclusion> - <groupId>org.springframework</groupId> <artifactId>spring-beans</artifactId> </exclusion> <exclusion> @@ -509,10 +497,6 @@ </exclusion> <exclusion> <groupId>org.springframework</groupId> - <artifactId>spring-asm</artifactId> - </exclusion> - <exclusion> - <groupId>org.springframework</groupId> <artifactId>spring-beans</artifactId> </exclusion> <exclusion> @@ -556,10 +540,6 @@ </exclusion> <exclusion> <groupId>org.springframework</groupId> - <artifactId>spring-asm</artifactId> - </exclusion> - <exclusion> - <groupId>org.springframework</groupId> <artifactId>spring-beans</artifactId> </exclusion> <exclusion> @@ -611,10 +591,6 @@ </exclusion> <exclusion> <groupId>org.springframework</groupId> - <artifactId>spring-asm</artifactId> - </exclusion> - <exclusion> - <groupId>org.springframework</groupId> <artifactId>spring-beans</artifactId> </exclusion> <exclusion> @@ -678,10 +654,6 @@ </exclusion> <exclusion> <groupId>org.springframework</groupId> - <artifactId>spring-asm</artifactId> - </exclusion> - <exclusion> - <groupId>org.springframework</groupId> <artifactId>spring-beans</artifactId> </exclusion> <exclusion> @@ -717,10 +689,6 @@ </exclusion> <exclusion> <groupId>org.springframework</groupId> - <artifactId>spring-asm</artifactId> - </exclusion> - <exclusion> - <groupId>org.springframework</groupId> <artifactId>spring-beans</artifactId> </exclusion> <exclusion> @@ -756,10 +724,6 @@ </exclusion> <exclusion> <groupId>org.springframework</groupId> - <artifactId>spring-asm</artifactId> - </exclusion> - <exclusion> - <groupId>org.springframework</groupId> <artifactId>spring-beans</artifactId> </exclusion> <exclusion> @@ -795,10 +759,6 @@ </exclusion> <exclusion> <groupId>org.springframework</groupId> - <artifactId>spring-asm</artifactId> - </exclusion> - <exclusion> - <groupId>org.springframework</groupId> <artifactId>spring-beans</artifactId> </exclusion> <exclusion> @@ -834,10 +794,6 @@ </exclusion> <exclusion> <groupId>org.springframework</groupId> - <artifactId>spring-asm</artifactId> - </exclusion> - <exclusion> - <groupId>org.springframework</groupId> <artifactId>spring-beans</artifactId> </exclusion> <exclusion> @@ -873,10 +829,6 @@ </exclusion> <exclusion> <groupId>org.springframework</groupId> - <artifactId>spring-asm</artifactId> - </exclusion> - <exclusion> - <groupId>org.springframework</groupId> <artifactId>spring-beans</artifactId> </exclusion> <exclusion> @@ -946,13 +898,39 @@ <groupId>org.apache.santuario</groupId> <artifactId>xmlsec</artifactId> <version>${xmlsec.version}</version> + <exclusions> + <exclusion> + <groupId>org.slf4j</groupId> + <artifactId>slf4j-api</artifactId> + </exclusion> + </exclusions> </dependency> <dependency> - <groupId>org.apache.ws.security</groupId> - <artifactId>wss4j</artifactId> + <groupId>org.apache.wss4j</groupId> + <artifactId>wss4j-ws-security-common</artifactId> <version>${wss4j.version}</version> </dependency> <dependency> + <groupId>org.apache.wss4j</groupId> + <artifactId>wss4j-ws-security-dom</artifactId> + <version>${wss4j.version}</version> + </dependency> + <dependency> + <groupId>org.apache.wss4j</groupId> + <artifactId>wss4j-ws-security-stax</artifactId> + <version>${wss4j.version}</version> + </dependency> + <dependency> + <groupId>org.apache.wss4j</groupId> + <artifactId>wss4j-policy</artifactId> + <version>${wss4j.version}</version> + </dependency> + <dependency> + <groupId>org.apache.wss4j</groupId> + <artifactId>wss4j-ws-security-policy-stax</artifactId> + <version>${wss4j.version}</version> + </dependency> + <dependency> <groupId>org.codehaus.woodstox</groupId> <artifactId>woodstox-core-asl</artifactId> <version>${wstx.version}</version> @@ -1062,12 +1040,6 @@ </dependency> <dependency> <groupId>org.springframework</groupId> - <artifactId>spring-asm</artifactId> - <version>${spring.version}</version> - <scope>provided</scope> - </dependency> - <dependency> - <groupId>org.springframework</groupId> <artifactId>spring-beans</artifactId> <version>${spring.version}</version> <scope>provided</scope>