You are viewing a plain text version of this content. The canonical link for it is here.
Posted to cvs@cocoon.apache.org by st...@apache.org on 2004/04/02 13:08:55 UTC
cvs commit: cocoon-2.1/src/blocks/javaflow/samples/screens calculator-a.xml calculator-b.xml calculator-message.xml calculator-operator.xml calculator-result.xml employee-result.xml form1-result.xml form2-result.xml
stephan 2004/04/02 03:08:55
Modified: src/blocks/javaflow/conf javaflow.xsamples
src/blocks/javaflow/samples sitemap.xmap
src/blocks/javaflow/samples/forms employee-template.xml
form1-template.xml form2-template.xml
src/blocks/javaflow/samples/screens calculator-a.xml
calculator-b.xml calculator-message.xml
calculator-operator.xml calculator-result.xml
employee-result.xml form1-result.xml
form2-result.xml
Added: src/blocks/javaflow/samples samples.xml
Log:
Rewrote samples navigation. Make own samples page.
Revision Changes Path
1.3 +2 -11 cocoon-2.1/src/blocks/javaflow/conf/javaflow.xsamples
Index: javaflow.xsamples
===================================================================
RCS file: /home/cvs/cocoon-2.1/src/blocks/javaflow/conf/javaflow.xsamples,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- javaflow.xsamples 1 Apr 2004 19:01:03 -0000 1.2
+++ javaflow.xsamples 2 Apr 2004 11:08:54 -0000 1.3
@@ -3,17 +3,8 @@
<xsamples xpath="/samples" unless="group[@name='Java Flow']">
<group name="Java Flow">
- <sample name="Java Flow Block: Calculator" href="javaflow/calculator.do">
- Example for the Java Flow implementation
- </sample>
- <sample name="Java Flow Block: Cocoon Forms" href="javaflow/editForm1.do">
- Example for the Cocoon Forms and Java Flow.
- </sample>
- <sample name="Java Flow Block: Cocoon Forms Binding" href="javaflow/editForm2.do">
- Example for the Cocoon Forms Binding and Java Flow.
- </sample>
- <sample name="Java Flow Block: Apache OJB" href="javaflow/showEmployee.do">
- Example for the Cocoon Forms and Java Flow and Apache OJB.
+ <sample name="Java Flow Block" href="javaflow/">
+ Cocoon Java Flow examples.
</sample>
</group>
1.2 +27 -4 cocoon-2.1/src/blocks/javaflow/samples/sitemap.xmap
Index: sitemap.xmap
===================================================================
RCS file: /home/cvs/cocoon-2.1/src/blocks/javaflow/samples/sitemap.xmap,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- sitemap.xmap 29 Mar 2004 17:47:22 -0000 1.1
+++ sitemap.xmap 2 Apr 2004 11:08:54 -0000 1.2
@@ -1,4 +1,19 @@
<?xml version="1.0"?>
+<!--
+ Copyright 1999-2004 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.
+ You may obtain a copy of the License at
+
+ http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing, software
+ distributed under the License is distributed on an "AS IS" BASIS,
+ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ See the License for the specific language governing permissions and
+ limitations under the License.
+-->
<map:sitemap xmlns:map="http://apache.org/cocoon/sitemap/1.0">
@@ -6,8 +21,8 @@
<map:transformers default="xalan">
<map:transformer name="i18n" src="org.apache.cocoon.transformation.I18nTransformer">
<catalogues default="other">
- <catalogue id="other" name="OtherMessages" location="context://samples/forms/messages"/>
- <catalogue id="forms" name="FormsMessages" location="context://samples/forms/messages"/>
+ <catalogue id="other" name="OtherMessages" location="context://samples/blocks/forms/messages"/>
+ <catalogue id="forms" name="FormsMessages" location="context://samples/blocks/forms/messages"/>
</catalogues>
<cache-at-startup>true</cache-at-startup>
</map:transformer>
@@ -43,13 +58,21 @@
<map:transform src="context://samples/common/style/xsl/html/complex-page2html.xsl">
<map:parameter name="contextPath" value="{request:contextPath}"/>
</map:transform>
- <map:transform src="context://samples/forms/resources/forms-samples-styling.xsl"/>
+ <map:transform src="context://samples/blocks/forms/resources/forms-samples-styling.xsl"/>
<map:serialize/>
</map:match>
</map:pipeline>
<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>
+
<!--+
| matches the page with the continuation ID and calls the flowscript
| associated to this sitemap with the given continuation ID. The flow
@@ -73,7 +96,7 @@
</map:match>
<map:match pattern="resources/**">
- <map:redirect-to uri="/samples/forms/resources/{1}"/>
+ <map:redirect-to uri="/samples/blocks/forms/resources/{1}"/>
</map:match>
</map:pipeline>
1.1 cocoon-2.1/src/blocks/javaflow/samples/samples.xml
Index: samples.xml
===================================================================
<?xml version="1.0"?>
<!--
Copyright 1999-2004 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.
You may obtain a copy of the License at
http://www.apache.org/licenses/LICENSE-2.0
Unless required by applicable law or agreed to in writing, software
distributed under the License is distributed on an "AS IS" BASIS,
WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
See the License for the specific language governing permissions and
limitations under the License.
-->
<!-- $Id: samples.xml,v 1.1 2004/04/02 11:08:54 stephan Exp $-->
<samples>
<group name="Main examples page.">
<sample name="Back" href="..">to Cocoon examples main page</sample>
</group>
<group name="Java Flow">
<sample name="Calculator" href="calculator.do">
Example for the Java Flow implementation
</sample>
<sample name="Cocoon Forms" href="editForm1.do">
Example for the Cocoon Forms and Java Flow.
</sample>
<sample name="Cocoon Forms Binding" href="editForm2.do">
Example for the Cocoon Forms Binding and Java Flow.
</sample>
<sample name="Apache OJB" href="showEmployee.do">
Example for the Cocoon Forms and Java Flow and Apache OJB.
</sample>
</group>
</samples>
1.3 +2 -2 cocoon-2.1/src/blocks/javaflow/samples/forms/employee-template.xml
Index: employee-template.xml
===================================================================
RCS file: /home/cvs/cocoon-2.1/src/blocks/javaflow/samples/forms/employee-template.xml,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- employee-template.xml 30 Mar 2004 11:10:53 -0000 1.2
+++ employee-template.xml 2 Apr 2004 11:08:54 -0000 1.3
@@ -25,7 +25,7 @@
xmlns:fi="http://apache.org/cocoon/forms/1.0#instance">
<header>
<title>JFlow example</title>
- <tab title="back" href=".."/>
+ <tab title="back" href="."/>
</header>
<body>
<row>
1.2 +1 -1 cocoon-2.1/src/blocks/javaflow/samples/forms/form1-template.xml
Index: form1-template.xml
===================================================================
RCS file: /home/cvs/cocoon-2.1/src/blocks/javaflow/samples/forms/form1-template.xml,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- form1-template.xml 29 Mar 2004 17:47:22 -0000 1.1
+++ form1-template.xml 2 Apr 2004 11:08:54 -0000 1.2
@@ -20,7 +20,7 @@
xmlns:fi="http://apache.org/cocoon/forms/1.0#instance">
<header>
<title>JFlow example</title>
- <tab title="back" href=".."/>
+ <tab title="back" href="."/>
</header>
<body>
<row>
1.2 +1 -1 cocoon-2.1/src/blocks/javaflow/samples/forms/form2-template.xml
Index: form2-template.xml
===================================================================
RCS file: /home/cvs/cocoon-2.1/src/blocks/javaflow/samples/forms/form2-template.xml,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- form2-template.xml 29 Mar 2004 17:47:22 -0000 1.1
+++ form2-template.xml 2 Apr 2004 11:08:54 -0000 1.2
@@ -18,7 +18,7 @@
xmlns:fi="http://apache.org/cocoon/forms/1.0#instance">
<header>
<title>JFlow example</title>
- <tab title="back" href=".."/>
+ <tab title="back" href="."/>
</header>
<body>
<row>
1.2 +1 -1 cocoon-2.1/src/blocks/javaflow/samples/screens/calculator-a.xml
Index: calculator-a.xml
===================================================================
RCS file: /home/cvs/cocoon-2.1/src/blocks/javaflow/samples/screens/calculator-a.xml,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- calculator-a.xml 29 Mar 2004 17:47:23 -0000 1.1
+++ calculator-a.xml 2 Apr 2004 11:08:55 -0000 1.2
@@ -17,7 +17,7 @@
<document xmlns:jx="http://apache.org/cocoon/templates/jx/1.0">
<header>
<title>Calculator example</title>
- <tab title="back" href=".."/>
+ <tab title="back" href="."/>
</header>
<body>
<row>
1.2 +1 -1 cocoon-2.1/src/blocks/javaflow/samples/screens/calculator-b.xml
Index: calculator-b.xml
===================================================================
RCS file: /home/cvs/cocoon-2.1/src/blocks/javaflow/samples/screens/calculator-b.xml,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- calculator-b.xml 29 Mar 2004 17:47:23 -0000 1.1
+++ calculator-b.xml 2 Apr 2004 11:08:55 -0000 1.2
@@ -17,7 +17,7 @@
<document>
<header>
<title>Calculator example</title>
- <tab title="back" href=".."/>
+ <tab title="back" href="."/>
</header>
<body>
<row>
1.2 +1 -1 cocoon-2.1/src/blocks/javaflow/samples/screens/calculator-message.xml
Index: calculator-message.xml
===================================================================
RCS file: /home/cvs/cocoon-2.1/src/blocks/javaflow/samples/screens/calculator-message.xml,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- calculator-message.xml 29 Mar 2004 17:47:23 -0000 1.1
+++ calculator-message.xml 2 Apr 2004 11:08:55 -0000 1.2
@@ -17,7 +17,7 @@
<document>
<header>
<title>Calculator example</title>
- <tab title="back" href=".."/>
+ <tab title="back" href="."/>
</header>
<body>
<row>
1.2 +1 -1 cocoon-2.1/src/blocks/javaflow/samples/screens/calculator-operator.xml
Index: calculator-operator.xml
===================================================================
RCS file: /home/cvs/cocoon-2.1/src/blocks/javaflow/samples/screens/calculator-operator.xml,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- calculator-operator.xml 29 Mar 2004 17:47:23 -0000 1.1
+++ calculator-operator.xml 2 Apr 2004 11:08:55 -0000 1.2
@@ -17,7 +17,7 @@
<document>
<header>
<title>Calculator example</title>
- <tab title="back" href=".."/>
+ <tab title="back" href="."/>
</header>
<body>
<row>
1.2 +1 -1 cocoon-2.1/src/blocks/javaflow/samples/screens/calculator-result.xml
Index: calculator-result.xml
===================================================================
RCS file: /home/cvs/cocoon-2.1/src/blocks/javaflow/samples/screens/calculator-result.xml,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- calculator-result.xml 29 Mar 2004 17:47:23 -0000 1.1
+++ calculator-result.xml 2 Apr 2004 11:08:55 -0000 1.2
@@ -17,7 +17,7 @@
<document>
<header>
<title>Calculator example</title>
- <tab title="back" href=".."/>
+ <tab title="back" href="."/>
</header>
<body>
<row>
1.2 +1 -1 cocoon-2.1/src/blocks/javaflow/samples/screens/employee-result.xml
Index: employee-result.xml
===================================================================
RCS file: /home/cvs/cocoon-2.1/src/blocks/javaflow/samples/screens/employee-result.xml,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- employee-result.xml 29 Mar 2004 17:47:23 -0000 1.1
+++ employee-result.xml 2 Apr 2004 11:08:55 -0000 1.2
@@ -17,7 +17,7 @@
<document xmlns:jx="http://apache.org/cocoon/templates/jx/1.0">
<header>
<title>Apache OJB example</title>
- <tab title="back" href=".."/>
+ <tab title="back" href="."/>
</header>
<body>
<row>
1.2 +1 -1 cocoon-2.1/src/blocks/javaflow/samples/screens/form1-result.xml
Index: form1-result.xml
===================================================================
RCS file: /home/cvs/cocoon-2.1/src/blocks/javaflow/samples/screens/form1-result.xml,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- form1-result.xml 29 Mar 2004 17:47:23 -0000 1.1
+++ form1-result.xml 2 Apr 2004 11:08:55 -0000 1.2
@@ -17,7 +17,7 @@
<document>
<header>
<title>Forms example</title>
- <tab title="back" href=".."/>
+ <tab title="back" href="."/>
</header>
<body>
<row>
1.2 +1 -1 cocoon-2.1/src/blocks/javaflow/samples/screens/form2-result.xml
Index: form2-result.xml
===================================================================
RCS file: /home/cvs/cocoon-2.1/src/blocks/javaflow/samples/screens/form2-result.xml,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- form2-result.xml 29 Mar 2004 17:47:23 -0000 1.1
+++ form2-result.xml 2 Apr 2004 11:08:55 -0000 1.2
@@ -17,7 +17,7 @@
<document xmlns:jx="http://apache.org/cocoon/templates/jx/1.0">
<header>
<title>Forms example</title>
- <tab title="back" href=".."/>
+ <tab title="back" href="."/>
</header>
<body>
<row>