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/21 16:29:20 UTC

svn commit: r1470305 - in /manifoldcf/branches/CONNECTORS-676: build.xml connectors/dropbox/ connectors/dropbox/build.xml connectors/dropbox/pom.xml

Author: kwright
Date: Sun Apr 21 14:29:19 2013
New Revision: 1470305

URL: http://svn.apache.org/r1470305
Log:
Add dropbox connector to main ant build.  Also include javadoc hookup.

Modified:
    manifoldcf/branches/CONNECTORS-676/build.xml
    manifoldcf/branches/CONNECTORS-676/connectors/dropbox/   (props changed)
    manifoldcf/branches/CONNECTORS-676/connectors/dropbox/build.xml
    manifoldcf/branches/CONNECTORS-676/connectors/dropbox/pom.xml

Modified: manifoldcf/branches/CONNECTORS-676/build.xml
URL: http://svn.apache.org/viewvc/manifoldcf/branches/CONNECTORS-676/build.xml?rev=1470305&r1=1470304&r2=1470305&view=diff
==============================================================================
--- manifoldcf/branches/CONNECTORS-676/build.xml (original)
+++ manifoldcf/branches/CONNECTORS-676/build.xml Sun Apr 21 14:29:19 2013
@@ -301,7 +301,11 @@
     <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>
@@ -1381,6 +1385,16 @@
         </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"/>
         <condition property="cmis-doc.include">
@@ -1418,6 +1432,11 @@
         </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">
@@ -2567,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"/>
@@ -3558,13 +3577,13 @@ Use Apache Forrest version forrest-0.9-d
         </copy>
     </target>
 
-   <target name="download-dropbox-sdk">
+   <target name="download-dropbox-client">
         <mkdir dir="lib"/>
         <antcall target="download-via-maven">
             <param name="target" value="lib"/>
-            <param name="project-path" value="com/dropbox"/>
+            <param name="project-path" value="org/syncloud"/>
             <param name="artifact-version" value="1.5.3"/>
-            <param name="artifact-name" value="dropbox-java-sdk"/>
+            <param name="artifact-name" value="dropbox-client"/>
             <param name="artifact-type" value="jar"/>
         </antcall>
         <antcall target="download-via-maven">
@@ -3629,7 +3648,7 @@ Use Apache Forrest version forrest-0.9-d
         </antcall>
     </target>
 
-    <target name="make-core-deps" depends="download-dropbox-sdk,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>

Propchange: manifoldcf/branches/CONNECTORS-676/connectors/dropbox/
------------------------------------------------------------------------------
--- svn:ignore (added)
+++ svn:ignore Sun Apr 21 14:29:19 2013
@@ -0,0 +1,2 @@
+build
+dist

Propchange: manifoldcf/branches/CONNECTORS-676/connectors/dropbox/
------------------------------------------------------------------------------
--- svn:ignores (added)
+++ svn:ignores Sun Apr 21 14:29:19 2013
@@ -0,0 +1,2 @@
+build
+dist

Modified: manifoldcf/branches/CONNECTORS-676/connectors/dropbox/build.xml
URL: http://svn.apache.org/viewvc/manifoldcf/branches/CONNECTORS-676/connectors/dropbox/build.xml?rev=1470305&r1=1470304&r2=1470305&view=diff
==============================================================================
--- manifoldcf/branches/CONNECTORS-676/connectors/dropbox/build.xml (original)
+++ manifoldcf/branches/CONNECTORS-676/connectors/dropbox/build.xml Sun Apr 21 14:29:19 2013
@@ -22,20 +22,8 @@
     <path id="connector-classpath">
         <path refid="mcf-connector-build.connector-classpath"/>
         <fileset dir="../../lib">
-            <include name="dropbox*.jar"/>
+            <include name="dropbox-client*.jar"/>
             <include name="json_simple*.jar"/>
-            <include name="chemistry*.jar"/>
-            <include name="saaj*.jar"/>
-            <include name="stax*.jar"/>
-            <include name="streambuffer*.jar"/>
-            <include name="jaxb*.jar"/>
-            <include name="jaxws*.jar"/>
-            <include name="wstx-asl*.jar"/>
-            <include name="mimepull*.jar"/>
-            <include name="resolver*.jar"/>
-            <include name="org.osgi.core*.jar"/>
-            <include name="activation*.jar"/>
-            <include name="commons-lang*.jar"/>
         </fileset>
     </path>
 
@@ -45,17 +33,6 @@
             <fileset dir="../../lib">
                 <include name="dropbox*.jar"/>
                 <include name="json_simple*.jar"/>
-                <include name="chemistry*.jar"/>
-                <include name="saaj*.jar"/>
-                <include name="stax*.jar"/>
-                <include name="streambuffer*.jar"/>
-                <include name="jaxb*.jar"/>
-                <include name="jaxws*.jar"/>
-                <include name="wstx-asl*.jar"/>
-                <include name="mimepull*.jar"/>
-                <include name="resolver*.jar"/>
-                <include name="org.osgi.core*.jar"/>
-                <include name="activation*.jar"/>
             </fileset>
         </copy>
     </target>

Modified: manifoldcf/branches/CONNECTORS-676/connectors/dropbox/pom.xml
URL: http://svn.apache.org/viewvc/manifoldcf/branches/CONNECTORS-676/connectors/dropbox/pom.xml?rev=1470305&r1=1470304&r2=1470305&view=diff
==============================================================================
--- manifoldcf/branches/CONNECTORS-676/connectors/dropbox/pom.xml (original)
+++ manifoldcf/branches/CONNECTORS-676/connectors/dropbox/pom.xml Sun Apr 21 14:29:19 2013
@@ -124,8 +124,8 @@
             <type>jar</type>
         </dependency>
         <dependency>
-            <groupId>com.dropbox</groupId>
-            <artifactId>dropbox-java-sdk</artifactId>
+            <groupId>org.syncloud</groupId>
+            <artifactId>dropbox-client</artifactId>
             <version>1.5.3</version>
             <type>jar</type>
         </dependency>