manifoldcf-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From kwri...@apache.org
Subject svn commit: r1628066 - in /manifoldcf/trunk: build.xml connectors/alfresco/build.xml connectors/cmis/build.xml connectors/elasticsearch/build.xml connectors/jcifs/build.xml framework/build.xml framework/buildfiles/connector-build.xml
Date Sun, 28 Sep 2014 11:49:16 GMT
Author: kwright
Date: Sun Sep 28 11:49:15 2014
New Revision: 1628066

URL: http://svn.apache.org/r1628066
Log:
More changes related to CONNECTORS-1048.

Modified:
    manifoldcf/trunk/build.xml
    manifoldcf/trunk/connectors/alfresco/build.xml
    manifoldcf/trunk/connectors/cmis/build.xml
    manifoldcf/trunk/connectors/elasticsearch/build.xml
    manifoldcf/trunk/connectors/jcifs/build.xml
    manifoldcf/trunk/framework/build.xml
    manifoldcf/trunk/framework/buildfiles/connector-build.xml

Modified: manifoldcf/trunk/build.xml
URL: http://svn.apache.org/viewvc/manifoldcf/trunk/build.xml?rev=1628066&r1=1628065&r2=1628066&view=diff
==============================================================================
--- manifoldcf/trunk/build.xml (original)
+++ manifoldcf/trunk/build.xml Sun Sep 28 11:49:15 2014
@@ -29,19 +29,82 @@
     <defaultexcludes add="**/*.iml"/> 
     <defaultexcludes add="**/.idea/**"/> 
     
+    <property name="hsqldb.version" value="2.3.1"/>
+    <property name="jetty.version" value="7.5.4.v20111024"/>
+    <property name="httpclient.version" value="4.3.5"/>
+    <property name="httpmime.version" value="4.3.5"/>
+    <property name="httpcore.version" value="4.3.2"/>
+    <property name="xerces.version" value="2.10.0"/>
+    <property name="zookeeper.version" value="3.4.6"/>
+    <property name="mongodb.version" value="2.11.3"/>
+    <property name="json.version" value="20090211"/>
+    <property name="postgresql.version" value="9.1-901.jdbc4"/>
+    <property name="axis.version" value="1.4"/>
+    <property name="saaj-api.version" value="1.3"/>
+    <property name="saaj-impl.version" value="1.3.3"/>
+    <property name="castor.version" value="1.0.5"/>
+    <property name="wsdl4j.version" value="1.6.2"/>
+    <property name="commons-codec.version" value="1.9"/>
+    <property name="commons-collections.version" value="3.2.1"/>
+    <property name="commons-discovery.version" value="0.5"/>
+    <property name="commons-el.version" value="1.0"/>
+    <property name="commons-fileupload.version" value="1.2.2"/>
+    <property name="commons-io.version" value="2.1"/>
+    <property name="commons-lang.version" value="2.6"/>
+    <property name="commons-logging.version" value="1.1.3"/>
+    <property name="commons-configuration.version" value="1.6"/>
+    <property name="commons-cli.version" value="1.2"/>
+    <property name="slf4j.version" value="1.7.7"/>
+    <property name="xalan.version" value="2.7.1"/>
+    <property name="poi.version" value="3.11-beta2"/>
+    <property name="activation.version" value="1.1.1"/>
+    <property name="avalon.version" value="4.3.1"/>
+    <property name="ecj.version" value="4.3.1"/>
+    <property name="fop.version" value="1.0"/>
+    <property name="javamail-spec.version" value="1.7.1"/>
+    <property name="tomcat.version" value="6.0.35"/>
+    <property name="jaxb-api.version" value="2.1"/>
+    <property name="jaxb-impl.version" value="2.1.11"/>
+    <property name="jaxws.version" value="2.2.6"/>
+    <property name="chemistry.version" value="0.11.0"/>
+    <property name="glassfish.version" value="2.1.v20091210"/>
+    <property name="junit.version" value="4.8.2"/>
+    <property name="log4j.version" value="1.2.16"/>
+    <property name="mail.version" value="1.4.5"/>
+    <property name="mimepull.version" value="1.3"/>
+    <property name="opensaml.version" value="1.1"/>
+    <property name="osgi.version" value="1.0.0"/>
+    <property name="xml-resolver.version" value="1.2"/>
+    <property name="servlet-api.version" value="2.5-20081211"/>
+    <property name="stax-api.version" value="1.0.1"/>
+    <property name="stax-ex.version" value="1.2"/>
+    <property name="streambuffer.version" value="0.9"/>
+    <property name="velocity.version" value="1.7"/>
+    <property name="wss4j.version" value="1.5.12"/>
+    <property name="xmlgraphics-commons.version" value="1.4"/>
+    <property name="wstx-asl.version" value="3.2.9"/>
+    <property name="xmlsec.version" value="1.4.0"/>
+    <property name="xml-apis.version" value="1.4.01"/>
+    <property name="jstl.version" value="1.2"/>
+    <property name="dropbox-client.version" value="1.5.3"/>
+    <property name="json-simple.version" value="1.1"/>
+    <property name="google-api-client.version" value="v2-rev136-1.19.0"/>
+    <property name="google-http-client.version" value="1.19.0"/>
+    <property name="jackson-core.version" value="2.1.3"/>
+
     <target name="downloaded-condition">
         <!-- Spot check a few of the dependent jars; no point including ALL of them here... -->
-        <!--available file="lib/hsqldb.jar" property="hsqldb-found"/>
-        <available file="lib/jetty-server.jar" property="jetty-found"/>
-        <available file="lib/httpclient.jar" property="httpclient-found"/>
-        <available file="lib/xercesImpl.jar" property="xerces-found"/ -->
-        <available file="lib/zookeeper-3.4.6.jar" property="zookeeper-found"/>
+        <available file="lib/hsqldb-${hsqldb.version}.jar" property="hsqldb-found"/>
+        <available file="lib/jetty-server-${jetty.version}.jar" property="jetty-found"/>
+        <available file="lib/httpclient-${httpclient.version}.jar" property="httpclient-found"/>
+        <available file="lib/xercesImpl-${xerces.version}.jar" property="xerces-found"/>
+        <available file="lib/zookeeper-${zookeeper.version}.jar" property="zookeeper-found"/>
         <condition property="downloaded">
             <and>
-                <!--isset property="hsqldb-found"/>
+                <isset property="hsqldb-found"/>
                 <isset property="jetty-found"/>
                 <isset property="httpclient-found"/>
-                <isset property="xerces-found"/ -->
+                <isset property="xerces-found"/>
                 <isset property="zookeeper-found"/>
             </and>
         </condition>
@@ -624,7 +687,7 @@ Use Apache Forrest version forrest-0.9-d
 
         <antcall target="download-via-maven">
             <param name="project-path" value="org/mongodb"/>
-            <param name="artifact-version" value="2.11.3"/>
+            <param name="artifact-version" value="${mongodb.version}"/>
             <param name="target" value="lib"/>
             <param name="artifact-name" value="mongo-java-driver"/>
             <param name="artifact-type" value="jar"/>
@@ -636,14 +699,14 @@ Use Apache Forrest version forrest-0.9-d
 
         <antcall target="download-via-maven">
             <param name="project-path" value="org/apache/httpcomponents"/>
-            <param name="artifact-version" value="4.3.2"/>
+            <param name="artifact-version" value="${httpcore.version}"/>
             <param name="target" value="lib"/>
             <param name="artifact-name" value="httpcore"/>
             <param name="artifact-type" value="jar"/>
         </antcall>
         <antcall target="download-via-maven">
             <param name="project-path" value="org/apache/httpcomponents"/>
-            <param name="artifact-version" value="4.3.5"/>
+            <param name="artifact-version" value="${httpclient.version}"/>
             <param name="target" value="lib"/>
             <param name="artifact-name" value="httpclient"/>
             <param name="artifact-type" value="jar"/>
@@ -651,7 +714,7 @@ Use Apache Forrest version forrest-0.9-d
         <antcall target="download-via-maven">
             <param name="target" value="lib"/>
             <param name="project-path" value="org/apache/httpcomponents"/>
-            <param name="artifact-version" value="4.3.5"/>
+            <param name="artifact-version" value="${httpmime.version}"/>
             <param name="artifact-name" value="httpmime"/>
             <param name="artifact-type" value="jar"/>
         </antcall>
@@ -661,7 +724,7 @@ Use Apache Forrest version forrest-0.9-d
         <mkdir dir="lib"/>
         <antcall target="download-via-maven">
             <param name="project-path" value="org/json"/>
-            <param name="artifact-version" value="20090211"/>
+            <param name="artifact-version" value="${json.version}"/>
             <param name="target" value="lib"/>
             <param name="artifact-name" value="json"/>
             <param name="artifact-type" value="jar"/>
@@ -670,34 +733,20 @@ Use Apache Forrest version forrest-0.9-d
     
     <target name="download-hsqldb">
         <mkdir dir="lib"/>
-        <!--mkdir dir="build/download"/>
-        <delete dir="build/download/hsqldb"/>
-        <antcall target="checkout-source-via-svn">
-            <param name="root-dir" value="build/download"/>
-            <param name="svn-url" value="https://hsqldb.svn.sourceforge.net/svnroot/hsqldb/base/trunk"/>
-            <param name="dir-name" value="hsqldb"/>
-        </antcall -->
-        <!-- Build it -->
-        <!--antcall target="build-via-ant">
-            <param name="root-dir" value="build/download/hsqldb/build"/>
-            <param name="target" value="hsqldb"/>
-        </antcall>
-        <copy todir="lib" file="build/download/hsqldb/lib/hsqldb.jar"/ -->
         <antcall target="download-via-maven">
             <param name="project-path" value="org/hsqldb"/>
-            <param name="artifact-version" value="2.3.1"/>
+            <param name="artifact-version" value="${hsqldb.version}"/>
             <param name="target" value="lib"/>
             <param name="artifact-name" value="hsqldb"/>
             <param name="artifact-type" value="jar"/>
         </antcall>
-        <!-- get src="http://www.hsqldb.org/repos/org/hsqldb/hsqldb/2.2.9/hsqldb-2.2.9.jar" dest="lib/hsqldb.jar"/-->
     </target>
     
     <target name="download-postgresql">
         <mkdir dir="lib"/>
         <antcall target="download-via-maven">
             <param name="project-path" value="postgresql"/>
-            <param name="artifact-version" value="9.1-901.jdbc4"/>
+            <param name="artifact-version" value="${postgresql.version}"/>
             <param name="target" value="lib"/>
             <param name="artifact-name" value="postgresql"/>
             <param name="artifact-type" value="jar"/>
