incubator-connectors-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From kwri...@apache.org
Subject svn commit: r1307339 - in /incubator/lcf/branches/CONNECTORS-437: ./ connectors/ connectors/alfresco/ connectors/elasticsearch/ connectors/jcifs/ connectors/sharepoint/ connectors/solr/ site/
Date Fri, 30 Mar 2012 10:02:10 GMT
Author: kwright
Date: Fri Mar 30 10:02:09 2012
New Revision: 1307339

URL: http://svn.apache.org/viewvc?rev=1307339&view=rev
Log:
Introduce common download antcalls, as well as download-clean targets.

Modified:
    incubator/lcf/branches/CONNECTORS-437/build.xml
    incubator/lcf/branches/CONNECTORS-437/common-build.xml
    incubator/lcf/branches/CONNECTORS-437/connectors/alfresco/build.xml
    incubator/lcf/branches/CONNECTORS-437/connectors/connector-build.xml
    incubator/lcf/branches/CONNECTORS-437/connectors/elasticsearch/build.xml
    incubator/lcf/branches/CONNECTORS-437/connectors/jcifs/build.xml
    incubator/lcf/branches/CONNECTORS-437/connectors/sharepoint/build.xml
    incubator/lcf/branches/CONNECTORS-437/connectors/solr/build.xml
    incubator/lcf/branches/CONNECTORS-437/site/build.xml

Modified: incubator/lcf/branches/CONNECTORS-437/build.xml
URL: http://svn.apache.org/viewvc/incubator/lcf/branches/CONNECTORS-437/build.xml?rev=1307339&r1=1307338&r2=1307339&view=diff
==============================================================================
--- incubator/lcf/branches/CONNECTORS-437/build.xml (original)
+++ incubator/lcf/branches/CONNECTORS-437/build.xml Fri Mar 30 10:02:09 2012
@@ -17,6 +17,8 @@
 
 <project name="manifoldcf" default="help">
 
+    <import file="common-build.xml"/>
+    
     <target name="clean">
         <delete>
           <fileset dir="." includes="apache-manifoldcf-*.zip"/>
@@ -2544,46 +2546,130 @@ Use Apache Forrest version forrest-0.9-d
     </target>
 
     <target name="download-derby">
