svn commit: r1428784 - /qpid/trunk/qpid/java/module.xml

[ro...@apache.org]

Author: robbie
Date: Fri Jan  4 11:06:46 2013
New Revision: 1428784

URL: http://svn.apache.org/viewvc?rev=1428784&view=rev
Log:
QPID-4526: stop logging warnings about <module>/resource dirs not existing

Modified:
    qpid/trunk/qpid/java/module.xml

Modified: qpid/trunk/qpid/java/module.xml
URL: http://svn.apache.org/viewvc/qpid/trunk/qpid/java/module.xml?rev=1428784&r1=1428783&r2=1428784&view=diff
==============================================================================
--- qpid/trunk/qpid/java/module.xml (original)
+++ qpid/trunk/qpid/java/module.xml Fri Jan  4 11:06:46 2013
@@ -55,8 +55,9 @@
   <property name="module.test.src"     location="src/test/java"/>
   <property name="module.bin"          location="bin"/>
   <property name="module.etc"          location="etc"/>
+  <property name="module.resources.dir" location="resources/"/>
   <property name="module.src.resources.metainf" location="src/main/resources/META-INF"/>
-  <property name="module.metainf" location="${module.build}/META-INF"/>
+  <property name="module.metainf"      location="${module.build}/META-INF"/>
 
   <property name="module.namever"      value="${project.name}-${module.name}-${project.version}"/>
   <property name="module.namever.osgi" value="${project.name}-${module.name}_${project.version}.0.osgi"/>
@@ -86,6 +87,7 @@
   <available property="module.etc.exists" file="${module.etc}"/>
   <available property="module.bin.exists" file="${module.bin}"/>
   <available property="module.src.resources.metainf.exists" file="${module.src.resources.metainf}"/>
+  <available property="module.resources.dir.exists" file="${module.resources.dir}"/>
 
   <property name="module.source.jar"
             location="${build.lib}/${project.name}-${module.name}-${project.version}-sources.jar"/>
@@ -496,13 +498,13 @@
 
   <target name="build" depends="jar,jar-tests,jar-sources,libs,copy-bin,copy-etc,postbuild,copy-broker-plugin-jars" description="compile and copy resources into build tree"/>
 
-  <target name="jar.manifest" depends="compile, copy-module-metainf" if="module.manifest">
+  <target name="jar.manifest" depends="compile,copy-files-to-module-metainf" if="module.manifest">
     <jar destfile="${module.jar}" basedir="${module.classes}" manifest="${module.manifest}">
        <metainf dir="${module.metainf}" />
     </jar>
   </target>
 
-  <target name="jar.nomanifest" depends="compile, copy-module-metainf" unless="module.manifest">
+  <target name="jar.nomanifest" depends="compile,copy-files-to-module-metainf" unless="module.manifest">
     <jar destfile="${module.jar}" basedir="${module.classes}">
        <metainf dir="${module.metainf}" />
     </jar>
@@ -512,18 +514,23 @@
     <copy file="${module.jar}" todir="${build.scratch.broker.plugins.lib}" failonerror="true"/>
   </target>
 
-  <target name="copy-module-metainf" depends="copy-metainf-resources" if="module.src.resources.metainf.exists">
-    <copy todir="${module.metainf}" failonerror="true">
-        <fileset dir="${module.src.resources.metainf}"/>
-    </copy>
-  </target>
+  <target name="copy-files-to-module-metainf" depends="copy-project-resources-metainf, copy-module-resources-metainf, copy-module-src-resources-metainf"/>
 
-  <target name="copy-metainf-resources">
+  <target name="copy-project-resources-metainf">
     <copy todir="${module.metainf}" failonerror="true">
         <fileset dir="${project.root}/resources/"/>
     </copy>
+  </target>
+
+  <target name="copy-module-resources-metainf" if="module.resources.dir.exists">
     <copy todir="${module.metainf}" failonerror="false" overwrite="true">
-        <fileset dir="resources/"/>
+        <fileset dir="${module.resources.dir}"/>
+    </copy>
+  </target>
+
+  <target name="copy-module-src-resources-metainf" if="module.src.resources.metainf.exists">
+    <copy todir="${module.metainf}" failonerror="true">
+        <fileset dir="${module.src.resources.metainf}"/>
     </copy>
   </target>
 



---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@qpid.apache.org
For additional commands, e-mail: commits-help@qpid.apache.org