avalon-cvs mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From mcconn...@apache.org
Subject cvs commit: avalon/versioning versions.ent
Date Thu, 22 Apr 2004 00:15:06 GMT
mcconnell    2004/04/21 17:15:06

  Modified:    activation/api index.ent
               activation/impl index.ent
               .        build.xml maven.xml
               composition/api index.ent
               composition/impl index.ent
               composition/spi index.ent
               maven-plugins maven.xml project.properties
               merlin/api index.ent
               merlin/cli index.ent
               merlin   external.xml index.ent maven.xml project.properties
               merlin/impl index.ent
               merlin/plugin index.ent
               merlin/servlet index.ent
               merlin/site/xdocs/starting/tutorial/config configurable.xml
               merlin/unit index.ent
               tutorials/configuration/injection/src/java/tutorial
                        HelloComponent.java
               tutorials/context/strategy index.ent
               tutorials/dynamics index.ent
               tutorials/hello/conf block.xml config.xml
               tutorials/hello/src/java/tutorial HelloComponent.java
               tutorials index.ent
               tutorials/jmx index.ent
               tutorials/lifecycle/activation index.ent
               tutorials/main index.ent
               tutorials/parameterization index.ent
               versioning versions.ent
  Log:
  Updates enabling clean build from root avalon.
  
  Revision  Changes    Path
  1.5       +1 -6      avalon/activation/api/index.ent
  
  Index: index.ent
  ===================================================================
  RCS file: /home/cvs/avalon/activation/api/index.ent,v
  retrieving revision 1.4
  retrieving revision 1.5
  diff -u -r1.4 -r1.5
  --- index.ent	18 Apr 2004 11:26:43 -0000	1.4
  +++ index.ent	22 Apr 2004 00:15:04 -0000	1.5
  @@ -1,6 +1 @@
  -<!ENTITY % merlin-entities SYSTEM "file:../../versioning/avalon-merlin.ent"> %merlin-entities;
  -<!ENTITY % framework-entities SYSTEM "file:../../versioning/avalon-framework.ent">
%framework-entities;
  -<!ENTITY % meta-entities SYSTEM "file:../../versioning/avalon-meta.ent"> %meta-entities;
  -<!ENTITY % util-entities SYSTEM "file:../../versioning/avalon-util.ent"> %util-entities;
  -<!ENTITY % repo-entities SYSTEM "file:../../versioning/avalon-repository.ent"> %repo-entities;
  -<!ENTITY % logging-entities SYSTEM "file:../../versioning/avalon-logging.ent"> %logging-entities;
  +<!ENTITY % versions SYSTEM "../../versioning/versions.ent"> %versions;
  
  
  
  1.8       +1 -6      avalon/activation/impl/index.ent
  
  Index: index.ent
  ===================================================================
  RCS file: /home/cvs/avalon/activation/impl/index.ent,v
  retrieving revision 1.7
  retrieving revision 1.8
  diff -u -r1.7 -r1.8
  --- index.ent	18 Apr 2004 11:26:43 -0000	1.7
  +++ index.ent	22 Apr 2004 00:15:04 -0000	1.8
  @@ -1,6 +1 @@
  -<!ENTITY % merlin-entities SYSTEM "file:../../versioning/avalon-merlin.ent"> %merlin-entities;
  -<!ENTITY % util-entities SYSTEM "file:../../versioning/avalon-util.ent"> %util-entities;
  -<!ENTITY % framework-entities SYSTEM "file:../../versioning/avalon-framework.ent">
%framework-entities;
  -<!ENTITY % meta-entities SYSTEM "file:../../versioning/avalon-meta.ent"> %meta-entities;
  -<!ENTITY % repo-entities SYSTEM "file:../../versioning/avalon-repository.ent"> %repo-entities;
  -<!ENTITY % logging-entities SYSTEM "file:../../versioning/avalon-logging.ent"> %logging-entities;
  +<!ENTITY % versions SYSTEM "../../versioning/versions.ent"> %versions;
  
  
  
  1.187     +1 -1      avalon/build.xml
  
  Index: build.xml
  ===================================================================
  RCS file: /home/cvs/avalon/build.xml,v
  retrieving revision 1.186
  retrieving revision 1.187
  diff -u -r1.186 -r1.187
  --- build.xml	13 Feb 2004 04:42:32 -0000	1.186
  +++ build.xml	22 Apr 2004 00:15:04 -0000	1.187
  @@ -35,7 +35,7 @@
         <arg line="${arg}" />
       </exec>
       <exec executable="cmd" os="Windows XP,Windows NT,Windows 2000" dir="${target}" failonerror="true">
  -      <arg line="maven.bat ${arg}" />
  +      <arg line="maven ${arg}" />
       </exec>
       <exec executable="command" os="Windows 95, Windows 98, Windows ME" dir="${target}"
