You are viewing a plain text version of this content. The canonical link for it is here.
Posted to cvs@cocoon.apache.org by gi...@apache.org on 2001/07/07 13:43:39 UTC
cvs commit: xml-cocoon2/webapp/docs/samples/slides view-source.xsp
giacomo 01/07/07 04:43:39
Modified: src/org/apache/cocoon Cocoon.java cocoon.roles
src/org/apache/cocoon/acting
AbstractComplementaryConfigurableAction.java
AbstractDatabaseAction.java Action.java
DatabaseAddAction.java DatabaseDeleteAction.java
DatabaseUpdateAction.java FormValidatorAction.java
ResourceExistsAction.java
src/org/apache/cocoon/components/browser Browser.java
BrowserImpl.xsl
src/org/apache/cocoon/components/classloader
ClassLoaderManager.java
src/org/apache/cocoon/components/language/generator
GeneratorSelector.java ProgramGenerator.java
ProgramGeneratorImpl.java
src/org/apache/cocoon/components/language/markup
AbstractMarkupLanguage.java MarkupLanguage.java
src/org/apache/cocoon/components/language/markup/sitemap/java
sitemap.xsl
src/org/apache/cocoon/components/language/markup/xsp
XSPFormValidatorHelper.java XSPGenerator.java
XSPUtil.java
src/org/apache/cocoon/components/language/markup/xsp/java
esql.xsl util.xsl xsp.xsl
src/org/apache/cocoon/components/language/programming
CompiledProgrammingLanguage.java
ProgrammingLanguage.java
src/org/apache/cocoon/components/language/programming/java
JavaLanguage.java
src/org/apache/cocoon/components/parser Parser.java
src/org/apache/cocoon/components/pipeline
AbstractEventPipeline.java
AbstractStreamPipeline.java
CachingEventPipeline.java
CachingStreamPipeline.java EventPipeline.java
NonCachingEventPipeline.java StreamPipeline.java
src/org/apache/cocoon/components/sax XMLDeserializer.java
XMLSerializer.java
src/org/apache/cocoon/components/saxconnector
SAXConnector.java
src/org/apache/cocoon/components/source SitemapSource.java
SourceHandler.java SourceHandlerImpl.java
URLSource.java
src/org/apache/cocoon/components/store Store.java
src/org/apache/cocoon/components/url URLFactory.java
src/org/apache/cocoon/generation DirectoryGenerator.java
FileGenerator.java Generator.java
HTMLGenerator.java JspGenerator.java
PhpGenerator.java ScriptGenerator.java
ServerPagesGenerator.java StreamGenerator.java
VelocityGenerator.java
src/org/apache/cocoon/matching Matcher.java
src/org/apache/cocoon/reading DatabaseReader.java
Reader.java ResourceReader.java
src/org/apache/cocoon/selection Selector.java
src/org/apache/cocoon/serialization Serializer.java
src/org/apache/cocoon/sitemap AbstractSitemap.java
ContentAggregator.java Handler.java
src/org/apache/cocoon/transformation
AbstractDOMTransformer.java
CIncludeTransformer.java
FragmentExtractorTransformer.java
I18nTransformer.java LDAPTransformer.java
SQLTransformer.java Transformer.java
TraxTransformer.java
WriteDOMSessionTransformer.java
XIncludeTransformer.java XTTransformer.java
webapp cocoon.xconf
webapp/WEB-INF web.xml
webapp/docs/samples/slides view-source.xsp
Log:
Changing to the proposed way Roles should be named.
Getting rid of thr Roles.java file
One last role remaines in Roles.java: DB_CONNECTION
Revision Changes Path
1.15 +12 -11 xml-cocoon2/src/org/apache/cocoon/Cocoon.java
Index: Cocoon.java
===================================================================
RCS file: /home/cvs/xml-cocoon2/src/org/apache/cocoon/Cocoon.java,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -u -r1.14 -r1.15
--- Cocoon.java 2001/07/04 07:56:35 1.14
+++ Cocoon.java 2001/07/07 11:43:11 1.15
@@ -36,6 +36,7 @@
import org.apache.cocoon.components.parser.Parser;
import org.apache.cocoon.components.pipeline.EventPipeline;
import org.apache.cocoon.components.pipeline.StreamPipeline;
+import org.apache.cocoon.components.store.Store;
import org.apache.cocoon.components.store.FilesystemStore;
import org.apache.cocoon.components.source.SourceHandler;
import org.apache.cocoon.components.source.URLSource;
@@ -56,7 +57,7 @@
*
* @author <a href="mailto:fumagalli@exoffice.com">Pierpaolo Fumagalli</a> (Apache Software Foundation, Exoffice Technologies)
* @author <a href="mailto:stefano@apache.org">Stefano Mazzocchi</a>
- * @version CVS $Revision: 1.14 $ $Date: 2001/07/04 07:56:35 $
+ * @version CVS $Revision: 1.15 $ $Date: 2001/07/07 11:43:11 $
*/
public class Cocoon extends AbstractLoggable implements ThreadSafe, Component, Initializable, Disposable, Modifiable, Processor, Contextualizable {
/** The application context */
@@ -132,7 +133,7 @@
startupManager.contextualize(this.context);
try {
- startupManager.addComponent(Roles.PARSER, ClassUtils.loadClass(parser), null);
+ startupManager.addComponent(Parser.ROLE, ClassUtils.loadClass(parser), null);
} catch (Exception e) {
getLogger().error("Could not load parser, Cocoon object not created.", e);
throw new ConfigurationException("Could not load parser " + parser, e);
@@ -143,7 +144,7 @@
FilesystemStore repository = new FilesystemStore();
repository.setLogger(getLogger());
repository.setDirectory(this.workDir);
- this.componentManager.addComponentInstance(Roles.REPOSITORY, repository);
+ this.componentManager.addComponentInstance(Store.ROLE + "/Filesystem", repository);
} catch (IOException e) {
getLogger().error("Could not create repository!", e);
throw new ConfigurationException("Could not create the repository!", e);
@@ -203,7 +204,7 @@
try {
this.configurationFile.refresh();
- p = (Parser)startupManager.lookup(Roles.PARSER);
+ p = (Parser)startupManager.lookup(Parser.ROLE);
SAXConfigurationHandler b = new SAXConfigurationHandler();
InputStream inputStream = ClassUtils.getResource("org/apache/cocoon/cocoon.roles").openStream();
InputSource is = new InputSource(inputStream);
@@ -225,7 +226,7 @@
try {
this.configurationFile.refresh();
- p = (Parser)startupManager.lookup(Roles.PARSER);
+ p = (Parser)startupManager.lookup(Parser.ROLE);
SAXConfigurationHandler b = new SAXConfigurationHandler();
InputStream inputStream = ClassUtils.getResource("org/apache/cocoon/sitemap/sitemap.roles").openStream();
InputSource is = new InputSource(inputStream);
@@ -245,7 +246,7 @@
sitemapRoleManager.configure(sitemapConfig);
try {
- p = (Parser)startupManager.lookup(Roles.PARSER);
+ p = (Parser)startupManager.lookup(Parser.ROLE);
SAXConfigurationHandler b = new SAXConfigurationHandler();
InputSource is = this.configurationFile.getInputSource();
p.setContentHandler(b);
@@ -274,7 +275,7 @@
String userRoles = conf.getAttribute("user-roles", "");
if ("".equals(userRoles) == false) {
try {
- p = (Parser)startupManager.lookup(Roles.PARSER);
+ p = (Parser)startupManager.lookup(Parser.ROLE);
SAXConfigurationHandler b = new SAXConfigurationHandler();
org.apache.cocoon.environment.Context context =
(org.apache.cocoon.environment.Context) this.context.get(Constants.CONTEXT_ENVIRONMENT_CONTEXT);
@@ -370,8 +371,8 @@
ProgramGenerator programGenerator = null;
SourceHandler sourceHandler = null;
try {
- programGenerator = (ProgramGenerator) this.componentManager.lookup(Roles.PROGRAM_GENERATOR);
- sourceHandler = (SourceHandler) this.componentManager.lookup(Roles.SOURCE_HANDLER);
+ programGenerator = (ProgramGenerator) this.componentManager.lookup(ProgramGenerator.ROLE);
+ sourceHandler = (SourceHandler) this.componentManager.lookup(SourceHandler.ROLE);
environment.setSourceHandler(sourceHandler);
String markupLanguage = "sitemap";
String programmingLanguage = "java";
@@ -405,8 +406,8 @@
try {
getLogger().debug("XSP generation begin:" + fileName);
- programGenerator = (ProgramGenerator) this.componentManager.lookup(Roles.PROGRAM_GENERATOR);
- sourceHandler = (SourceHandler) this.componentManager.lookup(Roles.SOURCE_HANDLER);
+ programGenerator = (ProgramGenerator) this.componentManager.lookup(ProgramGenerator.ROLE);
+ sourceHandler = (SourceHandler) this.componentManager.lookup(SourceHandler.ROLE);
environment.setSourceHandler(sourceHandler);
String markupLanguage = "xsp";
String programmingLanguage = "java";
1.15 +5 -5 xml-cocoon2/src/org/apache/cocoon/cocoon.roles
Index: cocoon.roles
===================================================================
RCS file: /home/cvs/xml-cocoon2/src/org/apache/cocoon/cocoon.roles,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -u -r1.14 -r1.15
--- cocoon.roles 2001/07/05 16:45:22 1.14
+++ cocoon.roles 2001/07/07 11:43:11 1.15
@@ -16,7 +16,7 @@
shorthand="store"
default-class="org.apache.cocoon.components.store.MemoryStore"/>
- <role name="org.apache.cocoon.components.store.Repository"
+ <role name="org.apache.cocoon.components.store.Store/Filesystem"
shorthand="repository"
default-class="org.apache.cocoon.components.store.FilesystemStore"/>
@@ -71,13 +71,13 @@
shorthand="xml-deserializer"
default-class="org.apache.cocoon.components.sax.XMLByteStreamInterpreter"/>
- <role name="org.apache.cocoon.caching.EventCache"
+ <role name="org.apache.cocoon.components.store.Store/EventCache"
shorthand="event-cache"
- default-class="org.apache.cocoon.caching.EventMemoryCache"/>
+ default-class="org.apache.cocoon.components.store.MRUMemoryStore"/>
- <role name="org.apache.cocoon.caching.StreamCache"
+ <role name="org.apache.cocoon.components.store.Store/StreamCache"
shorthand="stream-cache"
- default-class="org.apache.cocoon.caching.StreamMemoryCache"/>
+ default-class="org.apache.cocoon.components.store.MRUMemoryStore"/>
<role name="org.apache.cocoon.components.profiler.Profiler"
shorthand="profiler"
1.5 +2 -3 xml-cocoon2/src/org/apache/cocoon/acting/AbstractComplementaryConfigurableAction.java
Index: AbstractComplementaryConfigurableAction.java
===================================================================
RCS file: /home/cvs/xml-cocoon2/src/org/apache/cocoon/acting/AbstractComplementaryConfigurableAction.java,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -u -r1.4 -r1.5
--- AbstractComplementaryConfigurableAction.java 2001/07/06 09:59:35 1.4
+++ AbstractComplementaryConfigurableAction.java 2001/07/07 11:43:11 1.5
@@ -14,7 +14,6 @@
import org.apache.avalon.framework.configuration.Configuration;
import org.apache.avalon.framework.configuration.ConfigurationException;
import org.apache.avalon.framework.configuration.SAXConfigurationHandler;
-import org.apache.cocoon.Roles;
import org.apache.cocoon.components.source.SourceHandler;
import org.apache.cocoon.environment.Source;
@@ -26,7 +25,7 @@
* effective. The name of the root configuration element is irrelevant.
*
* @author <a href="mailto:bloritsch@apache.org">Berin Loritsch</a>
- * @version CVS $Revision: 1.4 $ $Date: 2001/07/06 09:59:35 $
+ * @version CVS $Revision: 1.5 $ $Date: 2001/07/07 11:43:11 $
*/
public abstract class AbstractComplementaryConfigurableAction extends ComposerAction {
private static Map configurations = new HashMap();
@@ -52,7 +51,7 @@
Source resource = null;
try {
- sourceHandler = (SourceHandler) this.manager.lookup(Roles.SOURCE_HANDLER);
+ sourceHandler = (SourceHandler) this.manager.lookup(SourceHandler.ROLE);
resource = sourceHandler.getSource(null, descriptor);
SAXConfigurationHandler builder = new SAXConfigurationHandler();
1.8 +3 -3 xml-cocoon2/src/org/apache/cocoon/acting/AbstractDatabaseAction.java
Index: AbstractDatabaseAction.java
===================================================================
RCS file: /home/cvs/xml-cocoon2/src/org/apache/cocoon/acting/AbstractDatabaseAction.java,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -u -r1.7 -r1.8
--- AbstractDatabaseAction.java 2001/05/31 15:38:49 1.7
+++ AbstractDatabaseAction.java 2001/07/07 11:43:12 1.8
@@ -34,7 +34,6 @@
import org.apache.avalon.framework.configuration.Configurable;
import org.apache.avalon.framework.configuration.Configuration;
import org.apache.avalon.framework.parameters.Parameters;
-import org.apache.cocoon.Roles;
import org.apache.cocoon.environment.Request;
import org.apache.cocoon.generation.ImageDirectoryGenerator;
import org.apache.avalon.excalibur.datasource.DataSourceComponent;
@@ -159,7 +158,7 @@
*
* @author <a href="mailto:bloritsch@apache.org">Berin Loritsch</a>
* @author <a href="mailto:balld@apache.org">Donald Ball</a>
- * @version CVS $Revision: 1.7 $ $Date: 2001/05/31 15:38:49 $
+ * @version CVS $Revision: 1.8 $ $Date: 2001/07/07 11:43:12 $
*/
public abstract class AbstractDatabaseAction extends AbstractComplementaryConfigurableAction implements Configurable, Disposable {
protected Map files = new HashMap();
@@ -202,7 +201,8 @@
* Compose the Actions so that we can select our databases.
*/
public void compose(ComponentManager manager) throws ComponentException {
- this.dbselector = (ComponentSelector) manager.lookup(Roles.DB_CONNECTION);
+ //this.dbselector = (ComponentSelector) manager.lookup(DataSourceComponent.ROLE);
+ this.dbselector = (ComponentSelector) manager.lookup(org.apache.cocoon.Roles.DB_CONNECTION);
super.compose(manager);
}
1.4 +4 -1 xml-cocoon2/src/org/apache/cocoon/acting/Action.java
Index: Action.java
===================================================================
RCS file: /home/cvs/xml-cocoon2/src/org/apache/cocoon/acting/Action.java,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -u -r1.3 -r1.4
--- Action.java 2001/06/05 21:36:20 1.3
+++ Action.java 2001/07/07 11:43:12 1.4
@@ -18,9 +18,12 @@
/**
*
* @author <a href="mailto:Giacomo.Pati@pwr.ch">Giacomo Pati</a>
- * @version CVS $Revision: 1.3 $ $Date: 2001/06/05 21:36:20 $
+ * @version CVS $Revision: 1.4 $ $Date: 2001/07/07 11:43:12 $
*/
public interface Action extends Component, ThreadSafe {
+
+ String ROLE = "org.apache.cocoon.acting.Action";
+
/**
* Controls the processing against some values of the
* <code>Dictionary</code> objectModel and returns a
1.7 +1 -2 xml-cocoon2/src/org/apache/cocoon/acting/DatabaseAddAction.java
Index: DatabaseAddAction.java
===================================================================
RCS file: /home/cvs/xml-cocoon2/src/org/apache/cocoon/acting/DatabaseAddAction.java,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -u -r1.6 -r1.7
--- DatabaseAddAction.java 2001/06/05 21:36:20 1.6
+++ DatabaseAddAction.java 2001/07/07 11:43:12 1.7
@@ -28,7 +28,6 @@
import org.apache.avalon.framework.parameters.Parameters;
import org.apache.cocoon.Constants;
import org.apache.cocoon.ProcessingException;
-import org.apache.cocoon.Roles;
import org.apache.cocoon.environment.Request;
import org.apache.cocoon.environment.Redirector;
import org.apache.cocoon.environment.SourceResolver;
@@ -44,7 +43,7 @@
*
* @author <a href="mailto:bloritsch@apache.org">Berin Loritsch</a>
* @author <a href="mailto:balld@apache.org">Donald Ball</a>
- * @version CVS $Revision: 1.6 $ $Date: 2001/06/05 21:36:20 $
+ * @version CVS $Revision: 1.7 $ $Date: 2001/07/07 11:43:12 $
*/
public class DatabaseAddAction extends AbstractDatabaseAction {
protected static final Map addStatements = new HashMap();
1.4 +1 -2 xml-cocoon2/src/org/apache/cocoon/acting/DatabaseDeleteAction.java
Index: DatabaseDeleteAction.java
===================================================================
RCS file: /home/cvs/xml-cocoon2/src/org/apache/cocoon/acting/DatabaseDeleteAction.java,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -u -r1.3 -r1.4
--- DatabaseDeleteAction.java 2001/06/05 21:36:20 1.3
+++ DatabaseDeleteAction.java 2001/07/07 11:43:12 1.4
@@ -24,7 +24,6 @@
import org.apache.avalon.framework.parameters.Parameters;
import org.apache.cocoon.Constants;
import org.apache.cocoon.ProcessingException;
-import org.apache.cocoon.Roles;
import org.apache.cocoon.environment.Request;
import org.apache.cocoon.environment.Redirector;
import org.apache.cocoon.environment.SourceResolver;
@@ -39,7 +38,7 @@
* the keys.
*
* @author <a href="mailto:bloritsch@apache.org">Berin Loritsch</a>
- * @version CVS $Revision: 1.3 $ $Date: 2001/06/05 21:36:20 $
+ * @version CVS $Revision: 1.4 $ $Date: 2001/07/07 11:43:12 $
*/
public final class DatabaseDeleteAction extends AbstractDatabaseAction {
private static final Map deleteStatements = new HashMap();
1.4 +1 -2 xml-cocoon2/src/org/apache/cocoon/acting/DatabaseUpdateAction.java
Index: DatabaseUpdateAction.java
===================================================================
RCS file: /home/cvs/xml-cocoon2/src/org/apache/cocoon/acting/DatabaseUpdateAction.java,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -u -r1.3 -r1.4
--- DatabaseUpdateAction.java 2001/06/05 21:36:20 1.3
+++ DatabaseUpdateAction.java 2001/07/07 11:43:12 1.4
@@ -24,7 +24,6 @@
import org.apache.avalon.framework.parameters.Parameters;
import org.apache.cocoon.Constants;
import org.apache.cocoon.ProcessingException;
-import org.apache.cocoon.Roles;
import org.apache.cocoon.environment.Request;
import org.apache.cocoon.environment.Redirector;
import org.apache.cocoon.environment.SourceResolver;
@@ -36,7 +35,7 @@
* only one table at a time to update.
*
* @author <a href="mailto:bloritsch@apache.org">Berin Loritsch</a>
- * @version CVS $Revision: 1.3 $ $Date: 2001/06/05 21:36:20 $
+ * @version CVS $Revision: 1.4 $ $Date: 2001/07/07 11:43:12 $
*/
public class DatabaseUpdateAction extends AbstractDatabaseAction {
private static final Map updateStatements = new HashMap();
1.6 +23 -23 xml-cocoon2/src/org/apache/cocoon/acting/FormValidatorAction.java
Index: FormValidatorAction.java
===================================================================
RCS file: /home/cvs/xml-cocoon2/src/org/apache/cocoon/acting/FormValidatorAction.java,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -u -r1.5 -r1.6
--- FormValidatorAction.java 2001/06/15 11:49:20 1.5
+++ FormValidatorAction.java 2001/07/07 11:43:12 1.6
@@ -1,4 +1,4 @@
-// $Id: FormValidatorAction.java,v 1.5 2001/06/15 11:49:20 dims Exp $
+// $Id: FormValidatorAction.java,v 1.6 2001/07/07 11:43:12 giacomo Exp $
package org.apache.cocoon.acting;
import java.util.Collections;
@@ -57,7 +57,7 @@
* the result is not available for the target page.
*
* @author Martin Man <Martin.Man@seznam.cz>
- * @version CVS $Revision: 1.5 $ $Date: 2001/06/15 11:49:20 $
+ * @version CVS $Revision: 1.6 $ $Date: 2001/07/07 11:43:12 $
*/
public class FormValidatorAction extends AbstractValidatorAction
{
@@ -71,7 +71,7 @@
/* check request validity */
if (req == null) {
- getLogger ().debug ("FORMVALIDATOR: no request object");
+ getLogger().debug ("FORMVALIDATOR: no request object");
return null;
}
@@ -89,7 +89,7 @@
* old obsoleted method
*/
if (!"".equals (valstr.trim ())) {
- getLogger ().debug ("FORMVALIDATOR: validating parameters "
+ getLogger().debug ("FORMVALIDATOR: validating parameters "
+ "as specified via 'validate' parameter");
/* get list of params to be validated */
String[] rparams = Tokenizer.tokenize (valstr, ",", false);
@@ -102,7 +102,7 @@
for (int i = 0; i < rparams.length; i ++) {
name = rparams[i];
if (name == null || "".equals (name.trim ())) {
- getLogger ().debug ("FORMVALIDATOR: "
+ getLogger().debug ("FORMVALIDATOR: "
+ "wrong syntax of the 'validate' parameter");
return null;
}
@@ -126,7 +126,7 @@
* new set-based method
*/
if (!"".equals (valsetstr.trim ())) {
- getLogger ().debug ("FORMVALIDATOR: validating parameters "
+ getLogger().debug ("FORMVALIDATOR: validating parameters "
+ "from given constraint-set " + valsetstr);
Configuration cset = null;
String setname = null;
@@ -140,7 +140,7 @@
}
}
if (!found) {
- getLogger ().debug ("FORMVALIDATOR: given set "
+ getLogger().debug ("FORMVALIDATOR: given set "
+ valsetstr
+ " does not exist in a description file");
return null;
@@ -153,14 +153,14 @@
ValidatorActionHelper result = null;
String name = null;
HashMap params = new HashMap (set.length);
- getLogger ().debug ("FORMVALIDATOR: given set "
+ getLogger().debug ("FORMVALIDATOR: given set "
+ valsetstr
+ " contains " + set.length + " rules");
/* put required params into hash */
for (int i = 0; i < set.length; i ++) {
name = set[i].getAttribute ("name", "");
if ("".equals (name.trim ())) {
- getLogger ().debug ("FORMVALIDATOR: wrong syntax "
+ getLogger().debug ("FORMVALIDATOR: wrong syntax "
+ " of 'validate' children nr. " + i);
return null;
}
@@ -179,20 +179,20 @@
actionMap.put (name, result.getObject());
resultMap.put (name, result.getResult());
}
+ }
+ if (!allOK) {
+ // if any validation failed return an empty map
+ actionMap = null;
+ getLogger().debug ("FORMVALIDATOR: all form "
+ + "params validated. An error occurred.");
+ } else {
+ getLogger().debug ("FORMVALIDATOR: all form "
+ + "params successfully validated");
}
- if (!allOK) {
- // if any validation failed return an empty map
- actionMap = null;
- getLogger().debug ("FORMVALIDATOR: all form "
- + "params validated. An error occurred.");
- } else {
- getLogger().debug ("FORMVALIDATOR: all form "
- + "params successfully validated");
- }
- // store validation results in request attribute
- req.setAttribute(Constants.XSP_FORMVALIDATOR_PATH, resultMap);
- // return Collections.unmodifiableMap (actionMap);
- return actionMap;
+ // store validation results in request attribute
+ req.setAttribute(Constants.XSP_FORMVALIDATOR_PATH, resultMap);
+ //return Collections.unmodifiableMap (actionMap);
+ return actionMap;
} catch (Exception e) {
getLogger().debug ("exception: ", e);
}
@@ -200,5 +200,5 @@
}
}
-// $Id: FormValidatorAction.java,v 1.5 2001/06/15 11:49:20 dims Exp $
+// $Id: FormValidatorAction.java,v 1.6 2001/07/07 11:43:12 giacomo Exp $
// vim: set et ts=4 sw=4:
1.7 +1 -2 xml-cocoon2/src/org/apache/cocoon/acting/ResourceExistsAction.java
Index: ResourceExistsAction.java
===================================================================
RCS file: /home/cvs/xml-cocoon2/src/org/apache/cocoon/acting/ResourceExistsAction.java,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -u -r1.6 -r1.7
--- ResourceExistsAction.java 2001/07/06 10:46:46 1.6
+++ ResourceExistsAction.java 2001/07/07 11:43:12 1.7
@@ -22,7 +22,6 @@
import org.apache.avalon.framework.parameters.Parameters;
import org.apache.cocoon.Constants;
import org.apache.cocoon.ProcessingException;
-import org.apache.cocoon.Roles;
import org.apache.cocoon.environment.Redirector;
import org.apache.cocoon.environment.Request;
import org.apache.cocoon.environment.SourceResolver;
@@ -34,7 +33,7 @@
* null otherwise. It has only been tested with context urls.
*
* @author <a href="mailto:balld@apache.org">Donald Ball</a>
- * @version CVS $Revision: 1.6 $ $Date: 2001/07/06 10:46:46 $
+ * @version CVS $Revision: 1.7 $ $Date: 2001/07/07 11:43:12 $
*/
public class ResourceExistsAction extends ComposerAction {
1.3 +14 -12 xml-cocoon2/src/org/apache/cocoon/components/browser/Browser.java
Index: Browser.java
===================================================================
RCS file: /home/cvs/xml-cocoon2/src/org/apache/cocoon/components/browser/Browser.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -u -r1.2 -r1.3
--- Browser.java 2001/05/31 16:12:35 1.2
+++ Browser.java 2001/07/07 11:43:13 1.3
@@ -14,21 +14,23 @@
/**
*
* @author <a href="mailto:dims@yahoo.com">Davanum Srinivas</a>
- * @version CVS $Revision: 1.2 $ $Date: 2001/05/31 16:12:35 $
+ * @version CVS $Revision: 1.3 $ $Date: 2001/07/07 11:43:13 $
*/
public interface Browser extends Component {
- /**
- * <code>getMedia</code> returns a media type based on the user
- * agent or on the Accept: header. This is used later by the XSLT
- * processor to select the stylesheet to apply on a given XML file.
- *
- * @param userAgent a <code>String</code> value
- * @param acceptHeader a <code>String</code> value
- * @return a <code>String</code> value */
- HashMap getBrowser(String userAgent, String acceptHeader);
+ String ROLE = "org.apache.cocoon.components.browser.Browser";
+ /**
+ * <code>getMedia</code> returns a media type based on the user
+ * agent or on the Accept: header. This is used later by the XSLT
+ * processor to select the stylesheet to apply on a given XML file.
+ *
+ * @param userAgent a <code>String</code> value
+ * @param acceptHeader a <code>String</code> value
+ * @return a <code>String</code> value
+ */
+ HashMap getBrowser(String userAgent, String acceptHeader);
- String getMedia(HashMap browserInfo);
+ String getMedia(HashMap browserInfo);
- Document getUACapabilities(HashMap browserInfo);
+ Document getUACapabilities(HashMap browserInfo);
}
1.3 +1 -2 xml-cocoon2/src/org/apache/cocoon/components/browser/BrowserImpl.xsl
Index: BrowserImpl.xsl
===================================================================
RCS file: /home/cvs/xml-cocoon2/src/org/apache/cocoon/components/browser/BrowserImpl.xsl,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -u -r1.2 -r1.3
--- BrowserImpl.xsl 2001/06/07 10:56:09 1.2
+++ BrowserImpl.xsl 2001/07/07 11:43:13 1.3
@@ -31,7 +31,6 @@
import org.apache.avalon.framework.component.ComponentException;
import org.apache.avalon.framework.component.ComponentManager;
-import org.apache.cocoon.Roles;
import org.apache.cocoon.xml.dom.DOMFactory;
import org.apache.cocoon.components.parser.Parser;
import java.util.TreeSet;
@@ -128,7 +127,7 @@
public void compose(ComponentManager manager)
throws ComponentException {
this.manager=manager;
- parser = (Parser)this.manager.lookup(Roles.PARSER);
+ parser = (Parser)this.manager.lookup(Parser.ROLE);
HashMap browser0 = new HashMap();
Document document;
1.2 +4 -1 xml-cocoon2/src/org/apache/cocoon/components/classloader/ClassLoaderManager.java
Index: ClassLoaderManager.java
===================================================================
RCS file: /home/cvs/xml-cocoon2/src/org/apache/cocoon/components/classloader/ClassLoaderManager.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -u -r1.1 -r1.2
--- ClassLoaderManager.java 2001/05/09 20:49:49 1.1
+++ ClassLoaderManager.java 2001/07/07 11:43:13 1.2
@@ -18,9 +18,12 @@
* that it can be safely reinstantiated for dynamic class reloading
*
* @author <a href="mailto:ricardo@apache.org">Ricardo Rocha</a>
- * @version CVS $Revision: 1.1 $ $Date: 2001/05/09 20:49:49 $
+ * @version CVS $Revision: 1.2 $ $Date: 2001/07/07 11:43:13 $
*/
public interface ClassLoaderManager extends Component {
+
+ String ROLE = "org.apache.cocoon.components.classloader.ClassLoaderManager";
+
/**
* Add a directory to the proxied class loader
*
1.4 +5 -3 xml-cocoon2/src/org/apache/cocoon/components/language/generator/GeneratorSelector.java
Index: GeneratorSelector.java
===================================================================
RCS file: /home/cvs/xml-cocoon2/src/org/apache/cocoon/components/language/generator/GeneratorSelector.java,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -u -r1.3 -r1.4
--- GeneratorSelector.java 2001/06/19 15:50:06 1.3
+++ GeneratorSelector.java 2001/07/07 11:43:13 1.4
@@ -15,7 +15,6 @@
import org.apache.avalon.framework.context.Context;
import org.apache.avalon.framework.configuration.DefaultConfiguration;
import org.apache.cocoon.Constants;
-import org.apache.cocoon.Roles;
import org.apache.cocoon.components.classloader.ClassLoaderManager;
import org.apache.cocoon.util.ClassUtils;
import org.apache.avalon.excalibur.component.ExcaliburComponentSelector;
@@ -30,9 +29,12 @@
* includes Sitemaps and XSP Pages
*
* @author <a href="mailto:bloritsch@apache.org">Berin Loritsch</a>
- * @version CVS $Revision: 1.3 $ $Date: 2001/06/19 15:50:06 $
+ * @version CVS $Revision: 1.4 $ $Date: 2001/07/07 11:43:13 $
*/
public class GeneratorSelector extends ExcaliburComponentSelector implements Disposable {
+
+ public static String ROLE = "org.apache.cocoon.components.language.generator.ServerPages";
+
private ClassLoaderManager classManager;
/** The component manager */
@@ -59,7 +61,7 @@
this.manager = manager;
try {
- this.classManager = (ClassLoaderManager) manager.lookup(Roles.CLASS_LOADER);
+ this.classManager = (ClassLoaderManager) manager.lookup(ClassLoaderManager.ROLE);
} catch (ComponentException cme) {
throw new ComponentException("GeneratorSelector", cme);
}
1.5 +4 -1 xml-cocoon2/src/org/apache/cocoon/components/language/generator/ProgramGenerator.java
Index: ProgramGenerator.java
===================================================================
RCS file: /home/cvs/xml-cocoon2/src/org/apache/cocoon/components/language/generator/ProgramGenerator.java,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -u -r1.4 -r1.5
--- ProgramGenerator.java 2001/06/08 20:28:14 1.4
+++ ProgramGenerator.java 2001/07/07 11:43:13 1.5
@@ -17,9 +17,12 @@
* documents writeen in a <code>MarkupLanguage</code>
*
* @author <a href="mailto:ricardo@apache.org">Ricardo Rocha</a>
- * @version CVS $Revision: 1.4 $ $Date: 2001/06/08 20:28:14 $
+ * @version CVS $Revision: 1.5 $ $Date: 2001/07/07 11:43:13 $
*/
public interface ProgramGenerator extends Component {
+
+ String ROLE = "org.apache.cocoon.components.language.generator.ProgramGenerator";
+
/**
* Load a program built from an XML document written in a
* <code>MarkupLanguage</code>
1.9 +6 -7 xml-cocoon2/src/org/apache/cocoon/components/language/generator/ProgramGeneratorImpl.java
Index: ProgramGeneratorImpl.java
===================================================================
RCS file: /home/cvs/xml-cocoon2/src/org/apache/cocoon/components/language/generator/ProgramGeneratorImpl.java,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -u -r1.8 -r1.9
--- ProgramGeneratorImpl.java 2001/07/05 16:45:24 1.8
+++ ProgramGeneratorImpl.java 2001/07/07 11:43:13 1.9
@@ -29,7 +29,6 @@
import org.apache.avalon.framework.thread.ThreadSafe;
import org.apache.cocoon.Constants;
import org.apache.cocoon.ProcessingException;
-import org.apache.cocoon.Roles;
import org.apache.cocoon.components.classloader.ClassLoaderManager;
import org.apache.cocoon.components.language.LanguageException;
import org.apache.cocoon.components.language.markup.MarkupLanguage;
@@ -49,7 +48,7 @@
/**
* The default implementation of <code>ProgramGenerator</code>
* @author <a href="mailto:ricardo@apache.org">Ricardo Rocha</a>
- * @version CVS $Revision: 1.8 $ $Date: 2001/07/05 16:45:24 $
+ * @version CVS $Revision: 1.9 $ $Date: 2001/07/07 11:43:13 $
*/
public class ProgramGeneratorImpl extends AbstractLoggable
implements ProgramGenerator, Contextualizable, Composable, Configurable, ThreadSafe, Disposable {
@@ -100,11 +99,11 @@
if ((this.manager == null) && (manager != null)) {
this.manager = 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);
- this.classManager = (ClassLoaderManager)this.manager.lookup(Roles.CLASS_LOADER);
+ this.cache = (GeneratorSelector) this.manager.lookup(GeneratorSelector.ROLE + "Selector");
+ this.repository = (Store) this.manager.lookup(Store.ROLE + "/Filesystem");
+ this.markupSelector = (ComponentSelector)this.manager.lookup(MarkupLanguage.ROLE + "Selector");
+ this.languageSelector = (ComponentSelector)this.manager.lookup(ProgrammingLanguage.ROLE + "Selector");
+ this.classManager = (ClassLoaderManager)this.manager.lookup(ClassLoaderManager.ROLE);
} catch (Exception e) {
getLogger().warn("Could not lookup Component", e);
}
1.5 +4 -5 xml-cocoon2/src/org/apache/cocoon/components/language/markup/AbstractMarkupLanguage.java
Index: AbstractMarkupLanguage.java
===================================================================
RCS file: /home/cvs/xml-cocoon2/src/org/apache/cocoon/components/language/markup/AbstractMarkupLanguage.java,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -u -r1.4 -r1.5
--- AbstractMarkupLanguage.java 2001/05/31 17:37:52 1.4
+++ AbstractMarkupLanguage.java 2001/07/07 11:43:14 1.5
@@ -31,7 +31,6 @@
import org.apache.avalon.framework.configuration.ConfigurationException;
import org.apache.avalon.framework.logger.AbstractLoggable;
import org.apache.avalon.framework.parameters.Parameters;
-import org.apache.cocoon.Roles;
import org.apache.cocoon.components.language.programming.ProgrammingLanguage;
import org.apache.cocoon.components.store.Store;
import org.apache.cocoon.components.url.URLFactory;
@@ -50,7 +49,7 @@
* logicsheets as the only means of code generation. Code generation should be decoupled from this context!!!
* @author <a href="mailto:ricardo@apache.org">Ricardo Rocha</a>
* @author <a href="mailto:dims@yahoo.com">Davanum Srinivas</a>
- * @version CVS $Revision: 1.4 $ $Date: 2001/05/31 17:37:52 $
+ * @version CVS $Revision: 1.5 $ $Date: 2001/07/07 11:43:14 $
*/
public abstract class AbstractMarkupLanguage extends AbstractLoggable implements MarkupLanguage, Composable, Configurable {
/** The supported language table */
@@ -76,7 +75,7 @@
this.manager = manager;
// Initialize logicsheet cache
- this.logicsheetCache = (Store) manager.lookup(Roles.STORE);
+ this.logicsheetCache = (Store) manager.lookup(Store.ROLE);
}
/** The default constructor. */
@@ -169,7 +168,7 @@
URLFactory urlFactory = null;
try {
- urlFactory = (URLFactory) this.manager.lookup(Roles.URL_FACTORY);
+ urlFactory = (URLFactory) this.manager.lookup(URLFactory.ROLE);
logicsheetURL = urlFactory.getURL(logicsheetLocation);
} catch (Exception e){
getLogger().warn("URL Error: " + e.getMessage(), e);
@@ -317,7 +316,7 @@
URL url = null;
URLFactory urlFactory = null;
try {
- urlFactory = (URLFactory)this.manager.lookup(Roles.URL_FACTORY);
+ urlFactory = (URLFactory)this.manager.lookup(URLFactory.ROLE);
url = urlFactory.getURL(logicsheetLocation);
} catch (Exception e) {
getLogger().error("cannot get logicsheet at " + logicsheetLocation);
1.3 +3 -1 xml-cocoon2/src/org/apache/cocoon/components/language/markup/MarkupLanguage.java
Index: MarkupLanguage.java
===================================================================
RCS file: /home/cvs/xml-cocoon2/src/org/apache/cocoon/components/language/markup/MarkupLanguage.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -u -r1.2 -r1.3
--- MarkupLanguage.java 2001/05/22 14:32:45 1.2
+++ MarkupLanguage.java 2001/07/07 11:43:14 1.3
@@ -19,9 +19,11 @@
* document augmenting it with dynamic content
*
* @author <a href="mailto:ricardo@apache.org">Ricardo Rocha</a>
- * @version CVS $Revision: 1.2 $ $Date: 2001/05/22 14:32:45 $
+ * @version CVS $Revision: 1.3 $ $Date: 2001/07/07 11:43:14 $
*/
public interface MarkupLanguage extends Component {
+
+ String ROLE = "org.apache.cocoon.components.language.markup.MarkupLanguage";
/**
* Return the input document's encoding or <code>null</code> if it is the
* platform's default encoding.
1.26 +5 -6 xml-cocoon2/src/org/apache/cocoon/components/language/markup/sitemap/java/sitemap.xsl
Index: sitemap.xsl
===================================================================
RCS file: /home/cvs/xml-cocoon2/src/org/apache/cocoon/components/language/markup/sitemap/java/sitemap.xsl,v
retrieving revision 1.25
retrieving revision 1.26
diff -u -u -r1.25 -r1.26
--- sitemap.xsl 2001/07/07 03:29:53 1.25
+++ sitemap.xsl 2001/07/07 11:43:16 1.26
@@ -103,7 +103,6 @@
import org.apache.regexp.REProgram;
import org.apache.cocoon.Constants;
- import org.apache.cocoon.Roles;
import org.apache.cocoon.ProcessingException;
import org.apache.cocoon.ResourceNotFoundException;
import org.apache.cocoon.ConnectionResetException;
@@ -128,7 +127,7 @@
*
* @author <a href="mailto:giacomo@apache.org">Giacomo Pati</a>
* @author <a href="mailto:bloritsch@apache.org">Berin Loritsch</a>
- * @version CVS $Id: sitemap.xsl,v 1.25 2001/07/07 03:29:53 vgritsenko Exp $
+ * @version CVS $Id: sitemap.xsl,v 1.26 2001/07/07 11:43:16 giacomo Exp $
*/
public class <xsl:value-of select="@file-name"/> extends AbstractSitemap {
static final String LOCATION = "<xsl:value-of select="translate(@file-path, '/', '.')"/>.<xsl:value-of select="@file-name"/>";
@@ -418,8 +417,8 @@
StreamPipeline pipeline = null;
boolean result = false;
try {
- eventPipeline = (EventPipeline)this.manager.lookup(Roles.EVENT_PIPELINE);
- pipeline = (StreamPipeline)this.manager.lookup(Roles.STREAM_PIPELINE);
+ eventPipeline = (EventPipeline)this.manager.lookup(EventPipeline.ROLE);
+ pipeline = (StreamPipeline)this.manager.lookup(StreamPipeline.ROLE);
pipeline.setEventPipeline(eventPipeline);
result = process (environment, pipeline, eventPipeline, false);
} catch (Exception e) {
@@ -517,8 +516,8 @@
EventPipeline eventPipeline = null;
StreamPipeline pipeline = null;
try {
- eventPipeline = (EventPipeline)this.manager.lookup(Roles.EVENT_PIPELINE);
- pipeline = (StreamPipeline)this.manager.lookup(Roles.STREAM_PIPELINE);
+ eventPipeline = (EventPipeline)this.manager.lookup(EventPipeline.ROLE);
+ pipeline = (StreamPipeline)this.manager.lookup(StreamPipeline.ROLE);
pipeline.setEventPipeline(eventPipeline);
List listOfMaps = (List)(new ArrayList());
Map map;
1.6 +3 -4 xml-cocoon2/src/org/apache/cocoon/components/language/markup/xsp/XSPFormValidatorHelper.java
Index: XSPFormValidatorHelper.java
===================================================================
RCS file: /home/cvs/xml-cocoon2/src/org/apache/cocoon/components/language/markup/xsp/XSPFormValidatorHelper.java,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -u -r1.5 -r1.6
--- XSPFormValidatorHelper.java 2001/07/06 09:59:38 1.5
+++ XSPFormValidatorHelper.java 2001/07/07 11:43:18 1.6
@@ -12,7 +12,6 @@
import java.net.URL;
import org.apache.cocoon.Constants;
-import org.apache.cocoon.Roles;
import org.apache.cocoon.acting.ValidatorActionResult;
import org.apache.cocoon.acting.ConfigurationHelper;
import org.apache.cocoon.components.language.markup.xsp.XSPObjectHelper;
@@ -38,7 +37,7 @@
* The <code>ValidatorActionResult</code> object helper
*
* @author <a href="mailto:haul@informatik.tu-darmstadt.de">Christian Haul</a>
- * @version CVS $Revision: 1.5 $ $Date: 2001/07/06 09:59:38 $
+ * @version CVS $Revision: 1.6 $ $Date: 2001/07/07 11:43:18 $
*/
public class XSPFormValidatorHelper {
/**
@@ -467,8 +466,8 @@
Source source = null;
SourceHandler sourceHandler = null;
try {
- sourceHandler = (SourceHandler) manager.lookup(Roles.SOURCE_HANDLER);
- source = sourceHandler.getSource(null, descriptor);
+ sourceHandler = (SourceHandler) manager.lookup(SourceHandler.ROLE);
+ source = sourceHandler.getSource(null, descriptor);
if (conf == null || ( reloadable && conf.lastModified < source.getLastModified())) {
logger.debug("XSPFormValidatorHelper.getConfiguration: (Re)Loading " + descriptor);
1.6 +1 -2 xml-cocoon2/src/org/apache/cocoon/components/language/markup/xsp/XSPGenerator.java
Index: XSPGenerator.java
===================================================================
RCS file: /home/cvs/xml-cocoon2/src/org/apache/cocoon/components/language/markup/xsp/XSPGenerator.java,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -u -r1.5 -r1.6
--- XSPGenerator.java 2001/07/06 09:59:39 1.5
+++ XSPGenerator.java 2001/07/07 11:43:18 1.6
@@ -12,7 +12,6 @@
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.Roles;
import org.apache.cocoon.components.language.generator.CompiledComponent;
import org.apache.cocoon.generation.AbstractServerPage;
import org.apache.avalon.excalibur.pool.Recyclable;
@@ -21,7 +20,7 @@
* Base class for XSP-generated <code>ServerPagesGenerator</code> classes
*
* @author <a href="mailto:ricardo@apache.org">Ricardo Rocha</a>
- * @version CVS $Revision: 1.5 $ $Date: 2001/07/06 09:59:39 $
+ * @version CVS $Revision: 1.6 $ $Date: 2001/07/07 11:43:18 $
*/
public abstract class XSPGenerator extends AbstractServerPage implements CompiledComponent, Contextualizable, Recyclable {
protected Context avalonContext = null;
1.3 +1 -2 xml-cocoon2/src/org/apache/cocoon/components/language/markup/xsp/XSPUtil.java
Index: XSPUtil.java
===================================================================
RCS file: /home/cvs/xml-cocoon2/src/org/apache/cocoon/components/language/markup/xsp/XSPUtil.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -u -r1.2 -r1.3
--- XSPUtil.java 2001/05/31 17:37:59 1.2
+++ XSPUtil.java 2001/07/07 11:43:18 1.3
@@ -22,7 +22,6 @@
import java.util.Map;
import org.apache.cocoon.Constants;
import org.apache.cocoon.ProcessingException;
-import org.apache.cocoon.Roles;
import org.apache.cocoon.components.parser.Parser;
import org.apache.cocoon.components.url.URLFactory;
import org.apache.cocoon.environment.Context;
@@ -42,7 +41,7 @@
* The XSP <code>Utility</code> object helper
* @author <a href="mailto:ricardo@apache.org">Ricardo Rocha</a>
* @author <a href="mailto:bloritsch@apache.org>Berin Loritsch</a>
- * @version $Revision: 1.2 $ $Date: 2001/05/31 17:37:59 $
+ * @version $Revision: 1.3 $ $Date: 2001/07/07 11:43:18 $
*/
public class XSPUtil {
public static String pathComponent(String filename) {
1.9 +2 -2 xml-cocoon2/src/org/apache/cocoon/components/language/markup/xsp/java/esql.xsl
Index: esql.xsl
===================================================================
RCS file: /home/cvs/xml-cocoon2/src/org/apache/cocoon/components/language/markup/xsp/java/esql.xsl,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -u -r1.8 -r1.9
--- esql.xsl 2001/07/05 04:32:29 1.8
+++ esql.xsl 2001/07/07 11:43:20 1.9
@@ -1,5 +1,5 @@
<?xml version="1.0"?>
-<!-- $Id: esql.xsl,v 1.8 2001/07/05 04:32:29 balld Exp $-->
+<!-- $Id: esql.xsl,v 1.9 2001/07/07 11:43:20 giacomo Exp $-->
<!--
============================================================================
@@ -805,7 +805,7 @@
org.apache.cocoon.components.parser.Parser newParser = null;
try {
- newParser = (org.apache.cocoon.components.parser.Parser) this.manager.lookup(Roles.PARSER);
+ newParser = (org.apache.cocoon.components.parser.Parser) this.manager.lookup(org.apache.cocoon.components.parser.Parser.ROLE);
InputSource __is = new InputSource(
new StringReader(
1.4 +4 -4 xml-cocoon2/src/org/apache/cocoon/components/language/markup/xsp/java/util.xsl
Index: util.xsl
===================================================================
RCS file: /home/cvs/xml-cocoon2/src/org/apache/cocoon/components/language/markup/xsp/java/util.xsl,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -u -r1.3 -r1.4
--- util.xsl 2001/05/23 12:32:17 1.3
+++ util.xsl 2001/07/07 11:43:20 1.4
@@ -137,8 +137,8 @@
org.apache.cocoon.components.url.URLFactory factory = null;
try {
- newParser = (org.apache.cocoon.components.parser.Parser) this.manager.lookup(Roles.PARSER);
- factory = (org.apache.cocoon.components.url.URLFactory) this.manager.lookup(org.apache.cocoon.Roles.URL_FACTORY);
+ newParser = (org.apache.cocoon.components.parser.Parser) this.manager.lookup(org.apache.cocoon.components.parser.Parser.ROLE);
+ factory = (org.apache.cocoon.components.url.URLFactory) this.manager.lookup(org.apache.cocoon.components.url.URLFactory.ROLE);
URL __url = factory.getURL(__name);
InputSource __is = new InputSource(__url.openStream());
__is.setSystemId(__url.toString());
@@ -171,7 +171,7 @@
org.apache.cocoon.components.parser.Parser newParser = null;
try {
- newParser = (org.apache.cocoon.components.parser.Parser) this.manager.lookup(Roles.PARSER);
+ newParser = (org.apache.cocoon.components.parser.Parser) this.manager.lookup(org.apache.cocoon.components.parser.Parser.ROLE);
InputSource __is = new InputSource(
new FileReader(
XSPUtil.relativeFilename(
@@ -208,7 +208,7 @@
org.apache.cocoon.components.parser.Parser newParser = null;
try {
- newParser = (org.apache.cocoon.components.parser.Parser) this.manager.lookup(Roles.PARSER);
+ newParser = (org.apache.cocoon.components.parser.Parser) this.manager.lookup(org.apache.cocoon.components.parser.Parser.ROLE);
InputSource __is = new InputSource(
new StringReader(
String.valueOf(<xsl:copy-of select="$expr"/>)
1.4 +1 -2 xml-cocoon2/src/org/apache/cocoon/components/language/markup/xsp/java/xsp.xsl
Index: xsp.xsl
===================================================================
RCS file: /home/cvs/xml-cocoon2/src/org/apache/cocoon/components/language/markup/xsp/java/xsp.xsl,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -u -r1.3 -r1.4
--- xsp.xsl 2001/06/22 14:11:01 1.3
+++ xsp.xsl 2001/07/07 11:43:20 1.4
@@ -12,7 +12,7 @@
<!--
* @author <a href="mailto:ricardo@apache.org>Ricardo Rocha</a>
* @author <a href="sylvain.wallez@anyware-tech.com">Sylvain Wallez</a>
- * @version CVS $Revision: 1.3 $ $Date: 2001/06/22 14:11:01 $
+ * @version CVS $Revision: 1.4 $ $Date: 2001/07/07 11:43:20 $
-->
<!-- XSP Core logicsheet for the Java language -->
@@ -57,7 +57,6 @@
//import org.apache.avalon.framework.util.*;
import org.apache.cocoon.Constants;
- import org.apache.cocoon.Roles;
import org.apache.cocoon.components.parser.Parser;
import org.apache.cocoon.generation.Generator;
//import org.apache.cocoon.util.*;
1.2 +1 -2 xml-cocoon2/src/org/apache/cocoon/components/language/programming/CompiledProgrammingLanguage.java
Index: CompiledProgrammingLanguage.java
===================================================================
RCS file: /home/cvs/xml-cocoon2/src/org/apache/cocoon/components/language/programming/CompiledProgrammingLanguage.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -u -r1.1 -r1.2
--- CompiledProgrammingLanguage.java 2001/05/09 20:49:56 1.1
+++ CompiledProgrammingLanguage.java 2001/07/07 11:43:21 1.2
@@ -14,7 +14,6 @@
import org.apache.avalon.framework.context.Contextualizable;
import org.apache.avalon.framework.parameters.Parameters;
import org.apache.cocoon.Constants;
-import org.apache.cocoon.Roles;
import org.apache.cocoon.components.language.LanguageException;
import org.apache.cocoon.util.ClassUtils;
import org.apache.cocoon.util.IOUtils;
@@ -23,7 +22,7 @@
* A compiled programming language. This class extends <code>AbstractProgrammingLanguage</code> adding support for compilation
* and object program files
* @author <a href="mailto:ricardo@apache.org">Ricardo Rocha</a>
- * @version CVS $Revision: 1.1 $ $Date: 2001/05/09 20:49:56 $
+ * @version CVS $Revision: 1.2 $ $Date: 2001/07/07 11:43:21 $
*/
public abstract class CompiledProgrammingLanguage extends AbstractProgrammingLanguage implements Contextualizable {
/** The compiler */
1.2 +3 -1 xml-cocoon2/src/org/apache/cocoon/components/language/programming/ProgrammingLanguage.java
Index: ProgrammingLanguage.java
===================================================================
RCS file: /home/cvs/xml-cocoon2/src/org/apache/cocoon/components/language/programming/ProgrammingLanguage.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -u -r1.1 -r1.2
--- ProgrammingLanguage.java 2001/05/09 20:49:56 1.1
+++ ProgrammingLanguage.java 2001/07/07 11:43:22 1.2
@@ -16,9 +16,11 @@
* This interface states the functionality of a programming language processor
*
* @author <a href="mailto:ricardo@apache.org">Ricardo Rocha</a>
- * @version CVS $Revision: 1.1 $ $Date: 2001/05/09 20:49:56 $
+ * @version CVS $Revision: 1.2 $ $Date: 2001/07/07 11:43:22 $
*/
public interface ProgrammingLanguage extends Component {
+
+ String ROLE = "org.apache.cocoon.components.language.programming.ProgrammingLanguage";
/**
* Return the programming language's source file extension
*
1.4 +3 -4 xml-cocoon2/src/org/apache/cocoon/components/language/programming/java/JavaLanguage.java
Index: JavaLanguage.java
===================================================================
RCS file: /home/cvs/xml-cocoon2/src/org/apache/cocoon/components/language/programming/java/JavaLanguage.java,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -u -r1.3 -r1.4
--- JavaLanguage.java 2001/07/02 20:38:10 1.3
+++ JavaLanguage.java 2001/07/07 11:43:22 1.4
@@ -19,7 +19,6 @@
import org.apache.avalon.framework.logger.Loggable;
import org.apache.avalon.framework.parameters.Parameters;
import org.apache.avalon.framework.thread.ThreadSafe;
-import org.apache.cocoon.Roles;
import org.apache.cocoon.components.classloader.ClassLoaderManager;
import org.apache.cocoon.components.language.LanguageException;
import org.apache.cocoon.components.language.generator.CompiledComponent;
@@ -34,7 +33,7 @@
* The Java programming language processor
*
* @author <a href="mailto:ricardo@apache.org">Ricardo Rocha</a>
- * @version CVS $Revision: 1.3 $ $Date: 2001/07/02 20:38:10 $
+ * @version CVS $Revision: 1.4 $ $Date: 2001/07/07 11:43:22 $
*/
public class JavaLanguage extends CompiledProgrammingLanguage implements ThreadSafe, Composable, Disposable {
@@ -98,9 +97,9 @@
this.manager = manager;
if (this.classLoaderManager == null) {
try {
- getLogger().debug("Looking up " + Roles.CLASS_LOADER);
+ getLogger().debug("Looking up " + ClassLoaderManager.ROLE);
this.classLoaderManager =
- (ClassLoaderManager) manager.lookup(Roles.CLASS_LOADER);
+ (ClassLoaderManager) manager.lookup(ClassLoaderManager.ROLE);
} catch (Exception e) {
getLogger().error("Could not find component", e);
}
1.3 +3 -1 xml-cocoon2/src/org/apache/cocoon/components/parser/Parser.java
Index: Parser.java
===================================================================
RCS file: /home/cvs/xml-cocoon2/src/org/apache/cocoon/components/parser/Parser.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -u -r1.2 -r1.3
--- Parser.java 2001/05/29 06:13:46 1.2
+++ Parser.java 2001/07/07 11:43:23 1.3
@@ -21,9 +21,11 @@
*
* @author <a href="mailto:fumagalli@exoffice.com">Pierpaolo Fumagalli</a>
* (Apache Software Foundation, Exoffice Technologies)
- * @version CVS $Revision: 1.2 $ $Date: 2001/05/29 06:13:46 $
+ * @version CVS $Revision: 1.3 $ $Date: 2001/07/07 11:43:23 $
*/
public interface Parser extends Component, XMLProducer, DOMFactory {
+
+ String ROLE = "org.apache.cocoon.components.parser.Parser";
void setContentHandler(ContentHandler contentHandler);
1.11 +6 -7 xml-cocoon2/src/org/apache/cocoon/components/pipeline/AbstractEventPipeline.java
Index: AbstractEventPipeline.java
===================================================================
RCS file: /home/cvs/xml-cocoon2/src/org/apache/cocoon/components/pipeline/AbstractEventPipeline.java,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -u -r1.10 -r1.11
--- AbstractEventPipeline.java 2001/06/22 02:30:41 1.10
+++ AbstractEventPipeline.java 2001/07/07 11:43:23 1.11
@@ -19,7 +19,6 @@
import org.apache.avalon.framework.parameters.Parameters;
import org.apache.cocoon.ProcessingException;
import org.apache.cocoon.Processor;
-import org.apache.cocoon.Roles;
import org.apache.cocoon.components.saxconnector.SAXConnector;
import org.apache.cocoon.components.saxconnector.NullSAXConnector;
import org.apache.cocoon.environment.Environment;
@@ -34,7 +33,7 @@
/**
* @author <a href="mailto:Giacomo.Pati@pwr.ch">Giacomo Pati</a>
* @author <a href="mailto:cziegeler@Carsten Ziegeler">Carsten Ziegeler</a>
- * @version CVS $Revision: 1.10 $ $Date: 2001/06/22 02:30:41 $
+ * @version CVS $Revision: 1.11 $ $Date: 2001/07/07 11:43:23 $
*/
public abstract class AbstractEventPipeline
extends AbstractXMLProducer
@@ -59,12 +58,12 @@
public void compose (ComponentManager manager)
throws ComponentException {
this.manager = manager;
- generatorSelector = (ComponentSelector) this.manager.lookup(Roles.GENERATORS);
- transformerSelector = (ComponentSelector) this.manager.lookup(Roles.TRANSFORMERS);
+ generatorSelector = (ComponentSelector) this.manager.lookup(Generator.ROLE + "Selector");
+ transformerSelector = (ComponentSelector) this.manager.lookup(Transformer.ROLE + "Selector");
Component saxConnector = null;
this.configuredSAXConnector = false;
try {
- saxConnector = this.manager.lookup(Roles.SAX_CONNECTOR);
+ saxConnector = this.manager.lookup(SAXConnector.ROLE);
// FIXME (CZ) remove the NullSAXConnector test when it is an optional
// configuration
this.configuredSAXConnector = !(saxConnector instanceof NullSAXConnector);
@@ -196,7 +195,7 @@
while ( itt.hasNext() ) {
if (this.configuredSAXConnector == true) {
// connect SAXConnector
- SAXConnector connect = (SAXConnector) this.manager.lookup(Roles.SAX_CONNECTOR);
+ SAXConnector connect = (SAXConnector) this.manager.lookup(SAXConnector.ROLE);
connect.setup(environment,environment.getObjectModel(),null,null);
this.connectors.add(connect);
next = connect;
@@ -212,7 +211,7 @@
if (this.configuredSAXConnector == true) {
// insert SAXConnector
- SAXConnector connect = (SAXConnector) this.manager.lookup(Roles.SAX_CONNECTOR);
+ SAXConnector connect = (SAXConnector) this.manager.lookup(SAXConnector.ROLE);
connect.setup(environment,environment.getObjectModel(),null,null);
this.connectors.add(connect);
next = connect;
1.6 +3 -4 xml-cocoon2/src/org/apache/cocoon/components/pipeline/AbstractStreamPipeline.java
Index: AbstractStreamPipeline.java
===================================================================
RCS file: /home/cvs/xml-cocoon2/src/org/apache/cocoon/components/pipeline/AbstractStreamPipeline.java,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -u -r1.5 -r1.6
--- AbstractStreamPipeline.java 2001/06/08 20:28:16 1.5
+++ AbstractStreamPipeline.java 2001/07/07 11:43:23 1.6
@@ -18,7 +18,6 @@
import org.apache.avalon.framework.logger.AbstractLoggable;
import org.apache.avalon.framework.parameters.Parameters;
import org.apache.cocoon.ProcessingException;
-import org.apache.cocoon.Roles;
import org.apache.cocoon.environment.Environment;
import org.apache.cocoon.reading.Reader;
import org.apache.cocoon.serialization.Serializer;
@@ -34,7 +33,7 @@
* resource
* </UL>
* @author <a href="mailto:Giacomo.Pati@pwr.ch">Giacomo Pati</a>
- * @version CVS $Revision: 1.5 $ $Date: 2001/06/08 20:28:16 $
+ * @version CVS $Revision: 1.6 $ $Date: 2001/07/07 11:43:23 $
*/
public abstract class AbstractStreamPipeline extends AbstractLoggable implements StreamPipeline, Disposable {
protected EventPipeline eventPipeline;
@@ -65,8 +64,8 @@
* @throws ComponentException */
public void compose (ComponentManager manager) throws ComponentException {
this.manager = manager;
- readerSelector = (SitemapComponentSelector) this.manager.lookup(Roles.READERS);
- serializerSelector = (SitemapComponentSelector) this.manager.lookup(Roles.SERIALIZERS);
+ readerSelector = (SitemapComponentSelector) this.manager.lookup(Reader.ROLE + "Selector");
+ serializerSelector = (SitemapComponentSelector) this.manager.lookup(Serializer.ROLE + "Selector");
}
public void setEventPipeline (EventPipeline eventPipeline) throws Exception {
1.14 +8 -9 xml-cocoon2/src/org/apache/cocoon/components/pipeline/CachingEventPipeline.java
Index: CachingEventPipeline.java
===================================================================
RCS file: /home/cvs/xml-cocoon2/src/org/apache/cocoon/components/pipeline/CachingEventPipeline.java,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -u -r1.13 -r1.14
--- CachingEventPipeline.java 2001/07/06 13:59:29 1.13
+++ CachingEventPipeline.java 2001/07/07 11:43:23 1.14
@@ -21,17 +21,16 @@
import org.apache.avalon.excalibur.pool.Recyclable;
import org.apache.cocoon.ProcessingException;
import org.apache.cocoon.Processor;
-import org.apache.cocoon.Roles;
import org.apache.cocoon.caching.CacheValidity;
import org.apache.cocoon.caching.Cacheable;
import org.apache.cocoon.caching.CachedEventObject;
import org.apache.cocoon.caching.ComponentCacheKey;
-import org.apache.cocoon.caching.EventCache;
import org.apache.cocoon.caching.PipelineCacheKey;
import org.apache.cocoon.components.sax.XMLDeserializer;
import org.apache.cocoon.components.sax.XMLSerializer;
import org.apache.cocoon.components.sax.XMLTeePipe;
import org.apache.cocoon.components.saxconnector.SAXConnector;
+import org.apache.cocoon.components.store.Store;
import org.apache.cocoon.environment.Environment;
import org.apache.cocoon.generation.Generator;
import org.apache.cocoon.sitemap.ErrorNotifier;
@@ -52,14 +51,14 @@
* does not cache! (If it would cache, the response would be cached twice!)
*
* @author <a href="mailto:cziegeler@apache.org">Carsten Ziegeler</a>
- * @version CVS $Revision: 1.13 $ $Date: 2001/07/06 13:59:29 $
+ * @version CVS $Revision: 1.14 $ $Date: 2001/07/07 11:43:23 $
*/
public class CachingEventPipeline
extends AbstractEventPipeline
implements Disposable, CacheableEventPipeline, Recyclable {
/** The store for the cached sax events */
- private EventCache eventCache;
+ private Store eventCache;
private XMLProducer producer;
private String generatorRole;
@@ -75,7 +74,7 @@
public void compose (ComponentManager manager)
throws ComponentException {
super.compose(manager);
- this.eventCache = (EventCache)this.manager.lookup(Roles.EVENT_CACHE);
+ this.eventCache = (Store)this.manager.lookup(Store.ROLE + "/EventCache");
}
/**
@@ -179,7 +178,7 @@
XMLDeserializer deserializer = null;
try {
- deserializer = (XMLDeserializer)this.manager.lookup(Roles.XML_DESERIALIZER);
+ deserializer = (XMLDeserializer)this.manager.lookup(XMLDeserializer.ROLE);
// connect the pipeline:
this.producer = deserializer;
this.connectPipeline(environment,
@@ -205,7 +204,7 @@
}
if (cachedObject == null) {
getLogger().debug("Caching content for further requests of '" + environment.getURI() + "'.");
- xmlSerializer = (XMLSerializer)this.manager.lookup(Roles.XML_SERIALIZER);
+ xmlSerializer = (XMLSerializer)this.manager.lookup(XMLSerializer.ROLE);
}
}
@@ -320,7 +319,7 @@
while ( itt.hasNext() ) {
if (this.configuredSAXConnector == true) {
// connect SAXConnector
- SAXConnector connect = (SAXConnector) this.manager.lookup(Roles.SAX_CONNECTOR);
+ SAXConnector connect = (SAXConnector) this.manager.lookup(SAXConnector.ROLE);
connect.setup(environment,environment.getObjectModel(),null,null);
this.connectors.add(connect);
next = connect;
@@ -344,7 +343,7 @@
if (this.configuredSAXConnector == true) {
// insert SAXConnector
- SAXConnector connect = (SAXConnector) this.manager.lookup(Roles.SAX_CONNECTOR);
+ SAXConnector connect = (SAXConnector) this.manager.lookup(SAXConnector.ROLE);
connect.setup(environment,environment.getObjectModel(),null,null);
this.connectors.add(connect);
next = connect;
1.7 +4 -5 xml-cocoon2/src/org/apache/cocoon/components/pipeline/CachingStreamPipeline.java
Index: CachingStreamPipeline.java
===================================================================
RCS file: /home/cvs/xml-cocoon2/src/org/apache/cocoon/components/pipeline/CachingStreamPipeline.java,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -u -r1.6 -r1.7
--- CachingStreamPipeline.java 2001/06/14 10:47:36 1.6
+++ CachingStreamPipeline.java 2001/07/07 11:43:23 1.7
@@ -19,14 +19,13 @@
import org.apache.avalon.framework.parameters.Parameters;
import org.apache.cocoon.ProcessingException;
import org.apache.cocoon.ConnectionResetException;
-import org.apache.cocoon.Roles;
import org.apache.cocoon.caching.CacheValidity;
import org.apache.cocoon.caching.Cacheable;
import org.apache.cocoon.caching.CachedStreamObject;
import org.apache.cocoon.caching.CachingOutputStream;
import org.apache.cocoon.caching.ComponentCacheKey;
import org.apache.cocoon.caching.PipelineCacheKey;
-import org.apache.cocoon.caching.StreamCache;
+import org.apache.cocoon.components.store.Store;
import org.apache.cocoon.environment.Environment;
import org.xml.sax.SAXException;
@@ -45,7 +44,7 @@
* </ul>
*
* @author <a href="mailto:cziegeler@apache.org">Carsten Ziegeler</a>
- * @version CVS $Revision: 1.6 $ $Date: 2001/06/14 10:47:36 $
+ * @version CVS $Revision: 1.7 $ $Date: 2001/07/07 11:43:23 $
*/
public class CachingStreamPipeline extends AbstractStreamPipeline {
@@ -56,12 +55,12 @@
private String readerRole;
/** The cache for the responses */
- private StreamCache streamCache;
+ private Store streamCache;
public void compose (ComponentManager manager)
throws ComponentException {
super.compose(manager);
- this.streamCache = (StreamCache)this.manager.lookup(Roles.STREAM_CACHE);
+ this.streamCache = (Store)this.manager.lookup(Store.ROLE + "/StreamCache");
}
public void dispose() {
1.5 +4 -1 xml-cocoon2/src/org/apache/cocoon/components/pipeline/EventPipeline.java
Index: EventPipeline.java
===================================================================
RCS file: /home/cvs/xml-cocoon2/src/org/apache/cocoon/components/pipeline/EventPipeline.java,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -u -r1.4 -r1.5
--- EventPipeline.java 2001/06/21 06:53:04 1.4
+++ EventPipeline.java 2001/07/07 11:43:24 1.5
@@ -18,9 +18,12 @@
/**
* @author <a href="mailto:Giacomo.Pati@pwr.ch">Giacomo Pati</a>
- * @version CVS $Revision: 1.4 $ $Date: 2001/06/21 06:53:04 $
+ * @version CVS $Revision: 1.5 $ $Date: 2001/07/07 11:43:24 $
*/
public interface EventPipeline extends Component, Composable, Recyclable, Processor {
+
+ String ROLE = "org.apache.cocoon.components.pipeline.EventPipeline";
+
void setGenerator (String role, String source, Parameters param, Exception e) throws Exception;
void setGenerator (String role, String source, Parameters param) throws Exception;
Generator getGenerator ();
1.5 +1 -2 xml-cocoon2/src/org/apache/cocoon/components/pipeline/NonCachingEventPipeline.java
Index: NonCachingEventPipeline.java
===================================================================
RCS file: /home/cvs/xml-cocoon2/src/org/apache/cocoon/components/pipeline/NonCachingEventPipeline.java,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -u -r1.4 -r1.5
--- NonCachingEventPipeline.java 2001/05/23 09:40:52 1.4
+++ NonCachingEventPipeline.java 2001/07/07 11:43:24 1.5
@@ -18,7 +18,6 @@
import org.apache.avalon.excalibur.pool.Recyclable;
import org.apache.cocoon.ProcessingException;
import org.apache.cocoon.Processor;
-import org.apache.cocoon.Roles;
import org.apache.cocoon.environment.Environment;
import org.apache.cocoon.generation.Generator;
import org.apache.cocoon.sitemap.ErrorNotifier;
@@ -30,7 +29,7 @@
/**
* @author <a href="mailto:Giacomo.Pati@pwr.ch">Giacomo Pati</a>
- * @version CVS $Revision: 1.4 $ $Date: 2001/05/23 09:40:52 $
+ * @version CVS $Revision: 1.5 $ $Date: 2001/07/07 11:43:24 $
*/
public class NonCachingEventPipeline extends AbstractEventPipeline implements Recyclable {
1.4 +3 -1 xml-cocoon2/src/org/apache/cocoon/components/pipeline/StreamPipeline.java
Index: StreamPipeline.java
===================================================================
RCS file: /home/cvs/xml-cocoon2/src/org/apache/cocoon/components/pipeline/StreamPipeline.java,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -u -r1.3 -r1.4
--- StreamPipeline.java 2001/06/08 20:28:17 1.3
+++ StreamPipeline.java 2001/07/07 11:43:24 1.4
@@ -20,9 +20,11 @@
* <CODE>Serializer</CODE> and let them produce the character stream
* </UL>
* @author <a href="mailto:Giacomo.Pati@pwr.ch">Giacomo Pati</a>
- * @version CVS $Revision: 1.3 $ $Date: 2001/06/08 20:28:17 $
+ * @version CVS $Revision: 1.4 $ $Date: 2001/07/07 11:43:24 $
*/
public interface StreamPipeline extends Component, Composable, Recyclable, Processor {
+
+ String ROLE = "org.apache.cocoon.components.pipeline.StreamPipeline";
void setEventPipeline (EventPipeline eventPipeline) throws Exception;
EventPipeline getEventPipeline ();
1.3 +3 -1 xml-cocoon2/src/org/apache/cocoon/components/sax/XMLDeserializer.java
Index: XMLDeserializer.java
===================================================================
RCS file: /home/cvs/xml-cocoon2/src/org/apache/cocoon/components/sax/XMLDeserializer.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -u -r1.2 -r1.3
--- XMLDeserializer.java 2001/05/31 16:12:43 1.2
+++ XMLDeserializer.java 2001/07/07 11:43:25 1.3
@@ -22,10 +22,12 @@
* the serialized data.
*
* @author <a href="mailto:cziegeler@apache.org">Carsten Ziegeler</a>
- * @version CVS $Revision: 1.2 $ $Date: 2001/05/31 16:12:43 $
+ * @version CVS $Revision: 1.3 $ $Date: 2001/07/07 11:43:25 $
*/
public interface XMLDeserializer
extends XMLProducer {
+
+ String ROLE = "org.apache.cocoon.components.sax.XMLDeserializer";
/**
* Deserialize the xml data and stream it.
1.3 +3 -2 xml-cocoon2/src/org/apache/cocoon/components/sax/XMLSerializer.java
Index: XMLSerializer.java
===================================================================
RCS file: /home/cvs/xml-cocoon2/src/org/apache/cocoon/components/sax/XMLSerializer.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -u -r1.2 -r1.3
--- XMLSerializer.java 2001/05/31 16:12:44 1.2
+++ XMLSerializer.java 2001/07/07 11:43:25 1.3
@@ -10,17 +10,18 @@
import org.apache.cocoon.xml.XMLConsumer;
/**
- * This interfaces identifies classes that serialize XML data, receiving
+ * This interfaces identifies classes that serialize XML data, receiving
* notification of SAX events.
* <br>
* It's beyond the scope of this interface to specify the format for
* the serialized data.
*
* @author <a href="mailto:cziegeler@apache.org">Carsten Ziegeler</a>
- * @version CVS $Revision: 1.2 $ $Date: 2001/05/31 16:12:44 $
+ * @version CVS $Revision: 1.3 $ $Date: 2001/07/07 11:43:25 $
*/
public interface XMLSerializer extends XMLConsumer {
+ String ROLE = "org.apache.cocoon.components.sax.XMLSerializer";
/**
* Get the serialized xml data
*
1.3 +3 -1 xml-cocoon2/src/org/apache/cocoon/components/saxconnector/SAXConnector.java
Index: SAXConnector.java
===================================================================
RCS file: /home/cvs/xml-cocoon2/src/org/apache/cocoon/components/saxconnector/SAXConnector.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -u -r1.2 -r1.3
--- SAXConnector.java 2001/06/21 06:53:12 1.2
+++ SAXConnector.java 2001/07/07 11:43:26 1.3
@@ -14,7 +14,9 @@
/**
* Provides a connection between SAX components.
* @author <a href="mailto:prussell@apache.org">Paul Russell</a>
- * @version CVS $Revision: 1.2 $ $Date: 2001/06/21 06:53:12 $
+ * @version CVS $Revision: 1.3 $ $Date: 2001/07/07 11:43:26 $
*/
public interface SAXConnector extends XMLPipe, Component, SitemapModelComponent {
+
+ String ROLE = "org.apache.cocoon.components.saxconnector.SAXConnector";
}
1.6 +6 -7 xml-cocoon2/src/org/apache/cocoon/components/source/SitemapSource.java
Index: SitemapSource.java
===================================================================
RCS file: /home/cvs/xml-cocoon2/src/org/apache/cocoon/components/source/SitemapSource.java,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -u -r1.5 -r1.6
--- SitemapSource.java 2001/07/06 09:59:41 1.5
+++ SitemapSource.java 2001/07/07 11:43:26 1.6
@@ -23,7 +23,6 @@
import org.apache.avalon.framework.component.ComponentManager;
import org.apache.cocoon.Constants;
import org.apache.cocoon.ProcessingException;
-import org.apache.cocoon.Roles;
import org.apache.cocoon.components.pipeline.EventPipeline;
import org.apache.cocoon.components.pipeline.StreamPipeline;
import org.apache.cocoon.environment.Environment;
@@ -43,7 +42,7 @@
* Description of a source which is defined by a pipeline.
*
* @author <a href="mailto:cziegeler@apache.org">Carsten Ziegeler</a>
- * @version CVS $Revision: 1.5 $ $Date: 2001/07/06 09:59:41 $
+ * @version CVS $Revision: 1.6 $ $Date: 2001/07/07 11:43:26 $
*/
public final class SitemapSource
@@ -134,9 +133,9 @@
Serializer serializer = null;
try {
- eventPipeline = (EventPipeline)this.manager.lookup(Roles.EVENT_PIPELINE);
- pipeline = (StreamPipeline)this.manager.lookup(Roles.STREAM_PIPELINE);
- serializerSelector = (SitemapComponentSelector) this.manager.lookup(Roles.SERIALIZERS);
+ eventPipeline = (EventPipeline)this.manager.lookup(EventPipeline.ROLE);
+ pipeline = (StreamPipeline)this.manager.lookup(StreamPipeline.ROLE);
+ serializerSelector = (SitemapComponentSelector) this.manager.lookup(Serializer.ROLE + "Selector");
serializer = (Serializer)serializerSelector.select("xml");
ByteArrayOutputStream os = new ByteArrayOutputStream();
serializer.setOutputStream(os);
@@ -217,8 +216,8 @@
StreamPipeline pipeline = null;
try {
- eventPipeline = (EventPipeline)this.manager.lookup(Roles.EVENT_PIPELINE);
- pipeline = (StreamPipeline)this.manager.lookup(Roles.STREAM_PIPELINE);
+ eventPipeline = (EventPipeline)this.manager.lookup(EventPipeline.ROLE);
+ pipeline = (StreamPipeline)this.manager.lookup(StreamPipeline.ROLE);
pipeline.setEventPipeline(eventPipeline);
1.4 +3 -1 xml-cocoon2/src/org/apache/cocoon/components/source/SourceHandler.java
Index: SourceHandler.java
===================================================================
RCS file: /home/cvs/xml-cocoon2/src/org/apache/cocoon/components/source/SourceHandler.java,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -u -r1.3 -r1.4
--- SourceHandler.java 2001/07/04 10:13:21 1.3
+++ SourceHandler.java 2001/07/07 11:43:27 1.4
@@ -17,9 +17,11 @@
/**
* @author <a href="mailto:cziegeler@apache.org">Carsten Ziegeler</a>
- * @version $Id: SourceHandler.java,v 1.3 2001/07/04 10:13:21 cziegeler Exp $
+ * @version $Id: SourceHandler.java,v 1.4 2001/07/07 11:43:27 giacomo Exp $
*/
public interface SourceHandler extends Component {
+
+ String ROLE = "org.apache.cocoon.components.source.SourceHandler";
/**
* Get a <code>Source</code> object.
1.3 +2 -3 xml-cocoon2/src/org/apache/cocoon/components/source/SourceHandlerImpl.java
Index: SourceHandlerImpl.java
===================================================================
RCS file: /home/cvs/xml-cocoon2/src/org/apache/cocoon/components/source/SourceHandlerImpl.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -u -r1.2 -r1.3
--- SourceHandlerImpl.java 2001/07/04 07:57:00 1.2
+++ SourceHandlerImpl.java 2001/07/07 11:43:27 1.3
@@ -28,7 +28,6 @@
import org.apache.avalon.framework.logger.Loggable;
import org.apache.avalon.framework.thread.ThreadSafe;
import org.apache.cocoon.ProcessingException;
-import org.apache.cocoon.Roles;
import org.apache.cocoon.components.source.URLSource;
import org.apache.cocoon.components.url.URLFactory;
import org.apache.cocoon.environment.Environment;
@@ -37,7 +36,7 @@
/**
* @author <a href="mailto:cziegeler@apache.org">Carsten Ziegeler</a>
- * @version $Id: SourceHandlerImpl.java,v 1.2 2001/07/04 07:57:00 cziegeler Exp $
+ * @version $Id: SourceHandlerImpl.java,v 1.3 2001/07/07 11:43:27 giacomo Exp $
*/
public final class SourceHandlerImpl
extends AbstractLoggable
@@ -101,7 +100,7 @@
public void compose(ComponentManager manager)
throws ComponentException {
this.manager = manager;
- this.urlFactory = (URLFactory)this.manager.lookup(Roles.URL_FACTORY);
+ this.urlFactory = (URLFactory)this.manager.lookup(URLFactory.ROLE);
}
/**
1.4 +3 -4 xml-cocoon2/src/org/apache/cocoon/components/source/URLSource.java
Index: URLSource.java
===================================================================
RCS file: /home/cvs/xml-cocoon2/src/org/apache/cocoon/components/source/URLSource.java,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -u -r1.3 -r1.4
--- URLSource.java 2001/07/06 09:59:42 1.3
+++ URLSource.java 2001/07/07 11:43:27 1.4
@@ -20,7 +20,6 @@
import org.apache.avalon.framework.component.ComponentException;
import org.apache.avalon.framework.component.ComponentManager;
import org.apache.cocoon.ProcessingException;
-import org.apache.cocoon.Roles;
import org.apache.cocoon.components.parser.Parser;
import org.apache.cocoon.environment.Source;
import org.apache.cocoon.xml.XMLConsumer;
@@ -32,7 +31,7 @@
* Description of a source which is described by an URL.
*
* @author <a href="mailto:cziegeler@apache.org">Carsten Ziegeler</a>
- * @version CVS $Revision: 1.3 $ $Date: 2001/07/06 09:59:42 $
+ * @version CVS $Revision: 1.4 $ $Date: 2001/07/07 11:43:27 $
*/
public final class URLSource
@@ -278,7 +277,7 @@
throws ProcessingException, SAXException, IOException {
Parser parser = null;
try {
- parser = (Parser)this.manager.lookup(Roles.PARSER);
+ parser = (Parser)this.manager.lookup(Parser.ROLE);
parser.setConsumer(consumer);
parser.parse(this.getInputSource());
@@ -296,7 +295,7 @@
throws ProcessingException, SAXException, IOException {
Parser parser = null;
try {
- parser = (Parser)this.manager.lookup(Roles.PARSER);
+ parser = (Parser)this.manager.lookup(Parser.ROLE);
parser.setContentHandler(contentHandler);
parser.parse(this.getInputSource());
1.2 +3 -1 xml-cocoon2/src/org/apache/cocoon/components/store/Store.java
Index: Store.java
===================================================================
RCS file: /home/cvs/xml-cocoon2/src/org/apache/cocoon/components/store/Store.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -u -r1.1 -r1.2
--- Store.java 2001/05/09 20:50:01 1.1
+++ Store.java 2001/07/07 11:43:29 1.2
@@ -19,9 +19,11 @@
* (Apache Software Foundation)
* @author <a href="mailto:fumagalli@exoffice.com">Pierpaolo Fumagalli</a>
* (Apache Software Foundation, Exoffice Technologies)
- * @version CVS $Revision: 1.1 $ $Date: 2001/05/09 20:50:01 $
+ * @version CVS $Revision: 1.2 $ $Date: 2001/07/07 11:43:29 $
*/
public interface Store extends Component {
+
+ String ROLE = "org.apache.cocoon.components.store.Store";
/**
* Get the object associated to the given unique key.
1.2 +2 -1 xml-cocoon2/src/org/apache/cocoon/components/url/URLFactory.java
Index: URLFactory.java
===================================================================
RCS file: /home/cvs/xml-cocoon2/src/org/apache/cocoon/components/url/URLFactory.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -u -r1.1 -r1.2
--- URLFactory.java 2001/05/09 20:50:02 1.1
+++ URLFactory.java 2001/07/07 11:43:29 1.2
@@ -13,10 +13,11 @@
/**
* @author <a href="mailto:giacomo@apache.org">Giacomo Pati</a>
- * @version $Id: URLFactory.java,v 1.1 2001/05/09 20:50:02 giacomo Exp $
+ * @version $Id: URLFactory.java,v 1.2 2001/07/07 11:43:29 giacomo Exp $
*/
public interface URLFactory extends ThreadSafe {
+ String ROLE = "org.apache.cocoon.components.url.URLFactory";
/**
* Get an URL
*/
1.7 +1 -2 xml-cocoon2/src/org/apache/cocoon/generation/DirectoryGenerator.java
Index: DirectoryGenerator.java
===================================================================
RCS file: /home/cvs/xml-cocoon2/src/org/apache/cocoon/generation/DirectoryGenerator.java,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -u -r1.6 -r1.7
--- DirectoryGenerator.java 2001/05/31 17:38:19 1.6
+++ DirectoryGenerator.java 2001/07/07 11:43:29 1.7
@@ -19,7 +19,6 @@
import org.apache.avalon.framework.parameters.Parameters;
import org.apache.cocoon.ProcessingException;
import org.apache.cocoon.ResourceNotFoundException;
-import org.apache.cocoon.Roles;
import org.apache.cocoon.environment.Source;
import org.apache.cocoon.environment.SourceResolver;
import org.apache.avalon.excalibur.pool.Recyclable;
@@ -63,7 +62,7 @@
* (Apache Software Foundation, Exoffice Technologies)
* @author <a href="mailto:conny@smb-tec.com">Conny Krappatsch</a>
* (SMB GmbH) for Virbus AG
- * @version CVS $Revision: 1.6 $ $Date: 2001/05/31 17:38:19 $ */
+ * @version CVS $Revision: 1.7 $ $Date: 2001/07/07 11:43:29 $ */
public class DirectoryGenerator extends ComposerGenerator implements Recyclable {
1.16 +1 -2 xml-cocoon2/src/org/apache/cocoon/generation/FileGenerator.java
Index: FileGenerator.java
===================================================================
RCS file: /home/cvs/xml-cocoon2/src/org/apache/cocoon/generation/FileGenerator.java,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -u -r1.15 -r1.16
--- FileGenerator.java 2001/07/06 09:59:47 1.15
+++ FileGenerator.java 2001/07/07 11:43:29 1.16
@@ -18,7 +18,6 @@
import org.apache.avalon.excalibur.pool.Poolable;
import org.apache.cocoon.ProcessingException;
import org.apache.cocoon.ResourceNotFoundException;
-import org.apache.cocoon.Roles;
import org.apache.cocoon.caching.CacheValidity;
import org.apache.cocoon.caching.Cacheable;
import org.apache.cocoon.caching.TimeStampCacheValidity;
@@ -38,7 +37,7 @@
* @author <a href="mailto:fumagalli@exoffice.com">Pierpaolo Fumagalli</a>
* (Apache Software Foundation, Exoffice Technologies)
* @author <a href="mailto:cziegeler@apache.org">Carsten Ziegeler</a>
- * @version CVS $Revision: 1.15 $ $Date: 2001/07/06 09:59:47 $
+ * @version CVS $Revision: 1.16 $ $Date: 2001/07/07 11:43:29 $
*/
public class FileGenerator extends ComposerGenerator
implements Cacheable, Recyclable {
1.2 +3 -1 xml-cocoon2/src/org/apache/cocoon/generation/Generator.java
Index: Generator.java
===================================================================
RCS file: /home/cvs/xml-cocoon2/src/org/apache/cocoon/generation/Generator.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -u -r1.1 -r1.2
--- Generator.java 2001/05/09 20:49:41 1.1
+++ Generator.java 2001/07/07 11:43:30 1.2
@@ -17,9 +17,11 @@
*
* @author <a href="mailto:fumagalli@exoffice.com">Pierpaolo Fumagalli</a>
* (Apache Software Foundation, Exoffice Technologies)
- * @version CVS $Revision: 1.1 $ $Date: 2001/05/09 20:49:41 $
+ * @version CVS $Revision: 1.2 $ $Date: 2001/07/07 11:43:30 $
*/
public interface Generator extends XMLProducer, SitemapModelComponent {
+
+ String ROLE = "org.apache.cocoon.generation.Generator";
void generate()
throws IOException, SAXException, ProcessingException;
1.6 +1 -2 xml-cocoon2/src/org/apache/cocoon/generation/HTMLGenerator.java
Index: HTMLGenerator.java
===================================================================
RCS file: /home/cvs/xml-cocoon2/src/org/apache/cocoon/generation/HTMLGenerator.java,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -u -r1.5 -r1.6
--- HTMLGenerator.java 2001/07/06 09:59:47 1.5
+++ HTMLGenerator.java 2001/07/07 11:43:30 1.6
@@ -21,7 +21,6 @@
import org.apache.avalon.excalibur.pool.Poolable;
import org.apache.cocoon.ProcessingException;
import org.apache.cocoon.ResourceNotFoundException;
-import org.apache.cocoon.Roles;
import org.apache.cocoon.caching.Cacheable;
import org.apache.cocoon.caching.CacheValidity;
import org.apache.cocoon.caching.TimeStampCacheValidity;
@@ -35,7 +34,7 @@
/**
* @author <a href="mailto:dims@yahoo.com">Davanum Srinivas</a>
* @author <a href="mailto:cziegeler@apache.org">Carsten Ziegeler</a>
- * @version CVS $Revision: 1.5 $ $Date: 2001/07/06 09:59:47 $
+ * @version CVS $Revision: 1.6 $ $Date: 2001/07/07 11:43:30 $
*/
public class HTMLGenerator extends ComposerGenerator implements Cacheable, Recyclable {
1.8 +2 -3 xml-cocoon2/src/org/apache/cocoon/generation/JspGenerator.java
Index: JspGenerator.java
===================================================================
RCS file: /home/cvs/xml-cocoon2/src/org/apache/cocoon/generation/JspGenerator.java,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -u -r1.7 -r1.8
--- JspGenerator.java 2001/06/19 07:41:53 1.7
+++ JspGenerator.java 2001/07/07 11:43:30 1.8
@@ -32,7 +32,6 @@
import org.apache.avalon.framework.component.ComponentManager;
import org.apache.avalon.framework.logger.AbstractLoggable;
import org.apache.cocoon.ProcessingException;
-import org.apache.cocoon.Roles;
import org.apache.cocoon.components.parser.Parser;
import org.apache.cocoon.environment.http.HttpEnvironment;
import org.apache.cocoon.xml.AbstractXMLProducer;
@@ -48,7 +47,7 @@
* results into SAX events.
*
* @author <a href="mailto:dims@yahoo.com">Davanum Srinivas</a>
- * @version CVS $Revision: 1.7 $ $Date: 2001/06/19 07:41:53 $
+ * @version CVS $Revision: 1.8 $ $Date: 2001/07/07 11:43:30 $
*/
public class JspGenerator extends ServletGenerator implements Recyclable {
@@ -83,7 +82,7 @@
ByteArrayInputStream input = new ByteArrayInputStream(bytes);
// pipe the results into the parser
- parser = (Parser)this.manager.lookup(Roles.PARSER);
+ parser = (Parser)this.manager.lookup(Parser.ROLE);
parser.setConsumer(this.xmlConsumer);
parser.parse(new InputSource(input));
1.7 +2 -3 xml-cocoon2/src/org/apache/cocoon/generation/PhpGenerator.java
Index: PhpGenerator.java
===================================================================
RCS file: /home/cvs/xml-cocoon2/src/org/apache/cocoon/generation/PhpGenerator.java,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -u -r1.6 -r1.7
--- PhpGenerator.java 2001/05/31 17:38:21 1.6
+++ PhpGenerator.java 2001/07/07 11:43:30 1.7
@@ -23,7 +23,6 @@
import org.apache.avalon.framework.component.ComponentManager;
import org.apache.avalon.framework.logger.AbstractLoggable;
import org.apache.cocoon.ProcessingException;
-import org.apache.cocoon.Roles;
import org.apache.cocoon.components.parser.Parser;
import org.apache.cocoon.environment.http.HttpEnvironment;
import org.apache.cocoon.environment.Source;
@@ -40,7 +39,7 @@
* results into SAX events.
*
* @author <a href="mailto:rubys@us.ibm.com">Sam Ruby</a>
- * @version CVS $Revision: 1.6 $ $Date: 2001/05/31 17:38:21 $
+ * @version CVS $Revision: 1.7 $ $Date: 2001/07/07 11:43:30 $
*/
public class PhpGenerator extends ServletGenerator implements Recyclable {
@@ -152,7 +151,7 @@
new Thread(php).start();
// pipe the results into the parser
- parser = (Parser)this.manager.lookup(Roles.PARSER);
+ parser = (Parser)this.manager.lookup(Parser.ROLE);
parser.setConsumer(this.xmlConsumer);
parser.parse(new InputSource(input));
1.8 +2 -3 xml-cocoon2/src/org/apache/cocoon/generation/ScriptGenerator.java
Index: ScriptGenerator.java
===================================================================
RCS file: /home/cvs/xml-cocoon2/src/org/apache/cocoon/generation/ScriptGenerator.java,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -u -r1.7 -r1.8
--- ScriptGenerator.java 2001/05/31 17:38:23 1.7
+++ ScriptGenerator.java 2001/07/07 11:43:30 1.8
@@ -21,7 +21,6 @@
import org.apache.avalon.framework.configuration.ConfigurationException;
import org.apache.avalon.excalibur.pool.Recyclable;
import org.apache.cocoon.ProcessingException;
-import org.apache.cocoon.Roles;
import org.apache.cocoon.components.parser.Parser;
import org.apache.cocoon.environment.Source;
import org.apache.cocoon.environment.SourceResolver;
@@ -48,7 +47,7 @@
* </pre>
*
* @author <a href="mailto:jafoster@engmail.uwaterloo.ca">Jason Foster</a>
- * @version CVS $Revision: 1.7 $ $Date: 2001/05/31 17:38:23 $
+ * @version CVS $Revision: 1.8 $ $Date: 2001/07/07 11:43:30 $
*/
public class ScriptGenerator extends ComposerGenerator implements Configurable,
Recyclable {
@@ -163,7 +162,7 @@
InputSource xmlInput =
new InputSource(new StringReader(output.toString()));
- parser = (Parser)(this.manager.lookup(Roles.PARSER));
+ parser = (Parser)(this.manager.lookup(Parser.ROLE));
parser.setConsumer(this.xmlConsumer);
parser.parse(xmlInput);
} catch (FileNotFoundException e) {
1.11 +3 -4 xml-cocoon2/src/org/apache/cocoon/generation/ServerPagesGenerator.java
Index: ServerPagesGenerator.java
===================================================================
RCS file: /home/cvs/xml-cocoon2/src/org/apache/cocoon/generation/ServerPagesGenerator.java,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -u -r1.10 -r1.11
--- ServerPagesGenerator.java 2001/07/02 20:50:43 1.10
+++ ServerPagesGenerator.java 2001/07/07 11:43:30 1.11
@@ -23,7 +23,6 @@
import org.apache.avalon.excalibur.pool.Poolable;
import org.apache.cocoon.ProcessingException;
import org.apache.cocoon.ResourceNotFoundException;
-import org.apache.cocoon.Roles;
import org.apache.cocoon.caching.Cacheable;
import org.apache.cocoon.caching.CacheValidity;
import org.apache.cocoon.caching.ParametersCacheValidity;
@@ -48,7 +47,7 @@
* delegating actual SAX event generation.
*
* @author <a href="mailto:ricardo@apache.org">Ricardo Rocha</a>
- * @version CVS $Revision: 1.10 $ $Date: 2001/07/02 20:50:43 $
+ * @version CVS $Revision: 1.11 $ $Date: 2001/07/07 11:43:30 $
*/
public class ServerPagesGenerator
extends ServletGenerator
@@ -74,10 +73,10 @@
super.compose(manager);
if (programGenerator == null) {
- getLogger().debug("Looking up " + Roles.PROGRAM_GENERATOR);
+ getLogger().debug("Looking up " + ProgramGenerator.ROLE);
try {
this.programGenerator = (ProgramGenerator)
- manager.lookup(Roles.PROGRAM_GENERATOR);
+ manager.lookup(ProgramGenerator.ROLE);
} catch (Exception e) {
getLogger().error("Could not find ProgramGenerator", e);
}
1.3 +2 -3 xml-cocoon2/src/org/apache/cocoon/generation/StreamGenerator.java
Index: StreamGenerator.java
===================================================================
RCS file: /home/cvs/xml-cocoon2/src/org/apache/cocoon/generation/StreamGenerator.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -u -r1.2 -r1.3
--- StreamGenerator.java 2001/06/12 17:20:41 1.2
+++ StreamGenerator.java 2001/07/07 11:43:30 1.3
@@ -14,7 +14,6 @@
import org.apache.cocoon.Constants;
import org.apache.cocoon.ProcessingException;
import org.apache.cocoon.ResourceNotFoundException;
-import org.apache.cocoon.Roles;
import org.apache.cocoon.components.parser.Parser;
import org.apache.cocoon.environment.http.HttpRequest;
import org.apache.cocoon.environment.Source;
@@ -49,7 +48,7 @@
* number of bytes read is equal to the getContentLength() value.
*
* @author <a href="mailto:Kinga_Dziembowski@hp.com">Kinga Dziembowski</a>
- * @version $Revision: 1.2 $ $Date: 2001/06/12 17:20:41 $
+ * @version $Revision: 1.3 $ $Date: 2001/07/07 11:43:30 $
*/
public class StreamGenerator extends ComposerGenerator {
public static final String CLASS = StreamGenerator.class.getName();
@@ -104,7 +103,7 @@
if (getLogger().isDebugEnabled()) {
getLogger().debug("processing stream ContentType= " + request.getContentType() + "ContentLen= " + len);
}
- parser = (Parser)this.manager.lookup(Roles.PARSER);
+ parser = (Parser)this.manager.lookup(Parser.ROLE);
parser.setContentHandler(super.contentHandler);
parser.setLexicalHandler(super.lexicalHandler);
parser.parse(this.inputSource);
1.5 +2 -3 xml-cocoon2/src/org/apache/cocoon/generation/VelocityGenerator.java
Index: VelocityGenerator.java
===================================================================
RCS file: /home/cvs/xml-cocoon2/src/org/apache/cocoon/generation/VelocityGenerator.java,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -u -r1.4 -r1.5
--- VelocityGenerator.java 2001/05/31 17:38:24 1.4
+++ VelocityGenerator.java 2001/07/07 11:43:30 1.5
@@ -16,7 +16,6 @@
import org.apache.avalon.framework.component.ComponentException;
import org.apache.cocoon.ProcessingException;
import org.apache.cocoon.ResourceNotFoundException;
-import org.apache.cocoon.Roles;
import org.apache.cocoon.components.parser.Parser;
import org.apache.avalon.excalibur.pool.Recyclable;
import org.apache.velocity.VelocityContext;
@@ -26,7 +25,7 @@
/**
* @author <a href="mailto:dims@yahoo.com">Davanum Srinivas</a>
- * @version CVS $Revision: 1.4 $ $Date: 2001/05/31 17:38:24 $
+ * @version CVS $Revision: 1.5 $ $Date: 2001/07/07 11:43:30 $
*/
public class VelocityGenerator extends ServletGenerator implements Recyclable {
@@ -41,7 +40,7 @@
Parser parser = null;
try
{
- parser = (Parser)(this.manager.lookup(Roles.PARSER));
+ parser = (Parser)(this.manager.lookup(Parser.ROLE));
getLogger().debug("Processing File :" + super.source);
/* first, we init the runtime engine. Defaults are fine. */
1.3 +4 -1 xml-cocoon2/src/org/apache/cocoon/matching/Matcher.java
Index: Matcher.java
===================================================================
RCS file: /home/cvs/xml-cocoon2/src/org/apache/cocoon/matching/Matcher.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -u -r1.2 -r1.3
--- Matcher.java 2001/05/18 14:16:30 1.2
+++ Matcher.java 2001/07/07 11:43:32 1.3
@@ -14,9 +14,12 @@
/**
*
* @author <a href="mailto:Giacomo.Pati@pwr.ch">Giacomo Pati</a>
- * @version CVS $Revision: 1.2 $ $Date: 2001/05/18 14:16:30 $
+ * @version CVS $Revision: 1.3 $ $Date: 2001/07/07 11:43:32 $
*/
public interface Matcher extends Component {
+
+ String ROLE = "org.apache.cocoon.matching.Matcher";
+
/**
* Matches the pattern against some <code>Request</code> values
* and returns a <code>Map</code> object with replacements
1.3 +2 -2 xml-cocoon2/src/org/apache/cocoon/reading/DatabaseReader.java
Index: DatabaseReader.java
===================================================================
RCS file: /home/cvs/xml-cocoon2/src/org/apache/cocoon/reading/DatabaseReader.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -u -r1.2 -r1.3
--- DatabaseReader.java 2001/05/22 14:43:41 1.2
+++ DatabaseReader.java 2001/07/07 11:43:33 1.3
@@ -33,7 +33,6 @@
import org.apache.cocoon.Constants;
import org.apache.cocoon.ProcessingException;
import org.apache.cocoon.ResourceNotFoundException;
-import org.apache.cocoon.Roles;
import org.apache.cocoon.environment.Request;
import org.apache.cocoon.environment.Response;
import org.apache.cocoon.environment.SourceResolver;
@@ -69,7 +68,8 @@
*/
public void compose(ComponentManager manager) throws ComponentException {
this.manager = manager;
- this.dbselector = (ComponentSelector) manager.lookup(Roles.DB_CONNECTION);
+ //this.dbselector = (ComponentSelector) manager.lookup(DataSourceComponent.ROLE + "Selector");
+ this.dbselector = (ComponentSelector) manager.lookup(org.apache.cocoon.Roles.DB_CONNECTION);
}
/**
1.2 +2 -1 xml-cocoon2/src/org/apache/cocoon/reading/Reader.java
Index: Reader.java
===================================================================
RCS file: /home/cvs/xml-cocoon2/src/org/apache/cocoon/reading/Reader.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -u -r1.1 -r1.2
--- Reader.java 2001/05/09 20:49:39 1.1
+++ Reader.java 2001/07/07 11:43:33 1.2
@@ -16,10 +16,11 @@
/**
*
* @author <a href="mailto:Giacomo.Pati@pwr.ch">Giacomo Pati</a>
- * @version CVS $Revision: 1.1 $ $Date: 2001/05/09 20:49:39 $
+ * @version CVS $Revision: 1.2 $ $Date: 2001/07/07 11:43:33 $
*/
public interface Reader extends SitemapModelComponent, SitemapOutputComponent {
+ String ROLE = "org.apache.cocoon.reading.Reader";
/**
* Generate the response.
* @return The length of the response or <code>0</code> if the length
1.4 +1 -2 xml-cocoon2/src/org/apache/cocoon/reading/ResourceReader.java
Index: ResourceReader.java
===================================================================
RCS file: /home/cvs/xml-cocoon2/src/org/apache/cocoon/reading/ResourceReader.java,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -u -r1.3 -r1.4
--- ResourceReader.java 2001/05/31 17:38:37 1.3
+++ ResourceReader.java 2001/07/07 11:43:33 1.4
@@ -28,7 +28,6 @@
import org.apache.cocoon.Constants;
import org.apache.cocoon.ProcessingException;
import org.apache.cocoon.ResourceNotFoundException;
-import org.apache.cocoon.Roles;
import org.apache.cocoon.caching.CacheValidity;
import org.apache.cocoon.caching.Cacheable;
import org.apache.cocoon.caching.TimeStampCacheValidity;
@@ -43,7 +42,7 @@
/**
*
* @author <a href="mailto:Giacomo.Pati@pwr.ch">Giacomo Pati</a>
- * @version CVS $Revision: 1.3 $ $Date: 2001/05/31 17:38:37 $
+ * @version CVS $Revision: 1.4 $ $Date: 2001/07/07 11:43:33 $
*
* The <code>ResourceReader</code> component is used to serve binary data
* in a sitemap pipeline. It makes use of HTTP Headers to determine if
1.2 +3 -1 xml-cocoon2/src/org/apache/cocoon/selection/Selector.java
Index: Selector.java
===================================================================
RCS file: /home/cvs/xml-cocoon2/src/org/apache/cocoon/selection/Selector.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -u -r1.1 -r1.2
--- Selector.java 2001/05/09 20:49:28 1.1
+++ Selector.java 2001/07/07 11:43:33 1.2
@@ -15,9 +15,11 @@
*
* @author <a href="mailto:Giacomo.Pati@pwr.ch">Giacomo Pati</a>
* @author <a href="mailto:leo.sutic">Leo Sutic</a>
- * @version CVS $Revision: 1.1 $ $Date: 2001/05/09 20:49:28 $
+ * @version CVS $Revision: 1.2 $ $Date: 2001/07/07 11:43:33 $
*/
public interface Selector extends Component {
+
+ String ROLE = "org.apache.cocoon.selection.Selector";
/**
* Selectors test pattern against some objects in a <code>Map</code>
* model and signals success with the returned boolean value
1.2 +3 -1 xml-cocoon2/src/org/apache/cocoon/serialization/Serializer.java
Index: Serializer.java
===================================================================
RCS file: /home/cvs/xml-cocoon2/src/org/apache/cocoon/serialization/Serializer.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -u -r1.1 -r1.2
--- Serializer.java 2001/05/09 20:49:38 1.1
+++ Serializer.java 2001/07/07 11:43:33 1.2
@@ -14,7 +14,9 @@
*
* @author <a href="mailto:fumagalli@exoffice.com">Pierpaolo Fumagalli</a>
* (Apache Software Foundation, Exoffice Technologies)
- * @version CVS $Revision: 1.1 $ $Date: 2001/05/09 20:49:38 $
+ * @version CVS $Revision: 1.2 $ $Date: 2001/07/07 11:43:33 $
*/
public interface Serializer extends XMLConsumer, SitemapOutputComponent {
+
+ String ROLE = "org.apache.cocoon.serialization.Serializer";
}
1.14 +23 -17 xml-cocoon2/src/org/apache/cocoon/sitemap/AbstractSitemap.java
Index: AbstractSitemap.java
===================================================================
RCS file: /home/cvs/xml-cocoon2/src/org/apache/cocoon/sitemap/AbstractSitemap.java,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -u -r1.13 -r1.14
--- AbstractSitemap.java 2001/07/02 14:31:10 1.13
+++ AbstractSitemap.java 2001/07/07 11:43:34 1.14
@@ -28,12 +28,18 @@
import org.apache.avalon.framework.context.Contextualizable;
import org.apache.avalon.framework.logger.AbstractLoggable;
import org.apache.avalon.framework.thread.ThreadSafe;
-import org.apache.cocoon.Roles;
+import org.apache.cocoon.acting.Action;
import org.apache.cocoon.components.classloader.RepositoryClassLoader;
import org.apache.cocoon.components.pipeline.EventPipeline;
import org.apache.cocoon.components.pipeline.StreamPipeline;
import org.apache.cocoon.components.url.URLFactory;
import org.apache.cocoon.environment.Environment;
+import org.apache.cocoon.generation.Generator;
+import org.apache.cocoon.matching.Matcher;
+import org.apache.cocoon.reading.Reader;
+import org.apache.cocoon.selection.Selector;
+import org.apache.cocoon.serialization.Serializer;
+import org.apache.cocoon.transformation.Transformer;
import org.apache.cocoon.util.ClassUtils;
import org.apache.avalon.excalibur.component.ExcaliburComponentManager;
import org.apache.avalon.excalibur.component.RoleManager;
@@ -43,7 +49,7 @@
* Base class for generated <code>Sitemap</code> classes
*
* @author <a href="mailto:Giacomo.Pati@pwr.ch">Giacomo Pati</a>
- * @version CVS $Revision: 1.13 $ $Date: 2001/07/02 14:31:10 $
+ * @version CVS $Revision: 1.14 $ $Date: 2001/07/07 11:43:34 $
*/
public abstract class AbstractSitemap extends AbstractLoggable implements Sitemap, Disposable, ThreadSafe {
private Context context;
@@ -93,7 +99,7 @@
this.manager.configure(AbstractSitemap.defaultConfig);
}
- this.urlFactory = (URLFactory)manager.lookup(Roles.URL_FACTORY);
+ this.urlFactory = (URLFactory)manager.lookup(URLFactory.ROLE);
// Create Sitemap Selectors
this.generators = new SitemapComponentSelector();
@@ -106,13 +112,13 @@
// Set Parent Sitemap Selectors
try {
- this.generators.setParentSelector((SitemapComponentSelector) this.manager.lookup(Roles.GENERATORS));
- this.transformers.setParentSelector((SitemapComponentSelector) this.manager.lookup(Roles.TRANSFORMERS));
- this.serializers.setParentSelector((SitemapComponentSelector) this.manager.lookup(Roles.SERIALIZERS));
- this.readers.setParentSelector((SitemapComponentSelector) this.manager.lookup(Roles.READERS));
- this.actions.setParentSelector((SitemapComponentSelector) this.manager.lookup(Roles.ACTIONS));
- this.matchers.setParentSelector((SitemapComponentSelector) this.manager.lookup(Roles.MATCHERS));
- this.selectors.setParentSelector((SitemapComponentSelector) this.manager.lookup(Roles.SELECTORS));
+ this.generators.setParentSelector((SitemapComponentSelector) this.manager.lookup(Generator.ROLE + "Selector"));
+ this.transformers.setParentSelector((SitemapComponentSelector) this.manager.lookup(Transformer.ROLE + "Selector"));
+ this.serializers.setParentSelector((SitemapComponentSelector) this.manager.lookup(Serializer.ROLE + "Selector"));
+ this.readers.setParentSelector((SitemapComponentSelector) this.manager.lookup(Reader.ROLE + "Selector"));
+ this.actions.setParentSelector((SitemapComponentSelector) this.manager.lookup(Action.ROLE + "Selector"));
+ this.matchers.setParentSelector((SitemapComponentSelector) this.manager.lookup(Matcher.ROLE + "Selector"));
+ this.selectors.setParentSelector((SitemapComponentSelector) this.manager.lookup(Selector.ROLE + "Selector"));
} catch (ComponentException ce) {
/* we are ignoring those exceptions. We just want
* to ensure that the selectors get initialized
@@ -130,13 +136,13 @@
this.setupSelector(this.selectors);
// Add the Selectors
- this.manager.addComponentInstance(Roles.GENERATORS, this.generators);
- this.manager.addComponentInstance(Roles.TRANSFORMERS, this.transformers);
- this.manager.addComponentInstance(Roles.SERIALIZERS, this.serializers);
- this.manager.addComponentInstance(Roles.READERS, this.readers);
- this.manager.addComponentInstance(Roles.ACTIONS, this.actions);
- this.manager.addComponentInstance(Roles.MATCHERS, this.matchers);
- this.manager.addComponentInstance(Roles.SELECTORS, this.selectors);
+ this.manager.addComponentInstance(Generator.ROLE + "Selector", this.generators);
+ this.manager.addComponentInstance(Transformer.ROLE + "Selector", this.transformers);
+ this.manager.addComponentInstance(Serializer.ROLE + "Selector", this.serializers);
+ this.manager.addComponentInstance(Reader.ROLE + "Selector", this.readers);
+ this.manager.addComponentInstance(Action.ROLE + "Selector", this.actions);
+ this.manager.addComponentInstance(Matcher.ROLE + "Selector", this.matchers);
+ this.manager.addComponentInstance(Selector.ROLE + "Selector", this.selectors);
} catch (Exception e) {
getLogger().error("cannot obtain the Component", e);
throw new ComponentException("cannot obtain the URLFactory", e);
1.12 +1 -2 xml-cocoon2/src/org/apache/cocoon/sitemap/ContentAggregator.java
Index: ContentAggregator.java
===================================================================
RCS file: /home/cvs/xml-cocoon2/src/org/apache/cocoon/sitemap/ContentAggregator.java,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -u -r1.11 -r1.12
--- ContentAggregator.java 2001/07/02 09:23:28 1.11
+++ ContentAggregator.java 2001/07/07 11:43:34 1.12
@@ -18,7 +18,6 @@
import org.apache.avalon.framework.component.Composable;
import org.apache.avalon.framework.parameters.Parameters;
import org.apache.cocoon.ProcessingException;
-import org.apache.cocoon.Roles;
import org.apache.cocoon.caching.CacheValidity;
import org.apache.cocoon.caching.AggregatedCacheValidity;
import org.apache.cocoon.caching.Cacheable;
@@ -40,7 +39,7 @@
/**
* @author <a href="mailto:giacomo@apache.org">Giacomo Pati</a>
* @author <a href="mailto:cziegeler@apache.org">Carsten Ziegeler</a>
- * @version CVS $Id: ContentAggregator.java,v 1.11 2001/07/02 09:23:28 cziegeler Exp $
+ * @version CVS $Id: ContentAggregator.java,v 1.12 2001/07/07 11:43:34 giacomo Exp $
*/
public class ContentAggregator extends ContentHandlerWrapper implements Generator, Cacheable, Composable {
1.15 +3 -4 xml-cocoon2/src/org/apache/cocoon/sitemap/Handler.java
Index: Handler.java
===================================================================
RCS file: /home/cvs/xml-cocoon2/src/org/apache/cocoon/sitemap/Handler.java,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -u -r1.14 -r1.15
--- Handler.java 2001/07/04 10:13:38 1.14
+++ Handler.java 2001/07/07 11:43:34 1.15
@@ -23,7 +23,6 @@
import org.apache.avalon.excalibur.component.RoleManager;
import org.apache.cocoon.ProcessingException;
import org.apache.cocoon.Processor;
-import org.apache.cocoon.Roles;
import org.apache.cocoon.components.language.generator.CompiledComponent;
import org.apache.cocoon.components.language.generator.ProgramGenerator;
import org.apache.cocoon.components.pipeline.EventPipeline;
@@ -41,7 +40,7 @@
* @author <a href="mailto:cziegeler@apache.org">Carsten Ziegeler</a>
* @author <a href="mailto:Giacomo.Pati@pwr.ch">Giacomo Pati</a>
* @author <a href="mailto:stefano@apache.org">Stefano Mazzocchi</a>
- * @version CVS $Revision: 1.14 $ $Date: 2001/07/04 10:13:38 $
+ * @version CVS $Revision: 1.15 $ $Date: 2001/07/07 11:43:34 $
*/
public class Handler extends AbstractLoggable
implements Runnable, Contextualizable, Composable, Processor, Disposable, SourceResolver {
@@ -89,7 +88,7 @@
public void compose(ComponentManager manager)
throws ComponentException {
this.manager = manager;
- this.sourceHandler = (SourceHandler)manager.lookup(Roles.SOURCE_HANDLER);
+ this.sourceHandler = (SourceHandler)manager.lookup(SourceHandler.ROLE);
}
protected boolean available() {
@@ -201,7 +200,7 @@
*/
XSLTFactoryLoader.setLogger(getLogger());
- programGenerator = (ProgramGenerator)this.manager.lookup(Roles.PROGRAM_GENERATOR);
+ programGenerator = (ProgramGenerator)this.manager.lookup(ProgramGenerator.ROLE);
smap = (Sitemap)programGenerator.load(this.manager, this.sourceFileName, markupLanguage,
programmingLanguage, this);
if (this.sitemap != null) {
1.4 +2 -3 xml-cocoon2/src/org/apache/cocoon/transformation/AbstractDOMTransformer.java
Index: AbstractDOMTransformer.java
===================================================================
RCS file: /home/cvs/xml-cocoon2/src/org/apache/cocoon/transformation/AbstractDOMTransformer.java,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -u -r1.3 -r1.4
--- AbstractDOMTransformer.java 2001/05/31 17:38:58 1.3
+++ AbstractDOMTransformer.java 2001/07/07 11:43:35 1.4
@@ -16,7 +16,6 @@
import org.apache.avalon.framework.parameters.Parameters;
import org.apache.avalon.excalibur.pool.Recyclable;
import org.apache.cocoon.ProcessingException;
-import org.apache.cocoon.Roles;
import org.apache.cocoon.components.parser.Parser;
import org.apache.cocoon.environment.SourceResolver;
import org.apache.cocoon.transformation.Transformer;
@@ -71,8 +70,8 @@
this.manager = manager;
// Get a parser and use it as a DOM factory
try {
- log.debug("Looking up " + Roles.PARSER);
- Parser p = (Parser)manager.lookup(Roles.PARSER);
+ log.debug("Looking up " + Parser.ROLE);
+ Parser p = (Parser)manager.lookup(Parser.ROLE);
super.factory = p;
} catch (Exception e) {
log.error("Could not find component", e);
1.4 +1 -4 xml-cocoon2/src/org/apache/cocoon/transformation/CIncludeTransformer.java
Index: CIncludeTransformer.java
===================================================================
RCS file: /home/cvs/xml-cocoon2/src/org/apache/cocoon/transformation/CIncludeTransformer.java,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -u -r1.3 -r1.4
--- CIncludeTransformer.java 2001/07/06 09:59:50 1.3
+++ CIncludeTransformer.java 2001/07/07 11:43:35 1.4
@@ -14,7 +14,6 @@
import org.apache.avalon.framework.component.Composable;
import org.apache.avalon.framework.parameters.Parameters;
import org.apache.cocoon.ProcessingException;
-import org.apache.cocoon.Roles;
import org.apache.cocoon.environment.SourceResolver;
import org.apache.cocoon.xml.IncludeXMLConsumer;
import org.xml.sax.Attributes;
@@ -31,7 +30,7 @@
* which surrounds the included content.
*
* @author <a href="mailto:cziegeler@apache.org">Carsten Ziegeler</a>
- * @version CVS $Revision: 1.3 $ $Date: 2001/07/06 09:59:50 $ $Author: cziegeler $
+ * @version CVS $Revision: 1.4 $ $Date: 2001/07/07 11:43:35 $ $Author: giacomo $
*/
public class CIncludeTransformer extends AbstractTransformer
implements Recyclable, Composable {
@@ -140,6 +139,4 @@
}
}
}
-
-
}
1.4 +3 -3 xml-cocoon2/src/org/apache/cocoon/transformation/FragmentExtractorTransformer.java
Index: FragmentExtractorTransformer.java
===================================================================
RCS file: /home/cvs/xml-cocoon2/src/org/apache/cocoon/transformation/FragmentExtractorTransformer.java,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -u -r1.3 -r1.4
--- FragmentExtractorTransformer.java 2001/05/23 12:32:18 1.3
+++ FragmentExtractorTransformer.java 2001/07/07 11:43:35 1.4
@@ -19,7 +19,7 @@
import org.apache.avalon.framework.parameters.Parameters;
import org.apache.avalon.excalibur.pool.Poolable;
import org.apache.cocoon.ProcessingException;
-import org.apache.cocoon.Roles;
+import org.apache.cocoon.components.parser.Parser;
import org.apache.cocoon.caching.CacheValidity;
import org.apache.cocoon.caching.Cacheable;
import org.apache.cocoon.caching.NOPCacheValidity;
@@ -43,7 +43,7 @@
* <a href="http://c2.com/cgi/wiki?YouArentGonnaNeedIt">you aren't gonna need it</a>,
* so I've just used very simple extraction based on a URI and local name.
* @author <a href="mailto:paul@luminas.co.uk">Paul Russell</a>
- * @version CVS $Revision: 1.3 $ $Date: 2001/05/23 12:32:18 $
+ * @version CVS $Revision: 1.4 $ $Date: 2001/07/07 11:43:35 $
*/
public class FragmentExtractorTransformer extends AbstractTransformer
implements Composable, Disposable, Cacheable, Poolable {
@@ -70,7 +70,7 @@
public void compose(ComponentManager manager)
throws ComponentException{
this.manager = manager;
- documentFactory = (DOMFactory) manager.lookup(Roles.PARSER);
+ documentFactory = (DOMFactory) manager.lookup(Parser.ROLE);
}
/** Setup the transformer.
1.13 +0 -1 xml-cocoon2/src/org/apache/cocoon/transformation/I18nTransformer.java
Index: I18nTransformer.java
===================================================================
RCS file: /home/cvs/xml-cocoon2/src/org/apache/cocoon/transformation/I18nTransformer.java,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -u -r1.12 -r1.13
--- I18nTransformer.java 2001/07/06 09:59:50 1.12
+++ I18nTransformer.java 2001/07/07 11:43:35 1.13
@@ -9,7 +9,6 @@
*/
package org.apache.cocoon.transformation;
-import org.apache.cocoon.Roles;
import org.apache.cocoon.ProcessingException;
import org.apache.cocoon.acting.LangSelect;
import org.apache.cocoon.environment.Source;
1.4 +0 -1 xml-cocoon2/src/org/apache/cocoon/transformation/LDAPTransformer.java
Index: LDAPTransformer.java
===================================================================
RCS file: /home/cvs/xml-cocoon2/src/org/apache/cocoon/transformation/LDAPTransformer.java,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -u -r1.3 -r1.4
--- LDAPTransformer.java 2001/07/06 13:59:40 1.3
+++ LDAPTransformer.java 2001/07/07 11:43:35 1.4
@@ -31,7 +31,6 @@
import org.apache.avalon.framework.parameters.Parameters;
import org.apache.cocoon.environment.SourceResolver;
import org.apache.cocoon.ProcessingException;
-import org.apache.cocoon.Roles;
import org.apache.cocoon.util.ClassUtils;
import org.apache.cocoon.xml.XMLConsumer;
import org.apache.cocoon.xml.XMLProducer;
1.12 +3 -3 xml-cocoon2/src/org/apache/cocoon/transformation/SQLTransformer.java
Index: SQLTransformer.java
===================================================================
RCS file: /home/cvs/xml-cocoon2/src/org/apache/cocoon/transformation/SQLTransformer.java,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -u -r1.11 -r1.12
--- SQLTransformer.java 2001/06/30 02:38:30 1.11
+++ SQLTransformer.java 2001/07/07 11:43:35 1.12
@@ -34,7 +34,6 @@
import org.apache.avalon.excalibur.pool.Recyclable;
import org.apache.cocoon.environment.SourceResolver;
import org.apache.cocoon.ProcessingException;
-import org.apache.cocoon.Roles;
import org.apache.cocoon.util.ClassUtils;
import org.apache.cocoon.xml.XMLConsumer;
import org.apache.cocoon.xml.XMLProducer;
@@ -55,7 +54,7 @@
* @author <a href="mailto:giacomo.pati@pwr.ch">Giacomo Pati</a>
* (PWR Organisation & Entwicklung)
* @author <a href="mailto:sven.beauprez@the-ecorp.com">Sven Beauprez</a>
- * @version CVS $Revision: 1.11 $ $Date: 2001/06/30 02:38:30 $ $Author: vgritsenko $
+ * @version CVS $Revision: 1.12 $ $Date: 2001/07/07 11:43:35 $ $Author: giacomo $
*/
public class SQLTransformer extends AbstractTransformer implements Composable, Recyclable, Disposable {
@@ -132,7 +131,8 @@
public void compose(ComponentManager manager) {
try {
this.manager = manager;
- this.dbSelector = (ComponentSelector) manager.lookup(Roles.DB_CONNECTION);
+ //this.dbSelector = (ComponentSelector) manager.lookup(DataSourceComponent.ROLE + "Selector");
+ this.dbSelector = (ComponentSelector) manager.lookup(org.apache.cocoon.Roles.DB_CONNECTION);
} catch (ComponentException cme) {
getLogger().warn("Could not get the DataSource Selector", cme);
}
1.2 +4 -1 xml-cocoon2/src/org/apache/cocoon/transformation/Transformer.java
Index: Transformer.java
===================================================================
RCS file: /home/cvs/xml-cocoon2/src/org/apache/cocoon/transformation/Transformer.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -u -r1.1 -r1.2
--- Transformer.java 2001/05/09 20:49:35 1.1
+++ Transformer.java 2001/07/07 11:43:35 1.2
@@ -14,7 +14,10 @@
*
* @author <a href="mailto:fumagalli@exoffice.com">Pierpaolo Fumagalli</a>
* (Apache Software Foundation, Exoffice Technologies)
- * @version CVS $Revision: 1.1 $ $Date: 2001/05/09 20:49:35 $
+ * @version CVS $Revision: 1.2 $ $Date: 2001/07/07 11:43:35 $
*/
public interface Transformer extends XMLPipe, SitemapModelComponent {
+
+ String ROLE = "org.apache.cocoon.transformation.Transformer";
+
}
1.23 +5 -6 xml-cocoon2/src/org/apache/cocoon/transformation/TraxTransformer.java
Index: TraxTransformer.java
===================================================================
RCS file: /home/cvs/xml-cocoon2/src/org/apache/cocoon/transformation/TraxTransformer.java,v
retrieving revision 1.22
retrieving revision 1.23
diff -u -u -r1.22 -r1.23
--- TraxTransformer.java 2001/07/07 04:32:32 1.22
+++ TraxTransformer.java 2001/07/07 11:43:36 1.23
@@ -38,7 +38,6 @@
import org.apache.avalon.excalibur.pool.Recyclable;
import org.apache.cocoon.Constants;
import org.apache.cocoon.ProcessingException;
-import org.apache.cocoon.Roles;
import org.apache.cocoon.caching.CacheValidity;
import org.apache.cocoon.caching.Cacheable;
import org.apache.cocoon.caching.CompositeCacheValidity;
@@ -100,7 +99,7 @@
* @author <a href="mailto:dims@yahoo.com">Davanum Srinivas</a>
* @author <a href="mailto:cziegeler@apache.org">Carsten Ziegeler</a>
* @author <a href="mailto:giacomo@apache.org">Giacomo Pati</a>
- * @version CVS $Id: TraxTransformer.java,v 1.22 2001/07/07 04:32:32 vgritsenko Exp $
+ * @version CVS $Id: TraxTransformer.java,v 1.23 2001/07/07 11:43:36 giacomo Exp $
*/
public class TraxTransformer extends ContentHandlerWrapper
implements Transformer, Composable, Recyclable, Configurable, Cacheable, Disposable, URIResolver {
@@ -322,10 +321,10 @@
public void compose(ComponentManager manager) {
try {
this.manager = manager;
- getLogger().debug("Looking up " + Roles.STORE);
- this.store = (Store) this.manager.lookup(Roles.STORE);
- getLogger().debug("Looking up " + Roles.BROWSER);
- this.browser = (Browser) this.manager.lookup(Roles.BROWSER);
+ getLogger().debug("Looking up " + Store.ROLE);
+ this.store = (Store) this.manager.lookup(Store.ROLE);
+ getLogger().debug("Looking up " + Browser.ROLE);
+ this.browser = (Browser) this.manager.lookup(Browser.ROLE);
} catch (Exception e) {
getLogger().error("Could not find component", e);
}
1.2 +11 -4 xml-cocoon2/src/org/apache/cocoon/transformation/WriteDOMSessionTransformer.java
Index: WriteDOMSessionTransformer.java
===================================================================
RCS file: /home/cvs/xml-cocoon2/src/org/apache/cocoon/transformation/WriteDOMSessionTransformer.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -u -r1.1 -r1.2
--- WriteDOMSessionTransformer.java 2001/06/21 11:07:57 1.1
+++ WriteDOMSessionTransformer.java 2001/07/07 11:43:36 1.2
@@ -1,10 +1,17 @@
+/*****************************************************************************
+ * Copyright (C) The Apache Software Foundation. All rights reserved. *
+ * ------------------------------------------------------------------------- *
+ * This software is published under the terms of the Apache Software License *
+ * version 1.1, a copy of which has been included with this distribution in *
+ * the LICENSE file. *
+ *****************************************************************************/
+
package org.apache.cocoon.transformation;
import java.util.Map;
import java.io.IOException;
import javax.xml.parsers.ParserConfigurationException;
import org.apache.cocoon.Constants;
-import org.apache.cocoon.Roles;
import org.apache.cocoon.environment.Session;
import org.apache.cocoon.environment.Request;
import org.apache.cocoon.environment.SourceResolver;
@@ -36,7 +43,7 @@
* dom-root-element is the trigger that will be the root element of the DOM
*
* @author <a href="mailto:sven.beauprez@the-ecorp.com">Sven Beauprez</a>
- * @version CVS $Revision: 1.1 $ $Date: 2001/06/21 11:07:57 $ $Author: dims $
+ * @version CVS $Revision: 1.2 $ $Date: 2001/07/07 11:43:36 $ $Author: giacomo $
*/
public class WriteDOMSessionTransformer extends AbstractTransformer implements
@@ -89,8 +96,8 @@
public void compose(ComponentManager manager) {
this.manager = manager;
try {
- getLogger().debug("Looking up " + Roles.PARSER);
- parser = (Parser)manager.lookup(Roles.PARSER);
+ getLogger().debug("Looking up " + Parser.ROLE);
+ parser = (Parser)manager.lookup(Parser.ROLE);
} catch (Exception e) {
getLogger().error("Could not find component", e);
}
1.10 +4 -5 xml-cocoon2/src/org/apache/cocoon/transformation/XIncludeTransformer.java
Index: XIncludeTransformer.java
===================================================================
RCS file: /home/cvs/xml-cocoon2/src/org/apache/cocoon/transformation/XIncludeTransformer.java,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -u -r1.9 -r1.10
--- XIncludeTransformer.java 2001/06/27 14:52:44 1.9
+++ XIncludeTransformer.java 2001/07/07 11:43:36 1.10
@@ -27,7 +27,6 @@
import org.apache.avalon.framework.logger.Loggable;
import org.apache.avalon.framework.parameters.Parameters;
import org.apache.cocoon.ProcessingException;
-import org.apache.cocoon.Roles;
import org.apache.cocoon.components.parser.Parser;
import org.apache.cocoon.components.url.URLFactory;
import org.apache.cocoon.environment.SourceResolver;
@@ -54,7 +53,7 @@
* by the SAX event FSM yet.
*
* @author <a href="mailto:balld@webslingerZ.com">Donald Ball</a>
- * @version CVS $Revision: 1.9 $ $Date: 2001/06/27 14:52:44 $ $Author: cziegeler $
+ * @version CVS $Revision: 1.10 $ $Date: 2001/07/07 11:43:36 $ $Author: giacomo $
*/
public class XIncludeTransformer extends AbstractTransformer implements Composable, Recyclable, Disposable {
@@ -106,7 +105,7 @@
public void compose(ComponentManager manager) {
this.manager = manager;
try {
- this.urlFactory = (URLFactory)this.manager.lookup(Roles.URL_FACTORY);
+ this.urlFactory = (URLFactory)this.manager.lookup(URLFactory.ROLE);
} catch (Exception e) {
getLogger().error("cannot obtain URLFactory", e);
}
@@ -235,8 +234,8 @@
Parser parser = null;
try
{
- getLogger().debug("Looking up " + Roles.PARSER);
- parser = (Parser)manager.lookup(Roles.PARSER);
+ getLogger().debug("Looking up " + Parser.ROLE);
+ parser = (Parser)manager.lookup(Parser.ROLE);
InputSource input;
if (object instanceof Loggable) {
1.5 +4 -5 xml-cocoon2/src/org/apache/cocoon/transformation/XTTransformer.java
Index: XTTransformer.java
===================================================================
RCS file: /home/cvs/xml-cocoon2/src/org/apache/cocoon/transformation/XTTransformer.java,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -u -r1.4 -r1.5
--- XTTransformer.java 2001/05/31 13:05:34 1.4
+++ XTTransformer.java 2001/07/07 11:43:36 1.5
@@ -38,7 +38,6 @@
import org.apache.cocoon.Constants;
import org.apache.cocoon.Modifiable;
import org.apache.cocoon.ProcessingException;
-import org.apache.cocoon.Roles;
import org.apache.cocoon.components.store.Store;
import org.apache.cocoon.components.url.URLFactory;
import org.apache.cocoon.environment.SourceResolver;
@@ -65,7 +64,7 @@
* This Transformer use the XT processor.
*
* @author <a href="mailto:ssahuc@imediation.com">Sahuc Sebastien</a>
- * @version CVS $Revision: 1.4 $ $Date: 2001/05/31 13:05:34 $
+ * @version CVS $Revision: 1.5 $ $Date: 2001/07/07 11:43:36 $
*/
public class XTTransformer extends DocumentHandlerWrapper
implements Transformer, Composable, Loggable, Recyclable, Disposable {
@@ -97,8 +96,8 @@
this.manager = manager;
try {
- log.debug("Looking up " + Roles.STORE);
- this.store = (Store) manager.lookup(Roles.STORE);
+ log.debug("Looking up " + Store.ROLE);
+ this.store = (Store) manager.lookup(Store.ROLE);
} catch (Exception e) {
log.error("Could not find component", e);
}
@@ -341,7 +340,7 @@
URL url = null;
URLFactory urlFactory = null;
try {
- urlFactory = (URLFactory)this.manager.lookup(Roles.URL_FACTORY);
+ urlFactory = (URLFactory)this.manager.lookup(URLFactory.ROLE);
url = urlFactory.getURL(sheetSource.getSystemId());
} catch (Exception e) {
log.error("cannot obtain the URLFactory", e);
1.16 +2 -2 xml-cocoon2/webapp/cocoon.xconf
Index: cocoon.xconf
===================================================================
RCS file: /home/cvs/xml-cocoon2/webapp/cocoon.xconf,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -u -r1.15 -r1.16
--- cocoon.xconf 2001/07/07 05:11:04 1.15
+++ cocoon.xconf 2001/07/07 11:43:38 1.16
@@ -209,7 +209,7 @@
threadpriority: Indicates the priority of the cleanup thread.
(1 is the lowest priority and 10 is the highest).
-->
- <stream-cache class="org.apache.cocoon.caching.StreamMemoryCache">
+ <stream-cache class="org.apache.cocoon.components.store.MRUMemoryStore">
<parameter name="freememory" value="1000000"/>
<parameter name="heapsize" value="60000000"/>
<parameter name="objectlifetime" value="300"/>
@@ -245,7 +245,7 @@
threadpriority: Indicates the priority of the cleanup thread.
(1 is the lowest priority and 10 is the highest).
-->
- <event-cache class="org.apache.cocoon.caching.EventMemoryCache">
+ <event-cache class="org.apache.cocoon.components.store.MRUMemoryStore">
<parameter name="freememory" value="1000000"/>
<parameter name="heapsize" value="60000000"/>
<parameter name="objectlifetime" value="300"/>
1.3 +6 -0 xml-cocoon2/webapp/WEB-INF/web.xml
Index: web.xml
===================================================================
RCS file: /home/cvs/xml-cocoon2/webapp/WEB-INF/web.xml,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -u -r1.2 -r1.3
--- web.xml 2001/07/02 15:22:31 1.2
+++ web.xml 2001/07/07 11:43:38 1.3
@@ -139,6 +139,12 @@
<param-value>WEB-INF/extra-classes1:/[YOU-ABSOLUTE-PATH-TO]/own.jar</param-value>
</init-param>
-->
+
+ <!--
+ This parameter allows you to startup Cocoon2 immediately after startup
+ of your servlet engine.
+ -->
+ <load-on-startup>1</load-on-startup>
</servlet>
<servlet-mapping>
1.2 +2 -2 xml-cocoon2/webapp/docs/samples/slides/view-source.xsp
Index: view-source.xsp
===================================================================
RCS file: /home/cvs/xml-cocoon2/webapp/docs/samples/slides/view-source.xsp,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -u -r1.1 -r1.2
--- view-source.xsp 2001/05/09 20:50:19 1.1
+++ view-source.xsp 2001/07/07 11:43:39 1.2
@@ -242,8 +242,8 @@
URLFactory factory = null;
try {
- newParser = (Parser) this.manager.lookup(Roles.PARSER);
- factory = (URLFactory) this.manager.lookup(org.apache.cocoon.Roles.URL_FACTORY);
+ newParser = (Parser) this.manager.lookup(Parser.ROLE);
+ factory = (URLFactory) this.manager.lookup(URLFactory.ROLE);
Document document = newParser.newDocument();
DOMBuilder builder = new DOMBuilder(newParser);
----------------------------------------------------------------------
In case of troubles, e-mail: webmaster@xml.apache.org
To unsubscribe, e-mail: cocoon-cvs-unsubscribe@xml.apache.org
For additional commands, e-mail: cocoon-cvs-help@xml.apache.org