QPID-832 sync build stuff from thegreatmerge

git-svn-id: https://svn.apache.org/repos/asf/incubator/qpid/trunk@651124 13f79535-47bb-0310-9956-ffa450edef68

10 files changed, 49 insertions, 6 deletions

diff --git a/qpid/java/broker/build.xml b/qpid/java/broker/build.xml
new file mode 100644
index 0000000000..bf402af7f7
--- /dev/null
+++ b/qpid/java/broker/build.xml
@@ -0,0 +1,38 @@
+<!--
+ -
+ - 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.
+ -
+ -->
+<project name="AMQ Broker" default="build">
+
+  <property name="module.depends" value="common"/>
+  <property name="module.main" value="org.apache.qpid.server.Main"/>
+  <property name="module.vm.version" value="1.5"/>
+
+  <import file="../module.xml"/>
+
+  <property name="output.dir" value="${module.precompiled}/org/apache/qpid/server/filter/jms/selector"/>
+
+  <target name="precompile">
+    <mkdir dir="${output.dir}"/>
+    <javacc target="src/main/grammar/SelectorParser.jj"
+            outputdirectory="${output.dir}"
+            javacchome="${project.root}/lib"/>
+  </target>
+
+</project>
diff --git a/qpid/java/build.deps b/qpid/java/build.deps
index 2ddc9fba7f..8acf1d8b4c 100644
--- a/qpid/java/build.deps
+++ b/qpid/java/build.deps
@@ -10,26 +10,31 @@ commons-logging=lib/commons-logging-1.0.4.jar
 geronimo-jms=lib/geronimo-jms_1.1_spec-1.0.jar
 
 junit=lib/junit-3.8.1.jar
-junit-toolkit=lib/junit-toolkit-0.6-SNAPSHOT.jar
 
 log4j=lib/log4j-1.2.12.jar
 
-mina-core=lib/mina-core-1.0.0.jar
-mina-filter-ssl=lib/mina-filter-ssl-1.0.0.jar
+mina-core=lib/mina-core-1.0.1.jar
+mina-filter-ssl=lib/mina-filter-ssl-1.0.1.jar
 
 slf4j-api=lib/slf4j-api-1.4.0.jar
 slf4j-log4j=lib/slf4j-log4j12-1.4.0.jar
 
 xalan=lib/xalan-2.7.0.jar
 
-test.libs=${log4j} ${slf4j-log4j} ${junit} ${junit-toolkit}
+osgi-core=lib/org.osgi.core-1.0.0.jar
+felix-framework=lib/org.apache.felix.framework-1.0.0.jar
+
+felix.libs=${osgi-core} ${felix-framework}
 
 common.libs=${slf4j-api} ${backport-util-concurrent} ${mina-core} \
     ${mina-filter-ssl} ${commons-codec} ${commons-lang} ${commons-collections} \
     ${commons-configuration}
 client.libs=${common.libs}  ${geronimo-jms}
 broker.libs=${common.libs} ${commons-cli} ${commons-logging} ${log4j} \
-    ${slf4j-log4j} ${xalan}
+    ${slf4j-log4j} ${xalan} ${felix.libs}
+
+junit-toolkit.libs=${log4j} ${junit}
+test.libs=${slf4j-log4j} ${junit-toolkit.libs}
 systests.libs=${client.libs} ${test.libs}
 perftests.libs=${systests.libs}
 integrationtests.libs=${systests.libs}
diff --git a/qpid/java/build.xml b/qpid/java/build.xml
index 1e91ce15c1..2094c50b9b 100644
--- a/qpid/java/build.xml
+++ b/qpid/java/build.xml
@@ -22,7 +22,7 @@
 
   <import file="common.xml"/>
 
-  <property name="modules.core"       value="common broker client"/>
+  <property name="modules.core"       value="junit-toolkit common broker client"/>
   <property name="modules.examples"   value="client/example"/>
   <property name="modules.tests"      value="systests perftests integrationtests"/>
   <property name="modules.management" value="management/eclipse-plugin"/>
diff --git a/qpid/java/lib/junit-toolkit-0.6-SNAPSHOT.jar b/qpid/java/lib/junit-toolkit-0.6-SNAPSHOT.jar
deleted file mode 100644
index 931c18ec25..0000000000
--- a/qpid/java/lib/junit-toolkit-0.6-SNAPSHOT.jar
+++ /dev/null
diff --git a/qpid/java/lib/mina-core-1.0.0.jar b/qpid/java/lib/mina-core-1.0.0.jar
deleted file mode 100644
index d20d97d52b..0000000000
--- a/qpid/java/lib/mina-core-1.0.0.jar
+++ /dev/null
diff --git a/qpid/java/lib/mina-core-1.0.1.jar b/qpid/java/lib/mina-core-1.0.1.jar
new file mode 100755
index 0000000000..f12067aa90
--- /dev/null
+++ b/qpid/java/lib/mina-core-1.0.1.jar
diff --git a/qpid/java/lib/mina-filter-ssl-1.0.0.jar b/qpid/java/lib/mina-filter-ssl-1.0.0.jar
deleted file mode 100644
index 3fa491c657..0000000000
--- a/qpid/java/lib/mina-filter-ssl-1.0.0.jar
+++ /dev/null
diff --git a/qpid/java/lib/mina-filter-ssl-1.0.1.jar b/qpid/java/lib/mina-filter-ssl-1.0.1.jar
new file mode 100755
index 0000000000..53738e6498
--- /dev/null
+++ b/qpid/java/lib/mina-filter-ssl-1.0.1.jar
diff --git a/qpid/java/lib/org.apache.felix.framework-1.0.0.jar b/qpid/java/lib/org.apache.felix.framework-1.0.0.jar
new file mode 100755
index 0000000000..51401807bb
--- /dev/null
+++ b/qpid/java/lib/org.apache.felix.framework-1.0.0.jar
diff --git a/qpid/java/lib/org.osgi.core-1.0.0.jar b/qpid/java/lib/org.osgi.core-1.0.0.jar
new file mode 100755
index 0000000000..dcddc09bc0
--- /dev/null
+++ b/qpid/java/lib/org.osgi.core-1.0.0.jar