diff options
| author | Robert Gemmell <robbie@apache.org> | 2013-09-23 23:37:32 +0000 |
|---|---|---|
| committer | Robert Gemmell <robbie@apache.org> | 2013-09-23 23:37:32 +0000 |
| commit | 9324c3e5b86d7ff988cc9859016830844ae6b193 (patch) | |
| tree | 12c3b4bc774b4f4e428859aac2ec205d76725698 /java/bdbstore | |
| parent | 89183b4b93b68d6483211d0ecd22c76991fc3494 (diff) | |
| download | qpid-python-9324c3e5b86d7ff988cc9859016830844ae6b193.tar.gz | |
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/qpid@1525736 13f79535-47bb-0310-9956-ffa450edef68
Diffstat (limited to 'java/bdbstore')
| -rw-r--r-- | java/bdbstore/build.xml | 6 | ||||
| -rw-r--r-- | java/bdbstore/jmx/build.xml | 6 |
2 files changed, 6 insertions, 6 deletions
diff --git a/java/bdbstore/build.xml b/java/bdbstore/build.xml index a74457d9ad..6262b24aad 100644 --- a/java/bdbstore/build.xml +++ b/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/java/bdbstore/jmx/build.xml b/java/bdbstore/jmx/build.xml index 898eac9070..33e9b1e580 100644 --- a/java/bdbstore/jmx/build.xml +++ b/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"/> |