[jbossws-commits] JBossWS SVN: r4090 - in common/trunk: ant-import and 1 other directories.

[jbossws-commits at lists.jboss.org]

Author: thomas.diesler at jboss.com
Date: 2007-08-02 06:49:01 -0400 (Thu, 02 Aug 2007)
New Revision: 4090

Modified:
   common/trunk/ant-import/build-thirdparty.xml
   common/trunk/src/main/etc/default.mf
   common/trunk/version.properties
Log:
Cleanup thirdparty

Modified: common/trunk/ant-import/build-thirdparty.xml
===================================================================
--- common/trunk/ant-import/build-thirdparty.xml	2007-08-02 10:44:44 UTC (rev 4089)
+++ common/trunk/ant-import/build-thirdparty.xml	2007-08-02 10:49:01 UTC (rev 4090)
@@ -38,9 +38,6 @@
   <target name="thirdparty-get" depends="thirdparty-init" if="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}/gnu-getopt/${gnu-getopt}/lib/getopt.jar" dest="${thirdparty.dir}/getopt.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}/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"/>
@@ -49,15 +46,11 @@
     <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-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}/jboss/jboss-javaee/${jboss-javaee}/lib/jboss-javaee.jar" dest="${thirdparty.dir}/jboss-javaee.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/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}/sun-jaf/${sun-jaf}/lib/activation.jar" dest="${thirdparty.dir}/activation.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-jaxws/${sun-jaxws}/lib/jaxws-api.jar" dest="${thirdparty.dir}/jaxws-api.jar" usetimestamp="true" verbose="true"/>
     <get src="${jboss.repository}/sun-jaxrpc/${sun-jaxrpc}/lib/jaxrpc-api.jar" dest="${thirdparty.dir}/jaxrpc-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"/>
     <checksum file="${common.dir}/version.properties" fileext=".md5"/>
   </target>
   
@@ -66,19 +59,14 @@
     <!-- The compile classpath for jbossws common -->
     <path id="common.thirdparty.classpath">
       <pathelement location="${thirdparty.dir}/activation.jar"/>
-      <pathelement location="${thirdparty.dir}/dom4j.jar"/>
-      <pathelement location="${thirdparty.dir}/getopt.jar"/>
+      <pathelement location="${thirdparty.dir}/jaxb-api.jar"/>
+      <pathelement location="${thirdparty.dir}/jaxrpc-api.jar"/>
+      <pathelement location="${thirdparty.dir}/jaxws-api.jar"/>
       <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-javaee.jar"/>
       <pathelement location="${thirdparty.dir}/jboss-microcontainer.jar"/>
-      <pathelement location="${thirdparty.dir}/jboss-xml-binding.jar"/>
       <pathelement location="${thirdparty.dir}/jbossws-spi.jar"/>
-      <pathelement location="${thirdparty.dir}/jaxws-api.jar"/>
-      <pathelement location="${thirdparty.dir}/jaxb-api.jar"/>
-      <pathelement location="${thirdparty.dir}/jaxrpc-api.jar"/>
-      <pathelement location="${thirdparty.dir}/servlet-api.jar"/>
     </path>
     
   </target>

Modified: common/trunk/src/main/etc/default.mf
===================================================================
--- common/trunk/src/main/etc/default.mf	2007-08-02 10:44:44 UTC (rev 4089)
+++ common/trunk/src/main/etc/default.mf	2007-08-02 10:49:01 UTC (rev 4090)
@@ -8,4 +8,3 @@
 Implementation-Version: @implementation.version@ (build=@build.id@)
 Implementation-Vendor: @implementation.vendor@
 Implementation-Vendor-Id: @implementation.vendor.id@
-Class-Path: getopt.jar
\ No newline at end of file

Modified: common/trunk/version.properties
===================================================================
--- common/trunk/version.properties	2007-08-02 10:44:44 UTC (rev 4089)
+++ common/trunk/version.properties	2007-08-02 10:49:01 UTC (rev 4090)
@@ -14,18 +14,12 @@
 implementation.vendor.id=http://www.jboss.org
 
 # Thirdparty library versions
-apache-ant=1.6.5
-dom4j=1.6.1
-gnu-getopt=1.0.10
 jboss-common-core=2.0.2.GA
 jboss-common-logging-log4j=2.0.2.GA
 jboss-common-logging-spi=2.0.2.GA
-jboss-javaee=5.0.0-SNAPSHOT
-jboss-jbossxb=1.0.0.GA-brew
 jboss-microcontainer=2.0.0.Beta3
 jbossws-spi=2.0.1.CR1
 sun-jaf=1.1
 sun-jaxb=2.1.4
 sun-jaxrpc=1.1
 sun-jaxws=2.1.1
-sun-servlet=2.5