vgritsenko 2004/06/11 14:38:10
Modified: src/webapp sitemap.xmap
src/webapp/samples sitemap.xmap
src/webapp/samples/hello-world samples.xml
Log:
cleanup sitemap, remove link to removed SWF block
Revision Changes Path
1.51 +1 -2 cocoon-2.1/src/webapp/sitemap.xmap
Index: sitemap.xmap
===================================================================
RCS file: /home/cvs/cocoon-2.1/src/webapp/sitemap.xmap,v
retrieving revision 1.50
retrieving revision 1.51
diff -u -r1.50 -r1.51
--- sitemap.xmap 26 Mar 2004 00:00:14 -0000 1.50
+++ sitemap.xmap 11 Jun 2004 21:38:10 -0000 1.51
@@ -644,7 +644,6 @@
</map:select>
</map:handle-errors>
-
</map:pipeline>
</map:pipelines>
1.27 +160 -167 cocoon-2.1/src/webapp/samples/sitemap.xmap
Index: sitemap.xmap
===================================================================
RCS file: /home/cvs/cocoon-2.1/src/webapp/samples/sitemap.xmap,v
retrieving revision 1.26
retrieving revision 1.27
diff -u -r1.26 -r1.27
--- sitemap.xmap 19 May 2004 11:32:02 -0000 1.26
+++ sitemap.xmap 11 Jun 2004 21:38:10 -0000 1.27
@@ -19,172 +19,165 @@
<map:sitemap xmlns:map="http://apache.org/cocoon/sitemap/1.0";>
-<!-- =========================== Components ================================
-->
+ <!-- ========================= Components ================================
-->
- <map:components>
- <map:generators default="file">
- <map:generator name="linkstatus"
src="org.apache.cocoon.generation.LinkStatusGenerator"/>
- <map:generator name="calendar"
src="org.apache.cocoon.generation.CalendarGenerator"/>
- </map:generators>
- <map:transformers default="xslt"/>
- <map:readers default="resource"/>
- <map:serializers default="html"/>
- <map:matchers default="wildcard"/>
- <map:selectors default="browser"/>
- </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">
- <map:transform src="context://stylesheets/system/xml2html.xslt"/>
- <map:serialize type="html"/>
- </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"/>
- <map:transform
src="context://samples/common/style/xsl/html/simple-samples2html.xsl">
- <map:parameter name="contextPath" value="{request:contextPath}"/>
- </map:transform>
- <map:serialize/>
- </map:match>
-
- <!-- ========================== Stream =================================
-->
-
- <map:match pattern="order">
- <map:generate src="stream/OrderPage.xml"/>
- <map:transform
src="context://samples/stylesheets/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"/>
- </map:transform>
- <map:serialize type="html"/>
- </map:match>
-
- <map:match pattern="process-order">
- <map:generate type="stream">
- <map:parameter name="form-name" value="Foo"/>
- </map:generate>
- <map:transform src="context://stylesheets/system/xml2html.xslt"/>
- <map:serialize type="html"/>
- </map:match>
-
- <!-- ========================= Other Samples
================================ -->
-
- <map:match pattern="scratchpad">
- <map:generate src="scratchpad-samples.xml"/>
- <map:transform
src="context://samples/common/style/xsl/html/simple-samples2html.xsl">
- <map:parameter name="contextPath" value="{request:contextPath}"/>
- </map:transform>
- <map:serialize/>
- </map:match>
-
- <map:match pattern="components">
- <map:generate src="components-samples.xml"/>
- <map:transform
src="context://samples/common/style/xsl/html/simple-samples2html.xsl">
- <map:parameter name="contextPath" value="{request:contextPath}"/>
- </map:transform>
- <map:serialize/>
- </map:match>
-
- <map:match pattern="misc">
- <map:generate src="misc-samples.xml"/>
- <map:transform
src="context://samples/common/style/xsl/html/simple-samples2html.xsl">
- <map:parameter name="contextPath" value="{request:contextPath}"/>
- </map:transform>
- <map:serialize/>
- </map:match>
-
- <!-- ========================= Utilities ================================
-->
-
- <map:match pattern="**sitemap.xmap">
- <map:generate src="{0}"/>
- <map:serialize type="xml"/>
- </map:match>
-
- <map:match pattern="linkstatus">
- <map:redirect-to uri="linkstatus/localhost/8888/docs/index.html"/>
- </map:match>
-
- <map:match pattern="linkstatus/*/*/**">
- <map:generate type="linkstatus" src="http://{1}:{2}/{3}"/>
- <map:transform src="context://stylesheets/system/linkstatus2html.xslt"/>
- <map:serialize/>
- </map:match>
-
- <map:match pattern="status.html">
- <map:generate src="status" type="status"/>
- <map:transform src="context://stylesheets/system/status2html.xslt">
- <map:parameter name="contextPath" value="{request:contextPath}"/>
- </map:transform>
- <map:serialize/>
- </map:match>
-
- <map:match pattern="clearcache.html">
- <map:act type="clear-cache">
- <map:generate src="status" type="status"/>
- <map:transform src="context://stylesheets/system/status2html.xslt">
- <map:parameter name="contextPath" value="{request:contextPath}"/>
- </map:transform>
- <map:serialize/>
- </map:act>
- </map:match>
-
- <map:match pattern="clearpersistentstore.html">
- <map:act type="clear-persistent-store">
- <map:generate src="status" type="status"/>
- <map:transform src="context://stylesheets/system/status2html.xslt">
- <map:parameter name="contextPath" value="{request:contextPath}"/>
- </map:transform>
- <map:serialize/>
- </map:act>
- <map:generate src="no-persistent-store.xml"/>
- <map:transform src="context://stylesheets/system/xml2html.xslt"/>
- <map:serialize type="html"/>
- </map:match>
-
- <map:match pattern="request.html">
- <map:generate type="request"/>
- <map:transform src="context://stylesheets/system/xml2html.xslt"/>
- <map:serialize/>
- </map:match>
-
- <map:match pattern="cal">
- <map:generate type="calendar" label="content">
- <!-- Uncomment and set a value for the desired month and year
- <map:parameter name="month" value="6"/>
- <map:parameter name="year" value="1998"/>
- -->
- <map:parameter name="dateFormat" value="EEEE, MMMM d yyyy"/>
- <map:parameter name="lang" value="en"/>
- <map:parameter name="country" value="US"/>
- </map:generate>
- <map:transform src="context://stylesheets/system/calendar2html.xslt"/>
- <map:serialize/>
- </map:match>
-
- <!-- ======================== Automount ===============================
-->
-
- <map:match pattern="*/**">
- <map:mount uri-prefix="{1}" src="{1}/" check-reload="yes"/>
- </map:match>
+ <map:components>
+ <map:generators default="file">
+ <map:generator name="linkstatus"
src="org.apache.cocoon.generation.LinkStatusGenerator"/>
+ <map:generator name="calendar"
src="org.apache.cocoon.generation.CalendarGenerator"/>
+ </map:generators>
+ </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">
+ <map:transform src="context://stylesheets/system/xml2html.xslt"/>
+ <map:serialize type="html"/>
+ </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"/>
+ <map:transform
src="context://samples/common/style/xsl/html/simple-samples2html.xsl">
+ <map:parameter name="contextPath" value="{request:contextPath}"/>
+ </map:transform>
+ <map:serialize/>
+ </map:match>
+
+ <!-- ========================= Stream ================================
-->
+
+ <map:match pattern="order">
+ <map:generate src="stream/OrderPage.xml"/>
+ <map:transform
src="context://samples/stylesheets/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"/>
+ </map:transform>
+ <map:serialize type="html"/>
+ </map:match>
+
+ <map:match pattern="process-order">
+ <map:generate type="stream">
+ <map:parameter name="form-name" value="Foo"/>
+ </map:generate>
+ <map:transform src="context://stylesheets/system/xml2html.xslt"/>
+ <map:serialize type="html"/>
+ </map:match>
+
+ <!-- ======================= Other Samples ===========================
-->
+
+ <map:match pattern="scratchpad">
+ <map:generate src="scratchpad-samples.xml"/>
+ <map:transform
src="context://samples/common/style/xsl/html/simple-samples2html.xsl">
+ <map:parameter name="contextPath" value="{request:contextPath}"/>
+ </map:transform>
+ <map:serialize/>
+ </map:match>
+
+ <map:match pattern="components">
+ <map:generate src="components-samples.xml"/>
+ <map:transform
src="context://samples/common/style/xsl/html/simple-samples2html.xsl">
+ <map:parameter name="contextPath" value="{request:contextPath}"/>
+ </map:transform>
+ <map:serialize/>
+ </map:match>
+
+ <map:match pattern="misc">
+ <map:generate src="misc-samples.xml"/>
+ <map:transform
src="context://samples/common/style/xsl/html/simple-samples2html.xsl">
+ <map:parameter name="contextPath" value="{request:contextPath}"/>
+ </map:transform>
+ <map:serialize/>
+ </map:match>
+
+ <!-- ======================== Utilities ==============================
-->
+
+ <map:match pattern="**sitemap.xmap">
+ <map:generate src="{0}"/>
+ <map:serialize type="xml"/>
+ </map:match>
+
+ <map:match pattern="linkstatus">
+ <map:redirect-to uri="linkstatus/localhost/8888/docs/index.html"/>
+ </map:match>
+
+ <map:match pattern="linkstatus/*/*/**">
+ <map:generate type="linkstatus" src="http://{1}:{2}/{3}"/>
+ <map:transform
src="context://stylesheets/system/linkstatus2html.xslt"/>
+ <map:serialize/>
+ </map:match>
+
+ <map:match pattern="status.html">
+ <map:generate src="status" type="status"/>
+ <map:transform src="context://stylesheets/system/status2html.xslt">
+ <map:parameter name="contextPath" value="{request:contextPath}"/>
+ </map:transform>
+ <map:serialize/>
+ </map:match>
+
+ <map:match pattern="clearcache.html">
+ <map:act type="clear-cache">
+ <map:generate src="status" type="status"/>
+ <map:transform src="context://stylesheets/system/status2html.xslt">
+ <map:parameter name="contextPath" value="{request:contextPath}"/>
+ </map:transform>
+ <map:serialize/>
+ </map:act>
+ </map:match>
+
+ <map:match pattern="clearpersistentstore.html">
+ <map:act type="clear-persistent-store">
+ <map:generate src="status" type="status"/>
+ <map:transform src="context://stylesheets/system/status2html.xslt">
+ <map:parameter name="contextPath" value="{request:contextPath}"/>
+ </map:transform>
+ <map:serialize/>
+ </map:act>
+ <map:generate src="no-persistent-store.xml"/>
+ <map:transform src="context://stylesheets/system/xml2html.xslt"/>
+ <map:serialize type="html"/>
+ </map:match>
+
+ <map:match pattern="request.html">
+ <map:generate type="request"/>
+ <map:transform src="context://stylesheets/system/xml2html.xslt"/>
+ <map:serialize/>
+ </map:match>
+
+ <map:match pattern="cal">
+ <map:generate type="calendar" label="content">
+ <!-- Uncomment and set a value for the desired month and year
+ <map:parameter name="month" value="6"/>
+ <map:parameter name="year" value="1998"/>
+ -->
+ <map:parameter name="dateFormat" value="EEEE, MMMM d yyyy"/>
+ <map:parameter name="lang" value="en"/>
+ <map:parameter name="country" value="US"/>
+ </map:generate>
+ <map:transform
src="context://stylesheets/system/calendar2html.xslt"/>
+ <map:serialize/>
+ </map:match>
+
+ <!-- ========================= Automount =============================
-->
+
+ <map:match pattern="*/**">
+ <map:mount uri-prefix="{1}" src="{1}/" check-reload="yes"/>
+ </map:match>
+ </map:pipeline>
- </map:pipeline>
-
- </map:pipelines>
+ </map:pipelines>
</map:sitemap>
1.17 +1 -4 cocoon-2.1/src/webapp/samples/hello-world/samples.xml
Index: samples.xml
===================================================================
RCS file: /home/cvs/cocoon-2.1/src/webapp/samples/hello-world/samples.xml,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -r1.16 -r1.17
--- samples.xml 4 Jun 2004 00:12:30 -0000 1.16
+++ samples.xml 11 Jun 2004 21:38:10 -0000 1.17
@@ -130,9 +130,6 @@
<sample name="PNG" href="../blocks/batik/hello.png">
Hello from the batik block in PNG.
</sample>
- <sample name="SWF" href="../blocks/swf/hello.swf">
- Flashy hello from swf block! You need the appropriate (flash) plugin for
your browser.
- </sample>
<sample name="XLS" href="../blocks/poi/hello.xls">
Hello in Excel spreadsheet format from the POI block.
</sample>