@@ -706,33 +755,28 @@ Use Apache Forrest version forrest-0.9-d
 
     <target name="download-axis">
         <mkdir dir="lib"/>
-        <property name="axis-version" value="1.4"/>
         <property name="axis-package" value="org/apache/axis"/>
-        <antcall target="download-via-maven"><param name="project-path" value="${axis-package}"/><param name="artifact-version" value="${axis-version}"/><param name="target" value="lib"/>
+        <antcall target="download-via-maven"><param name="project-path" value="${axis-package}"/><param name="artifact-version" value="${axis.version}"/><param name="target" value="lib"/>
             <param name="artifact-name" value="axis"/>
             <param name="artifact-type" value="jar"/>
         </antcall>
-        <antcall target="download-via-maven"><param name="project-path" value="${axis-package}"/><param name="artifact-version" value="${axis-version}"/><param name="target" value="lib"/>
+        <antcall target="download-via-maven"><param name="project-path" value="${axis-package}"/><param name="artifact-version" value="${axis.version}"/><param name="target" value="lib"/>
             <param name="artifact-name" value="axis-jaxrpc"/>
             <param name="artifact-type" value="jar"/>
         </antcall>
-        <!-- antcall target="download-via-maven"><param name="project-path" value="${axis-package}"/><param name="artifact-version" value="${axis-version}"/><param name="target" value="lib"/>
-            <param name="artifact-name" value="axis-saaj"/>
-            <param name="artifact-type" value="jar"/>
-        </antcall -->
     </target>
 
     <target name="download-saaj">
         <mkdir dir="lib"/>
         <antcall target="download-via-maven"><param name="target" value="lib"/>
             <param name="project-path" value="javax/xml/soap"/>
-            <param name="artifact-version" value="1.3"/>
+            <param name="artifact-version" value="${saaj-api.version}"/>
             <param name="artifact-name" value="saaj-api"/>
             <param name="artifact-type" value="jar"/>
         </antcall>
         <antcall target="download-via-maven"><param name="target" value="lib"/>
             <param name="project-path" value="com/sun/xml/messaging/saaj"/>
-            <param name="artifact-version" value="1.3.3"/>
+            <param name="artifact-version" value="${saaj-impl.version}"/>
             <param name="artifact-name" value="saaj-impl"/>
             <param name="artifact-type" value="jar"/>
         </antcall>
@@ -745,9 +789,8 @@ Use Apache Forrest version forrest-0.9-d
         <!-- get src="http://mirrors.ibiblio.org/pub/mirrors/maven/castor/1.0.5/castor-1.0.5.jar" dest="lib/castor.jar"/ -->
         <!-- get src="http://mirrors.ibiblio.org/pub/mirrors/maven/castor/1.0.5/castor-1.0.5-xml.jar" dest="lib/castor-xml.jar"/ -->
         <!-- get src="http://mirrors.ibiblio.org/pub/mirrors/maven/castor/1.0.5/castor-1.0.5-commons.jar" dest="lib/castor-commons.jar"/ -->
-        <property name="castor-version" value="1.0.5"/>
         <property name="castor-path" value="org/codehaus/castor"/>
-        <antcall target="download-via-maven"><param name="project-path" value="${castor-path}"/><param name="artifact-version" value="${castor-version}"/><param name="target" value="lib"/>
+        <antcall target="download-via-maven"><param name="project-path" value="${castor-path}"/><param name="artifact-version" value="${castor.version}"/><param name="target" value="lib"/>
             <param name="artifact-name" value="castor"/>
             <param name="artifact-type" value="jar"/>
         </antcall>
@@ -763,9 +806,8 @@ Use Apache Forrest version forrest-0.9-d
   
     <target name="download-wsdl4j">
         <mkdir dir="lib"/>
-        <property name="wsdl4j-version" value="1.6.2"/>
         <property name="wsdl4j-package" value="wsdl4j"/>
-        <antcall target="download-via-maven"><param name="project-path" value="${wsdl4j-package}"/><param name="artifact-version" value="${wsdl4j-version}"/><param name="target" value="lib"/>
+        <antcall target="download-via-maven"><param name="project-path" value="${wsdl4j-package}"/><param name="artifact-version" value="${wsdl4j.version}"/><param name="target" value="lib"/>
             <param name="artifact-name" value="wsdl4j"/>
             <param name="artifact-type" value="jar"/>
         </antcall>
@@ -775,61 +817,61 @@ Use Apache Forrest version forrest-0.9-d
         <mkdir dir="lib"/>
         <antcall target="download-via-maven"><param name="target" value="lib"/>
             <param name="project-path" value="commons-codec"/>
-            <param name="artifact-version" value="1.9"/>
+            <param name="artifact-version" value="${commons-codec.version}"/>
             <param name="artifact-name" value="commons-codec"/>
             <param name="artifact-type" value="jar"/>
         </antcall>
         <antcall target="download-via-maven"><param name="target" value="lib"/>
             <param name="project-path" value="commons-collections"/>
-            <param name="artifact-version" value="3.2.1"/>
+            <param name="artifact-version" value="${commons-collections.version}"/>
             <param name="artifact-name" value="commons-collections"/>
             <param name="artifact-type" value="jar"/>
         </antcall>
         <antcall target="download-via-maven"><param name="target" value="lib"/>
             <param name="project-path" value="commons-discovery"/>
-            <param name="artifact-version" value="0.5"/>
+            <param name="artifact-version" value="${commons-discovery.version}"/>
             <param name="artifact-name" value="commons-discovery"/>
             <param name="artifact-type" value="jar"/>
         </antcall>
         <antcall target="download-via-maven"><param name="target" value="lib"/>
             <param name="project-path" value="commons-el"/>
-            <param name="artifact-version" value="1.0"/>
+            <param name="artifact-version" value="${commons-el.version}"/>
             <param name="artifact-name" value="commons-el"/>
             <param name="artifact-type" value="jar"/>
         </antcall>
         <antcall target="download-via-maven"><param name="target" value="lib"/>
             <param name="project-path" value="commons-fileupload"/>
-            <param name="artifact-version" value="1.2.2"/>
+            <param name="artifact-version" value="${commons-fileupload.version}"/>
             <param name="artifact-name" value="commons-fileupload"/>
             <param name="artifact-type" value="jar"/>
         </antcall>
         <antcall target="download-via-maven"><param name="target" value="lib"/>
             <param name="project-path" value="commons-io"/>
-            <param name="artifact-version" value="2.1"/>
+            <param name="artifact-version" value="${commons-io.version}"/>
             <param name="artifact-name" value="commons-io"/>
             <param name="artifact-type" value="jar"/>
         </antcall>
         <antcall target="download-via-maven"><param name="target" value="lib"/>
             <param name="project-path" value="commons-lang"/>
-            <param name="artifact-version" value="2.6"/>
+            <param name="artifact-version" value="${commons-lang.version}"/>
             <param name="artifact-name" value="commons-lang"/>
             <param name="artifact-type" value="jar"/>
         </antcall>
         <antcall target="download-via-maven"><param name="target" value="lib"/>
             <param name="project-path" value="commons-logging"/>
-            <param name="artifact-version" value="1.1.3"/>
+            <param name="artifact-version" value="${commons-logging.version}"/>
             <param name="artifact-name" value="commons-logging"/>
             <param name="artifact-type" value="jar"/>
         </antcall>
         <antcall target="download-via-maven"><param name="target" value="lib"/>
             <param name="project-path" value="commons-configuration"/>
-            <param name="artifact-version" value="1.6"/>
+            <param name="artifact-version" value="${commons-configuration.version}"/>
             <param name="artifact-name" value="commons-configuration"/>
             <param name="artifact-type" value="jar"/>
         </antcall>
         <antcall target="download-via-maven"><param name="target" value="lib"/>
             <param name="project-path" value="commons-cli"/>
-            <param name="artifact-version" value="1.2"/>
+            <param name="artifact-version" value="${commons-cli.version}"/>
             <param name="artifact-name" value="commons-cli"/>
             <param name="artifact-type" value="jar"/>
         </antcall>
@@ -837,17 +879,16 @@ Use Apache Forrest version forrest-0.9-d
   
     <target name="download-slf4j">
         <mkdir dir="lib"/>
-        <property name="slf4j-version" value="1.7.7"/>
         <property name="slf4j-package" value="org/slf4j"/>
-        <antcall target="download-via-maven"><param name="project-path" value="${slf4j-package}"/><param name="artifact-version" value="${slf4j-version}"/><param name="target" value="lib"/>
+        <antcall target="download-via-maven"><param name="project-path" value="${slf4j-package}"/><param name="artifact-version" value="${slf4j.version}"/><param name="target" value="lib"/>
             <param name="artifact-name" value="slf4j-api"/>
             <param name="artifact-type" value="jar"/>
         </antcall>
-        <antcall target="download-via-maven"><param name="project-path" value="${slf4j-package}"/><param name="artifact-version" value="${slf4j-version}"/><param name="target" value="lib"/>
+        <antcall target="download-via-maven"><param name="project-path" value="${slf4j-package}"/><param name="artifact-version" value="${slf4j.version}"/><param name="target" value="lib"/>
             <param name="artifact-name" value="slf4j-simple"/>
             <param name="artifact-type" value="jar"/>
         </antcall>
-        <antcall target="download-via-maven"><param name="project-path" value="${slf4j-package}"/><param name="artifact-version" value="${slf4j-version}"/><param name="target" value="lib"/>
+        <antcall target="download-via-maven"><param name="project-path" value="${slf4j-package}"/><param name="artifact-version" value="${slf4j.version}"/><param name="target" value="lib"/>
             <param name="artifact-name" value="jcl-over-slf4j"/>
             <param name="artifact-type" value="jar"/>
         </antcall>
@@ -855,53 +896,52 @@ Use Apache Forrest version forrest-0.9-d
     
     <target name="download-jetty">
         <mkdir dir="lib"/>
-        <property name="jetty-version" value="7.5.4.v20111024"/>
         <property name="jetty-package" value="org/eclipse/jetty"/>
-        <antcall target="download-via-maven"><param name="project-path" value="${jetty-package}"/><param name="artifact-version" value="${jetty-version}"/><param name="target" value="lib"/>
+        <antcall target="download-via-maven"><param name="project-path" value="${jetty-package}"/><param name="artifact-version" value="${jetty.version}"/><param name="target" value="lib"/>
             <param name="artifact-name" value="jetty-jndi"/>
             <param name="artifact-type" value="jar"/>
         </antcall>
