mcconnell 2003/08/23 10:18:26
Modified: merlin/kernel/impl/src/java/org/apache/avalon/merlin/kernel/impl
DefaultKernel.java DefaultKernelContext.java
Log:
Updates to leverage improved log message generation.
Revision Changes Path
1.8 +8 -2
avalon-sandbox/merlin/kernel/impl/src/java/org/apache/avalon/merlin/kernel/impl/DefaultKernel.java
Index: DefaultKernel.java
===================================================================
RCS file:
/home/cvs/avalon-sandbox/merlin/kernel/impl/src/java/org/apache/avalon/merlin/kernel/impl/DefaultKernel.java,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- DefaultKernel.java 20 Aug 2003 11:57:13 -0000 1.7
+++ DefaultKernel.java 23 Aug 2003 17:18:26 -0000 1.8
@@ -82,6 +82,7 @@
import org.apache.avalon.composition.model.impl.DefaultModelFactory;
import org.apache.avalon.composition.model.ContainmentModel;
import org.apache.avalon.composition.util.ExceptionHelper;
+import org.apache.avalon.composition.util.StringHelper;
import org.apache.avalon.framework.activity.Disposable;
import org.apache.avalon.framework.logger.AbstractLogEnabled;
import org.apache.avalon.framework.configuration.Configuration;
@@ -172,7 +173,12 @@
for( int i=0; i<urls.length; i++ )
{
URL url = urls[i];
- getLogger().info( "installing: " + url );
+ if( getLogger().isInfoEnabled() )
+ {
+ getLogger().info(
+ "installing: "
+ + StringHelper.toString( url ) );
+ }
try
{
m_model.addModel( url );
1.19 +8 -55
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.18
retrieving revision 1.19
diff -u -r1.18 -r1.19
--- DefaultKernelContext.java 23 Aug 2003 09:35:45 -0000 1.18
+++ DefaultKernelContext.java 23 Aug 2003 17:18:26 -0000 1.19
@@ -71,6 +71,7 @@
import org.apache.avalon.composition.model.ModelFactory;
import org.apache.avalon.composition.model.impl.DefaultSystemContext;
import org.apache.avalon.composition.model.impl.DefaultModelFactory;
+import org.apache.avalon.composition.util.StringHelper;
import org.apache.avalon.framework.logger.Logger;
import org.apache.avalon.framework.logger.AbstractLogEnabled;
import org.apache.avalon.framework.configuration.Configuration;
@@ -112,7 +113,7 @@
private static final String CATEGORY_NAME = "context";
- private static final String USER_DIR = System.getProperty( "user.dir"
).replace( '\\', '/' );;
+ private static final String USER_DIR = System.getProperty( "user.dir"
).replace( '\\', '/' );
//==============================================================
// immutable state
@@ -310,7 +311,7 @@
// if the debug flag is enabled then print the context object
//
- if( debug || info )
+ if( info )
{
System.out.println( "\n" + toString() + "\n" );
}
@@ -609,7 +610,7 @@
+ System.getProperty( "os.name" ) + " "
+ System.getProperty( "os.version" ) + " Java "
+ System.getProperty( "java.version" ) );
- buffer.append( "\n Deployment Home: " + getString( getHomePath() ) );
+ buffer.append( "\n Deployment Home: " + StringHelper.toString(
getHomePath() ) );
buffer.append( "\n Runtime Repository: " );
if( m_system != null )
{
@@ -623,64 +624,16 @@
System.getProperty( "user.dir" ) ) );
buffer.append( fallback );
}
- buffer.append( "\n Library Anchor: " + getString( getLibraryPath() ) );
- buffer.append( "\n Kernel Path: " + m_kernelURL );
- buffer.append( "\n Deployment Blocks: " + getString( m_blocks ) );
+ buffer.append( "\n Library Anchor: " + StringHelper.toString(
getLibraryPath() ) );
+ buffer.append( "\n Kernel Path: " + StringHelper.toString( m_kernelURL ) );
+ buffer.append( "\n Deployment Blocks: " + StringHelper.toString( m_blocks
) );
buffer.append( "\n Override Path: " );
if( getOverrideDirective() != null )
{
- buffer.append( getString( getOverrideDirective() ) );
+ buffer.append( StringHelper.toString( getOverrideDirective() ) );
}
buffer.append( "\n Server Flag: " + getServerFlag() );
buffer.append( "\n Debug Flag: " + getDebugFlag() );
- return buffer.toString();
- }
-
- private String getString( String name )
- {
- String filtered = name.replace( '\\', '/' );
- return getString( filtered, USER_DIR, "${user.dir}" );
- }
-
- private String getString( String name, String pattern, String replacement )
- {
- final int n = name.indexOf( pattern );
- if( n == -1 ) return name;
- if( name.startsWith( pattern ) )
- {
- return replacement + name.substring( pattern.length() );
- }
- else
- {
- String header = name.substring( 0, n );
- String tail = name.substring( n + pattern.length() );
- return header + replacement + tail;
- }
- }
-
- private String getString( File file )
- {
- if( file == null ) return "";
- return getString( file.toString() );
- }
-
- private String getString( URL url )
- {
- if( url == null ) return "";
- return getString( url.toString() );
- }
-
- private String getString( URL[] urls )
- {
- StringBuffer buffer = new StringBuffer();
- for( int i=0; i<urls.length; i++ )
- {
- if( ( i > 0 ) && ( i < ( urls.length -1 ) ) )
- {
- buffer.append( ", " );
- }
- buffer.append( getString( urls[i] ) );
- }
return buffer.toString();
}
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
