mcconnell 2003/02/17 04:15:33
Modified: merlin-bootstrap/src/java Merlin.java
Log:
Fixed bug relating to resolution of the configuration overides.
Revision Changes Path
1.3 +8 -3 avalon-sandbox/merlin-bootstrap/src/java/Merlin.java
Index: Merlin.java
===================================================================
RCS file: /home/cvs/avalon-sandbox/merlin-bootstrap/src/java/Merlin.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- Merlin.java 16 Feb 2003 13:02:02 -0000 1.2
+++ Merlin.java 17 Feb 2003 12:15:33 -0000 1.3
@@ -256,7 +256,7 @@
//
// an optional configuration override
- File config = getConfigPath( base, line );
+ File config = getConfigPath( base.getParentFile(), line );
//
// the kernel configuration (used by the kernel loader)
@@ -405,6 +405,12 @@
formatter.printHelp( "merlin", CL_OPTIONS );
}
+ /**
+ * Return the configuration overrides file.
+ * @param block the directory containing the block defintion
+ * @param command the command line
+ * @return the target override configuration (possibly null)
+ */
private static File getConfigPath( File block, CommandLine command )
throws IOException
{
String filename = null;
@@ -424,8 +430,7 @@
}
else
{
- File info = new File( block, "block-inf" );
- File config = new File( info, "config.xml" );
+ File config = new File( block, "config.xml" );
if( config.exists() )
{
return config;
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
