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

35 files changed, 139 insertions, 104 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"/>
 
diff --git a/java/broker-core/build.xml b/java/broker-core/build.xml
index 50b637e5c3..2b3376c504 100644
--- a/java/broker-core/build.xml
+++ b/java/broker-core/build.xml
@@ -21,67 +21,13 @@
 <project name="AMQ Broker" default="build">
     <property name="module.depends" value="management/common common"/>
     <property name="module.test.depends" value="common/tests" />
-    <property name="module.main" value="org.apache.qpid.server.Main"/>
     <property name="module.genpom" value="true"/>
 
-    <!-- Add dependencies to the broker pom for the broker-plugins and bdbstore modules -->
-    <property name="module.maven.depends" value="broker-plugins/access-control broker-plugins/amqp-0-8-protocol broker-plugins/amqp-0-10-protocol broker-plugins/amqp-1-0-protocol broker-plugins/amqp-msg-conv-0-8-to-0-10 broker-plugins/amqp-msg-conv-0-8-to-1-0 broker-plugins/amqp-msg-conv-0-10-to-1-0 broker-plugins/derby-store broker-plugins/jdbc-provider-bone broker-plugins/jdbc-store broker-plugins/management-http broker-plugins/management-jmx broker-plugins/memory-store bdbstore bdbstore/jmx"/>
-    <!-- Make them runtime dependencies, make bdbstore modules optional -->
-    <property name="module.genpom.args" value="-Sqpid-broker-plugins-access-control=runtime -Sqpid-broker-plugins-amqp-0-8-protocol=runtime -Sqpid-broker-plugins-amqp-0-10-protocol=runtime -Sqpid-broker-plugins-amqp-1-0-protocol=runtime -Sqpid-broker-plugins-amqp-msg-conv-0-8-to-0-10=runtime -Sqpid-broker-plugins-amqp-msg-conv-0-8-to-1-0=runtime -Sqpid-broker-plugins-amqp-msg-conv-0-10-to-1-0=runtime -Sqpid-broker-plugins-derby-store=runtime -Sqpid-broker-plugins-jdbc-provider-bone=runtime -Sqpid-broker-plugins-jdbc-store=runtime -Sqpid-broker-plugins-management-http=runtime -Sqpid-broker-plugins-management-jmx=runtime -Sbroker-plugins-memory-store=runtime -Sqpid-bdbstore=runtime -Sqpid-bdbstore-jmx=runtime -Oqpid-bdbstore -Oqpid-bdbstore-jmx"/>
-
     <import file="../module.xml"/>
 
-    <import file="${project.root}/broker/build-generate-sources.xml"/>
+    <import file="${project.root}/broker-core/build-generate-sources.xml"/>
 
     <target name="precompile" depends="generate-logmessages"/>
 
-    <target name="copy-etc-release" if="module.etc.exists" description="copy etc directory if it exists to build tree">
-      <copy todir="${module.release}/etc" failonerror="false" flatten="true">
-          <fileset dir="${module.etc}" excludes="*.conf,*.jpp"/>
-      </copy>
-    </target>
-
-    <target name="copy-bin-release" description="copy dependencies into module release">
-        <copy todir="${module.release}/bin" failonerror="true">
-            <fileset dir="${module.bin}"/>
-        </copy>
-        <copy todir="${module.release}/bin" failonerror="true" flatten="true">
-            <fileset dir="${basedir}/../common/bin"/>
-        </copy>
-        <chmod dir="${module.release}/bin" perm="ugo+rx" includes="**/*"/>
-        <fixcrlf srcdir="${module.release}/bin" fixlast="true" eol="unix"/>
-        <fixcrlf srcdir="${module.release}/bin" fixlast="true" eol="dos" includes="*.bat"/>
-    </target>
-
-    <target name="release-bin-other" depends="release-bin-other-lib-opt,release-bin-other-bdbstore,release-bin-copy-broker-plugins"/>
-
-    <target name="release-bin-other-lib-opt" depends="release-bin-other-bdbstore" description="make lib/opt dir in the module release">
-        <mkdir dir="${module.release}/lib/opt"/>
-    </target>
-
-    <target name="release-bin-copy-broker-plugins" description="copy broker-plugins into module release">
-        <copy todir="${module.release}/lib/plugins" failonerror="true">
-            <fileset dir="${build.scratch.broker.plugins.lib}"/>
-        </copy>
-    </target>
-
-    <target name="release-bin-other-bdbstore" depends="check-bdbstore-requested" if="bdbstore-requested"
-                                         description="copy bdbstore items into module release">
-        <copy todir="${module.release}/bin" failonerror="true" flatten="true">
-            <fileset dir="${basedir}/../bdbstore/bin"/>
-        </copy>
-    </target>
-
-    <target name="check-bdbstore-requested">
-         <condition property="bdbstore-requested">
-             <or>
-                 <contains string="${modules.opt}" substring="bdbstore"/>
-                 <istrue value="${optional}"/>
-             </or>
-         </condition>
-    </target>
-
-    <target name="release-bin" depends="release-bin-tasks"/>
-
     <target name="bundle" depends="bundle-tasks"/>
 </project>
