bloritsch 2002/08/08 06:37:10
Modified: fortress/examples ant.properties build.xml
fortress/examples/src/java/org/apache/excalibur/fortress/examples/components
Translator.java
fortress/examples/src/java/org/apache/excalibur/fortress/examples/extended
Main.java
fortress/examples/src/java/org/apache/excalibur/fortress/examples/extended/components
ExtendedComponent.java ExtendedComponentImpl.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:
pruning imports of unnecessary cruft, and simplified examples building
Revision Changes Path
1.8 +1 -62 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.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- ant.properties 7 Aug 2002 19:20:35 -0000 1.7
+++ ant.properties 8 Aug 2002 13:37:09 -0000 1.8
@@ -8,59 +8,6 @@
# REQUIRED LIBRARIES
# --------------------------------------------------
-# ----- Excalibur altrmi -----
-excalibur-altrmi.home=${basepath}/../altrmi/dist
-excalibur-altrmi-common.jar=${excalibur-altrmi.home}/excalibur-altrmi-common.jar
-excalibur-altrmi-server-impl.jar=${excalibur-altrmi.home}/excalibur-altrmi-server-impl.jar
-excalibur-altrmi-server-interfaces.jar=${excalibur-altrmi.home}/excalibur-altrmi-server-interfaces.jar
-
-# ----- Excalibur collections, version 1.0 or later -----
-excalibur-collections.home=${basepath}/../collections/dist
-excalibur-collections.lib=${excalibur-collections.home}
-excalibur-collections.jar=${excalibur-collections.lib}/excalibur-collections-1.0.jar
-
-# ----- Excalibur event, version 1.0 or later -----
-excalibur-event.home=${basepath}/../event/dist
-excalibur-event.lib=${excalibur-event.home}
-excalibur-event.jar=${excalibur-event.lib}/excalibur-event-1.0a.jar
-
-# ----- Excalibur util, version 1.0 or later -----
-excalibur-util.home=${basepath}/../util/dist
-excalibur-util.lib=${excalibur-util.home}
-excalibur-util.jar=${excalibur-util.lib}/excalibur-util-1.0.jar
-
-# ----- Excalibur Source Resolver, version 1.0 or later -----
-excalibur-sourceresolve.home=${basepath}/../sourceresolve/dist
-excalibur-sourceresolve.lib=${excalibur-sourceresolve.home}
-excalibur-sourceresolve.jar=${excalibur-sourceresolve.lib}/excalibur-sourceresolve-1.0.jar
-
-# ----- Excalibur logger, version 1.0 or later -----
-excalibur-logger.home=${basepath}/../logger/dist
-excalibur-logger.lib=${excalibur-logger.home}
-excalibur-logger.jar=${excalibur-logger.lib}/excalibur-logger-1.0.jar
-
-# ----- Excalibur pool, version 1.0 or later -----
-excalibur-pool.home=${basepath}/../pool/dist
-excalibur-pool.lib=${excalibur-pool.home}
-excalibur-pool.jar=${excalibur-pool.lib}/excalibur-pool-1.1.jar
-
-# ----- Excalibur thread, version 1.0 or later -----
-excalibur-thread.home=${basepath}/../thread/dist
-excalibur-thread.lib=${excalibur-thread.home}
-excalibur-thread.jar=${excalibur-thread.lib}/excalibur-thread-1.0.jar
-
-# ----- Excalibur instrument, version 0.2 or later -----
-excalibur-instrument.home=${basepath}/../instrument/dist
-excalibur-instrument.lib=${excalibur-instrument.home}
-excalibur-instrument.jar=${excalibur-instrument.lib}/excalibur-instrument-0.3.jar
-excalibur-instrument-manager.jar=${excalibur-instrument.lib}/excalibur-instrument-manager-0.3.jar
-excalibur-instrument-manager-interfaces.jar=${excalibur-instrument.lib}/excalibur-instrument-manager-interfaces-0.3.jar
-
-# ----- Excalibur concurrent, version 1.0 or later -----
-excalibur-concurrent.home=${basepath}/../concurrent/dist
-excalibur-concurrent.lib=${excalibur-concurrent.home}
-excalibur-concurrent.jar=${excalibur-concurrent.lib}/excalibur-concurrent-1.0.jar
-
# ----- Avalon Framework, version 4.1 or later -----
avalon-framework.home=${basepath}/../../jakarta-avalon
avalon-framework.lib=${avalon-framework.home}/build/lib
@@ -69,15 +16,7 @@
# ----- Excalibur Fortress, version 1.0 or later -----
excalibur-fortress.home=${basepath}/build/lib
excalibur-fortress.lib=${excalibur-fortress.home}
-excalibur-fortress.jar=${excalibur-fortress.lib}/excalibur-fortress-1.0.jar
-
-# ----- Commons collections, version 2.0 or later -----
-commons-collections.home=${basepath}
-commons-collections.lib=${commons-collections.home}/lib
-commons-collections.jar=${commons-collections.lib}/commons-collections-2.0.jar
-
-# ----- Excalibur MPool, version 1.0 or later -----
-excalibur-mpool.jar=${excalibur-fortress.lib}/excalibur-mpool-1.0.jar
+excalibur-fortress.jar=${excalibur-fortress.lib}/excalibur-fortress-complete-1.0.jar
# ----- Logkit -----
logkit.home=${basepath}/../../jakarta-avalon-logkit
1.9 +11 -67 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.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- build.xml 5 Aug 2002 04:40:39 -0000 1.8
+++ build.xml 8 Aug 2002 13:37:09 -0000 1.9
@@ -49,55 +49,7 @@
<copy file="${avalon-framework.jar}"
todir="${lib.dir}" preservelastmodified="yes"/>
- <!-- Excalibur source resolver jar -->
- <copy file="${excalibur-sourceresolve.jar}"
- todir="${lib.dir}" preservelastmodified="yes"/>
-
- <!-- Excalibur Altrmi jars -->
- <copy file="${excalibur-altrmi-common.jar}"
- todir="${lib.dir}" preservelastmodified="yes"/>
- <copy file="${excalibur-altrmi-server-impl.jar}"
- todir="${lib.dir}" preservelastmodified="yes"/>
- <copy file="${excalibur-altrmi-server-interfaces.jar}"
- todir="${lib.dir}" preservelastmodified="yes"/>
-
- <!-- Excalibur Logger jar -->
- <copy file="${excalibur-logger.jar}"
- todir="${lib.dir}" preservelastmodified="yes"/>
-
- <!-- Excalibur pool jar -->
- <copy file="${excalibur-pool.jar}"
- todir="${lib.dir}" preservelastmodified="yes"/>
-
- <!-- Excalibur instrument jar -->
- <copy file="${excalibur-instrument.jar}"
- todir="${lib.dir}" preservelastmodified="yes"/>
-
- <!-- Excalibur instrument manager jar -->
- <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"/>
-
- <!-- Excalibur collections jar -->
- <copy file="${excalibur-collections.jar}"
- todir="${lib.dir}" preservelastmodified="yes"/>
-
- <!-- Excalibur concurrent jar -->
- <copy file="${excalibur-concurrent.jar}"
- todir="${lib.dir}" preservelastmodified="yes"/>
-
- <!-- Excalibur util jar -->
- <copy file="${excalibur-util.jar}"
- todir="${lib.dir}" preservelastmodified="yes"/>
-
- <!-- Avalon logger jar -->
+ <!-- Avalon logkit jar -->
<copy file="${logkit.jar}"
todir="${lib.dir}" preservelastmodified="yes"/>
@@ -105,14 +57,6 @@
<copy file="${excalibur-fortress.jar}"
todir="${lib.dir}" preservelastmodified="yes"/>
- <!-- MPool jar -->
- <copy file="${excalibur-mpool.jar}"
- todir="${lib.dir}" preservelastmodified="yes"/>
-
- <!-- Excalibur thread jar -->
- <copy file="${excalibur-thread.jar}"
- todir="${lib.dir}" preservelastmodified="yes"/>
-
<!-- xml-apis -->
<copy file="${xml-apis.jar}"
todir="${lib.dir}" preservelastmodified="yes"/>
@@ -137,7 +81,7 @@
</available>
</target>
-
+
<!-- Generic warning target -->
<target name="op-warning" description="General waring target (used by
other targets)">
<echo>**********************************************</echo>
@@ -151,7 +95,7 @@
<echo>***********************************************</echo>
<echo/>
</target>
-
+
<!-- Target to warn the developer if the servlet classes are not
available -->
<target name="servlet-warn" unless="servlet.present"
description="Outputs a warning if javax.servlet.* classes are
missing during compilation">
@@ -180,7 +124,7 @@
<delete dir="tmp-imports" />
</target>
-
+
<!-- ===================================================================
-->
<!-- Compiles the source code
-->
<!-- ===================================================================
-->
@@ -197,7 +141,7 @@
<include name="**/*.java"/>
<exclude name="**/servlet/*.java" unless="servlet.present"/>
</javac>
-
+
<!-- copy resources to same location as .class files -->
<copy todir="${build.classes.dir}">
<fileset dir="${src.java.dir}">
@@ -213,25 +157,25 @@
<include name="**/*.gif" />
</fileset>
</copy>
-
+
</target>
-
+
<target name="webapp" depends="jar">
-
+
<mkdir dir="${build.dir}/servlet"/>
<mkdir dir="${build.dir}/servlet/WEB-INF"/>
<mkdir dir="${build.dir}/servlet/WEB-INF/lib"/>
-
+
<copy todir="${build.dir}/servlet/WEB-INF/lib">
<fileset dir="${lib.dir}">
<include name="*.jar"/>
<exclude name="servlet*"/>
</fileset>
</copy>
-
+
<copy todir="${build.dir}/servlet/WEB-INF"
file="conf/web.xml"/>
-
+
</target>
<!-- ===================================================================
-->
1.4 +2 -4
jakarta-avalon-excalibur/fortress/examples/src/java/org/apache/excalibur/fortress/examples/components/Translator.java
Index: Translator.java
===================================================================
RCS file:
/home/cvs/jakarta-avalon-excalibur/fortress/examples/src/java/org/apache/excalibur/fortress/examples/components/Translator.java,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- Translator.java 7 Aug 2002 19:20:35 -0000 1.3
+++ Translator.java 8 Aug 2002 13:37:10 -0000 1.4
@@ -49,8 +49,6 @@
*/
package org.apache.excalibur.fortress.examples.components;
-import org.apache.avalon.framework.component.Component;
-
/**
* Translator component. This component provides simple translations of given
* keys, identified by language name.
@@ -58,7 +56,7 @@
* @author <a href="mailto:[EMAIL PROTECTED]">Marcus Crafter</a>
* @version CVS $Revision$ $Date$
*/
-public interface Translator extends Component
+public interface Translator
{
/**
* Role identifying Component
1.5 +1 -9
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.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- Main.java 7 Aug 2002 19:20:35 -0000 1.4
+++ Main.java 8 Aug 2002 13:37:10 -0000 1.5
@@ -49,18 +49,10 @@
*/
package org.apache.excalibur.fortress.examples.extended;
-import org.apache.avalon.framework.component.ComponentManager;
-import org.apache.avalon.framework.configuration.Configuration;
-import org.apache.avalon.framework.configuration.DefaultConfigurationBuilder;
-import org.apache.avalon.framework.context.Context;
-import org.apache.avalon.framework.context.DefaultContext;
-import org.apache.avalon.framework.logger.LogKitLogger;
-import org.apache.avalon.framework.logger.Logger;
import org.apache.excalibur.fortress.Container;
import org.apache.excalibur.fortress.ContainerManager;
import org.apache.excalibur.fortress.DefaultContainerManager;
import org.apache.excalibur.fortress.util.ContextBuilder;
-import org.apache.excalibur.fortress.util.ContextManager;
/**
* Fortress container example with custom extensions
1.4 +2 -4
jakarta-avalon-excalibur/fortress/examples/src/java/org/apache/excalibur/fortress/examples/extended/components/ExtendedComponent.java
Index: ExtendedComponent.java
===================================================================
RCS file:
/home/cvs/jakarta-avalon-excalibur/fortress/examples/src/java/org/apache/excalibur/fortress/examples/extended/components/ExtendedComponent.java,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- ExtendedComponent.java 7 Aug 2002 19:20:35 -0000 1.3
+++ ExtendedComponent.java 8 Aug 2002 13:37:10 -0000 1.4
@@ -49,15 +49,13 @@
*/
package org.apache.excalibur.fortress.examples.extended.components;
-import org.apache.avalon.framework.component.Component;
-
/**
* Simple <code>TestComponent</code> component for testing custom extensions
*
* @author <a href="mailto:[EMAIL PROTECTED]">Marcus Crafter</a>
* @version CVS $Revision$ $Date$
*/
-public interface ExtendedComponent extends Component
+public interface ExtendedComponent
{
/**
* Component <code>ROLE</code>
1.4 +1 -2
jakarta-avalon-excalibur/fortress/examples/src/java/org/apache/excalibur/fortress/examples/extended/components/ExtendedComponentImpl.java
Index: ExtendedComponentImpl.java
===================================================================
RCS file:
/home/cvs/jakarta-avalon-excalibur/fortress/examples/src/java/org/apache/excalibur/fortress/examples/extended/components/ExtendedComponentImpl.java,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- ExtendedComponentImpl.java 7 Aug 2002 19:20:35 -0000 1.3
+++ ExtendedComponentImpl.java 8 Aug 2002 13:37:10 -0000 1.4
@@ -50,7 +50,6 @@
package org.apache.excalibur.fortress.examples.extended.components;
import org.apache.avalon.framework.logger.AbstractLogEnabled;
-import org.apache.avalon.framework.component.Component;
import
org.apache.excalibur.fortress.examples.extended.extensions.SecurityManageable;
/**
1.5 +1 -9
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.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- servlet.java 7 Aug 2002 19:20:36 -0000 1.4
+++ servlet.java 8 Aug 2002 13:37:10 -0000 1.5
@@ -56,17 +56,9 @@
import javax.servlet.ServletResponse;
import javax.servlet.http.HttpServlet;
-import org.apache.avalon.framework.component.ComponentManager;
-import org.apache.avalon.framework.configuration.Configuration;
-import org.apache.avalon.framework.configuration.DefaultConfigurationBuilder;
-import org.apache.avalon.framework.context.Context;
-import org.apache.avalon.framework.context.DefaultContext;
-import org.apache.avalon.framework.logger.LogKitLogger;
-import org.apache.avalon.framework.logger.Logger;
import org.apache.excalibur.fortress.ContainerManager;
import org.apache.excalibur.fortress.DefaultContainerManager;
import org.apache.excalibur.fortress.util.ContextBuilder;
-import org.apache.excalibur.fortress.util.ContextManager;
/**
* Servlet based Fortress container example.
1.10 +1 -8
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.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- Main.java 7 Aug 2002 19:20:36 -0000 1.9
+++ Main.java 8 Aug 2002 13:37:10 -0000 1.10
@@ -49,13 +49,6 @@
*/
package org.apache.excalibur.fortress.examples.swing;
-import org.apache.avalon.framework.component.ComponentManager;
-import org.apache.avalon.framework.configuration.Configuration;
-import org.apache.avalon.framework.configuration.DefaultConfigurationBuilder;
-import org.apache.avalon.framework.context.Context;
-import org.apache.avalon.framework.context.DefaultContext;
-import org.apache.avalon.framework.logger.LogKitLogger;
-import org.apache.avalon.framework.logger.Logger;
import org.apache.excalibur.fortress.Container;
import org.apache.excalibur.fortress.ContainerManager;
import org.apache.excalibur.fortress.DefaultContainerManager;
1.5 +1 -9
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.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- Main.java 7 Aug 2002 19:20:36 -0000 1.4
+++ Main.java 8 Aug 2002 13:37:10 -0000 1.5
@@ -49,19 +49,11 @@
*/
package org.apache.excalibur.fortress.examples.viewer;
-import org.apache.avalon.framework.component.ComponentManager;
-import org.apache.avalon.framework.configuration.Configuration;
-import org.apache.avalon.framework.configuration.DefaultConfigurationBuilder;
-import org.apache.avalon.framework.context.Context;
-import org.apache.avalon.framework.context.DefaultContext;
-import org.apache.avalon.framework.logger.LogKitLogger;
-import org.apache.avalon.framework.logger.Logger;
import org.apache.avalon.framework.CascadingException;
import org.apache.excalibur.fortress.Container;
import org.apache.excalibur.fortress.ContainerManager;
import org.apache.excalibur.fortress.DefaultContainerManager;
import org.apache.excalibur.fortress.util.ContextBuilder;
-import org.apache.excalibur.fortress.util.ContextManager;
/**
* Fortress container example allowing you to perform lookups on components
--
To unsubscribe, e-mail: <mailto:[EMAIL PROTECTED]>
For additional commands, e-mail: <mailto:[EMAIL PROTECTED]>
