manifoldcf-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From kwri...@apache.org
Subject svn commit: r1708692 - in /manifoldcf/trunk: ./ CHANGES.txt build.xml connectors/kafka/ connectors/pom.xml dist-license/LICENSE.txt framework/build.xml lib-license/LICENSE.txt
Date Wed, 14 Oct 2015 20:56:47 GMT
Author: kwright
Date: Wed Oct 14 20:56:46 2015
New Revision: 1708692

URL: http://svn.apache.org/viewvc?rev=1708692&view=rev
Log:
Fix for CONNECTORS-1162.  Committed on behalf of Tugba Dogan.

Added:
    manifoldcf/trunk/connectors/kafka/
      - copied from r1708691, manifoldcf/branches/CONNECTORS-1162/connectors/kafka/
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/framework/build.xml
    manifoldcf/trunk/lib-license/LICENSE.txt

Propchange: manifoldcf/trunk/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Wed Oct 14 20:56:46 2015
@@ -51,6 +51,7 @@
 /manifoldcf/branches/CONNECTORS-1134:1649449-1649604
 /manifoldcf/branches/CONNECTORS-1160:1663182-1666294
 /manifoldcf/branches/CONNECTORS-1161:1695534-1695671
+/manifoldcf/branches/CONNECTORS-1162:1708552-1708691
 /manifoldcf/branches/CONNECTORS-1168:1666253-1668311
 /manifoldcf/branches/CONNECTORS-1177:1670213-1670613
 /manifoldcf/branches/CONNECTORS-120:1406712-1407974,1407982-1411043,1411049-1416451

Modified: manifoldcf/trunk/CHANGES.txt
URL: http://svn.apache.org/viewvc/manifoldcf/trunk/CHANGES.txt?rev=1708692&r1=1708691&r2=1708692&view=diff
==============================================================================
--- manifoldcf/trunk/CHANGES.txt (original)
+++ manifoldcf/trunk/CHANGES.txt Wed Oct 14 20:56:46 2015
@@ -3,6 +3,9 @@ $Id$
 
 ======================= 2.3-dev =====================
 
+CONNECTORS-1162: Kafka connector.
+(Tugba Dogan)
+
 CONNECTORS-1245: Using wrong logger for confluence authority.
 (Jens Grassel, Karl Wright)
 

Modified: manifoldcf/trunk/build.xml
URL: http://svn.apache.org/viewvc/manifoldcf/trunk/build.xml?rev=1708692&r1=1708691&r2=1708692&view=diff
==============================================================================
--- manifoldcf/trunk/build.xml (original)
+++ manifoldcf/trunk/build.xml Wed Oct 14 20:56:46 2015
@@ -1692,7 +1692,32 @@ Use Apache Forrest version forrest-0.9-d
             <fileset dir="build/download/apache-manifoldcf-elasticsearch-1.5-plugin-bin/elasticsearch-1.5-plugin-mcf-2.0"/>
         </copy>
     </target>
-
+	
+    <target name="download-kafka-client">
+        <mkdir dir="lib"/>
+        <antcall target="download-via-maven">
+            <param name="target" value="lib"/>
+            <param name="project-path" value="org/apache/kafka"/>
+            <param name="artifact-version" value="0.8.2.1"/>
+            <param name="artifact-name" value="kafka-clients"/>
+            <param name="artifact-type" value="jar"/>
+        </antcall>
+        <antcall target="download-via-maven">
+            <param name="target" value="lib"/>
+            <param name="project-path" value="net/jpountz/lz4"/>
+            <param name="artifact-version" value="1.3.0"/>
+            <param name="artifact-name" value="lz4"/>
+            <param name="artifact-type" value="jar"/>
+        </antcall>
+        <antcall target="download-via-maven">
+            <param name="target" value="lib"/>
+            <param name="project-path" value="org/xerial/snappy"/>
+            <param name="artifact-version" value="1.1.2"/>
+            <param name="artifact-name" value="snappy-java"/>
+            <param name="artifact-type" value="jar"/>
+        </antcall>
+    </target>
+    
    <target name="download-dropbox-client">
         <mkdir dir="lib"/>
         <antcall target="download-via-maven">
@@ -2298,7 +2323,7 @@ Use Apache Forrest version forrest-0.9-d
         </antcall>
     </target>
   
