manifoldcf-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From kwri...@apache.org
Subject svn commit: r1791663 - in /manifoldcf/trunk: ./ connectors/ connectors/alfresco-webscript/ connectors/amazons3/ connectors/confluence/ connectors/dropbox/ connectors/elasticsearch/ connectors/googledrive/ connectors/hdfs/ connectors/jira/ connectors/ka...
Date Mon, 17 Apr 2017 06:19:26 GMT
Author: kwright
Date: Mon Apr 17 06:19:26 2017
New Revision: 1791663

URL: http://svn.apache.org/viewvc?rev=1791663&view=rev
Log:
Commit Nuxeo connector and authority (CONNECTORS-1290)

Added:
    manifoldcf/trunk/connectors/nuxeo/
      - copied from r1791662, manifoldcf/branches/CONNECTORS-1290-3/connectors/nuxeo/
    manifoldcf/trunk/framework/example-multiprocess-common/logging.xml
      - copied unchanged from r1791662, manifoldcf/branches/CONNECTORS-1290-3/framework/example-multiprocess-common/logging.xml
    manifoldcf/trunk/framework/example-singleprocess-common/logging.xml
      - copied unchanged from r1791662, manifoldcf/branches/CONNECTORS-1290-3/framework/example-singleprocess-common/logging.xml
    manifoldcf/trunk/framework/jetty-runner/src/main/resources/logging.xml
      - copied unchanged from r1791662, manifoldcf/branches/CONNECTORS-1290-3/framework/jetty-runner/src/main/resources/logging.xml
Removed:
    manifoldcf/trunk/framework/example-multiprocess-common/logging.ini
    manifoldcf/trunk/framework/example-singleprocess-common/logging.ini
    manifoldcf/trunk/framework/jetty-runner/src/main/resources/logging.ini
Modified:
    manifoldcf/trunk/   (props changed)
    manifoldcf/trunk/CHANGES.txt
    manifoldcf/trunk/build.xml
    manifoldcf/trunk/connectors/alfresco-webscript/pom.xml
    manifoldcf/trunk/connectors/amazons3/pom.xml
    manifoldcf/trunk/connectors/confluence/pom.xml
    manifoldcf/trunk/connectors/dropbox/pom.xml
    manifoldcf/trunk/connectors/elasticsearch/pom.xml
    manifoldcf/trunk/connectors/googledrive/pom.xml
    manifoldcf/trunk/connectors/hdfs/pom.xml
    manifoldcf/trunk/connectors/jira/pom.xml
    manifoldcf/trunk/connectors/kafka/pom.xml
    manifoldcf/trunk/connectors/pom.xml
    manifoldcf/trunk/connectors/solr/pom.xml
    manifoldcf/trunk/dist-license/LICENSE.txt
    manifoldcf/trunk/framework/build.xml
    manifoldcf/trunk/framework/connector-common/pom.xml
    manifoldcf/trunk/framework/core/pom.xml
    manifoldcf/trunk/framework/core/src/main/java/org/apache/manifoldcf/core/system/Logging.java
    manifoldcf/trunk/framework/core/src/main/java/org/apache/manifoldcf/core/system/ManifoldCF.java
    manifoldcf/trunk/framework/core/src/test/java/org/apache/manifoldcf/core/tests/Base.java
    manifoldcf/trunk/framework/example-multiprocess-file-proprietary/properties.xml
    manifoldcf/trunk/framework/example-multiprocess-file/properties.xml
    manifoldcf/trunk/framework/example-multiprocess-zk-proprietary/properties.xml
    manifoldcf/trunk/framework/example-multiprocess-zk/properties.xml
    manifoldcf/trunk/framework/example-singleprocess-proprietary/properties.xml
    manifoldcf/trunk/framework/example-singleprocess/properties.xml
    manifoldcf/trunk/framework/jetty-runner/src/main/resources/properties.xml
    manifoldcf/trunk/lib-license/LICENSE.txt
    manifoldcf/trunk/pom.xml

