March 2007 - jbossws-commits - Jboss List Archives

JBossWS SVN: r2539 - in trunk: jbossws-core/src/java/javax/xml/ws and 35 other directories.

by jbossws-commits＠lists.jboss.org

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/in"); 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="jason.greene(a)jboss.com">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="jason.greene(a)jboss.com">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="jason.greene(a)jboss.com">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="jason.greene(a)jboss.com">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","EventingService")); 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) {

19 years, 1 month

1
0
0 / 0

JBossWS SVN: r2538 - in branches/tdiesler/trunk: integration-jboss50/src/java/org/jboss/ws/integration/jboss50 and 5 other directories.

by jbossws-commits＠lists.jboss.org

Author: thomas.diesler(a)jboss.com Date: 2007-03-06 18:07:01 -0500 (Tue, 06 Mar 2007) New Revision: 2538 Added: branches/tdiesler/trunk/jbossws-core/src/java/org/jboss/ws/core/jaxrpc/client/ServiceRefHandlerJAXRPC.java branches/tdiesler/trunk/jbossws-core/src/java/org/jboss/ws/core/jaxws/client/ServiceRefHandlerJAXWS.java Removed: branches/tdiesler/trunk/integration-jboss50/src/java/org/jboss/ws/integration/jboss50/WebServiceRefHandler.java branches/tdiesler/trunk/integration-jboss50/src/java/org/jboss/ws/integration/jboss50/WebServiceRefHandlerMBean.java branches/tdiesler/trunk/jbossws-core/src/java/org/jboss/ws/core/jaxws/UnifiedWebServiceRefHandler.java Modified: branches/tdiesler/trunk/build/build.xml branches/tdiesler/trunk/integration-jboss50/src/java/org/jboss/ws/integration/jboss50/ServiceRefHandler.java branches/tdiesler/trunk/integration-jboss50/src/resources/jbossws.deployer/META-INF/jbossws-deployer-beans.xml branches/tdiesler/trunk/jbossws-core/src/java/org/jboss/ws/core/jaxrpc/client/ServiceObjectFactory.java branches/tdiesler/trunk/jbossws-core/src/java/org/jboss/ws/core/jaxrpc/client/ServiceReferenceable.java branches/tdiesler/trunk/jbossws-core/src/java/org/jboss/ws/metadata/j2ee/serviceref/ServiceRefMetaData.java Log: partial Modified: branches/tdiesler/trunk/build/build.xml =================================================================== --- branches/tdiesler/trunk/build/build.xml 2007-03-06 21:33:39 UTC (rev 2537) +++ branches/tdiesler/trunk/build/build.xml 2007-03-06 23:07:01 UTC (rev 2538) @@ -48,7 +48,7 @@ <ant antfile="${integration.jboss42.dir}/build.xml" target="clean" inheritall="false"/> <ant antfile="${integration.jboss50.dir}/build.xml" target="clean" inheritall="false"/> <ant antfile="${integration.tomcat.dir}/build.xml" target="clean" inheritall="false"/> - <ant antfile="${tests.dir}/build.xml" target="clean" inheritall="false"/> +  </target> <target name="main" description="Executes the default target (most)." depends="most"> Modified: branches/tdiesler/trunk/integration-jboss50/src/java/org/jboss/ws/integration/jboss50/ServiceRefHandler.java =================================================================== --- branches/tdiesler/trunk/integration-jboss50/src/java/org/jboss/ws/integration/jboss50/ServiceRefHandler.java 2007-03-06 21:33:39 UTC (rev 2537) +++ branches/tdiesler/trunk/integration-jboss50/src/java/org/jboss/ws/integration/jboss50/ServiceRefHandler.java 2007-03-06 23:07:01 UTC (rev 2538) @@ -23,25 +23,23 @@ // $Id$ +import java.io.IOException; import java.lang.reflect.AnnotatedElement; -import java.net.URL; import javax.management.MBeanServer; import javax.naming.Context; import javax.naming.NamingException; -import javax.wsdl.Definition; import org.jboss.logging.Logger; import org.jboss.mx.util.MBeanServerLocator; -import org.jboss.util.naming.Util; import org.jboss.virtual.VirtualFile; -import org.jboss.ws.WSException; -import org.jboss.ws.core.jaxrpc.client.ServiceReferenceable; +import org.jboss.ws.core.jaxrpc.client.ServiceRefHandlerJAXRPC; +import org.jboss.ws.core.jaxws.client.ServiceRefHandlerJAXWS; +import org.jboss.ws.core.utils.DOMUtils; +import org.jboss.ws.core.utils.DOMWriter; import org.jboss.ws.metadata.j2ee.serviceref.ServiceRefMetaData; import org.jboss.ws.metadata.j2ee.serviceref.ServiceRefObjectFactory; -import org.jboss.ws.metadata.jaxrpcmapping.JavaWsdlMapping; -import org.jboss.ws.metadata.jaxrpcmapping.JavaWsdlMappingFactory; -import org.jboss.ws.tools.wsdl.WSDL11DefinitionFactory; +import org.w3c.dom.Element; /** * Binds a JAXRPC Service object in the client's ENC for every service-ref element in the @@ -62,74 +60,34 @@ { try { - ServiceRefObjectFactory factory = ServiceRefObjectFactory.newInstance(); - ServiceRefMetaData serviceRef = factory.parse(xmlFragment); - serviceRef.setVfsRoot(new VirtualFileAdaptor(vfsRoot)); - - String serviceRefName = serviceRef.getServiceRefName(); - - JavaWsdlMapping javaWsdlMapping = getJavaWsdlMapping(serviceRef); - serviceRef.setJavaWsdlMapping(javaWsdlMapping); - - Definition wsdlDefinition = getWsdlDefinition(serviceRef); - serviceRef.setWsdlDefinition(wsdlDefinition); - - ServiceReferenceable ref = new ServiceReferenceable(serviceRef); - - // Do not use rebind, the binding should be unique - Util.bind(encCtx, encName, ref); - - log.debug("<service-ref> bound to: java:comp/env/" + serviceRefName); + Element root = DOMUtils.parse(xmlFragment); + if (log.isDebugEnabled()) + log.info(DOMWriter.printNode(root, true)); } - catch (RuntimeException rte) + catch (IOException e) { - throw rte; + log.error("Invalid service-ref: " + xmlFragment); } - catch (Exception ex) + + ServiceRefObjectFactory factory = ServiceRefObjectFactory.newInstance(); + ServiceRefMetaData serviceRef = factory.parse(xmlFragment); + serviceRef.setVfsRoot(new VirtualFileAdaptor(vfsRoot)); + + if (isServiceRefJaxRpc(serviceRef)) { - throw new WSException("Cannot bind webservice to client environment", ex); + ServiceRefHandlerJAXRPC handler = new ServiceRefHandlerJAXRPC(); + handler.setupServiceRef(encCtx, encName, serviceRef); } - } - - private JavaWsdlMapping getJavaWsdlMapping(ServiceRefMetaData serviceRef) - { - JavaWsdlMapping javaWsdlMapping = null; - if (serviceRef.getMappingFile() != null) + else { - String mappingFile = serviceRef.getMappingFile(); - try - { - JavaWsdlMappingFactory mappingFactory = JavaWsdlMappingFactory.newInstance(); - URL mappingURL = serviceRef.getVfsRoot().findChild(mappingFile).toURL(); - javaWsdlMapping = mappingFactory.parse(mappingURL); - } - catch (Exception e) - { - throw new WSException("Cannot unmarshal jaxrpc-mapping-file: " + mappingFile, e); - } + ServiceRefHandlerJAXWS handler = new ServiceRefHandlerJAXWS(); + handler.setupServiceRef(encCtx, encName, anElement, serviceRef); } - return javaWsdlMapping; } - private Definition getWsdlDefinition(ServiceRefMetaData serviceRef) + private boolean isServiceRefJaxRpc(ServiceRefMetaData serviceRef) { - Definition wsdlDefinition = null; - { - URL wsdlLocation = serviceRef.getWsdlLocation(); - if (wsdlLocation != null) - { - try - { - WSDL11DefinitionFactory factory = WSDL11DefinitionFactory.newInstance(); - wsdlDefinition = factory.parse(wsdlLocation); - } - catch (Exception e) - { - throw new WSException("Cannot unmarshall wsdl-file: " + wsdlLocation, e); - } - } - } - return wsdlDefinition; + return false; } public void create() throws Exception Deleted: branches/tdiesler/trunk/integration-jboss50/src/java/org/jboss/ws/integration/jboss50/WebServiceRefHandler.java =================================================================== --- branches/tdiesler/trunk/integration-jboss50/src/java/org/jboss/ws/integration/jboss50/WebServiceRefHandler.java 2007-03-06 21:33:39 UTC (rev 2537) +++ branches/tdiesler/trunk/integration-jboss50/src/java/org/jboss/ws/integration/jboss50/WebServiceRefHandler.java 2007-03-06 23:07:01 UTC (rev 2538) @@ -1,62 +0,0 @@ -/* - * JBoss, Home of Professional Open Source - * Copyright 2005, JBoss Inc., and individual contributors as indicated - * by the @authors tag. See the copyright.txt in the distribution for a - * full listing of individual contributors. - * - * This is free software; you can redistribute it and/or modify it - * under the terms of the GNU Lesser General Public License as - * published by the Free Software Foundation; either version 2.1 of - * the License, or (at your option) any later version. - * - * This software is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * Lesser General Public License for more details. - * - * You should have received a copy of the GNU Lesser General Public - * License along with this software; if not, write to the Free - * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA - * 02110-1301 USA, or see the FSF site: http://www.fsf.org. - */ -package org.jboss.ws.integration.jboss50; - -// $Id$ - -import java.lang.reflect.AnnotatedElement; - -import javax.management.MBeanServer; -import javax.naming.Context; -import javax.naming.NamingException; - -import org.jboss.mx.util.MBeanServerLocator; -import org.jboss.virtual.VirtualFile; -import org.jboss.ws.core.jaxws.UnifiedWebServiceRefHandler; - -/** - * Binds a JAXWS @WebServiceRef object in the client's ENC - * - * @author Thomas.Diesler(a)jboss.org - * @since 17-Jan-2007 - */ -public class WebServiceRefHandler extends UnifiedWebServiceRefHandler implements WebServiceRefHandlerMBean -{ - public void setupServiceRef(Context encCtx, String encName, AnnotatedElement anElement, VirtualFile vfsRoot, String xmlFragment) throws NamingException - { - setupServiceRef(encCtx, encName, anElement, new VirtualFileAdaptor(vfsRoot), xmlFragment); - } - - public void create() throws Exception - { - MBeanServer server = MBeanServerLocator.locateJBoss(); - if (server != null) - server.registerMBean(this, OBJECT_NAME); - } - - public void destroy() throws Exception - { - MBeanServer server = MBeanServerLocator.locateJBoss(); - if (server != null) - server.unregisterMBean(OBJECT_NAME); - } -} Deleted: branches/tdiesler/trunk/integration-jboss50/src/java/org/jboss/ws/integration/jboss50/WebServiceRefHandlerMBean.java =================================================================== --- branches/tdiesler/trunk/integration-jboss50/src/java/org/jboss/ws/integration/jboss50/WebServiceRefHandlerMBean.java 2007-03-06 21:33:39 UTC (rev 2537) +++ branches/tdiesler/trunk/integration-jboss50/src/java/org/jboss/ws/integration/jboss50/WebServiceRefHandlerMBean.java 2007-03-06 23:07:01 UTC (rev 2538) @@ -1,45 +0,0 @@ -/* -* JBoss, Home of Professional Open Source -* Copyright 2005, JBoss Inc., and individual contributors as indicated -* by the @authors tag. See the copyright.txt in the distribution for a -* full listing of individual contributors. -* -* This is free software; you can redistribute it and/or modify it -* under the terms of the GNU Lesser General Public License as -* published by the Free Software Foundation; either version 2.1 of -* the License, or (at your option) any later version. -* -* This software is distributed in the hope that it will be useful, -* but WITHOUT ANY WARRANTY; without even the implied warranty of -* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU -* Lesser General Public License for more details. -* -* You should have received a copy of the GNU Lesser General Public -* License along with this software; if not, write to the Free -* Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA -* 02110-1301 USA, or see the FSF site: http://www.fsf.org. -*/ -package org.jboss.ws.integration.jboss50; - - -import java.lang.reflect.AnnotatedElement; - -import javax.management.ObjectName; -import javax.naming.Context; -import javax.naming.NamingException; - -import org.jboss.virtual.VirtualFile; -import org.jboss.ws.core.utils.ObjectNameFactory; - -/** - * MBean interface. - */ -public interface WebServiceRefHandlerMBean -{ - // default object name - public static final ObjectName OBJECT_NAME = ObjectNameFactory.create("jboss.ws:service=ServiceRefHandler"); - - /** Binds a JAXWS WebServiceRef into the callers ENC - */ - void setupServiceRef(Context encCtx, String encName, AnnotatedElement enElement, VirtualFile vfsRoot, String xmlFragment) throws NamingException; -} Modified: branches/tdiesler/trunk/integration-jboss50/src/resources/jbossws.deployer/META-INF/jbossws-deployer-beans.xml =================================================================== --- branches/tdiesler/trunk/integration-jboss50/src/resources/jbossws.deployer/META-INF/jbossws-deployer-beans.xml 2007-03-06 21:33:39 UTC (rev 2537) +++ branches/tdiesler/trunk/integration-jboss50/src/resources/jbossws.deployer/META-INF/jbossws-deployer-beans.xml 2007-03-06 23:07:01 UTC (rev 2538) @@ -48,7 +48,7 @@ </bean>  - <bean name="ServiceRefHandler" class="org.jboss.ws.integration.jboss50.WebServiceRefHandler"/> + <bean name="ServiceRefHandler" class="org.jboss.ws.integration.jboss50.ServiceRefHandler"/>  <bean name="SubscriptionManager" class="org.jboss.ws.extensions.eventing.mgmt.SubscriptionManager"/> Modified: branches/tdiesler/trunk/jbossws-core/src/java/org/jboss/ws/core/jaxrpc/client/ServiceObjectFactory.java =================================================================== --- branches/tdiesler/trunk/jbossws-core/src/java/org/jboss/ws/core/jaxrpc/client/ServiceObjectFactory.java 2007-03-06 21:33:39 UTC (rev 2537) +++ branches/tdiesler/trunk/jbossws-core/src/java/org/jboss/ws/core/jaxrpc/client/ServiceObjectFactory.java 2007-03-06 23:07:01 UTC (rev 2538) @@ -45,6 +45,7 @@ import javax.naming.RefAddr; import javax.naming.Reference; import javax.naming.spi.ObjectFactory; +import javax.wsdl.Definition; import javax.xml.namespace.QName; import javax.xml.rpc.JAXRPCException; import javax.xml.rpc.Service; @@ -59,9 +60,11 @@ import org.jboss.ws.metadata.j2ee.serviceref.PortComponentRefMetaData; import org.jboss.ws.metadata.j2ee.serviceref.ServiceRefMetaData; import org.jboss.ws.metadata.jaxrpcmapping.JavaWsdlMapping; +import org.jboss.ws.metadata.jaxrpcmapping.JavaWsdlMappingFactory; import org.jboss.ws.metadata.umdm.EndpointMetaData; import org.jboss.ws.metadata.umdm.ServiceMetaData; import org.jboss.ws.metadata.wsse.WSSecurityConfiguration; +import org.jboss.ws.tools.wsdl.WSDL11DefinitionFactory; /** * This ServiceObjectFactory reconstructs a javax.xml.rpc.Service @@ -104,13 +107,13 @@ Reference ref = (Reference)obj; // Unmarshall the ServiceRefMetaData - ServiceRefMetaData serviceRefMetaData = null; + ServiceRefMetaData serviceRef = null; RefAddr metaRefAddr = ref.get(ServiceReferenceable.SERVICE_REF_META_DATA); ByteArrayInputStream bais = new ByteArrayInputStream((byte[])metaRefAddr.getContent()); try { ObjectInputStream ois = new ObjectInputStream(bais); - serviceRefMetaData = (ServiceRefMetaData)ois.readObject(); + serviceRef = (ServiceRefMetaData)ois.readObject(); ois.close(); } catch (IOException ex) @@ -139,15 +142,15 @@ } ServiceImpl jaxrpcService = null; - URL wsdlLocation = serviceRefMetaData.getWsdlLocation(); + URL wsdlLocation = serviceRef.getWsdlLocation(); if (wsdlLocation != null) { if(log.isDebugEnabled()) log.debug("Create jaxrpc service from wsdl"); // Create the actual service object - QName serviceName = serviceRefMetaData.getServiceQName(); - JavaWsdlMapping javaWsdlMapping = (JavaWsdlMapping)serviceRefMetaData.getJavaWsdlMapping(); - jaxrpcService = new ServiceImpl(serviceName, wsdlLocation, javaWsdlMapping, securityConfig, serviceRefMetaData); + QName serviceName = serviceRef.getServiceQName(); + JavaWsdlMapping javaWsdlMapping = getJavaWsdlMapping(serviceRef); + jaxrpcService = new ServiceImpl(serviceName, wsdlLocation, javaWsdlMapping, securityConfig, serviceRef); } else { @@ -158,11 +161,11 @@ ServiceMetaData serviceMetaData = jaxrpcService.getServiceMetaData(); // Set any service level properties - if (serviceRefMetaData.getCallProperties().size() > 0) + if (serviceRef.getCallProperties().size() > 0) { Properties callProps = new Properties(); serviceMetaData.setProperties(callProps); - for (CallPropertyMetaData prop : serviceRefMetaData.getCallProperties()) + for (CallPropertyMetaData prop : serviceRef.getCallProperties()) callProps.setProperty(prop.getPropName(), prop.getPropValue()); } @@ -220,12 +223,12 @@ // load the service interface class ClassLoader contextCL = Thread.currentThread().getContextClassLoader(); - Class siClass = contextCL.loadClass(serviceRefMetaData.getServiceInterface()); + Class siClass = contextCL.loadClass(serviceRef.getServiceInterface()); if (Service.class.isAssignableFrom(siClass) == false) throw new JAXRPCException("The service interface does not implement javax.xml.rpc.Service: " + siClass.getName()); // load all service endpoint interface classes - for (PortComponentRefMetaData pcr : serviceRefMetaData.getPortComponentRefs()) + for (PortComponentRefMetaData pcr : serviceRef.getPortComponentRefs()) { Class seiClass = contextCL.loadClass(pcr.getServiceEndpointInterface()); if (Remote.class.isAssignableFrom(seiClass) == false) @@ -256,4 +259,45 @@ jaxrpcService.setupHandlerChain(epMetaData); } } + + private JavaWsdlMapping getJavaWsdlMapping(ServiceRefMetaData serviceRef) + { + JavaWsdlMapping javaWsdlMapping = null; + if (serviceRef.getMappingFile() != null) + { + String mappingFile = serviceRef.getMappingFile(); + try + { + JavaWsdlMappingFactory mappingFactory = JavaWsdlMappingFactory.newInstance(); + URL mappingURL = serviceRef.getVfsRoot().findChild(mappingFile).toURL(); + javaWsdlMapping = mappingFactory.parse(mappingURL); + } + catch (Exception e) + { + throw new WSException("Cannot unmarshal jaxrpc-mapping-file: " + mappingFile, e); + } + } + return javaWsdlMapping; + } + + private Definition getWsdlDefinition(ServiceRefMetaData serviceRef) + { + Definition wsdlDefinition = null; + { + URL wsdlLocation = serviceRef.getWsdlLocation(); + if (wsdlLocation != null) + { + try + { + WSDL11DefinitionFactory factory = WSDL11DefinitionFactory.newInstance(); + wsdlDefinition = factory.parse(wsdlLocation); + } + catch (Exception e) + { + throw new WSException("Cannot unmarshall wsdl-file: " + wsdlLocation, e); + } + } + } + return wsdlDefinition; + } } Added: branches/tdiesler/trunk/jbossws-core/src/java/org/jboss/ws/core/jaxrpc/client/ServiceRefHandlerJAXRPC.java =================================================================== --- branches/tdiesler/trunk/jbossws-core/src/java/org/jboss/ws/core/jaxrpc/client/ServiceRefHandlerJAXRPC.java (rev 0) +++ branches/tdiesler/trunk/jbossws-core/src/java/org/jboss/ws/core/jaxrpc/client/ServiceRefHandlerJAXRPC.java 2007-03-06 23:07:01 UTC (rev 2538) @@ -0,0 +1,58 @@ +/* + * 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.core.jaxrpc.client; + +// $Id$ + +import javax.naming.Context; +import javax.naming.NamingException; + +import org.jboss.logging.Logger; +import org.jboss.util.naming.Util; +import org.jboss.ws.metadata.j2ee.serviceref.ServiceRefMetaData; + +/** + * Binds a JAXRPC Service object in the client's ENC for every service-ref element in the + * deployment descriptor. + * + * @author Thomas.Diesler(a)jboss.org + * @since 04-Nov-2006 + */ +public class ServiceRefHandlerJAXRPC +{ + // logging support + private static Logger log = Logger.getLogger(ServiceRefHandlerJAXRPC.class); + + /** + * Binds a Service into the callers ENC for every service-ref element + */ + public void setupServiceRef(Context encCtx, String encName, ServiceRefMetaData serviceRef) throws NamingException + { + String serviceRefName = serviceRef.getServiceRefName(); + ServiceReferenceable ref = new ServiceReferenceable(serviceRef); + + // Do not use rebind, the binding should be unique + Util.bind(encCtx, encName, ref); + + log.debug("<service-ref> bound to: java:comp/env/" + serviceRefName); + } +} Property changes on: branches/tdiesler/trunk/jbossws-core/src/java/org/jboss/ws/core/jaxrpc/client/ServiceRefHandlerJAXRPC.java ___________________________________________________________________ Name: svn:keywords + Id Revision Name: svn:eol-style + LF Modified: branches/tdiesler/trunk/jbossws-core/src/java/org/jboss/ws/core/jaxrpc/client/ServiceReferenceable.java =================================================================== --- branches/tdiesler/trunk/jbossws-core/src/java/org/jboss/ws/core/jaxrpc/client/ServiceReferenceable.java 2007-03-06 21:33:39 UTC (rev 2537) +++ branches/tdiesler/trunk/jbossws-core/src/java/org/jboss/ws/core/jaxrpc/client/ServiceReferenceable.java 2007-03-06 23:07:01 UTC (rev 2538) @@ -123,8 +123,6 @@ */ private byte[] marshallServiceRef() throws NamingException { - refMetaData.getJavaWsdlMapping(); - ByteArrayOutputStream baos = new ByteArrayOutputStream(512); try { Deleted: branches/tdiesler/trunk/jbossws-core/src/java/org/jboss/ws/core/jaxws/UnifiedWebServiceRefHandler.java =================================================================== --- branches/tdiesler/trunk/jbossws-core/src/java/org/jboss/ws/core/jaxws/UnifiedWebServiceRefHandler.java 2007-03-06 21:33:39 UTC (rev 2537) +++ branches/tdiesler/trunk/jbossws-core/src/java/org/jboss/ws/core/jaxws/UnifiedWebServiceRefHandler.java 2007-03-06 23:07:01 UTC (rev 2538) @@ -1,200 +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.core.jaxws; - -// $Id$ - -import java.io.IOException; -import java.lang.annotation.Annotation; -import java.lang.reflect.AnnotatedElement; -import java.lang.reflect.Field; -import java.lang.reflect.Method; -import java.net.MalformedURLException; -import java.net.URL; -import java.util.ArrayList; -import java.util.List; - -import javax.jws.HandlerChain; -import javax.naming.Context; -import javax.naming.NamingException; -import javax.xml.ws.Service; -import javax.xml.ws.WebServiceRef; -import javax.xml.ws.WebServiceRefs; - -import org.jboss.logging.Logger; -import org.jboss.util.naming.Util; -import org.jboss.ws.WSException; -import org.jboss.ws.core.UnifiedVirtualFile; -import org.jboss.ws.core.jaxws.client.ServiceReferenceable; -import org.jboss.ws.metadata.j2ee.serviceref.ServiceRefMetaData; -import org.jboss.ws.metadata.j2ee.serviceref.ServiceRefObjectFactory; - -/** - * Binds a JAXWS Service object in the client's ENC - * - * @author Thomas.Diesler(a)jboss.org - * @since 17-Jan-2007 - */ -public class UnifiedWebServiceRefHandler -{ - // logging support - private static Logger log = Logger.getLogger(UnifiedWebServiceRefHandler.class); - - protected void setupServiceRef(Context encCtx, String encName, AnnotatedElement anElement, UnifiedVirtualFile vfsRoot, String xmlFragment) throws NamingException - { - WebServiceRef wsref = null; - - // Build the list of @WebServiceRef relevant annotations - List<WebServiceRef> wsrefList = new ArrayList<WebServiceRef>(); - for (Annotation an : anElement.getAnnotations()) - { - if (an instanceof WebServiceRef) - wsrefList.add((WebServiceRef)an); - - if (an instanceof WebServiceRefs) - { - WebServiceRefs wsrefs = (WebServiceRefs)an; - for (WebServiceRef aux : wsrefs.value()) - wsrefList.add(aux); - } - } - - // Use the single @WebServiceRef - if (wsrefList.size() == 1) - { - wsref = wsrefList.get(0); - } - else - { - for (WebServiceRef aux : wsrefList) - { - if (encName.endsWith("/" + aux.name())) - { - wsref = aux; - break; - } - } - } - - if (wsref == null) - throw new IllegalArgumentException("@WebServiceRef must be present on: " + anElement); - - Class targetClass = null; - if (anElement instanceof Field) - targetClass = ((Field)anElement).getType(); - else if (anElement instanceof Method) - targetClass = ((Method)anElement).getParameterTypes()[0]; - - String externalName = encCtx.getNameInNamespace() + "/" + encName; - String targetClassName = (targetClass != null ? targetClass.getName() : null); - log.debug("setupWebServiceRef [jndi=" + externalName + ",target=" + targetClassName + "]"); - - String serviceClassName = null; - - // #1 Use the explicit @WebServiceRef.value - if (wsref.value() != Object.class) - serviceClassName = wsref.value().getName(); - - // #2 Use the target ref type - if (serviceClassName == null && targetClass != null && Service.class.isAssignableFrom(targetClass)) - serviceClassName = targetClass.getName(); - - // #3 Use javax.xml.ws.Service - if (serviceClassName == null) - serviceClassName = Service.class.getName(); - - // #1 Use the explicit @WebServiceRef.type - if (wsref.type() != Object.class) - targetClassName = wsref.type().getName(); - - // #2 Use the target ref type - if (targetClassName == null && targetClass != null && Service.class.isAssignableFrom(targetClass) == false) - targetClassName = targetClass.getName(); - - try - { - ServiceRefObjectFactory factory = ServiceRefObjectFactory.newInstance(); - ServiceRefMetaData usRef = factory.parse(xmlFragment); - usRef.setVfsRoot(vfsRoot); - - // Set the wsdlLocation if there is no override already - if (usRef.getWsdlLocation() == null && wsref.wsdlLocation().length() > 0) - usRef.setWsdlLocation(new URL(wsref.wsdlLocation())); - - // Set the handlerChain from @HandlerChain on the annotated element - String handlerChain = usRef.getHandlerChain(); - HandlerChain anHandlerChain = anElement.getAnnotation(HandlerChain.class); - if (handlerChain == null && anHandlerChain != null && anHandlerChain.file().length() > 0) - handlerChain = anHandlerChain.file(); - - // Resolve path to handler chain - if (handlerChain != null) - { - try - { - new URL(handlerChain); - } - catch (MalformedURLException ex) - { - Class declaringClass = null; - if (anElement instanceof Field) - declaringClass = ((Field)anElement).getDeclaringClass(); - else if (anElement instanceof Method) - declaringClass = ((Method)anElement).getDeclaringClass(); - else if (anElement instanceof Class) - declaringClass = (Class)anElement; - - handlerChain = declaringClass.getPackage().getName().replace('.', '/') + "/" + handlerChain; - } - - usRef.setHandlerChain(handlerChain); - } - - // Do not use rebind, the binding should be unique - // [JBWS-1499] - Revisit WebServiceRefHandler JNDI rebind - Util.rebind(encCtx, encName, new ServiceReferenceable(serviceClassName, targetClassName, usRef)); - - log.debug("<service-ref> bound to: java:comp/env/" + encName); - } - catch (RuntimeException rte) - { - throw rte; - } - catch (Exception ex) - { - throw new WSException("Cannot bind web service ref: " + encName, ex); - } - } - - private boolean findHandlerChain(UnifiedVirtualFile vfsRoot, String handlerChain) - { - try - { - vfsRoot.findChild(handlerChain); - return true; - } - catch (IOException io) - { - return false; - } - } -} Added: branches/tdiesler/trunk/jbossws-core/src/java/org/jboss/ws/core/jaxws/client/ServiceRefHandlerJAXWS.java =================================================================== --- branches/tdiesler/trunk/jbossws-core/src/java/org/jboss/ws/core/jaxws/client/ServiceRefHandlerJAXWS.java (rev 0) +++ branches/tdiesler/trunk/jbossws-core/src/java/org/jboss/ws/core/jaxws/client/ServiceRefHandlerJAXWS.java 2007-03-06 23:07:01 UTC (rev 2538) @@ -0,0 +1,167 @@ +/* + * 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.core.jaxws.client; + +// $Id$ + +import java.lang.annotation.Annotation; +import java.lang.reflect.AnnotatedElement; +import java.lang.reflect.Field; +import java.lang.reflect.Method; +import java.net.MalformedURLException; +import java.net.URL; +import java.util.ArrayList; +import java.util.List; + +import javax.jws.HandlerChain; +import javax.naming.Context; +import javax.naming.NamingException; +import javax.xml.ws.Service; +import javax.xml.ws.WebServiceRef; +import javax.xml.ws.WebServiceRefs; + +import org.jboss.logging.Logger; +import org.jboss.util.naming.Util; +import org.jboss.ws.metadata.j2ee.serviceref.ServiceRefMetaData; + +/** + * Binds a JAXWS Service object in the client's ENC + * + * @author Thomas.Diesler(a)jboss.org + * @since 17-Jan-2007 + */ +public class ServiceRefHandlerJAXWS +{ + // logging support + private static Logger log = Logger.getLogger(ServiceRefHandlerJAXWS.class); + + public void setupServiceRef(Context encCtx, String encName, AnnotatedElement anElement, ServiceRefMetaData serviceRef) throws NamingException + { + WebServiceRef wsref = null; + + // Build the list of @WebServiceRef relevant annotations + List<WebServiceRef> wsrefList = new ArrayList<WebServiceRef>(); + for (Annotation an : anElement.getAnnotations()) + { + if (an instanceof WebServiceRef) + wsrefList.add((WebServiceRef)an); + + if (an instanceof WebServiceRefs) + { + WebServiceRefs wsrefs = (WebServiceRefs)an; + for (WebServiceRef aux : wsrefs.value()) + wsrefList.add(aux); + } + } + + // Use the single @WebServiceRef + if (wsrefList.size() == 1) + { + wsref = wsrefList.get(0); + } + else + { + for (WebServiceRef aux : wsrefList) + { + if (encName.endsWith("/" + aux.name())) + { + wsref = aux; + break; + } + } + } + + if (wsref == null) + throw new IllegalArgumentException("@WebServiceRef must be present on: " + anElement); + + Class targetClass = null; + if (anElement instanceof Field) + targetClass = ((Field)anElement).getType(); + else if (anElement instanceof Method) + targetClass = ((Method)anElement).getParameterTypes()[0]; + + String externalName = encCtx.getNameInNamespace() + "/" + encName; + String targetClassName = (targetClass != null ? targetClass.getName() : null); + log.debug("setupWebServiceRef [jndi=" + externalName + ",target=" + targetClassName + "]"); + + String serviceClassName = null; + + // #1 Use the explicit @WebServiceRef.value + if (wsref.value() != Object.class) + serviceClassName = wsref.value().getName(); + + // #2 Use the target ref type + if (serviceClassName == null && targetClass != null && Service.class.isAssignableFrom(targetClass)) + serviceClassName = targetClass.getName(); + + // #3 Use javax.xml.ws.Service + if (serviceClassName == null) + serviceClassName = Service.class.getName(); + + // #1 Use the explicit @WebServiceRef.type + if (wsref.type() != Object.class) + targetClassName = wsref.type().getName(); + + // #2 Use the target ref type + if (targetClassName == null && targetClass != null && Service.class.isAssignableFrom(targetClass) == false) + targetClassName = targetClass.getName(); + + // Set the wsdlLocation if there is no override already + if (serviceRef.getWsdlOverride() == null && wsref.wsdlLocation().length() > 0) + serviceRef.setWsdlFile(wsref.wsdlLocation()); + + // Set the handlerChain from @HandlerChain on the annotated element + String handlerChain = serviceRef.getHandlerChain(); + HandlerChain anHandlerChain = anElement.getAnnotation(HandlerChain.class); + if (handlerChain == null && anHandlerChain != null && anHandlerChain.file().length() > 0) + handlerChain = anHandlerChain.file(); + + // Resolve path to handler chain + if (handlerChain != null) + { + try + { + new URL(handlerChain); + } + catch (MalformedURLException ex) + { + Class declaringClass = null; + if (anElement instanceof Field) + declaringClass = ((Field)anElement).getDeclaringClass(); + else if (anElement instanceof Method) + declaringClass = ((Method)anElement).getDeclaringClass(); + else if (anElement instanceof Class) + declaringClass = (Class)anElement; + + handlerChain = declaringClass.getPackage().getName().replace('.', '/') + "/" + handlerChain; + } + + serviceRef.setHandlerChain(handlerChain); + } + + // Do not use rebind, the binding should be unique + // [JBWS-1499] - Revisit WebServiceRefHandler JNDI rebind + Util.rebind(encCtx, encName, new ServiceReferenceable(serviceClassName, targetClassName, serviceRef)); + + log.debug("<service-ref> bound to: java:comp/env/" + encName); + } +} Property changes on: branches/tdiesler/trunk/jbossws-core/src/java/org/jboss/ws/core/jaxws/client/ServiceRefHandlerJAXWS.java ___________________________________________________________________ Name: svn:keywords + Id Revision Name: svn:eol-style + LF Modified: branches/tdiesler/trunk/jbossws-core/src/java/org/jboss/ws/metadata/j2ee/serviceref/ServiceRefMetaData.java =================================================================== --- branches/tdiesler/trunk/jbossws-core/src/java/org/jboss/ws/metadata/j2ee/serviceref/ServiceRefMetaData.java 2007-03-06 21:33:39 UTC (rev 2537) +++ branches/tdiesler/trunk/jbossws-core/src/java/org/jboss/ws/metadata/j2ee/serviceref/ServiceRefMetaData.java 2007-03-06 23:07:01 UTC (rev 2538) @@ -32,14 +32,11 @@ import java.util.List; import java.util.Map; -import javax.wsdl.Definition; import javax.xml.namespace.QName; import org.jboss.logging.Logger; import org.jboss.ws.WSException; import org.jboss.ws.core.UnifiedVirtualFile; -import org.jboss.ws.metadata.jaxrpcmapping.JavaWsdlMapping; -import org.jboss.ws.tools.wsdl.WSDL11DefinitionFactory; /** * The metdata data from service-ref element in web.xml, ejb-jar.xml, and @@ -52,6 +49,8 @@ // provide logging private static Logger log = Logger.getLogger(ServiceRefMetaData.class); + private UnifiedVirtualFile vfsRoot; + // The required <service-ref-name> element private String serviceRefName; // The required <service-interface> element @@ -77,18 +76,10 @@ // The optional JBossWS config-file private String configFile; // The optional URL of the actual WSDL to use, <wsdl-override> - private URL wsdlOverride; + private String wsdlOverride; // Arbitrary proxy properties given by <call-property> private List<CallPropertyMetaData> callProperties = new ArrayList<CallPropertyMetaData>(); - private UnifiedVirtualFile vfsRoot; - // derived from jaxrpc-mapping-file - private JavaWsdlMapping javaWsdlMapping; - // derived from wsdl-override, wsdl-file - private URL wsdlLocation; - // derived from wsdl-override, wsdl-file - private Definition wsdlDefinition; - public UnifiedVirtualFile getVfsRoot() { return vfsRoot; @@ -119,31 +110,21 @@ this.mappingFile = mappingFile; } - public JavaWsdlMapping getJavaWsdlMapping() - { - return javaWsdlMapping; - } - - public void setJavaWsdlMapping(JavaWsdlMapping javaWsdlMapping) - { - this.javaWsdlMapping = javaWsdlMapping; - } - public URL getMappingLocation() { - URL mappingLocation = null; + URL mappingURL = null; if (mappingFile != null) { try { - mappingLocation = vfsRoot.findChild(mappingFile).toURL(); + mappingURL = vfsRoot.findChild(mappingFile).toURL(); } catch (Exception e) { throw new WSException("Cannot find jaxrcp-mapping-file: " + mappingFile, e); } } - return mappingLocation; + return mappingURL; } public Collection<PortComponentRefMetaData> getPortComponentRefs() @@ -214,10 +195,26 @@ public URL getWsdlLocation() { - if (wsdlLocation != null) - return wsdlLocation; - - wsdlLocation = wsdlOverride; + URL wsdlLocation = null; + if (wsdlOverride != null) + { + try + { + wsdlLocation = new URL(wsdlOverride); + } + catch (MalformedURLException e1) + { + try + { + wsdlLocation = vfsRoot.findChild(wsdlOverride).toURL(); + } + catch (Exception e) + { + throw new WSException("Cannot find wsdl-override: " + wsdlOverride, e); + } + } + } + if (wsdlLocation == null && wsdlFile != null) { try @@ -229,24 +226,10 @@ throw new WSException("Cannot find wsdl-file: " + wsdlFile, e); } } + return wsdlLocation; } - public void setWsdlLocation(URL wsdlLocation) - { - this.wsdlLocation = wsdlLocation; - } - - public Definition getWsdlDefinition() - { - return wsdlDefinition; - } - - public void setWsdlDefinition(Definition wsdlDefinition) - { - this.wsdlDefinition = wsdlDefinition; - } - public String getConfigFile() { return configFile; @@ -267,21 +250,14 @@ this.configName = configName; } - public URL getWsdlOverride() + public String getWsdlOverride() { return wsdlOverride; } public void setWsdlOverride(String wsdlOverride) { - try - { - this.wsdlOverride = new URL(wsdlOverride); - } - catch (MalformedURLException e) - { - throw new IllegalArgumentException("Invalid wsdl-override: " + wsdlOverride); - } + this.wsdlOverride = wsdlOverride; } public List<CallPropertyMetaData> getCallProperties()

19 years, 1 month

1
0
0 / 0

JBossWS SVN: r2537 - branches/tdiesler/trunk/jbossws-core/src/java/org/jboss/ws/core/jaxws.

by jbossws-commits＠lists.jboss.org

Author: thomas.diesler(a)jboss.com Date: 2007-03-06 16:33:39 -0500 (Tue, 06 Mar 2007) New Revision: 2537 Added: branches/tdiesler/trunk/jbossws-core/src/java/org/jboss/ws/core/jaxws/UnifiedWebServiceRefHandler.java Log: Added: branches/tdiesler/trunk/jbossws-core/src/java/org/jboss/ws/core/jaxws/UnifiedWebServiceRefHandler.java =================================================================== --- branches/tdiesler/trunk/jbossws-core/src/java/org/jboss/ws/core/jaxws/UnifiedWebServiceRefHandler.java (rev 0) +++ branches/tdiesler/trunk/jbossws-core/src/java/org/jboss/ws/core/jaxws/UnifiedWebServiceRefHandler.java 2007-03-06 21:33:39 UTC (rev 2537) @@ -0,0 +1,200 @@ +/* + * 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.core.jaxws; + +// $Id$ + +import java.io.IOException; +import java.lang.annotation.Annotation; +import java.lang.reflect.AnnotatedElement; +import java.lang.reflect.Field; +import java.lang.reflect.Method; +import java.net.MalformedURLException; +import java.net.URL; +import java.util.ArrayList; +import java.util.List; + +import javax.jws.HandlerChain; +import javax.naming.Context; +import javax.naming.NamingException; +import javax.xml.ws.Service; +import javax.xml.ws.WebServiceRef; +import javax.xml.ws.WebServiceRefs; + +import org.jboss.logging.Logger; +import org.jboss.util.naming.Util; +import org.jboss.ws.WSException; +import org.jboss.ws.core.UnifiedVirtualFile; +import org.jboss.ws.core.jaxws.client.ServiceReferenceable; +import org.jboss.ws.metadata.j2ee.serviceref.ServiceRefMetaData; +import org.jboss.ws.metadata.j2ee.serviceref.ServiceRefObjectFactory; + +/** + * Binds a JAXWS Service object in the client's ENC + * + * @author Thomas.Diesler(a)jboss.org + * @since 17-Jan-2007 + */ +public class UnifiedWebServiceRefHandler +{ + // logging support + private static Logger log = Logger.getLogger(UnifiedWebServiceRefHandler.class); + + protected void setupServiceRef(Context encCtx, String encName, AnnotatedElement anElement, UnifiedVirtualFile vfsRoot, String xmlFragment) throws NamingException + { + WebServiceRef wsref = null; + + // Build the list of @WebServiceRef relevant annotations + List<WebServiceRef> wsrefList = new ArrayList<WebServiceRef>(); + for (Annotation an : anElement.getAnnotations()) + { + if (an instanceof WebServiceRef) + wsrefList.add((WebServiceRef)an); + + if (an instanceof WebServiceRefs) + { + WebServiceRefs wsrefs = (WebServiceRefs)an; + for (WebServiceRef aux : wsrefs.value()) + wsrefList.add(aux); + } + } + + // Use the single @WebServiceRef + if (wsrefList.size() == 1) + { + wsref = wsrefList.get(0); + } + else + { + for (WebServiceRef aux : wsrefList) + { + if (encName.endsWith("/" + aux.name())) + { + wsref = aux; + break; + } + } + } + + if (wsref == null) + throw new IllegalArgumentException("@WebServiceRef must be present on: " + anElement); + + Class targetClass = null; + if (anElement instanceof Field) + targetClass = ((Field)anElement).getType(); + else if (anElement instanceof Method) + targetClass = ((Method)anElement).getParameterTypes()[0]; + + String externalName = encCtx.getNameInNamespace() + "/" + encName; + String targetClassName = (targetClass != null ? targetClass.getName() : null); + log.debug("setupWebServiceRef [jndi=" + externalName + ",target=" + targetClassName + "]"); + + String serviceClassName = null; + + // #1 Use the explicit @WebServiceRef.value + if (wsref.value() != Object.class) + serviceClassName = wsref.value().getName(); + + // #2 Use the target ref type + if (serviceClassName == null && targetClass != null && Service.class.isAssignableFrom(targetClass)) + serviceClassName = targetClass.getName(); + + // #3 Use javax.xml.ws.Service + if (serviceClassName == null) + serviceClassName = Service.class.getName(); + + // #1 Use the explicit @WebServiceRef.type + if (wsref.type() != Object.class) + targetClassName = wsref.type().getName(); + + // #2 Use the target ref type + if (targetClassName == null && targetClass != null && Service.class.isAssignableFrom(targetClass) == false) + targetClassName = targetClass.getName(); + + try + { + ServiceRefObjectFactory factory = ServiceRefObjectFactory.newInstance(); + ServiceRefMetaData usRef = factory.parse(xmlFragment); + usRef.setVfsRoot(vfsRoot); + + // Set the wsdlLocation if there is no override already + if (usRef.getWsdlLocation() == null && wsref.wsdlLocation().length() > 0) + usRef.setWsdlLocation(new URL(wsref.wsdlLocation())); + + // Set the handlerChain from @HandlerChain on the annotated element + String handlerChain = usRef.getHandlerChain(); + HandlerChain anHandlerChain = anElement.getAnnotation(HandlerChain.class); + if (handlerChain == null && anHandlerChain != null && anHandlerChain.file().length() > 0) + handlerChain = anHandlerChain.file(); + + // Resolve path to handler chain + if (handlerChain != null) + { + try + { + new URL(handlerChain); + } + catch (MalformedURLException ex) + { + Class declaringClass = null; + if (anElement instanceof Field) + declaringClass = ((Field)anElement).getDeclaringClass(); + else if (anElement instanceof Method) + declaringClass = ((Method)anElement).getDeclaringClass(); + else if (anElement instanceof Class) + declaringClass = (Class)anElement; + + handlerChain = declaringClass.getPackage().getName().replace('.', '/') + "/" + handlerChain; + } + + usRef.setHandlerChain(handlerChain); + } + + // Do not use rebind, the binding should be unique + // [JBWS-1499] - Revisit WebServiceRefHandler JNDI rebind + Util.rebind(encCtx, encName, new ServiceReferenceable(serviceClassName, targetClassName, usRef)); + + log.debug("<service-ref> bound to: java:comp/env/" + encName); + } + catch (RuntimeException rte) + { + throw rte; + } + catch (Exception ex) + { + throw new WSException("Cannot bind web service ref: " + encName, ex); + } + } + + private boolean findHandlerChain(UnifiedVirtualFile vfsRoot, String handlerChain) + { + try + { + vfsRoot.findChild(handlerChain); + return true; + } + catch (IOException io) + { + return false; + } + } +} Property changes on: branches/tdiesler/trunk/jbossws-core/src/java/org/jboss/ws/core/jaxws/UnifiedWebServiceRefHandler.java ___________________________________________________________________ Name: svn:keywords + Id Revision Name: svn:eol-style + LF

19 years, 1 month

1
0
0 / 0

JBossWS SVN: r2536 - in branches/tdiesler/trunk: integration-jboss50/src/java/org/jboss/ws/integration/jboss50 and 17 other directories.

by jbossws-commits＠lists.jboss.org

Author: thomas.diesler(a)jboss.com Date: 2007-03-06 10:20:12 -0500 (Tue, 06 Mar 2007) New Revision: 2536 Added: branches/tdiesler/trunk/jbossws-core/src/java/org/jboss/ws/metadata/j2ee/serviceref/ branches/tdiesler/trunk/jbossws-core/src/java/org/jboss/ws/metadata/j2ee/serviceref/CallPropertyMetaData.java branches/tdiesler/trunk/jbossws-core/src/java/org/jboss/ws/metadata/j2ee/serviceref/HandlerChainMetaData.java branches/tdiesler/trunk/jbossws-core/src/java/org/jboss/ws/metadata/j2ee/serviceref/HandlerChainsMetaData.java branches/tdiesler/trunk/jbossws-core/src/java/org/jboss/ws/metadata/j2ee/serviceref/HandlerMetaData.java branches/tdiesler/trunk/jbossws-core/src/java/org/jboss/ws/metadata/j2ee/serviceref/InitParamMetaData.java branches/tdiesler/trunk/jbossws-core/src/java/org/jboss/ws/metadata/j2ee/serviceref/PortComponentRefMetaData.java branches/tdiesler/trunk/jbossws-core/src/java/org/jboss/ws/metadata/j2ee/serviceref/ServiceRefMetaData.java branches/tdiesler/trunk/jbossws-core/src/java/org/jboss/ws/metadata/j2ee/serviceref/ServiceRefObjectFactory.java branches/tdiesler/trunk/jbossws-core/src/java/org/jboss/ws/metadata/j2ee/serviceref/StubPropertyMetaData.java Removed: branches/tdiesler/trunk/integration-jboss50/src/java/org/jboss/ws/integration/jboss50/ServiceRefMetaDataAdaptor.java branches/tdiesler/trunk/jbossws-core/src/java/org/jboss/ws/core/jaxws/ServiceRefHandlerJAXWS.java branches/tdiesler/trunk/jbossws-core/src/java/org/jboss/ws/core/jaxws/UnifiedServiceRefObjectFactory.java branches/tdiesler/trunk/jbossws-core/src/java/org/jboss/ws/core/jaxws/client/PortInfo.java branches/tdiesler/trunk/jbossws-core/src/java/org/jboss/ws/core/jaxws/client/UnifiedServiceRef.java Modified: branches/tdiesler/trunk/build/ant-import/build-thirdparty.xml branches/tdiesler/trunk/integration-jboss50/src/java/org/jboss/ws/integration/jboss50/ServiceRefHandler.java branches/tdiesler/trunk/integration-jboss50/src/java/org/jboss/ws/integration/jboss50/ServiceRefHandlerMBean.java branches/tdiesler/trunk/integration-jboss50/src/java/org/jboss/ws/integration/jboss50/WebServiceRefHandler.java branches/tdiesler/trunk/integration-jboss50/src/java/org/jboss/ws/integration/jboss50/WebServiceRefHandlerMBean.java branches/tdiesler/trunk/integration-jboss50/src/resources/jbossws.deployer/META-INF/jbossws-deployer-beans.xml branches/tdiesler/trunk/jbossws-core/src/java/org/jboss/ws/core/jaxrpc/client/ServiceImpl.java branches/tdiesler/trunk/jbossws-core/src/java/org/jboss/ws/core/jaxrpc/client/ServiceObjectFactory.java branches/tdiesler/trunk/jbossws-core/src/java/org/jboss/ws/core/jaxrpc/client/ServiceReferenceable.java branches/tdiesler/trunk/jbossws-core/src/java/org/jboss/ws/core/jaxrpc/handler/HandlerDelegateJAXRPC.java branches/tdiesler/trunk/jbossws-core/src/java/org/jboss/ws/core/jaxws/client/ServiceObjectFactory.java branches/tdiesler/trunk/jbossws-core/src/java/org/jboss/ws/core/jaxws/client/ServiceReferenceable.java branches/tdiesler/trunk/jbossws-core/src/java/org/jboss/ws/core/jaxws/spi/ServiceDelegateImpl.java branches/tdiesler/trunk/jbossws-core/src/java/org/jboss/ws/metadata/builder/jaxrpc/JAXRPCClientMetaDataBuilder.java branches/tdiesler/trunk/jbossws-core/src/java/org/jboss/ws/metadata/config/binding/OMFactoryJAXRPC.java branches/tdiesler/trunk/jbossws-core/src/java/org/jboss/ws/metadata/j2ee/UnifiedHandlerMetaData.java branches/tdiesler/trunk/jbossws-core/src/java/org/jboss/ws/metadata/j2ee/UnifiedPortComponentRefMetaData.java branches/tdiesler/trunk/jbossws-core/src/java/org/jboss/ws/metadata/jsr181/HandlerChainFactory.java branches/tdiesler/trunk/jbossws-core/src/java/org/jboss/ws/metadata/umdm/HandlerMetaData.java branches/tdiesler/trunk/jbossws-core/src/java/org/jboss/ws/metadata/webservices/WebservicesFactory.java branches/tdiesler/trunk/jbossws-tests/src/resources/jaxws/samples/handlerchain/META-INF/jboss-client.xml branches/tdiesler/trunk/jbossws-tests/src/resources/jaxws/samples/webserviceref/META-INF-override/jboss-client.xml branches/tdiesler/trunk/jbossws-tests/src/resources/jaxws/samples/webserviceref/META-INF-secure/jboss-client.xml branches/tdiesler/trunk/jbossws-tests/src/resources/jaxws/samples/webserviceref/META-INF/jboss-client.xml branches/tdiesler/trunk/jbossws-tests/src/resources/jaxws/samples/webserviceref/META-INF/jboss-web.xml branches/tdiesler/trunk/jbossws-tests/src/resources/jaxws/samples/webserviceref/META-INF/jboss.xml Log: partial commit Modified: branches/tdiesler/trunk/build/ant-import/build-thirdparty.xml =================================================================== --- branches/tdiesler/trunk/build/ant-import/build-thirdparty.xml 2007-03-06 13:45:43 UTC (rev 2535) +++ branches/tdiesler/trunk/build/ant-import/build-thirdparty.xml 2007-03-06 15:20:12 UTC (rev 2536) @@ -90,6 +90,7 @@ <pathelement location="${thirdparty.dir}/ejb3.deployer/jboss-ejb3x.jar"/> <pathelement location="${thirdparty.dir}/javassist.jar"/> <pathelement location="${thirdparty.dir}/jaxb-api.jar"/> + <pathelement location="${thirdparty.dir}/jaxb-impl.jar"/> <pathelement location="${thirdparty.dir}/jaxb-xjc.jar"/> <pathelement location="${thirdparty.dir}/jboss-common.jar"/> <pathelement location="${thirdparty.dir}/jboss-dependency.jar"/> Modified: branches/tdiesler/trunk/integration-jboss50/src/java/org/jboss/ws/integration/jboss50/ServiceRefHandler.java =================================================================== --- branches/tdiesler/trunk/integration-jboss50/src/java/org/jboss/ws/integration/jboss50/ServiceRefHandler.java 2007-03-06 13:45:43 UTC (rev 2535) +++ branches/tdiesler/trunk/integration-jboss50/src/java/org/jboss/ws/integration/jboss50/ServiceRefHandler.java 2007-03-06 15:20:12 UTC (rev 2536) @@ -23,25 +23,22 @@ // $Id$ +import java.lang.reflect.AnnotatedElement; import java.net.URL; -import java.util.Iterator; import javax.management.MBeanServer; import javax.naming.Context; +import javax.naming.NamingException; import javax.wsdl.Definition; -import javax.wsdl.WSDLException; -import javax.xml.rpc.JAXRPCException; -import org.jboss.deployers.spi.deployer.DeploymentUnit; import org.jboss.logging.Logger; import org.jboss.mx.util.MBeanServerLocator; import org.jboss.util.naming.Util; -import org.jboss.metadata.serviceref.ServiceRefMetaData; +import org.jboss.virtual.VirtualFile; import org.jboss.ws.WSException; import org.jboss.ws.core.jaxrpc.client.ServiceReferenceable; -import org.jboss.ws.core.server.UnifiedDeploymentInfo; -import org.jboss.ws.metadata.builder.jaxrpc.JAXRPCClientDeployment; -import org.jboss.ws.metadata.j2ee.UnifiedServiceRefMetaData; +import org.jboss.ws.metadata.j2ee.serviceref.ServiceRefMetaData; +import org.jboss.ws.metadata.j2ee.serviceref.ServiceRefObjectFactory; import org.jboss.ws.metadata.jaxrpcmapping.JavaWsdlMapping; import org.jboss.ws.metadata.jaxrpcmapping.JavaWsdlMappingFactory; import org.jboss.ws.tools.wsdl.WSDL11DefinitionFactory; @@ -59,40 +56,30 @@ private static Logger log = Logger.getLogger(ServiceRefHandler.class); /** - * This binds a jaxrpc Service into the callers ENC for every service-ref element - * - * @param envCtx ENC to bind the javax.rpc.xml.Service object to - * @param serviceRefs An iterator of the service-ref elements in the client deployment descriptor - * @param unit The client deployment + * Binds a Service into the callers ENC for every service-ref element */ - public void bindServiceRefs(Context envCtx, Iterator serviceRefs, DeploymentUnit unit) + public void setupServiceRef(Context encCtx, String encName, AnnotatedElement anElement, VirtualFile vfsRoot, String xmlFragment) throws NamingException { try { - while (serviceRefs.hasNext()) - { - ServiceRefMetaData serviceRef = (ServiceRefMetaData)serviceRefs.next(); - String serviceRefName = serviceRef.getServiceRefName(); + ServiceRefObjectFactory factory = ServiceRefObjectFactory.newInstance(); + ServiceRefMetaData serviceRef = factory.parse(xmlFragment); + serviceRef.setVfsRoot(new VirtualFileAdaptor(vfsRoot)); + + String serviceRefName = serviceRef.getServiceRefName(); - // Build the container independent deployment info - UnifiedDeploymentInfo udi = new JAXRPCClientDeployment(UnifiedDeploymentInfo.DeploymentType.JAXRPC_Client); - DeploymentInfoAdaptor.buildDeploymentInfo(udi, unit); + JavaWsdlMapping javaWsdlMapping = getJavaWsdlMapping(serviceRef); + serviceRef.setJavaWsdlMapping(javaWsdlMapping); - UnifiedServiceRefMetaData wsServiceRef = ServiceRefMetaDataAdaptor.buildUnifiedServiceRefMetaData(udi, serviceRef); + Definition wsdlDefinition = getWsdlDefinition(serviceRef); + serviceRef.setWsdlDefinition(wsdlDefinition); - JavaWsdlMapping javaWsdlMapping = getJavaWsdlMapping(wsServiceRef); - wsServiceRef.setJavaWsdlMapping(javaWsdlMapping); + ServiceReferenceable ref = new ServiceReferenceable(serviceRef); - Definition wsdlDefinition = getWsdlDefinition(wsServiceRef); - wsServiceRef.setWsdlDefinition(wsdlDefinition); + // Do not use rebind, the binding should be unique + Util.bind(encCtx, encName, ref); - ServiceReferenceable ref = new ServiceReferenceable(wsServiceRef, udi); - - // Do not use rebind, the binding should be unique - Util.bind(envCtx, serviceRefName, ref); - - log.debug("<service-ref> bound to: java:comp/env/" + serviceRefName); - } + log.debug("<service-ref> bound to: java:comp/env/" + serviceRefName); } catch (RuntimeException rte) { @@ -104,41 +91,41 @@ } } - private JavaWsdlMapping getJavaWsdlMapping(UnifiedServiceRefMetaData serviceRef) + private JavaWsdlMapping getJavaWsdlMapping(ServiceRefMetaData serviceRef) { JavaWsdlMapping javaWsdlMapping = null; - URL mappingURL = serviceRef.getMappingLocation(); - if (mappingURL != null) + if (serviceRef.getMappingFile() != null) { + String mappingFile = serviceRef.getMappingFile(); try { JavaWsdlMappingFactory mappingFactory = JavaWsdlMappingFactory.newInstance(); + URL mappingURL = serviceRef.getVfsRoot().findChild(mappingFile).toURL(); javaWsdlMapping = mappingFactory.parse(mappingURL); } catch (Exception e) { - throw new JAXRPCException("Cannot unmarshal jaxrpc-mapping-file: " + mappingURL, e); + throw new WSException("Cannot unmarshal jaxrpc-mapping-file: " + mappingFile, e); } } return javaWsdlMapping; } - private Definition getWsdlDefinition(UnifiedServiceRefMetaData serviceRef) + private Definition getWsdlDefinition(ServiceRefMetaData serviceRef) { Definition wsdlDefinition = null; { - URL wsdlOverride = serviceRef.getWsdlOverride(); - URL wsdlURL = serviceRef.getWsdlLocation(); - if (wsdlOverride == null && wsdlURL != null) + URL wsdlLocation = serviceRef.getWsdlLocation(); + if (wsdlLocation != null) { try { WSDL11DefinitionFactory factory = WSDL11DefinitionFactory.newInstance(); - wsdlDefinition = factory.parse(wsdlURL); + wsdlDefinition = factory.parse(wsdlLocation); } - catch (WSDLException e) + catch (Exception e) { - throw new WSException("Cannot unmarshall wsdl, cause: " + e.toString()); + throw new WSException("Cannot unmarshall wsdl-file: " + wsdlLocation, e); } } } Modified: branches/tdiesler/trunk/integration-jboss50/src/java/org/jboss/ws/integration/jboss50/ServiceRefHandlerMBean.java =================================================================== --- branches/tdiesler/trunk/integration-jboss50/src/java/org/jboss/ws/integration/jboss50/ServiceRefHandlerMBean.java 2007-03-06 13:45:43 UTC (rev 2535) +++ branches/tdiesler/trunk/integration-jboss50/src/java/org/jboss/ws/integration/jboss50/ServiceRefHandlerMBean.java 2007-03-06 15:20:12 UTC (rev 2536) @@ -21,13 +21,13 @@ */ package org.jboss.ws.integration.jboss50; -import java.util.Iterator; +import java.lang.reflect.AnnotatedElement; import javax.management.ObjectName; import javax.naming.Context; +import javax.naming.NamingException; -import org.jboss.deployers.spi.DeploymentException; -import org.jboss.deployers.spi.deployer.DeploymentUnit; +import org.jboss.virtual.VirtualFile; import org.jboss.ws.core.utils.ObjectNameFactory; /** @@ -39,12 +39,7 @@ public static final ObjectName OBJECT_NAME = ObjectNameFactory.create("jboss.ws:service=ServiceRefHandler"); /** - * Binds a JAXRPC Service into the callers ENC for every service-ref element - * - * @param envCtx ENC to bind the javax.rpc.xml.Service object to - * @param serviceRefs An iterator of the service-ref elements in the client deployment descriptor - * @param unit The client's deployment unit - * @throws DeploymentException if it goes wrong + * Binds a Service into the callers ENC for every service-ref element */ - void bindServiceRefs(Context envCtx, Iterator serviceRefs, DeploymentUnit unit); + void setupServiceRef(Context encCtx, String encName, AnnotatedElement anElement, VirtualFile vfsRoot, String xmlFragment) throws NamingException; } Deleted: branches/tdiesler/trunk/integration-jboss50/src/java/org/jboss/ws/integration/jboss50/ServiceRefMetaDataAdaptor.java =================================================================== --- branches/tdiesler/trunk/integration-jboss50/src/java/org/jboss/ws/integration/jboss50/ServiceRefMetaDataAdaptor.java 2007-03-06 13:45:43 UTC (rev 2535) +++ branches/tdiesler/trunk/integration-jboss50/src/java/org/jboss/ws/integration/jboss50/ServiceRefMetaDataAdaptor.java 2007-03-06 15:20:12 UTC (rev 2536) @@ -1,112 +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.integration.jboss50; - -// $Id$ - -import java.net.URL; -import java.util.ArrayList; -import java.util.LinkedHashMap; - -import javax.xml.namespace.QName; - -import org.jboss.metadata.serviceref.HandlerMetaData; -import org.jboss.metadata.serviceref.InitParamMetaData; -import org.jboss.metadata.serviceref.PortComponentRefMetaData; -import org.jboss.metadata.serviceref.ServiceRefMetaData; -import org.jboss.ws.core.server.UnifiedDeploymentInfo; -import org.jboss.ws.metadata.j2ee.UnifiedHandlerMetaData; -import org.jboss.ws.metadata.j2ee.UnifiedPortComponentRefMetaData; -import org.jboss.ws.metadata.j2ee.UnifiedServiceRefMetaData; -import org.jboss.ws.metadata.umdm.HandlerMetaData.HandlerInitParam; - -/** - * Build container independent service ref meta data - * - * @author Thomas.Diesler(a)jboss.org - * @since 05-May-2006 - */ -public class ServiceRefMetaDataAdaptor -{ - public static UnifiedServiceRefMetaData buildUnifiedServiceRefMetaData(UnifiedDeploymentInfo udi, ServiceRefMetaData srmd) throws Exception - { - UnifiedServiceRefMetaData usrmd = new UnifiedServiceRefMetaData(); - usrmd.setServiceRefName(srmd.getServiceRefName()); - usrmd.setServiceInterface(srmd.getServiceInterface()); - usrmd.setWsdlLocation(getWsdlLocation(udi, srmd)); - usrmd.setMappingLocation(udi.getMetaDataFileURL(srmd.getMappingFile())); - usrmd.setServiceQName(srmd.getServiceQName()); - - LinkedHashMap<String, UnifiedPortComponentRefMetaData> pcrefs = new LinkedHashMap<String, UnifiedPortComponentRefMetaData>(); - for (PortComponentRefMetaData pcmd : srmd.getPortComponentRefs()) - { - UnifiedPortComponentRefMetaData upcmd = new UnifiedPortComponentRefMetaData(); - upcmd.setServiceEndpointInterface(pcmd.getServiceEndpointInterface()); - upcmd.setPortComponentLink(pcmd.getPortComponentLink()); - upcmd.setCallProperties(pcmd.getCallProperties()); - pcrefs.put(pcmd.getServiceEndpointInterface(), upcmd); - } - usrmd.setPortComponentRefs(pcrefs); - - ArrayList<UnifiedHandlerMetaData> handlers = new ArrayList<UnifiedHandlerMetaData>(); - for (HandlerMetaData hmd : srmd.getHandlers()) - { - UnifiedHandlerMetaData uhmd = new UnifiedHandlerMetaData(null); - uhmd.setHandlerName(hmd.getHandlerName()); - uhmd.setHandlerClass(hmd.getHandlerClass()); - for(QName soapHeader : hmd.getSoapHeaders()) - { - uhmd.addSoapHeader(soapHeader); - } - for(String portname : hmd.getPortNames()) - { - uhmd.addPortName(portname); - } - for (InitParamMetaData ipmd : hmd.getInitParams()) - { - HandlerInitParam ip = new HandlerInitParam(); - ip.setParamName(ipmd.getParamName()); - ip.setParamValue(ipmd.getParamValue()); - uhmd.addInitParam(ip); - } - handlers.add(uhmd); - } - usrmd.setHandlers(handlers); - - usrmd.setConfigName(srmd.getConfigName()); - usrmd.setConfigFile(srmd.getConfigFile()); - usrmd.setWsdlOverride(srmd.getWsdlOverride()); - usrmd.setCallProperties(srmd.getCallProperties()); - - return usrmd; - } - - private static URL getWsdlLocation(UnifiedDeploymentInfo udi, ServiceRefMetaData srmd) throws Exception - { - URL wsdlLocation = srmd.getWsdlOverride(); - if (wsdlLocation == null && srmd.getWsdlFile() != null) - { - wsdlLocation = udi.getMetaDataFileURL(srmd.getWsdlFile()); - } - return wsdlLocation; - } -} Modified: branches/tdiesler/trunk/integration-jboss50/src/java/org/jboss/ws/integration/jboss50/WebServiceRefHandler.java =================================================================== --- branches/tdiesler/trunk/integration-jboss50/src/java/org/jboss/ws/integration/jboss50/WebServiceRefHandler.java 2007-03-06 13:45:43 UTC (rev 2535) +++ branches/tdiesler/trunk/integration-jboss50/src/java/org/jboss/ws/integration/jboss50/WebServiceRefHandler.java 2007-03-06 15:20:12 UTC (rev 2536) @@ -28,7 +28,6 @@ import javax.management.MBeanServer; import javax.naming.Context; import javax.naming.NamingException; -import javax.xml.transform.Source; import org.jboss.mx.util.MBeanServerLocator; import org.jboss.virtual.VirtualFile; @@ -42,9 +41,9 @@ */ public class WebServiceRefHandler extends UnifiedWebServiceRefHandler implements WebServiceRefHandlerMBean { - public void setupWebServiceRef(Context encCtx, String encName, AnnotatedElement anElement, VirtualFile vfsRoot, Source metadata) throws NamingException + public void setupServiceRef(Context encCtx, String encName, AnnotatedElement anElement, VirtualFile vfsRoot, String xmlFragment) throws NamingException { - setupWebServiceRef(encCtx, encName, anElement, new VirtualFileAdaptor(vfsRoot), metadata); + setupServiceRef(encCtx, encName, anElement, new VirtualFileAdaptor(vfsRoot), xmlFragment); } public void create() throws Exception Modified: branches/tdiesler/trunk/integration-jboss50/src/java/org/jboss/ws/integration/jboss50/WebServiceRefHandlerMBean.java =================================================================== --- branches/tdiesler/trunk/integration-jboss50/src/java/org/jboss/ws/integration/jboss50/WebServiceRefHandlerMBean.java 2007-03-06 13:45:43 UTC (rev 2535) +++ branches/tdiesler/trunk/integration-jboss50/src/java/org/jboss/ws/integration/jboss50/WebServiceRefHandlerMBean.java 2007-03-06 15:20:12 UTC (rev 2536) @@ -27,7 +27,6 @@ import javax.management.ObjectName; import javax.naming.Context; import javax.naming.NamingException; -import javax.xml.transform.Source; import org.jboss.virtual.VirtualFile; import org.jboss.ws.core.utils.ObjectNameFactory; @@ -38,9 +37,9 @@ public interface WebServiceRefHandlerMBean { // default object name - public static final ObjectName OBJECT_NAME = ObjectNameFactory.create("jboss.ws:service=WebServiceRefHandler"); + public static final ObjectName OBJECT_NAME = ObjectNameFactory.create("jboss.ws:service=ServiceRefHandler"); /** Binds a JAXWS WebServiceRef into the callers ENC */ - void setupWebServiceRef(Context encCtx, String encName, AnnotatedElement enElement, VirtualFile vfsRoot, Source metadata) throws NamingException; + void setupServiceRef(Context encCtx, String encName, AnnotatedElement enElement, VirtualFile vfsRoot, String xmlFragment) throws NamingException; } Modified: branches/tdiesler/trunk/integration-jboss50/src/resources/jbossws.deployer/META-INF/jbossws-deployer-beans.xml =================================================================== --- branches/tdiesler/trunk/integration-jboss50/src/resources/jbossws.deployer/META-INF/jbossws-deployer-beans.xml 2007-03-06 13:45:43 UTC (rev 2535) +++ branches/tdiesler/trunk/integration-jboss50/src/resources/jbossws.deployer/META-INF/jbossws-deployer-beans.xml 2007-03-06 15:20:12 UTC (rev 2536) @@ -47,12 +47,9 @@ <property name="serviceEndpointServlet">org.jboss.ws.integration.jboss50.JBossServiceEndpointServlet</property> </bean> -  - <bean name="ServiceRefHandler" class="org.jboss.ws.integration.jboss50.ServiceRefHandler"/> +  + <bean name="ServiceRefHandler" class="org.jboss.ws.integration.jboss50.WebServiceRefHandler"/> -  - <bean name="WebServiceRefHandler" class="org.jboss.ws.integration.jboss50.WebServiceRefHandler"/> -  <bean name="SubscriptionManager" class="org.jboss.ws.extensions.eventing.mgmt.SubscriptionManager"/> Modified: branches/tdiesler/trunk/jbossws-core/src/java/org/jboss/ws/core/jaxrpc/client/ServiceImpl.java =================================================================== --- branches/tdiesler/trunk/jbossws-core/src/java/org/jboss/ws/core/jaxrpc/client/ServiceImpl.java 2007-03-06 13:45:43 UTC (rev 2535) +++ branches/tdiesler/trunk/jbossws-core/src/java/org/jboss/ws/core/jaxrpc/client/ServiceImpl.java 2007-03-06 15:20:12 UTC (rev 2536) @@ -27,12 +27,10 @@ import java.net.URL; import java.rmi.Remote; import java.util.ArrayList; -import java.util.Enumeration; import java.util.HashMap; import java.util.HashSet; import java.util.Iterator; import java.util.List; -import java.util.Properties; import java.util.Set; import javax.xml.namespace.QName; @@ -47,8 +45,10 @@ import org.jboss.logging.Logger; import org.jboss.ws.core.StubExt; import org.jboss.ws.metadata.builder.jaxrpc.JAXRPCClientMetaDataBuilder; -import org.jboss.ws.metadata.j2ee.UnifiedPortComponentRefMetaData; -import org.jboss.ws.metadata.j2ee.UnifiedServiceRefMetaData; +import org.jboss.ws.metadata.j2ee.serviceref.CallPropertyMetaData; +import org.jboss.ws.metadata.j2ee.serviceref.InitParamMetaData; +import org.jboss.ws.metadata.j2ee.serviceref.PortComponentRefMetaData; +import org.jboss.ws.metadata.j2ee.serviceref.ServiceRefMetaData; import org.jboss.ws.metadata.jaxrpcmapping.JavaWsdlMapping; import org.jboss.ws.metadata.umdm.EndpointMetaData; import org.jboss.ws.metadata.umdm.HandlerMetaData; @@ -57,7 +57,6 @@ import org.jboss.ws.metadata.umdm.ResourceLoaderAdapter; import org.jboss.ws.metadata.umdm.ServiceMetaData; import org.jboss.ws.metadata.umdm.UnifiedMetaData; -import org.jboss.ws.metadata.umdm.HandlerMetaData.HandlerInitParam; import org.jboss.ws.metadata.umdm.HandlerMetaData.HandlerType; import org.jboss.ws.metadata.wsse.WSSecurityConfiguration; @@ -83,7 +82,7 @@ // The optional WSDL location private URL wsdlLocation; // The <service-ref> meta data - private UnifiedServiceRefMetaData usrMetaData; + private ServiceRefMetaData usrMetaData; // The handler registry private HandlerRegistryImpl handlerRegistry; @@ -115,14 +114,14 @@ /** * Construct a Service that has access to some WSDL meta data */ - ServiceImpl(QName serviceName, URL wsdlURL, JavaWsdlMapping mappingURL, WSSecurityConfiguration securityConfig, UnifiedServiceRefMetaData usrMetaData) + ServiceImpl(QName serviceName, URL wsdlURL, JavaWsdlMapping mappingURL, WSSecurityConfiguration securityConfig, ServiceRefMetaData usrMetaData) { this.wsdlLocation = wsdlURL; this.usrMetaData = usrMetaData; JAXRPCClientMetaDataBuilder builder = new JAXRPCClientMetaDataBuilder(); ClassLoader ctxClassLoader = Thread.currentThread().getContextClassLoader(); - + serviceMetaData = builder.buildMetaData(serviceName, wsdlURL, mappingURL, securityConfig, usrMetaData, ctxClassLoader); handlerRegistry = new HandlerRegistryImpl(serviceMetaData); } @@ -419,37 +418,19 @@ // nothing to do if (usrMetaData == null) return; - + // General properties - Properties callProps = usrMetaData.getCallProperties(); - if (callProps != null) - { - Enumeration<?> names = callProps.propertyNames(); - while (names.hasMoreElements()) - { - String name = (String)names.nextElement(); - String value = callProps.getProperty(name); - call.setProperty(name, value); - } - } - + for (CallPropertyMetaData prop : usrMetaData.getCallProperties()) + call.setProperty(prop.getPropName(), prop.getPropValue()); + if (seiName != null) { - for (UnifiedPortComponentRefMetaData upcRef : usrMetaData.getPortComponentRefs()) + for (PortComponentRefMetaData upcRef : usrMetaData.getPortComponentRefs()) { if (seiName.equals(upcRef.getServiceEndpointInterface())) { - callProps = upcRef.getCallProperties(); - if (callProps != null) - { - Enumeration<?> names = callProps.propertyNames(); - while (names.hasMoreElements()) - { - String name = (String)names.nextElement(); - String value = callProps.getProperty(name); - call.setProperty(name, value); - } - } + for (CallPropertyMetaData prop : upcRef.getCallProperties()) + call.setProperty(prop.getPropName(), prop.getPropValue()); } } } @@ -482,7 +463,7 @@ handlerRoles.addAll(jaxrpcMetaData.getSoapRoles()); HashMap hConfig = new HashMap(); - for (HandlerInitParam param : jaxrpcMetaData.getInitParams()) + for (InitParamMetaData param : jaxrpcMetaData.getInitParams()) { hConfig.put(param.getParamName(), param.getParamValue()); } @@ -495,7 +476,8 @@ hConfig.put(HandlerType.class.getName(), jaxrpcMetaData.getHandlerType()); HandlerInfo info = new HandlerInfo(hClass, hConfig, headerArr); - if(log.isDebugEnabled()) log.debug("Adding client side handler to endpoint '" + portName + "': " + info); + if (log.isDebugEnabled()) + log.debug("Adding client side handler to endpoint '" + portName + "': " + info); handlerInfos.add(info); // register the handlers with the client engine Modified: branches/tdiesler/trunk/jbossws-core/src/java/org/jboss/ws/core/jaxrpc/client/ServiceObjectFactory.java =================================================================== --- branches/tdiesler/trunk/jbossws-core/src/java/org/jboss/ws/core/jaxrpc/client/ServiceObjectFactory.java 2007-03-06 13:45:43 UTC (rev 2535) +++ branches/tdiesler/trunk/jbossws-core/src/java/org/jboss/ws/core/jaxrpc/client/ServiceObjectFactory.java 2007-03-06 15:20:12 UTC (rev 2536) @@ -37,6 +37,7 @@ import java.rmi.Remote; import java.util.Hashtable; import java.util.List; +import java.util.Properties; import javax.naming.Context; import javax.naming.Name; @@ -54,8 +55,9 @@ import org.jboss.ws.core.server.ServiceEndpoint; import org.jboss.ws.core.server.ServiceEndpointManager; import org.jboss.ws.core.server.ServiceEndpointManagerFactory; -import org.jboss.ws.metadata.j2ee.UnifiedPortComponentRefMetaData; -import org.jboss.ws.metadata.j2ee.UnifiedServiceRefMetaData; +import org.jboss.ws.metadata.j2ee.serviceref.CallPropertyMetaData; +import org.jboss.ws.metadata.j2ee.serviceref.PortComponentRefMetaData; +import org.jboss.ws.metadata.j2ee.serviceref.ServiceRefMetaData; import org.jboss.ws.metadata.jaxrpcmapping.JavaWsdlMapping; import org.jboss.ws.metadata.umdm.EndpointMetaData; import org.jboss.ws.metadata.umdm.ServiceMetaData; @@ -102,13 +104,13 @@ Reference ref = (Reference)obj; // Unmarshall the ServiceRefMetaData - UnifiedServiceRefMetaData usrMetaData = null; + ServiceRefMetaData serviceRefMetaData = null; RefAddr metaRefAddr = ref.get(ServiceReferenceable.SERVICE_REF_META_DATA); ByteArrayInputStream bais = new ByteArrayInputStream((byte[])metaRefAddr.getContent()); try { ObjectInputStream ois = new ObjectInputStream(bais); - usrMetaData = (UnifiedServiceRefMetaData)ois.readObject(); + serviceRefMetaData = (ServiceRefMetaData)ois.readObject(); ois.close(); } catch (IOException ex) @@ -137,15 +139,15 @@ } ServiceImpl jaxrpcService = null; - URL wsdlLocation = usrMetaData.getWsdlLocation(); + URL wsdlLocation = serviceRefMetaData.getWsdlLocation(); if (wsdlLocation != null) { if(log.isDebugEnabled()) log.debug("Create jaxrpc service from wsdl"); // Create the actual service object - QName serviceName = usrMetaData.getServiceQName(); - JavaWsdlMapping javaWsdlMapping = (JavaWsdlMapping)usrMetaData.getJavaWsdlMapping(); - jaxrpcService = new ServiceImpl(serviceName, wsdlLocation, javaWsdlMapping, securityConfig, usrMetaData); + QName serviceName = serviceRefMetaData.getServiceQName(); + JavaWsdlMapping javaWsdlMapping = (JavaWsdlMapping)serviceRefMetaData.getJavaWsdlMapping(); + jaxrpcService = new ServiceImpl(serviceName, wsdlLocation, javaWsdlMapping, securityConfig, serviceRefMetaData); } else { @@ -153,9 +155,16 @@ jaxrpcService = new ServiceImpl(new QName(Constants.NS_JBOSSWS_URI, "AnonymousService")); } + ServiceMetaData serviceMetaData = jaxrpcService.getServiceMetaData(); + // Set any service level properties - ServiceMetaData serviceMetaData = jaxrpcService.getServiceMetaData(); - serviceMetaData.setProperties(usrMetaData.getCallProperties()); + if (serviceRefMetaData.getCallProperties().size() > 0) + { + Properties callProps = new Properties(); + serviceMetaData.setProperties(callProps); + for (CallPropertyMetaData prop : serviceRefMetaData.getCallProperties()) + callProps.setProperty(prop.getPropName(), prop.getPropValue()); + } // The web service client using a port-component-link, the contet is the URL to // the PortComponentLinkServlet that will return the actual endpoint address @@ -211,15 +220,13 @@ // load the service interface class ClassLoader contextCL = Thread.currentThread().getContextClassLoader(); - Class siClass = contextCL.loadClass(usrMetaData.getServiceInterface()); + Class siClass = contextCL.loadClass(serviceRefMetaData.getServiceInterface()); if (Service.class.isAssignableFrom(siClass) == false) throw new JAXRPCException("The service interface does not implement javax.xml.rpc.Service: " + siClass.getName()); // load all service endpoint interface classes - UnifiedPortComponentRefMetaData[] pcrArray = usrMetaData.getPortComponentRefs(); - for (int i = 0; i < pcrArray.length; i++) + for (PortComponentRefMetaData pcr : serviceRefMetaData.getPortComponentRefs()) { - UnifiedPortComponentRefMetaData pcr = pcrArray[i]; Class seiClass = contextCL.loadClass(pcr.getServiceEndpointInterface()); if (Remote.class.isAssignableFrom(seiClass) == false) throw new IllegalArgumentException("The SEI does not implement java.rmi.Remote: " + seiClass.getName()); Modified: branches/tdiesler/trunk/jbossws-core/src/java/org/jboss/ws/core/jaxrpc/client/ServiceReferenceable.java =================================================================== --- branches/tdiesler/trunk/jbossws-core/src/java/org/jboss/ws/core/jaxrpc/client/ServiceReferenceable.java 2007-03-06 13:45:43 UTC (rev 2535) +++ branches/tdiesler/trunk/jbossws-core/src/java/org/jboss/ws/core/jaxrpc/client/ServiceReferenceable.java 2007-03-06 15:20:12 UTC (rev 2536) @@ -26,7 +26,6 @@ import java.io.ByteArrayOutputStream; import java.io.IOException; -import java.io.InputStream; import java.io.ObjectOutputStream; import java.net.URL; @@ -37,12 +36,11 @@ import javax.naming.StringRefAddr; import org.jboss.logging.Logger; +import org.jboss.ws.core.UnifiedVirtualFile; import org.jboss.ws.core.server.ServiceEndpointManager; import org.jboss.ws.core.server.ServiceEndpointManagerFactory; -import org.jboss.ws.core.server.UnifiedDeploymentInfo; -import org.jboss.ws.metadata.j2ee.UnifiedPortComponentRefMetaData; -import org.jboss.ws.metadata.j2ee.UnifiedServiceRefMetaData; -import org.jboss.ws.metadata.j2ee.UnifiedWebMetaData; +import org.jboss.ws.metadata.j2ee.serviceref.PortComponentRefMetaData; +import org.jboss.ws.metadata.j2ee.serviceref.ServiceRefMetaData; import org.jboss.ws.metadata.wsse.WSSecurityConfiguration; import org.jboss.ws.metadata.wsse.WSSecurityOMFactory; @@ -61,25 +59,20 @@ private static Logger log = Logger.getLogger(ServiceReferenceable.class); public static final String SERVICE_REF_META_DATA = "SERVICE_REF_META_DATA"; - public static final String DEPLOYMENT_URL = "DEPLOYMENT_URL"; public static final String SECURITY_CONFIG = "SECURITY_CONFIG"; - public static final String DESCRIPTOR_LOC = "DESCRIPTOR_LOC"; public static final String PORT_COMPONENT_LINK = "PORT_COMPONENT_LINK"; public static final String PORT_COMPONENT_LINK_SERVLET = "PORT_COMPONENT_LINK_SERVLET"; - private UnifiedServiceRefMetaData refMetaData; - private UnifiedDeploymentInfo udi; + private ServiceRefMetaData refMetaData; + private UnifiedVirtualFile vfsRoot; /** * A service referenceable for a WSDL document that is part of the deployment - * - * @param refMetaData The service-ref meta data - * @param udi The client DeploymentInfo */ - public ServiceReferenceable(UnifiedServiceRefMetaData refMetaData, UnifiedDeploymentInfo udi) + public ServiceReferenceable(ServiceRefMetaData refMetaData) { this.refMetaData = refMetaData; - this.udi = udi; + this.vfsRoot = refMetaData.getVfsRoot(); } /** @@ -92,11 +85,6 @@ { Reference myRef = new Reference(ServiceReferenceable.class.getName(), ServiceObjectFactory.class.getName(), null); - // The deployment URL of the web service client deployment - // Add a reference to the client deployment URL - String deploymentID = udi.name; - myRef.add(new StringRefAddr(DEPLOYMENT_URL, deploymentID)); - // Add a reference to the ServiceRefMetaData and WSDLDefinitions myRef.add(new BinaryRefAddr(SERVICE_REF_META_DATA, marshallServiceRef())); @@ -105,10 +93,8 @@ myRef.add(new BinaryRefAddr(SECURITY_CONFIG, marshallSecurityConfig())); // Add references to port component links - UnifiedPortComponentRefMetaData[] pcrArr = refMetaData.getPortComponentRefs(); - for (int i = 0; i < pcrArr.length; i++) + for (PortComponentRefMetaData pcr : refMetaData.getPortComponentRefs()) { - UnifiedPortComponentRefMetaData pcr = pcrArr[i]; String pcLink = pcr.getPortComponentLink(); if (pcLink != null) { @@ -161,8 +147,8 @@ try { ObjectOutputStream oos = new ObjectOutputStream(baos); - URL vfConfig = getSecurityConfig(); - WSSecurityConfiguration securityConfig = WSSecurityOMFactory.newInstance().parse(vfConfig); + WSSecurityOMFactory factory = WSSecurityOMFactory.newInstance(); + WSSecurityConfiguration securityConfig = factory.parse(getSecurityConfig()); oos.writeObject(securityConfig); oos.close(); } @@ -175,19 +161,23 @@ private URL getSecurityConfig() { - String descriptorPath = udi.metaData instanceof UnifiedWebMetaData ? "WEB-INF" : "META-INF"; - descriptorPath = descriptorPath + "/" + WSSecurityOMFactory.CLIENT_RESOURCE_NAME; + URL securityConfigURL = null; try { - URL vfConfig = udi.getMetaDataFileURL(descriptorPath); - InputStream inputStream = vfConfig.openStream(); - inputStream.close(); - return vfConfig; + vfsRoot.findChild("WEB-INF/" + WSSecurityOMFactory.CLIENT_RESOURCE_NAME); } catch (IOException ex) { - if(log.isDebugEnabled()) log.debug("Cannot find security config: " + descriptorPath); - return null; + // ignore } + try + { + vfsRoot.findChild("META-INF/" + WSSecurityOMFactory.CLIENT_RESOURCE_NAME); + } + catch (IOException ex) + { + // ignore + } + return securityConfigURL; } } \ No newline at end of file Modified: branches/tdiesler/trunk/jbossws-core/src/java/org/jboss/ws/core/jaxrpc/handler/HandlerDelegateJAXRPC.java =================================================================== --- branches/tdiesler/trunk/jbossws-core/src/java/org/jboss/ws/core/jaxrpc/handler/HandlerDelegateJAXRPC.java 2007-03-06 13:45:43 UTC (rev 2535) +++ branches/tdiesler/trunk/jbossws-core/src/java/org/jboss/ws/core/jaxrpc/handler/HandlerDelegateJAXRPC.java 2007-03-06 15:20:12 UTC (rev 2536) @@ -38,10 +38,10 @@ import org.jboss.ws.core.server.ServiceEndpointInfo; import org.jboss.ws.core.soap.MessageContextAssociation; import org.jboss.ws.extensions.xop.XOPContext; +import org.jboss.ws.metadata.j2ee.serviceref.InitParamMetaData; import org.jboss.ws.metadata.umdm.HandlerMetaData; import org.jboss.ws.metadata.umdm.HandlerMetaDataJAXRPC; import org.jboss.ws.metadata.umdm.ServerEndpointMetaData; -import org.jboss.ws.metadata.umdm.HandlerMetaData.HandlerInitParam; import org.jboss.ws.metadata.umdm.HandlerMetaData.HandlerType; /** Delegates to JAXRPC handlers @@ -158,7 +158,7 @@ handlerRoles.addAll(jaxrpcMetaData.getSoapRoles()); HashMap<String, Object> hConfig = new HashMap<String, Object>(); - for (HandlerInitParam param : jaxrpcMetaData.getInitParams()) + for (InitParamMetaData param : jaxrpcMetaData.getInitParams()) { hConfig.put(param.getParamName(), param.getParamValue()); } Deleted: branches/tdiesler/trunk/jbossws-core/src/java/org/jboss/ws/core/jaxws/ServiceRefHandlerJAXWS.java =================================================================== --- branches/tdiesler/trunk/jbossws-core/src/java/org/jboss/ws/core/jaxws/ServiceRefHandlerJAXWS.java 2007-03-06 13:45:43 UTC (rev 2535) +++ branches/tdiesler/trunk/jbossws-core/src/java/org/jboss/ws/core/jaxws/ServiceRefHandlerJAXWS.java 2007-03-06 15:20:12 UTC (rev 2536) @@ -1,185 +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.core.jaxws; - -// $Id$ - -import java.lang.annotation.Annotation; -import java.lang.reflect.AnnotatedElement; -import java.lang.reflect.Field; -import java.lang.reflect.Method; -import java.net.MalformedURLException; -import java.net.URL; -import java.util.ArrayList; -import java.util.List; - -import javax.jws.HandlerChain; -import javax.naming.Context; -import javax.naming.NamingException; -import javax.xml.ws.Service; -import javax.xml.ws.WebServiceRef; -import javax.xml.ws.WebServiceRefs; - -import org.jboss.logging.Logger; -import org.jboss.util.naming.Util; -import org.jboss.ws.WSException; -import org.jboss.ws.core.UnifiedVirtualFile; -import org.jboss.ws.core.jaxws.client.ServiceReferenceable; -import org.jboss.ws.core.jaxws.client.UnifiedServiceRef; - -/** - * Binds a JAXWS Service object in the client's ENC - * - * @author Thomas.Diesler(a)jboss.org - * @since 17-Jan-2007 - */ -public class ServiceRefHandlerJAXWS -{ - // logging support - private static Logger log = Logger.getLogger(ServiceRefHandlerJAXWS.class); - - public void setupServiceRef(Context encCtx, String encName, AnnotatedElement anElement, UnifiedVirtualFile vfsRoot, String xmlFragment) throws NamingException - { - WebServiceRef wsref = null; - - // Build the list of @WebServiceRef relevant annotations - List<WebServiceRef> wsrefList = new ArrayList<WebServiceRef>(); - for (Annotation an : anElement.getAnnotations()) - { - if (an instanceof WebServiceRef) - wsrefList.add((WebServiceRef)an); - - if (an instanceof WebServiceRefs) - { - WebServiceRefs wsrefs = (WebServiceRefs)an; - for (WebServiceRef aux : wsrefs.value()) - wsrefList.add(aux); - } - } - - // Use the single @WebServiceRef - if (wsrefList.size() == 1) - { - wsref = wsrefList.get(0); - } - else - { - for (WebServiceRef aux : wsrefList) - { - if (encName.endsWith("/" + aux.name())) - { - wsref = aux; - break; - } - } - } - - if (wsref == null) - throw new IllegalArgumentException("@WebServiceRef must be present on: " + anElement); - - Class targetClass = null; - if (anElement instanceof Field) - targetClass = ((Field)anElement).getType(); - else if (anElement instanceof Method) - targetClass = ((Method)anElement).getParameterTypes()[0]; - - String externalName = encCtx.getNameInNamespace() + "/" + encName; - String targetClassName = (targetClass != null ? targetClass.getName() : null); - log.debug("setupWebServiceRef [jndi=" + externalName + ",target=" + targetClassName + "]"); - - String serviceClassName = null; - - // #1 Use the explicit @WebServiceRef.value - if (wsref.value() != Object.class) - serviceClassName = wsref.value().getName(); - - // #2 Use the target ref type - if (serviceClassName == null && targetClass != null && Service.class.isAssignableFrom(targetClass)) - serviceClassName = targetClass.getName(); - - // #3 Use javax.xml.ws.Service - if (serviceClassName == null) - serviceClassName = Service.class.getName(); - - // #1 Use the explicit @WebServiceRef.type - if (wsref.type() != Object.class) - targetClassName = wsref.type().getName(); - - // #2 Use the target ref type - if (targetClassName == null && targetClass != null && Service.class.isAssignableFrom(targetClass) == false) - targetClassName = targetClass.getName(); - - try - { - UnifiedServiceRefObjectFactory factory = UnifiedServiceRefObjectFactory.newInstance(); - UnifiedServiceRef usRef = factory.parse(xmlFragment); - usRef.setRootFile(vfsRoot); - - // Set the wsdlLocation if there is no override already - if (usRef.getWsdlLocation() == null && wsref.wsdlLocation().length() > 0) - usRef.setWsdlLocation(wsref.wsdlLocation()); - - // Set the handlerChain from @HandlerChain on the annotated element - String handlerChain = usRef.getHandlerChain(); - HandlerChain anHandlerChain = anElement.getAnnotation(HandlerChain.class); - if (handlerChain == null && anHandlerChain != null && anHandlerChain.file().length() > 0) - handlerChain = anHandlerChain.file(); - - // Resolve path to handler chain - if (handlerChain != null) - { - try - { - new URL(handlerChain); - } - catch (MalformedURLException ex) - { - Class declaringClass = null; - if (anElement instanceof Field) - declaringClass = ((Field)anElement).getDeclaringClass(); - else if (anElement instanceof Method) - declaringClass = ((Method)anElement).getDeclaringClass(); - else if (anElement instanceof Class) - declaringClass = (Class)anElement; - - handlerChain = declaringClass.getPackage().getName().replace('.', '/') + "/" + handlerChain; - } - - usRef.setHandlerChain(handlerChain); - } - - // Do not use rebind, the binding should be unique - // [JBWS-1499] - Revisit WebServiceRefHandler JNDI rebind - Util.rebind(encCtx, encName, new ServiceReferenceable(serviceClassName, targetClassName, usRef)); - - log.debug("<service-ref> bound to: java:comp/env/" + encName); - } - catch (RuntimeException rte) - { - throw rte; - } - catch (Exception ex) - { - throw new WSException("Cannot bind web service ref: " + encName, ex); - } - } -} Deleted: branches/tdiesler/trunk/jbossws-core/src/java/org/jboss/ws/core/jaxws/UnifiedServiceRefObjectFactory.java =================================================================== --- branches/tdiesler/trunk/jbossws-core/src/java/org/jboss/ws/core/jaxws/UnifiedServiceRefObjectFactory.java 2007-03-06 13:45:43 UTC (rev 2535) +++ branches/tdiesler/trunk/jbossws-core/src/java/org/jboss/ws/core/jaxws/UnifiedServiceRefObjectFactory.java 2007-03-06 15:20:12 UTC (rev 2536) @@ -1,173 +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.core.jaxws; - -import java.io.ByteArrayInputStream; -import java.io.InputStream; - -import javax.xml.namespace.QName; - -import org.jboss.ws.WSException; -import org.jboss.ws.core.jaxws.client.NameValuePair; -import org.jboss.ws.core.jaxws.client.PortInfo; -import org.jboss.ws.core.jaxws.client.UnifiedServiceRef; -import org.jboss.xb.binding.ObjectModelFactory; -import org.jboss.xb.binding.Unmarshaller; -import org.jboss.xb.binding.UnmarshallerFactory; -import org.jboss.xb.binding.UnmarshallingContext; -import org.xml.sax.Attributes; - -/** - * An ObjectModelFactory for UnifiedServiceRef - * - * @author Thomas.Diesler(a)jboss.org - * @since 17-Jan-2007 - */ -public class UnifiedServiceRefObjectFactory implements ObjectModelFactory -{ - // Hide constructor - private UnifiedServiceRefObjectFactory() - { - } - - public static UnifiedServiceRefObjectFactory newInstance() - { - return new UnifiedServiceRefObjectFactory(); - } - - public UnifiedServiceRef parse(String xmlFragment) - { - try - { - InputStream is = new ByteArrayInputStream(xmlFragment.getBytes()); - Unmarshaller unmarshaller = UnmarshallerFactory.newInstance().newUnmarshaller(); - return (UnifiedServiceRef)unmarshaller.unmarshal(is, this, null); - } - catch (Exception ex) - { - WSException.rethrow(ex); - return null; - } - } - - public Object newRoot(Object root, UnmarshallingContext navigator, String namespaceURI, String localName, Attributes attrs) - { - return new UnifiedServiceRef(); - } - - public Object completeRoot(Object root, UnmarshallingContext ctx, String uri, String name) - { - return root; - } - - public void setValue(UnifiedServiceRef ref, UnmarshallingContext navigator, String namespaceURI, String localName, String value) - { - if (localName.equals("service-ref-name")) - { - ref.setServiceRefName(value); - } - else if (localName.equals("service-class-name")) - { - ref.setServiceClassName(value); - } - else if (localName.equals("service-qname")) - { - ref.setServiceQName(QName.valueOf(value)); - } - else if (localName.equals("config-name")) - { - ref.setConfigName(value); - } - else if (localName.equals("config-file")) - { - ref.setConfigFile(value); - } - else if (localName.equals("handler-chain")) - { - ref.setHandlerChain(value); - } - else if (localName.equals("wsdl-override")) - { - ref.setWsdlLocation(value); - } - } - - public Object newChild(UnifiedServiceRef parent, UnmarshallingContext navigator, String namespaceURI, String localName, Attributes attrs) - { - Object child = null; - - if (localName.equals("port-info")) - child = new PortInfo(parent); - - return child; - } - - public void addChild(UnifiedServiceRef parent, PortInfo portInfo, UnmarshallingContext navigator, String namespaceURI, String localName) - { - parent.getPortInfos().add(portInfo); - } - - public void setValue(PortInfo portInfo, UnmarshallingContext navigator, String namespaceURI, String localName, String value) - { - if (localName.equals("service-endpoint-interface")) - { - portInfo.setServiceEndpointInterface(value); - } - else if (localName.equals("port-qname")) - { - portInfo.setPortQName(QName.valueOf(value)); - } - else if (localName.equals("config-name")) - { - portInfo.setConfigName(value); - } - else if (localName.equals("config-file")) - { - portInfo.setConfigFile(value); - } - } - - public Object newChild(PortInfo portInfo, UnmarshallingContext navigator, String namespaceURI, String localName, Attributes attrs) - { - Object child = null; - if (localName.equals("stub-property")) - child = new NameValuePair(); - return child; - } - - public void addChild(PortInfo parent, NameValuePair stubProp, UnmarshallingContext navigator, String namespaceURI, String localName) - { - parent.getStubProperties().add(stubProp); - } - - public void setValue(NameValuePair nvPair, UnmarshallingContext navigator, String namespaceURI, String localName, String value) - { - if (localName.equals("name")) - { - nvPair.setName(value); - } - else if (localName.equals("value")) - { - nvPair.setValue(value); - } - } -} Deleted: branches/tdiesler/trunk/jbossws-core/src/java/org/jboss/ws/core/jaxws/client/PortInfo.java =================================================================== --- branches/tdiesler/trunk/jbossws-core/src/java/org/jboss/ws/core/jaxws/client/PortInfo.java 2007-03-06 13:45:43 UTC (rev 2535) +++ branches/tdiesler/trunk/jbossws-core/src/java/org/jboss/ws/core/jaxws/client/PortInfo.java 2007-03-06 15:20:12 UTC (rev 2536) @@ -1,102 +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.core.jaxws.client; - -//$Id$ - -import java.io.Serializable; -import java.util.ArrayList; -import java.util.List; - -import javax.xml.namespace.QName; - -/** - * Represents a <port-info> element in <service-ref> - * - * @author Thomas.Diesler(a)jboss.com - */ -public class PortInfo implements Serializable -{ - private static final long serialVersionUID = -5517739021682888778L; - - private UnifiedServiceRef serviceRef; - private String serviceEndpointInterface; - private QName portQName; - private String configName; - private String configFile; - private List<NameValuePair> stubProperties = new ArrayList<NameValuePair>(); - - public PortInfo(UnifiedServiceRef serviceRef) - { - this.serviceRef = serviceRef; - } - - public UnifiedServiceRef getServiceRef() - { - return serviceRef; - } - - public QName getPortQName() - { - return portQName; - } - - public void setPortQName(QName portName) - { - this.portQName = portName; - } - - public String getServiceEndpointInterface() - { - return serviceEndpointInterface; - } - - public void setServiceEndpointInterface(String serviceEndpointInterface) - { - this.serviceEndpointInterface = serviceEndpointInterface; - } - - public String getConfigFile() - { - return configFile; - } - - public void setConfigFile(String configFile) - { - this.configFile = configFile; - } - - public String getConfigName() - { - return configName; - } - - public void setConfigName(String configName) - { - this.configName = configName; - } - - public List<NameValuePair> getStubProperties() - { - return stubProperties; - } -} Modified: branches/tdiesler/trunk/jbossws-core/src/java/org/jboss/ws/core/jaxws/client/ServiceObjectFactory.java =================================================================== --- branches/tdiesler/trunk/jbossws-core/src/java/org/jboss/ws/core/jaxws/client/ServiceObjectFactory.java 2007-03-06 13:45:43 UTC (rev 2535) +++ branches/tdiesler/trunk/jbossws-core/src/java/org/jboss/ws/core/jaxws/client/ServiceObjectFactory.java 2007-03-06 15:20:12 UTC (rev 2536) @@ -25,13 +25,11 @@ // $Id$ import java.io.ByteArrayInputStream; -import java.io.File; import java.io.IOException; import java.io.ObjectInputStream; import java.lang.reflect.Constructor; import java.lang.reflect.InvocationTargetException; import java.lang.reflect.Method; -import java.net.MalformedURLException; import java.net.URL; import java.util.Hashtable; @@ -47,7 +45,7 @@ import org.jboss.logging.Logger; import org.jboss.ws.WSException; import org.jboss.ws.core.ConfigProvider; -import org.jboss.ws.core.UnifiedVirtualFile; +import org.jboss.ws.metadata.j2ee.serviceref.ServiceRefMetaData; /** * This ServiceObjectFactory reconstructs a javax.xml.ws.Service @@ -61,8 +59,8 @@ // provide logging private static final Logger log = Logger.getLogger(ServiceObjectFactory.class); - // The UnifiedServiceRef association - private static ThreadLocal serviceRefAssociation = new ThreadLocal(); + // The ServiceRefMetaData association + private static ThreadLocal<ServiceRefMetaData> serviceRefAssociation = new ThreadLocal<ServiceRefMetaData>(); /** * Creates an object using the location or reference information specified. @@ -94,23 +92,23 @@ String targetClassName = (String)ref.get(ServiceReferenceable.TARGET_CLASS_NAME).getContent(); // Unmarshall the UnifiedServiceRef - UnifiedServiceRef usRef = unmarshallServiceRef(ref); - String serviceRefName = usRef.getServiceRefName(); - QName serviceQName = usRef.getServiceQName(); + ServiceRefMetaData serviceRef = unmarshallServiceRef(ref); + String serviceRefName = serviceRef.getServiceRefName(); + QName serviceQName = serviceRef.getServiceQName(); - String serviceClassName = usRef.getServiceClassName(); - if (serviceClassName == null) - serviceClassName = (String)ref.get(ServiceReferenceable.SERVICE_CLASS_NAME).getContent(); + String serviceInterface = serviceRef.getServiceInterface(); + if (serviceInterface == null) + serviceInterface = (String)ref.get(ServiceReferenceable.SERVICE_CLASS_NAME).getContent(); // If the target defaults to javax.xml.ws.Service, user the service as the target if (Service.class.getName().equals(targetClassName)) - targetClassName = serviceClassName; + targetClassName = serviceInterface; - if(log.isDebugEnabled()) log.debug("[name=" + serviceRefName + ",service=" + serviceClassName + ",target=" + targetClassName + "]"); + if(log.isDebugEnabled()) log.debug("[name=" + serviceRefName + ",service=" + serviceInterface + ",target=" + targetClassName + "]"); // Load the service class ClassLoader ctxLoader = Thread.currentThread().getContextClassLoader(); - Class serviceClass = ctxLoader.loadClass(serviceClassName); + Class serviceClass = ctxLoader.loadClass(serviceInterface); Class targetClass = (targetClassName != null ? ctxLoader.loadClass(targetClassName) : null); if (Service.class.isAssignableFrom(serviceClass) == false) @@ -120,12 +118,11 @@ Object target; // Get the URL to the wsdl - URL wsdlURL = getWsdlLocationURL(targetClass != null ? targetClass : serviceClass, usRef); - + URL wsdlURL = serviceRef.getWsdlLocation(); try { - // Associate the UnifiedServiceRef with this thread - serviceRefAssociation.set(usRef); + // Associate the ServiceRefMetaData with this thread + serviceRefAssociation.set(serviceRef); // Generic javax.xml.ws.Service if (serviceClass == Service.class) @@ -159,9 +156,9 @@ } // Configure the service - configureService((Service)target, usRef); + configureService((Service)target, serviceRef); - if (targetClassName != null && targetClassName.equals(serviceClassName) == false) + if (targetClassName != null && targetClassName.equals(serviceInterface) == false) { try { @@ -203,16 +200,16 @@ } } - public static UnifiedServiceRef getUnifiedServiceRefAssociation() + public static ServiceRefMetaData getServiceRefAssociation() { // The ServiceDelegateImpl get the usRef at ctor time - return (UnifiedServiceRef)serviceRefAssociation.get(); + return (ServiceRefMetaData)serviceRefAssociation.get(); } - private void configureService(Service service, UnifiedServiceRef usRef) + private void configureService(Service service, ServiceRefMetaData serviceRef) { - String configFile = usRef.getConfigFile(); - String configName = usRef.getConfigName(); + String configFile = serviceRef.getConfigFile(); + String configName = serviceRef.getConfigName(); if (service instanceof ConfigProvider) { if(log.isDebugEnabled()) log.debug("Configure Service: [configName=" + configName + ",configFile=" + configFile + "]"); @@ -223,15 +220,15 @@ } } - private UnifiedServiceRef unmarshallServiceRef(Reference ref) throws ClassNotFoundException, NamingException + private ServiceRefMetaData unmarshallServiceRef(Reference ref) throws ClassNotFoundException, NamingException { - UnifiedServiceRef sref; - RefAddr refAddr = ref.get(ServiceReferenceable.UNIFIED_SERVICE_REF); + ServiceRefMetaData sref; + RefAddr refAddr = ref.get(ServiceReferenceable.SERVICE_REF_META_DATA); ByteArrayInputStream bais = new ByteArrayInputStream((byte[])refAddr.getContent()); try { ObjectInputStream ois = new ObjectInputStream(bais); - sref = (UnifiedServiceRef)ois.readObject(); + sref = (ServiceRefMetaData)ois.readObject(); ois.close(); } catch (IOException e) @@ -240,71 +237,4 @@ } return sref; } - - private URL getWsdlLocationURL(Class userClass, UnifiedServiceRef usRef) - { - UnifiedVirtualFile vfsRoot = usRef.getRootFile(); - String wsdlLocation = usRef.getWsdlLocation(); - - URL wsdlURL = null; - if (wsdlLocation != null) - { - // Try the wsdlLocation as URL - try - { - wsdlURL = new URL(wsdlLocation); - } - catch (MalformedURLException ex) - { - // ignore - } - - // Try the filename as File - if (wsdlURL == null) - { - try - { - File file = new File(wsdlLocation); - if (file.exists()) - wsdlURL = file.toURL(); - } - catch (MalformedURLException e) - { - // ignore - } - } - - // Try the filename as Resource - if (wsdlURL == null) - { - try - { - wsdlURL = vfsRoot.findChild(wsdlLocation).toURL(); - } - catch (Exception ex) - { - // ignore - } - } - - // Try the filename relative to class - if (wsdlURL == null) - { - String packagePath = userClass.getPackage().getName().replace('.', '/'); - String wsdlPath = packagePath + "/" + wsdlLocation; - try - { - wsdlURL = vfsRoot.findChild(wsdlPath).toURL(); - } - catch (Exception ex) - { - // ignore - } - } - - if (wsdlURL == null) - throw new IllegalArgumentException("Cannot get URL for: " + wsdlLocation); - } - return wsdlURL; - } } Modified: branches/tdiesler/trunk/jbossws-core/src/java/org/jboss/ws/core/jaxws/client/ServiceReferenceable.java =================================================================== --- branches/tdiesler/trunk/jbossws-core/src/java/org/jboss/ws/core/jaxws/client/ServiceReferenceable.java 2007-03-06 13:45:43 UTC (rev 2535) +++ branches/tdiesler/trunk/jbossws-core/src/java/org/jboss/ws/core/jaxws/client/ServiceReferenceable.java 2007-03-06 15:20:12 UTC (rev 2536) @@ -34,7 +34,9 @@ import javax.naming.Referenceable; import javax.naming.StringRefAddr; +import org.jboss.ws.metadata.j2ee.serviceref.ServiceRefMetaData; + /** * A JNDI reference to a javax.xml.ws.Service * @@ -46,19 +48,19 @@ */ public class ServiceReferenceable implements Referenceable { - public static final String UNIFIED_SERVICE_REF = "UNIFIED_SERVICE_REF"; + public static final String SERVICE_REF_META_DATA = "SERVICE_REF_META_DATA"; public static final String SERVICE_CLASS_NAME = "SERVICE_CLASS_NAME"; public static final String TARGET_CLASS_NAME = "TARGET_CLASS_NAME"; private String serviceClassName; private String targetClassName; - private UnifiedServiceRef usRef; + private ServiceRefMetaData serviceRef; - public ServiceReferenceable(String serviceClassName, String targetClassName, UnifiedServiceRef usRef) + public ServiceReferenceable(String serviceClassName, String targetClassName, ServiceRefMetaData serviceRef) { this.serviceClassName = serviceClassName; this.targetClassName = targetClassName; - this.usRef = usRef; + this.serviceRef = serviceRef; } /** @@ -73,7 +75,7 @@ myRef.add(new StringRefAddr(SERVICE_CLASS_NAME, serviceClassName)); myRef.add(new StringRefAddr(TARGET_CLASS_NAME, targetClassName)); - myRef.add(new BinaryRefAddr(UNIFIED_SERVICE_REF, marshall(usRef))); + myRef.add(new BinaryRefAddr(SERVICE_REF_META_DATA, marshall(serviceRef))); return myRef; } Deleted: branches/tdiesler/trunk/jbossws-core/src/java/org/jboss/ws/core/jaxws/client/UnifiedServiceRef.java =================================================================== --- branches/tdiesler/trunk/jbossws-core/src/java/org/jboss/ws/core/jaxws/client/UnifiedServiceRef.java 2007-03-06 13:45:43 UTC (rev 2535) +++ branches/tdiesler/trunk/jbossws-core/src/java/org/jboss/ws/core/jaxws/client/UnifiedServiceRef.java 2007-03-06 15:20:12 UTC (rev 2536) @@ -1,147 +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.core.jaxws.client; - -//$Id$ - -import java.io.Serializable; -import java.util.ArrayList; -import java.util.List; - -import javax.xml.namespace.QName; - -import org.jboss.ws.core.UnifiedVirtualFile; - -/** - * Represents a <service-ref> element of the jboss.xml, jboss-web.xml, jboss-client.xml - * - * @author Thomas.Diesler(a)jboss.com - * @since 16-Dec-2006 - */ -public class UnifiedServiceRef implements Serializable -{ - private static final long serialVersionUID = -6242639118713373752L; - - private UnifiedVirtualFile vfsRoot; - private String serviceRefName; - private String serviceClassName; - private QName serviceQName; - private String configName; - private String configFile; - private String handlerChain; - private List<PortInfo> portInfos = new ArrayList<PortInfo>(); - private String wsdlLocation; - - public UnifiedVirtualFile getRootFile() - { - return vfsRoot; - } - - public void setRootFile(UnifiedVirtualFile vfsRoot) - { - this.vfsRoot = vfsRoot; - } - - public String getServiceRefName() - { - return serviceRefName; - } - - public void setServiceRefName(String name) - { - this.serviceRefName = name; - } - - public String getServiceClassName() - { - return serviceClassName; - } - - public void setServiceClassName(String serviceClassName) - { - this.serviceClassName = serviceClassName; - } - - public QName getServiceQName() - { - return serviceQName; - } - - public void setServiceQName(QName serviceQName) - { - this.serviceQName = serviceQName; - } - - public String getConfigFile() - { - return configFile; - } - - public void setConfigFile(String configFile) - { - this.configFile = configFile; - } - - public String getConfigName() - { - return configName; - } - - public void setConfigName(String configName) - { - this.configName = configName; - } - - public String getHandlerChain() - { - return handlerChain; - } - - public void setHandlerChain(String handlerChain) - { - this.handlerChain = handlerChain; - } - - public List<PortInfo> getPortInfos() - { - return portInfos; - } - - public String getWsdlLocation() - { - return wsdlLocation; - } - - public void setWsdlLocation(String wsdlLocation) - { - this.wsdlLocation = wsdlLocation; - } - - public String toString() - { - StringBuffer sb = new StringBuffer(100); - sb.append("["); - sb.append("name=").append(serviceRefName); - sb.append("]"); - return sb.toString(); - } -} Modified: branches/tdiesler/trunk/jbossws-core/src/java/org/jboss/ws/core/jaxws/spi/ServiceDelegateImpl.java =================================================================== --- branches/tdiesler/trunk/jbossws-core/src/java/org/jboss/ws/core/jaxws/spi/ServiceDelegateImpl.java 2007-03-06 13:45:43 UTC (rev 2535) +++ branches/tdiesler/trunk/jbossws-core/src/java/org/jboss/ws/core/jaxws/spi/ServiceDelegateImpl.java 2007-03-06 15:20:12 UTC (rev 2536) @@ -52,12 +52,12 @@ import org.jboss.ws.core.jaxws.client.ClientImpl; import org.jboss.ws.core.jaxws.client.ClientProxy; import org.jboss.ws.core.jaxws.client.DispatchImpl; -import org.jboss.ws.core.jaxws.client.NameValuePair; -import org.jboss.ws.core.jaxws.client.PortInfo; import org.jboss.ws.core.jaxws.client.ServiceObjectFactory; -import org.jboss.ws.core.jaxws.client.UnifiedServiceRef; import org.jboss.ws.core.jaxws.handler.HandlerResolverImpl; import org.jboss.ws.metadata.builder.jaxws.JAXWSClientMetaDataBuilder; +import org.jboss.ws.metadata.j2ee.serviceref.PortComponentRefMetaData; +import org.jboss.ws.metadata.j2ee.serviceref.ServiceRefMetaData; +import org.jboss.ws.metadata.j2ee.serviceref.StubPropertyMetaData; import org.jboss.ws.metadata.umdm.ClientEndpointMetaData; import org.jboss.ws.metadata.umdm.EndpointMetaData; import org.jboss.ws.metadata.umdm.ResourceLoaderAdapter; @@ -83,8 +83,8 @@ private static ExecutorService defaultExecutor = Executors.newCachedThreadPool(); // The service meta data that is associated with this JAXWS Service private ServiceMetaData serviceMetaData; - // The UnifiedServiceRef supplied by the ServiceObjectFactory - private UnifiedServiceRef usRef; + // The ServiceRefMetaData supplied by the ServiceObjectFactory + private ServiceRefMetaData usRef; // The handler resolver private HandlerResolver handlerResolver = new HandlerResolverImpl(); // The executor service @@ -95,11 +95,11 @@ public ServiceDelegateImpl(URL wsdlURL, QName serviceName) { - usRef = ServiceObjectFactory.getUnifiedServiceRefAssociation(); + usRef = ServiceObjectFactory.getServiceRefAssociation(); UnifiedVirtualFile vfsRoot; if(usRef!=null) - vfsRoot = usRef.getRootFile(); + vfsRoot = usRef.getVfsRoot(); else vfsRoot = new ResourceLoaderAdapter(); @@ -351,7 +351,7 @@ String seiName = epMetaData.getServiceEndpointInterfaceName(); QName portName = epMetaData.getPortName(); - if(usRef == null || usRef.getPortInfos().size() == 0) + if(usRef == null || usRef.getPortComponentRefs().size() == 0) { if(log.isDebugEnabled()) log.debug("No port configuration for: " + portName); return; @@ -361,7 +361,7 @@ String configName = usRef.getConfigName(); boolean match = false; - for (PortInfo pi : usRef.getPortInfos()) + for (PortComponentRefMetaData pi : usRef.getPortComponentRefs()) { String piSEI = pi.getServiceEndpointInterface(); QName piPort = pi.getPortQName(); @@ -382,10 +382,10 @@ BindingProvider bp = (BindingProvider)stub; Map<String, Object> reqCtx = bp.getRequestContext(); - for (NameValuePair nvp : pi.getStubProperties()) + for (StubPropertyMetaData prop : pi.getStubProperties()) { - if(log.isDebugEnabled()) log.debug("Set stub property: " + nvp); - reqCtx.put(nvp.getName(), nvp.getValue()); + log.debug("Set stub property: " + prop); + reqCtx.put(prop.getPropName(), prop.getPropValue()); } break; } Modified: branches/tdiesler/trunk/jbossws-core/src/java/org/jboss/ws/metadata/builder/jaxrpc/JAXRPCClientMetaDataBuilder.java =================================================================== --- branches/tdiesler/trunk/jbossws-core/src/java/org/jboss/ws/metadata/builder/jaxrpc/JAXRPCClientMetaDataBuilder.java 2007-03-06 13:45:43 UTC (rev 2535) +++ branches/tdiesler/trunk/jbossws-core/src/java/org/jboss/ws/metadata/builder/jaxrpc/JAXRPCClientMetaDataBuilder.java 2007-03-06 15:20:12 UTC (rev 2536) @@ -33,8 +33,8 @@ import org.jboss.ws.Constants; import org.jboss.ws.WSException; import org.jboss.ws.core.UnifiedVirtualFile; -import org.jboss.ws.metadata.j2ee.UnifiedHandlerMetaData; -import org.jboss.ws.metadata.j2ee.UnifiedServiceRefMetaData; +import org.jboss.ws.metadata.j2ee.serviceref.HandlerMetaData; +import org.jboss.ws.metadata.j2ee.serviceref.ServiceRefMetaData; import org.jboss.ws.metadata.jaxrpcmapping.JavaWsdlMapping; import org.jboss.ws.metadata.jaxrpcmapping.JavaWsdlMappingFactory; import org.jboss.ws.metadata.jaxrpcmapping.ServiceEndpointInterfaceMapping; @@ -66,7 +66,7 @@ /** Build from WSDL and jaxrpc-mapping.xml */ public ServiceMetaData buildMetaData(QName serviceQName, URL wsdlURL, URL mappingURL, URL securityURL, - UnifiedServiceRefMetaData serviceRefMetaData, ClassLoader loader) + ServiceRefMetaData serviceRefMetaData, ClassLoader loader) { try { @@ -98,7 +98,7 @@ /** Build from WSDL and jaxrpc-mapping.xml */ public ServiceMetaData buildMetaData(QName serviceQName, URL wsdlURL, JavaWsdlMapping javaWsdlMapping, WSSecurityConfiguration securityConfig, - UnifiedServiceRefMetaData usrMetaData, ClassLoader loader) + ServiceRefMetaData usrMetaData, ClassLoader loader) { if(log.isDebugEnabled()) log.debug("START buildMetaData: [service=" + serviceQName + "]"); try @@ -150,7 +150,7 @@ } private void buildMetaDataInternal(ServiceMetaData serviceMetaData, WSDLDefinitions wsdlDefinitions, JavaWsdlMapping javaWsdlMapping, - UnifiedServiceRefMetaData serviceRefMetaData) throws IOException + ServiceRefMetaData serviceRefMetaData) throws IOException { QName serviceQName = serviceMetaData.getServiceName(); @@ -219,12 +219,12 @@ } } - private void setupHandlers(UnifiedServiceRefMetaData serviceRefMetaData, QName portName, EndpointMetaData epMetaData) + private void setupHandlers(ServiceRefMetaData serviceRefMetaData, QName portName, EndpointMetaData epMetaData) { // Setup the endpoint handlers if (serviceRefMetaData != null) { - for (UnifiedHandlerMetaData uhmd : serviceRefMetaData.getHandlers()) + for (HandlerMetaData uhmd : serviceRefMetaData.getHandlers()) { Set<String> portNames = uhmd.getPortNames(); if (portNames.size() == 0 || portNames.contains(portName.getLocalPart())) Modified: branches/tdiesler/trunk/jbossws-core/src/java/org/jboss/ws/metadata/config/binding/OMFactoryJAXRPC.java =================================================================== --- branches/tdiesler/trunk/jbossws-core/src/java/org/jboss/ws/metadata/config/binding/OMFactoryJAXRPC.java 2007-03-06 13:45:43 UTC (rev 2535) +++ branches/tdiesler/trunk/jbossws-core/src/java/org/jboss/ws/metadata/config/binding/OMFactoryJAXRPC.java 2007-03-06 15:20:12 UTC (rev 2536) @@ -32,8 +32,8 @@ import org.jboss.ws.metadata.config.jaxrpc.ConfigRootJAXRPC; import org.jboss.ws.metadata.config.jaxrpc.EndpointConfigJAXRPC; import org.jboss.ws.metadata.j2ee.UnifiedHandlerMetaData; +import org.jboss.ws.metadata.j2ee.serviceref.InitParamMetaData; import org.jboss.ws.metadata.jsr181.HandlerChainMetaData; -import org.jboss.ws.metadata.umdm.HandlerMetaData.HandlerInitParam; import org.jboss.xb.binding.ObjectModelFactory; import org.jboss.xb.binding.UnmarshallingContext; import org.xml.sax.Attributes; @@ -167,7 +167,7 @@ /** * Called when a new simple child element with text value was read from the XML content. */ - public void setValue(HandlerInitParam param, UnmarshallingContext navigator, String namespaceURI, String localName, String value) + public void setValue(InitParamMetaData param, UnmarshallingContext navigator, String namespaceURI, String localName, String value) { if (log.isTraceEnabled()) log.trace("UnifiedInitParamMetaData setValue: nuri=" + namespaceURI + " localName=" + localName + " value=" + value); Modified: branches/tdiesler/trunk/jbossws-core/src/java/org/jboss/ws/metadata/j2ee/UnifiedHandlerMetaData.java =================================================================== --- branches/tdiesler/trunk/jbossws-core/src/java/org/jboss/ws/metadata/j2ee/UnifiedHandlerMetaData.java 2007-03-06 13:45:43 UTC (rev 2535) +++ branches/tdiesler/trunk/jbossws-core/src/java/org/jboss/ws/metadata/j2ee/UnifiedHandlerMetaData.java 2007-03-06 15:20:12 UTC (rev 2536) @@ -31,11 +31,11 @@ import javax.xml.namespace.QName; +import org.jboss.ws.metadata.j2ee.serviceref.InitParamMetaData; import org.jboss.ws.metadata.jsr181.HandlerChainMetaData; import org.jboss.ws.metadata.umdm.EndpointMetaData; import org.jboss.ws.metadata.umdm.HandlerMetaDataJAXRPC; import org.jboss.ws.metadata.umdm.HandlerMetaDataJAXWS; -import org.jboss.ws.metadata.umdm.HandlerMetaData.HandlerInitParam; import org.jboss.ws.metadata.umdm.HandlerMetaData.HandlerType; /** @@ -55,7 +55,7 @@ // The required <handler-class> element private String handlerClass; // The optional <init-param> elements - private ArrayList<HandlerInitParam> initParams = new ArrayList<HandlerInitParam>(); + private ArrayList<InitParamMetaData> initParams = new ArrayList<InitParamMetaData>(); // The optional <soap-header> elements private Set<QName> soapHeaders = new HashSet<QName>(); // The optional <soap-role> elements @@ -88,12 +88,12 @@ return handlerClass; } - public void addInitParam(HandlerInitParam param) + public void addInitParam(InitParamMetaData param) { initParams.add(param); } - public List<HandlerInitParam> getInitParams() + public List<InitParamMetaData> getInitParams() { return initParams; } Modified: branches/tdiesler/trunk/jbossws-core/src/java/org/jboss/ws/metadata/j2ee/UnifiedPortComponentRefMetaData.java =================================================================== --- branches/tdiesler/trunk/jbossws-core/src/java/org/jboss/ws/metadata/j2ee/UnifiedPortComponentRefMetaData.java 2007-03-06 13:45:43 UTC (rev 2535) +++ branches/tdiesler/trunk/jbossws-core/src/java/org/jboss/ws/metadata/j2ee/UnifiedPortComponentRefMetaData.java 2007-03-06 15:20:12 UTC (rev 2536) @@ -41,7 +41,7 @@ // The optional <port-component-link> element private String portComponentLink; // Arbitrary proxy properties given by <call-property> - private Properties callProperties; + private Properties callProperties = new Properties(); public String getPortComponentLink() { Added: branches/tdiesler/trunk/jbossws-core/src/java/org/jboss/ws/metadata/j2ee/serviceref/CallPropertyMetaData.java =================================================================== --- branches/tdiesler/trunk/jbossws-core/src/java/org/jboss/ws/metadata/j2ee/serviceref/CallPropertyMetaData.java (rev 0) +++ branches/tdiesler/trunk/jbossws-core/src/java/org/jboss/ws/metadata/j2ee/serviceref/CallPropertyMetaData.java 2007-03-06 15:20:12 UTC (rev 2536) @@ -0,0 +1,63 @@ +/* +* JBoss, Home of Professional Open Source +* Copyright 2005, JBoss Inc., and individual contributors as indicated +* by the @authors tag. See the copyright.txt in the distribution for a +* full listing of individual contributors. +* +* This is free software; you can redistribute it and/or modify it +* under the terms of the GNU Lesser General Public License as +* published by the Free Software Foundation; either version 2.1 of +* the License, or (at your option) any later version. +* +* This software is distributed in the hope that it will be useful, +* but WITHOUT ANY WARRANTY; without even the implied warranty of +* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU +* Lesser General Public License for more details. +* +* You should have received a copy of the GNU Lesser General Public +* License along with this software; if not, write to the Free +* Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA +* 02110-1301 USA, or see the FSF site: http://www.fsf.org. +*/ +package org.jboss.ws.metadata.j2ee.serviceref; + +// $Id$ + +import java.io.Serializable; + +/** + * @author Thomas.Diesler(a)jboss.org + * @since 06-May-2004 + */ +public class CallPropertyMetaData implements Serializable +{ + // The required <prop-name> element + private String propName; + // The required <prop-value> element + private String propValue; + + public String getPropName() + { + return propName; + } + + public void setPropName(String paramName) + { + this.propName = paramName; + } + + public String getPropValue() + { + return propValue; + } + + public void setPropValue(String paramValue) + { + this.propValue = paramValue; + } + + public String toString() + { + return "[name=" + propName + ",value=" + propValue + "]"; + } +} Property changes on: branches/tdiesler/trunk/jbossws-core/src/java/org/jboss/ws/metadata/j2ee/serviceref/CallPropertyMetaData.java ___________________________________________________________________ Name: svn:keywords + Id Revision Name: svn:eol-style + LF Added: branches/tdiesler/trunk/jbossws-core/src/java/org/jboss/ws/metadata/j2ee/serviceref/HandlerChainMetaData.java =================================================================== --- branches/tdiesler/trunk/jbossws-core/src/java/org/jboss/ws/metadata/j2ee/serviceref/HandlerChainMetaData.java (rev 0) +++ branches/tdiesler/trunk/jbossws-core/src/java/org/jboss/ws/metadata/j2ee/serviceref/HandlerChainMetaData.java 2007-03-06 15:20:12 UTC (rev 2536) @@ -0,0 +1,82 @@ +/* + * JBoss, Home of Professional Open Source + * Copyright 2005, JBoss Inc., and individual contributors as indicated + * by the @authors tag. See the copyright.txt in the distribution for a + * full listing of individual contributors. + * + * This is free software; you can redistribute it and/or modify it + * under the terms of the GNU Lesser General Public License as + * published by the Free Software Foundation; either version 2.1 of + * the License, or (at your option) any later version. + * + * This software is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this software; if not, write to the Free + * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA + * 02110-1301 USA, or see the FSF site: http://www.fsf.org. + */ +package org.jboss.ws.metadata.j2ee.serviceref; + +// $Id$ + +import java.io.Serializable; +import java.util.ArrayList; +import java.util.List; + +import javax.xml.namespace.QName; + +/** The unified metdata data for a handler chain element + * + * @author Thomas.Diesler(a)jboss.org + */ +public class HandlerChainMetaData implements Serializable +{ + private QName serviceNamePattern; + private QName portNamePattern; + private String protocolBindings; + private List<HandlerMetaData> handlers = new ArrayList<HandlerMetaData>(); + + public QName getPortNamePattern() + { + return portNamePattern; + } + + public void setPortNamePattern(QName portNamePattern) + { + this.portNamePattern = portNamePattern; + } + + public QName getServiceNamePattern() + { + return serviceNamePattern; + } + + public void setServiceNamePattern(QName serviceNamePattern) + { + this.serviceNamePattern = serviceNamePattern; + } + + public String getProtocolBindings() + { + return protocolBindings; + } + + public void setProtocolBindings(String protocolBindings) + { + this.protocolBindings = protocolBindings; + } + + public List<HandlerMetaData> getHandlers() + { + return handlers; + } + + public void addHandler(HandlerMetaData handler) + { + handlers.add(handler); + } +} Property changes on: branches/tdiesler/trunk/jbossws-core/src/java/org/jboss/ws/metadata/j2ee/serviceref/HandlerChainMetaData.java ___________________________________________________________________ Name: svn:keywords + Id Revision Name: svn:eol-style + LF Added: branches/tdiesler/trunk/jbossws-core/src/java/org/jboss/ws/metadata/j2ee/serviceref/HandlerChainsMetaData.java =================================================================== --- branches/tdiesler/trunk/jbossws-core/src/java/org/jboss/ws/metadata/j2ee/serviceref/HandlerChainsMetaData.java (rev 0) +++ branches/tdiesler/trunk/jbossws-core/src/java/org/jboss/ws/metadata/j2ee/serviceref/HandlerChainsMetaData.java 2007-03-06 15:20:12 UTC (rev 2536) @@ -0,0 +1,47 @@ +/* + * JBoss, Home of Professional Open Source + * Copyright 2005, JBoss Inc., and individual contributors as indicated + * by the @authors tag. See the copyright.txt in the distribution for a + * full listing of individual contributors. + * + * This is free software; you can redistribute it and/or modify it + * under the terms of the GNU Lesser General Public License as + * published by the Free Software Foundation; either version 2.1 of + * the License, or (at your option) any later version. + * + * This software is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this software; if not, write to the Free + * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA + * 02110-1301 USA, or see the FSF site: http://www.fsf.org. + */ +package org.jboss.ws.metadata.j2ee.serviceref; + +// $Id$ + +import java.io.Serializable; +import java.util.ArrayList; +import java.util.List; + +/** The unified metdata data for a handler chains element + * + * @author Thomas.Diesler(a)jboss.org + */ +public class HandlerChainsMetaData implements Serializable +{ + private List<HandlerChainMetaData> handlerChains = new ArrayList<HandlerChainMetaData>(); + + public List<HandlerChainMetaData> getHandlerChains() + { + return handlerChains; + } + + public void addHandlerChain(HandlerChainMetaData handlerChain) + { + handlerChains.add(handlerChain); + } +} Property changes on: branches/tdiesler/trunk/jbossws-core/src/java/org/jboss/ws/metadata/j2ee/serviceref/HandlerChainsMetaData.java ___________________________________________________________________ Name: svn:keywords + Id Revision Name: svn:eol-style + LF Added: branches/tdiesler/trunk/jbossws-core/src/java/org/jboss/ws/metadata/j2ee/serviceref/HandlerMetaData.java =================================================================== --- branches/tdiesler/trunk/jbossws-core/src/java/org/jboss/ws/metadata/j2ee/serviceref/HandlerMetaData.java (rev 0) +++ branches/tdiesler/trunk/jbossws-core/src/java/org/jboss/ws/metadata/j2ee/serviceref/HandlerMetaData.java 2007-03-06 15:20:12 UTC (rev 2536) @@ -0,0 +1,148 @@ +/* + * JBoss, Home of Professional Open Source + * Copyright 2005, JBoss Inc., and individual contributors as indicated + * by the @authors tag. See the copyright.txt in the distribution for a + * full listing of individual contributors. + * + * This is free software; you can redistribute it and/or modify it + * under the terms of the GNU Lesser General Public License as + * published by the Free Software Foundation; either version 2.1 of + * the License, or (at your option) any later version. + * + * This software is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this software; if not, write to the Free + * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA + * 02110-1301 USA, or see the FSF site: http://www.fsf.org. + */ +package org.jboss.ws.metadata.j2ee.serviceref; + +// $Id$ + +import java.io.Serializable; +import java.util.ArrayList; +import java.util.HashSet; +import java.util.List; +import java.util.Set; + +import javax.xml.namespace.QName; + +import org.jboss.ws.metadata.umdm.EndpointMetaData; +import org.jboss.ws.metadata.umdm.HandlerMetaDataJAXRPC; +import org.jboss.ws.metadata.umdm.HandlerMetaDataJAXWS; +import org.jboss.ws.metadata.umdm.HandlerMetaData.HandlerType; + +/** The unified metdata data for a handler element + * + * @author Thomas.Diesler(a)jboss.org + * @version $Revision$ + */ +public class HandlerMetaData implements Serializable +{ + private HandlerChainMetaData handlerChain; + + // The required <handler-name> element + private String handlerName; + // The required <handler-class> element + private String handlerClass; + // The optional <init-param> elements + private List<InitParamMetaData> initParams = new ArrayList<InitParamMetaData>(); + // The optional <soap-header> elements + private Set<QName> soapHeaders = new HashSet<QName>(); + // The optional <soap-role> elements + private Set<String> soapRoles = new HashSet<String>(); + // The optional <port-name> elements, these only apply to webserve clients + private Set<String> portNames = new HashSet<String>(); + + + public void setHandlerName(String value) + { + this.handlerName = value; + } + + public String getHandlerName() + { + return handlerName; + } + + public void setHandlerClass(String handlerClass) + { + this.handlerClass = handlerClass; + } + + public String getHandlerClass() + { + return handlerClass; + } + + public void addInitParam(InitParamMetaData param) + { + initParams.add(param); + } + + public List<InitParamMetaData> getInitParams() + { + return initParams; + } + + public void addSoapHeader(QName qName) + { + soapHeaders.add(qName); + } + + public Set<QName> getSoapHeaders() + { + return soapHeaders; + } + + public void addSoapRole(String value) + { + soapRoles.add(value); + } + + public Set<String> getSoapRoles() + { + return soapRoles; + } + + public Set<String> getPortNames() + { + return portNames; + } + + public void addPortName(String value) + { + portNames.add(value); + } + + public HandlerMetaDataJAXRPC getHandlerMetaDataJAXRPC (EndpointMetaData epMetaData, HandlerType type) + { + HandlerMetaDataJAXRPC hmd = new HandlerMetaDataJAXRPC(epMetaData, type); + hmd.setHandlerName(getHandlerName()); + hmd.setHandlerClassName(getHandlerClass()); + hmd.seiInitParams(getInitParams()); + hmd.setSoapHeaders(getSoapHeaders()); + hmd.setSoapRoles(getSoapRoles()); + hmd.setPortNames(getPortNames()); + return hmd; + } + + public HandlerMetaDataJAXWS getHandlerMetaDataJAXWS (EndpointMetaData epMetaData, HandlerType type) + { + HandlerMetaDataJAXWS hmd = new HandlerMetaDataJAXWS(epMetaData, type); + hmd.setHandlerName(getHandlerName()); + hmd.setHandlerClassName(getHandlerClass()); + hmd.seiInitParams(getInitParams()); + if (handlerChain != null) + { + hmd.setProtocolBindings(handlerChain.getProtocolBindings()); + hmd.setServiceNamePattern(handlerChain.getServiceNamePattern()); + hmd.setPortNamePattern(handlerChain.getPortNamePattern()); + } + return hmd; + } +} Property changes on: branches/tdiesler/trunk/jbossws-core/src/java/org/jboss/ws/metadata/j2ee/serviceref/HandlerMetaData.java ___________________________________________________________________ Name: svn:keywords + Id Revision Name: svn:eol-style + LF Added: branches/tdiesler/trunk/jbossws-core/src/java/org/jboss/ws/metadata/j2ee/serviceref/InitParamMetaData.java =================================================================== --- branches/tdiesler/trunk/jbossws-core/src/java/org/jboss/ws/metadata/j2ee/serviceref/InitParamMetaData.java (rev 0) +++ branches/tdiesler/trunk/jbossws-core/src/java/org/jboss/ws/metadata/j2ee/serviceref/InitParamMetaData.java 2007-03-06 15:20:12 UTC (rev 2536) @@ -0,0 +1,63 @@ +/* +* JBoss, Home of Professional Open Source +* Copyright 2005, JBoss Inc., and individual contributors as indicated +* by the @authors tag. See the copyright.txt in the distribution for a +* full listing of individual contributors. +* +* This is free software; you can redistribute it and/or modify it +* under the terms of the GNU Lesser General Public License as +* published by the Free Software Foundation; either version 2.1 of +* the License, or (at your option) any later version. +* +* This software is distributed in the hope that it will be useful, +* but WITHOUT ANY WARRANTY; without even the implied warranty of +* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU +* Lesser General Public License for more details. +* +* You should have received a copy of the GNU Lesser General Public +* License along with this software; if not, write to the Free +* Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA +* 02110-1301 USA, or see the FSF site: http://www.fsf.org. +*/ +package org.jboss.ws.metadata.j2ee.serviceref; + +// $Id$ + +import java.io.Serializable; + +/** + * @author Thomas.Diesler(a)jboss.org + * @since 06-May-2004 + */ +public class InitParamMetaData implements Serializable +{ + // The required <param-name> element + private String paramName; + // The required <param-value> element + private String paramValue; + + public String getParamName() + { + return paramName; + } + + public void setParamName(String paramName) + { + this.paramName = paramName; + } + + public String getParamValue() + { + return paramValue; + } + + public void setParamValue(String paramValue) + { + this.paramValue = paramValue; + } + + public String toString() + { + return "[name=" + paramName + ",value=" + paramValue + "]"; + } +} Property changes on: branches/tdiesler/trunk/jbossws-core/src/java/org/jboss/ws/metadata/j2ee/serviceref/InitParamMetaData.java ___________________________________________________________________ Name: svn:keywords + Id Revision Name: svn:eol-style + LF Added: branches/tdiesler/trunk/jbossws-core/src/java/org/jboss/ws/metadata/j2ee/serviceref/PortComponentRefMetaData.java =================================================================== --- branches/tdiesler/trunk/jbossws-core/src/java/org/jboss/ws/metadata/j2ee/serviceref/PortComponentRefMetaData.java (rev 0) +++ branches/tdiesler/trunk/jbossws-core/src/java/org/jboss/ws/metadata/j2ee/serviceref/PortComponentRefMetaData.java 2007-03-06 15:20:12 UTC (rev 2536) @@ -0,0 +1,168 @@ +/* + * JBoss, Home of Professional Open Source + * Copyright 2005, JBoss Inc., and individual contributors as indicated + * by the @authors tag. See the copyright.txt in the distribution for a + * full listing of individual contributors. + * + * This is free software; you can redistribute it and/or modify it + * under the terms of the GNU Lesser General Public License as + * published by the Free Software Foundation; either version 2.1 of + * the License, or (at your option) any later version. + * + * This software is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this software; if not, write to the Free + * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA + * 02110-1301 USA, or see the FSF site: http://www.fsf.org. + */ +package org.jboss.ws.metadata.j2ee.serviceref; + +// $Id$ + +import java.io.Serializable; +import java.util.ArrayList; +import java.util.List; + +import javax.xml.namespace.QName; + +/** The metdata data from service-ref/port-component-ref element in web.xml, ejb-jar.xml, and application-client.xml. + * + * @author Thomas.Diesler(a)jboss.org + */ +public class PortComponentRefMetaData implements Serializable +{ + // The parent service-ref + private ServiceRefMetaData serviceRefMetaData; + + // The required <service-endpoint-interface> element + private String serviceEndpointInterface; + // The optional <enable-mtom> element + private Boolean enableMTOM; + // The optional <port-component-link> element + private String portComponentLink; + // The optional <port-qname> element + private QName portQName; + // Arbitrary proxy properties given by <call-property> + private List<CallPropertyMetaData> callProperties = new ArrayList<CallPropertyMetaData>(); + // Arbitrary proxy properties given by <stub-property> + private List<StubPropertyMetaData> stubProperties = new ArrayList<StubPropertyMetaData>(); + // The optional JBossWS config-name + private String configName; + // The optional JBossWS config-file + private String configFile; + + public PortComponentRefMetaData(ServiceRefMetaData serviceRefMetaData) + { + this.serviceRefMetaData = serviceRefMetaData; + } + + public ServiceRefMetaData getServiceRefMetaData() + { + return serviceRefMetaData; + } + + public Boolean getEnableMTOM() + { + return enableMTOM; + } + + public void setEnableMTOM(Boolean enableMTOM) + { + this.enableMTOM = enableMTOM; + } + + /** + * The port-component-link element links a port-component-ref + * to a specific port-component required to be made available + * by a service reference. + * + * The value of a port-component-link must be the + * port-component-name of a port-component in the same module + * or another module in the same application unit. The syntax + * for specification follows the syntax defined for ejb-link + * in the EJB 2.0 specification. + */ + public String getPortComponentLink() + { + return portComponentLink; + } + + public void setPortComponentLink(String portComponentLink) + { + this.portComponentLink = portComponentLink; + } + + public String getServiceEndpointInterface() + { + return serviceEndpointInterface; + } + + public void setServiceEndpointInterface(String serviceEndpointInterface) + { + this.serviceEndpointInterface = serviceEndpointInterface; + } + + public QName getPortQName() + { + return portQName; + } + + public void setPortQName(QName portQName) + { + this.portQName = portQName; + } + + public List<CallPropertyMetaData> getCallProperties() + { + return callProperties; + } + + public void setCallProperties(List<CallPropertyMetaData> callProps) + { + callProperties = callProps; + } + + public void addCallProperty(CallPropertyMetaData callProp) + { + callProperties.add(callProp); + } + + public List<StubPropertyMetaData> getStubProperties() + { + return stubProperties; + } + + public void setStubProperties(List<StubPropertyMetaData> stubProps) + { + stubProperties = stubProps; + } + + public void addStubProperty(StubPropertyMetaData stubProp) + { + stubProperties.add(stubProp); + } + + public String getConfigFile() + { + return configFile; + } + + public void setConfigFile(String configFile) + { + this.configFile = configFile; + } + + public String getConfigName() + { + return configName; + } + + public void setConfigName(String configName) + { + this.configName = configName; + } +} Property changes on: branches/tdiesler/trunk/jbossws-core/src/java/org/jboss/ws/metadata/j2ee/serviceref/PortComponentRefMetaData.java ___________________________________________________________________ Name: svn:keywords + Id Revision Name: svn:eol-style + LF Added: branches/tdiesler/trunk/jbossws-core/src/java/org/jboss/ws/metadata/j2ee/serviceref/ServiceRefMetaData.java =================================================================== --- branches/tdiesler/trunk/jbossws-core/src/java/org/jboss/ws/metadata/j2ee/serviceref/ServiceRefMetaData.java (rev 0) +++ branches/tdiesler/trunk/jbossws-core/src/java/org/jboss/ws/metadata/j2ee/serviceref/ServiceRefMetaData.java 2007-03-06 15:20:12 UTC (rev 2536) @@ -0,0 +1,321 @@ +/* + * JBoss, Home of Professional Open Source + * Copyright 2005, JBoss Inc., and individual contributors as indicated + * by the @authors tag. See the copyright.txt in the distribution for a + * full listing of individual contributors. + * + * This is free software; you can redistribute it and/or modify it + * under the terms of the GNU Lesser General Public License as + * published by the Free Software Foundation; either version 2.1 of + * the License, or (at your option) any later version. + * + * This software is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this software; if not, write to the Free + * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA + * 02110-1301 USA, or see the FSF site: http://www.fsf.org. + */ +package org.jboss.ws.metadata.j2ee.serviceref; + +// $Id$ + +import java.io.Serializable; +import java.net.MalformedURLException; +import java.net.URL; +import java.util.ArrayList; +import java.util.Collection; +import java.util.LinkedHashMap; +import java.util.List; +import java.util.Map; + +import javax.wsdl.Definition; +import javax.xml.namespace.QName; + +import org.jboss.logging.Logger; +import org.jboss.ws.WSException; +import org.jboss.ws.core.UnifiedVirtualFile; +import org.jboss.ws.metadata.jaxrpcmapping.JavaWsdlMapping; +import org.jboss.ws.tools.wsdl.WSDL11DefinitionFactory; + +/** + * The metdata data from service-ref element in web.xml, ejb-jar.xml, and + * application-client.xml. + * + * @author Thomas.Diesler(a)jboss.org + */ +public class ServiceRefMetaData implements Serializable +{ + // provide logging + private static Logger log = Logger.getLogger(ServiceRefMetaData.class); + + // The required <service-ref-name> element + private String serviceRefName; + // The required <service-interface> element + private String serviceInterface; + // service-res-type + private String serviceRefType; + // The optional <wsdl-file> element + private String wsdlFile; + // The optional <jaxrpc-mapping-file> element + private String mappingFile; + // The optional <service-qname> element + private QName serviceQName; + // The LinkedHashMap<String, PortComponentRefMetaData> for <port-component-ref> elements + private Map<String, PortComponentRefMetaData> portComponentRefs = new LinkedHashMap<String, PortComponentRefMetaData>(); + // The optional <handler> elements. JAX-RPC handlers declared in the standard J2EE1.4 descriptor + private List<HandlerMetaData> handlers = new ArrayList<HandlerMetaData>(); + // The optional <handler-chains> elements. JAX-WS handlers declared in the standard JavaEE5 descriptor + private HandlerChainsMetaData handlerChains; + // The optional <handler-chain> element. JAX-WS handler chain declared in the JBoss JavaEE5 descriptor + private String handlerChain; + // The optional JBossWS config-name + private String configName; + // The optional JBossWS config-file + private String configFile; + // The optional URL of the actual WSDL to use, <wsdl-override> + private URL wsdlOverride; + // Arbitrary proxy properties given by <call-property> + private List<CallPropertyMetaData> callProperties = new ArrayList<CallPropertyMetaData>(); + + private UnifiedVirtualFile vfsRoot; + // derived from jaxrpc-mapping-file + private JavaWsdlMapping javaWsdlMapping; + // derived from wsdl-override, wsdl-file + private URL wsdlLocation; + // derived from wsdl-override, wsdl-file + private Definition wsdlDefinition; + + public UnifiedVirtualFile getVfsRoot() + { + return vfsRoot; + } + + public void setVfsRoot(UnifiedVirtualFile vfsRoot) + { + this.vfsRoot = vfsRoot; + } + + public String getServiceRefName() + { + return serviceRefName; + } + + public void setServiceRefName(String serviceRefName) + { + this.serviceRefName = serviceRefName; + } + + public String getMappingFile() + { + return mappingFile; + } + + public void setMappingFile(String mappingFile) + { + this.mappingFile = mappingFile; + } + + public JavaWsdlMapping getJavaWsdlMapping() + { + return javaWsdlMapping; + } + + public void setJavaWsdlMapping(JavaWsdlMapping javaWsdlMapping) + { + this.javaWsdlMapping = javaWsdlMapping; + } + + public URL getMappingLocation() + { + URL mappingLocation = null; + if (mappingFile != null) + { + try + { + mappingLocation = vfsRoot.findChild(mappingFile).toURL(); + } + catch (Exception e) + { + throw new WSException("Cannot find jaxrcp-mapping-file: " + mappingFile, e); + } + } + return mappingLocation; + } + + public Collection<PortComponentRefMetaData> getPortComponentRefs() + { + return portComponentRefs.values(); + } + + public PortComponentRefMetaData getPortComponentRef(String seiName) + { + PortComponentRefMetaData ref = portComponentRefs.get(seiName); + return ref; + } + + public void addPortComponentRef(PortComponentRefMetaData pcRef) + { + portComponentRefs.put(pcRef.getServiceEndpointInterface(), pcRef); + } + + public List<HandlerMetaData> getHandlers() + { + return handlers; + } + + public void addHandler(HandlerMetaData handler) + { + handlers.add(handler); + } + + public String getServiceInterface() + { + return serviceInterface; + } + + public void setServiceInterface(String serviceInterface) + { + this.serviceInterface = serviceInterface; + } + + public QName getServiceQName() + { + return serviceQName; + } + + public void setServiceQName(QName serviceQName) + { + this.serviceQName = serviceQName; + } + + public String getServiceRefType() + { + return serviceRefType; + } + + public void setServiceRefType(String serviceResType) + { + this.serviceRefType = serviceResType; + } + + public String getWsdlFile() + { + return wsdlFile; + } + + public void setWsdlFile(String wsdlFile) + { + this.wsdlFile = wsdlFile; + } + + public URL getWsdlLocation() + { + if (wsdlLocation != null) + return wsdlLocation; + + wsdlLocation = wsdlOverride; + if (wsdlLocation == null && wsdlFile != null) + { + try + { + wsdlLocation = vfsRoot.findChild(wsdlFile).toURL(); + } + catch (Exception e) + { + throw new WSException("Cannot find wsdl-file: " + wsdlFile, e); + } + } + return wsdlLocation; + } + + public void setWsdlLocation(URL wsdlLocation) + { + this.wsdlLocation = wsdlLocation; + } + + public Definition getWsdlDefinition() + { + return wsdlDefinition; + } + + public void setWsdlDefinition(Definition wsdlDefinition) + { + this.wsdlDefinition = wsdlDefinition; + } + + public String getConfigFile() + { + return configFile; + } + + public void setConfigFile(String configFile) + { + this.configFile = configFile; + } + + public String getConfigName() + { + return configName; + } + + public void setConfigName(String configName) + { + this.configName = configName; + } + + public URL getWsdlOverride() + { + return wsdlOverride; + } + + public void setWsdlOverride(String wsdlOverride) + { + try + { + this.wsdlOverride = new URL(wsdlOverride); + } + catch (MalformedURLException e) + { + throw new IllegalArgumentException("Invalid wsdl-override: " + wsdlOverride); + } + } + + public List<CallPropertyMetaData> getCallProperties() + { + return callProperties; + } + + public void setCallProperties(List<CallPropertyMetaData> callProps) + { + callProperties = callProps; + } + + public void addCallProperty(CallPropertyMetaData callProp) + { + callProperties.add(callProp); + } + + public HandlerChainsMetaData getHandlerChains() + { + return handlerChains; + } + + public void setHandlerChains(HandlerChainsMetaData handlerChains) + { + this.handlerChains = handlerChains; + } + + public String getHandlerChain() + { + return handlerChain; + } + + public void setHandlerChain(String handlerChain) + { + this.handlerChain = handlerChain; + } +} Property changes on: branches/tdiesler/trunk/jbossws-core/src/java/org/jboss/ws/metadata/j2ee/serviceref/ServiceRefMetaData.java ___________________________________________________________________ Name: svn:keywords + Id Revision Name: svn:eol-style + LF Added: branches/tdiesler/trunk/jbossws-core/src/java/org/jboss/ws/metadata/j2ee/serviceref/ServiceRefObjectFactory.java =================================================================== --- branches/tdiesler/trunk/jbossws-core/src/java/org/jboss/ws/metadata/j2ee/serviceref/ServiceRefObjectFactory.java (rev 0) +++ branches/tdiesler/trunk/jbossws-core/src/java/org/jboss/ws/metadata/j2ee/serviceref/ServiceRefObjectFactory.java 2007-03-06 15:20:12 UTC (rev 2536) @@ -0,0 +1,302 @@ +/* + * JBoss, Home of Professional Open Source + * Copyright 2005, JBoss Inc., and individual contributors as indicated + * by the @authors tag. See the copyright.txt in the distribution for a + * full listing of individual contributors. + * + * This is free software; you can redistribute it and/or modify it + * under the terms of the GNU Lesser General Public License as + * published by the Free Software Foundation; either version 2.1 of + * the License, or (at your option) any later version. + * + * This software is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this software; if not, write to the Free + * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA + * 02110-1301 USA, or see the FSF site: http://www.fsf.org. + */ +package org.jboss.ws.metadata.j2ee.serviceref; + +import java.io.ByteArrayInputStream; +import java.io.InputStream; + +import javax.xml.namespace.QName; + +import org.jboss.ws.WSException; +import org.jboss.xb.binding.ObjectModelFactory; +import org.jboss.xb.binding.Unmarshaller; +import org.jboss.xb.binding.UnmarshallerFactory; +import org.jboss.xb.binding.UnmarshallingContext; +import org.xml.sax.Attributes; + +/** + * An ObjectModelFactory for ServiceRefMetaData + * + * @author Thomas.Diesler(a)jboss.org + * @since 17-Jan-2007 + */ +public class ServiceRefObjectFactory implements ObjectModelFactory +{ + // Hide constructor + private ServiceRefObjectFactory() + { + } + + public static ServiceRefObjectFactory newInstance() + { + return new ServiceRefObjectFactory(); + } + + public ServiceRefMetaData parse(String xmlFragment) + { + try + { + InputStream is = new ByteArrayInputStream(xmlFragment.getBytes()); + + Unmarshaller unmarshaller = UnmarshallerFactory.newInstance().newUnmarshaller(); + return (ServiceRefMetaData)unmarshaller.unmarshal(is, this, null); + } + catch (Exception ex) + { + WSException.rethrow(ex); + return null; + } + } + + public Object newRoot(Object root, UnmarshallingContext navigator, String namespaceURI, String localName, Attributes attrs) + { + return new ServiceRefMetaData(); + } + + public Object completeRoot(Object root, UnmarshallingContext ctx, String uri, String name) + { + return root; + } + + // ******************************************************** + // START ServiceRefMetaData + + public void setValue(ServiceRefMetaData ref, UnmarshallingContext navigator, String namespaceURI, String localName, String value) + { + /* Standard properties */ + if (localName.equals("service-ref-name")) + { + ref.setServiceRefName(value); + } + else if (localName.equals("service-interface")) + { + ref.setServiceInterface(value); + } + else if (localName.equals("service-ref-type")) + { + ref.setServiceRefType(value); + } + else if (localName.equals("wsdl-file")) + { + ref.setWsdlFile(value); + } + else if (localName.equals("jaxrpc-mapping-file")) + { + ref.setMappingFile(value); + } + else if (localName.equals("service-qname")) + { + ref.setServiceQName(QName.valueOf(value)); + } + + /* JBoss properties */ + else if (localName.equals("config-name")) + { + ref.setConfigName(value); + } + else if (localName.equals("config-file")) + { + ref.setConfigFile(value); + } + else if (localName.equals("wsdl-override")) + { + ref.setWsdlOverride(value); + } + else if (localName.equals("handler-chain")) + { + ref.setHandlerChain(value); + } + } + + public Object newChild(ServiceRefMetaData ref, UnmarshallingContext navigator, String namespaceURI, String localName, Attributes attrs) + { + Object child = null; + if (localName.equals("port-component-ref")) + child = new PortComponentRefMetaData(ref); + else if (localName.equals("handler")) + child = new HandlerMetaData(); + else if (localName.equals("handler-chains")) + child = new HandlerChainsMetaData(); + + else if (localName.equals("call-property")) + child = new CallPropertyMetaData(); + + return child; + } + + public Object newChild(HandlerChainsMetaData ref, UnmarshallingContext navigator, String namespaceURI, String localName, Attributes attrs) + { + Object child = null; + if (localName.equals("handler-chain")) + child = new HandlerChainMetaData(); + + return child; + } + + public void addChild(ServiceRefMetaData parent, PortComponentRefMetaData pcRef, UnmarshallingContext navigator, String namespaceURI, String localName) + { + parent.addPortComponentRef(pcRef); + } + + public void addChild(ServiceRefMetaData parent, HandlerMetaData handler, UnmarshallingContext navigator, String namespaceURI, String localName) + { + parent.addHandler(handler); + } + + public void addChild(ServiceRefMetaData parent, HandlerChainsMetaData handlerChains, UnmarshallingContext navigator, String namespaceURI, String localName) + { + parent.setHandlerChains(handlerChains); + } + + public void addChild(ServiceRefMetaData parent, CallPropertyMetaData callProp, UnmarshallingContext navigator, String namespaceURI, String localName) + { + parent.addCallProperty(callProp); + } + + public void addChild(HandlerChainsMetaData parent, HandlerChainMetaData handlerChain, UnmarshallingContext navigator, String namespaceURI, String localName) + { + parent.addHandlerChain(handlerChain); + } + + public void setValue(PortComponentRefMetaData ref, UnmarshallingContext navigator, String namespaceURI, String localName, String value) + { + if (localName.equals("service-endpoint-interface")) + { + ref.setServiceEndpointInterface(value); + } + else if (localName.equals("enable-mtom")) + { + ref.setEnableMTOM(Boolean.valueOf(value)); + } + else if (localName.equals("port-component-link")) + { + ref.setPortComponentLink(value); + } + else if (localName.equals("port-qname")) + { + ref.setPortComponentLink(value); + } + } + + public Object newChild(PortComponentRefMetaData ref, UnmarshallingContext navigator, String namespaceURI, String localName, Attributes attrs) + { + Object child = null; + if (localName.equals("call-property")) + child = new CallPropertyMetaData(); + if (localName.equals("stub-property")) + child = new StubPropertyMetaData(); + return child; + } + + public void setValue(HandlerChainMetaData ref, UnmarshallingContext navigator, String namespaceURI, String localName, String value) + { + if (localName.equals("service-name-pattern")) + { + ref.setServiceNamePattern(QName.valueOf(value)); + } + else if (localName.equals("port-name-pattern")) + { + ref.setPortNamePattern(QName.valueOf(value)); + } + else if (localName.equals("protocol-binding")) + { + ref.setProtocolBindings(value); + } + } + + public void setValue(HandlerMetaData ref, UnmarshallingContext navigator, String namespaceURI, String localName, String value) + { + if (localName.equals("handler-name")) + { + ref.setHandlerName(value); + } + else if (localName.equals("handler-class")) + { + ref.setHandlerClass(value); + } + else if (localName.equals("soap-header")) + { + ref.addSoapHeader(QName.valueOf(value)); + } + else if (localName.equals("soap-role")) + { + ref.addSoapRole(value); + } + else if (localName.equals("port-name")) + { + ref.addPortName(value); + } + } + + public Object newChild(HandlerMetaData ref, UnmarshallingContext navigator, String namespaceURI, String localName, Attributes attrs) + { + Object child = null; + if (localName.equals("init-param")) + child = new InitParamMetaData(); + + return child; + } + + public void addChild(HandlerMetaData parent, InitParamMetaData param, UnmarshallingContext navigator, String namespaceURI, String localName) + { + parent.addInitParam(param); + } + + public void setValue(InitParamMetaData ref, UnmarshallingContext navigator, String namespaceURI, String localName, String value) + { + if (localName.equals("param-name")) + { + ref.setParamName(value); + } + else if (localName.equals("param-value")) + { + ref.setParamValue(value); + } + } + + public void setValue(CallPropertyMetaData ref, UnmarshallingContext navigator, String namespaceURI, String localName, String value) + { + if (localName.equals("prop-name")) + { + ref.setPropName(value); + } + else if (localName.equals("prop-value")) + { + ref.setPropValue(value); + } + } + + public void setValue(StubPropertyMetaData ref, UnmarshallingContext navigator, String namespaceURI, String localName, String value) + { + if (localName.equals("prop-name")) + { + ref.setPropName(value); + } + else if (localName.equals("prop-value")) + { + ref.setPropValue(value); + } + } + + // END ServiceRefMetaData + // ******************************************************** +} Property changes on: branches/tdiesler/trunk/jbossws-core/src/java/org/jboss/ws/metadata/j2ee/serviceref/ServiceRefObjectFactory.java ___________________________________________________________________ Name: svn:keywords + Id Revision Name: svn:eol-style + LF Added: branches/tdiesler/trunk/jbossws-core/src/java/org/jboss/ws/metadata/j2ee/serviceref/StubPropertyMetaData.java =================================================================== --- branches/tdiesler/trunk/jbossws-core/src/java/org/jboss/ws/metadata/j2ee/serviceref/StubPropertyMetaData.java (rev 0) +++ branches/tdiesler/trunk/jbossws-core/src/java/org/jboss/ws/metadata/j2ee/serviceref/StubPropertyMetaData.java 2007-03-06 15:20:12 UTC (rev 2536) @@ -0,0 +1,63 @@ +/* +* JBoss, Home of Professional Open Source +* Copyright 2005, JBoss Inc., and individual contributors as indicated +* by the @authors tag. See the copyright.txt in the distribution for a +* full listing of individual contributors. +* +* This is free software; you can redistribute it and/or modify it +* under the terms of the GNU Lesser General Public License as +* published by the Free Software Foundation; either version 2.1 of +* the License, or (at your option) any later version. +* +* This software is distributed in the hope that it will be useful, +* but WITHOUT ANY WARRANTY; without even the implied warranty of +* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU +* Lesser General Public License for more details. +* +* You should have received a copy of the GNU Lesser General Public +* License along with this software; if not, write to the Free +* Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA +* 02110-1301 USA, or see the FSF site: http://www.fsf.org. +*/ +package org.jboss.ws.metadata.j2ee.serviceref; + +// $Id$ + +import java.io.Serializable; + +/** + * @author Thomas.Diesler(a)jboss.org + * @since 06-May-2004 + */ +public class StubPropertyMetaData implements Serializable +{ + // The required <prop-name> element + private String propName; + // The required <prop-value> element + private String propValue; + + public String getPropName() + { + return propName; + } + + public void setPropName(String paramName) + { + this.propName = paramName; + } + + public String getPropValue() + { + return propValue; + } + + public void setPropValue(String paramValue) + { + this.propValue = paramValue; + } + + public String toString() + { + return "[name=" + propName + ",value=" + propValue + "]"; + } +} Property changes on: branches/tdiesler/trunk/jbossws-core/src/java/org/jboss/ws/metadata/j2ee/serviceref/StubPropertyMetaData.java ___________________________________________________________________ Name: svn:keywords + Id Revision Name: svn:eol-style + LF Modified: branches/tdiesler/trunk/jbossws-core/src/java/org/jboss/ws/metadata/jsr181/HandlerChainFactory.java =================================================================== --- branches/tdiesler/trunk/jbossws-core/src/java/org/jboss/ws/metadata/jsr181/HandlerChainFactory.java 2007-03-06 13:45:43 UTC (rev 2535) +++ branches/tdiesler/trunk/jbossws-core/src/java/org/jboss/ws/metadata/jsr181/HandlerChainFactory.java 2007-03-06 15:20:12 UTC (rev 2536) @@ -25,7 +25,7 @@ import org.jboss.logging.Logger; import org.jboss.ws.metadata.j2ee.UnifiedHandlerMetaData; -import org.jboss.ws.metadata.umdm.HandlerMetaData.HandlerInitParam; +import org.jboss.ws.metadata.j2ee.serviceref.InitParamMetaData; import org.jboss.ws.metadata.umdm.HandlerMetaData.HandlerType; import org.jboss.xb.binding.ObjectModelFactory; import org.jboss.xb.binding.UnmarshallingContext; @@ -106,14 +106,14 @@ public Object newChild(UnifiedHandlerMetaData handler, UnmarshallingContext navigator, String namespaceURI, String localName, Attributes attrs) { if ("init-param".equals(localName)) - return new HandlerInitParam(); + return new InitParamMetaData(); else return null; } /** * Called when parsing character is complete. */ - public void addChild(UnifiedHandlerMetaData handler, HandlerInitParam param, UnmarshallingContext navigator, String namespaceURI, String localName) + public void addChild(UnifiedHandlerMetaData handler, InitParamMetaData param, UnmarshallingContext navigator, String namespaceURI, String localName) { handler.addInitParam(param); } @@ -151,7 +151,7 @@ /** * Called when a new simple child element with text value was read from the XML content. */ - public void setValue(HandlerInitParam param, UnmarshallingContext navigator, String namespaceURI, String localName, String value) + public void setValue(InitParamMetaData param, UnmarshallingContext navigator, String namespaceURI, String localName, String value) { if (log.isTraceEnabled()) log.trace("UnifiedInitParamMetaData setValue: nuri=" + namespaceURI + " localName=" + localName + " value=" + value); Modified: branches/tdiesler/trunk/jbossws-core/src/java/org/jboss/ws/metadata/umdm/HandlerMetaData.java =================================================================== --- branches/tdiesler/trunk/jbossws-core/src/java/org/jboss/ws/metadata/umdm/HandlerMetaData.java 2007-03-06 13:45:43 UTC (rev 2535) +++ branches/tdiesler/trunk/jbossws-core/src/java/org/jboss/ws/metadata/umdm/HandlerMetaData.java 2007-03-06 15:20:12 UTC (rev 2536) @@ -33,6 +33,7 @@ import org.jboss.logging.Logger; import org.jboss.ws.WSException; +import org.jboss.ws.metadata.j2ee.serviceref.InitParamMetaData; /** * The common metdata data for a handler element @@ -61,7 +62,7 @@ // The optional <soap-header> elements private Set<QName> soapHeaders = new HashSet<QName>(); // The optional <init-param> elements - private List<HandlerInitParam> initParams = new ArrayList<HandlerInitParam>(); + private List<InitParamMetaData> initParams = new ArrayList<InitParamMetaData>(); // The cached handler class private Class handlerClass; @@ -137,12 +138,12 @@ return soapHeaders; } - public void seiInitParams(List<HandlerInitParam> initParams) + public void seiInitParams(List<InitParamMetaData> initParams) { this.initParams = initParams; } - public List<HandlerInitParam> getInitParams() + public List<InitParamMetaData> getInitParams() { return initParams; } @@ -166,39 +167,4 @@ { handlerClass = getHandlerClass(); } - - public static class HandlerInitParam implements Serializable - { - private static final long serialVersionUID = -8687875291620457318L; - - // The required <handler-name> element - private String paramName; - // The required <handler-class> element - private String paramValue; - - public String getParamName() - { - return paramName; - } - - public void setParamName(String paramName) - { - this.paramName = paramName; - } - - public String getParamValue() - { - return paramValue; - } - - public void setParamValue(String paramValue) - { - this.paramValue = paramValue; - } - - public String toString() - { - return "[name=" + paramName + ",value=" + paramValue + "]"; - } - } } Modified: branches/tdiesler/trunk/jbossws-core/src/java/org/jboss/ws/metadata/webservices/WebservicesFactory.java =================================================================== --- branches/tdiesler/trunk/jbossws-core/src/java/org/jboss/ws/metadata/webservices/WebservicesFactory.java 2007-03-06 13:45:43 UTC (rev 2535) +++ branches/tdiesler/trunk/jbossws-core/src/java/org/jboss/ws/metadata/webservices/WebservicesFactory.java 2007-03-06 15:20:12 UTC (rev 2536) @@ -27,7 +27,7 @@ import org.jboss.logging.Logger; import org.jboss.ws.metadata.j2ee.UnifiedHandlerMetaData; -import org.jboss.ws.metadata.umdm.HandlerMetaData.HandlerInitParam; +import org.jboss.ws.metadata.j2ee.serviceref.InitParamMetaData; import org.jboss.xb.binding.ObjectModelFactory; import org.jboss.xb.binding.UnmarshallingContext; import org.xml.sax.Attributes; @@ -129,14 +129,14 @@ public Object newChild(UnifiedHandlerMetaData handler, UnmarshallingContext navigator, String namespaceURI, String localName, Attributes attrs) { if ("init-param".equals(localName)) - return new HandlerInitParam(); + return new InitParamMetaData(); else return null; } /** * Called when parsing character is complete. */ - public void addChild(UnifiedHandlerMetaData handler, HandlerInitParam param, UnmarshallingContext navigator, String namespaceURI, String localName) + public void addChild(UnifiedHandlerMetaData handler, InitParamMetaData param, UnmarshallingContext navigator, String namespaceURI, String localName) { handler.addInitParam(param); } @@ -200,7 +200,7 @@ /** * Called when a new simple child element with text value was read from the XML content. */ - public void setValue(HandlerInitParam param, UnmarshallingContext navigator, String namespaceURI, String localName, String value) + public void setValue(InitParamMetaData param, UnmarshallingContext navigator, String namespaceURI, String localName, String value) { if (log.isTraceEnabled()) log.trace("UnifiedInitParamMetaData setValue: nuri=" + namespaceURI + " localName=" + localName + " value=" + value); Modified: branches/tdiesler/trunk/jbossws-tests/src/resources/jaxws/samples/handlerchain/META-INF/jboss-client.xml =================================================================== --- branches/tdiesler/trunk/jbossws-tests/src/resources/jaxws/samples/handlerchain/META-INF/jboss-client.xml 2007-03-06 13:45:43 UTC (rev 2535) +++ branches/tdiesler/trunk/jbossws-tests/src/resources/jaxws/samples/handlerchain/META-INF/jboss-client.xml 2007-03-06 15:20:12 UTC (rev 2536) @@ -5,20 +5,20 @@ <jboss-client> <jndi-name>jbossws-client</jndi-name> - <webservice-ref> + <service-ref> <service-ref-name>Service1</service-ref-name> <wsdl-override>http://@jbosstest.host.name@:8080/jaxws-samples-handlerchain/TestService?wsdl</wsdl-override> - </webservice-ref> + </service-ref> - <webservice-ref> + <service-ref> <service-ref-name>Service2</service-ref-name> <wsdl-override>http://@jbosstest.host.name@:8080/jaxws-samples-handlerchain/TestService?wsdl</wsdl-override> - </webservice-ref> + </service-ref> - <webservice-ref> + <service-ref> <service-ref-name>Service3</service-ref-name> <handler-chain>jaxws-handlers.xml</handler-chain> <wsdl-override>http://@jbosstest.host.name@:8080/jaxws-samples-handlerchain/TestService?wsdl</wsdl-override> - </webservice-ref> + </service-ref> </jboss-client> \ No newline at end of file Modified: branches/tdiesler/trunk/jbossws-tests/src/resources/jaxws/samples/webserviceref/META-INF/jboss-client.xml =================================================================== --- branches/tdiesler/trunk/jbossws-tests/src/resources/jaxws/samples/webserviceref/META-INF/jboss-client.xml 2007-03-06 13:45:43 UTC (rev 2535) +++ branches/tdiesler/trunk/jbossws-tests/src/resources/jaxws/samples/webserviceref/META-INF/jboss-client.xml 2007-03-06 15:20:12 UTC (rev 2536) @@ -7,90 +7,90 @@   - <webservice-ref> + <service-ref> <service-ref-name>service2</service-ref-name> <wsdl-override>META-INF/wsdl/TestEndpoint.wsdl</wsdl-override> - </webservice-ref> + </service-ref>  - <webservice-ref> + <service-ref> <service-ref-name>TestEndpointService3</service-ref-name> <wsdl-override>META-INF/wsdl/TestEndpoint.wsdl</wsdl-override> - </webservice-ref> + </service-ref>  - <webservice-ref> + <service-ref> <service-ref-name>org.jboss.test.ws.jaxws.samples.webserviceref.TestEndpointClientOne/service4</service-ref-name> <wsdl-override>META-INF/wsdl/TestEndpoint.wsdl</wsdl-override> - </webservice-ref> + </service-ref>  - <webservice-ref> + <service-ref> <service-ref-name>TestEndpointService5</service-ref-name> <wsdl-override>META-INF/wsdl/TestEndpoint.wsdl</wsdl-override> - </webservice-ref> + </service-ref>  - <webservice-ref> + <service-ref> <service-ref-name>org.jboss.test.ws.jaxws.samples.webserviceref.TestEndpointClientOne/service6</service-ref-name> <wsdl-override>META-INF/wsdl/TestEndpoint.wsdl</wsdl-override> - </webservice-ref> + </service-ref>  - <webservice-ref> + <service-ref> <service-ref-name>port1</service-ref-name> <wsdl-override>META-INF/wsdl/TestEndpoint.wsdl</wsdl-override> - </webservice-ref> + </service-ref>  - <webservice-ref> + <service-ref> <service-ref-name>Port2</service-ref-name> <wsdl-override>META-INF/wsdl/TestEndpoint.wsdl</wsdl-override> - </webservice-ref> + </service-ref>  - <webservice-ref> + <service-ref> <service-ref-name>org.jboss.test.ws.jaxws.samples.webserviceref.TestEndpointClientOne/port3</service-ref-name> <wsdl-override>META-INF/wsdl/TestEndpoint.wsdl</wsdl-override> - </webservice-ref> + </service-ref>  - <webservice-ref> + <service-ref> <service-ref-name>org.jboss.test.ws.jaxws.samples.webserviceref.TestEndpointClientOne/port4</service-ref-name> <wsdl-override>META-INF/wsdl/TestEndpoint.wsdl</wsdl-override> - </webservice-ref> + </service-ref>  - <webservice-ref> + <service-ref> <service-ref-name>Port5</service-ref-name> <wsdl-override>META-INF/wsdl/TestEndpoint.wsdl</wsdl-override> - </webservice-ref> + </service-ref> </jboss-client> \ No newline at end of file Modified: branches/tdiesler/trunk/jbossws-tests/src/resources/jaxws/samples/webserviceref/META-INF/jboss-web.xml =================================================================== --- branches/tdiesler/trunk/jbossws-tests/src/resources/jaxws/samples/webserviceref/META-INF/jboss-web.xml 2007-03-06 13:45:43 UTC (rev 2535) +++ branches/tdiesler/trunk/jbossws-tests/src/resources/jaxws/samples/webserviceref/META-INF/jboss-web.xml 2007-03-06 15:20:12 UTC (rev 2536) @@ -7,74 +7,74 @@   - <webservice-ref> + <service-ref> <service-ref-name>service2</service-ref-name> <wsdl-override>WEB-INF/wsdl/TestEndpoint.wsdl</wsdl-override> - </webservice-ref> + </service-ref>  - <webservice-ref> + <service-ref> <service-ref-name>TestEndpointService3</service-ref-name> <wsdl-override>WEB-INF/wsdl/TestEndpoint.wsdl</wsdl-override> - </webservice-ref> + </service-ref>  - <webservice-ref> + <service-ref> <service-ref-name>org.jboss.test.ws.jaxws.samples.webserviceref.ServletClient/service4</service-ref-name> <wsdl-override>WEB-INF/wsdl/TestEndpoint.wsdl</wsdl-override> - </webservice-ref> + </service-ref>  - <webservice-ref> + <service-ref> <service-ref-name>TestEndpointService5</service-ref-name> <wsdl-override>WEB-INF/wsdl/TestEndpoint.wsdl</wsdl-override> - </webservice-ref> + </service-ref>  - <webservice-ref> + <service-ref> <service-ref-name>org.jboss.test.ws.jaxws.samples.webserviceref.ServletClient/service6</service-ref-name> <wsdl-override>WEB-INF/wsdl/TestEndpoint.wsdl</wsdl-override> - </webservice-ref> + </service-ref>  - <webservice-ref> + <service-ref> <service-ref-name>port1</service-ref-name> <wsdl-override>WEB-INF/wsdl/TestEndpoint.wsdl</wsdl-override> - </webservice-ref> + </service-ref>  - <webservice-ref> + <service-ref> <service-ref-name>Port2</service-ref-name> <wsdl-override>WEB-INF/wsdl/TestEndpoint.wsdl</wsdl-override> - </webservice-ref> + </service-ref>  - <webservice-ref> + <service-ref> <service-ref-name>org.jboss.test.ws.jaxws.samples.webserviceref.ServletClient/port3</service-ref-name> <wsdl-override>WEB-INF/wsdl/TestEndpoint.wsdl</wsdl-override> - </webservice-ref> + </service-ref> </jboss-web> \ No newline at end of file Modified: branches/tdiesler/trunk/jbossws-tests/src/resources/jaxws/samples/webserviceref/META-INF/jboss.xml =================================================================== --- branches/tdiesler/trunk/jbossws-tests/src/resources/jaxws/samples/webserviceref/META-INF/jboss.xml 2007-03-06 13:45:43 UTC (rev 2535) +++ branches/tdiesler/trunk/jbossws-tests/src/resources/jaxws/samples/webserviceref/META-INF/jboss.xml 2007-03-06 15:20:12 UTC (rev 2536) @@ -10,75 +10,75 @@   - <webservice-ref> + <service-ref> <service-ref-name>service2</service-ref-name> <wsdl-override>META-INF/wsdl/TestEndpoint.wsdl</wsdl-override> - </webservice-ref> + </service-ref>  - <webservice-ref> + <service-ref> <service-ref-name>TestEndpointService3</service-ref-name> <wsdl-override>META-INF/wsdl/TestEndpoint.wsdl</wsdl-override> - </webservice-ref> + </service-ref>  - <webservice-ref> + <service-ref> <service-ref-name>org.jboss.test.ws.jaxws.samples.webserviceref.EJB3Client/service4</service-ref-name> <wsdl-override>META-INF/wsdl/TestEndpoint.wsdl</wsdl-override> - </webservice-ref> + </service-ref>  - <webservice-ref> + <service-ref> <service-ref-name>TestEndpointService5</service-ref-name> <wsdl-override>META-INF/wsdl/TestEndpoint.wsdl</wsdl-override> - </webservice-ref> + </service-ref>  - <webservice-ref> + <service-ref> <service-ref-name>org.jboss.test.ws.jaxws.samples.webserviceref.EJB3Client/service6</service-ref-name> <wsdl-override>META-INF/wsdl/TestEndpoint.wsdl</wsdl-override> - </webservice-ref> + </service-ref>  - <webservice-ref> + <service-ref> <service-ref-name>port1</service-ref-name> <wsdl-override>META-INF/wsdl/TestEndpoint.wsdl</wsdl-override> - </webservice-ref> + </service-ref>  - <webservice-ref> + <service-ref> <service-ref-name>Port2</service-ref-name> <wsdl-override>META-INF/wsdl/TestEndpoint.wsdl</wsdl-override> - </webservice-ref> + </service-ref>  - <webservice-ref> + <service-ref> <service-ref-name>org.jboss.test.ws.jaxws.samples.webserviceref.EJB3Client/port3</service-ref-name> <wsdl-override>META-INF/wsdl/TestEndpoint.wsdl</wsdl-override> - </webservice-ref> + </service-ref> </session> </enterprise-beans> Modified: branches/tdiesler/trunk/jbossws-tests/src/resources/jaxws/samples/webserviceref/META-INF-override/jboss-client.xml =================================================================== --- branches/tdiesler/trunk/jbossws-tests/src/resources/jaxws/samples/webserviceref/META-INF-override/jboss-client.xml 2007-03-06 13:45:43 UTC (rev 2535) +++ branches/tdiesler/trunk/jbossws-tests/src/resources/jaxws/samples/webserviceref/META-INF-override/jboss-client.xml 2007-03-06 15:20:12 UTC (rev 2536) @@ -8,78 +8,78 @@  - <webservice-ref> + <service-ref> <service-ref-name>Service1</service-ref-name> - <service-class-name>org.jboss.test.ws.jaxws.samples.webserviceref.TestEndpointService</service-class-name> + <service-interface>org.jboss.test.ws.jaxws.samples.webserviceref.TestEndpointService</service-interface> <service-qname>{http://org.jboss.ws/wsref}TestEndpointService</service-qname> <wsdl-override>META-INF/wsdl/TestEndpoint.wsdl</wsdl-override> - </webservice-ref> + </service-ref>  - <webservice-ref> + <service-ref> <service-ref-name>Service2</service-ref-name> <config-name>Custom Client</config-name> <config-file>META-INF/jbossws-client-config.xml</config-file> <wsdl-override>META-INF/wsdl/TestEndpoint.wsdl</wsdl-override> - </webservice-ref> + </service-ref>  - <webservice-ref> + <service-ref> <service-ref-name>Service3</service-ref-name> - <service-class-name>org.jboss.test.ws.jaxws.samples.webserviceref.TestEndpointService</service-class-name> + <service-interface>org.jboss.test.ws.jaxws.samples.webserviceref.TestEndpointService</service-interface> <service-qname>{http://org.jboss.ws/wsref}TestEndpointService</service-qname> <wsdl-override>META-INF/wsdl/TestEndpoint.wsdl</wsdl-override> - </webservice-ref> + </service-ref>  - <webservice-ref> + <service-ref> <service-ref-name>Service4</service-ref-name> - <port-info> + <port-component-ref> <service-endpoint-interface>org.jboss.test.ws.jaxws.samples.webserviceref.TestEndpoint</service-endpoint-interface> <config-name>Custom Client</config-name> <config-file>META-INF/jbossws-client-config.xml</config-file> - </port-info> + </port-component-ref> <wsdl-override>META-INF/wsdl/TestEndpoint.wsdl</wsdl-override> - </webservice-ref> + </service-ref>  - <webservice-ref> + <service-ref> <service-ref-name>Port1</service-ref-name> - <port-info> + <port-component-ref> <port-qname>{http://org.jboss.ws/wsref}TestEndpointPort</port-qname> <config-name>Custom Client</config-name> <config-file>META-INF/jbossws-client-config.xml</config-file> - </port-info> + </port-component-ref> <wsdl-override>META-INF/wsdl/TestEndpoint.wsdl</wsdl-override> - </webservice-ref> + </service-ref>  - <webservice-ref> + <service-ref> <service-ref-name>Port2</service-ref-name> - <port-info> + <port-component-ref> <service-endpoint-interface>org.jboss.test.ws.jaxws.samples.webserviceref.TestEndpoint</service-endpoint-interface> <config-name>Custom Client</config-name> <config-file>META-INF/jbossws-client-config.xml</config-file> - </port-info> + </port-component-ref> <wsdl-override>META-INF/wsdl/TestEndpoint.wsdl</wsdl-override> - </webservice-ref> + </service-ref>  - <webservice-ref> + <service-ref> <service-ref-name>Port3</service-ref-name> - <port-info> + <port-component-ref> <service-endpoint-interface>org.jboss.test.ws.jaxws.samples.webserviceref.TestEndpoint</service-endpoint-interface> <port-qname>{http://org.jboss.ws/wsref}TestEndpointPort</port-qname> <stub-property> @@ -90,8 +90,8 @@ <name>javax.xml.ws.security.auth.password</name> <value>thefrog</value> </stub-property> - </port-info> + </port-component-ref> <wsdl-override>META-INF/wsdl/TestEndpoint.wsdl</wsdl-override> - </webservice-ref> + </service-ref> </jboss-client> \ No newline at end of file Modified: branches/tdiesler/trunk/jbossws-tests/src/resources/jaxws/samples/webserviceref/META-INF-secure/jboss-client.xml =================================================================== --- branches/tdiesler/trunk/jbossws-tests/src/resources/jaxws/samples/webserviceref/META-INF-secure/jboss-client.xml 2007-03-06 13:45:43 UTC (rev 2535) +++ branches/tdiesler/trunk/jbossws-tests/src/resources/jaxws/samples/webserviceref/META-INF-secure/jboss-client.xml 2007-03-06 15:20:12 UTC (rev 2536) @@ -5,11 +5,11 @@ <jboss-client> <jndi-name>jbossws-client</jndi-name> - <webservice-ref> + <service-ref> <service-ref-name>SecureService1</service-ref-name> - <service-class-name>org.jboss.test.ws.jaxws.samples.webserviceref.SecureEndpointService</service-class-name> + <service-interface>org.jboss.test.ws.jaxws.samples.webserviceref.SecureEndpointService</service-interface> <service-qname>{http://org.jboss.ws/wsref}SecureEndpointService</service-qname> - <port-info> + <port-component-ref> <service-endpoint-interface>org.jboss.test.ws.jaxws.samples.webserviceref.SecureEndpoint</service-endpoint-interface> <port-qname>{http://org.jboss.ws/wsref}SecureEndpointPort</port-qname> <stub-property> @@ -20,13 +20,13 @@ <name>javax.xml.ws.security.auth.password</name> <value>thefrog</value> </stub-property> - </port-info> + </port-component-ref> <wsdl-override>http://@jbosstest.host.name@:8080/jaxws-samples-webserviceref-secure/SecureEndpoint?wsdl</wsdl-override> - </webservice-ref> + </service-ref> - <webservice-ref> + <service-ref> <service-ref-name>SecureService2</service-ref-name> - <port-info> + <port-component-ref> <port-qname>{http://org.jboss.ws/wsref}SecureEndpointPort</port-qname> <stub-property> <name>javax.xml.ws.security.auth.username</name> @@ -36,13 +36,13 @@ <name>javax.xml.ws.security.auth.password</name> <value>thefrog</value> </stub-property> - </port-info> + </port-component-ref> <wsdl-override>http://@jbosstest.host.name@:8080/jaxws-samples-webserviceref-secure/SecureEndpoint?wsdl</wsdl-override> - </webservice-ref> + </service-ref> - <webservice-ref> + <service-ref> <service-ref-name>SecurePort1</service-ref-name> - <port-info> + <port-component-ref> <service-endpoint-interface>org.jboss.test.ws.jaxws.samples.webserviceref.SecureEndpoint</service-endpoint-interface> <stub-property> <name>javax.xml.ws.security.auth.username</name> @@ -52,8 +52,8 @@ <name>javax.xml.ws.security.auth.password</name> <value>thefrog</value> </stub-property> - </port-info> + </port-component-ref> <wsdl-override>http://@jbosstest.host.name@:8080/jaxws-samples-webserviceref-secure/SecureEndpoint?wsdl</wsdl-override> - </webservice-ref> + </service-ref> </jboss-client> \ No newline at end of file

19 years, 1 month

1
0
0 / 0

JBossWS SVN: r2535 - in trunk/jbossws-core/src/java/org/jboss/ws: core/soap/attachment and 3 other directories.

by jbossws-commits＠lists.jboss.org

Author: heiko.braun(a)jboss.com Date: 2007-03-06 08:45:43 -0500 (Tue, 06 Mar 2007) New Revision: 2535 Modified: trunk/jbossws-core/src/java/org/jboss/ws/core/CommonSOAPBinding.java trunk/jbossws-core/src/java/org/jboss/ws/core/EndpointInvocation.java trunk/jbossws-core/src/java/org/jboss/ws/core/soap/attachment/XmlDataContentHandler.java trunk/jbossws-core/src/java/org/jboss/ws/core/utils/IOUtils.java trunk/jbossws-core/src/java/org/jboss/ws/metadata/builder/jaxws/JAXWSMetaDataBuilder.java trunk/jbossws-core/src/java/org/jboss/ws/metadata/builder/jaxws/JAXWSWebServiceMetaDataBuilder.java trunk/jbossws-core/src/java/org/jboss/ws/metadata/umdm/EndpointMetaData.java Log: Fix SWA for JAX-WS Modified: trunk/jbossws-core/src/java/org/jboss/ws/core/CommonSOAPBinding.java =================================================================== --- trunk/jbossws-core/src/java/org/jboss/ws/core/CommonSOAPBinding.java 2007-03-06 11:56:20 UTC (rev 2534) +++ trunk/jbossws-core/src/java/org/jboss/ws/core/CommonSOAPBinding.java 2007-03-06 13:45:43 UTC (rev 2535) @@ -387,7 +387,7 @@ if (paramMetaData.isSwA()) { CIDGenerator cidGenerator = resMessage.getCidGenerator(); - AttachmentPart part = createAttachmentPart(retMetaData, value, cidGenerator); + AttachmentPart part = createAttachmentPart(paramMetaData, value, cidGenerator); resMessage.addAttachmentPart(part); } else @@ -530,7 +530,7 @@ handleException(e); } } - + public Object bindFaultMessage(Exception ex) { SOAPMessage faultMessage = createFaultMessageFromException(ex); @@ -570,8 +570,11 @@ DataHandler handler = (DataHandler)value; String mimeType = MimeUtils.getBaseMimeType(handler.getContentType()); + // JAX-WS 2.0, 2.6.3.1 MIME Content + // Conformance (MIME type mismatch): On receipt of a message where the MIME type of a part does not + // match that described in the WSDL an implementation SHOULD throw a WebServiceException. if (mimeTypes != null && !MimeUtils.isMemberOf(mimeType, mimeTypes)) - throw new BindingException("Mime type " + mimeType + " not allowed for parameter " + partName + " allowed types are " + mimeTypes); + log.warn("Mime type " + mimeType + " not allowed for parameter " + partName + " allowed types are " + mimeTypes); part.setDataHandler((DataHandler)value); } @@ -777,7 +780,7 @@ if (paramMetaData.isXOP() && XOPContext.isXOPEncodedRequest()) { SOAPMessageImpl soapMessage = (SOAPMessageImpl)MessageContextAssociation.peekMessageContext().getSOAPMessage(); - soapMessage.setXOPMessage(true); + soapMessage.setXOPMessage(true); } return soapContentElement; } Modified: trunk/jbossws-core/src/java/org/jboss/ws/core/EndpointInvocation.java =================================================================== --- trunk/jbossws-core/src/java/org/jboss/ws/core/EndpointInvocation.java 2007-03-06 11:56:20 UTC (rev 2534) +++ trunk/jbossws-core/src/java/org/jboss/ws/core/EndpointInvocation.java 2007-03-06 13:45:43 UTC (rev 2535) @@ -207,8 +207,11 @@ DataHandler handler = part.getDataHandler(); String mimeType = MimeUtils.getBaseMimeType(handler.getContentType()); + // JAX-WS 2.0, 2.6.3.1 MIME Content + // Conformance (MIME type mismatch): On receipt of a message where the MIME type of a part does not + // match that described in the WSDL an implementation SHOULD throw a WebServiceException. if (mimeTypes != null && !MimeUtils.isMemberOf(mimeType, mimeTypes)) - throw new SOAPException("Mime type " + mimeType + " not allowed for parameter " + xmlName + " allowed types are " + mimeTypes); + log.warn("Mime type " + mimeType + " not allowed for parameter " + xmlName + " allowed types are " + mimeTypes); retValue = part.getDataHandler(); } Modified: trunk/jbossws-core/src/java/org/jboss/ws/core/soap/attachment/XmlDataContentHandler.java =================================================================== --- trunk/jbossws-core/src/java/org/jboss/ws/core/soap/attachment/XmlDataContentHandler.java 2007-03-06 11:56:20 UTC (rev 2534) +++ trunk/jbossws-core/src/java/org/jboss/ws/core/soap/attachment/XmlDataContentHandler.java 2007-03-06 13:45:43 UTC (rev 2535) @@ -26,6 +26,7 @@ import java.io.IOException; import java.io.InputStream; import java.io.OutputStream; +import java.io.Reader; import javax.activation.ActivationDataFlavor; import javax.activation.DataContentHandler; @@ -102,9 +103,14 @@ // TODO - add support for reader source InputStream stream = ((StreamSource) obj).getInputStream(); - if (stream == null) - throw new IOException("XML Content handler requires an input stream based StreamSource"); + if (stream != null) + { + IOUtils.copyStream(os, stream); + } + else + { + IOUtils.copyReader(os, ((StreamSource) obj).getReader()); - IOUtils.copyStream(os, stream); + } } } \ No newline at end of file Modified: trunk/jbossws-core/src/java/org/jboss/ws/core/utils/IOUtils.java =================================================================== --- trunk/jbossws-core/src/java/org/jboss/ws/core/utils/IOUtils.java 2007-03-06 11:56:20 UTC (rev 2534) +++ trunk/jbossws-core/src/java/org/jboss/ws/core/utils/IOUtils.java 2007-03-06 13:45:43 UTC (rev 2535) @@ -72,6 +72,18 @@ r = ins.read(bytes); } } + + public static void copyReader(OutputStream outs, Reader reader) throws IOException + { + OutputStreamWriter writer = new OutputStreamWriter(outs); + char[] bytes = new char[1024]; + int r = reader.read(bytes); + while (r > 0) + { + writer.write(bytes, 0, r); + r = reader.read(bytes); + } + } public static byte[] convertToBytes(DataHandler dh) { Modified: trunk/jbossws-core/src/java/org/jboss/ws/metadata/builder/jaxws/JAXWSMetaDataBuilder.java =================================================================== --- trunk/jbossws-core/src/java/org/jboss/ws/metadata/builder/jaxws/JAXWSMetaDataBuilder.java 2007-03-06 11:56:20 UTC (rev 2534) +++ trunk/jbossws-core/src/java/org/jboss/ws/metadata/builder/jaxws/JAXWSMetaDataBuilder.java 2007-03-06 13:45:43 UTC (rev 2535) @@ -23,38 +23,8 @@ // $Id$ -import java.io.File; -import java.io.InputStream; -import java.lang.annotation.Annotation; -import java.lang.reflect.Method; -import java.lang.reflect.ParameterizedType; -import java.lang.reflect.Type; -import java.net.MalformedURLException; -import java.net.URL; -import java.rmi.RemoteException; -import java.util.ArrayList; -import java.util.Collection; -import java.util.List; -import java.util.Map; - -import javax.jws.HandlerChain; -import javax.jws.Oneway; -import javax.jws.WebMethod; -import javax.jws.WebParam; -import javax.jws.WebResult; -import javax.jws.soap.SOAPBinding; -import javax.jws.soap.SOAPMessageHandlers; -import javax.jws.soap.SOAPBinding.ParameterStyle; -import javax.xml.bind.JAXBException; -import javax.xml.namespace.QName; -import javax.xml.rpc.ParameterMode; -import javax.xml.ws.BindingType; -import javax.xml.ws.RequestWrapper; -import javax.xml.ws.ResponseWrapper; -import javax.xml.ws.WebFault; -import javax.xml.ws.addressing.Action; -import javax.xml.ws.addressing.AddressingProperties; - +import com.sun.xml.bind.api.JAXBRIContext; +import com.sun.xml.bind.api.TypeReference; import org.jboss.logging.Logger; import org.jboss.ws.Constants; import org.jboss.ws.WSException; @@ -73,20 +43,39 @@ import org.jboss.ws.metadata.jsr181.HandlerChainFactory; import org.jboss.ws.metadata.jsr181.HandlerChainMetaData; import org.jboss.ws.metadata.jsr181.HandlerChainsMetaData; -import org.jboss.ws.metadata.umdm.EndpointMetaData; -import org.jboss.ws.metadata.umdm.FaultMetaData; -import org.jboss.ws.metadata.umdm.OperationMetaData; -import org.jboss.ws.metadata.umdm.ParameterMetaData; -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.umdm.*; import org.jboss.ws.metadata.umdm.HandlerMetaData.HandlerType; +import org.jboss.ws.metadata.wsdl.*; import org.jboss.xb.binding.ObjectModelFactory; import org.jboss.xb.binding.Unmarshaller; import org.jboss.xb.binding.UnmarshallerFactory; -import com.sun.xml.bind.api.JAXBRIContext; -import com.sun.xml.bind.api.TypeReference; +import javax.jws.*; +import javax.jws.soap.SOAPBinding; +import javax.jws.soap.SOAPBinding.ParameterStyle; +import javax.jws.soap.SOAPMessageHandlers; +import javax.xml.bind.JAXBException; +import javax.xml.namespace.QName; +import javax.xml.rpc.ParameterMode; +import javax.xml.ws.BindingType; +import javax.xml.ws.RequestWrapper; +import javax.xml.ws.ResponseWrapper; +import javax.xml.ws.WebFault; +import javax.xml.ws.addressing.Action; +import javax.xml.ws.addressing.AddressingProperties; +import java.io.File; +import java.io.InputStream; +import java.lang.annotation.Annotation; +import java.lang.reflect.Method; +import java.lang.reflect.ParameterizedType; +import java.lang.reflect.Type; +import java.net.MalformedURLException; +import java.net.URL; +import java.rmi.RemoteException; +import java.util.ArrayList; +import java.util.Collection; +import java.util.List; +import java.util.Map; /** * Abstract class that represents a JAX-WS metadata builder. @@ -624,7 +613,7 @@ if (mode != ParameterMode.OUT) wrappedParameters.add(wrappedParameter); - + if (mode != ParameterMode.IN) { wrappedParameter.setHolder(true); @@ -662,6 +651,8 @@ opMetaData.addParameter(paramMetaData); javaTypes.add(javaType); typeRefs.add(new TypeReference(xmlName, genericType, parameterAnnotations[i])); + + processMIMEBinding(epMetaData, opMetaData, paramMetaData); } } @@ -717,6 +708,8 @@ javaTypes.add(returnType); typeRefs.add(new TypeReference(xmlName, genericReturnType, method.getAnnotations())); + + processMIMEBinding(epMetaData, opMetaData, retMetaData); } } @@ -753,6 +746,44 @@ processMetaExtensions(method, epMetaData, opMetaData); } + private void processMIMEBinding(EndpointMetaData epMetaData, OperationMetaData opMetaData, ParameterMetaData paramMetaData) + { + // process SWA metadata + WSDLDefinitions wsdlDef = epMetaData.getServiceMetaData().getWsdlDefinitions(); + if(wsdlDef!=null) + { + for(WSDLBinding binding : wsdlDef.getBindings()) + { + for(WSDLBindingOperation bindingOp : binding.getOperations()) + { + // it might an input or output parameter + WSDLBindingMessageReference[] inOrOutPut = + (paramMetaData.getMode().equals(ParameterMode.IN) || paramMetaData.getMode().equals(ParameterMode.INOUT)) ? + ( WSDLBindingMessageReference[])bindingOp.getInputs() : ( WSDLBindingMessageReference[])bindingOp.getOutputs(); + + if(inOrOutPut.length > 0) + { + // find matching operation + if(bindingOp.getRef().equals( opMetaData.getQName())) + { + WSDLBindingMessageReference bindingInput = inOrOutPut[0]; + for (WSDLMIMEPart mimePart : bindingInput.getMimeParts()) + { + String partName = mimePart.getPartName(); + if(paramMetaData.getPartName().equals(partName)) + { + log.debug("Identified SWA parameter: " + partName + ", mimeTypes=" +mimePart.getMimeTypes()); + paramMetaData.setSwA(true); + paramMetaData.setMimeTypes(mimePart.getMimeTypes()); + } + } + } + } + } + } + } + } + protected void processWebMethods(EndpointMetaData epMetaData, Class wsClass) { epMetaData.clearOperations(); Modified: trunk/jbossws-core/src/java/org/jboss/ws/metadata/builder/jaxws/JAXWSWebServiceMetaDataBuilder.java =================================================================== --- trunk/jbossws-core/src/java/org/jboss/ws/metadata/builder/jaxws/JAXWSWebServiceMetaDataBuilder.java 2007-03-06 11:56:20 UTC (rev 2534) +++ trunk/jbossws-core/src/java/org/jboss/ws/metadata/builder/jaxws/JAXWSWebServiceMetaDataBuilder.java 2007-03-06 13:45:43 UTC (rev 2535) @@ -117,6 +117,7 @@ processBindingType(sepMetaData, seiClass); // Process web methods + if(result.wsdlLocation!=null) serviceMetaData.setWsdlLocation(result.wsdlLocation); processWebMethods(sepMetaData, seiClass); // Init the transport guarantee Modified: trunk/jbossws-core/src/java/org/jboss/ws/metadata/umdm/EndpointMetaData.java =================================================================== --- trunk/jbossws-core/src/java/org/jboss/ws/metadata/umdm/EndpointMetaData.java 2007-03-06 11:56:20 UTC (rev 2534) +++ trunk/jbossws-core/src/java/org/jboss/ws/metadata/umdm/EndpointMetaData.java 2007-03-06 13:45:43 UTC (rev 2535) @@ -529,11 +529,13 @@ { List<Class> types = typeMapping.getJavaTypes(xmlType); + // TODO: Clarification. In which cases is the type already registered? boolean registered = false; for (Class current : types) { if (current.getName().equals(javaTypeName)) { + registeredTypes.add(current); registered = true; break; }

19 years, 1 month

1
0
0 / 0

JBossWS SVN: r2534 - in trunk/build: ant-import and 1 other directory.

by jbossws-commits＠lists.jboss.org

Author: thomas.diesler(a)jboss.com Date: 2007-03-06 06:56:20 -0500 (Tue, 06 Mar 2007) New Revision: 2534 Modified: trunk/build/ant-import/build-thirdparty.xml trunk/build/ant.properties.example trunk/build/version.properties Log: Add support for eclipse compiler Modified: trunk/build/ant-import/build-thirdparty.xml =================================================================== --- trunk/build/ant-import/build-thirdparty.xml 2007-03-06 11:50:49 UTC (rev 2533) +++ trunk/build/ant-import/build-thirdparty.xml 2007-03-06 11:56:20 UTC (rev 2534) @@ -35,6 +35,8 @@ <get src="${jboss.repository}/apache-xerces/${apache-xerces}/lib/xml-apis.jar" dest="${thirdparty.dir}/xml-apis.jar" usetimestamp="true" verbose="true"/> <get src="${jboss.repository}/apache-xmlsec/${apache-xmlsec}/lib/xmlsec.jar" dest="${thirdparty.dir}/xmlsec.jar" usetimestamp="true" verbose="true"/> <get src="${jboss.repository}/dom4j/${dom4j}/lib/dom4j.jar" dest="${thirdparty.dir}/dom4j.jar" usetimestamp="true" verbose="true"/> + <get src="${jboss.repository}/eclipse-compiler/${eclipse-compiler}/lib/jdtCompilerAdapter.jar" dest="${thirdparty.dir}/jdtCompilerAdapter.jar" usetimestamp="true" verbose="true"/> + <get src="${jboss.repository}/eclipse-compiler/${eclipse-compiler}/lib/org.eclipse.jdt.core.jar" dest="${thirdparty.dir}/org.eclipse.jdt.core.jar" usetimestamp="true" verbose="true"/> <get src="${jboss.repository}/gnu-getopt/${gnu-getopt}/lib/getopt.jar" dest="${thirdparty.dir}/getopt.jar" usetimestamp="true" verbose="true"/> <get src="${jboss.repository}/hibernate/${hibernate}/lib/hibernate3.jar" dest="${thirdparty.dir}/hibernate3.jar" usetimestamp="true" verbose="true"/> <get src="${jboss.repository}/ibm-wsdl4j/${ibm-wsdl4j}/lib/wsdl4j.jar" dest="${thirdparty.dir}/wsdl4j.jar" usetimestamp="true" verbose="true"/> @@ -88,6 +90,7 @@ <path id="core.classpath"> <pathelement location="${thirdparty.dir}/ejb3.deployer/jboss-annotations-ejb3.jar"/> <pathelement location="${thirdparty.dir}/ejb3.deployer/jboss-ejb3x.jar"/> + <pathelement location="${thirdparty.dir}/activation.jar"/> <pathelement location="${thirdparty.dir}/javassist.jar"/> <pathelement location="${thirdparty.dir}/jaxb-api.jar"/> <pathelement location="${thirdparty.dir}/jaxb-xjc.jar"/> Modified: trunk/build/ant.properties.example =================================================================== --- trunk/build/ant.properties.example 2007-03-06 11:50:49 UTC (rev 2533) +++ trunk/build/ant.properties.example 2007-03-06 11:56:20 UTC (rev 2534) @@ -64,3 +64,7 @@ javac.fail.onerror=yes javac.verbose=no +# Use the eclipse compiler to allow for hot code swapping +# http://www.jboss.org/index.html?module=bb&op=viewtopic&t=65783 +# build.compiler=org.eclipse.jdt.core.JDTCompilerAdapter + Modified: trunk/build/version.properties =================================================================== --- trunk/build/version.properties 2007-03-06 11:50:49 UTC (rev 2533) +++ trunk/build/version.properties 2007-03-06 11:56:20 UTC (rev 2534) @@ -31,6 +31,7 @@ apache-xalan=j_2.7.0 apache-xerces=2.9.0 dom4j=1.6.1 +eclipse-compiler=3.2.2 gnu-getopt=1.0.10 hibernate=3.2.1.GA jaxen=1.1-beta-10

19 years, 1 month

1
0
0 / 0

JBossWS SVN: r2533 - branches/dlofthouse.

by jbossws-commits＠lists.jboss.org

Author: darran.lofthouse(a)jboss.com Date: 2007-03-06 06:50:49 -0500 (Tue, 06 Mar 2007) New Revision: 2533 Added: branches/dlofthouse/JBWS-1464/ Log: Recreate branch. Copied: branches/dlofthouse/JBWS-1464 (from rev 2532, trunk)

19 years, 1 month

1
0
0 / 0

JBossWS SVN: r2532 - branches/dlofthouse.

by jbossws-commits＠lists.jboss.org

Author: darran.lofthouse(a)jboss.com Date: 2007-03-06 06:50:09 -0500 (Tue, 06 Mar 2007) New Revision: 2532 Removed: branches/dlofthouse/JBWS-1464/ Log: Recreate branch.

19 years, 1 month

1
0
0 / 0

JBossWS SVN: r2531 - trunk/jbossws-core/src/java/org/jboss/ws/core/soap.

by jbossws-commits＠lists.jboss.org

Author: jason.greene(a)jboss.com Date: 2007-03-05 23:44:30 -0500 (Mon, 05 Mar 2007) New Revision: 2531 Modified: trunk/jbossws-core/src/java/org/jboss/ws/core/soap/MessageFactoryImpl.java Log: Fix JBCTS-437 Modified: trunk/jbossws-core/src/java/org/jboss/ws/core/soap/MessageFactoryImpl.java =================================================================== --- trunk/jbossws-core/src/java/org/jboss/ws/core/soap/MessageFactoryImpl.java 2007-03-06 01:24:43 UTC (rev 2530) +++ trunk/jbossws-core/src/java/org/jboss/ws/core/soap/MessageFactoryImpl.java 2007-03-06 04:44:30 UTC (rev 2531) @@ -64,18 +64,24 @@ private Mode serviceMode; // The style used by this MessageFactory private Style style; + // Used if the style is dynamic + private boolean dynamic; public MessageFactoryImpl() { envNamespace = SOAPConstants.URI_NS_SOAP_1_1_ENVELOPE; } - public MessageFactoryImpl(String protocol) + public MessageFactoryImpl(String protocol) throws SOAPException { - if (SOAPConstants.SOAP_1_2_PROTOCOL.equals(protocol)) + if (SOAPConstants.SOAP_1_1_PROTOCOL.equals(protocol) || SOAPConstants.DEFAULT_SOAP_PROTOCOL.equals(protocol)) + envNamespace = SOAPConstants.URI_NS_SOAP_1_1_ENVELOPE; + else if (SOAPConstants.SOAP_1_2_PROTOCOL.equals(protocol)) envNamespace = SOAPConstants.URI_NS_SOAP_1_2_ENVELOPE; + else if (SOAPConstants.DYNAMIC_SOAP_PROTOCOL.equals(protocol)) + dynamic = true; else - envNamespace = SOAPConstants.URI_NS_SOAP_1_1_ENVELOPE; + throw new SOAPException("Unknown protocol: " + protocol); } /** @@ -144,6 +150,9 @@ */ public SOAPMessage createMessage() throws SOAPException { + if (dynamic) + throw new UnsupportedOperationException(); + SOAPMessageImpl soapMessage = new SOAPMessageImpl(); SOAPPartImpl soapPart = (SOAPPartImpl)soapMessage.getSOAPPart(); new SOAPEnvelopeImpl(soapPart, envNamespace);

19 years, 1 month

1
0
0 / 0

JBossWS SVN: r2530 - trunk/jbossws-core/src/java/org/jboss/ws/core/jaxws.

by jbossws-commits＠lists.jboss.org

Author: jason.greene(a)jboss.com Date: 2007-03-05 20:24:43 -0500 (Mon, 05 Mar 2007) New Revision: 2530 Modified: trunk/jbossws-core/src/java/org/jboss/ws/core/jaxws/JAXBSerializer.java Log: Improve performance and accuracy by using the PMD for type information 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-05 23:01:13 UTC (rev 2529) +++ trunk/jbossws-core/src/java/org/jboss/ws/core/jaxws/JAXBSerializer.java 2007-03-06 01:24:43 UTC (rev 2530) @@ -28,6 +28,7 @@ import javax.xml.bind.JAXBContext; import javax.xml.bind.JAXBElement; import javax.xml.bind.Marshaller; +import javax.xml.datatype.XMLGregorianCalendar; import javax.xml.namespace.QName; import javax.xml.transform.Result; import javax.xml.ws.WebServiceException; @@ -40,7 +41,9 @@ 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. @@ -65,13 +68,18 @@ Result result = null; try { - Class javaType = deriveType(value, xmlType, serContext.getTypeMapping()); + // The PMD contains the base type, which is needed for JAXB to marshall xsi:type correctly. + // This should be more efficient and accurate than searching the type mapping + ParameterMetaData pmd = (ParameterMetaData)serContext.getProperty(ParameterMetaData.class.getName()); + Class expectedType = pmd.getJavaType(); + Class actualType = value.getClass(); //JAXBContextCache contextCache = JAXBContextCache.getContextCache(); - //JAXBContext jaxbContext = contextCache.getInstance(javaType); + //JAXBContext jaxbContext = contextCache.getInstance(expectedType, actualType); + + Class[] types = shouldFilter(actualType) ? new Class[]{expectedType} : new Class[]{expectedType, actualType}; + JAXBContext jaxbContext = JAXBContext.newInstance(types); - JAXBContext jaxbContext = JAXBContext.newInstance(javaType); - Marshaller marshaller = jaxbContext.createMarshaller(); marshaller.setProperty(Marshaller.JAXB_FRAGMENT, true); @@ -80,7 +88,7 @@ // It's safe to pass a stream result, because the SCE will always be in XML_VALID state afterwards. // This state can safely be written to an outstream. See XMLFragment and XMLContent as well. result = new BufferedStreamResult(); - marshaller.marshal(new JAXBElement(xmlName, javaType, value), result); + marshaller.marshal(new JAXBElement(xmlName, expectedType, value), result); if(log.isDebugEnabled()) log.debug("serialized: " + result); } @@ -91,17 +99,11 @@ return result; } - - private Class deriveType(Object value, QName xmlType, TypeMappingImpl typeMapping) throws BindingException + + // Remove this when we add a XMLGregorianCalendar Serializer + private boolean shouldFilter(Class<?> actualType) { - // DO NOT REMOVE TYPE MAPPING CODE!!! - // We must pass the base type to JAXB so that xsi:type is serialized - List<Class> possibleJavaTypes = typeMapping.getJavaTypes(xmlType); - for(Class type : possibleJavaTypes) - if(JavaUtils.isAssignableFrom(type, value.getClass())) - return type; - - throw new BindingException("Unable to resolve target java type"); + return XMLGregorianCalendar.class.isAssignableFrom(actualType); } // 4.21 Conformance (Marshalling failure): If an error occurs when using the supplied JAXBContext to marshall

19 years, 1 month

1
0
0 / 0

2026

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

jbossws-commits March 2007