May 2007 - jbossws-commits - Jboss List Archives

JBossWS SVN: r3136 - in branches/tdiesler/trunk: integration/jboss42/ant-import and 37 other directories.

by jbossws-commits＠lists.jboss.org

Author: thomas.diesler(a)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 @@  <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(a)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 @@  <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"/>  - <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>  - <target name="release" depends="jbws50-jars" + <target name="release" depends="jars" description="Release to jboss.local.repository">  <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> +  + <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"/>  - <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"/>  - <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"> -  +  <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>  - <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(a)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(a)jboss.org + * @since 25.01.2007 + */ +public class ResourceLoaderAdapter implements UnifiedVirtualFile +{ + private URL resourceURL; + private ClassLoader loader; + + public ResourceLoaderAdapter() + { + this(Thread.currentThread().getContextClassLoader()); + } + + public ResourceLoaderAdapter(ClassLoader loader) + { + this.loader = loader; + } + + private ResourceLoaderAdapter(ClassLoader loader, URL resourceURL) + { + this.resourceURL = resourceURL; + this.loader = loader; + } + + public UnifiedVirtualFile findChild(String resourcePath) throws IOException + { + URL resourceURL = null; + if (resourcePath != null) + { + // Try the child as URL + try + { + resourceURL = new URL(resourcePath); + } + catch (MalformedURLException ex) + { + // ignore + } + + // Try the filename as File + if (resourceURL == null) + { + try + { + File file = new File(resourcePath); + if (file.exists()) + resourceURL = file.toURL(); + } + catch (MalformedURLException e) + { + // ignore + } + } + + // Try the filename as Resource + if (resourceURL == null) + { + try + { + resourceURL = loader.getResource(resourcePath); + } + catch (Exception ex) + { + // ignore + } + } + } + + if (resourceURL == null) + throw new IOException("Cannot get URL for: " + resourcePath); + + return new ResourceLoaderAdapter(loader, resourceURL); + } + + public URL toURL() + { + if (null == this.resourceURL) + throw new IllegalStateException("UnifiedVirtualFile not initialized"); + return resourceURL; + } +} Deleted: 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(a)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(a)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(a)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(a)jboss.org + * @since 25.01.2007 + */ +public class URLLoaderAdapter implements UnifiedVirtualFile +{ + private URL rootURL; + private URL resourceURL; + private transient URLClassLoader loader; + + public URLLoaderAdapter(URL rootURL) + { + this.rootURL = rootURL; + } + + private URLLoaderAdapter(URL rootURL, URLClassLoader loader, URL resourceURL) + { + this.rootURL = rootURL; + this.resourceURL = resourceURL; + this.loader = loader; + } + + public UnifiedVirtualFile findChild(String resourcePath) throws IOException + { + URL resourceURL = null; + if (resourcePath != null) + { + // Try the child as URL + try + { + resourceURL = new URL(resourcePath); + } + catch (MalformedURLException ex) + { + // ignore + } + + // Try the filename as File + if (resourceURL == null) + { + try + { + File file = new File(resourcePath); + if (file.exists()) + resourceURL = file.toURL(); + } + catch (MalformedURLException e) + { + // ignore + } + } + + // Try the filename as Resource + if (resourceURL == null) + { + try + { + resourceURL = getResourceLoader().getResource(resourcePath); + } + catch (Exception ex) + { + // ignore + } + } + } + + if (resourceURL == null) + throw new IOException("Cannot get URL for: " + resourcePath); + + return new URLLoaderAdapter(rootURL, loader, resourceURL); + } + + public URL toURL() + { + if (resourceURL != null) + return resourceURL; + else + return rootURL; + } + + private URLClassLoader getResourceLoader() + { + if (loader == null) + { + 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(a)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(a)jboss.org - * @since 25.01.2007 - */ -public class ResourceLoaderAdapter implements UnifiedVirtualFile -{ - private URL resourceURL; - private ClassLoader loader; - - public ResourceLoaderAdapter() - { - this(Thread.currentThread().getContextClassLoader()); - } - - public ResourceLoaderAdapter(ClassLoader loader) - { - this.loader = loader; - } - - private ResourceLoaderAdapter(ClassLoader loader, URL resourceURL) - { - this.resourceURL = resourceURL; - this.loader = loader; - } - - public UnifiedVirtualFile findChild(String resourcePath) throws IOException - { - URL resourceURL = null; - if (resourcePath != null) - { - // Try the child as URL - try - { - resourceURL = new URL(resourcePath); - } - catch (MalformedURLException ex) - { - // ignore - } - - // Try the filename as File - if (resourceURL == null) - { - try - { - File file = new File(resourcePath); - if (file.exists()) - resourceURL = file.toURL(); - } - catch (MalformedURLException e) - { - // ignore - } - } - - // Try the filename as Resource - if (resourceURL == null) - { - try - { - resourceURL = loader.getResource(resourcePath); - } - catch (Exception ex) - { - // ignore - } - } - } - - if (resourceURL == null) - throw new IOException("Cannot get URL for: " + resourcePath); - - return new ResourceLoaderAdapter(loader, resourceURL); - } - - public URL toURL() - { - if (null == this.resourceURL) - throw new IllegalStateException("UnifiedVirtualFile not initialized"); - return resourceURL; - } -} Deleted: 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(a)jboss.org - * @since 25.01.2007 - */ -public class URLLoaderAdapter implements UnifiedVirtualFile -{ - private URL rootURL; - private URL resourceURL; - private transient URLClassLoader loader; - - public URLLoaderAdapter(URL rootURL) - { - this.rootURL = rootURL; - } - - private URLLoaderAdapter(URL rootURL, URLClassLoader loader, URL resourceURL) - { - this.rootURL = rootURL; - this.resourceURL = resourceURL; - this.loader = loader; - } - - public UnifiedVirtualFile findChild(String resourcePath) throws IOException - { - URL resourceURL = null; - if (resourcePath != null) - { - // Try the child as URL - try - { - resourceURL = new URL(resourcePath); - } - catch (MalformedURLException ex) - { - // ignore - } - - // Try the filename as File - if (resourceURL == null) - { - try - { - File file = new File(resourcePath); - if (file.exists()) - resourceURL = file.toURL(); - } - catch (MalformedURLException e) - { - // ignore - } - } - - // Try the filename as Resource - if (resourceURL == null) - { - try - { - resourceURL = getResourceLoader().getResource(resourcePath); - } - catch (Exception ex) - { - // ignore - } - } - } - - if (resourceURL == null) - throw new IOException("Cannot get URL for: " + resourcePath); - - return new URLLoaderAdapter(rootURL, loader, resourceURL); - } - - public URL toURL() - { - if (resourceURL != null) - return resourceURL; - else - return rootURL; - } - - private URLClassLoader getResourceLoader() - { - if (loader == null) - { - 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(a)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(a)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(a)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(a)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(a)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(a)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(a)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(a)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 @@  <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 @@  <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="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 @@  <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>  <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>  - <target name="release" depends="core-jars" + <target name="release" depends="jars" description="Release to jboss.local.repository">  @@ -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 @@  <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(a)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

18 years, 11 months

1
0
0 / 0

JBossWS SVN: r3135 - branches/tdiesler/trunk/integration/spi/src/main/java/org/jboss/ws/integration.

by jbossws-commits＠lists.jboss.org

Author: thomas.diesler(a)jboss.com Date: 2007-05-18 06:22:57 -0400 (Fri, 18 May 2007) New Revision: 3135 Added: branches/tdiesler/trunk/integration/spi/src/main/java/org/jboss/ws/integration/KernelLocator.java Log: Added: 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 (rev 0) +++ branches/tdiesler/trunk/integration/spi/src/main/java/org/jboss/ws/integration/KernelLocator.java 2007-05-18 10:22:57 UTC (rev 3135) @@ -0,0 +1,32 @@ +/* + * 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 class KernelLocator extends org.jboss.wsintegration.spi.utils.KernelLocator +{ +} Property changes on: branches/tdiesler/trunk/integration/spi/src/main/java/org/jboss/ws/integration/KernelLocator.java ___________________________________________________________________ Name: svn:keywords + Id Revision Name: svn:eol-style + LF

18 years, 11 months

1
0
0 / 0

JBossWS SVN: r3134 - in branches/tdiesler/trunk/integration/spi/src/main/java/org/jboss: ws and 3 other directories.

by jbossws-commits＠lists.jboss.org

Author: thomas.diesler(a)jboss.com Date: 2007-05-18 06:18:58 -0400 (Fri, 18 May 2007) New Revision: 3134 Added: branches/tdiesler/trunk/integration/spi/src/main/java/org/jboss/ws/ branches/tdiesler/trunk/integration/spi/src/main/java/org/jboss/ws/integration/ 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/UnifiedVirtualFile.java branches/tdiesler/trunk/integration/spi/src/main/java/org/jboss/wsintegration/spi/annotation/ branches/tdiesler/trunk/integration/spi/src/main/java/org/jboss/wsintegration/spi/annotation/WebContext.java Log: Added: 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 (rev 0) +++ branches/tdiesler/trunk/integration/spi/src/main/java/org/jboss/ws/integration/ServiceRefElement.java 2007-05-18 10:18:58 UTC (rev 3134) @@ -0,0 +1,32 @@ +/* + * 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 +{ +} Property changes on: branches/tdiesler/trunk/integration/spi/src/main/java/org/jboss/ws/integration/ServiceRefElement.java ___________________________________________________________________ Name: svn:keywords + Id Revision Name: svn:eol-style + LF Added: 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 (rev 0) +++ branches/tdiesler/trunk/integration/spi/src/main/java/org/jboss/ws/integration/ServiceRefHandler.java 2007-05-18 10:18:58 UTC (rev 3134) @@ -0,0 +1,31 @@ +/* + * 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 +{ +} Property changes on: branches/tdiesler/trunk/integration/spi/src/main/java/org/jboss/ws/integration/ServiceRefHandler.java ___________________________________________________________________ Name: svn:keywords + Id Revision Name: svn:eol-style + LF Added: 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 (rev 0) +++ branches/tdiesler/trunk/integration/spi/src/main/java/org/jboss/ws/integration/ServiceRefMetaData.java 2007-05-18 10:18:58 UTC (rev 3134) @@ -0,0 +1,31 @@ +/* + * 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 +{ +} Property changes on: branches/tdiesler/trunk/integration/spi/src/main/java/org/jboss/ws/integration/ServiceRefMetaData.java ___________________________________________________________________ Name: svn:keywords + Id Revision Name: svn:eol-style + LF Added: 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 (rev 0) +++ branches/tdiesler/trunk/integration/spi/src/main/java/org/jboss/ws/integration/UnifiedVirtualFile.java 2007-05-18 10:18:58 UTC (rev 3134) @@ -0,0 +1,31 @@ +/* + * 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 UnifiedVirtualFile extends org.jboss.wsintegration.spi.deployment.UnifiedVirtualFile +{ +} Property changes on: branches/tdiesler/trunk/integration/spi/src/main/java/org/jboss/ws/integration/UnifiedVirtualFile.java ___________________________________________________________________ Name: svn:keywords + Id Revision Name: svn:eol-style + LF Added: branches/tdiesler/trunk/integration/spi/src/main/java/org/jboss/wsintegration/spi/annotation/WebContext.java =================================================================== --- branches/tdiesler/trunk/integration/spi/src/main/java/org/jboss/wsintegration/spi/annotation/WebContext.java (rev 0) +++ branches/tdiesler/trunk/integration/spi/src/main/java/org/jboss/wsintegration/spi/annotation/WebContext.java 2007-05-18 10:18:58 UTC (rev 3134) @@ -0,0 +1,95 @@ +/* +* JBoss, Home of Professional Open Source +* Copyright 2005, JBoss Inc., and individual contributors as indicated +* by the @authors tag. See the copyright.txt in the distribution for a +* full listing of individual contributors. +* +* This is free software; you can redistribute it and/or modify it +* under the terms of the GNU Lesser General Public License as +* published by the Free Software Foundation; either version 2.1 of +* the License, or (at your option) any later version. +* +* This software is distributed in the hope that it will be useful, +* but WITHOUT ANY WARRANTY; without even the implied warranty of +* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU +* Lesser General Public License for more details. +* +* You should have received a copy of the GNU Lesser General Public +* License along with this software; if not, write to the Free +* Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA +* 02110-1301 USA, or see the FSF site: http://www.fsf.org. +*/ +package org.jboss.wsintegration.spi.annotation; + +// $Id$ + +import java.lang.annotation.ElementType; +import java.lang.annotation.Retention; +import java.lang.annotation.RetentionPolicy; +import java.lang.annotation.Target; + +/** + * Provides web context specific meta data to EJB based web service endpoints. + * + * @author thomas.diesler(a)jboss.org + * @since 26-Apr-2005 + */ +@Retention(value = RetentionPolicy.RUNTIME) +@Target(value = { ElementType.TYPE }) +public @interface WebContext { + + /** + * The contextRoot element specifies the context root that the web service endpoint is deployed to. + * If it is not specified it will be derived from the deployment short name. + * + * Applies to server side port components only. + */ + String contextRoot() default ""; + + /** + * The virtual hosts that the web service endpoint is deployed to. + * + * Applies to server side port components only. + */ + String[] virtualHosts() default {}; + + /** + * Relative path that is appended to the contextRoot to form fully qualified + * endpoint address for the web service endpoint. + * + * Applies to server side port components only. + */ + String urlPattern() default ""; + + /** + * The authMethod is used to configure the authentication mechanism for the web service. + * As a prerequisite to gaining access to any web service which are protected by an authorization + * constraint, a user must have authenticated using the configured mechanism. + * + * Legal values for this element are "BASIC", or "CLIENT-CERT". + */ + String authMethod() default ""; + + /** + * The transportGuarantee specifies that the communication + * between client and server should be NONE, INTEGRAL, or + * CONFIDENTIAL. NONE means that the application does not require any + * transport guarantees. A value of INTEGRAL means that the application + * requires that the data sent between the client and server be sent in + * such a way that it can't be changed in transit. CONFIDENTIAL means + * that the application requires that the data be transmitted in a + * fashion that prevents other entities from observing the contents of + * the transmission. In most cases, the presence of the INTEGRAL or + * CONFIDENTIAL flag will indicate that the use of SSL is required. + */ + String transportGuarantee() default ""; + + /** + * A secure endpoint does not secure wsdl access by default. + * Explicitly setting secureWSDLAccess overrides this behaviour. + * + * Protect access to WSDL. See http://jira.jboss.org/jira/browse/JBWS-723 + */ + boolean secureWSDLAccess() default false; + +} Property changes on: branches/tdiesler/trunk/integration/spi/src/main/java/org/jboss/wsintegration/spi/annotation/WebContext.java ___________________________________________________________________ Name: svn:keywords + Id Revision Name: svn:eol-style + LF

18 years, 11 months

1
0
0 / 0

JBossWS SVN: r3132 - in branches/jbossws-2.0/jbossws-core/src/java/org/jboss/ws: integration/tools/jaxws/ant and 5 other directories.

by jbossws-commits＠lists.jboss.org

Author: heiko.braun(a)jboss.com Date: 2007-05-18 05:42:47 -0400 (Fri, 18 May 2007) New Revision: 3132 Removed: branches/jbossws-2.0/jbossws-core/src/java/org/jboss/ws/tools/jaxws/JAXBWSDLGenerator.java Modified: branches/jbossws-2.0/jbossws-core/src/java/org/jboss/ws/integration/ServiceRefHandler.java branches/jbossws-2.0/jbossws-core/src/java/org/jboss/ws/integration/ServiceRefMetaData.java branches/jbossws-2.0/jbossws-core/src/java/org/jboss/ws/integration/tools/jaxws/ant/wsconsume.java branches/jbossws-2.0/jbossws-core/src/java/org/jboss/ws/integration/tools/jaxws/ant/wsprovide.java branches/jbossws-2.0/jbossws-core/src/java/org/jboss/ws/integration/tools/jaxws/api/WSContractConsumer.java branches/jbossws-2.0/jbossws-core/src/java/org/jboss/ws/integration/tools/jaxws/api/WSContractProvider.java branches/jbossws-2.0/jbossws-core/src/java/org/jboss/ws/integration/tools/jaxws/command/wsconsume.java branches/jbossws-2.0/jbossws-core/src/java/org/jboss/ws/integration/tools/jaxws/command/wsprovide.java branches/jbossws-2.0/jbossws-core/src/java/org/jboss/ws/integration/tools/jaxws/impl/BytecodeWrapperGenerator.java branches/jbossws-2.0/jbossws-core/src/java/org/jboss/ws/integration/tools/jaxws/impl/ChainedWritableWrapperGenerator.java branches/jbossws-2.0/jbossws-core/src/java/org/jboss/ws/integration/tools/jaxws/impl/JBossWSProviderImpl.java branches/jbossws-2.0/jbossws-core/src/java/org/jboss/ws/integration/tools/jaxws/impl/SourceWrapperGenerator.java branches/jbossws-2.0/jbossws-core/src/java/org/jboss/ws/integration/tools/jaxws/impl/SunRIConsumerImpl.java branches/jbossws-2.0/jbossws-core/src/java/org/jboss/ws/integration/tools/jaxws/impl/WritableWrapperGenerator.java branches/jbossws-2.0/jbossws-core/src/java/org/jboss/ws/tools/wsdl/JAXBWSDLGenerator.java Log: cleanup imports Modified: branches/jbossws-2.0/jbossws-core/src/java/org/jboss/ws/integration/ServiceRefHandler.java =================================================================== --- branches/jbossws-2.0/jbossws-core/src/java/org/jboss/ws/integration/ServiceRefHandler.java 2007-05-18 09:01:49 UTC (rev 3131) +++ branches/jbossws-2.0/jbossws-core/src/java/org/jboss/ws/integration/ServiceRefHandler.java 2007-05-18 09:42:47 UTC (rev 3132) @@ -23,12 +23,12 @@ // $Id$ +import org.jboss.xb.binding.UnmarshallingContext; +import org.xml.sax.Attributes; + 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 * Modified: branches/jbossws-2.0/jbossws-core/src/java/org/jboss/ws/integration/ServiceRefMetaData.java =================================================================== --- branches/jbossws-2.0/jbossws-core/src/java/org/jboss/ws/integration/ServiceRefMetaData.java 2007-05-18 09:01:49 UTC (rev 3131) +++ branches/jbossws-2.0/jbossws-core/src/java/org/jboss/ws/integration/ServiceRefMetaData.java 2007-05-18 09:42:47 UTC (rev 3132) @@ -23,10 +23,10 @@ // $Id$ +import org.w3c.dom.Element; + import java.io.Serializable; -import org.w3c.dom.Element; - /** * An abstract service-ref meta data object. * Modified: branches/jbossws-2.0/jbossws-core/src/java/org/jboss/ws/integration/tools/jaxws/ant/wsconsume.java =================================================================== --- branches/jbossws-2.0/jbossws-core/src/java/org/jboss/ws/integration/tools/jaxws/ant/wsconsume.java 2007-05-18 09:01:49 UTC (rev 3131) +++ branches/jbossws-2.0/jbossws-core/src/java/org/jboss/ws/integration/tools/jaxws/ant/wsconsume.java 2007-05-18 09:42:47 UTC (rev 3132) @@ -21,17 +21,7 @@ */ package org.jboss.ws.integration.tools.jaxws.ant; -import java.io.File; -import java.io.PrintStream; -import java.net.MalformedURLException; -import java.util.ArrayList; -import java.util.List; - -import org.apache.tools.ant.AntClassLoader; -import org.apache.tools.ant.BuildException; -import org.apache.tools.ant.DirectoryScanner; -import org.apache.tools.ant.Project; -import org.apache.tools.ant.Task; +import org.apache.tools.ant.*; import org.apache.tools.ant.taskdefs.ExecuteJava; import org.apache.tools.ant.taskdefs.LogOutputStream; import org.apache.tools.ant.types.Commandline; @@ -40,6 +30,12 @@ import org.apache.tools.ant.types.Path; import org.jboss.ws.integration.tools.jaxws.api.WSContractConsumer; +import java.io.File; +import java.io.PrintStream; +import java.net.MalformedURLException; +import java.util.ArrayList; +import java.util.List; + /** * Ant task which consumes a Web Service contract. * Modified: branches/jbossws-2.0/jbossws-core/src/java/org/jboss/ws/integration/tools/jaxws/ant/wsprovide.java =================================================================== --- branches/jbossws-2.0/jbossws-core/src/java/org/jboss/ws/integration/tools/jaxws/ant/wsprovide.java 2007-05-18 09:01:49 UTC (rev 3131) +++ branches/jbossws-2.0/jbossws-core/src/java/org/jboss/ws/integration/tools/jaxws/ant/wsprovide.java 2007-05-18 09:42:47 UTC (rev 3132) @@ -21,9 +21,6 @@ */ package org.jboss.ws.integration.tools.jaxws.ant; -import java.io.File; -import java.io.PrintStream; - import org.apache.tools.ant.AntClassLoader; import org.apache.tools.ant.BuildException; import org.apache.tools.ant.Project; @@ -36,6 +33,9 @@ import org.apache.tools.ant.types.Reference; import org.jboss.ws.integration.tools.jaxws.api.WSContractProvider; +import java.io.File; +import java.io.PrintStream; + /** * Ant task which invokes provides a Web Service contract and portable JAX-WS wrapper classes. * Modified: branches/jbossws-2.0/jbossws-core/src/java/org/jboss/ws/integration/tools/jaxws/api/WSContractConsumer.java =================================================================== --- branches/jbossws-2.0/jbossws-core/src/java/org/jboss/ws/integration/tools/jaxws/api/WSContractConsumer.java 2007-05-18 09:01:49 UTC (rev 3131) +++ branches/jbossws-2.0/jbossws-core/src/java/org/jboss/ws/integration/tools/jaxws/api/WSContractConsumer.java 2007-05-18 09:42:47 UTC (rev 3132) @@ -21,14 +21,14 @@ */ package org.jboss.ws.integration.tools.jaxws.api; +import org.jboss.ws.integration.tools.jaxws.spi.WSContractConsumerFactory; + import java.io.File; import java.io.PrintStream; import java.net.MalformedURLException; import java.net.URL; import java.util.List; -import org.jboss.ws.integration.tools.jaxws.spi.WSContractConsumerFactory; - /** * WSContractConsumer is responsible for generating JAX-WS client and server * artifacts from the specified WSDL file. To implement a client, one would use Modified: branches/jbossws-2.0/jbossws-core/src/java/org/jboss/ws/integration/tools/jaxws/api/WSContractProvider.java =================================================================== --- branches/jbossws-2.0/jbossws-core/src/java/org/jboss/ws/integration/tools/jaxws/api/WSContractProvider.java 2007-05-18 09:01:49 UTC (rev 3131) +++ branches/jbossws-2.0/jbossws-core/src/java/org/jboss/ws/integration/tools/jaxws/api/WSContractProvider.java 2007-05-18 09:42:47 UTC (rev 3132) @@ -1,12 +1,12 @@ package org.jboss.ws.integration.tools.jaxws.api; +import org.jboss.ws.WSException; +import org.jboss.ws.integration.tools.jaxws.spi.WSContractProviderFactory; + import java.io.File; import java.io.PrintStream; -import org.jboss.ws.WSException; -import org.jboss.ws.integration.tools.jaxws.spi.WSContractProviderFactory; - /** * WSContractProvider is responsible for generating the required portable * JAX-WS artifacts for a service endpoint implementation. This includes class Modified: branches/jbossws-2.0/jbossws-core/src/java/org/jboss/ws/integration/tools/jaxws/command/wsconsume.java =================================================================== --- branches/jbossws-2.0/jbossws-core/src/java/org/jboss/ws/integration/tools/jaxws/command/wsconsume.java 2007-05-18 09:01:49 UTC (rev 3131) +++ branches/jbossws-2.0/jbossws-core/src/java/org/jboss/ws/integration/tools/jaxws/command/wsconsume.java 2007-05-18 09:42:47 UTC (rev 3132) @@ -23,6 +23,7 @@ import gnu.getopt.Getopt; import gnu.getopt.LongOpt; +import org.jboss.ws.integration.tools.jaxws.api.WSContractConsumer; import java.io.File; import java.io.PrintStream; @@ -31,8 +32,6 @@ import java.util.ArrayList; import java.util.List; -import org.jboss.ws.integration.tools.jaxws.api.WSContractConsumer; - /** * wsconsume is a command line tool that generates portable JAX-WS artifacts * from a WSDL file. Modified: branches/jbossws-2.0/jbossws-core/src/java/org/jboss/ws/integration/tools/jaxws/command/wsprovide.java =================================================================== --- branches/jbossws-2.0/jbossws-core/src/java/org/jboss/ws/integration/tools/jaxws/command/wsprovide.java 2007-05-18 09:01:49 UTC (rev 3131) +++ branches/jbossws-2.0/jbossws-core/src/java/org/jboss/ws/integration/tools/jaxws/command/wsprovide.java 2007-05-18 09:42:47 UTC (rev 3132) @@ -23,6 +23,8 @@ import gnu.getopt.Getopt; import gnu.getopt.LongOpt; +import org.jboss.ws.core.utils.JavaUtils; +import org.jboss.ws.integration.tools.jaxws.api.WSContractProvider; import java.io.File; import java.io.PrintStream; @@ -32,9 +34,6 @@ import java.util.ArrayList; import java.util.List; -import org.jboss.ws.core.utils.JavaUtils; -import org.jboss.ws.integration.tools.jaxws.api.WSContractProvider; - /** * wsprovide is a command line tool that generates portable JAX-WS artifacts * for a service endpoint implementation. Modified: branches/jbossws-2.0/jbossws-core/src/java/org/jboss/ws/integration/tools/jaxws/impl/BytecodeWrapperGenerator.java =================================================================== --- branches/jbossws-2.0/jbossws-core/src/java/org/jboss/ws/integration/tools/jaxws/impl/BytecodeWrapperGenerator.java 2007-05-18 09:01:49 UTC (rev 3131) +++ branches/jbossws-2.0/jbossws-core/src/java/org/jboss/ws/integration/tools/jaxws/impl/BytecodeWrapperGenerator.java 2007-05-18 09:42:47 UTC (rev 3132) @@ -21,20 +21,19 @@ */ package org.jboss.ws.integration.tools.jaxws.impl; -import java.io.File; -import java.io.IOException; -import java.io.PrintStream; -import java.util.ArrayList; -import java.util.List; - import javassist.CannotCompileException; import javassist.NotFoundException; - import org.jboss.ws.WSException; import org.jboss.ws.core.jaxws.DynamicWrapperGenerator; import org.jboss.ws.metadata.umdm.FaultMetaData; import org.jboss.ws.metadata.umdm.ParameterMetaData; +import java.io.File; +import java.io.IOException; +import java.io.PrintStream; +import java.util.ArrayList; +import java.util.List; + public class BytecodeWrapperGenerator extends DynamicWrapperGenerator implements WritableWrapperGenerator { private List<String> typeNames = new ArrayList<String>(); Modified: branches/jbossws-2.0/jbossws-core/src/java/org/jboss/ws/integration/tools/jaxws/impl/ChainedWritableWrapperGenerator.java =================================================================== --- branches/jbossws-2.0/jbossws-core/src/java/org/jboss/ws/integration/tools/jaxws/impl/ChainedWritableWrapperGenerator.java 2007-05-18 09:01:49 UTC (rev 3131) +++ branches/jbossws-2.0/jbossws-core/src/java/org/jboss/ws/integration/tools/jaxws/impl/ChainedWritableWrapperGenerator.java 2007-05-18 09:42:47 UTC (rev 3132) @@ -21,15 +21,15 @@ */ package org.jboss.ws.integration.tools.jaxws.impl; +import org.jboss.ws.core.jaxws.WrapperGenerator; +import org.jboss.ws.metadata.umdm.FaultMetaData; +import org.jboss.ws.metadata.umdm.ParameterMetaData; + import java.io.File; import java.io.IOException; import java.util.ArrayList; import java.util.List; -import org.jboss.ws.core.jaxws.WrapperGenerator; -import org.jboss.ws.metadata.umdm.FaultMetaData; -import org.jboss.ws.metadata.umdm.ParameterMetaData; - public class ChainedWritableWrapperGenerator implements WrapperGenerator { private List<Entry> chain = new ArrayList<Entry>(); Modified: branches/jbossws-2.0/jbossws-core/src/java/org/jboss/ws/integration/tools/jaxws/impl/JBossWSProviderImpl.java =================================================================== --- branches/jbossws-2.0/jbossws-core/src/java/org/jboss/ws/integration/tools/jaxws/impl/JBossWSProviderImpl.java 2007-05-18 09:01:49 UTC (rev 3131) +++ branches/jbossws-2.0/jbossws-core/src/java/org/jboss/ws/integration/tools/jaxws/impl/JBossWSProviderImpl.java 2007-05-18 09:42:47 UTC (rev 3132) @@ -21,25 +21,23 @@ */ package org.jboss.ws.integration.tools.jaxws.impl; +import org.jboss.ws.WSException; +import org.jboss.ws.core.server.UnifiedDeploymentInfo; +import org.jboss.ws.core.server.UnifiedDeploymentInfo.DeploymentType; import static org.jboss.ws.core.server.UnifiedDeploymentInfo.DeploymentType.JAXWS_EJB3; import static org.jboss.ws.core.server.UnifiedDeploymentInfo.DeploymentType.JAXWS_JSE; +import org.jboss.ws.integration.ResourceLoaderAdapter; +import org.jboss.ws.integration.tools.jaxws.api.WSContractProvider; +import org.jboss.ws.metadata.builder.jaxws.JAXWSWebServiceMetaDataBuilder; +import org.jboss.ws.metadata.umdm.UnifiedMetaData; +import javax.ejb.Stateless; import java.io.File; import java.io.IOException; import java.io.PrintStream; import java.net.URL; import java.net.URLClassLoader; -import javax.ejb.Stateless; - -import org.jboss.ws.WSException; -import org.jboss.ws.core.server.UnifiedDeploymentInfo; -import org.jboss.ws.core.server.UnifiedDeploymentInfo.DeploymentType; -import org.jboss.ws.integration.ResourceLoaderAdapter; -import org.jboss.ws.metadata.builder.jaxws.JAXWSWebServiceMetaDataBuilder; -import org.jboss.ws.metadata.umdm.UnifiedMetaData; -import org.jboss.ws.integration.tools.jaxws.api.WSContractProvider; - /** * The default WSContractProvider implementation. * Modified: branches/jbossws-2.0/jbossws-core/src/java/org/jboss/ws/integration/tools/jaxws/impl/SourceWrapperGenerator.java =================================================================== --- branches/jbossws-2.0/jbossws-core/src/java/org/jboss/ws/integration/tools/jaxws/impl/SourceWrapperGenerator.java 2007-05-18 09:01:49 UTC (rev 3131) +++ branches/jbossws-2.0/jbossws-core/src/java/org/jboss/ws/integration/tools/jaxws/impl/SourceWrapperGenerator.java 2007-05-18 09:42:47 UTC (rev 3132) @@ -21,19 +21,7 @@ */ package org.jboss.ws.integration.tools.jaxws.impl; -import java.io.File; -import java.io.IOException; -import java.io.PrintStream; -import java.util.List; -import java.util.SortedMap; - -import javax.xml.bind.annotation.XmlAccessType; -import javax.xml.bind.annotation.XmlAccessorType; -import javax.xml.bind.annotation.XmlElement; -import javax.xml.bind.annotation.XmlRootElement; -import javax.xml.bind.annotation.XmlType; -import javax.xml.namespace.QName; - +import com.sun.codemodel.*; import org.jboss.logging.Logger; import org.jboss.ws.WSException; import org.jboss.ws.core.jaxws.AbstractWrapperGenerator; @@ -43,14 +31,13 @@ import org.jboss.ws.metadata.umdm.ParameterMetaData; import org.jboss.ws.metadata.umdm.WrappedParameter; -import com.sun.codemodel.JAnnotationArrayMember; -import com.sun.codemodel.JAnnotationUse; -import com.sun.codemodel.JCodeModel; -import com.sun.codemodel.JDefinedClass; -import com.sun.codemodel.JExpr; -import com.sun.codemodel.JFieldVar; -import com.sun.codemodel.JMethod; -import com.sun.codemodel.JMod; +import javax.xml.bind.annotation.*; +import javax.xml.namespace.QName; +import java.io.File; +import java.io.IOException; +import java.io.PrintStream; +import java.util.List; +import java.util.SortedMap; /** * Generates source for wrapper beans Modified: branches/jbossws-2.0/jbossws-core/src/java/org/jboss/ws/integration/tools/jaxws/impl/SunRIConsumerImpl.java =================================================================== --- branches/jbossws-2.0/jbossws-core/src/java/org/jboss/ws/integration/tools/jaxws/impl/SunRIConsumerImpl.java 2007-05-18 09:01:49 UTC (rev 3131) +++ branches/jbossws-2.0/jbossws-core/src/java/org/jboss/ws/integration/tools/jaxws/impl/SunRIConsumerImpl.java 2007-05-18 09:42:47 UTC (rev 3132) @@ -21,15 +21,15 @@ */ package org.jboss.ws.integration.tools.jaxws.impl; +import com.sun.tools.ws.wscompile.CompileTool; +import org.jboss.ws.integration.tools.jaxws.api.WSContractConsumer; + import java.io.File; import java.io.PrintStream; import java.net.URL; import java.util.ArrayList; import java.util.List; -import com.sun.tools.ws.wscompile.CompileTool; -import org.jboss.ws.integration.tools.jaxws.api.WSContractConsumer; - /** * WSContractConsumer that delegates to the Sun CompileTool. * Modified: branches/jbossws-2.0/jbossws-core/src/java/org/jboss/ws/integration/tools/jaxws/impl/WritableWrapperGenerator.java =================================================================== --- branches/jbossws-2.0/jbossws-core/src/java/org/jboss/ws/integration/tools/jaxws/impl/WritableWrapperGenerator.java 2007-05-18 09:01:49 UTC (rev 3131) +++ branches/jbossws-2.0/jbossws-core/src/java/org/jboss/ws/integration/tools/jaxws/impl/WritableWrapperGenerator.java 2007-05-18 09:42:47 UTC (rev 3132) @@ -21,11 +21,11 @@ */ package org.jboss.ws.integration.tools.jaxws.impl; +import org.jboss.ws.core.jaxws.WrapperGenerator; + import java.io.File; import java.io.IOException; -import org.jboss.ws.core.jaxws.WrapperGenerator; - public interface WritableWrapperGenerator extends WrapperGenerator { public void write(File directory) throws IOException; Deleted: branches/jbossws-2.0/jbossws-core/src/java/org/jboss/ws/tools/jaxws/JAXBWSDLGenerator.java =================================================================== --- branches/jbossws-2.0/jbossws-core/src/java/org/jboss/ws/tools/jaxws/JAXBWSDLGenerator.java 2007-05-18 09:01:49 UTC (rev 3131) +++ branches/jbossws-2.0/jbossws-core/src/java/org/jboss/ws/tools/jaxws/JAXBWSDLGenerator.java 2007-05-18 09:42:47 UTC (rev 3132) @@ -1,113 +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.tools.jaxws; - -import java.io.IOException; - -import javax.xml.bind.SchemaOutputResolver; -import javax.xml.parsers.DocumentBuilder; -import javax.xml.parsers.DocumentBuilderFactory; -import javax.xml.transform.Result; -import javax.xml.transform.dom.DOMResult; - -import org.jboss.ws.Constants; -import org.jboss.ws.WSException; -import org.jboss.ws.extensions.security.Util; -import org.jboss.ws.metadata.wsdl.DOMTypes; -import org.jboss.ws.tools.wsdl.WSDLGenerator; -import org.w3c.dom.Document; -import org.w3c.dom.Element; - -import com.sun.xml.bind.api.JAXBRIContext; - -/** - * JAXBWSDLGenerator provides a JAXB based WSDLGenerator. - * - * @author <a href="mailto:jason.greene@jboss.com">Jason T. Greene</a> - */ -public class JAXBWSDLGenerator extends WSDLGenerator -{ - private JAXBRIContext ctx; - - public JAXBWSDLGenerator(JAXBRIContext ctx) - { - super(); - this.ctx = ctx; - } - - protected void processTypes() - { - // Register namespaces - for (String ns : ctx.getKnownNamespaceURIs()) - if (ns.length() > 0) - wsdl.registerNamespaceURI(ns, null); - - try - { - DocumentBuilder builder = DocumentBuilderFactory.newInstance().newDocumentBuilder(); - Document doc = builder.newDocument(); - DOMTypes types = new DOMTypes(doc); - final Element element = types.getElement(); - final Element throwAway = doc.createElement("throw-away"); - - ctx.generateSchema(new SchemaOutputResolver() - { - @Override - public Result createOutput(String namespace, String file) throws IOException - { - // JBWS-1295, getKnownNamespaceURIs is not accurate - if (namespace.length() > 0 && wsdl.getPrefix(namespace) == null) - wsdl.registerNamespaceURI(namespace, null); - - // JAXB creates an empty namespace due to type references, ignore it - DOMResult result = new DOMResult((namespace == null || namespace.length() == 0) ? throwAway : element); - result.setSystemId("replace-me"); - return result; - } - }); - - // Until we stop inlining schema, we will need to filter schemaLocations since JAXB requires them - removeSchemaLocations(element); - - wsdl.setWsdlTypes(types); - } - catch (Exception exception) - { - throw new WSException("Could not generate schema: " + exception.getMessage(), exception); - } - } - - private void removeSchemaLocations(Element element) - { - for (Element child = Util.getFirstChildElement(element); child != null; child = Util.getNextSiblingElement(child)) - { - if ("import".equals(child.getLocalName()) && Constants.NS_SCHEMA_XSD.equals(child.getNamespaceURI()) && "replace-me".equals(child.getAttribute("schemaLocation"))) - { - child.removeAttribute("schemaLocation"); - } - else - { - removeSchemaLocations(child); - } - } - } -} \ No newline at end of file Modified: branches/jbossws-2.0/jbossws-core/src/java/org/jboss/ws/tools/wsdl/JAXBWSDLGenerator.java =================================================================== --- branches/jbossws-2.0/jbossws-core/src/java/org/jboss/ws/tools/wsdl/JAXBWSDLGenerator.java 2007-05-18 09:01:49 UTC (rev 3131) +++ branches/jbossws-2.0/jbossws-core/src/java/org/jboss/ws/tools/wsdl/JAXBWSDLGenerator.java 2007-05-18 09:42:47 UTC (rev 3132) @@ -21,23 +21,20 @@ */ package org.jboss.ws.tools.wsdl; -import java.io.IOException; - -import javax.xml.bind.SchemaOutputResolver; -import javax.xml.parsers.DocumentBuilder; -import javax.xml.parsers.DocumentBuilderFactory; -import javax.xml.transform.Result; -import javax.xml.transform.dom.DOMResult; - +import com.sun.xml.bind.api.JAXBRIContext; import org.jboss.ws.Constants; import org.jboss.ws.WSException; import org.jboss.ws.extensions.security.Util; import org.jboss.ws.metadata.wsdl.DOMTypes; -import org.jboss.ws.tools.wsdl.WSDLGenerator; import org.w3c.dom.Document; import org.w3c.dom.Element; -import com.sun.xml.bind.api.JAXBRIContext; +import javax.xml.bind.SchemaOutputResolver; +import javax.xml.parsers.DocumentBuilder; +import javax.xml.parsers.DocumentBuilderFactory; +import javax.xml.transform.Result; +import javax.xml.transform.dom.DOMResult; +import java.io.IOException; /** * JAXBWSDLGenerator provides a JAXB based WSDLGenerator. @@ -54,6 +51,9 @@ this.ctx = ctx; } + /** + * Delegate schema generation to JAXB RI + */ protected void processTypes() { // Register namespaces

18 years, 11 months

1
0
0 / 0

JBossWS SVN: r3131 - in branches/tdiesler/trunk: integration/jboss42/src/main/java/org/jboss/ws/integration/jboss42 and 18 other directories.

by jbossws-commits＠lists.jboss.org

Author: thomas.diesler(a)jboss.com Date: 2007-05-18 05:01:49 -0400 (Fri, 18 May 2007) New Revision: 3131 Added: branches/tdiesler/trunk/integration/jbws/ant-import/build-release.xml branches/tdiesler/trunk/integration/jbws/src/main/resources/jbossws-jboss50.deployer/ branches/tdiesler/trunk/integration/sunri/src/main/java/org/jboss/ws/integration/sunri/ branches/tdiesler/trunk/integration/sunri/src/main/resources/jbossws-jboss50.deployer/ branches/tdiesler/trunk/integration/sunri/src/main/resources/jbossws-jboss50.sar/ branches/tdiesler/trunk/integration/sunri/src/test/resources/excludes-jboss50.txt Removed: branches/tdiesler/trunk/integration/jbws/ant-import/build-deploy-jboss42.xml branches/tdiesler/trunk/integration/jbws/ant-import/build-deploy-jboss50.xml branches/tdiesler/trunk/integration/jbws/ant-import/build-release-jboss42.xml branches/tdiesler/trunk/integration/jbws/ant-import/build-release-jboss50.xml branches/tdiesler/trunk/integration/jbws/src/main/resources/jbossws.deployer/ branches/tdiesler/trunk/integration/sunri/src/main/java/org/jboss/ws/integration/jboss50/ branches/tdiesler/trunk/integration/sunri/src/main/resources/jbossws.deployer/ branches/tdiesler/trunk/integration/sunri/src/main/resources/jbossws.sar/ branches/tdiesler/trunk/integration/sunri/src/test/resources/excludes.txt Modified: branches/tdiesler/trunk/integration/jboss42/.classpath branches/tdiesler/trunk/integration/jboss42/.project branches/tdiesler/trunk/integration/jboss42/src/main/java/org/jboss/ws/integration/jboss42/AbstractDeployerHook.java branches/tdiesler/trunk/integration/jboss50/.classpath branches/tdiesler/trunk/integration/jboss50/.project branches/tdiesler/trunk/integration/jboss50/src/main/java/org/jboss/ws/integration/jboss50/AbstractDeployerHook.java branches/tdiesler/trunk/integration/jbws/.classpath branches/tdiesler/trunk/integration/jbws/.project branches/tdiesler/trunk/integration/jbws/ant-import/build-deploy.xml branches/tdiesler/trunk/integration/jbws/build.xml branches/tdiesler/trunk/integration/spi/.project branches/tdiesler/trunk/integration/sunri/.classpath branches/tdiesler/trunk/integration/sunri/.project 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/build.xml branches/tdiesler/trunk/integration/sunri/src/main/java/org/jboss/ws/integration/sunri/EndpointNameDeployer.java branches/tdiesler/trunk/integration/sunri/src/main/java/org/jboss/ws/integration/sunri/LifecycleHandlerImpl.java branches/tdiesler/trunk/integration/sunri/src/main/java/org/jboss/ws/integration/sunri/ManagedEndpointRegistry.java branches/tdiesler/trunk/integration/sunri/src/main/java/org/jboss/ws/integration/sunri/ManagedEndpointRegistryMBean.java branches/tdiesler/trunk/integration/sunri/src/main/java/org/jboss/ws/integration/sunri/ModifyWebMetaDataDeployer.java branches/tdiesler/trunk/integration/sunri/src/main/java/org/jboss/ws/integration/sunri/RequestHandlerImpl.java branches/tdiesler/trunk/integration/sunri/src/main/java/org/jboss/ws/integration/sunri/ServletResourceLoader.java branches/tdiesler/trunk/integration/sunri/src/main/java/org/jboss/ws/integration/sunri/SunJaxwsDeployer.java branches/tdiesler/trunk/integration/sunri/src/main/java/org/jboss/ws/integration/sunri/VirtualFileResourceLoader.java branches/tdiesler/trunk/integration/sunri/src/main/java/org/jboss/ws/integration/sunri/WSEndpointServlet.java branches/tdiesler/trunk/integration/sunri/src/main/java/org/jboss/ws/integration/sunri/WSServletContextListener.java branches/tdiesler/trunk/integration/sunri/src/main/java/org/jboss/ws/integration/sunri/metadata/sunjaxws/DDEndpoint.java branches/tdiesler/trunk/integration/sunri/src/main/java/org/jboss/ws/integration/sunri/metadata/sunjaxws/DDEndpoints.java branches/tdiesler/trunk/integration/sunri/src/main/java/org/jboss/ws/integration/sunri/metadata/sunjaxws/DDHandler.java branches/tdiesler/trunk/integration/sunri/src/main/java/org/jboss/ws/integration/sunri/metadata/sunjaxws/DDHandlerChain.java branches/tdiesler/trunk/integration/sunri/src/main/resources/jbossws-jboss50.sar/META-INF/jbossws-beans.xml branches/tdiesler/trunk/jbossws-core/.classpath branches/tdiesler/trunk/jbossws-core/.project branches/tdiesler/trunk/testsuite/.classpath branches/tdiesler/trunk/testsuite/ant-import/build-jars-jaxws.xml branches/tdiesler/trunk/testsuite/src/java/org/jboss/test/ws/jaxws/eardeployment/EarTestCase.java Log: Modified: branches/tdiesler/trunk/integration/jboss42/.classpath =================================================================== --- branches/tdiesler/trunk/integration/jboss42/.classpath 2007-05-17 21:56:56 UTC (rev 3130) +++ branches/tdiesler/trunk/integration/jboss42/.classpath 2007-05-18 09:01:49 UTC (rev 3131) @@ -3,10 +3,10 @@ <classpathentry excluding="org/jboss/ws/integration/jboss42/jms/" kind="src" path="src/main/java"/> <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/> <classpathentry kind="con" path="org.eclipse.jdt.USER_LIBRARY/jboss-4.2.x"/> - <classpathentry combineaccessrules="false" kind="src" path="/spi"/> - <classpathentry kind="lib" path="/spi/thirdparty/jaxrpc-api.jar"/> - <classpathentry kind="lib" path="/spi/thirdparty/jaxws-api.jar"/> - <classpathentry kind="lib" path="/spi/thirdparty/jsr181-api.jar"/> - <classpathentry kind="lib" path="/spi/thirdparty/saaj-api.jar"/> + <classpathentry combineaccessrules="false" kind="src" path="/integration-spi"/> + <classpathentry kind="lib" path="/integration-spi/thirdparty/jaxrpc-api.jar"/> + <classpathentry kind="lib" path="/integration-spi/thirdparty/jaxws-api.jar"/> + <classpathentry kind="lib" path="/integration-spi/thirdparty/jsr181-api.jar"/> + <classpathentry kind="lib" path="/integration-spi/thirdparty/saaj-api.jar"/> <classpathentry kind="output" path="output-eclipse"/> </classpath> Modified: branches/tdiesler/trunk/integration/jboss42/.project =================================================================== --- branches/tdiesler/trunk/integration/jboss42/.project 2007-05-17 21:56:56 UTC (rev 3130) +++ branches/tdiesler/trunk/integration/jboss42/.project 2007-05-18 09:01:49 UTC (rev 3131) @@ -1,6 +1,6 @@ <?xml version="1.0" encoding="UTF-8"?> <projectDescription> - <name>jboss42</name> + <name>integration-jboss42</name> <comment></comment> <projects> </projects> Modified: branches/tdiesler/trunk/integration/jboss42/src/main/java/org/jboss/ws/integration/jboss42/AbstractDeployerHook.java =================================================================== --- branches/tdiesler/trunk/integration/jboss42/src/main/java/org/jboss/ws/integration/jboss42/AbstractDeployerHook.java 2007-05-17 21:56:56 UTC (rev 3130) +++ branches/tdiesler/trunk/integration/jboss42/src/main/java/org/jboss/ws/integration/jboss42/AbstractDeployerHook.java 2007-05-18 09:01:49 UTC (rev 3131) @@ -89,7 +89,7 @@ } catch (Exception ex) { - throw new WSDeploymentException("Cannot load: " + deploymentClass); + throw new WSDeploymentException("Cannot load Deployment class: " + deploymentClass); } } @@ -103,7 +103,7 @@ } catch (Exception ex) { - throw new WSDeploymentException("Cannot load: " + serviceClass); + throw new WSDeploymentException("Cannot load Service class: " + serviceClass); } } @@ -117,7 +117,7 @@ } catch (Exception ex) { - throw new WSDeploymentException("Cannot load: " + endpointClass); + throw new WSDeploymentException("Cannot load Endpoint class: " + endpointClass); } } Modified: branches/tdiesler/trunk/integration/jboss50/.classpath =================================================================== --- branches/tdiesler/trunk/integration/jboss50/.classpath 2007-05-17 21:56:56 UTC (rev 3130) +++ branches/tdiesler/trunk/integration/jboss50/.classpath 2007-05-18 09:01:49 UTC (rev 3131) @@ -2,11 +2,11 @@ <classpath> <classpathentry kind="src" path="src/main/java"/> <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/> - <classpathentry combineaccessrules="false" kind="src" path="/spi"/> - <classpathentry kind="lib" path="/spi/thirdparty/jaxws-api.jar"/> - <classpathentry kind="lib" path="/spi/thirdparty/jsr181-api.jar"/> <classpathentry kind="con" path="org.eclipse.jdt.USER_LIBRARY/jboss-5.0.x"/> - <classpathentry kind="lib" path="/spi/thirdparty/jaxrpc-api.jar"/> - <classpathentry kind="lib" path="/spi/thirdparty/saaj-api.jar"/> + <classpathentry combineaccessrules="false" kind="src" path="/integration-spi"/> + <classpathentry kind="lib" path="/integration-spi/thirdparty/jaxrpc-api.jar"/> + <classpathentry kind="lib" path="/integration-spi/thirdparty/jaxws-api.jar"/> + <classpathentry kind="lib" path="/integration-spi/thirdparty/jsr181-api.jar"/> + <classpathentry kind="lib" path="/integration-spi/thirdparty/saaj-api.jar"/> <classpathentry kind="output" path="output-eclipse"/> </classpath> Modified: branches/tdiesler/trunk/integration/jboss50/.project =================================================================== --- branches/tdiesler/trunk/integration/jboss50/.project 2007-05-17 21:56:56 UTC (rev 3130) +++ branches/tdiesler/trunk/integration/jboss50/.project 2007-05-18 09:01:49 UTC (rev 3131) @@ -1,6 +1,6 @@ <?xml version="1.0" encoding="UTF-8"?> <projectDescription> - <name>jboss50</name> + <name>integration-jboss50</name> <comment></comment> <projects> </projects> Modified: branches/tdiesler/trunk/integration/jboss50/src/main/java/org/jboss/ws/integration/jboss50/AbstractDeployerHook.java =================================================================== --- branches/tdiesler/trunk/integration/jboss50/src/main/java/org/jboss/ws/integration/jboss50/AbstractDeployerHook.java 2007-05-17 21:56:56 UTC (rev 3130) +++ branches/tdiesler/trunk/integration/jboss50/src/main/java/org/jboss/ws/integration/jboss50/AbstractDeployerHook.java 2007-05-18 09:01:49 UTC (rev 3131) @@ -77,7 +77,7 @@ } catch (Exception ex) { - throw new WSDeploymentException("Cannot load: " + deploymentClass); + throw new WSDeploymentException("Cannot load Deployment class: " + deploymentClass); } } @@ -91,7 +91,7 @@ } catch (Exception ex) { - throw new WSDeploymentException("Cannot load: " + serviceClass); + throw new WSDeploymentException("Cannot load Service class: " + serviceClass); } } @@ -105,7 +105,7 @@ } catch (Exception ex) { - throw new WSDeploymentException("Cannot load: " + endpointClass); + throw new WSDeploymentException("Cannot load Endpoint class: " + endpointClass); } } Modified: branches/tdiesler/trunk/integration/jbws/.classpath =================================================================== --- branches/tdiesler/trunk/integration/jbws/.classpath 2007-05-17 21:56:56 UTC (rev 3130) +++ branches/tdiesler/trunk/integration/jbws/.classpath 2007-05-18 09:01:49 UTC (rev 3131) @@ -3,8 +3,5 @@ <classpathentry kind="src" path="src/main/java"/> <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/> <classpathentry kind="con" path="org.eclipse.jdt.USER_LIBRARY/jboss-5.0.x"/> - <classpathentry combineaccessrules="false" kind="src" path="/jbossws"/> - <classpathentry combineaccessrules="false" kind="src" path="/spi"/> - <classpathentry combineaccessrules="false" kind="src" path="/jboss50"/> <classpathentry kind="output" path="output-eclipse"/> </classpath> Modified: branches/tdiesler/trunk/integration/jbws/.project =================================================================== --- branches/tdiesler/trunk/integration/jbws/.project 2007-05-17 21:56:56 UTC (rev 3130) +++ branches/tdiesler/trunk/integration/jbws/.project 2007-05-18 09:01:49 UTC (rev 3131) @@ -1,6 +1,6 @@ <?xml version="1.0" encoding="UTF-8"?> <projectDescription> - <name>jbws-jboss50</name> + <name>integration-jbws</name> <comment></comment> <projects> </projects> Deleted: branches/tdiesler/trunk/integration/jbws/ant-import/build-deploy-jboss42.xml =================================================================== --- branches/tdiesler/trunk/integration/jbws/ant-import/build-deploy-jboss42.xml 2007-05-17 21:56:56 UTC (rev 3130) +++ branches/tdiesler/trunk/integration/jbws/ant-import/build-deploy-jboss42.xml 2007-05-18 09:01:49 UTC (rev 3131) @@ -1,83 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> - - - - - - - - - - - - -<project> - -  -  -  - -  - <target name="deploy-jboss42" depends="jars-jbws42,undeploy-jboss42" description="Deploy jbossws"> - - <fail message="Not available: ${jboss42.available.file}" unless="jboss42.available"/> - - <copy todir="${jboss42.home}/client" overwrite="true"> - <fileset dir="${core.dir}/output/lib"> - <include name="jboss-jaxrpc.jar"/> - <include name="jboss-jaxws.jar"/> - <include name="jboss-saaj.jar"/> - <include name="jbossws-client.jar"/> - </fileset> - <fileset dir="${core.dir}/thirdparty"> - <include name="jaxb-api.jar"/> - <include name="jaxb-impl.jar"/> - <include name="jaxb-xjc.jar"/> - <include name="wsdl4j.jar"/> - <include name="jbossws-wsconsume-impl.jar"/> - </fileset> - </copy> - <copy todir="${jboss42.home}/lib" overwrite="true"> - <fileset dir="${spi.dir}/output/lib"> - <include name="jbossws-spi.jar"/> - </fileset> - </copy> - <copy todir="${jboss42.home}/server/${jboss.server.instance}/lib" overwrite="true"> - <fileset dir="${core.dir}/output/lib"> - <include name="jboss-jaxrpc.jar"/> - <include name="jboss-jaxws.jar"/> - <include name="jboss-saaj.jar"/> - </fileset> - </copy> - <mkdir dir="${jboss42.home}/server/${jboss.server.instance}/deploy/jbossws.sar"/> - <unjar dest="${jboss42.home}/server/${jboss.server.instance}/deploy/jbossws.sar" src="${jbws.output.lib.dir}/jbossws-jbws42.sar"/> - </target> - -  - <target name="undeploy-jboss42" depends="prepare" description="Remove jbossws"> - - <fail message="Not available: ${jboss42.available.file}" unless="jboss42.available"/> - - <delete> - <fileset dir="${jboss42.home}/client"> - <include name="jboss-jaxrpc.jar"/> - <include name="jboss-jaxws.jar"/> - <include name="jboss-saaj.jar"/> - <include name="jbossws-client.jar"/> - <include name="wsdl4j.jar"/> - <include name="jbossws-wsconsume-impl.jar"/> - </fileset> - <fileset dir="${jboss42.home}/lib"> - <include name="jbossws-integration.jar"/>  - <include name="jbossws-spi.jar"/> - </fileset> - <fileset dir="${jboss42.home}/server/${jboss.server.instance}/lib"> - <include name="jboss-jaxrpc.jar"/> - <include name="jboss-jaxws.jar"/> - <include name="jboss-saaj.jar"/> - </fileset> - </delete> - <delete dir="${jboss42.home}/server/${jboss.server.instance}/deploy/jbossws.sar"/> - </target> - -</project> Deleted: branches/tdiesler/trunk/integration/jbws/ant-import/build-deploy-jboss50.xml =================================================================== --- branches/tdiesler/trunk/integration/jbws/ant-import/build-deploy-jboss50.xml 2007-05-17 21:56:56 UTC (rev 3130) +++ branches/tdiesler/trunk/integration/jbws/ant-import/build-deploy-jboss50.xml 2007-05-18 09:01:49 UTC (rev 3131) @@ -1,88 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> - - - - - - - - - - - - -<project> - -  -  -  - -  - <target name="deploy-jboss50" depends="jars-jbws50,undeploy-jboss50" description="Deploy jbossws to jboss50"> - - <copy todir="${jboss50.home}/client" overwrite="true"> - <fileset dir="${core.dir}/output/lib"> - <include name="jboss-jaxrpc.jar"/> - <include name="jboss-jaxws.jar"/> - <include name="jboss-saaj.jar"/> - <include name="jbossws-client.jar"/> - </fileset> - <fileset dir="${core.dir}/thirdparty"> - <include name="jaxb-api.jar"/> - <include name="jaxb-impl.jar"/> - <include name="jaxb-xjc.jar"/> - <include name="wsdl4j.jar"/> - <include name="jbossws-wsconsume-impl.jar"/> - </fileset> - </copy> - <copy todir="${jboss50.home}/lib" overwrite="true"> - <fileset dir="${core.dir}/thirdparty"> - <include name="jaxb-api.jar"/> - <include name="jaxb-impl.jar"/> - </fileset> - </copy> - <copy todir="${jboss50.home}/server/${jboss.server.instance}/lib" overwrite="true"> - <fileset dir="${spi.dir}/output/lib"> - <include name="jbossws-spi.jar"/> - </fileset> - <fileset dir="${core.dir}/output/lib"> - <include name="jboss-jaxrpc.jar"/> - <include name="jboss-jaxws.jar"/> - <include name="jboss-saaj.jar"/> - </fileset> - </copy> - <mkdir dir="${jboss50.home}/server/${jboss.server.instance}/deployers/jbossws.deployer"/> - <unzip dest="${jboss50.home}/server/${jboss.server.instance}/deployers/jbossws.deployer" src="${jbws.output.lib.dir}/jbossws-jbws50-deployer.zip"/> - <mkdir dir="${jboss50.home}/server/${jboss.server.instance}/deploy/jbossws.sar"/> - <unjar dest="${jboss50.home}/server/${jboss.server.instance}/deploy/jbossws.sar" src="${jbws.output.lib.dir}/jbossws-jbws50.sar"/> - <copy tofile="${jboss50.home}/server/${jboss.server.instance}/deploy/jbossws-context.war" file="${jbws.output.lib.dir}/jbossws-context.war" overwrite="true"/> - </target> - -  - <target name="undeploy-jboss50" depends="prepare" description="Remove jbossws from jboss50"> - - <fail message="Not available: ${jboss50.available.file}" unless="jboss50.available"/> - - <ant antfile="${int.sunri.dir}/build.xml" target="undeploy" inheritall="false"/> - - <delete> - <fileset dir="${jboss50.home}/client"> - <include name="jboss-jaxrpc.jar"/> - <include name="jboss-jaxws.jar"/> - <include name="jboss-saaj.jar"/> - <include name="jbossws-client.jar"/> - <include name="wsdl4j.jar"/> - <include name="jbossws-wsconsume-impl.jar"/> - </fileset> - <fileset dir="${jboss50.home}/server/${jboss.server.instance}/lib"> - <include name="jboss-jaxrpc.jar"/> - <include name="jboss-jaxws.jar"/> - <include name="jboss-saaj.jar"/> - </fileset> - </delete> - <delete dir="${jboss50.home}/server/${jboss.server.instance}/deployers/jbossws.deployer"/> - <delete dir="${jboss50.home}/server/${jboss.server.instance}/deploy/jbossws.sar"/> - <delete file="${jboss50.home}/server/${jboss.server.instance}/deploy/jbossws-context.war"/> - </target> - -</project> Modified: branches/tdiesler/trunk/integration/jbws/ant-import/build-deploy.xml =================================================================== --- branches/tdiesler/trunk/integration/jbws/ant-import/build-deploy.xml 2007-05-17 21:56:56 UTC (rev 3130) +++ branches/tdiesler/trunk/integration/jbws/ant-import/build-deploy.xml 2007-05-18 09:01:49 UTC (rev 3131) @@ -18,7 +18,7 @@   - <target name="deploy" depends="jars,undeploy" description="Deploy jbossws"> + <target name="deploy-jboss50" depends="jars-jbws50,undeploy-jboss50" description="Deploy jbossws to jboss50"> <copy todir="${jboss50.home}/client" overwrite="true"> <fileset dir="${core.dir}/output/lib"> @@ -52,18 +52,18 @@ </fileset> </copy> <mkdir dir="${jboss50.home}/server/${jboss.server.instance}/deployers/jbossws.deployer"/> - <unzip dest="${jboss50.home}/server/${jboss.server.instance}/deployers/jbossws.deployer" src="${jbws50.output.lib.dir}/jbossws-jbws50-deployer.zip"/> + <unzip dest="${jboss50.home}/server/${jboss.server.instance}/deployers/jbossws.deployer" src="${jbws.output.lib.dir}/jbossws-jbws50-deployer.zip"/> <mkdir dir="${jboss50.home}/server/${jboss.server.instance}/deploy/jbossws.sar"/> - <unjar dest="${jboss50.home}/server/${jboss.server.instance}/deploy/jbossws.sar" src="${jbws50.output.lib.dir}/jbossws-jbws50.sar"/> - <copy tofile="${jboss50.home}/server/${jboss.server.instance}/deploy/jbossws-context.war" file="${jbws50.output.lib.dir}/jbossws-jbws50-context.war" overwrite="true"/> + <unjar dest="${jboss50.home}/server/${jboss.server.instance}/deploy/jbossws.sar" src="${jbws.output.lib.dir}/jbossws-jbws50.sar"/> + <copy tofile="${jboss50.home}/server/${jboss.server.instance}/deploy/jbossws-context.war" file="${jbws.output.lib.dir}/jbossws-context.war" overwrite="true"/> </target>  - <target name="undeploy" depends="prepare" description="Remove jbossws"> + <target name="undeploy-jboss50" depends="prepare" description="Remove jbossws from jboss50"> <fail message="Not available: ${jboss50.available.file}" unless="jboss50.available"/> - <ant antfile="${int.sunri50.dir}/build.xml" target="undeploy" inheritall="false"/> + <ant antfile="${int.sunri.dir}/build.xml" target="undeploy-jboss50" inheritall="false"/> <delete> <fileset dir="${jboss50.home}/client"> @@ -85,4 +85,67 @@ <delete file="${jboss50.home}/server/${jboss.server.instance}/deploy/jbossws-context.war"/> </target> +  + <target name="deploy-jboss42" depends="jars-jbws42,undeploy-jboss42" description="Deploy jbossws to jboss42"> + + <fail message="Not available: ${jboss42.available.file}" unless="jboss42.available"/> + + <copy todir="${jboss42.home}/client" overwrite="true"> + <fileset dir="${core.dir}/output/lib"> + <include name="jboss-jaxrpc.jar"/> + <include name="jboss-jaxws.jar"/> + <include name="jboss-saaj.jar"/> + <include name="jbossws-client.jar"/> + </fileset> + <fileset dir="${core.dir}/thirdparty"> + <include name="jaxb-api.jar"/> + <include name="jaxb-impl.jar"/> + <include name="jaxb-xjc.jar"/> + <include name="wsdl4j.jar"/> + <include name="jbossws-wsconsume-impl.jar"/> + </fileset> + </copy> + <copy todir="${jboss42.home}/lib" overwrite="true"> + <fileset dir="${spi.dir}/output/lib"> + <include name="jbossws-spi.jar"/> + </fileset> + </copy> + <copy todir="${jboss42.home}/server/${jboss.server.instance}/lib" overwrite="true"> + <fileset dir="${core.dir}/output/lib"> + <include name="jboss-jaxrpc.jar"/> + <include name="jboss-jaxws.jar"/> + <include name="jboss-saaj.jar"/> + </fileset> + </copy> + <mkdir dir="${jboss42.home}/server/${jboss.server.instance}/deploy/jbossws.sar"/> + <unjar dest="${jboss42.home}/server/${jboss.server.instance}/deploy/jbossws.sar" src="${jbws.output.lib.dir}/jbossws-jbws42.sar"/> + </target> + +  + <target name="undeploy-jboss42" depends="prepare" description="Remove jbossws from jboss42"> + + <fail message="Not available: ${jboss42.available.file}" unless="jboss42.available"/> + + <delete> + <fileset dir="${jboss42.home}/client"> + <include name="jboss-jaxrpc.jar"/> + <include name="jboss-jaxws.jar"/> + <include name="jboss-saaj.jar"/> + <include name="jbossws-client.jar"/> + <include name="wsdl4j.jar"/> + <include name="jbossws-wsconsume-impl.jar"/> + </fileset> + <fileset dir="${jboss42.home}/lib"> + <include name="jbossws-integration.jar"/>  + <include name="jbossws-spi.jar"/> + </fileset> + <fileset dir="${jboss42.home}/server/${jboss.server.instance}/lib"> + <include name="jboss-jaxrpc.jar"/> + <include name="jboss-jaxws.jar"/> + <include name="jboss-saaj.jar"/> + </fileset> + </delete> + <delete dir="${jboss42.home}/server/${jboss.server.instance}/deploy/jbossws.sar"/> + </target> + </project> Deleted: branches/tdiesler/trunk/integration/jbws/ant-import/build-release-jboss42.xml =================================================================== --- branches/tdiesler/trunk/integration/jbws/ant-import/build-release-jboss42.xml 2007-05-17 21:56:56 UTC (rev 3130) +++ branches/tdiesler/trunk/integration/jbws/ant-import/build-release-jboss42.xml 2007-05-18 09:01:49 UTC (rev 3131) @@ -1,38 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> - - - - - - - - - - - - -<project> - -  - <target name="release" depends="jars" - description="Release to jboss.local.repository"> - -  - <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="${jbws.output.lib.dir}"> - <include name="jbossws-jboss42.jar"/> - <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.xml" filtering="true" overwrite="true"> - <filterset> - <filtersfile file="${int.jbws42.dir}/version.properties"/> - </filterset> - </copy> - - </target> - -</project> Deleted: branches/tdiesler/trunk/integration/jbws/ant-import/build-release-jboss50.xml =================================================================== --- branches/tdiesler/trunk/integration/jbws/ant-import/build-release-jboss50.xml 2007-05-17 21:56:56 UTC (rev 3130) +++ branches/tdiesler/trunk/integration/jbws/ant-import/build-release-jboss50.xml 2007-05-18 09:01:49 UTC (rev 3131) @@ -1,39 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> - - - - - - - - - - - - -<project> - -  - <target name="release" depends="jbws50-jars" - description="Release to jboss.local.repository"> - -  - <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}"> - <include name="jbossws-jboss50.jar"/> - <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"> - <filterset> - <filtersfile file="${basedir}/version.properties"/> - </filterset> - </copy> - - </target> - -</project> Copied: branches/tdiesler/trunk/integration/jbws/ant-import/build-release.xml (from rev 3130, branches/tdiesler/trunk/integration/jbws/ant-import/build-release-jboss50.xml) =================================================================== --- branches/tdiesler/trunk/integration/jbws/ant-import/build-release.xml (rev 0) +++ branches/tdiesler/trunk/integration/jbws/ant-import/build-release.xml 2007-05-18 09:01:49 UTC (rev 3131) @@ -0,0 +1,39 @@ +<?xml version="1.0" encoding="UTF-8"?> + + + + + + + + + + + + +<project> + +  + <target name="release" depends="jbws50-jars" + description="Release to jboss.local.repository"> + +  + <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}"> + <include name="jbossws-jboss50.jar"/> + <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"> + <filterset> + <filtersfile file="${basedir}/version.properties"/> + </filterset> + </copy> + + </target> + +</project> Modified: branches/tdiesler/trunk/integration/jbws/build.xml =================================================================== --- branches/tdiesler/trunk/integration/jbws/build.xml 2007-05-17 21:56:56 UTC (rev 3130) +++ branches/tdiesler/trunk/integration/jbws/build.xml 2007-05-18 09:01:49 UTC (rev 3131) @@ -15,8 +15,7 @@ <import file="${basedir}/build/ant-import/build-setup.xml"/> - <import file="${int.jbws.dir}/ant-import/build-deploy-jboss50.xml"/> - <import file="${int.jbws.dir}/ant-import/build-deploy-jboss42.xml"/> + <import file="${int.jbws.dir}/ant-import/build-deploy.xml"/> <import file="${int.jbws.dir}/ant-import/build-testsuite.xml"/> <import file="${int.jbws.dir}/ant-import/build-thirdparty.xml"/> @@ -39,11 +38,9 @@  <target name="init" depends="prepare,thirdparty"> -  </target>  @@ -140,7 +137,7 @@ <fileset dir="${int.jboss50.dir}/output/lib"> <include name="jbossws-jboss50.jar"/> </fileset> - <fileset dir="${jbws.resources.dir}/jbossws.deployer"> + <fileset dir="${jbws.resources.dir}/jbossws-jboss50.deployer"> <include name="META-INF/jbossws-deployer-beans.xml"/> </fileset> </zip> Copied: branches/tdiesler/trunk/integration/jbws/src/main/resources/jbossws-jboss50.deployer (from rev 3130, branches/tdiesler/trunk/integration/jbws/src/main/resources/jbossws.deployer) Modified: branches/tdiesler/trunk/integration/spi/.project =================================================================== --- branches/tdiesler/trunk/integration/spi/.project 2007-05-17 21:56:56 UTC (rev 3130) +++ branches/tdiesler/trunk/integration/spi/.project 2007-05-18 09:01:49 UTC (rev 3131) @@ -1,6 +1,6 @@ <?xml version="1.0" encoding="UTF-8"?> <projectDescription> - <name>spi</name> + <name>integration-spi</name> <comment></comment> <projects> </projects> Modified: branches/tdiesler/trunk/integration/sunri/.classpath =================================================================== --- branches/tdiesler/trunk/integration/sunri/.classpath 2007-05-17 21:56:56 UTC (rev 3130) +++ branches/tdiesler/trunk/integration/sunri/.classpath 2007-05-18 09:01:49 UTC (rev 3131) @@ -19,7 +19,7 @@ <classpathentry kind="lib" path="thirdparty/sjsxp.jar"/> <classpathentry kind="lib" path="thirdparty/stax-ex.jar"/> <classpathentry kind="lib" path="thirdparty/streambuffer.jar"/> - <classpathentry combineaccessrules="false" kind="src" path="/spi"/> <classpathentry kind="lib" path="thirdparty/servlet-api.jar"/> + <classpathentry combineaccessrules="false" kind="src" path="/integration-spi"/> <classpathentry kind="output" path="output-eclipse"/> </classpath> Modified: branches/tdiesler/trunk/integration/sunri/.project =================================================================== --- branches/tdiesler/trunk/integration/sunri/.project 2007-05-17 21:56:56 UTC (rev 3130) +++ branches/tdiesler/trunk/integration/sunri/.project 2007-05-18 09:01:49 UTC (rev 3131) @@ -1,6 +1,6 @@ <?xml version="1.0" encoding="UTF-8"?> <projectDescription> - <name>sunri-jboss50</name> + <name>integration-sunri</name> <comment></comment> <projects> </projects> Modified: branches/tdiesler/trunk/integration/sunri/ant-import/build-deploy.xml =================================================================== --- branches/tdiesler/trunk/integration/sunri/ant-import/build-deploy.xml 2007-05-17 21:56:56 UTC (rev 3130) +++ branches/tdiesler/trunk/integration/sunri/ant-import/build-deploy.xml 2007-05-18 09:01:49 UTC (rev 3131) @@ -18,9 +18,9 @@   - <target name="deploy" depends="jars,undeploy" description="Deploy jbossws"> + <target name="deploy-jboss50" depends="jars-jboss50,undeploy-jboss50" description="Deploy jbossws/sunri to jboss50"> - <ant antfile="${int.jbws50.dir}/build.xml" target="undeploy" inheritall="false"/> + <ant antfile="${int.jbws.dir}/build.xml" target="undeploy-jboss50" inheritall="false"/> <copy todir="${jboss50.home}/client" overwrite="true"> <fileset dir="${thirdparty.dir}"> @@ -41,14 +41,14 @@ </fileset> </copy> <mkdir dir="${jboss50.home}/server/${jboss.server.instance}/deployers/jbossws.deployer"/> - <unzip dest="${jboss50.home}/server/${jboss.server.instance}/deployers/jbossws.deployer" src="${sunri50.output.lib.dir}/jbossws-sunri50-deployer.zip"/> + <unzip dest="${jboss50.home}/server/${jboss.server.instance}/deployers/jbossws.deployer" src="${sunri.output.lib.dir}/jbossws-sunri50-deployer.zip"/> <mkdir dir="${jboss50.home}/server/${jboss.server.instance}/deploy/jbossws-sunri.sar"/> - <unjar dest="${jboss50.home}/server/${jboss.server.instance}/deploy/jbossws-sunri.sar" src="${sunri50.output.lib.dir}/jbossws-sunri50.sar"/> - <copy tofile="${jboss50.home}/server/${jboss.server.instance}/deploy/jbossws-context.war" file="${sunri50.output.lib.dir}/jbossws-sunri50-context.war" overwrite="true"/> + <unjar dest="${jboss50.home}/server/${jboss.server.instance}/deploy/jbossws-sunri.sar" src="${sunri.output.lib.dir}/jbossws-sunri50.sar"/> + <copy tofile="${jboss50.home}/server/${jboss.server.instance}/deploy/jbossws-context.war" file="${sunri.output.lib.dir}/jbossws-context.war" overwrite="true"/> </target>  - <target name="undeploy" depends="prepare" description="Remove jbossws/sunri"> + <target name="undeploy-jboss50" depends="prepare" description="Remove jbossws/sunri from jboss50"> <delete dir="${jboss50.home}/server/${jboss.server.instance}/deploy/jbossws-sunri.sar"/> </target> Modified: branches/tdiesler/trunk/integration/sunri/ant-import/build-testsuite.xml =================================================================== --- branches/tdiesler/trunk/integration/sunri/ant-import/build-testsuite.xml 2007-05-17 21:56:56 UTC (rev 3130) +++ branches/tdiesler/trunk/integration/sunri/ant-import/build-testsuite.xml 2007-05-18 09:01:49 UTC (rev 3131) @@ -10,14 +10,29 @@ <project> - <property name="tests.dir" value="${int.sunri50.dir}/src/test"/> - <property name="tests.output.dir" value="${int.sunri50.dir}/output-tests"/> + <property name="tests.dir" value="${int.sunri.dir}/src/test"/> + <property name="tests.output.dir" value="${int.sunri.dir}/output-tests"/> - <property name="jboss.home" value="${jboss50.home}"/> - <property name="excludesfile" value="${int.sunri50.dir}/src/test/resources/excludes.txt"/> - <import file="${build.dir}/ant-import/build-testsuite.xml"/> +  + <target name="tests-jboss50" depends="tests-prepare-jboss50,tests"/> + <target name="tests-prepare-jboss50"> + <property name="jboss.home" value="${jboss50.home}"/> + <property name="excludesfile" value="${int.sunri.dir}/src/test/resources/excludes-jboss50.txt"/> + </target> + +  + <target name="tests-jboss42" depends="tests-prepare-jboss42,tests"/> + <target name="tests-prepare-jboss42"> + <property name="jboss.home" value="${jboss42.home}"/> + <property name="excludesfile" value="${int.sunri.dir}/src/test/resources/excludes-jboss42.txt"/> + </target> +    @@ -88,7 +103,7 @@  <target name="tests-copy-resources" depends="tests-init" description="Copy the deployment resources."> <copy-test-resources srcdir="${testsuite.dir}/src"/> - <copy-test-resources srcdir="${int.sunri50.dir}/src/test"/> + <copy-test-resources srcdir="${int.sunri.dir}/src/test"/> </target> <target name="tests-jars" depends="tests-compile,tests-copy-resources" description="Build the deployments."> Modified: branches/tdiesler/trunk/integration/sunri/ant-import/build-thirdparty.xml =================================================================== --- branches/tdiesler/trunk/integration/sunri/ant-import/build-thirdparty.xml 2007-05-17 21:56:56 UTC (rev 3130) +++ branches/tdiesler/trunk/integration/sunri/ant-import/build-thirdparty.xml 2007-05-18 09:01:49 UTC (rev 3131) @@ -13,7 +13,7 @@ <project> - <property file="${int.sunri50.dir}/version.properties"/> + <property file="${int.sunri.dir}/version.properties"/>   @@ -23,8 +23,8 @@ </target> <target name="thirdparty-init" depends="prepare"> - <property name="thirdparty.dir" value="${int.sunri50.dir}/thirdparty"/> - <checksum file="${int.sunri50.dir}/version.properties" fileext=".md5" verifyproperty="checksum.ok"/> + <property name="thirdparty.dir" value="${int.sunri.dir}/thirdparty"/> + <checksum file="${int.sunri.dir}/version.properties" fileext=".md5" verifyproperty="checksum.ok"/> <condition property="force.thirdparty.get"> <or> <not> @@ -63,7 +63,7 @@ <get src="${jboss.repository}/sun-jaxws/${sun-jaxws}/lib/jaxws-ri-src.jar" dest="${thirdparty.dir}/jaxws-ri-src.jar" usetimestamp="true" verbose="true"/> <get src="${jboss.repository}/sun-servlet/${sun-servlet}/lib/servlet-api.jar" dest="${thirdparty.dir}/servlet-api.jar" usetimestamp="true" verbose="true"/> - <checksum file="${int.sunri50.dir}/version.properties" fileext=".md5"/> + <checksum file="${int.sunri.dir}/version.properties" fileext=".md5"/> </target> <target name="thirdparty-classpath" depends="thirdparty-init"> Modified: branches/tdiesler/trunk/integration/sunri/build.xml =================================================================== --- branches/tdiesler/trunk/integration/sunri/build.xml 2007-05-17 21:56:56 UTC (rev 3130) +++ branches/tdiesler/trunk/integration/sunri/build.xml 2007-05-18 09:01:49 UTC (rev 3131) @@ -24,15 +24,15 @@   - <property name="sunri50.dir" value="${int.sunri.dir}"/> - <property name="sunri50.src.dir" value="${sunri50.dir}/src/main"/> - <property name="sunri50.etc.dir" value="${sunri50.src.dir}/etc"/> - <property name="sunri50.java.dir" value="${sunri50.src.dir}/java"/> - <property name="sunri50.resources.dir" value="${sunri50.src.dir}/resources"/> - <property name="sunri50.output.dir" value="${sunri50.dir}/output"/> - <property name="sunri50.output.classes.dir" value="${sunri50.output.dir}/classes"/> - <property name="sunri50.output.etc.dir" value="${sunri50.output.dir}/etc"/> - <property name="sunri50.output.lib.dir" value="${sunri50.output.dir}/lib"/> + <property name="sunri.dir" value="${int.sunri.dir}"/> + <property name="sunri.src.dir" value="${sunri.dir}/src/main"/> + <property name="sunri.etc.dir" value="${sunri.src.dir}/etc"/> + <property name="sunri.java.dir" value="${sunri.src.dir}/java"/> + <property name="sunri.resources.dir" value="${sunri.src.dir}/resources"/> + <property name="sunri.output.dir" value="${sunri.dir}/output"/> + <property name="sunri.output.classes.dir" value="${sunri.output.dir}/classes"/> + <property name="sunri.output.etc.dir" value="${sunri.output.dir}/etc"/> + <property name="sunri.output.lib.dir" value="${sunri.output.dir}/lib"/>   @@ -59,19 +59,19 @@  <target name="compile-classes" depends="init"> - <mkdir dir="${sunri50.output.classes.dir}"/> - <javac srcdir="${sunri50.java.dir}" sourcepath="" destdir="${sunri50.output.classes.dir}" encoding="utf-8" debug="${javac.debug}" verbose="${javac.verbose}" + <mkdir dir="${sunri.output.classes.dir}"/> + <javac srcdir="${sunri.java.dir}" sourcepath="" destdir="${sunri.output.classes.dir}" encoding="utf-8" debug="${javac.debug}" verbose="${javac.verbose}" deprecation="${javac.deprecation}" failonerror="${javac.fail.onerror}"> - <include name="org/jboss/ws/integration/jboss50/**"/> + <include name="org/jboss/ws/integration/sunri/**"/> <classpath refid="sunri50.integration.classpath"/> </javac> </target>  <target name="compile-etc" depends="init"> - <mkdir dir="${sunri50.output.etc.dir}"/> - <copy todir="${sunri50.output.etc.dir}" filtering="yes"> - <fileset dir="${sunri50.etc.dir}"> + <mkdir dir="${sunri.output.etc.dir}"/> + <copy todir="${sunri.output.etc.dir}" filtering="yes"> + <fileset dir="${sunri.etc.dir}"> <include name="component-info.xml"/> </fileset> <fileset dir="${build.dir}/etc"> @@ -95,37 +95,37 @@  - <target name="jars" depends="compile,module-jars" description="Builds all jar files."> + <target name="jars" depends="compile,jars-jboss50" description="Builds all jar files."> </target>  - <target name="module-jars" depends="init"> + <target name="jars-jboss50" depends="compile">  - <mkdir dir="${sunri50.output.lib.dir}"/> - <jar jarfile="${sunri50.output.lib.dir}/jbossws-sunri50.jar" manifest="${sunri50.output.etc.dir}/default.mf"> - <fileset dir="${sunri50.output.classes.dir}"> - <include name="org/jboss/ws/integration/jboss50/**"/> + <mkdir dir="${sunri.output.lib.dir}"/> + <jar jarfile="${sunri.output.lib.dir}/jbossws-sunri50.jar" manifest="${sunri.output.etc.dir}/default.mf"> + <fileset dir="${sunri.output.classes.dir}"> + <include name="org/jboss/ws/integration/sunri/**"/> </fileset> </jar> -  - <war warfile="${sunri50.output.lib.dir}/jbossws-sunri50-context.war" webxml="${sunri50.resources.dir}/jbossws-context.war/WEB-INF/web.xml"> - <fileset dir="${sunri50.resources.dir}/jbossws-context.war"> +  + <war warfile="${sunri.output.lib.dir}/jbossws-context.war" webxml="${sunri.resources.dir}/jbossws-context.war/WEB-INF/web.xml"> + <fileset dir="${sunri.resources.dir}/jbossws-context.war"> <include name="index.html"/> <include name="styles.css"/> </fileset> - <webinf dir="${sunri50.resources.dir}/jbossws-context.war/WEB-INF"> + <webinf dir="${sunri.resources.dir}/jbossws-context.war/WEB-INF"> <include name="jboss-web.xml"/> </webinf> </war>  - <jar jarfile="${sunri50.output.lib.dir}/jbossws-sunri50.sar" manifest="${sunri50.output.etc.dir}/default.mf"> + <jar jarfile="${sunri.output.lib.dir}/jbossws-sunri50.sar" manifest="${sunri.output.etc.dir}/default.mf">  @@ -145,27 +145,27 @@ <include name="stax-ex.jar"/> <include name="streambuffer.jar"/> </fileset> - <metainf dir="${sunri50.resources.dir}/jbossws.sar/META-INF"> + <metainf dir="${sunri.resources.dir}/jbossws-jboss50.sar/META-INF"> <include name="jbossws-beans.xml"/> </metainf> </jar>  - <zip zipfile="${sunri50.output.lib.dir}/jbossws-sunri50-deployer.zip"> + <zip zipfile="${sunri.output.lib.dir}/jbossws-sunri50-deployer.zip"> <fileset dir="${int.jboss50.dir}/output/lib"> <include name="jbossws-jboss50.jar"/> </fileset> - <fileset dir="${sunri50.output.lib.dir}"> + <fileset dir="${sunri.output.lib.dir}"> <include name="jbossws-sunri50.jar"/> </fileset> - <fileset dir="${sunri50.resources.dir}/jbossws.deployer"> + <fileset dir="${sunri.resources.dir}/jbossws-jboss50.deployer"> <include name="META-INF/jbossws-deployer-beans.xml"/> </fileset> </zip>  - <zip zipfile="${sunri50.output.lib.dir}/jbossws-sunri50-src.zip" > - <fileset dir="${sunri50.java.dir}"/> + <zip zipfile="${sunri.output.lib.dir}/jbossws-sunri50-src.zip" > + <fileset dir="${sunri.java.dir}"/> </zip> </target> @@ -175,7 +175,7 @@  <target name="clean" depends="prepare" description="Cleans up most generated files."> - <delete dir="${sunri50.output.dir}"/> + <delete dir="${sunri.output.dir}"/> </target> <target name="clobber" depends="clean" description="Cleans up all generated files."> Copied: branches/tdiesler/trunk/integration/sunri/src/main/java/org/jboss/ws/integration/sunri (from rev 3130, branches/tdiesler/trunk/integration/sunri/src/main/java/org/jboss/ws/integration/jboss50/sunri) Modified: branches/tdiesler/trunk/integration/sunri/src/main/java/org/jboss/ws/integration/sunri/EndpointNameDeployer.java =================================================================== --- branches/tdiesler/trunk/integration/sunri/src/main/java/org/jboss/ws/integration/jboss50/sunri/EndpointNameDeployer.java 2007-05-17 21:56:56 UTC (rev 3130) +++ branches/tdiesler/trunk/integration/sunri/src/main/java/org/jboss/ws/integration/sunri/EndpointNameDeployer.java 2007-05-18 09:01:49 UTC (rev 3131) @@ -19,7 +19,7 @@ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA * 02110-1301 USA, or see the FSF site: http://www.fsf.org. */ -package org.jboss.ws.integration.jboss50.sunri; +package org.jboss.ws.integration.sunri; //$Id$ Modified: branches/tdiesler/trunk/integration/sunri/src/main/java/org/jboss/ws/integration/sunri/LifecycleHandlerImpl.java =================================================================== --- branches/tdiesler/trunk/integration/sunri/src/main/java/org/jboss/ws/integration/jboss50/sunri/LifecycleHandlerImpl.java 2007-05-17 21:56:56 UTC (rev 3130) +++ branches/tdiesler/trunk/integration/sunri/src/main/java/org/jboss/ws/integration/sunri/LifecycleHandlerImpl.java 2007-05-18 09:01:49 UTC (rev 3131) @@ -19,7 +19,7 @@ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA * 02110-1301 USA, or see the FSF site: http://www.fsf.org. */ -package org.jboss.ws.integration.jboss50.sunri; +package org.jboss.ws.integration.sunri; //$Id$ Modified: branches/tdiesler/trunk/integration/sunri/src/main/java/org/jboss/ws/integration/sunri/ManagedEndpointRegistry.java =================================================================== --- branches/tdiesler/trunk/integration/sunri/src/main/java/org/jboss/ws/integration/jboss50/sunri/ManagedEndpointRegistry.java 2007-05-17 21:56:56 UTC (rev 3130) +++ branches/tdiesler/trunk/integration/sunri/src/main/java/org/jboss/ws/integration/sunri/ManagedEndpointRegistry.java 2007-05-18 09:01:49 UTC (rev 3131) @@ -19,7 +19,7 @@ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA * 02110-1301 USA, or see the FSF site: http://www.fsf.org. */ -package org.jboss.ws.integration.jboss50.sunri; +package org.jboss.ws.integration.sunri; // $Id$ Modified: branches/tdiesler/trunk/integration/sunri/src/main/java/org/jboss/ws/integration/sunri/ManagedEndpointRegistryMBean.java =================================================================== --- branches/tdiesler/trunk/integration/sunri/src/main/java/org/jboss/ws/integration/jboss50/sunri/ManagedEndpointRegistryMBean.java 2007-05-17 21:56:56 UTC (rev 3130) +++ branches/tdiesler/trunk/integration/sunri/src/main/java/org/jboss/ws/integration/sunri/ManagedEndpointRegistryMBean.java 2007-05-18 09:01:49 UTC (rev 3131) @@ -19,7 +19,7 @@ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA * 02110-1301 USA, or see the FSF site: http://www.fsf.org. */ -package org.jboss.ws.integration.jboss50.sunri; +package org.jboss.ws.integration.sunri; import org.jboss.ws.integration.management.EndpointRegistry; Modified: branches/tdiesler/trunk/integration/sunri/src/main/java/org/jboss/ws/integration/sunri/ModifyWebMetaDataDeployer.java =================================================================== --- branches/tdiesler/trunk/integration/sunri/src/main/java/org/jboss/ws/integration/jboss50/sunri/ModifyWebMetaDataDeployer.java 2007-05-17 21:56:56 UTC (rev 3130) +++ branches/tdiesler/trunk/integration/sunri/src/main/java/org/jboss/ws/integration/sunri/ModifyWebMetaDataDeployer.java 2007-05-18 09:01:49 UTC (rev 3131) @@ -19,7 +19,7 @@ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA * 02110-1301 USA, or see the FSF site: http://www.fsf.org. */ -package org.jboss.ws.integration.jboss50.sunri; +package org.jboss.ws.integration.sunri; //$Id$ @@ -30,7 +30,7 @@ import org.jboss.metadata.web.ParamValue.ParamType; import org.jboss.ws.integration.deployment.AbstractDeployer; import org.jboss.ws.integration.deployment.Deployment; -import org.jboss.ws.integration.jboss50.sunri.metadata.sunjaxws.DDEndpoints; +import org.jboss.ws.integration.sunri.metadata.sunjaxws.DDEndpoints; /** * A deployer that modifies the web.xml meta data Modified: branches/tdiesler/trunk/integration/sunri/src/main/java/org/jboss/ws/integration/sunri/RequestHandlerImpl.java =================================================================== --- branches/tdiesler/trunk/integration/sunri/src/main/java/org/jboss/ws/integration/jboss50/sunri/RequestHandlerImpl.java 2007-05-17 21:56:56 UTC (rev 3130) +++ branches/tdiesler/trunk/integration/sunri/src/main/java/org/jboss/ws/integration/sunri/RequestHandlerImpl.java 2007-05-18 09:01:49 UTC (rev 3131) @@ -19,7 +19,7 @@ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA * 02110-1301 USA, or see the FSF site: http://www.fsf.org. */ -package org.jboss.ws.integration.jboss50.sunri; +package org.jboss.ws.integration.sunri; //$Id$ Modified: branches/tdiesler/trunk/integration/sunri/src/main/java/org/jboss/ws/integration/sunri/ServletResourceLoader.java =================================================================== --- branches/tdiesler/trunk/integration/sunri/src/main/java/org/jboss/ws/integration/jboss50/sunri/ServletResourceLoader.java 2007-05-17 21:56:56 UTC (rev 3130) +++ branches/tdiesler/trunk/integration/sunri/src/main/java/org/jboss/ws/integration/sunri/ServletResourceLoader.java 2007-05-18 09:01:49 UTC (rev 3131) @@ -19,7 +19,7 @@ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA * 02110-1301 USA, or see the FSF site: http://www.fsf.org. */ -package org.jboss.ws.integration.jboss50.sunri; +package org.jboss.ws.integration.sunri; // $Id$ Modified: branches/tdiesler/trunk/integration/sunri/src/main/java/org/jboss/ws/integration/sunri/SunJaxwsDeployer.java =================================================================== --- branches/tdiesler/trunk/integration/sunri/src/main/java/org/jboss/ws/integration/jboss50/sunri/SunJaxwsDeployer.java 2007-05-17 21:56:56 UTC (rev 3130) +++ branches/tdiesler/trunk/integration/sunri/src/main/java/org/jboss/ws/integration/sunri/SunJaxwsDeployer.java 2007-05-18 09:01:49 UTC (rev 3131) @@ -19,7 +19,7 @@ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA * 02110-1301 USA, or see the FSF site: http://www.fsf.org. */ -package org.jboss.ws.integration.jboss50.sunri; +package org.jboss.ws.integration.sunri; //$Id$ @@ -32,8 +32,8 @@ import org.jboss.ws.integration.Endpoint; import org.jboss.ws.integration.deployment.AbstractDeployer; import org.jboss.ws.integration.deployment.Deployment; -import org.jboss.ws.integration.jboss50.sunri.metadata.sunjaxws.DDEndpoint; -import org.jboss.ws.integration.jboss50.sunri.metadata.sunjaxws.DDEndpoints; +import org.jboss.ws.integration.sunri.metadata.sunjaxws.DDEndpoint; +import org.jboss.ws.integration.sunri.metadata.sunjaxws.DDEndpoints; /** * A deployer that generates sun-jaxws.xml Modified: branches/tdiesler/trunk/integration/sunri/src/main/java/org/jboss/ws/integration/sunri/VirtualFileResourceLoader.java =================================================================== --- branches/tdiesler/trunk/integration/sunri/src/main/java/org/jboss/ws/integration/jboss50/sunri/VirtualFileResourceLoader.java 2007-05-17 21:56:56 UTC (rev 3130) +++ branches/tdiesler/trunk/integration/sunri/src/main/java/org/jboss/ws/integration/sunri/VirtualFileResourceLoader.java 2007-05-18 09:01:49 UTC (rev 3131) @@ -19,7 +19,7 @@ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA * 02110-1301 USA, or see the FSF site: http://www.fsf.org. */ -package org.jboss.ws.integration.jboss50.sunri; +package org.jboss.ws.integration.sunri; //$Id$ Modified: branches/tdiesler/trunk/integration/sunri/src/main/java/org/jboss/ws/integration/sunri/WSEndpointServlet.java =================================================================== --- branches/tdiesler/trunk/integration/sunri/src/main/java/org/jboss/ws/integration/jboss50/sunri/WSEndpointServlet.java 2007-05-17 21:56:56 UTC (rev 3130) +++ branches/tdiesler/trunk/integration/sunri/src/main/java/org/jboss/ws/integration/sunri/WSEndpointServlet.java 2007-05-18 09:01:49 UTC (rev 3131) @@ -19,7 +19,7 @@ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA * 02110-1301 USA, or see the FSF site: http://www.fsf.org. */ -package org.jboss.ws.integration.jboss50.sunri; +package org.jboss.ws.integration.sunri; // $Id$ Modified: branches/tdiesler/trunk/integration/sunri/src/main/java/org/jboss/ws/integration/sunri/WSServletContextListener.java =================================================================== --- branches/tdiesler/trunk/integration/sunri/src/main/java/org/jboss/ws/integration/jboss50/sunri/WSServletContextListener.java 2007-05-17 21:56:56 UTC (rev 3130) +++ branches/tdiesler/trunk/integration/sunri/src/main/java/org/jboss/ws/integration/sunri/WSServletContextListener.java 2007-05-18 09:01:49 UTC (rev 3131) @@ -19,7 +19,7 @@ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA * 02110-1301 USA, or see the FSF site: http://www.fsf.org. */ -package org.jboss.ws.integration.jboss50.sunri; +package org.jboss.ws.integration.sunri; // $Id$ Modified: branches/tdiesler/trunk/integration/sunri/src/main/java/org/jboss/ws/integration/sunri/metadata/sunjaxws/DDEndpoint.java =================================================================== --- branches/tdiesler/trunk/integration/sunri/src/main/java/org/jboss/ws/integration/jboss50/sunri/metadata/sunjaxws/DDEndpoint.java 2007-05-17 21:56:56 UTC (rev 3130) +++ branches/tdiesler/trunk/integration/sunri/src/main/java/org/jboss/ws/integration/sunri/metadata/sunjaxws/DDEndpoint.java 2007-05-18 09:01:49 UTC (rev 3131) @@ -19,7 +19,7 @@ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA * 02110-1301 USA, or see the FSF site: http://www.fsf.org. */ -package org.jboss.ws.integration.jboss50.sunri.metadata.sunjaxws; +package org.jboss.ws.integration.sunri.metadata.sunjaxws; import java.io.IOException; import java.io.Writer; Modified: branches/tdiesler/trunk/integration/sunri/src/main/java/org/jboss/ws/integration/sunri/metadata/sunjaxws/DDEndpoints.java =================================================================== --- branches/tdiesler/trunk/integration/sunri/src/main/java/org/jboss/ws/integration/jboss50/sunri/metadata/sunjaxws/DDEndpoints.java 2007-05-17 21:56:56 UTC (rev 3130) +++ branches/tdiesler/trunk/integration/sunri/src/main/java/org/jboss/ws/integration/sunri/metadata/sunjaxws/DDEndpoints.java 2007-05-18 09:01:49 UTC (rev 3131) @@ -19,7 +19,7 @@ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA * 02110-1301 USA, or see the FSF site: http://www.fsf.org. */ -package org.jboss.ws.integration.jboss50.sunri.metadata.sunjaxws; +package org.jboss.ws.integration.sunri.metadata.sunjaxws; import java.io.File; import java.io.FileOutputStream; Modified: branches/tdiesler/trunk/integration/sunri/src/main/java/org/jboss/ws/integration/sunri/metadata/sunjaxws/DDHandler.java =================================================================== --- branches/tdiesler/trunk/integration/sunri/src/main/java/org/jboss/ws/integration/jboss50/sunri/metadata/sunjaxws/DDHandler.java 2007-05-17 21:56:56 UTC (rev 3130) +++ branches/tdiesler/trunk/integration/sunri/src/main/java/org/jboss/ws/integration/sunri/metadata/sunjaxws/DDHandler.java 2007-05-18 09:01:49 UTC (rev 3131) @@ -19,7 +19,7 @@ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA * 02110-1301 USA, or see the FSF site: http://www.fsf.org. */ -package org.jboss.ws.integration.jboss50.sunri.metadata.sunjaxws; +package org.jboss.ws.integration.sunri.metadata.sunjaxws; import java.io.IOException; import java.io.Writer; Modified: branches/tdiesler/trunk/integration/sunri/src/main/java/org/jboss/ws/integration/sunri/metadata/sunjaxws/DDHandlerChain.java =================================================================== --- branches/tdiesler/trunk/integration/sunri/src/main/java/org/jboss/ws/integration/jboss50/sunri/metadata/sunjaxws/DDHandlerChain.java 2007-05-17 21:56:56 UTC (rev 3130) +++ branches/tdiesler/trunk/integration/sunri/src/main/java/org/jboss/ws/integration/sunri/metadata/sunjaxws/DDHandlerChain.java 2007-05-18 09:01:49 UTC (rev 3131) @@ -19,7 +19,7 @@ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA * 02110-1301 USA, or see the FSF site: http://www.fsf.org. */ -package org.jboss.ws.integration.jboss50.sunri.metadata.sunjaxws; +package org.jboss.ws.integration.sunri.metadata.sunjaxws; import java.io.IOException; import java.io.Writer; Copied: branches/tdiesler/trunk/integration/sunri/src/main/resources/jbossws-jboss50.deployer (from rev 3130, branches/tdiesler/trunk/integration/sunri/src/main/resources/jbossws.deployer) Copied: branches/tdiesler/trunk/integration/sunri/src/main/resources/jbossws-jboss50.sar (from rev 3130, branches/tdiesler/trunk/integration/sunri/src/main/resources/jbossws.sar) 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.sar/META-INF/jbossws-beans.xml 2007-05-17 21:56:56 UTC (rev 3130) +++ branches/tdiesler/trunk/integration/sunri/src/main/resources/jbossws-jboss50.sar/META-INF/jbossws-beans.xml 2007-05-18 09:01:49 UTC (rev 3131) @@ -26,7 +26,7 @@ </bean>  - <bean name="WSEndpointRegistry" class="org.jboss.ws.integration.jboss50.sunri.ManagedEndpointRegistry"/> + <bean name="WSEndpointRegistry" class="org.jboss.ws.integration.sunri.ManagedEndpointRegistry"/>   @@ -117,28 +117,31 @@ Each handles a single aspect of web service deployment --> <bean name="WSEndpointHandlerDeployer" class="org.jboss.ws.integration.deployment.EndpointHandlerDeployer"> - <property name="requestHandler">org.jboss.ws.integration.jboss50.sunri.RequestHandlerImpl</property> - <property name="lifecycleHandler">org.jboss.ws.integration.jboss50.sunri.LifecycleHandlerImpl</property> + <property name="requestHandler">org.jboss.ws.integration.sunri.RequestHandlerImpl</property> + <property name="lifecycleHandler">org.jboss.ws.integration.sunri.LifecycleHandlerImpl</property> <property name="invocationHandler"> <map keyClass="java.lang.String" valueClass="java.lang.String"> - <entry><key>JAXWS_JSE</key><value>org.jboss.ws.integration.jboss50.sunri.InvocationHandlerJSE</value></entry> + <entry><key>JAXWS_JSE</key><value>org.jboss.ws.integration.invocation.InvocationHandlerJSE</value></entry> + <entry><key>JAXWS_EJB3</key><value>org.jboss.ws.integration.jboss50.InvocationHandlerEJB3</value></entry> </map> </property> </bean> <bean name="WSEndpointLifecycleDeployer" class="org.jboss.ws.integration.deployment.EndpointLifecycleDeployer"/> - <bean name="WSEndpointNameDeployer" class="org.jboss.ws.integration.jboss50.sunri.EndpointNameDeployer"/> + <bean name="WSEndpointNameDeployer" class="org.jboss.ws.integration.sunri.EndpointNameDeployer"/> <bean name="WSEndpointRegistryDeployer" class="org.jboss.ws.integration.deployment.EndpointRegistryDeployer"/> - <bean name="WSModifyWebMetaDataDeployer" class="org.jboss.ws.integration.jboss50.sunri.ModifyWebMetaDataDeployer"> - <property name="listenerClass">org.jboss.ws.integration.jboss50.sunri.WSServletContextListener</property> - <property name="servletClass">org.jboss.ws.integration.jboss50.sunri.WSEndpointServlet</property> + <bean name="WSModifyWebMetaDataDeployer" class="org.jboss.ws.integration.sunri.ModifyWebMetaDataDeployer"> + <property name="listenerClass">org.jboss.ws.integration.sunri.WSServletContextListener</property> + <property name="servletClass">org.jboss.ws.integration.sunri.WSEndpointServlet</property> </bean> - <bean name="WSSunJaxwsDeployer" class="org.jboss.ws.integration.jboss50.sunri.SunJaxwsDeployer"/> + <bean name="WSSunJaxwsDeployer" class="org.jboss.ws.integration.sunri.SunJaxwsDeployer"/> <bean name="WSUnifiedDeploymentInfoDeployer" class="org.jboss.ws.integration.jboss50.UnifiedDeploymentInfoDeployer"/>  <bean name="WSDeployerHook_JAXRPC_JSE" class="org.jboss.ws.integration.jboss50.JAXRPCDeployerHookJSE"> + <property name="deploymentClass">org.jboss.ws.integration.deployment.BasicDeployment</property> + <property name="endpointClass">org.jboss.ws.integration.BasicEndpoint</property> <property name="deployerManager"><inject bean="WSDeployerManagerJSE"/></property> <install bean="WebServiceDeployerJSE" method="addDeployerHook"> <parameter> @@ -153,6 +156,8 @@ <depends>WebServiceDeployerJSE</depends> </bean> <bean name="WSDeployerHook_JAXRPC_EJB21" class="org.jboss.ws.integration.jboss50.JAXRPCDeployerHookEJB21"> + <property name="deploymentClass">org.jboss.ws.integration.deployment.BasicDeployment</property> + <property name="endpointClass">org.jboss.ws.integration.BasicEndpoint</property> <property name="deployerManager"><inject bean="WSDeployerManagerEJB"/></property> <install bean="WebServiceDeployerEJB" method="addDeployerHook"> <parameter> @@ -167,6 +172,8 @@ <depends>WebServiceDeployerEJB</depends> </bean> <bean name="WSDeployerHook_JAXWS_JSE" class="org.jboss.ws.integration.jboss50.JAXWSDeployerHookJSE"> + <property name="deploymentClass">org.jboss.ws.integration.deployment.BasicDeployment</property> + <property name="endpointClass">org.jboss.ws.integration.BasicEndpoint</property> <property name="deployerManager"><inject bean="WSDeployerManagerJSE"/></property> <install bean="WebServiceDeployerJSE" method="addDeployerHook"> <parameter> @@ -181,6 +188,8 @@ <depends>WebServiceDeployerJSE</depends> </bean> <bean name="WSDeployerHook_JAXWS_EJB3" class="org.jboss.ws.integration.jboss50.JAXWSDeployerHookEJB3"> + <property name="deploymentClass">org.jboss.ws.integration.deployment.BasicDeployment</property> + <property name="endpointClass">org.jboss.ws.integration.BasicEndpoint</property> <property name="deployerManager"><inject bean="WSDeployerManagerEJB"/></property> <install bean="WebServiceDeployerEJB" method="addDeployerHook"> <parameter> Copied: branches/tdiesler/trunk/integration/sunri/src/test/resources/excludes-jboss50.txt (from rev 3130, branches/tdiesler/trunk/integration/sunri/src/test/resources/excludes.txt) =================================================================== --- branches/tdiesler/trunk/integration/sunri/src/test/resources/excludes-jboss50.txt (rev 0) +++ branches/tdiesler/trunk/integration/sunri/src/test/resources/excludes-jboss50.txt 2007-05-18 09:01:49 UTC (rev 3131) @@ -0,0 +1,2 @@ + +# Nothing to exclude Deleted: branches/tdiesler/trunk/integration/sunri/src/test/resources/excludes.txt =================================================================== --- branches/tdiesler/trunk/integration/sunri/src/test/resources/excludes.txt 2007-05-17 21:56:56 UTC (rev 3130) +++ branches/tdiesler/trunk/integration/sunri/src/test/resources/excludes.txt 2007-05-18 09:01:49 UTC (rev 3131) @@ -1,2 +0,0 @@ - -# Nothing to exclude Modified: branches/tdiesler/trunk/jbossws-core/.classpath =================================================================== --- branches/tdiesler/trunk/jbossws-core/.classpath 2007-05-17 21:56:56 UTC (rev 3130) +++ branches/tdiesler/trunk/jbossws-core/.classpath 2007-05-18 09:01:49 UTC (rev 3131) @@ -4,7 +4,6 @@ <classpathentry excluding="org/jboss/test/ws/jaxrpc/samples/jmstransport/" kind="src" path="src/test/java"/> <classpathentry kind="src" path="output-tests/wsconsume/java"/> <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/> - <classpathentry combineaccessrules="false" kind="src" path="/spi"/> <classpathentry kind="lib" path="thirdparty/activation.jar"/> <classpathentry kind="lib" path="thirdparty/getopt.jar"/> <classpathentry kind="lib" path="thirdparty/javassist.jar"/> @@ -30,8 +29,9 @@ <classpathentry kind="lib" path="thirdparty/ant.jar"/> <classpathentry kind="lib" path="thirdparty/qdox.jar"/> <classpathentry kind="lib" path="thirdparty/xmlunit1.0.jar"/> - <classpathentry kind="lib" path="/spi/thirdparty/junit.jar"/> <classpathentry kind="lib" path="thirdparty/policy.jar"/> <classpathentry kind="con" path="org.eclipse.jdt.USER_LIBRARY/jboss-5.0.x"/> + <classpathentry combineaccessrules="false" kind="src" path="/integration-spi"/> + <classpathentry kind="lib" path="/integration-spi/thirdparty/junit.jar"/> <classpathentry kind="output" path="output-eclipse"/> </classpath> Modified: branches/tdiesler/trunk/jbossws-core/.project =================================================================== --- branches/tdiesler/trunk/jbossws-core/.project 2007-05-17 21:56:56 UTC (rev 3130) +++ branches/tdiesler/trunk/jbossws-core/.project 2007-05-18 09:01:49 UTC (rev 3131) @@ -1,6 +1,6 @@ <?xml version="1.0" encoding="UTF-8"?> <projectDescription> - <name>jbossws</name> + <name>jbossws-core</name> <comment></comment> <projects> </projects> Modified: branches/tdiesler/trunk/testsuite/.classpath =================================================================== --- branches/tdiesler/trunk/testsuite/.classpath 2007-05-17 21:56:56 UTC (rev 3130) +++ branches/tdiesler/trunk/testsuite/.classpath 2007-05-18 09:01:49 UTC (rev 3131) @@ -3,11 +3,12 @@ <classpathentry excluding="org/jboss/test/ws/jaxrpc/samples/jmstransport/OrganizationJMSEndpoint.java" kind="src" path="src/java"/> <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/> <classpathentry kind="con" path="org.eclipse.jdt.USER_LIBRARY/jboss-5.0.x"/> - <classpathentry combineaccessrules="false" kind="src" path="/spi"/> - <classpathentry kind="lib" path="/spi/thirdparty/junit.jar"/> - <classpathentry kind="lib" path="/spi/thirdparty/jaxws-api.jar"/> - <classpathentry kind="lib" path="/spi/thirdparty/jboss-logging-spi.jar"/> - <classpathentry kind="lib" path="/spi/thirdparty/jsr181-api.jar"/> - <classpathentry kind="lib" path="/spi/thirdparty/servlet-api.jar"/> + <classpathentry combineaccessrules="false" kind="src" path="/integration-spi"/> + <classpathentry kind="lib" path="/integration-spi/thirdparty/jaxrpc-api.jar"/> + <classpathentry kind="lib" path="/integration-spi/thirdparty/jaxws-api.jar"/> + <classpathentry kind="lib" path="/integration-spi/thirdparty/jboss-logging-spi.jar"/> + <classpathentry kind="lib" path="/integration-spi/thirdparty/jsr181-api.jar"/> + <classpathentry kind="lib" path="/integration-spi/thirdparty/saaj-api.jar"/> + <classpathentry kind="lib" path="/integration-spi/thirdparty/junit.jar"/> <classpathentry kind="output" path="output-eclipse"/> </classpath> Modified: branches/tdiesler/trunk/testsuite/ant-import/build-jars-jaxws.xml =================================================================== --- branches/tdiesler/trunk/testsuite/ant-import/build-jars-jaxws.xml 2007-05-17 21:56:56 UTC (rev 3130) +++ branches/tdiesler/trunk/testsuite/ant-import/build-jars-jaxws.xml 2007-05-18 09:01:49 UTC (rev 3131) @@ -39,7 +39,7 @@ </jar> <jar jarfile="${tests.output.dir}/libs/jaxws-eardeployment.ear"> <fileset dir="${tests.output.dir}/libs"> - <include name="jaxws-eardeployment.jar"/> +  <include name="jaxws-eardeployment.war"/> </fileset> <metainf dir="${tests.output.dir}/resources/jaxws/eardeployment/META-INF"> Modified: branches/tdiesler/trunk/testsuite/src/java/org/jboss/test/ws/jaxws/eardeployment/EarTestCase.java =================================================================== --- branches/tdiesler/trunk/testsuite/src/java/org/jboss/test/ws/jaxws/eardeployment/EarTestCase.java 2007-05-17 21:56:56 UTC (rev 3130) +++ branches/tdiesler/trunk/testsuite/src/java/org/jboss/test/ws/jaxws/eardeployment/EarTestCase.java 2007-05-18 09:01:49 UTC (rev 3131) @@ -45,7 +45,7 @@ return JBossWSTestSetup.newTestSetup(EarTestCase.class, earName); } - public void testEJB3Endpoint() throws Exception + public void _testEJB3Endpoint() throws Exception { URL wsdlURL = new URL("http://" + getServerHost() + ":8080/earejb3/EJB3Bean?wsdl"); QName serviceName = new QName("http://eardeployment.jaxws.ws.test.jboss.org/", "TestEndpointService");

