mcconnell 2002/06/16 06:49:13
Modified: merlin/src/demo demo.bat
merlin/src/demo/src/etc demo.mf
merlin/src/java/org/apache/excalibur/merlin UnitInfo.java
Log:
no message
Revision Changes Path
1.2 +1 -1 jakarta-avalon-excalibur/merlin/src/demo/demo.bat
Index: demo.bat
===================================================================
RCS file: /home/cvs/jakarta-avalon-excalibur/merlin/src/demo/demo.bat,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- demo.bat 13 Jun 2002 05:27:50 -0000 1.1
+++ demo.bat 16 Jun 2002 13:49:12 -0000 1.2
@@ -27,5 +27,5 @@
rem execute Merlin as a jar file
rem (avalon-framework.jar and logkit.jar must be in the same disrectory)
rem
-java -jar ./lib/merlin.jar -target %MERLIN_TARGET% -priority
%MERLIN_PRIORITY% -verbose %MERLIN_VERBOSE% %MERLIN_FILES%
+java -jar .\..\lib\merlin.jar -target %MERLIN_TARGET% -priority
%MERLIN_PRIORITY% -verbose %MERLIN_VERBOSE% %MERLIN_FILES%
1.2 +2 -1 jakarta-avalon-excalibur/merlin/src/demo/src/etc/demo.mf
Index: demo.mf
===================================================================
RCS file: /home/cvs/jakarta-avalon-excalibur/merlin/src/demo/src/etc/demo.mf,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- demo.mf 13 Jun 2002 05:27:50 -0000 1.1
+++ demo.mf 16 Jun 2002 13:49:13 -0000 1.2
@@ -1,5 +1,6 @@
Manifest-Version: 1.0
-Created-By: OSM SARL
+Created-By: OSM
+Class-Path: avalon-framework.jar logkit.jar
Name: org/apache/excalibur/playground/SimpleComponent.class
Avalon-Block: true
1.9 +1 -0
jakarta-avalon-excalibur/merlin/src/java/org/apache/excalibur/merlin/UnitInfo.java
Index: UnitInfo.java
===================================================================
RCS file:
/home/cvs/jakarta-avalon-excalibur/merlin/src/java/org/apache/excalibur/merlin/UnitInfo.java,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- UnitInfo.java 13 Jun 2002 12:59:10 -0000 1.8
+++ UnitInfo.java 16 Jun 2002 13:49:13 -0000 1.9
@@ -217,6 +217,7 @@
Configuration componentConfig =
ConfigurationUtil.matchFirstOccurance(
conf, "component", "class", block.getName() );
Configuration profileContextConfig = componentConfig.getChild(
"context", false );
+
if( null != profileContextConfig )
{
if( contextConfig != null )
--
To unsubscribe, e-mail: <mailto:[EMAIL PROTECTED]>
For additional commands, e-mail: <mailto:[EMAIL PROTECTED]>