failonerror="true">
         <arg line="maven.bat ${arg}" />
  
  
  
  1.7       +60 -9     avalon/maven.xml
  
  Index: maven.xml
  ===================================================================
  RCS file: /home/cvs/avalon/maven.xml,v
  retrieving revision 1.6
  retrieving revision 1.7
  diff -u -r1.6 -r1.7
  --- maven.xml	21 Apr 2004 23:10:18 -0000	1.6
  +++ maven.xml	22 Apr 2004 00:15:04 -0000	1.7
  @@ -15,30 +15,81 @@
       prereqs="xmeta,xutil,xrepo,xlogging,xcomposition,xactivation,xmerlin"/>
     -->
   
  -  <goal name="xall">
  +  <goal name="xutil">
       <maven:reactor basedir="${basedir}"
  -      includes="**/project.xml"
  -      excludes="merlin/project.xml,util/project.xml,meta/project.xml,repository/project.xml,logging/project.xml"
  +      includes="util/project.xml"
         banner="Building:"
  -      goals=""
  +      goals="avalon:build"
         ignoreFailures="false" 
         postProcessing="false" />
     </goal>
   
  -  <goal name="xutil">
  +  <goal name="xmeta">
       <maven:reactor basedir="${basedir}"
  -      includes="util/project.xml"
  +      includes="meta/project.xml"
         banner="Building:"
         goals="avalon:build"
         ignoreFailures="false" 
         postProcessing="false" />
     </goal>
   
  +  <goal name="xrepository">
  +    <maven:reactor basedir="${basedir}"
  +      includes="repository/project.xml"
  +      banner="Building:"
  +      goals="avalon:build"
  +      ignoreFailures="false" 
  +      postProcessing="false" />
  +  </goal>
   
  +  <goal name="xlogging">
  +    <maven:reactor basedir="${basedir}"
  +      includes="logging/project.xml"
  +      banner="Building:"
  +      goals="avalon:build"
  +      ignoreFailures="false" 
  +      postProcessing="false" />
  +  </goal>
   
  -  <goal name="xmeta">
  -    <maven:reactor basedir="meta"
  -      includes="project.xml"
  +  <goal name="xcomposition">
  +    <maven:reactor basedir="${basedir}"
  +      includes="composition/**/project.xml"
  +      banner="Building:"
  +      goals="jar:install"
  +      ignoreFailures="false" 
  +      postProcessing="false" />
  +  </goal>
  +
  +  <goal name="xactivation">
  +    <maven:reactor basedir="${basedir}"
  +      includes="activation/**/project.xml"
  +      banner="Building:"
  +      goals="jar:install"
  +      ignoreFailures="false" 
  +      postProcessing="false" />
  +  </goal>
  +
  +  <goal name="xmerlin">
  +    <maven:reactor basedir="${basedir}"
  +      includes="merlin/project.xml"
  +      banner="Building:"
  +      goals="avalon:build"
  +      ignoreFailures="false" 
  +      postProcessing="false" />
  +  </goal>
  +
  +  <goal name="xplugins">
  +    <maven:reactor basedir="${basedir}"
  +      includes="maven-plugins/project.xml"
  +      banner="Building:"
  +      goals="avalon:build"
  +      ignoreFailures="false" 
  +      postProcessing="false" />
  +  </goal>
  +
  +  <goal name="xtutorials">
  +    <maven:reactor basedir="${basedir}"
  +      includes="tutorials/project.xml"
         banner="Building:"
         goals="avalon:build"
         ignoreFailures="false" 
  
  
  
  1.8       +1 -6      avalon/composition/api/index.ent
  
  Index: index.ent
  ===================================================================
  RCS file: /home/cvs/avalon/composition/api/index.ent,v
  retrieving revision 1.7
  retrieving revision 1.8
  diff -u -r1.7 -r1.8
  --- index.ent	18 Apr 2004 11:13:42 -0000	1.7
  +++ index.ent	22 Apr 2004 00:15:04 -0000	1.8
  @@ -1,6 +1 @@
  -<!ENTITY % merlin-entities SYSTEM "file:../../versioning/avalon-merlin.ent"> %merlin-entities;
  -<!ENTITY % util-entities SYSTEM "file:../../versioning/avalon-util.ent"> %util-entities;
  -<!ENTITY % framework-entities SYSTEM "file:../../versioning/avalon-framework.ent">
%framework-entities;
  -<!ENTITY % meta-entities SYSTEM "file:../../versioning/avalon-meta.ent"> %meta-entities;
  -<!ENTITY % repo-entities SYSTEM "file:../../versioning/avalon-repository.ent"> %repo-entities;
  -<!ENTITY % logging-entities SYSTEM "file:../../versioning/avalon-logging.ent"> %logging-entities;
  +<!ENTITY % versions SYSTEM "../../versioning/versions.ent"> %versions;
  
  
  
  1.8       +1 -6      avalon/composition/impl/index.ent
  
  Index: index.ent
  ===================================================================
  RCS file: /home/cvs/avalon/composition/impl/index.ent,v
  retrieving revision 1.7
  retrieving revision 1.8
  diff -u -r1.7 -r1.8
  --- index.ent	18 Apr 2004 11:13:42 -0000	1.7
  +++ index.ent	22 Apr 2004 00:15:04 -0000	1.8
  @@ -1,6 +1 @@
  -<!ENTITY % merlin-entities SYSTEM "file:../../versioning/avalon-merlin.ent"> %merlin-entities;
  -<!ENTITY % util-entities SYSTEM "file:../../versioning/avalon-util.ent"> %util-entities;
  -<!ENTITY % framework-entities SYSTEM "file:../../versioning/avalon-framework.ent">
%framework-entities;
  -<!ENTITY % meta-entities SYSTEM "file:../../versioning/avalon-meta.ent"> %meta-entities;
  -<!ENTITY % repo-entities SYSTEM "file:../../versioning/avalon-repository.ent"> %repo-entities;
  -<!ENTITY % logging-entities SYSTEM "file:../../versioning/avalon-logging.ent"> %logging-entities;
  +<!ENTITY % versions SYSTEM "../../versioning/versions.ent"> %versions;
  
  
  
  1.8       +1 -6      avalon/composition/spi/index.ent
  
  Index: index.ent
  ===================================================================
  RCS file: /home/cvs/avalon/composition/spi/index.ent,v
  retrieving revision 1.7
  retrieving revision 1.8
  diff -u -r1.7 -r1.8
  --- index.ent	18 Apr 2004 11:13:42 -0000	1.7
  +++ index.ent	22 Apr 2004 00:15:04 -0000	1.8
  @@ -1,6 +1 @@
  -<!ENTITY % merlin-entities SYSTEM "file:../../versioning/avalon-merlin.ent"> %merlin-entities;
  -<!ENTITY % util-entities SYSTEM "file:../../versioning/avalon-util.ent"> %util-entities;
  -<!ENTITY % framework-entities SYSTEM "file:../../versioning/avalon-framework.ent">
