crafterm 2002/08/02 13:22:54
Modified: fortress/examples ant.properties build.xml
fortress/examples/src/java/org/apache/excalibur/fortress/examples/extended
ExtendedContainer.java
fortress/examples/src/java/org/apache/excalibur/fortress/examples/servlet
ServletContainer.java
fortress/examples/src/java/org/apache/excalibur/fortress/examples/swing
SwingContainer.java
fortress/examples/src/java/org/apache/excalibur/fortress/examples/viewer
ComponentViewer.java
Log:
Fixed up examples - parent class of example containers needed to change from
AbstractContainer to DefaultContainer. Also needed to install the instrument
manager interfaces jar.
Revision Changes Path
1.4 +4 -3 jakarta-avalon-excalibur/fortress/examples/ant.properties
Index: ant.properties
===================================================================
RCS file: /home/cvs/jakarta-avalon-excalibur/fortress/examples/ant.properties,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- ant.properties 31 Jul 2002 07:19:43 -0000 1.3
+++ ant.properties 2 Aug 2002 20:22:54 -0000 1.4
@@ -49,9 +49,10 @@
excalibur-instrument.jar=${excalibur-instrument.lib}/excalibur-instrument-0.2.jar
# ----- Excalibur instrument manager, version 1.0 or later -----
-excalibur-instrument-manager.home=${basepath}/../instrument-manager/dist
-excalibur-instrument-manager.lib=${excalibur-instrument-manager.home}
-excalibur-instrument-manager.jar=${excalibur-instrument-manager.lib}/excalibur-instrument-manager-0.1.jar
+excalibur-instrument-manager.jar=${excalibur-instrument.lib}/excalibur-instrument-manager-0.2.jar
+
+# ----- Excalibur instrument manager interfaces, version 1.0 or later -----
+excalibur-instrument-manager-interfaces.jar=${excalibur-instrument.lib}/excalibur-instrument-manager-interfaces-0.2.jar
# ----- Excalibur concurrent, version 1.0 or later -----
excalibur-concurrent.home=${basepath}/../concurrent/dist
1.7 +4 -0 jakarta-avalon-excalibur/fortress/examples/build.xml
Index: build.xml
===================================================================
RCS file: /home/cvs/jakarta-avalon-excalibur/fortress/examples/build.xml,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- build.xml 22 Jul 2002 10:02:17 -0000 1.6
+++ build.xml 2 Aug 2002 20:22:54 -0000 1.7
@@ -69,6 +69,10 @@
<copy file="${excalibur-instrument-manager.jar}"
todir="${lib.dir}" preservelastmodified="yes"/>
+ <!-- Excalibur instrument manager interfaces jar -->
+ <copy file="${excalibur-instrument-manager-interfaces.jar}"
+ todir="${lib.dir}" preservelastmodified="yes"/>
+
<!-- Excalibur event jar -->
<copy file="${excalibur-event.jar}"
todir="${lib.dir}" preservelastmodified="yes"/>
1.4 +2 -2
jakarta-avalon-excalibur/fortress/examples/src/java/org/apache/excalibur/fortress/examples/extended/ExtendedContainer.java
Index: ExtendedContainer.java
===================================================================
RCS file:
/home/cvs/jakarta-avalon-excalibur/fortress/examples/src/java/org/apache/excalibur/fortress/examples/extended/ExtendedContainer.java,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- ExtendedContainer.java 15 Jul 2002 16:18:37 -0000 1.3
+++ ExtendedContainer.java 2 Aug 2002 20:22:54 -0000 1.4
@@ -7,12 +7,12 @@
*/
package org.apache.excalibur.fortress.examples.extended;
-import org.apache.excalibur.fortress.AbstractContainer;
+import org.apache.excalibur.fortress.container.DefaultContainer;
import org.apache.excalibur.fortress.examples.extended.components.ExtendedComponent;
import org.apache.excalibur.fortress.examples.extended.extensions.Extensions;
public final class ExtendedContainer
- extends AbstractContainer
+ extends DefaultContainer
{
public void initialize()
throws Exception
1.3 +3 -3
jakarta-avalon-excalibur/fortress/examples/src/java/org/apache/excalibur/fortress/examples/servlet/ServletContainer.java
Index: ServletContainer.java
===================================================================
RCS file:
/home/cvs/jakarta-avalon-excalibur/fortress/examples/src/java/org/apache/excalibur/fortress/examples/servlet/ServletContainer.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- ServletContainer.java 12 Jul 2002 12:53:44 -0000 1.2
+++ ServletContainer.java 2 Aug 2002 20:22:54 -0000 1.3
@@ -17,7 +17,7 @@
import org.apache.avalon.framework.component.ServiceException;
import org.apache.avalon.framework.component.ServiceManager;
-import org.apache.excalibur.fortress.AbstractContainer;
+import org.apache.excalibur.fortress.container.DefaultContainer;
import org.apache.excalibur.fortress.examples.components.Translator;
/**
@@ -28,7 +28,7 @@
* @author <a href="mailto:[EMAIL PROTECTED]";>Marcus Crafter</a>
* @version CVS $Revision$ $Date$
*/
-public final class ServletContainer extends AbstractContainer
+public final class ServletContainer extends DefaultContainer
{
public static final String KEY = "hello-world";
1.3 +3 -3
jakarta-avalon-excalibur/fortress/examples/src/java/org/apache/excalibur/fortress/examples/swing/SwingContainer.java
Index: SwingContainer.java
===================================================================
RCS file:
/home/cvs/jakarta-avalon-excalibur/fortress/examples/src/java/org/apache/excalibur/fortress/examples/swing/SwingContainer.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- SwingContainer.java 12 Jul 2002 12:53:44 -0000 1.2
+++ SwingContainer.java 2 Aug 2002 20:22:54 -0000 1.3
@@ -19,7 +19,7 @@
import org.apache.avalon.framework.service.ServiceException;
import org.apache.avalon.framework.service.ServiceManager;
-import org.apache.excalibur.fortress.AbstractContainer;
+import org.apache.excalibur.fortress.container.DefaultContainer;
import org.apache.excalibur.fortress.examples.components.Translator;
/**
@@ -30,7 +30,7 @@
* @author <a href="mailto:[EMAIL PROTECTED]";>Marcus Crafter</a>
* @version CVS $Revision$ $Date$
*/
-public final class SwingContainer extends AbstractContainer
+public final class SwingContainer extends DefaultContainer
implements Startable, ActionListener
{
// Component references
1.2 +3 -3
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.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- ComponentViewer.java 22 Jul 2002 17:54:31 -0000 1.1
+++ ComponentViewer.java 2 Aug 2002 20:22:54 -0000 1.2
@@ -23,7 +23,7 @@
import org.apache.avalon.framework.service.ServiceException;
import org.apache.avalon.framework.service.ServiceManager;
-import org.apache.excalibur.fortress.AbstractContainer;
+import org.apache.excalibur.fortress.container.DefaultContainer;
/**
* Simple Fortress container containing a Swing based viewer for performing
@@ -43,7 +43,7 @@
* @author <a href="mailto:[EMAIL PROTECTED]";>Marcus Crafter</a>
* @version CVS $Revision$ $Date$
*/
-public final class ComponentViewer extends AbstractContainer
+public final class ComponentViewer extends DefaultContainer
implements Startable, ActionListener
{
// GUI references
--
To unsubscribe, e-mail: <mailto:[EMAIL PROTECTED]>
For additional commands, e-mail: <mailto:[EMAIL PROTECTED]>
