June 2014 - jbossws-commits - Jboss List Archives

JBossWS SVN: r18713 - stack/cxf/branches/rsearls/modules/testsuite.

by jbossws-commits＠lists.jboss.org

Author: asoldano Date: 2014-06-03 10:54:22 -0400 (Tue, 03 Jun 2014) New Revision: 18713 Modified: stack/cxf/branches/rsearls/modules/testsuite/pom.xml Log: Restoring proper module exclusions; no need to touch them for running a single testcase only, just use a command like: 'mvn -Dwildfly800.home=/dati/wildfly-8.0.0.Final -Pwildfly800,fast -Dtest=JBWS2150TestCaseForked integration-test' Modified: stack/cxf/branches/rsearls/modules/testsuite/pom.xml =================================================================== --- stack/cxf/branches/rsearls/modules/testsuite/pom.xml 2014-06-03 14:40:42 UTC (rev 18712) +++ stack/cxf/branches/rsearls/modules/testsuite/pom.xml 2014-06-03 14:54:22 UTC (rev 18713) @@ -38,9 +38,7 @@  <modules> <module>test-utils</module> -  <module>shared-tests</module> </modules> @@ -802,47 +800,6 @@  <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>

9 years, 10 months

1
0
0 / 0

JBossWS SVN: r18712 - in stack/cxf/branches/rsearls/modules: server/src/main/java/org/jboss/wsf/stack/cxf/addressRewrite and 5 other directories.

by jbossws-commits＠lists.jboss.org