Propchange: manifoldcf/trunk/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Mon Apr 17 06:19:26 2017
@@ -66,6 +66,9 @@
 /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-1290-3:1791483-1791662
 /manifoldcf/branches/CONNECTORS-13:1525862-1527182,1539324-1541634
 /manifoldcf/branches/CONNECTORS-1308:1741766-1741789
 /manifoldcf/branches/CONNECTORS-1313:1742768-1743158

Modified: manifoldcf/trunk/CHANGES.txt
URL: http://svn.apache.org/viewvc/manifoldcf/trunk/CHANGES.txt?rev=1791663&r1=1791662&r2=1791663&view=diff
==============================================================================
--- manifoldcf/trunk/CHANGES.txt (original)
+++ manifoldcf/trunk/CHANGES.txt Mon Apr 17 06:19:26 2017
@@ -3,6 +3,11 @@ $Id$
 
 ======================= 2.8-dev =====================
 
+CONNECTORS-1290: Merge Nuxeo Connector.  This also required going
+to log4j 2.x.  This connector is a work in progress but since a great deal
+of work has been done and the connector is nearly done, it's time to
+commit to trunk.
+(David Arroyo Escobar, Rafa Haro, Karl Wright)
 
 ======================= Release 2.7 =====================
 

Modified: manifoldcf/trunk/build.xml
URL: http://svn.apache.org/viewvc/manifoldcf/trunk/build.xml?rev=1791663&r1=1791662&r2=1791663&view=diff
==============================================================================
--- manifoldcf/trunk/build.xml (original)
+++ manifoldcf/trunk/build.xml Mon Apr 17 06:19:26 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/trunk/connectors/alfresco-webscript/pom.xml
URL: http://svn.apache.org/viewvc/manifoldcf/trunk/connectors/alfresco-webscript/pom.xml?rev=1791663&r1=1791662&r2=1791663&view=diff
==============================================================================
--- manifoldcf/trunk/connectors/alfresco-webscript/pom.xml (original)
+++ manifoldcf/trunk/connectors/alfresco-webscript/pom.xml Mon Apr 17 06:19:26 2017
@@ -216,6 +216,12 @@
             <groupId>com.github.maoo.indexer</groupId>
             <artifactId>alfresco-indexer-client</artifactId>
             <version>${alfresco.indexer.version}</version>
+            <exclusions>
+              <exclusion>
+                <groupId>log4j</groupId>
+                <artifactId>log4j</artifactId>
+              </exclusion>
+            </exclusions>
         </dependency>
 
         <dependency>

Modified: manifoldcf/trunk/connectors/amazons3/pom.xml
URL: http://svn.apache.org/viewvc/manifoldcf/trunk/connectors/amazons3/pom.xml?rev=1791663&r1=1791662&r2=1791663&view=diff
==============================================================================
--- manifoldcf/trunk/connectors/amazons3/pom.xml (original)
+++ manifoldcf/trunk/connectors/amazons3/pom.xml Mon Apr 17 06:19:26 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/trunk/connectors/confluence/pom.xml
URL: http://svn.apache.org/viewvc/manifoldcf/trunk/connectors/confluence/pom.xml?rev=1791663&r1=1791662&r2=1791663&view=diff
==============================================================================
--- manifoldcf/trunk/connectors/confluence/pom.xml (original)
+++ manifoldcf/trunk/connectors/confluence/pom.xml Mon Apr 17 06:19:26 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/trunk/connectors/dropbox/pom.xml
URL: http://svn.apache.org/viewvc/manifoldcf/trunk/connectors/dropbox/pom.xml?rev=1791663&r1=1791662&r2=1791663&view=diff
==============================================================================
--- manifoldcf/trunk/connectors/dropbox/pom.xml (original)
+++ manifoldcf/trunk/connectors/dropbox/pom.xml Mon Apr 17 06:19:26 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/trunk/connectors/elasticsearch/pom.xml
URL: http://svn.apache.org/viewvc/manifoldcf/trunk/connectors/elasticsearch/pom.xml?rev=1791663&r1=1791662&r2=1791663&view=diff
==============================================================================
--- manifoldcf/trunk/connectors/elasticsearch/pom.xml (original)
+++ manifoldcf/trunk/connectors/elasticsearch/pom.xml Mon Apr 17 06:19:26 2017
@@ -466,6 +466,12 @@
       <artifactId>elasticsearch-mapper-attachments</artifactId>
       <version>2.0.0.RC1</version>
       <scope>test</scope>
