hammant     2002/08/10 15:02:43

  Modified:    docs/excalibur/configuration configuration-merger.html
                        index.html
               docs/excalibur/configuration/skin site.css
  Log:
  api updates
  
  Revision  Changes    Path
  1.2       +9 -2      
jakarta-avalon-site/docs/excalibur/configuration/configuration-merger.html
  
  Index: configuration-merger.html
  ===================================================================
  RCS file: 
/home/cvs/jakarta-avalon-site/docs/excalibur/configuration/configuration-merger.html,v
  retrieving revision 1.1
  retrieving revision 1.2
  diff -u -r1.1 -r1.2
  --- configuration-merger.html 22 Jul 2002 21:21:12 -0000      1.1
  +++ configuration-merger.html 10 Aug 2002 22:02:43 -0000      1.2
  @@ -1,5 +1,12 @@
   <!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" 
"http://www.w3.org/TR/html4/loose.dtd";>
  -<html><head><META http-equiv="Content-Type" content="text/html; 
charset=ISO-8859-1"><link rel="stylesheet" href="skin/tigris.css" 
type="text/css"><link rel="stylesheet" href="skin/site.css" type="text/css"><link 
media="print" rel="stylesheet" href="skin/print.css" type="text/css"><meta 
value="Avalon Documentation Team" name="author"><meta 
value="[EMAIL PROTECTED]" name="email"><title>Configuration 
Merger</title></head><body class="composite" marginheight="0" marginwidth="0"><div 
id="banner"><table width="100%" cellpadding="8" cellspacing="0" 
border="0"><tbody><tr><td align="left"><a href="http://jakarta.apache.org/";><img 
border="0" src="images/jakarta-logo.gif"></a></td><td align="right"><a 
href="http://jakarta.apache.org/avalon/";><img border="0" 
src="images/header.gif"></a></td></tr></tbody></table></div><div 
id="breadcrumbs"><script src="skin/breadcrumbs.js" language="JavaScript" 
type="text/javascript"></script></div><table id="main" width="100%" cellpadding="8" 
cellspacing="0" border="0"><tbody><tr valign="top"><td id="leftcol"><div 
id="navcolumn"><div><strong>About</strong><div><a 
href="index.html">Overview</a></div><div><a 
href="configuration-merger.html">Configuration Merger</a></div><div><a 
href="http://jakarta.apache.org/avalon/excalibur/index.html";>Excalibur 
Home</a></div><div><a 
href="http://jakarta.apache.org/builds/jakarta-avalon-excalibur/release";>Download</a></div><div><a
 href="api">API Docs</a></div></div></div></td><td><div id="bodycol"><div 
class="app"><div align="center"><h1>Configuration Merger</h1><h2></h2></div><div 
class="h3">
  +<html><head><META http-equiv="Content-Type" content="text/html; 
charset=ISO-8859-1"><link rel="stylesheet" href="skin/tigris.css" 
type="text/css"><link rel="stylesheet" href="skin/site.css" type="text/css"><link 
media="print" rel="stylesheet" href="skin/print.css" type="text/css"><meta 
value="Avalon Documentation Team" name="author"><meta 
value="[EMAIL PROTECTED]" name="email"><title>Configuration 
Merger</title></head><body bgcolor="white" class="composite" marginheight="0" 
marginwidth="0"><div id="banner"><table width="100%" cellpadding="8" cellspacing="0" 
border="0"><tbody><tr><td align="left"><a href="http://jakarta.apache.org/";><img 
border="0" src="images/jakarta-logo.gif"></a></td><td align="right"><a 
href="http://jakarta.apache.org/avalon/";><img border="0" 
src="images/header.gif"></a></td></tr></tbody></table></div><table width="100%" 
cellpadding="0" cellspacing="0" border="0" id="breadcrumbs"><td><a 
href="http://jakarta.apache.org/";>Jakarta Main</a> |
  +            <a href="http://jakarta.apache.org/avalon";>Avalon Main</a> |
  +            <a href="../">Up</a></td><td style="text-align: right" align="right"><a 
href="http://jakarta.apache.org/avalon/framework/";>Framework</a> |
  +            <a href="http://jakarta.apache.org/avalon/excalibur/";>Excalibur</a> |
  +            <a href="http://jakarta.apache.org/avalon/cornerstone/";>Cornerstone</a> 
|
  +            <a href="http://jakarta.apache.org/avalon/phoenix/";>Phoenix</a> |
  +            <a href="http://jakarta.apache.org/avalon/apps/";>Apps</a> |
  +            <a 
href="http://jakarta.apache.org/avalon/logkit/";>Logkit</a></td></table><table 
id="main" width="100%" cellpadding="8" cellspacing="0" border="0"><tbody><tr 
valign="top"><td id="leftcol"><div id="navcolumn"><div><strong>About</strong><div><a 
href="index.html">Overview</a></div><div><a 
href="configuration-merger.html">Configuration Merger</a></div><div><a 
href="http://jakarta.apache.org/avalon/excalibur/index.html";>Excalibur 
Home</a></div><div><a 
href="http://jakarta.apache.org/builds/jakarta-avalon-excalibur/release";>Download</a></div><div><a
 href="api">API Docs</a></div></div></div></td><td><div id="bodycol"><div 
