You are viewing a plain text version of this content. The canonical link for it is here.
Posted to cvs@cocoon.apache.org by bl...@apache.org on 2003/10/22 20:13:36 UTC
cvs commit: cocoon-2.2/src/java/org/apache/cocoon/components/language/markup AbstractMarkupLanguage.java CocoonMarkupLanguage.java
bloritsch 2003/10/22 11:13:36
Modified: src/java/org/apache/cocoon/components/language/markup/xsp
JSGenerator.java XSPGenerator.java
src/java/org/apache/cocoon/components/language/markup
AbstractMarkupLanguage.java
CocoonMarkupLanguage.java
Log:
Update the language markup stuff to be resettable/serviceable
Revision Changes Path
1.2 +4 -4 cocoon-2.2/src/java/org/apache/cocoon/components/language/markup/xsp/JSGenerator.java
Index: JSGenerator.java
===================================================================
RCS file: /home/cvs/cocoon-2.2/src/java/org/apache/cocoon/components/language/markup/xsp/JSGenerator.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- JSGenerator.java 9 Mar 2003 00:08:54 -0000 1.1
+++ JSGenerator.java 22 Oct 2003 18:13:36 -0000 1.2
@@ -159,7 +159,7 @@
throw new ProcessingException("Failed to compile script", compileError);
}
- // add enter/exit here, too
+ // add enter/exit here, too
Context.enter();
try {
global.put("objectModel", global, Context.toObject(this.objectModel, global));
@@ -194,7 +194,7 @@
}
}
- public void recycle() {
+ public void reset() {
global.delete("contentHandler");
global.delete("objectModel");
@@ -204,7 +204,7 @@
global.delete("resolver");
global.delete("parameters");
- super.recycle();
+ super.reset();
}
public void dispose() {
1.2 +7 -7 cocoon-2.2/src/java/org/apache/cocoon/components/language/markup/xsp/XSPGenerator.java
Index: XSPGenerator.java
===================================================================
RCS file: /home/cvs/cocoon-2.2/src/java/org/apache/cocoon/components/language/markup/xsp/XSPGenerator.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- XSPGenerator.java 9 Mar 2003 00:08:55 -0000 1.1
+++ XSPGenerator.java 22 Oct 2003 18:13:36 -0000 1.2
@@ -50,14 +50,14 @@
*/
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.avalon.framework.service.ServiceManager;
+import org.apache.avalon.framework.service.ServiceException;
import org.apache.cocoon.components.language.generator.CompiledComponent;
import org.apache.cocoon.generation.AbstractServerPage;
+import org.apache.excalibur.mpool.Resettable;
import org.xml.sax.SAXException;
/**
@@ -66,7 +66,7 @@
* @author <a href="mailto:ricardo@apache.org">Ricardo Rocha</a>
* @version CVS $Id$
*/
-public abstract class XSPGenerator extends AbstractServerPage implements CompiledComponent, Contextualizable, Recyclable {
+public abstract class XSPGenerator extends AbstractServerPage implements CompiledComponent, Contextualizable, Resettable {
protected Context avalonContext = null;
/** Contextualize this class */
@@ -80,8 +80,8 @@
*
* @param manager The global component manager
*/
- public void compose(ComponentManager manager) throws ComponentException {
- super.compose(manager);
+ public void service(ServiceManager manager) throws ServiceException {
+ super.service(manager);
}
// XSP Helper methods accessible from the page
1.3 +4 -4 cocoon-2.2/src/java/org/apache/cocoon/components/language/markup/AbstractMarkupLanguage.java
Index: AbstractMarkupLanguage.java
===================================================================
RCS file: /home/cvs/cocoon-2.2/src/java/org/apache/cocoon/components/language/markup/AbstractMarkupLanguage.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- AbstractMarkupLanguage.java 22 May 2003 13:02:47 -0000 1.2
+++ AbstractMarkupLanguage.java 22 Oct 2003 18:13:36 -0000 1.3
@@ -62,7 +62,6 @@
import org.apache.avalon.framework.parameters.Parameterizable;
import org.apache.avalon.framework.parameters.Parameters;
-import org.apache.avalon.excalibur.pool.Recyclable;
import org.apache.excalibur.source.Source;
import org.apache.excalibur.source.SourceException;
import org.apache.excalibur.source.SourceResolver;
@@ -72,6 +71,7 @@
import org.apache.cocoon.components.language.programming.ProgrammingLanguage;
import org.apache.cocoon.components.source.SourceUtil;
import org.apache.excalibur.store.Store;
+import org.apache.excalibur.mpool.Resettable;
import org.apache.cocoon.util.HashMap;
import org.xml.sax.Attributes;
@@ -98,7 +98,7 @@
public abstract class AbstractMarkupLanguage
extends AbstractLogEnabled
implements MarkupLanguage, Composable, Configurable, Parameterizable,
- Recyclable, Disposable
+ Resettable, Disposable
{
/** The 'file' URL protocol. */
private static final String FILE = "file:";
@@ -233,7 +233,7 @@
/**
* Recycle this component: clear logic sheet list and dependencies.
*/
- public void recycle() {
+ public void reset() {
this.logicSheetList.clear();
}
1.3 +3 -3 cocoon-2.2/src/java/org/apache/cocoon/components/language/markup/CocoonMarkupLanguage.java
Index: CocoonMarkupLanguage.java
===================================================================
RCS file: /home/cvs/cocoon-2.2/src/java/org/apache/cocoon/components/language/markup/CocoonMarkupLanguage.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- CocoonMarkupLanguage.java 22 May 2003 13:02:47 -0000 1.2
+++ CocoonMarkupLanguage.java 22 Oct 2003 18:13:36 -0000 1.3
@@ -98,8 +98,8 @@
/**
* Recycle this component: clear logic sheet list and dependencies.
*/
- public void recycle() {
- super.recycle();
+ public void reset() {
+ super.reset();
this.dependencies.clear();
}