+      <exclusions>
+        <exclusion>
+          <groupId>log4j</groupId>
+          <artifactId>log4j</artifactId>
+        </exclusion>
+      </exclusions>
     </dependency>
 
   </dependencies>

Modified: manifoldcf/trunk/connectors/googledrive/pom.xml
URL: http://svn.apache.org/viewvc/manifoldcf/trunk/connectors/googledrive/pom.xml?rev=1791663&r1=1791662&r2=1791663&view=diff
==============================================================================
--- manifoldcf/trunk/connectors/googledrive/pom.xml (original)
+++ manifoldcf/trunk/connectors/googledrive/pom.xml Mon Apr 17 06:19:26 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/trunk/connectors/hdfs/pom.xml
URL: http://svn.apache.org/viewvc/manifoldcf/trunk/connectors/hdfs/pom.xml?rev=1791663&r1=1791662&r2=1791663&view=diff
==============================================================================
--- manifoldcf/trunk/connectors/hdfs/pom.xml (original)
+++ manifoldcf/trunk/connectors/hdfs/pom.xml Mon Apr 17 06:19:26 2017
@@ -361,6 +361,12 @@
       <groupId>org.apache.hadoop</groupId>
       <artifactId>hadoop-common</artifactId>
       <version>${hadoop.version}</version>
+      <exclusions>
+        <exclusion>
+          <groupId>log4j</groupId>
+          <artifactId>log4j</artifactId>
+        </exclusion>
+      </exclusions>
     </dependency>
   </dependencies>
 </project>

Modified: manifoldcf/trunk/connectors/jira/pom.xml
URL: http://svn.apache.org/viewvc/manifoldcf/trunk/connectors/jira/pom.xml?rev=1791663&r1=1791662&r2=1791663&view=diff
==============================================================================
--- manifoldcf/trunk/connectors/jira/pom.xml (original)
+++ manifoldcf/trunk/connectors/jira/pom.xml Mon Apr 17 06:19:26 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/trunk/connectors/kafka/pom.xml
URL: http://svn.apache.org/viewvc/manifoldcf/trunk/connectors/kafka/pom.xml?rev=1791663&r1=1791662&r2=1791663&view=diff
==============================================================================
--- manifoldcf/trunk/connectors/kafka/pom.xml (original)
+++ manifoldcf/trunk/connectors/kafka/pom.xml Mon Apr 17 06:19:26 2017
@@ -231,6 +231,12 @@
       <artifactId>kafka_2.11</artifactId>
       <version>0.8.2.1</version>
       <scope>test</scope>
+      <exclusions>
+        <exclusion>
+          <groupId>log4j</groupId>
+          <artifactId>log4j</artifactId>
+        </exclusion>
+      </exclusions>
     </dependency>
     <dependency>
       <groupId>org.scala-lang</groupId>
@@ -449,6 +455,12 @@
       <artifactId>zookeeper</artifactId>
       <version>${zookeeper.version}</version>
       <scope>test</scope>
+      <exclusions>
+        <exclusion>
+          <groupId>log4j</groupId>
+          <artifactId>log4j</artifactId>
+        </exclusion>
+      </exclusions>
     </dependency>
   </dependencies>
 </project>

Modified: manifoldcf/trunk/connectors/pom.xml
URL: http://svn.apache.org/viewvc/manifoldcf/trunk/connectors/pom.xml?rev=1791663&r1=1791662&r2=1791663&view=diff
==============================================================================
--- manifoldcf/trunk/connectors/pom.xml (original)
+++ manifoldcf/trunk/connectors/pom.xml Mon Apr 17 06:19:26 2017
@@ -69,6 +69,7 @@
     <module>amazons3</module>
     <module>kafka</module>
     <module>opennlp</module>
