bloritsch 2002/07/30 07:15:42
Modified: fortress/src/java/org/apache/excalibur/fortress/handler
AbstractComponentHandler.java ComponentFactory.java
fortress/src/java/org/apache/excalibur/fortress/util
ContextBuilder.java ContextManager.java
Log:
update fortress and make it compile
Revision Changes Path
1.10 +3 -3
jakarta-avalon-excalibur/fortress/src/java/org/apache/excalibur/fortress/handler/AbstractComponentHandler.java
Index: AbstractComponentHandler.java
===================================================================
RCS file:
/home/cvs/jakarta-avalon-excalibur/fortress/src/java/org/apache/excalibur/fortress/handler/AbstractComponentHandler.java,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- AbstractComponentHandler.java 26 Jul 2002 06:40:54 -0000 1.9
+++ AbstractComponentHandler.java 30 Jul 2002 14:15:42 -0000 1.10
@@ -7,8 +7,8 @@
*/
package org.apache.excalibur.fortress.handler;
-import org.apache.avalon.excalibur.instrument.Instrument;
-import org.apache.avalon.excalibur.instrument.Instrumentable;
+import org.apache.excalibur.instrument.Instrument;
+import org.apache.excalibur.instrument.Instrumentable;
import org.apache.avalon.excalibur.logger.LoggerManager;
import org.apache.avalon.framework.activity.Disposable;
import org.apache.avalon.framework.configuration.Configuration;
1.19 +4 -4
jakarta-avalon-excalibur/fortress/src/java/org/apache/excalibur/fortress/handler/ComponentFactory.java
Index: ComponentFactory.java
===================================================================
RCS file:
/home/cvs/jakarta-avalon-excalibur/fortress/src/java/org/apache/excalibur/fortress/handler/ComponentFactory.java,v
retrieving revision 1.18
retrieving revision 1.19
diff -u -r1.18 -r1.19
--- ComponentFactory.java 15 Jul 2002 17:35:22 -0000 1.18
+++ ComponentFactory.java 30 Jul 2002 14:15:42 -0000 1.19
@@ -7,9 +7,9 @@
*/
package org.apache.excalibur.fortress.handler;
-import org.apache.avalon.excalibur.instrument.CounterInstrument;
-import org.apache.avalon.excalibur.instrument.Instrument;
-import org.apache.avalon.excalibur.instrument.Instrumentable;
+import org.apache.excalibur.instrument.CounterInstrument;
+import org.apache.excalibur.instrument.Instrument;
+import org.apache.excalibur.instrument.Instrumentable;
import org.apache.avalon.excalibur.logger.LoggerManager;
import org.apache.avalon.framework.configuration.Configuration;
import org.apache.avalon.framework.container.ContainerUtil;
1.16 +1 -1
jakarta-avalon-excalibur/fortress/src/java/org/apache/excalibur/fortress/util/ContextBuilder.java
Index: ContextBuilder.java
===================================================================
RCS file:
/home/cvs/jakarta-avalon-excalibur/fortress/src/java/org/apache/excalibur/fortress/util/ContextBuilder.java,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -r1.15 -r1.16
--- ContextBuilder.java 30 Jul 2002 13:41:22 -0000 1.15
+++ ContextBuilder.java 30 Jul 2002 14:15:42 -0000 1.16
@@ -1,7 +1,7 @@
package org.apache.excalibur.fortress.util;
import java.io.File;
-import org.apache.avalon.excalibur.instrument.InstrumentManager;
+import org.apache.excalibur.instrument.InstrumentManager;
import org.apache.avalon.excalibur.logger.LoggerManager;
import org.apache.avalon.framework.component.ComponentManager;
import org.apache.avalon.framework.configuration.Configuration;
1.26 +4 -4
jakarta-avalon-excalibur/fortress/src/java/org/apache/excalibur/fortress/util/ContextManager.java
Index: ContextManager.java
===================================================================
RCS file:
/home/cvs/jakarta-avalon-excalibur/fortress/src/java/org/apache/excalibur/fortress/util/ContextManager.java,v
retrieving revision 1.25
retrieving revision 1.26
diff -u -r1.25 -r1.26
--- ContextManager.java 19 Jul 2002 15:50:21 -0000 1.25
+++ ContextManager.java 30 Jul 2002 14:15:42 -0000 1.26
@@ -9,7 +9,7 @@
import java.util.ArrayList;
import java.util.Iterator;
-import org.apache.avalon.excalibur.instrument.manager.DefaultInstrumentManager;
+import org.apache.excalibur.instrument.manager.DefaultInstrumentManager;
import org.apache.avalon.excalibur.logger.LogKitLoggerManager;
import org.apache.avalon.excalibur.logger.LoggerManager;
import org.apache.avalon.framework.activity.Disposable;
@@ -346,7 +346,7 @@
containerManagerContext.put( SERVICE_MANAGER, sm );
}
}
-
+
protected void initializeCommandQueue() throws Exception
{
try
@@ -372,7 +372,7 @@
}
/**
- * Helper method for creating a default Command Queue
+ * Helper method for creating a default Command Queue
*
* @return a default command <code>Queue</code>
* @exception Exception if an error occurs
--
To unsubscribe, e-mail: <mailto:[EMAIL PROTECTED]>
For additional commands, e-mail: <mailto:[EMAIL PROTECTED]>
