bloritsch 2003/01/27 13:11:44
Modified: fortress build.xml default.properties
fortress/src/java/org/apache/avalon/fortress/impl
AbstractContainer.java
Log:
divorce from Exalibur Thread
Revision Changes Path
1.67 +0 -6 jakarta-avalon-excalibur/fortress/build.xml
Index: build.xml
===================================================================
RCS file: /home/cvs/jakarta-avalon-excalibur/fortress/build.xml,v
retrieving revision 1.66
retrieving revision 1.67
diff -u -r1.66 -r1.67
--- build.xml 22 Jan 2003 04:33:45 -0000 1.66
+++ build.xml 27 Jan 2003 21:11:43 -0000 1.67
@@ -22,7 +22,6 @@
<pathelement location="${excalibur-event.jar}"/>
<pathelement location="${excalibur-logger.jar}"/>
<pathelement location="${excalibur-sourceresolve.jar}"/>
-<!-- <pathelement location="${excalibur-concurrent.jar}"/> -->
<pathelement location="${excalibur-container.jar}"/>
<pathelement location="${checkstyle.jar}"/>
<pathelement path="${java.class.path}"/>
@@ -50,7 +49,6 @@
<pathelement location="${excalibur-altrmi-client-interfaces.jar}"/>
<pathelement location="${excalibur-testcase.jar}"/>
<pathelement location="${excalibur-component.jar}"/>
- <pathelement location="${excalibur-thread.jar}"/>
<pathelement location="${excalibur-pool.jar}"/>
<pathelement location="${excalibur-datasource.jar}"/>
<pathelement location="${excalibur-cache.jar}"/>
@@ -72,8 +70,6 @@
</target>
<target name="big-jar" depends="jar,copy-optional-libs" description="Build the
big jar with all dependencies included">
- <!-- <copy file="${commons-collections.jar}" todir="${build.dir}/tempjars"/>
- <copy file="${util.concurrent.jar}" todir="${build.dir}/tempjars"/> -->
<copy file="${excalibur-altrmi-registry.jar}" todir="${build.dir}/tempjars"/>
<copy file="${excalibur-altrmi-common.jar}" todir="${build.dir}/tempjars"/>
<copy file="${excalibur-altrmi-server-impl.jar}"
todir="${build.dir}/tempjars"/>
@@ -88,8 +84,6 @@
<copy file="${excalibur-logger.jar}" todir="${build.dir}/tempjars"/>
<copy file="${excalibur-sourceresolve.jar}" todir="${build.dir}/tempjars"/>
<copy file="${excalibur-container.jar}" todir="${build.dir}/tempjars"/>
-<!-- <copy file="${excalibur-threadcontext.jar}"
todir="${build.dir}/tempjars"/> -->
- <copy file="${excalibur-thread.jar}" todir="${build.dir}/tempjars"/>
<copy file="${build.lib}/${jar.name}" todir="${build.dir}/tempjars"/>
<jar destfile="${build.lib}/${name}-complete-${version}.jar">
1.55 +1 -11 jakarta-avalon-excalibur/fortress/default.properties
Index: default.properties
===================================================================
RCS file: /home/cvs/jakarta-avalon-excalibur/fortress/default.properties,v
retrieving revision 1.54
retrieving revision 1.55
diff -u -r1.54 -r1.55
--- default.properties 27 Jan 2003 18:27:27 -0000 1.54
+++ default.properties 27 Jan 2003 21:11:43 -0000 1.55
@@ -48,7 +48,7 @@
# ----- Excalibur event, version 1.0 or later -----
excalibur-event.home=${basedir}/../event/dist
excalibur-event.lib=${excalibur-event.home}
-excalibur-event.jar=${excalibur-event.lib}/excalibur-event-1.0.1.jar
+excalibur-event.jar=${excalibur-event.lib}/excalibur-event-1.0.2.jar
# ----- Commons collections, version 2.1 or later -----
commons-collections.jar=${basedir}/../event/lib/commons-collections-2.1.jar
@@ -68,16 +68,6 @@
excalibur-logger.home=${basedir}/../logger/dist
excalibur-logger.lib=${excalibur-logger.home}
excalibur-logger.jar=${excalibur-logger.lib}/excalibur-logger-1.0.jar
-
-# ----- Excalibur thread, version 1.0 or later -----
-excalibur-thread.home=${basedir}/../thread/dist
-excalibur-thread.lib=${excalibur-thread.home}
-excalibur-thread.jar=${excalibur-thread.lib}/excalibur-thread-1.1.1.jar
-
-# ----- Excalibur threadcontext, version 1.0 or later -----
-#excalibur-threadcontext.home=${basedir}/../threadcontext/dist
-#excalibur-threadcontext.lib=${excalibur-threadcontext.home}
-#excalibur-threadcontext.jar=${excalibur-threadcontext.lib}/excalibur-threadcontext-1.0.jar
# ----- AltRMI -----
excalibur-altrmi.home=${basedir}/../altrmi/dist
1.3 +2 -2
jakarta-avalon-excalibur/fortress/src/java/org/apache/avalon/fortress/impl/AbstractContainer.java
Index: AbstractContainer.java
===================================================================
RCS file:
/home/cvs/jakarta-avalon-excalibur/fortress/src/java/org/apache/avalon/fortress/impl/AbstractContainer.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- AbstractContainer.java 27 Jan 2003 20:22:43 -0000 1.2
+++ AbstractContainer.java 27 Jan 2003 21:11:43 -0000 1.3
@@ -327,7 +327,7 @@
// create the appropriate handler instance
final ComponentHandler targetHandler =
- (ComponentHandler)handlerInstance;
+ (ComponentHandler)roleEntry.getHandlerClass().newInstance();
// do the handler lifecycle
ContainerUtil.contextualize( targetHandler, m_context );
--
To unsubscribe, e-mail: <mailto:[EMAIL PROTECTED]>
For additional commands, e-mail: <mailto:[EMAIL PROTECTED]>