+    <module>nuxeo</module>
   </modules>
 
 </project>

Modified: manifoldcf/trunk/connectors/solr/pom.xml
URL: http://svn.apache.org/viewvc/manifoldcf/trunk/connectors/solr/pom.xml?rev=1791663&r1=1791662&r2=1791663&view=diff
==============================================================================
--- manifoldcf/trunk/connectors/solr/pom.xml (original)
+++ manifoldcf/trunk/connectors/solr/pom.xml Mon Apr 17 06:19:26 2017
@@ -232,6 +232,12 @@
       <groupId>org.apache.zookeeper</groupId>
       <artifactId>zookeeper</artifactId>
       <version>${zookeeper.version}</version>
+      <exclusions>
+        <exclusion>
+          <groupId>log4j</groupId>
+          <artifactId>log4j</artifactId>
+        </exclusion>
+      </exclusions>
     </dependency>
     <dependency>
       <groupId>org.apache.httpcomponents</groupId>

Modified: manifoldcf/trunk/dist-license/LICENSE.txt
URL: http://svn.apache.org/viewvc/manifoldcf/trunk/dist-license/LICENSE.txt?rev=1791663&r1=1791662&r2=1791663&view=diff
==============================================================================
--- manifoldcf/trunk/dist-license/LICENSE.txt (original)
+++ manifoldcf/trunk/dist-license/LICENSE.txt Mon Apr 17 06:19:26 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/trunk/framework/build.xml
URL: http://svn.apache.org/viewvc/manifoldcf/trunk/framework/build.xml?rev=1791663&r1=1791662&r2=1791663&view=diff
==============================================================================
--- manifoldcf/trunk/framework/build.xml (original)
+++ manifoldcf/trunk/framework/build.xml Mon Apr 17 06:19:26 2017
@@ -1577,7 +1577,6 @@
         <mkdir dir="dist/multiprocess-file-example"/>
         <copy todir="dist/multiprocess-file-example">
             <fileset dir="example-multiprocess-common">
-                <include name="logging.ini"/>
                 <include name="*.sh"/>
                 <include name="*.bat"/>
                 <include name="*.xml"/>
@@ -1606,7 +1605,6 @@
         <mkdir dir="dist/multiprocess-file-example-proprietary"/>
         <copy todir="dist/multiprocess-file-example-proprietary">
             <fileset dir="example-multiprocess-common">
-                <include name="logging.ini"/>
                 <include name="*.sh"/>
                 <include name="*.bat"/>
                 <include name="*.xml"/>
@@ -1637,7 +1635,6 @@
         <mkdir dir="dist/multiprocess-zk-example"/>
         <copy todir="dist/multiprocess-zk-example">
             <fileset dir="example-multiprocess-common">
-                <include name="logging.ini"/>
                 <include name="*.sh"/>
                 <include name="*.bat"/>
                 <include name="*.xml"/>
@@ -1670,7 +1667,6 @@
         <mkdir dir="dist/multiprocess-zk-example-proprietary"/>
         <copy todir="dist/multiprocess-zk-example-proprietary">
             <fileset dir="example-multiprocess-common">
-                <include name="logging.ini"/>
                 <include name="*.sh"/>
                 <include name="*.bat"/>
                 <include name="*.xml"/>
@@ -1726,7 +1722,6 @@
         <mkdir dir="dist/example/logs"/>
         <copy todir="dist/example">
             <fileset dir="example-singleprocess-common">
-                <include name="logging.ini"/>
                 <include name="*.sh"/>
                 <include name="*.bat"/>
                 <include name="*.xml"/>
@@ -1760,7 +1755,6 @@
         <mkdir dir="dist/example-proprietary/logs"/>
         <copy todir="dist/example-proprietary">
             <fileset dir="example-singleprocess-common">
-                <include name="logging.ini"/>
                 <include name="*.sh"/>
                 <include name="*.bat"/>
                 <include name="*.xml"/>