-        <get src="http://repo1.maven.org/maven2/org/apache/derby/derby/10.8.2.2/derby-10.8.2.2.jar"
dest="lib/derby.jar"/>
-        <get src="http://repo1.maven.org/maven2/org/apache/derby/derbytools/10.8.2.2/derbytools-10.8.2.2.jar"
dest="lib/derbytools.jar"/>
-        <get src="http://repo1.maven.org/maven2/org/apache/derby/derbynet/10.8.2.2/derbynet-10.8.2.2.jar"
dest="lib/derbynet.jar"/>
-        <get src="http://repo1.maven.org/maven2/org/apache/derby/derbyLocale_it/10.8.2.2/derbyLocale_it-10.8.2.2.jar"
dest="lib/derbyLocale_it.jar"/>
-        <get src="http://repo1.maven.org/maven2/org/apache/derby/derbyLocale_de_DE/10.8.2.2/derbyLocale_de_DE-10.8.2.2.jar"
dest="lib/derbyLocale_de_DE.jar"/>
-        <get src="http://repo1.maven.org/maven2/org/apache/derby/derbyLocale_es/10.8.2.2/derbyLocale_es-10.8.2.2.jar"
dest="lib/derbyLocale_es.jar"/>
-        <get src="http://repo1.maven.org/maven2/org/apache/derby/derbyLocale_ja_JP/10.8.2.2/derbyLocale_ja_JP-10.8.2.2.jar"
dest="lib/derbyLocale_ja_JP.jar"/>
-        <get src="http://repo1.maven.org/maven2/org/apache/derby/derbyLocale_cs/10.8.2.2/derbyLocale_cs-10.8.2.2.jar"
dest="lib/derbyLocale_cs.jar"/>
-        <get src="http://repo1.maven.org/maven2/org/apache/derby/derbyLocale_zh_TW/10.8.2.2/derbyLocale_zh_TW-10.8.2.2.jar"
dest="lib/derbyLocale_zh_TW.jar"/>
-        <get src="http://repo1.maven.org/maven2/org/apache/derby/derbyLocale_zh_CN/10.8.2.2/derbyLocale_zh_CN-10.8.2.2.jar"
dest="lib/derbyLocale_zh_CN.jar"/>
-        <get src="http://repo1.maven.org/maven2/org/apache/derby/derbyLocale_pt_BR/10.8.2.2/derbyLocale_pt_BR-10.8.2.2.jar"
dest="lib/derbyLocale_pt_BR.jar"/>
-        <get src="http://repo1.maven.org/maven2/org/apache/derby/derbyLocale_fr/10.8.2.2/derbyLocale_fr-10.8.2.2.jar"
dest="lib/derbyLocale_fr.jar"/>
-        <get src="http://repo1.maven.org/maven2/org/apache/derby/derbyLocale_ru/10.8.2.2/derbyLocale_ru-10.8.2.2.jar"
dest="lib/derbyLocale_ru.jar"/>
-        <get src="http://repo1.maven.org/maven2/org/apache/derby/derbyLocale_ko_KR/10.8.2.2/derbyLocale_ko_KR-10.8.2.2.jar"
dest="lib/derbyLocale_ko_KR.jar"/>
-        <get src="http://repo1.maven.org/maven2/org/apache/derby/derbyLocale_hu/10.8.2.2/derbyLocale_hu-10.8.2.2.jar"
dest="lib/derbyLocale_hu.jar"/>
-        <get src="http://repo1.maven.org/maven2/org/apache/derby/derbyLocale_pl/10.8.2.2/derbyLocale_pl-10.8.2.2.jar"
dest="lib/derbyLocale_pl.jar"/>
+        <property name="derby-version" value="10.8.2.2"/>
+        <property name="derby-package" value="org/apache/derby"/>
+        <antcall target="download-via-maven"><param name="project-path" value="${derby-package}"/><param
name="artifact-version" value="${derby-version}"/><param name="target" value="lib"/>
+            <param name="artifact-name" value="derby"/>
+            <param name="artifact-type" value="jar"/>
+        </antcall>
+        <antcall target="download-via-maven"><param name="project-path" value="${derby-package}"/><param
name="artifact-version" value="${derby-version}"/><param name="target" value="lib"/>
+            <param name="artifact-name" value="derbytools"/>
+            <param name="artifact-type" value="jar"/>
+        </antcall>
+        <antcall target="download-via-maven"><param name="project-path" value="${derby-package}"/><param
name="artifact-version" value="${derby-version}"/><param name="target" value="lib"/>
+            <param name="artifact-name" value="derbynet"/>
+            <param name="artifact-type" value="jar"/>
+        </antcall>
+        <antcall target="download-via-maven"><param name="project-path" value="${derby-package}"/><param
name="artifact-version" value="${derby-version}"/><param name="target" value="lib"/>
+            <param name="artifact-name" value="derbyLocale_it"/>
+            <param name="artifact-type" value="jar"/>
+        </antcall>
+        <antcall target="download-via-maven"><param name="project-path" value="${derby-package}"/><param
name="artifact-version" value="${derby-version}"/><param name="target" value="lib"/>
+            <param name="artifact-name" value="derbyLocale_de_DE"/>
+            <param name="artifact-type" value="jar"/>
+        </antcall>
+        <antcall target="download-via-maven"><param name="project-path" value="${derby-package}"/><param
name="artifact-version" value="${derby-version}"/><param name="target" value="lib"/>
+            <param name="artifact-name" value="derbyLocale_es"/>
+            <param name="artifact-type" value="jar"/>
+        </antcall>
+        <antcall target="download-via-maven"><param name="project-path" value="${derby-package}"/><param
name="artifact-version" value="${derby-version}"/><param name="target" value="lib"/>
+            <param name="artifact-name" value="derbyLocale_ja_JP"/>
+            <param name="artifact-type" value="jar"/>
+        </antcall>
+        <antcall target="download-via-maven"><param name="project-path" value="${derby-package}"/><param
name="artifact-version" value="${derby-version}"/><param name="target" value="lib"/>
+            <param name="artifact-name" value="derbyLocale_cs"/>
+            <param name="artifact-type" value="jar"/>
+        </antcall>
+        <antcall target="download-via-maven"><param name="project-path" value="${derby-package}"/><param
name="artifact-version" value="${derby-version}"/><param name="target" value="lib"/>
+            <param name="artifact-name" value="derbyLocale_zh_TW"/>
+            <param name="artifact-type" value="jar"/>
+        </antcall>
+        <antcall target="download-via-maven"><param name="project-path" value="${derby-package}"/><param
name="artifact-version" value="${derby-version}"/><param name="target" value="lib"/>
+            <param name="artifact-name" value="derbyLocale_zh_CN"/>
+            <param name="artifact-type" value="jar"/>
+        </antcall>
+        <antcall target="download-via-maven"><param name="project-path" value="${derby-package}"/><param
name="artifact-version" value="${derby-version}"/><param name="target" value="lib"/>
+            <param name="artifact-name" value="derbyLocale_pt_BR"/>
+            <param name="artifact-type" value="jar"/>
+        </antcall>
+        <antcall target="download-via-maven"><param name="project-path" value="${derby-package}"/><param
name="artifact-version" value="${derby-version}"/><param name="target" value="lib"/>
+            <param name="artifact-name" value="derbyLocale_fr"/>
+            <param name="artifact-type" value="jar"/>
+        </antcall>
+        <antcall target="download-via-maven"><param name="project-path" value="${derby-package}"/><param
name="artifact-version" value="${derby-version}"/><param name="target" value="lib"/>
+            <param name="artifact-name" value="derbyLocale_ru"/>
+            <param name="artifact-type" value="jar"/>
+        </antcall>
+        <antcall target="download-via-maven"><param name="project-path" value="${derby-package}"/><param
name="artifact-version" value="${derby-version}"/><param name="target" value="lib"/>
+            <param name="artifact-name" value="derbyLocale_ko_KR"/>
+            <param name="artifact-type" value="jar"/>
+        </antcall>
+        <antcall target="download-via-maven"><param name="project-path" value="${derby-package}"/><param
name="artifact-version" value="${derby-version}"/><param name="target" value="lib"/>
+            <param name="artifact-name" value="derbyLocale_hu"/>
+            <param name="artifact-type" value="jar"/>
+        </antcall>
+        <antcall target="download-via-maven"><param name="project-path" value="${derby-package}"/><param
name="artifact-version" value="${derby-version}"/><param name="target" value="lib"/>
+            <param name="artifact-name" value="derbyLocale_pl"/>
+            <param name="artifact-type" value="jar"/>
+        </antcall>
     </target>
     
     <target name="download-hsqldb">