diff --git a/java/broker-plugins/access-control/build.xml b/java/broker-plugins/access-control/build.xml
index 47f8f2e0fe..ac633ab369 100644
--- a/java/broker-plugins/access-control/build.xml
+++ b/java/broker-plugins/access-control/build.xml
@@ -17,11 +17,11 @@
  - under the License.
  -->
 <project name="Qpid Broker-Plugins Access Control" default="build">
-    <property name="module.depends" value="common broker" />
-    <property name="module.test.depends" value="common/tests broker/tests management/common" />
+    <property name="module.depends" value="common broker-core" />
+    <property name="module.test.depends" value="common/tests broker-core/tests management/common" />
 
     <property name="module.genpom" value="true"/>
-    <property name="module.genpom.args" value="-Sqpid-common=provided -Sqpid-broker=provided"/>
+    <property name="module.genpom.args" value="-Sqpid-common=provided -Sqpid-broker-core=provided"/>
 
     <property name="broker.plugin" value="true"/>
 
@@ -29,7 +29,7 @@
 
     <import file="../../module.xml" />
 
-    <import file="${project.root}/broker/build-generate-sources.xml"/>
+    <import file="${project.root}/broker-core/build-generate-sources.xml"/>
 
     <target name="precompile" depends="generate-logmessages"/>
 
diff --git a/java/broker-plugins/amqp-0-10-protocol/build.xml b/java/broker-plugins/amqp-0-10-protocol/build.xml
index e3e6fabc87..5aed89f43e 100644
--- a/java/broker-plugins/amqp-0-10-protocol/build.xml
+++ b/java/broker-plugins/amqp-0-10-protocol/build.xml
@@ -17,11 +17,11 @@
  - under the License.
  -->
 <project name="Qpid Broker-Plugins AMQP 0-10 Protocol" default="build">
-    <property name="module.depends" value="common broker" />
-    <property name="module.test.depends" value="common/tests broker/tests" />
+    <property name="module.depends" value="common broker-core" />
+    <property name="module.test.depends" value="common/tests broker-core/tests" />
 
     <property name="module.genpom" value="true"/>
-    <property name="module.genpom.args" value="-Sqpid-common=provided -Sqpid-broker=provided"/>
+    <property name="module.genpom.args" value="-Sqpid-common=provided -Sqpid-broker-core=provided"/>
     <property name="broker-plugins-amqp-0-10-protocol.libs" value="" />
 
     <property name="broker.plugin" value="true"/>
diff --git a/java/broker-plugins/amqp-0-8-protocol/build.xml b/java/broker-plugins/amqp-0-8-protocol/build.xml
index 45086b6242..5c8d5e3135 100644
--- a/java/broker-plugins/amqp-0-8-protocol/build.xml
+++ b/java/broker-plugins/amqp-0-8-protocol/build.xml
@@ -17,11 +17,11 @@
  - under the License.
  -->
 <project name="Qpid Broker-Plugins AMQP 0-8 Protocol" default="build">
-    <property name="module.depends" value="common broker" />
-    <property name="module.test.depends" value="common/tests broker/tests" />
+    <property name="module.depends" value="common broker-core" />
+    <property name="module.test.depends" value="common/tests broker-core/tests" />
 
     <property name="module.genpom" value="true"/>
-    <property name="module.genpom.args" value="-Sqpid-common=provided -Sqpid-broker=provided"/>
+    <property name="module.genpom.args" value="-Sqpid-common=provided -Sqpid-broker-core=provided"/>
     <property name="broker-plugins-amqp-0-8-protocol.libs" value="" />
 
     <property name="broker.plugin" value="true"/>
