You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@qpid.apache.org by ra...@apache.org on 2008/05/01 02:03:23 UTC
svn commit: r652409 - in /incubator/qpid/trunk/qpid/java:
broker-plugins/build.xml broker/etc/acl.config.xml build.deps build.xml
common.xml module.xml
Author: rajith
Date: Wed Apr 30 17:03:23 2008
New Revision: 652409
URL: http://svn.apache.org/viewvc?rev=652409&view=rev
Log:
This commit is for QPID-992 and QPID-993
build.xml
==========
I added the broker-plugins as a module to the ant build system.
This was nessacery to get the plugins jar generated for QPID-993.
In general when we add extra exchanges as plugins we want release this as a separate jar
common.xml
==========
Added a property build.plugins.
This is used to create the plugins dir that is used for PluginTest noted in QPID-993.
module.xml
==========
Creats the folder identified by build.plugins
copys the plugins jar to the above folder before the tests are run
Added the following system properties when running tests
"example.plugin.target" to build.plugins - required for QPID-993
"QPID_EXAMPLE_HOME" and "QPID_HOME"
is to project.root/broker to pick up the config files in etc - required for QPID-992.
build.deps
==========
added common libs and felix libs for the broker-plugins module.
This is for QPID-993
acl.config.xml
==============
Added TempQueue as a routing key allowed for publish to amq.direct for user "server"
This was done for QPID-992
Added:
incubator/qpid/trunk/qpid/java/broker-plugins/build.xml
Modified:
incubator/qpid/trunk/qpid/java/broker/etc/acl.config.xml
incubator/qpid/trunk/qpid/java/build.deps
incubator/qpid/trunk/qpid/java/build.xml
incubator/qpid/trunk/qpid/java/common.xml
incubator/qpid/trunk/qpid/java/module.xml
Added: incubator/qpid/trunk/qpid/java/broker-plugins/build.xml
URL: http://svn.apache.org/viewvc/incubator/qpid/trunk/qpid/java/broker-plugins/build.xml?rev=652409&view=auto
==============================================================================
--- incubator/qpid/trunk/qpid/java/broker-plugins/build.xml (added)
+++ incubator/qpid/trunk/qpid/java/broker-plugins/build.xml Wed Apr 30 17:03:23 2008
@@ -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>
Modified: incubator/qpid/trunk/qpid/java/broker/etc/acl.config.xml
URL: http://svn.apache.org/viewvc/incubator/qpid/trunk/qpid/java/broker/etc/acl.config.xml?rev=652409&r1=652408&r2=652409&view=diff
==============================================================================
--- incubator/qpid/trunk/qpid/java/broker/etc/acl.config.xml (original)
+++ incubator/qpid/trunk/qpid/java/broker/etc/acl.config.xml Wed Apr 30 17:03:23 2008
@@ -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>
Modified: incubator/qpid/trunk/qpid/java/build.deps
URL: http://svn.apache.org/viewvc/incubator/qpid/trunk/qpid/java/build.deps?rev=652409&r1=652408&r2=652409&view=diff
==============================================================================
--- incubator/qpid/trunk/qpid/java/build.deps (original)
+++ incubator/qpid/trunk/qpid/java/build.deps Wed Apr 30 17:03:23 2008
@@ -33,6 +33,7 @@
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}
Modified: incubator/qpid/trunk/qpid/java/build.xml
URL: http://svn.apache.org/viewvc/incubator/qpid/trunk/qpid/java/build.xml?rev=652409&r1=652408&r2=652409&view=diff
==============================================================================
--- incubator/qpid/trunk/qpid/java/build.xml (original)
+++ incubator/qpid/trunk/qpid/java/build.xml Wed Apr 30 17:03:23 2008
@@ -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}"/>
Modified: incubator/qpid/trunk/qpid/java/common.xml
URL: http://svn.apache.org/viewvc/incubator/qpid/trunk/qpid/java/common.xml?rev=652409&r1=652408&r2=652409&view=diff
==============================================================================
--- incubator/qpid/trunk/qpid/java/common.xml (original)
+++ incubator/qpid/trunk/qpid/java/common.xml Wed Apr 30 17:03:23 2008
@@ -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"/>
Modified: incubator/qpid/trunk/qpid/java/module.xml
URL: http://svn.apache.org/viewvc/incubator/qpid/trunk/qpid/java/module.xml?rev=652409&r1=652408&r2=652409&view=diff
==============================================================================
--- incubator/qpid/trunk/qpid/java/module.xml (original)
+++ incubator/qpid/trunk/qpid/java/module.xml Wed Apr 30 17:03:23 2008
@@ -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"/>