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/04 14:52:43 UTC
svn commit: r1629381 - in /manifoldcf/branches/dev_1x: ./ CHANGES.txt
build.xml common-build.xml connectors/alfresco-webscript/
connectors/pom.xml framework/build.xml
Author: kwright
Date: Sat Oct 4 12:52:42 2014
New Revision: 1629381
URL: http://svn.apache.org/r1629381
Log:
Pull up CONNECTORS-1037 (alfresco web-script connector and authority) from trunk
Added:
manifoldcf/branches/dev_1x/connectors/alfresco-webscript/
- copied from r1629379, manifoldcf/trunk/connectors/alfresco-webscript/
Modified:
manifoldcf/branches/dev_1x/ (props changed)
manifoldcf/branches/dev_1x/CHANGES.txt
manifoldcf/branches/dev_1x/build.xml
manifoldcf/branches/dev_1x/common-build.xml
manifoldcf/branches/dev_1x/connectors/pom.xml
manifoldcf/branches/dev_1x/framework/build.xml
Propchange: manifoldcf/branches/dev_1x/
------------------------------------------------------------------------------
Merged /manifoldcf/branches/CONNECTORS-1037:r1628690-1629377
Merged /manifoldcf/trunk:r1629379
Modified: manifoldcf/branches/dev_1x/CHANGES.txt
URL: http://svn.apache.org/viewvc/manifoldcf/branches/dev_1x/CHANGES.txt?rev=1629381&r1=1629380&r2=1629381&view=diff
==============================================================================
--- manifoldcf/branches/dev_1x/CHANGES.txt (original)
+++ manifoldcf/branches/dev_1x/CHANGES.txt Sat Oct 4 12:52:42 2014
@@ -3,6 +3,9 @@ $Id$
======================= 1.8-dev =====================
+CONNECTORS-1037: Add Alfresco webscript connector and authority.
+(Maurizio Pillitu, Rafa Haro, Karl Wright)
+
CONNECTORS-1055: Fix Zulu date parsing.
(Karl Wright)
Modified: manifoldcf/branches/dev_1x/build.xml
URL: http://svn.apache.org/viewvc/manifoldcf/branches/dev_1x/build.xml?rev=1629381&r1=1629380&r2=1629381&view=diff
==============================================================================
--- manifoldcf/branches/dev_1x/build.xml (original)
+++ manifoldcf/branches/dev_1x/build.xml Sat Oct 4 12:52:42 2014
@@ -29,6 +29,13 @@
<defaultexcludes add="**/*.iml"/>
<defaultexcludes add="**/.idea/**"/>
+ <property name="alfresco-indexer-client.version" value="0.6.2"/>
+ <property name="gson.version" value="2.2.4"/>
+ <property name="guava.version" value="15.0"/>
+ <property name="mockito.version" value="1.9.5"/>
+ <property name="wiremock.version" value="1.34"/>
+ <property name="objenesis.version" value="2.1"/>
+
<target name="downloaded-condition">
<!-- Spot check a few of the dependent jars; no point including ALL of them here... -->
<available file="lib/derby.jar" property="derby-found"/>
@@ -649,6 +656,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"/>
@@ -1212,6 +1237,28 @@ Use Apache Forrest version forrest-0.9-d
</antcall>
</target>
+ <target name="download-mockito">
+ <mkdir dir="lib"/>
+ <antcall target="download-via-maven"><param name="target" value="lib"/>
+ <param name="project-path" value="org/mockito"/>
+ <param name="artifact-version" value="${mockito.version}"/>
+ <param name="artifact-name" value="mockito-core"/>
+ <param name="artifact-type" value="jar"/>
+ </antcall>
+ <antcall target="download-via-maven"><param name="target" value="lib"/>
+ <param name="project-path" value="com/github/tomakehurst"/>
+ <param name="artifact-version" value="${wiremock.version}"/>
+ <param name="artifact-name" value="wiremock"/>
+ <param name="artifact-type" value="jar"/>
+ </antcall>
+ <antcall target="download-via-maven"><param name="target" value="lib"/>
+ <param name="project-path" value="org/objenesis"/>
+ <param name="artifact-version" value="${objenesis.version}"/>
+ <param name="artifact-name" value="objenesis"/>
+ <param name="artifact-type" value="jar"/>
+ </antcall>
+ </target>
+
<target name="download-log4j">
<mkdir dir="lib"/>
<antcall target="download-via-maven"><param name="target" value="lib"/>
@@ -1569,7 +1616,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>
@@ -1810,7 +1857,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-derby,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,do
wnload-ecj,download-hadoop,download-protobuf,download-tika,download-jackson">
+ <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-derby,download-postgresql,download-axis,download-saaj,download-wsdl4j,download-castor,download-jetty,download-slf4j,download-xalan,download-activation,download-a
valon-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/branches/dev_1x/common-build.xml
URL: http://svn.apache.org/viewvc/manifoldcf/branches/dev_1x/common-build.xml?rev=1629381&r1=1629380&r2=1629381&view=diff
==============================================================================
--- manifoldcf/branches/dev_1x/common-build.xml (original)
+++ manifoldcf/branches/dev_1x/common-build.xml Sat Oct 4 12:52:42 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-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/dev_1x/connectors/pom.xml
URL: http://svn.apache.org/viewvc/manifoldcf/branches/dev_1x/connectors/pom.xml?rev=1629381&r1=1629380&r2=1629381&view=diff
==============================================================================
--- manifoldcf/branches/dev_1x/connectors/pom.xml (original)
+++ manifoldcf/branches/dev_1x/connectors/pom.xml Sat Oct 4 12:52:42 2014
@@ -34,6 +34,7 @@
<modules>
<!-- common modules -->
<module>activedirectory</module>
+ <module>alfresco-webscript</module>
<module>filesystem</module>
<module>gts</module>
<module>hdfs</module>
Modified: manifoldcf/branches/dev_1x/framework/build.xml
URL: http://svn.apache.org/viewvc/manifoldcf/branches/dev_1x/framework/build.xml?rev=1629381&r1=1629380&r2=1629381&view=diff
==============================================================================
--- manifoldcf/branches/dev_1x/framework/build.xml (original)
+++ manifoldcf/branches/dev_1x/framework/build.xml Sat Oct 4 12:52:42 2014
@@ -61,7 +61,6 @@
<include name="slf4j*.jar"/>
<include name="jsp-2.1*.jar"/>
<include name="jsp-api*.jar"/>
- <include name="junit*.jar"/>
<include name="log4j*.jar"/>
<include name="serializer*.jar"/>
<include name="servlet-api*.jar"/>
@@ -77,6 +76,12 @@
<include name="derby*.jar"/>
<include name="hsqldb*.jar"/>
</fileset>
+ <fileset dir="../lib">
+ <include name="junit*.jar"/>
+ <include name="mockito-core*.jar"/>
+ <include name="wiremock*.jar"/>
+ <include name="objenesis*.jar"/>
+ </fileset>
<fileset dir="../lib-proprietary">
<include name="mysql*.jar"/>
<include name="ojdbc*.jar"/>
@@ -1640,6 +1645,9 @@
<copy todir="dist/test-lib">
<fileset dir="../lib">
<include name="junit*.jar"/>
+ <include name="mockito-core*.jar"/>
+ <include name="wiremock*.jar"/>
+ <include name="objenesis*.jar"/>
<include name="juli*.jar"/>
</fileset>
<fileset dir="build/test-jar">