cocoon-cvs mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From fel...@apache.org
Subject svn commit: r539140 - in /cocoon/trunk/blocks: cocoon-validation/cocoon-validation-sample/src/main/resources/COB-INF/ cocoon-web3/cocoon-web3-sample/src/main/resources/COB-INF/ cocoon-xmldb/cocoon-xmldb-sample/src/main/resources/COB-INF/ cocoon-xsp/coc...
Date Thu, 17 May 2007 22:06:22 GMT
Author: felixk
Date: Thu May 17 15:06:20 2007
New Revision: 539140

URL: http://svn.apache.org/viewvc?view=rev&rev=539140
Log:
reformatting ...

Modified:
    cocoon/trunk/blocks/cocoon-validation/cocoon-validation-sample/src/main/resources/COB-INF/sitemap.xmap
    cocoon/trunk/blocks/cocoon-web3/cocoon-web3-sample/src/main/resources/COB-INF/sitemap.xmap
    cocoon/trunk/blocks/cocoon-xmldb/cocoon-xmldb-sample/src/main/resources/COB-INF/sitemap.xmap
    cocoon/trunk/blocks/cocoon-xsp/cocoon-xsp-sample/src/main/resources/COB-INF/sitemap.xmap
    cocoon/trunk/blocks/cocoon-xsp/cocoon-xsp-sample/src/main/resources/COB-INF/soap/sitemap.xmap

Modified: cocoon/trunk/blocks/cocoon-validation/cocoon-validation-sample/src/main/resources/COB-INF/sitemap.xmap
URL: http://svn.apache.org/viewvc/cocoon/trunk/blocks/cocoon-validation/cocoon-validation-sample/src/main/resources/COB-INF/sitemap.xmap?view=diff&rev=539140&r1=539139&r2=539140
==============================================================================
--- cocoon/trunk/blocks/cocoon-validation/cocoon-validation-sample/src/main/resources/COB-INF/sitemap.xmap
(original)
+++ cocoon/trunk/blocks/cocoon-validation/cocoon-validation-sample/src/main/resources/COB-INF/sitemap.xmap
Thu May 17 15:06:20 2007
@@ -23,103 +23,103 @@
 
 <map:sitemap xmlns:map="http://apache.org/cocoon/sitemap/1.0">
 
-  <map:pipelines>
-    <map:pipeline type="caching">
+    <map:pipelines>
+        <map:pipeline type="caching">
 