-        <antcall target="download-via-maven"><param name="project-path" value="${jetty-package}"/><param name="artifact-version" value="${jetty-version}"/><param name="target" value="lib"/>
+        <antcall target="download-via-maven"><param name="project-path" value="${jetty-package}"/><param name="artifact-version" value="${jetty.version}"/><param name="target" value="lib"/>
             <param name="artifact-name" value="jetty-server"/>
             <param name="artifact-type" value="jar"/>
         </antcall>
-        <antcall target="download-via-maven"><param name="project-path" value="${jetty-package}"/><param name="artifact-version" value="${jetty-version}"/><param name="target" value="lib"/>
+        <antcall target="download-via-maven"><param name="project-path" value="${jetty-package}"/><param name="artifact-version" value="${jetty.version}"/><param name="target" value="lib"/>
             <param name="artifact-name" value="jetty-webapp"/>
             <param name="artifact-type" value="jar"/>
         </antcall>
-        <antcall target="download-via-maven"><param name="project-path" value="${jetty-package}"/><param name="artifact-version" value="${jetty-version}"/><param name="target" value="lib"/>
+        <antcall target="download-via-maven"><param name="project-path" value="${jetty-package}"/><param name="artifact-version" value="${jetty.version}"/><param name="target" value="lib"/>
             <param name="artifact-name" value="jetty-servlet"/>
             <param name="artifact-type" value="jar"/>
         </antcall>
-        <antcall target="download-via-maven"><param name="project-path" value="${jetty-package}"/><param name="artifact-version" value="${jetty-version}"/><param name="target" value="lib"/>
+        <antcall target="download-via-maven"><param name="project-path" value="${jetty-package}"/><param name="artifact-version" value="${jetty.version}"/><param name="target" value="lib"/>
             <param name="artifact-name" value="jetty-plus"/>
             <param name="artifact-type" value="jar"/>
         </antcall>
-        <antcall target="download-via-maven"><param name="project-path" value="${jetty-package}"/><param name="artifact-version" value="${jetty-version}"/><param name="target" value="lib"/>
+        <antcall target="download-via-maven"><param name="project-path" value="${jetty-package}"/><param name="artifact-version" value="${jetty.version}"/><param name="target" value="lib"/>
             <param name="artifact-name" value="jetty-util"/>
             <param name="artifact-type" value="jar"/>
         </antcall>
-        <antcall target="download-via-maven"><param name="project-path" value="${jetty-package}"/><param name="artifact-version" value="${jetty-version}"/><param name="target" value="lib"/>
+        <antcall target="download-via-maven"><param name="project-path" value="${jetty-package}"/><param name="artifact-version" value="${jetty.version}"/><param name="target" value="lib"/>
             <param name="artifact-name" value="jetty-http"/>
             <param name="artifact-type" value="jar"/>
         </antcall>
-        <antcall target="download-via-maven"><param name="project-path" value="${jetty-package}"/><param name="artifact-version" value="${jetty-version}"/><param name="target" value="lib"/>
+        <antcall target="download-via-maven"><param name="project-path" value="${jetty-package}"/><param name="artifact-version" value="${jetty.version}"/><param name="target" value="lib"/>
             <param name="artifact-name" value="jetty-io"/>
             <param name="artifact-type" value="jar"/>
         </antcall>
-        <antcall target="download-via-maven"><param name="project-path" value="${jetty-package}"/><param name="artifact-version" value="${jetty-version}"/><param name="target" value="lib"/>
+        <antcall target="download-via-maven"><param name="project-path" value="${jetty-package}"/><param name="artifact-version" value="${jetty.version}"/><param name="target" value="lib"/>
             <param name="artifact-name" value="jetty-security"/>
             <param name="artifact-type" value="jar"/>
         </antcall>
-        <antcall target="download-via-maven"><param name="project-path" value="${jetty-package}"/><param name="artifact-version" value="${jetty-version}"/><param name="target" value="lib"/>
+        <antcall target="download-via-maven"><param name="project-path" value="${jetty-package}"/><param name="artifact-version" value="${jetty.version}"/><param name="target" value="lib"/>
             <param name="artifact-name" value="jetty-continuation"/>
             <param name="artifact-type" value="jar"/>
         </antcall>
-        <antcall target="download-via-maven"><param name="project-path" value="${jetty-package}"/><param name="artifact-version" value="${jetty-version}"/><param name="target" value="lib"/>
+        <antcall target="download-via-maven"><param name="project-path" value="${jetty-package}"/><param name="artifact-version" value="${jetty.version}"/><param name="target" value="lib"/>
             <param name="artifact-name" value="jetty-xml"/>
             <param name="artifact-type" value="jar"/>
         </antcall>
-        <antcall target="download-via-maven"><param name="project-path" value="${jetty-package}"/><param name="artifact-version" value="${jetty-version}"/><param name="target" value="lib"/>
+        <antcall target="download-via-maven"><param name="project-path" value="${jetty-package}"/><param name="artifact-version" value="${jetty.version}"/><param name="target" value="lib"/>
             <param name="artifact-name" value="jetty-jsp-2.1"/>
             <param name="artifact-type" value="jar"/>
         </antcall>
@@ -909,9 +949,8 @@ Use Apache Forrest version forrest-0.9-d
     
     <target name="download-xerces">
         <mkdir dir="lib"/>
-        <property name="xerces-version" value="2.10.0"/>
         <property name="xerces-package" value="xerces"/>
-        <antcall target="download-via-maven"><param name="project-path" value="${xerces-package}"/><param name="artifact-version" value="${xerces-version}"/><param name="target" value="lib"/>
+        <antcall target="download-via-maven"><param name="project-path" value="${xerces-package}"/><param name="artifact-version" value="${xerces.version}"/><param name="target" value="lib"/>
             <param name="artifact-name" value="xercesImpl"/>
             <param name="artifact-type" value="jar"/>
         </antcall>
@@ -919,23 +958,23 @@ Use Apache Forrest version forrest-0.9-d
     
     <target name="download-xalan">
         <mkdir dir="lib"/>
-        <property name="xalan-version" value="2.7.1"/>
         <property name="xalan-package" value="xalan"/>
-        <antcall target="download-via-maven"><param name="project-path" value="${xalan-package}"/><param name="artifact-version" value="${xalan-version}"/><param name="target" value="lib"/>
+        <antcall target="download-via-maven"><param name="project-path" value="${xalan-package}"/><param name="artifact-version" value="${xalan.version}"/><param name="target" value="lib"/>
             <param name="artifact-name" value="xalan"/>
             <param name="artifact-type" value="jar"/>
         </antcall>
-        <antcall target="download-via-maven"><param name="project-path" value="${xalan-package}"/><param name="artifact-version" value="${xalan-version}"/><param name="target" value="lib"/>
+        <antcall target="download-via-maven"><param name="project-path" value="${xalan-package}"/><param name="artifact-version" value="${xalan.version}"/><param name="target" value="lib"/>
             <param name="artifact-name" value="serializer"/>
             <param name="artifact-type" value="jar"/>
         </antcall>
     </target>
 
+    
     <target name="download-poi">
         <mkdir dir="lib"/>
         <antcall target="download-via-maven"><param name="target" value="lib"/>
             <param name="project-path" value="org/apache/poi"/>
-            <param name="artifact-version" value="3.11-beta2"/>
+            <param name="artifact-version" value="${poi.version}"/>
             <param name="artifact-name" value="poi"/>
             <param name="artifact-type" value="jar"/>
         </antcall>
@@ -945,7 +984,7 @@ Use Apache Forrest version forrest-0.9-d
         <mkdir dir="lib"/>
         <antcall target="download-via-maven"><param name="target" value="lib"/>
             <param name="project-path" value="javax/activation"/>
-            <param name="artifact-version" value="1.1.1"/>
+            <param name="artifact-version" value="${activation.version}"/>
             <param name="artifact-name" value="activation"/>
             <param name="artifact-type" value="jar"/>
         </antcall>
@@ -953,7 +992,6 @@ Use Apache Forrest version forrest-0.9-d
     
     <target name="download-avalon-framework">
         <property name="avalon.path" value="org/apache/avalon/framework"/>
-        <property name="avalon.version" value="4.3.1"/>
         <mkdir dir="lib"/>
         <antcall target="download-via-maven"><param name="target" value="lib"/><param name="project-path" value="${avalon.path}"/><param name="artifact-version" value="${avalon.version}"/>
             <param name="artifact-name" value="avalon-framework-api"/>
@@ -969,7 +1007,7 @@ Use Apache Forrest version forrest-0.9-d
         <mkdir dir="lib"/>
         <antcall target="download-via-maven"><param name="target" value="lib"/>
             <param name="project-path" value="org/eclipse/jdt/core/compiler"/>
-            <param name="artifact-version" value="4.3.1"/>
+            <param name="artifact-version" value="${ecj.version}"/>
             <param name="artifact-name" value="ecj"/>
             <param name="artifact-type" value="jar"/>
         </antcall>
@@ -979,7 +1017,7 @@ Use Apache Forrest version forrest-0.9-d
         <mkdir dir="lib"/>
         <antcall target="download-via-maven"><param name="target" value="lib"/>
             <param name="project-path" value="org/apache/xmlgraphics"/>
-            <param name="artifact-version" value="1.0"/>
+            <param name="artifact-version" value="${fop.version}"/>
             <param name="artifact-name" value="fop"/>
             <param name="artifact-type" value="jar"/>
         </antcall>
@@ -989,7 +1027,7 @@ Use Apache Forrest version forrest-0.9-d
         <mkdir dir="lib"/>
         <antcall target="download-via-maven"><param name="target" value="lib"/>
             <param name="project-path" value="org/apache/geronimo/specs"/>
-            <param name="artifact-version" value="1.7.1"/>
+            <param name="artifact-version" value="${javamail-spec.version}"/>
             <param name="artifact-name" value="geronimo-javamail_1.4_spec"/>
             <param name="artifact-type" value="jar"/>
         </antcall>
@@ -1009,18 +1047,17 @@ Use Apache Forrest version forrest-0.9-d
     
     <target name="download-tomcat">
         <mkdir dir="lib"/>
-        <property name="tomcat-version" value="6.0.35"/>
         <property name="tomcat-package" value="org/apache/tomcat"/>
         
-        <antcall target="download-via-maven"><param name="project-path" value="${tomcat-package}"/><param name="artifact-version" value="${tomcat-version}"/><param name="target" value="lib"/>
+        <antcall target="download-via-maven"><param name="project-path" value="${tomcat-package}"/><param name="artifact-version" value="${tomcat.version}"/><param name="target" value="lib"/>
             <param name="artifact-name" value="jasper"/>
             <param name="artifact-type" value="jar"/>
         </antcall>
