Merged out from trunkQPID-2519

git-svn-id: https://svn.apache.org/repos/asf/qpid/branches/QPID-2519@1187375 13f79535-47bb-0310-9956-ffa450edef68

39 files changed, 25 insertions, 66 deletions

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
--- a/java/lib/backport-util-concurrent-2.2.jar
+++ /dev/null
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
--- a/java/lib/commons-pool-1.4.jar
+++ /dev/null
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
--- a/java/lib/core-3.1.1.jar
+++ /dev/null
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
--- a/java/lib/geronimo-servlet_2.5_spec-1.2.jar
+++ /dev/null
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=<hostname> -Dhttp.proxyPort=<port>"
diff --git a/java/lib/javassist.jar b/java/lib/javassist.jar
deleted file mode 100644
index a6bde77812..0000000000
--- a/java/lib/javassist.jar
+++ /dev/null
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
--- a/java/lib/jline-0.9.94.jar
+++ /dev/null
diff --git a/java/lib/jsp-2.1.jar b/java/lib/jsp-2.1.jar
deleted file mode 100644
index bfdb566c13..0000000000
--- a/java/lib/jsp-2.1.jar
+++ /dev/null
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
--- a/java/lib/jsp-api-2.1.jar
+++ /dev/null
diff --git a/java/lib/junit-4.4.jar b/java/lib/junit-4.4.jar
deleted file mode 100644
index 649b0b327f..0000000000
--- a/java/lib/junit-4.4.jar
+++ /dev/null
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
--- a/java/lib/mina-core-1.0.1.jar
+++ /dev/null
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
--- a/java/lib/mina-filter-ssl-1.0.1.jar
+++ /dev/null
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
--- a/java/lib/muse-core-2.2.0.jar
+++ /dev/null
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
--- a/java/lib/muse-platform-mini-2.2.0.jar
+++ /dev/null
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
--- a/java/lib/muse-util-2.2.0.jar
+++ /dev/null
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
--- a/java/lib/muse-util-qname-2.2.0.jar
+++ /dev/null
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
--- a/java/lib/muse-util-xml-2.2.0.jar
+++ /dev/null
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
--- a/java/lib/muse-wsa-soap-2.2.0.jar
+++ /dev/null
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
--- a/java/lib/muse-wsdm-muws-adv-api-2.2.0.jar
+++ /dev/null
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
--- a/java/lib/muse-wsdm-muws-adv-impl-2.2.0.jar
+++ /dev/null
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
--- a/java/lib/muse-wsdm-muws-api-2.2.0.jar
+++ /dev/null
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
--- a/java/lib/muse-wsdm-muws-impl-2.2.0.jar
+++ /dev/null
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
--- a/java/lib/muse-wsdm-wef-api-2.2.0.jar
+++ /dev/null
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
--- a/java/lib/muse-wsdm-wef-impl-2.2.0.jar
+++ /dev/null
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
--- a/java/lib/muse-wsn-api-2.2.0.jar
+++ /dev/null
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
--- a/java/lib/muse-wsn-impl-2.2.0.jar
+++ /dev/null
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
--- a/java/lib/muse-wsrf-api-2.2.0.jar
+++ /dev/null
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
--- a/java/lib/muse-wsrf-impl-2.2.0.jar
+++ /dev/null
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
--- a/java/lib/muse-wsrf-rmd-2.2.0.jar
+++ /dev/null
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
--- a/java/lib/muse-wsx-api-2.2.0.jar
+++ /dev/null
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
--- a/java/lib/muse-wsx-impl-2.2.0.jar
+++ /dev/null
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 @@
-<?xml version="1.0"?>
-<!--
-   Licensed to the Apache Software Foundation (ASF) under one or more
-   contributor license agreements.  See the NOTICE file distributed with
-   this work for additional information regarding copyright ownership.
-   The ASF licenses this file to You under the Apache License, Version 2.0
-   (the "License"); you may not use this file except in compliance with
-   the License.  You may obtain a copy of the License at
-
-       http://www.apache.org/licenses/LICENSE-2.0
-
-   Unless required by applicable law or agreed to in writing, software
-   distributed under the License is distributed on an "AS IS" BASIS,
-   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-   See the License for the specific language governing permissions and
-   limitations under the License.
--->
-<dep>
-  <groupId>backport-util-concurrent</groupId>
-  <artifactId>backport-util-concurrent</artifactId>
-  <version>2.2</version>
-</dep>
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 @@
-<?xml version="1.0"?>
-<!--
-   Licensed to the Apache Software Foundation (ASF) under one or more
-   contributor license agreements.  See the NOTICE file distributed with
-   this work for additional information regarding copyright ownership.
-   The ASF licenses this file to You under the Apache License, Version 2.0
-   (the "License"); you may not use this file except in compliance with
-   the License.  You may obtain a copy of the License at
-
-       http://www.apache.org/licenses/LICENSE-2.0
-
-   Unless required by applicable law or agreed to in writing, software
-   distributed under the License is distributed on an "AS IS" BASIS,
-   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-   See the License for the specific language governing permissions and
-   limitations under the License.
--->
-<dep>
-  <groupId>org.apache.mina</groupId>
-  <artifactId>mina-core</artifactId>
-  <version>1.0.1</version>
-</dep>
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 @@
-<?xml version="1.0"?>
-<!--
-   Licensed to the Apache Software Foundation (ASF) under one or more
-   contributor license agreements.  See the NOTICE file distributed with
-   this work for additional information regarding copyright ownership.
-   The ASF licenses this file to You under the Apache License, Version 2.0
-   (the "License"); you may not use this file except in compliance with
-   the License.  You may obtain a copy of the License at
-
-       http://www.apache.org/licenses/LICENSE-2.0
-
-   Unless required by applicable law or agreed to in writing, software
-   distributed under the License is distributed on an "AS IS" BASIS,
-   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-   See the License for the specific language governing permissions and
-   limitations under the License.
--->
-<dep>
-  <groupId>org.apache.mina</groupId>
-  <artifactId>mina-filter-ssl</artifactId>
-  <version>1.0.1</version>
-</dep>
diff --git a/java/lib/start.jar b/java/lib/start.jar
deleted file mode 100644
index 63685df7cc..0000000000
--- a/java/lib/start.jar
+++ /dev/null
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
--- a/java/lib/wsdl4j-1.6.1.jar
+++ /dev/null
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
--- a/java/lib/xercesImpl-2.8.1.jar
+++ /dev/null
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
--- a/java/lib/xml-apis-1.3.03.jar
+++ /dev/null