You are viewing a plain text version of this content. The canonical link for it is here.
Posted to cvs@avalon.apache.org by bl...@apache.org on 2004/03/02 17:20:41 UTC
cvs commit: avalon/fortress/tools/src/java/org/apache/avalon/fortress/tools FortressBean.java
bloritsch 2004/03/02 08:20:41
Modified: fortress/tools/src/java/org/apache/avalon/fortress/tools
FortressBean.java
Log:
Fix the conflict
Revision Changes Path
1.6 +3 -1 avalon/fortress/tools/src/java/org/apache/avalon/fortress/tools/FortressBean.java
Index: FortressBean.java
===================================================================
RCS file: /home/cvs/avalon/fortress/tools/src/java/org/apache/avalon/fortress/tools/FortressBean.java,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- FortressBean.java 28 Feb 2004 15:16:27 -0000 1.5
+++ FortressBean.java 2 Mar 2004 16:20:41 -0000 1.6
@@ -81,6 +81,8 @@
// Get the root container initialized
this.cm = new DefaultContainerManager(config.getContext());
ContainerUtil.initialize(cm);
+ // set the static logger for commons logging
+ System.setProperty("org.apache.commons.logging.Log", "org.apache.commons.logging.impl.AvalonLogger");
this.container = (DefaultContainer) cm.getContainer();
this.sm = container.getServiceManager();
---------------------------------------------------------------------
To unsubscribe, e-mail: cvs-unsubscribe@avalon.apache.org
For additional commands, e-mail: cvs-help@avalon.apache.org