manifoldcf-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From kwri...@apache.org
Subject svn commit: r1307383 - in /incubator/lcf/branches/CONNECTORS-437: common-build.xml connectors/elasticsearch/build.xml connectors/sharepoint/build.xml connectors/solr/build.xml
Date Fri, 30 Mar 2012 12:17:06 GMT
Author: kwright
Date: Fri Mar 30 12:17:06 2012
New Revision: 1307383

URL: http://svn.apache.org/viewvc?rev=1307383&view=rev
Log:
Use new ant tasks for all appropriate downloads

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

Modified: incubator/lcf/branches/CONNECTORS-437/common-build.xml
URL: http://svn.apache.org/viewvc/incubator/lcf/branches/CONNECTORS-437/common-build.xml?rev=1307383&r1=1307382&r2=1307383&view=diff
==============================================================================
--- incubator/lcf/branches/CONNECTORS-437/common-build.xml (original)
+++ incubator/lcf/branches/CONNECTORS-437/common-build.xml Fri Mar 30 12:17:06 2012
@@ -32,5 +32,9 @@
     <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>
-    
+
+    <target name="download-via-escaped-svn" depends="setup-svn-url">
+        <get src="${svn-base-url}/bin-dist/${project-desc}-${artifact-version}/${escaped-artifact-name}.${artifact-type}"
dest="${target}/${artifact-name}.${artifact-type}"/>
+    </target>
+
 </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=1307383&r1=1307382&r2=1307383&view=diff
==============================================================================
--- incubator/lcf/branches/CONNECTORS-437/connectors/elasticsearch/build.xml (original)
+++ incubator/lcf/branches/CONNECTORS-437/connectors/elasticsearch/build.xml Fri Mar 30 12:17:06
2012
@@ -23,7 +23,7 @@
         
         <mkdir dir="build/download"/>
         <get src="http://cloud.github.com/downloads/elasticsearch/elasticsearch/elasticsearch-0.19.0.tar.gz"

-          dest="build/download/elasticsearch.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"/>
         
@@ -31,12 +31,12 @@
         <mkdir dir="test-materials-proprietary/elasticsearch-0.19.0/plugins"/>
         
         <get src="http://cloud.github.com/downloads/elasticsearch/elasticsearch-mapper-attachments/elasticsearch-mapper-attachments-1.2.0.zip"

-          dest="test-materials-proprietary/elasticsearch-0.19.0/plugins/mapper-attachments.zip"/>
+            dest="test-materials-proprietary/elasticsearch-0.19.0/plugins/mapper-attachments.zip"/>
         
         <unzip src="test-materials-proprietary/elasticsearch-0.19.0/plugins/mapper-attachments.zip"
dest="test-materials-proprietary/elasticsearch-0.19.0/plugins/mapper-attachments"/>
         
         <chmod dir="test-materials-proprietary/elasticsearch-0.19.0" perm="ugo+rxw">
-         <fileset dir="**/*"/>
+            <fileset dir="**/*"/>
         </chmod>
         <chmod file="test-materials-proprietary/elasticsearch-0.19.0/bin/plugin" perm="ugo+rx"/>
         <chmod file="test-materials-proprietary/elasticsearch-0.19.0/bin/elasticsearch"
perm="ugo+rx"/>

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=1307383&r1=1307382&r2=1307383&view=diff
==============================================================================
--- incubator/lcf/branches/CONNECTORS-437/connectors/sharepoint/build.xml (original)
+++ incubator/lcf/branches/CONNECTORS-437/connectors/sharepoint/build.xml Fri Mar 30 12:17:06
2012
@@ -85,12 +85,30 @@
         <get src="http://www.wssdemo.com/_vti_bin/versions.asmx?wsdl=true" dest="lib-proprietary/versions.wsdl"/>
         <get src="http://www.wssdemo.com/_vti_bin/webs.asmx?wsdl=true" dest="lib-proprietary/webs.wsdl"/>
 
