CVS: jcontainer/loom/engine/src/java/org/jcontainer/loom/frontends CLIMain.java,1.15,1.16 CLISetup.java,1.5,1.6
Peter Donald <pdonald-yCVjj/[email protected]>
| 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-serv21894/engine/src/java/org/jcontainer/loom/frontends
Modified Files:
CLIMain.java CLISetup.java
Log Message:
Remove usage of DNAs Parameters object and replace with usage of ResourceLocator
Index: CLIMain.java
===================================================================
RCS file: /cvsroot/jcontainer/jcontainer/loom/engine/src/java/org/jcontainer/loom/frontends/CLIMain.java,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -d -r1.15 -r1.16
--- CLIMain.java 28 Oct 2003 10:52:42 -0000 1.15
+++ CLIMain.java 29 Oct 2003 21:55:27 -0000 1.16
@@ -101,10 +101,8 @@
import org.jcontainer.dna.Logger;
import org.jcontainer.dna.impl.ConfigurationUtil;
import org.jcontainer.dna.impl.ContainerUtil;
-import org.jcontainer.dna.impl.DefaultParameters;
import org.jcontainer.dna.impl.DefaultResourceLocator;
import org.jcontainer.dna.impl.LogkitLogger;
-import org.jcontainer.loom.components.ParameterConstants;
import org.jcontainer.loom.components.util.ConfigUtil;
import org.jcontainer.loom.interfaces.ContainerConstants;
import org.jcontainer.loom.interfaces.Embeddor;
@@ -126,9 +124,18 @@
private static final Resources REZ =
ResourceManager.getPackageResources( CLIMain.class );
+ static final String APPS_DIR = File.class.getName() + "/apps";
+ static final String HOME_DIR = File.class.getName() + "/home";
+ static final String PERSISTENT = Boolean.class.getName() + "/persistent";
+ static final String DISABLE_HOOK = "disable-hook";
+ static final String CONFIGFILE = "loom.configfile";
+
private static final String DEFAULT_LOG_FILE =
File.separator + "logs" + File.separator + "loom.log";
+ private static final String DEFAULT_APPS_DIR =
+ File.separator + "apps";
+
private static final String DEFAULT_CONF_FILE =
File.separator + "conf" + File.separator + "kernel.xml";
@@ -147,6 +154,8 @@
private boolean m_shuttingDown;
private Logger m_logger;
+ private File m_home;
+
/**
* Main entry point.
*
@@ -171,18 +180,44 @@
System.out.println();
final Properties properties = setup.getParameters();
- final String loomHome = System.getProperty( ParameterConstants.HOME_DIR, ".." );
- properties.setProperty( ParameterConstants.HOME_DIR, loomHome );
- if( !properties.containsKey( "loom.configfile" ) )
+ final String loomHome = System.getProperty( "loom.home", ".." );
+ m_home = new File( loomHome ).getCanonicalFile();
+ data.put( HOME_DIR, m_home );
+ if( !properties.containsKey( CONFIGFILE ) )
{
- final String filename = loomHome + DEFAULT_CONF_FILE;
+ final String filename = m_home + DEFAULT_CONF_FILE;
final File configFile =
new File( filename ).getCanonicalFile();
// setting default
- properties.setProperty( "loom.configfile",
+ properties.setProperty( CONFIGFILE,
configFile.toString() );
}
+ final String appsPath;
+ if( !properties.containsKey( APPS_DIR ) )
+ {
+ appsPath = m_home + DEFAULT_APPS_DIR;
+ }
+ else
+ {
+ appsPath = properties.getProperty( APPS_DIR );
+ }
+ final File appsDirFile =
+ new File( appsPath ).getCanonicalFile();
+ data.put( APPS_DIR, appsDirFile );
+
+ final Boolean persistent;
+ if( !properties.containsKey( PERSISTENT ) )
+ {
+ persistent = Boolean.FALSE;
+ }
+ else
+ {
+ final String property =
+ properties.getProperty( PERSISTENT );
+ persistent = Boolean.valueOf( property );
+ }
+ data.put( PERSISTENT, persistent );
execute( properties, data, blocking );
}
@@ -207,7 +242,7 @@
}
final boolean disableHook =
- properties.getProperty( "disable-hook", "false" ).equals( "true" );
+ properties.getProperty( DISABLE_HOOK, "false" ).equals( "true" );
if( false == disableHook )
{
m_hook = new ShutdownHook( this );
@@ -262,16 +297,18 @@
{
try
{
- final String configFilename = properties.getProperty( "loom.configfile" );
+ final String configFilename = properties.getProperty( CONFIGFILE );
final Configuration original = ConfigurationUtil.buildFromXML( new InputSource( configFilename ) );
- final Configuration root = ConfigUtil.expandValues( original, properties );
+ 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 configuration = root.getChild( "embeddor" );
final String embeddorClassname = configuration.getAttribute( "class" );
m_embeddor = (Embeddor)Class.forName( embeddorClassname ).newInstance();
m_logger = createLogger( properties );
ContainerUtil.enableLogging( m_embeddor, m_logger );
- ContainerUtil.parameterize( m_embeddor, createParameters( properties ) );
ContainerUtil.compose( m_embeddor, createLocator( data ) );
ContainerUtil.configure( m_embeddor, configuration );
ContainerUtil.initialize( m_embeddor );
@@ -285,19 +322,6 @@
return true;
}
- private DefaultParameters createParameters( final Properties properties )
- {
- final DefaultParameters parameters = new DefaultParameters();
- final Iterator iterator = properties.keySet().iterator();
- while( iterator.hasNext() )
- {
- final String name = (String)iterator.next();
- final String value = properties.getProperty( name );
- parameters.setParameter( name, value );
- }
- return parameters;
- }
-
private DefaultResourceLocator createLocator( final Map data )
{
final DefaultResourceLocator locator = new DefaultResourceLocator();
@@ -322,9 +346,8 @@
private Logger createLogger( final Properties properties )
throws Exception
{
- final String loomHome = properties.getProperty( "loom.home" );
final String logDestination =
- properties.getProperty( "log-destination", loomHome + 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 );
Index: CLISetup.java
===================================================================
RCS file: /cvsroot/jcontainer/jcontainer/loom/engine/src/java/org/jcontainer/loom/frontends/CLISetup.java,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -d -r1.5 -r1.6
--- CLISetup.java 16 Oct 2003 14:45:47 -0000 1.5
+++ CLISetup.java 29 Oct 2003 21:55:27 -0000 1.6
@@ -88,7 +88,6 @@
import java.util.List;
import java.util.Properties;
-import org.jcontainer.loom.components.ParameterConstants;
import org.realityforge.cli.CLArgsParser;
import org.realityforge.cli.CLOption;
import org.realityforge.cli.CLOptionDescriptor;
@@ -114,7 +113,6 @@
private static final int PERSISTENT_OPT = 'p';
private static final int CONFIGFILE_OPT = 'f';
private static final int DISABLE_HOOK_OPT = 2;
- private static final int APPLICATION_OPT = 3;
///Parameters created by parsing CLI options
private final Properties m_parameters = new Properties();
@@ -142,7 +140,7 @@
*/
private CLOptionDescriptor[] createCLOptions()
{
- final CLOptionDescriptor options[] = new CLOptionDescriptor[ 8 ];
+ final CLOptionDescriptor options[] = new CLOptionDescriptor[ 7 ];
options[ 0 ] =
new CLOptionDescriptor( "help",
CLOptionDescriptor.ARGUMENT_DISALLOWED,
@@ -169,16 +167,11 @@
DISABLE_HOOK_OPT,
REZ.getString( "cli.opt.disable-hook.desc" ) );
options[ 5 ] =
- new CLOptionDescriptor( "application",
- CLOptionDescriptor.ARGUMENT_REQUIRED,
- APPLICATION_OPT,
- REZ.getString( "cli.opt.application.desc" ) );
- options[ 6 ] =
new CLOptionDescriptor( "persistent",
CLOptionDescriptor.ARGUMENT_DISALLOWED,
PERSISTENT_OPT,
REZ.getString( "cli.opt.persistent.desc" ) );
- options[ 7 ] =
+ options[ 6 ] =
new CLOptionDescriptor( "configfile",
CLOptionDescriptor.ARGUMENT_REQUIRED,
CONFIGFILE_OPT,
@@ -233,25 +226,20 @@
break;
case APPS_PATH_OPT:
- m_parameters.setProperty( ParameterConstants.APPS_DIR,
- option.getArgument() );
- break;
-
- case APPLICATION_OPT:
- m_parameters.setProperty( ParameterConstants.APPLICATION_LOCATION,
+ m_parameters.setProperty( CLIMain.APPS_DIR,
option.getArgument() );
break;
case PERSISTENT_OPT:
- m_parameters.setProperty( ParameterConstants.PERSISTENT, "true" );
+ m_parameters.setProperty( CLIMain.PERSISTENT, "true" );
break;
case DISABLE_HOOK_OPT:
- m_parameters.setProperty( "disable-hook", "true" );
+ m_parameters.setProperty( CLIMain.DISABLE_HOOK, "true" );
break;
case CONFIGFILE_OPT:
- m_parameters.setProperty( "loom.configfile", option.getArgument() );
+ m_parameters.setProperty( CLIMain.CONFIGFILE, option.getArgument() );
break;
}
}