Author: kwright
Date: Sat Apr 15 09:56:50 2017
New Revision: 1791484
URL: http://svn.apache.org/viewvc?rev=1791484&view=rev
Log:
Pull up changes from the CONNECTORS-1290-2 branch
Added:
manifoldcf/branches/CONNECTORS-1290-3/connectors/nuxeo/
- copied from r1791483,
manifoldcf/branches/CONNECTORS-1290-2/connectors/nuxeo/
Modified:
manifoldcf/branches/CONNECTORS-1290-3/ (props changed)
manifoldcf/branches/CONNECTORS-1290-3/build.xml
manifoldcf/branches/CONNECTORS-1290-3/connectors/amazons3/pom.xml
manifoldcf/branches/CONNECTORS-1290-3/connectors/confluence/pom.xml
manifoldcf/branches/CONNECTORS-1290-3/connectors/dropbox/pom.xml
manifoldcf/branches/CONNECTORS-1290-3/connectors/googledrive/pom.xml
manifoldcf/branches/CONNECTORS-1290-3/connectors/jira/pom.xml
manifoldcf/branches/CONNECTORS-1290-3/connectors/nuxeo/pom.xml
manifoldcf/branches/CONNECTORS-1290-3/connectors/pom.xml
manifoldcf/branches/CONNECTORS-1290-3/dist-license/LICENSE.txt
manifoldcf/branches/CONNECTORS-1290-3/framework/connector-common/pom.xml
manifoldcf/branches/CONNECTORS-1290-3/framework/core/pom.xml
manifoldcf/branches/CONNECTORS-1290-3/framework/core/src/main/java/org/apache/manifoldcf/core/system/Logging.java
manifoldcf/branches/CONNECTORS-1290-3/lib-license/LICENSE.txt
manifoldcf/branches/CONNECTORS-1290-3/pom.xml
Propchange: manifoldcf/branches/CONNECTORS-1290-3/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Sat Apr 15 09:56:50 2017
@@ -66,6 +66,8 @@
/manifoldcf/branches/CONNECTORS-1244:1705272-1705655
/manifoldcf/branches/CONNECTORS-1263:1718116-1719239,1719355
/manifoldcf/branches/CONNECTORS-1270:1726811-1727380
+/manifoldcf/branches/CONNECTORS-1290:1770892-1790234
+/manifoldcf/branches/CONNECTORS-1290-2:1790233-1791483
/manifoldcf/branches/CONNECTORS-13:1525862-1527182,1539324-1541634
/manifoldcf/branches/CONNECTORS-1308:1741766-1741789
/manifoldcf/branches/CONNECTORS-1313:1742768-1743158
Modified: manifoldcf/branches/CONNECTORS-1290-3/build.xml
URL:
http://svn.apache.org/viewvc/manifoldcf/branches/CONNECTORS-1290-3/build.xml?rev=1791484&r1=1791483&r2=1791484&view=diff
==============================================================================
--- manifoldcf/branches/CONNECTORS-1290-3/build.xml (original)
+++ manifoldcf/branches/CONNECTORS-1290-3/build.xml Sat Apr 15 09:56:50 2017
@@ -71,7 +71,7 @@
<property name="junit.version" value="4.12"/>
<property name="selenium.version" value="3.3.1"/>
<property name="hamcrest.version" value="1.3"/>
- <property name="log4j.version" value="1.2.16"/>
+ <property name="log4j.version" value="2.4.1"/>
<property name="mail.version" value="1.4.5"/>
<property name="mimepull.version" value="1.3"/>
<property name="opensaml.version" value="1.1"/>
@@ -839,6 +839,46 @@ Use Apache Forrest version forrest-0.9-d
</java>
</target>
+ <target name="setup-nuxeo-url">
+ <property name="nuxeo-base-url"
value="http://maven.nuxeo.com/nexus/content/repositories/public-releases"/>
+ </target>
+
+ <target name="download-via-nuxeo" depends="setup-nuxeo-url">
+ <get
src="${nuxeo-base-url}/${project-path}/${artifact-name}/${artifact-version}/${artifact-name}-${artifact-version}.${artifact-type}"
dest="${target}/${artifact-name}-${artifact-version}.${artifact-type}"/>
+ </target>
+
+ <target name="download-nuxeo-client">
+ <mkdir dir="lib"/>
+ <antcall target="download-via-nuxeo">
+ <param name="project-path" value="org/nuxeo/client"/>
+ <param name="artifact-version" value="2.5"/>
+ <param name="target" value="lib"/>
+ <param name="artifact-name" value="nuxeo-java-client"/>
+ <param name="artifact-type" value="jar"/>
+ </antcall>
+ <antcall target="download-via-maven">
+ <param name="project-path" value="com/squareup/retrofit2"/>
+ <param name="artifact-version" value="2.0.2"/>
+ <param name="target" value="lib"/>
+ <param name="artifact-name" value="retrofit"/>
+ <param name="artifact-type" value="jar"/>
+ </antcall>
+ <antcall target="download-via-maven">
+ <param name="project-path" value="com/squareup/okhttp3"/>
+ <param name="artifact-version" value="3.0.0-RC1"/>
+ <param name="target" value="lib"/>
+ <param name="artifact-name" value="okhttp"/>
+ <param name="artifact-type" value="jar"/>
+ </antcall>
+ <antcall target="download-via-maven">
+ <param name="project-path" value="com/squareup/okio"/>
+ <param name="artifact-version" value="1.6.0"/>
+ <param name="target" value="lib"/>
+ <param name="artifact-name" value="okio"/>
+ <param name="artifact-type" value="jar"/>
+ </antcall>
+ </target>
+
<target name="download-resteasy">
<mkdir dir="lib"/>
<antcall target="download-via-maven">
@@ -1633,9 +1673,21 @@ Use Apache Forrest version forrest-0.9-d
<target name="download-log4j">
<mkdir dir="lib"/>
<antcall target="download-via-maven"><param name="target" value="lib"/>
- <param name="project-path" value="log4j"/>
+ <param name="project-path" value="org/apache/logging/log4j"/>
+ <param name="artifact-version" value="${log4j.version}"/>
+ <param name="artifact-name" value="log4j-core"/>
+ <param name="artifact-type" value="jar"/>
+ </antcall>
+ <antcall target="download-via-maven"><param name="target" value="lib"/>
+ <param name="project-path" value="org/apache/logging/log4j"/>
+ <param name="artifact-version" value="${log4j.version}"/>
+ <param name="artifact-name" value="log4j-api"/>
+ <param name="artifact-type" value="jar"/>
+ </antcall>
+ <antcall target="download-via-maven"><param name="target" value="lib"/>
+ <param name="project-path" value="org/apache/logging/log4j"/>
<param name="artifact-version" value="${log4j.version}"/>
- <param name="artifact-name" value="log4j"/>
+ <param name="artifact-name" value="log4j-1.2-api"/>
<param name="artifact-type" value="jar"/>
</antcall>
</target>
@@ -2615,7 +2667,7 @@ Use Apache Forrest version forrest-0.9-d
</antcall>
</target>
- <target name="make-core-deps"
depends="download-forbidden-checks,download-json-simple,download-selenium,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-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,downlo
ad-fop,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,download-hadoop,download-htrace,download-protobuf,download-tika,download-jackson">
+ <target name="make-core-deps"
depends="download-forbidden-checks,download-nuxeo-client,download-json-simple,download-selenium,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-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,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/branches/CONNECTORS-1290-3/connectors/amazons3/pom.xml
URL:
http://svn.apache.org/viewvc/manifoldcf/branches/CONNECTORS-1290-3/connectors/amazons3/pom.xml?rev=1791484&r1=1791483&r2=1791484&view=diff
==============================================================================
--- manifoldcf/branches/CONNECTORS-1290-3/connectors/amazons3/pom.xml (original)
+++ manifoldcf/branches/CONNECTORS-1290-3/connectors/amazons3/pom.xml Sat Apr
15 09:56:50 2017
@@ -381,22 +381,6 @@
</dependency>
<dependency>
- <groupId>commons-logging</groupId>
- <artifactId>commons-logging</artifactId>
- <version>${commons-logging.version}</version>
- </dependency>
-
- <dependency>
- <groupId>log4j</groupId>
- <artifactId>log4j</artifactId>
- <version>${log4j.version}</version>
- </dependency>
- <dependency>
- <groupId>commons-codec</groupId>
- <artifactId>commons-codec</artifactId>
- <version>${commons-codec.version}</version>
- </dependency>
- <dependency>
<groupId>com.amazonaws</groupId>
<artifactId>aws-java-sdk-s3</artifactId>
<version>${aws-java-sdk.version}</version>
Modified: manifoldcf/branches/CONNECTORS-1290-3/connectors/confluence/pom.xml
URL:
http://svn.apache.org/viewvc/manifoldcf/branches/CONNECTORS-1290-3/connectors/confluence/pom.xml?rev=1791484&r1=1791483&r2=1791484&view=diff
==============================================================================
--- manifoldcf/branches/CONNECTORS-1290-3/connectors/confluence/pom.xml
(original)
+++ manifoldcf/branches/CONNECTORS-1290-3/connectors/confluence/pom.xml Sat Apr
15 09:56:50 2017
@@ -343,25 +343,6 @@
<version>${slf4j.version}</version>
</dependency>
- <dependency>
- <groupId>commons-logging</groupId>
- <artifactId>commons-logging</artifactId>
- <version>1.1.1</version>
- <scope>test</scope>
- </dependency>
-
- <dependency>
- <groupId>log4j</groupId>
- <artifactId>log4j</artifactId>
- <version>1.2.16</version>
- <scope>provided</scope>
- <type>jar</type>
- </dependency>
- <dependency>
- <groupId>commons-codec</groupId>
- <artifactId>commons-codec</artifactId>
- <version>1.8</version>
- </dependency>
</dependencies>
</project>
Modified: manifoldcf/branches/CONNECTORS-1290-3/connectors/dropbox/pom.xml
URL:
http://svn.apache.org/viewvc/manifoldcf/branches/CONNECTORS-1290-3/connectors/dropbox/pom.xml?rev=1791484&r1=1791483&r2=1791484&view=diff
==============================================================================
--- manifoldcf/branches/CONNECTORS-1290-3/connectors/dropbox/pom.xml (original)
+++ manifoldcf/branches/CONNECTORS-1290-3/connectors/dropbox/pom.xml Sat Apr 15
09:56:50 2017
@@ -230,18 +230,6 @@
<version>1.5.3</version>
<type>jar</type>
</dependency>
- <dependency>
- <groupId>commons-logging</groupId>
- <artifactId>commons-logging</artifactId>
- <version>${commons-logging.version}</version>
- <scope>test</scope>
- </dependency>
- <dependency>
- <groupId>log4j</groupId>
- <artifactId>log4j</artifactId>
- <version>${log4j.version}</version>
- <type>jar</type>
- </dependency>
<!-- Tests -->
<dependency>
Modified: manifoldcf/branches/CONNECTORS-1290-3/connectors/googledrive/pom.xml
URL:
http://svn.apache.org/viewvc/manifoldcf/branches/CONNECTORS-1290-3/connectors/googledrive/pom.xml?rev=1791484&r1=1791483&r2=1791484&view=diff
==============================================================================
--- manifoldcf/branches/CONNECTORS-1290-3/connectors/googledrive/pom.xml
(original)
+++ manifoldcf/branches/CONNECTORS-1290-3/connectors/googledrive/pom.xml Sat
Apr 15 09:56:50 2017
@@ -376,20 +376,7 @@
<version>${slf4j.version}</version>
<scope>test</scope>
</dependency>
- <dependency>
- <groupId>commons-logging</groupId>
- <artifactId>commons-logging</artifactId>
- <version>1.1.1</version>
- <scope>test</scope>
- </dependency>
- <dependency>
- <groupId>log4j</groupId>
- <artifactId>log4j</artifactId>
- <version>1.2.16</version>
- <scope>provided</scope>
- <type>jar</type>
- </dependency>
<dependency>
<groupId>com.google.apis</groupId>
<artifactId>google-api-services-drive</artifactId>
Modified: manifoldcf/branches/CONNECTORS-1290-3/connectors/jira/pom.xml
URL:
http://svn.apache.org/viewvc/manifoldcf/branches/CONNECTORS-1290-3/connectors/jira/pom.xml?rev=1791484&r1=1791483&r2=1791484&view=diff
==============================================================================
--- manifoldcf/branches/CONNECTORS-1290-3/connectors/jira/pom.xml (original)
+++ manifoldcf/branches/CONNECTORS-1290-3/connectors/jira/pom.xml Sat Apr 15
09:56:50 2017
@@ -376,25 +376,5 @@
<version>${slf4j.version}</version>
<scope>test</scope>
</dependency>
-
- <dependency>
- <groupId>commons-logging</groupId>
- <artifactId>commons-logging</artifactId>
- <version>1.1.1</version>
- <scope>test</scope>
- </dependency>
-
- <dependency>
- <groupId>log4j</groupId>
- <artifactId>log4j</artifactId>
- <version>1.2.16</version>
- <scope>provided</scope>
- <type>jar</type>
- </dependency>
- <dependency>
- <groupId>commons-codec</groupId>
- <artifactId>commons-codec</artifactId>
- <version>1.8</version>
- </dependency>
</dependencies>
</project>
Modified: manifoldcf/branches/CONNECTORS-1290-3/connectors/nuxeo/pom.xml
URL:
http://svn.apache.org/viewvc/manifoldcf/branches/CONNECTORS-1290-3/connectors/nuxeo/pom.xml?rev=1791484&r1=1791483&r2=1791484&view=diff
==============================================================================
--- manifoldcf/branches/CONNECTORS-1290-3/connectors/nuxeo/pom.xml (original)
+++ manifoldcf/branches/CONNECTORS-1290-3/connectors/nuxeo/pom.xml Sat Apr 15
09:56:50 2017
@@ -21,7 +21,7 @@
<parent>
<groupId>org.apache.manifoldcf</groupId>
<artifactId>mcf-connectors</artifactId>
- <version>2.7-SNAPSHOT</version>
+ <version>2.8-SNAPSHOT</version>
</parent>
<name>ManifoldCF - Connectors - Nuxeo Connector</name>
Modified: manifoldcf/branches/CONNECTORS-1290-3/connectors/pom.xml
URL:
http://svn.apache.org/viewvc/manifoldcf/branches/CONNECTORS-1290-3/connectors/pom.xml?rev=1791484&r1=1791483&r2=1791484&view=diff
==============================================================================
--- manifoldcf/branches/CONNECTORS-1290-3/connectors/pom.xml (original)
+++ manifoldcf/branches/CONNECTORS-1290-3/connectors/pom.xml Sat Apr 15
09:56:50 2017
@@ -69,6 +69,7 @@
<module>amazons3</module>
<module>kafka</module>
<module>opennlp</module>
+ <module>nuxeo</module>
</modules>
</project>
Modified: manifoldcf/branches/CONNECTORS-1290-3/dist-license/LICENSE.txt
URL:
http://svn.apache.org/viewvc/manifoldcf/branches/CONNECTORS-1290-3/dist-license/LICENSE.txt?rev=1791484&r1=1791483&r2=1791484&view=diff
==============================================================================
--- manifoldcf/branches/CONNECTORS-1290-3/dist-license/LICENSE.txt (original)
+++ manifoldcf/branches/CONNECTORS-1290-3/dist-license/LICENSE.txt Sat Apr 15
09:56:50 2017
@@ -493,6 +493,18 @@ selenium-api.jar, selenium-chrome-driver
selenium-java.jar, selenium-opera-driver.jar, selenium-remote-driver.jar,
selenium-safari-driver.jar, selenium-support.jar
License: Apache License, Version 2.0
(http://www.apache.org/licenses/LICENSE-2.0.txt)
+This product includes a nuxeo-java-client.jar:
https://doc.nuxeo.com/nxdoc/licenses/
+License: Apache License, Version 2.0
(http://www.apache.org/licenses/LICENSE-2.0.txt)
+
+This product includes a retrofit.jar.
+License: Apache License, Version 2.0
(http://www.apache.org/licenses/LICENSE-2.0.txt)
+
+This product includes a okhttp.jar.
+License: Apache License, Version 2.0
(http://www.apache.org/licenses/LICENSE-2.0.txt)
+
+This product includes a okio.jar.
+License: Apache License, Version 2.0
(http://www.apache.org/licenses/LICENSE-2.0.txt)
+
==========================================================================
The following license applies to postgresql.jar, which is available from
http://jdbc.postgresql.org
Modified:
manifoldcf/branches/CONNECTORS-1290-3/framework/connector-common/pom.xml
URL:
http://svn.apache.org/viewvc/manifoldcf/branches/CONNECTORS-1290-3/framework/connector-common/pom.xml?rev=1791484&r1=1791483&r2=1791484&view=diff
==============================================================================
--- manifoldcf/branches/CONNECTORS-1290-3/framework/connector-common/pom.xml
(original)
+++ manifoldcf/branches/CONNECTORS-1290-3/framework/connector-common/pom.xml
Sat Apr 15 09:56:50 2017
@@ -69,11 +69,6 @@
<version>${httpcomponent.httpclient.version}</version>
</dependency>
<dependency>
- <groupId>log4j</groupId>
- <artifactId>log4j</artifactId>
- <version>${log4j.version}</version>
- </dependency>
- <dependency>
<groupId>org.apache.tika</groupId>
<artifactId>tika-core</artifactId>
<version>${tika.version}</version>
Modified: manifoldcf/branches/CONNECTORS-1290-3/framework/core/pom.xml
URL:
http://svn.apache.org/viewvc/manifoldcf/branches/CONNECTORS-1290-3/framework/core/pom.xml?rev=1791484&r1=1791483&r2=1791484&view=diff
==============================================================================
--- manifoldcf/branches/CONNECTORS-1290-3/framework/core/pom.xml (original)
+++ manifoldcf/branches/CONNECTORS-1290-3/framework/core/pom.xml Sat Apr 15
09:56:50 2017
@@ -67,8 +67,18 @@
<version>${httpcomponent.httpclient.version}</version>
</dependency>
<dependency>
- <groupId>log4j</groupId>
- <artifactId>log4j</artifactId>
+ <groupId>org.apache.logging.log4j</groupId>
+ <artifactId>log4j-core</artifactId>
+ <version>${log4j.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.logging.log4j</groupId>
+ <artifactId>log4j-api</artifactId>
+ <version>${log4j.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.logging.log4j</groupId>
+ <artifactId>log4j-1.2-api</artifactId>
<version>${log4j.version}</version>
</dependency>
<dependency>
Modified:
manifoldcf/branches/CONNECTORS-1290-3/framework/core/src/main/java/org/apache/manifoldcf/core/system/Logging.java
URL:
http://svn.apache.org/viewvc/manifoldcf/branches/CONNECTORS-1290-3/framework/core/src/main/java/org/apache/manifoldcf/core/system/Logging.java?rev=1791484&r1=1791483&r2=1791484&view=diff
==============================================================================
---
manifoldcf/branches/CONNECTORS-1290-3/framework/core/src/main/java/org/apache/manifoldcf/core/system/Logging.java
(original)
+++
manifoldcf/branches/CONNECTORS-1290-3/framework/core/src/main/java/org/apache/manifoldcf/core/system/Logging.java
Sat Apr 15 09:56:50 2017
@@ -23,13 +23,6 @@ import java.util.*;
import java.io.*;
import org.apache.log4j.*;
-import org.apache.log4j.Logger;
-import org.apache.log4j.Level;
-import org.apache.log4j.Layout.*;
-import org.apache.log4j.helpers.DateLayout;
-import org.apache.log4j.helpers.DateTimeDateFormat;
-import org.apache.log4j.DailyRollingFileAppender;
-import org.apache.log4j.PropertyConfigurator;
/** This class furnishes the logging environment for the JSKW application.
*/
Modified: manifoldcf/branches/CONNECTORS-1290-3/lib-license/LICENSE.txt
URL:
http://svn.apache.org/viewvc/manifoldcf/branches/CONNECTORS-1290-3/lib-license/LICENSE.txt?rev=1791484&r1=1791483&r2=1791484&view=diff
==============================================================================
--- manifoldcf/branches/CONNECTORS-1290-3/lib-license/LICENSE.txt (original)
+++ manifoldcf/branches/CONNECTORS-1290-3/lib-license/LICENSE.txt Sat Apr 15
09:56:50 2017
@@ -502,6 +502,18 @@ selenium-api.jar, selenium-chrome-driver
selenium-java.jar, selenium-opera-driver.jar, selenium-remote-driver.jar,
selenium-safari-driver.jar, selenium-support.jar
License: Apache License, Version 2.0
(http://www.apache.org/licenses/LICENSE-2.0.txt)
+This product includes a nuxeo-java-client.jar:
https://doc.nuxeo.com/nxdoc/licenses/
+License: Apache License, Version 2.0
(http://www.apache.org/licenses/LICENSE-2.0.txt)
+
+This product includes a retrofit.jar.
+License: Apache License, Version 2.0
(http://www.apache.org/licenses/LICENSE-2.0.txt)
+
+This product includes a okhttp.jar.
+License: Apache License, Version 2.0
(http://www.apache.org/licenses/LICENSE-2.0.txt)
+
+This product includes a okio.jar.
+License: Apache License, Version 2.0
(http://www.apache.org/licenses/LICENSE-2.0.txt)
+
==========================================================================
The following license applies to postgresql.jar, which is available from
http://jdbc.postgresql.org
Modified: manifoldcf/branches/CONNECTORS-1290-3/pom.xml
URL:
http://svn.apache.org/viewvc/manifoldcf/branches/CONNECTORS-1290-3/pom.xml?rev=1791484&r1=1791483&r2=1791484&view=diff
==============================================================================
--- manifoldcf/branches/CONNECTORS-1290-3/pom.xml (original)
+++ manifoldcf/branches/CONNECTORS-1290-3/pom.xml Sat Apr 15 09:56:50 2017
@@ -77,7 +77,7 @@
<servlet-api.version>3.1.0</servlet-api.version>
<jstl.version>1.2</jstl.version>
<glassfish.version>2.1.v20091210</glassfish.version>
- <log4j.version>1.2.16</log4j.version>
+ <log4j.version>2.4.1</log4j.version>
<velocity.version>1.7</velocity.version>
<slf4j.version>1.7.7</slf4j.version>
<jaxb.version>2.2.6</jaxb.version>
