forrest-dev mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From je...@apache.org
Subject cvs commit: xml-forrest/src/resources/forrest-shbat forrest.build.xml
Date Sun, 12 Oct 2003 12:51:32 GMT
jefft       2003/10/12 05:51:32

  Modified:    src/resources/conf cocoon.xconf faq.xmap forrest.xmap
                        linkmap.xmap menu.xmap resources.xmap
                        revisions.xmap sitemap.xmap
               src/resources/forrest-shbat forrest.build.xml
  Log:
  Remove the need to copy xdocs to a temporary webapp. xdocs can now be edited in
  their original directory and updates seen live, eg. when using 'forrest run'.
  
  Revision  Changes    Path
  1.24      +12 -0     xml-forrest/src/resources/conf/cocoon.xconf
  
  Index: cocoon.xconf
  ===================================================================
  RCS file: /home/cvs/xml-forrest/src/resources/conf/cocoon.xconf,v
  retrieving revision 1.23
  retrieving revision 1.24
  diff -u -r1.23 -r1.24
  --- cocoon.xconf	16 Sep 2003 16:35:08 -0000	1.23
  +++ cocoon.xconf	12 Oct 2003 12:51:32 -0000	1.24
  @@ -167,6 +167,18 @@
         </values>
       </component-instance>
   
  +    <component-instance name="project"       class="org.apache.cocoon.components.modules.input.DefaultsMetaModule">
  +      <values>
  +        <skin>@skin@</skin>
  +        <doc>@project.content-dir@</doc>
  +        <content>@project.real-content-dir@/</content>
  +        <content.xdocs>@project.home@/@project.xdocs-dir@/</content.xdocs>
  +        <resources.stylesheets>@project.home@/@project.stylesheets-dir@/</resources.stylesheets>
  +        <resources.images>@project.home@/@project.images-dir@/</resources.images>
  +        <skins-dir>@project.home@/@project.skins-dir@/</skins-dir>
  +      </values>
  +    </component-instance>
  +
   
       <component-instance
         class="org.apache.cocoon.components.modules.input.XMLFileModule"
  
  
  
  1.20      +4 -4      xml-forrest/src/resources/conf/faq.xmap
  
  Index: faq.xmap
  ===================================================================
  RCS file: /home/cvs/xml-forrest/src/resources/conf/faq.xmap,v
  retrieving revision 1.19
  retrieving revision 1.20
  diff -u -r1.19 -r1.20
  --- faq.xmap	7 Aug 2003 16:06:58 -0000	1.19
  +++ faq.xmap	12 Oct 2003 12:51:32 -0000	1.20
  @@ -100,7 +100,7 @@
           <map:transform src="skins/{forrest:skin}/xslt/fo/document2fo.xsl">
             <map:parameter name="numbersections" value="false"/>
             <map:parameter name="ctxbasedir" value="{realpath:.}/"/>
  -          <map:parameter name="xmlbasedir" value="content/xdocs/{1}"/>
  +          <map:parameter name="xmlbasedir" value="{project:content.xdocs}{1}"/>
           </map:transform>
           <map:serialize type="fo2pdf"/>
         </map:match>
  @@ -129,9 +129,9 @@
         <!-- ============================================================ -->
   
         <map:match pattern="**.xml">
  -        <map:generate type="file" src="content/xdocs/{0}" />
  +        <map:generate type="file" src="{project:content.xdocs}{0}" />
           <map:call resource="transform-to-document">
  -          <map:parameter name="src" value="content/xdocs/{0}" />
  +          <map:parameter name="src" value="{project:content.xdocs}{0}" />
           </map:call>
           <map:serialize type="xml-document"/>
         </map:match>
  
  
  
  1.38      +11 -11    xml-forrest/src/resources/conf/forrest.xmap
  
  Index: forrest.xmap
  ===================================================================
  RCS file: /home/cvs/xml-forrest/src/resources/conf/forrest.xmap,v
  retrieving revision 1.37
  retrieving revision 1.38
  diff -u -r1.37 -r1.38
  --- forrest.xmap	1 Oct 2003 08:23:37 -0000	1.37
  +++ forrest.xmap	12 Oct 2003 12:51:32 -0000	1.38
  @@ -171,8 +171,8 @@
   
         <map:match pattern="**body-*.html">
           <map:select type="exists">
  -          <map:when test="content/xdocs/{1}{2}.ehtml">
  -            <map:generate src="content/xdocs/{1}{2}.ehtml" />
  +          <map:when test="{project:content.xdocs}{1}{2}.ehtml">
  +            <map:generate src="{project:content.xdocs}{1}{2}.ehtml" />
               <map:transform src="resources/stylesheets/html2htmlbody.xsl" />
               <map:serialize type="xml" />
             </map:when>
  @@ -187,16 +187,16 @@
   
           <map:select type="exists">
             
  -          <map:when test="content/xdocs/{1}.ihtml">
  -            <map:generate src="content/xdocs/{1}.ihtml" type="html" />
  +          <map:when test="{project:content.xdocs}{1}.ihtml">
  +            <map:generate src="{project:content.xdocs}{1}.ihtml" type="html" />
               <map:transform src="resources/stylesheets/html2document.xsl" />
               <map:transform type="idgen" />
               <map:serialize type="xml-document"/>
             </map:when>
   
  -          <map:when test="content/xdocs/{1}.cwiki">
  +          <map:when test="{project:content.xdocs}{1}.cwiki">
               <map:match type="regexp" pattern="^(.*?)([^/]*).xml$">
  -              <map:generate type="text2xml" src="content/xdocs/{1}{2}.cwiki" />
  +              <map:generate type="text2xml" src="{project:content.xdocs}{1}{2}.cwiki"
