Author: thomas.diesler(a)jboss.com
Date: 2007-04-23 04:00:28 -0400 (Mon, 23 Apr 2007)
New Revision: 2898
Modified:
trunk/integration-tomcat/build.xml
trunk/integration/build.xml
trunk/jbossws-api/
trunk/jbossws-core/build.xml
trunk/jbossws-tests/build.xml
Log:
Fix build issues
Modified: trunk/integration/build.xml
===================================================================
--- trunk/integration/build.xml 2007-04-23 06:12:12 UTC (rev 2897)
+++ trunk/integration/build.xml 2007-04-23 08:00:28 UTC (rev 2898)
@@ -67,7 +67,7 @@
<!--
| Build all jar files.
-->
- <target name="integration-jars"
depends="integration-compile,integration-module-jars" description="Builds
all jar files.">
+ <target name="integration-jars"
depends="integration-compile,integration-module-jars,api-jars"
description="Builds all jar files.">
</target>
<!--
Modified: trunk/integration-tomcat/build.xml
===================================================================
--- trunk/integration-tomcat/build.xml 2007-04-23 06:12:12 UTC (rev 2897)
+++ trunk/integration-tomcat/build.xml 2007-04-23 08:00:28 UTC (rev 2898)
@@ -120,7 +120,7 @@
<unjar dest="${tomcat.output.lib.dir}/build"
src="${thirdparty.dir}/concurrent.jar"/>
<unjar dest="${tomcat.output.lib.dir}/build"
src="${thirdparty.dir}/jaxb-api.jar"/>
<unjar dest="${tomcat.output.lib.dir}/build"
src="${thirdparty.dir}/jaxb-impl.jar"/>
- <unjar dest="${tomcat.output.lib.dir}/build"
src="${thirdparty.dir}/jboss-common.jar"/>
+ <unjar dest="${tomcat.output.lib.dir}/build"
src="${thirdparty.dir}/jboss-common-core.jar"/>
<unjar dest="${tomcat.output.lib.dir}/build"
src="${thirdparty.dir}/jboss-j2ee.jar"/>
<unjar dest="${tomcat.output.lib.dir}/build"
src="${thirdparty.dir}/jboss-container.jar"/>
<unjar dest="${tomcat.output.lib.dir}/build"
src="${thirdparty.dir}/jboss-dependency.jar"/>
Property changes on: trunk/jbossws-api
___________________________________________________________________
Name: svn:ignore
+ output*
Modified: trunk/jbossws-core/build.xml
===================================================================
--- trunk/jbossws-core/build.xml 2007-04-23 06:12:12 UTC (rev 2897)
+++ trunk/jbossws-core/build.xml 2007-04-23 08:00:28 UTC (rev 2898)
@@ -71,7 +71,7 @@
<!--
| Build all jar files.
-->
- <target name="core-jars" depends="core-compile,core-module-jars"
description="Builds all jar files.">
+ <target name="core-jars"
depends="core-compile,core-module-jars,integration-jars"
description="Builds all jar files.">
</target>
<!--
Modified: trunk/jbossws-tests/build.xml
===================================================================
--- trunk/jbossws-tests/build.xml 2007-04-23 06:12:12 UTC (rev 2897)
+++ trunk/jbossws-tests/build.xml 2007-04-23 08:00:28 UTC (rev 2898)
@@ -149,11 +149,12 @@
<property name="jbossws.classpath"
value="jbossws.classpath.jdk14"/>
<path id="jbossws.classpath.jdk15">
+ <pathelement location="${api.output.lib.dir}/jboss-jaxrpc.jar"/>
+ <pathelement location="${api.output.lib.dir}/jboss-jaxws.jar"/>
+ <pathelement location="${api.output.lib.dir}/jboss-saaj.jar"/>
<pathelement location="${core.output.lib.dir}/jbossws-core.jar"/>
<pathelement
location="${core.output.lib.dir}/jbossws-client.jar"/>
- <pathelement location="${core.output.lib.dir}/jboss-jaxrpc.jar"/>
- <pathelement location="${core.output.lib.dir}/jboss-jaxws.jar"/>
- <pathelement location="${core.output.lib.dir}/jboss-saaj.jar"/>
+ <pathelement
location="${integration.output.lib.dir}/jbossws-integration.jar"/>
<pathelement
location="${jboss50.output.lib.dir}/jbossws-jboss50-integration.jar"/>
<pathelement
location="${jboss42.output.lib.dir}/jbossws-jboss42-integration.jar"/>
<pathelement
location="${jboss40.output.lib.dir}/jbossws-jboss40-integration.jar"/>