You are viewing a plain text version of this content. The canonical link for it is here.
Posted to scm@geronimo.apache.org by ke...@apache.org on 2011/08/02 21:20:12 UTC
svn commit: r1153245 - in /geronimo/server/trunk/framework: ./
configs/karaf-framework/src/main/distribution/instance/var/log/
modules/geronimo-system/src/main/java/org/apache/geronimo/system/main/
Author: kevan
Date: Tue Aug 2 19:20:11 2011
New Revision: 1153245
URL: http://svn.apache.org/viewvc?rev=1153245&view=rev
Log:
GERONIMO-6055 use the new equinox 3.7.1 build
Modified:
geronimo/server/trunk/framework/configs/karaf-framework/src/main/distribution/instance/var/log/client-log4j.properties
geronimo/server/trunk/framework/modules/geronimo-system/src/main/java/org/apache/geronimo/system/main/SimpleProgressBarStartupMonitor.java
geronimo/server/trunk/framework/pom.xml
Modified: geronimo/server/trunk/framework/configs/karaf-framework/src/main/distribution/instance/var/log/client-log4j.properties
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/framework/configs/karaf-framework/src/main/distribution/instance/var/log/client-log4j.properties?rev=1153245&r1=1153244&r2=1153245&view=diff
==============================================================================
--- geronimo/server/trunk/framework/configs/karaf-framework/src/main/distribution/instance/var/log/client-log4j.properties (original)
+++ geronimo/server/trunk/framework/configs/karaf-framework/src/main/distribution/instance/var/log/client-log4j.properties Tue Aug 2 19:20:11 2011
@@ -17,7 +17,7 @@
## $Rev$ $Date$
##
-log4j.rootLogger=INFO, CONSOLE, FILE
+log4j.rootLogger=TRACE, CONSOLE, FILE
log4j.appender.CONSOLE=org.apache.log4j.ConsoleAppender
log4j.appender.CONSOLE.Threshold=${org.apache.geronimo.log.ConsoleLogLevel}
@@ -37,7 +37,7 @@ log4j.appender.FILE.layout.ConversionPat
log4j.appender.FILE.append=true
log4j.appender.FILE.file=${org.apache.geronimo.server.dir}/var/log/client.log
log4j.appender.FILE.bufferedIO=false
-log4j.appender.FILE.maxBackupIndex=3
+log4j.appender.FILE.maxBackupIndex=10
log4j.appender.FILE.maxFileSize=10MB
#
Modified: geronimo/server/trunk/framework/modules/geronimo-system/src/main/java/org/apache/geronimo/system/main/SimpleProgressBarStartupMonitor.java
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/framework/modules/geronimo-system/src/main/java/org/apache/geronimo/system/main/SimpleProgressBarStartupMonitor.java?rev=1153245&r1=1153244&r2=1153245&view=diff
==============================================================================
--- geronimo/server/trunk/framework/modules/geronimo-system/src/main/java/org/apache/geronimo/system/main/SimpleProgressBarStartupMonitor.java (original)
+++ geronimo/server/trunk/framework/modules/geronimo-system/src/main/java/org/apache/geronimo/system/main/SimpleProgressBarStartupMonitor.java Tue Aug 2 19:20:11 2011
@@ -112,7 +112,7 @@ public class SimpleProgressBarStartupMon
}
public synchronized void moduleLoading(Artifact module) {
- currentOperation = " Loading " + module;
+ currentOperation = " Loading " + module.getArtifactId();
for (int i = 0; i < modules.length; i++) {
if (modules[i].equals(module)) {
moduleStatus[i] = STATUS_LOADING;
@@ -134,7 +134,7 @@ public class SimpleProgressBarStartupMon
}
public synchronized void moduleStarting(Artifact module) {
- currentOperation = "Starting " + module;
+ //currentOperation = " Starting " + module.getArtifactId();
}
public synchronized void moduleStarted(Artifact module) {
Modified: geronimo/server/trunk/framework/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/framework/pom.xml?rev=1153245&r1=1153244&r2=1153245&view=diff
==============================================================================
--- geronimo/server/trunk/framework/pom.xml (original)
+++ geronimo/server/trunk/framework/pom.xml Tue Aug 2 19:20:11 2011
@@ -34,7 +34,7 @@
<packaging>pom</packaging>
<properties>
- <equinox.version>3.7.0.v20110613</equinox.version>
+ <equinox.version>3.7.1.R37x_v20110726_1449</equinox.version>
<felix.configadmin.version>1.2.4</felix.configadmin.version>
<felix.framework.version>3.0.2</felix.framework.version>
<pax.url.version>1.1.2</pax.url.version>