bloritsch 2002/07/30 09:57:42
Modified: fortress/src/java/org/apache/excalibur/fortress/util
ContextBuilder.java
instrument build.xml
Log:
make Fortress able to load the default contianer...
Revision Changes Path
1.18 +10 -2
jakarta-avalon-excalibur/fortress/src/java/org/apache/excalibur/fortress/util/ContextBuilder.java
Index: ContextBuilder.java
===================================================================
RCS file:
/home/cvs/jakarta-avalon-excalibur/fortress/src/java/org/apache/excalibur/fortress/util/ContextBuilder.java,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -r1.17 -r1.18
--- ContextBuilder.java 30 Jul 2002 15:12:30 -0000 1.17
+++ ContextBuilder.java 30 Jul 2002 16:57:42 -0000 1.18
@@ -63,8 +63,16 @@
{
DefaultContext defaultContext = new DefaultContext();
- defaultContext.put( CONTAINER_CLASS,
- "org.apache.excalibur.fortress.container.DefaultContainer" );
+ try
+ {
+ defaultContext.put( CONTAINER_CLASS, contextClassLoader.loadClass(
+ "org.apache.excalibur.fortress.container.DefaultContainer" ) );
+ }
+ catch (Exception e)
+ {
+ // ignore
+ }
+
defaultContext.put( THREADS_CPU, new Integer( 2 ) );
defaultContext.put( THREAD_TIMEOUT, new Long( 1000 ) );
defaultContext.put( CONTEXT_DIRECTORY, new File( "../" ) );
1.32 +7 -0 jakarta-avalon-excalibur/instrument/build.xml
Index: build.xml
===================================================================
RCS file: /home/cvs/jakarta-avalon-excalibur/instrument/build.xml,v
retrieving revision 1.31
retrieving revision 1.32
diff -u -r1.31 -r1.32
--- build.xml 30 Jul 2002 16:46:29 -0000 1.31
+++ build.xml 30 Jul 2002 16:57:42 -0000 1.32
@@ -246,6 +246,13 @@
<jar jarfile="${build.lib}/${manager-interfaces.name}.jar"
basedir="${build.manager.classes}"
compress="${build.compress}">
+ <manifest>
+ <attribute name="Extension-Name" value="${name}"/>
+ <attribute name="Specification-Vendor" value="Apache Software
Foundation"/>
+ <attribute name="Specification-Version" value="1.0"/>
+ <attribute name="Implementation-Vendor" value="Apache Software
Foundation"/>
+ <attribute name="Implementation-Version" value="${package-version}"/>
+ </manifest>
<include name="**/interfaces/**"/>
<exclude name="**/test/**"/>
<zipfileset dir=".." prefix="META-INF/">
--
To unsubscribe, e-mail: <mailto:[EMAIL PROTECTED]>
For additional commands, e-mail: <mailto:[EMAIL PROTECTED]>