You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@servicemix.apache.org by ch...@apache.org on 2007/12/13 15:54:13 UTC
svn commit: r603929 - in /servicemix/smx4/runtime/trunk: ./
assembly/src/main/distribution/text/etc/
filemonitor/src/main/java/org/apache/servicemix/runtime/filemonitor/
gshell/gshell-core/src/main/resources/org/apache/geronimo/gshell/spring/etc/
gshel...
Author: chirino
Date: Thu Dec 13 06:54:11 2007
New Revision: 603929
URL: http://svn.apache.org/viewvc?rev=603929&view=rev
Log:
Reduced intial amount of logging
Modified:
servicemix/smx4/runtime/trunk/assembly/src/main/distribution/text/etc/system.properties
servicemix/smx4/runtime/trunk/filemonitor/src/main/java/org/apache/servicemix/runtime/filemonitor/FileMonitor.java
servicemix/smx4/runtime/trunk/gshell/gshell-core/src/main/resources/org/apache/geronimo/gshell/spring/etc/system.properties
servicemix/smx4/runtime/trunk/gshell/gshell-wrapper/src/main/resources/org/apache/servicemix/runtime/gshell/wrapper/all/servicemix-wrapper.conf
servicemix/smx4/runtime/trunk/pom.xml
Modified: servicemix/smx4/runtime/trunk/assembly/src/main/distribution/text/etc/system.properties
URL: http://svn.apache.org/viewvc/servicemix/smx4/runtime/trunk/assembly/src/main/distribution/text/etc/system.properties?rev=603929&r1=603928&r2=603929&view=diff
==============================================================================
--- servicemix/smx4/runtime/trunk/assembly/src/main/distribution/text/etc/system.properties (original)
+++ servicemix/smx4/runtime/trunk/assembly/src/main/distribution/text/etc/system.properties Thu Dec 13 06:54:11 2007
@@ -18,4 +18,4 @@
################################################################################
java.security.auth.login.config=${servicemix.base}/etc/login.conf
-
+org.ops4j.pax.logging.DefaultServiceLog.level=ERROR
Modified: servicemix/smx4/runtime/trunk/filemonitor/src/main/java/org/apache/servicemix/runtime/filemonitor/FileMonitor.java
URL: http://svn.apache.org/viewvc/servicemix/smx4/runtime/trunk/filemonitor/src/main/java/org/apache/servicemix/runtime/filemonitor/FileMonitor.java?rev=603929&r1=603928&r2=603929&view=diff
==============================================================================
--- servicemix/smx4/runtime/trunk/filemonitor/src/main/java/org/apache/servicemix/runtime/filemonitor/FileMonitor.java (original)
+++ servicemix/smx4/runtime/trunk/filemonitor/src/main/java/org/apache/servicemix/runtime/filemonitor/FileMonitor.java Thu Dec 13 06:54:11 2007
@@ -48,6 +48,15 @@
* @version $Revision: 1.1 $
*/
public class FileMonitor {
+ // Define a few logging levels.
+ public static final int TRACE = 0;
+ public static final int DEBUG = 1;
+ public static final int INFO = 2;
+ public static final int WARN = 3;
+ public static final int ERROR = 4;
+ public static final int FATAL = 5;
+ public static final int NONE = 6;
+
public final static String CONFIG_DIR = "org.apache.servicemix.filemonitor.configDir";
public final static String DEPLOY_DIR = "org.apache.servicemix.filemonitor.monitorDir";
public final static String GENERATED_JAR_DIR = "org.apache.servicemix.filemonitor.generatedJarDir";
@@ -61,10 +70,11 @@
private Project project = new Project();
private long scanInterval = 500L;
private boolean loggedConfigAdminWarning;
- private boolean debug;
private List<Bundle> changedBundles = new ArrayList<Bundle>();
private List<Bundle> bundlesToStart = new ArrayList<Bundle>();
private List<Bundle> bundlesToUpdate = new ArrayList<Bundle>();
+
+ private int logLevel = NONE;
public FileMonitor() {
}
@@ -179,14 +189,6 @@
this.scanInterval = scanInterval;
}
- public boolean isDebug() {
- return debug;
- }
-
- public void setDebug(boolean debug) {
- this.debug = debug;
- }
-
// Implementation methods
//-------------------------------------------------------------------------
@@ -513,21 +515,27 @@
}
protected void debug(String message) {
- if (debug) {
+ if (logLevel <= DEBUG) {
System.out.println("DEBUG: " + message);
}
}
protected void log(String message) {
- System.out.println("INFO: " + message);
+ if (logLevel <= INFO) {
+ System.out.println("INFO: " + message);
+ }
}
protected void warn(String message) {
- System.out.println("WARN: " + message);
+ if (logLevel <= WARN) {
+ System.out.println("WARN: " + message);
+ }
}
protected void warn(String message, Throwable e) {
- warn(message);
- e.printStackTrace();
+ if (logLevel <= WARN) {
+ System.out.println("WARN: " + message);
+ e.printStackTrace();
+ }
}
}
Modified: servicemix/smx4/runtime/trunk/gshell/gshell-core/src/main/resources/org/apache/geronimo/gshell/spring/etc/system.properties
URL: http://svn.apache.org/viewvc/servicemix/smx4/runtime/trunk/gshell/gshell-core/src/main/resources/org/apache/geronimo/gshell/spring/etc/system.properties?rev=603929&r1=603928&r2=603929&view=diff
==============================================================================
--- servicemix/smx4/runtime/trunk/gshell/gshell-core/src/main/resources/org/apache/geronimo/gshell/spring/etc/system.properties (original)
+++ servicemix/smx4/runtime/trunk/gshell/gshell-core/src/main/resources/org/apache/geronimo/gshell/spring/etc/system.properties Thu Dec 13 06:54:11 2007
@@ -18,4 +18,4 @@
################################################################################
java.security.auth.login.config=${servicemix.base}/etc/login.conf
-
+org.ops4j.pax.logging.DefaultServiceLog.level=ERROR
\ No newline at end of file
Modified: servicemix/smx4/runtime/trunk/gshell/gshell-wrapper/src/main/resources/org/apache/servicemix/runtime/gshell/wrapper/all/servicemix-wrapper.conf
URL: http://svn.apache.org/viewvc/servicemix/smx4/runtime/trunk/gshell/gshell-wrapper/src/main/resources/org/apache/servicemix/runtime/gshell/wrapper/all/servicemix-wrapper.conf?rev=603929&r1=603928&r2=603929&view=diff
==============================================================================
--- servicemix/smx4/runtime/trunk/gshell/gshell-wrapper/src/main/resources/org/apache/servicemix/runtime/gshell/wrapper/all/servicemix-wrapper.conf (original)
+++ servicemix/smx4/runtime/trunk/gshell/gshell-wrapper/src/main/resources/org/apache/servicemix/runtime/gshell/wrapper/all/servicemix-wrapper.conf Thu Dec 13 06:54:11 2007
@@ -18,30 +18,21 @@
#********************************************************************
# Wrapper Properties
#********************************************************************
-
-#wrapper.debug=TRUE
set.default.SERVICEMIX_HOME=${servicemix.home}
set.default.SERVICEMIX_BASE=${servicemix.base}
-wrapper.working.dir=
# Java Application
+wrapper.working.dir=%SERVICEMIX_BASE%
wrapper.java.command=java
-
-# Java Main class. This class must implement the WrapperListener interface
-# or guarantee that the WrapperManager class is initialized. Helper
-# classes are provided to do this for you. See the Integration section
-# of the documentation for details.
wrapper.java.mainclass=org.tanukisoftware.wrapper.WrapperSimpleApp
-
-# Java Classpath (include wrapper.jar) Add class path elements as
-# needed starting from 1
wrapper.java.classpath.1=%SERVICEMIX_BASE%/lib/servicemix-wrapper.jar
wrapper.java.classpath.2=%SERVICEMIX_HOME%/lib/servicemix.jar
-
-# Java Library Path (location of Wrapper.DLL or libwrapper.so)
wrapper.java.library.path.1=%SERVICEMIX_BASE%/lib/
-# Java Additional Parameters
+# Application Parameters. Add parameters as needed starting from 1
+wrapper.app.parameter.1=org.apache.servicemix.runtime.main.Main
+
+# JVM Parameters
# note that n is the parameter number starting from 1.
wrapper.java.additional.1=-Dservicemix.home=%SERVICEMIX_HOME%
wrapper.java.additional.2=-Dservicemix.base=%SERVICEMIX_BASE%
@@ -67,8 +58,6 @@
# Maximum Java Heap Size (in MB)
wrapper.java.maxmemory=512
-# Application parameters. Add parameters as needed starting from 1
-wrapper.app.parameter.1=org.apache.servicemix.runtime.main.Main
#********************************************************************
# Wrapper Logging Properties
@@ -92,11 +81,11 @@
# the log is rolled. Size is specified in bytes. The default value
# of 0, disables log rolling. May abbreviate with the 'k' (kb) or
# 'm' (mb) suffix. For example: 10m = 10 megabytes.
-wrapper.logfile.maxsize=0
+wrapper.logfile.maxsize=10m
# Maximum number of rolled log files which will be allowed before old
# files are deleted. The default value of 0 implies no limit.
-wrapper.logfile.maxfiles=0
+wrapper.logfile.maxfiles=5
# Log Level for sys/event log output. (See docs for log levels)
wrapper.syslog.loglevel=NONE
Modified: servicemix/smx4/runtime/trunk/pom.xml
URL: http://svn.apache.org/viewvc/servicemix/smx4/runtime/trunk/pom.xml?rev=603929&r1=603928&r2=603929&view=diff
==============================================================================
--- servicemix/smx4/runtime/trunk/pom.xml (original)
+++ servicemix/smx4/runtime/trunk/pom.xml Thu Dec 13 06:54:11 2007
@@ -77,7 +77,7 @@
<jline.version>0.9.93</jline.version>
<log4j.version>1.2.14</log4j.version>
<mina.version>1.1.6-r602102</mina.version>
- <pax.logging.version>0.9.8</pax.logging.version>
+ <pax.logging.version>0.9.9-SNAPSHOT</pax.logging.version>
<spring.osgi.version>1.0-m3</spring.osgi.version>
<spring.version>2.5</spring.version>
<xstream.version>1.2.2</xstream.version>