You are viewing a plain text version of this content. The canonical link for it is here.
Posted to cvs@cocoon.apache.org by re...@apache.org on 2005/10/02 14:40:55 UTC
svn commit: r293103 - in /cocoon/branches/BRANCH_2_1_X/src:
blocks/apples/java/org/apache/cocoon/components/flow/apples/
blocks/apples/samples/ blocks/apples/samples/calc/
webapp/samples/flow/jxcalc/screens/
Author: reinhard
Date: Sun Oct 2 05:40:28 2005
New Revision: 293103
URL: http://svn.apache.org/viewcvs?rev=293103&view=rev
Log:
remove dependency of Apples samples on XSP; unfortunalty this makes a switch to the old expression style in the 'jxcalc'-samples templates necessary - maybe one of the jxt gurus has an idea what needs to be changed
Removed:
cocoon/branches/BRANCH_2_1_X/src/blocks/apples/samples/calc/
Modified:
cocoon/branches/BRANCH_2_1_X/src/blocks/apples/java/org/apache/cocoon/components/flow/apples/ApplesProcessor.java
cocoon/branches/BRANCH_2_1_X/src/blocks/apples/samples/sitemap.xmap
cocoon/branches/BRANCH_2_1_X/src/webapp/samples/flow/jxcalc/screens/displayResult.xml
cocoon/branches/BRANCH_2_1_X/src/webapp/samples/flow/jxcalc/screens/getNumberA.xml
cocoon/branches/BRANCH_2_1_X/src/webapp/samples/flow/jxcalc/screens/getNumberB.xml
cocoon/branches/BRANCH_2_1_X/src/webapp/samples/flow/jxcalc/screens/getOperator.xml
Modified: cocoon/branches/BRANCH_2_1_X/src/blocks/apples/java/org/apache/cocoon/components/flow/apples/ApplesProcessor.java
URL: http://svn.apache.org/viewcvs/cocoon/branches/BRANCH_2_1_X/src/blocks/apples/java/org/apache/cocoon/components/flow/apples/ApplesProcessor.java?rev=293103&r1=293102&r2=293103&view=diff
==============================================================================
--- cocoon/branches/BRANCH_2_1_X/src/blocks/apples/java/org/apache/cocoon/components/flow/apples/ApplesProcessor.java (original)
+++ cocoon/branches/BRANCH_2_1_X/src/blocks/apples/java/org/apache/cocoon/components/flow/apples/ApplesProcessor.java Sun Oct 2 05:40:28 2005
@@ -61,7 +61,7 @@
DefaultContext appleContext = new DefaultContext(avalonContext);
if (wk != null) {
- appleContext.put("continuation-id", wk.getId());
+ appleContext.put("continuation-id", wk.getId());
}
LifecycleHelper.setupComponent( app, getLogger(), appleContext,
Modified: cocoon/branches/BRANCH_2_1_X/src/blocks/apples/samples/sitemap.xmap
URL: http://svn.apache.org/viewcvs/cocoon/branches/BRANCH_2_1_X/src/blocks/apples/samples/sitemap.xmap?rev=293103&r1=293102&r2=293103&view=diff
==============================================================================
--- cocoon/branches/BRANCH_2_1_X/src/blocks/apples/samples/sitemap.xmap (original)
+++ cocoon/branches/BRANCH_2_1_X/src/blocks/apples/samples/sitemap.xmap Sun Oct 2 05:40:28 2005
@@ -85,6 +85,9 @@
<map:call continuation="{1}"/>
</map:match>
+ <map:match pattern="continue.*">
+ <map:call continuation="{1}"/>
+ </map:match>
<!--+
| Binding form sample, reuses pipelines stolen from Cocoon Forms
@@ -110,12 +113,12 @@
</map:match>
<map:match pattern="calc/*">
- <map:generate type="serverpages" src="calc/{1}.xsp"/>
+ <map:generate type="jx" src="context://samples/flow/jxcalc/screens/{1}.xml"/>
<map:transform src="context://samples/common/style/xsl/html/simple-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="/samples/apples/calc/{1}.xsp"/>
+ <map:parameter name="file" value="samples/flow/jxcalc/screens/{1}.xml"/>
<map:parameter name="remove" value="{0}"/>
</map:transform>
<map:serialize/>
Modified: cocoon/branches/BRANCH_2_1_X/src/webapp/samples/flow/jxcalc/screens/displayResult.xml
URL: http://svn.apache.org/viewcvs/cocoon/branches/BRANCH_2_1_X/src/webapp/samples/flow/jxcalc/screens/displayResult.xml?rev=293103&r1=293102&r2=293103&view=diff
==============================================================================
--- cocoon/branches/BRANCH_2_1_X/src/webapp/samples/flow/jxcalc/screens/displayResult.xml (original)
+++ cocoon/branches/BRANCH_2_1_X/src/webapp/samples/flow/jxcalc/screens/displayResult.xml Sun Oct 2 05:40:28 2005
@@ -16,7 +16,7 @@
-->
<!--+
- | CVS: $Id: displayResult.xml,v 1.3 2004/03/06 02:26:06 antonio Exp $
+ | CVS: $Id$
| Author: Ovidiu Predescu "ovidiu@cup.hp.com"
| Date: March 23, 2002
+-->
Modified: cocoon/branches/BRANCH_2_1_X/src/webapp/samples/flow/jxcalc/screens/getNumberA.xml
URL: http://svn.apache.org/viewcvs/cocoon/branches/BRANCH_2_1_X/src/webapp/samples/flow/jxcalc/screens/getNumberA.xml?rev=293103&r1=293102&r2=293103&view=diff
==============================================================================
--- cocoon/branches/BRANCH_2_1_X/src/webapp/samples/flow/jxcalc/screens/getNumberA.xml (original)
+++ cocoon/branches/BRANCH_2_1_X/src/webapp/samples/flow/jxcalc/screens/getNumberA.xml Sun Oct 2 05:40:28 2005
@@ -37,7 +37,7 @@
This is the continuation id: #{$cocoon/continuation/id}
A backslash dir reference: d:\cocoon\
</jx:comment>
- <form method="post" action="continue.#{$cocoon/continuation/id}">
+ <form method="post" action="continue.#{$continuation/id}">
<para>Enter value of <strong>a</strong>: <input type="text" name="a"/></para>
<input type="submit" name="submit" value="Enter"/>
</form>
Modified: cocoon/branches/BRANCH_2_1_X/src/webapp/samples/flow/jxcalc/screens/getNumberB.xml
URL: http://svn.apache.org/viewcvs/cocoon/branches/BRANCH_2_1_X/src/webapp/samples/flow/jxcalc/screens/getNumberB.xml?rev=293103&r1=293102&r2=293103&view=diff
==============================================================================
--- cocoon/branches/BRANCH_2_1_X/src/webapp/samples/flow/jxcalc/screens/getNumberB.xml (original)
+++ cocoon/branches/BRANCH_2_1_X/src/webapp/samples/flow/jxcalc/screens/getNumberB.xml Sun Oct 2 05:40:28 2005
@@ -16,7 +16,7 @@
-->
<!--+
- | CVS: $Id: getNumberB.xml,v 1.4 2004/03/06 02:26:06 antonio Exp $
+ | CVS: $Id$
| Author: Ovidiu Predescu "ovidiu@cup.hp.com"
| Date: March 23, 2002
+-->
@@ -27,7 +27,7 @@
</resources>
<title>Calculator</title>
<content>
- <form method="post" action="continue.#{$cocoon/continuation/id}">
+ <form method="post" action="continue.#{$continuation/id}">
<para>a = <strong>#{a}</strong></para>
<para>Enter value of <strong>b</strong>: <input type="text" name="b"/></para>
<input type="submit" name="submit" value="Enter"/>
Modified: cocoon/branches/BRANCH_2_1_X/src/webapp/samples/flow/jxcalc/screens/getOperator.xml
URL: http://svn.apache.org/viewcvs/cocoon/branches/BRANCH_2_1_X/src/webapp/samples/flow/jxcalc/screens/getOperator.xml?rev=293103&r1=293102&r2=293103&view=diff
==============================================================================
--- cocoon/branches/BRANCH_2_1_X/src/webapp/samples/flow/jxcalc/screens/getOperator.xml (original)
+++ cocoon/branches/BRANCH_2_1_X/src/webapp/samples/flow/jxcalc/screens/getOperator.xml Sun Oct 2 05:40:28 2005
@@ -16,7 +16,7 @@
-->
<!--+
- | CVS: $Id: getOperator.xml,v 1.4 2004/03/06 02:26:06 antonio Exp $
+ | CVS: $Id$
| Author: Ovidiu Predescu "ovidiu@cup.hp.com"
| Date: March 23, 2002
+-->
@@ -27,7 +27,7 @@
</resources>
<title>Calculator</title>
<content>
- <form method="post" action="continue.#{$cocoon/continuation/id}">
+ <form method="post" action="continue.#{$continuation/id}">
<para>a = <strong>#{a}</strong></para>
<para>b = <strong>#{b}</strong></para>
<para>Enter operator
Re: svn commit: r293103 - in /cocoon/branches/BRANCH_2_1_X/src: blocks/apples/java/org/apache/cocoon/components/flow/apples/
blocks/apples/samples/ blocks/apples/samples/calc/ webapp/samples/flow/jxcalc/screens/
Posted by Reinhard Poetz <re...@apache.org>.
Leszek Gawron wrote:
> reinhard@apache.org wrote:
>
>> Author: reinhard
>> Date: Sun Oct 2 05:40:28 2005
>> New Revision: 293103
>>
>> URL: http://svn.apache.org/viewcvs?rev=293103&view=rev
>> Log:
>> remove dependency of Apples samples on XSP; unfortunalty this makes a
>> switch to the old expression style in the 'jxcalc'-samples templates
>> necessary - maybe one of the jxt gurus has an idea what needs to be
>> changed
>
> The problem lies in inconsistency of jxtg object model when invoked from
> flow and without it. This has been fixed in trunk but the problem
> remains in 2.1.x until we do the sync.
Ahh, I remember. Thank you!
--
Reinhard Pötz Independent Consultant, Trainer & (IT)-Coach
{Software Engineering, Open Source, Web Applications, Apache Cocoon}
web(log): http://www.poetz.cc
--------------------------------------------------------------------
___________________________________________________________
Gesendet von Yahoo! Mail - Jetzt mit 1GB Speicher kostenlos - Hier anmelden: http://mail.yahoo.de
Re: svn commit: r293103 - in /cocoon/branches/BRANCH_2_1_X/src: blocks/apples/java/org/apache/cocoon/components/flow/apples/
blocks/apples/samples/ blocks/apples/samples/calc/ webapp/samples/flow/jxcalc/screens/
Posted by Leszek Gawron <lg...@mobilebox.pl>.
reinhard@apache.org wrote:
> Author: reinhard
> Date: Sun Oct 2 05:40:28 2005
> New Revision: 293103
>
> URL: http://svn.apache.org/viewcvs?rev=293103&view=rev
> Log:
> remove dependency of Apples samples on XSP; unfortunalty this makes a switch to the old expression style in the 'jxcalc'-samples templates necessary - maybe one of the jxt gurus has an idea what needs to be changed
The problem lies in inconsistency of jxtg object model when invoked from
flow and without it. This has been fixed in trunk but the problem
remains in 2.1.x until we do the sync.
--
Leszek Gawron lgawron@mobilebox.pl
IT Manager MobileBox sp. z o.o.
+48 (61) 855 06 67 http://www.mobilebox.pl
mobile: +48 (501) 720 812 fax: +48 (61) 853 29 65