jefft       2002/11/21 21:44:55

  Modified:    .        Tag: FORREST-branch forrest.properties
               src/documentation Tag: FORREST-branch sitemap.xmap
                        skinconf.xml
               src/documentation/content/framework Tag: FORREST-branch
                        for-developers-changes.xml guide-cop-in-avalon.xml
                        guide-patterns-in-avalon.xml
                        guide-patterns-soii.xml index.xml
  Added:       src/documentation/content/developing Tag: FORREST-branch
                        book.xml
               src/documentation/content/framework Tag: FORREST-branch
                        book.xml
               src/documentation/content/history Tag: FORREST-branch
                        book.xml
               src/documentation/content/images Tag: FORREST-branch
                        jakarta-logo.gif
  Removed:     src/documentation/content/developing Tag: FORREST-branch
                        menu.xml
               src/documentation/resources/images Tag: FORREST-branch
                        group-logo.gif
  Log:
  More doc forrestization
  Submitted by: Peter Donald
  
  Revision  Changes    Path
  No                   revision
  
  
  No                   revision
  
  
  1.1.2.3   +8 -5      jakarta-avalon/Attic/forrest.properties
  
  Index: forrest.properties
  ===================================================================
  RCS file: /home/cvs/jakarta-avalon/Attic/forrest.properties,v
  retrieving revision 1.1.2.2
  retrieving revision 1.1.2.3
  diff -u -r1.1.2.2 -r1.1.2.3
  --- forrest.properties        17 Nov 2002 00:59:18 -0000      1.1.2.2
  +++ forrest.properties        22 Nov 2002 05:44:54 -0000      1.1.2.3
  @@ -3,10 +3,10 @@
   ##############
   
   # Prints out a summary of Forrest settings for this project
  -#forrest.echo=true 
  +#forrest.echo=true
   
   # Project name (used to name .war file)
  -project.name=thinktank
  +project.name=avalon
   
   # Specifies name of Forrest skin to use
   project.skin=avalon-tigris
  @@ -16,15 +16,18 @@
   
   project.temp-dir=target/forrest
   project.site-dir=target/site
  -
  +forrest.validate=true
  +validate.xdocs=true
  +forrest.validate.xdocs.excludes=developing/*,authors/*,history/changes.xml
   #project.debuglevel=WARN
   
   # Properties that must be set to override the default locations
   #project.status=status.xml
  -#project.content-dir=src/documentation
  +project.content-dir=src/documentation
  +project.xdocs-dir=${project.content-dir}/content
   #project.conf-dir=${project.content-dir}/conf
   #project.sitemap=${project.content-dir}/sitemap.xmap
  -#project.xdocs-dir=${project.content-dir}/content/xdocs
  +
   #project.stylesheets-dir=${project.content-dir}/resources/stylesheets
   #project.images-dir=${project.content-dir}/resources/images
   #project.schema-dir=${project.content-dir}/resources/schema
  
  
  
  No                   revision
  
  
  No                   revision
  
  
  1.20.2.4  +248 -266  jakarta-avalon/src/documentation/sitemap.xmap
  
  Index: sitemap.xmap
  ===================================================================
  RCS file: /home/cvs/jakarta-avalon/src/documentation/sitemap.xmap,v
  retrieving revision 1.20.2.3
  retrieving revision 1.20.2.4
  diff -u -r1.20.2.3 -r1.20.2.4
  --- sitemap.xmap      18 Nov 2002 14:02:04 -0000      1.20.2.3
  +++ sitemap.xmap      22 Nov 2002 05:44:54 -0000      1.20.2.4
  @@ -1,276 +1,258 @@
   <?xml version="1.0"?>
   
  -<map:sitemap xmlns:map="http://apache.org/cocoon/sitemap/1.0";>
  +<map:sitemap
  +    xmlns:map="http://apache.org/cocoon/sitemap/1.0";>
   
  -<!-- =========================== Components ================================ -->
  +    <map:components>
  +        <map:generators default="file">
  +            <map:generator name="file" 
src="org.apache.cocoon.generation.FileGenerator" label="content"/>
  +            <map:generator name="directory" 
src="org.apache.cocoon.generation.DirectoryGenerator" label="content"/>
  +            <map:generator name="html" 
src="org.apache.cocoon.generation.HTMLGenerator" label="content"/>
  +            <map:generator name="libre" 
src="org.apache.forrest.yer.use.cocoon.HierarchyGenerator" label="content"/>
  +            <map:generator name="nekodtd" 
src="org.apache.forrest.components.generator.XNIConfigurableFileGenerator" 
label="content"/>
  +            <!-- FIXME: Change this once better view handling is implemented -->
  +            <map:generator name="file-nolabel" 
src="org.apache.cocoon.generation.FileGenerator"/>
  +        </map:generators>
  +
  +        <map:transformers default="xslt">
  +            <map:transformer name="xslt" 
src="org.apache.cocoon.transformation.TraxTransformer"
  +                logger="sitemap.transformer.xsltc"
  +                pool-max="32" pool-min="8" pool-grow="2">
  +                <use-request-parameters>false</use-request-parameters>
  +                <use-browser-capabilities-db>false</use-browser-capabilities-db>
  +                <use-deli>false</use-deli>
  +                <!-- 
transformer-factory>com.icl.saxon.TransformerFactoryImpl</transformer-factory -->
  +                <!-- 
transformer-factory>org.apache.xalan.xsltc.trax.TransformerFactoryImpl</transformer-factory
 -->
  +            </map:transformer>
  +        </map:transformers>
  +
  +        <map:readers default="resource">
  +            <map:reader name="resource" 
src="org.apache.cocoon.reading.ResourceReader"/>
  +        </map:readers>
  +
  +        <map:serializers default="html">
  +            <map:serializer name="html" mime-type="text/html"
  +                src="org.apache.cocoon.serialization.HTMLSerializer">
  +                <doctype-public>-//W3C//DTD HTML 4.01 
Transitional//EN</doctype-public>
  +                <encoding>ISO-8859-1</encoding>
  +            </map:serializer>
  +
  +            <map:serializer name="xml" mime-type="text/xml"
  +                src="org.apache.cocoon.serialization.XMLSerializer">
  +                <encoding>ISO-8859-1</encoding>
  +            </map:serializer>
   
  - <map:components>
  -
  -  <map:generators default="file">
  -   <map:generator  name="file"        
src="org.apache.cocoon.generation.FileGenerator" label="content"/>
  -   <map:generator  name="directory"   
src="org.apache.cocoon.generation.DirectoryGenerator" label="content"/>
  -   <map:generator  name="html"        
src="org.apache.cocoon.generation.HTMLGenerator" label="content"/>
  -   <map:generator  name="libre"       
src="org.apache.forrest.yer.use.cocoon.HierarchyGenerator" label="content"/>
  -   <map:generator  name="nekodtd"     
src="org.apache.forrest.components.generator.XNIConfigurableFileGenerator" 
label="content"/>
  -   <!-- FIXME: Change this once better view handling is implemented -->
  -   <map:generator  name="file-nolabel" 
src="org.apache.cocoon.generation.FileGenerator"/>
  -  </map:generators>
  -
  -  <map:transformers default="xslt">
  -  <!--
  -   <map:transformer     name="xslt"      
src="org.apache.cocoon.transformation.TraxTransformer">
  -    <use-request-parameters>false</use-request-parameters>
  -    <use-browser-capabilities-db>false</use-browser-capabilities-db>
  -   </map:transformer>
  -  -->
  -    <map:transformer name="xslt" 
src="org.apache.cocoon.transformation.TraxTransformer"
  -                        logger="sitemap.transformer.xsltc"
  -                        pool-max="32" pool-min="8" pool-grow="2">
  -      <use-request-parameters>false</use-request-parameters>
  -      <use-browser-capabilities-db>false</use-browser-capabilities-db>
  -      <use-deli>false</use-deli>
  -      <!-- 
transformer-factory>com.icl.saxon.TransformerFactoryImpl</transformer-factory -->
  -      <!-- 
transformer-factory>org.apache.xalan.xsltc.trax.TransformerFactoryImpl</transformer-factory
 -->
  -    </map:transformer>
  -  </map:transformers>
  -      
  -  <map:readers default="resource">
  -   <map:reader name="resource"       
src="org.apache.cocoon.reading.ResourceReader"/>
  -  </map:readers>
  -
  -  <map:serializers default="html">
  -   <map:serializer name="html"   mime-type="text/html"        
src="org.apache.cocoon.serialization.HTMLSerializer">
  -    <doctype-public>-//W3C//DTD HTML 4.01 Transitional//EN</doctype-public>
  -     <encoding>ISO-8859-1</encoding>
  -   </map:serializer>
  -
  -   <map:serializer name="xml"    mime-type="text/xml"         
src="org.apache.cocoon.serialization.XMLSerializer">
  -     <encoding>ISO-8859-1</encoding>
  -   </map:serializer>
  -
  -   <map:serializer name="fo2pdf"
  +            <map:serializer name="fo2pdf"
                   src="org.apache.cocoon.serialization.FOPSerializer"
                   mime-type="application/pdf"/>
   
  +            <map:serializer name="links" 
src="org.apache.cocoon.serialization.LinkSerializer">
  +                <encoding>ISO-8859-1</encoding>
  +            </map:serializer>
  +            <map:serializer name="svg2jpeg" mime-type="image/jpeg" 
src="org.apache.cocoon.serialization.SVGSerializer">
  +                <parameter name="quality" type="float" value="1.0"/>
  +            </map:serializer>
  +            <map:serializer name="svg2png" mime-type="image/png" 
src="org.apache.cocoon.serialization.SVGSerializer"/>
  +        </map:serializers>
  +
  +        <map:matchers default="wildcard">
  +            <map:matcher name="wildcard" 
src="org.apache.cocoon.matching.WildcardURIMatcher"/>
  +        </map:matchers>
  +
  +        <map:actions>
  +            <map:action logger="sitemap.action.resource-exists" 
name="resource-exists"
  +                src="org.apache.cocoon.acting.ResourceExistsAction"/>
  +        </map:actions>
  +
  +        <map:pipelines default="noncaching">
  +            <map:pipeline name="noncaching"
  +                
src="org.apache.cocoon.components.pipeline.impl.NonCachingProcessingPipeline"/>
  +        </map:pipelines>
  +
  +    </map:components>
  +
  +    <map:views>
  +        <map:view name="content" from-label="content">
  +            <map:serialize type="xml"/>
  +        </map:view>
  +
  +        <map:view name="links" from-position="last">
  +            <map:transform src="resources/stylesheets/avfilterlinks.xsl"/>
  +            <map:serialize type="links"/>
  +        </map:view>
  +    </map:views>
  +
  +    <map:resources>
  +        <map:resource name="skinit">
  +            <map:transform src="skins/{defaults:skin}/xslt/html/{type}.xsl">
  +                <map:parameter name="path" value="{path}"/>
  +                <!-- Can set an alternative project skinconfig here
  +                <map:parameter name="config-file" value="../../../../skinconf.xml"/>
  +                -->
  +            </map:transform>
  +            <map:serialize/>
  +        </map:resource>
  +
  +        <map:resource name="book">
  +            <map:generate src="content/{../1}book.xml"/>
  +            <map:call resource="skinit">
  +                <map:parameter name="type" value="book2menu"/>
  +                <map:parameter name="path" value="{path}"/>
  +            </map:call>
  +        </map:resource>
  +
  +        <map:resource name="skin-read">
  +            <map:read src="skins/{defaults:skin}/{path}" mime-type="{mime-type}"/>
  +        </map:resource>
  +
  +    </map:resources>
  +
  +    <!-- =========================== Pipelines ================================= -->
  +
  +    <map:pipelines>
  +
  +        <!-- Pipeline that manages the internal URI space
  +             For the external URI space manager, see the next pipeline. -->
  +        <map:pipeline internal-only="true">
  +
  +            <map:match pattern="**tab-**.xml">
  +                <map:generate src="content/tabs.xml"/>
  +                <map:call resource="skinit">
  +                    <map:parameter name="type" value="tab2menu"/>
  +                    <map:parameter name="path" value="{2}"/>
  +                </map:call>
  +            </map:match>
  +
  +            <map:match pattern="**book-**/*.xml">
  +                <map:call resource="book">
  +                    <map:parameter name="path" value="{2}/{3}.xml"/>
  +                </map:call>
  +            </map:match>
  +
  +            <map:match pattern="**book-**.xml">
  +                <map:call resource="book">
  +                    <map:parameter name="path" value="{2}.xml"/>
  +                </map:call>
  +            </map:match>
  +
  +            <map:match pattern="body-**/*.xml">
  +                <map:generate src="content/{1}/{2}.xml"/>
  +                <map:call resource="skinit">
  +                    <map:parameter name="type" value="document2html"/>
  +                    <map:parameter name="path" value="{1}/{2}.xml"/>
  +                </map:call>
  +            </map:match>
  +
  +            <!-- Generates body HTML for root-level files -->
  +            <map:match pattern="body-**.xml">
  +                <map:generate src="content/{1}.xml"/>
  +                <map:call resource="skinit">
  +                    <map:parameter name="type" value="document2html"/>
  +                    <map:parameter name="path" value="{1}.xml"/>
  +                </map:call>
  +            </map:match>
  +
  +        </map:pipeline>
  +
  +        <map:pipeline internal-only="false">
  +
  +            <!-- =========   External URI-space    ============ -->
  +            <map:match pattern="">
  +                <map:redirect-to uri="{context:context}/index.html"/>
  +            </map:match>
  +
  +            <map:match pattern="**">
  +
  +                <map:match pattern="**.gif">
  +                    <map:act type="resource-exists">
  +                        <map:parameter name="url" value="content/{1}.gif"/>
  +                        <map:read src="content/{../1}.gif" mime-type="image/gif"/>
  +                    </map:act>
  +                </map:match>
  +
  +                <map:match pattern="**.jpg">
  +                    <map:act type="resource-exists">
  +                        <map:parameter name="url" value="content/{1}.jpg"/>
  +                        <map:read src="content/{../1}.jpg" mime-type="image/jpg"/>
  +                    </map:act>
  +                </map:match>
  +
  +                <map:match pattern="**.png">
  +                    <map:act type="resource-exists">
  +                        <map:parameter name="url" value="content/{1}.png"/>
  +                        <map:read src="content/{../1}.png" mime-type="image/png"/>
  +                    </map:act>
  +                </map:match>
  +                <!-- if the file is present verbatim as content, give that to the 