-        <get src="http://svn.apache.org/repos/asf/incubator/lcf/bin-dist/mcf-sharepoint-3.0-plugin-0.1-incubating/MetaCarta.SharePoint.MCPermissionsService.wsp"
dest="integration/MetaCarta.SharePoint.MCPermissionsService.wsp"/>
-        <get src="http://svn.apache.org/repos/asf/incubator/lcf/bin-dist/mcf-sharepoint-3.0-plugin-0.1-incubating/Installation%20Readme.txt"
dest="integration/Installation Readme.txt"/>
-        <get src="http://svn.apache.org/repos/asf/incubator/lcf/bin-dist/mcf-sharepoint-3.0-plugin-0.1-incubating/setup.bat"
dest="integration/setup.bat"/>
-        <get src="http://svn.apache.org/repos/asf/incubator/lcf/bin-dist/mcf-sharepoint-3.0-plugin-0.1-incubating/remove.bat"
dest="integration/remove.bat"/>
-        <get src="http://svn.apache.org/repos/asf/incubator/lcf/bin-dist/mcf-sharepoint-3.0-plugin-0.1-incubating/upgrade.bat"
dest="integration/upgrade.bat"/>
-
+        <property name="sharepoint-plugin-version" value="0.1-incubating"/>
+        <property name="sharepoint-plugin-description" value="mcf-sharepoint-3.0-plugin"/>
+        
+        <antcall target="download-via-svn"><param name="target" value="integration"/><param
name="project-desc" value="${sharepoint-plugin-description}"/><param name="artifact-version"
value="${sharepoint-plugin-version}"/>
+            <param name="artifact-name" value="MetaCarta.SharePoint.MCPermissionsService"/>
+            <param name="artifact-type" value="wsp"/>
+        </antcall>
+        <antcall target="download-via-escaped-svn"><param name="target" value="integration"/><param
name="project-desc" value="${sharepoint-plugin-description}"/><param name="artifact-version"
value="${sharepoint-plugin-version}"/>
+            <param name="escaped-artifact-name" value="Installation%20Readme"/>
+            <param name="artifact-name" value="Installation Readme"/>
+            <param name="artifact-type" value="txt"/>
+        </antcall>
+        <antcall target="download-via-svn"><param name="target" value="integration"/><param
name="project-desc" value="${sharepoint-plugin-description}"/><param name="artifact-version"
value="${sharepoint-plugin-version}"/>
+            <param name="artifact-name" value="setup"/>
+            <param name="artifact-type" value="bat"/>
+        </antcall>
+        <antcall target="download-via-svn"><param name="target" value="integration"/><param
name="project-desc" value="${sharepoint-plugin-description}"/><param name="artifact-version"
value="${sharepoint-plugin-version}"/>
+            <param name="artifact-name" value="remove"/>
+            <param name="artifact-type" value="bat"/>
+        </antcall>
+        <antcall target="download-via-svn"><param name="target" value="integration"/><param
name="project-desc" value="${sharepoint-plugin-description}"/><param name="artifact-version"
value="${sharepoint-plugin-version}"/>
+            <param name="artifact-name" value="upgrade"/>
+            <param name="artifact-type" value="bat"/>
+        </antcall>
     </target>
 
     <target name="download-cleanup">

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=1307383&r1=1307382&r2=1307383&view=diff
==============================================================================
--- incubator/lcf/branches/CONNECTORS-437/connectors/solr/build.xml (original)
+++ incubator/lcf/branches/CONNECTORS-437/connectors/solr/build.xml Fri Mar 30 12:17:06 2012
@@ -20,8 +20,18 @@
     <import file="../connector-build.xml"/>
 
     <target name="download-dependencies">
-        <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"/>
+        <antcall target="download-via-svn"><param name="target" value="integration"/>
+            <param name="project-desc" value="mcf-solr-3.x-plugin"/>
+            <param name="artifact-version" value="0.1-incubating"/>
+            <param name="artifact-name" value="mcf-solr-3.x-plugin"/>
+            <param name="artifact-type" value="jar"/>
+        </antcall>
+        <antcall target="download-via-svn"><param name="target" value="integration"/>
+            <param name="project-desc" value="mcf-solr-4.x-plugin"/>
+            <param name="artifact-version" value="0.1-incubating"/>
+            <param name="artifact-name" value="mcf-solr-4.x-plugin"/>
+            <param name="artifact-type" value="jar"/>
+        </antcall>
     </target>
 
     <target name="download-cleanup">



Mime
View raw message