You are viewing a plain text version of this content. The canonical link for it is here.
Posted to cvs@cocoon.apache.org by gi...@apache.org on 2001/04/21 12:09:34 UTC
cvs commit: xml-cocoon/xdocs actions.xml httprequest.xml sitemap.xml
giacomo 01/04/21 03:09:34
Modified: . Tag: xml-cocoon2 todo.xml
webapp/docs/samples Tag: xml-cocoon2 samples.xml
xdocs Tag: xml-cocoon2 actions.xml httprequest.xml
sitemap.xml
Log:
Added patch submitted by Hans Ulrich Niedermann <nd...@n-dimensional.de>
Revision Changes Path
No revision
No revision
1.6.2.32 +2 -2 xml-cocoon/todo.xml
Index: todo.xml
===================================================================
RCS file: /home/cvs/xml-cocoon/todo.xml,v
retrieving revision 1.6.2.31
retrieving revision 1.6.2.32
diff -u -r1.6.2.31 -r1.6.2.32
--- todo.xml 2001/04/20 13:04:57 1.6.2.31
+++ todo.xml 2001/04/21 10:09:30 1.6.2.32
@@ -4,7 +4,7 @@
<!--
History of Cocoon changes
- $Id: todo.xml,v 1.6.2.31 2001/04/20 13:04:57 cziegeler Exp $
+ $Id: todo.xml,v 1.6.2.32 2001/04/21 10:09:30 giacomo Exp $
-->
@@ -97,7 +97,7 @@
</action>
<action context="code">
- Implement a internal profiling tool that should indicate the load and history of
+ Implement an internal profiling tool that should indicate the load and history of
such along with the status page. Something both useful and fancy to show the
power of C2.
</action>
No revision
No revision
1.1.2.21 +7 -7 xml-cocoon/webapp/docs/samples/Attic/samples.xml
Index: samples.xml
===================================================================
RCS file: /home/cvs/xml-cocoon/webapp/docs/samples/Attic/samples.xml,v
retrieving revision 1.1.2.20
retrieving revision 1.1.2.21
diff -u -r1.1.2.20 -r1.1.2.21
--- samples.xml 2001/04/19 14:06:55 1.1.2.20
+++ samples.xml 2001/04/21 10:09:31 1.1.2.21
@@ -1,10 +1,10 @@
-<?xml version="1.0"?>
+<?xml version="1.0" encoding="iso-8859-1"?>
<samples xmlns:xlink="http://www.w3.org/1999/xlink">
<group name="Multimedia Hello World">
<sample name="HTML" href="hello.html">
- This is a very simple demostration of how to use Cocoon. A simple XML page
+ This is a very simple demonstration of how to use Cocoon. A simple XML page
is transformed into an HTML page.
</sample>
<sample name="WML" href="hello.wml">
@@ -79,12 +79,12 @@
<sample name="Simple SQL" href="sql/sql-page" xlink:role="dynamic">
Simple SQL example. You should make sure that you have a database and
table according to the conf/sitemap.xmap and the
- docs/samples/sql/sql-page.sql definitions.
+ docs/samples/sql/sql-page.xml.sql definitions.
</sample>
<sample name="ESQL" href="xsp/esql" xlink:role="dynamic">
Simple ESQL example. You should make sure that you have a database
and table according to the docs/samples/xsp/esql.xsp and the
- docs/samples/sql/sql-page.sql definitions.
+ docs/samples/sql/sql-page.xml.sql definitions.
</sample>
<sample name="Session XSP" href="session" xlink:role="dynamic">
Sample Session XSP to illustrate session handling.
@@ -116,17 +116,17 @@
<group name="Sample Forms">
<sample name="Manage Employees" href="forms/employee" xlink:role="dynamic">
Adds, updates and deletes Employees to the employees table. You should make sure
- that you have a database and table according to the docs/samples/sql/sql-page.sql
+ that you have a database and table according to the docs/samples/sql/sql-page.xml.sql
definitions. Don't forget to change the driver information...
</sample>
<sample name="Insert Department" href="forms/add-department" xlink:role="dynamic">
Adds new Departments to the department table. You should make sure
- that you have a database and table according to the docs/samples/sql/sql-page.sql
+ that you have a database and table according to the docs/samples/sql/sql-page.xml.sql
definitions. Don't forget to change the driver information...
</sample>
<sample name="Insert Employees" href="forms/add-employee" xlink:role="dynamic">
Adds new Employees to the employees table. You should make sure
- that you have a database and table according to the docs/samples/sql/sql-page.sql
+ that you have a database and table according to the docs/samples/sql/sql-page.xml.sql
definitions. Don't forget to change the driver information...
</sample>
</group>
No revision
No revision
1.1.2.4 +2 -1 xml-cocoon/xdocs/Attic/actions.xml
Index: actions.xml
===================================================================
RCS file: /home/cvs/xml-cocoon/xdocs/Attic/actions.xml,v
retrieving revision 1.1.2.3
retrieving revision 1.1.2.4
diff -u -r1.1.2.3 -r1.1.2.4
--- actions.xml 2001/04/17 18:19:00 1.1.2.3
+++ actions.xml 2001/04/21 10:09:32 1.1.2.4
@@ -51,7 +51,8 @@
<esql:connection>
<esql:dbpool>mypool</esql:dbpool>
<esql:execute-query>
- <esql:query>SELECT userid FROM users WHERE name=<esql:parameter>name</esql:parameter> AND password=<esql:parameter>password</esql:parameter></esql:query>
+ <esql:query>SELECT userid FROM users WHERE name=<esql:parameter>name</esql:parameter>
+ AND password=<esql:parameter>password</esql:parameter></esql:query>
<esql:row-results>
<xsp:logic>
userid = <esql:get-int column="userid"/>
1.1.2.6 +18 -12 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.5
retrieving revision 1.1.2.6
diff -u -r1.1.2.5 -r1.1.2.6
--- httprequest.xml 2001/03/05 07:28:08 1.1.2.5
+++ httprequest.xml 2001/04/21 10:09:33 1.1.2.6
@@ -49,28 +49,33 @@
<map:components>
<map:generators default="file">
- <map:generator name="file" src="org.apache.cocoon.generation.FileGenerator" label="content"/>
+ <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">
+ <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: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">
+ <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:matcher name="uri"
+ factory="org.apache.cocoon.matching.WildcardURIMatcherFactory"/>
</map:matchers>
</map:components>
@@ -109,7 +114,7 @@
<component role="org.apache.cocoon.components.language.programming.ProgrammingLanguageSelector"
class="org.apache.cocoon.CocoonComponentSelector">
<component-instance name="java"
- class="org.apache.cocoon.components.language.programming.java.JavaLanguage">
+ class="org.apache.cocoon.components.language.programming.java.JavaLanguage">
<parameter name="compiler"
value="org.apache.cocoon.components.language.programming.java.Javac"/>
<parameter name="code-formatter"
@@ -124,38 +129,39 @@
<component role="org.apache.cocoon.components.language.markup.MarkupLanguageSelector"
class="org.apache.cocoon.CocoonComponentSelector">
- <component-instance name="xsp" class="org.apache.cocoon.components.language.markup.xsp.XSPMarkupLanguage">
+ <component-instance name="xsp"
+ class="org.apache.cocoon.components.language.markup.xsp.XSPMarkupLanguage">
<parameter name="prefix" value="xsp"/>
<parameter name="uri" value="http://apache.org/xsp"/>
<target-language name="java">
<parameter name="core-logicsheet"
- value="resource://org/apache/cocoon/components/language/markup/xsp/java/xsp.xsl"/>
+ value="resource://org/apache/cocoon/components/language/markup/xsp/java/xsp.xsl"/>
<builtin-logicsheet>
<parameter name="prefix" value="xsp-request"/>
<parameter name="uri" value="http://apache.org/xsp/request"/>
<parameter name="href"
- value="resource://org/apache/cocoon/components/language/markup/xsp/java/request.xsl"/>
+ value="resource://org/apache/cocoon/components/language/markup/xsp/java/request.xsl"/>
</builtin-logicsheet>
<builtin-logicsheet>
<parameter name="prefix" value="xsp-response"/>
<parameter name="uri" value="http://apache.org/xsp/response"/>
<parameter name="href"
- value="resource://org/apache/cocoon/components/language/markup/xsp/java/response.xsl"/>
+ value="resource://org/apache/cocoon/components/language/markup/xsp/java/response.xsl"/>
</builtin-logicsheet>
</target-language>
</component-instance>
<component-instance name="sitemap"
- class="org.apache.cocoon.components.language.markup.sitemap.SitemapMarkupLanguage">
+ class="org.apache.cocoon.components.language.markup.sitemap.SitemapMarkupLanguage">
<parameter name="prefix" value="map"/>
<parameter name="uri" value="http://apache.org/cocoon/sitemap/1.0"/>
<target-language name="java">
<parameter name="core-logicsheet"
- value="resource://org/apache/cocoon/components/language/markup/sitemap/java/sitemap.xsl"/>
+ value="resource://org/apache/cocoon/components/language/markup/sitemap/java/sitemap.xsl"/>
</target-language>
</component-instance>
</component>
1.1.2.10 +28 -14 xml-cocoon/xdocs/Attic/sitemap.xml
Index: sitemap.xml
===================================================================
RCS file: /home/cvs/xml-cocoon/xdocs/Attic/sitemap.xml,v
retrieving revision 1.1.2.9
retrieving revision 1.1.2.10
diff -u -r1.1.2.9 -r1.1.2.10
--- sitemap.xml 2001/04/17 15:00:26 1.1.2.9
+++ sitemap.xml 2001/04/21 10:09:33 1.1.2.10
@@ -170,8 +170,10 @@
<source>
<![CDATA[
<map:components>
- <map:transformer type="xslt" src="class:///org.apache.cocoon.transformation.XSLTTransformer">
- <compile-stylesheets value="true"/> <!-- This is a parameter to the transformer component -->
+ <map:transformer type="xslt"
+ src="class:///org.apache.cocoon.transformation.XSLTTransformer">
+ <!-- This is a parameter to the transformer component -->
+ <compile-stylesheets value="true"/>
</map:transformer>
</map:components>
]]>
@@ -223,10 +225,12 @@
<source>
<![CDATA[
<map:transformers default="xslt">
- <map:transformer type="xslt" src="class:///org.apache.cocoon.transformation.XSLTTransformer">
+ <map:transformer type="xslt"
+ src="class:///org.apache.cocoon.transformation.XSLTTransformer">
<compile-stylesheets value="true"/>
</map:transformer>
- <map:transformer type="xinclude" src="class:///org.apache.cocoon.transformation.XIncludeTransformer"/>
+ <map:transformer type="xinclude"
+ src="class:///org.apache.cocoon.transformation.XIncludeTransformer"/>
</map:transformers>
]]>
</source>
@@ -288,15 +292,18 @@
<source>
<![CDATA[
<map:selectors default="browser">
- <map:selector type="load" src="class:///org.apache.cocoon.selection.MachineLoadSelector">
+ <map:selector type="load"
+ src="class:///org.apache.cocoon.selection.MachineLoadSelector">
...
</map:selector>
- <map:selector type="user" src="class:///org.apache.cocoon.selection.AuthenticationSelector">
+ <map:selector type="user"
+ src="class:///org.apache.cocoon.selection.AuthenticationSelector">
...
</map:selector>
- <map:selector type="browser" factory="class:///org.apache.cocoon.selection.BrowserSelectorFactory">
+ <map:selector type="browser"
+ factory="class:///org.apache.cocoon.selection.BrowserSelectorFactory">
...
</map:selection>
</map:selection>
@@ -324,11 +331,13 @@
<source>
<![CDATA[
<map:matchers default="uri-wildcard">
- <map:matcher type="uri-wildcard" factory="class:///org.apache.cocoon.matcher.WildcardURIMatcherFactory">
+ <map:matcher type="uri-wildcard"
+ factory="class:///org.apache.cocoon.matcher.WildcardURIMatcherFactory">
...
</map:matcher>
- <map:matcher type="uri-regexp" src="class:///org.apache.cocoon.matcher.RegexpURIMatcher">
+ <map:matcher type="uri-regexp"
+ src="class:///org.apache.cocoon.matcher.RegexpURIMatcher">
...
</map:matcher>
</map:matchers>
@@ -415,8 +424,10 @@
<source>
<![CDATA[
<map:components>
- <map:transformer type="xslt" src="class:///org.apache.cocoon.transformation.XSLTTransformer">
- <compile-stylesheets value="true"/> <!-- This is a parameter to the transformer component -->
+ <map:transformer type="xslt"
+ src="class:///org.apache.cocoon.transformation.XSLTTransformer">
+ <!-- This is a parameter to the transformer component -->
+ <compile-stylesheets value="true"/>
</map:transformer>
</map:components>
]]>
@@ -539,7 +550,8 @@
================================ -->
<map:components>
<map:matchers default="wildcard">
- <map:matcher name="wildcard" factory="org.apache.cocoon.matching.WildcardURIMatcherFactory"/>
+ <map:matcher name="wildcard"
+ factory="org.apache.cocoon.matching.WildcardURIMatcherFactory"/>
</map:matchers>
<map:selectors default="host">
@@ -574,7 +586,8 @@
<source>
<![CDATA[
<map:match pattern="faq/*">
- <map:mount uri-prefix="faq/" check-reload="no" src="faq/sitemap.xmap" reload-method="asynchron"/>
+ <map:mount uri-prefix="faq/" check-reload="no"
+ src="faq/sitemap.xmap" reload-method="asynchron"/>
</map:match>
]]>
</source>
@@ -681,7 +694,8 @@
<source>
<![CDATA[
- public interface Transformer extends XMLProducer, XMLConsumer, SitemapModelComponent {
+ public interface Transformer
+ extends XMLProducer, XMLConsumer, SitemapModelComponent {
}
]]>
</source>
----------------------------------------------------------------------
In case of troubles, e-mail: webmaster@xml.apache.org
To unsubscribe, e-mail: cocoon-cvs-unsubscribe@xml.apache.org
For additional commands, e-mail: cocoon-cvs-help@xml.apache.org