Author: danielf
Date: Sun Dec 19 13:53:43 2004
New Revision: 122791
URL: http://svn.apache.org/viewcvs?view=rev&rev=122791
Log:
Added access to FOM request and context to the test case and rewrote some of
the tests based on that. The testJexlEnvExpression still don't work, I'm aware
that changing cocoon.request.protocol to request.protocol makes it work, but I
want to get the first form working.
Changed to shorter names for the test data files.
Added:
cocoon/trunk/src/blocks/template/test/org/apache/cocoon/template/jxtg/generate.xml
(props changed)
- copied unchanged from r111649,
cocoon/trunk/src/blocks/template/test/org/apache/cocoon/template/jxtg/JXTemplateGenerator-generate.xml
cocoon/trunk/src/blocks/template/test/org/apache/cocoon/template/jxtg/jexlEnvExpression-output.xml
(contents, props changed)
- copied, changed from r111649,
cocoon/trunk/src/blocks/template/test/org/apache/cocoon/template/jxtg/JXTemplateGenerator-jexlEnvExpression-output.xml
cocoon/trunk/src/blocks/template/test/org/apache/cocoon/template/jxtg/jexlEnvExpression.xml
(contents, props changed)
- copied, changed from r111649,
cocoon/trunk/src/blocks/template/test/org/apache/cocoon/template/jxtg/JXTemplateGenerator-jexlEnvExpression.xml
cocoon/trunk/src/blocks/template/test/org/apache/cocoon/template/jxtg/jexlExpression-output.xml
(props changed)
- copied unchanged from r111649,
cocoon/trunk/src/blocks/template/test/org/apache/cocoon/template/jxtg/JXTemplateGenerator-jexlExpression-output.xml
cocoon/trunk/src/blocks/template/test/org/apache/cocoon/template/jxtg/jexlExpression.xml
(props changed)
- copied unchanged from r111649,
cocoon/trunk/src/blocks/template/test/org/apache/cocoon/template/jxtg/JXTemplateGenerator-jexlExpression.xml
cocoon/trunk/src/blocks/template/test/org/apache/cocoon/template/jxtg/jxChoose-output.xml
(contents, props changed)
cocoon/trunk/src/blocks/template/test/org/apache/cocoon/template/jxtg/jxChoose.xml
(contents, props changed)
cocoon/trunk/src/blocks/template/test/org/apache/cocoon/template/jxtg/jxForEach-output.xml
cocoon/trunk/src/blocks/template/test/org/apache/cocoon/template/jxtg/jxForEach.xml
cocoon/trunk/src/blocks/template/test/org/apache/cocoon/template/jxtg/jxpathEnvExpression-output.xml
(contents, props changed)
- copied, changed from r111649,
cocoon/trunk/src/blocks/template/test/org/apache/cocoon/template/jxtg/JXTemplateGenerator-jxpathEnvExpression-output.xml
cocoon/trunk/src/blocks/template/test/org/apache/cocoon/template/jxtg/jxpathEnvExpression.xml
(contents, props changed)
- copied, changed from r111649,
cocoon/trunk/src/blocks/template/test/org/apache/cocoon/template/jxtg/JXTemplateGenerator-jxpathEnvExpression.xml
cocoon/trunk/src/blocks/template/test/org/apache/cocoon/template/jxtg/jxpathExpression-output.xml
(props changed)
- copied unchanged from r111649,
cocoon/trunk/src/blocks/template/test/org/apache/cocoon/template/jxtg/JXTemplateGenerator-jxpathExpression-output.xml
cocoon/trunk/src/blocks/template/test/org/apache/cocoon/template/jxtg/jxpathExpression.xml
(props changed)
- copied unchanged from r111649,
cocoon/trunk/src/blocks/template/test/org/apache/cocoon/template/jxtg/JXTemplateGenerator-jxpathExpression.xml
Removed:
cocoon/trunk/src/blocks/template/test/org/apache/cocoon/template/jxtg/JXTemplateGenerator-generate.xml
cocoon/trunk/src/blocks/template/test/org/apache/cocoon/template/jxtg/JXTemplateGenerator-jexlEnvExpression-output.xml
cocoon/trunk/src/blocks/template/test/org/apache/cocoon/template/jxtg/JXTemplateGenerator-jexlEnvExpression.xml
cocoon/trunk/src/blocks/template/test/org/apache/cocoon/template/jxtg/JXTemplateGenerator-jexlExpression-output.xml
cocoon/trunk/src/blocks/template/test/org/apache/cocoon/template/jxtg/JXTemplateGenerator-jexlExpression.xml
cocoon/trunk/src/blocks/template/test/org/apache/cocoon/template/jxtg/JXTemplateGenerator-jxpathEnvExpression-output.xml
cocoon/trunk/src/blocks/template/test/org/apache/cocoon/template/jxtg/JXTemplateGenerator-jxpathEnvExpression.xml
cocoon/trunk/src/blocks/template/test/org/apache/cocoon/template/jxtg/JXTemplateGenerator-jxpathExpression-output.xml
cocoon/trunk/src/blocks/template/test/org/apache/cocoon/template/jxtg/JXTemplateGenerator-jxpathExpression.xml
Modified:
cocoon/trunk/src/blocks/template/test/org/apache/cocoon/template/jxtg/JXTemplateGeneratorTestCase.java
cocoon/trunk/src/blocks/template/test/org/apache/cocoon/template/jxtg/JXTemplateGeneratorTestCase.xtest
(props changed)
Deleted:
/cocoon/trunk/src/blocks/template/test/org/apache/cocoon/template/jxtg/JXTemplateGenerator-generate.xml
Url:
http://svn.apache.org/viewcvs/cocoon/trunk/src/blocks/template/test/org/apache/cocoon/template/jxtg/JXTemplateGenerator-generate.xml?view=auto&rev=122790
==============================================================================
Deleted:
/cocoon/trunk/src/blocks/template/test/org/apache/cocoon/template/jxtg/JXTemplateGenerator-jexlEnvExpression-output.xml
Url:
http://svn.apache.org/viewcvs/cocoon/trunk/src/blocks/template/test/org/apache/cocoon/template/jxtg/JXTemplateGenerator-jexlEnvExpression-output.xml?view=auto&rev=122790
==============================================================================
Deleted:
/cocoon/trunk/src/blocks/template/test/org/apache/cocoon/template/jxtg/JXTemplateGenerator-jexlEnvExpression.xml
Url:
http://svn.apache.org/viewcvs/cocoon/trunk/src/blocks/template/test/org/apache/cocoon/template/jxtg/JXTemplateGenerator-jexlEnvExpression.xml?view=auto&rev=122790
==============================================================================
Deleted:
/cocoon/trunk/src/blocks/template/test/org/apache/cocoon/template/jxtg/JXTemplateGenerator-jexlExpression-output.xml
Url:
http://svn.apache.org/viewcvs/cocoon/trunk/src/blocks/template/test/org/apache/cocoon/template/jxtg/JXTemplateGenerator-jexlExpression-output.xml?view=auto&rev=122790
==============================================================================
Deleted:
/cocoon/trunk/src/blocks/template/test/org/apache/cocoon/template/jxtg/JXTemplateGenerator-jexlExpression.xml
Url:
http://svn.apache.org/viewcvs/cocoon/trunk/src/blocks/template/test/org/apache/cocoon/template/jxtg/JXTemplateGenerator-jexlExpression.xml?view=auto&rev=122790
==============================================================================
Deleted:
/cocoon/trunk/src/blocks/template/test/org/apache/cocoon/template/jxtg/JXTemplateGenerator-jxpathEnvExpression-output.xml
Url:
http://svn.apache.org/viewcvs/cocoon/trunk/src/blocks/template/test/org/apache/cocoon/template/jxtg/JXTemplateGenerator-jxpathEnvExpression-output.xml?view=auto&rev=122790
==============================================================================
Deleted:
/cocoon/trunk/src/blocks/template/test/org/apache/cocoon/template/jxtg/JXTemplateGenerator-jxpathEnvExpression.xml
Url:
http://svn.apache.org/viewcvs/cocoon/trunk/src/blocks/template/test/org/apache/cocoon/template/jxtg/JXTemplateGenerator-jxpathEnvExpression.xml?view=auto&rev=122790
==============================================================================
Deleted:
/cocoon/trunk/src/blocks/template/test/org/apache/cocoon/template/jxtg/JXTemplateGenerator-jxpathExpression-output.xml
Url:
http://svn.apache.org/viewcvs/cocoon/trunk/src/blocks/template/test/org/apache/cocoon/template/jxtg/JXTemplateGenerator-jxpathExpression-output.xml?view=auto&rev=122790
==============================================================================
Deleted:
/cocoon/trunk/src/blocks/template/test/org/apache/cocoon/template/jxtg/JXTemplateGenerator-jxpathExpression.xml
Url:
http://svn.apache.org/viewcvs/cocoon/trunk/src/blocks/template/test/org/apache/cocoon/template/jxtg/JXTemplateGenerator-jxpathExpression.xml?view=auto&rev=122790
==============================================================================
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=diff&rev=122791&p1=cocoon/trunk/src/blocks/template/test/org/apache/cocoon/template/jxtg/JXTemplateGeneratorTestCase.java&r1=122790&p2=cocoon/trunk/src/blocks/template/test/org/apache/cocoon/template/jxtg/JXTemplateGeneratorTestCase.java&r2=122791
==============================================================================
---
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
Sun Dec 19 13:53:43 2004
@@ -15,9 +15,15 @@
*/
package org.apache.cocoon.template.jxtg;
+import java.util.HashMap;
+import java.util.Map;
+
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.components.flow.javascript.fom.FOM_Cocoon;
+import
org.apache.cocoon.components.flow.javascript.fom.FOM_JavaScriptFlowHelper;
import org.apache.cocoon.SitemapComponentTestCase;
import org.apache.cocoon.environment.ObjectModelHelper;
@@ -25,56 +31,78 @@
Logger logger = new ConsoleLogger(ConsoleLogger.LEVEL_WARN);
String docBase = "resource://org/apache/cocoon/template/jxtg/";
String JX = "jx";
+ Map flowContext = new HashMap();
+
+ public void setUp() throws Exception {
+ super.setUp();
+
+ // Make the FOM objects available to the view layer
+ FOM_JavaScriptFlowHelper.setFOM_Request(getObjectModel(),
+ new
FOM_Cocoon.FOM_Request(getRequest()));
+ FlowHelper.setContextObject(getObjectModel(), flowContext);
+ }
+
+ public Map getFlowContext() {
+ return this.flowContext;
+ }
public Logger getLogger() {
return this.logger;
}
public void testGenerate() throws Exception {
- String inputURI = docBase + "JXTemplateGenerator-generate.xml";
+ String inputURI = docBase + "generate.xml";
assertEqual(load(inputURI), generate(JX, inputURI, EMPTY_PARAMS));
}
public void testJexlExpression() throws Exception {
- String inputURI = docBase + "JXTemplateGenerator-jexlExpression.xml";
- String outputURI = docBase +
"JXTemplateGenerator-jexlExpression-output.xml";
-
- String protocol =
ObjectModelHelper.getRequest(getObjectModel()).getProtocol();
- assertEquals("HTTP/1.1", protocol);
+ String inputURI = docBase + "jexlExpression.xml";
+ String outputURI = docBase + "jexlExpression-output.xml";
- Parameters parameters = new Parameters();
- parameters.setParameter("test", "foo");
- assertEqual(load(outputURI), generate(JX, inputURI, parameters));
+ assertEqual(load(outputURI), generate(JX, inputURI, EMPTY_PARAMS));
}
public void testJexlEnvExpression() throws Exception {
- String inputURI = docBase +
"JXTemplateGenerator-jexlEnvExpression.xml";
- String outputURI = docBase +
"JXTemplateGenerator-jexlEnvExpression-output.xml";
-
- String protocol =
ObjectModelHelper.getRequest(getObjectModel()).getProtocol();
- assertEquals("HTTP/1.1", protocol);
+ String inputURI = docBase + "jexlEnvExpression.xml";
+ String outputURI = docBase + "jexlEnvExpression-output.xml";
Parameters parameters = new Parameters();
parameters.setParameter("test", "foo");
+ getFlowContext().put("test", "bar");
assertEqual(load(outputURI), generate(JX, inputURI, parameters));
}
public void testJXPathExpression() throws Exception {
- String inputURI = docBase + "JXTemplateGenerator-jxpathExpression.xml";
- String outputURI = docBase +
"JXTemplateGenerator-jxpathExpression-output.xml";
+ String inputURI = docBase + "jxpathExpression.xml";
+ String outputURI = docBase + "jxpathExpression-output.xml";
- Parameters parameters = new Parameters();
- parameters.setParameter("test", "foo");
- assertEqual(load(outputURI), generate(JX, inputURI, parameters));
+ assertEqual(load(outputURI), generate(JX, inputURI, EMPTY_PARAMS));
}
public void testJXPathEnvExpression() throws Exception {
- String inputURI = docBase +
"JXTemplateGenerator-jxpathEnvExpression.xml";
- String outputURI = docBase +
"JXTemplateGenerator-jxpathEnvExpression-output.xml";
+ String inputURI = docBase + "jxpathEnvExpression.xml";
+ String outputURI = docBase + "jxpathEnvExpression-output.xml";
Parameters parameters = new Parameters();
parameters.setParameter("test", "foo");
+ getFlowContext().put("test", "bar");
assertEqual(load(outputURI), generate(JX, inputURI, parameters));
+ }
+
+ public void testJXChoose() throws Exception {
+ String inputURI = docBase + "jxChoose.xml";
+ String outputURI = docBase + "jxChoose-output.xml";
+
+ assertEqual(load(outputURI), generate(JX, inputURI, EMPTY_PARAMS));
+ }
+
+ public void testJXForEach() throws Exception {
+ String inputURI = docBase + "jxForEach.xml";
+ String outputURI = docBase + "jxForEach-output.xml";
+
+ String[] array = {"one", "two", "three"};
+ getFlowContext().put("test", array);
+ assertEqual(load(outputURI), generate(JX, inputURI, EMPTY_PARAMS));
}
}
Copied:
cocoon/trunk/src/blocks/template/test/org/apache/cocoon/template/jxtg/generate.xml
(from r111649,
cocoon/trunk/src/blocks/template/test/org/apache/cocoon/template/jxtg/JXTemplateGenerator-generate.xml)
Url:
http://svn.apache.org/viewcvs/cocoon/trunk/src/blocks/template/test/org/apache/cocoon/template/jxtg/generate.xml?view=diff&rev=122791&p1=cocoon/trunk/src/blocks/template/test/org/apache/cocoon/template/jxtg/JXTemplateGenerator-generate.xml&r1=111649&p2=cocoon/trunk/src/blocks/template/test/org/apache/cocoon/template/jxtg/generate.xml&r2=122791
==============================================================================
Copied:
cocoon/trunk/src/blocks/template/test/org/apache/cocoon/template/jxtg/jexlEnvExpression-output.xml
(from r111649,
cocoon/trunk/src/blocks/template/test/org/apache/cocoon/template/jxtg/JXTemplateGenerator-jexlEnvExpression-output.xml)
Url:
http://svn.apache.org/viewcvs/cocoon/trunk/src/blocks/template/test/org/apache/cocoon/template/jxtg/jexlEnvExpression-output.xml?view=diff&rev=122791&p1=cocoon/trunk/src/blocks/template/test/org/apache/cocoon/template/jxtg/JXTemplateGenerator-jexlEnvExpression-output.xml&r1=111649&p2=cocoon/trunk/src/blocks/template/test/org/apache/cocoon/template/jxtg/jexlEnvExpression-output.xml&r2=122791
==============================================================================
---
cocoon/trunk/src/blocks/template/test/org/apache/cocoon/template/jxtg/JXTemplateGenerator-jexlEnvExpression-output.xml
(original)
+++
cocoon/trunk/src/blocks/template/test/org/apache/cocoon/template/jxtg/jexlEnvExpression-output.xml
Sun Dec 19 13:53:43 2004
@@ -4,7 +4,7 @@
protocol: HTTP/1.1
<item attr="** foo **">
- Some text
+ context: bar
</item>
</root>
Copied:
cocoon/trunk/src/blocks/template/test/org/apache/cocoon/template/jxtg/jexlEnvExpression.xml
(from r111649,
cocoon/trunk/src/blocks/template/test/org/apache/cocoon/template/jxtg/JXTemplateGenerator-jexlEnvExpression.xml)
Url:
http://svn.apache.org/viewcvs/cocoon/trunk/src/blocks/template/test/org/apache/cocoon/template/jxtg/jexlEnvExpression.xml?view=diff&rev=122791&p1=cocoon/trunk/src/blocks/template/test/org/apache/cocoon/template/jxtg/JXTemplateGenerator-jexlEnvExpression.xml&r1=111649&p2=cocoon/trunk/src/blocks/template/test/org/apache/cocoon/template/jxtg/jexlEnvExpression.xml&r2=122791
==============================================================================
---
cocoon/trunk/src/blocks/template/test/org/apache/cocoon/template/jxtg/JXTemplateGenerator-jexlEnvExpression.xml
(original)
+++
cocoon/trunk/src/blocks/template/test/org/apache/cocoon/template/jxtg/jexlEnvExpression.xml
Sun Dec 19 13:53:43 2004
@@ -3,8 +3,8 @@
<root>
protocol: ${cocoon.request.protocol}
- <item attr="** ${parameters.test} **">
- Some text
+ <item attr="** ${cocoon.parameters.test} **">
+ context: ${test}
</item>
</root>
Copied:
cocoon/trunk/src/blocks/template/test/org/apache/cocoon/template/jxtg/jexlExpression-output.xml
(from r111649,
cocoon/trunk/src/blocks/template/test/org/apache/cocoon/template/jxtg/JXTemplateGenerator-jexlExpression-output.xml)
Url:
http://svn.apache.org/viewcvs/cocoon/trunk/src/blocks/template/test/org/apache/cocoon/template/jxtg/jexlExpression-output.xml?view=diff&rev=122791&p1=cocoon/trunk/src/blocks/template/test/org/apache/cocoon/template/jxtg/JXTemplateGenerator-jexlExpression-output.xml&r1=111649&p2=cocoon/trunk/src/blocks/template/test/org/apache/cocoon/template/jxtg/jexlExpression-output.xml&r2=122791
==============================================================================
Copied:
cocoon/trunk/src/blocks/template/test/org/apache/cocoon/template/jxtg/jexlExpression.xml
(from r111649,
cocoon/trunk/src/blocks/template/test/org/apache/cocoon/template/jxtg/JXTemplateGenerator-jexlExpression.xml)
Url:
http://svn.apache.org/viewcvs/cocoon/trunk/src/blocks/template/test/org/apache/cocoon/template/jxtg/jexlExpression.xml?view=diff&rev=122791&p1=cocoon/trunk/src/blocks/template/test/org/apache/cocoon/template/jxtg/JXTemplateGenerator-jexlExpression.xml&r1=111649&p2=cocoon/trunk/src/blocks/template/test/org/apache/cocoon/template/jxtg/jexlExpression.xml&r2=122791
==============================================================================
Added:
cocoon/trunk/src/blocks/template/test/org/apache/cocoon/template/jxtg/jxChoose-output.xml
Url:
http://svn.apache.org/viewcvs/cocoon/trunk/src/blocks/template/test/org/apache/cocoon/template/jxtg/jxChoose-output.xml?view=auto&rev=122791
==============================================================================
--- (empty file)
+++
cocoon/trunk/src/blocks/template/test/org/apache/cocoon/template/jxtg/jxChoose-output.xml
Sun Dec 19 13:53:43 2004
@@ -0,0 +1,6 @@
+<?xml version="1.0"?>
+
+<root>
+ <when/>
+ <otherwise/>
+</root>
Added:
cocoon/trunk/src/blocks/template/test/org/apache/cocoon/template/jxtg/jxChoose.xml
Url:
http://svn.apache.org/viewcvs/cocoon/trunk/src/blocks/template/test/org/apache/cocoon/template/jxtg/jxChoose.xml?view=auto&rev=122791
==============================================================================
--- (empty file)
+++
cocoon/trunk/src/blocks/template/test/org/apache/cocoon/template/jxtg/jxChoose.xml
Sun Dec 19 13:53:43 2004
@@ -0,0 +1,23 @@
+<?xml version="1.0"?>
+
+<root xmlns:jx="http://apache.org/cocoon/templates/jx/1.0";>
+ <jx:choose>
+ <jx:when test="${false}">
+ <when/>
+ </jx:when>
+ <jx:when test="${true}">
+ <when/>
+ </jx:when>
+ <jx:otherwise>
+ <otherwise/>
+ </jx:otherwise>
+ </jx:choose>
+ <jx:choose>
+ <jx:when test="${false}">
+ <when/>
+ </jx:when>
+ <jx:otherwise>
+ <otherwise/>
+ </jx:otherwise>
+ </jx:choose>
+</root>
Added:
cocoon/trunk/src/blocks/template/test/org/apache/cocoon/template/jxtg/jxForEach-output.xml
Url:
http://svn.apache.org/viewcvs/cocoon/trunk/src/blocks/template/test/org/apache/cocoon/template/jxtg/jxForEach-output.xml?view=auto&rev=122791
==============================================================================
--- (empty file)
+++
cocoon/trunk/src/blocks/template/test/org/apache/cocoon/template/jxtg/jxForEach-output.xml
Sun Dec 19 13:53:43 2004
@@ -0,0 +1,7 @@
+<?xml version="1.0"?>
+
+<root>
+ <forEach>one</forEach>
+ <forEach>two</forEach>
+ <forEach>three</forEach>
+</root>
Added:
cocoon/trunk/src/blocks/template/test/org/apache/cocoon/template/jxtg/jxForEach.xml
Url:
http://svn.apache.org/viewcvs/cocoon/trunk/src/blocks/template/test/org/apache/cocoon/template/jxtg/jxForEach.xml?view=auto&rev=122791
==============================================================================
--- (empty file)
+++
cocoon/trunk/src/blocks/template/test/org/apache/cocoon/template/jxtg/jxForEach.xml
Sun Dec 19 13:53:43 2004
@@ -0,0 +1,7 @@
+<?xml version="1.0"?>
+
+<root xmlns:jx="http://apache.org/cocoon/templates/jx/1.0";>
+ <jx:forEach var="i" items="${test}">
+ <forEach>${i}</forEach>
+ </jx:forEach>
+</root>
Copied:
cocoon/trunk/src/blocks/template/test/org/apache/cocoon/template/jxtg/jxpathEnvExpression-output.xml
(from r111649,
cocoon/trunk/src/blocks/template/test/org/apache/cocoon/template/jxtg/JXTemplateGenerator-jxpathEnvExpression-output.xml)
Url:
http://svn.apache.org/viewcvs/cocoon/trunk/src/blocks/template/test/org/apache/cocoon/template/jxtg/jxpathEnvExpression-output.xml?view=diff&rev=122791&p1=cocoon/trunk/src/blocks/template/test/org/apache/cocoon/template/jxtg/JXTemplateGenerator-jxpathEnvExpression-output.xml&r1=111649&p2=cocoon/trunk/src/blocks/template/test/org/apache/cocoon/template/jxtg/jxpathEnvExpression-output.xml&r2=122791
==============================================================================
---
cocoon/trunk/src/blocks/template/test/org/apache/cocoon/template/jxtg/JXTemplateGenerator-jxpathEnvExpression-output.xml
(original)
+++
cocoon/trunk/src/blocks/template/test/org/apache/cocoon/template/jxtg/jxpathEnvExpression-output.xml
Sun Dec 19 13:53:43 2004
@@ -4,7 +4,7 @@
protocol: HTTP/1.1
<item attr="** foo **">
- Some text
+ context: bar
</item>
</root>
Copied:
cocoon/trunk/src/blocks/template/test/org/apache/cocoon/template/jxtg/jxpathEnvExpression.xml
(from r111649,
cocoon/trunk/src/blocks/template/test/org/apache/cocoon/template/jxtg/JXTemplateGenerator-jxpathEnvExpression.xml)
Url:
http://svn.apache.org/viewcvs/cocoon/trunk/src/blocks/template/test/org/apache/cocoon/template/jxtg/jxpathEnvExpression.xml?view=diff&rev=122791&p1=cocoon/trunk/src/blocks/template/test/org/apache/cocoon/template/jxtg/JXTemplateGenerator-jxpathEnvExpression.xml&r1=111649&p2=cocoon/trunk/src/blocks/template/test/org/apache/cocoon/template/jxtg/jxpathEnvExpression.xml&r2=122791
==============================================================================
---
cocoon/trunk/src/blocks/template/test/org/apache/cocoon/template/jxtg/JXTemplateGenerator-jxpathEnvExpression.xml
(original)
+++
cocoon/trunk/src/blocks/template/test/org/apache/cocoon/template/jxtg/jxpathEnvExpression.xml
Sun Dec 19 13:53:43 2004
@@ -1,10 +1,10 @@
<?xml version="1.0"?>
<root>
- protocol: #{$cocoon.request.protocol}
+ protocol: #{$cocoon/request/protocol}
<item attr="** #{$cocoon/parameters/test} **">
- Some text
+ context: #{test}
</item>
</root>
Copied:
cocoon/trunk/src/blocks/template/test/org/apache/cocoon/template/jxtg/jxpathExpression-output.xml
(from r111649,
cocoon/trunk/src/blocks/template/test/org/apache/cocoon/template/jxtg/JXTemplateGenerator-jxpathExpression-output.xml)
Url:
http://svn.apache.org/viewcvs/cocoon/trunk/src/blocks/template/test/org/apache/cocoon/template/jxtg/jxpathExpression-output.xml?view=diff&rev=122791&p1=cocoon/trunk/src/blocks/template/test/org/apache/cocoon/template/jxtg/JXTemplateGenerator-jxpathExpression-output.xml&r1=111649&p2=cocoon/trunk/src/blocks/template/test/org/apache/cocoon/template/jxtg/jxpathExpression-output.xml&r2=122791
==============================================================================
Copied:
cocoon/trunk/src/blocks/template/test/org/apache/cocoon/template/jxtg/jxpathExpression.xml
(from r111649,
cocoon/trunk/src/blocks/template/test/org/apache/cocoon/template/jxtg/JXTemplateGenerator-jxpathExpression.xml)
Url:
http://svn.apache.org/viewcvs/cocoon/trunk/src/blocks/template/test/org/apache/cocoon/template/jxtg/jxpathExpression.xml?view=diff&rev=122791&p1=cocoon/trunk/src/blocks/template/test/org/apache/cocoon/template/jxtg/JXTemplateGenerator-jxpathExpression.xml&r1=111649&p2=cocoon/trunk/src/blocks/template/test/org/apache/cocoon/template/jxtg/jxpathExpression.xml&r2=122791
==============================================================================
