manifoldcf-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From kwri...@apache.org
Subject svn commit: r1308590 - in /incubator/lcf/branches/CONNECTORS-443: build.xml connectors/sharepoint/build.xml connectors/solr/build.xml
Date Mon, 02 Apr 2012 21:50:20 GMT
Author: kwright
Date: Mon Apr  2 21:50:19 2012
New Revision: 1308590

URL: http://svn.apache.org/viewvc?rev=1308590&view=rev
Log:
Separate proprietary vs. non-proprietary ant targets, so we can coexist with a binary dep
package delivering the non-proprietary jars.

Modified:
    incubator/lcf/branches/CONNECTORS-443/build.xml
    incubator/lcf/branches/CONNECTORS-443/connectors/sharepoint/build.xml
    incubator/lcf/branches/CONNECTORS-443/connectors/solr/build.xml

Modified: incubator/lcf/branches/CONNECTORS-443/build.xml
URL: http://svn.apache.org/viewvc/incubator/lcf/branches/CONNECTORS-443/build.xml?rev=1308590&r1=1308589&r2=1308590&view=diff
==============================================================================
--- incubator/lcf/branches/CONNECTORS-443/build.xml (original)
+++ incubator/lcf/branches/CONNECTORS-443/build.xml Mon Apr  2 21:50:19 2012
@@ -2606,8 +2606,11 @@ all      - Build code and docs, and test
 
 run-script-interpreter - Run the ManifoldCF script interpreter
 
-download-dependencies  - Fetch all required dependencies
-download-cleanup       - Clean up downloaded binaries
+make-deps              - Fetch non-redistributable dependencies
+clean-deps             - Clean up non-redistributable binaries
+
+make-core-deps         - Download and build core dependencies
+clean-core-deps        - Clean up core dependencies
 
 Use Apache Forrest version forrest-0.9-dev or higher.
       </echo>
@@ -3355,7 +3358,51 @@ Use Apache Forrest version forrest-0.9-d
         </antcall>
     </target>
     
-    <target name="download-core-dependencies" depends="download-jstl,download-xmlgraphics-commons,download-wstx-asl,download-xmlsec,download-xml-apis,download-wss4j,download-velocity,download-streambuffer,download-stax,download-servlet-api,download-xml-resolver,download-osgi,download-opensaml,download-mimepull,download-mail,download-log4j,download-junit,download-jsr181-api,download-jsr250-api,download-jaxws,download-jdbcpool,download-glassfish,download-jaxb,download-tomcat,download-h2,download-h2-support,download-geronimo-specs,download-fop,download-commons,download-derby,download-hsqldb,download-postgresql,download-axis,download-saaj,download-wsdl4j,download-castor,download-jetty,download-xerces,download-xalan,download-activation,download-avalon-framework,download-poi,download-chemistry,download-ecj">
+    <target name="download-sharepoint-plugin">
+        <property name="sharepoint-plugin-version" value="0.1-incubating"/>
+        <property name="sharepoint-plugin-description" value="mcf-sharepoint-3.0-plugin"/>
+        
+        <mkdir dir="lib"/>
+        <antcall target="download-via-svn"><param name="target" value="lib"/><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="lib"/><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="lib"/><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="lib"/><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="lib"/><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-solr-plugins">
+        <mkdir dir="lib"/>
+        <antcall target="download-via-svn"><param name="target" value="lib"/>
+            <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="lib"/>
+            <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="make-core-deps" depends="download-solr-plugins,download-sharepoint-plugin,download-jstl,download-xmlgraphics-commons,download-wstx-asl,download-xmlsec,download-xml-apis,download-wss4j,download-velocity,download-streambuffer,download-stax,download-servlet-api,download-xml-resolver,download-osgi,download-opensaml,download-mimepull,download-mail,download-log4j,download-junit,download-jsr181-api,download-jsr250-api,download-jaxws,download-jdbcpool,download-glassfish,download-jaxb,download-tomcat,download-h2,download-h2-support,download-geronimo-specs,download-fop,download-commons,download-derby,download-hsqldb,download-postgresql,download-axis,download-saaj,download-wsdl4j,download-castor,download-jetty,download-xerces,download-xalan,download-activation,download-avalon-framework,download-poi,download-chemistry,download-ecj">
     </target>
     
     <target name="download-mysql">