Modified: manifoldcf/trunk/framework/connector-common/pom.xml
URL: http://svn.apache.org/viewvc/manifoldcf/trunk/framework/connector-common/pom.xml?rev=1791663&r1=1791662&r2=1791663&view=diff
==============================================================================
--- manifoldcf/trunk/framework/connector-common/pom.xml (original)
+++ manifoldcf/trunk/framework/connector-common/pom.xml Mon Apr 17 06:19:26 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>
@@ -104,6 +99,10 @@
       <version>${castor.version}</version>
       <exclusions>
         <exclusion>
+          <groupId>log4j</groupId>
+          <artifactId>log4j</artifactId>
+        </exclusion>
+        <exclusion>
           <groupId>adaptx</groupId>
           <artifactId>adaptx</artifactId>
         </exclusion>

Modified: manifoldcf/trunk/framework/core/pom.xml
URL: http://svn.apache.org/viewvc/manifoldcf/trunk/framework/core/pom.xml?rev=1791663&r1=1791662&r2=1791663&view=diff
==============================================================================
--- manifoldcf/trunk/framework/core/pom.xml (original)
+++ manifoldcf/trunk/framework/core/pom.xml Mon Apr 17 06:19:26 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>
@@ -88,6 +98,10 @@
       <version>${zookeeper.version}</version>
       <exclusions>
         <exclusion>
+          <groupId>log4j</groupId>
+          <artifactId>log4j</artifactId>
+        </exclusion>
+        <exclusion>
           <groupId>junit</groupId>
           <artifactId>junit</artifactId>
         </exclusion>

Modified: manifoldcf/trunk/framework/core/src/main/java/org/apache/manifoldcf/core/system/Logging.java
URL: http://svn.apache.org/viewvc/manifoldcf/trunk/framework/core/src/main/java/org/apache/manifoldcf/core/system/Logging.java?rev=1791663&r1=1791662&r2=1791663&view=diff
==============================================================================
--- manifoldcf/trunk/framework/core/src/main/java/org/apache/manifoldcf/core/system/Logging.java
(original)
+++ manifoldcf/trunk/framework/core/src/main/java/org/apache/manifoldcf/core/system/Logging.java
Mon Apr 17 06:19:26 2017
@@ -23,15 +23,11 @@ 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;
+import org.apache.logging.log4j.core.config.ConfigurationSource;
+import org.apache.logging.log4j.core.config.ConfigurationFactory;
+import org.apache.logging.log4j.core.config.properties.PropertiesConfigurationFactory;
 
-/** This class furnishes the logging environment for the JSKW application.
+/** This class furnishes the logging environment for ManifoldCF.
 */
 public class Logging
 {
@@ -52,7 +48,7 @@ public class Logging
 
   /** Initialize logger setup.
   */
-  public static synchronized void initializeLoggingSystem(File logConfigFile)
+  public static synchronized void initializeLoggingSystem(final File logConfigFile)
   {
     if (logLevelMap != null)
       return;
@@ -70,9 +66,7 @@ public class Logging
 
     loggerTable = new HashMap();
 
-    // Initialize the logger
-    PropertyConfigurator.configure(logConfigFile.toString());
-
+    System.setProperty("log4j.configurationFile", logConfigFile.toString());
     //System.err.println("ManifoldCF logger setup complete");
   }
 

Modified: manifoldcf/trunk/framework/core/src/main/java/org/apache/manifoldcf/core/system/ManifoldCF.java
URL: http://svn.apache.org/viewvc/manifoldcf/trunk/framework/core/src/main/java/org/apache/manifoldcf/core/system/ManifoldCF.java?rev=1791663&r1=1791662&r2=1791663&view=diff
==============================================================================
--- manifoldcf/trunk/framework/core/src/main/java/org/apache/manifoldcf/core/system/ManifoldCF.java
(original)
+++ manifoldcf/trunk/framework/core/src/main/java/org/apache/manifoldcf/core/system/ManifoldCF.java
Mon Apr 17 06:19:26 2017
@@ -265,7 +265,7 @@ public class ManifoldCF
             System.err.println("Couldn't find "+logConfigFileProperty+" property; using default");
             String configPath = (String)props.get("user.home") + "/"+applicationName;
             configPath = configPath.replace('\\', '/');
-            logConfigFile = new File(configPath,"logging.ini");
+            logConfigFile = new File(configPath,"logging.xml");
           }
 
           // Make sure that the registered entry points for polling and cleanup are cleared,
