mcconnell 2004/05/16 02:02:57
Modified: . project.xml
tutorials/hello/src/java/tutorial HelloComponent.java
versioning avalon-excalibur.ent avalon-framework.ent
avalon-logging.ent avalon-logkit.ent
avalon-merlin.ent avalon-meta.ent
avalon-repository.ent avalon-util.ent
Removed: tutorials/hello/src/java/tutorial Hello.java
Log:
Add notice file, prepare activation, composition and merlin for final release.
Revision Changes Path
1.12 +2 -1 avalon/project.xml
Index: project.xml
===================================================================
RCS file: /home/cvs/avalon/project.xml,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- project.xml 8 May 2004 18:24:17 -0000 1.11
+++ project.xml 16 May 2004 09:02:56 -0000 1.12
@@ -307,9 +307,10 @@
</includes>
</resource>
<resource>
- <directory>${basedir}/../</directory>
+ <directory>${avalon.buildsystem}/site</directory>
<includes>
<include>LICENSE.txt</include>
+ <include>NOTICE.TXT</include>
</includes>
</resource>
<resource>
1.6 +1 -54
avalon/tutorials/hello/src/java/tutorial/HelloComponent.java
Index: HelloComponent.java
===================================================================
RCS file:
/home/cvs/avalon/tutorials/hello/src/java/tutorial/HelloComponent.java,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- HelloComponent.java 22 Apr 2004 00:15:06 -0000 1.5
+++ HelloComponent.java 16 May 2004 09:02:56 -0000 1.6
@@ -18,7 +18,6 @@
package tutorial;
import org.apache.avalon.framework.logger.Logger;
-import org.apache.avalon.framework.activity.Disposable;
/**
* A sample component.
@@ -27,22 +26,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
//-------------------------------------------------------
@@ -53,46 +40,6 @@
*/
public HelloComponent( Logger logger )
{
- m_logger = logger;
- m_logger.info( "instantiated" );
- }
-
- //-------------------------------------------------------
- // Hello service implementation
- //-------------------------------------------------------
-
- /**
- * The hello service implementation.
- */
- public void sayHello()
- {
- getLogger().info( "HELLO" );
+ m_logger.info( "Hello World" );
}
-
- //-------------------------------------------------------
- // 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;
- }
-
}
1.2 +11 -10 avalon/versioning/avalon-excalibur.ent
Index: avalon-excalibur.ent
===================================================================
RCS file: /home/cvs/avalon/versioning/avalon-excalibur.ent,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- avalon-excalibur.ent 6 Apr 2004 07:33:09 -0000 1.1
+++ avalon-excalibur.ent 16 May 2004 09:02:56 -0000 1.2
@@ -21,7 +21,7 @@
<!ENTITY excalibur-datasource-id "excalibur-datasource">
<!ENTITY excalibur-datasource-group "excalibur-datasource">
-<!ENTITY excalibur-datasource-version "1.2">
+<!ENTITY excalibur-datasource-version "1.2.0">
<!ENTITY excalibur-event-api-id "excalibur-event-api">
<!ENTITY excalibur-event-api-group "excalibur-event">
@@ -47,13 +47,14 @@
<!ENTITY excalibur-instrument-manager-group "excalibur-instrument">
<!ENTITY excalibur-instrument-manager-version "1.2">
+<!ENTITY excalibur-lifecycle-id "excalibur-lifecycle">
<!ENTITY excalibur-lifecycle-api-id "excalibur-lifecycle-api">
<!ENTITY excalibur-lifecycle-api-group "excalibur-lifecycle">
-<!ENTITY excalibur-lifecycle-api-version "1.1">
+<!ENTITY excalibur-lifecycle-api-version "1.1.0">
<!ENTITY excalibur-lifecycle-impl-id "excalibur-lifecycle-impl">
<!ENTITY excalibur-lifecycle-impl-group "excalibur-lifecycle">
-<!ENTITY excalibur-lifecycle-impl-version "1.1">
+<!ENTITY excalibur-lifecycle-impl-version "1.1.0">
<!ENTITY excalibur-logger-id "excalibur-logger">
<!ENTITY excalibur-logger-group "excalibur-logger">
@@ -69,19 +70,19 @@
<!ENTITY excalibur-pool-api-id "excalibur-pool-api">
<!ENTITY excalibur-pool-api-group "excalibur-pool">
-<!ENTITY excalibur-pool-api-version "2.0">
+<!ENTITY excalibur-pool-api-version "2.0.0">
<!ENTITY excalibur-pool-impl-id "excalibur-pool-impl">
<!ENTITY excalibur-pool-impl-group "excalibur-pool">
-<!ENTITY excalibur-pool-impl-version "2.0">
+<!ENTITY excalibur-pool-impl-version "2.0.0">
<!ENTITY excalibur-pool-instrumented-id "excalibur-pool-instrumented">
<!ENTITY excalibur-pool-instrumented-group "excalibur-pool">
-<!ENTITY excalibur-pool-instrumented-version "2.0">
+<!ENTITY excalibur-pool-instrumented-version "2.0.0">
<!ENTITY excalibur-sourceresolve-id "excalibur-sourceresolve">
<!ENTITY excalibur-sourceresolve-group "excalibur-sourceresolve">
-<!ENTITY excalibur-sourceresolve-version "1.2">
+<!ENTITY excalibur-sourceresolve-version "1.2.0">
<!ENTITY excalibur-store-id "excalibur-store">
<!ENTITY excalibur-store-group "excalibur-store">
@@ -93,15 +94,15 @@
<!ENTITY excalibur-thread-api-id "excalibur-thread-api">
<!ENTITY excalibur-thread-api-group "excalibur-thread">
-<!ENTITY excalibur-thread-api-version "2.0">
+<!ENTITY excalibur-thread-api-version "2.0.0">
<!ENTITY excalibur-thread-impl-id "excalibur-thread-impl">
<!ENTITY excalibur-thread-impl-group "excalibur-thread">
-<!ENTITY excalibur-thread-impl-version "2.0">
+<!ENTITY excalibur-thread-impl-version "2.0.0">
<!ENTITY excalibur-thread-instrumented-id "excalibur-thread-instrumented">
<!ENTITY excalibur-thread-instrumented-group "excalibur-thread">
-<!ENTITY excalibur-thread-instrumented-version "2.0">
+<!ENTITY excalibur-thread-instrumented-version "2.0.0">
<!ENTITY excalibur-xmlutil-id "excalibur-xmlutil">
<!ENTITY excalibur-xmlutil-group "excalibur-xmlutil">
1.7 +1 -1 avalon/versioning/avalon-framework.ent
Index: avalon-framework.ent
===================================================================
RCS file: /home/cvs/avalon/versioning/avalon-framework.ent,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- avalon-framework.ent 8 May 2004 18:24:18 -0000 1.6
+++ avalon-framework.ent 16 May 2004 09:02:56 -0000 1.7
@@ -1,6 +1,6 @@
<!ENTITY avalon-framework-id "avalon-framework">
-<!ENTITY avalon-framework-suffix "RC2">
+<!ENTITY avalon-framework-suffix "final">
<!ENTITY avalon-framework-version "4.2.0">
<!ENTITY avalon-framework-api-id "avalon-framework-api">
1.9 +1 -1 avalon/versioning/avalon-logging.ent
Index: avalon-logging.ent
===================================================================
RCS file: /home/cvs/avalon/versioning/avalon-logging.ent,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- avalon-logging.ent 11 May 2004 07:58:33 -0000 1.8
+++ avalon-logging.ent 16 May 2004 09:02:56 -0000 1.9
@@ -16,7 +16,7 @@
-->
<!ENTITY avalon-logging-id "avalon-logging">
-<!ENTITY avalon-logging-version "1.0-RC2">
+<!ENTITY avalon-logging-version "1.0.0">
<!ENTITY avalon-logging-api-id "avalon-logging-api">
<!ENTITY avalon-logging-api-version "1.0.0">
1.5 +1 -1 avalon/versioning/avalon-logkit.ent
Index: avalon-logkit.ent
===================================================================
RCS file: /home/cvs/avalon/versioning/avalon-logkit.ent,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- avalon-logkit.ent 18 Apr 2004 14:21:32 -0000 1.4
+++ avalon-logkit.ent 16 May 2004 09:02:56 -0000 1.5
@@ -1,5 +1,5 @@
<!ENTITY avalon-logkit-group "avalon-logkit">
<!ENTITY avalon-logkit-id "avalon-logkit">
-<!ENTITY avalon-logkit-version "2.0">
+<!ENTITY avalon-logkit-version "2.0.0">
1.13 +1 -1 avalon/versioning/avalon-merlin.ent
Index: avalon-merlin.ent
===================================================================
RCS file: /home/cvs/avalon/versioning/avalon-merlin.ent,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -r1.12 -r1.13
--- avalon-merlin.ent 9 May 2004 23:51:08 -0000 1.12
+++ avalon-merlin.ent 16 May 2004 09:02:56 -0000 1.13
@@ -47,7 +47,7 @@
<!ENTITY merlin-id "merlin">
<!ENTITY merlin-spec "3.3">
-<!ENTITY merlin-product-version "3.3-RC6">
+<!ENTITY merlin-product-version "3.3.0">
<!ENTITY merlin-api-id "merlin-api">
<!ENTITY merlin-api-version "3.3.0">
1.5 +1 -1 avalon/versioning/avalon-meta.ent
Index: avalon-meta.ent
===================================================================
RCS file: /home/cvs/avalon/versioning/avalon-meta.ent,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- avalon-meta.ent 30 Apr 2004 15:53:37 -0000 1.4
+++ avalon-meta.ent 16 May 2004 09:02:56 -0000 1.5
@@ -1,5 +1,5 @@
<!ENTITY avalon-meta-id "avalon-meta">
-<!ENTITY avalon-meta-version "1.4-RC1">
+<!ENTITY avalon-meta-version "1.4.0">
<!ENTITY avalon-meta-api-id "avalon-meta-api">
<!ENTITY avalon-meta-api-version "1.4.0">
1.7 +1 -1 avalon/versioning/avalon-repository.ent
Index: avalon-repository.ent
===================================================================
RCS file: /home/cvs/avalon/versioning/avalon-repository.ent,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- avalon-repository.ent 11 May 2004 07:58:33 -0000 1.6
+++ avalon-repository.ent 16 May 2004 09:02:56 -0000 1.7
@@ -1,5 +1,5 @@
<!ENTITY avalon-repository-id "avalon-repository">
-<!ENTITY avalon-repository-version "2.0-RC2">
+<!ENTITY avalon-repository-version "2.0.0">
<!ENTITY avalon-repository-api-id "avalon-repository-api">
<!ENTITY avalon-repository-api-version "2.0.0">
1.8 +4 -1 avalon/versioning/avalon-util.ent
Index: avalon-util.ent
===================================================================
RCS file: /home/cvs/avalon/versioning/avalon-util.ent,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- avalon-util.ent 30 Apr 2004 15:53:37 -0000 1.7
+++ avalon-util.ent 16 May 2004 09:02:56 -0000 1.8
@@ -1,6 +1,6 @@
<!ENTITY avalon-util-id "avalon-util">
-<!ENTITY avalon-util-version "1.2-RC1">
+<!ENTITY avalon-util-version "1.2.0">
<!ENTITY avalon-util-criteria-id "avalon-util-criteria">
<!ENTITY avalon-util-criteria-version "1.1.0">
@@ -25,4 +25,7 @@
<!ENTITY avalon-util-plugin-id "avalon-util-plugin">
<!ENTITY avalon-util-plugin-version "1.0.0">
+
+<!ENTITY avalon-util-configuration-id "avalon-util-configuration">
+<!ENTITY avalon-util-configuration-version "1.0.0">
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
