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 2017/04/15 14:02:15 UTC
svn commit: r1791508 - in /manifoldcf/branches/CONNECTORS-1290-3/framework:
./ core/src/main/java/org/apache/manifoldcf/core/system/
example-multiprocess-common/ example-multiprocess-file-proprietary/
example-multiprocess-file/ example-multiprocess-zk-...
Author: kwright
Date: Sat Apr 15 14:02:15 2017
New Revision: 1791508
URL: http://svn.apache.org/viewvc?rev=1791508&view=rev
Log:
Change from logging.ini to logging.properties because log4j2 cares about extension
Added:
manifoldcf/branches/CONNECTORS-1290-3/framework/example-multiprocess-common/logging.properties
- copied unchanged from r1791483, manifoldcf/branches/CONNECTORS-1290-3/framework/example-multiprocess-common/logging.ini
manifoldcf/branches/CONNECTORS-1290-3/framework/example-singleprocess-common/logging.properties
- copied unchanged from r1791483, manifoldcf/branches/CONNECTORS-1290-3/framework/example-singleprocess-common/logging.ini
Removed:
manifoldcf/branches/CONNECTORS-1290-3/framework/example-multiprocess-common/logging.ini
manifoldcf/branches/CONNECTORS-1290-3/framework/example-singleprocess-common/logging.ini
Modified:
manifoldcf/branches/CONNECTORS-1290-3/framework/build.xml
manifoldcf/branches/CONNECTORS-1290-3/framework/core/src/main/java/org/apache/manifoldcf/core/system/Logging.java
manifoldcf/branches/CONNECTORS-1290-3/framework/core/src/main/java/org/apache/manifoldcf/core/system/ManifoldCF.java
manifoldcf/branches/CONNECTORS-1290-3/framework/example-multiprocess-file-proprietary/properties.xml
manifoldcf/branches/CONNECTORS-1290-3/framework/example-multiprocess-file/properties.xml
manifoldcf/branches/CONNECTORS-1290-3/framework/example-multiprocess-zk-proprietary/properties.xml
manifoldcf/branches/CONNECTORS-1290-3/framework/example-multiprocess-zk/properties.xml
manifoldcf/branches/CONNECTORS-1290-3/framework/example-singleprocess-proprietary/properties.xml
manifoldcf/branches/CONNECTORS-1290-3/framework/example-singleprocess/properties.xml
Modified: manifoldcf/branches/CONNECTORS-1290-3/framework/build.xml
URL: http://svn.apache.org/viewvc/manifoldcf/branches/CONNECTORS-1290-3/framework/build.xml?rev=1791508&r1=1791507&r2=1791508&view=diff
==============================================================================
--- manifoldcf/branches/CONNECTORS-1290-3/framework/build.xml (original)
+++ manifoldcf/branches/CONNECTORS-1290-3/framework/build.xml Sat Apr 15 14:02:15 2017
@@ -1577,7 +1577,7 @@
<mkdir dir="dist/multiprocess-file-example"/>
<copy todir="dist/multiprocess-file-example">
<fileset dir="example-multiprocess-common">
- <include name="logging.ini"/>
+ <include name="logging.properties"/>
<include name="*.sh"/>
<include name="*.bat"/>
<include name="*.xml"/>
@@ -1606,7 +1606,7 @@
<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="logging.properties"/>
<include name="*.sh"/>
<include name="*.bat"/>
<include name="*.xml"/>
@@ -1637,7 +1637,7 @@
<mkdir dir="dist/multiprocess-zk-example"/>
<copy todir="dist/multiprocess-zk-example">
<fileset dir="example-multiprocess-common">
- <include name="logging.ini"/>
+ <include name="logging.properties"/>
<include name="*.sh"/>
<include name="*.bat"/>
<include name="*.xml"/>
@@ -1670,7 +1670,7 @@
<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="logging.properties"/>
<include name="*.sh"/>
<include name="*.bat"/>
<include name="*.xml"/>
@@ -1726,7 +1726,7 @@
<mkdir dir="dist/example/logs"/>
<copy todir="dist/example">
<fileset dir="example-singleprocess-common">
- <include name="logging.ini"/>
+ <include name="logging.properties"/>
<include name="*.sh"/>
<include name="*.bat"/>
<include name="*.xml"/>
@@ -1760,7 +1760,7 @@
<mkdir dir="dist/example-proprietary/logs"/>
<copy todir="dist/example-proprietary">
<fileset dir="example-singleprocess-common">
- <include name="logging.ini"/>
+ <include name="logging.properties"/>
<include name="*.sh"/>
<include name="*.bat"/>
<include name="*.xml"/>
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=1791508&r1=1791507&r2=1791508&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 14:02:15 2017
@@ -23,8 +23,11 @@ import java.util.*;
import java.io.*;
import org.apache.log4j.*;
+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
{
@@ -45,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;
@@ -63,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/branches/CONNECTORS-1290-3/framework/core/src/main/java/org/apache/manifoldcf/core/system/ManifoldCF.java
URL: http://svn.apache.org/viewvc/manifoldcf/branches/CONNECTORS-1290-3/framework/core/src/main/java/org/apache/manifoldcf/core/system/ManifoldCF.java?rev=1791508&r1=1791507&r2=1791508&view=diff
==============================================================================
--- manifoldcf/branches/CONNECTORS-1290-3/framework/core/src/main/java/org/apache/manifoldcf/core/system/ManifoldCF.java (original)
+++ manifoldcf/branches/CONNECTORS-1290-3/framework/core/src/main/java/org/apache/manifoldcf/core/system/ManifoldCF.java Sat Apr 15 14:02:15 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.properties");
}
// Make sure that the registered entry points for polling and cleanup are cleared, just in case.
Modified: manifoldcf/branches/CONNECTORS-1290-3/framework/example-multiprocess-file-proprietary/properties.xml
URL: http://svn.apache.org/viewvc/manifoldcf/branches/CONNECTORS-1290-3/framework/example-multiprocess-file-proprietary/properties.xml?rev=1791508&r1=1791507&r2=1791508&view=diff
==============================================================================
--- manifoldcf/branches/CONNECTORS-1290-3/framework/example-multiprocess-file-proprietary/properties.xml (original)
+++ manifoldcf/branches/CONNECTORS-1290-3/framework/example-multiprocess-file-proprietary/properties.xml Sat Apr 15 14:02:15 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.properties"/>
<!-- 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/branches/CONNECTORS-1290-3/framework/example-multiprocess-file/properties.xml
URL: http://svn.apache.org/viewvc/manifoldcf/branches/CONNECTORS-1290-3/framework/example-multiprocess-file/properties.xml?rev=1791508&r1=1791507&r2=1791508&view=diff
==============================================================================
--- manifoldcf/branches/CONNECTORS-1290-3/framework/example-multiprocess-file/properties.xml (original)
+++ manifoldcf/branches/CONNECTORS-1290-3/framework/example-multiprocess-file/properties.xml Sat Apr 15 14:02:15 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.properties"/>
<!-- 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/branches/CONNECTORS-1290-3/framework/example-multiprocess-zk-proprietary/properties.xml
URL: http://svn.apache.org/viewvc/manifoldcf/branches/CONNECTORS-1290-3/framework/example-multiprocess-zk-proprietary/properties.xml?rev=1791508&r1=1791507&r2=1791508&view=diff
==============================================================================
--- manifoldcf/branches/CONNECTORS-1290-3/framework/example-multiprocess-zk-proprietary/properties.xml (original)
+++ manifoldcf/branches/CONNECTORS-1290-3/framework/example-multiprocess-zk-proprietary/properties.xml Sat Apr 15 14:02:15 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.properties"/>
<!-- 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/branches/CONNECTORS-1290-3/framework/example-multiprocess-zk/properties.xml
URL: http://svn.apache.org/viewvc/manifoldcf/branches/CONNECTORS-1290-3/framework/example-multiprocess-zk/properties.xml?rev=1791508&r1=1791507&r2=1791508&view=diff
==============================================================================
--- manifoldcf/branches/CONNECTORS-1290-3/framework/example-multiprocess-zk/properties.xml (original)
+++ manifoldcf/branches/CONNECTORS-1290-3/framework/example-multiprocess-zk/properties.xml Sat Apr 15 14:02:15 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.properties"/>
<!-- 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/branches/CONNECTORS-1290-3/framework/example-singleprocess-proprietary/properties.xml
URL: http://svn.apache.org/viewvc/manifoldcf/branches/CONNECTORS-1290-3/framework/example-singleprocess-proprietary/properties.xml?rev=1791508&r1=1791507&r2=1791508&view=diff
==============================================================================
--- manifoldcf/branches/CONNECTORS-1290-3/framework/example-singleprocess-proprietary/properties.xml (original)
+++ manifoldcf/branches/CONNECTORS-1290-3/framework/example-singleprocess-proprietary/properties.xml Sat Apr 15 14:02:15 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.properties"/>
<!-- 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/branches/CONNECTORS-1290-3/framework/example-singleprocess/properties.xml
URL: http://svn.apache.org/viewvc/manifoldcf/branches/CONNECTORS-1290-3/framework/example-singleprocess/properties.xml?rev=1791508&r1=1791507&r2=1791508&view=diff
==============================================================================
--- manifoldcf/branches/CONNECTORS-1290-3/framework/example-singleprocess/properties.xml (original)
+++ manifoldcf/branches/CONNECTORS-1290-3/framework/example-singleprocess/properties.xml Sat Apr 15 14:02:15 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.properties"/>
<!-- Specify the connectors to be loaded -->
<property name="org.apache.manifoldcf.connectorsconfigurationfile" value="../connectors.xml"/>
<!-- Specify the path to the file resources directory -->