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/11/25 16:23:22 UTC
svn commit: r1641633 - in /manifoldcf/trunk: build.xml common-build.xml
connectors/alfresco-webscript/build.xml
Author: kwright
Date: Tue Nov 25 15:23:22 2014
New Revision: 1641633
URL: http://svn.apache.org/r1641633
Log:
Fix ant build to download alfresco-indexer plugin as well
Modified:
manifoldcf/trunk/build.xml
manifoldcf/trunk/common-build.xml
manifoldcf/trunk/connectors/alfresco-webscript/build.xml
Modified: manifoldcf/trunk/build.xml
URL: http://svn.apache.org/viewvc/manifoldcf/trunk/build.xml?rev=1641633&r1=1641632&r2=1641633&view=diff
==============================================================================
--- manifoldcf/trunk/build.xml (original)
+++ manifoldcf/trunk/build.xml Tue Nov 25 15:23:22 2014
@@ -93,7 +93,7 @@
<property name="jackson-core.version" value="2.1.3"/>
<property name="jetty-jsp-jdt.version" value="2.3.3"/>
<property name="jetty-schemas.version" value="3.1.M0"/>
- <property name="alfresco-indexer-client.version" value="0.7.0"/>
+ <property name="alfresco-indexer.version" value="0.7.0"/>
<property name="gson.version" value="2.2.4"/>
<property name="guava.version" value="15.0"/>
<property name="mockito.version" value="1.9.5"/>
@@ -736,11 +736,22 @@ Use Apache Forrest version forrest-0.9-d
</java>
</target>
+ <target name="download-alfresco-webscript-plugin">
+ <mkdir dir="lib/alfresco-webscript"/>
+ <antcall target="download-via-maven">
+ <param name="target" value="lib/alfresco-webscript"/>
+ <param name="project-path" value="com/github/maoo/indexer"/>
+ <param name="artifact-version" value="${alfresco-indexer.version}"/>
+ <param name="artifact-name" value="alfresco-indexer-webscripts"/>
+ <param name="artifact-type" value="amp"/>
+ </antcall>
+ </target>
+
<target name="download-alfresco-indexer-client" depends="download-guava">
<mkdir dir="lib"/>
- <antcall target="download-via-alfresco-indexer">
+ <antcall target="download-via-maven">
<param name="project-path" value="com/github/maoo/indexer"/>
- <param name="artifact-version" value="${alfresco-indexer-client.version}"/>
+ <param name="artifact-version" value="${alfresco-indexer.version}"/>
<param name="target" value="lib"/>
<param name="artifact-name" value="alfresco-indexer-client"/>
<param name="artifact-type" value="jar"/>
@@ -1880,7 +1891,7 @@ Use Apache Forrest version forrest-0.9-d
</antcall>
</target>
- <target name="make-core-deps" depends="download-mockito,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,download-chemistry,download-ecj,download-hadoop,download-protobuf,download-tika,download-jackson">
+ <target name="make-core-deps" depends="download-mockito,download-alfresco-webscript-plugin,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-a
ctivation,download-avalon-framework,download-poi,download-chemistry,download-ecj,download-hadoop,download-protobuf,download-tika,download-jackson">
<copy todir="lib">
<fileset dir="lib-license" includes="*.txt"/>
</copy>
Modified: manifoldcf/trunk/common-build.xml
URL: http://svn.apache.org/viewvc/manifoldcf/trunk/common-build.xml?rev=1641633&r1=1641632&r2=1641633&view=diff
==============================================================================
--- manifoldcf/trunk/common-build.xml (original)
+++ manifoldcf/trunk/common-build.xml Tue Nov 25 15:23:22 2014
@@ -25,10 +25,6 @@
<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="download-via-alfresco-indexer" 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-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/trunk/connectors/alfresco-webscript/build.xml
URL: http://svn.apache.org/viewvc/manifoldcf/trunk/connectors/alfresco-webscript/build.xml?rev=1641633&r1=1641632&r2=1641633&view=diff
==============================================================================
--- manifoldcf/trunk/connectors/alfresco-webscript/build.xml (original)
+++ manifoldcf/trunk/connectors/alfresco-webscript/build.xml Tue Nov 25 15:23:22 2014
@@ -30,7 +30,7 @@
<import file="${mcf-dist}/connector-build.xml"/>
- <property name="alfresco.indexer.version" value="0.7.0"/>
+ <property name="alfresco-indexer.version" value="0.7.0"/>
<path id="connector-classpath">
<path refid="mcf-connector-build.connector-classpath"/>
@@ -74,12 +74,22 @@
<target name="download-dependencies">
<property name="alfresco-package" value="com/github/maoo/indexer"/>
- <antcall target="download-via-alfresco-indexer"><param name="project-path" value="${alfresco-package}"/><param name="artifact-version" value="${alfresco.indexer.version}"/><param name="target" value="test-materials-proprietary"/>
+ <antcall target="download-via-maven">
+ <param name="project-path" value="${alfresco-package}"/>
+ <param name="artifact-version" value="${alfresco-indexer.version}"/>
+ <param name="target" value="test-materials-proprietary"/>
<param name="artifact-name" value="alfresco-indexer-webscripts-war"/>
<param name="artifact-type" value="war"/>
</antcall>
</target>
+ <target name="integration">
+ <mkdir dir="dist/integration/alfresco-webscript"/>
+ <copy todir="dist/integration/alfresco-webscript">
+ <fileset dir="../../lib/alfresco-webscript"/>
+ </copy>
+ </target>
+
<target name="download-cleanup">
<delete>
<fileset dir="test-materials-proprietary" excludes="README*.txt"/>