Author: jason.greene(a)jboss.com Date: 2007-03-07 03:08:09 -0500 (Wed, 07 Mar 2007) New Revision: 2539 Removed: trunk/jbossws-core/src/java/org/jboss/ws/metadata/wsdl/NCName.java Modified: trunk/integration-jboss50/src/java/org/jboss/ws/integration/jboss50/JBossServiceEndpointServlet.java trunk/jbossws-core/src/java/javax/xml/ws/RespectBindingFeature.java trunk/jbossws-core/src/java/org/jboss/ws/core/CommonBindingProvider.java trunk/jbossws-core/src/java/org/jboss/ws/core/CommonContextServlet.java trunk/jbossws-core/src/java/org/jboss/ws/core/jaxrpc/SOAPFaultHelperJAXRPC.java trunk/jbossws-core/src/java/org/jboss/ws/core/jaxrpc/TypeMappingImpl.java trunk/jbossws-core/src/java/org/jboss/ws/core/jaxrpc/binding/Base64Serializer.java trunk/jbossws-core/src/java/org/jboss/ws/core/jaxrpc/binding/BufferedStreamResult.java trunk/jbossws-core/src/java/org/jboss/ws/core/jaxrpc/binding/CalendarSerializer.java trunk/jbossws-core/src/java/org/jboss/ws/core/jaxrpc/binding/DateSerializer.java trunk/jbossws-core/src/java/org/jboss/ws/core/jaxrpc/binding/DeserializerSupport.java trunk/jbossws-core/src/java/org/jboss/ws/core/jaxrpc/binding/ElementSerializer.java trunk/jbossws-core/src/java/org/jboss/ws/core/jaxrpc/binding/HexSerializer.java trunk/jbossws-core/src/java/org/jboss/ws/core/jaxrpc/binding/JBossXBDeserializer.java trunk/jbossws-core/src/java/org/jboss/ws/core/jaxrpc/binding/JBossXBSerializer.java trunk/jbossws-core/src/java/org/jboss/ws/core/jaxrpc/binding/NullValueSerializer.java trunk/jbossws-core/src/java/org/jboss/ws/core/jaxrpc/binding/QNameSerializer.java trunk/jbossws-core/src/java/org/jboss/ws/core/jaxrpc/binding/SOAPArrayDeserializer.java trunk/jbossws-core/src/java/org/jboss/ws/core/jaxrpc/binding/SOAPArraySerializer.java trunk/jbossws-core/src/java/org/jboss/ws/core/jaxrpc/binding/SerializerSupport.java trunk/jbossws-core/src/java/org/jboss/ws/core/jaxrpc/binding/SimpleSerializer.java trunk/jbossws-core/src/java/org/jboss/ws/core/jaxws/JAXBDeserializer.java trunk/jbossws-core/src/java/org/jboss/ws/core/jaxws/JAXBSerializer.java trunk/jbossws-core/src/java/org/jboss/ws/core/jaxws/SOAPFaultHelperJAXWS.java trunk/jbossws-core/src/java/org/jboss/ws/core/jaxws/client/ClientImpl.java trunk/jbossws-core/src/java/org/jboss/ws/core/server/ServiceEndpointManager.java trunk/jbossws-core/src/java/org/jboss/ws/core/soap/DOMContent.java trunk/jbossws-core/src/java/org/jboss/ws/core/soap/EnvelopeBuilderDOM.java trunk/jbossws-core/src/java/org/jboss/ws/core/soap/EnvelopeBuilderPayload.java trunk/jbossws-core/src/java/org/jboss/ws/core/soap/EnvelopeBuilderStax.java trunk/jbossws-core/src/java/org/jboss/ws/core/soap/ObjectContent.java trunk/jbossws-core/src/java/org/jboss/ws/core/soap/SOAPContentElement.java trunk/jbossws-core/src/java/org/jboss/ws/core/soap/XMLContent.java trunk/jbossws-core/src/java/org/jboss/ws/core/soap/XMLFragment.java trunk/jbossws-core/src/java/org/jboss/ws/core/utils/DOMUtils.java trunk/jbossws-core/src/java/org/jboss/ws/metadata/builder/MetaDataBuilder.java trunk/jbossws-core/src/java/org/jboss/ws/metadata/builder/jaxrpc/JAXRPCClientMetaDataBuilder.java trunk/jbossws-core/src/java/org/jboss/ws/metadata/builder/jaxrpc/JAXRPCMetaDataBuilder.java trunk/jbossws-core/src/java/org/jboss/ws/metadata/builder/jaxrpc/JAXRPCServerMetaDataBuilder.java trunk/jbossws-core/src/java/org/jboss/ws/metadata/builder/jaxws/JAXWSClientMetaDataBuilder.java trunk/jbossws-core/src/java/org/jboss/ws/metadata/wsdl/WSDLBinding.java trunk/jbossws-core/src/java/org/jboss/ws/metadata/wsdl/WSDLBindingMessageReference.java trunk/jbossws-core/src/java/org/jboss/ws/metadata/wsdl/WSDLDefinitions.java trunk/jbossws-core/src/java/org/jboss/ws/metadata/wsdl/WSDLEndpoint.java trunk/jbossws-core/src/java/org/jboss/ws/metadata/wsdl/WSDLInterface.java trunk/jbossws-core/src/java/org/jboss/ws/metadata/wsdl/WSDLInterfaceFault.java trunk/jbossws-core/src/java/org/jboss/ws/metadata/wsdl/WSDLInterfaceMessageReference.java trunk/jbossws-core/src/java/org/jboss/ws/metadata/wsdl/WSDLInterfaceOperation.java trunk/jbossws-core/src/java/org/jboss/ws/metadata/wsdl/WSDLInterfaceOperationInfault.java trunk/jbossws-core/src/java/org/jboss/ws/metadata/wsdl/WSDLInterfaceOperationOutfault.java trunk/jbossws-core/src/java/org/jboss/ws/metadata/wsdl/WSDLService.java trunk/jbossws-core/src/java/org/jboss/ws/tools/JavaToXSD.java trunk/jbossws-core/src/java/org/jboss/ws/tools/WSDLToJava.java trunk/jbossws-core/src/java/org/jboss/ws/tools/client/ServiceCreator.java trunk/jbossws-core/src/java/org/jboss/ws/tools/helpers/MappingFileGeneratorHelper.java trunk/jbossws-core/src/java/org/jboss/ws/tools/helpers/ToolsHelper.java trunk/jbossws-core/src/java/org/jboss/ws/tools/jaxws/command/wsconsume.java trunk/jbossws-core/src/java/org/jboss/ws/tools/wsdl/WSDL11DefinitionFactory.java trunk/jbossws-core/src/java/org/jboss/ws/tools/wsdl/WSDL11Reader.java trunk/jbossws-core/src/java/org/jboss/ws/tools/wsdl/WSDL11Writer.java trunk/jbossws-core/src/java/org/jboss/ws/tools/wsdl/WSDLGenerator.java trunk/jbossws-core/src/java/org/jboss/ws/tools/wsdl/WSDLWriter.java trunk/jbossws-tests/src/java/org/jboss/test/ws/benchmark/jaxrpc/BenchmarkDocEJBTestCase.java trunk/jbossws-tests/src/java/org/jboss/test/ws/benchmark/jaxrpc/BenchmarkDocJSETestCase.java trunk/jbossws-tests/src/java/org/jboss/test/ws/benchmark/jaxrpc/BenchmarkRpcEJBTestCase.java trunk/jbossws-tests/src/java/org/jboss/test/ws/benchmark/jaxrpc/BenchmarkRpcJSETestCase.java trunk/jbossws-tests/src/java/org/jboss/test/ws/common/wsdl11/WSDL11TestCase.java trunk/jbossws-tests/src/java/org/jboss/test/ws/interop/soapwsdl/baserpclit/ServiceImpl.java trunk/jbossws-tests/src/java/org/jboss/test/ws/interop/wsa/AddressingTestCase.java trunk/jbossws-tests/src/java/org/jboss/test/ws/jaxrpc/jbws1378/JBWS1378TestCase.java trunk/jbossws-tests/src/java/org/jboss/test/ws/jaxrpc/marshall/MarshallDocLitTestCase.java trunk/jbossws-tests/src/java/org/jboss/test/ws/jaxrpc/samples/wssecurity/StorePassEncryptTestCase.java trunk/jbossws-tests/src/java/org/jboss/test/ws/jaxrpc/wsdlpublish/TestEndpointImpl.java trunk/jbossws-tests/src/java/org/jboss/test/ws/jaxws/complex/JSR181ComplexTestCase.java trunk/jbossws-tests/src/java/org/jboss/test/ws/jaxws/holder/HolderTestCase.java trunk/jbossws-tests/src/java/org/jboss/test/ws/jaxws/samples/exception/ExceptionTestCase.java trunk/jbossws-tests/src/java/org/jboss/test/ws/jaxws/samples/handlerchain/HandlerChainTestCase.java trunk/jbossws-tests/src/java/org/jboss/test/ws/jaxws/samples/retail/RetailSampleTestCase.java trunk/jbossws-tests/src/java/org/jboss/test/ws/jaxws/samples/webservice/JSR181WebServiceBase.java trunk/jbossws-tests/src/java/org/jboss/test/ws/jaxws/samples/xop/doclit/XOPHandlerTestCase.java trunk/jbossws-tests/src/java/org/jboss/test/ws/jaxws/samples/xop/doclit/XOPTestCase.java trunk/jbossws-tests/src/java/org/jboss/test/ws/jaxws/wseventing/EventingSupport.java trunk/jbossws-tests/src/java/org/jboss/test/ws/tools/jbws1553/JBWS1553TestCase.java trunk/jbossws-tests/src/java/org/jboss/test/ws/tools/validation/WSDL11Validator.java trunk/jbossws-tests/src/java/org/jboss/test/ws/tools/validation/WSDLValidationHelper.java trunk/jbossws-tests/src/java/org/jboss/test/ws/tools/validation/WSDLValidator.java Log: JBWS-1560 Rip out NCName from the WSDL model Also fix service namespaces in tests that were broken yet did not fail before this change Modified: trunk/integration-jboss50/src/java/org/jboss/ws/integration/jboss50/JBossServiceEndpointServlet.java =================================================================== --- trunk/integration-jboss50/src/java/org/jboss/ws/integration/jboss50/JBossServiceEndpointServlet.java 2007-03-06 23:07:01 UTC (rev 2538) +++ trunk/integration-jboss50/src/java/org/jboss/ws/integration/jboss50/JBossServiceEndpointServlet.java 2007-03-07 08:08:09 UTC (rev 2539) @@ -29,7 +29,6 @@ import org.jboss.ws.WSException; import org.jboss.ws.core.server.AbstractServiceEndpointServlet; import org.jboss.ws.core.server.ServiceEndpoint; -import org.jboss.ws.metadata.config.ConfigurationProvider; import org.jboss.ws.metadata.umdm.ServerEndpointMetaData; /** Modified: trunk/jbossws-core/src/java/javax/xml/ws/RespectBindingFeature.java =================================================================== --- trunk/jbossws-core/src/java/javax/xml/ws/RespectBindingFeature.java 2007-03-06 23:07:01 UTC (rev 2538) +++ trunk/jbossws-core/src/java/javax/xml/ws/RespectBindingFeature.java 2007-03-07 08:08:09 UTC (rev 2539) @@ -24,8 +24,6 @@ // $Id$ import javax.xml.ws.WebServiceFeature; -import javax.xml.ws.WebServiceException; -import javax.xml.ws.spi.Provider; /** * This feature clarifies the use of the <code>wsdl:binding</code> Modified: trunk/jbossws-core/src/java/org/jboss/ws/core/CommonBindingProvider.java =================================================================== --- trunk/jbossws-core/src/java/org/jboss/ws/core/CommonBindingProvider.java 2007-03-06 23:07:01 UTC (rev 2538) +++ trunk/jbossws-core/src/java/org/jboss/ws/core/CommonBindingProvider.java 2007-03-07 08:08:09 UTC (rev 2539) @@ -32,7 +32,6 @@ import org.jboss.ws.core.jaxws.binding.SOAP11BindingJAXWS; import org.jboss.ws.core.jaxws.binding.SOAP12BindingJAXWS; import org.jboss.ws.metadata.config.Configurable; -import org.jboss.ws.metadata.config.ConfigurationProvider; import org.jboss.ws.metadata.umdm.EndpointMetaData; import org.jboss.ws.metadata.umdm.EndpointMetaData.Type; Modified: trunk/jbossws-core/src/java/org/jboss/ws/core/CommonContextServlet.java =================================================================== --- trunk/jbossws-core/src/java/org/jboss/ws/core/CommonContextServlet.java 2007-03-06 23:07:01 UTC (rev 2538) +++ trunk/jbossws-core/src/java/org/jboss/ws/core/CommonContextServlet.java 2007-03-07 08:08:09 UTC (rev 2539) @@ -35,8 +35,8 @@ import javax.servlet.http.HttpServletResponse; import org.jboss.logging.Logger; +import org.jboss.ws.core.server.ServiceEndpointDTO; import org.jboss.ws.core.server.ServiceEndpointManager; -import org.jboss.ws.core.server.ServiceEndpointDTO; /** * The servlet that that is associated with context /jbossws Modified: trunk/jbossws-core/src/java/org/jboss/ws/core/jaxrpc/SOAPFaultHelperJAXRPC.java =================================================================== --- trunk/jbossws-core/src/java/org/jboss/ws/core/jaxrpc/SOAPFaultHelperJAXRPC.java 2007-03-06 23:07:01 UTC (rev 2538) +++ trunk/jbossws-core/src/java/org/jboss/ws/core/jaxrpc/SOAPFaultHelperJAXRPC.java 2007-03-07 08:08:09 UTC (rev 2539) @@ -23,31 +23,50 @@ // $Id$ +import java.io.IOException; +import java.util.ArrayList; +import java.util.Iterator; +import java.util.List; + +import javax.xml.namespace.QName; +import javax.xml.rpc.JAXRPCException; +import javax.xml.rpc.encoding.TypeMapping; +import javax.xml.rpc.soap.SOAPFaultException; +import javax.xml.soap.Detail; +import javax.xml.soap.DetailEntry; +import javax.xml.soap.MessageFactory; +import javax.xml.soap.Name; +import javax.xml.soap.SOAPBody; +import javax.xml.soap.SOAPElement; +import javax.xml.soap.SOAPException; +import javax.xml.soap.SOAPFault; +import javax.xml.soap.SOAPMessage; +import javax.xml.transform.Result; +import javax.xml.transform.Source; +import javax.xml.transform.dom.DOMSource; + import org.jboss.logging.Logger; import org.jboss.ws.Constants; import org.jboss.ws.WSException; import org.jboss.ws.core.CommonMessageContext; -import org.jboss.ws.core.jaxrpc.binding.*; -import org.jboss.ws.core.soap.*; +import org.jboss.ws.core.jaxrpc.binding.BindingException; +import org.jboss.ws.core.jaxrpc.binding.DeserializerFactoryBase; +import org.jboss.ws.core.jaxrpc.binding.DeserializerSupport; +import org.jboss.ws.core.jaxrpc.binding.SerializationContext; +import org.jboss.ws.core.jaxrpc.binding.SerializerFactoryBase; +import org.jboss.ws.core.jaxrpc.binding.SerializerSupport; +import org.jboss.ws.core.soap.MessageContextAssociation; +import org.jboss.ws.core.soap.MessageFactoryImpl; +import org.jboss.ws.core.soap.NameImpl; +import org.jboss.ws.core.soap.SOAPEnvelopeImpl; +import org.jboss.ws.core.soap.SOAPFactoryImpl; +import org.jboss.ws.core.soap.XMLFragment; import org.jboss.ws.core.utils.DOMUtils; import org.jboss.ws.metadata.umdm.FaultMetaData; import org.jboss.ws.metadata.umdm.OperationMetaData; import org.jboss.xb.binding.NamespaceRegistry; import org.w3c.dom.Element; -import javax.xml.namespace.QName; -import javax.xml.rpc.JAXRPCException; -import javax.xml.rpc.encoding.TypeMapping; -import javax.xml.rpc.soap.SOAPFaultException; -import javax.xml.soap.*; -import javax.xml.transform.Result; -import javax.xml.transform.Source; -import javax.xml.transform.dom.DOMSource; -import java.io.IOException; -import java.util.ArrayList; -import java.util.Iterator; -import java.util.List; - /** * A Helper that translates between SOAPFaultException and SOAPFault. * Modified: trunk/jbossws-core/src/java/org/jboss/ws/core/jaxrpc/TypeMappingImpl.java =================================================================== --- trunk/jbossws-core/src/java/org/jboss/ws/core/jaxrpc/TypeMappingImpl.java 2007-03-06 23:07:01 UTC (rev 2538) +++ trunk/jbossws-core/src/java/org/jboss/ws/core/jaxrpc/TypeMappingImpl.java 2007-03-07 08:08:09 UTC (rev 2539) @@ -23,22 +23,39 @@ // $Id$ -import org.jboss.logging.Logger; -import org.jboss.ws.Constants; -import org.jboss.ws.core.jaxrpc.binding.*; -import org.jboss.ws.core.utils.JavaUtils; -import org.jboss.ws.core.utils.HashCodeUtil; +import java.math.BigDecimal; +import java.math.BigInteger; +import java.net.URI; +import java.util.ArrayList; +import java.util.Calendar; +import java.util.Date; +import java.util.LinkedHashMap; +import java.util.List; +import java.util.Map; +import java.util.concurrent.ConcurrentHashMap; import javax.xml.namespace.QName; import javax.xml.rpc.encoding.DeserializerFactory; import javax.xml.rpc.encoding.SerializerFactory; import javax.xml.rpc.encoding.TypeMapping; -import java.math.BigDecimal; -import java.math.BigInteger; -import java.net.URI; -import java.util.*; -import java.util.concurrent.ConcurrentHashMap; +import org.jboss.logging.Logger; +import org.jboss.ws.Constants; +import org.jboss.ws.core.jaxrpc.binding.Base64DeserializerFactory; +import org.jboss.ws.core.jaxrpc.binding.Base64SerializerFactory; +import org.jboss.ws.core.jaxrpc.binding.CalendarDeserializerFactory; +import org.jboss.ws.core.jaxrpc.binding.CalendarSerializerFactory; +import org.jboss.ws.core.jaxrpc.binding.DateDeserializerFactory; +import org.jboss.ws.core.jaxrpc.binding.DateSerializerFactory; +import org.jboss.ws.core.jaxrpc.binding.HexDeserializerFactory; +import org.jboss.ws.core.jaxrpc.binding.HexSerializerFactory; +import org.jboss.ws.core.jaxrpc.binding.QNameDeserializerFactory; +import org.jboss.ws.core.jaxrpc.binding.QNameSerializerFactory; +import org.jboss.ws.core.jaxrpc.binding.SimpleDeserializerFactory; +import org.jboss.ws.core.jaxrpc.binding.SimpleSerializerFactory; +import org.jboss.ws.core.utils.HashCodeUtil; +import org.jboss.ws.core.utils.JavaUtils; + /** * This is the representation of a type mapping. * This TypeMapping implementation supports the literal encoding style. Modified: trunk/jbossws-core/src/java/org/jboss/ws/core/jaxrpc/binding/Base64Serializer.java =================================================================== --- trunk/jbossws-core/src/java/org/jboss/ws/core/jaxrpc/binding/Base64Serializer.java 2007-03-06 23:07:01 UTC (rev 2538) +++ trunk/jbossws-core/src/java/org/jboss/ws/core/jaxrpc/binding/Base64Serializer.java 2007-03-07 08:08:09 UTC (rev 2539) @@ -24,7 +24,6 @@ // $Id$ import javax.xml.namespace.QName; -import javax.xml.transform.Source; import javax.xml.transform.Result; import org.jboss.logging.Logger; Modified: trunk/jbossws-core/src/java/org/jboss/ws/core/jaxrpc/binding/BufferedStreamResult.java =================================================================== --- trunk/jbossws-core/src/java/org/jboss/ws/core/jaxrpc/binding/BufferedStreamResult.java 2007-03-06 23:07:01 UTC (rev 2538) +++ trunk/jbossws-core/src/java/org/jboss/ws/core/jaxrpc/binding/BufferedStreamResult.java 2007-03-07 08:08:09 UTC (rev 2539) @@ -21,11 +21,12 @@ */ package org.jboss.ws.core.jaxrpc.binding; -import javax.xml.transform.stream.StreamResult; import java.io.ByteArrayOutputStream; import java.io.OutputStream; import java.io.Writer; +import javax.xml.transform.stream.StreamResult; + /** * @author Heiko.Braun(a)jboss.org * @version $Id$ Modified: trunk/jbossws-core/src/java/org/jboss/ws/core/jaxrpc/binding/CalendarSerializer.java =================================================================== --- trunk/jbossws-core/src/java/org/jboss/ws/core/jaxrpc/binding/CalendarSerializer.java 2007-03-06 23:07:01 UTC (rev 2538) +++ trunk/jbossws-core/src/java/org/jboss/ws/core/jaxrpc/binding/CalendarSerializer.java 2007-03-07 08:08:09 UTC (rev 2539) @@ -26,7 +26,6 @@ import java.util.Calendar; import javax.xml.namespace.QName; -import javax.xml.transform.Source; import javax.xml.transform.Result; import org.jboss.logging.Logger; Modified: trunk/jbossws-core/src/java/org/jboss/ws/core/jaxrpc/binding/DateSerializer.java =================================================================== --- trunk/jbossws-core/src/java/org/jboss/ws/core/jaxrpc/binding/DateSerializer.java 2007-03-06 23:07:01 UTC (rev 2538) +++ trunk/jbossws-core/src/java/org/jboss/ws/core/jaxrpc/binding/DateSerializer.java 2007-03-07 08:08:09 UTC (rev 2539) @@ -28,7 +28,6 @@ import java.util.GregorianCalendar; import javax.xml.namespace.QName; -import javax.xml.transform.Source; import javax.xml.transform.Result; import org.jboss.logging.Logger; Modified: trunk/jbossws-core/src/java/org/jboss/ws/core/jaxrpc/binding/DeserializerSupport.java =================================================================== --- trunk/jbossws-core/src/java/org/jboss/ws/core/jaxrpc/binding/DeserializerSupport.java 2007-03-06 23:07:01 UTC (rev 2538) +++ trunk/jbossws-core/src/java/org/jboss/ws/core/jaxrpc/binding/DeserializerSupport.java 2007-03-07 08:08:09 UTC (rev 2539) @@ -23,19 +23,19 @@ // $Id$ +import java.io.ByteArrayOutputStream; + import javax.xml.namespace.QName; import javax.xml.rpc.encoding.Deserializer; import javax.xml.transform.Source; +import javax.xml.transform.TransformerException; import javax.xml.transform.TransformerFactory; -import javax.xml.transform.TransformerException; import javax.xml.transform.stream.StreamResult; import org.jboss.util.NotImplementedException; +import org.jboss.ws.WSException; import org.jboss.ws.core.utils.XMLPredefinedEntityReferenceResolver; -import org.jboss.ws.WSException; -import java.io.ByteArrayOutputStream; - /** The base class for all Deserializers. * * @author Thomas.Diesler(a)jboss.org Modified: trunk/jbossws-core/src/java/org/jboss/ws/core/jaxrpc/binding/ElementSerializer.java =================================================================== --- trunk/jbossws-core/src/java/org/jboss/ws/core/jaxrpc/binding/ElementSerializer.java 2007-03-06 23:07:01 UTC (rev 2538) +++ trunk/jbossws-core/src/java/org/jboss/ws/core/jaxrpc/binding/ElementSerializer.java 2007-03-07 08:08:09 UTC (rev 2539) @@ -24,7 +24,6 @@ // $Id$ import javax.xml.namespace.QName; -import javax.xml.transform.Source; import javax.xml.transform.Result; import org.jboss.logging.Logger; Modified: trunk/jbossws-core/src/java/org/jboss/ws/core/jaxrpc/binding/HexSerializer.java =================================================================== --- trunk/jbossws-core/src/java/org/jboss/ws/core/jaxrpc/binding/HexSerializer.java 2007-03-06 23:07:01 UTC (rev 2538) +++ trunk/jbossws-core/src/java/org/jboss/ws/core/jaxrpc/binding/HexSerializer.java 2007-03-07 08:08:09 UTC (rev 2539) @@ -24,7 +24,6 @@ // $Id$ import javax.xml.namespace.QName; -import javax.xml.transform.Source; import javax.xml.transform.Result; import org.jboss.logging.Logger; Modified: trunk/jbossws-core/src/java/org/jboss/ws/core/jaxrpc/binding/JBossXBDeserializer.java =================================================================== --- trunk/jbossws-core/src/java/org/jboss/ws/core/jaxrpc/binding/JBossXBDeserializer.java 2007-03-06 23:07:01 UTC (rev 2538) +++ trunk/jbossws-core/src/java/org/jboss/ws/core/jaxrpc/binding/JBossXBDeserializer.java 2007-03-07 08:08:09 UTC (rev 2539) @@ -34,7 +34,6 @@ import org.jboss.ws.core.jaxrpc.binding.jbossxb.JBossXBConstants; import org.jboss.ws.core.jaxrpc.binding.jbossxb.JBossXBUnmarshaller; import org.jboss.ws.core.jaxrpc.binding.jbossxb.JBossXBUnmarshallerImpl; -import org.jboss.ws.core.soap.XMLFragment; import org.jboss.ws.metadata.jaxrpcmapping.JavaWsdlMapping; /** Modified: trunk/jbossws-core/src/java/org/jboss/ws/core/jaxrpc/binding/JBossXBSerializer.java =================================================================== --- trunk/jbossws-core/src/java/org/jboss/ws/core/jaxrpc/binding/JBossXBSerializer.java 2007-03-06 23:07:01 UTC (rev 2538) +++ trunk/jbossws-core/src/java/org/jboss/ws/core/jaxrpc/binding/JBossXBSerializer.java 2007-03-07 08:08:09 UTC (rev 2539) @@ -26,7 +26,6 @@ import java.io.StringWriter; import javax.xml.namespace.QName; -import javax.xml.transform.Source; import javax.xml.transform.Result; import org.apache.xerces.xs.XSModel; Modified: trunk/jbossws-core/src/java/org/jboss/ws/core/jaxrpc/binding/NullValueSerializer.java =================================================================== --- trunk/jbossws-core/src/java/org/jboss/ws/core/jaxrpc/binding/NullValueSerializer.java 2007-03-06 23:07:01 UTC (rev 2538) +++ trunk/jbossws-core/src/java/org/jboss/ws/core/jaxrpc/binding/NullValueSerializer.java 2007-03-07 08:08:09 UTC (rev 2539) @@ -24,7 +24,6 @@ // $Id$ import javax.xml.namespace.QName; -import javax.xml.transform.Source; import javax.xml.transform.Result; import org.jboss.logging.Logger; Modified: trunk/jbossws-core/src/java/org/jboss/ws/core/jaxrpc/binding/QNameSerializer.java =================================================================== --- trunk/jbossws-core/src/java/org/jboss/ws/core/jaxrpc/binding/QNameSerializer.java 2007-03-06 23:07:01 UTC (rev 2538) +++ trunk/jbossws-core/src/java/org/jboss/ws/core/jaxrpc/binding/QNameSerializer.java 2007-03-07 08:08:09 UTC (rev 2539) @@ -27,7 +27,6 @@ import java.util.Set; import javax.xml.namespace.QName; -import javax.xml.transform.Source; import javax.xml.transform.Result; import org.jboss.logging.Logger; Modified: trunk/jbossws-core/src/java/org/jboss/ws/core/jaxrpc/binding/SOAPArrayDeserializer.java =================================================================== --- trunk/jbossws-core/src/java/org/jboss/ws/core/jaxrpc/binding/SOAPArrayDeserializer.java 2007-03-06 23:07:01 UTC (rev 2538) +++ trunk/jbossws-core/src/java/org/jboss/ws/core/jaxrpc/binding/SOAPArrayDeserializer.java 2007-03-07 08:08:09 UTC (rev 2539) @@ -37,7 +37,6 @@ import org.jboss.ws.WSException; import org.jboss.ws.core.jaxrpc.TypeMappingImpl; import org.jboss.ws.core.utils.DOMUtils; -import org.jboss.ws.core.utils.DOMWriter; import org.jboss.ws.core.utils.JavaUtils; import org.jboss.ws.metadata.umdm.ParameterMetaData; import org.w3c.dom.Element; Modified: trunk/jbossws-core/src/java/org/jboss/ws/core/jaxrpc/binding/SOAPArraySerializer.java =================================================================== --- trunk/jbossws-core/src/java/org/jboss/ws/core/jaxrpc/binding/SOAPArraySerializer.java 2007-03-06 23:07:01 UTC (rev 2538) +++ trunk/jbossws-core/src/java/org/jboss/ws/core/jaxrpc/binding/SOAPArraySerializer.java 2007-03-07 08:08:09 UTC (rev 2539) @@ -23,6 +23,9 @@ // $Id$ +import javax.xml.namespace.QName; +import javax.xml.transform.Result; + import org.jboss.logging.Logger; import org.jboss.ws.Constants; import org.jboss.ws.WSException; @@ -32,9 +35,6 @@ import org.jboss.ws.metadata.umdm.ParameterMetaData; import org.w3c.dom.NamedNodeMap; -import javax.xml.namespace.QName; -import javax.xml.transform.Result; - /** * A Serializer that can handle SOAP encoded arrays. * Modified: trunk/jbossws-core/src/java/org/jboss/ws/core/jaxrpc/binding/SerializerSupport.java =================================================================== --- trunk/jbossws-core/src/java/org/jboss/ws/core/jaxrpc/binding/SerializerSupport.java 2007-03-06 23:07:01 UTC (rev 2538) +++ trunk/jbossws-core/src/java/org/jboss/ws/core/jaxrpc/binding/SerializerSupport.java 2007-03-07 08:08:09 UTC (rev 2539) @@ -23,6 +23,14 @@ // $Id$ +import java.io.ByteArrayInputStream; +import java.io.IOException; +import java.util.Set; + +import javax.xml.namespace.QName; +import javax.xml.rpc.encoding.Serializer; +import javax.xml.transform.Result; + import org.jboss.util.NotImplementedException; import org.jboss.ws.Constants; import org.jboss.ws.WSException; @@ -31,13 +39,6 @@ import org.w3c.dom.NamedNodeMap; import org.w3c.dom.Node; -import javax.xml.namespace.QName; -import javax.xml.rpc.encoding.Serializer; -import javax.xml.transform.Result; -import java.io.ByteArrayInputStream; -import java.io.IOException; -import java.util.Set; - /** * The base class for all Serializers. * Modified: trunk/jbossws-core/src/java/org/jboss/ws/core/jaxrpc/binding/SimpleSerializer.java =================================================================== --- trunk/jbossws-core/src/java/org/jboss/ws/core/jaxrpc/binding/SimpleSerializer.java 2007-03-06 23:07:01 UTC (rev 2538) +++ trunk/jbossws-core/src/java/org/jboss/ws/core/jaxrpc/binding/SimpleSerializer.java 2007-03-07 08:08:09 UTC (rev 2539) @@ -24,7 +24,6 @@ // $Id$ import javax.xml.namespace.QName; -import javax.xml.transform.Source; import javax.xml.transform.Result; import org.jboss.logging.Logger; Modified: trunk/jbossws-core/src/java/org/jboss/ws/core/jaxws/JAXBDeserializer.java =================================================================== --- trunk/jbossws-core/src/java/org/jboss/ws/core/jaxws/JAXBDeserializer.java 2007-03-06 23:07:01 UTC (rev 2538) +++ trunk/jbossws-core/src/java/org/jboss/ws/core/jaxws/JAXBDeserializer.java 2007-03-07 08:08:09 UTC (rev 2539) @@ -23,13 +23,6 @@ // $Id$ -import org.jboss.logging.Logger; -import org.jboss.ws.core.jaxrpc.TypeMappingImpl; -import org.jboss.ws.core.jaxrpc.binding.BindingException; -import org.jboss.ws.core.jaxrpc.binding.ComplexTypeDeserializer; -import org.jboss.ws.core.jaxrpc.binding.SerializationContext; -import org.jboss.ws.extensions.xop.jaxws.AttachmentUnmarshallerImpl; - import javax.xml.bind.JAXBContext; import javax.xml.bind.JAXBElement; import javax.xml.bind.JAXBException; @@ -38,6 +31,13 @@ import javax.xml.transform.Source; import javax.xml.ws.WebServiceException; +import org.jboss.logging.Logger; +import org.jboss.ws.core.jaxrpc.TypeMappingImpl; +import org.jboss.ws.core.jaxrpc.binding.BindingException; +import org.jboss.ws.core.jaxrpc.binding.ComplexTypeDeserializer; +import org.jboss.ws.core.jaxrpc.binding.SerializationContext; +import org.jboss.ws.extensions.xop.jaxws.AttachmentUnmarshallerImpl; + /** * A Deserializer that can handle complex types by delegating to JAXB. * Modified: trunk/jbossws-core/src/java/org/jboss/ws/core/jaxws/JAXBSerializer.java =================================================================== --- trunk/jbossws-core/src/java/org/jboss/ws/core/jaxws/JAXBSerializer.java 2007-03-06 23:07:01 UTC (rev 2538) +++ trunk/jbossws-core/src/java/org/jboss/ws/core/jaxws/JAXBSerializer.java 2007-03-07 08:08:09 UTC (rev 2539) @@ -23,8 +23,6 @@ // $Id$ -import java.util.List; - import javax.xml.bind.JAXBContext; import javax.xml.bind.JAXBElement; import javax.xml.bind.Marshaller; @@ -34,16 +32,13 @@ import javax.xml.ws.WebServiceException; import org.jboss.logging.Logger; -import org.jboss.ws.core.jaxrpc.TypeMappingImpl; import org.jboss.ws.core.jaxrpc.binding.BindingException; import org.jboss.ws.core.jaxrpc.binding.BufferedStreamResult; import org.jboss.ws.core.jaxrpc.binding.ComplexTypeSerializer; import org.jboss.ws.core.jaxrpc.binding.SerializationContext; -import org.jboss.ws.core.utils.JavaUtils; import org.jboss.ws.extensions.xop.jaxws.AttachmentMarshallerImpl; import org.jboss.ws.metadata.umdm.ParameterMetaData; import org.w3c.dom.NamedNodeMap; -import com.sun.org.apache.xalan.internal.xsltc.runtime.Parameter; /** * A Serializer that can handle complex types by delegating to JAXB. Modified: trunk/jbossws-core/src/java/org/jboss/ws/core/jaxws/SOAPFaultHelperJAXWS.java =================================================================== --- trunk/jbossws-core/src/java/org/jboss/ws/core/jaxws/SOAPFaultHelperJAXWS.java 2007-03-06 23:07:01 UTC (rev 2538) +++ trunk/jbossws-core/src/java/org/jboss/ws/core/jaxws/SOAPFaultHelperJAXWS.java 2007-03-07 08:08:09 UTC (rev 2539) @@ -14,11 +14,36 @@ */ package org.jboss.ws.core.jaxws; +import java.io.IOException; +import java.util.Iterator; + +import javax.xml.namespace.QName; +import javax.xml.rpc.encoding.TypeMapping; +import javax.xml.soap.Detail; +import javax.xml.soap.DetailEntry; +import javax.xml.soap.MessageFactory; +import javax.xml.soap.Name; +import javax.xml.soap.SOAPBody; +import javax.xml.soap.SOAPElement; +import javax.xml.soap.SOAPException; +import javax.xml.soap.SOAPFault; +import javax.xml.soap.SOAPMessage; +import javax.xml.transform.Result; +import javax.xml.transform.Source; +import javax.xml.transform.dom.DOMSource; +import javax.xml.ws.WebServiceException; +import javax.xml.ws.soap.SOAPFaultException; + import org.jboss.logging.Logger; import org.jboss.ws.Constants; import org.jboss.ws.core.CommonMessageContext; import org.jboss.ws.core.jaxrpc.SOAPFaultHelperJAXRPC; -import org.jboss.ws.core.jaxrpc.binding.*; +import org.jboss.ws.core.jaxrpc.binding.BindingException; +import org.jboss.ws.core.jaxrpc.binding.DeserializerFactoryBase; +import org.jboss.ws.core.jaxrpc.binding.DeserializerSupport; +import org.jboss.ws.core.jaxrpc.binding.SerializationContext; +import org.jboss.ws.core.jaxrpc.binding.SerializerFactoryBase; +import org.jboss.ws.core.jaxrpc.binding.SerializerSupport; import org.jboss.ws.core.soap.MessageContextAssociation; import org.jboss.ws.core.soap.NameImpl; import org.jboss.ws.core.soap.SOAPFactoryImpl; @@ -28,17 +53,6 @@ import org.jboss.ws.metadata.umdm.OperationMetaData; import org.w3c.dom.Element; -import javax.xml.namespace.QName; -import javax.xml.rpc.encoding.TypeMapping; -import javax.xml.soap.*; -import javax.xml.transform.Source; -import javax.xml.transform.Result; -import javax.xml.transform.dom.DOMSource; -import javax.xml.ws.WebServiceException; -import javax.xml.ws.soap.SOAPFaultException; -import java.io.IOException; -import java.util.Iterator; - /** * Helper methods to translate between SOAPFault and SOAPFaultException * as well as between Exception and SOAPMessage containing a fault. Modified: trunk/jbossws-core/src/java/org/jboss/ws/core/jaxws/client/ClientImpl.java =================================================================== --- trunk/jbossws-core/src/java/org/jboss/ws/core/jaxws/client/ClientImpl.java 2007-03-06 23:07:01 UTC (rev 2538) +++ trunk/jbossws-core/src/java/org/jboss/ws/core/jaxws/client/ClientImpl.java 2007-03-07 08:08:09 UTC (rev 2539) @@ -55,12 +55,12 @@ import org.jboss.ws.core.jaxws.handler.PortInfoImpl; import org.jboss.ws.core.jaxws.handler.SOAPMessageContextJAXWS; import org.jboss.ws.core.soap.MessageContextAssociation; +import org.jboss.ws.extensions.xop.XOPContext; import org.jboss.ws.metadata.config.Configurable; import org.jboss.ws.metadata.config.ConfigurationProvider; import org.jboss.ws.metadata.umdm.EndpointMetaData; import org.jboss.ws.metadata.umdm.OperationMetaData; import org.jboss.ws.metadata.umdm.HandlerMetaData.HandlerType; -import org.jboss.ws.extensions.xop.XOPContext; /** * Provides support for the dynamic invocation of a service endpoint. Modified: trunk/jbossws-core/src/java/org/jboss/ws/core/server/ServiceEndpointManager.java =================================================================== --- trunk/jbossws-core/src/java/org/jboss/ws/core/server/ServiceEndpointManager.java 2007-03-06 23:07:01 UTC (rev 2538) +++ trunk/jbossws-core/src/java/org/jboss/ws/core/server/ServiceEndpointManager.java 2007-03-07 08:08:09 UTC (rev 2539) @@ -32,9 +32,9 @@ import java.io.StringWriter; import java.lang.reflect.Constructor; import java.net.InetAddress; +import java.net.MalformedURLException; import java.net.URL; import java.net.UnknownHostException; -import java.net.MalformedURLException; import java.util.ArrayList; import java.util.HashMap; import java.util.Iterator; Modified: trunk/jbossws-core/src/java/org/jboss/ws/core/soap/DOMContent.java =================================================================== --- trunk/jbossws-core/src/java/org/jboss/ws/core/soap/DOMContent.java 2007-03-06 23:07:01 UTC (rev 2538) +++ trunk/jbossws-core/src/java/org/jboss/ws/core/soap/DOMContent.java 2007-03-07 08:08:09 UTC (rev 2539) @@ -21,11 +21,11 @@ */ package org.jboss.ws.core.soap; -import org.jboss.logging.Logger; - import javax.xml.transform.Source; import javax.xml.transform.dom.DOMSource; +import org.jboss.logging.Logger; + /** * Represents the DOM_VALID state of an {@link SOAPContentElement}.<br> * Modified: trunk/jbossws-core/src/java/org/jboss/ws/core/soap/EnvelopeBuilderDOM.java =================================================================== --- trunk/jbossws-core/src/java/org/jboss/ws/core/soap/EnvelopeBuilderDOM.java 2007-03-06 23:07:01 UTC (rev 2538) +++ trunk/jbossws-core/src/java/org/jboss/ws/core/soap/EnvelopeBuilderDOM.java 2007-03-07 08:08:09 UTC (rev 2539) @@ -23,6 +23,21 @@ //$Id$ +import java.io.IOException; +import java.io.InputStream; +import java.util.Iterator; + +import javax.xml.namespace.QName; +import javax.xml.soap.Detail; +import javax.xml.soap.Name; +import javax.xml.soap.SOAPBody; +import javax.xml.soap.SOAPElement; +import javax.xml.soap.SOAPEnvelope; +import javax.xml.soap.SOAPException; +import javax.xml.soap.SOAPHeader; +import javax.xml.soap.SOAPMessage; +import javax.xml.transform.dom.DOMSource; + import org.jboss.logging.Logger; import org.jboss.ws.WSException; import org.jboss.ws.core.jaxrpc.Style; @@ -30,13 +45,6 @@ import org.w3c.dom.Element; import org.w3c.dom.NodeList; -import javax.xml.namespace.QName; -import javax.xml.soap.*; -import javax.xml.transform.dom.DOMSource; -import java.io.IOException; -import java.io.InputStream; -import java.util.Iterator; - /** * A SOAPEnvelope builder for JAXRPC based on DOM * Modified: trunk/jbossws-core/src/java/org/jboss/ws/core/soap/EnvelopeBuilderPayload.java =================================================================== --- trunk/jbossws-core/src/java/org/jboss/ws/core/soap/EnvelopeBuilderPayload.java 2007-03-06 23:07:01 UTC (rev 2538) +++ trunk/jbossws-core/src/java/org/jboss/ws/core/soap/EnvelopeBuilderPayload.java 2007-03-07 08:08:09 UTC (rev 2539) @@ -36,7 +36,6 @@ import javax.xml.transform.dom.DOMSource; import org.jboss.ws.core.utils.DOMUtils; -import org.jboss.ws.core.utils.DOMWriter; import org.w3c.dom.Element; /** Modified: trunk/jbossws-core/src/java/org/jboss/ws/core/soap/EnvelopeBuilderStax.java =================================================================== --- trunk/jbossws-core/src/java/org/jboss/ws/core/soap/EnvelopeBuilderStax.java 2007-03-06 23:07:01 UTC (rev 2538) +++ trunk/jbossws-core/src/java/org/jboss/ws/core/soap/EnvelopeBuilderStax.java 2007-03-07 08:08:09 UTC (rev 2539) @@ -23,9 +23,9 @@ // $Id$ +import java.io.ByteArrayInputStream; import java.io.IOException; import java.io.InputStream; -import java.io.ByteArrayInputStream; import javax.xml.namespace.QName; import javax.xml.soap.Name; Modified: trunk/jbossws-core/src/java/org/jboss/ws/core/soap/ObjectContent.java =================================================================== --- trunk/jbossws-core/src/java/org/jboss/ws/core/soap/ObjectContent.java 2007-03-06 23:07:01 UTC (rev 2538) +++ trunk/jbossws-core/src/java/org/jboss/ws/core/soap/ObjectContent.java 2007-03-07 08:08:09 UTC (rev 2539) @@ -21,19 +21,24 @@ */ package org.jboss.ws.core.soap; +import java.lang.reflect.Method; + +import javax.xml.namespace.QName; +import javax.xml.transform.Result; +import javax.xml.transform.Source; + +import org.jboss.logging.Logger; +import org.jboss.ws.WSException; import org.jboss.ws.core.CommonMessageContext; +import org.jboss.ws.core.jaxrpc.TypeMappingImpl; +import org.jboss.ws.core.jaxrpc.binding.BindingException; +import org.jboss.ws.core.jaxrpc.binding.NullValueSerializer; +import org.jboss.ws.core.jaxrpc.binding.SerializationContext; +import org.jboss.ws.core.jaxrpc.binding.SerializerFactoryBase; +import org.jboss.ws.core.jaxrpc.binding.SerializerSupport; import org.jboss.ws.core.utils.JavaUtils; -import org.jboss.ws.core.jaxrpc.binding.*; -import org.jboss.ws.core.jaxrpc.TypeMappingImpl; -import org.jboss.ws.WSException; import org.jboss.ws.metadata.umdm.ParameterMetaData; -import org.jboss.logging.Logger; -import javax.xml.transform.Source; -import javax.xml.transform.Result; -import javax.xml.namespace.QName; -import java.lang.reflect.Method; - /** * Represents the OBJECT_VALID state of an {@link SOAPContentElement}.<br> * Modified: trunk/jbossws-core/src/java/org/jboss/ws/core/soap/SOAPContentElement.java =================================================================== --- trunk/jbossws-core/src/java/org/jboss/ws/core/soap/SOAPContentElement.java 2007-03-06 23:07:01 UTC (rev 2538) +++ trunk/jbossws-core/src/java/org/jboss/ws/core/soap/SOAPContentElement.java 2007-03-07 08:08:09 UTC (rev 2539) @@ -23,22 +23,28 @@ // $Id$ -import org.jboss.logging.Logger; -import org.jboss.ws.core.CommonMessageContext; -import org.jboss.ws.core.utils.DOMWriter; -import org.jboss.ws.extensions.xop.XOPContext; -import org.jboss.ws.metadata.umdm.ParameterMetaData; -import org.w3c.dom.*; +import java.io.IOException; +import java.io.Writer; +import java.util.Iterator; import javax.xml.namespace.QName; import javax.xml.soap.Name; import javax.xml.soap.SOAPElement; import javax.xml.soap.SOAPException; import javax.xml.transform.Source; -import java.io.IOException; -import java.io.Writer; -import java.util.Iterator; +import org.jboss.logging.Logger; +import org.jboss.ws.core.CommonMessageContext; +import org.jboss.ws.core.utils.DOMWriter; +import org.jboss.ws.extensions.xop.XOPContext; +import org.jboss.ws.metadata.umdm.ParameterMetaData; +import org.w3c.dom.Attr; +import org.w3c.dom.DOMException; +import org.w3c.dom.NamedNodeMap; +import org.w3c.dom.Node; +import org.w3c.dom.NodeList; +import org.w3c.dom.TypeInfo; + /** * A SOAPElement that gives access to its content as XML fragment or Java object.<p> * Modified: trunk/jbossws-core/src/java/org/jboss/ws/core/soap/XMLContent.java =================================================================== --- trunk/jbossws-core/src/java/org/jboss/ws/core/soap/XMLContent.java 2007-03-06 23:07:01 UTC (rev 2538) +++ trunk/jbossws-core/src/java/org/jboss/ws/core/soap/XMLContent.java 2007-03-07 08:08:09 UTC (rev 2539) @@ -23,6 +23,21 @@ // $Id: $ +import java.io.ByteArrayOutputStream; +import java.io.IOException; +import java.io.InputStream; +import java.lang.reflect.Array; +import java.lang.reflect.Method; +import java.util.List; + +import javax.activation.DataHandler; +import javax.activation.DataSource; +import javax.xml.namespace.QName; +import javax.xml.soap.Name; +import javax.xml.soap.SOAPElement; +import javax.xml.soap.SOAPException; +import javax.xml.transform.Source; + import org.jboss.logging.Logger; import org.jboss.ws.Constants; import org.jboss.ws.WSException; @@ -42,20 +57,6 @@ import org.w3c.dom.Node; import org.w3c.dom.NodeList; -import javax.activation.DataHandler; -import javax.activation.DataSource; -import javax.xml.namespace.QName; -import javax.xml.soap.Name; -import javax.xml.soap.SOAPElement; -import javax.xml.soap.SOAPException; -import javax.xml.transform.Source; -import java.io.ByteArrayOutputStream; -import java.io.IOException; -import java.io.InputStream; -import java.lang.reflect.Array; -import java.lang.reflect.Method; -import java.util.List; - /** * Represents the XML_VALID state of an {@link SOAPContentElement}.<br> * Aggregates a {@link XMLFragment}. Modified: trunk/jbossws-core/src/java/org/jboss/ws/core/soap/XMLFragment.java =================================================================== --- trunk/jbossws-core/src/java/org/jboss/ws/core/soap/XMLFragment.java 2007-03-06 23:07:01 UTC (rev 2538) +++ trunk/jbossws-core/src/java/org/jboss/ws/core/soap/XMLFragment.java 2007-03-07 08:08:09 UTC (rev 2539) @@ -23,19 +23,26 @@ //$Id: $ -import org.jboss.ws.WSException; -import org.jboss.ws.core.jaxrpc.binding.BufferedStreamResult; -import org.jboss.ws.core.utils.DOMUtils; -import org.jboss.ws.core.utils.DOMWriter; -import org.w3c.dom.Element; +import java.io.ByteArrayInputStream; +import java.io.ByteArrayOutputStream; +import java.io.IOException; +import java.io.InputStream; +import java.io.OutputStream; +import java.io.PrintWriter; +import java.io.Writer; import javax.xml.transform.Result; import javax.xml.transform.Source; import javax.xml.transform.dom.DOMResult; import javax.xml.transform.dom.DOMSource; import javax.xml.transform.stream.StreamSource; -import java.io.*; +import org.jboss.ws.WSException; +import org.jboss.ws.core.jaxrpc.binding.BufferedStreamResult; +import org.jboss.ws.core.utils.DOMUtils; +import org.jboss.ws.core.utils.DOMWriter; +import org.w3c.dom.Element; + /** * A XMLFragment represent either a XML {@link Source} or a {@link Result}.<br> * The basic idea is that any {@link SOAPContentElement} XML_VALID state Modified: trunk/jbossws-core/src/java/org/jboss/ws/core/utils/DOMUtils.java =================================================================== --- trunk/jbossws-core/src/java/org/jboss/ws/core/utils/DOMUtils.java 2007-03-06 23:07:01 UTC (rev 2538) +++ trunk/jbossws-core/src/java/org/jboss/ws/core/utils/DOMUtils.java 2007-03-07 08:08:09 UTC (rev 2539) @@ -23,7 +23,11 @@ // $Id$ -import java.io.*; +import java.io.ByteArrayInputStream; +import java.io.ByteArrayOutputStream; +import java.io.IOException; +import java.io.InputStream; +import java.io.Reader; import java.util.ArrayList; import java.util.HashMap; import java.util.Iterator; @@ -35,10 +39,10 @@ import javax.xml.parsers.ParserConfigurationException; import javax.xml.transform.Source; import javax.xml.transform.TransformerFactory; +import javax.xml.transform.dom.DOMSource; import javax.xml.transform.sax.SAXSource; -import javax.xml.transform.dom.DOMSource; +import javax.xml.transform.stream.StreamResult; import javax.xml.transform.stream.StreamSource; -import javax.xml.transform.stream.StreamResult; import org.jboss.logging.Logger; import org.jboss.ws.WSException; Modified: trunk/jbossws-core/src/java/org/jboss/ws/metadata/builder/MetaDataBuilder.java =================================================================== --- trunk/jbossws-core/src/java/org/jboss/ws/metadata/builder/MetaDataBuilder.java 2007-03-06 23:07:01 UTC (rev 2538) +++ trunk/jbossws-core/src/java/org/jboss/ws/metadata/builder/MetaDataBuilder.java 2007-03-07 08:08:09 UTC (rev 2539) @@ -68,7 +68,6 @@ import org.jboss.ws.metadata.umdm.EndpointMetaData; import org.jboss.ws.metadata.umdm.OperationMetaData; import org.jboss.ws.metadata.umdm.ServerEndpointMetaData; -import org.jboss.ws.metadata.wsdl.NCName; import org.jboss.ws.metadata.wsdl.WSDLBinding; import org.jboss.ws.metadata.wsdl.WSDLBindingOperation; import org.jboss.ws.metadata.wsdl.WSDLDefinitions; @@ -97,7 +96,7 @@ { WSDLDefinitions wsdlDefinitions = wsdlEndpoint.getWsdlService().getWsdlDefinitions(); WSDLInterface wsdlInterface = wsdlEndpoint.getInterface(); - WSDLBinding wsdlBinding = wsdlDefinitions.getBindingByInterfaceName(wsdlInterface.getQName()); + WSDLBinding wsdlBinding = wsdlDefinitions.getBindingByInterfaceName(wsdlInterface.getName()); String bindingType = wsdlBinding.getType(); if (Constants.NS_SOAP11.equals(bindingType)) epMetaData.setBindingId(Constants.SOAP11HTTP_BINDING); @@ -114,13 +113,12 @@ { for (WSDLEndpoint wsdlEndpoint : wsdlService.getEndpoints()) { - if (epMetaData.getPortName().equals(wsdlEndpoint.getQName())) + if (epMetaData.getPortName().equals(wsdlEndpoint.getName())) { QName bindQName = wsdlEndpoint.getBinding(); - NCName ncName = new NCName(bindQName.getLocalPart()); - WSDLBinding wsdlBinding = wsdlDefinitions.getBinding(ncName); + WSDLBinding wsdlBinding = wsdlDefinitions.getBinding(bindQName); if (wsdlBinding == null) - throw new WSException("Cannot obtain binding: " + ncName); + throw new WSException("Cannot obtain binding: " + bindQName); for (WSDLBindingOperation wsdlBindingOperation : wsdlBinding.getOperations()) { @@ -314,7 +312,7 @@ { for (WSDLEndpoint wsdlEndpoint : wsdlService.getEndpoints()) { - QName wsdlPortName = wsdlEndpoint.getQName(); + QName wsdlPortName = wsdlEndpoint.getName(); if (wsdlPortName.equals(portName)) { endpointFound = true; @@ -454,7 +452,7 @@ if (eventSourceProp != null && epMetaData instanceof ServerEndpointMetaData) { ServerEndpointMetaData sepMetaData = (ServerEndpointMetaData)epMetaData; - String eventSourceNS = wsdlInterface.getQName().getNamespaceURI() + "/" + wsdlInterface.getQName().getLocalPart(); + String eventSourceNS = wsdlInterface.getName().getNamespaceURI() + "/" + wsdlInterface.getName().getLocalPart(); // extract the schema model JBossXSModel schemaModel = WSDLUtils.getSchemaModel(wsdlDefinitions.getWsdlTypes()); @@ -473,7 +471,7 @@ // WSDL operation of an WSDL interface that is marked as an event source // requires to carry an output message. throw new WSException("Unable to resolve eventing root element NS. No operation output found at "+ - wsdlInterfaceOperation.getQName()); + wsdlInterfaceOperation.getName()); } EventingEpMetaExt ext = new EventingEpMetaExt(EventingConstants.NS_EVENTING); @@ -491,8 +489,8 @@ protected void processOpMetaExtensions(OperationMetaData opMetaData, WSDLInterfaceOperation wsdlOperation) { - String tns = wsdlOperation.getQName().getNamespaceURI(); - String portTypeName = wsdlOperation.getQName().getLocalPart(); + String tns = wsdlOperation.getName().getNamespaceURI(); + String portTypeName = wsdlOperation.getName().getLocalPart(); AddressingProperties ADDR = new AddressingPropertiesImpl(); AddressingOpMetaExt addrExt = new AddressingOpMetaExt(ADDR.getNamespaceURI()); Modified: trunk/jbossws-core/src/java/org/jboss/ws/metadata/builder/jaxrpc/JAXRPCClientMetaDataBuilder.java =================================================================== --- trunk/jbossws-core/src/java/org/jboss/ws/metadata/builder/jaxrpc/JAXRPCClientMetaDataBuilder.java 2007-03-06 23:07:01 UTC (rev 2538) +++ trunk/jbossws-core/src/java/org/jboss/ws/metadata/builder/jaxrpc/JAXRPCClientMetaDataBuilder.java 2007-03-07 08:08:09 UTC (rev 2539) @@ -45,7 +45,6 @@ import org.jboss.ws.metadata.umdm.UnifiedMetaData; import org.jboss.ws.metadata.umdm.EndpointMetaData.Type; import org.jboss.ws.metadata.umdm.HandlerMetaData.HandlerType; -import org.jboss.ws.metadata.wsdl.NCName; import org.jboss.ws.metadata.wsdl.WSDLDefinitions; import org.jboss.ws.metadata.wsdl.WSDLEndpoint; import org.jboss.ws.metadata.wsdl.WSDLService; @@ -162,11 +161,11 @@ throw new IllegalArgumentException("Expected a single service element"); wsdlService = wsdlDefinitions.getServices()[0]; - serviceMetaData.setServiceName(wsdlService.getQName()); + serviceMetaData.setServiceName(wsdlService.getName()); } else { - wsdlService = wsdlDefinitions.getService(new NCName(serviceQName.getLocalPart())); + wsdlService = wsdlDefinitions.getService(serviceQName); } if (wsdlService == null) throw new IllegalArgumentException("Cannot obtain wsdl service: " + serviceQName); @@ -177,8 +176,8 @@ // Build endpoint meta data for (WSDLEndpoint wsdlEndpoint : wsdlService.getEndpoints()) { - QName portName = wsdlEndpoint.getQName(); - QName interfaceQName = wsdlEndpoint.getInterface().getQName(); + QName portName = wsdlEndpoint.getName(); + QName interfaceQName = wsdlEndpoint.getInterface().getName(); ClientEndpointMetaData epMetaData = new ClientEndpointMetaData(serviceMetaData, portName, interfaceQName, Type.JAXRPC); epMetaData.setEndpointAddress(wsdlEndpoint.getAddress()); serviceMetaData.addEndpoint(epMetaData); @@ -201,7 +200,7 @@ ServiceEndpointInterfaceMapping seiMapping = null; if (javaWsdlMapping != null) { - QName portType = wsdlEndpoint.getInterface().getQName(); + QName portType = wsdlEndpoint.getInterface().getName(); seiMapping = javaWsdlMapping.getServiceEndpointInterfaceMappingByPortType(portType); if (seiMapping != null) { Modified: trunk/jbossws-core/src/java/org/jboss/ws/metadata/builder/jaxrpc/JAXRPCMetaDataBuilder.java =================================================================== --- trunk/jbossws-core/src/java/org/jboss/ws/metadata/builder/jaxrpc/JAXRPCMetaDataBuilder.java 2007-03-06 23:07:01 UTC (rev 2538) +++ trunk/jbossws-core/src/java/org/jboss/ws/metadata/builder/jaxrpc/JAXRPCMetaDataBuilder.java 2007-03-07 08:08:09 UTC (rev 2539) @@ -63,7 +63,6 @@ import org.jboss.ws.metadata.umdm.TypeMappingMetaData; import org.jboss.ws.metadata.umdm.TypesMetaData; import org.jboss.ws.metadata.umdm.WrappedParameter; -import org.jboss.ws.metadata.wsdl.NCName; import org.jboss.ws.metadata.wsdl.WSDLBinding; import org.jboss.ws.metadata.wsdl.WSDLBindingOperation; import org.jboss.ws.metadata.wsdl.WSDLBindingOperationInput; @@ -158,8 +157,8 @@ WSDLInterface wsdlInterface = wsdlEndpoint.getInterface(); for (WSDLInterfaceOperation wsdlOperation : wsdlInterface.getOperations()) { - String opName = wsdlOperation.getName().toString(); - QName opQName = wsdlOperation.getQName(); + QName opQName = wsdlOperation.getName(); + String opName = opQName.getLocalPart(); // Set java method name String javaName = opName.substring(0, 1).toLowerCase() + opName.substring(1); @@ -187,7 +186,7 @@ opMetaData.setOneWay(true); // Set the operation SOAPAction - WSDLBinding wsdlBinding = wsdlDefinitions.getBindingByInterfaceName(wsdlInterface.getQName()); + WSDLBinding wsdlBinding = wsdlDefinitions.getBindingByInterfaceName(wsdlInterface.getName()); WSDLBindingOperation wsdlBindingOperation = wsdlBinding.getOperationByRef(opQName); if (wsdlBindingOperation != null) opMetaData.setSOAPAction(wsdlBindingOperation.getSOAPAction()); @@ -894,8 +893,8 @@ if (null == wsaAction) { - String tns = wsdlOperation.getQName().getNamespaceURI(); - String portTypeName = wsdlOperation.getQName().getLocalPart(); + String tns = wsdlOperation.getName().getNamespaceURI(); + String portTypeName = wsdlOperation.getName().getLocalPart(); WSDLProperty messageName = wsdlOperation.getProperty("http://www.jboss.org/jbossws/messagename/...; actionValue = new String(tns + "/" + portTypeName + "/" + messageName.getValue()); @@ -917,7 +916,7 @@ { QName ref = outFault.getRef(); - WSDLInterfaceFault wsdlFault = wsdlInterface.getFault(new NCName(ref.getLocalPart())); + WSDLInterfaceFault wsdlFault = wsdlInterface.getFault(ref); QName xmlName = wsdlFault.getElement(); QName xmlType = wsdlFault.getXmlType(); String javaTypeName = null; Modified: trunk/jbossws-core/src/java/org/jboss/ws/metadata/builder/jaxrpc/JAXRPCServerMetaDataBuilder.java =================================================================== --- trunk/jbossws-core/src/java/org/jboss/ws/metadata/builder/jaxrpc/JAXRPCServerMetaDataBuilder.java 2007-03-06 23:07:01 UTC (rev 2538) +++ trunk/jbossws-core/src/java/org/jboss/ws/metadata/builder/jaxrpc/JAXRPCServerMetaDataBuilder.java 2007-03-07 08:08:09 UTC (rev 2539) @@ -126,8 +126,8 @@ throw new WSException("Cannot find port in wsdl: " + portName); // set service name - serviceMetaData.setServiceName(wsdlEndpoint.getWsdlService().getQName()); - QName interfaceQName = wsdlEndpoint.getInterface().getQName(); + serviceMetaData.setServiceName(wsdlEndpoint.getWsdlService().getName()); + QName interfaceQName = wsdlEndpoint.getInterface().getName(); ServerEndpointMetaData sepMetaData = new ServerEndpointMetaData(serviceMetaData, portName, interfaceQName, Type.JAXRPC); sepMetaData.setPortComponentName(pcMetaData.getPortComponentName()); Modified: trunk/jbossws-core/src/java/org/jboss/ws/metadata/builder/jaxws/JAXWSClientMetaDataBuilder.java =================================================================== --- trunk/jbossws-core/src/java/org/jboss/ws/metadata/builder/jaxws/JAXWSClientMetaDataBuilder.java 2007-03-06 23:07:01 UTC (rev 2538) +++ trunk/jbossws-core/src/java/org/jboss/ws/metadata/builder/jaxws/JAXWSClientMetaDataBuilder.java 2007-03-07 08:08:09 UTC (rev 2539) @@ -41,7 +41,6 @@ import org.jboss.ws.metadata.umdm.ServiceMetaData; import org.jboss.ws.metadata.umdm.UnifiedMetaData; import org.jboss.ws.metadata.umdm.EndpointMetaData.Type; -import org.jboss.ws.metadata.wsdl.NCName; import org.jboss.ws.metadata.wsdl.WSDLBinding; import org.jboss.ws.metadata.wsdl.WSDLBindingOperation; import org.jboss.ws.metadata.wsdl.WSDLDefinitions; @@ -116,11 +115,11 @@ throw new IllegalArgumentException("Expected a single service element"); wsdlService = wsdlDefinitions.getServices()[0]; - serviceMetaData.setServiceName(wsdlService.getQName()); + serviceMetaData.setServiceName(wsdlService.getName()); } else { - wsdlService = wsdlDefinitions.getService(new NCName(serviceName.getLocalPart())); + wsdlService = wsdlDefinitions.getService(serviceName); } if (wsdlService == null) throw new IllegalArgumentException("Cannot obtain wsdl service: " + serviceName); @@ -128,8 +127,8 @@ // Build endpoint meta data for (WSDLEndpoint wsdlEndpoint : wsdlService.getEndpoints()) { - QName portName = wsdlEndpoint.getQName(); - QName interfaceQName = wsdlEndpoint.getInterface().getQName(); + QName portName = wsdlEndpoint.getName(); + QName interfaceQName = wsdlEndpoint.getInterface().getName(); ClientEndpointMetaData epMetaData = new ClientEndpointMetaData(serviceMetaData, portName, interfaceQName, Type.JAXWS); epMetaData.setEndpointAddress(wsdlEndpoint.getAddress()); serviceMetaData.addEndpoint(epMetaData); @@ -153,7 +152,7 @@ for (WSDLInterfaceOperation wsdlOperation : wsdlInterface.getOperations()) { String opName = wsdlOperation.getName().toString(); - QName opQName = wsdlOperation.getQName(); + QName opQName = wsdlOperation.getName(); // Set java method name String javaName = opName.substring(0, 1).toLowerCase() + opName.substring(1); @@ -170,7 +169,7 @@ opMetaData.setOneWay(true); // Set the operation SOAPAction - WSDLBinding wsdlBinding = wsdlDefinitions.getBindingByInterfaceName(wsdlInterface.getQName()); + WSDLBinding wsdlBinding = wsdlDefinitions.getBindingByInterfaceName(wsdlInterface.getName()); WSDLBindingOperation wsdlBindingOperation = wsdlBinding.getOperationByRef(opQName); if (wsdlBindingOperation != null) opMetaData.setSOAPAction(wsdlBindingOperation.getSOAPAction()); Deleted: trunk/jbossws-core/src/java/org/jboss/ws/metadata/wsdl/NCName.java =================================================================== --- trunk/jbossws-core/src/java/org/jboss/ws/metadata/wsdl/NCName.java 2007-03-06 23:07:01 UTC (rev 2538) +++ trunk/jbossws-core/src/java/org/jboss/ws/metadata/wsdl/NCName.java 2007-03-07 08:08:09 UTC (rev 2539) @@ -1,76 +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.wsdl; - -import java.io.Serializable; - -import javax.xml.namespace.QName; - -// $Id$ - - -/** - * The value space of the wsdls:NCName type is the subset of the value space of the wsdls:Token type - * consisting of tokens that do not contain the space (#x20) and ':' characters. - * - * @author Thomas.Diesler(a)jboss.org - * @since 10-Oct-2004 - */ -public class NCName implements Serializable -{ - private static final long serialVersionUID = -4997456323552864649L; - - private String name; - - public NCName(QName qname) - { - this(qname != null ? qname.getLocalPart() : null); - } - - public NCName(String name) - { - if (name == null || name.indexOf(':') >= 0 || name.indexOf(' ') >= 0) - throw new IllegalArgumentException("Illegal NCName: " + name); - - this.name = name; - } - - public boolean equals(Object obj) - { - if (obj instanceof NCName) - return name.equals(((NCName)obj).name); - if (obj instanceof String) - return name.equals(((String)obj)); - - return false; - } - - public int hashCode() - { - return name.hashCode(); - } - - public String toString() - { - return name; - } -} Modified: trunk/jbossws-core/src/java/org/jboss/ws/metadata/wsdl/WSDLBinding.java =================================================================== --- trunk/jbossws-core/src/java/org/jboss/ws/metadata/wsdl/WSDLBinding.java 2007-03-06 23:07:01 UTC (rev 2538) +++ trunk/jbossws-core/src/java/org/jboss/ws/metadata/wsdl/WSDLBinding.java 2007-03-07 08:08:09 UTC (rev 2539) @@ -37,6 +37,7 @@ * implementation details necessary to accessing the service. * * @author Thomas.Diesler(a)jboss.org + * @author <a href=&quot;jason.greene(a)jboss.com&quot;&gt;Jason T. Greene</a> * @since 10-Oct-2004 */ public class WSDLBinding implements Serializable @@ -47,15 +48,9 @@ private static final Logger log = Logger.getLogger(WSDLBinding.class); // The parent WSDL definitions element. - private WSDLDefinitions wsdlDefinitions; + private final WSDLDefinitions wsdlDefinitions; - /** The REQUIRED name attribute information item together with the targetNamespace attribute information item - * of the definitions element information item forms the QName of the binding.*/ - private NCName name; - - /** Derived QName identifier. - */ - private QName qname; + private final QName name; /** The OPTIONAL interface attribute information item refers, by QName, to an Interface component. */ private QName interfaceName; @@ -72,10 +67,10 @@ * information items in [children], if any.*/ private ArrayList<WSDLBindingOperation> operations = new ArrayList<WSDLBindingOperation>(); - public WSDLBinding(WSDLDefinitions wsdlDefinitions) + public WSDLBinding(WSDLDefinitions wsdlDefinitions, QName name) { - log.trace("new WSDLBinding"); this.wsdlDefinitions = wsdlDefinitions; + this.name = name; } public WSDLDefinitions getWsdlDefinitions() @@ -83,34 +78,11 @@ return wsdlDefinitions; } - public NCName getName() + public QName getName() { return name; } - public void setName(NCName name) - { - log.trace("setName: " + name); - this.name = name; - } - - public QName getQName() - { - if (qname == null) - { - String tnsURI = wsdlDefinitions.getTargetNamespace(); - qname = new QName(tnsURI, name.toString()); - } - return qname; - } - - - public void setQName(QName qname) - { - log.trace("setQName: " + qname); - this.qname = qname; - } - public QName getInterfaceName() { return interfaceName; @@ -124,7 +96,7 @@ public WSDLInterface getInterface() { - WSDLInterface wsdlInterface = wsdlDefinitions.getInterface(new NCName(interfaceName.getLocalPart())); + WSDLInterface wsdlInterface = wsdlDefinitions.getInterface(interfaceName); if (wsdlInterface == null) throw new WSException("Cannot get interface for name: " + interfaceName); return wsdlInterface; Modified: trunk/jbossws-core/src/java/org/jboss/ws/metadata/wsdl/WSDLBindingMessageReference.java =================================================================== --- trunk/jbossws-core/src/java/org/jboss/ws/metadata/wsdl/WSDLBindingMessageReference.java 2007-03-06 23:07:01 UTC (rev 2538) +++ trunk/jbossws-core/src/java/org/jboss/ws/metadata/wsdl/WSDLBindingMessageReference.java 2007-03-07 08:08:09 UTC (rev 2539) @@ -38,7 +38,7 @@ { // The parent WSDL binding operation private WSDLBindingOperation wsdlBindingOperation; - private NCName messageLabel; + private String messageLabel; private List<WSDLSOAPHeader> soapHeaders = new ArrayList<WSDLSOAPHeader>(); private LinkedHashMap<String, WSDLMIMEPart> mimeParts = new LinkedHashMap<String, WSDLMIMEPart>(); @@ -58,7 +58,7 @@ * exchange pattern} of the Interface Operation component being bound by the * containing Binding Operation component. */ - public NCName getMessageLabel() + public String getMessageLabel() { return messageLabel; } @@ -69,7 +69,7 @@ * exchange pattern} of the Interface Operation component being bound by the * containing Binding Operation component. */ - public void setMessageLabel(NCName messageLabel) + public void setMessageLabel(String messageLabel) { this.messageLabel = messageLabel; } Modified: trunk/jbossws-core/src/java/org/jboss/ws/metadata/wsdl/WSDLDefinitions.java =================================================================== --- trunk/jbossws-core/src/java/org/jboss/ws/metadata/wsdl/WSDLDefinitions.java 2007-03-06 23:07:01 UTC (rev 2538) +++ trunk/jbossws-core/src/java/org/jboss/ws/metadata/wsdl/WSDLDefinitions.java 2007-03-07 08:08:09 UTC (rev 2539) @@ -68,11 +68,11 @@ /** Types element information item */ private WSDLTypes types; /** Zero or more interface element information items */ - private Map<NCName, WSDLInterface> interfaces = new LinkedHashMap<NCName, WSDLInterface>(); + private Map<QName, WSDLInterface> interfaces = new LinkedHashMap<QName, WSDLInterface>(); /** Zero or more binding element information items */ - private Map<NCName, WSDLBinding> bindings = new LinkedHashMap<NCName, WSDLBinding>(); + private Map<QName, WSDLBinding> bindings = new LinkedHashMap<QName, WSDLBinding>(); /** Zero or more service element information items */ - private Map<NCName, WSDLService> services = new LinkedHashMap<NCName, WSDLService>(); + private Map<QName, WSDLService> services = new LinkedHashMap<QName, WSDLService>(); // Zero or more namespace definitions // [TODO] What is this doing here? @@ -221,9 +221,9 @@ this.types.setWSDLDefintiions(this); } - public WSDLInterface getInterface(NCName ncName) + public WSDLInterface getInterface(QName name) { - return interfaces.get(ncName); + return interfaces.get(name); } public WSDLInterface[] getInterfaces() @@ -245,9 +245,9 @@ return arr; } - public WSDLBinding getBinding(NCName ncName) + public WSDLBinding getBinding(QName name) { - return bindings.get(ncName); + return bindings.get(name); } public WSDLBinding getBindingByInterfaceName(QName qname) @@ -283,10 +283,15 @@ services.put(service.getName(), service); } - public WSDLService getService(NCName name) + public WSDLService getService(QName name) { return services.get(name); } + + public WSDLService getService(String localName) + { + return services.get(new QName(targetNamespace, localName)); + } /** Unregister the given namespaceURI/prefix combination */ public void unRegisterNamespaceURI(String namespaceURI, String prefix) Modified: trunk/jbossws-core/src/java/org/jboss/ws/metadata/wsdl/WSDLEndpoint.java =================================================================== --- trunk/jbossws-core/src/java/org/jboss/ws/metadata/wsdl/WSDLEndpoint.java 2007-03-06 23:07:01 UTC (rev 2538) +++ trunk/jbossws-core/src/java/org/jboss/ws/metadata/wsdl/WSDLEndpoint.java 2007-03-07 08:08:09 UTC (rev 2539) @@ -33,6 +33,7 @@ * Endpoint components are local to a given Service component; they cannot be referred to by QName. * * @author Thomas.Diesler(a)jboss.org + * @author <a href=&quot;jason.greene(a)jboss.com&quot;&gt;Jason T. Greene</a> * @since 10-Oct-2004 */ public class WSDLEndpoint extends Extendable @@ -43,26 +44,20 @@ private static final Logger log = Logger.getLogger(WSDLEndpoint.class); // The parent service - private WSDLService wsdlService; + private final WSDLService wsdlService; - /** The REQUIRED name attribute information item together with the targetNamespace attribute information item - * of the definitions element information item forms the QName of the endpoint. */ - private NCName name; + private final QName name; - /** Derived QName identifier. - */ - private QName qname; - /** The REQUIRED binding attribute information item refers, by QName, to a Binding component */ private QName binding; /** The OPTIONAL address attribute information item specifies the address of the endpoint. */ private String address; - public WSDLEndpoint(WSDLService wsdlService) + public WSDLEndpoint(WSDLService wsdlService, QName name) { - log.trace("new WSDLEndpoint"); this.wsdlService = wsdlService; + this.name = name; } public WSDLService getWsdlService() @@ -82,18 +77,18 @@ if (wsdlService.getInterfaceName() != null) { QName qname = wsdlService.getInterfaceName(); - wsdlInterface = wsdlDefinitions.getInterface(new NCName(qname)); + wsdlInterface = wsdlDefinitions.getInterface(qname); } else { - WSDLBinding wsdlBinding = wsdlDefinitions.getBinding(new NCName(binding)); + WSDLBinding wsdlBinding = wsdlDefinitions.getBinding(binding); if (wsdlBinding == null) throw new WSException("Cannot obtain the binding: " + binding); if (wsdlBinding.getInterfaceName() != null) { QName qname = wsdlBinding.getInterfaceName(); - wsdlInterface = wsdlDefinitions.getInterface(new NCName(qname)); + wsdlInterface = wsdlDefinitions.getInterface(qname); } } @@ -103,46 +98,12 @@ return wsdlInterface; } - /** Get the WSDLInterafceOperation for the given opName - * - * @param opName the operation name - * @return A WSDLOperation or null - */ - public WSDLInterfaceOperation getInterfaceOperation(NCName opName) - { - WSDLInterface wsdlInterface = getInterface(); - WSDLInterfaceOperation wsdlInterfaceOperation = wsdlInterface.getWSDLInterfaceOperation(opName); - return wsdlInterfaceOperation; - } - public NCName getName() + public QName getName() { return name; } - - public void setName(NCName name) - { - log.trace("setName: " + name); - this.name = name; - } - - public QName getQName() - { - if (qname == null) - { - String tnsURI = wsdlService.getWsdlDefinitions().getTargetNamespace(); - qname = new QName(tnsURI, name.toString()); - } - return qname; - } - - public void setQName(QName qname) - { - log.trace("setQName: " + qname); - this.qname = qname; - } - public QName getBinding() { return binding; Modified: trunk/jbossws-core/src/java/org/jboss/ws/metadata/wsdl/WSDLInterface.java =================================================================== --- trunk/jbossws-core/src/java/org/jboss/ws/metadata/wsdl/WSDLInterface.java 2007-03-06 23:07:01 UTC (rev 2538) +++ trunk/jbossws-core/src/java/org/jboss/ws/metadata/wsdl/WSDLInterface.java 2007-03-07 08:08:09 UTC (rev 2539) @@ -38,6 +38,7 @@ * and an interface is a set of operations. Thus, an interface defines the design of the application. * * @author Thomas.Diesler(a)jboss.org + * @author <a href=&quot;jason.greene(a)jboss.com&quot;&gt;Jason T. Greene</a> * @since 10-Oct-2004 */ public class WSDLInterface extends Extendable @@ -50,14 +51,7 @@ // The parent WSDL definitions element. private WSDLDefinitions wsdlDefinitions; - /** The REQUIRED name attribute information item together with the targetNamespace attribute information item - * of the [parent] definitions element information item forms the QName of the interface. - */ - private NCName name; - - /** Derived QName identifier. - */ - private QName qname; + private QName name; /** The OPTIONAL extends attribute information item lists the interfaces that this interface derives from. */ @@ -69,60 +63,27 @@ private String styleDefault; /** Zero or more operation element information items */ - private Map operations = new LinkedHashMap(); + private Map<QName, WSDLInterfaceOperation> operations = new LinkedHashMap<QName, WSDLInterfaceOperation>(); /** Zero or more fault element information items */ - private Map faults = new LinkedHashMap(); + private Map<QName, WSDLInterfaceFault> faults = new LinkedHashMap<QName, WSDLInterfaceFault>(); /** Construct a WSDL interface for a given WSDL definition */ - public WSDLInterface(WSDLDefinitions wsdlDefinitions) + public WSDLInterface(WSDLDefinitions wsdlDefinitions, QName name) { - log.trace("new WSDLInterface"); this.wsdlDefinitions = wsdlDefinitions; + this.name = name; } - - /** Get a WSDLOperation for a given name - * - * @param name The name of the operation - * @return A WSDLOperation or null - */ - public WSDLInterfaceOperation getWSDLInterfaceOperation(NCName name) - { - return (WSDLInterfaceOperation)operations.get(name); - } - + public WSDLDefinitions getWsdlDefinitions() { return wsdlDefinitions; } - public NCName getName() + public QName getName() { return name; } - - public void setName(NCName name) - { - log.trace("setName: " + name); - this.name = name; - } - - public QName getQName() - { - if (qname == null) - { - String tnsURI = wsdlDefinitions.getTargetNamespace(); - qname = new QName(tnsURI, name.toString()); - } - return qname; - } - - public void setQName(QName qname) - { - log.trace("setQName: " + qname); - this.qname = qname; - } - public QName[] getExtendList() { return extendList; @@ -158,11 +119,17 @@ return arr; } - public WSDLInterfaceOperation getOperation(NCName opName) + public WSDLInterfaceOperation getOperation(QName name) { - WSDLInterfaceOperation operation = (WSDLInterfaceOperation)operations.get(opName); + WSDLInterfaceOperation operation = operations.get(name); return operation; } + + public WSDLInterfaceOperation getOperation(String localName) + { + WSDLInterfaceOperation operation = operations.get(new QName(name.getNamespaceURI(), localName)); + return operation; + } public void addOperation(WSDLInterfaceOperation operation) { @@ -176,19 +143,19 @@ return arr; } - public WSDLInterfaceFault getFault(NCName fName) + public WSDLInterfaceFault getFault(QName name) { - WSDLInterfaceFault fault = (WSDLInterfaceFault)faults.get(fName); + WSDLInterfaceFault fault = faults.get(name); return fault; } + public WSDLInterfaceFault getFault(String localName) + { + WSDLInterfaceFault fault = faults.get(new QName(name.getNamespaceURI(), localName)); + return fault; + } public void addFault(WSDLInterfaceFault fault) { faults.put(fault.getName(), fault); } - - public boolean containsInterfaceOperation(NCName name) - { - return operations.containsKey(name); - } } Modified: trunk/jbossws-core/src/java/org/jboss/ws/metadata/wsdl/WSDLInterfaceFault.java =================================================================== --- trunk/jbossws-core/src/java/org/jboss/ws/metadata/wsdl/WSDLInterfaceFault.java 2007-03-06 23:07:01 UTC (rev 2538) +++ trunk/jbossws-core/src/java/org/jboss/ws/metadata/wsdl/WSDLInterfaceFault.java 2007-03-07 08:08:09 UTC (rev 2539) @@ -46,33 +46,35 @@ /** The REQUIRED name attribute information item identifies a given fault element information item inside a given * interface element information item. */ - private NCName name; - /** The OPTIONAL element attribute information item refers, by QName, to an element declaration component. + private QName name; + /** The OPTIONAL element attribute information item refers, by QName, to a schema element declaration component. */ private QName element; protected WSDLDocumentation documentationElement = null; - public WSDLInterfaceFault(WSDLInterface wsdlInterface) + public WSDLInterfaceFault(WSDLInterface wsdlInterface, QName name) { this.wsdlInterface = wsdlInterface; + this.name = name; } + + public WSDLInterfaceFault(WSDLInterface wsdlInterface, String localName) + { + this.wsdlInterface = wsdlInterface; + name = new QName(wsdlInterface.getName().getNamespaceURI(), localName); + } public WSDLInterface getWsdlInterface() { return wsdlInterface; } - public NCName getName() + public QName getName() { return name; } - public void setName(NCName name) - { - this.name = name; - } - public QName getElement() { return element; Modified: trunk/jbossws-core/src/java/org/jboss/ws/metadata/wsdl/WSDLInterfaceMessageReference.java =================================================================== --- trunk/jbossws-core/src/java/org/jboss/ws/metadata/wsdl/WSDLInterfaceMessageReference.java 2007-03-06 23:07:01 UTC (rev 2538) +++ trunk/jbossws-core/src/java/org/jboss/ws/metadata/wsdl/WSDLInterfaceMessageReference.java 2007-03-07 08:08:09 UTC (rev 2539) @@ -55,7 +55,7 @@ * of this message in the message exchange pattern of the given operation * element information item. */ - private NCName messageLabel; + private String messageLabel; /** * The OPTIONAL element attribute information item is the element declaration @@ -91,14 +91,13 @@ return wsdlOperation; } - public NCName getMessageLabel() + public String getMessageLabel() { return messageLabel; } - public void setMessageLabel(NCName messageLabel) + public void setMessageLabel(String messageLabel) { - log.trace("setMessageLabel: " + messageLabel); this.messageLabel = messageLabel; } Modified: trunk/jbossws-core/src/java/org/jboss/ws/metadata/wsdl/WSDLInterfaceOperation.java =================================================================== --- trunk/jbossws-core/src/java/org/jboss/ws/metadata/wsdl/WSDLInterfaceOperation.java 2007-03-06 23:07:01 UTC (rev 2538) +++ trunk/jbossws-core/src/java/org/jboss/ws/metadata/wsdl/WSDLInterfaceOperation.java 2007-03-07 08:08:09 UTC (rev 2539) @@ -42,6 +42,7 @@ * pattern used by the operation (see {message exchange pattern} property). * * @author Thomas.Diesler(a)jboss.org + * @author <a href="mailto:jason.greene@jboss.com>Jason T. Greene</a> * @since 10-Oct-2004 */ public class WSDLInterfaceOperation extends Extendable implements Comparable @@ -51,10 +52,7 @@ // The parent interface private WSDLInterface wsdlInterface; - /** The REQUIRED name attribute information item identifies a given operation element information item inside a - * given interface element information item. - */ - private NCName name; + private final QName name; /** The OPTIONAL pattern attribute information item identifies the message exchange pattern a given operation uses. */ @@ -81,32 +79,28 @@ /** Zero or more signature items */ private LinkedHashMap<String, WSDLRPCSignatureItem> rpcSignatureItems = new LinkedHashMap<String, WSDLRPCSignatureItem>(); - public WSDLInterfaceOperation(WSDLInterface wsdlInterface) + public WSDLInterfaceOperation(WSDLInterface wsdlInterface, QName name) { + this.name = name; this.wsdlInterface = wsdlInterface; } + + public WSDLInterfaceOperation(WSDLInterface wsdlInterface, String localName) + { + this.wsdlInterface = wsdlInterface; + name = new QName(wsdlInterface.getName().getNamespaceURI(), localName); + } public WSDLInterface getWsdlInterface() { return wsdlInterface; } - public NCName getName() + public QName getName() { return name; } - public void setName(NCName name) - { - this.name = name; - } - - public QName getQName() - { - String nsURI = wsdlInterface.getQName().getNamespaceURI(); - return new QName(nsURI, name.toString()); - } - public String getPattern() { return pattern; @@ -258,11 +252,11 @@ public WSDLBindingOperation getBindingOperation() { WSDLInterface wsdlInterface = getWsdlInterface(); - WSDLBinding binding = wsdlInterface.getWsdlDefinitions().getBindingByInterfaceName(wsdlInterface.getQName()); + WSDLBinding binding = wsdlInterface.getWsdlDefinitions().getBindingByInterfaceName(wsdlInterface.getName()); if (binding == null) return null; - WSDLBindingOperation bindingOperation = binding.getOperationByRef(getQName()); + WSDLBindingOperation bindingOperation = binding.getOperationByRef(getName()); if (bindingOperation == null) return null; @@ -275,8 +269,8 @@ if (o instanceof WSDLInterfaceOperation) { WSDLInterfaceOperation w = (WSDLInterfaceOperation)o; - String oname = w.getName().toString(); - String myname = name.toString(); + String oname = w.getName().getLocalPart(); + String myname = name.getLocalPart(); c = myname.compareTo(oname); } return c; Modified: trunk/jbossws-core/src/java/org/jboss/ws/metadata/wsdl/WSDLInterfaceOperationInfault.java =================================================================== --- trunk/jbossws-core/src/java/org/jboss/ws/metadata/wsdl/WSDLInterfaceOperationInfault.java 2007-03-06 23:07:01 UTC (rev 2538) +++ trunk/jbossws-core/src/java/org/jboss/ws/metadata/wsdl/WSDLInterfaceOperationInfault.java 2007-03-07 08:08:09 UTC (rev 2539) @@ -49,7 +49,7 @@ * pattern} property of the Interface Operation component it is contained within. The value of this * property MUST match the name of a placeholder message defined by the message exchange pattern. */ - private NCName messageLabel; + private String messageLabel; public WSDLInterfaceOperationInfault(WSDLInterfaceOperation wsdlInterfaceOperation) { @@ -71,12 +71,12 @@ this.ref = ref; } - public NCName getMessageLabel() + public String getMessageLabel() { return messageLabel; } - public void setMessageLabel(NCName messageLabel) + public void setMessageLabel(String messageLabel) { this.messageLabel = messageLabel; } Modified: trunk/jbossws-core/src/java/org/jboss/ws/metadata/wsdl/WSDLInterfaceOperationOutfault.java =================================================================== --- trunk/jbossws-core/src/java/org/jboss/ws/metadata/wsdl/WSDLInterfaceOperationOutfault.java 2007-03-06 23:07:01 UTC (rev 2538) +++ trunk/jbossws-core/src/java/org/jboss/ws/metadata/wsdl/WSDLInterfaceOperationOutfault.java 2007-03-07 08:08:09 UTC (rev 2539) @@ -49,7 +49,7 @@ * pattern} property of the Interface Operation component it is contained within. The value of this * property MUST match the name of a placeholder message defined by the message exchange pattern. */ - private NCName messageLabel; + private String messageLabel; public WSDLInterfaceOperationOutfault(WSDLInterfaceOperation wsdlInterfaceOperation) { @@ -71,12 +71,12 @@ this.ref = ref; } - public NCName getMessageLabel() + public String getMessageLabel() { return messageLabel; } - public void setMessageLabel(NCName messageLabel) + public void setMessageLabel(String messageLabel) { this.messageLabel = messageLabel; } Modified: trunk/jbossws-core/src/java/org/jboss/ws/metadata/wsdl/WSDLService.java =================================================================== --- trunk/jbossws-core/src/java/org/jboss/ws/metadata/wsdl/WSDLService.java 2007-03-06 23:07:01 UTC (rev 2538) +++ trunk/jbossws-core/src/java/org/jboss/ws/metadata/wsdl/WSDLService.java 2007-03-07 08:08:09 UTC (rev 2539) @@ -36,6 +36,7 @@ * which the service is provided. * * @author Thomas.Diesler(a)jboss.org + * @author <a href=&quot;jason.greene(a)jboss.com&quot;&gt;Jason T. Greene</a> * @since 10-Oct-2004 */ public class WSDLService extends Extendable @@ -46,15 +47,9 @@ private static final Logger log = Logger.getLogger(WSDLService.class); // The parent WSDL definitions element. - private WSDLDefinitions wsdlDefinitions; + private final WSDLDefinitions wsdlDefinitions; - /** The REQUIRED name attribute information item together with the targetNamespace attribute information item - * of the definitions element information item forms the QName of the service.*/ - private NCName name; - - /** Derived QName identifier. - */ - private QName qname; + private final QName name; /** The interface attribute information item identifies the interface that the service is an instance of. */ private QName interfaceName; @@ -62,10 +57,10 @@ /** One or more endpoint element information items */ private ArrayList<WSDLEndpoint> endpoints = new ArrayList<WSDLEndpoint>(); - public WSDLService(WSDLDefinitions wsdlDefinitions) + public WSDLService(WSDLDefinitions wsdlDefinitions, QName name) { - log.trace("new WSDLService"); this.wsdlDefinitions = wsdlDefinitions; + this.name = name; } public WSDLDefinitions getWsdlDefinitions() @@ -73,34 +68,11 @@ return wsdlDefinitions; } - public NCName getName() + public QName getName() { return name; } - - public void setName(NCName name) - { - log.trace("setName: " + name); - this.name = name; - } - - public QName getQName() - { - if (qname == null) - { - String tnsURI = wsdlDefinitions.getTargetNamespace(); - qname = new QName(tnsURI, name.toString()); - } - return qname; - } - - public void setQName(QName qname) - { - log.trace("setQName: " + qname); - this.qname = qname; - } - public QName getInterfaceName() { return interfaceName; @@ -131,7 +103,7 @@ while (it.hasNext()) { WSDLEndpoint wsdlEndpoint = (WSDLEndpoint)it.next(); - if (portName.equals(wsdlEndpoint.getQName())) + if (portName.equals(wsdlEndpoint.getName())) return wsdlEndpoint; } return null; Modified: trunk/jbossws-core/src/java/org/jboss/ws/tools/JavaToXSD.java =================================================================== --- trunk/jbossws-core/src/java/org/jboss/ws/tools/JavaToXSD.java 2007-03-06 23:07:01 UTC (rev 2538) +++ trunk/jbossws-core/src/java/org/jboss/ws/tools/JavaToXSD.java 2007-03-07 08:08:09 UTC (rev 2539) @@ -23,6 +23,15 @@ // $Id$ +import java.io.IOException; +import java.io.InputStream; +import java.net.URL; +import java.util.HashMap; +import java.util.Iterator; +import java.util.Map; + +import javax.xml.namespace.QName; + import org.apache.xerces.impl.xs.SchemaGrammar; import org.apache.xerces.impl.xs.XMLSchemaLoader; import org.apache.xerces.impl.xs.XSModelImpl; @@ -47,14 +56,6 @@ import org.w3c.dom.ls.LSInput; import org.xml.sax.InputSource; -import javax.xml.namespace.QName; -import java.io.IOException; -import java.io.InputStream; -import java.net.URL; -import java.util.HashMap; -import java.util.Iterator; -import java.util.Map; - /** * <P> * Handles the conversion of Java classes to XML Schema Modified: trunk/jbossws-core/src/java/org/jboss/ws/tools/WSDLToJava.java =================================================================== --- trunk/jbossws-core/src/java/org/jboss/ws/tools/WSDLToJava.java 2007-03-06 23:07:01 UTC (rev 2538) +++ trunk/jbossws-core/src/java/org/jboss/ws/tools/WSDLToJava.java 2007-03-07 08:08:09 UTC (rev 2539) @@ -45,7 +45,6 @@ import org.jboss.ws.WSException; import org.jboss.ws.core.jaxrpc.LiteralTypeMapping; import org.jboss.ws.core.utils.JavaUtils; -import org.jboss.ws.metadata.wsdl.NCName; import org.jboss.ws.metadata.wsdl.WSDLDefinitions; import org.jboss.ws.metadata.wsdl.WSDLException; import org.jboss.ws.metadata.wsdl.WSDLInterface; @@ -269,7 +268,7 @@ private void appendMethods(WSDLInterface intf, StringBuilder buf) throws IOException { buf.append(newline); - String itfname = intf.getName().toString(); + String itfname = intf.getName().getLocalPart(); WSDLInterfaceOperation[] ops = intf.getOperations(); if (ops == null || ops.length == 0) throw new IllegalArgumentException("Interface " + itfname + " doesn't have operations"); @@ -299,7 +298,7 @@ returnType = "void"; buf.append(" public " + returnType + " "); - buf.append(ToolsUtils.firstLetterLowerCase(op.getName().toString())); + buf.append(ToolsUtils.firstLetterLowerCase(op.getName().getLocalPart())); buf.append("(").append(paramBuffer); buf.append(") throws "); @@ -308,10 +307,10 @@ for (int k = 0; k < outfaults.length; k++) { WSDLInterfaceOperationOutfault fault = outfaults[k]; - QName faultqname = fault.getRef(); + QName faultName = fault.getRef(); //Get the main fault from the wsdlInterface - WSDLInterfaceFault intfFault = fault.getWsdlInterfaceOperation().getWsdlInterface().getFault(new NCName(faultqname.getLocalPart())); + WSDLInterfaceFault intfFault = fault.getWsdlInterfaceOperation().getWsdlInterface().getFault(faultName); JBossXSModel xsmodel = WSDLUtils.getSchemaModel(wsdl.getWsdlTypes()); QName faultXMLName = intfFault.getElement(); QName faultXMLType = intfFault.getXmlType(); @@ -414,7 +413,7 @@ if (inputs > 1) throw new WSException("[JAX-RPC - 2.3.1.2] Can not unwrap parameters for operation with mutliple inputs. inputs=" + inputs); - String operationName = in.getWsdlOperation().getName().toString(); + String operationName = in.getWsdlOperation().getName().getLocalPart(); String elementName = in.getElement().getLocalPart(); if (elementName.equals(operationName) == false) @@ -598,10 +597,10 @@ public String getServiceEndpointInterfaceName(WSDLInterface wsdlInterface) { - String seiName = utils.chopPortType(wsdlInterface.getName().toString()); + String seiName = utils.chopPortType(wsdlInterface.getName().getLocalPart()); //Check if the portType name conflicts with a service name - if (wsdl.getService(new NCName(seiName)) != null) + if (wsdl.getService(seiName) != null) seiName += "_PortType"; return seiName; Modified: trunk/jbossws-core/src/java/org/jboss/ws/tools/client/ServiceCreator.java =================================================================== --- trunk/jbossws-core/src/java/org/jboss/ws/tools/client/ServiceCreator.java 2007-03-06 23:07:01 UTC (rev 2538) +++ trunk/jbossws-core/src/java/org/jboss/ws/tools/client/ServiceCreator.java 2007-03-07 08:08:09 UTC (rev 2539) @@ -28,7 +28,6 @@ import javax.xml.namespace.QName; import org.jboss.ws.WSException; -import org.jboss.ws.metadata.wsdl.NCName; import org.jboss.ws.metadata.wsdl.WSDLBinding; import org.jboss.ws.metadata.wsdl.WSDLDefinitions; import org.jboss.ws.metadata.wsdl.WSDLEndpoint; @@ -196,11 +195,11 @@ private String getReturnType(WSDLBinding wbind) { - String portType = wbind.getInterface().getName().toString(); + String portType = wbind.getInterface().getName().getLocalPart(); portType = utils.chopPortType(portType); //Check if it conflicts with a service name - if(wsdl.getService(new NCName(portType) ) != null) + if(wsdl.getService(portType) != null) portType += "_PortType"; return packageName + "." + portType ; } @@ -209,12 +208,12 @@ private void generateServiceFile(WSDLService wsdlService) throws IOException { - String serviceName = wsdlService.getName().toString(); + String serviceName = wsdlService.getName().getLocalPart(); if (serviceName.endsWith("Service") == false) serviceName = serviceName + "Service"; //Check if the serviceName conflicts with a portType or interface name - if(wsdl.getInterface(new NCName(serviceName)) != null ) + if(wsdl.getInterface(new QName(wsdl.getTargetNamespace(), serviceName)) != null ) serviceName = new StringBuilder(serviceName).insert(serviceName.lastIndexOf("Service"), '_').toString(); StringBuilder buf = new StringBuilder(); @@ -244,10 +243,10 @@ { StringBuilder buf = new StringBuilder(" public "); QName bindName = endpt.getBinding(); - WSDLBinding wbind = wsdl.getBinding(new NCName(bindName.getLocalPart())); + WSDLBinding wbind = wsdl.getBinding(bindName); buf.append(getReturnType(wbind)).append(" get"); - buf.append(endpt.getName().toString()).append("()").append(" throws ServiceException;").append(newLine(1)); + buf.append(endpt.getName().getLocalPart()).append("()").append(" throws ServiceException;").append(newLine(1)); return buf.toString(); } Modified: trunk/jbossws-core/src/java/org/jboss/ws/tools/helpers/MappingFileGeneratorHelper.java =================================================================== --- trunk/jbossws-core/src/java/org/jboss/ws/tools/helpers/MappingFileGeneratorHelper.java 2007-03-06 23:07:01 UTC (rev 2538) +++ trunk/jbossws-core/src/java/org/jboss/ws/tools/helpers/MappingFileGeneratorHelper.java 2007-03-07 08:08:09 UTC (rev 2539) @@ -58,7 +58,6 @@ 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.NCName; import org.jboss.ws.metadata.wsdl.WSDLBinding; import org.jboss.ws.metadata.wsdl.WSDLDefinitions; import org.jboss.ws.metadata.wsdl.WSDLEndpoint; @@ -135,10 +134,10 @@ public ServiceInterfaceMapping constructServiceInterfaceMapping(JavaWsdlMapping jwm, WSDLService ser) { - serviceName = ser.getName().toString(); + serviceName = ser.getName().getLocalPart(); String javaServiceName = serviceName; //Check if the serviceName conflicts with a portType or interface name - if (wsdlDefinitions.getInterface(new NCName(serviceName)) != null) + if (wsdlDefinitions.getInterface(new QName(wsdlDefinitions.getTargetNamespace(), serviceName)) != null) javaServiceName += "_Service"; if (this.serviceName == null || serviceName.length() == 0) @@ -157,7 +156,7 @@ for (int j = 0; j < lenendpoints; j++) { WSDLEndpoint endpt = endpoints[j]; - String portname = endpt.getName().toString(); + String portname = endpt.getName().getLocalPart(); //port mapping PortMapping pm = new PortMapping(sim); pm.setPortName(portname); @@ -169,7 +168,7 @@ public void constructServiceEndpointInterfaceMapping(JavaWsdlMapping jwm, WSDLService ser) { - serviceName = ser.getName().toString(); + serviceName = ser.getName().getLocalPart(); if (this.serviceName == null || serviceName.length() == 0) throw new IllegalArgumentException("MappingFileGenerator:Service Name is null"); @@ -183,13 +182,13 @@ { WSDLEndpoint endpt = endpoints[j]; QName binding = endpt.getBinding(); - WSDLBinding wsdlbind = wsdlDefinitions.getBinding(new NCName(binding.getLocalPart())); - String bindName = wsdlbind.getName().toString(); - String portTypeName = wsdlbind.getInterfaceName().getLocalPart(); - WSDLInterface wsdlintf = wsdlDefinitions.getInterface(new NCName(portTypeName)); - String portName = wsdlintf.getName().toString(); + WSDLBinding wsdlbind = wsdlDefinitions.getBinding(binding); + String bindName = wsdlbind.getName().getLocalPart(); + QName portTypeName = wsdlbind.getInterfaceName(); + WSDLInterface wsdlintf = wsdlDefinitions.getInterface(portTypeName); + String portName = wsdlintf.getName().getLocalPart(); String javaPortName = utils.chopPortType(portName); - if (wsdlDefinitions.getService(new NCName(javaPortName)) != null) + if (wsdlDefinitions.getService(javaPortName) != null) javaPortName += "_PortType"; ServiceEndpointInterfaceMapping seim = new ServiceEndpointInterfaceMapping(jwm); @@ -211,7 +210,7 @@ for (int j = 0; j < len; j++) { WSDLInterfaceOperation wiop = wioparr[j]; - String opname = wiop.getName().toString(); + String opname = wiop.getName().getLocalPart(); ServiceEndpointMethodMapping semm = new ServiceEndpointMethodMapping(seim); semm.setJavaMethodName(ToolsUtils.firstLetterLowerCase(opname)); semm.setWsdlOperation(opname); @@ -434,7 +433,7 @@ registeredExceptions.add(exceptionType); ExceptionMapping exceptionMapping = new ExceptionMapping(jwm); exceptionMapping.setExceptionType(exceptionType); - exceptionMapping.setWsdlMessage(new QName(wsdlDefinitions.getTargetNamespace(), fault.getName().toString())); + exceptionMapping.setWsdlMessage(fault.getName()); jwm.addExceptionMappings(exceptionMapping); } } Modified: trunk/jbossws-core/src/java/org/jboss/ws/tools/helpers/ToolsHelper.java =================================================================== --- trunk/jbossws-core/src/java/org/jboss/ws/tools/helpers/ToolsHelper.java 2007-03-06 23:07:01 UTC (rev 2538) +++ trunk/jbossws-core/src/java/org/jboss/ws/tools/helpers/ToolsHelper.java 2007-03-07 08:08:09 UTC (rev 2539) @@ -52,7 +52,6 @@ import org.jboss.ws.metadata.umdm.ServiceMetaData; import org.jboss.ws.metadata.umdm.UnifiedMetaData; import org.jboss.ws.metadata.umdm.WrappedParameter; -import org.jboss.ws.metadata.wsdl.NCName; import org.jboss.ws.metadata.wsdl.WSDLDefinitions; import org.jboss.ws.metadata.wsdl.WSDLService; import org.jboss.ws.tools.Configuration; @@ -151,8 +150,8 @@ wscr.setSeiName(j2wc.endpointName); wscr.setServiceName(j2wc.serviceName); //Get the portname from wsdl definitions - WSDLService wsdlService = wsdl.getService(new NCName(j2wc.serviceName)); - String portName = wsdlService.getEndpoints()[0].getName().toString(); + WSDLService wsdlService = wsdl.getService(j2wc.serviceName); + String portName = wsdlService.getEndpoints()[0].getName().getLocalPart(); //wscr.setPortName(j2wc.serviceName + "Port"); wscr.setPortName(portName); //wscr.setMappingFileName(j2wc.mappingFileName); @@ -311,7 +310,7 @@ { MappingFileGenerator mgf = new MappingFileGenerator(wsdl, new LiteralTypeMapping()); mgf.setPackageName(getPackageName(wsdl, glc)); - mgf.setServiceName(wsdl.getServices()[0].getName().toString()); + mgf.setServiceName(wsdl.getServices()[0].getName().getLocalPart()); mgf.setParameterStyle(w2jc.parameterStyle); JavaWsdlMapping jwm = mgf.generate(); @@ -328,7 +327,7 @@ String serviceName = "MyServiceName"; if (wsdl.getServices().length == 1) - serviceName = wsdl.getServices()[0].getName().toString(); + serviceName = wsdl.getServices()[0].getName().getLocalPart(); if (wsdl.getInterfaces().length == 1) { @@ -340,8 +339,8 @@ wscr.setTargetNamespace(wsdl.getTargetNamespace()); wscr.setSeiName(seiName); wscr.setServiceName(serviceName); - WSDLService wsdlService = wsdl.getService(new NCName(serviceName)); - String portName = wsdlService.getEndpoints()[0].getName().toString(); + WSDLService wsdlService = wsdl.getService(serviceName); + String portName = wsdlService.getEndpoints()[0].getName().getLocalPart(); wscr.setPortName(portName); String wsdlShortName = wsdlURL.getPath(); Modified: trunk/jbossws-core/src/java/org/jboss/ws/tools/jaxws/command/wsconsume.java =================================================================== --- trunk/jbossws-core/src/java/org/jboss/ws/tools/jaxws/command/wsconsume.java 2007-03-06 23:07:01 UTC (rev 2538) +++ trunk/jbossws-core/src/java/org/jboss/ws/tools/jaxws/command/wsconsume.java 2007-03-07 08:08:09 UTC (rev 2539) @@ -27,7 +27,6 @@ import java.io.File; import java.io.PrintStream; import java.net.MalformedURLException; -import java.net.URI; import java.net.URL; import java.util.ArrayList; import java.util.List; Modified: trunk/jbossws-core/src/java/org/jboss/ws/tools/wsdl/WSDL11DefinitionFactory.java =================================================================== --- trunk/jbossws-core/src/java/org/jboss/ws/tools/wsdl/WSDL11DefinitionFactory.java 2007-03-06 23:07:01 UTC (rev 2538) +++ trunk/jbossws-core/src/java/org/jboss/ws/tools/wsdl/WSDL11DefinitionFactory.java 2007-03-07 08:08:09 UTC (rev 2539) @@ -34,8 +34,6 @@ import org.jboss.ws.core.utils.JBossWSEntityResolver; import org.xml.sax.EntityResolver; -import com.ibm.wsdl.xml.WSDLReaderImpl; - /** * A factory that creates a WSDL-1.1 <code>Definition</code> from an URL. * Modified: trunk/jbossws-core/src/java/org/jboss/ws/tools/wsdl/WSDL11Reader.java =================================================================== --- trunk/jbossws-core/src/java/org/jboss/ws/tools/wsdl/WSDL11Reader.java 2007-03-06 23:07:01 UTC (rev 2538) +++ trunk/jbossws-core/src/java/org/jboss/ws/tools/wsdl/WSDL11Reader.java 2007-03-07 08:08:09 UTC (rev 2539) @@ -72,7 +72,6 @@ import org.jboss.ws.core.utils.DOMUtils; import org.jboss.ws.core.utils.DOMWriter; import org.jboss.ws.core.utils.ResourceURL; -import org.jboss.ws.metadata.wsdl.NCName; import org.jboss.ws.metadata.wsdl.WSDLBinding; import org.jboss.ws.metadata.wsdl.WSDLBindingMessageReference; import org.jboss.ws.metadata.wsdl.WSDLBindingOperation; @@ -192,7 +191,7 @@ Binding srcBinding = (Binding)it.next(); QName srcQName = srcBinding.getQName(); - WSDLBinding destBinding = destWsdl.getBinding(new NCName(srcQName)); + WSDLBinding destBinding = destWsdl.getBinding(srcQName); if (destBinding == null) { processBinding(srcWsdl, srcBinding); @@ -478,12 +477,9 @@ log.trace("processPortType: " + srcPortType.getQName()); QName qname = srcPortType.getQName(); - NCName ncName = new NCName(qname); - if (destWsdl.getInterface(ncName) == null) + if (destWsdl.getInterface(qname) == null) { - WSDLInterface destInterface = new WSDLInterface(destWsdl); - destInterface.setName(ncName); - destInterface.setQName(qname); + WSDLInterface destInterface = new WSDLInterface(destWsdl, qname); // eventing extensions QName eventSourceProp = (QName)srcPortType.getExtensionAttribute(Constants.WSDL_ATTRIBUTE_WSE_EVENTSOURCE); @@ -505,8 +501,7 @@ { Operation srcOperation = (Operation)itOperations.next(); - WSDLInterfaceOperation destOperation = new WSDLInterfaceOperation(destInterface); - destOperation.setName(new NCName(srcOperation.getName())); + WSDLInterfaceOperation destOperation = new WSDLInterfaceOperation(destInterface, srcOperation.getName()); destOperation.setStyle(getOperationStyle(srcWsdl, srcPortType, srcOperation)); if(srcOperation.getStyle()!=null @@ -584,7 +579,7 @@ { // This is really a place holder, but also the actual value used in // WSDL 2.0 RPC bindings - rpcInput.setElement(destOperation.getQName()); + rpcInput.setElement(destOperation.getName()); rpcInput.setMessageName(srcMessage.getQName()); destOperation.addInput(rpcInput); } @@ -684,7 +679,7 @@ { // This is really a place holder, but also the actual value used in // WSDL 2.0 RPC bindings - QName name = destOperation.getQName(); + QName name = destOperation.getName(); rpcOutput.setElement(new QName(name.getNamespaceURI(), name.getLocalPart() + "Response")); rpcOutput.setMessageName(srcMessage.getQName()); destOperation.addOutput(rpcOutput); @@ -708,10 +703,7 @@ String faultName = srcFault.getName(); log.trace("processOperationFault: " + faultName); - WSDLInterfaceFault destFault = new WSDLInterfaceFault(destInterface); - NCName ncName = new NCName(faultName); - destFault.setName(ncName); - + WSDLInterfaceFault destFault = new WSDLInterfaceFault(destInterface, faultName); Message message = srcFault.getMessage(); QName messageName = message.getQName(); @@ -732,10 +724,6 @@ log.warn("Unsupported fault message part in message: " + messageName); } - WSDLInterfaceFault prevFault = destInterface.getFault(ncName); - if (prevFault != null && prevFault.getName().equals(ncName) == false) - throw new WSDLException(WSDLException.INVALID_WSDL, "Fault name must be unique: " + faultName); - // Add the fault to the interface destInterface.addFault(destFault); @@ -853,12 +841,11 @@ QName srcBindingQName = srcBinding.getQName(); log.trace("processBinding: " + srcBindingQName); - NCName ncName = new NCName(srcBindingQName); - if (destWsdl.getBinding(ncName) == null) + if (destWsdl.getBinding(srcBindingQName) == null) { PortType srcPortType = srcBinding.getPortType(); if (srcPortType == null) - throw new WSDLException(WSDLException.INVALID_WSDL, "Cannot find port type for binding: " + ncName); + throw new WSDLException(WSDLException.INVALID_WSDL, "Cannot find port type for binding: " + srcBindingQName); // Get binding type String bindingType = null; @@ -888,9 +875,7 @@ if (Constants.NS_SOAP11.equals(bindingType) == false && Constants.NS_SOAP12.equals(bindingType) == false) return false; - WSDLBinding destBinding = new WSDLBinding(destWsdl); - destBinding.setQName(srcBindingQName); - destBinding.setName(ncName); + WSDLBinding destBinding = new WSDLBinding(destWsdl, srcBindingQName); destBinding.setInterfaceName(srcPortType.getQName()); destBinding.setType(bindingType); destWsdl.addBinding(destBinding); @@ -1036,7 +1021,7 @@ log.trace("processBindingOperation: " + srcBindingName); WSDLInterface destInterface = destBinding.getInterface(); - String namespaceURI = destInterface.getQName().getNamespaceURI(); + String namespaceURI = destInterface.getName().getNamespaceURI(); WSDLBindingOperation destBindingOperation = new WSDLBindingOperation(destBinding); QName refQName = new QName(namespaceURI, srcBindingName); @@ -1044,7 +1029,7 @@ destBinding.addOperation(destBindingOperation); String opName = srcBindingName; - WSDLInterfaceOperation destIntfOperation = destInterface.getOperation(new NCName(opName)); + WSDLInterfaceOperation destIntfOperation = destInterface.getOperation(opName); // Process soap:operation@soapAction, soap:operation@style List<ExtensibilityElement> extList = srcBindingOperation.getExtensibilityElements(); @@ -1110,7 +1095,7 @@ public void removeRPCPart(String partName) { - WSDLInterfaceOperationInput operationInput = destIntfOperation.getInput(destIntfOperation.getQName()); + WSDLInterfaceOperationInput operationInput = destIntfOperation.getInput(destIntfOperation.getName()); operationInput.removeChildPart(partName); } }; @@ -1143,7 +1128,7 @@ public void removeRPCPart(String partName) { - QName name = destIntfOperation.getQName(); + QName name = destIntfOperation.getName(); WSDLInterfaceOperationOutput operationOutput = destIntfOperation.getOutput(new QName(name.getNamespaceURI(), name.getLocalPart() + "Response")); operationOutput.removeChildPart(partName); } @@ -1304,9 +1289,7 @@ { Service srcService = (Service)it.next(); QName qname = srcService.getQName(); - WSDLService destService = new WSDLService(destWsdl); - destService.setName(new NCName(qname)); - destService.setQName(qname); + WSDLService destService = new WSDLService(destWsdl, qname); destWsdl.addService(destService); processPorts(srcWsdl, destService, srcService); } @@ -1347,11 +1330,9 @@ log.trace("processPort: " + srcPort.getName()); Binding srcBinding = srcPort.getBinding(); - - WSDLEndpoint destEndpoint = new WSDLEndpoint(destService); - destEndpoint.setName(new NCName(srcPort.getName())); + QName endpointName = new QName(srcWsdl.getTargetNamespace(), srcPort.getName()); + WSDLEndpoint destEndpoint = new WSDLEndpoint(destService, endpointName); destEndpoint.setBinding(srcBinding.getQName()); - destEndpoint.setQName(new QName(srcWsdl.getTargetNamespace(), srcPort.getName())); destEndpoint.setAddress(getSOAPAddress(srcPort)); if (processBinding(srcWsdl, srcBinding)) Modified: trunk/jbossws-core/src/java/org/jboss/ws/tools/wsdl/WSDL11Writer.java =================================================================== --- trunk/jbossws-core/src/java/org/jboss/ws/tools/wsdl/WSDL11Writer.java 2007-03-06 23:07:01 UTC (rev 2538) +++ trunk/jbossws-core/src/java/org/jboss/ws/tools/wsdl/WSDL11Writer.java 2007-03-07 08:08:09 UTC (rev 2539) @@ -35,7 +35,6 @@ import org.jboss.ws.WSException; import org.jboss.ws.core.utils.DOMUtils; import org.jboss.ws.core.utils.DOMWriter; -import org.jboss.ws.metadata.wsdl.NCName; import org.jboss.ws.metadata.wsdl.WSDLBinding; import org.jboss.ws.metadata.wsdl.WSDLBindingMessageReference; import org.jboss.ws.metadata.wsdl.WSDLBindingOperation; @@ -173,7 +172,7 @@ for (int i = 0; i < len; i++) { WSDLInterface intf = interfaces[i]; - if (! namespace.equals(intf.getQName().getNamespaceURI())) + if (! namespace.equals(intf.getName().getNamespaceURI())) continue; WSDLInterfaceOperation[] operations = intf.getSortedOperations(); @@ -188,12 +187,12 @@ private void appendMessage(StringBuilder buffer, WSDLInterfaceOperation operation) { - String opname = operation.getName().toString(); + String opname = operation.getName().getLocalPart(); //Determine the style of the wsdl if (Constants.URI_STYLE_RPC.equals(operation.getStyle()) == false) wsdlStyle = Constants.DOCUMENT_LITERAL; //Not RPC/Literal - String interfaceName = operation.getWsdlInterface().getName().toString(); + String interfaceName = operation.getWsdlInterface().getName().getLocalPart(); buffer.append("<message name='" + interfaceName + "_" + opname + "' >"); for (WSDLInterfaceOperationInput input : operation.getInputs()) appendMessageParts(buffer, input); @@ -222,7 +221,7 @@ if (writtenFaultMessages.contains(exceptionName)) continue; - WSDLInterfaceFault interfaceFault = operation.getWsdlInterface().getFault(new NCName(exceptionName)); + WSDLInterfaceFault interfaceFault = operation.getWsdlInterface().getFault(fault.getRef()); QName xmlName = interfaceFault.getElement(); buffer.append("<message name='" + exceptionName + "' >"); @@ -285,8 +284,8 @@ { WSDLInterfaceOperation operation = reference.getWsdlOperation(); WSDLInterface wsdlInterface = operation.getWsdlInterface(); - WSDLBinding binding = wsdlInterface.getWsdlDefinitions().getBindingByInterfaceName(wsdlInterface.getQName()); - WSDLBindingOperation bindingOperation = binding.getOperationByRef(operation.getQName()); + WSDLBinding binding = wsdlInterface.getWsdlDefinitions().getBindingByInterfaceName(wsdlInterface.getName()); + WSDLBindingOperation bindingOperation = binding.getOperationByRef(operation.getName()); WSDLBindingMessageReference[] bindingReferences; if (reference instanceof WSDLInterfaceOperationInput) @@ -309,10 +308,10 @@ for (int i = 0; i < intfs.length; i++) { WSDLInterface intf = intfs[i]; - if (!namespace.equals(intf.getQName().getNamespaceURI())) + if (!namespace.equals(intf.getName().getNamespaceURI())) continue; - buffer.append("<portType name='" + intf.getName() + "'>"); + buffer.append("<portType name='" + intf.getName().getLocalPart() + "'>"); appendPortOperations(buffer, intf); buffer.append("</portType>"); } @@ -336,12 +335,12 @@ protected void appendPortOperations(StringBuilder buffer, WSDLInterface intf) { - String prefix = wsdl.getPrefix(intf.getQName().getNamespaceURI()); + String prefix = wsdl.getPrefix(intf.getName().getNamespaceURI()); WSDLInterfaceOperation[] operations = intf.getSortedOperations(); for (int i = 0; i < operations.length; i++) { WSDLInterfaceOperation operation = operations[i]; - buffer.append("<operation name='" + operation.getName().toString() + "'"); + buffer.append("<operation name='" + operation.getName().getLocalPart() + "'"); // JBWS-1501 wsimport RI fails when processing parameterOrder on one-way operations if (! Constants.WSDL20_PATTERN_IN_ONLY.equals(operation.getPattern())) @@ -353,8 +352,8 @@ } buffer.append(">"); - String opname = operation.getName().toString(); - String interfaceName = operation.getWsdlInterface().getName().toString(); + String opname = operation.getName().getLocalPart(); + String interfaceName = operation.getWsdlInterface().getName().getLocalPart(); String msgEl = prefix + ":" + interfaceName + "_" + opname; buffer.append("<input message='" + msgEl + "'>").append("</input>"); @@ -384,9 +383,9 @@ for (int i = 0; i < bindings.length; i++) { WSDLBinding binding = bindings[i]; - if (!namespace.equals(binding.getQName().getNamespaceURI())) + if (!namespace.equals(binding.getName().getNamespaceURI())) continue; - buffer.append("<binding name='" + binding.getName() + "' type='" + getQNameRef(binding.getInterfaceName()) + "'>"); + buffer.append("<binding name='" + binding.getName().getLocalPart() + "' type='" + getQNameRef(binding.getInterfaceName()) + "'>"); //TODO:Need to derive the WSDLStyle from the Style attribute of InterfaceOperation if (wsdlStyle == null) throw new IllegalArgumentException("WSDL Style is null (should be rpc or document"); @@ -407,14 +406,14 @@ for (int i = 0; i < operations.length; i++) { WSDLBindingOperation operation = operations[i]; - String interfaceName = operation.getWsdlBinding().getInterfaceName().getLocalPart(); + QName interfaceName = operation.getWsdlBinding().getInterfaceName(); - WSDLInterface wsdlInterface = wsdl.getInterface(new NCName(interfaceName)); + WSDLInterface wsdlInterface = wsdl.getInterface(interfaceName); if (wsdlInterface == null) throw new WSException("WSDL Interface should not be null"); - WSDLInterfaceOperation interfaceOperation = wsdlInterface.getOperation(new NCName(operation.getRef().getLocalPart())); + WSDLInterfaceOperation interfaceOperation = wsdlInterface.getOperation(operation.getRef()); - buffer.append("<operation name='" + interfaceOperation.getName() + "'>"); + buffer.append("<operation name='" + interfaceOperation.getName().getLocalPart() + "'>"); String soapAction = (operation.getSOAPAction() != null ? operation.getSOAPAction() : ""); buffer.append("<" + soapPrefix + ":operation soapAction=\"" + soapAction + "\"/>"); @@ -453,7 +452,7 @@ private void appendSOAPBinding(StringBuilder buffer, WSDLInterface wsdlInterface, WSDLBindingOperation operation, WSDLBindingMessageReference[] inputs) { String tns = wsdl.getTargetNamespace(); - WSDLInterfaceOperation interfaceOperation = wsdlInterface.getOperation(new NCName(operation.getRef().getLocalPart())); + WSDLInterfaceOperation interfaceOperation = wsdlInterface.getOperation(operation.getRef()); WSDLInterfaceMessageReference reference = (inputs instanceof WSDLBindingOperationInput[]) ? interfaceOperation.getInputs()[0] : interfaceOperation.getOutputs()[0]; @@ -479,7 +478,7 @@ { if (header.isIncludeInSignature()) { - String messageName = wsdlInterface.getName() + "_" + operation.getRef().getLocalPart(); + String messageName = wsdlInterface.getName().getLocalPart() + "_" + operation.getRef().getLocalPart(); if (reference instanceof WSDLInterfaceOperationOutput) messageName += "Response"; soapHeader.append("<").append(soapPrefix).append(":header use='literal' message='tns:").append(messageName); @@ -504,7 +503,7 @@ private String getBindingOperationPattern(WSDLBindingOperation operation) { WSDLBinding binding = operation.getWsdlBinding(); - String pattern = binding.getInterface().getOperation(new NCName(operation.getRef().getLocalPart())).getPattern(); + String pattern = binding.getInterface().getOperation(operation.getRef()).getPattern(); return pattern; } @@ -517,9 +516,9 @@ { WSDLService service = services[i]; - if (!namespace.equals(service.getQName().getNamespaceURI())) + if (!namespace.equals(service.getName().getNamespaceURI())) continue; - buffer.append("<service name='" + service.getName() + "'>"); + buffer.append("<service name='" + service.getName().getLocalPart() + "'>"); WSDLEndpoint[] endpoints = service.getEndpoints(); int lenend = endpoints.length; for (int j = 0; j < lenend; j++) @@ -534,7 +533,7 @@ protected void appendServicePort(StringBuilder buffer, WSDLEndpoint endpoint) { - String name = endpoint.getName().toString(); + String name = endpoint.getName().getLocalPart(); QName endpointBinding = endpoint.getBinding(); String prefix = endpointBinding.getPrefix(); prefix = wsdl.getPrefix(endpointBinding.getNamespaceURI()); Modified: trunk/jbossws-core/src/java/org/jboss/ws/tools/wsdl/WSDLGenerator.java =================================================================== --- trunk/jbossws-core/src/java/org/jboss/ws/tools/wsdl/WSDLGenerator.java 2007-03-06 23:07:01 UTC (rev 2538) +++ trunk/jbossws-core/src/java/org/jboss/ws/tools/wsdl/WSDLGenerator.java 2007-03-07 08:08:09 UTC (rev 2539) @@ -33,7 +33,6 @@ import org.jboss.ws.metadata.umdm.OperationMetaData; import org.jboss.ws.metadata.umdm.ParameterMetaData; import org.jboss.ws.metadata.umdm.ServiceMetaData; -import org.jboss.ws.metadata.wsdl.NCName; import org.jboss.ws.metadata.wsdl.WSDLBinding; import org.jboss.ws.metadata.wsdl.WSDLBindingFault; import org.jboss.ws.metadata.wsdl.WSDLBindingOperation; @@ -69,17 +68,13 @@ protected void processEndpoint(WSDLService service, EndpointMetaData endpoint) { - WSDLEndpoint wsdlEndpoint = new WSDLEndpoint(service); - wsdlEndpoint.setQName(endpoint.getPortName()); - wsdlEndpoint.setName(new NCName(endpoint.getPortName().getLocalPart())); + WSDLEndpoint wsdlEndpoint = new WSDLEndpoint(service, endpoint.getPortName()); String address = endpoint.getEndpointAddress(); wsdlEndpoint.setAddress(address == null ? "REPLACE_WITH_ACTUAL_URL" : address); service.addEndpoint(wsdlEndpoint); - WSDLInterface wsdlInterface = new WSDLInterface(wsdl); QName interfaceQName = endpoint.getPortTypeName(); - wsdlInterface.setQName(interfaceQName); - wsdlInterface.setName(new NCName(interfaceQName)); + WSDLInterface wsdlInterface = new WSDLInterface(wsdl, interfaceQName); wsdl.addInterface(wsdlInterface); // Add imports @@ -92,10 +87,8 @@ wsdl.registerNamespaceURI(interfaceQName.getNamespaceURI(), null); } - WSDLBinding wsdlBinding = new WSDLBinding(wsdl); QName bindingQName = new QName(interfaceQName.getNamespaceURI(), interfaceQName.getLocalPart() + "Binding"); - wsdlBinding.setQName(bindingQName); - wsdlBinding.setName(new NCName(bindingQName.getLocalPart())); + WSDLBinding wsdlBinding = new WSDLBinding(wsdl, bindingQName); wsdlBinding.setInterfaceName(interfaceQName); wsdl.addBinding(wsdlBinding); wsdlEndpoint.setBinding(bindingQName); @@ -108,10 +101,9 @@ protected void processOperation(WSDLInterface wsdlInterface, WSDLBinding wsdlBinding, OperationMetaData operation) { - WSDLInterfaceOperation interfaceOperation = new WSDLInterfaceOperation(wsdlInterface); + WSDLInterfaceOperation interfaceOperation = new WSDLInterfaceOperation(wsdlInterface, operation.getQName()); WSDLBindingOperation bindingOperation = new WSDLBindingOperation(wsdlBinding); - interfaceOperation.setName(new NCName(operation.getQName().getLocalPart())); interfaceOperation.setPattern(operation.isOneWay() ? Constants.WSDL20_PATTERN_IN_ONLY : Constants.WSDL20_PATTERN_IN_OUT); @@ -125,18 +117,17 @@ for (FaultMetaData fault : operation.getFaults()) { - WSDLInterfaceFault interfaceFault = new WSDLInterfaceFault(wsdlInterface); + QName faultName = new QName(operation.getQName().getNamespaceURI(), fault.getXmlName().getLocalPart()); + WSDLInterfaceFault interfaceFault = new WSDLInterfaceFault(wsdlInterface, faultName); interfaceFault.setElement(fault.getXmlName()); - interfaceFault.setName(new NCName(fault.getXmlName().getLocalPart())); wsdlInterface.addFault(interfaceFault); - - QName interfaceFaultRef = new QName(operation.getQName().getNamespaceURI(), fault.getXmlName().getLocalPart()); + WSDLInterfaceOperationOutfault outfault = new WSDLInterfaceOperationOutfault(interfaceOperation); - outfault.setRef(interfaceFaultRef); + outfault.setRef(faultName); interfaceOperation.addOutfault(outfault); WSDLBindingFault bindingFault = new WSDLBindingFault(wsdlBinding); - bindingFault.setRef(interfaceFaultRef); + bindingFault.setRef(faultName); wsdlBinding.addFault(bindingFault); } @@ -310,9 +301,7 @@ protected void processService(ServiceMetaData service) { - WSDLService wsdlService = new WSDLService(wsdl); - wsdlService.setQName(service.getServiceName()); - wsdlService.setName(new NCName(service.getServiceName().getLocalPart())); + WSDLService wsdlService = new WSDLService(wsdl, service.getServiceName()); wsdl.addService(wsdlService); EndpointMetaData endpoint = null; Modified: trunk/jbossws-core/src/java/org/jboss/ws/tools/wsdl/WSDLWriter.java =================================================================== --- trunk/jbossws-core/src/java/org/jboss/ws/tools/wsdl/WSDLWriter.java 2007-03-06 23:07:01 UTC (rev 2538) +++ trunk/jbossws-core/src/java/org/jboss/ws/tools/wsdl/WSDLWriter.java 2007-03-07 08:08:09 UTC (rev 2539) @@ -120,7 +120,7 @@ if (services != null && services.length == 1) { WSDLService ser = services[0]; - buffer.append(" name='" + ser.getName() + "'"); + buffer.append(" name='" + ser.getName().getLocalPart() + "'"); } buffer.append(" targetNamespace='" + namespace + "'"); buffer.append(" xmlns='" + wsdl.getWsdlNamespace() + "'"); Modified: trunk/jbossws-tests/src/java/org/jboss/test/ws/benchmark/jaxrpc/BenchmarkDocEJBTestCase.java =================================================================== --- trunk/jbossws-tests/src/java/org/jboss/test/ws/benchmark/jaxrpc/BenchmarkDocEJBTestCase.java 2007-03-06 23:07:01 UTC (rev 2538) +++ trunk/jbossws-tests/src/java/org/jboss/test/ws/benchmark/jaxrpc/BenchmarkDocEJBTestCase.java 2007-03-07 08:08:09 UTC (rev 2539) @@ -25,11 +25,8 @@ import org.jboss.test.ws.JBossWSTest; import org.jboss.test.ws.JBossWSTestSetup; -import javax.naming.Context; import javax.naming.InitialContext; -import javax.naming.NamingException; import javax.xml.rpc.Service; -import java.util.Properties; /** * Test Benchmark EJB Service Modified: trunk/jbossws-tests/src/java/org/jboss/test/ws/benchmark/jaxrpc/BenchmarkDocJSETestCase.java =================================================================== --- trunk/jbossws-tests/src/java/org/jboss/test/ws/benchmark/jaxrpc/BenchmarkDocJSETestCase.java 2007-03-06 23:07:01 UTC (rev 2538) +++ trunk/jbossws-tests/src/java/org/jboss/test/ws/benchmark/jaxrpc/BenchmarkDocJSETestCase.java 2007-03-07 08:08:09 UTC (rev 2539) @@ -25,13 +25,10 @@ import org.jboss.test.ws.JBossWSTest; import org.jboss.test.ws.JBossWSTestSetup; -import javax.naming.Context; import javax.naming.InitialContext; import javax.naming.NamingException; import javax.xml.rpc.Service; -import javax.xml.rpc.Stub; import javax.xml.rpc.ServiceException; -import java.util.Properties; /** * Test Benchmark EJB Service Modified: trunk/jbossws-tests/src/java/org/jboss/test/ws/benchmark/jaxrpc/BenchmarkRpcEJBTestCase.java =================================================================== --- trunk/jbossws-tests/src/java/org/jboss/test/ws/benchmark/jaxrpc/BenchmarkRpcEJBTestCase.java 2007-03-06 23:07:01 UTC (rev 2538) +++ trunk/jbossws-tests/src/java/org/jboss/test/ws/benchmark/jaxrpc/BenchmarkRpcEJBTestCase.java 2007-03-07 08:08:09 UTC (rev 2539) @@ -25,11 +25,8 @@ import org.jboss.test.ws.JBossWSTest; import org.jboss.test.ws.JBossWSTestSetup; -import javax.naming.Context; import javax.naming.InitialContext; -import javax.naming.NamingException; import javax.xml.rpc.Service; -import java.util.Properties; /** * Test Benchmark EJB Service Modified: trunk/jbossws-tests/src/java/org/jboss/test/ws/benchmark/jaxrpc/BenchmarkRpcJSETestCase.java =================================================================== --- trunk/jbossws-tests/src/java/org/jboss/test/ws/benchmark/jaxrpc/BenchmarkRpcJSETestCase.java 2007-03-06 23:07:01 UTC (rev 2538) +++ trunk/jbossws-tests/src/java/org/jboss/test/ws/benchmark/jaxrpc/BenchmarkRpcJSETestCase.java 2007-03-07 08:08:09 UTC (rev 2539) @@ -25,11 +25,8 @@ import org.jboss.test.ws.JBossWSTest; import org.jboss.test.ws.JBossWSTestSetup; -import javax.naming.Context; import javax.naming.InitialContext; -import javax.naming.NamingException; import javax.xml.rpc.Service; -import java.util.Properties; /** * Test Benchmark EJB Service Modified: trunk/jbossws-tests/src/java/org/jboss/test/ws/common/wsdl11/WSDL11TestCase.java =================================================================== --- trunk/jbossws-tests/src/java/org/jboss/test/ws/common/wsdl11/WSDL11TestCase.java 2007-03-06 23:07:01 UTC (rev 2538) +++ trunk/jbossws-tests/src/java/org/jboss/test/ws/common/wsdl11/WSDL11TestCase.java 2007-03-07 08:08:09 UTC (rev 2539) @@ -28,7 +28,6 @@ import org.jboss.test.ws.JBossWSTest; import org.jboss.ws.Constants; import org.jboss.ws.extensions.eventing.EventingConstants; -import org.jboss.ws.metadata.wsdl.NCName; import org.jboss.ws.metadata.wsdl.WSDLDefinitions; import org.jboss.ws.metadata.wsdl.WSDLEndpoint; import org.jboss.ws.metadata.wsdl.WSDLInterface; @@ -58,14 +57,14 @@ WSDLDefinitionsFactory factory = WSDLDefinitionsFactory.newInstance(); WSDLDefinitions wsdlDefinitions = factory.parse(wsdlFile.toURL()); - WSDLInterface wsdlInterface = wsdlDefinitions.getInterface(new NCName("JaxRpcTestService")); + WSDLInterface wsdlInterface = wsdlDefinitions.getInterface(new QName(wsdlDefinitions.getTargetNamespace(), "JaxRpcTestService")); // check if the schema has been extracted WSDLTypes wsdlTypes = wsdlDefinitions.getWsdlTypes(); assertNotNull(WSDLUtils.getSchemaModel(wsdlTypes)); // check the echoString operation - WSDLInterfaceOperation wsdlOperation = wsdlInterface.getOperation(new NCName("echoString")); + WSDLInterfaceOperation wsdlOperation = wsdlInterface.getOperation("echoString"); assertEquals(Constants.URI_STYLE_DOCUMENT, wsdlOperation.getStyle()); WSDLInterfaceOperationInput wsdlInput = wsdlOperation.getInput(new QName(TARGET_NAMESPACE, "echoString")); @@ -74,7 +73,7 @@ assertEquals(new QName(TARGET_NAMESPACE, "echoStringResponse"), wsdlOutput.getXMLType()); // check the echoSimpleUserType operation - wsdlOperation = wsdlInterface.getOperation(new NCName("echoSimpleUserType")); + wsdlOperation = wsdlInterface.getOperation("echoSimpleUserType"); assertEquals(Constants.URI_STYLE_DOCUMENT, wsdlOperation.getStyle()); wsdlInput = wsdlOperation.getInput(new QName(TARGET_NAMESPACE, "echoSimpleUserType")); @@ -114,14 +113,14 @@ WSDLDefinitionsFactory factory = WSDLDefinitionsFactory.newInstance(); WSDLDefinitions wsdlDefinitions = factory.parse(wsdlFile.toURL()); - WSDLInterface wsdlInterface = wsdlDefinitions.getInterface(new NCName("JaxRpcTestService")); + WSDLInterface wsdlInterface = wsdlDefinitions.getInterface(new QName(wsdlDefinitions.getTargetNamespace(), "JaxRpcTestService")); // check if the schema has been extracted WSDLTypes wsdlTypes = wsdlDefinitions.getWsdlTypes(); assertNotNull(WSDLUtils.getSchemaModel(wsdlTypes)); // check the echoString operation - WSDLInterfaceOperation wsdlOperation = wsdlInterface.getOperation(new NCName("echoString")); + WSDLInterfaceOperation wsdlOperation = wsdlInterface.getOperation("echoString"); assertEquals(Constants.URI_STYLE_RPC, wsdlOperation.getStyle()); WSDLInterfaceOperationInput wsdlInput = wsdlOperation.getInputs()[0]; @@ -134,7 +133,7 @@ assertEquals(Constants.TYPE_LITERAL_STRING, childPart.getType()); // check the echoSimpleUserType operation - wsdlOperation = wsdlInterface.getOperation(new NCName("echoSimpleUserType")); + wsdlOperation = wsdlInterface.getOperation("echoSimpleUserType"); assertEquals(Constants.URI_STYLE_RPC, wsdlOperation.getStyle()); wsdlInput = wsdlOperation.getInputs()[0]; @@ -156,22 +155,22 @@ WSDLDefinitionsFactory factory = WSDLDefinitionsFactory.newInstance(); WSDLDefinitions wsdlDefinitions = factory.parse(wsdlFile.toURL()); - WSDLService service = wsdlDefinitions.getService(new NCName("EventingService")); + WSDLService service = wsdlDefinitions.getService(new QName("http://schemas.xmlsoap.org/ws/2004/08/eventing";, "EventingService")); assertNotNull(service); WSDLEndpoint[] endpoints = service.getEndpoints(); for (int i = 0; i < endpoints.length; i++) { WSDLEndpoint ep = endpoints[i]; - assertEquals(EventingConstants.NS_EVENTING, ep.getQName().getNamespaceURI()); + assertEquals(EventingConstants.NS_EVENTING, ep.getName().getNamespaceURI()); } - WSDLInterface warningsInterface = wsdlDefinitions.getInterface(new NCName("Warnings")); + WSDLInterface warningsInterface = wsdlDefinitions.getInterface(new QName(wsdlDefinitions.getTargetNamespace(), "Warnings")); assertNotNull("Event source port type not parsed", warningsInterface); - assertEquals(warningsInterface.getQName().getNamespaceURI(), "http://www.example.org/oceanwatch"); + assertEquals(warningsInterface.getName().getNamespaceURI(), "http://www.example.org/oceanwatch"); - WSDLInterface eventSourceInterface = wsdlDefinitions.getInterface(new NCName("EventSource")); + WSDLInterface eventSourceInterface = wsdlDefinitions.getInterface(new QName("http://schemas.xmlsoap.org/ws/2004/08/eventing";, "EventSource")); assertNotNull(eventSourceInterface); - assertEquals(eventSourceInterface.getQName().getNamespaceURI(), EventingConstants.NS_EVENTING); + assertEquals(eventSourceInterface.getName().getNamespaceURI(), EventingConstants.NS_EVENTING); } public void testSwaMessages() throws Exception Modified: trunk/jbossws-tests/src/java/org/jboss/test/ws/interop/soapwsdl/baserpclit/ServiceImpl.java =================================================================== --- trunk/jbossws-tests/src/java/org/jboss/test/ws/interop/soapwsdl/baserpclit/ServiceImpl.java 2007-03-06 23:07:01 UTC (rev 2538) +++ trunk/jbossws-tests/src/java/org/jboss/test/ws/interop/soapwsdl/baserpclit/ServiceImpl.java 2007-03-07 08:08:09 UTC (rev 2539) @@ -21,14 +21,10 @@ */ package org.jboss.test.ws.interop.soapwsdl.baserpclit; -import org.jboss.test.ws.interop.soapwsdl.basedoclitw.IBaseDataTypesDocLitW; - import javax.jws.WebService; import javax.jws.WebMethod; import javax.jws.WebResult; import javax.jws.WebParam; -import javax.xml.ws.RequestWrapper; -import javax.xml.ws.ResponseWrapper; import javax.xml.datatype.XMLGregorianCalendar; import javax.xml.datatype.Duration; import javax.xml.namespace.QName; Modified: trunk/jbossws-tests/src/java/org/jboss/test/ws/interop/wsa/AddressingTestCase.java =================================================================== --- trunk/jbossws-tests/src/java/org/jboss/test/ws/interop/wsa/AddressingTestCase.java 2007-03-06 23:07:01 UTC (rev 2538) +++ trunk/jbossws-tests/src/java/org/jboss/test/ws/interop/wsa/AddressingTestCase.java 2007-03-07 08:08:09 UTC (rev 2539) @@ -24,8 +24,6 @@ import junit.framework.Test; import org.jboss.test.ws.JBossWSTest; import org.jboss.test.ws.JBossWSTestSetup; -import org.jboss.test.ws.interop.ClientScenario; -import org.jboss.test.ws.interop.InteropConfigFactory; import org.jboss.ws.core.StubExt; import org.jboss.ws.core.utils.DOMUtils; import org.jboss.ws.extensions.addressing.AddressingClientUtil; Modified: trunk/jbossws-tests/src/java/org/jboss/test/ws/jaxrpc/jbws1378/JBWS1378TestCase.java =================================================================== --- trunk/jbossws-tests/src/java/org/jboss/test/ws/jaxrpc/jbws1378/JBWS1378TestCase.java 2007-03-06 23:07:01 UTC (rev 2538) +++ trunk/jbossws-tests/src/java/org/jboss/test/ws/jaxrpc/jbws1378/JBWS1378TestCase.java 2007-03-07 08:08:09 UTC (rev 2539) @@ -60,7 +60,7 @@ ServiceFactoryImpl factory = (ServiceFactoryImpl)ServiceFactory.newInstance(); URL wsdlURL = new File("resources/jaxrpc/jbws1378/WEB-INF/wsdl/ExampleService.wsdl").toURL(); URL mappingURL = new File("resources/jaxrpc/jbws1378/WEB-INF/jaxrpc-mapping.xml").toURL(); - QName serviceName = new QName("http://org.jboss.test.ws/jbws1378", "ExampleService"); + QName serviceName = new QName("http://www.example.com/Example";, "ExampleService"); Service service = factory.createService(wsdlURL, serviceName , mappingURL); port = (ExamplePort)service.getPort(ExamplePort.class); ((Stub)port)._setProperty(Stub.ENDPOINT_ADDRESS_PROPERTY, "http://" + getServerHost() + ":8080/jaxrpc-jbws1378"); Modified: trunk/jbossws-tests/src/java/org/jboss/test/ws/jaxrpc/marshall/MarshallDocLitTestCase.java =================================================================== --- trunk/jbossws-tests/src/java/org/jboss/test/ws/jaxrpc/marshall/MarshallDocLitTestCase.java 2007-03-06 23:07:01 UTC (rev 2538) +++ trunk/jbossws-tests/src/java/org/jboss/test/ws/jaxrpc/marshall/MarshallDocLitTestCase.java 2007-03-07 08:08:09 UTC (rev 2539) @@ -28,8 +28,6 @@ import javax.naming.InitialContext; import javax.xml.namespace.QName; import javax.xml.rpc.Service; -import javax.xml.rpc.Stub; - import junit.framework.Test; import org.jboss.test.ws.JBossWSTestSetup; Modified: trunk/jbossws-tests/src/java/org/jboss/test/ws/jaxrpc/samples/wssecurity/StorePassEncryptTestCase.java =================================================================== --- trunk/jbossws-tests/src/java/org/jboss/test/ws/jaxrpc/samples/wssecurity/StorePassEncryptTestCase.java 2007-03-06 23:07:01 UTC (rev 2538) +++ trunk/jbossws-tests/src/java/org/jboss/test/ws/jaxrpc/samples/wssecurity/StorePassEncryptTestCase.java 2007-03-07 08:08:09 UTC (rev 2539) @@ -23,16 +23,10 @@ import java.io.File; import java.net.URL; -import java.util.HashMap; -import java.util.List; - import javax.naming.InitialContext; import javax.xml.namespace.QName; import javax.xml.rpc.Service; import javax.xml.rpc.Stub; -import javax.xml.rpc.handler.HandlerInfo; -import javax.xml.rpc.handler.HandlerRegistry; - import junit.framework.Test; import org.jboss.test.ws.JBossWSTest; @@ -40,7 +34,6 @@ import org.jboss.ws.core.StubExt; import org.jboss.ws.core.jaxrpc.client.ServiceFactoryImpl; import org.jboss.ws.core.jaxrpc.client.ServiceImpl; -import org.jboss.ws.extensions.security.jaxrpc.WSSecurityHandlerOutbound; /** * This test simulates the usage of a jboss-ws-security keystore and truststore use cases Modified: trunk/jbossws-tests/src/java/org/jboss/test/ws/jaxrpc/wsdlpublish/TestEndpointImpl.java =================================================================== --- trunk/jbossws-tests/src/java/org/jboss/test/ws/jaxrpc/wsdlpublish/TestEndpointImpl.java 2007-03-06 23:07:01 UTC (rev 2538) +++ trunk/jbossws-tests/src/java/org/jboss/test/ws/jaxrpc/wsdlpublish/TestEndpointImpl.java 2007-03-07 08:08:09 UTC (rev 2539) @@ -46,13 +46,13 @@ { URL wsdlURL = new File(wsdlPath).toURL(); WSDLDefinitions wsdl = WSDLDefinitionsFactory.newInstance().parse(wsdlURL); - portType = wsdl.getInterfaces()[0].getQName(); + portType = wsdl.getInterfaces()[0].getName(); } catch (Exception ex) { WSException.rethrow(ex); } - return portType.toString(); + return portType.getLocalPart(); } } Modified: trunk/jbossws-tests/src/java/org/jboss/test/ws/jaxws/complex/JSR181ComplexTestCase.java =================================================================== --- trunk/jbossws-tests/src/java/org/jboss/test/ws/jaxws/complex/JSR181ComplexTestCase.java 2007-03-06 23:07:01 UTC (rev 2538) +++ trunk/jbossws-tests/src/java/org/jboss/test/ws/jaxws/complex/JSR181ComplexTestCase.java 2007-03-07 08:08:09 UTC (rev 2539) @@ -32,7 +32,6 @@ import javax.xml.datatype.DatatypeFactory; import javax.xml.datatype.XMLGregorianCalendar; import javax.xml.namespace.QName; -import javax.xml.ws.Holder; import javax.xml.ws.Service; import junit.framework.Test; Modified: trunk/jbossws-tests/src/java/org/jboss/test/ws/jaxws/holder/HolderTestCase.java =================================================================== --- trunk/jbossws-tests/src/java/org/jboss/test/ws/jaxws/holder/HolderTestCase.java 2007-03-06 23:07:01 UTC (rev 2538) +++ trunk/jbossws-tests/src/java/org/jboss/test/ws/jaxws/holder/HolderTestCase.java 2007-03-07 08:08:09 UTC (rev 2539) @@ -25,12 +25,6 @@ import java.io.File; import java.net.URL; -import java.util.ArrayList; -import java.util.List; - -import javax.xml.datatype.DatatypeConfigurationException; -import javax.xml.datatype.DatatypeFactory; -import javax.xml.datatype.XMLGregorianCalendar; import javax.xml.namespace.QName; import javax.xml.ws.Holder; import javax.xml.ws.Service; Modified: trunk/jbossws-tests/src/java/org/jboss/test/ws/jaxws/samples/exception/ExceptionTestCase.java =================================================================== --- trunk/jbossws-tests/src/java/org/jboss/test/ws/jaxws/samples/exception/ExceptionTestCase.java 2007-03-06 23:07:01 UTC (rev 2538) +++ trunk/jbossws-tests/src/java/org/jboss/test/ws/jaxws/samples/exception/ExceptionTestCase.java 2007-03-07 08:08:09 UTC (rev 2539) @@ -41,7 +41,7 @@ */ public class ExceptionTestCase extends JBossWSTest { - private String targetNS = "http://exception.jaxws.ws.test.jboss.org/"; + private String targetNS = "http://exception.samples.jaxws.ws.test.jboss.org/"; private ExceptionEndpoint proxy; public static Test suite() Modified: trunk/jbossws-tests/src/java/org/jboss/test/ws/jaxws/samples/handlerchain/HandlerChainTestCase.java =================================================================== --- trunk/jbossws-tests/src/java/org/jboss/test/ws/jaxws/samples/handlerchain/HandlerChainTestCase.java 2007-03-06 23:07:01 UTC (rev 2538) +++ trunk/jbossws-tests/src/java/org/jboss/test/ws/jaxws/samples/handlerchain/HandlerChainTestCase.java 2007-03-07 08:08:09 UTC (rev 2539) @@ -43,7 +43,7 @@ */ public class HandlerChainTestCase extends JBossWSTest { - private static final String targetNS = "http://handlerchain.jsr181.jaxws.ws.test.jboss.org/"; + private static final String targetNS = "http://handlerchain.samples.jaxws.ws.test.jboss.org/"; public static Test suite() { Modified: trunk/jbossws-tests/src/java/org/jboss/test/ws/jaxws/samples/retail/RetailSampleTestCase.java =================================================================== --- trunk/jbossws-tests/src/java/org/jboss/test/ws/jaxws/samples/retail/RetailSampleTestCase.java 2007-03-06 23:07:01 UTC (rev 2538) +++ trunk/jbossws-tests/src/java/org/jboss/test/ws/jaxws/samples/retail/RetailSampleTestCase.java 2007-03-07 08:08:09 UTC (rev 2539) @@ -64,7 +64,7 @@ protected void setUp() throws Exception { - QName serviceName = new QName("http://org.jboss.ws/samples/retail", "OrderMgmtService"); + QName serviceName = new QName("http://retail.samples.jaxws.ws.test.jboss.org/";, "OrderMgmtService"); URL wsdlURL = new URL(TARGET_ENDPOINT_ADDRESS+"?wsdl"); javax.xml.ws.Service service = javax.xml.ws.Service.create(wsdlURL, serviceName); Modified: trunk/jbossws-tests/src/java/org/jboss/test/ws/jaxws/samples/webservice/JSR181WebServiceBase.java =================================================================== --- trunk/jbossws-tests/src/java/org/jboss/test/ws/jaxws/samples/webservice/JSR181WebServiceBase.java 2007-03-06 23:07:01 UTC (rev 2538) +++ trunk/jbossws-tests/src/java/org/jboss/test/ws/jaxws/samples/webservice/JSR181WebServiceBase.java 2007-03-07 08:08:09 UTC (rev 2539) @@ -51,7 +51,7 @@ private EndpointInterface03 getPort03(String context) throws MalformedURLException { - QName serviceName = new QName("http://foo", "TestService"); + QName serviceName = new QName("http://www.openuri.org/2004/04/HelloWorld";, "TestService"); URL wsdlURL = new URL("http://" + getServerHost() + ":8080/" + context + "?wsdl"); Service service = Service.create(wsdlURL, serviceName); Modified: trunk/jbossws-tests/src/java/org/jboss/test/ws/jaxws/samples/xop/doclit/XOPHandlerTestCase.java =================================================================== --- trunk/jbossws-tests/src/java/org/jboss/test/ws/jaxws/samples/xop/doclit/XOPHandlerTestCase.java 2007-03-06 23:07:01 UTC (rev 2538) +++ trunk/jbossws-tests/src/java/org/jboss/test/ws/jaxws/samples/xop/doclit/XOPHandlerTestCase.java 2007-03-07 08:08:09 UTC (rev 2539) @@ -61,7 +61,7 @@ protected void setUp() throws Exception { - QName serviceName = new QName("http://org.jboss.ws/xop/doclit", "MTOMService"); + QName serviceName = new QName("http://doclit.xop.samples.jaxws.ws.test.jboss.org/";, "MTOMService"); URL wsdlURL = new URL(TARGET_ENDPOINT_ADDRESS + "?wsdl"); javax.xml.ws.Service service = javax.xml.ws.Service.create(wsdlURL, serviceName); Modified: trunk/jbossws-tests/src/java/org/jboss/test/ws/jaxws/samples/xop/doclit/XOPTestCase.java =================================================================== --- trunk/jbossws-tests/src/java/org/jboss/test/ws/jaxws/samples/xop/doclit/XOPTestCase.java 2007-03-06 23:07:01 UTC (rev 2538) +++ trunk/jbossws-tests/src/java/org/jboss/test/ws/jaxws/samples/xop/doclit/XOPTestCase.java 2007-03-07 08:08:09 UTC (rev 2539) @@ -57,7 +57,7 @@ protected void setUp() throws Exception { - QName serviceName = new QName("http://org.jboss.ws/xop/doclit", "MTOMService"); + QName serviceName = new QName("http://doclit.xop.samples.jaxws.ws.test.jboss.org/";, "MTOMService"); URL wsdlURL = new URL(TARGET_ENDPOINT_ADDRESS + "?wsdl"); Service service = Service.create(wsdlURL, serviceName); Modified: trunk/jbossws-tests/src/java/org/jboss/test/ws/jaxws/wseventing/EventingSupport.java =================================================================== --- trunk/jbossws-tests/src/java/org/jboss/test/ws/jaxws/wseventing/EventingSupport.java 2007-03-06 23:07:01 UTC (rev 2538) +++ trunk/jbossws-tests/src/java/org/jboss/test/ws/jaxws/wseventing/EventingSupport.java 2007-03-07 08:08:09 UTC (rev 2539) @@ -98,7 +98,7 @@ eventSourceURI = new URI(EVENT_SOURCE_NAME); wsdlLocation = new URL("http://" + getServerHost() + ":8080/jaxws-wseventing/subscribe?wsdl"); - Service service = Service.create(wsdlLocation, new QName("","EventingService")); + Service service = Service.create(wsdlLocation, new QName("http://schemas.xmlsoap.org/ws/2004/08/eventing","Ev...); eventSourcePort = (EventSourceEndpoint)service.getPort(EventSourceEndpoint.class); managerPort = (SubscriptionManagerEndpoint)service.getPort(SubscriptionManagerEndpoint.class); Modified: trunk/jbossws-tests/src/java/org/jboss/test/ws/tools/jbws1553/JBWS1553TestCase.java =================================================================== --- trunk/jbossws-tests/src/java/org/jboss/test/ws/tools/jbws1553/JBWS1553TestCase.java 2007-03-06 23:07:01 UTC (rev 2538) +++ trunk/jbossws-tests/src/java/org/jboss/test/ws/tools/jbws1553/JBWS1553TestCase.java 2007-03-07 08:08:09 UTC (rev 2539) @@ -26,7 +26,6 @@ import javax.xml.namespace.QName; -import org.jboss.ws.metadata.wsdl.NCName; import org.jboss.ws.metadata.wsdl.WSDLDefinitions; import org.jboss.ws.metadata.wsdl.WSDLEndpoint; import org.jboss.ws.metadata.wsdl.WSDLInterface; @@ -52,9 +51,9 @@ public void testPortType() { - WSDLService atmService = definitions.getService(new NCName("AtmFrontEndService")); + WSDLService atmService = definitions.getService("AtmFrontEndService"); WSDLEndpoint endpoint = atmService.getEndpoint(new QName("urn:samples:atm", "FrontEndPort")); WSDLInterface _interface = endpoint.getInterface(); - assertEquals(new QName("urn:samples:frontend", "FrontEnd"), _interface.getQName()); + assertEquals(new QName("urn:samples:frontend", "FrontEnd"), _interface.getName()); } } Modified: trunk/jbossws-tests/src/java/org/jboss/test/ws/tools/validation/WSDL11Validator.java =================================================================== --- trunk/jbossws-tests/src/java/org/jboss/test/ws/tools/validation/WSDL11Validator.java 2007-03-06 23:07:01 UTC (rev 2538) +++ trunk/jbossws-tests/src/java/org/jboss/test/ws/tools/validation/WSDL11Validator.java 2007-03-07 08:08:09 UTC (rev 2539) @@ -150,9 +150,9 @@ private boolean validateMessage(WSDLInterfaceOperation op1, WSDLInterfaceOperation op2 ) throws JBossWSToolsException { - String op1name = op1.getName().toString(); + String op1name = op1.getName().getLocalPart(); String intf1name = op1.getWsdlInterface().getName().toString(); - String op2name = op2.getName().toString(); + String op2name = op2.getName().getLocalPart(); String intf2name = op2.getWsdlInterface().getName().toString(); if(op1name.equals(op2name) == false) throw new JBossWSToolsException(op1name + " does not match with " + op2name); Modified: trunk/jbossws-tests/src/java/org/jboss/test/ws/tools/validation/WSDLValidationHelper.java =================================================================== --- trunk/jbossws-tests/src/java/org/jboss/test/ws/tools/validation/WSDLValidationHelper.java 2007-03-06 23:07:01 UTC (rev 2538) +++ trunk/jbossws-tests/src/java/org/jboss/test/ws/tools/validation/WSDLValidationHelper.java 2007-03-07 08:08:09 UTC (rev 2539) @@ -25,7 +25,6 @@ import javax.xml.namespace.QName; -import org.jboss.ws.metadata.wsdl.NCName; import org.jboss.ws.metadata.wsdl.WSDLBinding; import org.jboss.ws.metadata.wsdl.WSDLBindingOperation; import org.jboss.ws.metadata.wsdl.WSDLBindingOperationInput; @@ -105,7 +104,7 @@ { WSDLInterface wi1 = wiarr1[i]; WSDLInterface wi2 = wiarr2[i]; - if(checkNCNameEquality(wi1.getName(),wi2.getName()) == false) + if(checkQNameEquality(wi1.getName(),wi2.getName()) == false) throw new JBossWSToolsException("Interface mismatch"); WSDLInterfaceOperation[] wioparr1 = wi1.getOperations(); WSDLInterfaceOperation[] wioparr2 = wi2.getOperations(); @@ -213,7 +212,7 @@ { WSDLService s1 = services1[i]; WSDLService s2 = services2[i]; - bool = checkNCNameEquality(s1.getName(),s2.getName()); + bool = checkQNameEquality(s1.getName(),s2.getName()); if(bool) { WSDLEndpoint[] we1 = s1.getEndpoints(); @@ -224,34 +223,12 @@ return bool; } - - - //*************************************************************************** - // - // PRIVATE METHODS - // - //*************************************************************************** /** - * Compare two NCName (s) for equality + * Compare two QName (s) for equality * @param name1 * @param name2 * @return */ - private static boolean checkNCNameEquality(NCName name1, NCName name2) - { - if(name1 == null && name2 == null) return true; - String str1 = name1.toString(); - String str2 = name2.toString(); - if(str1.equals(str2) == false) return false; - return true; - } - - /** - * Compare two NQName (s) for equality - * @param name1 - * @param name2 - * @return - */ private static boolean checkQNameEquality(QName name1, QName name2) { String str1 = name1.getLocalPart(); @@ -265,7 +242,7 @@ WSDLInterfaceOperation w2) throws JBossWSToolsException { - boolean bool = checkNCNameEquality(w1.getName(),w2.getName()); + boolean bool = checkQNameEquality(w1.getName(),w2.getName()); if(bool) { //validate the inputs @@ -304,7 +281,7 @@ { bool = checkQNameEquality(inf1[i].getRef(),inf2[i].getRef()); if(bool) - bool = checkNCNameEquality(inf1[i].getMessageLabel(),inf2[i].getMessageLabel()); + bool = checkStringEquality(inf1[i].getMessageLabel(),inf2[i].getMessageLabel()); if(bool == false) return bool; } @@ -321,7 +298,7 @@ { bool = checkQNameEquality(outf1[i].getRef(),outf2[i].getRef()); if(bool) - bool = checkNCNameEquality(outf1[i].getMessageLabel(),outf2[i].getMessageLabel()); + bool = checkStringEquality(outf1[i].getMessageLabel(),outf2[i].getMessageLabel()); if(bool == false) return bool; } } @@ -329,6 +306,14 @@ return bool; } + private static boolean checkStringEquality(String one, String two) + { + if (one == null && two == null) + return true; + + return one != null && one.equals(two); + } + private static boolean validateInterfaceOperationInput(WSDLInterfaceOperationInput i1, WSDLInterfaceOperationInput i2) throws JBossWSToolsException { @@ -388,7 +373,7 @@ { WSDLBindingOperationInput bindin1 = wb1[i]; WSDLBindingOperationInput bindin2 = wb2[i]; - bool = checkNCNameEquality(bindin1.getMessageLabel(),bindin2.getMessageLabel()); + bool = checkStringEquality(bindin1.getMessageLabel(),bindin2.getMessageLabel()); if(!bool) return bool; } @@ -403,7 +388,7 @@ { WSDLBindingOperationOutput bindout1 = wboutarr1[i]; WSDLBindingOperationOutput bindout2 = wboutarr2[i]; - bool = checkNCNameEquality(bindout1.getMessageLabel(),bindout2.getMessageLabel()); + bool = checkStringEquality(bindout1.getMessageLabel(),bindout2.getMessageLabel()); } return bool; } @@ -428,7 +413,7 @@ bool = checkQNameEquality(e1.getBinding(),e2.getBinding()); if(bool == false) throw new JBossWSToolsException("Endpoint binding do not match"); - bool = checkNCNameEquality(e1.getName(),e2.getName()); + bool = checkQNameEquality(e1.getName(),e2.getName()); if(bool == false) throw new JBossWSToolsException("Endpoint Names do not match"); } Modified: trunk/jbossws-tests/src/java/org/jboss/test/ws/tools/validation/WSDLValidator.java =================================================================== --- trunk/jbossws-tests/src/java/org/jboss/test/ws/tools/validation/WSDLValidator.java 2007-03-06 23:07:01 UTC (rev 2538) +++ trunk/jbossws-tests/src/java/org/jboss/test/ws/tools/validation/WSDLValidator.java 2007-03-07 08:08:09 UTC (rev 2539) @@ -175,7 +175,7 @@ Method method = methods[j]; if (op != null && op.getName() != null && - method.getName().equals(op.getName().toString())) + method.getName().equals(op.getName().getLocalPart())) { if (found) {