[jboss-svn-commits] JBossWS SVN: r949 - in branches/jbossws-1.0/src: main/java/javax/xml/ws main/java/javax/xml/ws/addressing main/java/org/jboss/ws main/java/org/jboss/ws/common main/java/org/jboss/ws/deployment main/java/org/jboss/ws/integration/jboss main/java/org/jboss/ws/metadata main/java/org/jboss/ws/server main/java/org/jboss/ws/soap main/java/org/jboss/ws/tools main/java/org/jboss/ws/tools/helpers test/java/org/jboss/test/ws/common/binding test/java/org/jboss/test/ws/common/soap/attachment test/java/org/jboss/test/ws/tools test/java/org/jboss/test/ws/tools/validation test/java/org/jboss/test/ws/tools/xmlschema
jboss-svn-commits at lists.jboss.org
jboss-svn-commits at lists.jboss.org
Wed Sep 13 06:54:13 EDT 2006
Author: thomas.diesler at jboss.com
Date: 2006-09-13 06:53:54 -0400 (Wed, 13 Sep 2006)
New Revision: 949
Added:
branches/jbossws-1.0/src/main/java/org/jboss/ws/common/CommonBinding.java
branches/jbossws-1.0/src/main/java/org/jboss/ws/common/CommonBindingProvider.java
branches/jbossws-1.0/src/main/java/org/jboss/ws/common/CommonSOAP11Binding.java
branches/jbossws-1.0/src/main/java/org/jboss/ws/common/CommonSOAP12Binding.java
branches/jbossws-1.0/src/main/java/org/jboss/ws/common/CommonSOAPBinding.java
Removed:
branches/jbossws-1.0/src/main/java/javax/xml/ws/Binding.java
branches/jbossws-1.0/src/main/java/javax/xml/ws/BindingProvider.java
branches/jbossws-1.0/src/main/java/javax/xml/ws/WebServiceException.java
branches/jbossws-1.0/src/main/java/javax/xml/ws/handler/
branches/jbossws-1.0/src/main/java/javax/xml/ws/http/
branches/jbossws-1.0/src/main/java/javax/xml/ws/soap/
branches/jbossws-1.0/src/main/java/org/jboss/ws/handler/
branches/jbossws-1.0/src/main/java/org/jboss/ws/jaxb/
branches/jbossws-1.0/src/main/java/org/jboss/ws/jaxws/
Modified:
branches/jbossws-1.0/src/main/java/javax/xml/ws/addressing/AddressingException.java
branches/jbossws-1.0/src/main/java/org/jboss/ws/common/CommonClient.java
branches/jbossws-1.0/src/main/java/org/jboss/ws/deployment/MetaDataBuilder.java
branches/jbossws-1.0/src/main/java/org/jboss/ws/integration/jboss/ServiceEndpointInterceptor.java
branches/jbossws-1.0/src/main/java/org/jboss/ws/metadata/EndpointMetaData.java
branches/jbossws-1.0/src/main/java/org/jboss/ws/server/AbstractServiceEndpointInvoker.java
branches/jbossws-1.0/src/main/java/org/jboss/ws/soap/SAAJPayloadBuilderDOM.java
branches/jbossws-1.0/src/main/java/org/jboss/ws/soap/SOAPConnectionImpl.java
branches/jbossws-1.0/src/main/java/org/jboss/ws/tools/JavaToWSDL11.java
branches/jbossws-1.0/src/main/java/org/jboss/ws/tools/helpers/JavaToWSDLHelper.java
branches/jbossws-1.0/src/test/java/org/jboss/test/ws/common/binding/SOAPBindingTestCase.java
branches/jbossws-1.0/src/test/java/org/jboss/test/ws/common/soap/attachment/GenericAttachmentTestCase.java
branches/jbossws-1.0/src/test/java/org/jboss/test/ws/tools/SchemaGeneratorTestCase.java
branches/jbossws-1.0/src/test/java/org/jboss/test/ws/tools/validation/WSDL11Validator.java
branches/jbossws-1.0/src/test/java/org/jboss/test/ws/tools/validation/WSDLValidator.java
branches/jbossws-1.0/src/test/java/org/jboss/test/ws/tools/xmlschema/WSDLTypesTestCase.java
Log:
Remove dependency on JAXWS for the core API
Deleted: branches/jbossws-1.0/src/main/java/javax/xml/ws/Binding.java
===================================================================
--- branches/jbossws-1.0/src/main/java/javax/xml/ws/Binding.java 2006-09-13 10:26:12 UTC (rev 948)
+++ branches/jbossws-1.0/src/main/java/javax/xml/ws/Binding.java 2006-09-13 10:53:54 UTC (rev 949)
@@ -1,45 +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 javax.xml.ws;
-
-import java.util.List;
-
-import javax.xml.ws.handler.Handler;
-
-/**
- * The Binding interface is the base interface for JAX-WS protocol bindings.
- *
- * @author Thomas.Diesler at jboss.com
- * @since 03-May-2006
- */
-public interface Binding
-{
-
- /**
- * Gets a copy of the handler chain for a protocol binding instance.
- * If the returned chain is modified a call to setHandlerChain
- * is required to configure the binding instance with the new chain.
- */
- List<Handler> getHandlerChain();
-
- void setHandlerChain(List<Handler> list);
-}
\ No newline at end of file
Deleted: branches/jbossws-1.0/src/main/java/javax/xml/ws/BindingProvider.java
===================================================================
--- branches/jbossws-1.0/src/main/java/javax/xml/ws/BindingProvider.java 2006-09-13 10:26:12 UTC (rev 948)
+++ branches/jbossws-1.0/src/main/java/javax/xml/ws/BindingProvider.java 2006-09-13 10:53:54 UTC (rev 949)
@@ -1,48 +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 javax.xml.ws;
-
-import java.util.Map;
-
-/**
- * The BindingProvider interface provides access to the protocol binding and
- * associated context objects for request and response message processing.
- *
- * @author Thomas.Diesler at jboss.com
- * @since 03-May-2006
- */
-public interface BindingProvider
-{
- public static final String USERNAME_PROPERTY = "javax.xml.ws.security.auth.username";
- public static final String PASSWORD_PROPERTY = "javax.xml.ws.security.auth.password";
- public static final String ENDPOINT_ADDRESS_PROPERTY = "javax.xml.ws.service.endpoint.address";
- public static final String SESSION_MAINTAIN_PROPERTY = "javax.xml.ws.session.maintain";
- public static final String SOAPACTION_USE_PROPERTY = "javax.xml.ws.soap.http.soapaction.use";
- public static final String SOAPACTION_URI_PROPERTY = "javax.xml.ws.soap.http.soapaction.uri";
-
- Map<String, Object> getRequestContext();
-
- Map<String, Object> getResponseContext();
-
- Binding getBinding();
-
-}
\ No newline at end of file
Deleted: branches/jbossws-1.0/src/main/java/javax/xml/ws/WebServiceException.java
===================================================================
--- branches/jbossws-1.0/src/main/java/javax/xml/ws/WebServiceException.java 2006-09-13 10:26:12 UTC (rev 948)
+++ branches/jbossws-1.0/src/main/java/javax/xml/ws/WebServiceException.java 2006-09-13 10:53:54 UTC (rev 949)
@@ -1,53 +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 javax.xml.ws;
-
-// $Id$
-
-/**
- * The WebServiceException class is the base exception class for all JAX-WS
- * API runtime exceptions.
- *
- * @author Thomas.Diesler at jboss.org
- * @since 14-Nov-2005
- */
-public class WebServiceException extends RuntimeException
-{
- public WebServiceException()
- {
- }
-
- public WebServiceException(String message)
- {
- super(message);
- }
-
- public WebServiceException(Throwable cause)
- {
- super(cause);
- }
-
- public WebServiceException(String message, Throwable cause)
- {
- super(message, cause);
- }
-}
Modified: branches/jbossws-1.0/src/main/java/javax/xml/ws/addressing/AddressingException.java
===================================================================
--- branches/jbossws-1.0/src/main/java/javax/xml/ws/addressing/AddressingException.java 2006-09-13 10:26:12 UTC (rev 948)
+++ branches/jbossws-1.0/src/main/java/javax/xml/ws/addressing/AddressingException.java 2006-09-13 10:53:54 UTC (rev 949)
@@ -24,9 +24,10 @@
//$Id$
import javax.xml.namespace.QName;
-import javax.xml.ws.WebServiceException;
-public class AddressingException extends WebServiceException
+import org.jboss.ws.WSException;
+
+public class AddressingException extends WSException
{
protected QName code;
Copied: branches/jbossws-1.0/src/main/java/org/jboss/ws/common/CommonBinding.java (from rev 948, branches/tdiesler/jbossws-1.0/src/main/java/org/jboss/ws/common/CommonBinding.java)
Copied: branches/jbossws-1.0/src/main/java/org/jboss/ws/common/CommonBindingProvider.java (from rev 948, branches/tdiesler/jbossws-1.0/src/main/java/org/jboss/ws/common/CommonBindingProvider.java)
Modified: branches/jbossws-1.0/src/main/java/org/jboss/ws/common/CommonClient.java
===================================================================
--- branches/jbossws-1.0/src/main/java/org/jboss/ws/common/CommonClient.java 2006-09-13 10:26:12 UTC (rev 948)
+++ branches/jbossws-1.0/src/main/java/org/jboss/ws/common/CommonClient.java 2006-09-13 10:53:54 UTC (rev 949)
@@ -33,7 +33,6 @@
import javax.xml.rpc.soap.SOAPFaultException;
import javax.xml.soap.SOAPException;
import javax.xml.soap.SOAPMessage;
-import javax.xml.ws.BindingProvider;
import javax.xml.ws.addressing.AddressingProperties;
import javax.xml.ws.addressing.JAXWSAConstants;
@@ -45,8 +44,6 @@
import org.jboss.ws.binding.UnboundHeader;
import org.jboss.ws.jaxrpc.ParameterWrapping;
import org.jboss.ws.jaxrpc.Style;
-import org.jboss.ws.jaxws.core.BindingImpl;
-import org.jboss.ws.jaxws.core.BindingProviderImpl;
import org.jboss.ws.metadata.ClientEndpointMetaData;
import org.jboss.ws.metadata.EndpointMetaData;
import org.jboss.ws.metadata.OperationMetaData;
@@ -81,7 +78,7 @@
protected EndpointInvocation epInv;
// The binding provider
- private BindingProvider bindingProvider;
+ private CommonBindingProvider bindingProvider;
/** Create a call that needs to be configured manually
*/
@@ -238,7 +235,7 @@
try
{
// Get the binding from the provider
- BindingImpl binding = (BindingImpl)getBindingProvider().getBinding();
+ CommonBinding binding = (CommonBinding)getBindingProvider().getBinding();
// Create the invocation and sync the input parameters
epInv = new EndpointInvocation(opMetaData);
@@ -348,11 +345,11 @@
}
}
- public BindingProvider getBindingProvider()
+ public CommonBindingProvider getBindingProvider()
{
if (bindingProvider == null)
{
- bindingProvider = new BindingProviderImpl(getEndpointMetaData());
+ bindingProvider = new CommonBindingProvider(getEndpointMetaData());
}
return bindingProvider;
}
Copied: branches/jbossws-1.0/src/main/java/org/jboss/ws/common/CommonSOAP11Binding.java (from rev 948, branches/tdiesler/jbossws-1.0/src/main/java/org/jboss/ws/common/CommonSOAP11Binding.java)
Copied: branches/jbossws-1.0/src/main/java/org/jboss/ws/common/CommonSOAP12Binding.java (from rev 948, branches/tdiesler/jbossws-1.0/src/main/java/org/jboss/ws/common/CommonSOAP12Binding.java)
Copied: branches/jbossws-1.0/src/main/java/org/jboss/ws/common/CommonSOAPBinding.java (from rev 948, branches/tdiesler/jbossws-1.0/src/main/java/org/jboss/ws/common/CommonSOAPBinding.java)
Modified: branches/jbossws-1.0/src/main/java/org/jboss/ws/deployment/MetaDataBuilder.java
===================================================================
--- branches/jbossws-1.0/src/main/java/org/jboss/ws/deployment/MetaDataBuilder.java 2006-09-13 10:26:12 UTC (rev 948)
+++ branches/jbossws-1.0/src/main/java/org/jboss/ws/deployment/MetaDataBuilder.java 2006-09-13 10:53:54 UTC (rev 949)
@@ -43,13 +43,13 @@
import javax.wsdl.extensions.soap.SOAPAddress;
import javax.xml.namespace.QName;
import javax.xml.ws.addressing.AddressingProperties;
-import javax.xml.ws.soap.SOAPBinding;
import org.jboss.logging.Logger;
import org.jboss.ws.Constants;
import org.jboss.ws.WSException;
import org.jboss.ws.addressing.AddressingPropertiesImpl;
import org.jboss.ws.addressing.metadata.AddressingOpMetaExt;
+import org.jboss.ws.common.CommonBinding;
import org.jboss.ws.eventing.EventingConstants;
import org.jboss.ws.eventing.deployment.EventingEndpoint;
import org.jboss.ws.eventing.metadata.EventingEpMetaExt;
@@ -153,9 +153,9 @@
WSDLBinding wsdlBinding = wsdlDefinitions.getBindingByInterfaceName(wsdlInterface.getQName());
String bindingType = wsdlBinding.getType();
if (Constants.NS_SOAP11.equals(bindingType))
- epMetaData.setBindingId(SOAPBinding.SOAP11HTTP_BINDING);
+ epMetaData.setBindingId(CommonBinding.SOAP11HTTP_BINDING);
else if (Constants.NS_SOAP12.equals(bindingType))
- epMetaData.setBindingId(SOAPBinding.SOAP12HTTP_BINDING);
+ epMetaData.setBindingId(CommonBinding.SOAP12HTTP_BINDING);
}
/** Initialize the endpoint encoding style from the binding operations
Modified: branches/jbossws-1.0/src/main/java/org/jboss/ws/integration/jboss/ServiceEndpointInterceptor.java
===================================================================
--- branches/jbossws-1.0/src/main/java/org/jboss/ws/integration/jboss/ServiceEndpointInterceptor.java 2006-09-13 10:26:12 UTC (rev 948)
+++ branches/jbossws-1.0/src/main/java/org/jboss/ws/integration/jboss/ServiceEndpointInterceptor.java 2006-09-13 10:53:54 UTC (rev 949)
@@ -30,9 +30,9 @@
import org.jboss.invocation.InvocationKey;
import org.jboss.logging.Logger;
import org.jboss.ws.binding.EndpointInvocation;
+import org.jboss.ws.common.CommonBinding;
+import org.jboss.ws.common.CommonBindingProvider;
import org.jboss.ws.common.CommonMessageContext;
-import org.jboss.ws.jaxws.core.BindingImpl;
-import org.jboss.ws.jaxws.core.BindingProviderImpl;
import org.jboss.ws.metadata.OperationMetaData;
import org.jboss.ws.metadata.HandlerMetaData.HandlerType;
@@ -92,8 +92,8 @@
epInv.setReturnValue(resObj);
// Bind the response message
- BindingProviderImpl bindingProvider = new BindingProviderImpl(opMetaData.getEndpointMetaData());
- BindingImpl binding = (BindingImpl)bindingProvider.getBinding();
+ CommonBindingProvider bindingProvider = new CommonBindingProvider(opMetaData.getEndpointMetaData());
+ CommonBinding binding = (CommonBinding)bindingProvider.getBinding();
SOAPMessage resMessage = (SOAPMessage)binding.bindResponseMessage(opMetaData, epInv);
msgContext.setSOAPMessage(resMessage);
}
Modified: branches/jbossws-1.0/src/main/java/org/jboss/ws/metadata/EndpointMetaData.java
===================================================================
--- branches/jbossws-1.0/src/main/java/org/jboss/ws/metadata/EndpointMetaData.java 2006-09-13 10:26:12 UTC (rev 948)
+++ branches/jbossws-1.0/src/main/java/org/jboss/ws/metadata/EndpointMetaData.java 2006-09-13 10:53:54 UTC (rev 949)
@@ -32,10 +32,10 @@
import javax.jws.soap.SOAPBinding.ParameterStyle;
import javax.xml.namespace.QName;
import javax.xml.rpc.ParameterMode;
-import javax.xml.ws.soap.SOAPBinding;
import org.jboss.logging.Logger;
import org.jboss.ws.WSException;
+import org.jboss.ws.common.CommonBinding;
import org.jboss.ws.jaxrpc.Style;
import org.jboss.ws.jaxrpc.TypeMappingImpl;
import org.jboss.ws.jaxrpc.Use;
@@ -109,7 +109,7 @@
this.type = type;
// The default binding
- this.bindingId = SOAPBinding.SOAP11HTTP_BINDING;
+ this.bindingId = CommonBinding.SOAP11HTTP_BINDING;
}
public ServiceMetaData getServiceMetaData()
@@ -161,7 +161,7 @@
public void setBindingId(String bindingId)
{
- if (!SOAPBinding.SOAP11HTTP_BINDING.equals(bindingId) && !SOAPBinding.SOAP12HTTP_BINDING.equals(bindingId))
+ if (!CommonBinding.SOAP11HTTP_BINDING.equals(bindingId) && !CommonBinding.SOAP12HTTP_BINDING.equals(bindingId))
throw new WSException("Unsupported binding: " + bindingId);
this.bindingId = bindingId;
}
Modified: branches/jbossws-1.0/src/main/java/org/jboss/ws/server/AbstractServiceEndpointInvoker.java
===================================================================
--- branches/jbossws-1.0/src/main/java/org/jboss/ws/server/AbstractServiceEndpointInvoker.java 2006-09-13 10:26:12 UTC (rev 948)
+++ branches/jbossws-1.0/src/main/java/org/jboss/ws/server/AbstractServiceEndpointInvoker.java 2006-09-13 10:53:54 UTC (rev 949)
@@ -35,16 +35,15 @@
import javax.xml.soap.SOAPException;
import javax.xml.soap.SOAPHeader;
import javax.xml.soap.SOAPMessage;
-import javax.xml.ws.BindingProvider;
import org.jboss.logging.Logger;
import org.jboss.ws.Constants;
import org.jboss.ws.binding.EndpointInvocation;
+import org.jboss.ws.common.CommonBinding;
+import org.jboss.ws.common.CommonBindingProvider;
import org.jboss.ws.common.CommonMessageContext;
import org.jboss.ws.jaxrpc.SOAPFaultExceptionHelper;
import org.jboss.ws.jaxrpc.handler.HandlerDelegateJAXRPC;
-import org.jboss.ws.jaxws.core.BindingImpl;
-import org.jboss.ws.jaxws.core.BindingProviderImpl;
import org.jboss.ws.metadata.EndpointMetaData;
import org.jboss.ws.metadata.OperationMetaData;
import org.jboss.ws.metadata.ServerEndpointMetaData;
@@ -64,14 +63,14 @@
// provide logging
private static Logger log = Logger.getLogger(AbstractServiceEndpointInvoker.class);
- protected BindingProvider bindingProvider;
+ protected CommonBindingProvider bindingProvider;
protected HandlerDelegate handlerDelegate;
/** Initialize the service endpoint */
public void initServiceEndpoint(ServiceEndpointInfo seInfo)
{
ServerEndpointMetaData sepMetaData = seInfo.getServerEndpointMetaData();
- bindingProvider = new BindingProviderImpl(sepMetaData);
+ bindingProvider = new CommonBindingProvider(sepMetaData);
handlerDelegate = new HandlerDelegateJAXRPC();
}
@@ -119,7 +118,7 @@
try
{
boolean oneway = false;
- BindingImpl binding = null;
+ CommonBinding binding = null;
EndpointInvocation epInv = null;
OperationMetaData opMetaData = null;
@@ -130,7 +129,7 @@
if (handlersPass)
{
// Get the binding from the provideer
- binding = (BindingImpl)bindingProvider.getBinding();
+ binding = (CommonBinding)bindingProvider.getBinding();
// Get the operation meta data from the SOAP message
opMetaData = getDispatchDestination(epMetaData, reqMessage);
Modified: branches/jbossws-1.0/src/main/java/org/jboss/ws/soap/SAAJPayloadBuilderDOM.java
===================================================================
--- branches/jbossws-1.0/src/main/java/org/jboss/ws/soap/SAAJPayloadBuilderDOM.java 2006-09-13 10:26:12 UTC (rev 948)
+++ branches/jbossws-1.0/src/main/java/org/jboss/ws/soap/SAAJPayloadBuilderDOM.java 2006-09-13 10:53:54 UTC (rev 949)
@@ -37,8 +37,8 @@
import org.jboss.logging.Logger;
import org.jboss.ws.utils.DOMUtils;
import org.jboss.ws.WSException;
+import org.jboss.ws.common.CommonSOAPBinding;
import org.jboss.ws.jaxrpc.Style;
-import org.jboss.ws.jaxws.core.SOAPBindingImpl;
import org.jboss.ws.utils.DOMWriter;
import org.w3c.dom.Element;
import org.w3c.dom.NodeList;
@@ -52,7 +52,7 @@
public class SAAJPayloadBuilderDOM implements PayloadBuilder
{
// provide logging
- private static Logger log = Logger.getLogger(SOAPBindingImpl.class);
+ private static Logger log = Logger.getLogger(CommonSOAPBinding.class);
private Style style = Style.DOCUMENT;
Modified: branches/jbossws-1.0/src/main/java/org/jboss/ws/soap/SOAPConnectionImpl.java
===================================================================
--- branches/jbossws-1.0/src/main/java/org/jboss/ws/soap/SOAPConnectionImpl.java 2006-09-13 10:26:12 UTC (rev 948)
+++ branches/jbossws-1.0/src/main/java/org/jboss/ws/soap/SOAPConnectionImpl.java 2006-09-13 10:53:54 UTC (rev 949)
@@ -36,7 +36,6 @@
import javax.xml.soap.SOAPEnvelope;
import javax.xml.soap.SOAPException;
import javax.xml.soap.SOAPMessage;
-import javax.xml.ws.BindingProvider;
import javax.xml.ws.addressing.EndpointReference;
import org.jboss.logging.Logger;
@@ -68,8 +67,6 @@
{
metadataMap.put(Stub.USERNAME_PROPERTY, "http.basic.username");
metadataMap.put(Stub.PASSWORD_PROPERTY, "http.basic.password");
- metadataMap.put(BindingProvider.USERNAME_PROPERTY, "http.basic.username");
- metadataMap.put(BindingProvider.PASSWORD_PROPERTY, "http.basic.password");
}
private static Map<String, String> configMap = new HashMap<String, String>();
static
Modified: branches/jbossws-1.0/src/main/java/org/jboss/ws/tools/JavaToWSDL11.java
===================================================================
--- branches/jbossws-1.0/src/main/java/org/jboss/ws/tools/JavaToWSDL11.java 2006-09-13 10:26:12 UTC (rev 948)
+++ branches/jbossws-1.0/src/main/java/org/jboss/ws/tools/JavaToWSDL11.java 2006-09-13 10:53:54 UTC (rev 949)
@@ -27,7 +27,6 @@
import javax.xml.namespace.QName;
import javax.xml.rpc.encoding.TypeMapping;
-import javax.xml.ws.soap.SOAPBinding;
import org.jboss.logging.Logger;
import org.jboss.ws.Constants;
Modified: branches/jbossws-1.0/src/main/java/org/jboss/ws/tools/helpers/JavaToWSDLHelper.java
===================================================================
--- branches/jbossws-1.0/src/main/java/org/jboss/ws/tools/helpers/JavaToWSDLHelper.java 2006-09-13 10:26:12 UTC (rev 948)
+++ branches/jbossws-1.0/src/main/java/org/jboss/ws/tools/helpers/JavaToWSDLHelper.java 2006-09-13 10:53:54 UTC (rev 949)
@@ -36,11 +36,11 @@
import javax.xml.rpc.encoding.TypeMapping;
import javax.xml.rpc.holders.ByteArrayHolder;
import javax.xml.rpc.holders.Holder;
-import javax.xml.ws.soap.SOAPBinding;
import org.apache.xerces.xs.XSTypeDefinition;
import org.jboss.ws.Constants;
import org.jboss.ws.WSException;
+import org.jboss.ws.common.CommonBinding;
import org.jboss.ws.jaxrpc.LiteralTypeMapping;
import org.jboss.ws.jaxrpc.Style;
import org.jboss.ws.metadata.EndpointMetaData;
@@ -130,9 +130,9 @@
wsdl.registerNamespaceURI(Constants.NS_SCHEMA_XSD, Constants.PREFIX_XSD);
if (wsdlNamespace.equals(Constants.NS_WSDL11))
{
- if (SOAPBinding.SOAP11HTTP_BINDING.equals(bindingId))
+ if (CommonBinding.SOAP11HTTP_BINDING.equals(bindingId))
wsdl.registerNamespaceURI(Constants.NS_SOAP11, Constants.PREFIX_SOAP11);
- else if (SOAPBinding.SOAP12HTTP_BINDING.equals(bindingId))
+ else if (CommonBinding.SOAP12HTTP_BINDING.equals(bindingId))
wsdl.registerNamespaceURI(Constants.NS_SOAP12, Constants.PREFIX_SOAP12);
}
}
Modified: branches/jbossws-1.0/src/test/java/org/jboss/test/ws/common/binding/SOAPBindingTestCase.java
===================================================================
--- branches/jbossws-1.0/src/test/java/org/jboss/test/ws/common/binding/SOAPBindingTestCase.java 2006-09-13 10:26:12 UTC (rev 948)
+++ branches/jbossws-1.0/src/test/java/org/jboss/test/ws/common/binding/SOAPBindingTestCase.java 2006-09-13 10:53:54 UTC (rev 949)
@@ -33,17 +33,16 @@
import javax.xml.rpc.soap.SOAPFaultException;
import javax.xml.soap.MessageFactory;
import javax.xml.soap.SOAPMessage;
-import javax.xml.ws.soap.SOAPBinding;
import org.jboss.test.ws.JBossWSTest;
import org.jboss.ws.Constants;
import org.jboss.ws.binding.EndpointInvocation;
import org.jboss.ws.binding.UnboundHeader;
+import org.jboss.ws.common.CommonBinding;
+import org.jboss.ws.common.CommonBindingProvider;
import org.jboss.ws.common.CommonMessageContext;
import org.jboss.ws.jaxrpc.CallImpl;
import org.jboss.ws.jaxrpc.handler.SOAPMessageContextJAXRPC;
-import org.jboss.ws.jaxws.core.BindingImpl;
-import org.jboss.ws.jaxws.core.BindingProviderImpl;
import org.jboss.ws.metadata.OperationMetaData;
import org.jboss.ws.metadata.ParameterMetaData;
import org.jboss.ws.soap.MessageContextAssociation;
@@ -167,7 +166,7 @@
*/
public void testBindRequestMessage() throws Exception
{
- BindingImpl binding = (BindingImpl)new BindingProviderImpl(SOAPBinding.SOAP12HTTP_BINDING).getBinding();
+ CommonBinding binding = (CommonBinding)new CommonBindingProvider(CommonBinding.SOAP12HTTP_BINDING).getBinding();
EndpointInvocation epInv = new EndpointInvocation(opMetaData);
epInv.initInputParams(new Object[]{"Hello World!"});
@@ -185,7 +184,7 @@
*/
public void testBindRequestMessageWithBoundHeader() throws Exception
{
- BindingImpl binding = (BindingImpl)new BindingProviderImpl(SOAPBinding.SOAP12HTTP_BINDING).getBinding();
+ CommonBinding binding = (CommonBinding)new CommonBindingProvider(CommonBinding.SOAP12HTTP_BINDING).getBinding();
// Add bound header
QName xmlName = new QName("http://somens", "String_2");
@@ -209,7 +208,7 @@
*/
public void testBindRequestMessageWithUnboundHeader() throws Exception
{
- BindingImpl binding = (BindingImpl)new BindingProviderImpl(SOAPBinding.SOAP12HTTP_BINDING).getBinding();
+ CommonBinding binding = (CommonBinding)new CommonBindingProvider(CommonBinding.SOAP12HTTP_BINDING).getBinding();
// Add unbound header
QName xmlName = new QName("http://somens", "String_2");
@@ -235,7 +234,7 @@
*/
public void testUnbindRequestMessage() throws Exception
{
- BindingImpl binding = (BindingImpl)new BindingProviderImpl(SOAPBinding.SOAP12HTTP_BINDING).getBinding();
+ CommonBinding binding = (CommonBinding)new CommonBindingProvider(CommonBinding.SOAP12HTTP_BINDING).getBinding();
ByteArrayInputStream inputStream = new ByteArrayInputStream(reqEnvelope.getBytes());
@@ -271,7 +270,7 @@
CommonMessageContext msgContext = MessageContextAssociation.peekMessageContext();
msgContext.setSOAPMessage(reqMessage);
- BindingImpl binding = (BindingImpl)new BindingProviderImpl(SOAPBinding.SOAP12HTTP_BINDING).getBinding();
+ CommonBinding binding = (CommonBinding)new CommonBindingProvider(CommonBinding.SOAP12HTTP_BINDING).getBinding();
EndpointInvocation epInv = binding.unbindRequestMessage(opMetaData, reqMessage);
assertNotNull(epInv);
@@ -293,7 +292,7 @@
CommonMessageContext msgContext = MessageContextAssociation.peekMessageContext();
msgContext.setSOAPMessage(reqMessage);
- BindingImpl binding = (BindingImpl)new BindingProviderImpl(SOAPBinding.SOAP12HTTP_BINDING).getBinding();
+ CommonBinding binding = (CommonBinding)new CommonBindingProvider(CommonBinding.SOAP12HTTP_BINDING).getBinding();
EndpointInvocation epInv = binding.unbindRequestMessage(opMetaData, reqMessage);
assertNotNull(epInv);
@@ -306,7 +305,7 @@
*/
public void testBindResponseMessage() throws Exception
{
- BindingImpl binding = (BindingImpl)new BindingProviderImpl(SOAPBinding.SOAP12HTTP_BINDING).getBinding();
+ CommonBinding binding = (CommonBinding)new CommonBindingProvider(CommonBinding.SOAP12HTTP_BINDING).getBinding();
EndpointInvocation epInv = new EndpointInvocation(opMetaData);
epInv.setReturnValue("Hello World!");
@@ -324,7 +323,7 @@
*/
public void testUnbindResponseMessage() throws Exception
{
- BindingImpl binding = (BindingImpl)new BindingProviderImpl(SOAPBinding.SOAP12HTTP_BINDING).getBinding();
+ CommonBinding binding = (CommonBinding)new CommonBindingProvider(CommonBinding.SOAP12HTTP_BINDING).getBinding();
ByteArrayInputStream inputStream = new ByteArrayInputStream(resEnvelope.getBytes());
@@ -343,7 +342,7 @@
*/
public void testUnbindResponseMessageWithBoundHeader() throws Exception
{
- BindingImpl binding = (BindingImpl)new BindingProviderImpl(SOAPBinding.SOAP12HTTP_BINDING).getBinding();
+ CommonBinding binding = (CommonBinding)new CommonBindingProvider(CommonBinding.SOAP12HTTP_BINDING).getBinding();
ByteArrayInputStream inputStream = new ByteArrayInputStream(resEnvelopeWithBoundHeader.getBytes());
@@ -372,7 +371,7 @@
*/
public void testUnbindResponseMessageWithUnboundHeader() throws Exception
{
- BindingImpl binding = (BindingImpl)new BindingProviderImpl(SOAPBinding.SOAP12HTTP_BINDING).getBinding();
+ CommonBinding binding = (CommonBinding)new CommonBindingProvider(CommonBinding.SOAP12HTTP_BINDING).getBinding();
ByteArrayInputStream inputStream = new ByteArrayInputStream(resEnvelopeWithUnboundHeader.getBytes());
@@ -399,7 +398,7 @@
*/
public void testUnbindFaultResponse() throws Exception
{
- BindingImpl binding = (BindingImpl)new BindingProviderImpl(SOAPBinding.SOAP12HTTP_BINDING).getBinding();
+ CommonBinding binding = (CommonBinding)new CommonBindingProvider(CommonBinding.SOAP12HTTP_BINDING).getBinding();
ByteArrayInputStream inputStream = new ByteArrayInputStream(resEnvelopeWithFault.getBytes());
Modified: branches/jbossws-1.0/src/test/java/org/jboss/test/ws/common/soap/attachment/GenericAttachmentTestCase.java
===================================================================
--- branches/jbossws-1.0/src/test/java/org/jboss/test/ws/common/soap/attachment/GenericAttachmentTestCase.java 2006-09-13 10:26:12 UTC (rev 948)
+++ branches/jbossws-1.0/src/test/java/org/jboss/test/ws/common/soap/attachment/GenericAttachmentTestCase.java 2006-09-13 10:53:54 UTC (rev 949)
@@ -38,15 +38,14 @@
import javax.xml.soap.MimeHeaders;
import javax.xml.soap.SOAPEnvelope;
import javax.xml.soap.SOAPMessage;
-import javax.xml.ws.soap.SOAPBinding;
import org.jboss.test.ws.JBossWSTest;
import org.jboss.ws.Constants;
import org.jboss.ws.binding.EndpointInvocation;
+import org.jboss.ws.common.CommonBinding;
+import org.jboss.ws.common.CommonBindingProvider;
import org.jboss.ws.jaxrpc.CallImpl;
import org.jboss.ws.jaxrpc.handler.SOAPMessageContextJAXRPC;
-import org.jboss.ws.jaxws.core.BindingImpl;
-import org.jboss.ws.jaxws.core.BindingProviderImpl;
import org.jboss.ws.metadata.OperationMetaData;
import org.jboss.ws.soap.MessageContextAssociation;
import org.jboss.ws.soap.MessageFactoryImpl;
@@ -145,7 +144,7 @@
MessageContextAssociation.pushMessageContext(messageContext);
messageContext.setOperationMetaData(opMetaData);
- BindingImpl binding = (BindingImpl)new BindingProviderImpl(SOAPBinding.SOAP11HTTP_BINDING).getBinding();
+ CommonBinding binding = (CommonBinding)new CommonBindingProvider(CommonBinding.SOAP11HTTP_BINDING).getBinding();
EndpointInvocation epInv = new EndpointInvocation(opMetaData);
epInv.initInputParams(new Object[]{"Hello World!", "hi"});
Modified: branches/jbossws-1.0/src/test/java/org/jboss/test/ws/tools/SchemaGeneratorTestCase.java
===================================================================
--- branches/jbossws-1.0/src/test/java/org/jboss/test/ws/tools/SchemaGeneratorTestCase.java 2006-09-13 10:26:12 UTC (rev 948)
+++ branches/jbossws-1.0/src/test/java/org/jboss/test/ws/tools/SchemaGeneratorTestCase.java 2006-09-13 10:53:54 UTC (rev 949)
@@ -146,4 +146,4 @@
Element wasElement = DOMUtils.parse(xsdSchema);
assertEquals(expElement, wasElement);
}
-}
+}
\ No newline at end of file
Modified: branches/jbossws-1.0/src/test/java/org/jboss/test/ws/tools/validation/WSDL11Validator.java
===================================================================
--- branches/jbossws-1.0/src/test/java/org/jboss/test/ws/tools/validation/WSDL11Validator.java 2006-09-13 10:26:12 UTC (rev 948)
+++ branches/jbossws-1.0/src/test/java/org/jboss/test/ws/tools/validation/WSDL11Validator.java 2006-09-13 10:53:54 UTC (rev 949)
@@ -19,7 +19,7 @@
* Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
* 02110-1301 USA, or see the FSF site: http://www.fsf.org.
*/
-package org.jboss.test.ws.tools.validation;
+package org.jboss.test.ws.tools.validation;
import java.util.StringTokenizer;
@@ -51,18 +51,18 @@
/**
* WSDL 11 Validator
* @author <mailto:Anil.Saldhana at jboss.org>Anil Saldhana
- * @since Jul 22, 2005
+ * @since Jul 22, 2005
*/
public class WSDL11Validator extends WSDLValidator
-{
+{
private static Logger log = Logger.getLogger(WSDL11Validator.class);
/**
- *
+ *
*/
public WSDL11Validator()
{
- super();
+ super();
}
/**
* Validates that two wsdl files represented by their WSDLDefinition objects
@@ -76,43 +76,43 @@
{
boolean bool = super.validate(wsdlExp,wsdlAct);
if( bool)
- bool = validateMessages(wsdlExp,wsdlAct);
+ bool = validateMessages(wsdlExp,wsdlAct);
if(!bool) log.error("Message Validation Failed");
return bool;
}
-
+
//**************************************************************************
//
// PRIVATE METHODS
//
//**************************************************************************
- public boolean validateMessages(WSDLDefinitions w1, WSDLDefinitions w2)
+ public boolean validateMessages(WSDLDefinitions w1, WSDLDefinitions w2)
throws JBossWSToolsException
- {
+ {
WSDLInterface[] intf1 = w1.getInterfaces();
WSDLInterface[] intf2 = w2.getInterfaces();
-
+
if(intf1.length != intf2.length)
throw new JBossWSToolsException("Number of portType operations in wsdl mismatch");
-
+
int len = intf1.length;
for (int i = 0; i < len; i++)
{
WSDLInterface i1 = intf1[i];
WSDLInterface i2 = intf2[i];
- WSDLInterfaceOperation[] ops1 = i1.getSortedOperations();
+ WSDLInterfaceOperation[] ops1 = i1.getSortedOperations();
WSDLInterfaceOperation[] ops2 = i2.getSortedOperations();
-
+
int lenOps = ops1.length;
for (int j = 0; j < lenOps; j++)
{
- if(validateMessage(ops1[j],ops2[j]) == false)
+ if(validateMessage(ops1[j],ops2[j]) == false)
{
log.error("Validation of Messages failed");
- throw new JBossWSToolsException("Validation of messages failed");
+ throw new JBossWSToolsException("Validation of messages failed");
}
}//end for
-
+
// Append the Faults
WSDLInterfaceFault[] faults1 = i1.getFaults();
WSDLInterfaceFault[] faults2 = i2.getFaults();
@@ -123,18 +123,18 @@
WSDLInterfaceFault flt2 = faults2[k];
QName elt = flt1.getXmlName();
QName elt2 = flt2.getXmlName();
- if(!(elt.getLocalPart().equals(elt2.getLocalPart()) &&
+ if(!(elt.getLocalPart().equals(elt2.getLocalPart()) &&
elt.getNamespaceURI().equals(elt2.getNamespaceURI())))
{
log.error("Faults do not match");
- throw new JBossWSToolsException("Validation of faults failed:"+elt.getLocalPart());
+ throw new JBossWSToolsException("Validation of faults failed:"+elt.getLocalPart());
}
-
- }
- }//end for
+
+ }
+ }//end for
return true;
}
-
+
//*********************************************************************************
//
// PRIVATE METHODS
@@ -144,10 +144,10 @@
{
WSDLUtils utils = WSDLUtils.getInstance();
if((o1 == null && o2 != null) || (o1 != null && o2 == null) )
- throw new IllegalStateException(utils.getJustClassName(c) + " does not match");
+ throw new IllegalStateException(utils.getJustClassName(c) + " does not match");
}
-
- private boolean validateMessage(WSDLInterfaceOperation op1,
+
+ private boolean validateMessage(WSDLInterfaceOperation op1,
WSDLInterfaceOperation op2 ) throws JBossWSToolsException
{
String op1name = op1.getName().toString();
@@ -157,7 +157,7 @@
if(op1name.equals(op2name) == false)
throw new JBossWSToolsException(op1name + " does not match with " + op2name);
if( intf1name.equals(intf2name) == false)
- throw new JBossWSToolsException(intf1name + " does not match with " + intf2name);
+ throw new JBossWSToolsException(intf1name + " does not match with " + intf2name);
WSDLInterfaceOperationInput[] inputs1 = op1.getInputs();
WSDLInterfaceOperationInput[] inputs2 = op2.getInputs();
@@ -166,15 +166,15 @@
{
WSDLInterfaceOperationInput input1 = inputs1[i];
WSDLInterfaceOperationInput input2 = inputs2[i];
- if(validateInputParts(input1, input2) == false)
+ if(validateInputParts(input1, input2) == false)
throw new JBossWSToolsException("Validation of input parts failed:" + input1.getElement());
- }
+ }
//Now the return type
WSDLInterfaceOperationOutput[] outputs1 = op1.getOutputs();
WSDLInterfaceOperationOutput[] outputs2 = op2.getOutputs();
int lenout = outputs1.length;
-
+
if(lenout != outputs2.length)
throw new JBossWSToolsException("Length of operation outputs do not match");
@@ -182,13 +182,13 @@
{
WSDLInterfaceOperationOutput out1 = outputs1[i];
WSDLInterfaceOperationOutput out2 = outputs2[i];
- if(validateOutputParts(out1, out2) == false)
+ if(validateOutputParts(out1, out2) == false)
throw new JBossWSToolsException("Validation of output parts failed:" + out1);
- }
+ }
return true;
}
- private boolean validateInputParts(WSDLInterfaceOperationInput in1,
+ private boolean validateInputParts(WSDLInterfaceOperationInput in1,
WSDLInterfaceOperationInput in2) throws JBossWSToolsException
{
//Check if there are any custom properties
@@ -206,11 +206,11 @@
return false;
if (zeroarg1 != null && "true".equals(zeroarg1))
return true;
-
+
//Check if there is a property
WSDLProperty wprop1 = in1.getProperty(Constants.WSDL_PROPERTY_RPC_XMLTYPE);
WSDLProperty wprop2 = in2.getProperty(Constants.WSDL_PROPERTY_RPC_XMLTYPE);
-
+
QName el1 = in1.getElement();
QName el2 = in2.getElement();
WSDLDefinitions w1 = in1.getWsdlOperation().getWsdlInterface().getWsdlDefinitions();
@@ -218,14 +218,14 @@
if(wprop1 != null) el1 = parseQName(wprop1.getValue(),w1);
if(wprop2 != null) el2 = parseQName(wprop2.getValue(),w2);
//Validate the QNames by using types
-
+
XSTypeDefinition x1 = getTypeDefinition(el1,w1);
- XSTypeDefinition x2 = getTypeDefinition(el2,w2);
+ XSTypeDefinition x2 = getTypeDefinition(el2,w2);
boolean bool = validateType(x1,x2);
-
+
return bool;
}
-
+
private boolean validateOutputParts(WSDLInterfaceOperationOutput out1,
WSDLInterfaceOperationOutput out2) throws JBossWSToolsException
{
@@ -239,41 +239,41 @@
if(prop1 != null ) voidreturn1 = prop1.getValue();
if(prop2 != null ) voidreturn2 = prop2.getValue();
- if(voidreturn1 != null &&
- voidreturn2 != null &&
+ if(voidreturn1 != null &&
+ voidreturn2 != null &&
voidreturn1.equals(voidreturn2) == false) return false;
if(voidreturn1 != null && "true".equals(voidreturn1)) return true;
-
- QName el1 = out1.getElement();
+
+ QName el1 = out1.getElement();
QName el2 = out2.getElement();
WSDLDefinitions w1 = out1.getWsdlOperation().getWsdlInterface().getWsdlDefinitions();
WSDLDefinitions w2 = out2.getWsdlOperation().getWsdlInterface().getWsdlDefinitions();
if( prop1 != null) el1 = parseQName( prop1.getValue(),w1);
if( prop2 != null) el2 = parseQName( prop2.getValue(),w2);
- //Validate the QNames by using types
+ //Validate the QNames by using types
XSTypeDefinition x1 = getTypeDefinition(el1,w1);
- XSTypeDefinition x2 = getTypeDefinition(el2,w2);
+ XSTypeDefinition x2 = getTypeDefinition(el2,w2);
boolean bool = validateType(x1,x2);
-
+
return bool;
}
-
+
private XSTypeDefinition getTypeDefinition(QName xmlType, WSDLDefinitions wsdl)
{
- WSDLTypes types = wsdl.getWsdlTypes();
+ WSDLTypes types = wsdl.getWsdlTypes();
JBossXSModel xsmodel = WSDLUtils.getSchemaModel(types);
return xsmodel.getTypeDefinition(xmlType.getLocalPart(),xmlType.getNamespaceURI());
}
-
+
private boolean validateType(XSTypeDefinition x1, XSTypeDefinition x2) throws JBossWSToolsException
{
boolean bool = false;
if(x1==null && x2 == null) return true;
this.checkNullParametersInconsistency(x1,x2,XSTypeDefinition.class);
-
+
if(x1.getName().equals(x2.getName()) == false)
- throw new JBossWSToolsException("Validation of XSType failed:"
- + x1.getName() + ":" + x2.getName());
+ throw new JBossWSToolsException("Validation of XSType failed:"
+ + x1.getName() + ":" + x2.getName());
//TODO: Expand comparison of types to include attributes/elements
if(x1 instanceof XSComplexTypeDefinition &&
x2 instanceof XSComplexTypeDefinition)
@@ -284,7 +284,7 @@
}
return bool;
}
-
+
private QName parseQName( String qnamestr, WSDLDefinitions wsdl)
{
QName qn = null;
@@ -297,16 +297,16 @@
qn = new QName(ns,localpart,prefix);
}
return qn;
- }
-
- private boolean checkXSAttributesEquality(XSAttributeDeclaration x1,
+ }
+
+ private boolean checkXSAttributesEquality(XSAttributeDeclaration x1,
XSAttributeDeclaration x2)
{
boolean bool = true;
if(x1.getName().equals(x2.getName())) return false;
XSTypeDefinition xt1 = x1.getTypeDefinition();
XSTypeDefinition xt2 = x2.getTypeDefinition();
- this.checkNullParametersInconsistency(xt1,xt2,XSTypeDefinition.class);
+ this.checkNullParametersInconsistency(xt1,xt2,XSTypeDefinition.class);
if( xt1 != null && xt2 != null)
{
if(xt1.getName().equals(xt2.getName()) == false)
@@ -314,18 +314,18 @@
}
return bool;
}
-
+
private boolean validateXSComplexTypeDefinitions(XSComplexTypeDefinition xc1,
- XSComplexTypeDefinition xc2 )
- {
+ XSComplexTypeDefinition xc2 )
+ {
//First lets validate the attributes
boolean bool = true;
XSObjectList xobj1 = xc1.getAttributeUses();
XSObjectList xobj2 = xc2.getAttributeUses();
this.checkNullParametersInconsistency(xobj1,xobj2,XSObjectList.class);
- if(xobj1 == null && xobj2 == null)
+ if(xobj1 == null && xobj2 == null)
return true;
- if(xobj1.getLength() != xobj2.getLength())
+ if(xobj1.getLength() != xobj2.getLength())
return false;
int len = xobj1.getLength();
for(int i=0; i<len ; i++)
@@ -334,7 +334,7 @@
XSAttributeDeclaration xat2 = (XSAttributeDeclaration)xobj1.item(i);
bool = checkXSAttributesEquality(xat1,xat2);
}
-
+
//Validate the particles
XSParticle xspart1 = xc1.getParticle();
XSParticle xspart2 = xc2.getParticle();
@@ -342,9 +342,9 @@
XSTerm xt2 = xspart2.getTerm();
if(xt1 instanceof XSModelGroup && xt2 instanceof XSModelGroup)
bool = validateXSModelGroups((XSModelGroup)xt1, (XSModelGroup)xt2);
- return bool;
+ return bool;
}
-
+
private boolean validateXSModelGroups( XSModelGroup xm1, XSModelGroup xm2)
{
boolean bool = true;
@@ -374,12 +374,12 @@
}
return bool;
}
-
+
private boolean validateXSElementDeclaration(XSElementDeclaration xe1,
XSElementDeclaration xe2)
{
boolean bool = true;
- bool = (xe1.getName().equals(xe2.getName()));
+ bool = (xe1.getName().equals(xe2.getName()));
if(bool)
{
//Check if there are types
@@ -387,8 +387,8 @@
XSTypeDefinition xt2 = xe2.getTypeDefinition();
bool = xt1.getName().equals(xt2.getName());
String ns1 = xt1.getNamespace();
- String ns2 = xt2.getNamespace();
-
+ String ns2 = xt2.getNamespace();
+
/**
* Ignore the namespace if it is wscompile generated arrays namespace
*/
@@ -396,7 +396,7 @@
bool = xt1.getNamespace().equals(xt2.getNamespace());
//TODO:take care of enclosing CT Definition
}
-
+
return bool;
}
}
Modified: branches/jbossws-1.0/src/test/java/org/jboss/test/ws/tools/validation/WSDLValidator.java
===================================================================
--- branches/jbossws-1.0/src/test/java/org/jboss/test/ws/tools/validation/WSDLValidator.java 2006-09-13 10:26:12 UTC (rev 948)
+++ branches/jbossws-1.0/src/test/java/org/jboss/test/ws/tools/validation/WSDLValidator.java 2006-09-13 10:53:54 UTC (rev 949)
@@ -81,7 +81,7 @@
}
catch (IOException e)
{
- log.error("Error validating types:",e);
+ log.error("Error validating types:",e);
}
validateInterfaces();
validateBindings();
Modified: branches/jbossws-1.0/src/test/java/org/jboss/test/ws/tools/xmlschema/WSDLTypesTestCase.java
===================================================================
--- branches/jbossws-1.0/src/test/java/org/jboss/test/ws/tools/xmlschema/WSDLTypesTestCase.java 2006-09-13 10:26:12 UTC (rev 948)
+++ branches/jbossws-1.0/src/test/java/org/jboss/test/ws/tools/xmlschema/WSDLTypesTestCase.java 2006-09-13 10:53:54 UTC (rev 949)
@@ -48,7 +48,7 @@
File wsdlFile = new File("resources/tools/wsdlfixture/" + filename);
WSDLTypes types = null;
try
- {
+ {
WSDLToJavaIntf wsdljava = new WSDLToJava();
wsdljava.setTypeMapping(new LiteralTypeMapping());
WSDLDefinitions wsdl = wsdljava.convertWSDL2Java(wsdlFile.toURL());
@@ -72,7 +72,7 @@
File wsdlFile = new File("resources/tools/wsdlfixture/" + filename);
WSDLTypes types = null;
try
- {
+ {
WSDLToJavaIntf wsdljava = new WSDLToJava();
wsdljava.setTypeMapping(new LiteralTypeMapping());
WSDLDefinitions wsdl = wsdljava.convertWSDL2Java(wsdlFile.toURL());
More information about the jboss-svn-commits
mailing list