From ebfd9ff053b04ab379acfc0fefedee5a31b6d8a5 Mon Sep 17 00:00:00 2001 From: "Stephen D. Huston" Date: Fri, 21 Oct 2011 01:19:00 +0000 Subject: Undo bad merge from trunk - merged at wrong level. git-svn-id: https://svn.apache.org/repos/asf/qpid/branches/QPID-2519@1187150 13f79535-47bb-0310-9956-ffa450edef68 --- java/lib/backport-util-concurrent-2.2.jar | Bin 0 -> 326319 bytes java/lib/bdbstore/README.txt | 14 -------------- java/lib/commons-pool-1.4.jar | Bin 0 -> 87077 bytes java/lib/core-3.1.1.jar | Bin 0 -> 3566844 bytes java/lib/geronimo-servlet_2.5_spec-1.2.jar | Bin 0 -> 70593 bytes java/lib/ivy/README.txt | 11 ----------- java/lib/javassist.jar | Bin 0 -> 471005 bytes java/lib/jline-0.9.94.jar | Bin 0 -> 87325 bytes java/lib/jsp-2.1.jar | Bin 0 -> 1024681 bytes java/lib/jsp-api-2.1.jar | Bin 0 -> 134910 bytes java/lib/junit-4.4.jar | Bin 0 -> 161477 bytes java/lib/mina-core-1.0.1.jar | Bin 0 -> 313338 bytes java/lib/mina-filter-ssl-1.0.1.jar | Bin 0 -> 28950 bytes java/lib/muse-core-2.2.0.jar | Bin 0 -> 121976 bytes java/lib/muse-platform-mini-2.2.0.jar | Bin 0 -> 8227 bytes java/lib/muse-util-2.2.0.jar | Bin 0 -> 23215 bytes java/lib/muse-util-qname-2.2.0.jar | Bin 0 -> 4968 bytes java/lib/muse-util-xml-2.2.0.jar | Bin 0 -> 19082 bytes java/lib/muse-wsa-soap-2.2.0.jar | Bin 0 -> 25030 bytes java/lib/muse-wsdm-muws-adv-api-2.2.0.jar | Bin 0 -> 4145 bytes java/lib/muse-wsdm-muws-adv-impl-2.2.0.jar | Bin 0 -> 10366 bytes java/lib/muse-wsdm-muws-api-2.2.0.jar | Bin 0 -> 18492 bytes java/lib/muse-wsdm-muws-impl-2.2.0.jar | Bin 0 -> 57860 bytes java/lib/muse-wsdm-wef-api-2.2.0.jar | Bin 0 -> 9125 bytes java/lib/muse-wsdm-wef-impl-2.2.0.jar | Bin 0 -> 18049 bytes java/lib/muse-wsn-api-2.2.0.jar | Bin 0 -> 29692 bytes java/lib/muse-wsn-impl-2.2.0.jar | Bin 0 -> 80531 bytes java/lib/muse-wsrf-api-2.2.0.jar | Bin 0 -> 58684 bytes java/lib/muse-wsrf-impl-2.2.0.jar | Bin 0 -> 127656 bytes java/lib/muse-wsrf-rmd-2.2.0.jar | Bin 0 -> 5625 bytes java/lib/muse-wsx-api-2.2.0.jar | Bin 0 -> 4624 bytes java/lib/muse-wsx-impl-2.2.0.jar | Bin 0 -> 9349 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 0 -> 17125 bytes java/lib/wsdl4j-1.6.1.jar | Bin 0 -> 148522 bytes java/lib/xercesImpl-2.8.1.jar | Bin 0 -> 1212965 bytes java/lib/xml-apis-1.3.03.jar | Bin 0 -> 195119 bytes 39 files changed, 66 insertions(+), 25 deletions(-) create mode 100644 java/lib/backport-util-concurrent-2.2.jar delete mode 100644 java/lib/bdbstore/README.txt create mode 100644 java/lib/commons-pool-1.4.jar create mode 100644 java/lib/core-3.1.1.jar create mode 100644 java/lib/geronimo-servlet_2.5_spec-1.2.jar delete mode 100644 java/lib/ivy/README.txt create mode 100644 java/lib/javassist.jar create mode 100644 java/lib/jline-0.9.94.jar create mode 100644 java/lib/jsp-2.1.jar create mode 100644 java/lib/jsp-api-2.1.jar create mode 100644 java/lib/junit-4.4.jar create mode 100755 java/lib/mina-core-1.0.1.jar create mode 100755 java/lib/mina-filter-ssl-1.0.1.jar create mode 100644 java/lib/muse-core-2.2.0.jar create mode 100644 java/lib/muse-platform-mini-2.2.0.jar create mode 100644 java/lib/muse-util-2.2.0.jar create mode 100644 java/lib/muse-util-qname-2.2.0.jar create mode 100644 java/lib/muse-util-xml-2.2.0.jar create mode 100644 java/lib/muse-wsa-soap-2.2.0.jar create mode 100644 java/lib/muse-wsdm-muws-adv-api-2.2.0.jar create mode 100644 java/lib/muse-wsdm-muws-adv-impl-2.2.0.jar create mode 100644 java/lib/muse-wsdm-muws-api-2.2.0.jar create mode 100644 java/lib/muse-wsdm-muws-impl-2.2.0.jar create mode 100644 java/lib/muse-wsdm-wef-api-2.2.0.jar create mode 100644 java/lib/muse-wsdm-wef-impl-2.2.0.jar create mode 100644 java/lib/muse-wsn-api-2.2.0.jar create mode 100644 java/lib/muse-wsn-impl-2.2.0.jar create mode 100644 java/lib/muse-wsrf-api-2.2.0.jar create mode 100644 java/lib/muse-wsrf-impl-2.2.0.jar create mode 100644 java/lib/muse-wsrf-rmd-2.2.0.jar create mode 100644 java/lib/muse-wsx-api-2.2.0.jar create mode 100644 java/lib/muse-wsx-impl-2.2.0.jar create mode 100644 java/lib/poms/backport-util-concurrent-2.2.xml create mode 100644 java/lib/poms/mina-core-1.0.1.xml create mode 100644 java/lib/poms/mina-filter-ssl-1.0.1.xml create mode 100644 java/lib/start.jar create mode 100644 java/lib/wsdl4j-1.6.1.jar create mode 100644 java/lib/xercesImpl-2.8.1.jar create 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 new file mode 100644 index 0000000000..20a16877bd Binary files /dev/null and b/java/lib/backport-util-concurrent-2.2.jar differ diff --git a/java/lib/bdbstore/README.txt b/java/lib/bdbstore/README.txt deleted file mode 100644 index 80adb199bf..0000000000 --- a/java/lib/bdbstore/README.txt +++ /dev/null @@ -1,14 +0,0 @@ -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 new file mode 100644 index 0000000000..d6bc185450 Binary files /dev/null and b/java/lib/commons-pool-1.4.jar differ diff --git a/java/lib/core-3.1.1.jar b/java/lib/core-3.1.1.jar new file mode 100644 index 0000000000..ae0b635867 Binary files /dev/null and b/java/lib/core-3.1.1.jar 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 new file mode 100644 index 0000000000..00a2010036 Binary files /dev/null and b/java/lib/geronimo-servlet_2.5_spec-1.2.jar differ diff --git a/java/lib/ivy/README.txt b/java/lib/ivy/README.txt deleted file mode 100644 index f8a01f39b4..0000000000 --- a/java/lib/ivy/README.txt +++ /dev/null @@ -1,11 +0,0 @@ -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 new file mode 100644 index 0000000000..a6bde77812 Binary files /dev/null and b/java/lib/javassist.jar differ diff --git a/java/lib/jline-0.9.94.jar b/java/lib/jline-0.9.94.jar new file mode 100644 index 0000000000..dafca7c46e Binary files /dev/null and b/java/lib/jline-0.9.94.jar differ diff --git a/java/lib/jsp-2.1.jar b/java/lib/jsp-2.1.jar new file mode 100644 index 0000000000..bfdb566c13 Binary files /dev/null and b/java/lib/jsp-2.1.jar differ diff --git a/java/lib/jsp-api-2.1.jar b/java/lib/jsp-api-2.1.jar new file mode 100644 index 0000000000..ac3a7a8f7e Binary files /dev/null and b/java/lib/jsp-api-2.1.jar differ diff --git a/java/lib/junit-4.4.jar b/java/lib/junit-4.4.jar new file mode 100644 index 0000000000..649b0b327f Binary files /dev/null and b/java/lib/junit-4.4.jar differ diff --git a/java/lib/mina-core-1.0.1.jar b/java/lib/mina-core-1.0.1.jar new file mode 100755 index 0000000000..f12067aa90 Binary files /dev/null and b/java/lib/mina-core-1.0.1.jar differ diff --git a/java/lib/mina-filter-ssl-1.0.1.jar b/java/lib/mina-filter-ssl-1.0.1.jar new file mode 100755 index 0000000000..53738e6498 Binary files /dev/null and b/java/lib/mina-filter-ssl-1.0.1.jar differ diff --git a/java/lib/muse-core-2.2.0.jar b/java/lib/muse-core-2.2.0.jar new file mode 100644 index 0000000000..674ec26f58 Binary files /dev/null and b/java/lib/muse-core-2.2.0.jar differ diff --git a/java/lib/muse-platform-mini-2.2.0.jar b/java/lib/muse-platform-mini-2.2.0.jar new file mode 100644 index 0000000000..1782083231 Binary files /dev/null and b/java/lib/muse-platform-mini-2.2.0.jar differ diff --git a/java/lib/muse-util-2.2.0.jar b/java/lib/muse-util-2.2.0.jar new file mode 100644 index 0000000000..8bb7348180 Binary files /dev/null and b/java/lib/muse-util-2.2.0.jar differ diff --git a/java/lib/muse-util-qname-2.2.0.jar b/java/lib/muse-util-qname-2.2.0.jar new file mode 100644 index 0000000000..af0c76ece4 Binary files /dev/null and b/java/lib/muse-util-qname-2.2.0.jar differ diff --git a/java/lib/muse-util-xml-2.2.0.jar b/java/lib/muse-util-xml-2.2.0.jar new file mode 100644 index 0000000000..016b303c62 Binary files /dev/null and b/java/lib/muse-util-xml-2.2.0.jar differ diff --git a/java/lib/muse-wsa-soap-2.2.0.jar b/java/lib/muse-wsa-soap-2.2.0.jar new file mode 100644 index 0000000000..f83322beac Binary files /dev/null and b/java/lib/muse-wsa-soap-2.2.0.jar 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 new file mode 100644 index 0000000000..ba3bf4aa40 Binary files /dev/null and b/java/lib/muse-wsdm-muws-adv-api-2.2.0.jar 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 new file mode 100644 index 0000000000..780a20f474 Binary files /dev/null and b/java/lib/muse-wsdm-muws-adv-impl-2.2.0.jar 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 new file mode 100644 index 0000000000..2a0cab200a Binary files /dev/null and b/java/lib/muse-wsdm-muws-api-2.2.0.jar 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 new file mode 100644 index 0000000000..a9954bb27e Binary files /dev/null and b/java/lib/muse-wsdm-muws-impl-2.2.0.jar 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 new file mode 100644 index 0000000000..e9206b2eb3 Binary files /dev/null and b/java/lib/muse-wsdm-wef-api-2.2.0.jar 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 new file mode 100644 index 0000000000..12856123b1 Binary files /dev/null and b/java/lib/muse-wsdm-wef-impl-2.2.0.jar differ diff --git a/java/lib/muse-wsn-api-2.2.0.jar b/java/lib/muse-wsn-api-2.2.0.jar new file mode 100644 index 0000000000..72b70a043d Binary files /dev/null and b/java/lib/muse-wsn-api-2.2.0.jar differ diff --git a/java/lib/muse-wsn-impl-2.2.0.jar b/java/lib/muse-wsn-impl-2.2.0.jar new file mode 100644 index 0000000000..615f2a5f62 Binary files /dev/null and b/java/lib/muse-wsn-impl-2.2.0.jar differ diff --git a/java/lib/muse-wsrf-api-2.2.0.jar b/java/lib/muse-wsrf-api-2.2.0.jar new file mode 100644 index 0000000000..efa36e9fbc Binary files /dev/null and b/java/lib/muse-wsrf-api-2.2.0.jar differ diff --git a/java/lib/muse-wsrf-impl-2.2.0.jar b/java/lib/muse-wsrf-impl-2.2.0.jar new file mode 100644 index 0000000000..a19b1e7149 Binary files /dev/null and b/java/lib/muse-wsrf-impl-2.2.0.jar differ diff --git a/java/lib/muse-wsrf-rmd-2.2.0.jar b/java/lib/muse-wsrf-rmd-2.2.0.jar new file mode 100644 index 0000000000..e03676cad8 Binary files /dev/null and b/java/lib/muse-wsrf-rmd-2.2.0.jar differ diff --git a/java/lib/muse-wsx-api-2.2.0.jar b/java/lib/muse-wsx-api-2.2.0.jar new file mode 100644 index 0000000000..1533d8dc59 Binary files /dev/null and b/java/lib/muse-wsx-api-2.2.0.jar differ diff --git a/java/lib/muse-wsx-impl-2.2.0.jar b/java/lib/muse-wsx-impl-2.2.0.jar new file mode 100644 index 0000000000..9ce78ef0b7 Binary files /dev/null and b/java/lib/muse-wsx-impl-2.2.0.jar differ diff --git a/java/lib/poms/backport-util-concurrent-2.2.xml b/java/lib/poms/backport-util-concurrent-2.2.xml new file mode 100644 index 0000000000..6df4cfca40 --- /dev/null +++ b/java/lib/poms/backport-util-concurrent-2.2.xml @@ -0,0 +1,22 @@ + + + + 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 new file mode 100644 index 0000000000..87fb96999f --- /dev/null +++ b/java/lib/poms/mina-core-1.0.1.xml @@ -0,0 +1,22 @@ + + + + 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 new file mode 100644 index 0000000000..ae41d7ed63 --- /dev/null +++ b/java/lib/poms/mina-filter-ssl-1.0.1.xml @@ -0,0 +1,22 @@ + + + + org.apache.mina + mina-filter-ssl + 1.0.1 + diff --git a/java/lib/start.jar b/java/lib/start.jar new file mode 100644 index 0000000000..63685df7cc Binary files /dev/null and b/java/lib/start.jar differ diff --git a/java/lib/wsdl4j-1.6.1.jar b/java/lib/wsdl4j-1.6.1.jar new file mode 100644 index 0000000000..67a35fcbaa Binary files /dev/null and b/java/lib/wsdl4j-1.6.1.jar differ diff --git a/java/lib/xercesImpl-2.8.1.jar b/java/lib/xercesImpl-2.8.1.jar new file mode 100644 index 0000000000..3b351f6e2b Binary files /dev/null and b/java/lib/xercesImpl-2.8.1.jar differ diff --git a/java/lib/xml-apis-1.3.03.jar b/java/lib/xml-apis-1.3.03.jar new file mode 100644 index 0000000000..b338fb6693 Binary files /dev/null and b/java/lib/xml-apis-1.3.03.jar differ -- cgit v1.2.1