-      <map:match pattern="">
-        <map:redirect-to uri="welcome"/>
-      </map:match>
-
-      <!-- list of samples -->
-      <map:match pattern="welcome">
-        <map:generate src="welcome.xml"/>
-        <!-- Make use of servlet services -->
-        <map:serialize type="servletService" mime-type="text/html">
-          <map:parameter name="service" value="servlet:style-default:/service/common/simple-samples2html"
/>
-        </map:serialize>
-      </map:match>
-
-      <!-- relax ng samples -->
-      <map:match pattern="validate-rng-valid">
-        <map:generate src="source-ok.xml"/>
-        <map:transform type="validate" src="schema-ok.rng"/>
-        <map:transform src="validation.xslt"/>
-        <map:serialize/>
-      </map:match>
-      
-      <map:match pattern="validate-rng-invalid">
-        <map:generate src="source-no.xml"/>
-        <map:transform type="validate" src="schema-ok.rng"/>
-        <map:transform src="validation.xslt"/>
-        <map:serialize/>
-      </map:match>
-      
-      <map:match pattern="validate-rng-badschema">
-        <map:generate src="source-ok.xml"/>
-        <map:transform type="validate" src="schema-no.rng"/>
-        <map:transform src="validation.xslt"/>
-        <map:serialize/>
-      </map:match>
-      
-      <!-- xml schema samples -->
-      <map:match pattern="validate-xsd-valid">
-        <map:generate src="source-ok.xml"/>
-        <map:transform type="validate" src="schema-ok.xsd"/>
-        <map:transform src="validation.xslt"/>
-        <map:serialize/>
-      </map:match>
-      
-      <map:match pattern="validate-xsd-invalid">
-        <map:generate src="source-no.xml"/>
-        <map:transform type="validate" src="schema-ok.xsd"/>
-        <map:transform src="validation.xslt"/>
-        <map:serialize/>
-      </map:match>
-      
-      <map:match pattern="validate-xsd-badschema">
-        <map:generate src="source-ok.xml"/>
-        <map:transform type="validate" src="schema-no.xsd"/>
-        <map:transform src="validation.xslt"/>
-        <map:serialize/>
-      </map:match>
-
-      <!-- reporting samples -->
-      <map:match pattern="report-rng-invalid">
-        <map:generate src="source-no.xml"/>
-        <map:transform type="validation-report" src="schema-ok.rng"/>
-        <!-- Make use of servlet services -->
-        <map:serialize type="servletService" mime-type="text/html">
-          <map:parameter name="service" value="servlet:style-default:/service/system/xml2html"
/>
-        </map:serialize>
-      </map:match>
-      
-      <map:match pattern="report-xsd-invalid">
-        <map:generate src="source-no.xml"/>
-        <map:transform type="validation-report" src="schema-ok.xsd"/>
-        <!-- Make use of servlet services -->
-        <map:serialize type="servletService" mime-type="text/html">
-          <map:parameter name="service" value="servlet:style-default:/service/system/xml2html"
/>
-        </map:serialize>
-      </map:match>
-
-      <map:match pattern="report-rng-valid">
-        <map:generate src="source-ok.xml"/>
-        <map:transform type="validation-report" src="schema-ok.rng"/>
-        <!-- Make use of servlet services -->
-        <map:serialize type="servletService" mime-type="text/html">
-          <map:parameter name="service" value="servlet:style-default:/service/system/xml2html"
/>
-        </map:serialize>
-      </map:match>
-      
-      <map:match pattern="report-xsd-valid">
-        <map:generate src="source-ok.xml"/>
-        <map:transform type="validation-report" src="schema-ok.xsd"/>
-        <!-- Make use of servlet services -->
-        <map:serialize type="servletService" mime-type="text/html">
-          <map:parameter name="service" value="servlet:style-default:/service/system/xml2html"
/>
-        </map:serialize>
-      </map:match>
-      
-    </map:pipeline>
-  </map:pipelines>
+            <map:match pattern="">
+                <map:redirect-to uri="welcome" />
+            </map:match>
+
+            <!-- list of samples -->
+            <map:match pattern="welcome">
+                <map:generate src="welcome.xml" />
+                <!-- Make use of servlet services -->
+                <map:serialize type="servletService" mime-type="text/html">
+                    <map:parameter name="service" value="servlet:style-default:/service/common/simple-samples2html"
/>
+                </map:serialize>
+            </map:match>
+
+            <!-- relax ng samples -->
+            <map:match pattern="validate-rng-valid">
+                <map:generate src="source-ok.xml" />
+                <map:transform type="validate" src="schema-ok.rng" />
+                <map:transform src="validation.xslt" />
+                <map:serialize />
+            </map:match>
+
+            <map:match pattern="validate-rng-invalid">
+                <map:generate src="source-no.xml" />
+                <map:transform type="validate" src="schema-ok.rng" />
+                <map:transform src="validation.xslt" />
+                <map:serialize />
+            </map:match>
+
+            <map:match pattern="validate-rng-badschema">
+                <map:generate src="source-ok.xml" />
+                <map:transform type="validate" src="schema-no.rng" />
+                <map:transform src="validation.xslt" />
+                <map:serialize />
+            </map:match>
+
+            <!-- xml schema samples -->
+            <map:match pattern="validate-xsd-valid">
+                <map:generate src="source-ok.xml" />
+                <map:transform type="validate" src="schema-ok.xsd" />
+                <map:transform src="validation.xslt" />
+                <map:serialize />
+            </map:match>
+
+            <map:match pattern="validate-xsd-invalid">
+                <map:generate src="source-no.xml" />
+                <map:transform type="validate" src="schema-ok.xsd" />
+                <map:transform src="validation.xslt" />
+                <map:serialize />
+            </map:match>
+
+            <map:match pattern="validate-xsd-badschema">
+                <map:generate src="source-ok.xml" />
+                <map:transform type="validate" src="schema-no.xsd" />
+                <map:transform src="validation.xslt" />
+                <map:serialize />
+            </map:match>
+
+            <!-- reporting samples -->
+            <map:match pattern="report-rng-invalid">
+                <map:generate src="source-no.xml" />
+                <map:transform type="validation-report" src="schema-ok.rng" />
+                <!-- Make use of servlet services -->
+                <map:serialize type="servletService" mime-type="text/html">
+                    <map:parameter name="service" value="servlet:style-default:/service/system/xml2html"
/>
+                </map:serialize>
+            </map:match>
+
+            <map:match pattern="report-xsd-invalid">
+                <map:generate src="source-no.xml" />
+                <map:transform type="validation-report" src="schema-ok.xsd" />
+                <!-- Make use of servlet services -->
+                <map:serialize type="servletService" mime-type="text/html">
+                    <map:parameter name="service" value="servlet:style-default:/service/system/xml2html"
/>
+                </map:serialize>
+            </map:match>
+
+            <map:match pattern="report-rng-valid">
+                <map:generate src="source-ok.xml" />
+                <map:transform type="validation-report" src="schema-ok.rng" />
+                <!-- Make use of servlet services -->
+                <map:serialize type="servletService" mime-type="text/html">
+                    <map:parameter name="service" value="servlet:style-default:/service/system/xml2html"
/>
+                </map:serialize>
+            </map:match>
+
+            <map:match pattern="report-xsd-valid">
+                <map:generate src="source-ok.xml" />
+                <map:transform type="validation-report" src="schema-ok.xsd" />
+                <!-- Make use of servlet services -->
+                <map:serialize type="servletService" mime-type="text/html">
+                    <map:parameter name="service" value="servlet:style-default:/service/system/xml2html"
/>
+                </map:serialize>
+            </map:match>
+
+        </map:pipeline>
+    </map:pipelines>
 </map:sitemap>

Modified: cocoon/trunk/blocks/cocoon-web3/cocoon-web3-sample/src/main/resources/COB-INF/sitemap.xmap
URL: http://svn.apache.org/viewvc/cocoon/trunk/blocks/cocoon-web3/cocoon-web3-sample/src/main/resources/COB-INF/sitemap.xmap?view=diff&rev=539140&r1=539139&r2=539140
==============================================================================
--- cocoon/trunk/blocks/cocoon-web3/cocoon-web3-sample/src/main/resources/COB-INF/sitemap.xmap
(original)
+++ cocoon/trunk/blocks/cocoon-web3/cocoon-web3-sample/src/main/resources/COB-INF/sitemap.xmap
Thu May 17 15:06:20 2007
@@ -16,76 +16,76 @@
   limitations under the License.
 -->
 <map:sitemap xmlns:map="http://apache.org/cocoon/sitemap/1.0">
