cocoon-cvs mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From t..@apache.org
Subject svn commit: r149560 - in cocoon/whiteboard/forms: WEB-INF/xconf/cocoon-forms.xconf samples/swan/sitemap.xmap
Date Wed, 02 Feb 2005 19:56:41 GMT
Author: tim
Date: Wed Feb  2 11:56:40 2005
New Revision: 149560

URL: http://svn.apache.org/viewcvs?view=rev&rev=149560
Log:
Sync with trunk: remove cforms sample dependency on profiler, remove reference to xsp.

Modified:
    cocoon/whiteboard/forms/WEB-INF/xconf/cocoon-forms.xconf
    cocoon/whiteboard/forms/samples/swan/sitemap.xmap

Modified: cocoon/whiteboard/forms/WEB-INF/xconf/cocoon-forms.xconf
URL: http://svn.apache.org/viewcvs/cocoon/whiteboard/forms/WEB-INF/xconf/cocoon-forms.xconf?view=diff&r1=149559&r2=149560
==============================================================================
--- cocoon/whiteboard/forms/WEB-INF/xconf/cocoon-forms.xconf (original)
+++ cocoon/whiteboard/forms/WEB-INF/xconf/cocoon-forms.xconf Wed Feb  2 11:56:40 2005
@@ -1,6 +1,6 @@
 <?xml version="1.0"?>
 <!--
-  Copyright 1999-2004 The Apache Software Foundation
+  Copyright 1999-2005 The Apache Software Foundation
 
   Licensed under the Apache License, Version 2.0 (the "License");
   you may not use this file except in compliance with the License.
@@ -15,7 +15,12 @@
   limitations under the License.
 -->
 
+<!--+
+    |
+    | @version $Id$
+    +-->
 <components>
+  <!-- Include roles -->
   <include src="resource://org/apache/cocoon/forms/forms.roles"/>
 
   <forms-binding logger="forms.binding">
@@ -189,4 +194,4 @@
     <transformer name="forms" logger="forms" src="org.apache.cocoon.forms.transformation.FormsTemplateTransformer"/>
   </transformers>
 
-</components>
\ No newline at end of file
+</components>

Modified: cocoon/whiteboard/forms/samples/swan/sitemap.xmap
URL: http://svn.apache.org/viewcvs/cocoon/whiteboard/forms/samples/swan/sitemap.xmap?view=diff&r1=149559&r2=149560
==============================================================================
--- cocoon/whiteboard/forms/samples/swan/sitemap.xmap (original)
+++ cocoon/whiteboard/forms/samples/swan/sitemap.xmap Wed Feb  2 11:56:40 2005
@@ -38,8 +38,6 @@
     <map:pipes default="caching">
       <map:pipe name="caching" src="org.apache.cocoon.components.pipeline.impl.CachingProcessingPipeline"/>
       <map:pipe name="noncaching" src="org.apache.cocoon.components.pipeline.impl.NonCachingProcessingPipeline"/>
-      <map:pipe name="profile-caching" src="org.apache.cocoon.components.profiler.ProfilingCachingProcessingPipeline"/>
-      <map:pipe name="profile-noncaching" src="org.apache.cocoon.components.profiler.ProfilingNonCachingProcessingPipeline"/>
     </map:pipes>
 
   </map:components>
@@ -79,22 +77,6 @@
 
   <map:pipelines>
 
-    <map:pipeline>
-      <map:match pattern="profile.html">
-        <map:generate type="profiler"/>
-        <map:transform src="context://samples/blocks/profiler/profile2html.xsl">
-          <map:parameter name="use-request-parameters" value="true"/>
-        </map:transform>
-        <map:serialize type="html"/>
-      </map:match>
-
-      <map:match pattern="profile.xml">
-        <map:generate type="profiler"/>
-        <map:serialize type="xml"/>
-      </map:match>
-
-    </map:pipeline>
-
     <map:pipeline type="noncaching">
 
       <map:match pattern="">
@@ -122,14 +104,6 @@
  
       <map:match pattern="*-error-pipeline">
         <map:generate src="error.xml"/>
-        <map:serialize/>
-      </map:match>
- 
-      <map:match pattern="*-success-pipeline.xsp">
-        <map:generate type="serverpages" src="forms/{1}_success.xsp"/>
-        <map:call resource="simple-page2html">
-          <map:parameter name="file" value="forms/{1}_template.xsp"/>
-        </map:call>
         <map:serialize/>
       </map:match>
  



Mime
View raw message