diff --git a/java/broker-plugins/amqp-1-0-protocol/build.xml b/java/broker-plugins/amqp-1-0-protocol/build.xml
index b83e3eeae1..99620905db 100644
--- a/java/broker-plugins/amqp-1-0-protocol/build.xml
+++ b/java/broker-plugins/amqp-1-0-protocol/build.xml
@@ -17,11 +17,11 @@
  - under the License.
  -->
 <project name="Qpid Broker-Plugins AMQP 1.0 Protocol" default="build">
-    <property name="module.depends" value="common broker amqp-1-0-common" />
-    <property name="module.test.depends" value="common/tests broker/tests" />
+    <property name="module.depends" value="common broker-core amqp-1-0-common" />
+    <property name="module.test.depends" value="common/tests broker-core/tests" />
 
     <property name="module.genpom" value="true"/>
-    <property name="module.genpom.args" value="-Sqpid-common=provided -Sqpid-broker=provided"/>
+    <property name="module.genpom.args" value="-Sqpid-common=provided -Sqpid-broker-core=provided"/>
     <property name="broker-plugins-amqp-1-0-protocol.libs" value="" />
 
     <property name="broker.plugin" value="true"/>
diff --git a/java/broker-plugins/amqp-msg-conv-0-10-to-1-0/build.xml b/java/broker-plugins/amqp-msg-conv-0-10-to-1-0/build.xml
index cddbcf5bae..66a08ddc31 100644
--- a/java/broker-plugins/amqp-msg-conv-0-10-to-1-0/build.xml
+++ b/java/broker-plugins/amqp-msg-conv-0-10-to-1-0/build.xml
@@ -17,11 +17,11 @@
  - under the License.
  -->
 <project name="Qpid Broker-Plugins AMQP 0.8 to 1.0 MessageConversion" default="build">
-    <property name="module.depends" value="common broker amqp-1-0-common broker-plugins/amqp-1-0-protocol broker-plugins/amqp-0-10-protocol" />
-    <property name="module.test.depends" value="common/tests broker/tests" />
+    <property name="module.depends" value="common broker-core amqp-1-0-common broker-plugins/amqp-1-0-protocol broker-plugins/amqp-0-10-protocol" />
+    <property name="module.test.depends" value="common/tests broker-core/tests" />
 
     <property name="module.genpom" value="true"/>
-    <property name="module.genpom.args" value="-Sqpid-common=provided -Sqpid-broker=provided -Sqpid-amqp-1-0-common=provided -Sqpid-broker-plugins-amqp-0-10-protocol=provided -Sqpid-broker-plugins-amqp-1-0-protocol=provided"/>
+    <property name="module.genpom.args" value="-Sqpid-common=provided -Sqpid-broker-core=provided -Sqpid-amqp-1-0-common=provided -Sqpid-broker-plugins-amqp-0-10-protocol=provided -Sqpid-broker-plugins-amqp-1-0-protocol=provided"/>
     <property name="broker-plugins-amqp-msg-conv-0-10-to-1-0.libs" value="" />
 
     <property name="broker.plugin" value="true"/>
diff --git a/java/broker-plugins/amqp-msg-conv-0-8-to-0-10/build.xml b/java/broker-plugins/amqp-msg-conv-0-8-to-0-10/build.xml
index f405eb8868..0d83e18abe 100644
--- a/java/broker-plugins/amqp-msg-conv-0-8-to-0-10/build.xml
+++ b/java/broker-plugins/amqp-msg-conv-0-8-to-0-10/build.xml
@@ -17,11 +17,11 @@
  - under the License.
  -->
 <project name="Qpid Broker-Plugins AMQP 0.8 to 0.10 MessageConversion" 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="common/tests broker/tests" />
+    <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="common/tests broker-core/tests" />
 
     <property name="module.genpom" value="true"/>
-    <property name="module.genpom.args" value="-Sqpid-common=provided -Sqpid-broker=provided -Sqpid-broker-plugins-amqp-0-10-protocol=provided -Sqpid-broker-plugins-amqp-0-8-protocol=provided"/>
+    <property name="module.genpom.args" value="-Sqpid-common=provided -Sqpid-broker-core=provided -Sqpid-broker-plugins-amqp-0-10-protocol=provided -Sqpid-broker-plugins-amqp-0-8-protocol=provided"/>
     <property name="broker-plugins-amqp-msg-conv-0-8-to-0-10.libs" value="" />
 
     <property name="broker.plugin" value="true"/>