user... -->
  +                <map:act type="resource-exists">
  +                    <map:parameter name="url" value="content/{1}"/>
  +                    <map:read src="content/{../1}"/>
  +                </map:act>
  +
  +                <map:match pattern="*.html">
  +                    <map:aggregate element="site">
  +                        <map:part src="cocoon:/book-{1}.xml"/>
  +                        <map:part src="cocoon:/tab-{1}.xml"/>
  +                        <map:part src="cocoon:/body-{1}.xml" label="content"/>
  +                    </map:aggregate>
  +                    <map:call resource="skinit">
  +                        <map:parameter name="type" value="site2xhtml"/>
  +                        <map:parameter name="path" value="{0}"/>
  +                    </map:call>
  +                </map:match>
  +
  +                <map:match pattern="**/*.html">
  +                    <map:aggregate element="site">
  +                        <map:part src="cocoon:/{1}/book-{1}/{2}.xml"/>
  +                        <map:part src="cocoon:/{1}/tab-{1}/{2}.xml"/>
  +                        <map:part src="cocoon:/body-{1}/{2}.xml" label="content"/>
  +                    </map:aggregate>
  +                    <map:call resource="skinit">
  +                        <map:parameter name="type" value="site2xhtml"/>
  +                        <map:parameter name="path" value="{0}"/>
  +                    </map:call>
  +                </map:match>
  +
  +                <map:match pattern="**.pdf">
  +                    <map:generate src="content/{1}.xml"/>
  +                    <map:transform 
