mcconnell 2004/05/16 00:06:00
Modified: merlin external.xml maven.xml project.xml
merlin/impl project.xml
merlin/site/xdocs/starting/installation cvs.xml index.xml
install.3.3.xml navigation.xml
merlin/site/xdocs/starting/tutorial creation.xml
execution.xml internal.xml
Log:
Add notice file handling and prep for 3.3.0 release.
Revision Changes Path
1.16 +6 -5 avalon/merlin/external.xml
Index: external.xml
===================================================================
RCS file: /home/cvs/avalon/merlin/external.xml,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -r1.15 -r1.16
--- external.xml 8 May 2004 18:24:17 -0000 1.15
+++ external.xml 16 May 2004 07:06:00 -0000 1.16
@@ -178,14 +178,15 @@
</dependency>
<dependency>
+ <groupId>&excalibur-lifecycle-id;</groupId>
+ <artifactId>&excalibur-lifecycle-api-id;</artifactId>
+ <version>&excalibur-lifecycle-api-version;</version>
+ </dependency>
+
+ <dependency>
<groupId>excalibur-configuration</groupId>
<artifactId>excalibur-configuration</artifactId>
<version>1.2</version>
- </dependency>
- <dependency>
- <groupId>excalibur-lifecycle</groupId>
- <artifactId>excalibur-lifecycle-api</artifactId>
- <version>1.1</version>
</dependency>
<dependency>
<groupId>xerces</groupId>
1.87 +3 -2 avalon/merlin/maven.xml
Index: maven.xml
===================================================================
RCS file: /home/cvs/avalon/merlin/maven.xml,v
retrieving revision 1.86
retrieving revision 1.87
diff -u -r1.86 -r1.87
--- maven.xml 8 May 2004 18:24:17 -0000 1.86
+++ maven.xml 16 May 2004 07:06:00 -0000 1.87
@@ -257,8 +257,9 @@
<fileset dir="${basedir}/cli/src">
<include name="config/**/*"/>
</fileset>
- <fileset dir="${basedir}">
- <include name="LICENSE.txt"/>
+ <fileset dir="${avalon.buildsystem}/site">
+ <include name="LICENSE*"/>
+ <include name="NOTICE*"/>
</fileset>
</ant:copy>
<ant:fixcrlf eol="crlf" srcdir="${merlin.build.dir}">
1.35 +3 -2 avalon/merlin/project.xml
Index: project.xml
===================================================================
RCS file: /home/cvs/avalon/merlin/project.xml,v
retrieving revision 1.34
retrieving revision 1.35
diff -u -r1.34 -r1.35
--- project.xml 26 Apr 2004 04:49:09 -0000 1.34
+++ project.xml 16 May 2004 07:06:00 -0000 1.35
@@ -170,9 +170,10 @@
</includes>
</resource>
<resource>
- <directory>${basedir}/../</directory>
+ <directory>${avalon.buildsystem}/site</directory>
<includes>
- <include>LICENSE.txt</include>
+ <include>LICENSE*</include>
+ <include>NOTICE*</include>
</includes>
</resource>
<resource>
1.36 +3 -3 avalon/merlin/impl/project.xml
Index: project.xml
===================================================================
RCS file: /home/cvs/avalon/merlin/impl/project.xml,v
retrieving revision 1.35
retrieving revision 1.36
diff -u -r1.35 -r1.36
--- project.xml 9 Apr 2004 12:11:49 -0000 1.35
+++ project.xml 16 May 2004 07:06:00 -0000 1.36
@@ -170,9 +170,9 @@
<!-- excalibur dependecies -->
<dependency>
- <groupId>excalibur-lifecycle</groupId>
- <artifactId>excalibur-lifecycle-api</artifactId>
- <version>1.1</version>
+ <groupId>&excalibur-lifecycle-id;</groupId>
+ <artifactId>&excalibur-lifecycle-api-id;</artifactId>
+ <version>&excalibur-lifecycle-api-version;</version>
<properties>
<avalon.classloader>api</avalon.classloader>
</properties>
1.5 +4 -0 avalon/merlin/site/xdocs/starting/installation/cvs.xml
Index: cvs.xml
===================================================================
RCS file: /home/cvs/avalon/merlin/site/xdocs/starting/installation/cvs.xml,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- cvs.xml 19 Apr 2004 10:50:42 -0000 1.4
+++ cvs.xml 16 May 2004 07:06:00 -0000 1.5
@@ -58,6 +58,10 @@
$ maven
$ cd ../logging
$ maven
+$ cd ../composition
+$ maven
+$ cd ../activation
+$ maven
$ cd ../merlin
$ maven
]]></source>
1.5 +6 -7 avalon/merlin/site/xdocs/starting/installation/index.xml
Index: index.xml
===================================================================
RCS file: /home/cvs/avalon/merlin/site/xdocs/starting/installation/index.xml,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- index.xml 16 Apr 2004 13:42:48 -0000 1.4
+++ index.xml 16 May 2004 07:06:00 -0000 1.5
@@ -33,17 +33,16 @@
<td>Instructions for building an installation from CVS.</td>
</tr>
<tr>
- <td><a href="install.3.3.html">Merlin 3.3 (dev) installation
procedure for the
- latest development snapshot release.</a></td>
- <td>Installation instructions for Merlin 3.2.</td>
+ <td><a href="install.3.3.html">Merlin 3.3.0</a></td>
+ <td>Merlin 3.3.0 installation procedure.</td>
</tr>
<tr>
- <td><a href="install.3.2.html">Merlin 3.2.5 (released)
installation procedure.</a></td>
- <td>Installation instructions for Merlin 3.2.</td>
+ <td><a href="install.3.2.html">Merlin 3.2.5</a></td>
+ <td>Merlin 3.2.5 installation procedure.</td>
</tr>
<tr>
- <td><a href="install.3.0.html">Merlin 3.0 Installation</a></td>
- <td>Installation instructions for Merlin 3.0.</td>
+ <td><a href="install.3.0.html">Merlin 3.0.0</a></td>
+ <td>Merlin 3.0 Installation</td>
</tr>
</table>
</section>
1.4 +1 -1
avalon/merlin/site/xdocs/starting/installation/install.3.3.xml
Index: install.3.3.xml
===================================================================
RCS file:
/home/cvs/avalon/merlin/site/xdocs/starting/installation/install.3.3.xml,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- install.3.3.xml 19 Apr 2004 10:50:42 -0000 1.3
+++ install.3.3.xml 16 May 2004 07:06:00 -0000 1.4
@@ -19,7 +19,7 @@
<document>
<header>
- <title>Installation - Merlin 3.3</title>
+ <title>Installation - Merlin 3.3.0</title>
<authors>
<person name="Stephen McConnell" email="[EMAIL PROTECTED]"/>
</authors>
1.13 +3 -3
avalon/merlin/site/xdocs/starting/installation/navigation.xml
Index: navigation.xml
===================================================================
RCS file:
/home/cvs/avalon/merlin/site/xdocs/starting/installation/navigation.xml,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -r1.12 -r1.13
--- navigation.xml 16 Apr 2004 13:42:48 -0000 1.12
+++ navigation.xml 16 May 2004 07:06:00 -0000 1.13
@@ -36,9 +36,9 @@
<item name="Getting Started" href="/starting/index.html">
<item name="Installation" href="/starting/installation/index.html">
<item name="CVS" href="/starting/installation/cvs.html"/>
- <item name="3.0" href="/starting/installation/install.3.0.html"/>
- <item name="3.2.5 (current)"
href="/starting/installation/install.3.2.html"/>
- <item name="3.3 (dev)"
href="/starting/installation/install.3.3.html"/>
+ <item name="3.3.0" href="/starting/installation/install.3.3.html"/>
+ <item name="3.2.5" href="/starting/installation/install.3.2.html"/>
+ <item name="3.0.0" href="/starting/installation/install.3.0.html"/>
</item>
<item name="Using Merlin" href="/starting/tutorial/index.html"/>
<item name="Advanced Features" href="/starting/advanced/index.html"/>
1.5 +1 -56 avalon/merlin/site/xdocs/starting/tutorial/creation.xml
Index: creation.xml
===================================================================
RCS file: /home/cvs/avalon/merlin/site/xdocs/starting/tutorial/creation.xml,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- creation.xml 19 Apr 2004 10:43:14 -0000 1.4
+++ creation.xml 16 May 2004 07:06:00 -0000 1.5
@@ -48,7 +48,6 @@
package tutorial;
import org.apache.avalon.framework.logger.Logger;
-import org.apache.avalon.framework.activity.Disposable;
/**
* A sample component.
@@ -57,22 +56,10 @@
* version="1.0"
* name="hello"
* lifestyle="singleton"
- * @avalon.service type="tutorial.Hello"
*/
public class HelloComponent
- implements Hello, Disposable
{
//-------------------------------------------------------
- // immutable state
- //-------------------------------------------------------
-
- /**
- * Internal reference to the logging channel supplied to us
- * by the container.
- */
- private final Logger m_logger;
-
- //-------------------------------------------------------
// constructor
//-------------------------------------------------------
@@ -83,46 +70,7 @@
*/
public HelloComponent( Logger logger )
{
- m_logger = logger;
- m_logger.info( "instantiated" );
- }
-
- //-------------------------------------------------------
- // Hello service implementation
- //-------------------------------------------------------
-
- /**
- * The hello service implementation.
- */
- public void sayHello()
- {
- getLogger().info( "HELLO" );
- }
-
- //-------------------------------------------------------
- // Disposable lifecycle interface
- //-------------------------------------------------------
-
- /**
- * Component disposal trigger by the container during which
- * the component will release consumed resources.
- */
- public void dispose()
- {
- getLogger().info( "disposal" );
- }
-
- //-------------------------------------------------------
- // internal utilities
- //-------------------------------------------------------
-
- /**
- * Return the logging channel assigned to us by the container.
- * @return the logging channel
- */
- private Logger getLogger()
- {
- return m_logger;
+ m_logger.info( "Hello World" );
}
}
]]></source>
@@ -164,9 +112,6 @@
<lifestyle>singleton</lifestyle>
<collection>hard</collection>
</info>
- <services>
- <service type="tutorial.Hello"/>
- </services>
</type>
]]></source>
1.4 +1 -2 avalon/merlin/site/xdocs/starting/tutorial/execution.xml
Index: execution.xml
===================================================================
RCS file: /home/cvs/avalon/merlin/site/xdocs/starting/tutorial/execution.xml,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- execution.xml 19 Apr 2004 10:43:14 -0000 1.3
+++ execution.xml 16 May 2004 07:06:00 -0000 1.4
@@ -60,8 +60,7 @@
</p>
<source><![CDATA[
-[INFO ] (tutorial.hello): instantiated
-[INFO ] (tutorial.hello): disposal
+[INFO ] (tutorial.hello): Hello World!
]]></source>
<p>
1.7 +5 -23 avalon/merlin/site/xdocs/starting/tutorial/internal.xml
Index: internal.xml
===================================================================
RCS file: /home/cvs/avalon/merlin/site/xdocs/starting/tutorial/internal.xml,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- internal.xml 19 Apr 2004 10:43:14 -0000 1.6
+++ internal.xml 16 May 2004 07:06:00 -0000 1.7
@@ -73,11 +73,7 @@
${merlin.deployment} == file:/${user.dir}/target/classes/
-----------------------------------------------------------
-[INFO ] (kernel): building application model
-[INFO ] (kernel): install phase
-[INFO ] (kernel): installing: file:/${user.dir}/target/classes/
-[INFO ] (tutorial.hello): instantiated
-[INFO ] (tutorial.hello): disposal
+[INFO ] (tutorial.hello): Hello World!
]]></source>
</subsection>
@@ -108,12 +104,12 @@
[DEBUG ] (tutorial): commissioning component [hello]
[DEBUG ] (tutorial.hello.lifecycle): incarnation
[DEBUG ] (tutorial.hello.lifecycle): instantiating component with 1
arguments.
-[INFO ] (tutorial.hello): instantiated
+[INFO ] (tutorial.hello): Hello World!
[DEBUG ] (tutorial): commissioning of [hello] completed in 93 milliseconds
[DEBUG ] (tutorial): decommissioning
[DEBUG ] (tutorial.hello.lifecycle): etherialization
[DEBUG ] (tutorial.hello.lifecycle): applying disposal
-[INFO ] (tutorial.hello): disposal
+[DEBUG ] (tutorial.hello): disposal
]]></source>
<p>
@@ -159,7 +155,7 @@
<source><![CDATA[
[DEBUG ] (tutorial.hello.lifecycle): incarnation
[DEBUG ] (tutorial.hello.lifecycle): instantiating component with 1
arguments.
-[INFO ] (tutorial.hello): instantiated
+[INFO ] (tutorial.hello): Hello World!
]]></source>
<p>
@@ -188,18 +184,6 @@
<source><![CDATA[
[DEBUG ] (tutorial): decommissioning
[DEBUG ] (tutorial.hello.lifecycle): etherialization
-[DEBUG ] (tutorial.hello.lifecycle): applying disposal
-]]></source>
-
- <p>
- The hello component implements the Disposable lifecycle
- interface and the following log entry raised by the
- component signals that it has completed it's own end-of-life
- processing.
- </p>
-
-<source><![CDATA[
-[INFO ] (tutorial.hello): disposal
]]></source>
</subsection>
@@ -265,7 +249,7 @@
[DEBUG ] (tutorial): commissioning component [hello]
[DEBUG ] (tutorial.hello.lifecycle): incarnation
[DEBUG ] (tutorial.hello.lifecycle): instantiating component with 1
arguments.
-[INFO ] (tutorial.hello): instantiated
+[INFO ] (tutorial.hello): Hello World
[DEBUG ] (tutorial): commissioning of [hello] completed in 94 milliseconds
[DEBUG ] (): commissioning of [tutorial] completed in 156 milliseconds
[DEBUG ] (kernel): state: started
@@ -275,8 +259,6 @@
[DEBUG ] (): decommissioning
[DEBUG ] (tutorial): decommissioning
[DEBUG ] (tutorial.hello.lifecycle): etherialization
-[DEBUG ] (tutorial.hello.lifecycle): applying disposal
-[INFO ] (tutorial.hello): disposal
[DEBUG ] (kernel): state: stopped
[DEBUG ] (kernel): disposal
[DEBUG ] (kernel): shutdown event
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