class="app"><div align="center"><h1>Configuration Merger</h1><h2></h2></div><div 
class="h3">
     
     
       <div class="h3"><h3>What is the Configuration Merger?</h3></div>
  @@ -103,7 +110,7 @@
     
   
     
  -<div id="authors" align="right">by&nbsp;<a href="mailto:[EMAIL PROTECTED]";>Peter 
Royal</a></div></div></div></div></td></tr></tbody></table><div id="footer"><table 
width="100%" cellpadding="4" cellspacing="0" border="0"><tbody><tr><td 
align="left">Copyright &copy; 1999-2002 Apache Software Foundation. All Rights 
Reserved.</td><td></td><td align="right"><script language="JavaScript">
  +<div id="authors" align="right">by&nbsp;Peter 
Royal</div></div></div></div></td></tr></tbody></table><div id="footer"><table 
width="100%" cellpadding="4" cellspacing="0" border="0"><tbody><tr><td 
align="left">Copyright &copy; 2002 Apache Software Foundation. All Rights 
Reserved.</td><td></td><td align="right"><script language="JavaScript">
                             <!--
                                     document.write("last modified: " + 
document.lastModified);
                             //  -->
  
  
  
  1.2       +19 -3     jakarta-avalon-site/docs/excalibur/configuration/index.html
  
  Index: index.html
  ===================================================================
  RCS file: /home/cvs/jakarta-avalon-site/docs/excalibur/configuration/index.html,v
  retrieving revision 1.1
  retrieving revision 1.2
  diff -u -r1.1 -r1.2
  --- index.html        22 Jul 2002 21:21:12 -0000      1.1
  +++ index.html        10 Aug 2002 22:02:43 -0000      1.2
  @@ -1,5 +1,12 @@
   <!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" 
"http://www.w3.org/TR/html4/loose.dtd";>
  -<html><head><META http-equiv="Content-Type" content="text/html; 
charset=ISO-8859-1"><link rel="stylesheet" href="skin/tigris.css" 
type="text/css"><link rel="stylesheet" href="skin/site.css" type="text/css"><link 
media="print" rel="stylesheet" href="skin/print.css" type="text/css"><meta 
value="Avalon Documentation Team" name="author"><meta 
value="[EMAIL PROTECTED]" name="email"><title>Excalibur Configuration - 
Overview</title></head><body class="composite" marginheight="0" marginwidth="0"><div 
id="banner"><table width="100%" cellpadding="8" cellspacing="0" 
border="0"><tbody><tr><td align="left"><a href="http://jakarta.apache.org/";><img 
border="0" src="images/jakarta-logo.gif"></a></td><td align="right"><a 
href="http://jakarta.apache.org/avalon/";><img border="0" 
src="images/header.gif"></a></td></tr></tbody></table></div><div 
id="breadcrumbs"><script src="skin/breadcrumbs.js" language="JavaScript" 
type="text/javascript"></script></div><table id="main" width="100%" cellpadding="8" 
cellspacing="0" border="0"><tbody><tr valign="top"><td id="leftcol"><div 
id="navcolumn"><div><strong>About</strong><div><a 
href="index.html">Overview</a></div><div><a 
href="configuration-merger.html">Configuration Merger</a></div><div><a 
href="http://jakarta.apache.org/avalon/excalibur/index.html";>Excalibur 
Home</a></div><div><a 
href="http://jakarta.apache.org/builds/jakarta-avalon-excalibur/release";>Download</a></div><div><a
 href="api">API Docs</a></div></div></div></td><td><div id="bodycol"><div 
class="app"><div align="center"><h1>Excalibur Configuration - 
Overview</h1><h2></h2></div><div class="h3">
  +<html><head><META http-equiv="Content-Type" content="text/html; 
charset=ISO-8859-1"><link rel="stylesheet" href="skin/tigris.css" 
type="text/css"><link rel="stylesheet" href="skin/site.css" type="text/css"><link 
media="print" rel="stylesheet" href="skin/print.css" type="text/css"><meta 
value="Avalon Documentation Team" name="author"><meta 
value="[EMAIL PROTECTED]" name="email"><title>Excalibur Configuration - 
Overview</title></head><body bgcolor="white" class="composite" marginheight="0" 
marginwidth="0"><div id="banner"><table width="100%" cellpadding="8" cellspacing="0" 
border="0"><tbody><tr><td align="left"><a href="http://jakarta.apache.org/";><img 
border="0" src="images/jakarta-logo.gif"></a></td><td align="right"><a 
href="http://jakarta.apache.org/avalon/";><img border="0" 
src="images/header.gif"></a></td></tr></tbody></table></div><table width="100%" 
cellpadding="0" cellspacing="0" border="0" id="breadcrumbs"><td><a 
href="http://jakarta.apache.org/";>Jakarta Main</a> |
  +            <a href="http://jakarta.apache.org/avalon";>Avalon Main</a> |
  +            <a href="../">Up</a></td><td style="text-align: right" align="right"><a 