-	<!-- =========================== Components ================================ -->
-	<map:components>
-		<map:transformers default="xslt">
-			<!-- include the transformer like this: 
- 			 -->
-			<map:transformer name="rfc" src="org.apache.cocoon.transformation.Web3RfcTransformer"
logger="core.web3.transformation">
-				<system>indy</system>
-			</map:transformer>
-		</map:transformers>
-	</map:components>
+    <!-- =========================== Components ================================ -->
+    <map:components>
+        <map:transformers default="xslt">
+            <!-- include the transformer like this: 
+            -->
+            <map:transformer name="rfc" src="org.apache.cocoon.transformation.Web3RfcTransformer"
logger="core.web3.transformation">
+                <system>indy</system>
+            </map:transformer>
+        </map:transformers>
+    </map:components>
 
-   <!-- =========================== Views =================================== -->
+    <!-- =========================== Views =================================== -->
 
     <map:views>
-     <map:view name="content" from-label="content">
-      <map:serialize type="xml"/>
-     </map:view>
-
-     <map:view from-label="content" name="pretty-content">
-       <!-- Make use of servlet services -->
-       <map:serialize type="servletService" mime-type="text/html">
-           <map:parameter name="service" value="servlet:style-default:/service/system/xml2html"
/>
-       </map:serialize>
-     </map:view>
-
-     <map:view name="links" from-position="last">
-      <map:serialize type="links"/>
-     </map:view>
-
-	<map:view from-label="generic" name="generic">
-		<map:serialize type="xml"/>
-	</map:view>
-
-	<map:view from-label="source" name="source">
-		<map:serialize type="xml"/>
-	</map:view>
+        <map:view name="content" from-label="content">
+            <map:serialize type="xml" />
+        </map:view>
+
+        <map:view from-label="content" name="pretty-content">
+            <!-- Make use of servlet services -->
+            <map:serialize type="servletService" mime-type="text/html">
+                <map:parameter name="service" value="servlet:style-default:/service/system/xml2html"
/>
+            </map:serialize>
+        </map:view>
+
+        <map:view name="links" from-position="last">
+            <map:serialize type="links" />
+        </map:view>
+
+        <map:view from-label="generic" name="generic">
+            <map:serialize type="xml" />
+        </map:view>
+
+        <map:view from-label="source" name="source">
+            <map:serialize type="xml" />
+        </map:view>
 
     </map:views>
 
-	<!-- =========================== Pipelines ================================= -->
-	<map:pipelines>
-		<map:pipeline>
-   			<map:match pattern="">
-   			    <map:redirect-to uri="samples"/>
-   			</map:match>
-   
-   			<map:match pattern="samples">
-   			    <map:generate src="samples.xml" />
-   			    <!-- Make use of servlet services -->
-   			    <map:serialize type="servletService" mime-type="text/html">
-   			        <map:parameter name="service" value="servlet:style-default:/service/common/simple-samples2html"
/>
-   			    </map:serialize>
-   			</map:match>
-
-   			<map:match pattern="">
-				<map:redirect-to uri="info.html"/>
-			</map:match>
-			<map:match pattern="*.html">
-				<map:generate src="resources/{1}.xml"/>
-				<map:transform type="rfc"/>
-				<map:transform src="stylesheets/rfc2html.xsl"/>
-				<map:serialize/>
-			</map:match>
-			<map:match pattern="*.xml">
-				<map:generate src="resources/{1}.xml" label="source"/>
-				<map:transform type="rfc" label="generic"/>
-				<map:transform src="stylesheets/proper.xsl"/>
-				<map:transform src="stylesheets/pretty.xsl"/>
-				<map:serialize type="xml"/>
-			</map:match>
-		</map:pipeline>
-	</map:pipelines>
+    <!-- =========================== Pipelines ================================= -->
+    <map:pipelines>
+        <map:pipeline>
+            <map:match pattern="">
+                <map:redirect-to uri="samples" />
+            </map:match>
+
+            <map:match pattern="samples">
+                <map:generate src="samples.xml" />
+                <!-- Make use of servlet services -->
+                <map:serialize type="servletService" mime-type="text/html">
+                    <map:parameter name="service" value="servlet:style-default:/service/common/simple-samples2html"
/>
+                </map:serialize>
+            </map:match>
+
+            <map:match pattern="">
+                <map:redirect-to uri="info.html" />
+            </map:match>
+            <map:match pattern="*.html">
+                <map:generate src="resources/{1}.xml" />
+                <map:transform type="rfc" />
+                <map:transform src="stylesheets/rfc2html.xsl" />
+                <map:serialize />
+            </map:match>
+            <map:match pattern="*.xml">
+                <map:generate src="resources/{1}.xml" label="source" />
+                <map:transform type="rfc" label="generic" />
+                <map:transform src="stylesheets/proper.xsl" />
+                <map:transform src="stylesheets/pretty.xsl" />
+                <map:serialize type="xml" />
+            </map:match>
+        </map:pipeline>
+    </map:pipelines>
 </map:sitemap>