-    <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">
+    <target name="make-core-deps" depends="download-kafka-client,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-s
 aaj,download-wsdl4j,download-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>
@@ -2354,4 +2379,4 @@ Use Apache Forrest version forrest-0.9-d
         <ant dir="site" target="download-cleanup"/>
     </target>
     
-</project>
+</project>
\ No newline at end of file

Modified: manifoldcf/trunk/connectors/pom.xml
URL: http://svn.apache.org/viewvc/manifoldcf/trunk/connectors/pom.xml?rev=1708692&r1=1708691&r2=1708692&view=diff
==============================================================================
--- manifoldcf/trunk/connectors/pom.xml (original)
+++ manifoldcf/trunk/connectors/pom.xml Wed Oct 14 20:56:46 2015
@@ -67,6 +67,7 @@
     <module>searchblox</module>
     <module>confluence</module>
     <module>amazons3</module>
+    <module>kafka</module>
   </modules>
 
 </project>

Modified: manifoldcf/trunk/dist-license/LICENSE.txt
URL: http://svn.apache.org/viewvc/manifoldcf/trunk/dist-license/LICENSE.txt?rev=1708692&r1=1708691&r2=1708692&view=diff
==============================================================================
--- manifoldcf/trunk/dist-license/LICENSE.txt (original)
+++ manifoldcf/trunk/dist-license/LICENSE.txt Wed Oct 14 20:56:46 2015
@@ -196,6 +196,7 @@ including, but not limited to:
   - Apache XMLBeans
   - Apache SIS
   - Apache OpenNLP
+  - Apache Kafka
 
 This product includes code from: http://www.json.org
 License: JSON license (http://www.json.org/license.html)
@@ -426,6 +427,12 @@ This product includes a c3p0.jar.
 License: Dual license consisting of LGPL v2.1 and EPL v1.0 ((http://www.gnu.org/licenses/lgpl-2.1.html
and http://www.eclipse.org/org/documents/epl-v10.php)
 Jar included under terms of EPL v1.0 license.
 
+This product includes a lz4-java.jar.
+License: Apache 2 (http://www.apache.org/licenses/LICENSE-2.0.txt)
+
+This product includes a snappy-java.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/framework/build.xml
URL: http://svn.apache.org/viewvc/manifoldcf/trunk/framework/build.xml?rev=1708692&r1=1708691&r2=1708692&view=diff
==============================================================================
--- manifoldcf/trunk/framework/build.xml (original)
+++ manifoldcf/trunk/framework/build.xml Wed Oct 14 20:56:46 2015
@@ -1411,6 +1411,8 @@
                 <include name="pdfbox*.jar"/>
                 <include name="fontbox*.jar"/>
                 <include name="jempbox*.jar"/>
+                <include name="kafka*.jar"/>
+		<include name="zookeeper*.jar"/>
                 <include name="bcmail-jdk15*.jar"/>
                 <include name="bcprov-jdk15*.jar"/>
                 <include name="xmlbeans*.jar"/>

Modified: manifoldcf/trunk/lib-license/LICENSE.txt
URL: http://svn.apache.org/viewvc/manifoldcf/trunk/lib-license/LICENSE.txt?rev=1708692&r1=1708691&r2=1708692&view=diff
==============================================================================
--- manifoldcf/trunk/lib-license/LICENSE.txt (original)
+++ manifoldcf/trunk/lib-license/LICENSE.txt Wed Oct 14 20:56:46 2015
@@ -196,6 +196,7 @@ including, but not limited to:
   - Apache XMLBeans
   - Apache SIS
   - Apache OpenNLP
+  - Apache Kafka
 
 This product includes code from: http://www.json.org
 License: JSON license (http://www.json.org/license.html)
@@ -441,6 +442,12 @@ This product includes a c3p0.jar.
 License: Dual license consisting of LGPL v2.1 and EPL v1.0 (http://www.gnu.org/licenses/lgpl-2.1.html
and http://www.eclipse.org/org/documents/epl-v10.php)
 Jar included under terms of EPL v1.0 license.
 
+This product includes a lz4-java.jar.
+License: Apache 2 (http://www.apache.org/licenses/LICENSE-2.0.txt)
+
+This product includes a snappy-java.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