Author: thomas.diesler(a)jboss.com
Date: 2007-05-12 01:49:15 -0400 (Sat, 12 May 2007)
New Revision: 3055
Modified:
trunk/build/
trunk/build/ant-import/build-setup.xml
trunk/build/ant.properties.example
trunk/build/build.xml
trunk/build/version.properties
trunk/jbossws-core/ant-import/build-testsuite.xml
trunk/jbossws-core/ant-import/build-thirdparty.xml
trunk/jbossws-core/build.xml
trunk/jbossws-core/version.properties
trunk/jbossws-spi/ant-import/build-thirdparty.xml
trunk/jbossws-spi/build.xml
trunk/jbws-jboss50/ant-import/build-thirdparty.xml
trunk/sunri-jboss50/ant-import/build-thirdparty.xml
trunk/sunri-jboss50/build.xml
trunk/sunri-jboss50/src/main/etc/default.mf
trunk/sunri-jboss50/version.properties
Log:
Fix duplicate references to thirdparty
Property changes on: trunk/build
___________________________________________________________________
Name: svn:ignore
- output
thirdparty
ant.properties
version.properties.md5
clipboard.*
+ output
thirdparty
ant.properties
version.properties.md5
clipboard.*
output*
Modified: trunk/build/ant-import/build-setup.xml
===================================================================
--- trunk/build/ant-import/build-setup.xml 2007-05-12 04:03:30 UTC (rev 3054)
+++ trunk/build/ant-import/build-setup.xml 2007-05-12 05:49:15 UTC (rev 3055)
@@ -21,11 +21,9 @@
<property name="spi.dir" value="${basedir}/../jbossws-spi"/>
<property name="core.dir"
value="${basedir}/../jbossws-core"/>
<property name="testsuite.dir"
value="${basedir}/../jbossws-tests"/>
- <property name="thirdparty.dir"
value="${basedir}/thirdparty"/>
<property file="${build.dir}/ant.properties"/>
<property file="${build.dir}/version.properties"/>
- <property file="${basedir}/version.properties"/>
<property name="jbws.jboss50.dir"
value="${basedir}/../jbws-jboss50"/>
<property name="jbws.jboss42.dir"
value="${basedir}/../jbws-jboss42"/>
@@ -82,18 +80,6 @@
<available property="jbossws.portal.content.available"
file="${jbossws.portal.content}" type="dir"/>
- <checksum file="${basedir}/version.properties" fileext=".md5"
verifyproperty="checksum.ok"/>
- <checksum file="${basedir}/version.properties"
fileext=".md5"/>
-
- <condition property="force.thirdparty.get">
- <or>
- <not>
- <available file="${thirdparty.dir}" type="dir"/>
- </not>
- <isfalse value="${checksum.ok}"/>
- </or>
- </condition>
-
<tstamp>
<format property="build.id" pattern="yyyyMMddHHmm"/>
</tstamp>
Modified: trunk/build/ant.properties.example
===================================================================
--- trunk/build/ant.properties.example 2007-05-12 04:03:30 UTC (rev 3054)
+++ trunk/build/ant.properties.example 2007-05-12 05:49:15 UTC (rev 3055)
@@ -17,7 +17,7 @@
tomcat.manager.password=manager
# JBoss Repository
-#jboss.repository=file:/home/tdiesler/svn/repository.jboss.org
+#jboss.repository=file:/home/tdiesler/svn/jboss.local.repository
jboss.repository=http://repository.jboss.org
# Hudson QA Environment
Modified: trunk/build/build.xml
===================================================================
--- trunk/build/build.xml 2007-05-12 04:03:30 UTC (rev 3054)
+++ trunk/build/build.xml 2007-05-12 05:49:15 UTC (rev 3055)
@@ -11,7 +11,7 @@
<!-- $Id$ -->
-<project default="main" basedir="."
name="JBossWS-Build">
+<project default="main" basedir="../build"
name="JBossWS-Build">
<import file="${basedir}/ant-import/build-setup.xml"/>
<import file="${basedir}/ant-import/build-release.xml"/>
@@ -26,8 +26,8 @@
| Build all jar files.
-->
<target name="jars" depends="prepare" description="Builds
all jar files.">
- <ant antfile="${spi.dir}/build.xml" dir="${spi.dir}"
target="spi.jars"/>
- <ant antfile="${core.dir}/build.xml" dir="${core.dir}"
target="core.jars"/>
+ <ant antfile="${spi.dir}/build.xml" dir="${spi.dir}"
target="spi-jars"/>
+ <ant antfile="${core.dir}/build.xml" dir="${core.dir}"
target="core-jars"/>
</target>
<target name="clean" depends="prepare" description="Cleans
up most generated files.">
Modified: trunk/build/version.properties
===================================================================
--- trunk/build/version.properties 2007-05-12 04:03:30 UTC (rev 3054)
+++ trunk/build/version.properties 2007-05-12 05:49:15 UTC (rev 3055)
@@ -7,3 +7,17 @@
version.id=2.1.0.DEV
repository.id=SNAPSHOT
+
+implementation.title=JBoss Web Services
+implementation.url=http://www.jboss.org/products/jbossws
+implementation.vendor=JBoss Inc.
+implementation.vendor.id=http://www.jboss.org
+
+# Thirdparty library versions
+jboss-common-core=2.0.2.GA
+jboss-common-logging-log4j=2.0.2.GA
+jboss-common-logging-spi=2.0.2.GA
+jboss-jbossxb=2.0.0.CR2
+jboss-microcontainer=2.0.0.Beta3
+sun-jaxws=2.1.1
+sun-servlet=2.5
Modified: trunk/jbossws-core/ant-import/build-testsuite.xml
===================================================================
--- trunk/jbossws-core/ant-import/build-testsuite.xml 2007-05-12 04:03:30 UTC (rev 3054)
+++ trunk/jbossws-core/ant-import/build-testsuite.xml 2007-05-12 05:49:15 UTC (rev 3055)
@@ -21,7 +21,7 @@
<!--
Init the various classpaths
-->
- <target name="tests-init"
depends="tests-prepare,thirdparty-classpath">
+ <target name="tests-init"
depends="tests-prepare,core-thirdparty-classpath">
<path id="jbossws.classpath">
<pathelement location="${spi.dir}/output/lib/jbossws-spi.jar"/>
@@ -34,8 +34,8 @@
<!-- The combined compile classpath -->
<path id="javac.classpath">
- <path refid="core.classpath"/>
<path refid="jbossws.classpath"/>
+ <path refid="core.thirdparty.classpath"/>
<pathelement location="${thirdparty.dir}/jboss-vfs.jar"/>
<pathelement location="${thirdparty.dir}/junit.jar"/>
<pathelement location="${thirdparty.dir}/qdox.jar"/>
Modified: trunk/jbossws-core/ant-import/build-thirdparty.xml
===================================================================
--- trunk/jbossws-core/ant-import/build-thirdparty.xml 2007-05-12 04:03:30 UTC (rev 3054)
+++ trunk/jbossws-core/ant-import/build-thirdparty.xml 2007-05-12 05:49:15 UTC (rev 3055)
@@ -12,115 +12,130 @@
<!-- $Id$ -->
<project>
-
+
+ <property file="${core.dir}/version.properties"/>
+
<!-- ========= -->
<!-- Libraries -->
<!-- ========= -->
- <target name="thirdparty"
depends="prepare,thirdparty-get,thirdparty-classpath">
+ <target name="core-thirdparty"
depends="core-thirdparty-init,core-thirdparty-get,core-thirdparty-classpath">
</target>
+ <target name="core-thirdparty-init" depends="prepare">
+
+ <property name="core.thirdparty.dir"
value="${core.dir}/thirdparty"/>
+ <checksum file="${core.dir}/version.properties" fileext=".md5"
verifyproperty="checksum.ok"/>
+ <condition property="core.force.thirdparty">
+ <or>
+ <not>
+ <available file="${core.thirdparty.dir}"
type="dir"/>
+ </not>
+ <isfalse value="${checksum.ok}"/>
+ <isset property="force.thirdparty.get"/>
+ </or>
+ </condition>
+ </target>
+
<!--
thirdpartry-get
-->
- <target name="thirdparty-get" if="force.thirdparty.get"
+ <target name="core-thirdparty-get" if="core.force.thirdparty"
description="Gets the thirdparty libraries">
- <mkdir dir="${thirdparty.dir}"/>
- <get src="${jboss.repository}/apache-ant/${apache-ant}/lib/ant.jar"
dest="${thirdparty.dir}/ant.jar" usetimestamp="true"
verbose="true"/>
- <get
src="${jboss.repository}/apache-collections/${apache-collections}/lib/commons-collections.jar"
dest="${thirdparty.dir}/commons-collections.jar" usetimestamp="true"
verbose="true"/>
- <get
src="${jboss.repository}/apache-log4j/${apache-log4j}/lib/log4j.jar"
dest="${thirdparty.dir}/log4j.jar" usetimestamp="true"
verbose="true"/>
- <get
src="${jboss.repository}/apache-logging/${apache-logging}/lib/commons-logging.jar"
dest="${thirdparty.dir}/commons-logging.jar" usetimestamp="true"
verbose="true"/>
- <get
src="${jboss.repository}/apache-xalan/${apache-xalan}/lib/serializer.jar"
dest="${thirdparty.dir}/serializer.jar" usetimestamp="true"
verbose="true"/>
- <get
src="${jboss.repository}/apache-xalan/${apache-xalan}/lib/xalan.jar"
dest="${thirdparty.dir}/xalan.jar" usetimestamp="true"
verbose="true"/>
- <get
src="${jboss.repository}/apache-xerces/${apache-xerces}/lib/resolver.jar"
dest="${thirdparty.dir}/resolver.jar" usetimestamp="true"
verbose="true"/>
- <get
src="${jboss.repository}/apache-xerces/${apache-xerces}/lib/xercesImpl.jar"
dest="${thirdparty.dir}/xercesImpl.jar" usetimestamp="true"
verbose="true"/>
- <get
src="${jboss.repository}/apache-xerces/${apache-xerces}/lib/xml-apis.jar"
dest="${thirdparty.dir}/xml-apis.jar" usetimestamp="true"
verbose="true"/>
- <get
src="${jboss.repository}/apache-xmlsec/${apache-xmlsec}/lib/xmlsec.jar"
dest="${thirdparty.dir}/xmlsec.jar" usetimestamp="true"
verbose="true"/>
- <get src="${jboss.repository}/dom4j/${dom4j}/lib/dom4j.jar"
dest="${thirdparty.dir}/dom4j.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}/hibernate/${hibernate}/lib/hibernate3.jar"
dest="${thirdparty.dir}/hibernate3.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"/>
- <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}/jaxen/${jaxen}/lib/jaxen.jar"
dest="${thirdparty.dir}/jaxen.jar" usetimestamp="true"
verbose="true"/>
- <get src="${jboss.repository}/javassist/${javassist}/lib/javassist.jar"
dest="${thirdparty.dir}/javassist.jar" usetimestamp="true"
verbose="true"/>
- <get
src="${jboss.repository}/jboss/backport-concurrent/${jboss-backport-concurrent}/lib/jboss-backport-concurrent.jar"
dest="${thirdparty.dir}/jboss-backport-concurrent.jar"
usetimestamp="true" verbose="true"/>
- <get
src="${jboss.repository}/jboss/common-core/${jboss-common-core}/lib/jboss-common-core.jar"
dest="${thirdparty.dir}/jboss-common-core.jar" usetimestamp="true"
verbose="true"/>
- <get
src="${jboss.repository}/jboss/common-core/${jboss-common-core}/lib/jboss-common-core-sources.jar"
dest="${thirdparty.dir}/jboss-common-core-sources.jar"
usetimestamp="true" verbose="true"/>
- <get
src="${jboss.repository}/jboss/common-logging-log4j/${jboss-common-logging-log4j}/lib/jboss-logging-log4j.jar"
dest="${thirdparty.dir}/jboss-logging-log4j.jar" usetimestamp="true"
verbose="true"/>
- <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}/jboss/ejb3/${jboss-ejb3}/bin/ejb3.deployer"
dest="${thirdparty.dir}/ejb3.deployer.zip" 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/jboss-vfs/${jboss-vfs}/lib/jboss-vfs.jar"
dest="${thirdparty.dir}/jboss-vfs.jar" usetimestamp="true"
verbose="true"/>
- <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/jbossretro/${jboss-jbossretro}/lib/jbossretro.jar"
dest="${thirdparty.dir}/jbossretro.jar" usetimestamp="true"
verbose="true"/>
- <get
src="${jboss.repository}/jboss/jbossretro/${jboss-jbossretro}/lib/jbossretro-rt.jar"
dest="${thirdparty.dir}/jbossretro-rt.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-wsconsume-impl/${jbossws-wsconsume-impl}/lib/jbossws-wsconsume-impl.jar"
dest="${thirdparty.dir}/jbossws-wsconsume-impl.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"/>
- <get
src="${jboss.repository}/jboss/microcontainer/${jboss-microcontainer}/lib/jboss-dependency.jar"
dest="${thirdparty.dir}/jboss-dependency.jar" usetimestamp="true"
verbose="true"/>
- <get
src="${jboss.repository}/jboss/microcontainer/${jboss-microcontainer}/lib/jboss-deployers.jar"
dest="${thirdparty.dir}/jboss-deployers.jar" usetimestamp="true"
verbose="true"/>
- <get
src="${jboss.repository}/jboss/microcontainer/${jboss-microcontainer}/lib/jboss-microcontainer.jar"
dest="${thirdparty.dir}/jboss-microcontainer.jar" usetimestamp="true"
verbose="true"/>
- <get
src="${jboss.repository}/jboss/microcontainer/${jboss-microcontainer}/lib/jboss-dependency-src.zip"
dest="${thirdparty.dir}/jboss-dependency-src.zip" usetimestamp="true"
verbose="true"/>
- <get
src="${jboss.repository}/jboss/microcontainer/${jboss-microcontainer}/lib/jboss-deployers-src.zip"
dest="${thirdparty.dir}/jboss-deployers-src.zip" usetimestamp="true"
verbose="true"/>
- <get
src="${jboss.repository}/jboss/microcontainer/${jboss-microcontainer}/lib/jboss-microcontainer-src.zip"
dest="${thirdparty.dir}/jboss-microcontainer-src.zip"
usetimestamp="true" verbose="true"/>
- <get
src="${jboss.repository}/jboss/remoting/${jboss-remoting}/lib/jboss-remoting.jar"
dest="${thirdparty.dir}/jboss-remoting.jar" usetimestamp="true"
verbose="true"/>
- <get
src="${jboss.repository}/jboss/security/${jboss-security}/lib/jbosssx-client.jar"
dest="${thirdparty.dir}/jbosssx-client.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}/jbpm/bpel/${jbpm-bpel}/lib/jbpm-bpel.sar"
dest="${thirdparty.dir}/jbpm-bpel.sar" usetimestamp="true"
verbose="true" />
- <get src="${jboss.repository}/junit/${junit}/lib/junit.jar"
dest="${thirdparty.dir}/junit.jar" 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"/>
- <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-jaf/${sun-jaf}/lib/activation.jar"
dest="${thirdparty.dir}/activation.jar" usetimestamp="true"
verbose="true"/>
- <get src="${jboss.repository}/sun-javamail/${sun-javamail}/lib/mail.jar"
dest="${thirdparty.dir}/mail.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"/>
- <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}/xmlunit-xmlunit/${xmlunit}/lib/xmlunit1.0.jar"
dest="${thirdparty.dir}/xmlunit1.0.jar" usetimestamp="true"
verbose="true"/>
- <get
src="${jboss.repository}/wscommons-policy/${wscommons-policy}/lib/policy.jar"
dest="${thirdparty.dir}/policy.jar" usetimestamp="true"
verbose="true"/>
- <get src="${jboss.repository}/woodstox/${woodstox}/lib/wstx.jar"
dest="${thirdparty.dir}/wstx.jar" usetimestamp="true"
verbose="true"/>
+ <mkdir dir="${core.thirdparty.dir}"/>
+ <get src="${jboss.repository}/apache-ant/${apache-ant}/lib/ant.jar"
dest="${core.thirdparty.dir}/ant.jar" usetimestamp="true"
verbose="true"/>
+ <get
src="${jboss.repository}/apache-collections/${apache-collections}/lib/commons-collections.jar"
dest="${core.thirdparty.dir}/commons-collections.jar"
usetimestamp="true" verbose="true"/>
+ <get
src="${jboss.repository}/apache-log4j/${apache-log4j}/lib/log4j.jar"
dest="${core.thirdparty.dir}/log4j.jar" usetimestamp="true"
verbose="true"/>
+ <get
src="${jboss.repository}/apache-logging/${apache-logging}/lib/commons-logging.jar"
dest="${core.thirdparty.dir}/commons-logging.jar" usetimestamp="true"
verbose="true"/>
+ <get
src="${jboss.repository}/apache-xalan/${apache-xalan}/lib/serializer.jar"
dest="${core.thirdparty.dir}/serializer.jar" usetimestamp="true"
verbose="true"/>
+ <get
src="${jboss.repository}/apache-xalan/${apache-xalan}/lib/xalan.jar"
dest="${core.thirdparty.dir}/xalan.jar" usetimestamp="true"
verbose="true"/>
+ <get
src="${jboss.repository}/apache-xerces/${apache-xerces}/lib/resolver.jar"
dest="${core.thirdparty.dir}/resolver.jar" usetimestamp="true"
verbose="true"/>
+ <get
src="${jboss.repository}/apache-xerces/${apache-xerces}/lib/xercesImpl.jar"
dest="${core.thirdparty.dir}/xercesImpl.jar" usetimestamp="true"
verbose="true"/>
+ <get
src="${jboss.repository}/apache-xerces/${apache-xerces}/lib/xml-apis.jar"
dest="${core.thirdparty.dir}/xml-apis.jar" usetimestamp="true"
verbose="true"/>
+ <get
src="${jboss.repository}/apache-xmlsec/${apache-xmlsec}/lib/xmlsec.jar"
dest="${core.thirdparty.dir}/xmlsec.jar" usetimestamp="true"
verbose="true"/>
+ <get src="${jboss.repository}/dom4j/${dom4j}/lib/dom4j.jar"
dest="${core.thirdparty.dir}/dom4j.jar" usetimestamp="true"
verbose="true"/>
+ <get src="${jboss.repository}/gnu-getopt/${gnu-getopt}/lib/getopt.jar"
dest="${core.thirdparty.dir}/getopt.jar" usetimestamp="true"
verbose="true"/>
+ <get src="${jboss.repository}/hibernate/${hibernate}/lib/hibernate3.jar"
dest="${core.thirdparty.dir}/hibernate3.jar" usetimestamp="true"
verbose="true"/>
+ <get src="${jboss.repository}/ibm-wsdl4j/${ibm-wsdl4j}/lib/wsdl4j.jar"
dest="${core.thirdparty.dir}/wsdl4j.jar" usetimestamp="true"
verbose="true"/>
+ <get
src="${jboss.repository}/ibm-wsdl4j/${ibm-wsdl4j}/lib/wsdl4j-src.jar"
dest="${core.thirdparty.dir}/wsdl4j-src.jar" usetimestamp="true"
verbose="true"/>
+ <get src="${jboss.repository}/jaxen/${jaxen}/lib/jaxen.jar"
dest="${core.thirdparty.dir}/jaxen.jar" usetimestamp="true"
verbose="true"/>
+ <get src="${jboss.repository}/javassist/${javassist}/lib/javassist.jar"
dest="${core.thirdparty.dir}/javassist.jar" usetimestamp="true"
verbose="true"/>
+ <get
src="${jboss.repository}/jboss/common-core/${jboss-common-core}/lib/jboss-common-core.jar"
dest="${core.thirdparty.dir}/jboss-common-core.jar"
usetimestamp="true" verbose="true"/>
+ <get
src="${jboss.repository}/jboss/common-core/${jboss-common-core}/lib/jboss-common-core-sources.jar"
dest="${core.thirdparty.dir}/jboss-common-core-sources.jar"
usetimestamp="true" verbose="true"/>
+ <get
src="${jboss.repository}/jboss/common-logging-log4j/${jboss-common-logging-log4j}/lib/jboss-logging-log4j.jar"
dest="${core.thirdparty.dir}/jboss-logging-log4j.jar"
usetimestamp="true" verbose="true"/>
+ <get
src="${jboss.repository}/jboss/common-logging-spi/${jboss-common-logging-spi}/lib/jboss-logging-spi.jar"
dest="${core.thirdparty.dir}/jboss-logging-spi.jar"
usetimestamp="true" verbose="true"/>
+ <get
src="${jboss.repository}/jboss/ejb3/${jboss-ejb3}/bin/ejb3.deployer"
dest="${core.thirdparty.dir}/ejb3.deployer.zip" usetimestamp="true"
verbose="true"/>
+ <get
src="${jboss.repository}/jboss/jaxr/${jboss-jaxr}/lib/juddi-service.sar"
dest="${core.thirdparty.dir}/juddi-service.sar" usetimestamp="true"
verbose="true"/>
+ <get
src="${jboss.repository}/jboss/jboss-vfs/${jboss-vfs}/lib/jboss-vfs.jar"
dest="${core.thirdparty.dir}/jboss-vfs.jar" usetimestamp="true"
verbose="true"/>
+ <get
src="${jboss.repository}/jboss/jboss-vfs/${jboss-vfs}/lib/jboss-vfs-sources.jar"
dest="${core.thirdparty.dir}/jboss-vfs-sources.jar"
usetimestamp="true" verbose="true"/>
+ <get
src="${jboss.repository}/jboss/jbossws-wsconsume-impl/${jbossws-wsconsume-impl}/lib/jbossws-wsconsume-impl.jar"
dest="${core.thirdparty.dir}/jbossws-wsconsume-impl.jar"
usetimestamp="true" verbose="true"/>
+ <get
src="${jboss.repository}/jboss/jbossxb/${jboss-jbossxb}/lib/jboss-xml-binding.jar"
dest="${core.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="${core.thirdparty.dir}/jboss-xml-binding-sources.jar"
usetimestamp="true" verbose="true"/>
+ <get
src="${jboss.repository}/jboss/microcontainer/${jboss-microcontainer}/lib/jboss-container.jar"
dest="${core.thirdparty.dir}/jboss-container.jar" usetimestamp="true"
verbose="true"/>
+ <get
src="${jboss.repository}/jboss/microcontainer/${jboss-microcontainer}/lib/jboss-dependency.jar"
dest="${core.thirdparty.dir}/jboss-dependency.jar" usetimestamp="true"
verbose="true"/>
+ <get
src="${jboss.repository}/jboss/microcontainer/${jboss-microcontainer}/lib/jboss-deployers.jar"
dest="${core.thirdparty.dir}/jboss-deployers.jar" usetimestamp="true"
verbose="true"/>
+ <get
src="${jboss.repository}/jboss/microcontainer/${jboss-microcontainer}/lib/jboss-microcontainer.jar"
dest="${core.thirdparty.dir}/jboss-microcontainer.jar"
usetimestamp="true" verbose="true"/>
+ <get
src="${jboss.repository}/jboss/microcontainer/${jboss-microcontainer}/lib/jboss-dependency-src.zip"
dest="${core.thirdparty.dir}/jboss-dependency-src.zip"
usetimestamp="true" verbose="true"/>
+ <get
src="${jboss.repository}/jboss/microcontainer/${jboss-microcontainer}/lib/jboss-deployers-src.zip"
dest="${core.thirdparty.dir}/jboss-deployers-src.zip"
usetimestamp="true" verbose="true"/>
+ <get
src="${jboss.repository}/jboss/microcontainer/${jboss-microcontainer}/lib/jboss-microcontainer-src.zip"
dest="${core.thirdparty.dir}/jboss-microcontainer-src.zip"
usetimestamp="true" verbose="true"/>
+ <get
src="${jboss.repository}/jboss/remoting/${jboss-remoting}/lib/jboss-remoting.jar"
dest="${core.thirdparty.dir}/jboss-remoting.jar" usetimestamp="true"
verbose="true"/>
+ <get
src="${jboss.repository}/jboss/security/${jboss-security}/lib/jbosssx-client.jar"
dest="${core.thirdparty.dir}/jbosssx-client.jar" usetimestamp="true"
verbose="true"/>
+ <get
src="${jboss.repository}/jboss/security/${jboss-security}/lib/jbosssx-src.zip"
dest="${core.thirdparty.dir}/jbosssx-src.zip" usetimestamp="true"
verbose="true"/>
+ <get
src="${jboss.repository}/jbossas/core-libs/${jbossas-core-libs}/lib/jboss-j2ee.jar"
dest="${core.thirdparty.dir}/jboss-j2ee.jar" usetimestamp="true"
verbose="true"/>
+ <get src="${jboss.repository}/jbpm/bpel/${jbpm-bpel}/lib/jbpm-bpel.sar"
dest="${core.thirdparty.dir}/jbpm-bpel.sar" usetimestamp="true"
verbose="true" />
+ <get src="${jboss.repository}/junit/${junit}/lib/junit.jar"
dest="${core.thirdparty.dir}/junit.jar" usetimestamp="true"
verbose="true"/>
+ <get
src="${jboss.repository}/oswego-concurrent/${oswego-concurrent}/lib/concurrent.jar"
dest="${core.thirdparty.dir}/concurrent.jar" usetimestamp="true"
verbose="true"/>
+ <get src="${jboss.repository}/qdox/${qdox}/lib/qdox.jar"
dest="${core.thirdparty.dir}/qdox.jar" usetimestamp="true"
verbose="true"/>
+ <get src="${jboss.repository}/stax-api/${stax-api}/lib/stax-api.jar"
dest="${core.thirdparty.dir}/stax-api.jar" usetimestamp="true"
verbose="true"/>
+ <get src="${jboss.repository}/sun-jaf/${sun-jaf}/lib/activation.jar"
dest="${core.thirdparty.dir}/activation.jar" usetimestamp="true"
verbose="true"/>
+ <get src="${jboss.repository}/sun-javamail/${sun-javamail}/lib/mail.jar"
dest="${core.thirdparty.dir}/mail.jar" usetimestamp="true"
verbose="true"/>
+ <get src="${jboss.repository}/sun-jaxb/${sun-jaxb}/lib/jaxb-api.jar"
dest="${core.thirdparty.dir}/jaxb-api.jar" usetimestamp="true"
verbose="true"/>
+ <get src="${jboss.repository}/sun-jaxb/${sun-jaxb}/lib/jaxb-impl.jar"
dest="${core.thirdparty.dir}/jaxb-impl.jar" usetimestamp="true"
verbose="true"/>
+ <get src="${jboss.repository}/sun-jaxb/${sun-jaxb}/lib/jaxb-xjc.jar"
dest="${core.thirdparty.dir}/jaxb-xjc.jar" usetimestamp="true"
verbose="true"/>
+ <get
src="${jboss.repository}/sun-servlet/${sun-servlet}/lib/servlet-api.jar"
dest="${core.thirdparty.dir}/servlet-api.jar" usetimestamp="true"
verbose="true"/>
+ <get
src="${jboss.repository}/xmlunit-xmlunit/${xmlunit}/lib/xmlunit1.0.jar"
dest="${core.thirdparty.dir}/xmlunit1.0.jar" usetimestamp="true"
verbose="true"/>
+ <get
src="${jboss.repository}/wscommons-policy/${wscommons-policy}/lib/policy.jar"
dest="${core.thirdparty.dir}/policy.jar" usetimestamp="true"
verbose="true"/>
+ <get src="${jboss.repository}/woodstox/${woodstox}/lib/wstx.jar"
dest="${core.thirdparty.dir}/wstx.jar" usetimestamp="true"
verbose="true"/>
- <mkdir dir="${thirdparty.dir}/jbpm-bpel"/>
- <unzip dest="${thirdparty.dir}/jbpm-bpel"
src="${thirdparty.dir}/jbpm-bpel.sar"/>
- <unzip dest="${thirdparty.dir}"
src="${thirdparty.dir}/ejb3.deployer.zip"/>
+ <mkdir dir="${core.thirdparty.dir}/jbpm-bpel"/>
+ <unzip dest="${core.thirdparty.dir}/jbpm-bpel"
src="${core.thirdparty.dir}/jbpm-bpel.sar"/>
+ <unzip dest="${core.thirdparty.dir}"
src="${core.thirdparty.dir}/ejb3.deployer.zip"/>
+
+ <checksum file="${core.dir}/version.properties"
fileext=".md5"/>
</target>
- <target name="thirdparty-classpath" >
+ <target name="core-thirdparty-classpath"
depends="core-thirdparty-init,spi-thirdparty-classpath">
<!-- The compile classpath for jbossws core -->
- <path id="core.classpath">
- <pathelement location="${spi.dir}/output/lib/jbossws-spi.jar"/>
+ <path id="core.thirdparty.classpath">
+ <path refid="spi.thirdparty.classpath"/>
+ <pathelement location="${spi.dir}/output/classes"/>
+ <pathelement
location="${core.thirdparty.dir}/ejb3.deployer/jboss-annotations-ejb3.jar"/>
+ <pathelement
location="${core.thirdparty.dir}/ejb3.deployer/jboss-ejb3x.jar"/>
+ <pathelement location="${core.thirdparty.dir}/activation.jar"/>
+ <pathelement location="${core.thirdparty.dir}/getopt.jar"/>
+ <pathelement location="${core.thirdparty.dir}/javassist.jar"/>
+ <pathelement location="${core.thirdparty.dir}/jaxb-api.jar"/>
+ <pathelement location="${core.thirdparty.dir}/jaxb-impl.jar"/>
+ <pathelement location="${core.thirdparty.dir}/jaxb-xjc.jar"/>
+ <pathelement
location="${core.thirdparty.dir}/jboss-common-core.jar"/>
+ <pathelement
location="${core.thirdparty.dir}/jboss-dependency.jar"/>
+ <pathelement location="${core.thirdparty.dir}/jboss-j2ee.jar"/>
+ <pathelement
location="${core.thirdparty.dir}/jboss-logging-spi.jar"/>
+ <pathelement
location="${core.thirdparty.dir}/jboss-microcontainer.jar"/>
+ <pathelement
location="${core.thirdparty.dir}/jboss-remoting.jar"/>
+ <pathelement
location="${core.thirdparty.dir}/jboss-xml-binding.jar"/>
+ <pathelement
location="${core.thirdparty.dir}/jbosssx-client.jar"/>
+ <pathelement location="${core.thirdparty.dir}/mail.jar"/>
+ <pathelement location="${core.thirdparty.dir}/servlet-api.jar"/>
+ <pathelement location="${core.thirdparty.dir}/stax-api.jar"/>
+ <pathelement location="${core.thirdparty.dir}/wsdl4j.jar"/>
+ <pathelement location="${core.thirdparty.dir}/wstx.jar"/>
+ <pathelement location="${core.thirdparty.dir}/xmlsec.jar"/>
+ <pathelement location="${core.thirdparty.dir}/xercesImpl.jar"/>
+ <pathelement location="${core.thirdparty.dir}/xalan.jar"/>
- <pathelement
location="${thirdparty.dir}/ejb3.deployer/jboss-annotations-ejb3.jar"/>
- <pathelement
location="${thirdparty.dir}/ejb3.deployer/jboss-ejb3x.jar"/>
- <pathelement location="${thirdparty.dir}/activation.jar"/>
- <pathelement location="${thirdparty.dir}/getopt.jar"/>
- <pathelement location="${thirdparty.dir}/javassist.jar"/>
- <pathelement location="${thirdparty.dir}/jaxb-api.jar"/>
- <pathelement location="${thirdparty.dir}/jaxb-impl.jar"/>
- <pathelement location="${thirdparty.dir}/jaxb-xjc.jar"/>
- <pathelement location="${thirdparty.dir}/jboss-common-core.jar"/>
- <pathelement location="${thirdparty.dir}/jboss-dependency.jar"/>
- <pathelement location="${thirdparty.dir}/jboss-j2ee.jar"/>
- <pathelement location="${thirdparty.dir}/jboss-logging-spi.jar"/>
- <pathelement
location="${thirdparty.dir}/jboss-microcontainer.jar"/>
- <pathelement location="${thirdparty.dir}/jboss-remoting.jar"/>
- <pathelement location="${thirdparty.dir}/jboss-xml-binding.jar"/>
- <pathelement location="${thirdparty.dir}/jbosssx-client.jar"/>
- <pathelement location="${thirdparty.dir}/mail.jar"/>
- <pathelement location="${thirdparty.dir}/servlet-api.jar"/>
- <pathelement location="${thirdparty.dir}/stax-api.jar"/>
- <pathelement location="${thirdparty.dir}/wsdl4j.jar"/>
- <pathelement location="${thirdparty.dir}/wstx.jar"/>
- <pathelement location="${thirdparty.dir}/xmlsec.jar"/>
- <pathelement location="${thirdparty.dir}/xercesImpl.jar"/>
- <pathelement location="${thirdparty.dir}/xalan.jar"/>
</path>
</target>
Modified: trunk/jbossws-core/build.xml
===================================================================
--- trunk/jbossws-core/build.xml 2007-05-12 04:03:30 UTC (rev 3054)
+++ trunk/jbossws-core/build.xml 2007-05-12 05:49:15 UTC (rev 3055)
@@ -31,7 +31,7 @@
<property name="core.output.classes14.dir"
value="${core.output.dir}/classes14"/>
<property name="core.output.lib.dir"
value="${core.output.dir}/lib"/>
- <target name="core-init" depends="prepare, thirdparty">
+ <target name="core-init" depends="prepare,core-thirdparty">
</target>
<!-- ================================================================== -->
@@ -58,7 +58,7 @@
failonerror="${javac.fail.onerror}" source="1.4"
target="1.4">
<include name="javax/xml/rpc/**"/>
<include name="javax/xml/soap/**"/>
- <classpath refid="core.classpath"/>
+ <classpath refid="core.thirdparty.classpath"/>
</javac>
<!-- Compile core classes with jdk1.5 -->
@@ -71,7 +71,7 @@
<include name="org/jboss/annotation/**"/>
<include name="org/jboss/ws/**"/>
<classpath path="${core.output.classes14.dir}"/>
- <classpath refid="core.classpath"/>
+ <classpath refid="core.thirdparty.classpath"/>
</javac>
</target>
@@ -86,7 +86,6 @@
<filter token="build.id" value="${build.id}"/>
<filter token="implementation.version"
value="jbossws-${version.id}"/>
<filtersfile file="${build.dir}/version.properties"/>
- <filtersfile file="${basedir}/version.properties"/>
</filterset>
</copy>
</target>
Modified: trunk/jbossws-core/version.properties
===================================================================
--- trunk/jbossws-core/version.properties 2007-05-12 04:03:30 UTC (rev 3054)
+++ trunk/jbossws-core/version.properties 2007-05-12 05:49:15 UTC (rev 3055)
@@ -1,26 +1,14 @@
# $Id$
-implementation.title=JBoss Web Services - JBossWS
-implementation.url=http://www.jboss.org/products/jbossws
-implementation.vendor=JBoss Inc.
-implementation.vendor.id=http://www.jboss.org
-
# Thirdparty library versions that are referenced in component-info.xml
apache-xmlsec=1.3.0
ibm-wsdl4j=1.6.2
javassist=3.5.0.CR1
-jboss-jbossws-spi=SNAPSHOT
jbossws-wsconsume-impl=2.0.0
jbpm-bpel=1.1.0.Beta5
-sun-jaxb=2.0.3jboss
stax-api=1.0
-# Build and Tomcat
-jboss-jbossxb=1.0.0.CR10
-jboss-microcontainer=2.0.0.Beta3
-jboss-remoting=2.0.0.GA
-
# Thirdparty library versions
apache-ant=1.6.5
apache-collections=3.1
@@ -34,17 +22,11 @@
gnu-getopt=1.0.10
hibernate=3.2.1.GA
jaxen=1.1-beta-10
-jboss-backport-concurrent=2.1.0.GA
-jboss-common-core=2.0.2.GA
-jboss-common-logging-log4j=2.0.2.GA
-jboss-common-logging-spi=2.0.2.GA
jboss-ejb3=1.0.0.CR9-jboss4.0.5
jboss-jaxr=1.2.0.GA
-jboss-jbossretro=1.0.4.GA
+jboss-remoting=2.0.0.GA
jboss-security=4.0.5.GA
jboss-vfs=2.0.0.Beta2
-jbossws-jboss42=SNAPSHOT
-jbossws-jboss50=SNAPSHOT
jbossas-core-libs=4.0.5.GA
junit=3.8.1
oswego-concurrent=1.3.4
@@ -52,7 +34,7 @@
sun-hudson=1.93
sun-jaf=1.1
sun-javamail=1.4
-sun-servlet=2.4
+sun-jaxb=2.1.3
woodstox=3.1.1
wscommons-policy=1.0
xmlunit=1.0
Modified: trunk/jbossws-spi/ant-import/build-thirdparty.xml
===================================================================
--- trunk/jbossws-spi/ant-import/build-thirdparty.xml 2007-05-12 04:03:30 UTC (rev 3054)
+++ trunk/jbossws-spi/ant-import/build-thirdparty.xml 2007-05-12 05:49:15 UTC (rev 3055)
@@ -17,43 +17,60 @@
<!-- Libraries -->
<!-- ========= -->
- <target name="thirdparty"
depends="prepare,thirdparty-get,spi-classpath">
+ <target name="spi-thirdparty"
depends="spi-thirdparty-init,spi-thirdparty-get,spi-thirdparty-classpath">
</target>
- <target name="thirdparty-get" if="force.thirdparty.get"
+ <target name="spi-thirdparty-init" depends="prepare">
+
+ <property name="spi.thirdparty.dir"
value="${spi.dir}/thirdparty"/>
+ <checksum file="${build.dir}/version.properties"
fileext=".md5" verifyproperty="checksum.ok"/>
+ <condition property="spi.force.thirdparty">
+ <or>
+ <not>
+ <available file="${spi.thirdparty.dir}" type="dir"/>
+ </not>
+ <isfalse value="${checksum.ok}"/>
+ <isset property="force.thirdparty.get"/>
+ </or>
+ </condition>
+ </target>
+
+ <target name="spi-thirdparty-get" if="spi.force.thirdparty"
description="Gets the thirdparty libraries">
- <mkdir dir="${thirdparty.dir}"/>
- <get
src="${jboss.repository}/jboss/common-core/${jboss-common-core}/lib/jboss-common-core.jar"
dest="${thirdparty.dir}/jboss-common-core.jar" usetimestamp="true"
verbose="true"/>
- <get
src="${jboss.repository}/jboss/common-core/${jboss-common-core}/lib/jboss-common-core-sources.jar"
dest="${thirdparty.dir}/jboss-common-core-sources.jar"
usetimestamp="true" verbose="true"/>
- <get
src="${jboss.repository}/jboss/common-logging-log4j/${jboss-common-logging-log4j}/lib/jboss-logging-log4j.jar"
dest="${thirdparty.dir}/jboss-logging-log4j.jar" usetimestamp="true"
verbose="true"/>
- <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}/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"/>
- <get
src="${jboss.repository}/jboss/microcontainer/${jboss-microcontainer}/lib/jboss-dependency.jar"
dest="${thirdparty.dir}/jboss-dependency.jar" usetimestamp="true"
verbose="true"/>
- <get
src="${jboss.repository}/jboss/microcontainer/${jboss-microcontainer}/lib/jboss-dependency-src.zip"
dest="${thirdparty.dir}/jboss-dependency-src.zip" usetimestamp="true"
verbose="true"/>
- <get
src="${jboss.repository}/jboss/microcontainer/${jboss-microcontainer}/lib/jboss-deployers.jar"
dest="${thirdparty.dir}/jboss-deployers.jar" usetimestamp="true"
verbose="true"/>
- <get
src="${jboss.repository}/jboss/microcontainer/${jboss-microcontainer}/lib/jboss-deployers-src.zip"
dest="${thirdparty.dir}/jboss-deployers-src.zip" usetimestamp="true"
verbose="true"/>
- <get
src="${jboss.repository}/jboss/microcontainer/${jboss-microcontainer}/lib/jboss-microcontainer.jar"
dest="${thirdparty.dir}/jboss-microcontainer.jar" usetimestamp="true"
verbose="true"/>
- <get
src="${jboss.repository}/jboss/microcontainer/${jboss-microcontainer}/lib/jboss-microcontainer-src.zip"
dest="${thirdparty.dir}/jboss-microcontainer-src.zip"
usetimestamp="true" verbose="true"/>
- <get src="${jboss.repository}/sun-jaxws/${sun-jaxws}/lib/jaxws-api.jar"
dest="${thirdparty.dir}/jaxws-api.jar" usetimestamp="true"
verbose="true"/>
- <get src="${jboss.repository}/sun-jaxws/${sun-jaxws}/lib/jsr181-api.jar"
dest="${thirdparty.dir}/jsr181-api.jar" usetimestamp="true"
verbose="true"/>
- <get
src="${jboss.repository}/sun-servlet/${sun-servlet}/lib/servlet-api.jar"
dest="${thirdparty.dir}/servlet-api.jar" usetimestamp="true"
verbose="true"/>
+ <mkdir dir="${spi.thirdparty.dir}"/>
+ <get
src="${jboss.repository}/jboss/common-core/${jboss-common-core}/lib/jboss-common-core.jar"
dest="${spi.thirdparty.dir}/jboss-common-core.jar" usetimestamp="true"
verbose="true"/>
+ <get
src="${jboss.repository}/jboss/common-core/${jboss-common-core}/lib/jboss-common-core-sources.jar"
dest="${spi.thirdparty.dir}/jboss-common-core-sources.jar"
usetimestamp="true" verbose="true"/>
+ <get
src="${jboss.repository}/jboss/common-logging-log4j/${jboss-common-logging-log4j}/lib/jboss-logging-log4j.jar"
dest="${spi.thirdparty.dir}/jboss-logging-log4j.jar"
usetimestamp="true" verbose="true"/>
+ <get
src="${jboss.repository}/jboss/common-logging-spi/${jboss-common-logging-spi}/lib/jboss-logging-spi.jar"
dest="${spi.thirdparty.dir}/jboss-logging-spi.jar" usetimestamp="true"
verbose="true"/>
+ <get
src="${jboss.repository}/jboss/jbossxb/${jboss-jbossxb}/lib/jboss-xml-binding.jar"
dest="${spi.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="${spi.thirdparty.dir}/jboss-xml-binding-sources.jar"
usetimestamp="true" verbose="true"/>
+ <get
src="${jboss.repository}/jboss/microcontainer/${jboss-microcontainer}/lib/jboss-container.jar"
dest="${spi.thirdparty.dir}/jboss-container.jar" usetimestamp="true"
verbose="true"/>
+ <get
src="${jboss.repository}/jboss/microcontainer/${jboss-microcontainer}/lib/jboss-dependency.jar"
dest="${spi.thirdparty.dir}/jboss-dependency.jar" usetimestamp="true"
verbose="true"/>
+ <get
src="${jboss.repository}/jboss/microcontainer/${jboss-microcontainer}/lib/jboss-dependency-src.zip"
dest="${spi.thirdparty.dir}/jboss-dependency-src.zip"
usetimestamp="true" verbose="true"/>
+ <get
src="${jboss.repository}/jboss/microcontainer/${jboss-microcontainer}/lib/jboss-deployers.jar"
dest="${spi.thirdparty.dir}/jboss-deployers.jar" usetimestamp="true"
verbose="true"/>
+ <get
src="${jboss.repository}/jboss/microcontainer/${jboss-microcontainer}/lib/jboss-deployers-src.zip"
dest="${spi.thirdparty.dir}/jboss-deployers-src.zip"
usetimestamp="true" verbose="true"/>
+ <get
src="${jboss.repository}/jboss/microcontainer/${jboss-microcontainer}/lib/jboss-microcontainer.jar"
dest="${spi.thirdparty.dir}/jboss-microcontainer.jar"
usetimestamp="true" verbose="true"/>
+ <get
src="${jboss.repository}/jboss/microcontainer/${jboss-microcontainer}/lib/jboss-microcontainer-src.zip"
dest="${spi.thirdparty.dir}/jboss-microcontainer-src.zip"
usetimestamp="true" verbose="true"/>
+ <get src="${jboss.repository}/sun-jaxws/${sun-jaxws}/lib/jaxws-api.jar"
dest="${spi.thirdparty.dir}/jaxws-api.jar" usetimestamp="true"
verbose="true"/>
+ <get src="${jboss.repository}/sun-jaxws/${sun-jaxws}/lib/jsr181-api.jar"
dest="${spi.thirdparty.dir}/jsr181-api.jar" usetimestamp="true"
verbose="true"/>
+ <get
src="${jboss.repository}/sun-servlet/${sun-servlet}/lib/servlet-api.jar"
dest="${spi.thirdparty.dir}/servlet-api.jar" usetimestamp="true"
verbose="true"/>
+
+ <checksum file="${build.dir}/version.properties"
fileext=".md5"/>
</target>
- <target name="spi-classpath" >
+ <target name="spi-thirdparty-classpath"
depends="spi-thirdparty-init">
<!-- The compile classpath for jbossws spi -->
- <path id="spi.classpath">
- <pathelement location="${thirdparty.dir}/jboss-common-core.jar"/>
- <pathelement location="${thirdparty.dir}/jboss-dependency.jar"/>
- <pathelement location="${thirdparty.dir}/jboss-logging-spi.jar"/>
- <pathelement
location="${thirdparty.dir}/jboss-microcontainer.jar"/>
- <pathelement location="${thirdparty.dir}/jboss-xml-binding.jar"/>
- <pathelement location="${thirdparty.dir}/jaxws-api.jar"/>
- <pathelement location="${thirdparty.dir}/jsr181-api.jar"/>
- <pathelement location="${thirdparty.dir}/servlet-api.jar"/>
+ <path id="spi.thirdparty.classpath">
+ <pathelement
location="${spi.thirdparty.dir}/jboss-common-core.jar"/>
+ <pathelement
location="${spi.thirdparty.dir}/jboss-dependency.jar"/>
+ <pathelement
location="${spi.thirdparty.dir}/jboss-logging-spi.jar"/>
+ <pathelement
location="${spi.thirdparty.dir}/jboss-microcontainer.jar"/>
+ <pathelement
location="${spi.thirdparty.dir}/jboss-xml-binding.jar"/>
+ <pathelement location="${spi.thirdparty.dir}/jaxws-api.jar"/>
+ <pathelement location="${spi.thirdparty.dir}/jsr181-api.jar"/>
+ <pathelement location="${spi.thirdparty.dir}/servlet-api.jar"/>
</path>
</target>
Modified: trunk/jbossws-spi/build.xml
===================================================================
--- trunk/jbossws-spi/build.xml 2007-05-12 04:03:30 UTC (rev 3054)
+++ trunk/jbossws-spi/build.xml 2007-05-12 05:49:15 UTC (rev 3055)
@@ -36,7 +36,7 @@
<!-- Initialization -->
<!-- ================================================================== -->
- <target name="spi-init" depends="prepare,thirdparty">
+ <target name="spi-init" depends="prepare,spi-thirdparty">
</target>
<!-- ================================================================== -->
@@ -51,7 +51,7 @@
| documentation compiles.
-->
- <target name="spi-compile"
depends="spi-init,spi-classpath,spi-compile-classes,spi-compile-etc"
+ <target name="spi-compile"
depends="spi-init,spi-compile-classes,spi-compile-etc"
description="Compile all source files."/>
<!-- Compile java sources -->
@@ -62,7 +62,7 @@
<javac srcdir="${spi.java.dir}" sourcepath=""
destdir="${spi.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/ws/**"/>
- <classpath refid="spi.classpath"/>
+ <classpath refid="spi.thirdparty.classpath"/>
</javac>
</target>
@@ -80,7 +80,6 @@
<filter token="build.id" value="${build.id}"/>
<filter token="implementation.version"
value="jbossws-spi-${version.id}"/>
<filtersfile file="${build.dir}/version.properties"/>
- <filtersfile file="${basedir}/version.properties"/>
</filterset>
</copy>
</target>
Modified: trunk/jbws-jboss50/ant-import/build-thirdparty.xml
===================================================================
--- trunk/jbws-jboss50/ant-import/build-thirdparty.xml 2007-05-12 04:03:30 UTC (rev 3054)
+++ trunk/jbws-jboss50/ant-import/build-thirdparty.xml 2007-05-12 05:49:15 UTC (rev 3055)
@@ -13,13 +13,29 @@
<project>
+ <property file="${basedir}/version.properties"/>
+
<!-- ========= -->
<!-- Libraries -->
<!-- ========= -->
- <target name="thirdparty"
depends="prepare,thirdparty-get,thirdparty-classpath">
+ <target name="thirdparty"
depends="thirdparty-init,thirdparty-get,thirdparty-classpath">
</target>
+ <target name="thirdparty-init" depends="prepare">
+
+ <property name="thirdparty.dir"
value="${basedir}/thirdparty"/>
+ <checksum file="${basedir}/version.properties" fileext=".md5"
verifyproperty="checksum.ok"/>
+ <condition property="force.thirdparty.get">
+ <or>
+ <not>
+ <available file="${thirdparty.dir}" type="dir"/>
+ </not>
+ <isfalse value="${checksum.ok}"/>
+ </or>
+ </condition>
+ </target>
+
<!--
thirdpartry-get
-->
@@ -53,17 +69,14 @@
<get
src="${jboss.repository}/wscommons-policy/${wscommons-policy}/lib/policy.jar"
dest="${thirdparty.dir}/policy.jar" usetimestamp="true"
verbose="true"/>
</target>
- <target name="thirdparty-classpath" >
+ <target name="thirdparty-classpath"
depends="thirdparty-init,core-thirdparty-classpath">
<!-- The compile classpath for jboss50 integration -->
<path id="jboss50.integration.classpath">
- <pathelement location="${spi.dir}/output/lib/jbossws-spi.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"/>
- <pathelement location="${core.dir}/output/lib/jboss-saaj.jar"/>
-
+ <path refid="core.thirdparty.classpath"/>
+ <pathelement location="${spi.dir}/output/classes"/>
+ <pathelement location="${core.dir}/output/classes"/>
+ <pathelement location="${core.dir}/output/classes14"/>
<pathelement location="${jboss50.lib}/jboss-aop-jdk50.jar"/>
<pathelement location="${jboss50.lib}/jboss-deployers.jar"/>
<pathelement location="${jboss50.lib}/jboss-j2se.jar"/>
Modified: trunk/sunri-jboss50/ant-import/build-thirdparty.xml
===================================================================
--- trunk/sunri-jboss50/ant-import/build-thirdparty.xml 2007-05-12 04:03:30 UTC (rev
3054)
+++ trunk/sunri-jboss50/ant-import/build-thirdparty.xml 2007-05-12 05:49:15 UTC (rev
3055)
@@ -13,13 +13,29 @@
<project>
+ <property file="${basedir}/version.properties"/>
+
<!-- ========= -->
<!-- Libraries -->
<!-- ========= -->
- <target name="thirdparty"
depends="prepare,thirdparty-get,thirdparty-classpath">
+ <target name="thirdparty"
depends="thirdparty-init,thirdparty-get,thirdparty-classpath">
</target>
+ <target name="thirdparty-init" depends="prepare">
+
+ <property name="thirdparty.dir"
value="${basedir}/thirdparty"/>
+ <checksum file="${basedir}/version.properties" fileext=".md5"
verifyproperty="checksum.ok"/>
+ <condition property="force.thirdparty.get">
+ <or>
+ <not>
+ <available file="${thirdparty.dir}" type="dir"/>
+ </not>
+ <isfalse value="${checksum.ok}"/>
+ </or>
+ </condition>
+ </target>
+
<!--
thirdpartry-get
-->
@@ -61,14 +77,16 @@
<get
src="${jboss.repository}/sun-jaxws/${sun-jaxws}/lib/streambuffer.jar"
dest="${thirdparty.dir}/streambuffer.jar" usetimestamp="true"
verbose="true"/>
<get
src="${jboss.repository}/sun-jaxws/${sun-jaxws}/lib/jaxws-ri-src.jar"
dest="${thirdparty.dir}/jaxws-ri-src.jar" usetimestamp="true"
verbose="true"/>
<get
src="${jboss.repository}/sun-servlet/${sun-servlet}/lib/servlet-api.jar"
dest="${thirdparty.dir}/servlet-api.jar" usetimestamp="true"
verbose="true"/>
+
+ <checksum file="${basedir}/version.properties"
fileext=".md5"/>
</target>
- <target name="thirdparty-classpath" >
+ <target name="thirdparty-classpath"
depends="spi-thirdparty-classpath">
<!-- The compile classpath for jboss50 integration -->
<path id="sunri50.integration.classpath">
- <pathelement location="${spi.dir}/output/lib/jbossws-spi.jar"/>
-
+ <path refid="spi.thirdparty.classpath"/>
+ <pathelement location="${spi.dir}/output/classes"/>
<pathelement location="${jboss50.lib}/jboss-aop-jdk50.jar"/>
<pathelement location="${jboss50.lib}/jboss-deployers.jar"/>
<pathelement location="${jboss50.lib}/jboss-j2se.jar"/>
Modified: trunk/sunri-jboss50/build.xml
===================================================================
--- trunk/sunri-jboss50/build.xml 2007-05-12 04:03:30 UTC (rev 3054)
+++ trunk/sunri-jboss50/build.xml 2007-05-12 05:49:15 UTC (rev 3055)
@@ -20,7 +20,7 @@
<import file="${basedir}/ant-import/build-testsuite.xml"/>
<import file="${basedir}/ant-import/build-thirdparty.xml"/>
- <import file="${core.dir}/build.xml"/>
+ <import file="${spi.dir}/build.xml"/>
<!-- ================================================================== -->
<!-- Setup -->
@@ -40,7 +40,7 @@
<!-- Initialization -->
<!-- ================================================================== -->
- <target name="sunri50-init" depends="prepare, thirdparty">
+ <target name="sunri50-init" depends="prepare,thirdparty">
<fail message="Not available: ${jboss50.available.file}"
unless="jboss50.available"/>
</target>
Modified: trunk/sunri-jboss50/src/main/etc/default.mf
===================================================================
--- trunk/sunri-jboss50/src/main/etc/default.mf 2007-05-12 04:03:30 UTC (rev 3054)
+++ trunk/sunri-jboss50/src/main/etc/default.mf 2007-05-12 05:49:15 UTC (rev 3055)
@@ -3,7 +3,7 @@
Specification-Title: @specification.title@
Specification-Version: @specification.version@
Specification-Vendor: @specification.vendor@
-Implementation-Title: @implementation.title@
+Implementation-Title: @sunri.implementation.title@
Implementation-URL: @implementation.url@
Implementation-Version: @implementation.version@ (build=(a)build.id@)
Implementation-Vendor: @implementation.vendor@
Modified: trunk/sunri-jboss50/version.properties
===================================================================
--- trunk/sunri-jboss50/version.properties 2007-05-12 04:03:30 UTC (rev 3054)
+++ trunk/sunri-jboss50/version.properties 2007-05-12 05:49:15 UTC (rev 3055)
@@ -1,26 +1,11 @@
# $Id: version.properties 2928 2007-04-26 10:53:56Z thomas.diesler(a)jboss.com $
-specification.title=JBossWS
-specification.vendor=JBoss (
http://www.jboss.org)
-specification.version=jbossws-2.1
+sunri.implementation.title=JBoss Web Services - JBossWS/SunRI
-version.id=2.1.0.DEV
-repository.id=SNAPSHOT
-
-implementation.title=JBoss Web Services - JBossWS/SunRI
-implementation.url=http://www.jboss.org/products/jbossws
-implementation.vendor=JBoss Inc.
-implementation.vendor.id=http://www.jboss.org
-
# Thirdparty library versions
-jboss-common-core=2.0.2.GA
-jboss-common-logging-log4j=2.0.2.GA
-jboss-common-logging-spi=2.0.2.GA
jboss-jaxr=1.2.0.GA
jboss-jbossws-spi=SNAPSHOT
-jboss-jbossxb=2.0.0.CR2
-jboss-microcontainer=2.0.0.Beta3
jboss-security-spi=2.0.0.Beta
sun-jaxb=2.1.3
sun-jaxws=2.1.1