You are viewing a plain text version of this content. The canonical link for it is here.
Posted to cvs@avalon.apache.org by mc...@apache.org on 2003/04/15 06:43:56 UTC
cvs commit: avalon-sandbox/merlin/merlin-smp/src/tutorial/005/src/java/tutorial HelloComponent.java
mcconnell 2003/04/14 21:43:55
Modified: merlin maven.xml
merlin/assembly/src/java/org/apache/avalon/assembly/engine/model
DefaultClasspath.java
merlin/merlin-core/src/java/org/apache/avalon/merlin/block/impl
DefaultBlock.java DefaultBlockLoader.java
merlin/merlin-core/src/java/org/apache/avalon/merlin/kernel/impl
DefaultKernel.java
merlin/merlin-smp/src/tutorial/005/src/config block.xml
merlin/merlin-smp/src/tutorial/005/src/java/tutorial
HelloComponent.java
Log:
Updated errors relating to tutorials resulting from root block classpath resolution.
Revision Changes Path
1.7 +5 -0 avalon-sandbox/merlin/maven.xml
Index: maven.xml
===================================================================
RCS file: /home/cvs/avalon-sandbox/merlin/maven.xml,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- maven.xml 10 Apr 2003 04:36:12 -0000 1.6
+++ maven.xml 15 Apr 2003 04:43:55 -0000 1.7
@@ -175,6 +175,11 @@
</copy>
</goal>
+ <!--
+ Utility goal to update the lib directories in the Merlin installation
+ without disrupting current executing NT services. I.e. just update
+ the jar files in the lib subdirectories.
+ -->
<goal name="merlin-libs" prereqs="merlin-install-plugin,merlin-dist">
<property environment="env"/>
<mkdir dir="${env.MERLIN_HOME}/lib/shared"/>
1.3 +11 -13 avalon-sandbox/merlin/assembly/src/java/org/apache/avalon/assembly/engine/model/DefaultClasspath.java
Index: DefaultClasspath.java
===================================================================
RCS file: /home/cvs/avalon-sandbox/merlin/assembly/src/java/org/apache/avalon/assembly/engine/model/DefaultClasspath.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- DefaultClasspath.java 11 Apr 2003 19:39:18 -0000 1.2
+++ DefaultClasspath.java 15 Apr 2003 04:43:55 -0000 1.3
@@ -87,8 +87,8 @@
/**
* Create a new Classpath instance.
- * @param system the the base directory from wehich the system repository
- * resoure references will be resolved
+ * @param system the the base directory from which the system repository
+ * resource references will be resolved
* @param base the base directory from which classpath fileset directories
* shall be resolved.
* @param classpath the classpath descriptor
@@ -230,16 +230,14 @@
{
base = file;
}
+ if( base.isDirectory() )
+ {
+ return base;
+ }
}
- if( base.isDirectory() )
- {
- return base;
- } else
- {
- final String error =
- "Cannot resolve base directory from supplied URL: " + url;
- throw new IllegalArgumentException( error );
- }
- }
+ final String error =
+ "Cannot resolve base directory from supplied URL: " + url;
+ throw new IllegalArgumentException( error );
+ }
}
1.10 +4 -1 avalon-sandbox/merlin/merlin-core/src/java/org/apache/avalon/merlin/block/impl/DefaultBlock.java
Index: DefaultBlock.java
===================================================================
RCS file: /home/cvs/avalon-sandbox/merlin/merlin-core/src/java/org/apache/avalon/merlin/block/impl/DefaultBlock.java,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- DefaultBlock.java 15 Apr 2003 03:00:18 -0000 1.9
+++ DefaultBlock.java 15 Apr 2003 04:43:55 -0000 1.10
@@ -932,7 +932,10 @@
public String toString()
{
+ if( getURL().getPath().equals("") )
+ {
+ return "[block://ROOT"]";
+ }
return "[block:/" + getURL().getPath() + "]";
}
-
}
1.12 +5 -5 avalon-sandbox/merlin/merlin-core/src/java/org/apache/avalon/merlin/block/impl/DefaultBlockLoader.java
Index: DefaultBlockLoader.java
===================================================================
RCS file: /home/cvs/avalon-sandbox/merlin/merlin-core/src/java/org/apache/avalon/merlin/block/impl/DefaultBlockLoader.java,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- DefaultBlockLoader.java 15 Apr 2003 03:00:18 -0000 1.11
+++ DefaultBlockLoader.java 15 Apr 2003 04:43:55 -0000 1.12
@@ -352,7 +352,7 @@
* @param url the URL to resolve a base path from
* @return the base URL
*/
- private URL getBasePath( final URL url )
+ public static URL getBasePath( final URL url )
{
if( url.getProtocol().equals( "jar" ) )
{
@@ -603,7 +603,7 @@
catch( Throwable e )
{
final String error =
- "Supplied block configuration does not conain the required name attribute:\n"
+ "Supplied container configuration does not contain the required name attribute:\n"
+ ConfigurationUtil.list( config );
throw new BlockException( error, e );
}
@@ -812,7 +812,7 @@
}
//
- // create the computational containment profile
+ // create the containment profile
//
ContainmentProfile descriptor =
@@ -988,7 +988,7 @@
Configuration target = targets[j];
try
{
- String key = path + "/" + target.getAttribute( "name" );
+ String key = path + target.getAttribute( "name" );
m_library.put( key, target.getChild( "configuration" ) );
getLogger().debug( "registering configuration for key: " + key );
}
1.8 +7 -13 avalon-sandbox/merlin/merlin-core/src/java/org/apache/avalon/merlin/kernel/impl/DefaultKernel.java
Index: DefaultKernel.java
===================================================================
RCS file: /home/cvs/avalon-sandbox/merlin/merlin-core/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 15 Apr 2003 02:56:42 -0000 1.7
+++ DefaultKernel.java 15 Apr 2003 04:43:55 -0000 1.8
@@ -472,7 +472,7 @@
try
{
Configuration engine = m_config.getChild( "engine" );
- m_engine = bootstrapEngine( m_logging, m_pool, engine, m_loader );
+ m_engine = bootstrapEngine( m_logging, m_pool, engine, m_loader, m_url );
Thread.currentThread().setContextClassLoader( m_engine );
}
catch( Throwable e )
@@ -752,7 +752,7 @@
* @return the engine
*/
private EngineClassLoader bootstrapEngine(
- LoggingManager logging, PoolManager pool, Configuration config, ClassLoader loader )
+ LoggingManager logging, PoolManager pool, Configuration config, ClassLoader loader, URL base )
throws Exception
{
if( m_home == null )
@@ -795,7 +795,10 @@
try
{
- EngineClassLoader engine = new EngineClassLoader( loader );
+ EngineClassLoader engine =
+ new EngineClassLoader(
+ new URL[]{ DefaultBlockLoader.getBasePath( m_url ) }, loader );
+
engine.enableLogging( getLogger() );
Locator system = getSystemContext();
DefaultLocator context = new DefaultLocator( system );
@@ -861,15 +864,6 @@
if( m_block != null )
{
buffer.append( "\nBlock: " + m_block );
-
- // list the block URLs
-
- //URL[] urls = m_block.getURLs();
- //for( int i=0; i<urls.length; i++ )
- //{
- // buffer.append( "\n " + urls[i].toString() );
- //}
- //buffer.append( "\n" );
}
return buffer.toString();
}
1.3 +2 -2 avalon-sandbox/merlin/merlin-smp/src/tutorial/005/src/config/block.xml
Index: block.xml
===================================================================
RCS file: /home/cvs/avalon-sandbox/merlin/merlin-smp/src/tutorial/005/src/config/block.xml,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- block.xml 15 Apr 2003 03:16:39 -0000 1.2
+++ block.xml 15 Apr 2003 04:43:55 -0000 1.3
@@ -5,10 +5,10 @@
<name>tutorial</name>
</info>
- <impementation>
+ <implementation>
<component name="hello" class="tutorial.HelloComponent" activation="startup">
<context class="tutorial.DemoContextProvider"/>
</component>
- </impementation>
+ </implementation>
</block>
1.2 +2 -0 avalon-sandbox/merlin/merlin-smp/src/tutorial/005/src/java/tutorial/HelloComponent.java
Index: HelloComponent.java
===================================================================
RCS file: /home/cvs/avalon-sandbox/merlin/merlin-smp/src/tutorial/005/src/java/tutorial/HelloComponent.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- HelloComponent.java 4 Apr 2003 12:14:29 -0000 1.1
+++ HelloComponent.java 15 Apr 2003 04:43:55 -0000 1.2
@@ -17,6 +17,8 @@
throws ContextException
{
DemoContext c = (DemoContext) context;
+ getLogger().info( "listing values resolved from domain specific context" );
+ getLogger().info( "supplied context class: " + context.getClass().getName() );
getLogger().info( "name: " + c.getName() );
getLogger().info( "partition: " + c.getPartition() );
getLogger().info( "home: " + c.getHomeDirectory() );
---------------------------------------------------------------------
To unsubscribe, e-mail: cvs-unsubscribe@avalon.apache.org
For additional commands, e-mail: cvs-help@avalon.apache.org