diff --git a/java/broker-plugins/amqp-msg-conv-0-8-to-1-0/build.xml b/java/broker-plugins/amqp-msg-conv-0-8-to-1-0/build.xml
index 897da14d1f..8a8a4eadfa 100644
--- a/java/broker-plugins/amqp-msg-conv-0-8-to-1-0/build.xml
+++ b/java/broker-plugins/amqp-msg-conv-0-8-to-1-0/build.xml
@@ -17,11 +17,11 @@
  - under the License.
  -->
 <project name="Qpid Broker-Plugins AMQP 0.8 to 1.0 MessageConversion" default="build">
-    <property name="module.depends" value="common broker amqp-1-0-common broker-plugins/amqp-0-8-protocol broker-plugins/amqp-1-0-protocol" />
-    <property name="module.test.depends" value="common/tests broker/tests" />
+    <property name="module.depends" value="common broker-core amqp-1-0-common broker-plugins/amqp-0-8-protocol broker-plugins/amqp-1-0-protocol" />
+    <property name="module.test.depends" value="common/tests broker-core/tests" />
 
     <property name="module.genpom" value="true"/>
-    <property name="module.genpom.args" value="-Sqpid-common=provided -Sqpid-broker=provided -Sqpid-amqp-1-0-common=provided -Sqpid-broker-plugins-amqp-1-0-protocol=provided -Sqpid-broker-plugins-amqp-0-8-protocol=provided"/>
+    <property name="module.genpom.args" value="-Sqpid-common=provided -Sqpid-broker-core=provided -Sqpid-amqp-1-0-common=provided -Sqpid-broker-plugins-amqp-1-0-protocol=provided -Sqpid-broker-plugins-amqp-0-8-protocol=provided"/>
     <property name="broker-plugins-amqp-msg-conv-0-8-to-1-0.libs" value="" />
 
     <property name="broker.plugin" value="true"/>
diff --git a/java/broker-plugins/derby-store/build.xml b/java/broker-plugins/derby-store/build.xml
index be3d72f059..c0d1bcb4b1 100644
--- a/java/broker-plugins/derby-store/build.xml
+++ b/java/broker-plugins/derby-store/build.xml
@@ -17,11 +17,11 @@
  - under the License.
  -->
 <project name="Qpid Broker-Plugins Derby Store" default="build">
-    <property name="module.depends" value="common broker" />
-    <property name="module.test.depends" value="common/tests broker/tests" />
+    <property name="module.depends" value="common broker-core" />
+    <property name="module.test.depends" value="common/tests broker-core/tests" />
 
     <property name="module.genpom" value="true"/>
-    <property name="module.genpom.args" value="-Sqpid-common=provided -Sqpid-broker=provided"/>
+    <property name="module.genpom.args" value="-Sqpid-common=provided -Sqpid-broker-core=provided"/>
     <property name="broker-plugins-derby-store.libs" value="" />
 
     <property name="broker.plugin" value="true"/>
diff --git a/java/broker-plugins/jdbc-provider-bone/build.xml b/java/broker-plugins/jdbc-provider-bone/build.xml
index eb3f40734f..8c8e44c072 100644
--- a/java/broker-plugins/jdbc-provider-bone/build.xml
+++ b/java/broker-plugins/jdbc-provider-bone/build.xml
@@ -17,9 +17,9 @@
  - under the License.
  -->
 <project name="jdbc-provider-bone" xmlns:ivy="antlib:org.apache.ivy.ant" default="build">
-    <property name="module.depends" value="common broker" />
+    <property name="module.depends" value="common broker-core" />
     <property name="module.genpom" value="true"/>
-    <property name="module.genpom.args" value="-Sqpid-common=provided -Sqpid-broker=provided"/>
+    <property name="module.genpom.args" value="-Sqpid-common=provided -Sqpid-broker-core=provided"/>
 
     <property name="broker.plugin" value="true"/>
 
diff --git a/java/broker-plugins/jdbc-store/build.xml b/java/broker-plugins/jdbc-store/build.xml
index 9b6aeb32d6..f82c22119d 100644
--- a/java/broker-plugins/jdbc-store/build.xml
+++ b/java/broker-plugins/jdbc-store/build.xml
@@ -17,11 +17,11 @@
  - under the License.
  -->
 <project name="Qpid Broker-Plugins JDBC Store" default="build">
-    <property name="module.depends" value="common broker" />
-    <property name="module.test.depends" value="common/tests broker/tests" />
+    <property name="module.depends" value="common broker-core" />
+    <property name="module.test.depends" value="common/tests broker-core/tests" />
 
     <property name="module.genpom" value="true"/>
