bloritsch 01/02/20 12:34:25
Modified: src/org/apache/cocoon Tag: xml-cocoon2 Roles.java
src/org/apache/cocoon/components/language/generator Tag:
xml-cocoon2 ProgramGeneratorImpl.java
src/org/apache/cocoon/reading Tag: xml-cocoon2
AbstractReader.java ResourceReader.java
src/org/apache/cocoon/util Tag: xml-cocoon2
ComponentPool.java ComponentPoolController.java
RoleUtils.java
Log:
Make the ServerPagesSelector a globally accessible item. This will allow
recursive
calls to the sitemap.
Revision Changes Path
No revision
No revision
1.1.2.8 +2 -1 xml-cocoon/src/org/apache/cocoon/Attic/Roles.java
Index: Roles.java
===================================================================
RCS file: /home/cvs/xml-cocoon/src/org/apache/cocoon/Attic/Roles.java,v
retrieving revision 1.1.2.7
retrieving revision 1.1.2.8
diff -u -r1.1.2.7 -r1.1.2.8
--- Roles.java 2001/02/19 18:10:34 1.1.2.7
+++ Roles.java 2001/02/20 20:34:12 1.1.2.8
@@ -12,7 +12,7 @@
* Created this interface to specify the Avalon role names.
*
* @author <a href="mailto:[EMAIL PROTECTED]">Berin Loritsch</a>
- * @version CVS $Revision: 1.1.2.7 $ $Date: 2001/02/19 18:10:34 $
+ * @version CVS $Revision: 1.1.2.8 $ $Date: 2001/02/20 20:34:12 $
*/
public interface Roles {
@@ -21,6 +21,7 @@
String PROCESSOR = "org.apache.cocoon.Processor";
String STORE = "org.apache.cocoon.components.store.Store";
String REPOSITORY =
"org.apache.cocoon.components.store.Repository";
+ String SERVERPAGES =
"org.apache.cocoon.components.language.generator.ServerPagesSelector";
String MARKUP_LANGUAGE =
"org.apache.cocoon.components.language.markup.MarkupLanguageSelector";
String PROGRAMMING_LANGUAGE =
"org.apache.cocoon.components.language.programming.ProgrammingLanguageSelector";
No revision
No revision
1.1.2.32 +2 -9
xml-cocoon/src/org/apache/cocoon/components/language/generator/Attic/ProgramGeneratorImpl.java
Index: ProgramGeneratorImpl.java
===================================================================
RCS file:
/home/cvs/xml-cocoon/src/org/apache/cocoon/components/language/generator/Attic/ProgramGeneratorImpl.java,v
retrieving revision 1.1.2.31
retrieving revision 1.1.2.32
diff -u -r1.1.2.31 -r1.1.2.32
--- ProgramGeneratorImpl.java 2001/02/19 15:58:08 1.1.2.31
+++ ProgramGeneratorImpl.java 2001/02/20 20:34:15 1.1.2.32
@@ -45,7 +45,7 @@
/**
* The default implementation of <code>ProgramGenerator</code>
* @author <a href="mailto:[EMAIL PROTECTED]">Ricardo Rocha</a>
- * @version CVS $Revision: 1.1.2.31 $ $Date: 2001/02/19 15:58:08 $
+ * @version CVS $Revision: 1.1.2.32 $ $Date: 2001/02/20 20:34:15 $
*/
public class ProgramGeneratorImpl extends AbstractLoggable implements
ProgramGenerator, Contextualizable, Composer, Configurable, ThreadSafe {
@@ -70,22 +70,15 @@
/** The working directory */
protected File workDir;
- public ProgramGeneratorImpl() {
- this.cache = new GeneratorSelector();
- }
-
/** Set the Cache's logger */
public void setLogger(Logger log) {
super.setLogger(log);
-
- this.cache.setLogger(log);
}
/** Contextualize this class */
public void contextualize(Context context) {
if (this.workDir == null) {
this.workDir = (File) context.get(Constants.CONTEXT_WORK_DIR);
- this.cache.contextualize(context);
}
}
@@ -97,8 +90,8 @@
public void compose(ComponentManager manager) throws
ComponentManagerException {
if ((this.manager == null) && (manager != null)) {
this.manager = manager;
- this.cache.compose(manager);
try {
+ this.cache = (GeneratorSelector)
this.manager.lookup(Roles.SERVERPAGES);
this.repository = (Store)
this.manager.lookup(Roles.REPOSITORY);
this.markupSelector =
(ComponentSelector)this.manager.lookup(Roles.MARKUP_LANGUAGE);
this.languageSelector =
(ComponentSelector)this.manager.lookup(Roles.PROGRAMMING_LANGUAGE);
No revision
No revision
1.1.2.9 +14 -3
xml-cocoon/src/org/apache/cocoon/reading/Attic/AbstractReader.java
Index: AbstractReader.java
===================================================================
RCS file:
/home/cvs/xml-cocoon/src/org/apache/cocoon/reading/Attic/AbstractReader.java,v
retrieving revision 1.1.2.8
retrieving revision 1.1.2.9
diff -u -r1.1.2.8 -r1.1.2.9
--- AbstractReader.java 2001/02/19 15:58:09 1.1.2.8
+++ AbstractReader.java 2001/02/20 20:34:17 1.1.2.9
@@ -10,18 +10,20 @@
import java.io.OutputStream;
import java.util.Map;
-import org.apache.avalon.Parameters;
+import org.apache.cocoon.PoolClient;
import org.xml.sax.EntityResolver;
+import org.apache.avalon.Parameters;
import org.apache.avalon.AbstractLoggable;
+import org.apache.avalon.util.pool.Pool;
/**
*
* @author <a href="mailto:[EMAIL PROTECTED]">Giacomo Pati</a>
- * @version CVS $Revision: 1.1.2.8 $ $Date: 2001/02/19 15:58:09 $
+ * @version CVS $Revision: 1.1.2.9 $ $Date: 2001/02/20 20:34:17 $
*/
-public abstract class AbstractReader extends AbstractLoggable implements
Reader {
+public abstract class AbstractReader extends AbstractLoggable implements
PoolClient, Reader {
/** The current <code>EntityResolver</code>. */
protected EntityResolver resolver=null;
/** The current <code>Map</code> of the object model. */
@@ -32,7 +34,16 @@
protected String source=null;
/** The <code>OutputStream</code> to write on. */
protected OutputStream out=null;
+ /** The pool to return the object to */
+ private Pool pool;
+
+ public void setPool(Pool pool) {
+ this.pool = pool;
+ }
+ public void returnToPool() {
+ this.pool.put(this);
+ }
/**
* Set the <code>EntityResolver</code> the object model <code>Map</code>,
* the source and sitemap <code>Parameters</code> used to process the
request.
1.1.2.17 +2 -14
xml-cocoon/src/org/apache/cocoon/reading/Attic/ResourceReader.java
Index: ResourceReader.java
===================================================================
RCS file:
/home/cvs/xml-cocoon/src/org/apache/cocoon/reading/Attic/ResourceReader.java,v
retrieving revision 1.1.2.16
retrieving revision 1.1.2.17
diff -u -r1.1.2.16 -r1.1.2.17
--- ResourceReader.java 2001/02/19 21:12:42 1.1.2.16
+++ ResourceReader.java 2001/02/20 20:34:18 1.1.2.17
@@ -27,18 +27,16 @@
import org.apache.cocoon.ResourceNotFoundException;
import org.apache.cocoon.Roles;
import org.apache.cocoon.components.url.URLFactory;
-import org.apache.cocoon.PoolClient;
import org.apache.avalon.ComponentManager;
import org.apache.avalon.Composer;
-import org.apache.avalon.util.pool.Pool;
import org.xml.sax.SAXException;
/**
*
* @author <a href="mailto:[EMAIL PROTECTED]">Giacomo Pati</a>
- * @version CVS $Revision: 1.1.2.16 $ $Date: 2001/02/19 21:12:42 $
+ * @version CVS $Revision: 1.1.2.17 $ $Date: 2001/02/20 20:34:18 $
*
* The <code>ResourceReader</code> component is used to serve binary data
* in a sitemap pipeline. It makes use of HTTP Headers to determine if
@@ -54,19 +52,9 @@
* </dd>
* </dl>
*/
-public class ResourceReader extends AbstractReader implements Composer,
PoolClient {
+public class ResourceReader extends AbstractReader implements Composer {
private ComponentManager manager;
-
- private Pool pool;
-
- public void setPool(Pool pool) {
- this.pool = pool;
- }
-
- public void returnToPool() {
- this.pool.put(this);
- }
public void compose (ComponentManager manager) {
this.manager = manager;
No revision
No revision
1.1.2.6 +1 -1
xml-cocoon/src/org/apache/cocoon/util/Attic/ComponentPool.java
Index: ComponentPool.java
===================================================================
RCS file:
/home/cvs/xml-cocoon/src/org/apache/cocoon/util/Attic/ComponentPool.java,v
retrieving revision 1.1.2.5
retrieving revision 1.1.2.6
diff -u -r1.1.2.5 -r1.1.2.6
--- ComponentPool.java 2001/02/16 22:07:50 1.1.2.5
+++ ComponentPool.java 2001/02/20 20:34:21 1.1.2.6
@@ -25,7 +25,7 @@
*/
public class ComponentPool extends AbstractPool implements ThreadSafe,
Loggable {
- public final static int DEFAULT_POOL_SIZE = 16;
+ public final static int DEFAULT_POOL_SIZE = 8;
private Logger log;
1.1.2.3 +2 -2
xml-cocoon/src/org/apache/cocoon/util/Attic/ComponentPoolController.java
Index: ComponentPoolController.java
===================================================================
RCS file:
/home/cvs/xml-cocoon/src/org/apache/cocoon/util/Attic/ComponentPoolController.java,v
retrieving revision 1.1.2.2
retrieving revision 1.1.2.3
diff -u -r1.1.2.2 -r1.1.2.3
--- ComponentPoolController.java 2001/01/22 21:56:53 1.1.2.2
+++ ComponentPoolController.java 2001/02/20 20:34:22 1.1.2.3
@@ -23,12 +23,12 @@
* a spezial behaviour or treatment.
*
* @author <a href="mailto:[EMAIL PROTECTED]">Giacomo Pati</a>
- * @version CVS $Revision: 1.1.2.2 $ $Date: 2001/01/22 21:56:53 $
+ * @version CVS $Revision: 1.1.2.3 $ $Date: 2001/02/20 20:34:22 $
*/
public class ComponentPoolController implements PoolController, ThreadSafe,
Component {
/** Initial increase/decrease amount */
- public final static int DEFAULT_AMOUNT = 16;
+ public final static int DEFAULT_AMOUNT = 8;
/** Current increase/decrease amount */
protected int amount = DEFAULT_AMOUNT;
1.1.2.10 +2 -1
xml-cocoon/src/org/apache/cocoon/util/Attic/RoleUtils.java
Index: RoleUtils.java
===================================================================
RCS file:
/home/cvs/xml-cocoon/src/org/apache/cocoon/util/Attic/RoleUtils.java,v
retrieving revision 1.1.2.9
retrieving revision 1.1.2.10
diff -u -r1.1.2.9 -r1.1.2.10
--- RoleUtils.java 2001/02/19 21:57:54 1.1.2.9
+++ RoleUtils.java 2001/02/20 20:34:22 1.1.2.10
@@ -19,7 +19,7 @@
* role aliases and the real Avalon role names.
*
* @author <a href="mailto:[EMAIL PROTECTED]">Berin Loritsch</a>
- * @version CVS $Revision: 1.1.2.9 $ $Date: 2001/02/19 21:57:54 $
+ * @version CVS $Revision: 1.1.2.10 $ $Date: 2001/02/20 20:34:22 $
*/
public class RoleUtils {
@@ -50,6 +50,7 @@
setup.put(Roles.PARSER,
"org.apache.cocoon.components.parser.JaxpParser");
setup.put(Roles.STORE,
"org.apache.cocoon.components.store.MemoryStore");
setup.put(Roles.REPOSITORY,
"org.apache.cocoon.components.store.FilesystemStore");
+ setup.put(Roles.SERVERPAGES,
"org.apache.cocoon.components.language.generator.GeneratorSelector");
setup.put(Roles.PROGRAMMING_LANGUAGE,
"org.apache.cocoon.CocoonComponentSelector");
setup.put(Roles.MARKUP_LANGUAGE,
"org.apache.cocoon.CocoonComponentSelector");
setup.put(Roles.CLASS_LOADER,
"org.apache.cocoon.components.classloader.ClassLoaderManagerImpl");
