You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@qpid.apache.org by kw...@apache.org on 2013/11/15 17:38:00 UTC

svn commit: r1542317 - in /qpid/trunk/qpid/java: bdbstore/pom.xml broker-plugins/derby-store/pom.xml broker-plugins/jdbc-provider-bone/pom.xml broker-plugins/jdbc-store/pom.xml broker-plugins/memory-store/pom.xml

Author: kwall
Date: Fri Nov 15 16:38:00 2013
New Revision: 1542317

URL: http://svn.apache.org/r1542317
Log:
QPID-5048: [Maven build system] Fix poms so that resources beneath the nonstandard src/main/java/resources are also included in the jar artifacts.

This problem prevented the proper creation of virtual hosts when using builds created by Maven.

Modified:
    qpid/trunk/qpid/java/bdbstore/pom.xml
    qpid/trunk/qpid/java/broker-plugins/derby-store/pom.xml
    qpid/trunk/qpid/java/broker-plugins/jdbc-provider-bone/pom.xml
    qpid/trunk/qpid/java/broker-plugins/jdbc-store/pom.xml
    qpid/trunk/qpid/java/broker-plugins/memory-store/pom.xml

Modified: qpid/trunk/qpid/java/bdbstore/pom.xml
URL: http://svn.apache.org/viewvc/qpid/trunk/qpid/java/bdbstore/pom.xml?rev=1542317&r1=1542316&r2=1542317&view=diff
==============================================================================
--- qpid/trunk/qpid/java/bdbstore/pom.xml (original)
+++ qpid/trunk/qpid/java/bdbstore/pom.xml Fri Nov 15 16:38:00 2013
@@ -86,6 +86,17 @@
   </dependencies>
 
   <build>
+    <resources>
+      <resource>
+        <directory>src/main/resources</directory>
+      </resource>
+      <resource>
+        <directory>src/main/java</directory>
+        <includes>
+          <include>resources/</include>
+        </includes>
+      </resource>
+    </resources>
   </build>
 
 </project>

Modified: qpid/trunk/qpid/java/broker-plugins/derby-store/pom.xml
URL: http://svn.apache.org/viewvc/qpid/trunk/qpid/java/broker-plugins/derby-store/pom.xml?rev=1542317&r1=1542316&r2=1542317&view=diff
==============================================================================
--- qpid/trunk/qpid/java/broker-plugins/derby-store/pom.xml (original)
+++ qpid/trunk/qpid/java/broker-plugins/derby-store/pom.xml Fri Nov 15 16:38:00 2013
@@ -59,6 +59,17 @@
   </dependencies>
 
   <build>
+    <resources>
+      <resource>
+        <directory>src/main/resources</directory>
+      </resource>
+      <resource>
+        <directory>src/main/java</directory>
+        <includes>
+          <include>resources/</include>
+        </includes>
+      </resource>
+    </resources>
   </build>
 
 </project>

Modified: qpid/trunk/qpid/java/broker-plugins/jdbc-provider-bone/pom.xml
URL: http://svn.apache.org/viewvc/qpid/trunk/qpid/java/broker-plugins/jdbc-provider-bone/pom.xml?rev=1542317&r1=1542316&r2=1542317&view=diff
==============================================================================
--- qpid/trunk/qpid/java/broker-plugins/jdbc-provider-bone/pom.xml (original)
+++ qpid/trunk/qpid/java/broker-plugins/jdbc-provider-bone/pom.xml Fri Nov 15 16:38:00 2013
@@ -58,6 +58,17 @@
   </dependencies>
 
   <build>
+    <resources>
+      <resource>
+        <directory>src/main/resources</directory>
+      </resource>
+      <resource>
+        <directory>src/main/java</directory>
+        <includes>
+          <include>resources/</include>
+        </includes>
+      </resource>
+    </resources>
   </build>
 
 </project>

Modified: qpid/trunk/qpid/java/broker-plugins/jdbc-store/pom.xml
URL: http://svn.apache.org/viewvc/qpid/trunk/qpid/java/broker-plugins/jdbc-store/pom.xml?rev=1542317&r1=1542316&r2=1542317&view=diff
==============================================================================
--- qpid/trunk/qpid/java/broker-plugins/jdbc-store/pom.xml (original)
+++ qpid/trunk/qpid/java/broker-plugins/jdbc-store/pom.xml Fri Nov 15 16:38:00 2013
@@ -59,6 +59,17 @@
   </dependencies>
 
   <build>
+    <resources>
+      <resource>
+        <directory>src/main/resources</directory>
+      </resource>
+      <resource>
+        <directory>src/main/java</directory>
+        <includes>
+          <include>resources/</include>
+        </includes>
+      </resource>
+    </resources>
   </build>
 
 </project>

Modified: qpid/trunk/qpid/java/broker-plugins/memory-store/pom.xml
URL: http://svn.apache.org/viewvc/qpid/trunk/qpid/java/broker-plugins/memory-store/pom.xml?rev=1542317&r1=1542316&r2=1542317&view=diff
==============================================================================
--- qpid/trunk/qpid/java/broker-plugins/memory-store/pom.xml (original)
+++ qpid/trunk/qpid/java/broker-plugins/memory-store/pom.xml Fri Nov 15 16:38:00 2013
@@ -36,6 +36,17 @@
   </dependencies>
 
   <build>
+    <resources>
+      <resource>
+        <directory>src/main/resources</directory>
+      </resource>
+      <resource>
+        <directory>src/main/java</directory>
+        <includes>
+          <include>resources/</include>
+        </includes>
+      </resource>
+    </resources>
   </build>
 
 </project>



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