mcconnell 2003/12/21 15:13:43
Modified: merlin/kernel/cli/src/java/org/apache/avalon/merlin/cli
Main.java
Log:
Improve handling of command line args on boolean switches - prev version was setting
debug, info, and server modes and in doing so, overriding defaults resolved from
properties. Update changes this so that the explicit declaration of a -info, -debug
or -server switch is required before setting the criteria value.
Revision Changes Path
1.10 +13 -7
avalon/merlin/kernel/cli/src/java/org/apache/avalon/merlin/cli/Main.java
Index: Main.java
===================================================================
RCS file:
/home/cvs/avalon/merlin/kernel/cli/src/java/org/apache/avalon/merlin/cli/Main.java,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- Main.java 14 Dec 2003 20:07:45 -0000 1.9
+++ Main.java 21 Dec 2003 23:13:43 -0000 1.10
@@ -405,20 +405,26 @@
private void setDebugPolicy( Map criteria, CommandLine line )
{
- boolean debug = line.hasOption( "debug" );
- criteria.put( "merlin.debug", new Boolean( debug ) );
+ if( line.hasOption( "debug" ) )
+ {
+ criteria.put( "merlin.debug", new Boolean( true ) );
+ }
}
private void setInfoPolicy( Map criteria, CommandLine line )
{
- boolean info = line.hasOption( "info" );
- criteria.put( "merlin.info", new Boolean( info ) );
+ if( line.hasOption( "info" ) )
+ {
+ criteria.put( "merlin.info", new Boolean( true ) );
+ }
}
private void setServerPolicy( Map criteria, CommandLine line )
{
- boolean execute = line.hasOption( "execute" );
- criteria.put( "merlin.server", new Boolean( !execute ) );
+ if( line.hasOption( "execute" ) )
+ {
+ criteria.put( "merlin.server", new Boolean( false ) );
+ }
}
private void setDeploymentPath( Map criteria, CommandLine line )
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