-    <property name="module.genpom.args" value="-Sqpid-common=provided -Sqpid-broker=provided"/>
+    <property name="module.genpom.args" value="-Sqpid-common=provided -Sqpid-broker-core=provided"/>
     <property name="broker-plugins-jdbc-store.libs" value="" />
 
     <property name="broker.plugin" value="true"/>
diff --git a/java/broker-plugins/management-http/build.xml b/java/broker-plugins/management-http/build.xml
index abf35d9c88..188e64c885 100644
--- a/java/broker-plugins/management-http/build.xml
+++ b/java/broker-plugins/management-http/build.xml
@@ -18,11 +18,11 @@
  -->
 <project name="Qpid Broker-Plugins Management HTTP" default="build">
 
-    <property name="module.depends" value="common broker" />
-    <property name="module.test.depends" value="broker/tests common/tests management/common client" />
+    <property name="module.depends" value="common broker-core" />
+    <property name="module.test.depends" value="broker-core/tests common/tests management/common client" />
 
     <property name="module.genpom" value="true" />
-    <property name="module.genpom.args" value="-Sqpid-common=provided -Sqpid-broker=provided" />
+    <property name="module.genpom.args" value="-Sqpid-common=provided -Sqpid-broker-core=provided" />
 
     <property name="broker.plugin" value="true"/>
 
diff --git a/java/broker-plugins/management-jmx/build.xml b/java/broker-plugins/management-jmx/build.xml
index 9d212cf39a..98c821ed5c 100644
--- a/java/broker-plugins/management-jmx/build.xml
+++ b/java/broker-plugins/management-jmx/build.xml
@@ -17,11 +17,11 @@
  - under the License.
  -->
 <project name="Qpid Broker-Plugins Management JMX" default="build">
-    <property name="module.depends" value="common broker management/common" />
-    <property name="module.test.depends" value="broker/tests common/tests management/common client" />
+    <property name="module.depends" value="common broker-core management/common" />
+    <property name="module.test.depends" value="broker-core/tests common/tests management/common client" />
     
     <property name="module.genpom" value="true"/>
-    <property name="module.genpom.args" value="-Sqpid-common=provided -Sqpid-broker=provided -Sqpid-management-common=provided"/>
+    <property name="module.genpom.args" value="-Sqpid-common=provided -Sqpid-broker-core=provided -Sqpid-management-common=provided"/>
 
     <property name="broker.plugin" value="true"/>
 
diff --git a/java/broker-plugins/memory-store/build.xml b/java/broker-plugins/memory-store/build.xml
index f265e68e94..14567ad3d5 100644
--- a/java/broker-plugins/memory-store/build.xml
+++ b/java/broker-plugins/memory-store/build.xml
@@ -17,11 +17,11 @@
  - under the License.
  -->
 <project name="Qpid Broker-Plugins Memory Store" default="build">
-    <property name="module.depends" value="common broker" />
-    <property name="module.test.depends" value="common/tests broker/tests" />
+    <property name="module.depends" value="common broker-core" />
+    <property name="module.test.depends" value="common/tests broker-core/tests" />
 
     <property name="module.genpom" value="true"/>
-    <property name="module.genpom.args" value="-Sqpid-common=provided -Sqpid-broker=provided"/>
+    <property name="module.genpom.args" value="-Sqpid-common=provided -Sqpid-broker-core=provided"/>
 
     <property name="broker.plugin" value="true"/>
     <property name="broker-plugins-memory-store.libs" value="" />
