From f83677056891e436bf5ba99e79240df2a44528cd Mon Sep 17 00:00:00 2001 From: "Stephen D. Huston" Date: Fri, 21 Oct 2011 14:42:12 +0000 Subject: Merged out from trunk git-svn-id: https://svn.apache.org/repos/asf/qpid/branches/QPID-2519@1187375 13f79535-47bb-0310-9956-ffa450edef68 --- java/lib/backport-util-concurrent-2.2.jar | Bin 326319 -> 0 bytes java/lib/bdbstore/README.txt | 14 ++++++++++++++ java/lib/commons-pool-1.4.jar | Bin 87077 -> 0 bytes java/lib/core-3.1.1.jar | Bin 3566844 -> 0 bytes java/lib/geronimo-servlet_2.5_spec-1.2.jar | Bin 70593 -> 0 bytes java/lib/ivy/README.txt | 11 +++++++++++ java/lib/javassist.jar | Bin 471005 -> 0 bytes java/lib/jline-0.9.94.jar | Bin 87325 -> 0 bytes java/lib/jsp-2.1.jar | Bin 1024681 -> 0 bytes java/lib/jsp-api-2.1.jar | Bin 134910 -> 0 bytes java/lib/junit-4.4.jar | Bin 161477 -> 0 bytes java/lib/mina-core-1.0.1.jar | Bin 313338 -> 0 bytes java/lib/mina-filter-ssl-1.0.1.jar | Bin 28950 -> 0 bytes java/lib/muse-core-2.2.0.jar | Bin 121976 -> 0 bytes java/lib/muse-platform-mini-2.2.0.jar | Bin 8227 -> 0 bytes java/lib/muse-util-2.2.0.jar | Bin 23215 -> 0 bytes java/lib/muse-util-qname-2.2.0.jar | Bin 4968 -> 0 bytes java/lib/muse-util-xml-2.2.0.jar | Bin 19082 -> 0 bytes java/lib/muse-wsa-soap-2.2.0.jar | Bin 25030 -> 0 bytes java/lib/muse-wsdm-muws-adv-api-2.2.0.jar | Bin 4145 -> 0 bytes java/lib/muse-wsdm-muws-adv-impl-2.2.0.jar | Bin 10366 -> 0 bytes java/lib/muse-wsdm-muws-api-2.2.0.jar | Bin 18492 -> 0 bytes java/lib/muse-wsdm-muws-impl-2.2.0.jar | Bin 57860 -> 0 bytes java/lib/muse-wsdm-wef-api-2.2.0.jar | Bin 9125 -> 0 bytes java/lib/muse-wsdm-wef-impl-2.2.0.jar | Bin 18049 -> 0 bytes java/lib/muse-wsn-api-2.2.0.jar | Bin 29692 -> 0 bytes java/lib/muse-wsn-impl-2.2.0.jar | Bin 80531 -> 0 bytes java/lib/muse-wsrf-api-2.2.0.jar | Bin 58684 -> 0 bytes java/lib/muse-wsrf-impl-2.2.0.jar | Bin 127656 -> 0 bytes java/lib/muse-wsrf-rmd-2.2.0.jar | Bin 5625 -> 0 bytes java/lib/muse-wsx-api-2.2.0.jar | Bin 4624 -> 0 bytes java/lib/muse-wsx-impl-2.2.0.jar | Bin 9349 -> 0 bytes java/lib/poms/backport-util-concurrent-2.2.xml | 22 ---------------------- java/lib/poms/mina-core-1.0.1.xml | 22 ---------------------- java/lib/poms/mina-filter-ssl-1.0.1.xml | 22 ---------------------- java/lib/start.jar | Bin 17125 -> 0 bytes java/lib/wsdl4j-1.6.1.jar | Bin 148522 -> 0 bytes java/lib/xercesImpl-2.8.1.jar | Bin 1212965 -> 0 bytes java/lib/xml-apis-1.3.03.jar | Bin 195119 -> 0 bytes 39 files changed, 25 insertions(+), 66 deletions(-) delete mode 100644 java/lib/backport-util-concurrent-2.2.jar create mode 100644 java/lib/bdbstore/README.txt delete mode 100644 java/lib/commons-pool-1.4.jar delete mode 100644 java/lib/core-3.1.1.jar delete mode 100644 java/lib/geronimo-servlet_2.5_spec-1.2.jar create mode 100644 java/lib/ivy/README.txt delete mode 100644 java/lib/javassist.jar delete mode 100644 java/lib/jline-0.9.94.jar delete mode 100644 java/lib/jsp-2.1.jar delete mode 100644 java/lib/jsp-api-2.1.jar delete mode 100644 java/lib/junit-4.4.jar delete mode 100755 java/lib/mina-core-1.0.1.jar delete mode 100755 java/lib/mina-filter-ssl-1.0.1.jar delete mode 100644 java/lib/muse-core-2.2.0.jar delete mode 100644 java/lib/muse-platform-mini-2.2.0.jar delete mode 100644 java/lib/muse-util-2.2.0.jar delete mode 100644 java/lib/muse-util-qname-2.2.0.jar delete mode 100644 java/lib/muse-util-xml-2.2.0.jar delete mode 100644 java/lib/muse-wsa-soap-2.2.0.jar delete mode 100644 java/lib/muse-wsdm-muws-adv-api-2.2.0.jar delete mode 100644 java/lib/muse-wsdm-muws-adv-impl-2.2.0.jar delete mode 100644 java/lib/muse-wsdm-muws-api-2.2.0.jar delete mode 100644 java/lib/muse-wsdm-muws-impl-2.2.0.jar delete mode 100644 java/lib/muse-wsdm-wef-api-2.2.0.jar delete mode 100644 java/lib/muse-wsdm-wef-impl-2.2.0.jar delete mode 100644 java/lib/muse-wsn-api-2.2.0.jar delete mode 100644 java/lib/muse-wsn-impl-2.2.0.jar delete mode 100644 java/lib/muse-wsrf-api-2.2.0.jar delete mode 100644 java/lib/muse-wsrf-impl-2.2.0.jar delete mode 100644 java/lib/muse-wsrf-rmd-2.2.0.jar delete mode 100644 java/lib/muse-wsx-api-2.2.0.jar delete mode 100644 java/lib/muse-wsx-impl-2.2.0.jar delete mode 100644 java/lib/poms/backport-util-concurrent-2.2.xml delete mode 100644 java/lib/poms/mina-core-1.0.1.xml delete mode 100644 java/lib/poms/mina-filter-ssl-1.0.1.xml delete mode 100644 java/lib/start.jar delete mode 100644 java/lib/wsdl4j-1.6.1.jar delete mode 100644 java/lib/xercesImpl-2.8.1.jar delete mode 100644 java/lib/xml-apis-1.3.03.jar (limited to 'java/lib') diff --git a/java/lib/backport-util-concurrent-2.2.jar b/java/lib/backport-util-concurrent-2.2.jar deleted file mode 100644 index 20a16877bd..0000000000 Binary files a/java/lib/backport-util-concurrent-2.2.jar and /dev/null differ diff --git a/java/lib/bdbstore/README.txt b/java/lib/bdbstore/README.txt new file mode 100644 index 0000000000..80adb199bf --- /dev/null +++ b/java/lib/bdbstore/README.txt @@ -0,0 +1,14 @@ +The BDB JE jar must be downloaded into this directory in order to allow the optional bdbstore module to be built against it. + +*NOTE* The BDB JE library is licensed under the Sleepycat Licence [1], which is not compatible with the Apache Lience v2.0. As a result, the BDB JE library is not distributed with the project, and the optional bdbstore module is not compiled by default. + +The jar file may be downloaded by either: + + Seperately running the following command from the qpid/java/bdbstore dir: ant download-bdb + + OR + + Adding -Ddownload-bdb=true to your regular build command + + +[1] http://www.oracle.com/technetwork/database/berkeleydb/downloads/jeoslicense-086837.html diff --git a/java/lib/commons-pool-1.4.jar b/java/lib/commons-pool-1.4.jar deleted file mode 100644 index d6bc185450..0000000000 Binary files a/java/lib/commons-pool-1.4.jar and /dev/null differ diff --git a/java/lib/core-3.1.1.jar b/java/lib/core-3.1.1.jar deleted file mode 100644 index ae0b635867..0000000000 Binary files a/java/lib/core-3.1.1.jar and /dev/null differ diff --git a/java/lib/geronimo-servlet_2.5_spec-1.2.jar b/java/lib/geronimo-servlet_2.5_spec-1.2.jar deleted file mode 100644 index 00a2010036..0000000000 Binary files a/java/lib/geronimo-servlet_2.5_spec-1.2.jar and /dev/null differ diff --git a/java/lib/ivy/README.txt b/java/lib/ivy/README.txt new file mode 100644 index 0000000000..f8a01f39b4 --- /dev/null +++ b/java/lib/ivy/README.txt @@ -0,0 +1,11 @@ +Folder used to store Ivy libs for use in publishing Maven artifacts. + +Ivy must be downloaded and extracted into this directory if it is not available in the Ant lib dir. + +File may be downloaded in 2 ways: +1. By running the following command from the qpid/java dir: + ant -buildfile upload.xml download-ivy +2. Manually download and extract via http://ant.apache.org/ivy. + +Note for method 1 you may also have to set proxy server settings in advance, eg: +export ANT_OPTS="-Dhttp.proxyHost= -Dhttp.proxyPort=" diff --git a/java/lib/javassist.jar b/java/lib/javassist.jar deleted file mode 100644 index a6bde77812..0000000000 Binary files a/java/lib/javassist.jar and /dev/null differ diff --git a/java/lib/jline-0.9.94.jar b/java/lib/jline-0.9.94.jar deleted file mode 100644 index dafca7c46e..0000000000 Binary files a/java/lib/jline-0.9.94.jar and /dev/null differ diff --git a/java/lib/jsp-2.1.jar b/java/lib/jsp-2.1.jar deleted file mode 100644 index bfdb566c13..0000000000 Binary files a/java/lib/jsp-2.1.jar and /dev/null differ diff --git a/java/lib/jsp-api-2.1.jar b/java/lib/jsp-api-2.1.jar deleted file mode 100644 index ac3a7a8f7e..0000000000 Binary files a/java/lib/jsp-api-2.1.jar and /dev/null differ diff --git a/java/lib/junit-4.4.jar b/java/lib/junit-4.4.jar deleted file mode 100644 index 649b0b327f..0000000000 Binary files a/java/lib/junit-4.4.jar and /dev/null differ diff --git a/java/lib/mina-core-1.0.1.jar b/java/lib/mina-core-1.0.1.jar deleted file mode 100755 index f12067aa90..0000000000 Binary files a/java/lib/mina-core-1.0.1.jar and /dev/null differ diff --git a/java/lib/mina-filter-ssl-1.0.1.jar b/java/lib/mina-filter-ssl-1.0.1.jar deleted file mode 100755 index 53738e6498..0000000000 Binary files a/java/lib/mina-filter-ssl-1.0.1.jar and /dev/null differ diff --git a/java/lib/muse-core-2.2.0.jar b/java/lib/muse-core-2.2.0.jar deleted file mode 100644 index 674ec26f58..0000000000 Binary files a/java/lib/muse-core-2.2.0.jar and /dev/null differ diff --git a/java/lib/muse-platform-mini-2.2.0.jar b/java/lib/muse-platform-mini-2.2.0.jar deleted file mode 100644 index 1782083231..0000000000 Binary files a/java/lib/muse-platform-mini-2.2.0.jar and /dev/null differ diff --git a/java/lib/muse-util-2.2.0.jar b/java/lib/muse-util-2.2.0.jar deleted file mode 100644 index 8bb7348180..0000000000 Binary files a/java/lib/muse-util-2.2.0.jar and /dev/null differ diff --git a/java/lib/muse-util-qname-2.2.0.jar b/java/lib/muse-util-qname-2.2.0.jar deleted file mode 100644 index af0c76ece4..0000000000 Binary files a/java/lib/muse-util-qname-2.2.0.jar and /dev/null differ diff --git a/java/lib/muse-util-xml-2.2.0.jar b/java/lib/muse-util-xml-2.2.0.jar deleted file mode 100644 index 016b303c62..0000000000 Binary files a/java/lib/muse-util-xml-2.2.0.jar and /dev/null differ diff --git a/java/lib/muse-wsa-soap-2.2.0.jar b/java/lib/muse-wsa-soap-2.2.0.jar deleted file mode 100644 index f83322beac..0000000000 Binary files a/java/lib/muse-wsa-soap-2.2.0.jar and /dev/null differ diff --git a/java/lib/muse-wsdm-muws-adv-api-2.2.0.jar b/java/lib/muse-wsdm-muws-adv-api-2.2.0.jar deleted file mode 100644 index ba3bf4aa40..0000000000 Binary files a/java/lib/muse-wsdm-muws-adv-api-2.2.0.jar and /dev/null differ diff --git a/java/lib/muse-wsdm-muws-adv-impl-2.2.0.jar b/java/lib/muse-wsdm-muws-adv-impl-2.2.0.jar deleted file mode 100644 index 780a20f474..0000000000 Binary files a/java/lib/muse-wsdm-muws-adv-impl-2.2.0.jar and /dev/null differ diff --git a/java/lib/muse-wsdm-muws-api-2.2.0.jar b/java/lib/muse-wsdm-muws-api-2.2.0.jar deleted file mode 100644 index 2a0cab200a..0000000000 Binary files a/java/lib/muse-wsdm-muws-api-2.2.0.jar and /dev/null differ diff --git a/java/lib/muse-wsdm-muws-impl-2.2.0.jar b/java/lib/muse-wsdm-muws-impl-2.2.0.jar deleted file mode 100644 index a9954bb27e..0000000000 Binary files a/java/lib/muse-wsdm-muws-impl-2.2.0.jar and /dev/null differ diff --git a/java/lib/muse-wsdm-wef-api-2.2.0.jar b/java/lib/muse-wsdm-wef-api-2.2.0.jar deleted file mode 100644 index e9206b2eb3..0000000000 Binary files a/java/lib/muse-wsdm-wef-api-2.2.0.jar and /dev/null differ diff --git a/java/lib/muse-wsdm-wef-impl-2.2.0.jar b/java/lib/muse-wsdm-wef-impl-2.2.0.jar deleted file mode 100644 index 12856123b1..0000000000 Binary files a/java/lib/muse-wsdm-wef-impl-2.2.0.jar and /dev/null differ diff --git a/java/lib/muse-wsn-api-2.2.0.jar b/java/lib/muse-wsn-api-2.2.0.jar deleted file mode 100644 index 72b70a043d..0000000000 Binary files a/java/lib/muse-wsn-api-2.2.0.jar and /dev/null differ diff --git a/java/lib/muse-wsn-impl-2.2.0.jar b/java/lib/muse-wsn-impl-2.2.0.jar deleted file mode 100644 index 615f2a5f62..0000000000 Binary files a/java/lib/muse-wsn-impl-2.2.0.jar and /dev/null differ diff --git a/java/lib/muse-wsrf-api-2.2.0.jar b/java/lib/muse-wsrf-api-2.2.0.jar deleted file mode 100644 index efa36e9fbc..0000000000 Binary files a/java/lib/muse-wsrf-api-2.2.0.jar and /dev/null differ diff --git a/java/lib/muse-wsrf-impl-2.2.0.jar b/java/lib/muse-wsrf-impl-2.2.0.jar deleted file mode 100644 index a19b1e7149..0000000000 Binary files a/java/lib/muse-wsrf-impl-2.2.0.jar and /dev/null differ diff --git a/java/lib/muse-wsrf-rmd-2.2.0.jar b/java/lib/muse-wsrf-rmd-2.2.0.jar deleted file mode 100644 index e03676cad8..0000000000 Binary files a/java/lib/muse-wsrf-rmd-2.2.0.jar and /dev/null differ diff --git a/java/lib/muse-wsx-api-2.2.0.jar b/java/lib/muse-wsx-api-2.2.0.jar deleted file mode 100644 index 1533d8dc59..0000000000 Binary files a/java/lib/muse-wsx-api-2.2.0.jar and /dev/null differ diff --git a/java/lib/muse-wsx-impl-2.2.0.jar b/java/lib/muse-wsx-impl-2.2.0.jar deleted file mode 100644 index 9ce78ef0b7..0000000000 Binary files a/java/lib/muse-wsx-impl-2.2.0.jar and /dev/null differ diff --git a/java/lib/poms/backport-util-concurrent-2.2.xml b/java/lib/poms/backport-util-concurrent-2.2.xml deleted file mode 100644 index 6df4cfca40..0000000000 --- a/java/lib/poms/backport-util-concurrent-2.2.xml +++ /dev/null @@ -1,22 +0,0 @@ - - - - backport-util-concurrent - backport-util-concurrent - 2.2 - diff --git a/java/lib/poms/mina-core-1.0.1.xml b/java/lib/poms/mina-core-1.0.1.xml deleted file mode 100644 index 87fb96999f..0000000000 --- a/java/lib/poms/mina-core-1.0.1.xml +++ /dev/null @@ -1,22 +0,0 @@ - - - - org.apache.mina - mina-core - 1.0.1 - diff --git a/java/lib/poms/mina-filter-ssl-1.0.1.xml b/java/lib/poms/mina-filter-ssl-1.0.1.xml deleted file mode 100644 index ae41d7ed63..0000000000 --- a/java/lib/poms/mina-filter-ssl-1.0.1.xml +++ /dev/null @@ -1,22 +0,0 @@ - - - - org.apache.mina - mina-filter-ssl - 1.0.1 - diff --git a/java/lib/start.jar b/java/lib/start.jar deleted file mode 100644 index 63685df7cc..0000000000 Binary files a/java/lib/start.jar and /dev/null differ diff --git a/java/lib/wsdl4j-1.6.1.jar b/java/lib/wsdl4j-1.6.1.jar deleted file mode 100644 index 67a35fcbaa..0000000000 Binary files a/java/lib/wsdl4j-1.6.1.jar and /dev/null differ diff --git a/java/lib/xercesImpl-2.8.1.jar b/java/lib/xercesImpl-2.8.1.jar deleted file mode 100644 index 3b351f6e2b..0000000000 Binary files a/java/lib/xercesImpl-2.8.1.jar and /dev/null differ diff --git a/java/lib/xml-apis-1.3.03.jar b/java/lib/xml-apis-1.3.03.jar deleted file mode 100644 index b338fb6693..0000000000 Binary files a/java/lib/xml-apis-1.3.03.jar and /dev/null differ -- cgit v1.2.1