/>
                 <map:transform type="lexer"   src="resources/grammars/wiki.xlex"/>
                 <map:transform type="parser"  src="resources/grammars/wiki.xgrm"/>
                 <!--  Dynamically generated equivalents.  Matchers need to be added to
  @@ -211,9 +211,9 @@
               </map:match>
             </map:when>
   
  -          <map:when test="content/xdocs/{1}.txt">
  +          <map:when test="{project:content.xdocs}{1}.txt">
               <map:match type="regexp" pattern="^(.*?)([^/]*).xml$">
  -              <map:generate type="text2xml" src="content/xdocs/{1}{2}.txt" />
  +              <map:generate type="text2xml" src="{project:content.xdocs}{1}{2}.txt"
/>
                 <map:transform src="resources/stylesheets/text2document.xsl">
                   <map:parameter name="filename" value="{2}" />
                 </map:transform>
  @@ -222,9 +222,9 @@
             </map:when>
             
             <map:otherwise>
  -            <map:generate src="content/xdocs/{1}.xml" />
  +            <map:generate src="{project:content.xdocs}{1}.xml" />
               <map:call resource="transform-to-document">
  -              <map:parameter name="src" value="content/xdocs/{1}.xml" />
  +              <map:parameter name="src" value="{project:content.xdocs}{1}.xml" />
               </map:call>
               <map:serialize type="xml-document"/>
             </map:otherwise>
  
  
  
  1.18      +2 -2      xml-forrest/src/resources/conf/linkmap.xmap
  
  Index: linkmap.xmap
  ===================================================================
  RCS file: /home/cvs/xml-forrest/src/resources/conf/linkmap.xmap,v
  retrieving revision 1.17
  retrieving revision 1.18
  diff -u -r1.17 -r1.18
  --- linkmap.xmap	7 Aug 2003 14:09:00 -0000	1.17
  +++ linkmap.xmap	12 Oct 2003 12:51:32 -0000	1.18
  @@ -27,7 +27,7 @@
   
         <!-- site.xml with @href's appended to be context-relative. -->
         <map:match pattern="abs-linkmap">
  -        <map:generate src="content/xdocs/site.xml" />
  +        <map:generate src="{project:content.xdocs}site.xml" />
           <map:transform src="resources/stylesheets/absolutize-linkmap.xsl" />
           <map:serialize type="xml" />
         </map:match>
  
  
  
  1.13      +6 -6      xml-forrest/src/resources/conf/menu.xmap
  
  Index: menu.xmap
  ===================================================================
  RCS file: /home/cvs/xml-forrest/src/resources/conf/menu.xmap,v
  retrieving revision 1.12
  retrieving revision 1.13
  diff -u -r1.12 -r1.13
  --- menu.xmap	20 Sep 2003 12:08:53 -0000	1.12
  +++ menu.xmap	12 Oct 2003 12:51:32 -0000	1.13
  @@ -46,14 +46,14 @@
       <map:pipeline internal-only="false">
   
         <map:match pattern="abs-menulinks">
  -        <map:generate src="content/xdocs/site.xml" />
  +        <map:generate src="{project:content.xdocs}site.xml" />
           <map:transform src="resources/stylesheets/absolutize-linkmap.xsl" />
           <map:transform src="resources/stylesheets/site2site-normalizetabs.xsl" />
           <map:serialize type="xml"/>
         </map:match>
   
         <map:match pattern="**menulinks-*">
  -        <map:generate src="content/xdocs/site.xml" />
  +        <map:generate src="{project:content.xdocs}site.xml" />
           <map:transform src="resources/stylesheets/absolutize-linkmap.xsl" />
   
           <map:select type="config">
  @@ -90,10 +90,10 @@
   
           <map:select type="exists">
   
  -          <map:when test="content/xdocs/{1}book.xml">
  +          <map:when test="{project:content.xdocs}{1}book.xml">
               <!-- If a hand-created book.xml exists, use it -->
  -            <map:parameter name="url" value="content/xdocs/{1}book.xml" />
  -            <map:generate src="content/xdocs/{1}book.xml" />
  +            <map:parameter name="url" value="{project:content.xdocs}{1}book.xml" />
  +            <map:generate src="{project:content.xdocs}{1}book.xml" />
             </map:when>
   
             <map:otherwise>
  
  
  
  1.5       +2 -2      xml-forrest/src/resources/conf/resources.xmap
  
  Index: resources.xmap
  ===================================================================
  RCS file: /home/cvs/xml-forrest/src/resources/conf/resources.xmap,v
  retrieving revision 1.4
  retrieving revision 1.5
  diff -u -r1.4 -r1.5
  --- resources.xmap	7 Aug 2003 02:51:33 -0000	1.4
  +++ resources.xmap	12 Oct 2003 12:51:32 -0000	1.5
  @@ -81,7 +81,7 @@
   
         <!-- DS: handles images local to a contributor directory -->
         <map:match pattern="**my-images/**.*">
  -        <map:read src="content/xdocs/{1}my-images/{2}.{3}" mime-type="image/{3}" />
  +        <map:read src="{project:content.xdocs}{1}my-images/{2}.{3}" mime-type="image/{3}"
