[jbossws-commits] JBossWS SVN: r2273 - in branches/jbossws-1.2.0: integration-jboss42 and 1 other directories.
jbossws-commits at lists.jboss.org
jbossws-commits at lists.jboss.org
Sun Feb 4 15:24:44 EST 2007
Author: thomas.diesler at jboss.com
Date: 2007-02-04 15:24:44 -0500 (Sun, 04 Feb 2007)
New Revision: 2273
Modified:
branches/jbossws-1.2.0/build/etc/jbossws-component-info.xml
branches/jbossws-1.2.0/integration-jboss42/build.xml
branches/jbossws-1.2.0/integration-jboss50/build.xml
Log:
Fix AS testsuites
Modified: branches/jbossws-1.2.0/build/etc/jbossws-component-info.xml
===================================================================
--- branches/jbossws-1.2.0/build/etc/jbossws-component-info.xml 2007-02-04 19:36:14 UTC (rev 2272)
+++ branches/jbossws-1.2.0/build/etc/jbossws-component-info.xml 2007-02-04 20:24:44 UTC (rev 2273)
@@ -1,50 +1,59 @@
<project name="jboss/jbossws-component-info">
-
- <component id="jboss/jbossws"
- licenseType="lgpl"
- version="@repository.id@"
- description="JBossWS an implementation of J2EE Web Services">
-
- <artifact id="jbossws-core.jar"/>
- <artifact id="jboss-jaxrpc.jar"/>
- <artifact id="jboss-jaxws.jar"/>
- <artifact id="jboss-saaj.jar"/>
- <artifact id="jbossws40.sar"/>
- <artifact id="jbossws42.sar"/>
- <artifact id="jbossws50.sar"/>
- <artifact id="jbossws50-deployer.zip"/>
-
- <import componentref="apache-xmlsec">
- <compatible version="@apache-xmlsec@"/>
- </import>
- <import componentref="ibm-wsdl4j">
- <compatible version="@ibm-wsdl4j@"/>
- </import>
- <import componentref="javassist">
- <compatible version="@javassist@"/>
- </import>
- <import componentref="jboss/jbossxb">
- <compatible version="@jboss-jbossxb@"/>
- </import>
- <import componentref="jboss/microcontainer">
- <compatible version="snapshot"/>
- <compatible version="@jboss-microcontainer@"/>
- </import>
- <import componentref="jboss/remoting">
- <compatible version="2.2.0.Alpha2"/>
- <compatible version="@jboss-remoting@"/>
- </import>
- <import componentref="sun-jaxb">
- <compatible version="@sun-jaxb@"/>
- </import>
-
- <export>
- <include input="jbossws-core.jar"/>
- <include input="jboss-jaxrpc.jar"/>
- <include input="jboss-jaxws.jar"/>
- <include input="jboss-saaj.jar"/>
- </export>
-
- </component>
-
-</project>
+
+ <component id="jboss/jbossws" licenseType="lgpl" version="@repository.id@" description="JBossWS an implementation of J2EE Web Services">
+
+ <artifact id="jbossws-client.jar"/>
+ <artifact id="jbossws-core.jar"/>
+ <artifact id="jboss-jaxrpc.jar"/>
+ <artifact id="jboss-jaxws.jar"/>
+ <artifact id="jboss-saaj.jar"/>
+
+ <artifact id="jbossws40.sar"/>
+ <artifact id="jbossws-jboss40-integration.jar"/>
+
+ <artifact id="jbossws42.sar"/>
+ <artifact id="jbossws-jboss42-integration.jar"/>
+
+ <artifact id="jbossws50.sar"/>
+ <artifact id="jbossws-jboss50-integration.jar"/>
+ <artifact id="jbossws50-deployer.zip"/>
+
+ <import componentref="apache-xmlsec">
+ <compatible version="@apache-xmlsec@"/>
+ </import>
+ <import componentref="ibm-wsdl4j">
+ <compatible version="@ibm-wsdl4j@"/>
+ </import>
+ <import componentref="javassist">
+ <compatible version="@javassist@"/>
+ </import>
+ <import componentref="jboss/jbossxb">
+ <compatible version="@jboss-jbossxb@"/>
+ </import>
+ <import componentref="jboss/microcontainer">
+ <compatible version="snapshot"/>
+ <compatible version="@jboss-microcontainer@"/>
+ </import>
+ <import componentref="jboss/remoting">
+ <compatible version="2.2.0.Alpha2"/>
+ <compatible version="@jboss-remoting@"/>
+ </import>
+ <import componentref="sun-jaxb">
+ <compatible version="@sun-jaxb@"/>
+ </import>
+
+ <!--
+ There should be no dependency on core or client jars except for
+ jbossws propriatary annotations. Do not expose these jars here.
+
+ Instead include jbossws-core.jar and jbossws-jboss??-integration.jar in the test classpath
+ -->
+ <export>
+ <include input="jboss-jaxrpc.jar"/>
+ <include input="jboss-jaxws.jar"/>
+ <include input="jboss-saaj.jar"/>
+ </export>
+
+ </component>
+
+</project>
\ No newline at end of file
Modified: branches/jbossws-1.2.0/integration-jboss42/build.xml
===================================================================
--- branches/jbossws-1.2.0/integration-jboss42/build.xml 2007-02-04 19:36:14 UTC (rev 2272)
+++ branches/jbossws-1.2.0/integration-jboss42/build.xml 2007-02-04 20:24:44 UTC (rev 2273)
@@ -153,14 +153,18 @@
<delete dir="${jboss42.home}/server/${jboss.server.instance}/deploy/jbossws.sar"/>
<mkdir dir="${jboss42.home}/server/${jboss.server.instance}/deploy/jbossws.sar"/>
<unjar dest="${jboss42.home}/server/${jboss.server.instance}/deploy/jbossws.sar" src="${jboss42.output.lib.dir}/jbossws42.sar"/>
- <!-- The JBossAS testsuite references jbosswsfrom thirdparty -->
+ <!-- The JBossAS testsuite references jbossws from thirdparty -->
<copy todir="${jboss42.home}/../../../thirdparty/jboss/jbossws/lib" overwrite="true">
<fileset dir="${core.output.lib.dir}">
<include name="jbossws-client.jar"/>
+ <include name="jbossws-core.jar"/>
<include name="jboss-jaxrpc.jar"/>
<include name="jboss-jaxws.jar"/>
<include name="jboss-saaj.jar"/>
</fileset>
+ <fileset dir="${jboss42.output.lib.dir}">
+ <include name="jbossws-jboss42-integration.jar"/>
+ </fileset>
</copy>
</target>
Modified: branches/jbossws-1.2.0/integration-jboss50/build.xml
===================================================================
--- branches/jbossws-1.2.0/integration-jboss50/build.xml 2007-02-04 19:36:14 UTC (rev 2272)
+++ branches/jbossws-1.2.0/integration-jboss50/build.xml 2007-02-04 20:24:44 UTC (rev 2273)
@@ -162,14 +162,18 @@
<delete dir="${jboss50.home}/server/${jboss.server.instance}/deploy/jbossws.sar"/>
<mkdir dir="${jboss50.home}/server/${jboss.server.instance}/deploy/jbossws.sar"/>
<unjar dest="${jboss50.home}/server/${jboss.server.instance}/deploy/jbossws.sar" src="${jboss50.output.lib.dir}/jbossws50.sar"/>
- <!-- The JBossAS testsuite references jbosswsfrom thirdparty -->
+ <!-- The JBossAS testsuite references jbossws from thirdparty -->
<copy todir="${jboss50.home}/../../../thirdparty/jboss/jbossws/lib" overwrite="true">
<fileset dir="${core.output.lib.dir}">
<include name="jbossws-client.jar"/>
+ <include name="jbossws-core.jar"/>
<include name="jboss-jaxrpc.jar"/>
<include name="jboss-jaxws.jar"/>
<include name="jboss-saaj.jar"/>
</fileset>
+ <fileset dir="${jboss50.output.lib.dir}">
+ <include name="jbossws-jboss50-integration.jar"/>
+ </fileset>
</copy>
</target>
More information about the jbossws-commits
mailing list