[jbossws-commits] JBossWS SVN: r1572 - in branches/tdiesler/trunk/src: main/java/org/jboss/ws/common main/java/org/jboss/ws/common/binding main/java/org/jboss/ws/common/config main/java/org/jboss/ws/common/jaxrpc main/java/org/jboss/ws/common/jaxrpc/encoding main/java/org/jboss/ws/common/jbossxb main/java/org/jboss/ws/common/metadata main/java/org/jboss/ws/common/metadata/config main/java/org/jboss/ws/common/metadata/config/jaxrpc main/java/org/jboss/ws/common/metadata/config/jaxws main/java/org/jboss/ws/co

Author: thomas.diesler(a)jboss.com Date: 2006-12-06 06:19:33 -0500 (Wed, 06 Dec 2006) New Revision: 1572 Added: branches/tdiesler/trunk/src/main/java/org/jboss/ws/common/NameImpl.java branches/tdiesler/trunk/src/main/java/org/jboss/ws/common/binding/ComplexTypeDeserializer.java branches/tdiesler/trunk/src/main/java/org/jboss/ws/common/binding/ComplexTypeSerializer.java branches/tdiesler/trunk/src/main/java/org/jboss/ws/common/config/ branches/tdiesler/trunk/src/main/java/org/jboss/ws/common/config/ServerConfig.java branches/tdiesler/trunk/src/main/java/org/jboss/ws/common/config/ServerConfigFactory.java branches/tdiesler/trunk/src/main/java/org/jboss/ws/common/jaxrpc/EncodedTypeMapping.java branches/tdiesler/trunk/src/main/java/org/jboss/ws/common/jaxrpc/TypeMappingRegistryImpl.java branches/tdiesler/trunk/src/main/java/org/jboss/ws/common/jaxrpc/Use.java branches/tdiesler/trunk/src/main/java/org/jboss/ws/common/jbossxb/ branches/tdiesler/trunk/src/main/java/org/jboss/ws/common/jbossxb/JBossXBConstants.java branches/tdiesler/trunk/src/main/java/org/jboss/ws/common/jbossxb/JBossXBMarshaller.java branches/tdiesler/trunk/src/main/java/org/jboss/ws/common/jbossxb/JBossXBMarshallerImpl.java branches/tdiesler/trunk/src/main/java/org/jboss/ws/common/jbossxb/JBossXBSupport.java branches/tdiesler/trunk/src/main/java/org/jboss/ws/common/jbossxb/JBossXBUnmarshaller.java branches/tdiesler/trunk/src/main/java/org/jboss/ws/common/jbossxb/JBossXBUnmarshallerImpl.java branches/tdiesler/trunk/src/main/java/org/jboss/ws/common/jbossxb/MarshalException.java branches/tdiesler/trunk/src/main/java/org/jboss/ws/common/jbossxb/SchemaBindingBuilder.java branches/tdiesler/trunk/src/main/java/org/jboss/ws/common/jbossxb/UnmarshalException.java branches/tdiesler/trunk/src/main/java/org/jboss/ws/common/jbossxb/XercesXSMarshallerImpl.java branches/tdiesler/trunk/src/main/java/org/jboss/ws/common/metadata/config/ branches/tdiesler/trunk/src/main/java/org/jboss/ws/common/metadata/config/WSCommonConfig.java branches/tdiesler/trunk/src/main/java/org/jboss/ws/common/metadata/config/WSConfigFactory.java branches/tdiesler/trunk/src/main/java/org/jboss/ws/common/metadata/config/jaxrpc/ branches/tdiesler/trunk/src/main/java/org/jboss/ws/common/metadata/config/jaxrpc/WSClientConfigJAXRPC.java branches/tdiesler/trunk/src/main/java/org/jboss/ws/common/metadata/config/jaxrpc/WSCommonConfigJAXRPC.java branches/tdiesler/trunk/src/main/java/org/jboss/ws/common/metadata/config/jaxrpc/WSConfigFactoryJAXRPC.java branches/tdiesler/trunk/src/main/java/org/jboss/ws/common/metadata/config/jaxrpc/WSConfigRootJAXRPC.java branches/tdiesler/trunk/src/main/java/org/jboss/ws/common/metadata/config/jaxrpc/WSEndpointConfigJAXRPC.java branches/tdiesler/trunk/src/main/java/org/jboss/ws/common/metadata/config/jaxws/ branches/tdiesler/trunk/src/main/java/org/jboss/ws/common/metadata/config/jaxws/WSClientConfigJAXWS.java branches/tdiesler/trunk/src/main/java/org/jboss/ws/common/metadata/config/jaxws/WSCommonConfigJAXWS.java branches/tdiesler/trunk/src/main/java/org/jboss/ws/common/metadata/config/jaxws/WSConfigFactoryJAXWS.java branches/tdiesler/trunk/src/main/java/org/jboss/ws/common/metadata/config/jaxws/WSConfigRootJAXWS.java branches/tdiesler/trunk/src/main/java/org/jboss/ws/common/metadata/config/jaxws/WSEndpointConfigJAXWS.java branches/tdiesler/trunk/src/main/java/org/jboss/ws/common/metadata/config/jaxws/WSHandlerChainsConfigJAXWS.java branches/tdiesler/trunk/src/main/java/org/jboss/ws/common/metadata/j2ee/ branches/tdiesler/trunk/src/main/java/org/jboss/ws/common/metadata/j2ee/UnifiedApplicationMetaData.java branches/tdiesler/trunk/src/main/java/org/jboss/ws/common/metadata/j2ee/UnifiedBeanMetaData.java branches/tdiesler/trunk/src/main/java/org/jboss/ws/common/metadata/j2ee/UnifiedEjbPortComponentMetaData.java branches/tdiesler/trunk/src/main/java/org/jboss/ws/common/metadata/j2ee/UnifiedHandlerMetaData.java branches/tdiesler/trunk/src/main/java/org/jboss/ws/common/metadata/j2ee/UnifiedMessageDrivenMetaData.java branches/tdiesler/trunk/src/main/java/org/jboss/ws/common/metadata/j2ee/UnifiedPortComponentRefMetaData.java branches/tdiesler/trunk/src/main/java/org/jboss/ws/common/metadata/j2ee/UnifiedServiceRefMetaData.java branches/tdiesler/trunk/src/main/java/org/jboss/ws/common/metadata/j2ee/UnifiedSessionMetaData.java branches/tdiesler/trunk/src/main/java/org/jboss/ws/common/metadata/j2ee/UnifiedWebMetaData.java branches/tdiesler/trunk/src/main/java/org/jboss/ws/common/metadata/j2ee/UnifiedWebSecurityMetaData.java branches/tdiesler/trunk/src/main/java/org/jboss/ws/common/metadata/jsr181/ branches/tdiesler/trunk/src/main/java/org/jboss/ws/common/metadata/jsr181/HandlerChainFactory.java branches/tdiesler/trunk/src/main/java/org/jboss/ws/common/metadata/jsr181/HandlerChainMetaData.java branches/tdiesler/trunk/src/main/java/org/jboss/ws/common/metadata/jsr181/HandlerChainsMetaData.java branches/tdiesler/trunk/src/main/java/org/jboss/ws/core/ThreadLocalAssociation.java Removed: branches/tdiesler/trunk/src/main/java/org/jboss/ws/common/jbossxb/JBossXBConstants.java branches/tdiesler/trunk/src/main/java/org/jboss/ws/common/jbossxb/JBossXBDeserializer.java branches/tdiesler/trunk/src/main/java/org/jboss/ws/common/jbossxb/JBossXBDeserializerFactory.java branches/tdiesler/trunk/src/main/java/org/jboss/ws/common/jbossxb/JBossXBMarshaller.java branches/tdiesler/trunk/src/main/java/org/jboss/ws/common/jbossxb/JBossXBMarshallerImpl.java branches/tdiesler/trunk/src/main/java/org/jboss/ws/common/jbossxb/JBossXBSerializer.java branches/tdiesler/trunk/src/main/java/org/jboss/ws/common/jbossxb/JBossXBSerializerFactory.java branches/tdiesler/trunk/src/main/java/org/jboss/ws/common/jbossxb/JBossXBSupport.java branches/tdiesler/trunk/src/main/java/org/jboss/ws/common/jbossxb/JBossXBUnmarshaller.java branches/tdiesler/trunk/src/main/java/org/jboss/ws/common/jbossxb/JBossXBUnmarshallerImpl.java branches/tdiesler/trunk/src/main/java/org/jboss/ws/common/jbossxb/MarshalException.java branches/tdiesler/trunk/src/main/java/org/jboss/ws/common/jbossxb/SchemaBindingBuilder.java branches/tdiesler/trunk/src/main/java/org/jboss/ws/common/jbossxb/UnmarshalException.java branches/tdiesler/trunk/src/main/java/org/jboss/ws/common/jbossxb/XercesXSMarshallerImpl.java branches/tdiesler/trunk/src/main/java/org/jboss/ws/common/metadata/config/jaxrpc/WSClientConfigJAXRPC.java branches/tdiesler/trunk/src/main/java/org/jboss/ws/common/metadata/config/jaxrpc/WSCommonConfigJAXRPC.java branches/tdiesler/trunk/src/main/java/org/jboss/ws/common/metadata/config/jaxrpc/WSConfigFactoryJAXRPC.java branches/tdiesler/trunk/src/main/java/org/jboss/ws/common/metadata/config/jaxrpc/WSConfigRootJAXRPC.java branches/tdiesler/trunk/src/main/java/org/jboss/ws/common/metadata/config/jaxrpc/WSEndpointConfigJAXRPC.java branches/tdiesler/trunk/src/main/java/org/jboss/ws/common/metadata/config/jaxws/WSClientConfigJAXWS.java branches/tdiesler/trunk/src/main/java/org/jboss/ws/common/metadata/config/jaxws/WSCommonConfigJAXWS.java branches/tdiesler/trunk/src/main/java/org/jboss/ws/common/metadata/config/jaxws/WSConfigFactoryJAXWS.java branches/tdiesler/trunk/src/main/java/org/jboss/ws/common/metadata/config/jaxws/WSConfigRootJAXWS.java branches/tdiesler/trunk/src/main/java/org/jboss/ws/common/metadata/config/jaxws/WSEndpointConfigJAXWS.java branches/tdiesler/trunk/src/main/java/org/jboss/ws/common/metadata/config/jaxws/WSHandlerChainsConfigJAXWS.java branches/tdiesler/trunk/src/main/java/org/jboss/ws/common/metadata/j2ee/UnifiedApplicationMetaData.java branches/tdiesler/trunk/src/main/java/org/jboss/ws/common/metadata/j2ee/UnifiedBeanMetaData.java branches/tdiesler/trunk/src/main/java/org/jboss/ws/common/metadata/j2ee/UnifiedEjbPortComponentMetaData.java branches/tdiesler/trunk/src/main/java/org/jboss/ws/common/metadata/j2ee/UnifiedHandlerMetaData.java branches/tdiesler/trunk/src/main/java/org/jboss/ws/common/metadata/j2ee/UnifiedMessageDrivenMetaData.java branches/tdiesler/trunk/src/main/java/org/jboss/ws/common/metadata/j2ee/UnifiedPortComponentRefMetaData.java branches/tdiesler/trunk/src/main/java/org/jboss/ws/common/metadata/j2ee/UnifiedServiceRefMetaData.java branches/tdiesler/trunk/src/main/java/org/jboss/ws/common/metadata/j2ee/UnifiedSessionMetaData.java branches/tdiesler/trunk/src/main/java/org/jboss/ws/common/metadata/j2ee/UnifiedWebMetaData.java branches/tdiesler/trunk/src/main/java/org/jboss/ws/common/metadata/j2ee/UnifiedWebSecurityMetaData.java branches/tdiesler/trunk/src/main/java/org/jboss/ws/common/metadata/jsr181/HandlerChainFactory.java branches/tdiesler/trunk/src/main/java/org/jboss/ws/common/metadata/jsr181/HandlerChainMetaData.java branches/tdiesler/trunk/src/main/java/org/jboss/ws/common/metadata/jsr181/HandlerChainsMetaData.java branches/tdiesler/trunk/src/main/java/org/jboss/ws/common/utils/ThreadLocalAssociation.java branches/tdiesler/trunk/src/main/java/org/jboss/ws/core/binding/ComplexTypeDeserializer.java branches/tdiesler/trunk/src/main/java/org/jboss/ws/core/binding/ComplexTypeSerializer.java branches/tdiesler/trunk/src/main/java/org/jboss/ws/core/jaxrpc/EncodedTypeMapping.java branches/tdiesler/trunk/src/main/java/org/jboss/ws/core/jaxrpc/TypeMappingRegistryImpl.java branches/tdiesler/trunk/src/main/java/org/jboss/ws/core/jaxrpc/Use.java branches/tdiesler/trunk/src/main/java/org/jboss/ws/core/jbossxb/ branches/tdiesler/trunk/src/main/java/org/jboss/ws/core/metadata/config/WSCommonConfig.java branches/tdiesler/trunk/src/main/java/org/jboss/ws/core/metadata/config/WSConfigFactory.java branches/tdiesler/trunk/src/main/java/org/jboss/ws/core/metadata/config/jaxrpc/ branches/tdiesler/trunk/src/main/java/org/jboss/ws/core/metadata/config/jaxws/ branches/tdiesler/trunk/src/main/java/org/jboss/ws/core/metadata/j2ee/ branches/tdiesler/trunk/src/main/java/org/jboss/ws/core/metadata/jsr181/ branches/tdiesler/trunk/src/main/java/org/jboss/ws/core/server/ServerConfig.java branches/tdiesler/trunk/src/main/java/org/jboss/ws/core/server/ServerConfigFactory.java branches/tdiesler/trunk/src/main/java/org/jboss/ws/core/soap/NameImpl.java Modified: branches/tdiesler/trunk/src/main/java/org/jboss/ws/common/Constants.java branches/tdiesler/trunk/src/main/java/org/jboss/ws/common/jaxrpc/encoding/JBossXBDeserializer.java branches/tdiesler/trunk/src/main/java/org/jboss/ws/common/jaxrpc/encoding/JBossXBSerializer.java branches/tdiesler/trunk/src/main/java/org/jboss/ws/common/jaxrpc/encoding/SOAPElementDeserializer.java branches/tdiesler/trunk/src/main/java/org/jboss/ws/common/metadata/webservices/PortComponentMetaData.java branches/tdiesler/trunk/src/main/java/org/jboss/ws/common/metadata/webservices/WebservicesFactory.java branches/tdiesler/trunk/src/main/java/org/jboss/ws/common/metadata/wsdl/xsd/SchemaUtils.java branches/tdiesler/trunk/src/main/java/org/jboss/ws/common/umdm/ClientEndpointMetaData.java branches/tdiesler/trunk/src/main/java/org/jboss/ws/common/umdm/EndpointMetaData.java branches/tdiesler/trunk/src/main/java/org/jboss/ws/common/umdm/OperationMetaData.java branches/tdiesler/trunk/src/main/java/org/jboss/ws/common/umdm/ServerEndpointMetaData.java branches/tdiesler/trunk/src/main/java/org/jboss/ws/common/umdm/ServiceMetaData.java branches/tdiesler/trunk/src/main/java/org/jboss/ws/common/utils/IOUtils.java branches/tdiesler/trunk/src/main/java/org/jboss/ws/core/CommonSOAP11Binding.java branches/tdiesler/trunk/src/main/java/org/jboss/ws/core/CommonSOAPBinding.java branches/tdiesler/trunk/src/main/java/org/jboss/ws/core/jaxrpc/SOAPFaultHelperJAXRPC.java branches/tdiesler/trunk/src/main/java/org/jboss/ws/core/jaxrpc/ServiceImpl.java branches/tdiesler/trunk/src/main/java/org/jboss/ws/core/jaxrpc/ServiceObjectFactory.java branches/tdiesler/trunk/src/main/java/org/jboss/ws/core/jaxrpc/ServiceReferenceable.java branches/tdiesler/trunk/src/main/java/org/jboss/ws/core/jaxws/JAXBDeserializer.java branches/tdiesler/trunk/src/main/java/org/jboss/ws/core/jaxws/JAXBSerializer.java branches/tdiesler/trunk/src/main/java/org/jboss/ws/core/jaxws/core/SOAPFaultHelperJAXWS.java branches/tdiesler/trunk/src/main/java/org/jboss/ws/core/metadata/builder/MetaDataBuilder.java branches/tdiesler/trunk/src/main/java/org/jboss/ws/core/metadata/builder/jaxrpc/JAXRPCClientMetaDataBuilder.java branches/tdiesler/trunk/src/main/java/org/jboss/ws/core/metadata/builder/jaxrpc/JAXRPCMetaDataBuilder.java branches/tdiesler/trunk/src/main/java/org/jboss/ws/core/metadata/builder/jaxrpc/JAXRPCServerMetaDataBuilder.java branches/tdiesler/trunk/src/main/java/org/jboss/ws/core/metadata/builder/jaxws/JAXWSClientEndpointMetaDataBuilder.java branches/tdiesler/trunk/src/main/java/org/jboss/ws/core/metadata/builder/jaxws/JAXWSMetaDataBuilderEJB21.java branches/tdiesler/trunk/src/main/java/org/jboss/ws/core/metadata/builder/jaxws/JAXWSMetaDataBuilderEJB3.java branches/tdiesler/trunk/src/main/java/org/jboss/ws/core/metadata/builder/jaxws/JAXWSMetaDataBuilderJSE.java branches/tdiesler/trunk/src/main/java/org/jboss/ws/core/metadata/builder/jaxws/JAXWSWebServiceMetaDataBuilder.java branches/tdiesler/trunk/src/main/java/org/jboss/ws/core/server/ServiceEndpointInfo.java branches/tdiesler/trunk/src/main/java/org/jboss/ws/core/server/ServiceEndpointManager.java branches/tdiesler/trunk/src/main/java/org/jboss/ws/core/server/WSDLFilePublisher.java branches/tdiesler/trunk/src/main/java/org/jboss/ws/core/soap/JAXWSPayloadBuilder.java branches/tdiesler/trunk/src/main/java/org/jboss/ws/core/soap/MessageContextAssociation.java branches/tdiesler/trunk/src/main/java/org/jboss/ws/core/soap/SAAJPayloadBuilderDOM.java branches/tdiesler/trunk/src/main/java/org/jboss/ws/core/soap/SAAJPayloadBuilderStax.java branches/tdiesler/trunk/src/main/java/org/jboss/ws/core/soap/SOAPBodyImpl.java branches/tdiesler/trunk/src/main/java/org/jboss/ws/core/soap/SOAPContentElement.java branches/tdiesler/trunk/src/main/java/org/jboss/ws/core/soap/SOAPElementImpl.java branches/tdiesler/trunk/src/main/java/org/jboss/ws/core/soap/SOAPEnvelopeImpl.java branches/tdiesler/trunk/src/main/java/org/jboss/ws/core/soap/SOAPFactoryImpl.java branches/tdiesler/trunk/src/main/java/org/jboss/ws/core/soap/SOAPFaultImpl.java branches/tdiesler/trunk/src/main/java/org/jboss/ws/extras/addressing/soap/SOAPAddressingPropertiesImpl.java branches/tdiesler/trunk/src/main/java/org/jboss/ws/extras/security/STRTransform.java branches/tdiesler/trunk/src/main/java/org/jboss/ws/extras/xop/XOPContext.java branches/tdiesler/trunk/src/main/java/org/jboss/ws/integration/jboss50/AbstractJSEDeployer.java branches/tdiesler/trunk/src/main/java/org/jboss/ws/integration/jboss50/ApplicationMetaDataAdaptor.java branches/tdiesler/trunk/src/main/java/org/jboss/ws/integration/jboss50/JBossServiceEndpointServlet.java branches/tdiesler/trunk/src/main/java/org/jboss/ws/integration/jboss50/ServerConfigImpl.java branches/tdiesler/trunk/src/main/java/org/jboss/ws/integration/jboss50/ServiceEndpointGeneratorEJB.java branches/tdiesler/trunk/src/main/java/org/jboss/ws/integration/jboss50/ServiceRefHandler.java branches/tdiesler/trunk/src/main/java/org/jboss/ws/integration/jboss50/ServiceRefMetaDataAdaptor.java branches/tdiesler/trunk/src/main/java/org/jboss/ws/integration/jboss50/WebMetaDataAdaptor.java branches/tdiesler/trunk/src/main/java/org/jboss/ws/integration/tomcat/DeploymentInfoAdaptor.java branches/tdiesler/trunk/src/main/java/org/jboss/ws/integration/tomcat/ServerConfigImpl.java branches/tdiesler/trunk/src/test/java/org/jboss/test/ws/common/config/WSConfigTestCase.java branches/tdiesler/trunk/src/test/java/org/jboss/test/ws/common/jbossxb/SerializerDeserializerTestCase.java branches/tdiesler/trunk/src/test/java/org/jboss/test/ws/common/jbossxb/array/BigDecimalArrayMarshallerTestCase.java branches/tdiesler/trunk/src/test/java/org/jboss/test/ws/common/jbossxb/array/BigDecimalArrayUnmarshallerTestCase.java branches/tdiesler/trunk/src/test/java/org/jboss/test/ws/common/jbossxb/array/CalendarArrayMarshallerTestCase.java branches/tdiesler/trunk/src/test/java/org/jboss/test/ws/common/jbossxb/array/CalendarArrayUnmarshallerTestCase.java branches/tdiesler/trunk/src/test/java/org/jboss/test/ws/common/jbossxb/array/QNameArrayMarshallerTestCase.java branches/tdiesler/trunk/src/test/java/org/jboss/test/ws/common/jbossxb/array/QNameArrayUnmarshallerTestCase.java branches/tdiesler/trunk/src/test/java/org/jboss/test/ws/common/jbossxb/complex/ComplexTypeMarshallerTestCase.java branches/tdiesler/trunk/src/test/java/org/jboss/test/ws/common/jbossxb/complex/ComplexTypeUnmarshallerTestCase.java branches/tdiesler/trunk/src/test/java/org/jboss/test/ws/common/jbossxb/docstyle/DocumentStyleMarshallerTestCase.java branches/tdiesler/trunk/src/test/java/org/jboss/test/ws/common/jbossxb/docstyle/DocumentStyleUnmarshallerTestCase.java branches/tdiesler/trunk/src/test/java/org/jboss/test/ws/common/jbossxb/simple/SimpleUserTypeMarshallerTestCase.java branches/tdiesler/trunk/src/test/java/org/jboss/test/ws/common/jbossxb/simple/SimpleUserTypeUnmarshallerTestCase.java branches/tdiesler/trunk/src/test/java/org/jboss/test/ws/common/soap/SOAPContentElementTestCase.java branches/tdiesler/trunk/src/test/java/org/jboss/test/ws/common/soap/SOAPHeaderElementTestCase.java branches/tdiesler/trunk/src/test/java/org/jboss/test/ws/common/soap/SOAPHeaderTestCase.java branches/tdiesler/trunk/src/test/java/org/jboss/test/ws/jaxrpc/jbws1190/TestEndpointImpl.java branches/tdiesler/trunk/src/test/java/org/jboss/test/ws/jaxrpc/jbws1205/TestEndpointImpl.java branches/tdiesler/trunk/src/test/java/org/jboss/test/ws/jaxrpc/xop/doclit/InlineHandler.java branches/tdiesler/trunk/src/test/java/org/jboss/test/ws/jaxrpc/xop/rpclit/InlineHandler.java branches/tdiesler/trunk/src/test/java/org/jboss/test/ws/jaxws/exception/ExceptionEndpointImpl.java branches/tdiesler/trunk/src/test/java/org/jboss/test/ws/jaxws/jbws1190/TestEndpointImpl.java branches/tdiesler/trunk/src/test/java/org/jboss/test/ws/jaxws/jsr181/soapbinding/JSR181SOAPBindingTestCase.java branches/tdiesler/trunk/src/test/java/org/jboss/test/ws/jaxws/jsr181/webmethod/JSR181WebMethodTestCase.java branches/tdiesler/trunk/src/test/java/org/jboss/test/ws/jaxws/jsr181/webresult/JSR181WebResultTestCase.java Log: Modified: branches/tdiesler/trunk/src/main/java/org/jboss/ws/common/Constants.java =================================================================== --- branches/tdiesler/trunk/src/main/java/org/jboss/ws/common/Constants.java 2006-12-06 10:47:51 UTC (rev 1571) +++ branches/tdiesler/trunk/src/main/java/org/jboss/ws/common/Constants.java 2006-12-06 11:19:33 UTC (rev 1572) @@ -25,7 +25,6 @@ import javax.xml.namespace.QName; import javax.xml.soap.Name; -import org.jboss.ws.core.soap.NameImpl; /** * A collection of constants relevant to JBossWS @@ -69,6 +68,11 @@ /** The namespace for XOP. */ static final String NS_XOP = "http://www.w3.org/2004/08/xop/include"; + /** A constant representing the identity of the SOAP 1.2 over HTTP binding. */ + static final String SOAP12HTTP_BINDING = "http://www.w3.org/2003/05/soap/bindings/HTTP/"; + /** A constant representing the identity of the SOAP 1.1 over HTTP binding. */ + static final String SOAP11HTTP_BINDING = "http://schemas.xmlsoap.org/wsdl/soap/http"; + /** SOAP-1.1 encoding URI */ static final String URI_SOAP11_ENC = "http://schemas.xmlsoap.org/soap/encoding/"; /** SOAP-1.2 encoding URI */ @@ -127,91 +131,91 @@ static final String DEFAULT_RPC_RETURN_NAME = "result"; // FIXME: According to JSR-181 this should be 'return' /** Standard Literal XML types */ - public static final QName TYPE_LITERAL_ANYSIMPLETYPE = new QName(NS_SCHEMA_XSD, "anySimpleType", PREFIX_XSD); - public static final QName TYPE_LITERAL_ANYTYPE = new QName(NS_SCHEMA_XSD, "anyType", PREFIX_XSD); - public static final QName TYPE_LITERAL_ANYURI = new QName(NS_SCHEMA_XSD, "anyURI", PREFIX_XSD); - public static final QName TYPE_LITERAL_BASE64BINARY = new QName(NS_SCHEMA_XSD, "base64Binary", PREFIX_XSD); - public static final QName TYPE_LITERAL_BOOLEAN = new QName(NS_SCHEMA_XSD, "boolean", PREFIX_XSD); - public static final QName TYPE_LITERAL_BYTE = new QName(NS_SCHEMA_XSD, "byte", PREFIX_XSD); - public static final QName TYPE_LITERAL_DATE = new QName(NS_SCHEMA_XSD, "date", PREFIX_XSD); - public static final QName TYPE_LITERAL_DATETIME = new QName(NS_SCHEMA_XSD, "dateTime", PREFIX_XSD); - public static final QName TYPE_LITERAL_DECIMAL = new QName(NS_SCHEMA_XSD, "decimal", PREFIX_XSD); - public static final QName TYPE_LITERAL_DOUBLE = new QName(NS_SCHEMA_XSD, "double", PREFIX_XSD); - public static final QName TYPE_LITERAL_DURATION = new QName(NS_SCHEMA_XSD, "duration", PREFIX_XSD); - public static final QName TYPE_LITERAL_FLOAT = new QName(NS_SCHEMA_XSD, "float", PREFIX_XSD); - public static final QName TYPE_LITERAL_GDAY = new QName(NS_SCHEMA_XSD, "gDay", PREFIX_XSD); - public static final QName TYPE_LITERAL_GMONTH = new QName(NS_SCHEMA_XSD, "gMonth", PREFIX_XSD); - public static final QName TYPE_LITERAL_GMONTHDAY = new QName(NS_SCHEMA_XSD, "gMonthDay", PREFIX_XSD); - public static final QName TYPE_LITERAL_GYEAR = new QName(NS_SCHEMA_XSD, "gYear", PREFIX_XSD); - public static final QName TYPE_LITERAL_GYEARMONTH = new QName(NS_SCHEMA_XSD, "gYearMonth", PREFIX_XSD); - public static final QName TYPE_LITERAL_HEXBINARY = new QName(NS_SCHEMA_XSD, "hexBinary", PREFIX_XSD); - public static final QName TYPE_LITERAL_ID = new QName(NS_SCHEMA_XSD, "ID", PREFIX_XSD); - public static final QName TYPE_LITERAL_INT = new QName(NS_SCHEMA_XSD, "int", PREFIX_XSD); - public static final QName TYPE_LITERAL_INTEGER = new QName(NS_SCHEMA_XSD, "integer", PREFIX_XSD); - public static final QName TYPE_LITERAL_LANGUAGE = new QName(NS_SCHEMA_XSD, "language", PREFIX_XSD); - public static final QName TYPE_LITERAL_LONG = new QName(NS_SCHEMA_XSD, "long", PREFIX_XSD); - public static final QName TYPE_LITERAL_NAME = new QName(NS_SCHEMA_XSD, "Name", PREFIX_XSD); - public static final QName TYPE_LITERAL_NCNAME = new QName(NS_SCHEMA_XSD, "NCName", PREFIX_XSD); - public static final QName TYPE_LITERAL_NEGATIVEINTEGER = new QName(NS_SCHEMA_XSD, "negativeInteger", PREFIX_XSD); - public static final QName TYPE_LITERAL_NMTOKEN = new QName(NS_SCHEMA_XSD, "NMTOKEN", PREFIX_XSD); - public static final QName TYPE_LITERAL_NMTOKENS = new QName(NS_SCHEMA_XSD, "NMTOKENS", PREFIX_XSD); - public static final QName TYPE_LITERAL_NONNEGATIVEINTEGER = new QName(NS_SCHEMA_XSD, "nonNegativeInteger", PREFIX_XSD); - public static final QName TYPE_LITERAL_NONPOSITIVEINTEGER = new QName(NS_SCHEMA_XSD, "nonPositiveInteger", PREFIX_XSD); - public static final QName TYPE_LITERAL_NORMALIZEDSTRING = new QName(NS_SCHEMA_XSD, "normalizedString", PREFIX_XSD); - public static final QName TYPE_LITERAL_POSITIVEINTEGER = new QName(NS_SCHEMA_XSD, "positiveInteger", PREFIX_XSD); - public static final QName TYPE_LITERAL_QNAME = new QName(NS_SCHEMA_XSD, "QName", PREFIX_XSD); - public static final QName TYPE_LITERAL_SHORT = new QName(NS_SCHEMA_XSD, "short", PREFIX_XSD); - public static final QName TYPE_LITERAL_STRING = new QName(NS_SCHEMA_XSD, "string", PREFIX_XSD); - public static final QName TYPE_LITERAL_TIME = new QName(NS_SCHEMA_XSD, "time", PREFIX_XSD); - public static final QName TYPE_LITERAL_TOKEN = new QName(NS_SCHEMA_XSD, "token", PREFIX_XSD); - public static final QName TYPE_LITERAL_UNSIGNEDBYTE = new QName(NS_SCHEMA_XSD, "unsignedByte", PREFIX_XSD); - public static final QName TYPE_LITERAL_UNSIGNEDINT = new QName(NS_SCHEMA_XSD, "unsignedInt", PREFIX_XSD); - public static final QName TYPE_LITERAL_UNSIGNEDLONG = new QName(NS_SCHEMA_XSD, "unsignedLong", PREFIX_XSD); - public static final QName TYPE_LITERAL_UNSIGNEDSHORT = new QName(NS_SCHEMA_XSD, "unsignedShort", PREFIX_XSD); + static final QName TYPE_LITERAL_ANYSIMPLETYPE = new QName(NS_SCHEMA_XSD, "anySimpleType", PREFIX_XSD); + static final QName TYPE_LITERAL_ANYTYPE = new QName(NS_SCHEMA_XSD, "anyType", PREFIX_XSD); + static final QName TYPE_LITERAL_ANYURI = new QName(NS_SCHEMA_XSD, "anyURI", PREFIX_XSD); + static final QName TYPE_LITERAL_BASE64BINARY = new QName(NS_SCHEMA_XSD, "base64Binary", PREFIX_XSD); + static final QName TYPE_LITERAL_BOOLEAN = new QName(NS_SCHEMA_XSD, "boolean", PREFIX_XSD); + static final QName TYPE_LITERAL_BYTE = new QName(NS_SCHEMA_XSD, "byte", PREFIX_XSD); + static final QName TYPE_LITERAL_DATE = new QName(NS_SCHEMA_XSD, "date", PREFIX_XSD); + static final QName TYPE_LITERAL_DATETIME = new QName(NS_SCHEMA_XSD, "dateTime", PREFIX_XSD); + static final QName TYPE_LITERAL_DECIMAL = new QName(NS_SCHEMA_XSD, "decimal", PREFIX_XSD); + static final QName TYPE_LITERAL_DOUBLE = new QName(NS_SCHEMA_XSD, "double", PREFIX_XSD); + static final QName TYPE_LITERAL_DURATION = new QName(NS_SCHEMA_XSD, "duration", PREFIX_XSD); + static final QName TYPE_LITERAL_FLOAT = new QName(NS_SCHEMA_XSD, "float", PREFIX_XSD); + static final QName TYPE_LITERAL_GDAY = new QName(NS_SCHEMA_XSD, "gDay", PREFIX_XSD); + static final QName TYPE_LITERAL_GMONTH = new QName(NS_SCHEMA_XSD, "gMonth", PREFIX_XSD); + static final QName TYPE_LITERAL_GMONTHDAY = new QName(NS_SCHEMA_XSD, "gMonthDay", PREFIX_XSD); + static final QName TYPE_LITERAL_GYEAR = new QName(NS_SCHEMA_XSD, "gYear", PREFIX_XSD); + static final QName TYPE_LITERAL_GYEARMONTH = new QName(NS_SCHEMA_XSD, "gYearMonth", PREFIX_XSD); + static final QName TYPE_LITERAL_HEXBINARY = new QName(NS_SCHEMA_XSD, "hexBinary", PREFIX_XSD); + static final QName TYPE_LITERAL_ID = new QName(NS_SCHEMA_XSD, "ID", PREFIX_XSD); + static final QName TYPE_LITERAL_INT = new QName(NS_SCHEMA_XSD, "int", PREFIX_XSD); + static final QName TYPE_LITERAL_INTEGER = new QName(NS_SCHEMA_XSD, "integer", PREFIX_XSD); + static final QName TYPE_LITERAL_LANGUAGE = new QName(NS_SCHEMA_XSD, "language", PREFIX_XSD); + static final QName TYPE_LITERAL_LONG = new QName(NS_SCHEMA_XSD, "long", PREFIX_XSD); + static final QName TYPE_LITERAL_NAME = new QName(NS_SCHEMA_XSD, "Name", PREFIX_XSD); + static final QName TYPE_LITERAL_NCNAME = new QName(NS_SCHEMA_XSD, "NCName", PREFIX_XSD); + static final QName TYPE_LITERAL_NEGATIVEINTEGER = new QName(NS_SCHEMA_XSD, "negativeInteger", PREFIX_XSD); + static final QName TYPE_LITERAL_NMTOKEN = new QName(NS_SCHEMA_XSD, "NMTOKEN", PREFIX_XSD); + static final QName TYPE_LITERAL_NMTOKENS = new QName(NS_SCHEMA_XSD, "NMTOKENS", PREFIX_XSD); + static final QName TYPE_LITERAL_NONNEGATIVEINTEGER = new QName(NS_SCHEMA_XSD, "nonNegativeInteger", PREFIX_XSD); + static final QName TYPE_LITERAL_NONPOSITIVEINTEGER = new QName(NS_SCHEMA_XSD, "nonPositiveInteger", PREFIX_XSD); + static final QName TYPE_LITERAL_NORMALIZEDSTRING = new QName(NS_SCHEMA_XSD, "normalizedString", PREFIX_XSD); + static final QName TYPE_LITERAL_POSITIVEINTEGER = new QName(NS_SCHEMA_XSD, "positiveInteger", PREFIX_XSD); + static final QName TYPE_LITERAL_QNAME = new QName(NS_SCHEMA_XSD, "QName", PREFIX_XSD); + static final QName TYPE_LITERAL_SHORT = new QName(NS_SCHEMA_XSD, "short", PREFIX_XSD); + static final QName TYPE_LITERAL_STRING = new QName(NS_SCHEMA_XSD, "string", PREFIX_XSD); + static final QName TYPE_LITERAL_TIME = new QName(NS_SCHEMA_XSD, "time", PREFIX_XSD); + static final QName TYPE_LITERAL_TOKEN = new QName(NS_SCHEMA_XSD, "token", PREFIX_XSD); + static final QName TYPE_LITERAL_UNSIGNEDBYTE = new QName(NS_SCHEMA_XSD, "unsignedByte", PREFIX_XSD); + static final QName TYPE_LITERAL_UNSIGNEDINT = new QName(NS_SCHEMA_XSD, "unsignedInt", PREFIX_XSD); + static final QName TYPE_LITERAL_UNSIGNEDLONG = new QName(NS_SCHEMA_XSD, "unsignedLong", PREFIX_XSD); + static final QName TYPE_LITERAL_UNSIGNEDSHORT = new QName(NS_SCHEMA_XSD, "unsignedShort", PREFIX_XSD); /** Standard SOAP-1.1 encoded XML types */ - public static final QName TYPE_SOAP11_ANYSIMPLETYPE = new QName(URI_SOAP11_ENC, "anySimpleType", PREFIX_SOAP11_ENC); - public static final QName TYPE_SOAP11_ANYTYPE = new QName(URI_SOAP11_ENC, "anyType", PREFIX_SOAP11_ENC); - public static final QName TYPE_SOAP11_ANYURI = new QName(URI_SOAP11_ENC, "anyURI", PREFIX_SOAP11_ENC); - public static final QName TYPE_SOAP11_BASE64 = new QName(URI_SOAP11_ENC, "base64", PREFIX_SOAP11_ENC); - public static final QName TYPE_SOAP11_BASE64BINARY = new QName(URI_SOAP11_ENC, "base64Binary", PREFIX_SOAP11_ENC); - public static final QName TYPE_SOAP11_BOOLEAN = new QName(URI_SOAP11_ENC, "boolean", PREFIX_SOAP11_ENC); - public static final QName TYPE_SOAP11_BYTE = new QName(URI_SOAP11_ENC, "byte", PREFIX_SOAP11_ENC); - public static final QName TYPE_SOAP11_DATE = new QName(URI_SOAP11_ENC, "date", PREFIX_SOAP11_ENC); - public static final QName TYPE_SOAP11_DATETIME = new QName(URI_SOAP11_ENC, "dateTime", PREFIX_SOAP11_ENC); - public static final QName TYPE_SOAP11_DECIMAL = new QName(URI_SOAP11_ENC, "decimal", PREFIX_SOAP11_ENC); - public static final QName TYPE_SOAP11_DOUBLE = new QName(URI_SOAP11_ENC, "double", PREFIX_SOAP11_ENC); - public static final QName TYPE_SOAP11_DURATION = new QName(URI_SOAP11_ENC, "duration", PREFIX_SOAP11_ENC); - public static final QName TYPE_SOAP11_FLOAT = new QName(URI_SOAP11_ENC, "float", PREFIX_SOAP11_ENC); - public static final QName TYPE_SOAP11_GDAY = new QName(URI_SOAP11_ENC, "gDay", PREFIX_SOAP11_ENC); - public static final QName TYPE_SOAP11_GMONTH = new QName(URI_SOAP11_ENC, "gMonth", PREFIX_SOAP11_ENC); - public static final QName TYPE_SOAP11_GMONTHDAY = new QName(URI_SOAP11_ENC, "gMonthDay", PREFIX_SOAP11_ENC); - public static final QName TYPE_SOAP11_GYEAR = new QName(URI_SOAP11_ENC, "gYear", PREFIX_SOAP11_ENC); - public static final QName TYPE_SOAP11_GYEARMONTH = new QName(URI_SOAP11_ENC, "gYearMonth", PREFIX_SOAP11_ENC); - public static final QName TYPE_SOAP11_HEXBINARY = new QName(URI_SOAP11_ENC, "hexBinary", PREFIX_SOAP11_ENC); - public static final QName TYPE_SOAP11_ID = new QName(URI_SOAP11_ENC, "ID", PREFIX_SOAP11_ENC); - public static final QName TYPE_SOAP11_INT = new QName(URI_SOAP11_ENC, "int", PREFIX_SOAP11_ENC); - public static final QName TYPE_SOAP11_INTEGER = new QName(URI_SOAP11_ENC, "integer", PREFIX_SOAP11_ENC); - public static final QName TYPE_SOAP11_LANGUAGE = new QName(URI_SOAP11_ENC, "language", PREFIX_SOAP11_ENC); - public static final QName TYPE_SOAP11_LONG = new QName(URI_SOAP11_ENC, "long", PREFIX_SOAP11_ENC); - public static final QName TYPE_SOAP11_NAME = new QName(URI_SOAP11_ENC, "Name", PREFIX_SOAP11_ENC); - public static final QName TYPE_SOAP11_NCNAME = new QName(URI_SOAP11_ENC, "NCName", PREFIX_SOAP11_ENC); - public static final QName TYPE_SOAP11_NEGATIVEINTEGER = new QName(URI_SOAP11_ENC, "negativeInteger", PREFIX_SOAP11_ENC); - public static final QName TYPE_SOAP11_NMTOKEN = new QName(URI_SOAP11_ENC, "NMTOKEN", PREFIX_SOAP11_ENC); - public static final QName TYPE_SOAP11_NMTOKENS = new QName(URI_SOAP11_ENC, "NMTOKENS", PREFIX_SOAP11_ENC); - public static final QName TYPE_SOAP11_NONNEGATIVEINTEGER = new QName(URI_SOAP11_ENC, "nonNegativeInteger", PREFIX_SOAP11_ENC); - public static final QName TYPE_SOAP11_NONPOSITIVEINTEGER = new QName(URI_SOAP11_ENC, "nonPositiveInteger", PREFIX_SOAP11_ENC); - public static final QName TYPE_SOAP11_NORMALIZEDSTRING = new QName(URI_SOAP11_ENC, "normalizedString", PREFIX_SOAP11_ENC); - public static final QName TYPE_SOAP11_POSITIVEINTEGER = new QName(URI_SOAP11_ENC, "positiveInteger", PREFIX_SOAP11_ENC); - public static final QName TYPE_SOAP11_QNAME = new QName(URI_SOAP11_ENC, "QName", PREFIX_SOAP11_ENC); - public static final QName TYPE_SOAP11_SHORT = new QName(URI_SOAP11_ENC, "short", PREFIX_SOAP11_ENC); - public static final QName TYPE_SOAP11_STRING = new QName(URI_SOAP11_ENC, "string", PREFIX_SOAP11_ENC); - public static final QName TYPE_SOAP11_TIME = new QName(URI_SOAP11_ENC, "time", PREFIX_SOAP11_ENC); - public static final QName TYPE_SOAP11_TOKEN = new QName(URI_SOAP11_ENC, "token", PREFIX_SOAP11_ENC); - public static final QName TYPE_SOAP11_UNSIGNEDBYTE = new QName(URI_SOAP11_ENC, "unsignedByte", PREFIX_SOAP11_ENC); - public static final QName TYPE_SOAP11_UNSIGNEDINT = new QName(URI_SOAP11_ENC, "unsignedInt", PREFIX_SOAP11_ENC); - public static final QName TYPE_SOAP11_UNSIGNEDLONG = new QName(URI_SOAP11_ENC, "unsignedLong", PREFIX_SOAP11_ENC); - public static final QName TYPE_SOAP11_UNSIGNEDSHORT = new QName(URI_SOAP11_ENC, "unsignedShort", PREFIX_SOAP11_ENC); + static final QName TYPE_SOAP11_ANYSIMPLETYPE = new QName(URI_SOAP11_ENC, "anySimpleType", PREFIX_SOAP11_ENC); + static final QName TYPE_SOAP11_ANYTYPE = new QName(URI_SOAP11_ENC, "anyType", PREFIX_SOAP11_ENC); + static final QName TYPE_SOAP11_ANYURI = new QName(URI_SOAP11_ENC, "anyURI", PREFIX_SOAP11_ENC); + static final QName TYPE_SOAP11_BASE64 = new QName(URI_SOAP11_ENC, "base64", PREFIX_SOAP11_ENC); + static final QName TYPE_SOAP11_BASE64BINARY = new QName(URI_SOAP11_ENC, "base64Binary", PREFIX_SOAP11_ENC); + static final QName TYPE_SOAP11_BOOLEAN = new QName(URI_SOAP11_ENC, "boolean", PREFIX_SOAP11_ENC); + static final QName TYPE_SOAP11_BYTE = new QName(URI_SOAP11_ENC, "byte", PREFIX_SOAP11_ENC); + static final QName TYPE_SOAP11_DATE = new QName(URI_SOAP11_ENC, "date", PREFIX_SOAP11_ENC); + static final QName TYPE_SOAP11_DATETIME = new QName(URI_SOAP11_ENC, "dateTime", PREFIX_SOAP11_ENC); + static final QName TYPE_SOAP11_DECIMAL = new QName(URI_SOAP11_ENC, "decimal", PREFIX_SOAP11_ENC); + static final QName TYPE_SOAP11_DOUBLE = new QName(URI_SOAP11_ENC, "double", PREFIX_SOAP11_ENC); + static final QName TYPE_SOAP11_DURATION = new QName(URI_SOAP11_ENC, "duration", PREFIX_SOAP11_ENC); + static final QName TYPE_SOAP11_FLOAT = new QName(URI_SOAP11_ENC, "float", PREFIX_SOAP11_ENC); + static final QName TYPE_SOAP11_GDAY = new QName(URI_SOAP11_ENC, "gDay", PREFIX_SOAP11_ENC); + static final QName TYPE_SOAP11_GMONTH = new QName(URI_SOAP11_ENC, "gMonth", PREFIX_SOAP11_ENC); + static final QName TYPE_SOAP11_GMONTHDAY = new QName(URI_SOAP11_ENC, "gMonthDay", PREFIX_SOAP11_ENC); + static final QName TYPE_SOAP11_GYEAR = new QName(URI_SOAP11_ENC, "gYear", PREFIX_SOAP11_ENC); + static final QName TYPE_SOAP11_GYEARMONTH = new QName(URI_SOAP11_ENC, "gYearMonth", PREFIX_SOAP11_ENC); + static final QName TYPE_SOAP11_HEXBINARY = new QName(URI_SOAP11_ENC, "hexBinary", PREFIX_SOAP11_ENC); + static final QName TYPE_SOAP11_ID = new QName(URI_SOAP11_ENC, "ID", PREFIX_SOAP11_ENC); + static final QName TYPE_SOAP11_INT = new QName(URI_SOAP11_ENC, "int", PREFIX_SOAP11_ENC); + static final QName TYPE_SOAP11_INTEGER = new QName(URI_SOAP11_ENC, "integer", PREFIX_SOAP11_ENC); + static final QName TYPE_SOAP11_LANGUAGE = new QName(URI_SOAP11_ENC, "language", PREFIX_SOAP11_ENC); + static final QName TYPE_SOAP11_LONG = new QName(URI_SOAP11_ENC, "long", PREFIX_SOAP11_ENC); + static final QName TYPE_SOAP11_NAME = new QName(URI_SOAP11_ENC, "Name", PREFIX_SOAP11_ENC); + static final QName TYPE_SOAP11_NCNAME = new QName(URI_SOAP11_ENC, "NCName", PREFIX_SOAP11_ENC); + static final QName TYPE_SOAP11_NEGATIVEINTEGER = new QName(URI_SOAP11_ENC, "negativeInteger", PREFIX_SOAP11_ENC); + static final QName TYPE_SOAP11_NMTOKEN = new QName(URI_SOAP11_ENC, "NMTOKEN", PREFIX_SOAP11_ENC); + static final QName TYPE_SOAP11_NMTOKENS = new QName(URI_SOAP11_ENC, "NMTOKENS", PREFIX_SOAP11_ENC); + static final QName TYPE_SOAP11_NONNEGATIVEINTEGER = new QName(URI_SOAP11_ENC, "nonNegativeInteger", PREFIX_SOAP11_ENC); + static final QName TYPE_SOAP11_NONPOSITIVEINTEGER = new QName(URI_SOAP11_ENC, "nonPositiveInteger", PREFIX_SOAP11_ENC); + static final QName TYPE_SOAP11_NORMALIZEDSTRING = new QName(URI_SOAP11_ENC, "normalizedString", PREFIX_SOAP11_ENC); + static final QName TYPE_SOAP11_POSITIVEINTEGER = new QName(URI_SOAP11_ENC, "positiveInteger", PREFIX_SOAP11_ENC); + static final QName TYPE_SOAP11_QNAME = new QName(URI_SOAP11_ENC, "QName", PREFIX_SOAP11_ENC); + static final QName TYPE_SOAP11_SHORT = new QName(URI_SOAP11_ENC, "short", PREFIX_SOAP11_ENC); + static final QName TYPE_SOAP11_STRING = new QName(URI_SOAP11_ENC, "string", PREFIX_SOAP11_ENC); + static final QName TYPE_SOAP11_TIME = new QName(URI_SOAP11_ENC, "time", PREFIX_SOAP11_ENC); + static final QName TYPE_SOAP11_TOKEN = new QName(URI_SOAP11_ENC, "token", PREFIX_SOAP11_ENC); + static final QName TYPE_SOAP11_UNSIGNEDBYTE = new QName(URI_SOAP11_ENC, "unsignedByte", PREFIX_SOAP11_ENC); + static final QName TYPE_SOAP11_UNSIGNEDINT = new QName(URI_SOAP11_ENC, "unsignedInt", PREFIX_SOAP11_ENC); + static final QName TYPE_SOAP11_UNSIGNEDLONG = new QName(URI_SOAP11_ENC, "unsignedLong", PREFIX_SOAP11_ENC); + static final QName TYPE_SOAP11_UNSIGNEDSHORT = new QName(URI_SOAP11_ENC, "unsignedShort", PREFIX_SOAP11_ENC); /** Encoded mime type namespace for internall and DII use */ static final String NS_ATTACHMENT_MIME_TYPE = "http://www.jboss.org/jbossws/attachment/mimetype"; Copied: branches/tdiesler/trunk/src/main/java/org/jboss/ws/common/NameImpl.java (from rev 1568, branches/tdiesler/trunk/src/main/java/org/jboss/ws/core/soap/NameImpl.java) =================================================================== --- branches/tdiesler/trunk/src/main/java/org/jboss/ws/core/soap/NameImpl.java 2006-12-06 05:06:23 UTC (rev 1568) +++ branches/tdiesler/trunk/src/main/java/org/jboss/ws/common/NameImpl.java 2006-12-06 11:19:33 UTC (rev 1572) @@ -0,0 +1,127 @@ +/* +* 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.common; + +// $Id$ + +import javax.xml.namespace.QName; +import javax.xml.soap.Name; + +/** + * An implementation of a Name + * <p/> + * At this time of writing, the spec does not say anything about null values. + * We assume emty string for any null value. + * + * @author Thomas.Diesler(a)jboss.org + * @since 01-June-2004 + */ +public class NameImpl implements Name +{ + private QName qname; + + public NameImpl(QName qname) + { + this.qname = qname; + } + + public NameImpl(String local) + { + qname = new QName(local); + } + + public NameImpl(String local, String prefix, String uri) + { + if (prefix != null) + qname = new QName(uri, local, prefix); + else + qname = new QName(uri, local); + } + + /** + * Gets the local name part of the XML name that this Name object represents. + * + * @return a string giving the local name + */ + public String getLocalName() + { + return qname.getLocalPart(); + } + + /** + * Returns the prefix that was specified when this Name object was initialized. + * This prefix is associated with the namespace for the XML name that this Name object represents. + * + * @return the prefix as a string + */ + public String getPrefix() + { + return qname.getPrefix(); + } + + /** + * Gets the namespace-qualified name of the XML name that this Name object represents. + * + * @return the namespace-qualified name as a string + */ + public String getQualifiedName() + { + String prefix = getPrefix(); + if (prefix.length() > 0) + return prefix + ":" + qname.getLocalPart(); + else + return qname.getLocalPart(); + } + + /** + * Returns the URI of the namespace for the XML name that this Name object represents. + * + * @return the URI as a string + */ + public String getURI() + { + return qname.getNamespaceURI(); + } + + public int hashCode() + { + return qname.hashCode(); + } + + public boolean equals(Object obj) + { + if (!(obj instanceof NameImpl)) return false; + if (obj == this) return true; + NameImpl other = (NameImpl)obj; + return qname.equals(other.qname); + } + + public QName toQName() + { + return qname; + } + + public String toString() + { + return qname.toString(); + } +} Copied: branches/tdiesler/trunk/src/main/java/org/jboss/ws/common/binding/ComplexTypeDeserializer.java (from rev 1569, branches/tdiesler/trunk/src/main/java/org/jboss/ws/core/binding/ComplexTypeDeserializer.java) =================================================================== --- branches/tdiesler/trunk/src/main/java/org/jboss/ws/core/binding/ComplexTypeDeserializer.java 2006-12-06 10:17:42 UTC (rev 1569) +++ branches/tdiesler/trunk/src/main/java/org/jboss/ws/common/binding/ComplexTypeDeserializer.java 2006-12-06 11:19:33 UTC (rev 1572) @@ -0,0 +1,36 @@ +/* + * 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.common.binding; + + +// $Id$ + +/** + * A Deserializer that can handle complex types by delegating to JAXB. + * + * @author Thomas.Diesler(a)jboss.org + * @since 04-Dec-2004 + */ +public abstract class ComplexTypeDeserializer extends DeserializerSupport +{ + +} Copied: branches/tdiesler/trunk/src/main/java/org/jboss/ws/common/binding/ComplexTypeSerializer.java (from rev 1569, branches/tdiesler/trunk/src/main/java/org/jboss/ws/core/binding/ComplexTypeSerializer.java) =================================================================== --- branches/tdiesler/trunk/src/main/java/org/jboss/ws/core/binding/ComplexTypeSerializer.java 2006-12-06 10:17:42 UTC (rev 1569) +++ branches/tdiesler/trunk/src/main/java/org/jboss/ws/common/binding/ComplexTypeSerializer.java 2006-12-06 11:19:33 UTC (rev 1572) @@ -0,0 +1,36 @@ +/* + * 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.common.binding; + + +// $Id$ + +/** + * A Serializer that can handle complex types by delegating to JAXB. + * + * @author Thomas.Diesler(a)jboss.org + * @since 04-Dec-2004 + */ +public abstract class ComplexTypeSerializer extends SerializerSupport +{ + +} Copied: branches/tdiesler/trunk/src/main/java/org/jboss/ws/common/config/ServerConfig.java (from rev 1568, branches/tdiesler/trunk/src/main/java/org/jboss/ws/core/server/ServerConfig.java) =================================================================== --- branches/tdiesler/trunk/src/main/java/org/jboss/ws/core/server/ServerConfig.java 2006-12-06 05:06:23 UTC (rev 1568) +++ branches/tdiesler/trunk/src/main/java/org/jboss/ws/common/config/ServerConfig.java 2006-12-06 11:19:33 UTC (rev 1572) @@ -0,0 +1,41 @@ +/* + * 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.common.config; + +// $Id: ServiceEndpointManagerFactory.java 293 2006-05-08 16:31:50Z thomas.diesler(a)jboss.com $ + +import java.io.File; + +/** + * Interface to container independent config + * + * @author Thomas.Diesler(a)jboss.org + * @since 08-May-2006 + */ +public interface ServerConfig +{ + static final String BEAN_NAME = "ServerConfig"; + + File getServerTempDir(); + + File getServerDataDir(); +} Copied: branches/tdiesler/trunk/src/main/java/org/jboss/ws/common/config/ServerConfigFactory.java (from rev 1568, branches/tdiesler/trunk/src/main/java/org/jboss/ws/core/server/ServerConfigFactory.java) =================================================================== --- branches/tdiesler/trunk/src/main/java/org/jboss/ws/core/server/ServerConfigFactory.java 2006-12-06 05:06:23 UTC (rev 1568) +++ branches/tdiesler/trunk/src/main/java/org/jboss/ws/common/config/ServerConfigFactory.java 2006-12-06 11:19:33 UTC (rev 1572) @@ -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.common.config; + +import org.jboss.kernel.spi.registry.KernelRegistry; +import org.jboss.logging.Logger; +import org.jboss.ws.core.server.KernelLocator; + +// $Id: ServiceEndpointManagerFactory.java 293 2006-05-08 16:31:50Z thomas.diesler(a)jboss.com $ + +/** + * Factory to container independent config + * + * @author Thomas.Diesler(a)jboss.org + * @since 08-May-2006 + */ +public class ServerConfigFactory +{ + // provide logging + private static final Logger log = Logger.getLogger(ServerConfigFactory.class); + + private static ServerConfigFactory instance = new ServerConfigFactory(); + + // Hide ctor + protected ServerConfigFactory() + { + } + + public static ServerConfigFactory getInstance() + { + return instance; + } + + public ServerConfig getServerConfig() + { + KernelRegistry registry = KernelLocator.getKernel().getRegistry(); + return (ServerConfig)registry.getEntry(ServerConfig.BEAN_NAME).getTarget(); + } +} Copied: branches/tdiesler/trunk/src/main/java/org/jboss/ws/common/jaxrpc/EncodedTypeMapping.java (from rev 1569, branches/tdiesler/trunk/src/main/java/org/jboss/ws/core/jaxrpc/EncodedTypeMapping.java) =================================================================== --- branches/tdiesler/trunk/src/main/java/org/jboss/ws/core/jaxrpc/EncodedTypeMapping.java 2006-12-06 10:17:42 UTC (rev 1569) +++ branches/tdiesler/trunk/src/main/java/org/jboss/ws/common/jaxrpc/EncodedTypeMapping.java 2006-12-06 11:19:33 UTC (rev 1572) @@ -0,0 +1,182 @@ +/* +* 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.common.jaxrpc; + +// $Id$ + +import java.math.BigDecimal; +import java.math.BigInteger; +import java.net.URI; +import java.util.Calendar; +import java.util.Date; + +import javax.xml.namespace.QName; +import javax.xml.soap.SOAPElement; + +import org.jboss.util.NotImplementedException; +import org.jboss.ws.common.Constants; +import org.jboss.ws.common.jaxrpc.encoding.Base64DeserializerFactory; +import org.jboss.ws.common.jaxrpc.encoding.Base64SerializerFactory; +import org.jboss.ws.common.jaxrpc.encoding.CalendarDeserializerFactory; +import org.jboss.ws.common.jaxrpc.encoding.CalendarSerializerFactory; +import org.jboss.ws.common.jaxrpc.encoding.DateDeserializerFactory; +import org.jboss.ws.common.jaxrpc.encoding.DateSerializerFactory; +import org.jboss.ws.common.jaxrpc.encoding.ElementDeserializerFactory; +import org.jboss.ws.common.jaxrpc.encoding.ElementSerializerFactory; +import org.jboss.ws.common.jaxrpc.encoding.HexDeserializerFactory; +import org.jboss.ws.common.jaxrpc.encoding.HexSerializerFactory; +import org.jboss.ws.common.jaxrpc.encoding.QNameDeserializerFactory; +import org.jboss.ws.common.jaxrpc.encoding.QNameSerializerFactory; +import org.jboss.ws.common.jaxrpc.encoding.SOAPElementDeserializerFactory; +import org.jboss.ws.common.jaxrpc.encoding.SOAPElementSerializerFactory; +import org.jboss.ws.common.jaxrpc.encoding.SimpleDeserializerFactory; +import org.jboss.ws.common.jaxrpc.encoding.SimpleSerializerFactory; +import org.w3c.dom.Element; + +/** + * This is the representation of a type mapping. + * This TypeMapping implementation supports the encoded encoding style. + * + * The TypeMapping instance maintains a tuple of the type + * {XML typeQName, Java Class, SerializerFactory, DeserializerFactory}. + * + * @author Thomas.Diesler(a)jboss.org + * @since 10-Oct-2004 + */ +public class EncodedTypeMapping extends TypeMappingImpl +{ + + /** + * Construct the default encoded type mapping. + * Registers javaTypes for all standard XMLSchema types specified by JAXRPC. + * + * Note, the order of registered types is important + * The last xmlType wins for a given javaType + * + */ + public EncodedTypeMapping() + { + registerStandardLiteralTypes(); + registerStandardSOAP11EncodedTypes(); + + // register mapping for xsd:anyType + registerInternal(SOAPElement.class, Constants.TYPE_SOAP11_ANYTYPE, new SOAPElementSerializerFactory(), new SOAPElementDeserializerFactory()); + registerInternal(Element.class, Constants.TYPE_SOAP11_ANYTYPE, new ElementSerializerFactory(), new ElementDeserializerFactory()); + } + + private void registerStandardSOAP11EncodedTypes() + { + registerInternal(BigDecimal.class, Constants.TYPE_SOAP11_DECIMAL, new SimpleSerializerFactory(), new SimpleDeserializerFactory()); + + registerInternal(BigInteger.class, Constants.TYPE_SOAP11_POSITIVEINTEGER, new SimpleSerializerFactory(), new SimpleDeserializerFactory()); + registerInternal(BigInteger.class, Constants.TYPE_SOAP11_NEGATIVEINTEGER, new SimpleSerializerFactory(), new SimpleDeserializerFactory()); + registerInternal(BigInteger.class, Constants.TYPE_SOAP11_NONPOSITIVEINTEGER, new SimpleSerializerFactory(), new SimpleDeserializerFactory()); + registerInternal(BigInteger.class, Constants.TYPE_SOAP11_NONNEGATIVEINTEGER, new SimpleSerializerFactory(), new SimpleDeserializerFactory()); + registerInternal(BigInteger.class, Constants.TYPE_SOAP11_UNSIGNEDLONG, new SimpleSerializerFactory(), new SimpleDeserializerFactory()); + registerInternal(BigInteger.class, Constants.TYPE_SOAP11_INTEGER, new SimpleSerializerFactory(), new SimpleDeserializerFactory()); + + registerInternal(Date.class, Constants.TYPE_SOAP11_DATETIME, new DateSerializerFactory(), new DateDeserializerFactory()); + + registerInternal(Calendar.class, Constants.TYPE_SOAP11_DATE, new CalendarSerializerFactory(), new CalendarDeserializerFactory()); + registerInternal(Calendar.class, Constants.TYPE_SOAP11_TIME, new CalendarSerializerFactory(), new CalendarDeserializerFactory()); + registerInternal(Calendar.class, Constants.TYPE_SOAP11_DATETIME, new CalendarSerializerFactory(), new CalendarDeserializerFactory()); + + registerInternal(QName.class, Constants.TYPE_SOAP11_QNAME, new QNameSerializerFactory(), new QNameDeserializerFactory()); + + registerInternal(String.class, Constants.TYPE_SOAP11_ANYSIMPLETYPE, new SimpleSerializerFactory(), new SimpleDeserializerFactory()); + registerInternal(String.class, Constants.TYPE_SOAP11_DURATION, new SimpleSerializerFactory(), new SimpleDeserializerFactory()); + registerInternal(String.class, Constants.TYPE_SOAP11_GDAY, new SimpleSerializerFactory(), new SimpleDeserializerFactory()); + registerInternal(String.class, Constants.TYPE_SOAP11_GMONTH, new SimpleSerializerFactory(), new SimpleDeserializerFactory()); + registerInternal(String.class, Constants.TYPE_SOAP11_GMONTHDAY, new SimpleSerializerFactory(), new SimpleDeserializerFactory()); + registerInternal(String.class, Constants.TYPE_SOAP11_GYEAR, new SimpleSerializerFactory(), new SimpleDeserializerFactory()); + registerInternal(String.class, Constants.TYPE_SOAP11_GYEARMONTH, new SimpleSerializerFactory(), new SimpleDeserializerFactory()); + registerInternal(String.class, Constants.TYPE_SOAP11_ID, new SimpleSerializerFactory(), new SimpleDeserializerFactory()); + registerInternal(String.class, Constants.TYPE_SOAP11_LANGUAGE, new SimpleSerializerFactory(), new SimpleDeserializerFactory()); + registerInternal(String.class, Constants.TYPE_SOAP11_NAME, new SimpleSerializerFactory(), new SimpleDeserializerFactory()); + registerInternal(String.class, Constants.TYPE_SOAP11_NCNAME, new SimpleSerializerFactory(), new SimpleDeserializerFactory()); + registerInternal(String.class, Constants.TYPE_SOAP11_NMTOKEN, new SimpleSerializerFactory(), new SimpleDeserializerFactory()); + registerInternal(String.class, Constants.TYPE_SOAP11_NORMALIZEDSTRING, new SimpleSerializerFactory(), new SimpleDeserializerFactory()); + registerInternal(String.class, Constants.TYPE_SOAP11_TOKEN, new SimpleSerializerFactory(), new SimpleDeserializerFactory()); + registerInternal(String.class, Constants.TYPE_SOAP11_STRING, new SimpleSerializerFactory(), new SimpleDeserializerFactory()); + + registerInternal(String[].class, Constants.TYPE_SOAP11_NMTOKENS, new SimpleSerializerFactory(), new SimpleDeserializerFactory()); + + registerInternal(URI.class, Constants.TYPE_SOAP11_ANYURI, new SimpleSerializerFactory(), new SimpleDeserializerFactory()); + + registerInternal(boolean.class, Constants.TYPE_SOAP11_BOOLEAN, new SimpleSerializerFactory(), new SimpleDeserializerFactory()); + registerInternal(Boolean.class, Constants.TYPE_SOAP11_BOOLEAN, new SimpleSerializerFactory(), new SimpleDeserializerFactory()); + + registerInternal(byte.class, Constants.TYPE_SOAP11_BYTE, new SimpleSerializerFactory(), new SimpleDeserializerFactory()); + registerInternal(Byte.class, Constants.TYPE_SOAP11_BYTE, new SimpleSerializerFactory(), new SimpleDeserializerFactory()); + + registerInternal(byte[].class, Constants.TYPE_SOAP11_HEXBINARY, new HexSerializerFactory(), new HexDeserializerFactory()); + registerInternal(Byte[].class, Constants.TYPE_SOAP11_HEXBINARY, new HexSerializerFactory(), new HexDeserializerFactory()); + registerInternal(byte[].class, Constants.TYPE_SOAP11_BASE64BINARY, new Base64SerializerFactory(), new Base64DeserializerFactory()); + registerInternal(Byte[].class, Constants.TYPE_SOAP11_BASE64BINARY, new Base64SerializerFactory(), new Base64DeserializerFactory()); + registerInternal(byte[].class, Constants.TYPE_SOAP11_BASE64, new Base64SerializerFactory(), new Base64DeserializerFactory()); + registerInternal(Byte[].class, Constants.TYPE_SOAP11_BASE64, new Base64SerializerFactory(), new Base64DeserializerFactory()); + + registerInternal(double.class, Constants.TYPE_SOAP11_DOUBLE, new SimpleSerializerFactory(), new SimpleDeserializerFactory()); + registerInternal(Double.class, Constants.TYPE_SOAP11_DOUBLE, new SimpleSerializerFactory(), new SimpleDeserializerFactory()); + + registerInternal(float.class, Constants.TYPE_SOAP11_FLOAT, new SimpleSerializerFactory(), new SimpleDeserializerFactory()); + registerInternal(Float.class, Constants.TYPE_SOAP11_FLOAT, new SimpleSerializerFactory(), new SimpleDeserializerFactory()); + + registerInternal(int.class, Constants.TYPE_SOAP11_UNSIGNEDSHORT, new SimpleSerializerFactory(), new SimpleDeserializerFactory()); + registerInternal(Integer.class, Constants.TYPE_SOAP11_UNSIGNEDSHORT, new SimpleSerializerFactory(), new SimpleDeserializerFactory()); + registerInternal(int.class, Constants.TYPE_SOAP11_INT, new SimpleSerializerFactory(), new SimpleDeserializerFactory()); + registerInternal(Integer.class, Constants.TYPE_SOAP11_INT, new SimpleSerializerFactory(), new SimpleDeserializerFactory()); + + registerInternal(long.class, Constants.TYPE_SOAP11_UNSIGNEDINT, new SimpleSerializerFactory(), new SimpleDeserializerFactory()); + registerInternal(Long.class, Constants.TYPE_SOAP11_UNSIGNEDINT, new SimpleSerializerFactory(), new SimpleDeserializerFactory()); + registerInternal(long.class, Constants.TYPE_SOAP11_LONG, new SimpleSerializerFactory(), new SimpleDeserializerFactory()); + registerInternal(Long.class, Constants.TYPE_SOAP11_LONG, new SimpleSerializerFactory(), new SimpleDeserializerFactory()); + + registerInternal(short.class, Constants.TYPE_SOAP11_UNSIGNEDBYTE, new SimpleSerializerFactory(), new SimpleDeserializerFactory()); + registerInternal(Short.class, Constants.TYPE_SOAP11_UNSIGNEDBYTE, new SimpleSerializerFactory(), new SimpleDeserializerFactory()); + registerInternal(short.class, Constants.TYPE_SOAP11_SHORT, new SimpleSerializerFactory(), new SimpleDeserializerFactory()); + registerInternal(Short.class, Constants.TYPE_SOAP11_SHORT, new SimpleSerializerFactory(), new SimpleDeserializerFactory()); + } + + /** + * Returns the encodingStyle URIs (as String[]) supported by this TypeMapping instance. + * A TypeMapping that contains only encoding style independent serializers and deserializers + * returns null from this method. + * + * @return Array of encodingStyle URIs for the supported encoding styles + */ + public String[] getSupportedEncodings() + { + return new String[] { "encoded" }; + } + + /** + * Sets the encodingStyle URIs supported by this TypeMapping instance. A TypeMapping that contains only encoding + * independent serializers and deserializers requires null as the parameter for this method. + * + * @param encodingStyleURIs Array of encodingStyle URIs for the supported encoding styles + */ + public void setSupportedEncodings(String[] encodingStyleURIs) + { + throw new NotImplementedException(); + } +} Copied: branches/tdiesler/trunk/src/main/java/org/jboss/ws/common/jaxrpc/TypeMappingRegistryImpl.java (from rev 1568, branches/tdiesler/trunk/src/main/java/org/jboss/ws/core/jaxrpc/TypeMappingRegistryImpl.java) =================================================================== --- branches/tdiesler/trunk/src/main/java/org/jboss/ws/core/jaxrpc/TypeMappingRegistryImpl.java 2006-12-06 05:06:23 UTC (rev 1568) +++ branches/tdiesler/trunk/src/main/java/org/jboss/ws/common/jaxrpc/TypeMappingRegistryImpl.java 2006-12-06 11:19:33 UTC (rev 1572) @@ -0,0 +1,164 @@ +/* +* 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.common.jaxrpc; + +// $Id$ + +import java.util.HashMap; +import java.util.Map; + +import javax.xml.rpc.JAXRPCException; +import javax.xml.rpc.encoding.TypeMapping; +import javax.xml.rpc.encoding.TypeMappingRegistry; + +import org.jboss.util.NotImplementedException; +import org.jboss.ws.common.Constants; + +/** + * This defines a registry of TypeMapping instances for encoding styles. + * + * @author Thomas.Diesler(a)jboss.org + * @since 04-Dec-2004 + */ +public class TypeMappingRegistryImpl implements TypeMappingRegistry +{ + // The registered typeMapping for the literal encoding style + private Map<String, TypeMappingImpl> typeMappings = new HashMap<String, TypeMappingImpl>(); + + public TypeMappingRegistryImpl() + { + typeMappings.put(Constants.URI_LITERAL_ENC, new LiteralTypeMapping()); + typeMappings.put(Constants.URI_SOAP11_ENC, new EncodedTypeMapping()); + } + + /** + * Removes all registered TypeMappings and encodingStyleURIs from this TypeMappingRegistry. + */ + public void clear() + { + typeMappings.clear(); + } + + /** + * Gets the registered default TypeMapping instance. + * This method returns null if there is no registered default TypeMapping in the registry. + * @return The registered default TypeMapping instance or null + */ + public TypeMapping getDefaultTypeMapping() + { + return typeMappings.get(Constants.URI_LITERAL_ENC); + } + + /** + * Registers the TypeMapping instance that is default for all encoding styles supported by the TypeMappingRegistry. + * A default TypeMapping should include serializers and deserializers that are independent of and usable with any + * encoding style. Successive invocations of the registerDefault method replace any existing default TypeMapping instance. + * + * If the default TypeMapping is registered, any other TypeMapping instances registered through the + * TypeMappingRegistry.register method (for a set of encodingStyle URIs) override the default TypeMapping. + * + * @param mapping TypeMapping instance + * @throws javax.xml.rpc.JAXRPCException If there is an error in the registration of the default TypeMapping + */ + public void registerDefault(TypeMapping mapping) + { + throw new NotImplementedException(); + } + + /** + * Creates a new empty TypeMapping object. + * @return TypeMapping instance + */ + public TypeMapping createTypeMapping() + { + throw new NotImplementedException(); + } + + /** + * Returns the registered TypeMapping for the specified encodingStyle URI. If there is no registered TypeMapping for + * the specified encodingStyleURI, this method returns null. + * @param encodingStyleURI Encoding style specified as an URI + * @return TypeMapping for the specified encodingStyleURI or null + */ + public TypeMapping getTypeMapping(String encodingStyleURI) + { + assertEncodingStyle(encodingStyleURI); + return typeMappings.get(encodingStyleURI); + } + + /** + * Returns a list of registered encodingStyle URIs in this TypeMappingRegistry instance. + * @return Array of the registered encodingStyle URIs + */ + public String[] getRegisteredEncodingStyleURIs() + { + return new String[]{Constants.URI_LITERAL_ENC, Constants.URI_SOAP11_ENC}; + } + + /** + * Registers a TypeMapping instance with the TypeMappingRegistry. + * This method replaces any existing registered TypeMapping instance for the specified encodingStyleURI. + * + * @param encodingStyleURI An encoding style specified as an URI. + * @param mapping TypeMapping instance + * @return Previous TypeMapping associated with the specified encodingStyleURI, or null if there was no + * TypeMapping associated with the specified encodingStyleURI + * @throws javax.xml.rpc.JAXRPCException If there is an error in the registration of the TypeMapping for the specified encodingStyleURI. + */ + public TypeMapping register(String encodingStyleURI, TypeMapping mapping) + { + throw new NotImplementedException(); + } + + /** + * Unregisters a TypeMapping instance, if present, from the specified encodingStyleURI. + * @param encodingStyleURI Encoding style specified as an URI + * @return TypeMapping instance that has been unregistered or null if there was no + * TypeMapping registered for the specified encodingStyleURI + */ + public TypeMapping unregisterTypeMapping(String encodingStyleURI) + { + throw new NotImplementedException(); + } + + /** + * Removes a TypeMapping from the TypeMappingRegistry. + * A TypeMapping is associated with 1 or more encodingStyleURIs. This method unregisters the specified + * TypeMapping instance from all associated encodingStyleURIs and then removes this TypeMapping + * instance from the registry. + * + * @param mapping TypeMapping to be removed + * @return true if specified TypeMapping is removed from the TypeMappingRegistry; + * false if the specified TypeMapping was not in the TypeMappingRegistry + */ + public boolean removeTypeMapping(TypeMapping mapping) + { + throw new NotImplementedException(); + } + + /** Assert the literal encoding style */ + private void assertEncodingStyle(String encURI) + { + if (Constants.URI_LITERAL_ENC.equals(encURI) == false && Constants.URI_SOAP11_ENC.equals(encURI) == false) + throw new JAXRPCException("Unsupported encoding style: " + encURI); + } +} Copied: branches/tdiesler/trunk/src/main/java/org/jboss/ws/common/jaxrpc/Use.java (from rev 1568, branches/tdiesler/trunk/src/main/java/org/jboss/ws/core/jaxrpc/Use.java) =================================================================== --- branches/tdiesler/trunk/src/main/java/org/jboss/ws/core/jaxrpc/Use.java 2006-12-06 05:06:23 UTC (rev 1568) +++ branches/tdiesler/trunk/src/main/java/org/jboss/ws/common/jaxrpc/Use.java 2006-12-06 11:19:33 UTC (rev 1572) @@ -0,0 +1,74 @@ +/* +* 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.common.jaxrpc; + +import org.jboss.ws.common.Constants; + +// $Id$ + +/** A type-safe enumeration for encoding use. + * + * @author Thomas.Diesler(a)jboss.org + * @since 16-Oct-2005 + */ +public class Use +{ + private String use; + + public static final Use LITERAL = new Use("literal"); + public static final Use ENCODED = new Use("encoded"); + + private Use(String use) + { + this.use = use; + } + + public static Use getDefaultUse() + { + return LITERAL; + } + + public static Use valueOf(String encodingStyle) + { + if (Constants.URI_LITERAL_ENC.equals(encodingStyle) || LITERAL.use.equals(encodingStyle)) + return LITERAL; + if (Constants.URI_SOAP11_ENC.equals(encodingStyle) || ENCODED.use.equals(encodingStyle)) + return ENCODED; + + throw new IllegalArgumentException("Unsupported encoding style: " + encodingStyle); + } + + public String toURI() + { + String encURI = null; + if (this == LITERAL) + encURI = Constants.URI_LITERAL_ENC; + else if (this == ENCODED) + encURI = Constants.URI_SOAP11_ENC; + return encURI; + } + + public String toString() + { + return use; + } +} Modified: branches/tdiesler/trunk/src/main/java/org/jboss/ws/common/jaxrpc/encoding/JBossXBDeserializer.java =================================================================== --- branches/tdiesler/trunk/src/main/java/org/jboss/ws/common/jaxrpc/encoding/JBossXBDeserializer.java 2006-12-06 10:47:51 UTC (rev 1571) +++ branches/tdiesler/trunk/src/main/java/org/jboss/ws/common/jaxrpc/encoding/JBossXBDeserializer.java 2006-12-06 11:19:33 UTC (rev 1572) @@ -30,13 +30,13 @@ import org.apache.xerces.xs.XSModel; import org.jboss.logging.Logger; import org.jboss.ws.common.binding.BindingException; +import org.jboss.ws.common.binding.ComplexTypeDeserializer; import org.jboss.ws.common.binding.SerializationContext; +import org.jboss.ws.common.jbossxb.JBossXBConstants; +import org.jboss.ws.common.jbossxb.JBossXBUnmarshaller; +import org.jboss.ws.common.jbossxb.JBossXBUnmarshallerImpl; import org.jboss.ws.common.metadata.jaxrpcmapping.JavaWsdlMapping; -import org.jboss.ws.core.binding.ComplexTypeDeserializer; import org.jboss.ws.core.jaxrpc.SerializationContextJAXRPC; -import org.jboss.ws.core.jbossxb.JBossXBConstants; -import org.jboss.ws.core.jbossxb.JBossXBUnmarshaller; -import org.jboss.ws.core.jbossxb.JBossXBUnmarshallerImpl; /** * A Deserializer that can handle complex types by delegating to JAXB. Modified: branches/tdiesler/trunk/src/main/java/org/jboss/ws/common/jaxrpc/encoding/JBossXBSerializer.java =================================================================== --- branches/tdiesler/trunk/src/main/java/org/jboss/ws/common/jaxrpc/encoding/JBossXBSerializer.java 2006-12-06 10:47:51 UTC (rev 1571) +++ branches/tdiesler/trunk/src/main/java/org/jboss/ws/common/jaxrpc/encoding/JBossXBSerializer.java 2006-12-06 11:19:33 UTC (rev 1572) @@ -30,14 +30,14 @@ import org.apache.xerces.xs.XSModel; import org.jboss.logging.Logger; import org.jboss.ws.common.binding.BindingException; +import org.jboss.ws.common.binding.ComplexTypeSerializer; import org.jboss.ws.common.binding.SerializationContext; +import org.jboss.ws.common.jbossxb.JBossXBConstants; +import org.jboss.ws.common.jbossxb.JBossXBMarshaller; +import org.jboss.ws.common.jbossxb.JBossXBMarshallerImpl; +import org.jboss.ws.common.jbossxb.XercesXSMarshallerImpl; import org.jboss.ws.common.metadata.jaxrpcmapping.JavaWsdlMapping; -import org.jboss.ws.core.binding.ComplexTypeSerializer; import org.jboss.ws.core.jaxrpc.SerializationContextJAXRPC; -import org.jboss.ws.core.jbossxb.JBossXBConstants; -import org.jboss.ws.core.jbossxb.JBossXBMarshaller; -import org.jboss.ws.core.jbossxb.JBossXBMarshallerImpl; -import org.jboss.ws.core.jbossxb.XercesXSMarshallerImpl; import org.w3c.dom.NamedNodeMap; /** Modified: branches/tdiesler/trunk/src/main/java/org/jboss/ws/common/jaxrpc/encoding/SOAPElementDeserializer.java =================================================================== --- branches/tdiesler/trunk/src/main/java/org/jboss/ws/common/jaxrpc/encoding/SOAPElementDeserializer.java 2006-12-06 10:47:51 UTC (rev 1571) +++ branches/tdiesler/trunk/src/main/java/org/jboss/ws/common/jaxrpc/encoding/SOAPElementDeserializer.java 2006-12-06 11:19:33 UTC (rev 1572) @@ -25,14 +25,17 @@ import javax.xml.namespace.QName; import javax.xml.soap.SOAPElement; +import javax.xml.soap.SOAPException; +import javax.xml.soap.SOAPFactory; import org.jboss.logging.Logger; import org.jboss.ws.common.binding.BindingException; import org.jboss.ws.common.binding.DeserializerSupport; import org.jboss.ws.common.binding.SerializationContext; import org.jboss.ws.common.utils.DOMUtils; -import org.jboss.ws.core.soap.SOAPFactoryImpl; import org.w3c.dom.Element; +import org.w3c.dom.Node; +import org.w3c.dom.NodeList; /** * A deserializer that can handle xsd:anyType @@ -51,8 +54,7 @@ try { Element domElement = DOMUtils.parse(xmlFragment); - SOAPFactoryImpl soapFactory = new SOAPFactoryImpl(); - SOAPElement soapElement = soapFactory.createElement(domElement, true); + SOAPElement soapElement = createElement(domElement, true); return soapElement; } catch (RuntimeException rte) @@ -64,4 +66,56 @@ throw new BindingException(); } } + + /** + * Create a SOAPElement from a DOM Element. + * This method is not part of the javax.xml.soap.SOAPFactory interface. + */ + public SOAPElement createElement(Element domNode, boolean deep) throws SOAPException + { + if (domNode == null) + throw new IllegalArgumentException("Source node cannot be null"); + + String localName = domNode.getLocalName(); + String prefix = domNode.getPrefix() != null ? domNode.getPrefix() : ""; + String nsURI = domNode.getNamespaceURI() != null ? domNode.getNamespaceURI() : ""; + + SOAPFactory factory = SOAPFactory.newInstance(); + SOAPElement soapElement = factory.createElement(localName, prefix, nsURI); + + // Add the child elements as well + if (deep) + { + if (domNode instanceof Element) + DOMUtils.copyAttributes(soapElement, (Element)domNode); + + NodeList nlist = domNode.getChildNodes(); + for (int i = 0; i < nlist.getLength(); i++) + { + Node child = nlist.item(i); + short nodeType = child.getNodeType(); + if (nodeType == Node.ELEMENT_NODE) + { + SOAPElement soapChild = createElement((Element)child, true); + soapElement.addChildElement(soapChild); + } + else if (nodeType == Node.TEXT_NODE) + { + String nodeValue = child.getNodeValue(); + soapElement.addTextNode(nodeValue); + } + else if (nodeType == Node.CDATA_SECTION_NODE) + { + String nodeValue = child.getNodeValue(); + soapElement.addTextNode(nodeValue); + } + else + { + log.trace("Ignore child type: " + nodeType); + } + } + } + + return soapElement; + } } Copied: branches/tdiesler/trunk/src/main/java/org/jboss/ws/common/jbossxb (from rev 1568, branches/tdiesler/trunk/src/main/java/org/jboss/ws/core/jbossxb) Deleted: branches/tdiesler/trunk/src/main/java/org/jboss/ws/common/jbossxb/JBossXBConstants.java =================================================================== --- branches/tdiesler/trunk/src/main/java/org/jboss/ws/core/jbossxb/JBossXBConstants.java 2006-12-06 05:06:23 UTC (rev 1568) +++ branches/tdiesler/trunk/src/main/java/org/jboss/ws/common/jbossxb/JBossXBConstants.java 2006-12-06 11:19:33 UTC (rev 1572) @@ -1,43 +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.jbossxb; - -// $Id$ - -/** JBossXB Constants - * - * @author Thomas.Diesler(a)jboss.org - * @since 18-Oct-2004 - */ -public interface JBossXBConstants -{ - /** Set this property with a Reader to the xsdSchema */ - String JBXB_SCHEMA_READER = "org.jboss.xb.xsd.reader"; - /** Set this property with a the QName of the root element */ - String JBXB_ROOT_QNAME = "org.jboss.xb.root.qname"; - /** Set this property with a the QName of the root type */ - String JBXB_TYPE_QNAME = "org.jboss.xb.type.qname"; - /** Set this property with an instance of JavaWsdlMapping */ - String JBXB_JAVA_MAPPING = "org.jboss.xb.java.mapping"; - /** Set this property to the XSModel to pull schema info from */ - String JBXB_XS_MODEL = "org.jboss.xb.xsd.xsmodel"; -} Copied: branches/tdiesler/trunk/src/main/java/org/jboss/ws/common/jbossxb/JBossXBConstants.java (from rev 1571, branches/tdiesler/trunk/src/main/java/org/jboss/ws/core/jbossxb/JBossXBConstants.java) =================================================================== --- branches/tdiesler/trunk/src/main/java/org/jboss/ws/core/jbossxb/JBossXBConstants.java 2006-12-06 10:47:51 UTC (rev 1571) +++ branches/tdiesler/trunk/src/main/java/org/jboss/ws/common/jbossxb/JBossXBConstants.java 2006-12-06 11:19:33 UTC (rev 1572) @@ -0,0 +1,43 @@ +/* +* 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.common.jbossxb; + +// $Id$ + +/** JBossXB Constants + * + * @author Thomas.Diesler(a)jboss.org + * @since 18-Oct-2004 + */ +public interface JBossXBConstants +{ + /** Set this property with a Reader to the xsdSchema */ + String JBXB_SCHEMA_READER = "org.jboss.xb.xsd.reader"; + /** Set this property with a the QName of the root element */ + String JBXB_ROOT_QNAME = "org.jboss.xb.root.qname"; + /** Set this property with a the QName of the root type */ + String JBXB_TYPE_QNAME = "org.jboss.xb.type.qname"; + /** Set this property with an instance of JavaWsdlMapping */ + String JBXB_JAVA_MAPPING = "org.jboss.xb.java.mapping"; + /** Set this property to the XSModel to pull schema info from */ + String JBXB_XS_MODEL = "org.jboss.xb.xsd.xsmodel"; +} Deleted: branches/tdiesler/trunk/src/main/java/org/jboss/ws/common/jbossxb/JBossXBDeserializer.java =================================================================== --- branches/tdiesler/trunk/src/main/java/org/jboss/ws/core/jbossxb/JBossXBDeserializer.java 2006-12-06 05:06:23 UTC (rev 1568) +++ branches/tdiesler/trunk/src/main/java/org/jboss/ws/common/jbossxb/JBossXBDeserializer.java 2006-12-06 11:19:33 UTC (rev 1572) @@ -1,110 +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.jbossxb; - -// $Id$ - -import java.io.ByteArrayInputStream; - -import javax.xml.namespace.QName; - -import org.apache.xerces.xs.XSModel; -import org.jboss.logging.Logger; -import org.jboss.ws.common.metadata.jaxrpcmapping.JavaWsdlMapping; -import org.jboss.ws.core.binding.BindingException; -import org.jboss.ws.core.binding.ComplexTypeDeserializer; -import org.jboss.ws.core.binding.SerializationContext; -import org.jboss.ws.core.jaxrpc.SerializationContextJAXRPC; - -/** - * A Deserializer that can handle complex types by delegating to JAXB. - * - * @author Thomas.Diesler(a)jboss.org - * @since 04-Dec-2004 - */ -public class JBossXBDeserializer extends ComplexTypeDeserializer -{ - // provide logging - private static final Logger log = Logger.getLogger(JBossXBDeserializer.class); - - private JBossXBUnmarshaller unmarshaller; - - public JBossXBDeserializer() throws BindingException - { - // Get the JAXB marshaller for complex objects - unmarshaller = new JBossXBUnmarshallerImpl(); - } - - /** - * For unmarshalling the WS layer passes to the JAXB layer - * - * - required self contained xml content - * - required map of packaged or generated XSDSchema - * - optional QName of the root complex type - * - optional instance of JavaWsdlMapping - * - * The xmlType is redundant if the root element name corresponds to a global element definition in schema. - * If the java mapping is null, default mapping rules apply. - * - * The result is an object instance or null. - * In case of an unmarshalling problem a descriptive exception is thrown. - */ - public Object deserialize(QName xmlName, QName xmlType, String val, SerializationContext serContext) throws BindingException - { - log.debug("deserialize: [xmlName=" + xmlName + ",xmlType=" + xmlType + "]"); - - // Expect the specific JAXRPC serialization context - SerializationContextJAXRPC jaxrpcContext = (SerializationContextJAXRPC)serContext; - - Object value = null; - String typeName = xmlType.getLocalPart(); - - try - { - // Get the parsed model - XSModel model = jaxrpcContext.getXsModel(); - - // Get the jaxrpc-mapping.xml meta data - JavaWsdlMapping jaxrpcMapping = jaxrpcContext.getJavaWsdlMapping(); - - unmarshaller.setProperty(JBossXBConstants.JBXB_XS_MODEL, model); - unmarshaller.setProperty(JBossXBConstants.JBXB_ROOT_QNAME, xmlName); - unmarshaller.setProperty(JBossXBConstants.JBXB_TYPE_QNAME, xmlType); - unmarshaller.setProperty(JBossXBConstants.JBXB_JAVA_MAPPING, jaxrpcMapping); - - ByteArrayInputStream ins = new ByteArrayInputStream(val.getBytes("UTF-8")); - value = unmarshaller.unmarshal(ins); - } - catch (RuntimeException rte) - { - throw rte; - } - catch (Exception ex) - { - throw new BindingException(ex); - } - - log.debug("deserialized: " + (value != null ? value.getClass().getName() : null)); - return value; - - } -} Deleted: branches/tdiesler/trunk/src/main/java/org/jboss/ws/common/jbossxb/JBossXBDeserializerFactory.java =================================================================== --- branches/tdiesler/trunk/src/main/java/org/jboss/ws/core/jbossxb/JBossXBDeserializerFactory.java 2006-12-06 05:06:23 UTC (rev 1568) +++ branches/tdiesler/trunk/src/main/java/org/jboss/ws/common/jbossxb/JBossXBDeserializerFactory.java 2006-12-06 11:19:33 UTC (rev 1572) @@ -1,43 +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.jbossxb; - -import org.jboss.ws.core.binding.BindingException; -import org.jboss.ws.core.binding.DeserializerSupport; -import org.jboss.ws.core.jaxrpc.encoding.DeserializerFactoryBase; - -// $Id$ - -/** - * A factory for a Deserializer that can handle complex types - * by delegating to JAXB. - * - * @author Thomas.Diesler(a)jboss.org - * @since 04-Dec-2004 - */ -public class JBossXBDeserializerFactory extends DeserializerFactoryBase -{ - public DeserializerSupport getDeserializer() throws BindingException - { - return new JBossXBDeserializer(); - } -} Deleted: branches/tdiesler/trunk/src/main/java/org/jboss/ws/common/jbossxb/JBossXBMarshaller.java =================================================================== --- branches/tdiesler/trunk/src/main/java/org/jboss/ws/core/jbossxb/JBossXBMarshaller.java 2006-12-06 05:06:23 UTC (rev 1568) +++ branches/tdiesler/trunk/src/main/java/org/jboss/ws/common/jbossxb/JBossXBMarshaller.java 2006-12-06 11:19:33 UTC (rev 1572) @@ -1,48 +0,0 @@ -/* -* JBoss, Home of Professional Open Source -* Copyright 2005, JBoss Inc., and individual contributors as indicated -* by the @authors tag. See the copyright.txt in the distribution for a -* full listing of individual contributors. -* -* This is free software; you can redistribute it and/or modify it -* under the terms of the GNU Lesser General Public License as -* published by the Free Software Foundation; either version 2.1 of -* the License, or (at your option) any later version. -* -* This software is distributed in the hope that it will be useful, -* but WITHOUT ANY WARRANTY; without even the implied warranty of -* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU -* Lesser General Public License for more details. -* -* You should have received a copy of the GNU Lesser General Public -* License along with this software; if not, write to the Free -* Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA -* 02110-1301 USA, or see the FSF site: http://www.fsf.org. -*/ -package org.jboss.ws.core.jbossxb; - -import org.xml.sax.ContentHandler; -import org.w3c.dom.Node; - -import java.io.Writer; -import java.io.OutputStream; - -/** - * @author Heiko Braun <heiko.braun(a)jboss.com&gt; - * @version $Id$ - * @since Jul 5, 2006 - */ -public interface JBossXBMarshaller { - - void marshal(Object obj, Writer writer) throws MarshalException; - - void marshal(Object obj, ContentHandler handler); - - void marshal(Object obj, Node node); - - void marshal(Object obj, OutputStream os) throws MarshalException; - - Object getProperty(String name); - - void setProperty(String name, Object value); -} Copied: branches/tdiesler/trunk/src/main/java/org/jboss/ws/common/jbossxb/JBossXBMarshaller.java (from rev 1571, branches/tdiesler/trunk/src/main/java/org/jboss/ws/core/jbossxb/JBossXBMarshaller.java) =================================================================== --- branches/tdiesler/trunk/src/main/java/org/jboss/ws/core/jbossxb/JBossXBMarshaller.java 2006-12-06 10:47:51 UTC (rev 1571) +++ branches/tdiesler/trunk/src/main/java/org/jboss/ws/common/jbossxb/JBossXBMarshaller.java 2006-12-06 11:19:33 UTC (rev 1572) @@ -0,0 +1,48 @@ +/* +* 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.common.jbossxb; + +import java.io.OutputStream; +import java.io.Writer; + +import org.w3c.dom.Node; +import org.xml.sax.ContentHandler; + +/** + * @author Heiko Braun <heiko.braun(a)jboss.com&gt; + * @version $Id$ + * @since Jul 5, 2006 + */ +public interface JBossXBMarshaller { + + void marshal(Object obj, Writer writer) throws MarshalException; + + void marshal(Object obj, ContentHandler handler); + + void marshal(Object obj, Node node); + + void marshal(Object obj, OutputStream os) throws MarshalException; + + Object getProperty(String name); + + void setProperty(String name, Object value); +} Deleted: branches/tdiesler/trunk/src/main/java/org/jboss/ws/common/jbossxb/JBossXBMarshallerImpl.java =================================================================== --- branches/tdiesler/trunk/src/main/java/org/jboss/ws/core/jbossxb/JBossXBMarshallerImpl.java 2006-12-06 05:06:23 UTC (rev 1568) +++ branches/tdiesler/trunk/src/main/java/org/jboss/ws/common/jbossxb/JBossXBMarshallerImpl.java 2006-12-06 11:19:33 UTC (rev 1572) @@ -1,233 +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.jbossxb; - -// $Id$ - -import org.jboss.logging.Logger; -import org.jboss.util.NotImplementedException; -import org.jboss.ws.common.WSException; -import org.jboss.ws.common.metadata.jaxrpcmapping.JavaWsdlMapping; -import org.jboss.ws.common.metadata.jaxrpcmapping.JavaXmlTypeMapping; -import org.jboss.ws.common.metadata.jaxrpcmapping.VariableMapping; -import org.jboss.ws.common.utils.JavaUtils; -import org.jboss.ws.extras.xop.jaxrpc.XOPMarshallerImpl; -import org.jboss.xb.binding.Constants; - -import org.jboss.xb.binding.sunday.marshalling.MarshallerImpl; -import org.jboss.xb.binding.sunday.unmarshalling.SchemaBinding; -import org.w3c.dom.Node; -import org.xml.sax.ContentHandler; - -import javax.xml.namespace.QName; -import java.io.OutputStream; -import java.io.OutputStreamWriter; -import java.io.Writer; -import java.util.HashMap; - -/** - * An implementation of a JAXB Marshaller that uses the JBossXB schema binding marshaller. - * - * @author Thomas.Diesler(a)jboss.org - * @author Heiko.Braun(a)jboss.org - * @since 05-Jul-2006 - */ -public class JBossXBMarshallerImpl implements JBossXBMarshaller { - - // provide logging - private static final Logger log = Logger.getLogger(JBossXBMarshallerImpl.class); - - // The marshaller properties - private HashMap properties = new HashMap(); - - private MarshallerImpl delegate; - - public JBossXBMarshallerImpl() - { - - //ClassInfos.disableCache(); - - delegate = new MarshallerImpl(); - delegate.setProperty(org.jboss.xb.binding.Marshaller.PROP_OUTPUT_XML_VERSION, "false"); - delegate.setProperty(org.jboss.xb.binding.Marshaller.PROP_OUTPUT_INDENTATION, "false"); - delegate.declareNamespace("xsi", Constants.NS_XML_SCHEMA_INSTANCE); - delegate.setSupportNil(true); - } - - /** - * Marshal the content tree rooted at obj into a Writer. - */ - public void marshal(Object obj, Writer writer) throws MarshalException - { - assertRequiredProperties(); - - try - { - QName xmlName = (QName)getProperty(JBossXBConstants.JBXB_ROOT_QNAME); - delegate.addRootElement(xmlName); - - QName xmlType = (QName)getProperty(JBossXBConstants.JBXB_TYPE_QNAME); - boolean isAnonymousType = (xmlType != null && xmlType.getLocalPart().startsWith(">")); - if (xmlType != null && !isAnonymousType) - { - delegate.setRootTypeQName(xmlType); - } - - if (xmlName.getNamespaceURI().length() > 0) - { - String prefix = xmlName.getPrefix(); - String nsURI = xmlName.getNamespaceURI(); - delegate.declareNamespace(prefix, nsURI); - } - - // wildcards still need to be mapped - // todo: cleanup XB API - JavaWsdlMapping wsdlMapping = (JavaWsdlMapping)getProperty(JBossXBConstants.JBXB_JAVA_MAPPING); - if (wsdlMapping != null) - { - JavaXmlTypeMapping[] javaXmlMappings = wsdlMapping.getJavaXmlTypeMappings(); - if (javaXmlMappings != null) - { - for (int i = 0; i < javaXmlMappings.length; ++i) - { - JavaXmlTypeMapping javaXmlMapping = javaXmlMappings[i]; - VariableMapping[] variableMappings = javaXmlMapping.getVariableMappings(); - - if (variableMappings != null) - { - String clsName = javaXmlMapping.getJavaType(); - Class cls = JavaUtils.loadJavaType(clsName, Thread.currentThread().getContextClassLoader()); - QName clsQName = javaXmlMapping.getRootTypeQName(); - - if (clsQName != null) - { - // TODO: legacy API usage, see JBWS-1091 - if ("complexType".equalsIgnoreCase(javaXmlMapping.getQnameScope())) - { - delegate.mapClassToXsiType(cls, clsQName.getNamespaceURI(), clsQName.getLocalPart()); - } - } - - for (int j = 0; j < variableMappings.length; ++j) - { - VariableMapping variableMapping = variableMappings[j]; - if (variableMapping.getXmlWildcard()) - { - delegate.mapFieldToWildcard(cls, "_any", JBossXBSupport.getWildcardMarshaller()); - } - } - } - } - } - } - - // the actual marshalling - SchemaBinding schemaBinding = JBossXBSupport.getOrCreateSchemaBinding(properties); - schemaBinding.setXopMarshaller(new XOPMarshallerImpl()); - delegate.marshal(schemaBinding, null, obj, writer); - } - catch (RuntimeException e) - { - throw e; - } - catch (Exception e) - { - throw new MarshalException(e); - } - } - - /** - * Marshal the content tree rooted at obj into SAX2 events. - */ - public void marshal(Object obj, ContentHandler handler) - { - throw new NotImplementedException(); - } - - /** - * Marshal the content tree rooted at obj into a DOM tree. - */ - public void marshal(Object obj, Node node) - { - throw new NotImplementedException(); - } - - /** - * Marshal the content tree rooted at obj into an output stream. - */ - public void marshal(Object obj, OutputStream os) throws MarshalException - { - marshal(obj, new OutputStreamWriter(os)); - } - - /** - * Get the particular property in the underlying implementation of - * Marshaller. - */ - public Object getProperty(String name) - { - if (name == null) - throw new IllegalArgumentException("name parameter is null"); - - return properties.get(name); - } - - /** - * Set the particular property in the underlying implementation of - * Marshaller. - * - */ - public void setProperty(String name, Object value) - { - if (name == null) - throw new IllegalArgumentException("name parameter is null"); - - properties.put(name, value); - } - - /** - * Get a DOM tree view of the content tree(Optional). - */ - public Node getNode(Object contentTree) - { - throw new NotImplementedException(); - } - - /** - * Assert the required properties - */ - private void assertRequiredProperties() - { - if (getProperty(JBossXBConstants.JBXB_SCHEMA_READER) == null && getProperty(JBossXBConstants.JBXB_XS_MODEL) == null) - throw new WSException("Cannot find required property: " + JBossXBConstants.JBXB_XS_MODEL); - - if (getProperty(JBossXBConstants.JBXB_JAVA_MAPPING) == null) - throw new WSException("Cannot find required property: " + JBossXBConstants.JBXB_JAVA_MAPPING); - - QName xmlName = (QName)getProperty(JBossXBConstants.JBXB_ROOT_QNAME); - if (xmlName == null) - throw new WSException("Cannot find required property: " + JBossXBConstants.JBXB_ROOT_QNAME); - - if (xmlName.getNamespaceURI().length() > 0 && xmlName.getPrefix().length() == 0) - throw new IllegalArgumentException("The given root element name must be prefix qualified: " + xmlName); - } -} Copied: branches/tdiesler/trunk/src/main/java/org/jboss/ws/common/jbossxb/JBossXBMarshallerImpl.java (from rev 1571, branches/tdiesler/trunk/src/main/java/org/jboss/ws/core/jbossxb/JBossXBMarshallerImpl.java) =================================================================== --- branches/tdiesler/trunk/src/main/java/org/jboss/ws/core/jbossxb/JBossXBMarshallerImpl.java 2006-12-06 10:47:51 UTC (rev 1571) +++ branches/tdiesler/trunk/src/main/java/org/jboss/ws/common/jbossxb/JBossXBMarshallerImpl.java 2006-12-06 11:19:33 UTC (rev 1572) @@ -0,0 +1,233 @@ +/* + * 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.common.jbossxb; + +// $Id$ + +import java.io.OutputStream; +import java.io.OutputStreamWriter; +import java.io.Writer; +import java.util.HashMap; + +import javax.xml.namespace.QName; + +import org.jboss.logging.Logger; +import org.jboss.util.NotImplementedException; +import org.jboss.ws.common.WSException; +import org.jboss.ws.common.metadata.jaxrpcmapping.JavaWsdlMapping; +import org.jboss.ws.common.metadata.jaxrpcmapping.JavaXmlTypeMapping; +import org.jboss.ws.common.metadata.jaxrpcmapping.VariableMapping; +import org.jboss.ws.common.utils.JavaUtils; +import org.jboss.ws.extras.xop.jaxrpc.XOPMarshallerImpl; +import org.jboss.xb.binding.Constants; +import org.jboss.xb.binding.sunday.marshalling.MarshallerImpl; +import org.jboss.xb.binding.sunday.unmarshalling.SchemaBinding; +import org.w3c.dom.Node; +import org.xml.sax.ContentHandler; + +/** + * An implementation of a JAXB Marshaller that uses the JBossXB schema binding marshaller. + * + * @author Thomas.Diesler(a)jboss.org + * @author Heiko.Braun(a)jboss.org + * @since 05-Jul-2006 + */ +public class JBossXBMarshallerImpl implements JBossXBMarshaller { + + // provide logging + private static final Logger log = Logger.getLogger(JBossXBMarshallerImpl.class); + + // The marshaller properties + private HashMap properties = new HashMap(); + + private MarshallerImpl delegate; + + public JBossXBMarshallerImpl() + { + + //ClassInfos.disableCache(); + + delegate = new MarshallerImpl(); + delegate.setProperty(org.jboss.xb.binding.Marshaller.PROP_OUTPUT_XML_VERSION, "false"); + delegate.setProperty(org.jboss.xb.binding.Marshaller.PROP_OUTPUT_INDENTATION, "false"); + delegate.declareNamespace("xsi", Constants.NS_XML_SCHEMA_INSTANCE); + delegate.setSupportNil(true); + } + + /** + * Marshal the content tree rooted at obj into a Writer. + */ + public void marshal(Object obj, Writer writer) throws MarshalException + { + assertRequiredProperties(); + + try + { + QName xmlName = (QName)getProperty(JBossXBConstants.JBXB_ROOT_QNAME); + delegate.addRootElement(xmlName); + + QName xmlType = (QName)getProperty(JBossXBConstants.JBXB_TYPE_QNAME); + boolean isAnonymousType = (xmlType != null && xmlType.getLocalPart().startsWith(">")); + if (xmlType != null && !isAnonymousType) + { + delegate.setRootTypeQName(xmlType); + } + + if (xmlName.getNamespaceURI().length() > 0) + { + String prefix = xmlName.getPrefix(); + String nsURI = xmlName.getNamespaceURI(); + delegate.declareNamespace(prefix, nsURI); + } + + // wildcards still need to be mapped + // todo: cleanup XB API + JavaWsdlMapping wsdlMapping = (JavaWsdlMapping)getProperty(JBossXBConstants.JBXB_JAVA_MAPPING); + if (wsdlMapping != null) + { + JavaXmlTypeMapping[] javaXmlMappings = wsdlMapping.getJavaXmlTypeMappings(); + if (javaXmlMappings != null) + { + for (int i = 0; i < javaXmlMappings.length; ++i) + { + JavaXmlTypeMapping javaXmlMapping = javaXmlMappings[i]; + VariableMapping[] variableMappings = javaXmlMapping.getVariableMappings(); + + if (variableMappings != null) + { + String clsName = javaXmlMapping.getJavaType(); + Class cls = JavaUtils.loadJavaType(clsName, Thread.currentThread().getContextClassLoader()); + QName clsQName = javaXmlMapping.getRootTypeQName(); + + if (clsQName != null) + { + // TODO: legacy API usage, see JBWS-1091 + if ("complexType".equalsIgnoreCase(javaXmlMapping.getQnameScope())) + { + delegate.mapClassToXsiType(cls, clsQName.getNamespaceURI(), clsQName.getLocalPart()); + } + } + + for (int j = 0; j < variableMappings.length; ++j) + { + VariableMapping variableMapping = variableMappings[j]; + if (variableMapping.getXmlWildcard()) + { + delegate.mapFieldToWildcard(cls, "_any", JBossXBSupport.getWildcardMarshaller()); + } + } + } + } + } + } + + // the actual marshalling + SchemaBinding schemaBinding = JBossXBSupport.getOrCreateSchemaBinding(properties); + schemaBinding.setXopMarshaller(new XOPMarshallerImpl()); + delegate.marshal(schemaBinding, null, obj, writer); + } + catch (RuntimeException e) + { + throw e; + } + catch (Exception e) + { + throw new MarshalException(e); + } + } + + /** + * Marshal the content tree rooted at obj into SAX2 events. + */ + public void marshal(Object obj, ContentHandler handler) + { + throw new NotImplementedException(); + } + + /** + * Marshal the content tree rooted at obj into a DOM tree. + */ + public void marshal(Object obj, Node node) + { + throw new NotImplementedException(); + } + + /** + * Marshal the content tree rooted at obj into an output stream. + */ + public void marshal(Object obj, OutputStream os) throws MarshalException + { + marshal(obj, new OutputStreamWriter(os)); + } + + /** + * Get the particular property in the underlying implementation of + * Marshaller. + */ + public Object getProperty(String name) + { + if (name == null) + throw new IllegalArgumentException("name parameter is null"); + + return properties.get(name); + } + + /** + * Set the particular property in the underlying implementation of + * Marshaller. + * + */ + public void setProperty(String name, Object value) + { + if (name == null) + throw new IllegalArgumentException("name parameter is null"); + + properties.put(name, value); + } + + /** + * Get a DOM tree view of the content tree(Optional). + */ + public Node getNode(Object contentTree) + { + throw new NotImplementedException(); + } + + /** + * Assert the required properties + */ + private void assertRequiredProperties() + { + if (getProperty(JBossXBConstants.JBXB_SCHEMA_READER) == null && getProperty(JBossXBConstants.JBXB_XS_MODEL) == null) + throw new WSException("Cannot find required property: " + JBossXBConstants.JBXB_XS_MODEL); + + if (getProperty(JBossXBConstants.JBXB_JAVA_MAPPING) == null) + throw new WSException("Cannot find required property: " + JBossXBConstants.JBXB_JAVA_MAPPING); + + QName xmlName = (QName)getProperty(JBossXBConstants.JBXB_ROOT_QNAME); + if (xmlName == null) + throw new WSException("Cannot find required property: " + JBossXBConstants.JBXB_ROOT_QNAME); + + if (xmlName.getNamespaceURI().length() > 0 && xmlName.getPrefix().length() == 0) + throw new IllegalArgumentException("The given root element name must be prefix qualified: " + xmlName); + } +} Deleted: branches/tdiesler/trunk/src/main/java/org/jboss/ws/common/jbossxb/JBossXBSerializer.java =================================================================== --- branches/tdiesler/trunk/src/main/java/org/jboss/ws/core/jbossxb/JBossXBSerializer.java 2006-12-06 05:06:23 UTC (rev 1568) +++ branches/tdiesler/trunk/src/main/java/org/jboss/ws/common/jbossxb/JBossXBSerializer.java 2006-12-06 11:19:33 UTC (rev 1572) @@ -1,121 +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.jbossxb; - -// $Id$ - -import org.apache.xerces.xs.XSModel; -import org.jboss.logging.Logger; -import org.jboss.ws.common.metadata.jaxrpcmapping.JavaWsdlMapping; -import org.jboss.ws.core.binding.BindingException; -import org.jboss.ws.core.binding.ComplexTypeSerializer; -import org.jboss.ws.core.binding.SerializationContext; -import org.jboss.ws.core.jaxrpc.SerializationContextJAXRPC; -import org.w3c.dom.NamedNodeMap; - -import javax.xml.namespace.QName; -import java.io.StringWriter; - -/** - * A Serializer that can handle complex types by delegating to JAXB. - * - * @author Thomas.Diesler(a)jboss.org - * @since 04-Dec-2004 - */ -public class JBossXBSerializer extends ComplexTypeSerializer -{ - // provide logging - private static final Logger log = Logger.getLogger(JBossXBSerializer.class); - - private JBossXBMarshaller marshaller; - - public JBossXBSerializer() throws BindingException - { - // Get the JAXB marshaller for complex objects - marshaller = new JBossXBMarshallerImpl(); - } - - /** - * For marshalling the WS layer passes to the JAXB layer - * - * - optional java object instance - * - required map of packaged or generated XSDSchema - * - required QName of the root element - * - optional QName of the root complex type - * - optional instance of JavaWsdlMapping - * - * If the object value is null, the corresponding XML representation of the nillable element should be marshalled. - * The xmlType is redundant if the xmlName corresponds to a global element definition in schema. - * If the java mapping is null, default mapping rules apply. - * - * The result is a self contained (i.e. contains all namespace definitions) XML document without the XML declaration. - * In case of an marshalling problem a descriptive exception is thrown. - */ - public String serialize(QName xmlName, QName xmlType, Object value, SerializationContext serContext, NamedNodeMap attributes) throws BindingException - { - log.debug("serialize: [xmlName=" + xmlName + ",xmlType=" + xmlType + "]"); - - // Expect the specific JAXRPC serialization context - SerializationContextJAXRPC jaxrpcContext = (SerializationContextJAXRPC)serContext; - - try - { - // Get the parsed model - XSModel model = jaxrpcContext.getXsModel(); - - // Get the jaxrpc-mapping.xml object graph - JavaWsdlMapping jaxrpcMapping = jaxrpcContext.getJavaWsdlMapping(); - - // schemabinding marshaller is the default delegate - JBossXBMarshaller delegate = marshaller; - - if(value instanceof Exception) - { - // todo: CTS workaround for custom exceptions, clarify when Alexey is back - // causes NPE in MarshallerImpl:458 - delegate = new XercesXSMarshallerImpl(); - } - - // marshalling context - delegate.setProperty(JBossXBConstants.JBXB_XS_MODEL, model); - delegate.setProperty(JBossXBConstants.JBXB_TYPE_QNAME, xmlType); - delegate.setProperty(JBossXBConstants.JBXB_ROOT_QNAME, xmlName); - delegate.setProperty(JBossXBConstants.JBXB_JAVA_MAPPING, jaxrpcMapping); - - // marshall - StringWriter strwr = new StringWriter(); - delegate.marshal(value, strwr); - String xmlFragment = strwr.toString(); - - log.debug("serialized: " + xmlFragment); - return xmlFragment; - } - catch (RuntimeException rte) - { - throw rte; - } - catch (Exception ex) - { - throw new BindingException(ex); - } - } -} Deleted: branches/tdiesler/trunk/src/main/java/org/jboss/ws/common/jbossxb/JBossXBSerializerFactory.java =================================================================== --- branches/tdiesler/trunk/src/main/java/org/jboss/ws/core/jbossxb/JBossXBSerializerFactory.java 2006-12-06 05:06:23 UTC (rev 1568) +++ branches/tdiesler/trunk/src/main/java/org/jboss/ws/common/jbossxb/JBossXBSerializerFactory.java 2006-12-06 11:19:33 UTC (rev 1572) @@ -1,44 +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.jbossxb; - -import org.jboss.ws.core.binding.BindingException; -import org.jboss.ws.core.binding.SerializerSupport; -import org.jboss.ws.core.jaxrpc.encoding.SerializerFactoryBase; - -// $Id$ - - -/** - * A factory for a Serializer that can handle complex types - * by delegating to JAXB. - * - * @author Thomas.Diesler(a)jboss.org - * @since 04-Dec-2004 - */ -public class JBossXBSerializerFactory extends SerializerFactoryBase -{ - public SerializerSupport getSerializer() throws BindingException - { - return new JBossXBSerializer(); - } -} Deleted: branches/tdiesler/trunk/src/main/java/org/jboss/ws/common/jbossxb/JBossXBSupport.java =================================================================== --- branches/tdiesler/trunk/src/main/java/org/jboss/ws/core/jbossxb/JBossXBSupport.java 2006-12-06 05:06:23 UTC (rev 1568) +++ branches/tdiesler/trunk/src/main/java/org/jboss/ws/common/jbossxb/JBossXBSupport.java 2006-12-06 11:19:33 UTC (rev 1572) @@ -1,106 +0,0 @@ -package org.jboss.ws.core.jbossxb; - -import java.util.Map; - -import javax.xml.namespace.QName; - -import org.jboss.ws.common.metadata.jaxrpcmapping.JavaWsdlMapping; -import org.jboss.ws.common.metadata.wsdl.xmlschema.JBossXSModel; -import org.jboss.ws.common.umdm.EndpointMetaData; -import org.jboss.ws.common.umdm.OperationMetaData; -import org.jboss.ws.common.umdm.ServiceMetaData; -import org.jboss.ws.core.CommonMessageContext; -import org.jboss.ws.core.soap.MessageContextAssociation; -import org.jboss.xb.binding.MarshallingContext; -import org.jboss.xb.binding.ObjectLocalMarshaller; -import org.jboss.xb.binding.sunday.unmarshalling.SchemaBinding; -import org.jboss.xb.util.Dom2Sax; -import org.w3c.dom.Element; -import org.xml.sax.ContentHandler; -import org.xml.sax.SAXException; - -/** - * @author Heiko Braun <heiko.braun(a)jboss.com&gt; - * @since May 31, 2006 - */ -public class JBossXBSupport { - - /** - * Setup SchemaBinding associated with the ServiceMetaData. - * In case of an unconfigured call it will be generated from JAXB properties. - * <p> - * The SchemaBinding expects to have an element binding for the - * incomming xml element. Because the same element name can be reused - * by various operations with different xml types, we have to add the - * element binding on every invocation. - * - * @see JBossXBConstants#JBXB_ROOT_QNAME - * @see JBossXBConstants#JBXB_TYPE_QNAME - */ - public static SchemaBinding getOrCreateSchemaBinding(Map properties) - { - SchemaBinding schemaBinding = null; - SchemaBindingBuilder bindingBuilder = new SchemaBindingBuilder(); - - QName xmlName = (QName)properties.get(JBossXBConstants.JBXB_ROOT_QNAME); - QName xmlType = (QName)properties.get(JBossXBConstants.JBXB_TYPE_QNAME); - - // Get the eagerly initialized SchemaBinding from the ServiceMetaData - CommonMessageContext msgContext = MessageContextAssociation.peekMessageContext(); - if (msgContext != null) - { - OperationMetaData opMetaData = msgContext.getOperationMetaData(); - EndpointMetaData epMetaData = opMetaData.getEndpointMetaData(); - ServiceMetaData serviceMetaData = epMetaData.getServiceMetaData(); - schemaBinding = serviceMetaData.getSchemaBinding(); - } - - // In case of an unconfigured call generate the SchemaBinding from JAXB properties - if (schemaBinding == null) - { - JBossXSModel xsModel = (JBossXSModel)properties.get(JBossXBConstants.JBXB_XS_MODEL); - JavaWsdlMapping wsdlMapping = (JavaWsdlMapping)properties.get(JBossXBConstants.JBXB_JAVA_MAPPING); - schemaBinding = bindingBuilder.buildSchemaBinding(xsModel, wsdlMapping); - } - - // The SchemaBinding expects to have an element binding for the - // incomming xml element. Because the same element name can be reused - // by various operations with different xml types, we have to add the - // element binding on every invocation. - bindingBuilder.bindParameterToElement(schemaBinding, xmlName, xmlType); - - return schemaBinding; - } - - /** - * Create a Marshaller that serializes - * <code>org.w3c.dom.Element</code>'s to a <code>org.xml.sax.ContentHandler</code> - * - * @return ObjectLocalMarshaller - * - * @see org.jboss.xb.binding.MarshallingContext#getContentHandler() - */ - public static ObjectLocalMarshaller getWildcardMarshaller() - { - return new ObjectLocalMarshaller() { - public void marshal(MarshallingContext ctx, Object o) - { - if (o == null) - { - return; - } - - Element e = (Element)o; - ContentHandler ch = ctx.getContentHandler(); - try - { - Dom2Sax.dom2sax(e, ch); - } - catch (SAXException e1) - { - throw new IllegalStateException("Failed to marshal DOM element " + new QName(e.getNamespaceURI(), e.getLocalName()) + ": " + e1.getMessage()); - } - } - }; - } -} Copied: branches/tdiesler/trunk/src/main/java/org/jboss/ws/common/jbossxb/JBossXBSupport.java (from rev 1571, branches/tdiesler/trunk/src/main/java/org/jboss/ws/core/jbossxb/JBossXBSupport.java) =================================================================== --- branches/tdiesler/trunk/src/main/java/org/jboss/ws/core/jbossxb/JBossXBSupport.java 2006-12-06 10:47:51 UTC (rev 1571) +++ branches/tdiesler/trunk/src/main/java/org/jboss/ws/common/jbossxb/JBossXBSupport.java 2006-12-06 11:19:33 UTC (rev 1572) @@ -0,0 +1,106 @@ +package org.jboss.ws.common.jbossxb; + +import java.util.Map; + +import javax.xml.namespace.QName; + +import org.jboss.ws.common.metadata.jaxrpcmapping.JavaWsdlMapping; +import org.jboss.ws.common.metadata.wsdl.xmlschema.JBossXSModel; +import org.jboss.ws.common.umdm.EndpointMetaData; +import org.jboss.ws.common.umdm.OperationMetaData; +import org.jboss.ws.common.umdm.ServiceMetaData; +import org.jboss.ws.core.CommonMessageContext; +import org.jboss.ws.core.soap.MessageContextAssociation; +import org.jboss.xb.binding.MarshallingContext; +import org.jboss.xb.binding.ObjectLocalMarshaller; +import org.jboss.xb.binding.sunday.unmarshalling.SchemaBinding; +import org.jboss.xb.util.Dom2Sax; +import org.w3c.dom.Element; +import org.xml.sax.ContentHandler; +import org.xml.sax.SAXException; + +/** + * @author Heiko Braun <heiko.braun(a)jboss.com&gt; + * @since May 31, 2006 + */ +public class JBossXBSupport { + + /** + * Setup SchemaBinding associated with the ServiceMetaData. + * In case of an unconfigured call it will be generated from JAXB properties. + * <p> + * The SchemaBinding expects to have an element binding for the + * incomming xml element. Because the same element name can be reused + * by various operations with different xml types, we have to add the + * element binding on every invocation. + * + * @see JBossXBConstants#JBXB_ROOT_QNAME + * @see JBossXBConstants#JBXB_TYPE_QNAME + */ + public static SchemaBinding getOrCreateSchemaBinding(Map properties) + { + SchemaBinding schemaBinding = null; + SchemaBindingBuilder bindingBuilder = new SchemaBindingBuilder(); + + QName xmlName = (QName)properties.get(JBossXBConstants.JBXB_ROOT_QNAME); + QName xmlType = (QName)properties.get(JBossXBConstants.JBXB_TYPE_QNAME); + + // Get the eagerly initialized SchemaBinding from the ServiceMetaData + CommonMessageContext msgContext = MessageContextAssociation.peekMessageContext(); + if (msgContext != null) + { + OperationMetaData opMetaData = msgContext.getOperationMetaData(); + EndpointMetaData epMetaData = opMetaData.getEndpointMetaData(); + ServiceMetaData serviceMetaData = epMetaData.getServiceMetaData(); + schemaBinding = serviceMetaData.getSchemaBinding(); + } + + // In case of an unconfigured call generate the SchemaBinding from JAXB properties + if (schemaBinding == null) + { + JBossXSModel xsModel = (JBossXSModel)properties.get(JBossXBConstants.JBXB_XS_MODEL); + JavaWsdlMapping wsdlMapping = (JavaWsdlMapping)properties.get(JBossXBConstants.JBXB_JAVA_MAPPING); + schemaBinding = bindingBuilder.buildSchemaBinding(xsModel, wsdlMapping); + } + + // The SchemaBinding expects to have an element binding for the + // incomming xml element. Because the same element name can be reused + // by various operations with different xml types, we have to add the + // element binding on every invocation. + bindingBuilder.bindParameterToElement(schemaBinding, xmlName, xmlType); + + return schemaBinding; + } + + /** + * Create a Marshaller that serializes + * <code>org.w3c.dom.Element</code>'s to a <code>org.xml.sax.ContentHandler</code> + * + * @return ObjectLocalMarshaller + * + * @see org.jboss.xb.binding.MarshallingContext#getContentHandler() + */ + public static ObjectLocalMarshaller getWildcardMarshaller() + { + return new ObjectLocalMarshaller() { + public void marshal(MarshallingContext ctx, Object o) + { + if (o == null) + { + return; + } + + Element e = (Element)o; + ContentHandler ch = ctx.getContentHandler(); + try + { + Dom2Sax.dom2sax(e, ch); + } + catch (SAXException e1) + { + throw new IllegalStateException("Failed to marshal DOM element " + new QName(e.getNamespaceURI(), e.getLocalName()) + ": " + e1.getMessage()); + } + } + }; + } +} Deleted: branches/tdiesler/trunk/src/main/java/org/jboss/ws/common/jbossxb/JBossXBUnmarshaller.java =================================================================== --- branches/tdiesler/trunk/src/main/java/org/jboss/ws/core/jbossxb/JBossXBUnmarshaller.java 2006-12-06 05:06:23 UTC (rev 1568) +++ branches/tdiesler/trunk/src/main/java/org/jboss/ws/common/jbossxb/JBossXBUnmarshaller.java 2006-12-06 11:19:33 UTC (rev 1572) @@ -1,37 +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.jbossxb; - -import java.io.InputStream; - -/** - * @author Heiko Braun <heiko.braun(a)jboss.com&gt; - * @version $Id$ - * @since Jul 5, 2006 - */ -public interface JBossXBUnmarshaller { - Object unmarshal(InputStream is) throws UnmarshalException; - - Object getProperty(String name); - - void setProperty(String name, Object value); -} Copied: branches/tdiesler/trunk/src/main/java/org/jboss/ws/common/jbossxb/JBossXBUnmarshaller.java (from rev 1571, branches/tdiesler/trunk/src/main/java/org/jboss/ws/core/jbossxb/JBossXBUnmarshaller.java) =================================================================== --- branches/tdiesler/trunk/src/main/java/org/jboss/ws/core/jbossxb/JBossXBUnmarshaller.java 2006-12-06 10:47:51 UTC (rev 1571) +++ branches/tdiesler/trunk/src/main/java/org/jboss/ws/common/jbossxb/JBossXBUnmarshaller.java 2006-12-06 11:19:33 UTC (rev 1572) @@ -0,0 +1,37 @@ +/* +* 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.common.jbossxb; + +import java.io.InputStream; + +/** + * @author Heiko Braun <heiko.braun(a)jboss.com&gt; + * @version $Id$ + * @since Jul 5, 2006 + */ +public interface JBossXBUnmarshaller { + Object unmarshal(InputStream is) throws UnmarshalException; + + Object getProperty(String name); + + void setProperty(String name, Object value); +} Deleted: branches/tdiesler/trunk/src/main/java/org/jboss/ws/common/jbossxb/JBossXBUnmarshallerImpl.java =================================================================== --- branches/tdiesler/trunk/src/main/java/org/jboss/ws/core/jbossxb/JBossXBUnmarshallerImpl.java 2006-12-06 05:06:23 UTC (rev 1568) +++ branches/tdiesler/trunk/src/main/java/org/jboss/ws/common/jbossxb/JBossXBUnmarshallerImpl.java 2006-12-06 11:19:33 UTC (rev 1572) @@ -1,105 +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.jbossxb; - -// $Id$ - -import org.jboss.ws.common.WSException; -import org.jboss.ws.extras.xop.jaxrpc.XOPUnmarshallerImpl; -import org.jboss.xb.binding.JBossXBException; -import org.jboss.xb.binding.UnmarshallerFactory; -import org.jboss.xb.binding.sunday.unmarshalling.SchemaBinding; -import java.io.InputStream; -import java.util.HashMap; - -/** - * An implementation of a JAXB Unmarshaller. - * - * @author Thomas.Diesler(a)jboss.org - * @author Alexey.Loubyansky(a)jboss.org - * @since 18-Oct-2004 - */ -public class JBossXBUnmarshallerImpl implements JBossXBUnmarshaller -{ - // The marshaller properties - private HashMap<String, Object> properties = new HashMap<String, Object>(); - - /** - * Unmarshal XML data from the specified InputStream and return the resulting content tree. - */ - public Object unmarshal(InputStream is) throws UnmarshalException - { - assertRequiredProperties(); - - org.jboss.xb.binding.Unmarshaller unm = UnmarshallerFactory.newInstance().newUnmarshaller(); - SchemaBinding schemaBinding = JBossXBSupport.getOrCreateSchemaBinding(properties); - XOPUnmarshallerImpl xopUnmarshaller = new XOPUnmarshallerImpl(); - schemaBinding.setXopUnmarshaller(xopUnmarshaller); - - try - { - return unm.unmarshal(is, schemaBinding); - } - catch (JBossXBException e) - { - throw new UnmarshalException(e.getMessage(), e); - } - } - - /** - * Get the particular property in the underlying implementation of Unmarshaller. - */ - public Object getProperty(String name) - { - if (name == null) - throw new IllegalArgumentException("name parameter is null"); - - return properties.get(name); - } - - /** - * Set the particular property in the underlying implementation of Unmarshaller. - */ - public void setProperty(String name, Object value) - { - if (name == null) - throw new IllegalArgumentException("name parameter is null"); - - properties.put(name, value); - } - - - /** Assert the required properties - */ - private void assertRequiredProperties() - { - if (getProperty(JBossXBConstants.JBXB_XS_MODEL) == null) - { - throw new WSException("Cannot find required property: " + JBossXBConstants.JBXB_XS_MODEL); - } - - if (getProperty(JBossXBConstants.JBXB_JAVA_MAPPING) == null) - { - throw new WSException("Cannot find required property: " + JBossXBConstants.JBXB_JAVA_MAPPING); - } - } -} Copied: branches/tdiesler/trunk/src/main/java/org/jboss/ws/common/jbossxb/JBossXBUnmarshallerImpl.java (from rev 1571, branches/tdiesler/trunk/src/main/java/org/jboss/ws/core/jbossxb/JBossXBUnmarshallerImpl.java) =================================================================== --- branches/tdiesler/trunk/src/main/java/org/jboss/ws/core/jbossxb/JBossXBUnmarshallerImpl.java 2006-12-06 10:47:51 UTC (rev 1571) +++ branches/tdiesler/trunk/src/main/java/org/jboss/ws/common/jbossxb/JBossXBUnmarshallerImpl.java 2006-12-06 11:19:33 UTC (rev 1572) @@ -0,0 +1,106 @@ +/* + * 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.common.jbossxb; + +// $Id$ + +import java.io.InputStream; +import java.util.HashMap; + +import org.jboss.ws.common.WSException; +import org.jboss.ws.extras.xop.jaxrpc.XOPUnmarshallerImpl; +import org.jboss.xb.binding.JBossXBException; +import org.jboss.xb.binding.UnmarshallerFactory; +import org.jboss.xb.binding.sunday.unmarshalling.SchemaBinding; + +/** + * An implementation of a JAXB Unmarshaller. + * + * @author Thomas.Diesler(a)jboss.org + * @author Alexey.Loubyansky(a)jboss.org + * @since 18-Oct-2004 + */ +public class JBossXBUnmarshallerImpl implements JBossXBUnmarshaller +{ + // The marshaller properties + private HashMap<String, Object> properties = new HashMap<String, Object>(); + + /** + * Unmarshal XML data from the specified InputStream and return the resulting content tree. + */ + public Object unmarshal(InputStream is) throws UnmarshalException + { + assertRequiredProperties(); + + org.jboss.xb.binding.Unmarshaller unm = UnmarshallerFactory.newInstance().newUnmarshaller(); + SchemaBinding schemaBinding = JBossXBSupport.getOrCreateSchemaBinding(properties); + XOPUnmarshallerImpl xopUnmarshaller = new XOPUnmarshallerImpl(); + schemaBinding.setXopUnmarshaller(xopUnmarshaller); + + try + { + return unm.unmarshal(is, schemaBinding); + } + catch (JBossXBException e) + { + throw new UnmarshalException(e.getMessage(), e); + } + } + + /** + * Get the particular property in the underlying implementation of Unmarshaller. + */ + public Object getProperty(String name) + { + if (name == null) + throw new IllegalArgumentException("name parameter is null"); + + return properties.get(name); + } + + /** + * Set the particular property in the underlying implementation of Unmarshaller. + */ + public void setProperty(String name, Object value) + { + if (name == null) + throw new IllegalArgumentException("name parameter is null"); + + properties.put(name, value); + } + + + /** Assert the required properties + */ + private void assertRequiredProperties() + { + if (getProperty(JBossXBConstants.JBXB_XS_MODEL) == null) + { + throw new WSException("Cannot find required property: " + JBossXBConstants.JBXB_XS_MODEL); + } + + if (getProperty(JBossXBConstants.JBXB_JAVA_MAPPING) == null) + { + throw new WSException("Cannot find required property: " + JBossXBConstants.JBXB_JAVA_MAPPING); + } + } +} Deleted: branches/tdiesler/trunk/src/main/java/org/jboss/ws/common/jbossxb/MarshalException.java =================================================================== --- branches/tdiesler/trunk/src/main/java/org/jboss/ws/core/jbossxb/MarshalException.java 2006-12-06 05:06:23 UTC (rev 1568) +++ branches/tdiesler/trunk/src/main/java/org/jboss/ws/common/jbossxb/MarshalException.java 2006-12-06 11:19:33 UTC (rev 1572) @@ -1,52 +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.jbossxb; - -/** - * A marshal exception. - * - * @author Thomas.Diesler(a)jboss.org - * @since 06-Jun-2006 - */ -public class MarshalException extends Exception -{ - - public MarshalException() - { - super(); - } - - public MarshalException(String msg, Throwable th) - { - super(msg, th); - } - - public MarshalException(String msg) - { - super(msg); - } - - public MarshalException(Throwable th) - { - super(th); - } -} Copied: branches/tdiesler/trunk/src/main/java/org/jboss/ws/common/jbossxb/MarshalException.java (from rev 1571, branches/tdiesler/trunk/src/main/java/org/jboss/ws/core/jbossxb/MarshalException.java) =================================================================== --- branches/tdiesler/trunk/src/main/java/org/jboss/ws/core/jbossxb/MarshalException.java 2006-12-06 10:47:51 UTC (rev 1571) +++ branches/tdiesler/trunk/src/main/java/org/jboss/ws/common/jbossxb/MarshalException.java 2006-12-06 11:19:33 UTC (rev 1572) @@ -0,0 +1,52 @@ +/* + * 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.common.jbossxb; + +/** + * A marshal exception. + * + * @author Thomas.Diesler(a)jboss.org + * @since 06-Jun-2006 + */ +public class MarshalException extends Exception +{ + + public MarshalException() + { + super(); + } + + public MarshalException(String msg, Throwable th) + { + super(msg, th); + } + + public MarshalException(String msg) + { + super(msg); + } + + public MarshalException(Throwable th) + { + super(th); + } +} Deleted: branches/tdiesler/trunk/src/main/java/org/jboss/ws/common/jbossxb/SchemaBindingBuilder.java =================================================================== --- branches/tdiesler/trunk/src/main/java/org/jboss/ws/core/jbossxb/SchemaBindingBuilder.java 2006-12-06 05:06:23 UTC (rev 1568) +++ branches/tdiesler/trunk/src/main/java/org/jboss/ws/common/jbossxb/SchemaBindingBuilder.java 2006-12-06 11:19:33 UTC (rev 1572) @@ -1,613 +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.jbossxb; - -// $Id$ - -import org.apache.xerces.xs.XSModel; -import org.jboss.logging.Logger; -import org.jboss.util.xml.JBossEntityResolver; -import org.jboss.ws.common.Constants; -import org.jboss.ws.common.WSException; -import org.jboss.ws.common.metadata.jaxrpcmapping.*; -import org.jboss.ws.common.utils.JBossWSEntityResolver; -import org.jboss.ws.extras.xop.jaxrpc.JBossXBContentAdapter; -import org.jboss.xb.binding.metadata.ClassMetaData; -import org.jboss.xb.binding.metadata.PackageMetaData; -import org.jboss.xb.binding.metadata.PropertyMetaData; -import org.jboss.xb.binding.metadata.ValueMetaData; -import org.jboss.xb.binding.sunday.unmarshalling.*; -import org.jboss.xb.binding.sunday.unmarshalling.impl.runtime.RtElementHandler; -import org.w3c.dom.Element; -import org.w3c.dom.Text; -import org.xml.sax.Attributes; - -import javax.xml.namespace.NamespaceContext; -import javax.xml.namespace.QName; -import javax.xml.soap.SOAPElement; -import javax.xml.soap.SOAPException; -import javax.xml.soap.SOAPFactory; -import java.util.ArrayList; -import java.util.Iterator; - -/** - * Create SchemaBinding from XSModel and jaxrpc-mapping. - * - * @author Thomas.Diesler(a)jboss.org - * @author Alexey.Loubyansky(a)jboss.org - * @since 18-Oct-2004 - * @see XSModel - * @see JavaWsdlMapping - */ -public class SchemaBindingBuilder -{ - // provide logging - private static final Logger log = Logger.getLogger(SchemaBindingBuilder.class); - - /** - * Creates and initializes an instance of SchemaBinding - */ - public SchemaBinding buildSchemaBinding(XSModel model, JavaWsdlMapping wsdlMapping) - { - JBossEntityResolver resolver = new JBossWSEntityResolver(); - SchemaBinding schemaBinding = XsdBinder.bind(model, new DefaultSchemaResolver(resolver)); - - schemaBinding.setIgnoreLowLine(false); - schemaBinding.setIgnoreUnresolvedFieldOrClass(false); - schemaBinding.setUnmarshalListsToArrays(true); // note: default jaxb2.0 is false! - schemaBinding.setSimpleContentProperty("_value"); - schemaBinding.setUseNoArgCtorIfFound(true); - if (wsdlMapping != null) - { - bindSchemaToJava(schemaBinding, wsdlMapping); - } - - // setup MTOM handler - JBossXBContentAdapter.register(schemaBinding); - - return schemaBinding; - } - - /** Merges JavaWsdlMapping into SchemaBinding - */ - private void bindSchemaToJava(SchemaBinding schemaBinding, JavaWsdlMapping wsdlMapping) - { - if (log.isTraceEnabled()) - log.trace("bindSchemaToJava: " + schemaBinding); - - for (PackageMapping packageMapping : wsdlMapping.getPackageMappings()) - { - processPackageMapping(schemaBinding, packageMapping); - } - - for (JavaXmlTypeMapping typeMapping : wsdlMapping.getJavaXmlTypeMappings()) - { - processJavaXmlTypeMapping(schemaBinding, typeMapping); - } - } - - private void processPackageMapping(SchemaBinding schemaBinding, PackageMapping packageMapping) - { - PackageMetaData packageMetaData = schemaBinding.getPackageMetaData(); - if (packageMetaData == null) - { - packageMetaData = new PackageMetaData(); - schemaBinding.setPackageMetaData(packageMetaData); - } - - if (log.isTraceEnabled()) - log.trace("Bound namespace " + packageMapping.getNamespaceURI() + " to package " + packageMapping.getPackageType()); - - packageMetaData.setName(packageMapping.getPackageType()); - } - - private void processJavaXmlTypeMapping(SchemaBinding schemaBinding, JavaXmlTypeMapping typeMapping) - { - String javaType = typeMapping.getJavaType(); - if (javaType.endsWith("[]")) - { - processArrayType(schemaBinding, typeMapping); - } - else - { - processNonArrayType(schemaBinding, typeMapping); - } - } - - private void processArrayType(SchemaBinding schemaBinding, JavaXmlTypeMapping typeMapping) - { - QName xmlType = getXmlType(typeMapping); - log.trace("Ignore array type: " + xmlType); - } - - private void processNonArrayType(SchemaBinding schemaBinding, JavaXmlTypeMapping typeMapping) - { - QName xmlType = getXmlType(typeMapping); - String javaType = typeMapping.getJavaType(); - log.trace("processNonArrayType: [xmlType=" + xmlType + ",javaType=" + javaType + "]"); - - TypeBinding typeBinding = getTypeBinding(schemaBinding, typeMapping); - if (typeBinding != null) - { - // Set the java type, but skip SimpleTypes - boolean isSimpleTypeBinding = (typeBinding instanceof SimpleTypeBinding); - if(isSimpleTypeBinding == false) - { - ClassMetaData classMetaData = typeBinding.getClassMetaData(); - if (classMetaData == null) - { - classMetaData = new ClassMetaData(); - typeBinding.setClassMetaData(classMetaData); - } - classMetaData.setImpl(javaType); - - // exception mapping drives whether we should use the noarg ctor - JavaWsdlMapping wsdlMapping = typeMapping.getJavaWsdlMapping(); - for (ExceptionMapping aux : wsdlMapping.getExceptionMappings()) - { - if (javaType.equals(aux.getExceptionType())) - { - classMetaData.setUseNoArgCtor(false); - break; - } - } - - if (log.isTraceEnabled()) - { - QName typeQName = typeBinding.getQName(); - log.trace("Bound: [xmlType=" + typeQName + ",javaType=" + javaType + "]"); - } - } - - VariableMapping[] variableMappings = typeMapping.getVariableMappings(); - for (VariableMapping varMapping : variableMappings) - { - if (varMapping.getXmlElementName() != null) - { - processXmlElementName(typeBinding, varMapping); - } - else if (varMapping.getXmlAttributeName() != null) - { - processXmlAttributeName(typeBinding, varMapping); - } - else if (varMapping.getXmlWildcard()) - { - processWildcard(typeBinding, varMapping); - } - } - } - else - { - log.warn("Cannot obtain type binding for: " + xmlType); - } - } - - private void processXmlAttributeName(TypeBinding typeBinding, VariableMapping varMapping) - { - String xmlAttrName = varMapping.getXmlAttributeName(); - log.trace("processXmlAttributeName: " + xmlAttrName); - - QName xmlName = new QName(xmlAttrName); - AttributeBinding attrBinding = typeBinding.getAttribute(xmlName); - if (attrBinding == null) - { - Iterator i = typeBinding.getAttributes().iterator(); - while (i.hasNext()) - { - AttributeBinding auxBinding = (AttributeBinding)i.next(); - if (auxBinding.getQName().getLocalPart().equals(xmlAttrName)) - { - if (attrBinding != null) - log.warn("Ambiguous binding for attribute: " + xmlAttrName); - - attrBinding = auxBinding; - } - } - } - - if (attrBinding == null) - { - // attributeFormDefault="qualified" - String nsURI = typeBinding.getQName().getNamespaceURI(); - if (Constants.SOAP11_ATTR_MUST_UNDERSTAND.equals(xmlAttrName) || Constants.SOAP11_ATTR_ACTOR.equals(xmlAttrName) - || Constants.SOAP11_ATTR_ROLE.equals(xmlAttrName)) - { - nsURI = Constants.NS_SOAP11_ENV; - } - QName auxName = new QName(nsURI, xmlAttrName); - attrBinding = typeBinding.getAttribute(auxName); - } - - if (attrBinding == null) - { - QName typeQName = typeBinding.getQName(); - throw new WSException("Attribute " + xmlName + " found in jaxrpc-mapping but not in the schema: " + typeQName); - } - - String javaVariableName = varMapping.getJavaVariableName(); - PropertyMetaData prop = new PropertyMetaData(); - prop.setName(javaVariableName); - attrBinding.setPropertyMetaData(prop); - - if (log.isTraceEnabled()) - log.trace("Bound attribute " + xmlName + " to property " + prop.getName()); - } - - private void processXmlElementName(TypeBinding typeBinding, VariableMapping varMapping) - { - QName xmlName = new QName(varMapping.getXmlElementName()); - log.trace("processXmlElementName: " + xmlName); - - ElementBinding element = typeBinding.getElement(xmlName); - QName typeQName = typeBinding.getQName(); - if (element == null && typeQName != null) - { - // elementFormDefault="qualified" - String nsURI = typeQName.getNamespaceURI(); - QName auxName = new QName(nsURI, varMapping.getXmlElementName()); - element = typeBinding.getElement(auxName); - } - - if (element == null) - { - // <element ref= - ParticleBinding particle = typeBinding.getParticle(); - if (particle != null) - { - TermBinding term = particle.getTerm(); - if (term instanceof ModelGroupBinding) - { - Iterator iterator = ((ModelGroupBinding)term).getParticles().iterator(); - element = findLocalPathElement(iterator, new String[] { varMapping.getXmlElementName() }, 0); - } - } - } - - if (element == null) - throw new WSException("Element " + xmlName + " found in jaxrpc-mapping but not in the schema: " + typeQName); - - String javaVariableName = varMapping.getJavaVariableName(); - if (javaVariableName != null) - { - PropertyMetaData prop = new PropertyMetaData(); - prop.setName(javaVariableName); - element.setPropertyMetaData(prop); - - if (log.isTraceEnabled()) - log.trace("Bound element " + xmlName + " to property " + prop.getName()); - } - } - - private void processWildcard(TypeBinding typeBinding, VariableMapping varMapping) - { - log.trace("processWildcard: " + typeBinding.getQName()); - - PropertyMetaData prop = null; - String javaVariableName = varMapping.getJavaVariableName(); - if (javaVariableName != null) - { - prop = new PropertyMetaData(); - prop.setName(javaVariableName); - } - - if (prop == null) - { - prop = new PropertyMetaData(); - prop.setName("_any"); - } - - WildcardBinding wildcard = typeBinding.getWildcard(); - wildcard.setUnresolvedElementHandler(new SoapElementHandler()); - wildcard.setUnresolvedCharactersHandler(new SoapCharactersHandler()); - wildcard.setPropertyMetaData(prop); - - if (log.isTraceEnabled()) - log.trace("Bound wildcard of " + typeBinding.getQName() + " to property " + prop.getName()); - } - - private TypeBinding getTypeBinding(SchemaBinding schemaBinding, JavaXmlTypeMapping typeMapping) - { - String qnameScope = typeMapping.getQnameScope(); - QName anonymousTypeQName = typeMapping.getAnonymousTypeQName(); - if (anonymousTypeQName != null) - { - return getAnonymousTypeBinding(schemaBinding, anonymousTypeQName); - } - - QName xmlType = typeMapping.getRootTypeQName(); - - TypeBinding typeBinding = null; - if ("complexType".equals(qnameScope) || "simpleType".equals(qnameScope)) - { - typeBinding = schemaBinding.getType(xmlType); - if (typeBinding == null) - { - log.warn("Type definition not found in schema: " + xmlType); - } - } - else if ("element".equals(qnameScope)) - { - ElementBinding element = schemaBinding.getElement(xmlType); - if (element != null) - { - typeBinding = element.getType(); - } - else - { - log.warn("Global element not found in schema: " + xmlType); - } - } - else - { - throw new WSException("Unexpected qname-scope for " + typeMapping.getJavaType() + ": " + qnameScope); - } - return typeBinding; - } - - public TypeBinding getAnonymousTypeBinding(SchemaBinding schemaBinding, QName typeQName) - { - String expression = typeQName.getLocalPart(); - if (log.isTraceEnabled()) - log.trace("Searching for anonymous expression: " + expression); - - ArrayList list = new ArrayList(10); - - for (int i = 0, begin = -1; i < expression.length(); i++) - { - if (expression.charAt(i) == '>') - { - if (begin != -1) - { - list.add(expression.substring(begin, i)); - begin = -1; - } - } - else - { - if (begin == -1) - begin = i; - else if (i == expression.length() - 1) - list.add(expression.substring(begin)); - } - } - - ElementBinding element = findLocalPathElement(schemaBinding.getElements(), ((String[])list.toArray(new String[0]))); - if (element == null) - element = findLocalPathElementInTypes(schemaBinding.getTypes(), ((String[])list.toArray(new String[0]))); - - if (element == null) - return null; - - return element.getType(); - } - - public void bindParameterToElement(SchemaBinding schemaBinding, QName xmlName, QName xmlType) - { - TypeBinding typeBinding; - boolean isAnonymousType = xmlType.getLocalPart().startsWith(">"); - if (isAnonymousType) - { - typeBinding = getAnonymousTypeBinding(schemaBinding, xmlType); - } - else - { - typeBinding = schemaBinding.getType(xmlType); - } - - if (typeBinding != null) - { - if(!isAnonymousType) - schemaBinding.addElement(xmlName, typeBinding); - } - else if (xmlType.equals(Constants.TYPE_LITERAL_ANYTYPE) == false) - { - throw new WSException("Root type " + xmlType + " not found in the schema."); - } - } - - private ElementBinding findLocalPathElement(Iterator elements, String[] path) - { - while (elements.hasNext()) - { - ElementBinding element = (ElementBinding)elements.next(); - element = findLocalPathElement(element, path, 0); - if (element != null) - return element; - } - - return null; - } - - private ElementBinding findLocalPathElementInTypes(Iterator types, String[] path) - { - while (types.hasNext()) - { - TypeBinding type = (TypeBinding)types.next(); - if (type.getQName().getLocalPart().equals(path[0])) - { - ParticleBinding particle = type.getParticle(); - if (particle == null) - continue; - - TermBinding term = particle.getTerm(); - if (!term.isModelGroup()) - continue; - - return findLocalPathElement(((ModelGroupBinding)term).getParticles().iterator(), path, 1); - } - } - - return null; - } - - private ElementBinding findLocalPathElement(ElementBinding element, String[] path, int pos) - { - String name = path[pos]; - if (!name.equals(element.getQName().getLocalPart())) - return null; - - // End of path - if (path.length - 1 == pos) - return element; - - ParticleBinding particle = element.getType().getParticle(); - if (particle == null) - return null; - - TermBinding term = particle.getTerm(); - if (!term.isModelGroup()) - return null; - - ModelGroupBinding group = (ModelGroupBinding)term; - Iterator i = group.getParticles().iterator(); - - // Increase depth - return findLocalPathElement(i, path, pos + 1); - } - - private ElementBinding findLocalPathElement(Iterator particles, String[] path, int pos) - { - while (particles.hasNext()) - { - TermBinding term = ((ParticleBinding)particles.next()).getTerm(); - if (term instanceof ElementBinding) - { - ElementBinding element = (ElementBinding)term; - element = findLocalPathElement(element, path, pos); - if (element != null) - return element; - - } - else if (term instanceof ModelGroupBinding) - { - Iterator i = ((ModelGroupBinding)term).getParticles().iterator(); - ElementBinding element = findLocalPathElement(i, path, pos); - if (element != null) - return element; - } - } - - return null; - } - - /** Get the <root-type-qname>, fall back to <anonymous-type-qname> - */ - private QName getXmlType(JavaXmlTypeMapping typeMapping) - { - QName xmlType = typeMapping.getRootTypeQName(); - if (xmlType == null && typeMapping.getAnonymousTypeQName() != null) - xmlType = typeMapping.getAnonymousTypeQName(); - - return xmlType; - } - - // Inner - - public static class SoapCharactersHandler extends CharactersHandler - { - public Object unmarshalEmpty(QName qName, TypeBinding typeBinding, NamespaceContext nsCtx, ValueMetaData valueMetaData) - { - return ""; - } - - public Object unmarshal(QName qName, TypeBinding typeBinding, NamespaceContext nsCtx, ValueMetaData valueMetaData, String value) - { - return value; - } - - public void setValue(QName qName, ElementBinding element, Object owner, Object value) - { - SOAPElement e = (SOAPElement)owner; - Text textNode = e.getOwnerDocument().createTextNode((String)value); - e.appendChild(textNode); - } - } - - public static class SoapElementHandler extends RtElementHandler implements ParticleHandler - { - private SOAPFactory factory; - - public Object startParticle(Object parent, QName elementName, ParticleBinding particle, Attributes attrs, NamespaceContext nsCtx) - { - SOAPFactory factory = getFactory(); - SOAPElement element = null; - try - { - String prefix = elementName.getPrefix(); - String ns = elementName.getNamespaceURI(); - if (ns != null && ns.length() > 0) - { - prefix = nsCtx.getPrefix(ns); - } - - element = factory.createElement(elementName.getLocalPart(), prefix, ns); - } - catch (SOAPException e) - { - throw new IllegalStateException("Failed to create SOAPElement", e); - } - - if (attrs != null) - { - for (int i = 0; i < attrs.getLength(); ++i) - { - element.setAttribute(attrs.getLocalName(i), attrs.getValue(i)); - } - } - - return element; - } - - public Object endParticle(Object o, QName elementName, ParticleBinding particle) - { - return o; - } - - public void setParent(Object parent, Object o, QName elementName, ParticleBinding particle, ParticleBinding parentParticle) - { - if (parent instanceof SOAPElement) - { - ((SOAPElement)parent).appendChild((Element)o); - } - else - { - super.setParent(parent, o, elementName, particle, parentParticle); - } - } - - private SOAPFactory getFactory() - { - if (factory == null) - { - try - { - factory = SOAPFactory.newInstance(); - } - catch (SOAPException e) - { - throw new IllegalStateException("Failed to create soap element factory", e); - } - } - return factory; - } - } -} Copied: branches/tdiesler/trunk/src/main/java/org/jboss/ws/common/jbossxb/SchemaBindingBuilder.java (from rev 1571, branches/tdiesler/trunk/src/main/java/org/jboss/ws/core/jbossxb/SchemaBindingBuilder.java) =================================================================== --- branches/tdiesler/trunk/src/main/java/org/jboss/ws/core/jbossxb/SchemaBindingBuilder.java 2006-12-06 10:47:51 UTC (rev 1571) +++ branches/tdiesler/trunk/src/main/java/org/jboss/ws/common/jbossxb/SchemaBindingBuilder.java 2006-12-06 11:19:33 UTC (rev 1572) @@ -0,0 +1,630 @@ +/* + * 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.common.jbossxb; + +// $Id$ + +import java.util.ArrayList; +import java.util.Iterator; + +import javax.xml.namespace.NamespaceContext; +import javax.xml.namespace.QName; +import javax.xml.soap.SOAPElement; +import javax.xml.soap.SOAPException; +import javax.xml.soap.SOAPFactory; + +import org.apache.xerces.xs.XSModel; +import org.jboss.logging.Logger; +import org.jboss.util.xml.JBossEntityResolver; +import org.jboss.ws.common.Constants; +import org.jboss.ws.common.WSException; +import org.jboss.ws.common.metadata.jaxrpcmapping.ExceptionMapping; +import org.jboss.ws.common.metadata.jaxrpcmapping.JavaWsdlMapping; +import org.jboss.ws.common.metadata.jaxrpcmapping.JavaXmlTypeMapping; +import org.jboss.ws.common.metadata.jaxrpcmapping.PackageMapping; +import org.jboss.ws.common.metadata.jaxrpcmapping.VariableMapping; +import org.jboss.ws.common.utils.JBossWSEntityResolver; +import org.jboss.ws.extras.xop.jaxrpc.JBossXBContentAdapter; +import org.jboss.xb.binding.metadata.ClassMetaData; +import org.jboss.xb.binding.metadata.PackageMetaData; +import org.jboss.xb.binding.metadata.PropertyMetaData; +import org.jboss.xb.binding.metadata.ValueMetaData; +import org.jboss.xb.binding.sunday.unmarshalling.AttributeBinding; +import org.jboss.xb.binding.sunday.unmarshalling.CharactersHandler; +import org.jboss.xb.binding.sunday.unmarshalling.DefaultSchemaResolver; +import org.jboss.xb.binding.sunday.unmarshalling.ElementBinding; +import org.jboss.xb.binding.sunday.unmarshalling.ModelGroupBinding; +import org.jboss.xb.binding.sunday.unmarshalling.ParticleBinding; +import org.jboss.xb.binding.sunday.unmarshalling.ParticleHandler; +import org.jboss.xb.binding.sunday.unmarshalling.SchemaBinding; +import org.jboss.xb.binding.sunday.unmarshalling.SimpleTypeBinding; +import org.jboss.xb.binding.sunday.unmarshalling.TermBinding; +import org.jboss.xb.binding.sunday.unmarshalling.TypeBinding; +import org.jboss.xb.binding.sunday.unmarshalling.WildcardBinding; +import org.jboss.xb.binding.sunday.unmarshalling.XsdBinder; +import org.jboss.xb.binding.sunday.unmarshalling.impl.runtime.RtElementHandler; +import org.w3c.dom.Element; +import org.w3c.dom.Text; +import org.xml.sax.Attributes; + +/** + * Create SchemaBinding from XSModel and jaxrpc-mapping. + * + * @author Thomas.Diesler(a)jboss.org + * @author Alexey.Loubyansky(a)jboss.org + * @since 18-Oct-2004 + * @see XSModel + * @see JavaWsdlMapping + */ +public class SchemaBindingBuilder +{ + // provide logging + private static final Logger log = Logger.getLogger(SchemaBindingBuilder.class); + + /** + * Creates and initializes an instance of SchemaBinding + */ + public SchemaBinding buildSchemaBinding(XSModel model, JavaWsdlMapping wsdlMapping) + { + JBossEntityResolver resolver = new JBossWSEntityResolver(); + SchemaBinding schemaBinding = XsdBinder.bind(model, new DefaultSchemaResolver(resolver)); + + schemaBinding.setIgnoreLowLine(false); + schemaBinding.setIgnoreUnresolvedFieldOrClass(false); + schemaBinding.setUnmarshalListsToArrays(true); // note: default jaxb2.0 is false! + schemaBinding.setSimpleContentProperty("_value"); + schemaBinding.setUseNoArgCtorIfFound(true); + if (wsdlMapping != null) + { + bindSchemaToJava(schemaBinding, wsdlMapping); + } + + // setup MTOM handler + JBossXBContentAdapter.register(schemaBinding); + + return schemaBinding; + } + + /** Merges JavaWsdlMapping into SchemaBinding + */ + private void bindSchemaToJava(SchemaBinding schemaBinding, JavaWsdlMapping wsdlMapping) + { + if (log.isTraceEnabled()) + log.trace("bindSchemaToJava: " + schemaBinding); + + for (PackageMapping packageMapping : wsdlMapping.getPackageMappings()) + { + processPackageMapping(schemaBinding, packageMapping); + } + + for (JavaXmlTypeMapping typeMapping : wsdlMapping.getJavaXmlTypeMappings()) + { + processJavaXmlTypeMapping(schemaBinding, typeMapping); + } + } + + private void processPackageMapping(SchemaBinding schemaBinding, PackageMapping packageMapping) + { + PackageMetaData packageMetaData = schemaBinding.getPackageMetaData(); + if (packageMetaData == null) + { + packageMetaData = new PackageMetaData(); + schemaBinding.setPackageMetaData(packageMetaData); + } + + if (log.isTraceEnabled()) + log.trace("Bound namespace " + packageMapping.getNamespaceURI() + " to package " + packageMapping.getPackageType()); + + packageMetaData.setName(packageMapping.getPackageType()); + } + + private void processJavaXmlTypeMapping(SchemaBinding schemaBinding, JavaXmlTypeMapping typeMapping) + { + String javaType = typeMapping.getJavaType(); + if (javaType.endsWith("[]")) + { + processArrayType(schemaBinding, typeMapping); + } + else + { + processNonArrayType(schemaBinding, typeMapping); + } + } + + private void processArrayType(SchemaBinding schemaBinding, JavaXmlTypeMapping typeMapping) + { + QName xmlType = getXmlType(typeMapping); + log.trace("Ignore array type: " + xmlType); + } + + private void processNonArrayType(SchemaBinding schemaBinding, JavaXmlTypeMapping typeMapping) + { + QName xmlType = getXmlType(typeMapping); + String javaType = typeMapping.getJavaType(); + log.trace("processNonArrayType: [xmlType=" + xmlType + ",javaType=" + javaType + "]"); + + TypeBinding typeBinding = getTypeBinding(schemaBinding, typeMapping); + if (typeBinding != null) + { + // Set the java type, but skip SimpleTypes + boolean isSimpleTypeBinding = (typeBinding instanceof SimpleTypeBinding); + if(isSimpleTypeBinding == false) + { + ClassMetaData classMetaData = typeBinding.getClassMetaData(); + if (classMetaData == null) + { + classMetaData = new ClassMetaData(); + typeBinding.setClassMetaData(classMetaData); + } + classMetaData.setImpl(javaType); + + // exception mapping drives whether we should use the noarg ctor + JavaWsdlMapping wsdlMapping = typeMapping.getJavaWsdlMapping(); + for (ExceptionMapping aux : wsdlMapping.getExceptionMappings()) + { + if (javaType.equals(aux.getExceptionType())) + { + classMetaData.setUseNoArgCtor(false); + break; + } + } + + if (log.isTraceEnabled()) + { + QName typeQName = typeBinding.getQName(); + log.trace("Bound: [xmlType=" + typeQName + ",javaType=" + javaType + "]"); + } + } + + VariableMapping[] variableMappings = typeMapping.getVariableMappings(); + for (VariableMapping varMapping : variableMappings) + { + if (varMapping.getXmlElementName() != null) + { + processXmlElementName(typeBinding, varMapping); + } + else if (varMapping.getXmlAttributeName() != null) + { + processXmlAttributeName(typeBinding, varMapping); + } + else if (varMapping.getXmlWildcard()) + { + processWildcard(typeBinding, varMapping); + } + } + } + else + { + log.warn("Cannot obtain type binding for: " + xmlType); + } + } + + private void processXmlAttributeName(TypeBinding typeBinding, VariableMapping varMapping) + { + String xmlAttrName = varMapping.getXmlAttributeName(); + log.trace("processXmlAttributeName: " + xmlAttrName); + + QName xmlName = new QName(xmlAttrName); + AttributeBinding attrBinding = typeBinding.getAttribute(xmlName); + if (attrBinding == null) + { + Iterator i = typeBinding.getAttributes().iterator(); + while (i.hasNext()) + { + AttributeBinding auxBinding = (AttributeBinding)i.next(); + if (auxBinding.getQName().getLocalPart().equals(xmlAttrName)) + { + if (attrBinding != null) + log.warn("Ambiguous binding for attribute: " + xmlAttrName); + + attrBinding = auxBinding; + } + } + } + + if (attrBinding == null) + { + // attributeFormDefault="qualified" + String nsURI = typeBinding.getQName().getNamespaceURI(); + if (Constants.SOAP11_ATTR_MUST_UNDERSTAND.equals(xmlAttrName) || Constants.SOAP11_ATTR_ACTOR.equals(xmlAttrName) + || Constants.SOAP11_ATTR_ROLE.equals(xmlAttrName)) + { + nsURI = Constants.NS_SOAP11_ENV; + } + QName auxName = new QName(nsURI, xmlAttrName); + attrBinding = typeBinding.getAttribute(auxName); + } + + if (attrBinding == null) + { + QName typeQName = typeBinding.getQName(); + throw new WSException("Attribute " + xmlName + " found in jaxrpc-mapping but not in the schema: " + typeQName); + } + + String javaVariableName = varMapping.getJavaVariableName(); + PropertyMetaData prop = new PropertyMetaData(); + prop.setName(javaVariableName); + attrBinding.setPropertyMetaData(prop); + + if (log.isTraceEnabled()) + log.trace("Bound attribute " + xmlName + " to property " + prop.getName()); + } + + private void processXmlElementName(TypeBinding typeBinding, VariableMapping varMapping) + { + QName xmlName = new QName(varMapping.getXmlElementName()); + log.trace("processXmlElementName: " + xmlName); + + ElementBinding element = typeBinding.getElement(xmlName); + QName typeQName = typeBinding.getQName(); + if (element == null && typeQName != null) + { + // elementFormDefault="qualified" + String nsURI = typeQName.getNamespaceURI(); + QName auxName = new QName(nsURI, varMapping.getXmlElementName()); + element = typeBinding.getElement(auxName); + } + + if (element == null) + { + // <element ref= + ParticleBinding particle = typeBinding.getParticle(); + if (particle != null) + { + TermBinding term = particle.getTerm(); + if (term instanceof ModelGroupBinding) + { + Iterator iterator = ((ModelGroupBinding)term).getParticles().iterator(); + element = findLocalPathElement(iterator, new String[] { varMapping.getXmlElementName() }, 0); + } + } + } + + if (element == null) + throw new WSException("Element " + xmlName + " found in jaxrpc-mapping but not in the schema: " + typeQName); + + String javaVariableName = varMapping.getJavaVariableName(); + if (javaVariableName != null) + { + PropertyMetaData prop = new PropertyMetaData(); + prop.setName(javaVariableName); + element.setPropertyMetaData(prop); + + if (log.isTraceEnabled()) + log.trace("Bound element " + xmlName + " to property " + prop.getName()); + } + } + + private void processWildcard(TypeBinding typeBinding, VariableMapping varMapping) + { + log.trace("processWildcard: " + typeBinding.getQName()); + + PropertyMetaData prop = null; + String javaVariableName = varMapping.getJavaVariableName(); + if (javaVariableName != null) + { + prop = new PropertyMetaData(); + prop.setName(javaVariableName); + } + + if (prop == null) + { + prop = new PropertyMetaData(); + prop.setName("_any"); + } + + WildcardBinding wildcard = typeBinding.getWildcard(); + wildcard.setUnresolvedElementHandler(new SoapElementHandler()); + wildcard.setUnresolvedCharactersHandler(new SoapCharactersHandler()); + wildcard.setPropertyMetaData(prop); + + if (log.isTraceEnabled()) + log.trace("Bound wildcard of " + typeBinding.getQName() + " to property " + prop.getName()); + } + + private TypeBinding getTypeBinding(SchemaBinding schemaBinding, JavaXmlTypeMapping typeMapping) + { + String qnameScope = typeMapping.getQnameScope(); + QName anonymousTypeQName = typeMapping.getAnonymousTypeQName(); + if (anonymousTypeQName != null) + { + return getAnonymousTypeBinding(schemaBinding, anonymousTypeQName); + } + + QName xmlType = typeMapping.getRootTypeQName(); + + TypeBinding typeBinding = null; + if ("complexType".equals(qnameScope) || "simpleType".equals(qnameScope)) + { + typeBinding = schemaBinding.getType(xmlType); + if (typeBinding == null) + { + log.warn("Type definition not found in schema: " + xmlType); + } + } + else if ("element".equals(qnameScope)) + { + ElementBinding element = schemaBinding.getElement(xmlType); + if (element != null) + { + typeBinding = element.getType(); + } + else + { + log.warn("Global element not found in schema: " + xmlType); + } + } + else + { + throw new WSException("Unexpected qname-scope for " + typeMapping.getJavaType() + ": " + qnameScope); + } + return typeBinding; + } + + public TypeBinding getAnonymousTypeBinding(SchemaBinding schemaBinding, QName typeQName) + { + String expression = typeQName.getLocalPart(); + if (log.isTraceEnabled()) + log.trace("Searching for anonymous expression: " + expression); + + ArrayList list = new ArrayList(10); + + for (int i = 0, begin = -1; i < expression.length(); i++) + { + if (expression.charAt(i) == '>') + { + if (begin != -1) + { + list.add(expression.substring(begin, i)); + begin = -1; + } + } + else + { + if (begin == -1) + begin = i; + else if (i == expression.length() - 1) + list.add(expression.substring(begin)); + } + } + + ElementBinding element = findLocalPathElement(schemaBinding.getElements(), ((String[])list.toArray(new String[0]))); + if (element == null) + element = findLocalPathElementInTypes(schemaBinding.getTypes(), ((String[])list.toArray(new String[0]))); + + if (element == null) + return null; + + return element.getType(); + } + + public void bindParameterToElement(SchemaBinding schemaBinding, QName xmlName, QName xmlType) + { + TypeBinding typeBinding; + boolean isAnonymousType = xmlType.getLocalPart().startsWith(">"); + if (isAnonymousType) + { + typeBinding = getAnonymousTypeBinding(schemaBinding, xmlType); + } + else + { + typeBinding = schemaBinding.getType(xmlType); + } + + if (typeBinding != null) + { + if(!isAnonymousType) + schemaBinding.addElement(xmlName, typeBinding); + } + else if (xmlType.equals(Constants.TYPE_LITERAL_ANYTYPE) == false) + { + throw new WSException("Root type " + xmlType + " not found in the schema."); + } + } + + private ElementBinding findLocalPathElement(Iterator elements, String[] path) + { + while (elements.hasNext()) + { + ElementBinding element = (ElementBinding)elements.next(); + element = findLocalPathElement(element, path, 0); + if (element != null) + return element; + } + + return null; + } + + private ElementBinding findLocalPathElementInTypes(Iterator types, String[] path) + { + while (types.hasNext()) + { + TypeBinding type = (TypeBinding)types.next(); + if (type.getQName().getLocalPart().equals(path[0])) + { + ParticleBinding particle = type.getParticle(); + if (particle == null) + continue; + + TermBinding term = particle.getTerm(); + if (!term.isModelGroup()) + continue; + + return findLocalPathElement(((ModelGroupBinding)term).getParticles().iterator(), path, 1); + } + } + + return null; + } + + private ElementBinding findLocalPathElement(ElementBinding element, String[] path, int pos) + { + String name = path[pos]; + if (!name.equals(element.getQName().getLocalPart())) + return null; + + // End of path + if (path.length - 1 == pos) + return element; + + ParticleBinding particle = element.getType().getParticle(); + if (particle == null) + return null; + + TermBinding term = particle.getTerm(); + if (!term.isModelGroup()) + return null; + + ModelGroupBinding group = (ModelGroupBinding)term; + Iterator i = group.getParticles().iterator(); + + // Increase depth + return findLocalPathElement(i, path, pos + 1); + } + + private ElementBinding findLocalPathElement(Iterator particles, String[] path, int pos) + { + while (particles.hasNext()) + { + TermBinding term = ((ParticleBinding)particles.next()).getTerm(); + if (term instanceof ElementBinding) + { + ElementBinding element = (ElementBinding)term; + element = findLocalPathElement(element, path, pos); + if (element != null) + return element; + + } + else if (term instanceof ModelGroupBinding) + { + Iterator i = ((ModelGroupBinding)term).getParticles().iterator(); + ElementBinding element = findLocalPathElement(i, path, pos); + if (element != null) + return element; + } + } + + return null; + } + + /** Get the <root-type-qname>, fall back to <anonymous-type-qname> + */ + private QName getXmlType(JavaXmlTypeMapping typeMapping) + { + QName xmlType = typeMapping.getRootTypeQName(); + if (xmlType == null && typeMapping.getAnonymousTypeQName() != null) + xmlType = typeMapping.getAnonymousTypeQName(); + + return xmlType; + } + + // Inner + + public static class SoapCharactersHandler extends CharactersHandler + { + public Object unmarshalEmpty(QName qName, TypeBinding typeBinding, NamespaceContext nsCtx, ValueMetaData valueMetaData) + { + return ""; + } + + public Object unmarshal(QName qName, TypeBinding typeBinding, NamespaceContext nsCtx, ValueMetaData valueMetaData, String value) + { + return value; + } + + public void setValue(QName qName, ElementBinding element, Object owner, Object value) + { + SOAPElement e = (SOAPElement)owner; + Text textNode = e.getOwnerDocument().createTextNode((String)value); + e.appendChild(textNode); + } + } + + public static class SoapElementHandler extends RtElementHandler implements ParticleHandler + { + private SOAPFactory factory; + + public Object startParticle(Object parent, QName elementName, ParticleBinding particle, Attributes attrs, NamespaceContext nsCtx) + { + SOAPFactory factory = getFactory(); + SOAPElement element = null; + try + { + String prefix = elementName.getPrefix(); + String ns = elementName.getNamespaceURI(); + if (ns != null && ns.length() > 0) + { + prefix = nsCtx.getPrefix(ns); + } + + element = factory.createElement(elementName.getLocalPart(), prefix, ns); + } + catch (SOAPException e) + { + throw new IllegalStateException("Failed to create SOAPElement", e); + } + + if (attrs != null) + { + for (int i = 0; i < attrs.getLength(); ++i) + { + element.setAttribute(attrs.getLocalName(i), attrs.getValue(i)); + } + } + + return element; + } + + public Object endParticle(Object o, QName elementName, ParticleBinding particle) + { + return o; + } + + public void setParent(Object parent, Object o, QName elementName, ParticleBinding particle, ParticleBinding parentParticle) + { + if (parent instanceof SOAPElement) + { + ((SOAPElement)parent).appendChild((Element)o); + } + else + { + super.setParent(parent, o, elementName, particle, parentParticle); + } + } + + private SOAPFactory getFactory() + { + if (factory == null) + { + try + { + factory = SOAPFactory.newInstance(); + } + catch (SOAPException e) + { + throw new IllegalStateException("Failed to create soap element factory", e); + } + } + return factory; + } + } +} Deleted: branches/tdiesler/trunk/src/main/java/org/jboss/ws/common/jbossxb/UnmarshalException.java =================================================================== --- branches/tdiesler/trunk/src/main/java/org/jboss/ws/core/jbossxb/UnmarshalException.java 2006-12-06 05:06:23 UTC (rev 1568) +++ branches/tdiesler/trunk/src/main/java/org/jboss/ws/common/jbossxb/UnmarshalException.java 2006-12-06 11:19:33 UTC (rev 1572) @@ -1,52 +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.jbossxb; - -/** - * A marshal exception. - * - * @author Thomas.Diesler(a)jboss.org - * @since 06-Jun-2006 - */ -public class UnmarshalException extends Exception -{ - - public UnmarshalException() - { - super(); - } - - public UnmarshalException(String msg, Throwable th) - { - super(msg, th); - } - - public UnmarshalException(String msg) - { - super(msg); - } - - public UnmarshalException(Throwable th) - { - super(th); - } -} Copied: branches/tdiesler/trunk/src/main/java/org/jboss/ws/common/jbossxb/UnmarshalException.java (from rev 1571, branches/tdiesler/trunk/src/main/java/org/jboss/ws/core/jbossxb/UnmarshalException.java) =================================================================== --- branches/tdiesler/trunk/src/main/java/org/jboss/ws/core/jbossxb/UnmarshalException.java 2006-12-06 10:47:51 UTC (rev 1571) +++ branches/tdiesler/trunk/src/main/java/org/jboss/ws/common/jbossxb/UnmarshalException.java 2006-12-06 11:19:33 UTC (rev 1572) @@ -0,0 +1,52 @@ +/* + * 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.common.jbossxb; + +/** + * A marshal exception. + * + * @author Thomas.Diesler(a)jboss.org + * @since 06-Jun-2006 + */ +public class UnmarshalException extends Exception +{ + + public UnmarshalException() + { + super(); + } + + public UnmarshalException(String msg, Throwable th) + { + super(msg, th); + } + + public UnmarshalException(String msg) + { + super(msg); + } + + public UnmarshalException(Throwable th) + { + super(th); + } +} Deleted: branches/tdiesler/trunk/src/main/java/org/jboss/ws/common/jbossxb/XercesXSMarshallerImpl.java =================================================================== --- branches/tdiesler/trunk/src/main/java/org/jboss/ws/core/jbossxb/XercesXSMarshallerImpl.java 2006-12-06 05:06:23 UTC (rev 1568) +++ branches/tdiesler/trunk/src/main/java/org/jboss/ws/common/jbossxb/XercesXSMarshallerImpl.java 2006-12-06 11:19:33 UTC (rev 1572) @@ -1,250 +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.jbossxb; - -// $Id$ - -import org.apache.xerces.xs.XSModel; -import org.jboss.logging.Logger; -import org.jboss.util.NotImplementedException; -import org.jboss.ws.common.WSException; -import org.jboss.ws.common.metadata.jaxrpcmapping.JavaWsdlMapping; -import org.jboss.ws.common.metadata.jaxrpcmapping.JavaXmlTypeMapping; -import org.jboss.ws.common.metadata.jaxrpcmapping.VariableMapping; -import org.jboss.ws.common.utils.JavaUtils; -import org.jboss.xb.binding.Constants; -import org.jboss.xb.binding.MappingObjectModelProvider; -import org.jboss.xb.binding.XercesXsMarshaller; -import org.w3c.dom.Node; -import org.xml.sax.ContentHandler; - -import javax.xml.namespace.QName; -import java.io.OutputStream; -import java.io.OutputStreamWriter; -import java.io.Writer; -import java.util.HashMap; - -/** - * An implementation of a JAXB Marshaller that user XercesXSMarshaller impl. - * - * @author Thomas.Diesler(a)jboss.org - * @since 18-Oct-2004 - */ -public class XercesXSMarshallerImpl implements JBossXBMarshaller -{ - - // provide logging - private static final Logger log = Logger.getLogger(XercesXSMarshallerImpl.class); - - // The marshaller properties - private HashMap properties = new HashMap(); - - private XercesXsMarshaller delegate; - - public XercesXSMarshallerImpl() - { - delegate = new XercesXsMarshaller(); - delegate.setProperty(XercesXsMarshaller.PROP_OUTPUT_XML_VERSION, "false"); - delegate.setProperty(XercesXsMarshaller.PROP_OUTPUT_INDENTATION, "false"); - delegate.declareNamespace("xsi", Constants.NS_XML_SCHEMA_INSTANCE); - delegate.setSupportNil(true); - delegate.setSimpleContentProperty("_value"); - } - - /** - * Marshal the content tree rooted at obj into a Writer. - */ - public void marshal(Object obj, Writer writer) throws MarshalException - { - assertRequiredProperties(); - - try - { - QName xmlName = (QName)getProperty(JBossXBConstants.JBXB_ROOT_QNAME); - delegate.addRootElement(xmlName); - - QName xmlType = (QName)getProperty(JBossXBConstants.JBXB_TYPE_QNAME); - if (xmlType != null) - { - delegate.setRootTypeQName(xmlType); - } - - if (xmlName.getNamespaceURI().length() > 0) - { - String prefix = xmlName.getPrefix(); - String nsURI = xmlName.getNamespaceURI(); - delegate.declareNamespace(prefix, nsURI); - } - - MappingObjectModelProvider provider = new MappingObjectModelProvider(); - provider.setIgnoreLowLine(false); - provider.setIgnoreNotFoundField(false); - - // todo complete wsdl mapping merge - JavaWsdlMapping wsdlMapping = (JavaWsdlMapping)getProperty(JBossXBConstants.JBXB_JAVA_MAPPING); - if (wsdlMapping != null) - { - JavaXmlTypeMapping[] javaXmlMappings = wsdlMapping.getJavaXmlTypeMappings(); - if (javaXmlMappings != null) - { - for (int i = 0; i < javaXmlMappings.length; ++i) - { - JavaXmlTypeMapping javaXmlMapping = javaXmlMappings[i]; - VariableMapping[] variableMappings = javaXmlMapping.getVariableMappings(); - if (variableMappings != null) - { - String clsName = javaXmlMapping.getJavaType(); - Class cls = JavaUtils.loadJavaType(clsName, Thread.currentThread().getContextClassLoader()); - QName clsQName = javaXmlMapping.getRootTypeQName(); - - if (clsQName != null) - { - if ("element".equals(javaXmlMapping.getQnameScope())) - { - delegate.mapClassToGlobalElement(cls, clsQName.getLocalPart(), clsQName.getNamespaceURI(), null, provider); - } - else - { - delegate.mapClassToGlobalType(cls, clsQName.getLocalPart(), clsQName.getNamespaceURI(), null, provider); - delegate.mapClassToXsiType(cls, clsQName.getNamespaceURI(), clsQName.getLocalPart()); - } - } - - for (int j = 0; j < variableMappings.length; ++j) - { - VariableMapping variableMapping = variableMappings[j]; - String javaName = variableMapping.getJavaVariableName(); - if (variableMapping.getXmlElementName() != null) - { - String xmlElementName = variableMapping.getXmlElementName(); - provider.mapFieldToElement(cls, javaName, "", xmlElementName, null); - } - else if (variableMapping.getXmlAttributeName() != null) - { - log.trace("Unmapped attribute: " + javaName); - } - else if (variableMapping.getXmlWildcard()) - { - delegate.mapFieldToWildcard(cls, "_any", JBossXBSupport.getWildcardMarshaller()); - } - else - { - log.warn("Unmapped variable: " + javaName); - } - } - } - } - } - } - - if (getProperty(JBossXBConstants.JBXB_XS_MODEL) != null) - { - XSModel model = (XSModel)getProperty(JBossXBConstants.JBXB_XS_MODEL); - delegate.marshal(model, provider, obj, writer); - } - } - catch (RuntimeException e) - { - throw e; - } - catch (Exception e) - { - throw new MarshalException(e); - } - } - - /** - * Marshal the content tree rooted at obj into SAX2 events. - */ - public void marshal(Object obj, ContentHandler handler) - { - throw new NotImplementedException(); - } - - /** - * Marshal the content tree rooted at obj into a DOM tree. - */ - public void marshal(Object obj, Node node) - { - throw new NotImplementedException(); - } - - /** - * Marshal the content tree rooted at obj into an output stream. - */ - public void marshal(Object obj, OutputStream os) throws MarshalException - { - marshal(obj, new OutputStreamWriter(os)); - } - - /** - * Get the particular property in the underlying implementation of - * Marshaller. - */ - public Object getProperty(String name) - { - if (name == null) - throw new IllegalArgumentException("name parameter is null"); - - return properties.get(name); - } - - /** - * Set the particular property in the underlying implementation of - * Marshaller. - * - */ - public void setProperty(String name, Object value) - { - if (name == null) - throw new IllegalArgumentException("name parameter is null"); - - properties.put(name, value); - } - - /** - * Get a DOM tree view of the content tree(Optional). - */ - public Node getNode(Object contentTree) - { - throw new NotImplementedException(); - } - - /** - * Assert the required properties - */ - private void assertRequiredProperties() - { - if (getProperty(JBossXBConstants.JBXB_SCHEMA_READER) == null && getProperty(JBossXBConstants.JBXB_XS_MODEL) == null) - throw new WSException("Cannot find required property: " + JBossXBConstants.JBXB_XS_MODEL); - - if (getProperty(JBossXBConstants.JBXB_JAVA_MAPPING) == null) - throw new WSException("Cannot find required property: " + JBossXBConstants.JBXB_JAVA_MAPPING); - - QName xmlName = (QName)getProperty(JBossXBConstants.JBXB_ROOT_QNAME); - if (xmlName == null) - throw new WSException("Cannot find required property: " + JBossXBConstants.JBXB_ROOT_QNAME); - - if (xmlName.getNamespaceURI().length() > 0 && xmlName.getPrefix().length() == 0) - throw new IllegalArgumentException("The given root element name must be prefix qualified: " + xmlName); - } -} Copied: branches/tdiesler/trunk/src/main/java/org/jboss/ws/common/jbossxb/XercesXSMarshallerImpl.java (from rev 1571, branches/tdiesler/trunk/src/main/java/org/jboss/ws/core/jbossxb/XercesXSMarshallerImpl.java) =================================================================== --- branches/tdiesler/trunk/src/main/java/org/jboss/ws/core/jbossxb/XercesXSMarshallerImpl.java 2006-12-06 10:47:51 UTC (rev 1571) +++ branches/tdiesler/trunk/src/main/java/org/jboss/ws/common/jbossxb/XercesXSMarshallerImpl.java 2006-12-06 11:19:33 UTC (rev 1572) @@ -0,0 +1,251 @@ +/* + * 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.common.jbossxb; + +// $Id$ + +import java.io.OutputStream; +import java.io.OutputStreamWriter; +import java.io.Writer; +import java.util.HashMap; + +import javax.xml.namespace.QName; + +import org.apache.xerces.xs.XSModel; +import org.jboss.logging.Logger; +import org.jboss.util.NotImplementedException; +import org.jboss.ws.common.WSException; +import org.jboss.ws.common.metadata.jaxrpcmapping.JavaWsdlMapping; +import org.jboss.ws.common.metadata.jaxrpcmapping.JavaXmlTypeMapping; +import org.jboss.ws.common.metadata.jaxrpcmapping.VariableMapping; +import org.jboss.ws.common.utils.JavaUtils; +import org.jboss.xb.binding.Constants; +import org.jboss.xb.binding.MappingObjectModelProvider; +import org.jboss.xb.binding.XercesXsMarshaller; +import org.w3c.dom.Node; +import org.xml.sax.ContentHandler; + +/** + * An implementation of a JAXB Marshaller that user XercesXSMarshaller impl. + * + * @author Thomas.Diesler(a)jboss.org + * @since 18-Oct-2004 + */ +public class XercesXSMarshallerImpl implements JBossXBMarshaller +{ + + // provide logging + private static final Logger log = Logger.getLogger(XercesXSMarshallerImpl.class); + + // The marshaller properties + private HashMap properties = new HashMap(); + + private XercesXsMarshaller delegate; + + public XercesXSMarshallerImpl() + { + delegate = new XercesXsMarshaller(); + delegate.setProperty(XercesXsMarshaller.PROP_OUTPUT_XML_VERSION, "false"); + delegate.setProperty(XercesXsMarshaller.PROP_OUTPUT_INDENTATION, "false"); + delegate.declareNamespace("xsi", Constants.NS_XML_SCHEMA_INSTANCE); + delegate.setSupportNil(true); + delegate.setSimpleContentProperty("_value"); + } + + /** + * Marshal the content tree rooted at obj into a Writer. + */ + public void marshal(Object obj, Writer writer) throws MarshalException + { + assertRequiredProperties(); + + try + { + QName xmlName = (QName)getProperty(JBossXBConstants.JBXB_ROOT_QNAME); + delegate.addRootElement(xmlName); + + QName xmlType = (QName)getProperty(JBossXBConstants.JBXB_TYPE_QNAME); + if (xmlType != null) + { + delegate.setRootTypeQName(xmlType); + } + + if (xmlName.getNamespaceURI().length() > 0) + { + String prefix = xmlName.getPrefix(); + String nsURI = xmlName.getNamespaceURI(); + delegate.declareNamespace(prefix, nsURI); + } + + MappingObjectModelProvider provider = new MappingObjectModelProvider(); + provider.setIgnoreLowLine(false); + provider.setIgnoreNotFoundField(false); + + // todo complete wsdl mapping merge + JavaWsdlMapping wsdlMapping = (JavaWsdlMapping)getProperty(JBossXBConstants.JBXB_JAVA_MAPPING); + if (wsdlMapping != null) + { + JavaXmlTypeMapping[] javaXmlMappings = wsdlMapping.getJavaXmlTypeMappings(); + if (javaXmlMappings != null) + { + for (int i = 0; i < javaXmlMappings.length; ++i) + { + JavaXmlTypeMapping javaXmlMapping = javaXmlMappings[i]; + VariableMapping[] variableMappings = javaXmlMapping.getVariableMappings(); + if (variableMappings != null) + { + String clsName = javaXmlMapping.getJavaType(); + Class cls = JavaUtils.loadJavaType(clsName, Thread.currentThread().getContextClassLoader()); + QName clsQName = javaXmlMapping.getRootTypeQName(); + + if (clsQName != null) + { + if ("element".equals(javaXmlMapping.getQnameScope())) + { + delegate.mapClassToGlobalElement(cls, clsQName.getLocalPart(), clsQName.getNamespaceURI(), null, provider); + } + else + { + delegate.mapClassToGlobalType(cls, clsQName.getLocalPart(), clsQName.getNamespaceURI(), null, provider); + delegate.mapClassToXsiType(cls, clsQName.getNamespaceURI(), clsQName.getLocalPart()); + } + } + + for (int j = 0; j < variableMappings.length; ++j) + { + VariableMapping variableMapping = variableMappings[j]; + String javaName = variableMapping.getJavaVariableName(); + if (variableMapping.getXmlElementName() != null) + { + String xmlElementName = variableMapping.getXmlElementName(); + provider.mapFieldToElement(cls, javaName, "", xmlElementName, null); + } + else if (variableMapping.getXmlAttributeName() != null) + { + log.trace("Unmapped attribute: " + javaName); + } + else if (variableMapping.getXmlWildcard()) + { + delegate.mapFieldToWildcard(cls, "_any", JBossXBSupport.getWildcardMarshaller()); + } + else + { + log.warn("Unmapped variable: " + javaName); + } + } + } + } + } + } + + if (getProperty(JBossXBConstants.JBXB_XS_MODEL) != null) + { + XSModel model = (XSModel)getProperty(JBossXBConstants.JBXB_XS_MODEL); + delegate.marshal(model, provider, obj, writer); + } + } + catch (RuntimeException e) + { + throw e; + } + catch (Exception e) + { + throw new MarshalException(e); + } + } + + /** + * Marshal the content tree rooted at obj into SAX2 events. + */ + public void marshal(Object obj, ContentHandler handler) + { + throw new NotImplementedException(); + } + + /** + * Marshal the content tree rooted at obj into a DOM tree. + */ + public void marshal(Object obj, Node node) + { + throw new NotImplementedException(); + } + + /** + * Marshal the content tree rooted at obj into an output stream. + */ + public void marshal(Object obj, OutputStream os) throws MarshalException + { + marshal(obj, new OutputStreamWriter(os)); + } + + /** + * Get the particular property in the underlying implementation of + * Marshaller. + */ + public Object getProperty(String name) + { + if (name == null) + throw new IllegalArgumentException("name parameter is null"); + + return properties.get(name); + } + + /** + * Set the particular property in the underlying implementation of + * Marshaller. + * + */ + public void setProperty(String name, Object value) + { + if (name == null) + throw new IllegalArgumentException("name parameter is null"); + + properties.put(name, value); + } + + /** + * Get a DOM tree view of the content tree(Optional). + */ + public Node getNode(Object contentTree) + { + throw new NotImplementedException(); + } + + /** + * Assert the required properties + */ + private void assertRequiredProperties() + { + if (getProperty(JBossXBConstants.JBXB_SCHEMA_READER) == null && getProperty(JBossXBConstants.JBXB_XS_MODEL) == null) + throw new WSException("Cannot find required property: " + JBossXBConstants.JBXB_XS_MODEL); + + if (getProperty(JBossXBConstants.JBXB_JAVA_MAPPING) == null) + throw new WSException("Cannot find required property: " + JBossXBConstants.JBXB_JAVA_MAPPING); + + QName xmlName = (QName)getProperty(JBossXBConstants.JBXB_ROOT_QNAME); + if (xmlName == null) + throw new WSException("Cannot find required property: " + JBossXBConstants.JBXB_ROOT_QNAME); + + if (xmlName.getNamespaceURI().length() > 0 && xmlName.getPrefix().length() == 0) + throw new IllegalArgumentException("The given root element name must be prefix qualified: " + xmlName); + } +} Copied: branches/tdiesler/trunk/src/main/java/org/jboss/ws/common/metadata/config/WSCommonConfig.java (from rev 1568, branches/tdiesler/trunk/src/main/java/org/jboss/ws/core/metadata/config/WSCommonConfig.java) =================================================================== --- branches/tdiesler/trunk/src/main/java/org/jboss/ws/core/metadata/config/WSCommonConfig.java 2006-12-06 05:06:23 UTC (rev 1568) +++ branches/tdiesler/trunk/src/main/java/org/jboss/ws/common/metadata/config/WSCommonConfig.java 2006-12-06 11:19:33 UTC (rev 1572) @@ -0,0 +1,53 @@ +/* + * 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.common.metadata.config; + +//$Id$ + +import java.util.List; + +import org.jboss.ws.common.umdm.EndpointMetaData; +import org.jboss.ws.common.umdm.HandlerMetaData; +import org.jboss.ws.common.umdm.HandlerMetaData.HandlerType; + +/** + * A common configuration + * + * @author Thomas.Diesler(a)jboss.org + * @since 18-Dec-2005 + */ +public abstract class WSCommonConfig +{ + private String configName; + + public String getConfigName() + { + return configName; + } + + public void setConfigName(String configName) + { + this.configName = configName; + } + + public abstract List<HandlerMetaData> getHandlers(EndpointMetaData epMetaData, HandlerType type); +} Copied: branches/tdiesler/trunk/src/main/java/org/jboss/ws/common/metadata/config/WSConfigFactory.java (from rev 1570, branches/tdiesler/trunk/src/main/java/org/jboss/ws/core/metadata/config/WSConfigFactory.java) =================================================================== --- branches/tdiesler/trunk/src/main/java/org/jboss/ws/core/metadata/config/WSConfigFactory.java 2006-12-06 10:29:48 UTC (rev 1570) +++ branches/tdiesler/trunk/src/main/java/org/jboss/ws/common/metadata/config/WSConfigFactory.java 2006-12-06 11:19:33 UTC (rev 1572) @@ -0,0 +1,129 @@ +/* + * 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.common.metadata.config; + +//$Id$ + +import java.io.IOException; +import java.io.InputStream; +import java.net.URL; + +import org.jboss.logging.Logger; +import org.jboss.ws.common.WSException; +import org.jboss.ws.common.metadata.config.jaxrpc.WSConfigFactoryJAXRPC; +import org.jboss.ws.common.metadata.config.jaxws.WSConfigFactoryJAXWS; +import org.jboss.ws.common.utils.DOMUtils; +import org.jboss.ws.common.utils.JBossWSEntityResolver; +import org.jboss.xb.binding.JBossXBException; +import org.jboss.xb.binding.Unmarshaller; +import org.jboss.xb.binding.UnmarshallerFactory; +import org.jboss.xb.binding.sunday.unmarshalling.SchemaBinding; +import org.jboss.xb.binding.sunday.unmarshalling.XsdBinder; +import org.w3c.dom.Element; + +/** + * A factory for the JBossWS endpoint/client configuration + * + * @author Thomas.Diesler(a)jboss.org + * @since 18-Dec-2005 + */ +public class WSConfigFactory +{ + // provide logging + private final Logger log = Logger.getLogger(WSConfigFactory.class); + + private static String URN_JAXRPC_CONFIG = "urn:jboss:jaxrpc-config:2.0"; + private static String URN_JAXWS_CONFIG = "urn:jboss:jaxws-config:2.0"; + + // Hide constructor + private WSConfigFactory() + { + } + + /** Create a new instance of the factory + */ + public static WSConfigFactory newInstance() + { + return new WSConfigFactory(); + } + + public Object parseWithSchemaBinding(URL configURL) throws IOException, JBossXBException + { + log.debug("parse: " + configURL); + + String configSchema = "schema/jaxrpc-config_2_0.xsd"; + URL xsdURL = Thread.currentThread().getContextClassLoader().getResource(configSchema); + if (xsdURL == null) + throw new WSException("Cannot find: " + configSchema); + + InputStream xsd = xsdURL.openStream(); + SchemaBinding schemaBinding = XsdBinder.bind(xsd, "UTF-8"); + + Unmarshaller unmarshaller = UnmarshallerFactory.newInstance().newUnmarshaller(); + unmarshaller.setValidation(true); + unmarshaller.setSchemaValidation(true); + unmarshaller.setEntityResolver(new JBossWSEntityResolver()); + Object wsConfig = unmarshaller.unmarshal(configURL.openStream(), schemaBinding); + return wsConfig; + } + + // Below is ObjectModelFactory stuff, which should be removed when parseWithSchemaBinding works. + + public Object parseWithObjectModelFactory(URL configURL) throws IOException, JBossXBException + { + log.debug("parse: " + configURL); + + Unmarshaller unmarshaller = UnmarshallerFactory.newInstance().newUnmarshaller(); + unmarshaller.setValidation(true); + unmarshaller.setSchemaValidation(true); + + Object wsConfig; + String nsURI = getNamespaceURI(configURL); + if (URN_JAXRPC_CONFIG.equals(nsURI)) + { + wsConfig = unmarshaller.unmarshal(configURL.openStream(), new WSConfigFactoryJAXRPC(), null); + } + else if (URN_JAXWS_CONFIG.equals(nsURI)) + { + wsConfig = unmarshaller.unmarshal(configURL.openStream(), new WSConfigFactoryJAXWS(), null); + } + else + { + throw new WSException("Invalid config namespace: " + nsURI); + } + + return wsConfig; + } + + private String getNamespaceURI(URL configURL) + { + try + { + Element root = DOMUtils.parse(configURL.openStream()); + return root.getNamespaceURI(); + } + catch (IOException ex) + { + throw new WSException(ex); + } + } +} Copied: branches/tdiesler/trunk/src/main/java/org/jboss/ws/common/metadata/config/jaxrpc (from rev 1568, branches/tdiesler/trunk/src/main/java/org/jboss/ws/core/metadata/config/jaxrpc) Deleted: branches/tdiesler/trunk/src/main/java/org/jboss/ws/common/metadata/config/jaxrpc/WSClientConfigJAXRPC.java =================================================================== --- branches/tdiesler/trunk/src/main/java/org/jboss/ws/core/metadata/config/jaxrpc/WSClientConfigJAXRPC.java 2006-12-06 05:06:23 UTC (rev 1568) +++ branches/tdiesler/trunk/src/main/java/org/jboss/ws/common/metadata/config/jaxrpc/WSClientConfigJAXRPC.java 2006-12-06 11:19:33 UTC (rev 1572) @@ -1,35 +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.metadata.config.jaxrpc; - - -// $Id$ - -/** - * A JBossWS client configuration - * - * @author Thomas.Diesler(a)jboss.org - * @since 18-Dec-2005 - */ -public class WSClientConfigJAXRPC extends WSCommonConfigJAXRPC -{ -} Copied: branches/tdiesler/trunk/src/main/java/org/jboss/ws/common/metadata/config/jaxrpc/WSClientConfigJAXRPC.java (from rev 1571, branches/tdiesler/trunk/src/main/java/org/jboss/ws/core/metadata/config/jaxrpc/WSClientConfigJAXRPC.java) =================================================================== --- branches/tdiesler/trunk/src/main/java/org/jboss/ws/core/metadata/config/jaxrpc/WSClientConfigJAXRPC.java 2006-12-06 10:47:51 UTC (rev 1571) +++ branches/tdiesler/trunk/src/main/java/org/jboss/ws/common/metadata/config/jaxrpc/WSClientConfigJAXRPC.java 2006-12-06 11:19:33 UTC (rev 1572) @@ -0,0 +1,35 @@ +/* + * 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.common.metadata.config.jaxrpc; + + +// $Id$ + +/** + * A JBossWS client configuration + * + * @author Thomas.Diesler(a)jboss.org + * @since 18-Dec-2005 + */ +public class WSClientConfigJAXRPC extends WSCommonConfigJAXRPC +{ +} Deleted: branches/tdiesler/trunk/src/main/java/org/jboss/ws/common/metadata/config/jaxrpc/WSCommonConfigJAXRPC.java =================================================================== --- branches/tdiesler/trunk/src/main/java/org/jboss/ws/core/metadata/config/jaxrpc/WSCommonConfigJAXRPC.java 2006-12-06 05:06:23 UTC (rev 1568) +++ branches/tdiesler/trunk/src/main/java/org/jboss/ws/common/metadata/config/jaxrpc/WSCommonConfigJAXRPC.java 2006-12-06 11:19:33 UTC (rev 1572) @@ -1,91 +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.metadata.config.jaxrpc; - -import java.util.ArrayList; -import java.util.List; - -import org.jboss.ws.common.umdm.EndpointMetaData; -import org.jboss.ws.common.umdm.HandlerMetaData; -import org.jboss.ws.common.umdm.HandlerMetaData.HandlerType; -import org.jboss.ws.core.metadata.config.WSCommonConfig; -import org.jboss.ws.core.metadata.j2ee.UnifiedHandlerMetaData; -import org.jboss.ws.core.metadata.jsr181.HandlerChainMetaData; - - -// $Id$ - -/** - * A JBossWS client configuration - * - * @author Thomas.Diesler(a)jboss.org - * @since 18-Dec-2005 - */ -public abstract class WSCommonConfigJAXRPC extends WSCommonConfig -{ - private HandlerChainMetaData preHandlerChain; - private HandlerChainMetaData postHandlerChain; - - public HandlerChainMetaData getPostHandlerChain() - { - return postHandlerChain; - } - - public void setPostHandlerChain(HandlerChainMetaData postHandlerChain) - { - this.postHandlerChain = postHandlerChain; - } - - public HandlerChainMetaData getPreHandlerChain() - { - return preHandlerChain; - } - - public void setPreHandlerChain(HandlerChainMetaData preHandlerChain) - { - this.preHandlerChain = preHandlerChain; - } - - @Override - public List<HandlerMetaData> getHandlers(EndpointMetaData epMetaData, HandlerType type) - { - List<HandlerMetaData> handlers = new ArrayList<HandlerMetaData>(); - - HandlerChainMetaData handlerChain; - if (type == HandlerType.PRE) - handlerChain = getPreHandlerChain(); - else if (type == HandlerType.POST) - handlerChain = getPostHandlerChain(); - else - throw new IllegalArgumentException("Invalid handler type: " + type); - - if (handlerChain != null) - { - for (UnifiedHandlerMetaData uhmd : handlerChain.getHandlers()) - { - handlers.add(uhmd.getHandlerMetaDataJAXRPC(epMetaData, type)); - } - } - - return handlers; - } -} Copied: branches/tdiesler/trunk/src/main/java/org/jboss/ws/common/metadata/config/jaxrpc/WSCommonConfigJAXRPC.java (from rev 1571, branches/tdiesler/trunk/src/main/java/org/jboss/ws/core/metadata/config/jaxrpc/WSCommonConfigJAXRPC.java) =================================================================== --- branches/tdiesler/trunk/src/main/java/org/jboss/ws/core/metadata/config/jaxrpc/WSCommonConfigJAXRPC.java 2006-12-06 10:47:51 UTC (rev 1571) +++ branches/tdiesler/trunk/src/main/java/org/jboss/ws/common/metadata/config/jaxrpc/WSCommonConfigJAXRPC.java 2006-12-06 11:19:33 UTC (rev 1572) @@ -0,0 +1,91 @@ +/* + * 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.common.metadata.config.jaxrpc; + +import java.util.ArrayList; +import java.util.List; + +import org.jboss.ws.common.metadata.config.WSCommonConfig; +import org.jboss.ws.common.metadata.j2ee.UnifiedHandlerMetaData; +import org.jboss.ws.common.metadata.jsr181.HandlerChainMetaData; +import org.jboss.ws.common.umdm.EndpointMetaData; +import org.jboss.ws.common.umdm.HandlerMetaData; +import org.jboss.ws.common.umdm.HandlerMetaData.HandlerType; + + +// $Id$ + +/** + * A JBossWS client configuration + * + * @author Thomas.Diesler(a)jboss.org + * @since 18-Dec-2005 + */ +public abstract class WSCommonConfigJAXRPC extends WSCommonConfig +{ + private HandlerChainMetaData preHandlerChain; + private HandlerChainMetaData postHandlerChain; + + public HandlerChainMetaData getPostHandlerChain() + { + return postHandlerChain; + } + + public void setPostHandlerChain(HandlerChainMetaData postHandlerChain) + { + this.postHandlerChain = postHandlerChain; + } + + public HandlerChainMetaData getPreHandlerChain() + { + return preHandlerChain; + } + + public void setPreHandlerChain(HandlerChainMetaData preHandlerChain) + { + this.preHandlerChain = preHandlerChain; + } + + @Override + public List<HandlerMetaData> getHandlers(EndpointMetaData epMetaData, HandlerType type) + { + List<HandlerMetaData> handlers = new ArrayList<HandlerMetaData>(); + + HandlerChainMetaData handlerChain; + if (type == HandlerType.PRE) + handlerChain = getPreHandlerChain(); + else if (type == HandlerType.POST) + handlerChain = getPostHandlerChain(); + else + throw new IllegalArgumentException("Invalid handler type: " + type); + + if (handlerChain != null) + { + for (UnifiedHandlerMetaData uhmd : handlerChain.getHandlers()) + { + handlers.add(uhmd.getHandlerMetaDataJAXRPC(epMetaData, type)); + } + } + + return handlers; + } +} Deleted: branches/tdiesler/trunk/src/main/java/org/jboss/ws/common/metadata/config/jaxrpc/WSConfigFactoryJAXRPC.java =================================================================== --- branches/tdiesler/trunk/src/main/java/org/jboss/ws/core/metadata/config/jaxrpc/WSConfigFactoryJAXRPC.java 2006-12-06 05:06:23 UTC (rev 1568) +++ branches/tdiesler/trunk/src/main/java/org/jboss/ws/common/metadata/config/jaxrpc/WSConfigFactoryJAXRPC.java 2006-12-06 11:19:33 UTC (rev 1572) @@ -1,162 +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.metadata.config.jaxrpc; - -//$Id$ - -import java.util.List; - -import org.jboss.logging.Logger; -import org.jboss.ws.common.umdm.HandlerMetaData.HandlerInitParam; -import org.jboss.ws.common.umdm.HandlerMetaData.HandlerType; -import org.jboss.ws.core.metadata.j2ee.UnifiedHandlerMetaData; -import org.jboss.ws.core.metadata.jsr181.HandlerChainMetaData; -import org.jboss.xb.binding.ObjectModelFactory; -import org.jboss.xb.binding.UnmarshallingContext; -import org.xml.sax.Attributes; - -/** - * A factory for the JBossWS endpoint/client configuration - * - * @author Thomas.Diesler(a)jboss.org - * @since 18-Dec-2005 - */ -public class WSConfigFactoryJAXRPC implements ObjectModelFactory -{ - // provide logging - private final Logger log = Logger.getLogger(WSConfigFactoryJAXRPC.class); - - public Object newRoot(Object root, UnmarshallingContext ctx, String namespaceURI, String localName, Attributes attrs) - { - return new WSConfigRootJAXRPC(); - } - - public Object completeRoot(Object root, UnmarshallingContext ctx, String namespaceURI, String localName) - { - return root; - } - - /** - * Called when parsing of a new element started. - */ - public Object newChild(WSConfigRootJAXRPC wsConfig, UnmarshallingContext navigator, String namespaceURI, String localName, Attributes attrs) - { - log.trace("WSConfig newChild: " + localName); - if ("endpoint-config".equals(localName)) - { - WSEndpointConfigJAXRPC wsEndpointConfig = new WSEndpointConfigJAXRPC(); - wsConfig.getEndpointConfig().add(wsEndpointConfig); - return wsEndpointConfig; - } - if ("client-config".equals(localName)) - { - WSClientConfigJAXRPC wsClientConfig = new WSClientConfigJAXRPC(); - wsConfig.getClientConfig().add(wsClientConfig); - return wsClientConfig; - } - return null; - } - - /** - * Called when a new simple child element with text value was read from the XML content. - */ - public void setValue(WSCommonConfigJAXRPC wsCommonConfig, UnmarshallingContext navigator, String namespaceURI, String localName, String value) - { - if (log.isTraceEnabled()) - log.trace("WSCommonConfig setValue: nuri=" + namespaceURI + " localName=" + localName + " value=" + value); - - if (localName.equals("config-name")) - wsCommonConfig.setConfigName(value); - } - - /** - * Called when parsing of a new element started. - */ - public Object newChild(WSCommonConfigJAXRPC wsCommonConfig, UnmarshallingContext navigator, String namespaceURI, String localName, Attributes attrs) - { - log.trace("WSCommonConfig newChild: " + localName); - - if ("pre-handler-chain".equals(localName)) - { - HandlerChainMetaData preHandlerChain = new HandlerChainMetaData(null); - wsCommonConfig.setPreHandlerChain(preHandlerChain); - return preHandlerChain; - } - if ("post-handler-chain".equals(localName)) - { - HandlerChainMetaData postHandlerChain = new HandlerChainMetaData(null); - wsCommonConfig.setPostHandlerChain(postHandlerChain); - return postHandlerChain; - } - return null; - } - - /** - * Called when parsing of a new element started. - */ - public Object newChild(HandlerChainMetaData handlerChainMetaData, UnmarshallingContext navigator, String namespaceURI, String localName, Attributes attrs) - { - log.trace("WSHandlerChainConfig newChild: " + localName); - if ("handler".equals(localName)) - { - UnifiedHandlerMetaData handler = new UnifiedHandlerMetaData(handlerChainMetaData); - List<UnifiedHandlerMetaData> handlers = handlerChainMetaData.getHandlers(); - handlers.add(handler); - return handler; - } - return null; - } - - /** - * Called when a new simple child element with text value was read from the XML content. - */ - public void setValue(UnifiedHandlerMetaData handler, UnmarshallingContext navigator, String namespaceURI, String localName, String value) - { - if (log.isTraceEnabled()) - log.trace("UnifiedHandlerMetaData setValue: nuri=" + namespaceURI + " localName=" + localName + " value=" + value); - - if (localName.equals("handler-name")) - handler.setHandlerName(value); - else if (localName.equals("handler-class")) - handler.setHandlerClass(value); - else if (localName.equals("soap-header")) - handler.addSoapHeader(navigator.resolveQName(value)); - else if (localName.equals("soap-role")) - handler.addSoapRole(value); - else if (localName.equals("port-name")) - handler.addPortName(value); - } - - /** - * 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) - { - if (log.isTraceEnabled()) - log.trace("UnifiedInitParamMetaData setValue: nuri=" + namespaceURI + " localName=" + localName + " value=" + value); - - if (localName.equals("param-name")) - param.setParamName(value); - else if (localName.equals("param-value")) - param.setParamValue(value); - } -} Copied: branches/tdiesler/trunk/src/main/java/org/jboss/ws/common/metadata/config/jaxrpc/WSConfigFactoryJAXRPC.java (from rev 1571, branches/tdiesler/trunk/src/main/java/org/jboss/ws/core/metadata/config/jaxrpc/WSConfigFactoryJAXRPC.java) =================================================================== --- branches/tdiesler/trunk/src/main/java/org/jboss/ws/core/metadata/config/jaxrpc/WSConfigFactoryJAXRPC.java 2006-12-06 10:47:51 UTC (rev 1571) +++ branches/tdiesler/trunk/src/main/java/org/jboss/ws/common/metadata/config/jaxrpc/WSConfigFactoryJAXRPC.java 2006-12-06 11:19:33 UTC (rev 1572) @@ -0,0 +1,161 @@ +/* + * 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.common.metadata.config.jaxrpc; + +//$Id$ + +import java.util.List; + +import org.jboss.logging.Logger; +import org.jboss.ws.common.metadata.j2ee.UnifiedHandlerMetaData; +import org.jboss.ws.common.metadata.jsr181.HandlerChainMetaData; +import org.jboss.ws.common.umdm.HandlerMetaData.HandlerInitParam; +import org.jboss.xb.binding.ObjectModelFactory; +import org.jboss.xb.binding.UnmarshallingContext; +import org.xml.sax.Attributes; + +/** + * A factory for the JBossWS endpoint/client configuration + * + * @author Thomas.Diesler(a)jboss.org + * @since 18-Dec-2005 + */ +public class WSConfigFactoryJAXRPC implements ObjectModelFactory +{ + // provide logging + private final Logger log = Logger.getLogger(WSConfigFactoryJAXRPC.class); + + public Object newRoot(Object root, UnmarshallingContext ctx, String namespaceURI, String localName, Attributes attrs) + { + return new WSConfigRootJAXRPC(); + } + + public Object completeRoot(Object root, UnmarshallingContext ctx, String namespaceURI, String localName) + { + return root; + } + + /** + * Called when parsing of a new element started. + */ + public Object newChild(WSConfigRootJAXRPC wsConfig, UnmarshallingContext navigator, String namespaceURI, String localName, Attributes attrs) + { + log.trace("WSConfig newChild: " + localName); + if ("endpoint-config".equals(localName)) + { + WSEndpointConfigJAXRPC wsEndpointConfig = new WSEndpointConfigJAXRPC(); + wsConfig.getEndpointConfig().add(wsEndpointConfig); + return wsEndpointConfig; + } + if ("client-config".equals(localName)) + { + WSClientConfigJAXRPC wsClientConfig = new WSClientConfigJAXRPC(); + wsConfig.getClientConfig().add(wsClientConfig); + return wsClientConfig; + } + return null; + } + + /** + * Called when a new simple child element with text value was read from the XML content. + */ + public void setValue(WSCommonConfigJAXRPC wsCommonConfig, UnmarshallingContext navigator, String namespaceURI, String localName, String value) + { + if (log.isTraceEnabled()) + log.trace("WSCommonConfig setValue: nuri=" + namespaceURI + " localName=" + localName + " value=" + value); + + if (localName.equals("config-name")) + wsCommonConfig.setConfigName(value); + } + + /** + * Called when parsing of a new element started. + */ + public Object newChild(WSCommonConfigJAXRPC wsCommonConfig, UnmarshallingContext navigator, String namespaceURI, String localName, Attributes attrs) + { + log.trace("WSCommonConfig newChild: " + localName); + + if ("pre-handler-chain".equals(localName)) + { + HandlerChainMetaData preHandlerChain = new HandlerChainMetaData(null); + wsCommonConfig.setPreHandlerChain(preHandlerChain); + return preHandlerChain; + } + if ("post-handler-chain".equals(localName)) + { + HandlerChainMetaData postHandlerChain = new HandlerChainMetaData(null); + wsCommonConfig.setPostHandlerChain(postHandlerChain); + return postHandlerChain; + } + return null; + } + + /** + * Called when parsing of a new element started. + */ + public Object newChild(HandlerChainMetaData handlerChainMetaData, UnmarshallingContext navigator, String namespaceURI, String localName, Attributes attrs) + { + log.trace("WSHandlerChainConfig newChild: " + localName); + if ("handler".equals(localName)) + { + UnifiedHandlerMetaData handler = new UnifiedHandlerMetaData(handlerChainMetaData); + List<UnifiedHandlerMetaData> handlers = handlerChainMetaData.getHandlers(); + handlers.add(handler); + return handler; + } + return null; + } + + /** + * Called when a new simple child element with text value was read from the XML content. + */ + public void setValue(UnifiedHandlerMetaData handler, UnmarshallingContext navigator, String namespaceURI, String localName, String value) + { + if (log.isTraceEnabled()) + log.trace("UnifiedHandlerMetaData setValue: nuri=" + namespaceURI + " localName=" + localName + " value=" + value); + + if (localName.equals("handler-name")) + handler.setHandlerName(value); + else if (localName.equals("handler-class")) + handler.setHandlerClass(value); + else if (localName.equals("soap-header")) + handler.addSoapHeader(navigator.resolveQName(value)); + else if (localName.equals("soap-role")) + handler.addSoapRole(value); + else if (localName.equals("port-name")) + handler.addPortName(value); + } + + /** + * 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) + { + if (log.isTraceEnabled()) + log.trace("UnifiedInitParamMetaData setValue: nuri=" + namespaceURI + " localName=" + localName + " value=" + value); + + if (localName.equals("param-name")) + param.setParamName(value); + else if (localName.equals("param-value")) + param.setParamValue(value); + } +} Deleted: branches/tdiesler/trunk/src/main/java/org/jboss/ws/common/metadata/config/jaxrpc/WSConfigRootJAXRPC.java =================================================================== --- branches/tdiesler/trunk/src/main/java/org/jboss/ws/core/metadata/config/jaxrpc/WSConfigRootJAXRPC.java 2006-12-06 05:06:23 UTC (rev 1568) +++ branches/tdiesler/trunk/src/main/java/org/jboss/ws/common/metadata/config/jaxrpc/WSConfigRootJAXRPC.java 2006-12-06 11:19:33 UTC (rev 1572) @@ -1,94 +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.metadata.config.jaxrpc; - -import java.util.ArrayList; -import java.util.List; - - -/** - * A JBossWS configuration - * - * @author Thomas.Diesler(a)jboss.org - * @since 18-Dec-2005 - */ -public class WSConfigRootJAXRPC -{ - private List<WSClientConfigJAXRPC> clientConfigList = new ArrayList<WSClientConfigJAXRPC>(); - private List<WSEndpointConfigJAXRPC> endpointConfigList = new ArrayList<WSEndpointConfigJAXRPC>(); - - public List<WSClientConfigJAXRPC> getClientConfig() - { - return clientConfigList; - } - - public void setClientConfig(List<WSClientConfigJAXRPC> clientConfig) - { - this.clientConfigList = clientConfig; - } - - public List<WSEndpointConfigJAXRPC> getEndpointConfig() - { - return endpointConfigList; - } - - public void setEndpointConfig(List<WSEndpointConfigJAXRPC> endpointConfig) - { - this.endpointConfigList = endpointConfig; - } - - public WSClientConfigJAXRPC getClientConfigByName(String configName) - { - WSClientConfigJAXRPC config = null; - for(WSClientConfigJAXRPC aux : clientConfigList) - { - if (aux.getConfigName().equals(configName)) - { - config = aux; - break; - } - } - - if (config == null && clientConfigList.size() == 1) - config = clientConfigList.get(0); - - return config; - } - - public WSEndpointConfigJAXRPC getEndpointConfigByName(String configName) - { - WSEndpointConfigJAXRPC config = null; - for(WSEndpointConfigJAXRPC aux : endpointConfigList) - { - if (aux.getConfigName().equals(configName)) - { - config = aux; - break; - } - } - - if (config == null && endpointConfigList.size() == 1) - config = endpointConfigList.get(0); - - return config; - } -} Copied: branches/tdiesler/trunk/src/main/java/org/jboss/ws/common/metadata/config/jaxrpc/WSConfigRootJAXRPC.java (from rev 1571, branches/tdiesler/trunk/src/main/java/org/jboss/ws/core/metadata/config/jaxrpc/WSConfigRootJAXRPC.java) =================================================================== --- branches/tdiesler/trunk/src/main/java/org/jboss/ws/core/metadata/config/jaxrpc/WSConfigRootJAXRPC.java 2006-12-06 10:47:51 UTC (rev 1571) +++ branches/tdiesler/trunk/src/main/java/org/jboss/ws/common/metadata/config/jaxrpc/WSConfigRootJAXRPC.java 2006-12-06 11:19:33 UTC (rev 1572) @@ -0,0 +1,94 @@ +/* + * 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.common.metadata.config.jaxrpc; + +import java.util.ArrayList; +import java.util.List; + + +/** + * A JBossWS configuration + * + * @author Thomas.Diesler(a)jboss.org + * @since 18-Dec-2005 + */ +public class WSConfigRootJAXRPC +{ + private List<WSClientConfigJAXRPC> clientConfigList = new ArrayList<WSClientConfigJAXRPC>(); + private List<WSEndpointConfigJAXRPC> endpointConfigList = new ArrayList<WSEndpointConfigJAXRPC>(); + + public List<WSClientConfigJAXRPC> getClientConfig() + { + return clientConfigList; + } + + public void setClientConfig(List<WSClientConfigJAXRPC> clientConfig) + { + this.clientConfigList = clientConfig; + } + + public List<WSEndpointConfigJAXRPC> getEndpointConfig() + { + return endpointConfigList; + } + + public void setEndpointConfig(List<WSEndpointConfigJAXRPC> endpointConfig) + { + this.endpointConfigList = endpointConfig; + } + + public WSClientConfigJAXRPC getClientConfigByName(String configName) + { + WSClientConfigJAXRPC config = null; + for(WSClientConfigJAXRPC aux : clientConfigList) + { + if (aux.getConfigName().equals(configName)) + { + config = aux; + break; + } + } + + if (config == null && clientConfigList.size() == 1) + config = clientConfigList.get(0); + + return config; + } + + public WSEndpointConfigJAXRPC getEndpointConfigByName(String configName) + { + WSEndpointConfigJAXRPC config = null; + for(WSEndpointConfigJAXRPC aux : endpointConfigList) + { + if (aux.getConfigName().equals(configName)) + { + config = aux; + break; + } + } + + if (config == null && endpointConfigList.size() == 1) + config = endpointConfigList.get(0); + + return config; + } +} Deleted: branches/tdiesler/trunk/src/main/java/org/jboss/ws/common/metadata/config/jaxrpc/WSEndpointConfigJAXRPC.java =================================================================== --- branches/tdiesler/trunk/src/main/java/org/jboss/ws/core/metadata/config/jaxrpc/WSEndpointConfigJAXRPC.java 2006-12-06 05:06:23 UTC (rev 1568) +++ branches/tdiesler/trunk/src/main/java/org/jboss/ws/common/metadata/config/jaxrpc/WSEndpointConfigJAXRPC.java 2006-12-06 11:19:33 UTC (rev 1572) @@ -1,44 +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.metadata.config.jaxrpc; - -import java.util.ArrayList; -import java.util.List; - -import org.jboss.ws.common.umdm.EndpointMetaData; -import org.jboss.ws.common.umdm.HandlerMetaData; -import org.jboss.ws.common.umdm.HandlerMetaData.HandlerType; -import org.jboss.ws.core.metadata.j2ee.UnifiedHandlerMetaData; -import org.jboss.ws.core.metadata.jsr181.HandlerChainMetaData; - - -// $Id$ - -/** - * A JBossWS endpoint configuration - * - * @author Thomas.Diesler(a)jboss.org - * @since 18-Dec-2005 - */ -public class WSEndpointConfigJAXRPC extends WSCommonConfigJAXRPC -{ -} Copied: branches/tdiesler/trunk/src/main/java/org/jboss/ws/common/metadata/config/jaxrpc/WSEndpointConfigJAXRPC.java (from rev 1571, branches/tdiesler/trunk/src/main/java/org/jboss/ws/core/metadata/config/jaxrpc/WSEndpointConfigJAXRPC.java) =================================================================== --- branches/tdiesler/trunk/src/main/java/org/jboss/ws/core/metadata/config/jaxrpc/WSEndpointConfigJAXRPC.java 2006-12-06 10:47:51 UTC (rev 1571) +++ branches/tdiesler/trunk/src/main/java/org/jboss/ws/common/metadata/config/jaxrpc/WSEndpointConfigJAXRPC.java 2006-12-06 11:19:33 UTC (rev 1572) @@ -0,0 +1,36 @@ +/* + * 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.common.metadata.config.jaxrpc; + + + +// $Id$ + +/** + * A JBossWS endpoint configuration + * + * @author Thomas.Diesler(a)jboss.org + * @since 18-Dec-2005 + */ +public class WSEndpointConfigJAXRPC extends WSCommonConfigJAXRPC +{ +} Copied: branches/tdiesler/trunk/src/main/java/org/jboss/ws/common/metadata/config/jaxws (from rev 1568, branches/tdiesler/trunk/src/main/java/org/jboss/ws/core/metadata/config/jaxws) Deleted: branches/tdiesler/trunk/src/main/java/org/jboss/ws/common/metadata/config/jaxws/WSClientConfigJAXWS.java =================================================================== --- branches/tdiesler/trunk/src/main/java/org/jboss/ws/core/metadata/config/jaxws/WSClientConfigJAXWS.java 2006-12-06 05:06:23 UTC (rev 1568) +++ branches/tdiesler/trunk/src/main/java/org/jboss/ws/common/metadata/config/jaxws/WSClientConfigJAXWS.java 2006-12-06 11:19:33 UTC (rev 1572) @@ -1,35 +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.metadata.config.jaxws; - - -// $Id$ - -/** - * A JBossWS client configuration - * - * @author Thomas.Diesler(a)jboss.org - * @since 18-Dec-2005 - */ -public class WSClientConfigJAXWS extends WSCommonConfigJAXWS -{ -} Copied: branches/tdiesler/trunk/src/main/java/org/jboss/ws/common/metadata/config/jaxws/WSClientConfigJAXWS.java (from rev 1571, branches/tdiesler/trunk/src/main/java/org/jboss/ws/core/metadata/config/jaxws/WSClientConfigJAXWS.java) =================================================================== --- branches/tdiesler/trunk/src/main/java/org/jboss/ws/core/metadata/config/jaxws/WSClientConfigJAXWS.java 2006-12-06 10:47:51 UTC (rev 1571) +++ branches/tdiesler/trunk/src/main/java/org/jboss/ws/common/metadata/config/jaxws/WSClientConfigJAXWS.java 2006-12-06 11:19:33 UTC (rev 1572) @@ -0,0 +1,35 @@ +/* + * 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.common.metadata.config.jaxws; + + +// $Id$ + +/** + * A JBossWS client configuration + * + * @author Thomas.Diesler(a)jboss.org + * @since 18-Dec-2005 + */ +public class WSClientConfigJAXWS extends WSCommonConfigJAXWS +{ +} Deleted: branches/tdiesler/trunk/src/main/java/org/jboss/ws/common/metadata/config/jaxws/WSCommonConfigJAXWS.java =================================================================== --- branches/tdiesler/trunk/src/main/java/org/jboss/ws/core/metadata/config/jaxws/WSCommonConfigJAXWS.java 2006-12-06 05:06:23 UTC (rev 1568) +++ branches/tdiesler/trunk/src/main/java/org/jboss/ws/common/metadata/config/jaxws/WSCommonConfigJAXWS.java 2006-12-06 11:19:33 UTC (rev 1572) @@ -1,91 +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.metadata.config.jaxws; - -import java.util.ArrayList; -import java.util.List; - -import org.jboss.ws.common.umdm.EndpointMetaData; -import org.jboss.ws.common.umdm.HandlerMetaData; -import org.jboss.ws.common.umdm.HandlerMetaData.HandlerType; -import org.jboss.ws.core.metadata.config.WSCommonConfig; -import org.jboss.ws.core.metadata.j2ee.UnifiedHandlerMetaData; -import org.jboss.ws.core.metadata.jsr181.HandlerChainMetaData; - -// $Id$ - -/** - * A JBossWS client configuration - * - * @author Thomas.Diesler(a)jboss.org - * @since 18-Dec-2005 - */ -public abstract class WSCommonConfigJAXWS extends WSCommonConfig -{ - private WSHandlerChainsConfigJAXWS preHandlerChains; - private WSHandlerChainsConfigJAXWS postHandlerChains; - - public WSHandlerChainsConfigJAXWS getPostHandlerChains() - { - return postHandlerChains; - } - - public void setPostHandlerChains(WSHandlerChainsConfigJAXWS postHandlerChain) - { - this.postHandlerChains = postHandlerChain; - } - - public WSHandlerChainsConfigJAXWS getPreHandlerChains() - { - return preHandlerChains; - } - - public void setPreHandlerChains(WSHandlerChainsConfigJAXWS preHandlerChains) - { - this.preHandlerChains = preHandlerChains; - } - - public List<HandlerMetaData> getHandlers(EndpointMetaData epMetaData, HandlerType type) - { - List<HandlerMetaData> handlers = new ArrayList<HandlerMetaData>(); - - WSHandlerChainsConfigJAXWS handlerChains; - if (type == HandlerType.PRE) - handlerChains = getPreHandlerChains(); - else if (type == HandlerType.POST) - handlerChains = getPostHandlerChains(); - else throw new IllegalArgumentException("Invalid handler type: " + type); - - if (handlerChains != null) - { - for (HandlerChainMetaData handlerChainMetaData : handlerChains.getHandlerChains()) - { - for (UnifiedHandlerMetaData uhmd : handlerChainMetaData.getHandlers()) - { - handlers.add(uhmd.getHandlerMetaDataJAXWS(epMetaData, type)); - } - } - } - - return handlers; - } -} Copied: branches/tdiesler/trunk/src/main/java/org/jboss/ws/common/metadata/config/jaxws/WSCommonConfigJAXWS.java (from rev 1571, branches/tdiesler/trunk/src/main/java/org/jboss/ws/core/metadata/config/jaxws/WSCommonConfigJAXWS.java) =================================================================== --- branches/tdiesler/trunk/src/main/java/org/jboss/ws/core/metadata/config/jaxws/WSCommonConfigJAXWS.java 2006-12-06 10:47:51 UTC (rev 1571) +++ branches/tdiesler/trunk/src/main/java/org/jboss/ws/common/metadata/config/jaxws/WSCommonConfigJAXWS.java 2006-12-06 11:19:33 UTC (rev 1572) @@ -0,0 +1,91 @@ +/* + * 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.common.metadata.config.jaxws; + +import java.util.ArrayList; +import java.util.List; + +import org.jboss.ws.common.metadata.config.WSCommonConfig; +import org.jboss.ws.common.metadata.j2ee.UnifiedHandlerMetaData; +import org.jboss.ws.common.metadata.jsr181.HandlerChainMetaData; +import org.jboss.ws.common.umdm.EndpointMetaData; +import org.jboss.ws.common.umdm.HandlerMetaData; +import org.jboss.ws.common.umdm.HandlerMetaData.HandlerType; + +// $Id$ + +/** + * A JBossWS client configuration + * + * @author Thomas.Diesler(a)jboss.org + * @since 18-Dec-2005 + */ +public abstract class WSCommonConfigJAXWS extends WSCommonConfig +{ + private WSHandlerChainsConfigJAXWS preHandlerChains; + private WSHandlerChainsConfigJAXWS postHandlerChains; + + public WSHandlerChainsConfigJAXWS getPostHandlerChains() + { + return postHandlerChains; + } + + public void setPostHandlerChains(WSHandlerChainsConfigJAXWS postHandlerChain) + { + this.postHandlerChains = postHandlerChain; + } + + public WSHandlerChainsConfigJAXWS getPreHandlerChains() + { + return preHandlerChains; + } + + public void setPreHandlerChains(WSHandlerChainsConfigJAXWS preHandlerChains) + { + this.preHandlerChains = preHandlerChains; + } + + public List<HandlerMetaData> getHandlers(EndpointMetaData epMetaData, HandlerType type) + { + List<HandlerMetaData> handlers = new ArrayList<HandlerMetaData>(); + + WSHandlerChainsConfigJAXWS handlerChains; + if (type == HandlerType.PRE) + handlerChains = getPreHandlerChains(); + else if (type == HandlerType.POST) + handlerChains = getPostHandlerChains(); + else throw new IllegalArgumentException("Invalid handler type: " + type); + + if (handlerChains != null) + { + for (HandlerChainMetaData handlerChainMetaData : handlerChains.getHandlerChains()) + { + for (UnifiedHandlerMetaData uhmd : handlerChainMetaData.getHandlers()) + { + handlers.add(uhmd.getHandlerMetaDataJAXWS(epMetaData, type)); + } + } + } + + return handlers; + } +} Deleted: branches/tdiesler/trunk/src/main/java/org/jboss/ws/common/metadata/config/jaxws/WSConfigFactoryJAXWS.java =================================================================== --- branches/tdiesler/trunk/src/main/java/org/jboss/ws/core/metadata/config/jaxws/WSConfigFactoryJAXWS.java 2006-12-06 05:06:23 UTC (rev 1568) +++ branches/tdiesler/trunk/src/main/java/org/jboss/ws/common/metadata/config/jaxws/WSConfigFactoryJAXWS.java 2006-12-06 11:19:33 UTC (rev 1572) @@ -1,123 +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.metadata.config.jaxws; - -//$Id$ - -import org.jboss.logging.Logger; -import org.jboss.ws.core.metadata.jsr181.HandlerChainFactory; -import org.jboss.ws.core.metadata.jsr181.HandlerChainMetaData; -import org.jboss.xb.binding.UnmarshallingContext; -import org.xml.sax.Attributes; - -/** - * A factory for the JBossWS endpoint/client configuration - * - * @author Thomas.Diesler(a)jboss.org - * @since 18-Dec-2005 - */ -public class WSConfigFactoryJAXWS extends HandlerChainFactory -{ - // provide logging - private final Logger log = Logger.getLogger(WSConfigFactoryJAXWS.class); - - public Object newRoot(Object root, UnmarshallingContext ctx, String namespaceURI, String localName, Attributes attrs) - { - return new WSConfigRootJAXWS(); - } - - public Object completeRoot(Object root, UnmarshallingContext ctx, String namespaceURI, String localName) - { - return root; - } - - /** - * Called when parsing of a new element started. - */ - public Object newChild(WSConfigRootJAXWS wsConfig, UnmarshallingContext navigator, String namespaceURI, String localName, Attributes attrs) - { - log.trace("WSConfig newChild: " + localName); - if ("endpoint-config".equals(localName)) - { - WSEndpointConfigJAXWS wsEndpointConfig = new WSEndpointConfigJAXWS(); - wsConfig.getEndpointConfig().add(wsEndpointConfig); - return wsEndpointConfig; - } - if ("client-config".equals(localName)) - { - WSClientConfigJAXWS wsClientConfig = new WSClientConfigJAXWS(); - wsConfig.getClientConfig().add(wsClientConfig); - return wsClientConfig; - } - return null; - } - - /** - * Called when a new simple child element with text value was read from the XML content. - */ - public void setValue(WSCommonConfigJAXWS wsCommonConfig, UnmarshallingContext navigator, String namespaceURI, String localName, String value) - { - if (log.isTraceEnabled()) - log.trace("WSCommonConfig setValue: nuri=" + namespaceURI + " localName=" + localName + " value=" + value); - - if (localName.equals("config-name")) - wsCommonConfig.setConfigName(value); - } - - /** - * Called when parsing of a new element started. - */ - public Object newChild(WSCommonConfigJAXWS wsCommonConfig, UnmarshallingContext navigator, String namespaceURI, String localName, Attributes attrs) - { - log.trace("WSCommonConfig newChild: " + localName); - - if ("pre-handler-chains".equals(localName)) - { - WSHandlerChainsConfigJAXWS preHandlerChains = new WSHandlerChainsConfigJAXWS(); - wsCommonConfig.setPreHandlerChains(preHandlerChains); - return preHandlerChains; - } - if ("post-handler-chains".equals(localName)) - { - WSHandlerChainsConfigJAXWS postHandlerChains = new WSHandlerChainsConfigJAXWS(); - wsCommonConfig.setPostHandlerChains(postHandlerChains); - return postHandlerChains; - } - return null; - } - - /** - * Called when parsing of a new element started. - */ - public Object newChild(WSHandlerChainsConfigJAXWS wsHandlerChains, UnmarshallingContext navigator, String namespaceURI, String localName, Attributes attrs) - { - log.trace("WSHandlerChainsConfig newChild: " + localName); - - if ("handler-chain".equals(localName)) - { - HandlerChainMetaData handlerChain = new HandlerChainMetaData(null); - wsHandlerChains.getHandlerChains().add(handlerChain); - return handlerChain; - } - return null; - } -} Copied: branches/tdiesler/trunk/src/main/java/org/jboss/ws/common/metadata/config/jaxws/WSConfigFactoryJAXWS.java (from rev 1571, branches/tdiesler/trunk/src/main/java/org/jboss/ws/core/metadata/config/jaxws/WSConfigFactoryJAXWS.java) =================================================================== --- branches/tdiesler/trunk/src/main/java/org/jboss/ws/core/metadata/config/jaxws/WSConfigFactoryJAXWS.java 2006-12-06 10:47:51 UTC (rev 1571) +++ branches/tdiesler/trunk/src/main/java/org/jboss/ws/common/metadata/config/jaxws/WSConfigFactoryJAXWS.java 2006-12-06 11:19:33 UTC (rev 1572) @@ -0,0 +1,123 @@ +/* + * 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.common.metadata.config.jaxws; + +//$Id$ + +import org.jboss.logging.Logger; +import org.jboss.ws.common.metadata.jsr181.HandlerChainFactory; +import org.jboss.ws.common.metadata.jsr181.HandlerChainMetaData; +import org.jboss.xb.binding.UnmarshallingContext; +import org.xml.sax.Attributes; + +/** + * A factory for the JBossWS endpoint/client configuration + * + * @author Thomas.Diesler(a)jboss.org + * @since 18-Dec-2005 + */ +public class WSConfigFactoryJAXWS extends HandlerChainFactory +{ + // provide logging + private final Logger log = Logger.getLogger(WSConfigFactoryJAXWS.class); + + public Object newRoot(Object root, UnmarshallingContext ctx, String namespaceURI, String localName, Attributes attrs) + { + return new WSConfigRootJAXWS(); + } + + public Object completeRoot(Object root, UnmarshallingContext ctx, String namespaceURI, String localName) + { + return root; + } + + /** + * Called when parsing of a new element started. + */ + public Object newChild(WSConfigRootJAXWS wsConfig, UnmarshallingContext navigator, String namespaceURI, String localName, Attributes attrs) + { + log.trace("WSConfig newChild: " + localName); + if ("endpoint-config".equals(localName)) + { + WSEndpointConfigJAXWS wsEndpointConfig = new WSEndpointConfigJAXWS(); + wsConfig.getEndpointConfig().add(wsEndpointConfig); + return wsEndpointConfig; + } + if ("client-config".equals(localName)) + { + WSClientConfigJAXWS wsClientConfig = new WSClientConfigJAXWS(); + wsConfig.getClientConfig().add(wsClientConfig); + return wsClientConfig; + } + return null; + } + + /** + * Called when a new simple child element with text value was read from the XML content. + */ + public void setValue(WSCommonConfigJAXWS wsCommonConfig, UnmarshallingContext navigator, String namespaceURI, String localName, String value) + { + if (log.isTraceEnabled()) + log.trace("WSCommonConfig setValue: nuri=" + namespaceURI + " localName=" + localName + " value=" + value); + + if (localName.equals("config-name")) + wsCommonConfig.setConfigName(value); + } + + /** + * Called when parsing of a new element started. + */ + public Object newChild(WSCommonConfigJAXWS wsCommonConfig, UnmarshallingContext navigator, String namespaceURI, String localName, Attributes attrs) + { + log.trace("WSCommonConfig newChild: " + localName); + + if ("pre-handler-chains".equals(localName)) + { + WSHandlerChainsConfigJAXWS preHandlerChains = new WSHandlerChainsConfigJAXWS(); + wsCommonConfig.setPreHandlerChains(preHandlerChains); + return preHandlerChains; + } + if ("post-handler-chains".equals(localName)) + { + WSHandlerChainsConfigJAXWS postHandlerChains = new WSHandlerChainsConfigJAXWS(); + wsCommonConfig.setPostHandlerChains(postHandlerChains); + return postHandlerChains; + } + return null; + } + + /** + * Called when parsing of a new element started. + */ + public Object newChild(WSHandlerChainsConfigJAXWS wsHandlerChains, UnmarshallingContext navigator, String namespaceURI, String localName, Attributes attrs) + { + log.trace("WSHandlerChainsConfig newChild: " + localName); + + if ("handler-chain".equals(localName)) + { + HandlerChainMetaData handlerChain = new HandlerChainMetaData(null); + wsHandlerChains.getHandlerChains().add(handlerChain); + return handlerChain; + } + return null; + } +} Deleted: branches/tdiesler/trunk/src/main/java/org/jboss/ws/common/metadata/config/jaxws/WSConfigRootJAXWS.java =================================================================== --- branches/tdiesler/trunk/src/main/java/org/jboss/ws/core/metadata/config/jaxws/WSConfigRootJAXWS.java 2006-12-06 05:06:23 UTC (rev 1568) +++ branches/tdiesler/trunk/src/main/java/org/jboss/ws/common/metadata/config/jaxws/WSConfigRootJAXWS.java 2006-12-06 11:19:33 UTC (rev 1572) @@ -1,94 +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.metadata.config.jaxws; - -import java.util.ArrayList; -import java.util.List; - - -/** - * A JBossWS configuration - * - * @author Thomas.Diesler(a)jboss.org - * @since 18-Dec-2005 - */ -public class WSConfigRootJAXWS -{ - private List<WSClientConfigJAXWS> clientConfigList = new ArrayList<WSClientConfigJAXWS>(); - private List<WSEndpointConfigJAXWS> endpointConfigList = new ArrayList<WSEndpointConfigJAXWS>(); - - public List<WSClientConfigJAXWS> getClientConfig() - { - return clientConfigList; - } - - public void setClientConfig(List<WSClientConfigJAXWS> clientConfig) - { - this.clientConfigList = clientConfig; - } - - public List<WSEndpointConfigJAXWS> getEndpointConfig() - { - return endpointConfigList; - } - - public void setEndpointConfig(List<WSEndpointConfigJAXWS> endpointConfig) - { - this.endpointConfigList = endpointConfig; - } - - public WSClientConfigJAXWS getClientConfigByName(String configName) - { - WSClientConfigJAXWS config = null; - for(WSClientConfigJAXWS aux : clientConfigList) - { - if (aux.getConfigName().equals(configName)) - { - config = aux; - break; - } - } - - if (config == null && clientConfigList.size() == 1) - config = clientConfigList.get(0); - - return config; - } - - public WSEndpointConfigJAXWS getEndpointConfigByName(String configName) - { - WSEndpointConfigJAXWS config = null; - for(WSEndpointConfigJAXWS aux : endpointConfigList) - { - if (aux.getConfigName().equals(configName)) - { - config = aux; - break; - } - } - - if (config == null && endpointConfigList.size() == 1) - config = endpointConfigList.get(0); - - return config; - } -} Copied: branches/tdiesler/trunk/src/main/java/org/jboss/ws/common/metadata/config/jaxws/WSConfigRootJAXWS.java (from rev 1571, branches/tdiesler/trunk/src/main/java/org/jboss/ws/core/metadata/config/jaxws/WSConfigRootJAXWS.java) =================================================================== --- branches/tdiesler/trunk/src/main/java/org/jboss/ws/core/metadata/config/jaxws/WSConfigRootJAXWS.java 2006-12-06 10:47:51 UTC (rev 1571) +++ branches/tdiesler/trunk/src/main/java/org/jboss/ws/common/metadata/config/jaxws/WSConfigRootJAXWS.java 2006-12-06 11:19:33 UTC (rev 1572) @@ -0,0 +1,94 @@ +/* + * 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.common.metadata.config.jaxws; + +import java.util.ArrayList; +import java.util.List; + + +/** + * A JBossWS configuration + * + * @author Thomas.Diesler(a)jboss.org + * @since 18-Dec-2005 + */ +public class WSConfigRootJAXWS +{ + private List<WSClientConfigJAXWS> clientConfigList = new ArrayList<WSClientConfigJAXWS>(); + private List<WSEndpointConfigJAXWS> endpointConfigList = new ArrayList<WSEndpointConfigJAXWS>(); + + public List<WSClientConfigJAXWS> getClientConfig() + { + return clientConfigList; + } + + public void setClientConfig(List<WSClientConfigJAXWS> clientConfig) + { + this.clientConfigList = clientConfig; + } + + public List<WSEndpointConfigJAXWS> getEndpointConfig() + { + return endpointConfigList; + } + + public void setEndpointConfig(List<WSEndpointConfigJAXWS> endpointConfig) + { + this.endpointConfigList = endpointConfig; + } + + public WSClientConfigJAXWS getClientConfigByName(String configName) + { + WSClientConfigJAXWS config = null; + for(WSClientConfigJAXWS aux : clientConfigList) + { + if (aux.getConfigName().equals(configName)) + { + config = aux; + break; + } + } + + if (config == null && clientConfigList.size() == 1) + config = clientConfigList.get(0); + + return config; + } + + public WSEndpointConfigJAXWS getEndpointConfigByName(String configName) + { + WSEndpointConfigJAXWS config = null; + for(WSEndpointConfigJAXWS aux : endpointConfigList) + { + if (aux.getConfigName().equals(configName)) + { + config = aux; + break; + } + } + + if (config == null && endpointConfigList.size() == 1) + config = endpointConfigList.get(0); + + return config; + } +} Deleted: branches/tdiesler/trunk/src/main/java/org/jboss/ws/common/metadata/config/jaxws/WSEndpointConfigJAXWS.java =================================================================== --- branches/tdiesler/trunk/src/main/java/org/jboss/ws/core/metadata/config/jaxws/WSEndpointConfigJAXWS.java 2006-12-06 05:06:23 UTC (rev 1568) +++ branches/tdiesler/trunk/src/main/java/org/jboss/ws/common/metadata/config/jaxws/WSEndpointConfigJAXWS.java 2006-12-06 11:19:33 UTC (rev 1572) @@ -1,43 +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.metadata.config.jaxws; - -import java.util.ArrayList; -import java.util.List; - -import org.jboss.ws.common.umdm.EndpointMetaData; -import org.jboss.ws.common.umdm.HandlerMetaData; -import org.jboss.ws.common.umdm.HandlerMetaData.HandlerType; -import org.jboss.ws.core.metadata.j2ee.UnifiedHandlerMetaData; -import org.jboss.ws.core.metadata.jsr181.HandlerChainMetaData; - -// $Id$ - -/** - * A JBossWS endpoint configuration - * - * @author Thomas.Diesler(a)jboss.org - * @since 18-Dec-2005 - */ -public class WSEndpointConfigJAXWS extends WSCommonConfigJAXWS -{ -} Copied: branches/tdiesler/trunk/src/main/java/org/jboss/ws/common/metadata/config/jaxws/WSEndpointConfigJAXWS.java (from rev 1571, branches/tdiesler/trunk/src/main/java/org/jboss/ws/core/metadata/config/jaxws/WSEndpointConfigJAXWS.java) =================================================================== --- branches/tdiesler/trunk/src/main/java/org/jboss/ws/core/metadata/config/jaxws/WSEndpointConfigJAXWS.java 2006-12-06 10:47:51 UTC (rev 1571) +++ branches/tdiesler/trunk/src/main/java/org/jboss/ws/common/metadata/config/jaxws/WSEndpointConfigJAXWS.java 2006-12-06 11:19:33 UTC (rev 1572) @@ -0,0 +1,35 @@ +/* + * 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.common.metadata.config.jaxws; + + +// $Id$ + +/** + * A JBossWS endpoint configuration + * + * @author Thomas.Diesler(a)jboss.org + * @since 18-Dec-2005 + */ +public class WSEndpointConfigJAXWS extends WSCommonConfigJAXWS +{ +} Deleted: branches/tdiesler/trunk/src/main/java/org/jboss/ws/common/metadata/config/jaxws/WSHandlerChainsConfigJAXWS.java =================================================================== --- branches/tdiesler/trunk/src/main/java/org/jboss/ws/core/metadata/config/jaxws/WSHandlerChainsConfigJAXWS.java 2006-12-06 05:06:23 UTC (rev 1568) +++ branches/tdiesler/trunk/src/main/java/org/jboss/ws/common/metadata/config/jaxws/WSHandlerChainsConfigJAXWS.java 2006-12-06 11:19:33 UTC (rev 1572) @@ -1,49 +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.metadata.config.jaxws; - -import java.util.ArrayList; -import java.util.List; - -import org.jboss.ws.common.umdm.HandlerMetaData.HandlerType; -import org.jboss.ws.core.metadata.jsr181.HandlerChainMetaData; - - -/** - * A JBossWS handler chains configuration - * - * @author Thomas.Diesler(a)jboss.org - * @since 18-Dec-2005 - */ -public class WSHandlerChainsConfigJAXWS -{ - private List<HandlerChainMetaData> chains = new ArrayList<HandlerChainMetaData>(); - - public WSHandlerChainsConfigJAXWS() - { - } - - public List<HandlerChainMetaData> getHandlerChains() - { - return chains; - } -} Copied: branches/tdiesler/trunk/src/main/java/org/jboss/ws/common/metadata/config/jaxws/WSHandlerChainsConfigJAXWS.java (from rev 1571, branches/tdiesler/trunk/src/main/java/org/jboss/ws/core/metadata/config/jaxws/WSHandlerChainsConfigJAXWS.java) =================================================================== --- branches/tdiesler/trunk/src/main/java/org/jboss/ws/core/metadata/config/jaxws/WSHandlerChainsConfigJAXWS.java 2006-12-06 10:47:51 UTC (rev 1571) +++ branches/tdiesler/trunk/src/main/java/org/jboss/ws/common/metadata/config/jaxws/WSHandlerChainsConfigJAXWS.java 2006-12-06 11:19:33 UTC (rev 1572) @@ -0,0 +1,48 @@ +/* + * 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.common.metadata.config.jaxws; + +import java.util.ArrayList; +import java.util.List; + +import org.jboss.ws.common.metadata.jsr181.HandlerChainMetaData; + + +/** + * A JBossWS handler chains configuration + * + * @author Thomas.Diesler(a)jboss.org + * @since 18-Dec-2005 + */ +public class WSHandlerChainsConfigJAXWS +{ + private List<HandlerChainMetaData> chains = new ArrayList<HandlerChainMetaData>(); + + public WSHandlerChainsConfigJAXWS() + { + } + + public List<HandlerChainMetaData> getHandlerChains() + { + return chains; + } +} Copied: branches/tdiesler/trunk/src/main/java/org/jboss/ws/common/metadata/j2ee (from rev 1568, branches/tdiesler/trunk/src/main/java/org/jboss/ws/core/metadata/j2ee) Deleted: branches/tdiesler/trunk/src/main/java/org/jboss/ws/common/metadata/j2ee/UnifiedApplicationMetaData.java =================================================================== --- branches/tdiesler/trunk/src/main/java/org/jboss/ws/core/metadata/j2ee/UnifiedApplicationMetaData.java 2006-12-06 05:06:23 UTC (rev 1568) +++ branches/tdiesler/trunk/src/main/java/org/jboss/ws/common/metadata/j2ee/UnifiedApplicationMetaData.java 2006-12-06 11:19:33 UTC (rev 1572) @@ -1,131 +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.metadata.j2ee; - -//$Id$ - -import java.util.ArrayList; -import java.util.Iterator; -import java.util.List; - -/** - * The container independent top level meta data from the jboss.xml and ejb-jar.xml descriptor. - * - * @author Thomas.Diesler(a)jboss.org - * @since 05-May-2006 - */ -public class UnifiedApplicationMetaData -{ - /** ArrayList<BeanMetaData> for the ejbs */ - private List<UnifiedBeanMetaData> beans = new ArrayList<UnifiedBeanMetaData>(); - /** The optional JBossWS config-name */ - private String configName; - /** The optional JBossWS config-file */ - private String configFile; - /** The web context root to use for web services */ - private String webServiceContextRoot; - /** The security-domain value assigned to the application */ - private String securityDomain; - /** A HashMap<String, String> for webservice description publish locations */ - private PublishLocationAdapter publishLocationAdapter; - - public UnifiedBeanMetaData getBeanByEjbName(String ejbName) - { - for (UnifiedBeanMetaData beanMetaData : beans) - { - if (beanMetaData.getEjbName().equals(ejbName)) - { - return beanMetaData; - } - } - return null; - } - - public Iterator<UnifiedBeanMetaData> getEnterpriseBeans() - { - return beans.iterator(); - } - - public void setEnterpriseBeans(List<UnifiedBeanMetaData> beans) - { - this.beans = beans; - } - - public String getConfigName() - { - return configName; - } - - public void setConfigName(String configName) - { - this.configName = configName; - } - - public String getConfigFile() - { - return configFile; - } - - public void setConfigFile(String configFile) - { - this.configFile = configFile; - } - - public String getWebServiceContextRoot() - { - return webServiceContextRoot; - } - - public void setWebServiceContextRoot(String contextRoot) - { - this.webServiceContextRoot = contextRoot; - } - - public String getSecurityDomain() - { - return securityDomain; - } - - public void setSecurityDomain(String securityDomain) - { - this.securityDomain = securityDomain; - } - - public void setPublishLocationAdapter(PublishLocationAdapter publishLocationAdapter) - { - this.publishLocationAdapter = publishLocationAdapter; - } - - public String getWsdlPublishLocationByName(String name) - { - String publishLocation = null; - if (publishLocationAdapter != null) - publishLocation = publishLocationAdapter.getWsdlPublishLocationByName(name); - return publishLocation; - - } - - public interface PublishLocationAdapter - { - String getWsdlPublishLocationByName(String name); - } -} Copied: branches/tdiesler/trunk/src/main/java/org/jboss/ws/common/metadata/j2ee/UnifiedApplicationMetaData.java (from rev 1571, branches/tdiesler/trunk/src/main/java/org/jboss/ws/core/metadata/j2ee/UnifiedApplicationMetaData.java) =================================================================== --- branches/tdiesler/trunk/src/main/java/org/jboss/ws/core/metadata/j2ee/UnifiedApplicationMetaData.java 2006-12-06 10:47:51 UTC (rev 1571) +++ branches/tdiesler/trunk/src/main/java/org/jboss/ws/common/metadata/j2ee/UnifiedApplicationMetaData.java 2006-12-06 11:19:33 UTC (rev 1572) @@ -0,0 +1,131 @@ +/* + * 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.common.metadata.j2ee; + +//$Id$ + +import java.util.ArrayList; +import java.util.Iterator; +import java.util.List; + +/** + * The container independent top level meta data from the jboss.xml and ejb-jar.xml descriptor. + * + * @author Thomas.Diesler(a)jboss.org + * @since 05-May-2006 + */ +public class UnifiedApplicationMetaData +{ + /** ArrayList<BeanMetaData> for the ejbs */ + private List<UnifiedBeanMetaData> beans = new ArrayList<UnifiedBeanMetaData>(); + /** The optional JBossWS config-name */ + private String configName; + /** The optional JBossWS config-file */ + private String configFile; + /** The web context root to use for web services */ + private String webServiceContextRoot; + /** The security-domain value assigned to the application */ + private String securityDomain; + /** A HashMap<String, String> for webservice description publish locations */ + private PublishLocationAdapter publishLocationAdapter; + + public UnifiedBeanMetaData getBeanByEjbName(String ejbName) + { + for (UnifiedBeanMetaData beanMetaData : beans) + { + if (beanMetaData.getEjbName().equals(ejbName)) + { + return beanMetaData; + } + } + return null; + } + + public Iterator<UnifiedBeanMetaData> getEnterpriseBeans() + { + return beans.iterator(); + } + + public void setEnterpriseBeans(List<UnifiedBeanMetaData> beans) + { + this.beans = beans; + } + + public String getConfigName() + { + return configName; + } + + public void setConfigName(String configName) + { + this.configName = configName; + } + + public String getConfigFile() + { + return configFile; + } + + public void setConfigFile(String configFile) + { + this.configFile = configFile; + } + + public String getWebServiceContextRoot() + { + return webServiceContextRoot; + } + + public void setWebServiceContextRoot(String contextRoot) + { + this.webServiceContextRoot = contextRoot; + } + + public String getSecurityDomain() + { + return securityDomain; + } + + public void setSecurityDomain(String securityDomain) + { + this.securityDomain = securityDomain; + } + + public void setPublishLocationAdapter(PublishLocationAdapter publishLocationAdapter) + { + this.publishLocationAdapter = publishLocationAdapter; + } + + public String getWsdlPublishLocationByName(String name) + { + String publishLocation = null; + if (publishLocationAdapter != null) + publishLocation = publishLocationAdapter.getWsdlPublishLocationByName(name); + return publishLocation; + + } + + public interface PublishLocationAdapter + { + String getWsdlPublishLocationByName(String name); + } +} Deleted: branches/tdiesler/trunk/src/main/java/org/jboss/ws/common/metadata/j2ee/UnifiedBeanMetaData.java =================================================================== --- branches/tdiesler/trunk/src/main/java/org/jboss/ws/core/metadata/j2ee/UnifiedBeanMetaData.java 2006-12-06 05:06:23 UTC (rev 1568) +++ branches/tdiesler/trunk/src/main/java/org/jboss/ws/common/metadata/j2ee/UnifiedBeanMetaData.java 2006-12-06 11:19:33 UTC (rev 1572) @@ -1,138 +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.metadata.j2ee; - -//$Id$ - -/** - * The container independent common meta data class for the entity, message-driven and session beans. - * - * @author Thomas.Diesler(a)jboss.org - * @since 05-May-2006 - */ -public class UnifiedBeanMetaData -{ - /** The ejb-name element specifies an enterprise bean's name. */ - private String ejbName; - /** The ejb-class element contains the fully-qualified name of the enterprise bean's class. */ - private String ejbClass; - /** The home element contains the fully-qualified name of the enterprise - bean's home interface. */ - private String homeClass; - /** The local-home element contains the fully-qualified name of the - enterprise bean's local home interface. */ - private String localHomeClass; - /** The service-endpoint element contains the fully-qualified name of the beans service endpoint interface (SEI) */ - protected String seiName; - /** The JNDI name under with the home interface should be bound */ - private String jndiName; - /** The JNDI name under with the local home interface should be bound */ - private String localJndiName; - /** The jboss port-component binding for a ejb webservice */ - protected UnifiedEjbPortComponentMetaData portComponent; - - public String getEjbName() - { - return ejbName; - } - - public void setEjbName(String ejbName) - { - this.ejbName = ejbName; - } - - public String getEjbClass() - { - return ejbClass; - } - - public void setEjbClass(String ejbClass) - { - this.ejbClass = ejbClass; - } - - public UnifiedEjbPortComponentMetaData getPortComponent() - { - return portComponent; - } - - public void setPortComponent(UnifiedEjbPortComponentMetaData portComponent) - { - this.portComponent = portComponent; - } - - public String getServiceEndpoint() - { - return seiName; - } - - public void setServiceEndpoint(String seiName) - { - this.seiName = seiName; - } - - public String getContainerObjectNameJndiName() - { - return getHome() != null ? getJndiName() : getLocalJndiName(); - } - - public String getHome() - { - return homeClass; - } - - public void setHome(String homeClass) - { - this.homeClass = homeClass; - } - - public String getJndiName() - { - return jndiName; - } - - public void setJndiName(String jndiName) - { - this.jndiName = jndiName; - } - - public String getLocalHome() - { - return localHomeClass; - } - - public void setLocalHome(String localHomeClass) - { - this.localHomeClass = localHomeClass; - } - - public String getLocalJndiName() - { - return localJndiName; - } - - public void setLocalJndiName(String localJndiName) - { - this.localJndiName = localJndiName; - } - -} Copied: branches/tdiesler/trunk/src/main/java/org/jboss/ws/common/metadata/j2ee/UnifiedBeanMetaData.java (from rev 1571, branches/tdiesler/trunk/src/main/java/org/jboss/ws/core/metadata/j2ee/UnifiedBeanMetaData.java) =================================================================== --- branches/tdiesler/trunk/src/main/java/org/jboss/ws/core/metadata/j2ee/UnifiedBeanMetaData.java 2006-12-06 10:47:51 UTC (rev 1571) +++ branches/tdiesler/trunk/src/main/java/org/jboss/ws/common/metadata/j2ee/UnifiedBeanMetaData.java 2006-12-06 11:19:33 UTC (rev 1572) @@ -0,0 +1,138 @@ +/* + * 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.common.metadata.j2ee; + +//$Id$ + +/** + * The container independent common meta data class for the entity, message-driven and session beans. + * + * @author Thomas.Diesler(a)jboss.org + * @since 05-May-2006 + */ +public class UnifiedBeanMetaData +{ + /** The ejb-name element specifies an enterprise bean's name. */ + private String ejbName; + /** The ejb-class element contains the fully-qualified name of the enterprise bean's class. */ + private String ejbClass; + /** The home element contains the fully-qualified name of the enterprise + bean's home interface. */ + private String homeClass; + /** The local-home element contains the fully-qualified name of the + enterprise bean's local home interface. */ + private String localHomeClass; + /** The service-endpoint element contains the fully-qualified name of the beans service endpoint interface (SEI) */ + protected String seiName; + /** The JNDI name under with the home interface should be bound */ + private String jndiName; + /** The JNDI name under with the local home interface should be bound */ + private String localJndiName; + /** The jboss port-component binding for a ejb webservice */ + protected UnifiedEjbPortComponentMetaData portComponent; + + public String getEjbName() + { + return ejbName; + } + + public void setEjbName(String ejbName) + { + this.ejbName = ejbName; + } + + public String getEjbClass() + { + return ejbClass; + } + + public void setEjbClass(String ejbClass) + { + this.ejbClass = ejbClass; + } + + public UnifiedEjbPortComponentMetaData getPortComponent() + { + return portComponent; + } + + public void setPortComponent(UnifiedEjbPortComponentMetaData portComponent) + { + this.portComponent = portComponent; + } + + public String getServiceEndpoint() + { + return seiName; + } + + public void setServiceEndpoint(String seiName) + { + this.seiName = seiName; + } + + public String getContainerObjectNameJndiName() + { + return getHome() != null ? getJndiName() : getLocalJndiName(); + } + + public String getHome() + { + return homeClass; + } + + public void setHome(String homeClass) + { + this.homeClass = homeClass; + } + + public String getJndiName() + { + return jndiName; + } + + public void setJndiName(String jndiName) + { + this.jndiName = jndiName; + } + + public String getLocalHome() + { + return localHomeClass; + } + + public void setLocalHome(String localHomeClass) + { + this.localHomeClass = localHomeClass; + } + + public String getLocalJndiName() + { + return localJndiName; + } + + public void setLocalJndiName(String localJndiName) + { + this.localJndiName = localJndiName; + } + +} Deleted: branches/tdiesler/trunk/src/main/java/org/jboss/ws/common/metadata/j2ee/UnifiedEjbPortComponentMetaData.java =================================================================== --- branches/tdiesler/trunk/src/main/java/org/jboss/ws/core/metadata/j2ee/UnifiedEjbPortComponentMetaData.java 2006-12-06 05:06:23 UTC (rev 1568) +++ branches/tdiesler/trunk/src/main/java/org/jboss/ws/common/metadata/j2ee/UnifiedEjbPortComponentMetaData.java 2006-12-06 11:19:33 UTC (rev 1572) @@ -1,90 +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.metadata.j2ee; - - -//$Id$ - - -/** - * The container independent metadata for session/port-component element from jboss.xml - * - * @author Thomas.Diesler(a)jboss.org - * @since 05-May-2006 - */ -public class UnifiedEjbPortComponentMetaData -{ - private String portComponentName; - private String portComponentURI; - private String authMethod; - private String transportGuarantee; - - public String getPortComponentName() - { - return portComponentName; - } - - public void setPortComponentName(String portComponentName) - { - this.portComponentName = portComponentName; - } - - public String getPortComponentURI() - { - return portComponentURI; - } - - public void setPortComponentURI(String portComponentURI) - { - this.portComponentURI = portComponentURI; - } - - public String getURLPattern() - { - String pattern = "/*"; - if (portComponentURI != null) - { - return portComponentURI; - } - return pattern; - } - - public String getAuthMethod() - { - return authMethod; - } - - public void setAuthMethod(String authMethod) - { - this.authMethod = authMethod; - } - - public String getTransportGuarantee() - { - return transportGuarantee; - } - - public void setTransportGuarantee(String transportGuarantee) - { - this.transportGuarantee = transportGuarantee; - } -} Copied: branches/tdiesler/trunk/src/main/java/org/jboss/ws/common/metadata/j2ee/UnifiedEjbPortComponentMetaData.java (from rev 1571, branches/tdiesler/trunk/src/main/java/org/jboss/ws/core/metadata/j2ee/UnifiedEjbPortComponentMetaData.java) =================================================================== --- branches/tdiesler/trunk/src/main/java/org/jboss/ws/core/metadata/j2ee/UnifiedEjbPortComponentMetaData.java 2006-12-06 10:47:51 UTC (rev 1571) +++ branches/tdiesler/trunk/src/main/java/org/jboss/ws/common/metadata/j2ee/UnifiedEjbPortComponentMetaData.java 2006-12-06 11:19:33 UTC (rev 1572) @@ -0,0 +1,90 @@ +/* + * 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.common.metadata.j2ee; + + +//$Id$ + + +/** + * The container independent metadata for session/port-component element from jboss.xml + * + * @author Thomas.Diesler(a)jboss.org + * @since 05-May-2006 + */ +public class UnifiedEjbPortComponentMetaData +{ + private String portComponentName; + private String portComponentURI; + private String authMethod; + private String transportGuarantee; + + public String getPortComponentName() + { + return portComponentName; + } + + public void setPortComponentName(String portComponentName) + { + this.portComponentName = portComponentName; + } + + public String getPortComponentURI() + { + return portComponentURI; + } + + public void setPortComponentURI(String portComponentURI) + { + this.portComponentURI = portComponentURI; + } + + public String getURLPattern() + { + String pattern = "/*"; + if (portComponentURI != null) + { + return portComponentURI; + } + return pattern; + } + + public String getAuthMethod() + { + return authMethod; + } + + public void setAuthMethod(String authMethod) + { + this.authMethod = authMethod; + } + + public String getTransportGuarantee() + { + return transportGuarantee; + } + + public void setTransportGuarantee(String transportGuarantee) + { + this.transportGuarantee = transportGuarantee; + } +} Deleted: branches/tdiesler/trunk/src/main/java/org/jboss/ws/common/metadata/j2ee/UnifiedHandlerMetaData.java =================================================================== --- branches/tdiesler/trunk/src/main/java/org/jboss/ws/core/metadata/j2ee/UnifiedHandlerMetaData.java 2006-12-06 05:06:23 UTC (rev 1568) +++ branches/tdiesler/trunk/src/main/java/org/jboss/ws/common/metadata/j2ee/UnifiedHandlerMetaData.java 2006-12-06 11:19:33 UTC (rev 1572) @@ -1,183 +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.metadata.j2ee; - -//$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.common.umdm.EndpointMetaData; -import org.jboss.ws.common.umdm.HandlerMetaDataJAXRPC; -import org.jboss.ws.common.umdm.HandlerMetaDataJAXWS; -import org.jboss.ws.common.umdm.HandlerMetaData.HandlerInitParam; -import org.jboss.ws.common.umdm.HandlerMetaData.HandlerType; -import org.jboss.ws.core.metadata.jsr181.HandlerChainMetaData; - -/** - * The container independent metdata data for a handler element - * - * @author Thomas.Diesler(a)jboss.org - * @since 05-May-2006 - */ -public class UnifiedHandlerMetaData implements Serializable -{ - private static final long serialVersionUID = -3019416564080333900L; - - private HandlerChainMetaData chainConfig; - - // The required <handler-name> element - private String handlerName; - // The required <handler-class> element - private String handlerClass; - // The optional <init-param> elements - private ArrayList<HandlerInitParam> initParams = new ArrayList<HandlerInitParam>(); - // 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 - private Set<String> portNames = new HashSet<String>(); - - public UnifiedHandlerMetaData(HandlerChainMetaData handlerChainMetaData) - { - this.chainConfig = handlerChainMetaData; - } - - 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(HandlerInitParam param) - { - initParams.add(param); - } - - public List<HandlerInitParam> getInitParams() - { - return initParams; - } - - public void addSoapRole(String value) - { - soapRoles.add(value); - } - - public Set<String> getSoapRoles() - { - return soapRoles; - } - - public void addSoapHeader(QName qName) - { - soapHeaders.add(qName); - } - - public Set<QName> getSoapHeaders() - { - return soapHeaders; - } - - public String getProtocolBindings() - { - return (chainConfig != null ? chainConfig.getProtocolBindings() : null); - } - - public QName getServiceNamePattern() - { - return (chainConfig != null ? chainConfig.getServiceNamePattern() : null); - } - - public QName getPortNamePattern() - { - return (chainConfig != null ? chainConfig.getPortNamePattern() : null); - } - - public void addPortName(String portName) - { - portNames.add(portName); - } - - public Set<String> getPortNames() - { - return portNames; - } - - 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()); - hmd.setProtocolBindings(getProtocolBindings()); - hmd.setServiceNamePattern(getServiceNamePattern()); - hmd.setPortNamePattern(getPortNamePattern()); - return hmd; - } - - public String toString() - { - StringBuffer buffer = new StringBuffer("\nUnifiedHandlerMetaData:"); - buffer.append("\n name=" + getHandlerName()); - buffer.append("\n class=" + getHandlerClass()); - buffer.append("\n params=" + getInitParams()); - buffer.append("\n headers=" + getSoapHeaders()); - buffer.append("\n roles=" + getSoapRoles()); - buffer.append("\n protocols=" + getProtocolBindings()); - buffer.append("\n services=" + getServiceNamePattern()); - buffer.append("\n ports=" + (getPortNamePattern() != null ? getPortNamePattern() : portNames)); - return buffer.toString(); - } -} Copied: branches/tdiesler/trunk/src/main/java/org/jboss/ws/common/metadata/j2ee/UnifiedHandlerMetaData.java (from rev 1571, branches/tdiesler/trunk/src/main/java/org/jboss/ws/core/metadata/j2ee/UnifiedHandlerMetaData.java) =================================================================== --- branches/tdiesler/trunk/src/main/java/org/jboss/ws/core/metadata/j2ee/UnifiedHandlerMetaData.java 2006-12-06 10:47:51 UTC (rev 1571) +++ branches/tdiesler/trunk/src/main/java/org/jboss/ws/common/metadata/j2ee/UnifiedHandlerMetaData.java 2006-12-06 11:19:33 UTC (rev 1572) @@ -0,0 +1,183 @@ +/* + * 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.common.metadata.j2ee; + +//$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.common.metadata.jsr181.HandlerChainMetaData; +import org.jboss.ws.common.umdm.EndpointMetaData; +import org.jboss.ws.common.umdm.HandlerMetaDataJAXRPC; +import org.jboss.ws.common.umdm.HandlerMetaDataJAXWS; +import org.jboss.ws.common.umdm.HandlerMetaData.HandlerInitParam; +import org.jboss.ws.common.umdm.HandlerMetaData.HandlerType; + +/** + * The container independent metdata data for a handler element + * + * @author Thomas.Diesler(a)jboss.org + * @since 05-May-2006 + */ +public class UnifiedHandlerMetaData implements Serializable +{ + private static final long serialVersionUID = -3019416564080333900L; + + private HandlerChainMetaData chainConfig; + + // The required <handler-name> element + private String handlerName; + // The required <handler-class> element + private String handlerClass; + // The optional <init-param> elements + private ArrayList<HandlerInitParam> initParams = new ArrayList<HandlerInitParam>(); + // 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 + private Set<String> portNames = new HashSet<String>(); + + public UnifiedHandlerMetaData(HandlerChainMetaData handlerChainMetaData) + { + this.chainConfig = handlerChainMetaData; + } + + 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(HandlerInitParam param) + { + initParams.add(param); + } + + public List<HandlerInitParam> getInitParams() + { + return initParams; + } + + public void addSoapRole(String value) + { + soapRoles.add(value); + } + + public Set<String> getSoapRoles() + { + return soapRoles; + } + + public void addSoapHeader(QName qName) + { + soapHeaders.add(qName); + } + + public Set<QName> getSoapHeaders() + { + return soapHeaders; + } + + public String getProtocolBindings() + { + return (chainConfig != null ? chainConfig.getProtocolBindings() : null); + } + + public QName getServiceNamePattern() + { + return (chainConfig != null ? chainConfig.getServiceNamePattern() : null); + } + + public QName getPortNamePattern() + { + return (chainConfig != null ? chainConfig.getPortNamePattern() : null); + } + + public void addPortName(String portName) + { + portNames.add(portName); + } + + public Set<String> getPortNames() + { + return portNames; + } + + 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()); + hmd.setProtocolBindings(getProtocolBindings()); + hmd.setServiceNamePattern(getServiceNamePattern()); + hmd.setPortNamePattern(getPortNamePattern()); + return hmd; + } + + public String toString() + { + StringBuffer buffer = new StringBuffer("\nUnifiedHandlerMetaData:"); + buffer.append("\n name=" + getHandlerName()); + buffer.append("\n class=" + getHandlerClass()); + buffer.append("\n params=" + getInitParams()); + buffer.append("\n headers=" + getSoapHeaders()); + buffer.append("\n roles=" + getSoapRoles()); + buffer.append("\n protocols=" + getProtocolBindings()); + buffer.append("\n services=" + getServiceNamePattern()); + buffer.append("\n ports=" + (getPortNamePattern() != null ? getPortNamePattern() : portNames)); + return buffer.toString(); + } +} Deleted: branches/tdiesler/trunk/src/main/java/org/jboss/ws/common/metadata/j2ee/UnifiedMessageDrivenMetaData.java =================================================================== --- branches/tdiesler/trunk/src/main/java/org/jboss/ws/core/metadata/j2ee/UnifiedMessageDrivenMetaData.java 2006-12-06 05:06:23 UTC (rev 1568) +++ branches/tdiesler/trunk/src/main/java/org/jboss/ws/common/metadata/j2ee/UnifiedMessageDrivenMetaData.java 2006-12-06 11:19:33 UTC (rev 1572) @@ -1,47 +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.metadata.j2ee; - - -// $Id$ - - -/** - * The container independent metadata of a message driven bean. - * - * @author Thomas.Diesler(a)jboss.org - * @since 05-May-2006 - */ -public class UnifiedMessageDrivenMetaData extends UnifiedBeanMetaData -{ - private String destinationJndiName; - - public String getDestinationJndiName() - { - return destinationJndiName; - } - - public void setDestinationJndiName(String destinationJndiName) - { - this.destinationJndiName = destinationJndiName; - } -} Copied: branches/tdiesler/trunk/src/main/java/org/jboss/ws/common/metadata/j2ee/UnifiedMessageDrivenMetaData.java (from rev 1571, branches/tdiesler/trunk/src/main/java/org/jboss/ws/core/metadata/j2ee/UnifiedMessageDrivenMetaData.java) =================================================================== --- branches/tdiesler/trunk/src/main/java/org/jboss/ws/core/metadata/j2ee/UnifiedMessageDrivenMetaData.java 2006-12-06 10:47:51 UTC (rev 1571) +++ branches/tdiesler/trunk/src/main/java/org/jboss/ws/common/metadata/j2ee/UnifiedMessageDrivenMetaData.java 2006-12-06 11:19:33 UTC (rev 1572) @@ -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.common.metadata.j2ee; + + +// $Id$ + + +/** + * The container independent metadata of a message driven bean. + * + * @author Thomas.Diesler(a)jboss.org + * @since 05-May-2006 + */ +public class UnifiedMessageDrivenMetaData extends UnifiedBeanMetaData +{ + private String destinationJndiName; + + public String getDestinationJndiName() + { + return destinationJndiName; + } + + public void setDestinationJndiName(String destinationJndiName) + { + this.destinationJndiName = destinationJndiName; + } +} Deleted: branches/tdiesler/trunk/src/main/java/org/jboss/ws/common/metadata/j2ee/UnifiedPortComponentRefMetaData.java =================================================================== --- branches/tdiesler/trunk/src/main/java/org/jboss/ws/core/metadata/j2ee/UnifiedPortComponentRefMetaData.java 2006-12-06 05:06:23 UTC (rev 1568) +++ branches/tdiesler/trunk/src/main/java/org/jboss/ws/common/metadata/j2ee/UnifiedPortComponentRefMetaData.java 2006-12-06 11:19:33 UTC (rev 1572) @@ -1,77 +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.metadata.j2ee; - -import java.io.Serializable; -import java.util.Properties; - -//$Id$ - -/** - * The container independent metdata data from handler init params - * - * @author Thomas.Diesler(a)jboss.org - * @since 05-May-2006 - */ -public class UnifiedPortComponentRefMetaData implements Serializable -{ - private static final long serialVersionUID = -7030007637678646740L; - - // The required <service-endpoint-interface> element - private String serviceEndpointInterface; - // The optional <port-component-link> element - private String portComponentLink; - - /** Arbitrary proxy properties given by <call-property> */ - private Properties callProperties; - - 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 Properties getCallProperties() - { - return callProperties; - } - - public void setCallProperties(Properties callProperties) - { - this.callProperties = callProperties; - } - -} Copied: branches/tdiesler/trunk/src/main/java/org/jboss/ws/common/metadata/j2ee/UnifiedPortComponentRefMetaData.java (from rev 1571, branches/tdiesler/trunk/src/main/java/org/jboss/ws/core/metadata/j2ee/UnifiedPortComponentRefMetaData.java) =================================================================== --- branches/tdiesler/trunk/src/main/java/org/jboss/ws/core/metadata/j2ee/UnifiedPortComponentRefMetaData.java 2006-12-06 10:47:51 UTC (rev 1571) +++ branches/tdiesler/trunk/src/main/java/org/jboss/ws/common/metadata/j2ee/UnifiedPortComponentRefMetaData.java 2006-12-06 11:19:33 UTC (rev 1572) @@ -0,0 +1,77 @@ +/* + * 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.common.metadata.j2ee; + +import java.io.Serializable; +import java.util.Properties; + +//$Id$ + +/** + * The container independent metdata data from handler init params + * + * @author Thomas.Diesler(a)jboss.org + * @since 05-May-2006 + */ +public class UnifiedPortComponentRefMetaData implements Serializable +{ + private static final long serialVersionUID = -7030007637678646740L; + + // The required <service-endpoint-interface> element + private String serviceEndpointInterface; + // The optional <port-component-link> element + private String portComponentLink; + + /** Arbitrary proxy properties given by <call-property> */ + private Properties callProperties; + + 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 Properties getCallProperties() + { + return callProperties; + } + + public void setCallProperties(Properties callProperties) + { + this.callProperties = callProperties; + } + +} Deleted: branches/tdiesler/trunk/src/main/java/org/jboss/ws/common/metadata/j2ee/UnifiedServiceRefMetaData.java =================================================================== --- branches/tdiesler/trunk/src/main/java/org/jboss/ws/core/metadata/j2ee/UnifiedServiceRefMetaData.java 2006-12-06 05:06:23 UTC (rev 1568) +++ branches/tdiesler/trunk/src/main/java/org/jboss/ws/common/metadata/j2ee/UnifiedServiceRefMetaData.java 2006-12-06 11:19:33 UTC (rev 1572) @@ -1,258 +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.metadata.j2ee; - -//$Id$ - -import java.io.Serializable; -import java.net.URL; -import java.net.URLClassLoader; -import java.util.ArrayList; -import java.util.LinkedHashMap; -import java.util.List; -import java.util.Map; -import java.util.Properties; - -import javax.xml.namespace.QName; - - -/** - * The container independent metdata data from service-ref element in web.xml, ejb-jar.xml, and - * application-client.xml. - * - * @author Thomas.Diesler(a)jboss.org - * @since 05-May-2006 - */ -public class UnifiedServiceRefMetaData implements Serializable -{ - private static final long serialVersionUID = 122554634182144069L; - - // The required <service-ref-name> element - private String serviceRefName; - // The required <service-interface> element - private String serviceInterface; - // The optional <wsdl-file> element - private String wsdlFile; - // The optional <jaxrpc-mapping-file> element - private String jaxrpcMappingFile; - // The optional <service-qname> element - private QName serviceQName; - // The LinkedHashMap<String, UnifiedPortComponentRefMetaData> for <port-component-ref> elements - private Map<String, UnifiedPortComponentRefMetaData> portComponentRefs = new LinkedHashMap<String, UnifiedPortComponentRefMetaData>(); - // The optional <handler> elements - private List<UnifiedHandlerMetaData> handlers = new ArrayList<UnifiedHandlerMetaData>(); - - // The optional JBossWS config-name - private String configName; - // The optional JBossWS config-file - private String configFile; - /** The URL of the actual WSDL to use, <wsdl-override> */ - private URL wsdlOverride; - /** Arbitrary proxy properties given by <call-property> */ - private Properties callProperties; - - // The wsdl definition, if we have one - private Object wsdlDefinition; - // The java/wsdl mapping, if we have one - private Object javaWsdlMapping; - - //The ClassLoader to load additional resources - private transient URLClassLoader resourceCL; - - /** Set the resource classloader that can load the wsdl file - * On the client side this is set expicitly after unmarshalling. - */ - public void setResourceCL(URLClassLoader resourceCL) - { - if (resourceCL == null) - throw new IllegalArgumentException("ResourceClassLoader cannot be null"); - - this.resourceCL = resourceCL; - } - - public URLClassLoader getResourceCL() - { - if (resourceCL == null) - resourceCL = new URLClassLoader(new URL[] {}, Thread.currentThread().getContextClassLoader()); - - return resourceCL; - } - - public String getJaxrpcMappingFile() - { - return jaxrpcMappingFile; - } - - public void setJaxrpcMappingFile(String jaxrpcMappingFile) - { - this.jaxrpcMappingFile = jaxrpcMappingFile; - } - - public URL getJavaWsdlMappingURL() - { - URL mappingURL = null; - if (jaxrpcMappingFile != null) - { - mappingURL = getResourceCL().findResource(jaxrpcMappingFile); - if (mappingURL == null) - throw new IllegalStateException("Cannot find resource: " + jaxrpcMappingFile); - } - return mappingURL; - } - - public Object getJavaWsdlMapping() - { - return javaWsdlMapping; - } - - public void setJavaWsdlMapping(Object javaWsdlMapping) - { - this.javaWsdlMapping = javaWsdlMapping; - } - - public UnifiedPortComponentRefMetaData[] getPortComponentRefs() - { - UnifiedPortComponentRefMetaData[] array = new UnifiedPortComponentRefMetaData[portComponentRefs.size()]; - portComponentRefs.values().toArray(array); - return array; - } - - public void setPortComponentRefs(LinkedHashMap<String, UnifiedPortComponentRefMetaData> portComponentRefs) - { - this.portComponentRefs = portComponentRefs; - } - - public UnifiedHandlerMetaData[] getHandlers() - { - UnifiedHandlerMetaData[] array = new UnifiedHandlerMetaData[handlers.size()]; - handlers.toArray(array); - return array; - } - - public void setHandlers(ArrayList<UnifiedHandlerMetaData> handlers) - { - this.handlers = handlers; - } - - 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 getServiceRefName() - { - return serviceRefName; - } - - public void setServiceRefName(String serviceRefName) - { - this.serviceRefName = serviceRefName; - } - - public String getWsdlFile() - { - return wsdlFile; - } - - public void setWsdlFile(String wsdlFile) - { - this.wsdlFile = wsdlFile; - } - - 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(URL wsdlOverride) - { - this.wsdlOverride = wsdlOverride; - } - - public URL getWsdlURL() - { - URL wsdlURL = wsdlOverride; - if (wsdlURL == null && wsdlFile != null) - { - wsdlURL = getResourceCL().findResource(wsdlFile); - if (wsdlURL == null) - throw new IllegalStateException("Cannot find resource: " + wsdlFile); - } - return wsdlURL; - } - - public Properties getCallProperties() - { - return callProperties; - } - - public void setCallProperties(Properties callProperties) - { - this.callProperties = callProperties; - } - - public Object getWsdlDefinition() - { - return wsdlDefinition; - } - - public void setWsdlDefinition(Object wsdlDefinition) - { - this.wsdlDefinition = wsdlDefinition; - } -} Copied: branches/tdiesler/trunk/src/main/java/org/jboss/ws/common/metadata/j2ee/UnifiedServiceRefMetaData.java (from rev 1571, branches/tdiesler/trunk/src/main/java/org/jboss/ws/core/metadata/j2ee/UnifiedServiceRefMetaData.java) =================================================================== --- branches/tdiesler/trunk/src/main/java/org/jboss/ws/core/metadata/j2ee/UnifiedServiceRefMetaData.java 2006-12-06 10:47:51 UTC (rev 1571) +++ branches/tdiesler/trunk/src/main/java/org/jboss/ws/common/metadata/j2ee/UnifiedServiceRefMetaData.java 2006-12-06 11:19:33 UTC (rev 1572) @@ -0,0 +1,258 @@ +/* + * 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.common.metadata.j2ee; + +//$Id$ + +import java.io.Serializable; +import java.net.URL; +import java.net.URLClassLoader; +import java.util.ArrayList; +import java.util.LinkedHashMap; +import java.util.List; +import java.util.Map; +import java.util.Properties; + +import javax.xml.namespace.QName; + + +/** + * The container independent metdata data from service-ref element in web.xml, ejb-jar.xml, and + * application-client.xml. + * + * @author Thomas.Diesler(a)jboss.org + * @since 05-May-2006 + */ +public class UnifiedServiceRefMetaData implements Serializable +{ + private static final long serialVersionUID = 122554634182144069L; + + // The required <service-ref-name> element + private String serviceRefName; + // The required <service-interface> element + private String serviceInterface; + // The optional <wsdl-file> element + private String wsdlFile; + // The optional <jaxrpc-mapping-file> element + private String jaxrpcMappingFile; + // The optional <service-qname> element + private QName serviceQName; + // The LinkedHashMap<String, UnifiedPortComponentRefMetaData> for <port-component-ref> elements + private Map<String, UnifiedPortComponentRefMetaData> portComponentRefs = new LinkedHashMap<String, UnifiedPortComponentRefMetaData>(); + // The optional <handler> elements + private List<UnifiedHandlerMetaData> handlers = new ArrayList<UnifiedHandlerMetaData>(); + + // The optional JBossWS config-name + private String configName; + // The optional JBossWS config-file + private String configFile; + /** The URL of the actual WSDL to use, <wsdl-override> */ + private URL wsdlOverride; + /** Arbitrary proxy properties given by <call-property> */ + private Properties callProperties; + + // The wsdl definition, if we have one + private Object wsdlDefinition; + // The java/wsdl mapping, if we have one + private Object javaWsdlMapping; + + //The ClassLoader to load additional resources + private transient URLClassLoader resourceCL; + + /** Set the resource classloader that can load the wsdl file + * On the client side this is set expicitly after unmarshalling. + */ + public void setResourceCL(URLClassLoader resourceCL) + { + if (resourceCL == null) + throw new IllegalArgumentException("ResourceClassLoader cannot be null"); + + this.resourceCL = resourceCL; + } + + public URLClassLoader getResourceCL() + { + if (resourceCL == null) + resourceCL = new URLClassLoader(new URL[] {}, Thread.currentThread().getContextClassLoader()); + + return resourceCL; + } + + public String getJaxrpcMappingFile() + { + return jaxrpcMappingFile; + } + + public void setJaxrpcMappingFile(String jaxrpcMappingFile) + { + this.jaxrpcMappingFile = jaxrpcMappingFile; + } + + public URL getJavaWsdlMappingURL() + { + URL mappingURL = null; + if (jaxrpcMappingFile != null) + { + mappingURL = getResourceCL().findResource(jaxrpcMappingFile); + if (mappingURL == null) + throw new IllegalStateException("Cannot find resource: " + jaxrpcMappingFile); + } + return mappingURL; + } + + public Object getJavaWsdlMapping() + { + return javaWsdlMapping; + } + + public void setJavaWsdlMapping(Object javaWsdlMapping) + { + this.javaWsdlMapping = javaWsdlMapping; + } + + public UnifiedPortComponentRefMetaData[] getPortComponentRefs() + { + UnifiedPortComponentRefMetaData[] array = new UnifiedPortComponentRefMetaData[portComponentRefs.size()]; + portComponentRefs.values().toArray(array); + return array; + } + + public void setPortComponentRefs(LinkedHashMap<String, UnifiedPortComponentRefMetaData> portComponentRefs) + { + this.portComponentRefs = portComponentRefs; + } + + public UnifiedHandlerMetaData[] getHandlers() + { + UnifiedHandlerMetaData[] array = new UnifiedHandlerMetaData[handlers.size()]; + handlers.toArray(array); + return array; + } + + public void setHandlers(ArrayList<UnifiedHandlerMetaData> handlers) + { + this.handlers = handlers; + } + + 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 getServiceRefName() + { + return serviceRefName; + } + + public void setServiceRefName(String serviceRefName) + { + this.serviceRefName = serviceRefName; + } + + public String getWsdlFile() + { + return wsdlFile; + } + + public void setWsdlFile(String wsdlFile) + { + this.wsdlFile = wsdlFile; + } + + 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(URL wsdlOverride) + { + this.wsdlOverride = wsdlOverride; + } + + public URL getWsdlURL() + { + URL wsdlURL = wsdlOverride; + if (wsdlURL == null && wsdlFile != null) + { + wsdlURL = getResourceCL().findResource(wsdlFile); + if (wsdlURL == null) + throw new IllegalStateException("Cannot find resource: " + wsdlFile); + } + return wsdlURL; + } + + public Properties getCallProperties() + { + return callProperties; + } + + public void setCallProperties(Properties callProperties) + { + this.callProperties = callProperties; + } + + public Object getWsdlDefinition() + { + return wsdlDefinition; + } + + public void setWsdlDefinition(Object wsdlDefinition) + { + this.wsdlDefinition = wsdlDefinition; + } +} Deleted: branches/tdiesler/trunk/src/main/java/org/jboss/ws/common/metadata/j2ee/UnifiedSessionMetaData.java =================================================================== --- branches/tdiesler/trunk/src/main/java/org/jboss/ws/core/metadata/j2ee/UnifiedSessionMetaData.java 2006-12-06 05:06:23 UTC (rev 1568) +++ branches/tdiesler/trunk/src/main/java/org/jboss/ws/common/metadata/j2ee/UnifiedSessionMetaData.java 2006-12-06 11:19:33 UTC (rev 1572) @@ -1,37 +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.metadata.j2ee; - - -// $Id$ - - -/** - * The container independent metadata of a message driven bean. - * - * @author Thomas.Diesler(a)jboss.org - * @since 05-May-2006 - */ -public class UnifiedSessionMetaData extends UnifiedBeanMetaData -{ - -} Copied: branches/tdiesler/trunk/src/main/java/org/jboss/ws/common/metadata/j2ee/UnifiedSessionMetaData.java (from rev 1571, branches/tdiesler/trunk/src/main/java/org/jboss/ws/core/metadata/j2ee/UnifiedSessionMetaData.java) =================================================================== --- branches/tdiesler/trunk/src/main/java/org/jboss/ws/core/metadata/j2ee/UnifiedSessionMetaData.java 2006-12-06 10:47:51 UTC (rev 1571) +++ branches/tdiesler/trunk/src/main/java/org/jboss/ws/common/metadata/j2ee/UnifiedSessionMetaData.java 2006-12-06 11:19:33 UTC (rev 1572) @@ -0,0 +1,37 @@ +/* + * 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.common.metadata.j2ee; + + +// $Id$ + + +/** + * The container independent metadata of a message driven bean. + * + * @author Thomas.Diesler(a)jboss.org + * @since 05-May-2006 + */ +public class UnifiedSessionMetaData extends UnifiedBeanMetaData +{ + +} Deleted: branches/tdiesler/trunk/src/main/java/org/jboss/ws/common/metadata/j2ee/UnifiedWebMetaData.java =================================================================== --- branches/tdiesler/trunk/src/main/java/org/jboss/ws/core/metadata/j2ee/UnifiedWebMetaData.java 2006-12-06 05:06:23 UTC (rev 1568) +++ branches/tdiesler/trunk/src/main/java/org/jboss/ws/common/metadata/j2ee/UnifiedWebMetaData.java 2006-12-06 11:19:33 UTC (rev 1572) @@ -1,143 +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.metadata.j2ee; - -//$Id$ - -import java.util.HashMap; -import java.util.List; -import java.util.Map; - -/** - * The container independent representation of the web.xml and jboss-web.xml deployment descriptors - * - * @author Thomas.Diesler(a)jboss.org - * @since 05-May-2006 - */ -public class UnifiedWebMetaData -{ - /** The war context root as specified at the jboss-web.xml descriptor level. */ - private String contextRoot; - /** The servlet-mapping <servlet-name, url-pattern> */ - private Map<String, String> servletMappings = new HashMap<String, String>(); - /** The servlet <servlet-name, servlet-class> */ - private Map<String, String> servletClassNames = new HashMap<String, String>(); - /** The optional JBossWS config-name */ - private String configName; - /** The optional JBossWS config-file */ - private String configFile; - /** The security-domain value assigned to the application */ - private String securityDomain; - /** A HashMap<String, String> for webservice description publish locations */ - private PublishLocationAdapter publishLocationAdapter; - /** web.xml security-constraints */ - private List<UnifiedWebSecurityMetaData> securityMetaData; - - public String getContextRoot() - { - return contextRoot; - } - - public void setContextRoot(String contextRoot) - { - this.contextRoot = contextRoot; - } - - public Map<String, String> getServletMappings() - { - return servletMappings; - } - - public void setServletMappings(Map<String, String> servletMappings) - { - this.servletMappings = servletMappings; - } - - public Map<String, String> getServletClassNames() - { - return servletClassNames; - } - - public void setServletClassNames(Map<String, String> servletClassNames) - { - this.servletClassNames = servletClassNames; - } - - public String getConfigName() - { - return configName; - } - - public void setConfigName(String configName) - { - this.configName = configName; - } - - public String getConfigFile() - { - return configFile; - } - - public void setConfigFile(String configFile) - { - this.configFile = configFile; - } - - public String getSecurityDomain() - { - return securityDomain; - } - - public void setSecurityDomain(String securityDomain) - { - this.securityDomain = securityDomain; - } - - public List<UnifiedWebSecurityMetaData> getSecurityMetaData() - { - return securityMetaData; - } - - public void setSecurityMetaData(List<UnifiedWebSecurityMetaData> securityMetaData) - { - this.securityMetaData = securityMetaData; - } - - public void setPublishLocationAdapter(PublishLocationAdapter publishLocationAdapter) - { - this.publishLocationAdapter = publishLocationAdapter; - } - - public String getWsdlPublishLocationByName(String name) - { - String publishLocation = null; - if (publishLocationAdapter != null) - publishLocation = publishLocationAdapter.getWsdlPublishLocationByName(name); - return publishLocation; - - } - - public interface PublishLocationAdapter - { - String getWsdlPublishLocationByName(String name); - } -} Copied: branches/tdiesler/trunk/src/main/java/org/jboss/ws/common/metadata/j2ee/UnifiedWebMetaData.java (from rev 1571, branches/tdiesler/trunk/src/main/java/org/jboss/ws/core/metadata/j2ee/UnifiedWebMetaData.java) =================================================================== --- branches/tdiesler/trunk/src/main/java/org/jboss/ws/core/metadata/j2ee/UnifiedWebMetaData.java 2006-12-06 10:47:51 UTC (rev 1571) +++ branches/tdiesler/trunk/src/main/java/org/jboss/ws/common/metadata/j2ee/UnifiedWebMetaData.java 2006-12-06 11:19:33 UTC (rev 1572) @@ -0,0 +1,143 @@ +/* + * 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.common.metadata.j2ee; + +//$Id$ + +import java.util.HashMap; +import java.util.List; +import java.util.Map; + +/** + * The container independent representation of the web.xml and jboss-web.xml deployment descriptors + * + * @author Thomas.Diesler(a)jboss.org + * @since 05-May-2006 + */ +public class UnifiedWebMetaData +{ + /** The war context root as specified at the jboss-web.xml descriptor level. */ + private String contextRoot; + /** The servlet-mapping <servlet-name, url-pattern> */ + private Map<String, String> servletMappings = new HashMap<String, String>(); + /** The servlet <servlet-name, servlet-class> */ + private Map<String, String> servletClassNames = new HashMap<String, String>(); + /** The optional JBossWS config-name */ + private String configName; + /** The optional JBossWS config-file */ + private String configFile; + /** The security-domain value assigned to the application */ + private String securityDomain; + /** A HashMap<String, String> for webservice description publish locations */ + private PublishLocationAdapter publishLocationAdapter; + /** web.xml security-constraints */ + private List<UnifiedWebSecurityMetaData> securityMetaData; + + public String getContextRoot() + { + return contextRoot; + } + + public void setContextRoot(String contextRoot) + { + this.contextRoot = contextRoot; + } + + public Map<String, String> getServletMappings() + { + return servletMappings; + } + + public void setServletMappings(Map<String, String> servletMappings) + { + this.servletMappings = servletMappings; + } + + public Map<String, String> getServletClassNames() + { + return servletClassNames; + } + + public void setServletClassNames(Map<String, String> servletClassNames) + { + this.servletClassNames = servletClassNames; + } + + public String getConfigName() + { + return configName; + } + + public void setConfigName(String configName) + { + this.configName = configName; + } + + public String getConfigFile() + { + return configFile; + } + + public void setConfigFile(String configFile) + { + this.configFile = configFile; + } + + public String getSecurityDomain() + { + return securityDomain; + } + + public void setSecurityDomain(String securityDomain) + { + this.securityDomain = securityDomain; + } + + public List<UnifiedWebSecurityMetaData> getSecurityMetaData() + { + return securityMetaData; + } + + public void setSecurityMetaData(List<UnifiedWebSecurityMetaData> securityMetaData) + { + this.securityMetaData = securityMetaData; + } + + public void setPublishLocationAdapter(PublishLocationAdapter publishLocationAdapter) + { + this.publishLocationAdapter = publishLocationAdapter; + } + + public String getWsdlPublishLocationByName(String name) + { + String publishLocation = null; + if (publishLocationAdapter != null) + publishLocation = publishLocationAdapter.getWsdlPublishLocationByName(name); + return publishLocation; + + } + + public interface PublishLocationAdapter + { + String getWsdlPublishLocationByName(String name); + } +} Deleted: branches/tdiesler/trunk/src/main/java/org/jboss/ws/common/metadata/j2ee/UnifiedWebSecurityMetaData.java =================================================================== --- branches/tdiesler/trunk/src/main/java/org/jboss/ws/core/metadata/j2ee/UnifiedWebSecurityMetaData.java 2006-12-06 05:06:23 UTC (rev 1568) +++ branches/tdiesler/trunk/src/main/java/org/jboss/ws/common/metadata/j2ee/UnifiedWebSecurityMetaData.java 2006-12-06 11:19:33 UTC (rev 1572) @@ -1,95 +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.metadata.j2ee; - -import java.util.Collection; -import java.util.HashMap; -import java.util.HashSet; - -/** - * - * @author darran.lofthouse(a)jboss.com - * @since Oct 22, 2006 - */ -public class UnifiedWebSecurityMetaData -{ - - /** The optional security-constraint/user-data-constraint/transport-guarantee */ - private String transportGuarantee; - - /** - * The HashMap for the security-constraint/web-resource-collection - * elements. - */ - private HashMap<String, UnifiedWebResourceCollection> webResources = new HashMap<String, UnifiedWebResourceCollection>(); - - public UnifiedWebResourceCollection addWebResource(final String name) - { - UnifiedWebResourceCollection wrc = new UnifiedWebResourceCollection(name); - webResources.put(name, wrc); - - return wrc; - } - - public Collection<UnifiedWebResourceCollection> getWebResources() - { - return webResources.values(); - } - - public String getTransportGuarantee() - { - return transportGuarantee; - } - - public void setTransportGuarantee(String transportGuarantee) - { - this.transportGuarantee = transportGuarantee; - } - - public static class UnifiedWebResourceCollection - { - private String name; - /** The required url-pattern element(s) */ - private HashSet<String> urlPatterns = new HashSet<String>(); - - public UnifiedWebResourceCollection(final String name) - { - this.name = name; - } - - public String getName() - { - return name; - } - - public void addPattern(String pattern) - { - urlPatterns.add(pattern); - } - - public HashSet<String> getUrlPatterns() - { - return urlPatterns; - } - } - -} Copied: branches/tdiesler/trunk/src/main/java/org/jboss/ws/common/metadata/j2ee/UnifiedWebSecurityMetaData.java (from rev 1571, branches/tdiesler/trunk/src/main/java/org/jboss/ws/core/metadata/j2ee/UnifiedWebSecurityMetaData.java) =================================================================== --- branches/tdiesler/trunk/src/main/java/org/jboss/ws/core/metadata/j2ee/UnifiedWebSecurityMetaData.java 2006-12-06 10:47:51 UTC (rev 1571) +++ branches/tdiesler/trunk/src/main/java/org/jboss/ws/common/metadata/j2ee/UnifiedWebSecurityMetaData.java 2006-12-06 11:19:33 UTC (rev 1572) @@ -0,0 +1,95 @@ +/* + * 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.common.metadata.j2ee; + +import java.util.Collection; +import java.util.HashMap; +import java.util.HashSet; + +/** + * + * @author darran.lofthouse(a)jboss.com + * @since Oct 22, 2006 + */ +public class UnifiedWebSecurityMetaData +{ + + /** The optional security-constraint/user-data-constraint/transport-guarantee */ + private String transportGuarantee; + + /** + * The HashMap for the security-constraint/web-resource-collection + * elements. + */ + private HashMap<String, UnifiedWebResourceCollection> webResources = new HashMap<String, UnifiedWebResourceCollection>(); + + public UnifiedWebResourceCollection addWebResource(final String name) + { + UnifiedWebResourceCollection wrc = new UnifiedWebResourceCollection(name); + webResources.put(name, wrc); + + return wrc; + } + + public Collection<UnifiedWebResourceCollection> getWebResources() + { + return webResources.values(); + } + + public String getTransportGuarantee() + { + return transportGuarantee; + } + + public void setTransportGuarantee(String transportGuarantee) + { + this.transportGuarantee = transportGuarantee; + } + + public static class UnifiedWebResourceCollection + { + private String name; + /** The required url-pattern element(s) */ + private HashSet<String> urlPatterns = new HashSet<String>(); + + public UnifiedWebResourceCollection(final String name) + { + this.name = name; + } + + public String getName() + { + return name; + } + + public void addPattern(String pattern) + { + urlPatterns.add(pattern); + } + + public HashSet<String> getUrlPatterns() + { + return urlPatterns; + } + } + +} Copied: branches/tdiesler/trunk/src/main/java/org/jboss/ws/common/metadata/jsr181 (from rev 1568, branches/tdiesler/trunk/src/main/java/org/jboss/ws/core/metadata/jsr181) Deleted: branches/tdiesler/trunk/src/main/java/org/jboss/ws/common/metadata/jsr181/HandlerChainFactory.java =================================================================== --- branches/tdiesler/trunk/src/main/java/org/jboss/ws/core/metadata/jsr181/HandlerChainFactory.java 2006-12-06 05:06:23 UTC (rev 1568) +++ branches/tdiesler/trunk/src/main/java/org/jboss/ws/common/metadata/jsr181/HandlerChainFactory.java 2006-12-06 11:19:33 UTC (rev 1572) @@ -1,164 +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.metadata.jsr181; - -// $Id$ - -import org.jboss.logging.Logger; -import org.jboss.ws.common.umdm.HandlerMetaData.HandlerInitParam; -import org.jboss.ws.common.umdm.HandlerMetaData.HandlerType; -import org.jboss.ws.core.metadata.j2ee.UnifiedHandlerMetaData; -import org.jboss.xb.binding.ObjectModelFactory; -import org.jboss.xb.binding.UnmarshallingContext; -import org.xml.sax.Attributes; - -/** - * A JBossXB factory for jsr181 the HandlerChain annotation - * - * @author Thomas.Diesler(a)jboss.org - * @since 15-Oct-2005 - */ -public class HandlerChainFactory implements ObjectModelFactory -{ - // provide logging - private static final Logger log = Logger.getLogger(HandlerChainFactory.class); - - public HandlerChainFactory() - { - } - - /** - * This method is called on the factory by the object model builder when the parsing starts. - * - * @return the root of the object model. - */ - public Object newRoot(Object root, UnmarshallingContext navigator, String namespaceURI, String localName, Attributes attrs) - { - HandlerChainsMetaData handlerConfigMetaData = new HandlerChainsMetaData(HandlerType.ENDPOINT); - return handlerConfigMetaData; - } - - public Object completeRoot(Object root, UnmarshallingContext ctx, String uri, String name) - { - return root; - } - - /** - * Called when parsing of a new element started. - */ - public Object newChild(HandlerChainsMetaData handlerConfig, UnmarshallingContext navigator, String namespaceURI, String localName, Attributes attrs) - { - if ("handler-chain".equals(localName)) - return new HandlerChainMetaData(handlerConfig); - else - return null; - } - - /** - * Called when parsing character is complete. - */ - public void addChild(HandlerChainsMetaData handlerConfig, HandlerChainMetaData handlerChain, UnmarshallingContext navigator, String namespaceURI, String localName) - { - handlerConfig.addHandlerChain(handlerChain); - } - - /** - * Called when parsing of a new element started. - */ - public Object newChild(HandlerChainMetaData chainConfig, UnmarshallingContext navigator, String namespaceURI, String localName, Attributes attrs) - { - if ("handler".equals(localName)) - return new UnifiedHandlerMetaData(chainConfig); - else - return null; - } - - /** - * Called when parsing character is complete. - */ - public void addChild(HandlerChainMetaData handlerConfig, UnifiedHandlerMetaData handler, UnmarshallingContext navigator, String namespaceURI, String localName) - { - handlerConfig.addHandler(handler); - } - - /** - * Called when parsing of a new element started. - */ - public Object newChild(UnifiedHandlerMetaData handler, UnmarshallingContext navigator, String namespaceURI, String localName, Attributes attrs) - { - if ("init-param".equals(localName)) - return new HandlerInitParam(); - else return null; - } - - /** - * Called when parsing character is complete. - */ - public void addChild(UnifiedHandlerMetaData handler, HandlerInitParam param, UnmarshallingContext navigator, String namespaceURI, String localName) - { - handler.addInitParam(param); - } - - /** - * Called when a new simple child element with text value was read from the XML content. - */ - public void setValue(HandlerChainMetaData handlerChain, UnmarshallingContext navigator, String namespaceURI, String localName, String value) - { - if (log.isTraceEnabled()) - log.trace("HandlerChainMetaData setValue: nuri=" + namespaceURI + " localName=" + localName + " value=" + value); - - if (localName.equals("protocol-bindings")) - handlerChain.setProtocolBindings(value); - else if (localName.equals("service-name-pattern")) - handlerChain.setServiceNamePattern(navigator.resolveQName(value)); - else if (localName.equals("port-name-pattern")) - handlerChain.setPortNamePattern(navigator.resolveQName(value)); - } - - /** - * Called when a new simple child element with text value was read from the XML content. - */ - public void setValue(UnifiedHandlerMetaData handler, UnmarshallingContext navigator, String namespaceURI, String localName, String value) - { - if (log.isTraceEnabled()) - log.trace("UnifiedHandlerMetaData setValue: nuri=" + namespaceURI + " localName=" + localName + " value=" + value); - - if (localName.equals("handler-name")) - handler.setHandlerName(value); - else if (localName.equals("handler-class")) - handler.setHandlerClass(value); - } - - /** - * 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) - { - if (log.isTraceEnabled()) - log.trace("UnifiedInitParamMetaData setValue: nuri=" + namespaceURI + " localName=" + localName + " value=" + value); - - if (localName.equals("param-name")) - param.setParamName(value); - else if (localName.equals("param-value")) - param.setParamValue(value); - } -} Copied: branches/tdiesler/trunk/src/main/java/org/jboss/ws/common/metadata/jsr181/HandlerChainFactory.java (from rev 1571, branches/tdiesler/trunk/src/main/java/org/jboss/ws/core/metadata/jsr181/HandlerChainFactory.java) =================================================================== --- branches/tdiesler/trunk/src/main/java/org/jboss/ws/core/metadata/jsr181/HandlerChainFactory.java 2006-12-06 10:47:51 UTC (rev 1571) +++ branches/tdiesler/trunk/src/main/java/org/jboss/ws/common/metadata/jsr181/HandlerChainFactory.java 2006-12-06 11:19:33 UTC (rev 1572) @@ -0,0 +1,164 @@ +/* +* 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.common.metadata.jsr181; + +// $Id$ + +import org.jboss.logging.Logger; +import org.jboss.ws.common.metadata.j2ee.UnifiedHandlerMetaData; +import org.jboss.ws.common.umdm.HandlerMetaData.HandlerInitParam; +import org.jboss.ws.common.umdm.HandlerMetaData.HandlerType; +import org.jboss.xb.binding.ObjectModelFactory; +import org.jboss.xb.binding.UnmarshallingContext; +import org.xml.sax.Attributes; + +/** + * A JBossXB factory for jsr181 the HandlerChain annotation + * + * @author Thomas.Diesler(a)jboss.org + * @since 15-Oct-2005 + */ +public class HandlerChainFactory implements ObjectModelFactory +{ + // provide logging + private static final Logger log = Logger.getLogger(HandlerChainFactory.class); + + public HandlerChainFactory() + { + } + + /** + * This method is called on the factory by the object model builder when the parsing starts. + * + * @return the root of the object model. + */ + public Object newRoot(Object root, UnmarshallingContext navigator, String namespaceURI, String localName, Attributes attrs) + { + HandlerChainsMetaData handlerConfigMetaData = new HandlerChainsMetaData(HandlerType.ENDPOINT); + return handlerConfigMetaData; + } + + public Object completeRoot(Object root, UnmarshallingContext ctx, String uri, String name) + { + return root; + } + + /** + * Called when parsing of a new element started. + */ + public Object newChild(HandlerChainsMetaData handlerConfig, UnmarshallingContext navigator, String namespaceURI, String localName, Attributes attrs) + { + if ("handler-chain".equals(localName)) + return new HandlerChainMetaData(handlerConfig); + else + return null; + } + + /** + * Called when parsing character is complete. + */ + public void addChild(HandlerChainsMetaData handlerConfig, HandlerChainMetaData handlerChain, UnmarshallingContext navigator, String namespaceURI, String localName) + { + handlerConfig.addHandlerChain(handlerChain); + } + + /** + * Called when parsing of a new element started. + */ + public Object newChild(HandlerChainMetaData chainConfig, UnmarshallingContext navigator, String namespaceURI, String localName, Attributes attrs) + { + if ("handler".equals(localName)) + return new UnifiedHandlerMetaData(chainConfig); + else + return null; + } + + /** + * Called when parsing character is complete. + */ + public void addChild(HandlerChainMetaData handlerConfig, UnifiedHandlerMetaData handler, UnmarshallingContext navigator, String namespaceURI, String localName) + { + handlerConfig.addHandler(handler); + } + + /** + * Called when parsing of a new element started. + */ + public Object newChild(UnifiedHandlerMetaData handler, UnmarshallingContext navigator, String namespaceURI, String localName, Attributes attrs) + { + if ("init-param".equals(localName)) + return new HandlerInitParam(); + else return null; + } + + /** + * Called when parsing character is complete. + */ + public void addChild(UnifiedHandlerMetaData handler, HandlerInitParam param, UnmarshallingContext navigator, String namespaceURI, String localName) + { + handler.addInitParam(param); + } + + /** + * Called when a new simple child element with text value was read from the XML content. + */ + public void setValue(HandlerChainMetaData handlerChain, UnmarshallingContext navigator, String namespaceURI, String localName, String value) + { + if (log.isTraceEnabled()) + log.trace("HandlerChainMetaData setValue: nuri=" + namespaceURI + " localName=" + localName + " value=" + value); + + if (localName.equals("protocol-bindings")) + handlerChain.setProtocolBindings(value); + else if (localName.equals("service-name-pattern")) + handlerChain.setServiceNamePattern(navigator.resolveQName(value)); + else if (localName.equals("port-name-pattern")) + handlerChain.setPortNamePattern(navigator.resolveQName(value)); + } + + /** + * Called when a new simple child element with text value was read from the XML content. + */ + public void setValue(UnifiedHandlerMetaData handler, UnmarshallingContext navigator, String namespaceURI, String localName, String value) + { + if (log.isTraceEnabled()) + log.trace("UnifiedHandlerMetaData setValue: nuri=" + namespaceURI + " localName=" + localName + " value=" + value); + + if (localName.equals("handler-name")) + handler.setHandlerName(value); + else if (localName.equals("handler-class")) + handler.setHandlerClass(value); + } + + /** + * 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) + { + if (log.isTraceEnabled()) + log.trace("UnifiedInitParamMetaData setValue: nuri=" + namespaceURI + " localName=" + localName + " value=" + value); + + if (localName.equals("param-name")) + param.setParamName(value); + else if (localName.equals("param-value")) + param.setParamValue(value); + } +} Deleted: branches/tdiesler/trunk/src/main/java/org/jboss/ws/common/metadata/jsr181/HandlerChainMetaData.java =================================================================== --- branches/tdiesler/trunk/src/main/java/org/jboss/ws/core/metadata/jsr181/HandlerChainMetaData.java 2006-12-06 05:06:23 UTC (rev 1568) +++ branches/tdiesler/trunk/src/main/java/org/jboss/ws/common/metadata/jsr181/HandlerChainMetaData.java 2006-12-06 11:19:33 UTC (rev 1572) @@ -1,104 +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.metadata.jsr181; - -// $Id$ - -import java.util.ArrayList; -import java.util.List; - -import javax.xml.namespace.QName; - -import org.jboss.logging.Logger; -import org.jboss.ws.common.umdm.HandlerMetaData.HandlerType; -import org.jboss.ws.core.metadata.j2ee.UnifiedHandlerMetaData; - -/** - * XML Binding element for handler-config/handler-chain elements - * - * @author Thomas.Diesler(a)jboss.org - * @since 15-Oct-2005 - */ -public class HandlerChainMetaData -{ - // provide logging - private static final Logger log = Logger.getLogger(HandlerChainMetaData.class); - - // The parent element - private HandlerChainsMetaData handlerChainsMetaData; - - private String protocolBindings; - private QName serviceNamePattern; - private QName portNamePattern; - private ArrayList<UnifiedHandlerMetaData> handlers = new ArrayList<UnifiedHandlerMetaData>(); - - public HandlerChainMetaData(HandlerChainsMetaData handlerConfig) - { - this.handlerChainsMetaData = handlerConfig; - } - - public HandlerChainsMetaData getHandlerChainsMetaData() - { - return handlerChainsMetaData; - } - - public void addHandler(UnifiedHandlerMetaData handlerMetaData) - { - handlers.add(handlerMetaData); - } - - public List<UnifiedHandlerMetaData> getHandlers() - { - return handlers; - } - - public QName getPortNamePattern() - { - return portNamePattern; - } - - public void setPortNamePattern(QName portNamePattern) - { - this.portNamePattern = portNamePattern; - } - - public String getProtocolBindings() - { - return protocolBindings; - } - - public void setProtocolBindings(String protocolBindings) - { - this.protocolBindings = protocolBindings; - } - - public QName getServiceNamePattern() - { - return serviceNamePattern; - } - - public void setServiceNamePattern(QName serviceNamePattern) - { - this.serviceNamePattern = serviceNamePattern; - } - -} Copied: branches/tdiesler/trunk/src/main/java/org/jboss/ws/common/metadata/jsr181/HandlerChainMetaData.java (from rev 1571, branches/tdiesler/trunk/src/main/java/org/jboss/ws/core/metadata/jsr181/HandlerChainMetaData.java) =================================================================== --- branches/tdiesler/trunk/src/main/java/org/jboss/ws/core/metadata/jsr181/HandlerChainMetaData.java 2006-12-06 10:47:51 UTC (rev 1571) +++ branches/tdiesler/trunk/src/main/java/org/jboss/ws/common/metadata/jsr181/HandlerChainMetaData.java 2006-12-06 11:19:33 UTC (rev 1572) @@ -0,0 +1,103 @@ +/* +* 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.common.metadata.jsr181; + +// $Id$ + +import java.util.ArrayList; +import java.util.List; + +import javax.xml.namespace.QName; + +import org.jboss.logging.Logger; +import org.jboss.ws.common.metadata.j2ee.UnifiedHandlerMetaData; + +/** + * XML Binding element for handler-config/handler-chain elements + * + * @author Thomas.Diesler(a)jboss.org + * @since 15-Oct-2005 + */ +public class HandlerChainMetaData +{ + // provide logging + private static final Logger log = Logger.getLogger(HandlerChainMetaData.class); + + // The parent element + private HandlerChainsMetaData handlerChainsMetaData; + + private String protocolBindings; + private QName serviceNamePattern; + private QName portNamePattern; + private ArrayList<UnifiedHandlerMetaData> handlers = new ArrayList<UnifiedHandlerMetaData>(); + + public HandlerChainMetaData(HandlerChainsMetaData handlerConfig) + { + this.handlerChainsMetaData = handlerConfig; + } + + public HandlerChainsMetaData getHandlerChainsMetaData() + { + return handlerChainsMetaData; + } + + public void addHandler(UnifiedHandlerMetaData handlerMetaData) + { + handlers.add(handlerMetaData); + } + + public List<UnifiedHandlerMetaData> getHandlers() + { + return handlers; + } + + public QName getPortNamePattern() + { + return portNamePattern; + } + + public void setPortNamePattern(QName portNamePattern) + { + this.portNamePattern = portNamePattern; + } + + public String getProtocolBindings() + { + return protocolBindings; + } + + public void setProtocolBindings(String protocolBindings) + { + this.protocolBindings = protocolBindings; + } + + public QName getServiceNamePattern() + { + return serviceNamePattern; + } + + public void setServiceNamePattern(QName serviceNamePattern) + { + this.serviceNamePattern = serviceNamePattern; + } + +} Deleted: branches/tdiesler/trunk/src/main/java/org/jboss/ws/common/metadata/jsr181/HandlerChainsMetaData.java =================================================================== --- branches/tdiesler/trunk/src/main/java/org/jboss/ws/core/metadata/jsr181/HandlerChainsMetaData.java 2006-12-06 05:06:23 UTC (rev 1568) +++ branches/tdiesler/trunk/src/main/java/org/jboss/ws/common/metadata/jsr181/HandlerChainsMetaData.java 2006-12-06 11:19:33 UTC (rev 1572) @@ -1,66 +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. -*/ -// $Id$ -package org.jboss.ws.core.metadata.jsr181; - -//$Id$ - -import java.util.ArrayList; - -import org.jboss.ws.common.umdm.HandlerMetaData.HandlerType; - -/** - * XML Binding root element for JSR-181 HandlerChain - * - * @author Thomas.Diesler(a)jboss.org - * @since 15-Oct-2005 - */ -public class HandlerChainsMetaData -{ - // The required handler type - private HandlerType handlerType; - // The required <handler-chain> elements - private ArrayList<HandlerChainMetaData> handlerChains = new ArrayList<HandlerChainMetaData>(); - - public HandlerChainsMetaData(HandlerType handlerType) - { - this.handlerType = handlerType; - } - - public HandlerType getHandlerType() - { - return handlerType; - } - - - public void addHandlerChain(HandlerChainMetaData handlerChain) - { - handlerChains.add(handlerChain); - } - - public HandlerChainMetaData[] getHandlerChains() - { - HandlerChainMetaData[] array = new HandlerChainMetaData[handlerChains.size()]; - handlerChains.toArray(array); - return array; - } -} Copied: branches/tdiesler/trunk/src/main/java/org/jboss/ws/common/metadata/jsr181/HandlerChainsMetaData.java (from rev 1571, branches/tdiesler/trunk/src/main/java/org/jboss/ws/core/metadata/jsr181/HandlerChainsMetaData.java) =================================================================== --- branches/tdiesler/trunk/src/main/java/org/jboss/ws/core/metadata/jsr181/HandlerChainsMetaData.java 2006-12-06 10:47:51 UTC (rev 1571) +++ branches/tdiesler/trunk/src/main/java/org/jboss/ws/common/metadata/jsr181/HandlerChainsMetaData.java 2006-12-06 11:19:33 UTC (rev 1572) @@ -0,0 +1,66 @@ +/* +* 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. +*/ +// $Id$ +package org.jboss.ws.common.metadata.jsr181; + +//$Id$ + +import java.util.ArrayList; + +import org.jboss.ws.common.umdm.HandlerMetaData.HandlerType; + +/** + * XML Binding root element for JSR-181 HandlerChain + * + * @author Thomas.Diesler(a)jboss.org + * @since 15-Oct-2005 + */ +public class HandlerChainsMetaData +{ + // The required handler type + private HandlerType handlerType; + // The required <handler-chain> elements + private ArrayList<HandlerChainMetaData> handlerChains = new ArrayList<HandlerChainMetaData>(); + + public HandlerChainsMetaData(HandlerType handlerType) + { + this.handlerType = handlerType; + } + + public HandlerType getHandlerType() + { + return handlerType; + } + + + public void addHandlerChain(HandlerChainMetaData handlerChain) + { + handlerChains.add(handlerChain); + } + + public HandlerChainMetaData[] getHandlerChains() + { + HandlerChainMetaData[] array = new HandlerChainMetaData[handlerChains.size()]; + handlerChains.toArray(array); + return array; + } +} Modified: branches/tdiesler/trunk/src/main/java/org/jboss/ws/common/metadata/webservices/PortComponentMetaData.java =================================================================== --- branches/tdiesler/trunk/src/main/java/org/jboss/ws/common/metadata/webservices/PortComponentMetaData.java 2006-12-06 10:47:51 UTC (rev 1571) +++ branches/tdiesler/trunk/src/main/java/org/jboss/ws/common/metadata/webservices/PortComponentMetaData.java 2006-12-06 11:19:33 UTC (rev 1572) @@ -30,7 +30,7 @@ import javax.xml.namespace.QName; import org.jboss.logging.Logger; -import org.jboss.ws.core.metadata.j2ee.UnifiedHandlerMetaData; +import org.jboss.ws.common.metadata.j2ee.UnifiedHandlerMetaData; /** * XML Binding and ws4ee meta-data element for Modified: branches/tdiesler/trunk/src/main/java/org/jboss/ws/common/metadata/webservices/WebservicesFactory.java =================================================================== --- branches/tdiesler/trunk/src/main/java/org/jboss/ws/common/metadata/webservices/WebservicesFactory.java 2006-12-06 10:47:51 UTC (rev 1571) +++ branches/tdiesler/trunk/src/main/java/org/jboss/ws/common/metadata/webservices/WebservicesFactory.java 2006-12-06 11:19:33 UTC (rev 1572) @@ -26,8 +26,8 @@ import java.net.URL; import org.jboss.logging.Logger; +import org.jboss.ws.common.metadata.j2ee.UnifiedHandlerMetaData; import org.jboss.ws.common.umdm.HandlerMetaData.HandlerInitParam; -import org.jboss.ws.core.metadata.j2ee.UnifiedHandlerMetaData; import org.jboss.xb.binding.ObjectModelFactory; import org.jboss.xb.binding.UnmarshallingContext; import org.xml.sax.Attributes; Modified: branches/tdiesler/trunk/src/main/java/org/jboss/ws/common/metadata/wsdl/xsd/SchemaUtils.java =================================================================== --- branches/tdiesler/trunk/src/main/java/org/jboss/ws/common/metadata/wsdl/xsd/SchemaUtils.java 2006-12-06 10:47:51 UTC (rev 1571) +++ branches/tdiesler/trunk/src/main/java/org/jboss/ws/common/metadata/wsdl/xsd/SchemaUtils.java 2006-12-06 11:19:33 UTC (rev 1572) @@ -49,14 +49,14 @@ import org.apache.xerces.xs.XSTypeDefinition; import org.jboss.ws.common.Constants; import org.jboss.ws.common.WSException; +import org.jboss.ws.common.config.ServerConfig; +import org.jboss.ws.common.config.ServerConfigFactory; import org.jboss.ws.common.metadata.wsdl.xmlschema.JBossXSComplexTypeDefinition; import org.jboss.ws.common.metadata.wsdl.xmlschema.JBossXSElementDeclaration; import org.jboss.ws.common.metadata.wsdl.xmlschema.JBossXSErrorHandler; import org.jboss.ws.common.metadata.wsdl.xmlschema.JBossXSSimpleTypeDefinition; import org.jboss.ws.common.metadata.wsdl.xmlschema.JBossXSStringList; import org.jboss.ws.common.metadata.wsdl.xmlschema.JBossXSTypeDefinition; -import org.jboss.ws.core.server.ServerConfig; -import org.jboss.ws.core.server.ServerConfigFactory; /** * Util class that deals with XML Schema Modified: branches/tdiesler/trunk/src/main/java/org/jboss/ws/common/umdm/ClientEndpointMetaData.java =================================================================== --- branches/tdiesler/trunk/src/main/java/org/jboss/ws/common/umdm/ClientEndpointMetaData.java 2006-12-06 10:47:51 UTC (rev 1571) +++ branches/tdiesler/trunk/src/main/java/org/jboss/ws/common/umdm/ClientEndpointMetaData.java 2006-12-06 11:19:33 UTC (rev 1572) @@ -30,10 +30,10 @@ import org.jboss.logging.Logger; import org.jboss.ws.common.WSException; +import org.jboss.ws.common.metadata.config.WSConfigFactory; +import org.jboss.ws.common.metadata.config.jaxrpc.WSConfigRootJAXRPC; +import org.jboss.ws.common.metadata.config.jaxws.WSConfigRootJAXWS; import org.jboss.ws.common.umdm.HandlerMetaData.HandlerType; -import org.jboss.ws.core.metadata.config.WSConfigFactory; -import org.jboss.ws.core.metadata.config.jaxrpc.WSConfigRootJAXRPC; -import org.jboss.ws.core.metadata.config.jaxws.WSConfigRootJAXWS; /** * Client side endpoint meta data. Modified: branches/tdiesler/trunk/src/main/java/org/jboss/ws/common/umdm/EndpointMetaData.java =================================================================== --- branches/tdiesler/trunk/src/main/java/org/jboss/ws/common/umdm/EndpointMetaData.java 2006-12-06 10:47:51 UTC (rev 1571) +++ branches/tdiesler/trunk/src/main/java/org/jboss/ws/common/umdm/EndpointMetaData.java 2006-12-06 11:19:33 UTC (rev 1572) @@ -41,17 +41,16 @@ import org.jboss.ws.common.WSException; import org.jboss.ws.common.jaxrpc.Style; import org.jboss.ws.common.jaxrpc.TypeMappingImpl; +import org.jboss.ws.common.jaxrpc.Use; import org.jboss.ws.common.jaxrpc.encoding.JBossXBDeserializerFactory; import org.jboss.ws.common.jaxrpc.encoding.JBossXBSerializerFactory; import org.jboss.ws.common.jaxrpc.encoding.SOAPArrayDeserializerFactory; import org.jboss.ws.common.jaxrpc.encoding.SOAPArraySerializerFactory; +import org.jboss.ws.common.metadata.config.WSCommonConfig; import org.jboss.ws.common.umdm.HandlerMetaData.HandlerType; import org.jboss.ws.common.utils.JavaUtils; -import org.jboss.ws.core.CommonSOAPBinding; -import org.jboss.ws.core.jaxrpc.Use; import org.jboss.ws.core.jaxws.JAXBDeserializerFactory; import org.jboss.ws.core.jaxws.JAXBSerializerFactory; -import org.jboss.ws.core.metadata.config.WSCommonConfig; /** * A Service component describes a set of endpoints. @@ -122,7 +121,7 @@ this.type = type; // The default binding - this.bindingId = CommonSOAPBinding.SOAP11HTTP_BINDING; + this.bindingId = Constants.SOAP11HTTP_BINDING; } public ServiceMetaData getServiceMetaData() @@ -181,7 +180,7 @@ public void setBindingId(String bindingId) { - if (!CommonSOAPBinding.SOAP11HTTP_BINDING.equals(bindingId) && !CommonSOAPBinding.SOAP12HTTP_BINDING.equals(bindingId)) + if (!Constants.SOAP11HTTP_BINDING.equals(bindingId) && !Constants.SOAP12HTTP_BINDING.equals(bindingId)) throw new WSException("Unsupported binding: " + bindingId); this.bindingId = bindingId; } Modified: branches/tdiesler/trunk/src/main/java/org/jboss/ws/common/umdm/OperationMetaData.java =================================================================== --- branches/tdiesler/trunk/src/main/java/org/jboss/ws/common/umdm/OperationMetaData.java 2006-12-06 10:47:51 UTC (rev 1571) +++ branches/tdiesler/trunk/src/main/java/org/jboss/ws/common/umdm/OperationMetaData.java 2006-12-06 11:19:33 UTC (rev 1572) @@ -36,9 +36,9 @@ import org.jboss.logging.Logger; import org.jboss.ws.common.WSException; import org.jboss.ws.common.jaxrpc.Style; +import org.jboss.ws.common.jaxrpc.Use; import org.jboss.ws.common.umdm.EndpointMetaData.Type; import org.jboss.ws.common.utils.JavaUtils; -import org.jboss.ws.core.jaxrpc.Use; import org.w3c.dom.Element; /** Modified: branches/tdiesler/trunk/src/main/java/org/jboss/ws/common/umdm/ServerEndpointMetaData.java =================================================================== --- branches/tdiesler/trunk/src/main/java/org/jboss/ws/common/umdm/ServerEndpointMetaData.java 2006-12-06 10:47:51 UTC (rev 1571) +++ branches/tdiesler/trunk/src/main/java/org/jboss/ws/common/umdm/ServerEndpointMetaData.java 2006-12-06 11:19:33 UTC (rev 1572) @@ -31,11 +31,11 @@ import org.jboss.logging.Logger; import org.jboss.ws.common.WSException; +import org.jboss.ws.common.metadata.config.WSCommonConfig; +import org.jboss.ws.common.metadata.config.WSConfigFactory; +import org.jboss.ws.common.metadata.config.jaxrpc.WSConfigRootJAXRPC; +import org.jboss.ws.common.metadata.config.jaxws.WSConfigRootJAXWS; import org.jboss.ws.common.umdm.HandlerMetaData.HandlerType; -import org.jboss.ws.core.metadata.config.WSCommonConfig; -import org.jboss.ws.core.metadata.config.WSConfigFactory; -import org.jboss.ws.core.metadata.config.jaxrpc.WSConfigRootJAXRPC; -import org.jboss.ws.core.metadata.config.jaxws.WSConfigRootJAXWS; import org.jboss.ws.core.server.ServiceEndpoint; /** Modified: branches/tdiesler/trunk/src/main/java/org/jboss/ws/common/umdm/ServiceMetaData.java =================================================================== --- branches/tdiesler/trunk/src/main/java/org/jboss/ws/common/umdm/ServiceMetaData.java 2006-12-06 10:47:51 UTC (rev 1571) +++ branches/tdiesler/trunk/src/main/java/org/jboss/ws/common/umdm/ServiceMetaData.java 2006-12-06 11:19:33 UTC (rev 1572) @@ -38,6 +38,9 @@ import org.jboss.logging.Logger; import org.jboss.ws.common.WSException; import org.jboss.ws.common.jaxrpc.TypeMappingImpl; +import org.jboss.ws.common.jaxrpc.TypeMappingRegistryImpl; +import org.jboss.ws.common.jaxrpc.Use; +import org.jboss.ws.common.jbossxb.SchemaBindingBuilder; import org.jboss.ws.common.metadata.jaxrpcmapping.JavaWsdlMapping; import org.jboss.ws.common.metadata.jaxrpcmapping.JavaWsdlMappingFactory; import org.jboss.ws.common.metadata.wsdl.WSDLDefinitions; @@ -46,9 +49,6 @@ import org.jboss.ws.common.metadata.wsdl.WSDLUtils; import org.jboss.ws.common.metadata.wsdl.xmlschema.JBossXSModel; import org.jboss.ws.common.umdm.HandlerMetaData.HandlerType; -import org.jboss.ws.core.jaxrpc.TypeMappingRegistryImpl; -import org.jboss.ws.core.jaxrpc.Use; -import org.jboss.ws.core.jbossxb.SchemaBindingBuilder; import org.jboss.ws.core.metadata.wsse.WSSecurityConfiguration; import org.jboss.xb.binding.sunday.unmarshalling.SchemaBinding; Modified: branches/tdiesler/trunk/src/main/java/org/jboss/ws/common/utils/IOUtils.java =================================================================== --- branches/tdiesler/trunk/src/main/java/org/jboss/ws/common/utils/IOUtils.java 2006-12-06 10:47:51 UTC (rev 1571) +++ branches/tdiesler/trunk/src/main/java/org/jboss/ws/common/utils/IOUtils.java 2006-12-06 11:19:33 UTC (rev 1572) @@ -38,8 +38,8 @@ import org.jboss.logging.Logger; import org.jboss.ws.common.WSException; -import org.jboss.ws.core.server.ServerConfig; -import org.jboss.ws.core.server.ServerConfigFactory; +import org.jboss.ws.common.config.ServerConfig; +import org.jboss.ws.common.config.ServerConfigFactory; /** * IO utilites Deleted: branches/tdiesler/trunk/src/main/java/org/jboss/ws/common/utils/ThreadLocalAssociation.java =================================================================== --- branches/tdiesler/trunk/src/main/java/org/jboss/ws/common/utils/ThreadLocalAssociation.java 2006-12-06 10:47:51 UTC (rev 1571) +++ branches/tdiesler/trunk/src/main/java/org/jboss/ws/common/utils/ThreadLocalAssociation.java 2006-12-06 11:19:33 UTC (rev 1572) @@ -1,73 +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.common.utils; - -// $Id$ - -import java.util.Stack; - -import org.jboss.ws.core.CommonMessageContext; -import org.jboss.ws.extras.security.SecurityStore; - -/** - * Maintain thread locals at a single point. - * - * @author Heiko Braun, <heiko(a)openj.net&gt; - * @author Thomas.Diesler(a)jboss.com - * @since 10-Apr-2006 - */ -public class ThreadLocalAssociation { - - /** - * Handles invocations on MDB endpoints. - */ - private static ThreadLocal invokerMDBAssoc = new ThreadLocal(); - - /** - * SOAP message context - * @see org.jboss.ws.core.soap.MessageContextAssociation - */ - private static ThreadLocal<Stack<CommonMessageContext>> msgContextAssoc = new ThreadLocal<Stack<CommonMessageContext>>(); - - /** - * @see org.jboss.ws.extras.security.STRTransform - */ - private static ThreadLocal<SecurityStore> strTransformAssoc = new ThreadLocal<SecurityStore>(); - - public static ThreadLocal localInvokerMDBAssoc() { - return invokerMDBAssoc; - } - - public static ThreadLocal<Stack<CommonMessageContext>> localMsgContextAssoc() { - return msgContextAssoc; - } - - public static ThreadLocal<SecurityStore> localStrTransformAssoc() { - return strTransformAssoc; - } - - public static void clear() { - invokerMDBAssoc.set(null); - msgContextAssoc.set(null); - strTransformAssoc.set(null); - } -} Modified: branches/tdiesler/trunk/src/main/java/org/jboss/ws/core/CommonSOAP11Binding.java =================================================================== --- branches/tdiesler/trunk/src/main/java/org/jboss/ws/core/CommonSOAP11Binding.java 2006-12-06 10:47:51 UTC (rev 1571) +++ branches/tdiesler/trunk/src/main/java/org/jboss/ws/core/CommonSOAP11Binding.java 2006-12-06 11:19:33 UTC (rev 1572) @@ -28,8 +28,8 @@ import javax.xml.soap.SOAPMessage; import org.jboss.ws.common.Constants; +import org.jboss.ws.common.jaxrpc.Use; import org.jboss.ws.common.umdm.OperationMetaData; -import org.jboss.ws.core.jaxrpc.Use; import org.jboss.ws.core.soap.MessageFactoryImpl; /** Modified: branches/tdiesler/trunk/src/main/java/org/jboss/ws/core/CommonSOAPBinding.java =================================================================== --- branches/tdiesler/trunk/src/main/java/org/jboss/ws/core/CommonSOAPBinding.java 2006-12-06 10:47:51 UTC (rev 1571) +++ branches/tdiesler/trunk/src/main/java/org/jboss/ws/core/CommonSOAPBinding.java 2006-12-06 11:19:33 UTC (rev 1572) @@ -47,6 +47,7 @@ import org.apache.xerces.xs.XSTypeDefinition; import org.jboss.logging.Logger; import org.jboss.ws.common.Constants; +import org.jboss.ws.common.NameImpl; import org.jboss.ws.common.WSException; import org.jboss.ws.common.binding.BindingException; import org.jboss.ws.common.jaxrpc.Style; @@ -62,7 +63,6 @@ import org.jboss.ws.core.jaxrpc.StubExt; 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.SOAPBodyElementDoc; import org.jboss.ws.core.soap.SOAPBodyElementRpc; import org.jboss.ws.core.soap.SOAPContentElement; Copied: branches/tdiesler/trunk/src/main/java/org/jboss/ws/core/ThreadLocalAssociation.java (from rev 1568, branches/tdiesler/trunk/src/main/java/org/jboss/ws/common/utils/ThreadLocalAssociation.java) =================================================================== --- branches/tdiesler/trunk/src/main/java/org/jboss/ws/common/utils/ThreadLocalAssociation.java 2006-12-06 05:06:23 UTC (rev 1568) +++ branches/tdiesler/trunk/src/main/java/org/jboss/ws/core/ThreadLocalAssociation.java 2006-12-06 11:19:33 UTC (rev 1572) @@ -0,0 +1,77 @@ +/* + * 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; + +// $Id$ + +import java.util.Stack; + +import org.jboss.ws.extras.security.SecurityStore; + +/** + * Maintain thread locals at a single point. + * + * @author Heiko Braun, <heiko(a)openj.net&gt; + * @author Thomas.Diesler(a)jboss.com + * @since 10-Apr-2006 + */ +public class ThreadLocalAssociation +{ + + /** + * Handles invocations on MDB endpoints. + */ + private static ThreadLocal invokerMDBAssoc = new ThreadLocal(); + + /** + * SOAP message context + * @see org.jboss.ws.core.soap.MessageContextAssociation + */ + private static ThreadLocal<Stack<CommonMessageContext>> msgContextAssoc = new ThreadLocal<Stack<CommonMessageContext>>(); + + /** + * @see org.jboss.ws.extras.security.STRTransform + */ + private static ThreadLocal<SecurityStore> strTransformAssoc = new ThreadLocal<SecurityStore>(); + + public static ThreadLocal localInvokerMDBAssoc() + { + return invokerMDBAssoc; + } + + public static ThreadLocal<Stack<CommonMessageContext>> localMsgContextAssoc() + { + return msgContextAssoc; + } + + public static ThreadLocal<SecurityStore> localStrTransformAssoc() + { + return strTransformAssoc; + } + + public static void clear() + { + invokerMDBAssoc.set(null); + msgContextAssoc.set(null); + strTransformAssoc.set(null); + } +} Deleted: branches/tdiesler/trunk/src/main/java/org/jboss/ws/core/binding/ComplexTypeDeserializer.java =================================================================== --- branches/tdiesler/trunk/src/main/java/org/jboss/ws/core/binding/ComplexTypeDeserializer.java 2006-12-06 10:47:51 UTC (rev 1571) +++ branches/tdiesler/trunk/src/main/java/org/jboss/ws/core/binding/ComplexTypeDeserializer.java 2006-12-06 11:19:33 UTC (rev 1572) @@ -1,37 +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.binding; - -import org.jboss.ws.common.binding.DeserializerSupport; - -// $Id$ - -/** - * A Deserializer that can handle complex types by delegating to JAXB. - * - * @author Thomas.Diesler(a)jboss.org - * @since 04-Dec-2004 - */ -public abstract class ComplexTypeDeserializer extends DeserializerSupport -{ - -} Deleted: branches/tdiesler/trunk/src/main/java/org/jboss/ws/core/binding/ComplexTypeSerializer.java =================================================================== --- branches/tdiesler/trunk/src/main/java/org/jboss/ws/core/binding/ComplexTypeSerializer.java 2006-12-06 10:47:51 UTC (rev 1571) +++ branches/tdiesler/trunk/src/main/java/org/jboss/ws/core/binding/ComplexTypeSerializer.java 2006-12-06 11:19:33 UTC (rev 1572) @@ -1,37 +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.binding; - -import org.jboss.ws.common.binding.SerializerSupport; - -// $Id$ - -/** - * A Serializer that can handle complex types by delegating to JAXB. - * - * @author Thomas.Diesler(a)jboss.org - * @since 04-Dec-2004 - */ -public abstract class ComplexTypeSerializer extends SerializerSupport -{ - -} Deleted: branches/tdiesler/trunk/src/main/java/org/jboss/ws/core/jaxrpc/EncodedTypeMapping.java =================================================================== --- branches/tdiesler/trunk/src/main/java/org/jboss/ws/core/jaxrpc/EncodedTypeMapping.java 2006-12-06 10:47:51 UTC (rev 1571) +++ branches/tdiesler/trunk/src/main/java/org/jboss/ws/core/jaxrpc/EncodedTypeMapping.java 2006-12-06 11:19:33 UTC (rev 1572) @@ -1,183 +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.jaxrpc; - -// $Id$ - -import java.math.BigDecimal; -import java.math.BigInteger; -import java.net.URI; -import java.util.Calendar; -import java.util.Date; - -import javax.xml.namespace.QName; -import javax.xml.soap.SOAPElement; - -import org.jboss.util.NotImplementedException; -import org.jboss.ws.common.Constants; -import org.jboss.ws.common.jaxrpc.TypeMappingImpl; -import org.jboss.ws.common.jaxrpc.encoding.Base64DeserializerFactory; -import org.jboss.ws.common.jaxrpc.encoding.Base64SerializerFactory; -import org.jboss.ws.common.jaxrpc.encoding.CalendarDeserializerFactory; -import org.jboss.ws.common.jaxrpc.encoding.CalendarSerializerFactory; -import org.jboss.ws.common.jaxrpc.encoding.DateDeserializerFactory; -import org.jboss.ws.common.jaxrpc.encoding.DateSerializerFactory; -import org.jboss.ws.common.jaxrpc.encoding.ElementDeserializerFactory; -import org.jboss.ws.common.jaxrpc.encoding.ElementSerializerFactory; -import org.jboss.ws.common.jaxrpc.encoding.HexDeserializerFactory; -import org.jboss.ws.common.jaxrpc.encoding.HexSerializerFactory; -import org.jboss.ws.common.jaxrpc.encoding.QNameDeserializerFactory; -import org.jboss.ws.common.jaxrpc.encoding.QNameSerializerFactory; -import org.jboss.ws.common.jaxrpc.encoding.SOAPElementDeserializerFactory; -import org.jboss.ws.common.jaxrpc.encoding.SOAPElementSerializerFactory; -import org.jboss.ws.common.jaxrpc.encoding.SimpleDeserializerFactory; -import org.jboss.ws.common.jaxrpc.encoding.SimpleSerializerFactory; -import org.w3c.dom.Element; - -/** - * This is the representation of a type mapping. - * This TypeMapping implementation supports the encoded encoding style. - * - * The TypeMapping instance maintains a tuple of the type - * {XML typeQName, Java Class, SerializerFactory, DeserializerFactory}. - * - * @author Thomas.Diesler(a)jboss.org - * @since 10-Oct-2004 - */ -public class EncodedTypeMapping extends TypeMappingImpl -{ - - /** - * Construct the default encoded type mapping. - * Registers javaTypes for all standard XMLSchema types specified by JAXRPC. - * - * Note, the order of registered types is important - * The last xmlType wins for a given javaType - * - */ - public EncodedTypeMapping() - { - registerStandardLiteralTypes(); - registerStandardSOAP11EncodedTypes(); - - // register mapping for xsd:anyType - registerInternal(SOAPElement.class, Constants.TYPE_SOAP11_ANYTYPE, new SOAPElementSerializerFactory(), new SOAPElementDeserializerFactory()); - registerInternal(Element.class, Constants.TYPE_SOAP11_ANYTYPE, new ElementSerializerFactory(), new ElementDeserializerFactory()); - } - - private void registerStandardSOAP11EncodedTypes() - { - registerInternal(BigDecimal.class, Constants.TYPE_SOAP11_DECIMAL, new SimpleSerializerFactory(), new SimpleDeserializerFactory()); - - registerInternal(BigInteger.class, Constants.TYPE_SOAP11_POSITIVEINTEGER, new SimpleSerializerFactory(), new SimpleDeserializerFactory()); - registerInternal(BigInteger.class, Constants.TYPE_SOAP11_NEGATIVEINTEGER, new SimpleSerializerFactory(), new SimpleDeserializerFactory()); - registerInternal(BigInteger.class, Constants.TYPE_SOAP11_NONPOSITIVEINTEGER, new SimpleSerializerFactory(), new SimpleDeserializerFactory()); - registerInternal(BigInteger.class, Constants.TYPE_SOAP11_NONNEGATIVEINTEGER, new SimpleSerializerFactory(), new SimpleDeserializerFactory()); - registerInternal(BigInteger.class, Constants.TYPE_SOAP11_UNSIGNEDLONG, new SimpleSerializerFactory(), new SimpleDeserializerFactory()); - registerInternal(BigInteger.class, Constants.TYPE_SOAP11_INTEGER, new SimpleSerializerFactory(), new SimpleDeserializerFactory()); - - registerInternal(Date.class, Constants.TYPE_SOAP11_DATETIME, new DateSerializerFactory(), new DateDeserializerFactory()); - - registerInternal(Calendar.class, Constants.TYPE_SOAP11_DATE, new CalendarSerializerFactory(), new CalendarDeserializerFactory()); - registerInternal(Calendar.class, Constants.TYPE_SOAP11_TIME, new CalendarSerializerFactory(), new CalendarDeserializerFactory()); - registerInternal(Calendar.class, Constants.TYPE_SOAP11_DATETIME, new CalendarSerializerFactory(), new CalendarDeserializerFactory()); - - registerInternal(QName.class, Constants.TYPE_SOAP11_QNAME, new QNameSerializerFactory(), new QNameDeserializerFactory()); - - registerInternal(String.class, Constants.TYPE_SOAP11_ANYSIMPLETYPE, new SimpleSerializerFactory(), new SimpleDeserializerFactory()); - registerInternal(String.class, Constants.TYPE_SOAP11_DURATION, new SimpleSerializerFactory(), new SimpleDeserializerFactory()); - registerInternal(String.class, Constants.TYPE_SOAP11_GDAY, new SimpleSerializerFactory(), new SimpleDeserializerFactory()); - registerInternal(String.class, Constants.TYPE_SOAP11_GMONTH, new SimpleSerializerFactory(), new SimpleDeserializerFactory()); - registerInternal(String.class, Constants.TYPE_SOAP11_GMONTHDAY, new SimpleSerializerFactory(), new SimpleDeserializerFactory()); - registerInternal(String.class, Constants.TYPE_SOAP11_GYEAR, new SimpleSerializerFactory(), new SimpleDeserializerFactory()); - registerInternal(String.class, Constants.TYPE_SOAP11_GYEARMONTH, new SimpleSerializerFactory(), new SimpleDeserializerFactory()); - registerInternal(String.class, Constants.TYPE_SOAP11_ID, new SimpleSerializerFactory(), new SimpleDeserializerFactory()); - registerInternal(String.class, Constants.TYPE_SOAP11_LANGUAGE, new SimpleSerializerFactory(), new SimpleDeserializerFactory()); - registerInternal(String.class, Constants.TYPE_SOAP11_NAME, new SimpleSerializerFactory(), new SimpleDeserializerFactory()); - registerInternal(String.class, Constants.TYPE_SOAP11_NCNAME, new SimpleSerializerFactory(), new SimpleDeserializerFactory()); - registerInternal(String.class, Constants.TYPE_SOAP11_NMTOKEN, new SimpleSerializerFactory(), new SimpleDeserializerFactory()); - registerInternal(String.class, Constants.TYPE_SOAP11_NORMALIZEDSTRING, new SimpleSerializerFactory(), new SimpleDeserializerFactory()); - registerInternal(String.class, Constants.TYPE_SOAP11_TOKEN, new SimpleSerializerFactory(), new SimpleDeserializerFactory()); - registerInternal(String.class, Constants.TYPE_SOAP11_STRING, new SimpleSerializerFactory(), new SimpleDeserializerFactory()); - - registerInternal(String[].class, Constants.TYPE_SOAP11_NMTOKENS, new SimpleSerializerFactory(), new SimpleDeserializerFactory()); - - registerInternal(URI.class, Constants.TYPE_SOAP11_ANYURI, new SimpleSerializerFactory(), new SimpleDeserializerFactory()); - - registerInternal(boolean.class, Constants.TYPE_SOAP11_BOOLEAN, new SimpleSerializerFactory(), new SimpleDeserializerFactory()); - registerInternal(Boolean.class, Constants.TYPE_SOAP11_BOOLEAN, new SimpleSerializerFactory(), new SimpleDeserializerFactory()); - - registerInternal(byte.class, Constants.TYPE_SOAP11_BYTE, new SimpleSerializerFactory(), new SimpleDeserializerFactory()); - registerInternal(Byte.class, Constants.TYPE_SOAP11_BYTE, new SimpleSerializerFactory(), new SimpleDeserializerFactory()); - - registerInternal(byte[].class, Constants.TYPE_SOAP11_HEXBINARY, new HexSerializerFactory(), new HexDeserializerFactory()); - registerInternal(Byte[].class, Constants.TYPE_SOAP11_HEXBINARY, new HexSerializerFactory(), new HexDeserializerFactory()); - registerInternal(byte[].class, Constants.TYPE_SOAP11_BASE64BINARY, new Base64SerializerFactory(), new Base64DeserializerFactory()); - registerInternal(Byte[].class, Constants.TYPE_SOAP11_BASE64BINARY, new Base64SerializerFactory(), new Base64DeserializerFactory()); - registerInternal(byte[].class, Constants.TYPE_SOAP11_BASE64, new Base64SerializerFactory(), new Base64DeserializerFactory()); - registerInternal(Byte[].class, Constants.TYPE_SOAP11_BASE64, new Base64SerializerFactory(), new Base64DeserializerFactory()); - - registerInternal(double.class, Constants.TYPE_SOAP11_DOUBLE, new SimpleSerializerFactory(), new SimpleDeserializerFactory()); - registerInternal(Double.class, Constants.TYPE_SOAP11_DOUBLE, new SimpleSerializerFactory(), new SimpleDeserializerFactory()); - - registerInternal(float.class, Constants.TYPE_SOAP11_FLOAT, new SimpleSerializerFactory(), new SimpleDeserializerFactory()); - registerInternal(Float.class, Constants.TYPE_SOAP11_FLOAT, new SimpleSerializerFactory(), new SimpleDeserializerFactory()); - - registerInternal(int.class, Constants.TYPE_SOAP11_UNSIGNEDSHORT, new SimpleSerializerFactory(), new SimpleDeserializerFactory()); - registerInternal(Integer.class, Constants.TYPE_SOAP11_UNSIGNEDSHORT, new SimpleSerializerFactory(), new SimpleDeserializerFactory()); - registerInternal(int.class, Constants.TYPE_SOAP11_INT, new SimpleSerializerFactory(), new SimpleDeserializerFactory()); - registerInternal(Integer.class, Constants.TYPE_SOAP11_INT, new SimpleSerializerFactory(), new SimpleDeserializerFactory()); - - registerInternal(long.class, Constants.TYPE_SOAP11_UNSIGNEDINT, new SimpleSerializerFactory(), new SimpleDeserializerFactory()); - registerInternal(Long.class, Constants.TYPE_SOAP11_UNSIGNEDINT, new SimpleSerializerFactory(), new SimpleDeserializerFactory()); - registerInternal(long.class, Constants.TYPE_SOAP11_LONG, new SimpleSerializerFactory(), new SimpleDeserializerFactory()); - registerInternal(Long.class, Constants.TYPE_SOAP11_LONG, new SimpleSerializerFactory(), new SimpleDeserializerFactory()); - - registerInternal(short.class, Constants.TYPE_SOAP11_UNSIGNEDBYTE, new SimpleSerializerFactory(), new SimpleDeserializerFactory()); - registerInternal(Short.class, Constants.TYPE_SOAP11_UNSIGNEDBYTE, new SimpleSerializerFactory(), new SimpleDeserializerFactory()); - registerInternal(short.class, Constants.TYPE_SOAP11_SHORT, new SimpleSerializerFactory(), new SimpleDeserializerFactory()); - registerInternal(Short.class, Constants.TYPE_SOAP11_SHORT, new SimpleSerializerFactory(), new SimpleDeserializerFactory()); - } - - /** - * Returns the encodingStyle URIs (as String[]) supported by this TypeMapping instance. - * A TypeMapping that contains only encoding style independent serializers and deserializers - * returns null from this method. - * - * @return Array of encodingStyle URIs for the supported encoding styles - */ - public String[] getSupportedEncodings() - { - return new String[] { "encoded" }; - } - - /** - * Sets the encodingStyle URIs supported by this TypeMapping instance. A TypeMapping that contains only encoding - * independent serializers and deserializers requires null as the parameter for this method. - * - * @param encodingStyleURIs Array of encodingStyle URIs for the supported encoding styles - */ - public void setSupportedEncodings(String[] encodingStyleURIs) - { - throw new NotImplementedException(); - } -} Modified: branches/tdiesler/trunk/src/main/java/org/jboss/ws/core/jaxrpc/SOAPFaultHelperJAXRPC.java =================================================================== --- branches/tdiesler/trunk/src/main/java/org/jboss/ws/core/jaxrpc/SOAPFaultHelperJAXRPC.java 2006-12-06 10:47:51 UTC (rev 1571) +++ branches/tdiesler/trunk/src/main/java/org/jboss/ws/core/jaxrpc/SOAPFaultHelperJAXRPC.java 2006-12-06 11:19:33 UTC (rev 1572) @@ -44,6 +44,7 @@ import org.jboss.logging.Logger; import org.jboss.ws.common.Constants; +import org.jboss.ws.common.NameImpl; import org.jboss.ws.common.WSException; import org.jboss.ws.common.binding.BindingException; import org.jboss.ws.common.binding.DeserializerSupport; @@ -58,7 +59,6 @@ import org.jboss.ws.core.CommonMessageContext; 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.xb.binding.NamespaceRegistry; Modified: branches/tdiesler/trunk/src/main/java/org/jboss/ws/core/jaxrpc/ServiceImpl.java =================================================================== --- branches/tdiesler/trunk/src/main/java/org/jboss/ws/core/jaxrpc/ServiceImpl.java 2006-12-06 10:47:51 UTC (rev 1571) +++ branches/tdiesler/trunk/src/main/java/org/jboss/ws/core/jaxrpc/ServiceImpl.java 2006-12-06 11:19:33 UTC (rev 1572) @@ -38,13 +38,13 @@ import javax.xml.rpc.handler.HandlerChain; import javax.xml.rpc.handler.HandlerRegistry; +import org.jboss.ws.common.metadata.j2ee.UnifiedServiceRefMetaData; import org.jboss.ws.common.metadata.jaxrpcmapping.JavaWsdlMapping; import org.jboss.ws.common.umdm.EndpointMetaData; import org.jboss.ws.common.umdm.OperationMetaData; import org.jboss.ws.common.umdm.ServiceMetaData; import org.jboss.ws.common.umdm.UnifiedMetaData; import org.jboss.ws.core.metadata.builder.jaxrpc.JAXRPCClientMetaDataBuilder; -import org.jboss.ws.core.metadata.j2ee.UnifiedServiceRefMetaData; import org.jboss.ws.core.metadata.wsse.WSSecurityConfiguration; /** Modified: branches/tdiesler/trunk/src/main/java/org/jboss/ws/core/jaxrpc/ServiceObjectFactory.java =================================================================== --- branches/tdiesler/trunk/src/main/java/org/jboss/ws/core/jaxrpc/ServiceObjectFactory.java 2006-12-06 10:47:51 UTC (rev 1571) +++ branches/tdiesler/trunk/src/main/java/org/jboss/ws/core/jaxrpc/ServiceObjectFactory.java 2006-12-06 11:19:33 UTC (rev 1572) @@ -58,6 +58,8 @@ import org.jboss.logging.Logger; import org.jboss.ws.common.Constants; import org.jboss.ws.common.WSException; +import org.jboss.ws.common.metadata.j2ee.UnifiedPortComponentRefMetaData; +import org.jboss.ws.common.metadata.j2ee.UnifiedServiceRefMetaData; import org.jboss.ws.common.metadata.jaxrpcmapping.JavaWsdlMapping; import org.jboss.ws.common.umdm.EndpointMetaData; import org.jboss.ws.common.umdm.HandlerMetaData; @@ -65,8 +67,6 @@ import org.jboss.ws.common.umdm.ServiceMetaData; import org.jboss.ws.common.umdm.HandlerMetaData.HandlerInitParam; import org.jboss.ws.common.umdm.HandlerMetaData.HandlerType; -import org.jboss.ws.core.metadata.j2ee.UnifiedPortComponentRefMetaData; -import org.jboss.ws.core.metadata.j2ee.UnifiedServiceRefMetaData; import org.jboss.ws.core.metadata.wsse.WSSecurityConfiguration; import org.jboss.ws.core.server.ServiceEndpoint; import org.jboss.ws.core.server.ServiceEndpointManager; Modified: branches/tdiesler/trunk/src/main/java/org/jboss/ws/core/jaxrpc/ServiceReferenceable.java =================================================================== --- branches/tdiesler/trunk/src/main/java/org/jboss/ws/core/jaxrpc/ServiceReferenceable.java 2006-12-06 10:47:51 UTC (rev 1571) +++ branches/tdiesler/trunk/src/main/java/org/jboss/ws/core/jaxrpc/ServiceReferenceable.java 2006-12-06 11:19:33 UTC (rev 1572) @@ -35,9 +35,9 @@ import javax.naming.Referenceable; import javax.naming.StringRefAddr; -import org.jboss.ws.core.metadata.j2ee.UnifiedPortComponentRefMetaData; -import org.jboss.ws.core.metadata.j2ee.UnifiedServiceRefMetaData; -import org.jboss.ws.core.metadata.j2ee.UnifiedWebMetaData; +import org.jboss.ws.common.metadata.j2ee.UnifiedPortComponentRefMetaData; +import org.jboss.ws.common.metadata.j2ee.UnifiedServiceRefMetaData; +import org.jboss.ws.common.metadata.j2ee.UnifiedWebMetaData; import org.jboss.ws.core.metadata.wsse.WSSecurityConfiguration; import org.jboss.ws.core.metadata.wsse.WSSecurityConfigurationFactory; import org.jboss.ws.core.server.ServiceEndpointManager; Deleted: branches/tdiesler/trunk/src/main/java/org/jboss/ws/core/jaxrpc/TypeMappingRegistryImpl.java =================================================================== --- branches/tdiesler/trunk/src/main/java/org/jboss/ws/core/jaxrpc/TypeMappingRegistryImpl.java 2006-12-06 10:47:51 UTC (rev 1571) +++ branches/tdiesler/trunk/src/main/java/org/jboss/ws/core/jaxrpc/TypeMappingRegistryImpl.java 2006-12-06 11:19:33 UTC (rev 1572) @@ -1,166 +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.jaxrpc; - -// $Id$ - -import java.util.HashMap; -import java.util.Map; - -import javax.xml.rpc.JAXRPCException; -import javax.xml.rpc.encoding.TypeMapping; -import javax.xml.rpc.encoding.TypeMappingRegistry; - -import org.jboss.util.NotImplementedException; -import org.jboss.ws.common.Constants; -import org.jboss.ws.common.jaxrpc.LiteralTypeMapping; -import org.jboss.ws.common.jaxrpc.TypeMappingImpl; - -/** - * This defines a registry of TypeMapping instances for encoding styles. - * - * @author Thomas.Diesler(a)jboss.org - * @since 04-Dec-2004 - */ -public class TypeMappingRegistryImpl implements TypeMappingRegistry -{ - // The registered typeMapping for the literal encoding style - private Map<String, TypeMappingImpl> typeMappings = new HashMap<String, TypeMappingImpl>(); - - public TypeMappingRegistryImpl() - { - typeMappings.put(Constants.URI_LITERAL_ENC, new LiteralTypeMapping()); - typeMappings.put(Constants.URI_SOAP11_ENC, new EncodedTypeMapping()); - } - - /** - * Removes all registered TypeMappings and encodingStyleURIs from this TypeMappingRegistry. - */ - public void clear() - { - typeMappings.clear(); - } - - /** - * Gets the registered default TypeMapping instance. - * This method returns null if there is no registered default TypeMapping in the registry. - * @return The registered default TypeMapping instance or null - */ - public TypeMapping getDefaultTypeMapping() - { - return typeMappings.get(Constants.URI_LITERAL_ENC); - } - - /** - * Registers the TypeMapping instance that is default for all encoding styles supported by the TypeMappingRegistry. - * A default TypeMapping should include serializers and deserializers that are independent of and usable with any - * encoding style. Successive invocations of the registerDefault method replace any existing default TypeMapping instance. - * - * If the default TypeMapping is registered, any other TypeMapping instances registered through the - * TypeMappingRegistry.register method (for a set of encodingStyle URIs) override the default TypeMapping. - * - * @param mapping TypeMapping instance - * @throws javax.xml.rpc.JAXRPCException If there is an error in the registration of the default TypeMapping - */ - public void registerDefault(TypeMapping mapping) - { - throw new NotImplementedException(); - } - - /** - * Creates a new empty TypeMapping object. - * @return TypeMapping instance - */ - public TypeMapping createTypeMapping() - { - throw new NotImplementedException(); - } - - /** - * Returns the registered TypeMapping for the specified encodingStyle URI. If there is no registered TypeMapping for - * the specified encodingStyleURI, this method returns null. - * @param encodingStyleURI Encoding style specified as an URI - * @return TypeMapping for the specified encodingStyleURI or null - */ - public TypeMapping getTypeMapping(String encodingStyleURI) - { - assertEncodingStyle(encodingStyleURI); - return typeMappings.get(encodingStyleURI); - } - - /** - * Returns a list of registered encodingStyle URIs in this TypeMappingRegistry instance. - * @return Array of the registered encodingStyle URIs - */ - public String[] getRegisteredEncodingStyleURIs() - { - return new String[]{Constants.URI_LITERAL_ENC, Constants.URI_SOAP11_ENC}; - } - - /** - * Registers a TypeMapping instance with the TypeMappingRegistry. - * This method replaces any existing registered TypeMapping instance for the specified encodingStyleURI. - * - * @param encodingStyleURI An encoding style specified as an URI. - * @param mapping TypeMapping instance - * @return Previous TypeMapping associated with the specified encodingStyleURI, or null if there was no - * TypeMapping associated with the specified encodingStyleURI - * @throws javax.xml.rpc.JAXRPCException If there is an error in the registration of the TypeMapping for the specified encodingStyleURI. - */ - public TypeMapping register(String encodingStyleURI, TypeMapping mapping) - { - throw new NotImplementedException(); - } - - /** - * Unregisters a TypeMapping instance, if present, from the specified encodingStyleURI. - * @param encodingStyleURI Encoding style specified as an URI - * @return TypeMapping instance that has been unregistered or null if there was no - * TypeMapping registered for the specified encodingStyleURI - */ - public TypeMapping unregisterTypeMapping(String encodingStyleURI) - { - throw new NotImplementedException(); - } - - /** - * Removes a TypeMapping from the TypeMappingRegistry. - * A TypeMapping is associated with 1 or more encodingStyleURIs. This method unregisters the specified - * TypeMapping instance from all associated encodingStyleURIs and then removes this TypeMapping - * instance from the registry. - * - * @param mapping TypeMapping to be removed - * @return true if specified TypeMapping is removed from the TypeMappingRegistry; - * false if the specified TypeMapping was not in the TypeMappingRegistry - */ - public boolean removeTypeMapping(TypeMapping mapping) - { - throw new NotImplementedException(); - } - - /** Assert the literal encoding style */ - private void assertEncodingStyle(String encURI) - { - if (Constants.URI_LITERAL_ENC.equals(encURI) == false && Constants.URI_SOAP11_ENC.equals(encURI) == false) - throw new JAXRPCException("Unsupported encoding style: " + encURI); - } -} Deleted: branches/tdiesler/trunk/src/main/java/org/jboss/ws/core/jaxrpc/Use.java =================================================================== --- branches/tdiesler/trunk/src/main/java/org/jboss/ws/core/jaxrpc/Use.java 2006-12-06 10:47:51 UTC (rev 1571) +++ branches/tdiesler/trunk/src/main/java/org/jboss/ws/core/jaxrpc/Use.java 2006-12-06 11:19:33 UTC (rev 1572) @@ -1,74 +0,0 @@ -/* -* JBoss, Home of Professional Open Source -* Copyright 2005, JBoss Inc., and individual contributors as indicated -* by the @authors tag. See the copyright.txt in the distribution for a -* full listing of individual contributors. -* -* This is free software; you can redistribute it and/or modify it -* under the terms of the GNU Lesser General Public License as -* published by the Free Software Foundation; either version 2.1 of -* the License, or (at your option) any later version. -* -* This software is distributed in the hope that it will be useful, -* but WITHOUT ANY WARRANTY; without even the implied warranty of -* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU -* Lesser General Public License for more details. -* -* You should have received a copy of the GNU Lesser General Public -* License along with this software; if not, write to the Free -* Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA -* 02110-1301 USA, or see the FSF site: http://www.fsf.org. -*/ -package org.jboss.ws.core.jaxrpc; - -import org.jboss.ws.common.Constants; - -// $Id$ - -/** A type-safe enumeration for encoding use. - * - * @author Thomas.Diesler(a)jboss.org - * @since 16-Oct-2005 - */ -public class Use -{ - private String use; - - public static final Use LITERAL = new Use("literal"); - public static final Use ENCODED = new Use("encoded"); - - private Use(String use) - { - this.use = use; - } - - public static Use getDefaultUse() - { - return LITERAL; - } - - public static Use valueOf(String encodingStyle) - { - if (Constants.URI_LITERAL_ENC.equals(encodingStyle) || LITERAL.use.equals(encodingStyle)) - return LITERAL; - if (Constants.URI_SOAP11_ENC.equals(encodingStyle) || ENCODED.use.equals(encodingStyle)) - return ENCODED; - - throw new IllegalArgumentException("Unsupported encoding style: " + encodingStyle); - } - - public String toURI() - { - String encURI = null; - if (this == LITERAL) - encURI = Constants.URI_LITERAL_ENC; - else if (this == ENCODED) - encURI = Constants.URI_SOAP11_ENC; - return encURI; - } - - public String toString() - { - return use; - } -} Modified: branches/tdiesler/trunk/src/main/java/org/jboss/ws/core/jaxws/JAXBDeserializer.java =================================================================== --- branches/tdiesler/trunk/src/main/java/org/jboss/ws/core/jaxws/JAXBDeserializer.java 2006-12-06 10:47:51 UTC (rev 1571) +++ branches/tdiesler/trunk/src/main/java/org/jboss/ws/core/jaxws/JAXBDeserializer.java 2006-12-06 11:19:33 UTC (rev 1572) @@ -34,9 +34,9 @@ import org.jboss.logging.Logger; import org.jboss.ws.common.binding.BindingException; +import org.jboss.ws.common.binding.ComplexTypeDeserializer; import org.jboss.ws.common.binding.SerializationContext; import org.jboss.ws.common.jaxrpc.TypeMappingImpl; -import org.jboss.ws.core.binding.ComplexTypeDeserializer; import org.jboss.ws.extras.xop.jaxws.AttachmentUnmarshallerImpl; /** Modified: branches/tdiesler/trunk/src/main/java/org/jboss/ws/core/jaxws/JAXBSerializer.java =================================================================== --- branches/tdiesler/trunk/src/main/java/org/jboss/ws/core/jaxws/JAXBSerializer.java 2006-12-06 10:47:51 UTC (rev 1571) +++ branches/tdiesler/trunk/src/main/java/org/jboss/ws/core/jaxws/JAXBSerializer.java 2006-12-06 11:19:33 UTC (rev 1572) @@ -33,9 +33,9 @@ import org.jboss.logging.Logger; import org.jboss.ws.common.binding.BindingException; +import org.jboss.ws.common.binding.ComplexTypeSerializer; import org.jboss.ws.common.binding.SerializationContext; import org.jboss.ws.common.jaxrpc.TypeMappingImpl; -import org.jboss.ws.core.binding.ComplexTypeSerializer; import org.jboss.ws.extras.xop.jaxws.AttachmentMarshallerImpl; import org.w3c.dom.NamedNodeMap; Modified: branches/tdiesler/trunk/src/main/java/org/jboss/ws/core/jaxws/core/SOAPFaultHelperJAXWS.java =================================================================== --- branches/tdiesler/trunk/src/main/java/org/jboss/ws/core/jaxws/core/SOAPFaultHelperJAXWS.java 2006-12-06 10:47:51 UTC (rev 1571) +++ branches/tdiesler/trunk/src/main/java/org/jboss/ws/core/jaxws/core/SOAPFaultHelperJAXWS.java 2006-12-06 11:19:33 UTC (rev 1572) @@ -39,6 +39,7 @@ import org.jboss.logging.Logger; import org.jboss.ws.common.Constants; +import org.jboss.ws.common.NameImpl; import org.jboss.ws.common.binding.BindingException; import org.jboss.ws.common.binding.DeserializerSupport; import org.jboss.ws.common.binding.SerializationContext; @@ -52,7 +53,6 @@ import org.jboss.ws.core.CommonMessageContext; import org.jboss.ws.core.jaxrpc.SOAPFaultHelperJAXRPC; import org.jboss.ws.core.soap.MessageContextAssociation; -import org.jboss.ws.core.soap.NameImpl; import org.jboss.ws.core.soap.SOAPFactoryImpl; import org.w3c.dom.Element; Modified: branches/tdiesler/trunk/src/main/java/org/jboss/ws/core/metadata/builder/MetaDataBuilder.java =================================================================== --- branches/tdiesler/trunk/src/main/java/org/jboss/ws/core/metadata/builder/MetaDataBuilder.java 2006-12-06 10:47:51 UTC (rev 1571) +++ branches/tdiesler/trunk/src/main/java/org/jboss/ws/core/metadata/builder/MetaDataBuilder.java 2006-12-06 11:19:33 UTC (rev 1572) @@ -45,6 +45,14 @@ import org.jboss.logging.Logger; import org.jboss.ws.common.Constants; import org.jboss.ws.common.WSException; +import org.jboss.ws.common.jaxrpc.Use; +import org.jboss.ws.common.metadata.j2ee.UnifiedApplicationMetaData; +import org.jboss.ws.common.metadata.j2ee.UnifiedBeanMetaData; +import org.jboss.ws.common.metadata.j2ee.UnifiedEjbPortComponentMetaData; +import org.jboss.ws.common.metadata.j2ee.UnifiedMessageDrivenMetaData; +import org.jboss.ws.common.metadata.j2ee.UnifiedWebMetaData; +import org.jboss.ws.common.metadata.j2ee.UnifiedWebSecurityMetaData; +import org.jboss.ws.common.metadata.j2ee.UnifiedWebSecurityMetaData.UnifiedWebResourceCollection; import org.jboss.ws.common.metadata.wsdl.NCName; import org.jboss.ws.common.metadata.wsdl.WSDLBinding; import org.jboss.ws.common.metadata.wsdl.WSDLBindingOperation; @@ -57,14 +65,6 @@ import org.jboss.ws.common.umdm.ServerEndpointMetaData; import org.jboss.ws.common.utils.ObjectNameFactory; import org.jboss.ws.core.CommonSOAPBinding; -import org.jboss.ws.core.jaxrpc.Use; -import org.jboss.ws.core.metadata.j2ee.UnifiedApplicationMetaData; -import org.jboss.ws.core.metadata.j2ee.UnifiedBeanMetaData; -import org.jboss.ws.core.metadata.j2ee.UnifiedEjbPortComponentMetaData; -import org.jboss.ws.core.metadata.j2ee.UnifiedMessageDrivenMetaData; -import org.jboss.ws.core.metadata.j2ee.UnifiedWebMetaData; -import org.jboss.ws.core.metadata.j2ee.UnifiedWebSecurityMetaData; -import org.jboss.ws.core.metadata.j2ee.UnifiedWebSecurityMetaData.UnifiedWebResourceCollection; import org.jboss.ws.core.metadata.wsse.WSSecurityConfiguration; import org.jboss.ws.core.metadata.wsse.WSSecurityConfigurationFactory; import org.jboss.ws.core.server.ServiceEndpointManager; Modified: branches/tdiesler/trunk/src/main/java/org/jboss/ws/core/metadata/builder/jaxrpc/JAXRPCClientMetaDataBuilder.java =================================================================== --- branches/tdiesler/trunk/src/main/java/org/jboss/ws/core/metadata/builder/jaxrpc/JAXRPCClientMetaDataBuilder.java 2006-12-06 10:47:51 UTC (rev 1571) +++ branches/tdiesler/trunk/src/main/java/org/jboss/ws/core/metadata/builder/jaxrpc/JAXRPCClientMetaDataBuilder.java 2006-12-06 11:19:33 UTC (rev 1572) @@ -32,6 +32,9 @@ import org.jboss.logging.Logger; import org.jboss.ws.common.Constants; import org.jboss.ws.common.WSException; +import org.jboss.ws.common.metadata.config.jaxrpc.WSClientConfigJAXRPC; +import org.jboss.ws.common.metadata.j2ee.UnifiedHandlerMetaData; +import org.jboss.ws.common.metadata.j2ee.UnifiedServiceRefMetaData; import org.jboss.ws.common.metadata.jaxrpcmapping.JavaWsdlMapping; import org.jboss.ws.common.metadata.jaxrpcmapping.JavaWsdlMappingFactory; import org.jboss.ws.common.metadata.jaxrpcmapping.ServiceEndpointInterfaceMapping; @@ -45,9 +48,6 @@ import org.jboss.ws.common.umdm.UnifiedMetaData; import org.jboss.ws.common.umdm.EndpointMetaData.Type; import org.jboss.ws.common.umdm.HandlerMetaData.HandlerType; -import org.jboss.ws.core.metadata.config.jaxrpc.WSClientConfigJAXRPC; -import org.jboss.ws.core.metadata.j2ee.UnifiedHandlerMetaData; -import org.jboss.ws.core.metadata.j2ee.UnifiedServiceRefMetaData; import org.jboss.ws.core.metadata.wsse.WSSecurityConfiguration; import org.jboss.ws.core.metadata.wsse.WSSecurityConfigurationFactory; Modified: branches/tdiesler/trunk/src/main/java/org/jboss/ws/core/metadata/builder/jaxrpc/JAXRPCMetaDataBuilder.java =================================================================== --- branches/tdiesler/trunk/src/main/java/org/jboss/ws/core/metadata/builder/jaxrpc/JAXRPCMetaDataBuilder.java 2006-12-06 10:47:51 UTC (rev 1571) +++ branches/tdiesler/trunk/src/main/java/org/jboss/ws/core/metadata/builder/jaxrpc/JAXRPCMetaDataBuilder.java 2006-12-06 11:19:33 UTC (rev 1572) @@ -41,6 +41,8 @@ import org.jboss.ws.common.jaxrpc.LiteralTypeMapping; import org.jboss.ws.common.jaxrpc.Style; import org.jboss.ws.common.jaxrpc.TypeMappingImpl; +import org.jboss.ws.common.jaxrpc.TypeMappingRegistryImpl; +import org.jboss.ws.common.jaxrpc.Use; import org.jboss.ws.common.metadata.jaxrpcmapping.ExceptionMapping; import org.jboss.ws.common.metadata.jaxrpcmapping.JavaWsdlMapping; import org.jboss.ws.common.metadata.jaxrpcmapping.JavaXmlTypeMapping; @@ -82,9 +84,7 @@ import org.jboss.ws.common.umdm.TypesMetaData; import org.jboss.ws.common.umdm.WrappedParameter; import org.jboss.ws.common.utils.JavaUtils; -import org.jboss.ws.core.jaxrpc.TypeMappingRegistryImpl; import org.jboss.ws.core.jaxrpc.UnqualifiedFaultException; -import org.jboss.ws.core.jaxrpc.Use; import org.jboss.ws.core.metadata.builder.MetaDataBuilder; import org.jboss.ws.extras.addressing.AddressingPropertiesImpl; import org.jboss.ws.extras.addressing.metadata.AddressingOpMetaExt; Modified: branches/tdiesler/trunk/src/main/java/org/jboss/ws/core/metadata/builder/jaxrpc/JAXRPCServerMetaDataBuilder.java =================================================================== --- branches/tdiesler/trunk/src/main/java/org/jboss/ws/core/metadata/builder/jaxrpc/JAXRPCServerMetaDataBuilder.java 2006-12-06 10:47:51 UTC (rev 1571) +++ branches/tdiesler/trunk/src/main/java/org/jboss/ws/core/metadata/builder/jaxrpc/JAXRPCServerMetaDataBuilder.java 2006-12-06 11:19:33 UTC (rev 1572) @@ -29,6 +29,12 @@ import org.jboss.logging.Logger; import org.jboss.ws.common.WSException; +import org.jboss.ws.common.metadata.config.jaxrpc.WSEndpointConfigJAXRPC; +import org.jboss.ws.common.metadata.j2ee.UnifiedApplicationMetaData; +import org.jboss.ws.common.metadata.j2ee.UnifiedBeanMetaData; +import org.jboss.ws.common.metadata.j2ee.UnifiedEjbPortComponentMetaData; +import org.jboss.ws.common.metadata.j2ee.UnifiedHandlerMetaData; +import org.jboss.ws.common.metadata.j2ee.UnifiedWebMetaData; import org.jboss.ws.common.metadata.jaxrpcmapping.JavaWsdlMapping; import org.jboss.ws.common.metadata.jaxrpcmapping.ServiceEndpointInterfaceMapping; import org.jboss.ws.common.metadata.webservices.PortComponentMetaData; @@ -41,12 +47,6 @@ import org.jboss.ws.common.umdm.UnifiedMetaData; import org.jboss.ws.common.umdm.EndpointMetaData.Type; import org.jboss.ws.common.umdm.HandlerMetaData.HandlerType; -import org.jboss.ws.core.metadata.config.jaxrpc.WSEndpointConfigJAXRPC; -import org.jboss.ws.core.metadata.j2ee.UnifiedApplicationMetaData; -import org.jboss.ws.core.metadata.j2ee.UnifiedBeanMetaData; -import org.jboss.ws.core.metadata.j2ee.UnifiedEjbPortComponentMetaData; -import org.jboss.ws.core.metadata.j2ee.UnifiedHandlerMetaData; -import org.jboss.ws.core.metadata.j2ee.UnifiedWebMetaData; import org.jboss.ws.core.metadata.wsse.WSSecurityConfiguration; /** Modified: branches/tdiesler/trunk/src/main/java/org/jboss/ws/core/metadata/builder/jaxws/JAXWSClientEndpointMetaDataBuilder.java =================================================================== --- branches/tdiesler/trunk/src/main/java/org/jboss/ws/core/metadata/builder/jaxws/JAXWSClientEndpointMetaDataBuilder.java 2006-12-06 10:47:51 UTC (rev 1571) +++ branches/tdiesler/trunk/src/main/java/org/jboss/ws/core/metadata/builder/jaxws/JAXWSClientEndpointMetaDataBuilder.java 2006-12-06 11:19:33 UTC (rev 1572) @@ -27,9 +27,9 @@ import javax.xml.ws.BindingType; import org.jboss.logging.Logger; +import org.jboss.ws.common.metadata.config.jaxws.WSClientConfigJAXWS; import org.jboss.ws.common.umdm.EndpointMetaData; import org.jboss.ws.common.umdm.HandlerMetaData.HandlerType; -import org.jboss.ws.core.metadata.config.jaxws.WSClientConfigJAXWS; /** * A client side meta data builder that is based on JSR-181 annotations Modified: branches/tdiesler/trunk/src/main/java/org/jboss/ws/core/metadata/builder/jaxws/JAXWSMetaDataBuilderEJB21.java =================================================================== --- branches/tdiesler/trunk/src/main/java/org/jboss/ws/core/metadata/builder/jaxws/JAXWSMetaDataBuilderEJB21.java 2006-12-06 10:47:51 UTC (rev 1571) +++ branches/tdiesler/trunk/src/main/java/org/jboss/ws/core/metadata/builder/jaxws/JAXWSMetaDataBuilderEJB21.java 2006-12-06 11:19:33 UTC (rev 1572) @@ -26,9 +26,9 @@ import org.jboss.logging.Logger; import org.jboss.ws.common.WSException; +import org.jboss.ws.common.metadata.j2ee.UnifiedApplicationMetaData; +import org.jboss.ws.common.metadata.j2ee.UnifiedBeanMetaData; import org.jboss.ws.common.umdm.UnifiedMetaData; -import org.jboss.ws.core.metadata.j2ee.UnifiedApplicationMetaData; -import org.jboss.ws.core.metadata.j2ee.UnifiedBeanMetaData; import org.jboss.ws.core.server.UnifiedDeploymentInfo; /** Modified: branches/tdiesler/trunk/src/main/java/org/jboss/ws/core/metadata/builder/jaxws/JAXWSMetaDataBuilderEJB3.java =================================================================== --- branches/tdiesler/trunk/src/main/java/org/jboss/ws/core/metadata/builder/jaxws/JAXWSMetaDataBuilderEJB3.java 2006-12-06 10:47:51 UTC (rev 1571) +++ branches/tdiesler/trunk/src/main/java/org/jboss/ws/core/metadata/builder/jaxws/JAXWSMetaDataBuilderEJB3.java 2006-12-06 11:19:33 UTC (rev 1572) @@ -29,9 +29,9 @@ import org.jboss.annotation.security.SecurityDomain; import org.jboss.logging.Logger; import org.jboss.ws.common.WSException; +import org.jboss.ws.common.metadata.j2ee.UnifiedApplicationMetaData; +import org.jboss.ws.common.metadata.j2ee.UnifiedBeanMetaData; import org.jboss.ws.common.umdm.UnifiedMetaData; -import org.jboss.ws.core.metadata.j2ee.UnifiedApplicationMetaData; -import org.jboss.ws.core.metadata.j2ee.UnifiedBeanMetaData; import org.jboss.ws.core.server.UnifiedDeploymentInfo; /** Modified: branches/tdiesler/trunk/src/main/java/org/jboss/ws/core/metadata/builder/jaxws/JAXWSMetaDataBuilderJSE.java =================================================================== --- branches/tdiesler/trunk/src/main/java/org/jboss/ws/core/metadata/builder/jaxws/JAXWSMetaDataBuilderJSE.java 2006-12-06 10:47:51 UTC (rev 1571) +++ branches/tdiesler/trunk/src/main/java/org/jboss/ws/core/metadata/builder/jaxws/JAXWSMetaDataBuilderJSE.java 2006-12-06 11:19:33 UTC (rev 1572) @@ -26,8 +26,8 @@ import org.jboss.logging.Logger; import org.jboss.ws.common.WSException; +import org.jboss.ws.common.metadata.j2ee.UnifiedWebMetaData; import org.jboss.ws.common.umdm.UnifiedMetaData; -import org.jboss.ws.core.metadata.j2ee.UnifiedWebMetaData; import org.jboss.ws.core.server.UnifiedDeploymentInfo; /** Modified: branches/tdiesler/trunk/src/main/java/org/jboss/ws/core/metadata/builder/jaxws/JAXWSWebServiceMetaDataBuilder.java =================================================================== --- branches/tdiesler/trunk/src/main/java/org/jboss/ws/core/metadata/builder/jaxws/JAXWSWebServiceMetaDataBuilder.java 2006-12-06 10:47:51 UTC (rev 1571) +++ branches/tdiesler/trunk/src/main/java/org/jboss/ws/core/metadata/builder/jaxws/JAXWSWebServiceMetaDataBuilder.java 2006-12-06 11:19:33 UTC (rev 1572) @@ -62,6 +62,12 @@ import org.jboss.ws.common.Constants; import org.jboss.ws.common.WSException; import org.jboss.ws.common.jaxrpc.Style; +import org.jboss.ws.common.jaxrpc.Use; +import org.jboss.ws.common.metadata.config.jaxws.WSEndpointConfigJAXWS; +import org.jboss.ws.common.metadata.j2ee.UnifiedHandlerMetaData; +import org.jboss.ws.common.metadata.jsr181.HandlerChainFactory; +import org.jboss.ws.common.metadata.jsr181.HandlerChainMetaData; +import org.jboss.ws.common.metadata.jsr181.HandlerChainsMetaData; import org.jboss.ws.common.metadata.wsdl.WSDLDefinitions; import org.jboss.ws.common.metadata.wsdl.WSDLUtils; import org.jboss.ws.common.metadata.wsdl.WSDLWriter; @@ -82,16 +88,10 @@ import org.jboss.ws.common.utils.IOUtils; import org.jboss.ws.common.utils.JBossWSEntityResolver; import org.jboss.ws.common.utils.JavaUtils; -import org.jboss.ws.core.jaxrpc.Use; import org.jboss.ws.core.jaxws.DynamicWrapperGenerator; import org.jboss.ws.core.jaxws.WrapperGenerator; import org.jboss.ws.core.metadata.acessor.JAXBAccessor; import org.jboss.ws.core.metadata.builder.MetaDataBuilder; -import org.jboss.ws.core.metadata.config.jaxws.WSEndpointConfigJAXWS; -import org.jboss.ws.core.metadata.j2ee.UnifiedHandlerMetaData; -import org.jboss.ws.core.metadata.jsr181.HandlerChainFactory; -import org.jboss.ws.core.metadata.jsr181.HandlerChainMetaData; -import org.jboss.ws.core.metadata.jsr181.HandlerChainsMetaData; import org.jboss.ws.core.metadata.wsse.WSSecurityConfiguration; import org.jboss.ws.core.server.UnifiedDeploymentInfo; import org.jboss.ws.extras.addressing.AddressingPropertiesImpl; Deleted: branches/tdiesler/trunk/src/main/java/org/jboss/ws/core/metadata/config/WSCommonConfig.java =================================================================== --- branches/tdiesler/trunk/src/main/java/org/jboss/ws/core/metadata/config/WSCommonConfig.java 2006-12-06 10:47:51 UTC (rev 1571) +++ branches/tdiesler/trunk/src/main/java/org/jboss/ws/core/metadata/config/WSCommonConfig.java 2006-12-06 11:19:33 UTC (rev 1572) @@ -1,53 +0,0 @@ -/* - * JBoss, Home of Professional Open Source - * Copyright 2005, JBoss Inc., and individual contributors as indicated - * by the @authors tag. See the copyright.txt in the distribution for a - * full listing of individual contributors. - * - * This is free software; you can redistribute it and/or modify it - * under the terms of the GNU Lesser General Public License as - * published by the Free Software Foundation; either version 2.1 of - * the License, or (at your option) any later version. - * - * This software is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * Lesser General Public License for more details. - * - * You should have received a copy of the GNU Lesser General Public - * License along with this software; if not, write to the Free - * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA - * 02110-1301 USA, or see the FSF site: http://www.fsf.org. - */ -package org.jboss.ws.core.metadata.config; - -//$Id$ - -import java.util.List; - -import org.jboss.ws.common.umdm.EndpointMetaData; -import org.jboss.ws.common.umdm.HandlerMetaData; -import org.jboss.ws.common.umdm.HandlerMetaData.HandlerType; - -/** - * A common configuration - * - * @author Thomas.Diesler(a)jboss.org - * @since 18-Dec-2005 - */ -public abstract class WSCommonConfig -{ - private String configName; - - public String getConfigName() - { - return configName; - } - - public void setConfigName(String configName) - { - this.configName = configName; - } - - public abstract List<HandlerMetaData> getHandlers(EndpointMetaData epMetaData, HandlerType type); -} Deleted: branches/tdiesler/trunk/src/main/java/org/jboss/ws/core/metadata/config/WSConfigFactory.java =================================================================== --- branches/tdiesler/trunk/src/main/java/org/jboss/ws/core/metadata/config/WSConfigFactory.java 2006-12-06 10:47:51 UTC (rev 1571) +++ branches/tdiesler/trunk/src/main/java/org/jboss/ws/core/metadata/config/WSConfigFactory.java 2006-12-06 11:19:33 UTC (rev 1572) @@ -1,129 +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.metadata.config; - -//$Id$ - -import java.io.IOException; -import java.io.InputStream; -import java.net.URL; - -import org.jboss.logging.Logger; -import org.jboss.ws.common.WSException; -import org.jboss.ws.common.utils.DOMUtils; -import org.jboss.ws.common.utils.JBossWSEntityResolver; -import org.jboss.ws.core.metadata.config.jaxrpc.WSConfigFactoryJAXRPC; -import org.jboss.ws.core.metadata.config.jaxws.WSConfigFactoryJAXWS; -import org.jboss.xb.binding.JBossXBException; -import org.jboss.xb.binding.Unmarshaller; -import org.jboss.xb.binding.UnmarshallerFactory; -import org.jboss.xb.binding.sunday.unmarshalling.SchemaBinding; -import org.jboss.xb.binding.sunday.unmarshalling.XsdBinder; -import org.w3c.dom.Element; - -/** - * A factory for the JBossWS endpoint/client configuration - * - * @author Thomas.Diesler(a)jboss.org - * @since 18-Dec-2005 - */ -public class WSConfigFactory -{ - // provide logging - private final Logger log = Logger.getLogger(WSConfigFactory.class); - - private static String URN_JAXRPC_CONFIG = "urn:jboss:jaxrpc-config:2.0"; - private static String URN_JAXWS_CONFIG = "urn:jboss:jaxws-config:2.0"; - - // Hide constructor - private WSConfigFactory() - { - } - - /** Create a new instance of the factory - */ - public static WSConfigFactory newInstance() - { - return new WSConfigFactory(); - } - - public Object parseWithSchemaBinding(URL configURL) throws IOException, JBossXBException - { - log.debug("parse: " + configURL); - - String configSchema = "schema/jaxrpc-config_2_0.xsd"; - URL xsdURL = Thread.currentThread().getContextClassLoader().getResource(configSchema); - if (xsdURL == null) - throw new WSException("Cannot find: " + configSchema); - - InputStream xsd = xsdURL.openStream(); - SchemaBinding schemaBinding = XsdBinder.bind(xsd, "UTF-8"); - - Unmarshaller unmarshaller = UnmarshallerFactory.newInstance().newUnmarshaller(); - unmarshaller.setValidation(true); - unmarshaller.setSchemaValidation(true); - unmarshaller.setEntityResolver(new JBossWSEntityResolver()); - Object wsConfig = unmarshaller.unmarshal(configURL.openStream(), schemaBinding); - return wsConfig; - } - - // Below is ObjectModelFactory stuff, which should be removed when parseWithSchemaBinding works. - - public Object parseWithObjectModelFactory(URL configURL) throws IOException, JBossXBException - { - log.debug("parse: " + configURL); - - Unmarshaller unmarshaller = UnmarshallerFactory.newInstance().newUnmarshaller(); - unmarshaller.setValidation(true); - unmarshaller.setSchemaValidation(true); - - Object wsConfig; - String nsURI = getNamespaceURI(configURL); - if (URN_JAXRPC_CONFIG.equals(nsURI)) - { - wsConfig = unmarshaller.unmarshal(configURL.openStream(), new WSConfigFactoryJAXRPC(), null); - } - else if (URN_JAXWS_CONFIG.equals(nsURI)) - { - wsConfig = unmarshaller.unmarshal(configURL.openStream(), new WSConfigFactoryJAXWS(), null); - } - else - { - throw new WSException("Invalid config namespace: " + nsURI); - } - - return wsConfig; - } - - private String getNamespaceURI(URL configURL) - { - try - { - Element root = DOMUtils.parse(configURL.openStream()); - return root.getNamespaceURI(); - } - catch (IOException ex) - { - throw new WSException(ex); - } - } -} Deleted: branches/tdiesler/trunk/src/main/java/org/jboss/ws/core/server/ServerConfig.java =================================================================== --- branches/tdiesler/trunk/src/main/java/org/jboss/ws/core/server/ServerConfig.java 2006-12-06 10:47:51 UTC (rev 1571) +++ branches/tdiesler/trunk/src/main/java/org/jboss/ws/core/server/ServerConfig.java 2006-12-06 11:19:33 UTC (rev 1572) @@ -1,41 +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.server; - -// $Id: ServiceEndpointManagerFactory.java 293 2006-05-08 16:31:50Z thomas.diesler(a)jboss.com $ - -import java.io.File; - -/** - * Interface to container independent config - * - * @author Thomas.Diesler(a)jboss.org - * @since 08-May-2006 - */ -public interface ServerConfig -{ - static final String BEAN_NAME = "ServerConfig"; - - File getServerTempDir(); - - File getServerDataDir(); -} Deleted: branches/tdiesler/trunk/src/main/java/org/jboss/ws/core/server/ServerConfigFactory.java =================================================================== --- branches/tdiesler/trunk/src/main/java/org/jboss/ws/core/server/ServerConfigFactory.java 2006-12-06 10:47:51 UTC (rev 1571) +++ branches/tdiesler/trunk/src/main/java/org/jboss/ws/core/server/ServerConfigFactory.java 2006-12-06 11:19:33 UTC (rev 1572) @@ -1,57 +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.server; - -import org.jboss.kernel.spi.registry.KernelRegistry; -import org.jboss.logging.Logger; - -// $Id: ServiceEndpointManagerFactory.java 293 2006-05-08 16:31:50Z thomas.diesler(a)jboss.com $ - -/** - * Factory to container independent config - * - * @author Thomas.Diesler(a)jboss.org - * @since 08-May-2006 - */ -public class ServerConfigFactory -{ - // provide logging - private static final Logger log = Logger.getLogger(ServerConfigFactory.class); - - private static ServerConfigFactory instance = new ServerConfigFactory(); - - // Hide ctor - protected ServerConfigFactory() - { - } - - public static ServerConfigFactory getInstance() - { - return instance; - } - - public ServerConfig getServerConfig() - { - KernelRegistry registry = KernelLocator.getKernel().getRegistry(); - return (ServerConfig)registry.getEntry(ServerConfig.BEAN_NAME).getTarget(); - } -} Modified: branches/tdiesler/trunk/src/main/java/org/jboss/ws/core/server/ServiceEndpointInfo.java =================================================================== --- branches/tdiesler/trunk/src/main/java/org/jboss/ws/core/server/ServiceEndpointInfo.java 2006-12-06 10:47:51 UTC (rev 1571) +++ branches/tdiesler/trunk/src/main/java/org/jboss/ws/core/server/ServiceEndpointInfo.java 2006-12-06 11:19:33 UTC (rev 1572) @@ -26,11 +26,11 @@ import javax.management.ObjectName; import org.jboss.ws.common.WSException; +import org.jboss.ws.common.metadata.j2ee.UnifiedApplicationMetaData; +import org.jboss.ws.common.metadata.j2ee.UnifiedBeanMetaData; +import org.jboss.ws.common.metadata.j2ee.UnifiedMessageDrivenMetaData; +import org.jboss.ws.common.metadata.j2ee.UnifiedSessionMetaData; import org.jboss.ws.common.umdm.ServerEndpointMetaData; -import org.jboss.ws.core.metadata.j2ee.UnifiedApplicationMetaData; -import org.jboss.ws.core.metadata.j2ee.UnifiedBeanMetaData; -import org.jboss.ws.core.metadata.j2ee.UnifiedMessageDrivenMetaData; -import org.jboss.ws.core.metadata.j2ee.UnifiedSessionMetaData; import org.jboss.ws.core.server.UnifiedDeploymentInfo.DeploymentType; /** Modified: branches/tdiesler/trunk/src/main/java/org/jboss/ws/core/server/ServiceEndpointManager.java =================================================================== --- branches/tdiesler/trunk/src/main/java/org/jboss/ws/core/server/ServiceEndpointManager.java 2006-12-06 10:47:51 UTC (rev 1571) +++ branches/tdiesler/trunk/src/main/java/org/jboss/ws/core/server/ServiceEndpointManager.java 2006-12-06 11:19:33 UTC (rev 1572) @@ -63,9 +63,9 @@ import org.jboss.ws.common.umdm.UnifiedMetaData; import org.jboss.ws.common.umdm.EndpointMetaData.Type; import org.jboss.ws.common.umdm.HandlerMetaData.HandlerType; -import org.jboss.ws.common.utils.ThreadLocalAssociation; import org.jboss.ws.core.CommonMessageContext; import org.jboss.ws.core.MessageContextPropertyHelper; +import org.jboss.ws.core.ThreadLocalAssociation; import org.jboss.ws.core.jaxrpc.handler.MessageContextJAXRPC; import org.jboss.ws.core.jaxrpc.handler.SOAPMessageContextJAXRPC; import org.jboss.ws.core.jaxws.handler.MessageContextJAXWS; Modified: branches/tdiesler/trunk/src/main/java/org/jboss/ws/core/server/WSDLFilePublisher.java =================================================================== --- branches/tdiesler/trunk/src/main/java/org/jboss/ws/core/server/WSDLFilePublisher.java 2006-12-06 10:47:51 UTC (rev 1571) +++ branches/tdiesler/trunk/src/main/java/org/jboss/ws/core/server/WSDLFilePublisher.java 2006-12-06 11:19:33 UTC (rev 1572) @@ -43,6 +43,8 @@ import org.jboss.util.NotImplementedException; import org.jboss.ws.common.Constants; import org.jboss.ws.common.WSException; +import org.jboss.ws.common.config.ServerConfig; +import org.jboss.ws.common.config.ServerConfigFactory; import org.jboss.ws.common.metadata.wsdl.WSDLDefinitions; import org.jboss.ws.common.umdm.ServiceMetaData; import org.jboss.ws.common.umdm.UnifiedMetaData; Modified: branches/tdiesler/trunk/src/main/java/org/jboss/ws/core/soap/JAXWSPayloadBuilder.java =================================================================== --- branches/tdiesler/trunk/src/main/java/org/jboss/ws/core/soap/JAXWSPayloadBuilder.java 2006-12-06 10:47:51 UTC (rev 1571) +++ branches/tdiesler/trunk/src/main/java/org/jboss/ws/core/soap/JAXWSPayloadBuilder.java 2006-12-06 11:19:33 UTC (rev 1572) @@ -34,6 +34,7 @@ import javax.xml.soap.SOAPHeader; import javax.xml.transform.stream.StreamSource; +import org.jboss.ws.common.NameImpl; import org.jboss.ws.common.utils.DOMUtils; import org.jboss.ws.common.utils.DOMWriter; import org.w3c.dom.Element; Modified: branches/tdiesler/trunk/src/main/java/org/jboss/ws/core/soap/MessageContextAssociation.java =================================================================== --- branches/tdiesler/trunk/src/main/java/org/jboss/ws/core/soap/MessageContextAssociation.java 2006-12-06 10:47:51 UTC (rev 1571) +++ branches/tdiesler/trunk/src/main/java/org/jboss/ws/core/soap/MessageContextAssociation.java 2006-12-06 11:19:33 UTC (rev 1572) @@ -26,8 +26,8 @@ import java.util.Stack; import org.jboss.logging.Logger; -import org.jboss.ws.common.utils.ThreadLocalAssociation; import org.jboss.ws.core.CommonMessageContext; +import org.jboss.ws.core.ThreadLocalAssociation; /** * A thread local association with the current message context Deleted: branches/tdiesler/trunk/src/main/java/org/jboss/ws/core/soap/NameImpl.java =================================================================== --- branches/tdiesler/trunk/src/main/java/org/jboss/ws/core/soap/NameImpl.java 2006-12-06 10:47:51 UTC (rev 1571) +++ branches/tdiesler/trunk/src/main/java/org/jboss/ws/core/soap/NameImpl.java 2006-12-06 11:19:33 UTC (rev 1572) @@ -1,127 +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.soap; - -// $Id$ - -import javax.xml.namespace.QName; -import javax.xml.soap.Name; - -/** - * An implementation of a Name - * <p/> - * At this time of writing, the spec does not say anything about null values. - * We assume emty string for any null value. - * - * @author Thomas.Diesler(a)jboss.org - * @since 01-June-2004 - */ -public class NameImpl implements Name -{ - private QName qname; - - public NameImpl(QName qname) - { - this.qname = qname; - } - - public NameImpl(String local) - { - qname = new QName(local); - } - - public NameImpl(String local, String prefix, String uri) - { - if (prefix != null) - qname = new QName(uri, local, prefix); - else - qname = new QName(uri, local); - } - - /** - * Gets the local name part of the XML name that this Name object represents. - * - * @return a string giving the local name - */ - public String getLocalName() - { - return qname.getLocalPart(); - } - - /** - * Returns the prefix that was specified when this Name object was initialized. - * This prefix is associated with the namespace for the XML name that this Name object represents. - * - * @return the prefix as a string - */ - public String getPrefix() - { - return qname.getPrefix(); - } - - /** - * Gets the namespace-qualified name of the XML name that this Name object represents. - * - * @return the namespace-qualified name as a string - */ - public String getQualifiedName() - { - String prefix = getPrefix(); - if (prefix.length() > 0) - return prefix + ":" + qname.getLocalPart(); - else - return qname.getLocalPart(); - } - - /** - * Returns the URI of the namespace for the XML name that this Name object represents. - * - * @return the URI as a string - */ - public String getURI() - { - return qname.getNamespaceURI(); - } - - public int hashCode() - { - return qname.hashCode(); - } - - public boolean equals(Object obj) - { - if (!(obj instanceof NameImpl)) return false; - if (obj == this) return true; - NameImpl other = (NameImpl)obj; - return qname.equals(other.qname); - } - - public QName toQName() - { - return qname; - } - - public String toString() - { - return qname.toString(); - } -} Modified: branches/tdiesler/trunk/src/main/java/org/jboss/ws/core/soap/SAAJPayloadBuilderDOM.java =================================================================== --- branches/tdiesler/trunk/src/main/java/org/jboss/ws/core/soap/SAAJPayloadBuilderDOM.java 2006-12-06 10:47:51 UTC (rev 1571) +++ branches/tdiesler/trunk/src/main/java/org/jboss/ws/core/soap/SAAJPayloadBuilderDOM.java 2006-12-06 11:19:33 UTC (rev 1572) @@ -35,6 +35,7 @@ import javax.xml.soap.SOAPHeader; import org.jboss.logging.Logger; +import org.jboss.ws.common.NameImpl; import org.jboss.ws.common.WSException; import org.jboss.ws.common.jaxrpc.Style; import org.jboss.ws.common.utils.DOMUtils; Modified: branches/tdiesler/trunk/src/main/java/org/jboss/ws/core/soap/SAAJPayloadBuilderStax.java =================================================================== --- branches/tdiesler/trunk/src/main/java/org/jboss/ws/core/soap/SAAJPayloadBuilderStax.java 2006-12-06 10:47:51 UTC (rev 1571) +++ branches/tdiesler/trunk/src/main/java/org/jboss/ws/core/soap/SAAJPayloadBuilderStax.java 2006-12-06 11:19:33 UTC (rev 1572) @@ -36,6 +36,7 @@ import javax.xml.stream.XMLStreamException; import javax.xml.stream.XMLStreamReader; +import org.jboss.ws.common.NameImpl; import org.w3c.dom.Element; import com.ctc.wstx.stax.WstxInputFactory; Modified: branches/tdiesler/trunk/src/main/java/org/jboss/ws/core/soap/SOAPBodyImpl.java =================================================================== --- branches/tdiesler/trunk/src/main/java/org/jboss/ws/core/soap/SOAPBodyImpl.java 2006-12-06 10:47:51 UTC (rev 1571) +++ branches/tdiesler/trunk/src/main/java/org/jboss/ws/core/soap/SOAPBodyImpl.java 2006-12-06 11:19:33 UTC (rev 1572) @@ -47,6 +47,7 @@ import org.jboss.logging.Logger; import org.jboss.ws.common.Constants; +import org.jboss.ws.common.NameImpl; import org.jboss.ws.common.WSException; import org.jboss.ws.common.umdm.UnifiedMetaData; import org.jboss.ws.common.utils.DOMUtils; Modified: branches/tdiesler/trunk/src/main/java/org/jboss/ws/core/soap/SOAPContentElement.java =================================================================== --- branches/tdiesler/trunk/src/main/java/org/jboss/ws/core/soap/SOAPContentElement.java 2006-12-06 10:47:51 UTC (rev 1571) +++ branches/tdiesler/trunk/src/main/java/org/jboss/ws/core/soap/SOAPContentElement.java 2006-12-06 11:19:33 UTC (rev 1572) @@ -40,6 +40,7 @@ import org.jboss.logging.Logger; import org.jboss.ws.common.Constants; +import org.jboss.ws.common.NameImpl; import org.jboss.ws.common.WSException; import org.jboss.ws.common.binding.BindingException; import org.jboss.ws.common.binding.DeserializerSupport; Modified: branches/tdiesler/trunk/src/main/java/org/jboss/ws/core/soap/SOAPElementImpl.java =================================================================== --- branches/tdiesler/trunk/src/main/java/org/jboss/ws/core/soap/SOAPElementImpl.java 2006-12-06 10:47:51 UTC (rev 1571) +++ branches/tdiesler/trunk/src/main/java/org/jboss/ws/core/soap/SOAPElementImpl.java 2006-12-06 11:19:33 UTC (rev 1572) @@ -40,6 +40,7 @@ import org.jboss.logging.Logger; import org.jboss.util.NotImplementedException; import org.jboss.ws.common.Constants; +import org.jboss.ws.common.NameImpl; import org.jboss.ws.common.WSException; import org.jboss.ws.common.utils.DOMUtils; import org.w3c.dom.Attr; Modified: branches/tdiesler/trunk/src/main/java/org/jboss/ws/core/soap/SOAPEnvelopeImpl.java =================================================================== --- branches/tdiesler/trunk/src/main/java/org/jboss/ws/core/soap/SOAPEnvelopeImpl.java 2006-12-06 10:47:51 UTC (rev 1571) +++ branches/tdiesler/trunk/src/main/java/org/jboss/ws/core/soap/SOAPEnvelopeImpl.java 2006-12-06 11:19:33 UTC (rev 1572) @@ -37,6 +37,7 @@ import javax.xml.soap.SOAPMessage; import org.jboss.ws.common.Constants; +import org.jboss.ws.common.NameImpl; import org.w3c.dom.Document; /** Modified: branches/tdiesler/trunk/src/main/java/org/jboss/ws/core/soap/SOAPFactoryImpl.java =================================================================== --- branches/tdiesler/trunk/src/main/java/org/jboss/ws/core/soap/SOAPFactoryImpl.java 2006-12-06 10:47:51 UTC (rev 1571) +++ branches/tdiesler/trunk/src/main/java/org/jboss/ws/core/soap/SOAPFactoryImpl.java 2006-12-06 11:19:33 UTC (rev 1572) @@ -30,6 +30,8 @@ import javax.xml.soap.SOAPFactory; import org.jboss.logging.Logger; +import org.jboss.ws.common.NameImpl; +import org.jboss.ws.common.jaxrpc.encoding.SOAPElementDeserializer; import org.jboss.ws.common.utils.DOMUtils; import org.w3c.dom.Element; import org.w3c.dom.Node; @@ -65,49 +67,8 @@ */ public SOAPElementImpl createElement(Element domNode, boolean deep) throws SOAPException { - if (domNode == null) - throw new IllegalArgumentException("Source node cannot be null"); - - String localName = domNode.getLocalName(); - String prefix = domNode.getPrefix() != null ? domNode.getPrefix() : ""; - String nsURI = domNode.getNamespaceURI() != null ? domNode.getNamespaceURI() : ""; - - SOAPElementImpl soapElement = new SOAPElementImpl(localName, prefix, nsURI); - - // Add the child elements as well - if (deep) - { - if (domNode instanceof Element) - DOMUtils.copyAttributes(soapElement, (Element)domNode); - - NodeList nlist = domNode.getChildNodes(); - for (int i = 0; i < nlist.getLength(); i++) - { - Node child = nlist.item(i); - short nodeType = child.getNodeType(); - if (nodeType == Node.ELEMENT_NODE) - { - SOAPElementImpl soapChild = createElement((Element)child, true); - soapElement.addChildElement(soapChild); - } - else if (nodeType == Node.TEXT_NODE) - { - String nodeValue = child.getNodeValue(); - soapElement.addTextNode(nodeValue); - } - else if (nodeType == Node.CDATA_SECTION_NODE) - { - String nodeValue = child.getNodeValue(); - soapElement.addTextNode(nodeValue); - } - else - { - log.trace("Ignore child type: " + nodeType); - } - } - } - - return soapElement; + SOAPElementDeserializer des = new SOAPElementDeserializer(); + return (SOAPElementImpl)des.createElement(domNode, deep); } public Detail createDetail() throws SOAPException Modified: branches/tdiesler/trunk/src/main/java/org/jboss/ws/core/soap/SOAPFaultImpl.java =================================================================== --- branches/tdiesler/trunk/src/main/java/org/jboss/ws/core/soap/SOAPFaultImpl.java 2006-12-06 10:47:51 UTC (rev 1571) +++ branches/tdiesler/trunk/src/main/java/org/jboss/ws/core/soap/SOAPFaultImpl.java 2006-12-06 11:19:33 UTC (rev 1572) @@ -34,6 +34,7 @@ import org.jboss.logging.Logger; import org.jboss.ws.common.Constants; +import org.jboss.ws.common.NameImpl; import org.jboss.ws.common.WSException; import org.jboss.ws.common.utils.DOMUtils; import org.jboss.ws.common.utils.DOMWriter; Modified: branches/tdiesler/trunk/src/main/java/org/jboss/ws/extras/addressing/soap/SOAPAddressingPropertiesImpl.java =================================================================== --- branches/tdiesler/trunk/src/main/java/org/jboss/ws/extras/addressing/soap/SOAPAddressingPropertiesImpl.java 2006-12-06 10:47:51 UTC (rev 1571) +++ branches/tdiesler/trunk/src/main/java/org/jboss/ws/extras/addressing/soap/SOAPAddressingPropertiesImpl.java 2006-12-06 11:19:33 UTC (rev 1572) @@ -46,8 +46,8 @@ import javax.xml.ws.addressing.soap.SOAPAddressingProperties; import org.jboss.util.NotImplementedException; +import org.jboss.ws.common.NameImpl; import org.jboss.ws.common.utils.DOMUtils; -import org.jboss.ws.core.soap.NameImpl; import org.jboss.ws.core.soap.SOAPElementImpl; import org.jboss.ws.core.soap.SOAPFactoryImpl; import org.jboss.ws.extras.addressing.AddressingConstantsImpl; Modified: branches/tdiesler/trunk/src/main/java/org/jboss/ws/extras/security/STRTransform.java =================================================================== --- branches/tdiesler/trunk/src/main/java/org/jboss/ws/extras/security/STRTransform.java 2006-12-06 10:47:51 UTC (rev 1571) +++ branches/tdiesler/trunk/src/main/java/org/jboss/ws/extras/security/STRTransform.java 2006-12-06 11:19:33 UTC (rev 1572) @@ -35,7 +35,7 @@ import org.apache.xml.security.utils.XMLUtils; import org.jboss.util.NotImplementedException; import org.jboss.ws.common.WSException; -import org.jboss.ws.common.utils.ThreadLocalAssociation; +import org.jboss.ws.core.ThreadLocalAssociation; import org.jboss.ws.extras.security.element.BinarySecurityToken; import org.jboss.ws.extras.security.element.SecurityTokenReference; import org.w3c.dom.Element; Modified: branches/tdiesler/trunk/src/main/java/org/jboss/ws/extras/xop/XOPContext.java =================================================================== --- branches/tdiesler/trunk/src/main/java/org/jboss/ws/extras/xop/XOPContext.java 2006-12-06 10:47:51 UTC (rev 1571) +++ branches/tdiesler/trunk/src/main/java/org/jboss/ws/extras/xop/XOPContext.java 2006-12-06 11:19:33 UTC (rev 1572) @@ -35,6 +35,7 @@ import org.jboss.logging.Logger; import org.jboss.ws.common.Constants; +import org.jboss.ws.common.NameImpl; import org.jboss.ws.common.WSException; import org.jboss.ws.common.utils.DOMUtils; import org.jboss.ws.common.utils.JavaUtils; @@ -42,7 +43,6 @@ import org.jboss.ws.core.CommonMessageContext; import org.jboss.ws.core.jaxrpc.StubExt; import org.jboss.ws.core.soap.MessageContextAssociation; -import org.jboss.ws.core.soap.NameImpl; import org.jboss.ws.core.soap.SOAPElementImpl; import org.jboss.ws.core.soap.SOAPMessageImpl; import org.jboss.ws.core.soap.attachment.MimeConstants; Modified: branches/tdiesler/trunk/src/main/java/org/jboss/ws/integration/jboss50/AbstractJSEDeployer.java =================================================================== --- branches/tdiesler/trunk/src/main/java/org/jboss/ws/integration/jboss50/AbstractJSEDeployer.java 2006-12-06 10:47:51 UTC (rev 1571) +++ branches/tdiesler/trunk/src/main/java/org/jboss/ws/integration/jboss50/AbstractJSEDeployer.java 2006-12-06 11:19:33 UTC (rev 1572) @@ -43,9 +43,9 @@ import org.jboss.metadata.web.Servlet; import org.jboss.virtual.VirtualFile; import org.jboss.ws.common.WSException; +import org.jboss.ws.common.config.ServerConfig; +import org.jboss.ws.common.config.ServerConfigFactory; import org.jboss.ws.common.utils.IOUtils; -import org.jboss.ws.core.server.ServerConfig; -import org.jboss.ws.core.server.ServerConfigFactory; import org.jboss.ws.core.server.UnifiedDeploymentInfo; /** Modified: branches/tdiesler/trunk/src/main/java/org/jboss/ws/integration/jboss50/ApplicationMetaDataAdaptor.java =================================================================== --- branches/tdiesler/trunk/src/main/java/org/jboss/ws/integration/jboss50/ApplicationMetaDataAdaptor.java 2006-12-06 10:47:51 UTC (rev 1571) +++ branches/tdiesler/trunk/src/main/java/org/jboss/ws/integration/jboss50/ApplicationMetaDataAdaptor.java 2006-12-06 11:19:33 UTC (rev 1572) @@ -34,10 +34,10 @@ import org.jboss.ejb3.SessionContainer; import org.jboss.ejb3.mdb.MessagingContainer; import org.jboss.logging.Logger; -import org.jboss.ws.core.metadata.j2ee.UnifiedApplicationMetaData; -import org.jboss.ws.core.metadata.j2ee.UnifiedBeanMetaData; -import org.jboss.ws.core.metadata.j2ee.UnifiedMessageDrivenMetaData; -import org.jboss.ws.core.metadata.j2ee.UnifiedSessionMetaData; +import org.jboss.ws.common.metadata.j2ee.UnifiedApplicationMetaData; +import org.jboss.ws.common.metadata.j2ee.UnifiedBeanMetaData; +import org.jboss.ws.common.metadata.j2ee.UnifiedMessageDrivenMetaData; +import org.jboss.ws.common.metadata.j2ee.UnifiedSessionMetaData; /** * Build container independent application meta data Modified: branches/tdiesler/trunk/src/main/java/org/jboss/ws/integration/jboss50/JBossServiceEndpointServlet.java =================================================================== --- branches/tdiesler/trunk/src/main/java/org/jboss/ws/integration/jboss50/JBossServiceEndpointServlet.java 2006-12-06 10:47:51 UTC (rev 1571) +++ branches/tdiesler/trunk/src/main/java/org/jboss/ws/integration/jboss50/JBossServiceEndpointServlet.java 2006-12-06 11:19:33 UTC (rev 1572) @@ -29,10 +29,10 @@ import org.jboss.logging.Logger; import org.jboss.ws.common.WSException; +import org.jboss.ws.common.metadata.config.WSCommonConfig; import org.jboss.ws.common.umdm.HandlerMetaData; import org.jboss.ws.common.umdm.ServerEndpointMetaData; import org.jboss.ws.common.umdm.HandlerMetaData.HandlerType; -import org.jboss.ws.core.metadata.config.WSCommonConfig; import org.jboss.ws.core.server.AbstractServiceEndpointServlet; import org.jboss.ws.core.server.ServiceEndpoint; Modified: branches/tdiesler/trunk/src/main/java/org/jboss/ws/integration/jboss50/ServerConfigImpl.java =================================================================== --- branches/tdiesler/trunk/src/main/java/org/jboss/ws/integration/jboss50/ServerConfigImpl.java 2006-12-06 10:47:51 UTC (rev 1571) +++ branches/tdiesler/trunk/src/main/java/org/jboss/ws/integration/jboss50/ServerConfigImpl.java 2006-12-06 11:19:33 UTC (rev 1572) @@ -30,8 +30,8 @@ import javax.management.ObjectName; import org.jboss.mx.util.MBeanServerLocator; +import org.jboss.ws.common.config.ServerConfig; import org.jboss.ws.common.utils.ObjectNameFactory; -import org.jboss.ws.core.server.ServerConfig; /** * JBoss specific implementation of a ServerConfig Modified: branches/tdiesler/trunk/src/main/java/org/jboss/ws/integration/jboss50/ServiceEndpointGeneratorEJB.java =================================================================== --- branches/tdiesler/trunk/src/main/java/org/jboss/ws/integration/jboss50/ServiceEndpointGeneratorEJB.java 2006-12-06 10:47:51 UTC (rev 1571) +++ branches/tdiesler/trunk/src/main/java/org/jboss/ws/integration/jboss50/ServiceEndpointGeneratorEJB.java 2006-12-06 11:19:33 UTC (rev 1572) @@ -34,14 +34,14 @@ import org.jboss.deployers.spi.deployer.DeploymentUnit; import org.jboss.logging.Logger; import org.jboss.ws.common.WSException; +import org.jboss.ws.common.config.ServerConfig; +import org.jboss.ws.common.config.ServerConfigFactory; import org.jboss.ws.common.umdm.EndpointMetaData; import org.jboss.ws.common.umdm.ServerEndpointMetaData; import org.jboss.ws.common.umdm.ServiceMetaData; import org.jboss.ws.common.umdm.UnifiedMetaData; import org.jboss.ws.common.utils.DOMUtils; import org.jboss.ws.common.utils.DOMWriter; -import org.jboss.ws.core.server.ServerConfig; -import org.jboss.ws.core.server.ServerConfigFactory; import org.w3c.dom.Element; /** Modified: branches/tdiesler/trunk/src/main/java/org/jboss/ws/integration/jboss50/ServiceRefHandler.java =================================================================== --- branches/tdiesler/trunk/src/main/java/org/jboss/ws/integration/jboss50/ServiceRefHandler.java 2006-12-06 10:47:51 UTC (rev 1571) +++ branches/tdiesler/trunk/src/main/java/org/jboss/ws/integration/jboss50/ServiceRefHandler.java 2006-12-06 11:19:33 UTC (rev 1572) @@ -38,12 +38,12 @@ import org.jboss.naming.Util; import org.jboss.webservice.metadata.serviceref.ServiceRefMetaData; import org.jboss.ws.common.WSException; +import org.jboss.ws.common.metadata.j2ee.UnifiedServiceRefMetaData; import org.jboss.ws.common.metadata.jaxrpcmapping.JavaWsdlMapping; import org.jboss.ws.common.metadata.jaxrpcmapping.JavaWsdlMappingFactory; import org.jboss.ws.common.metadata.wsdl.WSDL11DefinitionFactory; import org.jboss.ws.core.jaxrpc.ServiceReferenceable; import org.jboss.ws.core.metadata.builder.jaxrpc.JAXRPCClientDeployment; -import org.jboss.ws.core.metadata.j2ee.UnifiedServiceRefMetaData; import org.jboss.ws.core.server.UnifiedDeploymentInfo; /** Modified: branches/tdiesler/trunk/src/main/java/org/jboss/ws/integration/jboss50/ServiceRefMetaDataAdaptor.java =================================================================== --- branches/tdiesler/trunk/src/main/java/org/jboss/ws/integration/jboss50/ServiceRefMetaDataAdaptor.java 2006-12-06 10:47:51 UTC (rev 1571) +++ branches/tdiesler/trunk/src/main/java/org/jboss/ws/integration/jboss50/ServiceRefMetaDataAdaptor.java 2006-12-06 11:19:33 UTC (rev 1572) @@ -32,10 +32,10 @@ import org.jboss.webservice.metadata.serviceref.InitParamMetaData; import org.jboss.webservice.metadata.serviceref.PortComponentRefMetaData; import org.jboss.webservice.metadata.serviceref.ServiceRefMetaData; +import org.jboss.ws.common.metadata.j2ee.UnifiedHandlerMetaData; +import org.jboss.ws.common.metadata.j2ee.UnifiedPortComponentRefMetaData; +import org.jboss.ws.common.metadata.j2ee.UnifiedServiceRefMetaData; import org.jboss.ws.common.umdm.HandlerMetaData.HandlerInitParam; -import org.jboss.ws.core.metadata.j2ee.UnifiedHandlerMetaData; -import org.jboss.ws.core.metadata.j2ee.UnifiedPortComponentRefMetaData; -import org.jboss.ws.core.metadata.j2ee.UnifiedServiceRefMetaData; /** * Build container independent service ref meta data Modified: branches/tdiesler/trunk/src/main/java/org/jboss/ws/integration/jboss50/WebMetaDataAdaptor.java =================================================================== --- branches/tdiesler/trunk/src/main/java/org/jboss/ws/integration/jboss50/WebMetaDataAdaptor.java 2006-12-06 10:47:51 UTC (rev 1571) +++ branches/tdiesler/trunk/src/main/java/org/jboss/ws/integration/jboss50/WebMetaDataAdaptor.java 2006-12-06 11:19:33 UTC (rev 1572) @@ -34,10 +34,10 @@ import org.jboss.metadata.WebSecurityMetaData.WebResourceCollection; import org.jboss.metadata.web.Servlet; import org.jboss.metadata.web.ServletMapping; -import org.jboss.ws.core.metadata.j2ee.UnifiedWebMetaData; -import org.jboss.ws.core.metadata.j2ee.UnifiedWebSecurityMetaData; -import org.jboss.ws.core.metadata.j2ee.UnifiedWebMetaData.PublishLocationAdapter; -import org.jboss.ws.core.metadata.j2ee.UnifiedWebSecurityMetaData.UnifiedWebResourceCollection; +import org.jboss.ws.common.metadata.j2ee.UnifiedWebMetaData; +import org.jboss.ws.common.metadata.j2ee.UnifiedWebSecurityMetaData; +import org.jboss.ws.common.metadata.j2ee.UnifiedWebMetaData.PublishLocationAdapter; +import org.jboss.ws.common.metadata.j2ee.UnifiedWebSecurityMetaData.UnifiedWebResourceCollection; /** * Build container independent web meta data Modified: branches/tdiesler/trunk/src/main/java/org/jboss/ws/integration/tomcat/DeploymentInfoAdaptor.java =================================================================== --- branches/tdiesler/trunk/src/main/java/org/jboss/ws/integration/tomcat/DeploymentInfoAdaptor.java 2006-12-06 10:47:51 UTC (rev 1571) +++ branches/tdiesler/trunk/src/main/java/org/jboss/ws/integration/tomcat/DeploymentInfoAdaptor.java 2006-12-06 11:19:33 UTC (rev 1572) @@ -37,10 +37,10 @@ import javax.servlet.ServletContext; import org.jboss.ws.common.WSException; +import org.jboss.ws.common.metadata.j2ee.UnifiedWebMetaData; +import org.jboss.ws.common.metadata.j2ee.UnifiedWebSecurityMetaData; +import org.jboss.ws.common.metadata.j2ee.UnifiedWebSecurityMetaData.UnifiedWebResourceCollection; import org.jboss.ws.common.utils.DOMUtils; -import org.jboss.ws.core.metadata.j2ee.UnifiedWebMetaData; -import org.jboss.ws.core.metadata.j2ee.UnifiedWebSecurityMetaData; -import org.jboss.ws.core.metadata.j2ee.UnifiedWebSecurityMetaData.UnifiedWebResourceCollection; import org.jboss.ws.core.server.AbstractServiceEndpointPublisher; import org.jboss.ws.core.server.UnifiedDeploymentInfo; import org.w3c.dom.Element; Modified: branches/tdiesler/trunk/src/main/java/org/jboss/ws/integration/tomcat/ServerConfigImpl.java =================================================================== --- branches/tdiesler/trunk/src/main/java/org/jboss/ws/integration/tomcat/ServerConfigImpl.java 2006-12-06 10:47:51 UTC (rev 1571) +++ branches/tdiesler/trunk/src/main/java/org/jboss/ws/integration/tomcat/ServerConfigImpl.java 2006-12-06 11:19:33 UTC (rev 1572) @@ -26,7 +26,7 @@ import java.io.File; import java.io.IOException; -import org.jboss.ws.core.server.ServerConfig; +import org.jboss.ws.common.config.ServerConfig; /** * Tomcat specific implementation of a ServerConfig Modified: branches/tdiesler/trunk/src/test/java/org/jboss/test/ws/common/config/WSConfigTestCase.java =================================================================== --- branches/tdiesler/trunk/src/test/java/org/jboss/test/ws/common/config/WSConfigTestCase.java 2006-12-06 10:47:51 UTC (rev 1571) +++ branches/tdiesler/trunk/src/test/java/org/jboss/test/ws/common/config/WSConfigTestCase.java 2006-12-06 11:19:33 UTC (rev 1572) @@ -24,11 +24,11 @@ import java.io.File; import org.jboss.test.ws.JBossWSTest; -import org.jboss.ws.core.metadata.config.WSConfigFactory; -import org.jboss.ws.core.metadata.config.jaxrpc.WSConfigRootJAXRPC; -import org.jboss.ws.core.metadata.config.jaxrpc.WSEndpointConfigJAXRPC; -import org.jboss.ws.core.metadata.j2ee.UnifiedHandlerMetaData; -import org.jboss.ws.core.metadata.jsr181.HandlerChainMetaData; +import org.jboss.ws.common.metadata.config.WSConfigFactory; +import org.jboss.ws.common.metadata.config.jaxrpc.WSConfigRootJAXRPC; +import org.jboss.ws.common.metadata.config.jaxrpc.WSEndpointConfigJAXRPC; +import org.jboss.ws.common.metadata.j2ee.UnifiedHandlerMetaData; +import org.jboss.ws.common.metadata.jsr181.HandlerChainMetaData; /** * Test parsing of the JBossWS config Modified: branches/tdiesler/trunk/src/test/java/org/jboss/test/ws/common/jbossxb/SerializerDeserializerTestCase.java =================================================================== --- branches/tdiesler/trunk/src/test/java/org/jboss/test/ws/common/jbossxb/SerializerDeserializerTestCase.java 2006-12-06 10:47:51 UTC (rev 1571) +++ branches/tdiesler/trunk/src/test/java/org/jboss/test/ws/common/jbossxb/SerializerDeserializerTestCase.java 2006-12-06 11:19:33 UTC (rev 1572) @@ -36,10 +36,10 @@ import org.jboss.ws.common.binding.SerializationContext; import org.jboss.ws.common.binding.SerializerSupport; import org.jboss.ws.common.jaxrpc.TypeMappingImpl; +import org.jboss.ws.common.jaxrpc.TypeMappingRegistryImpl; import org.jboss.ws.common.jaxrpc.encoding.DeserializerFactoryBase; import org.jboss.ws.common.jaxrpc.encoding.SerializerFactoryBase; import org.jboss.ws.core.jaxrpc.SerializationContextJAXRPC; -import org.jboss.ws.core.jaxrpc.TypeMappingRegistryImpl; import org.jboss.xb.binding.NamespaceRegistry; /** Modified: branches/tdiesler/trunk/src/test/java/org/jboss/test/ws/common/jbossxb/array/BigDecimalArrayMarshallerTestCase.java =================================================================== --- branches/tdiesler/trunk/src/test/java/org/jboss/test/ws/common/jbossxb/array/BigDecimalArrayMarshallerTestCase.java 2006-12-06 10:47:51 UTC (rev 1571) +++ branches/tdiesler/trunk/src/test/java/org/jboss/test/ws/common/jbossxb/array/BigDecimalArrayMarshallerTestCase.java 2006-12-06 11:19:33 UTC (rev 1572) @@ -28,10 +28,10 @@ import org.apache.xerces.xs.XSModel; import org.jboss.test.ws.tools.WSToolsTest; +import org.jboss.ws.common.jbossxb.JBossXBConstants; +import org.jboss.ws.common.jbossxb.JBossXBMarshallerImpl; import org.jboss.ws.common.metadata.jaxrpcmapping.JavaWsdlMapping; import org.jboss.ws.common.utils.DOMUtils; -import org.jboss.ws.core.jbossxb.JBossXBConstants; -import org.jboss.ws.core.jbossxb.JBossXBMarshallerImpl; /** * Test the JAXB marshalling of array types Modified: branches/tdiesler/trunk/src/test/java/org/jboss/test/ws/common/jbossxb/array/BigDecimalArrayUnmarshallerTestCase.java =================================================================== --- branches/tdiesler/trunk/src/test/java/org/jboss/test/ws/common/jbossxb/array/BigDecimalArrayUnmarshallerTestCase.java 2006-12-06 10:47:51 UTC (rev 1571) +++ branches/tdiesler/trunk/src/test/java/org/jboss/test/ws/common/jbossxb/array/BigDecimalArrayUnmarshallerTestCase.java 2006-12-06 11:19:33 UTC (rev 1572) @@ -28,10 +28,10 @@ import org.apache.xerces.xs.XSModel; import org.jboss.test.ws.tools.WSToolsTest; +import org.jboss.ws.common.jbossxb.JBossXBConstants; +import org.jboss.ws.common.jbossxb.JBossXBUnmarshallerImpl; import org.jboss.ws.common.metadata.jaxrpcmapping.JavaWsdlMapping; import org.jboss.ws.common.utils.DOMUtils; -import org.jboss.ws.core.jbossxb.JBossXBConstants; -import org.jboss.ws.core.jbossxb.JBossXBUnmarshallerImpl; /** * Test the JAXB marshalling of array types Modified: branches/tdiesler/trunk/src/test/java/org/jboss/test/ws/common/jbossxb/array/CalendarArrayMarshallerTestCase.java =================================================================== --- branches/tdiesler/trunk/src/test/java/org/jboss/test/ws/common/jbossxb/array/CalendarArrayMarshallerTestCase.java 2006-12-06 10:47:51 UTC (rev 1571) +++ branches/tdiesler/trunk/src/test/java/org/jboss/test/ws/common/jbossxb/array/CalendarArrayMarshallerTestCase.java 2006-12-06 11:19:33 UTC (rev 1572) @@ -30,10 +30,10 @@ import org.apache.xerces.xs.XSModel; import org.jboss.test.ws.tools.WSToolsTest; +import org.jboss.ws.common.jbossxb.JBossXBConstants; +import org.jboss.ws.common.jbossxb.JBossXBMarshallerImpl; import org.jboss.ws.common.metadata.jaxrpcmapping.JavaWsdlMapping; import org.jboss.ws.common.utils.DOMUtils; -import org.jboss.ws.core.jbossxb.JBossXBConstants; -import org.jboss.ws.core.jbossxb.JBossXBMarshallerImpl; /** * Test the JAXB marshalling of array types Modified: branches/tdiesler/trunk/src/test/java/org/jboss/test/ws/common/jbossxb/array/CalendarArrayUnmarshallerTestCase.java =================================================================== --- branches/tdiesler/trunk/src/test/java/org/jboss/test/ws/common/jbossxb/array/CalendarArrayUnmarshallerTestCase.java 2006-12-06 10:47:51 UTC (rev 1571) +++ branches/tdiesler/trunk/src/test/java/org/jboss/test/ws/common/jbossxb/array/CalendarArrayUnmarshallerTestCase.java 2006-12-06 11:19:33 UTC (rev 1572) @@ -30,10 +30,10 @@ import org.apache.xerces.xs.XSModel; import org.jboss.test.ws.tools.WSToolsTest; +import org.jboss.ws.common.jbossxb.JBossXBConstants; +import org.jboss.ws.common.jbossxb.JBossXBUnmarshallerImpl; import org.jboss.ws.common.metadata.jaxrpcmapping.JavaWsdlMapping; import org.jboss.ws.common.utils.DOMUtils; -import org.jboss.ws.core.jbossxb.JBossXBConstants; -import org.jboss.ws.core.jbossxb.JBossXBUnmarshallerImpl; /** * Test the JAXB marshalling of array types Modified: branches/tdiesler/trunk/src/test/java/org/jboss/test/ws/common/jbossxb/array/QNameArrayMarshallerTestCase.java =================================================================== --- branches/tdiesler/trunk/src/test/java/org/jboss/test/ws/common/jbossxb/array/QNameArrayMarshallerTestCase.java 2006-12-06 10:47:51 UTC (rev 1571) +++ branches/tdiesler/trunk/src/test/java/org/jboss/test/ws/common/jbossxb/array/QNameArrayMarshallerTestCase.java 2006-12-06 11:19:33 UTC (rev 1572) @@ -27,10 +27,10 @@ import org.apache.xerces.xs.XSModel; import org.jboss.test.ws.tools.WSToolsTest; +import org.jboss.ws.common.jbossxb.JBossXBConstants; +import org.jboss.ws.common.jbossxb.JBossXBMarshallerImpl; import org.jboss.ws.common.metadata.jaxrpcmapping.JavaWsdlMapping; import org.jboss.ws.common.utils.DOMUtils; -import org.jboss.ws.core.jbossxb.JBossXBConstants; -import org.jboss.ws.core.jbossxb.JBossXBMarshallerImpl; /** * Test the JAXB marshalling of array types Modified: branches/tdiesler/trunk/src/test/java/org/jboss/test/ws/common/jbossxb/array/QNameArrayUnmarshallerTestCase.java =================================================================== --- branches/tdiesler/trunk/src/test/java/org/jboss/test/ws/common/jbossxb/array/QNameArrayUnmarshallerTestCase.java 2006-12-06 10:47:51 UTC (rev 1571) +++ branches/tdiesler/trunk/src/test/java/org/jboss/test/ws/common/jbossxb/array/QNameArrayUnmarshallerTestCase.java 2006-12-06 11:19:33 UTC (rev 1572) @@ -27,10 +27,10 @@ import org.apache.xerces.xs.XSModel; import org.jboss.test.ws.tools.WSToolsTest; +import org.jboss.ws.common.jbossxb.JBossXBConstants; +import org.jboss.ws.common.jbossxb.JBossXBUnmarshallerImpl; import org.jboss.ws.common.metadata.jaxrpcmapping.JavaWsdlMapping; import org.jboss.ws.common.utils.DOMUtils; -import org.jboss.ws.core.jbossxb.JBossXBConstants; -import org.jboss.ws.core.jbossxb.JBossXBUnmarshallerImpl; /** * Test the JAXB marshalling of array types Modified: branches/tdiesler/trunk/src/test/java/org/jboss/test/ws/common/jbossxb/complex/ComplexTypeMarshallerTestCase.java =================================================================== --- branches/tdiesler/trunk/src/test/java/org/jboss/test/ws/common/jbossxb/complex/ComplexTypeMarshallerTestCase.java 2006-12-06 10:47:51 UTC (rev 1571) +++ branches/tdiesler/trunk/src/test/java/org/jboss/test/ws/common/jbossxb/complex/ComplexTypeMarshallerTestCase.java 2006-12-06 11:19:33 UTC (rev 1572) @@ -30,11 +30,11 @@ import org.apache.xerces.xs.XSModel; import org.jboss.test.ws.tools.WSToolsTest; +import org.jboss.ws.common.jbossxb.JBossXBConstants; +import org.jboss.ws.common.jbossxb.JBossXBMarshallerImpl; import org.jboss.ws.common.metadata.jaxrpcmapping.JavaWsdlMapping; import org.jboss.ws.common.metadata.jaxrpcmapping.JavaWsdlMappingFactory; import org.jboss.ws.common.utils.DOMUtils; -import org.jboss.ws.core.jbossxb.JBossXBConstants; -import org.jboss.ws.core.jbossxb.JBossXBMarshallerImpl; /** * Test the JAXB marshalling of complex types Modified: branches/tdiesler/trunk/src/test/java/org/jboss/test/ws/common/jbossxb/complex/ComplexTypeUnmarshallerTestCase.java =================================================================== --- branches/tdiesler/trunk/src/test/java/org/jboss/test/ws/common/jbossxb/complex/ComplexTypeUnmarshallerTestCase.java 2006-12-06 10:47:51 UTC (rev 1571) +++ branches/tdiesler/trunk/src/test/java/org/jboss/test/ws/common/jbossxb/complex/ComplexTypeUnmarshallerTestCase.java 2006-12-06 11:19:33 UTC (rev 1572) @@ -30,10 +30,10 @@ import org.apache.xerces.xs.XSModel; import org.jboss.test.ws.tools.WSToolsTest; +import org.jboss.ws.common.jbossxb.JBossXBConstants; +import org.jboss.ws.common.jbossxb.JBossXBUnmarshallerImpl; import org.jboss.ws.common.metadata.jaxrpcmapping.JavaWsdlMapping; import org.jboss.ws.common.metadata.jaxrpcmapping.JavaWsdlMappingFactory; -import org.jboss.ws.core.jbossxb.JBossXBConstants; -import org.jboss.ws.core.jbossxb.JBossXBUnmarshallerImpl; import org.jboss.ws.tools.JavaToXSD; /** Modified: branches/tdiesler/trunk/src/test/java/org/jboss/test/ws/common/jbossxb/docstyle/DocumentStyleMarshallerTestCase.java =================================================================== --- branches/tdiesler/trunk/src/test/java/org/jboss/test/ws/common/jbossxb/docstyle/DocumentStyleMarshallerTestCase.java 2006-12-06 10:47:51 UTC (rev 1571) +++ branches/tdiesler/trunk/src/test/java/org/jboss/test/ws/common/jbossxb/docstyle/DocumentStyleMarshallerTestCase.java 2006-12-06 11:19:33 UTC (rev 1572) @@ -30,11 +30,11 @@ import org.apache.xerces.xs.XSModel; import org.jboss.test.ws.tools.WSToolsTest; +import org.jboss.ws.common.jbossxb.JBossXBConstants; +import org.jboss.ws.common.jbossxb.JBossXBMarshallerImpl; import org.jboss.ws.common.metadata.jaxrpcmapping.JavaWsdlMapping; import org.jboss.ws.common.metadata.jaxrpcmapping.JavaWsdlMappingFactory; import org.jboss.ws.common.utils.DOMUtils; -import org.jboss.ws.core.jbossxb.JBossXBConstants; -import org.jboss.ws.core.jbossxb.JBossXBMarshallerImpl; /** * Test the JAXB marshalling of complex types Modified: branches/tdiesler/trunk/src/test/java/org/jboss/test/ws/common/jbossxb/docstyle/DocumentStyleUnmarshallerTestCase.java =================================================================== --- branches/tdiesler/trunk/src/test/java/org/jboss/test/ws/common/jbossxb/docstyle/DocumentStyleUnmarshallerTestCase.java 2006-12-06 10:47:51 UTC (rev 1571) +++ branches/tdiesler/trunk/src/test/java/org/jboss/test/ws/common/jbossxb/docstyle/DocumentStyleUnmarshallerTestCase.java 2006-12-06 11:19:33 UTC (rev 1572) @@ -29,10 +29,10 @@ import org.apache.xerces.xs.XSModel; import org.jboss.test.ws.tools.WSToolsTest; +import org.jboss.ws.common.jbossxb.JBossXBConstants; +import org.jboss.ws.common.jbossxb.JBossXBUnmarshallerImpl; import org.jboss.ws.common.metadata.jaxrpcmapping.JavaWsdlMapping; import org.jboss.ws.common.metadata.jaxrpcmapping.JavaWsdlMappingFactory; -import org.jboss.ws.core.jbossxb.JBossXBConstants; -import org.jboss.ws.core.jbossxb.JBossXBUnmarshallerImpl; /** * Test the JAXB unmarshalling of complex types Modified: branches/tdiesler/trunk/src/test/java/org/jboss/test/ws/common/jbossxb/simple/SimpleUserTypeMarshallerTestCase.java =================================================================== --- branches/tdiesler/trunk/src/test/java/org/jboss/test/ws/common/jbossxb/simple/SimpleUserTypeMarshallerTestCase.java 2006-12-06 10:47:51 UTC (rev 1571) +++ branches/tdiesler/trunk/src/test/java/org/jboss/test/ws/common/jbossxb/simple/SimpleUserTypeMarshallerTestCase.java 2006-12-06 11:19:33 UTC (rev 1572) @@ -27,11 +27,11 @@ import org.apache.xerces.xs.XSModel; import org.jboss.test.ws.tools.WSToolsTest; +import org.jboss.ws.common.jbossxb.JBossXBConstants; +import org.jboss.ws.common.jbossxb.JBossXBMarshallerImpl; import org.jboss.ws.common.metadata.jaxrpcmapping.JavaWsdlMapping; import org.jboss.ws.common.metadata.jaxrpcmapping.PackageMapping; import org.jboss.ws.common.utils.DOMUtils; -import org.jboss.ws.core.jbossxb.JBossXBConstants; -import org.jboss.ws.core.jbossxb.JBossXBMarshallerImpl; /** * Test the JAXB marshalling of a SimpleUserType Modified: branches/tdiesler/trunk/src/test/java/org/jboss/test/ws/common/jbossxb/simple/SimpleUserTypeUnmarshallerTestCase.java =================================================================== --- branches/tdiesler/trunk/src/test/java/org/jboss/test/ws/common/jbossxb/simple/SimpleUserTypeUnmarshallerTestCase.java 2006-12-06 10:47:51 UTC (rev 1571) +++ branches/tdiesler/trunk/src/test/java/org/jboss/test/ws/common/jbossxb/simple/SimpleUserTypeUnmarshallerTestCase.java 2006-12-06 11:19:33 UTC (rev 1572) @@ -27,11 +27,11 @@ import org.apache.xerces.xs.XSModel; import org.jboss.test.ws.tools.WSToolsTest; +import org.jboss.ws.common.jbossxb.JBossXBConstants; +import org.jboss.ws.common.jbossxb.JBossXBUnmarshallerImpl; import org.jboss.ws.common.metadata.jaxrpcmapping.JavaWsdlMapping; import org.jboss.ws.common.metadata.jaxrpcmapping.PackageMapping; import org.jboss.ws.common.utils.DOMUtils; -import org.jboss.ws.core.jbossxb.JBossXBConstants; -import org.jboss.ws.core.jbossxb.JBossXBUnmarshallerImpl; /** * Test the JAXB unmarshalling of a SimpleUserType Modified: branches/tdiesler/trunk/src/test/java/org/jboss/test/ws/common/soap/SOAPContentElementTestCase.java =================================================================== --- branches/tdiesler/trunk/src/test/java/org/jboss/test/ws/common/soap/SOAPContentElementTestCase.java 2006-12-06 10:47:51 UTC (rev 1571) +++ branches/tdiesler/trunk/src/test/java/org/jboss/test/ws/common/soap/SOAPContentElementTestCase.java 2006-12-06 11:19:33 UTC (rev 1572) @@ -33,7 +33,7 @@ import javax.xml.soap.Text; import org.jboss.test.ws.JBossWSTest; -import org.jboss.ws.core.soap.NameImpl; +import org.jboss.ws.common.NameImpl; import org.jboss.ws.core.soap.SOAPContentElement; /** Modified: branches/tdiesler/trunk/src/test/java/org/jboss/test/ws/common/soap/SOAPHeaderElementTestCase.java =================================================================== --- branches/tdiesler/trunk/src/test/java/org/jboss/test/ws/common/soap/SOAPHeaderElementTestCase.java 2006-12-06 10:47:51 UTC (rev 1571) +++ branches/tdiesler/trunk/src/test/java/org/jboss/test/ws/common/soap/SOAPHeaderElementTestCase.java 2006-12-06 11:19:33 UTC (rev 1572) @@ -32,9 +32,9 @@ import javax.xml.soap.SOAPMessage; import org.jboss.test.ws.JBossWSTest; +import org.jboss.ws.common.NameImpl; import org.jboss.ws.common.utils.DOMUtils; import org.jboss.ws.core.soap.MessageFactoryImpl; -import org.jboss.ws.core.soap.NameImpl; /** * Test the SOAPHeaderElement Modified: branches/tdiesler/trunk/src/test/java/org/jboss/test/ws/common/soap/SOAPHeaderTestCase.java =================================================================== --- branches/tdiesler/trunk/src/test/java/org/jboss/test/ws/common/soap/SOAPHeaderTestCase.java 2006-12-06 10:47:51 UTC (rev 1571) +++ branches/tdiesler/trunk/src/test/java/org/jboss/test/ws/common/soap/SOAPHeaderTestCase.java 2006-12-06 11:19:33 UTC (rev 1572) @@ -34,9 +34,9 @@ import org.jboss.test.ws.JBossWSTest; import org.jboss.ws.common.Constants; +import org.jboss.ws.common.NameImpl; import org.jboss.ws.common.utils.DOMUtils; import org.jboss.ws.core.soap.MessageFactoryImpl; -import org.jboss.ws.core.soap.NameImpl; /** * Test the SOAPHeader Modified: branches/tdiesler/trunk/src/test/java/org/jboss/test/ws/jaxrpc/jbws1190/TestEndpointImpl.java =================================================================== --- branches/tdiesler/trunk/src/test/java/org/jboss/test/ws/jaxrpc/jbws1190/TestEndpointImpl.java 2006-12-06 10:47:51 UTC (rev 1571) +++ branches/tdiesler/trunk/src/test/java/org/jboss/test/ws/jaxrpc/jbws1190/TestEndpointImpl.java 2006-12-06 11:19:33 UTC (rev 1572) @@ -25,12 +25,12 @@ import java.io.FilenameFilter; import java.net.MalformedURLException; +import org.jboss.ws.common.config.ServerConfig; +import org.jboss.ws.common.config.ServerConfigFactory; import org.jboss.ws.common.metadata.wsdl.WSDLDefinitions; import org.jboss.ws.common.metadata.wsdl.WSDLDefinitionsFactory; import org.jboss.ws.common.metadata.wsdl.WSDLEndpoint; import org.jboss.ws.common.metadata.wsdl.WSDLService; -import org.jboss.ws.core.server.ServerConfig; -import org.jboss.ws.core.server.ServerConfigFactory; /** * Modified: branches/tdiesler/trunk/src/test/java/org/jboss/test/ws/jaxrpc/jbws1205/TestEndpointImpl.java =================================================================== --- branches/tdiesler/trunk/src/test/java/org/jboss/test/ws/jaxrpc/jbws1205/TestEndpointImpl.java 2006-12-06 10:47:51 UTC (rev 1571) +++ branches/tdiesler/trunk/src/test/java/org/jboss/test/ws/jaxrpc/jbws1205/TestEndpointImpl.java 2006-12-06 11:19:33 UTC (rev 1572) @@ -28,8 +28,8 @@ import javax.naming.InitialContext; import javax.xml.rpc.Service; -import org.jboss.ws.core.server.ServerConfig; -import org.jboss.ws.core.server.ServerConfigFactory; +import org.jboss.ws.common.config.ServerConfig; +import org.jboss.ws.common.config.ServerConfigFactory; /** * @author darran.lofthouse(a)jboss.com Modified: branches/tdiesler/trunk/src/test/java/org/jboss/test/ws/jaxrpc/xop/doclit/InlineHandler.java =================================================================== --- branches/tdiesler/trunk/src/test/java/org/jboss/test/ws/jaxrpc/xop/doclit/InlineHandler.java 2006-12-06 10:47:51 UTC (rev 1571) +++ branches/tdiesler/trunk/src/test/java/org/jboss/test/ws/jaxrpc/xop/doclit/InlineHandler.java 2006-12-06 11:19:33 UTC (rev 1572) @@ -22,7 +22,7 @@ package org.jboss.test.ws.jaxrpc.xop.doclit; import org.jboss.logging.Logger; -import org.jboss.ws.core.soap.NameImpl; +import org.jboss.ws.common.NameImpl; import javax.xml.rpc.handler.GenericHandler; import javax.xml.rpc.handler.HandlerInfo; Modified: branches/tdiesler/trunk/src/test/java/org/jboss/test/ws/jaxrpc/xop/rpclit/InlineHandler.java =================================================================== --- branches/tdiesler/trunk/src/test/java/org/jboss/test/ws/jaxrpc/xop/rpclit/InlineHandler.java 2006-12-06 10:47:51 UTC (rev 1571) +++ branches/tdiesler/trunk/src/test/java/org/jboss/test/ws/jaxrpc/xop/rpclit/InlineHandler.java 2006-12-06 11:19:33 UTC (rev 1572) @@ -1,7 +1,7 @@ package org.jboss.test.ws.jaxrpc.xop.rpclit; import org.jboss.logging.Logger; -import org.jboss.ws.core.soap.NameImpl; +import org.jboss.ws.common.NameImpl; import javax.xml.namespace.QName; import javax.xml.rpc.handler.GenericHandler; Modified: branches/tdiesler/trunk/src/test/java/org/jboss/test/ws/jaxws/exception/ExceptionEndpointImpl.java =================================================================== --- branches/tdiesler/trunk/src/test/java/org/jboss/test/ws/jaxws/exception/ExceptionEndpointImpl.java 2006-12-06 10:47:51 UTC (rev 1571) +++ branches/tdiesler/trunk/src/test/java/org/jboss/test/ws/jaxws/exception/ExceptionEndpointImpl.java 2006-12-06 11:19:33 UTC (rev 1572) @@ -27,7 +27,7 @@ import javax.xml.soap.SOAPFault; import javax.xml.ws.soap.SOAPFaultException; -import org.jboss.ws.core.soap.NameImpl; +import org.jboss.ws.common.NameImpl; import org.jboss.ws.core.soap.SOAPFaultImpl; @WebService(endpointInterface="org.jboss.test.ws.jaxws.exception.ExceptionEndpoint") Modified: branches/tdiesler/trunk/src/test/java/org/jboss/test/ws/jaxws/jbws1190/TestEndpointImpl.java =================================================================== --- branches/tdiesler/trunk/src/test/java/org/jboss/test/ws/jaxws/jbws1190/TestEndpointImpl.java 2006-12-06 10:47:51 UTC (rev 1571) +++ branches/tdiesler/trunk/src/test/java/org/jboss/test/ws/jaxws/jbws1190/TestEndpointImpl.java 2006-12-06 11:19:33 UTC (rev 1572) @@ -27,12 +27,12 @@ import javax.jws.WebService; +import org.jboss.ws.common.config.ServerConfig; +import org.jboss.ws.common.config.ServerConfigFactory; import org.jboss.ws.common.metadata.wsdl.WSDLDefinitions; import org.jboss.ws.common.metadata.wsdl.WSDLDefinitionsFactory; import org.jboss.ws.common.metadata.wsdl.WSDLEndpoint; import org.jboss.ws.common.metadata.wsdl.WSDLService; -import org.jboss.ws.core.server.ServerConfig; -import org.jboss.ws.core.server.ServerConfigFactory; /** * Modified: branches/tdiesler/trunk/src/test/java/org/jboss/test/ws/jaxws/jsr181/soapbinding/JSR181SOAPBindingTestCase.java =================================================================== --- branches/tdiesler/trunk/src/test/java/org/jboss/test/ws/jaxws/jsr181/soapbinding/JSR181SOAPBindingTestCase.java 2006-12-06 10:47:51 UTC (rev 1571) +++ branches/tdiesler/trunk/src/test/java/org/jboss/test/ws/jaxws/jsr181/soapbinding/JSR181SOAPBindingTestCase.java 2006-12-06 11:19:33 UTC (rev 1572) @@ -39,7 +39,7 @@ import org.jboss.test.ws.JBossWSTest; import org.jboss.test.ws.JBossWSTestSetup; -import org.jboss.ws.core.soap.NameImpl; +import org.jboss.ws.common.NameImpl; /** * Test the JSR-181 annotation: javax.jws.SOAPBinding Modified: branches/tdiesler/trunk/src/test/java/org/jboss/test/ws/jaxws/jsr181/webmethod/JSR181WebMethodTestCase.java =================================================================== --- branches/tdiesler/trunk/src/test/java/org/jboss/test/ws/jaxws/jsr181/webmethod/JSR181WebMethodTestCase.java 2006-12-06 10:47:51 UTC (rev 1571) +++ branches/tdiesler/trunk/src/test/java/org/jboss/test/ws/jaxws/jsr181/webmethod/JSR181WebMethodTestCase.java 2006-12-06 11:19:33 UTC (rev 1572) @@ -41,8 +41,8 @@ import org.jboss.test.ws.JBossWSTest; import org.jboss.test.ws.JBossWSTestSetup; +import org.jboss.ws.common.NameImpl; import org.jboss.ws.common.utils.DOMUtils; -import org.jboss.ws.core.soap.NameImpl; import org.w3c.dom.Element; import org.xml.sax.InputSource; Modified: branches/tdiesler/trunk/src/test/java/org/jboss/test/ws/jaxws/jsr181/webresult/JSR181WebResultTestCase.java =================================================================== --- branches/tdiesler/trunk/src/test/java/org/jboss/test/ws/jaxws/jsr181/webresult/JSR181WebResultTestCase.java 2006-12-06 10:47:51 UTC (rev 1571) +++ branches/tdiesler/trunk/src/test/java/org/jboss/test/ws/jaxws/jsr181/webresult/JSR181WebResultTestCase.java 2006-12-06 11:19:33 UTC (rev 1572) @@ -37,10 +37,10 @@ import org.jboss.test.ws.JBossWSTest; import org.jboss.test.ws.JBossWSTestSetup; +import org.jboss.ws.common.NameImpl; import org.jboss.ws.common.umdm.OperationMetaData; import org.jboss.ws.core.jaxrpc.CallImpl; import org.jboss.ws.core.jaxrpc.ServiceFactoryImpl; -import org.jboss.ws.core.soap.NameImpl; /** * Test the JSR-181 annotation: javax.jws.webresult