/>
         </map:match>
   
         <map:match pattern="images/**.png">
  
  
  
  1.11      +5 -5      xml-forrest/src/resources/conf/revisions.xmap
  
  Index: revisions.xmap
  ===================================================================
  RCS file: /home/cvs/xml-forrest/src/resources/conf/revisions.xmap,v
  retrieving revision 1.10
  retrieving revision 1.11
  diff -u -r1.10 -r1.11
  --- revisions.xmap	7 Aug 2003 14:09:00 -0000	1.10
  +++ revisions.xmap	12 Oct 2003 12:51:32 -0000	1.11
  @@ -35,19 +35,19 @@
       <map:pipeline>
   
         <map:match pattern="**index.xml">
  -        <map:generate src="content/xdocs/{0}" />
  +        <map:generate src="{project:content.xdocs}{0}" />
           <map:transform type="idgen" />
           <map:serialize type="xml"/>
         </map:match>
   
         <map:match pattern="**revision-*.xml">
  -        <map:generate src="content/xdocs/{1}revision-{2}.xml" />
  +        <map:generate src="{project:content.xdocs}{1}revision-{2}.xml" />
           <map:transform type="idgen" />
           <map:serialize type="xml"/>
         </map:match>
   
         <map:match pattern="**revisions-**">
  -        <map:generate type="directory" src="content/xdocs/{1}">
  +        <map:generate type="directory" src="{project:content.xdocs}{1}">
             <map:parameter name="dateFormat" value="yyyy-MM-dd hh:mm" />
           </map:generate>
           <map:transform src="resources/stylesheets/directory2revisions.xsl">
  @@ -59,7 +59,7 @@
   
         <map:match pattern="**/*.xml">
           <map:aggregate element="all">
  -          <map:part src="content/xdocs/{0}" />
  +          <map:part src="{project:content.xdocs}{0}" />
             <map:part src="cocoon:/{1}/revisions-{2}" />
           </map:aggregate>
           <map:transform src="resources/stylesheets/howto2document.xsl" />
  
  
  
  1.123     +6 -6      xml-forrest/src/resources/conf/sitemap.xmap
  
  Index: sitemap.xmap
  ===================================================================
  RCS file: /home/cvs/xml-forrest/src/resources/conf/sitemap.xmap,v
  retrieving revision 1.122
  retrieving revision 1.123
  diff -u -r1.122 -r1.123
  --- sitemap.xmap	22 Sep 2003 13:07:48 -0000	1.122
  +++ sitemap.xmap	12 Oct 2003 12:51:32 -0000	1.123
  @@ -98,7 +98,7 @@
       </map:matchers>
   
       <map:selectors>
  -      <map:selector logger="sitemap.selector.exists" name="exists" src="org.apache.cocoon.selection.ResourceExistsSelector"
