From a8e7aeb469037dfaf8b2bb0bb6ca75d4181a4b1c Mon Sep 17 00:00:00 2001
From: Robert Gemmell <robbie@apache.org>
Date: Thu, 21 Jul 2011 13:18:27 +0000
Subject: QPID-3365: Extend build system to build optional client-plugins.

Applied patch from Keith Wall <keith.wall@gmail.com>

git-svn-id: https://svn.apache.org/repos/asf/qpid/trunk@1149163 13f79535-47bb-0310-9956-ffa450edef68
---
 qpid/java/build.xml  | 4 ++--
 qpid/java/common.xml | 5 ++---
 2 files changed, 4 insertions(+), 5 deletions(-)

(limited to 'qpid/java')

diff --git a/qpid/java/build.xml b/qpid/java/build.xml
index 8651404cb7..b8441af3a5 100644
--- a/qpid/java/build.xml
+++ b/qpid/java/build.xml
@@ -22,15 +22,15 @@
 
   <import file="common.xml"/>
 
-
   <findSubProjects name="broker-plugins" dir="broker-plugins"/>
+  <findSubProjects name="client-plugins" dir="client-plugins" erroronmissingdir="false"/>
   <findSubProjects name="management" dir="management" excludes="common,example"/>
 
   <property name="modules.core"       value="junit-toolkit common management/common broker client tools"/>
   <property name="modules.examples"   value="client/example management/example"/>
   <property name="modules.tests"      value="systests perftests integrationtests testkit"/>
   <property name="modules.management" value="${management}"/>
-  <property name="modules.plugin"     value="${broker-plugins}"/>
+  <property name="modules.plugin"     value="${broker-plugins} ${client-plugins}"/>
   <property name="modules"            value="${modules.core} ${modules.examples}
    ${modules.management} ${modules.tests} ${modules.plugin}"/>
 
diff --git a/qpid/java/common.xml b/qpid/java/common.xml
index d8150bac6b..f503a5c7da 100644
--- a/qpid/java/common.xml
+++ b/qpid/java/common.xml
@@ -116,9 +116,10 @@
 	<attribute name="dir"/>
         <attribute name="name"/>
 	<attribute name="excludes" default=""/>
+	<attribute name="erroronmissingdir" default="true"/>
 	  
 	<sequential>
-	  <dirset id="@{dir}.refid" dir="@{dir}" excludes="@{excludes}">
+	  <dirset id="@{dir}.refid" dir="@{dir}" excludes="@{excludes}" erroronmissingdir="@{erroronmissingdir}">
 	   <present targetdir="@{dir}">
         	 <mapper type="glob" from="*" to="*/build.xml" />
 	   </present>
@@ -132,8 +133,6 @@
  	</sequential>
   </macrodef>
 
-
-
   <macrodef name="jython">
     <attribute name="path"/>
     <element name="args"/>
-- 
cgit v1.2.1