mcconnell 2003/08/20 04:57:13
Modified: merlin/activation/src/java/org/apache/avalon/activation/appliance/impl
DefaultBlock.java
merlin/composition maven.xml
merlin/composition/src/java/org/apache/avalon/composition/model/impl
DefaultClassLoaderModel.java
DefaultContainmentModel.java
DefaultModelFactory.java DefaultSystemContext.java
merlin/kernel/bootstrap maven.xml
merlin/kernel/bootstrap/src/etc merlin.properties
merlin/kernel/impl/src/java/org/apache/avalon/merlin/kernel/impl
CLIKernelLoader.java DefaultKernel.java
DefaultKernelContext.java
merlin/merlin-platform project.xml
merlin/merlin-platform/tutorials/configuration/block/conf
block.xml
merlin/merlin-platform/tutorials/configuration/defaults/conf
block.xml
merlin/merlin-platform/tutorials/configuration/override/conf
block.xml
merlin/merlin-platform/tutorials/configuration/simple/conf
block.xml
merlin/merlin-platform/tutorials/context_casting/conf
block.xml
merlin/merlin-platform/tutorials/context_custom/conf
block.xml
merlin/merlin-platform/tutorials/context_standard/conf
block.xml
merlin/merlin-platform/tutorials/hello/conf block.xml
Log:
Upate tutorials to explicity declare classloader directives and improve debug
inforation in classloader handling.
Revision Changes Path
1.7 +25 -3
avalon-sandbox/merlin/activation/src/java/org/apache/avalon/activation/appliance/impl/DefaultBlock.java
Index: DefaultBlock.java
===================================================================
RCS file:
/home/cvs/avalon-sandbox/merlin/activation/src/java/org/apache/avalon/activation/appliance/impl/DefaultBlock.java,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- DefaultBlock.java 18 Aug 2003 11:26:05 -0000 1.6
+++ DefaultBlock.java 20 Aug 2003 11:57:13 -0000 1.7
@@ -51,6 +51,7 @@
package org.apache.avalon.activation.appliance.impl;
import java.net.URL;
+import java.net.URLClassLoader;
import java.util.Map;
import java.util.Hashtable;
import java.util.ArrayList;
@@ -907,8 +908,29 @@
{
final ServiceDirective service = services[i];
final String classname = service.getReference().getClassname();
- Class clazz = loader.loadClass( classname );
- list.add( clazz );
+ try
+ {
+ Class clazz = loader.loadClass( classname );
+ list.add( clazz );
+ }
+ catch( ClassNotFoundException cnfe )
+ {
+ final String error =
+ "Class not found: [" + classname
+ + "] in block [" + this
+ + "] with classloader content: \n";
+ StringBuffer buffer = new StringBuffer( error );
+ if( loader instanceof URLClassLoader )
+ {
+ URL[] urls = ((URLClassLoader)loader).getURLs();
+ for( int j=0; j<urls.length; j++ )
+ {
+ buffer.append( "\n " + urls[j].toString() );
+ }
+ }
+ String message = buffer.toString();
+ throw new ApplianceException( message );
+ }
}
return (Class[]) list.toArray( new Class[0] );
}
1.5 +1 -1 avalon-sandbox/merlin/composition/maven.xml
Index: maven.xml
===================================================================
RCS file: /home/cvs/avalon-sandbox/merlin/composition/maven.xml,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- maven.xml 31 Jul 2003 22:52:47 -0000 1.4
+++ maven.xml 20 Aug 2003 11:57:13 -0000 1.5
@@ -1,5 +1,5 @@
<project
- default="jar:jar"
+ default="jar:install-snapshot"
xmlns:maven="jelly:maven"
xmlns:j="jelly:core"
xmlns:util="jelly:util"
1.18 +48 -10
avalon-sandbox/merlin/composition/src/java/org/apache/avalon/composition/model/impl/DefaultClassLoaderModel.java
Index: DefaultClassLoaderModel.java
===================================================================
RCS file:
/home/cvs/avalon-sandbox/merlin/composition/src/java/org/apache/avalon/composition/model/impl/DefaultClassLoaderModel.java,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -r1.17 -r1.18
--- DefaultClassLoaderModel.java 12 Aug 2003 05:30:44 -0000 1.17
+++ DefaultClassLoaderModel.java 20 Aug 2003 11:57:13 -0000 1.18
@@ -161,6 +161,8 @@
private final DefaultServiceRepository m_services;
+ private final Logger m_local;
+
//==============================================================
// constructor
//==============================================================
@@ -182,7 +184,8 @@
m_context = context;
enableLogging( context.getLogger() );
- getLogger().debug( "base: " + context.getBaseDirectory() );
+ m_local = getLogger().getChildLogger( "classloader" );
+ getLocalLogger().debug( "base: " + context.getBaseDirectory() );
File base =
context.getBaseDirectory();
@@ -213,7 +216,7 @@
m_manager = new PackageManager( m_extension );
m_classpath = createClassPath( base, repository, directive, implicit );
- if( getLogger().isDebugEnabled() )
+ if( getLocalLogger().isDebugEnabled() )
{
StringBuffer buffer = new StringBuffer( "classpath: " );
for( int i=0; i<m_classpath.length; i++ )
@@ -227,7 +230,7 @@
buffer.append( ";" + m_classpath[i] );
}
}
- getLogger().debug( buffer.toString() );
+ getLocalLogger().debug( buffer.toString() );
}
m_packages = buildOptionalPackages(
@@ -244,17 +247,17 @@
ArrayList types = new ArrayList();
ArrayList services = new ArrayList();
Scanner scanner = new Scanner( m_classLoader );
- scanner.enableLogging( getLogger().getChildLogger( "scanner" ) );
+ scanner.enableLogging( getLocalLogger().getChildLogger( "scanner" ) );
scanner.scan( m_urls, types, services );
//
// create the repository supporting type and service lookup
//
- Logger typeLogger = getLogger().getChildLogger( "types" );
+ Logger typeLogger = getLocalLogger().getChildLogger( "types" );
m_types = new DefaultTypeRepository(
typeLogger, m_classLoader, context.getTypeRepository(), types );
- Logger serviceLogger = getLogger().getChildLogger( "services" );
+ Logger serviceLogger = getLocalLogger().getChildLogger( "services" );
m_services = new DefaultServiceRepository(
serviceLogger, context.getServiceRepository(), services );
}
@@ -431,9 +434,18 @@
throws Exception
{
ArrayList classpath = new ArrayList();
- for( int i=0; i<implicit.length; i++ )
+
+ if( implicit.length > 0 )
{
- classpath.add( implicit[i].toString() );
+ if( getLogger().isDebugEnabled() )
+ {
+ getLogger().debug( "implicit entries: " + implicit.length );
+ }
+
+ for( int i=0; i<implicit.length; i++ )
+ {
+ classpath.add( implicit[i].toString() );
+ }
}
File[] files =
@@ -441,11 +453,33 @@
base, directive.getClasspathDirective().getFilesets() );
addToClassPath( classpath, files );
+ if( files.length > 0 )
+ {
+ if( getLogger().isDebugEnabled() )
+ {
+ getLogger().debug( "included entries: " + files.length );
+ }
+ }
+
RepositoryDirective[] repositories =
directive.getClasspathDirective().getRepositoryDirectives();
+
+ if( repositories.length > 0 )
+ {
+ if( getLogger().isDebugEnabled() )
+ {
+ getLogger().debug( "repository declarations: " +
repositories.length );
+ }
+ }
+
for( int i=0; i<repositories.length; i++ )
{
ResourceDirective[] resources = repositories[i].getResources();
+ if( getLogger().isDebugEnabled() )
+ {
+ getLogger().debug( "repository " + i + " contains " +
resources.length + " entries." );
+ }
+
for( int j=0; j<resources.length; j++ )
{
ResourceDirective resource = resources[j];
@@ -669,5 +703,9 @@
"Path does not correspond to a directory: " + dir;
throw new IOException( error );
}
-
+
+ private Logger getLocalLogger()
+ {
+ return m_local;
+ }
}
1.27 +3 -6
avalon-sandbox/merlin/composition/src/java/org/apache/avalon/composition/model/impl/DefaultContainmentModel.java
Index: DefaultContainmentModel.java
===================================================================
RCS file:
/home/cvs/avalon-sandbox/merlin/composition/src/java/org/apache/avalon/composition/model/impl/DefaultContainmentModel.java,v
retrieving revision 1.26
retrieving revision 1.27
diff -u -r1.26 -r1.27
--- DefaultContainmentModel.java 18 Aug 2003 19:42:03 -0000 1.26
+++ DefaultContainmentModel.java 20 Aug 2003 11:57:13 -0000 1.27
@@ -92,6 +92,7 @@
import org.apache.avalon.meta.info.ServiceDescriptor;
import org.apache.avalon.meta.info.StageDescriptor;
import org.apache.avalon.meta.info.Type;
+import org.apache.excalibur.configuration.ConfigurationUtil;
/**
@@ -529,6 +530,7 @@
new DefaultConfigurationBuilder();
Configuration config =
builder.build( path );
+
final ContainmentProfile profile =
CREATOR.createContainmentProfile( config );
@@ -547,11 +549,6 @@
{
final ContainmentProfile profile =
BUILDER.createContainmentProfile( stream );
-
- final String message =
- "including block: " + blockURL.toString();
- getLogger().debug( message );
-
return createContainmentModel(
getName( name, profile ), profile, new URL[]{ url } );
}
1.11 +2 -2
avalon-sandbox/merlin/composition/src/java/org/apache/avalon/composition/model/impl/DefaultModelFactory.java
Index: DefaultModelFactory.java
===================================================================
RCS file:
/home/cvs/avalon-sandbox/merlin/composition/src/java/org/apache/avalon/composition/model/impl/DefaultModelFactory.java,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- DefaultModelFactory.java 17 Aug 2003 06:35:51 -0000 1.10
+++ DefaultModelFactory.java 20 Aug 2003 11:57:13 -0000 1.11
@@ -135,7 +135,7 @@
{
//
// START WORKAROUND
- // The conde in tyhe following if statement should not
+ // The code in the following if statement should not
// not be needed, however, when attempting to load a
// url the referenes an XML source document we get a
// SAXParseException with the message "Content not
1.14 +4 -4
avalon-sandbox/merlin/composition/src/java/org/apache/avalon/composition/model/impl/DefaultSystemContext.java
Index: DefaultSystemContext.java
===================================================================
RCS file:
/home/cvs/avalon-sandbox/merlin/composition/src/java/org/apache/avalon/composition/model/impl/DefaultSystemContext.java,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -r1.13 -r1.14
--- DefaultSystemContext.java 19 Aug 2003 03:51:23 -0000 1.13
+++ DefaultSystemContext.java 20 Aug 2003 11:57:13 -0000 1.14
@@ -108,7 +108,7 @@
final File temp = new File( working, "temp" );
return new DefaultSystemContext(
- logging, base, home, temp, repository, false );
+ logging, base, home, temp, repository, "system", false );
}
private static Repository createRepository( File root ) throws Exception
@@ -211,7 +211,7 @@
*/
public DefaultSystemContext(
LoggingManager logging, File base, File home, File temp,
- Repository repository, boolean trace )
+ Repository repository, String category, boolean trace )
{
if( base == null )
{
@@ -238,7 +238,7 @@
m_trace = trace;
m_repository = repository;
m_logging = logging;
- m_logger = m_logging.getLoggerForCategory( "" );
+ m_logger = m_logging.getLoggerForCategory( category );
m_system = DefaultSystemContext.class.getClassLoader();
m_common = Logger.class.getClassLoader();
1.2 +1 -1 avalon-sandbox/merlin/kernel/bootstrap/maven.xml
Index: maven.xml
===================================================================
RCS file: /home/cvs/avalon-sandbox/merlin/kernel/bootstrap/maven.xml,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- maven.xml 11 Aug 2003 22:34:45 -0000 1.1
+++ maven.xml 20 Aug 2003 11:57:13 -0000 1.2
@@ -1,4 +1,4 @@
-<project default="jar:jar" xmlns:maven="jelly:maven" xmlns:j="jelly:core"
xmlns:util="jelly:util">
+<project default="jar:install" xmlns:maven="jelly:maven" xmlns:j="jelly:core"
xmlns:util="jelly:util">
<property name="maven.jar.manifest" value="${basedir}/src/etc/project.mf"/>
<property name="maven.jar.manifest.extensions.add" value="false"/>
1.7 +13 -14 avalon-sandbox/merlin/kernel/bootstrap/src/etc/merlin.properties
Index: merlin.properties
===================================================================
RCS file:
/home/cvs/avalon-sandbox/merlin/kernel/bootstrap/src/etc/merlin.properties,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- merlin.properties 20 Aug 2003 08:28:04 -0000 1.6
+++ merlin.properties 20 Aug 2003 11:57:13 -0000 1.7
@@ -27,19 +27,18 @@
#
# the bootstrap classpath
#
-merlin.impl.classpath.length=15
+merlin.impl.classpath.length=14
merlin.impl.classpath.0=xerces:xerces;2.2.1
merlin.impl.classpath.1=xml-apis:xml-apis;1.0.b2
-merlin.impl.classpath.2=xalan:xalan;2.3.1
-merlin.impl.classpath.3=avalon-framework:avalon-framework-impl;SNAPSHOT
-merlin.impl.classpath.4=avalon-meta:avalon-meta-impl;SNAPSHOT
-merlin.impl.classpath.5=avalon-extension:avalon-extension-impl;SNAPSHOT
-merlin.impl.classpath.6=avalon-composition:avalon-composition-impl;SNAPSHOT
-merlin.impl.classpath.7=avalon-activation:avalon-activation-impl;SNAPSHOT
-merlin.impl.classpath.8=excalibur-i18n:excalibur-i18n;1.0
-merlin.impl.classpath.9=avalon-repository:avalon-repository-impl;SNAPSHOT
-merlin.impl.classpath.10=commons-cli:commons-cli;1.0
-merlin.impl.classpath.11=merlin:merlin-kernel-impl;SNAPSHOT
-merlin.impl.classpath.12=logkit:logkit;1.2
-merlin.impl.classpath.13=excalibur-event:excalibur-event;1.0.3
-merlin.impl.classpath.14=excalibur-configuration:excalibur-configuration;1.1-dev
+merlin.impl.classpath.2=avalon-framework:avalon-framework-impl;SNAPSHOT
+merlin.impl.classpath.3=avalon-meta:avalon-meta-impl;SNAPSHOT
+merlin.impl.classpath.4=avalon-extension:avalon-extension-impl;SNAPSHOT
+merlin.impl.classpath.5=avalon-composition:avalon-composition-impl;SNAPSHOT
+merlin.impl.classpath.6=avalon-activation:avalon-activation-impl;SNAPSHOT
+merlin.impl.classpath.7=excalibur-i18n:excalibur-i18n;1.0
+merlin.impl.classpath.8=avalon-repository:avalon-repository-impl;SNAPSHOT
+merlin.impl.classpath.9=commons-cli:commons-cli;1.0
+merlin.impl.classpath.10=merlin:merlin-kernel-impl;SNAPSHOT
+merlin.impl.classpath.11=logkit:logkit;1.2
+merlin.impl.classpath.12=excalibur-event:excalibur-event;1.0.3
+merlin.impl.classpath.13=excalibur-configuration:excalibur-configuration;1.1-dev
1.10 +1 -1
avalon-sandbox/merlin/kernel/impl/src/java/org/apache/avalon/merlin/kernel/impl/CLIKernelLoader.java
Index: CLIKernelLoader.java
===================================================================
RCS file:
/home/cvs/avalon-sandbox/merlin/kernel/impl/src/java/org/apache/avalon/merlin/kernel/impl/CLIKernelLoader.java,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- CLIKernelLoader.java 20 Aug 2003 08:28:04 -0000 1.9
+++ CLIKernelLoader.java 20 Aug 2003 11:57:13 -0000 1.10
@@ -244,7 +244,7 @@
// get the library path
//
- File library = getLibraryPath( line, system );
+ File library = getLibraryPath( line, HOME );
//
// get the working home directory
1.7 +2 -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.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- DefaultKernel.java 19 Aug 2003 07:34:30 -0000 1.6
+++ DefaultKernel.java 20 Aug 2003 11:57:13 -0000 1.7
@@ -130,7 +130,7 @@
// create the root block into which we install application blocks
//
- getLogger().debug( "containment context establishment" );
+ getLogger().debug( "creating root containment context" );
ContainmentContext contaiment = null;
try
{
1.14 +2 -1
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.13
retrieving revision 1.14
diff -u -r1.13 -r1.14
--- DefaultKernelContext.java 19 Aug 2003 09:59:51 -0000 1.13
+++ DefaultKernelContext.java 20 Aug 2003 11:57:13 -0000 1.14
@@ -351,6 +351,7 @@
getHomePath(),
getTempPath(),
getRepository(),
+ logging.getName(),
debug ) );
getLogger().debug( "model factory established" );
}
1.18 +4 -0 avalon-sandbox/merlin/merlin-platform/project.xml
Index: project.xml
===================================================================
RCS file: /home/cvs/avalon-sandbox/merlin/merlin-platform/project.xml,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -r1.17 -r1.18
--- project.xml 19 Aug 2003 03:51:23 -0000 1.17
+++ project.xml 20 Aug 2003 11:57:13 -0000 1.18
@@ -166,6 +166,10 @@
<version>2.2.1</version>
<url>http://xml.apache.org/xerces2-j/</url>
</dependency>
+ <dependency>
+ <id>xalan</id>
+ <version>2.3.1</version>
+ </dependency>
</dependencies>
1.3 +13 -5
avalon-sandbox/merlin/merlin-platform/tutorials/configuration/block/conf/block.xml
Index: block.xml
===================================================================
RCS file:
/home/cvs/avalon-sandbox/merlin/merlin-platform/tutorials/configuration/block/conf/block.xml,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- block.xml 16 Aug 2003 11:16:33 -0000 1.2
+++ block.xml 20 Aug 2003 11:57:13 -0000 1.3
@@ -1,10 +1,18 @@
<container name="tutorial">
- <component name="hello" class="tutorial.HelloComponent" activation="startup">
- <configuration>
- <source>explicit configuration within block</source>
- </configuration>
- </component>
+ <classloader>
+ <classpath>
+ <repository>
+ <resource id="avalon-framework:avalon-framework-impl" version="SNAPSHOT"/>
+ </repository>
+ </classpath>
+ </classloader>
+
+ <component name="hello" class="tutorial.HelloComponent" activation="startup">
+ <configuration>
+ <source>explicit configuration within block</source>
+ </configuration>
+ </component>
</container>
1.4 +9 -1
avalon-sandbox/merlin/merlin-platform/tutorials/configuration/defaults/conf/block.xml
Index: block.xml
===================================================================
RCS file:
/home/cvs/avalon-sandbox/merlin/merlin-platform/tutorials/configuration/defaults/conf/block.xml,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- block.xml 18 Aug 2003 11:54:32 -0000 1.3
+++ block.xml 20 Aug 2003 11:57:13 -0000 1.4
@@ -1,6 +1,14 @@
<container name="tutorial">
- <component name="hello" class="tutorial.HelloComponent"/>
+ <classloader>
+ <classpath>
+ <repository>
+ <resource id="avalon-framework:avalon-framework-impl" version="SNAPSHOT"/>
+ </repository>
+ </classpath>
+ </classloader>
+
+ <component name="hello" class="tutorial.HelloComponent"/>
</container>
1.3 +14 -5
avalon-sandbox/merlin/merlin-platform/tutorials/configuration/override/conf/block.xml
Index: block.xml
===================================================================
RCS file:
/home/cvs/avalon-sandbox/merlin/merlin-platform/tutorials/configuration/override/conf/block.xml,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- block.xml 16 Aug 2003 11:16:33 -0000 1.2
+++ block.xml 20 Aug 2003 11:57:13 -0000 1.3
@@ -1,10 +1,19 @@
<container name="tutorial">
- <component name="hello" class="tutorial.HelloComponent" activation="startup">
- <configuration>
- <source>explicit configuration within block</source>
- </configuration>
- </component>
+ <classloader>
+ <classpath>
+ <repository>
+ <resource id="avalon-framework:avalon-framework-impl" version="SNAPSHOT"/>
+ </repository>
+ </classpath>
+ </classloader>
+
+
+ <component name="hello" class="tutorial.HelloComponent" activation="startup">
+ <configuration>
+ <source>explicit configuration within block</source>
+ </configuration>
+ </component>
</container>
1.4 +9 -1
avalon-sandbox/merlin/merlin-platform/tutorials/configuration/simple/conf/block.xml
Index: block.xml
===================================================================
RCS file:
/home/cvs/avalon-sandbox/merlin/merlin-platform/tutorials/configuration/simple/conf/block.xml,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- block.xml 18 Aug 2003 11:54:32 -0000 1.3
+++ block.xml 20 Aug 2003 11:57:13 -0000 1.4
@@ -1,6 +1,14 @@
<container name="tutorial">
- <component name="hello" class="tutorial.HelloComponent"/>
+ <classloader>
+ <classpath>
+ <repository>
+ <resource id="avalon-framework:avalon-framework-impl" version="SNAPSHOT"/>
+ </repository>
+ </classpath>
+ </classloader>
+
+ <component name="hello" class="tutorial.HelloComponent"/>
</container>
1.2 +11 -3
avalon-sandbox/merlin/merlin-platform/tutorials/context_casting/conf/block.xml
Index: block.xml
===================================================================
RCS file:
/home/cvs/avalon-sandbox/merlin/merlin-platform/tutorials/context_casting/conf/block.xml,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- block.xml 18 Aug 2003 16:59:41 -0000 1.1
+++ block.xml 20 Aug 2003 11:57:13 -0000 1.2
@@ -1,8 +1,16 @@
<container name="tutorial">
- <component name="hello" class="tutorial.HelloComponent" activation="startup">
- <context class="tutorial.DemoContextProvider"/>
- </component>
+ <classloader>
+ <classpath>
+ <repository>
+ <resource id="avalon-framework:avalon-framework-impl" version="SNAPSHOT"/>
+ </repository>
+ </classpath>
+ </classloader>
+
+ <component name="hello" class="tutorial.HelloComponent" activation="startup">
+ <context class="tutorial.DemoContextProvider"/>
+ </component>
</container>
1.2 +19 -10
avalon-sandbox/merlin/merlin-platform/tutorials/context_custom/conf/block.xml
Index: block.xml
===================================================================
RCS file:
/home/cvs/avalon-sandbox/merlin/merlin-platform/tutorials/context_custom/conf/block.xml,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- block.xml 18 Aug 2003 18:05:17 -0000 1.1
+++ block.xml 20 Aug 2003 11:57:13 -0000 1.2
@@ -1,15 +1,24 @@
<container name="tutorial">
- <component name="hello" class="tutorial.HelloComponent">
- <context>
- <entry key="cruncher">
- <constructor class="tutorial.NumberCruncher">
- <param class="java.lang.Integer">7</param>
- <param class="java.lang.Double">1.5</param>
- </constructor>
- </entry>
- </context>
- </component>
+ <classloader>
+ <classpath>
+ <repository>
+ <resource id="avalon-framework:avalon-framework-impl" version="SNAPSHOT"/>
+ </repository>
+ </classpath>
+ </classloader>
+
+
+ <component name="hello" class="tutorial.HelloComponent">
+ <context>
+ <entry key="cruncher">
+ <constructor class="tutorial.NumberCruncher">
+ <param class="java.lang.Integer">7</param>
+ <param class="java.lang.Double">1.5</param>
+ </constructor>
+ </entry>
+ </context>
+ </component>
</container>
1.2 +9 -1
avalon-sandbox/merlin/merlin-platform/tutorials/context_standard/conf/block.xml
Index: block.xml
===================================================================
RCS file:
/home/cvs/avalon-sandbox/merlin/merlin-platform/tutorials/context_standard/conf/block.xml,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- block.xml 18 Aug 2003 17:45:02 -0000 1.1
+++ block.xml 20 Aug 2003 11:57:13 -0000 1.2
@@ -1,6 +1,14 @@
<container name="tutorial">
- <component name="hello" class="tutorial.HelloComponent"/>
+ <classloader>
+ <classpath>
+ <repository>
+ <resource id="avalon-framework:avalon-framework-impl" version="SNAPSHOT"/>
+ </repository>
+ </classpath>
+ </classloader>
+
+ <component name="hello" class="tutorial.HelloComponent"/>
</container>
1.4 +9 -3
avalon-sandbox/merlin/merlin-platform/tutorials/hello/conf/block.xml
Index: block.xml
===================================================================
RCS file:
/home/cvs/avalon-sandbox/merlin/merlin-platform/tutorials/hello/conf/block.xml,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- block.xml 20 Aug 2003 08:55:34 -0000 1.3
+++ block.xml 20 Aug 2003 11:57:13 -0000 1.4
@@ -1,8 +1,14 @@
-<?xml version="1.0" encoding="ISO-8859-1"?>
<container name="tutorial">
- <component name="hello" class="tutorial.HelloComponent"/>
+ <classloader>
+ <classpath>
+ <repository>
+ <resource id="avalon-framework:avalon-framework-impl" version="SNAPSHOT"/>
+ </repository>
+ </classpath>
+ </classloader>
-</container>
+ <component name="hello" class="tutorial.HelloComponent"/>
+</container>
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
