cocoon-cvs mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From bdelacre...@apache.org
Subject cvs commit: cocoon-2.1/src/webapp/samples/test/internal-request/mounted c.xml sitemap.xmap
Date Fri, 06 Feb 2004 12:17:16 GMT
bdelacretaz    2004/02/06 04:17:16

  Modified:    src/test/anteater internalRequest.xml
               src/webapp/samples/test index.xml
  Added:       src/webapp/samples/test/internal-request a.xml
                        explain-test.xml sitemap.xmap
               src/webapp/samples/test/internal-request/mounted c.xml
                        sitemap.xmap
  Removed:     src/webapp/samples/test a.xml
  Log:
  internal-request test pages refactored
  
  Revision  Changes    Path
  1.3       +1 -1      cocoon-2.1/src/test/anteater/internalRequest.xml
  
  Index: internalRequest.xml
  ===================================================================
  RCS file: /home/cvs/cocoon-2.1/src/test/anteater/internalRequest.xml,v
  retrieving revision 1.2
  retrieving revision 1.3
  diff -u -r1.2 -r1.3
  --- internalRequest.xml	6 Feb 2004 10:37:39 -0000	1.2
  +++ internalRequest.xml	6 Feb 2004 12:17:15 -0000	1.3
  @@ -8,7 +8,7 @@
   
     <!-- test samples/test/simpletest -->
     <target name="internal-request-test">
  -    <property name="internal-request-test" value="${cocoon}/samples/test/simpletest"/>
  +    <property name="internal-request-test" value="${cocoon}/samples/test/internal-request/simpletest"/>
   
         <httpRequest href="${internal-request-test}"
   		   description="Test the internal request handling">
  
  
  
  1.3       +4 -1      cocoon-2.1/src/webapp/samples/test/index.xml
  
  Index: index.xml
  ===================================================================
  RCS file: /home/cvs/cocoon-2.1/src/webapp/samples/test/index.xml,v
  retrieving revision 1.2
  retrieving revision 1.3
  diff -u -r1.2 -r1.3
  --- index.xml	6 Feb 2004 11:42:07 -0000	1.2
  +++ index.xml	6 Feb 2004 12:17:15 -0000	1.3
  @@ -9,6 +9,9 @@
               Stuff found in and under this directory is meant for automated anteater tests.
           </para>
           <para>
  +            To run tests used the <em>anteater-tests</em> build target.
  +        </para>
  +        <para>
               To create a new test set, create a new subdirectory here and add an <em>explain-test.xml</em>
               document into it.
           </para>
  
  
  
  1.1                  cocoon-2.1/src/webapp/samples/test/internal-request/a.xml
  
  Index: a.xml
  ===================================================================
  <test file="a" xmlns:cinclude="http://apache.org/cocoon/include/1.0">
  
  	<note>Now i'm going to include something from a sitemap mounted below here</note>
  
  	<cinclude:include src="cocoon:/simpletest-mounted/includer"/>
  
  </test>
  
  
  
  1.1                  cocoon-2.1/src/webapp/samples/test/internal-request/explain-test.xml
  
  Index: explain-test.xml
  ===================================================================
  <?xml version="1.0"?>
  
  <!-- CVS $Id: explain-test.xml,v 1.1 2004/02/06 12:17:16 bdelacretaz Exp $ -->
  
  <page>
      <title>internal-request test pages</title>
      <content>
          <para>
              This is used by the internalRequest anteater test
          </para>
          <para>
              Test links:
              <ul>
                  <li><link href="simpletest">simpletest</link></li>
                  <li><link href="simpletest-mounted/includer">includer</link></li>
                  <li><link href="simpletest-content/a.xml">simpletest-content/a.xml</link></li>
              </ul>
          </para>
      </content>
  </page>
  
  
  
  1.1                  cocoon-2.1/src/webapp/samples/test/internal-request/sitemap.xmap
  
  Index: sitemap.xmap
  ===================================================================
  <?xml version="1.0" encoding="ISO-8859-1"?>
  <map:sitemap xmlns:map="http://apache.org/cocoon/sitemap/1.0">
  
      <map:pipelines>
  
          <!-- used by the internalRequest anteater test -->
          <map:pipeline>
              <map:match pattern="simpletest-content/**">
                  <map:generate src="{1}"/>
                  <map:serialize type="xml"/>
              </map:match>
              <map:match pattern="simpletest-mounted/**">
                  <map:mount src="mounted/" uri-prefix="simpletest-mounted"/>
              </map:match>
              <map:match pattern="simpletest">
                  <map:generate src="cocoon:/simpletest-content/a.xml"/>
                  <map:transform type="cinclude"/>
                  <map:serialize type="xml"/>
              </map:match>
          </map:pipeline>
  
      </map:pipelines>
  </map:sitemap>
  
  
  
  1.1                  cocoon-2.1/src/webapp/samples/test/internal-request/mounted/c.xml
  
  Index: c.xml
  ===================================================================
  <test file="c">
  	<note>This is c.xml served from the sitemap mounted below</note>
  </test>
  
  
  
  1.1                  cocoon-2.1/src/webapp/samples/test/internal-request/mounted/sitemap.xmap
  
  Index: sitemap.xmap
  ===================================================================
  <?xml version="1.0" encoding="ISO-8859-1"?>
  <map:sitemap xmlns:map="http://apache.org/cocoon/sitemap/1.0">
    <map:pipelines>
      <map:pipeline>
        <map:match pattern="includer">
          <map:generate src="c.xml"/>
          <map:serialize type="xml"/>
        </map:match>
      </map:pipeline>
    </map:pipelines>
  </map:sitemap>
  
  
  

Mime
View raw message