%framework-entities;
  -<!ENTITY % meta-entities SYSTEM "file:../../versioning/avalon-meta.ent"> %meta-entities;
  -<!ENTITY % repo-entities SYSTEM "file:../../versioning/avalon-repository.ent"> %repo-entities;
  -<!ENTITY % logging-entities SYSTEM "file:../../versioning/avalon-logging.ent"> %logging-entities;
  +<!ENTITY % versions SYSTEM "../../versioning/versions.ent"> %versions;
  
  
  
  1.4       +11 -1     avalon/maven-plugins/maven.xml
  
  Index: maven.xml
  ===================================================================
  RCS file: /home/cvs/avalon/maven-plugins/maven.xml,v
  retrieving revision 1.3
  retrieving revision 1.4
  diff -u -r1.3 -r1.4
  --- maven.xml	18 Apr 2004 15:52:10 -0000	1.3
  +++ maven.xml	22 Apr 2004 00:15:04 -0000	1.4
  @@ -16,7 +16,17 @@
    limitations under the License.
    -->
   
  -<project default="multiproject:install" xmlns:util="jelly:util" xmlns:j="jelly:core"
xmlns:ant="jelly:ant">
  +<project default="avalon:build" xmlns:maven="jelly:maven" xmlns:util="jelly:util" xmlns:j="jelly:core"
xmlns:ant="jelly:ant">
  +
  +  <goal name="avalon:build">
  +    <maven:reactor basedir="${basedir}"
  +      includes="**/project.xml"
  +      excludes="project.xml,**/target/**/project.xml"
  +      banner="Installing:"
  +      goals="plugin:install"
  +      ignoreFailures="false" 
  +      postProcessing="false" />
  +  </goal>
   
     <postGoal name="multiproject:site-init">
       <ant:mkdir dir="${maven.build.dir}/docs/style"/>
  
  
  
  1.4       +3 -3      avalon/maven-plugins/project.properties
  
  Index: project.properties
  ===================================================================
  RCS file: /home/cvs/avalon/maven-plugins/project.properties,v
  retrieving revision 1.3
  retrieving revision 1.4
  diff -u -r1.3 -r1.4
  --- project.properties	18 Apr 2004 15:52:10 -0000	1.3
  +++ project.properties	22 Apr 2004 00:15:05 -0000	1.4
  @@ -29,9 +29,9 @@
   maven.xdoc.poweredby.image= 
   
   # Styles & License
  -maven.xdoc.jsl = file:///${basedir}/../buildsystem/site/site.jsl
  -maven.license.licenseFile = ${basedir}/../buildsystem/LICENSE.txt
  -maven.javadoc.stylesheet = ${basedir}/../buildsystem/site/stylesheet.css
  +maven.xdoc.jsl = file:///${avalon.buildsystem}/site/site.jsl
  +maven.license.licenseFile = ${avalon.buildsystem}/site/LICENSE.txt
  +maven.javadoc.stylesheet = ${avalon.buildsystem}/site/stylesheet.css
   
   #
   # Declaration of the remote links to assign on javadoc generation.
  
  
  
  1.7       +1 -7      avalon/merlin/api/index.ent
  
  Index: index.ent
  ===================================================================
  RCS file: /home/cvs/avalon/merlin/api/index.ent,v
  retrieving revision 1.6
  retrieving revision 1.7
  diff -u -r1.6 -r1.7
  --- index.ent	18 Apr 2004 12:59:46 -0000	1.6
  +++ index.ent	22 Apr 2004 00:15:05 -0000	1.7
  @@ -1,7 +1 @@
  -<!ENTITY % util-entities SYSTEM "file:../../versioning/avalon-util.ent"> %util-entities;
  -<!ENTITY % merlin-entities SYSTEM "file:../../versioning/avalon-merlin.ent"> %merlin-entities;
  -<!ENTITY % framework-entities SYSTEM "file:../../versioning/avalon-framework.ent">
%framework-entities;
  -<!ENTITY % meta-entities SYSTEM "file:../../versioning/avalon-meta.ent"> %meta-entities;
  -<!ENTITY % repo-entities SYSTEM "file:../../versioning/avalon-repository.ent"> %repo-entities;
  -<!ENTITY % logging-entities SYSTEM "file:../../versioning/avalon-logging.ent"> %logging-entities;
  -<!ENTITY % logkit-entities SYSTEM "file:../../versioning/avalon-logkit.ent"> %logkit-entities;
  +<!ENTITY % versions SYSTEM "../../versioning/versions.ent"> %versions;
  
  
  
  1.6       +1 -7      avalon/merlin/cli/index.ent
  
  Index: index.ent
  ===================================================================
  RCS file: /home/cvs/avalon/merlin/cli/index.ent,v
  retrieving revision 1.5
  retrieving revision 1.6
  diff -u -r1.5 -r1.6
  --- index.ent	18 Apr 2004 12:59:46 -0000	1.5
  +++ index.ent	22 Apr 2004 00:15:05 -0000	1.6
  @@ -1,7 +1 @@
  -<!ENTITY % util-entities SYSTEM "file:../../versioning/avalon-util.ent"> %util-entities;
  -<!ENTITY % merlin-entities SYSTEM "file:../../versioning/avalon-merlin.ent"> %merlin-entities;
  -<!ENTITY % framework-entities SYSTEM "file:../../versioning/avalon-framework.ent">
