cocoon-cvs mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From sylv...@apache.org
Subject svn commit: r156462 - in cocoon/trunk/src/blocks: python/java/org/apache/cocoon/components/language/programming/python/ xsp/java/org/apache/cocoon/components/language/programming/java/ xsp/java/org/apache/cocoon/components/language/programming/javascript/
Date Mon, 07 Mar 2005 22:54:03 GMT
Author: sylvain
Date: Mon Mar  7 14:54:01 2005
New Revision: 156462

URL: http://svn.apache.org/viewcvs?view=rev&rev=156462
Log:
more proxied-poolable bug fixing

Modified:
    cocoon/trunk/src/blocks/python/java/org/apache/cocoon/components/language/programming/python/PythonProgram.java
    cocoon/trunk/src/blocks/xsp/java/org/apache/cocoon/components/language/programming/java/JavaProgram.java
    cocoon/trunk/src/blocks/xsp/java/org/apache/cocoon/components/language/programming/javascript/JavascriptProgram.java

Modified: cocoon/trunk/src/blocks/python/java/org/apache/cocoon/components/language/programming/python/PythonProgram.java
URL: http://svn.apache.org/viewcvs/cocoon/trunk/src/blocks/python/java/org/apache/cocoon/components/language/programming/python/PythonProgram.java?view=diff&r1=156461&r2=156462
==============================================================================
--- cocoon/trunk/src/blocks/python/java/org/apache/cocoon/components/language/programming/python/PythonProgram.java
(original)
+++ cocoon/trunk/src/blocks/python/java/org/apache/cocoon/components/language/programming/python/PythonProgram.java
Mon Mar  7 14:54:01 2005
@@ -21,6 +21,7 @@
 import org.apache.avalon.framework.logger.AbstractLogEnabled;
 import org.apache.avalon.framework.service.ServiceManager;
 
+import org.apache.cocoon.components.ComponentInfo;
 import org.apache.cocoon.components.language.programming.Program;
 import org.apache.cocoon.components.language.generator.CompiledComponent;
 import org.apache.cocoon.core.container.handler.AbstractComponentHandler;
@@ -47,6 +48,8 @@
         this.clazz = clazz;
 
         config = new DefaultConfiguration("", "GeneratorSelector");
+        // Instruct the core to avoid proxying this class
+        config.setAttribute("model", ComponentInfo.TYPE_NON_THREAD_SAFE_POOLED);
         DefaultConfiguration child = new DefaultConfiguration("file", "");
         child.setValue(file.toString());
         config.addChild(child);

Modified: cocoon/trunk/src/blocks/xsp/java/org/apache/cocoon/components/language/programming/java/JavaProgram.java
URL: http://svn.apache.org/viewcvs/cocoon/trunk/src/blocks/xsp/java/org/apache/cocoon/components/language/programming/java/JavaProgram.java?view=diff&r1=156461&r2=156462
==============================================================================
--- cocoon/trunk/src/blocks/xsp/java/org/apache/cocoon/components/language/programming/java/JavaProgram.java
(original)
+++ cocoon/trunk/src/blocks/xsp/java/org/apache/cocoon/components/language/programming/java/JavaProgram.java
Mon Mar  7 14:54:01 2005
@@ -20,6 +20,7 @@
 import org.apache.avalon.framework.logger.AbstractLogEnabled;
 import org.apache.avalon.framework.service.ServiceManager;
 
+import org.apache.cocoon.components.ComponentInfo;
 import org.apache.cocoon.components.language.generator.CompiledComponent;
 import org.apache.cocoon.components.language.programming.Program;
 import org.apache.cocoon.core.container.handler.AbstractComponentHandler;
@@ -35,9 +36,14 @@
 public class JavaProgram extends AbstractLogEnabled implements Program {
 
     protected Class program;
+    
+    protected DefaultConfiguration config;
 
     public JavaProgram(Class program) {
         this.program = program;
+        this.config = new DefaultConfiguration("", "GeneratorSelector");
+        // Instruct the core to avoid proxying this class
+        this.config.setAttribute("model", ComponentInfo.TYPE_NON_THREAD_SAFE_POOLED);
     }
 
     public String getName() {
@@ -47,15 +53,12 @@
     public ComponentHandler getHandler(ServiceManager manager,
                                        Context context)
     throws Exception {
-        DefaultConfiguration config = new DefaultConfiguration("", "GeneratorSelector");
-        // Instruct the core to avoid proxying this class
-        config.setAttribute("model", "non-thread-safe-pooled");
         return AbstractComponentHandler.getComponentHandler(
                 program,
                 getLogger(),
                 context,
                 manager,
-                config);
+                this.config);
     }
 
     public CompiledComponent newInstance() throws Exception {

Modified: cocoon/trunk/src/blocks/xsp/java/org/apache/cocoon/components/language/programming/javascript/JavascriptProgram.java
URL: http://svn.apache.org/viewcvs/cocoon/trunk/src/blocks/xsp/java/org/apache/cocoon/components/language/programming/javascript/JavascriptProgram.java?view=diff&r1=156461&r2=156462
==============================================================================
--- cocoon/trunk/src/blocks/xsp/java/org/apache/cocoon/components/language/programming/javascript/JavascriptProgram.java
(original)
+++ cocoon/trunk/src/blocks/xsp/java/org/apache/cocoon/components/language/programming/javascript/JavascriptProgram.java
Mon Mar  7 14:54:01 2005
@@ -21,6 +21,7 @@
 import org.apache.avalon.framework.logger.AbstractLogEnabled;
 import org.apache.avalon.framework.service.ServiceManager;
 
+import org.apache.cocoon.components.ComponentInfo;
 import org.apache.cocoon.components.language.generator.CompiledComponent;
 import org.apache.cocoon.components.language.programming.Program;
 import org.apache.cocoon.core.container.handler.AbstractComponentHandler;
@@ -49,6 +50,8 @@
         this.clazz = clazz;
 
         config = new DefaultConfiguration("", "GeneratorSelector");
+        // Instruct the core to avoid proxying this class
+        config.setAttribute("model", ComponentInfo.TYPE_NON_THREAD_SAFE_POOLED);
         child = new DefaultConfiguration("file", "");
         child.setValue(file.toString());
         config.addChild(child);



Mime
View raw message