mcconnell 2004/05/06 14:02:30
Modified: activation/impl/src/java/org/apache/avalon/activation/impl
DefaultComponentFactory.java
merlin/site/xdocs/reference/system/kernel index.xml
tutorials/parameterization/src/java/tutorial
HelloComponent.java
versioning avalon-merlin.ent
Log:
Housekeeping.
Revision Changes Path
1.13 +6 -2
avalon/activation/impl/src/java/org/apache/avalon/activation/impl/DefaultComponentFactory.java
Index: DefaultComponentFactory.java
===================================================================
RCS file:
/home/cvs/avalon/activation/impl/src/java/org/apache/avalon/activation/impl/DefaultComponentFactory.java,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -r1.12 -r1.13
--- DefaultComponentFactory.java 19 Apr 2004 10:49:50 -0000 1.12
+++ DefaultComponentFactory.java 6 May 2004 21:02:30 -0000 1.13
@@ -405,7 +405,7 @@
if( Startable.class.isAssignableFrom( clazz ) )
{
- getLogger().debug( "applying statup" );
+ getLogger().debug( "applying startup" );
if( m_secure )
{
AccessController.doPrivileged(
@@ -423,6 +423,7 @@
{
ContainerUtil.start( instance );
}
+ getLogger().debug( "component startup completed" );
}
else if( Executable.class.isAssignableFrom( clazz ) )
{
@@ -444,6 +445,7 @@
{
ContainerUtil.execute( instance );
}
+ getLogger().debug( "component execution completed" );
}
}
catch( Throwable e )
@@ -454,6 +456,8 @@
m_model.getQualifiedName() );
throw new LifecycleException( error, e );
}
+
+ getLogger().debug( "incarnation complete" );
return instance;
}
1.3 +2 -2
avalon/merlin/site/xdocs/reference/system/kernel/index.xml
Index: index.xml
===================================================================
RCS file:
/home/cvs/avalon/merlin/site/xdocs/reference/system/kernel/index.xml,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- index.xml 5 May 2004 13:38:06 -0000 1.2
+++ index.xml 6 May 2004 21:02:30 -0000 1.3
@@ -66,8 +66,8 @@
<repository>
<hosts>
- <host>http://dpml.net</host>
- <host>http://ibiblio.org/maven/</host>
+ <host>http://www.dpml.net</host>
+ <host>http://www.ibiblio.org/maven/</host>
</hosts>
</repository>
1.3 +1 -1
avalon/tutorials/parameterization/src/java/tutorial/HelloComponent.java
Index: HelloComponent.java
===================================================================
RCS file:
/home/cvs/avalon/tutorials/parameterization/src/java/tutorial/HelloComponent.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- HelloComponent.java 24 Jan 2004 23:25:35 -0000 1.2
+++ HelloComponent.java 6 May 2004 21:02:30 -0000 1.3
@@ -65,7 +65,7 @@
getLogger().info( "execution" );
m_color = params.getParameter( "color" );
m_size = params.getParameter( "size" );
- }
+ }
/**
* Initialization of the component by the container.
1.10 +1 -1 avalon/versioning/avalon-merlin.ent
Index: avalon-merlin.ent
===================================================================
RCS file: /home/cvs/avalon/versioning/avalon-merlin.ent,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- avalon-merlin.ent 1 May 2004 17:03:44 -0000 1.9
+++ avalon-merlin.ent 6 May 2004 21:02:30 -0000 1.10
@@ -47,7 +47,7 @@
<!ENTITY merlin-id "merlin">
<!ENTITY merlin-spec "3.3">
-<!ENTITY merlin-product-version "3.3-RC1">
+<!ENTITY merlin-product-version "3.3-RC4">
<!ENTITY merlin-api-id "merlin-api">
<!ENTITY merlin-api-version "3.3.0">
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