Modified: cocoon/trunk/blocks/cocoon-xmldb/cocoon-xmldb-sample/src/main/resources/COB-INF/sitemap.xmap
URL: http://svn.apache.org/viewvc/cocoon/trunk/blocks/cocoon-xmldb/cocoon-xmldb-sample/src/main/resources/COB-INF/sitemap.xmap?view=diff&rev=539140&r1=539139&r2=539140
==============================================================================
--- cocoon/trunk/blocks/cocoon-xmldb/cocoon-xmldb-sample/src/main/resources/COB-INF/sitemap.xmap
(original)
+++ cocoon/trunk/blocks/cocoon-xmldb/cocoon-xmldb-sample/src/main/resources/COB-INF/sitemap.xmap
Thu May 17 15:06:20 2007
@@ -23,88 +23,88 @@
 
 <map:sitemap xmlns:map="http://apache.org/cocoon/sitemap/1.0">
 
-<!-- =========================== Views =================================== -->
+    <!-- =========================== Views =================================== -->
 
-  <map:views>
-    <map:view name="content" from-label="content">
-      <map:serialize type="xml"/>
-    </map:view>
-
-    <map:view from-label="content" name="pretty-content">
-      <map:serialize type="servletService" mime-type="text/html">
-        <map:parameter name="service" value="servlet:style-default:/service/system/xml2html"
/>
-      </map:serialize>
-    </map:view>
-
-    <map:view name="links" from-position="last">
-      <map:serialize type="links"/>
-    </map:view>
-  </map:views>
-
-<!-- =========================== Pipelines ================================= -->
-
-  <map:pipelines>
-    <map:pipeline>
-      <map:match pattern="">
-        <map:redirect-to uri="welcome"/>
-      </map:match>
-   
-      <map:match pattern="welcome">
-        <map:generate src="samples.xml"/>
-        <!-- Make use of servlet services -->
-        <map:serialize type="servletService" mime-type="text/html">
-          <map:parameter name="service" value="servlet:style-default:/service/common/simple-samples2html"
/>
-        </map:serialize>
-      </map:match>
-   
-      <map:match pattern="xwelcome">
-        <map:generate src="xmldb:xindice-embed:///db/cocoon/xsamples.xml"/>
-        <!-- Make use of servlet services -->
-        <map:serialize type="servletService" mime-type="text/html">
-          <map:parameter name="service" value="servlet:style-default:/service/common/simple-samples2html"
/>
-        </map:serialize>
-      </map:match>
-
-      <map:match pattern="xmount/**">
-        <map:mount uri-prefix="xmount" src="xmldb:xindice-embed:///db/cocoon/sitemap"/>
-      </map:match>
-
-      <map:match pattern="populate">
-        <map:generate src="populate.xml"/>
-        <map:transform type="cinclude"/>
-        <map:transform type="xmldb"/>
-        <map:serialize/>
-      </map:match>
-
-      <map:match pattern="browse/**">
-        <map:match type="request-parameter" pattern="xpath">
-          <map:generate src="xmldb:xindice-embed:///db/{../1}#{1}"/>
-          <map:transform src="xmldb2samples.xsl"/>
-          <map:transform type="servletLinkRewriter" />
-          <!-- Make use of servlet services -->
-          <map:serialize type="servletService" mime-type="text/html">
-            <map:parameter name="service" value="servlet:style-default:/service/common/simple-samples2html"
/>
-          </map:serialize>
-        </map:match>
-
-        <map:generate src="xmldb:xindice-embed:///db/{1}"/>
-        <map:transform src="xmldb2samples.xsl"/>
-        <map:transform type="servletLinkRewriter" />
-        <!-- Make use of servlet services -->
-        <map:serialize type="servletService" mime-type="text/html">
-          <map:parameter name="service" value="servlet:style-default:/service/common/simple-samples2html"
/>
-        </map:serialize>
-      </map:match>
-
-      <map:match pattern="db/**">
-        <map:match type="request-parameter" pattern="xpath">
-          <map:generate src="xmldb:xindice-embed:///db/{../1}#{1}"/>
-          <map:serialize type="xml"/>
-        </map:match>
-        <map:generate src="xmldb:xindice-embed:///db/{1}"/>
-        <map:serialize type="xml"/>
-      </map:match>
-    </map:pipeline>
+    <map:views>
+        <map:view name="content" from-label="content">
+            <map:serialize type="xml" />
+        </map:view>
+
+        <map:view from-label="content" name="pretty-content">
+            <map:serialize type="servletService" mime-type="text/html">
+                <map:parameter name="service" value="servlet:style-default:/service/system/xml2html"
/>
+            </map:serialize>
+        </map:view>
+
+        <map:view name="links" from-position="last">
+            <map:serialize type="links" />
+        </map:view>
+    </map:views>
+
+    <!-- =========================== Pipelines ================================= -->
+
+    <map:pipelines>
+        <map:pipeline>
+            <map:match pattern="">
+                <map:redirect-to uri="welcome" />
+            </map:match>
+
+            <map:match pattern="welcome">
+                <map:generate src="samples.xml" />
+                <!-- Make use of servlet services -->
+                <map:serialize type="servletService" mime-type="text/html">
+                    <map:parameter name="service" value="servlet:style-default:/service/common/simple-samples2html"
/>
+                </map:serialize>
+            </map:match>
+
+            <map:match pattern="xwelcome">
+                <map:generate src="xmldb:xindice-embed:///db/cocoon/xsamples.xml" />
+                <!-- Make use of servlet services -->
+                <map:serialize type="servletService" mime-type="text/html">
+                    <map:parameter name="service" value="servlet:style-default:/service/common/simple-samples2html"
/>
+                </map:serialize>
+            </map:match>
+
+            <map:match pattern="xmount/**">
+                <map:mount uri-prefix="xmount" src="xmldb:xindice-embed:///db/cocoon/sitemap"
/>
+            </map:match>
+
+            <map:match pattern="populate">
+                <map:generate src="populate.xml" />
+                <map:transform type="cinclude" />
+                <map:transform type="xmldb" />
+                <map:serialize />
+            </map:match>
+
+            <map:match pattern="browse/**">
+                <map:match type="request-parameter" pattern="xpath">
+                    <map:generate src="xmldb:xindice-embed:///db/{../1}#{1}" />
+                    <map:transform src="xmldb2samples.xsl" />
+                    <map:transform type="servletLinkRewriter" />
+                    <!-- Make use of servlet services -->
+                    <map:serialize type="servletService" mime-type="text/html">
+                        <map:parameter name="service" value="servlet:style-default:/service/common/simple-samples2html"
/>
+                    </map:serialize>
+                </map:match>
+
+                <map:generate src="xmldb:xindice-embed:///db/{1}" />
+                <map:transform src="xmldb2samples.xsl" />
+                <map:transform type="servletLinkRewriter" />
+                <!-- Make use of servlet services -->
+                <map:serialize type="servletService" mime-type="text/html">
+                    <map:parameter name="service" value="servlet:style-default:/service/common/simple-samples2html"
/>
+                </map:serialize>
+            </map:match>
+
+            <map:match pattern="db/**">
+                <map:match type="request-parameter" pattern="xpath">
+                    <map:generate src="xmldb:xindice-embed:///db/{../1}#{1}" />
+                    <map:serialize type="xml" />
+                </map:match>
+                <map:generate src="xmldb:xindice-embed:///db/{1}" />
+                <map:serialize type="xml" />
+            </map:match>
+        </map:pipeline>
 
