You are viewing a plain text version of this content. The canonical link for it is here.
Posted to cvs@cocoon.apache.org by cz...@apache.org on 2005/05/30 12:52:01 UTC
svn commit: r179044 -
/cocoon/trunk/src/java/org/apache/cocoon/components/ComponentInfo.java
/cocoon/trunk/src/java/org/apache/cocoon/core/container/AbstractServiceManager.java
/cocoon/trunk/src/java/org/apache/cocoon/core/container/CoreServiceManager.java
Author: cziegeler
Date: Mon May 30 03:51:58 2005
New Revision: 179044
URL: http://svn.apache.org/viewcvs?rev=179044&view=rev
Log:
Fix log category bug
Modified:
cocoon/trunk/src/java/org/apache/cocoon/components/ComponentInfo.java
cocoon/trunk/src/java/org/apache/cocoon/core/container/AbstractServiceManager.java
cocoon/trunk/src/java/org/apache/cocoon/core/container/CoreServiceManager.java
Modified: cocoon/trunk/src/java/org/apache/cocoon/components/ComponentInfo.java
URL: http://svn.apache.org/viewcvs/cocoon/trunk/src/java/org/apache/cocoon/components/ComponentInfo.java?rev=179044&r1=179043&r2=179044&view=diff
==============================================================================
--- cocoon/trunk/src/java/org/apache/cocoon/components/ComponentInfo.java (original)
+++ cocoon/trunk/src/java/org/apache/cocoon/components/ComponentInfo.java Mon May 30 03:51:58 2005
@@ -54,6 +54,7 @@
public ComponentInfo() {
this.model = MODEL_PRIMITIVE;
+ this.loggingSystem = LOGGING_SYSTEM_LOGKIT;
}
/**
@@ -188,9 +189,9 @@
if ( LOGGING_LOG4J.equals(logSystem) ) {
this.setLoggingSystem(LOGGING_SYSTEM_LOG4J);
} else if (LOGGING_COMMONSLOGGING.equals(logSystem)) {
- this.setLoggingSystem(LOGGING_SYSTEM_LOGKIT);
- } else if ( LOGGING_LOGKIT.equals(logSystem) ) {
this.setLoggingSystem(LOGGING_SYSTEM_COMMONSLOGGING);
+ } else if ( LOGGING_LOGKIT.equals(logSystem) ) {
+ this.setLoggingSystem(LOGGING_SYSTEM_LOGKIT);
}
}
Modified: cocoon/trunk/src/java/org/apache/cocoon/core/container/AbstractServiceManager.java
URL: http://svn.apache.org/viewcvs/cocoon/trunk/src/java/org/apache/cocoon/core/container/AbstractServiceManager.java?rev=179044&r1=179043&r2=179044&view=diff
==============================================================================
--- cocoon/trunk/src/java/org/apache/cocoon/core/container/AbstractServiceManager.java (original)
+++ cocoon/trunk/src/java/org/apache/cocoon/core/container/AbstractServiceManager.java Mon May 30 03:51:58 2005
@@ -113,6 +113,7 @@
info = baseInfo.duplicate();
} else {
info = new ComponentInfo();
+ info.fill(configuration);
}
info.setConfiguration(configuration);
info.setServiceClassName(componentClass.getName());
Modified: cocoon/trunk/src/java/org/apache/cocoon/core/container/CoreServiceManager.java
URL: http://svn.apache.org/viewcvs/cocoon/trunk/src/java/org/apache/cocoon/core/container/CoreServiceManager.java?rev=179044&r1=179043&r2=179044&view=diff
==============================================================================
--- cocoon/trunk/src/java/org/apache/cocoon/core/container/CoreServiceManager.java (original)
+++ cocoon/trunk/src/java/org/apache/cocoon/core/container/CoreServiceManager.java Mon May 30 03:51:58 2005
@@ -613,6 +613,7 @@
info = baseInfo.duplicate();
} else {
info = new ComponentInfo();
+ info.fill(configuration);
}
info.setConfiguration(configuration);
info.setServiceClassName(className);