src="skins/{defaults:skin}/xslt/fo/document2fo.xsl"/>
  +                    <map:serialize type="fo2pdf"/>
  +                </map:match>
  +
  +                <!-- Redirect any request for a directory to the directory's 
index.html file  -->
  +                <map:match pattern="**/">
  +                    <map:redirect-to uri="{context:context}/{1}/index.html"/>
  +                </map:match>
  +
  +                <!-- ================  Static  =========================== -->
  +                <map:match pattern="skin/**.css">
  +                    <map:call resource="skin-read">
  +                        <map:parameter name="path" value="css/{1}.css"/>
  +                        <map:parameter name="mime-type" value="text/css"/>
  +                    </map:call>
  +                </map:match>
  +
  +                <map:match pattern="**/skin/**.css">
  +                    <map:call resource="skin-read">
  +                        <map:parameter name="path" value="css/{2}.css"/>
  +                        <map:parameter name="mime-type" value="text/css"/>
  +                    </map:call>
  +                </map:match>
  +
  +                <map:match pattern="**.css">
  +                    <map:read src="resources/css/{1}.css" mime-type="text/css"/>
  +                </map:match>
  +
  +                <map:match pattern="skin/images/**.*">
  +                    <map:call resource="skin-read">
  +                        <map:parameter name="path" value="images/{1}.{2}"/>
  +                        <map:parameter name="mime-type" value="image/{2}"/>
  +                    </map:call>
  +                </map:match>
   
  -   <map:serializer name="links"                               