just in case.

Modified: manifoldcf/trunk/framework/core/src/test/java/org/apache/manifoldcf/core/tests/Base.java
URL: http://svn.apache.org/viewvc/manifoldcf/trunk/framework/core/src/test/java/org/apache/manifoldcf/core/tests/Base.java?rev=1791663&r1=1791662&r2=1791663&view=diff
==============================================================================
--- manifoldcf/trunk/framework/core/src/test/java/org/apache/manifoldcf/core/tests/Base.java
(original)
+++ manifoldcf/trunk/framework/core/src/test/java/org/apache/manifoldcf/core/tests/Base.java
Mon Apr 17 06:19:26 2017
@@ -45,7 +45,7 @@ public class Base
 
       // First, write a properties file and a logging file, in the current directory.
       configFile = new File("properties.xml").getCanonicalFile();
-      loggingFile = new File("logging.ini").getCanonicalFile();
+      loggingFile = new File("logging.xml").getCanonicalFile();
       logOutputFile = new File("manifoldcf.log").getCanonicalFile();
       connectorFile = new File("connectors.xml").getCanonicalFile();
 
@@ -90,11 +90,20 @@ public class Base
     throws Exception
   {
     output.append(
-      "log4j.appender.MAIN.File="+logOutputFile.getAbsolutePath().replaceAll("\\\\","/")+"\n"
+
-      "log4j.rootLogger=WARN, MAIN\n" +
-      "log4j.appender.MAIN=org.apache.log4j.RollingFileAppender\n" +
-      "log4j.appender.MAIN.layout=org.apache.log4j.PatternLayout\n" +
-      "log4j.appender.MAIN.layout.ConversionPattern=%5p %d{ISO8601} (%t) - %m%n\n"
+"<Configuration status=\"warn\" name=\"ManifoldCF\" packages=\"\">\n"+
+"  <Appenders>\n"+
+"    <File name=\"MyFile\" fileName=\""+logOutputFile.getAbsolutePath().replaceAll("\\\\","/")+"\">\n"+
+"      <PatternLayout>\n"+
+"        <Pattern>%5p %d{ISO8601} (%t) - %m%n</Pattern>\n"+
+"      </PatternLayout>\n"+
+"    </File>\n"+
+"  </Appenders>\n"+
+"  <Loggers>\n"+
+"    <Root level=\"error\">\n"+
+"      <AppenderRef ref=\"MyFile\"/>\n"+
+"    </Root>\n"+
+"  </Loggers>\n"+
+"</Configuration>\n"
     );
   }
   

Modified: manifoldcf/trunk/framework/example-multiprocess-file-proprietary/properties.xml
URL: http://svn.apache.org/viewvc/manifoldcf/trunk/framework/example-multiprocess-file-proprietary/properties.xml?rev=1791663&r1=1791662&r2=1791663&view=diff
==============================================================================
--- manifoldcf/trunk/framework/example-multiprocess-file-proprietary/properties.xml (original)
+++ manifoldcf/trunk/framework/example-multiprocess-file-proprietary/properties.xml Mon Apr
17 06:19:26 2017
@@ -37,7 +37,7 @@
   <property name="org.apache.manifoldcf.database.maxhandles" value="100"/>
   <property name="org.apache.manifoldcf.crawler.threads" value="50"/>
   <!-- Point to a specific (common) logging file -->
-  <property name="org.apache.manifoldcf.logconfigfile" value="./logging.ini"/>
+  <property name="org.apache.manifoldcf.logconfigfile" value="./logging.xml"/>
   <!-- Specify the connectors to be loaded -->
   <property name="org.apache.manifoldcf.connectorsconfigurationfile" value="../connectors-proprietary.xml"/>
   <!-- Specify the path to the file resources directory -->

