From 59710ea96cf37dc3859ada1dc5fb095b0b2bc6b4 Mon Sep 17 00:00:00 2001
From: Robert Gemmell <robbie@apache.org>
Date: Mon, 23 Sep 2013 23:37:32 +0000
Subject: QPID-5159: fixups after previous directory rename of broker to
 broker-core  - Add new broker module build.xml  - Updates the other modules
 to rely on broker-core, make it all compile.  - 'Un-move' the bin, etc,
 scripts dirs and other non-core files to 'leave' them in the broker module. 
 - 'Un-move' the Main and MainTest classes to 'leave' them in the broker
 module.

git-svn-id: https://svn.apache.org/repos/asf/qpid/trunk@1525736 13f79535-47bb-0310-9956-ffa450edef68
---
 qpid/java/bdbstore/build.xml     | 6 +++---
 qpid/java/bdbstore/jmx/build.xml | 6 +++---
 2 files changed, 6 insertions(+), 6 deletions(-)

(limited to 'qpid/java/bdbstore')

diff --git a/qpid/java/bdbstore/build.xml b/qpid/java/bdbstore/build.xml
index a74457d9ad..6262b24aad 100644
--- a/qpid/java/bdbstore/build.xml
+++ b/qpid/java/bdbstore/build.xml
@@ -17,10 +17,10 @@
  - under the License.
  -->
 <project name="bdbstore" xmlns:ivy="antlib:org.apache.ivy.ant" default="build">
-    <property name="module.depends" value="common broker broker-plugins/amqp-0-8-protocol broker-plugins/amqp-0-10-protocol" />
-    <property name="module.test.depends" value="client common/tests broker/tests management/common systests broker-plugins/management-jmx broker-plugins/memory-store broker-plugins/amqp-0-8-protocol broker-plugins/amqp-0-10-protocol broker-plugins/amqp-msg-conv-0-8-to-0-10" />
+    <property name="module.depends" value="common broker-core broker-plugins/amqp-0-8-protocol broker-plugins/amqp-0-10-protocol" />
+    <property name="module.test.depends" value="client common/tests broker-core/tests management/common systests broker-plugins/management-jmx broker-plugins/memory-store broker-plugins/amqp-0-8-protocol broker-plugins/amqp-0-10-protocol broker-plugins/amqp-msg-conv-0-8-to-0-10" />
     <property name="module.genpom" value="true"/>
-    <property name="module.genpom.args" value="-Sqpid-common=provided -Sqpid-broker=provided -Sqpid-broker-plugins-amqp-0-8-protocol=provided -Sje=provided"/>
+    <property name="module.genpom.args" value="-Sqpid-common=provided -Sqpid-broker-core=provided -Sqpid-broker-plugins-amqp-0-8-protocol=provided -Sje=provided"/>
 
     <property name="broker.plugin" value="true"/>
 
diff --git a/qpid/java/bdbstore/jmx/build.xml b/qpid/java/bdbstore/jmx/build.xml
index 898eac9070..33e9b1e580 100644
--- a/qpid/java/bdbstore/jmx/build.xml
+++ b/qpid/java/bdbstore/jmx/build.xml
@@ -17,11 +17,11 @@
  - under the License.
  -->
 <project name="bdbstore-jmx" default="build">
-    <property name="module.depends" value="common broker broker-plugins/management-jmx management/common bdbstore" />
-    <property name="module.test.depends" value="broker/tests common/tests management/common client systests bdbstore/tests broker-plugins/memory-store" />
+    <property name="module.depends" value="common broker-core broker-plugins/management-jmx management/common bdbstore" />
+    <property name="module.test.depends" value="broker-core/tests common/tests management/common client systests bdbstore/tests broker-plugins/memory-store" />
 
     <property name="module.genpom" value="true"/>
-    <property name="module.genpom.args" value="-Sqpid-common=provided -Sqpid-broker=provided -Sqpid-broker-plugins-management-jmx=provided -Sqpid-management-common=provided -Sqpid-bdbstore=provided -Sje=provided"/>
+    <property name="module.genpom.args" value="-Sqpid-common=provided -Sqpid-broker-core=provided -Sqpid-broker-plugins-management-jmx=provided -Sqpid-management-common=provided -Sqpid-bdbstore=provided -Sje=provided"/>
 
     <property name="broker.plugin" value="true"/>
 
-- 
cgit v1.2.1