From 07c285f662e8f60d4e8aca247b65b77ca5df4587 Mon Sep 17 00:00:00 2001
From: Robert Gemmell <robbie@apache.org>
Date: Thu, 28 Jun 2012 16:46:12 +0000
Subject: QPID-3998, QPID-3999, QPID-4093: add new management plugins for
 jmx/rest/webui functionality, partial merge from the
 java-config-and-management branch at r1355039

git-svn-id: https://svn.apache.org/repos/asf/qpid/trunk@1355072 13f79535-47bb-0310-9956-ffa450edef68
---
 qpid/java/module.xml | 8 +++++++-
 1 file changed, 7 insertions(+), 1 deletion(-)

(limited to 'qpid/java/module.xml')

diff --git a/qpid/java/module.xml b/qpid/java/module.xml
index 8c6d815fee..87df541275 100644
--- a/qpid/java/module.xml
+++ b/qpid/java/module.xml
@@ -52,6 +52,7 @@
   <property name="module.results"      location="${build.results}/${module}"/>
   <property name="module.failed"       location="${module.results}/FAILED"/>
   <property name="module.src"          location="src/main/java"/>
+  <property name="module.src.resources" location="src/main/resources"/>
   <property name="module.test.src"     location="src/test/java"/>
   <property name="module.bin"          location="bin"/>
   <property name="module.etc"          location="etc"/>
@@ -443,12 +444,17 @@
 
   <target name="build" depends="jar,jar-tests,jar-sources,libs,copy-bin,copy-etc,postbuild" description="compile and copy resources into build tree"/>
   <target name="jar.manifest" depends="compile" if="module.manifest">
-    <jar destfile="${module.jar}" basedir="${module.classes}" manifest="${module.manifest}"/>
+    <jar destfile="${module.jar}" basedir="${module.classes}" manifest="${module.manifest}">
+       <metainf dir="${project.root}/resources/" />
+       <metainf dir="${module.src.resources}" erroronmissingdir="false"/>
+    </jar>
   </target>
 
   <target name="jar.nomanifest" depends="compile" unless="module.manifest">
+
     <jar destfile="${module.jar}" basedir="${module.classes}">
        <metainf dir="${project.root}/resources/" />
+       <metainf dir="${module.src.resources}" erroronmissingdir="false"/>
     </jar>
   </target>
 
-- 
cgit v1.2.1