Author: thomas.diesler(a)jboss.com Date: 2007-03-21 16:38:32 -0400 (Wed, 21 Mar 2007) New Revision: 2654 Modified: trunk/build/ant-import/build-deploy.xml trunk/build/ant-import/build-release.xml trunk/jbossws-core/src/java/org/jboss/ws/integration/URLLoaderAdapter.java Log: Fix AS42 integration Modified: trunk/build/ant-import/build-deploy.xml =================================================================== --- trunk/build/ant-import/build-deploy.xml 2007-03-21 14:15:41 UTC (rev 2653) +++ trunk/build/ant-import/build-deploy.xml 2007-03-21 20:38:32 UTC (rev 2654) @@ -115,6 +115,7 @@ </copy> <copy todir="${jboss42.home}/server/${jboss.server.instance}/lib" overwrite="true"> <fileset dir="${core.output.lib.dir}"> + <include name="jbossws-integration.jar"/> <include name="jboss-jaxrpc.jar"/> <include name="jboss-jaxws.jar"/> <include name="jboss-saaj.jar"/> Modified: trunk/build/ant-import/build-release.xml =================================================================== --- trunk/build/ant-import/build-release.xml 2007-03-21 14:15:41 UTC (rev 2653) +++ trunk/build/ant-import/build-release.xml 2007-03-21 20:38:32 UTC (rev 2654) @@ -79,6 +79,18 @@ </filterset> </copy> + <!-- jboss/jbossws-jboss42 --> + <copy todir="${jboss.repository.dir}/jbossws-jboss42/${repository.id}/lib" overwrite="true"> + <fileset dir="${jboss42.output.lib.dir}"> + <include name="jbossws42.sar"/> + </fileset> + </copy> + <copy tofile="${jboss.repository.dir}/jbossws-jboss42/${repository.id}/component-info.xml" file="${build.etc.dir}/component-info/integration-jboss42.xml" filtering="true" overwrite="true"> + <filterset> + <filtersfile file="${build.dir}/version.properties"/> + </filterset> + </copy> + </target> <!-- Release to portal content --> Modified: trunk/jbossws-core/src/java/org/jboss/ws/integration/URLLoaderAdapter.java =================================================================== --- trunk/jbossws-core/src/java/org/jboss/ws/integration/URLLoaderAdapter.java 2007-03-21 14:15:41 UTC (rev 2653) +++ trunk/jbossws-core/src/java/org/jboss/ws/integration/URLLoaderAdapter.java 2007-03-21 20:38:32 UTC (rev 2654) @@ -29,8 +29,6 @@ import java.net.URL; import java.net.URLClassLoader; -import org.jboss.ws.integration.UnifiedVirtualFile; - /** * The default file adapter loads resources through an associated classloader. * If no classload is set, the the thread context classloader will be used. @@ -108,9 +106,10 @@ public URL toURL() { - if (null == this.resourceURL) - throw new IllegalStateException("UnifiedVirtualFile not initialized"); - return resourceURL; + if (resourceURL != null) + return resourceURL; + else + return rootURL; } private URLClassLoader getResourceLoader()