mcconnell    2003/08/20 06:24:50

  Modified:    merlin/kernel/impl/src/java/org/apache/avalon/merlin/kernel/impl
                        DefaultKernelContext.java
  Log:
  Improvement to debug mode listing.
  
  Revision  Changes    Path
  1.15      +21 -9     
avalon-sandbox/merlin/kernel/impl/src/java/org/apache/avalon/merlin/kernel/impl/DefaultKernelContext.java
  
  Index: DefaultKernelContext.java
  ===================================================================
  RCS file: 
/home/cvs/avalon-sandbox/merlin/kernel/impl/src/java/org/apache/avalon/merlin/kernel/impl/DefaultKernelContext.java,v
  retrieving revision 1.14
  retrieving revision 1.15
  diff -u -r1.14 -r1.15
  --- DefaultKernelContext.java 20 Aug 2003 11:57:13 -0000      1.14
  +++ DefaultKernelContext.java 20 Aug 2003 13:24:50 -0000      1.15
  @@ -53,6 +53,7 @@
   import java.io.File;
   import java.net.URL;
   import java.util.ArrayList;
  +import java.util.Enumeration;
   import java.io.InputStream;
   
   import org.apache.avalon.composition.data.builder.XMLDeploymentProfileCreator;
  @@ -601,15 +602,26 @@
   
       public String toString()
       {
  -        StringBuffer buffer = new StringBuffer( "  version: " );
  +        StringBuffer buffer = new StringBuffer( "  Version: " );
           buffer.append( getVersionString() );
  -        buffer.append( "\n  home: " + getHomePath() );
  -        buffer.append( "\n  system: " + m_system );
  -        buffer.append( "\n  library: " + getLibraryPath() );
  -        buffer.append( "\n  kernel: " + m_kernelURL );
  -        buffer.append( "\n  block: " + getInstallSequenceString() );
  -        buffer.append( "\n  override: " + getOverrideDirective() );
  -        buffer.append( "\n  debug: " + getDebugFlag() );
  +        buffer.append( "\n  Environment: " 
  +              + System.getProperty( "os.name" ) + " "
  +              + System.getProperty( "os.version" ) + " Java " 
  +              + System.getProperty( "java.version" ) );
  +        buffer.append( "\n  Deployment Home: " + getHomePath() );
  +        buffer.append( "\n  Runtime Repository: " + m_system );
  +        buffer.append( "\n  Library Anchor: " + getLibraryPath() );
  +        if( m_kernelURL != null )
  +        {
  +            buffer.append( "\n  Kernel Path: " + m_kernelURL );
  +        }
  +        buffer.append( "\n  Deployment Blocks: " + getInstallSequenceString() );
  +        if( getOverrideDirective() != null )
  +        {
  +            buffer.append( "\n  Override Path: " + getOverrideDirective() );
  +        }
  +        buffer.append( "\n  Server Flag: " + getServerFlag() );
  +        buffer.append( "\n  Debug Flag: " + getDebugFlag() );
           return buffer.toString();
       }
   
  
  
  

---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]

Reply via email to