Modified: manifoldcf/trunk/framework/example-multiprocess-file/properties.xml
URL: http://svn.apache.org/viewvc/manifoldcf/trunk/framework/example-multiprocess-file/properties.xml?rev=1791663&r1=1791662&r2=1791663&view=diff
==============================================================================
--- manifoldcf/trunk/framework/example-multiprocess-file/properties.xml (original)
+++ manifoldcf/trunk/framework/example-multiprocess-file/properties.xml Mon Apr 17 06:19:26
2017
@@ -37,7 +37,7 @@
   <property name="org.apache.manifoldcf.database.maxhandles" value="100"/>
   <property name="org.apache.manifoldcf.crawler.threads" value="50"/>
   <!-- Point to a specific (common) logging file -->
-  <property name="org.apache.manifoldcf.logconfigfile" value="./logging.ini"/>
+  <property name="org.apache.manifoldcf.logconfigfile" value="./logging.xml"/>
   <!-- Specify the connectors to be loaded -->
   <property name="org.apache.manifoldcf.connectorsconfigurationfile" value="../connectors.xml"/>
   <!-- Specify the path to the file resources directory -->

Modified: manifoldcf/trunk/framework/example-multiprocess-zk-proprietary/properties.xml
URL: http://svn.apache.org/viewvc/manifoldcf/trunk/framework/example-multiprocess-zk-proprietary/properties.xml?rev=1791663&r1=1791662&r2=1791663&view=diff
==============================================================================
--- manifoldcf/trunk/framework/example-multiprocess-zk-proprietary/properties.xml (original)
+++ manifoldcf/trunk/framework/example-multiprocess-zk-proprietary/properties.xml Mon Apr
17 06:19:26 2017
@@ -32,7 +32,7 @@
   <property name="org.apache.manifoldcf.zookeeper.connectstring" value="localhost:8349"/>
   <property name="org.apache.manifoldcf.zookeeper.sessiontimeout" value="300000"/>
   <!-- Point to a specific (common) logging file -->
-  <property name="org.apache.manifoldcf.logconfigfile" value="./logging.ini"/>
+  <property name="org.apache.manifoldcf.logconfigfile" value="./logging.xml"/>
   <!-- Specify the connectors to be loaded -->
   <property name="org.apache.manifoldcf.connectorsconfigurationfile" value="../connectors-proprietary.xml"/>
   <!-- Specify the path to the file resources directory -->

Modified: manifoldcf/trunk/framework/example-multiprocess-zk/properties.xml
URL: http://svn.apache.org/viewvc/manifoldcf/trunk/framework/example-multiprocess-zk/properties.xml?rev=1791663&r1=1791662&r2=1791663&view=diff
==============================================================================
--- manifoldcf/trunk/framework/example-multiprocess-zk/properties.xml (original)
+++ manifoldcf/trunk/framework/example-multiprocess-zk/properties.xml Mon Apr 17 06:19:26
2017
@@ -32,7 +32,7 @@
   <property name="org.apache.manifoldcf.zookeeper.connectstring" value="localhost:8349"/>
   <property name="org.apache.manifoldcf.zookeeper.sessiontimeout" value="300000"/>
   <!-- Point to a specific (common) logging file -->
-  <property name="org.apache.manifoldcf.logconfigfile" value="./logging.ini"/>
+  <property name="org.apache.manifoldcf.logconfigfile" value="./logging.xml"/>
   <!-- Specify the connectors to be loaded -->
   <property name="org.apache.manifoldcf.connectorsconfigurationfile" value="../connectors.xml"/>
   <!-- Specify the path to the file resources directory -->

