Author: ritchiem
Date: Sun May 10 23:27:09 2009
New Revision: 773431
URL: http://svn.apache.org/viewvc?rev=773431&view=rev
Log:
QPID-1748, QPID-1752, QPID-1753 : Updated module.xml added qpid.java.root to be
reference the java dir so that sub projects such as m
anagement/client and management/tools/qpid-cli and correctly point to the top
level lib dir which is not always simply ${basedir}/..
This allowed the easy creation of Client Example package(build.deps was updated
for this to include log4j as a dependency so the resulting package will run)
QMan/WSDL pacakge and the qpid-cli management tool
Modified:
qpid/branches/0.5-release/qpid/java/build.deps
qpid/branches/0.5-release/qpid/java/client/example/build.xml
qpid/branches/0.5-release/qpid/java/management/client/build.xml
qpid/branches/0.5-release/qpid/java/management/tools/qpid-cli/build.xml
qpid/branches/0.5-release/qpid/java/module.xml
Modified: qpid/branches/0.5-release/qpid/java/build.deps
URL:
http://svn.apache.org/viewvc/qpid/branches/0.5-release/qpid/java/build.deps?rev=773431&r1=773430&r2=773431&view=diff
==============================================================================
--- qpid/branches/0.5-release/qpid/java/build.deps (original)
+++ qpid/branches/0.5-release/qpid/java/build.deps Sun May 10 23:27:09 2009
@@ -1,3 +1,21 @@
+#
+# 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.
+#
backport-util-concurrent=lib/backport-util-concurrent-2.2.jar
commons-beanutils-core=lib/commons-beanutils-core-1.8.0.jar
@@ -92,7 +110,7 @@
perftests.libs=${systests.libs}
integrationtests.libs=${systests.libs}
-client-example.libs=${client.libs}
+client-example.libs=${client.libs} ${slf4j-log4j} ${log4j}
testkit.libs=${client.libs}
ibm-icu=lib/com.ibm.icu_3.8.1.v20080530.jar
@@ -154,13 +172,12 @@
management-eclipse-plugin.libs=${management-eclipse-plugin.core-libs}
${management-eclipse-plugin.platform-libs}
-
management-tools-qpid-cli.libs=${common.libs} ${jline}
common.test.libs=${test.libs}
broker.test.libs=${test.libs}
client.test.libs=${broker.libs} ${test.libs}
-client-example.test.libs=${test.libs}
+client-example.test.libs=${test.libs}
tools.test.libs=${client.test.libs}
testkit.test.libs=${test.libs}
management-client.test.libs=${muse.libs} ${test.libs} ${log4j} ${javassist}
${geronimo-servlet} ${commons-pool}
Modified: qpid/branches/0.5-release/qpid/java/client/example/build.xml
URL:
http://svn.apache.org/viewvc/qpid/branches/0.5-release/qpid/java/client/example/build.xml?rev=773431&r1=773430&r2=773431&view=diff
==============================================================================
--- qpid/branches/0.5-release/qpid/java/client/example/build.xml (original)
+++ qpid/branches/0.5-release/qpid/java/client/example/build.xml Sun May 10
23:27:09 2009
@@ -21,7 +21,11 @@
<project name="AMQ Client" default="build">
<property name="module.depends" value="common client"/>
+
+ <property name="qpid.java.root" value="..${file.separator}.." />
<import file="../../module.xml"/>
+ <target name="release-bin" depends="release-bin-tasks"/>
+
</project>
Modified: qpid/branches/0.5-release/qpid/java/management/client/build.xml
URL:
http://svn.apache.org/viewvc/qpid/branches/0.5-release/qpid/java/management/client/build.xml?rev=773431&r1=773430&r2=773431&view=diff
==============================================================================
--- qpid/branches/0.5-release/qpid/java/management/client/build.xml (original)
+++ qpid/branches/0.5-release/qpid/java/management/client/build.xml Sun May 10
23:27:09 2009
@@ -37,6 +37,8 @@
<mkdir
dir="${module.release}${file.separator}examples${file.separator}sample_messages"/>
</target>
+
+ <target name="release-bin" depends="release-bin-tasks"/>
<target name="resources-release" description="copy resources into
module release">
<copy todir="${module.release}" failonerror="false"
flatten="true">
Modified:
qpid/branches/0.5-release/qpid/java/management/tools/qpid-cli/build.xml
URL:
http://svn.apache.org/viewvc/qpid/branches/0.5-release/qpid/java/management/tools/qpid-cli/build.xml?rev=773431&r1=773430&r2=773431&view=diff
==============================================================================
--- qpid/branches/0.5-release/qpid/java/management/tools/qpid-cli/build.xml
(original)
+++ qpid/branches/0.5-release/qpid/java/management/tools/qpid-cli/build.xml Sun
May 10 23:27:09 2009
@@ -20,12 +20,17 @@
-->
<project name="qpid-cli">
- <property name="module.depends" value="common management/common" />
+ <property name="module.depends" value="common management-common" />
<property name="module.test.depends" value="common client" />
<property name="module.src" value="src" />
<!-- Disable tests as per QPID-1342 -->
<!--property name="module.test.src" value="test" /-->
+
+ <property name="qpid.java.root"
value="..${file.separator}..${file.separator}.." />
+
<import file="../../../module.xml"/>
+ <target name="release-bin" depends="release-bin-tasks"/>
+
</project>
Modified: qpid/branches/0.5-release/qpid/java/module.xml
URL:
http://svn.apache.org/viewvc/qpid/branches/0.5-release/qpid/java/module.xml?rev=773431&r1=773430&r2=773431&view=diff
==============================================================================
--- qpid/branches/0.5-release/qpid/java/module.xml (original)
+++ qpid/branches/0.5-release/qpid/java/module.xml Sun May 10 23:27:09 2009
@@ -32,10 +32,11 @@
</filtermapper>
</map>
- <echo message="Running ant for module : ${module}" level="info"/>
+ <echo message="Running ant for module : ${module.name}" level="info"/>
<property file="${project.root}/build.deps"/>
-
+
+ <property name="qpid.java.root" location=".."/>
<property name="module.build" location="${build}/${module}"/>
<property name="module.classes" location="${module.build}/classes"/>
<property name="module.instrumented"
location="${module.build}/classes-instrumented"/>
@@ -342,7 +343,7 @@
<target name="libs-release" description="copy dependencies into module
release">
<!-- Copy the module dependencies -->
<copy todir="${module.release}" failonerror="true">
- <fileset dir="${basedir}${file.separator}.." includes="${module.libs}"/>
+ <fileset dir="${basedir}${file.separator}${qpid.java.root}"
includes="${module.libs}"/>
</copy>
<!-- Copy the jar for this module -->
<copy todir="${module.release}/lib" failonerror="true">
@@ -353,7 +354,7 @@
<target name="resources" description="copy resources into build tree">
<copy todir="${build}" failonerror="false" flatten="true">
- <fileset dir="${basedir}${file.separator}.." includes="${resources}"/>
+ <fileset dir="${basedir}${qpid.java.root}" includes="${resources}"/>
</copy>
</target>
---------------------------------------------------------------------
Apache Qpid - AMQP Messaging Implementation
Project: http://qpid.apache.org
Use/Interact: mailto:[email protected]
