You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@qpid.apache.org by ro...@apache.org on 2013/09/24 01:37:33 UTC
svn commit: r1525736 - in /qpid/trunk/qpid/java: ./ bdbstore/ bdbstore/jmx/
broker-core/ broker-core/bin/ broker-core/etc/ broker-core/scripts/
broker-core/src/main/java/org/apache/qpid/server/
broker-core/src/test/java/org/apache/qpid/server/ broker-p...
Author: robbie
Date: Mon Sep 23 23:37:32 2013
New Revision: 1525736
URL: http://svn.apache.org/r1525736
Log:
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.
Added:
qpid/trunk/qpid/java/broker/
qpid/trunk/qpid/java/broker/bin/
qpid/trunk/qpid/java/broker/bin/qpid-passwd (contents, props changed)
- copied, changed from r1525731, qpid/trunk/qpid/java/broker-core/bin/qpid-passwd
qpid/trunk/qpid/java/broker/bin/qpid-server (contents, props changed)
- copied, changed from r1525731, qpid/trunk/qpid/java/broker-core/bin/qpid-server
qpid/trunk/qpid/java/broker/bin/qpid-server.bat
- copied, changed from r1525731, qpid/trunk/qpid/java/broker-core/bin/qpid-server.bat
qpid/trunk/qpid/java/broker/bin/qpid.stop (contents, props changed)
- copied, changed from r1525731, qpid/trunk/qpid/java/broker-core/bin/qpid.stop
qpid/trunk/qpid/java/broker/bin/qpid.stopall (contents, props changed)
- copied, changed from r1525731, qpid/trunk/qpid/java/broker-core/bin/qpid.stopall
qpid/trunk/qpid/java/broker/build.xml
- copied, changed from r1525731, qpid/trunk/qpid/java/broker-core/build.xml
qpid/trunk/qpid/java/broker/etc/
qpid/trunk/qpid/java/broker/etc/broker_example.acl
- copied, changed from r1525731, qpid/trunk/qpid/java/broker-core/etc/broker_example.acl
qpid/trunk/qpid/java/broker/etc/groups
- copied, changed from r1525731, qpid/trunk/qpid/java/broker-core/etc/groups
qpid/trunk/qpid/java/broker/etc/log4j.xml
- copied, changed from r1525731, qpid/trunk/qpid/java/broker-core/etc/log4j.xml
qpid/trunk/qpid/java/broker/etc/md5passwd
- copied, changed from r1525731, qpid/trunk/qpid/java/broker-core/etc/md5passwd
qpid/trunk/qpid/java/broker/etc/passwd
- copied, changed from r1525731, qpid/trunk/qpid/java/broker-core/etc/passwd
qpid/trunk/qpid/java/broker/python-test.xml (contents, props changed)
- copied, changed from r1525731, qpid/trunk/qpid/java/broker-core/python-test.xml
qpid/trunk/qpid/java/broker/scripts/
qpid/trunk/qpid/java/broker/scripts/resetAlerting.sh
- copied, changed from r1525731, qpid/trunk/qpid/java/broker-core/scripts/resetAlerting.sh
qpid/trunk/qpid/java/broker/src/
qpid/trunk/qpid/java/broker/src/main/
qpid/trunk/qpid/java/broker/src/main/java/
qpid/trunk/qpid/java/broker/src/main/java/org/
qpid/trunk/qpid/java/broker/src/main/java/org/apache/
qpid/trunk/qpid/java/broker/src/main/java/org/apache/qpid/
qpid/trunk/qpid/java/broker/src/main/java/org/apache/qpid/server/
qpid/trunk/qpid/java/broker/src/main/java/org/apache/qpid/server/Main.java
- copied, changed from r1525731, qpid/trunk/qpid/java/broker-core/src/main/java/org/apache/qpid/server/Main.java
qpid/trunk/qpid/java/broker/src/test/
qpid/trunk/qpid/java/broker/src/test/java/
qpid/trunk/qpid/java/broker/src/test/java/org/
qpid/trunk/qpid/java/broker/src/test/java/org/apache/
qpid/trunk/qpid/java/broker/src/test/java/org/apache/qpid/
qpid/trunk/qpid/java/broker/src/test/java/org/apache/qpid/server/
qpid/trunk/qpid/java/broker/src/test/java/org/apache/qpid/server/MainTest.java
- copied, changed from r1525731, qpid/trunk/qpid/java/broker-core/src/test/java/org/apache/qpid/server/MainTest.java
Removed:
qpid/trunk/qpid/java/broker-core/bin/
qpid/trunk/qpid/java/broker-core/etc/
qpid/trunk/qpid/java/broker-core/python-test.xml
qpid/trunk/qpid/java/broker-core/scripts/
qpid/trunk/qpid/java/broker-core/src/main/java/org/apache/qpid/server/Main.java
qpid/trunk/qpid/java/broker-core/src/test/java/org/apache/qpid/server/MainTest.java
Modified:
qpid/trunk/qpid/java/bdbstore/build.xml
qpid/trunk/qpid/java/bdbstore/jmx/build.xml
qpid/trunk/qpid/java/broker-core/build.xml
qpid/trunk/qpid/java/broker-plugins/access-control/build.xml
qpid/trunk/qpid/java/broker-plugins/amqp-0-10-protocol/build.xml
qpid/trunk/qpid/java/broker-plugins/amqp-0-8-protocol/build.xml
qpid/trunk/qpid/java/broker-plugins/amqp-1-0-protocol/build.xml
qpid/trunk/qpid/java/broker-plugins/amqp-msg-conv-0-10-to-1-0/build.xml
qpid/trunk/qpid/java/broker-plugins/amqp-msg-conv-0-8-to-0-10/build.xml
qpid/trunk/qpid/java/broker-plugins/amqp-msg-conv-0-8-to-1-0/build.xml
qpid/trunk/qpid/java/broker-plugins/derby-store/build.xml
qpid/trunk/qpid/java/broker-plugins/jdbc-provider-bone/build.xml
qpid/trunk/qpid/java/broker-plugins/jdbc-store/build.xml
qpid/trunk/qpid/java/broker-plugins/management-http/build.xml
qpid/trunk/qpid/java/broker-plugins/management-jmx/build.xml
qpid/trunk/qpid/java/broker-plugins/memory-store/build.xml
qpid/trunk/qpid/java/build.deps
qpid/trunk/qpid/java/build.xml
qpid/trunk/qpid/java/perftests/build.xml
qpid/trunk/qpid/java/systests/build.xml
Modified: qpid/trunk/qpid/java/bdbstore/build.xml
URL: http://svn.apache.org/viewvc/qpid/trunk/qpid/java/bdbstore/build.xml?rev=1525736&r1=1525735&r2=1525736&view=diff
==============================================================================
--- qpid/trunk/qpid/java/bdbstore/build.xml (original)
+++ qpid/trunk/qpid/java/bdbstore/build.xml Mon Sep 23 23:37:32 2013
@@ -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"/>
Modified: qpid/trunk/qpid/java/bdbstore/jmx/build.xml
URL: http://svn.apache.org/viewvc/qpid/trunk/qpid/java/bdbstore/jmx/build.xml?rev=1525736&r1=1525735&r2=1525736&view=diff
==============================================================================
--- qpid/trunk/qpid/java/bdbstore/jmx/build.xml (original)
+++ qpid/trunk/qpid/java/bdbstore/jmx/build.xml Mon Sep 23 23:37:32 2013
@@ -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"/>
Modified: qpid/trunk/qpid/java/broker-core/build.xml
URL: http://svn.apache.org/viewvc/qpid/trunk/qpid/java/broker-core/build.xml?rev=1525736&r1=1525735&r2=1525736&view=diff
==============================================================================
--- qpid/trunk/qpid/java/broker-core/build.xml (original)
+++ qpid/trunk/qpid/java/broker-core/build.xml Mon Sep 23 23:37:32 2013
@@ -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>
Modified: qpid/trunk/qpid/java/broker-plugins/access-control/build.xml
URL: http://svn.apache.org/viewvc/qpid/trunk/qpid/java/broker-plugins/access-control/build.xml?rev=1525736&r1=1525735&r2=1525736&view=diff
==============================================================================
--- qpid/trunk/qpid/java/broker-plugins/access-control/build.xml (original)
+++ qpid/trunk/qpid/java/broker-plugins/access-control/build.xml Mon Sep 23 23:37:32 2013
@@ -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"/>
Modified: qpid/trunk/qpid/java/broker-plugins/amqp-0-10-protocol/build.xml
URL: http://svn.apache.org/viewvc/qpid/trunk/qpid/java/broker-plugins/amqp-0-10-protocol/build.xml?rev=1525736&r1=1525735&r2=1525736&view=diff
==============================================================================
--- qpid/trunk/qpid/java/broker-plugins/amqp-0-10-protocol/build.xml (original)
+++ qpid/trunk/qpid/java/broker-plugins/amqp-0-10-protocol/build.xml Mon Sep 23 23:37:32 2013
@@ -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"/>
Modified: qpid/trunk/qpid/java/broker-plugins/amqp-0-8-protocol/build.xml
URL: http://svn.apache.org/viewvc/qpid/trunk/qpid/java/broker-plugins/amqp-0-8-protocol/build.xml?rev=1525736&r1=1525735&r2=1525736&view=diff
==============================================================================
--- qpid/trunk/qpid/java/broker-plugins/amqp-0-8-protocol/build.xml (original)
+++ qpid/trunk/qpid/java/broker-plugins/amqp-0-8-protocol/build.xml Mon Sep 23 23:37:32 2013
@@ -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"/>
Modified: qpid/trunk/qpid/java/broker-plugins/amqp-1-0-protocol/build.xml
URL: http://svn.apache.org/viewvc/qpid/trunk/qpid/java/broker-plugins/amqp-1-0-protocol/build.xml?rev=1525736&r1=1525735&r2=1525736&view=diff
==============================================================================
--- qpid/trunk/qpid/java/broker-plugins/amqp-1-0-protocol/build.xml (original)
+++ qpid/trunk/qpid/java/broker-plugins/amqp-1-0-protocol/build.xml Mon Sep 23 23:37:32 2013
@@ -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"/>
Modified: qpid/trunk/qpid/java/broker-plugins/amqp-msg-conv-0-10-to-1-0/build.xml
URL: http://svn.apache.org/viewvc/qpid/trunk/qpid/java/broker-plugins/amqp-msg-conv-0-10-to-1-0/build.xml?rev=1525736&r1=1525735&r2=1525736&view=diff
==============================================================================
--- qpid/trunk/qpid/java/broker-plugins/amqp-msg-conv-0-10-to-1-0/build.xml (original)
+++ qpid/trunk/qpid/java/broker-plugins/amqp-msg-conv-0-10-to-1-0/build.xml Mon Sep 23 23:37:32 2013
@@ -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"/>
Modified: qpid/trunk/qpid/java/broker-plugins/amqp-msg-conv-0-8-to-0-10/build.xml
URL: http://svn.apache.org/viewvc/qpid/trunk/qpid/java/broker-plugins/amqp-msg-conv-0-8-to-0-10/build.xml?rev=1525736&r1=1525735&r2=1525736&view=diff
==============================================================================
--- qpid/trunk/qpid/java/broker-plugins/amqp-msg-conv-0-8-to-0-10/build.xml (original)
+++ qpid/trunk/qpid/java/broker-plugins/amqp-msg-conv-0-8-to-0-10/build.xml Mon Sep 23 23:37:32 2013
@@ -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"/>
Modified: qpid/trunk/qpid/java/broker-plugins/amqp-msg-conv-0-8-to-1-0/build.xml
URL: http://svn.apache.org/viewvc/qpid/trunk/qpid/java/broker-plugins/amqp-msg-conv-0-8-to-1-0/build.xml?rev=1525736&r1=1525735&r2=1525736&view=diff
==============================================================================
--- qpid/trunk/qpid/java/broker-plugins/amqp-msg-conv-0-8-to-1-0/build.xml (original)
+++ qpid/trunk/qpid/java/broker-plugins/amqp-msg-conv-0-8-to-1-0/build.xml Mon Sep 23 23:37:32 2013
@@ -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"/>
Modified: qpid/trunk/qpid/java/broker-plugins/derby-store/build.xml
URL: http://svn.apache.org/viewvc/qpid/trunk/qpid/java/broker-plugins/derby-store/build.xml?rev=1525736&r1=1525735&r2=1525736&view=diff
==============================================================================
--- qpid/trunk/qpid/java/broker-plugins/derby-store/build.xml (original)
+++ qpid/trunk/qpid/java/broker-plugins/derby-store/build.xml Mon Sep 23 23:37:32 2013
@@ -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"/>
Modified: qpid/trunk/qpid/java/broker-plugins/jdbc-provider-bone/build.xml
URL: http://svn.apache.org/viewvc/qpid/trunk/qpid/java/broker-plugins/jdbc-provider-bone/build.xml?rev=1525736&r1=1525735&r2=1525736&view=diff
==============================================================================
--- qpid/trunk/qpid/java/broker-plugins/jdbc-provider-bone/build.xml (original)
+++ qpid/trunk/qpid/java/broker-plugins/jdbc-provider-bone/build.xml Mon Sep 23 23:37:32 2013
@@ -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"/>
Modified: qpid/trunk/qpid/java/broker-plugins/jdbc-store/build.xml
URL: http://svn.apache.org/viewvc/qpid/trunk/qpid/java/broker-plugins/jdbc-store/build.xml?rev=1525736&r1=1525735&r2=1525736&view=diff
==============================================================================
--- qpid/trunk/qpid/java/broker-plugins/jdbc-store/build.xml (original)
+++ qpid/trunk/qpid/java/broker-plugins/jdbc-store/build.xml Mon Sep 23 23:37:32 2013
@@ -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"/>
Modified: qpid/trunk/qpid/java/broker-plugins/management-http/build.xml
URL: http://svn.apache.org/viewvc/qpid/trunk/qpid/java/broker-plugins/management-http/build.xml?rev=1525736&r1=1525735&r2=1525736&view=diff
==============================================================================
--- qpid/trunk/qpid/java/broker-plugins/management-http/build.xml (original)
+++ qpid/trunk/qpid/java/broker-plugins/management-http/build.xml Mon Sep 23 23:37:32 2013
@@ -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"/>
Modified: qpid/trunk/qpid/java/broker-plugins/management-jmx/build.xml
URL: http://svn.apache.org/viewvc/qpid/trunk/qpid/java/broker-plugins/management-jmx/build.xml?rev=1525736&r1=1525735&r2=1525736&view=diff
==============================================================================
--- qpid/trunk/qpid/java/broker-plugins/management-jmx/build.xml (original)
+++ qpid/trunk/qpid/java/broker-plugins/management-jmx/build.xml Mon Sep 23 23:37:32 2013
@@ -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"/>
Modified: qpid/trunk/qpid/java/broker-plugins/memory-store/build.xml
URL: http://svn.apache.org/viewvc/qpid/trunk/qpid/java/broker-plugins/memory-store/build.xml?rev=1525736&r1=1525735&r2=1525736&view=diff
==============================================================================
--- qpid/trunk/qpid/java/broker-plugins/memory-store/build.xml (original)
+++ qpid/trunk/qpid/java/broker-plugins/memory-store/build.xml Mon Sep 23 23:37:32 2013
@@ -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="" />
Copied: qpid/trunk/qpid/java/broker/bin/qpid-passwd (from r1525731, qpid/trunk/qpid/java/broker-core/bin/qpid-passwd)
URL: http://svn.apache.org/viewvc/qpid/trunk/qpid/java/broker/bin/qpid-passwd?p2=qpid/trunk/qpid/java/broker/bin/qpid-passwd&p1=qpid/trunk/qpid/java/broker-core/bin/qpid-passwd&r1=1525731&r2=1525736&rev=1525736&view=diff
==============================================================================
(empty)
Propchange: qpid/trunk/qpid/java/broker/bin/qpid-passwd
------------------------------------------------------------------------------
svn:eol-style = LF
Copied: qpid/trunk/qpid/java/broker/bin/qpid-server (from r1525731, qpid/trunk/qpid/java/broker-core/bin/qpid-server)
URL: http://svn.apache.org/viewvc/qpid/trunk/qpid/java/broker/bin/qpid-server?p2=qpid/trunk/qpid/java/broker/bin/qpid-server&p1=qpid/trunk/qpid/java/broker-core/bin/qpid-server&r1=1525731&r2=1525736&rev=1525736&view=diff
==============================================================================
(empty)
Propchange: qpid/trunk/qpid/java/broker/bin/qpid-server
------------------------------------------------------------------------------
svn:eol-style = LF
Copied: qpid/trunk/qpid/java/broker/bin/qpid-server.bat (from r1525731, qpid/trunk/qpid/java/broker-core/bin/qpid-server.bat)
URL: http://svn.apache.org/viewvc/qpid/trunk/qpid/java/broker/bin/qpid-server.bat?p2=qpid/trunk/qpid/java/broker/bin/qpid-server.bat&p1=qpid/trunk/qpid/java/broker-core/bin/qpid-server.bat&r1=1525731&r2=1525736&rev=1525736&view=diff
==============================================================================
(empty)
Copied: qpid/trunk/qpid/java/broker/bin/qpid.stop (from r1525731, qpid/trunk/qpid/java/broker-core/bin/qpid.stop)
URL: http://svn.apache.org/viewvc/qpid/trunk/qpid/java/broker/bin/qpid.stop?p2=qpid/trunk/qpid/java/broker/bin/qpid.stop&p1=qpid/trunk/qpid/java/broker-core/bin/qpid.stop&r1=1525731&r2=1525736&rev=1525736&view=diff
==============================================================================
(empty)
Propchange: qpid/trunk/qpid/java/broker/bin/qpid.stop
------------------------------------------------------------------------------
svn:eol-style = LF
Copied: qpid/trunk/qpid/java/broker/bin/qpid.stopall (from r1525731, qpid/trunk/qpid/java/broker-core/bin/qpid.stopall)
URL: http://svn.apache.org/viewvc/qpid/trunk/qpid/java/broker/bin/qpid.stopall?p2=qpid/trunk/qpid/java/broker/bin/qpid.stopall&p1=qpid/trunk/qpid/java/broker-core/bin/qpid.stopall&r1=1525731&r2=1525736&rev=1525736&view=diff
==============================================================================
(empty)
Propchange: qpid/trunk/qpid/java/broker/bin/qpid.stopall
------------------------------------------------------------------------------
svn:eol-style = LF
Copied: qpid/trunk/qpid/java/broker/build.xml (from r1525731, qpid/trunk/qpid/java/broker-core/build.xml)
URL: http://svn.apache.org/viewvc/qpid/trunk/qpid/java/broker/build.xml?p2=qpid/trunk/qpid/java/broker/build.xml&p1=qpid/trunk/qpid/java/broker-core/build.xml&r1=1525731&r2=1525736&rev=1525736&view=diff
==============================================================================
--- qpid/trunk/qpid/java/broker-core/build.xml (original)
+++ qpid/trunk/qpid/java/broker/build.xml Mon Sep 23 23:37:32 2013
@@ -18,22 +18,19 @@
- under the License.
-
-->
-<project name="AMQ Broker" default="build">
- <property name="module.depends" value="management/common common"/>
+<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-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 -->
+ <!-- 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"/>
- <import file="${project.root}/broker/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">
@@ -84,4 +81,5 @@
<target name="release-bin" depends="release-bin-tasks"/>
<target name="bundle" depends="bundle-tasks"/>
+
</project>
Copied: qpid/trunk/qpid/java/broker/etc/broker_example.acl (from r1525731, qpid/trunk/qpid/java/broker-core/etc/broker_example.acl)
URL: http://svn.apache.org/viewvc/qpid/trunk/qpid/java/broker/etc/broker_example.acl?p2=qpid/trunk/qpid/java/broker/etc/broker_example.acl&p1=qpid/trunk/qpid/java/broker-core/etc/broker_example.acl&r1=1525731&r2=1525736&rev=1525736&view=diff
==============================================================================
(empty)
Copied: qpid/trunk/qpid/java/broker/etc/groups (from r1525731, qpid/trunk/qpid/java/broker-core/etc/groups)
URL: http://svn.apache.org/viewvc/qpid/trunk/qpid/java/broker/etc/groups?p2=qpid/trunk/qpid/java/broker/etc/groups&p1=qpid/trunk/qpid/java/broker-core/etc/groups&r1=1525731&r2=1525736&rev=1525736&view=diff
==============================================================================
(empty)
Copied: qpid/trunk/qpid/java/broker/etc/log4j.xml (from r1525731, qpid/trunk/qpid/java/broker-core/etc/log4j.xml)
URL: http://svn.apache.org/viewvc/qpid/trunk/qpid/java/broker/etc/log4j.xml?p2=qpid/trunk/qpid/java/broker/etc/log4j.xml&p1=qpid/trunk/qpid/java/broker-core/etc/log4j.xml&r1=1525731&r2=1525736&rev=1525736&view=diff
==============================================================================
(empty)
Copied: qpid/trunk/qpid/java/broker/etc/md5passwd (from r1525731, qpid/trunk/qpid/java/broker-core/etc/md5passwd)
URL: http://svn.apache.org/viewvc/qpid/trunk/qpid/java/broker/etc/md5passwd?p2=qpid/trunk/qpid/java/broker/etc/md5passwd&p1=qpid/trunk/qpid/java/broker-core/etc/md5passwd&r1=1525731&r2=1525736&rev=1525736&view=diff
==============================================================================
(empty)
Copied: qpid/trunk/qpid/java/broker/etc/passwd (from r1525731, qpid/trunk/qpid/java/broker-core/etc/passwd)
URL: http://svn.apache.org/viewvc/qpid/trunk/qpid/java/broker/etc/passwd?p2=qpid/trunk/qpid/java/broker/etc/passwd&p1=qpid/trunk/qpid/java/broker-core/etc/passwd&r1=1525731&r2=1525736&rev=1525736&view=diff
==============================================================================
(empty)
Copied: qpid/trunk/qpid/java/broker/python-test.xml (from r1525731, qpid/trunk/qpid/java/broker-core/python-test.xml)
URL: http://svn.apache.org/viewvc/qpid/trunk/qpid/java/broker/python-test.xml?p2=qpid/trunk/qpid/java/broker/python-test.xml&p1=qpid/trunk/qpid/java/broker-core/python-test.xml&r1=1525731&r2=1525736&rev=1525736&view=diff
==============================================================================
(empty)
Copied: qpid/trunk/qpid/java/broker/scripts/resetAlerting.sh (from r1525731, qpid/trunk/qpid/java/broker-core/scripts/resetAlerting.sh)
URL: http://svn.apache.org/viewvc/qpid/trunk/qpid/java/broker/scripts/resetAlerting.sh?p2=qpid/trunk/qpid/java/broker/scripts/resetAlerting.sh&p1=qpid/trunk/qpid/java/broker-core/scripts/resetAlerting.sh&r1=1525731&r2=1525736&rev=1525736&view=diff
==============================================================================
(empty)
Copied: qpid/trunk/qpid/java/broker/src/main/java/org/apache/qpid/server/Main.java (from r1525731, qpid/trunk/qpid/java/broker-core/src/main/java/org/apache/qpid/server/Main.java)
URL: http://svn.apache.org/viewvc/qpid/trunk/qpid/java/broker/src/main/java/org/apache/qpid/server/Main.java?p2=qpid/trunk/qpid/java/broker/src/main/java/org/apache/qpid/server/Main.java&p1=qpid/trunk/qpid/java/broker-core/src/main/java/org/apache/qpid/server/Main.java&r1=1525731&r2=1525736&rev=1525736&view=diff
==============================================================================
(empty)
Copied: qpid/trunk/qpid/java/broker/src/test/java/org/apache/qpid/server/MainTest.java (from r1525731, qpid/trunk/qpid/java/broker-core/src/test/java/org/apache/qpid/server/MainTest.java)
URL: http://svn.apache.org/viewvc/qpid/trunk/qpid/java/broker/src/test/java/org/apache/qpid/server/MainTest.java?p2=qpid/trunk/qpid/java/broker/src/test/java/org/apache/qpid/server/MainTest.java&p1=qpid/trunk/qpid/java/broker-core/src/test/java/org/apache/qpid/server/MainTest.java&r1=1525731&r2=1525736&rev=1525736&view=diff
==============================================================================
(empty)
Modified: qpid/trunk/qpid/java/build.deps
URL: http://svn.apache.org/viewvc/qpid/trunk/qpid/java/build.deps?rev=1525736&r1=1525735&r2=1525736&view=diff
==============================================================================
--- qpid/trunk/qpid/java/build.deps (original)
+++ qpid/trunk/qpid/java/build.deps Mon Sep 23 23:37:32 2013
@@ -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=
Modified: qpid/trunk/qpid/java/build.xml
URL: http://svn.apache.org/viewvc/qpid/trunk/qpid/java/build.xml?rev=1525736&r1=1525735&r2=1525736&view=diff
==============================================================================
--- qpid/trunk/qpid/java/build.xml (original)
+++ qpid/trunk/qpid/java/build.xml Mon Sep 23 23:37:32 2013
@@ -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}"/>
Modified: qpid/trunk/qpid/java/perftests/build.xml
URL: http://svn.apache.org/viewvc/qpid/trunk/qpid/java/perftests/build.xml?rev=1525736&r1=1525735&r2=1525736&view=diff
==============================================================================
--- qpid/trunk/qpid/java/perftests/build.xml (original)
+++ qpid/trunk/qpid/java/perftests/build.xml Mon Sep 23 23:37:32 2013
@@ -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"/>
Modified: qpid/trunk/qpid/java/systests/build.xml
URL: http://svn.apache.org/viewvc/qpid/trunk/qpid/java/systests/build.xml?rev=1525736&r1=1525735&r2=1525736&view=diff
==============================================================================
--- qpid/trunk/qpid/java/systests/build.xml (original)
+++ qpid/trunk/qpid/java/systests/build.xml Mon Sep 23 23:37:32 2013
@@ -34,7 +34,7 @@ nn - or more contributor license agreeme
<!-- 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"/>
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@qpid.apache.org
For additional commands, e-mail: commits-help@qpid.apache.org