-        <get src="http://repo1.maven.org/maven2/org/hsqldb/hsqldb/2.2.8/hsqldb-2.2.8.jar"
dest="lib/hsqldb.jar"/>
+        <property name="hsqldb-version" value="2.2.8"/>
+        <property name="hsqldb-package" value="org/hsqldb"/>
+        <antcall target="download-via-maven"><param name="project-path" value="${hsqldb-package}"/><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>
     </target>
     
     <target name="download-postgresql">
-        <get src="http://repo1.maven.org/maven2/postgresql/postgresql/9.1-901-1.jdbc4/postgresql-9.1-901-1.jdbc4.jar"
dest="lib/postgresql.jar"/>
+        <property name="postgresql-version" value="9.1-901-1.jdbc4"/>
+        <property name="postgresql-package" value="postgresql"/>
+        <antcall target="download-via-maven"><param name="project-path" value="${postgresql-package}"/><param
name="artifact-version" value="${postgresql-version}"/><param name="target" value="lib"/>
+            <param name="artifact-name" value="postgresql"/>
+            <param name="artifact-type" value="jar"/>
+        </antcall>
     </target>
 
     <target name="download-axis">
-        <get src="http://repo1.maven.org/maven2/org/apache/axis/axis/1.4/axis-1.4.jar"
dest="lib/axis.jar"/>
-        <get src="http://repo1.maven.org/maven2/org/apache/axis/axis-jaxrpc/1.4/axis-jaxrpc-1.4.jar"
dest="lib/axis-jaxrpc.jar"/>
-        <!-- get src="http://repo1.maven.org/maven2/org/apache/axis/axis-saaj/1.4/axis-saaj-1.4.jar"
dest="lib/axis-saaj.jar"/ -->
+        <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"/>
+            <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"/>
+            <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-castor">
+
         <!-- biblio is just too slow -->
         <!-- 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"/ -->
-        <get src="http://svn.apache.org/repos/asf/incubator/lcf/bin-dist/castor-1.0.5/castor.jar"
dest="lib/castor.jar"/>
-        <get src="http://svn.apache.org/repos/asf/incubator/lcf/bin-dist/castor-1.0.5/castor-xml.jar"
dest="lib/castor-xml.jar"/>
-        <get src="http://svn.apache.org/repos/asf/incubator/lcf/bin-dist/castor-1.0.5/castor-commons.jar"
dest="lib/castor-commons.jar"/>
+
+        <property name="castor-version" value="1.0.5"/>
+        <property name="castor-description" value="castor"/>
+        <antcall target="download-via-svn"><param name="project-desc" value="${castor-description}"/><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>
+        <antcall target="download-via-svn"><param name="project-desc" value="${castor-description}"/><param
name="artifact-version" value="${castor-version}"/><param name="target" value="lib"/>
+            <param name="artifact-name" value="castor-xml"/>
+            <param name="artifact-type" value="jar"/>
+        </antcall>
+        <antcall target="download-via-svn"><param name="project-desc" value="${castor-description}"/><param
name="artifact-version" value="${castor-version}"/><param name="target" value="lib"/>
+            <param name="artifact-name" value="castor-commons"/>
+            <param name="artifact-type" value="jar"/>
+        </antcall>
     </target>
   
     <target name="download-wsdl4j">