href="http://jakarta.apache.org/avalon/framework/";>Framework</a> |
  +            <a href="http://jakarta.apache.org/avalon/excalibur/";>Excalibur</a> |
  +            <a href="http://jakarta.apache.org/avalon/cornerstone/";>Cornerstone</a> 
|
  +            <a href="http://jakarta.apache.org/avalon/phoenix/";>Phoenix</a> |
  +            <a href="http://jakarta.apache.org/avalon/apps/";>Apps</a> |
  +            <a 
href="http://jakarta.apache.org/avalon/logkit/";>Logkit</a></td></table><table 
id="main" width="100%" cellpadding="8" cellspacing="0" border="0"><tbody><tr 
valign="top"><td id="leftcol"><div id="navcolumn"><div><strong>About</strong><div><a 
href="index.html">Overview</a></div><div><a 
href="configuration-merger.html">Configuration Merger</a></div><div><a 
href="http://jakarta.apache.org/avalon/excalibur/index.html";>Excalibur 
Home</a></div><div><a 
href="http://jakarta.apache.org/builds/jakarta-avalon-excalibur/release";>Download</a></div><div><a
 href="api">API Docs</a></div></div></div></td><td><div id="bodycol"><div 
class="app"><div align="center"><h1>Excalibur Configuration - 
Overview</h1><h2></h2></div><div class="h3">
     
     
       <div class="h3"><h3>Introduction</h3></div>
  @@ -29,7 +36,10 @@
           </p>
           <p>
   Also provides a branch operation to take a Configuration object and rename it but
  -retain all attributes and children
  +retain all attributes and children.
  +        </p>
  +        <p>
  +Additionally, provide an method to test the equality of two Configuration objects
           </p>
         
         <div class="h4"><h4>ConfigurationMerger</h4></div>
  @@ -42,10 +52,16 @@
   layer.
           </p>
         
  +      <div class="h4"><h4>ConfigurationSplitter</h4></div>
  +        <p>
  +Given a Configuration and a "base", generate the "layer" that when passed to
  +the ConfigurationMerger will yield the original Configuration.
  +        </p>
  +      
       
     
     
  -<div id="authors" align="right">by&nbsp;<a 
href="mailto:[EMAIL PROTECTED]";>Stephen McConnell</a>,&nbsp;<a 
href="mailto:[EMAIL PROTECTED]";>Peter 
Royal</a></div></div></div></div></td></tr></tbody></table><div id="footer"><table 
width="100%" cellpadding="4" cellspacing="0" border="0"><tbody><tr><td 
align="left">Copyright &copy; 1999-2002 Apache Software Foundation. All Rights 
Reserved.</td><td></td><td align="right"><script language="JavaScript">
  +<div id="authors" align="right">by&nbsp;Stephen McConnell,&nbsp;Peter 
Royal</div></div></div></div></td></tr></tbody></table><div id="footer"><table 
width="100%" cellpadding="4" cellspacing="0" border="0"><tbody><tr><td 
align="left">Copyright &copy; 2002 Apache Software Foundation. All Rights 
Reserved.</td><td></td><td align="right"><script language="JavaScript">
                             <!--
                                     document.write("last modified: " + 
document.lastModified);
                             //  -->
  
  
  
  1.2       +4 -8      jakarta-avalon-site/docs/excalibur/configuration/skin/site.css
  
  Index: site.css
  ===================================================================
  RCS file: /home/cvs/jakarta-avalon-site/docs/excalibur/configuration/skin/site.css,v
  retrieving revision 1.1
  retrieving revision 1.2
  diff -u -r1.1 -r1.2
  --- site.css  22 Jul 2002 21:22:22 -0000      1.1
  +++ site.css  10 Aug 2002 22:02:43 -0000      1.2
  @@ -28,21 +28,17 @@
   /* make the whole column grey */
   #navcolumn {
    width: 150px;
  - background: none;
  - border-top: none;
  - border-right: none;
  - border-bottom: none;
    }
   
   #leftcol {
    width: 150px;
  - background: #eee;
  - border-top: 1px solid #fff;
  - border-right: 1px solid #aaa;
  - border-bottom: 1px solid #aaa;
   }
   
   /* breadcrumbs */
  +#breadcrumbs
  +{
  +     font-weight: bold;
  +}
   .breadcrumbTrail
   {
        padding-left: 5px;
  
  
  

--
To unsubscribe, e-mail:   <mailto:[EMAIL PROTECTED]>
For additional commands, e-mail: <mailto:[EMAIL PROTECTED]>

Reply via email to