[jbossws-commits] JBossWS SVN: r3136 - in branches/tdiesler/trunk: integration/jboss42/ant-import and 37 other directories.
jbossws-commits at lists.jboss.org
jbossws-commits at lists.jboss.org
Fri May 18 09:18:06 EDT 2007
Author: thomas.diesler at jboss.com
Date: 2007-05-18 09:18:06 -0400 (Fri, 18 May 2007)
New Revision: 3136
Added:
branches/tdiesler/trunk/integration/spi/src/main/java/org/jboss/ws/integration/ResourceLoaderAdapter.java
branches/tdiesler/trunk/integration/spi/src/main/java/org/jboss/ws/integration/ServiceRefElement.java
branches/tdiesler/trunk/integration/spi/src/main/java/org/jboss/ws/integration/ServiceRefHandler.java
branches/tdiesler/trunk/integration/spi/src/main/java/org/jboss/ws/integration/ServiceRefMetaData.java
branches/tdiesler/trunk/integration/spi/src/main/java/org/jboss/ws/integration/URLLoaderAdapter.java
Removed:
branches/tdiesler/trunk/integration/spi/src/main/java/org/jboss/ws/integration/ServiceRefElement.java
branches/tdiesler/trunk/integration/spi/src/main/java/org/jboss/ws/integration/ServiceRefHandler.java
branches/tdiesler/trunk/integration/spi/src/main/java/org/jboss/ws/integration/ServiceRefMetaData.java
branches/tdiesler/trunk/integration/spi/src/main/java/org/jboss/wsintegration/spi/deployment/ResourceLoaderAdapter.java
branches/tdiesler/trunk/integration/spi/src/main/java/org/jboss/wsintegration/spi/deployment/URLLoaderAdapter.java
branches/tdiesler/trunk/integration/spi/src/main/java/org/jboss/wsintegration/spi/deployment/UnifiedVirtualFile.java
branches/tdiesler/trunk/integration/spi/src/main/java/org/jboss/wsintegration/spi/serviceref/ServiceRefElement.java
branches/tdiesler/trunk/integration/spi/src/main/java/org/jboss/wsintegration/spi/serviceref/ServiceRefHandler.java
branches/tdiesler/trunk/integration/spi/src/main/java/org/jboss/wsintegration/spi/serviceref/ServiceRefMetaData.java
branches/tdiesler/trunk/integration/spi/src/main/java/org/jboss/wsintegration/spi/utils/KernelLocator.java
Modified:
branches/tdiesler/trunk/build/ant.properties.example
branches/tdiesler/trunk/integration/jboss42/ant-import/build-thirdparty.xml
branches/tdiesler/trunk/integration/jboss42/src/main/java/org/jboss/wsintegration/container/jboss42/ArchiveDeployerHook.java
branches/tdiesler/trunk/integration/jboss42/src/main/java/org/jboss/wsintegration/container/jboss42/DeploymentInfoAdapter.java
branches/tdiesler/trunk/integration/jboss42/src/main/java/org/jboss/wsintegration/container/jboss42/DeploymentInfoAdapterFactory.java
branches/tdiesler/trunk/integration/jboss50/ant-import/build-thirdparty.xml
branches/tdiesler/trunk/integration/jboss50/src/main/java/org/jboss/wsintegration/container/jboss50/ArchiveDeployerHook.java
branches/tdiesler/trunk/integration/jboss50/src/main/java/org/jboss/wsintegration/container/jboss50/VirtualFileAdaptor.java
branches/tdiesler/trunk/integration/jbws/ant-import/build-deploy.xml
branches/tdiesler/trunk/integration/jbws/ant-import/build-release.xml
branches/tdiesler/trunk/integration/jbws/ant-import/build-testsuite.xml
branches/tdiesler/trunk/integration/jbws/build.xml
branches/tdiesler/trunk/integration/jbws/src/main/resources/jbossws-jbws42.sar/jbossws.beans/META-INF/jboss-beans.xml
branches/tdiesler/trunk/integration/jbws/src/main/resources/jbossws-jbws50.sar/META-INF/jbossws-beans.xml
branches/tdiesler/trunk/integration/spi/ant-import/build-release.xml
branches/tdiesler/trunk/integration/spi/build.xml
branches/tdiesler/trunk/integration/spi/src/main/etc/component-info.xml
branches/tdiesler/trunk/integration/spi/src/main/java/org/jboss/ws/integration/KernelLocator.java
branches/tdiesler/trunk/integration/spi/src/main/java/org/jboss/ws/integration/UnifiedVirtualFile.java
branches/tdiesler/trunk/integration/spi/src/main/java/org/jboss/wsintegration/spi/deployment/JAXRPCDeployment.java
branches/tdiesler/trunk/integration/spi/src/main/java/org/jboss/wsintegration/spi/deployment/UnifiedDeploymentInfo.java
branches/tdiesler/trunk/integration/spi/src/main/java/org/jboss/wsintegration/spi/management/EndpointRegistryFactory.java
branches/tdiesler/trunk/integration/spi/src/main/java/org/jboss/wsintegration/spi/management/ServerConfigFactory.java
branches/tdiesler/trunk/integration/spi/src/main/java/org/jboss/wsintegration/spi/metadata/j2ee/serviceref/UnifiedCallPropertyMetaData.java
branches/tdiesler/trunk/integration/spi/src/main/java/org/jboss/wsintegration/spi/metadata/j2ee/serviceref/UnifiedHandlerChainMetaData.java
branches/tdiesler/trunk/integration/spi/src/main/java/org/jboss/wsintegration/spi/metadata/j2ee/serviceref/UnifiedHandlerChainsMetaData.java
branches/tdiesler/trunk/integration/spi/src/main/java/org/jboss/wsintegration/spi/metadata/j2ee/serviceref/UnifiedHandlerMetaData.java
branches/tdiesler/trunk/integration/spi/src/main/java/org/jboss/wsintegration/spi/metadata/j2ee/serviceref/UnifiedInitParamMetaData.java
branches/tdiesler/trunk/integration/spi/src/main/java/org/jboss/wsintegration/spi/metadata/j2ee/serviceref/UnifiedPortComponentRefMetaData.java
branches/tdiesler/trunk/integration/spi/src/main/java/org/jboss/wsintegration/spi/metadata/j2ee/serviceref/UnifiedServiceRefMetaData.java
branches/tdiesler/trunk/integration/spi/src/main/java/org/jboss/wsintegration/spi/metadata/j2ee/serviceref/UnifiedStubPropertyMetaData.java
branches/tdiesler/trunk/integration/spi/src/main/java/org/jboss/wsintegration/spi/metadata/webservices/WebservicesFactory.java
branches/tdiesler/trunk/integration/sunri/ant-import/build-deploy.xml
branches/tdiesler/trunk/integration/sunri/ant-import/build-testsuite.xml
branches/tdiesler/trunk/integration/sunri/ant-import/build-thirdparty.xml
branches/tdiesler/trunk/integration/sunri/src/main/resources/jbossws-jboss50.sar/META-INF/jbossws-beans.xml
branches/tdiesler/trunk/jbossws-core/ant-import-tests/build-testsuite.xml
branches/tdiesler/trunk/jbossws-core/ant-import/build-deploy.xml
branches/tdiesler/trunk/jbossws-core/ant-import/build-release.xml
branches/tdiesler/trunk/jbossws-core/ant-import/build-thirdparty.xml
branches/tdiesler/trunk/jbossws-core/build.xml
branches/tdiesler/trunk/jbossws-core/src/main/java/org/jboss/ws/core/CommonClient.java
branches/tdiesler/trunk/jbossws-core/src/main/java/org/jboss/ws/core/client/ServiceRefHandlerImpl.java
branches/tdiesler/trunk/jbossws-core/src/main/java/org/jboss/ws/core/client/ServiceRefObjectFactory.java
branches/tdiesler/trunk/jbossws-core/src/main/java/org/jboss/ws/core/jaxrpc/client/ServiceImpl.java
branches/tdiesler/trunk/jbossws-core/src/main/java/org/jboss/ws/core/jaxrpc/client/ServiceReferenceable.java
branches/tdiesler/trunk/jbossws-core/src/main/java/org/jboss/ws/core/jaxws/client/ServiceExt.java
branches/tdiesler/trunk/jbossws-core/src/main/java/org/jboss/ws/core/jaxws/spi/ServiceDelegateImpl.java
branches/tdiesler/trunk/jbossws-core/src/main/java/org/jboss/ws/extensions/eventing/mgmt/SubscriptionManagerFactory.java
branches/tdiesler/trunk/jbossws-core/src/main/java/org/jboss/ws/extensions/security/jaxrpc/WSSecurityHandler.java
branches/tdiesler/trunk/jbossws-core/src/main/java/org/jboss/ws/extensions/security/jaxws/WSSecurityHandler.java
branches/tdiesler/trunk/jbossws-core/src/main/java/org/jboss/ws/metadata/builder/jaxrpc/JAXRPCClientMetaDataBuilder.java
branches/tdiesler/trunk/jbossws-core/src/main/java/org/jboss/ws/metadata/builder/jaxws/JAXWSClientMetaDataBuilder.java
branches/tdiesler/trunk/jbossws-core/src/main/java/org/jboss/ws/metadata/config/JBossWSConfigFactory.java
branches/tdiesler/trunk/jbossws-core/src/main/java/org/jboss/ws/metadata/umdm/EndpointMetaData.java
branches/tdiesler/trunk/jbossws-core/src/main/java/org/jboss/ws/metadata/umdm/OperationMetaData.java
branches/tdiesler/trunk/jbossws-core/src/main/java/org/jboss/ws/metadata/umdm/ServiceMetaData.java
branches/tdiesler/trunk/jbossws-core/src/main/java/org/jboss/ws/metadata/umdm/UnifiedMetaData.java
branches/tdiesler/trunk/jbossws-core/src/main/java/org/jboss/ws/metadata/wsse/WSSecurityConfigFactory.java
branches/tdiesler/trunk/jbossws-core/src/main/java/org/jboss/ws/tools/jaxws/impl/WSContractProviderImpl.java
branches/tdiesler/trunk/jbossws-core/src/main/java/org/jboss/ws/tools/metadata/ToolsUnifiedMetaDataBuilder.java
Log:
Modified: branches/tdiesler/trunk/build/ant.properties.example
===================================================================
--- branches/tdiesler/trunk/build/ant.properties.example 2007-05-18 10:22:57 UTC (rev 3135)
+++ branches/tdiesler/trunk/build/ant.properties.example 2007-05-18 13:18:06 UTC (rev 3136)
@@ -41,7 +41,7 @@
# JBossWS Release
jbossws.portal.content=/home/tdiesler/svn/jbossws/portal-content
-jboss.local.repository=/home/tdiesler/svn/repository.jboss.org
+jboss.local.repository=/home/tdiesler/svn/jboss.local.repository
# Force thirdparty HTTP get
#force.thirdparty.get=true
Modified: branches/tdiesler/trunk/integration/jboss42/ant-import/build-thirdparty.xml
===================================================================
--- branches/tdiesler/trunk/integration/jboss42/ant-import/build-thirdparty.xml 2007-05-18 10:22:57 UTC (rev 3135)
+++ branches/tdiesler/trunk/integration/jboss42/ant-import/build-thirdparty.xml 2007-05-18 13:18:06 UTC (rev 3136)
@@ -32,7 +32,7 @@
<!-- The compile classpath for jboss42 integration -->
<path id="jbws42.integration.classpath">
- <pathelement location="${spi.dir}/output/lib/jbossws-spi.jar"/>
+ <pathelement location="${spi.dir}/output/lib/jbossws-integration.jar"/>
<pathelement location="${spi.dir}/thirdparty/jaxws-api.jar"/>
<pathelement location="${spi.dir}/thirdparty/jaxrpc-api.jar"/>
<pathelement location="${spi.dir}/thirdparty/jsr181-api.jar"/>
Modified: branches/tdiesler/trunk/integration/jboss42/src/main/java/org/jboss/wsintegration/container/jboss42/ArchiveDeployerHook.java
===================================================================
--- branches/tdiesler/trunk/integration/jboss42/src/main/java/org/jboss/wsintegration/container/jboss42/ArchiveDeployerHook.java 2007-05-18 10:22:57 UTC (rev 3135)
+++ branches/tdiesler/trunk/integration/jboss42/src/main/java/org/jboss/wsintegration/container/jboss42/ArchiveDeployerHook.java 2007-05-18 13:18:06 UTC (rev 3136)
@@ -28,9 +28,9 @@
import org.jboss.deployment.DeploymentException;
import org.jboss.deployment.DeploymentInfo;
+import org.jboss.ws.integration.ResourceLoaderAdapter;
+import org.jboss.ws.integration.UnifiedVirtualFile;
import org.jboss.wsintegration.spi.deployment.Deployment;
-import org.jboss.wsintegration.spi.deployment.ResourceLoaderAdapter;
-import org.jboss.wsintegration.spi.deployment.UnifiedVirtualFile;
import org.jboss.wsintegration.spi.deployment.WSDeploymentException;
import org.jboss.wsintegration.spi.deployment.Deployment.DeploymentType;
import org.jboss.wsintegration.spi.metadata.webservices.WebservicesFactory;
Modified: branches/tdiesler/trunk/integration/jboss42/src/main/java/org/jboss/wsintegration/container/jboss42/DeploymentInfoAdapter.java
===================================================================
--- branches/tdiesler/trunk/integration/jboss42/src/main/java/org/jboss/wsintegration/container/jboss42/DeploymentInfoAdapter.java 2007-05-18 10:22:57 UTC (rev 3135)
+++ branches/tdiesler/trunk/integration/jboss42/src/main/java/org/jboss/wsintegration/container/jboss42/DeploymentInfoAdapter.java 2007-05-18 13:18:06 UTC (rev 3136)
@@ -40,7 +40,7 @@
import org.jboss.mx.util.MBeanProxy;
import org.jboss.mx.util.MBeanProxyCreationException;
import org.jboss.mx.util.MBeanServerLocator;
-import org.jboss.wsintegration.spi.deployment.ResourceLoaderAdapter;
+import org.jboss.ws.integration.ResourceLoaderAdapter;
import org.jboss.wsintegration.spi.deployment.UnifiedDeploymentInfo;
import org.jboss.wsintegration.spi.deployment.WSDeploymentException;
import org.jboss.wsintegration.spi.metadata.j2ee.UnifiedApplicationMetaData;
Modified: branches/tdiesler/trunk/integration/jboss42/src/main/java/org/jboss/wsintegration/container/jboss42/DeploymentInfoAdapterFactory.java
===================================================================
--- branches/tdiesler/trunk/integration/jboss42/src/main/java/org/jboss/wsintegration/container/jboss42/DeploymentInfoAdapterFactory.java 2007-05-18 10:22:57 UTC (rev 3135)
+++ branches/tdiesler/trunk/integration/jboss42/src/main/java/org/jboss/wsintegration/container/jboss42/DeploymentInfoAdapterFactory.java 2007-05-18 13:18:06 UTC (rev 3136)
@@ -25,7 +25,7 @@
import org.jboss.kernel.spi.registry.KernelRegistry;
import org.jboss.kernel.spi.registry.KernelRegistryEntry;
-import org.jboss.wsintegration.spi.utils.KernelLocator;
+import org.jboss.ws.integration.KernelLocator;
/**
* @author Thomas.Diesler at jboss.org
Modified: branches/tdiesler/trunk/integration/jboss50/ant-import/build-thirdparty.xml
===================================================================
--- branches/tdiesler/trunk/integration/jboss50/ant-import/build-thirdparty.xml 2007-05-18 10:22:57 UTC (rev 3135)
+++ branches/tdiesler/trunk/integration/jboss50/ant-import/build-thirdparty.xml 2007-05-18 13:18:06 UTC (rev 3136)
@@ -32,7 +32,7 @@
<!-- The compile classpath for jboss50 integration -->
<path id="jbws50.integration.classpath">
- <pathelement location="${spi.dir}/output/lib/jbossws-spi.jar"/>
+ <pathelement location="${spi.dir}/output/lib/jbossws-integration.jar"/>
<pathelement location="${spi.dir}/thirdparty/jaxws-api.jar"/>
<pathelement location="${spi.dir}/thirdparty/jaxrpc-api.jar"/>
<pathelement location="${spi.dir}/thirdparty/jsr181-api.jar"/>
Modified: branches/tdiesler/trunk/integration/jboss50/src/main/java/org/jboss/wsintegration/container/jboss50/ArchiveDeployerHook.java
===================================================================
--- branches/tdiesler/trunk/integration/jboss50/src/main/java/org/jboss/wsintegration/container/jboss50/ArchiveDeployerHook.java 2007-05-18 10:22:57 UTC (rev 3135)
+++ branches/tdiesler/trunk/integration/jboss50/src/main/java/org/jboss/wsintegration/container/jboss50/ArchiveDeployerHook.java 2007-05-18 13:18:06 UTC (rev 3136)
@@ -28,9 +28,8 @@
import org.jboss.deployers.spi.DeploymentException;
import org.jboss.deployers.spi.deployer.DeploymentUnit;
import org.jboss.virtual.VirtualFile;
-import org.jboss.wsintegration.container.jboss50.AbstractDeployerHook;
+import org.jboss.ws.integration.UnifiedVirtualFile;
import org.jboss.wsintegration.spi.deployment.Deployment;
-import org.jboss.wsintegration.spi.deployment.UnifiedVirtualFile;
import org.jboss.wsintegration.spi.deployment.WSDeploymentException;
import org.jboss.wsintegration.spi.deployment.Deployment.DeploymentType;
import org.jboss.wsintegration.spi.metadata.webservices.WebservicesFactory;
Modified: branches/tdiesler/trunk/integration/jboss50/src/main/java/org/jboss/wsintegration/container/jboss50/VirtualFileAdaptor.java
===================================================================
--- branches/tdiesler/trunk/integration/jboss50/src/main/java/org/jboss/wsintegration/container/jboss50/VirtualFileAdaptor.java 2007-05-18 10:22:57 UTC (rev 3135)
+++ branches/tdiesler/trunk/integration/jboss50/src/main/java/org/jboss/wsintegration/container/jboss50/VirtualFileAdaptor.java 2007-05-18 13:18:06 UTC (rev 3136)
@@ -25,7 +25,7 @@
import java.net.URL;
import org.jboss.virtual.VirtualFile;
-import org.jboss.wsintegration.spi.deployment.UnifiedVirtualFile;
+import org.jboss.ws.integration.UnifiedVirtualFile;
// $Id$
Modified: branches/tdiesler/trunk/integration/jbws/ant-import/build-deploy.xml
===================================================================
--- branches/tdiesler/trunk/integration/jbws/ant-import/build-deploy.xml 2007-05-18 10:22:57 UTC (rev 3135)
+++ branches/tdiesler/trunk/integration/jbws/ant-import/build-deploy.xml 2007-05-18 13:18:06 UTC (rev 3136)
@@ -43,7 +43,7 @@
</copy>
<copy todir="${jboss50.home}/server/${jboss.server.instance}/lib" overwrite="true">
<fileset dir="${spi.dir}/output/lib">
- <include name="jbossws-spi.jar"/>
+ <include name="jbossws-integration.jar"/>
</fileset>
<fileset dir="${core.dir}/output/lib">
<include name="jboss-jaxrpc.jar"/>
@@ -107,7 +107,7 @@
</copy>
<copy todir="${jboss42.home}/lib" overwrite="true">
<fileset dir="${spi.dir}/output/lib">
- <include name="jbossws-spi.jar"/>
+ <include name="jbossws-integration.jar"/>
</fileset>
</copy>
<copy todir="${jboss42.home}/server/${jboss.server.instance}/lib" overwrite="true">
@@ -137,7 +137,7 @@
</fileset>
<fileset dir="${jboss42.home}/lib">
<include name="jbossws-integration.jar"/> <!-- The old integration jar-->
- <include name="jbossws-spi.jar"/>
+ <include name="jbossws-integration.jar"/>
</fileset>
<fileset dir="${jboss42.home}/server/${jboss.server.instance}/lib">
<include name="jboss-jaxrpc.jar"/>
Modified: branches/tdiesler/trunk/integration/jbws/ant-import/build-release.xml
===================================================================
--- branches/tdiesler/trunk/integration/jbws/ant-import/build-release.xml 2007-05-18 10:22:57 UTC (rev 3135)
+++ branches/tdiesler/trunk/integration/jbws/ant-import/build-release.xml 2007-05-18 13:18:06 UTC (rev 3136)
@@ -14,26 +14,46 @@
<project>
<!-- Release to jboss.local.repository -->
- <target name="release" depends="jbws50-jars"
+ <target name="release" depends="jars"
description="Release to jboss.local.repository">
<!-- jboss/jbossws-jboss50 -->
<property name="jboss.repository.dir" value="${jboss.local.repository}/jboss"/>
<mkdir dir="${jboss.repository.dir}/jbossws-jboss50/${repository.id}/lib"/>
<copy todir="${jboss.repository.dir}/jbossws-jboss50/${repository.id}/lib" overwrite="true">
- <fileset dir="${jbws50.output.lib.dir}">
+ <fileset dir="${int.jboss50.dir}/output/lib">
<include name="jbossws-jboss50.jar"/>
+ </fileset>
+ <fileset dir="${int.jbws.dir}/output/lib">
<include name="jbossws50.sar"/>
<include name="jbossws50-deployer.zip"/>
<include name="jbossws50-src.zip"/>
</fileset>
</copy>
- <copy tofile="${jboss.repository.dir}/jbossws-jboss50/${repository.id}/component-info.xml" file="${jbws50.etc.dir}/component-info.xml" filtering="true" overwrite="true">
+ <copy tofile="${jboss.repository.dir}/jbossws-jboss50/${repository.id}/component-info.xml" file="${jbws.etc.dir}/component-info-jboss50.xml" filtering="true" overwrite="true">
<filterset>
- <filtersfile file="${basedir}/version.properties"/>
+ <filtersfile file="${build.dir}/version.properties"/>
</filterset>
</copy>
+ <!-- jboss/jbossws-jboss42 -->
+ <property name="jboss.repository.dir" value="${jboss.local.repository}/jboss"/>
+ <mkdir dir="${jboss.repository.dir}/jbossws-jboss42/${repository.id}/lib"/>
+ <copy todir="${jboss.repository.dir}/jbossws-jboss42/${repository.id}/lib" overwrite="true">
+ <fileset dir="${int.jboss42.dir}/output/lib">
+ <include name="jbossws-jboss42.jar"/>
+ </fileset>
+ <fileset dir="${int.jbws.dir}/output/lib">
+ <include name="jbossws42.sar"/>
+ <include name="jbossws42-src.zip"/>
+ </fileset>
+ </copy>
+ <copy tofile="${jboss.repository.dir}/jbossws-jboss42/${repository.id}/component-info.xml" file="${jbws.etc.dir}/component-info-jboss42.xml" filtering="true" overwrite="true">
+ <filterset>
+ <filtersfile file="${build.dir}/version.properties"/>
+ </filterset>
+ </copy>
+
</target>
</project>
Modified: branches/tdiesler/trunk/integration/jbws/ant-import/build-testsuite.xml
===================================================================
--- branches/tdiesler/trunk/integration/jbws/ant-import/build-testsuite.xml 2007-05-18 10:22:57 UTC (rev 3135)
+++ branches/tdiesler/trunk/integration/jbws/ant-import/build-testsuite.xml 2007-05-18 13:18:06 UTC (rev 3136)
@@ -39,7 +39,7 @@
<target name="tests-init" depends="tests-prepare">
<path id="jbossws.classpath">
- <pathelement location="${spi.dir}/output/lib/jbossws-spi.jar"/>
+ <pathelement location="${spi.dir}/output/lib/jbossws-integration.jar"/>
<pathelement location="${core.dir}/output/lib/jboss-jaxrpc.jar"/>
<pathelement location="${core.dir}/output/lib/jboss-jaxws.jar"/>
<pathelement location="${core.dir}/output/lib/jboss-saaj.jar"/>
Modified: branches/tdiesler/trunk/integration/jbws/build.xml
===================================================================
--- branches/tdiesler/trunk/integration/jbws/build.xml 2007-05-18 10:22:57 UTC (rev 3135)
+++ branches/tdiesler/trunk/integration/jbws/build.xml 2007-05-18 13:18:06 UTC (rev 3136)
@@ -16,6 +16,7 @@
<import file="${basedir}/build/ant-import/build-setup.xml"/>
<import file="${int.jbws.dir}/ant-import/build-deploy.xml"/>
+ <import file="${int.jbws.dir}/ant-import/build-release.xml"/>
<import file="${int.jbws.dir}/ant-import/build-testsuite.xml"/>
<import file="${int.jbws.dir}/ant-import/build-thirdparty.xml"/>
@@ -160,7 +161,7 @@
<include name="jbossws-context.war"/>
</fileset>
<fileset dir="${spi.dir}/output/lib">
- <include name="jbossws-spi.jar"/>
+ <include name="jbossws-integration.jar"/>
</fileset>
<fileset dir="${core.dir}/output/lib">
<include name="jboss-jaxws.jar"/>
Modified: branches/tdiesler/trunk/integration/jbws/src/main/resources/jbossws-jbws42.sar/jbossws.beans/META-INF/jboss-beans.xml
===================================================================
--- branches/tdiesler/trunk/integration/jbws/src/main/resources/jbossws-jbws42.sar/jbossws.beans/META-INF/jboss-beans.xml 2007-05-18 10:22:57 UTC (rev 3135)
+++ branches/tdiesler/trunk/integration/jbws/src/main/resources/jbossws-jbws42.sar/jbossws.beans/META-INF/jboss-beans.xml 2007-05-18 13:18:06 UTC (rev 3136)
@@ -36,7 +36,7 @@
<bean name="ServiceRefHandler" class="org.jboss.ws.core.client.ServiceRefHandlerImpl"/>
<!-- Locate the single instance of the kernel -->
- <bean name="WSKernelLocator" class="org.jboss.wsintegration.spi.utils.KernelLocator">
+ <bean name="WSKernelLocator" class="org.jboss.ws.integration.KernelLocator">
<property name="kernel"><inject bean="jboss.kernel:service=Kernel"/></property>
</bean>
Modified: branches/tdiesler/trunk/integration/jbws/src/main/resources/jbossws-jbws50.sar/META-INF/jbossws-beans.xml
===================================================================
--- branches/tdiesler/trunk/integration/jbws/src/main/resources/jbossws-jbws50.sar/META-INF/jbossws-beans.xml 2007-05-18 10:22:57 UTC (rev 3135)
+++ branches/tdiesler/trunk/integration/jbws/src/main/resources/jbossws-jbws50.sar/META-INF/jbossws-beans.xml 2007-05-18 13:18:06 UTC (rev 3136)
@@ -36,7 +36,7 @@
<bean name="ServiceRefHandler" class="org.jboss.ws.core.client.ServiceRefHandlerImpl"/>
<!-- Locate the single instance of the kernel -->
- <bean name="WSKernelLocator" class="org.jboss.wsintegration.spi.utils.KernelLocator">
+ <bean name="WSKernelLocator" class="org.jboss.ws.integration.KernelLocator">
<property name="kernel"><inject bean="jboss.kernel:service=Kernel"/></property>
</bean>
Modified: branches/tdiesler/trunk/integration/spi/ant-import/build-release.xml
===================================================================
--- branches/tdiesler/trunk/integration/spi/ant-import/build-release.xml 2007-05-18 10:22:57 UTC (rev 3135)
+++ branches/tdiesler/trunk/integration/spi/ant-import/build-release.xml 2007-05-18 13:18:06 UTC (rev 3136)
@@ -22,13 +22,13 @@
<mkdir dir="${jboss.repository.dir}/jbossws/${repository.id}/lib"/>
<copy todir="${jboss.repository.dir}/jbossws-spi/${repository.id}/lib" overwrite="true">
<fileset dir="${spi.output.lib.dir}">
- <include name="jbossws-spi.jar"/>
- <include name="jbossws-spi-src.zip"/>
+ <include name="jbossws-integration.jar"/>
+ <include name="jbossws-integration-src.zip"/>
</fileset>
</copy>
<copy tofile="${jboss.repository.dir}/jbossws-spi/${repository.id}/component-info.xml" file="${spi.etc.dir}/component-info.xml" filtering="true" overwrite="true">
<filterset>
- <filtersfile file="${spi.dir}/version.properties"/>
+ <filtersfile file="${build.dir}/version.properties"/>
</filterset>
</copy>
Modified: branches/tdiesler/trunk/integration/spi/build.xml
===================================================================
--- branches/tdiesler/trunk/integration/spi/build.xml 2007-05-18 10:22:57 UTC (rev 3135)
+++ branches/tdiesler/trunk/integration/spi/build.xml 2007-05-18 13:18:06 UTC (rev 3136)
@@ -102,9 +102,9 @@
-->
<target name="module-jars">
- <!-- Build jbossws-spi.jar -->
+ <!-- Build jbossws-integration.jar -->
<mkdir dir="${spi.output.lib.dir}"/>
- <jar jarfile="${spi.output.lib.dir}/jbossws-spi.jar" manifest="${spi.output.etc.dir}/default.mf">
+ <jar jarfile="${spi.output.lib.dir}/jbossws-integration.jar" manifest="${spi.output.etc.dir}/default.mf">
<fileset dir="${spi.output.classes.dir}">
<include name="org/jboss/wsintegration/spi/**"/>
<include name="org/jboss/ws/integration/**"/>
@@ -112,7 +112,7 @@
</jar>
<!-- Build jbossws-src.zip -->
- <zip zipfile="${spi.output.lib.dir}/jbossws-src.zip" >
+ <zip zipfile="${spi.output.lib.dir}/jbossws-integration-src.zip" >
<fileset dir="${spi.java.dir}"/>
</zip>
Modified: branches/tdiesler/trunk/integration/spi/src/main/etc/component-info.xml
===================================================================
--- branches/tdiesler/trunk/integration/spi/src/main/etc/component-info.xml 2007-05-18 10:22:57 UTC (rev 3135)
+++ branches/tdiesler/trunk/integration/spi/src/main/etc/component-info.xml 2007-05-18 13:18:06 UTC (rev 3136)
@@ -5,10 +5,10 @@
version="@repository.id@"
licenseType="lgpl">
- <artifact id="jbossws-spi.jar"/>
+ <artifact id="jbossws-integration.jar"/>
<export>
- <include input="jbossws-spi.jar"/>
+ <include input="jbossws-integration.jar"/>
</export>
</component>
Modified: branches/tdiesler/trunk/integration/spi/src/main/java/org/jboss/ws/integration/KernelLocator.java
===================================================================
--- branches/tdiesler/trunk/integration/spi/src/main/java/org/jboss/ws/integration/KernelLocator.java 2007-05-18 10:22:57 UTC (rev 3135)
+++ branches/tdiesler/trunk/integration/spi/src/main/java/org/jboss/ws/integration/KernelLocator.java 2007-05-18 13:18:06 UTC (rev 3136)
@@ -23,10 +23,25 @@
//$Id$
+import org.jboss.kernel.Kernel;
/**
- * @deprecated
+ * Locate the single instance of the kernel
+ *
+ * @author Thomas.Diesler at jboss.org
+ * @since 12-May-2006
*/
-public class KernelLocator extends org.jboss.wsintegration.spi.utils.KernelLocator
+public class KernelLocator
{
+ private static Kernel kernel;
+
+ public static Kernel getKernel()
+ {
+ return KernelLocator.kernel;
+ }
+
+ public void setKernel(Kernel kernel)
+ {
+ KernelLocator.kernel = kernel;
+ }
}
Copied: branches/tdiesler/trunk/integration/spi/src/main/java/org/jboss/ws/integration/ResourceLoaderAdapter.java (from rev 3133, branches/tdiesler/trunk/integration/spi/src/main/java/org/jboss/wsintegration/spi/deployment/ResourceLoaderAdapter.java)
===================================================================
--- branches/tdiesler/trunk/integration/spi/src/main/java/org/jboss/ws/integration/ResourceLoaderAdapter.java (rev 0)
+++ branches/tdiesler/trunk/integration/spi/src/main/java/org/jboss/ws/integration/ResourceLoaderAdapter.java 2007-05-18 13:18:06 UTC (rev 3136)
@@ -0,0 +1,118 @@
+/*
+ * 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 org.jboss.ws.integration.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 at 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: branches/tdiesler/trunk/integration/spi/src/main/java/org/jboss/ws/integration/ServiceRefElement.java
===================================================================
--- branches/tdiesler/trunk/integration/spi/src/main/java/org/jboss/ws/integration/ServiceRefElement.java 2007-05-18 10:22:57 UTC (rev 3135)
+++ branches/tdiesler/trunk/integration/spi/src/main/java/org/jboss/ws/integration/ServiceRefElement.java 2007-05-18 13:18:06 UTC (rev 3136)
@@ -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
- */
-public abstract class ServiceRefElement extends org.jboss.wsintegration.spi.serviceref.ServiceRefElement
-{
-}
Copied: branches/tdiesler/trunk/integration/spi/src/main/java/org/jboss/ws/integration/ServiceRefElement.java (from rev 3133, branches/tdiesler/trunk/integration/spi/src/main/java/org/jboss/wsintegration/spi/serviceref/ServiceRefElement.java)
===================================================================
--- branches/tdiesler/trunk/integration/spi/src/main/java/org/jboss/ws/integration/ServiceRefElement.java (rev 0)
+++ branches/tdiesler/trunk/integration/spi/src/main/java/org/jboss/ws/integration/ServiceRefElement.java 2007-05-18 13:18:06 UTC (rev 3136)
@@ -0,0 +1,36 @@
+/*
+ * JBoss, Home of Professional Open Source
+ * Copyright 2005, JBoss Inc., and individual contributors as indicated
+ * by the @authors tag. See the copyright.txt in the distribution for a
+ * full listing of individual contributors.
+ *
+ * This is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU Lesser General Public License as
+ * published by the Free Software Foundation; either version 2.1 of
+ * the License, or (at your option) any later version.
+ *
+ * This software is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this software; if not, write to the Free
+ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
+ * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
+ */
+package org.jboss.ws.integration;
+
+// $Id$
+
+import java.io.Serializable;
+
+/**
+ * A marker for all <service-ref> related objects.
+ *
+ * @author Thomas.Diesler at jboss.org
+ * @since 08-Mar-2007
+ */
+public abstract class ServiceRefElement implements Serializable
+{
+}
Deleted: branches/tdiesler/trunk/integration/spi/src/main/java/org/jboss/ws/integration/ServiceRefHandler.java
===================================================================
--- branches/tdiesler/trunk/integration/spi/src/main/java/org/jboss/ws/integration/ServiceRefHandler.java 2007-05-18 10:22:57 UTC (rev 3135)
+++ branches/tdiesler/trunk/integration/spi/src/main/java/org/jboss/ws/integration/ServiceRefHandler.java 2007-05-18 13:18:06 UTC (rev 3136)
@@ -1,31 +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
- */
-public interface ServiceRefHandler extends org.jboss.wsintegration.spi.serviceref.ServiceRefHandler
-{
-}
Copied: branches/tdiesler/trunk/integration/spi/src/main/java/org/jboss/ws/integration/ServiceRefHandler.java (from rev 3133, branches/tdiesler/trunk/integration/spi/src/main/java/org/jboss/wsintegration/spi/serviceref/ServiceRefHandler.java)
===================================================================
--- branches/tdiesler/trunk/integration/spi/src/main/java/org/jboss/ws/integration/ServiceRefHandler.java (rev 0)
+++ branches/tdiesler/trunk/integration/spi/src/main/java/org/jboss/ws/integration/ServiceRefHandler.java 2007-05-18 13:18:06 UTC (rev 3136)
@@ -0,0 +1,49 @@
+/*
+ * 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 javax.naming.Context;
+import javax.naming.NamingException;
+
+import org.jboss.xb.binding.UnmarshallingContext;
+import org.xml.sax.Attributes;
+
+/**
+ * An implementation of this interface handles all service-ref binding concerns
+ *
+ * @author Thomas.Diesler at jboss.org
+ * @since 05-May-2004
+ */
+public interface ServiceRefHandler
+{
+ String BEAN_NAME = "ServiceRefHandler";
+
+ ServiceRefMetaData newServiceRefMetaData();
+
+ Object newChild(ServiceRefElement ref, UnmarshallingContext navigator, String namespaceURI, String localName, Attributes attrs);
+
+ void setValue(ServiceRefElement ref, UnmarshallingContext navigator, String namespaceURI, String localName, String value);
+
+ void bindServiceRef(Context encCtx, String encName, UnifiedVirtualFile vfsRoot, ClassLoader loader, ServiceRefMetaData sref) throws NamingException;
+}
Deleted: branches/tdiesler/trunk/integration/spi/src/main/java/org/jboss/ws/integration/ServiceRefMetaData.java
===================================================================
--- branches/tdiesler/trunk/integration/spi/src/main/java/org/jboss/ws/integration/ServiceRefMetaData.java 2007-05-18 10:22:57 UTC (rev 3135)
+++ branches/tdiesler/trunk/integration/spi/src/main/java/org/jboss/ws/integration/ServiceRefMetaData.java 2007-05-18 13:18:06 UTC (rev 3136)
@@ -1,31 +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
- */
-public abstract class ServiceRefMetaData extends org.jboss.wsintegration.spi.serviceref.ServiceRefMetaData
-{
-}
Copied: branches/tdiesler/trunk/integration/spi/src/main/java/org/jboss/ws/integration/ServiceRefMetaData.java (from rev 3133, branches/tdiesler/trunk/integration/spi/src/main/java/org/jboss/wsintegration/spi/serviceref/ServiceRefMetaData.java)
===================================================================
--- branches/tdiesler/trunk/integration/spi/src/main/java/org/jboss/ws/integration/ServiceRefMetaData.java (rev 0)
+++ branches/tdiesler/trunk/integration/spi/src/main/java/org/jboss/ws/integration/ServiceRefMetaData.java 2007-05-18 13:18:06 UTC (rev 3136)
@@ -0,0 +1,55 @@
+/*
+ * 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.Serializable;
+
+import org.w3c.dom.Element;
+
+/**
+ * An abstract service-ref meta data object.
+ *
+ * @author Thomas.Diesler at jboss.org
+ * @since 08-Mar-2007
+ */
+public abstract class ServiceRefMetaData extends ServiceRefElement implements Serializable
+{
+ public abstract String getServiceRefName();
+
+ public abstract void setServiceRefName(String name);
+
+ public abstract Object getAnnotatedElement();
+
+ public abstract void setAnnotatedElement(Object anElement);
+
+ public abstract boolean isProcessed();
+
+ public abstract void setProcessed(boolean flag);
+
+ public abstract void importStandardXml(Element element);
+
+ public abstract void importJBossXml(Element element);
+
+ public abstract void merge(ServiceRefMetaData targetRef);
+}
Copied: branches/tdiesler/trunk/integration/spi/src/main/java/org/jboss/ws/integration/URLLoaderAdapter.java (from rev 3133, branches/tdiesler/trunk/integration/spi/src/main/java/org/jboss/wsintegration/spi/deployment/URLLoaderAdapter.java)
===================================================================
--- branches/tdiesler/trunk/integration/spi/src/main/java/org/jboss/ws/integration/URLLoaderAdapter.java (rev 0)
+++ branches/tdiesler/trunk/integration/spi/src/main/java/org/jboss/ws/integration/URLLoaderAdapter.java 2007-05-18 13:18:06 UTC (rev 3136)
@@ -0,0 +1,126 @@
+/*
+ * 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;
+
+import org.jboss.ws.integration.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 at 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)
+ {
+ ClassLoader ctxLoader = Thread.currentThread().getContextClassLoader();
+ loader = new URLClassLoader(new URL[]{rootURL}, ctxLoader);
+ }
+ return loader;
+ }
+}
Modified: branches/tdiesler/trunk/integration/spi/src/main/java/org/jboss/ws/integration/UnifiedVirtualFile.java
===================================================================
--- branches/tdiesler/trunk/integration/spi/src/main/java/org/jboss/ws/integration/UnifiedVirtualFile.java 2007-05-18 10:22:57 UTC (rev 3135)
+++ branches/tdiesler/trunk/integration/spi/src/main/java/org/jboss/ws/integration/UnifiedVirtualFile.java 2007-05-18 13:18:06 UTC (rev 3136)
@@ -23,9 +23,20 @@
// $Id$
+import java.io.IOException;
+import java.io.Serializable;
+import java.net.URL;
+
/**
- * @deprecated
+ * 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 at jboss.org
+ * @since 05-May-2006
*/
-public interface UnifiedVirtualFile extends org.jboss.wsintegration.spi.deployment.UnifiedVirtualFile
+public interface UnifiedVirtualFile extends Serializable
{
+ UnifiedVirtualFile findChild(String child) throws IOException;
+
+ URL toURL();
}
Modified: branches/tdiesler/trunk/integration/spi/src/main/java/org/jboss/wsintegration/spi/deployment/JAXRPCDeployment.java
===================================================================
--- branches/tdiesler/trunk/integration/spi/src/main/java/org/jboss/wsintegration/spi/deployment/JAXRPCDeployment.java 2007-05-18 10:22:57 UTC (rev 3135)
+++ branches/tdiesler/trunk/integration/spi/src/main/java/org/jboss/wsintegration/spi/deployment/JAXRPCDeployment.java 2007-05-18 13:18:06 UTC (rev 3136)
@@ -24,8 +24,7 @@
import java.io.InputStream;
import java.net.URL;
-import javax.xml.ws.WebServiceException;
-
+import org.jboss.ws.integration.UnifiedVirtualFile;
import org.jboss.wsintegration.spi.deployment.Deployment.DeploymentType;
import org.jboss.wsintegration.spi.metadata.webservices.WebservicesFactory;
import org.jboss.wsintegration.spi.metadata.webservices.WebservicesMetaData;
Deleted: branches/tdiesler/trunk/integration/spi/src/main/java/org/jboss/wsintegration/spi/deployment/ResourceLoaderAdapter.java
===================================================================
--- branches/tdiesler/trunk/integration/spi/src/main/java/org/jboss/wsintegration/spi/deployment/ResourceLoaderAdapter.java 2007-05-18 10:22:57 UTC (rev 3135)
+++ branches/tdiesler/trunk/integration/spi/src/main/java/org/jboss/wsintegration/spi/deployment/ResourceLoaderAdapter.java 2007-05-18 13:18:06 UTC (rev 3136)
@@ -1,116 +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.wsintegration.spi.deployment;
-
-// $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 at 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: branches/tdiesler/trunk/integration/spi/src/main/java/org/jboss/wsintegration/spi/deployment/URLLoaderAdapter.java
===================================================================
--- branches/tdiesler/trunk/integration/spi/src/main/java/org/jboss/wsintegration/spi/deployment/URLLoaderAdapter.java 2007-05-18 10:22:57 UTC (rev 3135)
+++ branches/tdiesler/trunk/integration/spi/src/main/java/org/jboss/wsintegration/spi/deployment/URLLoaderAdapter.java 2007-05-18 13:18:06 UTC (rev 3136)
@@ -1,124 +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.wsintegration.spi.deployment;
-
-// $Id$
-
-import java.io.File;
-import java.io.IOException;
-import java.net.MalformedURLException;
-import java.net.URL;
-import java.net.URLClassLoader;
-
-/**
- * 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 at 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)
- {
- ClassLoader ctxLoader = Thread.currentThread().getContextClassLoader();
- loader = new URLClassLoader(new URL[]{rootURL}, ctxLoader);
- }
- return loader;
- }
-}
Modified: branches/tdiesler/trunk/integration/spi/src/main/java/org/jboss/wsintegration/spi/deployment/UnifiedDeploymentInfo.java
===================================================================
--- branches/tdiesler/trunk/integration/spi/src/main/java/org/jboss/wsintegration/spi/deployment/UnifiedDeploymentInfo.java 2007-05-18 10:22:57 UTC (rev 3135)
+++ branches/tdiesler/trunk/integration/spi/src/main/java/org/jboss/wsintegration/spi/deployment/UnifiedDeploymentInfo.java 2007-05-18 13:18:06 UTC (rev 3136)
@@ -31,6 +31,7 @@
import javax.management.ObjectName;
+import org.jboss.ws.integration.UnifiedVirtualFile;
import org.jboss.wsintegration.spi.deployment.Deployment.DeploymentType;
/**
Deleted: branches/tdiesler/trunk/integration/spi/src/main/java/org/jboss/wsintegration/spi/deployment/UnifiedVirtualFile.java
===================================================================
--- branches/tdiesler/trunk/integration/spi/src/main/java/org/jboss/wsintegration/spi/deployment/UnifiedVirtualFile.java 2007-05-18 10:22:57 UTC (rev 3135)
+++ branches/tdiesler/trunk/integration/spi/src/main/java/org/jboss/wsintegration/spi/deployment/UnifiedVirtualFile.java 2007-05-18 13:18:06 UTC (rev 3136)
@@ -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.wsintegration.spi.deployment;
-
-// $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 at jboss.org
- * @since 05-May-2006
- */
-public interface UnifiedVirtualFile extends Serializable
-{
- UnifiedVirtualFile findChild(String child) throws IOException;
-
- URL toURL();
-}
Modified: branches/tdiesler/trunk/integration/spi/src/main/java/org/jboss/wsintegration/spi/management/EndpointRegistryFactory.java
===================================================================
--- branches/tdiesler/trunk/integration/spi/src/main/java/org/jboss/wsintegration/spi/management/EndpointRegistryFactory.java 2007-05-18 10:22:57 UTC (rev 3135)
+++ branches/tdiesler/trunk/integration/spi/src/main/java/org/jboss/wsintegration/spi/management/EndpointRegistryFactory.java 2007-05-18 13:18:06 UTC (rev 3136)
@@ -26,7 +26,7 @@
import org.jboss.kernel.Kernel;
import org.jboss.kernel.spi.registry.KernelRegistry;
import org.jboss.kernel.spi.registry.KernelRegistryEntry;
-import org.jboss.wsintegration.spi.utils.KernelLocator;
+import org.jboss.ws.integration.KernelLocator;
/**
* Get the endpoint registry from the kernel
Modified: branches/tdiesler/trunk/integration/spi/src/main/java/org/jboss/wsintegration/spi/management/ServerConfigFactory.java
===================================================================
--- branches/tdiesler/trunk/integration/spi/src/main/java/org/jboss/wsintegration/spi/management/ServerConfigFactory.java 2007-05-18 10:22:57 UTC (rev 3135)
+++ branches/tdiesler/trunk/integration/spi/src/main/java/org/jboss/wsintegration/spi/management/ServerConfigFactory.java 2007-05-18 13:18:06 UTC (rev 3136)
@@ -21,9 +21,9 @@
*/
package org.jboss.wsintegration.spi.management;
-import org.jboss.wsintegration.spi.utils.KernelLocator;
import org.jboss.kernel.spi.registry.KernelRegistry;
import org.jboss.logging.Logger;
+import org.jboss.ws.integration.KernelLocator;
// $Id$
Modified: branches/tdiesler/trunk/integration/spi/src/main/java/org/jboss/wsintegration/spi/metadata/j2ee/serviceref/UnifiedCallPropertyMetaData.java
===================================================================
--- branches/tdiesler/trunk/integration/spi/src/main/java/org/jboss/wsintegration/spi/metadata/j2ee/serviceref/UnifiedCallPropertyMetaData.java 2007-05-18 10:22:57 UTC (rev 3135)
+++ branches/tdiesler/trunk/integration/spi/src/main/java/org/jboss/wsintegration/spi/metadata/j2ee/serviceref/UnifiedCallPropertyMetaData.java 2007-05-18 13:18:06 UTC (rev 3136)
@@ -21,15 +21,15 @@
*/
package org.jboss.wsintegration.spi.metadata.j2ee.serviceref;
+
// $Id$
-import org.jboss.wsintegration.spi.serviceref.ServiceRefElement;
/**
* @author Thomas.Diesler at jboss.org
* @since 06-May-2004
*/
-public class UnifiedCallPropertyMetaData extends ServiceRefElement
+public class UnifiedCallPropertyMetaData extends org.jboss.ws.integration.ServiceRefElement
{
// The required <prop-name> element
private String propName;
Modified: branches/tdiesler/trunk/integration/spi/src/main/java/org/jboss/wsintegration/spi/metadata/j2ee/serviceref/UnifiedHandlerChainMetaData.java
===================================================================
--- branches/tdiesler/trunk/integration/spi/src/main/java/org/jboss/wsintegration/spi/metadata/j2ee/serviceref/UnifiedHandlerChainMetaData.java 2007-05-18 10:22:57 UTC (rev 3135)
+++ branches/tdiesler/trunk/integration/spi/src/main/java/org/jboss/wsintegration/spi/metadata/j2ee/serviceref/UnifiedHandlerChainMetaData.java 2007-05-18 13:18:06 UTC (rev 3136)
@@ -29,7 +29,7 @@
import javax.xml.namespace.QName;
import javax.xml.ws.handler.PortInfo;
-import org.jboss.wsintegration.spi.serviceref.ServiceRefElement;
+import org.jboss.ws.integration.ServiceRefElement;
/** The unified metdata data for a handler chain element
*
Modified: branches/tdiesler/trunk/integration/spi/src/main/java/org/jboss/wsintegration/spi/metadata/j2ee/serviceref/UnifiedHandlerChainsMetaData.java
===================================================================
--- branches/tdiesler/trunk/integration/spi/src/main/java/org/jboss/wsintegration/spi/metadata/j2ee/serviceref/UnifiedHandlerChainsMetaData.java 2007-05-18 10:22:57 UTC (rev 3135)
+++ branches/tdiesler/trunk/integration/spi/src/main/java/org/jboss/wsintegration/spi/metadata/j2ee/serviceref/UnifiedHandlerChainsMetaData.java 2007-05-18 13:18:06 UTC (rev 3136)
@@ -26,8 +26,8 @@
import java.util.ArrayList;
import java.util.List;
+import org.jboss.ws.integration.ServiceRefElement;
import org.jboss.wsintegration.spi.metadata.j2ee.serviceref.UnifiedHandlerMetaData.HandlerType;
-import org.jboss.wsintegration.spi.serviceref.ServiceRefElement;
/** The unified metdata data for a handler chains element
*
Modified: branches/tdiesler/trunk/integration/spi/src/main/java/org/jboss/wsintegration/spi/metadata/j2ee/serviceref/UnifiedHandlerMetaData.java
===================================================================
--- branches/tdiesler/trunk/integration/spi/src/main/java/org/jboss/wsintegration/spi/metadata/j2ee/serviceref/UnifiedHandlerMetaData.java 2007-05-18 10:22:57 UTC (rev 3135)
+++ branches/tdiesler/trunk/integration/spi/src/main/java/org/jboss/wsintegration/spi/metadata/j2ee/serviceref/UnifiedHandlerMetaData.java 2007-05-18 13:18:06 UTC (rev 3136)
@@ -30,7 +30,7 @@
import javax.xml.namespace.QName;
-import org.jboss.wsintegration.spi.serviceref.ServiceRefElement;
+import org.jboss.ws.integration.ServiceRefElement;
import org.w3c.dom.Element;
/** The unified metdata data for a handler element
Modified: branches/tdiesler/trunk/integration/spi/src/main/java/org/jboss/wsintegration/spi/metadata/j2ee/serviceref/UnifiedInitParamMetaData.java
===================================================================
--- branches/tdiesler/trunk/integration/spi/src/main/java/org/jboss/wsintegration/spi/metadata/j2ee/serviceref/UnifiedInitParamMetaData.java 2007-05-18 10:22:57 UTC (rev 3135)
+++ branches/tdiesler/trunk/integration/spi/src/main/java/org/jboss/wsintegration/spi/metadata/j2ee/serviceref/UnifiedInitParamMetaData.java 2007-05-18 13:18:06 UTC (rev 3136)
@@ -21,10 +21,10 @@
*/
package org.jboss.wsintegration.spi.metadata.j2ee.serviceref;
+import org.jboss.ws.integration.ServiceRefElement;
+
// $Id$
-import org.jboss.wsintegration.spi.serviceref.ServiceRefElement;
-
/**
* @author Thomas.Diesler at jboss.org
* @since 06-May-2004
Modified: branches/tdiesler/trunk/integration/spi/src/main/java/org/jboss/wsintegration/spi/metadata/j2ee/serviceref/UnifiedPortComponentRefMetaData.java
===================================================================
--- branches/tdiesler/trunk/integration/spi/src/main/java/org/jboss/wsintegration/spi/metadata/j2ee/serviceref/UnifiedPortComponentRefMetaData.java 2007-05-18 10:22:57 UTC (rev 3135)
+++ branches/tdiesler/trunk/integration/spi/src/main/java/org/jboss/wsintegration/spi/metadata/j2ee/serviceref/UnifiedPortComponentRefMetaData.java 2007-05-18 13:18:06 UTC (rev 3136)
@@ -28,7 +28,7 @@
import javax.xml.namespace.QName;
-import org.jboss.wsintegration.spi.serviceref.ServiceRefElement;
+import org.jboss.ws.integration.ServiceRefElement;
import org.w3c.dom.Element;
/** The metdata data from service-ref/port-component-ref element in web.xml, ejb-jar.xml, and application-client.xml.
Modified: branches/tdiesler/trunk/integration/spi/src/main/java/org/jboss/wsintegration/spi/metadata/j2ee/serviceref/UnifiedServiceRefMetaData.java
===================================================================
--- branches/tdiesler/trunk/integration/spi/src/main/java/org/jboss/wsintegration/spi/metadata/j2ee/serviceref/UnifiedServiceRefMetaData.java 2007-05-18 10:22:57 UTC (rev 3135)
+++ branches/tdiesler/trunk/integration/spi/src/main/java/org/jboss/wsintegration/spi/metadata/j2ee/serviceref/UnifiedServiceRefMetaData.java 2007-05-18 13:18:06 UTC (rev 3136)
@@ -33,8 +33,8 @@
import javax.xml.ws.WebServiceException;
import org.jboss.logging.Logger;
-import org.jboss.wsintegration.spi.deployment.UnifiedVirtualFile;
-import org.jboss.wsintegration.spi.serviceref.ServiceRefMetaData;
+import org.jboss.ws.integration.ServiceRefMetaData;
+import org.jboss.ws.integration.UnifiedVirtualFile;
import org.w3c.dom.Element;
/**
@@ -100,7 +100,6 @@
{
}
- @Override
public void merge(ServiceRefMetaData sref)
{
UnifiedServiceRefMetaData sourceRef = (UnifiedServiceRefMetaData)sref;
Modified: branches/tdiesler/trunk/integration/spi/src/main/java/org/jboss/wsintegration/spi/metadata/j2ee/serviceref/UnifiedStubPropertyMetaData.java
===================================================================
--- branches/tdiesler/trunk/integration/spi/src/main/java/org/jboss/wsintegration/spi/metadata/j2ee/serviceref/UnifiedStubPropertyMetaData.java 2007-05-18 10:22:57 UTC (rev 3135)
+++ branches/tdiesler/trunk/integration/spi/src/main/java/org/jboss/wsintegration/spi/metadata/j2ee/serviceref/UnifiedStubPropertyMetaData.java 2007-05-18 13:18:06 UTC (rev 3136)
@@ -21,9 +21,10 @@
*/
package org.jboss.wsintegration.spi.metadata.j2ee.serviceref;
+import org.jboss.ws.integration.ServiceRefElement;
+
// $Id$
-import org.jboss.wsintegration.spi.serviceref.ServiceRefElement;
/**
* @author Thomas.Diesler at jboss.org
Modified: branches/tdiesler/trunk/integration/spi/src/main/java/org/jboss/wsintegration/spi/metadata/webservices/WebservicesFactory.java
===================================================================
--- branches/tdiesler/trunk/integration/spi/src/main/java/org/jboss/wsintegration/spi/metadata/webservices/WebservicesFactory.java 2007-05-18 10:22:57 UTC (rev 3135)
+++ branches/tdiesler/trunk/integration/spi/src/main/java/org/jboss/wsintegration/spi/metadata/webservices/WebservicesFactory.java 2007-05-18 13:18:06 UTC (rev 3136)
@@ -30,7 +30,7 @@
import javax.xml.ws.WebServiceException;
import org.jboss.logging.Logger;
-import org.jboss.wsintegration.spi.deployment.UnifiedVirtualFile;
+import org.jboss.ws.integration.UnifiedVirtualFile;
import org.jboss.wsintegration.spi.metadata.j2ee.serviceref.UnifiedHandlerChainMetaData;
import org.jboss.wsintegration.spi.metadata.j2ee.serviceref.UnifiedHandlerChainsMetaData;
import org.jboss.wsintegration.spi.metadata.j2ee.serviceref.UnifiedHandlerMetaData;
Deleted: branches/tdiesler/trunk/integration/spi/src/main/java/org/jboss/wsintegration/spi/serviceref/ServiceRefElement.java
===================================================================
--- branches/tdiesler/trunk/integration/spi/src/main/java/org/jboss/wsintegration/spi/serviceref/ServiceRefElement.java 2007-05-18 10:22:57 UTC (rev 3135)
+++ branches/tdiesler/trunk/integration/spi/src/main/java/org/jboss/wsintegration/spi/serviceref/ServiceRefElement.java 2007-05-18 13:18:06 UTC (rev 3136)
@@ -1,36 +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.wsintegration.spi.serviceref;
-
-// $Id$
-
-import java.io.Serializable;
-
-/**
- * A marker for all <service-ref> related objects.
- *
- * @author Thomas.Diesler at jboss.org
- * @since 08-Mar-2007
- */
-public abstract class ServiceRefElement implements Serializable
-{
-}
Deleted: branches/tdiesler/trunk/integration/spi/src/main/java/org/jboss/wsintegration/spi/serviceref/ServiceRefHandler.java
===================================================================
--- branches/tdiesler/trunk/integration/spi/src/main/java/org/jboss/wsintegration/spi/serviceref/ServiceRefHandler.java 2007-05-18 10:22:57 UTC (rev 3135)
+++ branches/tdiesler/trunk/integration/spi/src/main/java/org/jboss/wsintegration/spi/serviceref/ServiceRefHandler.java 2007-05-18 13:18:06 UTC (rev 3136)
@@ -1,50 +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.wsintegration.spi.serviceref;
-
-// $Id$
-
-import javax.naming.Context;
-import javax.naming.NamingException;
-
-import org.jboss.wsintegration.spi.deployment.UnifiedVirtualFile;
-import org.jboss.xb.binding.UnmarshallingContext;
-import org.xml.sax.Attributes;
-
-/**
- * An implementation of this interface handles all service-ref binding concerns
- *
- * @author Thomas.Diesler at jboss.org
- * @since 05-May-2004
- */
-public interface ServiceRefHandler
-{
- String BEAN_NAME = "ServiceRefHandler";
-
- ServiceRefMetaData newServiceRefMetaData();
-
- Object newChild(ServiceRefElement ref, UnmarshallingContext navigator, String namespaceURI, String localName, Attributes attrs);
-
- void setValue(ServiceRefElement ref, UnmarshallingContext navigator, String namespaceURI, String localName, String value);
-
- void bindServiceRef(Context encCtx, String encName, UnifiedVirtualFile vfsRoot, ClassLoader loader, ServiceRefMetaData sref) throws NamingException;
-}
Deleted: branches/tdiesler/trunk/integration/spi/src/main/java/org/jboss/wsintegration/spi/serviceref/ServiceRefMetaData.java
===================================================================
--- branches/tdiesler/trunk/integration/spi/src/main/java/org/jboss/wsintegration/spi/serviceref/ServiceRefMetaData.java 2007-05-18 10:22:57 UTC (rev 3135)
+++ branches/tdiesler/trunk/integration/spi/src/main/java/org/jboss/wsintegration/spi/serviceref/ServiceRefMetaData.java 2007-05-18 13:18:06 UTC (rev 3136)
@@ -1,55 +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.wsintegration.spi.serviceref;
-
-// $Id$
-
-import java.io.Serializable;
-
-import org.w3c.dom.Element;
-
-/**
- * An abstract service-ref meta data object.
- *
- * @author Thomas.Diesler at jboss.org
- * @since 08-Mar-2007
- */
-public abstract class ServiceRefMetaData extends ServiceRefElement implements Serializable
-{
- public abstract String getServiceRefName();
-
- public abstract void setServiceRefName(String name);
-
- public abstract Object getAnnotatedElement();
-
- public abstract void setAnnotatedElement(Object anElement);
-
- public abstract boolean isProcessed();
-
- public abstract void setProcessed(boolean flag);
-
- public abstract void importStandardXml(Element element);
-
- public abstract void importJBossXml(Element element);
-
- public abstract void merge(ServiceRefMetaData targetRef);
-}
Deleted: branches/tdiesler/trunk/integration/spi/src/main/java/org/jboss/wsintegration/spi/utils/KernelLocator.java
===================================================================
--- branches/tdiesler/trunk/integration/spi/src/main/java/org/jboss/wsintegration/spi/utils/KernelLocator.java 2007-05-18 10:22:57 UTC (rev 3135)
+++ branches/tdiesler/trunk/integration/spi/src/main/java/org/jboss/wsintegration/spi/utils/KernelLocator.java 2007-05-18 13:18:06 UTC (rev 3136)
@@ -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.wsintegration.spi.utils;
-
-//$Id$
-
-import org.jboss.kernel.Kernel;
-
-/**
- * Locate the single instance of the kernel
- *
- * @author Thomas.Diesler at jboss.org
- * @since 12-May-2006
- */
-public class KernelLocator
-{
- private static Kernel kernel;
-
- public static Kernel getKernel()
- {
- return KernelLocator.kernel;
- }
-
- public void setKernel(Kernel kernel)
- {
- KernelLocator.kernel = kernel;
- }
-}
Modified: branches/tdiesler/trunk/integration/sunri/ant-import/build-deploy.xml
===================================================================
--- branches/tdiesler/trunk/integration/sunri/ant-import/build-deploy.xml 2007-05-18 10:22:57 UTC (rev 3135)
+++ branches/tdiesler/trunk/integration/sunri/ant-import/build-deploy.xml 2007-05-18 13:18:06 UTC (rev 3136)
@@ -37,7 +37,7 @@
</copy>
<copy todir="${jboss50.home}/server/${jboss.server.instance}/lib" overwrite="true">
<fileset dir="${spi.dir}/output/lib">
- <include name="jbossws-spi.jar"/>
+ <include name="jbossws-integration.jar"/>
</fileset>
</copy>
<mkdir dir="${jboss50.home}/server/${jboss.server.instance}/deployers/jbossws.deployer"/>
Modified: branches/tdiesler/trunk/integration/sunri/ant-import/build-testsuite.xml
===================================================================
--- branches/tdiesler/trunk/integration/sunri/ant-import/build-testsuite.xml 2007-05-18 10:22:57 UTC (rev 3135)
+++ branches/tdiesler/trunk/integration/sunri/ant-import/build-testsuite.xml 2007-05-18 13:18:06 UTC (rev 3136)
@@ -62,7 +62,7 @@
<!-- The combined compile classpath -->
<path id="javac.classpath">
<path refid="sunri.classpath"/>
- <pathelement location="${spi.dir}/output/lib/jbossws-spi.jar"/>
+ <pathelement location="${spi.dir}/output/lib/jbossws-integration.jar"/>
<pathelement location="${jboss.client}/jboss-common-core.jar"/>
<pathelement location="${jboss.client}/jboss-logging-spi.jar"/>
<pathelement location="${jboss.server.lib}/jboss-javaee.jar"/>
Modified: branches/tdiesler/trunk/integration/sunri/ant-import/build-thirdparty.xml
===================================================================
--- branches/tdiesler/trunk/integration/sunri/ant-import/build-thirdparty.xml 2007-05-18 10:22:57 UTC (rev 3135)
+++ branches/tdiesler/trunk/integration/sunri/ant-import/build-thirdparty.xml 2007-05-18 13:18:06 UTC (rev 3136)
@@ -70,7 +70,7 @@
<!-- The compile classpath for jboss50 integration -->
<path id="sunri50.integration.classpath">
- <pathelement location="${spi.dir}/output/lib/jbossws-spi.jar"/>
+ <pathelement location="${spi.dir}/output/lib/jbossws-integration.jar"/>
<pathelement location="${jboss50.lib}/jboss-aop-jdk50.jar"/>
<pathelement location="${jboss50.lib}/jboss-common-core.jar"/>
<pathelement location="${jboss50.lib}/jboss-dependency.jar"/>
Modified: branches/tdiesler/trunk/integration/sunri/src/main/resources/jbossws-jboss50.sar/META-INF/jbossws-beans.xml
===================================================================
--- branches/tdiesler/trunk/integration/sunri/src/main/resources/jbossws-jboss50.sar/META-INF/jbossws-beans.xml 2007-05-18 10:22:57 UTC (rev 3135)
+++ branches/tdiesler/trunk/integration/sunri/src/main/resources/jbossws-jboss50.sar/META-INF/jbossws-beans.xml 2007-05-18 13:18:06 UTC (rev 3136)
@@ -33,7 +33,7 @@
<!--bean name="ServiceRefHandler" class="org.jboss.ws.core.client.ServiceRefHandlerImpl"/-->
<!-- Locate the single instance of the kernel -->
- <bean name="WSKernelLocator" class="org.jboss.wsintegration.spi.utils.KernelLocator">
+ <bean name="WSKernelLocator" class="org.jboss.ws.integration.KernelLocator">
<property name="kernel"><inject bean="jboss.kernel:service=Kernel"/></property>
</bean>
Modified: branches/tdiesler/trunk/jbossws-core/ant-import/build-deploy.xml
===================================================================
--- branches/tdiesler/trunk/jbossws-core/ant-import/build-deploy.xml 2007-05-18 10:22:57 UTC (rev 3135)
+++ branches/tdiesler/trunk/jbossws-core/ant-import/build-deploy.xml 2007-05-18 13:18:06 UTC (rev 3136)
@@ -15,12 +15,12 @@
<!-- Deploy jbossws to jboss50 -->
<target name="deploy-jboss50" depends="prepare" description="Deploy jbossws">
- <ant antfile="${int.jbws50.dir}/build.xml" target="deploy" inheritall="false"/>
+ <ant antfile="${int.jbws.dir}/build.xml" target="deploy-jboss50" inheritall="false"/>
</target>
<!-- Deploy jbossws to jboss42 -->
<target name="deploy-jboss42" depends="prepare" description="Deploy jbossws">
- <ant antfile="${int.jbws42.dir}/build.xml" target="deploy" inheritall="false"/>
+ <ant antfile="${int.jbws.dir}/build.xml" target="deploy-jboss42" inheritall="false"/>
</target>
</project>
Modified: branches/tdiesler/trunk/jbossws-core/ant-import/build-release.xml
===================================================================
--- branches/tdiesler/trunk/jbossws-core/ant-import/build-release.xml 2007-05-18 10:22:57 UTC (rev 3135)
+++ branches/tdiesler/trunk/jbossws-core/ant-import/build-release.xml 2007-05-18 13:18:06 UTC (rev 3136)
@@ -14,7 +14,7 @@
<project>
<!-- Release to jboss.local.repository -->
- <target name="release" depends="core-jars"
+ <target name="release" depends="jars"
description="Release to jboss.local.repository">
<!-- jboss/jbossws -->
@@ -31,7 +31,7 @@
<include name="jbossws-resources.zip"/>
</fileset>
</copy>
- <copy tofile="${jboss.repository.dir}/jbossws/${repository.id}/component-info.xml" file="${build.etc.dir}/component-info.xml" filtering="true" overwrite="true">
+ <copy tofile="${jboss.repository.dir}/jbossws/${repository.id}/component-info.xml" file="${core.etc.dir}/component-info.xml" filtering="true" overwrite="true">
<filterset>
<filtersfile file="${build.dir}/version.properties"/>
</filterset>
Modified: branches/tdiesler/trunk/jbossws-core/ant-import/build-thirdparty.xml
===================================================================
--- branches/tdiesler/trunk/jbossws-core/ant-import/build-thirdparty.xml 2007-05-18 10:22:57 UTC (rev 3135)
+++ branches/tdiesler/trunk/jbossws-core/ant-import/build-thirdparty.xml 2007-05-18 13:18:06 UTC (rev 3136)
@@ -106,7 +106,7 @@
<!-- The compile classpath for jbossws core -->
<path id="thirdparty.classpath">
- <pathelement location="${spi.dir}/output/lib/jbossws-spi.jar"/>
+ <pathelement location="${spi.dir}/output/lib/jbossws-integration.jar"/>
<pathelement location="${thirdparty.dir}/ejb3.deployer/jboss-annotations-ejb3.jar"/>
<pathelement location="${thirdparty.dir}/ejb3.deployer/jboss-ejb3x.jar"/>
<pathelement location="${thirdparty.dir}/activation.jar"/>
Modified: branches/tdiesler/trunk/jbossws-core/ant-import-tests/build-testsuite.xml
===================================================================
--- branches/tdiesler/trunk/jbossws-core/ant-import-tests/build-testsuite.xml 2007-05-18 10:22:57 UTC (rev 3135)
+++ branches/tdiesler/trunk/jbossws-core/ant-import-tests/build-testsuite.xml 2007-05-18 13:18:06 UTC (rev 3136)
@@ -28,7 +28,7 @@
<target name="tests-init" depends="jars,tests-prepare">
<path id="jbossws.classpath">
- <pathelement location="${spi.dir}/output/lib/jbossws-spi.jar"/>
+ <pathelement location="${spi.dir}/output/lib/jbossws-integration.jar"/>
<pathelement location="${core.dir}/output/lib/jboss-jaxrpc.jar"/>
<pathelement location="${core.dir}/output/lib/jboss-jaxws.jar"/>
<pathelement location="${core.dir}/output/lib/jboss-saaj.jar"/>
Modified: branches/tdiesler/trunk/jbossws-core/build.xml
===================================================================
--- branches/tdiesler/trunk/jbossws-core/build.xml 2007-05-18 10:22:57 UTC (rev 3135)
+++ branches/tdiesler/trunk/jbossws-core/build.xml 2007-05-18 13:18:06 UTC (rev 3136)
@@ -16,6 +16,7 @@
<import file="${basedir}/build/ant-import/build-setup.xml"/>
<import file="${core.dir}/ant-import/build-deploy.xml"/>
+ <import file="${core.dir}/ant-import/build-release.xml"/>
<import file="${core.dir}/ant-import/build-thirdparty.xml"/>
<import file="${core.dir}/ant-import-tests/build-testsuite.xml"/>
Modified: branches/tdiesler/trunk/jbossws-core/src/main/java/org/jboss/ws/core/CommonClient.java
===================================================================
--- branches/tdiesler/trunk/jbossws-core/src/main/java/org/jboss/ws/core/CommonClient.java 2007-05-18 10:22:57 UTC (rev 3135)
+++ branches/tdiesler/trunk/jbossws-core/src/main/java/org/jboss/ws/core/CommonClient.java 2007-05-18 13:18:06 UTC (rev 3136)
@@ -53,6 +53,7 @@
import org.jboss.ws.core.soap.UnboundHeader;
import org.jboss.ws.core.utils.HolderUtils;
import org.jboss.ws.extensions.addressing.AddressingConstantsImpl;
+import org.jboss.ws.integration.ResourceLoaderAdapter;
import org.jboss.ws.metadata.umdm.ClientEndpointMetaData;
import org.jboss.ws.metadata.umdm.EndpointMetaData;
import org.jboss.ws.metadata.umdm.OperationMetaData;
@@ -60,7 +61,6 @@
import org.jboss.ws.metadata.umdm.ServiceMetaData;
import org.jboss.ws.metadata.umdm.UnifiedMetaData;
import org.jboss.ws.metadata.umdm.EndpointMetaData.Type;
-import org.jboss.wsintegration.spi.deployment.ResourceLoaderAdapter;
import org.jboss.wsintegration.spi.metadata.j2ee.serviceref.UnifiedHandlerMetaData.HandlerType;
/**
Modified: branches/tdiesler/trunk/jbossws-core/src/main/java/org/jboss/ws/core/client/ServiceRefHandlerImpl.java
===================================================================
--- branches/tdiesler/trunk/jbossws-core/src/main/java/org/jboss/ws/core/client/ServiceRefHandlerImpl.java 2007-05-18 10:22:57 UTC (rev 3135)
+++ branches/tdiesler/trunk/jbossws-core/src/main/java/org/jboss/ws/core/client/ServiceRefHandlerImpl.java 2007-05-18 13:18:06 UTC (rev 3136)
@@ -31,12 +31,12 @@
import org.jboss.logging.Logger;
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.ServiceRefHandler;
+import org.jboss.ws.integration.ServiceRefMetaData;
+import org.jboss.ws.integration.UnifiedVirtualFile;
import org.jboss.ws.metadata.umdm.EndpointMetaData.Type;
-import org.jboss.wsintegration.spi.deployment.UnifiedVirtualFile;
import org.jboss.wsintegration.spi.metadata.j2ee.serviceref.UnifiedServiceRefMetaData;
-import org.jboss.wsintegration.spi.serviceref.ServiceRefElement;
-import org.jboss.wsintegration.spi.serviceref.ServiceRefHandler;
-import org.jboss.wsintegration.spi.serviceref.ServiceRefMetaData;
import org.jboss.xb.binding.UnmarshallingContext;
import org.xml.sax.Attributes;
@@ -58,7 +58,7 @@
{
return new UnifiedServiceRefMetaData();
}
-
+
public void bindServiceRef(Context encCtx, String encName, UnifiedVirtualFile vfsRoot, ClassLoader loader, ServiceRefMetaData sref) throws NamingException
{
if (sref.isProcessed())
Modified: branches/tdiesler/trunk/jbossws-core/src/main/java/org/jboss/ws/core/client/ServiceRefObjectFactory.java
===================================================================
--- branches/tdiesler/trunk/jbossws-core/src/main/java/org/jboss/ws/core/client/ServiceRefObjectFactory.java 2007-05-18 10:22:57 UTC (rev 3135)
+++ branches/tdiesler/trunk/jbossws-core/src/main/java/org/jboss/ws/core/client/ServiceRefObjectFactory.java 2007-05-18 13:18:06 UTC (rev 3136)
@@ -25,6 +25,7 @@
import javax.xml.namespace.QName;
+import org.jboss.ws.integration.ServiceRefElement;
import org.jboss.wsintegration.spi.metadata.j2ee.serviceref.UnifiedCallPropertyMetaData;
import org.jboss.wsintegration.spi.metadata.j2ee.serviceref.UnifiedHandlerChainMetaData;
import org.jboss.wsintegration.spi.metadata.j2ee.serviceref.UnifiedHandlerChainsMetaData;
@@ -33,7 +34,6 @@
import org.jboss.wsintegration.spi.metadata.j2ee.serviceref.UnifiedPortComponentRefMetaData;
import org.jboss.wsintegration.spi.metadata.j2ee.serviceref.UnifiedServiceRefMetaData;
import org.jboss.wsintegration.spi.metadata.j2ee.serviceref.UnifiedStubPropertyMetaData;
-import org.jboss.wsintegration.spi.serviceref.ServiceRefElement;
import org.jboss.xb.binding.UnmarshallingContext;
import org.xml.sax.Attributes;
Modified: branches/tdiesler/trunk/jbossws-core/src/main/java/org/jboss/ws/core/jaxrpc/client/ServiceImpl.java
===================================================================
--- branches/tdiesler/trunk/jbossws-core/src/main/java/org/jboss/ws/core/jaxrpc/client/ServiceImpl.java 2007-05-18 10:22:57 UTC (rev 3135)
+++ branches/tdiesler/trunk/jbossws-core/src/main/java/org/jboss/ws/core/jaxrpc/client/ServiceImpl.java 2007-05-18 13:18:06 UTC (rev 3136)
@@ -53,7 +53,7 @@
import org.jboss.ws.metadata.umdm.ServiceMetaData;
import org.jboss.ws.metadata.umdm.UnifiedMetaData;
import org.jboss.ws.metadata.wsse.WSSecurityConfiguration;
-import org.jboss.wsintegration.spi.deployment.ResourceLoaderAdapter;
+import org.jboss.ws.integration.ResourceLoaderAdapter;
import org.jboss.wsintegration.spi.metadata.j2ee.serviceref.UnifiedCallPropertyMetaData;
import org.jboss.wsintegration.spi.metadata.j2ee.serviceref.UnifiedInitParamMetaData;
import org.jboss.wsintegration.spi.metadata.j2ee.serviceref.UnifiedPortComponentRefMetaData;
Modified: branches/tdiesler/trunk/jbossws-core/src/main/java/org/jboss/ws/core/jaxrpc/client/ServiceReferenceable.java
===================================================================
--- branches/tdiesler/trunk/jbossws-core/src/main/java/org/jboss/ws/core/jaxrpc/client/ServiceReferenceable.java 2007-05-18 10:22:57 UTC (rev 3135)
+++ branches/tdiesler/trunk/jbossws-core/src/main/java/org/jboss/ws/core/jaxrpc/client/ServiceReferenceable.java 2007-05-18 13:18:06 UTC (rev 3136)
@@ -36,9 +36,9 @@
import javax.naming.StringRefAddr;
import org.jboss.logging.Logger;
+import org.jboss.ws.integration.UnifiedVirtualFile;
import org.jboss.ws.metadata.wsse.WSSecurityConfiguration;
import org.jboss.ws.metadata.wsse.WSSecurityOMFactory;
-import org.jboss.wsintegration.spi.deployment.UnifiedVirtualFile;
import org.jboss.wsintegration.spi.management.ServerConfig;
import org.jboss.wsintegration.spi.management.ServerConfigFactory;
import org.jboss.wsintegration.spi.metadata.j2ee.serviceref.UnifiedPortComponentRefMetaData;
Modified: branches/tdiesler/trunk/jbossws-core/src/main/java/org/jboss/ws/core/jaxws/client/ServiceExt.java
===================================================================
--- branches/tdiesler/trunk/jbossws-core/src/main/java/org/jboss/ws/core/jaxws/client/ServiceExt.java 2007-05-18 10:22:57 UTC (rev 3135)
+++ branches/tdiesler/trunk/jbossws-core/src/main/java/org/jboss/ws/core/jaxws/client/ServiceExt.java 2007-05-18 13:18:06 UTC (rev 3136)
@@ -34,11 +34,11 @@
import org.jboss.ws.WSException;
import org.jboss.ws.core.ConfigProvider;
import org.jboss.ws.core.StubExt;
+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;
import org.jboss.ws.metadata.wsse.WSSecurityConfiguration;
-import org.jboss.wsintegration.spi.deployment.UnifiedVirtualFile;
/**
* Extends the standard JAXWS Service
Modified: branches/tdiesler/trunk/jbossws-core/src/main/java/org/jboss/ws/core/jaxws/spi/ServiceDelegateImpl.java
===================================================================
--- branches/tdiesler/trunk/jbossws-core/src/main/java/org/jboss/ws/core/jaxws/spi/ServiceDelegateImpl.java 2007-05-18 10:22:57 UTC (rev 3135)
+++ branches/tdiesler/trunk/jbossws-core/src/main/java/org/jboss/ws/core/jaxws/spi/ServiceDelegateImpl.java 2007-05-18 13:18:06 UTC (rev 3136)
@@ -56,6 +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.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;
@@ -65,8 +67,6 @@
import org.jboss.ws.metadata.umdm.UnifiedMetaData;
import org.jboss.ws.metadata.umdm.EndpointMetaData.Type;
import org.jboss.ws.metadata.wsdl.WSDLUtils;
-import org.jboss.wsintegration.spi.deployment.ResourceLoaderAdapter;
-import org.jboss.wsintegration.spi.deployment.UnifiedVirtualFile;
import org.jboss.wsintegration.spi.metadata.j2ee.serviceref.UnifiedHandlerChainMetaData;
import org.jboss.wsintegration.spi.metadata.j2ee.serviceref.UnifiedHandlerChainsMetaData;
import org.jboss.wsintegration.spi.metadata.j2ee.serviceref.UnifiedHandlerMetaData;
Modified: branches/tdiesler/trunk/jbossws-core/src/main/java/org/jboss/ws/extensions/eventing/mgmt/SubscriptionManagerFactory.java
===================================================================
--- branches/tdiesler/trunk/jbossws-core/src/main/java/org/jboss/ws/extensions/eventing/mgmt/SubscriptionManagerFactory.java 2007-05-18 10:22:57 UTC (rev 3135)
+++ branches/tdiesler/trunk/jbossws-core/src/main/java/org/jboss/ws/extensions/eventing/mgmt/SubscriptionManagerFactory.java 2007-05-18 13:18:06 UTC (rev 3136)
@@ -1,8 +1,8 @@
package org.jboss.ws.extensions.eventing.mgmt;
-import org.jboss.wsintegration.spi.utils.KernelLocator;
import org.jboss.kernel.spi.registry.KernelRegistry;
import org.jboss.kernel.spi.registry.KernelRegistryEntry;
+import org.jboss.ws.integration.KernelLocator;
/**
* @author Heiko Braun, <heiko at openj.net>
Modified: branches/tdiesler/trunk/jbossws-core/src/main/java/org/jboss/ws/extensions/security/jaxrpc/WSSecurityHandler.java
===================================================================
--- branches/tdiesler/trunk/jbossws-core/src/main/java/org/jboss/ws/extensions/security/jaxrpc/WSSecurityHandler.java 2007-05-18 10:22:57 UTC (rev 3135)
+++ branches/tdiesler/trunk/jbossws-core/src/main/java/org/jboss/ws/extensions/security/jaxrpc/WSSecurityHandler.java 2007-05-18 13:18:06 UTC (rev 3136)
@@ -35,11 +35,11 @@
import org.jboss.ws.core.CommonMessageContext;
import org.jboss.ws.extensions.security.Constants;
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;
import org.jboss.ws.metadata.wsse.WSSecurityConfiguration;
-import org.jboss.wsintegration.spi.deployment.UnifiedVirtualFile;
/**
* An abstract JAXRPC handler that delegates to the WSSecurityDispatcher
Modified: branches/tdiesler/trunk/jbossws-core/src/main/java/org/jboss/ws/extensions/security/jaxws/WSSecurityHandler.java
===================================================================
--- branches/tdiesler/trunk/jbossws-core/src/main/java/org/jboss/ws/extensions/security/jaxws/WSSecurityHandler.java 2007-05-18 10:22:57 UTC (rev 3135)
+++ branches/tdiesler/trunk/jbossws-core/src/main/java/org/jboss/ws/extensions/security/jaxws/WSSecurityHandler.java 2007-05-18 13:18:06 UTC (rev 3136)
@@ -38,11 +38,11 @@
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.ws.integration.UnifiedVirtualFile;
import org.jboss.ws.metadata.umdm.EndpointMetaData;
import org.jboss.ws.metadata.umdm.ServiceMetaData;
import org.jboss.ws.metadata.wsse.WSSecurityConfigFactory;
import org.jboss.ws.metadata.wsse.WSSecurityConfiguration;
-import org.jboss.wsintegration.spi.deployment.UnifiedVirtualFile;
/**
* An abstract JAXWS handler that delegates to the WSSecurityDispatcher
Modified: branches/tdiesler/trunk/jbossws-core/src/main/java/org/jboss/ws/metadata/builder/jaxrpc/JAXRPCClientMetaDataBuilder.java
===================================================================
--- branches/tdiesler/trunk/jbossws-core/src/main/java/org/jboss/ws/metadata/builder/jaxrpc/JAXRPCClientMetaDataBuilder.java 2007-05-18 10:22:57 UTC (rev 3135)
+++ branches/tdiesler/trunk/jbossws-core/src/main/java/org/jboss/ws/metadata/builder/jaxrpc/JAXRPCClientMetaDataBuilder.java 2007-05-18 13:18:06 UTC (rev 3136)
@@ -46,8 +46,8 @@
import org.jboss.ws.metadata.wsdl.WSDLService;
import org.jboss.ws.metadata.wsse.WSSecurityConfiguration;
import org.jboss.ws.metadata.wsse.WSSecurityOMFactory;
-import org.jboss.wsintegration.spi.deployment.ResourceLoaderAdapter;
-import org.jboss.wsintegration.spi.deployment.UnifiedVirtualFile;
+import org.jboss.ws.integration.ResourceLoaderAdapter;
+import org.jboss.ws.integration.UnifiedVirtualFile;
import org.jboss.wsintegration.spi.metadata.j2ee.serviceref.UnifiedHandlerMetaData;
import org.jboss.wsintegration.spi.metadata.j2ee.serviceref.UnifiedServiceRefMetaData;
import org.jboss.wsintegration.spi.metadata.j2ee.serviceref.UnifiedHandlerMetaData.HandlerType;
Modified: branches/tdiesler/trunk/jbossws-core/src/main/java/org/jboss/ws/metadata/builder/jaxws/JAXWSClientMetaDataBuilder.java
===================================================================
--- branches/tdiesler/trunk/jbossws-core/src/main/java/org/jboss/ws/metadata/builder/jaxws/JAXWSClientMetaDataBuilder.java 2007-05-18 10:22:57 UTC (rev 3135)
+++ branches/tdiesler/trunk/jbossws-core/src/main/java/org/jboss/ws/metadata/builder/jaxws/JAXWSClientMetaDataBuilder.java 2007-05-18 13:18:06 UTC (rev 3136)
@@ -50,8 +50,8 @@
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.wsintegration.spi.deployment.ResourceLoaderAdapter;
-import org.jboss.wsintegration.spi.deployment.UnifiedVirtualFile;
+import org.jboss.ws.integration.ResourceLoaderAdapter;
+import org.jboss.ws.integration.UnifiedVirtualFile;
import org.jboss.wsintegration.spi.metadata.j2ee.serviceref.UnifiedCallPropertyMetaData;
import org.jboss.wsintegration.spi.metadata.j2ee.serviceref.UnifiedPortComponentRefMetaData;
import org.jboss.wsintegration.spi.metadata.j2ee.serviceref.UnifiedServiceRefMetaData;
Modified: branches/tdiesler/trunk/jbossws-core/src/main/java/org/jboss/ws/metadata/config/JBossWSConfigFactory.java
===================================================================
--- branches/tdiesler/trunk/jbossws-core/src/main/java/org/jboss/ws/metadata/config/JBossWSConfigFactory.java 2007-05-18 10:22:57 UTC (rev 3135)
+++ branches/tdiesler/trunk/jbossws-core/src/main/java/org/jboss/ws/metadata/config/JBossWSConfigFactory.java 2007-05-18 13:18:06 UTC (rev 3136)
@@ -32,8 +32,8 @@
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.wsintegration.spi.deployment.ResourceLoaderAdapter;
-import org.jboss.wsintegration.spi.deployment.UnifiedVirtualFile;
+import org.jboss.ws.integration.ResourceLoaderAdapter;
+import org.jboss.ws.integration.UnifiedVirtualFile;
import org.jboss.wsintegration.spi.utils.DOMUtils;
import org.jboss.xb.binding.JBossXBException;
import org.jboss.xb.binding.Unmarshaller;
Modified: branches/tdiesler/trunk/jbossws-core/src/main/java/org/jboss/ws/metadata/umdm/EndpointMetaData.java
===================================================================
--- branches/tdiesler/trunk/jbossws-core/src/main/java/org/jboss/ws/metadata/umdm/EndpointMetaData.java 2007-05-18 10:22:57 UTC (rev 3135)
+++ branches/tdiesler/trunk/jbossws-core/src/main/java/org/jboss/ws/metadata/umdm/EndpointMetaData.java 2007-05-18 13:18:06 UTC (rev 3136)
@@ -61,7 +61,7 @@
import org.jboss.ws.metadata.config.ConfigurationProvider;
import org.jboss.ws.metadata.config.EndpointFeature;
import org.jboss.ws.metadata.config.JBossWSConfigFactory;
-import org.jboss.wsintegration.spi.deployment.UnifiedVirtualFile;
+import org.jboss.ws.integration.UnifiedVirtualFile;
import org.jboss.wsintegration.spi.metadata.j2ee.serviceref.UnifiedPortComponentRefMetaData;
import org.jboss.wsintegration.spi.metadata.j2ee.serviceref.UnifiedHandlerMetaData.HandlerType;
import org.jboss.wsintegration.spi.utils.JavaUtils;
Modified: branches/tdiesler/trunk/jbossws-core/src/main/java/org/jboss/ws/metadata/umdm/OperationMetaData.java
===================================================================
--- branches/tdiesler/trunk/jbossws-core/src/main/java/org/jboss/ws/metadata/umdm/OperationMetaData.java 2007-05-18 10:22:57 UTC (rev 3135)
+++ branches/tdiesler/trunk/jbossws-core/src/main/java/org/jboss/ws/metadata/umdm/OperationMetaData.java 2007-05-18 13:18:06 UTC (rev 3136)
@@ -38,7 +38,7 @@
import org.jboss.ws.core.jaxrpc.Style;
import org.jboss.ws.core.jaxrpc.Use;
import org.jboss.ws.metadata.umdm.EndpointMetaData.Type;
-import org.jboss.wsintegration.spi.deployment.ResourceLoaderAdapter;
+import org.jboss.ws.integration.ResourceLoaderAdapter;
import org.jboss.wsintegration.spi.utils.JavaUtils;
import org.w3c.dom.Element;
Modified: branches/tdiesler/trunk/jbossws-core/src/main/java/org/jboss/ws/metadata/umdm/ServiceMetaData.java
===================================================================
--- branches/tdiesler/trunk/jbossws-core/src/main/java/org/jboss/ws/metadata/umdm/ServiceMetaData.java 2007-05-18 10:22:57 UTC (rev 3135)
+++ branches/tdiesler/trunk/jbossws-core/src/main/java/org/jboss/ws/metadata/umdm/ServiceMetaData.java 2007-05-18 13:18:06 UTC (rev 3136)
@@ -50,7 +50,7 @@
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.wsintegration.spi.deployment.UnifiedVirtualFile;
+import org.jboss.ws.integration.UnifiedVirtualFile;
import org.jboss.wsintegration.spi.metadata.j2ee.serviceref.UnifiedHandlerMetaData.HandlerType;
import org.jboss.xb.binding.sunday.unmarshalling.SchemaBinding;
Modified: branches/tdiesler/trunk/jbossws-core/src/main/java/org/jboss/ws/metadata/umdm/UnifiedMetaData.java
===================================================================
--- branches/tdiesler/trunk/jbossws-core/src/main/java/org/jboss/ws/metadata/umdm/UnifiedMetaData.java 2007-05-18 10:22:57 UTC (rev 3135)
+++ branches/tdiesler/trunk/jbossws-core/src/main/java/org/jboss/ws/metadata/umdm/UnifiedMetaData.java 2007-05-18 13:18:06 UTC (rev 3136)
@@ -33,7 +33,7 @@
import org.jboss.ws.core.server.ManagedEndpointRegistry;
import org.jboss.ws.metadata.jaxrpcmapping.JavaWsdlMapping;
import org.jboss.ws.metadata.wsdl.WSDLDefinitions;
-import org.jboss.wsintegration.spi.deployment.UnifiedVirtualFile;
+import org.jboss.ws.integration.UnifiedVirtualFile;
/**
* The top level meta data.
Modified: branches/tdiesler/trunk/jbossws-core/src/main/java/org/jboss/ws/metadata/wsse/WSSecurityConfigFactory.java
===================================================================
--- branches/tdiesler/trunk/jbossws-core/src/main/java/org/jboss/ws/metadata/wsse/WSSecurityConfigFactory.java 2007-05-18 10:22:57 UTC (rev 3135)
+++ branches/tdiesler/trunk/jbossws-core/src/main/java/org/jboss/ws/metadata/wsse/WSSecurityConfigFactory.java 2007-05-18 13:18:06 UTC (rev 3136)
@@ -30,7 +30,7 @@
import org.jboss.logging.Logger;
import org.jboss.ws.WSException;
import org.jboss.ws.metadata.builder.jaxrpc.JAXRPCServerMetaDataBuilder;
-import org.jboss.wsintegration.spi.deployment.UnifiedVirtualFile;
+import org.jboss.ws.integration.UnifiedVirtualFile;
/**
* Create a WSSecurityConfiguration
Modified: branches/tdiesler/trunk/jbossws-core/src/main/java/org/jboss/ws/tools/jaxws/impl/WSContractProviderImpl.java
===================================================================
--- branches/tdiesler/trunk/jbossws-core/src/main/java/org/jboss/ws/tools/jaxws/impl/WSContractProviderImpl.java 2007-05-18 10:22:57 UTC (rev 3135)
+++ branches/tdiesler/trunk/jbossws-core/src/main/java/org/jboss/ws/tools/jaxws/impl/WSContractProviderImpl.java 2007-05-18 13:18:06 UTC (rev 3136)
@@ -33,7 +33,7 @@
import org.jboss.ws.metadata.builder.jaxws.JAXWSWebServiceMetaDataBuilder;
import org.jboss.ws.metadata.umdm.UnifiedMetaData;
import org.jboss.ws.tools.jaxws.api.WSContractProvider;
-import org.jboss.wsintegration.spi.deployment.ResourceLoaderAdapter;
+import org.jboss.ws.integration.ResourceLoaderAdapter;
import org.jboss.wsintegration.spi.deployment.UnifiedDeploymentInfo;
import org.jboss.wsintegration.spi.deployment.Deployment.DeploymentType;
Modified: branches/tdiesler/trunk/jbossws-core/src/main/java/org/jboss/ws/tools/metadata/ToolsUnifiedMetaDataBuilder.java
===================================================================
--- branches/tdiesler/trunk/jbossws-core/src/main/java/org/jboss/ws/tools/metadata/ToolsUnifiedMetaDataBuilder.java 2007-05-18 10:22:57 UTC (rev 3135)
+++ branches/tdiesler/trunk/jbossws-core/src/main/java/org/jboss/ws/tools/metadata/ToolsUnifiedMetaDataBuilder.java 2007-05-18 13:18:06 UTC (rev 3136)
@@ -37,7 +37,7 @@
import org.jboss.ws.metadata.umdm.UnifiedMetaData;
import org.jboss.ws.metadata.wsdl.WSDLUtils;
import org.jboss.ws.tools.Configuration.OperationConfig;
-import org.jboss.wsintegration.spi.deployment.ResourceLoaderAdapter;
+import org.jboss.ws.integration.ResourceLoaderAdapter;
/**
* Builder class that builds the Tools Meta Data
More information about the jbossws-commits
mailing list