src="org.apache.cocoon.serialization.LinkSerializer">
  -     <encoding>ISO-8859-1</encoding>
  -   </map:serializer>
  -   <map:serializer name="svg2jpeg" mime-type="image/jpeg"     
src="org.apache.cocoon.serialization.SVGSerializer">
  -       <parameter name="quality" type="float" value="1.0"/>
  -   </map:serializer>
  -   <map:serializer name="svg2png" mime-type="image/png"       
src="org.apache.cocoon.serialization.SVGSerializer"/>
  -  </map:serializers>
  -
  -  <map:matchers default="wildcard">
  -   <map:matcher name="wildcard" 
src="org.apache.cocoon.matching.WildcardURIMatcher"/>
  -  </map:matchers>
  -<!--
  -  <map:selectors default="skin-parameter">
  -    <map:selector name="request-parameter" 
logger="sitemap.selector.request-parameter"
  -                 src="org.apache.cocoon.selection.RequestParameterSelector">
  -      <parameter-name>skin</parameter-name>
  -    </map:selector>
  -    <map:selector name="style-parameter" logger="sitemap.selector.request-parameter"
  -                 src="org.apache.cocoon.selection.RequestParameterSelector">
  -      <parameter-name>style</parameter-name>
  -    </map:selector>
  -
  -  </map:selectors>
  --->
  -  <map:actions>
  -   <!-- <map:action logger="sitemap.action.request" name="request" 
src="org.apache.cocoon.acting.RequestParamAction"/> -->
  -    <map:action logger="sitemap.action.resource-exists" name="resource-exists" 
src="org.apache.cocoon.acting.ResourceExistsAction"/>
  -  </map:actions>
  -
  -  <!--
  -     The different pipeline implementations
  -  -->
  -  <map:pipelines default="caching">
  -     <map:pipeline name="caching" 
src="org.apache.cocoon.components.pipeline.impl.CachingProcessingPipeline"/>
  -     <map:pipeline name="noncaching" 
src="org.apache.cocoon.components.pipeline.impl.NonCachingProcessingPipeline"/>
  -     <!-- The following two can be used for profiling:
  -     <map:pipeline name="profile-caching" 
src="org.apache.cocoon.components.profiler.ProfilingCachingProcessingPipeline"/>
  -     <map:pipeline name="profile-noncaching" 