@@ -2673,4 +2759,25 @@ Use Apache Forrest version forrest-0.9-d
         <ant dir="site" target="download-dependencies"/>
     </target>
 
+    <target name="download-proprietary-cleanup">
+        <delete>
+            <fileset dir="lib-proprietary" excludes="README.txt"/>
+        </delete>
+    </target>
+
+    <target name="download-core-cleanup">
+        <delete>
+            <fileset dir="lib" excludes="README.txt"/>
+        </delete>
+    </target>
+
+    <target name="download-cleanup" depends="download-proprietary-cleanup,download-core-cleanup">
+        <ant dir="connectors/jcifs" target="download-cleanup"/>
+        <ant dir="connectors/sharepoint" target="download-cleanup"/>
+        <ant dir="connectors/solr" target="download-cleanup"/>
+        <ant dir="connectors/alfresco" target="download-cleanup"/>
+        <ant dir="connectors/elasticsearch" target="download-cleanup"/>
+        <ant dir="site" target="download-cleanup"/>
+    </target>
+    
 </project>

Modified: incubator/lcf/branches/CONNECTORS-437/common-build.xml
URL: http://svn.apache.org/viewvc/incubator/lcf/branches/CONNECTORS-437/common-build.xml?rev=1307339&r1=1307338&r2=1307339&view=diff
==============================================================================
--- incubator/lcf/branches/CONNECTORS-437/common-build.xml (original)
+++ incubator/lcf/branches/CONNECTORS-437/common-build.xml Fri Mar 30 10:02:09 2012
@@ -17,5 +17,20 @@
 
 <project name="mcf-common-build">
 
+    <target name="setup-maven-url">
+        <property name="maven-base-url" value="http://repo1.maven.org/maven2"/>
+    </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}"/>
+    </target>
+    
+    <target name="setup-svn-url">
+        <property name="svn-base-url" value="http://svn.apache.org/repos/asf/incubator/lcf"/>
+    </target>
 
+    <target name="download-via-svn" depends="setup-svn-url">
+        <get src="${svn-base-url}/bin-dist/${project-desc}-${artifact-version}/${artifact-name}.${artifact-type}"
dest="${target}/${artifact-name}.${artifact-type}"/>
+    </target>
+    
 </project>

Modified: incubator/lcf/branches/CONNECTORS-437/connectors/alfresco/build.xml
URL: http://svn.apache.org/viewvc/incubator/lcf/branches/CONNECTORS-437/connectors/alfresco/build.xml?rev=1307339&r1=1307338&r2=1307339&view=diff
==============================================================================
--- incubator/lcf/branches/CONNECTORS-437/connectors/alfresco/build.xml (original)
+++ incubator/lcf/branches/CONNECTORS-437/connectors/alfresco/build.xml Fri Mar 30 10:02:09
2012
@@ -105,4 +105,10 @@
 	
     <target name="download-dependencies" depends="download-alfresco-ws-client"/>
 
+    <target name="download-cleanup">
+        <delete>
+            <fileset dir="lib-proprietary" excludes="README*.txt"/>
+        </delete>
+    </target>
+
 </project>

Modified: incubator/lcf/branches/CONNECTORS-437/connectors/connector-build.xml
URL: http://svn.apache.org/viewvc/incubator/lcf/branches/CONNECTORS-437/connectors/connector-build.xml?rev=1307339&r1=1307338&r2=1307339&view=diff
==============================================================================
--- incubator/lcf/branches/CONNECTORS-437/connectors/connector-build.xml (original)
+++ incubator/lcf/branches/CONNECTORS-437/connectors/connector-build.xml Fri Mar 30 10:02:09
2012
@@ -595,6 +595,8 @@
 
     <target name="download-dependencies"/>
 
+    <target name="download-cleanup"/>
+    
     <target name="all" depends="build,doc,build-tests,run-tests,run-tests-derby,run-tests-HSQLDB"/>
 
 </project>

