giacomo 01/05/06 01:01:40
Modified: . Tag: xml-cocoon2 build.xml
xdocs Tag: xml-cocoon2 httprequest.xml
webapp Tag: xml-cocoon2 sitemap.xmap
Log:
Patch applied.
Submitted by: Hans Ulrich Niederman
Revision Changes Path
No revision
No revision
1.6.2.80 +8 -0 xml-cocoon/build.xml
Index: build.xml
===================================================================
RCS file: /home/cvs/xml-cocoon/build.xml,v
retrieving revision 1.6.2.79
retrieving revision 1.6.2.80
diff -u -r1.6.2.79 -r1.6.2.80
--- build.xml 2001/04/19 13:11:39 1.6.2.79
+++ build.xml 2001/05/06 08:01:40 1.6.2.80
@@ -447,6 +447,14 @@
</fileset>
</copy>
+ <copy todir="${build.docs}" filtering="off">
+ <fileset dir="${docs.dir}">
+ <include name="**/*.gif"/>
+ <include name="**/*.png"/>
+ <include name="**/*.jpg"/>
+ </fileset>
+ </copy>
+
<copy file="changes.xml" tofile="${build.xdocs}/changes.xml"
filtering="on"/>
<copy file="todo.xml" tofile="${build.xdocs}/todo.xml"/>
No revision
No revision
1.1.2.7 +49 -49 xml-cocoon/xdocs/Attic/httprequest.xml
Index: httprequest.xml
===================================================================
RCS file: /home/cvs/xml-cocoon/xdocs/Attic/httprequest.xml,v
retrieving revision 1.1.2.6
retrieving revision 1.1.2.7
diff -u -r1.1.2.6 -r1.1.2.7
--- httprequest.xml 2001/04/21 10:09:33 1.1.2.6
+++ httprequest.xml 2001/05/06 08:01:40 1.1.2.7
@@ -41,58 +41,58 @@
Cocoon @[EMAIL PROTECTED]</p>
<p>The sitemap is defined in
<code>${cocoon}/sitemap.xmap</code>.</p>
<source><![CDATA[
- <?xml version="1.0"?>
-
- <map:sitemap xmlns:map="http://apache.org/cocoon/sitemap/1.0";>
-
-
<!--===========================Components================================-->
- <map:components>
-
- <map:generators default="file">
- <map:generator name="file" label="content"
-
src="org.apache.cocoon.generation.FileGenerator"/>
- </map:generators>
-
- <map:transformers default="xslt">
- <map:transformer name="xslt"
-
src="org.apache.cocoon.transformation.XalanTransformer">
- <compile-stylesheets map:value="true"/>
- </map:transformer>
- </map:transformers>
-
- <map:serializers default="html">
- <map:serializer name="html" mime-type="text/html"
-
src="org.apache.cocoon.serialization.HTMLSerializer"/>
- </map:serializers>
+<?xml version="1.0"?>
- <map:selectors default="browser">
- <map:selector name="browser"
-
factory="org.apache.cocoon.selection.BrowserSelectorFactory">
- <browser name="explorer" useragent="MSIE"/>
- <browser name="netscape" useragent="Mozilla"/>
- </map:selector>
- </map:selectors>
-
- <map:matchers default="uri">
- <map:matcher name="uri"
-
factory="org.apache.cocoon.matching.WildcardURIMatcherFactory"/>
- </map:matchers>
+<map:sitemap xmlns:map="http://apache.org/cocoon/sitemap/1.0";>
- </map:components>
+
<!--===========================Components================================-->
+ <map:components>
-
<!--===========================Pipelines=================================-->
- <map:pipelines>
- <map:pipeline>
- <map:match pattern="hello.html">
- <map:generate src="docs/samples/hello-page.xml"/>
- <map:transform
src="stylesheets/page/simple-page2html.xsl"/>
- <map:serialize type="html"/>
- </map:match>
- </map:pipeline>
- </map:pipelines>
+ <map:generators default="file">
+ <map:generator name="file" label="content"
+ src="org.apache.cocoon.generation.FileGenerator"/>
+ </map:generators>
+
+ <map:transformers default="xslt">
+ <map:transformer name="xslt"
+
src="org.apache.cocoon.transformation.XalanTransformer">
+ <compile-stylesheets map:value="true"/>
+ </map:transformer>
+ </map:transformers>
+
+ <map:serializers default="html">
+ <map:serializer name="html" mime-type="text/html"
+ src="org.apache.cocoon.serialization.HTMLSerializer"/>
+ </map:serializers>
+
+ <map:selectors default="browser">
+ <map:selector name="browser"
+
factory="org.apache.cocoon.selection.BrowserSelectorFactory">
+ <browser name="explorer" useragent="MSIE"/>
+ <browser name="netscape" useragent="Mozilla"/>
+ </map:selector>
+ </map:selectors>
+
+ <map:matchers default="uri">
+ <map:matcher name="uri"
+
factory="org.apache.cocoon.matching.WildcardURIMatcherFactory"/>
+ </map:matchers>
+
+ </map:components>
+
+
<!--===========================Pipelines=================================-->
+ <map:pipelines>
+ <map:pipeline>
+ <map:match pattern="hello.html">
+ <map:generate src="docs/samples/hello-page.xml"/>
+ <map:transform src="stylesheets/page/simple-page2html.xsl"/>
+ <map:serialize type="html"/>
+ </map:match>
+ </map:pipeline>
+ </map:pipelines>
- </map:sitemap>
- ]]></source>
+</map:sitemap>
+]]></source>
</s2>
<s2 title="cocoon.xconf">
<p><code>cocoon.xconf</code> is the file that defines the
@@ -240,7 +240,7 @@
</s3>
<s3 title="UML sequence diagram">
<p>You can find it <link
- href="images/initialize_cocoon.png">here</link>.</p>
+ href="images/initialize_Cocoon.png">here</link>.</p>
</s3>
</s2>
<s2 title="HttpRequest handling">
No revision
No revision
1.1.2.57 +35 -2 xml-cocoon/webapp/Attic/sitemap.xmap
Index: sitemap.xmap
===================================================================
RCS file: /home/cvs/xml-cocoon/webapp/Attic/sitemap.xmap,v
retrieving revision 1.1.2.56
retrieving revision 1.1.2.57
diff -u -r1.1.2.56 -r1.1.2.57
--- sitemap.xmap 2001/04/26 17:53:34 1.1.2.56
+++ sitemap.xmap 2001/05/06 08:01:40 1.1.2.57
@@ -21,12 +21,14 @@
<map:transformers default="xslt">
<map:transformer name="xslt"
src="org.apache.cocoon.transformation.TraxTransformer">
- <compile-stylesheets map:value="true"/>
<use-store map:value="true"/>
+ <use-request-parameters map:value="false"/>
+ <use-browser-capabilities-db map:value="false"/>
</map:transformer>
<map:transformer name="log"
src="org.apache.cocoon.transformation.LogTransformer"/>
<map:transformer name="sql"
src="org.apache.cocoon.transformation.SQLTransformer"/>
<map:transformer name="extractor"
src="org.apache.cocoon.transformation.FragmentExtractorTransformer"/>
+ <map:transformer name="i18n"
src="org.apache.cocoon.transformation.I18nTransformer"/>
</map:transformers>
<map:readers default="resource">
@@ -89,6 +91,7 @@
<map:action name="add-employee"
src="org.apache.cocoon.acting.DatabaseAddAction"/>
<map:action name="del-employee"
src="org.apache.cocoon.acting.DatabaseDeleteAction"/>
<map:action name="upd-employee"
src="org.apache.cocoon.acting.DatabaseUpdateAction"/>
+ <map:action name="lang-select" src="org.apache.cocoon.acting.LangSelect"/>
</map:actions>
</map:components>
@@ -337,6 +340,36 @@
<map:read src="docs/samples/{1}.png" mime-type="image/png"/>
</map:match>
+ <map:match pattern="i18n">
+ <map:generate type="serverpages" src="docs/samples/i18n/navigation.xsp"/>
+ <map:serialize type="html"/>
+ </map:match>
+
+ <!--
+ This pipeline is responsable for generating the images for the navigation
+ bar. It uses the navimage.xsp to generate an SVG document which contains
+ the text for the image from the request URI passed as a parameter. The
+ requested language is evaluated by the LangSelect action. The text
+ represents a key into the i18n dictionary for all navigation items. At
+ the end the generated SVG is serialized as a PNG image.
+ This pipeline is fully cachable and thus an image depends only on
+ the text id and the laguage used and is generated once for each
combination.
+ -->
+ <map:match pattern="i18n/images/*.png">
+ <map:act type="lang-select">
+ <map:generate type="serverpages" src="docs/samples/i18n/navimages.xsp">
+ <parameter name="textid" value="{../1}"/>
+ <parameter name="lang" value="{lang}"/>
+ </map:generate>
+ </map:act>
+ <map:transform type="i18n" src="docs/samples/i18n/nav_trans.xml">
+ <parameter name="default_lang" value="en"/>
+ <parameter name="available_lang_1" value="en"/>
+ <parameter name="available_lang_2" value="de"/>
+ </map:transform>
+ <map:serialize type="svg2png"/>
+ </map:match>
+
<!-- =========================== Dynamic ================================
-->
<map:match pattern="xsp/*">
<map:generate type="serverpages" src="docs/samples/xsp/{1}.xsp"/>
@@ -448,4 +481,4 @@
</map:sitemap>
-<!-- end of file -->
\ No newline at end of file
+<!-- end of file -->
----------------------------------------------------------------------
In case of troubles, e-mail: [EMAIL PROTECTED]
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
