mcconnell 2003/08/18 10:02:37
Modified: merlin/activation/src/java/org/apache/avalon/activation/appliance/impl
DefaultAppliance.java
merlin/composition/src/java/org/apache/avalon/composition/model/impl
DefaultSystemContext.java
merlin/composition/src/test/org/apache/avalon/composition/model/testa
TestA.java
merlin/kernel/bootstrap/src/etc merlin.properties
merlin/kernel/impl/src/java/org/apache/avalon/merlin/kernel/impl
DefaultKernelContext.java
merlin/merlin-platform/tutorials/context_standard/src/java/tutorial
HelloComponent.java
merlin/merlin-platform/tutorials/contextualization/src/java/tutorial
StandardContext.java StandardContext.xservice
merlin/merlin-platform/tutorials/mixed/src/java/tutorial
DemoContextProvider.java HelloComponent.java
merlin/merlin-platform/xdocs/starting/tutorial/context
casting.xml standard.xml
Log:
Housekeeping.
Revision Changes Path
1.4 +6 -3
avalon-sandbox/merlin/activation/src/java/org/apache/avalon/activation/appliance/impl/DefaultAppliance.java
Index: DefaultAppliance.java
===================================================================
RCS file:
/home/cvs/avalon-sandbox/merlin/activation/src/java/org/apache/avalon/activation/appliance/impl/DefaultAppliance.java,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- DefaultAppliance.java 18 Aug 2003 11:26:05 -0000 1.3
+++ DefaultAppliance.java 18 Aug 2003 17:02:37 -0000 1.4
@@ -705,7 +705,10 @@
private void applyContext( Object instance )
throws Exception
{
+ if( instance == null ) throw new NullPointerException( "context" );
+
final ContextModel model = m_model.getContextModel();
+
if( model == null ) return;
Context context = model.getContext();
@@ -720,7 +723,7 @@
final String error =
REZ.getString(
"lifecycle.contextualization.custom.error",
- m_contextProvider.getModel().getQualifiedName() );
+ m_model.getQualifiedName() );
throw new LifecycleException( error, e );
}
}
@@ -735,7 +738,7 @@
final String error =
REZ.getString(
"lifecycle.contextualization.component.error",
- m_contextProvider.getModel().getQualifiedName() );
+ m_model.getQualifiedName() );
throw new LifecycleException( error, e );
}
}
1.12 +7 -60
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.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- DefaultSystemContext.java 18 Aug 2003 11:26:05 -0000 1.11
+++ DefaultSystemContext.java 18 Aug 2003 17:02:37 -0000 1.12
@@ -103,7 +103,12 @@
LoggingManager logging = createLoggingManager( base, priority );
Logger logger = logging.getLoggerForCategory( "" );
Repository repository = createRepository( root );
- return new DefaultSystemContext( logging, base, repository );
+ final File working = new File( System.getProperty( "user.dir" ), "working"
);
+ final File home = new File( working, "home" );
+ final File temp = new File( working, "temp" );
+
+ return new DefaultSystemContext(
+ logging, base, home, temp, repository, false );
}
private static Repository createRepository( File root ) throws Exception
@@ -191,64 +196,6 @@
//==============================================================
// constructor
//==============================================================
-
- /**
- * Creation of a new system context.
- *
- * @param logging the logging manager
- * @param base the base directory from which relative references
- * within a classpath or library directive shall be resolved
- * @param repository a resource repository to be used when resolving
- * resource directives
- */
- public DefaultSystemContext(
- LoggingManager logging, File base, Repository repository )
- {
- this(
- logging, base,
- new File( System.getProperty( "user.dir" ), "working" ),
- repository );
- }
-
- /**
- * Creation of a new system context.
- *
- * @param logging the logging manager
- * @param base the base directory from which relative references
- * within a classpath or library directive shall be resolved
- * @param working the working directory from which a home and temp directory
- * can be resolved
- * @param repository a resource repository to be used when resolving
- * resource directives
- */
- public DefaultSystemContext(
- LoggingManager logging, File base, File working, Repository repository )
- {
- this(
- logging, base,
- new File( working, "home" ),
- new File( working, "temp" ),
- repository );
- }
-
- /**
- * Creation of a new system context.
- *
- * @param logging the logging manager
- * @param base the base directory from which relative references
- * within a classpath or library directive shall be resolved
- * @param home the home directory
- * @param temp the temp directory
- * @param repository a resource repository to be used when resolving
- * resource directives
- */
- public DefaultSystemContext(
- LoggingManager logging, File base, File home,
- File temp, Repository repository )
- {
- this( logging, base, home, temp, repository, false );
- }
-
/**
* Creation of a new system context.
1.4 +1 -1
avalon-sandbox/merlin/composition/src/test/org/apache/avalon/composition/model/testa/TestA.java
Index: TestA.java
===================================================================
RCS file:
/home/cvs/avalon-sandbox/merlin/composition/src/test/org/apache/avalon/composition/model/testa/TestA.java,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- TestA.java 11 Aug 2003 22:58:50 -0000 1.3
+++ TestA.java 18 Aug 2003 17:02:37 -0000 1.4
@@ -16,7 +16,7 @@
getLogger().info( "name: " + context.get( "urn:avalon:name" ) );
getLogger().info( "partition: " + context.get( "urn:avalon:partition" ) );
getLogger().info( "classloader: " + context.get( "urn:avalon:classloader" )
);
- getLogger().info( "work: " + context.get( "urn:avalon:work" ) );
+ getLogger().info( "work: " + context.get( "urn:avalon:home" ) );
getLogger().info( "temp: " + context.get( "urn:avalon:temp" ) );
}
1.3 +38 -0 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.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- merlin.properties 17 Aug 2003 15:06:41 -0000 1.2
+++ merlin.properties 18 Aug 2003 17:02:37 -0000 1.3
@@ -31,3 +31,41 @@
merlin.bootstrap.classpath.20=excalibur-event:excalibur-event;1.0.3
merlin.bootstrap.classpath.21=excalibur-configuration:excalibur-configuration;1.1-dev
merlin.bootstrap.classpath.22=excalibur-lifecycle:excalibur-lifecycle;1.0
+
+#
+# the api classpath
+#
+merlin.api.classpath.length=2
+merlin.api.classpath.0=avalon-framework:avalon-framework-api;SNAPSHOT
+merlin.api.classpath.1=avalon-meta:avalon-meta-api;SNAPSHOT
+
+#
+# the spi classpath
+#
+merlin.spi.classpath.length=7
+merlin.spi.classpath.0=avalon-meta:avalon-meta-spi;SNAPSHOT
+merlin.spi.classpath.1=avalon-extension:avalon-extension-spi;SNAPSHOT
+merlin.spi.classpath.2=avalon-composition:avalon-composition-spi;SNAPSHOT
+merlin.spi.classpath.3=avalon-activation:avalon-activation-spi;SNAPSHOT
+merlin.spi.classpath.4=avalon-repository:avalon-repository-spi;SNAPSHOT
+merlin.spi.classpath.5=merlin:merlin-kernel-spi;SNAPSHOT
+merlin.spi.classpath.6=excalibur-lifecycle:excalibur-lifecycle;1.0
+
+#
+# the bootstrap classpath
+#
+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=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.9 +3 -4
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.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- DefaultKernelContext.java 18 Aug 2003 15:11:33 -0000 1.8
+++ DefaultKernelContext.java 18 Aug 2003 17:02:37 -0000 1.9
@@ -298,7 +298,8 @@
}
}
- private Repository createRepository( File root, Configuration config ) throws
KernelException
+ private Repository createRepository( File root, Configuration config )
+ throws KernelException
{
File base = null;
String cache = config.getChild( "cache" ).getValue( null );
@@ -312,8 +313,6 @@
base = new File( root, "repository" );
getLogger().debug( "setting repository to: " + base );
}
-
- //File base = new File( getSystemPath(), "repository" );
if( !base.exists() ) base.mkdirs();
1.2 +1 -1
avalon-sandbox/merlin/merlin-platform/tutorials/context_standard/src/java/tutorial/HelloComponent.java
Index: HelloComponent.java
===================================================================
RCS file:
/home/cvs/avalon-sandbox/merlin/merlin-platform/tutorials/context_standard/src/java/tutorial/HelloComponent.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- HelloComponent.java 10 Jun 2003 02:12:24 -0000 1.1
+++ HelloComponent.java 18 Aug 2003 17:02:37 -0000 1.2
@@ -27,7 +27,7 @@
throws ContextException
{
m_home = (File) context.get( "urn:avalon:home" );
- m_temp = (File) context.get( "urn:avalon:work" );
+ m_temp = (File) context.get( "urn:avalon:temp" );
m_name = (String) context.get( "urn:avalon:name" );
m_partition = (String) context.get( "urn:avalon:partition" );
1.2 +2 -2
avalon-sandbox/merlin/merlin-platform/tutorials/contextualization/src/java/tutorial/StandardContext.java
Index: StandardContext.java
===================================================================
RCS file:
/home/cvs/avalon-sandbox/merlin/merlin-platform/tutorials/contextualization/src/java/tutorial/StandardContext.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- StandardContext.java 10 Jun 2003 02:12:22 -0000 1.1
+++ StandardContext.java 18 Aug 2003 17:02:37 -0000 1.2
@@ -69,7 +69,7 @@
{
public static final String NAME_KEY = "urn:avalon:name";
public static final String PARTITION_KEY = "urn:avalon:partition";
- public static final String WORKING_KEY = "urn:avalon:work";
+ public static final String WORKING_KEY = "urn:avalon:temp";
public static final String HOME_KEY = "urn:avalon:home";
/**
@@ -90,7 +90,7 @@
File getHomeDirectory();
/**
- * @return a file representing the working directory
+ * @return a file representing the temporary working directory
*/
File getWorkingDirectory();
1.2 +1 -1
avalon-sandbox/merlin/merlin-platform/tutorials/contextualization/src/java/tutorial/StandardContext.xservice
Index: StandardContext.xservice
===================================================================
RCS file:
/home/cvs/avalon-sandbox/merlin/merlin-platform/tutorials/contextualization/src/java/tutorial/StandardContext.xservice,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- StandardContext.xservice 10 Jun 2003 02:12:22 -0000 1.1
+++ StandardContext.xservice 18 Aug 2003 17:02:37 -0000 1.2
@@ -19,7 +19,7 @@
<entry key="urn:avalon:name"/>
<entry key="urn:avalon:partition"/>
<entry key="urn:avalon:home" type="java.io.File"/>
- <entry key="urn:avalon:work" type="java.io.File"/>
+ <entry key="urn:avalon:temp" type="java.io.File"/>
</entries>
</service>
1.2 +1 -1
avalon-sandbox/merlin/merlin-platform/tutorials/mixed/src/java/tutorial/DemoContextProvider.java
Index: DemoContextProvider.java
===================================================================
RCS file:
/home/cvs/avalon-sandbox/merlin/merlin-platform/tutorials/mixed/src/java/tutorial/DemoContextProvider.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- DemoContextProvider.java 10 Jun 2003 02:12:25 -0000 1.1
+++ DemoContextProvider.java 18 Aug 2003 17:02:37 -0000 1.2
@@ -85,7 +85,7 @@
{
try
{
- return (File) super.get( "urn:avalon:work" );
+ return (File) super.get( "urn:avalon:temp" );
}
catch( ContextException ce )
{
1.3 +2 -2
avalon-sandbox/merlin/merlin-platform/tutorials/mixed/src/java/tutorial/HelloComponent.java
Index: HelloComponent.java
===================================================================
RCS file:
/home/cvs/avalon-sandbox/merlin/merlin-platform/tutorials/mixed/src/java/tutorial/HelloComponent.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- HelloComponent.java 22 Jul 2003 08:57:59 -0000 1.2
+++ HelloComponent.java 18 Aug 2003 17:02:37 -0000 1.3
@@ -37,7 +37,7 @@
*
* @avalon.meta.context type="tutorial.DemoContext"
* @avalon.meta.entry key="urn:avalon:home" type="java.io.File"
- * @avalon.meta.entry key="urn:avalon:work" type="java.io.File"
+ * @avalon.meta.entry key="urn:avalon:temp" type="java.io.File"
* @avalon.meta.entry key="urn:avalon:name" type="java.lang.String"
* @avalon.meta.entry key="urn:avalon:partition" type="java.lang.String"
* @avalon.meta.entry key="cruncher" type="tutorial.NumberCruncher"
optional="true"
@@ -49,7 +49,7 @@
try
{
m_home = (File) context.get( "urn:avalon:home" );
- m_temp = (File) context.get( "urn:avalon:work" );
+ m_temp = (File) context.get( "urn:avalon:temp" );
m_name = (String) context.get( "urn:avalon:name" );
m_partition = (String) context.get( "urn:avalon:partition" );
1.4 +1 -1
avalon-sandbox/merlin/merlin-platform/xdocs/starting/tutorial/context/casting.xml
Index: casting.xml
===================================================================
RCS file:
/home/cvs/avalon-sandbox/merlin/merlin-platform/xdocs/starting/tutorial/context/casting.xml,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- casting.xml 17 Aug 2003 04:54:04 -0000 1.3
+++ casting.xml 18 Aug 2003 17:02:37 -0000 1.4
@@ -188,7 +188,7 @@
{
try
{
- return (File) super.get( "urn:avalon:work" );
+ return (File) super.get( "urn:avalon:temp" );
}
catch( ContextException ce )
{
1.2 +3 -3
avalon-sandbox/merlin/merlin-platform/xdocs/starting/tutorial/context/standard.xml
Index: standard.xml
===================================================================
RCS file:
/home/cvs/avalon-sandbox/merlin/merlin-platform/xdocs/starting/tutorial/context/standard.xml,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- standard.xml 10 Jun 2003 02:14:37 -0000 1.1
+++ standard.xml 18 Aug 2003 17:02:37 -0000 1.2
@@ -38,8 +38,8 @@
<td>The working directory.</td>
</tr>
<tr>
- <td>urn:avalon:work</td><td>java.io.File</td>
- <td>The temporary directory that will be destoryed at the
+ <td>urn:avalon:temp</td><td>java.io.File</td>
+ <td>The temporary directory that will be destroyed at the
end of the session.</td>
</tr>
<tr>
@@ -92,7 +92,7 @@
throws ContextException
{
m_home = (File) context.get( "urn:avalon:home" );
- m_temp = (File) context.get( "urn:avalon:work" );
+ m_temp = (File) context.get( "urn:avalon:temp" );
m_name = (String) context.get( "urn:avalon:name" );
m_partition = (String) context.get( "urn:avalon:partition" );
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