Modified: incubator/lcf/branches/CONNECTORS-437/connectors/elasticsearch/build.xml
URL: http://svn.apache.org/viewvc/incubator/lcf/branches/CONNECTORS-437/connectors/elasticsearch/build.xml?rev=1307339&r1=1307338&r2=1307339&view=diff
==============================================================================
--- incubator/lcf/branches/CONNECTORS-437/connectors/elasticsearch/build.xml (original)
+++ incubator/lcf/branches/CONNECTORS-437/connectors/elasticsearch/build.xml Fri Mar 30 10:02:09
2012
@@ -44,4 +44,10 @@
       
     </target>
 
+    <target name="download-cleanup">
+        <delete>
+            <fileset dir="test-materials-proprietary" excludes="README*.txt"/>
+        </delete>
+    </target>
+
 </project>

Modified: incubator/lcf/branches/CONNECTORS-437/connectors/jcifs/build.xml
URL: http://svn.apache.org/viewvc/incubator/lcf/branches/CONNECTORS-437/connectors/jcifs/build.xml?rev=1307339&r1=1307338&r2=1307339&view=diff
==============================================================================
--- incubator/lcf/branches/CONNECTORS-437/connectors/jcifs/build.xml (original)
+++ incubator/lcf/branches/CONNECTORS-437/connectors/jcifs/build.xml Fri Mar 30 10:02:09 2012
@@ -49,4 +49,10 @@
 
     <target name="download-dependencies" depends="download-jcifs"/>
 
+    <target name="download-cleanup">
+        <delete>
+            <fileset dir="lib-proprietary" excludes="README.txt"/>
+        </delete>
+    </target>
+    
 </project>

Modified: incubator/lcf/branches/CONNECTORS-437/connectors/sharepoint/build.xml
URL: http://svn.apache.org/viewvc/incubator/lcf/branches/CONNECTORS-437/connectors/sharepoint/build.xml?rev=1307339&r1=1307338&r2=1307339&view=diff
==============================================================================
--- incubator/lcf/branches/CONNECTORS-437/connectors/sharepoint/build.xml (original)
+++ incubator/lcf/branches/CONNECTORS-437/connectors/sharepoint/build.xml Fri Mar 30 10:02:09
2012
@@ -93,4 +93,11 @@
 
     </target>
 
+    <target name="download-cleanup">
+        <delete>
+            <fileset dir="lib-proprietary" excludes="README.txt"/>
+            <fileset dir="integration" excludes="README.txt"/>
+        </delete>
+    </target>
+
 </project>

Modified: incubator/lcf/branches/CONNECTORS-437/connectors/solr/build.xml
URL: http://svn.apache.org/viewvc/incubator/lcf/branches/CONNECTORS-437/connectors/solr/build.xml?rev=1307339&r1=1307338&r2=1307339&view=diff
==============================================================================
--- incubator/lcf/branches/CONNECTORS-437/connectors/solr/build.xml (original)
+++ incubator/lcf/branches/CONNECTORS-437/connectors/solr/build.xml Fri Mar 30 10:02:09 2012
@@ -23,7 +23,13 @@
         <get src="http://svn.apache.org/repos/asf/incubator/lcf/bin-dist/mcf-solr-3.x-plugin-0.1-incubating/mcf-solr-3.x-plugin.jar"
dest="integration/mcf-solr-3.x-plugin.jar"/>
         <get src="http://svn.apache.org/repos/asf/incubator/lcf/bin-dist/mcf-solr-4.x-plugin-0.1-incubating/mcf-solr-4.x-plugin.jar"
dest="integration/mcf-solr-4.x-plugin.jar"/>
     </target>
-    
+
+    <target name="download-cleanup">
+        <delete>
+            <fileset dir="integration" excludes="README*.txt"/>
+        </delete>
+    </target>
+
     <target name="integration">
         <mkdir dir="dist/integration"/>
         <copy todir="dist/integration">

Modified: incubator/lcf/branches/CONNECTORS-437/site/build.xml
URL: http://svn.apache.org/viewvc/incubator/lcf/branches/CONNECTORS-437/site/build.xml?rev=1307339&r1=1307338&r2=1307339&view=diff
==============================================================================
--- incubator/lcf/branches/CONNECTORS-437/site/build.xml (original)
+++ incubator/lcf/branches/CONNECTORS-437/site/build.xml Fri Mar 30 10:02:09 2012
@@ -265,7 +265,11 @@
     
     <target name="download-dependencies" depends="download-dejavu-fonts,download-ipa-fonts">
     </target>
-    
+
+    <target name="download-cleanup">
+        <delete dir="fonts"/>
+    </target>
+
     <target name="all" depends="dist"/>
     
 </project>



Mime
View raw message