[jboss-svn-commits] JBossWS SVN: r739 - in branches/tdiesler/trunk/src: main/java/org/jboss/ws/deployment main/java/org/jboss/ws/integration/jboss main/java/org/jboss/ws/jaxrpc main/java/org/jboss/ws/jaxrpc/handler main/java/org/jboss/ws/jaxws/client main/java/org/jboss/ws/jaxws/core main/java/org/jboss/ws/jaxws/handler main/java/org/jboss/ws/metadata main/java/org/jboss/ws/metadata/config/jaxrpc main/java/org/jboss/ws/metadata/j2ee main/java/org/jboss/ws/metadata/jsr109 main/java/org/jboss/ws/metadata/jsr181 main/java/org/jboss/ws/tools main/java/org/jboss/ws/tools/helpers main/java/org/jboss/ws/tools/metadata main/resources/jbossws.sar/META-INF test/ant test/java/org/jboss/test/ws/config test/java/org/jboss/test/ws/jsr181/handlerchain test/resources/config test/resources/jbws1121/META-INF test/resources/jbws1121/WEB-INF test/resources/samples/wssecurity/WEB-INF test/resources/samples/wssecurity/simple-encrypt/META-INF test/resources/samples/wssecurity/simple-sign/META-INF test/resou! rces/wsse/account-signup/META-INF test/resources/wsse/account-signup/WEB-INF test/resources/wsse/rpc/META-INF test/resources/wsse/rpc/WEB-INF test/resources/wsse/username/META-INF test/resources/wsse/webclient/WEB-INF
jboss-svn-commits at lists.jboss.org
jboss-svn-commits at lists.jboss.org
Mon Aug 14 03:56:49 EDT 2006
Author: thomas.diesler at jboss.com
Date: 2006-08-14 03:55:44 -0400 (Mon, 14 Aug 2006)
New Revision: 739
Removed:
branches/tdiesler/trunk/src/main/java/org/jboss/ws/jaxrpc/ParameterStyle.java
branches/tdiesler/trunk/src/main/java/org/jboss/ws/metadata/config/jaxrpc/WSHandlerChainConfigJAXRPC.java
branches/tdiesler/trunk/src/main/java/org/jboss/ws/metadata/j2ee/UnifiedHandlerMetaDataJAXRPC.java
branches/tdiesler/trunk/src/main/java/org/jboss/ws/metadata/j2ee/UnifiedHandlerMetaDataJAXWS.java
Modified:
branches/tdiesler/trunk/src/main/java/org/jboss/ws/deployment/JAXWSClientMetaDataBuilder.java
branches/tdiesler/trunk/src/main/java/org/jboss/ws/deployment/JAXWSProviderMetaDataBuilderJSE.java
branches/tdiesler/trunk/src/main/java/org/jboss/ws/deployment/JSR109ClientMetaDataBuilder.java
branches/tdiesler/trunk/src/main/java/org/jboss/ws/deployment/JSR109MetaDataBuilder.java
branches/tdiesler/trunk/src/main/java/org/jboss/ws/deployment/JSR109ServerMetaDataBuilder.java
branches/tdiesler/trunk/src/main/java/org/jboss/ws/deployment/JSR181MetaDataBuilder.java
branches/tdiesler/trunk/src/main/java/org/jboss/ws/deployment/MetaDataBuilder.java
branches/tdiesler/trunk/src/main/java/org/jboss/ws/integration/jboss/ServiceRefMetaDataAdaptor.java
branches/tdiesler/trunk/src/main/java/org/jboss/ws/jaxrpc/ParameterWrapping.java
branches/tdiesler/trunk/src/main/java/org/jboss/ws/jaxrpc/ServiceObjectFactory.java
branches/tdiesler/trunk/src/main/java/org/jboss/ws/jaxrpc/handler/HandlerChainBaseImpl.java
branches/tdiesler/trunk/src/main/java/org/jboss/ws/jaxrpc/handler/HandlerDelegateJAXRPC.java
branches/tdiesler/trunk/src/main/java/org/jboss/ws/jaxws/client/ClientImpl.java
branches/tdiesler/trunk/src/main/java/org/jboss/ws/jaxws/core/BindingImpl.java
branches/tdiesler/trunk/src/main/java/org/jboss/ws/jaxws/core/SOAP11BindingImpl.java
branches/tdiesler/trunk/src/main/java/org/jboss/ws/jaxws/handler/HandlerResolverImpl.java
branches/tdiesler/trunk/src/main/java/org/jboss/ws/metadata/ClientEndpointMetaData.java
branches/tdiesler/trunk/src/main/java/org/jboss/ws/metadata/EndpointMetaData.java
branches/tdiesler/trunk/src/main/java/org/jboss/ws/metadata/OperationMetaData.java
branches/tdiesler/trunk/src/main/java/org/jboss/ws/metadata/ServerEndpointMetaData.java
branches/tdiesler/trunk/src/main/java/org/jboss/ws/metadata/ServiceMetaData.java
branches/tdiesler/trunk/src/main/java/org/jboss/ws/metadata/config/jaxrpc/WSCommonConfigJAXRPC.java
branches/tdiesler/trunk/src/main/java/org/jboss/ws/metadata/config/jaxrpc/WSConfigFactoryJAXRPC.java
branches/tdiesler/trunk/src/main/java/org/jboss/ws/metadata/j2ee/UnifiedHandlerMetaData.java
branches/tdiesler/trunk/src/main/java/org/jboss/ws/metadata/j2ee/UnifiedServiceRefMetaData.java
branches/tdiesler/trunk/src/main/java/org/jboss/ws/metadata/jsr109/PortComponentMetaData.java
branches/tdiesler/trunk/src/main/java/org/jboss/ws/metadata/jsr109/WebservicesFactory.java
branches/tdiesler/trunk/src/main/java/org/jboss/ws/metadata/jsr181/HandlerChainFactory.java
branches/tdiesler/trunk/src/main/java/org/jboss/ws/metadata/jsr181/HandlerChainMetaData.java
branches/tdiesler/trunk/src/main/java/org/jboss/ws/tools/JavaToWSDL.java
branches/tdiesler/trunk/src/main/java/org/jboss/ws/tools/helpers/ToolsHelper.java
branches/tdiesler/trunk/src/main/java/org/jboss/ws/tools/metadata/ToolsUnifiedMetaDataBuilder.java
branches/tdiesler/trunk/src/main/resources/jbossws.sar/META-INF/standard-jaxws-client-config.xml
branches/tdiesler/trunk/src/main/resources/jbossws.sar/META-INF/standard-jaxws-endpoint-config.xml
branches/tdiesler/trunk/src/test/ant/build-jars.xml
branches/tdiesler/trunk/src/test/java/org/jboss/test/ws/config/WSConfigTestCase.java
branches/tdiesler/trunk/src/test/java/org/jboss/test/ws/jsr181/handlerchain/JSR181HandlerChainTestCase.java
branches/tdiesler/trunk/src/test/resources/config/jaxrpc-endpoint-config.xml
branches/tdiesler/trunk/src/test/resources/config/jaxws-endpoint-config.xml
branches/tdiesler/trunk/src/test/resources/jbws1121/META-INF/jboss-client.xml
branches/tdiesler/trunk/src/test/resources/jbws1121/WEB-INF/web.xml
branches/tdiesler/trunk/src/test/resources/samples/wssecurity/WEB-INF/web.xml
branches/tdiesler/trunk/src/test/resources/samples/wssecurity/simple-encrypt/META-INF/jboss-client.xml
branches/tdiesler/trunk/src/test/resources/samples/wssecurity/simple-sign/META-INF/jboss-client.xml
branches/tdiesler/trunk/src/test/resources/wsse/account-signup/META-INF/jboss-client.xml
branches/tdiesler/trunk/src/test/resources/wsse/account-signup/WEB-INF/jboss-web.xml
branches/tdiesler/trunk/src/test/resources/wsse/rpc/META-INF/jboss-client.xml
branches/tdiesler/trunk/src/test/resources/wsse/rpc/WEB-INF/jboss-web.xml
branches/tdiesler/trunk/src/test/resources/wsse/username/META-INF/jboss-client.xml
branches/tdiesler/trunk/src/test/resources/wsse/username/META-INF/jboss.xml
branches/tdiesler/trunk/src/test/resources/wsse/webclient/WEB-INF/jboss-web.xml
Log:
complete client/server side jaxws handler scoping
Modified: branches/tdiesler/trunk/src/main/java/org/jboss/ws/deployment/JAXWSClientMetaDataBuilder.java
===================================================================
--- branches/tdiesler/trunk/src/main/java/org/jboss/ws/deployment/JAXWSClientMetaDataBuilder.java 2006-08-13 20:45:16 UTC (rev 738)
+++ branches/tdiesler/trunk/src/main/java/org/jboss/ws/deployment/JAXWSClientMetaDataBuilder.java 2006-08-14 07:55:44 UTC (rev 739)
@@ -26,6 +26,7 @@
import java.io.IOException;
import java.net.URL;
+import javax.jws.soap.SOAPBinding.ParameterStyle;
import javax.xml.namespace.QName;
import javax.xml.rpc.ParameterMode;
import javax.xml.rpc.encoding.TypeMappingRegistry;
@@ -33,7 +34,6 @@
import org.jboss.logging.Logger;
import org.jboss.ws.Constants;
import org.jboss.ws.WSException;
-import org.jboss.ws.jaxrpc.ParameterStyle;
import org.jboss.ws.jaxrpc.Style;
import org.jboss.ws.jaxrpc.TypeMappingImpl;
import org.jboss.ws.jaxrpc.TypeMappingRegistryImpl;
@@ -184,7 +184,7 @@
opMetaData.setSOAPAction(wsdlBindingOperation.getSOAPAction());
// Get the type mapping for the encoding style
- String encStyle = epMetaData.getEncoding().toURI();
+ String encStyle = epMetaData.getEncodingStyle().toURI();
TypeMappingRegistry tmRegistry = new TypeMappingRegistryImpl();
TypeMappingImpl typeMapping = (TypeMappingImpl)tmRegistry.getTypeMapping(encStyle);
@@ -278,11 +278,8 @@
if (typeMetaData != null)
javaTypeName = typeMetaData.getJavaTypeName();
- // Check if we need to wrap the parameters
- boolean isWrapParameters = false;
-
ParameterMetaData inMetaData = new ParameterMetaData(opMetaData, xmlName, xmlType, javaTypeName);
- epMetaData.setParameterStyle(isWrapParameters ? ParameterStyle.WRAPPED : ParameterStyle.BARE);
+ epMetaData.setParameterStyle(ParameterStyle.BARE);
inMetaData.setInHeader(opInput.getProperty(Constants.WSDL_PROPERTY_APPLICATION_DATA) != null);
opMetaData.addParameter(inMetaData);
Modified: branches/tdiesler/trunk/src/main/java/org/jboss/ws/deployment/JAXWSProviderMetaDataBuilderJSE.java
===================================================================
--- branches/tdiesler/trunk/src/main/java/org/jboss/ws/deployment/JAXWSProviderMetaDataBuilderJSE.java 2006-08-13 20:45:16 UTC (rev 738)
+++ branches/tdiesler/trunk/src/main/java/org/jboss/ws/deployment/JAXWSProviderMetaDataBuilderJSE.java 2006-08-14 07:55:44 UTC (rev 739)
@@ -24,7 +24,7 @@
import java.util.Map;
-import javax.jws.WebService;
+import javax.jws.soap.SOAPBinding.ParameterStyle;
import javax.management.ObjectName;
import javax.xml.namespace.QName;
import javax.xml.soap.SOAPMessage;
@@ -36,7 +36,6 @@
import org.jboss.logging.Logger;
import org.jboss.ws.Constants;
import org.jboss.ws.WSException;
-import org.jboss.ws.jaxrpc.ParameterStyle;
import org.jboss.ws.jaxrpc.Style;
import org.jboss.ws.metadata.OperationMetaData;
import org.jboss.ws.metadata.ParameterMetaData;
Modified: branches/tdiesler/trunk/src/main/java/org/jboss/ws/deployment/JSR109ClientMetaDataBuilder.java
===================================================================
--- branches/tdiesler/trunk/src/main/java/org/jboss/ws/deployment/JSR109ClientMetaDataBuilder.java 2006-08-13 20:45:16 UTC (rev 738)
+++ branches/tdiesler/trunk/src/main/java/org/jboss/ws/deployment/JSR109ClientMetaDataBuilder.java 2006-08-14 07:55:44 UTC (rev 739)
@@ -39,7 +39,6 @@
import org.jboss.ws.metadata.UnifiedMetaData;
import org.jboss.ws.metadata.EndpointMetaData.Type;
import org.jboss.ws.metadata.j2ee.UnifiedHandlerMetaData;
-import org.jboss.ws.metadata.j2ee.UnifiedHandlerMetaDataJAXRPC;
import org.jboss.ws.metadata.j2ee.UnifiedServiceRefMetaData;
import org.jboss.ws.metadata.jaxrpcmapping.JavaWsdlMapping;
import org.jboss.ws.metadata.jaxrpcmapping.JavaWsdlMappingFactory;
@@ -220,7 +219,7 @@
// Setup the endpoint handlers
if (serviceRefMetaData != null)
{
- for (UnifiedHandlerMetaDataJAXRPC handlerMetaData : serviceRefMetaData.getHandlers())
+ for (UnifiedHandlerMetaData handlerMetaData : serviceRefMetaData.getHandlers())
{
List portNames = Arrays.asList(handlerMetaData.getPortNames());
if (portNames.size() == 0 || portNames.contains(portName.getLocalPart()))
Modified: branches/tdiesler/trunk/src/main/java/org/jboss/ws/deployment/JSR109MetaDataBuilder.java
===================================================================
--- branches/tdiesler/trunk/src/main/java/org/jboss/ws/deployment/JSR109MetaDataBuilder.java 2006-08-13 20:45:16 UTC (rev 738)
+++ branches/tdiesler/trunk/src/main/java/org/jboss/ws/deployment/JSR109MetaDataBuilder.java 2006-08-14 07:55:44 UTC (rev 739)
@@ -23,28 +23,58 @@
//$Id$
+import java.util.ArrayList;
+import java.util.List;
+
+import javax.jws.soap.SOAPBinding.ParameterStyle;
+import javax.wsdl.Message;
+import javax.wsdl.Part;
+import javax.xml.namespace.QName;
+import javax.xml.rpc.ParameterMode;
+import javax.xml.rpc.encoding.TypeMappingRegistry;
+import javax.xml.ws.addressing.AddressingConstants;
+
import org.apache.xerces.xs.XSTypeDefinition;
import org.jboss.logging.Logger;
import org.jboss.ws.Constants;
import org.jboss.ws.WSException;
-import org.jboss.ws.xop.XOPScanner;
import org.jboss.ws.addressing.AddressingConstantsImpl;
-import org.jboss.ws.jaxrpc.*;
-import org.jboss.ws.metadata.*;
-import org.jboss.ws.metadata.jaxrpcmapping.*;
-import org.jboss.ws.metadata.wsdl.*;
+import org.jboss.ws.jaxrpc.LiteralTypeMapping;
+import org.jboss.ws.jaxrpc.Style;
+import org.jboss.ws.jaxrpc.TypeMappingImpl;
+import org.jboss.ws.jaxrpc.TypeMappingRegistryImpl;
+import org.jboss.ws.jaxrpc.Use;
+import org.jboss.ws.metadata.EndpointMetaData;
+import org.jboss.ws.metadata.OperationMetaData;
+import org.jboss.ws.metadata.ParameterMetaData;
+import org.jboss.ws.metadata.ServiceMetaData;
+import org.jboss.ws.metadata.TypeMappingMetaData;
+import org.jboss.ws.metadata.TypesMetaData;
+import org.jboss.ws.metadata.jaxrpcmapping.ExceptionMapping;
+import org.jboss.ws.metadata.jaxrpcmapping.JavaWsdlMapping;
+import org.jboss.ws.metadata.jaxrpcmapping.JavaXmlTypeMapping;
+import org.jboss.ws.metadata.jaxrpcmapping.MethodParamPartsMapping;
+import org.jboss.ws.metadata.jaxrpcmapping.ServiceEndpointInterfaceMapping;
+import org.jboss.ws.metadata.jaxrpcmapping.ServiceEndpointMethodMapping;
+import org.jboss.ws.metadata.jaxrpcmapping.VariableMapping;
+import org.jboss.ws.metadata.jaxrpcmapping.WsdlMessageMapping;
+import org.jboss.ws.metadata.jaxrpcmapping.WsdlReturnValueMapping;
+import org.jboss.ws.metadata.wsdl.WSDLBinding;
+import org.jboss.ws.metadata.wsdl.WSDLBindingOperation;
+import org.jboss.ws.metadata.wsdl.WSDLDefinitions;
+import org.jboss.ws.metadata.wsdl.WSDLEndpoint;
+import org.jboss.ws.metadata.wsdl.WSDLInterface;
+import org.jboss.ws.metadata.wsdl.WSDLInterfaceOperation;
+import org.jboss.ws.metadata.wsdl.WSDLInterfaceOperationInput;
+import org.jboss.ws.metadata.wsdl.WSDLInterfaceOperationOutput;
+import org.jboss.ws.metadata.wsdl.WSDLInterfaceOperationPart;
+import org.jboss.ws.metadata.wsdl.WSDLProperty;
+import org.jboss.ws.metadata.wsdl.WSDLTypes;
+import org.jboss.ws.metadata.wsdl.WSDLUtils;
import org.jboss.ws.metadata.wsdl.xmlschema.JBossXSModel;
import org.jboss.ws.utils.JavaUtils;
+import org.jboss.ws.xop.XOPScanner;
-import javax.wsdl.Message;
-import javax.wsdl.Part;
-import javax.xml.namespace.QName;
-import javax.xml.rpc.ParameterMode;
-import javax.xml.rpc.encoding.TypeMappingRegistry;
-import javax.xml.ws.addressing.AddressingConstants;
-import java.util.ArrayList;
-import java.util.List;
-
/**
* A meta data builder that is based on webservices.xml.
*
@@ -146,7 +176,7 @@
opMetaData.setSOAPAction(wsdlBindingOperation.getSOAPAction());
// Get the type mapping for the encoding style
- String encStyle = epMetaData.getEncoding().toURI();
+ String encStyle = epMetaData.getEncodingStyle().toURI();
TypeMappingRegistry tmRegistry = new TypeMappingRegistryImpl();
TypeMappingImpl typeMapping = (TypeMappingImpl)tmRegistry.getTypeMapping(encStyle);
Modified: branches/tdiesler/trunk/src/main/java/org/jboss/ws/deployment/JSR109ServerMetaDataBuilder.java
===================================================================
--- branches/tdiesler/trunk/src/main/java/org/jboss/ws/deployment/JSR109ServerMetaDataBuilder.java 2006-08-13 20:45:16 UTC (rev 738)
+++ branches/tdiesler/trunk/src/main/java/org/jboss/ws/deployment/JSR109ServerMetaDataBuilder.java 2006-08-14 07:55:44 UTC (rev 739)
@@ -46,7 +46,6 @@
import org.jboss.ws.metadata.j2ee.UnifiedBeanMetaData;
import org.jboss.ws.metadata.j2ee.UnifiedEjbPortComponentMetaData;
import org.jboss.ws.metadata.j2ee.UnifiedHandlerMetaData;
-import org.jboss.ws.metadata.j2ee.UnifiedHandlerMetaDataJAXRPC;
import org.jboss.ws.metadata.j2ee.UnifiedWebMetaData;
import org.jboss.ws.metadata.jaxrpcmapping.JavaWsdlMapping;
import org.jboss.ws.metadata.jaxrpcmapping.ServiceEndpointInterfaceMapping;
@@ -225,7 +224,7 @@
setupOperationsFromWSDL(sepMetaData, wsdlEndpoint, seiMapping);
// Setup the endpoint handlers
- for (UnifiedHandlerMetaDataJAXRPC handlerMetaData : pcMetaData.getHandlers())
+ for (UnifiedHandlerMetaData handlerMetaData : pcMetaData.getHandlers())
{
List portNames = Arrays.asList(handlerMetaData.getPortNames());
if (portNames.size() == 0 || portNames.contains(portName.getLocalPart()))
Modified: branches/tdiesler/trunk/src/main/java/org/jboss/ws/deployment/JSR181MetaDataBuilder.java
===================================================================
--- branches/tdiesler/trunk/src/main/java/org/jboss/ws/deployment/JSR181MetaDataBuilder.java 2006-08-13 20:45:16 UTC (rev 738)
+++ branches/tdiesler/trunk/src/main/java/org/jboss/ws/deployment/JSR181MetaDataBuilder.java 2006-08-14 07:55:44 UTC (rev 739)
@@ -43,6 +43,7 @@
import javax.jws.WebService;
import javax.jws.soap.SOAPBinding;
import javax.jws.soap.SOAPMessageHandlers;
+import javax.jws.soap.SOAPBinding.ParameterStyle;
import javax.management.ObjectName;
import javax.xml.namespace.QName;
import javax.xml.rpc.ParameterMode;
@@ -58,7 +59,6 @@
import org.jboss.ws.WSException;
import org.jboss.ws.addressing.AddressingPropertiesImpl;
import org.jboss.ws.addressing.metadata.AddressingOpMetaExt;
-import org.jboss.ws.jaxrpc.ParameterStyle;
import org.jboss.ws.jaxrpc.ParameterWrapping;
import org.jboss.ws.jaxrpc.Style;
import org.jboss.ws.jaxrpc.TypeMappingImpl;
@@ -205,10 +205,9 @@
if (attrUse == SOAPBinding.Use.ENCODED)
throw new WSException("SOAP encoding is not supported for JSR-181 deployments");
- epMetaData.setEncoding(Use.LITERAL);
+ epMetaData.setEncodingStyle(Use.LITERAL);
- SOAPBinding.ParameterStyle attrParamStyle = anSoapBinding.parameterStyle();
- ParameterStyle paramStyle = (attrParamStyle == SOAPBinding.ParameterStyle.BARE ? ParameterStyle.BARE : ParameterStyle.WRAPPED);
+ ParameterStyle paramStyle = anSoapBinding.parameterStyle();
epMetaData.setParameterStyle(paramStyle);
}
@@ -299,6 +298,13 @@
QName xmlType = null;
Class[] parameterTypes = method.getParameterTypes();
+ // Force paramter style to wrapped
+ if (method.isAnnotationPresent(RequestWrapper.class) || method.isAnnotationPresent(ResponseWrapper.class))
+ {
+ epMetaData.setParameterStyle(null);
+ epMetaData.setParameterStyle(ParameterStyle.WRAPPED);
+ }
+
if (opMetaData.isDocumentWrapped())
{
xmlName = opMetaData.getQName();
Modified: branches/tdiesler/trunk/src/main/java/org/jboss/ws/deployment/MetaDataBuilder.java
===================================================================
--- branches/tdiesler/trunk/src/main/java/org/jboss/ws/deployment/MetaDataBuilder.java 2006-08-13 20:45:16 UTC (rev 738)
+++ branches/tdiesler/trunk/src/main/java/org/jboss/ws/deployment/MetaDataBuilder.java 2006-08-14 07:55:44 UTC (rev 739)
@@ -136,7 +136,7 @@
for (WSDLBindingOperation wsdlBindingOperation : wsdlBinding.getOperations())
{
String encStyle = wsdlBindingOperation.getEncodingStyle();
- epMetaData.setEncoding(Use.valueOf(encStyle));
+ epMetaData.setEncodingStyle(Use.valueOf(encStyle));
}
}
}
Modified: branches/tdiesler/trunk/src/main/java/org/jboss/ws/integration/jboss/ServiceRefMetaDataAdaptor.java
===================================================================
--- branches/tdiesler/trunk/src/main/java/org/jboss/ws/integration/jboss/ServiceRefMetaDataAdaptor.java 2006-08-13 20:45:16 UTC (rev 738)
+++ branches/tdiesler/trunk/src/main/java/org/jboss/ws/integration/jboss/ServiceRefMetaDataAdaptor.java 2006-08-14 07:55:44 UTC (rev 739)
@@ -32,7 +32,6 @@
import org.jboss.webservice.metadata.serviceref.PortComponentRefMetaData;
import org.jboss.webservice.metadata.serviceref.ServiceRefMetaData;
import org.jboss.ws.metadata.j2ee.UnifiedHandlerMetaData;
-import org.jboss.ws.metadata.j2ee.UnifiedHandlerMetaDataJAXRPC;
import org.jboss.ws.metadata.j2ee.UnifiedInitParamMetaData;
import org.jboss.ws.metadata.j2ee.UnifiedPortComponentRefMetaData;
import org.jboss.ws.metadata.j2ee.UnifiedServiceRefMetaData;
@@ -65,10 +64,10 @@
}
usrmd.setPortComponentRefs(pcrefs);
- ArrayList<UnifiedHandlerMetaDataJAXRPC> handlers = new ArrayList<UnifiedHandlerMetaDataJAXRPC>();
+ ArrayList<UnifiedHandlerMetaData> handlers = new ArrayList<UnifiedHandlerMetaData>();
for (HandlerMetaData hmd : srmd.getHandlers())
{
- UnifiedHandlerMetaDataJAXRPC uhmd = new UnifiedHandlerMetaDataJAXRPC();
+ UnifiedHandlerMetaData uhmd = new UnifiedHandlerMetaData(null);
uhmd.setHandlerName(hmd.getHandlerName());
uhmd.setHandlerClass(hmd.getHandlerClass());
Arrays.asList(hmd.getSoapHeaders());
Deleted: branches/tdiesler/trunk/src/main/java/org/jboss/ws/jaxrpc/ParameterStyle.java
===================================================================
--- branches/tdiesler/trunk/src/main/java/org/jboss/ws/jaxrpc/ParameterStyle.java 2006-08-13 20:45:16 UTC (rev 738)
+++ branches/tdiesler/trunk/src/main/java/org/jboss/ws/jaxrpc/ParameterStyle.java 2006-08-14 07:55:44 UTC (rev 739)
@@ -1,62 +0,0 @@
-/*
-* JBoss, Home of Professional Open Source
-* Copyright 2005, JBoss Inc., and individual contributors as indicated
-* by the @authors tag. See the copyright.txt 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.ws.jaxrpc;
-
-// $Id$
-
-/** A type-safe enumeration for parameter style.
- *
- * @author Thomas.Diesler at jboss.org
- * @since 17-Oct-2005
- */
-public class ParameterStyle
-{
- private String style;
-
- public static final ParameterStyle BARE = new ParameterStyle("bare");
- public static final ParameterStyle WRAPPED = new ParameterStyle("wrapped");
-
- private ParameterStyle(String style)
- {
- this.style = style;
- }
-
- public static ParameterStyle getDefaultStyle()
- {
- return WRAPPED;
- }
-
- public static ParameterStyle valueOf(String style)
- {
- if (BARE.style.equals(style))
- return BARE;
- if (WRAPPED.style.equals(style))
- return WRAPPED;
-
- throw new IllegalArgumentException("Unsupported parameter style: " + style);
- }
-
- public String toString()
- {
- return style;
- }
-}
Modified: branches/tdiesler/trunk/src/main/java/org/jboss/ws/jaxrpc/ParameterWrapping.java
===================================================================
--- branches/tdiesler/trunk/src/main/java/org/jboss/ws/jaxrpc/ParameterWrapping.java 2006-08-13 20:45:16 UTC (rev 738)
+++ branches/tdiesler/trunk/src/main/java/org/jboss/ws/jaxrpc/ParameterWrapping.java 2006-08-14 07:55:44 UTC (rev 739)
@@ -35,6 +35,7 @@
import javassist.LoaderClassPath;
import javassist.Modifier;
+import javax.jws.soap.SOAPBinding.ParameterStyle;
import javax.xml.namespace.QName;
import org.jboss.logging.Logger;
Modified: branches/tdiesler/trunk/src/main/java/org/jboss/ws/jaxrpc/ServiceObjectFactory.java
===================================================================
--- branches/tdiesler/trunk/src/main/java/org/jboss/ws/jaxrpc/ServiceObjectFactory.java 2006-08-13 20:45:16 UTC (rev 738)
+++ branches/tdiesler/trunk/src/main/java/org/jboss/ws/jaxrpc/ServiceObjectFactory.java 2006-08-14 07:55:44 UTC (rev 739)
@@ -38,7 +38,6 @@
import java.net.URLEncoder;
import java.rmi.Remote;
import java.util.ArrayList;
-import java.util.Arrays;
import java.util.HashMap;
import java.util.HashSet;
import java.util.Hashtable;
@@ -62,7 +61,6 @@
import org.jboss.ws.metadata.EndpointMetaData;
import org.jboss.ws.metadata.ServiceMetaData;
import org.jboss.ws.metadata.j2ee.UnifiedHandlerMetaData;
-import org.jboss.ws.metadata.j2ee.UnifiedHandlerMetaDataJAXRPC;
import org.jboss.ws.metadata.j2ee.UnifiedInitParamMetaData;
import org.jboss.ws.metadata.j2ee.UnifiedPortComponentRefMetaData;
import org.jboss.ws.metadata.j2ee.UnifiedServiceRefMetaData;
@@ -301,12 +299,12 @@
{
QName portName = epMetaData.getQName();
- HashSet handlerRoles = new HashSet();
+ Set<String> handlerRoles = new HashSet<String>();
ArrayList handlerInfos = new ArrayList();
for (UnifiedHandlerMetaData uhmd : epMetaData.getHandlers(HandlerType.ALL))
{
- UnifiedHandlerMetaDataJAXRPC handlerMetaData = (UnifiedHandlerMetaDataJAXRPC)uhmd;
- handlerRoles.addAll(Arrays.asList(handlerMetaData.getSoapRoles()));
+ UnifiedHandlerMetaData handlerMetaData = (UnifiedHandlerMetaData)uhmd;
+ handlerRoles.addAll(handlerMetaData.getSoapRoles());
ClassLoader cl = epMetaData.getClassLoader();
Class hClass = cl.loadClass(handlerMetaData.getHandlerClass());
Modified: branches/tdiesler/trunk/src/main/java/org/jboss/ws/jaxrpc/handler/HandlerChainBaseImpl.java
===================================================================
--- branches/tdiesler/trunk/src/main/java/org/jboss/ws/jaxrpc/handler/HandlerChainBaseImpl.java 2006-08-13 20:45:16 UTC (rev 738)
+++ branches/tdiesler/trunk/src/main/java/org/jboss/ws/jaxrpc/handler/HandlerChainBaseImpl.java 2006-08-14 07:55:44 UTC (rev 739)
@@ -85,7 +85,7 @@
/**
* Constructs a handler chain with the given handlers infos
*/
- public HandlerChainBaseImpl(List infos, Set roles)
+ public HandlerChainBaseImpl(List infos, Set<String> roles)
{
log.debug("Create a handler chain for roles: " + roles);
addHandlersToChain(infos, roles);
@@ -109,7 +109,7 @@
*
* @throws javax.xml.rpc.JAXRPCException If any error during initialization
*/
- private void addHandlersToChain(List infos, Set roleSet)
+ private void addHandlersToChain(List infos, Set<String> roleSet)
{
try
{
@@ -194,9 +194,11 @@
*/
public String[] getRoles()
{
- String[] arr = new String[roles.size()];
- roles.toArray(arr);
- return arr;
+ Set<String> auxlist = new HashSet<String>(roles);
+ auxlist.add(Constants.URI_SOAP11_NEXT_ACTOR);
+ String[] roleArr = new String[auxlist.size()];
+ auxlist.toArray(roleArr);
+ return roleArr;
}
/**
Modified: branches/tdiesler/trunk/src/main/java/org/jboss/ws/jaxrpc/handler/HandlerDelegateJAXRPC.java
===================================================================
--- branches/tdiesler/trunk/src/main/java/org/jboss/ws/jaxrpc/handler/HandlerDelegateJAXRPC.java 2006-08-13 20:45:16 UTC (rev 738)
+++ branches/tdiesler/trunk/src/main/java/org/jboss/ws/jaxrpc/handler/HandlerDelegateJAXRPC.java 2006-08-14 07:55:44 UTC (rev 739)
@@ -24,7 +24,6 @@
// $Id$
import java.util.ArrayList;
-import java.util.Arrays;
import java.util.HashMap;
import java.util.HashSet;
import java.util.List;
@@ -38,7 +37,6 @@
import org.jboss.ws.WSException;
import org.jboss.ws.metadata.ServerEndpointMetaData;
import org.jboss.ws.metadata.j2ee.UnifiedHandlerMetaData;
-import org.jboss.ws.metadata.j2ee.UnifiedHandlerMetaDataJAXRPC;
import org.jboss.ws.metadata.j2ee.UnifiedInitParamMetaData;
import org.jboss.ws.metadata.j2ee.UnifiedHandlerMetaData.HandlerType;
import org.jboss.ws.server.HandlerDelegate;
@@ -145,7 +143,7 @@
ServerEndpointMetaData sepMetaData = seInfo.getServerEndpointMetaData();
for (UnifiedHandlerMetaData uhmd : sepMetaData.getHandlers(type))
{
- UnifiedHandlerMetaDataJAXRPC handlerMetaData = (UnifiedHandlerMetaDataJAXRPC)uhmd;
+ UnifiedHandlerMetaData handlerMetaData = (UnifiedHandlerMetaData)uhmd;
handlerRoles.addAll(handlerMetaData.getSoapRoles());
Class hClass;
Modified: branches/tdiesler/trunk/src/main/java/org/jboss/ws/jaxws/client/ClientImpl.java
===================================================================
--- branches/tdiesler/trunk/src/main/java/org/jboss/ws/jaxws/client/ClientImpl.java 2006-08-13 20:45:16 UTC (rev 738)
+++ branches/tdiesler/trunk/src/main/java/org/jboss/ws/jaxws/client/ClientImpl.java 2006-08-14 07:55:44 UTC (rev 739)
@@ -66,9 +66,10 @@
if (handlerResolver != null)
{
PortInfoImpl portInfo = new PortInfoImpl(epMetaData);
+ List<Handler> handlerChain = binding.getHandlerChain();
for (Handler handler : handlerResolver.getHandlerChain(portInfo))
{
- binding.addHandler(handler);
+ handlerChain.add(handler);
}
}
}
Modified: branches/tdiesler/trunk/src/main/java/org/jboss/ws/jaxws/core/BindingImpl.java
===================================================================
--- branches/tdiesler/trunk/src/main/java/org/jboss/ws/jaxws/core/BindingImpl.java 2006-08-13 20:45:16 UTC (rev 738)
+++ branches/tdiesler/trunk/src/main/java/org/jboss/ws/jaxws/core/BindingImpl.java 2006-08-14 07:55:44 UTC (rev 739)
@@ -65,15 +65,10 @@
public List<Handler> getHandlerChain()
{
+ log.debug("getHandlerChain: " + handlerChain);
return handlerChain;
}
- public void addHandler(Handler handler)
- {
- log.debug("addHandler: " + handler);
- handlerChain.add(handler);
- }
-
public void setHandlerChain(List<Handler> handlerChain)
{
log.debug("setHandlerChain: " + handlerChain);
Modified: branches/tdiesler/trunk/src/main/java/org/jboss/ws/jaxws/core/SOAP11BindingImpl.java
===================================================================
--- branches/tdiesler/trunk/src/main/java/org/jboss/ws/jaxws/core/SOAP11BindingImpl.java 2006-08-13 20:45:16 UTC (rev 738)
+++ branches/tdiesler/trunk/src/main/java/org/jboss/ws/jaxws/core/SOAP11BindingImpl.java 2006-08-14 07:55:44 UTC (rev 739)
@@ -47,7 +47,7 @@
factory.setEnvelopeURI(Constants.NS_SOAP11_ENV);
SOAPMessage soapMessage = factory.createMessage();
- Use encStyle = opMetaData.getEndpointMetaData().getEncoding();
+ Use encStyle = opMetaData.getEndpointMetaData().getEncodingStyle();
if (Use.ENCODED.equals(encStyle))
{
SOAPEnvelope soapEnvelope = soapMessage.getSOAPPart().getEnvelope();
Modified: branches/tdiesler/trunk/src/main/java/org/jboss/ws/jaxws/handler/HandlerResolverImpl.java
===================================================================
--- branches/tdiesler/trunk/src/main/java/org/jboss/ws/jaxws/handler/HandlerResolverImpl.java 2006-08-13 20:45:16 UTC (rev 738)
+++ branches/tdiesler/trunk/src/main/java/org/jboss/ws/jaxws/handler/HandlerResolverImpl.java 2006-08-14 07:55:44 UTC (rev 739)
@@ -43,7 +43,6 @@
import org.jboss.ws.metadata.ServiceMetaData;
import org.jboss.ws.metadata.UnifiedMetaData;
import org.jboss.ws.metadata.j2ee.UnifiedHandlerMetaData;
-import org.jboss.ws.metadata.j2ee.UnifiedHandlerMetaDataJAXWS;
import org.jboss.ws.metadata.j2ee.UnifiedHandlerMetaData.HandlerType;
/**
@@ -116,9 +115,10 @@
public void initHandlerChain(EndpointMetaData epMetaData, HandlerType type)
{
+ log.debug("initHandlerChain: " + type);
for (UnifiedHandlerMetaData uhmd : epMetaData.getHandlers(type))
{
- UnifiedHandlerMetaDataJAXWS handlerMetaData = (UnifiedHandlerMetaDataJAXWS)uhmd;
+ UnifiedHandlerMetaData handlerMetaData = (UnifiedHandlerMetaData)uhmd;
String handlerName = handlerMetaData.getHandlerName();
String className = handlerMetaData.getHandlerClass();
Set<QName> soapHeaders = handlerMetaData.getSoapHeaders();
@@ -153,7 +153,7 @@
}
}
- private List<PortInfo> getPortInfo(EndpointMetaData epMetaData, UnifiedHandlerMetaDataJAXWS handlerMetaData)
+ private List<PortInfo> getPortInfo(EndpointMetaData epMetaData, UnifiedHandlerMetaData handlerMetaData)
{
String protocols = handlerMetaData.getProtocolBindings();
QName services = handlerMetaData.getServiceNamePattern();
Modified: branches/tdiesler/trunk/src/main/java/org/jboss/ws/metadata/ClientEndpointMetaData.java
===================================================================
--- branches/tdiesler/trunk/src/main/java/org/jboss/ws/metadata/ClientEndpointMetaData.java 2006-08-13 20:45:16 UTC (rev 738)
+++ branches/tdiesler/trunk/src/main/java/org/jboss/ws/metadata/ClientEndpointMetaData.java 2006-08-14 07:55:44 UTC (rev 739)
@@ -35,7 +35,6 @@
import org.jboss.ws.metadata.config.WSConfigFactory;
import org.jboss.ws.metadata.config.jaxrpc.WSClientConfigJAXRPC;
import org.jboss.ws.metadata.config.jaxrpc.WSConfigRootJAXRPC;
-import org.jboss.ws.metadata.config.jaxrpc.WSHandlerChainConfigJAXRPC;
import org.jboss.ws.metadata.config.jaxws.WSClientConfigJAXWS;
import org.jboss.ws.metadata.config.jaxws.WSConfigRootJAXWS;
import org.jboss.ws.metadata.config.jaxws.WSHandlerChainsConfigJAXWS;
@@ -86,7 +85,7 @@
// Add pre handlers
if (type == HandlerType.PRE || type == HandlerType.ALL)
{
- WSHandlerChainConfigJAXRPC preHandlerConfig = jaxrpcConfig.getPreHandlerChain();
+ HandlerChainMetaData preHandlerConfig = jaxrpcConfig.getPreHandlerChain();
if (preHandlerConfig != null)
{
handlers.addAll(preHandlerConfig.getHandlers());
@@ -102,7 +101,7 @@
// Add post handlers
if (type == HandlerType.POST || type == HandlerType.ALL)
{
- WSHandlerChainConfigJAXRPC postHandlerConfig = jaxrpcConfig.getPostHandlerChain();
+ HandlerChainMetaData postHandlerConfig = jaxrpcConfig.getPostHandlerChain();
if (postHandlerConfig != null)
{
handlers.addAll(postHandlerConfig.getHandlers());
Modified: branches/tdiesler/trunk/src/main/java/org/jboss/ws/metadata/EndpointMetaData.java
===================================================================
--- branches/tdiesler/trunk/src/main/java/org/jboss/ws/metadata/EndpointMetaData.java 2006-08-13 20:45:16 UTC (rev 738)
+++ branches/tdiesler/trunk/src/main/java/org/jboss/ws/metadata/EndpointMetaData.java 2006-08-14 07:55:44 UTC (rev 739)
@@ -29,6 +29,7 @@
import java.util.List;
import java.util.Properties;
+import javax.jws.soap.SOAPBinding.ParameterStyle;
import javax.xml.namespace.QName;
import javax.xml.rpc.ParameterMode;
import javax.xml.ws.Service.Mode;
@@ -37,7 +38,6 @@
import org.jboss.logging.Logger;
import org.jboss.ws.WSException;
-import org.jboss.ws.jaxrpc.ParameterStyle;
import org.jboss.ws.jaxrpc.Style;
import org.jboss.ws.jaxrpc.TypeMappingImpl;
import org.jboss.ws.jaxrpc.Use;
@@ -215,19 +215,22 @@
return seiClass;
}
- public Use getEncoding()
+ public Use getEncodingStyle()
{
if (use == null)
+ {
use = Use.getDefaultUse();
-
+ log.debug("Using default encoding style: " + use);
+ }
return use;
}
- public void setEncoding(Use value)
+ public void setEncodingStyle(Use value)
{
if (value != null && use != null && !use.equals(value))
throw new WSException("Mixed encoding styles not supported");
+ log.debug("setEncodingStyle: " + value);
this.use = value;
}
@@ -236,9 +239,8 @@
if (style == null)
{
style = Style.getDefaultStyle();
- log.warn("Cannot obtain style, using default: " + style);
+ log.debug("Using default style: " + style);
}
-
return style;
}
@@ -247,14 +249,17 @@
if (value != null && style != null && !style.equals(value))
throw new WSException("Mixed styles not supported");
+ log.debug("setStyle: " + value);
this.style = value;
}
public ParameterStyle getParameterStyle()
{
if (parameterStyle == null)
- parameterStyle = ParameterStyle.getDefaultStyle();
-
+ {
+ parameterStyle = ParameterStyle.WRAPPED;
+ log.debug("Using default parameter style: " + parameterStyle);
+ }
return parameterStyle;
}
@@ -263,6 +268,7 @@
if (value != null && parameterStyle != null && !parameterStyle.equals(value))
throw new WSException("Mixed SOAP parameter styles not supported");
+ log.debug("setParameterStyle: " + value);
this.parameterStyle = value;
}
@@ -444,7 +450,7 @@
if (JavaUtils.isPrimitive(javaTypeName))
javaType = JavaUtils.getWrapperType(javaType);
- if (getEncoding() == Use.ENCODED && javaType.isArray())
+ if (getEncodingStyle() == Use.ENCODED && javaType.isArray())
{
typeMapping.register(javaType, xmlType, new SOAPArraySerializerFactory(), new SOAPArrayDeserializerFactory());
}
Modified: branches/tdiesler/trunk/src/main/java/org/jboss/ws/metadata/OperationMetaData.java
===================================================================
--- branches/tdiesler/trunk/src/main/java/org/jboss/ws/metadata/OperationMetaData.java 2006-08-13 20:45:16 UTC (rev 738)
+++ branches/tdiesler/trunk/src/main/java/org/jboss/ws/metadata/OperationMetaData.java 2006-08-14 07:55:44 UTC (rev 739)
@@ -27,12 +27,12 @@
import java.util.ArrayList;
import java.util.List;
+import javax.jws.soap.SOAPBinding.ParameterStyle;
import javax.xml.namespace.QName;
import javax.xml.rpc.ParameterMode;
import org.jboss.logging.Logger;
import org.jboss.ws.WSException;
-import org.jboss.ws.jaxrpc.ParameterStyle;
import org.jboss.ws.jaxrpc.ParameterWrapping;
import org.jboss.ws.jaxrpc.Style;
import org.jboss.ws.jaxrpc.TypeMappingImpl;
@@ -131,7 +131,7 @@
public Use getUse()
{
- return epMetaData.getEncoding();
+ return epMetaData.getEncodingStyle();
}
public ParameterStyle getParameterStyle()
Modified: branches/tdiesler/trunk/src/main/java/org/jboss/ws/metadata/ServerEndpointMetaData.java
===================================================================
--- branches/tdiesler/trunk/src/main/java/org/jboss/ws/metadata/ServerEndpointMetaData.java 2006-08-13 20:45:16 UTC (rev 738)
+++ branches/tdiesler/trunk/src/main/java/org/jboss/ws/metadata/ServerEndpointMetaData.java 2006-08-14 07:55:44 UTC (rev 739)
@@ -36,7 +36,6 @@
import org.jboss.ws.metadata.config.WSConfigFactory;
import org.jboss.ws.metadata.config.jaxrpc.WSConfigRootJAXRPC;
import org.jboss.ws.metadata.config.jaxrpc.WSEndpointConfigJAXRPC;
-import org.jboss.ws.metadata.config.jaxrpc.WSHandlerChainConfigJAXRPC;
import org.jboss.ws.metadata.config.jaxws.WSConfigRootJAXWS;
import org.jboss.ws.metadata.config.jaxws.WSEndpointConfigJAXWS;
import org.jboss.ws.metadata.config.jaxws.WSHandlerChainsConfigJAXWS;
@@ -180,7 +179,7 @@
// Add pre handlers
if (type == HandlerType.PRE || type == HandlerType.ALL)
{
- WSHandlerChainConfigJAXRPC preHandlerConfig = jaxrpcConfig.getPreHandlerChain();
+ HandlerChainMetaData preHandlerConfig = jaxrpcConfig.getPreHandlerChain();
if (preHandlerConfig != null)
{
handlers.addAll(preHandlerConfig.getHandlers());
@@ -196,7 +195,7 @@
// Add post handlers
if (type == HandlerType.POST || type == HandlerType.ALL)
{
- WSHandlerChainConfigJAXRPC postHandlerConfig = jaxrpcConfig.getPostHandlerChain();
+ HandlerChainMetaData postHandlerConfig = jaxrpcConfig.getPostHandlerChain();
if (postHandlerConfig != null)
{
handlers.addAll(postHandlerConfig.getHandlers());
Modified: branches/tdiesler/trunk/src/main/java/org/jboss/ws/metadata/ServiceMetaData.java
===================================================================
--- branches/tdiesler/trunk/src/main/java/org/jboss/ws/metadata/ServiceMetaData.java 2006-08-13 20:45:16 UTC (rev 738)
+++ branches/tdiesler/trunk/src/main/java/org/jboss/ws/metadata/ServiceMetaData.java 2006-08-14 07:55:44 UTC (rev 739)
@@ -36,24 +36,19 @@
import javax.xml.rpc.encoding.TypeMappingRegistry;
import org.jboss.logging.Logger;
-import org.jboss.ws.metadata.jaxrpcmapping.JavaWsdlMapping;
-import org.jboss.ws.metadata.jaxrpcmapping.JavaWsdlMappingFactory;
import org.jboss.ws.WSException;
import org.jboss.ws.jaxrpc.TypeMappingImpl;
import org.jboss.ws.jaxrpc.TypeMappingRegistryImpl;
import org.jboss.ws.jaxrpc.Use;
-import org.jboss.ws.jaxrpc.encoding.SOAPArrayDeserializerFactory;
-import org.jboss.ws.jaxrpc.encoding.SOAPArraySerializerFactory;
-import org.jboss.ws.jbossxb.JBossXBDeserializerFactory;
-import org.jboss.ws.jbossxb.JBossXBSerializerFactory;
import org.jboss.ws.jbossxb.SchemaBindingBuilder;
+import org.jboss.ws.metadata.jaxrpcmapping.JavaWsdlMapping;
+import org.jboss.ws.metadata.jaxrpcmapping.JavaWsdlMappingFactory;
import org.jboss.ws.metadata.wsdl.WSDLDefinitions;
import org.jboss.ws.metadata.wsdl.WSDLDefinitionsFactory;
import org.jboss.ws.metadata.wsdl.WSDLTypes;
import org.jboss.ws.metadata.wsdl.WSDLUtils;
import org.jboss.ws.metadata.wsdl.xmlschema.JBossXSModel;
import org.jboss.ws.metadata.wsse.WSSecurityConfiguration;
-import org.jboss.ws.utils.JavaUtils;
import org.jboss.xb.binding.sunday.unmarshalling.SchemaBinding;
/**
@@ -316,9 +311,9 @@
{
if (encStyle == null)
{
- encStyle = epMetaData.getEncoding();
+ encStyle = epMetaData.getEncodingStyle();
}
- else if (encStyle.equals(epMetaData.getEncoding()) == false)
+ else if (encStyle.equals(epMetaData.getEncodingStyle()) == false)
{
throw new WSException("Conflicting encoding styles not supported");
}
@@ -326,7 +321,7 @@
}
else
{
- encStyle = Use.getDefaultUse();
+ encStyle = Use.LITERAL;
}
}
return encStyle;
Modified: branches/tdiesler/trunk/src/main/java/org/jboss/ws/metadata/config/jaxrpc/WSCommonConfigJAXRPC.java
===================================================================
--- branches/tdiesler/trunk/src/main/java/org/jboss/ws/metadata/config/jaxrpc/WSCommonConfigJAXRPC.java 2006-08-13 20:45:16 UTC (rev 738)
+++ branches/tdiesler/trunk/src/main/java/org/jboss/ws/metadata/config/jaxrpc/WSCommonConfigJAXRPC.java 2006-08-14 07:55:44 UTC (rev 739)
@@ -21,7 +21,9 @@
*/
package org.jboss.ws.metadata.config.jaxrpc;
+import org.jboss.ws.metadata.jsr181.HandlerChainMetaData;
+
// $Id$
/**
@@ -33,8 +35,8 @@
public abstract class WSCommonConfigJAXRPC
{
private String configName;
- private WSHandlerChainConfigJAXRPC preHandlerChain;
- private WSHandlerChainConfigJAXRPC postHandlerChain;
+ private HandlerChainMetaData preHandlerChain;
+ private HandlerChainMetaData postHandlerChain;
public String getConfigName()
{
@@ -46,22 +48,22 @@
this.configName = configName;
}
- public WSHandlerChainConfigJAXRPC getPostHandlerChain()
+ public HandlerChainMetaData getPostHandlerChain()
{
return postHandlerChain;
}
- public void setPostHandlerChain(WSHandlerChainConfigJAXRPC postHandlerChain)
+ public void setPostHandlerChain(HandlerChainMetaData postHandlerChain)
{
this.postHandlerChain = postHandlerChain;
}
- public WSHandlerChainConfigJAXRPC getPreHandlerChain()
+ public HandlerChainMetaData getPreHandlerChain()
{
return preHandlerChain;
}
- public void setPreHandlerChain(WSHandlerChainConfigJAXRPC preHandlerChain)
+ public void setPreHandlerChain(HandlerChainMetaData preHandlerChain)
{
this.preHandlerChain = preHandlerChain;
}
Modified: branches/tdiesler/trunk/src/main/java/org/jboss/ws/metadata/config/jaxrpc/WSConfigFactoryJAXRPC.java
===================================================================
--- branches/tdiesler/trunk/src/main/java/org/jboss/ws/metadata/config/jaxrpc/WSConfigFactoryJAXRPC.java 2006-08-13 20:45:16 UTC (rev 738)
+++ branches/tdiesler/trunk/src/main/java/org/jboss/ws/metadata/config/jaxrpc/WSConfigFactoryJAXRPC.java 2006-08-14 07:55:44 UTC (rev 739)
@@ -27,8 +27,8 @@
import org.jboss.logging.Logger;
import org.jboss.ws.metadata.j2ee.UnifiedHandlerMetaData;
-import org.jboss.ws.metadata.j2ee.UnifiedHandlerMetaDataJAXRPC;
import org.jboss.ws.metadata.j2ee.UnifiedInitParamMetaData;
+import org.jboss.ws.metadata.jsr181.HandlerChainMetaData;
import org.jboss.xb.binding.ObjectModelFactory;
import org.jboss.xb.binding.UnmarshallingContext;
import org.xml.sax.Attributes;
@@ -96,13 +96,13 @@
if ("pre-handler-chain".equals(localName))
{
- WSHandlerChainConfigJAXRPC preHandlerChain = new WSHandlerChainConfigJAXRPC();
+ HandlerChainMetaData preHandlerChain = new HandlerChainMetaData(null);
wsCommonConfig.setPreHandlerChain(preHandlerChain);
return preHandlerChain;
}
if ("post-handler-chain".equals(localName))
{
- WSHandlerChainConfigJAXRPC postHandlerChain = new WSHandlerChainConfigJAXRPC();
+ HandlerChainMetaData postHandlerChain = new HandlerChainMetaData(null);
wsCommonConfig.setPostHandlerChain(postHandlerChain);
return postHandlerChain;
}
@@ -110,27 +110,15 @@
}
/**
- * Called when a new simple child element with text value was read from the XML content.
- */
- public void setValue(WSHandlerChainConfigJAXRPC wsHandlerChainConfig, UnmarshallingContext navigator, String namespaceURI, String localName, String value)
- {
- if (log.isTraceEnabled())
- log.trace("WSHandlerChainConfig setValue: nuri=" + namespaceURI + " localName=" + localName + " value=" + value);
-
- if (localName.equals("handler-chain-name"))
- wsHandlerChainConfig.setHandlerChainName(value);
- }
-
- /**
* Called when parsing of a new element started.
*/
- public Object newChild(WSHandlerChainConfigJAXRPC wsHandlerChainConfig, UnmarshallingContext navigator, String namespaceURI, String localName, Attributes attrs)
+ public Object newChild(HandlerChainMetaData handlerChainMetaData, UnmarshallingContext navigator, String namespaceURI, String localName, Attributes attrs)
{
log.trace("WSHandlerChainConfig newChild: " + localName);
if ("handler".equals(localName))
{
- UnifiedHandlerMetaData handler = new UnifiedHandlerMetaDataJAXRPC();
- List<UnifiedHandlerMetaData> handlers = wsHandlerChainConfig.getHandlers();
+ UnifiedHandlerMetaData handler = new UnifiedHandlerMetaData(handlerChainMetaData);
+ List<UnifiedHandlerMetaData> handlers = handlerChainMetaData.getHandlers();
handlers.add(handler);
return handler;
}
@@ -140,7 +128,7 @@
/**
* Called when a new simple child element with text value was read from the XML content.
*/
- public void setValue(UnifiedHandlerMetaDataJAXRPC handler, UnmarshallingContext navigator, String namespaceURI, String localName, String value)
+ public void setValue(UnifiedHandlerMetaData handler, UnmarshallingContext navigator, String namespaceURI, String localName, String value)
{
if (log.isTraceEnabled())
log.trace("UnifiedHandlerMetaData setValue: nuri=" + namespaceURI + " localName=" + localName + " value=" + value);
Deleted: branches/tdiesler/trunk/src/main/java/org/jboss/ws/metadata/config/jaxrpc/WSHandlerChainConfigJAXRPC.java
===================================================================
--- branches/tdiesler/trunk/src/main/java/org/jboss/ws/metadata/config/jaxrpc/WSHandlerChainConfigJAXRPC.java 2006-08-13 20:45:16 UTC (rev 738)
+++ branches/tdiesler/trunk/src/main/java/org/jboss/ws/metadata/config/jaxrpc/WSHandlerChainConfigJAXRPC.java 2006-08-14 07:55:44 UTC (rev 739)
@@ -1,60 +0,0 @@
-/*
- * JBoss, Home of Professional Open Source
- * Copyright 2005, JBoss Inc., and individual contributors as indicated
- * by the @authors tag. See the copyright.txt 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.ws.metadata.config.jaxrpc;
-
-import java.util.ArrayList;
-import java.util.List;
-
-import org.jboss.ws.metadata.j2ee.UnifiedHandlerMetaData;
-
-
-/**
- * A JBossWS handler chain configuration
- *
- * @author Thomas.Diesler at jboss.org
- * @since 18-Dec-2005
- */
-public class WSHandlerChainConfigJAXRPC
-{
- private String handlerChainName;
- private List<UnifiedHandlerMetaData> handlers = new ArrayList<UnifiedHandlerMetaData>();
-
- public String getHandlerChainName()
- {
- return handlerChainName;
- }
-
- public void setHandlerChainName(String handlerChainName)
- {
- this.handlerChainName = handlerChainName;
- }
-
- public List<UnifiedHandlerMetaData> getHandlers()
- {
- return handlers;
- }
-
- public void setHandlers(List<UnifiedHandlerMetaData> handlers)
- {
- this.handlers = handlers;
- }
-}
Modified: branches/tdiesler/trunk/src/main/java/org/jboss/ws/metadata/j2ee/UnifiedHandlerMetaData.java
===================================================================
--- branches/tdiesler/trunk/src/main/java/org/jboss/ws/metadata/j2ee/UnifiedHandlerMetaData.java 2006-08-13 20:45:16 UTC (rev 738)
+++ branches/tdiesler/trunk/src/main/java/org/jboss/ws/metadata/j2ee/UnifiedHandlerMetaData.java 2006-08-14 07:55:44 UTC (rev 739)
@@ -25,22 +25,28 @@
import java.io.Serializable;
import java.util.ArrayList;
-import java.util.Collections;
import java.util.HashSet;
import java.util.Set;
import javax.xml.namespace.QName;
+import org.jboss.ws.metadata.jsr181.HandlerChainMetaData;
+
/**
* The container independent metdata data for a handler element
*
* @author Thomas.Diesler at jboss.org
* @since 05-May-2006
*/
-public abstract class UnifiedHandlerMetaData implements Serializable
+public class UnifiedHandlerMetaData implements Serializable
{
- public enum HandlerType {PRE, ENDPOINT, POST, ALL};
-
+ public enum HandlerType
+ {
+ PRE, ENDPOINT, POST, ALL
+ };
+
+ private HandlerChainMetaData chainConfig;
+
// The required <handler-name> element
private String handlerName;
// The required <handler-class> element
@@ -51,7 +57,14 @@
private Set<QName> soapHeaders = new HashSet<QName>();
// The optional <soap-role> elements
private Set<String> soapRoles = new HashSet<String>();
+ // The optional <port-name> elements
+ private Set<String> portNames = new HashSet<String>();
+ public UnifiedHandlerMetaData(HandlerChainMetaData handlerChainMetaData)
+ {
+ this.chainConfig = handlerChainMetaData;
+ }
+
public void setHandlerName(String value)
{
this.handlerName = value;
@@ -91,7 +104,7 @@
public Set<String> getSoapRoles()
{
- return Collections.unmodifiableSet(soapRoles);
+ return soapRoles;
}
public void addSoapHeader(QName qName)
@@ -101,6 +114,47 @@
public Set<QName> getSoapHeaders()
{
- return Collections.unmodifiableSet(soapHeaders);
+ return soapHeaders;
}
+
+ public String getProtocolBindings()
+ {
+ return (chainConfig != null ? chainConfig.getProtocolBindings() : null);
+ }
+
+ public QName getServiceNamePattern()
+ {
+ return (chainConfig != null ? chainConfig.getServiceNamePattern() : null);
+ }
+
+ public QName getPortNamePattern()
+ {
+ return (chainConfig != null ? chainConfig.getPortNamePattern() : null);
+ }
+
+ public void addPortName(String portName)
+ {
+ portNames.add(portName);
+ }
+
+ public String[] getPortNames()
+ {
+ String[] strarr = new String[portNames.size()];
+ portNames.toArray(strarr);
+ return strarr;
+ }
+
+ public String toString()
+ {
+ StringBuffer buffer = new StringBuffer("\nHandlerMetaData:");
+ buffer.append("\n name=" + getHandlerName());
+ buffer.append("\n class=" + getHandlerClass());
+ buffer.append("\n params=" + getInitParams());
+ buffer.append("\n headers=" + getSoapHeaders());
+ buffer.append("\n roles=" + getSoapRoles());
+ buffer.append("\n protocols=" + getProtocolBindings());
+ buffer.append("\n services=" + getServiceNamePattern());
+ buffer.append("\n ports=" + (getPortNamePattern() != null ? getPortNamePattern() : portNames));
+ return buffer.toString();
+ }
}
Deleted: branches/tdiesler/trunk/src/main/java/org/jboss/ws/metadata/j2ee/UnifiedHandlerMetaDataJAXRPC.java
===================================================================
--- branches/tdiesler/trunk/src/main/java/org/jboss/ws/metadata/j2ee/UnifiedHandlerMetaDataJAXRPC.java 2006-08-13 20:45:16 UTC (rev 738)
+++ branches/tdiesler/trunk/src/main/java/org/jboss/ws/metadata/j2ee/UnifiedHandlerMetaDataJAXRPC.java 2006-08-14 07:55:44 UTC (rev 739)
@@ -1,59 +0,0 @@
-/*
- * JBoss, Home of Professional Open Source
- * Copyright 2005, JBoss Inc., and individual contributors as indicated
- * by the @authors tag. See the copyright.txt 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.ws.metadata.j2ee;
-
-//$Id: UnifiedHandlerMetaData.java 697 2006-08-07 08:44:39Z thomas.diesler at jboss.com $
-
-import java.util.Collections;
-import java.util.HashSet;
-import java.util.Set;
-
-/**
- * The container independent metdata data for a handler element
- *
- * @author Thomas.Diesler at jboss.org
- * @since 05-May-2006
- */
-public class UnifiedHandlerMetaDataJAXRPC extends UnifiedHandlerMetaData
-{
- private static final long serialVersionUID = 8704185647582526122L;
-
- // The optional <port-name> elements, these only apply to webserve clients
- private Set<String> portNames = new HashSet<String>();
-
- public Set<String> getPortNames()
- {
- return Collections.unmodifiableSet(portNames);
- }
-
- public String toString()
- {
- StringBuffer buffer = new StringBuffer("\nHandlerMetaData:");
- buffer.append("\n name=" + getHandlerName());
- buffer.append("\n class=" + getHandlerClass());
- buffer.append("\n params=" + getInitParams());
- buffer.append("\n headers=" + getSoapHeaders());
- buffer.append("\n roles=" + getSoapRoles());
- buffer.append("\n ports=" + getPortNames());
- return buffer.toString();
- }
-}
Deleted: branches/tdiesler/trunk/src/main/java/org/jboss/ws/metadata/j2ee/UnifiedHandlerMetaDataJAXWS.java
===================================================================
--- branches/tdiesler/trunk/src/main/java/org/jboss/ws/metadata/j2ee/UnifiedHandlerMetaDataJAXWS.java 2006-08-13 20:45:16 UTC (rev 738)
+++ branches/tdiesler/trunk/src/main/java/org/jboss/ws/metadata/j2ee/UnifiedHandlerMetaDataJAXWS.java 2006-08-14 07:55:44 UTC (rev 739)
@@ -1,74 +0,0 @@
-/*
- * JBoss, Home of Professional Open Source
- * Copyright 2005, JBoss Inc., and individual contributors as indicated
- * by the @authors tag. See the copyright.txt 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.ws.metadata.j2ee;
-
-import javax.xml.namespace.QName;
-
-import org.jboss.ws.metadata.jsr181.HandlerChainMetaData;
-
-//$Id: UnifiedHandlerMetaData.java 697 2006-08-07 08:44:39Z thomas.diesler at jboss.com $
-
-
-/**
- * The container independent metdata data for a handler element
- *
- * @author Thomas.Diesler at jboss.org
- * @since 05-May-2006
- */
-public class UnifiedHandlerMetaDataJAXWS extends UnifiedHandlerMetaData
-{
- private HandlerChainMetaData chainConfig;
-
- public UnifiedHandlerMetaDataJAXWS(HandlerChainMetaData handlerChainMetaData)
- {
- this.chainConfig = handlerChainMetaData;
- }
-
- public String getProtocolBindings()
- {
- return chainConfig.getProtocolBindings();
- }
-
- public QName getServiceNamePattern()
- {
- return chainConfig.getServiceNamePattern();
- }
-
- public QName getPortNamePattern()
- {
- return chainConfig.getPortNamePattern();
- }
-
- public String toString()
- {
- StringBuffer buffer = new StringBuffer("\nHandlerMetaData:");
- buffer.append("\n name=" + getHandlerName());
- buffer.append("\n class=" + getHandlerClass());
- buffer.append("\n params=" + getInitParams());
- buffer.append("\n headers=" + getSoapHeaders());
- buffer.append("\n roles=" + getSoapRoles());
- buffer.append("\n protocols=" + getProtocolBindings());
- buffer.append("\n services=" + getServiceNamePattern());
- buffer.append("\n ports=" + getPortNamePattern());
- return buffer.toString();
- }
-}
Modified: branches/tdiesler/trunk/src/main/java/org/jboss/ws/metadata/j2ee/UnifiedServiceRefMetaData.java
===================================================================
--- branches/tdiesler/trunk/src/main/java/org/jboss/ws/metadata/j2ee/UnifiedServiceRefMetaData.java 2006-08-13 20:45:16 UTC (rev 738)
+++ branches/tdiesler/trunk/src/main/java/org/jboss/ws/metadata/j2ee/UnifiedServiceRefMetaData.java 2006-08-14 07:55:44 UTC (rev 739)
@@ -59,7 +59,7 @@
// The LinkedHashMap<String, UnifiedPortComponentRefMetaData> for <port-component-ref> elements
private Map<String, UnifiedPortComponentRefMetaData> portComponentRefs = new LinkedHashMap<String, UnifiedPortComponentRefMetaData>();
// The optional <handler> elements
- private List<UnifiedHandlerMetaDataJAXRPC> handlers = new ArrayList<UnifiedHandlerMetaDataJAXRPC>();
+ private List<UnifiedHandlerMetaData> handlers = new ArrayList<UnifiedHandlerMetaData>();
// The optional JBossWS config-name
private String configName;
@@ -141,14 +141,14 @@
this.portComponentRefs = portComponentRefs;
}
- public UnifiedHandlerMetaDataJAXRPC[] getHandlers()
+ public UnifiedHandlerMetaData[] getHandlers()
{
- UnifiedHandlerMetaDataJAXRPC[] array = new UnifiedHandlerMetaDataJAXRPC[handlers.size()];
+ UnifiedHandlerMetaData[] array = new UnifiedHandlerMetaData[handlers.size()];
handlers.toArray(array);
return array;
}
- public void setHandlers(ArrayList<UnifiedHandlerMetaDataJAXRPC> handlers)
+ public void setHandlers(ArrayList<UnifiedHandlerMetaData> handlers)
{
this.handlers = handlers;
}
Modified: branches/tdiesler/trunk/src/main/java/org/jboss/ws/metadata/jsr109/PortComponentMetaData.java
===================================================================
--- branches/tdiesler/trunk/src/main/java/org/jboss/ws/metadata/jsr109/PortComponentMetaData.java 2006-08-13 20:45:16 UTC (rev 738)
+++ branches/tdiesler/trunk/src/main/java/org/jboss/ws/metadata/jsr109/PortComponentMetaData.java 2006-08-14 07:55:44 UTC (rev 739)
@@ -30,7 +30,7 @@
import javax.xml.namespace.QName;
import org.jboss.logging.Logger;
-import org.jboss.ws.metadata.j2ee.UnifiedHandlerMetaDataJAXRPC;
+import org.jboss.ws.metadata.j2ee.UnifiedHandlerMetaData;
/**
* XML Binding and ws4ee meta-data element for
@@ -69,7 +69,7 @@
private String ejbLink;
private String servletLink;
// The optional <handler> elements
- private List<UnifiedHandlerMetaDataJAXRPC> handlers = new ArrayList<UnifiedHandlerMetaDataJAXRPC>();
+ private List<UnifiedHandlerMetaData> handlers = new ArrayList<UnifiedHandlerMetaData>();
// The HTTP context root
private String contextRoot;
@@ -139,14 +139,14 @@
this.serviceEndpointInterface = serviceEndpointInterface;
}
- public void addHandler(UnifiedHandlerMetaDataJAXRPC handler)
+ public void addHandler(UnifiedHandlerMetaData handler)
{
handlers.add(handler);
}
- public UnifiedHandlerMetaDataJAXRPC[] getHandlers()
+ public UnifiedHandlerMetaData[] getHandlers()
{
- UnifiedHandlerMetaDataJAXRPC[] array = new UnifiedHandlerMetaDataJAXRPC[handlers.size()];
+ UnifiedHandlerMetaData[] array = new UnifiedHandlerMetaData[handlers.size()];
handlers.toArray(array);
return array;
}
Modified: branches/tdiesler/trunk/src/main/java/org/jboss/ws/metadata/jsr109/WebservicesFactory.java
===================================================================
--- branches/tdiesler/trunk/src/main/java/org/jboss/ws/metadata/jsr109/WebservicesFactory.java 2006-08-13 20:45:16 UTC (rev 738)
+++ branches/tdiesler/trunk/src/main/java/org/jboss/ws/metadata/jsr109/WebservicesFactory.java 2006-08-14 07:55:44 UTC (rev 739)
@@ -1,24 +1,24 @@
/*
-* JBoss, Home of Professional Open Source
-* Copyright 2005, JBoss Inc., and individual contributors as indicated
-* by the @authors tag. See the copyright.txt 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.
-*/
+ * JBoss, Home of Professional Open Source
+ * Copyright 2005, JBoss Inc., and individual contributors as indicated
+ * by the @authors tag. See the copyright.txt 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.ws.metadata.jsr109;
// $Id$
@@ -27,7 +27,6 @@
import org.jboss.logging.Logger;
import org.jboss.ws.metadata.j2ee.UnifiedHandlerMetaData;
-import org.jboss.ws.metadata.j2ee.UnifiedHandlerMetaDataJAXRPC;
import org.jboss.ws.metadata.j2ee.UnifiedInitParamMetaData;
import org.jboss.xb.binding.ObjectModelFactory;
import org.jboss.xb.binding.UnmarshallingContext;
@@ -39,8 +38,7 @@
* @author Thomas.Diesler at jboss.org
* @since 16-Apr-2004
*/
-public class WebservicesFactory
- implements ObjectModelFactory
+public class WebservicesFactory implements ObjectModelFactory
{
// provide logging
private static final Logger log = Logger.getLogger(WebservicesFactory.class);
@@ -58,11 +56,7 @@
*
* @return the root of the object model.
*/
- public Object newRoot(Object root,
- UnmarshallingContext navigator,
- String namespaceURI,
- String localName,
- Attributes attrs)
+ public Object newRoot(Object root, UnmarshallingContext navigator, String namespaceURI, String localName, Attributes attrs)
{
WebservicesMetaData webservicesMetaData = new WebservicesMetaData(descriptorURL);
return webservicesMetaData;
@@ -76,21 +70,18 @@
/**
* Called when parsing of a new element started.
*/
- public Object newChild(WebservicesMetaData webservices, UnmarshallingContext navigator, String namespaceURI, String localName,
- Attributes attrs)
+ public Object newChild(WebservicesMetaData webservices, UnmarshallingContext navigator, String namespaceURI, String localName, Attributes attrs)
{
if ("webservice-description".equals(localName))
return new WebserviceDescriptionMetaData(webservices);
- else
- return null;
+ else return null;
}
/**
* Called when parsing character is complete.
*/
- public void addChild(WebservicesMetaData webservices,
- WebserviceDescriptionMetaData webserviceDescription,
- UnmarshallingContext navigator, String namespaceURI, String localName)
+ public void addChild(WebservicesMetaData webservices, WebserviceDescriptionMetaData webserviceDescription, UnmarshallingContext navigator, String namespaceURI,
+ String localName)
{
webservices.addWebserviceDescription(webserviceDescription);
}
@@ -98,21 +89,18 @@
/**
* Called when parsing of a new element started.
*/
- public Object newChild(WebserviceDescriptionMetaData webserviceDescription, UnmarshallingContext navigator, String namespaceURI, String localName,
- Attributes attrs)
+ public Object newChild(WebserviceDescriptionMetaData webserviceDescription, UnmarshallingContext navigator, String namespaceURI, String localName, Attributes attrs)
{
if ("port-component".equals(localName))
return new PortComponentMetaData(webserviceDescription);
- else
- return null;
+ else return null;
}
/**
* Called when parsing character is complete.
*/
- public void addChild(WebserviceDescriptionMetaData webserviceDescription,
- PortComponentMetaData portComponent,
- UnmarshallingContext navigator, String namespaceURI, String localName)
+ public void addChild(WebserviceDescriptionMetaData webserviceDescription, PortComponentMetaData portComponent, UnmarshallingContext navigator, String namespaceURI,
+ String localName)
{
webserviceDescription.addPortComponent(portComponent);
}
@@ -120,19 +108,17 @@
/**
* Called when parsing of a new element started.
*/
- public Object newChild(PortComponentMetaData portComponent, UnmarshallingContext navigator, String namespaceURI, String localName,
- Attributes attrs)
+ public Object newChild(PortComponentMetaData portComponent, UnmarshallingContext navigator, String namespaceURI, String localName, Attributes attrs)
{
if ("handler".equals(localName))
- return new UnifiedHandlerMetaDataJAXRPC();
- else
- return null;
+ return new UnifiedHandlerMetaData(null);
+ else return null;
}
/**
* Called when parsing character is complete.
*/
- public void addChild(PortComponentMetaData portComponent, UnifiedHandlerMetaDataJAXRPC handler, UnmarshallingContext navigator, String namespaceURI, String localName)
+ public void addChild(PortComponentMetaData portComponent, UnifiedHandlerMetaData handler, UnmarshallingContext navigator, String namespaceURI, String localName)
{
portComponent.addHandler(handler);
}
@@ -140,13 +126,11 @@
/**
* Called when parsing of a new element started.
*/
- public Object newChild(UnifiedHandlerMetaData handler, UnmarshallingContext navigator, String namespaceURI, String localName,
- Attributes attrs)
+ public Object newChild(UnifiedHandlerMetaData handler, UnmarshallingContext navigator, String namespaceURI, String localName, Attributes attrs)
{
if ("init-param".equals(localName))
return new UnifiedInitParamMetaData();
- else
- return null;
+ else return null;
}
/**
@@ -196,7 +180,7 @@
/**
* Called when a new simple child element with text value was read from the XML content.
*/
- public void setValue(UnifiedHandlerMetaDataJAXRPC handler, UnmarshallingContext navigator, String namespaceURI, String localName, String value)
+ public void setValue(UnifiedHandlerMetaData handler, UnmarshallingContext navigator, String namespaceURI, String localName, String value)
{
if (log.isTraceEnabled())
log.trace("UnifiedHandlerMetaData setValue: nuri=" + namespaceURI + " localName=" + localName + " value=" + value);
Modified: branches/tdiesler/trunk/src/main/java/org/jboss/ws/metadata/jsr181/HandlerChainFactory.java
===================================================================
--- branches/tdiesler/trunk/src/main/java/org/jboss/ws/metadata/jsr181/HandlerChainFactory.java 2006-08-13 20:45:16 UTC (rev 738)
+++ branches/tdiesler/trunk/src/main/java/org/jboss/ws/metadata/jsr181/HandlerChainFactory.java 2006-08-14 07:55:44 UTC (rev 739)
@@ -25,7 +25,6 @@
import org.jboss.logging.Logger;
import org.jboss.ws.metadata.j2ee.UnifiedHandlerMetaData;
-import org.jboss.ws.metadata.j2ee.UnifiedHandlerMetaDataJAXWS;
import org.jboss.ws.metadata.j2ee.UnifiedInitParamMetaData;
import org.jboss.xb.binding.ObjectModelFactory;
import org.jboss.xb.binding.UnmarshallingContext;
@@ -87,7 +86,7 @@
public Object newChild(HandlerChainMetaData chainConfig, UnmarshallingContext navigator, String namespaceURI, String localName, Attributes attrs)
{
if ("handler".equals(localName))
- return new UnifiedHandlerMetaDataJAXWS(chainConfig);
+ return new UnifiedHandlerMetaData(chainConfig);
else
return null;
}
@@ -95,7 +94,7 @@
/**
* Called when parsing character is complete.
*/
- public void addChild(HandlerChainMetaData handlerConfig, UnifiedHandlerMetaDataJAXWS handler, UnmarshallingContext navigator, String namespaceURI, String localName)
+ public void addChild(HandlerChainMetaData handlerConfig, UnifiedHandlerMetaData handler, UnmarshallingContext navigator, String namespaceURI, String localName)
{
handlerConfig.addHandler(handler);
}
Modified: branches/tdiesler/trunk/src/main/java/org/jboss/ws/metadata/jsr181/HandlerChainMetaData.java
===================================================================
--- branches/tdiesler/trunk/src/main/java/org/jboss/ws/metadata/jsr181/HandlerChainMetaData.java 2006-08-13 20:45:16 UTC (rev 738)
+++ branches/tdiesler/trunk/src/main/java/org/jboss/ws/metadata/jsr181/HandlerChainMetaData.java 2006-08-14 07:55:44 UTC (rev 739)
@@ -30,7 +30,7 @@
import javax.xml.namespace.QName;
import org.jboss.logging.Logger;
-import org.jboss.ws.metadata.j2ee.UnifiedHandlerMetaDataJAXWS;
+import org.jboss.ws.metadata.j2ee.UnifiedHandlerMetaData;
/**
* XML Binding element for handler-config/handler-chain elements
@@ -49,7 +49,7 @@
private String protocolBindings;
private QName serviceNamePattern;
private QName portNamePattern;
- private ArrayList<UnifiedHandlerMetaDataJAXWS> handlers = new ArrayList<UnifiedHandlerMetaDataJAXWS>();
+ private ArrayList<UnifiedHandlerMetaData> handlers = new ArrayList<UnifiedHandlerMetaData>();
public HandlerChainMetaData(HandlerChainsMetaData handlerConfig)
{
@@ -61,14 +61,14 @@
return handlerConfig;
}
- public void addHandler(UnifiedHandlerMetaDataJAXWS handlerMetaData)
+ public void addHandler(UnifiedHandlerMetaData handlerMetaData)
{
handlers.add(handlerMetaData);
}
- public List<UnifiedHandlerMetaDataJAXWS> getHandlers()
+ public List<UnifiedHandlerMetaData> getHandlers()
{
- return Collections.unmodifiableList(handlers);
+ return handlers;
}
public QName getPortNamePattern()
Modified: branches/tdiesler/trunk/src/main/java/org/jboss/ws/tools/JavaToWSDL.java
===================================================================
--- branches/tdiesler/trunk/src/main/java/org/jboss/ws/tools/JavaToWSDL.java 2006-08-13 20:45:16 UTC (rev 738)
+++ branches/tdiesler/trunk/src/main/java/org/jboss/ws/tools/JavaToWSDL.java 2006-08-14 07:55:44 UTC (rev 739)
@@ -28,12 +28,12 @@
import java.util.List;
import java.util.Map;
+import javax.jws.soap.SOAPBinding.ParameterStyle;
import javax.xml.rpc.encoding.TypeMapping;
import org.jboss.logging.Logger;
import org.jboss.ws.Constants;
import org.jboss.ws.WSException;
-import org.jboss.ws.jaxrpc.ParameterStyle;
import org.jboss.ws.jaxrpc.Style;
import org.jboss.ws.metadata.UnifiedMetaData;
import org.jboss.ws.metadata.jaxrpcmapping.JavaWsdlMapping;
Modified: branches/tdiesler/trunk/src/main/java/org/jboss/ws/tools/helpers/ToolsHelper.java
===================================================================
--- branches/tdiesler/trunk/src/main/java/org/jboss/ws/tools/helpers/ToolsHelper.java 2006-08-13 20:45:16 UTC (rev 738)
+++ branches/tdiesler/trunk/src/main/java/org/jboss/ws/tools/helpers/ToolsHelper.java 2006-08-14 07:55:44 UTC (rev 739)
@@ -32,6 +32,7 @@
import java.util.List;
import java.util.Map;
+import javax.jws.soap.SOAPBinding.ParameterStyle;
import javax.xml.namespace.QName;
import org.jboss.logging.Logger;
@@ -40,7 +41,6 @@
import org.jboss.ws.Constants;
import org.jboss.ws.WSException;
import org.jboss.ws.jaxrpc.LiteralTypeMapping;
-import org.jboss.ws.jaxrpc.ParameterStyle;
import org.jboss.ws.jaxrpc.Style;
import org.jboss.ws.metadata.EndpointMetaData;
import org.jboss.ws.metadata.OperationMetaData;
@@ -57,7 +57,6 @@
import org.jboss.ws.tools.JavaToWSDL;
import org.jboss.ws.tools.JavaWriter;
import org.jboss.ws.tools.NamespacePackageMapping;
-import org.jboss.ws.tools.ToolsUtils;
import org.jboss.ws.tools.WSDLToJava;
import org.jboss.ws.tools.WSDotXMLCreator;
import org.jboss.ws.tools.Configuration.GlobalConfig;
@@ -193,41 +192,41 @@
}
}
- private void createWrapperTypes(JavaToWSDLConfig j2wc, String outDir, UnifiedMetaData unifiedMetaData, JavaWsdlMapping mapping, Class endpointClass)
+ private void createWrapperTypes(JavaToWSDLConfig j2wc, String outDir, UnifiedMetaData wsMetaData, JavaWsdlMapping mapping, Class endpointClass)
throws IOException
{
Map<QName, JavaXmlTypeMapping> index = indexMappingTypes(mapping);
- EndpointMetaData endpoint = null;
- for (ServiceMetaData service : unifiedMetaData.getServices())
+ EndpointMetaData epMetaData = null;
+ for (ServiceMetaData service : wsMetaData.getServices())
{
- endpoint = service.getEndpointByServiceEndpointInterface(j2wc.endpointName);
- if (endpoint != null)
+ epMetaData = service.getEndpointByServiceEndpointInterface(j2wc.endpointName);
+ if (epMetaData != null)
break;
}
- if (endpoint == null)
+ if (epMetaData == null)
throw new WSException("Could not find endpoint in metadata: " + j2wc.endpointName);
- if (endpoint.getStyle() != Style.DOCUMENT || endpoint.getParameterStyle() != ParameterStyle.WRAPPED)
- return;
-
String packageName = endpointClass.getPackage().getName();
- ClassLoader classLoader = unifiedMetaData.getClassLoader();
+ ClassLoader classLoader = wsMetaData.getClassLoader();
- for (OperationMetaData operation : endpoint.getOperations())
+ for (OperationMetaData opMetaData : epMetaData.getOperations())
{
- for (ParameterMetaData parameter : operation.getParameters())
+ if (opMetaData.isDocumentWrapped() == false)
{
- String name = endpointClass.getSimpleName() + "_" + operation.getQName().getLocalPart() + "_RequestStruct";
- createWrapperType(parameter, name, packageName, index, classLoader, outDir);
- }
+ for (ParameterMetaData parameter : opMetaData.getParameters())
+ {
+ String name = endpointClass.getSimpleName() + "_" + opMetaData.getQName().getLocalPart() + "_RequestStruct";
+ createWrapperType(parameter, name, packageName, index, classLoader, outDir);
+ }
- ParameterMetaData returnParameter = operation.getReturnParameter();
- if (returnParameter != null)
- {
- String name = endpointClass.getSimpleName() + "_" + operation.getQName().getLocalPart() + "_ResponseStruct";
- createWrapperType(returnParameter, name, packageName, index, classLoader, outDir);
+ ParameterMetaData returnParameter = opMetaData.getReturnParameter();
+ if (returnParameter != null)
+ {
+ String name = endpointClass.getSimpleName() + "_" + opMetaData.getQName().getLocalPart() + "_ResponseStruct";
+ createWrapperType(returnParameter, name, packageName, index, classLoader, outDir);
+ }
}
}
Modified: branches/tdiesler/trunk/src/main/java/org/jboss/ws/tools/metadata/ToolsUnifiedMetaDataBuilder.java
===================================================================
--- branches/tdiesler/trunk/src/main/java/org/jboss/ws/tools/metadata/ToolsUnifiedMetaDataBuilder.java 2006-08-13 20:45:16 UTC (rev 738)
+++ branches/tdiesler/trunk/src/main/java/org/jboss/ws/tools/metadata/ToolsUnifiedMetaDataBuilder.java 2006-08-14 07:55:44 UTC (rev 739)
@@ -21,16 +21,18 @@
*/
package org.jboss.ws.tools.metadata;
+// $Id: $
+
import java.rmi.Remote;
import java.util.List;
import java.util.Map;
+import javax.jws.soap.SOAPBinding.ParameterStyle;
import javax.xml.namespace.QName;
import org.jboss.logging.Logger;
import org.jboss.ws.Constants;
import org.jboss.ws.WSException;
-import org.jboss.ws.jaxrpc.ParameterStyle;
import org.jboss.ws.jaxrpc.Style;
import org.jboss.ws.metadata.ServiceMetaData;
import org.jboss.ws.metadata.UnifiedMetaData;
Modified: branches/tdiesler/trunk/src/main/resources/jbossws.sar/META-INF/standard-jaxws-client-config.xml
===================================================================
--- branches/tdiesler/trunk/src/main/resources/jbossws.sar/META-INF/standard-jaxws-client-config.xml 2006-08-13 20:45:16 UTC (rev 738)
+++ branches/tdiesler/trunk/src/main/resources/jbossws.sar/META-INF/standard-jaxws-client-config.xml 2006-08-14 07:55:44 UTC (rev 739)
@@ -25,7 +25,7 @@
</client-config>
<client-config>
- <config-name>Standard Secure Client</config-name>
+ <config-name>Standard WSSecurity Client</config-name>
<post-handler-chains>
<javaee:handler-chain>
<javaee:protocol-bindings>##SOAP11_HTTP</javaee:protocol-bindings>
Modified: branches/tdiesler/trunk/src/main/resources/jbossws.sar/META-INF/standard-jaxws-endpoint-config.xml
===================================================================
--- branches/tdiesler/trunk/src/main/resources/jbossws.sar/META-INF/standard-jaxws-endpoint-config.xml 2006-08-13 20:45:16 UTC (rev 738)
+++ branches/tdiesler/trunk/src/main/resources/jbossws.sar/META-INF/standard-jaxws-endpoint-config.xml 2006-08-14 07:55:44 UTC (rev 739)
@@ -25,7 +25,7 @@
</endpoint-config>
<endpoint-config>
- <config-name>Standard Secure Endpoint</config-name>
+ <config-name>Standard WSSecurity Endpoint</config-name>
<pre-handler-chains>
<javaee:handler-chain>
<javaee:protocol-bindings>##SOAP11_HTTP</javaee:protocol-bindings>
Modified: branches/tdiesler/trunk/src/test/ant/build-jars.xml
===================================================================
--- branches/tdiesler/trunk/src/test/ant/build-jars.xml 2006-08-13 20:45:16 UTC (rev 738)
+++ branches/tdiesler/trunk/src/test/ant/build-jars.xml 2006-08-14 07:55:44 UTC (rev 739)
@@ -1537,6 +1537,9 @@
<include name="org/jboss/test/ws/samples/wsaddressing/StatefulEndpoint.class"/>
<include name="org/jboss/test/ws/samples/wsaddressing/ServerHandler.class"/>
</classes>
+ <webinf dir="${build.test.dir}/resources/samples/wsaddressing/WEB-INF">
+ <include name="jaxws-handlers.xml"/>
+ </webinf>
</war>
<!-- jbossws-samples-wssecurity-sign -->
Modified: branches/tdiesler/trunk/src/test/java/org/jboss/test/ws/config/WSConfigTestCase.java
===================================================================
--- branches/tdiesler/trunk/src/test/java/org/jboss/test/ws/config/WSConfigTestCase.java 2006-08-13 20:45:16 UTC (rev 738)
+++ branches/tdiesler/trunk/src/test/java/org/jboss/test/ws/config/WSConfigTestCase.java 2006-08-14 07:55:44 UTC (rev 739)
@@ -27,7 +27,6 @@
import org.jboss.ws.metadata.config.WSConfigFactory;
import org.jboss.ws.metadata.config.jaxrpc.WSConfigRootJAXRPC;
import org.jboss.ws.metadata.config.jaxrpc.WSEndpointConfigJAXRPC;
-import org.jboss.ws.metadata.config.jaxrpc.WSHandlerChainConfigJAXRPC;
import org.jboss.ws.metadata.config.jaxws.WSConfigRootJAXWS;
import org.jboss.ws.metadata.config.jaxws.WSEndpointConfigJAXWS;
import org.jboss.ws.metadata.j2ee.UnifiedHandlerMetaData;
@@ -69,9 +68,8 @@
assertNull(epc1.getPreHandlerChain());
assertNull(epc1.getPostHandlerChain());
- assertEquals("Standard Secure Endpoint", epc2.getConfigName());
- WSHandlerChainConfigJAXRPC preChain = epc2.getPreHandlerChain();
- assertEquals("PreHandlerChain", preChain.getHandlerChainName());
+ assertEquals("Standard WSSecurity Endpoint", epc2.getConfigName());
+ HandlerChainMetaData preChain = epc2.getPreHandlerChain();
assertEquals(1, preChain.getHandlers().size());
UnifiedHandlerMetaData h1 = (UnifiedHandlerMetaData)preChain.getHandlers().get(0);
assertEquals("WSSecurityHandlerInbound", h1.getHandlerName());
@@ -96,7 +94,7 @@
assertNull(epc1.getPreHandlerChains());
assertNull(epc1.getPostHandlerChains());
- assertEquals("Standard Secure Endpoint", epc2.getConfigName());
+ assertEquals("Standard WSSecurity Endpoint", epc2.getConfigName());
HandlerChainMetaData preChain = epc2.getPreHandlerChains().getHandlerChains().get(0);
assertEquals("##SOAP11_HTTP", preChain.getProtocolBindings());
assertEquals(1, preChain.getHandlers().size());
Modified: branches/tdiesler/trunk/src/test/java/org/jboss/test/ws/jsr181/handlerchain/JSR181HandlerChainTestCase.java
===================================================================
--- branches/tdiesler/trunk/src/test/java/org/jboss/test/ws/jsr181/handlerchain/JSR181HandlerChainTestCase.java 2006-08-13 20:45:16 UTC (rev 738)
+++ branches/tdiesler/trunk/src/test/java/org/jboss/test/ws/jsr181/handlerchain/JSR181HandlerChainTestCase.java 2006-08-14 07:55:44 UTC (rev 739)
@@ -63,6 +63,7 @@
handlerChain.add(new LogHandler());
handlerChain.add(new AuthorizationHandler());
handlerChain.add(new RoutingHandler());
+ bindingProvider.getBinding().setHandlerChain(handlerChain);
String retObj = port.echo("Kermit");
assertEquals("Kermit|LogOut|AuthOut|RoutOut|LogIn|AuthIn|RoutIn|endpoint|RoutOut|AuthOut|LogOut|RoutIn|AuthIn|LogIn", retObj);
Modified: branches/tdiesler/trunk/src/test/resources/config/jaxrpc-endpoint-config.xml
===================================================================
--- branches/tdiesler/trunk/src/test/resources/config/jaxrpc-endpoint-config.xml 2006-08-13 20:45:16 UTC (rev 738)
+++ branches/tdiesler/trunk/src/test/resources/config/jaxrpc-endpoint-config.xml 2006-08-14 07:55:44 UTC (rev 739)
@@ -12,7 +12,7 @@
</endpoint-config>
<endpoint-config>
- <config-name>Standard Secure Endpoint</config-name>
+ <config-name>Standard WSSecurity Endpoint</config-name>
<pre-handler-chain>
<handler-chain-name>PreHandlerChain</handler-chain-name>
<handler>
Modified: branches/tdiesler/trunk/src/test/resources/config/jaxws-endpoint-config.xml
===================================================================
--- branches/tdiesler/trunk/src/test/resources/config/jaxws-endpoint-config.xml 2006-08-13 20:45:16 UTC (rev 738)
+++ branches/tdiesler/trunk/src/test/resources/config/jaxws-endpoint-config.xml 2006-08-14 07:55:44 UTC (rev 739)
@@ -12,7 +12,7 @@
</endpoint-config>
<endpoint-config>
- <config-name>Standard Secure Endpoint</config-name>
+ <config-name>Standard WSSecurity Endpoint</config-name>
<pre-handler-chains>
<javaee:handler-chain>
<javaee:protocol-bindings>##SOAP11_HTTP</javaee:protocol-bindings>
Modified: branches/tdiesler/trunk/src/test/resources/jbws1121/META-INF/jboss-client.xml
===================================================================
--- branches/tdiesler/trunk/src/test/resources/jbws1121/META-INF/jboss-client.xml 2006-08-13 20:45:16 UTC (rev 738)
+++ branches/tdiesler/trunk/src/test/resources/jbws1121/META-INF/jboss-client.xml 2006-08-14 07:55:44 UTC (rev 739)
@@ -9,7 +9,7 @@
<service-ref>
<service-ref-name>service/HelloWorldService</service-ref-name>
- <config-name>Standard Secure Client</config-name>
+ <config-name>Standard WSSecurity Client</config-name>
<wsdl-override>http://@jbosstest.host.name@:8080/jbossws-jbws1121?wsdl</wsdl-override>
</service-ref>
Modified: branches/tdiesler/trunk/src/test/resources/jbws1121/WEB-INF/web.xml
===================================================================
--- branches/tdiesler/trunk/src/test/resources/jbws1121/WEB-INF/web.xml 2006-08-13 20:45:16 UTC (rev 738)
+++ branches/tdiesler/trunk/src/test/resources/jbws1121/WEB-INF/web.xml 2006-08-14 07:55:44 UTC (rev 739)
@@ -7,7 +7,7 @@
<context-param>
<param-name>jbossws-config-name</param-name>>
- <param-value>Standard Secure Endpoint</param-value>
+ <param-value>Standard WSSecurity Endpoint</param-value>
</context-param>
<servlet>
Modified: branches/tdiesler/trunk/src/test/resources/samples/wssecurity/WEB-INF/web.xml
===================================================================
--- branches/tdiesler/trunk/src/test/resources/samples/wssecurity/WEB-INF/web.xml 2006-08-13 20:45:16 UTC (rev 738)
+++ branches/tdiesler/trunk/src/test/resources/samples/wssecurity/WEB-INF/web.xml 2006-08-14 07:55:44 UTC (rev 739)
@@ -7,7 +7,7 @@
<context-param>
<param-name>jbossws-config-name</param-name>>
- <param-value>Standard Secure Endpoint</param-value>
+ <param-value>Standard WSSecurity Endpoint</param-value>
</context-param>
<servlet>
Modified: branches/tdiesler/trunk/src/test/resources/samples/wssecurity/simple-encrypt/META-INF/jboss-client.xml
===================================================================
--- branches/tdiesler/trunk/src/test/resources/samples/wssecurity/simple-encrypt/META-INF/jboss-client.xml 2006-08-13 20:45:16 UTC (rev 738)
+++ branches/tdiesler/trunk/src/test/resources/samples/wssecurity/simple-encrypt/META-INF/jboss-client.xml 2006-08-14 07:55:44 UTC (rev 739)
@@ -9,7 +9,7 @@
<service-ref>
<service-ref-name>service/HelloService</service-ref-name>
- <config-name>Standard Secure Client</config-name>
+ <config-name>Standard WSSecurity Client</config-name>
<wsdl-override>http://@jbosstest.host.name@:8080/jbossws-samples-wssecurity-encrypt?wsdl</wsdl-override>
</service-ref>
Modified: branches/tdiesler/trunk/src/test/resources/samples/wssecurity/simple-sign/META-INF/jboss-client.xml
===================================================================
--- branches/tdiesler/trunk/src/test/resources/samples/wssecurity/simple-sign/META-INF/jboss-client.xml 2006-08-13 20:45:16 UTC (rev 738)
+++ branches/tdiesler/trunk/src/test/resources/samples/wssecurity/simple-sign/META-INF/jboss-client.xml 2006-08-14 07:55:44 UTC (rev 739)
@@ -9,7 +9,7 @@
<service-ref>
<service-ref-name>service/HelloService</service-ref-name>
- <config-name>Standard Secure Client</config-name>
+ <config-name>Standard WSSecurity Client</config-name>
<wsdl-override>http://@jbosstest.host.name@:8080/jbossws-samples-wssecurity-sign?wsdl</wsdl-override>
</service-ref>
Modified: branches/tdiesler/trunk/src/test/resources/wsse/account-signup/META-INF/jboss-client.xml
===================================================================
--- branches/tdiesler/trunk/src/test/resources/wsse/account-signup/META-INF/jboss-client.xml 2006-08-13 20:45:16 UTC (rev 738)
+++ branches/tdiesler/trunk/src/test/resources/wsse/account-signup/META-INF/jboss-client.xml 2006-08-14 07:55:44 UTC (rev 739)
@@ -9,7 +9,7 @@
<service-ref>
<service-ref-name>service/AccountSignupService</service-ref-name>
- <config-name>Standard Secure Client</config-name>
+ <config-name>Standard WSSecurity Client</config-name>
<wsdl-override>http://@jbosstest.host.name@:8080/jbossws-wsse-account-signup?wsdl</wsdl-override>
</service-ref>
Modified: branches/tdiesler/trunk/src/test/resources/wsse/account-signup/WEB-INF/jboss-web.xml
===================================================================
--- branches/tdiesler/trunk/src/test/resources/wsse/account-signup/WEB-INF/jboss-web.xml 2006-08-13 20:45:16 UTC (rev 738)
+++ branches/tdiesler/trunk/src/test/resources/wsse/account-signup/WEB-INF/jboss-web.xml 2006-08-14 07:55:44 UTC (rev 739)
@@ -6,7 +6,7 @@
<webservice-description>
<webservice-description-name>HelloService</webservice-description-name>
- <config-name>Standard Secure Endpoint</config-name>
+ <config-name>Standard WSSecurity Endpoint</config-name>
</webservice-description>
</jboss-web>
Modified: branches/tdiesler/trunk/src/test/resources/wsse/rpc/META-INF/jboss-client.xml
===================================================================
--- branches/tdiesler/trunk/src/test/resources/wsse/rpc/META-INF/jboss-client.xml 2006-08-13 20:45:16 UTC (rev 738)
+++ branches/tdiesler/trunk/src/test/resources/wsse/rpc/META-INF/jboss-client.xml 2006-08-14 07:55:44 UTC (rev 739)
@@ -9,7 +9,7 @@
<service-ref>
<service-ref-name>service/HelloService</service-ref-name>
- <config-name>Standard Secure Client</config-name>
+ <config-name>Standard WSSecurity Client</config-name>
<wsdl-override>http://@jbosstest.host.name@:8080/jbossws-wsse-rpc?wsdl</wsdl-override>
</service-ref>
Modified: branches/tdiesler/trunk/src/test/resources/wsse/rpc/WEB-INF/jboss-web.xml
===================================================================
--- branches/tdiesler/trunk/src/test/resources/wsse/rpc/WEB-INF/jboss-web.xml 2006-08-13 20:45:16 UTC (rev 738)
+++ branches/tdiesler/trunk/src/test/resources/wsse/rpc/WEB-INF/jboss-web.xml 2006-08-14 07:55:44 UTC (rev 739)
@@ -8,7 +8,7 @@
<webservice-description>
<webservice-description-name>HelloService</webservice-description-name>
- <config-name>Standard Secure Endpoint</config-name>
+ <config-name>Standard WSSecurity Endpoint</config-name>
</webservice-description>
</jboss-web>
Modified: branches/tdiesler/trunk/src/test/resources/wsse/username/META-INF/jboss-client.xml
===================================================================
--- branches/tdiesler/trunk/src/test/resources/wsse/username/META-INF/jboss-client.xml 2006-08-13 20:45:16 UTC (rev 738)
+++ branches/tdiesler/trunk/src/test/resources/wsse/username/META-INF/jboss-client.xml 2006-08-14 07:55:44 UTC (rev 739)
@@ -9,7 +9,7 @@
<service-ref>
<service-ref-name>service/TestServiceEJB</service-ref-name>
- <config-name>Standard Secure Client</config-name>
+ <config-name>Standard WSSecurity Client</config-name>
<wsdl-override>http://@jbosstest.host.name@:8080/jbossws-wsse-username?wsdl</wsdl-override>
</service-ref>
Modified: branches/tdiesler/trunk/src/test/resources/wsse/username/META-INF/jboss.xml
===================================================================
--- branches/tdiesler/trunk/src/test/resources/wsse/username/META-INF/jboss.xml 2006-08-13 20:45:16 UTC (rev 738)
+++ branches/tdiesler/trunk/src/test/resources/wsse/username/META-INF/jboss.xml 2006-08-14 07:55:44 UTC (rev 739)
@@ -8,7 +8,7 @@
<webservices>
<webservice-description>
<webservice-description-name>TestService</webservice-description-name>
- <config-name>Standard Secure Endpoint</config-name>
+ <config-name>Standard WSSecurity Endpoint</config-name>
</webservice-description>
</webservices>
Modified: branches/tdiesler/trunk/src/test/resources/wsse/webclient/WEB-INF/jboss-web.xml
===================================================================
--- branches/tdiesler/trunk/src/test/resources/wsse/webclient/WEB-INF/jboss-web.xml 2006-08-13 20:45:16 UTC (rev 738)
+++ branches/tdiesler/trunk/src/test/resources/wsse/webclient/WEB-INF/jboss-web.xml 2006-08-14 07:55:44 UTC (rev 739)
@@ -7,12 +7,12 @@
<webservice-description>
<webservice-description-name>HelloService</webservice-description-name>
- <config-name>Standard Secure Endpoint</config-name>
+ <config-name>Standard WSSecurity Endpoint</config-name>
</webservice-description>
<service-ref>
<service-ref-name>service/HelloService</service-ref-name>
- <config-name>Standard Secure Client</config-name>
+ <config-name>Standard WSSecurity Client</config-name>
<wsdl-override>http://@jbosstest.host.name@:8080/jbossws-wsse-rpc/Hello?wsdl</wsdl-override>
</service-ref>
</jboss-web>
More information about the jboss-svn-commits
mailing list