Author: cziegeler
Date: Mon Feb 7 07:52:19 2005
New Revision: 151725
URL: http://svn.apache.org/viewcvs?view=rev&rev=151725
Log:
Use cocoon gateway object in forms transformer
Enhance proxy transformer
Reset exception if xconf is wrong
Modified:
cocoon/branches/BRANCH_2_1_X/src/blocks/forms/java/org/apache/cocoon/forms/transformation/FormsPipelineConfig.java
cocoon/branches/BRANCH_2_1_X/src/blocks/forms/samples/dreamteam/content/teamTemplate.jx
cocoon/branches/BRANCH_2_1_X/src/blocks/forms/samples/forms/datasource_chooser_template.xml
cocoon/branches/BRANCH_2_1_X/src/blocks/forms/samples/forms/dynamicrepeater_template.xml
cocoon/branches/BRANCH_2_1_X/src/blocks/forms/samples/forms/form1_template.xml
cocoon/branches/BRANCH_2_1_X/src/blocks/forms/samples/forms/form2_template.xml
cocoon/branches/BRANCH_2_1_X/src/blocks/forms/samples/forms/form_model_gui_template.xml
cocoon/branches/BRANCH_2_1_X/src/blocks/forms/samples/forms/htmlarea_template.xml
cocoon/branches/BRANCH_2_1_X/src/blocks/forms/samples/forms/multipage_template.xml
cocoon/branches/BRANCH_2_1_X/src/blocks/forms/samples/forms/sitemap.xmap
cocoon/branches/BRANCH_2_1_X/src/blocks/forms/samples/forms/tasktree_template.xml
cocoon/branches/BRANCH_2_1_X/src/blocks/forms/samples/forms/upload_template.xml
cocoon/branches/BRANCH_2_1_X/src/blocks/portal/java/org/apache/cocoon/portal/tools/copletManagement/LayoutActions.java
cocoon/branches/BRANCH_2_1_X/src/blocks/portal/java/org/apache/cocoon/portal/tools/copletManagement/generation/XMLProfileGenerator.java
cocoon/branches/BRANCH_2_1_X/src/blocks/portal/java/org/apache/cocoon/portal/transformation/ProxyTransformer.java
cocoon/branches/BRANCH_2_1_X/src/documentation/xdocs/userdocs/forms/templatetransformer.xml
cocoon/branches/BRANCH_2_1_X/src/java/org/apache/cocoon/servlet/CocoonServlet.java
cocoon/branches/BRANCH_2_1_X/status.xml
Modified:
cocoon/branches/BRANCH_2_1_X/src/blocks/forms/java/org/apache/cocoon/forms/transformation/FormsPipelineConfig.java
URL:
http://svn.apache.org/viewcvs/cocoon/branches/BRANCH_2_1_X/src/blocks/forms/java/org/apache/cocoon/forms/transformation/FormsPipelineConfig.java?view=diff&r1=151724&r2=151725
==============================================================================
---
cocoon/branches/BRANCH_2_1_X/src/blocks/forms/java/org/apache/cocoon/forms/transformation/FormsPipelineConfig.java
(original)
+++
cocoon/branches/BRANCH_2_1_X/src/blocks/forms/java/org/apache/cocoon/forms/transformation/FormsPipelineConfig.java
Mon Feb 7 07:52:19 2005
@@ -1,5 +1,5 @@
/*
- * Copyright 1999-2004 The Apache Software Foundation.
+ * Copyright 1999-2005 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.
@@ -17,6 +17,7 @@
import java.io.IOException;
import java.io.StringReader;
+import java.util.HashMap;
import java.util.Locale;
import java.util.Map;
@@ -99,11 +100,25 @@
Object flowContext = FlowHelper.getContextObject(objectModel);
WebContinuation wk = FlowHelper.getWebContinuation(objectModel);
JXPathContext jxpc = JXPathContext.newContext(flowContext);
+ // We manually create a cocoon object here to provide the same way
+ // of accessing things as in the jxtg
+ // as soon as we have our unified om, we should use that
+ Request request = ObjectModelHelper.getRequest(objectModel);
+ Session session = request.getSession(false);
+ final Map cocoonOM = new HashMap();
+ cocoonOM.put("continuation", wk);
+ cocoonOM.put("request", request);
+ if ( session != null ) {
+ cocoonOM.put("session", session);
+ }
+ cocoonOM.put("parameters", parameters);
+
Variables vars = jxpc.getVariables();
+ vars.declareVariable("cocoon", cocoonOM);
+ // These four are deprecated!
+ // FIXME - We should add a warning if they are used
vars.declareVariable("continuation", wk);
- Request request = ObjectModelHelper.getRequest(objectModel);
vars.declareVariable("request", request);
- Session session = request.getSession(false);
vars.declareVariable("session", session);
vars.declareVariable("parameters", parameters);
Modified:
cocoon/branches/BRANCH_2_1_X/src/blocks/forms/samples/dreamteam/content/teamTemplate.jx
URL:
http://svn.apache.org/viewcvs/cocoon/branches/BRANCH_2_1_X/src/blocks/forms/samples/dreamteam/content/teamTemplate.jx?view=diff&r1=151724&r2=151725
==============================================================================
---
cocoon/branches/BRANCH_2_1_X/src/blocks/forms/samples/dreamteam/content/teamTemplate.jx
(original)
+++
cocoon/branches/BRANCH_2_1_X/src/blocks/forms/samples/dreamteam/content/teamTemplate.jx
Mon Feb 7 07:52:19 2005
@@ -55,7 +55,7 @@
</tr>
</table>
</div>
- <ft:form-template action="#{$continuation/id}.continue" method="POST">
+ <ft:form-template action="#{$cocoon/continuation/id}.continue"
method="POST">
<jx:choose>
<jx:when test="${form.getChild('teammembers').getSize() == 0}">
<p>
Modified:
cocoon/branches/BRANCH_2_1_X/src/blocks/forms/samples/forms/datasource_chooser_template.xml
URL:
http://svn.apache.org/viewcvs/cocoon/branches/BRANCH_2_1_X/src/blocks/forms/samples/forms/datasource_chooser_template.xml?view=diff&r1=151724&r2=151725
==============================================================================
---
cocoon/branches/BRANCH_2_1_X/src/blocks/forms/samples/forms/datasource_chooser_template.xml
(original)
+++
cocoon/branches/BRANCH_2_1_X/src/blocks/forms/samples/forms/datasource_chooser_template.xml
Mon Feb 7 07:52:19 2005
@@ -23,7 +23,7 @@
<title>Datasource chooser</title>
<content>
- <ft:form-template action="#{$continuation/id}.continue" method="POST">
+ <ft:form-template action="#{$cocoon/continuation/id}.continue"
method="POST">
<p>Datasource name: <ft:widget id="name"/></p>
<fieldset>
Modified:
cocoon/branches/BRANCH_2_1_X/src/blocks/forms/samples/forms/dynamicrepeater_template.xml
URL:
http://svn.apache.org/viewcvs/cocoon/branches/BRANCH_2_1_X/src/blocks/forms/samples/forms/dynamicrepeater_template.xml?view=diff&r1=151724&r2=151725
==============================================================================
---
cocoon/branches/BRANCH_2_1_X/src/blocks/forms/samples/forms/dynamicrepeater_template.xml
(original)
+++
cocoon/branches/BRANCH_2_1_X/src/blocks/forms/samples/forms/dynamicrepeater_template.xml
Mon Feb 7 07:52:19 2005
@@ -38,7 +38,7 @@
</style>
<content>
- <ft:form-template action="#{$continuation/id}.continue" method="POST">
+ <ft:form-template action="#{$cocoon/continuation/id}.continue"
method="POST">
<p>This is an example of how dynamic templates (using the JX macros) allow
to change the
page structure depending on the form contents. By adding or removing
rows in the repeater
Modified:
cocoon/branches/BRANCH_2_1_X/src/blocks/forms/samples/forms/form1_template.xml
URL:
http://svn.apache.org/viewcvs/cocoon/branches/BRANCH_2_1_X/src/blocks/forms/samples/forms/form1_template.xml?view=diff&r1=151724&r2=151725
==============================================================================
---
cocoon/branches/BRANCH_2_1_X/src/blocks/forms/samples/forms/form1_template.xml
(original)
+++
cocoon/branches/BRANCH_2_1_X/src/blocks/forms/samples/forms/form1_template.xml
Mon Feb 7 07:52:19 2005
@@ -26,7 +26,7 @@
<title>Sample form</title>
<content>
- <ft:form-template action="#{$continuation/id}.continue" method="POST">
+ <ft:form-template action="#{$cocoon/continuation/id}.continue"
method="POST">
<div style="width: 90%; margin: 10px 50px 50px 50px;">
<!-- group with tabs. Each of the children of <items> will constitute
a tab -->
<fi:group>
Modified:
cocoon/branches/BRANCH_2_1_X/src/blocks/forms/samples/forms/form2_template.xml
URL:
http://svn.apache.org/viewcvs/cocoon/branches/BRANCH_2_1_X/src/blocks/forms/samples/forms/form2_template.xml?view=diff&r1=151724&r2=151725
==============================================================================
---
cocoon/branches/BRANCH_2_1_X/src/blocks/forms/samples/forms/form2_template.xml
(original)
+++
cocoon/branches/BRANCH_2_1_X/src/blocks/forms/samples/forms/form2_template.xml
Mon Feb 7 07:52:19 2005
@@ -36,7 +36,7 @@
<p>If you're running the bean-binding demo, then after successful submit
you'll be shown a page that uses the JXTemplateGenerator to extract
data from the bean (to show that the bean really has been updated).</p>
- <ft:form-template action="#{$continuation/id}.continue" method="POST">
+ <ft:form-template action="#{$cocoon/continuation/id}.continue"
method="POST">
<table border="1">
<tr>
<td valign="top"><ft:widget-label id="email"/></td>
Modified:
cocoon/branches/BRANCH_2_1_X/src/blocks/forms/samples/forms/form_model_gui_template.xml
URL:
http://svn.apache.org/viewcvs/cocoon/branches/BRANCH_2_1_X/src/blocks/forms/samples/forms/form_model_gui_template.xml?view=diff&r1=151724&r2=151725
==============================================================================
---
cocoon/branches/BRANCH_2_1_X/src/blocks/forms/samples/forms/form_model_gui_template.xml
(original)
+++
cocoon/branches/BRANCH_2_1_X/src/blocks/forms/samples/forms/form_model_gui_template.xml
Mon Feb 7 07:52:19 2005
@@ -30,7 +30,7 @@
<title>Form GUI</title>
<content>
- <ft:form-template action="#{$continuation/id}.continue" method="POST">
+ <ft:form-template action="#{$cocoon/continuation/id}.continue"
method="POST">
<ft:class id="id-class"><ft:widget-label id="id"/>:<ft:widget
id="id"/></ft:class>
<ft:class id="label-class"><ft:widget-label id="label"/>:<ft:widget
id="label"/></ft:class>
Modified:
cocoon/branches/BRANCH_2_1_X/src/blocks/forms/samples/forms/htmlarea_template.xml
URL:
http://svn.apache.org/viewcvs/cocoon/branches/BRANCH_2_1_X/src/blocks/forms/samples/forms/htmlarea_template.xml?view=diff&r1=151724&r2=151725
==============================================================================
---
cocoon/branches/BRANCH_2_1_X/src/blocks/forms/samples/forms/htmlarea_template.xml
(original)
+++
cocoon/branches/BRANCH_2_1_X/src/blocks/forms/samples/forms/htmlarea_template.xml
Mon Feb 7 07:52:19 2005
@@ -18,7 +18,7 @@
xmlns:fi="http://apache.org/cocoon/forms/1.0#instance";>
<title>HTMLArea</title>
<content>
- <ft:form-template action="#{$continuation/id}.continue" method="POST">
+ <ft:form-template action="#{$cocoon/continuation/id}.continue"
method="POST">
<div style="width:500px">
<ft:widget-label id="data1"/><br/>
<ft:widget id="data1">
Modified:
cocoon/branches/BRANCH_2_1_X/src/blocks/forms/samples/forms/multipage_template.xml
URL:
http://svn.apache.org/viewcvs/cocoon/branches/BRANCH_2_1_X/src/blocks/forms/samples/forms/multipage_template.xml?view=diff&r1=151724&r2=151725
==============================================================================
---
cocoon/branches/BRANCH_2_1_X/src/blocks/forms/samples/forms/multipage_template.xml
(original)
+++
cocoon/branches/BRANCH_2_1_X/src/blocks/forms/samples/forms/multipage_template.xml
Mon Feb 7 07:52:19 2005
@@ -26,7 +26,7 @@
<title>Sample multipage form</title>
<content>
- <ft:form-template action="#{$continuation/id}.continue" method="POST">
+ <ft:form-template action="#{$cocoon/continuation/id}.continue"
method="POST">
<div style="width: 70%; margin: 10px 50px 50px 50px;">
<ft:struct id="page1">
Modified:
cocoon/branches/BRANCH_2_1_X/src/blocks/forms/samples/forms/sitemap.xmap
URL:
http://svn.apache.org/viewcvs/cocoon/branches/BRANCH_2_1_X/src/blocks/forms/samples/forms/sitemap.xmap?view=diff&r1=151724&r2=151725
==============================================================================
--- cocoon/branches/BRANCH_2_1_X/src/blocks/forms/samples/forms/sitemap.xmap
(original)
+++ cocoon/branches/BRANCH_2_1_X/src/blocks/forms/samples/forms/sitemap.xmap
Mon Feb 7 07:52:19 2005
@@ -381,7 +381,7 @@
<map:match pattern="binding.form">
<map:generate type="form">
- <map:parameter name="form-action"
value="#\{$continuation/id}.continue" />
+ <map:parameter name="form-action"
value="#\{$cocoon/continuation/id}.continue" />
</map:generate>
<!--TODO: fix xsl for use with forms-generator -->
<map:transform src="resources/forms-samples-styling.xsl" />
Modified:
cocoon/branches/BRANCH_2_1_X/src/blocks/forms/samples/forms/tasktree_template.xml
URL:
http://svn.apache.org/viewcvs/cocoon/branches/BRANCH_2_1_X/src/blocks/forms/samples/forms/tasktree_template.xml?view=diff&r1=151724&r2=151725
==============================================================================
---
cocoon/branches/BRANCH_2_1_X/src/blocks/forms/samples/forms/tasktree_template.xml
(original)
+++
cocoon/branches/BRANCH_2_1_X/src/blocks/forms/samples/forms/tasktree_template.xml
Mon Feb 7 07:52:19 2005
@@ -65,7 +65,7 @@
</style>
<content>
- <ft:form-template action="#{$continuation/id}.continue" method="POST">
+ <ft:form-template action="#{$cocoon/continuation/id}.continue"
method="POST">
<ft:class id="task-class">
<div class="section">
Modified:
cocoon/branches/BRANCH_2_1_X/src/blocks/forms/samples/forms/upload_template.xml
URL:
http://svn.apache.org/viewcvs/cocoon/branches/BRANCH_2_1_X/src/blocks/forms/samples/forms/upload_template.xml?view=diff&r1=151724&r2=151725
==============================================================================
---
cocoon/branches/BRANCH_2_1_X/src/blocks/forms/samples/forms/upload_template.xml
(original)
+++
cocoon/branches/BRANCH_2_1_X/src/blocks/forms/samples/forms/upload_template.xml
Mon Feb 7 07:52:19 2005
@@ -21,7 +21,7 @@
<para>
For this example to work, you must enable uploads in your web.xml file.
</para>
- <ft:form-template action="#{$continuation/id}.continue" method="POST"
enctype="multipart/form-data">
+ <ft:form-template action="#{$cocoon/continuation/id}.continue"
method="POST" enctype="multipart/form-data">
<fi:group>
<fi:styling layout="columns"/>
<fi:items>
Modified:
cocoon/branches/BRANCH_2_1_X/src/blocks/portal/java/org/apache/cocoon/portal/tools/copletManagement/LayoutActions.java
URL:
http://svn.apache.org/viewcvs/cocoon/branches/BRANCH_2_1_X/src/blocks/portal/java/org/apache/cocoon/portal/tools/copletManagement/LayoutActions.java?view=diff&r1=151724&r2=151725
==============================================================================
---
cocoon/branches/BRANCH_2_1_X/src/blocks/portal/java/org/apache/cocoon/portal/tools/copletManagement/LayoutActions.java
(original)
+++
cocoon/branches/BRANCH_2_1_X/src/blocks/portal/java/org/apache/cocoon/portal/tools/copletManagement/LayoutActions.java
Mon Feb 7 07:52:19 2005
@@ -83,7 +83,7 @@
Item itemElem = (Item) iter.next();
-
if(itemElem.equals(((NamedItem)layoutObj))) {
+ if( itemElem.equals(layoutObj)) {
items.remove
(iter.nextIndex()-1);
return true;
}
Modified:
cocoon/branches/BRANCH_2_1_X/src/blocks/portal/java/org/apache/cocoon/portal/tools/copletManagement/generation/XMLProfileGenerator.java
URL:
http://svn.apache.org/viewcvs/cocoon/branches/BRANCH_2_1_X/src/blocks/portal/java/org/apache/cocoon/portal/tools/copletManagement/generation/XMLProfileGenerator.java?view=diff&r1=151724&r2=151725
==============================================================================
---
cocoon/branches/BRANCH_2_1_X/src/blocks/portal/java/org/apache/cocoon/portal/tools/copletManagement/generation/XMLProfileGenerator.java
(original)
+++
cocoon/branches/BRANCH_2_1_X/src/blocks/portal/java/org/apache/cocoon/portal/tools/copletManagement/generation/XMLProfileGenerator.java
Mon Feb 7 07:52:19 2005
@@ -28,8 +28,6 @@
import org.apache.cocoon.components.flow.FlowHelper;
import org.apache.cocoon.components.persistence.CastorSourceConverter;
import org.apache.cocoon.components.persistence.ConverterException;
-import org.apache.cocoon.environment.ObjectModelHelper;
-import org.apache.cocoon.environment.Request;
import org.apache.cocoon.generation.ServiceableGenerator;
import org.apache.commons.jxpath.DynamicPropertyHandler;
import org.apache.commons.jxpath.JXPathBeanInfo;
@@ -54,7 +52,6 @@
SAXParser parser = null;
CastorSourceConverter converter = null;
- final Request request = ObjectModelHelper.getRequest(this.objectModel);
final Object context = FlowHelper.getContextObject(this.objectModel);
Map myMap = new HashMap();
if (context instanceof Map) {
Modified:
cocoon/branches/BRANCH_2_1_X/src/blocks/portal/java/org/apache/cocoon/portal/transformation/ProxyTransformer.java
URL:
http://svn.apache.org/viewcvs/cocoon/branches/BRANCH_2_1_X/src/blocks/portal/java/org/apache/cocoon/portal/transformation/ProxyTransformer.java?view=diff&r1=151724&r2=151725
==============================================================================
---
cocoon/branches/BRANCH_2_1_X/src/blocks/portal/java/org/apache/cocoon/portal/transformation/ProxyTransformer.java
(original)
+++
cocoon/branches/BRANCH_2_1_X/src/blocks/portal/java/org/apache/cocoon/portal/transformation/ProxyTransformer.java
Mon Feb 7 07:52:19 2005
@@ -1,5 +1,5 @@
/*
- * Copyright 1999-2002,2004 The Apache Software Foundation.
+ * Copyright 1999-2002,2004-2005 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.
@@ -20,6 +20,7 @@
import java.io.InputStream;
import java.io.PrintWriter;
import java.io.StringWriter;
+import java.io.UnsupportedEncodingException;
import java.net.HttpURLConnection;
import java.net.MalformedURLException;
import java.net.URL;
@@ -137,6 +138,9 @@
*/
protected String userAgent;
+ /** The sitemap parameters */
+ protected Parameters parameters;
+
/* (non-Javadoc)
* @see
org.apache.avalon.framework.service.Serviceable#service(org.apache.avalon.framework.service.ServiceManager)
*/
@@ -146,17 +150,11 @@
}
/**
- * For the proxy transformer the envelope-tag and the protocol-handler
(for https) parameter can be specified.
+ * For the proxy transformer the envelope-tag parameter can be specified.
* @see
org.apache.avalon.framework.parameters.Parameterizable#parameterize(Parameters)
*/
public void parameterize(Parameters parameters) {
this.defaultEnvelopeTag =
parameters.getParameter(ENVELOPE_TAG_PARAMETER, null);
- String protocolHandler =
parameters.getParameter(PROTOCOL_HANDLER_PARAMETER, null);
- if (protocolHandler != null) {
- if (System.getProperty("java.protocol.handler.pkgs") == null) {
- System.setProperty("java.protocol.handler.pkgs",
protocolHandler);
- }
- }
}
/**
@@ -167,7 +165,7 @@
String src,
Parameters parameters)
throws ProcessingException, SAXException, IOException {
-
+ this.parameters = parameters;
this.request = ObjectModelHelper.getRequest(objectModel);
this.copletInstanceData = getInstanceData(this.manager, objectModel,
parameters);
@@ -208,6 +206,7 @@
this.documentBase = null;
this.link = null;
this.request = null;
+ this.parameters = null;
}
/**
@@ -252,31 +251,32 @@
remoteURI = remoteURI.substring(0, pos);
}
- Enumeration enumeration = request.getParameterNames();
-
+ // append all parameters of the current request, except those where
+ // the name of the request parameter starts with "cocoon-portal-"
+ final Enumeration enumeration = request.getParameterNames();
while (enumeration.hasMoreElements()) {
String paramName = (String) enumeration.nextElement();
if (!paramName.startsWith("cocoon-portal-")) {
- String[] paramValues =
- request.getParameterValues(paramName);
+ String[] paramValues =
request.getParameterValues(paramName);
for (int i = 0; i < paramValues.length; i++) {
- if (firstparameter) {
- if (!post) {
- query.append('?');
- }
- firstparameter = false;
- }
- else {
- query.append('&');
- }
-
- query.append(NetUtils.encode(paramName, "utf-8"));
- query.append('=');
- query.append(NetUtils.encode(paramValues[i], "utf-8"));
+ firstparameter = this.appendParameter(query,
firstparameter, post, paramName, paramValues[i]);
}
}
}
+
+ // now append parameters from the sitemap - if any
+ final String[] names = this.parameters.getNames();
+ for(int i=0; i<names.length; i++) {
+ if ( names[i].startsWith("add:") ) {
+ final String value =
this.parameters.getParameter(names[i]);
+ if ( value != null && value.trim().length() > 0 ) {
+ final String pName = names[i].substring(4);
+ firstparameter = this.appendParameter(query,
firstparameter, post, pName, value.trim());
+ }
+ }
+
+ }
Document result = null;
try {
@@ -313,6 +313,27 @@
}
}
+ protected boolean appendParameter(StringBuffer buffer,
+ boolean firstparameter,
+ boolean post,
+ String name,
+ String value)
+ throws UnsupportedEncodingException {
+ if (firstparameter) {
+ if (!post) {
+ buffer.append('?');
+ }
+ firstparameter = false;
+ } else {
+ buffer.append('&');
+ }
+
+ buffer.append(NetUtils.encode(name, "utf-8"));
+ buffer.append('=');
+ buffer.append(NetUtils.encode(value, "utf-8"));
+
+ return firstparameter;
+ }
/**
* Check the http status code of the http response to detect any redirects.
* @param connection The HttpURLConnection
Modified:
cocoon/branches/BRANCH_2_1_X/src/documentation/xdocs/userdocs/forms/templatetransformer.xml
URL:
http://svn.apache.org/viewcvs/cocoon/branches/BRANCH_2_1_X/src/documentation/xdocs/userdocs/forms/templatetransformer.xml?view=diff&r1=151724&r2=151725
==============================================================================
---
cocoon/branches/BRANCH_2_1_X/src/documentation/xdocs/userdocs/forms/templatetransformer.xml
(original)
+++
cocoon/branches/BRANCH_2_1_X/src/documentation/xdocs/userdocs/forms/templatetransformer.xml
Mon Feb 7 07:52:19 2005
@@ -100,10 +100,10 @@
embed dynamic data in the action attribute. One of the most common uses
is to embed the continuation id (if you're using flowscript), for
example:</p>
- <source><![CDATA[<ft:form-template
action="#{$continuation/id}.continue" ...]]></source>
+ <source><![CDATA[<ft:form-template
action="#{$cocoon/continuation/id}.continue" ...]]></source>
- <p>The following objects are available in the JXPath context:
continuation,
- requests, session and parameters. The context of the JXPath expression
is
+ <p>The following objects are available in the JXPath context via the
cocoon object:
+ continuation, requests, session and parameters. The context of the
JXPath expression is
the map passed on from the flowscript (if any).</p>
<p>The <strong>location</strong> attribute, if present, is used to
retrieve
Modified:
cocoon/branches/BRANCH_2_1_X/src/java/org/apache/cocoon/servlet/CocoonServlet.java
URL:
http://svn.apache.org/viewcvs/cocoon/branches/BRANCH_2_1_X/src/java/org/apache/cocoon/servlet/CocoonServlet.java?view=diff&r1=151724&r2=151725
==============================================================================
---
cocoon/branches/BRANCH_2_1_X/src/java/org/apache/cocoon/servlet/CocoonServlet.java
(original)
+++
cocoon/branches/BRANCH_2_1_X/src/java/org/apache/cocoon/servlet/CocoonServlet.java
Mon Feb 7 07:52:19 2005
@@ -1,5 +1,5 @@
/*
- * Copyright 1999-2004 The Apache Software Foundation.
+ * Copyright 1999-2005 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.
@@ -1364,6 +1364,7 @@
forceProperty();
try {
+ this.exception = null;
URL configFile = (URL)
this.appContext.get(Constants.CONTEXT_CONFIG_URL);
if (getLogger().isInfoEnabled()) {
getLogger().info("Reloading from: " +
configFile.toExternalForm());
Modified: cocoon/branches/BRANCH_2_1_X/status.xml
URL:
http://svn.apache.org/viewcvs/cocoon/branches/BRANCH_2_1_X/status.xml?view=diff&r1=151724&r2=151725
==============================================================================
--- cocoon/branches/BRANCH_2_1_X/status.xml (original)
+++ cocoon/branches/BRANCH_2_1_X/status.xml Mon Feb 7 07:52:19 2005
@@ -202,6 +202,10 @@
<changes>
<release version="@version@" date="@date@">
+ <action dev="CZ" type="fix">
+ CForms: template generator and transformer now use the same object model
as the JXTG: access
+ to objects have to use the "cocoon" object, like
"cocoon/continuation/id".
+ </action>
<action dev="RP" type="add">
hsqldb: make name and path of database parameterizable - this way the
database can be located outside of Cocoon
</action>