-        <antcall target="download-via-maven"><param name="project-path" value="${tomcat-package}"/><param name="artifact-version" value="${tomcat-version}"/><param name="target" value="lib"/>
+        <antcall target="download-via-maven"><param name="project-path" value="${tomcat-package}"/><param name="artifact-version" value="${tomcat.version}"/><param name="target" value="lib"/>
             <param name="artifact-name" value="jasper-el"/>
             <param name="artifact-type" value="jar"/>
         </antcall>
-        <antcall target="download-via-maven"><param name="project-path" value="${tomcat-package}"/><param name="artifact-version" value="${tomcat-version}"/><param name="target" value="lib"/>
+        <antcall target="download-via-maven"><param name="project-path" value="${tomcat-package}"/><param name="artifact-version" value="${tomcat.version}"/><param name="target" value="lib"/>
             <param name="artifact-name" value="juli"/>
             <param name="artifact-type" value="jar"/>
         </antcall>
@@ -1030,13 +1067,13 @@ Use Apache Forrest version forrest-0.9-d
         <mkdir dir="lib"/>
         <antcall target="download-via-maven"><param name="target" value="lib"/>
             <param name="project-path" value="javax/xml/bind"/>
-            <param name="artifact-version" value="2.1"/>
+            <param name="artifact-version" value="${jaxb-api.version}"/>
             <param name="artifact-name" value="jaxb-api"/>
             <param name="artifact-type" value="jar"/>
         </antcall>
         <antcall target="download-via-maven"><param name="target" value="lib"/>
             <param name="project-path" value="com/sun/xml/bind"/>
-            <param name="artifact-version" value="2.1.11"/>
+            <param name="artifact-version" value="${jaxb-impl.version}"/>
             <param name="artifact-name" value="jaxb-impl"/>
             <param name="artifact-type" value="jar"/>
         </antcall>
@@ -1046,13 +1083,13 @@ Use Apache Forrest version forrest-0.9-d
         <mkdir dir="lib"/>
         <antcall target="download-via-maven"><param name="target" value="lib"/>
             <param name="project-path" value="javax/xml/ws"/>
-            <param name="artifact-version" value="2.2.6"/>
+            <param name="artifact-version" value="${jaxws.version}"/>
             <param name="artifact-name" value="jaxws-api"/>
             <param name="artifact-type" value="jar"/>
         </antcall>
         <antcall target="download-via-maven"><param name="target" value="lib"/>
             <param name="project-path" value="com/sun/xml/ws"/>
-            <param name="artifact-version" value="2.2.6"/>
+            <param name="artifact-version" value="${jaxws.version}"/>
             <param name="artifact-name" value="jaxws-rt"/>
             <param name="artifact-type" value="jar"/>
         </antcall>
@@ -1060,29 +1097,28 @@ Use Apache Forrest version forrest-0.9-d
     
     <target name="download-chemistry">
         <mkdir dir="lib"/>
-        <property name="chemistry-version" value="0.11.0"/>
         <property name="chemistry-package" value="org/apache/chemistry/opencmis"/>
-        <antcall target="download-via-maven"><param name="project-path" value="${chemistry-package}"/><param name="artifact-version" value="${chemistry-version}"/><param name="target" value="lib"/>
+        <antcall target="download-via-maven"><param name="project-path" value="${chemistry-package}"/><param name="artifact-version" value="${chemistry.version}"/><param name="target" value="lib"/>
             <param name="artifact-name" value="chemistry-opencmis-client-impl"/>
             <param name="artifact-type" value="jar"/>
         </antcall>
-        <antcall target="download-via-maven"><param name="project-path" value="${chemistry-package}"/><param name="artifact-version" value="${chemistry-version}"/><param name="target" value="lib"/>
+        <antcall target="download-via-maven"><param name="project-path" value="${chemistry-package}"/><param name="artifact-version" value="${chemistry.version}"/><param name="target" value="lib"/>
             <param name="artifact-name" value="chemistry-opencmis-client-api"/>
             <param name="artifact-type" value="jar"/>
         </antcall>
-        <antcall target="download-via-maven"><param name="project-path" value="${chemistry-package}"/><param name="artifact-version" value="${chemistry-version}"/><param name="target" value="lib"/>
+        <antcall target="download-via-maven"><param name="project-path" value="${chemistry-package}"/><param name="artifact-version" value="${chemistry.version}"/><param name="target" value="lib"/>
             <param name="artifact-name" value="chemistry-opencmis-client-bindings"/>
             <param name="artifact-type" value="jar"/>
         </antcall>
-        <antcall target="download-via-maven"><param name="project-path" value="${chemistry-package}"/><param name="artifact-version" value="${chemistry-version}"/><param name="target" value="lib"/>
+        <antcall target="download-via-maven"><param name="project-path" value="${chemistry-package}"/><param name="artifact-version" value="${chemistry.version}"/><param name="target" value="lib"/>
             <param name="artifact-name" value="chemistry-opencmis-commons-impl"/>
             <param name="artifact-type" value="jar"/>
         </antcall>
-        <antcall target="download-via-maven"><param name="project-path" value="${chemistry-package}"/><param name="artifact-version" value="${chemistry-version}"/><param name="target" value="lib"/>
+        <antcall target="download-via-maven"><param name="project-path" value="${chemistry-package}"/><param name="artifact-version" value="${chemistry.version}"/><param name="target" value="lib"/>
             <param name="artifact-name" value="chemistry-opencmis-commons-api"/>
             <param name="artifact-type" value="jar"/>
         </antcall>
-        <antcall target="download-via-maven"><param name="project-path" value="${chemistry-package}"/><param name="artifact-version" value="${chemistry-version}"/><param name="target" value="lib"/>
+        <antcall target="download-via-maven"><param name="project-path" value="${chemistry-package}"/><param name="artifact-version" value="${chemistry.version}"/><param name="target" value="lib"/>
             <param name="artifact-name" value="chemistry-opencmis-server-inmemory"/>
             <param name="artifact-type" value="war"/>
         </antcall>
@@ -1090,13 +1126,12 @@ Use Apache Forrest version forrest-0.9-d
 
     <target name="download-glassfish">
         <mkdir dir="lib"/>
-        <property name="glassfish-version" value="2.1.v20091210"/>
         <property name="glassfish-package" value="org/mortbay/jetty"/>
-        <antcall target="download-via-maven"><param name="project-path" value="${glassfish-package}"/><param name="artifact-version" value="${glassfish-version}"/><param name="target" value="lib"/>
+        <antcall target="download-via-maven"><param name="project-path" value="${glassfish-package}"/><param name="artifact-version" value="${glassfish.version}"/><param name="target" value="lib"/>
             <param name="artifact-name" value="jsp-2.1-glassfish"/>
             <param name="artifact-type" value="jar"/>
         </antcall>
-        <antcall target="download-via-maven"><param name="project-path" value="${glassfish-package}"/><param name="artifact-version" value="${glassfish-version}"/><param name="target" value="lib"/>
+        <antcall target="download-via-maven"><param name="project-path" value="${glassfish-package}"/><param name="artifact-version" value="${glassfish.version}"/><param name="target" value="lib"/>
             <param name="artifact-name" value="jsp-api-2.1-glassfish"/>
             <param name="artifact-type" value="jar"/>
         </antcall>
@@ -1106,7 +1141,7 @@ Use Apache Forrest version forrest-0.9-d
         <mkdir dir="lib"/>
         <antcall target="download-via-maven"><param name="target" value="lib"/>
             <param name="project-path" value="junit"/>
-            <param name="artifact-version" value="4.8.2"/>
+            <param name="artifact-version" value="${junit.version}"/>
             <param name="artifact-name" value="junit"/>
             <param name="artifact-type" value="jar"/>
         </antcall>
@@ -1116,7 +1151,7 @@ Use Apache Forrest version forrest-0.9-d
         <mkdir dir="lib"/>
         <antcall target="download-via-maven"><param name="target" value="lib"/>
             <param name="project-path" value="log4j"/>
-            <param name="artifact-version" value="1.2.16"/>
+            <param name="artifact-version" value="${log4j.version}"/>
             <param name="artifact-name" value="log4j"/>
             <param name="artifact-type" value="jar"/>
         </antcall>
@@ -1126,29 +1161,28 @@ Use Apache Forrest version forrest-0.9-d
         <mkdir dir="lib"/>
         <antcall target="download-via-maven"><param name="target" value="lib"/>
             <param name="project-path" value="javax/mail"/>
-            <param name="artifact-version" value="1.4.5"/>
+            <param name="artifact-version" value="${mail.version}"/>
             <param name="artifact-name" value="mail"/>
             <param name="artifact-type" value="jar"/>
         </antcall>
     </target>
     
+
     <target name="download-mimepull">
         <mkdir dir="lib"/>
         <antcall target="download-via-maven"><param name="target" value="lib"/>
             <param name="project-path" value="org/jvnet"/>
-            <param name="artifact-version" value="1.3"/>
+            <param name="artifact-version" value="${mimepull.version}"/>
             <param name="artifact-name" value="mimepull"/>
             <param name="artifact-type" value="jar"/>
         </antcall>
     </target>
     
     <target name="download-opensaml">
-        <!-- http://maven.alfresco.com/nexus/content/groups/public/opensaml/opensaml/1.1b/opensaml-1.1b.jar -->
-        <!-- This dependency is for alfresco, so we use the jar alfresco has -->
         <mkdir dir="lib"/>
         <antcall target="download-via-maven"><param name="target" value="lib"/>
             <param name="project-path" value="org/opensaml"/>
-            <param name="artifact-version" value="1.1"/>
+            <param name="artifact-version" value="${opensaml.version}"/>
             <param name="artifact-name" value="opensaml"/>
             <param name="artifact-type" value="jar"/>
         </antcall>
@@ -1158,7 +1192,7 @@ Use Apache Forrest version forrest-0.9-d
         <mkdir dir="lib"/>
         <antcall target="download-via-maven"><param name="target" value="lib"/>
             <param name="project-path" value="org/apache/felix"/>
-            <param name="artifact-version" value="1.0.0"/>
+            <param name="artifact-version" value="${osgi.version}"/>
             <param name="artifact-name" value="org.osgi.core"/>
             <param name="artifact-type" value="jar"/>
         </antcall>
@@ -1168,7 +1202,7 @@ Use Apache Forrest version forrest-0.9-d
         <mkdir dir="lib"/>
         <antcall target="download-via-maven"><param name="target" value="lib"/>
             <param name="project-path" value="xml-resolver"/>
