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 2013/04/30 15:51:52 UTC
svn commit: r1477633 - in /manifoldcf/branches/release-1.2-branch: ./
connectors/ connectors/dropbox/ dist-license/
framework/core/src/main/java/org/apache/manifoldcf/core/common/
Author: kwright
Date: Tue Apr 30 13:51:52 2013
New Revision: 1477633
URL: http://svn.apache.org/r1477633
Log:
Pull up fix for CONNECTORS-676 to release branch.
Added:
manifoldcf/branches/release-1.2-branch/connectors/dropbox/ (props changed)
- copied from r1477631, manifoldcf/trunk/connectors/dropbox/
Modified:
manifoldcf/branches/release-1.2-branch/ (props changed)
manifoldcf/branches/release-1.2-branch/CHANGES.txt
manifoldcf/branches/release-1.2-branch/build.xml
manifoldcf/branches/release-1.2-branch/connectors/dropbox/pom.xml
manifoldcf/branches/release-1.2-branch/connectors/pom.xml
manifoldcf/branches/release-1.2-branch/dist-license/LICENSE.txt
manifoldcf/branches/release-1.2-branch/framework/core/src/main/java/org/apache/manifoldcf/core/common/XThreadInputStream.java
Propchange: manifoldcf/branches/release-1.2-branch/
------------------------------------------------------------------------------
Merged /manifoldcf/trunk:r1477631
Merged /manifoldcf/branches/CONNECTORS-676:r1470161-1477628
Modified: manifoldcf/branches/release-1.2-branch/CHANGES.txt
URL: http://svn.apache.org/viewvc/manifoldcf/branches/release-1.2-branch/CHANGES.txt?rev=1477633&r1=1477632&r2=1477633&view=diff
==============================================================================
--- manifoldcf/branches/release-1.2-branch/CHANGES.txt (original)
+++ manifoldcf/branches/release-1.2-branch/CHANGES.txt Tue Apr 30 13:51:52 2013
@@ -3,6 +3,9 @@ $Id$
======================= Release 1.2 =====================
+CONNECTORS-676: Include DropBox connector.
+(Andrew Janowczyk, Karl Wright)
+
CONNECTORS-678: Add missing noteModification() method calls, so
that jobqueue is reanalyzed more frequently.
(Karl Wright)
Modified: manifoldcf/branches/release-1.2-branch/build.xml
URL: http://svn.apache.org/viewvc/manifoldcf/branches/release-1.2-branch/build.xml?rev=1477633&r1=1477632&r2=1477633&view=diff
==============================================================================
--- manifoldcf/branches/release-1.2-branch/build.xml (original)
+++ manifoldcf/branches/release-1.2-branch/build.xml Tue Apr 30 13:51:52 2013
@@ -58,6 +58,7 @@
<ant dir="framework" target="clean"/>
<ant dir="connectors/alfresco" target="clean"/>
<ant dir="connectors/cmis" target="clean"/>
+ <ant dir="connectors/dropbox" target="clean"/>
<ant dir="connectors/activedirectory" target="clean"/>
<ant dir="connectors/ldap" target="clean"/>
<ant dir="connectors/documentum" target="clean"/>
@@ -108,6 +109,7 @@
<ant dir="framework" target="clean"/>
<ant dir="connectors/alfresco" target="clean"/>
<ant dir="connectors/cmis" target="clean"/>
+ <ant dir="connectors/dropbox" target="clean"/>
<ant dir="connectors/activedirectory" target="clean"/>
<ant dir="connectors/ldap" target="clean"/>
<ant dir="connectors/documentum" target="clean"/>
@@ -278,6 +280,8 @@
<target name="setup-cmis-connector" depends="build-framework" if="downloaded"/>
+ <target name="setup-dropbox-connector" depends="build-framework" if="downloaded"/>
+
<target name="setup-alfresco-connector-tests" depends="build-tests-framework" if="downloaded"/>
<target name="setup-cmis-connector-tests" depends="build-tests-framework" if="downloaded"/>
@@ -294,6 +298,14 @@
<ant dir="connectors/cmis" target="build"/>
</target>
+ <target name="build-dropbox-connector" depends="setup-dropbox-connector" if="downloaded">
+ <ant dir="connectors/dropbox" target="build"/>
+ </target>
+
+ <target name="doc-dropbox-connector" depends="setup-dropbox-connector" if="downloaded">
+ <ant dir="connectors/dropbox" target="doc"/>
+ </target>
+
<target name="doc-alfresco-connector" depends="setup-alfresco-connector" if="downloaded">
<ant dir="connectors/alfresco" target="doc"/>
</target>
@@ -1361,6 +1373,27 @@
</and>
</condition>
</target>
+
+
+ <target name="calculate-dropbox-condition" depends="build-dropbox-connector">
+ <available file="connectors/dropbox/dist/lib" type="dir" property="dropbox.exists"/>
+ <condition property="dropbox.include">
+ <and>
+ <isset property="dropbox.exists"/>
+ <isset property="downloaded"/>
+ </and>
+ </condition>
+ </target>
+
+ <target name="calculate-dropbox-doc-condition" depends="doc-dropbox-connector">
+ <available file="connectors/dropbox/dist/doc" type="dir" property="dropbox-doc.exists"/>
+ <condition property="dropbox-doc.include">
+ <and>
+ <isset property="dropbox-doc.exists"/>
+ <isset property="downloaded"/>
+ </and>
+ </condition>
+ </target>
<target name="calculate-cmis-doc-condition" depends="doc-cmis-connector">
<available file="connectors/cmis/dist/doc" type="dir" property="cmis-doc.exists"/>
@@ -1388,6 +1421,23 @@
</antcall>
</target>
+ <target name="deliver-dropbox-connector" depends="calculate-dropbox-condition" if="dropbox.include">
+ <antcall target="general-connector-delivery">
+ <param name="connector-name" value="dropbox"/>
+ </antcall>
+ <antcall target="general-add-repository-connector">
+ <param name="connector-name" value="dropbox"/>
+ <param name="connector-label" value="DropBox"/>
+ <param name="connector-class" value="org.apache.manifoldcf.crawler.connectors.dropbox.DropboxRepositoryConnector"/>
+ </antcall>
+ </target>
+
+ <target name="deliver-dropbox-connector-doc" depends="calculate-dropbox-doc-condition" if="dropbox-doc.include">
+ <antcall target="general-connector-doc-delivery">
+ <param name="connector-name" value="dropbox"/>
+ </antcall>
+ </target>
+
<target name="deliver-cmis-connector-doc" depends="calculate-cmis-doc-condition" if="cmis-doc.include">
<antcall target="general-connector-doc-delivery">
<param name="connector-name" value="cmis"/>
@@ -2536,8 +2586,8 @@
<target name="end-to-end-loadtests-HSQLDB" depends="run-filesystem-loadtests-HSQLDB,run-rss-loadtests-HSQLDB,run-wiki-loadtests-HSQLDB,run-alfresco-loadtests-HSQLDB,run-cmis-loadtests-HSQLDB,run-sharepoint-loadtests-HSQLDB"/>
- <target name="deliver-open-connectors" depends="deliver-nullauthority-connector,deliver-activedirectory-connector,deliver-ldap-connector,deliver-alfresco-connector,deliver-cmis-connector,deliver-filesystem-connector,deliver-rss-connector,deliver-webcrawler-connector,deliver-wiki-connector,deliver-jdbc-connector"/>
- <target name="deliver-open-connectors-doc" depends="deliver-nullauthority-connector-doc,deliver-activedirectory-connector-doc,deliver-ldap-connector-doc,deliver-alfresco-connector-doc,deliver-cmis-connector-doc,deliver-filesystem-connector-doc,deliver-rss-connector-doc,deliver-webcrawler-connector-doc,deliver-wiki-connector-doc,deliver-jdbc-connector-doc"/>
+ <target name="deliver-open-connectors" depends="deliver-dropbox-connector,deliver-nullauthority-connector,deliver-activedirectory-connector,deliver-ldap-connector,deliver-alfresco-connector,deliver-cmis-connector,deliver-filesystem-connector,deliver-rss-connector,deliver-webcrawler-connector,deliver-wiki-connector,deliver-jdbc-connector"/>
+ <target name="deliver-open-connectors-doc" depends="deliver-dropbox-connector-doc,deliver-nullauthority-connector-doc,deliver-activedirectory-connector-doc,deliver-ldap-connector-doc,deliver-alfresco-connector-doc,deliver-cmis-connector-doc,deliver-filesystem-connector-doc,deliver-rss-connector-doc,deliver-webcrawler-connector-doc,deliver-wiki-connector-doc,deliver-jdbc-connector-doc"/>
<target name="deliver-output-connectors" depends="deliver-gts-connector,deliver-solr-connector,deliver-nulloutput-connector,deliver-opensearchserver-connector,deliver-elasticsearch-connector"/>
<target name="deliver-output-connectors-doc" depends="deliver-gts-connector-doc,deliver-solr-connector-doc,deliver-nulloutput-connector-doc,deliver-opensearchserver-connector-doc,deliver-elasticsearch-connector-doc"/>
@@ -3526,6 +3576,24 @@ Use Apache Forrest version forrest-0.9-d
<fileset dir="build/download/apache-manifoldcf-elasticsearch-plugin-bin/elasticsearch-plugin-mcf-0.1"/>
</copy>
</target>
+
+ <target name="download-dropbox-client">
+ <mkdir dir="lib"/>
+ <antcall target="download-via-maven">
+ <param name="target" value="lib"/>
+ <param name="project-path" value="org/syncloud"/>
+ <param name="artifact-version" value="1.5.3"/>
+ <param name="artifact-name" value="dropbox-client"/>
+ <param name="artifact-type" value="jar"/>
+ </antcall>
+ <antcall target="download-via-maven">
+ <param name="target" value="lib"/>
+ <param name="project-path" value="com/googlecode/json-simple"/>
+ <param name="artifact-version" value="1.1"/>
+ <param name="artifact-name" value="json-simple"/>
+ <param name="artifact-type" value="jar"/>
+ </antcall>
+ </target>
<target name="download-sharepoint-plugins">
<mkdir dir="lib/sharepoint-2007"/>
@@ -3580,7 +3648,7 @@ Use Apache Forrest version forrest-0.9-d
</antcall>
</target>
- <target name="make-core-deps" depends="download-solrj,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,download-ecj">
+ <target name="make-core-deps" depends="download-dropbox-client,download-solrj,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,download-ecj">
<copy todir="lib">
<fileset dir="lib-license" includes="*.txt"/>
</copy>
@@ -3609,6 +3677,7 @@ Use Apache Forrest version forrest-0.9-d
<target name="make-deps" depends="download-proprietary-dependencies">
<ant dir="connectors/alfresco" target="download-dependencies"/>
<ant dir="connectors/cmis" target="download-dependencies"/>
+ <ant dir="connectors/dropbox" target="download-dependencies"/>
<ant dir="connectors/activedirectory" target="download-dependencies"/>
<ant dir="connectors/ldap" target="download-dependencies"/>
<ant dir="connectors/documentum" target="download-dependencies"/>
@@ -3645,6 +3714,7 @@ Use Apache Forrest version forrest-0.9-d
<target name="clean-deps" depends="download-proprietary-cleanup">
<ant dir="connectors/alfresco" target="download-cleanup"/>
<ant dir="connectors/cmis" target="download-cleanup"/>
+ <ant dir="connectors/dropbox" target="download-cleanup"/>
<ant dir="connectors/activedirectory" target="download-cleanup"/>
<ant dir="connectors/ldap" target="download-cleanup"/>
<ant dir="connectors/documentum" target="download-cleanup"/>
Propchange: manifoldcf/branches/release-1.2-branch/connectors/dropbox/
------------------------------------------------------------------------------
--- svn:ignore (added)
+++ svn:ignore Tue Apr 30 13:51:52 2013
@@ -0,0 +1,2 @@
+build
+dist
Propchange: manifoldcf/branches/release-1.2-branch/connectors/dropbox/
------------------------------------------------------------------------------
--- svn:ignores (added)
+++ svn:ignores Tue Apr 30 13:51:52 2013
@@ -0,0 +1,2 @@
+build
+dist
Modified: manifoldcf/branches/release-1.2-branch/connectors/dropbox/pom.xml
URL: http://svn.apache.org/viewvc/manifoldcf/branches/release-1.2-branch/connectors/dropbox/pom.xml?rev=1477633&r1=1477631&r2=1477633&view=diff
==============================================================================
--- manifoldcf/branches/release-1.2-branch/connectors/dropbox/pom.xml (original)
+++ manifoldcf/branches/release-1.2-branch/connectors/dropbox/pom.xml Tue Apr 30 13:51:52 2013
@@ -22,7 +22,7 @@
<parent>
<groupId>org.apache.manifoldcf</groupId>
<artifactId>mcf-connectors</artifactId>
- <version>1.3-SNAPSHOT</version>
+ <version>1.2</version>
</parent>
<modelVersion>4.0.0</modelVersion>
Modified: manifoldcf/branches/release-1.2-branch/connectors/pom.xml
URL: http://svn.apache.org/viewvc/manifoldcf/branches/release-1.2-branch/connectors/pom.xml?rev=1477633&r1=1477632&r2=1477633&view=diff
==============================================================================
--- manifoldcf/branches/release-1.2-branch/connectors/pom.xml (original)
+++ manifoldcf/branches/release-1.2-branch/connectors/pom.xml Tue Apr 30 13:51:52 2013
@@ -50,6 +50,7 @@
<module>wiki</module>
<module>alfresco</module>
<module>elasticsearch</module>
+ <module>dropbox</module>
</modules>
</project>
Modified: manifoldcf/branches/release-1.2-branch/dist-license/LICENSE.txt
URL: http://svn.apache.org/viewvc/manifoldcf/branches/release-1.2-branch/dist-license/LICENSE.txt?rev=1477633&r1=1477632&r2=1477633&view=diff
==============================================================================
--- manifoldcf/branches/release-1.2-branch/dist-license/LICENSE.txt (original)
+++ manifoldcf/branches/release-1.2-branch/dist-license/LICENSE.txt Tue Apr 30 13:51:52 2013
@@ -293,6 +293,12 @@ License: Common Development and Distribu
This product includes a jstl-impl-1.2.jar.
License: Common Development and Distribution License (CDDL) v1.0 (https://glassfish.dev.java.net/public/CDDLv1.0.html)
+This product includes a dropbox-client-1.5.3.jar.
+License: MIT license (http://opensource.org/licenses/MIT).
+
+This product includes a json-simple-1.1.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)
Modified: manifoldcf/branches/release-1.2-branch/framework/core/src/main/java/org/apache/manifoldcf/core/common/XThreadInputStream.java
URL: http://svn.apache.org/viewvc/manifoldcf/branches/release-1.2-branch/framework/core/src/main/java/org/apache/manifoldcf/core/common/XThreadInputStream.java?rev=1477633&r1=1477632&r2=1477633&view=diff
==============================================================================
--- manifoldcf/branches/release-1.2-branch/framework/core/src/main/java/org/apache/manifoldcf/core/common/XThreadInputStream.java (original)
+++ manifoldcf/branches/release-1.2-branch/framework/core/src/main/java/org/apache/manifoldcf/core/common/XThreadInputStream.java Tue Apr 30 13:51:52 2013
@@ -232,7 +232,7 @@ public class XThreadInputStream extends
public void close()
throws IOException
{
- // MHL
+ // Do nothing; stream close is handled by the caller on the stuffer side
}
}