Author: thomas.diesler(a)jboss.com Date: 2007-03-08 11:21:20 -0500 (Thu, 08 Mar 2007) New Revision: 2553 Added: branches/tdiesler/trunk/integration-jboss50/src/java/org/jboss/ws/integration/jboss50/serviceref/ branches/tdiesler/trunk/integration-jboss50/src/java/org/jboss/ws/integration/jboss50/serviceref/ServiceRefHandlerImpl.java branches/tdiesler/trunk/integration-jboss50/src/java/org/jboss/ws/integration/jboss50/serviceref/ServiceRefHandlerMBean.java branches/tdiesler/trunk/jbossws-core/src/java/org/jboss/ws/integration/ branches/tdiesler/trunk/jbossws-core/src/java/org/jboss/ws/integration/UnifiedVirtualFile.java Removed: branches/tdiesler/trunk/integration-jboss50/src/java/org/jboss/ws/integration/jboss50/ServiceRefHandler.java branches/tdiesler/trunk/integration-jboss50/src/java/org/jboss/ws/integration/jboss50/ServiceRefHandlerMBean.java branches/tdiesler/trunk/jbossws-core/src/java/org/jboss/ws/core/UnifiedVirtualFile.java branches/tdiesler/trunk/jbossws-core/src/java/org/jboss/ws/metadata/j2ee/serviceref/CallPropertyMetaData.java branches/tdiesler/trunk/jbossws-core/src/java/org/jboss/ws/metadata/j2ee/serviceref/HandlerChainMetaData.java branches/tdiesler/trunk/jbossws-core/src/java/org/jboss/ws/metadata/j2ee/serviceref/HandlerChainsMetaData.java branches/tdiesler/trunk/jbossws-core/src/java/org/jboss/ws/metadata/j2ee/serviceref/HandlerMetaData.java branches/tdiesler/trunk/jbossws-core/src/java/org/jboss/ws/metadata/j2ee/serviceref/InitParamMetaData.java branches/tdiesler/trunk/jbossws-core/src/java/org/jboss/ws/metadata/j2ee/serviceref/PortComponentRefMetaData.java branches/tdiesler/trunk/jbossws-core/src/java/org/jboss/ws/metadata/j2ee/serviceref/ServiceRefMetaData.java branches/tdiesler/trunk/jbossws-core/src/java/org/jboss/ws/metadata/j2ee/serviceref/ServiceRefObjectFactory.java branches/tdiesler/trunk/jbossws-core/src/java/org/jboss/ws/metadata/j2ee/serviceref/StubPropertyMetaData.java Modified: branches/tdiesler/trunk/build/etc/jbossws-component-info.xml branches/tdiesler/trunk/build/version.properties branches/tdiesler/trunk/integration-jboss40/src/java/org/jboss/ws/integration/jboss40/DeployerInterceptorEJB21.java branches/tdiesler/trunk/integration-jboss40/src/java/org/jboss/ws/integration/jboss40/DeployerInterceptorJSE.java branches/tdiesler/trunk/integration-jboss42/src/java/org/jboss/ws/integration/jboss42/DeployerInterceptorEJB21.java branches/tdiesler/trunk/integration-jboss42/src/java/org/jboss/ws/integration/jboss42/DeployerInterceptorJSE.java branches/tdiesler/trunk/integration-jboss42/src/java/org/jboss/ws/integration/jboss42/URLLoaderAdapter.java branches/tdiesler/trunk/integration-jboss50/.classpath branches/tdiesler/trunk/integration-jboss50/src/java/org/jboss/ws/integration/jboss50/JAXRPCDeployerJSE.java branches/tdiesler/trunk/integration-jboss50/src/java/org/jboss/ws/integration/jboss50/VirtualFileAdaptor.java branches/tdiesler/trunk/integration-tomcat/src/java/org/jboss/ws/integration/tomcat/TomcatServiceEndpointServlet.java branches/tdiesler/trunk/jbossws-core/build.xml branches/tdiesler/trunk/jbossws-core/src/java/org/jboss/ws/core/jaxrpc/client/ServiceReferenceable.java branches/tdiesler/trunk/jbossws-core/src/java/org/jboss/ws/core/jaxws/client/ServiceExt.java branches/tdiesler/trunk/jbossws-core/src/java/org/jboss/ws/core/jaxws/spi/ServiceDelegateImpl.java branches/tdiesler/trunk/jbossws-core/src/java/org/jboss/ws/core/server/UnifiedDeploymentInfo.java branches/tdiesler/trunk/jbossws-core/src/java/org/jboss/ws/extensions/security/jaxrpc/WSSecurityHandler.java branches/tdiesler/trunk/jbossws-core/src/java/org/jboss/ws/extensions/security/jaxws/WSSecurityHandler.java branches/tdiesler/trunk/jbossws-core/src/java/org/jboss/ws/metadata/builder/jaxrpc/JAXRPCClientMetaDataBuilder.java branches/tdiesler/trunk/jbossws-core/src/java/org/jboss/ws/metadata/builder/jaxrpc/JAXRPCDeployment.java branches/tdiesler/trunk/jbossws-core/src/java/org/jboss/ws/metadata/builder/jaxws/JAXWSClientMetaDataBuilder.java branches/tdiesler/trunk/jbossws-core/src/java/org/jboss/ws/metadata/config/JBossWSConfigFactory.java branches/tdiesler/trunk/jbossws-core/src/java/org/jboss/ws/metadata/j2ee/serviceref/UnifiedCallPropertyMetaData.java branches/tdiesler/trunk/jbossws-core/src/java/org/jboss/ws/metadata/j2ee/serviceref/UnifiedHandlerChainMetaData.java branches/tdiesler/trunk/jbossws-core/src/java/org/jboss/ws/metadata/j2ee/serviceref/UnifiedHandlerChainsMetaData.java branches/tdiesler/trunk/jbossws-core/src/java/org/jboss/ws/metadata/j2ee/serviceref/UnifiedHandlerMetaData.java branches/tdiesler/trunk/jbossws-core/src/java/org/jboss/ws/metadata/j2ee/serviceref/UnifiedInitParamMetaData.java branches/tdiesler/trunk/jbossws-core/src/java/org/jboss/ws/metadata/j2ee/serviceref/UnifiedPortComponentRefMetaData.java branches/tdiesler/trunk/jbossws-core/src/java/org/jboss/ws/metadata/j2ee/serviceref/UnifiedServiceRefMetaData.java branches/tdiesler/trunk/jbossws-core/src/java/org/jboss/ws/metadata/j2ee/serviceref/UnifiedStubPropertyMetaData.java branches/tdiesler/trunk/jbossws-core/src/java/org/jboss/ws/metadata/umdm/EndpointMetaData.java branches/tdiesler/trunk/jbossws-core/src/java/org/jboss/ws/metadata/umdm/ResourceLoaderAdapter.java branches/tdiesler/trunk/jbossws-core/src/java/org/jboss/ws/metadata/umdm/ServiceMetaData.java branches/tdiesler/trunk/jbossws-core/src/java/org/jboss/ws/metadata/umdm/UnifiedMetaData.java branches/tdiesler/trunk/jbossws-core/src/java/org/jboss/ws/metadata/wsse/WSSecurityConfigFactory.java Log: Modified: branches/tdiesler/trunk/build/etc/jbossws-component-info.xml =================================================================== --- branches/tdiesler/trunk/build/etc/jbossws-component-info.xml 2007-03-08 16:07:14 UTC (rev 2552) +++ branches/tdiesler/trunk/build/etc/jbossws-component-info.xml 2007-03-08 16:21:20 UTC (rev 2553) @@ -2,6 +2,7 @@ <component id="jboss/jbossws" licenseType="lgpl" version=&quot;@repository.id(a)&quot; description="JBossWS an implementation of J2EE Web Services"> + <artifact id="jbossws-integration.jar"/> <artifact id="jbossws-client.jar"/> <artifact id="jbossws-core.jar"/> <artifact id="jboss-jaxrpc.jar"/> @@ -43,6 +44,7 @@ </import> <export> + <include input="jbossws-integration.jar"/> <include input="jbossws-core.jar"/> <include input="jboss-jaxrpc.jar"/> <include input="jboss-jaxws.jar"/> Modified: branches/tdiesler/trunk/build/version.properties =================================================================== --- branches/tdiesler/trunk/build/version.properties 2007-03-08 16:07:14 UTC (rev 2552) +++ branches/tdiesler/trunk/build/version.properties 2007-03-08 16:21:20 UTC (rev 2553) @@ -17,7 +17,7 @@ apache-xmlsec=1.3.0 ibm-wsdl4j=1.5.2jboss javassist=3.5.0.CR1 -jboss-jbossxb=1.0.0.CR9 +jboss-jbossxb=2.0.0.CR1 jboss-microcontainer=2.0.0.Beta3 jboss-remoting=2.2.0.Alpha7 sun-jaxb=2.0.3 Modified: branches/tdiesler/trunk/integration-jboss40/src/java/org/jboss/ws/integration/jboss40/DeployerInterceptorEJB21.java =================================================================== --- branches/tdiesler/trunk/integration-jboss40/src/java/org/jboss/ws/integration/jboss40/DeployerInterceptorEJB21.java 2007-03-08 16:07:14 UTC (rev 2552) +++ branches/tdiesler/trunk/integration-jboss40/src/java/org/jboss/ws/integration/jboss40/DeployerInterceptorEJB21.java 2007-03-08 16:21:20 UTC (rev 2553) @@ -31,8 +31,8 @@ import org.jboss.metadata.ApplicationMetaData; import org.jboss.metadata.BeanMetaData; import org.jboss.ws.WSException; -import org.jboss.ws.core.UnifiedVirtualFile; import org.jboss.ws.core.server.UnifiedDeploymentInfo; +import org.jboss.ws.integration.UnifiedVirtualFile; import org.jboss.ws.integration.jboss42.ServiceEndpointGeneratorEJB21; import org.jboss.ws.metadata.builder.jaxrpc.JAXRPCDeployment; import org.jboss.ws.metadata.umdm.ResourceLoaderAdapter; Modified: branches/tdiesler/trunk/integration-jboss40/src/java/org/jboss/ws/integration/jboss40/DeployerInterceptorJSE.java =================================================================== --- branches/tdiesler/trunk/integration-jboss40/src/java/org/jboss/ws/integration/jboss40/DeployerInterceptorJSE.java 2007-03-08 16:07:14 UTC (rev 2552) +++ branches/tdiesler/trunk/integration-jboss40/src/java/org/jboss/ws/integration/jboss40/DeployerInterceptorJSE.java 2007-03-08 16:21:20 UTC (rev 2553) @@ -33,12 +33,12 @@ import org.jboss.deployment.DeploymentInfo; import org.jboss.metadata.WebMetaData; import org.jboss.ws.WSException; -import org.jboss.ws.core.UnifiedVirtualFile; import org.jboss.ws.core.server.AbstractServiceEndpointPublisher; import org.jboss.ws.core.server.JAXWSDeployment; import org.jboss.ws.core.server.UnifiedDeploymentInfo; import org.jboss.ws.core.server.AbstractServiceEndpointPublisher.RewriteResults; import org.jboss.ws.core.server.UnifiedDeploymentInfo.DeploymentType; +import org.jboss.ws.integration.UnifiedVirtualFile; import org.jboss.ws.metadata.builder.jaxrpc.JAXRPCDeployment; import org.jboss.ws.metadata.umdm.EndpointMetaData; import org.jboss.ws.metadata.umdm.ResourceLoaderAdapter; Modified: branches/tdiesler/trunk/integration-jboss42/src/java/org/jboss/ws/integration/jboss42/DeployerInterceptorEJB21.java =================================================================== --- branches/tdiesler/trunk/integration-jboss42/src/java/org/jboss/ws/integration/jboss42/DeployerInterceptorEJB21.java 2007-03-08 16:07:14 UTC (rev 2552) +++ branches/tdiesler/trunk/integration-jboss42/src/java/org/jboss/ws/integration/jboss42/DeployerInterceptorEJB21.java 2007-03-08 16:21:20 UTC (rev 2553) @@ -31,8 +31,8 @@ import org.jboss.metadata.ApplicationMetaData; import org.jboss.metadata.BeanMetaData; import org.jboss.ws.WSException; -import org.jboss.ws.core.UnifiedVirtualFile; import org.jboss.ws.core.server.UnifiedDeploymentInfo; +import org.jboss.ws.integration.UnifiedVirtualFile; import org.jboss.ws.metadata.builder.jaxrpc.JAXRPCDeployment; import org.jboss.ws.metadata.umdm.ResourceLoaderAdapter; import org.jboss.ws.metadata.umdm.UnifiedMetaData; Modified: branches/tdiesler/trunk/integration-jboss42/src/java/org/jboss/ws/integration/jboss42/DeployerInterceptorJSE.java =================================================================== --- branches/tdiesler/trunk/integration-jboss42/src/java/org/jboss/ws/integration/jboss42/DeployerInterceptorJSE.java 2007-03-08 16:07:14 UTC (rev 2552) +++ branches/tdiesler/trunk/integration-jboss42/src/java/org/jboss/ws/integration/jboss42/DeployerInterceptorJSE.java 2007-03-08 16:21:20 UTC (rev 2553) @@ -33,12 +33,12 @@ import org.jboss.deployment.DeploymentInfo; import org.jboss.metadata.WebMetaData; import org.jboss.ws.WSException; -import org.jboss.ws.core.UnifiedVirtualFile; import org.jboss.ws.core.server.AbstractServiceEndpointPublisher; import org.jboss.ws.core.server.JAXWSDeployment; import org.jboss.ws.core.server.UnifiedDeploymentInfo; import org.jboss.ws.core.server.AbstractServiceEndpointPublisher.RewriteResults; import org.jboss.ws.core.server.UnifiedDeploymentInfo.DeploymentType; +import org.jboss.ws.integration.UnifiedVirtualFile; import org.jboss.ws.metadata.builder.jaxrpc.JAXRPCDeployment; import org.jboss.ws.metadata.umdm.EndpointMetaData; import org.jboss.ws.metadata.umdm.ResourceLoaderAdapter; Modified: branches/tdiesler/trunk/integration-jboss42/src/java/org/jboss/ws/integration/jboss42/URLLoaderAdapter.java =================================================================== --- branches/tdiesler/trunk/integration-jboss42/src/java/org/jboss/ws/integration/jboss42/URLLoaderAdapter.java 2007-03-08 16:07:14 UTC (rev 2552) +++ branches/tdiesler/trunk/integration-jboss42/src/java/org/jboss/ws/integration/jboss42/URLLoaderAdapter.java 2007-03-08 16:21:20 UTC (rev 2553) @@ -29,7 +29,7 @@ import java.net.URL; import java.net.URLClassLoader; -import org.jboss.ws.core.UnifiedVirtualFile; +import org.jboss.ws.integration.UnifiedVirtualFile; /** * The default file adapter loads resources through an associated classloader. Modified: branches/tdiesler/trunk/integration-jboss50/.classpath =================================================================== --- branches/tdiesler/trunk/integration-jboss50/.classpath 2007-03-08 16:07:14 UTC (rev 2552) +++ branches/tdiesler/trunk/integration-jboss50/.classpath 2007-03-08 16:21:20 UTC (rev 2553) @@ -28,7 +28,7 @@ <classpathentry kind="lib" path="/build/thirdparty/xercesImpl.jar"/> <classpathentry kind="lib" path="/build/thirdparty/mail.jar"/> <classpathentry kind="lib" path="/build/thirdparty/jbosssx-client.jar" sourcepath="/build/thirdparty/jbosssx-src.zip"/> + <classpathentry kind="lib" path="/build/thirdparty/jboss-common.jar" sourcepath="/build/thirdparty/jboss-common-sources.jar"/> <classpathentry kind="con" path="org.eclipse.jdt.USER_LIBRARY/jboss-5.0.x"/> - <classpathentry kind="lib" path="/build/thirdparty/jboss-common.jar" sourcepath="/build/thirdparty/jboss-common-sources.jar"/> <classpathentry kind="output" path="output-eclipse"/> </classpath> Modified: branches/tdiesler/trunk/integration-jboss50/src/java/org/jboss/ws/integration/jboss50/JAXRPCDeployerJSE.java =================================================================== --- branches/tdiesler/trunk/integration-jboss50/src/java/org/jboss/ws/integration/jboss50/JAXRPCDeployerJSE.java 2007-03-08 16:07:14 UTC (rev 2552) +++ branches/tdiesler/trunk/integration-jboss50/src/java/org/jboss/ws/integration/jboss50/JAXRPCDeployerJSE.java 2007-03-08 16:21:20 UTC (rev 2553) @@ -27,9 +27,9 @@ import org.jboss.deployers.spi.deployer.DeploymentUnit; import org.jboss.metadata.WebMetaData; import org.jboss.virtual.VirtualFile; -import org.jboss.ws.core.UnifiedVirtualFile; import org.jboss.ws.core.server.UnifiedDeploymentInfo; import org.jboss.ws.core.server.UnifiedDeploymentInfo.DeploymentType; +import org.jboss.ws.integration.UnifiedVirtualFile; import org.jboss.ws.metadata.builder.jaxrpc.JAXRPCDeployment; /** Deleted: branches/tdiesler/trunk/integration-jboss50/src/java/org/jboss/ws/integration/jboss50/ServiceRefHandler.java =================================================================== --- branches/tdiesler/trunk/integration-jboss50/src/java/org/jboss/ws/integration/jboss50/ServiceRefHandler.java 2007-03-08 16:07:14 UTC (rev 2552) +++ branches/tdiesler/trunk/integration-jboss50/src/java/org/jboss/ws/integration/jboss50/ServiceRefHandler.java 2007-03-08 16:21:20 UTC (rev 2553) @@ -1,108 +0,0 @@ -/* - * JBoss, Home of Professional Open Source - * Copyright 2005, JBoss Inc., and individual contributors as indicated - * by the @authors tag. See the copyright.txt in the distribution for a - * full listing of individual contributors. - * - * This is free software; you can redistribute it and/or modify it - * under the terms of the GNU Lesser General Public License as - * published by the Free Software Foundation; either version 2.1 of - * the License, or (at your option) any later version. - * - * This software is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * Lesser General Public License for more details. - * - * You should have received a copy of the GNU Lesser General Public - * License along with this software; if not, write to the Free - * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA - * 02110-1301 USA, or see the FSF site: http://www.fsf.org. - */ -package org.jboss.ws.integration.jboss50; - -// $Id$ - -import java.io.IOException; -import java.lang.reflect.AnnotatedElement; - -import javax.management.MBeanServer; -import javax.naming.Context; -import javax.naming.NamingException; - -import org.jboss.logging.Logger; -import org.jboss.mx.util.MBeanServerLocator; -import org.jboss.virtual.VirtualFile; -import org.jboss.ws.core.jaxrpc.client.ServiceRefHandlerJAXRPC; -import org.jboss.ws.core.jaxws.client.ServiceRefHandlerJAXWS; -import org.jboss.ws.core.utils.DOMUtils; -import org.jboss.ws.core.utils.DOMWriter; -import org.jboss.ws.metadata.j2ee.serviceref.UnifiedServiceRefMetaData; -import org.jboss.ws.metadata.j2ee.serviceref.ServiceRefObjectFactory; -import org.w3c.dom.Element; - -/** - * Binds a JAXRPC Service object in the client's ENC for every service-ref element in the - * deployment descriptor. - * - * @author Thomas.Diesler(a)jboss.org - * @since 04-Nov-2006 - */ -public class ServiceRefHandler implements ServiceRefHandlerMBean -{ - // logging support - private static Logger log = Logger.getLogger(ServiceRefHandler.class); - - /** - * Binds a Service into the callers ENC for every service-ref element - */ - public void setupServiceRef(Context encCtx, String encName, AnnotatedElement anElement, VirtualFile vfsRoot, String xmlFragment) throws NamingException - { - try - { - Element root = DOMUtils.parse(xmlFragment); - if (log.isDebugEnabled()) - log.debug("setupServiceRef\n" + DOMWriter.printNode(root, true)); - } - catch (IOException e) - { - log.error("Invalid service-ref: " + xmlFragment); - } - - ServiceRefObjectFactory factory = ServiceRefObjectFactory.newInstance(); - UnifiedServiceRefMetaData serviceRef = factory.parse(xmlFragment); - serviceRef.setVfsRoot(new VirtualFileAdaptor(vfsRoot)); - - if (isServiceRefJaxRpc(serviceRef)) - { - ServiceRefHandlerJAXRPC handler = new ServiceRefHandlerJAXRPC(); - handler.setupServiceRef(encCtx, encName, serviceRef); - } - else - { - ServiceRefHandlerJAXWS handler = new ServiceRefHandlerJAXWS(); - handler.setupServiceRef(encCtx, encName, anElement, serviceRef); - } - } - - private boolean isServiceRefJaxRpc(UnifiedServiceRefMetaData serviceRef) - { - // The <service-interface> is a required element - // for JAXRPC and not defined for JAXWS - return serviceRef.getServiceInterface() != null; - } - - public void create() throws Exception - { - MBeanServer server = MBeanServerLocator.locateJBoss(); - if (server != null) - server.registerMBean(this, OBJECT_NAME); - } - - public void destroy() throws Exception - { - MBeanServer server = MBeanServerLocator.locateJBoss(); - if (server != null) - server.unregisterMBean(OBJECT_NAME); - } -} Deleted: branches/tdiesler/trunk/integration-jboss50/src/java/org/jboss/ws/integration/jboss50/ServiceRefHandlerMBean.java =================================================================== --- branches/tdiesler/trunk/integration-jboss50/src/java/org/jboss/ws/integration/jboss50/ServiceRefHandlerMBean.java 2007-03-08 16:07:14 UTC (rev 2552) +++ branches/tdiesler/trunk/integration-jboss50/src/java/org/jboss/ws/integration/jboss50/ServiceRefHandlerMBean.java 2007-03-08 16:21:20 UTC (rev 2553) @@ -1,45 +0,0 @@ -/* -* JBoss, Home of Professional Open Source -* Copyright 2005, JBoss Inc., and individual contributors as indicated -* by the @authors tag. See the copyright.txt in the distribution for a -* full listing of individual contributors. -* -* This is free software; you can redistribute it and/or modify it -* under the terms of the GNU Lesser General Public License as -* published by the Free Software Foundation; either version 2.1 of -* the License, or (at your option) any later version. -* -* This software is distributed in the hope that it will be useful, -* but WITHOUT ANY WARRANTY; without even the implied warranty of -* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU -* Lesser General Public License for more details. -* -* You should have received a copy of the GNU Lesser General Public -* License along with this software; if not, write to the Free -* Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA -* 02110-1301 USA, or see the FSF site: http://www.fsf.org. -*/ -package org.jboss.ws.integration.jboss50; - -import java.lang.reflect.AnnotatedElement; - -import javax.management.ObjectName; -import javax.naming.Context; -import javax.naming.NamingException; - -import org.jboss.virtual.VirtualFile; -import org.jboss.ws.core.utils.ObjectNameFactory; - -/** - * MBean interface. - */ -public interface ServiceRefHandlerMBean -{ - // default object name - public static final ObjectName OBJECT_NAME = ObjectNameFactory.create("jboss.ws:service=ServiceRefHandler"); - - /** - * Binds a Service into the callers ENC for every service-ref element - */ - void setupServiceRef(Context encCtx, String encName, AnnotatedElement anElement, VirtualFile vfsRoot, String xmlFragment) throws NamingException; -} Modified: branches/tdiesler/trunk/integration-jboss50/src/java/org/jboss/ws/integration/jboss50/VirtualFileAdaptor.java =================================================================== --- branches/tdiesler/trunk/integration-jboss50/src/java/org/jboss/ws/integration/jboss50/VirtualFileAdaptor.java 2007-03-08 16:07:14 UTC (rev 2552) +++ branches/tdiesler/trunk/integration-jboss50/src/java/org/jboss/ws/integration/jboss50/VirtualFileAdaptor.java 2007-03-08 16:21:20 UTC (rev 2553) @@ -25,7 +25,7 @@ import java.net.URL; import org.jboss.virtual.VirtualFile; -import org.jboss.ws.core.UnifiedVirtualFile; +import org.jboss.ws.integration.UnifiedVirtualFile; // $Id$ Added: branches/tdiesler/trunk/integration-jboss50/src/java/org/jboss/ws/integration/jboss50/serviceref/ServiceRefHandlerImpl.java =================================================================== --- branches/tdiesler/trunk/integration-jboss50/src/java/org/jboss/ws/integration/jboss50/serviceref/ServiceRefHandlerImpl.java (rev 0) +++ branches/tdiesler/trunk/integration-jboss50/src/java/org/jboss/ws/integration/jboss50/serviceref/ServiceRefHandlerImpl.java 2007-03-08 16:21:20 UTC (rev 2553) @@ -0,0 +1,120 @@ +/* + * JBoss, Home of Professional Open Source + * Copyright 2005, JBoss Inc., and individual contributors as indicated + * by the @authors tag. See the copyright.txt in the distribution for a + * full listing of individual contributors. + * + * This is free software; you can redistribute it and/or modify it + * under the terms of the GNU Lesser General Public License as + * published by the Free Software Foundation; either version 2.1 of + * the License, or (at your option) any later version. + * + * This software is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this software; if not, write to the Free + * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA + * 02110-1301 USA, or see the FSF site: http://www.fsf.org. + */ +package org.jboss.ws.integration.jboss50.serviceref; + +// $Id$ + +import java.lang.reflect.AnnotatedElement; +import java.util.Collection; + +import javax.management.MBeanServer; +import javax.naming.Context; +import javax.naming.NamingException; + +import org.jboss.logging.Logger; +import org.jboss.mx.util.MBeanServerLocator; +import org.jboss.ws.core.jaxrpc.client.ServiceRefHandlerJAXRPC; +import org.jboss.ws.core.jaxws.client.ServiceRefHandlerJAXWS; +import org.jboss.ws.integration.ServiceRefElement; +import org.jboss.ws.integration.ServiceRefMetaData; +import org.jboss.ws.integration.UnifiedVirtualFile; +import org.jboss.ws.metadata.j2ee.serviceref.UnifiedServiceRefMetaData; +import org.jboss.xb.binding.UnmarshallingContext; +import org.xml.sax.Attributes; + +/** + * Binds a JAXRPC Service object in the client's ENC for every service-ref element in the + * deployment descriptor. + * + * @author Thomas.Diesler(a)jboss.org + * @since 04-Nov-2006 + */ +public class ServiceRefHandlerImpl implements ServiceRefHandlerMBean +{ + // logging support + private static Logger log = Logger.getLogger(ServiceRefHandlerImpl.class); + + private ServiceRefObjectFactory objectFactory = new ServiceRefObjectFactory(); + + public ServiceRefMetaData newMetaData() + { + return new UnifiedServiceRefMetaData(); + } + + public void setupServiceRefs(Context envCtx, UnifiedVirtualFile vfsRoot, Collection<ServiceRefMetaData> serviceRefs) throws NamingException + { + for (ServiceRefMetaData sref : serviceRefs) + { + String encName = sref.getServiceRefName(); + setupServiceRef(envCtx, encName, vfsRoot, sref); + } + } + + public void setupServiceRef(Context encCtx, String encName, UnifiedVirtualFile vfsRoot, ServiceRefMetaData sref) throws NamingException + { + UnifiedServiceRefMetaData serviceRef = null; + serviceRef.setVfsRoot(vfsRoot); + + if (isServiceRefJaxRpc(serviceRef)) + { + ServiceRefHandlerJAXRPC handler = new ServiceRefHandlerJAXRPC(); + handler.setupServiceRef(encCtx, encName, serviceRef); + } + else + { + AnnotatedElement anElement = sref.getAnnotatedElement(); + ServiceRefHandlerJAXWS handler = new ServiceRefHandlerJAXWS(); + handler.setupServiceRef(encCtx, encName, anElement, serviceRef); + } + } + + public Object newChild(ServiceRefElement ref, UnmarshallingContext navigator, String namespaceURI, String localName, Attributes attrs) + { + return objectFactory.newChild(ref, navigator, namespaceURI, localName, attrs); + } + + public void setValue(ServiceRefElement ref, UnmarshallingContext navigator, String namespaceURI, String localName, String value) + { + objectFactory.setValue(ref, navigator, namespaceURI, localName, value); + } + + private boolean isServiceRefJaxRpc(UnifiedServiceRefMetaData serviceRef) + { + // The <service-interface> is a required element + // for JAXRPC and not defined for JAXWS + return serviceRef.getServiceInterface() != null; + } + + public void create() throws Exception + { + MBeanServer server = MBeanServerLocator.locateJBoss(); + if (server != null) + server.registerMBean(this, OBJECT_NAME); + } + + public void destroy() throws Exception + { + MBeanServer server = MBeanServerLocator.locateJBoss(); + if (server != null) + server.unregisterMBean(OBJECT_NAME); + } +} Property changes on: branches/tdiesler/trunk/integration-jboss50/src/java/org/jboss/ws/integration/jboss50/serviceref/ServiceRefHandlerImpl.java ___________________________________________________________________ Name: svn:keywords + Id Revision Name: svn:eol-style + LF Added: branches/tdiesler/trunk/integration-jboss50/src/java/org/jboss/ws/integration/jboss50/serviceref/ServiceRefHandlerMBean.java =================================================================== --- branches/tdiesler/trunk/integration-jboss50/src/java/org/jboss/ws/integration/jboss50/serviceref/ServiceRefHandlerMBean.java (rev 0) +++ branches/tdiesler/trunk/integration-jboss50/src/java/org/jboss/ws/integration/jboss50/serviceref/ServiceRefHandlerMBean.java 2007-03-08 16:21:20 UTC (rev 2553) @@ -0,0 +1,37 @@ +/* +* JBoss, Home of Professional Open Source +* Copyright 2005, JBoss Inc., and individual contributors as indicated +* by the @authors tag. See the copyright.txt in the distribution for a +* full listing of individual contributors. +* +* This is free software; you can redistribute it and/or modify it +* under the terms of the GNU Lesser General Public License as +* published by the Free Software Foundation; either version 2.1 of +* the License, or (at your option) any later version. +* +* This software is distributed in the hope that it will be useful, +* but WITHOUT ANY WARRANTY; without even the implied warranty of +* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU +* Lesser General Public License for more details. +* +* You should have received a copy of the GNU Lesser General Public +* License along with this software; if not, write to the Free +* Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA +* 02110-1301 USA, or see the FSF site: http://www.fsf.org. +*/ +package org.jboss.ws.integration.jboss50.serviceref; + +import javax.management.ObjectName; + +import org.jboss.ws.core.utils.ObjectNameFactory; +import org.jboss.ws.integration.ServiceRefHandler; + +/** + * MBean interface. + */ +public interface ServiceRefHandlerMBean extends ServiceRefHandler +{ + // default object name + public static final ObjectName OBJECT_NAME = ObjectNameFactory.create("jboss.ws:service=ServiceRefHandler"); + +} Property changes on: branches/tdiesler/trunk/integration-jboss50/src/java/org/jboss/ws/integration/jboss50/serviceref/ServiceRefHandlerMBean.java ___________________________________________________________________ Name: svn:keywords + Id Revision Name: svn:eol-style + LF Modified: branches/tdiesler/trunk/integration-tomcat/src/java/org/jboss/ws/integration/tomcat/TomcatServiceEndpointServlet.java =================================================================== --- branches/tdiesler/trunk/integration-tomcat/src/java/org/jboss/ws/integration/tomcat/TomcatServiceEndpointServlet.java 2007-03-08 16:07:14 UTC (rev 2552) +++ branches/tdiesler/trunk/integration-tomcat/src/java/org/jboss/ws/integration/tomcat/TomcatServiceEndpointServlet.java 2007-03-08 16:21:20 UTC (rev 2553) @@ -37,12 +37,12 @@ import org.jboss.kernel.spi.registry.KernelRegistryEntry; import org.jboss.logging.Logger; import org.jboss.ws.WSException; -import org.jboss.ws.core.UnifiedVirtualFile; import org.jboss.ws.core.server.AbstractServiceEndpointServlet; import org.jboss.ws.core.server.JAXWSDeployment; 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.integration.UnifiedVirtualFile; import org.jboss.ws.metadata.builder.jaxrpc.JAXRPCDeployment; import org.jboss.ws.metadata.umdm.ResourceLoaderAdapter; Modified: branches/tdiesler/trunk/jbossws-core/build.xml =================================================================== --- branches/tdiesler/trunk/jbossws-core/build.xml 2007-03-08 16:07:14 UTC (rev 2552) +++ branches/tdiesler/trunk/jbossws-core/build.xml 2007-03-08 16:21:20 UTC (rev 2553) @@ -64,7 +64,6 @@ <include name="javax/jws/**"/> <include name="org/jboss/annotation/**"/> <include name="org/jboss/ws/**"/> - <exclude name="org/jboss/ws/integration/**"/> <classpath path="${core.output.classes14.dir}"/> <classpath refid="core.classpath"/> </javac> @@ -142,6 +141,13 @@ </fileset> </jar> + <!-- Build jbossws-integration.jar --> + <jar jarfile="${core.output.lib.dir}/jbossws-integration.jar" manifest="${etc.dir}/default.mf"> + <fileset dir="${core.output.classes.dir}"> + <include name="org/jboss/ws/integration/**"/> + </fileset> + </jar> + <!-- Build jbossws-client.jar --> <jar jarfile="${core.output.lib.dir}/jbossws-client.jar" manifest="${etc.dir}/default.mf"> <fileset dir="${core.output.classes.dir}"> Deleted: branches/tdiesler/trunk/jbossws-core/src/java/org/jboss/ws/core/UnifiedVirtualFile.java =================================================================== --- branches/tdiesler/trunk/jbossws-core/src/java/org/jboss/ws/core/UnifiedVirtualFile.java 2007-03-08 16:07:14 UTC (rev 2552) +++ branches/tdiesler/trunk/jbossws-core/src/java/org/jboss/ws/core/UnifiedVirtualFile.java 2007-03-08 16:21:20 UTC (rev 2553) @@ -1,42 +0,0 @@ -/* - * JBoss, Home of Professional Open Source - * Copyright 2005, JBoss Inc., and individual contributors as indicated - * by the @authors tag. See the copyright.txt in the distribution for a - * full listing of individual contributors. - * - * This is free software; you can redistribute it and/or modify it - * under the terms of the GNU Lesser General Public License as - * published by the Free Software Foundation; either version 2.1 of - * the License, or (at your option) any later version. - * - * This software is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * Lesser General Public License for more details. - * - * You should have received a copy of the GNU Lesser General Public - * License along with this software; if not, write to the Free - * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA - * 02110-1301 USA, or see the FSF site: http://www.fsf.org. - */ -package org.jboss.ws.core; - -// $Id$ - -import java.io.IOException; -import java.io.Serializable; -import java.net.URL; - -/** - * An adaptor to a VirtualFile from jboss-vfs.jar - * jboss-vfs cannot be used in jboss-4.x because of its dependeny on jboss-common-core.jar - * - * @author Thomas.Diesler(a)jboss.org - * @since 05-May-2006 - */ -public interface UnifiedVirtualFile extends Serializable -{ - UnifiedVirtualFile findChild(String child) throws IOException; - - URL toURL(); -} Modified: branches/tdiesler/trunk/jbossws-core/src/java/org/jboss/ws/core/jaxrpc/client/ServiceReferenceable.java =================================================================== --- branches/tdiesler/trunk/jbossws-core/src/java/org/jboss/ws/core/jaxrpc/client/ServiceReferenceable.java 2007-03-08 16:07:14 UTC (rev 2552) +++ branches/tdiesler/trunk/jbossws-core/src/java/org/jboss/ws/core/jaxrpc/client/ServiceReferenceable.java 2007-03-08 16:21:20 UTC (rev 2553) @@ -36,9 +36,9 @@ import javax.naming.StringRefAddr; import org.jboss.logging.Logger; -import org.jboss.ws.core.UnifiedVirtualFile; import org.jboss.ws.core.server.ServiceEndpointManager; import org.jboss.ws.core.server.ServiceEndpointManagerFactory; +import org.jboss.ws.integration.UnifiedVirtualFile; import org.jboss.ws.metadata.j2ee.serviceref.UnifiedPortComponentRefMetaData; import org.jboss.ws.metadata.j2ee.serviceref.UnifiedServiceRefMetaData; import org.jboss.ws.metadata.wsse.WSSecurityConfiguration; Modified: branches/tdiesler/trunk/jbossws-core/src/java/org/jboss/ws/core/jaxws/client/ServiceExt.java =================================================================== --- branches/tdiesler/trunk/jbossws-core/src/java/org/jboss/ws/core/jaxws/client/ServiceExt.java 2007-03-08 16:07:14 UTC (rev 2552) +++ branches/tdiesler/trunk/jbossws-core/src/java/org/jboss/ws/core/jaxws/client/ServiceExt.java 2007-03-08 16:21:20 UTC (rev 2553) @@ -34,7 +34,7 @@ import org.jboss.ws.WSException; import org.jboss.ws.core.ConfigProvider; import org.jboss.ws.core.StubExt; -import org.jboss.ws.core.UnifiedVirtualFile; +import org.jboss.ws.integration.UnifiedVirtualFile; import org.jboss.ws.metadata.umdm.EndpointMetaData; import org.jboss.ws.metadata.umdm.ServiceMetaData; import org.jboss.ws.metadata.wsse.WSSecurityConfigFactory; Modified: branches/tdiesler/trunk/jbossws-core/src/java/org/jboss/ws/core/jaxws/spi/ServiceDelegateImpl.java =================================================================== --- branches/tdiesler/trunk/jbossws-core/src/java/org/jboss/ws/core/jaxws/spi/ServiceDelegateImpl.java 2007-03-08 16:07:14 UTC (rev 2552) +++ branches/tdiesler/trunk/jbossws-core/src/java/org/jboss/ws/core/jaxws/spi/ServiceDelegateImpl.java 2007-03-08 16:21:20 UTC (rev 2553) @@ -48,12 +48,12 @@ import org.jboss.logging.Logger; import org.jboss.util.NotImplementedException; import org.jboss.ws.core.StubExt; -import org.jboss.ws.core.UnifiedVirtualFile; import org.jboss.ws.core.jaxws.client.ClientImpl; import org.jboss.ws.core.jaxws.client.ClientProxy; import org.jboss.ws.core.jaxws.client.DispatchImpl; import org.jboss.ws.core.jaxws.client.ServiceObjectFactory; import org.jboss.ws.core.jaxws.handler.HandlerResolverImpl; +import org.jboss.ws.integration.UnifiedVirtualFile; import org.jboss.ws.metadata.builder.jaxws.JAXWSClientMetaDataBuilder; import org.jboss.ws.metadata.j2ee.serviceref.UnifiedPortComponentRefMetaData; import org.jboss.ws.metadata.j2ee.serviceref.UnifiedServiceRefMetaData; Modified: branches/tdiesler/trunk/jbossws-core/src/java/org/jboss/ws/core/server/UnifiedDeploymentInfo.java =================================================================== --- branches/tdiesler/trunk/jbossws-core/src/java/org/jboss/ws/core/server/UnifiedDeploymentInfo.java 2007-03-08 16:07:14 UTC (rev 2552) +++ branches/tdiesler/trunk/jbossws-core/src/java/org/jboss/ws/core/server/UnifiedDeploymentInfo.java 2007-03-08 16:21:20 UTC (rev 2553) @@ -31,7 +31,7 @@ import javax.management.ObjectName; -import org.jboss.ws.core.UnifiedVirtualFile; +import org.jboss.ws.integration.UnifiedVirtualFile; /** * The container independent deployment info. Modified: branches/tdiesler/trunk/jbossws-core/src/java/org/jboss/ws/extensions/security/jaxrpc/WSSecurityHandler.java =================================================================== --- branches/tdiesler/trunk/jbossws-core/src/java/org/jboss/ws/extensions/security/jaxrpc/WSSecurityHandler.java 2007-03-08 16:07:14 UTC (rev 2552) +++ branches/tdiesler/trunk/jbossws-core/src/java/org/jboss/ws/extensions/security/jaxrpc/WSSecurityHandler.java 2007-03-08 16:21:20 UTC (rev 2553) @@ -33,8 +33,8 @@ import org.jboss.logging.Logger; import org.jboss.ws.WSException; import org.jboss.ws.core.CommonMessageContext; -import org.jboss.ws.core.UnifiedVirtualFile; import org.jboss.ws.extensions.security.WSSecurityDispatcher; +import org.jboss.ws.integration.UnifiedVirtualFile; import org.jboss.ws.metadata.umdm.EndpointMetaData; import org.jboss.ws.metadata.umdm.ServiceMetaData; import org.jboss.ws.metadata.wsse.WSSecurityConfigFactory; Modified: branches/tdiesler/trunk/jbossws-core/src/java/org/jboss/ws/extensions/security/jaxws/WSSecurityHandler.java =================================================================== --- branches/tdiesler/trunk/jbossws-core/src/java/org/jboss/ws/extensions/security/jaxws/WSSecurityHandler.java 2007-03-08 16:07:14 UTC (rev 2552) +++ branches/tdiesler/trunk/jbossws-core/src/java/org/jboss/ws/extensions/security/jaxws/WSSecurityHandler.java 2007-03-08 16:21:20 UTC (rev 2553) @@ -31,9 +31,9 @@ import org.jboss.logging.Logger; import org.jboss.ws.WSException; import org.jboss.ws.core.CommonMessageContext; -import org.jboss.ws.core.UnifiedVirtualFile; import org.jboss.ws.core.jaxws.handler.GenericSOAPHandler; import org.jboss.ws.extensions.security.WSSecurityDispatcher; +import org.jboss.ws.integration.UnifiedVirtualFile; import org.jboss.ws.metadata.umdm.EndpointMetaData; import org.jboss.ws.metadata.umdm.ServiceMetaData; import org.jboss.ws.metadata.wsse.WSSecurityConfigFactory; Copied: branches/tdiesler/trunk/jbossws-core/src/java/org/jboss/ws/integration/UnifiedVirtualFile.java (from rev 2549, branches/tdiesler/trunk/jbossws-core/src/java/org/jboss/ws/core/UnifiedVirtualFile.java) =================================================================== --- branches/tdiesler/trunk/jbossws-core/src/java/org/jboss/ws/integration/UnifiedVirtualFile.java (rev 0) +++ branches/tdiesler/trunk/jbossws-core/src/java/org/jboss/ws/integration/UnifiedVirtualFile.java 2007-03-08 16:21:20 UTC (rev 2553) @@ -0,0 +1,42 @@ +/* + * JBoss, Home of Professional Open Source + * Copyright 2005, JBoss Inc., and individual contributors as indicated + * by the @authors tag. See the copyright.txt in the distribution for a + * full listing of individual contributors. + * + * This is free software; you can redistribute it and/or modify it + * under the terms of the GNU Lesser General Public License as + * published by the Free Software Foundation; either version 2.1 of + * the License, or (at your option) any later version. + * + * This software is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this software; if not, write to the Free + * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA + * 02110-1301 USA, or see the FSF site: http://www.fsf.org. + */ +package org.jboss.ws.integration; + +// $Id$ + +import java.io.IOException; +import java.io.Serializable; +import java.net.URL; + +/** + * An adaptor to a VirtualFile from jboss-vfs.jar + * jboss-vfs cannot be used in jboss-4.x because of its dependeny on jboss-common-core.jar + * + * @author Thomas.Diesler(a)jboss.org + * @since 05-May-2006 + */ +public interface UnifiedVirtualFile extends Serializable +{ + UnifiedVirtualFile findChild(String child) throws IOException; + + URL toURL(); +} Modified: branches/tdiesler/trunk/jbossws-core/src/java/org/jboss/ws/metadata/builder/jaxrpc/JAXRPCClientMetaDataBuilder.java =================================================================== --- branches/tdiesler/trunk/jbossws-core/src/java/org/jboss/ws/metadata/builder/jaxrpc/JAXRPCClientMetaDataBuilder.java 2007-03-08 16:07:14 UTC (rev 2552) +++ branches/tdiesler/trunk/jbossws-core/src/java/org/jboss/ws/metadata/builder/jaxrpc/JAXRPCClientMetaDataBuilder.java 2007-03-08 16:21:20 UTC (rev 2553) @@ -32,7 +32,7 @@ import org.jboss.logging.Logger; import org.jboss.ws.Constants; import org.jboss.ws.WSException; -import org.jboss.ws.core.UnifiedVirtualFile; +import org.jboss.ws.integration.UnifiedVirtualFile; import org.jboss.ws.metadata.j2ee.serviceref.UnifiedHandlerMetaData; import org.jboss.ws.metadata.j2ee.serviceref.UnifiedServiceRefMetaData; import org.jboss.ws.metadata.jaxrpcmapping.JavaWsdlMapping; Modified: branches/tdiesler/trunk/jbossws-core/src/java/org/jboss/ws/metadata/builder/jaxrpc/JAXRPCDeployment.java =================================================================== --- branches/tdiesler/trunk/jbossws-core/src/java/org/jboss/ws/metadata/builder/jaxrpc/JAXRPCDeployment.java 2007-03-08 16:07:14 UTC (rev 2552) +++ branches/tdiesler/trunk/jbossws-core/src/java/org/jboss/ws/metadata/builder/jaxrpc/JAXRPCDeployment.java 2007-03-08 16:21:20 UTC (rev 2553) @@ -25,8 +25,8 @@ import java.net.URL; import org.jboss.ws.WSException; -import org.jboss.ws.core.UnifiedVirtualFile; import org.jboss.ws.core.server.UnifiedDeploymentInfo; +import org.jboss.ws.integration.UnifiedVirtualFile; import org.jboss.ws.metadata.webservices.WebservicesFactory; import org.jboss.ws.metadata.webservices.WebservicesMetaData; import org.jboss.xb.binding.ObjectModelFactory; Modified: branches/tdiesler/trunk/jbossws-core/src/java/org/jboss/ws/metadata/builder/jaxws/JAXWSClientMetaDataBuilder.java =================================================================== --- branches/tdiesler/trunk/jbossws-core/src/java/org/jboss/ws/metadata/builder/jaxws/JAXWSClientMetaDataBuilder.java 2007-03-08 16:07:14 UTC (rev 2552) +++ branches/tdiesler/trunk/jbossws-core/src/java/org/jboss/ws/metadata/builder/jaxws/JAXWSClientMetaDataBuilder.java 2007-03-08 16:21:20 UTC (rev 2553) @@ -32,8 +32,8 @@ import org.jboss.ws.Constants; import org.jboss.ws.WSException; -import org.jboss.ws.core.UnifiedVirtualFile; import org.jboss.ws.core.jaxrpc.Style; +import org.jboss.ws.integration.UnifiedVirtualFile; import org.jboss.ws.metadata.umdm.ClientEndpointMetaData; import org.jboss.ws.metadata.umdm.EndpointMetaData; import org.jboss.ws.metadata.umdm.OperationMetaData; Modified: branches/tdiesler/trunk/jbossws-core/src/java/org/jboss/ws/metadata/config/JBossWSConfigFactory.java =================================================================== --- branches/tdiesler/trunk/jbossws-core/src/java/org/jboss/ws/metadata/config/JBossWSConfigFactory.java 2007-03-08 16:07:14 UTC (rev 2552) +++ branches/tdiesler/trunk/jbossws-core/src/java/org/jboss/ws/metadata/config/JBossWSConfigFactory.java 2007-03-08 16:21:20 UTC (rev 2553) @@ -28,8 +28,8 @@ import org.jboss.logging.Logger; import org.jboss.ws.WSException; -import org.jboss.ws.core.UnifiedVirtualFile; import org.jboss.ws.core.utils.DOMUtils; +import org.jboss.ws.integration.UnifiedVirtualFile; import org.jboss.ws.metadata.config.binding.OMFactoryJAXRPC; import org.jboss.ws.metadata.config.binding.OMFactoryJAXWS; import org.jboss.ws.metadata.config.jaxrpc.ConfigRootJAXRPC; Deleted: branches/tdiesler/trunk/jbossws-core/src/java/org/jboss/ws/metadata/j2ee/serviceref/CallPropertyMetaData.java =================================================================== --- branches/tdiesler/trunk/jbossws-core/src/java/org/jboss/ws/metadata/j2ee/serviceref/CallPropertyMetaData.java 2007-03-08 16:07:14 UTC (rev 2552) +++ branches/tdiesler/trunk/jbossws-core/src/java/org/jboss/ws/metadata/j2ee/serviceref/CallPropertyMetaData.java 2007-03-08 16:21:20 UTC (rev 2553) @@ -1,63 +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.j2ee.serviceref; - -// $Id$ - -import java.io.Serializable; - -/** - * @author Thomas.Diesler(a)jboss.org - * @since 06-May-2004 - */ -public class CallPropertyMetaData implements Serializable -{ - // The required <prop-name> element - private String propName; - // The required <prop-value> element - private String propValue; - - public String getPropName() - { - return propName; - } - - public void setPropName(String paramName) - { - this.propName = paramName; - } - - public String getPropValue() - { - return propValue; - } - - public void setPropValue(String paramValue) - { - this.propValue = paramValue; - } - - public String toString() - { - return "[name=" + propName + ",value=" + propValue + "]"; - } -} Deleted: branches/tdiesler/trunk/jbossws-core/src/java/org/jboss/ws/metadata/j2ee/serviceref/HandlerChainMetaData.java =================================================================== --- branches/tdiesler/trunk/jbossws-core/src/java/org/jboss/ws/metadata/j2ee/serviceref/HandlerChainMetaData.java 2007-03-08 16:07:14 UTC (rev 2552) +++ branches/tdiesler/trunk/jbossws-core/src/java/org/jboss/ws/metadata/j2ee/serviceref/HandlerChainMetaData.java 2007-03-08 16:21:20 UTC (rev 2553) @@ -1,82 +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.j2ee.serviceref; - -// $Id$ - -import java.io.Serializable; -import java.util.ArrayList; -import java.util.List; - -import javax.xml.namespace.QName; - -/** The unified metdata data for a handler chain element - * - * @author Thomas.Diesler(a)jboss.org - */ -public class HandlerChainMetaData implements Serializable -{ - private QName serviceNamePattern; - private QName portNamePattern; - private String protocolBindings; - private List<HandlerMetaData> handlers = new ArrayList<HandlerMetaData>(); - - public QName getPortNamePattern() - { - return portNamePattern; - } - - public void setPortNamePattern(QName portNamePattern) - { - this.portNamePattern = portNamePattern; - } - - public QName getServiceNamePattern() - { - return serviceNamePattern; - } - - public void setServiceNamePattern(QName serviceNamePattern) - { - this.serviceNamePattern = serviceNamePattern; - } - - public String getProtocolBindings() - { - return protocolBindings; - } - - public void setProtocolBindings(String protocolBindings) - { - this.protocolBindings = protocolBindings; - } - - public List<HandlerMetaData> getHandlers() - { - return handlers; - } - - public void addHandler(HandlerMetaData handler) - { - handlers.add(handler); - } -} Deleted: branches/tdiesler/trunk/jbossws-core/src/java/org/jboss/ws/metadata/j2ee/serviceref/HandlerChainsMetaData.java =================================================================== --- branches/tdiesler/trunk/jbossws-core/src/java/org/jboss/ws/metadata/j2ee/serviceref/HandlerChainsMetaData.java 2007-03-08 16:07:14 UTC (rev 2552) +++ branches/tdiesler/trunk/jbossws-core/src/java/org/jboss/ws/metadata/j2ee/serviceref/HandlerChainsMetaData.java 2007-03-08 16:21:20 UTC (rev 2553) @@ -1,47 +0,0 @@ -/* - * JBoss, Home of Professional Open Source - * Copyright 2005, JBoss Inc., and individual contributors as indicated - * by the @authors tag. See the copyright.txt in the distribution for a - * full listing of individual contributors. - * - * This is free software; you can redistribute it and/or modify it - * under the terms of the GNU Lesser General Public License as - * published by the Free Software Foundation; either version 2.1 of - * the License, or (at your option) any later version. - * - * This software is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * Lesser General Public License for more details. - * - * You should have received a copy of the GNU Lesser General Public - * License along with this software; if not, write to the Free - * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA - * 02110-1301 USA, or see the FSF site: http://www.fsf.org. - */ -package org.jboss.ws.metadata.j2ee.serviceref; - -// $Id$ - -import java.io.Serializable; -import java.util.ArrayList; -import java.util.List; - -/** The unified metdata data for a handler chains element - * - * @author Thomas.Diesler(a)jboss.org - */ -public class HandlerChainsMetaData implements Serializable -{ - private List<HandlerChainMetaData> handlerChains = new ArrayList<HandlerChainMetaData>(); - - public List<HandlerChainMetaData> getHandlerChains() - { - return handlerChains; - } - - public void addHandlerChain(HandlerChainMetaData handlerChain) - { - handlerChains.add(handlerChain); - } -} Deleted: branches/tdiesler/trunk/jbossws-core/src/java/org/jboss/ws/metadata/j2ee/serviceref/HandlerMetaData.java =================================================================== --- branches/tdiesler/trunk/jbossws-core/src/java/org/jboss/ws/metadata/j2ee/serviceref/HandlerMetaData.java 2007-03-08 16:07:14 UTC (rev 2552) +++ branches/tdiesler/trunk/jbossws-core/src/java/org/jboss/ws/metadata/j2ee/serviceref/HandlerMetaData.java 2007-03-08 16:21:20 UTC (rev 2553) @@ -1,148 +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.j2ee.serviceref; - -// $Id$ - -import java.io.Serializable; -import java.util.ArrayList; -import java.util.HashSet; -import java.util.List; -import java.util.Set; - -import javax.xml.namespace.QName; - -import org.jboss.ws.metadata.umdm.EndpointMetaData; -import org.jboss.ws.metadata.umdm.HandlerMetaDataJAXRPC; -import org.jboss.ws.metadata.umdm.HandlerMetaDataJAXWS; -import org.jboss.ws.metadata.umdm.HandlerMetaData.HandlerType; - -/** The unified metdata data for a handler element - * - * @author Thomas.Diesler(a)jboss.org - * @version $Revision$ - */ -public class HandlerMetaData implements Serializable -{ - private HandlerChainMetaData handlerChain; - - // The required <handler-name> element - private String handlerName; - // The required <handler-class> element - private String handlerClass; - // The optional <init-param> elements - private List<UnifiedInitParamMetaData> initParams = new ArrayList<UnifiedInitParamMetaData>(); - // The optional <soap-header> elements - private Set<QName> soapHeaders = new HashSet<QName>(); - // The optional <soap-role> elements - private Set<String> soapRoles = new HashSet<String>(); - // The optional <port-name> elements, these only apply to webserve clients - private Set<String> portNames = new HashSet<String>(); - - - public void setHandlerName(String value) - { - this.handlerName = value; - } - - public String getHandlerName() - { - return handlerName; - } - - public void setHandlerClass(String handlerClass) - { - this.handlerClass = handlerClass; - } - - public String getHandlerClass() - { - return handlerClass; - } - - public void addInitParam(UnifiedInitParamMetaData param) - { - initParams.add(param); - } - - public List<UnifiedInitParamMetaData> getInitParams() - { - return initParams; - } - - public void addSoapHeader(QName qName) - { - soapHeaders.add(qName); - } - - public Set<QName> getSoapHeaders() - { - return soapHeaders; - } - - public void addSoapRole(String value) - { - soapRoles.add(value); - } - - public Set<String> getSoapRoles() - { - return soapRoles; - } - - public Set<String> getPortNames() - { - return portNames; - } - - public void addPortName(String value) - { - portNames.add(value); - } - - public HandlerMetaDataJAXRPC getHandlerMetaDataJAXRPC (EndpointMetaData epMetaData, HandlerType type) - { - HandlerMetaDataJAXRPC hmd = new HandlerMetaDataJAXRPC(epMetaData, type); - hmd.setHandlerName(getHandlerName()); - hmd.setHandlerClassName(getHandlerClass()); - hmd.seiInitParams(getInitParams()); - hmd.setSoapHeaders(getSoapHeaders()); - hmd.setSoapRoles(getSoapRoles()); - hmd.setPortNames(getPortNames()); - return hmd; - } - - public HandlerMetaDataJAXWS getHandlerMetaDataJAXWS (EndpointMetaData epMetaData, HandlerType type) - { - HandlerMetaDataJAXWS hmd = new HandlerMetaDataJAXWS(epMetaData, type); - hmd.setHandlerName(getHandlerName()); - hmd.setHandlerClassName(getHandlerClass()); - hmd.seiInitParams(getInitParams()); - if (handlerChain != null) - { - hmd.setProtocolBindings(handlerChain.getProtocolBindings()); - hmd.setServiceNamePattern(handlerChain.getServiceNamePattern()); - hmd.setPortNamePattern(handlerChain.getPortNamePattern()); - } - return hmd; - } -} Deleted: branches/tdiesler/trunk/jbossws-core/src/java/org/jboss/ws/metadata/j2ee/serviceref/InitParamMetaData.java =================================================================== --- branches/tdiesler/trunk/jbossws-core/src/java/org/jboss/ws/metadata/j2ee/serviceref/InitParamMetaData.java 2007-03-08 16:07:14 UTC (rev 2552) +++ branches/tdiesler/trunk/jbossws-core/src/java/org/jboss/ws/metadata/j2ee/serviceref/InitParamMetaData.java 2007-03-08 16:21:20 UTC (rev 2553) @@ -1,63 +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.j2ee.serviceref; - -// $Id$ - -import java.io.Serializable; - -/** - * @author Thomas.Diesler(a)jboss.org - * @since 06-May-2004 - */ -public class InitParamMetaData implements Serializable -{ - // The required <param-name> element - private String paramName; - // The required <param-value> element - private String paramValue; - - public String getParamName() - { - return paramName; - } - - public void setParamName(String paramName) - { - this.paramName = paramName; - } - - public String getParamValue() - { - return paramValue; - } - - public void setParamValue(String paramValue) - { - this.paramValue = paramValue; - } - - public String toString() - { - return "[name=" + paramName + ",value=" + paramValue + "]"; - } -} Deleted: branches/tdiesler/trunk/jbossws-core/src/java/org/jboss/ws/metadata/j2ee/serviceref/PortComponentRefMetaData.java =================================================================== --- branches/tdiesler/trunk/jbossws-core/src/java/org/jboss/ws/metadata/j2ee/serviceref/PortComponentRefMetaData.java 2007-03-08 16:07:14 UTC (rev 2552) +++ branches/tdiesler/trunk/jbossws-core/src/java/org/jboss/ws/metadata/j2ee/serviceref/PortComponentRefMetaData.java 2007-03-08 16:21:20 UTC (rev 2553) @@ -1,168 +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.j2ee.serviceref; - -// $Id$ - -import java.io.Serializable; -import java.util.ArrayList; -import java.util.List; - -import javax.xml.namespace.QName; - -/** The metdata data from service-ref/port-component-ref element in web.xml, ejb-jar.xml, and application-client.xml. - * - * @author Thomas.Diesler(a)jboss.org - */ -public class PortComponentRefMetaData implements Serializable -{ - // The parent service-ref - private ServiceRefMetaData serviceRefMetaData; - - // The required <service-endpoint-interface> element - private String serviceEndpointInterface; - // The optional <enable-mtom> element - private Boolean enableMTOM; - // The optional <port-component-link> element - private String portComponentLink; - // The optional <port-qname> element - private QName portQName; - // Arbitrary proxy properties given by <call-property> - private List<CallPropertyMetaData> callProperties = new ArrayList<CallPropertyMetaData>(); - // Arbitrary proxy properties given by <stub-property> - private List<StubPropertyMetaData> stubProperties = new ArrayList<StubPropertyMetaData>(); - // The optional JBossWS config-name - private String configName; - // The optional JBossWS config-file - private String configFile; - - public PortComponentRefMetaData(ServiceRefMetaData serviceRefMetaData) - { - this.serviceRefMetaData = serviceRefMetaData; - } - - public ServiceRefMetaData getServiceRefMetaData() - { - return serviceRefMetaData; - } - - public Boolean getEnableMTOM() - { - return enableMTOM; - } - - public void setEnableMTOM(Boolean enableMTOM) - { - this.enableMTOM = enableMTOM; - } - - /** - * The port-component-link element links a port-component-ref - * to a specific port-component required to be made available - * by a service reference. - * - * The value of a port-component-link must be the - * port-component-name of a port-component in the same module - * or another module in the same application unit. The syntax - * for specification follows the syntax defined for ejb-link - * in the EJB 2.0 specification. - */ - public String getPortComponentLink() - { - return portComponentLink; - } - - public void setPortComponentLink(String portComponentLink) - { - this.portComponentLink = portComponentLink; - } - - public String getServiceEndpointInterface() - { - return serviceEndpointInterface; - } - - public void setServiceEndpointInterface(String serviceEndpointInterface) - { - this.serviceEndpointInterface = serviceEndpointInterface; - } - - public QName getPortQName() - { - return portQName; - } - - public void setPortQName(QName portQName) - { - this.portQName = portQName; - } - - public List<CallPropertyMetaData> getCallProperties() - { - return callProperties; - } - - public void setCallProperties(List<CallPropertyMetaData> callProps) - { - callProperties = callProps; - } - - public void addCallProperty(CallPropertyMetaData callProp) - { - callProperties.add(callProp); - } - - public List<StubPropertyMetaData> getStubProperties() - { - return stubProperties; - } - - public void setStubProperties(List<StubPropertyMetaData> stubProps) - { - stubProperties = stubProps; - } - - public void addStubProperty(StubPropertyMetaData stubProp) - { - stubProperties.add(stubProp); - } - - public String getConfigFile() - { - return configFile; - } - - public void setConfigFile(String configFile) - { - this.configFile = configFile; - } - - public String getConfigName() - { - return configName; - } - - public void setConfigName(String configName) - { - this.configName = configName; - } -} Deleted: branches/tdiesler/trunk/jbossws-core/src/java/org/jboss/ws/metadata/j2ee/serviceref/ServiceRefMetaData.java =================================================================== --- branches/tdiesler/trunk/jbossws-core/src/java/org/jboss/ws/metadata/j2ee/serviceref/ServiceRefMetaData.java 2007-03-08 16:07:14 UTC (rev 2552) +++ branches/tdiesler/trunk/jbossws-core/src/java/org/jboss/ws/metadata/j2ee/serviceref/ServiceRefMetaData.java 2007-03-08 16:21:20 UTC (rev 2553) @@ -1,314 +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.j2ee.serviceref; - -// $Id$ - -import java.io.Serializable; -import java.net.MalformedURLException; -import java.net.URL; -import java.util.ArrayList; -import java.util.Collection; -import java.util.LinkedHashMap; -import java.util.List; -import java.util.Map; - -import javax.xml.namespace.QName; - -import org.jboss.logging.Logger; -import org.jboss.ws.WSException; -import org.jboss.ws.core.UnifiedVirtualFile; - -/** - * The metdata data from service-ref element in web.xml, ejb-jar.xml, and - * application-client.xml. - * - * @author Thomas.Diesler(a)jboss.org - */ -public class ServiceRefMetaData implements Serializable -{ - // provide logging - private static Logger log = Logger.getLogger(ServiceRefMetaData.class); - - private UnifiedVirtualFile vfsRoot; - - // Standard properties - - // The required <service-ref-name> element - private String serviceRefName; - // The JAXRPC required <service-interface> element - private String serviceInterface; - // service-res-type - private String serviceRefType; - // The optional <wsdl-file> element - private String wsdlFile; - // The optional <jaxrpc-mapping-file> element - private String mappingFile; - // The optional <service-qname> element - private QName serviceQName; - // The LinkedHashMap<String, PortComponentRefMetaData> for <port-component-ref> elements - private Map<String, PortComponentRefMetaData> portComponentRefs = new LinkedHashMap<String, PortComponentRefMetaData>(); - // The optional <handler> elements. JAX-RPC handlers declared in the standard J2EE1.4 descriptor - private List<HandlerMetaData> handlers = new ArrayList<HandlerMetaData>(); - // The optional <handler-chains> elements. JAX-WS handlers declared in the standard JavaEE5 descriptor - private HandlerChainsMetaData handlerChains; - - // JBoss properties - - // The optional <service-impl-class> element - private String serviceImplClass; - // The optional JBossWS config-name - private String configName; - // The optional JBossWS config-file - private String configFile; - // The optional URL of the actual WSDL to use, <wsdl-override> - private String wsdlOverride; - // The optional <handler-chain> element. JAX-WS handler chain declared in the JBoss JavaEE5 descriptor - private String handlerChain; - // Arbitrary proxy properties given by <call-property> - private List<CallPropertyMetaData> callProperties = new ArrayList<CallPropertyMetaData>(); - - public UnifiedVirtualFile getVfsRoot() - { - return vfsRoot; - } - - public void setVfsRoot(UnifiedVirtualFile vfsRoot) - { - this.vfsRoot = vfsRoot; - } - - public String getServiceRefName() - { - return serviceRefName; - } - - public void setServiceRefName(String serviceRefName) - { - this.serviceRefName = serviceRefName; - } - - public String getMappingFile() - { - return mappingFile; - } - - public void setMappingFile(String mappingFile) - { - this.mappingFile = mappingFile; - } - - public URL getMappingLocation() - { - URL mappingURL = null; - if (mappingFile != null) - { - try - { - mappingURL = vfsRoot.findChild(mappingFile).toURL(); - } - catch (Exception e) - { - throw new WSException("Cannot find jaxrcp-mapping-file: " + mappingFile, e); - } - } - return mappingURL; - } - - public Collection<PortComponentRefMetaData> getPortComponentRefs() - { - return portComponentRefs.values(); - } - - public PortComponentRefMetaData getPortComponentRef(String seiName) - { - PortComponentRefMetaData ref = portComponentRefs.get(seiName); - return ref; - } - - public void addPortComponentRef(PortComponentRefMetaData pcRef) - { - portComponentRefs.put(pcRef.getServiceEndpointInterface(), pcRef); - } - - public List<HandlerMetaData> getHandlers() - { - return handlers; - } - - public void addHandler(HandlerMetaData handler) - { - handlers.add(handler); - } - - public String getServiceInterface() - { - return serviceInterface; - } - - public void setServiceInterface(String serviceInterface) - { - this.serviceInterface = serviceInterface; - } - - public String getServiceImplClass() - { - return serviceImplClass; - } - - public void setServiceImplClass(String serviceImplClass) - { - this.serviceImplClass = serviceImplClass; - } - - public QName getServiceQName() - { - return serviceQName; - } - - public void setServiceQName(QName serviceQName) - { - this.serviceQName = serviceQName; - } - - public String getServiceRefType() - { - return serviceRefType; - } - - public void setServiceRefType(String serviceResType) - { - this.serviceRefType = serviceResType; - } - - public String getWsdlFile() - { - return wsdlFile; - } - - public void setWsdlFile(String wsdlFile) - { - this.wsdlFile = wsdlFile; - } - - public URL getWsdlLocation() - { - URL wsdlLocation = null; - if (wsdlOverride != null) - { - try - { - wsdlLocation = new URL(wsdlOverride); - } - catch (MalformedURLException e1) - { - try - { - wsdlLocation = vfsRoot.findChild(wsdlOverride).toURL(); - } - catch (Exception e) - { - throw new WSException("Cannot find wsdl-override: " + wsdlOverride, e); - } - } - } - - if (wsdlLocation == null && wsdlFile != null) - { - try - { - wsdlLocation = vfsRoot.findChild(wsdlFile).toURL(); - } - catch (Exception e) - { - throw new WSException("Cannot find wsdl-file: " + wsdlFile, e); - } - } - - return wsdlLocation; - } - - public String getConfigFile() - { - return configFile; - } - - public void setConfigFile(String configFile) - { - this.configFile = configFile; - } - - public String getConfigName() - { - return configName; - } - - public void setConfigName(String configName) - { - this.configName = configName; - } - - public String getWsdlOverride() - { - return wsdlOverride; - } - - public void setWsdlOverride(String wsdlOverride) - { - this.wsdlOverride = wsdlOverride; - } - - public List<CallPropertyMetaData> getCallProperties() - { - return callProperties; - } - - public void setCallProperties(List<CallPropertyMetaData> callProps) - { - callProperties = callProps; - } - - public void addCallProperty(CallPropertyMetaData callProp) - { - callProperties.add(callProp); - } - - public HandlerChainsMetaData getHandlerChains() - { - return handlerChains; - } - - public void setHandlerChains(HandlerChainsMetaData handlerChains) - { - this.handlerChains = handlerChains; - } - - public String getHandlerChain() - { - return handlerChain; - } - - public void setHandlerChain(String handlerChain) - { - this.handlerChain = handlerChain; - } -} Deleted: branches/tdiesler/trunk/jbossws-core/src/java/org/jboss/ws/metadata/j2ee/serviceref/ServiceRefObjectFactory.java =================================================================== --- branches/tdiesler/trunk/jbossws-core/src/java/org/jboss/ws/metadata/j2ee/serviceref/ServiceRefObjectFactory.java 2007-03-08 16:07:14 UTC (rev 2552) +++ branches/tdiesler/trunk/jbossws-core/src/java/org/jboss/ws/metadata/j2ee/serviceref/ServiceRefObjectFactory.java 2007-03-08 16:21:20 UTC (rev 2553) @@ -1,324 +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.j2ee.serviceref; - -import java.io.ByteArrayInputStream; -import java.io.InputStream; - -import javax.xml.namespace.QName; - -import org.jboss.ws.WSException; -import org.jboss.xb.binding.ObjectModelFactory; -import org.jboss.xb.binding.Unmarshaller; -import org.jboss.xb.binding.UnmarshallerFactory; -import org.jboss.xb.binding.UnmarshallingContext; -import org.xml.sax.Attributes; - -/** - * An ObjectModelFactory for ServiceRefMetaData - * - * @author Thomas.Diesler(a)jboss.org - * @since 17-Jan-2007 - */ -public class ServiceRefObjectFactory implements ObjectModelFactory -{ - // Hide constructor - private ServiceRefObjectFactory() - { - } - - public static ServiceRefObjectFactory newInstance() - { - return new ServiceRefObjectFactory(); - } - - public UnifiedServiceRefMetaData parse(String xmlFragment) - { - try - { - InputStream is = new ByteArrayInputStream(xmlFragment.getBytes()); - - Unmarshaller unmarshaller = UnmarshallerFactory.newInstance().newUnmarshaller(); - return (UnifiedServiceRefMetaData)unmarshaller.unmarshal(is, this, null); - } - catch (Exception ex) - { - WSException.rethrow(ex); - return null; - } - } - - public Object newRoot(Object root, UnmarshallingContext navigator, String namespaceURI, String localName, Attributes attrs) - { - return new UnifiedServiceRefMetaData(); - } - - public Object completeRoot(Object root, UnmarshallingContext ctx, String uri, String name) - { - return root; - } - - // ******************************************************** - // START ServiceRefMetaData - - public void setValue(UnifiedServiceRefMetaData ref, UnmarshallingContext navigator, String namespaceURI, String localName, String value) - { - /* Standard properties */ - if (localName.equals("service-ref-name")) - { - ref.setServiceRefName(value); - } - else if (localName.equals("service-interface")) - { - ref.setServiceInterface(value); - } - else if (localName.equals("service-ref-type")) - { - ref.setServiceRefType(value); - } - else if (localName.equals("wsdl-file")) - { - ref.setWsdlFile(value); - } - else if (localName.equals("jaxrpc-mapping-file")) - { - ref.setMappingFile(value); - } - else if (localName.equals("service-qname")) - { - ref.setServiceQName(QName.valueOf(value)); - } - - /* JBoss properties */ - else if (localName.equals("service-impl-class")) - { - ref.setServiceImplClass(value); - } - else if (localName.equals("config-name")) - { - ref.setConfigName(value); - } - else if (localName.equals("config-file")) - { - ref.setConfigFile(value); - } - else if (localName.equals("wsdl-override")) - { - ref.setWsdlOverride(value); - } - else if (localName.equals("handler-chain")) - { - ref.setHandlerChain(value); - } - } - - public Object newChild(UnifiedServiceRefMetaData ref, UnmarshallingContext navigator, String namespaceURI, String localName, Attributes attrs) - { - Object child = null; - if (localName.equals("port-component-ref")) - child = new UnifiedPortComponentRefMetaData(ref); - else if (localName.equals("handler")) - child = new UnifiedHandlerMetaData(); - else if (localName.equals("handler-chains")) - child = new UnifiedHandlerChainsMetaData(); - - else if (localName.equals("call-property")) - child = new UnifiedCallPropertyMetaData(); - - return child; - } - - public Object newChild(UnifiedHandlerChainsMetaData ref, UnmarshallingContext navigator, String namespaceURI, String localName, Attributes attrs) - { - Object child = null; - if (localName.equals("handler-chain")) - child = new UnifiedHandlerChainMetaData(); - - return child; - } - - public void addChild(UnifiedServiceRefMetaData parent, UnifiedPortComponentRefMetaData pcRef, UnmarshallingContext navigator, String namespaceURI, String localName) - { - parent.addPortComponentRef(pcRef); - } - - public void addChild(UnifiedServiceRefMetaData parent, UnifiedHandlerMetaData handler, UnmarshallingContext navigator, String namespaceURI, String localName) - { - parent.addHandler(handler); - } - - public void addChild(UnifiedServiceRefMetaData parent, UnifiedHandlerChainsMetaData handlerChains, UnmarshallingContext navigator, String namespaceURI, String localName) - { - parent.setHandlerChains(handlerChains); - } - - public void addChild(UnifiedServiceRefMetaData parent, UnifiedCallPropertyMetaData callProp, UnmarshallingContext navigator, String namespaceURI, String localName) - { - parent.addCallProperty(callProp); - } - - public void addChild(UnifiedHandlerChainsMetaData parent, UnifiedHandlerChainMetaData handlerChain, UnmarshallingContext navigator, String namespaceURI, String localName) - { - parent.addHandlerChain(handlerChain); - } - - public void setValue(UnifiedPortComponentRefMetaData ref, UnmarshallingContext navigator, String namespaceURI, String localName, String value) - { - if (localName.equals("service-endpoint-interface")) - { - ref.setServiceEndpointInterface(value); - } - else if (localName.equals("enable-mtom")) - { - ref.setEnableMTOM(Boolean.valueOf(value)); - } - else if (localName.equals("port-component-link")) - { - ref.setPortComponentLink(value); - } - else if (localName.equals("port-qname")) - { - ref.setPortQName(QName.valueOf(value)); - } - else if (localName.equals("config-name")) - { - ref.setConfigName(value); - } - else if (localName.equals("config-file")) - { - ref.setConfigFile(value); - } - } - - public Object newChild(UnifiedPortComponentRefMetaData ref, UnmarshallingContext navigator, String namespaceURI, String localName, Attributes attrs) - { - Object child = null; - if (localName.equals("call-property")) - child = new UnifiedCallPropertyMetaData(); - if (localName.equals("stub-property")) - child = new UnifiedStubPropertyMetaData(); - return child; - } - - public void setValue(UnifiedHandlerChainMetaData ref, UnmarshallingContext navigator, String namespaceURI, String localName, String value) - { - if (localName.equals("service-name-pattern")) - { - ref.setServiceNamePattern(QName.valueOf(value)); - } - else if (localName.equals("port-name-pattern")) - { - ref.setPortNamePattern(QName.valueOf(value)); - } - else if (localName.equals("protocol-binding")) - { - ref.setProtocolBindings(value); - } - } - - public void setValue(UnifiedHandlerMetaData ref, UnmarshallingContext navigator, String namespaceURI, String localName, String value) - { - if (localName.equals("handler-name")) - { - ref.setHandlerName(value); - } - else if (localName.equals("handler-class")) - { - ref.setHandlerClass(value); - } - else if (localName.equals("soap-header")) - { - ref.addSoapHeader(QName.valueOf(value)); - } - else if (localName.equals("soap-role")) - { - ref.addSoapRole(value); - } - else if (localName.equals("port-name")) - { - ref.addPortName(value); - } - } - - public Object newChild(UnifiedHandlerMetaData ref, UnmarshallingContext navigator, String namespaceURI, String localName, Attributes attrs) - { - Object child = null; - if (localName.equals("init-param")) - child = new UnifiedInitParamMetaData(); - - return child; - } - - public void addChild(UnifiedHandlerMetaData parent, UnifiedInitParamMetaData param, UnmarshallingContext navigator, String namespaceURI, String localName) - { - parent.addInitParam(param); - } - - public void setValue(UnifiedInitParamMetaData ref, UnmarshallingContext navigator, String namespaceURI, String localName, String value) - { - if (localName.equals("param-name")) - { - ref.setParamName(value); - } - else if (localName.equals("param-value")) - { - ref.setParamValue(value); - } - } - - public void setValue(UnifiedCallPropertyMetaData ref, UnmarshallingContext navigator, String namespaceURI, String localName, String value) - { - if (localName.equals("prop-name")) - { - ref.setPropName(value); - } - else if (localName.equals("prop-value")) - { - ref.setPropValue(value); - } - } - - public void setValue(UnifiedStubPropertyMetaData ref, UnmarshallingContext navigator, String namespaceURI, String localName, String value) - { - if (localName.equals("prop-name")) - { - ref.setPropName(value); - } - else if (localName.equals("prop-value")) - { - ref.setPropValue(value); - } - } - - public void addChild(UnifiedPortComponentRefMetaData ref, UnifiedCallPropertyMetaData callProp, UnmarshallingContext navigator, String namespaceURI, String localName) - { - ref.addCallProperty(callProp); - } - - public void addChild(UnifiedPortComponentRefMetaData ref, UnifiedStubPropertyMetaData stubProp, UnmarshallingContext navigator, String namespaceURI, String localName) - { - ref.addStubProperty(stubProp); - } - - // END ServiceRefMetaData - // ******************************************************** -} Deleted: branches/tdiesler/trunk/jbossws-core/src/java/org/jboss/ws/metadata/j2ee/serviceref/StubPropertyMetaData.java =================================================================== --- branches/tdiesler/trunk/jbossws-core/src/java/org/jboss/ws/metadata/j2ee/serviceref/StubPropertyMetaData.java 2007-03-08 16:07:14 UTC (rev 2552) +++ branches/tdiesler/trunk/jbossws-core/src/java/org/jboss/ws/metadata/j2ee/serviceref/StubPropertyMetaData.java 2007-03-08 16:21:20 UTC (rev 2553) @@ -1,63 +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.j2ee.serviceref; - -// $Id$ - -import java.io.Serializable; - -/** - * @author Thomas.Diesler(a)jboss.org - * @since 06-May-2004 - */ -public class StubPropertyMetaData implements Serializable -{ - // The required <prop-name> element - private String propName; - // The required <prop-value> element - private String propValue; - - public String getPropName() - { - return propName; - } - - public void setPropName(String paramName) - { - this.propName = paramName; - } - - public String getPropValue() - { - return propValue; - } - - public void setPropValue(String paramValue) - { - this.propValue = paramValue; - } - - public String toString() - { - return "[name=" + propName + ",value=" + propValue + "]"; - } -} Modified: branches/tdiesler/trunk/jbossws-core/src/java/org/jboss/ws/metadata/j2ee/serviceref/UnifiedCallPropertyMetaData.java =================================================================== --- branches/tdiesler/trunk/jbossws-core/src/java/org/jboss/ws/metadata/j2ee/serviceref/UnifiedCallPropertyMetaData.java 2007-03-08 16:07:14 UTC (rev 2552) +++ branches/tdiesler/trunk/jbossws-core/src/java/org/jboss/ws/metadata/j2ee/serviceref/UnifiedCallPropertyMetaData.java 2007-03-08 16:21:20 UTC (rev 2553) @@ -23,13 +23,13 @@ // $Id$ -import java.io.Serializable; +import org.jboss.ws.integration.ServiceRefElement; /** * @author Thomas.Diesler(a)jboss.org * @since 06-May-2004 */ -public class UnifiedCallPropertyMetaData implements Serializable +public class UnifiedCallPropertyMetaData extends ServiceRefElement { // The required <prop-name> element private String propName; Modified: branches/tdiesler/trunk/jbossws-core/src/java/org/jboss/ws/metadata/j2ee/serviceref/UnifiedHandlerChainMetaData.java =================================================================== --- branches/tdiesler/trunk/jbossws-core/src/java/org/jboss/ws/metadata/j2ee/serviceref/UnifiedHandlerChainMetaData.java 2007-03-08 16:07:14 UTC (rev 2552) +++ branches/tdiesler/trunk/jbossws-core/src/java/org/jboss/ws/metadata/j2ee/serviceref/UnifiedHandlerChainMetaData.java 2007-03-08 16:21:20 UTC (rev 2553) @@ -23,17 +23,18 @@ // $Id$ -import java.io.Serializable; import java.util.ArrayList; import java.util.List; import javax.xml.namespace.QName; +import org.jboss.ws.integration.ServiceRefElement; + /** The unified metdata data for a handler chain element * * @author Thomas.Diesler(a)jboss.org */ -public class UnifiedHandlerChainMetaData implements Serializable +public class UnifiedHandlerChainMetaData extends ServiceRefElement { private UnifiedHandlerChainsMetaData handlerChains; Modified: branches/tdiesler/trunk/jbossws-core/src/java/org/jboss/ws/metadata/j2ee/serviceref/UnifiedHandlerChainsMetaData.java =================================================================== --- branches/tdiesler/trunk/jbossws-core/src/java/org/jboss/ws/metadata/j2ee/serviceref/UnifiedHandlerChainsMetaData.java 2007-03-08 16:07:14 UTC (rev 2552) +++ branches/tdiesler/trunk/jbossws-core/src/java/org/jboss/ws/metadata/j2ee/serviceref/UnifiedHandlerChainsMetaData.java 2007-03-08 16:21:20 UTC (rev 2553) @@ -23,17 +23,17 @@ // $Id$ -import java.io.Serializable; import java.util.ArrayList; import java.util.List; +import org.jboss.ws.integration.ServiceRefElement; import org.jboss.ws.metadata.umdm.HandlerMetaData.HandlerType; /** The unified metdata data for a handler chains element * * @author Thomas.Diesler(a)jboss.org */ -public class UnifiedHandlerChainsMetaData implements Serializable +public class UnifiedHandlerChainsMetaData extends ServiceRefElement { private HandlerType handlerType; private List<UnifiedHandlerChainMetaData> handlerChains = new ArrayList<UnifiedHandlerChainMetaData>(); Modified: branches/tdiesler/trunk/jbossws-core/src/java/org/jboss/ws/metadata/j2ee/serviceref/UnifiedHandlerMetaData.java =================================================================== --- branches/tdiesler/trunk/jbossws-core/src/java/org/jboss/ws/metadata/j2ee/serviceref/UnifiedHandlerMetaData.java 2007-03-08 16:07:14 UTC (rev 2552) +++ branches/tdiesler/trunk/jbossws-core/src/java/org/jboss/ws/metadata/j2ee/serviceref/UnifiedHandlerMetaData.java 2007-03-08 16:21:20 UTC (rev 2553) @@ -23,7 +23,6 @@ // $Id$ -import java.io.Serializable; import java.util.ArrayList; import java.util.HashSet; import java.util.List; @@ -31,6 +30,7 @@ import javax.xml.namespace.QName; +import org.jboss.ws.integration.ServiceRefElement; import org.jboss.ws.metadata.umdm.EndpointMetaData; import org.jboss.ws.metadata.umdm.HandlerMetaDataJAXRPC; import org.jboss.ws.metadata.umdm.HandlerMetaDataJAXWS; @@ -41,7 +41,7 @@ * @author Thomas.Diesler(a)jboss.org * @version $Revision$ */ -public class UnifiedHandlerMetaData implements Serializable +public class UnifiedHandlerMetaData extends ServiceRefElement { private UnifiedHandlerChainMetaData handlerChain; Modified: branches/tdiesler/trunk/jbossws-core/src/java/org/jboss/ws/metadata/j2ee/serviceref/UnifiedInitParamMetaData.java =================================================================== --- branches/tdiesler/trunk/jbossws-core/src/java/org/jboss/ws/metadata/j2ee/serviceref/UnifiedInitParamMetaData.java 2007-03-08 16:07:14 UTC (rev 2552) +++ branches/tdiesler/trunk/jbossws-core/src/java/org/jboss/ws/metadata/j2ee/serviceref/UnifiedInitParamMetaData.java 2007-03-08 16:21:20 UTC (rev 2553) @@ -23,13 +23,13 @@ // $Id$ -import java.io.Serializable; +import org.jboss.ws.integration.ServiceRefElement; /** * @author Thomas.Diesler(a)jboss.org * @since 06-May-2004 */ -public class UnifiedInitParamMetaData implements Serializable +public class UnifiedInitParamMetaData extends ServiceRefElement { // The required <param-name> element private String paramName; Modified: branches/tdiesler/trunk/jbossws-core/src/java/org/jboss/ws/metadata/j2ee/serviceref/UnifiedPortComponentRefMetaData.java =================================================================== --- branches/tdiesler/trunk/jbossws-core/src/java/org/jboss/ws/metadata/j2ee/serviceref/UnifiedPortComponentRefMetaData.java 2007-03-08 16:07:14 UTC (rev 2552) +++ branches/tdiesler/trunk/jbossws-core/src/java/org/jboss/ws/metadata/j2ee/serviceref/UnifiedPortComponentRefMetaData.java 2007-03-08 16:21:20 UTC (rev 2553) @@ -23,17 +23,18 @@ // $Id$ -import java.io.Serializable; import java.util.ArrayList; import java.util.List; import javax.xml.namespace.QName; +import org.jboss.ws.integration.ServiceRefElement; + /** The metdata data from service-ref/port-component-ref element in web.xml, ejb-jar.xml, and application-client.xml. * * @author Thomas.Diesler(a)jboss.org */ -public class UnifiedPortComponentRefMetaData implements Serializable +public class UnifiedPortComponentRefMetaData extends ServiceRefElement { // The parent service-ref private UnifiedServiceRefMetaData serviceRefMetaData; Modified: branches/tdiesler/trunk/jbossws-core/src/java/org/jboss/ws/metadata/j2ee/serviceref/UnifiedServiceRefMetaData.java =================================================================== --- branches/tdiesler/trunk/jbossws-core/src/java/org/jboss/ws/metadata/j2ee/serviceref/UnifiedServiceRefMetaData.java 2007-03-08 16:07:14 UTC (rev 2552) +++ branches/tdiesler/trunk/jbossws-core/src/java/org/jboss/ws/metadata/j2ee/serviceref/UnifiedServiceRefMetaData.java 2007-03-08 16:21:20 UTC (rev 2553) @@ -23,7 +23,7 @@ // $Id$ -import java.io.Serializable; +import java.lang.reflect.AnnotatedElement; import java.net.MalformedURLException; import java.net.URL; import java.util.ArrayList; @@ -36,7 +36,9 @@ import org.jboss.logging.Logger; import org.jboss.ws.WSException; -import org.jboss.ws.core.UnifiedVirtualFile; +import org.jboss.ws.integration.ServiceRefMetaData; +import org.jboss.ws.integration.UnifiedVirtualFile; +import org.w3c.dom.Element; /** * The metdata data from service-ref element in web.xml, ejb-jar.xml, and @@ -44,7 +46,7 @@ * * @author Thomas.Diesler(a)jboss.org */ -public class UnifiedServiceRefMetaData implements Serializable +public class UnifiedServiceRefMetaData extends ServiceRefMetaData { // provide logging private static Logger log = Logger.getLogger(UnifiedServiceRefMetaData.class); @@ -320,4 +322,53 @@ { this.handlerChain = handlerChain; } + + @Override + public AnnotatedElement getAnnotatedElement() + { + // TODO Auto-generated method stub + return null; + } + + @Override + public void importJBossXml(Element element) + { + // TODO Auto-generated method stub + + } + + @Override + public void importStandardXml(Element element) + { + // TODO Auto-generated method stub + + } + + @Override + public boolean isProcessed() + { + // TODO Auto-generated method stub + return false; + } + + @Override + public void merge(Object targetRef) + { + // TODO Auto-generated method stub + + } + + @Override + public void setAnnotatedElement(AnnotatedElement anElement) + { + // TODO Auto-generated method stub + + } + + @Override + public void setProcessed(boolean flag) + { + // TODO Auto-generated method stub + + } } Modified: branches/tdiesler/trunk/jbossws-core/src/java/org/jboss/ws/metadata/j2ee/serviceref/UnifiedStubPropertyMetaData.java =================================================================== --- branches/tdiesler/trunk/jbossws-core/src/java/org/jboss/ws/metadata/j2ee/serviceref/UnifiedStubPropertyMetaData.java 2007-03-08 16:07:14 UTC (rev 2552) +++ branches/tdiesler/trunk/jbossws-core/src/java/org/jboss/ws/metadata/j2ee/serviceref/UnifiedStubPropertyMetaData.java 2007-03-08 16:21:20 UTC (rev 2553) @@ -23,13 +23,13 @@ // $Id$ -import java.io.Serializable; +import org.jboss.ws.integration.ServiceRefElement; /** * @author Thomas.Diesler(a)jboss.org * @since 06-May-2004 */ -public class UnifiedStubPropertyMetaData implements Serializable +public class UnifiedStubPropertyMetaData extends ServiceRefElement { // The required <prop-name> element private String propName; Modified: branches/tdiesler/trunk/jbossws-core/src/java/org/jboss/ws/metadata/umdm/EndpointMetaData.java =================================================================== --- branches/tdiesler/trunk/jbossws-core/src/java/org/jboss/ws/metadata/umdm/EndpointMetaData.java 2007-03-08 16:07:14 UTC (rev 2552) +++ branches/tdiesler/trunk/jbossws-core/src/java/org/jboss/ws/metadata/umdm/EndpointMetaData.java 2007-03-08 16:21:20 UTC (rev 2553) @@ -43,7 +43,6 @@ import org.jboss.ws.WSException; import org.jboss.ws.core.CommonBindingProvider; import org.jboss.ws.core.CommonSOAPBinding; -import org.jboss.ws.core.UnifiedVirtualFile; import org.jboss.ws.core.jaxrpc.Style; import org.jboss.ws.core.jaxrpc.TypeMappingImpl; import org.jboss.ws.core.jaxrpc.Use; @@ -54,6 +53,7 @@ import org.jboss.ws.core.jaxws.JAXBDeserializerFactory; import org.jboss.ws.core.jaxws.JAXBSerializerFactory; import org.jboss.ws.core.utils.JavaUtils; +import org.jboss.ws.integration.UnifiedVirtualFile; import org.jboss.ws.metadata.config.CommonConfig; import org.jboss.ws.metadata.config.Configurable; import org.jboss.ws.metadata.config.ConfigurationProvider; Modified: branches/tdiesler/trunk/jbossws-core/src/java/org/jboss/ws/metadata/umdm/ResourceLoaderAdapter.java =================================================================== --- branches/tdiesler/trunk/jbossws-core/src/java/org/jboss/ws/metadata/umdm/ResourceLoaderAdapter.java 2007-03-08 16:07:14 UTC (rev 2552) +++ branches/tdiesler/trunk/jbossws-core/src/java/org/jboss/ws/metadata/umdm/ResourceLoaderAdapter.java 2007-03-08 16:21:20 UTC (rev 2553) @@ -28,7 +28,7 @@ import java.net.MalformedURLException; import java.net.URL; -import org.jboss.ws.core.UnifiedVirtualFile; +import org.jboss.ws.integration.UnifiedVirtualFile; /** * The default file adapter loads resources through an associated classloader. Modified: branches/tdiesler/trunk/jbossws-core/src/java/org/jboss/ws/metadata/umdm/ServiceMetaData.java =================================================================== --- branches/tdiesler/trunk/jbossws-core/src/java/org/jboss/ws/metadata/umdm/ServiceMetaData.java 2007-03-08 16:07:14 UTC (rev 2552) +++ branches/tdiesler/trunk/jbossws-core/src/java/org/jboss/ws/metadata/umdm/ServiceMetaData.java 2007-03-08 16:21:20 UTC (rev 2553) @@ -37,11 +37,11 @@ import org.jboss.logging.Logger; import org.jboss.ws.WSException; -import org.jboss.ws.core.UnifiedVirtualFile; import org.jboss.ws.core.jaxrpc.TypeMappingImpl; import org.jboss.ws.core.jaxrpc.TypeMappingRegistryImpl; import org.jboss.ws.core.jaxrpc.Use; import org.jboss.ws.core.jaxrpc.binding.jbossxb.SchemaBindingBuilder; +import org.jboss.ws.integration.UnifiedVirtualFile; import org.jboss.ws.metadata.jaxrpcmapping.JavaWsdlMapping; import org.jboss.ws.metadata.jaxrpcmapping.JavaWsdlMappingFactory; import org.jboss.ws.metadata.umdm.HandlerMetaData.HandlerType; Modified: branches/tdiesler/trunk/jbossws-core/src/java/org/jboss/ws/metadata/umdm/UnifiedMetaData.java =================================================================== --- branches/tdiesler/trunk/jbossws-core/src/java/org/jboss/ws/metadata/umdm/UnifiedMetaData.java 2007-03-08 16:07:14 UTC (rev 2552) +++ branches/tdiesler/trunk/jbossws-core/src/java/org/jboss/ws/metadata/umdm/UnifiedMetaData.java 2007-03-08 16:21:20 UTC (rev 2553) @@ -30,8 +30,8 @@ import java.util.StringTokenizer; import org.jboss.logging.Logger; -import org.jboss.ws.core.UnifiedVirtualFile; import org.jboss.ws.core.server.ServiceEndpointManager; +import org.jboss.ws.integration.UnifiedVirtualFile; import org.jboss.ws.metadata.jaxrpcmapping.JavaWsdlMapping; import org.jboss.ws.metadata.wsdl.WSDLDefinitions; Modified: branches/tdiesler/trunk/jbossws-core/src/java/org/jboss/ws/metadata/wsse/WSSecurityConfigFactory.java =================================================================== --- branches/tdiesler/trunk/jbossws-core/src/java/org/jboss/ws/metadata/wsse/WSSecurityConfigFactory.java 2007-03-08 16:07:14 UTC (rev 2552) +++ branches/tdiesler/trunk/jbossws-core/src/java/org/jboss/ws/metadata/wsse/WSSecurityConfigFactory.java 2007-03-08 16:21:20 UTC (rev 2553) @@ -29,7 +29,7 @@ import org.jboss.logging.Logger; import org.jboss.ws.WSException; -import org.jboss.ws.core.UnifiedVirtualFile; +import org.jboss.ws.integration.UnifiedVirtualFile; import org.jboss.ws.metadata.builder.jaxrpc.JAXRPCServerMetaDataBuilder; /**