-            <param name="artifact-version" value="1.2"/>
+            <param name="artifact-version" value="${xml-resolver.version}"/>
             <param name="artifact-name" value="xml-resolver"/>
             <param name="artifact-type" value="jar"/>
         </antcall>
@@ -1178,7 +1212,7 @@ Use Apache Forrest version forrest-0.9-d
         <mkdir dir="lib"/>
         <antcall target="download-via-maven"><param name="target" value="lib"/>
             <param name="project-path" value="org/mortbay/jetty"/>
-            <param name="artifact-version" value="2.5-20081211"/>
+            <param name="artifact-version" value="${servlet-api.version}"/>
             <param name="artifact-name" value="servlet-api"/>
             <param name="artifact-type" value="jar"/>
         </antcall>
@@ -1188,13 +1222,13 @@ Use Apache Forrest version forrest-0.9-d
         <mkdir dir="lib"/>
         <antcall target="download-via-maven"><param name="target" value="lib"/>
             <param name="project-path" value="stax"/>
-            <param name="artifact-version" value="1.0.1"/>
+            <param name="artifact-version" value="${stax-api.version}"/>
             <param name="artifact-name" value="stax-api"/>
             <param name="artifact-type" value="jar"/>
         </antcall>
         <antcall target="download-via-maven"><param name="target" value="lib"/>
             <param name="project-path" value="org/jvnet/staxex"/>
-            <param name="artifact-version" value="1.2"/>
+            <param name="artifact-version" value="${stax-ex.version}"/>
             <param name="artifact-name" value="stax-ex"/>
             <param name="artifact-type" value="jar"/>
         </antcall>
@@ -1204,7 +1238,7 @@ Use Apache Forrest version forrest-0.9-d
         <mkdir dir="lib"/>
         <antcall target="download-via-maven"><param name="target" value="lib"/>
             <param name="project-path" value="com/sun/xml/stream/buffer"/>
-            <param name="artifact-version" value="0.9"/>
+            <param name="artifact-version" value="${streambuffer.version}"/>
             <param name="artifact-name" value="streambuffer"/>
             <param name="artifact-type" value="jar"/>
         </antcall>
@@ -1214,7 +1248,7 @@ Use Apache Forrest version forrest-0.9-d
         <mkdir dir="lib"/>
         <antcall target="download-via-maven"><param name="target" value="lib"/>
             <param name="project-path" value="org/apache/velocity"/>
-            <param name="artifact-version" value="1.7"/>
+            <param name="artifact-version" value="${velocity.version}"/>
             <param name="artifact-name" value="velocity"/>
             <param name="artifact-type" value="jar"/>
         </antcall>
@@ -1224,7 +1258,7 @@ Use Apache Forrest version forrest-0.9-d
         <mkdir dir="lib"/>
         <antcall target="download-via-maven"><param name="target" value="lib"/>
             <param name="project-path" value="org/apache/ws/security"/>
-            <param name="artifact-version" value="1.5.12"/>
+            <param name="artifact-version" value="${wss4j.version}"/>
             <param name="artifact-name" value="wss4j"/>
             <param name="artifact-type" value="jar"/>
         </antcall>
@@ -1234,7 +1268,7 @@ Use Apache Forrest version forrest-0.9-d
         <mkdir dir="lib"/>
         <antcall target="download-via-maven"><param name="target" value="lib"/>
             <param name="project-path" value="org/apache/xmlgraphics"/>
-            <param name="artifact-version" value="1.4"/>
+            <param name="artifact-version" value="${xmlgraphics-commons.version}"/>
             <param name="artifact-name" value="xmlgraphics-commons"/>
             <param name="artifact-type" value="jar"/>
         </antcall>
@@ -1244,7 +1278,7 @@ Use Apache Forrest version forrest-0.9-d
         <mkdir dir="lib"/>
         <antcall target="download-via-maven"><param name="target" value="lib"/>
             <param name="project-path" value="org/codehaus/woodstox"/>
-            <param name="artifact-version" value="3.2.9"/>
+            <param name="artifact-version" value="${wstx-asl.version}"/>
             <param name="artifact-name" value="wstx-asl"/>
             <param name="artifact-type" value="jar"/>
         </antcall>
@@ -1255,7 +1289,7 @@ Use Apache Forrest version forrest-0.9-d
         <mkdir dir="lib"/>
         <antcall target="download-via-maven"><param name="target" value="lib"/>
             <param name="project-path" value="org/apache/santuario"/>
-            <param name="artifact-version" value="1.4.0"/>
+            <param name="artifact-version" value="${xmlsec.version}"/>
             <param name="artifact-name" value="xmlsec"/>
             <param name="artifact-type" value="jar"/>
         </antcall>
@@ -1266,7 +1300,7 @@ Use Apache Forrest version forrest-0.9-d
         <antcall target="download-via-maven">
             <param name="target" value="lib"/>
             <param name="project-path" value="xml-apis"/>
-            <param name="artifact-version" value="1.4.01"/>
+            <param name="artifact-version" value="${xml-apis.version}"/>
             <param name="artifact-name" value="xml-apis"/>
             <param name="artifact-type" value="jar"/>
         </antcall>
@@ -1275,11 +1309,10 @@ Use Apache Forrest version forrest-0.9-d
     <target name="download-jstl">
         <mkdir dir="lib"/>
         <property name="jstl-package" value="jstl"/>
-        <property name="jstl-version" value="1.2"/>
         <antcall target="download-via-maven">
             <param name="target" value="lib"/>
             <param name="project-path" value="${jstl-package}"/>
-            <param name="artifact-version" value="${jstl-version}"/>
+            <param name="artifact-version" value="${jstl.version}"/>
             <param name="artifact-name" value="jstl"/>
             <param name="artifact-type" value="jar"/>
         </antcall>
@@ -1301,14 +1334,14 @@ Use Apache Forrest version forrest-0.9-d
         <antcall target="download-via-maven">
             <param name="target" value="lib"/>
             <param name="project-path" value="org/syncloud"/>
-            <param name="artifact-version" value="1.5.3"/>
+            <param name="artifact-version" value="${dropbox-client.version}"/>
             <param name="artifact-name" value="dropbox-client"/>
             <param name="artifact-type" value="jar"/>
         </antcall>
         <antcall target="download-via-maven">
             <param name="target" value="lib"/>
             <param name="project-path" value="com/googlecode/json-simple"/>
-            <param name="artifact-version" value="1.1"/>
+            <param name="artifact-version" value="${json-simple.version}"/>
             <param name="artifact-name" value="json-simple"/>
             <param name="artifact-type" value="jar"/>
         </antcall>
@@ -1319,17 +1352,10 @@ Use Apache Forrest version forrest-0.9-d
         <antcall target="download-via-maven">
             <param name="target" value="lib"/>
             <param name="project-path" value="com/googlecode/json-simple"/>
-            <param name="artifact-version" value="1.1"/>
+            <param name="artifact-version" value="${json-simple.version}"/>
             <param name="artifact-name" value="json-simple"/>
             <param name="artifact-type" value="jar"/>
         </antcall>
-        <antcall target="download-via-maven">
-            <param name="target" value="lib"/>
-            <param name="project-path" value="commons-codec"/>
-            <param name="artifact-version" value="1.9"/>
-            <param name="artifact-name" value="commons-codec"/>
-            <param name="artifact-type" value="jar"/>
-        </antcall>
     </target>
 
    <target name="download-google-api-client">
@@ -1337,42 +1363,42 @@ Use Apache Forrest version forrest-0.9-d
         <antcall target="download-via-maven">
             <param name="target" value="lib"/>
             <param name="project-path" value="com/google/apis"/>
-            <param name="artifact-version" value="v2-rev136-1.19.0"/>
+            <param name="artifact-version" value="${google-api-client.version}"/>
             <param name="artifact-name" value="google-api-services-drive"/>
             <param name="artifact-type" value="jar"/>
         </antcall>
         <antcall target="download-via-maven">
             <param name="target" value="lib"/>
             <param name="project-path" value="com/google/http-client"/>
-            <param name="artifact-version" value="1.19.0"/>
+            <param name="artifact-version" value="${google-http-client.version}"/>
             <param name="artifact-name" value="google-http-client"/>
             <param name="artifact-type" value="jar"/>
         </antcall>
         <antcall target="download-via-maven">
             <param name="target" value="lib"/>
             <param name="project-path" value="com/google/http-client"/>
-            <param name="artifact-version" value="1.19.0"/>
+            <param name="artifact-version" value="${google-http-client.version}"/>
             <param name="artifact-name" value="google-http-client-jackson2"/>
             <param name="artifact-type" value="jar"/>
         </antcall>
         <antcall target="download-via-maven">
             <param name="target" value="lib"/>
             <param name="project-path" value="com/google/oauth-client"/>
-            <param name="artifact-version" value="1.19.0"/>
+            <param name="artifact-version" value="${google-http-client.version}"/>
             <param name="artifact-name" value="google-oauth-client"/>
             <param name="artifact-type" value="jar"/>
         </antcall>
         <antcall target="download-via-maven">
             <param name="target" value="lib"/>
             <param name="project-path" value="com/fasterxml/jackson/core/"/>
-            <param name="artifact-version" value="2.1.3"/>
+            <param name="artifact-version" value="${jackson-core.version}"/>
             <param name="artifact-name" value="jackson-core"/>
             <param name="artifact-type" value="jar"/>
         </antcall> 
         <antcall target="download-via-maven">
             <param name="target" value="lib"/>
             <param name="project-path" value="com/google/api-client"/>
-            <param name="artifact-version" value="1.19.0"/>
+            <param name="artifact-version" value="${google-http-client.version}"/>
             <param name="artifact-name" value="google-api-client"/>
             <param name="artifact-type" value="jar"/>
         </antcall>
@@ -1498,7 +1524,7 @@ Use Apache Forrest version forrest-0.9-d
         <antcall target="download-via-maven">
             <param name="target" value="lib"/>
             <param name="project-path" value="org/apache/zookeeper"/>
-            <param name="artifact-version" value="3.4.6"/>
+            <param name="artifact-version" value="${zookeeper.version}"/>
             <param name="artifact-name" value="zookeeper"/>
             <param name="artifact-type" value="jar"/>
         </antcall>

