avalon-cvs mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From mcconn...@apache.org
Subject cvs commit: avalon/merlin/platform/xdocs/resources download.xml
Date Wed, 01 Oct 2003 10:03:09 GMT
mcconnell    2003/10/01 03:03:09

  Modified:    merlin/platform/src/etc site.jsl
               merlin/platform/xdocs/meta/block navigation.xml
               merlin/platform/xdocs/meta/block/classloader navigation.xml
               merlin/platform/xdocs/meta/block/classloader/classpath
                        navigation.xml
               merlin/platform/xdocs/meta/block/classloader/classpath/repository
                        navigation.xml
               merlin/platform/xdocs/meta/block/components navigation.xml
               merlin/platform/xdocs/meta/block/components/categories
                        navigation.xml
               merlin/platform/xdocs/meta/block/components/context
                        navigation.xml
               merlin/platform/xdocs/meta/block/components/context/entry
                        navigation.xml
               merlin/platform/xdocs/meta/block/components/context/entry/constructor
                        navigation.xml
               merlin/platform/xdocs/meta/block/components/dependencies
                        navigation.xml
               merlin/platform/xdocs/meta/block/components/parameters
                        navigation.xml
               merlin/platform/xdocs/meta/block/include navigation.xml
               merlin/platform/xdocs/meta/block/services navigation.xml
               merlin/platform/xdocs/resources download.xml
  Log:
  Correct error in docs that reference blocks.xml instead of block.xml.
  
  Revision  Changes    Path
  1.2       +11 -1     avalon/merlin/platform/src/etc/site.jsl
  
  Index: site.jsl
  ===================================================================
  RCS file: /home/cvs/avalon/merlin/platform/src/etc/site.jsl,v
  retrieving revision 1.1
  retrieving revision 1.2
  diff -u -r1.1 -r1.2
  --- site.jsl	24 Sep 2003 09:33:40 -0000	1.1
  +++ site.jsl	1 Oct 2003 10:03:08 -0000	1.2
  @@ -126,12 +126,21 @@
                   </j:if>
                 </td>
   
  +              <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>
  +
  +
                 <!-- project logo and link -->
  +              <!--
                 <td>
                   <div align="right" id="login">
                     <j:set var="logo" value="${pom.logo}"/>
                     <j:if test="${logo != null and logo != ''}">
  -                    <!-- set image to relative or complete -->
                       <j:set var="image" value="${pom.logo}"/>
                       <j:if test="${!image.startsWith('http://')}">
                         <j:set var="image" value="${relativePath}${image}"/>
  @@ -143,6 +152,7 @@
                     </j:if>
                   </div>
                 </td>
  +              -->
               </tr>
             </table>
           </div>
  
  
  
  1.2       +1 -1      avalon/merlin/platform/xdocs/meta/block/navigation.xml
  
  Index: navigation.xml
  ===================================================================
  RCS file: /home/cvs/avalon/merlin/platform/xdocs/meta/block/navigation.xml,v
  retrieving revision 1.1
  retrieving revision 1.2
  diff -u -r1.1 -r1.2
  --- navigation.xml	24 Sep 2003 09:34:45 -0000	1.1
  +++ navigation.xml	1 Oct 2003 10:03:08 -0000	1.2
  @@ -68,7 +68,7 @@
         <item name="Merlin System" href="/merlin/index.html"/>
         <item name="Meta Model" href="/meta/index.html">
           <item name="kernel.xml" href="/meta/kernel/index.html"/>
  -        <item name="blocks.xml" href="/meta/block/index.html">
  +        <item name="block.xml" href="/meta/block/index.html">
             <item name="services" href="/meta/block/services/index.html"/>
             <item name="classloader" href="/meta/block/classloader/index.html"/>
             <item name="component" href="/meta/block/components/index.html"/>
  
  
  
  1.2       +1 -1      avalon/merlin/platform/xdocs/meta/block/classloader/navigation.xml
  
  Index: navigation.xml
  ===================================================================
  RCS file: /home/cvs/avalon/merlin/platform/xdocs/meta/block/classloader/navigation.xml,v
  retrieving revision 1.1
  retrieving revision 1.2
  diff -u -r1.1 -r1.2
  --- navigation.xml	24 Sep 2003 09:34:46 -0000	1.1
  +++ navigation.xml	1 Oct 2003 10:03:08 -0000	1.2
  @@ -68,7 +68,7 @@
         <item name="Merlin System" href="/merlin/index.html"/>
         <item name="Meta Model" href="/meta/index.html">
           <item name="kernel.xml" href="/meta/kernel/index.html"/>
  -        <item name="blocks.xml" href="/meta/block/index.html">
  +        <item name="block.xml" href="/meta/block/index.html">
             <item name="services" href="/meta/block/services/index.html"/>
             <item name="classloader" href="/meta/block/classloader/index.html">
               <item name="classpath" href="/meta/block/classloader/classpath/index.html"/>
  
  
  
  1.2       +1 -1      avalon/merlin/platform/xdocs/meta/block/classloader/classpath/navigation.xml
  
  Index: navigation.xml
  ===================================================================
  RCS file: /home/cvs/avalon/merlin/platform/xdocs/meta/block/classloader/classpath/navigation.xml,v
  retrieving revision 1.1
  retrieving revision 1.2
  diff -u -r1.1 -r1.2
  --- navigation.xml	24 Sep 2003 09:34:47 -0000	1.1
  +++ navigation.xml	1 Oct 2003 10:03:08 -0000	1.2
  @@ -67,7 +67,7 @@
         <item name="Merlin System" href="/merlin/index.html"/>
         <item name="Meta Model" href="/meta/index.html">
           <item name="kernel.xml" href="/meta/kernel/index.html"/>
  -        <item name="blocks.xml" href="/meta/block/index.html">
  +        <item name="block.xml" href="/meta/block/index.html">
             <item name="services" href="/meta/block/services/index.html"/>
             <item name="classloader" href="/meta/block/classloader/index.html">
               <item name="classpath" href="/meta/block/classloader/classpath/index.html">
  
  
  
  1.2       +1 -1      avalon/merlin/platform/xdocs/meta/block/classloader/classpath/repository/navigation.xml
  
  Index: navigation.xml
  ===================================================================
  RCS file: /home/cvs/avalon/merlin/platform/xdocs/meta/block/classloader/classpath/repository/navigation.xml,v
  retrieving revision 1.1
  retrieving revision 1.2
  diff -u -r1.1 -r1.2
  --- navigation.xml	24 Sep 2003 09:34:48 -0000	1.1
  +++ navigation.xml	1 Oct 2003 10:03:08 -0000	1.2
  @@ -68,7 +68,7 @@
         <item name="Merlin System" href="/merlin/index.html"/>
         <item name="Meta Model" href="/meta/index.html">
           <item name="kernel.xml" href="/meta/kernel/index.html"/>
  -        <item name="blocks.xml" href="/meta/block/index.html">
  +        <item name="block.xml" href="/meta/block/index.html">
             <item name="services" href="/meta/block/services/index.html"/>
             <item name="classloader" href="/meta/block/classloader/index.html">
               <item name="classpath" href="/meta/block/classloader/classpath/index.html">
  
  
  
  1.2       +1 -1      avalon/merlin/platform/xdocs/meta/block/components/navigation.xml
  
  Index: navigation.xml
  ===================================================================
  RCS file: /home/cvs/avalon/merlin/platform/xdocs/meta/block/components/navigation.xml,v
  retrieving revision 1.1
  retrieving revision 1.2
  diff -u -r1.1 -r1.2
  --- navigation.xml	24 Sep 2003 09:34:54 -0000	1.1
  +++ navigation.xml	1 Oct 2003 10:03:09 -0000	1.2
  @@ -67,7 +67,7 @@
         <item name="Merlin System" href="/merlin/index.html"/>
         <item name="Meta Model" href="/meta/index.html">
           <item name="kernel.xml" href="/meta/kernel/index.html"/>
  -        <item name="blocks.xml" href="/meta/block/index.html">
  +        <item name="block.xml" href="/meta/block/index.html">
             <item name="services" href="/meta/block/services/index.html"/>
             <item name="classloader" href="/meta/block/classloader/index.html"/>
             <item name="component" href="/meta/block/components/index.html">
  
  
  
  1.2       +1 -1      avalon/merlin/platform/xdocs/meta/block/components/categories/navigation.xml
  
  Index: navigation.xml
  ===================================================================
  RCS file: /home/cvs/avalon/merlin/platform/xdocs/meta/block/components/categories/navigation.xml,v
  retrieving revision 1.1
  retrieving revision 1.2
  diff -u -r1.1 -r1.2
  --- navigation.xml	24 Sep 2003 09:34:55 -0000	1.1
  +++ navigation.xml	1 Oct 2003 10:03:09 -0000	1.2
  @@ -67,7 +67,7 @@
         <item name="Merlin System" href="/merlin/index.html"/>
         <item name="Meta Model" href="/meta/index.html">
           <item name="kernel.xml" href="/meta/kernel/index.html"/>
  -        <item name="blocks.xml" href="/meta/block/index.html">
  +        <item name="block.xml" href="/meta/block/index.html">
             <item name="services" href="/meta/block/services/index.html"/>
             <item name="classloader" href="/meta/block/classloader/index.html"/>
             <item name="component" href="/meta/block/components/index.html">
  
  
  
  1.2       +1 -1      avalon/merlin/platform/xdocs/meta/block/components/context/navigation.xml
  
  Index: navigation.xml
  ===================================================================
  RCS file: /home/cvs/avalon/merlin/platform/xdocs/meta/block/components/context/navigation.xml,v
  retrieving revision 1.1
  retrieving revision 1.2
  diff -u -r1.1 -r1.2
  --- navigation.xml	24 Sep 2003 09:34:56 -0000	1.1
  +++ navigation.xml	1 Oct 2003 10:03:09 -0000	1.2
  @@ -67,7 +67,7 @@
         <item name="Merlin System" href="/merlin/index.html"/>
         <item name="Meta Model" href="/meta/index.html">
           <item name="kernel.xml" href="/meta/kernel/index.html"/>
  -        <item name="blocks.xml" href="/meta/block/index.html">
  +        <item name="block.xml" href="/meta/block/index.html">
             <item name="services" href="/meta/block/services/index.html"/>
             <item name="classloader" href="/meta/block/classloader/index.html"/>
             <item name="component" href="/meta/block/components/index.html">
  
  
  
  1.2       +1 -1      avalon/merlin/platform/xdocs/meta/block/components/context/entry/navigation.xml
  
  Index: navigation.xml
  ===================================================================
  RCS file: /home/cvs/avalon/merlin/platform/xdocs/meta/block/components/context/entry/navigation.xml,v
  retrieving revision 1.1
  retrieving revision 1.2
  diff -u -r1.1 -r1.2
  --- navigation.xml	24 Sep 2003 09:34:57 -0000	1.1
  +++ navigation.xml	1 Oct 2003 10:03:09 -0000	1.2
  @@ -68,7 +68,7 @@
         <item name="Merlin System" href="/merlin/index.html"/>
         <item name="Meta Model" href="/meta/index.html">
           <item name="kernel.xml" href="/meta/kernel/index.html"/>
  -        <item name="blocks.xml" href="/meta/block/index.html">
  +        <item name="block.xml" href="/meta/block/index.html">
             <item name="services" href="/meta/block/services/index.html"/>
             <item name="classloader" href="/meta/block/classloader/index.html"/>
             <item name="component" href="/meta/block/components/index.html">
  
  
  
  1.2       +1 -1      avalon/merlin/platform/xdocs/meta/block/components/context/entry/constructor/navigation.xml
  
  Index: navigation.xml
  ===================================================================
  RCS file: /home/cvs/avalon/merlin/platform/xdocs/meta/block/components/context/entry/constructor/navigation.xml,v
  retrieving revision 1.1
  retrieving revision 1.2
  diff -u -r1.1 -r1.2
  --- navigation.xml	24 Sep 2003 09:34:58 -0000	1.1
  +++ navigation.xml	1 Oct 2003 10:03:09 -0000	1.2
  @@ -68,7 +68,7 @@
         <item name="Merlin System" href="/merlin/index.html"/>
         <item name="Meta Model" href="/meta/index.html">
           <item name="kernel.xml" href="/meta/kernel/index.html"/>
  -        <item name="blocks.xml" href="/meta/block/index.html">
  +        <item name="block.xml" href="/meta/block/index.html">
             <item name="services" href="/meta/block/services/index.html"/>
             <item name="classloader" href="/meta/block/classloader/index.html"/>
             <item name="component" href="/meta/block/components/index.html">
  
  
  
  1.2       +1 -1      avalon/merlin/platform/xdocs/meta/block/components/dependencies/navigation.xml
  
  Index: navigation.xml
  ===================================================================
  RCS file: /home/cvs/avalon/merlin/platform/xdocs/meta/block/components/dependencies/navigation.xml,v
  retrieving revision 1.1
  retrieving revision 1.2
  diff -u -r1.1 -r1.2
  --- navigation.xml	24 Sep 2003 09:35:02 -0000	1.1
  +++ navigation.xml	1 Oct 2003 10:03:09 -0000	1.2
  @@ -68,7 +68,7 @@
         <item name="Merlin System" href="/merlin/index.html"/>
         <item name="Meta Model" href="/meta/index.html">
           <item name="kernel.xml" href="/meta/kernel/index.html"/>
  -        <item name="blocks.xml" href="/meta/block/index.html">
  +        <item name="block.xml" href="/meta/block/index.html">
             <item name="services" href="/meta/block/services/index.html"/>
             <item name="classloader" href="/meta/block/classloader/index.html"/>
             <item name="component" href="/meta/block/components/index.html">
  
  
  
  1.2       +1 -1      avalon/merlin/platform/xdocs/meta/block/components/parameters/navigation.xml
  
  Index: navigation.xml
  ===================================================================
  RCS file: /home/cvs/avalon/merlin/platform/xdocs/meta/block/components/parameters/navigation.xml,v
  retrieving revision 1.1
  retrieving revision 1.2
  diff -u -r1.1 -r1.2
  --- navigation.xml	24 Sep 2003 09:35:03 -0000	1.1
  +++ navigation.xml	1 Oct 2003 10:03:09 -0000	1.2
  @@ -68,7 +68,7 @@
         <item name="Merlin System" href="/merlin/index.html"/>
         <item name="Meta Model" href="/meta/index.html">
           <item name="kernel.xml" href="/meta/kernel/index.html"/>
  -        <item name="blocks.xml" href="/meta/block/index.html">
  +        <item name="block.xml" href="/meta/block/index.html">
             <item name="services" href="/meta/block/services/index.html"/>
             <item name="classloader" href="/meta/block/classloader/index.html"/>
             <item name="component" href="/meta/block/components/index.html">
  
  
  
  1.2       +1 -1      avalon/merlin/platform/xdocs/meta/block/include/navigation.xml
  
  Index: navigation.xml
  ===================================================================
  RCS file: /home/cvs/avalon/merlin/platform/xdocs/meta/block/include/navigation.xml,v
  retrieving revision 1.1
  retrieving revision 1.2
  diff -u -r1.1 -r1.2
  --- navigation.xml	24 Sep 2003 09:35:03 -0000	1.1
  +++ navigation.xml	1 Oct 2003 10:03:09 -0000	1.2
  @@ -68,7 +68,7 @@
         <item name="Merlin System" href="/merlin/index.html"/>
         <item name="Meta Model" href="/meta/index.html">
           <item name="kernel.xml" href="/meta/kernel/index.html"/>
  -        <item name="blocks.xml" href="/meta/block/index.html">
  +        <item name="block.xml" href="/meta/block/index.html">
             <item name="services" href="/meta/block/services/index.html"/>
             <item name="classloader" href="/meta/block/classloader/index.html"/>
             <item name="component" href="/meta/block/components/index.html"/>
  
  
  
  1.2       +1 -1      avalon/merlin/platform/xdocs/meta/block/services/navigation.xml
  
  Index: navigation.xml
  ===================================================================
  RCS file: /home/cvs/avalon/merlin/platform/xdocs/meta/block/services/navigation.xml,v
  retrieving revision 1.1
  retrieving revision 1.2
  diff -u -r1.1 -r1.2
  --- navigation.xml	24 Sep 2003 09:35:05 -0000	1.1
  +++ navigation.xml	1 Oct 2003 10:03:09 -0000	1.2
  @@ -68,7 +68,7 @@
         <item name="Merlin System" href="/merlin/index.html"/>
         <item name="Meta Model" href="/meta/index.html">
           <item name="kernel.xml" href="/meta/kernel/index.html"/>
  -        <item name="blocks.xml" href="/meta/block/index.html">
  +        <item name="block.xml" href="/meta/block/index.html">
             <item name="services" href="/meta/block/services/index.html">
               <item name="services" href="/meta/block/services/service.html"/>
             </item>
  
  
  
  1.3       +2 -2      avalon/merlin/platform/xdocs/resources/download.xml
  
  Index: download.xml
  ===================================================================
  RCS file: /home/cvs/avalon/merlin/platform/xdocs/resources/download.xml,v
  retrieving revision 1.2
  retrieving revision 1.3
  diff -u -r1.2 -r1.3
  --- download.xml	26 Sep 2003 01:46:36 -0000	1.2
  +++ download.xml	1 Oct 2003 10:03:09 -0000	1.3
  @@ -66,8 +66,8 @@
           </p>
   
           <p>
  -        <a href="http://www.dpml.net/merlin/distributions/?M=D">Interim builds</a>
of the 
  -        Merlin platform are hosted under the DPML.  Please note that snapshot builds are

  +        <a href="http://www.dpml.net/merlin/distributions/?M=D">Final, interim and
snapshot builds</a> of the 
  +        Merlin platform are also hosted under the DPML.  Please note that interim and snapshot
builds are 
           not subject to a formal release review process.
           </p>
   
  
  
  

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


Mime
View raw message