18 years, 11 months

1
0
0 / 0

JBossWS SVN: r3130 - branches/tdiesler/trunk/build/ant-import.

by jbossws-commits＠lists.jboss.org

Author: thomas.diesler(a)jboss.com Date: 2007-05-17 17:56:56 -0400 (Thu, 17 May 2007) New Revision: 3130 Modified: branches/tdiesler/trunk/build/ant-import/build-setup.xml Log: Modified: branches/tdiesler/trunk/build/ant-import/build-setup.xml =================================================================== --- branches/tdiesler/trunk/build/ant-import/build-setup.xml 2007-05-17 21:51:17 UTC (rev 3129) +++ branches/tdiesler/trunk/build/ant-import/build-setup.xml 2007-05-17 21:56:56 UTC (rev 3130) @@ -19,12 +19,12 @@ <property name="build.dir" value="${basedir}/build"/> <property name="spi.dir" value="${basedir}/integration/spi"/> - <property name="core.dir" value="${basedir}/jbossws"/> + <property name="core.dir" value="${basedir}/jbossws-core"/> <property name="testsuite.dir" value="${basedir}/testsuite"/> <property name="int.jboss50.dir" value="${basedir}/integration/jboss50"/> <property name="int.jboss42.dir" value="${basedir}/integration/jboss42"/> - <property name="int.jbws.dir" value="${basedir}/integration/jbws-jboss50"/> - <property name="int.sunri.dir" value="${basedir}/integration/sunri-jboss50"/> + <property name="int.jbws.dir" value="${basedir}/integration/jbws"/> + <property name="int.sunri.dir" value="${basedir}/integration/sunri"/> <property file="${build.dir}/ant.properties"/> <property file="${build.dir}/version.properties"/>

