manifoldcf-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From kwri...@apache.org
Subject svn commit: r1701874 - in /manifoldcf/trunk: ./ CHANGES.txt build.xml connectors/amazons3/ connectors/pom.xml dist-license/LICENSE.txt lib-license/LICENSE.txt
Date Tue, 08 Sep 2015 21:16:10 GMT
Author: kwright
Date: Tue Sep  8 21:16:10 2015
New Revision: 1701874

URL: http://svn.apache.org/r1701874
Log:
Fix for CONNECTORS-1233.

Added:
    manifoldcf/trunk/connectors/amazons3/
      - copied from r1701871, manifoldcf/branches/CONNECTORS-1233/connectors/amazons3/
Modified:
    manifoldcf/trunk/   (props changed)
    manifoldcf/trunk/CHANGES.txt
    manifoldcf/trunk/build.xml
    manifoldcf/trunk/connectors/pom.xml
    manifoldcf/trunk/dist-license/LICENSE.txt
    manifoldcf/trunk/lib-license/LICENSE.txt

Propchange: manifoldcf/trunk/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Tue Sep  8 21:16:10 2015
@@ -56,6 +56,7 @@
 /manifoldcf/branches/CONNECTORS-120:1406712-1407974,1407982-1411043,1411049-1416451
 /manifoldcf/branches/CONNECTORS-120-1:1416450-1417056
 /manifoldcf/branches/CONNECTORS-1204:1682204-1682409
+/manifoldcf/branches/CONNECTORS-1233:1697988-1701871
 /manifoldcf/branches/CONNECTORS-13:1525862-1527182,1539324-1541634
 /manifoldcf/branches/CONNECTORS-470:1349741-1360750,1360808
 /manifoldcf/branches/CONNECTORS-474:1349741-1353803

Modified: manifoldcf/trunk/CHANGES.txt
URL: http://svn.apache.org/viewvc/manifoldcf/trunk/CHANGES.txt?rev=1701874&r1=1701873&r2=1701874&view=diff
==============================================================================
--- manifoldcf/trunk/CHANGES.txt (original)
+++ manifoldcf/trunk/CHANGES.txt Tue Sep  8 21:16:10 2015
@@ -3,6 +3,9 @@ $Id$
 
 ======================= 2.3-dev =====================
 
+CONNECTORS-1233: Add Amazon S3 connector.
+(Gunaratnam Kuhajeyan, Karl Wright)
+
 CONNECTORS-1230: Add writeLimit option on Tika extractor.
 (Shinichiro Abe)
 

Modified: manifoldcf/trunk/build.xml
URL: http://svn.apache.org/viewvc/manifoldcf/trunk/build.xml?rev=1701874&r1=1701873&r2=1701874&view=diff
==============================================================================
--- manifoldcf/trunk/build.xml (original)
+++ manifoldcf/trunk/build.xml Tue Sep  8 21:16:10 2015
@@ -129,7 +129,8 @@
     <property name="resteasy.client.version" value="3.0.8.Final"/>
     <property name="jsoup.version" value="1.8.1"/>
     <property name="hadoop.version" value="2.6.0"/>
-
+    <property name="aws-sdk.version" value="1.9.0"/>
+    <property name="joda-time.version" value="2.8.2"/>
 
     <target name="downloaded-condition">
         <!-- Spot check a few of the dependent jars; no point including ALL of them here...
-->
@@ -885,6 +886,177 @@ Use Apache Forrest version forrest-0.9-d
         </antcall>
     </target>
 
