Author: kwright
Date: Sun Apr 21 14:06:30 2013
New Revision: 1470302
URL: http://svn.apache.org/r1470302
Log:
Various fixups, including apache headers that were missing, and correct
versions into poms.
Added:
manifoldcf/branches/CONNECTORS-676/connectors/dropbox/connector/src/main/native2ascii/org/
manifoldcf/branches/CONNECTORS-676/connectors/dropbox/connector/src/main/native2ascii/org/apache/
manifoldcf/branches/CONNECTORS-676/connectors/dropbox/connector/src/main/native2ascii/org/apache/manifoldcf/
manifoldcf/branches/CONNECTORS-676/connectors/dropbox/connector/src/main/native2ascii/org/apache/manifoldcf/crawler/
manifoldcf/branches/CONNECTORS-676/connectors/dropbox/connector/src/main/native2ascii/org/apache/manifoldcf/crawler/connectors/
manifoldcf/branches/CONNECTORS-676/connectors/dropbox/connector/src/main/native2ascii/org/apache/manifoldcf/crawler/connectors/dropbox/
manifoldcf/branches/CONNECTORS-676/connectors/dropbox/connector/src/main/native2ascii/org/apache/manifoldcf/crawler/connectors/dropbox/common_en_US.properties
- copied, changed from r1470161,
manifoldcf/branches/CONNECTORS-676/connectors/dropbox/connector/src/main/native2ascii/org.apache.manifoldcf.crawler.connectors.dropbox/common_en_US.properties
manifoldcf/branches/CONNECTORS-676/connectors/dropbox/connector/src/main/native2ascii/org/apache/manifoldcf/crawler/connectors/dropbox/common_ja_JP.properties
(with props)
Removed:
manifoldcf/branches/CONNECTORS-676/connectors/dropbox/connector/src/main/native2ascii/org.apache.manifoldcf.crawler.connectors.dropbox/
manifoldcf/branches/CONNECTORS-676/connectors/dropbox/connector/src/main/resources/org/apache/manifoldcf/crawler/connectors/dropbox/common_en_US.properties
Modified:
manifoldcf/branches/CONNECTORS-676/build.xml
manifoldcf/branches/CONNECTORS-676/connectors/dropbox/build.xml
manifoldcf/branches/CONNECTORS-676/connectors/dropbox/connector/src/main/java/org/apache/manifoldcf/crawler/connectors/dropbox/DropboxConfig.java
(contents, props changed)
manifoldcf/branches/CONNECTORS-676/connectors/dropbox/connector/src/main/java/org/apache/manifoldcf/crawler/connectors/dropbox/DropboxRepositoryConnector.java
(contents, props changed)
manifoldcf/branches/CONNECTORS-676/connectors/dropbox/connector/src/main/java/org/apache/manifoldcf/crawler/connectors/dropbox/DropboxSession.java
(contents, props changed)
manifoldcf/branches/CONNECTORS-676/connectors/dropbox/connector/src/main/java/org/apache/manifoldcf/crawler/connectors/dropbox/Messages.java
(contents, props changed)
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=1470302&r1=1470301&r2=1470302&view=diff
==============================================================================
--- manifoldcf/branches/CONNECTORS-676/build.xml (original)
+++ manifoldcf/branches/CONNECTORS-676/build.xml Sun Apr 21 14:06:30 2013
@@ -3558,17 +3558,23 @@ Use Apache Forrest version forrest-0.9-d
</copy>
</target>
-
<target name="download-dropbox-sdk">
- <!-- Download and unpack sdk -->
- <mkdir dir="build/download"/>
- <get
src="https://www.dropbox.com/static/developers/dropbox-java-sdk-1.5.3.zip";
dest="build/download/dropbox-java-sdk-1.5.3.zip"/>
- <unzip src="build/download/dropbox-java-sdk-1.5.3.zip"
dest="build/download/dropbox-java-sdk-1.5.3"/>
- <copy todir="lib/">
- <filelist
dir="build/download/dropbox-java-sdk-1.5.3/dropbox-java-sdk-1.5.3/lib/"
files="json_simple-1.1.jar dropbox-java-sdk-1.5.3.jar"/>
- </copy>
+ <mkdir dir="lib"/>
+ <antcall target="download-via-maven">
+ <param name="target" value="lib"/>
+ <param name="project-path" value="com/dropbox"/>
+ <param name="artifact-version" value="1.5.3"/>
+ <param name="artifact-name" value="dropbox-java-sdk"/>
+ <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"/>
@@ -3623,7 +3629,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-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">
<copy todir="lib">
<fileset dir="lib-license" includes="*.txt"/>
</copy>
Modified: manifoldcf/branches/CONNECTORS-676/connectors/dropbox/build.xml
URL:
http://svn.apache.org/viewvc/manifoldcf/branches/CONNECTORS-676/connectors/dropbox/build.xml?rev=1470302&r1=1470301&r2=1470302&view=diff
==============================================================================
--- manifoldcf/branches/CONNECTORS-676/connectors/dropbox/build.xml (original)
+++ manifoldcf/branches/CONNECTORS-676/connectors/dropbox/build.xml Sun Apr 21
14:06:30 2013
@@ -19,24 +19,11 @@
<import file="../connector-build.xml"/>
-
- <target name="download-dependencies">
-
- <mkdir dir="build/download"/>
- <get
src="https://www.dropbox.com/static/developers/dropbox-java-sdk-1.5.3.zip";
dest="build/download/dropbox-java-sdk-1.5.3.zip"/>
- <unzip src="build/download/dropbox-java-sdk-1.5.3.zip"
dest="build/download/dropbox-java-sdk-1.5.3"/>
- <copy todir="lib/">
- <filelist
dir="build/download/dropbox-java-sdk-1.5.3/dropbox-java-sdk-1.5.3/lib/"
files="json_simple-1.1.jar dropbox-java-sdk-1.5.3.jar"/>
- </copy>
-
- </target>
-
-
<path id="connector-classpath">
<path refid="mcf-connector-build.connector-classpath"/>
<fileset dir="../../lib">
<include name="dropbox*.jar"/>
- <include name="json_*.jar"/>
+ <include name="json_simple*.jar"/>
<include name="chemistry*.jar"/>
<include name="saaj*.jar"/>
<include name="stax*.jar"/>
@@ -57,7 +44,7 @@
<copy todir="dist/lib">
<fileset dir="../../lib">
<include name="dropbox*.jar"/>
- <include name="json_*.jar"/>
+ <include name="json_simple*.jar"/>
<include name="chemistry*.jar"/>
<include name="saaj*.jar"/>
<include name="stax*.jar"/>
Modified:
manifoldcf/branches/CONNECTORS-676/connectors/dropbox/connector/src/main/java/org/apache/manifoldcf/crawler/connectors/dropbox/DropboxConfig.java
URL:
http://svn.apache.org/viewvc/manifoldcf/branches/CONNECTORS-676/connectors/dropbox/connector/src/main/java/org/apache/manifoldcf/crawler/connectors/dropbox/DropboxConfig.java?rev=1470302&r1=1470301&r2=1470302&view=diff
==============================================================================
---
manifoldcf/branches/CONNECTORS-676/connectors/dropbox/connector/src/main/java/org/apache/manifoldcf/crawler/connectors/dropbox/DropboxConfig.java
(original)
+++
manifoldcf/branches/CONNECTORS-676/connectors/dropbox/connector/src/main/java/org/apache/manifoldcf/crawler/connectors/dropbox/DropboxConfig.java
Sun Apr 21 14:06:30 2013
@@ -1,41 +1,57 @@
-/*
- * To change this template, choose Tools | Templates
- * and open the template in the editor.
- */
-package org.apache.manifoldcf.crawler.connectors.dropbox;
-
-/**
- *
- * @author andrew
- */
-public class DropboxConfig {
-
- /** Username */
- public static final String KEY_PARAM = "key";
-
- /** Password */
- public static final String SECRET_PARAM = "secret";
-
-
- public static final String APP_KEY_PARAM = "app_key";
-
- /** Password */
- public static final String APP_SECRET_PARAM = "app_secret";
-
-
- /** Path of the context of the CMIS AtomPub api */
- public static final String PATH_PARAM = "path";
-
- /** CMIS Repository Id */
- public static final String REPOSITORY_ID_PARAM = "repositoryId";
-
- //default values
- public static final String PATH_DEFAULT_VALUE = "NOT USED YET";
- public static final String REPOSITORY_ID_DEFAULT_VALUE = "dropbox";
-
- public static final String DROPBOX_QUERY_PARAM = "dropboxQuery";
-
-
-
-
-}
+/* $Id$ */
+
+/**
+* Licensed to the Apache Software Foundation (ASF) under one or more
+* contributor license agreements. See the NOTICE file distributed with
+* this work for additional information regarding copyright ownership.
+* The ASF licenses this file to You under the Apache License, Version 2.0
+* (the "License"); you may not use this file except in compliance with
+* the License. You may obtain a copy of the License at
+*
+* http://www.apache.org/licenses/LICENSE-2.0
+*
+* Unless required by applicable law or agreed to in writing, software
+* distributed under the License is distributed on an "AS IS" BASIS,
+* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+* See the License for the specific language governing permissions and
+* limitations under the License.
+*/
+
+/*
+ * To change this template, choose Tools | Templates
+ * and open the template in the editor.
+ */
+package org.apache.manifoldcf.crawler.connectors.dropbox;
+
+/**
+ *
+ * @author andrew
+ */
+public class DropboxConfig {
+
+ /** Username */
+ public static final String KEY_PARAM = "key";
+
+ /** Password */
+ public static final String SECRET_PARAM = "secret";
+
+
+ public static final String APP_KEY_PARAM = "app_key";
+
+ /** Password */
+ public static final String APP_SECRET_PARAM = "app_secret";
+
+
+ /** Path of the context of the CMIS AtomPub api */
+ public static final String PATH_PARAM = "path";
+
+ /** CMIS Repository Id */
+ public static final String REPOSITORY_ID_PARAM = "repositoryId";
+
+ //default values
+ public static final String PATH_DEFAULT_VALUE = "NOT USED YET";
+ public static final String REPOSITORY_ID_DEFAULT_VALUE = "dropbox";
+
+ public static final String DROPBOX_QUERY_PARAM = "dropboxQuery";
+
+}
Propchange:
manifoldcf/branches/CONNECTORS-676/connectors/dropbox/connector/src/main/java/org/apache/manifoldcf/crawler/connectors/dropbox/DropboxConfig.java
------------------------------------------------------------------------------
svn:eol-style = native
Propchange:
manifoldcf/branches/CONNECTORS-676/connectors/dropbox/connector/src/main/java/org/apache/manifoldcf/crawler/connectors/dropbox/DropboxConfig.java
------------------------------------------------------------------------------
svn:keywords = Id
