bloritsch 2002/08/06 13:47:26
Modified:
fortress/examples/src/java/org/apache/excalibur/fortress/examples/extended
Main.java
fortress/examples/src/java/org/apache/excalibur/fortress/examples/servlet
servlet.java
fortress/examples/src/java/org/apache/excalibur/fortress/examples/swing
Main.java
fortress/examples/src/java/org/apache/excalibur/fortress/examples/viewer
Main.java
Log:
Update the examples to remove the ContextManager from the client.
Revision Changes Path
1.2 +3 -6
jakarta-avalon-excalibur/fortress/examples/src/java/org/apache/excalibur/fortress/examples/extended/Main.java
Index: Main.java
===================================================================
RCS file:
/home/cvs/jakarta-avalon-excalibur/fortress/examples/src/java/org/apache/excalibur/fortress/examples/extended/Main.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- Main.java 10 Jul 2002 10:01:08 -0000 1.1
+++ Main.java 6 Aug 2002 20:47:25 -0000 1.2
@@ -46,15 +46,12 @@
contextBuilder.setLoggerManagerConfiguration(
"resource://org/apache/excalibur/fortress/examples/extended/ExtendedContainer.xlog"
);
contextBuilder.setRoleManagerConfiguration(
"resource://org/apache/excalibur/fortress/examples/extended/ExtendedContainer.roles"
);
- ContextManager contextManager = new ContextManager(
contextBuilder.getContext(), null );
- contextManager.initialize();
-
- ContainerManager cm = new DefaultContainerManager( contextManager );
+ ContainerManager cm = new DefaultContainerManager(
contextBuilder.getContext() );
cm.initialize();
m_container = ( ExtendedContainer ) cm.getContainer();
- m_container.doLookups();
+ m_container.doLookups();
}
}
1.2 +2 -5
jakarta-avalon-excalibur/fortress/examples/src/java/org/apache/excalibur/fortress/examples/servlet/servlet.java
Index: servlet.java
===================================================================
RCS file:
/home/cvs/jakarta-avalon-excalibur/fortress/examples/src/java/org/apache/excalibur/fortress/examples/servlet/servlet.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- servlet.java 4 Jul 2002 10:24:00 -0000 1.1
+++ servlet.java 6 Aug 2002 20:47:25 -0000 1.2
@@ -57,10 +57,7 @@
contextBuilder.setLoggerManagerConfiguration(
"resource://org/apache/excalibur/fortress/examples/servlet/ServletContainer.xlog"
);
contextBuilder.setRoleManagerConfiguration(
"resource://org/apache/excalibur/fortress/examples/servlet/ServletContainer.roles"
);
- ContextManager contextManager = new ContextManager(
contextBuilder.getContext(), null );
- contextManager.initialize();
-
- m_containerManager = new DefaultContainerManager( contextManager
);
+ m_containerManager = new DefaultContainerManager(
contextBuilder.getContext() );
m_containerManager.initialize();
m_container = ( ServletContainer )
m_containerManager.getContainer();
1.3 +2 -5
jakarta-avalon-excalibur/fortress/examples/src/java/org/apache/excalibur/fortress/examples/swing/Main.java
Index: Main.java
===================================================================
RCS file:
/home/cvs/jakarta-avalon-excalibur/fortress/examples/src/java/org/apache/excalibur/fortress/examples/swing/Main.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- Main.java 5 Aug 2002 04:40:39 -0000 1.2
+++ Main.java 6 Aug 2002 20:47:25 -0000 1.3
@@ -49,10 +49,7 @@
contextBuilder.setRoleManagerConfiguration(
"resource://org/apache/excalibur/fortress/examples/swing/SwingContainer.roles"
);
contextBuilder.setInstrumentManagerConfiguration(
"resource://org/apache/excalibur/fortress/examples/swing/SwingContainer.instruments"
);
- ContextManager contextManager = new ContextManager(
contextBuilder.getContext(), null );
- contextManager.initialize();
-
- ContainerManager cm = new DefaultContainerManager( contextManager );
+ ContainerManager cm = new DefaultContainerManager(
contextBuilder.getContext() );
cm.initialize();
m_container = ( Container ) cm.getContainer();
1.2 +2 -5
jakarta-avalon-excalibur/fortress/examples/src/java/org/apache/excalibur/fortress/examples/viewer/Main.java
Index: Main.java
===================================================================
RCS file:
/home/cvs/jakarta-avalon-excalibur/fortress/examples/src/java/org/apache/excalibur/fortress/examples/viewer/Main.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- Main.java 22 Jul 2002 17:54:31 -0000 1.1
+++ Main.java 6 Aug 2002 20:47:26 -0000 1.2
@@ -50,10 +50,7 @@
contextBuilder.setLoggerManagerConfiguration(
"resource://org/apache/excalibur/fortress/examples/viewer/ComponentViewer.xlog"
);
contextBuilder.setRoleManagerConfiguration(
"resource://org/apache/excalibur/fortress/examples/viewer/ComponentViewer.roles"
);
- ContextManager contextManager = new ContextManager(
contextBuilder.getContext(), null );
- contextManager.initialize();
-
- ContainerManager cm = new DefaultContainerManager(
contextManager );
+ ContainerManager cm = new DefaultContainerManager(
contextBuilder.getContext() );
cm.initialize();
m_container = ( ComponentViewer ) cm.getContainer();
--
To unsubscribe, e-mail: <mailto:[EMAIL PROTECTED]>
For additional commands, e-mail: <mailto:[EMAIL PROTECTED]>
