[jbossws-commits] JBossWS SVN: r4044 - in trunk: integration/jboss42/src/main/java/org/jboss/wsf/container/jboss42 and 21 other directories.

Author: thomas.diesler(a)jboss.com Date: 2007-08-01 04:23:22 -0400 (Wed, 01 Aug 2007) New Revision: 4044 Added: trunk/integration/spi/src/main/java/org/jboss/ws/integration/ResourceLoaderAdapter.java trunk/integration/spi/src/main/java/org/jboss/ws/integration/URLLoaderAdapter.java trunk/integration/spi/src/main/java/org/jboss/ws/integration/UnifiedVirtualFile.java Removed: trunk/integration/spi/src/main/java/org/jboss/ws/integration/KernelLocator.java trunk/integration/spi/src/main/java/org/jboss/ws/integration/ResourceLoaderAdapter.java trunk/integration/spi/src/main/java/org/jboss/ws/integration/URLLoaderAdapter.java trunk/integration/spi/src/main/java/org/jboss/ws/integration/UnifiedVirtualFile.java trunk/integration/spi/src/main/java/org/jboss/wsf/common/ResourceLoaderAdapter.java trunk/integration/spi/src/main/java/org/jboss/wsf/common/URLLoaderAdapter.java trunk/integration/spi/src/main/java/org/jboss/wsf/spi/deployment/UnifiedVirtualFile.java Modified: trunk/integration/jboss40/src/main/java/org/jboss/wsf/container/jboss40/ServiceRefMetaDataAdapter.java trunk/integration/jboss42/src/main/java/org/jboss/wsf/container/jboss42/ArchiveDeployerHook.java trunk/integration/jboss42/src/main/java/org/jboss/wsf/container/jboss42/JAXRPCDeployerHookEJB21.java trunk/integration/jboss42/src/main/java/org/jboss/wsf/container/jboss42/JAXRPCDeployerHookJSE.java trunk/integration/jboss42/src/main/java/org/jboss/wsf/container/jboss42/JAXWSDeployerHookEJB3.java trunk/integration/jboss42/src/main/java/org/jboss/wsf/container/jboss42/JAXWSDeployerHookJSE.java trunk/integration/jboss50/src/main/java/org/jboss/wsf/container/jboss50/ArchiveDeployerHook.java trunk/integration/jboss50/src/main/java/org/jboss/wsf/container/jboss50/VirtualFileAdaptor.java trunk/integration/spi/src/main/java/org/jboss/ws/integration/ServiceRefHandlerFactory.java trunk/integration/spi/src/main/java/org/jboss/wsf/framework/deployment/ArchiveDeploymentImpl.java trunk/integration/spi/src/main/java/org/jboss/wsf/framework/deployment/EndpointAPIDeploymentAspect.java trunk/integration/spi/src/main/java/org/jboss/wsf/spi/deployment/ArchiveDeployment.java trunk/integration/spi/src/main/java/org/jboss/wsf/spi/metadata/j2ee/serviceref/UnifiedServiceRefMetaData.java trunk/integration/spi/src/main/java/org/jboss/wsf/spi/metadata/webservices/WebservicesFactory.java trunk/jbossws-core/src/main/java/org/jboss/ws/core/CommonClient.java trunk/jbossws-core/src/main/java/org/jboss/ws/core/jaxrpc/client/ServiceImpl.java trunk/jbossws-core/src/main/java/org/jboss/ws/core/jaxrpc/client/ServiceReferenceable.java trunk/jbossws-core/src/main/java/org/jboss/ws/core/jaxws/spi/ServiceDelegateImpl.java trunk/jbossws-core/src/main/java/org/jboss/ws/extensions/policy/metadata/PolicyMetaDataBuilder.java trunk/jbossws-core/src/main/java/org/jboss/ws/extensions/security/jaxrpc/WSSecurityHandler.java trunk/jbossws-core/src/main/java/org/jboss/ws/extensions/security/jaxws/WSSecurityHandler.java trunk/jbossws-core/src/main/java/org/jboss/ws/metadata/builder/jaxrpc/JAXRPCClientMetaDataBuilder.java trunk/jbossws-core/src/main/java/org/jboss/ws/metadata/builder/jaxws/JAXWSClientMetaDataBuilder.java trunk/jbossws-core/src/main/java/org/jboss/ws/metadata/config/JBossWSConfigFactory.java trunk/jbossws-core/src/main/java/org/jboss/ws/metadata/umdm/EndpointMetaData.java trunk/jbossws-core/src/main/java/org/jboss/ws/metadata/umdm/OperationMetaData.java trunk/jbossws-core/src/main/java/org/jboss/ws/metadata/umdm/ServiceMetaData.java trunk/jbossws-core/src/main/java/org/jboss/ws/metadata/umdm/UnifiedMetaData.java trunk/jbossws-core/src/main/java/org/jboss/ws/metadata/wsse/WSSecurityConfigFactory.java trunk/jbossws-core/src/main/java/org/jboss/ws/tools/jaxws/impl/JBossWSProviderImpl.java trunk/jbossws-core/src/main/java/org/jboss/ws/tools/metadata/ToolsUnifiedMetaDataBuilder.java trunk/jbossws-core/src/test/java/org/jboss/test/ws/jaxws/wspolicy/PolicyMetaDataBuilderTestCase.java Log: Restore serviceref handling through ws.integration Modified: trunk/integration/jboss40/src/main/java/org/jboss/wsf/container/jboss40/ServiceRefMetaDataAdapter.java =================================================================== --- trunk/integration/jboss40/src/main/java/org/jboss/wsf/container/jboss40/ServiceRefMetaDataAdapter.java 2007-07-31 17:11:42 UTC (rev 4043) +++ trunk/integration/jboss40/src/main/java/org/jboss/wsf/container/jboss40/ServiceRefMetaDataAdapter.java 2007-08-01 08:23:22 UTC (rev 4044) @@ -35,7 +35,7 @@ import org.jboss.webservice.metadata.serviceref.InitParamMetaData; import org.jboss.webservice.metadata.serviceref.PortComponentRefMetaData; import org.jboss.webservice.metadata.serviceref.ServiceRefMetaData; -import org.jboss.wsf.spi.deployment.UnifiedVirtualFile; +import org.jboss.ws.integration.UnifiedVirtualFile; import org.jboss.wsf.spi.metadata.j2ee.serviceref.UnifiedCallPropertyMetaData; import org.jboss.wsf.spi.metadata.j2ee.serviceref.UnifiedHandlerMetaData; import org.jboss.wsf.spi.metadata.j2ee.serviceref.UnifiedInitParamMetaData; Modified: trunk/integration/jboss42/src/main/java/org/jboss/wsf/container/jboss42/ArchiveDeployerHook.java =================================================================== --- trunk/integration/jboss42/src/main/java/org/jboss/wsf/container/jboss42/ArchiveDeployerHook.java 2007-07-31 17:11:42 UTC (rev 4043) +++ trunk/integration/jboss42/src/main/java/org/jboss/wsf/container/jboss42/ArchiveDeployerHook.java 2007-08-01 08:23:22 UTC (rev 4044) @@ -28,8 +28,8 @@ import org.jboss.deployment.DeploymentException; import org.jboss.deployment.DeploymentInfo; -import org.jboss.wsf.common.ResourceLoaderAdapter; -import org.jboss.wsf.spi.deployment.UnifiedVirtualFile; +import org.jboss.ws.integration.ResourceLoaderAdapter; +import org.jboss.ws.integration.UnifiedVirtualFile; import org.jboss.wsf.spi.deployment.Deployment; import org.jboss.wsf.spi.deployment.WSFDeploymentException; import org.jboss.wsf.spi.deployment.Deployment.DeploymentType; Modified: trunk/integration/jboss42/src/main/java/org/jboss/wsf/container/jboss42/JAXRPCDeployerHookEJB21.java =================================================================== --- trunk/integration/jboss42/src/main/java/org/jboss/wsf/container/jboss42/JAXRPCDeployerHookEJB21.java 2007-07-31 17:11:42 UTC (rev 4043) +++ trunk/integration/jboss42/src/main/java/org/jboss/wsf/container/jboss42/JAXRPCDeployerHookEJB21.java 2007-08-01 08:23:22 UTC (rev 4044) @@ -26,7 +26,7 @@ import org.jboss.deployment.DeploymentInfo; import org.jboss.metadata.ApplicationMetaData; import org.jboss.metadata.BeanMetaData; -import org.jboss.wsf.common.URLLoaderAdapter; +import org.jboss.ws.integration.URLLoaderAdapter; import org.jboss.wsf.spi.deployment.ArchiveDeployment; import org.jboss.wsf.spi.deployment.Deployment; import org.jboss.wsf.spi.deployment.Endpoint; Modified: trunk/integration/jboss42/src/main/java/org/jboss/wsf/container/jboss42/JAXRPCDeployerHookJSE.java =================================================================== --- trunk/integration/jboss42/src/main/java/org/jboss/wsf/container/jboss42/JAXRPCDeployerHookJSE.java 2007-07-31 17:11:42 UTC (rev 4043) +++ trunk/integration/jboss42/src/main/java/org/jboss/wsf/container/jboss42/JAXRPCDeployerHookJSE.java 2007-08-01 08:23:22 UTC (rev 4044) @@ -29,7 +29,7 @@ import org.jboss.deployment.DeploymentInfo; import org.jboss.metadata.WebMetaData; -import org.jboss.wsf.common.URLLoaderAdapter; +import org.jboss.ws.integration.URLLoaderAdapter; import org.jboss.wsf.spi.deployment.ArchiveDeployment; import org.jboss.wsf.spi.deployment.Deployment; import org.jboss.wsf.spi.deployment.Endpoint; Modified: trunk/integration/jboss42/src/main/java/org/jboss/wsf/container/jboss42/JAXWSDeployerHookEJB3.java =================================================================== --- trunk/integration/jboss42/src/main/java/org/jboss/wsf/container/jboss42/JAXWSDeployerHookEJB3.java 2007-07-31 17:11:42 UTC (rev 4043) +++ trunk/integration/jboss42/src/main/java/org/jboss/wsf/container/jboss42/JAXWSDeployerHookEJB3.java 2007-08-01 08:23:22 UTC (rev 4044) @@ -30,7 +30,7 @@ import org.jboss.ejb3.EJBContainer; import org.jboss.ejb3.Ejb3ModuleMBean; import org.jboss.ejb3.stateless.StatelessContainer; -import org.jboss.wsf.common.URLLoaderAdapter; +import org.jboss.ws.integration.URLLoaderAdapter; import org.jboss.wsf.spi.deployment.ArchiveDeployment; import org.jboss.wsf.spi.deployment.Deployment; import org.jboss.wsf.spi.deployment.Endpoint; Modified: trunk/integration/jboss42/src/main/java/org/jboss/wsf/container/jboss42/JAXWSDeployerHookJSE.java =================================================================== --- trunk/integration/jboss42/src/main/java/org/jboss/wsf/container/jboss42/JAXWSDeployerHookJSE.java 2007-07-31 17:11:42 UTC (rev 4043) +++ trunk/integration/jboss42/src/main/java/org/jboss/wsf/container/jboss42/JAXWSDeployerHookJSE.java 2007-08-01 08:23:22 UTC (rev 4044) @@ -34,7 +34,7 @@ import org.jboss.deployment.DeploymentInfo; import org.jboss.metadata.WebMetaData; -import org.jboss.wsf.common.URLLoaderAdapter; +import org.jboss.ws.integration.URLLoaderAdapter; import org.jboss.wsf.spi.deployment.ArchiveDeployment; import org.jboss.wsf.spi.deployment.Deployment; import org.jboss.wsf.spi.deployment.Endpoint; Modified: trunk/integration/jboss50/src/main/java/org/jboss/wsf/container/jboss50/ArchiveDeployerHook.java =================================================================== --- trunk/integration/jboss50/src/main/java/org/jboss/wsf/container/jboss50/ArchiveDeployerHook.java 2007-07-31 17:11:42 UTC (rev 4043) +++ trunk/integration/jboss50/src/main/java/org/jboss/wsf/container/jboss50/ArchiveDeployerHook.java 2007-08-01 08:23:22 UTC (rev 4044) @@ -27,7 +27,7 @@ import org.jboss.deployers.structure.spi.DeploymentUnit; import org.jboss.deployers.vfs.spi.structure.VFSDeploymentUnit; import org.jboss.virtual.VirtualFile; -import org.jboss.wsf.spi.deployment.UnifiedVirtualFile; +import org.jboss.ws.integration.UnifiedVirtualFile; import org.jboss.wsf.common.DOMUtils; import org.jboss.wsf.spi.deployment.Deployment; import org.jboss.wsf.spi.deployment.Deployment.DeploymentType; Modified: trunk/integration/jboss50/src/main/java/org/jboss/wsf/container/jboss50/VirtualFileAdaptor.java =================================================================== --- trunk/integration/jboss50/src/main/java/org/jboss/wsf/container/jboss50/VirtualFileAdaptor.java 2007-07-31 17:11:42 UTC (rev 4043) +++ trunk/integration/jboss50/src/main/java/org/jboss/wsf/container/jboss50/VirtualFileAdaptor.java 2007-08-01 08:23:22 UTC (rev 4044) @@ -22,7 +22,7 @@ package org.jboss.wsf.container.jboss50; import org.jboss.virtual.VirtualFile; -import org.jboss.wsf.spi.deployment.UnifiedVirtualFile; +import org.jboss.ws.integration.UnifiedVirtualFile; import java.io.IOException; import java.net.URL; Deleted: trunk/integration/spi/src/main/java/org/jboss/ws/integration/KernelLocator.java =================================================================== --- trunk/integration/spi/src/main/java/org/jboss/ws/integration/KernelLocator.java 2007-07-31 17:11:42 UTC (rev 4043) +++ trunk/integration/spi/src/main/java/org/jboss/ws/integration/KernelLocator.java 2007-08-01 08:23:22 UTC (rev 4044) @@ -1,46 +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; - -//$Id$ - -import org.jboss.kernel.Kernel; -import org.jboss.util.NotImplementedException; - -/** - * @deprecated - * @see org.jboss.wsf.common.KernelLocator - */ -public class KernelLocator -{ - @Deprecated - public static Kernel getKernel() - { - return org.jboss.wsf.common.KernelLocator.getKernel(); - } - - @Deprecated - public void setKernel(Kernel kernel) - { - throw new NotImplementedException("Deprecated, use: " + org.jboss.wsf.common.KernelLocator.class.getName()); - } -} Deleted: trunk/integration/spi/src/main/java/org/jboss/ws/integration/ResourceLoaderAdapter.java =================================================================== --- trunk/integration/spi/src/main/java/org/jboss/ws/integration/ResourceLoaderAdapter.java 2007-07-31 17:11:42 UTC (rev 4043) +++ trunk/integration/spi/src/main/java/org/jboss/ws/integration/ResourceLoaderAdapter.java 2007-08-01 08:23:22 UTC (rev 4044) @@ -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.integration; - -// $Id$ - -/** - * @deprecated - * @see org.jboss.wsf.common.ResourceLoaderAdapter - */ -public class ResourceLoaderAdapter extends org.jboss.wsf.common.ResourceLoaderAdapter implements UnifiedVirtualFile -{ - @Deprecated - public ResourceLoaderAdapter() - { - } - - @Deprecated - public ResourceLoaderAdapter(ClassLoader loader) - { - super(loader); - } -} Added: trunk/integration/spi/src/main/java/org/jboss/ws/integration/ResourceLoaderAdapter.java =================================================================== --- trunk/integration/spi/src/main/java/org/jboss/ws/integration/ResourceLoaderAdapter.java (rev 0) +++ trunk/integration/spi/src/main/java/org/jboss/ws/integration/ResourceLoaderAdapter.java 2007-08-01 08:23:22 UTC (rev 4044) @@ -0,0 +1,116 @@ +/* + * 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.File; +import java.io.IOException; +import java.net.MalformedURLException; +import java.net.URL; + + +/** + * The default file adapter loads resources through an associated classloader. + * If no classload is set, the the thread context classloader will be used. + * + * @author Heiko.Braun(a)jboss.org + * @since 25.01.2007 + */ +public class ResourceLoaderAdapter implements UnifiedVirtualFile +{ + private URL resourceURL; + private ClassLoader loader; + + public ResourceLoaderAdapter() + { + this(Thread.currentThread().getContextClassLoader()); + } + + public ResourceLoaderAdapter(ClassLoader loader) + { + this.loader = loader; + } + + private ResourceLoaderAdapter(ClassLoader loader, URL resourceURL) + { + this.resourceURL = resourceURL; + this.loader = loader; + } + + public UnifiedVirtualFile findChild(String resourcePath) throws IOException + { + URL resourceURL = null; + if (resourcePath != null) + { + // Try the child as URL + try + { + resourceURL = new URL(resourcePath); + } + catch (MalformedURLException ex) + { + // ignore + } + + // Try the filename as File + if (resourceURL == null) + { + try + { + File file = new File(resourcePath); + if (file.exists()) + resourceURL = file.toURL(); + } + catch (MalformedURLException e) + { + // ignore + } + } + + // Try the filename as Resource + if (resourceURL == null) + { + try + { + resourceURL = loader.getResource(resourcePath); + } + catch (Exception ex) + { + // ignore + } + } + } + + if (resourceURL == null) + throw new IOException("Cannot get URL for: " + resourcePath); + + return new ResourceLoaderAdapter(loader, resourceURL); + } + + public URL toURL() + { + if (null == this.resourceURL) + throw new IllegalStateException("UnifiedVirtualFile not initialized"); + return resourceURL; + } +} Modified: trunk/integration/spi/src/main/java/org/jboss/ws/integration/ServiceRefHandlerFactory.java =================================================================== --- trunk/integration/spi/src/main/java/org/jboss/ws/integration/ServiceRefHandlerFactory.java 2007-07-31 17:11:42 UTC (rev 4043) +++ trunk/integration/spi/src/main/java/org/jboss/ws/integration/ServiceRefHandlerFactory.java 2007-08-01 08:23:22 UTC (rev 4044) @@ -27,6 +27,7 @@ import org.jboss.kernel.spi.registry.KernelRegistry; import org.jboss.kernel.spi.registry.KernelRegistryEntry; import org.jboss.wsf.common.ServiceLoader; +import org.jboss.wsf.common.KernelLocator; /** * A factory for the ServiceRefHandler Deleted: trunk/integration/spi/src/main/java/org/jboss/ws/integration/URLLoaderAdapter.java =================================================================== --- trunk/integration/spi/src/main/java/org/jboss/ws/integration/URLLoaderAdapter.java 2007-07-31 17:11:42 UTC (rev 4043) +++ trunk/integration/spi/src/main/java/org/jboss/ws/integration/URLLoaderAdapter.java 2007-08-01 08:23:22 UTC (rev 4044) @@ -1,39 +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; - -// $Id$ - -import java.net.URL; - -/** - * @deprecated - * @see org.jboss.wsf.common.URLLoaderAdapter - */ -public class URLLoaderAdapter extends org.jboss.wsf.common.URLLoaderAdapter implements UnifiedVirtualFile -{ - @Deprecated - public URLLoaderAdapter(URL rootURL) - { - super(rootURL); - } -} Added: trunk/integration/spi/src/main/java/org/jboss/ws/integration/URLLoaderAdapter.java =================================================================== --- trunk/integration/spi/src/main/java/org/jboss/ws/integration/URLLoaderAdapter.java (rev 0) +++ trunk/integration/spi/src/main/java/org/jboss/ws/integration/URLLoaderAdapter.java 2007-08-01 08:23:22 UTC (rev 4044) @@ -0,0 +1,125 @@ +/* + * 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.File; +import java.io.IOException; +import java.net.MalformedURLException; +import java.net.URL; +import java.net.URLClassLoader; + + +/** + * Load resources through a URLClassLoader.<br> + * NOTE: The associated classloader doesn't do parent delegation. + * + * + * @author Heiko.Braun(a)jboss.org + * @since 25.01.2007 + */ +public class URLLoaderAdapter implements UnifiedVirtualFile +{ + private URL rootURL; + private URL resourceURL; + private transient URLClassLoader loader; + + public URLLoaderAdapter(URL rootURL) + { + this.rootURL = rootURL; + } + + private URLLoaderAdapter(URL rootURL, URLClassLoader loader, URL resourceURL) + { + this.rootURL = rootURL; + this.resourceURL = resourceURL; + this.loader = loader; + } + + public UnifiedVirtualFile findChild(String resourcePath) throws IOException + { + URL resourceURL = null; + if (resourcePath != null) + { + // Try the child as URL + try + { + resourceURL = new URL(resourcePath); + } + catch (MalformedURLException ex) + { + // ignore + } + + // Try the filename as File + if (resourceURL == null) + { + try + { + File file = new File(resourcePath); + if (file.exists()) + resourceURL = file.toURL(); + } + catch (MalformedURLException e) + { + // ignore + } + } + + // Try the filename as Resource + if (resourceURL == null) + { + try + { + resourceURL = getResourceLoader().getResource(resourcePath); + } + catch (Exception ex) + { + // ignore + } + } + } + + if (resourceURL == null) + throw new IOException("Cannot get URL for: " + resourcePath); + + return new URLLoaderAdapter(rootURL, loader, resourceURL); + } + + public URL toURL() + { + if (resourceURL != null) + return resourceURL; + else + return rootURL; + } + + private URLClassLoader getResourceLoader() + { + if (loader == null) + { + loader = new URLClassLoader(new URL[] { rootURL }); + } + return loader; + } +} Deleted: trunk/integration/spi/src/main/java/org/jboss/ws/integration/UnifiedVirtualFile.java =================================================================== --- trunk/integration/spi/src/main/java/org/jboss/ws/integration/UnifiedVirtualFile.java 2007-07-31 17:11:42 UTC (rev 4043) +++ trunk/integration/spi/src/main/java/org/jboss/ws/integration/UnifiedVirtualFile.java 2007-08-01 08:23:22 UTC (rev 4044) @@ -1,32 +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; - -// $Id$ - -/** - * @deprecated - * @see org.jboss.wsf.spi.deployment.UnifiedVirtualFile - */ -public interface UnifiedVirtualFile extends org.jboss.wsf.spi.deployment.UnifiedVirtualFile -{ -} Added: trunk/integration/spi/src/main/java/org/jboss/ws/integration/UnifiedVirtualFile.java =================================================================== --- trunk/integration/spi/src/main/java/org/jboss/ws/integration/UnifiedVirtualFile.java (rev 0) +++ trunk/integration/spi/src/main/java/org/jboss/ws/integration/UnifiedVirtualFile.java 2007-08-01 08:23:22 UTC (rev 4044) @@ -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(); +} Deleted: trunk/integration/spi/src/main/java/org/jboss/wsf/common/ResourceLoaderAdapter.java =================================================================== --- trunk/integration/spi/src/main/java/org/jboss/wsf/common/ResourceLoaderAdapter.java 2007-07-31 17:11:42 UTC (rev 4043) +++ trunk/integration/spi/src/main/java/org/jboss/wsf/common/ResourceLoaderAdapter.java 2007-08-01 08:23:22 UTC (rev 4044) @@ -1,117 +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.wsf.common; - -// $Id: ResourceLoaderAdapter.java 3137 2007-05-18 13:41:57Z thomas.diesler(a)jboss.com $ - -import java.io.File; -import java.io.IOException; -import java.net.MalformedURLException; -import java.net.URL; - -import org.jboss.wsf.spi.deployment.UnifiedVirtualFile; - -/** - * The default file adapter loads resources through an associated classloader. - * If no classload is set, the the thread context classloader will be used. - * - * @author Heiko.Braun(a)jboss.org - * @since 25.01.2007 - */ -public class ResourceLoaderAdapter implements UnifiedVirtualFile -{ - private URL resourceURL; - private ClassLoader loader; - - public ResourceLoaderAdapter() - { - this(Thread.currentThread().getContextClassLoader()); - } - - public ResourceLoaderAdapter(ClassLoader loader) - { - this.loader = loader; - } - - private ResourceLoaderAdapter(ClassLoader loader, URL resourceURL) - { - this.resourceURL = resourceURL; - this.loader = loader; - } - - public UnifiedVirtualFile findChild(String resourcePath) throws IOException - { - URL resourceURL = null; - if (resourcePath != null) - { - // Try the child as URL - try - { - resourceURL = new URL(resourcePath); - } - catch (MalformedURLException ex) - { - // ignore - } - - // Try the filename as File - if (resourceURL == null) - { - try - { - File file = new File(resourcePath); - if (file.exists()) - resourceURL = file.toURL(); - } - catch (MalformedURLException e) - { - // ignore - } - } - - // Try the filename as Resource - if (resourceURL == null) - { - try - { - resourceURL = loader.getResource(resourcePath); - } - catch (Exception ex) - { - // ignore - } - } - } - - if (resourceURL == null) - throw new IOException("Cannot get URL for: " + resourcePath); - - return new ResourceLoaderAdapter(loader, resourceURL); - } - - public URL toURL() - { - if (null == this.resourceURL) - throw new IllegalStateException("UnifiedVirtualFile not initialized"); - return resourceURL; - } -} Deleted: trunk/integration/spi/src/main/java/org/jboss/wsf/common/URLLoaderAdapter.java =================================================================== --- trunk/integration/spi/src/main/java/org/jboss/wsf/common/URLLoaderAdapter.java 2007-07-31 17:11:42 UTC (rev 4043) +++ trunk/integration/spi/src/main/java/org/jboss/wsf/common/URLLoaderAdapter.java 2007-08-01 08:23:22 UTC (rev 4044) @@ -1,126 +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.wsf.common; - -// $Id: URLLoaderAdapter.java 3830 2007-07-09 17:01:33Z heiko.braun(a)jboss.com $ - -import java.io.File; -import java.io.IOException; -import java.net.MalformedURLException; -import java.net.URL; -import java.net.URLClassLoader; - -import org.jboss.wsf.spi.deployment.UnifiedVirtualFile; - -/** - * Load resources through a URLClassLoader.<br> - * NOTE: The associated classloader doesn't do parent delegation. - * - * - * @author Heiko.Braun(a)jboss.org - * @since 25.01.2007 - */ -public class URLLoaderAdapter implements UnifiedVirtualFile -{ - private URL rootURL; - private URL resourceURL; - private transient URLClassLoader loader; - - public URLLoaderAdapter(URL rootURL) - { - this.rootURL = rootURL; - } - - private URLLoaderAdapter(URL rootURL, URLClassLoader loader, URL resourceURL) - { - this.rootURL = rootURL; - this.resourceURL = resourceURL; - this.loader = loader; - } - - public UnifiedVirtualFile findChild(String resourcePath) throws IOException - { - URL resourceURL = null; - if (resourcePath != null) - { - // Try the child as URL - try - { - resourceURL = new URL(resourcePath); - } - catch (MalformedURLException ex) - { - // ignore - } - - // Try the filename as File - if (resourceURL == null) - { - try - { - File file = new File(resourcePath); - if (file.exists()) - resourceURL = file.toURL(); - } - catch (MalformedURLException e) - { - // ignore - } - } - - // Try the filename as Resource - if (resourceURL == null) - { - try - { - resourceURL = getResourceLoader().getResource(resourcePath); - } - catch (Exception ex) - { - // ignore - } - } - } - - if (resourceURL == null) - throw new IOException("Cannot get URL for: " + resourcePath); - - return new URLLoaderAdapter(rootURL, loader, resourceURL); - } - - public URL toURL() - { - if (resourceURL != null) - return resourceURL; - else - return rootURL; - } - - private URLClassLoader getResourceLoader() - { - if (loader == null) - { - loader = new URLClassLoader(new URL[] { rootURL }); - } - return loader; - } -} Modified: trunk/integration/spi/src/main/java/org/jboss/wsf/framework/deployment/ArchiveDeploymentImpl.java =================================================================== --- trunk/integration/spi/src/main/java/org/jboss/wsf/framework/deployment/ArchiveDeploymentImpl.java 2007-07-31 17:11:42 UTC (rev 4043) +++ trunk/integration/spi/src/main/java/org/jboss/wsf/framework/deployment/ArchiveDeploymentImpl.java 2007-08-01 08:23:22 UTC (rev 4044) @@ -27,8 +27,8 @@ import java.net.MalformedURLException; import java.net.URL; +import org.jboss.ws.integration.UnifiedVirtualFile; import org.jboss.wsf.spi.deployment.ArchiveDeployment; -import org.jboss.wsf.spi.deployment.UnifiedVirtualFile; /** * A general web service deployment that is based on an archive. Modified: trunk/integration/spi/src/main/java/org/jboss/wsf/framework/deployment/EndpointAPIDeploymentAspect.java =================================================================== --- trunk/integration/spi/src/main/java/org/jboss/wsf/framework/deployment/EndpointAPIDeploymentAspect.java 2007-07-31 17:11:42 UTC (rev 4043) +++ trunk/integration/spi/src/main/java/org/jboss/wsf/framework/deployment/EndpointAPIDeploymentAspect.java 2007-08-01 08:23:22 UTC (rev 4044) @@ -23,12 +23,12 @@ //$Id: EndpointAddressDeploymentAspect.java 4018 2007-07-27 06:31:03Z thomas.diesler(a)jboss.com $ -import org.jboss.wsf.common.ResourceLoaderAdapter; +import org.jboss.ws.integration.ResourceLoaderAdapter; +import org.jboss.ws.integration.UnifiedVirtualFile; import org.jboss.wsf.spi.deployment.ArchiveDeployment; import org.jboss.wsf.spi.deployment.Deployment; import org.jboss.wsf.spi.deployment.DeploymentAspect; import org.jboss.wsf.spi.deployment.Endpoint; -import org.jboss.wsf.spi.deployment.UnifiedVirtualFile; import org.jboss.wsf.spi.deployment.Deployment.DeploymentType; /** Modified: trunk/integration/spi/src/main/java/org/jboss/wsf/spi/deployment/ArchiveDeployment.java =================================================================== --- trunk/integration/spi/src/main/java/org/jboss/wsf/spi/deployment/ArchiveDeployment.java 2007-07-31 17:11:42 UTC (rev 4043) +++ trunk/integration/spi/src/main/java/org/jboss/wsf/spi/deployment/ArchiveDeployment.java 2007-08-01 08:23:22 UTC (rev 4044) @@ -26,6 +26,8 @@ import java.io.IOException; import java.net.URL; +import org.jboss.ws.integration.UnifiedVirtualFile; + /** * A general web service deployment dep. * Deleted: trunk/integration/spi/src/main/java/org/jboss/wsf/spi/deployment/UnifiedVirtualFile.java =================================================================== --- trunk/integration/spi/src/main/java/org/jboss/wsf/spi/deployment/UnifiedVirtualFile.java 2007-07-31 17:11:42 UTC (rev 4043) +++ trunk/integration/spi/src/main/java/org/jboss/wsf/spi/deployment/UnifiedVirtualFile.java 2007-08-01 08:23:22 UTC (rev 4044) @@ -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.wsf.spi.deployment; - -// $Id: UnifiedVirtualFile.java 3137 2007-05-18 13:41:57Z thomas.diesler(a)jboss.com $ - -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: trunk/integration/spi/src/main/java/org/jboss/wsf/spi/metadata/j2ee/serviceref/UnifiedServiceRefMetaData.java =================================================================== --- trunk/integration/spi/src/main/java/org/jboss/wsf/spi/metadata/j2ee/serviceref/UnifiedServiceRefMetaData.java 2007-07-31 17:11:42 UTC (rev 4043) +++ trunk/integration/spi/src/main/java/org/jboss/wsf/spi/metadata/j2ee/serviceref/UnifiedServiceRefMetaData.java 2007-08-01 08:23:22 UTC (rev 4044) @@ -34,7 +34,7 @@ import org.jboss.logging.Logger; import org.jboss.ws.integration.ServiceRefMetaData; -import org.jboss.wsf.spi.deployment.UnifiedVirtualFile; +import org.jboss.ws.integration.UnifiedVirtualFile; import org.w3c.dom.Element; /** Modified: trunk/integration/spi/src/main/java/org/jboss/wsf/spi/metadata/webservices/WebservicesFactory.java =================================================================== --- trunk/integration/spi/src/main/java/org/jboss/wsf/spi/metadata/webservices/WebservicesFactory.java 2007-07-31 17:11:42 UTC (rev 4043) +++ trunk/integration/spi/src/main/java/org/jboss/wsf/spi/metadata/webservices/WebservicesFactory.java 2007-08-01 08:23:22 UTC (rev 4044) @@ -30,7 +30,7 @@ import javax.xml.ws.WebServiceException; import org.jboss.logging.Logger; -import org.jboss.wsf.spi.deployment.UnifiedVirtualFile; +import org.jboss.ws.integration.UnifiedVirtualFile; import org.jboss.wsf.spi.metadata.j2ee.serviceref.UnifiedHandlerChainMetaData; import org.jboss.wsf.spi.metadata.j2ee.serviceref.UnifiedHandlerChainsMetaData; import org.jboss.wsf.spi.metadata.j2ee.serviceref.UnifiedHandlerMetaData; Modified: trunk/jbossws-core/src/main/java/org/jboss/ws/core/CommonClient.java =================================================================== --- trunk/jbossws-core/src/main/java/org/jboss/ws/core/CommonClient.java 2007-07-31 17:11:42 UTC (rev 4043) +++ trunk/jbossws-core/src/main/java/org/jboss/ws/core/CommonClient.java 2007-08-01 08:23:22 UTC (rev 4044) @@ -54,7 +54,8 @@ import org.jboss.ws.core.soap.UnboundHeader; import org.jboss.ws.core.utils.HolderUtils; import org.jboss.ws.extensions.addressing.AddressingConstantsImpl; -import org.jboss.wsf.common.ResourceLoaderAdapter; +import org.jboss.ws.integration.ResourceLoaderAdapter; +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; @@ -64,7 +65,6 @@ import org.jboss.ws.metadata.umdm.EndpointMetaData.Type; import org.jboss.ws.metadata.wsse.WSSecurityConfigFactory; import org.jboss.ws.metadata.wsse.WSSecurityConfiguration; -import org.jboss.wsf.spi.deployment.UnifiedVirtualFile; import org.jboss.wsf.spi.metadata.j2ee.serviceref.UnifiedHandlerMetaData.HandlerType; /** Modified: trunk/jbossws-core/src/main/java/org/jboss/ws/core/jaxrpc/client/ServiceImpl.java =================================================================== --- trunk/jbossws-core/src/main/java/org/jboss/ws/core/jaxrpc/client/ServiceImpl.java 2007-07-31 17:11:42 UTC (rev 4043) +++ trunk/jbossws-core/src/main/java/org/jboss/ws/core/jaxrpc/client/ServiceImpl.java 2007-08-01 08:23:22 UTC (rev 4044) @@ -44,6 +44,7 @@ import org.jboss.logging.Logger; import org.jboss.ws.core.StubExt; +import org.jboss.ws.integration.ResourceLoaderAdapter; import org.jboss.ws.metadata.builder.jaxrpc.JAXRPCClientMetaDataBuilder; import org.jboss.ws.metadata.jaxrpcmapping.JavaWsdlMapping; import org.jboss.ws.metadata.umdm.EndpointMetaData; @@ -53,7 +54,6 @@ import org.jboss.ws.metadata.umdm.ServiceMetaData; import org.jboss.ws.metadata.umdm.UnifiedMetaData; import org.jboss.ws.metadata.wsse.WSSecurityConfiguration; -import org.jboss.wsf.common.ResourceLoaderAdapter; import org.jboss.wsf.spi.metadata.j2ee.serviceref.UnifiedCallPropertyMetaData; import org.jboss.wsf.spi.metadata.j2ee.serviceref.UnifiedInitParamMetaData; import org.jboss.wsf.spi.metadata.j2ee.serviceref.UnifiedPortComponentRefMetaData; Modified: trunk/jbossws-core/src/main/java/org/jboss/ws/core/jaxrpc/client/ServiceReferenceable.java =================================================================== --- trunk/jbossws-core/src/main/java/org/jboss/ws/core/jaxrpc/client/ServiceReferenceable.java 2007-07-31 17:11:42 UTC (rev 4043) +++ trunk/jbossws-core/src/main/java/org/jboss/ws/core/jaxrpc/client/ServiceReferenceable.java 2007-08-01 08:23:22 UTC (rev 4044) @@ -37,7 +37,7 @@ import javax.naming.StringRefAddr; import org.jboss.logging.Logger; -import org.jboss.wsf.spi.deployment.UnifiedVirtualFile; +import org.jboss.ws.integration.UnifiedVirtualFile; import org.jboss.ws.metadata.wsse.WSSecurityConfiguration; import org.jboss.ws.metadata.wsse.WSSecurityOMFactory; import org.jboss.wsf.spi.management.ServerConfig; Modified: trunk/jbossws-core/src/main/java/org/jboss/ws/core/jaxws/spi/ServiceDelegateImpl.java =================================================================== --- trunk/jbossws-core/src/main/java/org/jboss/ws/core/jaxws/spi/ServiceDelegateImpl.java 2007-07-31 17:11:42 UTC (rev 4043) +++ trunk/jbossws-core/src/main/java/org/jboss/ws/core/jaxws/spi/ServiceDelegateImpl.java 2007-08-01 08:23:22 UTC (rev 4044) @@ -56,8 +56,8 @@ import org.jboss.ws.core.jaxws.client.DispatchImpl; import org.jboss.ws.core.jaxws.client.ServiceObjectFactoryJAXWS; import org.jboss.ws.core.jaxws.handler.HandlerResolverImpl; -import org.jboss.wsf.common.ResourceLoaderAdapter; -import org.jboss.wsf.spi.deployment.UnifiedVirtualFile; +import org.jboss.ws.integration.ResourceLoaderAdapter; +import org.jboss.ws.integration.UnifiedVirtualFile; import org.jboss.ws.metadata.builder.jaxws.JAXWSClientMetaDataBuilder; import org.jboss.ws.metadata.builder.jaxws.JAXWSMetaDataBuilder; import org.jboss.ws.metadata.umdm.ClientEndpointMetaData; Modified: trunk/jbossws-core/src/main/java/org/jboss/ws/extensions/policy/metadata/PolicyMetaDataBuilder.java =================================================================== --- trunk/jbossws-core/src/main/java/org/jboss/ws/extensions/policy/metadata/PolicyMetaDataBuilder.java 2007-07-31 17:11:42 UTC (rev 4043) +++ trunk/jbossws-core/src/main/java/org/jboss/ws/extensions/policy/metadata/PolicyMetaDataBuilder.java 2007-08-01 08:23:22 UTC (rev 4044) @@ -37,7 +37,7 @@ import org.jboss.ws.extensions.policy.annotation.PolicyAttachment; import org.jboss.ws.extensions.policy.deployer.PolicyDeployer; import org.jboss.ws.extensions.policy.deployer.exceptions.UnsupportedPolicy; -import org.jboss.wsf.spi.deployment.UnifiedVirtualFile; +import org.jboss.ws.integration.UnifiedVirtualFile; import org.jboss.ws.metadata.umdm.EndpointMetaData; import org.jboss.ws.metadata.umdm.ExtensibleMetaData; import org.jboss.ws.metadata.wsdl.WSDLBinding; Modified: trunk/jbossws-core/src/main/java/org/jboss/ws/extensions/security/jaxrpc/WSSecurityHandler.java =================================================================== --- trunk/jbossws-core/src/main/java/org/jboss/ws/extensions/security/jaxrpc/WSSecurityHandler.java 2007-07-31 17:11:42 UTC (rev 4043) +++ trunk/jbossws-core/src/main/java/org/jboss/ws/extensions/security/jaxrpc/WSSecurityHandler.java 2007-08-01 08:23:22 UTC (rev 4044) @@ -35,7 +35,7 @@ import org.jboss.ws.core.CommonMessageContext; import org.jboss.ws.extensions.security.Constants; import org.jboss.ws.extensions.security.WSSecurityDispatcher; -import org.jboss.wsf.spi.deployment.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: trunk/jbossws-core/src/main/java/org/jboss/ws/extensions/security/jaxws/WSSecurityHandler.java =================================================================== --- trunk/jbossws-core/src/main/java/org/jboss/ws/extensions/security/jaxws/WSSecurityHandler.java 2007-07-31 17:11:42 UTC (rev 4043) +++ trunk/jbossws-core/src/main/java/org/jboss/ws/extensions/security/jaxws/WSSecurityHandler.java 2007-08-01 08:23:22 UTC (rev 4044) @@ -38,7 +38,7 @@ import org.jboss.ws.core.jaxws.handler.GenericSOAPHandler; import org.jboss.ws.extensions.security.Constants; import org.jboss.ws.extensions.security.WSSecurityDispatcher; -import org.jboss.wsf.spi.deployment.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: trunk/jbossws-core/src/main/java/org/jboss/ws/metadata/builder/jaxrpc/JAXRPCClientMetaDataBuilder.java =================================================================== --- trunk/jbossws-core/src/main/java/org/jboss/ws/metadata/builder/jaxrpc/JAXRPCClientMetaDataBuilder.java 2007-07-31 17:11:42 UTC (rev 4043) +++ trunk/jbossws-core/src/main/java/org/jboss/ws/metadata/builder/jaxrpc/JAXRPCClientMetaDataBuilder.java 2007-08-01 08:23:22 UTC (rev 4044) @@ -32,6 +32,8 @@ import org.jboss.logging.Logger; import org.jboss.ws.Constants; import org.jboss.ws.WSException; +import org.jboss.ws.integration.ResourceLoaderAdapter; +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.jaxrpcmapping.ServiceEndpointInterfaceMapping; @@ -46,8 +48,6 @@ import org.jboss.ws.metadata.wsdl.WSDLService; import org.jboss.ws.metadata.wsse.WSSecurityConfiguration; import org.jboss.ws.metadata.wsse.WSSecurityOMFactory; -import org.jboss.wsf.common.ResourceLoaderAdapter; -import org.jboss.wsf.spi.deployment.UnifiedVirtualFile; import org.jboss.wsf.spi.metadata.j2ee.serviceref.UnifiedHandlerMetaData; import org.jboss.wsf.spi.metadata.j2ee.serviceref.UnifiedServiceRefMetaData; import org.jboss.wsf.spi.metadata.j2ee.serviceref.UnifiedHandlerMetaData.HandlerType; Modified: trunk/jbossws-core/src/main/java/org/jboss/ws/metadata/builder/jaxws/JAXWSClientMetaDataBuilder.java =================================================================== --- trunk/jbossws-core/src/main/java/org/jboss/ws/metadata/builder/jaxws/JAXWSClientMetaDataBuilder.java 2007-07-31 17:11:42 UTC (rev 4043) +++ trunk/jbossws-core/src/main/java/org/jboss/ws/metadata/builder/jaxws/JAXWSClientMetaDataBuilder.java 2007-08-01 08:23:22 UTC (rev 4044) @@ -36,6 +36,8 @@ import org.jboss.ws.core.jaxws.client.ServiceObjectFactoryJAXWS; import org.jboss.ws.core.soap.Style; import org.jboss.ws.extensions.policy.metadata.PolicyMetaDataBuilder; +import org.jboss.ws.integration.ResourceLoaderAdapter; +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; @@ -51,8 +53,6 @@ import org.jboss.ws.metadata.wsdl.WSDLService; import org.jboss.ws.metadata.wsdl.WSDLUtils; import org.jboss.ws.metadata.wsdl.xmlschema.JBossXSModel; -import org.jboss.wsf.common.ResourceLoaderAdapter; -import org.jboss.wsf.spi.deployment.UnifiedVirtualFile; import org.jboss.wsf.spi.metadata.j2ee.serviceref.UnifiedCallPropertyMetaData; import org.jboss.wsf.spi.metadata.j2ee.serviceref.UnifiedPortComponentRefMetaData; import org.jboss.wsf.spi.metadata.j2ee.serviceref.UnifiedServiceRefMetaData; Modified: trunk/jbossws-core/src/main/java/org/jboss/ws/metadata/config/JBossWSConfigFactory.java =================================================================== --- trunk/jbossws-core/src/main/java/org/jboss/ws/metadata/config/JBossWSConfigFactory.java 2007-07-31 17:11:42 UTC (rev 4043) +++ trunk/jbossws-core/src/main/java/org/jboss/ws/metadata/config/JBossWSConfigFactory.java 2007-08-01 08:23:22 UTC (rev 4044) @@ -28,12 +28,12 @@ import org.jboss.logging.Logger; import org.jboss.ws.WSException; +import org.jboss.ws.integration.ResourceLoaderAdapter; +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; import org.jboss.ws.metadata.config.jaxws.ConfigRootJAXWS; -import org.jboss.wsf.common.ResourceLoaderAdapter; -import org.jboss.wsf.spi.deployment.UnifiedVirtualFile; import org.jboss.wsf.common.DOMUtils; import org.jboss.xb.binding.JBossXBException; import org.jboss.xb.binding.Unmarshaller; Modified: trunk/jbossws-core/src/main/java/org/jboss/ws/metadata/umdm/EndpointMetaData.java =================================================================== --- trunk/jbossws-core/src/main/java/org/jboss/ws/metadata/umdm/EndpointMetaData.java 2007-07-31 17:11:42 UTC (rev 4043) +++ trunk/jbossws-core/src/main/java/org/jboss/ws/metadata/umdm/EndpointMetaData.java 2007-08-01 08:23:22 UTC (rev 4044) @@ -57,7 +57,7 @@ import org.jboss.ws.core.jaxws.client.DispatchBinding; import org.jboss.ws.core.soap.Style; import org.jboss.ws.core.soap.Use; -import org.jboss.wsf.spi.deployment.UnifiedVirtualFile; +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: trunk/jbossws-core/src/main/java/org/jboss/ws/metadata/umdm/OperationMetaData.java =================================================================== --- trunk/jbossws-core/src/main/java/org/jboss/ws/metadata/umdm/OperationMetaData.java 2007-07-31 17:11:42 UTC (rev 4043) +++ trunk/jbossws-core/src/main/java/org/jboss/ws/metadata/umdm/OperationMetaData.java 2007-08-01 08:23:22 UTC (rev 4044) @@ -37,8 +37,8 @@ import org.jboss.ws.WSException; import org.jboss.ws.core.soap.Style; import org.jboss.ws.core.soap.Use; +import org.jboss.ws.integration.ResourceLoaderAdapter; import org.jboss.ws.metadata.umdm.EndpointMetaData.Type; -import org.jboss.wsf.common.ResourceLoaderAdapter; import org.jboss.wsf.common.JavaUtils; import org.w3c.dom.Element; Modified: trunk/jbossws-core/src/main/java/org/jboss/ws/metadata/umdm/ServiceMetaData.java =================================================================== --- trunk/jbossws-core/src/main/java/org/jboss/ws/metadata/umdm/ServiceMetaData.java 2007-07-31 17:11:42 UTC (rev 4043) +++ trunk/jbossws-core/src/main/java/org/jboss/ws/metadata/umdm/ServiceMetaData.java 2007-08-01 08:23:22 UTC (rev 4044) @@ -42,6 +42,7 @@ import org.jboss.ws.core.jaxrpc.TypeMappingRegistryImpl; import org.jboss.ws.core.jaxrpc.binding.jbossxb.SchemaBindingBuilder; import org.jboss.ws.core.soap.Use; +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.wsdl.WSDLDefinitions; @@ -50,7 +51,6 @@ import org.jboss.ws.metadata.wsdl.xmlschema.JBossXSModel; import org.jboss.ws.metadata.wsse.WSSecurityConfiguration; import org.jboss.ws.tools.wsdl.WSDLDefinitionsFactory; -import org.jboss.wsf.spi.deployment.UnifiedVirtualFile; import org.jboss.wsf.spi.metadata.j2ee.serviceref.UnifiedHandlerMetaData.HandlerType; import org.jboss.xb.binding.sunday.unmarshalling.SchemaBinding; Modified: trunk/jbossws-core/src/main/java/org/jboss/ws/metadata/umdm/UnifiedMetaData.java =================================================================== --- trunk/jbossws-core/src/main/java/org/jboss/ws/metadata/umdm/UnifiedMetaData.java 2007-07-31 17:11:42 UTC (rev 4043) +++ trunk/jbossws-core/src/main/java/org/jboss/ws/metadata/umdm/UnifiedMetaData.java 2007-08-01 08:23:22 UTC (rev 4044) @@ -30,9 +30,9 @@ import java.util.StringTokenizer; import org.jboss.logging.Logger; +import org.jboss.ws.integration.UnifiedVirtualFile; import org.jboss.ws.metadata.jaxrpcmapping.JavaWsdlMapping; import org.jboss.ws.metadata.wsdl.WSDLDefinitions; -import org.jboss.wsf.spi.deployment.UnifiedVirtualFile; /** * The top level meta data. Modified: trunk/jbossws-core/src/main/java/org/jboss/ws/metadata/wsse/WSSecurityConfigFactory.java =================================================================== --- trunk/jbossws-core/src/main/java/org/jboss/ws/metadata/wsse/WSSecurityConfigFactory.java 2007-07-31 17:11:42 UTC (rev 4043) +++ trunk/jbossws-core/src/main/java/org/jboss/ws/metadata/wsse/WSSecurityConfigFactory.java 2007-08-01 08:23:22 UTC (rev 4044) @@ -29,8 +29,8 @@ import org.jboss.logging.Logger; import org.jboss.ws.WSException; +import org.jboss.ws.integration.UnifiedVirtualFile; import org.jboss.ws.metadata.builder.jaxrpc.JAXRPCServerMetaDataBuilder; -import org.jboss.wsf.spi.deployment.UnifiedVirtualFile; /** * Create a WSSecurityConfiguration Modified: trunk/jbossws-core/src/main/java/org/jboss/ws/tools/jaxws/impl/JBossWSProviderImpl.java =================================================================== --- trunk/jbossws-core/src/main/java/org/jboss/ws/tools/jaxws/impl/JBossWSProviderImpl.java 2007-07-31 17:11:42 UTC (rev 4043) +++ trunk/jbossws-core/src/main/java/org/jboss/ws/tools/jaxws/impl/JBossWSProviderImpl.java 2007-08-01 08:23:22 UTC (rev 4044) @@ -28,7 +28,7 @@ import java.net.URLClassLoader; import org.jboss.ws.WSException; -import org.jboss.wsf.common.ResourceLoaderAdapter; +import org.jboss.ws.integration.ResourceLoaderAdapter; import org.jboss.ws.metadata.builder.jaxws.JAXWSWebServiceMetaDataBuilder; import org.jboss.ws.metadata.umdm.UnifiedMetaData; import org.jboss.wsf.spi.SPIProvider; Modified: trunk/jbossws-core/src/main/java/org/jboss/ws/tools/metadata/ToolsUnifiedMetaDataBuilder.java =================================================================== --- trunk/jbossws-core/src/main/java/org/jboss/ws/tools/metadata/ToolsUnifiedMetaDataBuilder.java 2007-07-31 17:11:42 UTC (rev 4043) +++ trunk/jbossws-core/src/main/java/org/jboss/ws/tools/metadata/ToolsUnifiedMetaDataBuilder.java 2007-08-01 08:23:22 UTC (rev 4044) @@ -33,11 +33,11 @@ import org.jboss.logging.Logger; import org.jboss.ws.WSException; import org.jboss.ws.core.soap.Style; +import org.jboss.ws.integration.ResourceLoaderAdapter; import org.jboss.ws.metadata.umdm.ServiceMetaData; import org.jboss.ws.metadata.umdm.UnifiedMetaData; import org.jboss.ws.metadata.wsdl.WSDLUtils; import org.jboss.ws.tools.Configuration.OperationConfig; -import org.jboss.wsf.common.ResourceLoaderAdapter; /** * Builder class that builds the Tools Meta Data Modified: trunk/jbossws-core/src/test/java/org/jboss/test/ws/jaxws/wspolicy/PolicyMetaDataBuilderTestCase.java =================================================================== --- trunk/jbossws-core/src/test/java/org/jboss/test/ws/jaxws/wspolicy/PolicyMetaDataBuilderTestCase.java 2007-07-31 17:11:42 UTC (rev 4043) +++ trunk/jbossws-core/src/test/java/org/jboss/test/ws/jaxws/wspolicy/PolicyMetaDataBuilderTestCase.java 2007-08-01 08:23:22 UTC (rev 4044) @@ -36,8 +36,8 @@ import org.jboss.ws.extensions.policy.deployer.domainAssertion.NopAssertionDeployer; import org.jboss.ws.extensions.policy.metadata.PolicyMetaDataBuilder; import org.jboss.ws.extensions.policy.metadata.PolicyMetaExtension; -import org.jboss.wsf.common.URLLoaderAdapter; -import org.jboss.wsf.spi.deployment.UnifiedVirtualFile; +import org.jboss.ws.integration.URLLoaderAdapter; +import org.jboss.ws.integration.UnifiedVirtualFile; import org.jboss.ws.metadata.umdm.EndpointMetaData; import org.jboss.ws.metadata.umdm.ServerEndpointMetaData; import org.jboss.ws.metadata.umdm.ServiceMetaData;