Modified: manifoldcf/trunk/connectors/alfresco/build.xml
URL: http://svn.apache.org/viewvc/manifoldcf/trunk/connectors/alfresco/build.xml?rev=1628066&r1=1628065&r2=1628066&view=diff
==============================================================================
--- manifoldcf/trunk/connectors/alfresco/build.xml (original)
+++ manifoldcf/trunk/connectors/alfresco/build.xml Sun Sep 28 11:49:15 2014
@@ -30,8 +30,10 @@
 
     <import file="${mcf-dist}/connector-build.xml"/>
   
+    <property name="alfresco-client.version" value="4.2.c"/>
+    
     <target name="calculate-condition">
-        <available file="lib-proprietary/alfresco-web-service-client-4.2.c.jar" property="alfrescoStatus"/>
+        <available file="lib-proprietary/alfresco-web-service-client-${alfresco-client.version}.jar" property="alfrescoStatus"/>
         <condition property="build-present">
             <isset property="alfrescoStatus"/>
         </condition>
@@ -45,7 +47,7 @@
     </target>
 
     <target name="precompile-warn" depends="calculate-condition" unless="build-present">
-        <echo message="Alfresco Connector cannot be built without alfresco-web-service-client-4.2.c.jar"/>
+        <echo message="Alfresco Connector cannot be built without alfresco-web-service-client-${alfresco-client.version}.jar"/>
     </target>
 
     <target name="pretest-warn" depends="calculate-testcode-condition" unless="tests-present">
@@ -82,7 +84,7 @@
     </target>
 
     <target name="download-alfresco-ws-client">
-      <get src="https://artifacts.alfresco.com/nexus/service/local/repositories/releases/content/org/alfresco/alfresco-web-service-client/4.2.c/alfresco-web-service-client-4.2.c.jar" dest="lib-proprietary"/>
+      <get src="https://artifacts.alfresco.com/nexus/service/local/repositories/releases/content/org/alfresco/alfresco-web-service-client/${alfresco-client.version}/alfresco-web-service-client-${alfresco-client.version}.jar" dest="lib-proprietary"/>
     </target>
 	
     <target name="download-dependencies" depends="download-alfresco-ws-client"/>

Modified: manifoldcf/trunk/connectors/cmis/build.xml
URL: http://svn.apache.org/viewvc/manifoldcf/trunk/connectors/cmis/build.xml?rev=1628066&r1=1628065&r2=1628066&view=diff
==============================================================================
--- manifoldcf/trunk/connectors/cmis/build.xml (original)
+++ manifoldcf/trunk/connectors/cmis/build.xml Sun Sep 28 11:49:15 2014
@@ -30,6 +30,8 @@
 
     <import file="${mcf-dist}/connector-build.xml"/>
     
+    <property name="cmis.version" value="0.11.0"/>
+    
     <path id="connector-classpath">
         <path refid="mcf-connector-build.connector-classpath"/>
         <fileset dir="../../lib">
@@ -74,4 +76,33 @@
         </antcall>
     </target>
 
+    <!-- Note: We need to fix the war path; it refers directly to the lib directory.
+         Instead, we need to have each connector be responsible for downloading its test materials,
+         so that the main framework dist does not need to include it.  MHL -->
+    <target name="run-IT-HSQLDB" depends="compile-tests,pretest-check" if="canTest">
+        <mkdir dir="test-HSQLDB-output"/>
+        <junit fork="true" maxmemory="256m" dir="test-HSQLDB-output" outputtoformatters="true" showoutput="true" haltonfailure="true">
+            <jvmarg value="-DcrawlerWarPath=${mcf-dist}/web/war/mcf-crawler-ui.war"/>
+            <jvmarg value="-DauthorityserviceWarPath=${mcf-dist}/web/war/mcf-authority-service.war"/>
+            <jvmarg value="-DapiWarPath=${mcf-dist}/web/war/mcf-api-service.war"/>
+            <jvmarg value="-DcombinedWarPath=${mcf-dist}/web/war/mcf-combined-service.war"/>
+            <jvmarg value="-DopenCmisServerWarPath=../../../lib/chemistry-opencmis-server-inmemory-${cmis.version}.war"/>
+            <jvmarg value="-Xms128m"/>
+            <jvmarg value="-Xmx256m"/>
+            <classpath>
+                <fileset dir="${env.JAVA_HOME}/lib">
+                    <include name="tools.jar"/>
+                </fileset>
+                <path refid="connector-test-classpath"/>
+                <pathelement location="build/connector-tests/classes"/>
+            </classpath>
+            <formatter type="brief" usefile="false"/>
+            <batchtest todir="test-HSQLDB-output">
+                <fileset dir="build/connector-tests/classes">
+                    <include name="**/*HSQLDBIT.class"/>
+                </fileset>
+            </batchtest>
+        </junit>
+    </target>
+
 </project>

Modified: manifoldcf/trunk/connectors/elasticsearch/build.xml
URL: http://svn.apache.org/viewvc/manifoldcf/trunk/connectors/elasticsearch/build.xml?rev=1628066&r1=1628065&r2=1628066&view=diff
==============================================================================
--- manifoldcf/trunk/connectors/elasticsearch/build.xml (original)
+++ manifoldcf/trunk/connectors/elasticsearch/build.xml Sun Sep 28 11:49:15 2014
@@ -30,28 +30,30 @@
 
     <import file="${mcf-dist}/connector-build.xml"/>
 
+    <property name="elasticsearch.version" value="1.0.1"/>
+
     <target name="download-dependencies">
         
         <mkdir dir="build/download"/>
-        <get src="http://download.elasticsearch.org/elasticsearch/elasticsearch/elasticsearch-1.0.1.tar.gz" 
+        <get src="http://download.elasticsearch.org/elasticsearch/elasticsearch/elasticsearch-${elasticsearch.version}.tar.gz" 
             dest="build/download/elasticsearch.tar.gz"/>
         <gunzip src="build/download/elasticsearch.tar.gz"/>
         <untar src="build/download/elasticsearch.tar" dest="test-materials-proprietary"/>
         
         <!-- download and install the attachment plugin -->
-        <mkdir dir="test-materials-proprietary/elasticsearch-1.0.1/plugins"/>
+        <mkdir dir="test-materials-proprietary/elasticsearch-${elasticsearch.version}/plugins"/>
         
         <get src="https://github.com/elasticsearch/elasticsearch-mapper-attachments/archive/v2.0.0.RC1.zip" 
-            dest="test-materials-proprietary/elasticsearch-1.0.1/plugins/mapper-attachments.zip"/>
+            dest="test-materials-proprietary/elasticsearch-${elasticsearch.version}/plugins/mapper-attachments.zip"/>
         
-        <unzip src="test-materials-proprietary/elasticsearch-1.0.1/plugins/mapper-attachments.zip" dest="test-materials-proprietary/elasticsearch-1.0.1/plugins/mapper-attachments"/>
+        <unzip src="test-materials-proprietary/elasticsearch-${elasticsearch.version}/plugins/mapper-attachments.zip" dest="test-materials-proprietary/elasticsearch-${elasticsearch.version}/plugins/mapper-attachments"/>
 
-        <chmod dir="test-materials-proprietary/elasticsearch-1.0.1" perm="ugo+rxw">
+        <chmod dir="test-materials-proprietary/elasticsearch-${elasticsearch.version}" perm="ugo+rxw">
             <fileset dir="**/*"/>
         </chmod>
-        <chmod file="test-materials-proprietary/elasticsearch-1.0.1/bin/plugin" perm="ugo+rx"/>
-        <chmod file="test-materials-proprietary/elasticsearch-1.0.1/bin/elasticsearch" perm="ugo+rx"/>
-        <chmod file="test-materials-proprietary/elasticsearch-1.0.1/bin/elasticsearch.in.sh" perm="ugo+rx"/>
+        <chmod file="test-materials-proprietary/elasticsearch-${elasticsearch.version}/bin/plugin" perm="ugo+rx"/>
+        <chmod file="test-materials-proprietary/elasticsearch-${elasticsearch.version}/bin/elasticsearch" perm="ugo+rx"/>
+        <chmod file="test-materials-proprietary/elasticsearch-${elasticsearch.version}/bin/elasticsearch.in.sh" perm="ugo+rx"/>
       
     </target>
 
@@ -69,7 +71,7 @@
     </target>
 
     <target name="calculate-testcode-condition">
-        <available file="test-materials-proprietary/elasticsearch-1.0.1" property="tests-present"/>
+        <available file="test-materials-proprietary/elasticsearch-${elasticsearch.version}" property="tests-present"/>
     </target>
 
     <target name="pretest-warn" depends="calculate-testcode-condition" unless="tests-present">
@@ -78,7 +80,7 @@
 
     <path id="connector-test-classpath">
         <path refid="mcf-connector-build.connector-test-classpath"/>
-        <fileset dir="test-materials-proprietary/elasticsearch-1.0.1">
+        <fileset dir="test-materials-proprietary/elasticsearch-${elasticsearch.version}">
             <include name="lib/*.jar"/>
         	  <include name="plugins/mapper-attachments/*.jar"/>
         </fileset>

Modified: manifoldcf/trunk/connectors/jcifs/build.xml
URL: http://svn.apache.org/viewvc/manifoldcf/trunk/connectors/jcifs/build.xml?rev=1628066&r1=1628065&r2=1628066&view=diff
==============================================================================
--- manifoldcf/trunk/connectors/jcifs/build.xml (original)
+++ manifoldcf/trunk/connectors/jcifs/build.xml Sun Sep 28 11:49:15 2014
@@ -30,8 +30,10 @@
 
     <import file="${mcf-dist}/connector-build.xml"/>
 
+    <property name="jcifs.version" value="1.3.17"/>
+    
     <target name="calculate-condition">
-        <available file="lib-proprietary/jcifs.jar" property="jcifsStatus"/>
+        <available file="lib-proprietary/jcifs-${jcifs.version}.jar" property="jcifsStatus"/>
         <condition property="build-present">
             <isset property="jcifsStatus"/>
         </condition>
@@ -54,10 +56,9 @@
     </target>
 
     <target name="download-jcifs">
-        <property name="jcifs-version" value="1.3.17"/>
         <antcall target="download-via-maven">
             <param name="project-path" value="jcifs"/>
-            <param name="artifact-version" value="${jcifs-version}"/>
+            <param name="artifact-version" value="${jcifs.version}"/>
             <param name="target" value="lib-proprietary"/>
             <param name="artifact-name" value="jcifs"/>
             <param name="artifact-type" value="jar"/>

Modified: manifoldcf/trunk/framework/build.xml
URL: http://svn.apache.org/viewvc/manifoldcf/trunk/framework/build.xml?rev=1628066&r1=1628065&r2=1628066&view=diff
==============================================================================
--- manifoldcf/trunk/framework/build.xml (original)
+++ manifoldcf/trunk/framework/build.xml Sun Sep 28 11:49:15 2014
@@ -1044,229 +1044,201 @@
         </copy>
     </target>
 