diff --git a/java/broker-core/bin/qpid-passwd b/java/broker/bin/qpid-passwd
index 69246974fa..69246974fa 100755..100644
--- a/java/broker-core/bin/qpid-passwd
+++ b/java/broker/bin/qpid-passwd
diff --git a/java/broker-core/bin/qpid-server b/java/broker/bin/qpid-server
index 206ae6a225..206ae6a225 100755..100644
--- a/java/broker-core/bin/qpid-server
+++ b/java/broker/bin/qpid-server
diff --git a/java/broker-core/bin/qpid-server.bat b/java/broker/bin/qpid-server.bat
index 96965b0b42..96965b0b42 100644
--- a/java/broker-core/bin/qpid-server.bat
+++ b/java/broker/bin/qpid-server.bat
diff --git a/java/broker-core/bin/qpid.stop b/java/broker/bin/qpid.stop
index 316f8dff46..316f8dff46 100755..100644
--- a/java/broker-core/bin/qpid.stop
+++ b/java/broker/bin/qpid.stop
diff --git a/java/broker-core/bin/qpid.stopall b/java/broker/bin/qpid.stopall
index b0ad506629..b0ad506629 100755..100644
--- a/java/broker-core/bin/qpid.stopall
+++ b/java/broker/bin/qpid.stopall
diff --git a/java/broker/build.xml b/java/broker/build.xml
new file mode 100644
index 0000000000..d0c976787a
--- /dev/null
+++ b/java/broker/build.xml
@@ -0,0 +1,85 @@
+<!--
+ -
+ - 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="Broker" default="build">
+    <property name="module.depends" value="broker-core common"/>
+    <property name="module.test.depends" value="common/tests" />
+    <property name="module.main" value="org.apache.qpid.server.Main"/>
+    <property name="module.genpom" value="true"/>
+
+    <!-- Add dependencies to the broker pom for the broker-core, broker-plugins and bdbstore modules -->
+    <property name="module.maven.depends" value="broker-core broker-plugins/access-control broker-plugins/amqp-0-8-protocol broker-plugins/amqp-0-10-protocol broker-plugins/amqp-1-0-protocol broker-plugins/amqp-msg-conv-0-8-to-0-10 broker-plugins/amqp-msg-conv-0-8-to-1-0 broker-plugins/amqp-msg-conv-0-10-to-1-0 broker-plugins/derby-store broker-plugins/jdbc-provider-bone broker-plugins/jdbc-store broker-plugins/management-http broker-plugins/management-jmx broker-plugins/memory-store bdbstore bdbstore/jmx"/>
+    <!-- Make the plugins runtime dependencies, make bdbstore modules optional -->
+    <property name="module.genpom.args" value="-Sqpid-broker-plugins-access-control=runtime -Sqpid-broker-plugins-amqp-0-8-protocol=runtime -Sqpid-broker-plugins-amqp-0-10-protocol=runtime -Sqpid-broker-plugins-amqp-1-0-protocol=runtime -Sqpid-broker-plugins-amqp-msg-conv-0-8-to-0-10=runtime -Sqpid-broker-plugins-amqp-msg-conv-0-8-to-1-0=runtime -Sqpid-broker-plugins-amqp-msg-conv-0-10-to-1-0=runtime -Sqpid-broker-plugins-derby-store=runtime -Sqpid-broker-plugins-jdbc-provider-bone=runtime -Sqpid-broker-plugins-jdbc-store=runtime -Sqpid-broker-plugins-management-http=runtime -Sqpid-broker-plugins-management-jmx=runtime -Sbroker-plugins-memory-store=runtime -Sqpid-bdbstore=runtime -Sqpid-bdbstore-jmx=runtime -Oqpid-bdbstore -Oqpid-bdbstore-jmx"/>
+
+    <import file="../module.xml"/>
+
+
+    <target name="copy-etc-release" if="module.etc.exists" description="copy etc directory if it exists to build tree">
+      <copy todir="${module.release}/etc" failonerror="false" flatten="true">
+          <fileset dir="${module.etc}" excludes="*.conf,*.jpp"/>
+      </copy>
+    </target>
+
+    <target name="copy-bin-release" description="copy dependencies into module release">
+        <copy todir="${module.release}/bin" failonerror="true">
+            <fileset dir="${module.bin}"/>
+        </copy>
+        <copy todir="${module.release}/bin" failonerror="true" flatten="true">
+            <fileset dir="${basedir}/../common/bin"/>
+        </copy>
+        <chmod dir="${module.release}/bin" perm="ugo+rx" includes="**/*"/>
+        <fixcrlf srcdir="${module.release}/bin" fixlast="true" eol="unix"/>
+        <fixcrlf srcdir="${module.release}/bin" fixlast="true" eol="dos" includes="*.bat"/>
+    </target>
+
+    <target name="release-bin-other" depends="release-bin-other-lib-opt,release-bin-other-bdbstore,release-bin-copy-broker-plugins"/>
+
+    <target name="release-bin-other-lib-opt" depends="release-bin-other-bdbstore" description="make lib/opt dir in the module release">
+        <mkdir dir="${module.release}/lib/opt"/>
+    </target>
+
+    <target name="release-bin-copy-broker-plugins" description="copy broker-plugins into module release">
+        <copy todir="${module.release}/lib/plugins" failonerror="true">
+            <fileset dir="${build.scratch.broker.plugins.lib}"/>
+        </copy>
+    </target>
+
+    <target name="release-bin-other-bdbstore" depends="check-bdbstore-requested" if="bdbstore-requested"
+                                         description="copy bdbstore items into module release">
+        <copy todir="${module.release}/bin" failonerror="true" flatten="true">
+            <fileset dir="${basedir}/../bdbstore/bin"/>
+        </copy>
+    </target>
+
+    <target name="check-bdbstore-requested">
+         <condition property="bdbstore-requested">
+             <or>
+                 <contains string="${modules.opt}" substring="bdbstore"/>
+                 <istrue value="${optional}"/>
+             </or>
+         </condition>
+    </target>
+
+    <target name="release-bin" depends="release-bin-tasks"/>
+
+    <target name="bundle" depends="bundle-tasks"/>
+
+</project>
diff --git a/java/broker-core/etc/broker_example.acl b/java/broker/etc/broker_example.acl
index 29dca90f15..29dca90f15 100644
--- a/java/broker-core/etc/broker_example.acl
+++ b/java/broker/etc/broker_example.acl
diff --git a/java/broker-core/etc/groups b/java/broker/etc/groups
index e3912ece99..e3912ece99 100644
--- a/java/broker-core/etc/groups
+++ b/java/broker/etc/groups
diff --git a/java/broker-core/etc/log4j.xml b/java/broker/etc/log4j.xml
index 71a13875a1..71a13875a1 100644
--- a/java/broker-core/etc/log4j.xml
+++ b/java/broker/etc/log4j.xml
diff --git a/java/broker-core/etc/md5passwd b/java/broker/etc/md5passwd
index f7185c0e92..f7185c0e92 100644
--- a/java/broker-core/etc/md5passwd
+++ b/java/broker/etc/md5passwd
diff --git a/java/broker-core/etc/passwd b/java/broker/etc/passwd
index f0dcb80f25..f0dcb80f25 100644
--- a/java/broker-core/etc/passwd
+++ b/java/broker/etc/passwd
diff --git a/java/broker-core/python-test.xml b/java/broker/python-test.xml
index 5c263e3169..5c263e3169 100755..100644
--- a/java/broker-core/python-test.xml
+++ b/java/broker/python-test.xml
diff --git a/java/broker-core/scripts/resetAlerting.sh b/java/broker/scripts/resetAlerting.sh
index 18e8c64cb0..18e8c64cb0 100644
--- a/java/broker-core/scripts/resetAlerting.sh
+++ b/java/broker/scripts/resetAlerting.sh
diff --git a/java/broker-core/src/main/java/org/apache/qpid/server/Main.java b/java/broker/src/main/java/org/apache/qpid/server/Main.java
index 20b73e965c..20b73e965c 100644
--- a/java/broker-core/src/main/java/org/apache/qpid/server/Main.java
+++ b/java/broker/src/main/java/org/apache/qpid/server/Main.java
diff --git a/java/broker-core/src/test/java/org/apache/qpid/server/MainTest.java b/java/broker/src/test/java/org/apache/qpid/server/MainTest.java
index f3b1749808..f3b1749808 100644
--- a/java/broker-core/src/test/java/org/apache/qpid/server/MainTest.java
+++ b/java/broker/src/test/java/org/apache/qpid/server/MainTest.java
diff --git a/java/build.deps b/java/build.deps
index ebb6517738..99ca19a60b 100644
--- a/java/build.deps
+++ b/java/build.deps
@@ -72,10 +72,13 @@ amqp-1-0-client.libs=
 amqp-1-0-client-example.libs=${commons-cli}
 amqp-1-0-client-jms.libs=${geronimo-jms}
 tools.libs=${commons-configuration.libs} ${log4j}