+    <target name="download-aws-sdk">
+        <mkdir dir="lib"/>
+        <property name="aws-sdk-package" value="com/amazonaws"/>
+        <!-- antcall target="download-via-maven"><param name="project-path" value="${aws-sdk-package}"/><param
name="artifact-version" value="${aws-sdk.version}"/><param name="target" value="lib"/>
+            <param name="artifact-name" value="aws-java-sdk"/>
+            <param name="artifact-type" value="jar"/>
+        </antcall>
+        <antcall target="download-via-maven"><param name="project-path" value="${aws-sdk-package}"/><param
name="artifact-version" value="${aws-sdk.version}"/><param name="target" value="lib"/>
+            <param name="artifact-name" value="aws-java-sdk-directconnect"/>
+            <param name="artifact-type" value="jar"/>
+        </antcall>
+        <antcall target="download-via-maven"><param name="project-path" value="${aws-sdk-package}"/><param
name="artifact-version" value="${aws-sdk.version}"/><param name="target" value="lib"/>
+            <param name="artifact-name" value="aws-java-sdk-logs"/>
+            <param name="artifact-type" value="jar"/>
+        </antcall>
+        <antcall target="download-via-maven"><param name="project-path" value="${aws-sdk-package}"/><param
name="artifact-version" value="${aws-sdk.version}"/><param name="target" value="lib"/>
+            <param name="artifact-name" value="aws-java-sdk-elasticbeanstalk"/>
+            <param name="artifact-type" value="jar"/>
+        </antcall>
+        <antcall target="download-via-maven"><param name="project-path" value="${aws-sdk-package}"/><param
name="artifact-version" value="${aws-sdk.version}"/><param name="target" value="lib"/>
+            <param name="artifact-name" value="aws-java-sdk-iam"/>
+            <param name="artifact-type" value="jar"/>
+        </antcall>
+        <antcall target="download-via-maven"><param name="project-path" value="${aws-sdk-package}"/><param
name="artifact-version" value="${aws-sdk.version}"/><param name="target" value="lib"/>
+            <param name="artifact-name" value="aws-java-sdk-autoscaling"/>
+            <param name="artifact-type" value="jar"/>
+        </antcall>
+        <antcall target="download-via-maven"><param name="project-path" value="${aws-sdk-package}"/><param
name="artifact-version" value="${aws-sdk.version}"/><param name="target" value="lib"/>
+            <param name="artifact-name" value="aws-java-sdk-emr"/>
+            <param name="artifact-type" value="jar"/>
+        </antcall>
+        <antcall target="download-via-maven"><param name="project-path" value="${aws-sdk-package}"/><param
name="artifact-version" value="${aws-sdk.version}"/><param name="target" value="lib"/>
+            <param name="artifact-name" value="aws-java-sdk-cognitoidentity"/>
+            <param name="artifact-type" value="jar"/>
+        </antcall>
+        <antcall target="download-via-maven"><param name="project-path" value="${aws-sdk-package}"/><param
name="artifact-version" value="${aws-sdk.version}"/><param name="target" value="lib"/>
+            <param name="artifact-name" value="aws-java-sdk-cloudwatchmetrics"/>
+            <param name="artifact-type" value="jar"/>
+        </antcall>
+        <antcall target="download-via-maven"><param name="project-path" value="${aws-sdk-package}"/><param
name="artifact-version" value="${aws-sdk.version}"/><param name="target" value="lib"/>
+            <param name="artifact-name" value="aws-java-sdk-cloudwatch"/>
+            <param name="artifact-type" value="jar"/>
+        </antcall>
+        <antcall target="download-via-maven"><param name="project-path" value="${aws-sdk-package}"/><param
name="artifact-version" value="${aws-sdk.version}"/><param name="target" value="lib"/>
+            <param name="artifact-name" value="aws-java-sdk-dynamodb"/>
+            <param name="artifact-type" value="jar"/>
+        </antcall>
+        <antcall target="download-via-maven"><param name="project-path" value="${aws-sdk-package}"/><param
name="artifact-version" value="${aws-sdk.version}"/><param name="target" value="lib"/>
+            <param name="artifact-name" value="aws-java-sdk-ses"/>
+            <param name="artifact-type" value="jar"/>
+        </antcall>
+        <antcall target="download-via-maven"><param name="project-path" value="${aws-sdk-package}"/><param
name="artifact-version" value="${aws-sdk.version}"/><param name="target" value="lib"/>
+            <param name="artifact-name" value="aws-java-sdk-simpleworkflow"/>
+            <param name="artifact-type" value="jar"/>
+        </antcall>
+        <antcall target="download-via-maven"><param name="project-path" value="${aws-sdk-package}"/><param
name="artifact-version" value="${aws-sdk.version}"/><param name="target" value="lib"/>
+            <param name="artifact-name" value="aws-java-sdk-swf-libraries"/>
+            <param name="artifact-type" value="jar"/>
+        </antcall>
+        <antcall target="download-via-maven"><param name="project-path" value="${aws-sdk-package}"/><param
name="artifact-version" value="${aws-sdk.version}"/><param name="target" value="lib"/>
+            <param name="artifact-name" value="aws-java-sdk-importexport"/>
+            <param name="artifact-type" value="jar"/>
+        </antcall>
+        <antcall target="download-via-maven"><param name="project-path" value="${aws-sdk-package}"/><param
name="artifact-version" value="${aws-sdk.version}"/><param name="target" value="lib"/>
+            <param name="artifact-name" value="aws-java-sdk-support"/>
+            <param name="artifact-type" value="jar"/>
+        </antcall>
+        <antcall target="download-via-maven"><param name="project-path" value="${aws-sdk-package}"/><param
name="artifact-version" value="${aws-sdk.version}"/><param name="target" value="lib"/>
+            <param name="artifact-name" value="aws-java-sdk-elasticache"/>
+            <param name="artifact-type" value="jar"/>
+        </antcall>
+        <antcall target="download-via-maven"><param name="project-path" value="${aws-sdk-package}"/><param
name="artifact-version" value="${aws-sdk.version}"/><param name="target" value="lib"/>
+            <param name="artifact-name" value="aws-java-sdk-cloudfront"/>
+            <param name="artifact-type" value="jar"/>
+        </antcall>
+        <antcall target="download-via-maven"><param name="project-path" value="${aws-sdk-package}"/><param
name="artifact-version" value="${aws-sdk.version}"/><param name="target" value="lib"/>
+            <param name="artifact-name" value="aws-java-sdk-opsworks"/>
+            <param name="artifact-type" value="jar"/>
+        </antcall>
+        <antcall target="download-via-maven"><param name="project-path" value="${aws-sdk-package}"/><param
name="artifact-version" value="${aws-sdk.version}"/><param name="target" value="lib"/>
+            <param name="artifact-name" value="aws-java-sdk-storagegateway"/>
+            <param name="artifact-type" value="jar"/>
+        </antcall>
+        <antcall target="download-via-maven"><param name="project-path" value="${aws-sdk-package}"/><param
name="artifact-version" value="${aws-sdk.version}"/><param name="target" value="lib"/>
+            <param name="artifact-name" value="aws-java-sdk-kinesis"/>
+            <param name="artifact-type" value="jar"/>
+        </antcall>
+        <antcall target="download-via-maven"><param name="project-path" value="${aws-sdk-package}"/><param
name="artifact-version" value="${aws-sdk.version}"/><param name="target" value="lib"/>
+            <param name="artifact-name" value="aws-java-sdk-redshift"/>
+            <param name="artifact-type" value="jar"/>
+        </antcall>
+        <antcall target="download-via-maven"><param name="project-path" value="${aws-sdk-package}"/><param
name="artifact-version" value="${aws-sdk.version}"/><param name="target" value="lib"/>
+            <param name="artifact-name" value="aws-java-sdk-cloudsearch"/>
+            <param name="artifact-type" value="jar"/>
+        </antcall>
+        <antcall target="download-via-maven"><param name="project-path" value="${aws-sdk-package}"/><param
name="artifact-version" value="${aws-sdk.version}"/><param name="target" value="lib"/>
+            <param name="artifact-name" value="aws-java-sdk-cloudformation"/>
+            <param name="artifact-type" value="jar"/>
+        </antcall>
+        <antcall target="download-via-maven"><param name="project-path" value="${aws-sdk-package}"/><param
name="artifact-version" value="${aws-sdk.version}"/><param name="target" value="lib"/>
+            <param name="artifact-name" value="aws-java-sdk-rds"/>
+            <param name="artifact-type" value="jar"/>
+        </antcall>
+        <antcall target="download-via-maven"><param name="project-path" value="${aws-sdk-package}"/><param
name="artifact-version" value="${aws-sdk.version}"/><param name="target" value="lib"/>
+            <param name="artifact-name" value="aws-java-sdk-sts"/>
+            <param name="artifact-type" value="jar"/>
+        </antcall>
+        <antcall target="download-via-maven"><param name="project-path" value="${aws-sdk-package}"/><param
name="artifact-version" value="${aws-sdk.version}"/><param name="target" value="lib"/>
+            <param name="artifact-name" value="aws-java-sdk-route53"/>
+            <param name="artifact-type" value="jar"/>
+        </antcall>
+        <antcall target="download-via-maven"><param name="project-path" value="${aws-sdk-package}"/><param
name="artifact-version" value="${aws-sdk.version}"/><param name="target" value="lib"/>
+            <param name="artifact-name" value="aws-java-sdk-glacier"/>
+            <param name="artifact-type" value="jar"/>
+        </antcall>
+        <antcall target="download-via-maven"><param name="project-path" value="${aws-sdk-package}"/><param
name="artifact-version" value="${aws-sdk.version}"/><param name="target" value="lib"/>
+            <param name="artifact-name" value="aws-java-sdk-sqs"/>
+            <param name="artifact-type" value="jar"/>
+        </antcall>
+        <antcall target="download-via-maven"><param name="project-path" value="${aws-sdk-package}"/><param
name="artifact-version" value="${aws-sdk.version}"/><param name="target" value="lib"/>
+            <param name="artifact-name" value="aws-java-sdk-sns"/>
+            <param name="artifact-type" value="jar"/>
+        </antcall>
+        <antcall target="download-via-maven"><param name="project-path" value="${aws-sdk-package}"/><param
name="artifact-version" value="${aws-sdk.version}"/><param name="target" value="lib"/>
+            <param name="artifact-name" value="aws-java-sdk-cloudtrail"/>
+            <param name="artifact-type" value="jar"/>
+        </antcall>
+        <antcall target="download-via-maven"><param name="project-path" value="${aws-sdk-package}"/><param
name="artifact-version" value="${aws-sdk.version}"/><param name="target" value="lib"/>
+            <param name="artifact-name" value="aws-java-sdk-ec2"/>
+            <param name="artifact-type" value="jar"/>
+        </antcall>
+        <antcall target="download-via-maven"><param name="project-path" value="${aws-sdk-package}"/><param
name="artifact-version" value="${aws-sdk.version}"/><param name="target" value="lib"/>
+            <param name="artifact-name" value="aws-java-sdk-cognitosync"/>
+            <param name="artifact-type" value="jar"/>
+        </antcall>
+        <antcall target="download-via-maven"><param name="project-path" value="${aws-sdk-package}"/><param
name="artifact-version" value="${aws-sdk.version}"/><param name="target" value="lib"/>
+            <param name="artifact-name" value="aws-java-sdk-simpledb"/>
+            <param name="artifact-type" value="jar"/>
+        </antcall>
+        <antcall target="download-via-maven"><param name="project-path" value="${aws-sdk-package}"/><param
name="artifact-version" value="${aws-sdk.version}"/><param name="target" value="lib"/>
+            <param name="artifact-name" value="aws-java-sdk-datapipeline"/>
+            <param name="artifact-type" value="jar"/>
+        </antcall>
+        <antcall target="download-via-maven"><param name="project-path" value="${aws-sdk-package}"/><param
name="artifact-version" value="${aws-sdk.version}"/><param name="target" value="lib"/>
+            <param name="artifact-name" value="aws-java-sdk-elasticloadbalancing"/>
+            <param name="artifact-type" value="jar"/>
+        </antcall>
+        <antcall target="download-via-maven"><param name="project-path" value="${aws-sdk-package}"/><param
name="artifact-version" value="${aws-sdk.version}"/><param name="target" value="lib"/>
+            <param name="artifact-name" value="aws-java-sdk-elastictranscoder"/>
+            <param name="artifact-type" value="jar"/>
+        </antcall-->
+        <antcall target="download-via-maven"><param name="project-path" value="${aws-sdk-package}"/><param
name="artifact-version" value="${aws-sdk.version}"/><param name="target" value="lib"/>
+            <param name="artifact-name" value="aws-java-sdk-s3"/>
+            <param name="artifact-type" value="jar"/>
+        </antcall>
+        <antcall target="download-via-maven"><param name="project-path" value="${aws-sdk-package}"/><param
name="artifact-version" value="${aws-sdk.version}"/><param name="target" value="lib"/>
+            <param name="artifact-name" value="aws-java-sdk-core"/>
+            <param name="artifact-type" value="jar"/>
+        </antcall>
+    </target>
+    
+    <target name="download-joda-time">
+        <mkdir dir="lib"/>
+        <antcall target="download-via-maven"><param name="target" value="lib"/>
+            <param name="project-path" value="joda-time"/>
+            <param name="artifact-version" value="${joda-time.version}"/>
+            <param name="artifact-name" value="joda-time"/>
+            <param name="artifact-type" value="jar"/>
+        </antcall>
+    </target>
+    
     <target name="download-axis">
         <mkdir dir="lib"/>
         <property name="axis-package" value="org/apache/axis"/>