-    <target name="jetty-lib" depends="lib">
-        <mkdir dir="build/lib/jetty"/>
-        <copy todir="build/lib/jetty">
-            <fileset dir="../lib">
-                <include name="jetty*.jar"/>
-            </fileset>
-        </copy>
-    </target>
-    
-    <target name="database-lib" depends="lib">
-        <mkdir dir="build/lib/database"/>
-        <copy todir="build/lib/database">
-            <fileset dir="../lib">
-                <include name="hsqldb*.jar"/>
-                <include name="postgresql*.jar"/>
-            </fileset>
-        </copy>
-    </target>
+    <!-- Paths, as used to construct script classpaths -->
     
-    <target name="hsqldb-lib" depends="lib">
-        <mkdir dir="build/lib/hsqldb"/>
-        <copy todir="build/lib/hsqldb">
-            <fileset dir="../lib">
-                <include name="hsqldb*.jar"/>
-            </fileset>
-        </copy>
-    </target>
-
-    <target name="zookeeper-lib" depends="lib">
-        <mkdir dir="build/lib/zookeeper"/>
-        <copy todir="build/lib/zookeeper">
-            <fileset dir="../lib">
-                <include name="zookeeper*.jar"/>
-                <include name="slf4j-api*.jar"/>
-                <include name="slf4j-simple*.jar"/>
-                <include name="log4j*.jar"/>
-            </fileset>
-        </copy>
-    </target>
-
-    <target name="process-lib" depends="lib">
-        <mkdir dir="build/lib/process"/>
-        <copy todir="build/lib/process">
-            <fileset dir="../lib">
-                <include name="commons-lang*.jar"/>
-                <include name="commons-codec*.jar"/>
-                <include name="commons-collections*.jar"/>
-                <include name="commons-el*.jar"/>
-                <include name="commons-fileupload*.jar"/>
-                <include name="commons-io*.jar"/>
-                <include name="commons-logging*.jar"/>
-                <include name="commons-discovery*.jar"/>
-                <include name="jasper*.jar"/>
-                <include name="jsp-api-2.1-glassfish*.jar"/>
-                <include name="json*.jar"/>
-                <include name="log4j*.jar"/>
-                <include name="serializer*.jar"/>
-                <include name="servlet-api*.jar"/>
-                <include name="juli*.jar"/>
-                <include name="xalan*.jar"/>
-                <include name="xercesImpl*.jar"/>
-                <include name="xml-apis*.jar"/>
-                <include name="ecj*.jar"/>
-                <include name="velocity*.jar"/>
-                <include name="slf4j-api*.jar"/>
-                <include name="slf4j-simple*.jar"/>
-                <include name="httpcore*.jar"/>
-                <include name="httpclient*.jar"/>
-                <include name="mail*.jar"/>
-                <include name="zookeeper*.jar"/>
-                <include name="castor*.jar"/>
-                <include name="geronimo-javamail_1.4_spec*.jar"/>
-                <include name="axis*.jar"/>
-                <include name="wsdl4j*.jar"/>
-                <include name="saaj-api*.jar"/>
-                <include name="saaj-impl*.jar"/>
-                <include name="activation*.jar"/>
-                <include name="wss4j*.jar"/>
-                <include name="xmlsec*.jar"/>
-                <include name="opensaml*.jar"/>
-            </fileset>
-        </copy>
-    </target>
-
-    <target name="process-lib-proprietary" depends="lib-proprietary">
-        <mkdir dir="build/lib-proprietary/process"/>
-        <copy todir="build/lib-proprietary/process">
-            <fileset dir="../lib-proprietary">
-                <include name="mysql-connector-java*.jar"/>
-                <include name="ojdbc*.jar"/>
-                <include name="jtds*.jar"/>
-            </fileset>
-        </copy>
-    </target>
-
-    <target name="engine-lib" depends="lib">
-        <mkdir dir="build/lib/engine"/>
-        <copy todir="build/lib/engine">
-            <fileset dir="../lib">
-                <include name="commons-lang*.jar"/>
-                <include name="commons-codec*.jar"/>
-                <include name="commons-collections*.jar"/>
-                <include name="commons-io*.jar"/>
-                <include name="commons-logging*.jar"/>
-                <include name="json*.jar"/>
-                <include name="httpcore*.jar"/>
-                <include name="httpclient*.jar"/>
-            </fileset>
-        </copy>
-    </target>
-
-    <target name="jetty-lib-classpath" depends="jetty-lib">
-        <property name="jetty-lib-classpath" location="build/lib/jetty"/>
-        <pathconvert property="jetty-lib-classpath-win" dirsep="\" pathsep=";">
-            <path>
-                <fileset dir="${jetty-lib-classpath}" includes="*.jar"/>
-            </path>
+    <path id="jetty-lib">
+        <fileset dir="../lib">
+            <include name="jetty*.jar"/>
+        </fileset>
+    </path>
+    
+    <path id="database-lib">
+        <fileset dir="../lib">
+            <include name="hsqldb*.jar"/>
+            <include name="postgresql*.jar"/>
+        </fileset>
+    </path>
+    
+    <path id="hsqldb-lib">
+        <fileset dir="../lib">
+            <include name="hsqldb*.jar"/>
+        </fileset>
+    </path>
+    
+    <path id="zookeeper-lib">
+        <fileset dir="../lib">
+            <include name="zookeeper*.jar"/>
+            <include name="slf4j-api*.jar"/>
+            <include name="slf4j-simple*.jar"/>
+            <include name="log4j*.jar"/>
+        </fileset>
+    </path>
+    
+    <path id="process-lib">
+        <fileset dir="../lib">
+            <include name="commons-lang*.jar"/>
+            <include name="commons-codec*.jar"/>
+            <include name="commons-collections*.jar"/>
+            <include name="commons-el*.jar"/>
+            <include name="commons-fileupload*.jar"/>
+            <include name="commons-io*.jar"/>
+            <include name="commons-logging*.jar"/>
+            <include name="commons-discovery*.jar"/>
+            <include name="jasper*.jar"/>
+            <include name="jsp-api-2.1-glassfish*.jar"/>
+            <include name="json*.jar"/>
+            <include name="log4j*.jar"/>
+            <include name="serializer*.jar"/>
+            <include name="servlet-api*.jar"/>
+            <include name="juli*.jar"/>
+            <include name="xalan*.jar"/>
+            <include name="xercesImpl*.jar"/>
+            <include name="xml-apis*.jar"/>
+            <include name="ecj*.jar"/>
+            <include name="velocity*.jar"/>
+            <include name="slf4j-api*.jar"/>
+            <include name="slf4j-simple*.jar"/>
+            <include name="httpcore*.jar"/>
+            <include name="httpclient*.jar"/>
+            <include name="mail*.jar"/>
+            <include name="zookeeper*.jar"/>
+            <include name="castor*.jar"/>
+            <include name="geronimo-javamail_1.4_spec*.jar"/>
+            <include name="axis*.jar"/>
+            <include name="wsdl4j*.jar"/>
+            <include name="saaj-api*.jar"/>
+            <include name="saaj-impl*.jar"/>
+            <include name="activation*.jar"/>
+            <include name="wss4j*.jar"/>
+            <include name="xmlsec*.jar"/>
+            <include name="opensaml*.jar"/>
+        </fileset>
+    </path>
+    
+    <path id="process-lib-proprietary">
+        <fileset dir="../lib-proprietary">
+            <include name="mysql-connector-java*.jar"/>
+            <include name="ojdbc*.jar"/>
+            <include name="jtds*.jar"/>
+        </fileset>
+    </path>
+    
+    <path id="engine-lib">
+        <fileset dir="../lib">
+            <include name="commons-lang*.jar"/>
+            <include name="commons-codec*.jar"/>
+            <include name="commons-collections*.jar"/>
+            <include name="commons-io*.jar"/>
+            <include name="commons-logging*.jar"/>
+            <include name="json*.jar"/>
+            <include name="httpcore*.jar"/>
+            <include name="httpclient*.jar"/>
+        </fileset>
+    </path>
+    
+    <!-- Classpaths -->
+    
+    <target name="jetty-lib-classpath" depends="lib">
+        <property name="jetty-lib-classpath" location="../lib"/>
+        <pathconvert property="jetty-lib-classpath-win" refid="jetty-lib" dirsep="\" pathsep=";">
             <map from="${jetty-lib-classpath}" to="..\lib"/>
         </pathconvert>
-        <pathconvert property="jetty-lib-classpath-unix" dirsep="/" pathsep=":">
-            <path>
-                <fileset dir="${jetty-lib-classpath}" includes="*.jar"/>
-            </path>
+        <pathconvert property="jetty-lib-classpath-unix" refid="jetty-lib" dirsep="/" pathsep=":">
             <map from="${jetty-lib-classpath}" to="../lib"/>
         </pathconvert>
     </target>
 
-    <target name="hsqldb-lib-classpath" depends="hsqldb-lib">
-        <property name="hsqldb-lib-classpath" location="build/lib/hsqldb"/>
-        <pathconvert property="hsqldb-lib-classpath-win" dirsep="\" pathsep=";">
-            <path>
-                <fileset dir="${hsqldb-lib-classpath}" includes="*.jar"/>
-            </path>
+    <target name="hsqldb-lib-classpath" depends="lib">
+        <property name="hsqldb-lib-classpath" location="../lib"/>
+        <pathconvert property="hsqldb-lib-classpath-win" refid="hsqldb-lib" dirsep="\" pathsep=";">
             <map from="${hsqldb-lib-classpath}" to="..\lib"/>
         </pathconvert>
-        <pathconvert property="hsqldb-lib-classpath-unix" dirsep="/" pathsep=":">
-            <path>
-                <fileset dir="${hsqldb-lib-classpath}" includes="*.jar"/>
-            </path>
+        <pathconvert property="hsqldb-lib-classpath-unix" refid="hsqldb-lib" dirsep="/" pathsep=":">
             <map from="${hsqldb-lib-classpath}" to="../lib"/>
         </pathconvert>
     </target>
 
-    <target name="zookeeper-lib-classpath" depends="zookeeper-lib">
-        <property name="zookeeper-lib-classpath" location="build/lib/zookeeper"/>
-        <pathconvert property="zookeeper-lib-classpath-win" dirsep="\" pathsep=";">
-            <path>
-                <fileset dir="${zookeeper-lib-classpath}" includes="*.jar"/>
-            </path>
+    <target name="zookeeper-lib-classpath" depends="lib">
+        <property name="zookeeper-lib-classpath" location="../lib"/>
+        <pathconvert property="zookeeper-lib-classpath-win" refid="zookeeper-lib" dirsep="\" pathsep=";">
             <map from="${zookeeper-lib-classpath}" to="..\lib"/>
         </pathconvert>