-  </map:pipelines>
+    </map:pipelines>
 </map:sitemap>

Modified: cocoon/trunk/blocks/cocoon-xsp/cocoon-xsp-sample/src/main/resources/COB-INF/sitemap.xmap
URL: http://svn.apache.org/viewvc/cocoon/trunk/blocks/cocoon-xsp/cocoon-xsp-sample/src/main/resources/COB-INF/sitemap.xmap?view=diff&rev=539140&r1=539139&r2=539140
==============================================================================
--- cocoon/trunk/blocks/cocoon-xsp/cocoon-xsp-sample/src/main/resources/COB-INF/sitemap.xmap
(original)
+++ cocoon/trunk/blocks/cocoon-xsp/cocoon-xsp-sample/src/main/resources/COB-INF/sitemap.xmap
Thu May 17 15:06:20 2007
@@ -17,131 +17,131 @@
 -->
 
 <map:sitemap xmlns:map="http://apache.org/cocoon/sitemap/1.0">
-  <map:components>
-    <map:matchers default="wildcard">
-      <map:matcher logger="sitemap.matcher.header" name="filename" src="org.apache.cocoon.matching.modular.CachingRegexpMatcher">
-        <input-module name="request-param">
-           <parameter>filename</parameter>
-        </input-module>
-      </map:matcher>
-    </map:matchers>
-  </map:components>
-
-<!-- =========================== Views =================================== -->
-
-  <map:views>
-    <map:view name="content" from-label="content">
-      <map:serialize type="xml"/>
-    </map:view>
-
-    <map:view from-label="content" name="pretty-content">
-      <!-- Make use of servlet services -->
-      <map:serialize type="servletService" mime-type="text/html">
-        <map:parameter name="service" value="servlet:style-default:/service/system/xml2html"
/>
-      </map:serialize>
-    </map:view>
-
-    <map:view name="links" from-position="last">
-      <map:serialize type="links"/>
-    </map:view>
-  </map:views>
-
-<!-- =========================== Pipelines ================================= -->
-
-  <map:pipelines>
-    <map:pipeline>
-
-      <map:match pattern="">
-        <map:generate src="samples.xml"/>
-        <!-- Make use of servlet services -->
-        <map:serialize type="servletService" mime-type="text/html">
-          <map:parameter name="service" value="servlet:style-default:/service/common/simple-samples2html"
/>
-        </map:serialize>
-      </map:match>
-
-      <map:match pattern="java/*.zip">
-        <map:generate src="java/{1}.xsp" type="serverpages" label="content"/>
-        <map:serialize type="zip"/>
-      </map:match>
-
-      <map:match pattern="java/*">
-        <map:generate src="java/{1}.xsp" type="serverpages"/>
-        <!-- Make use of servlet services -->
-        <map:serialize type="servletService" mime-type="text/html">
-         <map:parameter name="service" value="servlet:style-default:/service/blocks/dynamic-page2html"
/>
-        </map:serialize>
-        <!-- I can't see where these params are used in the dynamic-page2html.xsl
-        <map:transform src="servlet:style-default:/blocks/dynamic-page2html.xsl">
-          <map:parameter name="servletPath" value="{request:servletPath}"/>
-          <map:parameter name="sitemapURI" value="{request:sitemapURI}"/>
-          <map:parameter name="contextPath" value="{request:contextPath}"/>
-          <map:parameter name="file" value="xsp/{1}.xsp"/>
-          <map:parameter name="remove" value="{0}"/>
-        </map:transform>
-        <map:transform type="servletLinkRewriter" />
-        <map:serialize/>
-        -->
-      </map:match>
-
-      <map:match pattern="js/*">
-        <map:generate src="javascript/{1}.xsp" type="serverpages">
-          <map:parameter name="programming-language" value="js"/>
-        </map:generate>
-        <!-- Make use of servlet services -->
-        <map:serialize type="servletService" mime-type="text/html">
-         <map:parameter name="service" value="servlet:style-default:/service/blocks/dynamic-page2html"
/>
-        </map:serialize>
-        <!-- I can't see where these params are used in the dynamic-page2html.xsl
-        <map:transform src="servlet:style-default:/blocks/dynamic-page2html.xsl">
-          <map:parameter name="servletPath" value="{request:servletPath}"/>
-          <map:parameter name="sitemapURI" value="{request:sitemapURI}"/>
-          <map:parameter name="contextPath" value="{request:contextPath}"/>
-          <map:parameter name="file" value="xsp-js/{1}.xsp"/>
-          <map:parameter name="remove" value="{0}"/>
-        </map:transform>
-        <map:transform type="servletLinkRewriter" />
-        <map:serialize/>
-        -->
-      </map:match>
-
-      <map:match pattern="python/*">
-        <map:generate src="python/{1}.xsp" type="serverpages">
-          <map:parameter name="programming-language" value="python"/>
-        </map:generate>
-        <!-- Make use of servlet services -->
-        <map:serialize type="servletService" mime-type="text/html">
-         <map:parameter name="service" value="servlet:style-default:/service/blocks/dynamic-page2html"
/>
-        </map:serialize>
-        <!-- I can't see where these params are used in the dynamic-page2html.xsl
-        <map:transform src="servlet:style-default:/blocks/dynamic-page2html.xsl">
-          <map:parameter name="servletPath" value="{request:servletPath}"/>
-          <map:parameter name="sitemapURI" value="{request:sitemapURI}"/>
-          <map:parameter name="contextPath" value="{request:contextPath}"/>
-          <map:parameter name="file" value="xsp-js/{1}.xsp"/>
-          <map:parameter name="remove" value="{0}"/>
-        </map:transform>
-        <map:transform type="servletLinkRewriter" />
-        <map:serialize/>
-        -->
-      </map:match>
-
-      <map:match pattern="soap/**">
-        <map:mount uri-prefix="soap" src="soap/"/>
-      </map:match>
-  
-    </map:pipeline>
-
-	<map:pipeline internal-only="true">
-      <map:match pattern="view-source">
-        <!-- colourize files that are known to be XML -->
-        <map:match type="filename" pattern="((xml)|(xsp)|(xmap)|(xconf))$">
-          <map:generate src="util/view-source.xsp" type="serverpages"/>
-          <map:serialize/>
-        </map:match>
-        <!-- all other files are just send as text -->
-        <map:read mime-type="text/plain" src="../{request-param:filename}"/>
-      </map:match>
-    </map:pipeline>
-  
-  </map:pipelines>
+    <map:components>
+        <map:matchers default="wildcard">
+            <map:matcher logger="sitemap.matcher.header" name="filename" src="org.apache.cocoon.matching.modular.CachingRegexpMatcher">
+                <input-module name="request-param">
+                    <parameter>filename</parameter>
+                </input-module>
+            </map:matcher>
+        </map:matchers>
+    </map:components>
+
+    <!-- =========================== Views =================================== -->
+
+    <map:views>
+        <map:view name="content" from-label="content">
+            <map:serialize type="xml" />
+        </map:view>
+
+        <map:view from-label="content" name="pretty-content">
+            <!-- Make use of servlet services -->
+            <map:serialize type="servletService" mime-type="text/html">
+                <map:parameter name="service" value="servlet:style-default:/service/system/xml2html"
/>
+            </map:serialize>
+        </map:view>
+
+        <map:view name="links" from-position="last">
+            <map:serialize type="links" />
+        </map:view>
+    </map:views>
+
+    <!-- =========================== Pipelines ================================= -->
+
+    <map:pipelines>
+        <map:pipeline>
+
+            <map:match pattern="">
+                <map:generate src="samples.xml" />
+                <!-- Make use of servlet services -->
+                <map:serialize type="servletService" mime-type="text/html">
+                    <map:parameter name="service" value="servlet:style-default:/service/common/simple-samples2html"
/>
+                </map:serialize>
+            </map:match>
+
+            <map:match pattern="java/*.zip">
+                <map:generate src="java/{1}.xsp" type="serverpages" label="content" />
+                <map:serialize type="zip" />
+            </map:match>
+
+            <map:match pattern="java/*">
+                <map:generate src="java/{1}.xsp" type="serverpages" />
+                <!-- Make use of servlet services -->
+                <map:serialize type="servletService" mime-type="text/html">
+                    <map:parameter name="service" value="servlet:style-default:/service/blocks/dynamic-page2html"
/>
+                </map:serialize>
+                <!-- I can't see where these params are used in the dynamic-page2html.xsl
+                    <map:transform src="servlet:style-default:/blocks/dynamic-page2html.xsl">
+                    <map:parameter name="servletPath" value="{request:servletPath}"/>
+                    <map:parameter name="sitemapURI" value="{request:sitemapURI}"/>
+                    <map:parameter name="contextPath" value="{request:contextPath}"/>
+                    <map:parameter name="file" value="xsp/{1}.xsp"/>
+                    <map:parameter name="remove" value="{0}"/>
+                    </map:transform>
+                    <map:transform type="servletLinkRewriter" />
+                    <map:serialize/>
+                -->
+            </map:match>
+
+            <map:match pattern="js/*">
+                <map:generate src="javascript/{1}.xsp" type="serverpages">
+                    <map:parameter name="programming-language" value="js" />
+                </map:generate>
+                <!-- Make use of servlet services -->
+                <map:serialize type="servletService" mime-type="text/html">
+                    <map:parameter name="service" value="servlet:style-default:/service/blocks/dynamic-page2html"
/>
+                </map:serialize>
+                <!-- I can't see where these params are used in the dynamic-page2html.xsl
+                    <map:transform src="servlet:style-default:/blocks/dynamic-page2html.xsl">
+                    <map:parameter name="servletPath" value="{request:servletPath}"/>
+                    <map:parameter name="sitemapURI" value="{request:sitemapURI}"/>
+                    <map:parameter name="contextPath" value="{request:contextPath}"/>
+                    <map:parameter name="file" value="xsp-js/{1}.xsp"/>
+                    <map:parameter name="remove" value="{0}"/>
+                    </map:transform>
+                    <map:transform type="servletLinkRewriter" />
+                    <map:serialize/>
+                -->
+            </map:match>
+
+            <map:match pattern="python/*">
+                <map:generate src="python/{1}.xsp" type="serverpages">
+                    <map:parameter name="programming-language" value="python" />
+                </map:generate>
+                <!-- Make use of servlet services -->
+                <map:serialize type="servletService" mime-type="text/html">
+                    <map:parameter name="service" value="servlet:style-default:/service/blocks/dynamic-page2html"
/>
+                </map:serialize>
+                <!-- I can't see where these params are used in the dynamic-page2html.xsl
+                    <map:transform src="servlet:style-default:/blocks/dynamic-page2html.xsl">
+                    <map:parameter name="servletPath" value="{request:servletPath}"/>
+                    <map:parameter name="sitemapURI" value="{request:sitemapURI}"/>
+                    <map:parameter name="contextPath" value="{request:contextPath}"/>
+                    <map:parameter name="file" value="xsp-js/{1}.xsp"/>
+                    <map:parameter name="remove" value="{0}"/>
+                    </map:transform>
+                    <map:transform type="servletLinkRewriter" />
+                    <map:serialize/>
+                -->
+            </map:match>
+
+            <map:match pattern="soap/**">
+                <map:mount uri-prefix="soap" src="soap/" />
+            </map:match>
+
+        </map:pipeline>
+
+        <map:pipeline internal-only="true">
+            <map:match pattern="view-source">
+                <!-- colourize files that are known to be XML -->
+                <map:match type="filename" pattern="((xml)|(xsp)|(xmap)|(xconf))$">
+                    <map:generate src="util/view-source.xsp" type="serverpages" />
+                    <map:serialize />
+                </map:match>
+                <!-- all other files are just send as text -->
+                <map:read mime-type="text/plain" src="../{request-param:filename}" />
+            </map:match>
+        </map:pipeline>
+
+    </map:pipelines>
 </map:sitemap>