@@ -1970,7 +2142,7 @@ Use Apache Forrest version forrest-0.9-d
         </antcall>
     </target>
 	
-    <target name="make-core-deps" depends="download-resteasy,download-jsoup,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-woodstox,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,downloa
 d-slf4j,download-xalan,download-activation,download-avalon-framework,download-poi,download-chemistry,download-ecj,download-hadoop,download-htrace,download-protobuf,download-tika,download-jackson">
+    <target name="make-core-deps" depends="download-joda-time,download-aws-sdk,download-resteasy,download-jsoup,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-woodstox,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,do
 wnload-castor,download-jetty,download-slf4j,download-xalan,download-activation,download-avalon-framework,download-poi,download-chemistry,download-ecj,download-hadoop,download-htrace,download-protobuf,download-tika,download-jackson">
         <copy todir="lib">
             <fileset dir="lib-license" includes="*.txt"/>
         </copy>

Modified: manifoldcf/trunk/connectors/pom.xml
URL: http://svn.apache.org/viewvc/manifoldcf/trunk/connectors/pom.xml?rev=1701874&r1=1701873&r2=1701874&view=diff
==============================================================================
--- manifoldcf/trunk/connectors/pom.xml (original)
+++ manifoldcf/trunk/connectors/pom.xml Tue Sep  8 21:16:10 2015
@@ -66,6 +66,7 @@
     <module>documentfilter</module>
     <module>searchblox</module>
     <module>confluence</module>
