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 2003/10/27 08:28:27 UTC
cvs commit: cocoon-2.2/src/java/org/apache/cocoon/acting LocaleAction.java SessionStateAction.java AbstractAction.java Action.java SessionInvalidatorAction.java RequestParameterExistsAction.java ClearPersistentStoreAction.java RequestParamAction.java SetCharacterEncodingAction.java AbstractMultiAction.java SessionValidatorAction.java ResourceExistsAction.java ClearCacheAction.java AbstractComplementaryConfigurableAction.java FormValidatorAction.java InputModuleAction.java SessionPropagatorAction.java SessionIsValidAction.java HelloAction.java HttpHeaderAction.java ServerPagesAction.java AbstractValidatorAction.java
cziegeler 2003/10/26 23:28:27
Modified: src/java/org/apache/cocoon/acting LocaleAction.java
SessionStateAction.java AbstractAction.java
Action.java SessionInvalidatorAction.java
RequestParameterExistsAction.java
ClearPersistentStoreAction.java
RequestParamAction.java
SetCharacterEncodingAction.java
AbstractMultiAction.java
SessionValidatorAction.java
ResourceExistsAction.java ClearCacheAction.java
AbstractComplementaryConfigurableAction.java
FormValidatorAction.java InputModuleAction.java
SessionPropagatorAction.java
SessionIsValidAction.java HelloAction.java
HttpHeaderAction.java ServerPagesAction.java
AbstractValidatorAction.java
Log:
Organizing imports
Revision Changes Path
1.4 +2 -10 cocoon-2.2/src/java/org/apache/cocoon/acting/LocaleAction.java
Index: LocaleAction.java
===================================================================
RCS file: /home/cvs/cocoon-2.2/src/java/org/apache/cocoon/acting/LocaleAction.java,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- LocaleAction.java 25 Oct 2003 17:46:38 -0000 1.3
+++ LocaleAction.java 27 Oct 2003 07:28:26 -0000 1.4
@@ -58,15 +58,7 @@
import org.apache.avalon.framework.configuration.Configuration;
import org.apache.avalon.framework.configuration.ConfigurationException;
import org.apache.avalon.framework.parameters.Parameters;
-import org.apache.avalon.framework.thread.ThreadSafe;
-
-import org.apache.cocoon.environment.Cookie;
-import org.apache.cocoon.environment.ObjectModelHelper;
-import org.apache.cocoon.environment.Redirector;
-import org.apache.cocoon.environment.Request;
-import org.apache.cocoon.environment.Response;
-import org.apache.cocoon.environment.Session;
-import org.apache.cocoon.environment.SourceResolver;
+import org.apache.cocoon.environment.*;
import org.apache.cocoon.i18n.I18nUtils;
/**
1.3 +4 -5 cocoon-2.2/src/java/org/apache/cocoon/acting/SessionStateAction.java
Index: SessionStateAction.java
===================================================================
RCS file: /home/cvs/cocoon-2.2/src/java/org/apache/cocoon/acting/SessionStateAction.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- SessionStateAction.java 25 Oct 2003 17:46:38 -0000 1.2
+++ SessionStateAction.java 27 Oct 2003 07:28:26 -0000 1.3
@@ -50,18 +50,17 @@
*/
package org.apache.cocoon.acting;
+import java.util.HashMap;
+import java.util.Map;
+
import org.apache.avalon.framework.configuration.Configuration;
import org.apache.avalon.framework.configuration.ConfigurationException;
import org.apache.avalon.framework.parameters.Parameters;
-import org.apache.avalon.framework.thread.ThreadSafe;
import org.apache.cocoon.environment.ObjectModelHelper;
import org.apache.cocoon.environment.Redirector;
import org.apache.cocoon.environment.Request;
import org.apache.cocoon.environment.Session;
import org.apache.cocoon.environment.SourceResolver;
-
-import java.util.HashMap;
-import java.util.Map;
/**
* Store the session's current state in a session attribute.
1.2 +3 -3 cocoon-2.2/src/java/org/apache/cocoon/acting/AbstractAction.java
Index: AbstractAction.java
===================================================================
RCS file: /home/cvs/cocoon-2.2/src/java/org/apache/cocoon/acting/AbstractAction.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- AbstractAction.java 9 Mar 2003 00:08:38 -0000 1.1
+++ AbstractAction.java 27 Oct 2003 07:28:26 -0000 1.2
@@ -50,11 +50,11 @@
*/
package org.apache.cocoon.acting;
-import org.apache.avalon.framework.logger.AbstractLogEnabled;
-
import java.util.Collections;
import java.util.Map;
import java.util.TreeMap;
+
+import org.apache.avalon.framework.logger.AbstractLogEnabled;
/**
* AbstractAction gives you the infrastructure for easily deploying more
1.3 +3 -4 cocoon-2.2/src/java/org/apache/cocoon/acting/Action.java
Index: Action.java
===================================================================
RCS file: /home/cvs/cocoon-2.2/src/java/org/apache/cocoon/acting/Action.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- Action.java 25 Oct 2003 17:46:38 -0000 1.2
+++ Action.java 27 Oct 2003 07:28:26 -0000 1.3
@@ -50,12 +50,11 @@
*/
package org.apache.cocoon.acting;
-import org.apache.avalon.framework.component.Component;
+import java.util.Map;
+
import org.apache.avalon.framework.parameters.Parameters;
import org.apache.cocoon.environment.Redirector;
import org.apache.cocoon.environment.SourceResolver;
-
-import java.util.Map;
/**
*
1.3 +3 -4 cocoon-2.2/src/java/org/apache/cocoon/acting/SessionInvalidatorAction.java
Index: SessionInvalidatorAction.java
===================================================================
RCS file: /home/cvs/cocoon-2.2/src/java/org/apache/cocoon/acting/SessionInvalidatorAction.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- SessionInvalidatorAction.java 25 Oct 2003 17:46:38 -0000 1.2
+++ SessionInvalidatorAction.java 27 Oct 2003 07:28:26 -0000 1.3
@@ -50,15 +50,14 @@
*/
package org.apache.cocoon.acting;
+import java.util.Map;
+
import org.apache.avalon.framework.parameters.Parameters;
-import org.apache.avalon.framework.thread.ThreadSafe;
import org.apache.cocoon.environment.ObjectModelHelper;
import org.apache.cocoon.environment.Redirector;
import org.apache.cocoon.environment.Request;
import org.apache.cocoon.environment.Session;
import org.apache.cocoon.environment.SourceResolver;
-
-import java.util.Map;
/**
* This is the action used to invalidate an HTTP session. The action returns
1.3 +3 -2 cocoon-2.2/src/java/org/apache/cocoon/acting/RequestParameterExistsAction.java
Index: RequestParameterExistsAction.java
===================================================================
RCS file: /home/cvs/cocoon-2.2/src/java/org/apache/cocoon/acting/RequestParameterExistsAction.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- RequestParameterExistsAction.java 25 Oct 2003 17:46:38 -0000 1.2
+++ RequestParameterExistsAction.java 27 Oct 2003 07:28:26 -0000 1.3
@@ -53,9 +53,10 @@
import java.util.Collections;
import java.util.Enumeration;
import java.util.HashMap;
+import java.util.Iterator;
import java.util.Map;
import java.util.StringTokenizer;
-import java.util.Iterator;
+
import org.apache.avalon.framework.parameters.Parameters;
import org.apache.cocoon.environment.ObjectModelHelper;
import org.apache.cocoon.environment.Redirector;
1.5 +3 -4 cocoon-2.2/src/java/org/apache/cocoon/acting/ClearPersistentStoreAction.java
Index: ClearPersistentStoreAction.java
===================================================================
RCS file: /home/cvs/cocoon-2.2/src/java/org/apache/cocoon/acting/ClearPersistentStoreAction.java,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- ClearPersistentStoreAction.java 25 Oct 2003 17:46:38 -0000 1.4
+++ ClearPersistentStoreAction.java 27 Oct 2003 07:28:26 -0000 1.5
@@ -50,15 +50,14 @@
*/
package org.apache.cocoon.acting;
+import java.util.Map;
+
import org.apache.avalon.framework.parameters.Parameters;
import org.apache.avalon.framework.service.ServiceException;
import org.apache.avalon.framework.service.ServiceManager;
-import org.apache.avalon.framework.thread.ThreadSafe;
import org.apache.cocoon.environment.Redirector;
import org.apache.cocoon.environment.SourceResolver;
import org.apache.excalibur.store.Store;
-
-import java.util.Map;
/**
* Simple action which ensures the persistent store is cleared.
1.5 +1 -3 cocoon-2.2/src/java/org/apache/cocoon/acting/RequestParamAction.java
Index: RequestParamAction.java
===================================================================
RCS file: /home/cvs/cocoon-2.2/src/java/org/apache/cocoon/acting/RequestParamAction.java,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- RequestParamAction.java 25 Oct 2003 17:46:38 -0000 1.4
+++ RequestParamAction.java 27 Oct 2003 07:28:26 -0000 1.5
@@ -55,8 +55,6 @@
import java.util.Map;
import org.apache.avalon.framework.parameters.Parameters;
-import org.apache.avalon.framework.thread.ThreadSafe;
-
import org.apache.cocoon.environment.ObjectModelHelper;
import org.apache.cocoon.environment.Redirector;
import org.apache.cocoon.environment.Request;
1.5 +3 -5 cocoon-2.2/src/java/org/apache/cocoon/acting/SetCharacterEncodingAction.java
Index: SetCharacterEncodingAction.java
===================================================================
RCS file: /home/cvs/cocoon-2.2/src/java/org/apache/cocoon/acting/SetCharacterEncodingAction.java,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- SetCharacterEncodingAction.java 25 Oct 2003 17:46:38 -0000 1.4
+++ SetCharacterEncodingAction.java 27 Oct 2003 07:28:26 -0000 1.5
@@ -50,17 +50,15 @@
*/
package org.apache.cocoon.acting;
+import java.util.Map;
+
import org.apache.avalon.framework.parameters.ParameterException;
import org.apache.avalon.framework.parameters.Parameterizable;
import org.apache.avalon.framework.parameters.Parameters;
-import org.apache.avalon.framework.thread.ThreadSafe;
-
import org.apache.cocoon.environment.ObjectModelHelper;
import org.apache.cocoon.environment.Redirector;
import org.apache.cocoon.environment.Request;
import org.apache.cocoon.environment.SourceResolver;
-
-import java.util.Map;
/**
* Sets the character encoding of parameters.
1.8 +9 -9 cocoon-2.2/src/java/org/apache/cocoon/acting/AbstractMultiAction.java
Index: AbstractMultiAction.java
===================================================================
RCS file: /home/cvs/cocoon-2.2/src/java/org/apache/cocoon/acting/AbstractMultiAction.java,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- AbstractMultiAction.java 16 Oct 2003 14:50:22 -0000 1.7
+++ AbstractMultiAction.java 27 Oct 2003 07:28:26 -0000 1.8
@@ -50,19 +50,19 @@
*/
package org.apache.cocoon.acting;
+import java.lang.reflect.InvocationTargetException;
+import java.lang.reflect.Method;
+import java.util.Enumeration;
+import java.util.HashMap;
+import java.util.Map;
+
import org.apache.avalon.framework.configuration.Configuration;
import org.apache.avalon.framework.configuration.ConfigurationException;
import org.apache.avalon.framework.parameters.Parameters;
+import org.apache.cocoon.environment.ObjectModelHelper;
import org.apache.cocoon.environment.Redirector;
-import org.apache.cocoon.environment.SourceResolver;
import org.apache.cocoon.environment.Request;
-import org.apache.cocoon.environment.ObjectModelHelper;
-
-import java.util.HashMap;
-import java.util.Map;
-import java.util.Enumeration;
-import java.lang.reflect.InvocationTargetException;
-import java.lang.reflect.Method;
+import org.apache.cocoon.environment.SourceResolver;
/**
* The <code>AbstractMultiAction</code> provides a way
1.4 +5 -7 cocoon-2.2/src/java/org/apache/cocoon/acting/SessionValidatorAction.java
Index: SessionValidatorAction.java
===================================================================
RCS file: /home/cvs/cocoon-2.2/src/java/org/apache/cocoon/acting/SessionValidatorAction.java,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- SessionValidatorAction.java 25 Oct 2003 17:46:38 -0000 1.3
+++ SessionValidatorAction.java 27 Oct 2003 07:28:26 -0000 1.4
@@ -50,16 +50,14 @@
*/
package org.apache.cocoon.acting;
-import org.apache.avalon.framework.configuration.Configuration;
-import org.apache.avalon.framework.thread.ThreadSafe;
-
-import org.apache.cocoon.environment.ObjectModelHelper;
-import org.apache.cocoon.environment.Session;
-
import java.util.Collection;
import java.util.HashMap;
import java.util.Iterator;
import java.util.Map;
+
+import org.apache.avalon.framework.configuration.Configuration;
+import org.apache.cocoon.environment.ObjectModelHelper;
+import org.apache.cocoon.environment.Session;
/**
* This is the action used to validate Session parameters (attributes).
1.5 +3 -4 cocoon-2.2/src/java/org/apache/cocoon/acting/ResourceExistsAction.java
Index: ResourceExistsAction.java
===================================================================
RCS file: /home/cvs/cocoon-2.2/src/java/org/apache/cocoon/acting/ResourceExistsAction.java,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- ResourceExistsAction.java 25 Oct 2003 17:46:38 -0000 1.4
+++ ResourceExistsAction.java 27 Oct 2003 07:28:26 -0000 1.5
@@ -50,13 +50,12 @@
*/
package org.apache.cocoon.acting;
+import java.util.Map;
+
import org.apache.avalon.framework.parameters.Parameters;
-import org.apache.avalon.framework.thread.ThreadSafe;
import org.apache.cocoon.environment.Redirector;
import org.apache.cocoon.environment.SourceResolver;
import org.apache.excalibur.source.Source;
-
-import java.util.Map;
/**
* This action simply checks to see if a given resource exists. It checks
1.6 +3 -4 cocoon-2.2/src/java/org/apache/cocoon/acting/ClearCacheAction.java
Index: ClearCacheAction.java
===================================================================
RCS file: /home/cvs/cocoon-2.2/src/java/org/apache/cocoon/acting/ClearCacheAction.java,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- ClearCacheAction.java 25 Oct 2003 17:46:38 -0000 1.5
+++ ClearCacheAction.java 27 Oct 2003 07:28:26 -0000 1.6
@@ -50,15 +50,14 @@
*/
package org.apache.cocoon.acting;
+import java.util.Map;
+
import org.apache.avalon.framework.parameters.Parameters;
import org.apache.avalon.framework.service.ServiceException;
import org.apache.avalon.framework.service.ServiceManager;
-import org.apache.avalon.framework.thread.ThreadSafe;
import org.apache.cocoon.caching.Cache;
import org.apache.cocoon.environment.Redirector;
import org.apache.cocoon.environment.SourceResolver;
-
-import java.util.Map;
/**
* Simple action which ensures the cache is cleared of all
1.4 +4 -4 cocoon-2.2/src/java/org/apache/cocoon/acting/AbstractComplementaryConfigurableAction.java
Index: AbstractComplementaryConfigurableAction.java
===================================================================
RCS file: /home/cvs/cocoon-2.2/src/java/org/apache/cocoon/acting/AbstractComplementaryConfigurableAction.java,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- AbstractComplementaryConfigurableAction.java 16 Oct 2003 14:50:22 -0000 1.3
+++ AbstractComplementaryConfigurableAction.java 27 Oct 2003 07:28:26 -0000 1.4
@@ -50,6 +50,9 @@
*/
package org.apache.cocoon.acting;
+import java.util.HashMap;
+import java.util.Map;
+
import org.apache.avalon.framework.configuration.Configuration;
import org.apache.avalon.framework.configuration.ConfigurationException;
import org.apache.avalon.framework.configuration.SAXConfigurationHandler;
@@ -57,9 +60,6 @@
import org.apache.cocoon.components.source.SourceUtil;
import org.apache.cocoon.environment.SourceResolver;
import org.apache.excalibur.source.Source;
-
-import java.util.HashMap;
-import java.util.Map;
/**
* Set up environment for configurable form handling data. This group
1.4 +5 -7 cocoon-2.2/src/java/org/apache/cocoon/acting/FormValidatorAction.java
Index: FormValidatorAction.java
===================================================================
RCS file: /home/cvs/cocoon-2.2/src/java/org/apache/cocoon/acting/FormValidatorAction.java,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- FormValidatorAction.java 25 Oct 2003 17:46:38 -0000 1.3
+++ FormValidatorAction.java 27 Oct 2003 07:28:26 -0000 1.4
@@ -50,16 +50,14 @@
*/
package org.apache.cocoon.acting;
-import org.apache.avalon.framework.configuration.Configuration;
-import org.apache.avalon.framework.thread.ThreadSafe;
-
-import org.apache.cocoon.environment.ObjectModelHelper;
-import org.apache.cocoon.environment.Request;
-
import java.util.Collection;
import java.util.HashMap;
import java.util.Iterator;
import java.util.Map;
+
+import org.apache.avalon.framework.configuration.Configuration;
+import org.apache.cocoon.environment.ObjectModelHelper;
+import org.apache.cocoon.environment.Request;
/**
* This is the action used to validate Request parameters.
1.5 +5 -6 cocoon-2.2/src/java/org/apache/cocoon/acting/InputModuleAction.java
Index: InputModuleAction.java
===================================================================
RCS file: /home/cvs/cocoon-2.2/src/java/org/apache/cocoon/acting/InputModuleAction.java,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- InputModuleAction.java 25 Oct 2003 17:46:38 -0000 1.4
+++ InputModuleAction.java 27 Oct 2003 07:28:26 -0000 1.5
@@ -50,18 +50,17 @@
*/
package org.apache.cocoon.acting;
+import java.util.HashMap;
+import java.util.Map;
+
import org.apache.avalon.framework.configuration.Configuration;
import org.apache.avalon.framework.configuration.ConfigurationException;
import org.apache.avalon.framework.parameters.Parameters;
import org.apache.avalon.framework.service.ServiceException;
import org.apache.avalon.framework.service.ServiceManager;
-
+import org.apache.cocoon.components.language.markup.xsp.XSPModuleHelper;
import org.apache.cocoon.environment.Redirector;
import org.apache.cocoon.environment.SourceResolver;
-import org.apache.cocoon.components.language.markup.xsp.XSPModuleHelper;
-
-import java.util.HashMap;
-import java.util.Map;
/**
* Simple helper action to allow passing sitemap variables to InputModules.
1.3 +1 -2 cocoon-2.2/src/java/org/apache/cocoon/acting/SessionPropagatorAction.java
Index: SessionPropagatorAction.java
===================================================================
RCS file: /home/cvs/cocoon-2.2/src/java/org/apache/cocoon/acting/SessionPropagatorAction.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- SessionPropagatorAction.java 25 Oct 2003 17:46:38 -0000 1.2
+++ SessionPropagatorAction.java 27 Oct 2003 07:28:26 -0000 1.3
@@ -58,7 +58,6 @@
import org.apache.avalon.framework.configuration.ConfigurationException;
import org.apache.avalon.framework.parameters.Parameters;
import org.apache.avalon.framework.thread.ThreadSafe;
-
import org.apache.cocoon.environment.ObjectModelHelper;
import org.apache.cocoon.environment.Redirector;
import org.apache.cocoon.environment.Request;
1.3 +3 -4 cocoon-2.2/src/java/org/apache/cocoon/acting/SessionIsValidAction.java
Index: SessionIsValidAction.java
===================================================================
RCS file: /home/cvs/cocoon-2.2/src/java/org/apache/cocoon/acting/SessionIsValidAction.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- SessionIsValidAction.java 25 Oct 2003 17:46:38 -0000 1.2
+++ SessionIsValidAction.java 27 Oct 2003 07:28:26 -0000 1.3
@@ -50,15 +50,14 @@
*/
package org.apache.cocoon.acting;
+import java.util.Map;
+
import org.apache.avalon.framework.parameters.Parameters;
-import org.apache.avalon.framework.thread.ThreadSafe;
import org.apache.cocoon.environment.ObjectModelHelper;
import org.apache.cocoon.environment.Redirector;
import org.apache.cocoon.environment.Request;
import org.apache.cocoon.environment.Session;
import org.apache.cocoon.environment.SourceResolver;
-
-import java.util.Map;
/**
1.4 +3 -4 cocoon-2.2/src/java/org/apache/cocoon/acting/HelloAction.java
Index: HelloAction.java
===================================================================
RCS file: /home/cvs/cocoon-2.2/src/java/org/apache/cocoon/acting/HelloAction.java,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- HelloAction.java 25 Oct 2003 17:46:38 -0000 1.3
+++ HelloAction.java 27 Oct 2003 07:28:26 -0000 1.4
@@ -50,16 +50,15 @@
*/
package org.apache.cocoon.acting;
+import java.util.Map;
+
import org.apache.avalon.framework.logger.AbstractLogEnabled;
import org.apache.avalon.framework.parameters.Parameters;
-import org.apache.avalon.framework.thread.ThreadSafe;
import org.apache.cocoon.environment.ObjectModelHelper;
import org.apache.cocoon.environment.Redirector;
import org.apache.cocoon.environment.Request;
import org.apache.cocoon.environment.Session;
import org.apache.cocoon.environment.SourceResolver;
-
-import java.util.Map;
/**
* A simple Action that tracks if a <code>Session</code> object
1.3 +5 -6 cocoon-2.2/src/java/org/apache/cocoon/acting/HttpHeaderAction.java
Index: HttpHeaderAction.java
===================================================================
RCS file: /home/cvs/cocoon-2.2/src/java/org/apache/cocoon/acting/HttpHeaderAction.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- HttpHeaderAction.java 25 Oct 2003 17:46:38 -0000 1.2
+++ HttpHeaderAction.java 27 Oct 2003 07:28:26 -0000 1.3
@@ -50,18 +50,17 @@
*/
package org.apache.cocoon.acting;
+import java.util.Collections;
+import java.util.HashMap;
+import java.util.Map;
+
import org.apache.avalon.framework.configuration.Configuration;
import org.apache.avalon.framework.configuration.ConfigurationException;
import org.apache.avalon.framework.parameters.Parameters;
-import org.apache.avalon.framework.thread.ThreadSafe;
import org.apache.cocoon.environment.ObjectModelHelper;
import org.apache.cocoon.environment.Redirector;
import org.apache.cocoon.environment.Response;
import org.apache.cocoon.environment.SourceResolver;
-
-import java.util.Collections;
-import java.util.HashMap;
-import java.util.Map;
/**
* This action adds HTTP headers to the response.
1.7 +8 -9 cocoon-2.2/src/java/org/apache/cocoon/acting/ServerPagesAction.java
Index: ServerPagesAction.java
===================================================================
RCS file: /home/cvs/cocoon-2.2/src/java/org/apache/cocoon/acting/ServerPagesAction.java,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- ServerPagesAction.java 25 Oct 2003 17:46:38 -0000 1.6
+++ ServerPagesAction.java 27 Oct 2003 07:28:26 -0000 1.7
@@ -53,21 +53,20 @@
import java.util.HashMap;
import java.util.Map;
+import org.apache.avalon.fortress.impl.handler.ComponentFactory;
+import org.apache.avalon.fortress.impl.handler.ComponentHandler;
+import org.apache.avalon.fortress.impl.handler.PoolableComponentHandler;
import org.apache.avalon.framework.activity.Disposable;
import org.apache.avalon.framework.activity.Initializable;
import org.apache.avalon.framework.configuration.Configuration;
import org.apache.avalon.framework.configuration.ConfigurationException;
-import org.apache.avalon.framework.parameters.Parameters;
-import org.apache.avalon.framework.thread.ThreadSafe;
import org.apache.avalon.framework.container.ContainerUtil;
-import org.apache.avalon.framework.service.DefaultServiceManager;
-import org.apache.avalon.framework.context.Contextualizable;
import org.apache.avalon.framework.context.Context;
import org.apache.avalon.framework.context.ContextException;
-import org.apache.avalon.fortress.impl.handler.ComponentHandler;
-import org.apache.avalon.fortress.impl.handler.PoolableComponentHandler;
-import org.apache.avalon.fortress.impl.handler.ComponentFactory;
-
+import org.apache.avalon.framework.context.Contextualizable;
+import org.apache.avalon.framework.parameters.Parameters;
+import org.apache.avalon.framework.service.DefaultServiceManager;
+import org.apache.avalon.framework.thread.ThreadSafe;
import org.apache.cocoon.components.sax.XMLByteStreamCompiler;
import org.apache.cocoon.components.sax.XMLByteStreamFragment;
import org.apache.cocoon.environment.ObjectModelHelper;
1.6 +4 -12 cocoon-2.2/src/java/org/apache/cocoon/acting/AbstractValidatorAction.java
Index: AbstractValidatorAction.java
===================================================================
RCS file: /home/cvs/cocoon-2.2/src/java/org/apache/cocoon/acting/AbstractValidatorAction.java,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- AbstractValidatorAction.java 24 Sep 2003 21:26:51 -0000 1.5
+++ AbstractValidatorAction.java 27 Oct 2003 07:28:26 -0000 1.6
@@ -50,27 +50,19 @@
*/
package org.apache.cocoon.acting;
+import java.util.*;
+
import org.apache.avalon.framework.configuration.Configurable;
import org.apache.avalon.framework.configuration.Configuration;
import org.apache.avalon.framework.configuration.ConfigurationException;
import org.apache.avalon.framework.parameters.Parameters;
-
import org.apache.cocoon.Constants;
-import org.apache.cocoon.environment.SourceResolver;
import org.apache.cocoon.environment.ObjectModelHelper;
import org.apache.cocoon.environment.Redirector;
+import org.apache.cocoon.environment.SourceResolver;
import org.apache.cocoon.util.Tokenizer;
-
import org.apache.regexp.RE;
import org.apache.regexp.RESyntaxException;
-
-import java.util.Collection;
-import java.util.HashMap;
-import java.util.HashSet;
-import java.util.Iterator;
-import java.util.Map;
-import java.util.Set;
-import java.util.Vector;
/**
* Abstract implementation of action that needs to perform validation of
Re: Woody BinaryWidget
Posted by Upayavira <uv...@upaya.co.uk>.
Gunter D'Hondt wrote:
>Upayavira,
>
>Don't worry I can wait (better that than making the same again).
>What datatype have you used? A composite datatype with the byte-array
>and the filename as string?
>
>
At present it returns an InputStream to the part (either in memory or on
disc). Sylvain suggested making it return the Part, we can discuss that
when I return from time away (computer is being switched off straight
after this mail!)
Regards, Upayavira
>Regards,
>Gunter D'Hondt
>
>
>-----Original Message-----
>From: dev-return-50206-gudo=sofico.be@cocoon.apache.org
>[mailto:dev-return-50206-gudo=sofico.be@cocoon.apache.org] On Behalf Of
>Upayavira
>Sent: maandag 27 oktober 2003 9:47
>To: dev@cocoon.apache.org
>Subject: Re: Woody BinaryWidget
>
>
>Gunter D'Hondt wrote:
>
>
>
>>Hi,
>>
>>I was thinking of making a page where people can upload a file but I
>>was wondering how to do that with Woody. For the layout (inputfield
>>with
>>"Browse"-button) a new widget can be made and the datatype should be a
>>byte-array and a filename?
>>
>>Any thought on this?
>>Is there already a list/doc that describes all available widgets and
>>datatypes?
>>
>>Gunter D'Hondt
>>www.sofico.info
>>
>>
>>
>>
>>
>>
>I've got an Upload widget working and almost ready to commit, but won't
>be able to do so straight away as I'm about to go away for a week.
>
>If you can wait, I can finish that and commit it.
>
>Regards, Upayavira
>
>
>
>
>
RE: Woody BinaryWidget
Posted by Gunter D'Hondt <gu...@sofico.be>.
Upayavira,
Don't worry I can wait (better that than making the same again).
What datatype have you used? A composite datatype with the byte-array
and the filename as string?
Regards,
Gunter D'Hondt
-----Original Message-----
From: dev-return-50206-gudo=sofico.be@cocoon.apache.org
[mailto:dev-return-50206-gudo=sofico.be@cocoon.apache.org] On Behalf Of
Upayavira
Sent: maandag 27 oktober 2003 9:47
To: dev@cocoon.apache.org
Subject: Re: Woody BinaryWidget
Gunter D'Hondt wrote:
>Hi,
>
>I was thinking of making a page where people can upload a file but I
>was wondering how to do that with Woody. For the layout (inputfield
>with
>"Browse"-button) a new widget can be made and the datatype should be a
>byte-array and a filename?
>
>Any thought on this?
>Is there already a list/doc that describes all available widgets and
>datatypes?
>
>Gunter D'Hondt
>www.sofico.info
>
>
>
>
I've got an Upload widget working and almost ready to commit, but won't
be able to do so straight away as I'm about to go away for a week.
If you can wait, I can finish that and commit it.
Regards, Upayavira
Re: Woody BinaryWidget
Posted by Upayavira <uv...@upaya.co.uk>.
Gunter D'Hondt wrote:
>Hi,
>
>I was thinking of making a page where people can upload a file but I was
>wondering how to do that with Woody. For the layout (inputfield with
>"Browse"-button) a new widget can be made and the datatype should be a
>byte-array and a filename?
>
>Any thought on this?
>Is there already a list/doc that describes all available widgets and
>datatypes?
>
>Gunter D'Hondt
>www.sofico.info
>
>
>
>
I've got an Upload widget working and almost ready to commit, but won't
be able to do so straight away as I'm about to go away for a week.
If you can wait, I can finish that and commit it.
Regards, Upayavira
Woody BinaryWidget
Posted by Gunter D'Hondt <gu...@sofico.be>.
Hi,
I was thinking of making a page where people can upload a file but I was
wondering how to do that with Woody. For the layout (inputfield with
"Browse"-button) a new widget can be made and the datatype should be a
byte-array and a filename?
Any thought on this?
Is there already a list/doc that describes all available widgets and
datatypes?
Gunter D'Hondt
www.sofico.info
RE: cvs commit: cocoon-2.2/src/java/org/apache/cocoon/acting LocaleAction.java SessionStateAction.java AbstractAction.java Action.java SessionInvalidatorAction.java RequestParameterExistsAction.java ClearPersistentStoreAction.java RequestParamAction.java
Posted by Carsten Ziegeler <cz...@s-und-n.de>.
Gianugo Rabellino wrote:
> > +import java.util.*;
>
> Why this? I thought we agreed not to have "*" imports...
>
Sorry, it's my default conf.
Did we agree on this? We agreed on so many coding standards and
three weeks later we agree on the opposite (like the "this.",
"super." etc. discussions). Sorry, but I never say/noticed
a discussion of the "import *".
Carsten
Re: cvs commit: cocoon-2.2/src/java/org/apache/cocoon/acting LocaleAction.java
SessionStateAction.java AbstractAction.java Action.java SessionInvalidatorAction.java
RequestParameterExistsAction.java ClearPersistentStoreAction.java RequestParamAction.java
SetCharacterEncodingAction.java AbstractMultiAction.java SessionValidatorAction.java
ResourceExistsAction.java ClearCacheAction.java AbstractComplementaryConfigurableAction.java
FormValidatorAction.java InputModuleAction.java SessionPropagatorAction.java
SessionIsValidAction.java HelloAction.java HttpHeaderAction.java ServerPagesAction.java
AbstractValidatorAction.java
Posted by Gianugo Rabellino <gi...@apache.org>.
cziegeler@apache.org wrote:
1.6 +4 -12
cocoon-2.2/src/java/org/apache/cocoon/acting/AbstractValidatorAction.java
>
> Index: AbstractValidatorAction.java
> ===================================================================
> RCS file: /home/cvs/cocoon-2.2/src/java/org/apache/cocoon/acting/AbstractValidatorAction.java,v
> retrieving revision 1.5
> retrieving revision 1.6
> diff -u -r1.5 -r1.6
> --- AbstractValidatorAction.java 24 Sep 2003 21:26:51 -0000 1.5
> +++ AbstractValidatorAction.java 27 Oct 2003 07:28:26 -0000 1.6
> @@ -50,27 +50,19 @@
> */
> package org.apache.cocoon.acting;
>
> +import java.util.*;
Why this? I thought we agreed not to have "*" imports...
Ciao,
--
Gianugo Rabellino
Pro-netics s.r.l. - http://www.pro-netics.com
Orixo, the XML business alliance - http://www.orixo.com
(Now blogging at: http://blogs.cocoondev.org/gianugo/)