You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@logging.apache.org by rp...@apache.org on 2015/12/05 02:05:40 UTC
[1/2] logging-log4j2 git commit: organized imports
Repository: logging-log4j2
Updated Branches:
refs/heads/master 609a25b5b -> d64c6f4f1
organized imports
Project: http://git-wip-us.apache.org/repos/asf/logging-log4j2/repo
Commit: http://git-wip-us.apache.org/repos/asf/logging-log4j2/commit/239f9918
Tree: http://git-wip-us.apache.org/repos/asf/logging-log4j2/tree/239f9918
Diff: http://git-wip-us.apache.org/repos/asf/logging-log4j2/diff/239f9918
Branch: refs/heads/master
Commit: 239f991893745f034fb7fb264576a19bc9a4ad7d
Parents: 609a25b
Author: rpopma <rp...@apache.org>
Authored: Sat Dec 5 09:44:02 2015 +0900
Committer: rpopma <rp...@apache.org>
Committed: Sat Dec 5 09:44:02 2015 +0900
----------------------------------------------------------------------
.../main/java/org/apache/logging/log4j/core/script/ScriptRef.java | 1 -
1 file changed, 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/logging-log4j2/blob/239f9918/log4j-core/src/main/java/org/apache/logging/log4j/core/script/ScriptRef.java
----------------------------------------------------------------------
diff --git a/log4j-core/src/main/java/org/apache/logging/log4j/core/script/ScriptRef.java b/log4j-core/src/main/java/org/apache/logging/log4j/core/script/ScriptRef.java
index 785be75..0ace830 100644
--- a/log4j-core/src/main/java/org/apache/logging/log4j/core/script/ScriptRef.java
+++ b/log4j-core/src/main/java/org/apache/logging/log4j/core/script/ScriptRef.java
@@ -23,7 +23,6 @@ import org.apache.logging.log4j.core.config.plugins.Plugin;
import org.apache.logging.log4j.core.config.plugins.PluginAttribute;
import org.apache.logging.log4j.core.config.plugins.PluginConfiguration;
import org.apache.logging.log4j.core.config.plugins.PluginFactory;
-import org.apache.logging.log4j.core.config.plugins.PluginValue;
import org.apache.logging.log4j.status.StatusLogger;
/**
[2/2] logging-log4j2 git commit: organized imports,
implemented serializable
Posted by rp...@apache.org.
organized imports, implemented serializable
Project: http://git-wip-us.apache.org/repos/asf/logging-log4j2/repo
Commit: http://git-wip-us.apache.org/repos/asf/logging-log4j2/commit/d64c6f4f
Tree: http://git-wip-us.apache.org/repos/asf/logging-log4j2/tree/d64c6f4f
Diff: http://git-wip-us.apache.org/repos/asf/logging-log4j2/diff/d64c6f4f
Branch: refs/heads/master
Commit: d64c6f4f18abe60eaf62343a71125110907ad771
Parents: 239f991
Author: rpopma <rp...@apache.org>
Authored: Sat Dec 5 09:44:54 2015 +0900
Committer: rpopma <rp...@apache.org>
Committed: Sat Dec 5 09:44:54 2015 +0900
----------------------------------------------------------------------
.../log4j/core/script/ScriptManager.java | 30 +++++++++++---------
1 file changed, 16 insertions(+), 14 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/logging-log4j2/blob/d64c6f4f/log4j-core/src/main/java/org/apache/logging/log4j/core/script/ScriptManager.java
----------------------------------------------------------------------
diff --git a/log4j-core/src/main/java/org/apache/logging/log4j/core/script/ScriptManager.java b/log4j-core/src/main/java/org/apache/logging/log4j/core/script/ScriptManager.java
index d05698d..208da68 100644
--- a/log4j-core/src/main/java/org/apache/logging/log4j/core/script/ScriptManager.java
+++ b/log4j-core/src/main/java/org/apache/logging/log4j/core/script/ScriptManager.java
@@ -16,10 +16,14 @@
*/
package org.apache.logging.log4j.core.script;
-import org.apache.logging.log4j.Logger;
-import org.apache.logging.log4j.core.util.FileWatcher;
-import org.apache.logging.log4j.core.util.WatchManager;
-import org.apache.logging.log4j.status.StatusLogger;
+import java.io.File;
+import java.io.Serializable;
+import java.nio.file.Path;
+import java.security.AccessController;
+import java.security.PrivilegedAction;
+import java.util.List;
+import java.util.concurrent.ConcurrentHashMap;
+import java.util.concurrent.ConcurrentMap;
import javax.script.Bindings;
import javax.script.Compilable;
@@ -28,22 +32,20 @@ import javax.script.ScriptEngine;
import javax.script.ScriptEngineFactory;
import javax.script.ScriptEngineManager;
import javax.script.ScriptException;
-import java.io.File;
-import java.nio.file.Path;
-import java.security.AccessController;
-import java.security.PrivilegedAction;
-import java.util.List;
-import java.util.concurrent.ConcurrentHashMap;
-import java.util.concurrent.ConcurrentMap;
+
+import org.apache.logging.log4j.Logger;
+import org.apache.logging.log4j.core.util.FileWatcher;
+import org.apache.logging.log4j.core.util.WatchManager;
+import org.apache.logging.log4j.status.StatusLogger;
/**
* Manages the scripts use by the Configuration.
*/
-public class ScriptManager implements FileWatcher {
-
+public class ScriptManager implements FileWatcher, Serializable {
+ private static final long serialVersionUID = -2534169384971965196L;
private static final String KEY_THREADING = "THREADING";
private static final Logger logger = StatusLogger.getLogger();
- private static final long serialVersionUID = -2534169384971965196L;
+
private final ScriptEngineManager manager = new ScriptEngineManager();
private final ConcurrentMap<String, ScriptRunner> scripts = new ConcurrentHashMap<>();
private final String languages;