@@ -3378,7 +3425,7 @@ Use Apache Forrest version forrest-0.9-d
 
     <target name="download-proprietary-dependencies" depends="download-mysql,download-jtds"/>
     
-    <target name="download-dependencies" depends="download-proprietary-dependencies,download-core-dependencies">
+    <target name="make-deps" depends="download-proprietary-dependencies">
         <ant dir="connectors/alfresco" target="download-dependencies"/>
         <ant dir="connectors/cmis" target="download-dependencies"/>
         <ant dir="connectors/activedirectory" target="download-dependencies"/>
@@ -3409,11 +3456,11 @@ Use Apache Forrest version forrest-0.9-d
         </delete>
     </target>
 
-    <target name="download-core-cleanup">
+    <target name="clean-core-deps">
         <delete dir="lib"/>
     </target>
 
-    <target name="download-cleanup" depends="download-proprietary-cleanup,download-core-cleanup">
+    <target name="clean-deps" depends="download-proprietary-cleanup">
         <ant dir="connectors/alfresco" target="download-cleanup"/>
         <ant dir="connectors/cmis" target="download-cleanup"/>
         <ant dir="connectors/activedirectory" target="download-cleanup"/>

Modified: incubator/lcf/branches/CONNECTORS-443/connectors/sharepoint/build.xml
URL: http://svn.apache.org/viewvc/incubator/lcf/branches/CONNECTORS-443/connectors/sharepoint/build.xml?rev=1308590&r1=1308589&r2=1308590&view=diff
==============================================================================
--- incubator/lcf/branches/CONNECTORS-443/connectors/sharepoint/build.xml (original)
+++ incubator/lcf/branches/CONNECTORS-443/connectors/sharepoint/build.xml Mon Apr  2 21:50:19
2012
@@ -69,7 +69,7 @@
     <target name="integration">
         <mkdir dir="dist/integration"/>
         <copy todir="dist/integration">
-          <fileset dir="lib">
+          <fileset dir="../../lib">
               <include name="*.bat"/>
               <include name="*.wsp"/>
               <include name="Installation Readme.txt"/>
@@ -84,39 +84,12 @@
         <get src="http://www.wssdemo.com/_vti_bin/usergroup.asmx?wsdl=true" dest="lib-proprietary/usergroup.wsdl"/>
         <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"/>
-
-        <property name="sharepoint-plugin-version" value="0.1-incubating"/>
-        <property name="sharepoint-plugin-description" value="mcf-sharepoint-3.0-plugin"/>
-        
-        <mkdir dir="lib"/>
-        <antcall target="download-via-svn"><param name="target" value="lib"/><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="lib"/><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="lib"/><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="lib"/><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="lib"/><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">
         <delete>
             <fileset dir="lib-proprietary" excludes="README.txt"/>
         </delete>
-        <delete dir="lib"/>
     </target>
 
 </project>

Modified: incubator/lcf/branches/CONNECTORS-443/connectors/solr/build.xml
URL: http://svn.apache.org/viewvc/incubator/lcf/branches/CONNECTORS-443/connectors/solr/build.xml?rev=1308590&r1=1308589&r2=1308590&view=diff
==============================================================================
--- incubator/lcf/branches/CONNECTORS-443/connectors/solr/build.xml (original)
+++ incubator/lcf/branches/CONNECTORS-443/connectors/solr/build.xml Mon Apr  2 21:50:19 2012
@@ -19,26 +19,6 @@
 
     <import file="../connector-build.xml"/>
 
-    <target name="download-dependencies">
-        <mkdir dir="lib"/>
-        <antcall target="download-via-svn"><param name="target" value="lib"/>
-            <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="lib"/>
-            <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">
-        <delete dir="lib"/>
-    </target>
-
     <target name="integration">
         <mkdir dir="dist/integration"/>
         <copy todir="dist/integration">
@@ -46,7 +26,7 @@
               <include name="README-3.x.txt"/>
               <include name="README-4.x.txt"/>
           </fileset>
-          <fileset dir="lib">
+          <fileset dir="../../lib">
               <include name="*.jar"/>
           </fileset>
         </copy>



Mime
View raw message