diff options
| -rw-r--r-- | java/broker-plugins/build.xml | 27 | ||||
| -rw-r--r-- | java/broker/etc/acl.config.xml | 6 | ||||
| -rw-r--r-- | java/build.deps | 1 | ||||
| -rw-r--r-- | java/build.xml | 3 | ||||
| -rw-r--r-- | java/common.xml | 1 | ||||
| -rw-r--r-- | java/module.xml | 6 |
6 files changed, 43 insertions, 1 deletions
diff --git a/java/broker-plugins/build.xml b/java/broker-plugins/build.xml new file mode 100644 index 0000000000..669eadd2e8 --- /dev/null +++ b/java/broker-plugins/build.xml @@ -0,0 +1,27 @@ +<!-- + - + - Licensed to the Apache Software Foundation (ASF) under one +nn - or more contributor license agreements. See the NOTICE file + -n 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-Plugins" default="build"> + <property name="module.depends" value="client broker common junit-toolkit"/> + <property name="module.dist" value="false"/> + <property name="module.vm.version" value="1.5"/> + <import file="../module.xml"/> + +</project> diff --git a/java/broker/etc/acl.config.xml b/java/broker/etc/acl.config.xml index 0de01bf8bb..73c8d239de 100644 --- a/java/broker/etc/acl.config.xml +++ b/java/broker/etc/acl.config.xml @@ -129,6 +129,12 @@ <user>server</user> </users> </routing_key> + <routing_key> + <value>TempQueue*</value> + <users> + <user>server</user> + </users> + </routing_key> </routing_keys> </exchange> diff --git a/java/build.deps b/java/build.deps index 2f5390e3e3..f9a7c4c261 100644 --- a/java/build.deps +++ b/java/build.deps @@ -33,6 +33,7 @@ client.libs=${common.libs} ${geronimo-jms} broker.libs=${common.libs} ${commons-cli} ${commons-logging} ${log4j} \ ${slf4j-log4j} ${xalan} ${felix.libs} +broker-plugins.libs=${common.libs} ${felix.libs} junit-toolkit.libs=${log4j} ${junit} test.libs=${slf4j-log4j} ${junit-toolkit.libs} diff --git a/java/build.xml b/java/build.xml index 2094c50b9b..5a5db734f6 100644 --- a/java/build.xml +++ b/java/build.xml @@ -26,8 +26,9 @@ <property name="modules.examples" value="client/example"/> <property name="modules.tests" value="systests perftests integrationtests"/> <property name="modules.management" value="management/eclipse-plugin"/> + <property name="modules.plugin" value="broker-plugins"/> - <property name="modules" value="${modules.core} ${modules.examples} ${modules.tests} ${modules.management}"/> + <property name="modules" value="${modules.core} ${modules.plugin} ${modules.examples} ${modules.tests} ${modules.management}"/> <property name="qpid.jar" location="${build.lib}/qpid-incubating.jar"/> <basename property="qpid.jar.name" file="${qpid.jar}"/> diff --git a/java/common.xml b/java/common.xml index cfaab2cc84..cbfc87d270 100644 --- a/java/common.xml +++ b/java/common.xml @@ -35,6 +35,7 @@ <property name="build.release" location="${build}/release"/> <property name="build.release.prepare" location="${build.release}/prepare"/> <property name="build.data" location="${build}/data"/> + <property name="build.plugins" location="${build}/lib/plugins"/> <property name="java.target" value="1.5"/> <property name="java.source" value="1.5"/> diff --git a/java/module.xml b/java/module.xml index 3dbab15962..76f81e93f1 100644 --- a/java/module.xml +++ b/java/module.xml @@ -112,6 +112,7 @@ <mkdir dir="${build.lib}"/> <mkdir dir="${build.results}"/> <mkdir dir="${build.data}"/> + <mkdir dir="${build.plugins}"/> <mkdir dir="${module.classes}"/> <mkdir dir="${module.precompiled}"/> <mkdir dir="${module.api}"/> @@ -171,6 +172,8 @@ <target name="test" depends="compile-tests" if="module.test.src.exists" description="execute unit tests"> + <copy file="${build.lib}/${project.name}-broker-plugins-${project.version}.jar" todir="${build.plugins}"/> + <junit fork="${test.fork}" maxmemory="${test.mem}" reloading="no" haltonfailure="${haltonfailure}" haltonerror="${haltonerror}" printsummary="on" timeout="600000" > @@ -186,6 +189,9 @@ <sysproperty key="test.excludes" value="${test.excludes}"/> <sysproperty key="test.excludesfile" value="${test.excludesfile}"/> <sysproperty key="max_prefetch" value ="${max_prefetch}"/> + <sysproperty key="example.plugin.target" value="${project.root}/build/lib/plugins"/> + <sysproperty key="QPID_EXAMPLE_HOME" value="${project.root}/broker"/> + <sysproperty key="QPID_HOME" value="${project.root}/broker"/> <formatter type="plain"/> <formatter type="xml"/> |