Author: asoldano Date: 2014-06-03 10:40:42 -0400 (Tue, 03 Jun 2014) New Revision: 18712 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/CharMap.java stack/cxf/branches/rsearls/modules/server/src/main/java/org/jboss/wsf/stack/cxf/addressRewrite/SEDProcessor.java stack/cxf/branches/rsearls/modules/server/src/main/java/org/jboss/wsf/stack/cxf/addressRewrite/SedArguments.java 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/deployment/EndpointImpl.java stack/cxf/branches/rsearls/modules/server/src/main/java/org/jboss/wsf/stack/cxf/interceptor/WSDLSoapAddressRewriteInterceptor.java stack/cxf/branches/rsearls/modules/server/src/main/java/org/jboss/wsf/stack/cxf/interceptor/util/WSDLSoapAddressRewriteUtils.java stack/cxf/branches/rsearls/modules/server/src/main/java/org/jboss/wsf/stack/cxf/metadata/MetadataBuilder.java stack/cxf/branches/rsearls/modules/testsuite/shared-tests/src/test/java/org/jboss/test/ws/jaxws/jbws2150/JBWS2150TestCaseForked.java Log: Misc cleanup 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-06-03 10:16:17 UTC (rev 18711) +++ stack/cxf/branches/rsearls/modules/server/src/main/java/org/jboss/wsf/stack/cxf/RequestHandlerImpl.java 2014-06-03 14:40:42 UTC (rev 18712) @@ -52,7 +52,6 @@ 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; @@ -137,7 +136,6 @@ { throw Messages.MESSAGES.cannotObtainRegistry(DestinationRegistry.class.getName()); } - 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/CharMap.java =================================================================== --- stack/cxf/branches/rsearls/modules/server/src/main/java/org/jboss/wsf/stack/cxf/addressRewrite/CharMap.java 2014-06-03 10:16:17 UTC (rev 18711) +++ stack/cxf/branches/rsearls/modules/server/src/main/java/org/jboss/wsf/stack/cxf/addressRewrite/CharMap.java 2014-06-03 14:40:42 UTC (rev 18712) @@ -1,3 +1,24 @@ +/* + * JBoss, Home of Professional Open Source. + * Copyright 2014, Red Hat Middleware LLC, and individual contributors + * as indicated by the @author tags. See the copyright.txt file in the + * distribution for a full listing of individual contributors. + * + * This is free software; you can redistribute it and/or modify it + * under the terms of the GNU Lesser General Public License as + * published by the Free Software Foundation; either version 2.1 of + * the License, or (at your option) any later version. + * + * This software is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this software; if not, write to the Free + * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA + * 02110-1301 USA, or see the FSF site: http://www.fsf.org. + */ package org.jboss.wsf.stack.cxf.addressRewrite; import java.util.HashMap; @@ -8,7 +29,7 @@ * characters are simply kept in a char array. For all other more exotic source * characters, a proper hash map is used to store the mapping. */ -class CharMap { +final class CharMap { private final char[] map = new char[256]; private final Map<Character, Character> extendedMap = new HashMap<Character, Character>(); @@ -31,38 +52,14 @@ add(source, destination); } - /** - * Adds the given source and destination characters to this char map.. If - * the strings do not have the same length, subsequent characters in the - * longer string are ignored. The first mapping is defined as - * {@code source[0] --> destination[0]}, all other mappings in an analogous - * way with matching character indices in the two strings. - * - * @param source - * source characters - * @param destination - * destination characters - * @throws IllegalArgumentException - * if any of the destination characters is the zero character - */ - public void add(String source, String destination) { + private void add(String source, String destination) { final int len = Math.min(source.length(), destination.length()); for (int i = 0; i < len; i++) { add(source.charAt(i), destination.charAt(i)); } } - /** - * Adds the given mapping {@code source --> destination} to this char map. - * - * @param source - * source character - * @param destination - * destination character - * @throws IllegalArgumentException - * if the destination character is the zero character - */ - public void add(char source, char destination) { + private void add(char source, char destination) { if (destination == 0) { throw new IllegalArgumentException("cannot map to zero character"); } Modified: stack/cxf/branches/rsearls/modules/server/src/main/java/org/jboss/wsf/stack/cxf/addressRewrite/SEDProcessor.java =================================================================== --- stack/cxf/branches/rsearls/modules/server/src/main/java/org/jboss/wsf/stack/cxf/addressRewrite/SEDProcessor.java 2014-06-03 10:16:17 UTC (rev 18711) +++ stack/cxf/branches/rsearls/modules/server/src/main/java/org/jboss/wsf/stack/cxf/addressRewrite/SEDProcessor.java 2014-06-03 14:40:42 UTC (rev 18712) @@ -1,3 +1,24 @@ +/* + * JBoss, Home of Professional Open Source. + * Copyright 2014, Red Hat Middleware LLC, and individual contributors + * as indicated by the @author tags. See the copyright.txt file in the + * distribution for a full listing of individual contributors. + * + * This is free software; you can redistribute it and/or modify it + * under the terms of the GNU Lesser General Public License as + * published by the Free Software Foundation; either version 2.1 of + * the License, or (at your option) any later version. + * + * This software is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this software; if not, write to the Free + * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA + * 02110-1301 USA, or see the FSF site: http://www.fsf.org. + */ package org.jboss.wsf.stack.cxf.addressRewrite; import java.util.Arrays; Modified: stack/cxf/branches/rsearls/modules/server/src/main/java/org/jboss/wsf/stack/cxf/addressRewrite/SedArguments.java =================================================================== --- stack/cxf/branches/rsearls/modules/server/src/main/java/org/jboss/wsf/stack/cxf/addressRewrite/SedArguments.java 2014-06-03 10:16:17 UTC (rev 18711) +++ stack/cxf/branches/rsearls/modules/server/src/main/java/org/jboss/wsf/stack/cxf/addressRewrite/SedArguments.java 2014-06-03 14:40:42 UTC (rev 18712) @@ -1,3 +1,24 @@ +/* + * JBoss, Home of Professional Open Source. + * Copyright 2014, Red Hat Middleware LLC, and individual contributors + * as indicated by the @author tags. See the copyright.txt file in the + * distribution for a full listing of individual contributors. + * + * This is free software; you can redistribute it and/or modify it + * under the terms of the GNU Lesser General Public License as + * published by the Free Software Foundation; either version 2.1 of + * the License, or (at your option) any later version. + * + * This software is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this software; if not, write to the Free + * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA + * 02110-1301 USA, or see the FSF site: http://www.fsf.org. + */ package org.jboss.wsf.stack.cxf.addressRewrite; public final class SedArguments @@ -2,39 +23,17 @@ { - private boolean isGlobal = false; - private boolean isIgnoreCase = false; - private boolean isTranslate = false; - private boolean isSubstitute = false; - - // operand: <script> private String script; - private boolean scriptIsSet = false; - - // operand: <regexp> private String regexp; - private boolean regexpIsSet = false; - - // operand: <string1> private String string1; - private boolean string1IsSet = false; - - // operand: <replacement> private String replacement; - private boolean replacementIsSet = false; - - // operand: <string2> private String string2; - private boolean string2IsSet = false; - - // operand: <occurrence> private int[] occurrence; - private boolean occurrenceIsSet = false; 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-06-03 10:16:17 UTC (rev 18711) +++ stack/cxf/branches/rsearls/modules/server/src/main/java/org/jboss/wsf/stack/cxf/addressRewrite/SoapAddressRewriteHelper.java 2014-06-03 14:40:42 UTC (rev 18712) @@ -25,7 +25,6 @@ import java.net.URI; import java.net.URL; -import org.apache.cxf.common.util.StringUtils; import org.jboss.wsf.spi.management.ServerConfig; @@ -33,6 +32,7 @@ * Helper for rewriting soap:address in published wsdl * * @author alessio.soldano(a)jboss.com + * @author rsears(a)redhat.com * @since 30-Nov-2012 */ public class SoapAddressRewriteHelper @@ -48,7 +48,7 @@ * @param serverConfig The current ServerConfig * @return The rewritten soap:address to be used in the wsdl */ - public static String getRewrittenPublishedEndpointUrl(String wsdlAddress, String epAddress, ServerConfig serverConfig, String contextRoot) { + public static String getRewrittenPublishedEndpointUrl(String wsdlAddress, String epAddress, ServerConfig serverConfig) { if (wsdlAddress == null) { return null; } @@ -57,7 +57,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, serverConfig.getWebServicePathRewriteRule(), contextRoot); + return rewriteSoapAddress(serverConfig, wsdlAddress, epAddress, uriScheme); } else { @@ -65,6 +65,41 @@ } } + /** + * Rewrite and get address to be used for CXF published endpoint url prop (rewritten wsdl address). + * This method is to be used for code-first endpoints, when no wsdl is provided by the user. + * + * @param address The container computed endpoint address + * @param serverConfig The current ServerConfig + * @return + */ + public static String getRewrittenPublishedEndpointUrl(String address, ServerConfig serverConfig) + { + try + { + if (isPathRewriteRequired(serverConfig)) + { + final URL url = new URL(address); + final String path = url.getPath(); + final String tmpPath = SEDProcessor.newInstance(serverConfig.getWebServicePathRewriteRule()).processLine(path); + final String newUrl=url.toString().replace(path, tmpPath); + + ADDRESS_REWRITE_LOGGER.addressRewritten(address, newUrl); + return newUrl; + } + else + { + ADDRESS_REWRITE_LOGGER.rewriteNotRequired(address); + return address; + } + } + catch (Exception e) + { + ADDRESS_REWRITE_LOGGER.invalidAddressProvidedUseItWithoutRewriting(address, ""); + return address; + } + } + public static boolean isAutoRewriteOn(ServerConfig serverConfig) { return serverConfig.isModifySOAPAddress() && ServerConfig.UNDEFINED_HOSTNAME.equals(serverConfig.getWebServiceHost()); @@ -119,7 +154,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, String additionalCcontext, String contextRoot) + private static String rewriteSoapAddress(ServerConfig serverConfig, String origAddress, String newAddress, String uriScheme) { try { @@ -148,11 +183,11 @@ sb.append("://"); sb.append(host); sb.append(port); - // replace original context-root with replacement context - if (additionalCcontext != null && additionalCcontext.length() > 0) { - String tmpPath = SEDProcessor.newInstance(additionalCcontext).processLine(path); - sb.append(tmpPath); - } else + + if (isPathRewriteRequired(serverConfig)) { + sb.append(SEDProcessor.newInstance(serverConfig.getWebServicePathRewriteRule()).processLine(path)); + } + else { sb.append(path); } @@ -183,34 +218,11 @@ } - public static String rewriteSoapAddress(ServerConfig serverConfig, String address) - { - try - { - final String additionalCcontext = serverConfig.getWebServicePathRewriteRule(); - if (isSoapAddressRewrite(serverConfig)) - { - final URL url = new URL(address); - final String path = url.getPath(); - final String tmpPath = SEDProcessor.newInstance(additionalCcontext).processLine(path); - final String newUrl=url.toString().replace(path, tmpPath); - - ADDRESS_REWRITE_LOGGER.addressRewritten(address, newUrl); - return newUrl; - } else - { - ADDRESS_REWRITE_LOGGER.rewriteNotRequired(address); - return address; - } - - } catch (Exception e) - { - ADDRESS_REWRITE_LOGGER.invalidAddressProvidedUseItWithoutRewriting(address, ""); - return address; + public static boolean isPathRewriteRequired(ServerConfig sc){ + if (!sc.isModifySOAPAddress()) { + return false; } + final String pathRewriteRule = sc.getWebServicePathRewriteRule(); + return pathRewriteRule != null && !pathRewriteRule.isEmpty(); } - - public static boolean isSoapAddressRewrite(ServerConfig sc){ - return (sc.isModifySOAPAddress() && !StringUtils.isEmpty(sc.getWebServicePathRewriteRule())); - } } Modified: stack/cxf/branches/rsearls/modules/server/src/main/java/org/jboss/wsf/stack/cxf/deployment/EndpointImpl.java =================================================================== --- stack/cxf/branches/rsearls/modules/server/src/main/java/org/jboss/wsf/stack/cxf/deployment/EndpointImpl.java 2014-06-03 10:16:17 UTC (rev 18711) +++ stack/cxf/branches/rsearls/modules/server/src/main/java/org/jboss/wsf/stack/cxf/deployment/EndpointImpl.java 2014-06-03 14:40:42 UTC (rev 18712) @@ -1,6 +1,6 @@ /* * JBoss, Home of Professional Open Source. - * Copyright 2011, Red Hat Middleware LLC, and individual contributors + * Copyright 2014, Red Hat Middleware LLC, and individual contributors * as indicated by the @author tags. See the copyright.txt file in the * distribution for a full listing of individual contributors. * @@ -21,9 +21,19 @@ */ package org.jboss.wsf.stack.cxf.deployment; +import java.io.IOException; +import java.security.AccessController; +import java.util.Collection; +import java.util.HashMap; +import java.util.List; +import java.util.Map; + +import javax.xml.namespace.QName; + import org.apache.cxf.Bus; import org.apache.cxf.configuration.Configurer; import org.apache.cxf.endpoint.Endpoint; +import org.apache.cxf.frontend.WSDLGetInterceptor; import org.apache.cxf.frontend.WSDLGetUtils; import org.apache.cxf.interceptor.Interceptor; import org.apache.cxf.jaxws.support.JaxWsImplementorInfo; @@ -38,13 +48,6 @@ import org.jboss.wsf.stack.cxf.Loggers; import org.jboss.wsf.stack.cxf.addressRewrite.SoapAddressRewriteHelper; import org.jboss.wsf.stack.cxf.interceptor.WSDLSoapAddressRewriteInterceptor; -import javax.xml.namespace.QName; -import java.io.IOException; -import java.security.AccessController; -import java.util.Collection; -import java.util.HashMap; -import java.util.List; -import java.util.Map; /** @@ -78,7 +81,7 @@ // A custom interceptor is required when the server config attributes for rewriting // the path in a WSDL URL (i.e., <soap:address location= ...) are set - setCustomInterceptor(); + replaceWSDLGetInterceptor(); //allow for configuration so that the wsdlPublisher can be set be the JBossWSCXFConfigurer configureObject(this); @@ -88,16 +91,14 @@ } /** - * A custom interceptor is required when the server config attributes for rewriting - * the path in a WSDL URL (i.e., <soap:address location= ...) are set + * Replaces the WSDLGetInInterceptor with a custom interceptor that also does proper soap:address rewrite */ - private void setCustomInterceptor(){ - if (SoapAddressRewriteHelper.isSoapAddressRewrite(getServerConfig())) { - Collection<Endpoint> epList = super.getService().getEndpoints().values(); - for (Endpoint ep : epList) { - List<Interceptor<? extends Message>> inList = ep.getInInterceptors(); - for (Interceptor in : inList) { - if (in instanceof org.apache.cxf.frontend.WSDLGetInterceptor) { + private void replaceWSDLGetInterceptor(){ + if (SoapAddressRewriteHelper.isPathRewriteRequired(getServerConfig())) { + for (Endpoint ep : getService().getEndpoints().values()) { + final List<Interceptor<? extends Message>> inList = ep.getInInterceptors(); + for (Interceptor<? extends Message> in : inList) { + if (in instanceof WSDLGetInterceptor) { int index = inList.indexOf(in); if (index > -1) { inList.remove(index); @@ -229,7 +230,7 @@ } else { //- wsdl-first handling if (ei.getAddress().contains(ServerConfig.UNDEFINED_HOSTNAME)){ - String epurl = SoapAddressRewriteHelper.rewriteSoapAddress(servConfig, ei.getAddress()); + String epurl = SoapAddressRewriteHelper.getRewrittenPublishedEndpointUrl(ei.getAddress(), servConfig); ei.setAddress(epurl); } } Modified: stack/cxf/branches/rsearls/modules/server/src/main/java/org/jboss/wsf/stack/cxf/interceptor/WSDLSoapAddressRewriteInterceptor.java =================================================================== --- stack/cxf/branches/rsearls/modules/server/src/main/java/org/jboss/wsf/stack/cxf/interceptor/WSDLSoapAddressRewriteInterceptor.java 2014-06-03 10:16:17 UTC (rev 18711) +++ stack/cxf/branches/rsearls/modules/server/src/main/java/org/jboss/wsf/stack/cxf/interceptor/WSDLSoapAddressRewriteInterceptor.java 2014-06-03 14:40:42 UTC (rev 18712) @@ -1,3 +1,24 @@ +/* + * JBoss, Home of Professional Open Source. + * Copyright 2014, Red Hat Middleware LLC, and individual contributors + * as indicated by the @author tags. See the copyright.txt file in the + * distribution for a full listing of individual contributors. + * + * This is free software; you can redistribute it and/or modify it + * under the terms of the GNU Lesser General Public License as + * published by the Free Software Foundation; either version 2.1 of + * the License, or (at your option) any later version. + * + * This software is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this software; if not, write to the Free + * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA + * 02110-1301 USA, or see the FSF site: http://www.fsf.org. + */ package org.jboss.wsf.stack.cxf.interceptor; import org.apache.cxf.binding.soap.interceptor.EndpointSelectionInterceptor; @@ -22,7 +43,9 @@ /** * This is a customization of org.apache.cxf.frontend.WSDLGetInterceptor. It * enables the handling of rewriting the path of a URL. - * Date: 5/19/14 + * + * @author rsearls(a)redhat.com + * @since 19-May-2014 */ public class WSDLSoapAddressRewriteInterceptor extends AbstractPhaseInterceptor<Message> { public static final WSDLSoapAddressRewriteInterceptor INSTANCE = Modified: stack/cxf/branches/rsearls/modules/server/src/main/java/org/jboss/wsf/stack/cxf/interceptor/util/WSDLSoapAddressRewriteUtils.java =================================================================== --- stack/cxf/branches/rsearls/modules/server/src/main/java/org/jboss/wsf/stack/cxf/interceptor/util/WSDLSoapAddressRewriteUtils.java 2014-06-03 10:16:17 UTC (rev 18711) +++ stack/cxf/branches/rsearls/modules/server/src/main/java/org/jboss/wsf/stack/cxf/interceptor/util/WSDLSoapAddressRewriteUtils.java 2014-06-03 14:40:42 UTC (rev 18712) @@ -1,5 +1,38 @@ +/* + * JBoss, Home of Professional Open Source. + * Copyright 2014, Red Hat Middleware LLC, and individual contributors + * as indicated by the @author tags. See the copyright.txt file in the + * distribution for a full listing of individual contributors. + * + * This is free software; you can redistribute it and/or modify it + * under the terms of the GNU Lesser General Public License as + * published by the Free Software Foundation; either version 2.1 of + * the License, or (at your option) any later version. + * + * This software is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this software; if not, write to the Free + * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA + * 02110-1301 USA, or see the FSF site: http://www.fsf.org. + */ package org.jboss.wsf.stack.cxf.interceptor.util; +import java.net.URLDecoder; +import java.security.AccessController; +import java.util.HashMap; +import java.util.Map; +import java.util.concurrent.ConcurrentHashMap; +import java.util.logging.Logger; + +import javax.wsdl.Definition; +import javax.wsdl.extensions.schema.SchemaReference; +import javax.wsdl.xml.WSDLWriter; +import javax.xml.transform.dom.DOMSource; + import org.apache.cxf.Bus; import org.apache.cxf.catalog.OASISCatalogManager; import org.apache.cxf.common.logging.LogUtils; @@ -16,29 +49,18 @@ import org.apache.cxf.wsdl11.ServiceWSDLBuilder; import org.jboss.ws.common.management.AbstractServerConfig; import org.jboss.wsf.spi.management.ServerConfig; -import org.jboss.wsf.stack.cxf.addressRewrite.SEDProcessor; import org.jboss.wsf.stack.cxf.addressRewrite.SoapAddressRewriteHelper; import org.jboss.wsf.stack.cxf.interceptor.WSDLSoapAddressRewriteInterceptor; import org.w3c.dom.Document; import org.xml.sax.InputSource; -import javax.wsdl.Definition; -import javax.wsdl.extensions.schema.SchemaReference; -import javax.wsdl.xml.WSDLWriter; -import javax.xml.transform.dom.DOMSource; -import java.net.URL; -import java.net.URLDecoder; -import java.security.AccessController; -import java.util.HashMap; -import java.util.Map; -import java.util.concurrent.ConcurrentHashMap; -import java.util.logging.Logger; -import org.apache.cxf.common.util.StringUtils; - - /** - * User: rsearls - * Date: 5/19/14 + * This is an extension of the org.apache.cxf.frontend.WSDLGetUtils; currently this + * is needed for properly setting the publishedEndpointURL in the code-first scenario + * when a path rewrite rule is specified in the server configuration. + * + * @author rsearls(a)redhat.com + * */ public class WSDLSoapAddressRewriteUtils extends WSDLGetUtils { @@ -141,10 +163,10 @@ base = epurl; } else { // When using replacement path, must set replacement path in the active url. - ServerConfig sc = getServerConfig(); - if (SoapAddressRewriteHelper.isSoapAddressRewrite(getServerConfig()) + final ServerConfig sc = getServerConfig(); + if (SoapAddressRewriteHelper.isPathRewriteRequired(sc) && endpointInfo.getAddress().contains(ServerConfig.UNDEFINED_HOSTNAME)) { - String epurl = SoapAddressRewriteHelper.rewriteSoapAddress(sc, base); + String epurl = SoapAddressRewriteHelper.getRewrittenPublishedEndpointUrl(base, sc); updatePublishedEndpointUrl(epurl, def, endpointInfo.getName()); base = epurl; } @@ -202,20 +224,6 @@ } } - @Override - public void updateWSDLPublishedEndpointAddress(Definition def, EndpointInfo endpointInfo) - { - synchronized (def) { - //writing a def is not threadsafe. Sync on it to make sure - //we don't get any ConcurrentModificationExceptions - if (endpointInfo.getProperty(PUBLISHED_ENDPOINT_URL) != null) { - String epurl = - String.valueOf(endpointInfo.getProperty(PUBLISHED_ENDPOINT_URL)); - updatePublishedEndpointUrl(epurl, def, endpointInfo.getName()); - } - } - } - private static ServerConfig getServerConfig() { if(System.getSecurityManager() == null) { return AbstractServerConfig.getServerIntegrationServerConfig(); Modified: stack/cxf/branches/rsearls/modules/server/src/main/java/org/jboss/wsf/stack/cxf/metadata/MetadataBuilder.java =================================================================== --- stack/cxf/branches/rsearls/modules/server/src/main/java/org/jboss/wsf/stack/cxf/metadata/MetadataBuilder.java 2014-06-03 10:16:17 UTC (rev 18711) +++ stack/cxf/branches/rsearls/modules/server/src/main/java/org/jboss/wsf/stack/cxf/metadata/MetadataBuilder.java 2014-06-03 14:40:42 UTC (rev 18712) @@ -21,6 +21,25 @@ */ package org.jboss.wsf.stack.cxf.metadata; +import static org.jboss.wsf.stack.cxf.Loggers.METADATA_LOGGER; +import static org.jboss.wsf.stack.cxf.Messages.MESSAGES; + +import java.net.URL; +import java.security.AccessController; +import java.util.HashMap; +import java.util.LinkedList; +import java.util.List; +import java.util.Map; +import java.util.Stack; +import java.util.StringTokenizer; + +import javax.jws.WebService; +import javax.xml.namespace.QName; +import javax.xml.ws.BindingType; +import javax.xml.ws.WebServiceProvider; +import javax.xml.ws.soap.MTOM; +import javax.xml.ws.soap.SOAPBinding; + import org.jboss.ws.common.JavaUtils; import org.jboss.ws.common.deployment.SOAPAddressWSDLParser; import org.jboss.ws.common.management.AbstractServerConfig; @@ -40,19 +59,6 @@ import org.jboss.wsf.stack.cxf.metadata.services.DDBeans; import org.jboss.wsf.stack.cxf.metadata.services.DDEndpoint; -import javax.jws.WebService; -import javax.xml.namespace.QName; -import javax.xml.ws.BindingType; -import javax.xml.ws.WebServiceProvider; -import javax.xml.ws.soap.MTOM; -import javax.xml.ws.soap.SOAPBinding; -import java.net.URL; -import java.security.AccessController; -import java.util.*; - -import static org.jboss.wsf.stack.cxf.Loggers.METADATA_LOGGER; -import static org.jboss.wsf.stack.cxf.Messages.MESSAGES; - /** * Builds the DDBeans metadata used for generating the jboss-cxf.xml deployment descriptor * @@ -288,8 +294,7 @@ //do not try rewriting addresses for not-http binding String wsdlAddress = parser.filterSoapAddress(ddep.getServiceName(), ddep.getPortName(), SOAPAddressWSDLParser.SOAP_HTTP_NS); - String rewrittenWsdlAddress = - SoapAddressRewriteHelper.getRewrittenPublishedEndpointUrl(wsdlAddress, ddep.getAddress(), sc, dep.getService().getContextRoot()); + String rewrittenWsdlAddress = SoapAddressRewriteHelper.getRewrittenPublishedEndpointUrl(wsdlAddress, ddep.getAddress(), sc); //If "auto rewrite", leave "publishedEndpointUrl" unset so that CXF does not force host/port values for //wsdl imports and auto-rewrite them too; otherwise set the new address into "publishedEndpointUrl", //which causes CXF to override any address in the published wsdl. @@ -302,9 +307,8 @@ } else { //same comment as above regarding auto rewrite... if (!SoapAddressRewriteHelper.isAutoRewriteOn(sc)) { - //- code-first handling - String base = SoapAddressRewriteHelper.rewriteSoapAddress(sc, ddep.getAddress()); - ddep.setPublishedEndpointUrl(base); //force computed address for code first endpoints + //force computed address for code first endpoints + ddep.setPublishedEndpointUrl(SoapAddressRewriteHelper.getRewrittenPublishedEndpointUrl(ddep.getAddress(), sc)); } } } 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-06-03 10:16:17 UTC (rev 18711) +++ stack/cxf/branches/rsearls/modules/testsuite/shared-tests/src/test/java/org/jboss/test/ws/jaxws/jbws2150/JBWS2150TestCaseForked.java 2014-06-03 14:40:42 UTC (rev 18712) @@ -530,13 +530,14 @@ } /** - * Test soap:address rewrite. The new address contains the webServicePath setting. + * Test soap:address rewrite when a path rewrite rule is specified. + * * @throws Exception */ - public void testRewriteContext() throws Exception + public void testRewriteWithPathRule() throws Exception { setModifySOAPAddress(true); - final String addContext = "xx/jaxws-jbws2150"; + final String expectedContext = "xx/jaxws-jbws2150"; final String sedCmd = "s/jaxws-jbws2150/xx\\/jaxws-jbws2150/g"; setWebServicePathRewriteRule(sedCmd); deploy("jaxws-jbws2150.war"); @@ -554,19 +555,19 @@ Definition definition = getWSDLDefinition(wsdlLocation); String address = getPortAddress(definition, "ValidURLService", "ValidURLPort"); - assertEquals("http://" + serverHost + ":8080/" + addContext + "/ValidURL", address); + assertEquals("http://" + serverHost + ":8080/" + expectedContext + "/ValidURL", address); address = getPortAddress(definition, "InvalidURLService", "InvalidURLPort"); - assertEquals("http://" + serverHost + ":8080/" + addContext + "/InvalidURL", address); + assertEquals("http://" + serverHost + ":8080/" + expectedContext + "/InvalidURL", address); address = getPortAddress(definition, "ValidSecureURLService", "ValidSecureURLPort"); - assertEquals("https://" + serverHost + ":8443/" + addContext + "/ValidSecureURL", address); + assertEquals("https://" + serverHost + ":8443/" + expectedContext + "/ValidSecureURL", address); address = getPortAddress(definition, "InvalidSecureURLService", "InvalidSecureURLPort"); - assertEquals("https://" + serverHost + ":8443/" + addContext + "/InvalidSecureURL", address); + assertEquals("https://" + serverHost + ":8443/" + expectedContext + "/InvalidSecureURL", address); //check wsdl import (which is bound to the endpoint currently serving the wsdl) - assertTrue(getWsdlImportAddress(definition).contains(addContext)); + assertTrue(getWsdlImportAddress(definition).contains(expectedContext)); } } finally @@ -576,14 +577,14 @@ } /** - * Test soap:address rewrite. The new address contains the webServicePath setting. + * Test soap:address rewrite for code-first endpoints when a path rewrite rule is specified * * @throws Exception */ - public void testRewriteCodeFirstContext() throws Exception + public void testRewriteCodeFirstPathRule() throws Exception { setModifySOAPAddress(true); - final String addContext = "xx/jaxws-jbws2150-codefirst"; + final String expectedContext = "xx/jaxws-jbws2150-codefirst"; final String sedCmd = "s/jaxws-jbws2150-codefirst/xx\\/jaxws-jbws2150-codefirst/g"; setWebServicePathRewriteRule(sedCmd); deploy("jaxws-jbws2150-codefirst.war"); @@ -594,7 +595,7 @@ Definition definition = getWSDLDefinition(wsdlLocation); String address = getPortAddress(definition, "CodeFirstService", "CodeFirstPort"); - assertEquals("http://" + serverHost + ":8080/" + addContext +"/CodeFirstService", address); + assertEquals("http://" + serverHost + ":8080/" + expectedContext +"/CodeFirstService", address); } finally { @@ -603,14 +604,15 @@ } /** - * Test soap:address rewrite with code-first endpoint and context set + * Test soap:address rewrite for code-first endpoints when a path rewrite rule is specified and auto-rewrite is on + * (wsdl host prop set to ServerConfig.UNDEFINED_HOSTNAME) * * @throws Exception */ - public void testAutoRewriteCodeFirstContext() throws Exception + public void testAutoRewriteCodeFirstPathRule() throws Exception { setModifySOAPAddress(true); - final String addContext = "xx/jaxws-jbws2150-codefirst"; + final String expectedContext = "xx/jaxws-jbws2150-codefirst"; final String sedCmd = "s/jaxws-jbws2150-codefirst/xx\\/jaxws-jbws2150-codefirst/g"; setWebServicePathRewriteRule(sedCmd); setWebServiceHost(ServerConfig.UNDEFINED_HOSTNAME); @@ -622,11 +624,11 @@ Definition definition = getWSDLDefinition(wsdlLocation); String address = getPortAddress(definition, "CodeFirstService", "CodeFirstPort"); - assertEquals("http://" + serverHost + ":8080/" + addContext +"/CodeFirstService", address); + assertEquals("http://" + serverHost + ":8080/" + expectedContext +"/CodeFirstService", address); if (isTestsuiteServerHostLocalhost()) { definition = getWSDLDefinition("http://127.0.0.1:8080/jaxws-jbws2150-codefirst/CodeFirstService?wsdl"); address = getPortAddress(definition, "CodeFirstService", "CodeFirstPort"); - assertEquals("http://127.0.0.1:8080/" + addContext +"/CodeFirstService", address); + assertEquals("http://127.0.0.1:8080/" + expectedContext +"/CodeFirstService", address); } } finally @@ -636,16 +638,14 @@ } /** - * Test soap:address rewrite with host configured to ServerConfig.UNDEFINED_HOSTNAME and context set - * - * (see MetadataBuilder#processAddressRewrite) + * Test soap:address rewrite with host configured to ServerConfig.UNDEFINED_HOSTNAME and path rewrite rule specified * * @throws Exception */ - public void testAutoRewriteContext() throws Exception + public void testAutoRewritePathRule() throws Exception { setModifySOAPAddress(true); - final String addContext = "xx/jaxws-jbws2150"; + final String expectedContext = "xx/jaxws-jbws2150"; final String sedCmd = "s/jaxws-jbws2150/xx\\/jaxws-jbws2150/g"; setWebServicePathRewriteRule(sedCmd); setWebServiceHost(ServerConfig.UNDEFINED_HOSTNAME); @@ -670,19 +670,19 @@ Definition definition = getWSDLDefinition(wsdlLocation); String address = getPortAddress(definition, "ValidURLService", "ValidURLPort"); - assertEquals("http://" + host + ":8080/" + addContext + "/ValidURL", address); + assertEquals("http://" + host + ":8080/" + expectedContext + "/ValidURL", address); address = getPortAddress(definition, "InvalidURLService", "InvalidURLPort"); - assertEquals("http://" + host + ":8080/" + addContext + "/InvalidURL", address); + assertEquals("http://" + host + ":8080/" + expectedContext + "/InvalidURL", address); address = getPortAddress(definition, "ValidSecureURLService", "ValidSecureURLPort"); - assertEquals("http://" + host + ":8080/" + addContext + "/ValidSecureURL", address); + assertEquals("http://" + host + ":8080/" + expectedContext + "/ValidSecureURL", address); address = getPortAddress(definition, "InvalidSecureURLService", "InvalidSecureURLPort"); - assertEquals("http://" + host + ":8080/" + addContext + "/InvalidSecureURL", address); + assertEquals("http://" + host + ":8080/" + expectedContext + "/InvalidSecureURL", address); //check wsdl import (which is bound to the endpoint currently serving the wsdl) - assertTrue(getWsdlImportAddress(definition).contains(addContext)); + assertTrue(getWsdlImportAddress(definition).contains(expectedContext)); } } finally

9 years, 10 months

1
0
0 / 0

JBossWS SVN: r18711 - in stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/samples/wsse/policy: secconv and 1 other directory.

by jbossws-commits＠lists.jboss.org

Author: jim.ma Date: 2014-06-03 06:16:17 -0400 (Tue, 03 Jun 2014) New Revision: 18711 Modified: stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/samples/wsse/policy/oasis/WSSecurityPolicyExamples21xTestCase.java stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/samples/wsse/policy/oasis/WSSecurityPolicyExamples22xTestCase.java stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/samples/wsse/policy/secconv/SecureConversationTestCase.java Log: [JBWS-3789]:Enable WS-Security streaming (StAX) support for some tests Modified: stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/samples/wsse/policy/oasis/WSSecurityPolicyExamples21xTestCase.java =================================================================== --- stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/samples/wsse/policy/oasis/WSSecurityPolicyExamples21xTestCase.java 2014-06-03 09:12:40 UTC (rev 18710) +++ stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/samples/wsse/policy/oasis/WSSecurityPolicyExamples21xTestCase.java 2014-06-03 10:16:17 UTC (rev 18711) @@ -78,7 +78,7 @@ { Service service = Service.create(new URL(serviceURL + "SecurityService2111?wsdl"), serviceName); ServiceIface proxy = (ServiceIface)service.getPort(new QName(NS, "SecurityService2111Port"), ServiceIface.class); - setupWsse(proxy); + setupWsse(proxy, true); assertTrue(proxy.sayHello().equals("Hello - UsernameToken with plain text password")); } @@ -91,7 +91,7 @@ { Service service = Service.create(new URL(serviceURL + "SecurityService2112?wsdl"), serviceName); ServiceIface proxy = (ServiceIface)service.getPort(new QName(NS, "SecurityService2112Port"), ServiceIface.class); - setupWsse(proxy); + setupWsse(proxy, false); assertTrue(proxy.sayHello().equals("Hello - UsernameToken without password")); } @@ -104,7 +104,7 @@ { Service service = Service.create(new URL(serviceURL + "SecurityService2113?wsdl"), serviceName); ServiceIface proxy = (ServiceIface)service.getPort(new QName(NS, "SecurityService2113Port"), ServiceIface.class); - setupWsse(proxy); + setupWsse(proxy, true); assertTrue(proxy.sayHello().equals("Hello - UsernameToken with timestamp, nonce and password hash")); } @@ -117,7 +117,7 @@ { Service service = Service.create(new URL(serviceURLHttps + "SecurityService2121?wsdl"), serviceName); ServiceIface proxy = (ServiceIface)service.getPort(new QName(NS, "SecurityService2121Port"), ServiceIface.class); - setupWsse(proxy); + setupWsse(proxy, false); assertTrue(proxy.sayHello().equals("Hello - UsernameToken as supporting token")); } @@ -130,7 +130,7 @@ { Service service = Service.create(new URL(serviceURL + "SecurityService213?wsdl"), serviceName); ServiceIface proxy = (ServiceIface)service.getPort(new QName(NS, "SecurityService213Port"), ServiceIface.class); - setupWsse(proxy); + setupWsse(proxy, true); assertTrue(proxy.sayHello().equals("Hello - (WSS 1.0) UsernameToken with Mutual X.509v3 Authentication, Sign, Encrypt")); } @@ -143,11 +143,11 @@ { Service service = Service.create(new URL(serviceURL + "SecurityService214?wsdl"), serviceName); ServiceIface proxy = (ServiceIface)service.getPort(new QName(NS, "SecurityService214Port"), ServiceIface.class); - setupWsse(proxy); + setupWsse(proxy, false); assertTrue(proxy.sayHello().equals("Hello - (WSS 1.1) User Name with Certificates, Sign, Encrypt")); } - private void setupWsse(ServiceIface proxy) + private void setupWsse(ServiceIface proxy, boolean streaming) { ((BindingProvider)proxy).getRequestContext().put(SecurityConstants.USERNAME, "kermit"); ((BindingProvider)proxy).getRequestContext().put(SecurityConstants.CALLBACK_HANDLER, new UsernamePasswordCallback()); @@ -155,5 +155,10 @@ ((BindingProvider)proxy).getRequestContext().put(SecurityConstants.ENCRYPT_PROPERTIES, Thread.currentThread().getContextClassLoader().getResource("META-INF/alice.properties")); ((BindingProvider)proxy).getRequestContext().put(SecurityConstants.SIGNATURE_USERNAME, "alice"); ((BindingProvider)proxy).getRequestContext().put(SecurityConstants.ENCRYPT_USERNAME, "bob"); + if (streaming) + { + ((BindingProvider)proxy).getRequestContext().put(SecurityConstants.ENABLE_STREAMING_SECURITY, "true"); + ((BindingProvider)proxy).getResponseContext().put(SecurityConstants.ENABLE_STREAMING_SECURITY, "true"); + } } } Modified: stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/samples/wsse/policy/oasis/WSSecurityPolicyExamples22xTestCase.java =================================================================== --- stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/samples/wsse/policy/oasis/WSSecurityPolicyExamples22xTestCase.java 2014-06-03 09:12:40 UTC (rev 18710) +++ stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/samples/wsse/policy/oasis/WSSecurityPolicyExamples22xTestCase.java 2014-06-03 10:16:17 UTC (rev 18711) @@ -68,7 +68,7 @@ { Service service = Service.create(new URL(serviceURL + "SecurityService221?wsdl"), serviceName); ServiceIface proxy = (ServiceIface)service.getPort(new QName(NS, "SecurityService221Port"), ServiceIface.class); - setupWsse(proxy); + setupWsse(proxy, true); try { assertTrue(proxy.sayHello().equals("Hello - (WSS1.0) X.509 Certificates, Sign, Encrypt")); } catch (Exception e) { @@ -90,7 +90,7 @@ { Service service = Service.create(new URL(serviceURL + "SecurityService222?wsdl"), serviceName); ServiceIface proxy = (ServiceIface)service.getPort(new QName(NS, "SecurityService222Port"), ServiceIface.class); - setupWsse(proxy); + setupWsse(proxy, true); try { assertTrue(proxy.sayHello().equals("Hello - (WSS1.0) Mutual Authentication with X.509 Certificates, Sign, Encrypt")); } catch (Exception e) { @@ -112,7 +112,7 @@ { Service service = Service.create(new URL(serviceURL + "SecurityService223?wsdl"), serviceName); ServiceIface proxy = (ServiceIface)service.getPort(new QName(NS, "SecurityService223Port"), ServiceIface.class); - setupWsse(proxy); + setupWsse(proxy, true); try { assertTrue(proxy.sayHello().equals("Hello - (WSS1.1) Anonymous with X.509 Certificates, Sign, Encrypt")); } catch (Exception e) { @@ -134,7 +134,7 @@ { Service service = Service.create(new URL(serviceURL + "SecurityService224?wsdl"), serviceName); ServiceIface proxy = (ServiceIface)service.getPort(new QName(NS, "SecurityService224Port"), ServiceIface.class); - setupWsse(proxy); + setupWsse(proxy, false); try { assertTrue(proxy.sayHello().equals("Hello - (WSS1.1) Mutual Authentication with X.509 Certificates, Sign, Encrypt")); } catch (Exception e) { @@ -142,12 +142,17 @@ } } - private void setupWsse(ServiceIface proxy) + private void setupWsse(ServiceIface proxy, boolean streaming) { ((BindingProvider)proxy).getRequestContext().put(SecurityConstants.CALLBACK_HANDLER, new KeystorePasswordCallback()); ((BindingProvider)proxy).getRequestContext().put(SecurityConstants.SIGNATURE_PROPERTIES, Thread.currentThread().getContextClassLoader().getResource("META-INF/alice.properties")); ((BindingProvider)proxy).getRequestContext().put(SecurityConstants.ENCRYPT_PROPERTIES, Thread.currentThread().getContextClassLoader().getResource("META-INF/alice.properties")); ((BindingProvider)proxy).getRequestContext().put(SecurityConstants.SIGNATURE_USERNAME, "alice"); ((BindingProvider)proxy).getRequestContext().put(SecurityConstants.ENCRYPT_USERNAME, "bob"); + if (streaming) + { + ((BindingProvider)proxy).getRequestContext().put(SecurityConstants.ENABLE_STREAMING_SECURITY, "true"); + ((BindingProvider)proxy).getResponseContext().put(SecurityConstants.ENABLE_STREAMING_SECURITY, "true"); + } } } Modified: stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/samples/wsse/policy/secconv/SecureConversationTestCase.java =================================================================== --- stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/samples/wsse/policy/secconv/SecureConversationTestCase.java 2014-06-03 09:12:40 UTC (rev 18710) +++ stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/samples/wsse/policy/secconv/SecureConversationTestCase.java 2014-06-03 10:16:17 UTC (rev 18711) @@ -29,6 +29,7 @@ import junit.framework.Test; +import org.apache.cxf.ws.security.SecurityConstants; import org.jboss.test.ws.jaxws.samples.wsse.policy.basic.KeystorePasswordCallback; import org.jboss.wsf.test.JBossWSCXFTestSetup; import org.jboss.wsf.test.JBossWSTest; @@ -59,17 +60,22 @@ URL wsdlURL = new URL(serviceURL + "?wsdl"); Service service = Service.create(wsdlURL, serviceName); ServiceIface proxy = (ServiceIface)service.getPort(ServiceIface.class); - setupWsse(proxy); + setupWsse(proxy, true); assertTrue(proxy.sayHello().startsWith("Secure Conversation Hello World!")); assertTrue(proxy.sayHello().startsWith("Secure Conversation Hello World!")); } - private void setupWsse(ServiceIface proxy) + private void setupWsse(ServiceIface proxy, boolean streaming) { ((BindingProvider)proxy).getRequestContext().put("ws-security.callback-handler.sct", new KeystorePasswordCallback()); ((BindingProvider)proxy).getRequestContext().put("ws-security.signature.properties.sct", Thread.currentThread().getContextClassLoader().getResource("META-INF/alice.properties")); ((BindingProvider)proxy).getRequestContext().put("ws-security.encryption.properties.sct", Thread.currentThread().getContextClassLoader().getResource("META-INF/alice.properties")); ((BindingProvider)proxy).getRequestContext().put("ws-security.signature.username.sct", "alice"); ((BindingProvider)proxy).getRequestContext().put("ws-security.encryption.username.sct", "bob"); + if (streaming) + { + ((BindingProvider)proxy).getRequestContext().put(SecurityConstants.ENABLE_STREAMING_SECURITY, "true"); + ((BindingProvider)proxy).getResponseContext().put(SecurityConstants.ENABLE_STREAMING_SECURITY, "true"); + } } }

9 years, 10 months

1
0
0 / 0

JBossWS SVN: r18710 - in stack/cxf/trunk/modules: testsuite/shared-tests/src/test/java/org/jboss/test/ws/jaxws/handlerauth and 1 other directory.

by jbossws-commits＠lists.jboss.org

Author: asoldano Date: 2014-06-03 05:12:40 -0400 (Tue, 03 Jun 2014) New Revision: 18710 Modified: stack/cxf/trunk/modules/server/src/main/java/org/jboss/wsf/stack/cxf/interceptor/HandlerAuthInterceptor.java stack/cxf/trunk/modules/testsuite/shared-tests/src/test/java/org/jboss/test/ws/jaxws/handlerauth/HandlerAuthTestCase.java stack/cxf/trunk/modules/testsuite/shared-tests/src/test/java/org/jboss/test/ws/jaxws/handlerauth/LogicalSimpleHandler.java stack/cxf/trunk/modules/testsuite/shared-tests/src/test/java/org/jboss/test/ws/jaxws/handlerauth/SecureEndpoint.java stack/cxf/trunk/modules/testsuite/shared-tests/src/test/java/org/jboss/test/ws/jaxws/handlerauth/SecureEndpointImpl.java stack/cxf/trunk/modules/testsuite/shared-tests/src/test/java/org/jboss/test/ws/jaxws/handlerauth/SecureEndpointImpl2.java stack/cxf/trunk/modules/testsuite/shared-tests/src/test/java/org/jboss/test/ws/jaxws/handlerauth/SecureEndpointImpl3.java stack/cxf/trunk/modules/testsuite/shared-tests/src/test/java/org/jboss/test/ws/jaxws/handlerauth/SimpleHandler.java Log: More on JBWS-3378 Modified: stack/cxf/trunk/modules/server/src/main/java/org/jboss/wsf/stack/cxf/interceptor/HandlerAuthInterceptor.java =================================================================== --- stack/cxf/trunk/modules/server/src/main/java/org/jboss/wsf/stack/cxf/interceptor/HandlerAuthInterceptor.java 2014-06-02 16:53:14 UTC (rev 18709) +++ stack/cxf/trunk/modules/server/src/main/java/org/jboss/wsf/stack/cxf/interceptor/HandlerAuthInterceptor.java 2014-06-03 09:12:40 UTC (rev 18710) @@ -1,6 +1,6 @@ /* * JBoss, Home of Professional Open Source. - * Copyright 2012, Red Hat Middleware LLC, and individual contributors + * Copyright 2014, Red Hat Middleware LLC, and individual contributors * as indicated by the @author tags. See the copyright.txt file in the * distribution for a full listing of individual contributors. * @@ -58,6 +58,8 @@ */ public class HandlerAuthInterceptor extends AbstractPhaseInterceptor<Message> { + private static final String KEY = HandlerAuthInterceptor.class.getName() + ".SECURITY_EXCEPTION"; + public HandlerAuthInterceptor() { super(Phase.PRE_PROTOCOL_FRONTEND); @@ -111,7 +113,25 @@ checkAuthorization(context); return super.invokeProtocolHandlers(requestor, context); } + + @Override + public boolean invokeLogicalHandlersHandleFault(boolean requestor, LogicalMessageContext context) + { + if (context.containsKey(KEY)) { + return true; + } + return super.invokeLogicalHandlersHandleFault(requestor, context); + } + @Override + public boolean invokeProtocolHandlersHandleFault(boolean requestor, MessageContext context) + { + if (context.containsKey(KEY)) { + return true; + } + return super.invokeProtocolHandlersHandleFault(requestor, context); + } + protected void checkAuthorization(MessageContext ctx) { if ((Boolean) ctx.get(MessageContext.MESSAGE_OUTBOUND_PROPERTY)) @@ -149,6 +169,7 @@ } } final Principal p = secCtx.getUserPrincipal(); + ctx.put(KEY, true); throw MESSAGES.authorizationFailed(p != null ? p.getName() : null); } } Modified: stack/cxf/trunk/modules/testsuite/shared-tests/src/test/java/org/jboss/test/ws/jaxws/handlerauth/HandlerAuthTestCase.java =================================================================== --- stack/cxf/trunk/modules/testsuite/shared-tests/src/test/java/org/jboss/test/ws/jaxws/handlerauth/HandlerAuthTestCase.java 2014-06-02 16:53:14 UTC (rev 18709) +++ stack/cxf/trunk/modules/testsuite/shared-tests/src/test/java/org/jboss/test/ws/jaxws/handlerauth/HandlerAuthTestCase.java 2014-06-03 09:12:40 UTC (rev 18710) @@ -74,31 +74,43 @@ SecureEndpoint port = service.getPort(new QName("http://ws/", "SecureEndpoint3Port"), SecureEndpoint.class); setUser((BindingProvider)port, "John", "foo"); int count = port.getHandlerCounter(); + int countOut = port.getHandlerCounterOutbound(); int newCount; + int newCountOut; assertEquals("Hello, Mr. John", port.sayHello("John")); newCount = port.getHandlerCounter(); + newCountOut = port.getHandlerCounterOutbound(); assertEquals(++count, newCount); + assertEquals(++countOut, newCountOut); assertEquals("Bye, Mr. John", port.sayBye("John")); newCount = port.getHandlerCounter(); + newCountOut = port.getHandlerCounterOutbound(); assertEquals(++count, newCount); + assertEquals(++countOut, newCountOut); try { port.deniedMethod(); fail("Exception expected!"); } catch (Exception e) { newCount = port.getHandlerCounter(); + newCountOut = port.getHandlerCounterOutbound(); assertEquals(++count, newCount); //verify count is increased + assertEquals(++countOut, newCountOut); //verify countOut is increased } port.ping(); newCount = port.getHandlerCounter(); + newCountOut = port.getHandlerCounterOutbound(); assertEquals(++count, newCount); + assertEquals(countOut, newCountOut); //verify countOut is not increased (oneway) assertEquals("foo", port.echo("foo")); newCount = port.getHandlerCounter(); + newCountOut = port.getHandlerCounterOutbound(); assertEquals(++count, newCount); + assertEquals(++countOut, newCountOut); //Change user... @@ -106,14 +118,18 @@ assertEquals("Hello, Mr. Bob", port.sayHello("Bob")); newCount = port.getHandlerCounter(); + newCountOut = port.getHandlerCounterOutbound(); assertEquals(++count, newCount); + assertEquals(++countOut, newCountOut); try { port.sayBye("Bob"); fail("Exception expected!"); } catch (Exception e) { newCount = port.getHandlerCounter(); + newCountOut = port.getHandlerCounterOutbound(); assertEquals(++count, newCount); //verify count is increased + assertEquals(++countOut, newCountOut); //verify countOut is increased } try { @@ -121,27 +137,37 @@ fail("Exception expected!"); } catch (Exception e) { newCount = port.getHandlerCounter(); + newCountOut = port.getHandlerCounterOutbound(); assertEquals(++count, newCount); //verify count is increased + assertEquals(++countOut, newCountOut); //verify countOut is increased } assertEquals("foo2", port.echo("foo2")); newCount = port.getHandlerCounter(); + newCountOut = port.getHandlerCounterOutbound(); assertEquals(++count, newCount); + assertEquals(++countOut, newCountOut); } private void testAuth(final SecureEndpoint port) throws Exception { setUser((BindingProvider)port, "John", "foo"); int count = port.getHandlerCounter(); + int countOut = port.getHandlerCounterOutbound(); int newCount; + int newCountOut; assertEquals("Hello, Mr. John", port.sayHello("John")); newCount = port.getHandlerCounter(); + newCountOut = port.getHandlerCounterOutbound(); assertEquals(++count, newCount); + assertEquals(++countOut, newCountOut); assertEquals("Bye, Mr. John", port.sayBye("John")); newCount = port.getHandlerCounter(); + newCountOut = port.getHandlerCounterOutbound(); assertEquals(++count, newCount); + assertEquals(++countOut, newCountOut); try { port.deniedMethod(); @@ -149,16 +175,22 @@ } catch (Exception e) { assertTrue(e.getMessage().contains("JBWS024094")); newCount = port.getHandlerCounter(); + newCountOut = port.getHandlerCounterOutbound(); assertEquals(count, newCount); //verify count is *not* increased + assertEquals(countOut, newCountOut); //verify countOut is *not* increased } port.ping(); newCount = port.getHandlerCounter(); + newCountOut = port.getHandlerCounterOutbound(); assertEquals(++count, newCount); + assertEquals(countOut, newCountOut); //verify countOut is *not* increased (oneway) assertEquals("foo", port.echo("foo")); newCount = port.getHandlerCounter(); + newCountOut = port.getHandlerCounterOutbound(); assertEquals(++count, newCount); + assertEquals(++countOut, newCountOut); //Change user... @@ -166,7 +198,9 @@ assertEquals("Hello, Mr. Bob", port.sayHello("Bob")); newCount = port.getHandlerCounter(); + newCountOut = port.getHandlerCounterOutbound(); assertEquals(++count, newCount); + assertEquals(++countOut, newCountOut); try { port.sayBye("Bob"); @@ -174,7 +208,9 @@ } catch (Exception e) { assertTrue(e.getMessage().contains("JBWS024094")); newCount = port.getHandlerCounter(); + newCountOut = port.getHandlerCounterOutbound(); assertEquals(count, newCount); //verify count is *not* increased + assertEquals(countOut, newCountOut); //verify countOut is *not* increased } try { @@ -183,7 +219,9 @@ } catch (Exception e) { assertTrue(e.getMessage().contains("JBWS024094")); newCount = port.getHandlerCounter(); + newCountOut = port.getHandlerCounterOutbound(); assertEquals(count, newCount); //verify count is *not* increased + assertEquals(countOut, newCountOut); //verify countOut is *not* increased } try { @@ -191,12 +229,16 @@ } catch (Exception e) { assertTrue(e.getMessage().contains("JBWS024094")); newCount = port.getHandlerCounter(); + newCountOut = port.getHandlerCounterOutbound(); assertEquals(count, newCount); //verify count is *not* increased + assertEquals(countOut, newCountOut); //verify countOut is *not* increased (it's oneway anyway) } assertEquals("foo2", port.echo("foo2")); newCount = port.getHandlerCounter(); + newCountOut = port.getHandlerCounterOutbound(); assertEquals(++count, newCount); + assertEquals(++countOut, newCountOut); } private static void setUser(BindingProvider bp, String username, String password) { Modified: stack/cxf/trunk/modules/testsuite/shared-tests/src/test/java/org/jboss/test/ws/jaxws/handlerauth/LogicalSimpleHandler.java =================================================================== --- stack/cxf/trunk/modules/testsuite/shared-tests/src/test/java/org/jboss/test/ws/jaxws/handlerauth/LogicalSimpleHandler.java 2014-06-02 16:53:14 UTC (rev 18709) +++ stack/cxf/trunk/modules/testsuite/shared-tests/src/test/java/org/jboss/test/ws/jaxws/handlerauth/LogicalSimpleHandler.java 2014-06-03 09:12:40 UTC (rev 18710) @@ -31,14 +31,17 @@ public class LogicalSimpleHandler implements LogicalHandler<LogicalMessageContext> { public static AtomicInteger counter = new AtomicInteger(0); + public static AtomicInteger outboundCounter = new AtomicInteger(0); @Override public boolean handleMessage(LogicalMessageContext context) { Boolean isOutbound = (Boolean) context.get(MessageContext.MESSAGE_OUTBOUND_PROPERTY); String operation = ((QName) context.get(MessageContext.WSDL_OPERATION)).getLocalPart(); - if (!isOutbound && !operation.equals("getHandlerCounter")) { + if (!isOutbound && !operation.startsWith("getHandlerCounter")) { counter.incrementAndGet(); + } else if (isOutbound && !operation.startsWith("getHandlerCounter")) { + outboundCounter.incrementAndGet(); } return true; } @@ -46,6 +49,10 @@ @Override public boolean handleFault(LogicalMessageContext context) { + String operation = ((QName) context.get(MessageContext.WSDL_OPERATION)).getLocalPart(); + if (!operation.startsWith("getHandlerCounter")) { + outboundCounter.incrementAndGet(); + } return true; } Modified: stack/cxf/trunk/modules/testsuite/shared-tests/src/test/java/org/jboss/test/ws/jaxws/handlerauth/SecureEndpoint.java =================================================================== --- stack/cxf/trunk/modules/testsuite/shared-tests/src/test/java/org/jboss/test/ws/jaxws/handlerauth/SecureEndpoint.java 2014-06-02 16:53:14 UTC (rev 18709) +++ stack/cxf/trunk/modules/testsuite/shared-tests/src/test/java/org/jboss/test/ws/jaxws/handlerauth/SecureEndpoint.java 2014-06-03 09:12:40 UTC (rev 18710) @@ -33,6 +33,8 @@ int getHandlerCounter(); + int getHandlerCounterOutbound(); + @Oneway void ping(); Modified: stack/cxf/trunk/modules/testsuite/shared-tests/src/test/java/org/jboss/test/ws/jaxws/handlerauth/SecureEndpointImpl.java =================================================================== --- stack/cxf/trunk/modules/testsuite/shared-tests/src/test/java/org/jboss/test/ws/jaxws/handlerauth/SecureEndpointImpl.java 2014-06-02 16:53:14 UTC (rev 18709) +++ stack/cxf/trunk/modules/testsuite/shared-tests/src/test/java/org/jboss/test/ws/jaxws/handlerauth/SecureEndpointImpl.java 2014-06-03 09:12:40 UTC (rev 18710) @@ -77,8 +77,11 @@ public int getHandlerCounter() { return SimpleHandler.counter.get(); } + + public int getHandlerCounterOutbound() { + return SimpleHandler.outboundCounter.get(); + } - @Oneway @RolesAllowed("friend") public void ping() { Modified: stack/cxf/trunk/modules/testsuite/shared-tests/src/test/java/org/jboss/test/ws/jaxws/handlerauth/SecureEndpointImpl2.java =================================================================== --- stack/cxf/trunk/modules/testsuite/shared-tests/src/test/java/org/jboss/test/ws/jaxws/handlerauth/SecureEndpointImpl2.java 2014-06-02 16:53:14 UTC (rev 18709) +++ stack/cxf/trunk/modules/testsuite/shared-tests/src/test/java/org/jboss/test/ws/jaxws/handlerauth/SecureEndpointImpl2.java 2014-06-03 09:12:40 UTC (rev 18710) @@ -78,6 +78,9 @@ return LogicalSimpleHandler.counter.get(); } + public int getHandlerCounterOutbound() { + return LogicalSimpleHandler.outboundCounter.get(); + } @Oneway @RolesAllowed("friend") Modified: stack/cxf/trunk/modules/testsuite/shared-tests/src/test/java/org/jboss/test/ws/jaxws/handlerauth/SecureEndpointImpl3.java =================================================================== --- stack/cxf/trunk/modules/testsuite/shared-tests/src/test/java/org/jboss/test/ws/jaxws/handlerauth/SecureEndpointImpl3.java 2014-06-02 16:53:14 UTC (rev 18709) +++ stack/cxf/trunk/modules/testsuite/shared-tests/src/test/java/org/jboss/test/ws/jaxws/handlerauth/SecureEndpointImpl3.java 2014-06-03 09:12:40 UTC (rev 18710) @@ -78,6 +78,9 @@ return SimpleHandler.counter.get(); } + public int getHandlerCounterOutbound() { + return SimpleHandler.outboundCounter.get(); + } @Oneway @RolesAllowed("friend") Modified: stack/cxf/trunk/modules/testsuite/shared-tests/src/test/java/org/jboss/test/ws/jaxws/handlerauth/SimpleHandler.java =================================================================== --- stack/cxf/trunk/modules/testsuite/shared-tests/src/test/java/org/jboss/test/ws/jaxws/handlerauth/SimpleHandler.java 2014-06-02 16:53:14 UTC (rev 18709) +++ stack/cxf/trunk/modules/testsuite/shared-tests/src/test/java/org/jboss/test/ws/jaxws/handlerauth/SimpleHandler.java 2014-06-03 09:12:40 UTC (rev 18710) @@ -32,14 +32,17 @@ public class SimpleHandler implements SOAPHandler<SOAPMessageContext> { public static AtomicInteger counter = new AtomicInteger(0); + public static AtomicInteger outboundCounter = new AtomicInteger(0); @Override public boolean handleMessage(SOAPMessageContext context) { Boolean isOutbound = (Boolean) context.get(MessageContext.MESSAGE_OUTBOUND_PROPERTY); String operation = ((QName) context.get(MessageContext.WSDL_OPERATION)).getLocalPart(); - if (!isOutbound && !operation.equals("getHandlerCounter")) { + if (!isOutbound && !operation.startsWith("getHandlerCounter")) { counter.incrementAndGet(); + } else if (isOutbound && !operation.startsWith("getHandlerCounter")) { + outboundCounter.incrementAndGet(); } return true; } @@ -47,6 +50,10 @@ @Override public boolean handleFault(SOAPMessageContext context) { + String operation = ((QName) context.get(MessageContext.WSDL_OPERATION)).getLocalPart(); + if (!operation.startsWith("getHandlerCounter")) { + outboundCounter.incrementAndGet(); + } return true; }

9 years, 10 months

1
0
0 / 0

JBossWS SVN: r18709 - in stack/cxf/branches/rsearls/modules: server/src/main/java/org/jboss/wsf/stack/cxf/interceptor/util and 1 other directories.

by jbossws-commits＠lists.jboss.org

Author: rsearls Date: 2014-06-02 12:53:14 -0400 (Mon, 02 Jun 2014) New Revision: 18709 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/interceptor/util/WSDLSoapAddressRewriteUtils.java stack/cxf/branches/rsearls/modules/testsuite/shared-tests/src/test/java/org/jboss/test/ws/jaxws/jbws2150/JBWS2150TestCaseForked.java Log: webservicePath attr revised webServicePathRewriteRule 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-06-02 15:43:58 UTC (rev 18708) +++ stack/cxf/branches/rsearls/modules/server/src/main/java/org/jboss/wsf/stack/cxf/addressRewrite/SoapAddressRewriteHelper.java 2014-06-02 16:53:14 UTC (rev 18709) @@ -57,7 +57,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, serverConfig.getWebServicePath(), contextRoot); + return rewriteSoapAddress(serverConfig, wsdlAddress, epAddress, uriScheme, serverConfig.getWebServicePathRewriteRule(), contextRoot); } else { @@ -187,7 +187,7 @@ { try { - final String additionalCcontext = serverConfig.getWebServicePath(); + final String additionalCcontext = serverConfig.getWebServicePathRewriteRule(); if (isSoapAddressRewrite(serverConfig)) { final URL url = new URL(address); @@ -211,6 +211,6 @@ } public static boolean isSoapAddressRewrite(ServerConfig sc){ - return (sc.isModifySOAPAddress() && !StringUtils.isEmpty(sc.getWebServicePath())); + return (sc.isModifySOAPAddress() && !StringUtils.isEmpty(sc.getWebServicePathRewriteRule())); } } Modified: stack/cxf/branches/rsearls/modules/server/src/main/java/org/jboss/wsf/stack/cxf/interceptor/util/WSDLSoapAddressRewriteUtils.java =================================================================== --- stack/cxf/branches/rsearls/modules/server/src/main/java/org/jboss/wsf/stack/cxf/interceptor/util/WSDLSoapAddressRewriteUtils.java 2014-06-02 15:43:58 UTC (rev 18708) +++ stack/cxf/branches/rsearls/modules/server/src/main/java/org/jboss/wsf/stack/cxf/interceptor/util/WSDLSoapAddressRewriteUtils.java 2014-06-02 16:53:14 UTC (rev 18709) @@ -213,26 +213,6 @@ String.valueOf(endpointInfo.getProperty(PUBLISHED_ENDPOINT_URL)); updatePublishedEndpointUrl(epurl, def, endpointInfo.getName()); } - /** rls test else { - // When using replacement path must set replacement path in active url. - ServerConfig sc = getServerConfig(); - if (sc.isModifySOAPAddress() && !StringUtils.isEmpty(sc.getWebServicePath() - && endpointInfo.getAddress().contains(ServerConfig.UNDEFINED_HOSTNAME)) { - try { - String base = endpointInfo.getAddress(); - URL baseUrl = new URL(base); - //String tmpPath = Unix4j.builder().echo(baseUrl.getPath()).sed(sc.getWebServicePath()).toStringResult(); - String tmpPath = SEDProcessor.newInstance(sc.getWebServicePath()).processLine(baseUrl.getPath()); - String epurl = base.replace(baseUrl.getPath(), tmpPath); - updatePublishedEndpointUrl(epurl, def, endpointInfo.getName()); - //base = epurl; - } catch (Exception e){ - // TODO fix - LOG.info(e.toString()); - } - } - } - **/ } } 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-06-02 15:43:58 UTC (rev 18708) +++ stack/cxf/branches/rsearls/modules/testsuite/shared-tests/src/test/java/org/jboss/test/ws/jaxws/jbws2150/JBWS2150TestCaseForked.java 2014-06-02 16:53:14 UTC (rev 18709) @@ -84,7 +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"); + webServicePath = (String)getServer().getAttribute(SERVER_CONFIG_OBJECT_NAME, "WebServicePathRewriteRule"); super.setUp(); } } @@ -100,7 +100,7 @@ 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); + attr = new Attribute("WebServicePathRewriteRule", JBWS2150TestSetup.webServicePath); getServer().setAttribute(SERVER_CONFIG_OBJECT_NAME, attr); } @@ -538,7 +538,7 @@ setModifySOAPAddress(true); final String addContext = "xx/jaxws-jbws2150"; final String sedCmd = "s/jaxws-jbws2150/xx\\/jaxws-jbws2150/g"; - setWebServicePath(sedCmd); + setWebServicePathRewriteRule(sedCmd); deploy("jaxws-jbws2150.war"); try { @@ -585,7 +585,7 @@ setModifySOAPAddress(true); final String addContext = "xx/jaxws-jbws2150-codefirst"; final String sedCmd = "s/jaxws-jbws2150-codefirst/xx\\/jaxws-jbws2150-codefirst/g"; - setWebServicePath(sedCmd); + setWebServicePathRewriteRule(sedCmd); deploy("jaxws-jbws2150-codefirst.war"); try { @@ -612,7 +612,7 @@ setModifySOAPAddress(true); final String addContext = "xx/jaxws-jbws2150-codefirst"; final String sedCmd = "s/jaxws-jbws2150-codefirst/xx\\/jaxws-jbws2150-codefirst/g"; - setWebServicePath(sedCmd); + setWebServicePathRewriteRule(sedCmd); setWebServiceHost(ServerConfig.UNDEFINED_HOSTNAME); deploy("jaxws-jbws2150-codefirst.war"); try @@ -647,7 +647,7 @@ setModifySOAPAddress(true); final String addContext = "xx/jaxws-jbws2150"; final String sedCmd = "s/jaxws-jbws2150/xx\\/jaxws-jbws2150/g"; - setWebServicePath(sedCmd); + setWebServicePathRewriteRule(sedCmd); setWebServiceHost(ServerConfig.UNDEFINED_HOSTNAME); deploy("jaxws-jbws2150.war"); try @@ -722,9 +722,9 @@ getServer().setAttribute(SERVER_CONFIG_OBJECT_NAME, attr); } - private void setWebServicePath(String value) throws Exception + private void setWebServicePathRewriteRule(String value) throws Exception { - Attribute attr = new Attribute("WebServicePath", value); + Attribute attr = new Attribute("WebServicePathRewriteRule", value); getServer().setAttribute(SERVER_CONFIG_OBJECT_NAME, attr); }

9 years, 10 months

1
0
0 / 0

JBossWS SVN: r18708 - in container/wildfly80/branches/rsearls/server-integration/src: main/java/org/jboss/as/webservices/dmr and 1 other directories.

by jbossws-commits＠lists.jboss.org

Author: rsearls Date: 2014-06-02 11:43:58 -0400 (Mon, 02 Jun 2014) New Revision: 18708 Modified: container/wildfly80/branches/rsearls/server-integration/src/main/java/org/jboss/as/webservices/config/ServerConfigImpl.java 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/Constants.java container/wildfly80/branches/rsearls/server-integration/src/main/java/org/jboss/as/webservices/dmr/Element.java 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/WSSubsystemAdd.java container/wildfly80/branches/rsearls/server-integration/src/main/java/org/jboss/as/webservices/dmr/WSSubsystemReader.java container/wildfly80/branches/rsearls/server-integration/src/test/java/org/jboss/as/webservices/config/ServerConfigImplTestCase.java Log: webservicePath attr revised webServicePathRewriteRule Modified: container/wildfly80/branches/rsearls/server-integration/src/main/java/org/jboss/as/webservices/config/ServerConfigImpl.java =================================================================== --- container/wildfly80/branches/rsearls/server-integration/src/main/java/org/jboss/as/webservices/config/ServerConfigImpl.java 2014-06-02 15:43:33 UTC (rev 18707) +++ container/wildfly80/branches/rsearls/server-integration/src/main/java/org/jboss/as/webservices/config/ServerConfigImpl.java 2014-06-02 15:43:58 UTC (rev 18708) @@ -52,7 +52,7 @@ private final DMRSynchCheckHandler webServicePortUCH = new DMRSynchCheckHandler(); private final DMRSynchCheckHandler webServiceSecurePortUCH = new DMRSynchCheckHandler(); private final DMRSynchCheckHandler modifySOAPAddressUCH = new DMRSynchCheckHandler(); - private final DMRSynchCheckHandler webServicePathUCH = new DMRSynchCheckHandler(); + private final DMRSynchCheckHandler webServicePathRewriteRuleUCH = new DMRSynchCheckHandler(); private ServerConfigImpl() { // forbidden inheritance @@ -66,7 +66,7 @@ webServicePortUCH.reset(); webServiceSecurePortUCH.reset(); modifySOAPAddressUCH.reset(); - webServicePathUCH.reset(); + webServicePathRewriteRuleUCH.reset(); } public void incrementWSDeploymentCount() { @@ -91,13 +91,13 @@ setWebServiceHost(host, webServiceHostUCH); } - public void setWebServicePath(String path, boolean forceUpdate) { - setWebServicePath(path, forceUpdate ? null : webServicePathUCH); + public void setWebServicePathRewriteRule(String path, boolean forceUpdate) { + setWebServicePathRewriteRule(path, forceUpdate ? null : webServicePathRewriteRuleUCH); } @Override - public void setWebServicePath(String path) { - setWebServicePath(path, webServicePathUCH); + public void setWebServicePathRewriteRule(String path) { + setWebServicePathRewriteRule(path, webServicePathRewriteRuleUCH); } public void setWebServicePort(int port, boolean forceUpdate) { 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-06-02 15:43:33 UTC (rev 18707) +++ container/wildfly80/branches/rsearls/server-integration/src/main/java/org/jboss/as/webservices/dmr/Attributes.java 2014-06-02 15:43:58 UTC (rev 18708) @@ -62,12 +62,12 @@ .setAllowExpression(true) .build(); - SimpleAttributeDefinition PATH = new SimpleAttributeDefinitionBuilder(Constants.PATH, ModelType.STRING) + SimpleAttributeDefinition WSDL_PATH_REWRITE_RULE = new SimpleAttributeDefinitionBuilder(Constants.WSDL_PATH_REWRITE_RULE, ModelType.STRING) .setAllowNull(true) .setAllowExpression(false) .build(); - SimpleAttributeDefinition[] SUBSYSTEM_ATTRIBUTES = {MODIFY_WSDL_ADDRESS, WSDL_HOST, WSDL_PORT, WSDL_SECURE_PORT, PATH}; + SimpleAttributeDefinition[] SUBSYSTEM_ATTRIBUTES = {MODIFY_WSDL_ADDRESS, WSDL_HOST, WSDL_PORT, WSDL_SECURE_PORT, WSDL_PATH_REWRITE_RULE}; SimpleAttributeDefinition VALUE = new SimpleAttributeDefinitionBuilder(Constants.VALUE, ModelType.STRING) .setAllowNull(true) Modified: container/wildfly80/branches/rsearls/server-integration/src/main/java/org/jboss/as/webservices/dmr/Constants.java =================================================================== --- container/wildfly80/branches/rsearls/server-integration/src/main/java/org/jboss/as/webservices/dmr/Constants.java 2014-06-02 15:43:33 UTC (rev 18707) +++ container/wildfly80/branches/rsearls/server-integration/src/main/java/org/jboss/as/webservices/dmr/Constants.java 2014-06-02 15:43:58 UTC (rev 18708) @@ -55,5 +55,5 @@ String HANDLER_NAME="handler-name"; String HANDLER_CLASS="handler-class"; String VALUE = "value"; - String PATH = "path"; + String WSDL_PATH_REWRITE_RULE = "wsdl-path-rewrite-rule"; } Modified: container/wildfly80/branches/rsearls/server-integration/src/main/java/org/jboss/as/webservices/dmr/Element.java =================================================================== --- container/wildfly80/branches/rsearls/server-integration/src/main/java/org/jboss/as/webservices/dmr/Element.java 2014-06-02 15:43:33 UTC (rev 18707) +++ container/wildfly80/branches/rsearls/server-integration/src/main/java/org/jboss/as/webservices/dmr/Element.java 2014-06-02 15:43:58 UTC (rev 18708) @@ -39,7 +39,7 @@ WSDL_HOST(Constants.WSDL_HOST), WSDL_PORT(Constants.WSDL_PORT), WSDL_SECURE_PORT(Constants.WSDL_SECURE_PORT), - PATH(Constants.PATH), + WSDL_PATH_REWRITE_RULE(Constants.WSDL_PATH_REWRITE_RULE), CLIENT_CONFIG(Constants.CLIENT_CONFIG), ENDPOINT_CONFIG(Constants.ENDPOINT_CONFIG), CONFIG_NAME(Constants.CONFIG_NAME), 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-06-02 15:43:33 UTC (rev 18707) +++ container/wildfly80/branches/rsearls/server-integration/src/main/java/org/jboss/as/webservices/dmr/WSServerConfigAttributeHandler.java 2014-06-02 15:43:58 UTC (rev 18708) @@ -104,9 +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)) { + } else if (WSDL_PATH_REWRITE_RULE.equals(attributeName)) { final String path = value != null ? value : null; - config.setWebServicePath(path, isRevert); + config.setWebServicePathRewriteRule(path, isRevert); } else { throw new IllegalArgumentException(attributeName); } Modified: container/wildfly80/branches/rsearls/server-integration/src/main/java/org/jboss/as/webservices/dmr/WSSubsystemAdd.java =================================================================== --- container/wildfly80/branches/rsearls/server-integration/src/main/java/org/jboss/as/webservices/dmr/WSSubsystemAdd.java 2014-06-02 15:43:33 UTC (rev 18707) +++ container/wildfly80/branches/rsearls/server-integration/src/main/java/org/jboss/as/webservices/dmr/WSSubsystemAdd.java 2014-06-02 15:43:58 UTC (rev 18708) @@ -26,7 +26,7 @@ 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 static org.jboss.as.webservices.dmr.Constants.PATH; +import static org.jboss.as.webservices.dmr.Constants.WSDL_PATH_REWRITE_RULE; import java.net.UnknownHostException; import java.util.ArrayList; @@ -113,8 +113,8 @@ if (configuration.hasDefined(WSDL_SECURE_PORT)) { config.setWebServiceSecurePort(Attributes.WSDL_SECURE_PORT.resolveModelAttribute(context, configuration).asInt()); } - if (configuration.hasDefined(PATH)) { - config.setWebServicePath(Attributes.PATH.resolveModelAttribute(context, configuration).asString()); + if (configuration.hasDefined(WSDL_PATH_REWRITE_RULE)) { + config.setWebServicePathRewriteRule(Attributes.WSDL_PATH_REWRITE_RULE.resolveModelAttribute(context, configuration).asString()); } return config; } Modified: container/wildfly80/branches/rsearls/server-integration/src/main/java/org/jboss/as/webservices/dmr/WSSubsystemReader.java =================================================================== --- container/wildfly80/branches/rsearls/server-integration/src/main/java/org/jboss/as/webservices/dmr/WSSubsystemReader.java 2014-06-02 15:43:33 UTC (rev 18707) +++ container/wildfly80/branches/rsearls/server-integration/src/main/java/org/jboss/as/webservices/dmr/WSSubsystemReader.java 2014-06-02 15:43:58 UTC (rev 18708) @@ -140,9 +140,9 @@ Attributes.WSDL_SECURE_PORT.parseAndSetParameter(value, subsystem, reader); break; } - case PATH: { + case WSDL_PATH_REWRITE_RULE: { final String value = parseElementNoAttributes(reader); - Attributes.PATH.parseAndSetParameter(value, subsystem, reader); + Attributes.WSDL_PATH_REWRITE_RULE.parseAndSetParameter(value, subsystem, reader); break; } case ENDPOINT_CONFIG: { Modified: container/wildfly80/branches/rsearls/server-integration/src/test/java/org/jboss/as/webservices/config/ServerConfigImplTestCase.java =================================================================== --- container/wildfly80/branches/rsearls/server-integration/src/test/java/org/jboss/as/webservices/config/ServerConfigImplTestCase.java 2014-06-02 15:43:33 UTC (rev 18707) +++ container/wildfly80/branches/rsearls/server-integration/src/test/java/org/jboss/as/webservices/config/ServerConfigImplTestCase.java 2014-06-02 15:43:58 UTC (rev 18708) @@ -95,7 +95,7 @@ internalTestSingleAttributeUpdate(new Callback() { @Override public void setAttribute(ServerConfig sc) throws Exception { - sc.setWebServicePath("MY/TEST/PATH"); + sc.setWebServicePathRewriteRule("MY/TEST/PATH"); } }); } @@ -129,7 +129,7 @@ Callback cbE = new Callback() { @Override public void setAttribute(ServerConfig sc) throws Exception { - sc.setWebServicePath("MY/TEST/PATH"); + sc.setWebServicePathRewriteRule("MY/TEST/PATH"); } }; internalTestMultipleAttributeUpdate(cbA, new Callback[]{cbB, cbC, cbD, cbE});

9 years, 10 months

1
0
0 / 0

JBossWS SVN: r18707 - common/branches/rsearls/src/main/java/org/jboss/ws/common/management.

by jbossws-commits＠lists.jboss.org

Author: rsearls Date: 2014-06-02 11:43:33 -0400 (Mon, 02 Jun 2014) New Revision: 18707 Modified: common/branches/rsearls/src/main/java/org/jboss/ws/common/management/AbstractServerConfig.java common/branches/rsearls/src/main/java/org/jboss/ws/common/management/AbstractServerConfigMBean.java Log: webservicePath attr revised webServicePathRewriteRule Modified: common/branches/rsearls/src/main/java/org/jboss/ws/common/management/AbstractServerConfig.java =================================================================== --- common/branches/rsearls/src/main/java/org/jboss/ws/common/management/AbstractServerConfig.java 2014-06-02 15:43:09 UTC (rev 18706) +++ common/branches/rsearls/src/main/java/org/jboss/ws/common/management/AbstractServerConfig.java 2014-06-02 15:43:33 UTC (rev 18707) @@ -83,8 +83,8 @@ private final Object modifySOAPAddressLock = new Object(); // The SOAP address path component for substitution in the existing SOAP address. - private volatile String webServicePath; - private final Object webServicePathLock = new Object(); + private volatile String webServicePathRewriteRule; + private final Object webServicePathRewriteRuleLock = new Object(); //The stack config protected volatile StackConfig stackConfig; @@ -254,24 +254,24 @@ } } - public String getWebServicePath() + public String getWebServicePathRewriteRule() { - return webServicePath; + return webServicePathRewriteRule; } - public void setWebServicePath(String path) + public void setWebServicePathRewriteRule(String path) { - setWebServicePath(path, null); + setWebServicePathRewriteRule(path, null); } - public void setWebServicePath(String path, UpdateCallbackHandler uch) + public void setWebServicePathRewriteRule(String path, UpdateCallbackHandler uch) { - synchronized (webServicePathLock) { + synchronized (webServicePathRewriteRuleLock) { if (uch != null) { uch.onBeforeUpdate(); } - this.webServicePath = path; + this.webServicePathRewriteRule = path; } } Modified: common/branches/rsearls/src/main/java/org/jboss/ws/common/management/AbstractServerConfigMBean.java =================================================================== --- common/branches/rsearls/src/main/java/org/jboss/ws/common/management/AbstractServerConfigMBean.java 2014-06-02 15:43:09 UTC (rev 18706) +++ common/branches/rsearls/src/main/java/org/jboss/ws/common/management/AbstractServerConfigMBean.java 2014-06-02 15:43:33 UTC (rev 18707) @@ -59,7 +59,7 @@ void setModifySOAPAddress(boolean flag); - String getWebServicePath(); + String getWebServicePathRewriteRule(); - void setWebServicePath(String path); + void setWebServicePathRewriteRule(String path); }

9 years, 10 months

1
0
0 / 0

JBossWS SVN: r18706 - spi/branches/rsearls/src/main/java/org/jboss/wsf/spi/management.

by jbossws-commits＠lists.jboss.org

Author: rsearls Date: 2014-06-02 11:43:09 -0400 (Mon, 02 Jun 2014) New Revision: 18706 Modified: spi/branches/rsearls/src/main/java/org/jboss/wsf/spi/management/ServerConfig.java Log: webservicePath attr revised webServicePathRewriteRule Modified: spi/branches/rsearls/src/main/java/org/jboss/wsf/spi/management/ServerConfig.java =================================================================== --- spi/branches/rsearls/src/main/java/org/jboss/wsf/spi/management/ServerConfig.java 2014-05-30 14:05:25 UTC (rev 18705) +++ spi/branches/rsearls/src/main/java/org/jboss/wsf/spi/management/ServerConfig.java 2014-06-02 15:43:09 UTC (rev 18706) @@ -61,9 +61,9 @@ void setWebServiceSecurePort(int port); - String getWebServicePath(); + String getWebServicePathRewriteRule(); - void setWebServicePath(String path); + void setWebServicePathRewriteRule(String path); boolean isModifySOAPAddress();

9 years, 10 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 June 2014