May 2014 - jbossws-commits - Jboss List Archives

JBossWS SVN: r18674 - in spi/trunk/src/main/java/org/jboss/wsf/spi: deployer and 5 other directories.

by jbossws-commits＠lists.jboss.org

Author: asoldano Date: 2014-05-19 10:22:07 -0400 (Mon, 19 May 2014) New Revision: 18674 Removed: spi/trunk/src/main/java/org/jboss/wsf/spi/SPIView.java spi/trunk/src/main/java/org/jboss/wsf/spi/deployment/WritableUnifiedVirtualFile.java Modified: spi/trunk/src/main/java/org/jboss/wsf/spi/deployer/Deployer.java spi/trunk/src/main/java/org/jboss/wsf/spi/deployment/DeploymentAspectManagerFactory.java spi/trunk/src/main/java/org/jboss/wsf/spi/deployment/DeploymentModelFactory.java spi/trunk/src/main/java/org/jboss/wsf/spi/deployment/LifecycleHandlerFactory.java spi/trunk/src/main/java/org/jboss/wsf/spi/invocation/InvocationHandlerFactory.java spi/trunk/src/main/java/org/jboss/wsf/spi/invocation/RequestHandlerFactory.java spi/trunk/src/main/java/org/jboss/wsf/spi/invocation/SecurityAdaptorFactory.java spi/trunk/src/main/java/org/jboss/wsf/spi/management/EndpointRegistryFactory.java spi/trunk/src/main/java/org/jboss/wsf/spi/management/ServerConfigFactory.java spi/trunk/src/main/java/org/jboss/wsf/spi/management/StackConfigFactory.java spi/trunk/src/main/java/org/jboss/wsf/spi/serviceref/ServiceRefFactoryFactory.java spi/trunk/src/main/java/org/jboss/wsf/spi/util/URLLoaderAdapter.java Log: Removing few useless / not used anymore interfaces, making URLLoaderAdapter thread-safe, removing deprecated method in InvocationHandlerFactory Deleted: spi/trunk/src/main/java/org/jboss/wsf/spi/SPIView.java =================================================================== --- spi/trunk/src/main/java/org/jboss/wsf/spi/SPIView.java 2014-05-19 12:41:41 UTC (rev 18673) +++ spi/trunk/src/main/java/org/jboss/wsf/spi/SPIView.java 2014-05-19 14:22:07 UTC (rev 18674) @@ -1,33 +0,0 @@ -/* - * JBoss, Home of Professional Open Source. - * Copyright 2006, Red Hat Middleware LLC, and individual contributors - * as indicated by the @author tags. See the copyright.txt file in the - * distribution for a full listing of individual contributors. - * - * This is free software; you can redistribute it and/or modify it - * under the terms of the GNU Lesser General Public License as - * published by the Free Software Foundation; either version 2.1 of - * the License, or (at your option) any later version. - * - * This software is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * Lesser General Public License for more details. - * - * You should have received a copy of the GNU Lesser General Public - * License along with this software; if not, write to the Free - * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA - * 02110-1301 USA, or see the FSF site: http://www.fsf.org. - */ -package org.jboss.wsf.spi; - -/** - * Marks a specific subset onto the overall SPI.<br> - * An SPIView can be passed to the {@link SPIProvider} to get an implementation. - * - * @author Heiko.Braun(a)jboss.com - * Created: Jul 18, 2007 - */ -public interface SPIView -{ -} Modified: spi/trunk/src/main/java/org/jboss/wsf/spi/deployer/Deployer.java =================================================================== --- spi/trunk/src/main/java/org/jboss/wsf/spi/deployer/Deployer.java 2014-05-19 12:41:41 UTC (rev 18673) +++ spi/trunk/src/main/java/org/jboss/wsf/spi/deployer/Deployer.java 2014-05-19 14:22:07 UTC (rev 18674) @@ -21,14 +21,12 @@ import java.net.URL; import java.util.Map; -import org.jboss.wsf.spi.SPIView; - /** * Abstraction to provide AS agnostic remote deployer. * * @author <a href="mailto:ropalka@redhat.com">Richard Opalka</a> */ -public interface Deployer extends SPIView +public interface Deployer { /** * Deploys specified archive remotely. Modified: spi/trunk/src/main/java/org/jboss/wsf/spi/deployment/DeploymentAspectManagerFactory.java =================================================================== --- spi/trunk/src/main/java/org/jboss/wsf/spi/deployment/DeploymentAspectManagerFactory.java 2014-05-19 12:41:41 UTC (rev 18673) +++ spi/trunk/src/main/java/org/jboss/wsf/spi/deployment/DeploymentAspectManagerFactory.java 2014-05-19 14:22:07 UTC (rev 18674) @@ -21,7 +21,6 @@ */ package org.jboss.wsf.spi.deployment; -import org.jboss.wsf.spi.SPIView; /** * Creates DeploymentAspectManager's by {@link org.jboss.wsf.spi.deployment.Deployment.DeploymentType} @@ -29,7 +28,7 @@ * @author Heiko.Braun(a)jboss.com * Created: Jul 20, 2007 */ -public abstract class DeploymentAspectManagerFactory implements SPIView +public abstract class DeploymentAspectManagerFactory { public abstract DeploymentAspectManager getDeploymentAspectManager(DeploymentType deploymentType); Modified: spi/trunk/src/main/java/org/jboss/wsf/spi/deployment/DeploymentModelFactory.java =================================================================== --- spi/trunk/src/main/java/org/jboss/wsf/spi/deployment/DeploymentModelFactory.java 2014-05-19 12:41:41 UTC (rev 18673) +++ spi/trunk/src/main/java/org/jboss/wsf/spi/deployment/DeploymentModelFactory.java 2014-05-19 14:22:07 UTC (rev 18674) @@ -21,13 +21,12 @@ */ package org.jboss.wsf.spi.deployment; -import org.jboss.wsf.spi.SPIView; /** * @author Heiko.Braun(a)jboss.com * Created: Jul 18, 2007 */ -public abstract class DeploymentModelFactory implements SPIView +public abstract class DeploymentModelFactory { public abstract Deployment newDeployment(String simpleName, ClassLoader initialLoader); Modified: spi/trunk/src/main/java/org/jboss/wsf/spi/deployment/LifecycleHandlerFactory.java =================================================================== --- spi/trunk/src/main/java/org/jboss/wsf/spi/deployment/LifecycleHandlerFactory.java 2014-05-19 12:41:41 UTC (rev 18673) +++ spi/trunk/src/main/java/org/jboss/wsf/spi/deployment/LifecycleHandlerFactory.java 2014-05-19 14:22:07 UTC (rev 18674) @@ -21,13 +21,12 @@ */ package org.jboss.wsf.spi.deployment; -import org.jboss.wsf.spi.SPIView; /** * @author Heiko.Braun(a)jboss.com * Created: Jul 23, 2007 */ -public abstract class LifecycleHandlerFactory implements SPIView +public abstract class LifecycleHandlerFactory { public abstract LifecycleHandler getLifecycleHandler(); } Deleted: spi/trunk/src/main/java/org/jboss/wsf/spi/deployment/WritableUnifiedVirtualFile.java =================================================================== --- spi/trunk/src/main/java/org/jboss/wsf/spi/deployment/WritableUnifiedVirtualFile.java 2014-05-19 12:41:41 UTC (rev 18673) +++ spi/trunk/src/main/java/org/jboss/wsf/spi/deployment/WritableUnifiedVirtualFile.java 2014-05-19 14:22:07 UTC (rev 18674) @@ -1,41 +0,0 @@ -/* - * JBoss, Home of Professional Open Source. - * Copyright 2006, Red Hat Middleware LLC, and individual contributors - * as indicated by the @author tags. See the copyright.txt file in the - * distribution for a full listing of individual contributors. - * - * This is free software; you can redistribute it and/or modify it - * under the terms of the GNU Lesser General Public License as - * published by the Free Software Foundation; either version 2.1 of - * the License, or (at your option) any later version. - * - * This software is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * Lesser General Public License for more details. - * - * You should have received a copy of the GNU Lesser General Public - * License along with this software; if not, write to the Free - * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA - * 02110-1301 USA, or see the FSF site: http://www.fsf.org. - */ -package org.jboss.wsf.spi.deployment; - -import java.io.IOException; -import java.io.OutputStream; - -/** - * @author alessio.soldano(a)jboss.com - * @since 04-Mar-2010 - */ -public interface WritableUnifiedVirtualFile extends UnifiedVirtualFile -{ - public void writeContent(OutputStream os) throws IOException; - - public void writeContent(OutputStream os, NameFilter filter) throws IOException; - - public interface NameFilter - { - public boolean accept(String fileName); - } -} Modified: spi/trunk/src/main/java/org/jboss/wsf/spi/invocation/InvocationHandlerFactory.java =================================================================== --- spi/trunk/src/main/java/org/jboss/wsf/spi/invocation/InvocationHandlerFactory.java 2014-05-19 12:41:41 UTC (rev 18673) +++ spi/trunk/src/main/java/org/jboss/wsf/spi/invocation/InvocationHandlerFactory.java 2014-05-19 14:22:07 UTC (rev 18674) @@ -21,7 +21,6 @@ */ package org.jboss.wsf.spi.invocation; -import org.jboss.wsf.spi.SPIView; /** * Creates invocation related artefacts. @@ -29,7 +28,7 @@ * @author Heiko.Braun(a)jboss.com * Created: Jul 19, 2007 */ -public abstract class InvocationHandlerFactory implements SPIView +public abstract class InvocationHandlerFactory { public abstract InvocationHandler newInvocationHandler(InvocationType type); } Modified: spi/trunk/src/main/java/org/jboss/wsf/spi/invocation/RequestHandlerFactory.java =================================================================== --- spi/trunk/src/main/java/org/jboss/wsf/spi/invocation/RequestHandlerFactory.java 2014-05-19 12:41:41 UTC (rev 18673) +++ spi/trunk/src/main/java/org/jboss/wsf/spi/invocation/RequestHandlerFactory.java 2014-05-19 14:22:07 UTC (rev 18674) @@ -21,16 +21,12 @@ */ package org.jboss.wsf.spi.invocation; -import org.jboss.wsf.spi.SPIView; /** * @author Heiko.Braun(a)jboss.com * Created: Jul 23, 2007 */ -public abstract class RequestHandlerFactory implements SPIView +public abstract class RequestHandlerFactory { - @Deprecated - public abstract RequestHandler newRequestHandler(); - public abstract RequestHandler getRequestHandler(); } Modified: spi/trunk/src/main/java/org/jboss/wsf/spi/invocation/SecurityAdaptorFactory.java =================================================================== --- spi/trunk/src/main/java/org/jboss/wsf/spi/invocation/SecurityAdaptorFactory.java 2014-05-19 12:41:41 UTC (rev 18673) +++ spi/trunk/src/main/java/org/jboss/wsf/spi/invocation/SecurityAdaptorFactory.java 2014-05-19 14:22:07 UTC (rev 18674) @@ -21,7 +21,6 @@ */ package org.jboss.wsf.spi.invocation; -import org.jboss.wsf.spi.SPIView; /** * A container idependent SecurityAdaptorFactory @@ -31,7 +30,7 @@ * * @since 10-May-2005 */ -public abstract class SecurityAdaptorFactory implements SPIView +public abstract class SecurityAdaptorFactory { public abstract SecurityAdaptor newSecurityAdapter(); } Modified: spi/trunk/src/main/java/org/jboss/wsf/spi/management/EndpointRegistryFactory.java =================================================================== --- spi/trunk/src/main/java/org/jboss/wsf/spi/management/EndpointRegistryFactory.java 2014-05-19 12:41:41 UTC (rev 18673) +++ spi/trunk/src/main/java/org/jboss/wsf/spi/management/EndpointRegistryFactory.java 2014-05-19 14:22:07 UTC (rev 18674) @@ -21,7 +21,6 @@ */ package org.jboss.wsf.spi.management; -import org.jboss.wsf.spi.SPIView; /** * Get the endpoint registry from the kernel @@ -29,7 +28,7 @@ * @author Thomas.Diesler(a)jboss.com * @since 20-Apr-2007 */ -public abstract class EndpointRegistryFactory implements SPIView +public abstract class EndpointRegistryFactory { public abstract EndpointRegistry getEndpointRegistry(); } Modified: spi/trunk/src/main/java/org/jboss/wsf/spi/management/ServerConfigFactory.java =================================================================== --- spi/trunk/src/main/java/org/jboss/wsf/spi/management/ServerConfigFactory.java 2014-05-19 12:41:41 UTC (rev 18673) +++ spi/trunk/src/main/java/org/jboss/wsf/spi/management/ServerConfigFactory.java 2014-05-19 14:22:07 UTC (rev 18674) @@ -21,7 +21,6 @@ */ package org.jboss.wsf.spi.management; -import org.jboss.wsf.spi.SPIView; /** * Factory to container independent config @@ -29,7 +28,7 @@ * @author Thomas.Diesler(a)jboss.org * @since 08-May-2006 */ -public abstract class ServerConfigFactory implements SPIView +public abstract class ServerConfigFactory { public abstract ServerConfig getServerConfig(); } Modified: spi/trunk/src/main/java/org/jboss/wsf/spi/management/StackConfigFactory.java =================================================================== --- spi/trunk/src/main/java/org/jboss/wsf/spi/management/StackConfigFactory.java 2014-05-19 12:41:41 UTC (rev 18673) +++ spi/trunk/src/main/java/org/jboss/wsf/spi/management/StackConfigFactory.java 2014-05-19 14:22:07 UTC (rev 18674) @@ -21,7 +21,6 @@ */ package org.jboss.wsf.spi.management; -import org.jboss.wsf.spi.SPIView; /** * Factory to stack configuration @@ -29,7 +28,7 @@ * @author alessio.soldano(a)jboss.com * @since 25-May-2009 */ -public abstract class StackConfigFactory implements SPIView +public abstract class StackConfigFactory { public abstract StackConfig getStackConfig(); } Modified: spi/trunk/src/main/java/org/jboss/wsf/spi/serviceref/ServiceRefFactoryFactory.java =================================================================== --- spi/trunk/src/main/java/org/jboss/wsf/spi/serviceref/ServiceRefFactoryFactory.java 2014-05-19 12:41:41 UTC (rev 18673) +++ spi/trunk/src/main/java/org/jboss/wsf/spi/serviceref/ServiceRefFactoryFactory.java 2014-05-19 14:22:07 UTC (rev 18674) @@ -21,12 +21,11 @@ */ package org.jboss.wsf.spi.serviceref; -import org.jboss.wsf.spi.SPIView; /** * @author Thomas.Diesler(a)jboss.com */ -public interface ServiceRefFactoryFactory extends SPIView +public interface ServiceRefFactoryFactory { ServiceRefFactory newServiceRefFactory(); } Modified: spi/trunk/src/main/java/org/jboss/wsf/spi/util/URLLoaderAdapter.java =================================================================== --- spi/trunk/src/main/java/org/jboss/wsf/spi/util/URLLoaderAdapter.java 2014-05-19 12:41:41 UTC (rev 18673) +++ spi/trunk/src/main/java/org/jboss/wsf/spi/util/URLLoaderAdapter.java 2014-05-19 14:22:07 UTC (rev 18674) @@ -52,14 +52,15 @@ { private static final long serialVersionUID = 8263115387770740414L; - private URL rootURL; - private URL resourceURL; - private transient URLClassLoader loader; + private final URL rootURL; + private final URL resourceURL; + private transient volatile URLClassLoader loader; private static final String jarFileSeparator = "/"; public URLLoaderAdapter(URL rootURL) { this.rootURL = rootURL; + this.resourceURL = null; } private URLLoaderAdapter(URL rootURL, URLClassLoader loader, URL resourceURL)

9 years, 11 months

1
0
0 / 0

JBossWS SVN: r18673 - in stack/cxf/branches/rsearls/modules/server/src/main/java/org/jboss/wsf/stack/cxf: addressRewrite and 1 other directory.

by jbossws-commits＠lists.jboss.org

Author: asoldano Date: 2014-05-19 08:41:41 -0400 (Mon, 19 May 2014) New Revision: 18673 Modified: stack/cxf/branches/rsearls/modules/server/src/main/java/org/jboss/wsf/stack/cxf/RequestHandlerImpl.java stack/cxf/branches/rsearls/modules/server/src/main/java/org/jboss/wsf/stack/cxf/addressRewrite/SoapAddressRewriteHelper.java Log: Modified: stack/cxf/branches/rsearls/modules/server/src/main/java/org/jboss/wsf/stack/cxf/RequestHandlerImpl.java =================================================================== --- stack/cxf/branches/rsearls/modules/server/src/main/java/org/jboss/wsf/stack/cxf/RequestHandlerImpl.java 2014-05-19 12:40:35 UTC (rev 18672) +++ stack/cxf/branches/rsearls/modules/server/src/main/java/org/jboss/wsf/stack/cxf/RequestHandlerImpl.java 2014-05-19 12:41:41 UTC (rev 18673) @@ -138,26 +138,6 @@ throw Messages.MESSAGES.cannotObtainRegistry(DestinationRegistry.class.getName()); } - //------ rls start - // this substitution enables a AbstractHTTPDestination object to be found. - ServerConfig serverConfig = getServerConfig(); - if(serverConfig.isModifySOAPAddress()) - { - String altContextRoot = serverConfig.getWebServicePath(); - if ((altContextRoot != null && altContextRoot.length() > 0)) - { - //final Service service = dep.getService(); - //service.getContextRoot(); - // TMP USAGE. NEED TO GET context-root from the service obj. - String contextRoot = "/jaxws-jbws2150"; // rls test only - String tmpContextRoot = (altContextRoot.startsWith("/")) ? altContextRoot : "/" + altContextRoot; - String tmpRequestURI = requestURI; - requestURI = tmpRequestURI.replace(contextRoot, tmpContextRoot); - - } - } - //------ rls end - requestURI = pathPattern.matcher(requestURI).replaceAll("/"); //first try looking up the destination in the registry map final AbstractHTTPDestination dest = destRegistry.getDestinationForPath(requestURI, true); Modified: stack/cxf/branches/rsearls/modules/server/src/main/java/org/jboss/wsf/stack/cxf/addressRewrite/SoapAddressRewriteHelper.java =================================================================== --- stack/cxf/branches/rsearls/modules/server/src/main/java/org/jboss/wsf/stack/cxf/addressRewrite/SoapAddressRewriteHelper.java 2014-05-19 12:40:35 UTC (rev 18672) +++ stack/cxf/branches/rsearls/modules/server/src/main/java/org/jboss/wsf/stack/cxf/addressRewrite/SoapAddressRewriteHelper.java 2014-05-19 12:41:41 UTC (rev 18673) @@ -56,7 +56,7 @@ final String origUriScheme = getUriScheme(wsdlAddress); //will be https if the user wants a https address in the wsdl final String newUriScheme = getUriScheme(epAddress); //will be https if the user set confidential transport for the endpoint final String uriScheme = (origUriScheme.equals(HTTPS) || newUriScheme.equals(HTTPS)) ? HTTPS : HTTP; - return rewriteSoapAddress(serverConfig, wsdlAddress, epAddress, uriScheme); + return rewriteSoapAddress(serverConfig, wsdlAddress, epAddress, uriScheme, serverConfig.getWebServicePath()); } else { @@ -118,7 +118,7 @@ * @param uriScheme The uriScheme to use for rewrite * @return The obtained address */ - private static String rewriteSoapAddress(ServerConfig serverConfig, String origAddress, String newAddress, String uriScheme) + private static String rewriteSoapAddress(ServerConfig serverConfig, String origAddress, String newAddress, String uriScheme, String additionalCcontext) { try { @@ -143,7 +143,19 @@ } } - String urlStr = uriScheme + "://" + host + port + path; + StringBuilder sb = new StringBuilder(uriScheme); + sb.append("://"); + sb.append(host); + sb.append(port); + if (additionalCcontext != null) { + if (!additionalCcontext.startsWith("/")) { + sb.append("/"); + } + sb.append(additionalCcontext); + } + sb.append(path); + final String urlStr = sb.toString(); + ADDRESS_REWRITE_LOGGER.addressRewritten(origAddress, urlStr); return urlStr; }

9 years, 11 months

1
0
0 / 0

JBossWS SVN: r18672 - common/branches/rsearls/src/main/java/org/jboss/ws/common/deployment.

by jbossws-commits＠lists.jboss.org

Author: asoldano Date: 2014-05-19 08:40:35 -0400 (Mon, 19 May 2014) New Revision: 18672 Modified: common/branches/rsearls/src/main/java/org/jboss/ws/common/deployment/EndpointAddressDeploymentAspect.java Log: Modified: common/branches/rsearls/src/main/java/org/jboss/ws/common/deployment/EndpointAddressDeploymentAspect.java =================================================================== --- common/branches/rsearls/src/main/java/org/jboss/ws/common/deployment/EndpointAddressDeploymentAspect.java 2014-05-19 12:31:48 UTC (rev 18671) +++ common/branches/rsearls/src/main/java/org/jboss/ws/common/deployment/EndpointAddressDeploymentAspect.java 2014-05-19 12:40:35 UTC (rev 18672) @@ -69,15 +69,6 @@ port.setServerConfig(serverConfig); String host = serverConfig.getWebServiceHost(); - if(serverConfig.isModifySOAPAddress()) - { - String altContextRoot = serverConfig.getWebServicePath(); - if ((altContextRoot != null && altContextRoot.length() > 0)) - { - contextRoot = (altContextRoot.startsWith("/")) ? altContextRoot : "/" + altContextRoot; - } - } - Map<String, Endpoint> endpointsMap = new HashMap<String, Endpoint>(); List<Endpoint> deleteList = new LinkedList<Endpoint>(); for (Endpoint ep : service.getEndpoints())

9 years, 11 months

1
0
0 / 0

JBossWS SVN: r18671 - stack/cxf/branches/rsearls/modules/testsuite/shared-tests/src/test/java/org/jboss/test/ws/jaxws/jbws2150.

by jbossws-commits＠lists.jboss.org

Author: asoldano Date: 2014-05-19 08:31:48 -0400 (Mon, 19 May 2014) New Revision: 18671 Modified: stack/cxf/branches/rsearls/modules/testsuite/shared-tests/src/test/java/org/jboss/test/ws/jaxws/jbws2150/JBWS2150TestCaseForked.java Log: Change to the testcase Modified: stack/cxf/branches/rsearls/modules/testsuite/shared-tests/src/test/java/org/jboss/test/ws/jaxws/jbws2150/JBWS2150TestCaseForked.java =================================================================== --- stack/cxf/branches/rsearls/modules/testsuite/shared-tests/src/test/java/org/jboss/test/ws/jaxws/jbws2150/JBWS2150TestCaseForked.java 2014-05-16 14:46:21 UTC (rev 18670) +++ stack/cxf/branches/rsearls/modules/testsuite/shared-tests/src/test/java/org/jboss/test/ws/jaxws/jbws2150/JBWS2150TestCaseForked.java 2014-05-19 12:31:48 UTC (rev 18671) @@ -21,7 +21,6 @@ */ package org.jboss.test.ws.jaxws.jbws2150; -import java.io.File; import java.net.URL; import java.util.Collection; import java.util.HashMap; @@ -75,6 +74,7 @@ protected static Boolean modifySOAPAddress; protected static String webServiceHost; + protected static String webServicePath; public JBWS2150TestSetup() { super(JBWS2150TestCaseForked.class, null); @@ -84,6 +84,7 @@ { modifySOAPAddress = (Boolean)getServer().getAttribute(SERVER_CONFIG_OBJECT_NAME, "ModifySOAPAddress"); webServiceHost = (String)getServer().getAttribute(SERVER_CONFIG_OBJECT_NAME, "WebServiceHost"); + webServicePath = (String)getServer().getAttribute(SERVER_CONFIG_OBJECT_NAME, "WebServicePath"); super.setUp(); } } @@ -99,6 +100,8 @@ getServer().setAttribute(SERVER_CONFIG_OBJECT_NAME, attr); attr = new Attribute("WebServiceHost", JBWS2150TestSetup.webServiceHost); getServer().setAttribute(SERVER_CONFIG_OBJECT_NAME, attr); + attr = new Attribute("WebServicePath", JBWS2150TestSetup.webServicePath); + getServer().setAttribute(SERVER_CONFIG_OBJECT_NAME, attr); } private String getWebServiceHost() { @@ -525,82 +528,102 @@ undeploy("jaxws-jbws2150-codefirst.war"); } } + + /** + * + * + * @throws Exception + */ + public void testRewriteContext() throws Exception + { + setModifySOAPAddress(true); + final String addContext = "xx"; + setWebServicePath(addContext); + deploy("jaxws-jbws2150.war"); + try + { + final String serverHost = getServerHost(); + final List<String> wsdlLocations = new LinkedList<String>(); + wsdlLocations.add("http://" + serverHost + ":8080/jaxws-jbws2150/ValidURL?wsdl"); + wsdlLocations.add("http://" + serverHost + ":8080/jaxws-jbws2150/InvalidURL?wsdl"); + wsdlLocations.add("http://" + serverHost + ":8080/jaxws-jbws2150/ValidSecureURL?wsdl"); + wsdlLocations.add("http://" + serverHost + ":8080/jaxws-jbws2150/InvalidSecureURL?wsdl"); + for (final String wsdlLocation : wsdlLocations) + { + Definition definition = getWSDLDefinition(wsdlLocation); - /** - * Test soap:address replacement of path in URI. - * - * @throws Exception - */ - public void testWebServicePath() throws Exception - { - try - { - setModifySOAPAddress (true); - setWebServicePath("xx-jaxws-jbws2150"); - deploy("jaxws-jbws2150.war"); + String address = getPortAddress(definition, "ValidURLService", "ValidURLPort"); + assertEquals("http://" + serverHost + ":8080/" + addContext + "/jaxws-jbws2150/ValidURL", address); - //--- - final String serverHost = getServerHost(); - final QName serviceName = new QName(NAMESPACE, "ValidURLService"); - final URL wsdlURL = new URL("http://" + serverHost + ":8080/jaxws-jbws2150/ValidURL?wsdl"); - Service service = Service.create(wsdlURL, serviceName); - URL tmpURL = service.getWSDLDocumentLocation(); + address = getPortAddress(definition, "InvalidURLService", "InvalidURLPort"); + assertEquals("http://" + serverHost + ":8080/" + addContext + "/jaxws-jbws2150/InvalidURL", address); - //--- - /* - final Map<String, String> wsdlLocationsMap = new HashMap<String, String>(); - final String serverHost = getServerHost(); - wsdlLocationsMap.put("http://" + serverHost + ":8080/xx-jaxws-jbws2150/ValidURL?wsdl", getWebServiceHost()); - //wsdlLocationsMap.put("http://" + serverHost + ":8080/jaxws-jbws2150/InvalidURL?wsdl", getWebServiceHost()); - //wsdlLocationsMap.put("http://" + serverHost + ":8080/jaxws-jbws2150/ValidSecureURL?wsdl", getWebServiceHost()); - //wsdlLocationsMap.put("http://" + serverHost + ":8080/jaxws-jbws2150/InvalidSecureURL?wsdl", getWebServiceHost()); - if (isTestsuiteServerHostLocalhost()) { - wsdlLocationsMap.put("http://127.0.0.1:8080/jaxws-jbws2150/ValidURL?wsdl", getWebServiceHost()); - //wsdlLocationsMap.put("http://127.0.0.1:8080/jaxws-jbws2150/InvalidURL?wsdl", getWebServiceHost()); - //wsdlLocationsMap.put("http://127.0.0.1:8080/xx-jaxws-jbws2150/ValidSecureURL?wsdl", getWebServiceHost()); - //wsdlLocationsMap.put("http://127.0.0.1:8080/jaxws-jbws2150/InvalidSecureURL?wsdl", getWebServiceHost()); - } + address = getPortAddress(definition, "ValidSecureURLService", "ValidSecureURLPort"); + assertEquals("https://" + serverHost + ":8443/" + addContext + "/jaxws-jbws2150/ValidSecureURL", address); - for (Entry<String, String> entry : wsdlLocationsMap.entrySet()) { - String wsdlLocation = entry.getKey(); - String host = entry.getValue(); - Definition definition = getWSDLDefinition(wsdlLocation); + address = getPortAddress(definition, "InvalidSecureURLService", "InvalidSecureURLPort"); + assertEquals("https://" + serverHost + ":8443/" + addContext + "/jaxws-jbws2150/InvalidSecureURL", address); - String address = getPortAddress(definition, "ValidURLService", "ValidURLPort"); - assertEquals("http://" + host + ":8080/jaxws-jbws2150/ValidURL", address); - //avoid invoking on https endpoints as that would require getting the imported wsdl using https... - if (!wsdlLocation.contains("Secure")) { - ServiceIface endpoint = getEndpoint(wsdlLocation, "ValidURLService"); - assertEquals(endpoint.echo("hello"), "hello"); - } + //check wsdl import (which is bound to the endpoint currently serving the wsdl) + assertTrue(getWsdlImportAddress(definition).contains(addContext + "/jaxws-jbws2150")); + } + } + finally + { + undeploy("jaxws-jbws2150.war"); + } + } - address = getPortAddress(definition, "InvalidURLService", "InvalidURLPort"); - assertEquals("http://" + host + ":8080/jaxws-jbws2150/InvalidURL", address); - // if (!wsdlLocation.contains("Secure")) { - // ServiceIface endpoint = getEndpoint(wsdlLocation, "InvalidURLService"); - // assertEquals(endpoint.echo("hello"), "hello"); - // } + /** + * This is not passing, as the auto rewrite mechanism clashes with the context rewrite one + * (see MetadataBuilder#processAddressRewrite) + * + * @throws Exception + */ + public void testAutoRewriteContext() throws Exception + { + setModifySOAPAddress(true); + final String addContext = "xx"; + setWebServicePath(addContext); + setWebServiceHost(ServerConfig.UNDEFINED_HOSTNAME); + deploy("jaxws-jbws2150.war"); + try + { + final String serverHost = getServerHost(); + final List<String> wsdlLocations = new LinkedList<String>(); + wsdlLocations.add("http://" + serverHost + ":8080/jaxws-jbws2150/ValidURL?wsdl"); + wsdlLocations.add("http://" + serverHost + ":8080/jaxws-jbws2150/InvalidURL?wsdl"); + wsdlLocations.add("http://" + serverHost + ":8080/jaxws-jbws2150/ValidSecureURL?wsdl"); + wsdlLocations.add("http://" + serverHost + ":8080/jaxws-jbws2150/InvalidSecureURL?wsdl"); - address = getPortAddress(definition, "ValidSecureURLService", "ValidSecureURLPort"); - assertEquals("https://" + host + ":8443/jaxws-jbws2150/ValidSecureURL", address); + for (final String wsdlLocation : wsdlLocations) + { + Definition definition = getWSDLDefinition(wsdlLocation); - // address = getPortAddress(definition, "InvalidSecureURLService", "InvalidSecureURLPort"); - // assertEquals("https://" + host + ":8443/jaxws-jbws2150/InvalidSecureURL", address); - } - */ - } catch (Exception e) { // rls added - e.printStackTrace(); // rls added - } // rls added + String address = getPortAddress(definition, "ValidURLService", "ValidURLPort"); + assertEquals("http://" + serverHost + ":8080/" + addContext + "/jaxws-jbws2150/ValidURL", address); - finally - { - undeploy("jaxws-jbws2150.war"); - setWebServicePath(null); - } - } + address = getPortAddress(definition, "InvalidURLService", "InvalidURLPort"); + assertEquals("http://" + serverHost + ":8080/" + addContext + "/jaxws-jbws2150/InvalidURL", address); - private void checkWsdlAndInvokeCodeFirstEndpoint(String testHost, String expectedWsdlHost, boolean setTargetAddress) throws Exception { + address = getPortAddress(definition, "ValidSecureURLService", "ValidSecureURLPort"); + assertEquals("https://" + serverHost + ":8443/" + addContext + "/jaxws-jbws2150/ValidSecureURL", address); + + address = getPortAddress(definition, "InvalidSecureURLService", "InvalidSecureURLPort"); + assertEquals("https://" + serverHost + ":8443/" + addContext + "/jaxws-jbws2150/InvalidSecureURL", address); + + //check wsdl import (which is bound to the endpoint currently serving the wsdl) + assertTrue(getWsdlImportAddress(definition).contains(addContext + "/jaxws-jbws2150")); + } + } + finally + { + undeploy("jaxws-jbws2150.war"); + } + } + + private void checkWsdlAndInvokeCodeFirstEndpoint(String testHost, String expectedWsdlHost, boolean setTargetAddress) throws Exception { final String addr = "http://" + testHost + ":8080/jaxws-jbws2150-codefirst/CodeFirstService"; final String wsdlLocation = addr + "?wsdl";

9 years, 11 months

1
0
0 / 0

JBossWS SVN: r18670 - stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/cxf/jbws3593.

by jbossws-commits＠lists.jboss.org

Author: asoldano Date: 2014-05-16 10:46:21 -0400 (Fri, 16 May 2014) New Revision: 18670 Modified: stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/cxf/jbws3593/ClientHandler.java Log: [JBWS-3795] Fix cxf-testsuite too Modified: stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/cxf/jbws3593/ClientHandler.java =================================================================== --- stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/cxf/jbws3593/ClientHandler.java 2014-05-16 14:05:38 UTC (rev 18669) +++ stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/cxf/jbws3593/ClientHandler.java 2014-05-16 14:46:21 UTC (rev 18670) @@ -39,7 +39,7 @@ import org.jboss.logging.Logger; import org.jboss.ws.api.handler.GenericSOAPHandler; -public class ClientHandler extends GenericSOAPHandler<LogicalMessageContext> +public class ClientHandler extends GenericSOAPHandler<SOAPMessageContext> { private static Logger log = Logger.getLogger(ClientHandler.class); @@ -50,13 +50,13 @@ this.checkMtom = checkMtom; } - public boolean handleInbound(MessageContext msgContext) + public boolean handleInbound(SOAPMessageContext msgContext) { log.info("handleInbound"); try { - SOAPEnvelope soapEnvelope = (SOAPEnvelope)((SOAPMessageContext)msgContext).getMessage().getSOAPPart().getEnvelope(); + SOAPEnvelope soapEnvelope = (SOAPEnvelope)msgContext.getMessage().getSOAPPart().getEnvelope(); String nsURI = soapEnvelope.getNamespaceURI(); log.info("nsURI=" + nsURI); @@ -97,7 +97,7 @@ return true; } - protected ContentType getContentType(MessageContext msgContext) + protected ContentType getContentType(SOAPMessageContext msgContext) { ContentType contentType = null; @@ -116,7 +116,7 @@ if (ctype == null) { //Native has already processed this header into the message - SOAPMessage soapMessage = ((SOAPMessageContext)msgContext).getMessage(); + SOAPMessage soapMessage = msgContext.getMessage(); MimeHeaders mimeHeaders = soapMessage.getMimeHeaders(); String[] ct = mimeHeaders.getHeader("Content-Type"); log.info("ct="+ct);

9 years, 11 months

1
0
0 / 0

JBossWS SVN: r18669 - in stack/cxf/trunk/modules/testsuite/shared-tests/src/test/java/org/jboss/test/ws/jaxws: clientConfig and 23 other directories.

by jbossws-commits＠lists.jboss.org

Author: asoldano Date: 2014-05-16 10:05:38 -0400 (Fri, 16 May 2014) New Revision: 18669 Modified: stack/cxf/trunk/modules/testsuite/shared-tests/src/test/java/org/jboss/test/ws/jaxws/binding/ClientHandler.java stack/cxf/trunk/modules/testsuite/shared-tests/src/test/java/org/jboss/test/ws/jaxws/binding/ClientHandler2.java stack/cxf/trunk/modules/testsuite/shared-tests/src/test/java/org/jboss/test/ws/jaxws/binding/ServerHandler.java stack/cxf/trunk/modules/testsuite/shared-tests/src/test/java/org/jboss/test/ws/jaxws/clientConfig/CustomHandler.java stack/cxf/trunk/modules/testsuite/shared-tests/src/test/java/org/jboss/test/ws/jaxws/clientConfig/LogHandler.java stack/cxf/trunk/modules/testsuite/shared-tests/src/test/java/org/jboss/test/ws/jaxws/clientConfig/RoutingHandler.java stack/cxf/trunk/modules/testsuite/shared-tests/src/test/java/org/jboss/test/ws/jaxws/clientConfig/UserHandler.java stack/cxf/trunk/modules/testsuite/shared-tests/src/test/java/org/jboss/test/ws/jaxws/handlerscope/ProtocolHandler.java stack/cxf/trunk/modules/testsuite/shared-tests/src/test/java/org/jboss/test/ws/jaxws/jbws1283/AttachmentHandler.java stack/cxf/trunk/modules/testsuite/shared-tests/src/test/java/org/jboss/test/ws/jaxws/jbws1283/JBWS1283TestCase.java stack/cxf/trunk/modules/testsuite/shared-tests/src/test/java/org/jboss/test/ws/jaxws/jbws2074/handler/DescriptorResourcesHandler.java stack/cxf/trunk/modules/testsuite/shared-tests/src/test/java/org/jboss/test/ws/jaxws/jbws2074/handler/JavaResourcesHandler.java stack/cxf/trunk/modules/testsuite/shared-tests/src/test/java/org/jboss/test/ws/jaxws/jbws2074/handler/ManualResourcesHandler.java stack/cxf/trunk/modules/testsuite/shared-tests/src/test/java/org/jboss/test/ws/jaxws/jbws2259/CustomHandler.java stack/cxf/trunk/modules/testsuite/shared-tests/src/test/java/org/jboss/test/ws/jaxws/jbws2278/TestHandler.java stack/cxf/trunk/modules/testsuite/shared-tests/src/test/java/org/jboss/test/ws/jaxws/jbws2419/SOAP11ClientHandler.java stack/cxf/trunk/modules/testsuite/shared-tests/src/test/java/org/jboss/test/ws/jaxws/jbws2419/SOAP11ServerHandler.java stack/cxf/trunk/modules/testsuite/shared-tests/src/test/java/org/jboss/test/ws/jaxws/jbws2419/SOAP12ClientHandler.java stack/cxf/trunk/modules/testsuite/shared-tests/src/test/java/org/jboss/test/ws/jaxws/jbws2419/SOAP12ServerHandler.java stack/cxf/trunk/modules/testsuite/shared-tests/src/test/java/org/jboss/test/ws/jaxws/jbws2634/shared/handlers/TestHandler.java stack/cxf/trunk/modules/testsuite/shared-tests/src/test/java/org/jboss/test/ws/jaxws/jbws2955/ClientSOAPHandler.java stack/cxf/trunk/modules/testsuite/shared-tests/src/test/java/org/jboss/test/ws/jaxws/jbws2956/ClientSOAPHandler.java stack/cxf/trunk/modules/testsuite/shared-tests/src/test/java/org/jboss/test/ws/jaxws/jbws2976/SOAPHandler.java stack/cxf/trunk/modules/testsuite/shared-tests/src/test/java/org/jboss/test/ws/jaxws/jbws2999/CustomHandler.java stack/cxf/trunk/modules/testsuite/shared-tests/src/test/java/org/jboss/test/ws/jaxws/jbws3034/ServerSOAPHandler.java stack/cxf/trunk/modules/testsuite/shared-tests/src/test/java/org/jboss/test/ws/jaxws/jbws3282/AuthorizationHandler.java stack/cxf/trunk/modules/testsuite/shared-tests/src/test/java/org/jboss/test/ws/jaxws/jbws3282/EndpointHandler.java stack/cxf/trunk/modules/testsuite/shared-tests/src/test/java/org/jboss/test/ws/jaxws/jbws3282/LogHandler.java stack/cxf/trunk/modules/testsuite/shared-tests/src/test/java/org/jboss/test/ws/jaxws/jbws3282/RoutingHandler.java stack/cxf/trunk/modules/testsuite/shared-tests/src/test/java/org/jboss/test/ws/jaxws/jbws3287/AuthorizationHandler.java stack/cxf/trunk/modules/testsuite/shared-tests/src/test/java/org/jboss/test/ws/jaxws/jbws3287/EndpointHandler.java stack/cxf/trunk/modules/testsuite/shared-tests/src/test/java/org/jboss/test/ws/jaxws/jbws3287/LogHandler.java stack/cxf/trunk/modules/testsuite/shared-tests/src/test/java/org/jboss/test/ws/jaxws/jbws3287/RoutingHandler.java stack/cxf/trunk/modules/testsuite/shared-tests/src/test/java/org/jboss/test/ws/jaxws/jbws3293/SOAPHandler.java stack/cxf/trunk/modules/testsuite/shared-tests/src/test/java/org/jboss/test/ws/jaxws/samples/addressing/ServerHandler.java stack/cxf/trunk/modules/testsuite/shared-tests/src/test/java/org/jboss/test/ws/jaxws/samples/advanced/retail/handler/SOAPMessageTrace.java stack/cxf/trunk/modules/testsuite/shared-tests/src/test/java/org/jboss/test/ws/jaxws/samples/exception/server/ServerHandler.java stack/cxf/trunk/modules/testsuite/shared-tests/src/test/java/org/jboss/test/ws/jaxws/samples/handlerchain/AuthorizationHandler.java stack/cxf/trunk/modules/testsuite/shared-tests/src/test/java/org/jboss/test/ws/jaxws/samples/handlerchain/ClientMimeHandler.java stack/cxf/trunk/modules/testsuite/shared-tests/src/test/java/org/jboss/test/ws/jaxws/samples/handlerchain/LogHandler.java stack/cxf/trunk/modules/testsuite/shared-tests/src/test/java/org/jboss/test/ws/jaxws/samples/handlerchain/RoutingHandler.java stack/cxf/trunk/modules/testsuite/shared-tests/src/test/java/org/jboss/test/ws/jaxws/samples/handlerchain/ServerMimeHandler.java stack/cxf/trunk/modules/testsuite/shared-tests/src/test/java/org/jboss/test/ws/jaxws/samples/httpbinding/LogicalSourceHandler.java stack/cxf/trunk/modules/testsuite/shared-tests/src/test/java/org/jboss/test/ws/jaxws/samples/logicalhandler/LogicalJAXBHandler.java stack/cxf/trunk/modules/testsuite/shared-tests/src/test/java/org/jboss/test/ws/jaxws/samples/logicalhandler/LogicalSourceHandler.java stack/cxf/trunk/modules/testsuite/shared-tests/src/test/java/org/jboss/test/ws/jaxws/samples/logicalhandler/PortHandler.java stack/cxf/trunk/modules/testsuite/shared-tests/src/test/java/org/jboss/test/ws/jaxws/samples/logicalhandler/ProtocolHandler.java stack/cxf/trunk/modules/testsuite/shared-tests/src/test/java/org/jboss/test/ws/jaxws/samples/provider/LogicalSourceHandler.java stack/cxf/trunk/modules/testsuite/shared-tests/src/test/java/org/jboss/test/ws/jaxws/samples/xop/doclit/MTOMProtocolHandler.java Log: [JBWS-3795] Updating/fixing testsuite accordingly Modified: stack/cxf/trunk/modules/testsuite/shared-tests/src/test/java/org/jboss/test/ws/jaxws/binding/ClientHandler.java =================================================================== --- stack/cxf/trunk/modules/testsuite/shared-tests/src/test/java/org/jboss/test/ws/jaxws/binding/ClientHandler.java 2014-05-16 13:59:14 UTC (rev 18668) +++ stack/cxf/trunk/modules/testsuite/shared-tests/src/test/java/org/jboss/test/ws/jaxws/binding/ClientHandler.java 2014-05-16 14:05:38 UTC (rev 18669) @@ -26,8 +26,6 @@ import javax.xml.soap.SOAPException; import javax.xml.soap.SOAPMessage; import javax.xml.ws.WebServiceException; -import javax.xml.ws.handler.LogicalMessageContext; -import javax.xml.ws.handler.MessageContext; import javax.xml.ws.handler.soap.SOAPMessageContext; import org.jboss.ws.api.handler.GenericSOAPHandler; @@ -38,14 +36,14 @@ * @author Thomas.Diesler(a)jboss.org * @since 24-Nov-2005 */ -public class ClientHandler extends GenericSOAPHandler<LogicalMessageContext> +public class ClientHandler extends GenericSOAPHandler<SOAPMessageContext> { @Override - public boolean handleInbound(MessageContext msgContext) + public boolean handleInbound(SOAPMessageContext msgContext) { try { - SOAPMessage soapMessage = ((SOAPMessageContext)msgContext).getMessage(); + SOAPMessage soapMessage = msgContext.getMessage(); SOAPEnvelope soapEnvelope = soapMessage.getSOAPPart().getEnvelope(); String nsURI = soapEnvelope.getNamespaceURI(); Modified: stack/cxf/trunk/modules/testsuite/shared-tests/src/test/java/org/jboss/test/ws/jaxws/binding/ClientHandler2.java =================================================================== --- stack/cxf/trunk/modules/testsuite/shared-tests/src/test/java/org/jboss/test/ws/jaxws/binding/ClientHandler2.java 2014-05-16 13:59:14 UTC (rev 18668) +++ stack/cxf/trunk/modules/testsuite/shared-tests/src/test/java/org/jboss/test/ws/jaxws/binding/ClientHandler2.java 2014-05-16 14:05:38 UTC (rev 18669) @@ -26,8 +26,6 @@ import javax.xml.soap.SOAPException; import javax.xml.soap.SOAPMessage; import javax.xml.ws.WebServiceException; -import javax.xml.ws.handler.LogicalMessageContext; -import javax.xml.ws.handler.MessageContext; import javax.xml.ws.handler.soap.SOAPMessageContext; import org.jboss.logging.Logger; @@ -39,18 +37,18 @@ * @author Alessio Soldano, alessio.soldano(a)jboss.com * @since 31-Oct-2007 */ -public class ClientHandler2 extends GenericSOAPHandler<LogicalMessageContext> +public class ClientHandler2 extends GenericSOAPHandler<SOAPMessageContext> { private static Logger log = Logger.getLogger(ClientHandler2.class); @Override - public boolean handleInbound(MessageContext msgContext) + public boolean handleInbound(SOAPMessageContext msgContext) { log.info("handleInbound"); try { - SOAPMessage soapMessage = ((SOAPMessageContext)msgContext).getMessage(); + SOAPMessage soapMessage = msgContext.getMessage(); soapMessage.saveChanges(); // force changes save to make sure headers are copied to the message MimeHeaders mimeHeaders = soapMessage.getMimeHeaders(); @@ -72,13 +70,13 @@ } @Override - protected boolean handleOutbound(MessageContext msgContext) + protected boolean handleOutbound(SOAPMessageContext msgContext) { log.info("handleOutbound"); try { - SOAPMessage soapMessage = ((SOAPMessageContext)msgContext).getMessage(); + SOAPMessage soapMessage = msgContext.getMessage(); soapMessage.saveChanges(); // force changes save to make sure headers are copied to the message MimeHeaders mimeHeaders = soapMessage.getMimeHeaders(); Modified: stack/cxf/trunk/modules/testsuite/shared-tests/src/test/java/org/jboss/test/ws/jaxws/binding/ServerHandler.java =================================================================== --- stack/cxf/trunk/modules/testsuite/shared-tests/src/test/java/org/jboss/test/ws/jaxws/binding/ServerHandler.java 2014-05-16 13:59:14 UTC (rev 18668) +++ stack/cxf/trunk/modules/testsuite/shared-tests/src/test/java/org/jboss/test/ws/jaxws/binding/ServerHandler.java 2014-05-16 14:05:38 UTC (rev 18669) @@ -25,8 +25,6 @@ import javax.xml.soap.SOAPException; import javax.xml.soap.SOAPMessage; import javax.xml.ws.WebServiceException; -import javax.xml.ws.handler.LogicalMessageContext; -import javax.xml.ws.handler.MessageContext; import javax.xml.ws.handler.soap.SOAPMessageContext; import org.jboss.ws.api.handler.GenericSOAPHandler; @@ -37,16 +35,16 @@ * @author alessio.soldano(a)jboss.com * @since 11-Nov-2009 */ -public class ServerHandler extends GenericSOAPHandler<LogicalMessageContext> +public class ServerHandler extends GenericSOAPHandler<SOAPMessageContext> { private static String nsURI = null; @Override - public boolean handleInbound(MessageContext msgContext) + public boolean handleInbound(SOAPMessageContext msgContext) { try { - SOAPMessage soapMessage = ((SOAPMessageContext)msgContext).getMessage(); + SOAPMessage soapMessage = msgContext.getMessage(); SOAPEnvelope soapEnvelope = soapMessage.getSOAPPart().getEnvelope(); nsURI = soapEnvelope.getNamespaceURI(); Modified: stack/cxf/trunk/modules/testsuite/shared-tests/src/test/java/org/jboss/test/ws/jaxws/clientConfig/CustomHandler.java =================================================================== --- stack/cxf/trunk/modules/testsuite/shared-tests/src/test/java/org/jboss/test/ws/jaxws/clientConfig/CustomHandler.java 2014-05-16 13:59:14 UTC (rev 18668) +++ stack/cxf/trunk/modules/testsuite/shared-tests/src/test/java/org/jboss/test/ws/jaxws/clientConfig/CustomHandler.java 2014-05-16 14:05:38 UTC (rev 18669) @@ -27,26 +27,24 @@ import javax.xml.soap.SOAPException; import javax.xml.soap.SOAPMessage; import javax.xml.ws.WebServiceException; -import javax.xml.ws.handler.LogicalMessageContext; -import javax.xml.ws.handler.MessageContext; import javax.xml.ws.handler.soap.SOAPMessageContext; import org.jboss.logging.Logger; import org.jboss.ws.api.handler.GenericSOAPHandler; -public class CustomHandler extends GenericSOAPHandler<LogicalMessageContext> +public class CustomHandler extends GenericSOAPHandler<SOAPMessageContext> { // Provide logging private static Logger log = Logger.getLogger(CustomHandler.class); @Override - protected boolean handleInbound(MessageContext msgContext) + protected boolean handleInbound(SOAPMessageContext msgContext) { log.info("handleInbound"); try { - SOAPMessage soapMessage = ((SOAPMessageContext)msgContext).getMessage(); + SOAPMessage soapMessage = msgContext.getMessage(); SOAPBody soapBody = soapMessage.getSOAPBody(); SOAPBodyElement soapBodyElement = (SOAPBodyElement)soapBody.getChildElements().next(); @@ -63,13 +61,13 @@ } @Override - protected boolean handleOutbound(MessageContext msgContext) + protected boolean handleOutbound(SOAPMessageContext msgContext) { log.info("handleOutbound"); try { - SOAPMessage soapMessage = ((SOAPMessageContext)msgContext).getMessage(); + SOAPMessage soapMessage = msgContext.getMessage(); SOAPBody soapBody = soapMessage.getSOAPBody(); SOAPBodyElement soapBodyElement = (SOAPBodyElement)soapBody.getChildElements().next(); Modified: stack/cxf/trunk/modules/testsuite/shared-tests/src/test/java/org/jboss/test/ws/jaxws/clientConfig/LogHandler.java =================================================================== --- stack/cxf/trunk/modules/testsuite/shared-tests/src/test/java/org/jboss/test/ws/jaxws/clientConfig/LogHandler.java 2014-05-16 13:59:14 UTC (rev 18668) +++ stack/cxf/trunk/modules/testsuite/shared-tests/src/test/java/org/jboss/test/ws/jaxws/clientConfig/LogHandler.java 2014-05-16 14:05:38 UTC (rev 18669) @@ -27,26 +27,24 @@ import javax.xml.soap.SOAPException; import javax.xml.soap.SOAPMessage; import javax.xml.ws.WebServiceException; -import javax.xml.ws.handler.LogicalMessageContext; -import javax.xml.ws.handler.MessageContext; import javax.xml.ws.handler.soap.SOAPMessageContext; import org.jboss.logging.Logger; import org.jboss.ws.api.handler.GenericSOAPHandler; -public class LogHandler extends GenericSOAPHandler<LogicalMessageContext> +public class LogHandler extends GenericSOAPHandler<SOAPMessageContext> { // Provide logging private static Logger log = Logger.getLogger(LogHandler.class); @Override - protected boolean handleInbound(MessageContext msgContext) + protected boolean handleInbound(SOAPMessageContext msgContext) { log.info("handleInbound"); try { - SOAPMessage soapMessage = ((SOAPMessageContext)msgContext).getMessage(); + SOAPMessage soapMessage = msgContext.getMessage(); SOAPBody soapBody = soapMessage.getSOAPBody(); SOAPBodyElement soapBodyElement = (SOAPBodyElement)soapBody.getChildElements().next(); @@ -63,13 +61,13 @@ } @Override - protected boolean handleOutbound(MessageContext msgContext) + protected boolean handleOutbound(SOAPMessageContext msgContext) { log.info("handleOutbound"); try { - SOAPMessage soapMessage = ((SOAPMessageContext)msgContext).getMessage(); + SOAPMessage soapMessage = msgContext.getMessage(); SOAPBody soapBody = soapMessage.getSOAPBody(); SOAPBodyElement soapBodyElement = (SOAPBodyElement)soapBody.getChildElements().next(); Modified: stack/cxf/trunk/modules/testsuite/shared-tests/src/test/java/org/jboss/test/ws/jaxws/clientConfig/RoutingHandler.java =================================================================== --- stack/cxf/trunk/modules/testsuite/shared-tests/src/test/java/org/jboss/test/ws/jaxws/clientConfig/RoutingHandler.java 2014-05-16 13:59:14 UTC (rev 18668) +++ stack/cxf/trunk/modules/testsuite/shared-tests/src/test/java/org/jboss/test/ws/jaxws/clientConfig/RoutingHandler.java 2014-05-16 14:05:38 UTC (rev 18669) @@ -27,26 +27,24 @@ import javax.xml.soap.SOAPException; import javax.xml.soap.SOAPMessage; import javax.xml.ws.WebServiceException; -import javax.xml.ws.handler.LogicalMessageContext; -import javax.xml.ws.handler.MessageContext; import javax.xml.ws.handler.soap.SOAPMessageContext; import org.jboss.logging.Logger; import org.jboss.ws.api.handler.GenericSOAPHandler; -public class RoutingHandler extends GenericSOAPHandler<LogicalMessageContext> +public class RoutingHandler extends GenericSOAPHandler<SOAPMessageContext> { // Provide logging private static Logger log = Logger.getLogger(RoutingHandler.class); @Override - protected boolean handleInbound(MessageContext msgContext) + protected boolean handleInbound(SOAPMessageContext msgContext) { log.info("handleInbound"); try { - SOAPMessage soapMessage = ((SOAPMessageContext)msgContext).getMessage(); + SOAPMessage soapMessage = msgContext.getMessage(); SOAPBody soapBody = soapMessage.getSOAPBody(); SOAPBodyElement soapBodyElement = (SOAPBodyElement)soapBody.getChildElements().next(); @@ -63,13 +61,13 @@ } @Override - protected boolean handleOutbound(MessageContext msgContext) + protected boolean handleOutbound(SOAPMessageContext msgContext) { log.info("handleOutbound"); try { - SOAPMessage soapMessage = ((SOAPMessageContext)msgContext).getMessage(); + SOAPMessage soapMessage = msgContext.getMessage(); SOAPBody soapBody = soapMessage.getSOAPBody(); SOAPBodyElement soapBodyElement = (SOAPBodyElement)soapBody.getChildElements().next(); Modified: stack/cxf/trunk/modules/testsuite/shared-tests/src/test/java/org/jboss/test/ws/jaxws/clientConfig/UserHandler.java =================================================================== --- stack/cxf/trunk/modules/testsuite/shared-tests/src/test/java/org/jboss/test/ws/jaxws/clientConfig/UserHandler.java 2014-05-16 13:59:14 UTC (rev 18668) +++ stack/cxf/trunk/modules/testsuite/shared-tests/src/test/java/org/jboss/test/ws/jaxws/clientConfig/UserHandler.java 2014-05-16 14:05:38 UTC (rev 18669) @@ -27,26 +27,24 @@ import javax.xml.soap.SOAPException; import javax.xml.soap.SOAPMessage; import javax.xml.ws.WebServiceException; -import javax.xml.ws.handler.LogicalMessageContext; -import javax.xml.ws.handler.MessageContext; import javax.xml.ws.handler.soap.SOAPMessageContext; import org.jboss.logging.Logger; import org.jboss.ws.api.handler.GenericSOAPHandler; -public class UserHandler extends GenericSOAPHandler<LogicalMessageContext> +public class UserHandler extends GenericSOAPHandler<SOAPMessageContext> { // Provide logging private static Logger log = Logger.getLogger(UserHandler.class); @Override - protected boolean handleInbound(MessageContext msgContext) + protected boolean handleInbound(SOAPMessageContext msgContext) { log.info("handleInbound"); try { - SOAPMessage soapMessage = ((SOAPMessageContext)msgContext).getMessage(); + SOAPMessage soapMessage = msgContext.getMessage(); SOAPBody soapBody = soapMessage.getSOAPBody(); SOAPBodyElement soapBodyElement = (SOAPBodyElement)soapBody.getChildElements().next(); @@ -63,13 +61,13 @@ } @Override - protected boolean handleOutbound(MessageContext msgContext) + protected boolean handleOutbound(SOAPMessageContext msgContext) { log.info("handleOutbound"); try { - SOAPMessage soapMessage = ((SOAPMessageContext)msgContext).getMessage(); + SOAPMessage soapMessage = msgContext.getMessage(); SOAPBody soapBody = soapMessage.getSOAPBody(); SOAPBodyElement soapBodyElement = (SOAPBodyElement)soapBody.getChildElements().next(); Modified: stack/cxf/trunk/modules/testsuite/shared-tests/src/test/java/org/jboss/test/ws/jaxws/handlerscope/ProtocolHandler.java =================================================================== --- stack/cxf/trunk/modules/testsuite/shared-tests/src/test/java/org/jboss/test/ws/jaxws/handlerscope/ProtocolHandler.java 2014-05-16 13:59:14 UTC (rev 18668) +++ stack/cxf/trunk/modules/testsuite/shared-tests/src/test/java/org/jboss/test/ws/jaxws/handlerscope/ProtocolHandler.java 2014-05-16 14:05:38 UTC (rev 18669) @@ -25,22 +25,21 @@ import javax.xml.soap.SOAPException; import javax.xml.soap.SOAPMessage; import javax.xml.ws.WebServiceException; -import javax.xml.ws.handler.LogicalMessageContext; import javax.xml.ws.handler.MessageContext; import javax.xml.ws.handler.soap.SOAPMessageContext; import org.jboss.ws.api.handler.GenericSOAPHandler; -public class ProtocolHandler extends GenericSOAPHandler<LogicalMessageContext> +public class ProtocolHandler extends GenericSOAPHandler<SOAPMessageContext> { @Override - public boolean handleOutbound(MessageContext msgContext) + public boolean handleOutbound(SOAPMessageContext msgContext) { return appendHandlerName(msgContext); } @Override - public boolean handleInbound(MessageContext msgContext) + public boolean handleInbound(SOAPMessageContext msgContext) { return appendHandlerName(msgContext); } Modified: stack/cxf/trunk/modules/testsuite/shared-tests/src/test/java/org/jboss/test/ws/jaxws/jbws1283/AttachmentHandler.java =================================================================== --- stack/cxf/trunk/modules/testsuite/shared-tests/src/test/java/org/jboss/test/ws/jaxws/jbws1283/AttachmentHandler.java 2014-05-16 13:59:14 UTC (rev 18668) +++ stack/cxf/trunk/modules/testsuite/shared-tests/src/test/java/org/jboss/test/ws/jaxws/jbws1283/AttachmentHandler.java 2014-05-16 14:05:38 UTC (rev 18669) @@ -24,8 +24,6 @@ import javax.activation.DataHandler; import javax.xml.soap.AttachmentPart; import javax.xml.soap.SOAPMessage; -import javax.xml.ws.handler.LogicalMessageContext; -import javax.xml.ws.handler.MessageContext; import javax.xml.ws.handler.soap.SOAPMessageContext; import org.jboss.ws.api.handler.GenericSOAPHandler; @@ -35,13 +33,13 @@ * * @author Heiko.Braun(a)jboss.com */ -public class AttachmentHandler extends GenericSOAPHandler<LogicalMessageContext> +public class AttachmentHandler extends GenericSOAPHandler<SOAPMessageContext> { @Override - protected boolean handleOutbound(MessageContext msgContext) + protected boolean handleOutbound(SOAPMessageContext msgContext) { System.out.println("AttachmentHandler: Adding attachment ot message"); - SOAPMessage soapMessage = ((SOAPMessageContext)msgContext).getMessage(); + SOAPMessage soapMessage = msgContext.getMessage(); AttachmentPart attachment = soapMessage.createAttachmentPart(new DataHandler("Server data", "text/plain")); soapMessage.addAttachmentPart(attachment); return true; Modified: stack/cxf/trunk/modules/testsuite/shared-tests/src/test/java/org/jboss/test/ws/jaxws/jbws1283/JBWS1283TestCase.java =================================================================== --- stack/cxf/trunk/modules/testsuite/shared-tests/src/test/java/org/jboss/test/ws/jaxws/jbws1283/JBWS1283TestCase.java 2014-05-16 13:59:14 UTC (rev 18668) +++ stack/cxf/trunk/modules/testsuite/shared-tests/src/test/java/org/jboss/test/ws/jaxws/jbws1283/JBWS1283TestCase.java 2014-05-16 14:05:38 UTC (rev 18669) @@ -33,8 +33,6 @@ import javax.xml.ws.BindingProvider; import javax.xml.ws.Service; import javax.xml.ws.handler.Handler; -import javax.xml.ws.handler.LogicalMessageContext; -import javax.xml.ws.handler.MessageContext; import javax.xml.ws.handler.soap.SOAPMessageContext; import junit.framework.Test; @@ -81,12 +79,12 @@ } // handler that verifies the attachment that have been added on the server-side - static class VerifyAttachmentHandler extends GenericSOAPHandler<LogicalMessageContext> + static class VerifyAttachmentHandler extends GenericSOAPHandler<SOAPMessageContext> { @Override - protected boolean handleInbound(MessageContext msgContext) + protected boolean handleInbound(SOAPMessageContext msgContext) { - SOAPMessage soapMessage = ((SOAPMessageContext)msgContext).getMessage(); + SOAPMessage soapMessage = msgContext.getMessage(); Iterator<?> it = soapMessage.getAttachments(); while(it.hasNext()) { Modified: stack/cxf/trunk/modules/testsuite/shared-tests/src/test/java/org/jboss/test/ws/jaxws/jbws2074/handler/DescriptorResourcesHandler.java =================================================================== --- stack/cxf/trunk/modules/testsuite/shared-tests/src/test/java/org/jboss/test/ws/jaxws/jbws2074/handler/DescriptorResourcesHandler.java 2014-05-16 13:59:14 UTC (rev 18668) +++ stack/cxf/trunk/modules/testsuite/shared-tests/src/test/java/org/jboss/test/ws/jaxws/jbws2074/handler/DescriptorResourcesHandler.java 2014-05-16 14:05:38 UTC (rev 18669) @@ -26,7 +26,6 @@ import javax.xml.soap.SOAPException; import javax.xml.soap.SOAPMessage; import javax.xml.ws.WebServiceException; -import javax.xml.ws.handler.LogicalMessageContext; import javax.xml.ws.handler.MessageContext; import javax.xml.ws.handler.soap.SOAPMessageContext; @@ -41,7 +40,7 @@ * * @author ropalka(a)redhat.com */ -public class DescriptorResourcesHandler extends GenericSOAPHandler<LogicalMessageContext> +public class DescriptorResourcesHandler extends GenericSOAPHandler<SOAPMessageContext> { // provide logging private static final Logger log = Logger.getLogger(DescriptorResourcesHandler.class); @@ -312,13 +311,13 @@ } @Override - public boolean handleOutbound(MessageContext msgContext) + public boolean handleOutbound(SOAPMessageContext msgContext) { return ensureInjectionsAndInitialization(msgContext, "Outbound"); } @Override - public boolean handleInbound(MessageContext msgContext) + public boolean handleInbound(SOAPMessageContext msgContext) { return ensureInjectionsAndInitialization(msgContext, "Inbound"); } Modified: stack/cxf/trunk/modules/testsuite/shared-tests/src/test/java/org/jboss/test/ws/jaxws/jbws2074/handler/JavaResourcesHandler.java =================================================================== --- stack/cxf/trunk/modules/testsuite/shared-tests/src/test/java/org/jboss/test/ws/jaxws/jbws2074/handler/JavaResourcesHandler.java 2014-05-16 13:59:14 UTC (rev 18668) +++ stack/cxf/trunk/modules/testsuite/shared-tests/src/test/java/org/jboss/test/ws/jaxws/jbws2074/handler/JavaResourcesHandler.java 2014-05-16 14:05:38 UTC (rev 18669) @@ -27,7 +27,6 @@ import javax.xml.soap.SOAPException; import javax.xml.soap.SOAPMessage; import javax.xml.ws.WebServiceException; -import javax.xml.ws.handler.LogicalMessageContext; import javax.xml.ws.handler.MessageContext; import javax.xml.ws.handler.soap.SOAPMessageContext; @@ -42,7 +41,7 @@ * * @author ropalka(a)redhat.com */ -public class JavaResourcesHandler extends GenericSOAPHandler<LogicalMessageContext> +public class JavaResourcesHandler extends GenericSOAPHandler<SOAPMessageContext> { // provide logging private static final Logger log = Logger.getLogger(JavaResourcesHandler.class); @@ -304,13 +303,13 @@ } @Override - public boolean handleOutbound(MessageContext msgContext) + public boolean handleOutbound(SOAPMessageContext msgContext) { return ensureInjectionsAndInitialization(msgContext, "Outbound"); } @Override - public boolean handleInbound(MessageContext msgContext) + public boolean handleInbound(SOAPMessageContext msgContext) { return ensureInjectionsAndInitialization(msgContext, "Inbound"); } Modified: stack/cxf/trunk/modules/testsuite/shared-tests/src/test/java/org/jboss/test/ws/jaxws/jbws2074/handler/ManualResourcesHandler.java =================================================================== --- stack/cxf/trunk/modules/testsuite/shared-tests/src/test/java/org/jboss/test/ws/jaxws/jbws2074/handler/ManualResourcesHandler.java 2014-05-16 13:59:14 UTC (rev 18668) +++ stack/cxf/trunk/modules/testsuite/shared-tests/src/test/java/org/jboss/test/ws/jaxws/jbws2074/handler/ManualResourcesHandler.java 2014-05-16 14:05:38 UTC (rev 18669) @@ -28,7 +28,6 @@ import javax.xml.soap.SOAPException; import javax.xml.soap.SOAPMessage; import javax.xml.ws.WebServiceException; -import javax.xml.ws.handler.LogicalMessageContext; import javax.xml.ws.handler.MessageContext; import javax.xml.ws.handler.soap.SOAPMessageContext; @@ -42,7 +41,7 @@ * * @author ropalka(a)redhat.com */ -public class ManualResourcesHandler extends GenericSOAPHandler<LogicalMessageContext> +public class ManualResourcesHandler extends GenericSOAPHandler<SOAPMessageContext> { // provide logging private static final Logger log = Logger.getLogger(ManualResourcesHandler.class); @@ -205,13 +204,13 @@ } @Override - public boolean handleOutbound(MessageContext msgContext) + public boolean handleOutbound(SOAPMessageContext msgContext) { return ensureInjectionsAndInitialization(msgContext, "Outbound"); } @Override - public boolean handleInbound(MessageContext msgContext) + public boolean handleInbound(SOAPMessageContext msgContext) { return ensureInjectionsAndInitialization(msgContext, "Inbound"); } Modified: stack/cxf/trunk/modules/testsuite/shared-tests/src/test/java/org/jboss/test/ws/jaxws/jbws2259/CustomHandler.java =================================================================== --- stack/cxf/trunk/modules/testsuite/shared-tests/src/test/java/org/jboss/test/ws/jaxws/jbws2259/CustomHandler.java 2014-05-16 13:59:14 UTC (rev 18668) +++ stack/cxf/trunk/modules/testsuite/shared-tests/src/test/java/org/jboss/test/ws/jaxws/jbws2259/CustomHandler.java 2014-05-16 14:05:38 UTC (rev 18669) @@ -25,8 +25,6 @@ import javax.xml.soap.SOAPMessage; import javax.xml.ws.WebServiceException; -import javax.xml.ws.handler.LogicalMessageContext; -import javax.xml.ws.handler.MessageContext; import javax.xml.ws.handler.soap.SOAPMessageContext; import org.jboss.logging.Logger; @@ -39,15 +37,15 @@ * @since 27th March 2009 * @see https://jira.jboss.org/jira/browse/JBWS-2259 */ -public class CustomHandler extends GenericSOAPHandler<LogicalMessageContext> +public class CustomHandler extends GenericSOAPHandler<SOAPMessageContext> { private static final Logger log = Logger.getLogger(CustomHandler.class); @Override - public boolean handleMessage(final MessageContext msgContext) + public boolean handleMessage(final SOAPMessageContext msgContext) { - SOAPMessage soapMessage = ((SOAPMessageContext)msgContext).getMessage(); + SOAPMessage soapMessage = msgContext.getMessage(); try { ByteArrayOutputStream baos = new ByteArrayOutputStream(); Modified: stack/cxf/trunk/modules/testsuite/shared-tests/src/test/java/org/jboss/test/ws/jaxws/jbws2278/TestHandler.java =================================================================== --- stack/cxf/trunk/modules/testsuite/shared-tests/src/test/java/org/jboss/test/ws/jaxws/jbws2278/TestHandler.java 2014-05-16 13:59:14 UTC (rev 18668) +++ stack/cxf/trunk/modules/testsuite/shared-tests/src/test/java/org/jboss/test/ws/jaxws/jbws2278/TestHandler.java 2014-05-16 14:05:38 UTC (rev 18669) @@ -26,7 +26,6 @@ import javax.xml.soap.SOAPException; import javax.xml.soap.SOAPMessage; import javax.xml.soap.SOAPPart; -import javax.xml.ws.handler.LogicalMessageContext; import javax.xml.ws.handler.MessageContext; import javax.xml.ws.handler.soap.SOAPMessageContext; @@ -37,7 +36,7 @@ * @author alessio.soldano(a)jboss.com * @since 30-Sep-2008 */ -public class TestHandler extends GenericSOAPHandler<LogicalMessageContext> +public class TestHandler extends GenericSOAPHandler<SOAPMessageContext> { private final String envelopeNamespace; private final String contentType; @@ -55,17 +54,17 @@ } @Override - public boolean handleFault(MessageContext context) + public boolean handleFault(SOAPMessageContext context) { return handleMessage(context); } @Override - public boolean handleInbound(MessageContext context) + public boolean handleInbound(SOAPMessageContext context) { try { - SOAPMessage soapMessage = ((SOAPMessageContext)context).getMessage(); + SOAPMessage soapMessage = context.getMessage(); soapMessage.saveChanges(); checkEnvelope(soapMessage); checkContentType(soapMessage); @@ -78,11 +77,11 @@ } @Override - public boolean handleOutbound(MessageContext context) + public boolean handleOutbound(SOAPMessageContext context) { try { - SOAPMessage soapMessage = ((SOAPMessageContext)context).getMessage(); + SOAPMessage soapMessage = context.getMessage(); soapMessage.saveChanges(); checkEnvelope(soapMessage); checkContentType(soapMessage); Modified: stack/cxf/trunk/modules/testsuite/shared-tests/src/test/java/org/jboss/test/ws/jaxws/jbws2419/SOAP11ClientHandler.java =================================================================== --- stack/cxf/trunk/modules/testsuite/shared-tests/src/test/java/org/jboss/test/ws/jaxws/jbws2419/SOAP11ClientHandler.java 2014-05-16 13:59:14 UTC (rev 18668) +++ stack/cxf/trunk/modules/testsuite/shared-tests/src/test/java/org/jboss/test/ws/jaxws/jbws2419/SOAP11ClientHandler.java 2014-05-16 14:05:38 UTC (rev 18669) @@ -45,18 +45,18 @@ * @author mageshbk(a)jboss.com * @since 20-Feb-2009 */ -public class SOAP11ClientHandler extends GenericSOAPHandler<LogicalMessageContext> +public class SOAP11ClientHandler extends GenericSOAPHandler<SOAPMessageContext> { private static Logger log = Logger.getLogger(SOAP11ClientHandler.class); @Override - public boolean handleInbound(MessageContext msgContext) + public boolean handleInbound(SOAPMessageContext msgContext) { log.info("handleInbound"); try { - SOAPEnvelope soapEnvelope = ((SOAPMessageContext)msgContext).getMessage().getSOAPPart().getEnvelope(); + SOAPEnvelope soapEnvelope = msgContext.getMessage().getSOAPPart().getEnvelope(); String nsURI = soapEnvelope.getNamespaceURI(); log.info("nsURI=" + nsURI); Modified: stack/cxf/trunk/modules/testsuite/shared-tests/src/test/java/org/jboss/test/ws/jaxws/jbws2419/SOAP11ServerHandler.java =================================================================== --- stack/cxf/trunk/modules/testsuite/shared-tests/src/test/java/org/jboss/test/ws/jaxws/jbws2419/SOAP11ServerHandler.java 2014-05-16 13:59:14 UTC (rev 18668) +++ stack/cxf/trunk/modules/testsuite/shared-tests/src/test/java/org/jboss/test/ws/jaxws/jbws2419/SOAP11ServerHandler.java 2014-05-16 14:05:38 UTC (rev 18669) @@ -45,12 +45,12 @@ * @author mageshbk(a)jboss.com * @since 20-Feb-2009 */ -public class SOAP11ServerHandler extends GenericSOAPHandler<LogicalMessageContext> +public class SOAP11ServerHandler extends GenericSOAPHandler<SOAPMessageContext> { private static Logger log = Logger.getLogger(SOAP11ServerHandler.class); @Override - public boolean handleInbound(MessageContext msgContext) + public boolean handleInbound(SOAPMessageContext msgContext) { log.info("handleInbound"); Modified: stack/cxf/trunk/modules/testsuite/shared-tests/src/test/java/org/jboss/test/ws/jaxws/jbws2419/SOAP12ClientHandler.java =================================================================== --- stack/cxf/trunk/modules/testsuite/shared-tests/src/test/java/org/jboss/test/ws/jaxws/jbws2419/SOAP12ClientHandler.java 2014-05-16 13:59:14 UTC (rev 18668) +++ stack/cxf/trunk/modules/testsuite/shared-tests/src/test/java/org/jboss/test/ws/jaxws/jbws2419/SOAP12ClientHandler.java 2014-05-16 14:05:38 UTC (rev 18669) @@ -32,7 +32,6 @@ import javax.xml.soap.SOAPException; import javax.xml.soap.SOAPMessage; import javax.xml.ws.WebServiceException; -import javax.xml.ws.handler.LogicalMessageContext; import javax.xml.ws.handler.MessageContext; import javax.xml.ws.handler.soap.SOAPMessageContext; @@ -45,18 +44,18 @@ * @author mageshbk(a)jboss.com * @since 20-Feb-2009 */ -public class SOAP12ClientHandler extends GenericSOAPHandler<LogicalMessageContext> +public class SOAP12ClientHandler extends GenericSOAPHandler<SOAPMessageContext> { private static Logger log = Logger.getLogger(SOAP12ClientHandler.class); @Override - public boolean handleInbound(MessageContext msgContext) + public boolean handleInbound(SOAPMessageContext msgContext) { log.info("handleInbound"); try { - SOAPEnvelope soapEnvelope = ((SOAPMessageContext)msgContext).getMessage().getSOAPPart().getEnvelope(); + SOAPEnvelope soapEnvelope = msgContext.getMessage().getSOAPPart().getEnvelope(); String nsURI = soapEnvelope.getNamespaceURI(); log.info("nsURI=" + nsURI); Modified: stack/cxf/trunk/modules/testsuite/shared-tests/src/test/java/org/jboss/test/ws/jaxws/jbws2419/SOAP12ServerHandler.java =================================================================== --- stack/cxf/trunk/modules/testsuite/shared-tests/src/test/java/org/jboss/test/ws/jaxws/jbws2419/SOAP12ServerHandler.java 2014-05-16 13:59:14 UTC (rev 18668) +++ stack/cxf/trunk/modules/testsuite/shared-tests/src/test/java/org/jboss/test/ws/jaxws/jbws2419/SOAP12ServerHandler.java 2014-05-16 14:05:38 UTC (rev 18669) @@ -45,12 +45,12 @@ * @author mageshbk(a)jboss.com * @since 20-Feb-2009 */ -public class SOAP12ServerHandler extends GenericSOAPHandler<LogicalMessageContext> +public class SOAP12ServerHandler extends GenericSOAPHandler<SOAPMessageContext> { private static Logger log = Logger.getLogger(SOAP12ServerHandler.class); @Override - public boolean handleInbound(MessageContext msgContext) + public boolean handleInbound(SOAPMessageContext msgContext) { log.info("handleInbound"); @@ -89,7 +89,7 @@ return true; } - protected ContentType getContentType(MessageContext msgContext) + protected ContentType getContentType(SOAPMessageContext msgContext) { ContentType contentType = null; Modified: stack/cxf/trunk/modules/testsuite/shared-tests/src/test/java/org/jboss/test/ws/jaxws/jbws2634/shared/handlers/TestHandler.java =================================================================== --- stack/cxf/trunk/modules/testsuite/shared-tests/src/test/java/org/jboss/test/ws/jaxws/jbws2634/shared/handlers/TestHandler.java 2014-05-16 13:59:14 UTC (rev 18668) +++ stack/cxf/trunk/modules/testsuite/shared-tests/src/test/java/org/jboss/test/ws/jaxws/jbws2634/shared/handlers/TestHandler.java 2014-05-16 14:05:38 UTC (rev 18669) @@ -28,7 +28,6 @@ import javax.xml.soap.SOAPException; import javax.xml.soap.SOAPMessage; import javax.xml.ws.WebServiceException; -import javax.xml.ws.handler.LogicalMessageContext; import javax.xml.ws.handler.MessageContext; import javax.xml.ws.handler.soap.SOAPMessageContext; @@ -41,7 +40,7 @@ * * @author <a href="mailto:richard.opalka@jboss.org">Richard Opalka</a> */ -public class TestHandler extends GenericSOAPHandler<LogicalMessageContext> +public class TestHandler extends GenericSOAPHandler<SOAPMessageContext> { // provide logging private static final Logger log = Logger.getLogger(TestHandler.class); @@ -79,13 +78,13 @@ } @Override - public boolean handleOutbound(MessageContext msgContext) + public boolean handleOutbound(SOAPMessageContext msgContext) { return ensureInjectionsAndInitialization(msgContext, "Outbound"); } @Override - public boolean handleInbound(MessageContext msgContext) + public boolean handleInbound(SOAPMessageContext msgContext) { return ensureInjectionsAndInitialization(msgContext, "Inbound"); } Modified: stack/cxf/trunk/modules/testsuite/shared-tests/src/test/java/org/jboss/test/ws/jaxws/jbws2955/ClientSOAPHandler.java =================================================================== --- stack/cxf/trunk/modules/testsuite/shared-tests/src/test/java/org/jboss/test/ws/jaxws/jbws2955/ClientSOAPHandler.java 2014-05-16 13:59:14 UTC (rev 18668) +++ stack/cxf/trunk/modules/testsuite/shared-tests/src/test/java/org/jboss/test/ws/jaxws/jbws2955/ClientSOAPHandler.java 2014-05-16 14:05:38 UTC (rev 18669) @@ -24,8 +24,6 @@ import javax.xml.soap.SOAPBody; import javax.xml.soap.SOAPException; import javax.xml.soap.SOAPMessage; -import javax.xml.ws.handler.LogicalMessageContext; -import javax.xml.ws.handler.MessageContext; import javax.xml.ws.handler.soap.SOAPMessageContext; import org.jboss.ws.api.handler.GenericSOAPHandler; @@ -33,15 +31,14 @@ import org.w3c.dom.Node; import org.w3c.dom.NodeList; -public class ClientSOAPHandler extends GenericSOAPHandler<LogicalMessageContext> +public class ClientSOAPHandler extends GenericSOAPHandler<SOAPMessageContext> { @Override - protected boolean handleInbound(final MessageContext msgContext) + protected boolean handleInbound(final SOAPMessageContext msgContext) { try { - SOAPMessageContext smc = (SOAPMessageContext) msgContext; - SOAPMessage message = smc.getMessage(); + SOAPMessage message = msgContext.getMessage(); SOAPBody body = message.getSOAPBody(); Document document = body.extractContentAsDocument(); Modified: stack/cxf/trunk/modules/testsuite/shared-tests/src/test/java/org/jboss/test/ws/jaxws/jbws2956/ClientSOAPHandler.java =================================================================== --- stack/cxf/trunk/modules/testsuite/shared-tests/src/test/java/org/jboss/test/ws/jaxws/jbws2956/ClientSOAPHandler.java 2014-05-16 13:59:14 UTC (rev 18668) +++ stack/cxf/trunk/modules/testsuite/shared-tests/src/test/java/org/jboss/test/ws/jaxws/jbws2956/ClientSOAPHandler.java 2014-05-16 14:05:38 UTC (rev 18669) @@ -25,22 +25,21 @@ import javax.xml.soap.SOAPException; import javax.xml.soap.SOAPFault; import javax.xml.soap.SOAPMessage; -import javax.xml.ws.handler.LogicalMessageContext; -import javax.xml.ws.handler.MessageContext; +import javax.xml.ws.handler.soap.SOAPMessageContext; import javax.xml.ws.soap.SOAPFaultException; import org.jboss.ws.api.handler.GenericSOAPHandler; -public class ClientSOAPHandler extends GenericSOAPHandler<LogicalMessageContext> +public class ClientSOAPHandler extends GenericSOAPHandler<SOAPMessageContext> { @Override - protected boolean handleInbound(final MessageContext msgContext) + protected boolean handleInbound(final SOAPMessageContext msgContext) { //do nothing return true; } - protected boolean handleOutbound(final MessageContext msgContext) + protected boolean handleOutbound(final SOAPMessageContext msgContext) { try { Modified: stack/cxf/trunk/modules/testsuite/shared-tests/src/test/java/org/jboss/test/ws/jaxws/jbws2976/SOAPHandler.java =================================================================== --- stack/cxf/trunk/modules/testsuite/shared-tests/src/test/java/org/jboss/test/ws/jaxws/jbws2976/SOAPHandler.java 2014-05-16 13:59:14 UTC (rev 18668) +++ stack/cxf/trunk/modules/testsuite/shared-tests/src/test/java/org/jboss/test/ws/jaxws/jbws2976/SOAPHandler.java 2014-05-16 14:05:38 UTC (rev 18669) @@ -21,18 +21,17 @@ */ package org.jboss.test.ws.jaxws.jbws2976; -import javax.xml.ws.handler.LogicalMessageContext; -import javax.xml.ws.handler.MessageContext; +import javax.xml.ws.handler.soap.SOAPMessageContext; import org.jboss.ws.api.handler.GenericSOAPHandler; /** * @author <a href="ema(a)redhat.com">Jim Ma</a> */ -public class SOAPHandler extends GenericSOAPHandler<LogicalMessageContext> +public class SOAPHandler extends GenericSOAPHandler<SOAPMessageContext> { @Override - protected boolean handleInbound(final MessageContext msgContext) + protected boolean handleInbound(final SOAPMessageContext msgContext) { //do nothing return true; Modified: stack/cxf/trunk/modules/testsuite/shared-tests/src/test/java/org/jboss/test/ws/jaxws/jbws2999/CustomHandler.java =================================================================== --- stack/cxf/trunk/modules/testsuite/shared-tests/src/test/java/org/jboss/test/ws/jaxws/jbws2999/CustomHandler.java 2014-05-16 13:59:14 UTC (rev 18668) +++ stack/cxf/trunk/modules/testsuite/shared-tests/src/test/java/org/jboss/test/ws/jaxws/jbws2999/CustomHandler.java 2014-05-16 14:05:38 UTC (rev 18669) @@ -27,20 +27,18 @@ import javax.xml.soap.SOAPException; import javax.xml.soap.SOAPMessage; import javax.xml.ws.WebServiceException; -import javax.xml.ws.handler.LogicalMessageContext; -import javax.xml.ws.handler.MessageContext; import javax.xml.ws.handler.soap.SOAPMessageContext; import org.jboss.ws.api.handler.GenericSOAPHandler; -public class CustomHandler extends GenericSOAPHandler<LogicalMessageContext> { +public class CustomHandler extends GenericSOAPHandler<SOAPMessageContext> { @Override - protected boolean handleInbound(MessageContext msgContext) + protected boolean handleInbound(SOAPMessageContext msgContext) { try { - SOAPMessage soapMessage = ((SOAPMessageContext)msgContext).getMessage(); + SOAPMessage soapMessage = msgContext.getMessage(); SOAPBody soapBody = soapMessage.getSOAPBody(); SOAPBodyElement soapBodyElement = (SOAPBodyElement)soapBody.getChildElements().next(); Modified: stack/cxf/trunk/modules/testsuite/shared-tests/src/test/java/org/jboss/test/ws/jaxws/jbws3034/ServerSOAPHandler.java =================================================================== --- stack/cxf/trunk/modules/testsuite/shared-tests/src/test/java/org/jboss/test/ws/jaxws/jbws3034/ServerSOAPHandler.java 2014-05-16 13:59:14 UTC (rev 18668) +++ stack/cxf/trunk/modules/testsuite/shared-tests/src/test/java/org/jboss/test/ws/jaxws/jbws3034/ServerSOAPHandler.java 2014-05-16 14:05:38 UTC (rev 18669) @@ -24,8 +24,6 @@ import javax.xml.soap.SOAPBody; import javax.xml.soap.SOAPException; import javax.xml.soap.SOAPMessage; -import javax.xml.ws.handler.LogicalMessageContext; -import javax.xml.ws.handler.MessageContext; import javax.xml.ws.handler.soap.SOAPMessageContext; import org.jboss.ws.api.handler.GenericSOAPHandler; @@ -33,15 +31,14 @@ import org.w3c.dom.Node; import org.w3c.dom.NodeList; -public class ServerSOAPHandler extends GenericSOAPHandler<LogicalMessageContext> +public class ServerSOAPHandler extends GenericSOAPHandler<SOAPMessageContext> { @Override - protected boolean handleOutbound(final MessageContext msgContext) + protected boolean handleOutbound(final SOAPMessageContext msgContext) { try { - SOAPMessageContext smc = (SOAPMessageContext) msgContext; - SOAPMessage message = smc.getMessage(); + SOAPMessage message = msgContext.getMessage(); SOAPBody body = message.getSOAPBody(); Document document = body.extractContentAsDocument(); Modified: stack/cxf/trunk/modules/testsuite/shared-tests/src/test/java/org/jboss/test/ws/jaxws/jbws3282/AuthorizationHandler.java =================================================================== --- stack/cxf/trunk/modules/testsuite/shared-tests/src/test/java/org/jboss/test/ws/jaxws/jbws3282/AuthorizationHandler.java 2014-05-16 13:59:14 UTC (rev 18668) +++ stack/cxf/trunk/modules/testsuite/shared-tests/src/test/java/org/jboss/test/ws/jaxws/jbws3282/AuthorizationHandler.java 2014-05-16 14:05:38 UTC (rev 18669) @@ -27,20 +27,18 @@ import javax.xml.soap.SOAPException; import javax.xml.soap.SOAPMessage; import javax.xml.ws.WebServiceException; -import javax.xml.ws.handler.LogicalMessageContext; -import javax.xml.ws.handler.MessageContext; import javax.xml.ws.handler.soap.SOAPMessageContext; import org.jboss.logging.Logger; import org.jboss.ws.api.handler.GenericSOAPHandler; -public class AuthorizationHandler extends GenericSOAPHandler<LogicalMessageContext> +public class AuthorizationHandler extends GenericSOAPHandler<SOAPMessageContext> { // Provide logging private static Logger log = Logger.getLogger(AuthorizationHandler.class); @Override - protected boolean handleInbound(MessageContext msgContext) + protected boolean handleInbound(SOAPMessageContext msgContext) { log.info("handleInbound"); @@ -69,7 +67,7 @@ } @Override - protected boolean handleOutbound(MessageContext msgContext) + protected boolean handleOutbound(SOAPMessageContext msgContext) { log.info("handleOutbound"); Modified: stack/cxf/trunk/modules/testsuite/shared-tests/src/test/java/org/jboss/test/ws/jaxws/jbws3282/EndpointHandler.java =================================================================== --- stack/cxf/trunk/modules/testsuite/shared-tests/src/test/java/org/jboss/test/ws/jaxws/jbws3282/EndpointHandler.java 2014-05-16 13:59:14 UTC (rev 18668) +++ stack/cxf/trunk/modules/testsuite/shared-tests/src/test/java/org/jboss/test/ws/jaxws/jbws3282/EndpointHandler.java 2014-05-16 14:05:38 UTC (rev 18669) @@ -27,20 +27,18 @@ import javax.xml.soap.SOAPException; import javax.xml.soap.SOAPMessage; import javax.xml.ws.WebServiceException; -import javax.xml.ws.handler.LogicalMessageContext; -import javax.xml.ws.handler.MessageContext; import javax.xml.ws.handler.soap.SOAPMessageContext; import org.jboss.logging.Logger; import org.jboss.ws.api.handler.GenericSOAPHandler; -public class EndpointHandler extends GenericSOAPHandler<LogicalMessageContext> +public class EndpointHandler extends GenericSOAPHandler<SOAPMessageContext> { // Provide logging private static Logger log = Logger.getLogger(EndpointHandler.class); @Override - protected boolean handleInbound(MessageContext msgContext) + protected boolean handleInbound(SOAPMessageContext msgContext) { log.info("handleInbound"); @@ -69,7 +67,7 @@ } @Override - protected boolean handleOutbound(MessageContext msgContext) + protected boolean handleOutbound(SOAPMessageContext msgContext) { log.info("handleOutbound"); Modified: stack/cxf/trunk/modules/testsuite/shared-tests/src/test/java/org/jboss/test/ws/jaxws/jbws3282/LogHandler.java =================================================================== --- stack/cxf/trunk/modules/testsuite/shared-tests/src/test/java/org/jboss/test/ws/jaxws/jbws3282/LogHandler.java 2014-05-16 13:59:14 UTC (rev 18668) +++ stack/cxf/trunk/modules/testsuite/shared-tests/src/test/java/org/jboss/test/ws/jaxws/jbws3282/LogHandler.java 2014-05-16 14:05:38 UTC (rev 18669) @@ -28,26 +28,24 @@ import javax.xml.soap.SOAPHeader; import javax.xml.soap.SOAPMessage; import javax.xml.ws.WebServiceException; -import javax.xml.ws.handler.LogicalMessageContext; -import javax.xml.ws.handler.MessageContext; import javax.xml.ws.handler.soap.SOAPMessageContext; import org.jboss.logging.Logger; import org.jboss.ws.api.handler.GenericSOAPHandler; -public class LogHandler extends GenericSOAPHandler<LogicalMessageContext> +public class LogHandler extends GenericSOAPHandler<SOAPMessageContext> { // Provide logging private static Logger log = Logger.getLogger(LogHandler.class); @Override - protected boolean handleInbound(MessageContext msgContext) + protected boolean handleInbound(SOAPMessageContext msgContext) { log.info("handleInbound"); try { - SOAPMessage soapMessage = ((SOAPMessageContext)msgContext).getMessage(); + SOAPMessage soapMessage = msgContext.getMessage(); getFailsafeSOAPHeader(soapMessage); SOAPBody soapBody = soapMessage.getSOAPBody(); @@ -70,13 +68,13 @@ } @Override - protected boolean handleOutbound(MessageContext msgContext) + protected boolean handleOutbound(SOAPMessageContext msgContext) { log.info("handleOutbound"); try { - SOAPMessage soapMessage = ((SOAPMessageContext)msgContext).getMessage(); + SOAPMessage soapMessage = msgContext.getMessage(); getFailsafeSOAPHeader(soapMessage); SOAPBody soapBody = soapMessage.getSOAPBody(); Modified: stack/cxf/trunk/modules/testsuite/shared-tests/src/test/java/org/jboss/test/ws/jaxws/jbws3282/RoutingHandler.java =================================================================== --- stack/cxf/trunk/modules/testsuite/shared-tests/src/test/java/org/jboss/test/ws/jaxws/jbws3282/RoutingHandler.java 2014-05-16 13:59:14 UTC (rev 18668) +++ stack/cxf/trunk/modules/testsuite/shared-tests/src/test/java/org/jboss/test/ws/jaxws/jbws3282/RoutingHandler.java 2014-05-16 14:05:38 UTC (rev 18669) @@ -27,26 +27,24 @@ import javax.xml.soap.SOAPException; import javax.xml.soap.SOAPMessage; import javax.xml.ws.WebServiceException; -import javax.xml.ws.handler.LogicalMessageContext; -import javax.xml.ws.handler.MessageContext; import javax.xml.ws.handler.soap.SOAPMessageContext; import org.jboss.logging.Logger; import org.jboss.ws.api.handler.GenericSOAPHandler; -public class RoutingHandler extends GenericSOAPHandler<LogicalMessageContext> +public class RoutingHandler extends GenericSOAPHandler<SOAPMessageContext> { // Provide logging private static Logger log = Logger.getLogger(RoutingHandler.class); @Override - protected boolean handleInbound(MessageContext msgContext) + protected boolean handleInbound(SOAPMessageContext msgContext) { log.info("handleInbound"); try { - SOAPMessage soapMessage = ((SOAPMessageContext)msgContext).getMessage(); + SOAPMessage soapMessage = msgContext.getMessage(); soapMessage.getSOAPHeader(); SOAPBody soapBody = soapMessage.getSOAPBody(); @@ -69,13 +67,13 @@ } @Override - protected boolean handleOutbound(MessageContext msgContext) + protected boolean handleOutbound(SOAPMessageContext msgContext) { log.info("handleOutbound"); try { - SOAPMessage soapMessage = ((SOAPMessageContext)msgContext).getMessage(); + SOAPMessage soapMessage = msgContext.getMessage(); soapMessage.getSOAPHeader(); SOAPBody soapBody = soapMessage.getSOAPBody(); Modified: stack/cxf/trunk/modules/testsuite/shared-tests/src/test/java/org/jboss/test/ws/jaxws/jbws3287/AuthorizationHandler.java =================================================================== --- stack/cxf/trunk/modules/testsuite/shared-tests/src/test/java/org/jboss/test/ws/jaxws/jbws3287/AuthorizationHandler.java 2014-05-16 13:59:14 UTC (rev 18668) +++ stack/cxf/trunk/modules/testsuite/shared-tests/src/test/java/org/jboss/test/ws/jaxws/jbws3287/AuthorizationHandler.java 2014-05-16 14:05:38 UTC (rev 18669) @@ -27,26 +27,24 @@ import javax.xml.soap.SOAPException; import javax.xml.soap.SOAPMessage; import javax.xml.ws.WebServiceException; -import javax.xml.ws.handler.LogicalMessageContext; -import javax.xml.ws.handler.MessageContext; import javax.xml.ws.handler.soap.SOAPMessageContext; import org.jboss.logging.Logger; import org.jboss.ws.api.handler.GenericSOAPHandler; -public class AuthorizationHandler extends GenericSOAPHandler<LogicalMessageContext> +public class AuthorizationHandler extends GenericSOAPHandler<SOAPMessageContext> { // Provide logging private static Logger log = Logger.getLogger(AuthorizationHandler.class); @Override - protected boolean handleInbound(MessageContext msgContext) + protected boolean handleInbound(SOAPMessageContext msgContext) { log.info("handleInbound"); try { - SOAPMessage soapMessage = ((SOAPMessageContext)msgContext).getMessage(); + SOAPMessage soapMessage = msgContext.getMessage(); SOAPBody soapBody = soapMessage.getSOAPBody(); SOAPBodyElement soapBodyElement = (SOAPBodyElement)soapBody.getChildElements().next(); @@ -63,13 +61,13 @@ } @Override - protected boolean handleOutbound(MessageContext msgContext) + protected boolean handleOutbound(SOAPMessageContext msgContext) { log.info("handleOutbound"); try { - SOAPMessage soapMessage = ((SOAPMessageContext)msgContext).getMessage(); + SOAPMessage soapMessage = msgContext.getMessage(); SOAPBody soapBody = soapMessage.getSOAPBody(); SOAPBodyElement soapBodyElement = (SOAPBodyElement)soapBody.getChildElements().next(); Modified: stack/cxf/trunk/modules/testsuite/shared-tests/src/test/java/org/jboss/test/ws/jaxws/jbws3287/EndpointHandler.java =================================================================== --- stack/cxf/trunk/modules/testsuite/shared-tests/src/test/java/org/jboss/test/ws/jaxws/jbws3287/EndpointHandler.java 2014-05-16 13:59:14 UTC (rev 18668) +++ stack/cxf/trunk/modules/testsuite/shared-tests/src/test/java/org/jboss/test/ws/jaxws/jbws3287/EndpointHandler.java 2014-05-16 14:05:38 UTC (rev 18669) @@ -27,20 +27,18 @@ import javax.xml.soap.SOAPException; import javax.xml.soap.SOAPMessage; import javax.xml.ws.WebServiceException; -import javax.xml.ws.handler.LogicalMessageContext; -import javax.xml.ws.handler.MessageContext; import javax.xml.ws.handler.soap.SOAPMessageContext; import org.jboss.logging.Logger; import org.jboss.ws.api.handler.GenericSOAPHandler; -public class EndpointHandler extends GenericSOAPHandler<LogicalMessageContext> +public class EndpointHandler extends GenericSOAPHandler<SOAPMessageContext> { // Provide logging private static Logger log = Logger.getLogger(EndpointHandler.class); @Override - protected boolean handleInbound(MessageContext msgContext) + protected boolean handleInbound(SOAPMessageContext msgContext) { log.info("handleInbound"); @@ -63,7 +61,7 @@ } @Override - protected boolean handleOutbound(MessageContext msgContext) + protected boolean handleOutbound(SOAPMessageContext msgContext) { log.info("handleOutbound"); Modified: stack/cxf/trunk/modules/testsuite/shared-tests/src/test/java/org/jboss/test/ws/jaxws/jbws3287/LogHandler.java =================================================================== --- stack/cxf/trunk/modules/testsuite/shared-tests/src/test/java/org/jboss/test/ws/jaxws/jbws3287/LogHandler.java 2014-05-16 13:59:14 UTC (rev 18668) +++ stack/cxf/trunk/modules/testsuite/shared-tests/src/test/java/org/jboss/test/ws/jaxws/jbws3287/LogHandler.java 2014-05-16 14:05:38 UTC (rev 18669) @@ -27,26 +27,24 @@ import javax.xml.soap.SOAPException; import javax.xml.soap.SOAPMessage; import javax.xml.ws.WebServiceException; -import javax.xml.ws.handler.LogicalMessageContext; -import javax.xml.ws.handler.MessageContext; import javax.xml.ws.handler.soap.SOAPMessageContext; import org.jboss.logging.Logger; import org.jboss.ws.api.handler.GenericSOAPHandler; -public class LogHandler extends GenericSOAPHandler<LogicalMessageContext> +public class LogHandler extends GenericSOAPHandler<SOAPMessageContext> { // Provide logging private static Logger log = Logger.getLogger(LogHandler.class); @Override - protected boolean handleInbound(MessageContext msgContext) + protected boolean handleInbound(SOAPMessageContext msgContext) { log.info("handleInbound"); try { - SOAPMessage soapMessage = ((SOAPMessageContext)msgContext).getMessage(); + SOAPMessage soapMessage = msgContext.getMessage(); SOAPBody soapBody = soapMessage.getSOAPBody(); SOAPBodyElement soapBodyElement = (SOAPBodyElement)soapBody.getChildElements().next(); @@ -63,13 +61,13 @@ } @Override - protected boolean handleOutbound(MessageContext msgContext) + protected boolean handleOutbound(SOAPMessageContext msgContext) { log.info("handleOutbound"); try { - SOAPMessage soapMessage = ((SOAPMessageContext)msgContext).getMessage(); + SOAPMessage soapMessage = msgContext.getMessage(); SOAPBody soapBody = soapMessage.getSOAPBody(); SOAPBodyElement soapBodyElement = (SOAPBodyElement)soapBody.getChildElements().next(); Modified: stack/cxf/trunk/modules/testsuite/shared-tests/src/test/java/org/jboss/test/ws/jaxws/jbws3287/RoutingHandler.java =================================================================== --- stack/cxf/trunk/modules/testsuite/shared-tests/src/test/java/org/jboss/test/ws/jaxws/jbws3287/RoutingHandler.java 2014-05-16 13:59:14 UTC (rev 18668) +++ stack/cxf/trunk/modules/testsuite/shared-tests/src/test/java/org/jboss/test/ws/jaxws/jbws3287/RoutingHandler.java 2014-05-16 14:05:38 UTC (rev 18669) @@ -27,26 +27,24 @@ import javax.xml.soap.SOAPException; import javax.xml.soap.SOAPMessage; import javax.xml.ws.WebServiceException; -import javax.xml.ws.handler.LogicalMessageContext; -import javax.xml.ws.handler.MessageContext; import javax.xml.ws.handler.soap.SOAPMessageContext; import org.jboss.logging.Logger; import org.jboss.ws.api.handler.GenericSOAPHandler; -public class RoutingHandler extends GenericSOAPHandler<LogicalMessageContext> +public class RoutingHandler extends GenericSOAPHandler<SOAPMessageContext> { // Provide logging private static Logger log = Logger.getLogger(RoutingHandler.class); @Override - protected boolean handleInbound(MessageContext msgContext) + protected boolean handleInbound(SOAPMessageContext msgContext) { log.info("handleInbound"); try { - SOAPMessage soapMessage = ((SOAPMessageContext)msgContext).getMessage(); + SOAPMessage soapMessage = msgContext.getMessage(); SOAPBody soapBody = soapMessage.getSOAPBody(); SOAPBodyElement soapBodyElement = (SOAPBodyElement)soapBody.getChildElements().next(); @@ -63,13 +61,13 @@ } @Override - protected boolean handleOutbound(MessageContext msgContext) + protected boolean handleOutbound(SOAPMessageContext msgContext) { log.info("handleOutbound"); try { - SOAPMessage soapMessage = ((SOAPMessageContext)msgContext).getMessage(); + SOAPMessage soapMessage = msgContext.getMessage(); SOAPBody soapBody = soapMessage.getSOAPBody(); SOAPBodyElement soapBodyElement = (SOAPBodyElement)soapBody.getChildElements().next(); Modified: stack/cxf/trunk/modules/testsuite/shared-tests/src/test/java/org/jboss/test/ws/jaxws/jbws3293/SOAPHandler.java =================================================================== --- stack/cxf/trunk/modules/testsuite/shared-tests/src/test/java/org/jboss/test/ws/jaxws/jbws3293/SOAPHandler.java 2014-05-16 13:59:14 UTC (rev 18668) +++ stack/cxf/trunk/modules/testsuite/shared-tests/src/test/java/org/jboss/test/ws/jaxws/jbws3293/SOAPHandler.java 2014-05-16 14:05:38 UTC (rev 18669) @@ -25,8 +25,6 @@ import javax.xml.soap.SOAPBody; import javax.xml.soap.SOAPException; import javax.xml.soap.SOAPMessage; -import javax.xml.ws.handler.LogicalMessageContext; -import javax.xml.ws.handler.MessageContext; import javax.xml.ws.handler.soap.SOAPMessageContext; import org.jboss.logging.Logger; @@ -36,20 +34,19 @@ import org.w3c.dom.Node; import org.w3c.dom.NodeList; -public class SOAPHandler extends GenericSOAPHandler<LogicalMessageContext> +public class SOAPHandler extends GenericSOAPHandler<SOAPMessageContext> { private static final Logger log = Logger.getLogger(SOAPHandler.class); @Override - protected boolean handleInbound(final MessageContext msgContext) + protected boolean handleInbound(final SOAPMessageContext msgContext) { log.info("handleInbound()"); try { - SOAPMessageContext smc = (SOAPMessageContext)msgContext; - SOAPMessage message = smc.getMessage(); + SOAPMessage message = msgContext.getMessage(); SOAPBody body = message.getSOAPBody(); Document document = body.extractContentAsDocument(); Modified: stack/cxf/trunk/modules/testsuite/shared-tests/src/test/java/org/jboss/test/ws/jaxws/samples/addressing/ServerHandler.java =================================================================== --- stack/cxf/trunk/modules/testsuite/shared-tests/src/test/java/org/jboss/test/ws/jaxws/samples/addressing/ServerHandler.java 2014-05-16 13:59:14 UTC (rev 18668) +++ stack/cxf/trunk/modules/testsuite/shared-tests/src/test/java/org/jboss/test/ws/jaxws/samples/addressing/ServerHandler.java 2014-05-16 14:05:38 UTC (rev 18669) @@ -22,9 +22,8 @@ package org.jboss.test.ws.jaxws.samples.addressing; import javax.xml.namespace.QName; -import javax.xml.ws.handler.LogicalMessageContext; -import javax.xml.ws.handler.MessageContext; import javax.xml.ws.handler.MessageContext.Scope; +import javax.xml.ws.handler.soap.SOAPMessageContext; import org.jboss.logging.Logger; import org.jboss.ws.api.addressing.MAP; @@ -42,7 +41,7 @@ * @author Thomas.Diesler(a)jboss.org * @since 24-Nov-2005 */ -public class ServerHandler extends GenericSOAPHandler<LogicalMessageContext> +public class ServerHandler extends GenericSOAPHandler<SOAPMessageContext> { // Provide logging private static Logger log = Logger.getLogger(ServerHandler.class); @@ -50,7 +49,7 @@ private static final QName IDQN = StatefulEndpointImpl.IDQN; @Override - public boolean handleInbound(MessageContext msgContext) + public boolean handleInbound(SOAPMessageContext msgContext) { log.info("handleRequest"); @@ -89,7 +88,7 @@ } @Override - public boolean handleOutbound(MessageContext msgContext) + public boolean handleOutbound(SOAPMessageContext msgContext) { log.info("handleResponse"); Modified: stack/cxf/trunk/modules/testsuite/shared-tests/src/test/java/org/jboss/test/ws/jaxws/samples/advanced/retail/handler/SOAPMessageTrace.java =================================================================== --- stack/cxf/trunk/modules/testsuite/shared-tests/src/test/java/org/jboss/test/ws/jaxws/samples/advanced/retail/handler/SOAPMessageTrace.java 2014-05-16 13:59:14 UTC (rev 18668) +++ stack/cxf/trunk/modules/testsuite/shared-tests/src/test/java/org/jboss/test/ws/jaxws/samples/advanced/retail/handler/SOAPMessageTrace.java 2014-05-16 14:05:38 UTC (rev 18669) @@ -21,27 +21,26 @@ */ package org.jboss.test.ws.jaxws.samples.advanced.retail.handler; -import javax.xml.ws.handler.LogicalMessageContext; -import javax.xml.ws.handler.MessageContext; +import javax.xml.ws.handler.soap.SOAPMessageContext; import org.jboss.logging.Logger; import org.jboss.ws.api.handler.GenericSOAPHandler; -public class SOAPMessageTrace extends GenericSOAPHandler<LogicalMessageContext> +public class SOAPMessageTrace extends GenericSOAPHandler<SOAPMessageContext> { private static final Logger log = Logger.getLogger(SOAPMessageTrace.class); private final Timer timer = Timer.getInstance(); @Override - public boolean handleInbound(MessageContext msgContext) + public boolean handleInbound(SOAPMessageContext msgContext) { timer.push(System.currentTimeMillis()); return true; } @Override - public boolean handleOutbound(MessageContext msgContext) + public boolean handleOutbound(SOAPMessageContext msgContext) { log.info("Exectime time: " + timer.pop() + " ms"); return true; Modified: stack/cxf/trunk/modules/testsuite/shared-tests/src/test/java/org/jboss/test/ws/jaxws/samples/exception/server/ServerHandler.java =================================================================== --- stack/cxf/trunk/modules/testsuite/shared-tests/src/test/java/org/jboss/test/ws/jaxws/samples/exception/server/ServerHandler.java 2014-05-16 13:59:14 UTC (rev 18668) +++ stack/cxf/trunk/modules/testsuite/shared-tests/src/test/java/org/jboss/test/ws/jaxws/samples/exception/server/ServerHandler.java 2014-05-16 14:05:38 UTC (rev 18669) @@ -29,8 +29,6 @@ import javax.xml.soap.SOAPElement; import javax.xml.soap.SOAPMessage; import javax.xml.ws.WebServiceException; -import javax.xml.ws.handler.LogicalMessageContext; -import javax.xml.ws.handler.MessageContext; import javax.xml.ws.handler.soap.SOAPMessageContext; import org.jboss.ws.api.handler.GenericSOAPHandler; @@ -41,15 +39,15 @@ * @author alessio.soldano(a)jboss.org * @since 12-Feb-2008 */ -public class ServerHandler extends GenericSOAPHandler<LogicalMessageContext> +public class ServerHandler extends GenericSOAPHandler<SOAPMessageContext> { @Override @SuppressWarnings("unchecked") - public boolean handleFault(MessageContext msgContext) + public boolean handleFault(SOAPMessageContext msgContext) { try { - SOAPMessage soapMessage = ((SOAPMessageContext)msgContext).getMessage(); + SOAPMessage soapMessage = msgContext.getMessage(); SOAPBody soapBody = soapMessage.getSOAPBody(); SOAPBodyElement soapBodyElement = (SOAPBodyElement)soapBody.getChildElements().next(); SOAPElement faultStringElement = (SOAPElement)soapBodyElement.getChildElements(new QName("faultstring")).next(); Modified: stack/cxf/trunk/modules/testsuite/shared-tests/src/test/java/org/jboss/test/ws/jaxws/samples/handlerchain/AuthorizationHandler.java =================================================================== --- stack/cxf/trunk/modules/testsuite/shared-tests/src/test/java/org/jboss/test/ws/jaxws/samples/handlerchain/AuthorizationHandler.java 2014-05-16 13:59:14 UTC (rev 18668) +++ stack/cxf/trunk/modules/testsuite/shared-tests/src/test/java/org/jboss/test/ws/jaxws/samples/handlerchain/AuthorizationHandler.java 2014-05-16 14:05:38 UTC (rev 18669) @@ -31,8 +31,6 @@ import javax.xml.soap.SOAPHeaderElement; import javax.xml.soap.SOAPMessage; import javax.xml.ws.WebServiceException; -import javax.xml.ws.handler.LogicalMessageContext; -import javax.xml.ws.handler.MessageContext; import javax.xml.ws.handler.soap.SOAPMessageContext; import org.jboss.logging.Logger; @@ -44,19 +42,19 @@ * @author Thomas.Diesler(a)jboss.org * @since 08-Oct-2005 */ -public class AuthorizationHandler extends GenericSOAPHandler<LogicalMessageContext> +public class AuthorizationHandler extends GenericSOAPHandler<SOAPMessageContext> { // Provide logging private static Logger log = Logger.getLogger(AuthorizationHandler.class); @Override - protected boolean handleInbound(MessageContext msgContext) + protected boolean handleInbound(SOAPMessageContext msgContext) { log.info("handleInbound"); try { - SOAPMessage soapMessage = ((SOAPMessageContext)msgContext).getMessage(); + SOAPMessage soapMessage = msgContext.getMessage(); SOAPHeader soapHeader = soapMessage.getSOAPHeader(); SOAPBody soapBody = soapMessage.getSOAPBody(); @@ -79,13 +77,13 @@ } @Override - protected boolean handleOutbound(MessageContext msgContext) + protected boolean handleOutbound(SOAPMessageContext msgContext) { log.info("handleOutbound"); try { - SOAPMessage soapMessage = ((SOAPMessageContext)msgContext).getMessage(); + SOAPMessage soapMessage = msgContext.getMessage(); SOAPHeader soapHeader = soapMessage.getSOAPHeader(); SOAPBody soapBody = soapMessage.getSOAPBody(); Modified: stack/cxf/trunk/modules/testsuite/shared-tests/src/test/java/org/jboss/test/ws/jaxws/samples/handlerchain/ClientMimeHandler.java =================================================================== --- stack/cxf/trunk/modules/testsuite/shared-tests/src/test/java/org/jboss/test/ws/jaxws/samples/handlerchain/ClientMimeHandler.java 2014-05-16 13:59:14 UTC (rev 18668) +++ stack/cxf/trunk/modules/testsuite/shared-tests/src/test/java/org/jboss/test/ws/jaxws/samples/handlerchain/ClientMimeHandler.java 2014-05-16 14:05:38 UTC (rev 18669) @@ -28,7 +28,6 @@ import javax.xml.soap.MimeHeaders; import javax.xml.soap.SOAPMessage; -import javax.xml.ws.handler.LogicalMessageContext; import javax.xml.ws.handler.MessageContext; import javax.xml.ws.handler.soap.SOAPMessageContext; @@ -42,7 +41,7 @@ * @author alessio.soldano(a)jboss.com * @since 08-Oct-2005 */ -public class ClientMimeHandler extends GenericSOAPHandler<LogicalMessageContext> +public class ClientMimeHandler extends GenericSOAPHandler<SOAPMessageContext> { // Provide logging private static Logger log = Logger.getLogger(ClientMimeHandler.class); @@ -50,12 +49,12 @@ public static String inboundCookie; @Override - protected boolean handleOutbound(MessageContext msgContext) + protected boolean handleOutbound(SOAPMessageContext msgContext) { log.info("handleOutbound"); // legacy JBossWS-Native approach - SOAPMessage soapMessage = ((SOAPMessageContext)msgContext).getMessage(); + SOAPMessage soapMessage = msgContext.getMessage(); MimeHeaders mimeHeaders = soapMessage.getMimeHeaders(); mimeHeaders.setHeader("Cookie", "client-cookie=true"); @@ -70,12 +69,12 @@ } @Override - protected boolean handleInbound(MessageContext msgContext) + protected boolean handleInbound(SOAPMessageContext msgContext) { log.info("handleInbound"); //legacy JBossWS-Native approach - SOAPMessage soapMessage = ((SOAPMessageContext)msgContext).getMessage(); + SOAPMessage soapMessage = msgContext.getMessage(); MimeHeaders mimeHeaders = soapMessage.getMimeHeaders(); String[] cookies = mimeHeaders.getHeader("Set-Cookie"); Modified: stack/cxf/trunk/modules/testsuite/shared-tests/src/test/java/org/jboss/test/ws/jaxws/samples/handlerchain/LogHandler.java =================================================================== --- stack/cxf/trunk/modules/testsuite/shared-tests/src/test/java/org/jboss/test/ws/jaxws/samples/handlerchain/LogHandler.java 2014-05-16 13:59:14 UTC (rev 18668) +++ stack/cxf/trunk/modules/testsuite/shared-tests/src/test/java/org/jboss/test/ws/jaxws/samples/handlerchain/LogHandler.java 2014-05-16 14:05:38 UTC (rev 18669) @@ -31,8 +31,6 @@ import javax.xml.soap.SOAPHeaderElement; import javax.xml.soap.SOAPMessage; import javax.xml.ws.WebServiceException; -import javax.xml.ws.handler.LogicalMessageContext; -import javax.xml.ws.handler.MessageContext; import javax.xml.ws.handler.soap.SOAPMessageContext; import org.jboss.logging.Logger; @@ -44,19 +42,19 @@ * @author Thomas.Diesler(a)jboss.org * @since 08-Oct-2005 */ -public class LogHandler extends GenericSOAPHandler<LogicalMessageContext> +public class LogHandler extends GenericSOAPHandler<SOAPMessageContext> { // Provide logging private static Logger log = Logger.getLogger(LogHandler.class); @Override - protected boolean handleInbound(MessageContext msgContext) + protected boolean handleInbound(SOAPMessageContext msgContext) { log.info("handleInbound"); try { - SOAPMessage soapMessage = ((SOAPMessageContext)msgContext).getMessage(); + SOAPMessage soapMessage = msgContext.getMessage(); SOAPHeader soapHeader = getFailsafeSOAPHeader(soapMessage); SOAPBody soapBody = soapMessage.getSOAPBody(); @@ -79,13 +77,13 @@ } @Override - protected boolean handleOutbound(MessageContext msgContext) + protected boolean handleOutbound(SOAPMessageContext msgContext) { log.info("handleOutbound"); try { - SOAPMessage soapMessage = ((SOAPMessageContext)msgContext).getMessage(); + SOAPMessage soapMessage = msgContext.getMessage(); SOAPHeader soapHeader = getFailsafeSOAPHeader(soapMessage); SOAPBody soapBody = soapMessage.getSOAPBody(); Modified: stack/cxf/trunk/modules/testsuite/shared-tests/src/test/java/org/jboss/test/ws/jaxws/samples/handlerchain/RoutingHandler.java =================================================================== --- stack/cxf/trunk/modules/testsuite/shared-tests/src/test/java/org/jboss/test/ws/jaxws/samples/handlerchain/RoutingHandler.java 2014-05-16 13:59:14 UTC (rev 18668) +++ stack/cxf/trunk/modules/testsuite/shared-tests/src/test/java/org/jboss/test/ws/jaxws/samples/handlerchain/RoutingHandler.java 2014-05-16 14:05:38 UTC (rev 18669) @@ -31,8 +31,6 @@ import javax.xml.soap.SOAPHeaderElement; import javax.xml.soap.SOAPMessage; import javax.xml.ws.WebServiceException; -import javax.xml.ws.handler.LogicalMessageContext; -import javax.xml.ws.handler.MessageContext; import javax.xml.ws.handler.soap.SOAPMessageContext; import org.jboss.logging.Logger; @@ -44,19 +42,19 @@ * @author Thomas.Diesler(a)jboss.org * @since 08-Oct-2005 */ -public class RoutingHandler extends GenericSOAPHandler<LogicalMessageContext> +public class RoutingHandler extends GenericSOAPHandler<SOAPMessageContext> { // Provide logging private static Logger log = Logger.getLogger(RoutingHandler.class); @Override - protected boolean handleInbound(MessageContext msgContext) + protected boolean handleInbound(SOAPMessageContext msgContext) { log.info("handleInbound"); try { - SOAPMessage soapMessage = ((SOAPMessageContext)msgContext).getMessage(); + SOAPMessage soapMessage = msgContext.getMessage(); SOAPHeader soapHeader = soapMessage.getSOAPHeader(); SOAPBody soapBody = soapMessage.getSOAPBody(); @@ -79,13 +77,13 @@ } @Override - protected boolean handleOutbound(MessageContext msgContext) + protected boolean handleOutbound(SOAPMessageContext msgContext) { log.info("handleOutbound"); try { - SOAPMessage soapMessage = ((SOAPMessageContext)msgContext).getMessage(); + SOAPMessage soapMessage = msgContext.getMessage(); SOAPHeader soapHeader = soapMessage.getSOAPHeader(); SOAPBody soapBody = soapMessage.getSOAPBody(); Modified: stack/cxf/trunk/modules/testsuite/shared-tests/src/test/java/org/jboss/test/ws/jaxws/samples/handlerchain/ServerMimeHandler.java =================================================================== --- stack/cxf/trunk/modules/testsuite/shared-tests/src/test/java/org/jboss/test/ws/jaxws/samples/handlerchain/ServerMimeHandler.java 2014-05-16 13:59:14 UTC (rev 18668) +++ stack/cxf/trunk/modules/testsuite/shared-tests/src/test/java/org/jboss/test/ws/jaxws/samples/handlerchain/ServerMimeHandler.java 2014-05-16 14:05:38 UTC (rev 18669) @@ -28,7 +28,6 @@ import javax.xml.soap.MimeHeaders; import javax.xml.soap.SOAPMessage; -import javax.xml.ws.handler.LogicalMessageContext; import javax.xml.ws.handler.MessageContext; import javax.xml.ws.handler.soap.SOAPMessageContext; @@ -42,19 +41,19 @@ * @author alessio.soldano(a)jboss.com * @since 08-Oct-2005 */ -public class ServerMimeHandler extends GenericSOAPHandler<LogicalMessageContext> +public class ServerMimeHandler extends GenericSOAPHandler<SOAPMessageContext> { private static Logger log = Logger.getLogger(ServerMimeHandler.class); private boolean setCookieOnResponse; @Override - protected boolean handleInbound(MessageContext msgContext) + protected boolean handleInbound(SOAPMessageContext msgContext) { log.info("handleInbound"); // legacy JBossWS-Native approach... - SOAPMessage soapMessage = ((SOAPMessageContext)msgContext).getMessage(); + SOAPMessage soapMessage = msgContext.getMessage(); MimeHeaders mimeHeaders = soapMessage.getMimeHeaders(); String[] cookies = mimeHeaders.getHeader("Cookie"); @@ -76,14 +75,14 @@ @Override - protected boolean handleOutbound(MessageContext msgContext) + protected boolean handleOutbound(SOAPMessageContext msgContext) { log.info("handleOutbound"); if (setCookieOnResponse) { // legacy JBossWS-Native approach - SOAPMessage soapMessage = ((SOAPMessageContext)msgContext).getMessage(); + SOAPMessage soapMessage = msgContext.getMessage(); MimeHeaders mimeHeaders = soapMessage.getMimeHeaders(); mimeHeaders.setHeader("Set-Cookie", "server-cookie=true"); Modified: stack/cxf/trunk/modules/testsuite/shared-tests/src/test/java/org/jboss/test/ws/jaxws/samples/httpbinding/LogicalSourceHandler.java =================================================================== --- stack/cxf/trunk/modules/testsuite/shared-tests/src/test/java/org/jboss/test/ws/jaxws/samples/httpbinding/LogicalSourceHandler.java 2014-05-16 13:59:14 UTC (rev 18668) +++ stack/cxf/trunk/modules/testsuite/shared-tests/src/test/java/org/jboss/test/ws/jaxws/samples/httpbinding/LogicalSourceHandler.java 2014-05-16 14:05:38 UTC (rev 18669) @@ -52,13 +52,13 @@ private static final Logger log = Logger.getLogger(LogicalSourceHandler.class); @Override - public boolean handleOutbound(MessageContext msgContext) + public boolean handleOutbound(LogicalMessageContext msgContext) { return appendHandlerName(msgContext, "Outbound"); } @Override - public boolean handleInbound(MessageContext msgContext) + public boolean handleInbound(LogicalMessageContext msgContext) { return appendHandlerName(msgContext, "Inbound"); } Modified: stack/cxf/trunk/modules/testsuite/shared-tests/src/test/java/org/jboss/test/ws/jaxws/samples/logicalhandler/LogicalJAXBHandler.java =================================================================== --- stack/cxf/trunk/modules/testsuite/shared-tests/src/test/java/org/jboss/test/ws/jaxws/samples/logicalhandler/LogicalJAXBHandler.java 2014-05-16 13:59:14 UTC (rev 18668) +++ stack/cxf/trunk/modules/testsuite/shared-tests/src/test/java/org/jboss/test/ws/jaxws/samples/logicalhandler/LogicalJAXBHandler.java 2014-05-16 14:05:38 UTC (rev 18669) @@ -32,13 +32,13 @@ public class LogicalJAXBHandler extends GenericLogicalHandler<LogicalMessageContext> { @Override - public boolean handleOutbound(MessageContext msgContext) + public boolean handleOutbound(LogicalMessageContext msgContext) { return appendHandlerName(msgContext, "Outbound"); } @Override - public boolean handleInbound(MessageContext msgContext) + public boolean handleInbound(LogicalMessageContext msgContext) { return appendHandlerName(msgContext, "Inbound"); } Modified: stack/cxf/trunk/modules/testsuite/shared-tests/src/test/java/org/jboss/test/ws/jaxws/samples/logicalhandler/LogicalSourceHandler.java =================================================================== --- stack/cxf/trunk/modules/testsuite/shared-tests/src/test/java/org/jboss/test/ws/jaxws/samples/logicalhandler/LogicalSourceHandler.java 2014-05-16 13:59:14 UTC (rev 18668) +++ stack/cxf/trunk/modules/testsuite/shared-tests/src/test/java/org/jboss/test/ws/jaxws/samples/logicalhandler/LogicalSourceHandler.java 2014-05-16 14:05:38 UTC (rev 18669) @@ -52,13 +52,13 @@ private static final Logger log = Logger.getLogger(LogicalSourceHandler.class); @Override - public boolean handleOutbound(MessageContext msgContext) + public boolean handleOutbound(LogicalMessageContext msgContext) { return appendHandlerName(msgContext, "Outbound"); } @Override - public boolean handleInbound(MessageContext msgContext) + public boolean handleInbound(LogicalMessageContext msgContext) { return appendHandlerName(msgContext, "Inbound"); } Modified: stack/cxf/trunk/modules/testsuite/shared-tests/src/test/java/org/jboss/test/ws/jaxws/samples/logicalhandler/PortHandler.java =================================================================== --- stack/cxf/trunk/modules/testsuite/shared-tests/src/test/java/org/jboss/test/ws/jaxws/samples/logicalhandler/PortHandler.java 2014-05-16 13:59:14 UTC (rev 18668) +++ stack/cxf/trunk/modules/testsuite/shared-tests/src/test/java/org/jboss/test/ws/jaxws/samples/logicalhandler/PortHandler.java 2014-05-16 14:05:38 UTC (rev 18669) @@ -27,8 +27,6 @@ import javax.xml.soap.SOAPException; import javax.xml.soap.SOAPMessage; import javax.xml.ws.WebServiceException; -import javax.xml.ws.handler.LogicalMessageContext; -import javax.xml.ws.handler.MessageContext; import javax.xml.ws.handler.soap.SOAPMessageContext; import org.jboss.logging.Logger; @@ -40,28 +38,28 @@ * @author Thomas.Diesler(a)jboss.org * @since 24-Nov-2005 */ -public class PortHandler extends GenericSOAPHandler<LogicalMessageContext> +public class PortHandler extends GenericSOAPHandler<SOAPMessageContext> { // provide logging private static final Logger log = Logger.getLogger(PortHandler.class); @Override - public boolean handleOutbound(MessageContext msgContext) + public boolean handleOutbound(SOAPMessageContext msgContext) { return appendHandlerName(msgContext, "Outbound"); } @Override - public boolean handleInbound(MessageContext msgContext) + public boolean handleInbound(SOAPMessageContext msgContext) { return appendHandlerName(msgContext, "Inbound"); } - private boolean appendHandlerName(MessageContext msgContext, String direction) + private boolean appendHandlerName(SOAPMessageContext msgContext, String direction) { try { - SOAPMessage soapMessage = ((SOAPMessageContext)msgContext).getMessage(); + SOAPMessage soapMessage = msgContext.getMessage(); SOAPElement soapElement = getFirstChildElement(soapMessage.getSOAPBody()); soapElement = getFirstChildElement(soapElement); Modified: stack/cxf/trunk/modules/testsuite/shared-tests/src/test/java/org/jboss/test/ws/jaxws/samples/logicalhandler/ProtocolHandler.java =================================================================== --- stack/cxf/trunk/modules/testsuite/shared-tests/src/test/java/org/jboss/test/ws/jaxws/samples/logicalhandler/ProtocolHandler.java 2014-05-16 13:59:14 UTC (rev 18668) +++ stack/cxf/trunk/modules/testsuite/shared-tests/src/test/java/org/jboss/test/ws/jaxws/samples/logicalhandler/ProtocolHandler.java 2014-05-16 14:05:38 UTC (rev 18669) @@ -25,8 +25,6 @@ import javax.xml.soap.SOAPException; import javax.xml.soap.SOAPMessage; import javax.xml.ws.WebServiceException; -import javax.xml.ws.handler.LogicalMessageContext; -import javax.xml.ws.handler.MessageContext; import javax.xml.ws.handler.soap.SOAPMessageContext; import org.jboss.logging.Logger; @@ -38,28 +36,28 @@ * @author Thomas.Diesler(a)jboss.org * @since 24-Nov-2005 */ -public class ProtocolHandler extends GenericSOAPHandler<LogicalMessageContext> +public class ProtocolHandler extends GenericSOAPHandler<SOAPMessageContext> { // provide logging private static final Logger log = Logger.getLogger(ProtocolHandler.class); @Override - public boolean handleOutbound(MessageContext msgContext) + public boolean handleOutbound(SOAPMessageContext msgContext) { return appendHandlerName(msgContext, "Outbound"); } @Override - public boolean handleInbound(MessageContext msgContext) + public boolean handleInbound(SOAPMessageContext msgContext) { return appendHandlerName(msgContext, "Inbound"); } - private boolean appendHandlerName(MessageContext msgContext, String direction) + private boolean appendHandlerName(SOAPMessageContext msgContext, String direction) { try { - SOAPMessage soapMessage = ((SOAPMessageContext)msgContext).getMessage(); + SOAPMessage soapMessage = msgContext.getMessage(); SOAPElement soapElement = (SOAPElement)soapMessage.getSOAPBody().getChildElements().next(); soapElement = (SOAPElement)soapElement.getChildElements().next(); Modified: stack/cxf/trunk/modules/testsuite/shared-tests/src/test/java/org/jboss/test/ws/jaxws/samples/provider/LogicalSourceHandler.java =================================================================== --- stack/cxf/trunk/modules/testsuite/shared-tests/src/test/java/org/jboss/test/ws/jaxws/samples/provider/LogicalSourceHandler.java 2014-05-16 13:59:14 UTC (rev 18668) +++ stack/cxf/trunk/modules/testsuite/shared-tests/src/test/java/org/jboss/test/ws/jaxws/samples/provider/LogicalSourceHandler.java 2014-05-16 14:05:38 UTC (rev 18669) @@ -52,13 +52,13 @@ private static final Logger log = Logger.getLogger(LogicalSourceHandler.class); @Override - public boolean handleOutbound(MessageContext msgContext) + public boolean handleOutbound(LogicalMessageContext msgContext) { return appendHandlerName(msgContext, "Outbound"); } @Override - public boolean handleInbound(MessageContext msgContext) + public boolean handleInbound(LogicalMessageContext msgContext) { return appendHandlerName(msgContext, "Inbound"); } Modified: stack/cxf/trunk/modules/testsuite/shared-tests/src/test/java/org/jboss/test/ws/jaxws/samples/xop/doclit/MTOMProtocolHandler.java =================================================================== --- stack/cxf/trunk/modules/testsuite/shared-tests/src/test/java/org/jboss/test/ws/jaxws/samples/xop/doclit/MTOMProtocolHandler.java 2014-05-16 13:59:14 UTC (rev 18668) +++ stack/cxf/trunk/modules/testsuite/shared-tests/src/test/java/org/jboss/test/ws/jaxws/samples/xop/doclit/MTOMProtocolHandler.java 2014-05-16 14:05:38 UTC (rev 18669) @@ -26,7 +26,6 @@ import javax.xml.soap.SOAPException; import javax.xml.soap.SOAPMessage; import javax.xml.ws.WebServiceException; -import javax.xml.ws.handler.LogicalMessageContext; import javax.xml.ws.handler.MessageContext; import javax.xml.ws.handler.soap.SOAPMessageContext; @@ -39,17 +38,17 @@ * which means an inlined representation of the binary data. * It checks existence of the xop:Include element. */ -public class MTOMProtocolHandler extends GenericSOAPHandler<LogicalMessageContext> +public class MTOMProtocolHandler extends GenericSOAPHandler<SOAPMessageContext> { @Override - protected boolean handleOutbound(MessageContext msgContext) + protected boolean handleOutbound(SOAPMessageContext msgContext) { return verifyXOPPackage(msgContext); } @Override - protected boolean handleInbound(MessageContext msgContext) + protected boolean handleInbound(SOAPMessageContext msgContext) { return verifyXOPPackage(msgContext); }

9 years, 11 months

1
0
0 / 0

JBossWS SVN: r18668 - in stack/cxf/branches/rsearls: modules/addons and 17 other directories.

by jbossws-commits＠lists.jboss.org

Author: rsearls Date: 2014-05-16 09:59:14 -0400 (Fri, 16 May 2014) New Revision: 18668 Modified: stack/cxf/branches/rsearls/modules/addons/pom.xml stack/cxf/branches/rsearls/modules/addons/transports/http/httpserver/pom.xml stack/cxf/branches/rsearls/modules/addons/transports/http/undertow/pom.xml stack/cxf/branches/rsearls/modules/addons/transports/udp/pom.xml stack/cxf/branches/rsearls/modules/client/pom.xml stack/cxf/branches/rsearls/modules/dist/pom.xml stack/cxf/branches/rsearls/modules/endorsed/pom.xml stack/cxf/branches/rsearls/modules/jaspi/pom.xml stack/cxf/branches/rsearls/modules/resources/pom.xml stack/cxf/branches/rsearls/modules/server/pom.xml stack/cxf/branches/rsearls/modules/server/src/main/java/org/jboss/wsf/stack/cxf/RequestHandlerImpl.java stack/cxf/branches/rsearls/modules/server/src/main/java/org/jboss/wsf/stack/cxf/addressRewrite/SoapAddressRewriteHelper.java stack/cxf/branches/rsearls/modules/testsuite/cxf-spring-tests/pom.xml stack/cxf/branches/rsearls/modules/testsuite/cxf-tests/pom.xml stack/cxf/branches/rsearls/modules/testsuite/pom.xml stack/cxf/branches/rsearls/modules/testsuite/shared-tests/pom.xml stack/cxf/branches/rsearls/modules/testsuite/shared-tests/src/test/java/org/jboss/test/ws/jaxws/jbws2150/JBWS2150TestCaseForked.java stack/cxf/branches/rsearls/modules/testsuite/test-utils/pom.xml stack/cxf/branches/rsearls/pom.xml Log: [JBWS-3750] code changes in server module. Testsuite tailored to run just JBWS2150TestCaseForked Modified: stack/cxf/branches/rsearls/modules/addons/pom.xml =================================================================== --- stack/cxf/branches/rsearls/modules/addons/pom.xml 2014-05-16 13:02:43 UTC (rev 18667) +++ stack/cxf/branches/rsearls/modules/addons/pom.xml 2014-05-16 13:59:14 UTC (rev 18668) @@ -10,7 +10,7 @@ <parent> <groupId>org.jboss.ws.cxf</groupId> <artifactId>jbossws-cxf</artifactId> - <version>4.3.1-SNAPSHOT</version> + <version>4.3.2-SNAPSHOT</version> <relativePath>../../pom.xml</relativePath> </parent> Modified: stack/cxf/branches/rsearls/modules/addons/transports/http/httpserver/pom.xml =================================================================== --- stack/cxf/branches/rsearls/modules/addons/transports/http/httpserver/pom.xml 2014-05-16 13:02:43 UTC (rev 18667) +++ stack/cxf/branches/rsearls/modules/addons/transports/http/httpserver/pom.xml 2014-05-16 13:59:14 UTC (rev 18668) @@ -8,7 +8,7 @@ <parent> <groupId>org.jboss.ws.cxf</groupId> <artifactId>jbossws-cxf-addons</artifactId> - <version>4.3.1-SNAPSHOT</version> + <version>4.3.2-SNAPSHOT</version> <relativePath>../../../pom.xml</relativePath> </parent> Modified: stack/cxf/branches/rsearls/modules/addons/transports/http/undertow/pom.xml =================================================================== --- stack/cxf/branches/rsearls/modules/addons/transports/http/undertow/pom.xml 2014-05-16 13:02:43 UTC (rev 18667) +++ stack/cxf/branches/rsearls/modules/addons/transports/http/undertow/pom.xml 2014-05-16 13:59:14 UTC (rev 18668) @@ -8,7 +8,7 @@ <parent> <groupId>org.jboss.ws.cxf</groupId> <artifactId>jbossws-cxf-addons</artifactId> - <version>4.3.1-SNAPSHOT</version> + <version>4.3.2-SNAPSHOT</version> <relativePath>../../../pom.xml</relativePath> </parent> Modified: stack/cxf/branches/rsearls/modules/addons/transports/udp/pom.xml =================================================================== --- stack/cxf/branches/rsearls/modules/addons/transports/udp/pom.xml 2014-05-16 13:02:43 UTC (rev 18667) +++ stack/cxf/branches/rsearls/modules/addons/transports/udp/pom.xml 2014-05-16 13:59:14 UTC (rev 18668) @@ -8,7 +8,7 @@ <parent> <groupId>org.jboss.ws.cxf</groupId> <artifactId>jbossws-cxf-addons</artifactId> - <version>4.3.1-SNAPSHOT</version> + <version>4.3.2-SNAPSHOT</version> <relativePath>../../pom.xml</relativePath> </parent> Modified: stack/cxf/branches/rsearls/modules/client/pom.xml =================================================================== --- stack/cxf/branches/rsearls/modules/client/pom.xml 2014-05-16 13:02:43 UTC (rev 18667) +++ stack/cxf/branches/rsearls/modules/client/pom.xml 2014-05-16 13:59:14 UTC (rev 18668) @@ -8,7 +8,7 @@ <parent> <groupId>org.jboss.ws.cxf</groupId> <artifactId>jbossws-cxf</artifactId> - <version>4.3.1-SNAPSHOT</version> + <version>4.3.2-SNAPSHOT</version> <relativePath>../../pom.xml</relativePath> </parent> Modified: stack/cxf/branches/rsearls/modules/dist/pom.xml =================================================================== --- stack/cxf/branches/rsearls/modules/dist/pom.xml 2014-05-16 13:02:43 UTC (rev 18667) +++ stack/cxf/branches/rsearls/modules/dist/pom.xml 2014-05-16 13:59:14 UTC (rev 18668) @@ -8,7 +8,7 @@ <parent> <groupId>org.jboss.ws.cxf</groupId> <artifactId>jbossws-cxf</artifactId> - <version>4.3.1-SNAPSHOT</version> + <version>4.3.2-SNAPSHOT</version> <relativePath>../../pom.xml</relativePath> </parent> Modified: stack/cxf/branches/rsearls/modules/endorsed/pom.xml =================================================================== --- stack/cxf/branches/rsearls/modules/endorsed/pom.xml 2014-05-16 13:02:43 UTC (rev 18667) +++ stack/cxf/branches/rsearls/modules/endorsed/pom.xml 2014-05-16 13:59:14 UTC (rev 18668) @@ -9,7 +9,7 @@ <parent> <groupId>org.jboss.ws.cxf</groupId> <artifactId>jbossws-cxf</artifactId> - <version>4.3.1-SNAPSHOT</version> + <version>4.3.2-SNAPSHOT</version> <relativePath>../../pom.xml</relativePath> </parent> Modified: stack/cxf/branches/rsearls/modules/jaspi/pom.xml =================================================================== --- stack/cxf/branches/rsearls/modules/jaspi/pom.xml 2014-05-16 13:02:43 UTC (rev 18667) +++ stack/cxf/branches/rsearls/modules/jaspi/pom.xml 2014-05-16 13:59:14 UTC (rev 18668) @@ -9,7 +9,7 @@ <parent> <groupId>org.jboss.ws.cxf</groupId> <artifactId>jbossws-cxf</artifactId> - <version>4.3.1-SNAPSHOT</version> + <version>4.3.2-SNAPSHOT</version> <relativePath>../../pom.xml</relativePath> </parent> Modified: stack/cxf/branches/rsearls/modules/resources/pom.xml =================================================================== --- stack/cxf/branches/rsearls/modules/resources/pom.xml 2014-05-16 13:02:43 UTC (rev 18667) +++ stack/cxf/branches/rsearls/modules/resources/pom.xml 2014-05-16 13:59:14 UTC (rev 18668) @@ -9,7 +9,7 @@ <parent> <groupId>org.jboss.ws.cxf</groupId> <artifactId>jbossws-cxf</artifactId> - <version>4.3.1-SNAPSHOT</version> + <version>4.3.2-SNAPSHOT</version> <relativePath>../../pom.xml</relativePath> </parent> Modified: stack/cxf/branches/rsearls/modules/server/pom.xml =================================================================== --- stack/cxf/branches/rsearls/modules/server/pom.xml 2014-05-16 13:02:43 UTC (rev 18667) +++ stack/cxf/branches/rsearls/modules/server/pom.xml 2014-05-16 13:59:14 UTC (rev 18668) @@ -9,7 +9,7 @@ <parent> <groupId>org.jboss.ws.cxf</groupId> <artifactId>jbossws-cxf</artifactId> - <version>4.3.1-SNAPSHOT</version> + <version>4.3.2-SNAPSHOT</version> <relativePath>../../pom.xml</relativePath> </parent> Modified: stack/cxf/branches/rsearls/modules/server/src/main/java/org/jboss/wsf/stack/cxf/RequestHandlerImpl.java =================================================================== --- stack/cxf/branches/rsearls/modules/server/src/main/java/org/jboss/wsf/stack/cxf/RequestHandlerImpl.java 2014-05-16 13:02:43 UTC (rev 18667) +++ stack/cxf/branches/rsearls/modules/server/src/main/java/org/jboss/wsf/stack/cxf/RequestHandlerImpl.java 2014-05-16 13:59:14 UTC (rev 18668) @@ -52,6 +52,7 @@ import org.jboss.util.NotImplementedException; import org.jboss.ws.common.management.AbstractServerConfig; import org.jboss.wsf.spi.deployment.Endpoint; +import org.jboss.wsf.spi.deployment.Service; import org.jboss.wsf.spi.invocation.InvocationContext; import org.jboss.wsf.spi.invocation.RequestHandler; import org.jboss.wsf.spi.management.EndpointMetrics; @@ -136,6 +137,27 @@ { throw Messages.MESSAGES.cannotObtainRegistry(DestinationRegistry.class.getName()); } + + //------ rls start + // this substitution enables a AbstractHTTPDestination object to be found. + ServerConfig serverConfig = getServerConfig(); + if(serverConfig.isModifySOAPAddress()) + { + String altContextRoot = serverConfig.getWebServicePath(); + if ((altContextRoot != null && altContextRoot.length() > 0)) + { + //final Service service = dep.getService(); + //service.getContextRoot(); + // TMP USAGE. NEED TO GET context-root from the service obj. + String contextRoot = "/jaxws-jbws2150"; // rls test only + String tmpContextRoot = (altContextRoot.startsWith("/")) ? altContextRoot : "/" + altContextRoot; + String tmpRequestURI = requestURI; + requestURI = tmpRequestURI.replace(contextRoot, tmpContextRoot); + + } + } + //------ rls end + requestURI = pathPattern.matcher(requestURI).replaceAll("/"); //first try looking up the destination in the registry map final AbstractHTTPDestination dest = destRegistry.getDestinationForPath(requestURI, true); Modified: stack/cxf/branches/rsearls/modules/server/src/main/java/org/jboss/wsf/stack/cxf/addressRewrite/SoapAddressRewriteHelper.java =================================================================== --- stack/cxf/branches/rsearls/modules/server/src/main/java/org/jboss/wsf/stack/cxf/addressRewrite/SoapAddressRewriteHelper.java 2014-05-16 13:02:43 UTC (rev 18667) +++ stack/cxf/branches/rsearls/modules/server/src/main/java/org/jboss/wsf/stack/cxf/addressRewrite/SoapAddressRewriteHelper.java 2014-05-16 13:59:14 UTC (rev 18668) @@ -142,6 +142,7 @@ port = ":" + portNo; } } + String urlStr = uriScheme + "://" + host + port + path; ADDRESS_REWRITE_LOGGER.addressRewritten(origAddress, urlStr); return urlStr; @@ -166,4 +167,5 @@ return HTTP; } } + } Modified: stack/cxf/branches/rsearls/modules/testsuite/cxf-spring-tests/pom.xml =================================================================== --- stack/cxf/branches/rsearls/modules/testsuite/cxf-spring-tests/pom.xml 2014-05-16 13:02:43 UTC (rev 18667) +++ stack/cxf/branches/rsearls/modules/testsuite/cxf-spring-tests/pom.xml 2014-05-16 13:59:14 UTC (rev 18668) @@ -10,7 +10,7 @@ <parent> <groupId>org.jboss.ws.cxf</groupId> <artifactId>jbossws-cxf-testsuite</artifactId> - <version>4.3.1-SNAPSHOT</version> + <version>4.3.2-SNAPSHOT</version> <relativePath>../pom.xml</relativePath> </parent> Modified: stack/cxf/branches/rsearls/modules/testsuite/cxf-tests/pom.xml =================================================================== --- stack/cxf/branches/rsearls/modules/testsuite/cxf-tests/pom.xml 2014-05-16 13:02:43 UTC (rev 18667) +++ stack/cxf/branches/rsearls/modules/testsuite/cxf-tests/pom.xml 2014-05-16 13:59:14 UTC (rev 18668) @@ -10,7 +10,7 @@ <parent> <groupId>org.jboss.ws.cxf</groupId> <artifactId>jbossws-cxf-testsuite</artifactId> - <version>4.3.1-SNAPSHOT</version> + <version>4.3.2-SNAPSHOT</version> <relativePath>../pom.xml</relativePath> </parent> Modified: stack/cxf/branches/rsearls/modules/testsuite/pom.xml =================================================================== --- stack/cxf/branches/rsearls/modules/testsuite/pom.xml 2014-05-16 13:02:43 UTC (rev 18667) +++ stack/cxf/branches/rsearls/modules/testsuite/pom.xml 2014-05-16 13:59:14 UTC (rev 18668) @@ -10,7 +10,7 @@ <parent> <groupId>org.jboss.ws.cxf</groupId> <artifactId>jbossws-cxf</artifactId> - <version>4.3.1-SNAPSHOT</version> + <version>4.3.2-SNAPSHOT</version> <relativePath>../../pom.xml</relativePath> </parent> @@ -38,7 +38,9 @@  <modules> <module>test-utils</module> +  <module>shared-tests</module> </modules> @@ -800,6 +802,47 @@  <exclude>org/jboss/test/ws/jaxws/samples/wsse/kerberos/*TestCase*</exclude> + +  + + <exclude>org/jboss/test/ws/jaxws/handlerauth/**</exclude> + <exclude>org/jboss/test/ws/jaxws/jbws1*/**</exclude> + <exclude>org/jboss/test/ws/jaxws/jbws20*/**</exclude> + <exclude>org/jboss/test/ws/jaxws/jbws22*/**</exclude> + <exclude>org/jboss/test/ws/jaxws/jbws24*/**</exclude> + <exclude>org/jboss/test/ws/jaxws/jbws29*/**</exclude> + <exclude>org/jboss/test/ws/jaxws/jbws3*/**</exclude> + <exclude>org/jboss/test/ws/jaxws/smoke/**</exclude> + + <exclude>org/jboss/test/ws/jaxws/handlerscope/**</exclude> + <exclude>org/jboss/test/ws/jaxws/webfault/**</exclude> + <exclude>org/jboss/test/ws/jaxws/a*/**</exclude> + <exclude>org/jboss/test/ws/jaxws/b*/**</exclude> + <exclude>org/jboss/test/ws/jaxws/c*/**</exclude> + <exclude>org/jboss/test/ws/jaxws/h*/**</exclude> + <exclude>org/jboss/test/ws/jaxws/jaxbcust/**</exclude> + <exclude>org/jboss/test/ws/jaxws/w*/**</exclude> + <exclude>org/jboss/test/ws/jaxws/jbws8*/**</exclude> + + <exclude>org/jboss/test/ws/jaxws/jbws9*/**</exclude> + <exclude>org/jboss/test/ws/jaxws/jbws25*/**</exclude> + <exclude>org/jboss/test/ws/jaxws/jbws2957/**</exclude> + <exclude>org/jboss/test/ws/jaxws/e*/**</exclude> + <exclude>org/jboss/test/ws/jaxws/jbws26*/**</exclude> + <exclude>org/jboss/test/ws/jaxws/misc/**</exclude> + <exclude>org/jboss/test/ws/jaxws/jbws27*/**</exclude> + <exclude>org/jboss/test/ws/jaxws/jbws20*/**</exclude> + <exclude>org/jboss/test/ws/jaxws/samples/**</exclude> + <exclude>org/jboss/test/ws/jaxws/namespace/**</exclude> + <exclude>org/jboss/test/ws/jaxws/jbws23*/**</exclude> + <exclude>org/jboss/test/ws/jaxws/jbws2183/**</exclude> + + <exclude>org/jboss/test/ws/appclient/**</exclude> + <exclude>org/jboss/test/ws/jaxrpc/**</exclude> + <exclude>org/jboss/test/ws/management/**</exclude> + <exclude>org/jboss/test/ws/publish/**</exclude> + <exclude>org/jboss/test/ws/saaj/**</exclude> + </excludes> </configuration> </plugin> Modified: stack/cxf/branches/rsearls/modules/testsuite/shared-tests/pom.xml =================================================================== --- stack/cxf/branches/rsearls/modules/testsuite/shared-tests/pom.xml 2014-05-16 13:02:43 UTC (rev 18667) +++ stack/cxf/branches/rsearls/modules/testsuite/shared-tests/pom.xml 2014-05-16 13:59:14 UTC (rev 18668) @@ -10,7 +10,7 @@ <parent> <groupId>org.jboss.ws.cxf</groupId> <artifactId>jbossws-cxf-testsuite</artifactId> - <version>4.3.1-SNAPSHOT</version> + <version>4.3.2-SNAPSHOT</version> <relativePath>../pom.xml</relativePath> </parent> Modified: stack/cxf/branches/rsearls/modules/testsuite/shared-tests/src/test/java/org/jboss/test/ws/jaxws/jbws2150/JBWS2150TestCaseForked.java =================================================================== --- stack/cxf/branches/rsearls/modules/testsuite/shared-tests/src/test/java/org/jboss/test/ws/jaxws/jbws2150/JBWS2150TestCaseForked.java 2014-05-16 13:02:43 UTC (rev 18667) +++ stack/cxf/branches/rsearls/modules/testsuite/shared-tests/src/test/java/org/jboss/test/ws/jaxws/jbws2150/JBWS2150TestCaseForked.java 2014-05-16 13:59:14 UTC (rev 18668) @@ -21,6 +21,7 @@ */ package org.jboss.test.ws.jaxws.jbws2150; +import java.io.File; import java.net.URL; import java.util.Collection; import java.util.HashMap; @@ -524,8 +525,82 @@ undeploy("jaxws-jbws2150-codefirst.war"); } } - - private void checkWsdlAndInvokeCodeFirstEndpoint(String testHost, String expectedWsdlHost, boolean setTargetAddress) throws Exception { + + + /** + * Test soap:address replacement of path in URI. + * + * @throws Exception + */ + public void testWebServicePath() throws Exception + { + try + { + setModifySOAPAddress (true); + setWebServicePath("xx-jaxws-jbws2150"); + deploy("jaxws-jbws2150.war"); + + //--- + final String serverHost = getServerHost(); + final QName serviceName = new QName(NAMESPACE, "ValidURLService"); + final URL wsdlURL = new URL("http://" + serverHost + ":8080/jaxws-jbws2150/ValidURL?wsdl"); + Service service = Service.create(wsdlURL, serviceName); + URL tmpURL = service.getWSDLDocumentLocation(); + + //--- + /* + final Map<String, String> wsdlLocationsMap = new HashMap<String, String>(); + final String serverHost = getServerHost(); + wsdlLocationsMap.put("http://" + serverHost + ":8080/xx-jaxws-jbws2150/ValidURL?wsdl", getWebServiceHost()); + //wsdlLocationsMap.put("http://" + serverHost + ":8080/jaxws-jbws2150/InvalidURL?wsdl", getWebServiceHost()); + //wsdlLocationsMap.put("http://" + serverHost + ":8080/jaxws-jbws2150/ValidSecureURL?wsdl", getWebServiceHost()); + //wsdlLocationsMap.put("http://" + serverHost + ":8080/jaxws-jbws2150/InvalidSecureURL?wsdl", getWebServiceHost()); + if (isTestsuiteServerHostLocalhost()) { + wsdlLocationsMap.put("http://127.0.0.1:8080/jaxws-jbws2150/ValidURL?wsdl", getWebServiceHost()); + //wsdlLocationsMap.put("http://127.0.0.1:8080/jaxws-jbws2150/InvalidURL?wsdl", getWebServiceHost()); + //wsdlLocationsMap.put("http://127.0.0.1:8080/xx-jaxws-jbws2150/ValidSecureURL?wsdl", getWebServiceHost()); + //wsdlLocationsMap.put("http://127.0.0.1:8080/jaxws-jbws2150/InvalidSecureURL?wsdl", getWebServiceHost()); + } + + for (Entry<String, String> entry : wsdlLocationsMap.entrySet()) { + String wsdlLocation = entry.getKey(); + String host = entry.getValue(); + Definition definition = getWSDLDefinition(wsdlLocation); + + String address = getPortAddress(definition, "ValidURLService", "ValidURLPort"); + assertEquals("http://" + host + ":8080/jaxws-jbws2150/ValidURL", address); + //avoid invoking on https endpoints as that would require getting the imported wsdl using https... + if (!wsdlLocation.contains("Secure")) { + ServiceIface endpoint = getEndpoint(wsdlLocation, "ValidURLService"); + assertEquals(endpoint.echo("hello"), "hello"); + } + + address = getPortAddress(definition, "InvalidURLService", "InvalidURLPort"); + assertEquals("http://" + host + ":8080/jaxws-jbws2150/InvalidURL", address); + // if (!wsdlLocation.contains("Secure")) { + // ServiceIface endpoint = getEndpoint(wsdlLocation, "InvalidURLService"); + // assertEquals(endpoint.echo("hello"), "hello"); + // } + + address = getPortAddress(definition, "ValidSecureURLService", "ValidSecureURLPort"); + assertEquals("https://" + host + ":8443/jaxws-jbws2150/ValidSecureURL", address); + + // address = getPortAddress(definition, "InvalidSecureURLService", "InvalidSecureURLPort"); + // assertEquals("https://" + host + ":8443/jaxws-jbws2150/InvalidSecureURL", address); + } + */ + } catch (Exception e) { // rls added + e.printStackTrace(); // rls added + } // rls added + + finally + { + undeploy("jaxws-jbws2150.war"); + setWebServicePath(null); + } + } + + private void checkWsdlAndInvokeCodeFirstEndpoint(String testHost, String expectedWsdlHost, boolean setTargetAddress) throws Exception { final String addr = "http://" + testHost + ":8080/jaxws-jbws2150-codefirst/CodeFirstService"; final String wsdlLocation = addr + "?wsdl"; @@ -556,7 +631,13 @@ getServer().setAttribute(SERVER_CONFIG_OBJECT_NAME, attr); } - private ServiceIface getEndpoint(String wsdlLocation, String serviceName) throws Exception + private void setWebServicePath(String value) throws Exception + { + Attribute attr = new Attribute("WebServicePath", value); + getServer().setAttribute(SERVER_CONFIG_OBJECT_NAME, attr); + } + + private ServiceIface getEndpoint(String wsdlLocation, String serviceName) throws Exception { List<WebServiceFeature> features = new LinkedList<WebServiceFeature>(); if (isIntegrationCXF()) { @@ -581,6 +662,7 @@ wsdlReader.setFeature("javax.wsdl.verbose", false); Definition definition = wsdlReader.readWSDL(null, wsdlLocation); + Map services = definition.getServices(); return definition; } Modified: stack/cxf/branches/rsearls/modules/testsuite/test-utils/pom.xml =================================================================== --- stack/cxf/branches/rsearls/modules/testsuite/test-utils/pom.xml 2014-05-16 13:02:43 UTC (rev 18667) +++ stack/cxf/branches/rsearls/modules/testsuite/test-utils/pom.xml 2014-05-16 13:59:14 UTC (rev 18668) @@ -10,7 +10,7 @@ <parent> <groupId>org.jboss.ws.cxf</groupId> <artifactId>jbossws-cxf-testsuite</artifactId> - <version>4.3.1-SNAPSHOT</version> + <version>4.3.2-SNAPSHOT</version> <relativePath>../pom.xml</relativePath> </parent> Modified: stack/cxf/branches/rsearls/pom.xml =================================================================== --- stack/cxf/branches/rsearls/pom.xml 2014-05-16 13:02:43 UTC (rev 18667) +++ stack/cxf/branches/rsearls/pom.xml 2014-05-16 13:59:14 UTC (rev 18668) @@ -32,7 +32,7 @@ <description>JBossWS CXF stack</description> - <version>4.3.1-SNAPSHOT</version> + <version>4.3.2-SNAPSHOT</version>  <parent> @@ -61,11 +61,11 @@  <properties> <jbossws.api.version>1.0.2.Final</jbossws.api.version> - <jbossws.spi.version>2.3.0.Final</jbossws.spi.version> - <jbossws.common.version>2.3.0.Final</jbossws.common.version> + <jbossws.spi.version>2.3.2-SNAPSHOT</jbossws.spi.version> + <jbossws.common.version>2.3.2-SNAPSHOT</jbossws.common.version> <jbossws.common.tools.version>1.2.0.Final</jbossws.common.tools.version> <jbossws.jboss720.version>4.3.0.Final</jbossws.jboss720.version> - <jbossws.wildfly800.version>4.3.0.Final</jbossws.wildfly800.version> + <jbossws.wildfly800.version>4.3.1-SNAPSHOT</jbossws.wildfly800.version> <jbossws.native.version>4.2.0.Final</jbossws.native.version> <jboss720.version>7.2.0.Final</jboss720.version> <wildfly800.version>8.0.0.Final</wildfly800.version>

9 years, 11 months

1
0
0 / 0

JBossWS SVN: r18667 - common/branches/rsearls/src/main/java/org/jboss/ws/common/deployment.

by jbossws-commits＠lists.jboss.org

Author: rsearls Date: 2014-05-16 09:02:43 -0400 (Fri, 16 May 2014) New Revision: 18667 Modified: common/branches/rsearls/src/main/java/org/jboss/ws/common/deployment/EndpointAddressDeploymentAspect.java Log: perform contextRoot substitution Modified: common/branches/rsearls/src/main/java/org/jboss/ws/common/deployment/EndpointAddressDeploymentAspect.java =================================================================== --- common/branches/rsearls/src/main/java/org/jboss/ws/common/deployment/EndpointAddressDeploymentAspect.java 2014-05-16 12:58:13 UTC (rev 18666) +++ common/branches/rsearls/src/main/java/org/jboss/ws/common/deployment/EndpointAddressDeploymentAspect.java 2014-05-16 13:02:43 UTC (rev 18667) @@ -68,6 +68,16 @@ ServerConfig serverConfig = getServerConfig(); port.setServerConfig(serverConfig); String host = serverConfig.getWebServiceHost(); + + if(serverConfig.isModifySOAPAddress()) + { + String altContextRoot = serverConfig.getWebServicePath(); + if ((altContextRoot != null && altContextRoot.length() > 0)) + { + contextRoot = (altContextRoot.startsWith("/")) ? altContextRoot : "/" + altContextRoot; + } + } + Map<String, Endpoint> endpointsMap = new HashMap<String, Endpoint>(); List<Endpoint> deleteList = new LinkedList<Endpoint>(); for (Endpoint ep : service.getEndpoints())

9 years, 11 months

1
0
0 / 0

JBossWS SVN: r18666 - container/wildfly80/branches/rsearls/server-integration/src/main/java/org/jboss/as/webservices/dmr.

by jbossws-commits＠lists.jboss.org

Author: rsearls Date: 2014-05-16 08:58:13 -0400 (Fri, 16 May 2014) New Revision: 18666 Modified: container/wildfly80/branches/rsearls/server-integration/src/main/java/org/jboss/as/webservices/dmr/Attributes.java container/wildfly80/branches/rsearls/server-integration/src/main/java/org/jboss/as/webservices/dmr/WSServerConfigAttributeHandler.java Log: removed a couple of attr for path def and added code to set the attr. Modified: container/wildfly80/branches/rsearls/server-integration/src/main/java/org/jboss/as/webservices/dmr/Attributes.java =================================================================== --- container/wildfly80/branches/rsearls/server-integration/src/main/java/org/jboss/as/webservices/dmr/Attributes.java 2014-05-16 12:41:40 UTC (rev 18665) +++ container/wildfly80/branches/rsearls/server-integration/src/main/java/org/jboss/as/webservices/dmr/Attributes.java 2014-05-16 12:58:13 UTC (rev 18666) @@ -27,7 +27,6 @@ import org.jboss.as.controller.SimpleAttributeDefinition; import org.jboss.as.controller.SimpleAttributeDefinitionBuilder; import org.jboss.as.controller.operations.validation.IntRangeValidator; -import org.jboss.as.controller.operations.validation.StringLengthValidator; import org.jboss.dmr.ModelNode; import org.jboss.dmr.ModelType; @@ -65,9 +64,7 @@ SimpleAttributeDefinition PATH = new SimpleAttributeDefinitionBuilder(Constants.PATH, ModelType.STRING) .setAllowNull(true) - .setMinSize(1) .setAllowExpression(false) - .setValidator(new StringLengthValidator(1, Integer.MAX_VALUE, true, true)) .build(); SimpleAttributeDefinition[] SUBSYSTEM_ATTRIBUTES = {MODIFY_WSDL_ADDRESS, WSDL_HOST, WSDL_PORT, WSDL_SECURE_PORT, PATH}; Modified: container/wildfly80/branches/rsearls/server-integration/src/main/java/org/jboss/as/webservices/dmr/WSServerConfigAttributeHandler.java =================================================================== --- container/wildfly80/branches/rsearls/server-integration/src/main/java/org/jboss/as/webservices/dmr/WSServerConfigAttributeHandler.java 2014-05-16 12:41:40 UTC (rev 18665) +++ container/wildfly80/branches/rsearls/server-integration/src/main/java/org/jboss/as/webservices/dmr/WSServerConfigAttributeHandler.java 2014-05-16 12:58:13 UTC (rev 18666) @@ -21,11 +21,6 @@ */ package org.jboss.as.webservices.dmr; -import static org.jboss.as.webservices.dmr.Constants.MODIFY_WSDL_ADDRESS; -import static org.jboss.as.webservices.dmr.Constants.WSDL_HOST; -import static org.jboss.as.webservices.dmr.Constants.WSDL_PORT; -import static org.jboss.as.webservices.dmr.Constants.WSDL_SECURE_PORT; - import java.net.UnknownHostException; import org.jboss.as.controller.AbstractWriteAttributeHandler; @@ -37,6 +32,8 @@ import org.jboss.as.webservices.util.WSServices; import org.jboss.dmr.ModelNode; +import static org.jboss.as.webservices.dmr.Constants.*; + /** * An AbstractWriteAttributeHandler extension for updating basic WS server config attributes * @@ -107,6 +104,9 @@ } else if (WSDL_SECURE_PORT.equals(attributeName)) { final int securePort = value != null ? Integer.parseInt(value) : -1; config.setWebServiceSecurePort(securePort, isRevert); + } else if (PATH.equals(attributeName)) { + final String path = value != null ? value : null; + config.setWebServicePath(path, isRevert); } else { throw new IllegalArgumentException(attributeName); }

9 years, 11 months

1
0
0 / 0

JBossWS SVN: r18665 - spi/trunk.

by jbossws-commits＠lists.jboss.org

Author: asoldano Date: 2014-05-16 08:41:40 -0400 (Fri, 16 May 2014) New Revision: 18665 Modified: spi/trunk/pom.xml Log: Use latest jbossws-api Modified: spi/trunk/pom.xml =================================================================== --- spi/trunk/pom.xml 2014-05-16 12:40:47 UTC (rev 18664) +++ spi/trunk/pom.xml 2014-05-16 12:41:40 UTC (rev 18665) @@ -25,7 +25,7 @@  <properties> - <jbossws.api.version>1.0.2.Final</jbossws.api.version> + <jbossws.api.version>1.0.3-SNAPSHOT</jbossws.api.version> <jms.api.version>1.0.1.Final</jms.api.version> <jboss-logging.version>3.1.2.GA</jboss-logging.version> <jboss-logging-processor.version>1.0.3.Final</jboss-logging-processor.version>

9 years, 11 months

1
0
0 / 0

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

jbossws-commits May 2014