krysalis-jplugin/src/java/org/krysalis/jplugin/engine Lifecycle.java,1.2,1.3 Boot.java,1.2,1.3 Engine.java,1.2,1.3
[email protected] Mon, 29 Sep 2003 08:47:07 -0700
Newsgroups
gmane.comp.krysalis.metamorphosis.cvs
Message-ID
<[email protected] >
Update of /cvsroot/metamorphosis/krysalis-jplugin/src/java/org/krysalis/jplugin/engine
In directory sc8-pr-cvs1:/tmp/cvs-serv1880/src/java/org/krysalis/jplugin/engine
Modified Files:
Lifecycle.java Boot.java Engine.java
Log Message:
Another round of Logging fixes and other small code tweaks.
Index: Lifecycle.java
===================================================================
RCS file: /cvsroot/metamorphosis/krysalis-jplugin/src/java/org/krysalis/jplugin/engine/Lifecycle.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** Lifecycle.java 29 Sep 2003 12:42:30 -0000 1.2
--- Lifecycle.java 29 Sep 2003 15:46:35 -0000 1.3
***************
*** 26,31 ****
public class Lifecycle {
- private final static org.apache.log4j.Category c = org.apache.log4j.Category.getInstance(org.krysalis.jplugin.engine.Lifecycle.class.toString());
-
private static Lifecycle avalonLifecycle;
--- 26,29 ----
Index: Boot.java
===================================================================
RCS file: /cvsroot/metamorphosis/krysalis-jplugin/src/java/org/krysalis/jplugin/engine/Boot.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** Boot.java 29 Sep 2003 12:42:30 -0000 1.2
--- Boot.java 29 Sep 2003 15:46:35 -0000 1.3
***************
*** 21,44 ****
try {
- //Setup logging
- try
- {
- org.apache.log4j.xml.DOMConfigurator.configure((new URL(args[1])));
- }
- catch(Exception e)
- {
- try
- {
- org.apache.log4j.xml.DOMConfigurator.configure((new File("./resources/log.conf.xml")).toURL());
- }
- catch(Exception e2)
- {
- org.apache.log4j.BasicConfigurator.configure();
- }
- }
-
//Setup engine
! try
! {
new Engine((new URL(args[0])).openStream());
}
--- 21,26 ----
try {
//Setup engine
! try {
new Engine((new URL(args[0])).openStream());
}
Index: Engine.java
===================================================================
RCS file: /cvsroot/metamorphosis/krysalis-jplugin/src/java/org/krysalis/jplugin/engine/Engine.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** Engine.java 29 Sep 2003 12:42:30 -0000 1.2
--- Engine.java 29 Sep 2003 15:46:35 -0000 1.3
***************
*** 15,19 ****
import org.apache.avalon.framework.configuration.DefaultConfigurationBuilder;
import org.apache.avalon.framework.context.DefaultContext;
- import org.krysalis.jplugin.framework.concerns.Logging;
/**
--- 15,18 ----
***************
*** 24,29 ****
public class Engine {
- private final static org.apache.log4j.Category c = org.apache.log4j.Category.getInstance(org.krysalis.jplugin.engine.Engine.class.toString());
-
private static Lifecycle avalonLifecycle;
private static DefaultContext context;
--- 23,26 ----
***************
*** 64,71 ****
Component newComponent = (Component) avalonLifecycle.newInstance(roleClass, factory, componentConf, context, componentManager);
! Logging.debug(c,"!!!!!!!!!!!!!!!!!!!!!!!"+typeString+"?"+roleString+"?"+newComponent);
if (typeString.equals("singleton")) {
! Logging.debug(c,"?!?!?!?!?!!?!?!?SINGLETON?"+nameString+"?"+newComponent);
componentManager.put(nameString, newComponent);
}
--- 61,68 ----
Component newComponent = (Component) avalonLifecycle.newInstance(roleClass, factory, componentConf, context, componentManager);
! //Logging.debug(c,"!!!!!!!!!!!!!!!!!!!!!!!"+typeString+"?"+roleString+"?"+newComponent);
if (typeString.equals("singleton")) {
! //Logging.debug(c,"?!?!?!?!?!!?!?!?SINGLETON?"+nameString+"?"+newComponent);
componentManager.put(nameString, newComponent);
}
-------------------------------------------------------
This sf.net email is sponsored by:ThinkGeek
Welcome to geek heaven.
http://thinkgeek.com/sf