src="org.apache.cocoon.components.profiler.ProfilingNonCachingProcessingPipeline"/>
  -     -->
  -  </map:pipelines>
  -  
  - </map:components>
  -
  -<!-- =========================== Views =================================== -->
  -
  - <map:views>
  -  <map:view name="content" from-label="content">
  -   <map:serialize type="xml"/>
  -  </map:view>
  -
  -  <map:view name="links" from-position="last">
  -   <map:transform src="resources/stylesheets/avfilterlinks.xsl"/>
  -   <map:serialize type="links"/>
  -  </map:view>
  - </map:views>
  -
  - <map:resources>
  -  <map:resource name="skinit">
  -   <map:transform src="skins/{defaults:skin}/xslt/html/{type}.xsl">
  -     <map:parameter name="isfaq" value="{isfaq}"/>
  -     <map:parameter name="nopdf" value="{nopdf}"/>
  -     <map:parameter name="path" value="{path}"/>
  -     <!-- Can set an alternative project skinconfig here 
  -     <map:parameter name="config-file" value="../../../../skinconf.xml"/>
  -     -->
  -   </map:transform>
  -   <map:serialize/>
  -  </map:resource>
  -
  -  <map:resource name="book">
  -    <map:generate src="content/{../1}book.xml"/>
  -    <map:call resource="skinit">
  -      <map:parameter name="type" value="book2menu"/>
  -      <map:parameter name="path" value="{path}"/>
  -    </map:call>
  -  </map:resource>
  -
  -  <map:resource name="skin-read">
  -    <map:read src="skins/{defaults:skin}/{path}" mime-type="{mime-type}"/>
  -  </map:resource>
  -
  - </map:resources>
  -
  -<!-- =========================== Pipelines ================================= -->
  -
  - <map:pipelines>
  -  
  -  <!-- Pipeline that manages the internal URI space
  -       For the external URI space manager, see the next pipeline. -->
  -  <map:pipeline internal-only="true">
  -
  -  <map:match pattern="**tab-**.xml">
  -    <map:generate src="content/tabs.xml"/>
  -    <map:call resource="skinit">
  -     <map:parameter name="type" value="tab2menu"/>
  -     <map:parameter name="path" value="{2}"/>
  -    </map:call>
  -  </map:match>
  -
  -  <map:match pattern="**book-**/*.xml">
  -    <map:call resource="book">
  -     <map:parameter name="path" value="{2}/{3}.xml"/>
  -    </map:call>
  -  </map:match>
  -
  -  <map:match pattern="**book-**.xml">
  -    <map:call resource="book">
  -      <map:parameter name="path" value="{2}.xml"/>
  -    </map:call>
  -  </map:match>
  -
  -   <!-- Redirect requests for community/ (eg in the trail) to the home page -->
  -   <map:match pattern="community/index.html">
  -     <map:redirect-to uri="../index.html"/>
  -   </map:match>
  -
  -   <map:match pattern="body-**/*.xml">
  -    <map:generate src="content/{1}/{2}.xml"/>
  -    <map:call resource="skinit">
  -     <map:parameter name="type" value="document2html"/>
  -     <map:parameter name="path" value="{1}/{2}.xml"/>
  -    </map:call>
  -    </map:match>
  -
  -   <!-- Generates body HTML for root-level files -->
  -   <map:match pattern="body-**.xml">
  -    <map:generate src="content/{1}.xml"/>
  -    <map:call resource="skinit">
  -     <map:parameter name="type" value="document2html"/>
  -     <map:parameter name="path" value="{1}.xml"/>
  -    </map:call>
  -   </map:match>
  -
  -  </map:pipeline>
  -
  -
  -  <map:pipeline internal-only="false">
  -
  -   <!-- =========   External URI-space    ============ -->   
  -   <map:match pattern="">
  -    <map:redirect-to uri="{context:context}/index.html"/>
  -   </map:match>
  -
  -   <map:match pattern="**">
  -   
  -    <!-- if the file is present verbatim as content, give that to the user... -->
  -    <map:act type="resource-exists">
  -     <map:parameter name="url" value="content/{1}"/>
  -     <map:read src="content/{../1}"/>
  -    </map:act>
  -   
  -   <map:match pattern="*.html">
  -    <map:aggregate element="site">
  -     <map:part src="cocoon:/book-{1}.xml"/>
  -     <map:part src="cocoon:/tab-{1}.xml"/>
  -     <map:part src="cocoon:/body-{1}.xml" label="content"/>
  -    </map:aggregate>
  -    <map:call resource="skinit">
  -      <map:parameter name="type" value="site2xhtml"/>
  -      <map:parameter name="path" value="{0}"/>
  -    </map:call>
  -   </map:match>
  -
  -   <map:match pattern="**/*.html">
  -    <map:aggregate element="site">
  -     <map:part src="cocoon:/{1}/book-{1}/{2}.xml"/>
  -     <map:part src="cocoon:/{1}/tab-{1}/{2}.xml"/>
  -     <map:part src="cocoon:/body-{1}/{2}.xml" label="content"/>
  -    </map:aggregate>
  -     <map:call resource="skinit">
  -      <map:parameter name="type" value="site2xhtml"/>
  -      <map:parameter name="path" value="{0}"/>
  -     </map:call>
  -   </map:match>
  -
  -   <map:match pattern="**.pdf">
  -    <map:generate src="content/{1}.xml"/>
  -    <map:transform src="skins/{defaults:skin}/xslt/fo/document2fo.xsl"/>
  -    <map:serialize type="fo2pdf"/>
  -   </map:match>
  -
  -   <!-- ================  Directory redirects   =========================== -->
  -   <!-- Redirect any request for a directory to the directory's index.html file  -->
  -   <map:match pattern="**/">
  -     <map:redirect-to uri="{context:context}/{1}/index.html"/>
  -   </map:match>
  -
  -   <!-- ================  Static  =========================== -->
  -   <map:match pattern="skin/**.css">
  -    <map:call resource="skin-read">
  -      <map:parameter name="path" value="css/{1}.css"/>
  -      <map:parameter name="mime-type" value="text/css"/>
  -    </map:call>
  -   </map:match>
  -
  -   <map:match pattern="**/skin/**.css">
  -    <map:call resource="skin-read">
  -      <map:parameter name="path" value="css/{2}.css"/>
  -      <map:parameter name="mime-type" value="text/css"/>
  -    </map:call>
  -   </map:match>
  -
  -   <map:match pattern="**.css">
  -    <map:read src="resources/css/{1}.css" mime-type="text/css"/>
  -   </map:match>
  -
  -   <map:match pattern="skin/images/**.*">
  -    <map:call resource="skin-read">
  -      <map:parameter name="path" value="images/{1}.{2}"/>
  -      <map:parameter name="mime-type" value="image/{2}"/>
  -    </map:call>
  -   </map:match>
  -
  -   </map:match>
  -   
  -  </map:pipeline>
  - </map:pipelines>
  +            </map:match>
   
  -</map:sitemap>
  +        </map:pipeline>
  +    </map:pipelines>
   
  +</map:sitemap>
  
  
  
  1.1.2.2   +4 -4      jakarta-avalon/src/documentation/Attic/skinconf.xml
  
  Index: skinconf.xml
  ===================================================================
  RCS file: /home/cvs/jakarta-avalon/src/documentation/Attic/skinconf.xml,v
  retrieving revision 1.1.2.1
  retrieving revision 1.1.2.2
  diff -u -r1.1.2.1 -r1.1.2.2
  --- skinconf.xml      17 Nov 2002 00:40:30 -0000      1.1.2.1
  +++ skinconf.xml      22 Nov 2002 05:44:54 -0000      1.1.2.2
  @@ -16,7 +16,7 @@
     <!ELEMENT credit (name, url, image, width?, height?)>
     <!ELEMENT disable-search (#PCDATA)>
     <!ELEMENT searchsite-domain (#PCDATA)>
  -  <!ELEMENT searchsite-name (#PCDATA)>  
  +  <!ELEMENT searchsite-name (#PCDATA)>
     <!ELEMENT project-name (#PCDATA)>
     <!ELEMENT project-url (#PCDATA)>
     <!ELEMENT project-logo (#PCDATA)>
  @@ -46,19 +46,19 @@
     <!-- Do we want to disable the Google search box? -->
     <disable-search>false</disable-search>
     <searchsite-domain>jakarta.apache.org</searchsite-domain>
  -  <searchsite-name>Jakarta Apache</searchsite-name>  
  +  <searchsite-name>Jakarta Apache</searchsite-name>
   
     <!-- mandatory project logo
          skin: forrest-site renders it at the top -->
     <project-name>Avalon</project-name>
     <project-url>http://jakarta.apache.org/avalon/</project-url>
  -  <project-logo>images/project-logo.gif</project-logo>
  +  <project-logo>images/header.gif</project-logo>
   
     <!-- optional group logo
          skin: forrest-site renders it at the top-left corner -->
     <group-name>Jakarta Apache</group-name>
     <group-url>http://jakarta.apache.org/</group-url>
  -  <group-logo>images/group-logo.gif</group-logo>
  +  <group-logo>images/jakarta-logo.gif</group-logo>
   
     <!-- optional host logo (e.g. sourceforge logo)
          skin: forrest-site renders it at the bottom-left corner -->
  
  
  
  No                   revision
  
  
  No                   revision
  
  
  1.1.2.1   +26 -0     
jakarta-avalon/src/documentation/content/developing/Attic/book.xml
  
  
  
  
  No                   revision
  
  
  No                   revision
  
  
  1.1.2.2   +11 -10    
jakarta-avalon/src/documentation/content/framework/Attic/for-developers-changes.xml
  
  Index: for-developers-changes.xml
  ===================================================================
  RCS file: 
/home/cvs/jakarta-avalon/src/documentation/content/framework/Attic/for-developers-changes.xml,v
  retrieving revision 1.1.2.1
  retrieving revision 1.1.2.2
  diff -u -r1.1.2.1 -r1.1.2.2
  --- for-developers-changes.xml        16 Nov 2002 23:53:15 -0000      1.1.2.1
  +++ for-developers-changes.xml        22 Nov 2002 05:44:55 -0000      1.1.2.2
  @@ -1,6 +1,7 @@
   <?xml version="1.0" encoding="UTF-8"?>
   <!DOCTYPE changes PUBLIC "-//APACHE//DTD Changes V1.1//EN" "changes-v11.dtd">
  -<changes title="Avalon Framework - History of Changes">
  +<changes>
  +    <title>Avalon Framework - History of Changes</title>
     <devs>
       <person name="Federico Barbieri" email="[EMAIL PROTECTED]" id="FB"/>
       <person name="Berin Loritsch" email="[EMAIL PROTECTED]" id="BL"/>
  @@ -12,7 +13,7 @@
       <person name="Leo Simons" email="[EMAIL PROTECTED]" id="LS"/>
     </devs>
     <release version="4.1.2" date="January 31, 2002">
  -    <action dev="BL" type="udpate">
  +    <action dev="BL" type="update">
         Updated the build jars.
       </action>
       <action dev="CZ" type="add">
  @@ -95,9 +96,9 @@
         Added a method to Version to parse a Version from a string. Added accessor
         methods to Version to allow access to major/minor/micro components of version.
       </action>
  -    <action dev="PD" type="change">
  -      Updated Version class to refer to micro version rather than revision. This 
  -      is to match the terminology for JDK versioning. This is just documentation 
  +    <action dev="PD" type="update">
  +      Updated Version class to refer to micro version rather than revision. This
  +      is to match the terminology for JDK versioning. This is just documentation
         changes.
       </action>
       <action dev="JT" type="fix">
  @@ -116,7 +117,7 @@
       <action dev="BL" type="add">
         Added stylesheet to convert Stylebook markup to DocBook markup.
       </action>
  -    <action dev="BL" type="change">
  +    <action dev="BL" type="update">
         Changed the documentation build process to use Cocoon to build
         the site.
       </action>
  @@ -127,13 +128,13 @@
         Added Executable interface to activity package.
       </action>
       <action dev="PD" type="fix">
  -      Updated Resolvable interface to allow a ContextException to be thrown 
  -      on failure. 
  +      Updated Resolvable interface to allow a ContextException to be thrown
  +      on failure.
       </action>
       <action dev="PD" type="update">
  -      Add a makeReadOnly() method to the default implementations of Configuration, 
  +      Add a makeReadOnly() method to the default implementations of Configuration,
         Context and ComponentManager. Calling this method after the respective
  -      object has been filled will make the object read-only. This is a safety 
  +      object has been filled will make the object read-only. This is a safety
         precaution to stop code performing unwanted operations.
       </action>
       <action dev="PD" type="update">
  
  
  
  1.1.2.2   +1 -1      
jakarta-avalon/src/documentation/content/framework/Attic/guide-cop-in-avalon.xml
  
  Index: guide-cop-in-avalon.xml
  ===================================================================
  RCS file: 
/home/cvs/jakarta-avalon/src/documentation/content/framework/Attic/guide-cop-in-avalon.xml,v
  retrieving revision 1.1.2.1
  retrieving revision 1.1.2.2
  diff -u -r1.1.2.1 -r1.1.2.2
  --- guide-cop-in-avalon.xml   16 Nov 2002 23:53:15 -0000      1.1.2.1
  +++ guide-cop-in-avalon.xml   22 Nov 2002 05:44:55 -0000      1.1.2.2
  @@ -306,7 +306,7 @@
        </p>
        <p>
                For a list of containers implementations,
  -             <link href="reference-containers.xml">look here</link>.
  +             <link href="reference-containers.html">look here</link>.
        </p>
       </section>
     </body>
  
  
  
  1.1.2.2   +7 -7      
jakarta-avalon/src/documentation/content/framework/Attic/guide-patterns-in-avalon.xml
  
  Index: guide-patterns-in-avalon.xml
  ===================================================================
  RCS file: 
/home/cvs/jakarta-avalon/src/documentation/content/framework/Attic/guide-patterns-in-avalon.xml,v
  retrieving revision 1.1.2.1
  retrieving revision 1.1.2.2
  diff -u -r1.1.2.1 -r1.1.2.2
  --- guide-patterns-in-avalon.xml      16 Nov 2002 23:53:15 -0000      1.1.2.1
  +++ guide-patterns-in-avalon.xml      22 Nov 2002 05:44:55 -0000      1.1.2.2
  @@ -30,9 +30,9 @@
         <section>
   <title>Separation of Interface and Implementation</title>
           <p>
  -<b>Summary:</b> The Separation of Interface and Implementation is
  +<strong>Summary:</strong> The Separation of Interface and Implementation is
           a core feature of the Java language. However, it is often misused so we
  -        list it as one of the Avalon patterns, and our use of it is extensive. 
  +        list it as one of the Avalon patterns, and our use of it is extensive.
           </p>
           <p>
   <link href="guide-patterns-soii.html">
  @@ -44,7 +44,7 @@
         <section>
   <title>Inversion of Control</title>
           <p>
  -<b>Summary:</b> Avalon not only has an inheritance hierarchy, but also a
  +<strong>Summary:</strong> Avalon not only has an inheritance hierarchy, but also a
           Component hierarchy. In this hierarchy, the control of program flow is
           completely in the hands of the parent component(s), as soldiers in the
           military take orders from their officers.
  @@ -59,10 +59,10 @@
         <section>
   <title>Multi-Dimensional Separation of Concerns</title>
           <p>
  -<b>Summary:</b> You just read the introduction about patterns before
  +<strong>Summary:</strong> You just read the introduction about patterns before
           reading about Avalon's patterns because that enables you to reuse the
           knowledge you gained about patterns in context other than that of
  -        Avalon. We do this with software as well. 
  +        Avalon. We do this with software as well.
           </p>
           <p>
   <link href="guide-patterns-soc.html">
  @@ -74,7 +74,7 @@
         <section>
   <title>Aspect-Oriented Programming</title>
           <p>
  -<b>Summary:</b> this is the next logical step ofter Separation of
  +<strong>Summary:</strong> this is the next logical step ofter Separation of
           Concerns. Many concerns cannot be centrally addressed using the standard
           OOP mechanisms. Using AOP (which is an extension to OOP), we would be
           able to do so in a simple fashion. As there is no good AOP facility
  @@ -85,7 +85,7 @@
         <section>
   <title>Component-Oriented Programming</title>
           <p>
  -<b>Summary:</b> The Avalon framework promotes black-box reuse at
  +<strong>Summary:</strong> The Avalon framework promotes black-box reuse at
           every level. Doing so is commonly known as COP. This is so important
           in Avalon we devote an
           <link href="guide-cop-what-is.html">
  
  
  
  1.1.2.2   +8 -8      
jakarta-avalon/src/documentation/content/framework/Attic/guide-patterns-soii.xml
  
  Index: guide-patterns-soii.xml
  ===================================================================
  RCS file: 
/home/cvs/jakarta-avalon/src/documentation/content/framework/Attic/guide-patterns-soii.xml,v
  retrieving revision 1.1.2.1
  retrieving revision 1.1.2.2
  diff -u -r1.1.2.1 -r1.1.2.2
  --- guide-patterns-soii.xml   16 Nov 2002 23:53:16 -0000      1.1.2.1
  +++ guide-patterns-soii.xml   22 Nov 2002 05:44:55 -0000      1.1.2.2
  @@ -27,15 +27,15 @@
   <title>Justification</title>
           <p>
             The main reason we do it is because:
  +        </p>
             <ol>
  -            <li>it forces you to decouple different modules/components/objects</li>
  -            <li>if specified correctly allows you to easily change the 
implementation of
  -                the interface/contract in the future</li>
  -            <li>makes it possible for a user to read documentation about interface
  -                without having the implementation details clutter up their 
perception</li>
  -            <li>increases the possibility of reuse in a larger application</li>
  +              <li>it forces you to decouple different 
modules/components/objects</li>
  +              <li>if specified correctly allows you to easily change the 
implementation of
  +                  the interface/contract in the future</li>
  +              <li>makes it possible for a user to read documentation about interface
  +                  without having the implementation details clutter up their 
perception</li>
  +              <li>increases the possibility of reuse in a larger application</li>
             </ol>
  -        </p>
           <p>
             If you are building objects with the aim of reuse then [2] is important 
but
             most people don't build for reuse (and most XP advocates say you should 
just
  @@ -153,7 +153,7 @@
             SAX, mentioned in multiple contexts in this document, is also an example 
of
             where the design can go wrong.  The Factory is static (that in itself is 
an
             anti-pattern to IoC).  Despite giving the appearance of having the ability
  -          to generate a parser based on the implementation's class name, only the 
first 
  +          to generate a parser based on the implementation's class name, only the 
first
             caller of that method will register a parser for the whole environment to 
use.
           </p>
           <p>
  
  
  
  1.1.2.3   +7 -7      
jakarta-avalon/src/documentation/content/framework/Attic/index.xml
  
  Index: index.xml
  ===================================================================
  RCS file: 
/home/cvs/jakarta-avalon/src/documentation/content/framework/Attic/index.xml,v
  retrieving revision 1.1.2.2
  retrieving revision 1.1.2.3
  diff -u -r1.1.2.2 -r1.1.2.3
  --- index.xml 16 Nov 2002 23:59:41 -0000      1.1.2.2
  +++ index.xml 22 Nov 2002 05:44:55 -0000      1.1.2.3
  @@ -23,7 +23,7 @@
           it or
           <link href="http://jakarta.apache.org/site/cvsindex.html";>get it from 
CVS</link>.
           The <link href="getting-started.html">Getting started</link> document
  -        provides more pointers.         
  +        provides more pointers.
         </p>
       </section>
         <section>
  @@ -38,18 +38,18 @@
           <p>
             This is more a theoretical introduction than a hands-on guide. If you
             prefer looking at code while learning, try our
  -          <link href="../developing">Developing with Avalon</link> paper.
  +          <link href="../developing/index.html">Developing with Avalon</link> paper.
           </p>
           <section>
   <title>Target Audience</title>
             <p>
               This documentation is aimed towards developers who:
  +          </p>
               <ul>
  -              <li>are interested in the design principles of Avalon</li>
  -              <li>wish to develop code that will be incorporated into Avalon</li>
  -              <li>wish to reuse Avalon concepts in their own application</li>
  +                <li>are interested in the design principles of Avalon</li>
  +                <li>wish to develop code that will be incorporated into Avalon</li>
  +                <li>wish to reuse Avalon concepts in their own application</li>
               </ul>
  -          </p>
           </section>
           <section>
   <title>Contents</title>
  @@ -80,7 +80,7 @@
           <p>
              Besides the
              <link href="../api/index.html">Javadocs</link>, we have
  -           <link href="diagrams/">Class diagrams</link>, the
  +           <!--<link href="diagrams/">Class diagrams</link>, the-->
              <link href="reference-the-lifecycle.html">Lifecycle specification</link> 
and the
              <link href="reference-containers.html">List of containers</link>.
           </p>
  
  
  
  No                   revision
  
  
  No                   revision
  
  
  1.1.2.1   +37 -0     
jakarta-avalon/src/documentation/content/framework/Attic/book.xml
  
  
  
  
  No                   revision
  
  
  No                   revision
  
  
  1.1.2.1   +0 -0      jakarta-avalon/src/documentation/content/history/book.xml
  
  Index: book.xml
  ===================================================================
  RCS file: /home/cvs/jakarta-avalon/src/documentation/content/history/book.xml,v
  retrieving revision 1.1
  retrieving revision 1.1.2.1
  diff -u -r1.1 -r1.1.2.1
  
  
  
  No                   revision
  
  
  No                   revision
  
  
  1.1.2.1   +51 -0     
jakarta-avalon/src/documentation/content/images/Attic/jakarta-logo.gif
  
        <<Binary file>>
  
  

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

Reply via email to