Modified: manifoldcf/trunk/framework/example-singleprocess-proprietary/properties.xml
URL: http://svn.apache.org/viewvc/manifoldcf/trunk/framework/example-singleprocess-proprietary/properties.xml?rev=1791663&r1=1791662&r2=1791663&view=diff
==============================================================================
--- manifoldcf/trunk/framework/example-singleprocess-proprietary/properties.xml (original)
+++ manifoldcf/trunk/framework/example-singleprocess-proprietary/properties.xml Mon Apr 17
06:19:26 2017
@@ -34,7 +34,7 @@
   <property name="org.apache.manifoldcf.crawler.threads" value="50"/>
   <property name="org.apache.manifoldcf.crawler.historycleanupinterval" value="2592000000"/>
   <!-- Point to a specific logging file -->
-  <property name="org.apache.manifoldcf.logconfigfile" value="./logging.ini"/>
+  <property name="org.apache.manifoldcf.logconfigfile" value="./logging.xml"/>
   <!-- Specify the connectors to be loaded -->
   <property name="org.apache.manifoldcf.connectorsconfigurationfile" value="../connectors-proprietary.xml"/>
   <!-- Specify the path to the file resources directory -->

Modified: manifoldcf/trunk/framework/example-singleprocess/properties.xml
URL: http://svn.apache.org/viewvc/manifoldcf/trunk/framework/example-singleprocess/properties.xml?rev=1791663&r1=1791662&r2=1791663&view=diff
==============================================================================
--- manifoldcf/trunk/framework/example-singleprocess/properties.xml (original)
+++ manifoldcf/trunk/framework/example-singleprocess/properties.xml Mon Apr 17 06:19:26 2017
@@ -34,7 +34,7 @@
   <property name="org.apache.manifoldcf.crawler.threads" value="50"/>
   <property name="org.apache.manifoldcf.crawler.historycleanupinterval" value="2592000000"/>
   <!-- Point to a specific logging file -->
-  <property name="org.apache.manifoldcf.logconfigfile" value="./logging.ini"/>
+  <property name="org.apache.manifoldcf.logconfigfile" value="./logging.xml"/>
   <!-- Specify the connectors to be loaded -->
   <property name="org.apache.manifoldcf.connectorsconfigurationfile" value="../connectors.xml"/>
   <!-- Specify the path to the file resources directory -->

Modified: manifoldcf/trunk/framework/jetty-runner/src/main/resources/properties.xml
URL: http://svn.apache.org/viewvc/manifoldcf/trunk/framework/jetty-runner/src/main/resources/properties.xml?rev=1791663&r1=1791662&r2=1791663&view=diff
==============================================================================
--- manifoldcf/trunk/framework/jetty-runner/src/main/resources/properties.xml (original)
+++ manifoldcf/trunk/framework/jetty-runner/src/main/resources/properties.xml Mon Apr 17 06:19:26
2017
@@ -24,7 +24,7 @@
   <property name="org.apache.manifoldcf.database.maxhandles" value="100"/>
   <property name="org.apache.manifoldcf.crawler.threads" value="50"/>
   <!-- Point to a specific logging file -->
-  <property name="org.apache.manifoldcf.logconfigfile" value="./logging.ini"/>
+  <property name="org.apache.manifoldcf.logconfigfile" value="./logging.xml"/>
   <!-- Specify the connectors to be loaded -->
   <property name="org.apache.manifoldcf.connectorsconfigurationfile" value="./connectors.xml"/>
   <!-- Tell LCF where to find the connector jars -->

Modified: manifoldcf/trunk/lib-license/LICENSE.txt
URL: http://svn.apache.org/viewvc/manifoldcf/trunk/lib-license/LICENSE.txt?rev=1791663&r1=1791662&r2=1791663&view=diff
==============================================================================
--- manifoldcf/trunk/lib-license/LICENSE.txt (original)
+++ manifoldcf/trunk/lib-license/LICENSE.txt Mon Apr 17 06:19:26 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/trunk/pom.xml
URL: http://svn.apache.org/viewvc/manifoldcf/trunk/pom.xml?rev=1791663&r1=1791662&r2=1791663&view=diff
==============================================================================
--- manifoldcf/trunk/pom.xml (original)
+++ manifoldcf/trunk/pom.xml Mon Apr 17 06:19:26 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>



Mime
View raw message