You are viewing a plain text version of this content. The canonical link for it is here.
Posted to cvs@cocoon.apache.org by cz...@apache.org on 2005/01/21 22:19:52 UTC
svn commit: r125963 - in cocoon/trunk/src: blocks/forms/java/org/apache/cocoon/forms/transformation blocks/jms/java/org/apache/cocoon/samples/jms blocks/portal/java/org/apache/cocoon/portal/event/impl blocks/portal/java/org/apache/cocoon/portal/pluto blocks/scratchpad/java/org/apache/cocoon/components/source/impl blocks/taglib/java/org/apache/cocoon/jxpath blocks/template/java/org/apache/cocoon/components/expression blocks/template/java/org/apache/cocoon/components/expression/jxpath blocks/template/java/org/apache/cocoon/template/jxtg/script/event blocks/template/test/org/apache/cocoon/template/jxtg blocks/xsp/java/org/apache/cocoon/components/language/markup/xsp core/java/org/apache/cocoon java/org/apache/cocoon/acting java/org/apache/cocoon/servlet java/org/apache/cocoon/transformation/helpers
Author: cziegeler
Date: Fri Jan 21 13:19:51 2005
New Revision: 125963
URL: http://svn.apache.org/viewcvs?view=rev&rev=125963
Log:
Cleanup constants and code
Modified:
cocoon/trunk/src/blocks/forms/java/org/apache/cocoon/forms/transformation/EffectWidgetReplacingPipe.java
cocoon/trunk/src/blocks/jms/java/org/apache/cocoon/samples/jms/HTTPTrigger.java
cocoon/trunk/src/blocks/portal/java/org/apache/cocoon/portal/event/impl/FullScreenCopletEvent.java
cocoon/trunk/src/blocks/portal/java/org/apache/cocoon/portal/pluto/PortletURLProviderFactory.java
cocoon/trunk/src/blocks/scratchpad/java/org/apache/cocoon/components/source/impl/DelayRefresher.java
cocoon/trunk/src/blocks/taglib/java/org/apache/cocoon/jxpath/JXPathCocoonContexts.java
cocoon/trunk/src/blocks/template/java/org/apache/cocoon/components/expression/ExpressionFactory.java
cocoon/trunk/src/blocks/template/java/org/apache/cocoon/components/expression/jxpath/JXPathExpression.java
cocoon/trunk/src/blocks/template/java/org/apache/cocoon/template/jxtg/script/event/Event.java
cocoon/trunk/src/blocks/template/test/org/apache/cocoon/template/jxtg/JXTemplateGeneratorTestCase.java
cocoon/trunk/src/blocks/xsp/java/org/apache/cocoon/components/language/markup/xsp/XSPCookieHelper.java
cocoon/trunk/src/blocks/xsp/java/org/apache/cocoon/components/language/markup/xsp/XSPRequestHelper.java
cocoon/trunk/src/blocks/xsp/java/org/apache/cocoon/components/language/markup/xsp/XSPResponseHelper.java
cocoon/trunk/src/blocks/xsp/java/org/apache/cocoon/components/language/markup/xsp/XSPUtil.java
cocoon/trunk/src/core/java/org/apache/cocoon/Constants.java
cocoon/trunk/src/java/org/apache/cocoon/acting/AbstractValidatorAction.java
cocoon/trunk/src/java/org/apache/cocoon/servlet/CocoonServlet.java
cocoon/trunk/src/java/org/apache/cocoon/servlet/SettingsHelper.java
cocoon/trunk/src/java/org/apache/cocoon/transformation/helpers/FormValidatorHelper.java
Modified: cocoon/trunk/src/blocks/forms/java/org/apache/cocoon/forms/transformation/EffectWidgetReplacingPipe.java
Url: http://svn.apache.org/viewcvs/cocoon/trunk/src/blocks/forms/java/org/apache/cocoon/forms/transformation/EffectWidgetReplacingPipe.java?view=diff&rev=125963&p1=cocoon/trunk/src/blocks/forms/java/org/apache/cocoon/forms/transformation/EffectWidgetReplacingPipe.java&r1=125962&p2=cocoon/trunk/src/blocks/forms/java/org/apache/cocoon/forms/transformation/EffectWidgetReplacingPipe.java&r2=125963
==============================================================================
--- cocoon/trunk/src/blocks/forms/java/org/apache/cocoon/forms/transformation/EffectWidgetReplacingPipe.java (original)
+++ cocoon/trunk/src/blocks/forms/java/org/apache/cocoon/forms/transformation/EffectWidgetReplacingPipe.java Fri Jan 21 13:19:51 2005
@@ -38,7 +38,6 @@
import org.xml.sax.SAXException;
import org.xml.sax.ext.LexicalHandler;
import org.xml.sax.helpers.AttributesImpl;
-import org.xml.sax.Locator;
import java.util.HashMap;
import java.util.LinkedList;
Modified: cocoon/trunk/src/blocks/jms/java/org/apache/cocoon/samples/jms/HTTPTrigger.java
Url: http://svn.apache.org/viewcvs/cocoon/trunk/src/blocks/jms/java/org/apache/cocoon/samples/jms/HTTPTrigger.java?view=diff&rev=125963&p1=cocoon/trunk/src/blocks/jms/java/org/apache/cocoon/samples/jms/HTTPTrigger.java&r1=125962&p2=cocoon/trunk/src/blocks/jms/java/org/apache/cocoon/samples/jms/HTTPTrigger.java&r2=125963
==============================================================================
--- cocoon/trunk/src/blocks/jms/java/org/apache/cocoon/samples/jms/HTTPTrigger.java (original)
+++ cocoon/trunk/src/blocks/jms/java/org/apache/cocoon/samples/jms/HTTPTrigger.java Fri Jan 21 13:19:51 2005
@@ -17,8 +17,8 @@
import java.net.HttpURLConnection;
import java.net.URL;
-import java.net.URLEncoder;
+import org.apache.cocoon.util.NetUtils;
import org.hsqldb.Trigger;
/**
@@ -37,11 +37,10 @@
*/
public void fire(String triggerName, String tableName, Object[] row) {
try {
- // FIXME: Method URLEncoder.encode(triggerName.toLowerCase(), "UTF-8") is absent on JDK1.3
HttpURLConnection con = (HttpURLConnection) new URL(this.protocol, this.hostname, this.port, this.path+"?trigger="
- + URLEncoder.encode(triggerName.toLowerCase())
+ + NetUtils.encode(triggerName.toLowerCase(), "utf-8")
+ "&table="
- + URLEncoder.encode(tableName.toLowerCase())).openConnection();
+ + NetUtils.encode(tableName.toLowerCase(), "utf-8")).openConnection();
con.connect();
con.getContent();
con.disconnect();
Modified: cocoon/trunk/src/blocks/portal/java/org/apache/cocoon/portal/event/impl/FullScreenCopletEvent.java
Url: http://svn.apache.org/viewcvs/cocoon/trunk/src/blocks/portal/java/org/apache/cocoon/portal/event/impl/FullScreenCopletEvent.java?view=diff&rev=125963&p1=cocoon/trunk/src/blocks/portal/java/org/apache/cocoon/portal/event/impl/FullScreenCopletEvent.java&r1=125962&p2=cocoon/trunk/src/blocks/portal/java/org/apache/cocoon/portal/event/impl/FullScreenCopletEvent.java&r2=125963
==============================================================================
--- cocoon/trunk/src/blocks/portal/java/org/apache/cocoon/portal/event/impl/FullScreenCopletEvent.java (original)
+++ cocoon/trunk/src/blocks/portal/java/org/apache/cocoon/portal/event/impl/FullScreenCopletEvent.java Fri Jan 21 13:19:51 2005
@@ -20,8 +20,6 @@
import org.apache.cocoon.portal.event.ConvertableEvent;
import org.apache.cocoon.portal.layout.Layout;
import org.apache.cocoon.portal.PortalService;
-import org.apache.cocoon.portal.pluto.om.PortletWindowImpl;
-import org.apache.pluto.om.window.PortletWindow;
/**
* EventSource: copletID
Modified: cocoon/trunk/src/blocks/portal/java/org/apache/cocoon/portal/pluto/PortletURLProviderFactory.java
Url: http://svn.apache.org/viewcvs/cocoon/trunk/src/blocks/portal/java/org/apache/cocoon/portal/pluto/PortletURLProviderFactory.java?view=diff&rev=125963&p1=cocoon/trunk/src/blocks/portal/java/org/apache/cocoon/portal/pluto/PortletURLProviderFactory.java&r1=125962&p2=cocoon/trunk/src/blocks/portal/java/org/apache/cocoon/portal/pluto/PortletURLProviderFactory.java&r2=125963
==============================================================================
--- cocoon/trunk/src/blocks/portal/java/org/apache/cocoon/portal/pluto/PortletURLProviderFactory.java (original)
+++ cocoon/trunk/src/blocks/portal/java/org/apache/cocoon/portal/pluto/PortletURLProviderFactory.java Fri Jan 21 13:19:51 2005
@@ -19,8 +19,6 @@
import org.apache.cocoon.portal.PortalService;
import org.apache.cocoon.portal.event.ConvertableEventFactory;
import org.apache.cocoon.portal.event.ConvertableEvent;
-import org.apache.cocoon.portal.event.impl.FullScreenCopletEventFactory;
-import org.apache.cocoon.portal.event.impl.FullScreenCopletEvent;
/**
* Factory to create PortletURLProviderImpl objects from marshalled data
Modified: cocoon/trunk/src/blocks/scratchpad/java/org/apache/cocoon/components/source/impl/DelayRefresher.java
Url: http://svn.apache.org/viewcvs/cocoon/trunk/src/blocks/scratchpad/java/org/apache/cocoon/components/source/impl/DelayRefresher.java?view=diff&rev=125963&p1=cocoon/trunk/src/blocks/scratchpad/java/org/apache/cocoon/components/source/impl/DelayRefresher.java&r1=125962&p2=cocoon/trunk/src/blocks/scratchpad/java/org/apache/cocoon/components/source/impl/DelayRefresher.java&r2=125963
==============================================================================
--- cocoon/trunk/src/blocks/scratchpad/java/org/apache/cocoon/components/source/impl/DelayRefresher.java (original)
+++ cocoon/trunk/src/blocks/scratchpad/java/org/apache/cocoon/components/source/impl/DelayRefresher.java Fri Jan 21 13:19:51 2005
@@ -19,9 +19,8 @@
import java.io.IOException;
import java.io.OutputStream;
import java.io.OutputStreamWriter;
+import java.io.UnsupportedEncodingException;
import java.io.Writer;
-import java.net.URLDecoder;
-import java.net.URLEncoder;
import java.util.Collections;
import java.util.HashMap;
import java.util.Iterator;
@@ -48,6 +47,7 @@
import org.apache.cocoon.components.cron.CronJob;
import org.apache.cocoon.components.cron.JobScheduler;
import org.apache.cocoon.components.source.SourceUtil;
+import org.apache.cocoon.util.NetUtils;
import org.apache.excalibur.source.ModifiableSource;
import org.apache.excalibur.source.Source;
import org.apache.excalibur.source.SourceException;
@@ -57,7 +57,7 @@
* Default implementation of the refresher.
*
* @since 2.1.1
- * @version CVS $Id: DelayRefresher.java,v 1.7 2004/05/26 01:31:06 joerg Exp $
+ * @version CVS $Id$
*/
public class DelayRefresher extends AbstractLogEnabled
implements Contextualizable, Serviceable, Parameterizable, Disposable, ThreadSafe, Refresher, CronJob {
@@ -272,26 +272,29 @@
* @throws CascadingException
*/
private void setupSingleRefreshJob(final Configuration conf) throws ConfigurationException, CascadingException {
-
- final String uri = URLDecoder.decode(conf.getAttribute(ATTR_URI));
- final String cache = conf.getAttribute(ATTR_CACHE);
- final int expires = conf.getAttributeAsInteger(ATTR_EXPIRES);
- final String key = URLDecoder.decode(conf.getAttribute(ATTR_KEY));
- final IdentifierCacheKey cacheKey = new IdentifierCacheKey(key, false);
-
- final Parameters parameters = Parameters.fromConfiguration(conf);
-
- final TargetConfiguration tc = new TargetConfiguration(cacheKey, uri, cache, parameters);
-
- this.entries.put(key, tc);
- final String name = cacheKey.getKey();
-
- this.scheduler.addPeriodicJob(name,
- this.updateTarget,
- expires,
- true,
- tc.parameters,
- tc.map);
+ try {
+ final String uri = NetUtils.decode(conf.getAttribute(ATTR_URI), "utf-8");
+ final String cache = conf.getAttribute(ATTR_CACHE);
+ final int expires = conf.getAttributeAsInteger(ATTR_EXPIRES);
+ final String key = NetUtils.decode(conf.getAttribute(ATTR_KEY), "utf-8");
+ final IdentifierCacheKey cacheKey = new IdentifierCacheKey(key, false);
+
+ final Parameters parameters = Parameters.fromConfiguration(conf);
+
+ final TargetConfiguration tc = new TargetConfiguration(cacheKey, uri, cache, parameters);
+
+ this.entries.put(key, tc);
+ final String name = cacheKey.getKey();
+
+ this.scheduler.addPeriodicJob(name,
+ this.updateTarget,
+ expires,
+ true,
+ tc.parameters,
+ tc.map);
+ } catch (UnsupportedEncodingException uee) {
+ throw new ConfigurationException("Unsupported encoding", uee);
+ }
}
/**
@@ -335,13 +338,13 @@
*/
private void writeRefreshJobConfiguration(Writer writer, final TargetConfiguration c) throws IOException {
writer.write("<"+TAGNAME_TARGET+" "+ATTR_URI+"=\"");
- writer.write(URLEncoder.encode(c.parameters.getParameter(ATTR_URI, "")));
+ writer.write(NetUtils.encode(c.parameters.getParameter(ATTR_URI, ""), "utf-8"));
writer.write("\" "+ATTR_EXPIRES+"=\"");
writer.write(c.parameters.getParameter(PARAM_CACHE_EXPIRES, "0"));
writer.write("\" "+ATTR_CACHE+"=\"");
writer.write(c.parameters.getParameter(PARAM_CACHE_ROLE, ""));
writer.write("\" "+ATTR_KEY+"=\"");
- writer.write(URLEncoder.encode(((IdentifierCacheKey) c.map.get(CACHE_KEY)).getKey()));
+ writer.write(NetUtils.encode(((IdentifierCacheKey) c.map.get(CACHE_KEY)).getKey(), "utf-8"));
writer.write("\"/>\n");
}
Modified: cocoon/trunk/src/blocks/taglib/java/org/apache/cocoon/jxpath/JXPathCocoonContexts.java
Url: http://svn.apache.org/viewcvs/cocoon/trunk/src/blocks/taglib/java/org/apache/cocoon/jxpath/JXPathCocoonContexts.java?view=diff&rev=125963&p1=cocoon/trunk/src/blocks/taglib/java/org/apache/cocoon/jxpath/JXPathCocoonContexts.java&r1=125962&p2=cocoon/trunk/src/blocks/taglib/java/org/apache/cocoon/jxpath/JXPathCocoonContexts.java&r2=125963
==============================================================================
--- cocoon/trunk/src/blocks/taglib/java/org/apache/cocoon/jxpath/JXPathCocoonContexts.java (original)
+++ cocoon/trunk/src/blocks/taglib/java/org/apache/cocoon/jxpath/JXPathCocoonContexts.java Fri Jan 21 13:19:51 2005
@@ -19,7 +19,6 @@
import org.apache.avalon.excalibur.pool.Recyclable;
import org.apache.avalon.framework.context.Context;
-import org.apache.avalon.framework.context.ContextException;
import org.apache.avalon.framework.context.Contextualizable;
import org.apache.cocoon.components.ContextHelper;
import org.apache.cocoon.environment.ObjectModelHelper;
Modified: cocoon/trunk/src/blocks/template/java/org/apache/cocoon/components/expression/ExpressionFactory.java
Url: http://svn.apache.org/viewcvs/cocoon/trunk/src/blocks/template/java/org/apache/cocoon/components/expression/ExpressionFactory.java?view=diff&rev=125963&p1=cocoon/trunk/src/blocks/template/java/org/apache/cocoon/components/expression/ExpressionFactory.java&r1=125962&p2=cocoon/trunk/src/blocks/template/java/org/apache/cocoon/components/expression/ExpressionFactory.java&r2=125963
==============================================================================
--- cocoon/trunk/src/blocks/template/java/org/apache/cocoon/components/expression/ExpressionFactory.java (original)
+++ cocoon/trunk/src/blocks/template/java/org/apache/cocoon/components/expression/ExpressionFactory.java Fri Jan 21 13:19:51 2005
@@ -15,7 +15,6 @@
*/
package org.apache.cocoon.components.expression;
-import org.apache.avalon.framework.CascadingRuntimeException;
import org.apache.avalon.framework.activity.Disposable;
import org.apache.avalon.framework.logger.AbstractLogEnabled;
import org.apache.avalon.framework.service.ServiceException;
Modified: cocoon/trunk/src/blocks/template/java/org/apache/cocoon/components/expression/jxpath/JXPathExpression.java
Url: http://svn.apache.org/viewcvs/cocoon/trunk/src/blocks/template/java/org/apache/cocoon/components/expression/jxpath/JXPathExpression.java?view=diff&rev=125963&p1=cocoon/trunk/src/blocks/template/java/org/apache/cocoon/components/expression/jxpath/JXPathExpression.java&r1=125962&p2=cocoon/trunk/src/blocks/template/java/org/apache/cocoon/components/expression/jxpath/JXPathExpression.java&r2=125963
==============================================================================
--- cocoon/trunk/src/blocks/template/java/org/apache/cocoon/components/expression/jxpath/JXPathExpression.java (original)
+++ cocoon/trunk/src/blocks/template/java/org/apache/cocoon/components/expression/jxpath/JXPathExpression.java Fri Jan 21 13:19:51 2005
@@ -18,10 +18,8 @@
import java.util.Iterator;
import java.util.LinkedList;
import java.util.List;
-import java.util.Map;
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.cocoon.components.expression.jexl.JSIntrospector;
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=diff&rev=125963&p1=cocoon/trunk/src/blocks/template/java/org/apache/cocoon/template/jxtg/script/event/Event.java&r1=125962&p2=cocoon/trunk/src/blocks/template/java/org/apache/cocoon/template/jxtg/script/event/Event.java&r2=125963
==============================================================================
--- 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 Fri Jan 21 13:19:51 2005
@@ -15,7 +15,6 @@
*/
package org.apache.cocoon.template.jxtg.script.event;
-import org.apache.cocoon.template.jxtg.JXTemplateGenerator;
import org.xml.sax.Locator;
import org.xml.sax.helpers.LocatorImpl;
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=125963&p1=cocoon/trunk/src/blocks/template/test/org/apache/cocoon/template/jxtg/JXTemplateGeneratorTestCase.java&r1=125962&p2=cocoon/trunk/src/blocks/template/test/org/apache/cocoon/template/jxtg/JXTemplateGeneratorTestCase.java&r2=125963
==============================================================================
--- 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 Jan 21 13:19:51 2005
@@ -22,10 +22,7 @@
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;
public class JXTemplateGeneratorTestCase extends SitemapComponentTestCase {
private Logger logger = new ConsoleLogger(ConsoleLogger.LEVEL_WARN);
Modified: cocoon/trunk/src/blocks/xsp/java/org/apache/cocoon/components/language/markup/xsp/XSPCookieHelper.java
Url: http://svn.apache.org/viewcvs/cocoon/trunk/src/blocks/xsp/java/org/apache/cocoon/components/language/markup/xsp/XSPCookieHelper.java?view=diff&rev=125963&p1=cocoon/trunk/src/blocks/xsp/java/org/apache/cocoon/components/language/markup/xsp/XSPCookieHelper.java&r1=125962&p2=cocoon/trunk/src/blocks/xsp/java/org/apache/cocoon/components/language/markup/xsp/XSPCookieHelper.java&r2=125963
==============================================================================
--- cocoon/trunk/src/blocks/xsp/java/org/apache/cocoon/components/language/markup/xsp/XSPCookieHelper.java (original)
+++ cocoon/trunk/src/blocks/xsp/java/org/apache/cocoon/components/language/markup/xsp/XSPCookieHelper.java Fri Jan 21 13:19:51 2005
@@ -15,7 +15,6 @@
*/
package org.apache.cocoon.components.language.markup.xsp;
-import org.apache.cocoon.Constants;
import org.apache.cocoon.environment.Cookie;
import org.apache.cocoon.environment.ObjectModelHelper;
import org.apache.cocoon.environment.Request;
@@ -52,14 +51,14 @@
* private static String returnCookieProperty(Map ,String ,int ,String );
* </pre>
*
- * @version CVS $Id: XSPCookieHelper.java,v 1.1 2004/03/10 12:58:05 stephan Exp $
+ * @version CVS $Id$
*/
public class XSPCookieHelper extends XSPObjectHelper {
/**
* Assign values to the object's namespace uri and prefix
*/
- private static final String URI = Constants.XSP_COOKIE_URI;
- private static final String PREFIX = Constants.XSP_COOKIE_PREFIX;
+ private static final String URI = XSPUtil.XSP_COOKIE_URI;
+ private static final String PREFIX = XSPUtil.XSP_COOKIE_PREFIX;
/**
* This method will set a new cookie with values that are passed through parameters
Modified: cocoon/trunk/src/blocks/xsp/java/org/apache/cocoon/components/language/markup/xsp/XSPRequestHelper.java
Url: http://svn.apache.org/viewcvs/cocoon/trunk/src/blocks/xsp/java/org/apache/cocoon/components/language/markup/xsp/XSPRequestHelper.java?view=diff&rev=125963&p1=cocoon/trunk/src/blocks/xsp/java/org/apache/cocoon/components/language/markup/xsp/XSPRequestHelper.java&r1=125962&p2=cocoon/trunk/src/blocks/xsp/java/org/apache/cocoon/components/language/markup/xsp/XSPRequestHelper.java&r2=125963
==============================================================================
--- cocoon/trunk/src/blocks/xsp/java/org/apache/cocoon/components/language/markup/xsp/XSPRequestHelper.java (original)
+++ cocoon/trunk/src/blocks/xsp/java/org/apache/cocoon/components/language/markup/xsp/XSPRequestHelper.java Fri Jan 21 13:19:51 2005
@@ -16,7 +16,6 @@
package org.apache.cocoon.components.language.markup.xsp;
import org.apache.avalon.framework.CascadingRuntimeException;
-import org.apache.cocoon.Constants;
import org.apache.cocoon.environment.ObjectModelHelper;
import org.apache.cocoon.environment.Request;
import org.apache.cocoon.environment.Session;
@@ -35,14 +34,14 @@
* The <code>Request</code> object helper
*
* @author <a href="mailto:ricardo@apache.org">Ricardo Rocha</a>
- * @version CVS $Id: XSPRequestHelper.java,v 1.1 2004/03/10 12:58:05 stephan Exp $
+ * @version CVS $Id$
*/
public class XSPRequestHelper {
/**
* Assign values to the object's namespace uri and prefix
*/
- private static final String URI = Constants.XSP_REQUEST_URI;
- private static final String PREFIX = Constants.XSP_REQUEST_PREFIX;
+ private static final String URI = XSPUtil.XSP_REQUEST_URI;
+ private static final String PREFIX = XSPUtil.XSP_REQUEST_PREFIX;
private static void getLocale(Locale locale, ContentHandler handler)
throws SAXException
Modified: cocoon/trunk/src/blocks/xsp/java/org/apache/cocoon/components/language/markup/xsp/XSPResponseHelper.java
Url: http://svn.apache.org/viewcvs/cocoon/trunk/src/blocks/xsp/java/org/apache/cocoon/components/language/markup/xsp/XSPResponseHelper.java?view=diff&rev=125963&p1=cocoon/trunk/src/blocks/xsp/java/org/apache/cocoon/components/language/markup/xsp/XSPResponseHelper.java&r1=125962&p2=cocoon/trunk/src/blocks/xsp/java/org/apache/cocoon/components/language/markup/xsp/XSPResponseHelper.java&r2=125963
==============================================================================
--- cocoon/trunk/src/blocks/xsp/java/org/apache/cocoon/components/language/markup/xsp/XSPResponseHelper.java (original)
+++ cocoon/trunk/src/blocks/xsp/java/org/apache/cocoon/components/language/markup/xsp/XSPResponseHelper.java Fri Jan 21 13:19:51 2005
@@ -15,7 +15,6 @@
*/
package org.apache.cocoon.components.language.markup.xsp;
-import org.apache.cocoon.Constants;
import org.apache.cocoon.environment.Response;
import org.xml.sax.ContentHandler;
import org.xml.sax.SAXException;
@@ -30,14 +29,14 @@
* The XSP <code>Response</code> object helper
*
* @author <a href="mailto:ricardo@apache.org">Ricardo Rocha</a>
- * @version CVS $Id: XSPResponseHelper.java,v 1.1 2004/03/10 12:58:05 stephan Exp $
+ * @version CVS $Id$
*/
public class XSPResponseHelper {
/**
* Assign values to the object's namespace uri and prefix
*/
- private static final String URI = Constants.XSP_RESPONSE_URI;
- private static final String PREFIX = Constants.XSP_RESPONSE_PREFIX;
+ private static final String URI = XSPUtil.XSP_RESPONSE_URI;
+ private static final String PREFIX = XSPUtil.XSP_RESPONSE_PREFIX;
public static void getLocale(Response response, ContentHandler handler)
throws SAXException {
Modified: cocoon/trunk/src/blocks/xsp/java/org/apache/cocoon/components/language/markup/xsp/XSPUtil.java
Url: http://svn.apache.org/viewcvs/cocoon/trunk/src/blocks/xsp/java/org/apache/cocoon/components/language/markup/xsp/XSPUtil.java?view=diff&rev=125963&p1=cocoon/trunk/src/blocks/xsp/java/org/apache/cocoon/components/language/markup/xsp/XSPUtil.java&r1=125962&p2=cocoon/trunk/src/blocks/xsp/java/org/apache/cocoon/components/language/markup/xsp/XSPUtil.java&r2=125963
==============================================================================
--- cocoon/trunk/src/blocks/xsp/java/org/apache/cocoon/components/language/markup/xsp/XSPUtil.java (original)
+++ cocoon/trunk/src/blocks/xsp/java/org/apache/cocoon/components/language/markup/xsp/XSPUtil.java Fri Jan 21 13:19:51 2005
@@ -55,6 +55,39 @@
*/
public class XSPUtil {
+ /** The namespace for the XSP core logicsheet. */
+ public static final String XSP_URI = "http://apache.org/xsp";
+
+ /**
+ * The namespace prefix for the request logicsheet.
+ */
+ public static final String XSP_REQUEST_PREFIX = "xsp-request";
+
+ /**
+ * The namespace for the request logicsheet.
+ */
+ public static final String XSP_REQUEST_URI = XSP_URI + "/request/2.0";
+
+ /**
+ * The namespace prefix for the response logicsheet.
+ */
+ public static final String XSP_RESPONSE_PREFIX = "xsp-response";
+
+ /**
+ * The namespace for the response logicsheet.
+ */
+ public static final String XSP_RESPONSE_URI = XSP_URI + "/response/2.0";
+
+ /**
+ * The namespace prefix for the cookie logicsheet.
+ */
+ public static final String XSP_COOKIE_PREFIX = "xsp-cookie";
+
+ /**
+ * The namespace for the cookie logicsheet.
+ */
+ public static final String XSP_COOKIE_URI = XSP_URI + "/cookie/2.0";
+
public static String pathComponent(String filename) {
int i = filename.lastIndexOf(File.separator);
return (i >= 0) ? filename.substring(0, i) : filename;
Modified: cocoon/trunk/src/core/java/org/apache/cocoon/Constants.java
Url: http://svn.apache.org/viewcvs/cocoon/trunk/src/core/java/org/apache/cocoon/Constants.java?view=diff&rev=125963&p1=cocoon/trunk/src/core/java/org/apache/cocoon/Constants.java&r1=125962&p2=cocoon/trunk/src/core/java/org/apache/cocoon/Constants.java&r2=125963
==============================================================================
--- cocoon/trunk/src/core/java/org/apache/cocoon/Constants.java (original)
+++ cocoon/trunk/src/core/java/org/apache/cocoon/Constants.java Fri Jan 21 13:19:51 2005
@@ -100,68 +100,6 @@
*/
public static final String ACTION_PARAM_PREFIX = "cocoon-action-";
- /** The name of the property holding the class for a XML parser
- * @deprecated Cocoon now uses the system's JAXP parser to load its configuration
- */
- public static final String PARSER_PROPERTY = "org.apache.excalibur.xml.sax.SAXParser";
-
- /** The name of the class for the default XML parser to use
- * @deprecated Cocoon now uses the system's JAXP parser to load its configuration
- */
- public static final String DEFAULT_PARSER = "org.apache.excalibur.xml.impl.JaxpParser";
-
- /** The namespace for the XSP core logicsheet. */
- public static final String XSP_URI = "http://apache.org/xsp";
-
- /**
- * The namespace prefix for the request logicsheet.
- *
- * FIXME(GP): Would logicsheets belong to the core?
- */
- public static final String XSP_REQUEST_PREFIX = "xsp-request";
-
- /**
- * The namespace for the request logicsheet.
- *
- * FIXME(GP): Would logicsheets belong to the core?
- */
- public static final String XSP_REQUEST_URI = XSP_URI + "/request/2.0";
-
- /**
- * The namespace prefix for the response logicsheet.
- *
- * FIXME(GP): Would logicsheets belong to the core?
- */
- public static final String XSP_RESPONSE_PREFIX = "xsp-response";
-
- /**
- * The namespace for the response logicsheet.
- *
- * FIXME(GP): Would logicsheets belong to the core?
- */
- public static final String XSP_RESPONSE_URI = XSP_URI + "/response/2.0";
-
- /**
- * The namespace prefix for the cookie logicsheet.
- *
- * FIXME(GP): Would logicsheets belong to the core?
- */
- public static final String XSP_COOKIE_PREFIX = "xsp-cookie";
-
- /**
- * The namespace for the cookie logicsheet.
- *
- * FIXME(GP): Would logicsheets belong to the core?
- */
- public static final String XSP_COOKIE_URI = XSP_URI + "/cookie/2.0";
-
- /**
- * Don't know exactly what this is for. (I can guess it's for the FormValidator)
- *
- * FIXME(GP): Isn't this component specific?
- */
- public static final String XSP_FORMVALIDATOR_PATH = "org.apache.cocoon.acting.FormValidatorAction.results";
-
/** The URI for xml namespaces */
public static final String XML_NAMESPACE_URI = "http://www.w3.org/XML/1998/namespace";
Modified: cocoon/trunk/src/java/org/apache/cocoon/acting/AbstractValidatorAction.java
Url: http://svn.apache.org/viewcvs/cocoon/trunk/src/java/org/apache/cocoon/acting/AbstractValidatorAction.java?view=diff&rev=125963&p1=cocoon/trunk/src/java/org/apache/cocoon/acting/AbstractValidatorAction.java&r1=125962&p2=cocoon/trunk/src/java/org/apache/cocoon/acting/AbstractValidatorAction.java&r2=125963
==============================================================================
--- cocoon/trunk/src/java/org/apache/cocoon/acting/AbstractValidatorAction.java (original)
+++ cocoon/trunk/src/java/org/apache/cocoon/acting/AbstractValidatorAction.java Fri Jan 21 13:19:51 2005
@@ -20,7 +20,6 @@
import org.apache.avalon.framework.configuration.ConfigurationException;
import org.apache.avalon.framework.parameters.Parameters;
-import org.apache.cocoon.Constants;
import org.apache.cocoon.ProcessingException;
import org.apache.cocoon.environment.SourceResolver;
import org.apache.cocoon.environment.ObjectModelHelper;
@@ -90,7 +89,7 @@
* <p>In addition a request attribute
* <code>org.apache.cocoon.acting.FormValidatorAction.results</code>
* contains the validation results in both cases and make it available
- * to XSPs. The special parameter "*" contains either the validation
+ * to other components. The special parameter "*" contains either the validation
* result "OK", if all parameters were validated successfully, or
* "ERROR" otherwise. Mind you that redirections create new request
* objects and thus the result is not available for the target
@@ -194,6 +193,11 @@
implements Configurable {
/**
+ * This is the name of the request attribute containing the result
+ */
+ public static final String FORMVALIDATOR_PATH = "org.apache.cocoon.acting.FormValidatorAction.results";
+
+ /**
* Reads parameter values for all parameters that are contained in the active
* constraint list. If a parameter has multiple values, all are stored in the
* resulting map.
@@ -1038,7 +1042,7 @@
}
// store validation results in request attribute
ObjectModelHelper.getRequest(objectModel).setAttribute(
- Constants.XSP_FORMVALIDATOR_PATH,
+ FORMVALIDATOR_PATH,
resultMap);
//return Collections.unmodifiableMap (actionMap);
return actionMap;
Modified: cocoon/trunk/src/java/org/apache/cocoon/servlet/CocoonServlet.java
Url: http://svn.apache.org/viewcvs/cocoon/trunk/src/java/org/apache/cocoon/servlet/CocoonServlet.java?view=diff&rev=125963&p1=cocoon/trunk/src/java/org/apache/cocoon/servlet/CocoonServlet.java&r1=125962&p2=cocoon/trunk/src/java/org/apache/cocoon/servlet/CocoonServlet.java&r2=125963
==============================================================================
--- cocoon/trunk/src/java/org/apache/cocoon/servlet/CocoonServlet.java (original)
+++ cocoon/trunk/src/java/org/apache/cocoon/servlet/CocoonServlet.java Fri Jan 21 13:19:51 2005
@@ -167,7 +167,12 @@
* can be overwritten
*/
protected Settings getSettings() {
- return SettingsHelper.getSettings(this.getServletConfig());
+ // create a settings object from the servlet parameters
+ Settings s = SettingsHelper.getSettings(this.getServletConfig());
+ // now overwrite with system properties
+ s.fill(System.getProperties());
+
+ return s;
}
/**
Modified: cocoon/trunk/src/java/org/apache/cocoon/servlet/SettingsHelper.java
Url: http://svn.apache.org/viewcvs/cocoon/trunk/src/java/org/apache/cocoon/servlet/SettingsHelper.java?view=diff&rev=125963&p1=cocoon/trunk/src/java/org/apache/cocoon/servlet/SettingsHelper.java&r1=125962&p2=cocoon/trunk/src/java/org/apache/cocoon/servlet/SettingsHelper.java&r2=125963
==============================================================================
--- cocoon/trunk/src/java/org/apache/cocoon/servlet/SettingsHelper.java (original)
+++ cocoon/trunk/src/java/org/apache/cocoon/servlet/SettingsHelper.java Fri Jan 21 13:19:51 2005
@@ -36,7 +36,6 @@
public static Settings getSettings(ServletConfig config) {
final Settings s = new Settings();
- s.fill(System.getProperties());
// logging
s.setCocoonLogger(config.getInitParameter("cocoon-logger"));
Modified: cocoon/trunk/src/java/org/apache/cocoon/transformation/helpers/FormValidatorHelper.java
Url: http://svn.apache.org/viewcvs/cocoon/trunk/src/java/org/apache/cocoon/transformation/helpers/FormValidatorHelper.java?view=diff&rev=125963&p1=cocoon/trunk/src/java/org/apache/cocoon/transformation/helpers/FormValidatorHelper.java&r1=125962&p2=cocoon/trunk/src/java/org/apache/cocoon/transformation/helpers/FormValidatorHelper.java&r2=125963
==============================================================================
--- cocoon/trunk/src/java/org/apache/cocoon/transformation/helpers/FormValidatorHelper.java (original)
+++ cocoon/trunk/src/java/org/apache/cocoon/transformation/helpers/FormValidatorHelper.java Fri Jan 21 13:19:51 2005
@@ -20,7 +20,7 @@
import org.apache.avalon.framework.configuration.SAXConfigurationHandler;
import org.apache.excalibur.source.Source;
-import org.apache.cocoon.Constants;
+import org.apache.cocoon.acting.AbstractValidatorAction;
import org.apache.cocoon.acting.ConfigurationHelper;
import org.apache.cocoon.acting.ValidatorActionResult;
import org.apache.cocoon.components.source.SourceUtil;
@@ -37,7 +37,7 @@
* The <code>ValidatorActionResult</code> object helper
*
* @author <a href="mailto:haul@apache.org">Christian Haul</a>
- * @version CVS $Id: FormValidatorHelper.java,v 1.2 2004/03/10 15:19:32 unico Exp $
+ * @version CVS $Id$
*/
public class FormValidatorHelper {
@@ -107,7 +107,7 @@
*/
public static Map getResults(Map objectModel) {
Request request = ObjectModelHelper.getRequest(objectModel);
- return (Map) request.getAttribute(Constants.XSP_FORMVALIDATOR_PATH);
+ return (Map) request.getAttribute(AbstractValidatorAction.FORMVALIDATOR_PATH);
}