-broker.libs=${commons-cli} ${commons-logging} ${log4j} ${slf4j-log4j} \
+broker-core.libs=${commons-cli} ${commons-logging} ${log4j} ${slf4j-log4j} \
     ${xalan} ${derby-db} ${commons-configuration.libs} \
     ${jackson-core} ${jackson-mapper} ${jetty} ${jetty-continuation} ${jetty-security} ${jetty-http} ${jetty-io} ${jetty-servlet} ${jetty-util} ${servlet-api} ${jetty-websocket}
 
+#Borrow the broker-core libs, hack for release binary generation
+broker.libs=${broker-core.libs}
+
 broker-plugins-management-http.libs=${jetty} ${jetty-continuation} ${jetty-security} ${jetty-http} ${jetty-io} ${jetty-servlet} ${jetty-util} ${servlet-api}  ${jackson-core} ${jackson-mapper}
 broker-plugins.libs=${log4j} ${commons-configuration.libs}
 
@@ -87,6 +90,7 @@ management-common.libs=
 
 common.test.libs=${test.libs}
 broker.test.libs=${test.libs}
+broker-core.test.libs=${test.libs}
 client.test.libs=${test.libs}
 client-example.test.libs=${test.libs}
 tools.test.libs=
diff --git a/java/build.xml b/java/build.xml
index 5d2269d2d4..03c50938d0 100644
--- a/java/build.xml
+++ b/java/build.xml
@@ -34,7 +34,7 @@
   <findSubProjects name="broker-plugins" dir="broker-plugins" excludes="${broker-plugins-exclude}"/>
   <findSubProjects name="client-plugins" dir="client-plugins"/>
 
