CVS: jcontainer/loom/engine/src/java/org/jcontainer/loom/frontends CLIMain.java,1.19,1.20 CLISetup.java,1.8,1.9
Peter Donald <pdonald-yCVjj/[email protected]> Sat, 29 Nov 2003 07:45:02 -0600
| Newsgroups | gmane.comp.java.jcontainer.cvs |
|---|---|
| Message-ID | <[email protected]> |
Update of /cvsroot/jcontainer/jcontainer/loom/engine/src/java/org/jcontainer/loom/frontends In directory hogshead.codehaus.org:/tmp/cvs-serv31016/loom/engine/src/java/org/jcontainer/loom/frontends Modified Files: CLIMain.java CLISetup.java Log Message: Remove email addie Index: CLIMain.java =================================================================== RCS file: /cvsroot/jcontainer/jcontainer/loom/engine/src/java/org/jcontainer/loom/frontends/CLIMain.java,v retrieving revision 1.19 retrieving revision 1.20 diff -u -d -r1.19 -r1.20 --- CLIMain.java 3 Nov 2003 05:52:13 -0000 1.19 +++ CLIMain.java 29 Nov 2003 13:44:27 -0000 1.20 @@ -114,7 +114,7 @@ /** * The class to load the kernel and start it running. * - * @author <a href="mailto:peter at realityforge.org">Peter Donald</a> + * @author Peter Donald * @author <a href="mailto:[email protected]">Leo Simons</a> */ public final class CLIMain @@ -161,7 +161,9 @@ { try { - final String command = "java " + getClass().getName() + " [options]"; + final String command = "java " + + getClass().getName() + + " [options]"; final CLISetup setup = new CLISetup( command ); if( false == setup.parseCommandLineOptions( args ) ) @@ -170,7 +172,8 @@ } System.out.println(); - System.out.println( ContainerConstants.SOFTWARE + " " + ContainerConstants.VERSION ); + System.out.println( + ContainerConstants.SOFTWARE + " " + ContainerConstants.VERSION ); System.out.println(); final Properties properties = setup.getParameters(); @@ -267,14 +270,18 @@ try { final String configFilename = properties.getProperty( CONFIGFILE ); - final Configuration original = ConfigurationUtil.buildFromXML( new InputSource( configFilename ) ); + final Configuration original = ConfigurationUtil.buildFromXML( + new InputSource( configFilename ) ); final File home = (File)data.get( HOME_DIR ); final Properties params = new Properties(); params.setProperty( "loom.home", home.getAbsolutePath() ); - final Configuration root = ConfigUtil.expandValues( original, params ); + final Configuration root = ConfigUtil.expandValues( original, + params ); final Configuration configuration = root.getChild( "embeddor" ); - final String embeddorClassname = configuration.getAttribute( "class" ); - m_embeddor = (Embeddor)Class.forName( embeddorClassname ).newInstance(); + final String embeddorClassname = configuration.getAttribute( + "class" ); + m_embeddor = + (Embeddor)Class.forName( embeddorClassname ).newInstance(); m_logger = createLogger( properties ); ContainerUtil.enableLogging( m_embeddor, m_logger ); @@ -305,21 +312,21 @@ } /** - * Uses {@link org.apache.log.Hierarchy} to create a new - * logger using "Loom" as its category, DEBUG as its - * priority and the log-destination from Parameters as its - * destination. - * TODO: allow configurable priorities and multiple - * logtargets. + * Uses {@link org.apache.log.Hierarchy} to create a new logger using "Loom" + * as its category, DEBUG as its priority and the log-destination from + * Parameters as its destination. TODO: allow configurable priorities and + * multiple logtargets. */ private Logger createLogger( final Properties properties ) throws Exception { final String logDestination = - properties.getProperty( "log-destination", m_home + DEFAULT_LOG_FILE ); + properties.getProperty( "log-destination", + m_home + DEFAULT_LOG_FILE ); final String logPriority = properties.getProperty( "log-priority", "INFO" ); - final ExtendedPatternFormatter formatter = new ExtendedPatternFormatter( DEFAULT_FORMAT ); + final ExtendedPatternFormatter formatter = new ExtendedPatternFormatter( + DEFAULT_FORMAT ); final File file = new File( logDestination ); m_logTarget = new FileTarget( file, false, formatter ); @@ -336,8 +343,8 @@ /** * Shut the embeddor down. * - * Note must be public so that the Frontend can - * shut it down via reflection. + * Note must be public so that the Frontend can shut it down via + * reflection. */ public synchronized void shutdown() { @@ -386,8 +393,8 @@ if( null != m_logger ) { trace = - ExceptionUtil.prettyPrintStackTrace( throwable, - "org.jcontainer.loom.components" ); + ExceptionUtil.prettyPrintStackTrace( throwable, + "org.jcontainer.loom.components" ); m_logger.error( throwable.getMessage(), throwable ); } else Index: CLISetup.java =================================================================== RCS file: /cvsroot/jcontainer/jcontainer/loom/engine/src/java/org/jcontainer/loom/frontends/CLISetup.java,v retrieving revision 1.8 retrieving revision 1.9 diff -u -d -r1.8 -r1.9 --- CLISetup.java 3 Nov 2003 05:52:13 -0000 1.8 +++ CLISetup.java 29 Nov 2003 13:44:28 -0000 1.9 @@ -98,7 +98,7 @@ /** * The class prepare parameters based on input options. * - * @author <a href="mailto:peter at realityforge.org">Peter Donald</a> + * @author Peter Donald * @author <a href="[email protected]">Leo Simons</a> */ class CLISetup @@ -129,7 +129,8 @@ private void usage( final CLOptionDescriptor[] options ) { System.err.println( m_command ); - System.err.println( "\t" + REZ.getString( "cli.desc.available.header" ) ); + System.err.println( + "\t" + REZ.getString( "cli.desc.available.header" ) ); System.err.println( CLUtil.describeOptions( options ) ); } @@ -140,30 +141,30 @@ { final CLOptionDescriptor options[] = new CLOptionDescriptor[ 5 ]; options[ 0 ] = - new CLOptionDescriptor( "help", - CLOptionDescriptor.ARGUMENT_DISALLOWED, - HELP_OPT, - REZ.getString( "cli.opt.help.desc" ) ); + new CLOptionDescriptor( "help", + CLOptionDescriptor.ARGUMENT_DISALLOWED, + HELP_OPT, + REZ.getString( "cli.opt.help.desc" ) ); options[ 1 ] = - new CLOptionDescriptor( "log-file", - CLOptionDescriptor.ARGUMENT_REQUIRED, - LOG_FILE_OPT, - REZ.getString( "cli.opt.log-file.desc" ) ); + new CLOptionDescriptor( "log-file", + CLOptionDescriptor.ARGUMENT_REQUIRED, + LOG_FILE_OPT, + REZ.getString( "cli.opt.log-file.desc" ) ); options[ 2 ] = - new CLOptionDescriptor( "debug-init", - CLOptionDescriptor.ARGUMENT_DISALLOWED, - DEBUG_LOG_OPT, - REZ.getString( "cli.opt.debug-init.desc" ) ); + new CLOptionDescriptor( "debug-init", + CLOptionDescriptor.ARGUMENT_DISALLOWED, + DEBUG_LOG_OPT, + REZ.getString( "cli.opt.debug-init.desc" ) ); options[ 3 ] = - new CLOptionDescriptor( "persistent", - CLOptionDescriptor.ARGUMENT_DISALLOWED, - PERSISTENT_OPT, - REZ.getString( "cli.opt.persistent.desc" ) ); + new CLOptionDescriptor( "persistent", + CLOptionDescriptor.ARGUMENT_DISALLOWED, + PERSISTENT_OPT, + REZ.getString( "cli.opt.persistent.desc" ) ); options[ 4 ] = - new CLOptionDescriptor( "configfile", - CLOptionDescriptor.ARGUMENT_REQUIRED, - CONFIGFILE_OPT, - REZ.getString( "cli.opt.configfile.desc" ) ); + new CLOptionDescriptor( "configfile", + CLOptionDescriptor.ARGUMENT_REQUIRED, + CONFIGFILE_OPT, + REZ.getString( "cli.opt.configfile.desc" ) ); return options; } @@ -179,7 +180,8 @@ if( null != parser.getErrorString() ) { - final String message = REZ.getString( "cli.error.parser", parser.getErrorString() ); + final String message = REZ.getString( "cli.error.parser", + parser.getErrorString() ); System.err.println( message ); return false; } @@ -196,7 +198,8 @@ case 0: { final String message = - REZ.getString( "cli.error.unknown.arg", option.getArgument() ); + REZ.getString( "cli.error.unknown.arg", + option.getArgument() ); System.err.println( message ); } return false; @@ -210,7 +213,8 @@ break; case LOG_FILE_OPT: - m_parameters.setProperty( "log-destination", option.getArgument() ); + m_parameters.setProperty( "log-destination", + option.getArgument() ); break; case PERSISTENT_OPT: @@ -218,7 +222,8 @@ break; case CONFIGFILE_OPT: - m_parameters.setProperty( CLIMain.CONFIGFILE, option.getArgument() ); + m_parameters.setProperty( CLIMain.CONFIGFILE, + option.getArgument() ); break; } }