-        <pathconvert property="zookeeper-lib-classpath-unix" dirsep="/" pathsep=":">
-            <path>
-                <fileset dir="${zookeeper-lib-classpath}" includes="*.jar"/>
-            </path>
+        <pathconvert property="zookeeper-lib-classpath-unix" refid="zookeeper-lib" dirsep="/" pathsep=":">
             <map from="${zookeeper-lib-classpath}" to="../lib"/>
         </pathconvert>
     </target>
 
-    <target name="database-lib-classpath" depends="database-lib">
-        <property name="database-lib-classpath" location="build/lib/database"/>
-        <pathconvert property="database-lib-classpath-win" dirsep="\" pathsep=";">
-            <path>
-                <fileset dir="${database-lib-classpath}" includes="*.jar"/>
-            </path>
+    <target name="database-lib-classpath" depends="lib">
+        <property name="database-lib-classpath" location="../lib"/>
+        <pathconvert property="database-lib-classpath-win" refid="database-lib" dirsep="\" pathsep=";">
             <map from="${database-lib-classpath}" to="..\lib"/>
         </pathconvert>
-        <pathconvert property="database-lib-classpath-unix" dirsep="/" pathsep=":">
-            <path>
-                <fileset dir="${database-lib-classpath}" includes="*.jar"/>
-            </path>
+        <pathconvert property="database-lib-classpath-unix" refid="database-lib" dirsep="/" pathsep=":">
             <map from="${database-lib-classpath}" to="../lib"/>
         </pathconvert>
     </target>
 
-    <target name="process-lib-classpath" depends="process-lib">
-        <property name="process-lib-classpath" location="build/lib/process"/>
-        <pathconvert property="process-lib-classpath-win" dirsep="\" pathsep=";">
-            <path>
-                <fileset dir="${process-lib-classpath}" includes="*.jar"/>
-            </path>
+    <target name="process-lib-classpath" depends="lib">
+        <property name="process-lib-classpath" location="../lib"/>
+        <pathconvert property="process-lib-classpath-win" refid="process-lib" dirsep="\" pathsep=";">
             <map from="${process-lib-classpath}" to="..\lib"/>
         </pathconvert>
-        <pathconvert property="process-lib-classpath-unix" dirsep="/" pathsep=":">
-            <path>
-                <fileset dir="${process-lib-classpath}" includes="*.jar"/>
-            </path>
+        <pathconvert property="process-lib-classpath-unix" refid="process-lib" dirsep="/" pathsep=":">
             <map from="${process-lib-classpath}" to="../lib"/>
         </pathconvert>
     </target>
 
-    <target name="process-lib-proprietary-classpath" depends="process-lib-proprietary">
-        <property name="process-lib-proprietary-classpath" location="build/lib-proprietary/process"/>
-        <pathconvert property="process-lib-proprietary-classpath-win" dirsep="\" pathsep=";">
-            <path>
-                <fileset dir="${process-lib-proprietary-classpath}" includes="*.jar"/>
-            </path>
+    <target name="process-lib-proprietary-classpath" depends="lib-proprietary">
+        <property name="process-lib-proprietary-classpath" location="../lib-proprietary"/>
+        <pathconvert property="process-lib-proprietary-classpath-win" refid="process-lib-proprietary" dirsep="\" pathsep=";">
             <map from="${process-lib-proprietary-classpath}" to="..\lib"/>
         </pathconvert>
-        <pathconvert property="process-lib-proprietary-classpath-unix" dirsep="/" pathsep=":">
-            <path>
-                <fileset dir="${process-lib-proprietary-classpath}" includes="*.jar"/>
-            </path>
+        <pathconvert property="process-lib-proprietary-classpath-unix" refid="process-lib-proprietary" dirsep="/" pathsep=":">
             <map from="${process-lib-proprietary-classpath}" to="../lib"/>
         </pathconvert>
     </target>
 
-    <target name="engine-lib-classpath" depends="engine-lib">
-        <property name="engine-lib-classpath" location="build/lib/engine"/>
-        <pathconvert property="engine-lib-classpath-win" dirsep="\" pathsep=";">
-            <path>
-                <fileset dir="${engine-lib-classpath}" includes="*.jar"/>
-            </path>
+    <target name="engine-lib-classpath" depends="lib">
+        <property name="engine-lib-classpath" location="../lib"/>
+        <pathconvert property="engine-lib-classpath-win" refid="engine-lib" dirsep="\" pathsep=";">
             <map from="${engine-lib-classpath}" to="..\lib"/>
         </pathconvert>
-        <pathconvert property="engine-lib-classpath-unix" dirsep="/" pathsep=":">
-            <path>
-                <fileset dir="${engine-lib-classpath}" includes="*.jar"/>
-            </path>
+        <pathconvert property="engine-lib-classpath-unix" refid="engine-lib" dirsep="/" pathsep=":">
             <map from="${engine-lib-classpath}" to="../lib"/>
         </pathconvert>
     </target>
 
+    <target name="jetty-lib-manifest" depends="lib">
+        <property name="jetty-lib-manifest" location="../lib"/>
+        <pathconvert property="jetty-manifest-cp" refid="jetty-lib" dirsep="/" pathsep=" ">
+            <map from="${jetty-lib-manifest}" to="../lib"/>
+        </pathconvert>
+    </target>
+
+    <target name="database-lib-manifest" depends="lib">
+        <property name="database-lib-manifest" location="../lib"/>
+        <pathconvert property="database-manifest-cp" refid="database-lib" dirsep="/" pathsep=" ">
+            <map from="${database-lib-manifest}" to="../lib"/>
+        </pathconvert>
+    </target>
+
+    <target name="process-lib-manifest" depends="lib">
+        <property name="process-lib-manifest" location="../lib"/>
+        <pathconvert property="process-manifest-cp" refid="process-lib" dirsep="/" pathsep=" ">
+            <map from="${process-lib-manifest}" to="../lib"/>
+        </pathconvert>
+    </target>
+
+    <target name="process-lib-proprietary-manifest" depends="lib-proprietary">
+        <property name="process-manifest-proprietary" location="../lib-proprietary" />
+        <pathconvert property="process-manifest-cp-proprietary" refid="process-lib-proprietary" dirsep="/" pathsep=" ">
+            <map from="${process-manifest-proprietary}" to="../lib-proprietary"/>
+        </pathconvert>
+    </target>
+
+
+    <!-- Apply classpaths to various scripts -->
+    
     <target name="setup-engine-processes" depends="preclean-engine-processes,scripts-engine,engine-lib-classpath">
         <antcall target="general-set-engine-classpath">
             <param name="processes-dir" value="${processes-dir}"/>
@@ -1335,6 +1307,8 @@
         </antcall>
     </target>
 
+    <!-- Set up example directories -->
+    
     <target name="example-common" depends="wars,wars-proprietary">
         <copy file="example-common/connectors.xml" tofile="dist/connectors.xml"/>
         <copy file="example-common/connectors.xml" tofile="dist/connectors-proprietary.xml"/>
@@ -1497,46 +1471,6 @@
         <chmod dir="dist/script-engine" perm="a+x" includes="**/*.sh"/>
     </target>
     
-    <target name="jetty-lib-manifest" depends="jetty-lib">
-        <property name="jetty-lib-manifest" location="build/lib/jetty"/>
-        <pathconvert property="jetty-manifest-cp" dirsep="/" pathsep=" ">
-            <path>
-                <fileset dir="${jetty-lib-manifest}" includes="*.jar"/>
-            </path>
-            <map from="${jetty-lib-manifest}" to="../lib"/>
-        </pathconvert>
-    </target>
-
-    <target name="database-lib-manifest" depends="database-lib">
-        <property name="database-lib-manifest" location="build/lib/database"/>
-        <pathconvert property="database-manifest-cp" dirsep="/" pathsep=" ">
-            <path>
-                <fileset dir="${database-lib-manifest}" includes="*.jar"/>
-            </path>
-            <map from="${database-lib-manifest}" to="../lib"/>
-        </pathconvert>
-    </target>
-
-    <target name="process-lib-manifest" depends="process-lib">
-        <property name="process-lib-manifest" location="build/lib/process"/>
-        <pathconvert property="process-manifest-cp" dirsep="/" pathsep=" ">
-            <path>
-                <fileset dir="${process-lib-manifest}" includes="*.jar"/>
-            </path>
-            <map from="${process-lib-manifest}" to="../lib"/>
-        </pathconvert>
-    </target>
-
-    <target name="process-lib-proprietary-manifest" depends="process-lib-proprietary">
-        <property name="process-manifest-proprietary" location="build/lib-proprietary/process" />
-        <pathconvert property="process-manifest-cp-proprietary" dirsep="/" pathsep=" ">
-            <path>
-                <fileset dir="${process-manifest-proprietary}" includes="*.jar"/>
-            </path>
-            <map from="${process-manifest-proprietary}" to="../lib-proprietary"/>
-        </pathconvert>
-    </target>
-
     <target name="single-process-start-jar" depends="process-lib-manifest,jetty-lib-manifest,database-lib-manifest">
         <mkdir dir="build/example"/>
         <manifest file="build/example/manifest">

Modified: manifoldcf/trunk/framework/buildfiles/connector-build.xml
URL: http://svn.apache.org/viewvc/manifoldcf/trunk/framework/buildfiles/connector-build.xml?rev=1628066&r1=1628065&r2=1628066&view=diff
==============================================================================
--- manifoldcf/trunk/framework/buildfiles/connector-build.xml (original)
+++ manifoldcf/trunk/framework/buildfiles/connector-build.xml Sun Sep 28 11:49:15 2014
@@ -24,7 +24,7 @@
     </target>
     
     <target name="download-via-maven" depends="setup-maven-url">
-        <get src="${maven-base-url}/${project-path}/${artifact-name}/${artifact-version}/${artifact-name}-${artifact-version}.${artifact-type}" dest="${target}/${artifact-name}.${artifact-type}"/>
+        <get src="${maven-base-url}/${project-path}/${artifact-name}/${artifact-version}/${artifact-name}-${artifact-version}.${artifact-type}" dest="${target}/${artifact-name}-${artifact-version}.${artifact-type}"/>
     </target>
 
     <target name="checkout-source-via-svn">



Mime
View raw message