%framework-entities;
  -<!ENTITY % meta-entities SYSTEM "file:../../versioning/avalon-meta.ent"> %meta-entities;
  -<!ENTITY % repo-entities SYSTEM "file:../../versioning/avalon-repository.ent"> %repo-entities;
  -<!ENTITY % logging-entities SYSTEM "file:../../versioning/avalon-logging.ent"> %logging-entities;
  -<!ENTITY % logkit-entities SYSTEM "file:../../versioning/avalon-logkit.ent"> %logkit-entities;
  +<!ENTITY % versions SYSTEM "../../versioning/versions.ent"> %versions;
  
  
  
  1.13      +0 -1      avalon/merlin/external.xml
  
  Index: external.xml
  ===================================================================
  RCS file: /home/cvs/avalon/merlin/external.xml,v
  retrieving revision 1.12
  retrieving revision 1.13
  diff -u -r1.12 -r1.13
  --- external.xml	18 Apr 2004 12:59:46 -0000	1.12
  +++ external.xml	22 Apr 2004 00:15:05 -0000	1.13
  @@ -66,7 +66,6 @@
         <version>&avalon-activation-impl-version;</version>
       </dependency>
   
  -
     </dependencies>
   
   </project>
  
  
  
  1.7       +1 -7      avalon/merlin/index.ent
  
  Index: index.ent
  ===================================================================
  RCS file: /home/cvs/avalon/merlin/index.ent,v
  retrieving revision 1.6
  retrieving revision 1.7
  diff -u -r1.6 -r1.7
  --- index.ent	9 Apr 2004 12:11:49 -0000	1.6
  +++ index.ent	22 Apr 2004 00:15:05 -0000	1.7
  @@ -1,7 +1 @@
  -<!ENTITY % util-entities SYSTEM "file:../versioning/avalon-util.ent"> %util-entities;
  -<!ENTITY % merlin-entities SYSTEM "file:../versioning/avalon-merlin.ent"> %merlin-entities;
  -<!ENTITY % framework-entities SYSTEM "file:../versioning/avalon-framework.ent"> %framework-entities;
  -<!ENTITY % meta-entities SYSTEM "file:../versioning/avalon-meta.ent"> %meta-entities;
  -<!ENTITY % repo-entities SYSTEM "file:../versioning/avalon-repository.ent"> %repo-entities;
  -<!ENTITY % logging-entities SYSTEM "file:../versioning/avalon-logging.ent"> %logging-entities;
  -<!ENTITY % logkit-entities SYSTEM "file:../versioning/avalon-logkit.ent"> %logkit-entities;
  +<!ENTITY % versions SYSTEM "../versioning/versions.ent"> %versions;
  
  
  
  1.74      +1 -1      avalon/merlin/maven.xml
  
  Index: maven.xml
  ===================================================================
  RCS file: /home/cvs/avalon/merlin/maven.xml,v
  retrieving revision 1.73
  retrieving revision 1.74
  diff -u -r1.73 -r1.74
  --- maven.xml	18 Apr 2004 15:06:05 -0000	1.73
  +++ maven.xml	22 Apr 2004 00:15:05 -0000	1.74
  @@ -111,7 +111,7 @@
     <goal name="avalon:build-main" description="Build Merlin.">
   
       <maven:reactor basedir="${basedir}"
  -      includes="api/project.xml,impl/project.xml"
  +      includes="api/project.xml,impl/project.xml,../composition/**/project.xml,../activation/**/project.xml"
         banner="Installing:"
         goals="jar:install"
         ignoreFailures="false" 
  
  
  
  1.15      +12 -7     avalon/merlin/project.properties
  
  Index: project.properties
  ===================================================================
  RCS file: /home/cvs/avalon/merlin/project.properties,v
  retrieving revision 1.14
  retrieving revision 1.15
  diff -u -r1.14 -r1.15
  --- project.properties	18 Apr 2004 23:22:24 -0000	1.14
  +++ project.properties	22 Apr 2004 00:15:05 -0000	1.15
  @@ -4,12 +4,19 @@
   #
   # Banner background and foreground colors.
   #
  -
   maven.ui.banner.background = #fff
   maven.ui.banner.foreground = #000
  -maven.xdoc.jsl = ./site/etc/site.jsl
  -maven.javadoc.stylesheet =${basedir}/site/etc/stylesheet.css
  -maven.xdoc.poweredby.image=
  +maven.xdoc.poweredby.image= 
  +
  +# Styles & License
  +maven.xdoc.jsl = file:///${avalon.buildsystem}/site/site.jsl
  +maven.license.licenseFile = ${avalon.buildsystem}/site/LICENSE.txt
  +maven.javadoc.stylesheet = ${avalon.buildsystem}/site/stylesheet.css
  +
  +#
  +# doc sources
  +#
  +
   maven.docs.src = ${basedir}/site/xdocs
   
   #
  @@ -30,7 +37,5 @@
   excalibur.i18n.link = http://avalon.apache.org/excalibur/i18n/apidocs/
   excalibur.pool.link = http://avalon.apache.org/excalibur/pool/api/
   excalibur.thread.link = http://avalon.apache.org/excalibur/thread/api/
  -excalibur.threadcontext.link = http://avalon.apache.org/excalibur/threadcontext/api/
  -excalibur.event.link = http://avalon.apache.org/excalibur/event/api/
   
  -maven.javadoc.links = ${sun.j2se.link},${avalon.logkit.link},${avalon.logging.link},${avalon.framework.link},${avalon.meta.link},${avalon.lifecycle.link},${excalibur.configuration.link},${excalibur.i18n.link},${excalibur.pool.link},${excalibur.thread.link},${excalibur.threadcontext.link},${excalibur.event.link},${sun.jmx.link}
  +maven.javadoc.links = ${sun.j2se.link},${avalon.logkit.link},${avalon.logging.link},${avalon.framework.link},${avalon.meta.link},${avalon.lifecycle.link},${excalibur.configuration.link},${excalibur.i18n.link},${excalibur.pool.link},${excalibur.thread.link},${sun.jmx.link}
  
  
  
  1.7       +1 -7      avalon/merlin/impl/index.ent
  
  Index: index.ent
  ===================================================================
  RCS file: /home/cvs/avalon/merlin/impl/index.ent,v
  retrieving revision 1.6
  retrieving revision 1.7
  diff -u -r1.6 -r1.7
  --- index.ent	18 Apr 2004 12:59:47 -0000	1.6
  +++ index.ent	22 Apr 2004 00:15:05 -0000	1.7
  @@ -1,7 +1 @@
  -<!ENTITY % util-entities SYSTEM "file:../../versioning/avalon-util.ent"> %util-entities;
  -<!ENTITY % merlin-entities SYSTEM "file:../../versioning/avalon-merlin.ent"> %merlin-entities;
  -<!ENTITY % framework-entities SYSTEM "file:../../versioning/avalon-framework.ent">
