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:14:48 UTC
cvs commit: cocoon-2.2/src/java/org/apache/cocoon/components/language/programming Program.java
bloritsch 2003/10/22 11:14:48
Modified: src/java/org/apache/cocoon/components/language/programming/java
AbstractJavaCompiler.java JavaProgram.java
src/java/org/apache/cocoon/components/language/programming/javascript
JavascriptProgram.java
src/java/org/apache/cocoon/components/language/programming
Program.java
Log:
Update the language programming stuff to be resettable/serviceable
Revision Changes Path
1.2 +4 -4 cocoon-2.2/src/java/org/apache/cocoon/components/language/programming/java/AbstractJavaCompiler.java
Index: AbstractJavaCompiler.java
===================================================================
RCS file: /home/cvs/cocoon-2.2/src/java/org/apache/cocoon/components/language/programming/java/AbstractJavaCompiler.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- AbstractJavaCompiler.java 9 Mar 2003 00:09:00 -0000 1.1
+++ AbstractJavaCompiler.java 22 Oct 2003 18:14:48 -0000 1.2
@@ -51,8 +51,8 @@
package org.apache.cocoon.components.language.programming.java;
import org.apache.avalon.framework.logger.AbstractLogEnabled;
-import org.apache.avalon.excalibur.pool.Recyclable;
import org.apache.cocoon.components.language.programming.LanguageCompiler;
+import org.apache.excalibur.mpool.Resettable;
import java.io.BufferedReader;
import java.io.IOException;
@@ -66,7 +66,7 @@
* @version CVS $Id$
* @since 2.0
*/
-public abstract class AbstractJavaCompiler extends AbstractLogEnabled implements LanguageCompiler, Recyclable {
+public abstract class AbstractJavaCompiler extends AbstractLogEnabled implements LanguageCompiler, Resettable {
/**
* The source program filename
@@ -222,7 +222,7 @@
* This method is called by the component manager before this
* component is return to its pool.
*/
- public void recycle() {
+ public void reset() {
file = null;
srcDir = null;
destDir = null;
1.3 +3 -11 cocoon-2.2/src/java/org/apache/cocoon/components/language/programming/java/JavaProgram.java
Index: JavaProgram.java
===================================================================
RCS file: /home/cvs/cocoon-2.2/src/java/org/apache/cocoon/components/language/programming/java/JavaProgram.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- JavaProgram.java 19 Jul 2003 15:06:38 -0000 1.2
+++ JavaProgram.java 22 Oct 2003 18:14:48 -0000 1.3
@@ -50,14 +50,6 @@
*/
package org.apache.cocoon.components.language.programming.java;
-import org.apache.avalon.framework.configuration.DefaultConfiguration;
-import org.apache.avalon.framework.component.ComponentManager;
-import org.apache.avalon.framework.context.Context;
-
-import org.apache.avalon.excalibur.component.ComponentHandler;
-import org.apache.avalon.excalibur.component.RoleManager;
-import org.apache.avalon.excalibur.component.LogkitLoggerManager;
-
import org.apache.cocoon.components.language.generator.CompiledComponent;
import org.apache.cocoon.components.language.programming.Program;
@@ -80,7 +72,7 @@
return program.getName();
}
- public ComponentHandler getHandler(ComponentManager manager,
+/* public ComponentHandler getHandler(ComponentManager manager,
Context context,
RoleManager roles,
LogkitLoggerManager logKitManager)
@@ -91,7 +83,7 @@
new DefaultConfiguration("", "GeneratorSelector"),
manager, context, roles, logKitManager, null, "N/A");
}
-
+ */
public CompiledComponent newInstance() throws Exception {
return (CompiledComponent)this.program.newInstance();
}
1.3 +3 -9 cocoon-2.2/src/java/org/apache/cocoon/components/language/programming/javascript/JavascriptProgram.java
Index: JavascriptProgram.java
===================================================================
RCS file: /home/cvs/cocoon-2.2/src/java/org/apache/cocoon/components/language/programming/javascript/JavascriptProgram.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- JavascriptProgram.java 19 Jul 2003 15:06:38 -0000 1.2
+++ JavascriptProgram.java 22 Oct 2003 18:14:48 -0000 1.3
@@ -50,14 +50,8 @@
*/
package org.apache.cocoon.components.language.programming.javascript;
-import org.apache.avalon.framework.component.ComponentManager;
import org.apache.avalon.framework.configuration.Configurable;
import org.apache.avalon.framework.configuration.DefaultConfiguration;
-import org.apache.avalon.framework.context.Context;
-
-import org.apache.avalon.excalibur.component.ComponentHandler;
-import org.apache.avalon.excalibur.component.RoleManager;
-import org.apache.avalon.excalibur.component.LogkitLoggerManager;
import org.apache.cocoon.components.language.generator.CompiledComponent;
import org.apache.cocoon.components.language.programming.Program;
@@ -100,7 +94,7 @@
return file.toString();
}
- public ComponentHandler getHandler(ComponentManager manager,
+/* public ComponentHandler getHandler(ComponentManager manager,
Context context,
RoleManager roles,
LogkitLoggerManager logKitManager)
@@ -109,7 +103,7 @@
return ComponentHandler.getComponentHandler(
clazz, config, manager, context, roles, logKitManager, null, "N/A");
}
-
+ */
public CompiledComponent newInstance() throws Exception {
CompiledComponent instance = (CompiledComponent) clazz.newInstance();
if (instance instanceof Configurable)
1.2 +3 -7 cocoon-2.2/src/java/org/apache/cocoon/components/language/programming/Program.java
Index: Program.java
===================================================================
RCS file: /home/cvs/cocoon-2.2/src/java/org/apache/cocoon/components/language/programming/Program.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- Program.java 9 Mar 2003 00:08:59 -0000 1.1
+++ Program.java 22 Oct 2003 18:14:48 -0000 1.2
@@ -53,10 +53,6 @@
import org.apache.avalon.framework.component.ComponentManager;
import org.apache.avalon.framework.context.Context;
-import org.apache.avalon.excalibur.component.ComponentHandler;
-import org.apache.avalon.excalibur.component.RoleManager;
-import org.apache.avalon.excalibur.component.LogkitLoggerManager;
-
import org.apache.cocoon.components.language.generator.CompiledComponent;
/**
@@ -76,11 +72,11 @@
/**
* Get ComponentHandler which holds instances of this program.
*/
- ComponentHandler getHandler(ComponentManager manager,
+/* ComponentHandler getHandler(ComponentManager manager,
Context context,
RoleManager roles,
LogkitLoggerManager logKitManager) throws Exception;
-
+ */
/**
* Create new instance of the program.
*/