+    <module>amazons3</module>
   </modules>
 
 </project>

Modified: manifoldcf/trunk/dist-license/LICENSE.txt
URL: http://svn.apache.org/viewvc/manifoldcf/trunk/dist-license/LICENSE.txt?rev=1701874&r1=1701873&r2=1701874&view=diff
==============================================================================
--- manifoldcf/trunk/dist-license/LICENSE.txt (original)
+++ manifoldcf/trunk/dist-license/LICENSE.txt Tue Sep  8 21:16:10 2015
@@ -383,6 +383,12 @@ License: Apache 2 (http://www.apache.org
 This product includes an xz.jar.
 License: Public domain
 
+This product includes a number of aws-java-sdk-* jars.
+License: Apache 2 (http://www.apache.org/licenses/LICENSE-2.0.txt)
+
+This product includes a joda-time.jar.
+License: Apache 2 (http://www.apache.org/licenses/LICENSE-2.0.txt)
+
 This product includes a jetty-server.jar, jetty-servlet.jar, jetty-io.jar, jetty-jndi.jar,
jetty-webapp.jar,
 jetty-plus.jar, jetty-util.jar, jetty-http.jar, jetty-security.jar, jetty-continuation.jar,
jetty-xml.jar,
 jetty-jsp-jdt.jar, and jetty-schemas.jar.

Modified: manifoldcf/trunk/lib-license/LICENSE.txt
URL: http://svn.apache.org/viewvc/manifoldcf/trunk/lib-license/LICENSE.txt?rev=1701874&r1=1701873&r2=1701874&view=diff
==============================================================================
--- manifoldcf/trunk/lib-license/LICENSE.txt (original)
+++ manifoldcf/trunk/lib-license/LICENSE.txt Tue Sep  8 21:16:10 2015
@@ -395,6 +395,12 @@ License: Apache 2 (http://www.apache.org
 This product includes a jsoup.jar.
 License: MIT license (http://opensource.org/licenses/MIT)
 
+This product includes a number of aws-java-sdk-* jars.
+License: Apache 2 (http://www.apache.org/licenses/LICENSE-2.0.txt)
+
+This product includes a joda-time.jar.
+License: Apache 2 (http://www.apache.org/licenses/LICENSE-2.0.txt)
+
 This product may include pdf files that embed IPA-licensed fonts.
 License: IPA Font License Agreement v1.0 (http://ossipedia.ipa.go.jp/ipafont/index.html#LicenseEng)
 



Mime
View raw message