You are viewing a plain text version of this content. The canonical link for it is here.
Posted to cvs@cocoon.apache.org by an...@apache.org on 2006/04/23 07:56:23 UTC
svn commit: r396218 - in /cocoon:
branches/BRANCH_2_1_X/src/blocks/batik/java/org/apache/cocoon/serialization/
branches/BRANCH_2_1_X/src/blocks/databases/java/org/apache/cocoon/acting/
branches/BRANCH_2_1_X/src/blocks/databases/java/org/apache/cocoon/a...
Author: antonio
Date: Sat Apr 22 22:56:20 2006
New Revision: 396218
URL: http://svn.apache.org/viewcvs?rev=396218&view=rev
Log:
Implements same interface as superclass.
Modified:
cocoon/branches/BRANCH_2_1_X/src/blocks/batik/java/org/apache/cocoon/serialization/SVGSerializer.java
cocoon/branches/BRANCH_2_1_X/src/blocks/databases/java/org/apache/cocoon/acting/AbstractDatabaseAction.java
cocoon/branches/BRANCH_2_1_X/src/blocks/databases/java/org/apache/cocoon/acting/modular/DatabaseAction.java
cocoon/branches/BRANCH_2_1_X/src/blocks/databases/java/org/apache/cocoon/transformation/SQLTransformer.java
cocoon/branches/BRANCH_2_1_X/src/blocks/session-fw/java/org/apache/cocoon/webapps/session/acting/SessionFormAction.java
cocoon/branches/BRANCH_2_1_X/src/blocks/xsp/java/org/apache/cocoon/components/language/generator/GeneratorSelector.java
cocoon/branches/BRANCH_2_1_X/src/blocks/xsp/java/org/apache/cocoon/components/language/markup/CocoonMarkupLanguage.java
cocoon/branches/BRANCH_2_1_X/src/blocks/xsp/java/org/apache/cocoon/components/language/markup/xsp/XSPGenerator.java
cocoon/branches/BRANCH_2_1_X/src/blocks/xsp/java/org/apache/cocoon/components/language/programming/javascript/JavascriptLanguage.java
cocoon/branches/BRANCH_2_1_X/src/blocks/xsp/java/org/apache/cocoon/generation/ServerPagesGenerator.java
cocoon/branches/BRANCH_2_1_X/src/samples/org/apache/cocoon/samples/parentcm/Generator.java
cocoon/branches/BRANCH_2_1_X/src/test/org/apache/cocoon/transformation/IncrementTransformer.java
cocoon/trunk/blocks/cocoon-ajax/cocoon-ajax-impl/src/main/java/org/apache/cocoon/ajax/AjaxRequestSelector.java
Modified: cocoon/branches/BRANCH_2_1_X/src/blocks/batik/java/org/apache/cocoon/serialization/SVGSerializer.java
URL: http://svn.apache.org/viewcvs/cocoon/branches/BRANCH_2_1_X/src/blocks/batik/java/org/apache/cocoon/serialization/SVGSerializer.java?rev=396218&r1=396217&r2=396218&view=diff
==============================================================================
--- cocoon/branches/BRANCH_2_1_X/src/blocks/batik/java/org/apache/cocoon/serialization/SVGSerializer.java (original)
+++ cocoon/branches/BRANCH_2_1_X/src/blocks/batik/java/org/apache/cocoon/serialization/SVGSerializer.java Sat Apr 22 22:56:20 2006
@@ -19,7 +19,6 @@
import java.io.OutputStream;
import java.io.Serializable;
-import org.apache.avalon.excalibur.pool.Poolable;
import org.apache.avalon.framework.configuration.Configurable;
import org.apache.avalon.framework.configuration.Configuration;
import org.apache.avalon.framework.configuration.ConfigurationException;
@@ -51,10 +50,10 @@
*
* @author <a href="mailto:dims@yahoo.com">Davanum Srinivas</a>
* @author <a href="mailto:rossb@apache.org">Ross Burton</a>
- * @version CVS $Id$
+ * @version $Id$
*/
public class SVGSerializer extends SVGBuilder
-implements Serializer, Configurable, Poolable, CacheableProcessingComponent, Contextualizable {
+implements Serializer, Configurable, CacheableProcessingComponent, Contextualizable {
/**
* Get the context
Modified: cocoon/branches/BRANCH_2_1_X/src/blocks/databases/java/org/apache/cocoon/acting/AbstractDatabaseAction.java
URL: http://svn.apache.org/viewcvs/cocoon/branches/BRANCH_2_1_X/src/blocks/databases/java/org/apache/cocoon/acting/AbstractDatabaseAction.java?rev=396218&r1=396217&r2=396218&view=diff
==============================================================================
--- cocoon/branches/BRANCH_2_1_X/src/blocks/databases/java/org/apache/cocoon/acting/AbstractDatabaseAction.java (original)
+++ cocoon/branches/BRANCH_2_1_X/src/blocks/databases/java/org/apache/cocoon/acting/AbstractDatabaseAction.java Sat Apr 22 22:56:20 2006
@@ -38,7 +38,6 @@
import org.apache.avalon.excalibur.datasource.DataSourceComponent;
import org.apache.avalon.framework.activity.Disposable;
-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;
@@ -169,9 +168,9 @@
*
* @author <a href="mailto:bloritsch@apache.org">Berin Loritsch</a>
* @author <a href="mailto:balld@apache.org">Donald Ball</a>
- * @version CVS $Id$
+ * @version $Id$
*/
-public abstract class AbstractDatabaseAction extends AbstractComplementaryConfigurableAction implements Configurable, Disposable {
+public abstract class AbstractDatabaseAction extends AbstractComplementaryConfigurableAction implements Disposable {
protected Map files = new HashMap();
protected static final Map typeConstants;
protected ServiceSelector dbselector;
Modified: cocoon/branches/BRANCH_2_1_X/src/blocks/databases/java/org/apache/cocoon/acting/modular/DatabaseAction.java
URL: http://svn.apache.org/viewcvs/cocoon/branches/BRANCH_2_1_X/src/blocks/databases/java/org/apache/cocoon/acting/modular/DatabaseAction.java?rev=396218&r1=396217&r2=396218&view=diff
==============================================================================
--- cocoon/branches/BRANCH_2_1_X/src/blocks/databases/java/org/apache/cocoon/acting/modular/DatabaseAction.java (original)
+++ cocoon/branches/BRANCH_2_1_X/src/blocks/databases/java/org/apache/cocoon/acting/modular/DatabaseAction.java Sat Apr 22 22:56:20 2006
@@ -24,7 +24,6 @@
import org.apache.avalon.excalibur.datasource.DataSourceComponent;
import org.apache.avalon.framework.activity.Disposable;
-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;
@@ -87,13 +86,13 @@
* </table>
*
* @author <a href="mailto:haul@apache.org">Christian Haul</a>
- * @version CVS $Id$
+ * @version $Id$
* @see org.apache.cocoon.components.modules.input
* @see org.apache.cocoon.components.modules.output
* @see org.apache.cocoon.components.modules.database
* @see org.apache.cocoon.util.JDBCTypeConversions
*/
-public abstract class DatabaseAction extends AbstractComplementaryConfigurableAction implements Configurable, Disposable, ThreadSafe {
+public abstract class DatabaseAction extends AbstractComplementaryConfigurableAction implements Disposable, ThreadSafe {
// ========================================================================
// constants
Modified: cocoon/branches/BRANCH_2_1_X/src/blocks/databases/java/org/apache/cocoon/transformation/SQLTransformer.java
URL: http://svn.apache.org/viewcvs/cocoon/branches/BRANCH_2_1_X/src/blocks/databases/java/org/apache/cocoon/transformation/SQLTransformer.java?rev=396218&r1=396217&r2=396218&view=diff
==============================================================================
--- cocoon/branches/BRANCH_2_1_X/src/blocks/databases/java/org/apache/cocoon/transformation/SQLTransformer.java (original)
+++ cocoon/branches/BRANCH_2_1_X/src/blocks/databases/java/org/apache/cocoon/transformation/SQLTransformer.java Sat Apr 22 22:56:20 2006
@@ -35,8 +35,6 @@
import java.util.ArrayList;
import org.apache.avalon.excalibur.datasource.DataSourceComponent;
-import org.apache.avalon.framework.activity.Disposable;
-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.logger.AbstractLogEnabled;
@@ -150,8 +148,7 @@
* @author <a href="mailto:vgritsenko@apache.org">Vadim Gritsenko</a>
* @version $Id$
*/
-public class SQLTransformer extends AbstractSAXTransformer
- implements Disposable, Configurable {
+public class SQLTransformer extends AbstractSAXTransformer {
/** The SQL transformer namespace */
public static final String NAMESPACE = "http://apache.org/cocoon/SQL/2.0";
Modified: cocoon/branches/BRANCH_2_1_X/src/blocks/session-fw/java/org/apache/cocoon/webapps/session/acting/SessionFormAction.java
URL: http://svn.apache.org/viewcvs/cocoon/branches/BRANCH_2_1_X/src/blocks/session-fw/java/org/apache/cocoon/webapps/session/acting/SessionFormAction.java?rev=396218&r1=396217&r2=396218&view=diff
==============================================================================
--- cocoon/branches/BRANCH_2_1_X/src/blocks/session-fw/java/org/apache/cocoon/webapps/session/acting/SessionFormAction.java (original)
+++ cocoon/branches/BRANCH_2_1_X/src/blocks/session-fw/java/org/apache/cocoon/webapps/session/acting/SessionFormAction.java Sat Apr 22 22:56:20 2006
@@ -17,7 +17,6 @@
import org.apache.avalon.framework.configuration.Configuration;
import org.apache.avalon.framework.parameters.Parameters;
-import org.apache.avalon.framework.thread.ThreadSafe;
import org.apache.cocoon.acting.FormValidatorAction;
import org.apache.cocoon.environment.ObjectModelHelper;
@@ -93,9 +92,9 @@
*
* @author <a href="mailto:gcasper@s-und-n.de">Guido Casper</a>
* @author <a href="mailto:haul@apache.org">Christian Haul</a>
- * @version CVS $Id: SessionFormAction.java,v 1.7 2004/04/03 03:01:35 joerg Exp $
+ * @version $Id$
*/
-public class SessionFormAction extends FormValidatorAction implements ThreadSafe {
+public class SessionFormAction extends FormValidatorAction {
/* (non-Javadoc)
* @see org.apache.cocoon.acting.AbstractValidatorAction#getDescriptor(org.apache.cocoon.environment.SourceResolver, org.apache.avalon.framework.parameters.Parameters)
@@ -110,5 +109,4 @@
ObjectModelHelper.getRequest(objectModel).getParameter(
SessionConstants.SESSION_FORM_PARAMETER));
}
-
}
Modified: cocoon/branches/BRANCH_2_1_X/src/blocks/xsp/java/org/apache/cocoon/components/language/generator/GeneratorSelector.java
URL: http://svn.apache.org/viewcvs/cocoon/branches/BRANCH_2_1_X/src/blocks/xsp/java/org/apache/cocoon/components/language/generator/GeneratorSelector.java?rev=396218&r1=396217&r2=396218&view=diff
==============================================================================
--- cocoon/branches/BRANCH_2_1_X/src/blocks/xsp/java/org/apache/cocoon/components/language/generator/GeneratorSelector.java (original)
+++ cocoon/branches/BRANCH_2_1_X/src/blocks/xsp/java/org/apache/cocoon/components/language/generator/GeneratorSelector.java Sat Apr 22 22:56:20 2006
@@ -21,7 +21,6 @@
import org.apache.avalon.excalibur.component.RoleManager;
import org.apache.avalon.excalibur.logger.LogKitManager;
import org.apache.avalon.excalibur.logger.LoggerManager;
-import org.apache.avalon.framework.activity.Disposable;
import org.apache.avalon.framework.component.Component;
import org.apache.avalon.framework.component.ComponentException;
import org.apache.avalon.framework.component.ComponentManager;
@@ -43,9 +42,9 @@
*
* @author <a href="mailto:bloritsch@apache.org">Berin Loritsch</a>
* @author <a href="mailto:vgritsenko@apache.org">Vadim Gritsenko</a>
- * @version CVS $Id$
+ * @version $Id$
*/
-public class GeneratorSelector extends ExcaliburComponentSelector implements Disposable {
+public class GeneratorSelector extends ExcaliburComponentSelector {
public final static String ROLE = "org.apache.cocoon.components.language.generator.ServerPages";
@@ -96,7 +95,7 @@
}
}
- public void compose (ComponentManager manager) throws ComponentException {
+ public void compose(ComponentManager manager) throws ComponentException {
super.compose(manager);
this.manager = manager;
Modified: cocoon/branches/BRANCH_2_1_X/src/blocks/xsp/java/org/apache/cocoon/components/language/markup/CocoonMarkupLanguage.java
URL: http://svn.apache.org/viewcvs/cocoon/branches/BRANCH_2_1_X/src/blocks/xsp/java/org/apache/cocoon/components/language/markup/CocoonMarkupLanguage.java?rev=396218&r1=396217&r2=396218&view=diff
==============================================================================
--- cocoon/branches/BRANCH_2_1_X/src/blocks/xsp/java/org/apache/cocoon/components/language/markup/CocoonMarkupLanguage.java (original)
+++ cocoon/branches/BRANCH_2_1_X/src/blocks/xsp/java/org/apache/cocoon/components/language/markup/CocoonMarkupLanguage.java Sat Apr 22 22:56:20 2006
@@ -15,7 +15,6 @@
*/
package org.apache.cocoon.components.language.markup;
-import org.apache.avalon.framework.logger.LogEnabled;
import org.apache.avalon.framework.logger.Logger;
import org.apache.cocoon.ProcessingException;
@@ -48,7 +47,7 @@
* @author <a href="mailto:dims@yahoo.com">Davanum Srinivas</a>
* @author <a href="mailto:ovidiu@cup.hp.com">Ovidiu Predescu</a>
* @author <a href="mailto:vgritsenko@apache.org">Vadim Gritsenko</a>
- * @version CVS $Id$
+ * @version $Id$
*/
public abstract class CocoonMarkupLanguage extends AbstractMarkupLanguage
{
@@ -158,7 +157,7 @@
*
* @see org.xml.sax.ContentHandler
*/
- public class PreProcessFilter extends AbstractXMLPipe implements LogEnabled {
+ public class PreProcessFilter extends AbstractXMLPipe {
protected Logger log;
protected AbstractXMLPipe filter;
@@ -274,8 +273,7 @@
* @see org.xml.sax.ContentHandler
*/
public class CocoonTransformerChainBuilderFilter
- extends TransformerChainBuilderFilter
- implements LogEnabled {
+ extends TransformerChainBuilderFilter {
protected Logger log;
Modified: cocoon/branches/BRANCH_2_1_X/src/blocks/xsp/java/org/apache/cocoon/components/language/markup/xsp/XSPGenerator.java
URL: http://svn.apache.org/viewcvs/cocoon/branches/BRANCH_2_1_X/src/blocks/xsp/java/org/apache/cocoon/components/language/markup/xsp/XSPGenerator.java?rev=396218&r1=396217&r2=396218&view=diff
==============================================================================
--- cocoon/branches/BRANCH_2_1_X/src/blocks/xsp/java/org/apache/cocoon/components/language/markup/xsp/XSPGenerator.java (original)
+++ cocoon/branches/BRANCH_2_1_X/src/blocks/xsp/java/org/apache/cocoon/components/language/markup/xsp/XSPGenerator.java Sat Apr 22 22:56:20 2006
@@ -15,13 +15,11 @@
*/
package org.apache.cocoon.components.language.markup.xsp;
-import org.apache.avalon.excalibur.pool.Recyclable;
import org.apache.avalon.framework.component.ComponentException;
import org.apache.avalon.framework.component.ComponentManager;
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.language.generator.CompiledComponent;
import org.apache.cocoon.generation.AbstractServerPage;
import org.xml.sax.SAXException;
@@ -29,9 +27,9 @@
* Base class for XSP-generated <code>ServerPagesGenerator</code> classes
*
* @author <a href="mailto:ricardo@apache.org">Ricardo Rocha</a>
- * @version CVS $Id: XSPGenerator.java,v 1.1 2004/03/10 12:58:05 stephan Exp $
+ * @version $Id$
*/
-public abstract class XSPGenerator extends AbstractServerPage implements CompiledComponent, Contextualizable, Recyclable {
+public abstract class XSPGenerator extends AbstractServerPage implements Contextualizable {
protected Context avalonContext = null;
/** Contextualize this class */
Modified: cocoon/branches/BRANCH_2_1_X/src/blocks/xsp/java/org/apache/cocoon/components/language/programming/javascript/JavascriptLanguage.java
URL: http://svn.apache.org/viewcvs/cocoon/branches/BRANCH_2_1_X/src/blocks/xsp/java/org/apache/cocoon/components/language/programming/javascript/JavascriptLanguage.java?rev=396218&r1=396217&r2=396218&view=diff
==============================================================================
--- cocoon/branches/BRANCH_2_1_X/src/blocks/xsp/java/org/apache/cocoon/components/language/programming/javascript/JavascriptLanguage.java (original)
+++ cocoon/branches/BRANCH_2_1_X/src/blocks/xsp/java/org/apache/cocoon/components/language/programming/javascript/JavascriptLanguage.java Sat Apr 22 22:56:20 2006
@@ -19,7 +19,6 @@
import org.apache.cocoon.components.language.markup.xsp.XSLTExtension;
import org.apache.cocoon.components.language.programming.AbstractProgrammingLanguage;
import org.apache.cocoon.components.language.programming.Program;
-import org.apache.cocoon.components.language.programming.ProgrammingLanguage;
import org.apache.cocoon.util.ClassUtils;
import org.apache.cocoon.util.IOUtils;
@@ -38,9 +37,9 @@
* The class specified will be used as a Java wrapper interpreting javascript program.
*
* @author <a href="mailto:vgritsenko@apache.org">Vadim Gritsenko</a>
- * @version CVS $Id: JavascriptLanguage.java,v 1.1 2004/03/10 12:58:08 stephan Exp $
+ * @version $Id$
*/
-public class JavascriptLanguage extends AbstractProgrammingLanguage implements ProgrammingLanguage {
+public class JavascriptLanguage extends AbstractProgrammingLanguage {
public Program preload(String filename, File baseDirectory, String encoding) throws LanguageException {
return load(filename, baseDirectory, encoding);
Modified: cocoon/branches/BRANCH_2_1_X/src/blocks/xsp/java/org/apache/cocoon/generation/ServerPagesGenerator.java
URL: http://svn.apache.org/viewcvs/cocoon/branches/BRANCH_2_1_X/src/blocks/xsp/java/org/apache/cocoon/generation/ServerPagesGenerator.java?rev=396218&r1=396217&r2=396218&view=diff
==============================================================================
--- cocoon/branches/BRANCH_2_1_X/src/blocks/xsp/java/org/apache/cocoon/generation/ServerPagesGenerator.java (original)
+++ cocoon/branches/BRANCH_2_1_X/src/blocks/xsp/java/org/apache/cocoon/generation/ServerPagesGenerator.java Sat Apr 22 22:56:20 2006
@@ -16,7 +16,6 @@
package org.apache.cocoon.generation;
import org.apache.commons.collections.ArrayStack;
-import org.apache.avalon.framework.activity.Disposable;
import org.apache.avalon.framework.component.ComponentException;
import org.apache.avalon.framework.component.ComponentManager;
import org.apache.avalon.framework.configuration.Configurable;
@@ -56,10 +55,10 @@
*
* @author <a href="mailto:ricardo@apache.org">Ricardo Rocha</a>
* @author <a href="mailto:sylvain@apache.org">Sylvain Wallez</a>
- * @version CVS $Id: ServerPagesGenerator.java,v 1.1 2004/03/10 15:20:51 unico Exp $
+ * @version $Id$
*/
public class ServerPagesGenerator extends ServletGenerator
- implements Disposable, CacheableProcessingComponent, Configurable {
+ implements CacheableProcessingComponent, Configurable {
/**
* The sitemap-defined server pages program generator
*/
Modified: cocoon/branches/BRANCH_2_1_X/src/samples/org/apache/cocoon/samples/parentcm/Generator.java
URL: http://svn.apache.org/viewcvs/cocoon/branches/BRANCH_2_1_X/src/samples/org/apache/cocoon/samples/parentcm/Generator.java?rev=396218&r1=396217&r2=396218&view=diff
==============================================================================
--- cocoon/branches/BRANCH_2_1_X/src/samples/org/apache/cocoon/samples/parentcm/Generator.java (original)
+++ cocoon/branches/BRANCH_2_1_X/src/samples/org/apache/cocoon/samples/parentcm/Generator.java Sat Apr 22 22:56:20 2006
@@ -19,7 +19,6 @@
import java.util.Date;
import java.util.Map;
-import org.apache.avalon.excalibur.pool.Poolable;
import org.apache.avalon.framework.parameters.Parameters;
import org.apache.avalon.framework.service.ServiceException;
import org.apache.cocoon.ProcessingException;
@@ -37,7 +36,7 @@
* @author <a href="mailto:leo.sutic@inspireinfrastructure.com">Leo Sutic</a>
* @version $Id$
*/
-public class Generator extends ServiceableGenerator implements Poolable {
+public class Generator extends ServiceableGenerator {
/**
* Current time.
Modified: cocoon/branches/BRANCH_2_1_X/src/test/org/apache/cocoon/transformation/IncrementTransformer.java
URL: http://svn.apache.org/viewcvs/cocoon/branches/BRANCH_2_1_X/src/test/org/apache/cocoon/transformation/IncrementTransformer.java?rev=396218&r1=396217&r2=396218&view=diff
==============================================================================
--- cocoon/branches/BRANCH_2_1_X/src/test/org/apache/cocoon/transformation/IncrementTransformer.java (original)
+++ cocoon/branches/BRANCH_2_1_X/src/test/org/apache/cocoon/transformation/IncrementTransformer.java Sat Apr 22 22:56:20 2006
@@ -40,7 +40,7 @@
*
* @version $Id$
*/
-public class IncrementTransformer extends AbstractTransformer implements Transformer, CacheableProcessingComponent {
+public class IncrementTransformer extends AbstractTransformer implements CacheableProcessingComponent {
XMLConsumer consumer;
Map objectModel;
String key;
Modified: cocoon/trunk/blocks/cocoon-ajax/cocoon-ajax-impl/src/main/java/org/apache/cocoon/ajax/AjaxRequestSelector.java
URL: http://svn.apache.org/viewcvs/cocoon/trunk/blocks/cocoon-ajax/cocoon-ajax-impl/src/main/java/org/apache/cocoon/ajax/AjaxRequestSelector.java?rev=396218&r1=396217&r2=396218&view=diff
==============================================================================
--- cocoon/trunk/blocks/cocoon-ajax/cocoon-ajax-impl/src/main/java/org/apache/cocoon/ajax/AjaxRequestSelector.java (original)
+++ cocoon/trunk/blocks/cocoon-ajax/cocoon-ajax-impl/src/main/java/org/apache/cocoon/ajax/AjaxRequestSelector.java Sat Apr 22 22:56:20 2006
@@ -18,7 +18,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.Request;
import org.apache.cocoon.selection.AbstractSwitchSelector;
@@ -42,7 +41,7 @@
* @since 2.1.8
* @version $Id$
*/
-public class AjaxRequestSelector extends AbstractSwitchSelector implements ThreadSafe {
+public class AjaxRequestSelector extends AbstractSwitchSelector {
public Object getSelectorContext(Map objectModel, Parameters parameters) {
Request req = ObjectModelHelper.getRequest(objectModel);
@@ -51,7 +50,6 @@
public boolean select(String expression, Object selectorContext) {
boolean test = BooleanUtils.toBoolean(expression);
-
return test == ((Boolean)selectorContext).booleanValue();
}
}