donaldp 2002/11/08 23:29:37
Modified:
fortress/examples/src/java/org/apache/excalibur/fortress/examples/extended
Main.java
fortress/examples/src/java/org/apache/excalibur/fortress/examples/swing
Main.java
fortress/examples/src/java/org/apache/excalibur/fortress/examples/viewer
ComponentViewer.java Main.java
Log:
Get examples compiling again.
Revision Changes Path
1.10 +5 -3
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.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- Main.java 2 Oct 2002 01:52:20 -0000 1.9
+++ Main.java 9 Nov 2002 07:29:37 -0000 1.10
@@ -52,6 +52,7 @@
import org.apache.excalibur.fortress.ContainerManager;
import org.apache.excalibur.fortress.DefaultContainerManager;
import org.apache.excalibur.fortress.util.ContextBuilder;
+import org.apache.avalon.framework.container.ContainerUtil;
/**
* Fortress container example with custom extensions
@@ -79,8 +80,9 @@
.setLoggerManagerConfiguration(
"resource://org/apache/excalibur/fortress/examples/extended/ExtendedContainer.xlog" )
.setRoleManagerConfiguration(
"resource://org/apache/excalibur/fortress/examples/extended/ExtendedContainer.roles" );
- ContainerManager cm = new DefaultContainerManager(
contextBuilder.getContext() );
- cm.initialize();
+ final ContainerManager cm =
+ new DefaultContainerManager( contextBuilder.getContext() );
+ ContainerUtil.initialize( cm );
m_container = (ExtendedContainer)cm.getContainer();
1.14 +3 -7
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.13
retrieving revision 1.14
diff -u -r1.13 -r1.14
--- Main.java 2 Oct 2002 01:46:59 -0000 1.13
+++ Main.java 9 Nov 2002 07:29:37 -0000 1.14
@@ -53,6 +53,7 @@
import org.apache.excalibur.fortress.ContainerManager;
import org.apache.excalibur.fortress.DefaultContainerManager;
import org.apache.excalibur.fortress.util.ContextBuilder;
+import org.apache.avalon.framework.container.ContainerUtil;
/**
* Fortress container example.
@@ -62,9 +63,6 @@
*/
public final class Main
{
- // container reference
- private static Container m_container;
-
/**
* Start the show. Creates a <code>SwingContainer</code>.
*
@@ -84,9 +82,7 @@
.setInstrumentManagerConfiguration(
"resource://org/apache/excalibur/fortress/examples/swing/SwingContainer.instruments" );
ContainerManager cm = new DefaultContainerManager(
contextBuilder.getContext() );
- cm.initialize();
-
- m_container = (Container)cm.getContainer();
+ ContainerUtil.initialize( cm );
}
}
1.5 +2 -2
jakarta-avalon-excalibur/fortress/examples/src/java/org/apache/excalibur/fortress/examples/viewer/ComponentViewer.java
Index: ComponentViewer.java
===================================================================
RCS file:
/home/cvs/jakarta-avalon-excalibur/fortress/examples/src/java/org/apache/excalibur/fortress/examples/viewer/ComponentViewer.java,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- ComponentViewer.java 2 Oct 2002 01:52:20 -0000 1.4
+++ ComponentViewer.java 9 Nov 2002 07:29:37 -0000 1.5
@@ -102,7 +102,7 @@
for( Iterator i = keys.iterator(); i.hasNext(); )
{
- roles[ j++ ] = (String)i.next();
+ roles[ j++ ] = i.next();
}
return roles;
1.10 +4 -6
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.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- Main.java 2 Oct 2002 01:52:20 -0000 1.9
+++ Main.java 9 Nov 2002 07:29:37 -0000 1.10
@@ -50,6 +50,7 @@
package org.apache.excalibur.fortress.examples.viewer;
import org.apache.avalon.framework.CascadingException;
+import org.apache.avalon.framework.container.ContainerUtil;
import org.apache.excalibur.fortress.ContainerManager;
import org.apache.excalibur.fortress.DefaultContainerManager;
import org.apache.excalibur.fortress.util.ContextBuilder;
@@ -63,9 +64,6 @@
*/
public final class Main
{
- // container reference
- private static ComponentViewer m_container;
-
/**
* @param args a <code>String[]</code> array of command line arguments
* @exception Exception if an error occurs
@@ -84,9 +82,9 @@
.setRoleManagerConfiguration(
"resource://org/apache/excalibur/fortress/examples/viewer/ComponentViewer.roles" );
ContainerManager cm = new DefaultContainerManager(
contextBuilder.getContext() );
- cm.initialize();
+ ContainerUtil.initialize( cm );
- m_container = (ComponentViewer)cm.getContainer();
+ //(ComponentViewer)cm.getContainer();
}
catch( CascadingException e )
{
--
To unsubscribe, e-mail: <mailto:avalon-cvs-unsubscribe@;jakarta.apache.org>
For additional commands, e-mail: <mailto:avalon-cvs-help@;jakarta.apache.org>