18 years, 11 months

1
0
0 / 0

JBossWS SVN: r3129 - branches/tdiesler/trunk.

by jbossws-commits＠lists.jboss.org

Author: thomas.diesler(a)jboss.com Date: 2007-05-17 17:51:17 -0400 (Thu, 17 May 2007) New Revision: 3129 Added: branches/tdiesler/trunk/jbossws-core/ Removed: branches/tdiesler/trunk/jbossws/ Log: Copied: branches/tdiesler/trunk/jbossws-core (from rev 3128, branches/tdiesler/trunk/jbossws)

18 years, 11 months

1
0
0 / 0

JBossWS SVN: r3128 - branches/tdiesler/trunk/integration.

by jbossws-commits＠lists.jboss.org

Author: thomas.diesler(a)jboss.com Date: 2007-05-17 17:48:57 -0400 (Thu, 17 May 2007) New Revision: 3128 Added: branches/tdiesler/trunk/integration/sunri/ Removed: branches/tdiesler/trunk/integration/sunri-jboss50/ Log: Copied: branches/tdiesler/trunk/integration/sunri (from rev 3127, branches/tdiesler/trunk/integration/sunri-jboss50)

18 years, 11 months

1
0
0 / 0

JBossWS SVN: r3127 - branches/tdiesler/trunk/integration.

by jbossws-commits＠lists.jboss.org

Author: thomas.diesler(a)jboss.com Date: 2007-05-17 17:48:36 -0400 (Thu, 17 May 2007) New Revision: 3127 Added: branches/tdiesler/trunk/integration/jbws/ Removed: branches/tdiesler/trunk/integration/jbws-jboss50/ Log: Copied: branches/tdiesler/trunk/integration/jbws (from rev 3126, branches/tdiesler/trunk/integration/jbws-jboss50)

18 years, 11 months

1
0
0 / 0

JBossWS SVN: r3126 - branches/tdiesler/trunk/integration.

by jbossws-commits＠lists.jboss.org

Author: thomas.diesler(a)jboss.com Date: 2007-05-17 17:47:28 -0400 (Thu, 17 May 2007) New Revision: 3126 Removed: branches/tdiesler/trunk/integration/jbws-jboss42/ Log:

18 years, 11 months

1
0
0 / 0

2026

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

jbossws-commits May 2007