/>
  +      <map:selector logger="sitemap.selector.exists" name="exists" src="org.apache.cocoon.selection.SourceExistsSelector"
/>
       </map:selectors>
   
       <map:pipes default="caching">
  @@ -233,8 +233,8 @@
   
         <map:match pattern="**body-*.html">
           <map:select type="exists">
  -          <map:when test="content/xdocs/{1}{2}.ehtml">
  -            <map:generate src="content/xdocs/{1}{2}.ehtml" />
  +          <map:when test="{project:content.xdocs}{1}{2}.ehtml">
  +            <map:generate src="{project:content.xdocs}{1}{2}.ehtml" />
               <map:transform src="resources/stylesheets/html2htmlbody.xsl" />
               <map:transform type="linkrewriter" src="cocoon:/{1}linkmap-{2}.html"/>
               <map:serialize type="xml" />
  @@ -266,7 +266,7 @@
         </map:match>
   
         <map:match pattern="**tab-*.html">
  -        <map:generate src="content/xdocs/tabs.xml" />
  +        <map:generate src="{project:content.xdocs}tabs.xml" />
           <map:transform type="linkrewriter" src="cocoon:/{1}linkmap-{2}.html"/>
           <map:call resource="skinit">
             <map:parameter name="type" value="tab2menu"/>
  @@ -332,7 +332,7 @@
           <map:transform type="linkrewriter" src="cocoon://{1}linkmap-{2}.pdf"/>
           <map:transform src="skins/{forrest:skin}/xslt/fo/document2fo.xsl">
             <map:parameter name="ctxbasedir" value="{realpath:.}/"/>
  -          <map:parameter name="xmlbasedir" value="content/xdocs/{1}"/>
  +          <map:parameter name="xmlbasedir" value="{project:content.xdocs}{1}"/>
           </map:transform>
           <map:serialize type="fo2pdf"/>
         </map:match>
  
  
  
  1.111     +10 -2     xml-forrest/src/resources/forrest-shbat/forrest.build.xml
  
  Index: forrest.build.xml
  ===================================================================
  RCS file: /home/cvs/xml-forrest/src/resources/forrest-shbat/forrest.build.xml,v
  retrieving revision 1.110
  retrieving revision 1.111
  diff -u -r1.110 -r1.111
  --- forrest.build.xml	5 Oct 2003 10:12:09 -0000	1.110
  +++ forrest.build.xml	12 Oct 2003 12:51:32 -0000	1.111
  @@ -114,6 +114,14 @@
       <property name="tools.jar"           location="${java.home}/../lib/tools.jar"/>
       <available file="${tools.jar}"       property="tools.jar.present"/>
   
  +    <!-- Define filters for project.* properties -->
  +    <mkdir dir="${project.temp-dir}"/>
  +    <property name="projfilters" value="${project.temp-dir}/projfilters.properties"/>
  +    <echoproperties prefix="project" destfile="${projfilters}"/>
  +    <filter filtersfile="${projfilters}"/>
  +    <filter token="forrest.home" value="${forrest.home}"/>
  +    <filter token="project.home" value="${project.home}"/>
  + 
       <!-- echo settings in -Dforrest.echo=true mode -->
       <antcall target="echo-settings" />
     </target>
  @@ -403,7 +411,7 @@
          =============================================================== -->
     <target name="project-context" depends="examine-proj, ensure-content,
       validate, init, bare-context, copy-sitemap, copy-conf,
  -    copy-xdocs, copy-stylesheets, copy-images, copy-grammars, copy-resources, copy-content,
copy-lib, 
  +    copy-stylesheets, copy-images, copy-grammars, copy-resources, copy-content, copy-lib,

       copy-classes, copy-skins, copy-skinconf, copy-status, copy-translations"/>
   
     <target name="copy-conf" if="conf.present">
  
  
  

Mime
View raw message