-  <property name="modules.core"       value="common management/common amqp-1-0-common broker client amqp-1-0-client amqp-1-0-client-jms tools"/>
+  <property name="modules.core"       value="common management/common amqp-1-0-common broker-core broker client amqp-1-0-client amqp-1-0-client-jms tools"/>
   <property name="modules.examples"   value="client/example management/example amqp-1-0-client/example amqp-1-0-client-jms/example"/>
   <property name="modules.tests"      value="systests perftests"/>
   <property name="modules.plugin"     value="${broker-plugins} ${client-plugins}"/>
diff --git a/java/perftests/build.xml b/java/perftests/build.xml
index 3b19c7645a..a97b33ef41 100644
--- a/java/perftests/build.xml
+++ b/java/perftests/build.xml
@@ -33,7 +33,7 @@
     </condition>
 
     <property name="module.depends" value="client common"/>
-    <property name="module.test.depends" value="systests broker broker-plugins/memory-store broker-plugins/derby-store common/tests management/common broker-plugins/amqp-0-8-protocol  broker-plugins/amqp-0-10-protocol broker-plugins/amqp-1-0-protocol ${perftests.optional.test.depends}"/>
+    <property name="module.test.depends" value="systests broker-core broker-plugins/memory-store broker-plugins/derby-store common/tests management/common broker-plugins/amqp-0-8-protocol  broker-plugins/amqp-0-10-protocol broker-plugins/amqp-1-0-protocol ${perftests.optional.test.depends}"/>
 
     <import file="../module.xml"/>
 
diff --git a/java/systests/build.xml b/java/systests/build.xml
index 59fcb8bbd2..68199fbc66 100644
--- a/java/systests/build.xml
+++ b/java/systests/build.xml
@@ -34,7 +34,7 @@ nn - or more contributor license agreements.  See the NOTICE file
 
     <!-- The jca module is unusual in that it produces a jar with the name ra rather than jca.  Unfortunately this means we
           need to add both jca (finds jca's jar dependencies) and ra (to find the qpid-ra jar file itself).  -->
-    <property name="module.depends" value="client management/common broker broker/tests common amqp-1-0-common common/tests jca ra broker-plugins/access-control broker-plugins/management-http broker-plugins/management-jmx broker-plugins/memory-store broker-plugins/derby-store broker-plugins/amqp-0-8-protocol broker-plugins/amqp-0-10-protocol broker-plugins/amqp-1-0-protocol broker-plugins/amqp-msg-conv-0-8-to-0-10 broker-plugins/amqp-msg-conv-0-8-to-1-0 broker-plugins/amqp-msg-conv-0-10-to-1-0 ${systests.optional.depends}"/>
+    <property name="module.depends" value="client management/common broker-core broker-core/tests common amqp-1-0-common common/tests jca ra broker-plugins/access-control broker-plugins/management-http broker-plugins/management-jmx broker-plugins/memory-store broker-plugins/derby-store broker-plugins/amqp-0-8-protocol broker-plugins/amqp-0-10-protocol broker-plugins/amqp-1-0-protocol broker-plugins/amqp-msg-conv-0-8-to-0-10 broker-plugins/amqp-msg-conv-0-8-to-1-0 broker-plugins/amqp-msg-conv-0-10-to-1-0 ${systests.optional.depends}"/>
     <property name="module.test.src" location="src/main/java"/>
     <property name="module.test.excludes"
               value="**/DropInTest.java,**/TestClientControlledTest.java"/>