Skip to Content.
Sympa Menu

notify-dpml - r860 - trunk/main/depot/core/console/src/main/net/dpml/depot

notify-dpml AT lists.ibiblio.org

Subject: DPML Notify

List archive

Chronological Thread  
  • From: mcconnell at BerliOS <mcconnell AT mail.berlios.de>
  • To: notify-dpml AT lists.ibiblio.org
  • Subject: r860 - trunk/main/depot/core/console/src/main/net/dpml/depot
  • Date: Thu, 5 Jan 2006 09:21:52 +0100

Author: mcconnell
Date: 2006-01-05 09:21:51 +0100 (Thu, 05 Jan 2006)
New Revision: 860

Modified:
trunk/main/depot/core/console/src/main/net/dpml/depot/Main.java
Log:
fix issue concerning tools inclusion

Modified: trunk/main/depot/core/console/src/main/net/dpml/depot/Main.java
===================================================================
--- trunk/main/depot/core/console/src/main/net/dpml/depot/Main.java
2006-01-05 07:57:46 UTC (rev 859)
+++ trunk/main/depot/core/console/src/main/net/dpml/depot/Main.java
2006-01-05 08:21:51 UTC (rev 860)
@@ -81,9 +81,11 @@
private Main( String[] arguments )
{
String[] args = arguments;
-
- boolean tools = false;

+ //
+ // check for debug mode and tools flag
+ //
+
if( CLIHelper.isOptionPresent( args, "-debug" ) )
{
args = CLIHelper.consolidate( args, "-debug" );
@@ -96,6 +98,10 @@
}
}

+ //
+ // handle cli sub-system establishment
+ //
+
Command command = getCommand( args );
if( Command.BUILD.equals( command ) )
{
@@ -121,9 +127,10 @@
System.exit( 1 );
}
}
-
- private void handleBuild( String[] args )
+
+ private void handleBuild( String[] arguments )
{
+ String[] args = processSystemProperties( arguments );
String name = "build";
String spec = "@DEPOT-BUILDER-URI@";
handlePlugin( name, spec, args, false, true );
@@ -174,8 +181,12 @@

private void handlePlugin( String name, String spec, String[] args,
boolean wait, boolean tools )
{
+ if( tools )
+ {
+ System.setProperty( "dpml.transit.include.tools", "true" );
+ }
System.setSecurityManager( new RMISecurityManager() );
- boolean waitForCompletion = deployHandler( name, spec, args, /*this,
*/ wait, tools );
+ boolean waitForCompletion = deployHandler( name, spec, args, wait,
tools );
if( !waitForCompletion )
{
System.exit( 0 );
@@ -183,7 +194,7 @@
}

private boolean deployHandler(
- String command, String path, String[] args, /*ShutdownHandler
shutdown,*/ boolean waitFor, boolean tools )
+ String command, String path, String[] args, boolean waitFor, boolean
tools )
{
Logger logger = getLogger().getChildLogger( command );
if( m_debug )
@@ -206,7 +217,7 @@
m_plugin =
repository.getPlugin(
ClassLoader.getSystemClassLoader(),
- uri, new Object[]{model, args, logger/*, shutdown*/} );
+ uri, new Object[]{model, args, logger} );
}
catch( RepositoryException e )
{
@@ -371,7 +382,6 @@
}
catch( Throwable e )
{
- // ignore it
boolean ignorable = true;
}
System.runFinalization();
@@ -412,9 +422,6 @@

private static Logger m_LOGGER = null;

- //private static final Preferences ROOT_PREFS =
- // Preferences.userNodeForPackage( Main.class );
-
private Command getCommand( String[] args )
{
String ref = getApplicationReference( args );




  • r860 - trunk/main/depot/core/console/src/main/net/dpml/depot, mcconnell at BerliOS, 01/05/2006

Archive powered by MHonArc 2.6.24.

Top of Page