[jbossws-commits] JBossWS SVN: r4081 - in trunk: build/ant-import and 35 other directories.
jbossws-commits at lists.jboss.org
jbossws-commits at lists.jboss.org
Thu Aug 2 05:23:17 EDT 2007
Author: thomas.diesler at jboss.com
Date: 2007-08-02 05:23:17 -0400 (Thu, 02 Aug 2007)
New Revision: 4081
Added:
trunk/integration/spi/ant-import/macros-deploy-wsf.xml
trunk/integration/spi/src/main/java/org/jboss/wsf/framework/serviceref/DefaultServiceRefMetaDataParser.java
trunk/integration/spi/src/main/java/org/jboss/wsf/framework/serviceref/DefaultServiceRefMetaDataParserFactory.java
Removed:
trunk/integration/spi/ant-import/macros-deploy-spi.xml
trunk/integration/spi/src/main/java/org/jboss/wsf/common/KernelLocator.java
trunk/integration/spi/src/main/java/org/jboss/wsf/common/ServiceLoader.java
trunk/integration/spi/src/main/java/org/jboss/wsf/spi/
Modified:
trunk/build/ant-import/build-release.xml
trunk/build/ant-import/build-samples.xml
trunk/build/ant-import/build-setup.xml
trunk/build/build.xml
trunk/build/version.properties
trunk/integration/jboss40/.classpath
trunk/integration/jboss40/ant-import/build-thirdparty.xml
trunk/integration/jboss40/src/main/java/org/jboss/wsf/container/jboss40/ServiceRefMetaDataAdapterFactory.java
trunk/integration/jboss40/src/main/resources/jbossws-jboss40-config.xml
trunk/integration/jboss42/.classpath
trunk/integration/jboss42/ant-import/build-thirdparty.xml
trunk/integration/jboss42/build.xml
trunk/integration/jboss42/src/main/java/org/jboss/ws/integration/KernelLocator.java
trunk/integration/jboss42/src/main/resources/jbossws-jboss42-config.xml
trunk/integration/jboss50/.classpath
trunk/integration/jboss50/ant-import/build-thirdparty.xml
trunk/integration/jboss50/build.xml
trunk/integration/jboss50/src/main/resources/jbossws-jboss50.deployer/META-INF/jbossws-deployer-beans.xml
trunk/integration/native/.classpath
trunk/integration/native/ant-import/build-bin-dist.xml
trunk/integration/native/ant-import/build-deploy.xml
trunk/integration/native/ant-import/build-testsuite.xml
trunk/integration/native/ant-import/build-thirdparty.xml
trunk/integration/native/ant-import/macros-deploy-native.xml
trunk/integration/native/build.xml
trunk/integration/native/src/main/etc/bin-dist-build.xml
trunk/integration/spi/.classpath
trunk/integration/spi/ant-import/build-release.xml
trunk/integration/spi/ant-import/build-thirdparty.xml
trunk/integration/spi/build.xml
trunk/integration/spi/src/main/etc/component-info.xml
trunk/integration/spi/src/main/java/org/jboss/wsf/common/KernelAwareSPIFactory.java
trunk/integration/spi/src/main/java/org/jboss/wsf/framework/DefaultSPIProviderResolver.java
trunk/integration/sunri/.classpath
trunk/integration/sunri/ant-import/build-bin-dist.xml
trunk/integration/sunri/ant-import/build-deploy.xml
trunk/integration/sunri/ant-import/build-testsuite.xml
trunk/integration/sunri/ant-import/build-thirdparty.xml
trunk/integration/sunri/build.xml
trunk/integration/sunri/src/main/etc/bin-dist-build.xml
trunk/integration/xfire/.classpath
trunk/integration/xfire/ant-import/build-bin-dist.xml
trunk/integration/xfire/ant-import/build-deploy.xml
trunk/integration/xfire/ant-import/build-testsuite.xml
trunk/integration/xfire/ant-import/build-thirdparty.xml
trunk/integration/xfire/ant-import/macros-deploy-xfire.xml
trunk/integration/xfire/build.xml
trunk/integration/xfire/src/main/etc/bin-dist-build.xml
trunk/jbossws-core/.classpath
trunk/jbossws-core/ant-import-tests/build-testsuite.xml
trunk/jbossws-core/ant-import/build-thirdparty.xml
trunk/jbossws-core/build.xml
trunk/jbossws-core/src/main/java/org/jboss/ws/core/jaxws/JAXBContextFactory.java
trunk/jbossws-core/src/main/java/org/jboss/ws/core/jaxws/handler/LogicalMessageImpl.java
trunk/jbossws-core/src/main/java/org/jboss/ws/core/soap/MessageFactoryImpl.java
trunk/jbossws-core/src/main/java/org/jboss/ws/core/soap/SOAPPartImpl.java
trunk/jbossws-core/src/main/java/org/jboss/ws/extensions/eventing/mgmt/SubscriptionManagerFactory.java
trunk/testsuite/.classpath
Log:
Externalize jbossws-spi.jar
Modified: trunk/build/ant-import/build-release.xml
===================================================================
--- trunk/build/ant-import/build-release.xml 2007-08-02 09:09:47 UTC (rev 4080)
+++ trunk/build/ant-import/build-release.xml 2007-08-02 09:23:17 UTC (rev 4081)
@@ -36,7 +36,7 @@
</target>
<target name="release-to-repository" depends="prepare" description="Release to local repository">
- <ant antfile="${spi.dir}/build.xml" target="release" inheritall="false"/>
+ <ant antfile="${framework.dir}/build.xml" target="release" inheritall="false"/>
<ant antfile="${core.dir}/build.xml" target="release" inheritall="false"/>
<ant antfile="${int.jboss50.dir}/build.xml" target="release" inheritall="false"/>
<ant antfile="${int.jboss42.dir}/build.xml" target="release" inheritall="false"/>
Modified: trunk/build/ant-import/build-samples.xml
===================================================================
--- trunk/build/ant-import/build-samples.xml 2007-08-02 09:09:47 UTC (rev 4080)
+++ trunk/build/ant-import/build-samples.xml 2007-08-02 09:23:17 UTC (rev 4081)
@@ -67,7 +67,6 @@
<mkdir dir="${build.src.samples.dir}/lib"/>
<copy todir="${build.src.samples.dir}/lib">
<fileset dir="${core.output.lib.dir}">
- <include name="jbossws-spi.jar"/>
<include name="jbossws-client.jar"/>
<include name="jbossws-core.jar"/>
<include name="jboss-jaxrpc.jar"/>
Modified: trunk/build/ant-import/build-setup.xml
===================================================================
--- trunk/build/ant-import/build-setup.xml 2007-08-02 09:09:47 UTC (rev 4080)
+++ trunk/build/ant-import/build-setup.xml 2007-08-02 09:23:17 UTC (rev 4081)
@@ -18,7 +18,7 @@
<!-- ================================================================== -->
<property name="build.dir" value="${basedir}/build"/>
- <property name="spi.dir" value="${basedir}/integration/spi"/>
+ <property name="framework.dir" value="${basedir}/integration/spi"/>
<property name="core.dir" value="${basedir}/jbossws-core"/>
<property name="testsuite.dir" value="${basedir}/testsuite"/>
<property name="int.jboss50.dir" value="${basedir}/integration/jboss50"/>
Modified: trunk/build/build.xml
===================================================================
--- trunk/build/build.xml 2007-08-02 09:09:47 UTC (rev 4080)
+++ trunk/build/build.xml 2007-08-02 09:23:17 UTC (rev 4081)
@@ -113,7 +113,7 @@
| Build all jar files.
-->
<target name="jars" depends="prepare" description="Builds all jar files.">
- <ant antfile="${spi.dir}/build.xml" target="jars" inheritall="false"/>
+ <ant antfile="${framework.dir}/build.xml" target="jars" inheritall="false"/>
<ant antfile="${core.dir}/build.xml" target="jars" inheritall="false"/>
</target>
@@ -123,7 +123,7 @@
<target name="clean" depends="prepare" description="Cleans up most generated files.">
<delete dir="${build.dir}/output"/>
- <ant antfile="${spi.dir}/build.xml" target="clean" inheritall="false"/>
+ <ant antfile="${framework.dir}/build.xml" target="clean" inheritall="false"/>
<ant antfile="${core.dir}/build.xml" target="clean" inheritall="false"/>
<ant antfile="${int.jboss50.dir}/build.xml" target="clean" inheritall="false"/>
<ant antfile="${int.jboss42.dir}/build.xml" target="clean" inheritall="false"/>
@@ -136,7 +136,7 @@
<target name="clobber" depends="prepare" description="Cleans up all generated files.">
<delete dir="${build.dir}/output"/>
- <ant antfile="${spi.dir}/build.xml" target="clobber" inheritall="false"/>
+ <ant antfile="${framework.dir}/build.xml" target="clobber" inheritall="false"/>
<ant antfile="${core.dir}/build.xml" target="clobber" inheritall="false"/>
<ant antfile="${testsuite.dir}/build.xml" target="clobber" inheritall="false"/>
<ant antfile="${int.jboss50.dir}/build.xml" target="clobber" inheritall="false"/>
Modified: trunk/build/version.properties
===================================================================
--- trunk/build/version.properties 2007-08-02 09:09:47 UTC (rev 4080)
+++ trunk/build/version.properties 2007-08-02 09:23:17 UTC (rev 4081)
@@ -24,6 +24,7 @@
jboss-jaxr=1.2.0.GA
jboss-jbossxb=1.0.0.GA-brew
jboss-microcontainer=2.0.0.Beta3
+jbossws-spi=2.0.1.CR1
junit=3.8.1
stax-api=1.0
sun-jaf=1.1
Modified: trunk/integration/jboss40/.classpath
===================================================================
--- trunk/integration/jboss40/.classpath 2007-08-02 09:09:47 UTC (rev 4080)
+++ trunk/integration/jboss40/.classpath 2007-08-02 09:23:17 UTC (rev 4081)
@@ -11,5 +11,6 @@
<classpathentry kind="con" path="org.eclipse.jdt.USER_LIBRARY/jboss-4.0.x"/>
<classpathentry combineaccessrules="false" kind="src" path="/integration-jboss42"/>
<classpathentry combineaccessrules="false" kind="src" path="/jbossws-core"/>
+ <classpathentry combineaccessrules="false" kind="src" path="/spi"/>
<classpathentry kind="output" path="output/eclipse"/>
</classpath>
Modified: trunk/integration/jboss40/ant-import/build-thirdparty.xml
===================================================================
--- trunk/integration/jboss40/ant-import/build-thirdparty.xml 2007-08-02 09:09:47 UTC (rev 4080)
+++ trunk/integration/jboss40/ant-import/build-thirdparty.xml 2007-08-02 09:23:17 UTC (rev 4081)
@@ -32,12 +32,13 @@
<!-- The compile classpath for jboss40 integration -->
<path id="jbws40.integration.classpath">
- <pathelement location="${spi.dir}/output/lib/jbossws-spi.jar"/>
<pathelement location="${core.dir}/output/lib/jbossws-core.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"/>
- <pathelement location="${spi.dir}/thirdparty/saaj-api.jar"/>
+ <pathelement location="${framework.dir}/output/lib/jbossws-framework.jar"/>
+ <pathelement location="${framework.dir}/thirdparty/jbossws-spi.jar"/>
+ <pathelement location="${framework.dir}/thirdparty/jaxws-api.jar"/>
+ <pathelement location="${framework.dir}/thirdparty/jaxrpc-api.jar"/>
+ <pathelement location="${framework.dir}/thirdparty/jsr181-api.jar"/>
+ <pathelement location="${framework.dir}/thirdparty/saaj-api.jar"/>
<pathelement location="${jboss40.lib}/jboss-common.jar"/>
<pathelement location="${jboss40.lib}/jboss-jmx.jar"/>
<pathelement location="${jboss40.lib}/jboss-system.jar"/>
Modified: trunk/integration/jboss40/src/main/java/org/jboss/wsf/container/jboss40/ServiceRefMetaDataAdapterFactory.java
===================================================================
--- trunk/integration/jboss40/src/main/java/org/jboss/wsf/container/jboss40/ServiceRefMetaDataAdapterFactory.java 2007-08-02 09:09:47 UTC (rev 4080)
+++ trunk/integration/jboss40/src/main/java/org/jboss/wsf/container/jboss40/ServiceRefMetaDataAdapterFactory.java 2007-08-02 09:23:17 UTC (rev 4081)
@@ -25,7 +25,7 @@
import org.jboss.kernel.spi.registry.KernelRegistry;
import org.jboss.kernel.spi.registry.KernelRegistryEntry;
-import org.jboss.wsf.common.KernelLocator;
+import org.jboss.wsf.spi.util.KernelLocator;
/**
* @author Thomas.Diesler at jboss.org
Modified: trunk/integration/jboss40/src/main/resources/jbossws-jboss40-config.xml
===================================================================
--- trunk/integration/jboss40/src/main/resources/jbossws-jboss40-config.xml 2007-08-02 09:09:47 UTC (rev 4080)
+++ trunk/integration/jboss40/src/main/resources/jbossws-jboss40-config.xml 2007-08-02 09:23:17 UTC (rev 4081)
@@ -1,6 +1,6 @@
<!-- Locate the single instance of the kernel -->
- <bean name="WSKernelLocator" class="org.jboss.wsf.common.KernelLocator">
+ <bean name="WSKernelLocator" class="org.jboss.wsf.spi.util.KernelLocator">
<property name="kernel"><inject bean="jboss.kernel:service=Kernel"/></property>
</bean>
@@ -12,9 +12,6 @@
<property name="mbeanServer"><inject bean="WSMBeanServerLocator" property="mbeanServer"/></property>
</bean>
- <!-- Bind Service objects in client environment context -->
- <bean name="ServiceRefHandler" class="org.jboss.wsf.container.jboss42.serviceref.ServiceRefHandlerImpl"/>
-
<!--
*********************************************************************************************************************
Web Service deployment
Modified: trunk/integration/jboss42/.classpath
===================================================================
--- trunk/integration/jboss42/.classpath 2007-08-02 09:09:47 UTC (rev 4080)
+++ trunk/integration/jboss42/.classpath 2007-08-02 09:23:17 UTC (rev 4081)
@@ -9,5 +9,6 @@
<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/dom4j.jar"/>
+ <classpathentry combineaccessrules="false" kind="src" path="/spi"/>
<classpathentry kind="output" path="output/eclipse"/>
</classpath>
Modified: trunk/integration/jboss42/ant-import/build-thirdparty.xml
===================================================================
--- trunk/integration/jboss42/ant-import/build-thirdparty.xml 2007-08-02 09:09:47 UTC (rev 4080)
+++ trunk/integration/jboss42/ant-import/build-thirdparty.xml 2007-08-02 09:23:17 UTC (rev 4081)
@@ -32,11 +32,12 @@
<!-- The compile classpath for jboss42 integration -->
<path id="jbws42.integration.classpath">
- <pathelement location="${spi.dir}/output/lib/jbossws-spi.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"/>
- <pathelement location="${spi.dir}/thirdparty/saaj-api.jar"/>
+ <pathelement location="${framework.dir}/output/lib/jbossws-framework.jar"/>
+ <pathelement location="${framework.dir}/thirdparty/jbossws-spi.jar"/>
+ <pathelement location="${framework.dir}/thirdparty/jaxws-api.jar"/>
+ <pathelement location="${framework.dir}/thirdparty/jaxrpc-api.jar"/>
+ <pathelement location="${framework.dir}/thirdparty/jsr181-api.jar"/>
+ <pathelement location="${framework.dir}/thirdparty/saaj-api.jar"/>
<pathelement location="${jboss42.lib}/jboss-common.jar"/>
<pathelement location="${jboss42.lib}/jboss-jmx.jar"/>
<pathelement location="${jboss42.lib}/jboss-system.jar"/>
Modified: trunk/integration/jboss42/build.xml
===================================================================
--- trunk/integration/jboss42/build.xml 2007-08-02 09:09:47 UTC (rev 4080)
+++ trunk/integration/jboss42/build.xml 2007-08-02 09:23:17 UTC (rev 4081)
@@ -39,7 +39,7 @@
<target name="init" depends="prepare, thirdparty">
<fail message="Not available: ${jboss42.available.file}" unless="jboss42.available"/>
- <ant antfile="${spi.dir}/build.xml" target="jars" inheritall="false"/>
+ <ant antfile="${framework.dir}/build.xml" target="jars" inheritall="false"/>
</target>
<!-- ================================================================== -->
Modified: trunk/integration/jboss42/src/main/java/org/jboss/ws/integration/KernelLocator.java
===================================================================
--- trunk/integration/jboss42/src/main/java/org/jboss/ws/integration/KernelLocator.java 2007-08-02 09:09:47 UTC (rev 4080)
+++ trunk/integration/jboss42/src/main/java/org/jboss/ws/integration/KernelLocator.java 2007-08-02 09:23:17 UTC (rev 4081)
@@ -32,6 +32,6 @@
{
public static Kernel getKernel()
{
- return org.jboss.wsf.common.KernelLocator.getKernel();
+ return org.jboss.wsf.spi.util.KernelLocator.getKernel();
}
}
Modified: trunk/integration/jboss42/src/main/resources/jbossws-jboss42-config.xml
===================================================================
--- trunk/integration/jboss42/src/main/resources/jbossws-jboss42-config.xml 2007-08-02 09:09:47 UTC (rev 4080)
+++ trunk/integration/jboss42/src/main/resources/jbossws-jboss42-config.xml 2007-08-02 09:23:17 UTC (rev 4081)
@@ -1,6 +1,6 @@
<!-- Locate the single instance of the kernel -->
- <bean name="WSKernelLocator" class="org.jboss.wsf.common.KernelLocator">
+ <bean name="WSKernelLocator" class="org.jboss.wsf.spi.util.KernelLocator">
<property name="kernel"><inject bean="jboss.kernel:service=Kernel"/></property>
</bean>
Modified: trunk/integration/jboss50/.classpath
===================================================================
--- trunk/integration/jboss50/.classpath 2007-08-02 09:09:47 UTC (rev 4080)
+++ trunk/integration/jboss50/.classpath 2007-08-02 09:23:17 UTC (rev 4081)
@@ -9,5 +9,6 @@
<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/dom4j.jar"/>
+ <classpathentry combineaccessrules="false" kind="src" path="/spi"/>
<classpathentry kind="output" path="output/eclipse"/>
</classpath>
Modified: trunk/integration/jboss50/ant-import/build-thirdparty.xml
===================================================================
--- trunk/integration/jboss50/ant-import/build-thirdparty.xml 2007-08-02 09:09:47 UTC (rev 4080)
+++ trunk/integration/jboss50/ant-import/build-thirdparty.xml 2007-08-02 09:23:17 UTC (rev 4081)
@@ -32,11 +32,12 @@
<!-- The compile classpath for jboss50 integration -->
<path id="jbws50.integration.classpath">
- <pathelement location="${spi.dir}/output/lib/jbossws-spi.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"/>
- <pathelement location="${spi.dir}/thirdparty/saaj-api.jar"/>
+ <pathelement location="${framework.dir}/output/lib/jbossws-framework.jar"/>
+ <pathelement location="${framework.dir}/thirdparty/jbossws-spi.jar"/>
+ <pathelement location="${framework.dir}/thirdparty/jaxws-api.jar"/>
+ <pathelement location="${framework.dir}/thirdparty/jaxrpc-api.jar"/>
+ <pathelement location="${framework.dir}/thirdparty/jsr181-api.jar"/>
+ <pathelement location="${framework.dir}/thirdparty/saaj-api.jar"/>
<pathelement location="${jboss50.lib}/dom4j.jar"/>
<pathelement location="${jboss50.lib}/jboss-aop-jdk50.jar"/>
<pathelement location="${jboss50.lib}/jboss-common-core.jar"/>
Modified: trunk/integration/jboss50/build.xml
===================================================================
--- trunk/integration/jboss50/build.xml 2007-08-02 09:09:47 UTC (rev 4080)
+++ trunk/integration/jboss50/build.xml 2007-08-02 09:23:17 UTC (rev 4081)
@@ -39,7 +39,7 @@
<target name="init" depends="prepare,thirdparty">
<fail message="Not available: ${jboss50.available.file}" unless="jboss50.available"/>
- <ant antfile="${spi.dir}/build.xml" target="jars" inheritall="false"/>
+ <ant antfile="${framework.dir}/build.xml" target="jars" inheritall="false"/>
</target>
<!-- ================================================================== -->
Modified: trunk/integration/jboss50/src/main/resources/jbossws-jboss50.deployer/META-INF/jbossws-deployer-beans.xml
===================================================================
--- trunk/integration/jboss50/src/main/resources/jbossws-jboss50.deployer/META-INF/jbossws-deployer-beans.xml 2007-08-02 09:09:47 UTC (rev 4080)
+++ trunk/integration/jboss50/src/main/resources/jbossws-jboss50.deployer/META-INF/jbossws-deployer-beans.xml 2007-08-02 09:23:17 UTC (rev 4081)
@@ -3,7 +3,7 @@
<deployment xmlns="urn:jboss:bean-deployer:2.0">
<!-- Locate the single instance of the kernel -->
- <bean name="WSKernelLocator" class="org.jboss.wsf.common.KernelLocator">
+ <bean name="WSKernelLocator" class="org.jboss.wsf.spi.util.KernelLocator">
<property name="kernel"><inject bean="jboss.kernel:service=Kernel"/></property>
</bean>
Modified: trunk/integration/native/.classpath
===================================================================
--- trunk/integration/native/.classpath 2007-08-02 09:09:47 UTC (rev 4080)
+++ trunk/integration/native/.classpath 2007-08-02 09:23:17 UTC (rev 4081)
@@ -9,5 +9,6 @@
<classpathentry kind="lib" path="/integration-spi/thirdparty/jboss-common-core.jar"/>
<classpathentry kind="lib" path="/jbossws-core/thirdparty/wsdl4j.jar"/>
<classpathentry kind="lib" path="/integration-spi/thirdparty/activation.jar"/>
+ <classpathentry combineaccessrules="false" kind="src" path="/spi"/>
<classpathentry kind="output" path="output/eclipse"/>
</classpath>
Modified: trunk/integration/native/ant-import/build-bin-dist.xml
===================================================================
--- trunk/integration/native/ant-import/build-bin-dist.xml 2007-08-02 09:09:47 UTC (rev 4080)
+++ trunk/integration/native/ant-import/build-bin-dist.xml 2007-08-02 09:23:17 UTC (rev 4081)
@@ -57,7 +57,7 @@
<fileset dir="${int.sunri.dir}/ant-import">
<include name="macros-deploy-sunri.xml"/>
</fileset>
- <fileset dir="${spi.dir}/ant-import">
+ <fileset dir="${framework.dir}/ant-import">
<include name="macros-deploy-spi.xml"/>
</fileset>
<fileset dir="${int.xfire.dir}/ant-import">
@@ -69,7 +69,7 @@
</copy>
<copy todir="${bindist.bin.dir}">
- <fileset dir="${spi.dir}/src/main/etc">
+ <fileset dir="${framework.dir}/src/main/etc">
<include name="*.sh"/>
<include name="*.bat"/>
</fileset>
@@ -109,9 +109,9 @@
<!-- lib -->
<copy todir="${bindist.lib.dir}" overwrite="true">
- <fileset dir="${spi.dir}/output/lib">
- <include name="jbossws-spi.jar"/>
- <include name="jbossws-spi-scripts.zip"/>
+ <fileset dir="${framework.dir}/output/lib">
+ <include name="jbossws-framework.jar"/>
+ <include name="jbossws-framework-scripts.zip"/>
</fileset>
<fileset dir="${int.jboss50.dir}/output/lib">
<include name="jbossws-jboss50.jar"/>
Modified: trunk/integration/native/ant-import/build-deploy.xml
===================================================================
--- trunk/integration/native/ant-import/build-deploy.xml 2007-08-02 09:09:47 UTC (rev 4080)
+++ trunk/integration/native/ant-import/build-deploy.xml 2007-08-02 09:23:17 UTC (rev 4081)
@@ -14,7 +14,7 @@
<project>
<import file="${int.native.dir}/ant-import/macros-deploy-native.xml"/>
- <import file="${spi.dir}/ant-import/macros-deploy-spi.xml"/>
+ <import file="${framework.dir}/ant-import/macros-deploy-wsf.xml"/>
<!-- ================================================================== -->
<!-- Deployment JBoss50 -->
@@ -25,14 +25,14 @@
<ant antfile="${int.sunri.dir}/build.xml" target="undeploy-jboss50" inheritall="false"/>
<ant antfile="${int.xfire.dir}/build.xml" target="undeploy-jboss50" inheritall="false"/>
<macro-deploy-native50
- spilibs="${spi.dir}/output/lib"
+ wsflibs="${framework.dir}/output/lib"
jbosslibs="${int.jboss50.dir}/output/lib"
corelibs="${core.dir}/output/lib"
stacklibs="${int.native.dir}/output/lib"
thirdpartylibs="${core.dir}/thirdparty"/>
- <macro-deploy-spi
- spilibs="${spi.dir}/output/lib"
- thirdpartylibs="${spi.dir}/thirdparty"
+ <macro-deploy-wsf
+ wsflibs="${framework.dir}/output/lib"
+ thirdpartylibs="${framework.dir}/thirdparty"
jbosshome="${jboss50.home}"/>
<!-- [JBWS-1617] JAXRPC doc/literal trims empty string
@@ -51,7 +51,7 @@
<!-- Remove jbossws from jboss50 -->
<target name="undeploy-jboss50" depends="prepare,undeploy-jboss50-endorsed" description="Remove jbossws from jboss50">
<macro-undeploy-native50/>
- <macro-undeploy-spi jbosshome="${jboss50.home}"/>
+ <macro-undeploy-wsf jbosshome="${jboss50.home}"/>
</target>
<target name="undeploy-jboss50-endorsed" depends="prepare">
@@ -63,14 +63,14 @@
<ant antfile="${int.sunri.dir}/build.xml" target="undeploy-jboss42" inheritall="false"/>
<ant antfile="${int.xfire.dir}/build.xml" target="undeploy-jboss42" inheritall="false"/>
<macro-deploy-native42
- spilibs="${spi.dir}/output/lib"
+ wsflibs="${framework.dir}/output/lib"
jbosslibs="${int.jboss42.dir}/output/lib"
corelibs="${core.dir}/output/lib"
stacklibs="${int.native.dir}/output/lib"
thirdpartylibs="${core.dir}/thirdparty"/>
- <macro-deploy-spi
- spilibs="${spi.dir}/output/lib"
- thirdpartylibs="${spi.dir}/thirdparty"
+ <macro-deploy-wsf
+ wsflibs="${framework.dir}/output/lib"
+ thirdpartylibs="${framework.dir}/thirdparty"
jbosshome="${jboss42.home}"/>
<!-- [JBWS-1617] JAXRPC doc/literal trims empty string
@@ -90,7 +90,7 @@
<!-- Remove jbossws from jboss42 -->
<target name="undeploy-jboss42" depends="prepare,undeploy-jboss42-endorsed" description="Remove jbossws from jboss42">
<macro-undeploy-native42/>
- <macro-undeploy-spi jbosshome="${jboss42.home}"/>
+ <macro-undeploy-wsf jbosshome="${jboss42.home}"/>
</target>
<target name="undeploy-jboss42-endorsed" depends="prepare">
<macro-undeploy-endorsed jbosshome="${jboss42.home}"/>
@@ -101,14 +101,14 @@
<target name="deploy-jboss40-ejb3">
<macro-deploy-native40
- spilibs="${spi.dir}/output/lib"
+ wsflibs="${framework.dir}/output/lib"
jbosslibs="${int.jboss40.dir}/output/lib"
corelibs="${core.dir}/output/lib"
stacklibs="${int.native.dir}/output/lib"
thirdpartylibs="${core.dir}/thirdparty"/>
- <macro-deploy-spi
- spilibs="${spi.dir}/output/lib"
- thirdpartylibs="${spi.dir}/thirdparty"
+ <macro-deploy-wsf
+ wsflibs="${framework.dir}/output/lib"
+ thirdpartylibs="${framework.dir}/thirdparty"
jbosshome="${jboss40.home}"/>
</target>
@@ -125,6 +125,6 @@
<!-- Remove jbossws from jboss40 -->
<target name="undeploy-jboss40" depends="prepare" description="Remove jbossws from jboss40">
<macro-undeploy-native40/>
- <macro-undeploy-spi jbosshome="${jboss40.home}"/>
+ <macro-undeploy-wsf jbosshome="${jboss40.home}"/>
</target>
</project>
Modified: trunk/integration/native/ant-import/build-testsuite.xml
===================================================================
--- trunk/integration/native/ant-import/build-testsuite.xml 2007-08-02 09:09:47 UTC (rev 4080)
+++ trunk/integration/native/ant-import/build-testsuite.xml 2007-08-02 09:23:17 UTC (rev 4081)
@@ -27,7 +27,7 @@
<target name="tests-init" depends="tests-classpath">
<path id="ws.stack.classpath">
- <pathelement location="${spi.dir}/output/lib/jbossws-spi.jar"/>
+ <pathelement location="${framework.dir}/output/lib/jbossws-framework.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: trunk/integration/native/ant-import/build-thirdparty.xml
===================================================================
--- trunk/integration/native/ant-import/build-thirdparty.xml 2007-08-02 09:09:47 UTC (rev 4080)
+++ trunk/integration/native/ant-import/build-thirdparty.xml 2007-08-02 09:23:17 UTC (rev 4081)
@@ -31,12 +31,13 @@
<target name="thirdparty-classpath" depends="thirdparty-init">
<path id="native.integration.classpath">
- <pathelement location="${spi.dir}/output/lib/jbossws-spi.jar"/>
- <pathelement location="${spi.dir}/thirdparty/activation.jar"/>
- <pathelement location="${spi.dir}/thirdparty/dom4j.jar"/>
- <pathelement location="${spi.dir}/thirdparty/jboss-common-core.jar"/>
- <pathelement location="${spi.dir}/thirdparty/jboss-logging-spi.jar"/>
- <pathelement location="${spi.dir}/thirdparty/servlet-api.jar"/>
+ <pathelement location="${framework.dir}/output/lib/jbossws-framework.jar"/>
+ <pathelement location="${framework.dir}/thirdparty/activation.jar"/>
+ <pathelement location="${framework.dir}/thirdparty/dom4j.jar"/>
+ <pathelement location="${framework.dir}/thirdparty/jboss-common-core.jar"/>
+ <pathelement location="${framework.dir}/thirdparty/jboss-logging-spi.jar"/>
+ <pathelement location="${framework.dir}/thirdparty/jbossws-spi.jar"/>
+ <pathelement location="${framework.dir}/thirdparty/servlet-api.jar"/>
<pathelement location="${core.dir}/output/lib/jbossws-core.jar"/>
<pathelement location="${core.dir}/output/lib/jboss-jaxrpc.jar"/>
<pathelement location="${core.dir}/output/lib/jboss-jaxws.jar"/>
Modified: trunk/integration/native/ant-import/macros-deploy-native.xml
===================================================================
--- trunk/integration/native/ant-import/macros-deploy-native.xml 2007-08-02 09:09:47 UTC (rev 4080)
+++ trunk/integration/native/ant-import/macros-deploy-native.xml 2007-08-02 09:23:17 UTC (rev 4081)
@@ -18,7 +18,7 @@
<!-- ================================================================== -->
<macrodef name="macro-deploy-native50">
- <attribute name="spilibs"/>
+ <attribute name="wsflibs"/>
<attribute name="jbosslibs"/>
<attribute name="corelibs"/>
<attribute name="stacklibs"/>
@@ -127,7 +127,7 @@
</macrodef>
<macrodef name="macro-deploy-native42">
- <attribute name="spilibs"/>
+ <attribute name="wsflibs"/>
<attribute name="jbosslibs"/>
<attribute name="corelibs"/>
<attribute name="stacklibs"/>
@@ -233,7 +233,7 @@
</macrodef>
<macrodef name="macro-deploy-native40">
- <attribute name="spilibs"/>
+ <attribute name="wsflibs"/>
<attribute name="jbosslibs"/>
<attribute name="corelibs"/>
<attribute name="stacklibs"/>
Modified: trunk/integration/native/build.xml
===================================================================
--- trunk/integration/native/build.xml 2007-08-02 09:09:47 UTC (rev 4080)
+++ trunk/integration/native/build.xml 2007-08-02 09:23:17 UTC (rev 4081)
@@ -277,7 +277,7 @@
defaultexcludes="yes">
<classpath>
<pathelement path="${native.integration.classpath}"/>
- <fileset dir="${spi.dir}/thirdparty">
+ <fileset dir="${framework.dir}/thirdparty">
<include name="**/*.jar"/>
</fileset>
<fileset dir="${core.dir}/thirdparty">
@@ -289,7 +289,7 @@
<include name="org/jboss/wsf/**"/>
<include name="org/jboss/ws/**"/>
</packageset>
- <packageset dir="${spi.dir}/src/main/java">
+ <packageset dir="${framework.dir}/src/main/java">
<include name="org/jboss/wsf/**"/>
<include name="org/jboss/ws/**"/>
</packageset>
Modified: trunk/integration/native/src/main/etc/bin-dist-build.xml
===================================================================
--- trunk/integration/native/src/main/etc/bin-dist-build.xml 2007-08-02 09:09:47 UTC (rev 4080)
+++ trunk/integration/native/src/main/etc/bin-dist-build.xml 2007-08-02 09:23:17 UTC (rev 4081)
@@ -95,6 +95,7 @@
<target name="tests-init" depends="prepare,tests-classpath">
<path id="ws.stack.classpath">
+ <pathelement location="${lib.dir}/jbossws-framework.jar"/>
<pathelement location="${lib.dir}/jbossws-spi.jar"/>
<pathelement location="${lib.dir}/jboss-jaxrpc.jar"/>
<pathelement location="${lib.dir}/jboss-jaxws.jar"/>
Modified: trunk/integration/spi/.classpath
===================================================================
--- trunk/integration/spi/.classpath 2007-08-02 09:09:47 UTC (rev 4080)
+++ trunk/integration/spi/.classpath 2007-08-02 09:23:17 UTC (rev 4081)
@@ -23,5 +23,6 @@
<classpathentry kind="lib" path="thirdparty/getopt.jar"/>
<classpathentry kind="lib" path="thirdparty/saaj-api.jar"/>
<classpathentry kind="lib" path="thirdparty/jaxb-api.jar"/>
+ <classpathentry combineaccessrules="false" kind="src" path="/spi"/>
<classpathentry kind="output" path="output/eclipse"/>
</classpath>
Modified: trunk/integration/spi/ant-import/build-release.xml
===================================================================
--- trunk/integration/spi/ant-import/build-release.xml 2007-08-02 09:09:47 UTC (rev 4080)
+++ trunk/integration/spi/ant-import/build-release.xml 2007-08-02 09:23:17 UTC (rev 4081)
@@ -21,13 +21,13 @@
<property name="jboss.repository.dir" value="${jboss.local.repository}/jboss"/>
<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-spi-scripts.zip"/>
+ <fileset dir="${framework.output.lib.dir}">
+ <include name="jbossws-framework.jar"/>
+ <include name="jbossws-framework-src.zip"/>
+ <include name="jbossws-framework-scripts.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">
+ <copy tofile="${jboss.repository.dir}/jbossws-spi/${repository.id}/component-info.xml" file="${framework.etc.dir}/component-info.xml" filtering="true" overwrite="true">
<filterset>
<filtersfile file="${build.dir}/version.properties"/>
</filterset>
Modified: trunk/integration/spi/ant-import/build-thirdparty.xml
===================================================================
--- trunk/integration/spi/ant-import/build-thirdparty.xml 2007-08-02 09:09:47 UTC (rev 4080)
+++ trunk/integration/spi/ant-import/build-thirdparty.xml 2007-08-02 09:23:17 UTC (rev 4081)
@@ -21,7 +21,7 @@
<target name="thirdparty-init" depends="prepare">
- <property name="thirdparty.dir" value="${spi.dir}/thirdparty"/>
+ <property name="thirdparty.dir" value="${framework.dir}/thirdparty"/>
<checksum file="${build.dir}/version.properties" fileext=".md5" verifyproperty="checksum.ok"/>
<condition property="force.thirdparty">
<or>
@@ -48,6 +48,7 @@
<get src="${jboss.repository}/jboss/common-logging-spi/${jboss-common-logging-spi}/lib/jboss-logging-spi.jar" dest="${thirdparty.dir}/jboss-logging-spi.jar" usetimestamp="true" verbose="true"/>
<get src="${jboss.repository}/gnu-getopt/${gnu-getopt}/lib/getopt.jar" dest="${thirdparty.dir}/getopt.jar" usetimestamp="true" verbose="true"/>
<get src="${jboss.repository}/jboss/jboss-javaee/${jboss-javaee}/lib/jboss-javaee.jar" dest="${thirdparty.dir}/jboss-javaee.jar" usetimestamp="true" verbose="true"/>
+ <get src="${jboss.repository}/jboss/jbossws-spi/${jbossws-spi}/lib/jbossws-spi.jar" dest="${thirdparty.dir}/jbossws-spi.jar" usetimestamp="true" verbose="true"/>
<get src="${jboss.repository}/jboss/jbossxb/${jboss-jbossxb}/lib/jboss-xml-binding.jar" dest="${thirdparty.dir}/jboss-xml-binding.jar" usetimestamp="true" verbose="true"/>
<get src="${jboss.repository}/jboss/jbossxb/${jboss-jbossxb}/lib/jboss-xml-binding-sources.jar" dest="${thirdparty.dir}/jboss-xml-binding-sources.jar" usetimestamp="true" verbose="true"/>
<get src="${jboss.repository}/jboss/microcontainer/${jboss-microcontainer}/lib/jboss-container.jar" dest="${thirdparty.dir}/jboss-container.jar" usetimestamp="true" verbose="true"/>
@@ -87,6 +88,7 @@
<pathelement location="${thirdparty.dir}/jboss-javaee.jar"/>
<pathelement location="${thirdparty.dir}/jboss-microcontainer.jar"/>
<pathelement location="${thirdparty.dir}/jboss-xml-binding.jar"/>
+ <pathelement location="${thirdparty.dir}/jbossws-spi.jar"/>
<pathelement location="${thirdparty.dir}/jaxws-api.jar"/>
<pathelement location="${thirdparty.dir}/jaxb-api.jar"/>
<pathelement location="${thirdparty.dir}/jaxrpc-api.jar"/>
Deleted: trunk/integration/spi/ant-import/macros-deploy-spi.xml
===================================================================
--- trunk/integration/spi/ant-import/macros-deploy-spi.xml 2007-08-02 09:09:47 UTC (rev 4080)
+++ trunk/integration/spi/ant-import/macros-deploy-spi.xml 2007-08-02 09:23:17 UTC (rev 4081)
@@ -1,69 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-
-<!-- ====================================================================== -->
-<!-- -->
-<!-- JBoss, the OpenSource J2EE webOS -->
-<!-- -->
-<!-- Distributable under LGPL license. -->
-<!-- See terms of license at http://www.gnu.org. -->
-<!-- -->
-<!-- ====================================================================== -->
-
-<!-- $Id$ -->
-
-<project>
-
- <macrodef name="macro-deploy-spi">
- <attribute name="spilibs"/>
- <attribute name="thirdpartylibs"/>
- <attribute name="jbosshome"/>
- <sequential>
-
- <!-- BIN SCRIPTS -->
- <unzip dest="@{jbosshome}/bin" src="@{spilibs}/jbossws-spi-scripts.zip"/>
- <chmod dir="@{jbosshome}/bin" perm="+x" includes="*.sh"/>
-
- <!-- CLIENT JARS-->
- <copy todir="@{jbosshome}/client">
- <fileset dir="@{spilibs}">
- <include name="jbossws-spi.jar"/>
- </fileset>
- <fileset dir="@{thirdpartylibs}">
- <include name="wsdl4j.jar"/>
- </fileset>
- </copy>
-
- <!-- SERVER JARS-->
- <copy todir="@{jbosshome}/server/${jboss.server.instance}/lib">
- <fileset dir="@{spilibs}">
- <include name="jbossws-spi.jar"/>
- </fileset>
- </copy>
- </sequential>
- </macrodef>
-
- <macrodef name="macro-undeploy-spi">
- <attribute name="jbosshome"/>
- <sequential>
- <delete>
- <!-- BIN SCRIPTS -->
- <fileset dir="@{jbosshome}/bin">
- <include name="wsconsume.*"/>
- <include name="wsprovide.*"/>
- </fileset>
-
- <!-- CLIENT JARS-->
- <fileset dir="@{jbosshome}/client">
- <include name="jbossws-spi.jar"/>
- <include name="wsdl4j.jar"/>
- </fileset>
-
- <!-- SERVER JARS-->
- <fileset dir="@{jbosshome}/server/${jboss.server.instance}/lib">
- <include name="jbossws-spi.jar"/>
- </fileset>
- </delete>
- </sequential>
- </macrodef>
-
-</project>
\ No newline at end of file
Copied: trunk/integration/spi/ant-import/macros-deploy-wsf.xml (from rev 4080, branches/tdiesler/trunk/integration/spi/ant-import/macros-deploy-wsf.xml)
===================================================================
--- trunk/integration/spi/ant-import/macros-deploy-wsf.xml (rev 0)
+++ trunk/integration/spi/ant-import/macros-deploy-wsf.xml 2007-08-02 09:23:17 UTC (rev 4081)
@@ -0,0 +1,75 @@
+<?xml version="1.0" encoding="UTF-8"?>
+
+<!-- ====================================================================== -->
+<!-- -->
+<!-- JBoss, the OpenSource J2EE webOS -->
+<!-- -->
+<!-- Distributable under LGPL license. -->
+<!-- See terms of license at http://www.gnu.org. -->
+<!-- -->
+<!-- ====================================================================== -->
+
+<!-- $Id: macros-deploy-spi.xml 3620 2007-06-18 20:39:56Z heiko.braun at jboss.com $ -->
+
+<project>
+
+ <macrodef name="macro-deploy-wsf">
+ <attribute name="wsflibs"/>
+ <attribute name="thirdpartylibs"/>
+ <attribute name="jbosshome"/>
+ <sequential>
+
+ <!-- BIN SCRIPTS -->
+ <unzip dest="@{jbosshome}/bin" src="@{wsflibs}/jbossws-framework-scripts.zip"/>
+ <chmod dir="@{jbosshome}/bin" perm="+x" includes="*.sh"/>
+
+ <!-- CLIENT JARS-->
+ <copy todir="@{jbosshome}/client">
+ <fileset dir="@{wsflibs}">
+ <include name="jbossws-framework.jar"/>
+ </fileset>
+ <fileset dir="@{thirdpartylibs}">
+ <include name="jbossws-spi.jar"/>
+ <include name="wsdl4j.jar"/>
+ </fileset>
+ </copy>
+
+ <!-- SERVER JARS-->
+ <copy todir="@{jbosshome}/server/${jboss.server.instance}/lib">
+ <fileset dir="@{wsflibs}">
+ <include name="jbossws-framework.jar"/>
+ </fileset>
+ <fileset dir="@{thirdpartylibs}">
+ <include name="jbossws-spi.jar"/>
+ </fileset>
+ </copy>
+ </sequential>
+ </macrodef>
+
+ <macrodef name="macro-undeploy-wsf">
+ <attribute name="jbosshome"/>
+ <sequential>
+ <delete>
+ <!-- BIN SCRIPTS -->
+ <fileset dir="@{jbosshome}/bin">
+ <include name="wsconsume.*"/>
+ <include name="wsprovide.*"/>
+ </fileset>
+
+ <!-- CLIENT JARS-->
+ <fileset dir="@{jbosshome}/client">
+ <include name="jbossws-framework.jar"/>
+ <include name="jbossws-spi.jar"/>
+ <include name="wsdl4j.jar"/>
+ </fileset>
+
+ <!-- SERVER JARS-->
+ <fileset dir="@{jbosshome}/server/${jboss.server.instance}/lib">
+ <include name="jbossws-framework.jar"/>
+ <include name="jbossws-spi.jar"/>
+ </fileset>
+ </delete>
+ </sequential>
+ </macrodef>
+
+</project>
\ No newline at end of file
Modified: trunk/integration/spi/build.xml
===================================================================
--- trunk/integration/spi/build.xml 2007-08-02 09:09:47 UTC (rev 4080)
+++ trunk/integration/spi/build.xml 2007-08-02 09:23:17 UTC (rev 4081)
@@ -15,22 +15,22 @@
<import file="${basedir}/build/ant-import/build-setup.xml"/>
- <import file="${spi.dir}/ant-import/build-release.xml"/>
- <import file="${spi.dir}/ant-import/build-thirdparty.xml"/>
+ <import file="${framework.dir}/ant-import/build-release.xml"/>
+ <import file="${framework.dir}/ant-import/build-thirdparty.xml"/>
<!-- ================================================================== -->
<!-- Setup -->
<!-- ================================================================== -->
- <property name="spi.src.dir" value="${spi.dir}/src/main"/>
- <property name="spi.etc.dir" value="${spi.src.dir}/etc"/>
- <property name="spi.java.dir" value="${spi.src.dir}/java"/>
- <property name="spi.resources.dir" value="${spi.src.dir}/resources"/>
- <property name="spi.output.dir" value="${spi.dir}/output"/>
- <property name="spi.output.apidocs.dir" value="${spi.output.dir}/apidocs"/>
- <property name="spi.output.etc.dir" value="${spi.output.dir}/etc"/>
- <property name="spi.output.classes.dir" value="${spi.output.dir}/classes"/>
- <property name="spi.output.lib.dir" value="${spi.output.dir}/lib"/>
+ <property name="framework.src.dir" value="${framework.dir}/src/main"/>
+ <property name="framework.etc.dir" value="${framework.src.dir}/etc"/>
+ <property name="framework.java.dir" value="${framework.src.dir}/java"/>
+ <property name="framework.resources.dir" value="${framework.src.dir}/resources"/>
+ <property name="framework.output.dir" value="${framework.dir}/output"/>
+ <property name="framework.output.apidocs.dir" value="${framework.output.dir}/apidocs"/>
+ <property name="framework.output.etc.dir" value="${framework.output.dir}/etc"/>
+ <property name="framework.output.classes.dir" value="${framework.output.dir}/classes"/>
+ <property name="framework.output.lib.dir" value="${framework.output.dir}/lib"/>
<!-- ================================================================== -->
<!-- Initialization -->
@@ -58,8 +58,8 @@
<target name="compile-classes" depends="init">
<!-- Compile spi classes with jdk1.5 -->
- <mkdir dir="${spi.output.classes.dir}"/>
- <javac srcdir="${spi.java.dir}" sourcepath="" destdir="${spi.output.classes.dir}" encoding="utf-8" debug="${javac.debug}" verbose="${javac.verbose}"
+ <mkdir dir="${framework.output.classes.dir}"/>
+ <javac srcdir="${framework.java.dir}" sourcepath="" destdir="${framework.output.classes.dir}" encoding="utf-8" debug="${javac.debug}" verbose="${javac.verbose}"
deprecation="${javac.deprecation}" failonerror="${javac.fail.onerror}" source="1.5" target="1.5">
<include name="org/jboss/wsf/**"/>
<classpath refid="spi.thirdparty.classpath"/>
@@ -68,12 +68,9 @@
<!-- Compile etc files (manifests and such) -->
<target name="compile-etc" depends="init">
- <mkdir dir="${spi.output.etc.dir}"/>
- <copy todir="${spi.output.etc.dir}" filtering="yes">
- <fileset dir="${spi.etc.dir}"/>
- <fileset dir="${spi.etc.dir}">
- <include name="default.mf"/>
- </fileset>
+ <mkdir dir="${framework.output.etc.dir}"/>
+ <copy todir="${framework.output.etc.dir}" filtering="yes">
+ <fileset dir="${framework.etc.dir}"/>
<filterset>
<filter token="java.vm.version" value="${java.vm.version}"/>
<filter token="java.vm.vendor" value="${java.vm.vendor}"/>
@@ -99,29 +96,31 @@
-->
<target name="module-jars">
- <!-- Build jbossws-spi.jar -->
- <mkdir dir="${spi.output.lib.dir}"/>
- <jar jarfile="${spi.output.lib.dir}/jbossws-spi.jar" manifest="${spi.output.etc.dir}/default.mf">
- <fileset dir="${spi.output.classes.dir}">
- <include name="org/jboss/wsf/**"/>
+ <!-- Build jbossws-framework.jar -->
+ <mkdir dir="${framework.output.lib.dir}"/>
+ <jar jarfile="${framework.output.lib.dir}/jbossws-framework.jar" manifest="${framework.output.etc.dir}/default.mf">
+ <fileset dir="${framework.output.classes.dir}">
+ <include name="org/jboss/wsf/common/**"/>
+ <include name="org/jboss/wsf/framework/**"/>
+ <include name="org/jboss/wsf/test/**"/>
</fileset>
</jar>
<!-- Build jbossws-spi-scripts.zip -->
- <zip zipfile="${spi.output.lib.dir}/jbossws-spi-scripts.zip" >
- <fileset dir="${spi.output.etc.dir}">
+ <zip zipfile="${framework.output.lib.dir}/jbossws-framework-scripts.zip" >
+ <fileset dir="${framework.output.etc.dir}">
<include name="wsconsume.bat"/>
<include name="wsprovide.bat"/>
</fileset>
- <zipfileset dir="${spi.output.etc.dir}" filemode="755">
+ <zipfileset dir="${framework.output.etc.dir}" filemode="755">
<include name="wsconsume.sh"/>
<include name="wsprovide.sh"/>
</zipfileset>
</zip>
<!-- Build jbossws-spi-src.zip -->
- <zip zipfile="${spi.output.lib.dir}/jbossws-spi-src.zip" >
- <fileset dir="${spi.java.dir}"/>
+ <zip zipfile="${framework.output.lib.dir}/jbossws-framework-src.zip" >
+ <fileset dir="${framework.java.dir}"/>
</zip>
</target>
@@ -133,11 +132,10 @@
<!-- Generate the JavaDoc -->
<target name="javadoc" depends="init" description="Generate the Javadoc">
- <mkdir dir="${spi.output.apidocs.dir}"/>
- <javadoc destdir="${spi.output.apidocs.dir}" author="true" version="true" use="true" windowtitle="JBossWS API">
+ <mkdir dir="${framework.output.apidocs.dir}"/>
+ <javadoc destdir="${framework.output.apidocs.dir}" author="true" version="true" use="true" windowtitle="JBossWS API">
<classpath refid="spi.thirdparty.classpath"/>
- <packageset dir="${spi.java.dir}" defaultexcludes="yes">
- <include name="org/jboss/ws/**"/>
+ <packageset dir="${framework.java.dir}" defaultexcludes="yes">
<include name="org/jboss/wsf/**"/>
</packageset>
<doctitle><![CDATA[<h1>JBoss Web Service Framework - SPI</h1>]]></doctitle>
@@ -146,11 +144,11 @@
</target>
<target name="clean" depends="prepare" description="Cleans up most generated files.">
- <delete dir="${spi.output.dir}"/>
+ <delete dir="${framework.output.dir}"/>
</target>
<target name="clobber" depends="clean" description="Cleans up all generated files.">
- <delete dir="${spi.dir}/thirdparty"/>
+ <delete dir="${framework.dir}/thirdparty"/>
</target>
<target name="main" description="Executes the default target (most)." depends="most"/>
Modified: trunk/integration/spi/src/main/etc/component-info.xml
===================================================================
--- trunk/integration/spi/src/main/etc/component-info.xml 2007-08-02 09:09:47 UTC (rev 4080)
+++ trunk/integration/spi/src/main/etc/component-info.xml 2007-08-02 09:23:17 UTC (rev 4081)
@@ -1,28 +1,18 @@
-<project name="jboss/jbossws-spi">
+<project name="jboss/jbossws-framework">
- <component id="jboss/jbossws-spi"
+ <component id="jboss/jbossws-framework"
description="JBossWS SPI"
version="@repository.id@"
licenseType="lgpl">
- <artifact id="jbossws-spi.jar"/>
- <artifact id="jbossws-spi-scripts.zip"/>
+ <artifact id="jbossws-framework.jar"/>
+ <artifact id="jbossws-framework-scripts.zip"/>
- <import componentref="sun-jaxb">
- <compatible version="@sun-jaxb@"/>
+ <import componentref="jbossws-spi">
+ <compatible version="@jbossws-spi@"/>
</import>
- <import componentref="sun-jaxws">
- <compatible version="@sun-jaxws@"/>
- </import>
-
- <import componentref="woodstox">
- <compatible version="@woodstox@"/>
- <compatible version="@woodstox at -brew"/>
- </import>
-
<export>
- <include input="jbossws-spi.jar"/>
</export>
</component>
Modified: trunk/integration/spi/src/main/java/org/jboss/wsf/common/KernelAwareSPIFactory.java
===================================================================
--- trunk/integration/spi/src/main/java/org/jboss/wsf/common/KernelAwareSPIFactory.java 2007-08-02 09:09:47 UTC (rev 4080)
+++ trunk/integration/spi/src/main/java/org/jboss/wsf/common/KernelAwareSPIFactory.java 2007-08-02 09:23:17 UTC (rev 4081)
@@ -24,7 +24,7 @@
import org.jboss.kernel.Kernel;
import org.jboss.kernel.spi.registry.KernelRegistry;
import org.jboss.kernel.spi.registry.KernelRegistryEntry;
-import org.jboss.wsf.common.KernelLocator;
+import org.jboss.wsf.spi.util.KernelLocator;
/**
* @author Heiko.Braun at jboss.com
Deleted: trunk/integration/spi/src/main/java/org/jboss/wsf/common/KernelLocator.java
===================================================================
--- trunk/integration/spi/src/main/java/org/jboss/wsf/common/KernelLocator.java 2007-08-02 09:09:47 UTC (rev 4080)
+++ trunk/integration/spi/src/main/java/org/jboss/wsf/common/KernelLocator.java 2007-08-02 09:23:17 UTC (rev 4081)
@@ -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.wsf.common;
-
-//$Id: KernelLocator.java 3137 2007-05-18 13:41:57Z thomas.diesler at jboss.com $
-
-import org.jboss.kernel.Kernel;
-
-/**
- * Locate the single instance of the kernel
- *
- * @author Thomas.Diesler at jboss.org
- * @since 12-May-2006
- */
-public class KernelLocator
-{
- private static Kernel kernel;
-
- public static Kernel getKernel()
- {
- return KernelLocator.kernel;
- }
-
- public void setKernel(Kernel kernel)
- {
- KernelLocator.kernel = kernel;
- }
-}
Deleted: trunk/integration/spi/src/main/java/org/jboss/wsf/common/ServiceLoader.java
===================================================================
--- trunk/integration/spi/src/main/java/org/jboss/wsf/common/ServiceLoader.java 2007-08-02 09:09:47 UTC (rev 4080)
+++ trunk/integration/spi/src/main/java/org/jboss/wsf/common/ServiceLoader.java 2007-08-02 09:23:17 UTC (rev 4081)
@@ -1,251 +0,0 @@
-/*
- * JBoss, Home of Professional Open Source
- * Copyright 2005, JBoss Inc., and individual contributors as indicated
- * by the @authors tag. See the copyright.txt in the distribution for a
- * full listing of individual contributors.
- *
- * This is free software; you can redistribute it and/or modify it
- * under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation; either version 2.1 of
- * the License, or (at your option) any later version.
- *
- * This software is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this software; if not, write to the Free
- * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
- * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
- */
-package org.jboss.wsf.common;
-
-import java.io.BufferedReader;
-import java.io.File;
-import java.io.FileInputStream;
-import java.io.IOException;
-import java.io.InputStream;
-import java.io.InputStreamReader;
-import java.security.AccessController;
-import java.security.PrivilegedAction;
-import java.util.Properties;
-
-// $Id$
-
-/**
- * Load a service class using this ordered lookup procedure
- *
- * @author Thomas.Diesler at jboss.com
- * @since 14-Dec-2006
- */
-public abstract class ServiceLoader
-{
- /**
- * This method uses the algorithm below using the JAXWS Provider as an example.
- *
- * 1. If a resource with the name of META-INF/services/javax.xml.ws.spi.Provider exists, then
- * its first line, if present, is used as the UTF-8 encoded name of the implementation class.
- *
- * 2. If the ${java.home}/lib/jaxws.properties file exists and it is readable by the
- * java.util.Properties.load(InputStream) method and it contains an entry whose key is
- * javax.xml.ws.spi.Provider, then the value of that entry is used as the name of the implementation class.
- *
- * 3. If a system property with the name javax.xml.ws.spi.Provider is defined, then its value is used
- * as the name of the implementation class.
- *
- * 4. Finally, a default implementation class name is used.
- */
- public static Object loadService(String propertyName, String defaultFactory)
- {
- Object factory = loadFromServices(propertyName, null);
- if (factory == null)
- {
- factory = loadFromPropertiesFile(propertyName, null);
- }
- if (factory == null)
- {
- factory = loadFromSystemProperty(propertyName, defaultFactory);
- }
- return factory;
- }
-
- /** Use the Services API (as detailed in the JAR specification), if available, to determine the classname.
- */
- public static Object loadFromServices(String propertyName, String defaultFactory)
- {
- Object factory = null;
- String factoryName = null;
- ClassLoader loader = Thread.currentThread().getContextClassLoader();
-
- // Use the Services API (as detailed in the JAR specification), if available, to determine the classname.
- String filename = "META-INF/services/" + propertyName;
- InputStream inStream = loader.getResourceAsStream(filename);
- if (inStream != null)
- {
- try
- {
- BufferedReader br = new BufferedReader(new InputStreamReader(inStream, "UTF-8"));
- factoryName = br.readLine();
- br.close();
- if (factoryName != null)
- {
- Class factoryClass = loader.loadClass(factoryName);
- factory = factoryClass.newInstance();
- }
- }
- catch (Throwable t)
- {
- throw new IllegalStateException("Failed to load " + propertyName + ": " + factoryName, t);
- }
- }
-
- // Use the default factory implementation class.
- if (factory == null && defaultFactory != null)
- {
- factory = loadDefault(defaultFactory);
- }
-
- return factory;
- }
-
- /** Use the system property
- */
- public static Object loadFromSystemProperty(String propertyName, String defaultFactory)
- {
- Object factory = null;
- ClassLoader loader = Thread.currentThread().getContextClassLoader();
-
- PrivilegedAction action = new PropertyAccessAction(propertyName);
- String factoryName = (String)AccessController.doPrivileged(action);
- if (factoryName != null)
- {
- try
- {
- //if(log.isDebugEnabled()) log.debug("Load from system property: " + factoryName);
- Class factoryClass = loader.loadClass(factoryName);
- factory = factoryClass.newInstance();
- }
- catch (Throwable t)
- {
- throw new IllegalStateException("Failed to load " + propertyName + ": " + factoryName, t);
- }
- }
-
- // Use the default factory implementation class.
- if (factory == null && defaultFactory != null)
- {
- factory = loadDefault(defaultFactory);
- }
-
- return factory;
- }
-
- /**
- * Use the properties file "${java.home}/lib/jaxws.properties" in the JRE directory.
- * This configuration file is in standard java.util.Properties format and contains the
- * fully qualified name of the implementation class with the key being the system property defined above.
- */
- public static Object loadFromPropertiesFile(String propertyName, String defaultFactory)
- {
- Object factory = null;
- String factoryName = null;
- ClassLoader loader = Thread.currentThread().getContextClassLoader();
-
- // Use the properties file "lib/jaxm.properties" in the JRE directory.
- // This configuration file is in standard java.util.Properties format and contains the fully qualified name of the implementation class with the key being the system property defined above.
- PrivilegedAction action = new PropertyAccessAction("java.home");
- String javaHome = (String)AccessController.doPrivileged(action);
- File jaxmFile = new File(javaHome + "/lib/jaxws.properties");
- if (jaxmFile.exists())
- {
- try
- {
- action = new PropertyFileAccessAction(jaxmFile.getCanonicalPath());
- Properties jaxmProperties = (Properties)AccessController.doPrivileged(action);
- factoryName = jaxmProperties.getProperty(propertyName);
- if (factoryName != null)
- {
- //if(log.isDebugEnabled()) log.debug("Load from " + jaxmFile + ": " + factoryName);
- Class factoryClass = loader.loadClass(factoryName);
- factory = factoryClass.newInstance();
- }
- }
- catch (Throwable t)
- {
- throw new IllegalStateException("Failed to load " + propertyName + ": " + factoryName, t);
- }
- }
-
- // Use the default factory implementation class.
- if (factory == null && defaultFactory != null)
- {
- factory = loadDefault(defaultFactory);
- }
-
- return factory;
- }
-
- private static Object loadDefault(String defaultFactory)
- {
- Object factory = null;
- ClassLoader loader = Thread.currentThread().getContextClassLoader();
-
- // Use the default factory implementation class.
- if (defaultFactory != null)
- {
- try
- {
- //if(log.isDebugEnabled()) log.debug("Load from default: " + factoryName);
- Class factoryClass = loader.loadClass(defaultFactory);
- factory = factoryClass.newInstance();
- }
- catch (Throwable t)
- {
- throw new IllegalStateException("Failed to load: " + defaultFactory, t);
- }
- }
-
- return factory;
- }
-
- private static class PropertyAccessAction implements PrivilegedAction
- {
- private String name;
-
- PropertyAccessAction(String name)
- {
- this.name = name;
- }
-
- public Object run()
- {
- return System.getProperty(name);
- }
- }
-
- private static class PropertyFileAccessAction implements PrivilegedAction
- {
- private String filename;
-
- PropertyFileAccessAction(String filename)
- {
- this.filename = filename;
- }
-
- public Object run()
- {
- try
- {
- InputStream inStream = new FileInputStream(filename);
- Properties props = new Properties();
- props.load(inStream);
- return props;
- }
- catch (IOException ex)
- {
- throw new SecurityException("Cannot load properties: " + filename, ex);
- }
- }
- }
-}
Modified: trunk/integration/spi/src/main/java/org/jboss/wsf/framework/DefaultSPIProviderResolver.java
===================================================================
--- trunk/integration/spi/src/main/java/org/jboss/wsf/framework/DefaultSPIProviderResolver.java 2007-08-02 09:09:47 UTC (rev 4080)
+++ trunk/integration/spi/src/main/java/org/jboss/wsf/framework/DefaultSPIProviderResolver.java 2007-08-02 09:23:17 UTC (rev 4081)
@@ -22,15 +22,14 @@
package org.jboss.wsf.framework;
import org.jboss.logging.Logger;
-import org.jboss.wsf.common.ServiceLoader;
import org.jboss.wsf.framework.deployment.DefaultDeploymentAspectManagerFactory;
import org.jboss.wsf.framework.deployment.DefaultDeploymentModelFactory;
import org.jboss.wsf.framework.deployment.DefaultLifecycleHandlerFactory;
import org.jboss.wsf.framework.http.DefaultHttpContextFactory;
import org.jboss.wsf.framework.http.DefaultHttpServerFactory;
import org.jboss.wsf.framework.invocation.DefaultResourceInjectorFactory;
-import org.jboss.wsf.framework.serviceref.DefaultServiceRefHandler;
import org.jboss.wsf.framework.serviceref.DefaultServiceRefHandlerFactory;
+import org.jboss.wsf.framework.serviceref.DefaultServiceRefMetaDataParserFactory;
import org.jboss.wsf.spi.SPIProvider;
import org.jboss.wsf.spi.SPIProviderResolver;
import org.jboss.wsf.spi.WSFException;
@@ -46,8 +45,10 @@
import org.jboss.wsf.spi.invocation.WebServiceContextFactory;
import org.jboss.wsf.spi.management.EndpointRegistryFactory;
import org.jboss.wsf.spi.management.ServerConfigFactory;
+import org.jboss.wsf.spi.metadata.j2ee.serviceref.ServiceRefMetaDataParserFactory;
import org.jboss.wsf.spi.serviceref.ServiceRefBinderFactory;
import org.jboss.wsf.spi.serviceref.ServiceRefHandlerFactory;
+import org.jboss.wsf.spi.util.ServiceLoader;
/**
* @author Heiko.Braun at jboss.com
@@ -106,6 +107,10 @@
{
returnType = (T)loadService(spiType, DefaultServiceRefHandlerFactory.class.getName());
}
+ else if (ServiceRefMetaDataParserFactory.class.equals(spiType))
+ {
+ returnType = (T)loadService(spiType, DefaultServiceRefMetaDataParserFactory.class.getName());
+ }
// SPI provided by either container or stack integration
Copied: trunk/integration/spi/src/main/java/org/jboss/wsf/framework/serviceref/DefaultServiceRefMetaDataParser.java (from rev 4080, branches/tdiesler/trunk/integration/spi/src/main/java/org/jboss/wsf/framework/serviceref/DefaultServiceRefMetaDataParser.java)
===================================================================
--- trunk/integration/spi/src/main/java/org/jboss/wsf/framework/serviceref/DefaultServiceRefMetaDataParser.java (rev 0)
+++ trunk/integration/spi/src/main/java/org/jboss/wsf/framework/serviceref/DefaultServiceRefMetaDataParser.java 2007-08-02 09:23:17 UTC (rev 4081)
@@ -0,0 +1,256 @@
+/*
+ * JBoss, Home of Professional Open Source
+ * Copyright 2005, JBoss Inc., and individual contributors as indicated
+ * by the @authors tag. See the copyright.txt in the distribution for a
+ * full listing of individual contributors.
+ *
+ * This is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU Lesser General Public License as
+ * published by the Free Software Foundation; either version 2.1 of
+ * the License, or (at your option) any later version.
+ *
+ * This software is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this software; if not, write to the Free
+ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
+ * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
+ */
+package org.jboss.wsf.framework.serviceref;
+
+// $Id: ServiceRefMetaDataParser.java 3959 2007-07-20 14:44:19Z heiko.braun at jboss.com $
+
+import java.util.Iterator;
+
+import javax.xml.namespace.QName;
+
+import org.jboss.logging.Logger;
+import org.jboss.wsf.common.DOMUtils;
+import org.jboss.wsf.spi.metadata.j2ee.serviceref.ServiceRefMetaDataParser;
+import org.jboss.wsf.spi.metadata.j2ee.serviceref.UnifiedCallPropertyMetaData;
+import org.jboss.wsf.spi.metadata.j2ee.serviceref.UnifiedHandlerMetaData;
+import org.jboss.wsf.spi.metadata.j2ee.serviceref.UnifiedInitParamMetaData;
+import org.jboss.wsf.spi.metadata.j2ee.serviceref.UnifiedPortComponentRefMetaData;
+import org.jboss.wsf.spi.metadata.j2ee.serviceref.UnifiedServiceRefMetaData;
+import org.jboss.wsf.spi.metadata.j2ee.serviceref.UnifiedStubPropertyMetaData;
+import org.jboss.xb.QNameBuilder;
+import org.w3c.dom.Element;
+
+/**
+ * The metdata data from service-ref element in web.xml, ejb-jar.xml, and
+ * application-client.xml.
+ *
+ * @author Thomas.Diesler at jboss.org
+ */
+public class DefaultServiceRefMetaDataParser implements ServiceRefMetaDataParser
+{
+ private static final Logger log = Logger.getLogger(DefaultServiceRefMetaDataParser.class);
+
+ public void importStandardXml(Element root, UnifiedServiceRefMetaData sref)
+ {
+ sref.setServiceRefName(getElementContent(root, "service-ref-name"));
+ sref.setServiceInterface(getOptionalElementContent(root, "service-interface"));
+ sref.setWsdlFile(getOptionalElementContent(root, "wsdl-file"));
+ sref.setMappingFile(getOptionalElementContent(root, "jaxrpc-mapping-file"));
+
+ Element child = DOMUtils.getFirstChildElement(root, "service-qname");
+ if (child != null)
+ sref.setServiceQName(QNameBuilder.buildQName(child, getTextContent(child)));
+
+ // Parse the port-component-ref elements
+ Iterator iterator = DOMUtils.getChildElements(root, "port-component-ref");
+ while (iterator.hasNext())
+ {
+ Element pcrefElement = (Element)iterator.next();
+ UnifiedPortComponentRefMetaData pcrefMetaData = new UnifiedPortComponentRefMetaData(sref);
+ pcrefMetaData.importStandardXml(pcrefElement);
+ sref.addPortComponentRef(pcrefMetaData);
+ }
+
+ // Parse the handler elements
+ iterator = DOMUtils.getChildElements(root, "handler");
+ while (iterator.hasNext())
+ {
+ Element handlerElement = (Element)iterator.next();
+ UnifiedHandlerMetaData handlerMetaData = new UnifiedHandlerMetaData();
+ handlerMetaData.importStandardXml(handlerElement);
+ sref.addHandler(handlerMetaData);
+ }
+ }
+
+ public void importJBossXml(Element root, UnifiedServiceRefMetaData sref)
+ {
+ sref.setConfigName(getOptionalElementContent(root, "config-name"));
+ sref.setConfigFile(getOptionalElementContent(root, "config-file"));
+ sref.setWsdlOverride(getOptionalElementContent(root, "wsdl-override"));
+
+ // Parse the port-component-ref elements
+ Iterator iterator = DOMUtils.getChildElements(root, "port-component-ref");
+ while (iterator.hasNext())
+ {
+ Element pcrefElement = (Element)iterator.next();
+ String seiName = getOptionalElementContent(pcrefElement, "service-endpoint-interface");
+ QName portName = getOptionalElementContentAsQName(pcrefElement, "port-qname");
+
+ UnifiedPortComponentRefMetaData pcref = sref.getPortComponentRef(seiName, portName);
+ if (pcref == null && seiName != null)
+ {
+ // Its ok to only have the <port-component-ref> in jboss.xml and not in ejb-jar.xml
+ // if it has at least a SEI declared
+ pcref = new UnifiedPortComponentRefMetaData(sref);
+ pcref.importStandardXml(pcrefElement);
+ sref.addPortComponentRef(pcref);
+ }
+
+ if (pcref != null)
+ pcref.importJBossXml(pcrefElement);
+ }
+
+ // Parse the call-property elements
+ iterator = DOMUtils.getChildElements(root, "call-property");
+ while (iterator.hasNext())
+ {
+ Element propElement = (Element)iterator.next();
+ String name = getElementContent(propElement, "prop-name");
+ String value = getElementContent(propElement, "prop-value");
+ sref.addCallProperty(new UnifiedCallPropertyMetaData(name, value));
+ }
+ }
+
+ public void importStandardXml(Element root, UnifiedPortComponentRefMetaData pcref)
+ {
+ pcref.setServiceEndpointInterface(getOptionalElementContent(root, "service-endpoint-interface"));
+ pcref.setPortComponentLink(getOptionalElementContent(root, "port-component-link"));
+ }
+
+ public void importJBossXml(Element root, UnifiedPortComponentRefMetaData pcref)
+ {
+ // Look for call-property elements
+ Iterator iterator = DOMUtils.getChildElements(root, "call-property");
+ while (iterator.hasNext())
+ {
+ Element propElement = (Element)iterator.next();
+ String name = getElementContent(propElement, "prop-name");
+ String value = getElementContent(propElement, "prop-value");
+ pcref.addCallProperty(new UnifiedCallPropertyMetaData(name, value));
+ }
+
+ // Look for stub-property elements
+ iterator = DOMUtils.getChildElements(root, "stub-property");
+ while (iterator.hasNext())
+ {
+ Element propElement = (Element)iterator.next();
+ String name = getElementContent(propElement, "prop-name");
+ String value = getElementContent(propElement, "prop-value");
+ UnifiedStubPropertyMetaData propMetaData = new UnifiedStubPropertyMetaData();
+ propMetaData.setPropName(name);
+ propMetaData.setPropValue(value);
+ pcref.addStubProperty(propMetaData);
+ }
+
+ // portQName
+ QName portQName = getOptionalElementContentAsQName(root, "port-qname");
+ if (portQName != null)
+ pcref.setPortQName(portQName);
+
+ // config
+ Element configName = DOMUtils.getFirstChildElement(root, "config-name");
+ if (configName != null)
+ pcref.setConfigName(getTextContent(configName));
+
+ Element configFile = DOMUtils.getFirstChildElement(root, "config-file");
+ if (configFile != null)
+ pcref.setConfigFile(getTextContent(configFile));
+
+ // service-endpoint-interface
+ Element sei = DOMUtils.getFirstChildElement(root, "service-endpoint-interface");
+ if (sei != null)
+ pcref.setServiceEndpointInterface(getTextContent(sei));
+
+ }
+
+ public void importStandardXml(Element root, UnifiedHandlerMetaData href)
+ {
+ href.setHandlerName(getElementContent(root, "handler-name"));
+ href.setHandlerClass(getElementContent(root, "handler-class"));
+
+ // Parse the init-param elements
+ Iterator iterator = DOMUtils.getChildElements(root, "init-param");
+ while (iterator.hasNext())
+ {
+ Element paramElement = (Element)iterator.next();
+ UnifiedInitParamMetaData param = new UnifiedInitParamMetaData();
+ param.setParamName(getElementContent(paramElement, "param-name"));
+ param.setParamValue(getElementContent(paramElement, "param-value"));
+ href.addInitParam(param);
+ }
+
+ // Parse the soap-header elements
+ iterator = DOMUtils.getChildElements(root, "soap-header");
+ while (iterator.hasNext())
+ {
+ Element headerElement = (Element)iterator.next();
+ String content = getTextContent(headerElement);
+ QName qname = DOMUtils.resolveQName(headerElement, content);
+ href.addSoapHeader(qname);
+ }
+
+ // Parse the soap-role elements
+ iterator = DOMUtils.getChildElements(root, "soap-role");
+ while (iterator.hasNext())
+ {
+ Element roleElement = (Element)iterator.next();
+ String content = getTextContent(roleElement);
+ href.addSoapRole(content);
+ }
+
+ // Parse the port-name elements
+ iterator = DOMUtils.getChildElements(root, "port-name");
+ while (iterator.hasNext())
+ {
+ Element portElement = (Element)iterator.next();
+ String content = getTextContent(portElement);
+ href.addPortName(content);
+ }
+ }
+
+ private String getElementContent(Element element, String childName)
+ {
+ String childValue = getOptionalElementContent(element, childName);
+ if (childValue == null || childValue.length() == 0)
+ throw new IllegalStateException("Invalid null element content: " + childName);
+
+ return childValue;
+ }
+
+ private String getOptionalElementContent(Element element, String childName)
+ {
+ return getTextContent(DOMUtils.getFirstChildElement(element, childName));
+ }
+
+ private QName getOptionalElementContentAsQName(Element element, String childName)
+ {
+ QName qname = null;
+ String value = getOptionalElementContent(element, childName);
+ if (value != null)
+ {
+ qname = (value.startsWith("{") ? QName.valueOf(value) : DOMUtils.resolveQName(element, value));
+ }
+ return qname;
+ }
+
+ private String getTextContent(Element element)
+ {
+ String content = null;
+ if (element != null)
+ {
+ content = DOMUtils.getTextContent(element);
+ if (content != null)
+ content = content.trim();
+ }
+ return content;
+ }
+}
Copied: trunk/integration/spi/src/main/java/org/jboss/wsf/framework/serviceref/DefaultServiceRefMetaDataParserFactory.java (from rev 4080, branches/tdiesler/trunk/integration/spi/src/main/java/org/jboss/wsf/framework/serviceref/DefaultServiceRefMetaDataParserFactory.java)
===================================================================
--- trunk/integration/spi/src/main/java/org/jboss/wsf/framework/serviceref/DefaultServiceRefMetaDataParserFactory.java (rev 0)
+++ trunk/integration/spi/src/main/java/org/jboss/wsf/framework/serviceref/DefaultServiceRefMetaDataParserFactory.java 2007-08-02 09:23:17 UTC (rev 4081)
@@ -0,0 +1,39 @@
+/*
+ * JBoss, Home of Professional Open Source
+ * Copyright 2005, JBoss Inc., and individual contributors as indicated
+ * by the @authors tag. See the copyright.txt in the distribution for a
+ * full listing of individual contributors.
+ *
+ * This is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU Lesser General Public License as
+ * published by the Free Software Foundation; either version 2.1 of
+ * the License, or (at your option) any later version.
+ *
+ * This software is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this software; if not, write to the Free
+ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
+ * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
+ */
+package org.jboss.wsf.framework.serviceref;
+
+// $Id: ServiceRefMetaDataParser.java 3959 2007-07-20 14:44:19Z heiko.braun at jboss.com $
+
+import org.jboss.wsf.spi.metadata.j2ee.serviceref.ServiceRefMetaDataParser;
+import org.jboss.wsf.spi.metadata.j2ee.serviceref.ServiceRefMetaDataParserFactory;
+
+/**
+ * @author Thomas.Diesler at jboss.org
+ * @since 02-Aug-2007
+ */
+public class DefaultServiceRefMetaDataParserFactory implements ServiceRefMetaDataParserFactory
+{
+ public ServiceRefMetaDataParser getServiceRefMetaDataParser()
+ {
+ return new DefaultServiceRefMetaDataParser();
+ }
+}
Modified: trunk/integration/sunri/.classpath
===================================================================
--- trunk/integration/sunri/.classpath 2007-08-02 09:09:47 UTC (rev 4080)
+++ trunk/integration/sunri/.classpath 2007-08-02 09:23:17 UTC (rev 4081)
@@ -24,5 +24,6 @@
<classpathentry kind="lib" path="/integration-spi/thirdparty/dom4j.jar"/>
<classpathentry kind="lib" path="/integration-spi/thirdparty/jboss-common-core.jar"/>
<classpathentry combineaccessrules="false" kind="src" path="/integration-jboss50"/>
+ <classpathentry combineaccessrules="false" kind="src" path="/spi"/>
<classpathentry kind="output" path="output/eclipse"/>
</classpath>
Modified: trunk/integration/sunri/ant-import/build-bin-dist.xml
===================================================================
--- trunk/integration/sunri/ant-import/build-bin-dist.xml 2007-08-02 09:09:47 UTC (rev 4080)
+++ trunk/integration/sunri/ant-import/build-bin-dist.xml 2007-08-02 09:23:17 UTC (rev 4081)
@@ -61,7 +61,7 @@
<fileset dir="${int.sunri.dir}/ant-import">
<include name="macros-deploy-sunri.xml"/>
</fileset>
- <fileset dir="${spi.dir}/ant-import">
+ <fileset dir="${framework.dir}/ant-import">
<include name="macros-deploy-spi.xml"/>
</fileset>
<fileset dir="${int.xfire.dir}/ant-import">
@@ -73,7 +73,7 @@
</copy>
<copy todir="${bindist.bin.dir}">
- <fileset dir="${spi.dir}/src/main/etc">
+ <fileset dir="${framework.dir}/src/main/etc">
<include name="*.sh"/>
<include name="*.bat"/>
</fileset>
@@ -94,11 +94,12 @@
<!-- lib -->
<copy todir="${bindist.lib.dir}" overwrite="true">
- <fileset dir="${spi.dir}/output/lib">
+ <fileset dir="${framework.dir}/output/lib">
+ <include name="jbossws-framework.jar"/>
+ <include name="jbossws-framework-scripts.zip"/>
+ </fileset>
+ <fileset dir="${framework.dir}/thirdparty">
<include name="jbossws-spi.jar"/>
- <include name="jbossws-spi-scripts.zip"/>
- </fileset>
- <fileset dir="${spi.dir}/thirdparty">
<include name="getopt.jar"/>
<include name="wsdl4j.jar"/>
</fileset>
Modified: trunk/integration/sunri/ant-import/build-deploy.xml
===================================================================
--- trunk/integration/sunri/ant-import/build-deploy.xml 2007-08-02 09:09:47 UTC (rev 4080)
+++ trunk/integration/sunri/ant-import/build-deploy.xml 2007-08-02 09:23:17 UTC (rev 4081)
@@ -14,7 +14,7 @@
<project>
<import file="${int.sunri.dir}/ant-import/macros-deploy-sunri.xml"/>
- <import file="${spi.dir}/ant-import/macros-deploy-spi.xml"/>
+ <import file="${framework.dir}/ant-import/macros-deploy-wsf.xml"/>
<!-- ================================================================== -->
<!-- Deployment -->
@@ -25,21 +25,21 @@
<ant antfile="${int.native.dir}/build.xml" target="undeploy-jboss50" inheritall="false"/>
<ant antfile="${int.xfire.dir}/build.xml" target="undeploy-jboss50" inheritall="false"/>
<macro-deploy-sunri50
- spilibs="${spi.dir}/output/lib"
+ wsflibs="${framework.dir}/output/lib"
jbosslibs="${int.jboss50.dir}/output/lib"
stacklibs="${int.sunri.dir}/output/lib"
thirdpartylibs="${int.sunri.dir}/thirdparty"/>
- <macro-deploy-spi
- spilibs="${spi.dir}/output/lib"
- thirdpartylibs="${spi.dir}/thirdparty"
+ <macro-deploy-wsf
+ wsflibs="${framework.dir}/output/lib"
+ thirdpartylibs="${framework.dir}/thirdparty"
jbosshome="${jboss50.home}"/>
</target>
<!-- Remove from jboss50 -->
<target name="undeploy-jboss50" depends="prepare" description="Remove jbossws/sunri from jboss50">
<macro-undeploy-sunri50/>
- <macro-undeploy-spi jbosshome="${jboss50.home}"/>
+ <macro-undeploy-wsf jbosshome="${jboss50.home}"/>
</target>
<!-- Deploy to jboss42 -->
@@ -47,21 +47,21 @@
<ant antfile="${int.native.dir}/build.xml" target="undeploy-jboss42" inheritall="false"/>
<ant antfile="${int.xfire.dir}/build.xml" target="undeploy-jboss42" inheritall="false"/>
<macro-deploy-sunri42
- spilibs="${spi.dir}/output/lib"
+ wsflibs="${framework.dir}/output/lib"
jbosslibs="${int.jboss42.dir}/output/lib"
stacklibs="${int.sunri.dir}/output/lib"
thirdpartylibs="${int.sunri.dir}/thirdparty"/>
- <macro-deploy-spi
- spilibs="${spi.dir}/output/lib"
- thirdpartylibs="${spi.dir}/thirdparty"
+ <macro-deploy-wsf
+ wsflibs="${framework.dir}/output/lib"
+ thirdpartylibs="${framework.dir}/thirdparty"
jbosshome="${jboss42.home}"/>
</target>
<!-- Remove from jboss42 -->
<target name="undeploy-jboss42" depends="prepare" description="Remove jbossws/sunri from jboss42">
<macro-undeploy-sunri42/>
- <macro-undeploy-spi jbosshome="${jboss42.home}"/>
+ <macro-undeploy-wsf jbosshome="${jboss42.home}"/>
</target>
</project>
Modified: trunk/integration/sunri/ant-import/build-testsuite.xml
===================================================================
--- trunk/integration/sunri/ant-import/build-testsuite.xml 2007-08-02 09:09:47 UTC (rev 4080)
+++ trunk/integration/sunri/ant-import/build-testsuite.xml 2007-08-02 09:23:17 UTC (rev 4081)
@@ -27,7 +27,8 @@
<target name="tests-init" depends="tests-classpath">
<path id="ws.stack.classpath">
- <pathelement location="${spi.dir}/output/lib/jbossws-spi.jar"/>
+ <pathelement location="${framework.dir}/output/lib/jbossws-framework.jar"/>
+ <pathelement location="${int.sunri.dir}/thirdparty/jbossws-spi.jar"/>
<pathelement location="${int.sunri.dir}/thirdparty/FastInfoset.jar"/>
<pathelement location="${int.sunri.dir}/thirdparty/http.jar"/>
<pathelement location="${int.sunri.dir}/thirdparty/jaxws-api.jar"/>
Modified: trunk/integration/sunri/ant-import/build-thirdparty.xml
===================================================================
--- trunk/integration/sunri/ant-import/build-thirdparty.xml 2007-08-02 09:09:47 UTC (rev 4080)
+++ trunk/integration/sunri/ant-import/build-thirdparty.xml 2007-08-02 09:23:17 UTC (rev 4081)
@@ -43,6 +43,7 @@
<mkdir dir="${thirdparty.dir}"/>
<get src="${jboss.repository}/jboss/jaxr/${jboss-jaxr}/lib/juddi-service.sar" dest="${thirdparty.dir}/juddi-service.sar" usetimestamp="true" verbose="true"/>
+ <get src="${jboss.repository}/jboss/jbossws-spi/${jbossws-spi}/lib/jbossws-spi.jar" dest="${thirdparty.dir}/jbossws-spi.jar" usetimestamp="true" verbose="true"/>
<get src="${jboss.repository}/sun-jaxb/${sun-jaxb}/lib/jaxb-api.jar" dest="${thirdparty.dir}/jaxb-api.jar" usetimestamp="true" verbose="true"/>
<get src="${jboss.repository}/sun-jaxb/${sun-jaxb}/lib/jaxb-impl.jar" dest="${thirdparty.dir}/jaxb-impl.jar" usetimestamp="true" verbose="true"/>
<get src="${jboss.repository}/sun-jaxb/${sun-jaxb}/lib/jaxb-xjc.jar" dest="${thirdparty.dir}/jaxb-xjc.jar" usetimestamp="true" verbose="true"/>
@@ -56,7 +57,6 @@
<get src="${jboss.repository}/sun-jaxws/${sun-jaxws}/lib/saaj-api.jar" dest="${thirdparty.dir}/saaj-api.jar" usetimestamp="true" verbose="true"/>
<get src="${jboss.repository}/sun-jaxws/${sun-jaxws}/lib/saaj-impl.jar" dest="${thirdparty.dir}/saaj-impl.jar" usetimestamp="true" verbose="true"/>
<get src="${jboss.repository}/sun-jaxws/${sun-jaxws}/lib/sjsxp.jar" dest="${thirdparty.dir}/sjsxp.jar" usetimestamp="true" verbose="true"/>
-
<get src="${jboss.repository}/sun-jaxws/${sun-jaxws}/lib/jaxws-rt.jar" dest="${thirdparty.dir}/jaxws-rt.jar" usetimestamp="true" verbose="true"/>
<get src="${jboss.repository}/sun-jaxws/${sun-jaxws}/lib/jaxws-tools.jar" dest="${thirdparty.dir}/jaxws-tools.jar" usetimestamp="true" verbose="true"/>
<get src="${jboss.repository}/sun-jaxws/${sun-jaxws}/lib/stax-ex.jar" dest="${thirdparty.dir}/stax-ex.jar" usetimestamp="true" verbose="true"/>
@@ -65,7 +65,6 @@
<get src="${jboss.repository}/sun-servlet/${sun-servlet}/lib/servlet-api.jar" dest="${thirdparty.dir}/servlet-api.jar" usetimestamp="true" verbose="true"/>
<get src="${jboss.repository}/woodstox/${woodstox}/lib/wstx.jar" dest="${thirdparty.dir}/wstx.jar" usetimestamp="true" verbose="true"/>
<get src="${jboss.repository}/ibm-wsdl4j/${ibm-wsdl4j}/lib/wsdl4j.jar" dest="${thirdparty.dir}/wsdl4j.jar" usetimestamp="true" verbose="true"/>
-
<checksum file="${int.sunri.dir}/version.properties" fileext=".md5"/>
</target>
@@ -73,17 +72,18 @@
<!-- The compile classpath for jboss50 integration -->
<path id="sunri.integration.classpath">
- <pathelement location="${spi.dir}/output/lib/jbossws-spi.jar"/>
- <pathelement location="${spi.dir}/thirdparty/dom4j.jar"/>
- <pathelement location="${spi.dir}/thirdparty/jboss-common-core.jar"/>
- <pathelement location="${spi.dir}/thirdparty/jboss-logging-spi.jar"/>
- <pathelement location="${spi.dir}/thirdparty/jboss-javaee.jar"/>
+ <pathelement location="${framework.dir}/output/lib/jbossws-framework.jar"/>
+ <pathelement location="${framework.dir}/thirdparty/dom4j.jar"/>
+ <pathelement location="${framework.dir}/thirdparty/jboss-common-core.jar"/>
+ <pathelement location="${framework.dir}/thirdparty/jboss-logging-spi.jar"/>
+ <pathelement location="${framework.dir}/thirdparty/jboss-javaee.jar"/>
<pathelement location="${thirdparty.dir}/http.jar"/>
<pathelement location="${thirdparty.dir}/jaxb-api.jar"/>
<pathelement location="${thirdparty.dir}/jaxb-xjc.jar"/>
<pathelement location="${thirdparty.dir}/jaxws-api.jar"/>
<pathelement location="${thirdparty.dir}/jaxws-tools.jar"/>
<pathelement location="${thirdparty.dir}/jaxws-rt.jar"/>
+ <pathelement location="${thirdparty.dir}/jbossws-spi.jar"/>
<pathelement location="${thirdparty.dir}/jsr181-api.jar"/>
<pathelement location="${thirdparty.dir}/servlet-api.jar"/>
</path>
Modified: trunk/integration/sunri/build.xml
===================================================================
--- trunk/integration/sunri/build.xml 2007-08-02 09:09:47 UTC (rev 4080)
+++ trunk/integration/sunri/build.xml 2007-08-02 09:23:17 UTC (rev 4081)
@@ -41,7 +41,7 @@
<!-- ================================================================== -->
<target name="init" depends="prepare,thirdparty">
- <ant antfile="${spi.dir}/build.xml" target="jars" inheritall="false"/>
+ <ant antfile="${framework.dir}/build.xml" target="jars" inheritall="false"/>
<mkdir dir="${sunri.output.apidocs.dir}"/>
</target>
@@ -165,7 +165,7 @@
<include name="jbossws-context.war"/>
</fileset>
- <fileset dir="${spi.dir}/thirdparty">
+ <fileset dir="${framework.dir}/thirdparty">
<include name="jaxrpc-api.jar"/>
</fileset>
<fileset dir="${thirdparty.dir}">
@@ -214,7 +214,7 @@
<fileset dir="${sunri.output.lib.dir}">
<include name="jbossws-context.war"/>
</fileset>
- <fileset dir="${spi.dir}/thirdparty">
+ <fileset dir="${framework.dir}/thirdparty">
<include name="jaxrpc-api.jar"/>
</fileset>
<fileset dir="${int.jboss42.dir}/output/lib">
@@ -261,7 +261,7 @@
<classpath>
<pathelement path="${sunri50.integration.classpath}"/>
<pathelement path="${sunri.integration.classpath}"/>
- <fileset dir="${spi.dir}/thirdparty">
+ <fileset dir="${framework.dir}/thirdparty">
<include name="**/*.jar"/>
</fileset>
</classpath>
@@ -272,7 +272,7 @@
<packageset dir="${sunri.output.dir}/thirdparty-sources" defaultexcludes="yes">
<include name="com/sun/**"/>
</packageset>
- <packageset dir="${spi.dir}/src/main/java">
+ <packageset dir="${framework.dir}/src/main/java">
<include name="org/jboss/wsf/**"/>
<include name="org/jboss/ws/**"/>
</packageset>
Modified: trunk/integration/sunri/src/main/etc/bin-dist-build.xml
===================================================================
--- trunk/integration/sunri/src/main/etc/bin-dist-build.xml 2007-08-02 09:09:47 UTC (rev 4080)
+++ trunk/integration/sunri/src/main/etc/bin-dist-build.xml 2007-08-02 09:23:17 UTC (rev 4081)
@@ -78,6 +78,7 @@
<target name="tests-init" depends="prepare,tests-classpath">
<path id="ws.stack.classpath">
+ <pathelement location="${lib.dir}/jbossws-framework.jar"/>
<pathelement location="${lib.dir}/jbossws-spi.jar"/>
<pathelement location="${thirdparty.dir}/FastInfoset.jar"/>
<pathelement location="${thirdparty.dir}/http.jar"/>
Modified: trunk/integration/xfire/.classpath
===================================================================
--- trunk/integration/xfire/.classpath 2007-08-02 09:09:47 UTC (rev 4080)
+++ trunk/integration/xfire/.classpath 2007-08-02 09:23:17 UTC (rev 4081)
@@ -19,5 +19,6 @@
<classpathentry kind="lib" path="thirdparty/spring-beans.jar"/>
<classpathentry kind="lib" path="thirdparty/spring-core.jar"/>
<classpathentry kind="lib" path="thirdparty/spring-web.jar"/>
+ <classpathentry combineaccessrules="false" kind="src" path="/spi"/>
<classpathentry kind="output" path="output/eclipse"/>
</classpath>
Modified: trunk/integration/xfire/ant-import/build-bin-dist.xml
===================================================================
--- trunk/integration/xfire/ant-import/build-bin-dist.xml 2007-08-02 09:09:47 UTC (rev 4080)
+++ trunk/integration/xfire/ant-import/build-bin-dist.xml 2007-08-02 09:23:17 UTC (rev 4081)
@@ -62,7 +62,7 @@
<fileset dir="${int.sunri.dir}/ant-import">
<include name="macros-deploy-sunri.xml"/>
</fileset>
- <fileset dir="${spi.dir}/ant-import">
+ <fileset dir="${framework.dir}/ant-import">
<include name="macros-deploy-spi.xml"/>
</fileset>
<fileset dir="${int.xfire.dir}/ant-import">
@@ -74,7 +74,7 @@
</copy>
<copy todir="${bindist.bin.dir}">
- <fileset dir="${spi.dir}/src/main/etc">
+ <fileset dir="${framework.dir}/src/main/etc">
<include name="*.sh"/>
<include name="*.bat"/>
</fileset>
@@ -95,11 +95,12 @@
<!-- lib -->
<copy todir="${bindist.lib.dir}" overwrite="true">
- <fileset dir="${spi.dir}/output/lib">
+ <fileset dir="${framework.dir}/output/lib">
+ <include name="jbossws-framework.jar"/>
+ <include name="jbossws-framework-scripts.zip"/>
+ </fileset>
+ <fileset dir="${framework.dir}/thirdparty">
<include name="jbossws-spi.jar"/>
- <include name="jbossws-spi-scripts.zip"/>
- </fileset>
- <fileset dir="${spi.dir}/thirdparty">
<include name="getopt.jar"/>
<include name="wsdl4j.jar"/>
</fileset>
Modified: trunk/integration/xfire/ant-import/build-deploy.xml
===================================================================
--- trunk/integration/xfire/ant-import/build-deploy.xml 2007-08-02 09:09:47 UTC (rev 4080)
+++ trunk/integration/xfire/ant-import/build-deploy.xml 2007-08-02 09:23:17 UTC (rev 4081)
@@ -14,7 +14,7 @@
<project>
<import file="${int.xfire.dir}/ant-import/macros-deploy-xfire.xml"/>
- <import file="${spi.dir}/ant-import/macros-deploy-spi.xml"/>
+ <import file="${framework.dir}/ant-import/macros-deploy-wsf.xml"/>
<!-- ================================================================== -->
<!-- Deployment -->
@@ -25,21 +25,21 @@
<ant antfile="${int.native.dir}/build.xml" target="undeploy-jboss50" inheritall="false"/>
<ant antfile="${int.sunri.dir}/build.xml" target="undeploy-jboss50" inheritall="false"/>
<macro-deploy-xfire50
- spilibs="${spi.dir}/output/lib"
+ wsflibs="${framework.dir}/output/lib"
jbosslibs="${int.jboss50.dir}/output/lib"
stacklibs="${int.xfire.dir}/output/lib"
thirdpartylibs="${int.xfire.dir}/thirdparty"/>
- <macro-deploy-spi
- spilibs="${spi.dir}/output/lib"
- thirdpartylibs="${spi.dir}/thirdparty"
+ <macro-deploy-wsf
+ wsflibs="${framework.dir}/output/lib"
+ thirdpartylibs="${framework.dir}/thirdparty"
jbosshome="${jboss50.home}"/>
</target>
<!-- Remove from jboss50 -->
<target name="undeploy-jboss50" depends="prepare" description="Remove jbossws/xfire from jboss50">
<macro-undeploy-xfire50/>
- <macro-undeploy-spi jbosshome="${jboss50.home}"/>
+ <macro-undeploy-wsf jbosshome="${jboss50.home}"/>
</target>
<!-- Deploy to jboss42 -->
@@ -47,21 +47,21 @@
<ant antfile="${int.native.dir}/build.xml" target="undeploy-jboss42" inheritall="false"/>
<ant antfile="${int.sunri.dir}/build.xml" target="undeploy-jboss42" inheritall="false"/>
<macro-deploy-xfire42
- spilibs="${spi.dir}/output/lib"
+ wsflibs="${framework.dir}/output/lib"
jbosslibs="${int.jboss42.dir}/output/lib"
stacklibs="${int.xfire.dir}/output/lib"
thirdpartylibs="${int.xfire.dir}/thirdparty"/>
- <macro-deploy-spi
- spilibs="${spi.dir}/output/lib"
- thirdpartylibs="${spi.dir}/thirdparty"
+ <macro-deploy-wsf
+ wsflibs="${framework.dir}/output/lib"
+ thirdpartylibs="${framework.dir}/thirdparty"
jbosshome="${jboss42.home}"/>
</target>
<!-- Remove from jboss42 -->
<target name="undeploy-jboss42" depends="prepare" description="Remove jbossws/xfire from jboss42">
<macro-undeploy-xfire42/>
- <macro-undeploy-spi jbosshome="${jboss42.home}"/>
+ <macro-undeploy-wsf jbosshome="${jboss42.home}"/>
</target>
</project>
Modified: trunk/integration/xfire/ant-import/build-testsuite.xml
===================================================================
--- trunk/integration/xfire/ant-import/build-testsuite.xml 2007-08-02 09:09:47 UTC (rev 4080)
+++ trunk/integration/xfire/ant-import/build-testsuite.xml 2007-08-02 09:23:17 UTC (rev 4081)
@@ -27,7 +27,8 @@
<target name="tests-init" depends="tests-classpath">
<path id="ws.stack.classpath">
- <pathelement location="${spi.dir}/output/lib/jbossws-spi.jar"/>
+ <pathelement location="${framework.dir}/output/lib/jbossws-framework.jar"/>
+ <pathelement location="${int.xfire.dir}/thirdparty/jbossws-spi.jar"/>
<pathelement location="${int.xfire.dir}/thirdparty/cxf-incubator.jar"/>
<pathelement location="${int.xfire.dir}/thirdparty/geronimo-javamail.jar"/>
<pathelement location="${int.xfire.dir}/thirdparty/geronimo-ws-metadata.jar"/>
Modified: trunk/integration/xfire/ant-import/build-thirdparty.xml
===================================================================
--- trunk/integration/xfire/ant-import/build-thirdparty.xml 2007-08-02 09:09:47 UTC (rev 4080)
+++ trunk/integration/xfire/ant-import/build-thirdparty.xml 2007-08-02 09:23:17 UTC (rev 4081)
@@ -58,6 +58,7 @@
<get src="${jboss.repository}/ibm-wsdl4j/${ibm-wsdl4j}/lib/wsdl4j.jar" dest="${thirdparty.dir}/wsdl4j.jar" usetimestamp="true" verbose="true"/>
<get src="${jboss.repository}/ibm-wsdl4j/${ibm-wsdl4j}/lib/wsdl4j-src.jar" dest="${thirdparty.dir}/wsdl4j-src.jar" usetimestamp="true" verbose="true"/>
<get src="${jboss.repository}/jboss/jaxr/${jboss-jaxr}/lib/juddi-service.sar" dest="${thirdparty.dir}/juddi-service.sar" usetimestamp="true" verbose="true"/>
+ <get src="${jboss.repository}/jboss/jbossws-spi/${jbossws-spi}/lib/jbossws-spi.jar" dest="${thirdparty.dir}/jbossws-spi.jar" usetimestamp="true" verbose="true"/>
<get src="${jboss.repository}/stax-api/${stax-api}/lib/stax-api.jar" dest="${thirdparty.dir}/stax-api.jar" usetimestamp="true" verbose="true"/>
<get src="${jboss.repository}/sun-jaxb/${sun-jaxb}/lib/jaxb-api.jar" dest="${thirdparty.dir}/jaxb-api.jar" usetimestamp="true" verbose="true"/>
<get src="${jboss.repository}/sun-jaxb/${sun-jaxb}/lib/jaxb-impl.jar" dest="${thirdparty.dir}/jaxb-impl.jar" usetimestamp="true" verbose="true"/>
@@ -71,14 +72,15 @@
<target name="thirdparty-classpath" depends="thirdparty-init">
<path id="xfire.integration.classpath">
- <pathelement location="${spi.dir}/output/lib/jbossws-spi.jar"/>
- <pathelement location="${spi.dir}/thirdparty/dom4j.jar"/>
- <pathelement location="${spi.dir}/thirdparty/jboss-common-core.jar"/>
- <pathelement location="${spi.dir}/thirdparty/jboss-logging-spi.jar"/>
+ <pathelement location="${framework.dir}/output/lib/jbossws-framework.jar"/>
+ <pathelement location="${framework.dir}/thirdparty/dom4j.jar"/>
+ <pathelement location="${framework.dir}/thirdparty/jboss-common-core.jar"/>
+ <pathelement location="${framework.dir}/thirdparty/jboss-logging-spi.jar"/>
<pathelement location="${thirdparty.dir}/cxf-incubator.jar"/>
<pathelement location="${thirdparty.dir}/geronimo-ws-metadata.jar"/>
<pathelement location="${thirdparty.dir}/jaxb-api.jar"/>
<pathelement location="${thirdparty.dir}/jaxws-api.jar"/>
+ <pathelement location="${thirdparty.dir}/jbossws-spi.jar"/>
<pathelement location="${thirdparty.dir}/saaj-api.jar"/>
<pathelement location="${thirdparty.dir}/saaj-impl.jar"/>
<pathelement location="${thirdparty.dir}/servlet-api.jar"/>
Modified: trunk/integration/xfire/ant-import/macros-deploy-xfire.xml
===================================================================
--- trunk/integration/xfire/ant-import/macros-deploy-xfire.xml 2007-08-02 09:09:47 UTC (rev 4080)
+++ trunk/integration/xfire/ant-import/macros-deploy-xfire.xml 2007-08-02 09:23:17 UTC (rev 4081)
@@ -29,12 +29,13 @@
<!-- CLIENT JARS -->
<copy todir="${jboss50.home}/client" overwrite="true">
<fileset dir="@{spilibs}">
- <include name="jbossws-spi.jar"/>
+ <include name="jbossws-framework.jar"/>
</fileset>
<fileset dir="@{jbosslibs}">
<include name="jbossws-jboss50.jar"/>
</fileset>
<fileset dir="@{thirdpartylibs}">
+ <include name="jbossws-spi.jar"/>
<include name="jaxb-api.jar"/>
<include name="jaxb-impl.jar"/>
<include name="jaxb-xjc.jar"/>
@@ -77,6 +78,7 @@
<!-- CLIENT JARS -->
<fileset dir="${jboss50.home}/client">
+ <include name="jbossws-framework.jar"/>
<include name="jbossws-spi.jar"/>
<include name="jbossws-jboss50.jar"/>
</fileset>
@@ -110,12 +112,13 @@
<!-- CLIENT JARS -->
<copy todir="${jboss42.home}/client" overwrite="true">
<fileset dir="@{spilibs}">
- <include name="jbossws-spi.jar"/>
+ <include name="jbossws-framework.jar"/>
</fileset>
<fileset dir="@{jbosslibs}">
<include name="jbossws-jboss42.jar"/>
</fileset>
<fileset dir="@{thirdpartylibs}">
+ <include name="jbossws-spi.jar"/>
<include name="jaxb-api.jar"/>
<include name="jaxb-impl.jar"/>
<include name="jaxb-xjc.jar"/>
Modified: trunk/integration/xfire/build.xml
===================================================================
--- trunk/integration/xfire/build.xml 2007-08-02 09:09:47 UTC (rev 4080)
+++ trunk/integration/xfire/build.xml 2007-08-02 09:23:17 UTC (rev 4081)
@@ -41,7 +41,7 @@
<!-- ================================================================== -->
<target name="init" depends="prepare,thirdparty">
- <ant antfile="${spi.dir}/build.xml" target="jars" inheritall="false"/>
+ <ant antfile="${framework.dir}/build.xml" target="jars" inheritall="false"/>
<mkdir dir="${xfire.output.apidocs.dir}"/>
</target>
@@ -151,7 +151,7 @@
<include name="jbossws-context.war"/>
</fileset>
- <fileset dir="${spi.dir}/thirdparty">
+ <fileset dir="${framework.dir}/thirdparty">
<include name="jaxrpc-api.jar"/>
</fileset>
<fileset dir="${thirdparty.dir}">
@@ -205,7 +205,7 @@
<fileset dir="${xfire.output.lib.dir}">
<include name="jbossws-context.war"/>
</fileset>
- <fileset dir="${spi.dir}/thirdparty">
+ <fileset dir="${framework.dir}/thirdparty">
<include name="jaxrpc-api.jar"/>
</fileset>
<fileset dir="${int.jboss42.dir}/output/lib">
@@ -254,7 +254,7 @@
<javadoc destdir="${xfire.output.apidocs.dir}" author="true" version="true" use="true" windowtitle="JBossWS API ${version.id} ">
<classpath>
<pathelement path="${xfire.integration.classpath}"/>
- <fileset dir="${spi.dir}/thirdparty">
+ <fileset dir="${framework.dir}/thirdparty">
<include name="**/*.jar"/>
</fileset>
</classpath>
@@ -264,7 +264,7 @@
<packageset dir="${xfire.output.dir}/thirdparty-sources" defaultexcludes="yes">
<include name="org/codehaus/**"/>
</packageset>
- <packageset dir="${spi.dir}/src/main/java">
+ <packageset dir="${framework.dir}/src/main/java">
<include name="org/jboss/wsf/**"/>
<include name="org/jboss/ws/**"/>
</packageset>
Modified: trunk/integration/xfire/src/main/etc/bin-dist-build.xml
===================================================================
--- trunk/integration/xfire/src/main/etc/bin-dist-build.xml 2007-08-02 09:09:47 UTC (rev 4080)
+++ trunk/integration/xfire/src/main/etc/bin-dist-build.xml 2007-08-02 09:23:17 UTC (rev 4081)
@@ -79,6 +79,7 @@
<target name="tests-init" depends="prepare,tests-classpath">
<path id="ws.stack.classpath">
+ <pathelement location="${lib.dir}/jbossws-framework.jar"/>
<pathelement location="${lib.dir}/jbossws-spi.jar"/>
<pathelement location="${lib.dir}/cxf-incubator.jar"/>
<pathelement location="${lib.dir}/geronimo-javamail.jar"/>
Modified: trunk/jbossws-core/.classpath
===================================================================
--- trunk/jbossws-core/.classpath 2007-08-02 09:09:47 UTC (rev 4080)
+++ trunk/jbossws-core/.classpath 2007-08-02 09:23:17 UTC (rev 4081)
@@ -37,5 +37,6 @@
<classpathentry kind="lib" path="thirdparty/jaxws-tools.jar"/>
<classpathentry kind="lib" path="thirdparty/jaxws-rt.jar"/>
<classpathentry kind="lib" path="thirdparty/concurrent.jar"/>
+ <classpathentry combineaccessrules="false" kind="src" path="/spi"/>
<classpathentry kind="output" path="output/eclipse"/>
</classpath>
Modified: trunk/jbossws-core/ant-import/build-thirdparty.xml
===================================================================
--- trunk/jbossws-core/ant-import/build-thirdparty.xml 2007-08-02 09:09:47 UTC (rev 4080)
+++ trunk/jbossws-core/ant-import/build-thirdparty.xml 2007-08-02 09:23:17 UTC (rev 4081)
@@ -82,6 +82,7 @@
<get src="${jboss.repository}/jboss/security/${jboss-security}/lib/jbosssx.jar" dest="${thirdparty.dir}/jbosssx.jar" usetimestamp="true" verbose="true"/>
<get src="${jboss.repository}/jboss/security/${jboss-security}/lib/jbosssx-src.zip" dest="${thirdparty.dir}/jbosssx-src.zip" usetimestamp="true" verbose="true"/>
<get src="${jboss.repository}/jbossas/core-libs/${jbossas-core-libs}/lib/jboss-j2ee.jar" dest="${thirdparty.dir}/jboss-j2ee.jar" usetimestamp="true" verbose="true"/>
+ <get src="${jboss.repository}/jboss/jbossws-spi/${jbossws-spi}/lib/jbossws-spi.jar" dest="${thirdparty.dir}/jbossws-spi.jar" usetimestamp="true" verbose="true"/>
<get src="${jboss.repository}/jbpm/bpel/${jbpm-bpel}/lib/jbpm-bpel.sar" dest="${thirdparty.dir}/jbpm-bpel.sar" usetimestamp="true" verbose="true" />
<get src="${jboss.repository}/oswego-concurrent/${oswego-concurrent}/lib/concurrent.jar" dest="${thirdparty.dir}/concurrent.jar" usetimestamp="true" verbose="true"/>
<get src="${jboss.repository}/qdox/${qdox}/lib/qdox.jar" dest="${thirdparty.dir}/qdox.jar" usetimestamp="true" verbose="true"/>
@@ -115,7 +116,7 @@
<!-- The compile classpath for jbossws core -->
<path id="thirdparty.classpath">
- <pathelement location="${spi.dir}/output/lib/jbossws-spi.jar"/>
+ <pathelement location="${framework.dir}/output/lib/jbossws-framework.jar"/>
<pathelement location="${thirdparty.dir}/ejb3.deployer/jboss-annotations-ejb3.jar"/>
<pathelement location="${thirdparty.dir}/ejb3.deployer/jboss-ejb3x.jar"/>
<pathelement location="${thirdparty.dir}/ant.jar"/>
@@ -136,6 +137,7 @@
<pathelement location="${thirdparty.dir}/jboss-remoting.jar"/>
<pathelement location="${thirdparty.dir}/jboss-xml-binding.jar"/>
<pathelement location="${thirdparty.dir}/jbosssx.jar"/>
+ <pathelement location="${thirdparty.dir}/jbossws-spi.jar"/>
<pathelement location="${thirdparty.dir}/mail.jar"/>
<pathelement location="${thirdparty.dir}/policy.jar"/>
<pathelement location="${thirdparty.dir}/servlet-api.jar"/>
Modified: trunk/jbossws-core/ant-import-tests/build-testsuite.xml
===================================================================
--- trunk/jbossws-core/ant-import-tests/build-testsuite.xml 2007-08-02 09:09:47 UTC (rev 4080)
+++ trunk/jbossws-core/ant-import-tests/build-testsuite.xml 2007-08-02 09:23:17 UTC (rev 4081)
@@ -28,12 +28,13 @@
<target name="tests-init" depends="thirdparty-classpath,tests-classpath">
<path id="ws.stack.classpath">
- <pathelement location="${spi.dir}/output/lib/jbossws-spi.jar"/>
+ <pathelement location="${framework.dir}/output/lib/jbossws-framework.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"/>
<pathelement location="${core.dir}/output/lib/jbossws-core.jar"/>
<pathelement location="${core.dir}/output/lib/jbossws-client.jar"/>
+ <pathelement location="${core.dir}/thirdparty/jbossws-spi.jar"/>
<pathelement location="${core.dir}/thirdparty/policy.jar"/>
<pathelement location="${core.dir}/thirdparty/wsdl4j.jar"/>
<pathelement location="${core.dir}/thirdparty/wstx.jar"/>
Modified: trunk/jbossws-core/build.xml
===================================================================
--- trunk/jbossws-core/build.xml 2007-08-02 09:09:47 UTC (rev 4080)
+++ trunk/jbossws-core/build.xml 2007-08-02 09:23:17 UTC (rev 4081)
@@ -33,7 +33,7 @@
<property name="core.output.lib.dir" value="${core.output.dir}/lib"/>
<target name="init" depends="prepare,thirdparty-get">
- <ant antfile="${spi.dir}/build.xml" target="jars" inheritall="false"/>
+ <ant antfile="${framework.dir}/build.xml" target="jars" inheritall="false"/>
</target>
<!-- ================================================================== -->
Modified: trunk/jbossws-core/src/main/java/org/jboss/ws/core/jaxws/JAXBContextFactory.java
===================================================================
--- trunk/jbossws-core/src/main/java/org/jboss/ws/core/jaxws/JAXBContextFactory.java 2007-08-02 09:09:47 UTC (rev 4080)
+++ trunk/jbossws-core/src/main/java/org/jboss/ws/core/jaxws/JAXBContextFactory.java 2007-08-02 09:23:17 UTC (rev 4081)
@@ -22,7 +22,7 @@
package org.jboss.ws.core.jaxws;
import org.jboss.ws.WSException;
-import org.jboss.wsf.common.ServiceLoader;
+import org.jboss.wsf.spi.util.ServiceLoader;
import javax.xml.bind.JAXBContext;
@@ -41,7 +41,7 @@
public abstract JAXBContext createContext(Class clazz) throws WSException;
/**
- * Retrieve JAXBContextFactory instance through the {@link org.jboss.wsf.common.ServiceLoader}.
+ * Retrieve JAXBContextFactory instance through the {@link org.jboss.wsf.spi.util.ServiceLoader}.
* Defaults to {@link CustomizableJAXBContextFactory}
* @return JAXBContextFactory
*/
Modified: trunk/jbossws-core/src/main/java/org/jboss/ws/core/jaxws/handler/LogicalMessageImpl.java
===================================================================
--- trunk/jbossws-core/src/main/java/org/jboss/ws/core/jaxws/handler/LogicalMessageImpl.java 2007-08-02 09:09:47 UTC (rev 4080)
+++ trunk/jbossws-core/src/main/java/org/jboss/ws/core/jaxws/handler/LogicalMessageImpl.java 2007-08-02 09:23:17 UTC (rev 4081)
@@ -47,7 +47,7 @@
import org.jboss.ws.core.soap.Style;
import org.jboss.ws.core.soap.XMLFragment;
import org.jboss.wsf.common.DOMUtils;
-import org.jboss.wsf.common.ServiceLoader;
+import org.jboss.wsf.spi.util.ServiceLoader;
import org.w3c.dom.Element;
/**
Modified: trunk/jbossws-core/src/main/java/org/jboss/ws/core/soap/MessageFactoryImpl.java
===================================================================
--- trunk/jbossws-core/src/main/java/org/jboss/ws/core/soap/MessageFactoryImpl.java 2007-08-02 09:09:47 UTC (rev 4080)
+++ trunk/jbossws-core/src/main/java/org/jboss/ws/core/soap/MessageFactoryImpl.java 2007-08-02 09:23:17 UTC (rev 4081)
@@ -45,8 +45,8 @@
import org.jboss.ws.core.CommonMessageContext;
import org.jboss.ws.core.soap.attachment.MimeConstants;
import org.jboss.ws.core.soap.attachment.MultipartRelatedDecoder;
-import org.jboss.wsf.common.ServiceLoader;
import org.jboss.wsf.common.IOUtils;
+import org.jboss.wsf.spi.util.ServiceLoader;
/**
* MessageFactory implementation
Modified: trunk/jbossws-core/src/main/java/org/jboss/ws/core/soap/SOAPPartImpl.java
===================================================================
--- trunk/jbossws-core/src/main/java/org/jboss/ws/core/soap/SOAPPartImpl.java 2007-08-02 09:09:47 UTC (rev 4080)
+++ trunk/jbossws-core/src/main/java/org/jboss/ws/core/soap/SOAPPartImpl.java 2007-08-02 09:23:17 UTC (rev 4081)
@@ -42,7 +42,7 @@
import org.jboss.logging.Logger;
import org.jboss.util.NotImplementedException;
-import org.jboss.wsf.common.ServiceLoader;
+import org.jboss.wsf.spi.util.ServiceLoader;
import org.w3c.dom.Attr;
import org.w3c.dom.CDATASection;
import org.w3c.dom.Comment;
Modified: trunk/jbossws-core/src/main/java/org/jboss/ws/extensions/eventing/mgmt/SubscriptionManagerFactory.java
===================================================================
--- trunk/jbossws-core/src/main/java/org/jboss/ws/extensions/eventing/mgmt/SubscriptionManagerFactory.java 2007-08-02 09:09:47 UTC (rev 4080)
+++ trunk/jbossws-core/src/main/java/org/jboss/ws/extensions/eventing/mgmt/SubscriptionManagerFactory.java 2007-08-02 09:23:17 UTC (rev 4081)
@@ -2,7 +2,7 @@
import org.jboss.kernel.spi.registry.KernelRegistry;
import org.jboss.kernel.spi.registry.KernelRegistryEntry;
-import org.jboss.wsf.common.KernelLocator;
+import org.jboss.wsf.spi.util.KernelLocator;
/**
* @author Heiko Braun, <heiko at openj.net>
Modified: trunk/testsuite/.classpath
===================================================================
--- trunk/testsuite/.classpath 2007-08-02 09:09:47 UTC (rev 4080)
+++ trunk/testsuite/.classpath 2007-08-02 09:23:17 UTC (rev 4081)
@@ -15,5 +15,6 @@
<classpathentry kind="lib" path="/integration-spi/thirdparty/jaxb-impl.jar"/>
<classpathentry kind="lib" path="/integration-spi/thirdparty/stax-api.jar"/>
<classpathentry kind="lib" path="/integration-spi/thirdparty/wsdl4j.jar" sourcepath="/integration-spi/thirdparty/wsdl4j-src.jar"/>
+ <classpathentry combineaccessrules="false" kind="src" path="/spi"/>
<classpathentry kind="output" path="output/eclipse"/>
</classpath>
More information about the jbossws-commits
mailing list