svn commit: r168623 - /cocoon/blocks/unsupported/template/trunk/java/org/apache/cocoon/template/jxtg/instruction/StartForEach.java
Author: lgawron
Date: Fri May 6 08:39:17 2005
New Revision: 168623
URL: http://svn.apache.org/viewcvs?rev=168623view=rev
Log:
a quick fix to make jx:forEach begin=sth end=sth work again. I will have to
see why this is needed at all though.
Modified:
cocoon/blocks/unsupported/template/trunk/java/org/apache/cocoon/template/jxtg/instruction/StartForEach.java
Modified:
cocoon/blocks/unsupported/template/trunk/java/org/apache/cocoon/template/jxtg/instruction/StartForEach.java
URL:
http://svn.apache.org/viewcvs/cocoon/blocks/unsupported/template/trunk/java/org/apache/cocoon/template/jxtg/instruction/StartForEach.java?rev=168623r1=168622r2=168623view=diff
==
---
cocoon/blocks/unsupported/template/trunk/java/org/apache/cocoon/template/jxtg/instruction/StartForEach.java
(original)
+++
cocoon/blocks/unsupported/template/trunk/java/org/apache/cocoon/template/jxtg/instruction/StartForEach.java
Fri May 6 08:39:17 2005
@@ -93,6 +93,11 @@
step = this.step == null
? 1
: this.step.getIntValue(expressionContext);
+
+// FIXME: why is this needed?
+if ( step == 0 )
+step = 1;
+
var = this.var.getStringValue(expressionContext);
varStatus = this.varStatus.getStringValue(expressionContext);
} catch (Exception exc) {
svn commit: r164958 - /cocoon/trunk/status.xml
Author: lgawron Date: Wed Apr 27 00:41:27 2005 New Revision: 164958 URL: http://svn.apache.org/viewcvs?rev=164958view=rev Log: add info about new JXTG to status.xml Modified: cocoon/trunk/status.xml Modified: cocoon/trunk/status.xml URL: http://svn.apache.org/viewcvs/cocoon/trunk/status.xml?rev=164958r1=164957r2=164958view=diff == --- cocoon/trunk/status.xml (original) +++ cocoon/trunk/status.xml Wed Apr 27 00:41:27 2005 @@ -195,6 +195,10 @@ changes release version=@version@ date=@date@ + action dev=LG type=update + Removed o.a.c.generation.JXTemplateGenerator from core. + Introduced o.a.c.template.jxtg.JXTemplateGenerator as the official templating language. + /action action dev=VG type=remove Removed EventRecorder (in o.a.c.t.helpers package). /action
svn commit: r164795 - /cocoon/trunk/src/java/org/apache/cocoon/util/log/CocoonLogFormatter.java
Author: lgawron
Date: Tue Apr 26 07:23:49 2005
New Revision: 164795
URL: http://svn.apache.org/viewcvs?rev=164795view=rev
Log:
queryString may be null
Modified:
cocoon/trunk/src/java/org/apache/cocoon/util/log/CocoonLogFormatter.java
Modified:
cocoon/trunk/src/java/org/apache/cocoon/util/log/CocoonLogFormatter.java
URL:
http://svn.apache.org/viewcvs/cocoon/trunk/src/java/org/apache/cocoon/util/log/CocoonLogFormatter.java?rev=164795r1=164794r2=164795view=diff
==
--- cocoon/trunk/src/java/org/apache/cocoon/util/log/CocoonLogFormatter.java
(original)
+++ cocoon/trunk/src/java/org/apache/cocoon/util/log/CocoonLogFormatter.java
Tue Apr 26 07:23:49 2005
@@ -230,9 +230,13 @@
final Object context = ctxMap.get(objectModel);
if (context != null context instanceof Map) {
// Get the request
-final Request request = ObjectModelHelper.getRequest((Map)
context);
+final Request request = ObjectModelHelper
+.getRequest((Map) context);
if (request != null) {
-return ? + request.getQueryString();
+String queryString = request.getQueryString();
+return (queryString != null)
+ ? (? + request.getQueryString())
+ : ;
}
}
}
svn commit: r164568 - /cocoon/trunk/src/webapp/WEB-INF/logkit.xconf
Author: lgawron
Date: Mon Apr 25 06:15:33 2005
New Revision: 164568
URL: http://svn.apache.org/viewcvs?rev=164568view=rev
Log:
exceptions are not logged anywhere
Modified:
cocoon/trunk/src/webapp/WEB-INF/logkit.xconf
Modified: cocoon/trunk/src/webapp/WEB-INF/logkit.xconf
URL:
http://svn.apache.org/viewcvs/cocoon/trunk/src/webapp/WEB-INF/logkit.xconf?rev=164568r1=164567r2=164568view=diff
==
--- cocoon/trunk/src/webapp/WEB-INF/logkit.xconf (original)
+++ cocoon/trunk/src/webapp/WEB-INF/logkit.xconf Mon Apr 25 06:15:33 2005
@@ -74,7 +74,7 @@
| Please mind that the default format logs request uri along with
| query string. This may log confidential data (passwords etc.).
+--
- format type=cocoon%5.5{priority} %{time} [%{category}]
(%{uri}%{query}) %{thread}/%{class:short}: %{message}\n/format
+ format type=cocoon%5.5{priority} %{time} [%{category}]
(%{uri}%{query}) %{thread}/%{class:short}: %{message}\n%{throwable}/format
!--format type=cocoon%5.5{priority} %{time} [%{category}]
(%{uri}%{query}) %{thread}/%{class:short}: %{message}\n%{throwable}/format--
!--+
svn commit: r164569 - /cocoon/blocks/unsupported/template/trunk/java/org/apache/cocoon/template/jxtg/JXTemplateGenerator.java
Author: lgawron
Date: Mon Apr 25 06:17:43 2005
New Revision: 164569
URL: http://svn.apache.org/viewcvs?rev=164569view=rev
Log:
possible NPE
Modified:
cocoon/blocks/unsupported/template/trunk/java/org/apache/cocoon/template/jxtg/JXTemplateGenerator.java
Modified:
cocoon/blocks/unsupported/template/trunk/java/org/apache/cocoon/template/jxtg/JXTemplateGenerator.java
URL:
http://svn.apache.org/viewcvs/cocoon/blocks/unsupported/template/trunk/java/org/apache/cocoon/template/jxtg/JXTemplateGenerator.java?rev=164569r1=164568r2=164569view=diff
==
---
cocoon/blocks/unsupported/template/trunk/java/org/apache/cocoon/template/jxtg/JXTemplateGenerator.java
(original)
+++
cocoon/blocks/unsupported/template/trunk/java/org/apache/cocoon/template/jxtg/JXTemplateGenerator.java
Mon Apr 25 06:17:43 2005
@@ -120,6 +120,8 @@
public Serializable getKey() {
JXTExpression cacheKeyExpr = (JXTExpression) this.startDocument
.getTemplateProperty(JXTemplateGenerator.CACHE_KEY);
+if ( cacheKeyExpr == null )
+return null;
try {
final Serializable templateKey = (Serializable) cacheKeyExpr
.getValue(this.expressionContext);
@@ -135,6 +137,8 @@
public SourceValidity getValidity() {
JXTExpression validityExpr = (JXTExpression) this.startDocument
.getTemplateProperty(JXTemplateGenerator.VALIDITY);
+if ( validityExpr == null )
+return null;
try {
final SourceValidity sourceValidity = this.startDocument
.getSourceValidity();
svn commit: r164581 - /cocoon/trunk/src/webapp/WEB-INF/logkit.xconf
Author: lgawron
Date: Mon Apr 25 07:33:22 2005
New Revision: 164581
URL: http://svn.apache.org/viewcvs?rev=164581view=rev
Log:
use rootThrowable instead of throwable in cocoon.log
Modified:
cocoon/trunk/src/webapp/WEB-INF/logkit.xconf
Modified: cocoon/trunk/src/webapp/WEB-INF/logkit.xconf
URL:
http://svn.apache.org/viewcvs/cocoon/trunk/src/webapp/WEB-INF/logkit.xconf?rev=164581r1=164580r2=164581view=diff
==
--- cocoon/trunk/src/webapp/WEB-INF/logkit.xconf (original)
+++ cocoon/trunk/src/webapp/WEB-INF/logkit.xconf Mon Apr 25 07:33:22 2005
@@ -67,15 +67,16 @@
| Note that newlines are *not* automatic: you have to specify the
| newline as '\n' or everything will appear on a single line!
|
- | The first format below is less verbose because it won't print out
- | the error stacktrace (which tend to be very verbose and for little
value).
- | If you need the stacktraces, uncomment the second format below.
+ | The first format below is verbose: it includes error stacktraces.
+ | If you want something even more verbose use %{throwable} which will
+ | show a full chain of exceptions. Using the second format won't
+ | output stacktraces at all.
|
| Please mind that the default format logs request uri along with
| query string. This may log confidential data (passwords etc.).
+--
- format type=cocoon%5.5{priority} %{time} [%{category}]
(%{uri}%{query}) %{thread}/%{class:short}: %{message}\n%{throwable}/format
- !--format type=cocoon%5.5{priority} %{time} [%{category}]
(%{uri}%{query}) %{thread}/%{class:short}: %{message}\n%{throwable}/format--
+ format type=cocoon%5.5{priority} %{time} [%{category}]
(%{uri}%{query}) %{thread}/%{class:short}: %{message}\n%{rootThrowable}/format
+ !--format type=cocoon%5.5{priority} %{time} [%{category}]
(%{uri}%{query}) %{thread}/%{class:short}: %{message}\n%/format--
!--+
| append if set to 'true' will make cocoon append the events
svn commit: r164418 - in /cocoon/trunk: blocks.properties gump.xml src/java/org/apache/cocoon/environment/TemplateObjectModelHelper.java src/java/org/apache/cocoon/generation/JXTemplateGenerator.java src/java/org/apache/cocoon/transformation/JXTemplateTransformer.java src/webapp/sitemap.xmap
Author: lgawron Date: Sat Apr 23 13:36:39 2005 New Revision: 164418 URL: http://svn.apache.org/viewcvs?rev=164418view=rev Log: template block goes official apples samples fixed (used continuation.id instead of $cocoon.continuation.id) jxtg is now o.a.c.template.jxtg.JXTemplateGenerator dummy deprecated o.a.c.generation.JXTemplateGenerator introduced to keep backward compatibility (same for transformer) dependencies reflected in gump.xml Removed: cocoon/trunk/src/java/org/apache/cocoon/generation/JXTemplateGenerator.java cocoon/trunk/src/java/org/apache/cocoon/transformation/JXTemplateTransformer.java Modified: cocoon/trunk/blocks.properties cocoon/trunk/gump.xml cocoon/trunk/src/java/org/apache/cocoon/environment/TemplateObjectModelHelper.java cocoon/trunk/src/webapp/sitemap.xmap Modified: cocoon/trunk/blocks.properties URL: http://svn.apache.org/viewcvs/cocoon/trunk/blocks.properties?rev=164418r1=164417r2=164418view=diff == --- cocoon/trunk/blocks.properties (original) +++ cocoon/trunk/blocks.properties Sat Apr 23 13:36:39 2005 @@ -58,6 +58,7 @@ #-[dependency]: batik is needed by fop, scratchpad, tour. #include.block.batik=false #include.block.bsf=false +#-[dependency]: chaperon depends on template (for samples). #include.block.chaperon=false #-[dependency]: databases is needed by hsqldb, jms, ojb, petstore, repository, xmldb, xsp. #include.block.databases=false @@ -73,6 +74,7 @@ #include.block.jfor=false #include.block.jsp=false #include.block.linkrewriter=false +#-[dependency]: lucene depends on template (for samples). #-[dependency]: lucene is needed by querybean. #include.block.lucene=false #include.block.naming=false @@ -81,7 +83,7 @@ #include.block.ojb=false #include.block.paranoid=false #include.block.poi=false -#-[dependency]: portal depends on authentication-fw, cron, forms, session-fw. +#-[dependency]: portal depends on authentication-fw, cron, forms, session-fw, template (for samples). #-[dependency]: portal is needed by faces. #include.block.portal=false #include.block.profiler=false @@ -114,17 +116,20 @@ #include.block.asciiart=false #-[dependency]: axis is needed by scratchpad. #include.block.axis=false +#-[dependency]: cron depends on template (for samples). #-[dependency]: cron is needed by portal, scratchpad. #include.block.cron=false #include.block.deli=false -#-[dependency]: eventcache depends on jms. +#-[dependency]: eventcache depends on jms, template (for samples). #-[dependency]: eventcache is needed by repository. #include.block.eventcache=false #-[dependency]: faces depends on portal, taglib. #-[dependency]: faces is needed by scratchpad. #include.block.faces=false +#-[dependency]: forms depends on template. #-[dependency]: forms is needed by apples, ojb, petstore, portal, querybean, tour. #include.block.forms=false +#-[dependency]: javaflow depends on template (for samples). #-[dependency]: javaflow is needed by scratchpad. #include.block.javaflow=false #-[dependency]: jms depends on databases (for samples), hsqldb (for samples). @@ -133,28 +138,29 @@ #-[dependency]: mail depends on asciiart, scratchpad. #include.block.mail=false #include.block.midi=false -#-[dependency]: petstore depends on databases, forms, hsqldb, velocity. +#-[dependency]: petstore depends on databases, forms, hsqldb, template, velocity. #include.block.petstore=false #include.block.proxy=false #include.block.qdox=false -#-[dependency]: querybean depends on forms (for samples), lucene, ojb. +#-[dependency]: querybean depends on forms (for samples), lucene, ojb, template (for samples). #include.block.querybean=false #-[dependency]: repository depends on databases (for samples), eventcache. #-[dependency]: repository is needed by scratchpad, slide, webdav. #include.block.repository=false -#-[dependency]: scratchpad depends on axis (for samples), batik (for samples), cron, faces (for samples), javaflow, repository, velocity (for samples), xsp. +#-[dependency]: scratchpad depends on axis (for samples), batik (for samples), cron, faces (for samples), javaflow, repository, template (for samples), velocity (for samples), xsp. #-[dependency]: scratchpad is needed by mail. #include.block.scratchpad=false #include.block.serializers=false -#-[dependency]: slide depends on jms, repository. +#-[dependency]: slide depends on jms, repository, template (for samples). #include.block.slide=false #-[dependency]: slop is needed by tour. #include.block.slop=false #include.block.stx=false #-[dependency]: taglib is needed by faces. #include.block.taglib=false +#-[dependency]: template is needed by chaperon, cron, eventcache, forms, javaflow, lucene, petstore, portal, querybean, scratchpad, slide, tour, webdav
svn commit: r164419 [3/3] - in /cocoon/blocks/unsupported/template/trunk: conf/ java/org/apache/cocoon/components/accessor/ java/org/apache/cocoon/components/expression/ java/org/apache/cocoon/components/expression/jexl/ java/org/apache/cocoon/components/expression/jxpath/ java/org/apache/cocoon/environment/ java/org/apache/cocoon/generation/ java/org/apache/cocoon/template/jxtg/ java/org/apache/cocoon/template/jxtg/environment/ java/org/apache/cocoon/template/jxtg/expression/ java/org/apache/cocoon/template/jxtg/instruction/ java/org/apache/cocoon/template/jxtg/script/ java/org/apache/cocoon/template/jxtg/script/event/ java/org/apache/cocoon/transformation/ java/org/apache/cocoon/xml/ test/org/apache/cocoon/components/accessor/ test/org/apache/cocoon/components/expression/ test/org/apache/cocoon/components/expression/jexl/ test/org/apache/cocoon/components/expression/jxpath/ test/org/apache/cocoon/environment/ test/org/apache/cocoon/template/jxtg/
Modified:
cocoon/blocks/unsupported/template/trunk/test/org/apache/cocoon/environment/FOMTestCase.xtest
URL:
http://svn.apache.org/viewcvs/cocoon/blocks/unsupported/template/trunk/test/org/apache/cocoon/environment/FOMTestCase.xtest?rev=164419r1=164418r2=164419view=diff
==
---
cocoon/blocks/unsupported/template/trunk/test/org/apache/cocoon/environment/FOMTestCase.xtest
(original)
+++
cocoon/blocks/unsupported/template/trunk/test/org/apache/cocoon/environment/FOMTestCase.xtest
Sat Apr 23 13:44:12 2005
@@ -1,35 +1,35 @@
-?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.
---
-
-testcase
- roles
-role
name=org.apache.cocoon.components.expression.ExpressionCompilerSelector
- shorthand=expression-compilers
-
default-class=org.apache.cocoon.core.container.DefaultServiceSelector/
-role name=org.apache.cocoon.components.expression.ExpressionFactory
- shorthand=expression-factory
-
default-class=org.apache.cocoon.components.expression.ExpressionFactory/
- /roles
-
- components
-expression-compilers
- component-instance
class=org.apache.cocoon.components.expression.jexl.JexlCompiler name=jexl/
- component-instance
class=org.apache.cocoon.components.expression.jxpath.JXPathCompiler
name=jxpath/
-/expression-compilers
- /components
-
-/testcase
+?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.
+--
+
+testcase
+ roles
+role
name=org.apache.cocoon.components.expression.ExpressionCompilerSelector
+ shorthand=expression-compilers
+
default-class=org.apache.cocoon.core.container.DefaultServiceSelector/
+role name=org.apache.cocoon.components.expression.ExpressionFactory
+ shorthand=expression-factory
+
default-class=org.apache.cocoon.components.expression.ExpressionFactory/
+ /roles
+
+ components
+expression-compilers
+ component-instance
class=org.apache.cocoon.components.expression.jexl.JexlCompiler name=jexl/
+ component-instance
class=org.apache.cocoon.components.expression.jxpath.JXPathCompiler
name=jxpath/
+/expression-compilers
+ /components
+
+/testcase
Propchange:
cocoon/blocks/unsupported/template/trunk/test/org/apache/cocoon/environment/FOMTestCase.xtest
--
svn:eol-style = native
Propchange:
cocoon/blocks/unsupported/template/trunk/test/org/apache/cocoon/environment/FOMTestCase.xtest
--
svn:keywords = Id
Modified:
cocoon/blocks/unsupported/template/trunk/test/org/apache/cocoon/template/jxtg/JXTemplateGeneratorTestCase.java
URL:
http://svn.apache.org/viewcvs/cocoon/blocks/unsupported/template/trunk/test/org/apache/cocoon/template/jxtg/JXTemplateGeneratorTestCase.java?rev=164419r1=164418r2=164419view=diff
==
---
cocoon/blocks/unsupported/template/trunk/test/org/apache/cocoon/template/jxtg/JXTemplateGeneratorTestCase.java
(original)
+++
cocoon/blocks/unsupported/template/trunk/test/org/apache/cocoon/template/jxtg/JXTemplateGeneratorTestCase.java
Sat Apr 23 13:44:12 2005
@@ -23,7 +23,6 @@
import org.apache.avalon.framework.parameters.Parameters;
import org.apache.cocoon.SitemapComponentTestCase;
import org.apache.cocoon.components.flow.FlowHelper;
-import org.w3c.dom.Document;
public class JXTemplateGeneratorTestCase extends SitemapComponentTestCase {
private Logger logger = new ConsoleLogger(ConsoleLogger.LEVEL_WARN);
svn commit: r164419 [1/3] - in /cocoon/blocks/unsupported/template/trunk: conf/ java/org/apache/cocoon/components/accessor/ java/org/apache/cocoon/components/expression/ java/org/apache/cocoon/components/expression/jexl/ java/org/apache/cocoon/components/expression/jxpath/ java/org/apache/cocoon/environment/ java/org/apache/cocoon/generation/ java/org/apache/cocoon/template/jxtg/ java/org/apache/cocoon/template/jxtg/environment/ java/org/apache/cocoon/template/jxtg/expression/ java/org/apache/cocoon/template/jxtg/instruction/ java/org/apache/cocoon/template/jxtg/script/ java/org/apache/cocoon/template/jxtg/script/event/ java/org/apache/cocoon/transformation/ java/org/apache/cocoon/xml/ test/org/apache/cocoon/components/accessor/ test/org/apache/cocoon/components/expression/ test/org/apache/cocoon/components/expression/jexl/ test/org/apache/cocoon/components/expression/jxpath/ test/org/apache/cocoon/environment/ test/org/apache/cocoon/template/jxtg/
Author: lgawron Date: Sat Apr 23 13:44:12 2005 New Revision: 164419 URL: http://svn.apache.org/viewcvs?rev=164419view=rev Log: template block goes official apples samples fixed (used continuation.id instead of $cocoon.continuation.id) jxtg is now o.a.c.template.jxtg.JXTemplateGenerator dummy deprecated o.a.c.generation.JXTemplateGenerator introduced to keep backward compatibility (same for transformer) dependencies reflected in gump.xml Added: cocoon/blocks/unsupported/template/trunk/conf/template-generator.xmap cocoon/blocks/unsupported/template/trunk/conf/template-transformer.xmap cocoon/blocks/unsupported/template/trunk/java/org/apache/cocoon/generation/ cocoon/blocks/unsupported/template/trunk/java/org/apache/cocoon/generation/JXTemplateGenerator.java (with props) cocoon/blocks/unsupported/template/trunk/java/org/apache/cocoon/template/jxtg/JXTemplateTransformer.java (with props) cocoon/blocks/unsupported/template/trunk/java/org/apache/cocoon/transformation/ cocoon/blocks/unsupported/template/trunk/java/org/apache/cocoon/transformation/JXTemplateTransformer.java (with props) Removed: cocoon/blocks/unsupported/template/trunk/conf/template.xmap Modified: cocoon/blocks/unsupported/template/trunk/java/org/apache/cocoon/components/accessor/Accessor.java (contents, props changed) cocoon/blocks/unsupported/template/trunk/java/org/apache/cocoon/components/accessor/ContextAccessor.java (contents, props changed) cocoon/blocks/unsupported/template/trunk/java/org/apache/cocoon/components/accessor/ContinuationAccessor.java (contents, props changed) cocoon/blocks/unsupported/template/trunk/java/org/apache/cocoon/components/accessor/FlowAttributeAccessor.java (contents, props changed) cocoon/blocks/unsupported/template/trunk/java/org/apache/cocoon/components/accessor/MapAccessor.java (contents, props changed) cocoon/blocks/unsupported/template/trunk/java/org/apache/cocoon/components/accessor/ObjectModelAccessor.java (contents, props changed) cocoon/blocks/unsupported/template/trunk/java/org/apache/cocoon/components/accessor/RequestAccessor.java (contents, props changed) cocoon/blocks/unsupported/template/trunk/java/org/apache/cocoon/components/accessor/SessionAccessor.java (contents, props changed) cocoon/blocks/unsupported/template/trunk/java/org/apache/cocoon/components/expression/Expression.java (contents, props changed) cocoon/blocks/unsupported/template/trunk/java/org/apache/cocoon/components/expression/ExpressionCompiler.java (contents, props changed) cocoon/blocks/unsupported/template/trunk/java/org/apache/cocoon/components/expression/ExpressionContext.java (contents, props changed) cocoon/blocks/unsupported/template/trunk/java/org/apache/cocoon/components/expression/ExpressionException.java (contents, props changed) cocoon/blocks/unsupported/template/trunk/java/org/apache/cocoon/components/expression/ExpressionFactory.java (contents, props changed) cocoon/blocks/unsupported/template/trunk/java/org/apache/cocoon/components/expression/jexl/JSIntrospector.java (contents, props changed) cocoon/blocks/unsupported/template/trunk/java/org/apache/cocoon/components/expression/jexl/JexlCompiler.java (contents, props changed) cocoon/blocks/unsupported/template/trunk/java/org/apache/cocoon/components/expression/jexl/JexlExpression.java (contents, props changed) cocoon/blocks/unsupported/template/trunk/java/org/apache/cocoon/components/expression/jxpath/JXPathCompiler.java (contents, props changed) cocoon/blocks/unsupported/template/trunk/java/org/apache/cocoon/components/expression/jxpath/JXPathExpression.java (contents, props changed) cocoon/blocks/unsupported/template/trunk/java/org/apache/cocoon/environment/FlowObjectModelHelper.java cocoon/blocks/unsupported/template/trunk/java/org/apache/cocoon/template/jxtg/JXTemplateGenerator.java cocoon/blocks/unsupported/template/trunk/java/org/apache/cocoon/template/jxtg/TransformerAdapter.java cocoon/blocks/unsupported/template/trunk/java/org/apache/cocoon/template/jxtg/environment/ErrorHolder.java cocoon/blocks/unsupported/template/trunk/java/org/apache/cocoon/template/jxtg/environment/ExecutionContext.java cocoon/blocks/unsupported/template/trunk/java/org/apache/cocoon/template/jxtg/environment/JXCacheKey.java cocoon/blocks/unsupported/template/trunk/java/org/apache/cocoon/template/jxtg/environment/JXSourceValidity.java cocoon/blocks/unsupported/template/trunk/java/org/apache/cocoon/template/jxtg/environment/LocatorFacade.java cocoon/blocks/unsupported/template/trunk/java/org/apache/cocoon/template/jxtg/environment/ValueHelper.java cocoon/blocks/unsupported/template/trunk/java/org/apache/cocoon/template/jxtg/expression/JXTExpression.java cocoon/blocks/unsupported/template/trunk/java/org/apache/cocoon/template/jxtg/expression
svn commit: r164419 [2/3] - in /cocoon/blocks/unsupported/template/trunk: conf/ java/org/apache/cocoon/components/accessor/ java/org/apache/cocoon/components/expression/ java/org/apache/cocoon/components/expression/jexl/ java/org/apache/cocoon/components/expression/jxpath/ java/org/apache/cocoon/environment/ java/org/apache/cocoon/generation/ java/org/apache/cocoon/template/jxtg/ java/org/apache/cocoon/template/jxtg/environment/ java/org/apache/cocoon/template/jxtg/expression/ java/org/apache/cocoon/template/jxtg/instruction/ java/org/apache/cocoon/template/jxtg/script/ java/org/apache/cocoon/template/jxtg/script/event/ java/org/apache/cocoon/transformation/ java/org/apache/cocoon/xml/ test/org/apache/cocoon/components/accessor/ test/org/apache/cocoon/components/expression/ test/org/apache/cocoon/components/expression/jexl/ test/org/apache/cocoon/components/expression/jxpath/ test/org/apache/cocoon/environment/ test/org/apache/cocoon/template/jxtg/
Modified:
cocoon/blocks/unsupported/template/trunk/java/org/apache/cocoon/template/jxtg/expression/Substitutions.java
URL:
http://svn.apache.org/viewcvs/cocoon/blocks/unsupported/template/trunk/java/org/apache/cocoon/template/jxtg/expression/Substitutions.java?rev=164419r1=164418r2=164419view=diff
==
---
cocoon/blocks/unsupported/template/trunk/java/org/apache/cocoon/template/jxtg/expression/Substitutions.java
(original)
+++
cocoon/blocks/unsupported/template/trunk/java/org/apache/cocoon/template/jxtg/expression/Substitutions.java
Sat Apr 23 13:44:12 2005
@@ -1,161 +1,164 @@
-/*
- * 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.
- */
-package org.apache.cocoon.template.jxtg.expression;
-
-import java.io.CharArrayReader;
-import java.io.IOException;
-import java.io.Reader;
-import java.io.StringReader;
-import java.util.Iterator;
-import java.util.LinkedList;
-import java.util.List;
-
-import org.apache.cocoon.components.expression.ExpressionContext;
-import org.apache.cocoon.template.jxtg.environment.ErrorHolder;
-import org.xml.sax.Locator;
-import org.xml.sax.SAXException;
-import org.xml.sax.SAXParseException;
-
-public class Substitutions {
-
-final private List substitutions;
-final private boolean hasSubstitutions;
-
-public Substitutions(Locator location, String stringTemplate) throws
SAXException {
-this(location, new StringReader(stringTemplate));
-}
-
-public Substitutions(Locator location, char[] chars, int start, int length)
-throws SAXException {
-this(location, new CharArrayReader(chars, start, length));
-}
-
-private Substitutions(Locator location, Reader in) throws SAXException {
-LinkedList substitutions = new LinkedList();
-StringBuffer buf = new StringBuffer();
-buf.setLength(0);
-int ch;
-boolean inExpr = false;
-boolean xpath = false;
-try {
-top:
-while ((ch = in.read()) != -1) {
-// column++;
-char c = (char) ch;
-processChar:
-while (true) {
-if (inExpr) {
-if (c == '\\') {
-ch = in.read();
-buf.append(ch == -1 ? '\\' : (char) ch);
-} else if (c == '}') {
-String str = buf.toString();
-JXTExpression compiledExpression;
-try {
-compiledExpression =
JXTExpression.compile(str, xpath);
-} catch (Exception exc) {
-throw new SAXParseException(exc.getMessage(),
-location, exc);
-} catch (Error err) {
-throw new SAXParseException(err.getMessage(),
-location,
-new
ErrorHolder(err));
-}
-substitutions.add(compiledExpression);
-buf.setLength(0);
-inExpr = false;
-} else {
-buf.append(c);
-}
-} else if (c == '$' || c == '#') {
-ch = in.read();
-if (ch == '{') {
-xpath = c == '#';
-inExpr = true;
-if (buf.length() 0) {
-substitutions.add(new Literal(buf.toString()));
-buf.setLength(0);
-}
-continue top;
-}
-buf.append(c);
-if (ch != -1) {
-c = (char) ch;
-continue processChar;
-}
-} else {
-buf.append(c);
-}
-break;
-}
-}
-} catch (IOException ignored) {
-// won't happen
-
svn commit: r164420 - in /cocoon/blocks/unsupported/apples/trunk/samples: guess/guess.jx hanoi/intro.jx
Author: lgawron
Date: Sat Apr 23 13:45:46 2005
New Revision: 164420
URL: http://svn.apache.org/viewcvs?rev=164420view=rev
Log:
fixes in blocks after replacing jxtg
Modified:
cocoon/blocks/unsupported/apples/trunk/samples/guess/guess.jx
cocoon/blocks/unsupported/apples/trunk/samples/hanoi/intro.jx
Modified: cocoon/blocks/unsupported/apples/trunk/samples/guess/guess.jx
URL:
http://svn.apache.org/viewcvs/cocoon/blocks/unsupported/apples/trunk/samples/guess/guess.jx?rev=164420r1=164419r2=164420view=diff
==
--- cocoon/blocks/unsupported/apples/trunk/samples/guess/guess.jx (original)
+++ cocoon/blocks/unsupported/apples/trunk/samples/guess/guess.jx Sat Apr 23
13:45:46 2005
@@ -25,7 +25,7 @@
para${hint}/para
paraYou've guessed ${guesses} times./para
-form method=post action=${continuation.id}.continue
+form method=post action=${cocoon.continuation.id}.continue
input type=text name=guess/
input type=submit value=Guess!/
/form
Modified: cocoon/blocks/unsupported/apples/trunk/samples/hanoi/intro.jx
URL:
http://svn.apache.org/viewcvs/cocoon/blocks/unsupported/apples/trunk/samples/hanoi/intro.jx?rev=164420r1=164419r2=164420view=diff
==
--- cocoon/blocks/unsupported/apples/trunk/samples/hanoi/intro.jx (original)
+++ cocoon/blocks/unsupported/apples/trunk/samples/hanoi/intro.jx Sat Apr 23
13:45:46 2005
@@ -26,7 +26,7 @@
paraTo start the puzzle interaction you need to initilaize the number of
discs: /para
-form method=post action=${continuation.id}.continue
+form method=post action=${cocoon.continuation.id}.continue
select name=size
option3/option
svn commit: r164421 - /cocoon/blocks/unsupported/eventcache/trunk/java/org/apache/cocoon/samples/EventAwareGenerator.java
Author: lgawron
Date: Sat Apr 23 13:46:21 2005
New Revision: 164421
URL: http://svn.apache.org/viewcvs?rev=164421view=rev
Log:
fixes in blocks after replacing jxtg
Modified:
cocoon/blocks/unsupported/eventcache/trunk/java/org/apache/cocoon/samples/EventAwareGenerator.java
Modified:
cocoon/blocks/unsupported/eventcache/trunk/java/org/apache/cocoon/samples/EventAwareGenerator.java
URL:
http://svn.apache.org/viewcvs/cocoon/blocks/unsupported/eventcache/trunk/java/org/apache/cocoon/samples/EventAwareGenerator.java?rev=164421r1=164420r2=164421view=diff
==
---
cocoon/blocks/unsupported/eventcache/trunk/java/org/apache/cocoon/samples/EventAwareGenerator.java
(original)
+++
cocoon/blocks/unsupported/eventcache/trunk/java/org/apache/cocoon/samples/EventAwareGenerator.java
Sat Apr 23 13:46:21 2005
@@ -23,14 +23,14 @@
import org.apache.cocoon.caching.validity.NamedEvent;
import org.apache.cocoon.environment.ObjectModelHelper;
import org.apache.cocoon.environment.Request;
-import org.apache.cocoon.generation.JXTemplateGenerator;
+import org.apache.cocoon.template.jxtg.JXTemplateGenerator;
import org.apache.excalibur.source.SourceValidity;
import org.xml.sax.SAXException;
/**
* This is a sample generator to demonstrate the event aware caching.
* We simply extend the JXTG.
- * @version $Id:$
+ * @version $Id$
*/
public class EventAwareGenerator extends JXTemplateGenerator {
svn commit: r161892 - in cocoon/blocks/unsupported/template/trunk: java/org/apache/cocoon/template/jxtg/ java/org/apache/cocoon/template/jxtg/environment/ java/org/apache/cocoon/template/jxtg/instruction/ java/org/apache/cocoon/template/jxtg/script/ java/org/apache/cocoon/xml/ test/org/apache/cocoon/template/jxtg/
Author: lgawron
Date: Tue Apr 19 07:11:15 2005
New Revision: 161892
URL: http://svn.apache.org/viewcvs?view=revrev=161892
Log:
initial implementation of jx:attribute.
No namespace support
Probably buggy error reporting.
Check test/org/apache/cocoon/template/jxtg/jxAttribute.xml for examples.
Added:
cocoon/blocks/unsupported/template/trunk/java/org/apache/cocoon/template/jxtg/instruction/StartAttribute.java
cocoon/blocks/unsupported/template/trunk/java/org/apache/cocoon/xml/
cocoon/blocks/unsupported/template/trunk/java/org/apache/cocoon/xml/AttributeAwareXMLConsumer.java
cocoon/blocks/unsupported/template/trunk/java/org/apache/cocoon/xml/AttributeAwareXMLConsumerImpl.java
cocoon/blocks/unsupported/template/trunk/test/org/apache/cocoon/template/jxtg/jxAttribute-output.xml
cocoon/blocks/unsupported/template/trunk/test/org/apache/cocoon/template/jxtg/jxAttribute.xml
Modified:
cocoon/blocks/unsupported/template/trunk/java/org/apache/cocoon/template/jxtg/JXTemplateGenerator.java
cocoon/blocks/unsupported/template/trunk/java/org/apache/cocoon/template/jxtg/environment/JXCacheKey.java
cocoon/blocks/unsupported/template/trunk/java/org/apache/cocoon/template/jxtg/script/Parser.java
cocoon/blocks/unsupported/template/trunk/test/org/apache/cocoon/template/jxtg/JXTemplateGeneratorTestCase.java
Modified:
cocoon/blocks/unsupported/template/trunk/java/org/apache/cocoon/template/jxtg/JXTemplateGenerator.java
URL:
http://svn.apache.org/viewcvs/cocoon/blocks/unsupported/template/trunk/java/org/apache/cocoon/template/jxtg/JXTemplateGenerator.java?view=diffr1=161891r2=161892
==
---
cocoon/blocks/unsupported/template/trunk/java/org/apache/cocoon/template/jxtg/JXTemplateGenerator.java
(original)
+++
cocoon/blocks/unsupported/template/trunk/java/org/apache/cocoon/template/jxtg/JXTemplateGenerator.java
Tue Apr 19 07:11:15 2005
@@ -37,6 +37,7 @@
import org.apache.cocoon.template.jxtg.script.ScriptManager;
import org.apache.cocoon.template.jxtg.script.event.Event;
import org.apache.cocoon.template.jxtg.script.event.StartDocument;
+import org.apache.cocoon.xml.AttributeAwareXMLConsumerImpl;
import org.apache.cocoon.xml.RedundantNamespacesFilter;
import org.apache.cocoon.xml.XMLConsumer;
import org.apache.excalibur.source.SourceValidity;
@@ -95,8 +96,8 @@
if (src != null)
startDocument = scriptManager.resolveTemplate(src);
-this.expressionContext =
-FlowObjectModelHelper.getFOMExpressionContext(objectModel,
parameters);
+this.expressionContext = FlowObjectModelHelper.getFOMExpressionContext(
+objectModel, parameters);
this.definitions = new HashMap();
}
@@ -108,20 +109,21 @@
this.startDocument = null;
}
-public void performGeneration(Event startEvent, Event endEvent) throws
SAXException {
-XMLConsumer consumer = new
RedundantNamespacesFilter(this.xmlConsumer);
+public void performGeneration(Event startEvent, Event endEvent)
+throws SAXException {
+ XMLConsumer consumer = new AttributeAwareXMLConsumerImpl(
+ new RedundantNamespacesFilter(this.xmlConsumer));
((Map) expressionContext.get(cocoon)).put(consumer, consumer);
-Invoker.execute(consumer, this.expressionContext,
-new ExecutionContext(this.definitions,
this.scriptManager),
-null, startEvent, null);
+Invoker.execute(consumer, this.expressionContext, new ExecutionContext(
+this.definitions, this.scriptManager), null, startEvent, null);
}
public Serializable getKey() {
JXTExpression cacheKeyExpr = (JXTExpression) this.startDocument
.getTemplateProperty(JXTemplateGenerator.CACHE_KEY);
try {
-final Serializable templateKey =
-(Serializable) cacheKeyExpr.getValue(this.expressionContext);
+final Serializable templateKey = (Serializable) cacheKeyExpr
+.getValue(this.expressionContext);
if (templateKey != null) {
return new JXCacheKey(this.startDocument.getUri(),
templateKey);
}
@@ -135,10 +137,10 @@
JXTExpression validityExpr = (JXTExpression) this.startDocument
.getTemplateProperty(JXTemplateGenerator.VALIDITY);
try {
-final SourceValidity sourceValidity =
-this.startDocument.getSourceValidity();
-final SourceValidity templateValidity =
-(SourceValidity) validityExpr.getValue(this.expressionContext);
+final SourceValidity sourceValidity = this.startDocument
+.getSourceValidity();
+final SourceValidity templateValidity = (SourceValidity)
validityExpr
+.getValue(this.expressionContext
svn commit: r161355 - cocoon/trunk/tools/ide/eclipse/blocks-classpath.xsl
Author: lgawron
Date: Thu Apr 14 14:56:01 2005
New Revision: 161355
URL: http://svn.apache.org/viewcvs?view=revrev=161355
Log:
no more src/core as the source path
Modified:
cocoon/trunk/tools/ide/eclipse/blocks-classpath.xsl
Modified: cocoon/trunk/tools/ide/eclipse/blocks-classpath.xsl
URL:
http://svn.apache.org/viewcvs/cocoon/trunk/tools/ide/eclipse/blocks-classpath.xsl?view=diffr1=161354r2=161355
==
--- cocoon/trunk/tools/ide/eclipse/blocks-classpath.xsl (original)
+++ cocoon/trunk/tools/ide/eclipse/blocks-classpath.xsl Thu Apr 14 14:56:01 2005
@@ -47,7 +47,6 @@
!-- prepare the various paths that will form the project --
path id=srcs
!-- main source dir --
-pathelement path=${{src.core}}/
pathelement path=${{java}}/
!-- samples source dir --
!-- FIXME: Load based on local.build.properties --
@@ -56,7 +55,6 @@
!-- FIXME: Load based on local.build.properties --
pathelement path=${{src}}/deprecated/java/
!-- test source dir --
-pathelement path=${{src.core.test}}/
pathelement path=${{src}}/test/
/path
!--core mocks --
svn commit: r161358 - in cocoon/blocks/unsupported/template/trunk/java/org/apache/cocoon/template/jxtg: JXTemplateGenerator.java TransformerAdapter.java
Author: lgawron
Date: Thu Apr 14 15:14:51 2005
New Revision: 161358
URL: http://svn.apache.org/viewcvs?view=revrev=161358
Log:
wrap JXTG xmlConsumer with RedundantNamespacesFilter
Modified:
cocoon/blocks/unsupported/template/trunk/java/org/apache/cocoon/template/jxtg/JXTemplateGenerator.java
cocoon/blocks/unsupported/template/trunk/java/org/apache/cocoon/template/jxtg/TransformerAdapter.java
Modified:
cocoon/blocks/unsupported/template/trunk/java/org/apache/cocoon/template/jxtg/JXTemplateGenerator.java
URL:
http://svn.apache.org/viewcvs/cocoon/blocks/unsupported/template/trunk/java/org/apache/cocoon/template/jxtg/JXTemplateGenerator.java?view=diffr1=161357r2=161358
==
---
cocoon/blocks/unsupported/template/trunk/java/org/apache/cocoon/template/jxtg/JXTemplateGenerator.java
(original)
+++
cocoon/blocks/unsupported/template/trunk/java/org/apache/cocoon/template/jxtg/JXTemplateGenerator.java
Thu Apr 14 15:14:51 2005
@@ -37,6 +37,7 @@
import org.apache.cocoon.template.jxtg.script.ScriptManager;
import org.apache.cocoon.template.jxtg.script.event.Event;
import org.apache.cocoon.template.jxtg.script.event.StartDocument;
+import org.apache.cocoon.xml.RedundantNamespacesFilter;
import org.apache.cocoon.xml.XMLConsumer;
import org.apache.excalibur.source.SourceValidity;
import org.xml.sax.SAXException;
@@ -86,16 +87,9 @@
super.recycle();
}
-/*
- * (non-Javadoc)
- *
- * @see
org.apache.cocoon.sitemap.SitemapModelComponent#setup(org.apache.cocoon.environment.SourceResolver,
- * java.util.Map, java.lang.String,
- * org.apache.avalon.framework.parameters.Parameters)
- */
public void setup(SourceResolver resolver, Map objectModel, String src,
- Parameters parameters)
-throws ProcessingException, SAXException, IOException {
+Parameters parameters) throws ProcessingException, SAXException,
+IOException {
super.setup(resolver, objectModel, src, parameters);
if (src != null)
@@ -106,29 +100,22 @@
this.definitions = new HashMap();
}
-/*
- * (non-Javadoc)
- *
- * @see org.apache.cocoon.generation.Generator#generate()
- */
public void generate() throws IOException, SAXException,
ProcessingException {
-performGeneration(this.xmlConsumer, this.startDocument, null);
+performGeneration(this.startDocument, null);
+
+// no need to reference compiled script anymore
+this.startDocument = null;
}
-public void performGeneration(final XMLConsumer consumer, Event
startEvent, Event endEvent)
-throws SAXException {
-((Map)expressionContext.get(cocoon)).put(consumer, consumer);
-Invoker.execute(this.xmlConsumer, this.expressionContext,
-new ExecutionContext(this.definitions,
this.scriptManager),
+public void performGeneration(Event startEvent, Event endEvent) throws
SAXException {
+XMLConsumer consumer = new
RedundantNamespacesFilter(this.xmlConsumer);
+((Map) expressionContext.get(cocoon)).put(consumer, consumer);
+Invoker.execute(consumer, this.expressionContext,
+new ExecutionContext(this.definitions,
this.scriptManager),
null, startEvent, null);
}
-/*
- * (non-Javadoc)
- *
- * @see org.apache.cocoon.caching.CacheableProcessingComponent#getKey()
- */
public Serializable getKey() {
JXTExpression cacheKeyExpr = (JXTExpression) this.startDocument
.getTemplateProperty(JXTemplateGenerator.CACHE_KEY);
@@ -144,11 +131,6 @@
return null;
}
-/*
- * (non-Javadoc)
- *
- * @see
org.apache.cocoon.caching.CacheableProcessingComponent#getValidity()
- */
public SourceValidity getValidity() {
JXTExpression validityExpr = (JXTExpression) this.startDocument
.getTemplateProperty(JXTemplateGenerator.VALIDITY);
Modified:
cocoon/blocks/unsupported/template/trunk/java/org/apache/cocoon/template/jxtg/TransformerAdapter.java
URL:
http://svn.apache.org/viewcvs/cocoon/blocks/unsupported/template/trunk/java/org/apache/cocoon/template/jxtg/TransformerAdapter.java?view=diffr1=161357r2=161358
==
---
cocoon/blocks/unsupported/template/trunk/java/org/apache/cocoon/template/jxtg/TransformerAdapter.java
(original)
+++
cocoon/blocks/unsupported/template/trunk/java/org/apache/cocoon/template/jxtg/TransformerAdapter.java
Thu Apr 14 15:14:51 2005
@@ -53,7 +53,7 @@
public void endDocument() throws SAXException {
super.endDocument();
-gen.performGeneration(gen.getConsumer(), getStartEvent(), null);
+gen.performGeneration(getStartEvent(), null
svn commit: r161174 - cocoon/trunk/src/java/org/apache/cocoon/util/log/CocoonLogFormatter.java
Author: lgawron
Date: Wed Apr 13 04:13:18 2005
New Revision: 161174
URL: http://svn.apache.org/viewcvs?view=revrev=161174
Log:
Extend CocoonLogFormatter with the ability to log request query string
prepended with '?' character.
Modified:
cocoon/trunk/src/java/org/apache/cocoon/util/log/CocoonLogFormatter.java
Modified:
cocoon/trunk/src/java/org/apache/cocoon/util/log/CocoonLogFormatter.java
URL:
http://svn.apache.org/viewcvs/cocoon/trunk/src/java/org/apache/cocoon/util/log/CocoonLogFormatter.java?view=diffr1=161173r2=161174
==
--- cocoon/trunk/src/java/org/apache/cocoon/util/log/CocoonLogFormatter.java
(original)
+++ cocoon/trunk/src/java/org/apache/cocoon/util/log/CocoonLogFormatter.java
Wed Apr 13 04:13:18 2005
@@ -36,7 +36,8 @@
* package name. Warning: This pattern works only if formatting occurs in
* the same thread as the call to Logger, i.e. it won't work with
* codeAsyncLogTarget/code./li
- * licodeuri/code: Outputs the request URI.li
+ * licodeuri/code: Outputs the request URI./li
+ * licodequery/code: Outputs the request query string/li
* licodethread/code: Outputs the name of the current thread (first
element
* on the context stack)./li
* licodehost/code: Outputs the request host header.li
@@ -58,11 +59,13 @@
protected final static int TYPE_URI= MAX_TYPE + 2;
protected final static int TYPE_THREAD = MAX_TYPE + 3;
protected final static int TYPE_HOST = MAX_TYPE + 4;
+protected final static int TYPE_QUERY = MAX_TYPE + 5;
protected final static String TYPE_CLASS_STR = class;
protected final static String TYPE_CLASS_SHORT_STR = short;
protected final static String TYPE_URI_STR = uri;
+protected final static String TYPE_QUERY_STR = query;
protected final static String TYPE_THREAD_STR = thread;
protected final static String TYPE_HOST_STR= host;
@@ -136,6 +139,8 @@
return TYPE_THREAD;
} else if (type.equalsIgnoreCase(TYPE_HOST_STR)) {
return TYPE_HOST;
+} else if (type.equalsIgnoreCase(TYPE_QUERY_STR)) {
+return TYPE_QUERY;
} else {
return super.getTypeIdFor(type);
}
@@ -153,6 +158,8 @@
return getThread(event.getContextMap());
case TYPE_HOST:
return getHost(event.getContextMap());
+case TYPE_QUERY:
+return getQueryString(event.getContextMap());
}
return super.formatPatternRun(event, run);
}
@@ -204,6 +211,23 @@
return Unknown-URI;
}
+/**
+ * Find request query string
+ */
+private String getQueryString(ContextMap ctxMap) {
+if (ctxMap != null) {
+final Object context = ctxMap.get(objectModel);
+if (context != null context instanceof Map) {
+// Get the request
+final Request request = ObjectModelHelper.getRequest((Map)
context);
+if (request != null) {
+return ? + request.getQueryString();
+}
+}
+}
+return ;
+}
+
/**
* Find the host header of the request that is being processed.
*/
svn commit: r161175 - cocoon/branches/BRANCH_2_1_X/src/java/org/apache/cocoon/util/log/CocoonLogFormatter.java
Author: lgawron
Date: Wed Apr 13 05:07:26 2005
New Revision: 161175
URL: http://svn.apache.org/viewcvs?view=revrev=161175
Log:
Extend CocoonLogFormatter with the ability to log request query string
prepended with '?' character.
Modified:
cocoon/branches/BRANCH_2_1_X/src/java/org/apache/cocoon/util/log/CocoonLogFormatter.java
Modified:
cocoon/branches/BRANCH_2_1_X/src/java/org/apache/cocoon/util/log/CocoonLogFormatter.java
URL:
http://svn.apache.org/viewcvs/cocoon/branches/BRANCH_2_1_X/src/java/org/apache/cocoon/util/log/CocoonLogFormatter.java?view=diffr1=161174r2=161175
==
---
cocoon/branches/BRANCH_2_1_X/src/java/org/apache/cocoon/util/log/CocoonLogFormatter.java
(original)
+++
cocoon/branches/BRANCH_2_1_X/src/java/org/apache/cocoon/util/log/CocoonLogFormatter.java
Wed Apr 13 05:07:26 2005
@@ -36,7 +36,8 @@
* package name. Warning: This pattern works only if formatting occurs in
* the same thread as the call to Logger, i.e. it won't work with
* codeAsyncLogTarget/code./li
- * licodeuri/code: Outputs the request URI.li
+ * licodeuri/code: Outputs the request URI./li
+ * licodequery/code: Outputs the request query string/li
* licodethread/code: Outputs the name of the current thread (first
element
* on the context stack)./li
* licodehost/code: Outputs the request host header.li
@@ -58,11 +59,13 @@
protected final static int TYPE_URI= MAX_TYPE + 2;
protected final static int TYPE_THREAD = MAX_TYPE + 3;
protected final static int TYPE_HOST = MAX_TYPE + 4;
+protected final static int TYPE_QUERY = MAX_TYPE + 5;
protected final static String TYPE_CLASS_STR = class;
protected final static String TYPE_CLASS_SHORT_STR = short;
protected final static String TYPE_URI_STR = uri;
+protected final static String TYPE_QUERY_STR = query;
protected final static String TYPE_THREAD_STR = thread;
protected final static String TYPE_HOST_STR= host;
@@ -136,6 +139,8 @@
return TYPE_THREAD;
} else if (type.equalsIgnoreCase(TYPE_HOST_STR)) {
return TYPE_HOST;
+} else if (type.equalsIgnoreCase(TYPE_QUERY_STR)) {
+return TYPE_QUERY;
} else {
return super.getTypeIdFor(type);
}
@@ -153,6 +158,8 @@
return getThread(event.getContextMap());
case TYPE_HOST:
return getHost(event.getContextMap());
+case TYPE_QUERY:
+return getQueryString(event.getContextMap());
}
return super.formatPatternRun(event, run);
}
@@ -204,6 +211,23 @@
return Unknown-URI;
}
+/**
+ * Find request query string
+ */
+private String getQueryString(ContextMap ctxMap) {
+if (ctxMap != null) {
+final Object context = ctxMap.get(objectModel);
+if (context != null context instanceof Map) {
+// Get the request
+final Request request = ObjectModelHelper.getRequest((Map)
context);
+if (request != null) {
+return ? + request.getQueryString();
+}
+}
+}
+return ;
+}
+
/**
* Find the host header of the request that is being processed.
*/
svn commit: r156143 - cocoon/trunk/src/java/org/apache/cocoon/generation/JXTemplateGenerator.java cocoon/trunk/status.xml
Author: lgawron
Date: Fri Mar 4 00:39:53 2005
New Revision: 156143
URL: http://svn.apache.org/viewcvs?view=revrev=156143
Log:
Fix thread safety problem in JXTemplateGenerator.setup() concerning template
script reparsing.
Modified:
cocoon/trunk/src/java/org/apache/cocoon/generation/JXTemplateGenerator.java
cocoon/trunk/status.xml
Modified:
cocoon/trunk/src/java/org/apache/cocoon/generation/JXTemplateGenerator.java
URL:
http://svn.apache.org/viewcvs/cocoon/trunk/src/java/org/apache/cocoon/generation/JXTemplateGenerator.java?view=diffr1=156142r2=156143
==
--- cocoon/trunk/src/java/org/apache/cocoon/generation/JXTemplateGenerator.java
(original)
+++ cocoon/trunk/src/java/org/apache/cocoon/generation/JXTemplateGenerator.java
Fri Mar 4 00:39:53 2005
@@ -2357,7 +2357,6 @@
valid = startEvent.compileTime.isValid(validity);
}
if (valid != SourceValidity.VALID) {
-cache.remove(uri);
regenerate = true;
}
} else {
Modified: cocoon/trunk/status.xml
URL:
http://svn.apache.org/viewcvs/cocoon/trunk/status.xml?view=diffr1=156142r2=156143
==
--- cocoon/trunk/status.xml (original)
+++ cocoon/trunk/status.xml Fri Mar 4 00:39:53 2005
@@ -202,6 +202,12 @@
changes
release version=@version@ date=@date@
+ action dev=LG type=fix fixes-bug=33836 due-to=Niklas Therning
due-to-email=[EMAIL PROTECTED]
+ Fix thread safety problem in JXTemplateGenerator.setup() concerning
template script reparsing.
+ /action
+ action dev=LG type=add
+ Polish i18n for CForms.
+ /action
action dev=CZ type=update
Create proxies for pooled components. Pooled components can now be used in
the same
way as thread safe components, the client code does not need to know if
they are pooled anymore.
svn commit: r156144 - cocoon/branches/BRANCH_2_1_X/src/java/org/apache/cocoon/generation/JXTemplateGenerator.java cocoon/branches/BRANCH_2_1_X/status.xml
Author: lgawron
Date: Fri Mar 4 00:46:41 2005
New Revision: 156144
URL: http://svn.apache.org/viewcvs?view=revrev=156144
Log:
Fix thread safety problem in JXTemplateGenerator.setup() concerning template
script reparsing.
Modified:
cocoon/branches/BRANCH_2_1_X/src/java/org/apache/cocoon/generation/JXTemplateGenerator.java
cocoon/branches/BRANCH_2_1_X/status.xml
Modified:
cocoon/branches/BRANCH_2_1_X/src/java/org/apache/cocoon/generation/JXTemplateGenerator.java
URL:
http://svn.apache.org/viewcvs/cocoon/branches/BRANCH_2_1_X/src/java/org/apache/cocoon/generation/JXTemplateGenerator.java?view=diffr1=156143r2=156144
==
---
cocoon/branches/BRANCH_2_1_X/src/java/org/apache/cocoon/generation/JXTemplateGenerator.java
(original)
+++
cocoon/branches/BRANCH_2_1_X/src/java/org/apache/cocoon/generation/JXTemplateGenerator.java
Fri Mar 4 00:46:41 2005
@@ -2357,7 +2357,6 @@
valid = startEvent.compileTime.isValid(validity);
}
if (valid != SourceValidity.VALID) {
-cache.remove(uri);
regenerate = true;
}
} else {
Modified: cocoon/branches/BRANCH_2_1_X/status.xml
URL:
http://svn.apache.org/viewcvs/cocoon/branches/BRANCH_2_1_X/status.xml?view=diffr1=156143r2=156144
==
--- cocoon/branches/BRANCH_2_1_X/status.xml (original)
+++ cocoon/branches/BRANCH_2_1_X/status.xml Fri Mar 4 00:46:41 2005
@@ -202,6 +202,12 @@
changes
release version=@version@ date=@date@
+ action dev=LG type=fix fixes-bug=33836 due-to=Niklas Therning
due-to-email=[EMAIL PROTECTED]
+ Fix thread safety problem in JXTemplateGenerator.setup() concerning
template script reparsing.
+ /action
+ action dev=LG type=add
+ Polish i18n for CForms.
+ /action
action dev=VG type=fix
Runnable Manager: Fix bug preventing scheduling of two different jobs at
the same time.
/action
svn commit: r155904 - in cocoon/trunk/src/blocks/forms/samples/messages: FormsMessages_pl.xml OtherMessages_pl.xml
Author: lgawron
Date: Wed Mar 2 02:32:35 2005
New Revision: 155904
URL: http://svn.apache.org/viewcvs?view=revrev=155904
Log:
polish translation for forms messages
Added:
cocoon/trunk/src/blocks/forms/samples/messages/FormsMessages_pl.xml (with
props)
cocoon/trunk/src/blocks/forms/samples/messages/OtherMessages_pl.xml (with
props)
Added: cocoon/trunk/src/blocks/forms/samples/messages/FormsMessages_pl.xml
URL:
http://svn.apache.org/viewcvs/cocoon/trunk/src/blocks/forms/samples/messages/FormsMessages_pl.xml?view=autorev=155904
==
--- cocoon/trunk/src/blocks/forms/samples/messages/FormsMessages_pl.xml (added)
+++ cocoon/trunk/src/blocks/forms/samples/messages/FormsMessages_pl.xml Wed Mar
2 02:32:35 2005
@@ -0,0 +1,53 @@
+?xml version=1.0 encoding=utf-8?
+!--
+ 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.
+--
+!-- This catalogue file contains translations for built-in CForms messages.
--
+catalogue
+ message key=general.field-requiredTo pole jest wymagane./message
+
+ message key=datatype.conversion-failedNiepoprawna warto typu:
{0}./message
+ message key=datatype.decimalliczba rzeczywista/message
+ message key=datatype.integerliczba cakowita/message
+ message key=datatype.longliczba cakowita/message
+ message key=datatype.floatliczba rzeczywista/message
+ message key=datatype.doubleliczba rzeczywista/message
+ message key=datatype.date.datedata/message
+ message key=datatype.date.timeczas/message
+ message key=datatype.date.datetimedata i czas/message
+
+ message key=validation.string.exact-lengthWprowad dokadnie {0}
znakw./message
+ message key=validation.string.range-lengthWprowad od {0} do {1}
znakw./message
+ message key=validation.string.min-lengthWprowad przynajmniej {0}
znakw./message
+ message key=validation.string.max-lengthWprowad co najwyej {0}
znakw./message
+ message key=validation.string.regexpWarto nie odpowiada
wyraeniu regularnemu: {0}./message
+ message key=validation.string.invalidemailTo pole nie zawiera poprawnego
adresu e-mail./message
+
+ message key=validation.array.exact-valuecountDokadnie {0}
element(w) powinno zosta zaznaczonych./message
+ message key=validation.array.range-valuecountCo najmniej {0} i co
najwyej {1} element(w) powinno zosta zaznaczonych./message
+ message key=validation.array.min-valuecountCo najmniej {0}
element(w) powinno zosta zaznaczonych./message
+ message key=validation.array.max-valuecountCo najwyej {0}
element(w) powinno zosta zaznaczonych./message
+
+ message key=multivaluefield.conversionfailedJedna z zaznaczonych
wartoci jest niepoprawnego typu./message
+
+ message key=validation.numeric.rangeWprowad liczb w zakresie od
{0} do {1}./message
+ message key=validation.numeric.minWprowad liczb wiksz
lub rwn {0}./message
+ message key=validation.numeric.maxWprowad liczb mniejsz lub
rwn {0}./message
+
+ message key=validation.mod10Warto nie dzieli si bez reszty
przez 10./message
+
+ message key=aggregatedfield.split-failedZawarto tego pola nie
odpowiada wyraeniu regularnemu: {0}./message
+ message key=upload.invalid-typeNiepoprawny typ./message
+/catalogue
Propchange: cocoon/trunk/src/blocks/forms/samples/messages/FormsMessages_pl.xml
--
svn:eol-style = native
Propchange: cocoon/trunk/src/blocks/forms/samples/messages/FormsMessages_pl.xml
--
svn:keywords = Id
Added: cocoon/trunk/src/blocks/forms/samples/messages/OtherMessages_pl.xml
URL:
http://svn.apache.org/viewcvs/cocoon/trunk/src/blocks/forms/samples/messages/OtherMessages_pl.xml?view=autorev=155904
==
--- cocoon/trunk/src/blocks/forms/samples/messages/OtherMessages_pl.xml (added)
+++ cocoon/trunk/src/blocks/forms/samples/messages/OtherMessages_pl.xml Wed Mar
2 02:32:35 2005
@@ -0,0 +1,20 @@
+?xml version=1.0 encoding=utf-8?
+!--
+ 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
svn commit: r155905 - in cocoon/branches/BRANCH_2_1_X/src/blocks/forms/samples/messages: FormsMessages_pl.xml OtherMessages_pl.xml
Author: lgawron
Date: Wed Mar 2 02:36:17 2005
New Revision: 155905
URL: http://svn.apache.org/viewcvs?view=revrev=155905
Log:
polish translation for forms messages
Added:
cocoon/branches/BRANCH_2_1_X/src/blocks/forms/samples/messages/FormsMessages_pl.xml
(with props)
cocoon/branches/BRANCH_2_1_X/src/blocks/forms/samples/messages/OtherMessages_pl.xml
(with props)
Added:
cocoon/branches/BRANCH_2_1_X/src/blocks/forms/samples/messages/FormsMessages_pl.xml
URL:
http://svn.apache.org/viewcvs/cocoon/branches/BRANCH_2_1_X/src/blocks/forms/samples/messages/FormsMessages_pl.xml?view=autorev=155905
==
---
cocoon/branches/BRANCH_2_1_X/src/blocks/forms/samples/messages/FormsMessages_pl.xml
(added)
+++
cocoon/branches/BRANCH_2_1_X/src/blocks/forms/samples/messages/FormsMessages_pl.xml
Wed Mar 2 02:36:17 2005
@@ -0,0 +1,53 @@
+?xml version=1.0 encoding=utf-8?
+!--
+ 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.
+--
+!-- This catalogue file contains translations for built-in CForms messages.
--
+catalogue
+ message key=general.field-requiredTo pole jest wymagane./message
+
+ message key=datatype.conversion-failedNiepoprawna warto typu:
{0}./message
+ message key=datatype.decimalliczba rzeczywista/message
+ message key=datatype.integerliczba cakowita/message
+ message key=datatype.longliczba cakowita/message
+ message key=datatype.floatliczba rzeczywista/message
+ message key=datatype.doubleliczba rzeczywista/message
+ message key=datatype.date.datedata/message
+ message key=datatype.date.timeczas/message
+ message key=datatype.date.datetimedata i czas/message
+
+ message key=validation.string.exact-lengthWprowad dokadnie {0}
znakw./message
+ message key=validation.string.range-lengthWprowad od {0} do {1}
znakw./message
+ message key=validation.string.min-lengthWprowad przynajmniej {0}
znakw./message
+ message key=validation.string.max-lengthWprowad co najwyej {0}
znakw./message
+ message key=validation.string.regexpWarto nie odpowiada
wyraeniu regularnemu: {0}./message
+ message key=validation.string.invalidemailTo pole nie zawiera poprawnego
adresu e-mail./message
+
+ message key=validation.array.exact-valuecountDokadnie {0}
element(w) powinno zosta zaznaczonych./message
+ message key=validation.array.range-valuecountCo najmniej {0} i co
najwyej {1} element(w) powinno zosta zaznaczonych./message
+ message key=validation.array.min-valuecountCo najmniej {0}
element(w) powinno zosta zaznaczonych./message
+ message key=validation.array.max-valuecountCo najwyej {0}
element(w) powinno zosta zaznaczonych./message
+
+ message key=multivaluefield.conversionfailedJedna z zaznaczonych
wartoci jest niepoprawnego typu./message
+
+ message key=validation.numeric.rangeWprowad liczb w zakresie od
{0} do {1}./message
+ message key=validation.numeric.minWprowad liczb wiksz
lub rwn {0}./message
+ message key=validation.numeric.maxWprowad liczb mniejsz lub
rwn {0}./message
+
+ message key=validation.mod10Warto nie dzieli si bez reszty
przez 10./message
+
+ message key=aggregatedfield.split-failedZawarto tego pola nie
odpowiada wyraeniu regularnemu: {0}./message
+ message key=upload.invalid-typeNiepoprawny typ./message
+/catalogue
Propchange:
cocoon/branches/BRANCH_2_1_X/src/blocks/forms/samples/messages/FormsMessages_pl.xml
--
svn:eol-style = native
Propchange:
cocoon/branches/BRANCH_2_1_X/src/blocks/forms/samples/messages/FormsMessages_pl.xml
--
svn:keywords = Id
Added:
cocoon/branches/BRANCH_2_1_X/src/blocks/forms/samples/messages/OtherMessages_pl.xml
URL:
http://svn.apache.org/viewcvs/cocoon/branches/BRANCH_2_1_X/src/blocks/forms/samples/messages/OtherMessages_pl.xml?view=autorev=155905
==
---
cocoon/branches/BRANCH_2_1_X/src/blocks/forms/samples/messages/OtherMessages_pl.xml
(added)
+++
cocoon/branches/BRANCH_2_1_X/src/blocks/forms/samples/messages/OtherMessages_pl.xml
Wed Mar 2 02:36:17 2005
@@ -0,0 +1,20 @@
+?xml version=1.0 encoding=utf-8?
+!--
+ Copyright 1999-2004 The Apache Software Foundation
+
+ Licensed under the Apache License, Version 2.0 (the License);
+ you may not use this file except
svn commit: r155390 - cocoon/trunk/src/blocks/template/java/org/apache/cocoon/template/jxtg/instruction/MacroContext.java
Author: lgawron
Date: Sat Feb 26 00:26:18 2005
New Revision: 155390
URL: http://svn.apache.org/viewcvs?view=revrev=155390
Log:
missing license header
Modified:
cocoon/trunk/src/blocks/template/java/org/apache/cocoon/template/jxtg/instruction/MacroContext.java
Modified:
cocoon/trunk/src/blocks/template/java/org/apache/cocoon/template/jxtg/instruction/MacroContext.java
URL:
http://svn.apache.org/viewcvs/cocoon/trunk/src/blocks/template/java/org/apache/cocoon/template/jxtg/instruction/MacroContext.java?view=diffr1=155389r2=155390
==
---
cocoon/trunk/src/blocks/template/java/org/apache/cocoon/template/jxtg/instruction/MacroContext.java
(original)
+++
cocoon/trunk/src/blocks/template/java/org/apache/cocoon/template/jxtg/instruction/MacroContext.java
Sat Feb 26 00:26:18 2005
@@ -1,13 +1,22 @@
/*
- * Created on 2005-02-25
+ * 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.
*/
package org.apache.cocoon.template.jxtg.instruction;
import org.apache.cocoon.template.jxtg.script.event.Event;
-/**
- * @author lgawron
- */
public class MacroContext {
private final String macroQName;
private final Event bodyStart;
svn commit: r155340 - in cocoon/trunk/src/blocks/template: java/org/apache/cocoon/template/jxtg/ java/org/apache/cocoon/template/jxtg/instruction/ java/org/apache/cocoon/template/jxtg/script/ java/org/apache/cocoon/template/jxtg/script/event/ test/org/apache/cocoon/template/jxtg/
Author: lgawron
Date: Fri Feb 25 08:16:53 2005
New Revision: 155340
URL: http://svn.apache.org/viewcvs?view=revrev=155340
Log:
introduced:
jx:call macro=${macroName}
jx:withParam name=param1 value=${val}
bodyhere/body
/jx:call
Added:
cocoon/trunk/src/blocks/template/java/org/apache/cocoon/template/jxtg/instruction/MacroContext.java
(with props)
Modified:
cocoon/trunk/src/blocks/template/java/org/apache/cocoon/template/jxtg/JXTemplateGenerator.java
cocoon/trunk/src/blocks/template/java/org/apache/cocoon/template/jxtg/TransformerAdapter.java
cocoon/trunk/src/blocks/template/java/org/apache/cocoon/template/jxtg/instruction/StartCall.java
cocoon/trunk/src/blocks/template/java/org/apache/cocoon/template/jxtg/instruction/StartChoose.java
cocoon/trunk/src/blocks/template/java/org/apache/cocoon/template/jxtg/instruction/StartComment.java
cocoon/trunk/src/blocks/template/java/org/apache/cocoon/template/jxtg/instruction/StartDefine.java
cocoon/trunk/src/blocks/template/java/org/apache/cocoon/template/jxtg/instruction/StartEval.java
cocoon/trunk/src/blocks/template/java/org/apache/cocoon/template/jxtg/instruction/StartEvalBody.java
cocoon/trunk/src/blocks/template/java/org/apache/cocoon/template/jxtg/instruction/StartForEach.java
cocoon/trunk/src/blocks/template/java/org/apache/cocoon/template/jxtg/instruction/StartFormatDate.java
cocoon/trunk/src/blocks/template/java/org/apache/cocoon/template/jxtg/instruction/StartFormatNumber.java
cocoon/trunk/src/blocks/template/java/org/apache/cocoon/template/jxtg/instruction/StartIf.java
cocoon/trunk/src/blocks/template/java/org/apache/cocoon/template/jxtg/instruction/StartImport.java
cocoon/trunk/src/blocks/template/java/org/apache/cocoon/template/jxtg/instruction/StartOut.java
cocoon/trunk/src/blocks/template/java/org/apache/cocoon/template/jxtg/instruction/StartParameterInstance.java
cocoon/trunk/src/blocks/template/java/org/apache/cocoon/template/jxtg/instruction/StartSet.java
cocoon/trunk/src/blocks/template/java/org/apache/cocoon/template/jxtg/instruction/StartTemplate.java
cocoon/trunk/src/blocks/template/java/org/apache/cocoon/template/jxtg/script/Invoker.java
cocoon/trunk/src/blocks/template/java/org/apache/cocoon/template/jxtg/script/Parser.java
cocoon/trunk/src/blocks/template/java/org/apache/cocoon/template/jxtg/script/event/Characters.java
cocoon/trunk/src/blocks/template/java/org/apache/cocoon/template/jxtg/script/event/EndCDATA.java
cocoon/trunk/src/blocks/template/java/org/apache/cocoon/template/jxtg/script/event/EndDTD.java
cocoon/trunk/src/blocks/template/java/org/apache/cocoon/template/jxtg/script/event/EndDocument.java
cocoon/trunk/src/blocks/template/java/org/apache/cocoon/template/jxtg/script/event/EndElement.java
cocoon/trunk/src/blocks/template/java/org/apache/cocoon/template/jxtg/script/event/EndEntity.java
cocoon/trunk/src/blocks/template/java/org/apache/cocoon/template/jxtg/script/event/EndPrefixMapping.java
cocoon/trunk/src/blocks/template/java/org/apache/cocoon/template/jxtg/script/event/Event.java
cocoon/trunk/src/blocks/template/java/org/apache/cocoon/template/jxtg/script/event/IgnorableWhitespace.java
cocoon/trunk/src/blocks/template/java/org/apache/cocoon/template/jxtg/script/event/ProcessingInstruction.java
cocoon/trunk/src/blocks/template/java/org/apache/cocoon/template/jxtg/script/event/SkippedEntity.java
cocoon/trunk/src/blocks/template/java/org/apache/cocoon/template/jxtg/script/event/StartCDATA.java
cocoon/trunk/src/blocks/template/java/org/apache/cocoon/template/jxtg/script/event/StartDTD.java
cocoon/trunk/src/blocks/template/java/org/apache/cocoon/template/jxtg/script/event/StartDocument.java
cocoon/trunk/src/blocks/template/java/org/apache/cocoon/template/jxtg/script/event/StartElement.java
cocoon/trunk/src/blocks/template/java/org/apache/cocoon/template/jxtg/script/event/StartEntity.java
cocoon/trunk/src/blocks/template/java/org/apache/cocoon/template/jxtg/script/event/StartInstruction.java
cocoon/trunk/src/blocks/template/java/org/apache/cocoon/template/jxtg/script/event/StartPrefixMapping.java
cocoon/trunk/src/blocks/template/test/org/apache/cocoon/template/jxtg/JXTemplateGeneratorTestCase.java
cocoon/trunk/src/blocks/template/test/org/apache/cocoon/template/jxtg/jxMacro-output.xml
cocoon/trunk/src/blocks/template/test/org/apache/cocoon/template/jxtg/jxMacro.xml
Modified:
cocoon/trunk/src/blocks/template/java/org/apache/cocoon/template/jxtg/JXTemplateGenerator.java
URL:
http://svn.apache.org/viewcvs/cocoon/trunk/src/blocks/template/java/org/apache/cocoon/template/jxtg/JXTemplateGenerator.java?view=diffr1=155339r2=155340
==
---
cocoon/trunk/src/blocks/template/java/org/apache/cocoon/template/jxtg/JXTemplateGenerator.java
(original)
+++
cocoon
svn commit: r155341 - cocoon/trunk/src/blocks/template/test/org/apache/cocoon/template/jxtg/JXTemplateGeneratorTestCase.java
Author: lgawron
Date: Fri Feb 25 08:20:45 2005
New Revision: 155341
URL: http://svn.apache.org/viewcvs?view=revrev=155341
Log:
forgot to remove debug statements
Modified:
cocoon/trunk/src/blocks/template/test/org/apache/cocoon/template/jxtg/JXTemplateGeneratorTestCase.java
Modified:
cocoon/trunk/src/blocks/template/test/org/apache/cocoon/template/jxtg/JXTemplateGeneratorTestCase.java
URL:
http://svn.apache.org/viewcvs/cocoon/trunk/src/blocks/template/test/org/apache/cocoon/template/jxtg/JXTemplateGeneratorTestCase.java?view=diffr1=155340r2=155341
==
---
cocoon/trunk/src/blocks/template/test/org/apache/cocoon/template/jxtg/JXTemplateGeneratorTestCase.java
(original)
+++
cocoon/trunk/src/blocks/template/test/org/apache/cocoon/template/jxtg/JXTemplateGeneratorTestCase.java
Fri Feb 25 08:20:45 2005
@@ -23,8 +23,6 @@
import org.apache.avalon.framework.parameters.Parameters;
import org.apache.cocoon.SitemapComponentTestCase;
import org.apache.cocoon.components.flow.FlowHelper;
-import org.apache.cocoon.xml.XMLUtils;
-import org.w3c.dom.Document;
public class JXTemplateGeneratorTestCase extends SitemapComponentTestCase {
private Logger logger = new ConsoleLogger(ConsoleLogger.LEVEL_WARN);
@@ -108,19 +106,15 @@
String inputURI = docBase + jxMacro.xml;
String outputURI = docBase + jxMacro-output.xml;
-Document expected = load(outputURI);
-getLogger().error( XMLUtils.serializeNode( expected ) );
-Document actual = generate(JX, inputURI, EMPTY_PARAMS);
-getLogger().error( XMLUtils.serializeNode( actual ) );
-assertEqual( expected, actual );
+assertEqual( load(outputURI), generate(JX, inputURI, EMPTY_PARAMS) );
}
-//public void testJXDynamicMacro() throws Exception {
-//String inputURI = docBase + jxDynamicMacro.xml;
-//String outputURI = docBase + jxDynamicMacro-output.xml;
-//
-//assertEqual(load(outputURI), generate(JX, inputURI, EMPTY_PARAMS));
-//}
+public void testJXDynamicMacro() throws Exception {
+String inputURI = docBase + jxDynamicMacro.xml;
+String outputURI = docBase + jxDynamicMacro-output.xml;
+
+assertEqual(load(outputURI), generate(JX, inputURI, EMPTY_PARAMS));
+}
public void testJXSet() throws Exception {
String inputURI = docBase + jxSet.xml;
svn commit: r155186 - in cocoon/trunk/src/blocks/template/java/org/apache/cocoon/template/jxtg: instruction/StartCall.java instruction/StartParameterInstance.java script/Invoker.java script/event/StartInstruction.java
Author: lgawron
Date: Thu Feb 24 06:11:29 2005
New Revision: 155186
URL: http://svn.apache.org/viewcvs?view=revrev=155186
Log:
Factor out macro calling to StartCall class. It is a little bit messy not but
will clear out as soon as it will also start to support jx:call macro=name
statement.
Added:
cocoon/trunk/src/blocks/template/java/org/apache/cocoon/template/jxtg/instruction/StartCall.java
(with props)
cocoon/trunk/src/blocks/template/java/org/apache/cocoon/template/jxtg/instruction/StartParameterInstance.java
(with props)
Modified:
cocoon/trunk/src/blocks/template/java/org/apache/cocoon/template/jxtg/script/Invoker.java
cocoon/trunk/src/blocks/template/java/org/apache/cocoon/template/jxtg/script/event/StartInstruction.java
Added:
cocoon/trunk/src/blocks/template/java/org/apache/cocoon/template/jxtg/instruction/StartCall.java
URL:
http://svn.apache.org/viewcvs/cocoon/trunk/src/blocks/template/java/org/apache/cocoon/template/jxtg/instruction/StartCall.java?view=autorev=155186
==
---
cocoon/trunk/src/blocks/template/java/org/apache/cocoon/template/jxtg/instruction/StartCall.java
(added)
+++
cocoon/trunk/src/blocks/template/java/org/apache/cocoon/template/jxtg/instruction/StartCall.java
Thu Feb 24 06:11:29 2005
@@ -0,0 +1,126 @@
+/*
+ * 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.
+ */
+package org.apache.cocoon.template.jxtg.instruction;
+
+import java.util.HashMap;
+import java.util.Iterator;
+import java.util.Map;
+import java.util.Stack;
+
+import org.apache.cocoon.components.expression.ExpressionContext;
+import org.apache.cocoon.template.jxtg.environment.ExecutionContext;
+import org.apache.cocoon.template.jxtg.script.Invoker;
+import org.apache.cocoon.template.jxtg.script.event.AttributeEvent;
+import org.apache.cocoon.template.jxtg.script.event.Event;
+import org.apache.cocoon.template.jxtg.script.event.StartElement;
+import org.apache.cocoon.template.jxtg.script.event.StartInstruction;
+import org.apache.cocoon.xml.XMLConsumer;
+import org.xml.sax.Attributes;
+import org.xml.sax.SAXException;
+
+public class StartCall extends StartInstruction {
+//private JXTExpression macroName;
+private Map parameters;
+private StartElement body;
+private StartDefine definition;
+
+public StartCall(StartDefine definition, StartElement body)
+throws SAXException {
+super(body.getLocation());
+this.parameters = new HashMap();
+setBody(body);
+setDefinition(definition);
+
+Iterator i = this.body.getAttributeEvents().iterator();
+while (i.hasNext()) {
+AttributeEvent attrEvent = (AttributeEvent) i.next();
+addParameterInstance(attrEvent);
+}
+}
+
+public StartCall(StartElement raw, Attributes attrs, Stack stack)
+throws SAXException {
+super(raw);
+//Locator locator = getLocation();
+//String name = attrs.getValue(macro);
+//if (name == null) {
+//throw new SAXParseException(if: \test\ is required, locator,
+//null);
+//}
+//this.macroName = JXTExpression.compileExpr(name, call: \macro\: ,
+//locator);
+this.parameters = new HashMap();
+}
+
+public void setDefinition(StartDefine definition) {
+this.definition = definition;
+setEndInstruction(definition.getEndInstruction());
+}
+
+public void addParameterInstance(AttributeEvent attributeEvent)
+throws SAXException {
+StartParameterInstance parameter = new StartParameterInstance(
+attributeEvent);
+this.parameters.put(parameter.getName(), parameter);
+}
+
+public Event execute(XMLConsumer consumer,
+ExpressionContext expressionContext,
+ExecutionContext executionContext, StartElement macroCall,
+Event startEvent, Event endEvent) throws SAXException {
+Map attributeMap = new HashMap();
+Iterator i = parameters.keySet().iterator();
+while (i.hasNext()) {
+String parameterName = (String) i.next();
+StartParameterInstance parameter = (StartParameterInstance)
parameters
+.get(parameterName);
+Object parameterValue = parameter.getValue(expressionContext
svn commit: r155189 - in cocoon/trunk/src/blocks/template/java/org/apache/cocoon/template/jxtg: instruction/StartDefine.java script/Parser.java script/event/StartInstruction.java
Author: lgawron
Date: Thu Feb 24 06:56:13 2005
New Revision: 155189
URL: http://svn.apache.org/viewcvs?view=revrev=155189
Log:
every instruction is being notified of end of parsing. No more Parser
dependency on StartDefine.
We can introduce configurable tag set now.
Modified:
cocoon/trunk/src/blocks/template/java/org/apache/cocoon/template/jxtg/instruction/StartDefine.java
cocoon/trunk/src/blocks/template/java/org/apache/cocoon/template/jxtg/script/Parser.java
cocoon/trunk/src/blocks/template/java/org/apache/cocoon/template/jxtg/script/event/StartInstruction.java
Modified:
cocoon/trunk/src/blocks/template/java/org/apache/cocoon/template/jxtg/instruction/StartDefine.java
URL:
http://svn.apache.org/viewcvs/cocoon/trunk/src/blocks/template/java/org/apache/cocoon/template/jxtg/instruction/StartDefine.java?view=diffr1=155188r2=155189
==
---
cocoon/trunk/src/blocks/template/java/org/apache/cocoon/template/jxtg/instruction/StartDefine.java
(original)
+++
cocoon/trunk/src/blocks/template/java/org/apache/cocoon/template/jxtg/instruction/StartDefine.java
Thu Feb 24 06:56:13 2005
@@ -69,7 +69,7 @@
return getEndInstruction().getNext();
}
-public void finish() throws SAXException {
+public void endNotify() throws SAXException {
Event e = next;
boolean params = true;
while (e != this.getEndInstruction()) {
Modified:
cocoon/trunk/src/blocks/template/java/org/apache/cocoon/template/jxtg/script/Parser.java
URL:
http://svn.apache.org/viewcvs/cocoon/trunk/src/blocks/template/java/org/apache/cocoon/template/jxtg/script/Parser.java?view=diffr1=155188r2=155189
==
---
cocoon/trunk/src/blocks/template/java/org/apache/cocoon/template/jxtg/script/Parser.java
(original)
+++
cocoon/trunk/src/blocks/template/java/org/apache/cocoon/template/jxtg/script/Parser.java
Thu Feb 24 06:56:13 2005
@@ -127,15 +127,13 @@
EndInstruction endInstruction = new EndInstruction(locator,
startInstruction);
newEvent = endInstruction;
+addEvent(newEvent);
+startInstruction.endNotify();
} else {
StartElement startElement = (StartElement) start;
newEvent = new EndElement(locator, startElement);
startElement.setEndElement((EndElement) newEvent);
-}
-addEvent(newEvent);
-if (start instanceof StartDefine) {
-StartDefine startDefine = (StartDefine) start;
-startDefine.finish();
+addEvent(newEvent);
}
}
Modified:
cocoon/trunk/src/blocks/template/java/org/apache/cocoon/template/jxtg/script/event/StartInstruction.java
URL:
http://svn.apache.org/viewcvs/cocoon/trunk/src/blocks/template/java/org/apache/cocoon/template/jxtg/script/event/StartInstruction.java?view=diffr1=155188r2=155189
==
---
cocoon/trunk/src/blocks/template/java/org/apache/cocoon/template/jxtg/script/event/StartInstruction.java
(original)
+++
cocoon/trunk/src/blocks/template/java/org/apache/cocoon/template/jxtg/script/event/StartInstruction.java
Thu Feb 24 06:56:13 2005
@@ -16,6 +16,7 @@
package org.apache.cocoon.template.jxtg.script.event;
import org.xml.sax.Locator;
+import org.xml.sax.SAXException;
public abstract class StartInstruction extends Event {
public StartInstruction(Locator locator) {
@@ -37,5 +38,9 @@
public void setEndInstruction(EndInstruction endInstruction) {
this.endInstruction = endInstruction;
+}
+
+public void endNotify() throws SAXException {
+return;
}
}
svn commit: r155191 - cocoon/trunk/src/blocks/template/java/org/apache/cocoon/template/jxtg/script/Parser.java
Author: lgawron
Date: Thu Feb 24 07:52:36 2005
New Revision: 155191
URL: http://svn.apache.org/viewcvs?view=revrev=155191
Log:
no more if/else if on instruction creation
Modified:
cocoon/trunk/src/blocks/template/java/org/apache/cocoon/template/jxtg/script/Parser.java
Modified:
cocoon/trunk/src/blocks/template/java/org/apache/cocoon/template/jxtg/script/Parser.java
URL:
http://svn.apache.org/viewcvs/cocoon/trunk/src/blocks/template/java/org/apache/cocoon/template/jxtg/script/Parser.java?view=diffr1=155190r2=155191
==
---
cocoon/trunk/src/blocks/template/java/org/apache/cocoon/template/jxtg/script/Parser.java
(original)
+++
cocoon/trunk/src/blocks/template/java/org/apache/cocoon/template/jxtg/script/Parser.java
Thu Feb 24 07:52:36 2005
@@ -15,6 +15,9 @@
*/
package org.apache.cocoon.template.jxtg.script;
+import java.lang.reflect.Constructor;
+import java.util.HashMap;
+import java.util.Map;
import java.util.Stack;
import org.apache.cocoon.template.jxtg.JXTemplateGenerator;
@@ -40,25 +43,46 @@
Locator charLocation;
StringBuffer charBuf;
-final static String TEMPLATE = template;
-final static String FOR_EACH = forEach;
-final static String IF = if;
-final static String CHOOSE = choose;
-final static String WHEN = when;
-final static String OTHERWISE = otherwise;
-final static String OUT = out;
-final static String IMPORT = import;
-final static String SET = set;
-final static String MACRO = macro;
-final static String EVALBODY = evalBody;
-final static String EVAL = eval;
-final static String PARAMETER = parameter;
-final static String FORMAT_NUMBER = formatNumber;
-final static String FORMAT_DATE = formatDate;
-final static String COMMENT = comment;
+final static Map instructions = new HashMap();
+final static Class[] parametersClasses = new Class[] { StartElement.class,
+Attributes.class, Stack.class };
public static final Locator NULL_LOCATOR = new LocatorImpl();
+static {
+try {
+registerInstruction(template, StartTemplate.class.getName());
+registerInstruction(forEach, StartForEach.class.getName());
+registerInstruction(if, StartIf.class.getName());
+registerInstruction(choose, StartChoose.class.getName());
+registerInstruction(when, StartWhen.class.getName());
+registerInstruction(otherwise, StartOtherwise.class.getName());
+registerInstruction(out, StartOut.class.getName());
+registerInstruction(import, StartImport.class.getName());
+registerInstruction(set, StartSet.class.getName());
+registerInstruction(macro, StartDefine.class.getName());
+registerInstruction(evalBody, StartEvalBody.class.getName());
+registerInstruction(eval, StartEval.class.getName());
+registerInstruction(parameter, StartParameter.class.getName());
+registerInstruction(formatNumber, StartFormatNumber.class
+.getName());
+registerInstruction(formatDate, StartFormatDate.class.getName());
+registerInstruction(comment, StartComment.class.getName());
+} catch (Exception e) {
+// we'll do something more professional with that when the
configuration moves
+// to the sitemap
+e.printStackTrace();
+}
+}
+
+public static void registerInstruction(String instructionName,
+String className) throws ClassNotFoundException, SecurityException,
+NoSuchMethodException {
+Class clazz = Class.forName(className);
+Constructor constructor = clazz.getConstructor(parametersClasses);
+instructions.put(instructionName, constructor);
+}
+
public Parser() {
// EMPTY
}
@@ -106,7 +130,8 @@
throws SAXException {
if (charBuf == null) {
charBuf = new StringBuffer(length);
-charLocation = locator != null ? new LocatorImpl(locator) :
NULL_LOCATOR;
+charLocation = locator != null ? new LocatorImpl(locator)
+: NULL_LOCATOR;
}
charBuf.append(ch, start, length);
}
@@ -179,48 +204,26 @@
if (StringUtils.equals(attributeURI, JXTemplateGenerator.NS)) {
getStartEvent().getTemplateProperties().put(
elementAttributes.getLocalName(i),
-
JXTExpression.compileExpr(elementAttributes.getValue(i), null,
- locator));
+JXTExpression.compileExpr(
+elementAttributes.getValue(i), null, locator));
elementAttributes.removeAttribute(i--);
}
}
StartElement startElement = new StartElement(locator, namespaceURI
svn commit: r155193 - cocoon/trunk/src/blocks/template/java/org/apache/cocoon/template/jxtg/script/Parser.java
Author: lgawron
Date: Thu Feb 24 07:58:56 2005
New Revision: 155193
URL: http://svn.apache.org/viewcvs?view=revrev=155193
Log:
banned 'tag' word :)
Modified:
cocoon/trunk/src/blocks/template/java/org/apache/cocoon/template/jxtg/script/Parser.java
Modified:
cocoon/trunk/src/blocks/template/java/org/apache/cocoon/template/jxtg/script/Parser.java
URL:
http://svn.apache.org/viewcvs/cocoon/trunk/src/blocks/template/java/org/apache/cocoon/template/jxtg/script/Parser.java?view=diffr1=155192r2=155193
==
---
cocoon/trunk/src/blocks/template/java/org/apache/cocoon/template/jxtg/script/Parser.java
(original)
+++
cocoon/trunk/src/blocks/template/java/org/apache/cocoon/template/jxtg/script/Parser.java
Thu Feb 24 07:58:56 2005
@@ -214,7 +214,7 @@
if (JXTemplateGenerator.NS.equals(namespaceURI)) {
Constructor constructor = (Constructor)
instructions.get(localName);
if (constructor == null) {
-throw new SAXParseException(unrecognized tag: + localName,
+throw new SAXParseException(unrecognized instruction: +
localName,
locator, null);
}
svn commit: r155006 - in cocoon/trunk/src: blocks/template/java/org/apache/cocoon/environment/FlowObjectModelHelper.java blocks/template/java/org/apache/cocoon/template/jxtg/script/event/Event.java java/org/apache/cocoon/environment/TemplateObjectModelHelper.java
Author: lgawron
Date: Wed Feb 23 05:28:04 2005
New Revision: 155006
URL: http://svn.apache.org/viewcvs?view=revrev=155006
Log:
add TemplateObjectModelHelper.addJavaPackages so the object model is not messed
with NativeJavaPackages by default
Modified:
cocoon/trunk/src/blocks/template/java/org/apache/cocoon/environment/FlowObjectModelHelper.java
cocoon/trunk/src/blocks/template/java/org/apache/cocoon/template/jxtg/script/event/Event.java
cocoon/trunk/src/java/org/apache/cocoon/environment/TemplateObjectModelHelper.java
Modified:
cocoon/trunk/src/blocks/template/java/org/apache/cocoon/environment/FlowObjectModelHelper.java
URL:
http://svn.apache.org/viewcvs/cocoon/trunk/src/blocks/template/java/org/apache/cocoon/environment/FlowObjectModelHelper.java?view=diffr1=155005r2=155006
==
---
cocoon/trunk/src/blocks/template/java/org/apache/cocoon/environment/FlowObjectModelHelper.java
(original)
+++
cocoon/trunk/src/blocks/template/java/org/apache/cocoon/environment/FlowObjectModelHelper.java
Wed Feb 23 05:28:04 2005
@@ -36,7 +36,9 @@
public static ExpressionContext getFOMExpressionContext(final Map
objectModel,
final Parameters
parameters) {
ExpressionContext context = new ExpressionContext();
-
context.setVars((Map)TemplateObjectModelHelper.getTemplateObjectModel(objectModel,
parameters));
+Map expressionContext =
(Map)TemplateObjectModelHelper.getTemplateObjectModel(objectModel, parameters);
+expressionContext = (Map) TemplateObjectModelHelper.addJavaPackages(
expressionContext );
+context.setVars( expressionContext );
context.setContextBean(FlowHelper.getContextObject(objectModel));
return context;
Modified:
cocoon/trunk/src/blocks/template/java/org/apache/cocoon/template/jxtg/script/event/Event.java
URL:
http://svn.apache.org/viewcvs/cocoon/trunk/src/blocks/template/java/org/apache/cocoon/template/jxtg/script/event/Event.java?view=diffr1=155005r2=155006
==
---
cocoon/trunk/src/blocks/template/java/org/apache/cocoon/template/jxtg/script/event/Event.java
(original)
+++
cocoon/trunk/src/blocks/template/java/org/apache/cocoon/template/jxtg/script/event/Event.java
Wed Feb 23 05:28:04 2005
@@ -15,7 +15,11 @@
*/
package org.apache.cocoon.template.jxtg.script.event;
+import org.apache.cocoon.components.expression.ExpressionContext;
+import org.apache.cocoon.template.jxtg.environment.ExecutionContext;
+import org.apache.cocoon.xml.XMLConsumer;
import org.xml.sax.Locator;
+import org.xml.sax.SAXException;
import org.xml.sax.helpers.LocatorImpl;
public class Event {
@@ -52,5 +56,13 @@
buf.append(. + col);
}
return buf.toString();
+}
+
+public Event execute(final XMLConsumer consumer,
+ ExpressionContext expressionContext,
+ ExecutionContext executionContext,
+ StartElement macroCall, Event startEvent, Event
endEvent)
+throws SAXException {
+return getNext();
}
}
Modified:
cocoon/trunk/src/java/org/apache/cocoon/environment/TemplateObjectModelHelper.java
URL:
http://svn.apache.org/viewcvs/cocoon/trunk/src/java/org/apache/cocoon/environment/TemplateObjectModelHelper.java?view=diffr1=155005r2=155006
==
---
cocoon/trunk/src/java/org/apache/cocoon/environment/TemplateObjectModelHelper.java
(original)
+++
cocoon/trunk/src/java/org/apache/cocoon/environment/TemplateObjectModelHelper.java
Wed Feb 23 05:28:04 2005
@@ -134,12 +134,21 @@
fillContext(contextObject, map);
}
+return map;
+}
+
+/**
+ * Add java packages to object model. Allows to construct java objects.
+ * @param objectModel usually the result of invoking getTemplateObjectModel
+ */
+public static Object addJavaPackages( Map objectModel ) {
Object javaPkg = FOM_JavaScriptFlowHelper.getJavaPackage(objectModel);
Object pkgs = FOM_JavaScriptFlowHelper.getPackages(objectModel);
+// packages might have already been set up if flowscript is being used
if ( javaPkg != null pkgs != null ) {
-map.put( Packages, javaPkg );
-map.put( java, pkgs );
+objectModel.put( Packages, javaPkg );
+objectModel.put( java, pkgs );
} else {
Context cx = Context.enter();
try {
@@ -152,13 +161,12 @@
newPackages.setParentScope( scope );
newPackages.setPrototype( ScriptableObject.getClassPrototype(
scope,
JAVA_PACKAGE ) );
-map.put
svn commit: r155007 - cocoon/trunk/src/blocks/template/java/org/apache/cocoon/template/jxtg/script/event/Event.java
Author: lgawron
Date: Wed Feb 23 05:30:23 2005
New Revision: 155007
URL: http://svn.apache.org/viewcvs?view=revrev=155007
Log:
mistake
Modified:
cocoon/trunk/src/blocks/template/java/org/apache/cocoon/template/jxtg/script/event/Event.java
Modified:
cocoon/trunk/src/blocks/template/java/org/apache/cocoon/template/jxtg/script/event/Event.java
URL:
http://svn.apache.org/viewcvs/cocoon/trunk/src/blocks/template/java/org/apache/cocoon/template/jxtg/script/event/Event.java?view=diffr1=155006r2=155007
==
---
cocoon/trunk/src/blocks/template/java/org/apache/cocoon/template/jxtg/script/event/Event.java
(original)
+++
cocoon/trunk/src/blocks/template/java/org/apache/cocoon/template/jxtg/script/event/Event.java
Wed Feb 23 05:30:23 2005
@@ -57,12 +57,4 @@
}
return buf.toString();
}
-
-public Event execute(final XMLConsumer consumer,
- ExpressionContext expressionContext,
- ExecutionContext executionContext,
- StartElement macroCall, Event startEvent, Event
endEvent)
-throws SAXException {
-return getNext();
-}
}
svn commit: r155016 - in cocoon/trunk/src/blocks/template/java/org/apache/cocoon: environment/ template/jxtg/expression/ template/jxtg/instruction/ template/jxtg/script/ template/jxtg/script/event/
Author: lgawron
Date: Wed Feb 23 06:41:48 2005
New Revision: 155016
URL: http://svn.apache.org/viewcvs?view=revrev=155016
Log:
breaking down o.a.c.template.jxtg.script.Invoker
Modified:
cocoon/trunk/src/blocks/template/java/org/apache/cocoon/environment/FlowObjectModelHelper.java
cocoon/trunk/src/blocks/template/java/org/apache/cocoon/template/jxtg/expression/Substitutions.java
cocoon/trunk/src/blocks/template/java/org/apache/cocoon/template/jxtg/instruction/StartFormatNumber.java
cocoon/trunk/src/blocks/template/java/org/apache/cocoon/template/jxtg/instruction/StartImport.java
cocoon/trunk/src/blocks/template/java/org/apache/cocoon/template/jxtg/instruction/StartOut.java
cocoon/trunk/src/blocks/template/java/org/apache/cocoon/template/jxtg/instruction/StartSet.java
cocoon/trunk/src/blocks/template/java/org/apache/cocoon/template/jxtg/script/Invoker.java
cocoon/trunk/src/blocks/template/java/org/apache/cocoon/template/jxtg/script/event/Characters.java
cocoon/trunk/src/blocks/template/java/org/apache/cocoon/template/jxtg/script/event/EndCDATA.java
cocoon/trunk/src/blocks/template/java/org/apache/cocoon/template/jxtg/script/event/EndDTD.java
cocoon/trunk/src/blocks/template/java/org/apache/cocoon/template/jxtg/script/event/EndDocument.java
cocoon/trunk/src/blocks/template/java/org/apache/cocoon/template/jxtg/script/event/EndElement.java
cocoon/trunk/src/blocks/template/java/org/apache/cocoon/template/jxtg/script/event/EndEntity.java
cocoon/trunk/src/blocks/template/java/org/apache/cocoon/template/jxtg/script/event/EndPrefixMapping.java
cocoon/trunk/src/blocks/template/java/org/apache/cocoon/template/jxtg/script/event/Event.java
cocoon/trunk/src/blocks/template/java/org/apache/cocoon/template/jxtg/script/event/IgnorableWhitespace.java
cocoon/trunk/src/blocks/template/java/org/apache/cocoon/template/jxtg/script/event/ProcessingInstruction.java
cocoon/trunk/src/blocks/template/java/org/apache/cocoon/template/jxtg/script/event/SkippedEntity.java
cocoon/trunk/src/blocks/template/java/org/apache/cocoon/template/jxtg/script/event/StartCDATA.java
cocoon/trunk/src/blocks/template/java/org/apache/cocoon/template/jxtg/script/event/StartDTD.java
cocoon/trunk/src/blocks/template/java/org/apache/cocoon/template/jxtg/script/event/StartDocument.java
cocoon/trunk/src/blocks/template/java/org/apache/cocoon/template/jxtg/script/event/StartElement.java
cocoon/trunk/src/blocks/template/java/org/apache/cocoon/template/jxtg/script/event/StartEntity.java
cocoon/trunk/src/blocks/template/java/org/apache/cocoon/template/jxtg/script/event/StartInstruction.java
cocoon/trunk/src/blocks/template/java/org/apache/cocoon/template/jxtg/script/event/StartPrefixMapping.java
cocoon/trunk/src/blocks/template/java/org/apache/cocoon/template/jxtg/script/event/TextEvent.java
Modified:
cocoon/trunk/src/blocks/template/java/org/apache/cocoon/environment/FlowObjectModelHelper.java
URL:
http://svn.apache.org/viewcvs/cocoon/trunk/src/blocks/template/java/org/apache/cocoon/environment/FlowObjectModelHelper.java?view=diffr1=155015r2=155016
==
---
cocoon/trunk/src/blocks/template/java/org/apache/cocoon/environment/FlowObjectModelHelper.java
(original)
+++
cocoon/trunk/src/blocks/template/java/org/apache/cocoon/environment/FlowObjectModelHelper.java
Wed Feb 23 06:41:48 2005
@@ -20,7 +20,6 @@
import org.apache.avalon.framework.parameters.Parameters;
import org.apache.cocoon.components.expression.ExpressionContext;
import org.apache.cocoon.components.flow.FlowHelper;
-import org.apache.cocoon.environment.TemplateObjectModelHelper;
/**
Modified:
cocoon/trunk/src/blocks/template/java/org/apache/cocoon/template/jxtg/expression/Substitutions.java
URL:
http://svn.apache.org/viewcvs/cocoon/trunk/src/blocks/template/java/org/apache/cocoon/template/jxtg/expression/Substitutions.java?view=diffr1=155015r2=155016
==
---
cocoon/trunk/src/blocks/template/java/org/apache/cocoon/template/jxtg/expression/Substitutions.java
(original)
+++
cocoon/trunk/src/blocks/template/java/org/apache/cocoon/template/jxtg/expression/Substitutions.java
Wed Feb 23 06:41:48 2005
@@ -29,8 +29,6 @@
import org.xml.sax.SAXException;
import org.xml.sax.SAXParseException;
-import org.apache.cocoon.template.jxtg.environment.ErrorHolder;
-
public class Substitutions {
final private List substitutions;
Modified:
cocoon/trunk/src/blocks/template/java/org/apache/cocoon/template/jxtg/instruction/StartFormatNumber.java
URL:
http://svn.apache.org/viewcvs/cocoon/trunk/src/blocks/template/java/org/apache/cocoon/template/jxtg/instruction/StartFormatNumber.java?view=diffr1=155015r2=155016
==
---
cocoon/trunk/src/blocks
svn commit: r154841 - in cocoon/trunk/src: blocks/template/java/org/apache/cocoon/components/expression/jexl/JexlExpression.java blocks/template/test/org/apache/cocoon/template/jxtg/JXTemplateGeneratorTestCase.java java/org/apache/cocoon/environment/TemplateObjectModelHelper.java
Author: lgawron
Date: Tue Feb 22 05:01:08 2005
New Revision: 154841
URL: http://svn.apache.org/viewcvs?view=revrev=154841
Log:
turns out that that jx:set var=tags value=${java.util.HashMap()}/ worked
not due to Jexl mechanisms
but due to Rhino features (AFAIU NativeJavaClass executed as function with some
parameters passed returned an appropriate object)
In order to keep backward functionality NativeJavaPackage has to be registered
as property of template object model.
Modified:
cocoon/trunk/src/blocks/template/java/org/apache/cocoon/components/expression/jexl/JexlExpression.java
cocoon/trunk/src/blocks/template/test/org/apache/cocoon/template/jxtg/JXTemplateGeneratorTestCase.java
cocoon/trunk/src/java/org/apache/cocoon/environment/TemplateObjectModelHelper.java
Modified:
cocoon/trunk/src/blocks/template/java/org/apache/cocoon/components/expression/jexl/JexlExpression.java
URL:
http://svn.apache.org/viewcvs/cocoon/trunk/src/blocks/template/java/org/apache/cocoon/components/expression/jexl/JexlExpression.java?view=diffr1=154840r2=154841
==
---
cocoon/trunk/src/blocks/template/java/org/apache/cocoon/components/expression/jexl/JexlExpression.java
(original)
+++
cocoon/trunk/src/blocks/template/java/org/apache/cocoon/components/expression/jexl/JexlExpression.java
Tue Feb 22 05:01:08 2005
@@ -19,13 +19,12 @@
import java.util.Iterator;
import java.util.Map;
-import org.apache.commons.jexl.JexlContext;
-import org.apache.commons.jexl.util.Introspector;
-import org.apache.commons.jexl.util.introspection.Info;
import org.apache.cocoon.components.expression.Expression;
-import org.apache.cocoon.components.expression.ExpressionCompiler;
import org.apache.cocoon.components.expression.ExpressionContext;
import org.apache.cocoon.components.expression.ExpressionException;
+import org.apache.commons.jexl.JexlContext;
+import org.apache.commons.jexl.util.Introspector;
+import org.apache.commons.jexl.util.introspection.Info;
public class JexlExpression implements Expression {
Modified:
cocoon/trunk/src/blocks/template/test/org/apache/cocoon/template/jxtg/JXTemplateGeneratorTestCase.java
URL:
http://svn.apache.org/viewcvs/cocoon/trunk/src/blocks/template/test/org/apache/cocoon/template/jxtg/JXTemplateGeneratorTestCase.java?view=diffr1=154840r2=154841
==
---
cocoon/trunk/src/blocks/template/test/org/apache/cocoon/template/jxtg/JXTemplateGeneratorTestCase.java
(original)
+++
cocoon/trunk/src/blocks/template/test/org/apache/cocoon/template/jxtg/JXTemplateGeneratorTestCase.java
Tue Feb 22 05:01:08 2005
@@ -21,8 +21,8 @@
import org.apache.avalon.framework.logger.ConsoleLogger;
import org.apache.avalon.framework.logger.Logger;
import org.apache.avalon.framework.parameters.Parameters;
-import org.apache.cocoon.components.flow.FlowHelper;
import org.apache.cocoon.SitemapComponentTestCase;
+import org.apache.cocoon.components.flow.FlowHelper;
public class JXTemplateGeneratorTestCase extends SitemapComponentTestCase {
private Logger logger = new ConsoleLogger(ConsoleLogger.LEVEL_WARN);
Modified:
cocoon/trunk/src/java/org/apache/cocoon/environment/TemplateObjectModelHelper.java
URL:
http://svn.apache.org/viewcvs/cocoon/trunk/src/java/org/apache/cocoon/environment/TemplateObjectModelHelper.java?view=diffr1=154840r2=154841
==
---
cocoon/trunk/src/java/org/apache/cocoon/environment/TemplateObjectModelHelper.java
(original)
+++
cocoon/trunk/src/java/org/apache/cocoon/environment/TemplateObjectModelHelper.java
Tue Feb 22 05:01:08 2005
@@ -22,9 +22,14 @@
import org.apache.avalon.framework.parameters.Parameters;
import org.apache.cocoon.components.flow.FlowHelper;
+import
org.apache.cocoon.components.flow.javascript.fom.FOM_JavaScriptFlowHelper;
import org.apache.commons.jxpath.DynamicPropertyHandler;
import org.apache.commons.jxpath.JXPathBeanInfo;
import org.apache.commons.jxpath.JXPathIntrospector;
+import org.mozilla.javascript.Context;
+import org.mozilla.javascript.NativeJavaPackage;
+import org.mozilla.javascript.Scriptable;
+import org.mozilla.javascript.ScriptableObject;
/**
@@ -129,6 +134,30 @@
fillContext(contextObject, map);
}
+Object javaPkg = FOM_JavaScriptFlowHelper.getJavaPackage(objectModel);
+Object pkgs = FOM_JavaScriptFlowHelper.getPackages(objectModel);
+
+if ( javaPkg != null pkgs != null ) {
+map.put( Packages, javaPkg );
+map.put( java, pkgs );
+} else {
+Context cx = Context.enter();
+try {
+//FIXME: we surely need to share the scope as this operation
is time consuming
+Scriptable scope = cx.initStandardObjects();
+
+final String JAVA_PACKAGE
svn commit: r148891 - /cocoon/branches/BRANCH_2_1_X/tools/targets/compile-build.xml
Author: lgawron
Date: Fri Jan 28 06:57:38 2005
New Revision: 148891
URL: http://svn.apache.org/viewcvs?view=revrev=148891
Log:
cocoon-testcase.jar was missing ContainerTestCase class
Modified:
cocoon/branches/BRANCH_2_1_X/tools/targets/compile-build.xml
Modified: cocoon/branches/BRANCH_2_1_X/tools/targets/compile-build.xml
Url:
http://svn.apache.org/viewcvs/cocoon/branches/BRANCH_2_1_X/tools/targets/compile-build.xml?view=diffrev=148891p1=cocoon/branches/BRANCH_2_1_X/tools/targets/compile-build.xmlr1=148890p2=cocoon/branches/BRANCH_2_1_X/tools/targets/compile-build.xmlr2=148891
==
--- cocoon/branches/BRANCH_2_1_X/tools/targets/compile-build.xml
(original)
+++ cocoon/branches/BRANCH_2_1_X/tools/targets/compile-build.xmlFri Jan
28 06:57:38 2005
@@ -185,6 +185,7 @@
fileset dir=${build.test}
include name=org/apache/cocoon/environment/mock/*/
include
name=org/apache/cocoon/components/source/SourceResolverAdapter*/
+include name=org/apache/cocoon/core/container/ContainerTestCase*/
include name=org/apache/cocoon/SitemapComponentTestCase*/
include name=org/apache/cocoon/xml/WhitespaceFilter*/
/fileset
svn commit: r111713 - /cocoon/trunk/src/blocks/template/java/org/apache/cocoon/template/jxtg/environment/ExecutionContext.java /cocoon/trunk/src/blocks/template/java/org/apache/cocoon/template/jxtg/script/Invoker.java
Author: lgawron
Date: Mon Dec 13 06:04:36 2004
New Revision: 111713
URL: http://svn.apache.org/viewcvs?view=revrev=111713
Log:
svn:eol-style native, svn:keywords Id
Modified:
cocoon/trunk/src/blocks/template/java/org/apache/cocoon/template/jxtg/environment/ExecutionContext.java
(contents, props changed)
cocoon/trunk/src/blocks/template/java/org/apache/cocoon/template/jxtg/script/Invoker.java
(contents, props changed)
Modified:
cocoon/trunk/src/blocks/template/java/org/apache/cocoon/template/jxtg/environment/ExecutionContext.java
Url:
http://svn.apache.org/viewcvs/cocoon/trunk/src/blocks/template/java/org/apache/cocoon/template/jxtg/environment/ExecutionContext.java?view=diffrev=111713p1=cocoon/trunk/src/blocks/template/java/org/apache/cocoon/template/jxtg/environment/ExecutionContext.javar1=111712p2=cocoon/trunk/src/blocks/template/java/org/apache/cocoon/template/jxtg/environment/ExecutionContext.javar2=111713
==
---
cocoon/trunk/src/blocks/template/java/org/apache/cocoon/template/jxtg/environment/ExecutionContext.java
(original)
+++
cocoon/trunk/src/blocks/template/java/org/apache/cocoon/template/jxtg/environment/ExecutionContext.java
Mon Dec 13 06:04:36 2004
@@ -1,74 +1,74 @@
-/*
- * 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.
- */
-package org.apache.cocoon.template.jxtg.environment;
-
-import java.util.Map;
-
-import org.apache.avalon.framework.service.ServiceManager;
-import org.apache.cocoon.template.jxtg.expression.MyJexlContext;
-import org.apache.commons.jxpath.JXPathContext;
-import org.apache.commons.jxpath.Variables;
-
-public class ExecutionContext {
-private MyJexlContext jexlContext;
-private JXPathContext jxpathContext;
-private Variables variables;
-private Map definitions;
-private Map cache;
-private ServiceManager manager;
-
-public ExecutionContext(MyJexlContext jexlContext, JXPathContext
jxpathContext,
-Variables variables, Map definitions, Map cache,
-ServiceManager manager) {
-this.jexlContext = jexlContext;
-this.jxpathContext = jxpathContext;
-this.variables = variables;
-this.definitions = definitions;
-this.cache = cache;
-this.manager = manager;
-}
-
-public MyJexlContext getJexlContext() {
-return this.jexlContext;
-}
-
-public JXPathContext getJXPathContext() {
-return this.jxpathContext;
-}
-
-public Variables getVariables() {
-return this.variables;
-}
-
-public Map getDefinitions() {
-return this.definitions;
-}
-
-public Map getCache() {
-return this.cache;
-}
-
-public ServiceManager getServiceManager() {
-return this.manager;
-}
-
-public ExecutionContext getChildContext(MyJexlContext jexlContext,
-JXPathContext jxpathContext) {
-return new ExecutionContext(jexlContext, jxpathContext,
-this.variables, this.definitions,
this.cache,
-this.manager);
-}
-}
+/*
+ * 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.
+ */
+package org.apache.cocoon.template.jxtg.environment;
+
+import java.util.Map;
+
+import org.apache.avalon.framework.service.ServiceManager;
+import org.apache.cocoon.template.jxtg.expression.MyJexlContext;
+import org.apache.commons.jxpath.JXPathContext;
+import org.apache.commons.jxpath.Variables;
+
+public class ExecutionContext {
+private MyJexlContext jexlContext;
+private JXPathContext jxpathContext;
+private Variables variables;
+private Map definitions;
+private Map cache;
+private ServiceManager manager;
+
+public ExecutionContext
svn commit: r111515 - /cocoon/trunk/src/java/org/apache/cocoon/components/flow/ContinuationsManagerImpl.java /cocoon/trunk/src/webapp/WEB-INF/cocoon.xconf
Author: lgawron
Date: Fri Dec 10 07:50:06 2004
New Revision: 111515
URL: http://svn.apache.org/viewcvs?view=revrev=111515
Log:
Remove support for sharing continuations between sitemaps. This is not a
feature - it is a bug.
Modified:
cocoon/trunk/src/java/org/apache/cocoon/components/flow/ContinuationsManagerImpl.java
cocoon/trunk/src/webapp/WEB-INF/cocoon.xconf
Modified:
cocoon/trunk/src/java/org/apache/cocoon/components/flow/ContinuationsManagerImpl.java
Url:
http://svn.apache.org/viewcvs/cocoon/trunk/src/java/org/apache/cocoon/components/flow/ContinuationsManagerImpl.java?view=diffrev=111515p1=cocoon/trunk/src/java/org/apache/cocoon/components/flow/ContinuationsManagerImpl.javar1=111514p2=cocoon/trunk/src/java/org/apache/cocoon/components/flow/ContinuationsManagerImpl.javar2=111515
==
---
cocoon/trunk/src/java/org/apache/cocoon/components/flow/ContinuationsManagerImpl.java
(original)
+++
cocoon/trunk/src/java/org/apache/cocoon/components/flow/ContinuationsManagerImpl.java
Fri Dec 10 07:50:06 2004
@@ -106,7 +106,6 @@
protected SortedSet expirations = Collections.synchronizedSortedSet(new
TreeSet());
private String instrumentableName;
-private boolean isContinuationSharingBugCompatible;
private boolean bindContinuationsToSession;
private ServiceManager serviceManager;
@@ -129,7 +128,6 @@
public void configure(Configuration config) {
this.defaultTimeToLive = config.getAttributeAsInteger(time-to-live,
(3600 * 1000));
-this.isContinuationSharingBugCompatible =
config.getAttributeAsBoolean(continuation-sharing-bug-compatible, false);
this.bindContinuationsToSession = config.getAttributeAsBoolean(
session-bound-continuations, false );
if (!this.bindContinuationsToSession)
this.continuationsHolder = new WebContinuationsHolder();
@@ -193,34 +191,42 @@
return null;
WebContinuation kont = (WebContinuation) continuationsHolder.get(id);
-if ( kont != null ) {
-boolean interpreterMatches =
kont.interpreterMatches(interpreterId);
-if (!interpreterMatches getLogger().isWarnEnabled()) {
-getLogger().warn(WK: Continuation ( + kont.getId()
- + ) lookup for wrong interpreter. Bound to:
- + kont.getInterpreterId() + , looked up for:
- + interpreterId);
-}
-return interpreterMatches || isContinuationSharingBugCompatible ?
kont : null;
+if (kont == null)
+return null;
+
+if (!kont.interpreterMatches(interpreterId)) {
+getLogger().error(
+WK: Continuation ( + kont.getId()
++ ) lookup for wrong interpreter. Bound to:
++ kont.getInterpreterId() + , looked up for:
++ interpreterId);
+return null;
}
-return null;
+return kont;
}
/**
- * Create codeWebContinuation/code and generate unique identifier
- * for it. The identifier is generated using a cryptographically strong
+ * Create codeWebContinuation/code and generate unique identifier for
+ * it. The identifier is generated using a cryptographically strong
* algorithm to prevent people to generate their own identifiers.
- *
- * pIt has the side effect of interning the continuation object in
- * the codeidToWebCont/code hash table.
- *
- * @param kont an codeObject/code value representing continuation
- * @param parent value representing parent codeWebContinuation/code
- * @param ttl codeWebContinuation/code time to live
- * @param interpreterId id of interpreter invoking continuation creation
- * @param disposer codeContinuationsDisposer/code instance to use for
- * cleanup of the continuation.
- * @return the generated codeWebContinuation/code with unique
identifier
+ *
+ * p
+ * It has the side effect of interning the continuation object in the
+ * codeidToWebCont/code hash table.
+ *
+ * @param kont
+ *an codeObject/code value representing continuation
+ * @param parent
+ *value representing parent codeWebContinuation/code
+ * @param ttl
+ *codeWebContinuation/code time to live
+ * @param interpreterId
+ *id of interpreter invoking continuation creation
+ * @param disposer
+ *codeContinuationsDisposer/code instance to use for
+ *cleanup of the continuation.
+ * @return the generated codeWebContinuation/code with unique
+ * identifier
*/
private WebContinuation generateContinuation(Object kont
svn commit: r111552 - /cocoon/trunk/src/blocks/template/java/org/apache/cocoon/template/jxtg/script/event/StartDefine.java /cocoon/trunk/src/blocks/template/java/org/apache/cocoon/template/jxtg/script/event/StartInstruction.java
Author: lgawron
Date: Fri Dec 10 14:40:29 2004
New Revision: 111552
URL: http://svn.apache.org/viewcvs?view=revrev=111552
Log:
use getter
Modified:
cocoon/trunk/src/blocks/template/java/org/apache/cocoon/template/jxtg/script/event/StartDefine.java
cocoon/trunk/src/blocks/template/java/org/apache/cocoon/template/jxtg/script/event/StartInstruction.java
Modified:
cocoon/trunk/src/blocks/template/java/org/apache/cocoon/template/jxtg/script/event/StartDefine.java
Url:
http://svn.apache.org/viewcvs/cocoon/trunk/src/blocks/template/java/org/apache/cocoon/template/jxtg/script/event/StartDefine.java?view=diffrev=111552p1=cocoon/trunk/src/blocks/template/java/org/apache/cocoon/template/jxtg/script/event/StartDefine.javar1=111551p2=cocoon/trunk/src/blocks/template/java/org/apache/cocoon/template/jxtg/script/event/StartDefine.javar2=111552
==
---
cocoon/trunk/src/blocks/template/java/org/apache/cocoon/template/jxtg/script/event/StartDefine.java
(original)
+++
cocoon/trunk/src/blocks/template/java/org/apache/cocoon/template/jxtg/script/event/StartDefine.java
Fri Dec 10 14:40:29 2004
@@ -39,7 +39,7 @@
public void finish() throws SAXException {
Event e = next;
boolean params = true;
-while (e != this.endInstruction) {
+while (e != this.getEndInstruction()) {
if (e instanceof StartParameter) {
StartParameter startParam = (StartParameter) e;
if (!params) {
@@ -53,7 +53,7 @@
throw new SAXParseException(duplicate parameter: \
+ startParam.name + \, location, null);
}
-e = startParam.endInstruction;
+e = startParam.getEndInstruction();
} else if (e instanceof IgnorableWhitespace) {
// EMPTY
} else if (e instanceof Characters) {
@@ -78,7 +78,7 @@
e = e.getNext();
}
if (this.getBody() == null) {
-this.setBody(this.endInstruction);
+this.setBody(this.getEndInstruction());
}
}
Modified:
cocoon/trunk/src/blocks/template/java/org/apache/cocoon/template/jxtg/script/event/StartInstruction.java
Url:
http://svn.apache.org/viewcvs/cocoon/trunk/src/blocks/template/java/org/apache/cocoon/template/jxtg/script/event/StartInstruction.java?view=diffrev=111552p1=cocoon/trunk/src/blocks/template/java/org/apache/cocoon/template/jxtg/script/event/StartInstruction.javar1=111551p2=cocoon/trunk/src/blocks/template/java/org/apache/cocoon/template/jxtg/script/event/StartInstruction.javar2=111552
==
---
cocoon/trunk/src/blocks/template/java/org/apache/cocoon/template/jxtg/script/event/StartInstruction.java
(original)
+++
cocoon/trunk/src/blocks/template/java/org/apache/cocoon/template/jxtg/script/event/StartInstruction.java
Fri Dec 10 14:40:29 2004
@@ -22,8 +22,8 @@
this.startElement = startElement;
}
-final StartElement startElement;
-EndInstruction endInstruction;
+private final StartElement startElement;
+private EndInstruction endInstruction;
public EndInstruction getEndInstruction() {
return endInstruction;
svn commit: r111553 - /cocoon/trunk/src/blocks/template/test/org/apache/cocoon/template/jxtg/JXTemplateGeneratorTestCase.java
Author: lgawron
Date: Fri Dec 10 14:41:53 2004
New Revision: 111553
URL: http://svn.apache.org/viewcvs?view=revrev=111553
Log:
use parameters instead of EMPTY_PARAMS
Modified:
cocoon/trunk/src/blocks/template/test/org/apache/cocoon/template/jxtg/JXTemplateGeneratorTestCase.java
Modified:
cocoon/trunk/src/blocks/template/test/org/apache/cocoon/template/jxtg/JXTemplateGeneratorTestCase.java
Url:
http://svn.apache.org/viewcvs/cocoon/trunk/src/blocks/template/test/org/apache/cocoon/template/jxtg/JXTemplateGeneratorTestCase.java?view=diffrev=111553p1=cocoon/trunk/src/blocks/template/test/org/apache/cocoon/template/jxtg/JXTemplateGeneratorTestCase.javar1=111552p2=cocoon/trunk/src/blocks/template/test/org/apache/cocoon/template/jxtg/JXTemplateGeneratorTestCase.javar2=111553
==
---
cocoon/trunk/src/blocks/template/test/org/apache/cocoon/template/jxtg/JXTemplateGeneratorTestCase.java
(original)
+++
cocoon/trunk/src/blocks/template/test/org/apache/cocoon/template/jxtg/JXTemplateGeneratorTestCase.java
Fri Dec 10 14:41:53 2004
@@ -45,7 +45,7 @@
Parameters parameters = new Parameters();
parameters.setParameter(test, foo);
-assertEqual(load(outputURI), generate(JX, inputURI, EMPTY_PARAMS));
+assertEqual(load(outputURI), generate(JX, inputURI, parameters));
}
public void testJexlEnvExpression() throws Exception {
@@ -57,7 +57,7 @@
Parameters parameters = new Parameters();
parameters.setParameter(test, foo);
-assertEqual(load(outputURI), generate(JX, inputURI, EMPTY_PARAMS));
+assertEqual(load(outputURI), generate(JX, inputURI, parameters));
}
public void testJXPathExpression() throws Exception {
@@ -66,7 +66,7 @@
Parameters parameters = new Parameters();
parameters.setParameter(test, foo);
-assertEqual(load(outputURI), generate(JX, inputURI, EMPTY_PARAMS));
+assertEqual(load(outputURI), generate(JX, inputURI, parameters));
}
public void testJXPathEnvExpression() throws Exception {
@@ -75,6 +75,6 @@
Parameters parameters = new Parameters();
parameters.setParameter(test, foo);
-assertEqual(load(outputURI), generate(JX, inputURI, EMPTY_PARAMS));
+assertEqual(load(outputURI), generate(JX, inputURI, parameters));
}
}
svn commit: r111363 - /cocoon/branches/BRANCH_2_1_X/src/webapp/WEB-INF/cocoon.xconf
Author: lgawron Date: Thu Dec 9 00:28:48 2004 New Revision: 111363 URL: http://svn.apache.org/viewcvs?view=revrev=111363 Log: remove BOM Modified: cocoon/branches/BRANCH_2_1_X/src/webapp/WEB-INF/cocoon.xconf Modified: cocoon/branches/BRANCH_2_1_X/src/webapp/WEB-INF/cocoon.xconf Url: http://svn.apache.org/viewcvs/cocoon/branches/BRANCH_2_1_X/src/webapp/WEB-INF/cocoon.xconf?view=diffrev=111363p1=cocoon/branches/BRANCH_2_1_X/src/webapp/WEB-INF/cocoon.xconfr1=111362p2=cocoon/branches/BRANCH_2_1_X/src/webapp/WEB-INF/cocoon.xconfr2=111363 == --- cocoon/branches/BRANCH_2_1_X/src/webapp/WEB-INF/cocoon.xconf (original) +++ cocoon/branches/BRANCH_2_1_X/src/webapp/WEB-INF/cocoon.xconfThu Dec 9 00:28:48 2004 @@ -1,4 +1,4 @@ -?xml version=1.0 encoding=UTF-8? +?xml version=1.0 encoding=UTF-8? !-- Copyright 1999-2004 The Apache Software Foundation
svn commit: r111375 - in cocoon/trunk/src/blocks/template: java/org/apache/cocoon/template/generation java/org/apache/cocoon/template/jxtg java/org/apache/cocoon/template/jxtg/environment java/org/apache/cocoon/template/jxtg/expression java/org/apache/cocoon/template/jxtg/script java/org/apache/cocoon/template/jxtg/script/event java/org/apache/cocoon/template/script java/org/apache/cocoon/template/tag java/org/apache/cocoon/template/v2 java/org/apache/cocoon/template/v2/generation java/org/apache/cocoon/template/v2/script java/org/apache/cocoon/template/v2/tag java/org/apache/cocoon/template/v2/tag/samples test/org/apache/cocoon/template/generation test/org/apache/cocoon/template/script
Author: lgawron Date: Thu Dec 9 04:38:49 2004 New Revision: 111375 URL: http://svn.apache.org/viewcvs?view=revrev=111375 Log: moved Jonas' template solution to o.a.c.template.v2 refactored JXTemplate generator introduced as o.a.c.template.jxtg.JXTemplateGenerator Added: cocoon/trunk/src/blocks/template/java/org/apache/cocoon/template/jxtg/ cocoon/trunk/src/blocks/template/java/org/apache/cocoon/template/jxtg/JXTemplateGenerator.java cocoon/trunk/src/blocks/template/java/org/apache/cocoon/template/jxtg/TransformerAdapter.java cocoon/trunk/src/blocks/template/java/org/apache/cocoon/template/jxtg/environment/ cocoon/trunk/src/blocks/template/java/org/apache/cocoon/template/jxtg/environment/ErrorHolder.java cocoon/trunk/src/blocks/template/java/org/apache/cocoon/template/jxtg/environment/JSIntrospector.java cocoon/trunk/src/blocks/template/java/org/apache/cocoon/template/jxtg/environment/JXCacheKey.java cocoon/trunk/src/blocks/template/java/org/apache/cocoon/template/jxtg/environment/JXSourceValidity.java cocoon/trunk/src/blocks/template/java/org/apache/cocoon/template/jxtg/environment/LocatorFacade.java cocoon/trunk/src/blocks/template/java/org/apache/cocoon/template/jxtg/environment/MyVariables.java cocoon/trunk/src/blocks/template/java/org/apache/cocoon/template/jxtg/environment/ValueHelper.java cocoon/trunk/src/blocks/template/java/org/apache/cocoon/template/jxtg/expression/ cocoon/trunk/src/blocks/template/java/org/apache/cocoon/template/jxtg/expression/JXTExpression.java cocoon/trunk/src/blocks/template/java/org/apache/cocoon/template/jxtg/expression/Literal.java cocoon/trunk/src/blocks/template/java/org/apache/cocoon/template/jxtg/expression/MyJexlContext.java cocoon/trunk/src/blocks/template/java/org/apache/cocoon/template/jxtg/expression/Subst.java cocoon/trunk/src/blocks/template/java/org/apache/cocoon/template/jxtg/script/ cocoon/trunk/src/blocks/template/java/org/apache/cocoon/template/jxtg/script/Parser.java cocoon/trunk/src/blocks/template/java/org/apache/cocoon/template/jxtg/script/event/ cocoon/trunk/src/blocks/template/java/org/apache/cocoon/template/jxtg/script/event/AttributeEvent.java cocoon/trunk/src/blocks/template/java/org/apache/cocoon/template/jxtg/script/event/Characters.java cocoon/trunk/src/blocks/template/java/org/apache/cocoon/template/jxtg/script/event/CopyAttribute.java cocoon/trunk/src/blocks/template/java/org/apache/cocoon/template/jxtg/script/event/EndCDATA.java cocoon/trunk/src/blocks/template/java/org/apache/cocoon/template/jxtg/script/event/EndDTD.java cocoon/trunk/src/blocks/template/java/org/apache/cocoon/template/jxtg/script/event/EndDocument.java cocoon/trunk/src/blocks/template/java/org/apache/cocoon/template/jxtg/script/event/EndElement.java cocoon/trunk/src/blocks/template/java/org/apache/cocoon/template/jxtg/script/event/EndEntity.java cocoon/trunk/src/blocks/template/java/org/apache/cocoon/template/jxtg/script/event/EndInstruction.java cocoon/trunk/src/blocks/template/java/org/apache/cocoon/template/jxtg/script/event/EndPrefixMapping.java cocoon/trunk/src/blocks/template/java/org/apache/cocoon/template/jxtg/script/event/Event.java cocoon/trunk/src/blocks/template/java/org/apache/cocoon/template/jxtg/script/event/IgnorableWhitespace.java cocoon/trunk/src/blocks/template/java/org/apache/cocoon/template/jxtg/script/event/LoopTagStatus.java cocoon/trunk/src/blocks/template/java/org/apache/cocoon/template/jxtg/script/event/ProcessingInstruction.java cocoon/trunk/src/blocks/template/java/org/apache/cocoon/template/jxtg/script/event/SkippedEntity.java cocoon/trunk/src/blocks/template/java/org/apache/cocoon/template/jxtg/script/event/StartCDATA.java cocoon/trunk/src/blocks/template/java/org/apache/cocoon/template/jxtg/script/event/StartChoose.java cocoon/trunk/src/blocks/template/java/org/apache/cocoon/template/jxtg/script/event/StartComment.java cocoon/trunk/src/blocks/template/java/org/apache/cocoon/template/jxtg/script/event/StartDTD.java cocoon/trunk/src/blocks/template/java/org/apache/cocoon/template/jxtg/script/event/StartDefine.java cocoon/trunk/src/blocks/template/java/org/apache/cocoon/template/jxtg/script/event/StartDocument.java cocoon/trunk/src/blocks/template/java/org/apache/cocoon/template/jxtg/script/event/StartElement.java cocoon/trunk/src/blocks/template/java/org/apache/cocoon/template/jxtg/script/event/StartEntity.java cocoon/trunk/src/blocks/template/java/org/apache/cocoon/template/jxtg/script/event/StartEval.java cocoon/trunk/src/blocks/template/java/org/apache/cocoon/template/jxtg/script/event/StartEvalBody.java cocoon/trunk/src/blocks/template/java/org/apache/cocoon/template/jxtg/script/event/StartForEach.java cocoon/trunk/src/blocks/template/java/org/apache/cocoon/template/jxtg/script/event/StartFormatDate.java cocoon/trunk/src/blocks/template/java/org/apache
svn commit: r111395 - in cocoon/trunk/src/blocks/template/java/org/apache/cocoon: el el/jexl el/util template/jxtg template/jxtg/environment template/jxtg/expression template/jxtg/script template/jxtg/script/event template/v2/generation template/v2/script template/v2/tag template/v2/tag/samples util
Author: lgawron Date: Thu Dec 9 07:41:02 2004 New Revision: 111395 URL: http://svn.apache.org/viewcvs?view=revrev=111395 Log: svn:eol-style native, svn:keywords Id Modified: cocoon/trunk/src/blocks/template/java/org/apache/cocoon/el/AbstractExpression.java (props changed) cocoon/trunk/src/blocks/template/java/org/apache/cocoon/el/Context.java (props changed) cocoon/trunk/src/blocks/template/java/org/apache/cocoon/el/DefaultContext.java (props changed) cocoon/trunk/src/blocks/template/java/org/apache/cocoon/el/Expression.java (props changed) cocoon/trunk/src/blocks/template/java/org/apache/cocoon/el/ExpressionCompiler.java (props changed) cocoon/trunk/src/blocks/template/java/org/apache/cocoon/el/GenericExpressionCompiler.java (props changed) cocoon/trunk/src/blocks/template/java/org/apache/cocoon/el/jexl/JexlContext.java (props changed) cocoon/trunk/src/blocks/template/java/org/apache/cocoon/el/jexl/JexlExpression.java (props changed) cocoon/trunk/src/blocks/template/java/org/apache/cocoon/el/jexl/JexlExpressionCompiler.java (props changed) cocoon/trunk/src/blocks/template/java/org/apache/cocoon/el/util/ELUtils.java (props changed) cocoon/trunk/src/blocks/template/java/org/apache/cocoon/el/util/ParseHandler.java (props changed) cocoon/trunk/src/blocks/template/java/org/apache/cocoon/template/jxtg/JXTemplateGenerator.java (contents, props changed) cocoon/trunk/src/blocks/template/java/org/apache/cocoon/template/jxtg/TransformerAdapter.java (contents, props changed) cocoon/trunk/src/blocks/template/java/org/apache/cocoon/template/jxtg/environment/ErrorHolder.java (contents, props changed) cocoon/trunk/src/blocks/template/java/org/apache/cocoon/template/jxtg/environment/JSIntrospector.java (contents, props changed) cocoon/trunk/src/blocks/template/java/org/apache/cocoon/template/jxtg/environment/JXCacheKey.java (contents, props changed) cocoon/trunk/src/blocks/template/java/org/apache/cocoon/template/jxtg/environment/JXSourceValidity.java (contents, props changed) cocoon/trunk/src/blocks/template/java/org/apache/cocoon/template/jxtg/environment/LocatorFacade.java (contents, props changed) cocoon/trunk/src/blocks/template/java/org/apache/cocoon/template/jxtg/environment/MyVariables.java (contents, props changed) cocoon/trunk/src/blocks/template/java/org/apache/cocoon/template/jxtg/environment/ValueHelper.java (contents, props changed) cocoon/trunk/src/blocks/template/java/org/apache/cocoon/template/jxtg/expression/JXTExpression.java (contents, props changed) cocoon/trunk/src/blocks/template/java/org/apache/cocoon/template/jxtg/expression/Literal.java (contents, props changed) cocoon/trunk/src/blocks/template/java/org/apache/cocoon/template/jxtg/expression/MyJexlContext.java (contents, props changed) cocoon/trunk/src/blocks/template/java/org/apache/cocoon/template/jxtg/expression/Subst.java (contents, props changed) cocoon/trunk/src/blocks/template/java/org/apache/cocoon/template/jxtg/script/Parser.java (contents, props changed) cocoon/trunk/src/blocks/template/java/org/apache/cocoon/template/jxtg/script/event/AttributeEvent.java (contents, props changed) cocoon/trunk/src/blocks/template/java/org/apache/cocoon/template/jxtg/script/event/Characters.java (contents, props changed) cocoon/trunk/src/blocks/template/java/org/apache/cocoon/template/jxtg/script/event/CopyAttribute.java (contents, props changed) cocoon/trunk/src/blocks/template/java/org/apache/cocoon/template/jxtg/script/event/EndCDATA.java (contents, props changed) cocoon/trunk/src/blocks/template/java/org/apache/cocoon/template/jxtg/script/event/EndDTD.java (contents, props changed) cocoon/trunk/src/blocks/template/java/org/apache/cocoon/template/jxtg/script/event/EndDocument.java (contents, props changed) cocoon/trunk/src/blocks/template/java/org/apache/cocoon/template/jxtg/script/event/EndElement.java (contents, props changed) cocoon/trunk/src/blocks/template/java/org/apache/cocoon/template/jxtg/script/event/EndEntity.java (contents, props changed) cocoon/trunk/src/blocks/template/java/org/apache/cocoon/template/jxtg/script/event/EndInstruction.java (contents, props changed) cocoon/trunk/src/blocks/template/java/org/apache/cocoon/template/jxtg/script/event/EndPrefixMapping.java (contents, props changed) cocoon/trunk/src/blocks/template/java/org/apache/cocoon/template/jxtg/script/event/Event.java (contents, props changed) cocoon/trunk/src/blocks/template/java/org/apache/cocoon/template/jxtg/script/event/IgnorableWhitespace.java (contents, props changed) cocoon/trunk/src/blocks/template/java/org/apache/cocoon/template/jxtg/script/event/LoopTagStatus.java (contents, props changed) cocoon/trunk/src/blocks/template/java/org/apache/cocoon/template/jxtg/script/event
svn commit: r111397 - /cocoon/trunk/src/blocks/template/test/org/apache/cocoon/template/jxtg/JXTemplateGeneratorTestCase.java
Author: lgawron Date: Thu Dec 9 07:46:59 2004 New Revision: 111397 URL: http://svn.apache.org/viewcvs?view=revrev=111397 Log: svn:eol-style native, svn:keywords Id Modified: cocoon/trunk/src/blocks/template/test/org/apache/cocoon/template/jxtg/JXTemplateGeneratorTestCase.java (props changed)
svn commit: r111250 - /cocoon/branches/BRANCH_2_1_X/src/webapp/samples/flow/prefs/prefs.js
Author: lgawron
Date: Wed Dec 8 03:10:29 2004
New Revision: 111250
URL: http://svn.apache.org/viewcvs?view=revrev=111250
Log:
top level flowscript function cannot have parameters
Modified:
cocoon/branches/BRANCH_2_1_X/src/webapp/samples/flow/prefs/prefs.js
Modified: cocoon/branches/BRANCH_2_1_X/src/webapp/samples/flow/prefs/prefs.js
Url:
http://svn.apache.org/viewcvs/cocoon/branches/BRANCH_2_1_X/src/webapp/samples/flow/prefs/prefs.js?view=diffrev=111250p1=cocoon/branches/BRANCH_2_1_X/src/webapp/samples/flow/prefs/prefs.jsr1=111249p2=cocoon/branches/BRANCH_2_1_X/src/webapp/samples/flow/prefs/prefs.jsr2=111250
==
--- cocoon/branches/BRANCH_2_1_X/src/webapp/samples/flow/prefs/prefs.js
(original)
+++ cocoon/branches/BRANCH_2_1_X/src/webapp/samples/flow/prefs/prefs.js Wed Dec
8 03:10:29 2004
@@ -14,7 +14,7 @@
* limitations under the License.
*/
/*
-CVS: $Id: prefs.js,v 1.5 2004/03/06 02:25:54 antonio Exp $
+CVS: $Id$
This file is the central controller piece in the preferences
application. It receives the requests from the client browser (the
@@ -130,8 +130,9 @@
// This top-level function is used for user login.
-function login(errorMsg)
+function login()
{
+ var errorMsg = cocoon.parameters[errorMsg];
var login = ;
var password = ;
svn commit: r111253 - /cocoon/trunk/src/webapp/samples/flow/prefs/prefs.js
Author: lgawron
Date: Wed Dec 8 03:14:59 2004
New Revision: 111253
URL: http://svn.apache.org/viewcvs?view=revrev=111253
Log:
top level flowscript function cannot have parameters
Modified:
cocoon/trunk/src/webapp/samples/flow/prefs/prefs.js
Modified: cocoon/trunk/src/webapp/samples/flow/prefs/prefs.js
Url:
http://svn.apache.org/viewcvs/cocoon/trunk/src/webapp/samples/flow/prefs/prefs.js?view=diffrev=111253p1=cocoon/trunk/src/webapp/samples/flow/prefs/prefs.jsr1=111252p2=cocoon/trunk/src/webapp/samples/flow/prefs/prefs.jsr2=111253
==
--- cocoon/trunk/src/webapp/samples/flow/prefs/prefs.js (original)
+++ cocoon/trunk/src/webapp/samples/flow/prefs/prefs.js Wed Dec 8 03:14:59 2004
@@ -14,7 +14,7 @@
* limitations under the License.
*/
/*
-CVS: $Id: prefs.js,v 1.5 2004/03/06 02:25:54 antonio Exp $
+CVS: $Id$
This file is the central controller piece in the preferences
application. It receives the requests from the client browser (the
@@ -130,8 +130,9 @@
// This top-level function is used for user login.
-function login(errorMsg)
+function login()
{
+ var errorMsg = cocoon.parameters[errorMsg];
var login = ;
var password = ;
svn commit: r111254 - /cocoon/branches/BRANCH_2_1_X/src/webapp/samples/flow/prefs/screens/login.xml /cocoon/branches/BRANCH_2_1_X/src/webapp/samples/flow/prefs/screens/userInfo.xml
Author: lgawron
Date: Wed Dec 8 03:20:33 2004
New Revision: 111254
URL: http://svn.apache.org/viewcvs?view=revrev=111254
Log:
error message was never shown due to invalid expression in jx:if
Modified:
cocoon/branches/BRANCH_2_1_X/src/webapp/samples/flow/prefs/screens/login.xml
cocoon/branches/BRANCH_2_1_X/src/webapp/samples/flow/prefs/screens/userInfo.xml
Modified:
cocoon/branches/BRANCH_2_1_X/src/webapp/samples/flow/prefs/screens/login.xml
Url:
http://svn.apache.org/viewcvs/cocoon/branches/BRANCH_2_1_X/src/webapp/samples/flow/prefs/screens/login.xml?view=diffrev=111254p1=cocoon/branches/BRANCH_2_1_X/src/webapp/samples/flow/prefs/screens/login.xmlr1=111253p2=cocoon/branches/BRANCH_2_1_X/src/webapp/samples/flow/prefs/screens/login.xmlr2=111254
==
---
cocoon/branches/BRANCH_2_1_X/src/webapp/samples/flow/prefs/screens/login.xml
(original)
+++
cocoon/branches/BRANCH_2_1_X/src/webapp/samples/flow/prefs/screens/login.xml
Wed Dec 8 03:20:33 2004
@@ -20,7 +20,7 @@
/resources
titleLogin/title
content
-jx:if test=errorMsg
+jx:if test=${errorMsg != null}
strong${errorMsg}/strong
/jx:if
form action=continue.${continuation.id}
Modified:
cocoon/branches/BRANCH_2_1_X/src/webapp/samples/flow/prefs/screens/userInfo.xml
Url:
http://svn.apache.org/viewcvs/cocoon/branches/BRANCH_2_1_X/src/webapp/samples/flow/prefs/screens/userInfo.xml?view=diffrev=111254p1=cocoon/branches/BRANCH_2_1_X/src/webapp/samples/flow/prefs/screens/userInfo.xmlr1=111253p2=cocoon/branches/BRANCH_2_1_X/src/webapp/samples/flow/prefs/screens/userInfo.xmlr2=111254
==
---
cocoon/branches/BRANCH_2_1_X/src/webapp/samples/flow/prefs/screens/userInfo.xml
(original)
+++
cocoon/branches/BRANCH_2_1_X/src/webapp/samples/flow/prefs/screens/userInfo.xml
Wed Dec 8 03:20:33 2004
@@ -21,7 +21,7 @@
title${title}/title
content
jx:choose
- jx:when test=errorMsg
+ jx:when test=${errorMsg != null}
parastrong${errorMsg}/strong/para
/jx:when
jx:otherwise
svn commit: r111255 - /cocoon/trunk/src/webapp/samples/flow/prefs/screens/login.xml /cocoon/trunk/src/webapp/samples/flow/prefs/screens/userInfo.xml
Author: lgawron
Date: Wed Dec 8 03:20:58 2004
New Revision: 111255
URL: http://svn.apache.org/viewcvs?view=revrev=111255
Log:
error message was never shown due to invalid expression in jx:if
Modified:
cocoon/trunk/src/webapp/samples/flow/prefs/screens/login.xml
cocoon/trunk/src/webapp/samples/flow/prefs/screens/userInfo.xml
Modified: cocoon/trunk/src/webapp/samples/flow/prefs/screens/login.xml
Url:
http://svn.apache.org/viewcvs/cocoon/trunk/src/webapp/samples/flow/prefs/screens/login.xml?view=diffrev=111255p1=cocoon/trunk/src/webapp/samples/flow/prefs/screens/login.xmlr1=111254p2=cocoon/trunk/src/webapp/samples/flow/prefs/screens/login.xmlr2=111255
==
--- cocoon/trunk/src/webapp/samples/flow/prefs/screens/login.xml
(original)
+++ cocoon/trunk/src/webapp/samples/flow/prefs/screens/login.xmlWed Dec
8 03:20:58 2004
@@ -20,7 +20,7 @@
/resources
titleLogin/title
content
-jx:if test=errorMsg
+jx:if test=${errorMsg != null}
strong${errorMsg}/strong
/jx:if
form action=continue.${continuation.id}
Modified: cocoon/trunk/src/webapp/samples/flow/prefs/screens/userInfo.xml
Url:
http://svn.apache.org/viewcvs/cocoon/trunk/src/webapp/samples/flow/prefs/screens/userInfo.xml?view=diffrev=111255p1=cocoon/trunk/src/webapp/samples/flow/prefs/screens/userInfo.xmlr1=111254p2=cocoon/trunk/src/webapp/samples/flow/prefs/screens/userInfo.xmlr2=111255
==
--- cocoon/trunk/src/webapp/samples/flow/prefs/screens/userInfo.xml
(original)
+++ cocoon/trunk/src/webapp/samples/flow/prefs/screens/userInfo.xml Wed Dec
8 03:20:58 2004
@@ -21,7 +21,7 @@
title${title}/title
content
jx:choose
- jx:when test=errorMsg
+ jx:when test=${errorMsg != null}
parastrong${errorMsg}/strong/para
/jx:when
jx:otherwise
svn commit: r111262 - in cocoon/branches/BRANCH_2_1_X/src: java/org/apache/cocoon/components/flow webapp/WEB-INF
Author: lgawron
Date: Wed Dec 8 03:47:12 2004
New Revision: 111262
URL: http://svn.apache.org/viewcvs?view=revrev=111262
Log:
implement 2 modes of work for continuations manager:
- standard, as it was up till now
- secure in which continuations are bound to session. Only the session that
created a continuation can invoke it.
All continuations bound to session are invalidated when the session ifself
gets invalidated.
This mode is for those users who build web applications protected with
authentification.
Modified:
cocoon/branches/BRANCH_2_1_X/src/java/org/apache/cocoon/components/flow/ContinuationsManagerImpl.java
cocoon/branches/BRANCH_2_1_X/src/java/org/apache/cocoon/components/flow/WebContinuation.java
cocoon/branches/BRANCH_2_1_X/src/webapp/WEB-INF/cocoon.xconf
Modified:
cocoon/branches/BRANCH_2_1_X/src/java/org/apache/cocoon/components/flow/ContinuationsManagerImpl.java
Url:
http://svn.apache.org/viewcvs/cocoon/branches/BRANCH_2_1_X/src/java/org/apache/cocoon/components/flow/ContinuationsManagerImpl.java?view=diffrev=111262p1=cocoon/branches/BRANCH_2_1_X/src/java/org/apache/cocoon/components/flow/ContinuationsManagerImpl.javar1=111261p2=cocoon/branches/BRANCH_2_1_X/src/java/org/apache/cocoon/components/flow/ContinuationsManagerImpl.javar2=111262
==
---
cocoon/branches/BRANCH_2_1_X/src/java/org/apache/cocoon/components/flow/ContinuationsManagerImpl.java
(original)
+++
cocoon/branches/BRANCH_2_1_X/src/java/org/apache/cocoon/components/flow/ContinuationsManagerImpl.java
Wed Dec 8 03:47:12 2004
@@ -18,12 +18,19 @@
import org.apache.avalon.framework.component.Component;
import org.apache.avalon.framework.configuration.Configurable;
import org.apache.avalon.framework.configuration.Configuration;
+import org.apache.avalon.framework.context.Context;
+import org.apache.avalon.framework.context.ContextException;
+import org.apache.avalon.framework.context.Contextualizable;
import org.apache.avalon.framework.logger.AbstractLogEnabled;
import org.apache.avalon.framework.service.ServiceException;
import org.apache.avalon.framework.service.ServiceManager;
import org.apache.avalon.framework.service.Serviceable;
import org.apache.avalon.framework.thread.ThreadSafe;
+import org.apache.cocoon.components.ContextHelper;
import org.apache.cocoon.components.thread.RunnableManager;
+import org.apache.cocoon.environment.ObjectModelHelper;
+import org.apache.cocoon.environment.Request;
+import org.apache.cocoon.environment.Session;
import org.apache.excalibur.instrument.CounterInstrument;
import org.apache.excalibur.instrument.Instrument;
@@ -41,11 +48,26 @@
import java.util.SortedSet;
import java.util.TreeSet;
+import javax.servlet.http.HttpSessionBindingEvent;
+import javax.servlet.http.HttpSessionBindingListener;
+
/**
- * The default implementation of [EMAIL PROTECTED] ContinuationsManager}.
- *
- * @author a href=mailto:[EMAIL PROTECTED]Ovidiu Predescu/a
- * @author a href=mailto:[EMAIL PROTECTED]Michael Melhem/a
+ * The default implementation of [EMAIL PROTECTED] ContinuationsManager}.
br/There are
+ * two modes of work: br/
+ * ul
+ * libstandard mode /b- continuations are stored in single holder. No
+ * security is applied to continuation lookup. Anyone can invoke a continuation
+ * only knowing the ID. Set session-bound-continuations configuration option
+ * to false to activate this mode./li
+ * libsecure mode /b- each session has it's own continuations holder. A
+ * continuation is only valid for the same session it was created for. Session
+ * invalidation causes all bound continuations to be invalidated as well. Use
+ * this setting for web applications. Set session-bound-continuations
+ * configuration option to true to activate this mode./li
+ * /ul
+ *
+ * @author a href=mailto:[EMAIL PROTECTED]Ovidiu Predescu /a
+ * @author a href=mailto:[EMAIL PROTECTED]Michael Melhem /a
* @since March 19, 2002
* @see ContinuationsManager
* @version CVS $Id$
@@ -53,7 +75,7 @@
public class ContinuationsManagerImpl
extends AbstractLogEnabled
implements ContinuationsManager, Component, Configurable,
- ThreadSafe, Instrumentable, Serviceable {
+ ThreadSafe, Instrumentable, Serviceable, Contextualizable {
static final int CONTINUATION_ID_LENGTH = 20;
static final String EXPIRE_CONTINUATIONS = expire-continuations;
@@ -78,11 +100,11 @@
protected Set forest = Collections.synchronizedSet(new HashSet());
/**
- * Association between codeWebContinuation/code IDs and the
- * corresponding codeWebContinuation/code objects.
+ * Main continuations holder. Used unless continuations are stored in user
+ * session.
*/
-protected Map idToWebCont = Collections.synchronizedMap(new HashMap());
-
+protected WebContinuationsHolder continuationsHolder;
+
/**
* Sorted set
svn commit: r111266 - /cocoon/branches/BRANCH_2_1_X/status.xml
Author: lgawron Date: Wed Dec 8 04:08:39 2004 New Revision: 111266 URL: http://svn.apache.org/viewcvs?view=revrev=111266 Log: status update Modified: cocoon/branches/BRANCH_2_1_X/status.xml Modified: cocoon/branches/BRANCH_2_1_X/status.xml Url: http://svn.apache.org/viewcvs/cocoon/branches/BRANCH_2_1_X/status.xml?view=diffrev=111266p1=cocoon/branches/BRANCH_2_1_X/status.xmlr1=111265p2=cocoon/branches/BRANCH_2_1_X/status.xmlr2=111266 == --- cocoon/branches/BRANCH_2_1_X/status.xml (original) +++ cocoon/branches/BRANCH_2_1_X/status.xml Wed Dec 8 04:08:39 2004 @@ -202,6 +202,11 @@ changes release version=@version@ date=@date@ + action dev=LG type=add + ContinuationsManager default implementation can now store continuations in user session. + Continuations are not available outside user session and invalidated automatically + when session gets invalidated by servlet container. This is a good security option for web applications. + /action action dev=AG type=fix fixes-bug=32083 due-to=Mark H. Butler due-to-email=[EMAIL PROTECTED] Update Deli to x031104 (include over 300 vendor, operator and third party profiles) /action
svn commit: r111272 - /cocoon/trunk/src/java/org/apache/cocoon/components/flow/ContinuationsManagerImpl.java /cocoon/trunk/src/java/org/apache/cocoon/components/flow/WebContinuation.java /cocoon/trunk/src/webapp/WEB-INF/cocoon.xconf /cocoon/trunk/status.xml
Author: lgawron
Date: Wed Dec 8 06:58:35 2004
New Revision: 111272
URL: http://svn.apache.org/viewcvs?view=revrev=111272
Log:
implement 2 modes of work for continuations manager:
- standard, as it was up till now
- secure in which continuations are bound to session. Only the session that
created a continuation can invoke it.
All continuations bound to session are invalidated w
Modified:
cocoon/trunk/src/java/org/apache/cocoon/components/flow/ContinuationsManagerImpl.java
cocoon/trunk/src/java/org/apache/cocoon/components/flow/WebContinuation.java
cocoon/trunk/src/webapp/WEB-INF/cocoon.xconf
cocoon/trunk/status.xml
Modified:
cocoon/trunk/src/java/org/apache/cocoon/components/flow/ContinuationsManagerImpl.java
Url:
http://svn.apache.org/viewcvs/cocoon/trunk/src/java/org/apache/cocoon/components/flow/ContinuationsManagerImpl.java?view=diffrev=111272p1=cocoon/trunk/src/java/org/apache/cocoon/components/flow/ContinuationsManagerImpl.javar1=111271p2=cocoon/trunk/src/java/org/apache/cocoon/components/flow/ContinuationsManagerImpl.javar2=111272
==
---
cocoon/trunk/src/java/org/apache/cocoon/components/flow/ContinuationsManagerImpl.java
(original)
+++
cocoon/trunk/src/java/org/apache/cocoon/components/flow/ContinuationsManagerImpl.java
Wed Dec 8 06:58:35 2004
@@ -26,27 +26,49 @@
import java.util.SortedSet;
import java.util.TreeSet;
+import javax.servlet.http.HttpSessionBindingEvent;
+import javax.servlet.http.HttpSessionBindingListener;
+
import org.apache.avalon.framework.configuration.Configurable;
import org.apache.avalon.framework.configuration.Configuration;
+import org.apache.avalon.framework.context.Context;
+import org.apache.avalon.framework.context.ContextException;
+import org.apache.avalon.framework.context.Contextualizable;
import org.apache.avalon.framework.logger.AbstractLogEnabled;
import org.apache.avalon.framework.service.ServiceException;
import org.apache.avalon.framework.service.ServiceManager;
import org.apache.avalon.framework.service.Serviceable;
import org.apache.avalon.framework.thread.ThreadSafe;
+import org.apache.cocoon.components.ContextHelper;
import org.apache.cocoon.components.thread.RunnableManager;
+import org.apache.cocoon.environment.ObjectModelHelper;
+import org.apache.cocoon.environment.Request;
+import org.apache.cocoon.environment.Session;
/**
- * The default implementation of [EMAIL PROTECTED] ContinuationsManager}.
- *
- * @author a href=mailto:[EMAIL PROTECTED]Ovidiu Predescu/a
- * @author a href=mailto:[EMAIL PROTECTED]Michael Melhem/a
+ * The default implementation of [EMAIL PROTECTED] ContinuationsManager}.
br/There are
+ * two modes of work: br/
+ * ul
+ * libstandard mode /b- continuations are stored in single holder. No
+ * security is applied to continuation lookup. Anyone can invoke a continuation
+ * only knowing the ID. Set session-bound-continuations configuration option
+ * to false to activate this mode./li
+ * libsecure mode /b- each session has it's own continuations holder. A
+ * continuation is only valid for the same session it was created for. Session
+ * invalidation causes all bound continuations to be invalidated as well. Use
+ * this setting for web applications. Set session-bound-continuations
+ * configuration option to true to activate this mode./li
+ * /ul
+ *
+ * @author a href=mailto:[EMAIL PROTECTED]Ovidiu Predescu /a
+ * @author a href=mailto:[EMAIL PROTECTED]Michael Melhem /a
* @since March 19, 2002
* @see ContinuationsManager
* @version CVS $Id$
*/
public class ContinuationsManagerImpl
extends AbstractLogEnabled
-implements ContinuationsManager, Configurable, ThreadSafe, Serviceable
{
+implements ContinuationsManager, Configurable, ThreadSafe,
Serviceable, Contextualizable {
static final int CONTINUATION_ID_LENGTH = 20;
static final String EXPIRE_CONTINUATIONS = expire-continuations;
@@ -71,11 +93,11 @@
protected Set forest = Collections.synchronizedSet(new HashSet());
/**
- * Association between codeWebContinuation/code IDs and the
- * corresponding codeWebContinuation/code objects.
+ * Main continuations holder. Used unless continuations are stored in user
+ * session.
*/
-protected Map idToWebCont = Collections.synchronizedMap(new HashMap());
-
+protected WebContinuationsHolder continuationsHolder;
+
/**
* Sorted set of codeWebContinuation/code instances, based on
* their expiration time. This is used by the background thread to
@@ -85,8 +107,10 @@
private String instrumentableName;
private boolean isContinuationSharingBugCompatible;
+private boolean bindContinuationsToSession;
private ServiceManager serviceManager;
+private Context context;
public ContinuationsManagerImpl() throws Exception {
try {
@@ -99,13 +123,17 @@
bytes = new byte
svn commit: r111276 - /cocoon/trunk/src/webapp/WEB-INF/entities/datatypes.dtd /cocoon/trunk/src/webapp/WEB-INF/web.xml
Author: lgawron
Date: Wed Dec 8 07:23:00 2004
New Revision: 111276
URL: http://svn.apache.org/viewcvs?view=revrev=111276
Log:
missing ASL license
whitespace sync
Modified:
cocoon/trunk/src/webapp/WEB-INF/entities/datatypes.dtd
cocoon/trunk/src/webapp/WEB-INF/web.xml
Modified: cocoon/trunk/src/webapp/WEB-INF/entities/datatypes.dtd
Url:
http://svn.apache.org/viewcvs/cocoon/trunk/src/webapp/WEB-INF/entities/datatypes.dtd?view=diffrev=111276p1=cocoon/trunk/src/webapp/WEB-INF/entities/datatypes.dtdr1=111275p2=cocoon/trunk/src/webapp/WEB-INF/entities/datatypes.dtdr2=111276
==
--- cocoon/trunk/src/webapp/WEB-INF/entities/datatypes.dtd (original)
+++ cocoon/trunk/src/webapp/WEB-INF/entities/datatypes.dtd Wed Dec 8
07:23:00 2004
@@ -1,3 +1,19 @@
+!--
+ 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.
+--
+
!-- DTD for XML Schemas: Part 2: Datatypes --
!-- Id: datatypes.dtd,v 1.14 2000/10/23 08:58:09 ht Exp --
Modified: cocoon/trunk/src/webapp/WEB-INF/web.xml
Url:
http://svn.apache.org/viewcvs/cocoon/trunk/src/webapp/WEB-INF/web.xml?view=diffrev=111276p1=cocoon/trunk/src/webapp/WEB-INF/web.xmlr1=111275p2=cocoon/trunk/src/webapp/WEB-INF/web.xmlr2=111276
==
--- cocoon/trunk/src/webapp/WEB-INF/web.xml (original)
+++ cocoon/trunk/src/webapp/WEB-INF/web.xml Wed Dec 8 07:23:00 2004
@@ -38,7 +38,7 @@
param-value/some/path/to/your/webapp/param-value
descriptionAn override of the session cookie path/description
/context-param--
-
+
!-- Servlet Configuration == --
servlet
@@ -144,7 +144,7 @@
an XML configuration file here. You can use the usual log4j property
substituation mechanism, e.g. ${context-root} is replaced by the
context root of this web application etc.
- You can configure the log4j configuration even if you use LogKit
+ You can configure the log4j configuration even if you use LogKit
for Cocoon logging. You can use this to configure third party code
for example.
init-param
@@ -152,11 +152,11 @@
param-value/WEB-INF/log4j.xconf/param-value
/init-param
--
-
+
!--
Allow reinstantiating (reloading) of the cocoon instance. If this is
set to yes or true, a new cocoon instance can be created using
- the request parameter cocoon-reload. It also enables that Cocoon is
+ the request parameter cocoon-reload. It also enables that Cocoon is
reloaded when cocoon.xconf changes. Default is no for security reasons.
--
init-param
svn commit: r111279 - /cocoon/branches/BRANCH_2_1_X/src/java/org/apache/cocoon/components/flow/ContinuationsManagerImpl.java /cocoon/branches/BRANCH_2_1_X/src/webapp/WEB-INF/cocoon.xconf /cocoon/branches/BRANCH_2_1_X/src/webapp/WEB-INF/web.xml
Author: lgawron
Date: Wed Dec 8 07:35:02 2004
New Revision: 111279
URL: http://svn.apache.org/viewcvs?view=revrev=111279
Log:
whitespace sync, removing tab characters
Modified:
cocoon/branches/BRANCH_2_1_X/src/java/org/apache/cocoon/components/flow/ContinuationsManagerImpl.java
cocoon/branches/BRANCH_2_1_X/src/webapp/WEB-INF/cocoon.xconf
cocoon/branches/BRANCH_2_1_X/src/webapp/WEB-INF/web.xml
Modified:
cocoon/branches/BRANCH_2_1_X/src/java/org/apache/cocoon/components/flow/ContinuationsManagerImpl.java
Url:
http://svn.apache.org/viewcvs/cocoon/branches/BRANCH_2_1_X/src/java/org/apache/cocoon/components/flow/ContinuationsManagerImpl.java?view=diffrev=111279p1=cocoon/branches/BRANCH_2_1_X/src/java/org/apache/cocoon/components/flow/ContinuationsManagerImpl.javar1=111278p2=cocoon/branches/BRANCH_2_1_X/src/java/org/apache/cocoon/components/flow/ContinuationsManagerImpl.javar2=111279
==
---
cocoon/branches/BRANCH_2_1_X/src/java/org/apache/cocoon/components/flow/ContinuationsManagerImpl.java
(original)
+++
cocoon/branches/BRANCH_2_1_X/src/java/org/apache/cocoon/components/flow/ContinuationsManagerImpl.java
Wed Dec 8 07:35:02 2004
@@ -265,8 +265,10 @@
* @return the generated codeWebContinuation/code with unique
identifier
*/
private WebContinuation generateContinuation(Object kont,
-WebContinuation parent, int ttl, String interpreterId,
-ContinuationsDisposer disposer) {
+ WebContinuation parent,
+ int ttl,
+ String interpreterId,
+ ContinuationsDisposer
disposer) {
char[] result = new char[bytes.length * 2];
WebContinuation wk = null;
Modified: cocoon/branches/BRANCH_2_1_X/src/webapp/WEB-INF/cocoon.xconf
Url:
http://svn.apache.org/viewcvs/cocoon/branches/BRANCH_2_1_X/src/webapp/WEB-INF/cocoon.xconf?view=diffrev=111279p1=cocoon/branches/BRANCH_2_1_X/src/webapp/WEB-INF/cocoon.xconfr1=111278p2=cocoon/branches/BRANCH_2_1_X/src/webapp/WEB-INF/cocoon.xconfr2=111279
==
--- cocoon/branches/BRANCH_2_1_X/src/webapp/WEB-INF/cocoon.xconf
(original)
+++ cocoon/branches/BRANCH_2_1_X/src/webapp/WEB-INF/cocoon.xconfWed Dec
8 07:35:02 2004
@@ -151,7 +151,7 @@
| carry Meta in their name. An example is the ChainMetaModule
| which tries several other modules in turn until a non-null
| value is obtained or all modules are tied.
- |
+ |
| For details and optional configuration parameters refer to the
| accompanying javadocs.
+--
@@ -196,7 +196,7 @@
component-instance logger=core.modules.input name=jxpath
class=org.apache.cocoon.components.modules.input.JXPathMetaModule/
component-instance logger=core.modules.input name=simplemap
class=org.apache.cocoon.components.modules.input.SimpleMappingMetaModule/
component-instance logger=core.modules.input name=locate
class=org.apache.cocoon.components.modules.input.LocateResource/
-component-instance logger=core.modules.input name=chain
class=org.apache.cocoon.components.modules.input.ChainMetaModule
+component-instance logger=core.modules.input name=chain
class=org.apache.cocoon.components.modules.input.ChainMetaModule
input-module name=request-param/
input-module name=request-attr/
input-module name=session-attr/
@@ -559,7 +559,7 @@
parameter name=preemptive-loader-url
value=http://localhost:8080/cocoon/samples/cinclude/loader/
--
- /component
+ /component
!--+
| Runnable manager
Modified: cocoon/branches/BRANCH_2_1_X/src/webapp/WEB-INF/web.xml
Url:
http://svn.apache.org/viewcvs/cocoon/branches/BRANCH_2_1_X/src/webapp/WEB-INF/web.xml?view=diffrev=111279p1=cocoon/branches/BRANCH_2_1_X/src/webapp/WEB-INF/web.xmlr1=111278p2=cocoon/branches/BRANCH_2_1_X/src/webapp/WEB-INF/web.xmlr2=111279
==
--- cocoon/branches/BRANCH_2_1_X/src/webapp/WEB-INF/web.xml (original)
+++ cocoon/branches/BRANCH_2_1_X/src/webapp/WEB-INF/web.xml Wed Dec 8
07:35:02 2004
@@ -434,4 +434,3 @@
/mime-mapping
/web-app
-
svn commit: r111307 - /cocoon/branches/BRANCH_2_1_X/src/webapp/WEB-INF/cocoon.xconf
Author: lgawron Date: Wed Dec 8 12:31:53 2004 New Revision: 111307 URL: http://svn.apache.org/viewcvs?view=revrev=111307 Log: describe new continuations manager configuration options Modified: cocoon/branches/BRANCH_2_1_X/src/webapp/WEB-INF/cocoon.xconf Modified: cocoon/branches/BRANCH_2_1_X/src/webapp/WEB-INF/cocoon.xconf Url: http://svn.apache.org/viewcvs/cocoon/branches/BRANCH_2_1_X/src/webapp/WEB-INF/cocoon.xconf?view=diffrev=111307p1=cocoon/branches/BRANCH_2_1_X/src/webapp/WEB-INF/cocoon.xconfr1=111306p2=cocoon/branches/BRANCH_2_1_X/src/webapp/WEB-INF/cocoon.xconfr2=111307 == --- cocoon/branches/BRANCH_2_1_X/src/webapp/WEB-INF/cocoon.xconf (original) +++ cocoon/branches/BRANCH_2_1_X/src/webapp/WEB-INF/cocoon.xconfWed Dec 8 12:31:53 2004 @@ -118,6 +118,13 @@ | The expirations-check element specifies different policies for | expiring continuations. Currently only the periodic type is | supported. + | + | If you need higher security you can bind your continuations + | to session. This way only the session that initially created + | the continuation can later resume it. Also if session gets + | invalidated all continuations are invalidated as well. + | Enable this feature for web applications by setting + | 'session-bound-continuations' to true. +-- continuations-manager logger=flow.manager time-to-live=360 session-bound-continuations=false
svn commit: r109669 - /cocoon/branches/BRANCH_2_1_X/src/java/org/apache/cocoon/components/flow/ContinuationsManagerImpl.java /cocoon/branches/BRANCH_2_1_X/src/webapp/WEB-INF/cocoon.xconf
Author: lgawron
Date: Fri Dec 3 05:02:16 2004
New Revision: 109669
URL: http://svn.apache.org/viewcvs?view=revrev=109669
Log:
fix 32511: allow ContinuationsManagerImpl run in compatibility mode and return
WebContinuations for improper interpreter.
Modified:
cocoon/branches/BRANCH_2_1_X/src/java/org/apache/cocoon/components/flow/ContinuationsManagerImpl.java
cocoon/branches/BRANCH_2_1_X/src/webapp/WEB-INF/cocoon.xconf
Modified:
cocoon/branches/BRANCH_2_1_X/src/java/org/apache/cocoon/components/flow/ContinuationsManagerImpl.java
Url:
http://svn.apache.org/viewcvs/cocoon/branches/BRANCH_2_1_X/src/java/org/apache/cocoon/components/flow/ContinuationsManagerImpl.java?view=diffrev=109669p1=cocoon/branches/BRANCH_2_1_X/src/java/org/apache/cocoon/components/flow/ContinuationsManagerImpl.javar1=109668p2=cocoon/branches/BRANCH_2_1_X/src/java/org/apache/cocoon/components/flow/ContinuationsManagerImpl.javar2=109669
==
---
cocoon/branches/BRANCH_2_1_X/src/java/org/apache/cocoon/components/flow/ContinuationsManagerImpl.java
(original)
+++
cocoon/branches/BRANCH_2_1_X/src/java/org/apache/cocoon/components/flow/ContinuationsManagerImpl.java
Fri Dec 3 05:02:16 2004
@@ -96,6 +96,7 @@
private ValueInstrument expirationsSize;
private CounterInstrument continuationsCreated;
private CounterInstrument continuationsInvalidated;
+private boolean isContinuationSharingBugCompatible;
private ServiceManager serviceManager;
@@ -122,6 +123,7 @@
public void configure(Configuration config) {
this.defaultTimeToLive = config.getAttributeAsInteger(time-to-live,
(3600 * 1000));
+this.isContinuationSharingBugCompatible =
config.getAttributeAsBoolean(continuation-sharing-bug-compatible, false);
final Configuration expireConf = config.getChild(expirations-check);
final long initialDelay = expireConf.getChild(offset,
true).getValueAsLong(18);
@@ -208,7 +210,7 @@
+ kont.getInterpreterId() + , looked up for:
+ interpreterId);
}
-return interpreterMatches ? kont : null;
+return interpreterMatches || isContinuationSharingBugCompatible ?
kont : null;
}
return null;
}
Modified: cocoon/branches/BRANCH_2_1_X/src/webapp/WEB-INF/cocoon.xconf
Url:
http://svn.apache.org/viewcvs/cocoon/branches/BRANCH_2_1_X/src/webapp/WEB-INF/cocoon.xconf?view=diffrev=109669p1=cocoon/branches/BRANCH_2_1_X/src/webapp/WEB-INF/cocoon.xconfr1=109668p2=cocoon/branches/BRANCH_2_1_X/src/webapp/WEB-INF/cocoon.xconfr2=109669
==
--- cocoon/branches/BRANCH_2_1_X/src/webapp/WEB-INF/cocoon.xconf
(original)
+++ cocoon/branches/BRANCH_2_1_X/src/webapp/WEB-INF/cocoon.xconfFri Dec
3 05:02:16 2004
@@ -106,6 +106,15 @@
| in miliseconds using the time-to-live attribute of
| the continuations-manager element.
|
+ | If your site is sharing continuations between sitemaps you
+ | should refactor your application to keep a continuation bound to
+ | a single sitemap. The log will contain warnings which indicate
+ | where a continuation from a different sitemap is used.
+ |
+ | When you cannot do the refactoring in one blow you can turn on
+ | compatibility with shared continuations by setting the
+ | continuation-sharing-bug-compatible attribute to true.
+ |
| The expirations-check element specifies different policies for
| expiring continuations. Currently only the periodic type is
| supported.
svn commit: r109670 - /cocoon/trunk/src/java/org/apache/cocoon/components/flow/ContinuationsManagerImpl.java /cocoon/trunk/src/webapp/WEB-INF/cocoon.xconf
Author: lgawron
Date: Fri Dec 3 05:04:31 2004
New Revision: 109670
URL: http://svn.apache.org/viewcvs?view=revrev=109670
Log:
fix 32511: allow ContinuationsManagerImpl run in compatibility mode and return
WebContinuations for improper interpreter.
Modified:
cocoon/trunk/src/java/org/apache/cocoon/components/flow/ContinuationsManagerImpl.java
cocoon/trunk/src/webapp/WEB-INF/cocoon.xconf
Modified:
cocoon/trunk/src/java/org/apache/cocoon/components/flow/ContinuationsManagerImpl.java
Url:
http://svn.apache.org/viewcvs/cocoon/trunk/src/java/org/apache/cocoon/components/flow/ContinuationsManagerImpl.java?view=diffrev=109670p1=cocoon/trunk/src/java/org/apache/cocoon/components/flow/ContinuationsManagerImpl.javar1=109669p2=cocoon/trunk/src/java/org/apache/cocoon/components/flow/ContinuationsManagerImpl.javar2=109670
==
---
cocoon/trunk/src/java/org/apache/cocoon/components/flow/ContinuationsManagerImpl.java
(original)
+++
cocoon/trunk/src/java/org/apache/cocoon/components/flow/ContinuationsManagerImpl.java
Fri Dec 3 05:04:31 2004
@@ -84,6 +84,7 @@
protected SortedSet expirations = Collections.synchronizedSortedSet(new
TreeSet());
private String instrumentableName;
+private boolean isContinuationSharingBugCompatible;
private ServiceManager serviceManager;
@@ -103,6 +104,7 @@
*/
public void configure(Configuration config) {
this.defaultTimeToLive = config.getAttributeAsInteger(time-to-live,
(3600 * 1000));
+this.isContinuationSharingBugCompatible =
config.getAttributeAsBoolean(continuation-sharing-bug-compatible, false);
final Configuration expireConf = config.getChild(expirations-check);
final long initialDelay = expireConf.getChild(offset,
true).getValueAsLong(18);
@@ -175,7 +177,7 @@
+ kont.getInterpreterId() + , looked up for:
+ interpreterId);
}
-return interpreterMatches ? kont : null;
+return interpreterMatches || isContinuationSharingBugCompatible ?
kont : null;
}
return null;
}
Modified: cocoon/trunk/src/webapp/WEB-INF/cocoon.xconf
Url:
http://svn.apache.org/viewcvs/cocoon/trunk/src/webapp/WEB-INF/cocoon.xconf?view=diffrev=109670p1=cocoon/trunk/src/webapp/WEB-INF/cocoon.xconfr1=109669p2=cocoon/trunk/src/webapp/WEB-INF/cocoon.xconfr2=109670
==
--- cocoon/trunk/src/webapp/WEB-INF/cocoon.xconf(original)
+++ cocoon/trunk/src/webapp/WEB-INF/cocoon.xconfFri Dec 3 05:04:31 2004
@@ -106,6 +106,15 @@
| in miliseconds using the time-to-live attribute of
| the continuations-manager element.
|
+ | If your site is sharing continuations between sitemaps you
+ | should refactor your application to keep a continuation bound to
+ | a single sitemap. The log will contain warnings which indicate
+ | where a continuation from a different sitemap is used.
+ |
+ | When you cannot do the refactoring in one blow you can turn on
+ | compatibility with shared continuations by setting the
+ | continuation-sharing-bug-compatible attribute to true.
+ |
| The expirations-check element specifies different policies for
| expiring continuations. Currently only the periodic type is
| supported.
svn commit: r109263 - /cocoon/trunk/blocks.properties
Author: lgawron Date: Tue Nov 30 16:10:03 2004 New Revision: 109263 URL: http://svn.apache.org/viewcvs?view=revrev=109263 Log: broke blocks.properties Modified: cocoon/trunk/blocks.properties Modified: cocoon/trunk/blocks.properties Url: http://svn.apache.org/viewcvs/cocoon/trunk/blocks.properties?view=diffrev=109263p1=cocoon/trunk/blocks.propertiesr1=109262p2=cocoon/trunk/blocks.propertiesr2=109263 == --- cocoon/trunk/blocks.properties (original) +++ cocoon/trunk/blocks.properties Tue Nov 30 16:10:03 2004 @@ -46,49 +46,49 @@ #-[dependency]: authentication-fw depends on session-fw. #-[dependency]: authentication-fw is needed by portal, portal-fw. -include.block.authentication-fw=false +#include.block.authentication-fw=false #-[dependency]: batik is needed by fop, scratchpad, tour. -include.block.batik=false -include.block.bsf=false +#include.block.batik=false +#include.block.bsf=false #-[dependency]: chaperon depends on xsp (for samples). -include.block.chaperon=false +#include.block.chaperon=false #-[dependency]: databases depends on xsp. #-[dependency]: databases is needed by hsqldb, jms, ojb, petstore, repository, xmldb. -include.block.databases=false +#include.block.databases=false #-[dependency]: fop depends on batik. #-[dependency]: fop is needed by tour. -include.block.fop=false +#include.block.fop=false #-[dependency]: hsqldb depends on databases. #-[dependency]: hsqldb is needed by jms, ojb, petstore. -include.block.hsqldb=false +#include.block.hsqldb=false #-[dependency]: html is needed by portal. -include.block.html=false -include.block.itext=false -include.block.jfor=false -include.block.jsp=false -include.block.linkrewriter=false +#include.block.html=false +#include.block.itext=false +#include.block.jfor=false +#include.block.jsp=false +#include.block.linkrewriter=false #-[dependency]: lucene depends on forms (for samples), xsp (for samples). #-[dependency]: lucene is needed by querybean. -include.block.lucene=false -include.block.naming=false -include.block.paranoid=false -include.block.poi=false +#include.block.lucene=false +#include.block.naming=false +#include.block.paranoid=false +#include.block.poi=false #-[dependency]: portal depends on authentication-fw, html, session-fw. #-[dependency]: portal is needed by faces. -include.block.portal=false -include.block.profiler=false +#include.block.portal=false +#include.block.profiler=false #-[dependency]: python depends on xsp. -include.block.python=false +#include.block.python=false #-[dependency]: session-fw depends on xsp. #-[dependency]: session-fw is needed by authentication-fw, portal, portal-fw. -include.block.session-fw=false +#include.block.session-fw=false #-[dependency]: velocity is needed by petstore, scratchpad. -include.block.velocity=false -include.block.web3=false +#include.block.velocity=false +#include.block.web3=false #-[dependency]: xmldb depends on databases. -include.block.xmldb=false +#include.block.xmldb=false #-[dependency]: xsp is needed by chaperon, databases, eventcache, forms, lucene, python, scratchpad, session-fw, woody. -include.block.xsp=false +#include.block.xsp=false # Unstable blocks -- @@ -101,61 +101,61 @@ # stable. #-[dependency]: apples depends on forms (for samples). -include.block.apples=false +#include.block.apples=false #-[dependency]: asciiart is needed by mail. -include.block.asciiart=false +#include.block.asciiart=false #-[dependency]: axis is needed by scratchpad. -include.block.axis=false +#include.block.axis=false #-[dependency]: cron is needed by scratchpad. -include.block.cron=false -include.block.deli=false +#include.block.cron=false +#include.block.deli=false #-[dependency]: eventcache depends on jms, xsp (for samples). #-[dependency]: eventcache is needed by repository. -include.block.eventcache=false +#include.block.eventcache=false #-[dependency]: faces depends on portal, taglib. #-[dependency]: faces is needed by scratchpad. -include.block.faces=false +#include.block.faces=false #-[dependency]: forms depends on xsp (for samples). #-[dependency]: forms is needed by apples, javaflow, lucene, ojb, petstore, querybean, tour. -include.block.forms=false +#include.block.forms=false #-[dependency]: javaflow depends on forms, ojb (for samples). #-[dependency]: javaflow is needed by scratchpad. -include.block.javaflow=false +#include.block.javaflow=false #-[dependency]: jms depends on databases (for samples), hsqldb. #-[dependency]: jms is needed by eventcache, slide. -include.block.jms=false -include.block.linotype=false +#include.block.jms=false +#include.block.linotype=false #-[dependency]: mail depends on asciiart, scratchpad. -include.block.mail
svn commit: r109324 - /cocoon/branches/BRANCH_2_1_X/tools/ide/eclipse/blocks-classpath.xsl /cocoon/branches/BRANCH_2_1_X/tools/targets/ide-build.xml /cocoon/branches/BRANCH_2_1_X/tools/targets/init-build.xml
Author: lgawron
Date: Wed Dec 1 03:06:07 2004
New Revision: 109324
URL: http://svn.apache.org/viewcvs?view=revrev=109324
Log:
fix: eclipse-customized-project used a hard-coded path separator.
Modified:
cocoon/branches/BRANCH_2_1_X/tools/ide/eclipse/blocks-classpath.xsl
cocoon/branches/BRANCH_2_1_X/tools/targets/ide-build.xml
cocoon/branches/BRANCH_2_1_X/tools/targets/init-build.xml
Modified: cocoon/branches/BRANCH_2_1_X/tools/ide/eclipse/blocks-classpath.xsl
Url:
http://svn.apache.org/viewcvs/cocoon/branches/BRANCH_2_1_X/tools/ide/eclipse/blocks-classpath.xsl?view=diffrev=109324p1=cocoon/branches/BRANCH_2_1_X/tools/ide/eclipse/blocks-classpath.xslr1=109323p2=cocoon/branches/BRANCH_2_1_X/tools/ide/eclipse/blocks-classpath.xslr2=109324
==
--- cocoon/branches/BRANCH_2_1_X/tools/ide/eclipse/blocks-classpath.xsl
(original)
+++ cocoon/branches/BRANCH_2_1_X/tools/ide/eclipse/blocks-classpath.xsl Wed Dec
1 03:06:07 2004
@@ -87,9 +87,9 @@
filtering=yes
overwrite=yes
filterset
-filter token=SRC_DIRS value=${{srcs}}:@eclipse-src@/
-filter token=LIBS value=${{libs}}:@eclipse-libs@/
-filter token=MOCKS_DIRS
value=${{mockss}}:@eclipse-mocks@/
+filter token=SRC_DIRS value=[EMAIL PROTECTED]@/
+filter token=LIBS value=[EMAIL PROTECTED]@/
+filter token=MOCKS_DIRS value=[EMAIL PROTECTED]@/
filter token=OUTPUT_DIR
value=${{ide.eclipse.outputdir}}/
/filterset
/copy
@@ -106,15 +106,14 @@
!-- clean up src, libs and mocks --
replace file=${{build.temp}}/classpath-temp.xml
-token=:@eclipse-src@ value=/
+token=[EMAIL PROTECTED]@ value=/
replace file=${{build.temp}}/classpath-temp.xml
-token=:@eclipse-libs@ value=/
+token=[EMAIL PROTECTED]@ value=/
replace file=${{build.temp}}/classpath-temp.xml
token=@eclipse-libs@ value=/
-
replace file=${{build.temp}}/classpath-temp.xml
-token=:@eclipse-mocks@ value=/
+token=[EMAIL PROTECTED]@ value=/
!-- split the path in 'item' XML elements --
replace file=${{build.temp}}/classpath-temp.xml
@@ -132,7 +131,7 @@
!-- now build the .classpath file --
echoGenerate classpath/echo
-xslt in=${{build.temp}}/classpath-temp.xml
out=${{basedir}}/.classpath
+xslt in=${{build.temp}}/classpath-temp.xml
out=${{basedir}}/.classpath
style=${{tools}}/ide/eclipse/make-classpath.xsl
param name=exportlib
expression=${{ide.eclipse.export.libs}}/
/xslt
@@ -168,7 +167,7 @@
/path
property name=src-{$block-name}
refid=src-{$block-name}/
replace file=${{build.temp}}/classpath-temp.xml
-token=@eclipse-src@
value=${{src-{$block-name}}}:@eclipse-src@/
+token=@eclipse-src@ value=[EMAIL PROTECTED]@/
/then
/if
!-- block mocks directory --
@@ -182,7 +181,7 @@
/path
property name=mocks-{$block-name}
refid=mocks-{$block-name}/
replace file=${{build.temp}}/classpath-temp.xml
-token=@eclipse-mocks@
value=${{mocks-{$block-name}}}:@eclipse-mocks@/
+token=@eclipse-mocks@ value=[EMAIL
PROTECTED]@/
/then
/if
@@ -197,7 +196,7 @@
/path
property name=lib-{$block-name}
refid=lib-{$block-name}/
replace file=${{build.temp}}/classpath-temp.xml
-token=@eclipse-libs@
value=${{lib-{$block-name}}}:@eclipse-libs@/
+token=@eclipse-libs@ value=[EMAIL PROTECTED]@/
/then
/if
!-- Add optional libraries used by this block --
@@ -222,7 +221,7 @@
/not
then
replace
file=${{build.temp}}/classpath-temp.xml
-token=@eclipse-libs@
value=[EMAIL PROTECTED]:@eclipse-libs@/
+token=@eclipse-libs@
value=[EMAIL PROTECTED]@eclipse-libs@/
/then
/if
/then
Modified: cocoon/branches/BRANCH_2_1_X/tools/targets/ide-build.xml
Url:
http://svn.apache.org/viewcvs/cocoon/branches/BRANCH_2_1_X/tools/targets/ide-build.xml?view=diffrev=109324p1=cocoon/branches/BRANCH_2_1_X
svn commit: r109325 - in cocoon/trunk: . tools/ide/eclipse tools/targets
Author: lgawron
Date: Wed Dec 1 03:23:24 2004
New Revision: 109325
URL: http://svn.apache.org/viewcvs?view=revrev=109325
Log:
port eclipse-customized-project target from 2.1.x
small other synchronizations (mainly whitespaces)
Added:
cocoon/trunk/tools/ide/eclipse/blocks-classpath.xsl
Modified:
cocoon/trunk/blocks.properties
cocoon/trunk/tools/ide/eclipse/make-classpath.xsl
cocoon/trunk/tools/targets/compile-build.xml
cocoon/trunk/tools/targets/ide-build.xml
cocoon/trunk/tools/targets/init-build.xml
cocoon/trunk/tools/targets/validate-build.xml
cocoon/trunk/tools/targets/webapp-build.xml
Modified: cocoon/trunk/blocks.properties
Url:
http://svn.apache.org/viewcvs/cocoon/trunk/blocks.properties?view=diffrev=109325p1=cocoon/trunk/blocks.propertiesr1=109324p2=cocoon/trunk/blocks.propertiesr2=109325
==
--- cocoon/trunk/blocks.properties (original)
+++ cocoon/trunk/blocks.properties Wed Dec 1 03:23:24 2004
@@ -82,9 +82,9 @@
#-[dependency]: session-fw depends on xsp.
#-[dependency]: session-fw is needed by authentication-fw, portal,
portal-fw.
#include.block.session-fw=false
-#include.block.web3=false
#-[dependency]: velocity is needed by petstore, scratchpad.
#include.block.velocity=false
+#include.block.web3=false
#-[dependency]: xmldb depends on databases.
#include.block.xmldb=false
#-[dependency]: xsp is needed by chaperon, databases, eventcache,
forms, lucene, python, scratchpad, session-fw, woody.
Added: cocoon/trunk/tools/ide/eclipse/blocks-classpath.xsl
Url:
http://svn.apache.org/viewcvs/cocoon/trunk/tools/ide/eclipse/blocks-classpath.xsl?view=autorev=109325
==
--- (empty file)
+++ cocoon/trunk/tools/ide/eclipse/blocks-classpath.xsl Wed Dec 1 03:23:24 2004
@@ -0,0 +1,236 @@
+?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.
+--
+
+xsl:stylesheet version=1.0 xmlns:xsl=http://www.w3.org/1999/XSL/Transform;
+xsl:output method=xml indent=yes/
+
+xsl:template match=/
+project default=generate-customized-eclipse-project basedir=.
name=blocks-eclipse
+descriptionAutogenerated Ant build file that builds customized
eclipse project for selected blocks./description
+xsl:apply-templates select=module/
+/project
+/xsl:template
+
+xsl:template match=module
+xsl:variable name=cocoon-blocks select=project[starts-with(@name,
'cocoon-block-')]/
+
+!-- Define wich blocks will be included --
+target name=init
+xsl:for-each select=$cocoon-blocks
+xsl:variable name=block-name
select=substring-after(@name,'cocoon-block-')/
+condition property=include.block.{$block-name}
+not
+istrue value=${{exclude.block.{$block-name}}}/
+/not
+/condition
+condition property=internal.exclude.block.{$block-name}
+isfalse value=${{include.block.{$block-name}}}/
+/condition
+/xsl:for-each
+
+!-- prepare the various paths that will form the project --
+path id=srcs
+!-- main source dir --
+pathelement path=${{src.core}}/
+pathelement path=${{java}}/
+!-- samples source dir --
+!-- FIXME: Load based on local.build.properties --
+pathelement path=${{src}}/samples/
+!-- deprecated source dir --
+!-- FIXME: Load based on local.build.properties --
+pathelement path=${{src}}/deprecated/java/
+!-- test source dir --
+pathelement path=${{src.core.test}}/
+pathelement path=${{src}}/test/
+/path
+!--core mocks --
+path id=mockss
+dirset dir=${{src}}
+include name=mocks/
+/dirset
+/path
+
+path id=libs
+!-- main libs --
+fileset dir=${{lib}}
+include name=core/*.jar/
+include name=local/*.jar/
+include name=endorsed/*.jar/
+/fileset
+!-- tools libs
svn commit: r109327 - /cocoon/trunk/gump.xml
Author: lgawron Date: Wed Dec 1 03:27:31 2004 New Revision: 109327 URL: http://svn.apache.org/viewcvs?view=revrev=109327 Log: add jexl dependency on cocoon-block-template Modified: cocoon/trunk/gump.xml Modified: cocoon/trunk/gump.xml Url: http://svn.apache.org/viewcvs/cocoon/trunk/gump.xml?view=diffrev=109327p1=cocoon/trunk/gump.xmlr1=109326p2=cocoon/trunk/gump.xmlr2=109327 == --- cocoon/trunk/gump.xml (original) +++ cocoon/trunk/gump.xml Wed Dec 1 03:27:31 2004 @@ -1224,6 +1224,7 @@ /ant depend project=cocoon inherit=all/ +depend project=commons-jexl/ work nested=tools/anttasks/ home nested=build/cocoon-@@DATE@@/
svn commit: r109328 - in cocoon/branches/BRANCH_2_1_X: . src/blocks/template src/blocks/template/conf src/blocks/template/java src/blocks/template/java/org src/blocks/template/java/org/apache src/blocks/template/java/org/apache/cocoon src/blocks/template/java/org/apache/cocoon/el src/blocks/template/java/org/apache/cocoon/el/jexl src/blocks/template/java/org/apache/cocoon/el/util src/blocks/template/java/org/apache/cocoon/template src/blocks/template/java/org/apache/cocoon/template/generation src/blocks/template/java/org/apache/cocoon/template/script src/blocks/template/java/org/apache/cocoon/template/tag src/blocks/template/java/org/apache/cocoon/template/tag/samples src/blocks/template/java/org/apache/cocoon/util src/blocks/template/samples src/blocks/template/test src/blocks/template/test/org src/blocks/template/test/org/apache src/blocks/template/test/org/apache/cocoon src/blocks/template/test/org/apache/cocoon/el src/blocks/template/test/org/apache/cocoon/el/jexl src/blocks/template/test/org/apache/cocoon/el/util src/blocks/template/test/org/apache/cocoon/template src/blocks/template/test/org/apache/cocoon/template/generation src/blocks/template/test/org/apache/cocoon/template/script src/blocks/template/test/org/apache/cocoon/util
Author: lgawron Date: Wed Dec 1 03:51:37 2004 New Revision: 109328 URL: http://svn.apache.org/viewcvs?view=revrev=109328 Log: initial (very initial) cocoon-template-block Added: cocoon/branches/BRANCH_2_1_X/src/blocks/template/ cocoon/branches/BRANCH_2_1_X/src/blocks/template/conf/ cocoon/branches/BRANCH_2_1_X/src/blocks/template/java/ cocoon/branches/BRANCH_2_1_X/src/blocks/template/java/org/ cocoon/branches/BRANCH_2_1_X/src/blocks/template/java/org/apache/ cocoon/branches/BRANCH_2_1_X/src/blocks/template/java/org/apache/cocoon/ cocoon/branches/BRANCH_2_1_X/src/blocks/template/java/org/apache/cocoon/el/ cocoon/branches/BRANCH_2_1_X/src/blocks/template/java/org/apache/cocoon/el/AbstractExpression.java cocoon/branches/BRANCH_2_1_X/src/blocks/template/java/org/apache/cocoon/el/Context.java cocoon/branches/BRANCH_2_1_X/src/blocks/template/java/org/apache/cocoon/el/DefaultContext.java cocoon/branches/BRANCH_2_1_X/src/blocks/template/java/org/apache/cocoon/el/Expression.java cocoon/branches/BRANCH_2_1_X/src/blocks/template/java/org/apache/cocoon/el/ExpressionCompiler.java cocoon/branches/BRANCH_2_1_X/src/blocks/template/java/org/apache/cocoon/el/GenericExpressionCompiler.java cocoon/branches/BRANCH_2_1_X/src/blocks/template/java/org/apache/cocoon/el/jexl/ cocoon/branches/BRANCH_2_1_X/src/blocks/template/java/org/apache/cocoon/el/jexl/JexlContext.java cocoon/branches/BRANCH_2_1_X/src/blocks/template/java/org/apache/cocoon/el/jexl/JexlExpression.java cocoon/branches/BRANCH_2_1_X/src/blocks/template/java/org/apache/cocoon/el/jexl/JexlExpressionCompiler.java cocoon/branches/BRANCH_2_1_X/src/blocks/template/java/org/apache/cocoon/el/util/ cocoon/branches/BRANCH_2_1_X/src/blocks/template/java/org/apache/cocoon/el/util/ELUtils.java cocoon/branches/BRANCH_2_1_X/src/blocks/template/java/org/apache/cocoon/el/util/ParseHandler.java cocoon/branches/BRANCH_2_1_X/src/blocks/template/java/org/apache/cocoon/template/ cocoon/branches/BRANCH_2_1_X/src/blocks/template/java/org/apache/cocoon/template/generation/ cocoon/branches/BRANCH_2_1_X/src/blocks/template/java/org/apache/cocoon/template/generation/TemplateGenerator.java cocoon/branches/BRANCH_2_1_X/src/blocks/template/java/org/apache/cocoon/template/script/ cocoon/branches/BRANCH_2_1_X/src/blocks/template/java/org/apache/cocoon/template/script/AbstractToken.java cocoon/branches/BRANCH_2_1_X/src/blocks/template/java/org/apache/cocoon/template/script/AttributeToken.java cocoon/branches/BRANCH_2_1_X/src/blocks/template/java/org/apache/cocoon/template/script/CharactersToken.java cocoon/branches/BRANCH_2_1_X/src/blocks/template/java/org/apache/cocoon/template/script/ElementToken.java cocoon/branches/BRANCH_2_1_X/src/blocks/template/java/org/apache/cocoon/template/script/ExpressionToken.java cocoon/branches/BRANCH_2_1_X/src/blocks/template/java/org/apache/cocoon/template/script/PlainElementToken.java cocoon/branches/BRANCH_2_1_X/src/blocks/template/java/org/apache/cocoon/template/script/Script.java cocoon/branches/BRANCH_2_1_X/src/blocks/template/java/org/apache/cocoon/template/script/ScriptCompiler.java cocoon/branches/BRANCH_2_1_X/src/blocks/template/java/org/apache/cocoon/template/script/ScriptContext.java cocoon/branches/BRANCH_2_1_X/src/blocks/template/java/org/apache/cocoon/template/script/ScriptInvoker.java cocoon/branches/BRANCH_2_1_X/src/blocks/template/java/org/apache/cocoon/template/script/TagRepository.java cocoon/branches/BRANCH_2_1_X/src/blocks/template/java/org/apache/cocoon/template/script/Token.java cocoon/branches/BRANCH_2_1_X/src/blocks/template/java/org/apache/cocoon/template/tag/ cocoon/branches/BRANCH_2_1_X/src/blocks/template/java/org/apache/cocoon/template/tag/AbstractTag.java cocoon/branches/BRANCH_2_1_X/src/blocks/template/java/org/apache/cocoon/template/tag/Tag.java cocoon/branches/BRANCH_2_1_X/src/blocks/template/java/org/apache/cocoon/template/tag/samples/ cocoon/branches/BRANCH_2_1_X/src/blocks/template/java/org/apache/cocoon/template/tag/samples/DuplicateTag.java cocoon/branches/BRANCH_2_1_X/src/blocks/template/java/org/apache/cocoon/util/ cocoon/branches/BRANCH_2_1_X/src/blocks/template/java/org/apache/cocoon/util/ContextStackMap.java cocoon/branches/BRANCH_2_1_X/src/blocks/template/java/org/apache/cocoon/util/IncludingConfiguration.java cocoon/branches/BRANCH_2_1_X/src/blocks/template/java/org/apache/cocoon/util/TypeUtils.java cocoon/branches/BRANCH_2_1_X/src/blocks/template/samples/ cocoon/branches/BRANCH_2_1_X/src/blocks/template/test/ cocoon/branches/BRANCH_2_1_X/src/blocks/template/test/org/ cocoon/branches/BRANCH_2_1_X/src/blocks/template/test/org/apache/ cocoon/branches/BRANCH_2_1_X/src/blocks/template/test/org/apache/cocoon/ cocoon/branches/BRANCH_2_1_X/src/blocks/template/test/org/apache/cocoon/ExtendedSitemapComponentTestCase.java cocoon/branches
svn commit: r109330 - in cocoon/branches/BRANCH_2_1_X/src: blocks/apples/java/org/apache/cocoon/components/flow/apples java/org/apache/cocoon/components/flow java/org/apache/cocoon/components/flow/javascript/fom
Author: lgawron
Date: Wed Dec 1 04:01:14 2004
New Revision: 109330
URL: http://svn.apache.org/viewcvs?view=revrev=109330
Log:
fix: (patch) warn about use of continuation in wrong sitemap.
Thanks to Johan Stuyts johan(at)hippo.nl.
whitespace tweaks
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/java/org/apache/cocoon/components/flow/ContinuationsManagerImpl.java
cocoon/branches/BRANCH_2_1_X/src/java/org/apache/cocoon/components/flow/WebContinuation.java
cocoon/branches/BRANCH_2_1_X/src/java/org/apache/cocoon/components/flow/javascript/fom/FOM_Cocoon.java
cocoon/branches/BRANCH_2_1_X/src/java/org/apache/cocoon/components/flow/javascript/fom/FOM_WebContinuation.java
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?view=diffrev=109330p1=cocoon/branches/BRANCH_2_1_X/src/blocks/apples/java/org/apache/cocoon/components/flow/apples/ApplesProcessor.javar1=109329p2=cocoon/branches/BRANCH_2_1_X/src/blocks/apples/java/org/apache/cocoon/components/flow/apples/ApplesProcessor.javar2=109330
==
---
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
Wed Dec 1 04:01:14 2004
@@ -125,7 +125,7 @@
DefaultAppleResponse res = new DefaultAppleResponse(cocoonResponse);
try {
-app.process(req, res);
+app.process(req, res);
} finally {
if (wk == null) {
// dispose stateless apple immediatelly
Modified:
cocoon/branches/BRANCH_2_1_X/src/java/org/apache/cocoon/components/flow/ContinuationsManagerImpl.java
Url:
http://svn.apache.org/viewcvs/cocoon/branches/BRANCH_2_1_X/src/java/org/apache/cocoon/components/flow/ContinuationsManagerImpl.java?view=diffrev=109330p1=cocoon/branches/BRANCH_2_1_X/src/java/org/apache/cocoon/components/flow/ContinuationsManagerImpl.javar1=109329p2=cocoon/branches/BRANCH_2_1_X/src/java/org/apache/cocoon/components/flow/ContinuationsManagerImpl.javar2=109330
==
---
cocoon/branches/BRANCH_2_1_X/src/java/org/apache/cocoon/components/flow/ContinuationsManagerImpl.java
(original)
+++
cocoon/branches/BRANCH_2_1_X/src/java/org/apache/cocoon/components/flow/ContinuationsManagerImpl.java
Wed Dec 1 04:01:14 2004
@@ -200,8 +200,16 @@
// REVISIT: Is the following check needed to avoid threading issues:
// return wk only if !(wk.hasExpired) ?
WebContinuation kont = (WebContinuation) idToWebCont.get(id);
-if ( kont != null )
- return (kont.interpreterMatches(interpreterId)) ? kont : null;
+if ( kont != null ) {
+boolean interpreterMatches =
kont.interpreterMatches(interpreterId);
+if (!interpreterMatches getLogger().isWarnEnabled()) {
+getLogger().warn(WK: Continuation ( + kont.getId()
+ + ) lookup for wrong interpreter. Bound to:
+ + kont.getInterpreterId() + , looked up for:
+ + interpreterId);
+}
+return interpreterMatches ? kont : null;
+}
return null;
}
Modified:
cocoon/branches/BRANCH_2_1_X/src/java/org/apache/cocoon/components/flow/WebContinuation.java
Url:
http://svn.apache.org/viewcvs/cocoon/branches/BRANCH_2_1_X/src/java/org/apache/cocoon/components/flow/WebContinuation.java?view=diffrev=109330p1=cocoon/branches/BRANCH_2_1_X/src/java/org/apache/cocoon/components/flow/WebContinuation.javar1=109329p2=cocoon/branches/BRANCH_2_1_X/src/java/org/apache/cocoon/components/flow/WebContinuation.javar2=109330
==
---
cocoon/branches/BRANCH_2_1_X/src/java/org/apache/cocoon/components/flow/WebContinuation.java
(original)
+++
cocoon/branches/BRANCH_2_1_X/src/java/org/apache/cocoon/components/flow/WebContinuation.java
Wed Dec 1 04:01:14 2004
@@ -198,6 +198,16 @@
}
/**
+ * Returns the string identifier of the interpreter to which
+ * this codeWebContinuation/code is bound.
+ *
+ * @return a codeString/code value
+ */
+public String getInterpreterId() {
+return interpreterId;
+}
+
+/**
* Returns the last time this
* codeWebContinuation/code was accessed.
*
Modified:
cocoon/branches/BRANCH_2_1_X/src/java/org/apache/cocoon
svn commit: r109331 - /cocoon/trunk/src/java/org/apache/cocoon/components/flow/ContinuationsManagerImpl.java /cocoon/trunk/src/java/org/apache/cocoon/components/flow/WebContinuation.java
Author: lgawron
Date: Wed Dec 1 04:06:32 2004
New Revision: 109331
URL: http://svn.apache.org/viewcvs?view=revrev=109331
Log:
fix: (patch - bugzilla entry 32465) warn about use of continuation in wrong
sitemap.
Thanks to Johan Stuyts johan(at)hippo.nl.
Modified:
cocoon/trunk/src/java/org/apache/cocoon/components/flow/ContinuationsManagerImpl.java
cocoon/trunk/src/java/org/apache/cocoon/components/flow/WebContinuation.java
Modified:
cocoon/trunk/src/java/org/apache/cocoon/components/flow/ContinuationsManagerImpl.java
Url:
http://svn.apache.org/viewcvs/cocoon/trunk/src/java/org/apache/cocoon/components/flow/ContinuationsManagerImpl.java?view=diffrev=109331p1=cocoon/trunk/src/java/org/apache/cocoon/components/flow/ContinuationsManagerImpl.javar1=109330p2=cocoon/trunk/src/java/org/apache/cocoon/components/flow/ContinuationsManagerImpl.javar2=109331
==
---
cocoon/trunk/src/java/org/apache/cocoon/components/flow/ContinuationsManagerImpl.java
(original)
+++
cocoon/trunk/src/java/org/apache/cocoon/components/flow/ContinuationsManagerImpl.java
Wed Dec 1 04:06:32 2004
@@ -167,8 +167,16 @@
// REVISIT: Is the following check needed to avoid threading issues:
// return wk only if !(wk.hasExpired) ?
WebContinuation kont = (WebContinuation) idToWebCont.get(id);
-if ( kont != null )
- return (kont.interpreterMatches(interpreterId)) ? kont : null;
+if ( kont != null ) {
+boolean interpreterMatches =
kont.interpreterMatches(interpreterId);
+if (!interpreterMatches getLogger().isWarnEnabled()) {
+getLogger().warn(WK: Continuation ( + kont.getId()
+ + ) lookup for wrong interpreter. Bound to:
+ + kont.getInterpreterId() + , looked up for:
+ + interpreterId);
+}
+return interpreterMatches ? kont : null;
+}
return null;
}
Modified:
cocoon/trunk/src/java/org/apache/cocoon/components/flow/WebContinuation.java
Url:
http://svn.apache.org/viewcvs/cocoon/trunk/src/java/org/apache/cocoon/components/flow/WebContinuation.java?view=diffrev=109331p1=cocoon/trunk/src/java/org/apache/cocoon/components/flow/WebContinuation.javar1=109330p2=cocoon/trunk/src/java/org/apache/cocoon/components/flow/WebContinuation.javar2=109331
==
---
cocoon/trunk/src/java/org/apache/cocoon/components/flow/WebContinuation.java
(original)
+++
cocoon/trunk/src/java/org/apache/cocoon/components/flow/WebContinuation.java
Wed Dec 1 04:06:32 2004
@@ -198,6 +198,16 @@
}
/**
+ * Returns the string identifier of the interpreter to which
+ * this codeWebContinuation/code is bound.
+ *
+ * @return a codeString/code value
+ */
+public String getInterpreterId() {
+return interpreterId;
+}
+
+/**
* Returns the last time this
* codeWebContinuation/code was accessed.
*
svn commit: r109356 - /cocoon/branches/BRANCH_2_1_X/blocks.properties /cocoon/branches/BRANCH_2_1_X/gump.xml /cocoon/branches/BRANCH_2_1_X/src/blocks/template /cocoon/branches/BRANCH_2_1_X/status.xml
Author: lgawron Date: Wed Dec 1 08:46:18 2004 New Revision: 109356 URL: http://svn.apache.org/viewcvs?view=revrev=109356 Log: removed cocoon template block from 2.1.x branch Removed: cocoon/branches/BRANCH_2_1_X/src/blocks/template/ Modified: cocoon/branches/BRANCH_2_1_X/blocks.properties cocoon/branches/BRANCH_2_1_X/gump.xml cocoon/branches/BRANCH_2_1_X/status.xml Modified: cocoon/branches/BRANCH_2_1_X/blocks.properties Url: http://svn.apache.org/viewcvs/cocoon/branches/BRANCH_2_1_X/blocks.properties?view=diffrev=109356p1=cocoon/branches/BRANCH_2_1_X/blocks.propertiesr1=109355p2=cocoon/branches/BRANCH_2_1_X/blocks.propertiesr2=109356 == --- cocoon/branches/BRANCH_2_1_X/blocks.properties (original) +++ cocoon/branches/BRANCH_2_1_X/blocks.properties Wed Dec 1 08:46:18 2004 @@ -145,7 +145,6 @@ #include.block.stx=false #-[dependency]: taglib is needed by faces. #include.block.taglib=false -#include.block.template=false #-[dependency]: tour depends on batik, fop, forms. #include.block.tour=false #-[dependency]: webdav depends on repository. Modified: cocoon/branches/BRANCH_2_1_X/gump.xml Url: http://svn.apache.org/viewcvs/cocoon/branches/BRANCH_2_1_X/gump.xml?view=diffrev=109356p1=cocoon/branches/BRANCH_2_1_X/gump.xmlr1=109355p2=cocoon/branches/BRANCH_2_1_X/gump.xmlr2=109356 == --- cocoon/branches/BRANCH_2_1_X/gump.xml (original) +++ cocoon/branches/BRANCH_2_1_X/gump.xml Wed Dec 1 08:46:18 2004 @@ -1353,24 +1353,6 @@ nag from=Gump lt;general@gump.apache.orggt; to=dev@cocoon.apache.org/ /project - project name=cocoon-block-template status=unstable -packageorg.apache.cocoon/package - -ant target=gump-block - property name=block-name value=template/ - property name=version value=@@DATE@@/ -/ant - -depend project=cocoon inherit=all/ -depend project=commons-jexl/ - -work nested=tools/anttasks/ -home nested=build/cocoon-@@DATE@@/ - -jar name=blocks/template-block.jar/ - -nag from=Gump lt;general@gump.apache.orggt; to=dev@cocoon.apache.org/ - /project !-- COCOON SUPPLIED PROJECTS Modified: cocoon/branches/BRANCH_2_1_X/status.xml Url: http://svn.apache.org/viewcvs/cocoon/branches/BRANCH_2_1_X/status.xml?view=diffrev=109356p1=cocoon/branches/BRANCH_2_1_X/status.xmlr1=109355p2=cocoon/branches/BRANCH_2_1_X/status.xmlr2=109356 == --- cocoon/branches/BRANCH_2_1_X/status.xml (original) +++ cocoon/branches/BRANCH_2_1_X/status.xml Wed Dec 1 08:46:18 2004 @@ -202,9 +202,6 @@ changes release version=@version@ date=@date@ - action dev=LG type=add due-to=Jonas Ekstedt due-to-email=[EMAIL PROTECTED] -initial revision of new block: Cocoon Templates - /action action dev=AG type=fix fixes-bug=32408 due-to=Juan Jose Pablos due-to-email=[EMAIL PROTECTED] typo on the date-selector doc. /action
svn commit: r109259 - in cocoon/trunk: . src/blocks/template src/blocks/template/conf src/blocks/template/java src/blocks/template/java/org src/blocks/template/java/org/apache src/blocks/template/java/org/apache/cocoon src/blocks/template/java/org/apache/cocoon/el src/blocks/template/java/org/apache/cocoon/el/jexl src/blocks/template/java/org/apache/cocoon/el/util src/blocks/template/java/org/apache/cocoon/template src/blocks/template/java/org/apache/cocoon/template/generation src/blocks/template/java/org/apache/cocoon/template/script src/blocks/template/java/org/apache/cocoon/template/tag src/blocks/template/java/org/apache/cocoon/template/tag/samples src/blocks/template/java/org/apache/cocoon/util src/blocks/template/samples src/blocks/template/test src/blocks/template/test/org src/blocks/template/test/org/apache src/blocks/template/test/org/apache/cocoon src/blocks/template/test/org/apache/cocoon/el src/blocks/template/test/org/apache/cocoon/el/jexl src/blocks/template/test/org/apache/cocoon/el/util src/blocks/template/test/org/apache/cocoon/template src/blocks/template/test/org/apache/cocoon/template/generation src/blocks/template/test/org/apache/cocoon/template/script src/blocks/template/test/org/apache/cocoon/util
Author: lgawron Date: Tue Nov 30 15:41:24 2004 New Revision: 109259 URL: http://svn.apache.org/viewcvs?view=revrev=109259 Log: initial (very initial) cocoon-template-block Added: cocoon/trunk/src/blocks/template/ cocoon/trunk/src/blocks/template/conf/ cocoon/trunk/src/blocks/template/java/ cocoon/trunk/src/blocks/template/java/org/ cocoon/trunk/src/blocks/template/java/org/apache/ cocoon/trunk/src/blocks/template/java/org/apache/cocoon/ cocoon/trunk/src/blocks/template/java/org/apache/cocoon/el/ cocoon/trunk/src/blocks/template/java/org/apache/cocoon/el/AbstractExpression.java cocoon/trunk/src/blocks/template/java/org/apache/cocoon/el/Context.java cocoon/trunk/src/blocks/template/java/org/apache/cocoon/el/DefaultContext.java cocoon/trunk/src/blocks/template/java/org/apache/cocoon/el/Expression.java cocoon/trunk/src/blocks/template/java/org/apache/cocoon/el/ExpressionCompiler.java cocoon/trunk/src/blocks/template/java/org/apache/cocoon/el/GenericExpressionCompiler.java cocoon/trunk/src/blocks/template/java/org/apache/cocoon/el/jexl/ cocoon/trunk/src/blocks/template/java/org/apache/cocoon/el/jexl/JexlContext.java cocoon/trunk/src/blocks/template/java/org/apache/cocoon/el/jexl/JexlExpression.java cocoon/trunk/src/blocks/template/java/org/apache/cocoon/el/jexl/JexlExpressionCompiler.java cocoon/trunk/src/blocks/template/java/org/apache/cocoon/el/util/ cocoon/trunk/src/blocks/template/java/org/apache/cocoon/el/util/ELUtils.java cocoon/trunk/src/blocks/template/java/org/apache/cocoon/el/util/ParseHandler.java cocoon/trunk/src/blocks/template/java/org/apache/cocoon/template/ cocoon/trunk/src/blocks/template/java/org/apache/cocoon/template/generation/ cocoon/trunk/src/blocks/template/java/org/apache/cocoon/template/generation/TemplateGenerator.java cocoon/trunk/src/blocks/template/java/org/apache/cocoon/template/script/ cocoon/trunk/src/blocks/template/java/org/apache/cocoon/template/script/AbstractToken.java cocoon/trunk/src/blocks/template/java/org/apache/cocoon/template/script/AttributeToken.java cocoon/trunk/src/blocks/template/java/org/apache/cocoon/template/script/CharactersToken.java cocoon/trunk/src/blocks/template/java/org/apache/cocoon/template/script/ElementToken.java cocoon/trunk/src/blocks/template/java/org/apache/cocoon/template/script/ExpressionToken.java cocoon/trunk/src/blocks/template/java/org/apache/cocoon/template/script/PlainElementToken.java cocoon/trunk/src/blocks/template/java/org/apache/cocoon/template/script/Script.java cocoon/trunk/src/blocks/template/java/org/apache/cocoon/template/script/ScriptCompiler.java cocoon/trunk/src/blocks/template/java/org/apache/cocoon/template/script/ScriptContext.java cocoon/trunk/src/blocks/template/java/org/apache/cocoon/template/script/ScriptInvoker.java cocoon/trunk/src/blocks/template/java/org/apache/cocoon/template/script/TagRepository.java cocoon/trunk/src/blocks/template/java/org/apache/cocoon/template/script/Token.java cocoon/trunk/src/blocks/template/java/org/apache/cocoon/template/tag/ cocoon/trunk/src/blocks/template/java/org/apache/cocoon/template/tag/AbstractTag.java cocoon/trunk/src/blocks/template/java/org/apache/cocoon/template/tag/Tag.java cocoon/trunk/src/blocks/template/java/org/apache/cocoon/template/tag/samples/ cocoon/trunk/src/blocks/template/java/org/apache/cocoon/template/tag/samples/DuplicateTag.java cocoon/trunk/src/blocks/template/java/org/apache/cocoon/util/ cocoon/trunk/src/blocks/template/java/org/apache/cocoon/util/ContextStackMap.java cocoon/trunk/src/blocks/template/java/org/apache/cocoon/util/IncludingConfiguration.java cocoon/trunk/src/blocks/template/java/org/apache/cocoon/util/TypeUtils.java cocoon/trunk/src/blocks/template/samples/ cocoon/trunk/src/blocks/template/test/ cocoon/trunk/src/blocks/template/test/org/ cocoon/trunk/src/blocks/template/test/org/apache/ cocoon/trunk/src/blocks/template/test/org/apache/cocoon/ cocoon/trunk/src/blocks/template/test/org/apache/cocoon/ExtendedSitemapComponentTestCase.java cocoon/trunk/src/blocks/template/test/org/apache/cocoon/el/ cocoon/trunk/src/blocks/template/test/org/apache/cocoon/el/jexl/ cocoon/trunk/src/blocks/template/test/org/apache/cocoon/el/jexl/JexlExpressionTestCase.java cocoon/trunk/src/blocks/template/test/org/apache/cocoon/el/util/ cocoon/trunk/src/blocks/template/test/org/apache/cocoon/el/util/ELUtilsTestCase.java cocoon/trunk/src/blocks/template/test/org/apache/cocoon/template/ cocoon/trunk/src/blocks/template/test/org/apache/cocoon/template/generation/ cocoon/trunk/src/blocks/template/test/org/apache/cocoon/template/generation/TemplateGenerator-generate.xml cocoon/trunk/src/blocks/template/test/org/apache/cocoon/template/generation/TemplateGenerator-tag-output.xml cocoon/trunk/src/blocks/template/test/org/apache/cocoon/template/generation
svn commit: r109260 - /cocoon/trunk/status.xml
Author: lgawron Date: Tue Nov 30 15:47:36 2004 New Revision: 109260 URL: http://svn.apache.org/viewcvs?view=revrev=109260 Log: update status.xml Modified: cocoon/trunk/status.xml Modified: cocoon/trunk/status.xml Url: http://svn.apache.org/viewcvs/cocoon/trunk/status.xml?view=diffrev=109260p1=cocoon/trunk/status.xmlr1=109259p2=cocoon/trunk/status.xmlr2=109260 == --- cocoon/trunk/status.xml (original) +++ cocoon/trunk/status.xml Tue Nov 30 15:47:36 2004 @@ -202,6 +202,9 @@ changes release version=@version@ date=@date@ + action dev=LG type=add due-to=Jonas Ekstedt due-to-email=[EMAIL PROTECTED] +initial revision of new block: Cocoon Templates + /action action dev=RP type=add cForms: added HTMLCleaning convertor (taken from Outerthought's Daisy) that cleans up the result by HTMLArea fields. The cleanup process, that is based upon
svn commit: r106909 - /cocoon/branches/BRANCH_2_1_X/src/java/org/apache/cocoon/components/flow/ContinuationsManagerImpl.java
Author: lgawron
Date: Mon Nov 29 06:10:06 2004
New Revision: 106909
URL: http://svn.apache.org/viewcvs?view=revrev=106909
Log:
fix possible NPE
Modified:
cocoon/branches/BRANCH_2_1_X/src/java/org/apache/cocoon/components/flow/ContinuationsManagerImpl.java
Modified:
cocoon/branches/BRANCH_2_1_X/src/java/org/apache/cocoon/components/flow/ContinuationsManagerImpl.java
Url:
http://svn.apache.org/viewcvs/cocoon/branches/BRANCH_2_1_X/src/java/org/apache/cocoon/components/flow/ContinuationsManagerImpl.java?view=diffrev=106909p1=cocoon/branches/BRANCH_2_1_X/src/java/org/apache/cocoon/components/flow/ContinuationsManagerImpl.javar1=106908p2=cocoon/branches/BRANCH_2_1_X/src/java/org/apache/cocoon/components/flow/ContinuationsManagerImpl.javar2=106909
==
---
cocoon/branches/BRANCH_2_1_X/src/java/org/apache/cocoon/components/flow/ContinuationsManagerImpl.java
(original)
+++
cocoon/branches/BRANCH_2_1_X/src/java/org/apache/cocoon/components/flow/ContinuationsManagerImpl.java
Mon Nov 29 06:10:06 2004
@@ -116,9 +116,6 @@
continuationsInvalidated = new CounterInstrument(invalidates);
}
-/**
- * Get the command sink so that we can be notified of changes
- */
public void service(final ServiceManager manager) throws ServiceException {
this.serviceManager = manager;
}
@@ -132,11 +129,11 @@
try {
final RunnableManager runnableManager =
(RunnableManager)serviceManager.lookup(RunnableManager.ROLE);
runnableManager.execute( new Runnable() {
-public void run()
-{
-expireContinuations();
-}
-}, initialDelay, interval);
+public void run()
+{
+expireContinuations();
+}
+}, initialDelay, interval);
serviceManager.release(runnableManager);
} catch (Exception e) {
getLogger().warn(Could not enqueue continuations expiration task.
+
@@ -203,7 +200,9 @@
// REVISIT: Is the following check needed to avoid threading issues:
// return wk only if !(wk.hasExpired) ?
WebContinuation kont = (WebContinuation) idToWebCont.get(id);
-return (kont.interpreterMatches(interpreterId)) ? kont : null;
+if ( kont != null )
+ return (kont.interpreterMatches(interpreterId)) ? kont : null;
+return null;
}
/**
@@ -226,7 +225,7 @@
WebContinuation parent,
int ttl,
String interpreterId,
- ContinuationsDisposer
disposer ) {
+ ContinuationsDisposer
disposer) {
char[] result = new char[bytes.length * 2];
WebContinuation wk = null;
svn commit: r106910 - /cocoon/trunk/src/java/org/apache/cocoon/components/flow/ContinuationsManagerImpl.java
Author: lgawron Date: Mon Nov 29 06:11:58 2004 New Revision: 106910 URL: http://svn.apache.org/viewcvs?view=revrev=106910 Log: fix possible NPE Modified: cocoon/trunk/src/java/org/apache/cocoon/components/flow/ContinuationsManagerImpl.java Modified: cocoon/trunk/src/java/org/apache/cocoon/components/flow/ContinuationsManagerImpl.java Url: http://svn.apache.org/viewcvs/cocoon/trunk/src/java/org/apache/cocoon/components/flow/ContinuationsManagerImpl.java?view=diffrev=106910p1=cocoon/trunk/src/java/org/apache/cocoon/components/flow/ContinuationsManagerImpl.javar1=106909p2=cocoon/trunk/src/java/org/apache/cocoon/components/flow/ContinuationsManagerImpl.javar2=106910 == --- cocoon/trunk/src/java/org/apache/cocoon/components/flow/ContinuationsManagerImpl.java (original) +++ cocoon/trunk/src/java/org/apache/cocoon/components/flow/ContinuationsManagerImpl.java Mon Nov 29 06:11:58 2004 @@ -167,7 +167,9 @@ // REVISIT: Is the following check needed to avoid threading issues: // return wk only if !(wk.hasExpired) ? WebContinuation kont = (WebContinuation) idToWebCont.get(id); -return (kont.interpreterMatches(interpreterId)) ? kont : null; +if ( kont != null ) + return (kont.interpreterMatches(interpreterId)) ? kont : null; +return null; } /**
svn commit: r106645 - /cocoon/site/src/documentation/content/xdocs/community/members.xml
Author: lgawron Date: Fri Nov 26 00:37:47 2004 New Revision: 106645 URL: http://svn.apache.org/viewcvs?view=revrev=106645 Log: Add myself to commiters list Modified: cocoon/site/src/documentation/content/xdocs/community/members.xml Modified: cocoon/site/src/documentation/content/xdocs/community/members.xml Url: http://svn.apache.org/viewcvs/cocoon/site/src/documentation/content/xdocs/community/members.xml?view=diffrev=106645p1=cocoon/site/src/documentation/content/xdocs/community/members.xmlr1=106644p2=cocoon/site/src/documentation/content/xdocs/community/members.xmlr2=106645 == --- cocoon/site/src/documentation/content/xdocs/community/members.xml (original) +++ cocoon/site/src/documentation/content/xdocs/community/members.xml Fri Nov 26 00:37:47 2004 @@ -50,6 +50,7 @@ liGerhard Froehlich (froehlich.at.apache.org)/li liPier Fumagalli (pier.at.apache.org)/li liAntonio Gallardo (antonio.at.apache.org)/li + liLeszek Gawron (lgawron.at.apache.org)/li liRalph Goers (rgoers.at.apache.org)/li liRobin Green (greenrd.at.apache.org)/li liVadim Gritsenko (vgritsenko.at.apache.org)/li
svn commit: r106560 - /cocoon/branches/BRANCH_2_1_X/src/documentation/xdocs/who.xml
Author: lgawron Date: Thu Nov 25 01:45:56 2004 New Revision: 106560 URL: http://svn.apache.org/viewcvs?view=revrev=106560 Log: add myself to the active commiters list Modified: cocoon/branches/BRANCH_2_1_X/src/documentation/xdocs/who.xml Modified: cocoon/branches/BRANCH_2_1_X/src/documentation/xdocs/who.xml Url: http://svn.apache.org/viewcvs/cocoon/branches/BRANCH_2_1_X/src/documentation/xdocs/who.xml?view=diffrev=106560p1=cocoon/branches/BRANCH_2_1_X/src/documentation/xdocs/who.xmlr1=106559p2=cocoon/branches/BRANCH_2_1_X/src/documentation/xdocs/who.xmlr2=106560 == --- cocoon/branches/BRANCH_2_1_X/src/documentation/xdocs/who.xml (original) +++ cocoon/branches/BRANCH_2_1_X/src/documentation/xdocs/who.xmlThu Nov 25 01:45:56 2004 @@ -63,6 +63,7 @@ liDaniel Fagerstr#246;m (danielf.at.apache.org)/li liPier Fumagalli (pier.at.apache.org)/li liAntonio Gallardo (antonio.at.apache.org)/li + liLeszek Gawron (lgawron.at.apache.org)/li liVadim Gritsenko (vgritsenko.at.apache.org)/li liChristian Haul (haul.at.apache.org)/li liJ#246;rg Heinicke (joerg.at.apache.org)/li
svn commit: r106561 - /cocoon/trunk/src/documentation/xdocs/who.xml
Author: lgawron Date: Thu Nov 25 01:47:43 2004 New Revision: 106561 URL: http://svn.apache.org/viewcvs?view=revrev=106561 Log: add myself to the active commiters list Modified: cocoon/trunk/src/documentation/xdocs/who.xml Modified: cocoon/trunk/src/documentation/xdocs/who.xml Url: http://svn.apache.org/viewcvs/cocoon/trunk/src/documentation/xdocs/who.xml?view=diffrev=106561p1=cocoon/trunk/src/documentation/xdocs/who.xmlr1=106560p2=cocoon/trunk/src/documentation/xdocs/who.xmlr2=106561 == --- cocoon/trunk/src/documentation/xdocs/who.xml(original) +++ cocoon/trunk/src/documentation/xdocs/who.xmlThu Nov 25 01:47:43 2004 @@ -63,6 +63,7 @@ liDaniel Fagerstr#246;m (danielf.at.apache.org)/li liPier Fumagalli (pier.at.apache.org)/li liAntonio Gallardo (antonio.at.apache.org)/li + liLeszek Gawron (lgawron.at.apache.org)/li liVadim Gritsenko (vgritsenko.at.apache.org)/li liChristian Haul (haul.at.apache.org)/li liJ#246;rg Heinicke (joerg.at.apache.org)/li
svn commit: r106089 - /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/javaflow/java/org/apache/cocoon/components/flow/java/JavaInterpreter.java /cocoon/branches/BRANCH_2_1_X/src/blocks/scratchpad/java/org/apache/cocoon/components/flow/javascript/fom/AO_FOM_Cocoon.java /cocoon/branches/BRANCH_2_1_X/src/blocks/scratchpad/java/org/apache/cocoon/components/flow/javascript/fom/AO_FOM_JavaScriptInterpreter.java /cocoon/branches/BRANCH_2_1_X/src/java/org/apache/cocoon/components/flow/AbstractInterpreter.java /cocoon/branches/BRANCH_2_1_X/src/java/org/apache/cocoon/components/flow/ContinuationsManager.java /cocoon/branches/BRANCH_2_1_X/src/java/org/apache/cocoon/components/flow/ContinuationsManagerImpl.java /cocoon/branches/BRANCH_2_1_X/src/java/org/apache/cocoon/components/flow/Interpreter.java /cocoon/branches/BRANCH_2_1_X/src/java/org/apache/cocoon/components/flow/WebContinuation.java /cocoon/branches/BRANCH_2_1_X/src/java/org/apache/cocoon/components/flow/javascript/fom/FOM_Cocoon.java /cocoon/branches/BRANCH_2_1_X/src/java/org/apache/cocoon/components/flow/javascript/fom/FOM_JavaScriptInterpreter.java /cocoon/branches/BRANCH_2_1_X/src/java/org/apache/cocoon/components/flow/javascript/fom/FOM_WebContinuation.java /cocoon/branches/BRANCH_2_1_X/status.xml
Author: lgawron
Date: Sun Nov 21 05:26:02 2004
New Revision: 106089
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/javaflow/java/org/apache/cocoon/components/flow/java/JavaInterpreter.java
cocoon/branches/BRANCH_2_1_X/src/blocks/scratchpad/java/org/apache/cocoon/components/flow/javascript/fom/AO_FOM_Cocoon.java
cocoon/branches/BRANCH_2_1_X/src/blocks/scratchpad/java/org/apache/cocoon/components/flow/javascript/fom/AO_FOM_JavaScriptInterpreter.java
cocoon/branches/BRANCH_2_1_X/src/java/org/apache/cocoon/components/flow/AbstractInterpreter.java
cocoon/branches/BRANCH_2_1_X/src/java/org/apache/cocoon/components/flow/ContinuationsManager.java
cocoon/branches/BRANCH_2_1_X/src/java/org/apache/cocoon/components/flow/ContinuationsManagerImpl.java
cocoon/branches/BRANCH_2_1_X/src/java/org/apache/cocoon/components/flow/Interpreter.java
cocoon/branches/BRANCH_2_1_X/src/java/org/apache/cocoon/components/flow/WebContinuation.java
cocoon/branches/BRANCH_2_1_X/src/java/org/apache/cocoon/components/flow/javascript/fom/FOM_Cocoon.java
cocoon/branches/BRANCH_2_1_X/src/java/org/apache/cocoon/components/flow/javascript/fom/FOM_JavaScriptInterpreter.java
cocoon/branches/BRANCH_2_1_X/src/java/org/apache/cocoon/components/flow/javascript/fom/FOM_WebContinuation.java
cocoon/branches/BRANCH_2_1_X/status.xml
Log:
Fix: Continuation can only be invoked for the interpreter it was originally
created for
- o.a.c.components.flow.ContinuationsManager interface change. Interpreter id
has to be passed
to create a continuation and lookup one.
- o.a.c.components.flow.ContinuationManagerImpl returns null if interpreter
does not match during lookup.
- o.a.c.components.flow.Interpreter interface extended with setInterpreterID
method.
- all current interpreters updated to match new contracts
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/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 Nov 21 05:26:02 2004
@@ -53,7 +53,8 @@
WebContinuation wk = null;
if (!(app instanceof StatelessAppleController)) {
-wk = this.continuationsMgr.createWebContinuation(app, null, 0,
this);
+wk = this.continuationsMgr.createWebContinuation(app, null, 0,
+getInterpreterID(), this);
if (getLogger().isDebugEnabled())
getLogger().debug(Instantiated a stateful apple,
continuationid = + wk.getId());
}
@@ -79,7 +80,7 @@
throws Exception {
WebContinuation wk =
-this.continuationsMgr.lookupWebContinuation(continuationId);
+this.continuationsMgr.lookupWebContinuation(continuationId,
getInterpreterID());
if (wk == null) {
// Throw an InvalidContinuationException to be handled inside the
// map:handle-errors sitemap element.
Modified:
cocoon/branches/BRANCH_2_1_X/src/blocks/javaflow/java/org/apache/cocoon/components/flow/java/JavaInterpreter.java
==
---
cocoon/branches/BRANCH_2_1_X/src/blocks/javaflow/java/org/apache/cocoon/components/flow/java/JavaInterpreter.java
(original)
+++
cocoon/branches/BRANCH_2_1_X/src/blocks/javaflow/java/org/apache/cocoon/components/flow/java/JavaInterpreter.java
Sun Nov 21 05:26:02 2004
@@ -144,14 +144,15 @@
context.setRedirector(redirector);
Parameters parameters = new Parameters();
for(Iterator i=params.iterator(); i.hasNext();) {
- Argument argument = (Argument)i.next();
- parameters.setParameter(argument.name, argument.value);
+Argument argument = (Argument)i.next();
+parameters.setParameter(argument.name, argument.value);
}
context.setParameters(parameters);
Continuation continuation = new Continuation(context);
-WebContinuation wk =
continuationsMgr.createWebContinuation(continuation, null, timeToLive, null);
+WebContinuation wk = continuationsMgr.createWebContinuation(
+continuation, null, timeToLive, getInterpreterID(), null);
FlowHelper.setWebContinuation(ContextHelper.getObjectModel(this.avalonContext),
wk);
continuation.registerThread();
@@ -195,7 +196,7 @@
if (!initialized)
initialize();
-WebContinuation parentwk = continuationsMgr.lookupWebContinuation(id);
+WebContinuation parentwk = continuationsMgr.lookupWebContinuation(id
svn commit: r106091 - /cocoon/trunk/src/blocks/apples/java/org/apache/cocoon/components/flow/apples/ApplesProcessor.java /cocoon/trunk/src/blocks/apples/java/org/apache/cocoon/components/flow/apples/StatelessAppleController.java /cocoon/trunk/src/blocks/javaflow/java/org/apache/cocoon/components/flow/java/JavaInterpreter.java /cocoon/trunk/src/blocks/javaflow/java/org/apache/cocoon/components/flow/javascript/JavaScriptInterpreter.java /cocoon/trunk/src/blocks/scratchpad/java/org/apache/cocoon/components/flow/groovy/GroovyInterpreter.java /cocoon/trunk/src/blocks/scratchpad/java/org/apache/cocoon/components/flow/javascript/fom/AO_FOM_Cocoon.java /cocoon/trunk/src/blocks/scratchpad/java/org/apache/cocoon/components/flow/javascript/fom/AO_FOM_JavaScriptInterpreter.java /cocoon/trunk/src/java/org/apache/cocoon/components/flow/AbstractInterpreter.java /cocoon/trunk/src/java/org/apache/cocoon/components/flow/ContinuationsManager.java /cocoon/trunk/src/java/org/apache/cocoon/components/flow/ContinuationsManagerImpl.java /cocoon/trunk/src/java/org/apache/cocoon/components/flow/Interpreter.java /cocoon/trunk/src/java/org/apache/cocoon/components/flow/WebContinuation.java /cocoon/trunk/src/java/org/apache/cocoon/components/flow/javascript/fom/FOM_Cocoon.java /cocoon/trunk/src/java/org/apache/cocoon/components/flow/javascript/fom/FOM_JavaScriptInterpreter.java /cocoon/trunk/src/java/org/apache/cocoon/components/flow/javascript/fom/FOM_WebContinuation.java /cocoon/trunk/status.xml
Author: lgawron
Date: Sun Nov 21 06:20:13 2004
New Revision: 106091
Modified:
cocoon/trunk/src/blocks/apples/java/org/apache/cocoon/components/flow/apples/ApplesProcessor.java
cocoon/trunk/src/blocks/apples/java/org/apache/cocoon/components/flow/apples/StatelessAppleController.java
cocoon/trunk/src/blocks/javaflow/java/org/apache/cocoon/components/flow/java/JavaInterpreter.java
cocoon/trunk/src/blocks/javaflow/java/org/apache/cocoon/components/flow/javascript/JavaScriptInterpreter.java
cocoon/trunk/src/blocks/scratchpad/java/org/apache/cocoon/components/flow/groovy/GroovyInterpreter.java
cocoon/trunk/src/blocks/scratchpad/java/org/apache/cocoon/components/flow/javascript/fom/AO_FOM_Cocoon.java
cocoon/trunk/src/blocks/scratchpad/java/org/apache/cocoon/components/flow/javascript/fom/AO_FOM_JavaScriptInterpreter.java
cocoon/trunk/src/java/org/apache/cocoon/components/flow/AbstractInterpreter.java
cocoon/trunk/src/java/org/apache/cocoon/components/flow/ContinuationsManager.java
cocoon/trunk/src/java/org/apache/cocoon/components/flow/ContinuationsManagerImpl.java
cocoon/trunk/src/java/org/apache/cocoon/components/flow/Interpreter.java
cocoon/trunk/src/java/org/apache/cocoon/components/flow/WebContinuation.java
cocoon/trunk/src/java/org/apache/cocoon/components/flow/javascript/fom/FOM_Cocoon.java
cocoon/trunk/src/java/org/apache/cocoon/components/flow/javascript/fom/FOM_JavaScriptInterpreter.java
cocoon/trunk/src/java/org/apache/cocoon/components/flow/javascript/fom/FOM_WebContinuation.java
cocoon/trunk/status.xml
Log:
Fix: Continuation can only be invoked for the interpreter it was originally
created for
- o.a.c.components.flow.ContinuationsManager interface change. Interpreter id
has to be passed
to create a continuation and lookup one.
- o.a.c.components.flow.ContinuationManagerImpl returns null if interpreter
does not match during lookup.
- o.a.c.components.flow.Interpreter interface extended with setInterpreterID
method.
- all current interpreters updated to match new contracts
Modified:
cocoon/trunk/src/blocks/apples/java/org/apache/cocoon/components/flow/apples/ApplesProcessor.java
==
---
cocoon/trunk/src/blocks/apples/java/org/apache/cocoon/components/flow/apples/ApplesProcessor.java
(original)
+++
cocoon/trunk/src/blocks/apples/java/org/apache/cocoon/components/flow/apples/ApplesProcessor.java
Sun Nov 21 06:20:13 2004
@@ -52,7 +52,8 @@
WebContinuation wk = null;
if (!(app instanceof StatelessAppleController)) {
-wk = this.continuationsMgr.createWebContinuation(app, null, 0,
this);
+wk = this.continuationsMgr.createWebContinuation(app, null, 0,
+getInterpreterID(), this);
if (getLogger().isDebugEnabled())
getLogger().debug(Instantiated a stateful apple,
continuationid = + wk.getId());
}
@@ -79,7 +80,7 @@
throws Exception {
WebContinuation wk =
-this.continuationsMgr.lookupWebContinuation(continuationId);
+this.continuationsMgr.lookupWebContinuation(continuationId,
getInterpreterID());
if (wk == null) {
// Throw an InvalidContinuationException to be handled inside the
// map:handle-errors sitemap element.
Modified:
cocoon/trunk/src/blocks/apples/java/org/apache/cocoon/components/flow/apples/StatelessAppleController.java
==
---
cocoon/trunk/src/blocks/apples/java/org/apache/cocoon/components/flow/apples/StatelessAppleController.java
(original)
+++
cocoon/trunk/src/blocks/apples/java/org/apache/cocoon/components/flow/apples/StatelessAppleController.java
Sun Nov 21 06:20:13 2004
@@ -1,3 +1,19 @@
+/*
+ * 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.
+ */
+
package org.apache.cocoon.components.flow.apples;
/**
Modified:
cocoon/trunk/src/blocks/javaflow/java/org/apache/cocoon/components/flow/java/JavaInterpreter.java
==
---
cocoon/trunk/src/blocks/javaflow/java/org/apache/cocoon/components/flow/java/JavaInterpreter.java
(original)
+++
cocoon/trunk/src/blocks/javaflow/java/org/apache/cocoon/components/flow/java/JavaInterpreter.java
Sun Nov 21
svn commit: r106102 - /cocoon/trunk/src/blocks/tour/samples/bean-editor/cocoon-app/flow/tour.js /cocoon/trunk/src/blocks/tour/samples/flow/multi-page/multi-page.js
Author: lgawron
Date: Sun Nov 21 10:48:36 2004
New Revision: 106102
Modified:
cocoon/trunk/src/blocks/tour/samples/bean-editor/cocoon-app/flow/tour.js
cocoon/trunk/src/blocks/tour/samples/flow/multi-page/multi-page.js
Log:
obligatory 'var' keyword for variable declaration (sync with 2.1.X branch)
Modified:
cocoon/trunk/src/blocks/tour/samples/bean-editor/cocoon-app/flow/tour.js
Url:
http://svn.apache.org/viewcvs/cocoon/trunk/src/blocks/tour/samples/bean-editor/cocoon-app/flow/tour.js?view=diffrev=106102p1=cocoon/trunk/src/blocks/tour/samples/bean-editor/cocoon-app/flow/tour.jsr1=106101p2=cocoon/trunk/src/blocks/tour/samples/bean-editor/cocoon-app/flow/tour.jsr2=106102
==
--- cocoon/trunk/src/blocks/tour/samples/bean-editor/cocoon-app/flow/tour.js
(original)
+++ cocoon/trunk/src/blocks/tour/samples/bean-editor/cocoon-app/flow/tour.js
Sun Nov 21 10:48:36 2004
@@ -24,7 +24,7 @@
// Query all TaskBean objects and display them
function query_allTasks() {
-list = db.getTasks();
+var list = db.getTasks();
cocoon.sendPage(internal/generate-view/taskList, {
title : List of tasks,
@@ -35,15 +35,15 @@
// Query a single TaskBean object and display it
function query_singleTask() {
-id = cocoon.request.getParameter(taskId);
-bean = db.getTaskBeanById(id);
+var id = cocoon.request.getParameter(taskId);
+var bean = db.getTaskBeanById(id);
displayTaskBean(id,bean);
}
// Edit a single TaskBean object using Cocoon Forms
function singleTaskEditor(form) {
-id = cocoon.request.getParameter(taskId);
-bean = db.getTaskBeanById(id);
+var id = cocoon.request.getParameter(taskId);
+var bean = db.getTaskBeanById(id);
form.load(bean);
form.showForm(internal/show-form/singleTask);
Modified: cocoon/trunk/src/blocks/tour/samples/flow/multi-page/multi-page.js
Url:
http://svn.apache.org/viewcvs/cocoon/trunk/src/blocks/tour/samples/flow/multi-page/multi-page.js?view=diffrev=106102p1=cocoon/trunk/src/blocks/tour/samples/flow/multi-page/multi-page.jsr1=106101p2=cocoon/trunk/src/blocks/tour/samples/flow/multi-page/multi-page.jsr2=106102
==
--- cocoon/trunk/src/blocks/tour/samples/flow/multi-page/multi-page.js
(original)
+++ cocoon/trunk/src/blocks/tour/samples/flow/multi-page/multi-page.js Sun Nov
21 10:48:36 2004
@@ -33,7 +33,7 @@
while(true) {
// decide which page to show based on request parameters
-page = page1;
+var page = page1;
if(cocoon.request.getParameter(action_send) != null) {
break;
} else if(cocoon.request.getParameter(action_page2) != null) {
@@ -45,7 +45,7 @@
// now for the boring part: copy form data into message
// that's where Forms bindings would help
-tmp = cocoon.request.getParameter(sender);
+var tmp = cocoon.request.getParameter(sender);
if(tmp != null) message.sender = tmp;
tmp = cocoon.request.getParameter(subject);
