You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@manifoldcf.apache.org by kw...@apache.org on 2014/10/02 19:20:40 UTC
svn commit: r1629024 - in /manifoldcf/branches/CONNECTORS-1037: build.xml
common-build.xml connectors/alfresco-webscript/build.xml
Author: kwright
Date: Thu Oct 2 17:20:39 2014
New Revision: 1629024
URL: http://svn.apache.org/r1629024
Log:
Hook up ant build dependencies
Modified:
manifoldcf/branches/CONNECTORS-1037/build.xml
manifoldcf/branches/CONNECTORS-1037/common-build.xml
manifoldcf/branches/CONNECTORS-1037/connectors/alfresco-webscript/build.xml
Modified: manifoldcf/branches/CONNECTORS-1037/build.xml
URL: http://svn.apache.org/viewvc/manifoldcf/branches/CONNECTORS-1037/build.xml?rev=1629024&r1=1629023&r2=1629024&view=diff
==============================================================================
--- manifoldcf/branches/CONNECTORS-1037/build.xml (original)
+++ manifoldcf/branches/CONNECTORS-1037/build.xml Thu Oct 2 17:20:39 2014
@@ -91,6 +91,9 @@
<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"/>
+ <property name="alfresco-indexer-client.version" value="0.6"/>
+ <property name="gson.version" value="2.2.4"/>
+ <property name="guava.version" value="15.0"/>
<target name="downloaded-condition">
<!-- Spot check a few of the dependent jars; no point including ALL of them here... -->
@@ -690,6 +693,24 @@ Use Apache Forrest version forrest-0.9-d
</java>
</target>
+ <target name="download-alfresco-indexer-client" depends="download-guava">
+ <mkdir dir="lib"/>
+ <antcall target="download-via-alfresco-indexer">
+ <param name="project-path" value="org/alfresco/consulting/indexer"/>
+ <param name="artifact-version" value="${alfresco-indexer-client.version}"/>
+ <param name="target" value="lib"/>
+ <param name="artifact-name" value="alfresco-indexer-client"/>
+ <param name="artifact-type" value="jar"/>
+ </antcall>
+ <antcall target="download-via-maven">
+ <param name="project-path" value="com/google/code/gson"/>
+ <param name="artifact-version" value="${gson.version}"/>
+ <param name="target" value="lib"/>
+ <param name="artifact-name" value="gson"/>
+ <param name="artifact-type" value="jar"/>
+ </antcall>
+ </target>
+
<target name="download-mongo-java-driver">
<mkdir dir="lib"/>
@@ -1499,7 +1520,7 @@ 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/guava"/>
- <param name="artifact-version" value="11.0.2"/>
+ <param name="artifact-version" value="${guava.version}"/>
<param name="artifact-name" value="guava"/>
<param name="artifact-type" value="jar"/>
</antcall>
@@ -1734,7 +1755,7 @@ Use Apache Forrest version forrest-0.9-d
</antcall>
</target>
- <target name="make-core-deps" depends="download-mongo-java-driver,download-jira-client,download-google-api-client,download-dropbox-client,download-solrj,download-zookeeper,download-httpcomponents,download-json,download-hsqldb,download-xerces,download-commons,download-elasticsearch-plugin,download-solr-plugins,download-sharepoint-plugins,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-jaxws,download-glassfish,download-jaxb,download-tomcat,download-h2,download-h2-support,download-geronimo-specs,download-fop,download-postgresql,download-axis,download-saaj,download-wsdl4j,download-castor,download-jetty,download-slf4j,download-xalan,download-activation,download-avalon-framework,download-poi,download-chemistry,download-ecj,down
load-hadoop,download-protobuf,download-tika,download-jackson">
+ <target name="make-core-deps" depends="download-alfresco-indexer-client,download-mongo-java-driver,download-jira-client,download-google-api-client,download-dropbox-client,download-solrj,download-zookeeper,download-httpcomponents,download-json,download-hsqldb,download-xerces,download-commons,download-elasticsearch-plugin,download-solr-plugins,download-sharepoint-plugins,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-jaxws,download-glassfish,download-jaxb,download-tomcat,download-h2,download-h2-support,download-geronimo-specs,download-fop,download-postgresql,download-axis,download-saaj,download-wsdl4j,download-castor,download-jetty,download-slf4j,download-xalan,download-activation,download-avalon-framework,download-poi,dow
nload-chemistry,download-ecj,download-hadoop,download-protobuf,download-tika,download-jackson">
<copy todir="lib">
<fileset dir="lib-license" includes="*.txt"/>
</copy>
Modified: manifoldcf/branches/CONNECTORS-1037/common-build.xml
URL: http://svn.apache.org/viewvc/manifoldcf/branches/CONNECTORS-1037/common-build.xml?rev=1629024&r1=1629023&r2=1629024&view=diff
==============================================================================
--- manifoldcf/branches/CONNECTORS-1037/common-build.xml (original)
+++ manifoldcf/branches/CONNECTORS-1037/common-build.xml Thu Oct 2 17:20:39 2014
@@ -25,6 +25,14 @@
<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="setup-alfresco-indexer-url">
+ <property name="alfresco-indexer-base-url" value="https://repository-maoo.forge.cloudbees.com/release"/>
+ </target>
+
+ <target name="download-via-alfresco-indexer" depends="setup-alfresco-indexer-url">
+ <get src="${alfresco-indexer-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">
<mkdir dir="${root-dir}"/>
<exec dir="${root-dir}" executable="svn" failifexecutionfails="true" failonerror="true">
Modified: manifoldcf/branches/CONNECTORS-1037/connectors/alfresco-webscript/build.xml
URL: http://svn.apache.org/viewvc/manifoldcf/branches/CONNECTORS-1037/connectors/alfresco-webscript/build.xml?rev=1629024&r1=1629023&r2=1629024&view=diff
==============================================================================
--- manifoldcf/branches/CONNECTORS-1037/connectors/alfresco-webscript/build.xml (original)
+++ manifoldcf/branches/CONNECTORS-1037/connectors/alfresco-webscript/build.xml Thu Oct 2 17:20:39 2014
@@ -30,6 +30,26 @@
<import file="${mcf-dist}/connector-build.xml"/>
+ <path id="connector-classpath">
+ <path refid="mcf-connector-build.connector-classpath"/>
+ <fileset dir="../../lib">
+ <include name="alfresco-indexer-client*.jar"/>
+ <include name="gson*.jar"/>
+ <include name="guava*.jar"/>
+ </fileset>
+ </path>
+
+ <target name="lib" depends="mcf-connector-build.lib,precompile-check" if="canBuild">
+ <mkdir dir="dist/lib"/>
+ <copy todir="dist/lib">
+ <fileset dir="../../lib">
+ <include name="alfresco-indexer-client*.jar"/>
+ <include name="gson*.jar"/>
+ <include name="guava*.jar"/>
+ </fileset>
+ </copy>
+ </target>
+
<target name="calculate-testcode-condition">
<available file="test-materials-proprietary/alfresco.war" property="alfrescoTestcodeStatus"/>
<condition property="tests-present">
@@ -41,13 +61,5 @@
<echo message="Alfresco Connector integration tests cannot be be performed without alfresco.war"/>
</target>
- <target name="build-test-materials" depends="pretest-check" if="canTest">
- <mkdir dir="build/alfresco-war"/>
- <copy todir="build/alfresco-war">
- <fileset dir="test-materials-proprietary">
- <include name="alfresco*.war"/>
- </fileset>
- </copy>
- </target>
</project>