manifoldcf-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From kwri...@apache.org
Subject svn commit: r1629379 - in /manifoldcf/trunk: ./ CHANGES.txt build.xml common-build.xml connectors/alfresco-webscript/ connectors/pom.xml framework/build.xml
Date Sat, 04 Oct 2014 12:41:05 GMT
Author: kwright
Date: Sat Oct  4 12:41:05 2014
New Revision: 1629379

URL: http://svn.apache.org/r1629379
Log:
Merge changes for CONNECTORS-1037 from the CONNECTORS-1037 branch

Added:
    manifoldcf/trunk/connectors/alfresco-webscript/
      - copied from r1629377, manifoldcf/branches/CONNECTORS-1037/connectors/alfresco-webscript/
Modified:
    manifoldcf/trunk/   (props changed)
    manifoldcf/trunk/CHANGES.txt
    manifoldcf/trunk/build.xml
    manifoldcf/trunk/common-build.xml
    manifoldcf/trunk/connectors/pom.xml
    manifoldcf/trunk/framework/build.xml

Propchange: manifoldcf/trunk/
------------------------------------------------------------------------------
  Merged /manifoldcf/branches/CONNECTORS-1037:r1628690-1629377

Modified: manifoldcf/trunk/CHANGES.txt
URL: http://svn.apache.org/viewvc/manifoldcf/trunk/CHANGES.txt?rev=1629379&r1=1629378&r2=1629379&view=diff
==============================================================================
--- manifoldcf/trunk/CHANGES.txt (original)
+++ manifoldcf/trunk/CHANGES.txt Sat Oct  4 12:41:05 2014
@@ -3,6 +3,9 @@ $Id$
 
 ======================= 2.0-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/trunk/build.xml
URL: http://svn.apache.org/viewvc/manifoldcf/trunk/build.xml?rev=1629379&r1=1629378&r2=1629379&view=diff
==============================================================================
--- manifoldcf/trunk/build.xml (original)
+++ manifoldcf/trunk/build.xml Sat Oct  4 12:41:05 2014
@@ -93,7 +93,13 @@
     <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.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/hsqldb-${hsqldb.version}.jar" property="hsqldb-found"/>
@@ -692,6 +698,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"/>
 
@@ -1157,6 +1181,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"/>
@@ -1505,7 +1551,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>
@@ -1740,7 +1786,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-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">
         <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=1629379&r1=1629378&r2=1629379&view=diff
==============================================================================
--- manifoldcf/trunk/common-build.xml (original)
+++ manifoldcf/trunk/common-build.xml Sat Oct  4 12:41:05 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/trunk/connectors/pom.xml
URL: http://svn.apache.org/viewvc/manifoldcf/trunk/connectors/pom.xml?rev=1629379&r1=1629378&r2=1629379&view=diff
==============================================================================
--- manifoldcf/trunk/connectors/pom.xml (original)
+++ manifoldcf/trunk/connectors/pom.xml Sat Oct  4 12:41:05 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/trunk/framework/build.xml
URL: http://svn.apache.org/viewvc/manifoldcf/trunk/framework/build.xml?rev=1629379&r1=1629378&r2=1629379&view=diff
==============================================================================
--- manifoldcf/trunk/framework/build.xml (original)
+++ manifoldcf/trunk/framework/build.xml Sat Oct  4 12:41:05 2014
@@ -60,7 +60,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="javax.servlet-api*.jar"/>
@@ -75,6 +74,12 @@
             <include name="postgresql*.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"/>
@@ -1652,6 +1657,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">



Mime
View raw message