[jbossws-commits] JBossWS SVN: r4119 - in trunk: build/ant-import and 19 other directories.
jbossws-commits at lists.jboss.org
jbossws-commits at lists.jboss.org
Thu Aug 2 14:40:09 EDT 2007
Author: thomas.diesler at jboss.com
Date: 2007-08-02 14:40:08 -0400 (Thu, 02 Aug 2007)
New Revision: 4119
Removed:
trunk/integration/jboss40/
trunk/integration/jboss42/
trunk/integration/spi/src/main/java/org/jboss/wsf/framework/deployment/ResourceLoaderAdapter.java
trunk/integration/spi/src/main/java/org/jboss/wsf/framework/deployment/URLLoaderAdapter.java
Modified:
trunk/build/ant-import/build-release.xml
trunk/build/ant-import/build-setup.xml
trunk/build/build.xml
trunk/integration/spi/src/main/java/org/jboss/wsf/framework/deployment/EndpointAPIDeploymentAspect.java
trunk/integration/spi/src/main/java/org/jboss/wsf/framework/serviceref/DefaultServiceRefHandler.java
trunk/integration/sunri/ant-import/build-bin-dist.xml
trunk/integration/sunri/ant-import/build-deploy.xml
trunk/integration/sunri/ant-import/build-thirdparty.xml
trunk/integration/sunri/build.xml
trunk/integration/sunri/version.properties
trunk/integration/xfire/ant-import/build-bin-dist.xml
trunk/integration/xfire/ant-import/build-deploy.xml
trunk/integration/xfire/ant-import/build-thirdparty.xml
trunk/integration/xfire/build.xml
trunk/integration/xfire/version.properties
trunk/jbossws-core/ant-import/build-bin-dist.xml
trunk/jbossws-core/ant-import/build-deploy.xml
trunk/jbossws-core/ant-import/build-thirdparty.xml
trunk/jbossws-core/build.xml
trunk/jbossws-core/src/main/java/org/jboss/ws/core/CommonClient.java
trunk/jbossws-core/src/main/java/org/jboss/ws/core/jaxrpc/client/ServiceImpl.java
trunk/jbossws-core/src/main/java/org/jboss/ws/core/jaxws/spi/ServiceDelegateImpl.java
trunk/jbossws-core/src/main/java/org/jboss/ws/metadata/builder/jaxrpc/JAXRPCClientMetaDataBuilder.java
trunk/jbossws-core/src/main/java/org/jboss/ws/metadata/builder/jaxws/JAXWSClientMetaDataBuilder.java
trunk/jbossws-core/src/main/java/org/jboss/ws/metadata/config/JBossWSConfigFactory.java
trunk/jbossws-core/src/main/java/org/jboss/ws/metadata/umdm/OperationMetaData.java
trunk/jbossws-core/src/main/java/org/jboss/ws/tools/jaxws/impl/JBossWSProviderImpl.java
trunk/jbossws-core/src/main/java/org/jboss/ws/tools/metadata/ToolsUnifiedMetaDataBuilder.java
trunk/jbossws-core/src/test/java/org/jboss/test/ws/jaxws/wspolicy/PolicyMetaDataBuilderTestCase.java
trunk/jbossws-core/version.properties
Log:
partial commit. pls use jboss50 integration
Modified: trunk/build/ant-import/build-release.xml
===================================================================
--- trunk/build/ant-import/build-release.xml 2007-08-02 17:08:25 UTC (rev 4118)
+++ trunk/build/ant-import/build-release.xml 2007-08-02 18:40:08 UTC (rev 4119)
@@ -38,10 +38,6 @@
<target name="release-to-repository" depends="prepare" description="Release to local repository">
<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"/>
- <ant antfile="${int.jboss40.dir}/build.xml" target="release" inheritall="false"/>
- <ant antfile="${int.native.dir}/build.xml" target="release" inheritall="false"/>
<ant antfile="${int.sunri.dir}/build.xml" target="release" inheritall="false"/>
<ant antfile="${int.xfire.dir}/build.xml" target="release" inheritall="false"/>
</target>
Modified: trunk/build/ant-import/build-setup.xml
===================================================================
--- trunk/build/ant-import/build-setup.xml 2007-08-02 17:08:25 UTC (rev 4118)
+++ trunk/build/ant-import/build-setup.xml 2007-08-02 18:40:08 UTC (rev 4119)
@@ -21,8 +21,6 @@
<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.jboss42.dir" value="${basedir}/integration/jboss42"/>
- <property name="int.jboss40.dir" value="${basedir}/integration/jboss40"/>
<property name="int.sunri.dir" value="${basedir}/integration/sunri"/>
<property name="int.xfire.dir" value="${basedir}/integration/xfire"/>
Modified: trunk/build/build.xml
===================================================================
--- trunk/build/build.xml 2007-08-02 17:08:25 UTC (rev 4118)
+++ trunk/build/build.xml 2007-08-02 18:40:08 UTC (rev 4119)
@@ -125,8 +125,6 @@
<delete dir="${build.dir}/output"/>
<ant antfile="${framework.dir}/build.xml" target="clean" inheritall="false"/>
<ant antfile="${core.dir}/build.xml" target="clean" inheritall="false"/>
- <ant antfile="${int.jboss42.dir}/build.xml" target="clean" inheritall="false"/>
- <ant antfile="${int.jboss40.dir}/build.xml" target="clean" inheritall="false"/>
<ant antfile="${testsuite.dir}/build.xml" target="clean" inheritall="false"/>
<ant antfile="${int.sunri.dir}/build.xml" target="clean" inheritall="false"/>
<ant antfile="${int.xfire.dir}/build.xml" target="clean" inheritall="false"/>
@@ -137,8 +135,6 @@
<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.jboss42.dir}/build.xml" target="clobber" inheritall="false"/>
- <ant antfile="${int.jboss40.dir}/build.xml" target="clobber" inheritall="false"/>
<ant antfile="${int.sunri.dir}/build.xml" target="clobber" inheritall="false"/>
<ant antfile="${int.xfire.dir}/build.xml" target="clobber" inheritall="false"/>
</target>
Modified: trunk/integration/spi/src/main/java/org/jboss/wsf/framework/deployment/EndpointAPIDeploymentAspect.java
===================================================================
--- trunk/integration/spi/src/main/java/org/jboss/wsf/framework/deployment/EndpointAPIDeploymentAspect.java 2007-08-02 17:08:25 UTC (rev 4118)
+++ trunk/integration/spi/src/main/java/org/jboss/wsf/framework/deployment/EndpointAPIDeploymentAspect.java 2007-08-02 18:40:08 UTC (rev 4119)
@@ -23,6 +23,7 @@
//$Id: EndpointAddressDeploymentAspect.java 4018 2007-07-27 06:31:03Z thomas.diesler at jboss.com $
+import org.jboss.wsf.common.ResourceLoaderAdapter;
import org.jboss.wsf.spi.deployment.ArchiveDeployment;
import org.jboss.wsf.spi.deployment.Deployment;
import org.jboss.wsf.spi.deployment.DeploymentAspect;
Deleted: trunk/integration/spi/src/main/java/org/jboss/wsf/framework/deployment/ResourceLoaderAdapter.java
===================================================================
--- trunk/integration/spi/src/main/java/org/jboss/wsf/framework/deployment/ResourceLoaderAdapter.java 2007-08-02 17:08:25 UTC (rev 4118)
+++ trunk/integration/spi/src/main/java/org/jboss/wsf/framework/deployment/ResourceLoaderAdapter.java 2007-08-02 18:40:08 UTC (rev 4119)
@@ -1,118 +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.framework.deployment;
-
-// $Id: ResourceLoaderAdapter.java 3137 2007-05-18 13:41:57Z thomas.diesler at jboss.com $
-
-import java.io.File;
-import java.io.IOException;
-import java.net.MalformedURLException;
-import java.net.URL;
-
-import org.jboss.wsf.spi.deployment.UnifiedVirtualFile;
-
-
-/**
- * The default file adapter loads resources through an associated classloader.
- * If no classload is set, the the thread context classloader will be used.
- *
- * @author Heiko.Braun at jboss.org
- * @since 25.01.2007
- */
-public class ResourceLoaderAdapter implements UnifiedVirtualFile
-{
- private URL resourceURL;
- private ClassLoader loader;
-
- public ResourceLoaderAdapter()
- {
- this(Thread.currentThread().getContextClassLoader());
- }
-
- public ResourceLoaderAdapter(ClassLoader loader)
- {
- this.loader = loader;
- }
-
- private ResourceLoaderAdapter(ClassLoader loader, URL resourceURL)
- {
- this.resourceURL = resourceURL;
- this.loader = loader;
- }
-
- public UnifiedVirtualFile findChild(String resourcePath) throws IOException
- {
- URL resourceURL = null;
- if (resourcePath != null)
- {
- // Try the child as URL
- try
- {
- resourceURL = new URL(resourcePath);
- }
- catch (MalformedURLException ex)
- {
- // ignore
- }
-
- // Try the filename as File
- if (resourceURL == null)
- {
- try
- {
- File file = new File(resourcePath);
- if (file.exists())
- resourceURL = file.toURL();
- }
- catch (MalformedURLException e)
- {
- // ignore
- }
- }
-
- // Try the filename as Resource
- if (resourceURL == null)
- {
- try
- {
- resourceURL = loader.getResource(resourcePath);
- }
- catch (Exception ex)
- {
- // ignore
- }
- }
- }
-
- if (resourceURL == null)
- throw new IOException("Cannot get URL for: " + resourcePath);
-
- return new ResourceLoaderAdapter(loader, resourceURL);
- }
-
- public URL toURL()
- {
- if (null == this.resourceURL)
- throw new IllegalStateException("UnifiedVirtualFile not initialized");
- return resourceURL;
- }
-}
Deleted: trunk/integration/spi/src/main/java/org/jboss/wsf/framework/deployment/URLLoaderAdapter.java
===================================================================
--- trunk/integration/spi/src/main/java/org/jboss/wsf/framework/deployment/URLLoaderAdapter.java 2007-08-02 17:08:25 UTC (rev 4118)
+++ trunk/integration/spi/src/main/java/org/jboss/wsf/framework/deployment/URLLoaderAdapter.java 2007-08-02 18:40:08 UTC (rev 4119)
@@ -1,127 +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.framework.deployment;
-
-// $Id: URLLoaderAdapter.java 3830 2007-07-09 17:01:33Z heiko.braun at jboss.com $
-
-import java.io.File;
-import java.io.IOException;
-import java.net.MalformedURLException;
-import java.net.URL;
-import java.net.URLClassLoader;
-
-import org.jboss.wsf.spi.deployment.UnifiedVirtualFile;
-
-
-/**
- * Load resources through a URLClassLoader.<br>
- * NOTE: The associated classloader doesn't do parent delegation.
- *
- *
- * @author Heiko.Braun at jboss.org
- * @since 25.01.2007
- */
-public class URLLoaderAdapter implements UnifiedVirtualFile
-{
- private URL rootURL;
- private URL resourceURL;
- private transient URLClassLoader loader;
-
- public URLLoaderAdapter(URL rootURL)
- {
- this.rootURL = rootURL;
- }
-
- private URLLoaderAdapter(URL rootURL, URLClassLoader loader, URL resourceURL)
- {
- this.rootURL = rootURL;
- this.resourceURL = resourceURL;
- this.loader = loader;
- }
-
- public UnifiedVirtualFile findChild(String resourcePath) throws IOException
- {
- URL resourceURL = null;
- if (resourcePath != null)
- {
- // Try the child as URL
- try
- {
- resourceURL = new URL(resourcePath);
- }
- catch (MalformedURLException ex)
- {
- // ignore
- }
-
- // Try the filename as File
- if (resourceURL == null)
- {
- try
- {
- File file = new File(resourcePath);
- if (file.exists())
- resourceURL = file.toURL();
- }
- catch (MalformedURLException e)
- {
- // ignore
- }
- }
-
- // Try the filename as Resource
- if (resourceURL == null)
- {
- try
- {
- resourceURL = getResourceLoader().getResource(resourcePath);
- }
- catch (Exception ex)
- {
- // ignore
- }
- }
- }
-
- if (resourceURL == null)
- throw new IOException("Cannot get URL for: " + resourcePath);
-
- return new URLLoaderAdapter(rootURL, loader, resourceURL);
- }
-
- public URL toURL()
- {
- if (resourceURL != null)
- return resourceURL;
- else
- return rootURL;
- }
-
- private URLClassLoader getResourceLoader()
- {
- if (loader == null)
- {
- loader = new URLClassLoader(new URL[] { rootURL });
- }
- return loader;
- }
-}
Modified: trunk/integration/spi/src/main/java/org/jboss/wsf/framework/serviceref/DefaultServiceRefHandler.java
===================================================================
--- trunk/integration/spi/src/main/java/org/jboss/wsf/framework/serviceref/DefaultServiceRefHandler.java 2007-08-02 17:08:25 UTC (rev 4118)
+++ trunk/integration/spi/src/main/java/org/jboss/wsf/framework/serviceref/DefaultServiceRefHandler.java 2007-08-02 18:40:08 UTC (rev 4119)
@@ -32,7 +32,7 @@
import javax.naming.NamingException;
import org.jboss.logging.Logger;
-import org.jboss.wsf.framework.deployment.URLLoaderAdapter;
+import org.jboss.wsf.common.URLLoaderAdapter;
import org.jboss.wsf.spi.SPIProvider;
import org.jboss.wsf.spi.SPIProviderResolver;
import org.jboss.wsf.spi.WSFException;
Modified: trunk/integration/sunri/ant-import/build-bin-dist.xml
===================================================================
--- trunk/integration/sunri/ant-import/build-bin-dist.xml 2007-08-02 17:08:25 UTC (rev 4118)
+++ trunk/integration/sunri/ant-import/build-bin-dist.xml 2007-08-02 18:40:08 UTC (rev 4119)
@@ -19,9 +19,6 @@
<target name="build-bin-dist" depends="jars,javadoc" description="Build the binary distribution">
- <ant antfile="${int.jboss50.dir}/build.xml" target="jars" inheritall="false"/>
- <ant antfile="${int.jboss42.dir}/build.xml" target="jars" inheritall="false"/>
-
<property name="bindist.dir" value="${sunri.output.dir}/jbossws-sunri-${version.id}"/>
<property name="bindist.bin.dir" value="${bindist.dir}/bin"/>
<property name="bindist.build.dir" value="${bindist.dir}/build"/>
@@ -103,13 +100,6 @@
<include name="getopt.jar"/>
<include name="wsdl4j.jar"/>
</fileset>
- <fileset dir="${int.jboss42.dir}/output/lib">
- <include name="jbossws-jboss42.jar"/>
- </fileset>
- <fileset dir="${int.jboss50.dir}/output/lib">
- <include name="jbossws-jboss50.jar"/>
- <include name="jbossws-jboss50-deployer.zip"/>
- </fileset>
<fileset dir="${int.sunri.dir}/output/lib">
<include name="jbossws-context.war"/>
<include name="jbossws-sunri42.sar"/>
Modified: trunk/integration/sunri/ant-import/build-deploy.xml
===================================================================
--- trunk/integration/sunri/ant-import/build-deploy.xml 2007-08-02 17:08:25 UTC (rev 4118)
+++ trunk/integration/sunri/ant-import/build-deploy.xml 2007-08-02 18:40:08 UTC (rev 4119)
@@ -47,7 +47,6 @@
<ant antfile="${int.xfire.dir}/build.xml" target="undeploy-jboss42" inheritall="false"/>
<macro-deploy-sunri42
wsflibs="${framework.dir}/output/lib"
- jbosslibs="${int.jboss42.dir}/output/lib"
stacklibs="${int.sunri.dir}/output/lib"
thirdpartylibs="${int.sunri.dir}/thirdparty"/>
Modified: trunk/integration/sunri/ant-import/build-thirdparty.xml
===================================================================
--- trunk/integration/sunri/ant-import/build-thirdparty.xml 2007-08-02 17:08:25 UTC (rev 4118)
+++ trunk/integration/sunri/ant-import/build-thirdparty.xml 2007-08-02 18:40:08 UTC (rev 4119)
@@ -45,6 +45,7 @@
<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-common/${jbossws-common}/lib/jbossws-common.jar" dest="${thirdparty.dir}/jbossws-common.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/jbossws-jboss42/${jbossws-jboss42}/lib/jbossws-jboss42.jar" dest="${thirdparty.dir}/jbossws-jboss42.jar" usetimestamp="true" verbose="true"/>
<get src="${jboss.repository}/jboss/jbossws-jboss50/${jbossws-jboss50}/lib/jbossws-jboss50.jar" dest="${thirdparty.dir}/jbossws-jboss50.jar" usetimestamp="true" verbose="true"/>
<get src="${jboss.repository}/jboss/jbossws-jboss50/${jbossws-jboss50}/lib/jbossws-jboss50-deployer.zip" dest="${thirdparty.dir}/jbossws-jboss50-deployer.zip" 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"/>
@@ -95,7 +96,6 @@
<!-- The compile classpath for jboss50 integration -->
<path id="sunri50.integration.classpath">
<path refid="sunri.integration.classpath"/>
- <pathelement location="${int.jboss50.dir}/output/lib/jbossws-jboss50.jar"/>
<pathelement location="${jboss50.server.lib}/jboss.jar"/>
</path>
Modified: trunk/integration/sunri/build.xml
===================================================================
--- trunk/integration/sunri/build.xml 2007-08-02 17:08:25 UTC (rev 4118)
+++ trunk/integration/sunri/build.xml 2007-08-02 18:40:08 UTC (rev 4119)
@@ -193,8 +193,6 @@
<target name="jars-jboss42" depends="jars-common" if="jboss42.home">
- <ant antfile="${int.jboss42.dir}/build.xml" target="jars" inheritall="false"/>
-
<!-- Concat jboss-beans.xml -->
<concat destfile="${sunri.output.lib.dir}/jbossws-sunri42/jbossws.beans/META-INF/jboss-beans.xml">
<header trimleading="yes">
@@ -215,13 +213,11 @@
<fileset dir="${framework.dir}/thirdparty">
<include name="jaxrpc-api.jar"/>
</fileset>
- <fileset dir="${int.jboss42.dir}/output/lib">
- <include name="jbossws-jboss42.jar"/>
- </fileset>
<fileset dir="${sunri.output.lib.dir}">
<include name="jbossws-sunri.jar"/>
</fileset>
<fileset dir="${thirdparty.dir}">
+ <include name="jbossws-jboss42.jar"/>
<include name="FastInfoset.jar"/>
<include name="http.jar"/>
<include name="jaxb-api.jar"/>
@@ -272,11 +268,7 @@
</packageset>
<packageset dir="${framework.dir}/src/main/java">
<include name="org/jboss/wsf/**"/>
- <include name="org/jboss/ws/**"/>
</packageset>
- <packageset dir="${int.jboss50.dir}/src/main/java">
- <include name="org/jboss/wsf/**"/>
- </packageset>
<doctitle><![CDATA[<h1>JBoss Web Service Framework ${version.id} - Stack integration Sun-RI</h1>]]></doctitle>
<tag name="todo" scope="all" description="To do:"/>
Modified: trunk/integration/sunri/version.properties
===================================================================
--- trunk/integration/sunri/version.properties 2007-08-02 17:08:25 UTC (rev 4118)
+++ trunk/integration/sunri/version.properties 2007-08-02 18:40:08 UTC (rev 4119)
@@ -7,6 +7,7 @@
jbossws-common=2.0.1.CR1
jbossws-spi=2.0.1.CR1
jbossws-jboss50=2.0.1.CR1
+jbossws-jboss42=2.0.1.CR1
jboss-security-spi=2.0.0.Beta
sun-jaxws=2.1.1
Modified: trunk/integration/xfire/ant-import/build-bin-dist.xml
===================================================================
--- trunk/integration/xfire/ant-import/build-bin-dist.xml 2007-08-02 17:08:25 UTC (rev 4118)
+++ trunk/integration/xfire/ant-import/build-bin-dist.xml 2007-08-02 18:40:08 UTC (rev 4119)
@@ -19,9 +19,6 @@
<target name="build-bin-dist" depends="jars,javadoc" description="Build the binary distribution">
- <ant antfile="${int.jboss50.dir}/build.xml" target="jars" inheritall="false"/>
- <ant antfile="${int.jboss42.dir}/build.xml" target="jars" inheritall="false"/>
-
<property name="bindist.dir" value="${xfire.output.dir}/jbossws-xfire-${version.id}"/>
<property name="bindist.bin.dir" value="${bindist.dir}/bin"/>
<property name="bindist.build.dir" value="${bindist.dir}/build"/>
@@ -104,13 +101,6 @@
<include name="getopt.jar"/>
<include name="wsdl4j.jar"/>
</fileset>
- <fileset dir="${int.jboss42.dir}/output/lib">
- <include name="jbossws-jboss42.jar"/>
- </fileset>
- <fileset dir="${int.jboss50.dir}/output/lib">
- <include name="jbossws-jboss50.jar"/>
- <include name="jbossws-jboss50-deployer.zip"/>
- </fileset>
<fileset dir="${int.xfire.dir}/output/lib">
<include name="jbossws-context.war"/>
<include name="jbossws-xfire42.sar"/>
Modified: trunk/integration/xfire/ant-import/build-deploy.xml
===================================================================
--- trunk/integration/xfire/ant-import/build-deploy.xml 2007-08-02 17:08:25 UTC (rev 4118)
+++ trunk/integration/xfire/ant-import/build-deploy.xml 2007-08-02 18:40:08 UTC (rev 4119)
@@ -47,7 +47,6 @@
<ant antfile="${int.sunri.dir}/build.xml" target="undeploy-jboss42" inheritall="false"/>
<macro-deploy-xfire42
wsflibs="${framework.dir}/output/lib"
- jbosslibs="${int.jboss42.dir}/output/lib"
stacklibs="${int.xfire.dir}/output/lib"
thirdpartylibs="${int.xfire.dir}/thirdparty"/>
Modified: trunk/integration/xfire/ant-import/build-thirdparty.xml
===================================================================
--- trunk/integration/xfire/ant-import/build-thirdparty.xml 2007-08-02 17:08:25 UTC (rev 4118)
+++ trunk/integration/xfire/ant-import/build-thirdparty.xml 2007-08-02 18:40:08 UTC (rev 4119)
@@ -60,6 +60,7 @@
<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-common/${jbossws-common}/lib/jbossws-common.jar" dest="${thirdparty.dir}/jbossws-common.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/jbossws-jboss42/${jbossws-jboss42}/lib/jbossws-jboss42.jar" dest="${thirdparty.dir}/jbossws-jboss42.jar" usetimestamp="true" verbose="true"/>
<get src="${jboss.repository}/jboss/jbossws-jboss50/${jbossws-jboss50}/lib/jbossws-jboss50.jar" dest="${thirdparty.dir}/jbossws-jboss50.jar" usetimestamp="true" verbose="true"/>
<get src="${jboss.repository}/jboss/jbossws-jboss50/${jbossws-jboss50}/lib/jbossws-jboss50-deployer.zip" dest="${thirdparty.dir}/jbossws-jboss50-deployer.zip" 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"/>
Modified: trunk/integration/xfire/build.xml
===================================================================
--- trunk/integration/xfire/build.xml 2007-08-02 17:08:25 UTC (rev 4118)
+++ trunk/integration/xfire/build.xml 2007-08-02 18:40:08 UTC (rev 4119)
@@ -184,8 +184,6 @@
<target name="jars-jboss42" depends="jars-common" if="jboss42.home">
- <ant antfile="${int.jboss42.dir}/build.xml" target="jars" inheritall="false"/>
-
<!-- Concat jboss-beans.xml -->
<concat destfile="${xfire.output.lib.dir}/jbossws-xfire42/jbossws.beans/META-INF/jboss-beans.xml">
<header trimleading="yes">
@@ -206,13 +204,11 @@
<fileset dir="${framework.dir}/thirdparty">
<include name="jaxrpc-api.jar"/>
</fileset>
- <fileset dir="${int.jboss42.dir}/output/lib">
- <include name="jbossws-jboss42.jar"/>
- </fileset>
<fileset dir="${xfire.output.lib.dir}">
<include name="jbossws-xfire.jar"/>
</fileset>
<fileset dir="${thirdparty.dir}">
+ <include name="jbossws-jboss42.jar"/>
<include name="cxf-incubator.jar"/>
<include name="geronimo-ws-metadata.jar"/>
<include name="jaxb-api.jar"/>
@@ -266,9 +262,6 @@
<include name="org/jboss/wsf/**"/>
<include name="org/jboss/ws/**"/>
</packageset>
- <packageset dir="${int.jboss50.dir}/src/main/java">
- <include name="org/jboss/wsf/**"/>
- </packageset>
<doctitle><![CDATA[<h1>JBoss Web Service Framework ${version.id} - Stack integration XFire</h1>]]></doctitle>
<tag name="todo" scope="all" description="To do:"/>
<!--group title="Native SOAP stack" packages="org.jboss.ws,org.jboss.ws.core*, org.jboss.ws.metadata*, org.jboss.ws.extensions*, org.jboss.ws.tools*, org.jboss.ws.annotation*, org.jboss.ws.jaxrpc*, org.jboss.ws.soap*"/-->
Modified: trunk/integration/xfire/version.properties
===================================================================
--- trunk/integration/xfire/version.properties 2007-08-02 17:08:25 UTC (rev 4118)
+++ trunk/integration/xfire/version.properties 2007-08-02 18:40:08 UTC (rev 4119)
@@ -7,6 +7,7 @@
jbossws-common=2.0.1.CR1
jbossws-spi=2.0.1.CR1
jbossws-jboss50=2.0.1.CR1
+jbossws-jboss42=2.0.1.CR1
apache-cxf=2.0
apache-xml-commons=1.2
Modified: trunk/jbossws-core/ant-import/build-bin-dist.xml
===================================================================
--- trunk/jbossws-core/ant-import/build-bin-dist.xml 2007-08-02 17:08:25 UTC (rev 4118)
+++ trunk/jbossws-core/ant-import/build-bin-dist.xml 2007-08-02 18:40:08 UTC (rev 4119)
@@ -113,16 +113,6 @@
<include name="jbossws-framework.jar"/>
<include name="jbossws-framework-scripts.zip"/>
</fileset>
- <fileset dir="${int.jboss50.dir}/output/lib">
- <include name="jbossws-jboss50.jar"/>
- <include name="jbossws-jboss50-deployer.zip"/>
- </fileset>
- <fileset dir="${int.jboss42.dir}/output/lib">
- <include name="jbossws-jboss42.jar"/>
- </fileset>
- <fileset dir="${int.jboss40.dir}/output/lib">
- <include name="jbossws-jboss40.jar"/>
- </fileset>
<fileset dir="${core.dir}/output/lib">
<include name="jboss-jaxrpc.jar"/>
<include name="jboss-jaxws.jar"/>
@@ -138,6 +128,10 @@
<include name="jbossws-native50.sar"/>
</fileset>
<fileset dir="${core.dir}/thirdparty">
+ <include name="jbossws-jboss50.jar"/>
+ <include name="jbossws-jboss50-deployer.zip"/>
+ <include name="jbossws-jboss42.jar"/>
+ <include name="jbossws-jboss40.jar"/>
<include name="juddi-service.sar"/>
<include name="policy.jar"/>
<include name="getopt.jar"/>
Modified: trunk/jbossws-core/ant-import/build-deploy.xml
===================================================================
--- trunk/jbossws-core/ant-import/build-deploy.xml 2007-08-02 17:08:25 UTC (rev 4118)
+++ trunk/jbossws-core/ant-import/build-deploy.xml 2007-08-02 18:40:08 UTC (rev 4119)
@@ -62,7 +62,6 @@
<ant antfile="${int.xfire.dir}/build.xml" target="undeploy-jboss42" inheritall="false"/>
<macro-deploy-native42
wsflibs="${framework.dir}/output/lib"
- jbosslibs="${int.jboss42.dir}/output/lib"
stacklibs="${core.dir}/output/lib"
thirdpartylibs="${core.dir}/thirdparty"/>
<macro-deploy-wsf
@@ -99,7 +98,6 @@
<target name="deploy-jboss40-ejb3">
<macro-deploy-native40
wsflibs="${framework.dir}/output/lib"
- jbosslibs="${int.jboss40.dir}/output/lib"
stacklibs="${core.dir}/output/lib"
thirdpartylibs="${core.dir}/thirdparty"/>
<macro-deploy-wsf
Modified: trunk/jbossws-core/ant-import/build-thirdparty.xml
===================================================================
--- trunk/jbossws-core/ant-import/build-thirdparty.xml 2007-08-02 17:08:25 UTC (rev 4118)
+++ trunk/jbossws-core/ant-import/build-thirdparty.xml 2007-08-02 18:40:08 UTC (rev 4119)
@@ -69,6 +69,8 @@
<get src="${jboss.repository}/jboss/jboss-vfs/${jboss-vfs}/lib/jboss-vfs-sources.jar" dest="${thirdparty.dir}/jboss-vfs-sources.jar" usetimestamp="true" verbose="true"/>
<get src="${jboss.repository}/jboss/jbossws-common/${jbossws-common}/lib/jbossws-common.jar" dest="${thirdparty.dir}/jbossws-common.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/jbossws-jboss40/${jbossws-jboss40}/lib/jbossws-jboss40.jar" dest="${thirdparty.dir}/jbossws-jboss40.jar" usetimestamp="true" verbose="true"/>
+ <get src="${jboss.repository}/jboss/jbossws-jboss42/${jbossws-jboss42}/lib/jbossws-jboss42.jar" dest="${thirdparty.dir}/jbossws-jboss42.jar" usetimestamp="true" verbose="true"/>
<get src="${jboss.repository}/jboss/jbossws-jboss50/${jbossws-jboss50}/lib/jbossws-jboss50.jar" dest="${thirdparty.dir}/jbossws-jboss50.jar" usetimestamp="true" verbose="true"/>
<get src="${jboss.repository}/jboss/jbossws-jboss50/${jbossws-jboss50}/lib/jbossws-jboss50-deployer.zip" dest="${thirdparty.dir}/jbossws-jboss50-deployer.zip" 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"/>
Modified: trunk/jbossws-core/build.xml
===================================================================
--- trunk/jbossws-core/build.xml 2007-08-02 17:08:25 UTC (rev 4118)
+++ trunk/jbossws-core/build.xml 2007-08-02 18:40:08 UTC (rev 4119)
@@ -246,8 +246,6 @@
<target name="jars-jboss42" depends="jars-common" if="jboss42.home">
- <ant antfile="${int.jboss42.dir}/build.xml" target="jars" inheritall="false"/>
-
<!-- Concat jboss-beans.xml -->
<concat destfile="${core.output.lib.dir}/jbossws-native42/jbossws.beans/META-INF/jboss-beans.xml">
<header trimleading="yes">
@@ -272,10 +270,8 @@
<include name="jboss-saaj.jar"/>
<include name="jbossws-core.jar"/>
</fileset>
- <fileset dir="${int.jboss42.dir}/output/lib">
- <include name="jbossws-jboss42.jar"/>
- </fileset>
<fileset dir="${core.dir}/thirdparty">
+ <include name="jbossws-jboss42.jar"/>
<include name="jaxb-api.jar"/>
<include name="jaxb-impl.jar"/>
<include name="policy.jar"/>
@@ -298,8 +294,6 @@
<target name="jars-jboss40" depends="jars-common" if="jboss40.home">
- <ant antfile="${int.jboss40.dir}/build.xml" target="jars" inheritall="false"/>
-
<!-- Concat jboss-beans.xml -->
<concat destfile="${core.output.lib.dir}/jbossws-native40/jbossws.beans/META-INF/jboss-beans.xml">
<header trimleading="yes">
Modified: trunk/jbossws-core/src/main/java/org/jboss/ws/core/CommonClient.java
===================================================================
--- trunk/jbossws-core/src/main/java/org/jboss/ws/core/CommonClient.java 2007-08-02 17:08:25 UTC (rev 4118)
+++ trunk/jbossws-core/src/main/java/org/jboss/ws/core/CommonClient.java 2007-08-02 18:40:08 UTC (rev 4119)
@@ -63,7 +63,7 @@
import org.jboss.ws.metadata.umdm.EndpointMetaData.Type;
import org.jboss.ws.metadata.wsse.WSSecurityConfigFactory;
import org.jboss.ws.metadata.wsse.WSSecurityConfiguration;
-import org.jboss.wsf.framework.deployment.ResourceLoaderAdapter;
+import org.jboss.wsf.common.ResourceLoaderAdapter;
import org.jboss.wsf.spi.deployment.UnifiedVirtualFile;
import org.jboss.wsf.spi.metadata.j2ee.serviceref.UnifiedHandlerMetaData.HandlerType;
Modified: trunk/jbossws-core/src/main/java/org/jboss/ws/core/jaxrpc/client/ServiceImpl.java
===================================================================
--- trunk/jbossws-core/src/main/java/org/jboss/ws/core/jaxrpc/client/ServiceImpl.java 2007-08-02 17:08:25 UTC (rev 4118)
+++ trunk/jbossws-core/src/main/java/org/jboss/ws/core/jaxrpc/client/ServiceImpl.java 2007-08-02 18:40:08 UTC (rev 4119)
@@ -53,7 +53,7 @@
import org.jboss.ws.metadata.umdm.ServiceMetaData;
import org.jboss.ws.metadata.umdm.UnifiedMetaData;
import org.jboss.ws.metadata.wsse.WSSecurityConfiguration;
-import org.jboss.wsf.framework.deployment.ResourceLoaderAdapter;
+import org.jboss.wsf.common.ResourceLoaderAdapter;
import org.jboss.wsf.spi.metadata.j2ee.serviceref.UnifiedCallPropertyMetaData;
import org.jboss.wsf.spi.metadata.j2ee.serviceref.UnifiedInitParamMetaData;
import org.jboss.wsf.spi.metadata.j2ee.serviceref.UnifiedPortComponentRefMetaData;
Modified: trunk/jbossws-core/src/main/java/org/jboss/ws/core/jaxws/spi/ServiceDelegateImpl.java
===================================================================
--- trunk/jbossws-core/src/main/java/org/jboss/ws/core/jaxws/spi/ServiceDelegateImpl.java 2007-08-02 17:08:25 UTC (rev 4118)
+++ trunk/jbossws-core/src/main/java/org/jboss/ws/core/jaxws/spi/ServiceDelegateImpl.java 2007-08-02 18:40:08 UTC (rev 4119)
@@ -65,7 +65,7 @@
import org.jboss.ws.metadata.umdm.UnifiedMetaData;
import org.jboss.ws.metadata.umdm.EndpointMetaData.Type;
import org.jboss.ws.metadata.wsdl.WSDLUtils;
-import org.jboss.wsf.framework.deployment.ResourceLoaderAdapter;
+import org.jboss.wsf.common.ResourceLoaderAdapter;
import org.jboss.wsf.spi.deployment.UnifiedVirtualFile;
import org.jboss.wsf.spi.metadata.j2ee.serviceref.UnifiedHandlerChainMetaData;
import org.jboss.wsf.spi.metadata.j2ee.serviceref.UnifiedHandlerChainsMetaData;
Modified: trunk/jbossws-core/src/main/java/org/jboss/ws/metadata/builder/jaxrpc/JAXRPCClientMetaDataBuilder.java
===================================================================
--- trunk/jbossws-core/src/main/java/org/jboss/ws/metadata/builder/jaxrpc/JAXRPCClientMetaDataBuilder.java 2007-08-02 17:08:25 UTC (rev 4118)
+++ trunk/jbossws-core/src/main/java/org/jboss/ws/metadata/builder/jaxrpc/JAXRPCClientMetaDataBuilder.java 2007-08-02 18:40:08 UTC (rev 4119)
@@ -46,7 +46,7 @@
import org.jboss.ws.metadata.wsdl.WSDLService;
import org.jboss.ws.metadata.wsse.WSSecurityConfiguration;
import org.jboss.ws.metadata.wsse.WSSecurityOMFactory;
-import org.jboss.wsf.framework.deployment.ResourceLoaderAdapter;
+import org.jboss.wsf.common.ResourceLoaderAdapter;
import org.jboss.wsf.spi.deployment.UnifiedVirtualFile;
import org.jboss.wsf.spi.metadata.j2ee.serviceref.UnifiedHandlerMetaData;
import org.jboss.wsf.spi.metadata.j2ee.serviceref.UnifiedServiceRefMetaData;
Modified: trunk/jbossws-core/src/main/java/org/jboss/ws/metadata/builder/jaxws/JAXWSClientMetaDataBuilder.java
===================================================================
--- trunk/jbossws-core/src/main/java/org/jboss/ws/metadata/builder/jaxws/JAXWSClientMetaDataBuilder.java 2007-08-02 17:08:25 UTC (rev 4118)
+++ trunk/jbossws-core/src/main/java/org/jboss/ws/metadata/builder/jaxws/JAXWSClientMetaDataBuilder.java 2007-08-02 18:40:08 UTC (rev 4119)
@@ -51,7 +51,7 @@
import org.jboss.ws.metadata.wsdl.WSDLService;
import org.jboss.ws.metadata.wsdl.WSDLUtils;
import org.jboss.ws.metadata.wsdl.xmlschema.JBossXSModel;
-import org.jboss.wsf.framework.deployment.ResourceLoaderAdapter;
+import org.jboss.wsf.common.ResourceLoaderAdapter;
import org.jboss.wsf.spi.deployment.UnifiedVirtualFile;
import org.jboss.wsf.spi.metadata.j2ee.serviceref.UnifiedCallPropertyMetaData;
import org.jboss.wsf.spi.metadata.j2ee.serviceref.UnifiedPortComponentRefMetaData;
Modified: trunk/jbossws-core/src/main/java/org/jboss/ws/metadata/config/JBossWSConfigFactory.java
===================================================================
--- trunk/jbossws-core/src/main/java/org/jboss/ws/metadata/config/JBossWSConfigFactory.java 2007-08-02 17:08:25 UTC (rev 4118)
+++ trunk/jbossws-core/src/main/java/org/jboss/ws/metadata/config/JBossWSConfigFactory.java 2007-08-02 18:40:08 UTC (rev 4119)
@@ -33,7 +33,7 @@
import org.jboss.ws.metadata.config.jaxrpc.ConfigRootJAXRPC;
import org.jboss.ws.metadata.config.jaxws.ConfigRootJAXWS;
import org.jboss.wsf.common.DOMUtils;
-import org.jboss.wsf.framework.deployment.ResourceLoaderAdapter;
+import org.jboss.wsf.common.ResourceLoaderAdapter;
import org.jboss.wsf.spi.deployment.UnifiedVirtualFile;
import org.jboss.xb.binding.JBossXBException;
import org.jboss.xb.binding.Unmarshaller;
Modified: trunk/jbossws-core/src/main/java/org/jboss/ws/metadata/umdm/OperationMetaData.java
===================================================================
--- trunk/jbossws-core/src/main/java/org/jboss/ws/metadata/umdm/OperationMetaData.java 2007-08-02 17:08:25 UTC (rev 4118)
+++ trunk/jbossws-core/src/main/java/org/jboss/ws/metadata/umdm/OperationMetaData.java 2007-08-02 18:40:08 UTC (rev 4119)
@@ -39,7 +39,7 @@
import org.jboss.ws.core.soap.Use;
import org.jboss.ws.metadata.umdm.EndpointMetaData.Type;
import org.jboss.wsf.common.JavaUtils;
-import org.jboss.wsf.framework.deployment.ResourceLoaderAdapter;
+import org.jboss.wsf.common.ResourceLoaderAdapter;
import org.w3c.dom.Element;
/**
Modified: trunk/jbossws-core/src/main/java/org/jboss/ws/tools/jaxws/impl/JBossWSProviderImpl.java
===================================================================
--- trunk/jbossws-core/src/main/java/org/jboss/ws/tools/jaxws/impl/JBossWSProviderImpl.java 2007-08-02 17:08:25 UTC (rev 4118)
+++ trunk/jbossws-core/src/main/java/org/jboss/ws/tools/jaxws/impl/JBossWSProviderImpl.java 2007-08-02 18:40:08 UTC (rev 4119)
@@ -30,7 +30,7 @@
import org.jboss.ws.WSException;
import org.jboss.ws.metadata.builder.jaxws.JAXWSWebServiceMetaDataBuilder;
import org.jboss.ws.metadata.umdm.UnifiedMetaData;
-import org.jboss.wsf.framework.deployment.ResourceLoaderAdapter;
+import org.jboss.wsf.common.ResourceLoaderAdapter;
import org.jboss.wsf.spi.SPIProvider;
import org.jboss.wsf.spi.SPIProviderResolver;
import org.jboss.wsf.spi.deployment.Deployment;
Modified: trunk/jbossws-core/src/main/java/org/jboss/ws/tools/metadata/ToolsUnifiedMetaDataBuilder.java
===================================================================
--- trunk/jbossws-core/src/main/java/org/jboss/ws/tools/metadata/ToolsUnifiedMetaDataBuilder.java 2007-08-02 17:08:25 UTC (rev 4118)
+++ trunk/jbossws-core/src/main/java/org/jboss/ws/tools/metadata/ToolsUnifiedMetaDataBuilder.java 2007-08-02 18:40:08 UTC (rev 4119)
@@ -37,7 +37,7 @@
import org.jboss.ws.metadata.umdm.UnifiedMetaData;
import org.jboss.ws.metadata.wsdl.WSDLUtils;
import org.jboss.ws.tools.Configuration.OperationConfig;
-import org.jboss.wsf.framework.deployment.ResourceLoaderAdapter;
+import org.jboss.wsf.common.ResourceLoaderAdapter;
/**
* Builder class that builds the Tools Meta Data
Modified: trunk/jbossws-core/src/test/java/org/jboss/test/ws/jaxws/wspolicy/PolicyMetaDataBuilderTestCase.java
===================================================================
--- trunk/jbossws-core/src/test/java/org/jboss/test/ws/jaxws/wspolicy/PolicyMetaDataBuilderTestCase.java 2007-08-02 17:08:25 UTC (rev 4118)
+++ trunk/jbossws-core/src/test/java/org/jboss/test/ws/jaxws/wspolicy/PolicyMetaDataBuilderTestCase.java 2007-08-02 18:40:08 UTC (rev 4119)
@@ -43,7 +43,7 @@
import org.jboss.ws.metadata.umdm.EndpointMetaData.Type;
import org.jboss.ws.metadata.wsdl.WSDLDefinitions;
import org.jboss.ws.tools.wsdl.WSDLDefinitionsFactory;
-import org.jboss.wsf.framework.deployment.URLLoaderAdapter;
+import org.jboss.wsf.common.URLLoaderAdapter;
import org.jboss.wsf.spi.deployment.UnifiedVirtualFile;
import org.jboss.wsf.test.JBossWSTest;
Modified: trunk/jbossws-core/version.properties
===================================================================
--- trunk/jbossws-core/version.properties 2007-08-02 17:08:25 UTC (rev 4118)
+++ trunk/jbossws-core/version.properties 2007-08-02 18:40:08 UTC (rev 4119)
@@ -9,6 +9,8 @@
jbossws-common=2.0.1.CR1
jbossws-spi=2.0.1.CR1
jbossws-jboss50=2.0.1.CR1
+jbossws-jboss42=2.0.1.CR1
+jbossws-jboss40=2.0.1.CR1
# Thirdparty library versions
apache-collections=3.1
More information about the jbossws-commits
mailing list