You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@tinkerpop.apache.org by sp...@apache.org on 2015/02/13 19:57:05 UTC
[3/3] incubator-tinkerpop git commit: Rename Gremlin Console log4j
file.
Rename Gremlin Console log4j file.
Project: http://git-wip-us.apache.org/repos/asf/incubator-tinkerpop/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-tinkerpop/commit/c530d6fa
Tree: http://git-wip-us.apache.org/repos/asf/incubator-tinkerpop/tree/c530d6fa
Diff: http://git-wip-us.apache.org/repos/asf/incubator-tinkerpop/diff/c530d6fa
Branch: refs/heads/master
Commit: c530d6fa38e4e826648d181fec9e06f3aa9b3a0b
Parents: c4e8d08
Author: Stephen Mallette <sp...@apache.org>
Authored: Fri Feb 13 13:56:46 2015 -0500
Committer: Stephen Mallette <sp...@apache.org>
Committed: Fri Feb 13 13:56:46 2015 -0500
----------------------------------------------------------------------
gremlin-console/conf/log4j-console.properties | 24 ++++++++++++++++++++++
gremlin-console/conf/log4j-repl.properties | 24 ----------------------
gremlin-console/src/main/bin/gremlin.sh | 2 +-
3 files changed, 25 insertions(+), 25 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-tinkerpop/blob/c530d6fa/gremlin-console/conf/log4j-console.properties
----------------------------------------------------------------------
diff --git a/gremlin-console/conf/log4j-console.properties b/gremlin-console/conf/log4j-console.properties
new file mode 100644
index 0000000..3e86e5d
--- /dev/null
+++ b/gremlin-console/conf/log4j-console.properties
@@ -0,0 +1,24 @@
+# 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.
+
+log4j.appender.A2=org.apache.log4j.ConsoleAppender
+log4j.appender.A2.Threshold=TRACE
+log4j.appender.A2.layout=org.apache.log4j.PatternLayout
+log4j.appender.A2.layout.ConversionPattern=%-5p %c %x - %m%n
+
+log4j.rootLogger=${gremlin.log4j.level}, A2
+log4j.logger.io.netty.channel.DefaultChannelPipeline=OFF
http://git-wip-us.apache.org/repos/asf/incubator-tinkerpop/blob/c530d6fa/gremlin-console/conf/log4j-repl.properties
----------------------------------------------------------------------
diff --git a/gremlin-console/conf/log4j-repl.properties b/gremlin-console/conf/log4j-repl.properties
deleted file mode 100644
index 3e86e5d..0000000
--- a/gremlin-console/conf/log4j-repl.properties
+++ /dev/null
@@ -1,24 +0,0 @@
-# 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.
-
-log4j.appender.A2=org.apache.log4j.ConsoleAppender
-log4j.appender.A2.Threshold=TRACE
-log4j.appender.A2.layout=org.apache.log4j.PatternLayout
-log4j.appender.A2.layout.ConversionPattern=%-5p %c %x - %m%n
-
-log4j.rootLogger=${gremlin.log4j.level}, A2
-log4j.logger.io.netty.channel.DefaultChannelPipeline=OFF
http://git-wip-us.apache.org/repos/asf/incubator-tinkerpop/blob/c530d6fa/gremlin-console/src/main/bin/gremlin.sh
----------------------------------------------------------------------
diff --git a/gremlin-console/src/main/bin/gremlin.sh b/gremlin-console/src/main/bin/gremlin.sh
index e3fb9f2..a7ff60f 100755
--- a/gremlin-console/src/main/bin/gremlin.sh
+++ b/gremlin-console/src/main/bin/gremlin.sh
@@ -88,7 +88,7 @@ done
shift $(( $OPTIND - 1 ))
if [ -z "${JAVA_OPTIONS:-}" ]; then
- JAVA_OPTIONS="-Dtinkerpop.ext=$DIR/../ext -Dlog4j.configuration=conf/log4j-repl.properties -Dgremlin.log4j.level=$GREMLIN_LOG_LEVEL"
+ JAVA_OPTIONS="-Dtinkerpop.ext=$DIR/../ext -Dlog4j.configuration=conf/log4j-console.properties -Dgremlin.log4j.level=$GREMLIN_LOG_LEVEL"
fi
if [ -n "$SCRIPT_DEBUG" ]; then