svn commit: r1160180 - in /qpid/trunk/qpid/java: build.xml client-plugins/ client-plugins/.gitignore client-plugins/README.txt common.xml

[kw...@apache.org]

Author: kwall
Date: Mon Aug 22 10:08:33 2011
New Revision: 1160180

URL: http://svn.apache.org/viewvc?rev=1160180&view=rev
Log:
QPID-3365: Reverted change to build system to avoid dependency on Ant 1.7.1.   client-plugins is now a placeholder empty dir.

Added:
    qpid/trunk/qpid/java/client-plugins/
    qpid/trunk/qpid/java/client-plugins/.gitignore
    qpid/trunk/qpid/java/client-plugins/README.txt
Modified:
    qpid/trunk/qpid/java/build.xml
    qpid/trunk/qpid/java/common.xml

Modified: qpid/trunk/qpid/java/build.xml
URL: http://svn.apache.org/viewvc/qpid/trunk/qpid/java/build.xml?rev=1160180&r1=1160179&r2=1160180&view=diff
==============================================================================
--- qpid/trunk/qpid/java/build.xml (original)
+++ qpid/trunk/qpid/java/build.xml Mon Aug 22 10:08:33 2011
@@ -23,7 +23,7 @@
   <import file="common.xml"/>
 
   <findSubProjects name="broker-plugins" dir="broker-plugins"/>
-  <findSubProjects name="client-plugins" dir="client-plugins" erroronmissingdir="false"/>
+  <findSubProjects name="client-plugins" dir="client-plugins"/>
   <findSubProjects name="management" dir="management" excludes="common,example"/>
 
   <property name="modules.core"       value="junit-toolkit common management/common broker client tools"/>

Added: qpid/trunk/qpid/java/client-plugins/.gitignore
URL: http://svn.apache.org/viewvc/qpid/trunk/qpid/java/client-plugins/.gitignore?rev=1160180&view=auto
==============================================================================
    (empty)

Added: qpid/trunk/qpid/java/client-plugins/README.txt
URL: http://svn.apache.org/viewvc/qpid/trunk/qpid/java/client-plugins/README.txt?rev=1160180&view=auto
==============================================================================
--- qpid/trunk/qpid/java/client-plugins/README.txt (added)
+++ qpid/trunk/qpid/java/client-plugins/README.txt Mon Aug 22 10:08:33 2011
@@ -0,0 +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.
+#
+
+Placeholder directory to allow for the building of client side optional modules such as transports or custom SASL modules etc. Analogous to
+broker-plugins.

Modified: qpid/trunk/qpid/java/common.xml
URL: http://svn.apache.org/viewvc/qpid/trunk/qpid/java/common.xml?rev=1160180&r1=1160179&r2=1160180&view=diff
==============================================================================
--- qpid/trunk/qpid/java/common.xml (original)
+++ qpid/trunk/qpid/java/common.xml Mon Aug 22 10:08:33 2011
@@ -116,10 +116,9 @@
 	<attribute name="dir"/>
         <attribute name="name"/>
 	<attribute name="excludes" default=""/>
-	<attribute name="erroronmissingdir" default="true"/>
 	  
 	<sequential>
-	  <dirset id="@{dir}.refid" dir="@{dir}" excludes="@{excludes}" erroronmissingdir="@{erroronmissingdir}">
+	  <dirset id="@{dir}.refid" dir="@{dir}" excludes="@{excludes}">
 	   <present targetdir="@{dir}">
         	 <mapper type="glob" from="*" to="*/build.xml" />
 	   </present>



---------------------------------------------------------------------
Apache Qpid - AMQP Messaging Implementation
Project:      http://qpid.apache.org
Use/Interact: mailto:commits-subscribe@qpid.apache.org