%framework-entities;
  -<!ENTITY % meta-entities SYSTEM "file:../../versioning/avalon-meta.ent"> %meta-entities;
  -<!ENTITY % repo-entities SYSTEM "file:../../versioning/avalon-repository.ent"> %repo-entities;
  -<!ENTITY % logging-entities SYSTEM "file:../../versioning/avalon-logging.ent"> %logging-entities;
  -<!ENTITY % logkit-entities SYSTEM "file:../../versioning/avalon-logkit.ent"> %logkit-entities;
  +<!ENTITY % versions SYSTEM "../../versioning/versions.ent"> %versions;
  
  
  
  1.7       +1 -7      avalon/merlin/plugin/index.ent
  
  Index: index.ent
  ===================================================================
  RCS file: /home/cvs/avalon/merlin/plugin/index.ent,v
  retrieving revision 1.6
  retrieving revision 1.7
  diff -u -r1.6 -r1.7
  --- index.ent	18 Apr 2004 12:59:47 -0000	1.6
  +++ index.ent	22 Apr 2004 00:15:05 -0000	1.7
  @@ -1,7 +1 @@
  -<!ENTITY % util-entities SYSTEM "file:../../versioning/avalon-util.ent"> %util-entities;
  -<!ENTITY % merlin-entities SYSTEM "file:../../versioning/avalon-merlin.ent"> %merlin-entities;
  -<!ENTITY % framework-entities SYSTEM "file:../../versioning/avalon-framework.ent">
%framework-entities;
  -<!ENTITY % meta-entities SYSTEM "file:../../versioning/avalon-meta.ent"> %meta-entities;
  -<!ENTITY % repo-entities SYSTEM "file:../../versioning/avalon-repository.ent"> %repo-entities;
  -<!ENTITY % logging-entities SYSTEM "file:../../versioning/avalon-logging.ent"> %logging-entities;
  -<!ENTITY % logkit-entities SYSTEM "file:../../versioning/avalon-logkit.ent"> %logkit-entities;
  +<!ENTITY % versions SYSTEM "../../versioning/versions.ent"> %versions;
  
  
  
  1.6       +1 -7      avalon/merlin/servlet/index.ent
  
  Index: index.ent
  ===================================================================
  RCS file: /home/cvs/avalon/merlin/servlet/index.ent,v
  retrieving revision 1.5
  retrieving revision 1.6
  diff -u -r1.5 -r1.6
  --- index.ent	18 Apr 2004 12:59:47 -0000	1.5
  +++ index.ent	22 Apr 2004 00:15:05 -0000	1.6
  @@ -1,7 +1 @@
  -<!ENTITY % util-entities SYSTEM "file:../../versioning/avalon-util.ent"> %util-entities;
  -<!ENTITY % merlin-entities SYSTEM "file:../../versioning/avalon-merlin.ent"> %merlin-entities;
  -<!ENTITY % framework-entities SYSTEM "file:../../versioning/avalon-framework.ent">
