You are viewing a plain text version of this content. The canonical link for it is here.
Posted to cvs@avalon.apache.org by mc...@apache.org on 2003/12/11 09:48:13 UTC

cvs commit: avalon/meta/site/xdocs/tutorial navigation.xml

mcconnell    2003/12/11 00:48:13

  Modified:    meta/impl/src/java/org/apache/avalon/meta/info/builder
                        XMLTypeCreator.java
               meta/impl/src/java/org/apache/avalon/meta/info/writer
                        XMLTypeWriter.java
               meta     maven.xml project.xml
               meta/site/etc site.jsl
               meta/site/xdocs/meta/data navigation.xml
               meta/site/xdocs/meta/info/attributes navigation.xml
               meta/site/xdocs/meta/info navigation.xml service.xml
               meta/site/xdocs/meta/info/type/context navigation.xml
               meta/site/xdocs/meta/info/type/dependencies navigation.xml
               meta/site/xdocs/meta/info/type/extensions navigation.xml
               meta/site/xdocs/meta/info/type info.xml navigation.xml
               meta/site/xdocs/meta/info/type/loggers navigation.xml
               meta/site/xdocs/meta/info/type/services navigation.xml
               meta/site/xdocs/meta/info/type/stages navigation.xml
               meta/site/xdocs/meta navigation.xml
               meta/site/xdocs navigation.xml
               meta/site/xdocs/tools/maven index.xml navigation.xml
               meta/site/xdocs/tools navigation.xml
               meta/site/xdocs/tools/tags navigation.xml
               meta/site/xdocs/tutorial navigation.xml
  Log:
  Documetation updates and cleanup of the info descriptor xml format.
  
  Revision  Changes    Path
  1.7       +4 -2      avalon/meta/impl/src/java/org/apache/avalon/meta/info/builder/XMLTypeCreator.java
  
  Index: XMLTypeCreator.java
  ===================================================================
  RCS file: /home/cvs/avalon/meta/impl/src/java/org/apache/avalon/meta/info/builder/XMLTypeCreator.java,v
  retrieving revision 1.6
  retrieving revision 1.7
  diff -u -r1.6 -r1.7
  --- XMLTypeCreator.java	28 Oct 2003 20:33:29 -0000	1.6
  +++ XMLTypeCreator.java	11 Dec 2003 08:48:12 -0000	1.7
  @@ -460,8 +460,10 @@
               buildAttributes( info.getChild( "attributes" ) );
           final String lifestyle = 
             buildLifestyle( info, attributes );
  -        final String collection = 
  +        final String collectionLegacy = 
             info.getChild( "lifestyle" ).getAttribute( "collection", null );
  +        final String collection = 
  +          info.getChild( "collection" ).getValue( collectionLegacy );
           return new InfoDescriptor( 
             name, classname, version, lifestyle, collection, schema, attributes );
       }
  
  
  
  1.5       +7 -6      avalon/meta/impl/src/java/org/apache/avalon/meta/info/writer/XMLTypeWriter.java
  
  Index: XMLTypeWriter.java
  ===================================================================
  RCS file: /home/cvs/avalon/meta/impl/src/java/org/apache/avalon/meta/info/writer/XMLTypeWriter.java,v
  retrieving revision 1.4
  retrieving revision 1.5
  diff -u -r1.4 -r1.5
  --- XMLTypeWriter.java	19 Oct 2003 14:05:54 -0000	1.4
  +++ XMLTypeWriter.java	11 Dec 2003 08:48:12 -0000	1.5
  @@ -160,12 +160,13 @@
               writer.write( "</schema>");
           }
   
  -        writer.write( 
  -          "\n    <lifestyle collection=\"" 
  -          + InfoDescriptor.getCollectionPolicyKey( info.getCollectionPolicy() ) 
  -          + "\">" );
  +        writer.write( "\n    <lifestyle>");
           writer.write( info.getLifestyle() );
  -        writer.write( "</lifestyle>" );
  +        writer.write( "</lifestyle>");
  +
  +        writer.write( "\n    <collection>");
  +        writer.write( info.getCollectionPolicyKey( info.getCollectionPolicy() ) );
  +        writer.write( "</collection>");
   
           if( 0 == info.getAttributeNames().length )
           {
  
  
  
  1.8       +17 -42    avalon/meta/maven.xml
  
  Index: maven.xml
  ===================================================================
  RCS file: /home/cvs/avalon/meta/maven.xml,v
  retrieving revision 1.7
  retrieving revision 1.8
  diff -u -r1.7 -r1.8
  --- maven.xml	10 Dec 2003 09:56:21 -0000	1.7
  +++ maven.xml	11 Dec 2003 08:48:12 -0000	1.8
  @@ -36,43 +36,21 @@
     </goal>
   
     <goal name="avalon:build">
  -    
  -    <echo>
  -
  -Building the framework using the default target "avalon:build".
  -The complete set of target include:
  -
  -  avalon:clean
  -  avalon:build ---------- default goal
  -  avalon:build-snapshot
  -  avalon:dist
  -  avalon:site
  -    </echo>
  -
  -    <maven:reactor
  -      basedir="${basedir}"
  -      includes="*/project.xml"
  +    <maven:reactor basedir="${basedir}"
  +      includes="**/project.xml"
  +      excludes="project.xml"
         goals=""
         banner="Building:"
  -      ignoreFailures="false"/>
  +      ignoreFailures="false"
  +      postProcessing="true" />
  +
       <ant:copy todir="${maven.build.dir}">
  -      <ant:fileset dir="${basedir}/api/target">
  -        <ant:include name="${pom.artifactId}-api-${pom.currentVersion}.jar"/>
  -      </ant:fileset>
  -      <ant:fileset dir="${basedir}/spi/target">
  -        <ant:include name="${pom.artifactId}-spi-${pom.currentVersion}.jar"/>
  -      </ant:fileset>
  -      <ant:fileset dir="${basedir}/impl/target">
  -        <ant:include name="${pom.artifactId}-impl-${pom.currentVersion}.jar"/>
  -      </ant:fileset>
  -      <ant:fileset dir="${basedir}/tools/target">
  -        <ant:include name="${pom.artifactId}-tools-${pom.currentVersion}.jar"/>
  -      </ant:fileset>
  -      <ant:fileset dir="${basedir}/plugin/target">
  -        <ant:include name="${pom.artifactId}-plugin-${meta.plugin.version}.jar"/>
  -      </ant:fileset>
  +      <j:forEach var="child" items="${reactorProjects}">
  +        <ant:fileset dir="${child.file.parentFile}/target">
  +          <ant:include name="${child.artifactId}-${child.currentVersion}.jar"/>
  +        </ant:fileset>
  +      </j:forEach>
       </ant:copy>
  -
     </goal>
   
     <goal name="avalon:build-snapshot">
  @@ -150,11 +128,7 @@
       <!-- Copy Jars -->
       <ant:copy todir="${maven.dist.bin.assembly.dir}">
         <ant:fileset dir="${maven.build.dir}">
  -        <ant:include name="${pom.artifactId}-api-${pom.currentVersion}.jar"/>
  -        <ant:include name="${pom.artifactId}-spi-${pom.currentVersion}.jar"/>
  -        <ant:include name="${pom.artifactId}-impl-${pom.currentVersion}.jar"/>
  -        <ant:include name="${pom.artifactId}-tools-${pom.currentVersion}.jar"/>
  -        <ant:include name="${pom.artifactId}-plugin-${meta.plugin.version}.jar"/>
  +        <ant:include name="*.jar"/>
           <ant:include name="docs/**"/>
         </ant:fileset>
       </ant:copy>
  @@ -215,6 +189,7 @@
       <ant:mkdir dir="${maven.dist.dir}"/>
     </goal>
   
  +
     <goal
       name="xdist:build-bin" 
       prereqs="xdist:build-setup,xdist:prepare-bin-filesystem"
  @@ -229,13 +204,14 @@
         zipfile="${maven.dist.dir}/${maven.final.name}.tar.gz"
         src="${maven.dist.dir}/${maven.final.name}.tar"
       />
  -    
  +    <checksum file="${maven.dist.dir}/${maven.final.name}.tar.gz"/>
       <ant:delete file="${maven.dist.dir}/${maven.final.name}.tar"/>
   
       <!-- Create a zip file -->
       <ant:zip zipfile="${maven.dist.dir}/${maven.final.name}.zip">
         <ant:zipfileset dir="${maven.dist.bin.archive.dir}"/>
       </ant:zip>
  +    <checksum file="${maven.dist.dir}/${maven.final.name}.zip"/>
     </goal>
   
     <goal
  @@ -247,19 +223,18 @@
       <ant:tar longfile="gnu" tarfile="${maven.dist.dir}/${maven.final.name}-src.tar">
         <ant:tarfileset dir="${maven.dist.src.archive.dir}"/>
       </ant:tar>
  -
       <ant:gzip 
         zipfile="${maven.dist.dir}/${maven.final.name}-src.tar.gz" 
         src="${maven.dist.dir}/${maven.final.name}-src.tar"
       />
  -    
  +    <checksum file="${maven.dist.dir}/${maven.final.name}-src.tar.gz"/>
       <ant:delete file="${maven.dist.dir}/${maven.final.name}-src.tar"/>
   
       <!-- Create a zip file -->
       <ant:zip zipfile="${maven.dist.dir}/${maven.final.name}-src.zip">
         <ant:zipfileset dir="${maven.dist.src.archive.dir}"/>
       </ant:zip>
  -
  +    <checksum file="${maven.dist.dir}/${maven.final.name}-src.zip"/>
     </goal>
   
     <postGoal name="java:prepare-filesystem">
  
  
  
  1.5       +1 -1      avalon/meta/project.xml
  
  Index: project.xml
  ===================================================================
  RCS file: /home/cvs/avalon/meta/project.xml,v
  retrieving revision 1.4
  retrieving revision 1.5
  diff -u -r1.4 -r1.5
  --- project.xml	30 Oct 2003 00:44:51 -0000	1.4
  +++ project.xml	11 Dec 2003 08:48:12 -0000	1.5
  @@ -5,7 +5,7 @@
     <name>Avalon Meta</name>
     <groupId>avalon-meta</groupId>
     <id>avalon-meta</id>
  -  <currentVersion>1.2-SNAPSHOT</currentVersion>
  +  <currentVersion>1.2.1-RC1</currentVersion>
     <inceptionYear>2000</inceptionYear>
   
     <organization>
  
  
  
  1.5       +2 -11     avalon/meta/site/etc/site.jsl
  
  Index: site.jsl
  ===================================================================
  RCS file: /home/cvs/avalon/meta/site/etc/site.jsl,v
  retrieving revision 1.4
  retrieving revision 1.5
  diff -u -r1.4 -r1.5
  --- site.jsl	12 Nov 2003 04:46:52 -0000	1.4
  +++ site.jsl	11 Dec 2003 08:48:12 -0000	1.5
  @@ -104,17 +104,7 @@
                   </j:if>
                 </td>
   
  -              <!-- project logo and link -->
  -
  -              <td>
  -                <div align="right" id="login">
  -                  <a href='http://apachecon.com/2003/US/index.html'>
  -                    <img border='0' 
  -                      src='http://www.apache.org/~ceki/ac2003/ac2003-150.gif'/>
  -                  </a>
  -                </div>
  -              </td>
  -
  +              <td></td>
                 <!--
                 <td>
                   <div align="right" id="login">
  @@ -131,6 +121,7 @@
                   </div>
                 </td>
                 -->
  +
               </tr>
             </table>
           </div>
  
  
  
  1.3       +0 -1      avalon/meta/site/xdocs/meta/data/navigation.xml
  
  Index: navigation.xml
  ===================================================================
  RCS file: /home/cvs/avalon/meta/site/xdocs/meta/data/navigation.xml,v
  retrieving revision 1.2
  retrieving revision 1.3
  diff -u -r1.2 -r1.3
  --- navigation.xml	28 Oct 2003 11:42:34 -0000	1.2
  +++ navigation.xml	11 Dec 2003 08:48:12 -0000	1.3
  @@ -14,7 +14,6 @@
   
       <menu name="About Avalon Meta">
         <item name="Overview" href="/index.html"/>
  -      <item name="Getting Started" href="/tutorial/index.html"/>
         <item name="Meta Model" href="/meta/index.html">
           <item name="Descriptors" href="/meta/info/index.html"/>
           <item name="Directives" href="/meta/data/index.html"/>
  
  
  
  1.3       +0 -1      avalon/meta/site/xdocs/meta/info/attributes/navigation.xml
  
  Index: navigation.xml
  ===================================================================
  RCS file: /home/cvs/avalon/meta/site/xdocs/meta/info/attributes/navigation.xml,v
  retrieving revision 1.2
  retrieving revision 1.3
  diff -u -r1.2 -r1.3
  --- navigation.xml	28 Oct 2003 11:42:34 -0000	1.2
  +++ navigation.xml	11 Dec 2003 08:48:12 -0000	1.3
  @@ -15,7 +15,6 @@
   
       <menu name="About Avalon Meta">
         <item name="Overview" href="/index.html"/>
  -      <item name="Getting Started" href="/tutorial/index.html"/>
         <item name="Meta Model" href="/meta/index.html">
           <item name="Descriptors" href="/meta/info/index.html">
             <item name="Type" href="/meta/info/type/index.html"/>
  
  
  
  1.3       +0 -1      avalon/meta/site/xdocs/meta/info/navigation.xml
  
  Index: navigation.xml
  ===================================================================
  RCS file: /home/cvs/avalon/meta/site/xdocs/meta/info/navigation.xml,v
  retrieving revision 1.2
  retrieving revision 1.3
  diff -u -r1.2 -r1.3
  --- navigation.xml	28 Oct 2003 11:42:34 -0000	1.2
  +++ navigation.xml	11 Dec 2003 08:48:12 -0000	1.3
  @@ -15,7 +15,6 @@
   
       <menu name="About Avalon Meta">
         <item name="Overview" href="/index.html"/>
  -      <item name="Getting Started" href="/tutorial/index.html"/>
         <item name="Meta Model" href="/meta/index.html">
           <item name="Descriptors" href="/meta/info/index.html">
             <item name="Type" href="/meta/info/type/index.html"/>
  
  
  
  1.2       +0 -2      avalon/meta/site/xdocs/meta/info/service.xml
  
  Index: service.xml
  ===================================================================
  RCS file: /home/cvs/avalon/meta/site/xdocs/meta/info/service.xml,v
  retrieving revision 1.1
  retrieving revision 1.2
  diff -u -r1.1 -r1.2
  --- service.xml	24 Sep 2003 08:15:56 -0000	1.1
  +++ service.xml	11 Dec 2003 08:48:12 -0000	1.2
  @@ -14,8 +14,6 @@
   <p>
   The org.apache.avalon.meta.info.ServiceDefinition class describes a type of service. It suppliments the classic Java interface with a version identifier and attributes.  A ServiceDefintion may be referenced by multiple components that will typically suppliment the defintion in terms of additional  attributes.  References to a ServiceDefintion concern a component type declaration of depedencies, service access points, lifestyle extension ability, and lifestyle extension depedencies.</p>
   
  -<img src="./../../images/ServiceDefinition.gif" />
  -
   <p>An instance of ServiceDescriptor is created using a ServiceBuilder.  The following code fragment shows the creation of new ServiceBuilder and the creation of a ServiceDefinition using the builder.</p>
   <source>
     //
  
  
  
  1.3       +0 -1      avalon/meta/site/xdocs/meta/info/type/context/navigation.xml
  
  Index: navigation.xml
  ===================================================================
  RCS file: /home/cvs/avalon/meta/site/xdocs/meta/info/type/context/navigation.xml,v
  retrieving revision 1.2
  retrieving revision 1.3
  diff -u -r1.2 -r1.3
  --- navigation.xml	28 Oct 2003 11:42:35 -0000	1.2
  +++ navigation.xml	11 Dec 2003 08:48:12 -0000	1.3
  @@ -15,7 +15,6 @@
   
       <menu name="About Avalon Meta">
         <item name="Overview" href="/index.html"/>
  -      <item name="Getting Started" href="/tutorial/index.html"/>
         <item name="Meta Model" href="/meta/index.html">
           <item name="Descriptors" href="/meta/info/index.html">
             <item name="Type" href="/meta/info/type/index.html">
  
  
  
  1.3       +0 -1      avalon/meta/site/xdocs/meta/info/type/dependencies/navigation.xml
  
  Index: navigation.xml
  ===================================================================
  RCS file: /home/cvs/avalon/meta/site/xdocs/meta/info/type/dependencies/navigation.xml,v
  retrieving revision 1.2
  retrieving revision 1.3
  diff -u -r1.2 -r1.3
  --- navigation.xml	28 Oct 2003 11:42:35 -0000	1.2
  +++ navigation.xml	11 Dec 2003 08:48:12 -0000	1.3
  @@ -15,7 +15,6 @@
   
       <menu name="About Avalon Meta">
         <item name="Overview" href="/index.html"/>
  -      <item name="Getting Started" href="/tutorial/index.html"/>
         <item name="Meta Model" href="/meta/index.html">
           <item name="Descriptors" href="/meta/info/index.html">
             <item name="Type" href="/meta/info/type/index.html">
  
  
  
  1.3       +0 -1      avalon/meta/site/xdocs/meta/info/type/extensions/navigation.xml
  
  Index: navigation.xml
  ===================================================================
  RCS file: /home/cvs/avalon/meta/site/xdocs/meta/info/type/extensions/navigation.xml,v
  retrieving revision 1.2
  retrieving revision 1.3
  diff -u -r1.2 -r1.3
  --- navigation.xml	28 Oct 2003 11:42:35 -0000	1.2
  +++ navigation.xml	11 Dec 2003 08:48:12 -0000	1.3
  @@ -15,7 +15,6 @@
   
       <menu name="About Avalon Meta">
         <item name="Overview" href="/index.html"/>
  -      <item name="Getting Started" href="/tutorial/index.html"/>
         <item name="Meta Model" href="/meta/index.html">
           <item name="Descriptors" href="/meta/info/index.html">
             <item name="Type" href="/meta/info/type/index.html">
  
  
  
  1.5       +10 -19    avalon/meta/site/xdocs/meta/info/type/info.xml
  
  Index: info.xml
  ===================================================================
  RCS file: /home/cvs/avalon/meta/site/xdocs/meta/info/type/info.xml,v
  retrieving revision 1.4
  retrieving revision 1.5
  diff -u -r1.4 -r1.5
  --- info.xml	30 Oct 2003 00:44:51 -0000	1.4
  +++ info.xml	11 Dec 2003 08:48:12 -0000	1.5
  @@ -10,24 +10,6 @@
   
       <section name="Info Descriptor">
   
  -      <subsection name="Attributes">
  -        <table>
  -          <tr><th>Attribute</th><th>Required</th><th>Description</th></tr>
  -          <tr>
  -            <td>collection</td><td>no</td>
  -            <td>
  -             Declaration of a decommissioning policy default override.  If 
  -             the value is "liberal" the component will be decommissioned automatically
  -             if all references to the component have ben released.  If the value is
  -             "conservative" the component will be maintained for the life of its parent
  -             (where parent for a singleton is the jvm and for a thread lifestyle - the 
  -             parent is the thread).  The default policy is "liberal" for transient and 
  -             pooled components and "conservative" for singelton and thread lifestyles.
  -            </td>
  -          </tr>
  -        </table>
  -      </subsection>
  -
         <subsection name="Nested Elements">
           <table>
             <tr><th>Element</th><th>Occurance</th><th>Description</th></tr>
  @@ -54,6 +36,15 @@
               <td><a href="../attributes/index.html">attributes</a></td><td>0..1</td>
               <td>
                Declaration of a set of attributes associated with the component type.
  +            </td>
  +          </tr>
  +          <tr>
  +            <td>collection</td><td>0..1</td>
  +            <td>
  +             Declaration of a garbage collection policy default override.  If 
  +             the value is "liberal" the component will be decommissioned automatically
  +             if all references to the component have been released.  If the value is
  +             "conservative" the component will be maintained for the life of its parent.
               </td>
             </tr>
           </table>
  
  
  
  1.3       +0 -1      avalon/meta/site/xdocs/meta/info/type/navigation.xml
  
  Index: navigation.xml
  ===================================================================
  RCS file: /home/cvs/avalon/meta/site/xdocs/meta/info/type/navigation.xml,v
  retrieving revision 1.2
  retrieving revision 1.3
  diff -u -r1.2 -r1.3
  --- navigation.xml	28 Oct 2003 11:42:34 -0000	1.2
  +++ navigation.xml	11 Dec 2003 08:48:12 -0000	1.3
  @@ -15,7 +15,6 @@
   
       <menu name="About Avalon Meta">
         <item name="Overview" href="/index.html"/>
  -      <item name="Getting Started" href="/tutorial/index.html"/>
         <item name="Meta Model" href="/meta/index.html">
           <item name="Descriptors" href="/meta/info/index.html">
             <item name="Type" href="/meta/info/type/index.html">
  
  
  
  1.3       +0 -1      avalon/meta/site/xdocs/meta/info/type/loggers/navigation.xml
  
  Index: navigation.xml
  ===================================================================
  RCS file: /home/cvs/avalon/meta/site/xdocs/meta/info/type/loggers/navigation.xml,v
  retrieving revision 1.2
  retrieving revision 1.3
  diff -u -r1.2 -r1.3
  --- navigation.xml	28 Oct 2003 11:42:35 -0000	1.2
  +++ navigation.xml	11 Dec 2003 08:48:13 -0000	1.3
  @@ -15,7 +15,6 @@
   
       <menu name="About Avalon Meta">
         <item name="Overview" href="/index.html"/>
  -      <item name="Getting Started" href="/tutorial/index.html"/>
         <item name="Meta Model" href="/meta/index.html">
           <item name="Descriptors" href="/meta/info/index.html">
             <item name="Type" href="/meta/info/type/index.html">
  
  
  
  1.3       +0 -1      avalon/meta/site/xdocs/meta/info/type/services/navigation.xml
  
  Index: navigation.xml
  ===================================================================
  RCS file: /home/cvs/avalon/meta/site/xdocs/meta/info/type/services/navigation.xml,v
  retrieving revision 1.2
  retrieving revision 1.3
  diff -u -r1.2 -r1.3
  --- navigation.xml	28 Oct 2003 11:42:35 -0000	1.2
  +++ navigation.xml	11 Dec 2003 08:48:13 -0000	1.3
  @@ -15,7 +15,6 @@
   
       <menu name="About Avalon Meta">
         <item name="Overview" href="/index.html"/>
  -      <item name="Getting Started" href="/tutorial/index.html"/>
         <item name="Meta Model" href="/meta/index.html">
           <item name="Descriptors" href="/meta/info/index.html">
             <item name="Type" href="/meta/info/type/index.html">
  
  
  
  1.3       +0 -1      avalon/meta/site/xdocs/meta/info/type/stages/navigation.xml
  
  Index: navigation.xml
  ===================================================================
  RCS file: /home/cvs/avalon/meta/site/xdocs/meta/info/type/stages/navigation.xml,v
  retrieving revision 1.2
  retrieving revision 1.3
  diff -u -r1.2 -r1.3
  --- navigation.xml	28 Oct 2003 11:42:35 -0000	1.2
  +++ navigation.xml	11 Dec 2003 08:48:13 -0000	1.3
  @@ -15,7 +15,6 @@
   
       <menu name="About Avalon Meta">
         <item name="Overview" href="/index.html"/>
  -      <item name="Getting Started" href="/tutorial/index.html"/>
         <item name="Meta Model" href="/meta/index.html">
           <item name="Descriptors" href="/meta/info/index.html">
             <item name="Type" href="/meta/info/type/index.html">
  
  
  
  1.3       +0 -1      avalon/meta/site/xdocs/meta/navigation.xml
  
  Index: navigation.xml
  ===================================================================
  RCS file: /home/cvs/avalon/meta/site/xdocs/meta/navigation.xml,v
  retrieving revision 1.2
  retrieving revision 1.3
  diff -u -r1.2 -r1.3
  --- navigation.xml	28 Oct 2003 11:42:34 -0000	1.2
  +++ navigation.xml	11 Dec 2003 08:48:13 -0000	1.3
  @@ -14,7 +14,6 @@
   
       <menu name="About Avalon Meta">
         <item name="Overview" href="/index.html"/>
  -      <item name="Getting Started" href="/tutorial/index.html"/>
         <item name="Meta Model" href="/meta/index.html">
           <item name="Descriptors" href="/meta/info/index.html"/>
           <item name="Directives" href="/meta/data/index.html"/>
  
  
  
  1.4       +0 -1      avalon/meta/site/xdocs/navigation.xml
  
  Index: navigation.xml
  ===================================================================
  RCS file: /home/cvs/avalon/meta/site/xdocs/navigation.xml,v
  retrieving revision 1.3
  retrieving revision 1.4
  diff -u -r1.3 -r1.4
  --- navigation.xml	28 Oct 2003 11:42:34 -0000	1.3
  +++ navigation.xml	11 Dec 2003 08:48:13 -0000	1.4
  @@ -15,7 +15,6 @@
   
       <menu name="About Avalon Meta">
         <item name="Overview" href="/index.html"/>
  -      <item name="Getting Started" href="/tutorial/index.html"/>
         <item name="Meta Model" href="/meta/index.html"/>
         <item name="Tools" href="/tools/index.html"/>
         <item name="Javadoc" href="/api/index.html"/>
  
  
  
  1.2       +4 -2      avalon/meta/site/xdocs/tools/maven/index.xml
  
  Index: index.xml
  ===================================================================
  RCS file: /home/cvs/avalon/meta/site/xdocs/tools/maven/index.xml,v
  retrieving revision 1.1
  retrieving revision 1.2
  diff -u -r1.1 -r1.2
  --- index.xml	24 Sep 2003 08:16:01 -0000	1.1
  +++ index.xml	11 Dec 2003 08:48:13 -0000	1.2
  @@ -45,11 +45,13 @@
       <build>
         <!-- more stuff -->
         <resources>
  -        <!-- include the generated meta-info descriptors into you jar file -->
  +        <!-- include the generated meta-info 
  +            descriptors into you jar file -->
           <resource>
             <directory>${basedir}/target/src</directory> 
             <includes>
  -            <include>**/*.x*</include> <!-- meta info desriptors -->
  +            <!-- meta info desriptors -->
  +            <include>**/*.x*</include> 
             </includes>
           </resource>
         </resources>
  
  
  
  1.3       +0 -1      avalon/meta/site/xdocs/tools/maven/navigation.xml
  
  Index: navigation.xml
  ===================================================================
  RCS file: /home/cvs/avalon/meta/site/xdocs/tools/maven/navigation.xml,v
  retrieving revision 1.2
  retrieving revision 1.3
  diff -u -r1.2 -r1.3
  --- navigation.xml	28 Oct 2003 11:42:35 -0000	1.2
  +++ navigation.xml	11 Dec 2003 08:48:13 -0000	1.3
  @@ -15,7 +15,6 @@
   
       <menu name="About Avalon Meta">
         <item name="Overview" href="/index.html"/>
  -      <item name="Getting Started" href="/tutorial/index.html"/>
         <item name="Meta Model" href="/meta/index.html"/>
         <item name="Tools" href="/tools/index.html">
           <item name="Javadoc Tags Reference" href="/tools/tags/index.html"/>
  
  
  
  1.4       +0 -1      avalon/meta/site/xdocs/tools/navigation.xml
  
  Index: navigation.xml
  ===================================================================
  RCS file: /home/cvs/avalon/meta/site/xdocs/tools/navigation.xml,v
  retrieving revision 1.3
  retrieving revision 1.4
  diff -u -r1.3 -r1.4
  --- navigation.xml	28 Oct 2003 11:42:35 -0000	1.3
  +++ navigation.xml	11 Dec 2003 08:48:13 -0000	1.4
  @@ -15,7 +15,6 @@
   
       <menu name="About Avalon Meta">
         <item name="Overview" href="/index.html"/>
  -      <item name="Getting Started" href="/tutorial/index.html"/>
         <item name="Meta Model" href="/meta/index.html"/>
         <item name="Tools" href="/tools/index.html">
           <item name="Javadoc Tags Reference" href="/tools/tags/index.html"/>
  
  
  
  1.3       +0 -1      avalon/meta/site/xdocs/tools/tags/navigation.xml
  
  Index: navigation.xml
  ===================================================================
  RCS file: /home/cvs/avalon/meta/site/xdocs/tools/tags/navigation.xml,v
  retrieving revision 1.2
  retrieving revision 1.3
  diff -u -r1.2 -r1.3
  --- navigation.xml	28 Oct 2003 11:42:35 -0000	1.2
  +++ navigation.xml	11 Dec 2003 08:48:13 -0000	1.3
  @@ -15,7 +15,6 @@
   
       <menu name="About Avalon Meta">
         <item name="Overview" href="/index.html"/>
  -      <item name="Getting Started" href="/tutorial/index.html"/>
         <item name="Meta Model" href="/meta/index.html"/>
         <item name="Tools" href="/tools/index.html">
           <item name="Javadoc Tags Reference" href="/tools/tags/index.html">
  
  
  
  1.3       +0 -1      avalon/meta/site/xdocs/tutorial/navigation.xml
  
  Index: navigation.xml
  ===================================================================
  RCS file: /home/cvs/avalon/meta/site/xdocs/tutorial/navigation.xml,v
  retrieving revision 1.2
  retrieving revision 1.3
  diff -u -r1.2 -r1.3
  --- navigation.xml	28 Oct 2003 11:42:35 -0000	1.2
  +++ navigation.xml	11 Dec 2003 08:48:13 -0000	1.3
  @@ -15,7 +15,6 @@
   
       <menu name="About Avalon Meta">
         <item name="Overview" href="/index.html"/>
  -      <item name="Getting Started" href="/tutorial/index.html"/>
         <item name="Meta Model" href="/meta/index.html"/>
         <item name="Tools" href="/tools/index.html"/>
         <item name="Javadoc" href="/api/index.html"/>
  
  
  

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