You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@joshua.apache.org by mj...@apache.org on 2016/06/01 02:52:00 UTC
[65/94] [abbrv] incubator-joshua git commit: point to internal
properties file
point to internal properties file
Project: http://git-wip-us.apache.org/repos/asf/incubator-joshua/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-joshua/commit/1aba8ae3
Tree: http://git-wip-us.apache.org/repos/asf/incubator-joshua/tree/1aba8ae3
Diff: http://git-wip-us.apache.org/repos/asf/incubator-joshua/diff/1aba8ae3
Branch: refs/heads/master
Commit: 1aba8ae393d20a7e904be426083b0c52857af275
Parents: 30b328b
Author: Matt Post <po...@cs.jhu.edu>
Authored: Thu May 26 18:31:52 2016 -0400
Committer: Matt Post <po...@cs.jhu.edu>
Committed: Thu May 26 18:31:52 2016 -0400
----------------------------------------------------------------------
bin/joshua-decoder | 2 +-
logging.properties | 34 --------------------------------
src/main/resources/log4j.properties | 2 +-
3 files changed, 2 insertions(+), 36 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-joshua/blob/1aba8ae3/bin/joshua-decoder
----------------------------------------------------------------------
diff --git a/bin/joshua-decoder b/bin/joshua-decoder
index a3ebd3f..70b2bfb 100755
--- a/bin/joshua-decoder
+++ b/bin/joshua-decoder
@@ -44,7 +44,7 @@ JOSHUA=$(dirname $0)/..
exec java -Xmx${mem} \
-Dfile.encoding=utf8 \
- -Dlog4j.configuration=$JOSHUA/logging.properties \
+ -Dlog4j.configuration=$JOSHUA/src/main/resources/log4j.properties \
-Djava.library.path=$JOSHUA/lib \
-cp $JOSHUA/target/joshua-*-jar-with-dependencies.jar \
org.apache.joshua.decoder.JoshuaDecoder "$@"
http://git-wip-us.apache.org/repos/asf/incubator-joshua/blob/1aba8ae3/logging.properties
----------------------------------------------------------------------
diff --git a/logging.properties b/logging.properties
deleted file mode 100644
index 713851b..0000000
--- a/logging.properties
+++ /dev/null
@@ -1,34 +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.
-
-# Turn off logging
-log4j.rootLogger=OFF
-
-## Other options (http://logging.apache.org/log4j/1.2/faq.html#sysprops)
-
-## If true, log4j will output internal debugging messages to the console.
-# log4j.debug
-
-## If true, log4j will not perform default initialization, that is check for log4j.properties or log4j.xml, at the first logging request.
-# log4j.defaultInitOverride
-
-## URL for default initialization configuration file.
-# log4j.configuration
-
-## Class name for configurator to process default initialization configuration file.
-# log4j.configurationClass
-
-## If true, the thread class loader will be ignored when loading classes.
-# log4j.ignoreTCL
http://git-wip-us.apache.org/repos/asf/incubator-joshua/blob/1aba8ae3/src/main/resources/log4j.properties
----------------------------------------------------------------------
diff --git a/src/main/resources/log4j.properties b/src/main/resources/log4j.properties
index 67b4d3e..13e19bf 100644
--- a/src/main/resources/log4j.properties
+++ b/src/main/resources/log4j.properties
@@ -1,5 +1,5 @@
# log4j settings
-log4j.rootLogger=DEBUG, stdout
+log4j.rootLogger=OFF, stdout
log4j.appender.stdout=org.apache.log4j.ConsoleAppender
log4j.appender.stdout.Target=System.out
log4j.appender.stdout.layout=org.apache.log4j.SimpleLayout