%framework-entities;
  -<!ENTITY % meta-entities SYSTEM "file:../../versioning/avalon-meta.ent"> %meta-entities;
  -<!ENTITY % repo-entities SYSTEM "file:../../versioning/avalon-repository.ent"> %repo-entities;
  -<!ENTITY % logging-entities SYSTEM "file:../../versioning/avalon-logging.ent"> %logging-entities;
  -<!ENTITY % logkit-entities SYSTEM "file:../../versioning/avalon-logkit.ent"> %logkit-entities;
  +<!ENTITY % versions SYSTEM "../../versioning/versions.ent"> %versions;
  
  
  
  1.6       +47 -7     avalon/merlin/site/xdocs/starting/tutorial/config/configurable.xml
  
  Index: configurable.xml
  ===================================================================
  RCS file: /home/cvs/avalon/merlin/site/xdocs/starting/tutorial/config/configurable.xml,v
  retrieving revision 1.5
  retrieving revision 1.6
  diff -u -r1.5 -r1.6
  --- configurable.xml	14 Mar 2004 11:12:45 -0000	1.5
  +++ configurable.xml	22 Apr 2004 00:15:05 -0000	1.6
  @@ -28,17 +28,56 @@
       <section name="Using Merlin">
         <subsection name="Adding Configuration Support to the Component">
           <p>
  -        To be supplied with a configuration, our component must implement
  -        the Avalon Framework Configurable interface.  The following code
  -        is the HelloComponent extended to include implementation of 
  -        Configurable, and updates to the inialize method to log the source
  -        of the configuration based on runtime information.
  +        To be supplied with a configuration, our component must either 
  +        declare a Configuration as a constructor argument, or alternatively, 
  +        implement the Avalon Framework Configurable interface.  
           </p>
  +
  +        <p>
  +        The following code
  +        is the HelloComponent extended to include a configuration constructor 
  +        argument and updates to log the source of the configuration based on 
  +        runtime information.
  +        </p>
  +
           <p>
           Resources supporting this tutorial are contained in the 
  -        tutorials/configuration/block/ directory.
  +        tutorials/configuration/injection directory.
           </p>
   <source>
  +public class HelloComponent
  +{
  +   /**
  +    * Configuration of the component by the container.  The 
  +    * implementation get a child element named 'source' and 
  +    * assigns the value of the element to a local variable.
  +    *
  +    * @param config the component configuration
  +    * @exception ConfigurationException if a configuration error occurs
  +    */
  +    public HelloComponent( 
  +      final Logger logger, final Configuration config ) 
  +      throws ConfigurationException
  +    {
  +        logger.info( "instantiation" );
  +        final String source = 
  +          config.getChild( "source" ).getValue( "unknown" );
  +        final String message = "source: " + source;
  +        logger.info( message );
  +    }
  +}
  +</source>
  +
  +        <p>
  +        The alternative approach to configuration supply is via the Avalon 
  +        Configurable interface - demonstrated in the following code example.
  +        </p>
  +
  +        <p>
  +        Reter tutorials/configuration/block.
  +        </p>
  +
  +<source>
   /**
    * A configurable component.
    *
  @@ -57,7 +96,8 @@
       * @param config the component configuration
       * @exception ConfigurationException if a configuration error occurs
       */
  -    public void configure( Configuration config ) throws ConfigurationException
  +    public void configure( Configuration config ) 
  +      throws ConfigurationException
       {
           getLogger().info( "configuration stage" );
           m_source = config.getChild( "source" ).getValue( "unknown" );
  
  
  
  1.5       +1 -7      avalon/merlin/unit/index.ent
  
  Index: index.ent
  ===================================================================
  RCS file: /home/cvs/avalon/merlin/unit/index.ent,v
  retrieving revision 1.4
  retrieving revision 1.5
  diff -u -r1.4 -r1.5
  --- index.ent	18 Apr 2004 12:59:47 -0000	1.4
  +++ index.ent	22 Apr 2004 00:15:05 -0000	1.5
  @@ -1,7 +1 @@
  -<!ENTITY % util-entities SYSTEM "file:../../versioning/avalon-util.ent"> %util-entities;
  -<!ENTITY % merlin-entities SYSTEM "file:../../versioning/avalon-merlin.ent"> %merlin-entities;
  -<!ENTITY % framework-entities SYSTEM "file:../../versioning/avalon-framework.ent">
%framework-entities;
  -<!ENTITY % meta-entities SYSTEM "file:../../versioning/avalon-meta.ent"> %meta-entities;
  -<!ENTITY % repo-entities SYSTEM "file:../../versioning/avalon-repository.ent"> %repo-entities;
  -<!ENTITY % logging-entities SYSTEM "file:../../versioning/avalon-logging.ent"> %logging-entities;
  -<!ENTITY % logkit-entities SYSTEM "file:../../versioning/avalon-logkit.ent"> %logkit-entities;
  +<!ENTITY % versions SYSTEM "../../versioning/versions.ent"> %versions;
  
  
  
  1.2       +5 -2      avalon/tutorials/configuration/injection/src/java/tutorial/HelloComponent.java
  
  Index: HelloComponent.java
  ===================================================================
  RCS file: /home/cvs/avalon/tutorials/configuration/injection/src/java/tutorial/HelloComponent.java,v
  retrieving revision 1.1
  retrieving revision 1.2
  diff -u -r1.1 -r1.2
  --- HelloComponent.java	11 Mar 2004 13:21:17 -0000	1.1
  +++ HelloComponent.java	22 Apr 2004 00:15:05 -0000	1.2
  @@ -36,10 +36,13 @@
       * @param config the component configuration
       * @exception ConfigurationException if a configuration error occurs
       */
  -    public HelloComponent( Logger logger, Configuration config ) throws ConfigurationException
  +    public HelloComponent( 
  +      final Logger logger, final Configuration config ) 
  +      throws ConfigurationException
       {
           logger.info( "instantiation" );
  -        final String source = config.getChild( "source" ).getValue( "unknown" );
  +        final String source = 
  +          config.getChild( "source" ).getValue( "unknown" );
           final String message = "source: " + source;
           logger.info( message );
       }
  
  
  
  1.4       +1 -1      avalon/tutorials/context/strategy/index.ent
  
  Index: index.ent
  ===================================================================
  RCS file: /home/cvs/avalon/tutorials/context/strategy/index.ent,v
  retrieving revision 1.3
  retrieving revision 1.4
  diff -u -r1.3 -r1.4
  --- index.ent	18 Apr 2004 10:51:56 -0000	1.3
  +++ index.ent	22 Apr 2004 00:15:05 -0000	1.4
  @@ -1 +1 @@
  -<!ENTITY % merlin-entities SYSTEM "file:../../../versioning/avalon-merlin.ent"> %merlin-entities;
  +<!ENTITY % versions SYSTEM "../../../versioning/versions.ent"> %versions;
  
  
  
  1.5       +1 -2      avalon/tutorials/dynamics/index.ent
  
  Index: index.ent
  ===================================================================
  RCS file: /home/cvs/avalon/tutorials/dynamics/index.ent,v
  retrieving revision 1.4
  retrieving revision 1.5
  diff -u -r1.4 -r1.5
  --- index.ent	18 Apr 2004 10:51:56 -0000	1.4
  +++ index.ent	22 Apr 2004 00:15:05 -0000	1.5
  @@ -1,2 +1 @@
  -<!ENTITY % merlin-entities SYSTEM "file:../../versioning/avalon-merlin.ent"> %merlin-entities;
  -<!ENTITY % meta-entities SYSTEM "file:../../versioning/avalon-meta.ent"> %meta-entities;
  +<!ENTITY % versions SYSTEM "../../versioning/versions.ent"> %versions;
  
  
  
  1.4       +1 -1      avalon/tutorials/hello/conf/block.xml
  
  Index: block.xml
  ===================================================================
  RCS file: /home/cvs/avalon/tutorials/hello/conf/block.xml,v
  retrieving revision 1.3
  retrieving revision 1.4
  diff -u -r1.3 -r1.4
  --- block.xml	11 Mar 2004 01:30:39 -0000	1.3
  +++ block.xml	22 Apr 2004 00:15:06 -0000	1.4
  @@ -1,6 +1,6 @@
   
   <container name="tutorial">
   
  -   <component name="hello" class="tutorial.HelloComponent" activation="startup"/>
  +   <component name="hello" class="tutorial.HelloComponent"/>
   
   </container>
  
  
  
  1.4       +1 -1      avalon/tutorials/hello/conf/config.xml
  
  Index: config.xml
  ===================================================================
  RCS file: /home/cvs/avalon/tutorials/hello/conf/config.xml,v
  retrieving revision 1.3
  retrieving revision 1.4
  diff -u -r1.3 -r1.4
  --- config.xml	10 Mar 2004 10:52:18 -0000	1.3
  +++ config.xml	22 Apr 2004 00:15:06 -0000	1.4
  @@ -2,7 +2,7 @@
   
   <targets>
   
  -  <target path="/tutorial/hello">
  +  <target path="/tutorial">
       <categories priority="DEBUG"/>
     </target>
   
  
  
  
  1.5       +32 -36    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.4
  retrieving revision 1.5
  diff -u -r1.4 -r1.5
  --- HelloComponent.java	24 Jan 2004 23:25:34 -0000	1.4
  +++ HelloComponent.java	22 Apr 2004 00:15:06 -0000	1.5
  @@ -18,67 +18,60 @@
   package tutorial;
   
   import org.apache.avalon.framework.logger.Logger;
  -import org.apache.avalon.framework.logger.LogEnabled;
   import org.apache.avalon.framework.activity.Disposable;
  -import org.apache.avalon.framework.activity.Executable;
  -import org.apache.avalon.framework.activity.Initializable;
   
   /**
  - * A sample component.  This component implements a number 
  - * of lifecycle interface.  Each lifecycle interface is a stage
  - * that is processed by a container during the deployment of 
  - * the component.  The lifecycle stages demonstrated here include
  - * LogEnabled (association of a logging channel), Initializable
  - * (initialization of the component), Executable (component
  - * execution), and Disposable (componet disposal).  Please note 
  - * that all lifecycle stages are optional.
  + * A sample component.  
    *
  - * @avalon.component version="1.0" name="hello" lifestyle="singleton"
  + * @avalon.component 
  + *    version="1.0" 
  + *    name="hello" 
  + *    lifestyle="singleton"
    * @avalon.service type="tutorial.Hello"
    */
   public class HelloComponent 
  -  implements LogEnabled, Initializable, Executable, Disposable, Hello
  +  implements Hello, Disposable
   {
  -
  -    public void sayHello()
  -    {
  -        getLogger().info( "HELLO" );
  -    }
  +    //-------------------------------------------------------
  +    // immutable state
  +    //-------------------------------------------------------
   
      /**
       * Internal reference to the logging channel supplied to us 
       * by the container. 
       */
  -    private Logger m_logger;
  +    private final Logger m_logger;
  +
  +    //-------------------------------------------------------
  +    // constructor
  +    //-------------------------------------------------------
   
      /**
  -    * Supply of a logging channel by the container.
  +    * Creation of a new hello component instance.
       *
  -    * @param logger the logging channel for this component
  +    * @param logger the logging channel supplied by the container
       */
  -    public void enableLogging( final Logger logger )
  +    public HelloComponent( Logger logger )
       {
           m_logger = logger;
  -        getLogger().info( "logging" );
  +        m_logger.info( "instantiated" );
       }
   
  +    //-------------------------------------------------------
  +    // Hello service implementation
  +    //-------------------------------------------------------
  +
      /**
  -    * Initialization of the component by the container.
  -    * @exception Exception if an initialization error occurs
  +    * The hello service implementation.
       */
  -    public void initialize() throws Exception
  +    public void sayHello()
       {
  -        getLogger().info( "initialization" );
  +        getLogger().info( "HELLO" );
       }
   
  -   /**
  -    * Component execution trigger by the container following 
  -    * completion of the initialization stage.
  -    */
  -    public void execute()
  -    {
  -        getLogger().info( "execution" );
  -    } 
  +    //-------------------------------------------------------
  +    // Disposable lifecycle interface
  +    //-------------------------------------------------------
   
      /**
       * Component disposal trigger by the container during which
  @@ -87,8 +80,11 @@
       public void dispose()
       {
           getLogger().info( "disposal" );
  -        m_logger = null;
       }
  +
  +    //-------------------------------------------------------
  +    // internal utilities
  +    //-------------------------------------------------------
   
      /**
       * Return the logging channel assigned to us by the container.
  
  
  
  1.2       +1 -3      avalon/tutorials/index.ent
  
  Index: index.ent
  ===================================================================
  RCS file: /home/cvs/avalon/tutorials/index.ent,v
  retrieving revision 1.1
  retrieving revision 1.2
  diff -u -r1.1 -r1.2
  --- index.ent	18 Apr 2004 14:20:09 -0000	1.1
  +++ index.ent	22 Apr 2004 00:15:06 -0000	1.2
  @@ -1,3 +1 @@
  -<!ENTITY % merlin-entities SYSTEM "file:../versioning/avalon-merlin.ent"> %merlin-entities;
  -<!ENTITY % meta-entities SYSTEM "file:../versioning/avalon-meta.ent"> %meta-entities;
  -<!ENTITY % repo-entities SYSTEM "file:../versioning/avalon-repository.ent"> %repo-entities;
  +<!ENTITY % versions SYSTEM "../versioning/versions.ent"> %versions;
  
  
  
  1.4       +1 -1      avalon/tutorials/jmx/index.ent
  
  Index: index.ent
  ===================================================================
  RCS file: /home/cvs/avalon/tutorials/jmx/index.ent,v
  retrieving revision 1.3
  retrieving revision 1.4
  diff -u -r1.3 -r1.4
  --- index.ent	18 Apr 2004 10:51:56 -0000	1.3
  +++ index.ent	22 Apr 2004 00:15:06 -0000	1.4
  @@ -1 +1 @@
  -<!ENTITY % merlin-entities SYSTEM "file:../../versioning/avalon-merlin.ent"> %merlin-entities;
  +<!ENTITY % versions SYSTEM "../../versioning/versions.ent"> %versions;
  
  
  
  1.4       +1 -1      avalon/tutorials/lifecycle/activation/index.ent
  
  Index: index.ent
  ===================================================================
  RCS file: /home/cvs/avalon/tutorials/lifecycle/activation/index.ent,v
  retrieving revision 1.3
  retrieving revision 1.4
  diff -u -r1.3 -r1.4
  --- index.ent	18 Apr 2004 10:51:56 -0000	1.3
  +++ index.ent	22 Apr 2004 00:15:06 -0000	1.4
  @@ -1 +1 @@
  -<!ENTITY % merlin-entities SYSTEM "file:../../../versioning/avalon-merlin.ent"> %merlin-entities;
  +<!ENTITY % versions SYSTEM "../../../versioning/versions.ent"> %versions;
  
  
  
  1.2       +1 -1      avalon/tutorials/main/index.ent
  
  Index: index.ent
  ===================================================================
  RCS file: /home/cvs/avalon/tutorials/main/index.ent,v
  retrieving revision 1.1
  retrieving revision 1.2
  diff -u -r1.1 -r1.2
  --- index.ent	18 Apr 2004 14:20:09 -0000	1.1
  +++ index.ent	22 Apr 2004 00:15:06 -0000	1.2
  @@ -1 +1 @@
  -<!ENTITY % merlin-entities SYSTEM "file:../../versioning/avalon-merlin.ent"> %merlin-entities;
  +<!ENTITY % versions SYSTEM "../../versioning/versions.ent"> %versions;
  
  
  
  1.4       +1 -1      avalon/tutorials/parameterization/index.ent
  
  Index: index.ent
  ===================================================================
  RCS file: /home/cvs/avalon/tutorials/parameterization/index.ent,v
  retrieving revision 1.3
  retrieving revision 1.4
  diff -u -r1.3 -r1.4
  --- index.ent	18 Apr 2004 10:51:56 -0000	1.3
  +++ index.ent	22 Apr 2004 00:15:06 -0000	1.4
  @@ -1 +1 @@
  -<!ENTITY % merlin-entities SYSTEM "file:../../versioning/avalon-merlin.ent"> %merlin-entities;
  +<!ENTITY % versions SYSTEM "../../versioning/versions.ent"> %versions;
  
  
  
  1.3       +2 -0      avalon/versioning/versions.ent
  
  Index: versions.ent
  ===================================================================
  RCS file: /home/cvs/avalon/versioning/versions.ent,v
  retrieving revision 1.2
  retrieving revision 1.3
  diff -u -r1.2 -r1.3
  --- versions.ent	21 Apr 2004 22:57:18 -0000	1.2
  +++ versions.ent	22 Apr 2004 00:15:06 -0000	1.3
  @@ -11,6 +11,7 @@
   <!ENTITY % avalon-framework-entities SYSTEM "avalon-framework.ent"> 
   <!ENTITY % avalon-logkit-entities SYSTEM "avalon-logkit.ent"> 
   <!ENTITY % avalon-meta-entities SYSTEM "avalon-meta.ent"> 
  +<!ENTITY % avalon-versioning-entities SYSTEM "avalon-versioning-plugin.ent"> 
   
   %avalon-excalibur-entities;
   %avalon-fortress-entities;
  @@ -24,3 +25,4 @@
   %avalon-util-entities;
   %avalon-facilities-entities;
   %avalon-cornerstone-entities;
  +%avalon-versioning-entities;
  
  
  

---------------------------------------------------------------------
To unsubscribe, e-mail: cvs-unsubscribe@avalon.apache.org
For additional commands, e-mail: cvs-help@avalon.apache.org


Mime
View raw message