Modified: cocoon/trunk/blocks/cocoon-xsp/cocoon-xsp-sample/src/main/resources/COB-INF/soap/sitemap.xmap
URL: http://svn.apache.org/viewvc/cocoon/trunk/blocks/cocoon-xsp/cocoon-xsp-sample/src/main/resources/COB-INF/soap/sitemap.xmap?view=diff&rev=539140&r1=539139&r2=539140
==============================================================================
--- cocoon/trunk/blocks/cocoon-xsp/cocoon-xsp-sample/src/main/resources/COB-INF/soap/sitemap.xmap
(original)
+++ cocoon/trunk/blocks/cocoon-xsp/cocoon-xsp-sample/src/main/resources/COB-INF/soap/sitemap.xmap
Thu May 17 15:06:20 2007
@@ -20,68 +20,68 @@
 
 <map:sitemap xmlns:map="http://apache.org/cocoon/sitemap/1.0">
 
- <map:pipelines>
-   <map:pipeline>
+    <map:pipelines>
+        <map:pipeline>
 
-   <map:match pattern="">
-     <map:generate src="samples.xml"/>
-     <!-- Make use of servlet services -->
-     <map:serialize type="servletService" mime-type="text/html">
-       <map:parameter name="service" value="servlet:style-default:/service/common/simple-samples2html"
/>
-     </map:serialize>
-   </map:match>
-
-   <!-- ======================== XScript Samples ========================= -->
-
-   <map:match pattern="xscript/getquote1">
-     <map:generate src="pages/xscript/getquote1.xsp" type="serverpages"/>
-     <map:transform src="stylesheets/soap-getquote1.xsl"/>
-     <!-- Make use of servlet services -->
-     <map:serialize type="servletService" mime-type="text/html">
-       <map:parameter name="service" value="servlet:style-default:/service/blocks/dynamic-page2html"
/>
-     </map:serialize>
-     <!-- I can't see where these params are used in the dynamic-page2html.xsl
-     <map:transform src="servlet:style-default:/blocks/dynamic-page2html.xsl">
-        <map:parameter name="servletPath" value="{request:servletPath}"/>
-        <map:parameter name="sitemapURI" value="{request:sitemapURI}"/>
-        <map:parameter name="contextPath" value="{request:contextPath}"/>
-        <map:parameter name="file" value="pages/{0}.xsp"/>
-        <map:parameter name="remove" value="{0}"/>
-     </map:transform>
-     <map:transform type="servletLinkRewriter" />
-     <map:serialize/>
-     -->
-   </map:match>
-
-   <map:match pattern="xscript/*">
-     <map:generate src="pages/xscript/{1}.xsp" type="serverpages"/>
-     <!-- Make use of servlet services -->
-     <map:serialize type="servletService" mime-type="text/html">
-       <map:parameter name="service" value="servlet:style-default:/service/blocks/dynamic-page2html"
/>
-     </map:serialize>
-     <!-- I can't see where these params are used in the dynamic-page2html.xsl
-     <map:transform src="servlet:style-default:/blocks/dynamic-page2html.xsl">
-        <map:parameter name="servletPath" value="{request:servletPath}"/>
-        <map:parameter name="sitemapURI" value="{request:sitemapURI}"/>
-        <map:parameter name="contextPath" value="{request:contextPath}"/>
-        <map:parameter name="file" value="pages/{0}.xsp"/>
-        <map:parameter name="remove" value="{0}"/>
-     </map:transform>
-     <map:transform type="servletLinkRewriter" />
-     <map:serialize/>
-     -->
-   </map:match>   
-
-   <!-- ======================== XScript Samples ========================= -->
-            
-   <map:match pattern="*">
-    <map:generate src="pages/{1}.xsp" type="serverpages"/>
-    <!-- Make use of servlet services -->
-    <map:serialize type="servletService" mime-type="text/html">
-      <map:parameter name="service" value="servlet:style-default:/service/system/xml2html"
/>
-    </map:serialize>
-   </map:match>
+            <map:match pattern="">
+                <map:generate src="samples.xml" />
+                <!-- Make use of servlet services -->
+                <map:serialize type="servletService" mime-type="text/html">
+                    <map:parameter name="service" value="servlet:style-default:/service/common/simple-samples2html"
/>
+                </map:serialize>
+            </map:match>
+
+            <!-- ======================== XScript Samples ========================= -->
+
+            <map:match pattern="xscript/getquote1">
+                <map:generate src="pages/xscript/getquote1.xsp" type="serverpages" />
+                <map:transform src="stylesheets/soap-getquote1.xsl" />
+                <!-- Make use of servlet services -->
+                <map:serialize type="servletService" mime-type="text/html">
+                    <map:parameter name="service" value="servlet:style-default:/service/blocks/dynamic-page2html"
/>
+                </map:serialize>
+                <!-- I can't see where these params are used in the dynamic-page2html.xsl
+                    <map:transform src="servlet:style-default:/blocks/dynamic-page2html.xsl">
+                    <map:parameter name="servletPath" value="{request:servletPath}"/>
+                    <map:parameter name="sitemapURI" value="{request:sitemapURI}"/>
+                    <map:parameter name="contextPath" value="{request:contextPath}"/>
+                    <map:parameter name="file" value="pages/{0}.xsp"/>
+                    <map:parameter name="remove" value="{0}"/>
+                    </map:transform>
+                    <map:transform type="servletLinkRewriter" />
+                    <map:serialize/>
+                -->
+            </map:match>
+
+            <map:match pattern="xscript/*">
+                <map:generate src="pages/xscript/{1}.xsp" type="serverpages" />
+                <!-- Make use of servlet services -->
+                <map:serialize type="servletService" mime-type="text/html">
+                    <map:parameter name="service" value="servlet:style-default:/service/blocks/dynamic-page2html"
/>
+                </map:serialize>
+                <!-- I can't see where these params are used in the dynamic-page2html.xsl
+                    <map:transform src="servlet:style-default:/blocks/dynamic-page2html.xsl">
+                    <map:parameter name="servletPath" value="{request:servletPath}"/>
+                    <map:parameter name="sitemapURI" value="{request:sitemapURI}"/>
+                    <map:parameter name="contextPath" value="{request:contextPath}"/>
+                    <map:parameter name="file" value="pages/{0}.xsp"/>
+                    <map:parameter name="remove" value="{0}"/>
+                    </map:transform>
+                    <map:transform type="servletLinkRewriter" />
+                    <map:serialize/>
+                -->
+            </map:match>
+
+            <!-- ======================== XScript Samples ========================= -->
+
+            <map:match pattern="*">
+                <map:generate src="pages/{1}.xsp" type="serverpages" />
+                <!-- Make use of servlet services -->
+                <map:serialize type="servletService" mime-type="text/html">
+                    <map:parameter name="service" value="servlet:style-default:/service/system/xml2html"
/>
+                </map:serialize>
+            </map:match>
 
-   </map:pipeline>                
- </map:pipelines>
+        </map:pipeline>
+    </map:pipelines>
 </map:sitemap>



Mime
View raw message