[jbossws-commits] JBossWS SVN: r1565 - in branches/tdiesler/trunk/src: main/java/org/jboss/ws/common main/java/org/jboss/ws/common/umdm main/java/org/jboss/ws/core main/java/org/jboss/ws/core/binding main/java/org/jboss/ws/core/jaxws main/java/org/jboss/ws/core/jaxws/client main/java/org/jboss/ws/core/jaxws/core main/java/org/jboss/ws/core/jaxws/handler main/java/org/jboss/ws/core/jaxws/spi main/java/org/jboss/ws/core/jbossxb main/java/org/jboss/ws/core/server main/java/org/jboss/ws/core/soap main/java/org/

Author: thomas.diesler(a)jboss.com Date: 2006-12-05 20:14:45 -0500 (Tue, 05 Dec 2006) New Revision: 1565 Added: branches/tdiesler/trunk/src/main/java/org/jboss/ws/common/umdm/ 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/ExtensibleMetaData.java branches/tdiesler/trunk/src/main/java/org/jboss/ws/common/umdm/FaultMetaData.java branches/tdiesler/trunk/src/main/java/org/jboss/ws/common/umdm/HandlerMetaData.java branches/tdiesler/trunk/src/main/java/org/jboss/ws/common/umdm/HandlerMetaDataJAXRPC.java branches/tdiesler/trunk/src/main/java/org/jboss/ws/common/umdm/HandlerMetaDataJAXWS.java branches/tdiesler/trunk/src/main/java/org/jboss/ws/common/umdm/MetaDataExtension.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/ParameterMetaData.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/umdm/TypeMappingMetaData.java branches/tdiesler/trunk/src/main/java/org/jboss/ws/common/umdm/TypesMetaData.java branches/tdiesler/trunk/src/main/java/org/jboss/ws/common/umdm/UnifiedMetaData.java branches/tdiesler/trunk/src/main/java/org/jboss/ws/common/umdm/WrappedParameter.java Removed: branches/tdiesler/trunk/src/main/java/org/jboss/ws/common/metadata/ 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/ExtensibleMetaData.java branches/tdiesler/trunk/src/main/java/org/jboss/ws/common/umdm/FaultMetaData.java branches/tdiesler/trunk/src/main/java/org/jboss/ws/common/umdm/HandlerMetaData.java branches/tdiesler/trunk/src/main/java/org/jboss/ws/common/umdm/HandlerMetaDataJAXRPC.java branches/tdiesler/trunk/src/main/java/org/jboss/ws/common/umdm/HandlerMetaDataJAXWS.java branches/tdiesler/trunk/src/main/java/org/jboss/ws/common/umdm/MetaDataExtension.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/ParameterMetaData.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/umdm/TypeMappingMetaData.java branches/tdiesler/trunk/src/main/java/org/jboss/ws/common/umdm/TypesMetaData.java branches/tdiesler/trunk/src/main/java/org/jboss/ws/common/umdm/UnifiedMetaData.java branches/tdiesler/trunk/src/main/java/org/jboss/ws/common/umdm/WrappedParameter.java branches/tdiesler/trunk/src/main/java/org/jboss/ws/metadata/umdm/ Modified: branches/tdiesler/trunk/src/main/java/org/jboss/ws/core/CommonBinding.java branches/tdiesler/trunk/src/main/java/org/jboss/ws/core/CommonBindingProvider.java branches/tdiesler/trunk/src/main/java/org/jboss/ws/core/CommonClient.java branches/tdiesler/trunk/src/main/java/org/jboss/ws/core/CommonMessageContext.java branches/tdiesler/trunk/src/main/java/org/jboss/ws/core/CommonSOAP11Binding.java branches/tdiesler/trunk/src/main/java/org/jboss/ws/core/CommonSOAP12Binding.java branches/tdiesler/trunk/src/main/java/org/jboss/ws/core/CommonSOAPBinding.java branches/tdiesler/trunk/src/main/java/org/jboss/ws/core/binding/EndpointInvocation.java branches/tdiesler/trunk/src/main/java/org/jboss/ws/core/binding/UnboundHeader.java branches/tdiesler/trunk/src/main/java/org/jboss/ws/core/jaxws/DynamicWrapperGenerator.java branches/tdiesler/trunk/src/main/java/org/jboss/ws/core/jaxws/WrapperGenerator.java branches/tdiesler/trunk/src/main/java/org/jboss/ws/core/jaxws/client/ClientImpl.java branches/tdiesler/trunk/src/main/java/org/jboss/ws/core/jaxws/client/ClientProxy.java branches/tdiesler/trunk/src/main/java/org/jboss/ws/core/jaxws/client/DispatchImpl.java branches/tdiesler/trunk/src/main/java/org/jboss/ws/core/jaxws/core/BindingExt.java branches/tdiesler/trunk/src/main/java/org/jboss/ws/core/jaxws/core/BindingImpl.java branches/tdiesler/trunk/src/main/java/org/jboss/ws/core/jaxws/core/BindingProviderImpl.java branches/tdiesler/trunk/src/main/java/org/jboss/ws/core/jaxws/core/HTTPBindingJAXWS.java branches/tdiesler/trunk/src/main/java/org/jboss/ws/core/jaxws/core/MessageBinding.java branches/tdiesler/trunk/src/main/java/org/jboss/ws/core/jaxws/core/PayloadBinding.java branches/tdiesler/trunk/src/main/java/org/jboss/ws/core/jaxws/core/SOAP11BindingJAXWS.java branches/tdiesler/trunk/src/main/java/org/jboss/ws/core/jaxws/core/SOAP12BindingJAXWS.java branches/tdiesler/trunk/src/main/java/org/jboss/ws/core/jaxws/core/SOAPBindingJAXWS.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/jaxws/handler/HandlerChainExecutor.java branches/tdiesler/trunk/src/main/java/org/jboss/ws/core/jaxws/handler/HandlerDelegateJAXWS.java branches/tdiesler/trunk/src/main/java/org/jboss/ws/core/jaxws/handler/HandlerResolverImpl.java branches/tdiesler/trunk/src/main/java/org/jboss/ws/core/jaxws/handler/MessageContextJAXWS.java branches/tdiesler/trunk/src/main/java/org/jboss/ws/core/jaxws/handler/PortInfoImpl.java branches/tdiesler/trunk/src/main/java/org/jboss/ws/core/jaxws/spi/ServiceDelegateImpl.java branches/tdiesler/trunk/src/main/java/org/jboss/ws/core/jbossxb/JBossXBSupport.java branches/tdiesler/trunk/src/main/java/org/jboss/ws/core/server/AbstractServiceEndpointInvoker.java branches/tdiesler/trunk/src/main/java/org/jboss/ws/core/server/AbstractServiceEndpointServlet.java branches/tdiesler/trunk/src/main/java/org/jboss/ws/core/server/HandlerDelegate.java branches/tdiesler/trunk/src/main/java/org/jboss/ws/core/server/ServiceEndpoint.java branches/tdiesler/trunk/src/main/java/org/jboss/ws/core/server/ServiceEndpointDeployer.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/ServiceEndpointInvokerJSE.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/ServiceEndpointManagerMBean.java branches/tdiesler/trunk/src/main/java/org/jboss/ws/core/server/WSDLFilePublisher.java branches/tdiesler/trunk/src/main/java/org/jboss/ws/core/server/WSDLRequestHandler.java branches/tdiesler/trunk/src/main/java/org/jboss/ws/core/soap/EndpointInfo.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/SOAPMessageDispatcher.java branches/tdiesler/trunk/src/main/java/org/jboss/ws/core/soap/SOAPMessageImpl.java branches/tdiesler/trunk/src/main/java/org/jboss/ws/extras/addressing/jaxrpc/WSAddressingServerHandler.java branches/tdiesler/trunk/src/main/java/org/jboss/ws/extras/addressing/jaxws/WSAddressingServerHandler.java branches/tdiesler/trunk/src/main/java/org/jboss/ws/extras/addressing/metadata/AddressingOpMetaExt.java branches/tdiesler/trunk/src/main/java/org/jboss/ws/extras/eventing/deployment/EventingEndpoint.java branches/tdiesler/trunk/src/main/java/org/jboss/ws/extras/eventing/metadata/EventingEpMetaExt.java branches/tdiesler/trunk/src/main/java/org/jboss/ws/extras/security/WSSecurityDispatcher.java branches/tdiesler/trunk/src/main/java/org/jboss/ws/extras/security/jaxrpc/WSSecurityHandler.java branches/tdiesler/trunk/src/main/java/org/jboss/ws/extras/security/jaxws/WSSecurityHandler.java branches/tdiesler/trunk/src/main/java/org/jboss/ws/integration/jboss50/AbstractEJBDeployer.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/ServiceEndpointGeneratorEJB.java branches/tdiesler/trunk/src/main/java/org/jboss/ws/integration/jboss50/ServiceEndpointLifecycleDeployer.java branches/tdiesler/trunk/src/main/java/org/jboss/ws/integration/jboss50/ServiceRefMetaDataAdaptor.java branches/tdiesler/trunk/src/main/java/org/jboss/ws/jaxrpc/CallImpl.java branches/tdiesler/trunk/src/main/java/org/jboss/ws/jaxrpc/CallProxy.java branches/tdiesler/trunk/src/main/java/org/jboss/ws/jaxrpc/HandlerRegistryImpl.java branches/tdiesler/trunk/src/main/java/org/jboss/ws/jaxrpc/ParameterWrapping.java branches/tdiesler/trunk/src/main/java/org/jboss/ws/jaxrpc/SOAP11BindingJAXRPC.java branches/tdiesler/trunk/src/main/java/org/jboss/ws/jaxrpc/SOAP12BindingJAXRPC.java branches/tdiesler/trunk/src/main/java/org/jboss/ws/jaxrpc/SOAPBindingJAXRPC.java branches/tdiesler/trunk/src/main/java/org/jboss/ws/jaxrpc/SOAPFaultHelperJAXRPC.java branches/tdiesler/trunk/src/main/java/org/jboss/ws/jaxrpc/SerializationContextJAXRPC.java branches/tdiesler/trunk/src/main/java/org/jboss/ws/jaxrpc/ServiceImpl.java branches/tdiesler/trunk/src/main/java/org/jboss/ws/jaxrpc/ServiceObjectFactory.java branches/tdiesler/trunk/src/main/java/org/jboss/ws/jaxrpc/StubExt.java branches/tdiesler/trunk/src/main/java/org/jboss/ws/jaxrpc/encoding/SOAPArrayDeserializer.java branches/tdiesler/trunk/src/main/java/org/jboss/ws/jaxrpc/encoding/SOAPArraySerializer.java branches/tdiesler/trunk/src/main/java/org/jboss/ws/jaxrpc/handler/HandlerChainBaseImpl.java branches/tdiesler/trunk/src/main/java/org/jboss/ws/jaxrpc/handler/HandlerDelegateJAXRPC.java branches/tdiesler/trunk/src/main/java/org/jboss/ws/jaxrpc/handler/MessageContextJAXRPC.java branches/tdiesler/trunk/src/main/java/org/jboss/ws/jaxrpc/handler/ServerHandlerChain.java branches/tdiesler/trunk/src/main/java/org/jboss/ws/metadata/acessor/JAXBAccessor.java branches/tdiesler/trunk/src/main/java/org/jboss/ws/metadata/acessor/ReflectiveMethodAccessor.java branches/tdiesler/trunk/src/main/java/org/jboss/ws/metadata/builder/MetaDataBuilder.java branches/tdiesler/trunk/src/main/java/org/jboss/ws/metadata/builder/jaxrpc/JAXRPCClientMetaDataBuilder.java branches/tdiesler/trunk/src/main/java/org/jboss/ws/metadata/builder/jaxrpc/JAXRPCMetaDataBuilder.java branches/tdiesler/trunk/src/main/java/org/jboss/ws/metadata/builder/jaxrpc/JAXRPCServerMetaDataBuilder.java branches/tdiesler/trunk/src/main/java/org/jboss/ws/metadata/builder/jaxws/JAXWSClientEndpointMetaDataBuilder.java branches/tdiesler/trunk/src/main/java/org/jboss/ws/metadata/builder/jaxws/JAXWSClientMetaDataBuilder.java branches/tdiesler/trunk/src/main/java/org/jboss/ws/metadata/builder/jaxws/JAXWSEndpointMetaDataBuilder.java branches/tdiesler/trunk/src/main/java/org/jboss/ws/metadata/builder/jaxws/JAXWSMetaDataBuilderEJB21.java branches/tdiesler/trunk/src/main/java/org/jboss/ws/metadata/builder/jaxws/JAXWSMetaDataBuilderEJB3.java branches/tdiesler/trunk/src/main/java/org/jboss/ws/metadata/builder/jaxws/JAXWSMetaDataBuilderJSE.java branches/tdiesler/trunk/src/main/java/org/jboss/ws/metadata/builder/jaxws/JAXWSProviderMetaDataBuilder.java branches/tdiesler/trunk/src/main/java/org/jboss/ws/metadata/builder/jaxws/JAXWSServerMetaDataBuilder.java branches/tdiesler/trunk/src/main/java/org/jboss/ws/metadata/builder/jaxws/JAXWSWebServiceMetaDataBuilder.java branches/tdiesler/trunk/src/main/java/org/jboss/ws/metadata/config/WSCommonConfig.java branches/tdiesler/trunk/src/main/java/org/jboss/ws/metadata/config/jaxrpc/WSCommonConfigJAXRPC.java branches/tdiesler/trunk/src/main/java/org/jboss/ws/metadata/config/jaxrpc/WSConfigFactoryJAXRPC.java branches/tdiesler/trunk/src/main/java/org/jboss/ws/metadata/config/jaxrpc/WSEndpointConfigJAXRPC.java branches/tdiesler/trunk/src/main/java/org/jboss/ws/metadata/config/jaxws/WSCommonConfigJAXWS.java branches/tdiesler/trunk/src/main/java/org/jboss/ws/metadata/config/jaxws/WSEndpointConfigJAXWS.java branches/tdiesler/trunk/src/main/java/org/jboss/ws/metadata/config/jaxws/WSHandlerChainsConfigJAXWS.java branches/tdiesler/trunk/src/main/java/org/jboss/ws/metadata/j2ee/UnifiedHandlerMetaData.java branches/tdiesler/trunk/src/main/java/org/jboss/ws/metadata/jsr109/WebservicesFactory.java branches/tdiesler/trunk/src/main/java/org/jboss/ws/metadata/jsr181/HandlerChainFactory.java branches/tdiesler/trunk/src/main/java/org/jboss/ws/metadata/jsr181/HandlerChainMetaData.java branches/tdiesler/trunk/src/main/java/org/jboss/ws/metadata/jsr181/HandlerChainsMetaData.java branches/tdiesler/trunk/src/main/java/org/jboss/ws/tools/JavaToWSDL.java branches/tdiesler/trunk/src/main/java/org/jboss/ws/tools/JavaToWSDL11.java branches/tdiesler/trunk/src/main/java/org/jboss/ws/tools/SourceWrapperGenerator.java branches/tdiesler/trunk/src/main/java/org/jboss/ws/tools/helpers/JavaToWSDLHelper.java branches/tdiesler/trunk/src/main/java/org/jboss/ws/tools/helpers/ToolsHelper.java branches/tdiesler/trunk/src/main/java/org/jboss/ws/tools/jaxws/WSDLGenerator.java branches/tdiesler/trunk/src/main/java/org/jboss/ws/tools/metadata/ReflectiveMetaDataBuilder.java branches/tdiesler/trunk/src/main/java/org/jboss/ws/tools/metadata/ToolsAnnotationMetaDataBuilder.java branches/tdiesler/trunk/src/main/java/org/jboss/ws/tools/metadata/ToolsEndpointMetaData.java branches/tdiesler/trunk/src/main/java/org/jboss/ws/tools/metadata/ToolsUnifiedMetaDataBuilder.java branches/tdiesler/trunk/src/test/java/org/jboss/test/ws/common/binding/SOAPBindingTestCase.java branches/tdiesler/trunk/src/test/java/org/jboss/test/ws/common/soap/attachment/GenericAttachmentTestCase.java branches/tdiesler/trunk/src/test/java/org/jboss/test/ws/jaxrpc/samples/dynamichandler/DynamicHandlerTestCase.java branches/tdiesler/trunk/src/test/java/org/jboss/test/ws/jaxws/jsr181/webparam/JSR181WebParamTestCase.java branches/tdiesler/trunk/src/test/java/org/jboss/test/ws/jaxws/jsr181/webresult/JSR181WebResultTestCase.java Log: partial commit Copied: branches/tdiesler/trunk/src/main/java/org/jboss/ws/common/umdm (from rev 1563, branches/tdiesler/trunk/src/main/java/org/jboss/ws/metadata/umdm) Deleted: branches/tdiesler/trunk/src/main/java/org/jboss/ws/common/umdm/ClientEndpointMetaData.java =================================================================== --- branches/tdiesler/trunk/src/main/java/org/jboss/ws/metadata/umdm/ClientEndpointMetaData.java 2006-12-06 01:04:23 UTC (rev 1563) +++ branches/tdiesler/trunk/src/main/java/org/jboss/ws/common/umdm/ClientEndpointMetaData.java 2006-12-06 01:14:45 UTC (rev 1565) @@ -1,177 +0,0 @@ -/* - * JBoss, Home of Professional Open Source - * Copyright 2005, JBoss Inc., and individual contributors as indicated - * by the @authors tag. See the copyright.txt in the distribution for a - * full listing of individual contributors. - * - * This is free software; you can redistribute it and/or modify it - * under the terms of the GNU Lesser General Public License as - * published by the Free Software Foundation; either version 2.1 of - * the License, or (at your option) any later version. - * - * This software is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * Lesser General Public License for more details. - * - * You should have received a copy of the GNU Lesser General Public - * License along with this software; if not, write to the Free - * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA - * 02110-1301 USA, or see the FSF site: http://www.fsf.org. - */ -package org.jboss.ws.metadata.umdm; - -// $Id$ - -import java.net.MalformedURLException; -import java.net.URL; -import java.util.ArrayList; -import java.util.List; - -import javax.xml.namespace.QName; - -import org.jboss.logging.Logger; -import org.jboss.ws.WSException; -import org.jboss.ws.metadata.config.WSConfigFactory; -import org.jboss.ws.metadata.config.jaxrpc.WSClientConfigJAXRPC; -import org.jboss.ws.metadata.config.jaxrpc.WSConfigRootJAXRPC; -import org.jboss.ws.metadata.config.jaxws.WSClientConfigJAXWS; -import org.jboss.ws.metadata.config.jaxws.WSConfigRootJAXWS; -import org.jboss.ws.metadata.config.jaxws.WSHandlerChainsConfigJAXWS; -import org.jboss.ws.metadata.jsr181.HandlerChainMetaData; -import org.jboss.ws.metadata.umdm.EndpointMetaData.Type; -import org.jboss.ws.metadata.umdm.HandlerMetaData.HandlerType; - -/** - * Client side endpoint meta data. - * - * @author Thomas.Diesler(a)jboss.org - * @since 12-May-2005 - */ -public class ClientEndpointMetaData extends EndpointMetaData -{ - // provide logging - private static Logger log = Logger.getLogger(ClientEndpointMetaData.class); - - public ClientEndpointMetaData(ServiceMetaData service, QName qname, QName interfaceQName, Type type) - { - super(service, qname, interfaceQName, type); - } - - public void setConfigName(String configName) - { - super.setConfigName(configName); - endpointConfig = null; - } - - public void setConfigFile(String configFile) - { - super.setConfigFile(configFile); - endpointConfig = null; - } - - @Override - public Object getEndpointConfig() - { - if (endpointConfig == null) - { - String configName = getConfigName(); - if (configName == null) - { - configName = "Standard Client"; - setConfigName(configName); - } - - String configFile = getConfigFile(); - if (configFile == null) - { - if (getType() == Type.JAXRPC) - { - configFile = "META-INF/standard-jaxrpc-client-config.xml"; - } - else - { - configFile = "META-INF/standard-jaxws-client-config.xml"; - } - setConfigFile(configFile); - } - - log.debug("getClientConfig: [name=" + configName + ",url=" + configFile + "]"); - - URL configURL = null; - try - { - configURL = new URL(configFile); - } - catch (MalformedURLException ex) - { - // ignore - } - - // Try to get the URL as resource - if (configURL == null) - { - ClassLoader cl = Thread.currentThread().getContextClassLoader(); - configURL = cl.getResource(configFile); - if (configURL == null) - throw new WSException("Cannot get resource: " + configFile); - } - - // Get the config root - Object wsConfig; - try - { - WSConfigFactory factory = WSConfigFactory.newInstance(); - wsConfig = factory.parseWithObjectModelFactory(configURL); - } - catch (RuntimeException rte) - { - throw rte; - } - catch (Exception ex) - { - throw new WSException("Cannot parse client config", ex); - } - - // Get the client config - if (wsConfig instanceof WSConfigRootJAXRPC) - { - endpointConfig = ((WSConfigRootJAXRPC)wsConfig).getClientConfigByName(configName); - if (endpointConfig == null) - throw new WSException("Cannot obtain client config: " + configName); - } - else - { - endpointConfig = ((WSConfigRootJAXWS)wsConfig).getClientConfigByName(configName); - if (endpointConfig == null) - throw new WSException("Cannot obtain client config: " + configName); - } - } - - return endpointConfig; - } - - public String toString() - { - StringBuilder buffer = new StringBuilder("\nClientEndpointMetaData:"); - buffer.append("\n type=" + getType()); - buffer.append("\n qname=" + getQName()); - buffer.append("\n address=" + getEndpointAddress()); - buffer.append("\n binding=" + getBindingId()); - buffer.append("\n seiName=" + getServiceEndpointInterfaceName()); - buffer.append("\n configFile=" + getConfigFile()); - buffer.append("\n configName=" + getConfigName()); - buffer.append("\n authMethod=" + getAuthMethod()); - buffer.append("\n properties=" + getProperties()); - - for (OperationMetaData opMetaData : getOperations()) - { - buffer.append("\n" + opMetaData); - } - for (HandlerMetaData hdlMetaData : getHandlerMetaData(HandlerType.ALL)) - { - buffer.append("\n" + hdlMetaData); - } - return buffer.toString(); - } -} Copied: branches/tdiesler/trunk/src/main/java/org/jboss/ws/common/umdm/ClientEndpointMetaData.java (from rev 1564, branches/tdiesler/trunk/src/main/java/org/jboss/ws/metadata/umdm/ClientEndpointMetaData.java) =================================================================== --- branches/tdiesler/trunk/src/main/java/org/jboss/ws/metadata/umdm/ClientEndpointMetaData.java 2006-12-06 01:10:43 UTC (rev 1564) +++ branches/tdiesler/trunk/src/main/java/org/jboss/ws/common/umdm/ClientEndpointMetaData.java 2006-12-06 01:14:45 UTC (rev 1565) @@ -0,0 +1,177 @@ +/* + * 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.umdm; + +// $Id$ + +import java.net.MalformedURLException; +import java.net.URL; +import java.util.ArrayList; +import java.util.List; + +import javax.xml.namespace.QName; + +import org.jboss.logging.Logger; +import org.jboss.ws.common.WSException; +import org.jboss.ws.common.umdm.EndpointMetaData.Type; +import org.jboss.ws.common.umdm.HandlerMetaData.HandlerType; +import org.jboss.ws.metadata.config.WSConfigFactory; +import org.jboss.ws.metadata.config.jaxrpc.WSClientConfigJAXRPC; +import org.jboss.ws.metadata.config.jaxrpc.WSConfigRootJAXRPC; +import org.jboss.ws.metadata.config.jaxws.WSClientConfigJAXWS; +import org.jboss.ws.metadata.config.jaxws.WSConfigRootJAXWS; +import org.jboss.ws.metadata.config.jaxws.WSHandlerChainsConfigJAXWS; +import org.jboss.ws.metadata.jsr181.HandlerChainMetaData; + +/** + * Client side endpoint meta data. + * + * @author Thomas.Diesler(a)jboss.org + * @since 12-May-2005 + */ +public class ClientEndpointMetaData extends EndpointMetaData +{ + // provide logging + private static Logger log = Logger.getLogger(ClientEndpointMetaData.class); + + public ClientEndpointMetaData(ServiceMetaData service, QName qname, QName interfaceQName, Type type) + { + super(service, qname, interfaceQName, type); + } + + public void setConfigName(String configName) + { + super.setConfigName(configName); + endpointConfig = null; + } + + public void setConfigFile(String configFile) + { + super.setConfigFile(configFile); + endpointConfig = null; + } + + @Override + public Object getEndpointConfig() + { + if (endpointConfig == null) + { + String configName = getConfigName(); + if (configName == null) + { + configName = "Standard Client"; + setConfigName(configName); + } + + String configFile = getConfigFile(); + if (configFile == null) + { + if (getType() == Type.JAXRPC) + { + configFile = "META-INF/standard-jaxrpc-client-config.xml"; + } + else + { + configFile = "META-INF/standard-jaxws-client-config.xml"; + } + setConfigFile(configFile); + } + + log.debug("getClientConfig: [name=" + configName + ",url=" + configFile + "]"); + + URL configURL = null; + try + { + configURL = new URL(configFile); + } + catch (MalformedURLException ex) + { + // ignore + } + + // Try to get the URL as resource + if (configURL == null) + { + ClassLoader cl = Thread.currentThread().getContextClassLoader(); + configURL = cl.getResource(configFile); + if (configURL == null) + throw new WSException("Cannot get resource: " + configFile); + } + + // Get the config root + Object wsConfig; + try + { + WSConfigFactory factory = WSConfigFactory.newInstance(); + wsConfig = factory.parseWithObjectModelFactory(configURL); + } + catch (RuntimeException rte) + { + throw rte; + } + catch (Exception ex) + { + throw new WSException("Cannot parse client config", ex); + } + + // Get the client config + if (wsConfig instanceof WSConfigRootJAXRPC) + { + endpointConfig = ((WSConfigRootJAXRPC)wsConfig).getClientConfigByName(configName); + if (endpointConfig == null) + throw new WSException("Cannot obtain client config: " + configName); + } + else + { + endpointConfig = ((WSConfigRootJAXWS)wsConfig).getClientConfigByName(configName); + if (endpointConfig == null) + throw new WSException("Cannot obtain client config: " + configName); + } + } + + return endpointConfig; + } + + public String toString() + { + StringBuilder buffer = new StringBuilder("\nClientEndpointMetaData:"); + buffer.append("\n type=" + getType()); + buffer.append("\n qname=" + getQName()); + buffer.append("\n address=" + getEndpointAddress()); + buffer.append("\n binding=" + getBindingId()); + buffer.append("\n seiName=" + getServiceEndpointInterfaceName()); + buffer.append("\n configFile=" + getConfigFile()); + buffer.append("\n configName=" + getConfigName()); + buffer.append("\n authMethod=" + getAuthMethod()); + buffer.append("\n properties=" + getProperties()); + + for (OperationMetaData opMetaData : getOperations()) + { + buffer.append("\n" + opMetaData); + } + for (HandlerMetaData hdlMetaData : getHandlerMetaData(HandlerType.ALL)) + { + buffer.append("\n" + hdlMetaData); + } + return buffer.toString(); + } +} Deleted: branches/tdiesler/trunk/src/main/java/org/jboss/ws/common/umdm/EndpointMetaData.java =================================================================== --- branches/tdiesler/trunk/src/main/java/org/jboss/ws/metadata/umdm/EndpointMetaData.java 2006-12-06 01:04:23 UTC (rev 1563) +++ branches/tdiesler/trunk/src/main/java/org/jboss/ws/common/umdm/EndpointMetaData.java 2006-12-06 01:14:45 UTC (rev 1565) @@ -1,580 +0,0 @@ -/* - * JBoss, Home of Professional Open Source - * Copyright 2005, JBoss Inc., and individual contributors as indicated - * by the @authors tag. See the copyright.txt in the distribution for a - * full listing of individual contributors. - * - * This is free software; you can redistribute it and/or modify it - * under the terms of the GNU Lesser General Public License as - * published by the Free Software Foundation; either version 2.1 of - * the License, or (at your option) any later version. - * - * This software is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * Lesser General Public License for more details. - * - * You should have received a copy of the GNU Lesser General Public - * License along with this software; if not, write to the Free - * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA - * 02110-1301 USA, or see the FSF site: http://www.fsf.org. - */ -package org.jboss.ws.metadata.umdm; - -// $Id$ - -import java.lang.reflect.Method; -import java.util.ArrayList; -import java.util.Arrays; -import java.util.HashMap; -import java.util.List; -import java.util.Map; -import java.util.Properties; - -import javax.jws.soap.SOAPBinding.ParameterStyle; -import javax.xml.namespace.QName; -import javax.xml.rpc.ParameterMode; -import javax.xml.ws.Service.Mode; - -import org.jboss.logging.Logger; -import org.jboss.ws.Constants; -import org.jboss.ws.WSException; -import org.jboss.ws.common.utils.JavaUtils; -import org.jboss.ws.core.CommonSOAPBinding; -import org.jboss.ws.core.jaxws.JAXBDeserializerFactory; -import org.jboss.ws.core.jaxws.JAXBSerializerFactory; -import org.jboss.ws.core.jbossxb.JBossXBDeserializerFactory; -import org.jboss.ws.core.jbossxb.JBossXBSerializerFactory; -import org.jboss.ws.jaxrpc.Style; -import org.jboss.ws.jaxrpc.TypeMappingImpl; -import org.jboss.ws.jaxrpc.Use; -import org.jboss.ws.jaxrpc.encoding.SOAPArrayDeserializerFactory; -import org.jboss.ws.jaxrpc.encoding.SOAPArraySerializerFactory; -import org.jboss.ws.metadata.config.WSCommonConfig; -import org.jboss.ws.metadata.umdm.HandlerMetaData.HandlerType; - -/** - * A Service component describes a set of endpoints. - * - * @author Thomas.Diesler(a)jboss.org - * @since 12-May-2005 - */ -public abstract class EndpointMetaData extends ExtensibleMetaData -{ - // provide logging - private static Logger log = Logger.getLogger(EndpointMetaData.class); - - public enum Type - { - JAXRPC, JAXWS - } - - // The parent meta data. - private ServiceMetaData serviceMetaData; - - // The REQUIRED endpoint config - protected WSCommonConfig endpointConfig; - - // The REQUIRED name - private QName portName; - // The REQUIRED binding id - private String bindingId; - // The REQUIRED name of the WSDL interface/portType - private QName interfaceQName; - // The REQUIRED config-name - private String configName; - // The REQUIRED config-file - private String configFile; - // The endpoint address - private String endpointAddress; - // The endpoint interface name - private String seiName; - // The endpoint interface - private Class seiClass; - // The optional authentication method - private String authMethod; - // Arbitrary properties given by <call-property> - private Properties properties; - // The SOAPBinding style - private Style style; - // The SOAPBinding use - private Use use; - // The SOAPBinding parameter style - private ParameterStyle parameterStyle; - // The JAXWS ServiceMode - private Mode serviceMode; - // Whether the endpoint was deployed from annotations - private Type type; - // The list of service meta data - private List<OperationMetaData> operations = new ArrayList<OperationMetaData>(); - // The optional handlers - private List<HandlerMetaData> handlers = new ArrayList<HandlerMetaData>(); - // True if the handlers are initialized - private boolean handlersInitialized; - // Maps the java method to the operation meta data - private Map<Method, OperationMetaData> opMetaDataCache = new HashMap<Method, OperationMetaData>(); - - public EndpointMetaData(ServiceMetaData service, QName qname, QName interfaceQName, Type type) - { - this.serviceMetaData = service; - this.portName = qname; - this.interfaceQName = interfaceQName; - this.type = type; - - // The default binding - this.bindingId = CommonSOAPBinding.SOAP11HTTP_BINDING; - } - - public ServiceMetaData getServiceMetaData() - { - return serviceMetaData; - } - - public QName getQName() - { - return portName; - } - - public QName getInterfaceQName() - { - return interfaceQName; - } - - public String getConfigFile() - { - return configFile; - } - - public void setConfigFile(String configFile) - { - this.configFile = configFile; - this.endpointConfig = null; - } - - public String getConfigName() - { - return configName; - } - - public void setConfigName(String configName) - { - this.configName = configName; - this.endpointConfig = null; - } - - public abstract Object getEndpointConfig(); - - public String getEndpointAddress() - { - return endpointAddress; - } - - public void setEndpointAddress(String endpointAddress) - { - this.endpointAddress = endpointAddress; - } - - public String getBindingId() - { - return bindingId; - } - - public void setBindingId(String bindingId) - { - if (!CommonSOAPBinding.SOAP11HTTP_BINDING.equals(bindingId) && !CommonSOAPBinding.SOAP12HTTP_BINDING.equals(bindingId)) - throw new WSException("Unsupported binding: " + bindingId); - this.bindingId = bindingId; - } - - public String getServiceEndpointInterfaceName() - { - return seiName; - } - - public void setServiceEndpointInterfaceName(String seiName) - { - this.seiName = seiName; - this.seiClass = null; - - UnifiedMetaData wsMetaData = serviceMetaData.getUnifiedMetaData(); - if (wsMetaData.isEagerInitialized()) - { - if (UnifiedMetaData.isFinalRelease() == false) - log.warn("Set SEI name after eager initialization", new IllegalStateException()); - - // reinitialize - initializeInternal(); - } - } - - /** Get the class loader associated with the endpoint meta data */ - public ClassLoader getClassLoader() - { - ClassLoader classLoader = getServiceMetaData().getUnifiedMetaData().getClassLoader(); - return classLoader; - } - - /** - * Load the service endpoint interface. - * It should only be cached during eager initialization. - */ - public Class getServiceEndpointInterface() - { - Class tmpClass = seiClass; - if (tmpClass == null && seiName != null) - { - try - { - ClassLoader classLoader = getClassLoader(); - tmpClass = classLoader.loadClass(seiName); - if (serviceMetaData.getUnifiedMetaData().isEagerInitialized()) - { - log.warn("Loading SEI after eager initialization"); - seiClass = tmpClass; - } - } - catch (ClassNotFoundException ex) - { - throw new WSException("Cannot load service endpoint interface: " + seiName, ex); - } - } - return tmpClass; - } - - public Use getEncodingStyle() - { - if (use == null) - { - use = Use.getDefaultUse(); - log.debug("Using default encoding style: " + use); - } - return use; - } - - public void setEncodingStyle(Use value) - { - if (value != null && use != null && !use.equals(value)) - throw new WSException("Mixed encoding styles not supported"); - - log.trace("setEncodingStyle: " + value); - this.use = value; - } - - public Style getStyle() - { - if (style == null) - { - style = Style.getDefaultStyle(); - log.debug("Using default style: " + style); - } - return style; - } - - public void setStyle(Style value) - { - if (value != null && style != null && !style.equals(value)) - throw new WSException("Mixed styles not supported"); - - log.trace("setStyle: " + value); - this.style = value; - } - - public ParameterStyle getParameterStyle() - { - if (parameterStyle == null) - { - parameterStyle = ParameterStyle.WRAPPED; - log.debug("Using default parameter style: " + parameterStyle); - } - return parameterStyle; - } - - public void setParameterStyle(ParameterStyle value) - { - if (value != null && parameterStyle != null && !parameterStyle.equals(value)) - throw new WSException("Mixed SOAP parameter styles not supported"); - - log.debug("setParameterStyle: " + value); - this.parameterStyle = value; - } - - public Mode getServiceMode() - { - return serviceMode; - } - - public void setServiceMode(Mode serviceMode) - { - this.serviceMode = serviceMode; - } - - public Type getType() - { - return type; - } - - public String getAuthMethod() - { - return authMethod; - } - - public void setAuthMethod(String authMethod) - { - this.authMethod = authMethod; - } - - public Properties getProperties() - { - return properties; - } - - public void setProperties(Properties properties) - { - this.properties = properties; - } - - public List<OperationMetaData> getOperations() - { - return new ArrayList<OperationMetaData>(operations); - } - - public OperationMetaData getOperation(QName xmlName) - { - OperationMetaData opMetaData = null; - for (OperationMetaData aux : operations) - { - QName opQName = aux.getQName(); - String javaName = aux.getJavaName(); - if (opQName.equals(xmlName) && !javaName.endsWith(Constants.ASYNC_METHOD_SUFFIX)) - { - if (opMetaData == null) - { - opMetaData = aux; - } - else - { - throw new WSException("Cannot uniquely indentify operation: " + xmlName); - } - } - } - - if (opMetaData == null && getStyle() == Style.DOCUMENT) - { - for (OperationMetaData auxOperation : operations) - { - ParameterMetaData paramMetaData = null; - for (ParameterMetaData auxParam : auxOperation.getParameters()) - { - ParameterMode mode = auxParam.getMode(); - if (auxParam.isInHeader() == false && mode == ParameterMode.IN) - { - paramMetaData = auxParam; - break; - } - } - if (paramMetaData != null && paramMetaData.getXmlName().equals(xmlName)) - { - if (opMetaData == null) - { - opMetaData = auxOperation; - } - else - { - throw new WSException("Cannot uniquely indentify operation: " + xmlName); - } - } - } - } - - return opMetaData; - } - - public OperationMetaData getOperation(Method method) - { - if (opMetaDataCache.size() == 0) - { - // This can happen when the SEI mapping was not found - log.warn("Access to empty operation meta data cache, reinitializing"); - initializeInternal(); - } - - OperationMetaData opMetaData = opMetaDataCache.get(method); - if (opMetaData == null) - { - for (OperationMetaData aux : operations) - { - boolean doesMatch = aux.getJavaMethod().equals(method); - - // fallback for async methods - if(!doesMatch && method.getName().endsWith(Constants.ASYNC_METHOD_SUFFIX)) - { - String name = method.getName(); - name = name.substring(0, name.length()-5); - doesMatch = aux.getJavaName().equals(name); - } - - if (doesMatch) - { - opMetaDataCache.put(method, aux); - opMetaData = aux; - break; - } - - } - } - return opMetaData; - } - - public void addOperation(OperationMetaData opMetaData) - { - operations.add(opMetaData); - } - - public void clearOperations() - { - operations.clear(); - } - - public void addHandlers(List<HandlerMetaData> configHandlers) - { - handlers.addAll(configHandlers); - } - - public void addHandler(HandlerMetaData handler) - { - handlers.add(handler); - } - - public void clearHandlers() - { - handlers.clear(); - handlersInitialized = false; - } - - public List<HandlerMetaData> getHandlerMetaData(HandlerType type) - { - List<HandlerMetaData> typeHandlers = new ArrayList<HandlerMetaData>(); - for (HandlerMetaData hmd : handlers) - { - if (hmd.getHandlerType() == type || type == HandlerType.ALL) - typeHandlers.add(hmd); - } - return typeHandlers; - } - - public boolean isHandlersInitialized() - { - return handlersInitialized; - } - - public void setHandlersInitialized(boolean flag) - { - this.handlersInitialized = flag; - } - - public void validate() - { - for (HandlerMetaData handler : handlers) - handler.validate(); - - for (OperationMetaData opMetaData : operations) - opMetaData.validate(); - } - - /** - * @see UnifiedMetaData#eagerInitialize() - */ - public void eagerInitialize() - { - initializeInternal(); - } - - private void initializeInternal() - { - // reset sei class - seiClass = null; - - // Initialize handlers - for (HandlerMetaData handler : handlers) - handler.eagerInitialize(); - - eagerInitializeOperations(); - eagerInitializeTypes(); - } - - private void eagerInitializeOperations() - { - seiClass = getServiceEndpointInterface(); - if (seiClass != null) - { - List<Method> unsynchronizedMethods = new ArrayList<Method>(); - unsynchronizedMethods.addAll(Arrays.asList(seiClass.getMethods())); - - for (OperationMetaData opMetaData : operations) - { - opMetaData.eagerInitialize(unsynchronizedMethods); - Method method = opMetaData.getJavaMethod(); - if (method != null) - { - opMetaDataCache.put(method, opMetaData); - unsynchronizedMethods.remove(method); - } - } - } - } - - private void eagerInitializeTypes() - { - TypeMappingImpl typeMapping = serviceMetaData.getTypeMapping(); - for (TypeMappingMetaData tmMetaData : serviceMetaData.getTypesMetaData().getTypeMappings()) - { - String javaTypeName = tmMetaData.getJavaTypeName(); - QName xmlType = tmMetaData.getXmlType(); - if (xmlType != null) - { - List<Class> registeredTypes = typeMapping.getJavaTypes(xmlType); - - boolean registered = false; - for (Class current : registeredTypes) { - if (current.getName().equals(javaTypeName)) - { - registered = true; - break; - } - } - - if (registered == false) - { - try - { - ClassLoader classLoader = getClassLoader(); - Class javaType = JavaUtils.loadJavaType(javaTypeName, classLoader); - - if (JavaUtils.isPrimitive(javaTypeName)) - javaType = JavaUtils.getWrapperType(javaType); - - if (getEncodingStyle() == Use.ENCODED && javaType.isArray()) - { - typeMapping.register(javaType, xmlType, new SOAPArraySerializerFactory(), new SOAPArrayDeserializerFactory()); - } - else - { - if (getType() == Type.JAXWS) - { - typeMapping.register(javaType, xmlType, new JAXBSerializerFactory(), new JAXBDeserializerFactory()); - } - else - { - typeMapping.register(javaType, xmlType, new JBossXBSerializerFactory(), new JBossXBDeserializerFactory()); - } - } - } - catch (ClassNotFoundException e) - { - log.warn("Cannot load class for type: " + xmlType + "," + javaTypeName); - } - } - } - } - } -} Copied: branches/tdiesler/trunk/src/main/java/org/jboss/ws/common/umdm/EndpointMetaData.java (from rev 1564, branches/tdiesler/trunk/src/main/java/org/jboss/ws/metadata/umdm/EndpointMetaData.java) =================================================================== --- branches/tdiesler/trunk/src/main/java/org/jboss/ws/metadata/umdm/EndpointMetaData.java 2006-12-06 01:10:43 UTC (rev 1564) +++ branches/tdiesler/trunk/src/main/java/org/jboss/ws/common/umdm/EndpointMetaData.java 2006-12-06 01:14:45 UTC (rev 1565) @@ -0,0 +1,580 @@ +/* + * 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.umdm; + +// $Id$ + +import java.lang.reflect.Method; +import java.util.ArrayList; +import java.util.Arrays; +import java.util.HashMap; +import java.util.List; +import java.util.Map; +import java.util.Properties; + +import javax.jws.soap.SOAPBinding.ParameterStyle; +import javax.xml.namespace.QName; +import javax.xml.rpc.ParameterMode; +import javax.xml.ws.Service.Mode; + +import org.jboss.logging.Logger; +import org.jboss.ws.common.Constants; +import org.jboss.ws.common.WSException; +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.jaxws.JAXBDeserializerFactory; +import org.jboss.ws.core.jaxws.JAXBSerializerFactory; +import org.jboss.ws.core.jbossxb.JBossXBDeserializerFactory; +import org.jboss.ws.core.jbossxb.JBossXBSerializerFactory; +import org.jboss.ws.jaxrpc.Style; +import org.jboss.ws.jaxrpc.TypeMappingImpl; +import org.jboss.ws.jaxrpc.Use; +import org.jboss.ws.jaxrpc.encoding.SOAPArrayDeserializerFactory; +import org.jboss.ws.jaxrpc.encoding.SOAPArraySerializerFactory; +import org.jboss.ws.metadata.config.WSCommonConfig; + +/** + * A Service component describes a set of endpoints. + * + * @author Thomas.Diesler(a)jboss.org + * @since 12-May-2005 + */ +public abstract class EndpointMetaData extends ExtensibleMetaData +{ + // provide logging + private static Logger log = Logger.getLogger(EndpointMetaData.class); + + public enum Type + { + JAXRPC, JAXWS + } + + // The parent meta data. + private ServiceMetaData serviceMetaData; + + // The REQUIRED endpoint config + protected WSCommonConfig endpointConfig; + + // The REQUIRED name + private QName portName; + // The REQUIRED binding id + private String bindingId; + // The REQUIRED name of the WSDL interface/portType + private QName interfaceQName; + // The REQUIRED config-name + private String configName; + // The REQUIRED config-file + private String configFile; + // The endpoint address + private String endpointAddress; + // The endpoint interface name + private String seiName; + // The endpoint interface + private Class seiClass; + // The optional authentication method + private String authMethod; + // Arbitrary properties given by <call-property> + private Properties properties; + // The SOAPBinding style + private Style style; + // The SOAPBinding use + private Use use; + // The SOAPBinding parameter style + private ParameterStyle parameterStyle; + // The JAXWS ServiceMode + private Mode serviceMode; + // Whether the endpoint was deployed from annotations + private Type type; + // The list of service meta data + private List<OperationMetaData> operations = new ArrayList<OperationMetaData>(); + // The optional handlers + private List<HandlerMetaData> handlers = new ArrayList<HandlerMetaData>(); + // True if the handlers are initialized + private boolean handlersInitialized; + // Maps the java method to the operation meta data + private Map<Method, OperationMetaData> opMetaDataCache = new HashMap<Method, OperationMetaData>(); + + public EndpointMetaData(ServiceMetaData service, QName qname, QName interfaceQName, Type type) + { + this.serviceMetaData = service; + this.portName = qname; + this.interfaceQName = interfaceQName; + this.type = type; + + // The default binding + this.bindingId = CommonSOAPBinding.SOAP11HTTP_BINDING; + } + + public ServiceMetaData getServiceMetaData() + { + return serviceMetaData; + } + + public QName getQName() + { + return portName; + } + + public QName getInterfaceQName() + { + return interfaceQName; + } + + public String getConfigFile() + { + return configFile; + } + + public void setConfigFile(String configFile) + { + this.configFile = configFile; + this.endpointConfig = null; + } + + public String getConfigName() + { + return configName; + } + + public void setConfigName(String configName) + { + this.configName = configName; + this.endpointConfig = null; + } + + public abstract Object getEndpointConfig(); + + public String getEndpointAddress() + { + return endpointAddress; + } + + public void setEndpointAddress(String endpointAddress) + { + this.endpointAddress = endpointAddress; + } + + public String getBindingId() + { + return bindingId; + } + + public void setBindingId(String bindingId) + { + if (!CommonSOAPBinding.SOAP11HTTP_BINDING.equals(bindingId) && !CommonSOAPBinding.SOAP12HTTP_BINDING.equals(bindingId)) + throw new WSException("Unsupported binding: " + bindingId); + this.bindingId = bindingId; + } + + public String getServiceEndpointInterfaceName() + { + return seiName; + } + + public void setServiceEndpointInterfaceName(String seiName) + { + this.seiName = seiName; + this.seiClass = null; + + UnifiedMetaData wsMetaData = serviceMetaData.getUnifiedMetaData(); + if (wsMetaData.isEagerInitialized()) + { + if (UnifiedMetaData.isFinalRelease() == false) + log.warn("Set SEI name after eager initialization", new IllegalStateException()); + + // reinitialize + initializeInternal(); + } + } + + /** Get the class loader associated with the endpoint meta data */ + public ClassLoader getClassLoader() + { + ClassLoader classLoader = getServiceMetaData().getUnifiedMetaData().getClassLoader(); + return classLoader; + } + + /** + * Load the service endpoint interface. + * It should only be cached during eager initialization. + */ + public Class getServiceEndpointInterface() + { + Class tmpClass = seiClass; + if (tmpClass == null && seiName != null) + { + try + { + ClassLoader classLoader = getClassLoader(); + tmpClass = classLoader.loadClass(seiName); + if (serviceMetaData.getUnifiedMetaData().isEagerInitialized()) + { + log.warn("Loading SEI after eager initialization"); + seiClass = tmpClass; + } + } + catch (ClassNotFoundException ex) + { + throw new WSException("Cannot load service endpoint interface: " + seiName, ex); + } + } + return tmpClass; + } + + public Use getEncodingStyle() + { + if (use == null) + { + use = Use.getDefaultUse(); + log.debug("Using default encoding style: " + use); + } + return use; + } + + public void setEncodingStyle(Use value) + { + if (value != null && use != null && !use.equals(value)) + throw new WSException("Mixed encoding styles not supported"); + + log.trace("setEncodingStyle: " + value); + this.use = value; + } + + public Style getStyle() + { + if (style == null) + { + style = Style.getDefaultStyle(); + log.debug("Using default style: " + style); + } + return style; + } + + public void setStyle(Style value) + { + if (value != null && style != null && !style.equals(value)) + throw new WSException("Mixed styles not supported"); + + log.trace("setStyle: " + value); + this.style = value; + } + + public ParameterStyle getParameterStyle() + { + if (parameterStyle == null) + { + parameterStyle = ParameterStyle.WRAPPED; + log.debug("Using default parameter style: " + parameterStyle); + } + return parameterStyle; + } + + public void setParameterStyle(ParameterStyle value) + { + if (value != null && parameterStyle != null && !parameterStyle.equals(value)) + throw new WSException("Mixed SOAP parameter styles not supported"); + + log.debug("setParameterStyle: " + value); + this.parameterStyle = value; + } + + public Mode getServiceMode() + { + return serviceMode; + } + + public void setServiceMode(Mode serviceMode) + { + this.serviceMode = serviceMode; + } + + public Type getType() + { + return type; + } + + public String getAuthMethod() + { + return authMethod; + } + + public void setAuthMethod(String authMethod) + { + this.authMethod = authMethod; + } + + public Properties getProperties() + { + return properties; + } + + public void setProperties(Properties properties) + { + this.properties = properties; + } + + public List<OperationMetaData> getOperations() + { + return new ArrayList<OperationMetaData>(operations); + } + + public OperationMetaData getOperation(QName xmlName) + { + OperationMetaData opMetaData = null; + for (OperationMetaData aux : operations) + { + QName opQName = aux.getQName(); + String javaName = aux.getJavaName(); + if (opQName.equals(xmlName) && !javaName.endsWith(Constants.ASYNC_METHOD_SUFFIX)) + { + if (opMetaData == null) + { + opMetaData = aux; + } + else + { + throw new WSException("Cannot uniquely indentify operation: " + xmlName); + } + } + } + + if (opMetaData == null && getStyle() == Style.DOCUMENT) + { + for (OperationMetaData auxOperation : operations) + { + ParameterMetaData paramMetaData = null; + for (ParameterMetaData auxParam : auxOperation.getParameters()) + { + ParameterMode mode = auxParam.getMode(); + if (auxParam.isInHeader() == false && mode == ParameterMode.IN) + { + paramMetaData = auxParam; + break; + } + } + if (paramMetaData != null && paramMetaData.getXmlName().equals(xmlName)) + { + if (opMetaData == null) + { + opMetaData = auxOperation; + } + else + { + throw new WSException("Cannot uniquely indentify operation: " + xmlName); + } + } + } + } + + return opMetaData; + } + + public OperationMetaData getOperation(Method method) + { + if (opMetaDataCache.size() == 0) + { + // This can happen when the SEI mapping was not found + log.warn("Access to empty operation meta data cache, reinitializing"); + initializeInternal(); + } + + OperationMetaData opMetaData = opMetaDataCache.get(method); + if (opMetaData == null) + { + for (OperationMetaData aux : operations) + { + boolean doesMatch = aux.getJavaMethod().equals(method); + + // fallback for async methods + if(!doesMatch && method.getName().endsWith(Constants.ASYNC_METHOD_SUFFIX)) + { + String name = method.getName(); + name = name.substring(0, name.length()-5); + doesMatch = aux.getJavaName().equals(name); + } + + if (doesMatch) + { + opMetaDataCache.put(method, aux); + opMetaData = aux; + break; + } + + } + } + return opMetaData; + } + + public void addOperation(OperationMetaData opMetaData) + { + operations.add(opMetaData); + } + + public void clearOperations() + { + operations.clear(); + } + + public void addHandlers(List<HandlerMetaData> configHandlers) + { + handlers.addAll(configHandlers); + } + + public void addHandler(HandlerMetaData handler) + { + handlers.add(handler); + } + + public void clearHandlers() + { + handlers.clear(); + handlersInitialized = false; + } + + public List<HandlerMetaData> getHandlerMetaData(HandlerType type) + { + List<HandlerMetaData> typeHandlers = new ArrayList<HandlerMetaData>(); + for (HandlerMetaData hmd : handlers) + { + if (hmd.getHandlerType() == type || type == HandlerType.ALL) + typeHandlers.add(hmd); + } + return typeHandlers; + } + + public boolean isHandlersInitialized() + { + return handlersInitialized; + } + + public void setHandlersInitialized(boolean flag) + { + this.handlersInitialized = flag; + } + + public void validate() + { + for (HandlerMetaData handler : handlers) + handler.validate(); + + for (OperationMetaData opMetaData : operations) + opMetaData.validate(); + } + + /** + * @see UnifiedMetaData#eagerInitialize() + */ + public void eagerInitialize() + { + initializeInternal(); + } + + private void initializeInternal() + { + // reset sei class + seiClass = null; + + // Initialize handlers + for (HandlerMetaData handler : handlers) + handler.eagerInitialize(); + + eagerInitializeOperations(); + eagerInitializeTypes(); + } + + private void eagerInitializeOperations() + { + seiClass = getServiceEndpointInterface(); + if (seiClass != null) + { + List<Method> unsynchronizedMethods = new ArrayList<Method>(); + unsynchronizedMethods.addAll(Arrays.asList(seiClass.getMethods())); + + for (OperationMetaData opMetaData : operations) + { + opMetaData.eagerInitialize(unsynchronizedMethods); + Method method = opMetaData.getJavaMethod(); + if (method != null) + { + opMetaDataCache.put(method, opMetaData); + unsynchronizedMethods.remove(method); + } + } + } + } + + private void eagerInitializeTypes() + { + TypeMappingImpl typeMapping = serviceMetaData.getTypeMapping(); + for (TypeMappingMetaData tmMetaData : serviceMetaData.getTypesMetaData().getTypeMappings()) + { + String javaTypeName = tmMetaData.getJavaTypeName(); + QName xmlType = tmMetaData.getXmlType(); + if (xmlType != null) + { + List<Class> registeredTypes = typeMapping.getJavaTypes(xmlType); + + boolean registered = false; + for (Class current : registeredTypes) { + if (current.getName().equals(javaTypeName)) + { + registered = true; + break; + } + } + + if (registered == false) + { + try + { + ClassLoader classLoader = getClassLoader(); + Class javaType = JavaUtils.loadJavaType(javaTypeName, classLoader); + + if (JavaUtils.isPrimitive(javaTypeName)) + javaType = JavaUtils.getWrapperType(javaType); + + if (getEncodingStyle() == Use.ENCODED && javaType.isArray()) + { + typeMapping.register(javaType, xmlType, new SOAPArraySerializerFactory(), new SOAPArrayDeserializerFactory()); + } + else + { + if (getType() == Type.JAXWS) + { + typeMapping.register(javaType, xmlType, new JAXBSerializerFactory(), new JAXBDeserializerFactory()); + } + else + { + typeMapping.register(javaType, xmlType, new JBossXBSerializerFactory(), new JBossXBDeserializerFactory()); + } + } + } + catch (ClassNotFoundException e) + { + log.warn("Cannot load class for type: " + xmlType + "," + javaTypeName); + } + } + } + } + } +} Deleted: branches/tdiesler/trunk/src/main/java/org/jboss/ws/common/umdm/ExtensibleMetaData.java =================================================================== --- branches/tdiesler/trunk/src/main/java/org/jboss/ws/metadata/umdm/ExtensibleMetaData.java 2006-12-06 01:04:23 UTC (rev 1563) +++ branches/tdiesler/trunk/src/main/java/org/jboss/ws/common/umdm/ExtensibleMetaData.java 2006-12-06 01:14:45 UTC (rev 1565) @@ -1,29 +0,0 @@ -package org.jboss.ws.metadata.umdm; - -import java.util.Map; -import java.util.HashMap; - - -/** - * Base class for UMD elements that are extensible. - * - * @author Heiko Braun, <heiko(a)openj.net&gt; - * @since 21-Mar-2006 - */ -public abstract class ExtensibleMetaData { - - private Map<String, MetaDataExtension> extensions = new HashMap<String, MetaDataExtension>(); - - public Map<String, MetaDataExtension> getExtensions() { - return extensions; - } - - public void addExtension(MetaDataExtension ext) { - getExtensions().put(ext.getExtensionNameSpace(), ext); - } - - public MetaDataExtension getExtension(String namespace) { - return getExtensions().get(namespace); - } - -} Copied: branches/tdiesler/trunk/src/main/java/org/jboss/ws/common/umdm/ExtensibleMetaData.java (from rev 1564, branches/tdiesler/trunk/src/main/java/org/jboss/ws/metadata/umdm/ExtensibleMetaData.java) =================================================================== --- branches/tdiesler/trunk/src/main/java/org/jboss/ws/metadata/umdm/ExtensibleMetaData.java 2006-12-06 01:10:43 UTC (rev 1564) +++ branches/tdiesler/trunk/src/main/java/org/jboss/ws/common/umdm/ExtensibleMetaData.java 2006-12-06 01:14:45 UTC (rev 1565) @@ -0,0 +1,29 @@ +package org.jboss.ws.common.umdm; + +import java.util.Map; +import java.util.HashMap; + + +/** + * Base class for UMD elements that are extensible. + * + * @author Heiko Braun, <heiko(a)openj.net&gt; + * @since 21-Mar-2006 + */ +public abstract class ExtensibleMetaData { + + private Map<String, MetaDataExtension> extensions = new HashMap<String, MetaDataExtension>(); + + public Map<String, MetaDataExtension> getExtensions() { + return extensions; + } + + public void addExtension(MetaDataExtension ext) { + getExtensions().put(ext.getExtensionNameSpace(), ext); + } + + public MetaDataExtension getExtension(String namespace) { + return getExtensions().get(namespace); + } + +} Deleted: branches/tdiesler/trunk/src/main/java/org/jboss/ws/common/umdm/FaultMetaData.java =================================================================== --- branches/tdiesler/trunk/src/main/java/org/jboss/ws/metadata/umdm/FaultMetaData.java 2006-12-06 01:04:23 UTC (rev 1563) +++ branches/tdiesler/trunk/src/main/java/org/jboss/ws/common/umdm/FaultMetaData.java 2006-12-06 01:14:45 UTC (rev 1565) @@ -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.metadata.umdm; - -// $Id$ - -import javax.xml.namespace.QName; - -import org.jboss.logging.Logger; -import org.jboss.ws.WSException; -import org.jboss.ws.common.utils.JavaUtils; -import org.jboss.ws.core.jaxws.DynamicWrapperGenerator; - -/** - * A Fault component describes a fault that a given operation supports. - * - * @author Thomas.Diesler(a)jboss.org - * @author jason.greene(a)jboss.com - * @since 12-May-2005 - */ -public class FaultMetaData -{ - // provide logging - private final Logger log = Logger.getLogger(FaultMetaData.class); - - // The parent operation - private OperationMetaData opMetaData; - - private QName xmlName; - private QName xmlType; - private String javaTypeName; - private String faultBeanName; - private Class javaType; - private Class faultBean; - - public FaultMetaData(OperationMetaData operation, QName xmlName, QName xmlType, String javaTypeName) - { - this(operation, xmlName, javaTypeName); - setXmlType(xmlType); - } - - public FaultMetaData(OperationMetaData operation, QName xmlName, String javaTypeName) - { - if (xmlName == null) - throw new IllegalArgumentException("Invalid null xmlName argument"); - if (javaTypeName == null) - throw new IllegalArgumentException("Invalid null javaTypeName argument, for: " + xmlName); - - this.opMetaData = operation; - this.xmlName = xmlName; - this.javaTypeName = javaTypeName; - } - - public OperationMetaData getOperationMetaData() - { - return opMetaData; - } - - public QName getXmlName() - { - return xmlName; - } - - public QName getXmlType() - { - return xmlType; - } - - public void setXmlType(QName xmlType) - { - if (xmlType == null) - throw new IllegalArgumentException("Invalid null xmlType argument, for: " + xmlName); - - this.xmlType = xmlType; - } - - public String getJavaTypeName() - { - return javaTypeName; - } - - /** Load the java type. - * It should only be cached during eager initialization. - */ - public Class getJavaType() - { - Class tmpJavaType = javaType; - if (tmpJavaType == null && javaTypeName != null) - { - try - { - ClassLoader loader = opMetaData.getEndpointMetaData().getClassLoader(); - tmpJavaType = JavaUtils.loadJavaType(javaTypeName, loader); - - if (opMetaData.getEndpointMetaData().getServiceMetaData().getUnifiedMetaData().isEagerInitialized()) - { - log.warn("Loading java type after eager initialization"); - javaType = tmpJavaType; - } - } - catch (ClassNotFoundException ex) - { - throw new WSException("Cannot load java type: " + javaTypeName, ex); - } - } - return tmpJavaType; - } - - public String getFaultBeanName() - { - return faultBeanName; - } - - public void setFaultBeanName(String faultBeanName) - { - this.faultBeanName = faultBeanName; - } - - public Class getFaultBean() - { - Class tmpFaultBean = faultBean; - if (tmpFaultBean == null && faultBeanName != null) - { - try - { - ClassLoader loader = opMetaData.getEndpointMetaData().getClassLoader(); - tmpFaultBean = JavaUtils.loadJavaType(faultBeanName, loader); - } - catch (ClassNotFoundException ex) - { - throw new WSException("Cannot load fault bean: " + faultBeanName, ex); - } - } - return tmpFaultBean; - } - - public void validate() - { - // nothing to do - } - - public void eagerInitialize() - { - ClassLoader loader = opMetaData.getEndpointMetaData().getClassLoader(); - new DynamicWrapperGenerator(loader).generate(this); - - // Initialize the cache - javaType = getJavaType(); - if (javaType == null) - throw new WSException("Cannot load java type: " + javaTypeName); - - faultBean = getFaultBean(); - } - - public String toString() - { - StringBuilder buffer = new StringBuilder("\nFaultMetaData"); - buffer.append("\n xmlName=" + xmlName); - buffer.append("\n xmlType=" + xmlType); - buffer.append("\n javaType=" + javaTypeName); - buffer.append("\n faultBean=" + faultBeanName); - return buffer.toString(); - } -} \ No newline at end of file Copied: branches/tdiesler/trunk/src/main/java/org/jboss/ws/common/umdm/FaultMetaData.java (from rev 1564, branches/tdiesler/trunk/src/main/java/org/jboss/ws/metadata/umdm/FaultMetaData.java) =================================================================== --- branches/tdiesler/trunk/src/main/java/org/jboss/ws/metadata/umdm/FaultMetaData.java 2006-12-06 01:10:43 UTC (rev 1564) +++ branches/tdiesler/trunk/src/main/java/org/jboss/ws/common/umdm/FaultMetaData.java 2006-12-06 01:14:45 UTC (rev 1565) @@ -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.umdm; + +// $Id$ + +import javax.xml.namespace.QName; + +import org.jboss.logging.Logger; +import org.jboss.ws.common.WSException; +import org.jboss.ws.common.utils.JavaUtils; +import org.jboss.ws.core.jaxws.DynamicWrapperGenerator; + +/** + * A Fault component describes a fault that a given operation supports. + * + * @author Thomas.Diesler(a)jboss.org + * @author jason.greene(a)jboss.com + * @since 12-May-2005 + */ +public class FaultMetaData +{ + // provide logging + private final Logger log = Logger.getLogger(FaultMetaData.class); + + // The parent operation + private OperationMetaData opMetaData; + + private QName xmlName; + private QName xmlType; + private String javaTypeName; + private String faultBeanName; + private Class javaType; + private Class faultBean; + + public FaultMetaData(OperationMetaData operation, QName xmlName, QName xmlType, String javaTypeName) + { + this(operation, xmlName, javaTypeName); + setXmlType(xmlType); + } + + public FaultMetaData(OperationMetaData operation, QName xmlName, String javaTypeName) + { + if (xmlName == null) + throw new IllegalArgumentException("Invalid null xmlName argument"); + if (javaTypeName == null) + throw new IllegalArgumentException("Invalid null javaTypeName argument, for: " + xmlName); + + this.opMetaData = operation; + this.xmlName = xmlName; + this.javaTypeName = javaTypeName; + } + + public OperationMetaData getOperationMetaData() + { + return opMetaData; + } + + public QName getXmlName() + { + return xmlName; + } + + public QName getXmlType() + { + return xmlType; + } + + public void setXmlType(QName xmlType) + { + if (xmlType == null) + throw new IllegalArgumentException("Invalid null xmlType argument, for: " + xmlName); + + this.xmlType = xmlType; + } + + public String getJavaTypeName() + { + return javaTypeName; + } + + /** Load the java type. + * It should only be cached during eager initialization. + */ + public Class getJavaType() + { + Class tmpJavaType = javaType; + if (tmpJavaType == null && javaTypeName != null) + { + try + { + ClassLoader loader = opMetaData.getEndpointMetaData().getClassLoader(); + tmpJavaType = JavaUtils.loadJavaType(javaTypeName, loader); + + if (opMetaData.getEndpointMetaData().getServiceMetaData().getUnifiedMetaData().isEagerInitialized()) + { + log.warn("Loading java type after eager initialization"); + javaType = tmpJavaType; + } + } + catch (ClassNotFoundException ex) + { + throw new WSException("Cannot load java type: " + javaTypeName, ex); + } + } + return tmpJavaType; + } + + public String getFaultBeanName() + { + return faultBeanName; + } + + public void setFaultBeanName(String faultBeanName) + { + this.faultBeanName = faultBeanName; + } + + public Class getFaultBean() + { + Class tmpFaultBean = faultBean; + if (tmpFaultBean == null && faultBeanName != null) + { + try + { + ClassLoader loader = opMetaData.getEndpointMetaData().getClassLoader(); + tmpFaultBean = JavaUtils.loadJavaType(faultBeanName, loader); + } + catch (ClassNotFoundException ex) + { + throw new WSException("Cannot load fault bean: " + faultBeanName, ex); + } + } + return tmpFaultBean; + } + + public void validate() + { + // nothing to do + } + + public void eagerInitialize() + { + ClassLoader loader = opMetaData.getEndpointMetaData().getClassLoader(); + new DynamicWrapperGenerator(loader).generate(this); + + // Initialize the cache + javaType = getJavaType(); + if (javaType == null) + throw new WSException("Cannot load java type: " + javaTypeName); + + faultBean = getFaultBean(); + } + + public String toString() + { + StringBuilder buffer = new StringBuilder("\nFaultMetaData"); + buffer.append("\n xmlName=" + xmlName); + buffer.append("\n xmlType=" + xmlType); + buffer.append("\n javaType=" + javaTypeName); + buffer.append("\n faultBean=" + faultBeanName); + return buffer.toString(); + } +} \ No newline at end of file Deleted: branches/tdiesler/trunk/src/main/java/org/jboss/ws/common/umdm/HandlerMetaData.java =================================================================== --- branches/tdiesler/trunk/src/main/java/org/jboss/ws/metadata/umdm/HandlerMetaData.java 2006-12-06 01:04:23 UTC (rev 1563) +++ branches/tdiesler/trunk/src/main/java/org/jboss/ws/common/umdm/HandlerMetaData.java 2006-12-06 01:14:45 UTC (rev 1565) @@ -1,204 +0,0 @@ -/* - * JBoss, Home of Professional Open Source - * Copyright 2005, JBoss Inc., and individual contributors as indicated - * by the @authors tag. See the copyright.txt in the distribution for a - * full listing of individual contributors. - * - * This is free software; you can redistribute it and/or modify it - * under the terms of the GNU Lesser General Public License as - * published by the Free Software Foundation; either version 2.1 of - * the License, or (at your option) any later version. - * - * This software is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * Lesser General Public License for more details. - * - * You should have received a copy of the GNU Lesser General Public - * License along with this software; if not, write to the Free - * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA - * 02110-1301 USA, or see the FSF site: http://www.fsf.org. - */ -package org.jboss.ws.metadata.umdm; - -// $Id:HandlerMetaData.java 915 2006-09-08 08:40:45Z thomas.diesler(a)jboss.com $ - -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.logging.Logger; -import org.jboss.ws.WSException; - -/** - * The common metdata data for a handler element - * - * @author Thomas.Diesler(a)jboss.org - * @since 05-May-2006 - */ -public abstract class HandlerMetaData implements Serializable -{ - // provide logging - private final Logger log = Logger.getLogger(HandlerMetaData.class); - - public enum HandlerType - { - PRE, ENDPOINT, POST, ALL - }; - - private transient EndpointMetaData epMetaData; - - // The required <handler-name> element - private String handlerName; - // The required <handler-class> element - private String handlerClassName; - // The required handler type - private HandlerType handlerType; - // The optional <soap-header> elements - private Set<QName> soapHeaders = new HashSet<QName>(); - // The optional <init-param> elements - private List<HandlerInitParam> initParams = new ArrayList<HandlerInitParam>(); - // The cached handler class - private Class handlerClass; - - public HandlerMetaData(EndpointMetaData epMetaData, HandlerType type) - { - this.epMetaData = epMetaData; - this.handlerType = type; - } - - public void setEndpointMetaData(EndpointMetaData epMetaData) - { - this.epMetaData = epMetaData; - } - - public EndpointMetaData getEndpointMetaData() - { - return epMetaData; - } - - public void setHandlerName(String value) - { - this.handlerName = value; - } - - public String getHandlerName() - { - return handlerName; - } - - public void setHandlerClassName(String handlerClass) - { - this.handlerClassName = handlerClass; - } - - public String getHandlerClassName() - { - return handlerClassName; - } - - public Class getHandlerClass() - { - if (handlerClassName == null) - throw new IllegalStateException("Handler class name cannot be null"); - - Class localClass = handlerClass; - if (localClass == null) - { - try - { - ClassLoader loader = epMetaData.getClassLoader(); - localClass = loader.loadClass(handlerClassName); - } - catch (ClassNotFoundException ex) - { - throw new WSException("Cannot load handler: " + handlerClassName, ex); - } - } - return localClass; - } - - public HandlerType getHandlerType() - { - return handlerType; - } - - public void setSoapHeaders(Set<QName> soapHeaders) - { - this.soapHeaders = soapHeaders; - } - - public Set<QName> getSoapHeaders() - { - return soapHeaders; - } - - public void seiInitParams(List<HandlerInitParam> initParams) - { - this.initParams = initParams; - } - - public List<HandlerInitParam> getInitParams() - { - return initParams; - } - - public void validate() - { - List<String> securityHandlers = new ArrayList<String>(); - securityHandlers.add(org.jboss.ws.extras.security.jaxrpc.WSSecurityHandlerInbound.class.getName()); - securityHandlers.add(org.jboss.ws.extras.security.jaxrpc.WSSecurityHandlerOutbound.class.getName()); - securityHandlers.add(org.jboss.ws.extras.security.jaxws.WSSecurityHandlerInbound.class.getName()); - securityHandlers.add(org.jboss.ws.extras.security.jaxws.WSSecurityHandlerOutbound.class.getName()); - - if (securityHandlers.contains(handlerClassName)) - { - if (epMetaData.getServiceMetaData().getSecurityConfiguration() == null) - log.warn("WS-Security requires security configuration"); - } - } - - public void eagerInitialize() - { - handlerClass = getHandlerClass(); - } - - public static class HandlerInitParam implements Serializable - { - private static final long serialVersionUID = -8687875291620457318L; - - // The required <handler-name> element - private String paramName; - // The required <handler-class> element - private String paramValue; - - public String getParamName() - { - return paramName; - } - - public void setParamName(String paramName) - { - this.paramName = paramName; - } - - public String getParamValue() - { - return paramValue; - } - - public void setParamValue(String paramValue) - { - this.paramValue = paramValue; - } - - public String toString() - { - return "[name=" + paramName + ",value=" + paramValue + "]"; - } - } -} Copied: branches/tdiesler/trunk/src/main/java/org/jboss/ws/common/umdm/HandlerMetaData.java (from rev 1564, branches/tdiesler/trunk/src/main/java/org/jboss/ws/metadata/umdm/HandlerMetaData.java) =================================================================== --- branches/tdiesler/trunk/src/main/java/org/jboss/ws/metadata/umdm/HandlerMetaData.java 2006-12-06 01:10:43 UTC (rev 1564) +++ branches/tdiesler/trunk/src/main/java/org/jboss/ws/common/umdm/HandlerMetaData.java 2006-12-06 01:14:45 UTC (rev 1565) @@ -0,0 +1,204 @@ +/* + * 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.umdm; + +// $Id:HandlerMetaData.java 915 2006-09-08 08:40:45Z thomas.diesler(a)jboss.com $ + +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.logging.Logger; +import org.jboss.ws.common.WSException; + +/** + * The common metdata data for a handler element + * + * @author Thomas.Diesler(a)jboss.org + * @since 05-May-2006 + */ +public abstract class HandlerMetaData implements Serializable +{ + // provide logging + private final Logger log = Logger.getLogger(HandlerMetaData.class); + + public enum HandlerType + { + PRE, ENDPOINT, POST, ALL + }; + + private transient EndpointMetaData epMetaData; + + // The required <handler-name> element + private String handlerName; + // The required <handler-class> element + private String handlerClassName; + // The required handler type + private HandlerType handlerType; + // The optional <soap-header> elements + private Set<QName> soapHeaders = new HashSet<QName>(); + // The optional <init-param> elements + private List<HandlerInitParam> initParams = new ArrayList<HandlerInitParam>(); + // The cached handler class + private Class handlerClass; + + public HandlerMetaData(EndpointMetaData epMetaData, HandlerType type) + { + this.epMetaData = epMetaData; + this.handlerType = type; + } + + public void setEndpointMetaData(EndpointMetaData epMetaData) + { + this.epMetaData = epMetaData; + } + + public EndpointMetaData getEndpointMetaData() + { + return epMetaData; + } + + public void setHandlerName(String value) + { + this.handlerName = value; + } + + public String getHandlerName() + { + return handlerName; + } + + public void setHandlerClassName(String handlerClass) + { + this.handlerClassName = handlerClass; + } + + public String getHandlerClassName() + { + return handlerClassName; + } + + public Class getHandlerClass() + { + if (handlerClassName == null) + throw new IllegalStateException("Handler class name cannot be null"); + + Class localClass = handlerClass; + if (localClass == null) + { + try + { + ClassLoader loader = epMetaData.getClassLoader(); + localClass = loader.loadClass(handlerClassName); + } + catch (ClassNotFoundException ex) + { + throw new WSException("Cannot load handler: " + handlerClassName, ex); + } + } + return localClass; + } + + public HandlerType getHandlerType() + { + return handlerType; + } + + public void setSoapHeaders(Set<QName> soapHeaders) + { + this.soapHeaders = soapHeaders; + } + + public Set<QName> getSoapHeaders() + { + return soapHeaders; + } + + public void seiInitParams(List<HandlerInitParam> initParams) + { + this.initParams = initParams; + } + + public List<HandlerInitParam> getInitParams() + { + return initParams; + } + + public void validate() + { + List<String> securityHandlers = new ArrayList<String>(); + securityHandlers.add(org.jboss.ws.extras.security.jaxrpc.WSSecurityHandlerInbound.class.getName()); + securityHandlers.add(org.jboss.ws.extras.security.jaxrpc.WSSecurityHandlerOutbound.class.getName()); + securityHandlers.add(org.jboss.ws.extras.security.jaxws.WSSecurityHandlerInbound.class.getName()); + securityHandlers.add(org.jboss.ws.extras.security.jaxws.WSSecurityHandlerOutbound.class.getName()); + + if (securityHandlers.contains(handlerClassName)) + { + if (epMetaData.getServiceMetaData().getSecurityConfiguration() == null) + log.warn("WS-Security requires security configuration"); + } + } + + public void eagerInitialize() + { + handlerClass = getHandlerClass(); + } + + public static class HandlerInitParam implements Serializable + { + private static final long serialVersionUID = -8687875291620457318L; + + // The required <handler-name> element + private String paramName; + // The required <handler-class> element + private String paramValue; + + public String getParamName() + { + return paramName; + } + + public void setParamName(String paramName) + { + this.paramName = paramName; + } + + public String getParamValue() + { + return paramValue; + } + + public void setParamValue(String paramValue) + { + this.paramValue = paramValue; + } + + public String toString() + { + return "[name=" + paramName + ",value=" + paramValue + "]"; + } + } +} Deleted: branches/tdiesler/trunk/src/main/java/org/jboss/ws/common/umdm/HandlerMetaDataJAXRPC.java =================================================================== --- branches/tdiesler/trunk/src/main/java/org/jboss/ws/metadata/umdm/HandlerMetaDataJAXRPC.java 2006-12-06 01:04:23 UTC (rev 1563) +++ branches/tdiesler/trunk/src/main/java/org/jboss/ws/common/umdm/HandlerMetaDataJAXRPC.java 2006-12-06 01:14:45 UTC (rev 1565) @@ -1,84 +0,0 @@ -/* - * JBoss, Home of Professional Open Source - * Copyright 2005, JBoss Inc., and individual contributors as indicated - * by the @authors tag. See the copyright.txt in the distribution for a - * full listing of individual contributors. - * - * This is free software; you can redistribute it and/or modify it - * under the terms of the GNU Lesser General Public License as - * published by the Free Software Foundation; either version 2.1 of - * the License, or (at your option) any later version. - * - * This software is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * Lesser General Public License for more details. - * - * You should have received a copy of the GNU Lesser General Public - * License along with this software; if not, write to the Free - * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA - * 02110-1301 USA, or see the FSF site: http://www.fsf.org. - */ -package org.jboss.ws.metadata.umdm; - -//$Id:HandlerMetaDataJAXRPC.java 915 2006-09-08 08:40:45Z thomas.diesler(a)jboss.com $ - -import java.util.HashSet; -import java.util.Set; - -import javax.xml.namespace.QName; - - -/** - * The JAXRPC metdata data for a handler element - * - * @author Thomas.Diesler(a)jboss.org - * @since 05-May-2006 - */ -public class HandlerMetaDataJAXRPC extends HandlerMetaData -{ - private static final long serialVersionUID = -5232305815202943509L; - - // 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 HandlerMetaDataJAXRPC(EndpointMetaData epMetaData, HandlerType type) - { - super(epMetaData, type); - } - - public void setSoapRoles(Set<String> soapRoles) - { - this.soapRoles = soapRoles; - } - - public Set<String> getSoapRoles() - { - return soapRoles; - } - - public void setPortNames(Set<String> portNames) - { - this.portNames = portNames; - } - - public Set<String> getPortNames() - { - return portNames; - } - - public String toString() - { - StringBuffer buffer = new StringBuffer("\nHandlerMetaDataJAXRPC:"); - buffer.append("\n type=" + getHandlerType()); - buffer.append("\n name=" + getHandlerName()); - buffer.append("\n class=" + getHandlerClassName()); - buffer.append("\n params=" + getInitParams()); - buffer.append("\n headers=" + getSoapHeaders()); - buffer.append("\n roles=" + getSoapRoles()); - buffer.append("\n ports=" + getPortNames()); - return buffer.toString(); - } -} Copied: branches/tdiesler/trunk/src/main/java/org/jboss/ws/common/umdm/HandlerMetaDataJAXRPC.java (from rev 1564, branches/tdiesler/trunk/src/main/java/org/jboss/ws/metadata/umdm/HandlerMetaDataJAXRPC.java) =================================================================== --- branches/tdiesler/trunk/src/main/java/org/jboss/ws/metadata/umdm/HandlerMetaDataJAXRPC.java 2006-12-06 01:10:43 UTC (rev 1564) +++ branches/tdiesler/trunk/src/main/java/org/jboss/ws/common/umdm/HandlerMetaDataJAXRPC.java 2006-12-06 01:14:45 UTC (rev 1565) @@ -0,0 +1,84 @@ +/* + * 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.umdm; + +//$Id:HandlerMetaDataJAXRPC.java 915 2006-09-08 08:40:45Z thomas.diesler(a)jboss.com $ + +import java.util.HashSet; +import java.util.Set; + +import javax.xml.namespace.QName; + + +/** + * The JAXRPC metdata data for a handler element + * + * @author Thomas.Diesler(a)jboss.org + * @since 05-May-2006 + */ +public class HandlerMetaDataJAXRPC extends HandlerMetaData +{ + private static final long serialVersionUID = -5232305815202943509L; + + // 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 HandlerMetaDataJAXRPC(EndpointMetaData epMetaData, HandlerType type) + { + super(epMetaData, type); + } + + public void setSoapRoles(Set<String> soapRoles) + { + this.soapRoles = soapRoles; + } + + public Set<String> getSoapRoles() + { + return soapRoles; + } + + public void setPortNames(Set<String> portNames) + { + this.portNames = portNames; + } + + public Set<String> getPortNames() + { + return portNames; + } + + public String toString() + { + StringBuffer buffer = new StringBuffer("\nHandlerMetaDataJAXRPC:"); + buffer.append("\n type=" + getHandlerType()); + buffer.append("\n name=" + getHandlerName()); + buffer.append("\n class=" + getHandlerClassName()); + buffer.append("\n params=" + getInitParams()); + buffer.append("\n headers=" + getSoapHeaders()); + buffer.append("\n roles=" + getSoapRoles()); + buffer.append("\n ports=" + getPortNames()); + return buffer.toString(); + } +} Deleted: branches/tdiesler/trunk/src/main/java/org/jboss/ws/common/umdm/HandlerMetaDataJAXWS.java =================================================================== --- branches/tdiesler/trunk/src/main/java/org/jboss/ws/metadata/umdm/HandlerMetaDataJAXWS.java 2006-12-06 01:04:23 UTC (rev 1563) +++ branches/tdiesler/trunk/src/main/java/org/jboss/ws/common/umdm/HandlerMetaDataJAXWS.java 2006-12-06 01:14:45 UTC (rev 1565) @@ -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.metadata.umdm; - -//$Id$ - -import javax.xml.namespace.QName; - - -/** - * The JAXWS metdata data for a handler element - * - * @author Thomas.Diesler(a)jboss.org - * @since 05-May-2006 - */ -public class HandlerMetaDataJAXWS extends HandlerMetaData -{ - private static final long serialVersionUID = 7631133188974299826L; - - // The JAXWS protocol bindings - private String protocolBindings; - // The JAXWS service name pattern - private QName serviceNamePattern; - // The JAXWS port name pattern - private QName portNamePattern; - - public HandlerMetaDataJAXWS(EndpointMetaData epMetaData, HandlerType type) - { - super(epMetaData, type); - } - - 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; - } - - public String toString() - { - StringBuffer buffer = new StringBuffer("\nHandlerMetaDataJAXWS:"); - buffer.append("\n type=" + getHandlerType()); - buffer.append("\n name=" + getHandlerName()); - buffer.append("\n class=" + getHandlerClass()); - buffer.append("\n params=" + getInitParams()); - buffer.append("\n protocols=" + getProtocolBindings()); - buffer.append("\n services=" + getServiceNamePattern()); - buffer.append("\n ports=" + getPortNamePattern()); - return buffer.toString(); - } - -} Copied: branches/tdiesler/trunk/src/main/java/org/jboss/ws/common/umdm/HandlerMetaDataJAXWS.java (from rev 1564, branches/tdiesler/trunk/src/main/java/org/jboss/ws/metadata/umdm/HandlerMetaDataJAXWS.java) =================================================================== --- branches/tdiesler/trunk/src/main/java/org/jboss/ws/metadata/umdm/HandlerMetaDataJAXWS.java 2006-12-06 01:10:43 UTC (rev 1564) +++ branches/tdiesler/trunk/src/main/java/org/jboss/ws/common/umdm/HandlerMetaDataJAXWS.java 2006-12-06 01:14:45 UTC (rev 1565) @@ -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.umdm; + +//$Id$ + +import javax.xml.namespace.QName; + + +/** + * The JAXWS metdata data for a handler element + * + * @author Thomas.Diesler(a)jboss.org + * @since 05-May-2006 + */ +public class HandlerMetaDataJAXWS extends HandlerMetaData +{ + private static final long serialVersionUID = 7631133188974299826L; + + // The JAXWS protocol bindings + private String protocolBindings; + // The JAXWS service name pattern + private QName serviceNamePattern; + // The JAXWS port name pattern + private QName portNamePattern; + + public HandlerMetaDataJAXWS(EndpointMetaData epMetaData, HandlerType type) + { + super(epMetaData, type); + } + + 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; + } + + public String toString() + { + StringBuffer buffer = new StringBuffer("\nHandlerMetaDataJAXWS:"); + buffer.append("\n type=" + getHandlerType()); + buffer.append("\n name=" + getHandlerName()); + buffer.append("\n class=" + getHandlerClass()); + buffer.append("\n params=" + getInitParams()); + buffer.append("\n protocols=" + getProtocolBindings()); + buffer.append("\n services=" + getServiceNamePattern()); + buffer.append("\n ports=" + getPortNamePattern()); + return buffer.toString(); + } + +} Deleted: branches/tdiesler/trunk/src/main/java/org/jboss/ws/common/umdm/MetaDataExtension.java =================================================================== --- branches/tdiesler/trunk/src/main/java/org/jboss/ws/metadata/umdm/MetaDataExtension.java 2006-12-06 01:04:23 UTC (rev 1563) +++ branches/tdiesler/trunk/src/main/java/org/jboss/ws/common/umdm/MetaDataExtension.java 2006-12-06 01:14:45 UTC (rev 1565) @@ -1,45 +0,0 @@ -/* - * JBoss, Home of Professional Open Source - * Copyright 2005, JBoss Inc., and individual contributors as indicated - * by the @authors tag. See the copyright.txt in the distribution for a - * full listing of individual contributors. - * - * This is free software; you can redistribute it and/or modify it - * under the terms of the GNU Lesser General Public License as - * published by the Free Software Foundation; either version 2.1 of - * the License, or (at your option) any later version. - * - * This software is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * Lesser General Public License for more details. - * - * You should have received a copy of the GNU Lesser General Public - * License along with this software; if not, write to the Free - * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA - * 02110-1301 USA, or see the FSF site: http://www.fsf.org. - */ -package org.jboss.ws.metadata.umdm; - -// $Id$ - -/** - * Operation metaData extension. - * - * @author Heiko Braun, <heiko(a)openj.net&gt; - * @since 17-Mar-2006 - */ -public abstract class MetaDataExtension -{ - private String extensionNameSpace; - - public MetaDataExtension(String extensionNameSpace) - { - this.extensionNameSpace = extensionNameSpace; - } - - public String getExtensionNameSpace() - { - return extensionNameSpace; - } -} Copied: branches/tdiesler/trunk/src/main/java/org/jboss/ws/common/umdm/MetaDataExtension.java (from rev 1564, branches/tdiesler/trunk/src/main/java/org/jboss/ws/metadata/umdm/MetaDataExtension.java) =================================================================== --- branches/tdiesler/trunk/src/main/java/org/jboss/ws/metadata/umdm/MetaDataExtension.java 2006-12-06 01:10:43 UTC (rev 1564) +++ branches/tdiesler/trunk/src/main/java/org/jboss/ws/common/umdm/MetaDataExtension.java 2006-12-06 01:14:45 UTC (rev 1565) @@ -0,0 +1,45 @@ +/* + * 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.umdm; + +// $Id$ + +/** + * Operation metaData extension. + * + * @author Heiko Braun, <heiko(a)openj.net&gt; + * @since 17-Mar-2006 + */ +public abstract class MetaDataExtension +{ + private String extensionNameSpace; + + public MetaDataExtension(String extensionNameSpace) + { + this.extensionNameSpace = extensionNameSpace; + } + + public String getExtensionNameSpace() + { + return extensionNameSpace; + } +} Deleted: branches/tdiesler/trunk/src/main/java/org/jboss/ws/common/umdm/OperationMetaData.java =================================================================== --- branches/tdiesler/trunk/src/main/java/org/jboss/ws/metadata/umdm/OperationMetaData.java 2006-12-06 01:04:23 UTC (rev 1563) +++ branches/tdiesler/trunk/src/main/java/org/jboss/ws/common/umdm/OperationMetaData.java 2006-12-06 01:14:45 UTC (rev 1565) @@ -1,521 +0,0 @@ -/* - * JBoss, Home of Professional Open Source - * Copyright 2005, JBoss Inc., and individual contributors as indicated - * by the @authors tag. See the copyright.txt in the distribution for a - * full listing of individual contributors. - * - * This is free software; you can redistribute it and/or modify it - * under the terms of the GNU Lesser General Public License as - * published by the Free Software Foundation; either version 2.1 of - * the License, or (at your option) any later version. - * - * This software is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * Lesser General Public License for more details. - * - * You should have received a copy of the GNU Lesser General Public - * License along with this software; if not, write to the Free - * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA - * 02110-1301 USA, or see the FSF site: http://www.fsf.org. - */ -package org.jboss.ws.metadata.umdm; - -// $Id$ - -import java.lang.reflect.Method; -import java.util.ArrayList; -import java.util.HashSet; -import java.util.List; -import java.util.Set; - -import javax.jws.soap.SOAPBinding.ParameterStyle; -import javax.xml.namespace.QName; -import javax.xml.rpc.ParameterMode; - -import org.jboss.logging.Logger; -import org.jboss.ws.WSException; -import org.jboss.ws.common.utils.JavaUtils; -import org.jboss.ws.jaxrpc.Style; -import org.jboss.ws.jaxrpc.Use; -import org.jboss.ws.metadata.umdm.EndpointMetaData.Type; -import org.w3c.dom.Element; - -/** - * An Operation component describes an operation that a given interface supports. - * - * @author Thomas.Diesler(a)jboss.org - * @author <a href="mailto:jason.greene@jboss.com">Jason T. Greene</a> - * @since 12-May-2004 - */ -public class OperationMetaData extends ExtensibleMetaData -{ - // provide logging - private final Logger log = Logger.getLogger(OperationMetaData.class); - - // The parent interface - private EndpointMetaData epMetaData; - - private QName qname; - private QName responseName; - private String javaName; - private Method javaMethod; - private boolean oneWay; - private String soapAction; - private List<ParameterMetaData> parameters = new ArrayList<ParameterMetaData>(); - private List<FaultMetaData> faults = new ArrayList<FaultMetaData>(); - private ParameterMetaData returnParam; - - public OperationMetaData(QName qname, String javaName) - { - UnifiedMetaData umd = new UnifiedMetaData(); - ServiceMetaData smd = new ServiceMetaData(umd, new QName("mock-service")); - ServerEndpointMetaData epmd = new ServerEndpointMetaData(smd, new QName("mock-endpoint"), new QName("mock-interface"), Type.JAXRPC); - initOperationMetaData(epmd, qname, javaName); - } - - public OperationMetaData(EndpointMetaData epMetaData, QName qname, String javaName) - { - log.trace("new OperationMetaData: [xmlName=" + qname + ",javaName=" + javaName + "]"); - initOperationMetaData(epMetaData, qname, javaName); - } - - private void initOperationMetaData(EndpointMetaData epMetaData, QName qname, String javaName) - { - this.epMetaData = epMetaData; - this.qname = qname; - this.javaName = javaName; - - if (qname == null) - throw new IllegalArgumentException("Invalid null qname argument"); - if (javaName == null) - throw new IllegalArgumentException("Invalid null javaName argument, for: " + qname); - - String nsURI = qname.getNamespaceURI(); - String localPart = qname.getLocalPart(); - this.responseName = new QName(nsURI, localPart + "Response"); - } - - public EndpointMetaData getEndpointMetaData() - { - return epMetaData; - } - - public QName getQName() - { - return qname; - } - - public QName getResponseName() - { - return responseName; - } - - public String getSOAPAction() - { - return soapAction; - } - - public void setSOAPAction(String soapAction) - { - this.soapAction = soapAction; - } - - public Style getStyle() - { - return epMetaData.getStyle(); - } - - public Use getUse() - { - return epMetaData.getEncodingStyle(); - } - - public ParameterStyle getParameterStyle() - { - return epMetaData.getParameterStyle(); - } - - public boolean isRPCLiteral() - { - return getStyle() == Style.RPC && getUse() == Use.LITERAL; - } - - public boolean isRPCEncoded() - { - return getStyle() == Style.RPC && getUse() == Use.ENCODED; - } - - public boolean isDocumentBare() - { - return getStyle() == Style.DOCUMENT && getParameterStyle() == ParameterStyle.BARE; - } - - public boolean isDocumentWrapped() - { - return getStyle() == Style.DOCUMENT && getParameterStyle() == ParameterStyle.WRAPPED; - } - - public String getJavaName() - { - return javaName; - } - - public Method getJavaMethod() - { - Method tmpMethod = javaMethod; - Class seiClass = epMetaData.getServiceEndpointInterface(); - if (tmpMethod == null && seiClass != null) - { - for (Method method : seiClass.getMethods()) - { - if (isJavaMethod(method)) - { - tmpMethod = method; - - UnifiedMetaData wsMetaData = epMetaData.getServiceMetaData().getUnifiedMetaData(); - if (wsMetaData.isEagerInitialized()) - { - if (UnifiedMetaData.isFinalRelease() == false) - log.warn("Loading java method after eager initialization", new IllegalStateException()); - - javaMethod = method; - } - - break; - } - } - - if (tmpMethod == null) - throw new WSException("Cannot find java method: " + javaName); - } - return tmpMethod; - } - - public boolean isJavaMethod(Method method) - { - boolean isJavaMethod = method.equals(javaMethod); - if (isJavaMethod == false) - { - String methodName = method.getName(); - if (javaName.equals(methodName)) - { - log.trace("Found java method: " + method); - - // compare params by java type name - if (matchParameters(method, true)) - { - log.debug("Found best matching java method: " + method); - isJavaMethod = true; - } - - // compare params by assignability - if (!isJavaMethod && matchParameters(method, false)) - { - log.debug("Found possible matching java method: " + method); - isJavaMethod = true; - } - } - } - - if (log.isTraceEnabled()) - log.trace("Synchronized java method:\n" + method + "\nwith: " + toString()); - - return isJavaMethod; - } - - private boolean matchParameters(Method method, boolean exact) - { - Class[] paramTypes = method.getParameterTypes(); - Set<Integer> matches = new HashSet<Integer>(paramTypes.length); - - for (ParameterMetaData param : getParameters()) - { - if (param.matchParameter(method, matches, exact) == false) - return false; - } - - // We should have an entry for every parameter index if we match - if (matches.size() != paramTypes.length) - return false; - - ParameterMetaData returnMetaData = getReturnParameter(); - if (returnMetaData != null) - { - return returnMetaData.matchParameter(method, matches, exact); - } - - return true; - } - - /** Return true if this is a generic message style destination that takes a org.w3c.dom.Element - */ - public boolean isMessageEndpoint() - { - boolean isMessageEndpoint = false; - if (parameters.size() == 1) - { - ParameterMetaData inParam = parameters.get(0); - if (JavaUtils.isAssignableFrom(Element.class, inParam.getJavaType())) - { - isMessageEndpoint = true; - } - } - return isMessageEndpoint; - } - - public boolean isOneWay() - { - return oneWay; - } - - public void setOneWay(boolean oneWay) - { - this.oneWay = oneWay; - assertOneWayOperation(); - } - - public ParameterMetaData getParameter(QName xmlName) - { - ParameterMetaData paramMetaData = null; - for (int i = 0; paramMetaData == null && i < parameters.size(); i++) - { - ParameterMetaData aux = parameters.get(i); - if (xmlName.equals(aux.getXmlName())) - paramMetaData = aux; - } - return paramMetaData; - } - - /** Get the IN or INOUT parameter list */ - public List<ParameterMetaData> getInputParameters() - { - List<ParameterMetaData> retList = new ArrayList<ParameterMetaData>(); - for (ParameterMetaData paramMetaData : parameters) - { - ParameterMode mode = paramMetaData.getMode(); - if (mode == ParameterMode.IN || mode == ParameterMode.INOUT) - retList.add(paramMetaData); - } - return retList; - } - - /** Get the OUT or INOUT parameter list */ - public List<ParameterMetaData> getOutputParameters() - { - List<ParameterMetaData> retList = new ArrayList<ParameterMetaData>(); - for (ParameterMetaData paramMetaData : parameters) - { - ParameterMode mode = paramMetaData.getMode(); - if (mode == ParameterMode.OUT || mode == ParameterMode.INOUT) - retList.add(paramMetaData); - } - return retList; - } - - /** Get the non header parameter list */ - public List<ParameterMetaData> getNonHeaderParameters() - { - List<ParameterMetaData> retList = new ArrayList<ParameterMetaData>(); - for (ParameterMetaData paramMetaData : parameters) - { - if (paramMetaData.isInHeader() == false) - retList.add(paramMetaData); - } - return retList; - } - - public List<ParameterMetaData> getParameters() - { - return new ArrayList<ParameterMetaData>(parameters); - } - - public void addParameter(ParameterMetaData pmd) - { - log.trace("addParameter: [xmlName=" + pmd.getXmlName() + ",xmlType=" + pmd.getXmlType() + "]"); - parameters.add(pmd); - assertOneWayOperation(); - } - - public void removeAllParameters() - { - parameters.clear(); - } - - public ParameterMetaData getReturnParameter() - { - return returnParam; - } - - public void setReturnParameter(ParameterMetaData returnParam) - { - log.trace("setReturnParameter: " + returnParam); - returnParam.setMode(ParameterMode.OUT); - returnParam.setIndex(-1); - this.returnParam = returnParam; - assertOneWayOperation(); - } - - public List<FaultMetaData> getFaults() - { - return new ArrayList<FaultMetaData>(faults); - } - - public FaultMetaData getFault(QName xmlName) - { - FaultMetaData faultMetaData = null; - for (int i = 0; faultMetaData == null && i < faults.size(); i++) - { - FaultMetaData aux = faults.get(i); - if (aux.getXmlName().equals(xmlName)) - faultMetaData = aux; - } - return faultMetaData; - } - - public FaultMetaData getFault(Class javaType) - { - FaultMetaData faultMetaData = null; - for (FaultMetaData aux : faults) - { - if (aux.getJavaType().equals(javaType)) - { - faultMetaData = aux; - break; - } - } - return faultMetaData; - } - - public void addFault(FaultMetaData fault) - { - log.trace("addFault: " + fault); - faults.add(fault); - assertOneWayOperation(); - } - - // A JSR-181 processor is REQUIRED to report an error if an - // operation marked @Oneway has a return value, declares any checked exceptions or has any - // INOUT or OUT parameters. - private void assertOneWayOperation() - { - if (oneWay) - { - if (returnParam != null) - throw new WSException("OneWay operations cannot have a return parameter"); - - if (faults.size() > 0) - throw new WSException("OneWay operations cannot have checked exceptions"); - - for (ParameterMetaData paramMetaData : parameters) - { - if (paramMetaData.getMode() != ParameterMode.IN) - throw new WSException("OneWay operations cannot have INOUT or OUT parameters"); - } - } - } - - public void assertDocumentBare() - { - if (isDocumentBare()) - { - int in = 0; - int out = 0; - - for (ParameterMetaData paramMetaData : parameters) - { - if (paramMetaData.isInHeader()) - continue; - - ParameterMode mode = paramMetaData.getMode(); - if (mode != ParameterMode.OUT) - in++; - if (mode != ParameterMode.IN) - out++; - } - - if (returnParam != null && !returnParam.isInHeader()) - out++; - - if (in > 1 || out > (oneWay ? 0 : 1)) - throw new WSException("The body of a document/literal bare message requires at most 1 input and at most 1 output (or 0 if oneway). method: " + javaName + " in: " - + in + " out: " + out); - } - } - - public void validate() - { - for (ParameterMetaData parameter : parameters) - parameter.validate(); - - for (FaultMetaData fault : faults) - fault.validate(); - } - - /** - * @see UnifiedMetaData#eagerInitialize() - */ - public void eagerInitialize(List<Method> unsynchronizedMethods) - { - // reset java method - javaMethod = null; - - for (ParameterMetaData parameter : parameters) - parameter.eagerInitialize(); - - if (returnParam != null) - returnParam.eagerInitialize(); - - for (FaultMetaData fault : faults) - fault.eagerInitialize(); - - // Method initialization - for (Method method : unsynchronizedMethods) - { - if (isJavaMethod(method)) - { - javaMethod = method; - break; - } - } - - // Report unsynchronized java method - if (javaMethod == null) - { - StringBuilder errMsg = new StringBuilder("Cannot synchronize to any of these methods:"); - for (Method method : unsynchronizedMethods) - { - errMsg.append("\n" + method); - } - errMsg.append("\n" + toString()); - throw new IllegalStateException(errMsg.toString()); - } - } - - public String toString() - { - StringBuilder buffer = new StringBuilder("\nOperationMetaData:"); - buffer.append("\n qname=" + qname); - buffer.append("\n javaName=" + javaName); - buffer.append("\n style=" + getStyle() + "/" + getUse()); - if (getStyle() == Style.DOCUMENT) - { - buffer.append("/" + getParameterStyle()); - } - buffer.append("\n oneWay=" + oneWay); - buffer.append("\n soapAction=" + soapAction); - for (ParameterMetaData param : parameters) - { - buffer.append(param); - } - if (returnParam != null) - { - buffer.append(returnParam.toString()); - } - for (FaultMetaData fault : faults) - { - buffer.append(fault); - } - return buffer.toString(); - } -} Copied: branches/tdiesler/trunk/src/main/java/org/jboss/ws/common/umdm/OperationMetaData.java (from rev 1564, branches/tdiesler/trunk/src/main/java/org/jboss/ws/metadata/umdm/OperationMetaData.java) =================================================================== --- branches/tdiesler/trunk/src/main/java/org/jboss/ws/metadata/umdm/OperationMetaData.java 2006-12-06 01:10:43 UTC (rev 1564) +++ branches/tdiesler/trunk/src/main/java/org/jboss/ws/common/umdm/OperationMetaData.java 2006-12-06 01:14:45 UTC (rev 1565) @@ -0,0 +1,521 @@ +/* + * 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.umdm; + +// $Id$ + +import java.lang.reflect.Method; +import java.util.ArrayList; +import java.util.HashSet; +import java.util.List; +import java.util.Set; + +import javax.jws.soap.SOAPBinding.ParameterStyle; +import javax.xml.namespace.QName; +import javax.xml.rpc.ParameterMode; + +import org.jboss.logging.Logger; +import org.jboss.ws.common.WSException; +import org.jboss.ws.common.umdm.EndpointMetaData.Type; +import org.jboss.ws.common.utils.JavaUtils; +import org.jboss.ws.jaxrpc.Style; +import org.jboss.ws.jaxrpc.Use; +import org.w3c.dom.Element; + +/** + * An Operation component describes an operation that a given interface supports. + * + * @author Thomas.Diesler(a)jboss.org + * @author <a href="mailto:jason.greene@jboss.com">Jason T. Greene</a> + * @since 12-May-2004 + */ +public class OperationMetaData extends ExtensibleMetaData +{ + // provide logging + private final Logger log = Logger.getLogger(OperationMetaData.class); + + // The parent interface + private EndpointMetaData epMetaData; + + private QName qname; + private QName responseName; + private String javaName; + private Method javaMethod; + private boolean oneWay; + private String soapAction; + private List<ParameterMetaData> parameters = new ArrayList<ParameterMetaData>(); + private List<FaultMetaData> faults = new ArrayList<FaultMetaData>(); + private ParameterMetaData returnParam; + + public OperationMetaData(QName qname, String javaName) + { + UnifiedMetaData umd = new UnifiedMetaData(); + ServiceMetaData smd = new ServiceMetaData(umd, new QName("mock-service")); + ServerEndpointMetaData epmd = new ServerEndpointMetaData(smd, new QName("mock-endpoint"), new QName("mock-interface"), Type.JAXRPC); + initOperationMetaData(epmd, qname, javaName); + } + + public OperationMetaData(EndpointMetaData epMetaData, QName qname, String javaName) + { + log.trace("new OperationMetaData: [xmlName=" + qname + ",javaName=" + javaName + "]"); + initOperationMetaData(epMetaData, qname, javaName); + } + + private void initOperationMetaData(EndpointMetaData epMetaData, QName qname, String javaName) + { + this.epMetaData = epMetaData; + this.qname = qname; + this.javaName = javaName; + + if (qname == null) + throw new IllegalArgumentException("Invalid null qname argument"); + if (javaName == null) + throw new IllegalArgumentException("Invalid null javaName argument, for: " + qname); + + String nsURI = qname.getNamespaceURI(); + String localPart = qname.getLocalPart(); + this.responseName = new QName(nsURI, localPart + "Response"); + } + + public EndpointMetaData getEndpointMetaData() + { + return epMetaData; + } + + public QName getQName() + { + return qname; + } + + public QName getResponseName() + { + return responseName; + } + + public String getSOAPAction() + { + return soapAction; + } + + public void setSOAPAction(String soapAction) + { + this.soapAction = soapAction; + } + + public Style getStyle() + { + return epMetaData.getStyle(); + } + + public Use getUse() + { + return epMetaData.getEncodingStyle(); + } + + public ParameterStyle getParameterStyle() + { + return epMetaData.getParameterStyle(); + } + + public boolean isRPCLiteral() + { + return getStyle() == Style.RPC && getUse() == Use.LITERAL; + } + + public boolean isRPCEncoded() + { + return getStyle() == Style.RPC && getUse() == Use.ENCODED; + } + + public boolean isDocumentBare() + { + return getStyle() == Style.DOCUMENT && getParameterStyle() == ParameterStyle.BARE; + } + + public boolean isDocumentWrapped() + { + return getStyle() == Style.DOCUMENT && getParameterStyle() == ParameterStyle.WRAPPED; + } + + public String getJavaName() + { + return javaName; + } + + public Method getJavaMethod() + { + Method tmpMethod = javaMethod; + Class seiClass = epMetaData.getServiceEndpointInterface(); + if (tmpMethod == null && seiClass != null) + { + for (Method method : seiClass.getMethods()) + { + if (isJavaMethod(method)) + { + tmpMethod = method; + + UnifiedMetaData wsMetaData = epMetaData.getServiceMetaData().getUnifiedMetaData(); + if (wsMetaData.isEagerInitialized()) + { + if (UnifiedMetaData.isFinalRelease() == false) + log.warn("Loading java method after eager initialization", new IllegalStateException()); + + javaMethod = method; + } + + break; + } + } + + if (tmpMethod == null) + throw new WSException("Cannot find java method: " + javaName); + } + return tmpMethod; + } + + public boolean isJavaMethod(Method method) + { + boolean isJavaMethod = method.equals(javaMethod); + if (isJavaMethod == false) + { + String methodName = method.getName(); + if (javaName.equals(methodName)) + { + log.trace("Found java method: " + method); + + // compare params by java type name + if (matchParameters(method, true)) + { + log.debug("Found best matching java method: " + method); + isJavaMethod = true; + } + + // compare params by assignability + if (!isJavaMethod && matchParameters(method, false)) + { + log.debug("Found possible matching java method: " + method); + isJavaMethod = true; + } + } + } + + if (log.isTraceEnabled()) + log.trace("Synchronized java method:\n" + method + "\nwith: " + toString()); + + return isJavaMethod; + } + + private boolean matchParameters(Method method, boolean exact) + { + Class[] paramTypes = method.getParameterTypes(); + Set<Integer> matches = new HashSet<Integer>(paramTypes.length); + + for (ParameterMetaData param : getParameters()) + { + if (param.matchParameter(method, matches, exact) == false) + return false; + } + + // We should have an entry for every parameter index if we match + if (matches.size() != paramTypes.length) + return false; + + ParameterMetaData returnMetaData = getReturnParameter(); + if (returnMetaData != null) + { + return returnMetaData.matchParameter(method, matches, exact); + } + + return true; + } + + /** Return true if this is a generic message style destination that takes a org.w3c.dom.Element + */ + public boolean isMessageEndpoint() + { + boolean isMessageEndpoint = false; + if (parameters.size() == 1) + { + ParameterMetaData inParam = parameters.get(0); + if (JavaUtils.isAssignableFrom(Element.class, inParam.getJavaType())) + { + isMessageEndpoint = true; + } + } + return isMessageEndpoint; + } + + public boolean isOneWay() + { + return oneWay; + } + + public void setOneWay(boolean oneWay) + { + this.oneWay = oneWay; + assertOneWayOperation(); + } + + public ParameterMetaData getParameter(QName xmlName) + { + ParameterMetaData paramMetaData = null; + for (int i = 0; paramMetaData == null && i < parameters.size(); i++) + { + ParameterMetaData aux = parameters.get(i); + if (xmlName.equals(aux.getXmlName())) + paramMetaData = aux; + } + return paramMetaData; + } + + /** Get the IN or INOUT parameter list */ + public List<ParameterMetaData> getInputParameters() + { + List<ParameterMetaData> retList = new ArrayList<ParameterMetaData>(); + for (ParameterMetaData paramMetaData : parameters) + { + ParameterMode mode = paramMetaData.getMode(); + if (mode == ParameterMode.IN || mode == ParameterMode.INOUT) + retList.add(paramMetaData); + } + return retList; + } + + /** Get the OUT or INOUT parameter list */ + public List<ParameterMetaData> getOutputParameters() + { + List<ParameterMetaData> retList = new ArrayList<ParameterMetaData>(); + for (ParameterMetaData paramMetaData : parameters) + { + ParameterMode mode = paramMetaData.getMode(); + if (mode == ParameterMode.OUT || mode == ParameterMode.INOUT) + retList.add(paramMetaData); + } + return retList; + } + + /** Get the non header parameter list */ + public List<ParameterMetaData> getNonHeaderParameters() + { + List<ParameterMetaData> retList = new ArrayList<ParameterMetaData>(); + for (ParameterMetaData paramMetaData : parameters) + { + if (paramMetaData.isInHeader() == false) + retList.add(paramMetaData); + } + return retList; + } + + public List<ParameterMetaData> getParameters() + { + return new ArrayList<ParameterMetaData>(parameters); + } + + public void addParameter(ParameterMetaData pmd) + { + log.trace("addParameter: [xmlName=" + pmd.getXmlName() + ",xmlType=" + pmd.getXmlType() + "]"); + parameters.add(pmd); + assertOneWayOperation(); + } + + public void removeAllParameters() + { + parameters.clear(); + } + + public ParameterMetaData getReturnParameter() + { + return returnParam; + } + + public void setReturnParameter(ParameterMetaData returnParam) + { + log.trace("setReturnParameter: " + returnParam); + returnParam.setMode(ParameterMode.OUT); + returnParam.setIndex(-1); + this.returnParam = returnParam; + assertOneWayOperation(); + } + + public List<FaultMetaData> getFaults() + { + return new ArrayList<FaultMetaData>(faults); + } + + public FaultMetaData getFault(QName xmlName) + { + FaultMetaData faultMetaData = null; + for (int i = 0; faultMetaData == null && i < faults.size(); i++) + { + FaultMetaData aux = faults.get(i); + if (aux.getXmlName().equals(xmlName)) + faultMetaData = aux; + } + return faultMetaData; + } + + public FaultMetaData getFault(Class javaType) + { + FaultMetaData faultMetaData = null; + for (FaultMetaData aux : faults) + { + if (aux.getJavaType().equals(javaType)) + { + faultMetaData = aux; + break; + } + } + return faultMetaData; + } + + public void addFault(FaultMetaData fault) + { + log.trace("addFault: " + fault); + faults.add(fault); + assertOneWayOperation(); + } + + // A JSR-181 processor is REQUIRED to report an error if an + // operation marked @Oneway has a return value, declares any checked exceptions or has any + // INOUT or OUT parameters. + private void assertOneWayOperation() + { + if (oneWay) + { + if (returnParam != null) + throw new WSException("OneWay operations cannot have a return parameter"); + + if (faults.size() > 0) + throw new WSException("OneWay operations cannot have checked exceptions"); + + for (ParameterMetaData paramMetaData : parameters) + { + if (paramMetaData.getMode() != ParameterMode.IN) + throw new WSException("OneWay operations cannot have INOUT or OUT parameters"); + } + } + } + + public void assertDocumentBare() + { + if (isDocumentBare()) + { + int in = 0; + int out = 0; + + for (ParameterMetaData paramMetaData : parameters) + { + if (paramMetaData.isInHeader()) + continue; + + ParameterMode mode = paramMetaData.getMode(); + if (mode != ParameterMode.OUT) + in++; + if (mode != ParameterMode.IN) + out++; + } + + if (returnParam != null && !returnParam.isInHeader()) + out++; + + if (in > 1 || out > (oneWay ? 0 : 1)) + throw new WSException("The body of a document/literal bare message requires at most 1 input and at most 1 output (or 0 if oneway). method: " + javaName + " in: " + + in + " out: " + out); + } + } + + public void validate() + { + for (ParameterMetaData parameter : parameters) + parameter.validate(); + + for (FaultMetaData fault : faults) + fault.validate(); + } + + /** + * @see UnifiedMetaData#eagerInitialize() + */ + public void eagerInitialize(List<Method> unsynchronizedMethods) + { + // reset java method + javaMethod = null; + + for (ParameterMetaData parameter : parameters) + parameter.eagerInitialize(); + + if (returnParam != null) + returnParam.eagerInitialize(); + + for (FaultMetaData fault : faults) + fault.eagerInitialize(); + + // Method initialization + for (Method method : unsynchronizedMethods) + { + if (isJavaMethod(method)) + { + javaMethod = method; + break; + } + } + + // Report unsynchronized java method + if (javaMethod == null) + { + StringBuilder errMsg = new StringBuilder("Cannot synchronize to any of these methods:"); + for (Method method : unsynchronizedMethods) + { + errMsg.append("\n" + method); + } + errMsg.append("\n" + toString()); + throw new IllegalStateException(errMsg.toString()); + } + } + + public String toString() + { + StringBuilder buffer = new StringBuilder("\nOperationMetaData:"); + buffer.append("\n qname=" + qname); + buffer.append("\n javaName=" + javaName); + buffer.append("\n style=" + getStyle() + "/" + getUse()); + if (getStyle() == Style.DOCUMENT) + { + buffer.append("/" + getParameterStyle()); + } + buffer.append("\n oneWay=" + oneWay); + buffer.append("\n soapAction=" + soapAction); + for (ParameterMetaData param : parameters) + { + buffer.append(param); + } + if (returnParam != null) + { + buffer.append(returnParam.toString()); + } + for (FaultMetaData fault : faults) + { + buffer.append(fault); + } + return buffer.toString(); + } +} Deleted: branches/tdiesler/trunk/src/main/java/org/jboss/ws/common/umdm/ParameterMetaData.java =================================================================== --- branches/tdiesler/trunk/src/main/java/org/jboss/ws/metadata/umdm/ParameterMetaData.java 2006-12-06 01:04:23 UTC (rev 1563) +++ branches/tdiesler/trunk/src/main/java/org/jboss/ws/common/umdm/ParameterMetaData.java 2006-12-06 01:14:45 UTC (rev 1565) @@ -1,469 +0,0 @@ -/* - * JBoss, Home of Professional Open Source - * Copyright 2005, JBoss Inc., and individual contributors as indicated - * by the @authors tag. See the copyright.txt in the distribution for a - * full listing of individual contributors. - * - * This is free software; you can redistribute it and/or modify it - * under the terms of the GNU Lesser General Public License as - * published by the Free Software Foundation; either version 2.1 of - * the License, or (at your option) any later version. - * - * This software is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * Lesser General Public License for more details. - * - * You should have received a copy of the GNU Lesser General Public - * License along with this software; if not, write to the Free - * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA - * 02110-1301 USA, or see the FSF site: http://www.fsf.org. - */ -package org.jboss.ws.metadata.umdm; - -// $Id$ - -import java.lang.reflect.Method; -import java.lang.reflect.Type; -import java.util.ArrayList; -import java.util.HashSet; -import java.util.List; -import java.util.Set; -import java.util.StringTokenizer; - -import javax.xml.namespace.QName; -import javax.xml.rpc.ParameterMode; - -import org.jboss.logging.Logger; -import org.jboss.ws.Constants; -import org.jboss.ws.WSException; -import org.jboss.ws.common.utils.HolderUtils; -import org.jboss.ws.common.utils.JavaUtils; -import org.jboss.ws.core.jaxws.DynamicWrapperGenerator; -import org.jboss.ws.jaxrpc.ParameterWrapping; -import org.jboss.ws.metadata.acessor.ReflectiveMethodAccessor; -import org.jboss.ws.metadata.umdm.WrappedParameter.AccessorFactory; - -/** - * A request/response parameter that a given operation supports. - * - * @author Thomas.Diesler(a)jboss.org - * @author <a href="mailto:jason.greene@jboss.com">Jason T. Greene</a> - * @since 12-May-2005 - */ -public class ParameterMetaData -{ - // provide logging - private final Logger log = Logger.getLogger(ParameterMetaData.class); - - // The parent operation - private OperationMetaData opMetaData; - - private QName xmlName; - private String partName; - private QName xmlType; - private String javaTypeName; - private Class javaType; - private ParameterMode mode; - private Set<String> mimeTypes; - private boolean inHeader; - private boolean isSwA; - private boolean isXOP; - private List<WrappedParameter> wrappedParameters; - private int index; - - // SOAP-ENC:Array - private boolean soapArrayParam; - private QName soapArrayCompType; - private AccessorFactoryCreator accessorFactoryCreator = ReflectiveMethodAccessor.FACTORY_CREATOR; - - public static interface AccessorFactoryCreator - { - public AccessorFactory create(ParameterMetaData parameter); - } - - private static final List<String> messageTypes = new ArrayList<String>(); - static - { - messageTypes.add("javax.xml.soap.SOAPElement"); - messageTypes.add("org.w3c.dom.Element"); - } - - public ParameterMetaData(OperationMetaData opMetaData, QName xmlName, QName xmlType, String javaTypeName) - { - this(opMetaData, xmlName, javaTypeName); - setXmlType(xmlType); - } - - public ParameterMetaData(OperationMetaData opMetaData, QName xmlName, String javaTypeName) - { - if (xmlName == null) - throw new IllegalArgumentException("Invalid null xmlName argument"); - - // Remove the prefixes - if (xmlName.getNamespaceURI().length() > 0) - xmlName = new QName(xmlName.getNamespaceURI(), xmlName.getLocalPart()); - - this.xmlName = xmlName; - this.opMetaData = opMetaData; - this.mode = ParameterMode.IN; - this.partName = xmlName.getLocalPart(); - this.javaTypeName = javaTypeName; - } - - private static boolean matchParameter(Method method, int index, Class expectedType, Set<Integer> matches, boolean exact, boolean holder) - { - Class returnType = method.getReturnType(); - Type[] parameters = method.getGenericParameterTypes(); - - if (index == -1 && matchTypes(returnType, expectedType, exact, false)) - return true; - - if (index < parameters.length && matchTypes(parameters[index], expectedType, exact, holder)) - { - matches.add(index); - return true; - } - - return false; - } - - private static boolean matchTypes(Type actualType, Class expectedType, boolean exact, boolean holder) - { - if (holder && HolderUtils.isHolderType(actualType) == false) - return false; - - Type valueType = (holder ? HolderUtils.getValueType(actualType) : actualType); - Class valueClass = JavaUtils.erasure(valueType); - boolean matched = (exact ? valueClass.getName().equals(expectedType.getName()) : JavaUtils.isAssignableFrom(valueClass, expectedType)); - - return matched; - } - - public OperationMetaData getOperationMetaData() - { - return opMetaData; - } - - public QName getXmlName() - { - return xmlName; - } - - public QName getXmlType() - { - return xmlType; - } - - public void setXmlType(QName xmlType) - { - if (xmlType == null) - throw new IllegalArgumentException("Invalid null xmlType"); - - // Remove potential prefix - if (xmlType.getNamespaceURI().length() > 0) - this.xmlType = new QName(xmlType.getNamespaceURI(), xmlType.getLocalPart()); - else this.xmlType = xmlType; - - // Special case to identify attachments - if (Constants.NS_ATTACHMENT_MIME_TYPE.equals(xmlType.getNamespaceURI())) - { - String mimeType = convertXmlTypeToMimeType(xmlType); - setMimeTypes(mimeType); - this.isSwA = true; - } - else if(Constants.NS_SCHEMA_XSD.equals(xmlType.getNamespaceURI()) - && "base64Binary".equals(xmlType.getLocalPart())) - { - setXOP(true); - } - } - - public String getJavaTypeName() - { - return javaTypeName; - } - - public void setJavaTypeName(String typeName) - { - // Warn if this is called after eager initialization - UnifiedMetaData wsMetaData = opMetaData.getEndpointMetaData().getServiceMetaData().getUnifiedMetaData(); - if (wsMetaData.isEagerInitialized() && UnifiedMetaData.isFinalRelease() == false) - log.warn("Set java type name after eager initialization", new IllegalStateException()); - - javaTypeName = typeName; - javaType = null; - } - - /** Load the java type. - * It should only be cached during eager initialization. - */ - public Class getJavaType() - { - Class tmpJavaType = javaType; - if (tmpJavaType == null && javaTypeName != null) - { - try - { - ClassLoader loader = opMetaData.getEndpointMetaData().getClassLoader(); - tmpJavaType = JavaUtils.loadJavaType(javaTypeName, loader); - - UnifiedMetaData wsMetaData = opMetaData.getEndpointMetaData().getServiceMetaData().getUnifiedMetaData(); - if (wsMetaData.isEagerInitialized()) - { - // This should not happen, see the warning in setJavaTypeName - javaType = tmpJavaType; - } - } - catch (ClassNotFoundException ex) - { - throw new WSException("Cannot load java type: " + javaTypeName, ex); - } - } - return tmpJavaType; - } - - public ParameterMode getMode() - { - return mode; - } - - public void setMode(String mode) - { - if ("IN".equals(mode)) - setMode(ParameterMode.IN); - else if ("INOUT".equals(mode)) - setMode(ParameterMode.INOUT); - else if ("OUT".equals(mode)) - setMode(ParameterMode.OUT); - else throw new IllegalArgumentException("Invalid mode: " + mode); - } - - public void setMode(ParameterMode mode) - { - this.mode = mode; - } - - public Set<String> getMimeTypes() - { - return mimeTypes; - } - - public void setMimeTypes(String mimeStr) - { - mimeTypes = new HashSet<String>(); - StringTokenizer st = new StringTokenizer(mimeStr, ","); - while (st.hasMoreTokens()) - mimeTypes.add(st.nextToken().trim()); - } - - public boolean isInHeader() - { - return inHeader; - } - - public void setInHeader(boolean inHeader) - { - this.inHeader = inHeader; - } - - public boolean isSwA() - { - return isSwA; - } - - public void setSwA(boolean isSwA) - { - this.isSwA = isSwA; - } - - public boolean isXOP() - { - return isXOP; - } - - public void setXOP(boolean isXOP) - { - this.isXOP = isXOP; - } - - public boolean isSOAPArrayParam() - { - return soapArrayParam; - } - - public void setSOAPArrayParam(boolean soapArrayParam) - { - this.soapArrayParam = soapArrayParam; - } - - public QName getSOAPArrayCompType() - { - return soapArrayCompType; - } - - public void setSOAPArrayCompType(QName xmlType) - { - this.soapArrayCompType = xmlType; - } - - public boolean isMessageType() - { - return messageTypes.contains(javaTypeName); - } - - public static boolean isMessageType(String javaTypeName) - { - return messageTypes.contains(javaTypeName); - } - - /** Converts a proprietary JBossWS attachment xml type to the MIME type that it represents. - */ - private String convertXmlTypeToMimeType(QName xmlType) - { - StringBuilder mimeName = new StringBuilder(xmlType.getLocalPart()); - int pos = mimeName.indexOf("_"); - if (pos == -1) - throw new IllegalArgumentException("Invalid mime type: " + xmlType); - - mimeName.setCharAt(pos, '/'); - return mimeName.toString(); - } - - public int getIndex() - { - return index; - } - - public void setIndex(int index) - { - this.index = index; - } - - public List<WrappedParameter> getWrappedParameters() - { - return wrappedParameters; - } - - public void setWrappedParameters(List<WrappedParameter> wrappedParameters) - { - this.wrappedParameters = wrappedParameters; - } - - public String getPartName() - { - return partName; - } - - public void setPartName(String partName) - { - this.partName = partName; - } - - public void validate() - { - // nothing to do - } - - /** - * @see UnifiedMetaData#eagerInitialize() - */ - public void eagerInitialize() - { - // reset java type - javaType = null; - - if (getOperationMetaData().isDocumentWrapped() && isMessageType() == false) - { - new DynamicWrapperGenerator(getClassLoader()).generate(this); - - // Initialize accessors - AccessorFactory factory = accessorFactoryCreator.create(this); - for (WrappedParameter wrapped : wrappedParameters) - wrapped.setAccessor(factory.create(wrapped)); - } - - javaType = getJavaType(); - if (javaType == null) - throw new WSException("Cannot load java type: " + javaTypeName); - } - - private ClassLoader getClassLoader() - { - ClassLoader loader = opMetaData.getEndpointMetaData().getServiceMetaData().getUnifiedMetaData().getClassLoader(); - if (loader == null) - throw new WSException("ClassLoader not available"); - return loader; - } - - public boolean matchParameter(Method method, Set<Integer> matches, boolean exact) - { - ClassLoader loader = getOperationMetaData().getEndpointMetaData().getClassLoader(); - List<WrappedParameter> wrappedParameters = getWrappedParameters(); - Class wrapperType = getJavaType(); - - // Standard type - if (wrappedParameters == null) - return matchParameter(method, getIndex(), getJavaType(), matches, exact, mode != ParameterMode.IN); - - // Wrapped type - for (WrappedParameter wrapped : wrappedParameters) - { - String typeName = wrapped.getType(); - - try - { - Class type = (typeName != null) ? JavaUtils.loadJavaType(typeName, loader) : ParameterWrapping.getWrappedType(wrapped.getVariable(), wrapperType); - if (type == null) - return false; - if (!matchParameter(method, wrapped.getIndex(), type, matches, exact, wrapped.isHolder())) - return false; - } - catch (Exception ex) - { - log.debug("Invalid wrapper type:" + typeName, ex); - return false; - } - } - - return true; - } - - public void setAccessorFactoryCreator(AccessorFactoryCreator accessorFactoryCreator) - { - this.accessorFactoryCreator = accessorFactoryCreator; - } - - public String toString() - { - boolean isReturn = (opMetaData.getReturnParameter() == this); - StringBuilder buffer = new StringBuilder("\n" + (isReturn ? "ReturnMetaData:" : "ParameterMetaData:")); - buffer.append("\n xmlName=" + getXmlName()); - buffer.append("\n partName=" + getPartName()); - buffer.append("\n xmlType=" + getXmlType()); - buffer.append("\n javaType=" + getJavaTypeName()); - buffer.append("\n mode=" + getMode()); - buffer.append("\n inHeader=" + isInHeader()); - buffer.append("\n index=" + index); - - if (soapArrayParam) - buffer.append("\n soapArrayCompType=" + soapArrayCompType); - - if (isSwA()) - { - buffer.append("\n isSwA=" + isSwA()); - buffer.append("\n mimeTypes=" + getMimeTypes()); - } - - if (wrappedParameters != null) - buffer.append("\n wrappedParameters=" + wrappedParameters); - - if (isXOP()) - { - buffer.append("\n isXOP=" + isXOP()); - buffer.append("\n mimeTypes=" + getMimeTypes()); - } - - return buffer.toString(); - } -} Copied: branches/tdiesler/trunk/src/main/java/org/jboss/ws/common/umdm/ParameterMetaData.java (from rev 1564, branches/tdiesler/trunk/src/main/java/org/jboss/ws/metadata/umdm/ParameterMetaData.java) =================================================================== --- branches/tdiesler/trunk/src/main/java/org/jboss/ws/metadata/umdm/ParameterMetaData.java 2006-12-06 01:10:43 UTC (rev 1564) +++ branches/tdiesler/trunk/src/main/java/org/jboss/ws/common/umdm/ParameterMetaData.java 2006-12-06 01:14:45 UTC (rev 1565) @@ -0,0 +1,469 @@ +/* + * 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.umdm; + +// $Id$ + +import java.lang.reflect.Method; +import java.lang.reflect.Type; +import java.util.ArrayList; +import java.util.HashSet; +import java.util.List; +import java.util.Set; +import java.util.StringTokenizer; + +import javax.xml.namespace.QName; +import javax.xml.rpc.ParameterMode; + +import org.jboss.logging.Logger; +import org.jboss.ws.common.Constants; +import org.jboss.ws.common.WSException; +import org.jboss.ws.common.umdm.WrappedParameter.AccessorFactory; +import org.jboss.ws.common.utils.HolderUtils; +import org.jboss.ws.common.utils.JavaUtils; +import org.jboss.ws.core.jaxws.DynamicWrapperGenerator; +import org.jboss.ws.jaxrpc.ParameterWrapping; +import org.jboss.ws.metadata.acessor.ReflectiveMethodAccessor; + +/** + * A request/response parameter that a given operation supports. + * + * @author Thomas.Diesler(a)jboss.org + * @author <a href="mailto:jason.greene@jboss.com">Jason T. Greene</a> + * @since 12-May-2005 + */ +public class ParameterMetaData +{ + // provide logging + private final Logger log = Logger.getLogger(ParameterMetaData.class); + + // The parent operation + private OperationMetaData opMetaData; + + private QName xmlName; + private String partName; + private QName xmlType; + private String javaTypeName; + private Class javaType; + private ParameterMode mode; + private Set<String> mimeTypes; + private boolean inHeader; + private boolean isSwA; + private boolean isXOP; + private List<WrappedParameter> wrappedParameters; + private int index; + + // SOAP-ENC:Array + private boolean soapArrayParam; + private QName soapArrayCompType; + private AccessorFactoryCreator accessorFactoryCreator = ReflectiveMethodAccessor.FACTORY_CREATOR; + + public static interface AccessorFactoryCreator + { + public AccessorFactory create(ParameterMetaData parameter); + } + + private static final List<String> messageTypes = new ArrayList<String>(); + static + { + messageTypes.add("javax.xml.soap.SOAPElement"); + messageTypes.add("org.w3c.dom.Element"); + } + + public ParameterMetaData(OperationMetaData opMetaData, QName xmlName, QName xmlType, String javaTypeName) + { + this(opMetaData, xmlName, javaTypeName); + setXmlType(xmlType); + } + + public ParameterMetaData(OperationMetaData opMetaData, QName xmlName, String javaTypeName) + { + if (xmlName == null) + throw new IllegalArgumentException("Invalid null xmlName argument"); + + // Remove the prefixes + if (xmlName.getNamespaceURI().length() > 0) + xmlName = new QName(xmlName.getNamespaceURI(), xmlName.getLocalPart()); + + this.xmlName = xmlName; + this.opMetaData = opMetaData; + this.mode = ParameterMode.IN; + this.partName = xmlName.getLocalPart(); + this.javaTypeName = javaTypeName; + } + + private static boolean matchParameter(Method method, int index, Class expectedType, Set<Integer> matches, boolean exact, boolean holder) + { + Class returnType = method.getReturnType(); + Type[] parameters = method.getGenericParameterTypes(); + + if (index == -1 && matchTypes(returnType, expectedType, exact, false)) + return true; + + if (index < parameters.length && matchTypes(parameters[index], expectedType, exact, holder)) + { + matches.add(index); + return true; + } + + return false; + } + + private static boolean matchTypes(Type actualType, Class expectedType, boolean exact, boolean holder) + { + if (holder && HolderUtils.isHolderType(actualType) == false) + return false; + + Type valueType = (holder ? HolderUtils.getValueType(actualType) : actualType); + Class valueClass = JavaUtils.erasure(valueType); + boolean matched = (exact ? valueClass.getName().equals(expectedType.getName()) : JavaUtils.isAssignableFrom(valueClass, expectedType)); + + return matched; + } + + public OperationMetaData getOperationMetaData() + { + return opMetaData; + } + + public QName getXmlName() + { + return xmlName; + } + + public QName getXmlType() + { + return xmlType; + } + + public void setXmlType(QName xmlType) + { + if (xmlType == null) + throw new IllegalArgumentException("Invalid null xmlType"); + + // Remove potential prefix + if (xmlType.getNamespaceURI().length() > 0) + this.xmlType = new QName(xmlType.getNamespaceURI(), xmlType.getLocalPart()); + else this.xmlType = xmlType; + + // Special case to identify attachments + if (Constants.NS_ATTACHMENT_MIME_TYPE.equals(xmlType.getNamespaceURI())) + { + String mimeType = convertXmlTypeToMimeType(xmlType); + setMimeTypes(mimeType); + this.isSwA = true; + } + else if(Constants.NS_SCHEMA_XSD.equals(xmlType.getNamespaceURI()) + && "base64Binary".equals(xmlType.getLocalPart())) + { + setXOP(true); + } + } + + public String getJavaTypeName() + { + return javaTypeName; + } + + public void setJavaTypeName(String typeName) + { + // Warn if this is called after eager initialization + UnifiedMetaData wsMetaData = opMetaData.getEndpointMetaData().getServiceMetaData().getUnifiedMetaData(); + if (wsMetaData.isEagerInitialized() && UnifiedMetaData.isFinalRelease() == false) + log.warn("Set java type name after eager initialization", new IllegalStateException()); + + javaTypeName = typeName; + javaType = null; + } + + /** Load the java type. + * It should only be cached during eager initialization. + */ + public Class getJavaType() + { + Class tmpJavaType = javaType; + if (tmpJavaType == null && javaTypeName != null) + { + try + { + ClassLoader loader = opMetaData.getEndpointMetaData().getClassLoader(); + tmpJavaType = JavaUtils.loadJavaType(javaTypeName, loader); + + UnifiedMetaData wsMetaData = opMetaData.getEndpointMetaData().getServiceMetaData().getUnifiedMetaData(); + if (wsMetaData.isEagerInitialized()) + { + // This should not happen, see the warning in setJavaTypeName + javaType = tmpJavaType; + } + } + catch (ClassNotFoundException ex) + { + throw new WSException("Cannot load java type: " + javaTypeName, ex); + } + } + return tmpJavaType; + } + + public ParameterMode getMode() + { + return mode; + } + + public void setMode(String mode) + { + if ("IN".equals(mode)) + setMode(ParameterMode.IN); + else if ("INOUT".equals(mode)) + setMode(ParameterMode.INOUT); + else if ("OUT".equals(mode)) + setMode(ParameterMode.OUT); + else throw new IllegalArgumentException("Invalid mode: " + mode); + } + + public void setMode(ParameterMode mode) + { + this.mode = mode; + } + + public Set<String> getMimeTypes() + { + return mimeTypes; + } + + public void setMimeTypes(String mimeStr) + { + mimeTypes = new HashSet<String>(); + StringTokenizer st = new StringTokenizer(mimeStr, ","); + while (st.hasMoreTokens()) + mimeTypes.add(st.nextToken().trim()); + } + + public boolean isInHeader() + { + return inHeader; + } + + public void setInHeader(boolean inHeader) + { + this.inHeader = inHeader; + } + + public boolean isSwA() + { + return isSwA; + } + + public void setSwA(boolean isSwA) + { + this.isSwA = isSwA; + } + + public boolean isXOP() + { + return isXOP; + } + + public void setXOP(boolean isXOP) + { + this.isXOP = isXOP; + } + + public boolean isSOAPArrayParam() + { + return soapArrayParam; + } + + public void setSOAPArrayParam(boolean soapArrayParam) + { + this.soapArrayParam = soapArrayParam; + } + + public QName getSOAPArrayCompType() + { + return soapArrayCompType; + } + + public void setSOAPArrayCompType(QName xmlType) + { + this.soapArrayCompType = xmlType; + } + + public boolean isMessageType() + { + return messageTypes.contains(javaTypeName); + } + + public static boolean isMessageType(String javaTypeName) + { + return messageTypes.contains(javaTypeName); + } + + /** Converts a proprietary JBossWS attachment xml type to the MIME type that it represents. + */ + private String convertXmlTypeToMimeType(QName xmlType) + { + StringBuilder mimeName = new StringBuilder(xmlType.getLocalPart()); + int pos = mimeName.indexOf("_"); + if (pos == -1) + throw new IllegalArgumentException("Invalid mime type: " + xmlType); + + mimeName.setCharAt(pos, '/'); + return mimeName.toString(); + } + + public int getIndex() + { + return index; + } + + public void setIndex(int index) + { + this.index = index; + } + + public List<WrappedParameter> getWrappedParameters() + { + return wrappedParameters; + } + + public void setWrappedParameters(List<WrappedParameter> wrappedParameters) + { + this.wrappedParameters = wrappedParameters; + } + + public String getPartName() + { + return partName; + } + + public void setPartName(String partName) + { + this.partName = partName; + } + + public void validate() + { + // nothing to do + } + + /** + * @see UnifiedMetaData#eagerInitialize() + */ + public void eagerInitialize() + { + // reset java type + javaType = null; + + if (getOperationMetaData().isDocumentWrapped() && isMessageType() == false) + { + new DynamicWrapperGenerator(getClassLoader()).generate(this); + + // Initialize accessors + AccessorFactory factory = accessorFactoryCreator.create(this); + for (WrappedParameter wrapped : wrappedParameters) + wrapped.setAccessor(factory.create(wrapped)); + } + + javaType = getJavaType(); + if (javaType == null) + throw new WSException("Cannot load java type: " + javaTypeName); + } + + private ClassLoader getClassLoader() + { + ClassLoader loader = opMetaData.getEndpointMetaData().getServiceMetaData().getUnifiedMetaData().getClassLoader(); + if (loader == null) + throw new WSException("ClassLoader not available"); + return loader; + } + + public boolean matchParameter(Method method, Set<Integer> matches, boolean exact) + { + ClassLoader loader = getOperationMetaData().getEndpointMetaData().getClassLoader(); + List<WrappedParameter> wrappedParameters = getWrappedParameters(); + Class wrapperType = getJavaType(); + + // Standard type + if (wrappedParameters == null) + return matchParameter(method, getIndex(), getJavaType(), matches, exact, mode != ParameterMode.IN); + + // Wrapped type + for (WrappedParameter wrapped : wrappedParameters) + { + String typeName = wrapped.getType(); + + try + { + Class type = (typeName != null) ? JavaUtils.loadJavaType(typeName, loader) : ParameterWrapping.getWrappedType(wrapped.getVariable(), wrapperType); + if (type == null) + return false; + if (!matchParameter(method, wrapped.getIndex(), type, matches, exact, wrapped.isHolder())) + return false; + } + catch (Exception ex) + { + log.debug("Invalid wrapper type:" + typeName, ex); + return false; + } + } + + return true; + } + + public void setAccessorFactoryCreator(AccessorFactoryCreator accessorFactoryCreator) + { + this.accessorFactoryCreator = accessorFactoryCreator; + } + + public String toString() + { + boolean isReturn = (opMetaData.getReturnParameter() == this); + StringBuilder buffer = new StringBuilder("\n" + (isReturn ? "ReturnMetaData:" : "ParameterMetaData:")); + buffer.append("\n xmlName=" + getXmlName()); + buffer.append("\n partName=" + getPartName()); + buffer.append("\n xmlType=" + getXmlType()); + buffer.append("\n javaType=" + getJavaTypeName()); + buffer.append("\n mode=" + getMode()); + buffer.append("\n inHeader=" + isInHeader()); + buffer.append("\n index=" + index); + + if (soapArrayParam) + buffer.append("\n soapArrayCompType=" + soapArrayCompType); + + if (isSwA()) + { + buffer.append("\n isSwA=" + isSwA()); + buffer.append("\n mimeTypes=" + getMimeTypes()); + } + + if (wrappedParameters != null) + buffer.append("\n wrappedParameters=" + wrappedParameters); + + if (isXOP()) + { + buffer.append("\n isXOP=" + isXOP()); + buffer.append("\n mimeTypes=" + getMimeTypes()); + } + + return buffer.toString(); + } +} Deleted: branches/tdiesler/trunk/src/main/java/org/jboss/ws/common/umdm/ServerEndpointMetaData.java =================================================================== --- branches/tdiesler/trunk/src/main/java/org/jboss/ws/metadata/umdm/ServerEndpointMetaData.java 2006-12-06 01:04:23 UTC (rev 1563) +++ branches/tdiesler/trunk/src/main/java/org/jboss/ws/common/umdm/ServerEndpointMetaData.java 2006-12-06 01:14:45 UTC (rev 1565) @@ -1,300 +0,0 @@ -/* - * JBoss, Home of Professional Open Source - * Copyright 2005, JBoss Inc., and individual contributors as indicated - * by the @authors tag. See the copyright.txt in the distribution for a - * full listing of individual contributors. - * - * This is free software; you can redistribute it and/or modify it - * under the terms of the GNU Lesser General Public License as - * published by the Free Software Foundation; either version 2.1 of - * the License, or (at your option) any later version. - * - * This software is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * Lesser General Public License for more details. - * - * You should have received a copy of the GNU Lesser General Public - * License along with this software; if not, write to the Free - * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA - * 02110-1301 USA, or see the FSF site: http://www.fsf.org. - */ -package org.jboss.ws.metadata.umdm; - -// $Id$ - -import java.net.MalformedURLException; -import java.net.URL; - -import javax.management.ObjectName; -import javax.xml.namespace.QName; - -import org.jboss.logging.Logger; -import org.jboss.ws.WSException; -import org.jboss.ws.core.server.ServiceEndpoint; -import org.jboss.ws.metadata.config.WSCommonConfig; -import org.jboss.ws.metadata.config.WSConfigFactory; -import org.jboss.ws.metadata.config.jaxrpc.WSConfigRootJAXRPC; -import org.jboss.ws.metadata.config.jaxws.WSConfigRootJAXWS; -import org.jboss.ws.metadata.umdm.HandlerMetaData.HandlerType; - -/** - * Client side endpoint meta data. - * - * @author Thomas.Diesler(a)jboss.org - * @author <a href="mailto:jason.greene@jboss.com">Jason T. Greene</a> - * @since 12-May-2005 - */ -public class ServerEndpointMetaData extends EndpointMetaData -{ - // provide logging - private static Logger log = Logger.getLogger(ServerEndpointMetaData.class); - - public static final String SEPID_DOMAIN = "jboss.ws"; - public static final String SEPID_PROPERTY_CONTEXT = "context"; - public static final String SEPID_PROPERTY_ENDPOINT = "endpoint"; - - // The REQUIRED link name - private String linkName; - // Legacy JSR-109 port component name - private String portComponentName; - // The endpoint implementation bean - private String implName; - // The unique service endpointID - private ObjectName sepID; - // The HTTP context root - private String contextRoot; - // The HTTP virtual hosts - private String[] virtualHosts; - // The HTTP url parttern - private String urlPattern; - // The optional transport guarantee - private String transportGuarantee; - // The bean that registers with the ServiceEndpointManager - private String managedEndpointBean = ServiceEndpoint.class.getName(); - - public ServerEndpointMetaData(ServiceMetaData service, QName qname, QName interfaceQName, Type type) - { - super(service, qname, interfaceQName, type); - } - - public void setConfigName(String configName) - { - super.setConfigName(configName); - endpointConfig = null; - } - - public void setConfigFile(String configFile) - { - super.setConfigFile(configFile); - endpointConfig = null; - } - - public String getLinkName() - { - return linkName; - } - - public void setLinkName(String linkName) - { - this.linkName = linkName; - } - - public String getPortComponentName() - { - return portComponentName; - } - - public void setPortComponentName(String portComponentName) - { - this.portComponentName = portComponentName; - } - - public String getServiceEndpointImplName() - { - return implName; - } - - public void setServiceEndpointImplName(String endpointImpl) - { - this.implName = endpointImpl; - } - - public ObjectName getServiceEndpointID() - { - return sepID; - } - - public void setServiceEndpointID(ObjectName endpointID) - { - this.sepID = endpointID; - } - - public String getContextRoot() - { - return contextRoot; - } - - public void setContextRoot(String contextRoot) - { - if (contextRoot != null && contextRoot.startsWith("/") == false) - throw new IllegalArgumentException("context root should start with '/'"); - - this.contextRoot = contextRoot; - } - - public String[] getVirtualHosts() - { - return virtualHosts; - } - - public void setVirtualHosts(String[] virtualHosts) - { - this.virtualHosts = virtualHosts; - } - - public String getURLPattern() - { - return urlPattern; - } - - public void setURLPattern(String urlPattern) - { - if (urlPattern != null && urlPattern.startsWith("/") == false) - throw new IllegalArgumentException("url pattern should start with '/'"); - - this.urlPattern = urlPattern; - } - - public String getTransportGuarantee() - { - return transportGuarantee; - } - - public void setTransportGuarantee(String transportGuarantee) - { - this.transportGuarantee = transportGuarantee; - } - - public String getManagedEndpointBean() - { - return managedEndpointBean; - } - - public void setManagedEndpointBean(String managedEndpointBean) - { - this.managedEndpointBean = managedEndpointBean; - } - - @Override - public WSCommonConfig getEndpointConfig() - { - if (endpointConfig == null) - { - String configName = getConfigName(); - if (configName == null) - { - configName = "Standard Endpoint"; - setConfigName(configName); - } - - String configFile = getConfigFile(); - if (configFile == null) - { - if (getType() == Type.JAXRPC) - { - configFile = "META-INF/standard-jaxrpc-endpoint-config.xml"; - } - else - { - configFile = "META-INF/standard-jaxws-endpoint-config.xml"; - } - setConfigFile(configFile); - } - - log.debug("getEndpointConfig: [name=" + configName + ",url=" + configFile + "]"); - - URL configURL = null; - try - { - configURL = new URL(configFile); - } - catch (MalformedURLException ex) - { - // ignore - } - - // Try to get the URL as resource - if (configURL == null) - { - ClassLoader cl = Thread.currentThread().getContextClassLoader(); - configURL = cl.getResource(configFile); - if (configURL == null) - throw new WSException("Cannot get resource: " + configFile); - } - - // Get the config root - Object wsConfig; - try - { - WSConfigFactory factory = WSConfigFactory.newInstance(); - wsConfig = factory.parseWithObjectModelFactory(configURL); - } - catch (RuntimeException rte) - { - throw rte; - } - catch (Exception ex) - { - throw new WSException("Cannot parse client config", ex); - } - - // Get the endpoint config - if (wsConfig instanceof WSConfigRootJAXRPC) - { - endpointConfig = ((WSConfigRootJAXRPC)wsConfig).getEndpointConfigByName(configName); - if (endpointConfig == null) - throw new WSException("Cannot obtain endpoint config: " + configName); - } - else - { - endpointConfig = ((WSConfigRootJAXWS)wsConfig).getEndpointConfigByName(configName); - if (endpointConfig == null) - throw new WSException("Cannot obtain endpoint config: " + configName); - } - } - return endpointConfig; - } - - public String toString() - { - StringBuilder buffer = new StringBuilder("\nServerEndpointMetaData:"); - buffer.append("\n type=" + getType()); - buffer.append("\n qname=" + getQName()); - buffer.append("\n id=" + getServiceEndpointID().getCanonicalName()); - buffer.append("\n address=" + getEndpointAddress()); - buffer.append("\n binding=" + getBindingId()); - buffer.append("\n linkName=" + getLinkName()); - buffer.append("\n implName=" + getServiceEndpointImplName()); - buffer.append("\n seiName=" + getServiceEndpointInterfaceName()); - buffer.append("\n serviceMode=" + getServiceMode()); - buffer.append("\n portComponentName=" + getPortComponentName()); - buffer.append("\n contextRoot=" + getContextRoot()); - buffer.append("\n urlPattern=" + getURLPattern()); - buffer.append("\n configFile=" + getConfigFile()); - buffer.append("\n configName=" + getConfigName()); - buffer.append("\n authMethod=" + getAuthMethod()); - buffer.append("\n transportGuarantee=" + getTransportGuarantee()); - buffer.append("\n properties=" + getProperties()); - - for (OperationMetaData opMetaData : getOperations()) - { - buffer.append("\n" + opMetaData); - } - for (HandlerMetaData hdlMetaData : getHandlerMetaData(HandlerType.ALL)) - { - buffer.append("\n" + hdlMetaData); - } - return buffer.toString(); - } -} Copied: branches/tdiesler/trunk/src/main/java/org/jboss/ws/common/umdm/ServerEndpointMetaData.java (from rev 1564, branches/tdiesler/trunk/src/main/java/org/jboss/ws/metadata/umdm/ServerEndpointMetaData.java) =================================================================== --- branches/tdiesler/trunk/src/main/java/org/jboss/ws/metadata/umdm/ServerEndpointMetaData.java 2006-12-06 01:10:43 UTC (rev 1564) +++ branches/tdiesler/trunk/src/main/java/org/jboss/ws/common/umdm/ServerEndpointMetaData.java 2006-12-06 01:14:45 UTC (rev 1565) @@ -0,0 +1,300 @@ +/* + * 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.umdm; + +// $Id$ + +import java.net.MalformedURLException; +import java.net.URL; + +import javax.management.ObjectName; +import javax.xml.namespace.QName; + +import org.jboss.logging.Logger; +import org.jboss.ws.common.WSException; +import org.jboss.ws.common.umdm.HandlerMetaData.HandlerType; +import org.jboss.ws.core.server.ServiceEndpoint; +import org.jboss.ws.metadata.config.WSCommonConfig; +import org.jboss.ws.metadata.config.WSConfigFactory; +import org.jboss.ws.metadata.config.jaxrpc.WSConfigRootJAXRPC; +import org.jboss.ws.metadata.config.jaxws.WSConfigRootJAXWS; + +/** + * Client side endpoint meta data. + * + * @author Thomas.Diesler(a)jboss.org + * @author <a href="mailto:jason.greene@jboss.com">Jason T. Greene</a> + * @since 12-May-2005 + */ +public class ServerEndpointMetaData extends EndpointMetaData +{ + // provide logging + private static Logger log = Logger.getLogger(ServerEndpointMetaData.class); + + public static final String SEPID_DOMAIN = "jboss.ws"; + public static final String SEPID_PROPERTY_CONTEXT = "context"; + public static final String SEPID_PROPERTY_ENDPOINT = "endpoint"; + + // The REQUIRED link name + private String linkName; + // Legacy JSR-109 port component name + private String portComponentName; + // The endpoint implementation bean + private String implName; + // The unique service endpointID + private ObjectName sepID; + // The HTTP context root + private String contextRoot; + // The HTTP virtual hosts + private String[] virtualHosts; + // The HTTP url parttern + private String urlPattern; + // The optional transport guarantee + private String transportGuarantee; + // The bean that registers with the ServiceEndpointManager + private String managedEndpointBean = ServiceEndpoint.class.getName(); + + public ServerEndpointMetaData(ServiceMetaData service, QName qname, QName interfaceQName, Type type) + { + super(service, qname, interfaceQName, type); + } + + public void setConfigName(String configName) + { + super.setConfigName(configName); + endpointConfig = null; + } + + public void setConfigFile(String configFile) + { + super.setConfigFile(configFile); + endpointConfig = null; + } + + public String getLinkName() + { + return linkName; + } + + public void setLinkName(String linkName) + { + this.linkName = linkName; + } + + public String getPortComponentName() + { + return portComponentName; + } + + public void setPortComponentName(String portComponentName) + { + this.portComponentName = portComponentName; + } + + public String getServiceEndpointImplName() + { + return implName; + } + + public void setServiceEndpointImplName(String endpointImpl) + { + this.implName = endpointImpl; + } + + public ObjectName getServiceEndpointID() + { + return sepID; + } + + public void setServiceEndpointID(ObjectName endpointID) + { + this.sepID = endpointID; + } + + public String getContextRoot() + { + return contextRoot; + } + + public void setContextRoot(String contextRoot) + { + if (contextRoot != null && contextRoot.startsWith("/") == false) + throw new IllegalArgumentException("context root should start with '/'"); + + this.contextRoot = contextRoot; + } + + public String[] getVirtualHosts() + { + return virtualHosts; + } + + public void setVirtualHosts(String[] virtualHosts) + { + this.virtualHosts = virtualHosts; + } + + public String getURLPattern() + { + return urlPattern; + } + + public void setURLPattern(String urlPattern) + { + if (urlPattern != null && urlPattern.startsWith("/") == false) + throw new IllegalArgumentException("url pattern should start with '/'"); + + this.urlPattern = urlPattern; + } + + public String getTransportGuarantee() + { + return transportGuarantee; + } + + public void setTransportGuarantee(String transportGuarantee) + { + this.transportGuarantee = transportGuarantee; + } + + public String getManagedEndpointBean() + { + return managedEndpointBean; + } + + public void setManagedEndpointBean(String managedEndpointBean) + { + this.managedEndpointBean = managedEndpointBean; + } + + @Override + public WSCommonConfig getEndpointConfig() + { + if (endpointConfig == null) + { + String configName = getConfigName(); + if (configName == null) + { + configName = "Standard Endpoint"; + setConfigName(configName); + } + + String configFile = getConfigFile(); + if (configFile == null) + { + if (getType() == Type.JAXRPC) + { + configFile = "META-INF/standard-jaxrpc-endpoint-config.xml"; + } + else + { + configFile = "META-INF/standard-jaxws-endpoint-config.xml"; + } + setConfigFile(configFile); + } + + log.debug("getEndpointConfig: [name=" + configName + ",url=" + configFile + "]"); + + URL configURL = null; + try + { + configURL = new URL(configFile); + } + catch (MalformedURLException ex) + { + // ignore + } + + // Try to get the URL as resource + if (configURL == null) + { + ClassLoader cl = Thread.currentThread().getContextClassLoader(); + configURL = cl.getResource(configFile); + if (configURL == null) + throw new WSException("Cannot get resource: " + configFile); + } + + // Get the config root + Object wsConfig; + try + { + WSConfigFactory factory = WSConfigFactory.newInstance(); + wsConfig = factory.parseWithObjectModelFactory(configURL); + } + catch (RuntimeException rte) + { + throw rte; + } + catch (Exception ex) + { + throw new WSException("Cannot parse client config", ex); + } + + // Get the endpoint config + if (wsConfig instanceof WSConfigRootJAXRPC) + { + endpointConfig = ((WSConfigRootJAXRPC)wsConfig).getEndpointConfigByName(configName); + if (endpointConfig == null) + throw new WSException("Cannot obtain endpoint config: " + configName); + } + else + { + endpointConfig = ((WSConfigRootJAXWS)wsConfig).getEndpointConfigByName(configName); + if (endpointConfig == null) + throw new WSException("Cannot obtain endpoint config: " + configName); + } + } + return endpointConfig; + } + + public String toString() + { + StringBuilder buffer = new StringBuilder("\nServerEndpointMetaData:"); + buffer.append("\n type=" + getType()); + buffer.append("\n qname=" + getQName()); + buffer.append("\n id=" + getServiceEndpointID().getCanonicalName()); + buffer.append("\n address=" + getEndpointAddress()); + buffer.append("\n binding=" + getBindingId()); + buffer.append("\n linkName=" + getLinkName()); + buffer.append("\n implName=" + getServiceEndpointImplName()); + buffer.append("\n seiName=" + getServiceEndpointInterfaceName()); + buffer.append("\n serviceMode=" + getServiceMode()); + buffer.append("\n portComponentName=" + getPortComponentName()); + buffer.append("\n contextRoot=" + getContextRoot()); + buffer.append("\n urlPattern=" + getURLPattern()); + buffer.append("\n configFile=" + getConfigFile()); + buffer.append("\n configName=" + getConfigName()); + buffer.append("\n authMethod=" + getAuthMethod()); + buffer.append("\n transportGuarantee=" + getTransportGuarantee()); + buffer.append("\n properties=" + getProperties()); + + for (OperationMetaData opMetaData : getOperations()) + { + buffer.append("\n" + opMetaData); + } + for (HandlerMetaData hdlMetaData : getHandlerMetaData(HandlerType.ALL)) + { + buffer.append("\n" + hdlMetaData); + } + return buffer.toString(); + } +} Deleted: branches/tdiesler/trunk/src/main/java/org/jboss/ws/common/umdm/ServiceMetaData.java =================================================================== --- branches/tdiesler/trunk/src/main/java/org/jboss/ws/metadata/umdm/ServiceMetaData.java 2006-12-06 01:04:23 UTC (rev 1563) +++ branches/tdiesler/trunk/src/main/java/org/jboss/ws/common/umdm/ServiceMetaData.java 2006-12-06 01:14:45 UTC (rev 1565) @@ -1,416 +0,0 @@ -/* - * JBoss, Home of Professional Open Source - * Copyright 2005, JBoss Inc., and individual contributors as indicated - * by the @authors tag. See the copyright.txt in the distribution for a - * full listing of individual contributors. - * - * This is free software; you can redistribute it and/or modify it - * under the terms of the GNU Lesser General Public License as - * published by the Free Software Foundation; either version 2.1 of - * the License, or (at your option) any later version. - * - * This software is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * Lesser General Public License for more details. - * - * You should have received a copy of the GNU Lesser General Public - * License along with this software; if not, write to the Free - * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA - * 02110-1301 USA, or see the FSF site: http://www.fsf.org. - */ -package org.jboss.ws.metadata.umdm; - -// $Id$ - -import java.io.IOException; -import java.net.MalformedURLException; -import java.net.URL; -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; -import javax.xml.rpc.encoding.TypeMappingRegistry; - -import org.jboss.logging.Logger; -import org.jboss.ws.WSException; -import org.jboss.ws.core.jbossxb.SchemaBindingBuilder; -import org.jboss.ws.jaxrpc.TypeMappingImpl; -import org.jboss.ws.jaxrpc.TypeMappingRegistryImpl; -import org.jboss.ws.jaxrpc.Use; -import org.jboss.ws.metadata.jaxrpcmapping.JavaWsdlMapping; -import org.jboss.ws.metadata.jaxrpcmapping.JavaWsdlMappingFactory; -import org.jboss.ws.metadata.umdm.HandlerMetaData.HandlerType; -import org.jboss.ws.metadata.wsdl.WSDLDefinitions; -import org.jboss.ws.metadata.wsdl.WSDLDefinitionsFactory; -import org.jboss.ws.metadata.wsdl.WSDLTypes; -import org.jboss.ws.metadata.wsdl.WSDLUtils; -import org.jboss.ws.metadata.wsdl.xmlschema.JBossXSModel; -import org.jboss.ws.metadata.wsse.WSSecurityConfiguration; -import org.jboss.xb.binding.sunday.unmarshalling.SchemaBinding; - -/** - * A Service component describes a set of endpoints. - * - * @author Thomas.Diesler(a)jboss.org - * @since 12-May-2005 - */ -public class ServiceMetaData -{ - // provide logging - private static final Logger log = Logger.getLogger(ServiceMetaData.class); - - // The parent meta data. - private UnifiedMetaData wsMetaData; - - // The service endpoints - private Map<QName, EndpointMetaData> endpoints = new LinkedHashMap<QName, EndpointMetaData>(); - - private QName serviceName; - private String wsdName; - private String wsdlFile; - private String jaxrpcMappingFile; - private String wsdlPublishLocation; - - // The type mapping that is maintained by this service - private TypesMetaData types; - private TypeMappingRegistry tmRegistry = new TypeMappingRegistryImpl(); - private SchemaBinding schemaBinding; - - // Arbitrary properties given by <call-property> - private Properties properties; - - // derived cached encoding style - private Use encStyle; - - // The security configuration - private WSSecurityConfiguration securityConfiguration; - - public ServiceMetaData(UnifiedMetaData wsMetaData, QName serviceName) - { - this.wsMetaData = wsMetaData; - this.serviceName = serviceName; - this.types = new TypesMetaData(this); - } - - public UnifiedMetaData getUnifiedMetaData() - { - return wsMetaData; - } - - public void setServiceName(QName serviceName) - { - this.serviceName = serviceName; - } - - public QName getServiceName() - { - return serviceName; - } - - public String getWebserviceDescriptionName() - { - return wsdName; - } - - public void setWebserviceDescriptionName(String wsdName) - { - this.wsdName = wsdName; - } - - public String getWsdlFile() - { - return wsdlFile; - } - - public void setWsdlFile(String wsdlFile) - { - this.wsdlFile = wsdlFile; - } - - public String getWsdlPublishLocation() - { - return wsdlPublishLocation; - } - - public void setWsdlPublishLocation(String wsdlPublishLocation) - { - this.wsdlPublishLocation = wsdlPublishLocation; - } - - public Properties getProperties() - { - return properties; - } - - public void setProperties(Properties properties) - { - this.properties = properties; - } - - public TypesMetaData getTypesMetaData() - { - return types; - } - - public List<EndpointMetaData> getEndpoints() - { - return new ArrayList<EndpointMetaData>(endpoints.values()); - } - - public EndpointMetaData getEndpoint(QName portName) - { - return endpoints.get(portName); - } - - public EndpointMetaData getEndpointByServiceEndpointInterface(String seiName) - { - EndpointMetaData epMetaData = null; - for (EndpointMetaData epmd : endpoints.values()) - { - if (seiName.equals(epmd.getServiceEndpointInterfaceName())) - { - if (epMetaData != null) - { - // The CTS uses Service.getPort(Class) with multiple endpoints implementing the same SEI - log.warn("Multiple possible endpoints implementing SEI: " + seiName); - } - epMetaData = epmd; - } - } - return epMetaData; - } - - public void addEndpoint(EndpointMetaData epMetaData) - { - QName portName = epMetaData.getQName(); - - // This happends when we have multiple port components in sharing the same wsdl port - // The EndpointMetaData name is the wsdl port, so we cannot have multiple meta data for the same port. - if (endpoints.get(portName) != null) - throw new WSException("EndpointMetaData name must be unique: " + portName); - - endpoints.put(portName, epMetaData); - } - - public String getJaxrpcMappingFile() - { - return jaxrpcMappingFile; - } - - public void setJaxrpcMappingFile(String jaxrpcMappingFile) - { - this.jaxrpcMappingFile = jaxrpcMappingFile; - } - - public JavaWsdlMapping getJavaWsdlMapping() - { - JavaWsdlMapping javaWsdlMapping = (JavaWsdlMapping)wsMetaData.getMappingDefinition(jaxrpcMappingFile); - if (javaWsdlMapping == null && jaxrpcMappingFile != null) - { - URL mappingLocation = null; - try - { - mappingLocation = new URL(jaxrpcMappingFile); - } - catch (MalformedURLException e) - { - // ignore - } - if (mappingLocation == null) - { - mappingLocation = wsMetaData.getClassLoader().getResource(jaxrpcMappingFile); - } - - if (mappingLocation == null) - throw new IllegalArgumentException("Cannot find jaxrpc-mapping.xml in deployment: " + jaxrpcMappingFile); - - try - { - JavaWsdlMappingFactory mappingFactory = JavaWsdlMappingFactory.newInstance(); - javaWsdlMapping = mappingFactory.parse(mappingLocation); - wsMetaData.addMappingDefinition(jaxrpcMappingFile, javaWsdlMapping); - } - catch (IOException e) - { - throw new WSException("Cannot parse jaxrpc-mapping.xml", e); - } - } - return javaWsdlMapping; - } - - /** - * Get the wsdl definition that corresponds to the wsdl-file element. - */ - public WSDLDefinitions getWsdlDefinitions() - { - WSDLDefinitions wsdlDefinitions = (WSDLDefinitions)wsMetaData.getWSDLDefinition(wsdlFile); - if (wsdlDefinitions == null && wsdlFile != null) - { - URL wsdlLocation = getWsdlLocation(); - if (wsdlLocation == null) - throw new IllegalArgumentException("Cannot find wsdl in deployment: " + wsdlFile); - - WSDLDefinitionsFactory factory = WSDLDefinitionsFactory.newInstance(); - wsdlDefinitions = factory.parse(wsdlLocation); - wsMetaData.addWSDLDefinition(wsdlFile, wsdlDefinitions); - } - return wsdlDefinitions; - } - - public URL getWsdlLocation() - { - URL wsdlLocation = null; - if (wsdlFile != null) - { - try - { - wsdlLocation = new URL(wsdlFile); - } - catch (MalformedURLException e) - { - // ignore - } - if (wsdlLocation == null) - { - wsdlLocation = wsMetaData.getClassLoader().getResource(wsdlFile); - } - } - return wsdlLocation; - } - - public TypeMappingImpl getTypeMapping() - { - Use encStyle = getEncodingStyle(); - TypeMappingImpl typeMapping = (TypeMappingImpl)tmRegistry.getTypeMapping(encStyle.toURI()); - if (typeMapping == null) - throw new WSException("No type mapping for encoding style: " + encStyle); - - return typeMapping; - } - - public WSSecurityConfiguration getSecurityConfiguration() - { - return securityConfiguration; - } - - public void setSecurityConfiguration(WSSecurityConfiguration securityConfiguration) - { - this.securityConfiguration = securityConfiguration; - } - - public Use getEncodingStyle() - { - if (encStyle == null) - { - if (endpoints.size() > 0) - { - for (EndpointMetaData epMetaData : endpoints.values()) - { - if (encStyle == null) - { - encStyle = epMetaData.getEncodingStyle(); - } - else if (encStyle.equals(epMetaData.getEncodingStyle()) == false) - { - throw new WSException("Conflicting encoding styles not supported"); - } - } - } - else - { - encStyle = Use.LITERAL; - } - } - return encStyle; - } - - public SchemaBinding getSchemaBinding() - { - JavaWsdlMapping wsdlMapping = getJavaWsdlMapping(); - if (schemaBinding == null && getEncodingStyle() == Use.LITERAL && wsdlMapping != null) - { - JBossXSModel xsModel = types.getSchemaModel(); - SchemaBindingBuilder bindingBuilder = new SchemaBindingBuilder(); - schemaBinding = bindingBuilder.buildSchemaBinding(xsModel, wsdlMapping); - } - return schemaBinding; - } - - public void validate() - { - // Validate that there is at least one handler configured - // if we have a security configuration - if (securityConfiguration != null) - { - int handlerCount = 0; - for (EndpointMetaData epMetaData : endpoints.values()) - { - handlerCount += epMetaData.getHandlerMetaData(HandlerType.ALL).size(); - } - if (handlerCount == 0) - log.warn("WS-Security requires a security handler to be configured"); - } - - // Validate endpoints - for (EndpointMetaData epMetaData : endpoints.values()) - epMetaData.validate(); - } - - /** - * @see UnifiedMetaData#eagerInitialize() - */ - public void eagerInitialize() - { - // Initialize all wsdl definitions and schema objects - WSDLDefinitions definitions = getWsdlDefinitions(); - if (definitions != null) - { - WSDLTypes types = definitions.getWsdlTypes(); - if (types != null) - { - JBossXSModel model = WSDLUtils.getSchemaModel(types); - if (model != null) - model.eagerInitialize(); - } - } - - // Initialize jaxrpc-mapping data - getJavaWsdlMapping(); - - // Initialize endpoints - for (EndpointMetaData epMetaData : endpoints.values()) - epMetaData.eagerInitialize(); - - // Initialize schema binding - getSchemaBinding(); - } - - /** Assert that the given namespace is the WSDL's target namespace */ - public void assertTargetNamespace(String targetNS) - { - if (getServiceName().getNamespaceURI().equals(targetNS) == false) - throw new WSException("Requested namespace is not WSDL target namespace: " + targetNS); - } - - public String toString() - { - StringBuilder buffer = new StringBuilder("\nServiceMetaData:"); - buffer.append("\n qname=" + serviceName); - buffer.append("\n wsdName=" + wsdName); - buffer.append("\n wsdlFile=" + wsdlFile); - buffer.append("\n jaxrpcFile=" + jaxrpcMappingFile); - buffer.append("\n publishLocation=" + wsdlPublishLocation); - buffer.append("\n properties=" + properties); - buffer.append("\n" + types); - buffer.append("\n"); - for (EndpointMetaData epMetaData : endpoints.values()) - { - buffer.append(epMetaData); - } - return buffer.toString(); - } -} Copied: branches/tdiesler/trunk/src/main/java/org/jboss/ws/common/umdm/ServiceMetaData.java (from rev 1564, branches/tdiesler/trunk/src/main/java/org/jboss/ws/metadata/umdm/ServiceMetaData.java) =================================================================== --- branches/tdiesler/trunk/src/main/java/org/jboss/ws/metadata/umdm/ServiceMetaData.java 2006-12-06 01:10:43 UTC (rev 1564) +++ branches/tdiesler/trunk/src/main/java/org/jboss/ws/common/umdm/ServiceMetaData.java 2006-12-06 01:14:45 UTC (rev 1565) @@ -0,0 +1,416 @@ +/* + * 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.umdm; + +// $Id$ + +import java.io.IOException; +import java.net.MalformedURLException; +import java.net.URL; +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; +import javax.xml.rpc.encoding.TypeMappingRegistry; + +import org.jboss.logging.Logger; +import org.jboss.ws.common.WSException; +import org.jboss.ws.common.umdm.HandlerMetaData.HandlerType; +import org.jboss.ws.core.jbossxb.SchemaBindingBuilder; +import org.jboss.ws.jaxrpc.TypeMappingImpl; +import org.jboss.ws.jaxrpc.TypeMappingRegistryImpl; +import org.jboss.ws.jaxrpc.Use; +import org.jboss.ws.metadata.jaxrpcmapping.JavaWsdlMapping; +import org.jboss.ws.metadata.jaxrpcmapping.JavaWsdlMappingFactory; +import org.jboss.ws.metadata.wsdl.WSDLDefinitions; +import org.jboss.ws.metadata.wsdl.WSDLDefinitionsFactory; +import org.jboss.ws.metadata.wsdl.WSDLTypes; +import org.jboss.ws.metadata.wsdl.WSDLUtils; +import org.jboss.ws.metadata.wsdl.xmlschema.JBossXSModel; +import org.jboss.ws.metadata.wsse.WSSecurityConfiguration; +import org.jboss.xb.binding.sunday.unmarshalling.SchemaBinding; + +/** + * A Service component describes a set of endpoints. + * + * @author Thomas.Diesler(a)jboss.org + * @since 12-May-2005 + */ +public class ServiceMetaData +{ + // provide logging + private static final Logger log = Logger.getLogger(ServiceMetaData.class); + + // The parent meta data. + private UnifiedMetaData wsMetaData; + + // The service endpoints + private Map<QName, EndpointMetaData> endpoints = new LinkedHashMap<QName, EndpointMetaData>(); + + private QName serviceName; + private String wsdName; + private String wsdlFile; + private String jaxrpcMappingFile; + private String wsdlPublishLocation; + + // The type mapping that is maintained by this service + private TypesMetaData types; + private TypeMappingRegistry tmRegistry = new TypeMappingRegistryImpl(); + private SchemaBinding schemaBinding; + + // Arbitrary properties given by <call-property> + private Properties properties; + + // derived cached encoding style + private Use encStyle; + + // The security configuration + private WSSecurityConfiguration securityConfiguration; + + public ServiceMetaData(UnifiedMetaData wsMetaData, QName serviceName) + { + this.wsMetaData = wsMetaData; + this.serviceName = serviceName; + this.types = new TypesMetaData(this); + } + + public UnifiedMetaData getUnifiedMetaData() + { + return wsMetaData; + } + + public void setServiceName(QName serviceName) + { + this.serviceName = serviceName; + } + + public QName getServiceName() + { + return serviceName; + } + + public String getWebserviceDescriptionName() + { + return wsdName; + } + + public void setWebserviceDescriptionName(String wsdName) + { + this.wsdName = wsdName; + } + + public String getWsdlFile() + { + return wsdlFile; + } + + public void setWsdlFile(String wsdlFile) + { + this.wsdlFile = wsdlFile; + } + + public String getWsdlPublishLocation() + { + return wsdlPublishLocation; + } + + public void setWsdlPublishLocation(String wsdlPublishLocation) + { + this.wsdlPublishLocation = wsdlPublishLocation; + } + + public Properties getProperties() + { + return properties; + } + + public void setProperties(Properties properties) + { + this.properties = properties; + } + + public TypesMetaData getTypesMetaData() + { + return types; + } + + public List<EndpointMetaData> getEndpoints() + { + return new ArrayList<EndpointMetaData>(endpoints.values()); + } + + public EndpointMetaData getEndpoint(QName portName) + { + return endpoints.get(portName); + } + + public EndpointMetaData getEndpointByServiceEndpointInterface(String seiName) + { + EndpointMetaData epMetaData = null; + for (EndpointMetaData epmd : endpoints.values()) + { + if (seiName.equals(epmd.getServiceEndpointInterfaceName())) + { + if (epMetaData != null) + { + // The CTS uses Service.getPort(Class) with multiple endpoints implementing the same SEI + log.warn("Multiple possible endpoints implementing SEI: " + seiName); + } + epMetaData = epmd; + } + } + return epMetaData; + } + + public void addEndpoint(EndpointMetaData epMetaData) + { + QName portName = epMetaData.getQName(); + + // This happends when we have multiple port components in sharing the same wsdl port + // The EndpointMetaData name is the wsdl port, so we cannot have multiple meta data for the same port. + if (endpoints.get(portName) != null) + throw new WSException("EndpointMetaData name must be unique: " + portName); + + endpoints.put(portName, epMetaData); + } + + public String getJaxrpcMappingFile() + { + return jaxrpcMappingFile; + } + + public void setJaxrpcMappingFile(String jaxrpcMappingFile) + { + this.jaxrpcMappingFile = jaxrpcMappingFile; + } + + public JavaWsdlMapping getJavaWsdlMapping() + { + JavaWsdlMapping javaWsdlMapping = (JavaWsdlMapping)wsMetaData.getMappingDefinition(jaxrpcMappingFile); + if (javaWsdlMapping == null && jaxrpcMappingFile != null) + { + URL mappingLocation = null; + try + { + mappingLocation = new URL(jaxrpcMappingFile); + } + catch (MalformedURLException e) + { + // ignore + } + if (mappingLocation == null) + { + mappingLocation = wsMetaData.getClassLoader().getResource(jaxrpcMappingFile); + } + + if (mappingLocation == null) + throw new IllegalArgumentException("Cannot find jaxrpc-mapping.xml in deployment: " + jaxrpcMappingFile); + + try + { + JavaWsdlMappingFactory mappingFactory = JavaWsdlMappingFactory.newInstance(); + javaWsdlMapping = mappingFactory.parse(mappingLocation); + wsMetaData.addMappingDefinition(jaxrpcMappingFile, javaWsdlMapping); + } + catch (IOException e) + { + throw new WSException("Cannot parse jaxrpc-mapping.xml", e); + } + } + return javaWsdlMapping; + } + + /** + * Get the wsdl definition that corresponds to the wsdl-file element. + */ + public WSDLDefinitions getWsdlDefinitions() + { + WSDLDefinitions wsdlDefinitions = (WSDLDefinitions)wsMetaData.getWSDLDefinition(wsdlFile); + if (wsdlDefinitions == null && wsdlFile != null) + { + URL wsdlLocation = getWsdlLocation(); + if (wsdlLocation == null) + throw new IllegalArgumentException("Cannot find wsdl in deployment: " + wsdlFile); + + WSDLDefinitionsFactory factory = WSDLDefinitionsFactory.newInstance(); + wsdlDefinitions = factory.parse(wsdlLocation); + wsMetaData.addWSDLDefinition(wsdlFile, wsdlDefinitions); + } + return wsdlDefinitions; + } + + public URL getWsdlLocation() + { + URL wsdlLocation = null; + if (wsdlFile != null) + { + try + { + wsdlLocation = new URL(wsdlFile); + } + catch (MalformedURLException e) + { + // ignore + } + if (wsdlLocation == null) + { + wsdlLocation = wsMetaData.getClassLoader().getResource(wsdlFile); + } + } + return wsdlLocation; + } + + public TypeMappingImpl getTypeMapping() + { + Use encStyle = getEncodingStyle(); + TypeMappingImpl typeMapping = (TypeMappingImpl)tmRegistry.getTypeMapping(encStyle.toURI()); + if (typeMapping == null) + throw new WSException("No type mapping for encoding style: " + encStyle); + + return typeMapping; + } + + public WSSecurityConfiguration getSecurityConfiguration() + { + return securityConfiguration; + } + + public void setSecurityConfiguration(WSSecurityConfiguration securityConfiguration) + { + this.securityConfiguration = securityConfiguration; + } + + public Use getEncodingStyle() + { + if (encStyle == null) + { + if (endpoints.size() > 0) + { + for (EndpointMetaData epMetaData : endpoints.values()) + { + if (encStyle == null) + { + encStyle = epMetaData.getEncodingStyle(); + } + else if (encStyle.equals(epMetaData.getEncodingStyle()) == false) + { + throw new WSException("Conflicting encoding styles not supported"); + } + } + } + else + { + encStyle = Use.LITERAL; + } + } + return encStyle; + } + + public SchemaBinding getSchemaBinding() + { + JavaWsdlMapping wsdlMapping = getJavaWsdlMapping(); + if (schemaBinding == null && getEncodingStyle() == Use.LITERAL && wsdlMapping != null) + { + JBossXSModel xsModel = types.getSchemaModel(); + SchemaBindingBuilder bindingBuilder = new SchemaBindingBuilder(); + schemaBinding = bindingBuilder.buildSchemaBinding(xsModel, wsdlMapping); + } + return schemaBinding; + } + + public void validate() + { + // Validate that there is at least one handler configured + // if we have a security configuration + if (securityConfiguration != null) + { + int handlerCount = 0; + for (EndpointMetaData epMetaData : endpoints.values()) + { + handlerCount += epMetaData.getHandlerMetaData(HandlerType.ALL).size(); + } + if (handlerCount == 0) + log.warn("WS-Security requires a security handler to be configured"); + } + + // Validate endpoints + for (EndpointMetaData epMetaData : endpoints.values()) + epMetaData.validate(); + } + + /** + * @see UnifiedMetaData#eagerInitialize() + */ + public void eagerInitialize() + { + // Initialize all wsdl definitions and schema objects + WSDLDefinitions definitions = getWsdlDefinitions(); + if (definitions != null) + { + WSDLTypes types = definitions.getWsdlTypes(); + if (types != null) + { + JBossXSModel model = WSDLUtils.getSchemaModel(types); + if (model != null) + model.eagerInitialize(); + } + } + + // Initialize jaxrpc-mapping data + getJavaWsdlMapping(); + + // Initialize endpoints + for (EndpointMetaData epMetaData : endpoints.values()) + epMetaData.eagerInitialize(); + + // Initialize schema binding + getSchemaBinding(); + } + + /** Assert that the given namespace is the WSDL's target namespace */ + public void assertTargetNamespace(String targetNS) + { + if (getServiceName().getNamespaceURI().equals(targetNS) == false) + throw new WSException("Requested namespace is not WSDL target namespace: " + targetNS); + } + + public String toString() + { + StringBuilder buffer = new StringBuilder("\nServiceMetaData:"); + buffer.append("\n qname=" + serviceName); + buffer.append("\n wsdName=" + wsdName); + buffer.append("\n wsdlFile=" + wsdlFile); + buffer.append("\n jaxrpcFile=" + jaxrpcMappingFile); + buffer.append("\n publishLocation=" + wsdlPublishLocation); + buffer.append("\n properties=" + properties); + buffer.append("\n" + types); + buffer.append("\n"); + for (EndpointMetaData epMetaData : endpoints.values()) + { + buffer.append(epMetaData); + } + return buffer.toString(); + } +} Deleted: branches/tdiesler/trunk/src/main/java/org/jboss/ws/common/umdm/TypeMappingMetaData.java =================================================================== --- branches/tdiesler/trunk/src/main/java/org/jboss/ws/metadata/umdm/TypeMappingMetaData.java 2006-12-06 01:04:23 UTC (rev 1563) +++ branches/tdiesler/trunk/src/main/java/org/jboss/ws/common/umdm/TypeMappingMetaData.java 2006-12-06 01:14:45 UTC (rev 1565) @@ -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.metadata.umdm; - -// $Id$ - -import java.util.Arrays; -import java.util.List; - -import javax.xml.namespace.QName; - - -/** - * Type mapping meta data - * - * @author Thomas.Diesler(a)jboss.org - * @since 12-May-2005 - */ -public class TypeMappingMetaData -{ - // The parent meta data. - private TypesMetaData typesMetaData; - - private QName xmlType; - private String javaTypeName; - private String qnameScope; - - // List of allowed qname scopes - public static final String QNAME_SCOPE_SIMPLE_TYPE = "simpleType"; - public static final String QNAME_SCOPE_COMPLEX_TYPE = "complexType"; - public static final String QNAME_SCOPE_ELEMENT = "element"; - private static List<String> allowedScopes = Arrays.asList(new String[] { QNAME_SCOPE_COMPLEX_TYPE, QNAME_SCOPE_SIMPLE_TYPE, QNAME_SCOPE_ELEMENT }); - - public TypeMappingMetaData(TypesMetaData typesMetaData, QName xmlType, String javaTypeName) - { - if (xmlType == null) - throw new IllegalArgumentException("Invalid null xmlType"); - if (javaTypeName == null) - throw new IllegalArgumentException("Invalid null javaTypeName"); - - this.typesMetaData = typesMetaData; - this.javaTypeName = javaTypeName; - this.xmlType = xmlType; - this.qnameScope = QNAME_SCOPE_COMPLEX_TYPE; - } - - public TypesMetaData getTypesMetaData() - { - return typesMetaData; - } - - public String getJavaTypeName() - { - return javaTypeName; - } - - public QName getXmlType() - { - return xmlType; - } - - public String getQNameScope() - { - return qnameScope; - } - - public void setQNameScope(String qnameScope) - { - if (allowedScopes.contains(qnameScope) == false) - throw new IllegalArgumentException("Invalid qname scope: " + qnameScope); - - this.qnameScope = qnameScope; - } - - public int hashCode() - { - return toString().hashCode(); - } - - public boolean equals(Object obj) - { - if (obj instanceof TypeMappingMetaData == false) return false; - TypeMappingMetaData other = (TypeMappingMetaData)obj; - return toString().equals(other.toString()); - } - - public String toString() - { - return "[" + qnameScope + "=" + xmlType + ",javaType=" + javaTypeName + "]"; - } -} Copied: branches/tdiesler/trunk/src/main/java/org/jboss/ws/common/umdm/TypeMappingMetaData.java (from rev 1564, branches/tdiesler/trunk/src/main/java/org/jboss/ws/metadata/umdm/TypeMappingMetaData.java) =================================================================== --- branches/tdiesler/trunk/src/main/java/org/jboss/ws/metadata/umdm/TypeMappingMetaData.java 2006-12-06 01:10:43 UTC (rev 1564) +++ branches/tdiesler/trunk/src/main/java/org/jboss/ws/common/umdm/TypeMappingMetaData.java 2006-12-06 01:14:45 UTC (rev 1565) @@ -0,0 +1,110 @@ +/* +* 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.umdm; + +// $Id$ + +import java.util.Arrays; +import java.util.List; + +import javax.xml.namespace.QName; + + +/** + * Type mapping meta data + * + * @author Thomas.Diesler(a)jboss.org + * @since 12-May-2005 + */ +public class TypeMappingMetaData +{ + // The parent meta data. + private TypesMetaData typesMetaData; + + private QName xmlType; + private String javaTypeName; + private String qnameScope; + + // List of allowed qname scopes + public static final String QNAME_SCOPE_SIMPLE_TYPE = "simpleType"; + public static final String QNAME_SCOPE_COMPLEX_TYPE = "complexType"; + public static final String QNAME_SCOPE_ELEMENT = "element"; + private static List<String> allowedScopes = Arrays.asList(new String[] { QNAME_SCOPE_COMPLEX_TYPE, QNAME_SCOPE_SIMPLE_TYPE, QNAME_SCOPE_ELEMENT }); + + public TypeMappingMetaData(TypesMetaData typesMetaData, QName xmlType, String javaTypeName) + { + if (xmlType == null) + throw new IllegalArgumentException("Invalid null xmlType"); + if (javaTypeName == null) + throw new IllegalArgumentException("Invalid null javaTypeName"); + + this.typesMetaData = typesMetaData; + this.javaTypeName = javaTypeName; + this.xmlType = xmlType; + this.qnameScope = QNAME_SCOPE_COMPLEX_TYPE; + } + + public TypesMetaData getTypesMetaData() + { + return typesMetaData; + } + + public String getJavaTypeName() + { + return javaTypeName; + } + + public QName getXmlType() + { + return xmlType; + } + + public String getQNameScope() + { + return qnameScope; + } + + public void setQNameScope(String qnameScope) + { + if (allowedScopes.contains(qnameScope) == false) + throw new IllegalArgumentException("Invalid qname scope: " + qnameScope); + + this.qnameScope = qnameScope; + } + + public int hashCode() + { + return toString().hashCode(); + } + + public boolean equals(Object obj) + { + if (obj instanceof TypeMappingMetaData == false) return false; + TypeMappingMetaData other = (TypeMappingMetaData)obj; + return toString().equals(other.toString()); + } + + public String toString() + { + return "[" + qnameScope + "=" + xmlType + ",javaType=" + javaTypeName + "]"; + } +} Deleted: branches/tdiesler/trunk/src/main/java/org/jboss/ws/common/umdm/TypesMetaData.java =================================================================== --- branches/tdiesler/trunk/src/main/java/org/jboss/ws/metadata/umdm/TypesMetaData.java 2006-12-06 01:04:23 UTC (rev 1563) +++ branches/tdiesler/trunk/src/main/java/org/jboss/ws/common/umdm/TypesMetaData.java 2006-12-06 01:14:45 UTC (rev 1565) @@ -1,193 +0,0 @@ -/* -* JBoss, Home of Professional Open Source -* Copyright 2005, JBoss Inc., and individual contributors as indicated -* by the @authors tag. See the copyright.txt in the distribution for a -* full listing of individual contributors. -* -* This is free software; you can redistribute it and/or modify it -* under the terms of the GNU Lesser General Public License as -* published by the Free Software Foundation; either version 2.1 of -* the License, or (at your option) any later version. -* -* This software is distributed in the hope that it will be useful, -* but WITHOUT ANY WARRANTY; without even the implied warranty of -* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU -* Lesser General Public License for more details. -* -* You should have received a copy of the GNU Lesser General Public -* License along with this software; if not, write to the Free -* Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA -* 02110-1301 USA, or see the FSF site: http://www.fsf.org. -*/ -package org.jboss.ws.metadata.umdm; - -// $Id$ - -import java.util.ArrayList; -import java.util.List; - -import javax.xml.namespace.QName; - -import org.apache.xerces.xs.XSSimpleTypeDefinition; -import org.apache.xerces.xs.XSTypeDefinition; -import org.jboss.logging.Logger; -import org.jboss.ws.WSException; -import org.jboss.ws.jaxrpc.LiteralTypeMapping; -import org.jboss.ws.metadata.wsdl.xmlschema.JBossXSModel; - -/** - * Types meta data - * - * @author Thomas.Diesler(a)jboss.org - * @since 12-May-2005 - */ -public class TypesMetaData -{ - // provide logging - private static final Logger log = Logger.getLogger(TypesMetaData.class); - - // The parent meta data. - private ServiceMetaData serviceMetaData; - // The list of type meta data - private List<TypeMappingMetaData> typeList = new ArrayList<TypeMappingMetaData>(); - - private JBossXSModel schemaModel; - - public TypesMetaData(ServiceMetaData serviceMetaData) - { - this.serviceMetaData = serviceMetaData; - } - - public ServiceMetaData getServiceMetaData() - { - return serviceMetaData; - } - - public JBossXSModel getSchemaModel() - { - return schemaModel; - } - - public void setSchemaModel(JBossXSModel model) - { - this.schemaModel = model; - } - - public void addSchemaModel(JBossXSModel model) - { - if (this.schemaModel == null) - { - this.schemaModel = model; - } - else - { - this.schemaModel.merge(model); - } - } - - public List<TypeMappingMetaData> getTypeMappings() - { - return new ArrayList<TypeMappingMetaData>(typeList); - } - - public void addTypeMapping(TypeMappingMetaData tmMetaData) - { - if (typeList.contains(tmMetaData) == false) - { - log.trace("Add type mapping: " + tmMetaData); - typeList.add(tmMetaData); - } - } - - public TypeMappingMetaData getTypeMappingByXMLType(QName xmlType) - { - TypeMappingMetaData tmMetaData = null; - for (TypeMappingMetaData aux : typeList) - { - boolean isElementScope = TypeMappingMetaData.QNAME_SCOPE_ELEMENT.equals(aux.getQNameScope()); - if (aux.getXmlType().equals(xmlType) && isElementScope == false) - { - if (tmMetaData != null) - { - log.error(tmMetaData + "\n" + aux); - throw new WSException("Ambiguous type mappping for: " + xmlType); - } - tmMetaData = aux; - } - } - - if (tmMetaData == null && schemaModel != null) - { - // Simple types are not neccessary mapped in jaxrpc-mapping.xml, lazily add the mapping here - XSTypeDefinition xsType = schemaModel.getTypeDefinition(xmlType.getLocalPart(), xmlType.getNamespaceURI()); - if (xsType instanceof XSSimpleTypeDefinition) - { - XSSimpleTypeDefinition xsSimpleType = (XSSimpleTypeDefinition)xsType; - String javaTypeName = null; - - // <simpleType name="FooStringListType"> - // <list itemType="string"/> - // </simpleType> - if (xsSimpleType.getVariety() == XSSimpleTypeDefinition.VARIETY_LIST) - { - XSSimpleTypeDefinition itemType = xsSimpleType.getItemType(); - QName xmlBaseType = new QName(itemType.getNamespace(), itemType.getName()); - javaTypeName = new LiteralTypeMapping().getJavaTypeName(xmlBaseType); - if (javaTypeName != null) - { - javaTypeName += "[]"; - } - } - - // <simpleType name="FooIType"> - // <restriction base="normalizedString"> - // <pattern value="\d{3}-[A-Z0-9]{5}"/> - // </restriction> - // </simpleType> - XSTypeDefinition xsBaseType = xsType.getBaseType(); - while (javaTypeName == null && xsBaseType != null) - { - QName xmlBaseType = new QName(xsBaseType.getNamespace(), xsBaseType.getName()); - javaTypeName = new LiteralTypeMapping().getJavaTypeName(xmlBaseType); - xsBaseType = xsBaseType.getBaseType(); - } - - if (javaTypeName != null) - { - tmMetaData = new TypeMappingMetaData(this, xmlType, javaTypeName); - tmMetaData.setQNameScope(TypeMappingMetaData.QNAME_SCOPE_SIMPLE_TYPE); - log.debug("Adding a simpleType without jaxrpc-mapping: " + tmMetaData); - addTypeMapping(tmMetaData); - } - else - { - log.warn("Cannot obtain javaTypeName for xmlType: " + xmlType); - } - } - } - - return tmMetaData; - } - - public TypeMappingMetaData getTypeMappingByJavaType(String javaTypeName) - { - TypeMappingMetaData tmMetaData = null; - for (TypeMappingMetaData aux : typeList) - { - if (aux.getJavaTypeName().equals(javaTypeName)) - tmMetaData = aux; - } - return tmMetaData; - } - - public String toString() - { - StringBuilder buffer = new StringBuilder("\nTypesMetaData: "); - for (TypeMappingMetaData tmd : typeList) - { - buffer.append("\n " + tmd); - } - buffer.append("\n" + (schemaModel != null ? schemaModel.serialize() : "<schema/>")); - return buffer.toString(); - } -} Copied: branches/tdiesler/trunk/src/main/java/org/jboss/ws/common/umdm/TypesMetaData.java (from rev 1564, branches/tdiesler/trunk/src/main/java/org/jboss/ws/metadata/umdm/TypesMetaData.java) =================================================================== --- branches/tdiesler/trunk/src/main/java/org/jboss/ws/metadata/umdm/TypesMetaData.java 2006-12-06 01:10:43 UTC (rev 1564) +++ branches/tdiesler/trunk/src/main/java/org/jboss/ws/common/umdm/TypesMetaData.java 2006-12-06 01:14:45 UTC (rev 1565) @@ -0,0 +1,193 @@ +/* +* 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.umdm; + +// $Id$ + +import java.util.ArrayList; +import java.util.List; + +import javax.xml.namespace.QName; + +import org.apache.xerces.xs.XSSimpleTypeDefinition; +import org.apache.xerces.xs.XSTypeDefinition; +import org.jboss.logging.Logger; +import org.jboss.ws.common.WSException; +import org.jboss.ws.jaxrpc.LiteralTypeMapping; +import org.jboss.ws.metadata.wsdl.xmlschema.JBossXSModel; + +/** + * Types meta data + * + * @author Thomas.Diesler(a)jboss.org + * @since 12-May-2005 + */ +public class TypesMetaData +{ + // provide logging + private static final Logger log = Logger.getLogger(TypesMetaData.class); + + // The parent meta data. + private ServiceMetaData serviceMetaData; + // The list of type meta data + private List<TypeMappingMetaData> typeList = new ArrayList<TypeMappingMetaData>(); + + private JBossXSModel schemaModel; + + public TypesMetaData(ServiceMetaData serviceMetaData) + { + this.serviceMetaData = serviceMetaData; + } + + public ServiceMetaData getServiceMetaData() + { + return serviceMetaData; + } + + public JBossXSModel getSchemaModel() + { + return schemaModel; + } + + public void setSchemaModel(JBossXSModel model) + { + this.schemaModel = model; + } + + public void addSchemaModel(JBossXSModel model) + { + if (this.schemaModel == null) + { + this.schemaModel = model; + } + else + { + this.schemaModel.merge(model); + } + } + + public List<TypeMappingMetaData> getTypeMappings() + { + return new ArrayList<TypeMappingMetaData>(typeList); + } + + public void addTypeMapping(TypeMappingMetaData tmMetaData) + { + if (typeList.contains(tmMetaData) == false) + { + log.trace("Add type mapping: " + tmMetaData); + typeList.add(tmMetaData); + } + } + + public TypeMappingMetaData getTypeMappingByXMLType(QName xmlType) + { + TypeMappingMetaData tmMetaData = null; + for (TypeMappingMetaData aux : typeList) + { + boolean isElementScope = TypeMappingMetaData.QNAME_SCOPE_ELEMENT.equals(aux.getQNameScope()); + if (aux.getXmlType().equals(xmlType) && isElementScope == false) + { + if (tmMetaData != null) + { + log.error(tmMetaData + "\n" + aux); + throw new WSException("Ambiguous type mappping for: " + xmlType); + } + tmMetaData = aux; + } + } + + if (tmMetaData == null && schemaModel != null) + { + // Simple types are not neccessary mapped in jaxrpc-mapping.xml, lazily add the mapping here + XSTypeDefinition xsType = schemaModel.getTypeDefinition(xmlType.getLocalPart(), xmlType.getNamespaceURI()); + if (xsType instanceof XSSimpleTypeDefinition) + { + XSSimpleTypeDefinition xsSimpleType = (XSSimpleTypeDefinition)xsType; + String javaTypeName = null; + + // <simpleType name="FooStringListType"> + // <list itemType="string"/> + // </simpleType> + if (xsSimpleType.getVariety() == XSSimpleTypeDefinition.VARIETY_LIST) + { + XSSimpleTypeDefinition itemType = xsSimpleType.getItemType(); + QName xmlBaseType = new QName(itemType.getNamespace(), itemType.getName()); + javaTypeName = new LiteralTypeMapping().getJavaTypeName(xmlBaseType); + if (javaTypeName != null) + { + javaTypeName += "[]"; + } + } + + // <simpleType name="FooIType"> + // <restriction base="normalizedString"> + // <pattern value="\d{3}-[A-Z0-9]{5}"/> + // </restriction> + // </simpleType> + XSTypeDefinition xsBaseType = xsType.getBaseType(); + while (javaTypeName == null && xsBaseType != null) + { + QName xmlBaseType = new QName(xsBaseType.getNamespace(), xsBaseType.getName()); + javaTypeName = new LiteralTypeMapping().getJavaTypeName(xmlBaseType); + xsBaseType = xsBaseType.getBaseType(); + } + + if (javaTypeName != null) + { + tmMetaData = new TypeMappingMetaData(this, xmlType, javaTypeName); + tmMetaData.setQNameScope(TypeMappingMetaData.QNAME_SCOPE_SIMPLE_TYPE); + log.debug("Adding a simpleType without jaxrpc-mapping: " + tmMetaData); + addTypeMapping(tmMetaData); + } + else + { + log.warn("Cannot obtain javaTypeName for xmlType: " + xmlType); + } + } + } + + return tmMetaData; + } + + public TypeMappingMetaData getTypeMappingByJavaType(String javaTypeName) + { + TypeMappingMetaData tmMetaData = null; + for (TypeMappingMetaData aux : typeList) + { + if (aux.getJavaTypeName().equals(javaTypeName)) + tmMetaData = aux; + } + return tmMetaData; + } + + public String toString() + { + StringBuilder buffer = new StringBuilder("\nTypesMetaData: "); + for (TypeMappingMetaData tmd : typeList) + { + buffer.append("\n " + tmd); + } + buffer.append("\n" + (schemaModel != null ? schemaModel.serialize() : "<schema/>")); + return buffer.toString(); + } +} Deleted: branches/tdiesler/trunk/src/main/java/org/jboss/ws/common/umdm/UnifiedMetaData.java =================================================================== --- branches/tdiesler/trunk/src/main/java/org/jboss/ws/metadata/umdm/UnifiedMetaData.java 2006-12-06 01:04:23 UTC (rev 1563) +++ branches/tdiesler/trunk/src/main/java/org/jboss/ws/common/umdm/UnifiedMetaData.java 2006-12-06 01:14:45 UTC (rev 1565) @@ -1,219 +0,0 @@ -/* -* JBoss, Home of Professional Open Source -* Copyright 2005, JBoss Inc., and individual contributors as indicated -* by the @authors tag. See the copyright.txt in the distribution for a -* full listing of individual contributors. -* -* This is free software; you can redistribute it and/or modify it -* under the terms of the GNU Lesser General Public License as -* published by the Free Software Foundation; either version 2.1 of -* the License, or (at your option) any later version. -* -* This software is distributed in the hope that it will be useful, -* but WITHOUT ANY WARRANTY; without even the implied warranty of -* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU -* Lesser General Public License for more details. -* -* You should have received a copy of the GNU Lesser General Public -* License along with this software; if not, write to the Free -* Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA -* 02110-1301 USA, or see the FSF site: http://www.fsf.org. -*/ -package org.jboss.ws.metadata.umdm; - -// $Id$ - -import java.util.ArrayList; -import java.util.HashMap; -import java.util.List; -import java.util.Map; -import java.util.StringTokenizer; - -import org.jboss.logging.Logger; -import org.jboss.ws.core.server.ServiceEndpointManager; -import org.jboss.ws.metadata.jaxrpcmapping.JavaWsdlMapping; -import org.jboss.ws.metadata.wsdl.WSDLDefinitions; - -/** - * The top level meta data. - * - * <h4>Thread safety</h4> - * <p>A <code>UnifiedMetaData</code> instance may be shared accross threads provided that the following conditions are met: - * <ol> - * <li>{@link #eagerInitialize() eagerInitialize()} is called from a single thread on startup</li> - * <li>Multi-thread access is limited to read-only calls</li> - * </ol></p> - * - * @author Thomas.Diesler(a)jboss.org - * @author <a href="mailto:jason.greene@jboss.com">Jason T. Greene</a> - * @since 12-May-2005 - */ -public class UnifiedMetaData -{ - // provide logging - private static Logger log = Logger.getLogger(UnifiedMetaData.class); - - // The canonical deployment name - private String deploymentName; - // The modules class loader - private ClassLoader classLoader; - // The optional security domain - private String securityDomain; - // The implementation version - private static String implementationVersion; - // True if this is a final release - private static boolean isFinalRelease; - // Map<String, WSDLDefinitions> the wsdl-file to the wsdl Document - // Note the same wsdl can be used in multiple webservice descriptions - Map<String, WSDLDefinitions> wsdlMap = new HashMap<String, WSDLDefinitions>(); - // Maps the jaxrpc-mapping-file to {@link JavaWsdlMapping} object - // Note the same jaxrpc-mapping.xml can be used in multiple webservice descriptions - Map<String, JavaWsdlMapping> jaxrpcMap = new HashMap<String, JavaWsdlMapping>(); - // The list of service meta data - private List<ServiceMetaData> services = new ArrayList<ServiceMetaData>(); - // Used by eager initialization - private boolean eagerInitialized; - // Used by validate - private boolean validated; - - public UnifiedMetaData() - { - this.classLoader = Thread.currentThread().getContextClassLoader(); - } - - public ClassLoader getClassLoader() - { - if (classLoader == null) - throw new IllegalStateException ("Class loader not available"); - - return classLoader; - } - - public void setClassLoader(ClassLoader classLoader) - { - this.classLoader = classLoader; - } - - public String getDeploymentName() - { - return deploymentName; - } - - public void setDeploymentName(String deploymentName) - { - this.deploymentName = deploymentName; - } - - public String getSecurityDomain() - { - return securityDomain; - } - - public void setSecurityDomain(String domain) - { - String prefix = "java:/jaas/"; - if (domain != null && domain.startsWith(prefix)) - domain = domain.substring(prefix.length()); - - this.securityDomain = domain; - } - - public List<ServiceMetaData> getServices() - { - return new ArrayList<ServiceMetaData>(services); - } - - public void addService(ServiceMetaData serviceMetaData) - { - services.add(serviceMetaData); - } - - public void addWSDLDefinition(String wsdlFile, WSDLDefinitions wsdlDefinitions) - { - wsdlMap.put(wsdlFile, wsdlDefinitions); - } - - public WSDLDefinitions getWSDLDefinition(String wsdlFile) - { - return wsdlMap.get(wsdlFile); - } - - public void addMappingDefinition(String jaxrpcFile, JavaWsdlMapping javaWsdlMapping) - { - jaxrpcMap.put(jaxrpcFile, javaWsdlMapping); - } - - public JavaWsdlMapping getMappingDefinition(String jaxrpcFile) - { - return jaxrpcMap.get(jaxrpcFile); - } - - public void validate() - { - if (validated == false) - { - for (ServiceMetaData service : services) - { - service.validate(); - } - validated = true; - } - } - - public boolean isEagerInitialized() - { - return eagerInitialized; - } - - /** - * Eagerly initialize all cache values that are normally lazy-loaded. This - * allows for concurrent read-only access to a <code>UnifiedMetaData</code> - * instance. This method, however, must be called from a single thread. - */ - public void eagerInitialize() - { - if (eagerInitialized == false) - { - log.debug("Eagerly initialize the meta data model"); - for (ServiceMetaData service : services) - { - service.eagerInitialize(); - } - eagerInitialized = true; - } - } - - public static String getImplementationVersion() - { - if (implementationVersion == null) - { - implementationVersion = ServiceEndpointManager.class.getPackage().getImplementationVersion(); - if (implementationVersion != null) - isFinalRelease = new StringTokenizer(implementationVersion).nextToken().endsWith(".GA"); - } - return implementationVersion; - } - - public static boolean isFinalRelease() - { - getImplementationVersion(); - return isFinalRelease; - } - - public String toString() - { - StringBuilder buffer = new StringBuilder("\nUnifiedMetaData: "); - buffer.append("\n implementation: " + getImplementationVersion()); - buffer.append("\n deploymentName: " + getDeploymentName()); - buffer.append("\n securityDomain: " + getSecurityDomain()); - //buffer.append("\n resourceLoader: " + resourceLoader); - //buffer.append("\n classLoader: " + classLoader); - buffer.append("\n"); - - for (ServiceMetaData serviceMetaData : services) - { - buffer.append(serviceMetaData); - } - return buffer.toString(); - } -} Copied: branches/tdiesler/trunk/src/main/java/org/jboss/ws/common/umdm/UnifiedMetaData.java (from rev 1564, branches/tdiesler/trunk/src/main/java/org/jboss/ws/metadata/umdm/UnifiedMetaData.java) =================================================================== --- branches/tdiesler/trunk/src/main/java/org/jboss/ws/metadata/umdm/UnifiedMetaData.java 2006-12-06 01:10:43 UTC (rev 1564) +++ branches/tdiesler/trunk/src/main/java/org/jboss/ws/common/umdm/UnifiedMetaData.java 2006-12-06 01:14:45 UTC (rev 1565) @@ -0,0 +1,219 @@ +/* +* 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.umdm; + +// $Id$ + +import java.util.ArrayList; +import java.util.HashMap; +import java.util.List; +import java.util.Map; +import java.util.StringTokenizer; + +import org.jboss.logging.Logger; +import org.jboss.ws.core.server.ServiceEndpointManager; +import org.jboss.ws.metadata.jaxrpcmapping.JavaWsdlMapping; +import org.jboss.ws.metadata.wsdl.WSDLDefinitions; + +/** + * The top level meta data. + * + * <h4>Thread safety</h4> + * <p>A <code>UnifiedMetaData</code> instance may be shared accross threads provided that the following conditions are met: + * <ol> + * <li>{@link #eagerInitialize() eagerInitialize()} is called from a single thread on startup</li> + * <li>Multi-thread access is limited to read-only calls</li> + * </ol></p> + * + * @author Thomas.Diesler(a)jboss.org + * @author <a href="mailto:jason.greene@jboss.com">Jason T. Greene</a> + * @since 12-May-2005 + */ +public class UnifiedMetaData +{ + // provide logging + private static Logger log = Logger.getLogger(UnifiedMetaData.class); + + // The canonical deployment name + private String deploymentName; + // The modules class loader + private ClassLoader classLoader; + // The optional security domain + private String securityDomain; + // The implementation version + private static String implementationVersion; + // True if this is a final release + private static boolean isFinalRelease; + // Map<String, WSDLDefinitions> the wsdl-file to the wsdl Document + // Note the same wsdl can be used in multiple webservice descriptions + Map<String, WSDLDefinitions> wsdlMap = new HashMap<String, WSDLDefinitions>(); + // Maps the jaxrpc-mapping-file to {@link JavaWsdlMapping} object + // Note the same jaxrpc-mapping.xml can be used in multiple webservice descriptions + Map<String, JavaWsdlMapping> jaxrpcMap = new HashMap<String, JavaWsdlMapping>(); + // The list of service meta data + private List<ServiceMetaData> services = new ArrayList<ServiceMetaData>(); + // Used by eager initialization + private boolean eagerInitialized; + // Used by validate + private boolean validated; + + public UnifiedMetaData() + { + this.classLoader = Thread.currentThread().getContextClassLoader(); + } + + public ClassLoader getClassLoader() + { + if (classLoader == null) + throw new IllegalStateException ("Class loader not available"); + + return classLoader; + } + + public void setClassLoader(ClassLoader classLoader) + { + this.classLoader = classLoader; + } + + public String getDeploymentName() + { + return deploymentName; + } + + public void setDeploymentName(String deploymentName) + { + this.deploymentName = deploymentName; + } + + public String getSecurityDomain() + { + return securityDomain; + } + + public void setSecurityDomain(String domain) + { + String prefix = "java:/jaas/"; + if (domain != null && domain.startsWith(prefix)) + domain = domain.substring(prefix.length()); + + this.securityDomain = domain; + } + + public List<ServiceMetaData> getServices() + { + return new ArrayList<ServiceMetaData>(services); + } + + public void addService(ServiceMetaData serviceMetaData) + { + services.add(serviceMetaData); + } + + public void addWSDLDefinition(String wsdlFile, WSDLDefinitions wsdlDefinitions) + { + wsdlMap.put(wsdlFile, wsdlDefinitions); + } + + public WSDLDefinitions getWSDLDefinition(String wsdlFile) + { + return wsdlMap.get(wsdlFile); + } + + public void addMappingDefinition(String jaxrpcFile, JavaWsdlMapping javaWsdlMapping) + { + jaxrpcMap.put(jaxrpcFile, javaWsdlMapping); + } + + public JavaWsdlMapping getMappingDefinition(String jaxrpcFile) + { + return jaxrpcMap.get(jaxrpcFile); + } + + public void validate() + { + if (validated == false) + { + for (ServiceMetaData service : services) + { + service.validate(); + } + validated = true; + } + } + + public boolean isEagerInitialized() + { + return eagerInitialized; + } + + /** + * Eagerly initialize all cache values that are normally lazy-loaded. This + * allows for concurrent read-only access to a <code>UnifiedMetaData</code> + * instance. This method, however, must be called from a single thread. + */ + public void eagerInitialize() + { + if (eagerInitialized == false) + { + log.debug("Eagerly initialize the meta data model"); + for (ServiceMetaData service : services) + { + service.eagerInitialize(); + } + eagerInitialized = true; + } + } + + public static String getImplementationVersion() + { + if (implementationVersion == null) + { + implementationVersion = ServiceEndpointManager.class.getPackage().getImplementationVersion(); + if (implementationVersion != null) + isFinalRelease = new StringTokenizer(implementationVersion).nextToken().endsWith(".GA"); + } + return implementationVersion; + } + + public static boolean isFinalRelease() + { + getImplementationVersion(); + return isFinalRelease; + } + + public String toString() + { + StringBuilder buffer = new StringBuilder("\nUnifiedMetaData: "); + buffer.append("\n implementation: " + getImplementationVersion()); + buffer.append("\n deploymentName: " + getDeploymentName()); + buffer.append("\n securityDomain: " + getSecurityDomain()); + //buffer.append("\n resourceLoader: " + resourceLoader); + //buffer.append("\n classLoader: " + classLoader); + buffer.append("\n"); + + for (ServiceMetaData serviceMetaData : services) + { + buffer.append(serviceMetaData); + } + return buffer.toString(); + } +} Deleted: branches/tdiesler/trunk/src/main/java/org/jboss/ws/common/umdm/WrappedParameter.java =================================================================== --- branches/tdiesler/trunk/src/main/java/org/jboss/ws/metadata/umdm/WrappedParameter.java 2006-12-06 01:04:23 UTC (rev 1563) +++ branches/tdiesler/trunk/src/main/java/org/jboss/ws/common/umdm/WrappedParameter.java 2006-12-06 01:14:45 UTC (rev 1565) @@ -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.metadata.umdm; - -import javax.xml.namespace.QName; - -import org.jboss.ws.common.utils.JavaUtils; - -/** - * WrappedParameter represents a document/literal wrapped parameter. - * - * @author <a href=&quot;jason.greene(a)jboss.com&quot;&gt;Jason T. Greene</a> - * @version $Revision$ - */ -public class WrappedParameter -{ - public static final int RETURN = -1; - private QName name; - private String type; - private String[] typeArguments; - private String variable; - private boolean holder = false; - private int index = -2; - private Accessor accessor; - - public static interface AccessorFactory - { - public Accessor create(WrappedParameter parameter); - } - - public static interface Accessor - { - public void set(Object bean, Object value); - public Object get(Object bean); - } - - public WrappedParameter(QName name, String type, String variable, int index) - { - this.setName(name); - this.setType(type); - this.setVariable(variable); - this.setIndex(index); - } - - public Accessor accessor() - { - return accessor; - } - - public void setName(QName name) - { - this.name = name; - } - - public QName getName() - { - return name; - } - - public void setType(String type) - { - this.type = type; - } - - public String getType() - { - return type; - } - - public void setTypeArguments(String[] typeArguments) - { - this.typeArguments = typeArguments; - } - - public String[] getTypeArguments() - { - return typeArguments; - } - - public void setVariable(String variable) - { - this.variable = variable; - } - - public String getVariable() - { - return variable; - } - - public void setHolder(boolean holder) - { - this.holder = holder; - } - - public boolean isHolder() - { - return holder; - } - - public void setIndex(int index) - { - this.index = index; - } - - public int getIndex() - { - return index; - } - - void setAccessor(Accessor accessor) - { - this.accessor = accessor; - } - - public String toString() - { - return "[name = " + getName() + ", type = " + getType() + ", typeArgs = " + JavaUtils.printArray(getTypeArguments()) + ", variable = " + getVariable() + ", index = " + getIndex() + "]"; - } -} \ No newline at end of file Copied: branches/tdiesler/trunk/src/main/java/org/jboss/ws/common/umdm/WrappedParameter.java (from rev 1564, branches/tdiesler/trunk/src/main/java/org/jboss/ws/metadata/umdm/WrappedParameter.java) =================================================================== --- branches/tdiesler/trunk/src/main/java/org/jboss/ws/metadata/umdm/WrappedParameter.java 2006-12-06 01:10:43 UTC (rev 1564) +++ branches/tdiesler/trunk/src/main/java/org/jboss/ws/common/umdm/WrappedParameter.java 2006-12-06 01:14:45 UTC (rev 1565) @@ -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.umdm; + +import javax.xml.namespace.QName; + +import org.jboss.ws.common.utils.JavaUtils; + +/** + * WrappedParameter represents a document/literal wrapped parameter. + * + * @author <a href=&quot;jason.greene(a)jboss.com&quot;&gt;Jason T. Greene</a> + * @version $Revision$ + */ +public class WrappedParameter +{ + public static final int RETURN = -1; + private QName name; + private String type; + private String[] typeArguments; + private String variable; + private boolean holder = false; + private int index = -2; + private Accessor accessor; + + public static interface AccessorFactory + { + public Accessor create(WrappedParameter parameter); + } + + public static interface Accessor + { + public void set(Object bean, Object value); + public Object get(Object bean); + } + + public WrappedParameter(QName name, String type, String variable, int index) + { + this.setName(name); + this.setType(type); + this.setVariable(variable); + this.setIndex(index); + } + + public Accessor accessor() + { + return accessor; + } + + public void setName(QName name) + { + this.name = name; + } + + public QName getName() + { + return name; + } + + public void setType(String type) + { + this.type = type; + } + + public String getType() + { + return type; + } + + public void setTypeArguments(String[] typeArguments) + { + this.typeArguments = typeArguments; + } + + public String[] getTypeArguments() + { + return typeArguments; + } + + public void setVariable(String variable) + { + this.variable = variable; + } + + public String getVariable() + { + return variable; + } + + public void setHolder(boolean holder) + { + this.holder = holder; + } + + public boolean isHolder() + { + return holder; + } + + public void setIndex(int index) + { + this.index = index; + } + + public int getIndex() + { + return index; + } + + void setAccessor(Accessor accessor) + { + this.accessor = accessor; + } + + public String toString() + { + return "[name = " + getName() + ", type = " + getType() + ", typeArgs = " + JavaUtils.printArray(getTypeArguments()) + ", variable = " + getVariable() + ", index = " + getIndex() + "]"; + } +} \ No newline at end of file Modified: branches/tdiesler/trunk/src/main/java/org/jboss/ws/core/CommonBinding.java =================================================================== --- branches/tdiesler/trunk/src/main/java/org/jboss/ws/core/CommonBinding.java 2006-12-06 01:10:43 UTC (rev 1564) +++ branches/tdiesler/trunk/src/main/java/org/jboss/ws/core/CommonBinding.java 2006-12-06 01:14:45 UTC (rev 1565) @@ -27,10 +27,10 @@ import javax.xml.namespace.QName; +import org.jboss.ws.common.umdm.OperationMetaData; import org.jboss.ws.core.binding.BindingException; import org.jboss.ws.core.binding.EndpointInvocation; import org.jboss.ws.core.binding.UnboundHeader; -import org.jboss.ws.metadata.umdm.OperationMetaData; /** * The base interface for protocol bindings. Modified: branches/tdiesler/trunk/src/main/java/org/jboss/ws/core/CommonBindingProvider.java =================================================================== --- branches/tdiesler/trunk/src/main/java/org/jboss/ws/core/CommonBindingProvider.java 2006-12-06 01:10:43 UTC (rev 1564) +++ branches/tdiesler/trunk/src/main/java/org/jboss/ws/core/CommonBindingProvider.java 2006-12-06 01:14:45 UTC (rev 1565) @@ -24,12 +24,12 @@ // $Id$ import org.jboss.ws.common.WSException; +import org.jboss.ws.common.umdm.EndpointMetaData; +import org.jboss.ws.common.umdm.EndpointMetaData.Type; import org.jboss.ws.core.jaxws.core.SOAP11BindingJAXWS; import org.jboss.ws.core.jaxws.core.SOAP12BindingJAXWS; import org.jboss.ws.jaxrpc.SOAP11BindingJAXRPC; import org.jboss.ws.jaxrpc.SOAP12BindingJAXRPC; -import org.jboss.ws.metadata.umdm.EndpointMetaData; -import org.jboss.ws.metadata.umdm.EndpointMetaData.Type; /** * Provides access to the protocol binding. Modified: branches/tdiesler/trunk/src/main/java/org/jboss/ws/core/CommonClient.java =================================================================== --- branches/tdiesler/trunk/src/main/java/org/jboss/ws/core/CommonClient.java 2006-12-06 01:10:43 UTC (rev 1564) +++ branches/tdiesler/trunk/src/main/java/org/jboss/ws/core/CommonClient.java 2006-12-06 01:14:45 UTC (rev 1565) @@ -37,6 +37,14 @@ import org.jboss.logging.Logger; import org.jboss.ws.common.Constants; import org.jboss.ws.common.WSException; +import org.jboss.ws.common.umdm.ClientEndpointMetaData; +import org.jboss.ws.common.umdm.EndpointMetaData; +import org.jboss.ws.common.umdm.OperationMetaData; +import org.jboss.ws.common.umdm.ParameterMetaData; +import org.jboss.ws.common.umdm.ServiceMetaData; +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.HolderUtils; import org.jboss.ws.core.binding.EndpointInvocation; import org.jboss.ws.core.binding.UnboundHeader; @@ -48,14 +56,6 @@ import org.jboss.ws.jaxrpc.ParameterWrapping; import org.jboss.ws.jaxrpc.Style; import org.jboss.ws.jaxrpc.handler.HandlerChainBaseImpl; -import org.jboss.ws.metadata.umdm.ClientEndpointMetaData; -import org.jboss.ws.metadata.umdm.EndpointMetaData; -import org.jboss.ws.metadata.umdm.OperationMetaData; -import org.jboss.ws.metadata.umdm.ParameterMetaData; -import org.jboss.ws.metadata.umdm.ServiceMetaData; -import org.jboss.ws.metadata.umdm.UnifiedMetaData; -import org.jboss.ws.metadata.umdm.EndpointMetaData.Type; -import org.jboss.ws.metadata.umdm.HandlerMetaData.HandlerType; /** * Provides support for the dynamic invocation of a service endpoint. Modified: branches/tdiesler/trunk/src/main/java/org/jboss/ws/core/CommonMessageContext.java =================================================================== --- branches/tdiesler/trunk/src/main/java/org/jboss/ws/core/CommonMessageContext.java 2006-12-06 01:10:43 UTC (rev 1564) +++ branches/tdiesler/trunk/src/main/java/org/jboss/ws/core/CommonMessageContext.java 2006-12-06 01:14:45 UTC (rev 1565) @@ -29,9 +29,9 @@ import javax.xml.soap.SOAPMessage; +import org.jboss.ws.common.umdm.EndpointMetaData; +import org.jboss.ws.common.umdm.OperationMetaData; import org.jboss.ws.core.binding.SerializationContext; -import org.jboss.ws.metadata.umdm.EndpointMetaData; -import org.jboss.ws.metadata.umdm.OperationMetaData; import org.jboss.xb.binding.NamespaceRegistry; /** 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 01:10:43 UTC (rev 1564) +++ branches/tdiesler/trunk/src/main/java/org/jboss/ws/core/CommonSOAP11Binding.java 2006-12-06 01:14:45 UTC (rev 1565) @@ -28,9 +28,9 @@ import javax.xml.soap.SOAPMessage; import org.jboss.ws.common.Constants; +import org.jboss.ws.common.umdm.OperationMetaData; import org.jboss.ws.core.soap.MessageFactoryImpl; import org.jboss.ws.jaxrpc.Use; -import org.jboss.ws.metadata.umdm.OperationMetaData; /** * The SOAP11Binding Modified: branches/tdiesler/trunk/src/main/java/org/jboss/ws/core/CommonSOAP12Binding.java =================================================================== --- branches/tdiesler/trunk/src/main/java/org/jboss/ws/core/CommonSOAP12Binding.java 2006-12-06 01:10:43 UTC (rev 1564) +++ branches/tdiesler/trunk/src/main/java/org/jboss/ws/core/CommonSOAP12Binding.java 2006-12-06 01:14:45 UTC (rev 1565) @@ -27,8 +27,8 @@ import javax.xml.soap.SOAPMessage; import org.jboss.ws.common.Constants; +import org.jboss.ws.common.umdm.OperationMetaData; import org.jboss.ws.core.soap.MessageFactoryImpl; -import org.jboss.ws.metadata.umdm.OperationMetaData; /** * The SOAP11Binding 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 01:10:43 UTC (rev 1564) +++ branches/tdiesler/trunk/src/main/java/org/jboss/ws/core/CommonSOAPBinding.java 2006-12-06 01:14:45 UTC (rev 1565) @@ -48,6 +48,9 @@ import org.jboss.logging.Logger; import org.jboss.ws.common.Constants; import org.jboss.ws.common.WSException; +import org.jboss.ws.common.umdm.OperationMetaData; +import org.jboss.ws.common.umdm.ParameterMetaData; +import org.jboss.ws.common.umdm.TypesMetaData; import org.jboss.ws.common.utils.DOMUtils; import org.jboss.ws.common.utils.JavaUtils; import org.jboss.ws.common.utils.MimeUtils; @@ -72,9 +75,6 @@ import org.jboss.ws.jaxrpc.StubExt; import org.jboss.ws.jaxrpc.Style; import org.jboss.ws.jaxrpc.Use; -import org.jboss.ws.metadata.umdm.OperationMetaData; -import org.jboss.ws.metadata.umdm.ParameterMetaData; -import org.jboss.ws.metadata.umdm.TypesMetaData; import org.jboss.xb.binding.NamespaceRegistry; import org.w3c.dom.Element; Modified: branches/tdiesler/trunk/src/main/java/org/jboss/ws/core/binding/EndpointInvocation.java =================================================================== --- branches/tdiesler/trunk/src/main/java/org/jboss/ws/core/binding/EndpointInvocation.java 2006-12-06 01:10:43 UTC (rev 1564) +++ branches/tdiesler/trunk/src/main/java/org/jboss/ws/core/binding/EndpointInvocation.java 2006-12-06 01:14:45 UTC (rev 1565) @@ -39,14 +39,14 @@ import org.jboss.logging.Logger; import org.jboss.ws.common.WSException; +import org.jboss.ws.common.umdm.OperationMetaData; +import org.jboss.ws.common.umdm.ParameterMetaData; +import org.jboss.ws.common.umdm.WrappedParameter; import org.jboss.ws.common.utils.HolderUtils; import org.jboss.ws.common.utils.JavaUtils; import org.jboss.ws.common.utils.MimeUtils; import org.jboss.ws.core.soap.SOAPContentElement; import org.jboss.ws.jaxrpc.ParameterWrapping; -import org.jboss.ws.metadata.umdm.OperationMetaData; -import org.jboss.ws.metadata.umdm.ParameterMetaData; -import org.jboss.ws.metadata.umdm.WrappedParameter; /** A web service invocation. * Modified: branches/tdiesler/trunk/src/main/java/org/jboss/ws/core/binding/UnboundHeader.java =================================================================== --- branches/tdiesler/trunk/src/main/java/org/jboss/ws/core/binding/UnboundHeader.java 2006-12-06 01:10:43 UTC (rev 1564) +++ branches/tdiesler/trunk/src/main/java/org/jboss/ws/core/binding/UnboundHeader.java 2006-12-06 01:14:45 UTC (rev 1565) @@ -26,8 +26,8 @@ import javax.xml.namespace.QName; import javax.xml.rpc.ParameterMode; -import org.jboss.ws.metadata.umdm.OperationMetaData; -import org.jboss.ws.metadata.umdm.ParameterMetaData; +import org.jboss.ws.common.umdm.OperationMetaData; +import org.jboss.ws.common.umdm.ParameterMetaData; /** * Represents an unbound SOAPHeaderElement Modified: branches/tdiesler/trunk/src/main/java/org/jboss/ws/core/jaxws/DynamicWrapperGenerator.java =================================================================== --- branches/tdiesler/trunk/src/main/java/org/jboss/ws/core/jaxws/DynamicWrapperGenerator.java 2006-12-06 01:10:43 UTC (rev 1564) +++ branches/tdiesler/trunk/src/main/java/org/jboss/ws/core/jaxws/DynamicWrapperGenerator.java 2006-12-06 01:14:45 UTC (rev 1565) @@ -44,14 +44,14 @@ import org.jboss.logging.Logger; import org.jboss.ws.common.WSException; +import org.jboss.ws.common.umdm.FaultMetaData; +import org.jboss.ws.common.umdm.OperationMetaData; +import org.jboss.ws.common.umdm.ParameterMetaData; +import org.jboss.ws.common.umdm.TypeMappingMetaData; +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.common.utils.JavassistUtils; -import org.jboss.ws.metadata.umdm.FaultMetaData; -import org.jboss.ws.metadata.umdm.OperationMetaData; -import org.jboss.ws.metadata.umdm.ParameterMetaData; -import org.jboss.ws.metadata.umdm.TypeMappingMetaData; -import org.jboss.ws.metadata.umdm.TypesMetaData; -import org.jboss.ws.metadata.umdm.WrappedParameter; public class DynamicWrapperGenerator extends WrapperGenerator { Modified: branches/tdiesler/trunk/src/main/java/org/jboss/ws/core/jaxws/WrapperGenerator.java =================================================================== --- branches/tdiesler/trunk/src/main/java/org/jboss/ws/core/jaxws/WrapperGenerator.java 2006-12-06 01:10:43 UTC (rev 1564) +++ branches/tdiesler/trunk/src/main/java/org/jboss/ws/core/jaxws/WrapperGenerator.java 2006-12-06 01:14:45 UTC (rev 1565) @@ -28,8 +28,8 @@ import java.util.SortedMap; import java.util.TreeMap; -import org.jboss.ws.metadata.umdm.FaultMetaData; -import org.jboss.ws.metadata.umdm.ParameterMetaData; +import org.jboss.ws.common.umdm.FaultMetaData; +import org.jboss.ws.common.umdm.ParameterMetaData; /** Modified: branches/tdiesler/trunk/src/main/java/org/jboss/ws/core/jaxws/client/ClientImpl.java =================================================================== --- branches/tdiesler/trunk/src/main/java/org/jboss/ws/core/jaxws/client/ClientImpl.java 2006-12-06 01:10:43 UTC (rev 1564) +++ branches/tdiesler/trunk/src/main/java/org/jboss/ws/core/jaxws/client/ClientImpl.java 2006-12-06 01:14:45 UTC (rev 1565) @@ -40,6 +40,9 @@ import javax.xml.ws.soap.SOAPFaultException; import org.jboss.logging.Logger; +import org.jboss.ws.common.umdm.EndpointMetaData; +import org.jboss.ws.common.umdm.OperationMetaData; +import org.jboss.ws.common.umdm.HandlerMetaData.HandlerType; import org.jboss.ws.core.CommonBindingProvider; import org.jboss.ws.core.CommonClient; import org.jboss.ws.core.CommonMessageContext; @@ -50,9 +53,6 @@ import org.jboss.ws.core.jaxws.handler.PortInfoImpl; import org.jboss.ws.core.jaxws.handler.SOAPMessageContextJAXWS; import org.jboss.ws.core.soap.MessageContextAssociation; -import org.jboss.ws.metadata.umdm.EndpointMetaData; -import org.jboss.ws.metadata.umdm.OperationMetaData; -import org.jboss.ws.metadata.umdm.HandlerMetaData.HandlerType; /** * Provides support for the dynamic invocation of a service endpoint. Modified: branches/tdiesler/trunk/src/main/java/org/jboss/ws/core/jaxws/client/ClientProxy.java =================================================================== --- branches/tdiesler/trunk/src/main/java/org/jboss/ws/core/jaxws/client/ClientProxy.java 2006-12-06 01:10:43 UTC (rev 1564) +++ branches/tdiesler/trunk/src/main/java/org/jboss/ws/core/jaxws/client/ClientProxy.java 2006-12-06 01:14:45 UTC (rev 1565) @@ -40,9 +40,9 @@ import org.jboss.logging.Logger; import org.jboss.ws.common.Constants; import org.jboss.ws.common.WSException; +import org.jboss.ws.common.umdm.EndpointMetaData; +import org.jboss.ws.common.umdm.OperationMetaData; import org.jboss.ws.common.utils.JavaUtils; -import org.jboss.ws.metadata.umdm.EndpointMetaData; -import org.jboss.ws.metadata.umdm.OperationMetaData; /** * The dynamic proxy that delegates to the underlying client implementation Modified: branches/tdiesler/trunk/src/main/java/org/jboss/ws/core/jaxws/client/DispatchImpl.java =================================================================== --- branches/tdiesler/trunk/src/main/java/org/jboss/ws/core/jaxws/client/DispatchImpl.java 2006-12-06 01:10:43 UTC (rev 1564) +++ branches/tdiesler/trunk/src/main/java/org/jboss/ws/core/jaxws/client/DispatchImpl.java 2006-12-06 01:14:45 UTC (rev 1565) @@ -51,11 +51,11 @@ import javax.xml.ws.Service.Mode; import org.jboss.logging.Logger; +import org.jboss.ws.common.umdm.EndpointMetaData; import org.jboss.ws.common.utils.DOMWriter; import org.jboss.ws.core.jaxws.core.BindingProviderImpl; import org.jboss.ws.core.soap.SOAPBodyImpl; import org.jboss.ws.core.soap.SOAPConnectionImpl; -import org.jboss.ws.metadata.umdm.EndpointMetaData; /** * The Dispatch interface provides support for the dynamic invocation of a service endpoint operations. Modified: branches/tdiesler/trunk/src/main/java/org/jboss/ws/core/jaxws/core/BindingExt.java =================================================================== --- branches/tdiesler/trunk/src/main/java/org/jboss/ws/core/jaxws/core/BindingExt.java 2006-12-06 01:10:43 UTC (rev 1564) +++ branches/tdiesler/trunk/src/main/java/org/jboss/ws/core/jaxws/core/BindingExt.java 2006-12-06 01:14:45 UTC (rev 1565) @@ -26,7 +26,7 @@ import javax.xml.ws.Binding; import javax.xml.ws.handler.Handler; -import org.jboss.ws.metadata.umdm.HandlerMetaData.HandlerType; +import org.jboss.ws.common.umdm.HandlerMetaData.HandlerType; // $Id$ Modified: branches/tdiesler/trunk/src/main/java/org/jboss/ws/core/jaxws/core/BindingImpl.java =================================================================== --- branches/tdiesler/trunk/src/main/java/org/jboss/ws/core/jaxws/core/BindingImpl.java 2006-12-06 01:10:43 UTC (rev 1564) +++ branches/tdiesler/trunk/src/main/java/org/jboss/ws/core/jaxws/core/BindingImpl.java 2006-12-06 01:14:45 UTC (rev 1565) @@ -30,7 +30,7 @@ import javax.xml.ws.handler.Handler; import org.jboss.logging.Logger; -import org.jboss.ws.metadata.umdm.HandlerMetaData.HandlerType; +import org.jboss.ws.common.umdm.HandlerMetaData.HandlerType; /** * The Binding interface is the base interface for JAXWS protocol bindings. Modified: branches/tdiesler/trunk/src/main/java/org/jboss/ws/core/jaxws/core/BindingProviderImpl.java =================================================================== --- branches/tdiesler/trunk/src/main/java/org/jboss/ws/core/jaxws/core/BindingProviderImpl.java 2006-12-06 01:10:43 UTC (rev 1564) +++ branches/tdiesler/trunk/src/main/java/org/jboss/ws/core/jaxws/core/BindingProviderImpl.java 2006-12-06 01:14:45 UTC (rev 1565) @@ -33,9 +33,9 @@ import javax.xml.ws.http.HTTPBinding; import javax.xml.ws.soap.SOAPBinding; +import org.jboss.ws.common.umdm.EndpointMetaData; +import org.jboss.ws.common.umdm.EndpointMetaData.Type; import org.jboss.ws.core.CommonBindingProvider; -import org.jboss.ws.metadata.umdm.EndpointMetaData; -import org.jboss.ws.metadata.umdm.EndpointMetaData.Type; /** * The BindingProvider interface provides access to the protocol binding and associated context objects Modified: branches/tdiesler/trunk/src/main/java/org/jboss/ws/core/jaxws/core/HTTPBindingJAXWS.java =================================================================== --- branches/tdiesler/trunk/src/main/java/org/jboss/ws/core/jaxws/core/HTTPBindingJAXWS.java 2006-12-06 01:10:43 UTC (rev 1564) +++ branches/tdiesler/trunk/src/main/java/org/jboss/ws/core/jaxws/core/HTTPBindingJAXWS.java 2006-12-06 01:14:45 UTC (rev 1565) @@ -31,12 +31,12 @@ import javax.xml.ws.http.HTTPBinding; import org.jboss.util.NotImplementedException; +import org.jboss.ws.common.umdm.OperationMetaData; +import org.jboss.ws.common.umdm.HandlerMetaData.HandlerType; import org.jboss.ws.core.CommonBinding; import org.jboss.ws.core.binding.BindingException; import org.jboss.ws.core.binding.EndpointInvocation; import org.jboss.ws.core.binding.UnboundHeader; -import org.jboss.ws.metadata.umdm.OperationMetaData; -import org.jboss.ws.metadata.umdm.HandlerMetaData.HandlerType; /** * The HTTPBinding interface is an abstraction for the XML/HTTP binding. Modified: branches/tdiesler/trunk/src/main/java/org/jboss/ws/core/jaxws/core/MessageBinding.java =================================================================== --- branches/tdiesler/trunk/src/main/java/org/jboss/ws/core/jaxws/core/MessageBinding.java 2006-12-06 01:10:43 UTC (rev 1564) +++ branches/tdiesler/trunk/src/main/java/org/jboss/ws/core/jaxws/core/MessageBinding.java 2006-12-06 01:14:45 UTC (rev 1565) @@ -33,15 +33,15 @@ import org.jboss.logging.Logger; import org.jboss.util.NotImplementedException; import org.jboss.ws.common.WSException; +import org.jboss.ws.common.umdm.OperationMetaData; +import org.jboss.ws.common.umdm.ParameterMetaData; +import org.jboss.ws.common.umdm.HandlerMetaData.HandlerType; import org.jboss.ws.core.CommonBinding; import org.jboss.ws.core.binding.BindingException; import org.jboss.ws.core.binding.EndpointInvocation; import org.jboss.ws.core.binding.UnboundHeader; import org.jboss.ws.core.jaxws.handler.SOAPMessageContextJAXWS; import org.jboss.ws.core.soap.MessageContextAssociation; -import org.jboss.ws.metadata.umdm.OperationMetaData; -import org.jboss.ws.metadata.umdm.ParameterMetaData; -import org.jboss.ws.metadata.umdm.HandlerMetaData.HandlerType; /** A binding for unprocessed SOAP Messages * Modified: branches/tdiesler/trunk/src/main/java/org/jboss/ws/core/jaxws/core/PayloadBinding.java =================================================================== --- branches/tdiesler/trunk/src/main/java/org/jboss/ws/core/jaxws/core/PayloadBinding.java 2006-12-06 01:10:43 UTC (rev 1564) +++ branches/tdiesler/trunk/src/main/java/org/jboss/ws/core/jaxws/core/PayloadBinding.java 2006-12-06 01:14:45 UTC (rev 1565) @@ -35,6 +35,9 @@ import org.jboss.util.NotImplementedException; import org.jboss.ws.common.Constants; import org.jboss.ws.common.WSException; +import org.jboss.ws.common.umdm.OperationMetaData; +import org.jboss.ws.common.umdm.ParameterMetaData; +import org.jboss.ws.common.umdm.HandlerMetaData.HandlerType; import org.jboss.ws.core.CommonBinding; import org.jboss.ws.core.binding.BindingException; import org.jboss.ws.core.binding.EndpointInvocation; @@ -44,9 +47,6 @@ import org.jboss.ws.core.soap.MessageFactoryImpl; import org.jboss.ws.core.soap.SOAPBodyImpl; import org.jboss.ws.core.soap.SOAPMessageImpl; -import org.jboss.ws.metadata.umdm.OperationMetaData; -import org.jboss.ws.metadata.umdm.ParameterMetaData; -import org.jboss.ws.metadata.umdm.HandlerMetaData.HandlerType; /** A BindingProvider for a JAXWS payload * Modified: branches/tdiesler/trunk/src/main/java/org/jboss/ws/core/jaxws/core/SOAP11BindingJAXWS.java =================================================================== --- branches/tdiesler/trunk/src/main/java/org/jboss/ws/core/jaxws/core/SOAP11BindingJAXWS.java 2006-12-06 01:10:43 UTC (rev 1564) +++ branches/tdiesler/trunk/src/main/java/org/jboss/ws/core/jaxws/core/SOAP11BindingJAXWS.java 2006-12-06 01:14:45 UTC (rev 1565) @@ -33,10 +33,10 @@ import javax.xml.ws.soap.SOAPBinding; import org.jboss.ws.common.Constants; +import org.jboss.ws.common.umdm.OperationMetaData; +import org.jboss.ws.common.umdm.HandlerMetaData.HandlerType; import org.jboss.ws.core.CommonSOAP11Binding; import org.jboss.ws.core.soap.SOAPFaultImpl; -import org.jboss.ws.metadata.umdm.OperationMetaData; -import org.jboss.ws.metadata.umdm.HandlerMetaData.HandlerType; /** * The JAXWS SOAP11Binding Modified: branches/tdiesler/trunk/src/main/java/org/jboss/ws/core/jaxws/core/SOAP12BindingJAXWS.java =================================================================== --- branches/tdiesler/trunk/src/main/java/org/jboss/ws/core/jaxws/core/SOAP12BindingJAXWS.java 2006-12-06 01:10:43 UTC (rev 1564) +++ branches/tdiesler/trunk/src/main/java/org/jboss/ws/core/jaxws/core/SOAP12BindingJAXWS.java 2006-12-06 01:14:45 UTC (rev 1565) @@ -34,10 +34,10 @@ import javax.xml.ws.soap.SOAPBinding; import org.jboss.ws.common.Constants; +import org.jboss.ws.common.umdm.OperationMetaData; +import org.jboss.ws.common.umdm.HandlerMetaData.HandlerType; import org.jboss.ws.core.CommonSOAP12Binding; import org.jboss.ws.core.soap.SOAPFaultImpl; -import org.jboss.ws.metadata.umdm.OperationMetaData; -import org.jboss.ws.metadata.umdm.HandlerMetaData.HandlerType; /** * The SOAP11Binding Modified: branches/tdiesler/trunk/src/main/java/org/jboss/ws/core/jaxws/core/SOAPBindingJAXWS.java =================================================================== --- branches/tdiesler/trunk/src/main/java/org/jboss/ws/core/jaxws/core/SOAPBindingJAXWS.java 2006-12-06 01:10:43 UTC (rev 1564) +++ branches/tdiesler/trunk/src/main/java/org/jboss/ws/core/jaxws/core/SOAPBindingJAXWS.java 2006-12-06 01:14:45 UTC (rev 1565) @@ -32,9 +32,9 @@ import javax.xml.ws.BindingProvider; import org.jboss.logging.Logger; +import org.jboss.ws.common.umdm.OperationMetaData; import org.jboss.ws.core.CommonMessageContext; import org.jboss.ws.core.soap.MessageContextAssociation; -import org.jboss.ws.metadata.umdm.OperationMetaData; /** * The SOAPBinding interface is an abstraction for the SOAP binding. 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 01:10:43 UTC (rev 1564) +++ branches/tdiesler/trunk/src/main/java/org/jboss/ws/core/jaxws/core/SOAPFaultHelperJAXWS.java 2006-12-06 01:14:45 UTC (rev 1565) @@ -39,6 +39,8 @@ import org.jboss.logging.Logger; import org.jboss.ws.common.Constants; +import org.jboss.ws.common.umdm.FaultMetaData; +import org.jboss.ws.common.umdm.OperationMetaData; import org.jboss.ws.common.utils.DOMUtils; import org.jboss.ws.common.utils.DOMWriter; import org.jboss.ws.core.CommonMessageContext; @@ -52,8 +54,6 @@ import org.jboss.ws.jaxrpc.SOAPFaultHelperJAXRPC; import org.jboss.ws.jaxrpc.encoding.DeserializerFactoryBase; import org.jboss.ws.jaxrpc.encoding.SerializerFactoryBase; -import org.jboss.ws.metadata.umdm.FaultMetaData; -import org.jboss.ws.metadata.umdm.OperationMetaData; import org.w3c.dom.Element; /** Modified: branches/tdiesler/trunk/src/main/java/org/jboss/ws/core/jaxws/handler/HandlerChainExecutor.java =================================================================== --- branches/tdiesler/trunk/src/main/java/org/jboss/ws/core/jaxws/handler/HandlerChainExecutor.java 2006-12-06 01:10:43 UTC (rev 1564) +++ branches/tdiesler/trunk/src/main/java/org/jboss/ws/core/jaxws/handler/HandlerChainExecutor.java 2006-12-06 01:14:45 UTC (rev 1565) @@ -34,11 +34,11 @@ import javax.xml.ws.handler.MessageContext; import org.jboss.logging.Logger; +import org.jboss.ws.common.umdm.EndpointMetaData; import org.jboss.ws.common.utils.DOMWriter; import org.jboss.ws.core.CommonMessageContext; import org.jboss.ws.core.soap.SOAPEnvelopeImpl; import org.jboss.ws.jaxrpc.Style; -import org.jboss.ws.metadata.umdm.EndpointMetaData; /** * Executes a list of JAXWS handlers. Modified: branches/tdiesler/trunk/src/main/java/org/jboss/ws/core/jaxws/handler/HandlerDelegateJAXWS.java =================================================================== --- branches/tdiesler/trunk/src/main/java/org/jboss/ws/core/jaxws/handler/HandlerDelegateJAXWS.java 2006-12-06 01:10:43 UTC (rev 1564) +++ branches/tdiesler/trunk/src/main/java/org/jboss/ws/core/jaxws/handler/HandlerDelegateJAXWS.java 2006-12-06 01:14:45 UTC (rev 1565) @@ -31,12 +31,12 @@ import javax.xml.ws.handler.PortInfo; import org.jboss.logging.Logger; +import org.jboss.ws.common.umdm.EndpointMetaData; +import org.jboss.ws.common.umdm.ServerEndpointMetaData; +import org.jboss.ws.common.umdm.HandlerMetaData.HandlerType; import org.jboss.ws.core.server.HandlerDelegate; import org.jboss.ws.core.server.ServiceEndpointInfo; import org.jboss.ws.core.soap.MessageContextAssociation; -import org.jboss.ws.metadata.umdm.EndpointMetaData; -import org.jboss.ws.metadata.umdm.ServerEndpointMetaData; -import org.jboss.ws.metadata.umdm.HandlerMetaData.HandlerType; /** Delegates to JAXWS handlers * Modified: branches/tdiesler/trunk/src/main/java/org/jboss/ws/core/jaxws/handler/HandlerResolverImpl.java =================================================================== --- branches/tdiesler/trunk/src/main/java/org/jboss/ws/core/jaxws/handler/HandlerResolverImpl.java 2006-12-06 01:10:43 UTC (rev 1564) +++ branches/tdiesler/trunk/src/main/java/org/jboss/ws/core/jaxws/handler/HandlerResolverImpl.java 2006-12-06 01:14:45 UTC (rev 1565) @@ -40,12 +40,12 @@ import org.jboss.logging.Logger; import org.jboss.ws.common.WSException; -import org.jboss.ws.metadata.umdm.EndpointMetaData; -import org.jboss.ws.metadata.umdm.HandlerMetaData; -import org.jboss.ws.metadata.umdm.HandlerMetaDataJAXWS; -import org.jboss.ws.metadata.umdm.ServiceMetaData; -import org.jboss.ws.metadata.umdm.UnifiedMetaData; -import org.jboss.ws.metadata.umdm.HandlerMetaData.HandlerType; +import org.jboss.ws.common.umdm.EndpointMetaData; +import org.jboss.ws.common.umdm.HandlerMetaData; +import org.jboss.ws.common.umdm.HandlerMetaDataJAXWS; +import org.jboss.ws.common.umdm.ServiceMetaData; +import org.jboss.ws.common.umdm.UnifiedMetaData; +import org.jboss.ws.common.umdm.HandlerMetaData.HandlerType; /** * HandlerResolver is an interface implemented by an application to get control over Modified: branches/tdiesler/trunk/src/main/java/org/jboss/ws/core/jaxws/handler/MessageContextJAXWS.java =================================================================== --- branches/tdiesler/trunk/src/main/java/org/jboss/ws/core/jaxws/handler/MessageContextJAXWS.java 2006-12-06 01:10:43 UTC (rev 1564) +++ branches/tdiesler/trunk/src/main/java/org/jboss/ws/core/jaxws/handler/MessageContextJAXWS.java 2006-12-06 01:14:45 UTC (rev 1565) @@ -30,11 +30,11 @@ import javax.xml.ws.handler.MessageContext; +import org.jboss.ws.common.umdm.EndpointMetaData; +import org.jboss.ws.common.umdm.ServiceMetaData; import org.jboss.ws.core.CommonMessageContext; import org.jboss.ws.core.binding.SerializationContext; import org.jboss.ws.core.jaxws.SerializationContextJAXWS; -import org.jboss.ws.metadata.umdm.EndpointMetaData; -import org.jboss.ws.metadata.umdm.ServiceMetaData; import org.jboss.xb.binding.NamespaceRegistry; Modified: branches/tdiesler/trunk/src/main/java/org/jboss/ws/core/jaxws/handler/PortInfoImpl.java =================================================================== --- branches/tdiesler/trunk/src/main/java/org/jboss/ws/core/jaxws/handler/PortInfoImpl.java 2006-12-06 01:10:43 UTC (rev 1564) +++ branches/tdiesler/trunk/src/main/java/org/jboss/ws/core/jaxws/handler/PortInfoImpl.java 2006-12-06 01:14:45 UTC (rev 1565) @@ -24,7 +24,7 @@ import javax.xml.namespace.QName; import javax.xml.ws.handler.PortInfo; -import org.jboss.ws.metadata.umdm.EndpointMetaData; +import org.jboss.ws.common.umdm.EndpointMetaData; /** * The PortInfo interface is used by a HandlerResolver to query information about the Modified: branches/tdiesler/trunk/src/main/java/org/jboss/ws/core/jaxws/spi/ServiceDelegateImpl.java =================================================================== --- branches/tdiesler/trunk/src/main/java/org/jboss/ws/core/jaxws/spi/ServiceDelegateImpl.java 2006-12-06 01:10:43 UTC (rev 1564) +++ branches/tdiesler/trunk/src/main/java/org/jboss/ws/core/jaxws/spi/ServiceDelegateImpl.java 2006-12-06 01:14:45 UTC (rev 1565) @@ -44,17 +44,17 @@ import javax.xml.ws.spi.ServiceDelegate; import org.jboss.ws.common.Constants; +import org.jboss.ws.common.umdm.ClientEndpointMetaData; +import org.jboss.ws.common.umdm.EndpointMetaData; +import org.jboss.ws.common.umdm.ServiceMetaData; +import org.jboss.ws.common.umdm.EndpointMetaData.Type; +import org.jboss.ws.common.umdm.HandlerMetaData.HandlerType; import org.jboss.ws.core.jaxws.client.ClientImpl; import org.jboss.ws.core.jaxws.client.ClientProxy; import org.jboss.ws.core.jaxws.client.DispatchImpl; import org.jboss.ws.core.jaxws.handler.HandlerResolverImpl; import org.jboss.ws.metadata.builder.jaxws.JAXWSClientEndpointMetaDataBuilder; import org.jboss.ws.metadata.builder.jaxws.JAXWSClientMetaDataBuilder; -import org.jboss.ws.metadata.umdm.ClientEndpointMetaData; -import org.jboss.ws.metadata.umdm.EndpointMetaData; -import org.jboss.ws.metadata.umdm.ServiceMetaData; -import org.jboss.ws.metadata.umdm.EndpointMetaData.Type; -import org.jboss.ws.metadata.umdm.HandlerMetaData.HandlerType; /** * Service delegates are used internally by Service objects to allow pluggability of JAX-WS implementations. Modified: 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 01:10:43 UTC (rev 1564) +++ branches/tdiesler/trunk/src/main/java/org/jboss/ws/core/jbossxb/JBossXBSupport.java 2006-12-06 01:14:45 UTC (rev 1565) @@ -4,12 +4,12 @@ import javax.xml.namespace.QName; +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.ws.metadata.jaxrpcmapping.JavaWsdlMapping; -import org.jboss.ws.metadata.umdm.EndpointMetaData; -import org.jboss.ws.metadata.umdm.OperationMetaData; -import org.jboss.ws.metadata.umdm.ServiceMetaData; import org.jboss.ws.metadata.wsdl.xmlschema.JBossXSModel; import org.jboss.xb.binding.MarshallingContext; import org.jboss.xb.binding.ObjectLocalMarshaller; Modified: branches/tdiesler/trunk/src/main/java/org/jboss/ws/core/server/AbstractServiceEndpointInvoker.java =================================================================== --- branches/tdiesler/trunk/src/main/java/org/jboss/ws/core/server/AbstractServiceEndpointInvoker.java 2006-12-06 01:10:43 UTC (rev 1564) +++ branches/tdiesler/trunk/src/main/java/org/jboss/ws/core/server/AbstractServiceEndpointInvoker.java 2006-12-06 01:14:45 UTC (rev 1565) @@ -42,6 +42,10 @@ import org.jboss.logging.Logger; import org.jboss.ws.common.Constants; +import org.jboss.ws.common.umdm.EndpointMetaData; +import org.jboss.ws.common.umdm.OperationMetaData; +import org.jboss.ws.common.umdm.ServerEndpointMetaData; +import org.jboss.ws.common.umdm.HandlerMetaData.HandlerType; import org.jboss.ws.common.utils.JavaUtils; import org.jboss.ws.core.CommonBinding; import org.jboss.ws.core.CommonBindingProvider; @@ -54,10 +58,6 @@ import org.jboss.ws.core.soap.SOAPBodyImpl; import org.jboss.ws.core.soap.SOAPMessageImpl; import org.jboss.ws.jaxrpc.handler.HandlerDelegateJAXRPC; -import org.jboss.ws.metadata.umdm.EndpointMetaData; -import org.jboss.ws.metadata.umdm.OperationMetaData; -import org.jboss.ws.metadata.umdm.ServerEndpointMetaData; -import org.jboss.ws.metadata.umdm.HandlerMetaData.HandlerType; /** An implementation handles invocations on the endpoint * Modified: branches/tdiesler/trunk/src/main/java/org/jboss/ws/core/server/AbstractServiceEndpointServlet.java =================================================================== --- branches/tdiesler/trunk/src/main/java/org/jboss/ws/core/server/AbstractServiceEndpointServlet.java 2006-12-06 01:10:43 UTC (rev 1564) +++ branches/tdiesler/trunk/src/main/java/org/jboss/ws/core/server/AbstractServiceEndpointServlet.java 2006-12-06 01:14:45 UTC (rev 1565) @@ -37,8 +37,8 @@ import org.jboss.logging.Logger; import org.jboss.ws.common.WSException; +import org.jboss.ws.common.umdm.ServerEndpointMetaData; import org.jboss.ws.common.utils.ObjectNameFactory; -import org.jboss.ws.metadata.umdm.ServerEndpointMetaData; /** * A servlet that is installed for every web service endpoint. Modified: branches/tdiesler/trunk/src/main/java/org/jboss/ws/core/server/HandlerDelegate.java =================================================================== --- branches/tdiesler/trunk/src/main/java/org/jboss/ws/core/server/HandlerDelegate.java 2006-12-06 01:10:43 UTC (rev 1564) +++ branches/tdiesler/trunk/src/main/java/org/jboss/ws/core/server/HandlerDelegate.java 2006-12-06 01:14:45 UTC (rev 1565) @@ -23,7 +23,7 @@ // $Id$ -import org.jboss.ws.metadata.umdm.HandlerMetaData.HandlerType; +import org.jboss.ws.common.umdm.HandlerMetaData.HandlerType; /** An implementation of handles invocations on the endpoint * Modified: branches/tdiesler/trunk/src/main/java/org/jboss/ws/core/server/ServiceEndpoint.java =================================================================== --- branches/tdiesler/trunk/src/main/java/org/jboss/ws/core/server/ServiceEndpoint.java 2006-12-06 01:10:43 UTC (rev 1564) +++ branches/tdiesler/trunk/src/main/java/org/jboss/ws/core/server/ServiceEndpoint.java 2006-12-06 01:14:45 UTC (rev 1565) @@ -38,6 +38,9 @@ import org.jboss.logging.Logger; import org.jboss.ws.common.Constants; +import org.jboss.ws.common.umdm.EndpointMetaData; +import org.jboss.ws.common.umdm.ServerEndpointMetaData; +import org.jboss.ws.common.umdm.UnifiedMetaData; import org.jboss.ws.common.utils.DOMWriter; import org.jboss.ws.core.CommonBindingProvider; import org.jboss.ws.core.CommonMessageContext; @@ -49,9 +52,6 @@ import org.jboss.ws.core.soap.SOAPElementWriter; import org.jboss.ws.core.soap.SOAPMessageImpl; import org.jboss.ws.extras.xop.XOPContext; -import org.jboss.ws.metadata.umdm.EndpointMetaData; -import org.jboss.ws.metadata.umdm.ServerEndpointMetaData; -import org.jboss.ws.metadata.umdm.UnifiedMetaData; import org.w3c.dom.Document; /** Modified: branches/tdiesler/trunk/src/main/java/org/jboss/ws/core/server/ServiceEndpointDeployer.java =================================================================== --- branches/tdiesler/trunk/src/main/java/org/jboss/ws/core/server/ServiceEndpointDeployer.java 2006-12-06 01:10:43 UTC (rev 1564) +++ branches/tdiesler/trunk/src/main/java/org/jboss/ws/core/server/ServiceEndpointDeployer.java 2006-12-06 01:14:45 UTC (rev 1565) @@ -28,15 +28,15 @@ import org.jboss.logging.Logger; import org.jboss.ws.common.WSException; +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.core.server.UnifiedDeploymentInfo.DeploymentType; import org.jboss.ws.metadata.builder.jaxrpc.JAXRPCDeployment; import org.jboss.ws.metadata.builder.jaxrpc.JAXRPCServerMetaDataBuilder; import org.jboss.ws.metadata.builder.jaxws.JAXWSMetaDataBuilderEJB3; import org.jboss.ws.metadata.builder.jaxws.JAXWSMetaDataBuilderJSE; -import org.jboss.ws.metadata.umdm.EndpointMetaData; -import org.jboss.ws.metadata.umdm.ServerEndpointMetaData; -import org.jboss.ws.metadata.umdm.ServiceMetaData; -import org.jboss.ws.metadata.umdm.UnifiedMetaData; /** * The POJO deployer for web service endpoints. This Deployer is already decoupled from the target 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 01:10:43 UTC (rev 1564) +++ branches/tdiesler/trunk/src/main/java/org/jboss/ws/core/server/ServiceEndpointInfo.java 2006-12-06 01:14:45 UTC (rev 1565) @@ -26,12 +26,12 @@ import javax.management.ObjectName; import org.jboss.ws.common.WSException; +import org.jboss.ws.common.umdm.ServerEndpointMetaData; import org.jboss.ws.core.server.UnifiedDeploymentInfo.DeploymentType; import org.jboss.ws.metadata.j2ee.UnifiedApplicationMetaData; import org.jboss.ws.metadata.j2ee.UnifiedBeanMetaData; import org.jboss.ws.metadata.j2ee.UnifiedMessageDrivenMetaData; import org.jboss.ws.metadata.j2ee.UnifiedSessionMetaData; -import org.jboss.ws.metadata.umdm.ServerEndpointMetaData; /** * This object registered with the EndpointManager service. Modified: branches/tdiesler/trunk/src/main/java/org/jboss/ws/core/server/ServiceEndpointInvokerJSE.java =================================================================== --- branches/tdiesler/trunk/src/main/java/org/jboss/ws/core/server/ServiceEndpointInvokerJSE.java 2006-12-06 01:10:43 UTC (rev 1564) +++ branches/tdiesler/trunk/src/main/java/org/jboss/ws/core/server/ServiceEndpointInvokerJSE.java 2006-12-06 01:14:45 UTC (rev 1565) @@ -32,12 +32,12 @@ import org.jboss.logging.Logger; import org.jboss.ws.common.WSException; +import org.jboss.ws.common.umdm.ServerEndpointMetaData; import org.jboss.ws.core.CommonMessageContext; import org.jboss.ws.core.binding.EndpointInvocation; import org.jboss.ws.core.jaxws.handler.SOAPMessageContextJAXWS; import org.jboss.ws.core.soap.MessageContextAssociation; import org.jboss.ws.jaxrpc.ServletEndpointContextImpl; -import org.jboss.ws.metadata.umdm.ServerEndpointMetaData; /** * Handles invocations on JSE endpoints. 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 01:10:43 UTC (rev 1564) +++ branches/tdiesler/trunk/src/main/java/org/jboss/ws/core/server/ServiceEndpointManager.java 2006-12-06 01:14:45 UTC (rev 1565) @@ -57,6 +57,12 @@ import org.jboss.logging.Logger; import org.jboss.ws.common.WSException; +import org.jboss.ws.common.umdm.EndpointMetaData; +import org.jboss.ws.common.umdm.HandlerMetaData; +import org.jboss.ws.common.umdm.ServerEndpointMetaData; +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; @@ -67,12 +73,6 @@ import org.jboss.ws.extras.addressing.AddressingConstantsImpl; import org.jboss.ws.jaxrpc.handler.MessageContextJAXRPC; import org.jboss.ws.jaxrpc.handler.SOAPMessageContextJAXRPC; -import org.jboss.ws.metadata.umdm.EndpointMetaData; -import org.jboss.ws.metadata.umdm.HandlerMetaData; -import org.jboss.ws.metadata.umdm.ServerEndpointMetaData; -import org.jboss.ws.metadata.umdm.UnifiedMetaData; -import org.jboss.ws.metadata.umdm.EndpointMetaData.Type; -import org.jboss.ws.metadata.umdm.HandlerMetaData.HandlerType; /** * A service that manages JBossWS endpoints. Modified: branches/tdiesler/trunk/src/main/java/org/jboss/ws/core/server/ServiceEndpointManagerMBean.java =================================================================== --- branches/tdiesler/trunk/src/main/java/org/jboss/ws/core/server/ServiceEndpointManagerMBean.java 2006-12-06 01:10:43 UTC (rev 1564) +++ branches/tdiesler/trunk/src/main/java/org/jboss/ws/core/server/ServiceEndpointManagerMBean.java 2006-12-06 01:14:45 UTC (rev 1565) @@ -26,8 +26,8 @@ import javax.management.ObjectName; +import org.jboss.ws.common.umdm.HandlerMetaData; import org.jboss.ws.common.utils.ObjectNameFactory; -import org.jboss.ws.metadata.umdm.HandlerMetaData; /** * MBean interface. 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 01:10:43 UTC (rev 1564) +++ branches/tdiesler/trunk/src/main/java/org/jboss/ws/core/server/WSDLFilePublisher.java 2006-12-06 01:14:45 UTC (rev 1565) @@ -43,10 +43,10 @@ import org.jboss.util.NotImplementedException; import org.jboss.ws.common.Constants; import org.jboss.ws.common.WSException; +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.IOUtils; -import org.jboss.ws.metadata.umdm.ServiceMetaData; -import org.jboss.ws.metadata.umdm.UnifiedMetaData; import org.jboss.ws.metadata.wsdl.WSDLDefinitions; import org.w3c.dom.Document; import org.w3c.dom.Element; Modified: branches/tdiesler/trunk/src/main/java/org/jboss/ws/core/server/WSDLRequestHandler.java =================================================================== --- branches/tdiesler/trunk/src/main/java/org/jboss/ws/core/server/WSDLRequestHandler.java 2006-12-06 01:10:43 UTC (rev 1564) +++ branches/tdiesler/trunk/src/main/java/org/jboss/ws/core/server/WSDLRequestHandler.java 2006-12-06 01:14:45 UTC (rev 1565) @@ -29,8 +29,8 @@ import java.net.URL; import org.jboss.logging.Logger; +import org.jboss.ws.common.umdm.EndpointMetaData; import org.jboss.ws.common.utils.DOMUtils; -import org.jboss.ws.metadata.umdm.EndpointMetaData; import org.w3c.dom.Attr; import org.w3c.dom.Document; import org.w3c.dom.Element; Modified: branches/tdiesler/trunk/src/main/java/org/jboss/ws/core/soap/EndpointInfo.java =================================================================== --- branches/tdiesler/trunk/src/main/java/org/jboss/ws/core/soap/EndpointInfo.java 2006-12-06 01:10:43 UTC (rev 1564) +++ branches/tdiesler/trunk/src/main/java/org/jboss/ws/core/soap/EndpointInfo.java 2006-12-06 01:14:45 UTC (rev 1565) @@ -28,7 +28,7 @@ import java.util.Map; import java.util.Properties; -import org.jboss.ws.metadata.umdm.EndpointMetaData; +import org.jboss.ws.common.umdm.EndpointMetaData; /** A wrapper object that associates the target address with some metadata * 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 01:10:43 UTC (rev 1564) +++ branches/tdiesler/trunk/src/main/java/org/jboss/ws/core/soap/SOAPBodyImpl.java 2006-12-06 01:14:45 UTC (rev 1565) @@ -48,10 +48,10 @@ import org.jboss.logging.Logger; import org.jboss.ws.common.Constants; import org.jboss.ws.common.WSException; +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.CommonMessageContext; -import org.jboss.ws.metadata.umdm.UnifiedMetaData; import org.w3c.dom.DOMException; import org.w3c.dom.Document; import org.w3c.dom.DocumentFragment; 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 01:10:43 UTC (rev 1564) +++ branches/tdiesler/trunk/src/main/java/org/jboss/ws/core/soap/SOAPContentElement.java 2006-12-06 01:14:45 UTC (rev 1565) @@ -26,6 +26,8 @@ import org.jboss.logging.Logger; import org.jboss.ws.common.Constants; import org.jboss.ws.common.WSException; +import org.jboss.ws.common.umdm.ParameterMetaData; +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.common.utils.JavaUtils; @@ -41,8 +43,6 @@ import org.jboss.ws.jaxrpc.encoding.DeserializerFactoryBase; import org.jboss.ws.jaxrpc.encoding.NullValueSerializer; import org.jboss.ws.jaxrpc.encoding.SerializerFactoryBase; -import org.jboss.ws.metadata.umdm.ParameterMetaData; -import org.jboss.ws.metadata.umdm.UnifiedMetaData; import org.w3c.dom.*; import javax.xml.namespace.QName; Modified: branches/tdiesler/trunk/src/main/java/org/jboss/ws/core/soap/SOAPMessageDispatcher.java =================================================================== --- branches/tdiesler/trunk/src/main/java/org/jboss/ws/core/soap/SOAPMessageDispatcher.java 2006-12-06 01:10:43 UTC (rev 1564) +++ branches/tdiesler/trunk/src/main/java/org/jboss/ws/core/soap/SOAPMessageDispatcher.java 2006-12-06 01:14:45 UTC (rev 1565) @@ -35,10 +35,10 @@ import javax.xml.ws.addressing.JAXWSAConstants; import org.jboss.logging.Logger; +import org.jboss.ws.common.umdm.EndpointMetaData; +import org.jboss.ws.common.umdm.OperationMetaData; import org.jboss.ws.core.CommonMessageContext; import org.jboss.ws.jaxrpc.Style; -import org.jboss.ws.metadata.umdm.EndpointMetaData; -import org.jboss.ws.metadata.umdm.OperationMetaData; /** * Derive the operation meta data from incomming SOAP message Modified: branches/tdiesler/trunk/src/main/java/org/jboss/ws/core/soap/SOAPMessageImpl.java =================================================================== --- branches/tdiesler/trunk/src/main/java/org/jboss/ws/core/soap/SOAPMessageImpl.java 2006-12-06 01:10:43 UTC (rev 1564) +++ branches/tdiesler/trunk/src/main/java/org/jboss/ws/core/soap/SOAPMessageImpl.java 2006-12-06 01:14:45 UTC (rev 1565) @@ -41,6 +41,8 @@ import javax.xml.soap.SOAPPart; import org.jboss.ws.common.WSException; +import org.jboss.ws.common.umdm.EndpointMetaData; +import org.jboss.ws.common.umdm.OperationMetaData; import org.jboss.ws.core.soap.attachment.AttachmentPartImpl; import org.jboss.ws.core.soap.attachment.CIDGenerator; import org.jboss.ws.core.soap.attachment.MimeConstants; @@ -48,8 +50,6 @@ import org.jboss.ws.core.soap.attachment.MultipartRelatedSwAEncoder; import org.jboss.ws.core.soap.attachment.MultipartRelatedXOPEncoder; import org.jboss.ws.extras.xop.XOPContext; -import org.jboss.ws.metadata.umdm.EndpointMetaData; -import org.jboss.ws.metadata.umdm.OperationMetaData; /** * The root class for all SOAP messages. As transmitted on the "wire", a SOAP message is an XML document or a Modified: branches/tdiesler/trunk/src/main/java/org/jboss/ws/extras/addressing/jaxrpc/WSAddressingServerHandler.java =================================================================== --- branches/tdiesler/trunk/src/main/java/org/jboss/ws/extras/addressing/jaxrpc/WSAddressingServerHandler.java 2006-12-06 01:10:43 UTC (rev 1564) +++ branches/tdiesler/trunk/src/main/java/org/jboss/ws/extras/addressing/jaxrpc/WSAddressingServerHandler.java 2006-12-06 01:14:45 UTC (rev 1565) @@ -35,10 +35,10 @@ import javax.xml.ws.addressing.soap.SOAPAddressingProperties; import org.jboss.logging.Logger; +import org.jboss.ws.common.umdm.OperationMetaData; import org.jboss.ws.extras.addressing.AddressingConstantsImpl; import org.jboss.ws.extras.addressing.metadata.AddressingOpMetaExt; import org.jboss.ws.jaxrpc.handler.SOAPMessageContextJAXRPC; -import org.jboss.ws.metadata.umdm.OperationMetaData; /** * A server side handler that reads/writes the addressing properties Modified: branches/tdiesler/trunk/src/main/java/org/jboss/ws/extras/addressing/jaxws/WSAddressingServerHandler.java =================================================================== --- branches/tdiesler/trunk/src/main/java/org/jboss/ws/extras/addressing/jaxws/WSAddressingServerHandler.java 2006-12-06 01:10:43 UTC (rev 1564) +++ branches/tdiesler/trunk/src/main/java/org/jboss/ws/extras/addressing/jaxws/WSAddressingServerHandler.java 2006-12-06 01:14:45 UTC (rev 1565) @@ -36,11 +36,11 @@ import javax.xml.ws.handler.soap.SOAPMessageContext; import org.jboss.logging.Logger; +import org.jboss.ws.common.umdm.OperationMetaData; import org.jboss.ws.core.CommonMessageContext; import org.jboss.ws.core.jaxws.handler.GenericSOAPHandler; import org.jboss.ws.extras.addressing.AddressingConstantsImpl; import org.jboss.ws.extras.addressing.metadata.AddressingOpMetaExt; -import org.jboss.ws.metadata.umdm.OperationMetaData; /** * A server side handler that reads/writes the addressing properties Modified: branches/tdiesler/trunk/src/main/java/org/jboss/ws/extras/addressing/metadata/AddressingOpMetaExt.java =================================================================== --- branches/tdiesler/trunk/src/main/java/org/jboss/ws/extras/addressing/metadata/AddressingOpMetaExt.java 2006-12-06 01:10:43 UTC (rev 1564) +++ branches/tdiesler/trunk/src/main/java/org/jboss/ws/extras/addressing/metadata/AddressingOpMetaExt.java 2006-12-06 01:14:45 UTC (rev 1565) @@ -23,7 +23,7 @@ // $Id$ -import org.jboss.ws.metadata.umdm.MetaDataExtension; +import org.jboss.ws.common.umdm.MetaDataExtension; /** * Addressing meta data extensions: Modified: branches/tdiesler/trunk/src/main/java/org/jboss/ws/extras/eventing/deployment/EventingEndpoint.java =================================================================== --- branches/tdiesler/trunk/src/main/java/org/jboss/ws/extras/eventing/deployment/EventingEndpoint.java 2006-12-06 01:10:43 UTC (rev 1564) +++ branches/tdiesler/trunk/src/main/java/org/jboss/ws/extras/eventing/deployment/EventingEndpoint.java 2006-12-06 01:14:45 UTC (rev 1565) @@ -1,13 +1,13 @@ package org.jboss.ws.extras.eventing.deployment; import org.jboss.ws.common.WSException; +import org.jboss.ws.common.umdm.ServerEndpointMetaData; import org.jboss.ws.core.server.ServiceEndpoint; import org.jboss.ws.core.server.ServiceEndpointInfo; import org.jboss.ws.extras.eventing.EventingConstants; import org.jboss.ws.extras.eventing.metadata.EventingEpMetaExt; import org.jboss.ws.extras.eventing.mgmt.SubscriptionManagerFactory; import org.jboss.ws.extras.eventing.mgmt.SubscriptionManagerMBean; -import org.jboss.ws.metadata.umdm.ServerEndpointMetaData; /** * EventingEndpointLifecycle is responsible to create event sources Modified: branches/tdiesler/trunk/src/main/java/org/jboss/ws/extras/eventing/metadata/EventingEpMetaExt.java =================================================================== --- branches/tdiesler/trunk/src/main/java/org/jboss/ws/extras/eventing/metadata/EventingEpMetaExt.java 2006-12-06 01:10:43 UTC (rev 1564) +++ branches/tdiesler/trunk/src/main/java/org/jboss/ws/extras/eventing/metadata/EventingEpMetaExt.java 2006-12-06 01:14:45 UTC (rev 1565) @@ -3,7 +3,7 @@ import java.net.URI; import java.net.URISyntaxException; -import org.jboss.ws.metadata.umdm.MetaDataExtension; +import org.jboss.ws.common.umdm.MetaDataExtension; /** * Eventing specific endpoint meta data extensions. Modified: branches/tdiesler/trunk/src/main/java/org/jboss/ws/extras/security/WSSecurityDispatcher.java =================================================================== --- branches/tdiesler/trunk/src/main/java/org/jboss/ws/extras/security/WSSecurityDispatcher.java 2006-12-06 01:10:43 UTC (rev 1564) +++ branches/tdiesler/trunk/src/main/java/org/jboss/ws/extras/security/WSSecurityDispatcher.java 2006-12-06 01:14:45 UTC (rev 1565) @@ -34,12 +34,12 @@ import org.jboss.logging.Logger; import org.jboss.ws.common.WSException; +import org.jboss.ws.common.umdm.EndpointMetaData; +import org.jboss.ws.common.umdm.OperationMetaData; import org.jboss.ws.common.utils.DOMWriter; import org.jboss.ws.core.CommonMessageContext; import org.jboss.ws.core.soap.SOAPMessageImpl; import org.jboss.ws.jaxrpc.StubExt; -import org.jboss.ws.metadata.umdm.EndpointMetaData; -import org.jboss.ws.metadata.umdm.OperationMetaData; import org.jboss.ws.metadata.wsse.Config; import org.jboss.ws.metadata.wsse.Encrypt; import org.jboss.ws.metadata.wsse.Operation; Modified: branches/tdiesler/trunk/src/main/java/org/jboss/ws/extras/security/jaxrpc/WSSecurityHandler.java =================================================================== --- branches/tdiesler/trunk/src/main/java/org/jboss/ws/extras/security/jaxrpc/WSSecurityHandler.java 2006-12-06 01:10:43 UTC (rev 1564) +++ branches/tdiesler/trunk/src/main/java/org/jboss/ws/extras/security/jaxrpc/WSSecurityHandler.java 2006-12-06 01:14:45 UTC (rev 1565) @@ -29,9 +29,9 @@ import javax.xml.soap.SOAPException; import org.jboss.logging.Logger; +import org.jboss.ws.common.umdm.EndpointMetaData; import org.jboss.ws.extras.security.WSSecurityDispatcher; import org.jboss.ws.jaxrpc.handler.SOAPMessageContextJAXRPC; -import org.jboss.ws.metadata.umdm.EndpointMetaData; import org.jboss.ws.metadata.wsse.WSSecurityConfiguration; /** Modified: branches/tdiesler/trunk/src/main/java/org/jboss/ws/extras/security/jaxws/WSSecurityHandler.java =================================================================== --- branches/tdiesler/trunk/src/main/java/org/jboss/ws/extras/security/jaxws/WSSecurityHandler.java 2006-12-06 01:10:43 UTC (rev 1564) +++ branches/tdiesler/trunk/src/main/java/org/jboss/ws/extras/security/jaxws/WSSecurityHandler.java 2006-12-06 01:14:45 UTC (rev 1565) @@ -27,10 +27,10 @@ import javax.xml.ws.handler.MessageContext; import org.jboss.logging.Logger; +import org.jboss.ws.common.umdm.EndpointMetaData; import org.jboss.ws.core.CommonMessageContext; import org.jboss.ws.core.jaxws.handler.GenericSOAPHandler; import org.jboss.ws.extras.security.WSSecurityDispatcher; -import org.jboss.ws.metadata.umdm.EndpointMetaData; import org.jboss.ws.metadata.wsse.WSSecurityConfiguration; /** Modified: branches/tdiesler/trunk/src/main/java/org/jboss/ws/integration/jboss50/AbstractEJBDeployer.java =================================================================== --- branches/tdiesler/trunk/src/main/java/org/jboss/ws/integration/jboss50/AbstractEJBDeployer.java 2006-12-06 01:10:43 UTC (rev 1564) +++ branches/tdiesler/trunk/src/main/java/org/jboss/ws/integration/jboss50/AbstractEJBDeployer.java 2006-12-06 01:14:45 UTC (rev 1565) @@ -27,8 +27,8 @@ import org.jboss.deployers.spi.DeploymentException; import org.jboss.deployers.spi.deployer.DeploymentUnit; +import org.jboss.ws.common.umdm.UnifiedMetaData; import org.jboss.ws.core.server.UnifiedDeploymentInfo; -import org.jboss.ws.metadata.umdm.UnifiedMetaData; /** * An abstract deployer for EJB Endpoints 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 01:10:43 UTC (rev 1564) +++ branches/tdiesler/trunk/src/main/java/org/jboss/ws/integration/jboss50/JBossServiceEndpointServlet.java 2006-12-06 01:14:45 UTC (rev 1565) @@ -29,12 +29,12 @@ import org.jboss.logging.Logger; import org.jboss.ws.common.WSException; +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.server.AbstractServiceEndpointServlet; import org.jboss.ws.core.server.ServiceEndpoint; import org.jboss.ws.metadata.config.WSCommonConfig; -import org.jboss.ws.metadata.umdm.HandlerMetaData; -import org.jboss.ws.metadata.umdm.ServerEndpointMetaData; -import org.jboss.ws.metadata.umdm.HandlerMetaData.HandlerType; /** * A servlet that is installed for every web service endpoint. 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 01:10:43 UTC (rev 1564) +++ branches/tdiesler/trunk/src/main/java/org/jboss/ws/integration/jboss50/ServiceEndpointGeneratorEJB.java 2006-12-06 01:14:45 UTC (rev 1565) @@ -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.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.jboss.ws.metadata.umdm.EndpointMetaData; -import org.jboss.ws.metadata.umdm.ServerEndpointMetaData; -import org.jboss.ws.metadata.umdm.ServiceMetaData; -import org.jboss.ws.metadata.umdm.UnifiedMetaData; import org.w3c.dom.Element; /** Modified: branches/tdiesler/trunk/src/main/java/org/jboss/ws/integration/jboss50/ServiceEndpointLifecycleDeployer.java =================================================================== --- branches/tdiesler/trunk/src/main/java/org/jboss/ws/integration/jboss50/ServiceEndpointLifecycleDeployer.java 2006-12-06 01:10:43 UTC (rev 1564) +++ branches/tdiesler/trunk/src/main/java/org/jboss/ws/integration/jboss50/ServiceEndpointLifecycleDeployer.java 2006-12-06 01:14:45 UTC (rev 1565) @@ -31,10 +31,10 @@ import org.jboss.kernel.spi.registry.KernelRegistry; import org.jboss.kernel.spi.registry.KernelRegistryEntry; import org.jboss.metadata.WebMetaData; +import org.jboss.ws.common.umdm.UnifiedMetaData; import org.jboss.ws.core.server.KernelLocator; import org.jboss.ws.core.server.ServiceEndpointDeployer; import org.jboss.ws.core.server.UnifiedDeploymentInfo; -import org.jboss.ws.metadata.umdm.UnifiedMetaData; /** * A deployer that starts and stops web service deployments 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 01:10:43 UTC (rev 1564) +++ branches/tdiesler/trunk/src/main/java/org/jboss/ws/integration/jboss50/ServiceRefMetaDataAdaptor.java 2006-12-06 01:14:45 UTC (rev 1565) @@ -33,10 +33,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.umdm.HandlerMetaData.HandlerInitParam; import org.jboss.ws.metadata.j2ee.UnifiedHandlerMetaData; import org.jboss.ws.metadata.j2ee.UnifiedPortComponentRefMetaData; import org.jboss.ws.metadata.j2ee.UnifiedServiceRefMetaData; -import org.jboss.ws.metadata.umdm.HandlerMetaData.HandlerInitParam; /** * Build container independent service ref meta data Modified: branches/tdiesler/trunk/src/main/java/org/jboss/ws/jaxrpc/CallImpl.java =================================================================== --- branches/tdiesler/trunk/src/main/java/org/jboss/ws/jaxrpc/CallImpl.java 2006-12-06 01:10:43 UTC (rev 1564) +++ branches/tdiesler/trunk/src/main/java/org/jboss/ws/jaxrpc/CallImpl.java 2006-12-06 01:14:45 UTC (rev 1565) @@ -46,6 +46,12 @@ import org.jboss.logging.Logger; import org.jboss.ws.common.Constants; +import org.jboss.ws.common.umdm.EndpointMetaData; +import org.jboss.ws.common.umdm.OperationMetaData; +import org.jboss.ws.common.umdm.ParameterMetaData; +import org.jboss.ws.common.umdm.ServiceMetaData; +import org.jboss.ws.common.umdm.TypesMetaData; +import org.jboss.ws.common.umdm.HandlerMetaData.HandlerType; import org.jboss.ws.common.utils.JavaUtils; import org.jboss.ws.core.CommonClient; import org.jboss.ws.core.binding.UnboundHeader; @@ -55,12 +61,6 @@ import org.jboss.ws.extras.xop.XOPContext; import org.jboss.ws.jaxrpc.handler.HandlerChainBaseImpl; import org.jboss.ws.jaxrpc.handler.SOAPMessageContextJAXRPC; -import org.jboss.ws.metadata.umdm.EndpointMetaData; -import org.jboss.ws.metadata.umdm.OperationMetaData; -import org.jboss.ws.metadata.umdm.ParameterMetaData; -import org.jboss.ws.metadata.umdm.ServiceMetaData; -import org.jboss.ws.metadata.umdm.TypesMetaData; -import org.jboss.ws.metadata.umdm.HandlerMetaData.HandlerType; import org.jboss.ws.metadata.wsdl.xmlschema.JBossXSModel; /** Provides support for the dynamic invocation of a service endpoint. Modified: branches/tdiesler/trunk/src/main/java/org/jboss/ws/jaxrpc/CallProxy.java =================================================================== --- branches/tdiesler/trunk/src/main/java/org/jboss/ws/jaxrpc/CallProxy.java 2006-12-06 01:10:43 UTC (rev 1564) +++ branches/tdiesler/trunk/src/main/java/org/jboss/ws/jaxrpc/CallProxy.java 2006-12-06 01:14:45 UTC (rev 1565) @@ -39,9 +39,9 @@ import org.jboss.logging.Logger; import org.jboss.ws.common.WSException; +import org.jboss.ws.common.umdm.EndpointMetaData; +import org.jboss.ws.common.umdm.OperationMetaData; import org.jboss.ws.common.utils.JavaUtils; -import org.jboss.ws.metadata.umdm.EndpointMetaData; -import org.jboss.ws.metadata.umdm.OperationMetaData; /** * The dynamic proxy that delegates to the underlying Call implementation Modified: branches/tdiesler/trunk/src/main/java/org/jboss/ws/jaxrpc/HandlerRegistryImpl.java =================================================================== --- branches/tdiesler/trunk/src/main/java/org/jboss/ws/jaxrpc/HandlerRegistryImpl.java 2006-12-06 01:10:43 UTC (rev 1564) +++ branches/tdiesler/trunk/src/main/java/org/jboss/ws/jaxrpc/HandlerRegistryImpl.java 2006-12-06 01:14:45 UTC (rev 1565) @@ -35,11 +35,11 @@ import javax.xml.rpc.handler.HandlerRegistry; import org.jboss.logging.Logger; +import org.jboss.ws.common.umdm.EndpointMetaData; +import org.jboss.ws.common.umdm.HandlerMetaDataJAXRPC; +import org.jboss.ws.common.umdm.ServiceMetaData; +import org.jboss.ws.common.umdm.HandlerMetaData.HandlerType; import org.jboss.ws.jaxrpc.handler.ClientHandlerChain; -import org.jboss.ws.metadata.umdm.EndpointMetaData; -import org.jboss.ws.metadata.umdm.HandlerMetaDataJAXRPC; -import org.jboss.ws.metadata.umdm.ServiceMetaData; -import org.jboss.ws.metadata.umdm.HandlerMetaData.HandlerType; /** * Provides support for the programmatic configuration of Modified: branches/tdiesler/trunk/src/main/java/org/jboss/ws/jaxrpc/ParameterWrapping.java =================================================================== --- branches/tdiesler/trunk/src/main/java/org/jboss/ws/jaxrpc/ParameterWrapping.java 2006-12-06 01:10:43 UTC (rev 1564) +++ branches/tdiesler/trunk/src/main/java/org/jboss/ws/jaxrpc/ParameterWrapping.java 2006-12-06 01:14:45 UTC (rev 1565) @@ -41,17 +41,17 @@ import org.jboss.logging.Logger; import org.jboss.ws.common.WSException; +import org.jboss.ws.common.umdm.EndpointMetaData; +import org.jboss.ws.common.umdm.OperationMetaData; +import org.jboss.ws.common.umdm.ParameterMetaData; +import org.jboss.ws.common.umdm.ServiceMetaData; +import org.jboss.ws.common.umdm.TypeMappingMetaData; +import org.jboss.ws.common.umdm.TypesMetaData; +import org.jboss.ws.common.umdm.WrappedParameter; import org.jboss.ws.common.utils.HolderUtils; import org.jboss.ws.common.utils.JavaUtils; import org.jboss.ws.core.jbossxb.JBossXBDeserializerFactory; import org.jboss.ws.core.jbossxb.JBossXBSerializerFactory; -import org.jboss.ws.metadata.umdm.EndpointMetaData; -import org.jboss.ws.metadata.umdm.OperationMetaData; -import org.jboss.ws.metadata.umdm.ParameterMetaData; -import org.jboss.ws.metadata.umdm.ServiceMetaData; -import org.jboss.ws.metadata.umdm.TypeMappingMetaData; -import org.jboss.ws.metadata.umdm.TypesMetaData; -import org.jboss.ws.metadata.umdm.WrappedParameter; /** A helper class to wrap/unwrap ducument style request/response structures. * Modified: branches/tdiesler/trunk/src/main/java/org/jboss/ws/jaxrpc/SOAP11BindingJAXRPC.java =================================================================== --- branches/tdiesler/trunk/src/main/java/org/jboss/ws/jaxrpc/SOAP11BindingJAXRPC.java 2006-12-06 01:10:43 UTC (rev 1564) +++ branches/tdiesler/trunk/src/main/java/org/jboss/ws/jaxrpc/SOAP11BindingJAXRPC.java 2006-12-06 01:14:45 UTC (rev 1565) @@ -25,9 +25,9 @@ import javax.xml.soap.SOAPMessage; +import org.jboss.ws.common.umdm.OperationMetaData; import org.jboss.ws.core.CommonSOAP11Binding; import org.jboss.ws.core.soap.SOAPFaultImpl; -import org.jboss.ws.metadata.umdm.OperationMetaData; /** * The JAXRPC SOAP11Binding Modified: branches/tdiesler/trunk/src/main/java/org/jboss/ws/jaxrpc/SOAP12BindingJAXRPC.java =================================================================== --- branches/tdiesler/trunk/src/main/java/org/jboss/ws/jaxrpc/SOAP12BindingJAXRPC.java 2006-12-06 01:10:43 UTC (rev 1564) +++ branches/tdiesler/trunk/src/main/java/org/jboss/ws/jaxrpc/SOAP12BindingJAXRPC.java 2006-12-06 01:14:45 UTC (rev 1565) @@ -25,9 +25,9 @@ import javax.xml.soap.SOAPMessage; +import org.jboss.ws.common.umdm.OperationMetaData; import org.jboss.ws.core.CommonSOAP12Binding; import org.jboss.ws.core.soap.SOAPFaultImpl; -import org.jboss.ws.metadata.umdm.OperationMetaData; /** * The JAXRPC SOAP12Binding Modified: branches/tdiesler/trunk/src/main/java/org/jboss/ws/jaxrpc/SOAPBindingJAXRPC.java =================================================================== --- branches/tdiesler/trunk/src/main/java/org/jboss/ws/jaxrpc/SOAPBindingJAXRPC.java 2006-12-06 01:10:43 UTC (rev 1564) +++ branches/tdiesler/trunk/src/main/java/org/jboss/ws/jaxrpc/SOAPBindingJAXRPC.java 2006-12-06 01:14:45 UTC (rev 1565) @@ -28,9 +28,9 @@ import javax.xml.soap.SOAPMessage; import org.jboss.logging.Logger; +import org.jboss.ws.common.umdm.OperationMetaData; import org.jboss.ws.core.CommonMessageContext; import org.jboss.ws.core.soap.MessageContextAssociation; -import org.jboss.ws.metadata.umdm.OperationMetaData; /** * The SOAPBinding interface is an abstraction for the SOAP binding. Modified: branches/tdiesler/trunk/src/main/java/org/jboss/ws/jaxrpc/SOAPFaultHelperJAXRPC.java =================================================================== --- branches/tdiesler/trunk/src/main/java/org/jboss/ws/jaxrpc/SOAPFaultHelperJAXRPC.java 2006-12-06 01:10:43 UTC (rev 1564) +++ branches/tdiesler/trunk/src/main/java/org/jboss/ws/jaxrpc/SOAPFaultHelperJAXRPC.java 2006-12-06 01:14:45 UTC (rev 1565) @@ -45,6 +45,8 @@ import org.jboss.logging.Logger; import org.jboss.ws.common.Constants; import org.jboss.ws.common.WSException; +import org.jboss.ws.common.umdm.FaultMetaData; +import org.jboss.ws.common.umdm.OperationMetaData; import org.jboss.ws.common.utils.DOMUtils; import org.jboss.ws.common.utils.DOMWriter; import org.jboss.ws.core.CommonMessageContext; @@ -59,8 +61,6 @@ import org.jboss.ws.core.soap.SOAPFactoryImpl; import org.jboss.ws.jaxrpc.encoding.DeserializerFactoryBase; import org.jboss.ws.jaxrpc.encoding.SerializerFactoryBase; -import org.jboss.ws.metadata.umdm.FaultMetaData; -import org.jboss.ws.metadata.umdm.OperationMetaData; import org.jboss.xb.binding.NamespaceRegistry; import org.w3c.dom.Element; Modified: branches/tdiesler/trunk/src/main/java/org/jboss/ws/jaxrpc/SerializationContextJAXRPC.java =================================================================== --- branches/tdiesler/trunk/src/main/java/org/jboss/ws/jaxrpc/SerializationContextJAXRPC.java 2006-12-06 01:10:43 UTC (rev 1564) +++ branches/tdiesler/trunk/src/main/java/org/jboss/ws/jaxrpc/SerializationContextJAXRPC.java 2006-12-06 01:14:45 UTC (rev 1565) @@ -29,6 +29,9 @@ import org.jboss.logging.Logger; import org.jboss.ws.common.Constants; import org.jboss.ws.common.WSException; +import org.jboss.ws.common.umdm.OperationMetaData; +import org.jboss.ws.common.umdm.ServiceMetaData; +import org.jboss.ws.common.umdm.TypesMetaData; import org.jboss.ws.common.utils.JavaUtils; import org.jboss.ws.core.binding.SerializationContext; import org.jboss.ws.core.soap.MessageContextAssociation; @@ -36,9 +39,6 @@ import org.jboss.ws.metadata.jaxrpcmapping.JavaWsdlMapping; import org.jboss.ws.metadata.jaxrpcmapping.JavaXmlTypeMapping; import org.jboss.ws.metadata.jaxrpcmapping.PackageMapping; -import org.jboss.ws.metadata.umdm.OperationMetaData; -import org.jboss.ws.metadata.umdm.ServiceMetaData; -import org.jboss.ws.metadata.umdm.TypesMetaData; /** * The serialization context for JAXRPC endpoints/clients Modified: branches/tdiesler/trunk/src/main/java/org/jboss/ws/jaxrpc/ServiceImpl.java =================================================================== --- branches/tdiesler/trunk/src/main/java/org/jboss/ws/jaxrpc/ServiceImpl.java 2006-12-06 01:10:43 UTC (rev 1564) +++ branches/tdiesler/trunk/src/main/java/org/jboss/ws/jaxrpc/ServiceImpl.java 2006-12-06 01:14:45 UTC (rev 1565) @@ -39,13 +39,13 @@ import javax.xml.rpc.handler.HandlerChain; import javax.xml.rpc.handler.HandlerRegistry; +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.metadata.builder.jaxrpc.JAXRPCClientMetaDataBuilder; import org.jboss.ws.metadata.j2ee.UnifiedServiceRefMetaData; import org.jboss.ws.metadata.jaxrpcmapping.JavaWsdlMapping; -import org.jboss.ws.metadata.umdm.EndpointMetaData; -import org.jboss.ws.metadata.umdm.OperationMetaData; -import org.jboss.ws.metadata.umdm.ServiceMetaData; -import org.jboss.ws.metadata.umdm.UnifiedMetaData; import org.jboss.ws.metadata.wsse.WSSecurityConfiguration; /** Modified: branches/tdiesler/trunk/src/main/java/org/jboss/ws/jaxrpc/ServiceObjectFactory.java =================================================================== --- branches/tdiesler/trunk/src/main/java/org/jboss/ws/jaxrpc/ServiceObjectFactory.java 2006-12-06 01:10:43 UTC (rev 1564) +++ branches/tdiesler/trunk/src/main/java/org/jboss/ws/jaxrpc/ServiceObjectFactory.java 2006-12-06 01:14:45 UTC (rev 1565) @@ -58,18 +58,18 @@ import org.jboss.logging.Logger; import org.jboss.ws.common.Constants; import org.jboss.ws.common.WSException; +import org.jboss.ws.common.umdm.EndpointMetaData; +import org.jboss.ws.common.umdm.HandlerMetaData; +import org.jboss.ws.common.umdm.HandlerMetaDataJAXRPC; +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.server.ServiceEndpoint; import org.jboss.ws.core.server.ServiceEndpointManager; import org.jboss.ws.core.server.ServiceEndpointManagerFactory; import org.jboss.ws.metadata.j2ee.UnifiedPortComponentRefMetaData; import org.jboss.ws.metadata.j2ee.UnifiedServiceRefMetaData; import org.jboss.ws.metadata.jaxrpcmapping.JavaWsdlMapping; -import org.jboss.ws.metadata.umdm.EndpointMetaData; -import org.jboss.ws.metadata.umdm.HandlerMetaData; -import org.jboss.ws.metadata.umdm.HandlerMetaDataJAXRPC; -import org.jboss.ws.metadata.umdm.ServiceMetaData; -import org.jboss.ws.metadata.umdm.HandlerMetaData.HandlerInitParam; -import org.jboss.ws.metadata.umdm.HandlerMetaData.HandlerType; import org.jboss.ws.metadata.wsse.WSSecurityConfiguration; /** Modified: branches/tdiesler/trunk/src/main/java/org/jboss/ws/jaxrpc/StubExt.java =================================================================== --- branches/tdiesler/trunk/src/main/java/org/jboss/ws/jaxrpc/StubExt.java 2006-12-06 01:10:43 UTC (rev 1564) +++ branches/tdiesler/trunk/src/main/java/org/jboss/ws/jaxrpc/StubExt.java 2006-12-06 01:14:45 UTC (rev 1565) @@ -26,7 +26,7 @@ import javax.xml.namespace.QName; import javax.xml.rpc.ParameterMode; -import org.jboss.ws.metadata.umdm.EndpointMetaData; +import org.jboss.ws.common.umdm.EndpointMetaData; // $Id$ Modified: branches/tdiesler/trunk/src/main/java/org/jboss/ws/jaxrpc/encoding/SOAPArrayDeserializer.java =================================================================== --- branches/tdiesler/trunk/src/main/java/org/jboss/ws/jaxrpc/encoding/SOAPArrayDeserializer.java 2006-12-06 01:10:43 UTC (rev 1564) +++ branches/tdiesler/trunk/src/main/java/org/jboss/ws/jaxrpc/encoding/SOAPArrayDeserializer.java 2006-12-06 01:14:45 UTC (rev 1565) @@ -33,6 +33,7 @@ import org.jboss.logging.Logger; import org.jboss.ws.common.Constants; import org.jboss.ws.common.WSException; +import org.jboss.ws.common.umdm.ParameterMetaData; import org.jboss.ws.common.utils.DOMUtils; import org.jboss.ws.common.utils.DOMWriter; import org.jboss.ws.common.utils.JavaUtils; @@ -40,7 +41,6 @@ import org.jboss.ws.core.binding.DeserializerSupport; import org.jboss.ws.core.binding.SerializationContext; import org.jboss.ws.jaxrpc.TypeMappingImpl; -import org.jboss.ws.metadata.umdm.ParameterMetaData; import org.w3c.dom.Element; /** Modified: branches/tdiesler/trunk/src/main/java/org/jboss/ws/jaxrpc/encoding/SOAPArraySerializer.java =================================================================== --- branches/tdiesler/trunk/src/main/java/org/jboss/ws/jaxrpc/encoding/SOAPArraySerializer.java 2006-12-06 01:10:43 UTC (rev 1564) +++ branches/tdiesler/trunk/src/main/java/org/jboss/ws/jaxrpc/encoding/SOAPArraySerializer.java 2006-12-06 01:14:45 UTC (rev 1565) @@ -28,12 +28,12 @@ import org.jboss.logging.Logger; import org.jboss.ws.common.Constants; import org.jboss.ws.common.WSException; +import org.jboss.ws.common.umdm.ParameterMetaData; import org.jboss.ws.common.utils.JavaUtils; import org.jboss.ws.core.binding.BindingException; import org.jboss.ws.core.binding.SerializationContext; import org.jboss.ws.core.binding.SerializerSupport; import org.jboss.ws.jaxrpc.TypeMappingImpl; -import org.jboss.ws.metadata.umdm.ParameterMetaData; import org.w3c.dom.NamedNodeMap; /** Modified: branches/tdiesler/trunk/src/main/java/org/jboss/ws/jaxrpc/handler/HandlerChainBaseImpl.java =================================================================== --- branches/tdiesler/trunk/src/main/java/org/jboss/ws/jaxrpc/handler/HandlerChainBaseImpl.java 2006-12-06 01:10:43 UTC (rev 1564) +++ branches/tdiesler/trunk/src/main/java/org/jboss/ws/jaxrpc/handler/HandlerChainBaseImpl.java 2006-12-06 01:14:45 UTC (rev 1565) @@ -48,15 +48,15 @@ import org.jboss.logging.Logger; import org.jboss.ws.common.Constants; +import org.jboss.ws.common.umdm.EndpointMetaData; +import org.jboss.ws.common.umdm.OperationMetaData; +import org.jboss.ws.common.umdm.ParameterMetaData; +import org.jboss.ws.common.umdm.HandlerMetaData.HandlerType; import org.jboss.ws.core.CommonMessageContext; import org.jboss.ws.core.soap.SOAPElementImpl; import org.jboss.ws.core.soap.SOAPElementWriter; import org.jboss.ws.core.soap.SOAPEnvelopeImpl; import org.jboss.ws.core.soap.SOAPMessageImpl; -import org.jboss.ws.metadata.umdm.EndpointMetaData; -import org.jboss.ws.metadata.umdm.OperationMetaData; -import org.jboss.ws.metadata.umdm.ParameterMetaData; -import org.jboss.ws.metadata.umdm.HandlerMetaData.HandlerType; /** * Represents a list of handlers. All elements in the Modified: branches/tdiesler/trunk/src/main/java/org/jboss/ws/jaxrpc/handler/HandlerDelegateJAXRPC.java =================================================================== --- branches/tdiesler/trunk/src/main/java/org/jboss/ws/jaxrpc/handler/HandlerDelegateJAXRPC.java 2006-12-06 01:10:43 UTC (rev 1564) +++ branches/tdiesler/trunk/src/main/java/org/jboss/ws/jaxrpc/handler/HandlerDelegateJAXRPC.java 2006-12-06 01:14:45 UTC (rev 1565) @@ -34,15 +34,15 @@ import javax.xml.rpc.handler.HandlerInfo; import org.jboss.logging.Logger; +import org.jboss.ws.common.umdm.HandlerMetaData; +import org.jboss.ws.common.umdm.HandlerMetaDataJAXRPC; +import org.jboss.ws.common.umdm.ServerEndpointMetaData; +import org.jboss.ws.common.umdm.HandlerMetaData.HandlerInitParam; +import org.jboss.ws.common.umdm.HandlerMetaData.HandlerType; import org.jboss.ws.core.server.HandlerDelegate; import org.jboss.ws.core.server.ServiceEndpointInfo; import org.jboss.ws.core.soap.MessageContextAssociation; import org.jboss.ws.extras.xop.XOPContext; -import org.jboss.ws.metadata.umdm.HandlerMetaData; -import org.jboss.ws.metadata.umdm.HandlerMetaDataJAXRPC; -import org.jboss.ws.metadata.umdm.ServerEndpointMetaData; -import org.jboss.ws.metadata.umdm.HandlerMetaData.HandlerInitParam; -import org.jboss.ws.metadata.umdm.HandlerMetaData.HandlerType; /** Delegates to JAXRPC handlers * Modified: branches/tdiesler/trunk/src/main/java/org/jboss/ws/jaxrpc/handler/MessageContextJAXRPC.java =================================================================== --- branches/tdiesler/trunk/src/main/java/org/jboss/ws/jaxrpc/handler/MessageContextJAXRPC.java 2006-12-06 01:10:43 UTC (rev 1564) +++ branches/tdiesler/trunk/src/main/java/org/jboss/ws/jaxrpc/handler/MessageContextJAXRPC.java 2006-12-06 01:14:45 UTC (rev 1565) @@ -26,11 +26,11 @@ import javax.xml.rpc.handler.MessageContext; import javax.xml.soap.SOAPMessage; +import org.jboss.ws.common.umdm.EndpointMetaData; +import org.jboss.ws.common.umdm.ServiceMetaData; import org.jboss.ws.core.CommonMessageContext; import org.jboss.ws.core.binding.SerializationContext; import org.jboss.ws.jaxrpc.SerializationContextJAXRPC; -import org.jboss.ws.metadata.umdm.EndpointMetaData; -import org.jboss.ws.metadata.umdm.ServiceMetaData; import org.jboss.xb.binding.NamespaceRegistry; /** Modified: branches/tdiesler/trunk/src/main/java/org/jboss/ws/jaxrpc/handler/ServerHandlerChain.java =================================================================== --- branches/tdiesler/trunk/src/main/java/org/jboss/ws/jaxrpc/handler/ServerHandlerChain.java 2006-12-06 01:10:43 UTC (rev 1564) +++ branches/tdiesler/trunk/src/main/java/org/jboss/ws/jaxrpc/handler/ServerHandlerChain.java 2006-12-06 01:14:45 UTC (rev 1565) @@ -28,7 +28,7 @@ import javax.xml.rpc.handler.MessageContext; -import org.jboss.ws.metadata.umdm.HandlerMetaData.HandlerType; +import org.jboss.ws.common.umdm.HandlerMetaData.HandlerType; /** * Represents a list of handlers. All elements in the Modified: branches/tdiesler/trunk/src/main/java/org/jboss/ws/metadata/acessor/JAXBAccessor.java =================================================================== --- branches/tdiesler/trunk/src/main/java/org/jboss/ws/metadata/acessor/JAXBAccessor.java 2006-12-06 01:10:43 UTC (rev 1564) +++ branches/tdiesler/trunk/src/main/java/org/jboss/ws/metadata/acessor/JAXBAccessor.java 2006-12-06 01:14:45 UTC (rev 1565) @@ -25,11 +25,11 @@ import javax.xml.namespace.QName; import org.jboss.ws.common.WSException; -import org.jboss.ws.metadata.umdm.ParameterMetaData; -import org.jboss.ws.metadata.umdm.WrappedParameter; -import org.jboss.ws.metadata.umdm.ParameterMetaData.AccessorFactoryCreator; -import org.jboss.ws.metadata.umdm.WrappedParameter.Accessor; -import org.jboss.ws.metadata.umdm.WrappedParameter.AccessorFactory; +import org.jboss.ws.common.umdm.ParameterMetaData; +import org.jboss.ws.common.umdm.WrappedParameter; +import org.jboss.ws.common.umdm.ParameterMetaData.AccessorFactoryCreator; +import org.jboss.ws.common.umdm.WrappedParameter.Accessor; +import org.jboss.ws.common.umdm.WrappedParameter.AccessorFactory; import com.sun.xml.bind.api.AccessorException; import com.sun.xml.bind.api.JAXBRIContext; Modified: branches/tdiesler/trunk/src/main/java/org/jboss/ws/metadata/acessor/ReflectiveMethodAccessor.java =================================================================== --- branches/tdiesler/trunk/src/main/java/org/jboss/ws/metadata/acessor/ReflectiveMethodAccessor.java 2006-12-06 01:10:43 UTC (rev 1564) +++ branches/tdiesler/trunk/src/main/java/org/jboss/ws/metadata/acessor/ReflectiveMethodAccessor.java 2006-12-06 01:14:45 UTC (rev 1565) @@ -25,11 +25,11 @@ import java.lang.reflect.Method; import org.jboss.ws.common.WSException; -import org.jboss.ws.metadata.umdm.ParameterMetaData; -import org.jboss.ws.metadata.umdm.WrappedParameter; -import org.jboss.ws.metadata.umdm.ParameterMetaData.AccessorFactoryCreator; -import org.jboss.ws.metadata.umdm.WrappedParameter.Accessor; -import org.jboss.ws.metadata.umdm.WrappedParameter.AccessorFactory; +import org.jboss.ws.common.umdm.ParameterMetaData; +import org.jboss.ws.common.umdm.WrappedParameter; +import org.jboss.ws.common.umdm.ParameterMetaData.AccessorFactoryCreator; +import org.jboss.ws.common.umdm.WrappedParameter.Accessor; +import org.jboss.ws.common.umdm.WrappedParameter.AccessorFactory; /** * A simple JavaBean accessor that uses ordinary reflection. Modified: branches/tdiesler/trunk/src/main/java/org/jboss/ws/metadata/builder/MetaDataBuilder.java =================================================================== --- branches/tdiesler/trunk/src/main/java/org/jboss/ws/metadata/builder/MetaDataBuilder.java 2006-12-06 01:10:43 UTC (rev 1564) +++ branches/tdiesler/trunk/src/main/java/org/jboss/ws/metadata/builder/MetaDataBuilder.java 2006-12-06 01:14:45 UTC (rev 1565) @@ -45,6 +45,9 @@ import org.jboss.logging.Logger; import org.jboss.ws.common.Constants; import org.jboss.ws.common.WSException; +import org.jboss.ws.common.umdm.ClientEndpointMetaData; +import org.jboss.ws.common.umdm.EndpointMetaData; +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.server.ServiceEndpointManager; @@ -58,9 +61,6 @@ import org.jboss.ws.metadata.j2ee.UnifiedWebMetaData; import org.jboss.ws.metadata.j2ee.UnifiedWebSecurityMetaData; import org.jboss.ws.metadata.j2ee.UnifiedWebSecurityMetaData.UnifiedWebResourceCollection; -import org.jboss.ws.metadata.umdm.ClientEndpointMetaData; -import org.jboss.ws.metadata.umdm.EndpointMetaData; -import org.jboss.ws.metadata.umdm.ServerEndpointMetaData; import org.jboss.ws.metadata.wsdl.NCName; import org.jboss.ws.metadata.wsdl.WSDLBinding; import org.jboss.ws.metadata.wsdl.WSDLBindingOperation; Modified: branches/tdiesler/trunk/src/main/java/org/jboss/ws/metadata/builder/jaxrpc/JAXRPCClientMetaDataBuilder.java =================================================================== --- branches/tdiesler/trunk/src/main/java/org/jboss/ws/metadata/builder/jaxrpc/JAXRPCClientMetaDataBuilder.java 2006-12-06 01:10:43 UTC (rev 1564) +++ branches/tdiesler/trunk/src/main/java/org/jboss/ws/metadata/builder/jaxrpc/JAXRPCClientMetaDataBuilder.java 2006-12-06 01:14:45 UTC (rev 1565) @@ -34,18 +34,18 @@ import org.jboss.logging.Logger; import org.jboss.ws.common.Constants; import org.jboss.ws.common.WSException; +import org.jboss.ws.common.umdm.ClientEndpointMetaData; +import org.jboss.ws.common.umdm.EndpointMetaData; +import org.jboss.ws.common.umdm.ServiceMetaData; +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.metadata.config.jaxrpc.WSClientConfigJAXRPC; import org.jboss.ws.metadata.j2ee.UnifiedHandlerMetaData; import org.jboss.ws.metadata.j2ee.UnifiedServiceRefMetaData; import org.jboss.ws.metadata.jaxrpcmapping.JavaWsdlMapping; import org.jboss.ws.metadata.jaxrpcmapping.JavaWsdlMappingFactory; import org.jboss.ws.metadata.jaxrpcmapping.ServiceEndpointInterfaceMapping; -import org.jboss.ws.metadata.umdm.ClientEndpointMetaData; -import org.jboss.ws.metadata.umdm.EndpointMetaData; -import org.jboss.ws.metadata.umdm.ServiceMetaData; -import org.jboss.ws.metadata.umdm.UnifiedMetaData; -import org.jboss.ws.metadata.umdm.EndpointMetaData.Type; -import org.jboss.ws.metadata.umdm.HandlerMetaData.HandlerType; import org.jboss.ws.metadata.wsdl.NCName; import org.jboss.ws.metadata.wsdl.WSDLDefinitions; import org.jboss.ws.metadata.wsdl.WSDLEndpoint; Modified: branches/tdiesler/trunk/src/main/java/org/jboss/ws/metadata/builder/jaxrpc/JAXRPCMetaDataBuilder.java =================================================================== --- branches/tdiesler/trunk/src/main/java/org/jboss/ws/metadata/builder/jaxrpc/JAXRPCMetaDataBuilder.java 2006-12-06 01:10:43 UTC (rev 1564) +++ branches/tdiesler/trunk/src/main/java/org/jboss/ws/metadata/builder/jaxrpc/JAXRPCMetaDataBuilder.java 2006-12-06 01:14:45 UTC (rev 1565) @@ -38,6 +38,15 @@ import org.jboss.logging.Logger; import org.jboss.ws.common.Constants; import org.jboss.ws.common.WSException; +import org.jboss.ws.common.umdm.EndpointMetaData; +import org.jboss.ws.common.umdm.FaultMetaData; +import org.jboss.ws.common.umdm.OperationMetaData; +import org.jboss.ws.common.umdm.ParameterMetaData; +import org.jboss.ws.common.umdm.ServerEndpointMetaData; +import org.jboss.ws.common.umdm.ServiceMetaData; +import org.jboss.ws.common.umdm.TypeMappingMetaData; +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.extras.addressing.AddressingPropertiesImpl; import org.jboss.ws.extras.addressing.metadata.AddressingOpMetaExt; @@ -61,15 +70,6 @@ import org.jboss.ws.metadata.jaxrpcmapping.VariableMapping; import org.jboss.ws.metadata.jaxrpcmapping.WsdlMessageMapping; import org.jboss.ws.metadata.jaxrpcmapping.WsdlReturnValueMapping; -import org.jboss.ws.metadata.umdm.EndpointMetaData; -import org.jboss.ws.metadata.umdm.FaultMetaData; -import org.jboss.ws.metadata.umdm.OperationMetaData; -import org.jboss.ws.metadata.umdm.ParameterMetaData; -import org.jboss.ws.metadata.umdm.ServerEndpointMetaData; -import org.jboss.ws.metadata.umdm.ServiceMetaData; -import org.jboss.ws.metadata.umdm.TypeMappingMetaData; -import org.jboss.ws.metadata.umdm.TypesMetaData; -import org.jboss.ws.metadata.umdm.WrappedParameter; import org.jboss.ws.metadata.wsdl.NCName; import org.jboss.ws.metadata.wsdl.WSDLBinding; import org.jboss.ws.metadata.wsdl.WSDLBindingOperation; Modified: branches/tdiesler/trunk/src/main/java/org/jboss/ws/metadata/builder/jaxrpc/JAXRPCServerMetaDataBuilder.java =================================================================== --- branches/tdiesler/trunk/src/main/java/org/jboss/ws/metadata/builder/jaxrpc/JAXRPCServerMetaDataBuilder.java 2006-12-06 01:10:43 UTC (rev 1564) +++ branches/tdiesler/trunk/src/main/java/org/jboss/ws/metadata/builder/jaxrpc/JAXRPCServerMetaDataBuilder.java 2006-12-06 01:14:45 UTC (rev 1565) @@ -32,6 +32,12 @@ import org.jboss.logging.Logger; import org.jboss.ws.common.WSException; +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.umdm.EndpointMetaData.Type; +import org.jboss.ws.common.umdm.HandlerMetaData.HandlerType; import org.jboss.ws.core.server.UnifiedDeploymentInfo; import org.jboss.ws.metadata.config.jaxrpc.WSEndpointConfigJAXRPC; import org.jboss.ws.metadata.j2ee.UnifiedApplicationMetaData; @@ -45,12 +51,6 @@ import org.jboss.ws.metadata.jaxrpcmapping.ServiceEndpointInterfaceMapping; import org.jboss.ws.metadata.jsr109.PortComponentMetaData; import org.jboss.ws.metadata.jsr109.WebserviceDescriptionMetaData; -import org.jboss.ws.metadata.umdm.EndpointMetaData; -import org.jboss.ws.metadata.umdm.ServerEndpointMetaData; -import org.jboss.ws.metadata.umdm.ServiceMetaData; -import org.jboss.ws.metadata.umdm.UnifiedMetaData; -import org.jboss.ws.metadata.umdm.EndpointMetaData.Type; -import org.jboss.ws.metadata.umdm.HandlerMetaData.HandlerType; import org.jboss.ws.metadata.wsdl.WSDLDefinitions; import org.jboss.ws.metadata.wsdl.WSDLEndpoint; import org.jboss.ws.metadata.wsdl.WSDLService; Modified: branches/tdiesler/trunk/src/main/java/org/jboss/ws/metadata/builder/jaxws/JAXWSClientEndpointMetaDataBuilder.java =================================================================== --- branches/tdiesler/trunk/src/main/java/org/jboss/ws/metadata/builder/jaxws/JAXWSClientEndpointMetaDataBuilder.java 2006-12-06 01:10:43 UTC (rev 1564) +++ branches/tdiesler/trunk/src/main/java/org/jboss/ws/metadata/builder/jaxws/JAXWSClientEndpointMetaDataBuilder.java 2006-12-06 01:14:45 UTC (rev 1565) @@ -27,9 +27,9 @@ import javax.xml.ws.BindingType; import org.jboss.logging.Logger; +import org.jboss.ws.common.umdm.EndpointMetaData; +import org.jboss.ws.common.umdm.HandlerMetaData.HandlerType; import org.jboss.ws.metadata.config.jaxws.WSClientConfigJAXWS; -import org.jboss.ws.metadata.umdm.EndpointMetaData; -import org.jboss.ws.metadata.umdm.HandlerMetaData.HandlerType; /** * A client side meta data builder that is based on JSR-181 annotations Modified: branches/tdiesler/trunk/src/main/java/org/jboss/ws/metadata/builder/jaxws/JAXWSClientMetaDataBuilder.java =================================================================== --- branches/tdiesler/trunk/src/main/java/org/jboss/ws/metadata/builder/jaxws/JAXWSClientMetaDataBuilder.java 2006-12-06 01:10:43 UTC (rev 1564) +++ branches/tdiesler/trunk/src/main/java/org/jboss/ws/metadata/builder/jaxws/JAXWSClientMetaDataBuilder.java 2006-12-06 01:14:45 UTC (rev 1565) @@ -31,13 +31,13 @@ import org.jboss.logging.Logger; import org.jboss.ws.common.Constants; import org.jboss.ws.common.WSException; +import org.jboss.ws.common.umdm.ClientEndpointMetaData; +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.common.umdm.EndpointMetaData.Type; import org.jboss.ws.jaxrpc.Style; -import org.jboss.ws.metadata.umdm.ClientEndpointMetaData; -import org.jboss.ws.metadata.umdm.EndpointMetaData; -import org.jboss.ws.metadata.umdm.OperationMetaData; -import org.jboss.ws.metadata.umdm.ServiceMetaData; -import org.jboss.ws.metadata.umdm.UnifiedMetaData; -import org.jboss.ws.metadata.umdm.EndpointMetaData.Type; import org.jboss.ws.metadata.wsdl.NCName; import org.jboss.ws.metadata.wsdl.WSDLBinding; import org.jboss.ws.metadata.wsdl.WSDLBindingOperation; Modified: branches/tdiesler/trunk/src/main/java/org/jboss/ws/metadata/builder/jaxws/JAXWSEndpointMetaDataBuilder.java =================================================================== --- branches/tdiesler/trunk/src/main/java/org/jboss/ws/metadata/builder/jaxws/JAXWSEndpointMetaDataBuilder.java 2006-12-06 01:10:43 UTC (rev 1564) +++ branches/tdiesler/trunk/src/main/java/org/jboss/ws/metadata/builder/jaxws/JAXWSEndpointMetaDataBuilder.java 2006-12-06 01:14:45 UTC (rev 1565) @@ -25,11 +25,11 @@ import org.jboss.logging.Logger; import org.jboss.ws.annotation.PortComponent; +import org.jboss.ws.common.umdm.EndpointMetaData; +import org.jboss.ws.common.umdm.ServerEndpointMetaData; +import org.jboss.ws.common.umdm.UnifiedMetaData; import org.jboss.ws.core.server.UnifiedDeploymentInfo; import org.jboss.ws.core.server.UnifiedDeploymentInfo.DeploymentType; -import org.jboss.ws.metadata.umdm.EndpointMetaData; -import org.jboss.ws.metadata.umdm.ServerEndpointMetaData; -import org.jboss.ws.metadata.umdm.UnifiedMetaData; /** * Builds ServiceEndpointMetaData for a JAX-WS endpoint. Modified: branches/tdiesler/trunk/src/main/java/org/jboss/ws/metadata/builder/jaxws/JAXWSMetaDataBuilderEJB21.java =================================================================== --- branches/tdiesler/trunk/src/main/java/org/jboss/ws/metadata/builder/jaxws/JAXWSMetaDataBuilderEJB21.java 2006-12-06 01:10:43 UTC (rev 1564) +++ branches/tdiesler/trunk/src/main/java/org/jboss/ws/metadata/builder/jaxws/JAXWSMetaDataBuilderEJB21.java 2006-12-06 01:14:45 UTC (rev 1565) @@ -28,12 +28,12 @@ import org.jboss.logging.Logger; import org.jboss.ws.common.WSException; +import org.jboss.ws.common.umdm.ServerEndpointMetaData; +import org.jboss.ws.common.umdm.UnifiedMetaData; import org.jboss.ws.core.server.JAXWSDeployment; import org.jboss.ws.core.server.UnifiedDeploymentInfo; import org.jboss.ws.metadata.j2ee.UnifiedApplicationMetaData; import org.jboss.ws.metadata.j2ee.UnifiedBeanMetaData; -import org.jboss.ws.metadata.umdm.ServerEndpointMetaData; -import org.jboss.ws.metadata.umdm.UnifiedMetaData; /** * A server side meta data builder that is based on JSR-181 annotations Modified: branches/tdiesler/trunk/src/main/java/org/jboss/ws/metadata/builder/jaxws/JAXWSMetaDataBuilderEJB3.java =================================================================== --- branches/tdiesler/trunk/src/main/java/org/jboss/ws/metadata/builder/jaxws/JAXWSMetaDataBuilderEJB3.java 2006-12-06 01:10:43 UTC (rev 1564) +++ branches/tdiesler/trunk/src/main/java/org/jboss/ws/metadata/builder/jaxws/JAXWSMetaDataBuilderEJB3.java 2006-12-06 01:14:45 UTC (rev 1565) @@ -29,11 +29,11 @@ import org.jboss.annotation.security.SecurityDomain; import org.jboss.logging.Logger; import org.jboss.ws.common.WSException; +import org.jboss.ws.common.umdm.UnifiedMetaData; import org.jboss.ws.core.server.JAXWSDeployment; import org.jboss.ws.core.server.UnifiedDeploymentInfo; import org.jboss.ws.metadata.j2ee.UnifiedApplicationMetaData; import org.jboss.ws.metadata.j2ee.UnifiedBeanMetaData; -import org.jboss.ws.metadata.umdm.UnifiedMetaData; /** * A server side meta data builder that is based on JSR-181 annotations Modified: branches/tdiesler/trunk/src/main/java/org/jboss/ws/metadata/builder/jaxws/JAXWSMetaDataBuilderJSE.java =================================================================== --- branches/tdiesler/trunk/src/main/java/org/jboss/ws/metadata/builder/jaxws/JAXWSMetaDataBuilderJSE.java 2006-12-06 01:10:43 UTC (rev 1564) +++ branches/tdiesler/trunk/src/main/java/org/jboss/ws/metadata/builder/jaxws/JAXWSMetaDataBuilderJSE.java 2006-12-06 01:14:45 UTC (rev 1565) @@ -26,9 +26,9 @@ import org.jboss.logging.Logger; import org.jboss.ws.common.WSException; +import org.jboss.ws.common.umdm.UnifiedMetaData; import org.jboss.ws.core.server.UnifiedDeploymentInfo; import org.jboss.ws.metadata.j2ee.UnifiedWebMetaData; -import org.jboss.ws.metadata.umdm.UnifiedMetaData; /** * A server side meta data builder that is based on JSR-181 annotations Modified: branches/tdiesler/trunk/src/main/java/org/jboss/ws/metadata/builder/jaxws/JAXWSProviderMetaDataBuilder.java =================================================================== --- branches/tdiesler/trunk/src/main/java/org/jboss/ws/metadata/builder/jaxws/JAXWSProviderMetaDataBuilder.java 2006-12-06 01:10:43 UTC (rev 1564) +++ branches/tdiesler/trunk/src/main/java/org/jboss/ws/metadata/builder/jaxws/JAXWSProviderMetaDataBuilder.java 2006-12-06 01:14:45 UTC (rev 1565) @@ -36,16 +36,16 @@ import org.jboss.logging.Logger; import org.jboss.ws.common.Constants; +import org.jboss.ws.common.umdm.OperationMetaData; +import org.jboss.ws.common.umdm.ParameterMetaData; +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.umdm.EndpointMetaData.Type; import org.jboss.ws.common.utils.JavaUtils; import org.jboss.ws.core.server.UnifiedDeploymentInfo; import org.jboss.ws.jaxrpc.Style; import org.jboss.ws.metadata.builder.MetaDataBuilder; -import org.jboss.ws.metadata.umdm.OperationMetaData; -import org.jboss.ws.metadata.umdm.ParameterMetaData; -import org.jboss.ws.metadata.umdm.ServerEndpointMetaData; -import org.jboss.ws.metadata.umdm.ServiceMetaData; -import org.jboss.ws.metadata.umdm.UnifiedMetaData; -import org.jboss.ws.metadata.umdm.EndpointMetaData.Type; import org.jboss.ws.metadata.wsdl.WSDLUtils; /** Modified: branches/tdiesler/trunk/src/main/java/org/jboss/ws/metadata/builder/jaxws/JAXWSServerMetaDataBuilder.java =================================================================== --- branches/tdiesler/trunk/src/main/java/org/jboss/ws/metadata/builder/jaxws/JAXWSServerMetaDataBuilder.java 2006-12-06 01:10:43 UTC (rev 1564) +++ branches/tdiesler/trunk/src/main/java/org/jboss/ws/metadata/builder/jaxws/JAXWSServerMetaDataBuilder.java 2006-12-06 01:14:45 UTC (rev 1565) @@ -27,9 +27,9 @@ import javax.xml.ws.WebServiceProvider; import org.jboss.logging.Logger; +import org.jboss.ws.common.umdm.UnifiedMetaData; import org.jboss.ws.core.server.JAXWSDeployment; import org.jboss.ws.core.server.UnifiedDeploymentInfo; -import org.jboss.ws.metadata.umdm.UnifiedMetaData; /** An abstract annotation meta data builder. * Modified: branches/tdiesler/trunk/src/main/java/org/jboss/ws/metadata/builder/jaxws/JAXWSWebServiceMetaDataBuilder.java =================================================================== --- branches/tdiesler/trunk/src/main/java/org/jboss/ws/metadata/builder/jaxws/JAXWSWebServiceMetaDataBuilder.java 2006-12-06 01:10:43 UTC (rev 1564) +++ branches/tdiesler/trunk/src/main/java/org/jboss/ws/metadata/builder/jaxws/JAXWSWebServiceMetaDataBuilder.java 2006-12-06 01:14:45 UTC (rev 1565) @@ -61,6 +61,17 @@ import org.jboss.logging.Logger; import org.jboss.ws.common.Constants; import org.jboss.ws.common.WSException; +import org.jboss.ws.common.umdm.EndpointMetaData; +import org.jboss.ws.common.umdm.FaultMetaData; +import org.jboss.ws.common.umdm.OperationMetaData; +import org.jboss.ws.common.umdm.ParameterMetaData; +import org.jboss.ws.common.umdm.ServerEndpointMetaData; +import org.jboss.ws.common.umdm.ServiceMetaData; +import org.jboss.ws.common.umdm.TypeMappingMetaData; +import org.jboss.ws.common.umdm.TypesMetaData; +import org.jboss.ws.common.umdm.UnifiedMetaData; +import org.jboss.ws.common.umdm.WrappedParameter; +import org.jboss.ws.common.umdm.HandlerMetaData.HandlerType; import org.jboss.ws.common.utils.HolderUtils; import org.jboss.ws.common.utils.IOUtils; import org.jboss.ws.common.utils.JBossWSEntityResolver; @@ -79,17 +90,6 @@ import org.jboss.ws.metadata.jsr181.HandlerChainFactory; import org.jboss.ws.metadata.jsr181.HandlerChainMetaData; import org.jboss.ws.metadata.jsr181.HandlerChainsMetaData; -import org.jboss.ws.metadata.umdm.EndpointMetaData; -import org.jboss.ws.metadata.umdm.FaultMetaData; -import org.jboss.ws.metadata.umdm.OperationMetaData; -import org.jboss.ws.metadata.umdm.ParameterMetaData; -import org.jboss.ws.metadata.umdm.ServerEndpointMetaData; -import org.jboss.ws.metadata.umdm.ServiceMetaData; -import org.jboss.ws.metadata.umdm.TypeMappingMetaData; -import org.jboss.ws.metadata.umdm.TypesMetaData; -import org.jboss.ws.metadata.umdm.UnifiedMetaData; -import org.jboss.ws.metadata.umdm.WrappedParameter; -import org.jboss.ws.metadata.umdm.HandlerMetaData.HandlerType; import org.jboss.ws.metadata.wsdl.WSDLDefinitions; import org.jboss.ws.metadata.wsdl.WSDLUtils; import org.jboss.ws.metadata.wsdl.WSDLWriter; Modified: branches/tdiesler/trunk/src/main/java/org/jboss/ws/metadata/config/WSCommonConfig.java =================================================================== --- branches/tdiesler/trunk/src/main/java/org/jboss/ws/metadata/config/WSCommonConfig.java 2006-12-06 01:10:43 UTC (rev 1564) +++ branches/tdiesler/trunk/src/main/java/org/jboss/ws/metadata/config/WSCommonConfig.java 2006-12-06 01:14:45 UTC (rev 1565) @@ -25,9 +25,9 @@ import java.util.List; -import org.jboss.ws.metadata.umdm.EndpointMetaData; -import org.jboss.ws.metadata.umdm.HandlerMetaData; -import org.jboss.ws.metadata.umdm.HandlerMetaData.HandlerType; +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 Modified: branches/tdiesler/trunk/src/main/java/org/jboss/ws/metadata/config/jaxrpc/WSCommonConfigJAXRPC.java =================================================================== --- branches/tdiesler/trunk/src/main/java/org/jboss/ws/metadata/config/jaxrpc/WSCommonConfigJAXRPC.java 2006-12-06 01:10:43 UTC (rev 1564) +++ branches/tdiesler/trunk/src/main/java/org/jboss/ws/metadata/config/jaxrpc/WSCommonConfigJAXRPC.java 2006-12-06 01:14:45 UTC (rev 1565) @@ -24,12 +24,12 @@ 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.metadata.config.WSCommonConfig; import org.jboss.ws.metadata.j2ee.UnifiedHandlerMetaData; import org.jboss.ws.metadata.jsr181.HandlerChainMetaData; -import org.jboss.ws.metadata.umdm.EndpointMetaData; -import org.jboss.ws.metadata.umdm.HandlerMetaData; -import org.jboss.ws.metadata.umdm.HandlerMetaData.HandlerType; // $Id$ Modified: branches/tdiesler/trunk/src/main/java/org/jboss/ws/metadata/config/jaxrpc/WSConfigFactoryJAXRPC.java =================================================================== --- branches/tdiesler/trunk/src/main/java/org/jboss/ws/metadata/config/jaxrpc/WSConfigFactoryJAXRPC.java 2006-12-06 01:10:43 UTC (rev 1564) +++ branches/tdiesler/trunk/src/main/java/org/jboss/ws/metadata/config/jaxrpc/WSConfigFactoryJAXRPC.java 2006-12-06 01:14:45 UTC (rev 1565) @@ -26,10 +26,10 @@ 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.metadata.j2ee.UnifiedHandlerMetaData; import org.jboss.ws.metadata.jsr181.HandlerChainMetaData; -import org.jboss.ws.metadata.umdm.HandlerMetaData.HandlerInitParam; -import org.jboss.ws.metadata.umdm.HandlerMetaData.HandlerType; 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/metadata/config/jaxrpc/WSEndpointConfigJAXRPC.java =================================================================== --- branches/tdiesler/trunk/src/main/java/org/jboss/ws/metadata/config/jaxrpc/WSEndpointConfigJAXRPC.java 2006-12-06 01:10:43 UTC (rev 1564) +++ branches/tdiesler/trunk/src/main/java/org/jboss/ws/metadata/config/jaxrpc/WSEndpointConfigJAXRPC.java 2006-12-06 01:14:45 UTC (rev 1565) @@ -24,11 +24,11 @@ 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.metadata.j2ee.UnifiedHandlerMetaData; import org.jboss.ws.metadata.jsr181.HandlerChainMetaData; -import org.jboss.ws.metadata.umdm.EndpointMetaData; -import org.jboss.ws.metadata.umdm.HandlerMetaData; -import org.jboss.ws.metadata.umdm.HandlerMetaData.HandlerType; // $Id$ Modified: branches/tdiesler/trunk/src/main/java/org/jboss/ws/metadata/config/jaxws/WSCommonConfigJAXWS.java =================================================================== --- branches/tdiesler/trunk/src/main/java/org/jboss/ws/metadata/config/jaxws/WSCommonConfigJAXWS.java 2006-12-06 01:10:43 UTC (rev 1564) +++ branches/tdiesler/trunk/src/main/java/org/jboss/ws/metadata/config/jaxws/WSCommonConfigJAXWS.java 2006-12-06 01:14:45 UTC (rev 1565) @@ -24,12 +24,12 @@ 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.metadata.config.WSCommonConfig; import org.jboss.ws.metadata.j2ee.UnifiedHandlerMetaData; import org.jboss.ws.metadata.jsr181.HandlerChainMetaData; -import org.jboss.ws.metadata.umdm.EndpointMetaData; -import org.jboss.ws.metadata.umdm.HandlerMetaData; -import org.jboss.ws.metadata.umdm.HandlerMetaData.HandlerType; // $Id$ Modified: branches/tdiesler/trunk/src/main/java/org/jboss/ws/metadata/config/jaxws/WSEndpointConfigJAXWS.java =================================================================== --- branches/tdiesler/trunk/src/main/java/org/jboss/ws/metadata/config/jaxws/WSEndpointConfigJAXWS.java 2006-12-06 01:10:43 UTC (rev 1564) +++ branches/tdiesler/trunk/src/main/java/org/jboss/ws/metadata/config/jaxws/WSEndpointConfigJAXWS.java 2006-12-06 01:14:45 UTC (rev 1565) @@ -24,11 +24,11 @@ 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.metadata.j2ee.UnifiedHandlerMetaData; import org.jboss.ws.metadata.jsr181.HandlerChainMetaData; -import org.jboss.ws.metadata.umdm.EndpointMetaData; -import org.jboss.ws.metadata.umdm.HandlerMetaData; -import org.jboss.ws.metadata.umdm.HandlerMetaData.HandlerType; // $Id$ Modified: branches/tdiesler/trunk/src/main/java/org/jboss/ws/metadata/config/jaxws/WSHandlerChainsConfigJAXWS.java =================================================================== --- branches/tdiesler/trunk/src/main/java/org/jboss/ws/metadata/config/jaxws/WSHandlerChainsConfigJAXWS.java 2006-12-06 01:10:43 UTC (rev 1564) +++ branches/tdiesler/trunk/src/main/java/org/jboss/ws/metadata/config/jaxws/WSHandlerChainsConfigJAXWS.java 2006-12-06 01:14:45 UTC (rev 1565) @@ -24,8 +24,8 @@ import java.util.ArrayList; import java.util.List; +import org.jboss.ws.common.umdm.HandlerMetaData.HandlerType; import org.jboss.ws.metadata.jsr181.HandlerChainMetaData; -import org.jboss.ws.metadata.umdm.HandlerMetaData.HandlerType; /** Modified: branches/tdiesler/trunk/src/main/java/org/jboss/ws/metadata/j2ee/UnifiedHandlerMetaData.java =================================================================== --- branches/tdiesler/trunk/src/main/java/org/jboss/ws/metadata/j2ee/UnifiedHandlerMetaData.java 2006-12-06 01:10:43 UTC (rev 1564) +++ branches/tdiesler/trunk/src/main/java/org/jboss/ws/metadata/j2ee/UnifiedHandlerMetaData.java 2006-12-06 01:14:45 UTC (rev 1565) @@ -31,12 +31,12 @@ 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.metadata.jsr181.HandlerChainMetaData; -import org.jboss.ws.metadata.umdm.EndpointMetaData; -import org.jboss.ws.metadata.umdm.HandlerMetaDataJAXRPC; -import org.jboss.ws.metadata.umdm.HandlerMetaDataJAXWS; -import org.jboss.ws.metadata.umdm.HandlerMetaData.HandlerInitParam; -import org.jboss.ws.metadata.umdm.HandlerMetaData.HandlerType; /** * The container independent metdata data for a handler element Modified: branches/tdiesler/trunk/src/main/java/org/jboss/ws/metadata/jsr109/WebservicesFactory.java =================================================================== --- branches/tdiesler/trunk/src/main/java/org/jboss/ws/metadata/jsr109/WebservicesFactory.java 2006-12-06 01:10:43 UTC (rev 1564) +++ branches/tdiesler/trunk/src/main/java/org/jboss/ws/metadata/jsr109/WebservicesFactory.java 2006-12-06 01:14:45 UTC (rev 1565) @@ -26,9 +26,9 @@ import java.net.URL; 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.metadata.j2ee.UnifiedHandlerMetaData; -import org.jboss.ws.metadata.umdm.HandlerMetaData.HandlerInitParam; -import org.jboss.ws.metadata.umdm.HandlerMetaData.HandlerType; 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/metadata/jsr181/HandlerChainFactory.java =================================================================== --- branches/tdiesler/trunk/src/main/java/org/jboss/ws/metadata/jsr181/HandlerChainFactory.java 2006-12-06 01:10:43 UTC (rev 1564) +++ branches/tdiesler/trunk/src/main/java/org/jboss/ws/metadata/jsr181/HandlerChainFactory.java 2006-12-06 01:14:45 UTC (rev 1565) @@ -24,9 +24,9 @@ // $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.metadata.j2ee.UnifiedHandlerMetaData; -import org.jboss.ws.metadata.umdm.HandlerMetaData.HandlerInitParam; -import org.jboss.ws.metadata.umdm.HandlerMetaData.HandlerType; 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/metadata/jsr181/HandlerChainMetaData.java =================================================================== --- branches/tdiesler/trunk/src/main/java/org/jboss/ws/metadata/jsr181/HandlerChainMetaData.java 2006-12-06 01:10:43 UTC (rev 1564) +++ branches/tdiesler/trunk/src/main/java/org/jboss/ws/metadata/jsr181/HandlerChainMetaData.java 2006-12-06 01:14:45 UTC (rev 1565) @@ -29,8 +29,8 @@ import javax.xml.namespace.QName; import org.jboss.logging.Logger; +import org.jboss.ws.common.umdm.HandlerMetaData.HandlerType; import org.jboss.ws.metadata.j2ee.UnifiedHandlerMetaData; -import org.jboss.ws.metadata.umdm.HandlerMetaData.HandlerType; /** * XML Binding element for handler-config/handler-chain elements Modified: branches/tdiesler/trunk/src/main/java/org/jboss/ws/metadata/jsr181/HandlerChainsMetaData.java =================================================================== --- branches/tdiesler/trunk/src/main/java/org/jboss/ws/metadata/jsr181/HandlerChainsMetaData.java 2006-12-06 01:10:43 UTC (rev 1564) +++ branches/tdiesler/trunk/src/main/java/org/jboss/ws/metadata/jsr181/HandlerChainsMetaData.java 2006-12-06 01:14:45 UTC (rev 1565) @@ -26,7 +26,7 @@ import java.util.ArrayList; -import org.jboss.ws.metadata.umdm.HandlerMetaData.HandlerType; +import org.jboss.ws.common.umdm.HandlerMetaData.HandlerType; /** * XML Binding root element for JSR-181 HandlerChain Modified: branches/tdiesler/trunk/src/main/java/org/jboss/ws/tools/JavaToWSDL.java =================================================================== --- branches/tdiesler/trunk/src/main/java/org/jboss/ws/tools/JavaToWSDL.java 2006-12-06 01:10:43 UTC (rev 1564) +++ branches/tdiesler/trunk/src/main/java/org/jboss/ws/tools/JavaToWSDL.java 2006-12-06 01:14:45 UTC (rev 1565) @@ -34,11 +34,11 @@ import org.jboss.logging.Logger; import org.jboss.ws.common.Constants; import org.jboss.ws.common.WSException; +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.jaxrpc.Style; import org.jboss.ws.metadata.jaxrpcmapping.JavaWsdlMapping; -import org.jboss.ws.metadata.umdm.UnifiedMetaData; import org.jboss.ws.metadata.wsdl.WSDLDefinitions; import org.jboss.ws.tools.Configuration.OperationConfig; import org.jboss.ws.tools.metadata.ToolsUnifiedMetaDataBuilder; Modified: branches/tdiesler/trunk/src/main/java/org/jboss/ws/tools/JavaToWSDL11.java =================================================================== --- branches/tdiesler/trunk/src/main/java/org/jboss/ws/tools/JavaToWSDL11.java 2006-12-06 01:10:43 UTC (rev 1564) +++ branches/tdiesler/trunk/src/main/java/org/jboss/ws/tools/JavaToWSDL11.java 2006-12-06 01:14:45 UTC (rev 1565) @@ -30,10 +30,10 @@ import org.jboss.logging.Logger; import org.jboss.ws.common.Constants; import org.jboss.ws.common.WSException; +import org.jboss.ws.common.umdm.EndpointMetaData; +import org.jboss.ws.common.umdm.ServiceMetaData; +import org.jboss.ws.common.umdm.UnifiedMetaData; import org.jboss.ws.metadata.jaxrpcmapping.JavaWsdlMapping; -import org.jboss.ws.metadata.umdm.EndpointMetaData; -import org.jboss.ws.metadata.umdm.ServiceMetaData; -import org.jboss.ws.metadata.umdm.UnifiedMetaData; import org.jboss.ws.metadata.wsdl.WSDLDefinitions; import org.jboss.ws.metadata.wsdl.WSDLUtils; import org.jboss.ws.metadata.wsdl.xmlschema.JBossXSModel; Modified: branches/tdiesler/trunk/src/main/java/org/jboss/ws/tools/SourceWrapperGenerator.java =================================================================== --- branches/tdiesler/trunk/src/main/java/org/jboss/ws/tools/SourceWrapperGenerator.java 2006-12-06 01:10:43 UTC (rev 1564) +++ branches/tdiesler/trunk/src/main/java/org/jboss/ws/tools/SourceWrapperGenerator.java 2006-12-06 01:14:45 UTC (rev 1565) @@ -33,12 +33,12 @@ import org.jboss.logging.Logger; import org.jboss.ws.common.WSException; +import org.jboss.ws.common.umdm.FaultMetaData; +import org.jboss.ws.common.umdm.OperationMetaData; +import org.jboss.ws.common.umdm.ParameterMetaData; +import org.jboss.ws.common.umdm.WrappedParameter; import org.jboss.ws.common.utils.JavaUtils; import org.jboss.ws.core.jaxws.WrapperGenerator; -import org.jboss.ws.metadata.umdm.FaultMetaData; -import org.jboss.ws.metadata.umdm.OperationMetaData; -import org.jboss.ws.metadata.umdm.ParameterMetaData; -import org.jboss.ws.metadata.umdm.WrappedParameter; import com.sun.codemodel.JAnnotationArrayMember; import com.sun.codemodel.JAnnotationUse; Modified: branches/tdiesler/trunk/src/main/java/org/jboss/ws/tools/helpers/JavaToWSDLHelper.java =================================================================== --- branches/tdiesler/trunk/src/main/java/org/jboss/ws/tools/helpers/JavaToWSDLHelper.java 2006-12-06 01:10:43 UTC (rev 1564) +++ branches/tdiesler/trunk/src/main/java/org/jboss/ws/tools/helpers/JavaToWSDLHelper.java 2006-12-06 01:14:45 UTC (rev 1565) @@ -40,6 +40,12 @@ import org.apache.xerces.xs.XSTypeDefinition; import org.jboss.ws.common.Constants; import org.jboss.ws.common.WSException; +import org.jboss.ws.common.umdm.EndpointMetaData; +import org.jboss.ws.common.umdm.FaultMetaData; +import org.jboss.ws.common.umdm.OperationMetaData; +import org.jboss.ws.common.umdm.ParameterMetaData; +import org.jboss.ws.common.umdm.ServerEndpointMetaData; +import org.jboss.ws.common.umdm.WrappedParameter; import org.jboss.ws.common.utils.JavaUtils; import org.jboss.ws.core.CommonSOAPBinding; import org.jboss.ws.jaxrpc.LiteralTypeMapping; @@ -56,12 +62,6 @@ import org.jboss.ws.metadata.jaxrpcmapping.VariableMapping; import org.jboss.ws.metadata.jaxrpcmapping.WsdlMessageMapping; import org.jboss.ws.metadata.jaxrpcmapping.WsdlReturnValueMapping; -import org.jboss.ws.metadata.umdm.EndpointMetaData; -import org.jboss.ws.metadata.umdm.FaultMetaData; -import org.jboss.ws.metadata.umdm.OperationMetaData; -import org.jboss.ws.metadata.umdm.ParameterMetaData; -import org.jboss.ws.metadata.umdm.ServerEndpointMetaData; -import org.jboss.ws.metadata.umdm.WrappedParameter; import org.jboss.ws.metadata.wsdl.NCName; import org.jboss.ws.metadata.wsdl.WSDLBinding; import org.jboss.ws.metadata.wsdl.WSDLBindingFault; Modified: branches/tdiesler/trunk/src/main/java/org/jboss/ws/tools/helpers/ToolsHelper.java =================================================================== --- branches/tdiesler/trunk/src/main/java/org/jboss/ws/tools/helpers/ToolsHelper.java 2006-12-06 01:10:43 UTC (rev 1564) +++ branches/tdiesler/trunk/src/main/java/org/jboss/ws/tools/helpers/ToolsHelper.java 2006-12-06 01:14:45 UTC (rev 1565) @@ -38,6 +38,12 @@ import org.jboss.logging.Logger; import org.jboss.ws.common.Constants; import org.jboss.ws.common.WSException; +import org.jboss.ws.common.umdm.EndpointMetaData; +import org.jboss.ws.common.umdm.OperationMetaData; +import org.jboss.ws.common.umdm.ParameterMetaData; +import org.jboss.ws.common.umdm.ServiceMetaData; +import org.jboss.ws.common.umdm.UnifiedMetaData; +import org.jboss.ws.common.umdm.WrappedParameter; import org.jboss.ws.common.utils.DOMUtils; import org.jboss.ws.common.utils.DOMWriter; import org.jboss.ws.common.utils.IOUtils; @@ -46,12 +52,6 @@ import org.jboss.ws.jaxrpc.Style; import org.jboss.ws.metadata.jaxrpcmapping.JavaWsdlMapping; import org.jboss.ws.metadata.jaxrpcmapping.JavaXmlTypeMapping; -import org.jboss.ws.metadata.umdm.EndpointMetaData; -import org.jboss.ws.metadata.umdm.OperationMetaData; -import org.jboss.ws.metadata.umdm.ParameterMetaData; -import org.jboss.ws.metadata.umdm.ServiceMetaData; -import org.jboss.ws.metadata.umdm.UnifiedMetaData; -import org.jboss.ws.metadata.umdm.WrappedParameter; import org.jboss.ws.metadata.wsdl.NCName; import org.jboss.ws.metadata.wsdl.WSDLDefinitions; import org.jboss.ws.metadata.wsdl.WSDLService; Modified: branches/tdiesler/trunk/src/main/java/org/jboss/ws/tools/jaxws/WSDLGenerator.java =================================================================== --- branches/tdiesler/trunk/src/main/java/org/jboss/ws/tools/jaxws/WSDLGenerator.java 2006-12-06 01:10:43 UTC (rev 1564) +++ branches/tdiesler/trunk/src/main/java/org/jboss/ws/tools/jaxws/WSDLGenerator.java 2006-12-06 01:14:45 UTC (rev 1565) @@ -27,13 +27,13 @@ import javax.xml.rpc.ParameterMode; import org.jboss.ws.common.Constants; +import org.jboss.ws.common.umdm.EndpointMetaData; +import org.jboss.ws.common.umdm.FaultMetaData; +import org.jboss.ws.common.umdm.OperationMetaData; +import org.jboss.ws.common.umdm.ParameterMetaData; +import org.jboss.ws.common.umdm.ServerEndpointMetaData; +import org.jboss.ws.common.umdm.ServiceMetaData; import org.jboss.ws.jaxrpc.Style; -import org.jboss.ws.metadata.umdm.EndpointMetaData; -import org.jboss.ws.metadata.umdm.FaultMetaData; -import org.jboss.ws.metadata.umdm.OperationMetaData; -import org.jboss.ws.metadata.umdm.ParameterMetaData; -import org.jboss.ws.metadata.umdm.ServerEndpointMetaData; -import org.jboss.ws.metadata.umdm.ServiceMetaData; import org.jboss.ws.metadata.wsdl.NCName; import org.jboss.ws.metadata.wsdl.WSDLBinding; import org.jboss.ws.metadata.wsdl.WSDLBindingFault; Modified: branches/tdiesler/trunk/src/main/java/org/jboss/ws/tools/metadata/ReflectiveMetaDataBuilder.java =================================================================== --- branches/tdiesler/trunk/src/main/java/org/jboss/ws/tools/metadata/ReflectiveMetaDataBuilder.java 2006-12-06 01:10:43 UTC (rev 1564) +++ branches/tdiesler/trunk/src/main/java/org/jboss/ws/tools/metadata/ReflectiveMetaDataBuilder.java 2006-12-06 01:14:45 UTC (rev 1565) @@ -35,13 +35,13 @@ import org.jboss.ws.common.Constants; import org.jboss.ws.common.WSException; +import org.jboss.ws.common.umdm.FaultMetaData; +import org.jboss.ws.common.umdm.OperationMetaData; +import org.jboss.ws.common.umdm.ParameterMetaData; +import org.jboss.ws.common.umdm.WrappedParameter; import org.jboss.ws.common.utils.HolderUtils; import org.jboss.ws.common.utils.JavaUtils; import org.jboss.ws.jaxrpc.ParameterWrapping; -import org.jboss.ws.metadata.umdm.FaultMetaData; -import org.jboss.ws.metadata.umdm.OperationMetaData; -import org.jboss.ws.metadata.umdm.ParameterMetaData; -import org.jboss.ws.metadata.umdm.WrappedParameter; import org.jboss.ws.metadata.wsdl.WSDLUtils; import org.jboss.ws.tools.ToolsUtils; import org.jboss.ws.tools.Configuration.OperationConfig; Modified: branches/tdiesler/trunk/src/main/java/org/jboss/ws/tools/metadata/ToolsAnnotationMetaDataBuilder.java =================================================================== --- branches/tdiesler/trunk/src/main/java/org/jboss/ws/tools/metadata/ToolsAnnotationMetaDataBuilder.java 2006-12-06 01:10:43 UTC (rev 1564) +++ branches/tdiesler/trunk/src/main/java/org/jboss/ws/tools/metadata/ToolsAnnotationMetaDataBuilder.java 2006-12-06 01:14:45 UTC (rev 1565) @@ -36,10 +36,10 @@ import javax.xml.rpc.holders.Holder; import org.jboss.ws.common.WSException; +import org.jboss.ws.common.umdm.FaultMetaData; +import org.jboss.ws.common.umdm.OperationMetaData; +import org.jboss.ws.common.umdm.ParameterMetaData; import org.jboss.ws.jaxrpc.Style; -import org.jboss.ws.metadata.umdm.FaultMetaData; -import org.jboss.ws.metadata.umdm.OperationMetaData; -import org.jboss.ws.metadata.umdm.ParameterMetaData; import org.jboss.ws.metadata.wsdl.WSDLUtils; import org.jboss.ws.tools.ToolsUtils; Modified: branches/tdiesler/trunk/src/main/java/org/jboss/ws/tools/metadata/ToolsEndpointMetaData.java =================================================================== --- branches/tdiesler/trunk/src/main/java/org/jboss/ws/tools/metadata/ToolsEndpointMetaData.java 2006-12-06 01:10:43 UTC (rev 1564) +++ branches/tdiesler/trunk/src/main/java/org/jboss/ws/tools/metadata/ToolsEndpointMetaData.java 2006-12-06 01:14:45 UTC (rev 1565) @@ -26,8 +26,8 @@ import javax.xml.namespace.QName; import org.jboss.util.NotImplementedException; -import org.jboss.ws.metadata.umdm.EndpointMetaData; -import org.jboss.ws.metadata.umdm.ServiceMetaData; +import org.jboss.ws.common.umdm.EndpointMetaData; +import org.jboss.ws.common.umdm.ServiceMetaData; /** * Tools Endpoint Metadata Modified: branches/tdiesler/trunk/src/main/java/org/jboss/ws/tools/metadata/ToolsUnifiedMetaDataBuilder.java =================================================================== --- branches/tdiesler/trunk/src/main/java/org/jboss/ws/tools/metadata/ToolsUnifiedMetaDataBuilder.java 2006-12-06 01:10:43 UTC (rev 1564) +++ branches/tdiesler/trunk/src/main/java/org/jboss/ws/tools/metadata/ToolsUnifiedMetaDataBuilder.java 2006-12-06 01:14:45 UTC (rev 1565) @@ -32,9 +32,9 @@ import org.jboss.logging.Logger; import org.jboss.ws.common.WSException; +import org.jboss.ws.common.umdm.ServiceMetaData; +import org.jboss.ws.common.umdm.UnifiedMetaData; import org.jboss.ws.jaxrpc.Style; -import org.jboss.ws.metadata.umdm.ServiceMetaData; -import org.jboss.ws.metadata.umdm.UnifiedMetaData; import org.jboss.ws.metadata.wsdl.WSDLUtils; import org.jboss.ws.tools.Configuration.OperationConfig; Modified: branches/tdiesler/trunk/src/test/java/org/jboss/test/ws/common/binding/SOAPBindingTestCase.java =================================================================== --- branches/tdiesler/trunk/src/test/java/org/jboss/test/ws/common/binding/SOAPBindingTestCase.java 2006-12-06 01:10:43 UTC (rev 1564) +++ branches/tdiesler/trunk/src/test/java/org/jboss/test/ws/common/binding/SOAPBindingTestCase.java 2006-12-06 01:14:45 UTC (rev 1565) @@ -36,6 +36,9 @@ import org.jboss.test.ws.JBossWSTest; import org.jboss.ws.common.Constants; +import org.jboss.ws.common.umdm.OperationMetaData; +import org.jboss.ws.common.umdm.ParameterMetaData; +import org.jboss.ws.common.umdm.EndpointMetaData.Type; import org.jboss.ws.common.utils.DOMUtils; import org.jboss.ws.core.CommonBinding; import org.jboss.ws.core.CommonBindingProvider; @@ -47,9 +50,6 @@ import org.jboss.ws.core.soap.MessageFactoryImpl; import org.jboss.ws.jaxrpc.CallImpl; import org.jboss.ws.jaxrpc.handler.SOAPMessageContextJAXRPC; -import org.jboss.ws.metadata.umdm.OperationMetaData; -import org.jboss.ws.metadata.umdm.ParameterMetaData; -import org.jboss.ws.metadata.umdm.EndpointMetaData.Type; /** * Test the SOAPBindingProvider Modified: branches/tdiesler/trunk/src/test/java/org/jboss/test/ws/common/soap/attachment/GenericAttachmentTestCase.java =================================================================== --- branches/tdiesler/trunk/src/test/java/org/jboss/test/ws/common/soap/attachment/GenericAttachmentTestCase.java 2006-12-06 01:10:43 UTC (rev 1564) +++ branches/tdiesler/trunk/src/test/java/org/jboss/test/ws/common/soap/attachment/GenericAttachmentTestCase.java 2006-12-06 01:14:45 UTC (rev 1565) @@ -41,6 +41,8 @@ import org.jboss.test.ws.JBossWSTest; import org.jboss.ws.common.Constants; +import org.jboss.ws.common.umdm.OperationMetaData; +import org.jboss.ws.common.umdm.EndpointMetaData.Type; import org.jboss.ws.core.CommonBinding; import org.jboss.ws.core.CommonBindingProvider; import org.jboss.ws.core.CommonSOAPBinding; @@ -50,8 +52,6 @@ import org.jboss.ws.core.soap.attachment.MimeConstants; import org.jboss.ws.jaxrpc.CallImpl; import org.jboss.ws.jaxrpc.handler.SOAPMessageContextJAXRPC; -import org.jboss.ws.metadata.umdm.OperationMetaData; -import org.jboss.ws.metadata.umdm.EndpointMetaData.Type; /** * TODO Modified: branches/tdiesler/trunk/src/test/java/org/jboss/test/ws/jaxrpc/samples/dynamichandler/DynamicHandlerTestCase.java =================================================================== --- branches/tdiesler/trunk/src/test/java/org/jboss/test/ws/jaxrpc/samples/dynamichandler/DynamicHandlerTestCase.java 2006-12-06 01:10:43 UTC (rev 1564) +++ branches/tdiesler/trunk/src/test/java/org/jboss/test/ws/jaxrpc/samples/dynamichandler/DynamicHandlerTestCase.java 2006-12-06 01:14:45 UTC (rev 1565) @@ -35,9 +35,9 @@ import org.jboss.test.ws.JBossWSTest; import org.jboss.test.ws.JBossWSTestSetup; +import org.jboss.ws.common.umdm.HandlerMetaData; import org.jboss.ws.common.utils.ObjectNameFactory; import org.jboss.ws.jaxrpc.ServiceExt; -import org.jboss.ws.metadata.umdm.HandlerMetaData; /** * Test dynamic handlers Modified: branches/tdiesler/trunk/src/test/java/org/jboss/test/ws/jaxws/jsr181/webparam/JSR181WebParamTestCase.java =================================================================== --- branches/tdiesler/trunk/src/test/java/org/jboss/test/ws/jaxws/jsr181/webparam/JSR181WebParamTestCase.java 2006-12-06 01:10:43 UTC (rev 1564) +++ branches/tdiesler/trunk/src/test/java/org/jboss/test/ws/jaxws/jsr181/webparam/JSR181WebParamTestCase.java 2006-12-06 01:14:45 UTC (rev 1565) @@ -32,10 +32,10 @@ import org.jboss.test.ws.JBossWSTest; import org.jboss.test.ws.JBossWSTestSetup; +import org.jboss.ws.common.umdm.OperationMetaData; +import org.jboss.ws.common.umdm.ParameterMetaData; import org.jboss.ws.jaxrpc.CallImpl; import org.jboss.ws.jaxrpc.ServiceFactoryImpl; -import org.jboss.ws.metadata.umdm.OperationMetaData; -import org.jboss.ws.metadata.umdm.ParameterMetaData; /** * Test the JSR-181 annotation: javax.jws.WebParam 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 01:10:43 UTC (rev 1564) +++ branches/tdiesler/trunk/src/test/java/org/jboss/test/ws/jaxws/jsr181/webresult/JSR181WebResultTestCase.java 2006-12-06 01:14:45 UTC (rev 1565) @@ -37,10 +37,10 @@ import org.jboss.test.ws.JBossWSTest; import org.jboss.test.ws.JBossWSTestSetup; +import org.jboss.ws.common.umdm.OperationMetaData; import org.jboss.ws.core.soap.NameImpl; import org.jboss.ws.jaxrpc.CallImpl; import org.jboss.ws.jaxrpc.ServiceFactoryImpl; -import org.jboss.ws.metadata.umdm.OperationMetaData; /** * Test the JSR-181 annotation: javax.jws.webresult