bloritsch 00/10/19 07:44:47
Modified: lib Tag: xml-cocoon2 avalonapi.jar
src/org/apache/cocoon Tag: xml-cocoon2 Cocoon.java
ComponentFactory.java DefaultComponentManager.java
src/org/apache/cocoon/acting Tag: xml-cocoon2 Action.java
HelloAction.java
src/org/apache/cocoon/components/image Tag: xml-cocoon2
JAIJPEGEncoder.java JAIPNGEncoder.java
JPEGEncoder.java PNGEncoder.java
src/org/apache/cocoon/components/language/generator Tag:
xml-cocoon2 ProgramGeneratorImpl.java
src/org/apache/cocoon/components/language/markup Tag:
xml-cocoon2 AbstractMarkupLanguage.java
MarkupLanguage.java
src/org/apache/cocoon/components/language/markup/sitemap/java
Tag: xml-cocoon2 sitemap.xsl
src/org/apache/cocoon/components/language/markup/xsp Tag:
xml-cocoon2 XSPGenerator.java
src/org/apache/cocoon/components/language/programming Tag:
xml-cocoon2 AbstractProgrammingLanguage.java
CompiledProgrammingLanguage.java
ProgrammingLanguage.java
src/org/apache/cocoon/components/language/programming/java
Tag: xml-cocoon2 JavaLanguage.java
src/org/apache/cocoon/generation Tag: xml-cocoon2
AbstractGenerator.java ComposerGenerator.java
DirectoryGenerator.java FileGenerator.java
PhpGenerator.java RequestGenerator.java
ServerPagesGenerator.java ServletGenerator.java
src/org/apache/cocoon/matching Tag: xml-cocoon2
RegexpURIMatcherFactory.java
WildcardURIMatcherFactory.java
src/org/apache/cocoon/reading Tag: xml-cocoon2
AbstractReader.java
src/org/apache/cocoon/serialization Tag: xml-cocoon2
AbstractTextSerializer.java SVGSerializer.java
src/org/apache/cocoon/sitemap Tag: xml-cocoon2
AbstractSitemap.java DefaultComponentHolder.java
Handler.java LinkTranslator.java Manager.java
PoolableComponentHolder.java ResourcePipeline.java
SitemapModelComponent.java
src/org/apache/cocoon/transformation Tag: xml-cocoon2
AbstractDOMTransformer.java LogTransformer.java
SQLTransformer.java XIncludeTransformer.java
XTTransformer.java XalanTransformer.java
webapp Tag: xml-cocoon2 cocoon.xconf
Added: src/org/apache/cocoon Tag: xml-cocoon2
CocoonComponentSelector.java Roles.java
Removed: lib Tag: xml-cocoon2 AvalonAware.jar
Log:
Synchronized with Avalon 3.0a4. Among changes include propper
ComponentSelector
patterns and such. The Component Role names have been aligned to what the
Avalon standards are (interface names), and included an interface that has
all the
role names that Cocoon uses.
Revision Changes Path
No revision
No revision
1.1.2.4 +254 -52 xml-cocoon/lib/Attic/avalonapi.jar
<<Binary file>>
No revision
No revision
1.4.2.32 +33 -32 xml-cocoon/src/org/apache/cocoon/Cocoon.java
Index: Cocoon.java
===================================================================
RCS file: /home/cvs/xml-cocoon/src/org/apache/cocoon/Cocoon.java,v
retrieving revision 1.4.2.31
retrieving revision 1.4.2.32
diff -u -r1.4.2.31 -r1.4.2.32
--- Cocoon.java 2000/10/13 04:08:01 1.4.2.31
+++ Cocoon.java 2000/10/19 14:42:29 1.4.2.32
@@ -16,6 +16,7 @@
import java.net.URL;
import java.util.HashMap;
import java.util.Enumeration;
+import java.util.Iterator;
import org.apache.avalon.Component;
import org.apache.avalon.Composer;
@@ -26,7 +27,6 @@
import org.apache.avalon.Configurable;
import org.apache.avalon.Configuration;
import org.apache.avalon.ConfigurationException;
-import org.apache.avalon.SAXConfigurationBuilder;
import org.apache.cocoon.components.parser.Parser;
import org.apache.cocoon.environment.Environment;
@@ -34,6 +34,7 @@
import org.apache.cocoon.sitemap.Manager;
import org.apache.cocoon.util.ClassUtils;
import org.apache.cocoon.DefaultComponentManager;
+import org.apache.cocoon.xml.SAXConfigurationBuilder;
import org.xml.sax.InputSource;
import org.xml.sax.SAXException;
@@ -42,7 +43,7 @@
* @author <a href="mailto:[EMAIL PROTECTED]">Pierpaolo Fumagalli</a>
* (Apache Software Foundation, Exoffice Technologies)
* @author <a href="mailto:[EMAIL PROTECTED]">Stefano Mazzocchi</a>
- * @version CVS $Revision: 1.4.2.31 $ $Date: 2000/10/13 04:08:01 $
+ * @version CVS $Revision: 1.4.2.32 $ $Date: 2000/10/19 14:42:29 $
*/
public class Cocoon
implements Component, Configurable, ComponentManager, Modifiable,
Processor, Constants {
@@ -88,18 +89,18 @@
// If one need to use a different parser, set the given system
property
String parser = System.getProperty(PARSER_PROPERTY, DEFAULT_PARSER);
try {
- this.componentManager.addComponent("parser",
ClassUtils.loadClass(parser),null);
+ this.componentManager.addComponent(Roles.PARSER,
ClassUtils.loadClass(parser),null);
} catch ( Exception e ) {
- throw new ConfigurationException("Could not load parser " +
parser + ": " + e.getMessage(),null);
+ throw new ConfigurationException("Could not load parser " +
parser + ": " + e.getMessage());
}
- this.componentManager.addComponentInstance("cocoon", this);
-
+ this.componentManager.addComponentInstance(Roles.COCOON, this);
+
String processor = System.getProperty(PROCESSOR_PROPERTY,
DEFAULT_PROCESSOR);
try {
- trax.Processor.setPlatformDefaultProcessor(processor);
- this.components.put("processor", ClassUtils.loadClass(parser));
+ trax.Processor.setPlatformDefaultProcessor(processor);
+ this.components.put(Roles.PROCESSOR,
ClassUtils.loadClass(processor));
} catch (Exception e) {
- throw new ConfigurationException("Error creating processor (" +
processor + ")", null);
+ throw new ConfigurationException("Error creating processor (" +
processor + ")");
}
}
@@ -120,14 +121,14 @@
throw new FileNotFoundException(configurationFile.toString());
}
- Parser p = (Parser) this.getComponent("parser");
+ Parser p = (Parser) this.lookup(Roles.PARSER);
SAXConfigurationBuilder b = new SAXConfigurationBuilder();
p.setContentHandler(b);
String path = this.configurationFile.getPath();
InputSource is = new InputSource(new FileReader(path));
is.setSystemId(path);
p.parse(is);
- this.setConfiguration(b.getConfiguration());
+ this.configure(b.getConfiguration());
this.root = this.configurationFile.getParentFile().toURL();
}
@@ -158,55 +159,55 @@
/**
* Configure this <code>Cocoon</code> instance.
*/
- public void setConfiguration(Configuration conf)
+ public void configure(Configuration conf)
throws ConfigurationException {
this.configuration = conf;
if (!"cocoon".equals(conf.getName())) {
- throw new ConfigurationException("Invalid configuration file",
conf);
+ throw new ConfigurationException("Invalid configuration file\n"
+ conf.toString());
}
if (!CONF_VERSION.equals(conf.getAttribute("version"))) {
throw new ConfigurationException("Invalid configuration schema
version. Must be '"
- + CONF_VERSION + "'.", conf);
+ + CONF_VERSION + "'."/*, conf*/);
}
// Set components
- Enumeration e = conf.getConfigurations("component");
- while (e.hasMoreElements()) {
- Configuration co = (Configuration) e.nextElement();
+ Iterator e = conf.getChildren("component");
+ while (e.hasNext()) {
+ Configuration co = (Configuration) e.next();
String role = co.getAttribute("role");
String className = co.getAttribute("class");
try {
componentManager.addComponent(role,ClassUtils.loadClass(className),co);
} catch ( Exception ex ) {
throw new ConfigurationException("Could not get class " +
className
- + " for role " + role + ": " + ex.getMessage(),
- (Configuration)e
+ + " for role " + role + ": " + ex.getMessage()/*,
+ (Configuration)e*/
);
}
}
// Create the sitemap
- Configuration sconf = conf.getConfiguration("sitemap");
+ Configuration sconf = conf.getChild("sitemap");
if (sconf == null) {
- throw new ConfigurationException("No sitemap configuration",
conf);
+ throw new ConfigurationException("No sitemap configuration");
}
this.sitemapManager = new Manager(null);
- this.sitemapManager.setComponentManager(this);
- this.sitemapManager.setConfiguration(conf);
+ this.sitemapManager.compose(this);
+ this.sitemapManager.configure(conf);
this.sitemapFileName = sconf.getAttribute("file");
if (this.sitemapFileName == null) {
- throw new ConfigurationException("No sitemap file name", conf);
+ throw new ConfigurationException("No sitemap file name\n" +
conf.toString());
}
}
/**
* Get the <code>Component</code> associated with the given role.
*/
- public Component getComponent(String role)
+ public Component lookup(String role)
throws ComponentNotFoundException, ComponentNotAccessibleException {
- return this.componentManager.getComponent(role);
+ return this.componentManager.lookup(role);
}
/**
@@ -227,15 +228,15 @@
/**
* Sets required system properties .
- */
+ */
protected void setSystemProperties()
- {
- java.util.Properties props = new java.util.Properties();
+ {
+ java.util.Properties props = new java.util.Properties();
// This is needed by Xalan2, it is used by
org.xml.sax.helpers.XMLReaderFactory
// to locate the SAX2 driver.
- props.put("org.xml.sax.driver",
"org.apache.xerces.parsers.SAXParser");
-
+ props.put("org.xml.sax.driver", "org.apache.xerces.parsers.SAXParser");
+
java.util.Properties systemProps = System.getProperties();
Enumeration propEnum = props.propertyNames();
while(propEnum.hasMoreElements())
@@ -245,5 +246,5 @@
systemProps.put(prop, props.getProperty(prop));
}
System.setProperties(systemProps);
- }
+ }
}
1.1.2.2 +3 -3
xml-cocoon/src/org/apache/cocoon/Attic/ComponentFactory.java
Index: ComponentFactory.java
===================================================================
RCS file:
/home/cvs/xml-cocoon/src/org/apache/cocoon/Attic/ComponentFactory.java,v
retrieving revision 1.1.2.1
retrieving revision 1.1.2.2
diff -u -r1.1.2.1 -r1.1.2.2
--- ComponentFactory.java 2000/10/13 04:08:00 1.1.2.1
+++ ComponentFactory.java 2000/10/19 14:42:36 1.1.2.2
@@ -18,7 +18,7 @@
/** Factory for Cocoon components.
* @author <a href="mailto:[EMAIL PROTECTED]">Paul Russell</a>
- * @version CVS $Revision: 1.1.2.1 $ $Date: 2000/10/13 04:08:00 $
+ * @version CVS $Revision: 1.1.2.2 $ $Date: 2000/10/19 14:42:36 $
*/
public class ComponentFactory implements ObjectFactory {
/** The class which this <code>ComponentFactory</code>
@@ -49,11 +49,11 @@
Poolable comp = (Poolable)componentClass.newInstance();
if ( comp instanceof Configurable ) {
- ((Configurable)comp).setConfiguration(this.conf);
+ ((Configurable)comp).configure(this.conf);
}
if ( comp instanceof Composer) {
- ((Composer)comp).setComponentManager(this.manager);
+ ((Composer)comp).compose(this.manager);
}
return comp;
1.1.2.2 +234 -209
xml-cocoon/src/org/apache/cocoon/Attic/DefaultComponentManager.java
Index: DefaultComponentManager.java
===================================================================
RCS file:
/home/cvs/xml-cocoon/src/org/apache/cocoon/Attic/DefaultComponentManager.java,v
retrieving revision 1.1.2.1
retrieving revision 1.1.2.2
diff -u -r1.1.2.1 -r1.1.2.2
--- DefaultComponentManager.java 2000/10/13 04:08:00 1.1.2.1
+++ DefaultComponentManager.java 2000/10/19 14:42:37 1.1.2.2
@@ -11,6 +11,7 @@
import java.util.HashMap;
import java.util.Map;
import java.util.Collections;
+import java.util.Iterator;
import org.apache.avalon.ComponentManager;
import org.apache.avalon.Component;
@@ -24,220 +25,244 @@
import org.apache.avalon.Composer;
import org.apache.avalon.ConfigurationException;
+import org.apache.cocoon.util.ClassUtils;
import org.apache.cocoon.util.ComponentPool;
import org.apache.cocoon.util.ComponentPoolController;
+import org.apache.cocoon.CocoonComponentSelector;
/** Default component manager for Cocoon's non sitemap components.
* @author <a href="mailto:[EMAIL PROTECTED]">Paul Russell</a>
- * @version CVS $Revision: 1.1.2.1 $ $Date: 2000/10/13 04:08:00 $
+ * @version CVS $Revision: 1.1.2.2 $ $Date: 2000/10/19 14:42:37 $
*/
public class DefaultComponentManager implements ComponentManager {
- /** Hashmap of all components which this ComponentManager knows about.
- */
- private Map components;
-
- /** Thread safe instances.
- */
- private Map threadSafeInstances;
-
- /** Static component instances.
- */
- private Map instances;
-
- /** Configurations for components.
- */
- private Map configurations;
-
- /** Component pools. */
- private Map pools;
-
-
- /** Construct a new default component manager.
- */
- public DefaultComponentManager() {
- // Setup the maps.
- components = Collections.synchronizedMap(new HashMap());
- threadSafeInstances = Collections.synchronizedMap(new
HashMap());
- configurations = Collections.synchronizedMap(new HashMap());
- pools = Collections.synchronizedMap(new HashMap());
- instances = Collections.synchronizedMap(new HashMap());
- }
-
- /** Return an instance of a component.
- */
- public Component getComponent( String role ) throws
- ComponentNotFoundException, ComponentNotAccessibleException {
-
- Component component;
-
- if ( role == null ) {
- throw new ComponentNotFoundException("Attempted to
retrieve component will null roll.");
- }
-
- // Retrieve the class of the requested component.
- Class componentClass = (Class)this.components.get(role);
-
- if ( componentClass == null ) {
- component = (Component)this.instances.get(role);
- if ( component == null ) {
- throw new ComponentNotFoundException("Could not
find component for role '" + role + "'.");
- } else {
- // we found an individual instance of a
component.
- return component;
- }
- }
-
- if ( !Component.class.isAssignableFrom(componentClass) ) {
- throw new ComponentNotAccessibleException(
- "Component with role '" + role + "' (" +
componentClass.getName() + ")does not implement Component.",
- null
- );
- }
-
- // Work out what class of component we're dealing with.
- if ( ThreadSafe.class.isAssignableFrom(componentClass) ) {
- component = getThreadsafeComponent(componentClass);
- } else if ( Poolable.class.isAssignableFrom(componentClass) ) {
- component = getPooledComponent(componentClass);
- } else if (
SingleThreaded.class.isAssignableFrom(componentClass) ) {
- try {
- component =
(Component)componentClass.newInstance();
- } catch ( InstantiationException e ) {
- throw new ComponentNotAccessibleException(
- "Could not instantiate component " +
componentClass.getName() + ": " + e.getMessage(),
- e
- );
- } catch ( IllegalAccessException e ) {
- throw new ComponentNotAccessibleException(
- "Could not access class " +
componentClass.getName() + ": " + e.getMessage(),
- e
- );
- }
- setupComponent(component);
- } else {
- /* The component doesn't implement any of the Avalon
marker
- * classes, treat as normal.
- */
- try {
- component =
(Component)componentClass.newInstance();
- } catch ( InstantiationException e ) {
- throw new ComponentNotAccessibleException(
- "Could not instantiate component " +
componentClass.getName() + ": " + e.getMessage(),
- e
- );
- } catch ( IllegalAccessException e ) {
- throw new ComponentNotAccessibleException(
- "Could not access class " +
componentClass.getName() + ": " + e.getMessage(),
- e
- );
- }
- setupComponent(component);
- }
-
- return component;
- }
-
- /** Retrieve an instance of a threadsafe component.
- * @param componentClass the class to retrieve an instance of.
- * @return and instance of the component.
- */
- private Component getThreadsafeComponent(Class componentClass) {
- Component component =
(Component)threadSafeInstances.get(componentClass);
-
- if ( component == null ) {
- try {
- component =
(Component)componentClass.newInstance();
- } catch ( InstantiationException e ) {
- throw new ComponentNotAccessibleException(
- "Failed to instantiate component " +
componentClass.getName() + ": " + e.getMessage(),
- e
- );
- } catch ( IllegalAccessException e ) {
- throw new ComponentNotAccessibleException(
- "Could not access component " +
componentClass.getName() + ": " + e.getMessage(),
- e
- );
- }
- setupComponent(component);
- threadSafeInstances.put(componentClass,component);
- }
- return component;
- }
-
- /** Return an instance of a component from its associated pool.
- * @param componentClass the class of the component of which we need an
instance.
- */
- private Component getPooledComponent(Class componentClass) throws
ComponentNotAccessibleException {
- ComponentPool pool = (ComponentPool)pools.get(componentClass);
-
- if ( pool == null ) {
- try {
- pool = new ComponentPool(
- new ComponentFactory(componentClass,
(Configuration)configurations.get(componentClass), this),
- new ComponentPoolController()
- );
- } catch (Exception e) {
- throw new ComponentNotAccessibleException(
- "Could not create pool for component "
+ componentClass.getName() + ": " + e.getMessage(),
- e
- );
- }
- pools.put(componentClass,pool);
- }
-
- Component component;
- try {
- component = (Component)pool.get();
- } catch ( Exception e ) {
- throw new ComponentNotAccessibleException(
- "Could not retrieve component " +
componentClass.getName() + " due to a " +
- e.getClass().getName() + ": " + e.getMessage(),
- e
- );
- }
-
- return component;
- }
-
- /** Configure a new component.
- * @param c the component to configure.
- */
- private void setupComponent(Component c) throws
ComponentNotAccessibleException {
- if ( c instanceof Configurable ) {
- try {
- ((Configurable)c).setConfiguration(
-
(Configuration)this.configurations.get(c.getClass())
- );
- } catch (ConfigurationException e) {
- throw new ComponentNotAccessibleException(
- "Could not configure component " +
c.getClass().getName() + ".",
- e
- );
- }
- }
-
- if ( c instanceof Composer ) {
- ((Composer)c).setComponentManager(this);
- }
- }
-
- /** Add a new component to the manager.
- * @param role the role name for the new component.
- * @param component the class of this component.
- * @param Configuration the configuration for this component.
- */
- public void addComponent(String role, Class component, Configuration
config) {
- this.components.put(role,component);
- if ( config != null ) {
- this.configurations.put(component,config);
- }
- }
-
- /** Add a static instance of a component to the manager.
- * @param role the role name for the component.
- * @param instance the instance of the component.
- */
- public void addComponentInstance(String role, Object instance) {
- this.instances.put(role,instance);
- }
+ /** Hashmap of all components which this ComponentManager knows about.
+ */
+ private Map components;
+
+ /** Thread safe instances.
+ */
+ private Map threadSafeInstances;
+
+ /** Static component instances.
+ */
+ private Map instances;
+
+ /** Configurations for components.
+ */
+ private Map configurations;
+
+ /** Component pools. */
+ private Map pools;
+
+
+ /** Construct a new default component manager.
+ */
+ public DefaultComponentManager() {
+ // Setup the maps.
+ components = Collections.synchronizedMap(new HashMap());
+ threadSafeInstances = Collections.synchronizedMap(new HashMap());
+ configurations = Collections.synchronizedMap(new HashMap());
+ pools = Collections.synchronizedMap(new HashMap());
+ instances = Collections.synchronizedMap(new HashMap());
+ }
+
+ /** Return an instance of a component.
+ */
+ public Component lookup( String role ) throws
+ ComponentNotFoundException, ComponentNotAccessibleException {
+
+ Component component;
+
+ if ( role == null ) {
+ throw new ComponentNotFoundException("Attempted to retrieve
component will null roll.");
+ }
+
+ // Retrieve the class of the requested component.
+ Class componentClass = (Class)this.components.get(role);
+
+ if ( componentClass == null ) {
+ component = (Component)this.instances.get(role);
+ if ( component == null ) {
+ throw new ComponentNotFoundException("Could not find
component for role '" + role + "'.");
+ } else {
+ // we found an individual instance of a component.
+ return component;
+ }
+ }
+
+ if ( !Component.class.isAssignableFrom(componentClass) ) {
+ throw new ComponentNotAccessibleException(
+ "Component with role '" + role + "' (" +
componentClass.getName() + ")does not implement Component.",
+ null
+ );
+ }
+
+ // Work out what class of component we're dealing with.
+ if ( ThreadSafe.class.isAssignableFrom(componentClass) ) {
+ component = getThreadsafeComponent(componentClass);
+ } else if ( Poolable.class.isAssignableFrom(componentClass) ) {
+ component = getPooledComponent(componentClass);
+ } else if ( SingleThreaded.class.isAssignableFrom(componentClass) ) {
+ try {
+ component = (Component)componentClass.newInstance();
+ } catch ( InstantiationException e ) {
+ throw new ComponentNotAccessibleException(
+ "Could not instantiate component " +
componentClass.getName() + ": " + e.getMessage(),
+ e
+ );
+ } catch ( IllegalAccessException e ) {
+ throw new ComponentNotAccessibleException(
+ "Could not access class " + componentClass.getName() +
": " + e.getMessage(),
+ e
+ );
+ }
+ setupComponent(component);
+ } else {
+ /* The component doesn't implement any of the Avalon marker
+ * classes, treat as normal.
+ */
+ try {
+ component = (Component)componentClass.newInstance();
+ } catch ( InstantiationException e ) {
+ throw new ComponentNotAccessibleException(
+ "Could not instantiate component " +
componentClass.getName() + ": " + e.getMessage(),
+ e
+ );
+ } catch ( IllegalAccessException e ) {
+ throw new ComponentNotAccessibleException(
+ "Could not access class " + componentClass.getName() +
": " + e.getMessage(),
+ e
+ );
+ }
+ setupComponent(component);
+ }
+
+ return component;
+ }
+
+ /** Retrieve an instance of a threadsafe component.
+ * @param componentClass the class to retrieve an instance of.
+ * @return and instance of the component.
+ */
+ private Component getThreadsafeComponent(Class componentClass) {
+ Component component =
(Component)threadSafeInstances.get(componentClass);
+
+ if ( component == null ) {
+ try {
+ component = (Component)componentClass.newInstance();
+ } catch ( InstantiationException e ) {
+ throw new ComponentNotAccessibleException(
+ "Failed to instantiate component " +
componentClass.getName() + ": " + e.getMessage(),
+ e
+ );
+ } catch ( IllegalAccessException e ) {
+ throw new ComponentNotAccessibleException(
+ "Could not access component " + componentClass.getName()
+ ": " + e.getMessage(),
+ e
+ );
+ }
+ setupComponent(component);
+ threadSafeInstances.put(componentClass,component);
+ }
+ return component;
+ }
+
+ /** Return an instance of a component from its associated pool.
+ * @param componentClass the class of the component of which we need an
instance.
+ */
+ private Component getPooledComponent(Class componentClass) throws
ComponentNotAccessibleException {
+ ComponentPool pool = (ComponentPool)pools.get(componentClass);
+
+ if ( pool == null ) {
+ try {
+ pool = new ComponentPool(
+ new ComponentFactory(componentClass,
(Configuration)configurations.get(componentClass), this),
+ new ComponentPoolController()
+ );
+ } catch (Exception e) {
+ throw new ComponentNotAccessibleException(
+ "Could not create pool for component " +
componentClass.getName() + ": " + e.getMessage(),
+ e
+ );
+ }
+ pools.put(componentClass,pool);
+ }
+
+ Component component;
+ try {
+ component = (Component)pool.get();
+ } catch ( Exception e ) {
+ throw new ComponentNotAccessibleException(
+ "Could not retrieve component " + componentClass.getName() +
" due to a " +
+ e.getClass().getName() + ": " + e.getMessage(),
+ e
+ );
+ }
+
+ return component;
+ }
+
+ /** Configure a new component.
+ * @param c the component to configure.
+ */
+ private void setupComponent(Component c) throws
ComponentNotAccessibleException {
+ if ( c instanceof Configurable ) {
+ try {
+ ((Configurable)c).configure(
+ (Configuration)this.configurations.get(c.getClass())
+ );
+ } catch (ConfigurationException e) {
+ throw new ComponentNotAccessibleException(
+ "Could not configure component " +
c.getClass().getName() + ".",
+ e
+ );
+ }
+ }
+
+ if ( c instanceof Composer ) {
+ ((Composer)c).compose(this);
+ }
+ }
+
+ /** Add a new component to the manager.
+ * @param role the role name for the new component.
+ * @param component the class of this component.
+ * @param Configuration the configuration for this component.
+ */
+ public void addComponent(String role, Class component, Configuration
config) {
+ if (component.equals(CocoonComponentSelector.class)) {
+ CocoonComponentSelector selector = new CocoonComponentSelector();
+ Iterator instances = config.getChildren("component-instance");
+
+ selector.compose(this);
+
+ while (instances.hasNext()) {
+ Configuration current = (Configuration) instances.next();
+ Object hint = current.getAttribute("name");
+ String className = (String) current.getAttribute("class");
+
+ try {
+ selector.addComponent(hint,
ClassUtils.loadClass(className), current);
+ } catch (Exception e) {
+ throw new ConfigurationException("The component instance
for '" + hint + "' has an invalid class name.");
+ }
+ }
+
+ this.addComponentInstance(role, selector);
+ return;
+ }
+
+ this.components.put(role,component);
+ if ( config != null ) {
+ this.configurations.put(component,config);
+ }
+ }
+
+ /** Add a static instance of a component to the manager.
+ * @param role the role name for the component.
+ * @param instance the instance of the component.
+ */
+ public void addComponentInstance(String role, Object instance) {
+ this.instances.put(role,instance);
+ }
}
No revision
No revision
1.1.2.1 +255 -0
xml-cocoon/src/org/apache/cocoon/Attic/CocoonComponentSelector.java
1.1.2.1 +30 -0 xml-cocoon/src/org/apache/cocoon/Attic/Roles.java
No revision
No revision
1.1.2.2 +2 -2 xml-cocoon/src/org/apache/cocoon/acting/Attic/Action.java
Index: Action.java
===================================================================
RCS file:
/home/cvs/xml-cocoon/src/org/apache/cocoon/acting/Attic/Action.java,v
retrieving revision 1.1.2.1
retrieving revision 1.1.2.2
diff -u -r1.1.2.1 -r1.1.2.2
--- Action.java 2000/10/08 20:56:38 1.1.2.1
+++ Action.java 2000/10/19 14:42:49 1.1.2.2
@@ -12,7 +12,7 @@
import org.apache.avalon.Component;
import org.apache.avalon.ThreadSafe;
-import org.apache.avalon.utils.Parameters;
+import org.apache.avalon.Parameters;
import org.xml.sax.SAXException;
import org.xml.sax.EntityResolver;
@@ -20,7 +20,7 @@
/**
*
* @author <a href="mailto:[EMAIL PROTECTED]">Giacomo Pati</a>
- * @version CVS $Revision: 1.1.2.1 $ $Date: 2000/10/08 20:56:38 $
+ * @version CVS $Revision: 1.1.2.2 $ $Date: 2000/10/19 14:42:49 $
*/
public interface Action extends Component, ThreadSafe {
/**
1.1.2.2 +2 -2
xml-cocoon/src/org/apache/cocoon/acting/Attic/HelloAction.java
Index: HelloAction.java
===================================================================
RCS file:
/home/cvs/xml-cocoon/src/org/apache/cocoon/acting/Attic/HelloAction.java,v
retrieving revision 1.1.2.1
retrieving revision 1.1.2.2
diff -u -r1.1.2.1 -r1.1.2.2
--- HelloAction.java 2000/10/08 20:56:38 1.1.2.1
+++ HelloAction.java 2000/10/19 14:42:52 1.1.2.2
@@ -15,7 +15,7 @@
import javax.servlet.ServletContext;
import org.apache.avalon.Component;
-import org.apache.avalon.utils.Parameters;
+import org.apache.avalon.Parameters;
import org.xml.sax.SAXException;
import org.xml.sax.EntityResolver;
@@ -23,7 +23,7 @@
/**
*
* @author <a href="mailto:[EMAIL PROTECTED]">Giacomo Pati</a>
- * @version CVS $Revision: 1.1.2.1 $ $Date: 2000/10/08 20:56:38 $
+ * @version CVS $Revision: 1.1.2.2 $ $Date: 2000/10/19 14:42:52 $
*/
public class HelloAction implements Action {
/**
No revision
No revision
1.1.2.4 +2 -2
xml-cocoon/src/org/apache/cocoon/components/image/Attic/JAIJPEGEncoder.java
Index: JAIJPEGEncoder.java
===================================================================
RCS file:
/home/cvs/xml-cocoon/src/org/apache/cocoon/components/image/Attic/JAIJPEGEncoder.java,v
retrieving revision 1.1.2.3
retrieving revision 1.1.2.4
diff -u -r1.1.2.3 -r1.1.2.4
--- JAIJPEGEncoder.java 2000/09/22 20:27:25 1.1.2.3
+++ JAIJPEGEncoder.java 2000/10/19 14:42:56 1.1.2.4
@@ -9,7 +9,7 @@
package org.apache.cocoon.components.image;
import org.apache.avalon.*;
-import org.apache.avalon.utils.Parameters;
+import org.apache.avalon.Parameters;
import java.io.OutputStream;
import java.io.IOException;
import java.awt.image.*;
@@ -28,7 +28,7 @@
/** The quality level. The default is 0.75 (high quality) */
private float quality;
- public void setConfiguration(Configuration conf) throws
ConfigurationException {
+ public void configure(Configuration conf) throws ConfigurationException {
// Using the passed Configuration, generate a far more friendly
Parameters object.
Parameters p = Parameters.fromConfiguration(conf);
quality = p.getParameterAsFloat("quality", 0.75f);
1.1.2.4 +2 -2
xml-cocoon/src/org/apache/cocoon/components/image/Attic/JAIPNGEncoder.java
Index: JAIPNGEncoder.java
===================================================================
RCS file:
/home/cvs/xml-cocoon/src/org/apache/cocoon/components/image/Attic/JAIPNGEncoder.java,v
retrieving revision 1.1.2.3
retrieving revision 1.1.2.4
diff -u -r1.1.2.3 -r1.1.2.4
--- JAIPNGEncoder.java 2000/09/22 20:27:26 1.1.2.3
+++ JAIPNGEncoder.java 2000/10/19 14:42:57 1.1.2.4
@@ -9,7 +9,7 @@
package org.apache.cocoon.components.image;
import org.apache.avalon.*;
-import org.apache.avalon.utils.Parameters;
+import org.apache.avalon.Parameters;
import java.io.OutputStream;
import java.io.IOException;
import java.awt.image.BufferedImage;
@@ -29,7 +29,7 @@
private boolean interlaced;
private boolean alpha;
- public void setConfiguration(Configuration conf) throws
ConfigurationException {
+ public void configure(Configuration conf) throws ConfigurationException {
// Using the passed Configuration, generate a far more friendly
Parameters object.
Parameters p = Parameters.fromConfiguration(conf);
interlaced = p.getParameterAsBoolean("interlaced", true);
1.1.2.4 +2 -2
xml-cocoon/src/org/apache/cocoon/components/image/Attic/JPEGEncoder.java
Index: JPEGEncoder.java
===================================================================
RCS file:
/home/cvs/xml-cocoon/src/org/apache/cocoon/components/image/Attic/JPEGEncoder.java,v
retrieving revision 1.1.2.3
retrieving revision 1.1.2.4
diff -u -r1.1.2.3 -r1.1.2.4
--- JPEGEncoder.java 2000/09/22 20:27:26 1.1.2.3
+++ JPEGEncoder.java 2000/10/19 14:42:58 1.1.2.4
@@ -9,7 +9,7 @@
package org.apache.cocoon.components.image;
import org.apache.avalon.*;
-import org.apache.avalon.utils.Parameters;
+import org.apache.avalon.Parameters;
import java.io.OutputStream;
import java.io.IOException;
import java.awt.image.*;
@@ -30,7 +30,7 @@
/** Force baseline flag. The default is true; */
private boolean baseline;
- public void setConfiguration(Configuration conf) throws
ConfigurationException {
+ public void configure(Configuration conf) throws ConfigurationException {
// Using the passed Configuration, generate a far more friendly
Parameters object.
Parameters p = Parameters.fromConfiguration(conf);
quality = p.getParameterAsFloat("quality", 0.75f);
1.1.2.4 +1 -1
xml-cocoon/src/org/apache/cocoon/components/image/Attic/PNGEncoder.java
Index: PNGEncoder.java
===================================================================
RCS file:
/home/cvs/xml-cocoon/src/org/apache/cocoon/components/image/Attic/PNGEncoder.java,v
retrieving revision 1.1.2.3
retrieving revision 1.1.2.4
diff -u -r1.1.2.3 -r1.1.2.4
--- PNGEncoder.java 2000/09/22 20:27:27 1.1.2.3
+++ PNGEncoder.java 2000/10/19 14:43:01 1.1.2.4
@@ -31,7 +31,7 @@
/** Whether to encode the alpha channel (default: yes) */
private boolean alpha;
- public void setConfiguration(Configuration conf) throws
ConfigurationException {
+ public void configure(Configuration conf) throws ConfigurationException {
// Using the passed Configuration, generate a far more friendly
Parameters object.
Parameters p = Parameters.fromConfiguration(conf);
compression = p.getParameterAsInteger("compression", 7);
No revision
No revision
1.1.2.13 +21 -14
xml-cocoon/src/org/apache/cocoon/components/language/generator/Attic/ProgramGeneratorImpl.java
Index: ProgramGeneratorImpl.java
===================================================================
RCS file:
/home/cvs/xml-cocoon/src/org/apache/cocoon/components/language/generator/Attic/ProgramGeneratorImpl.java,v
retrieving revision 1.1.2.12
retrieving revision 1.1.2.13
diff -u -r1.1.2.12 -r1.1.2.13
--- ProgramGeneratorImpl.java 2000/10/12 16:43:13 1.1.2.12
+++ ProgramGeneratorImpl.java 2000/10/19 14:43:08 1.1.2.13
@@ -21,11 +21,12 @@
import org.apache.avalon.Configurable;
import org.apache.avalon.Configuration;
import org.apache.avalon.ConfigurationException;
-import org.apache.avalon.NamedComponentManager;
+import org.apache.avalon.ComponentSelector;
-import org.apache.avalon.utils.Parameters;
+import org.apache.avalon.Parameters;
import org.apache.cocoon.Cocoon;
+import org.apache.cocoon.Roles;
import org.apache.cocoon.components.store.MemoryStore;
import org.apache.cocoon.components.store.FilesystemStore;
@@ -49,7 +50,7 @@
* The default implementation of <code>ProgramGenerator</code>
*
* @author <a href="mailto:[EMAIL PROTECTED]">Ricardo Rocha</a>
- * @version CVS $Revision: 1.1.2.12 $ $Date: 2000/10/12 16:43:13 $
+ * @version CVS $Revision: 1.1.2.13 $ $Date: 2000/10/19 14:43:08 $
*/
public class ProgramGeneratorImpl
implements ProgramGenerator, Composer, Configurable
@@ -63,23 +64,27 @@
/** The component manager */
protected ComponentManager manager;
- /** The named component manager */
- protected NamedComponentManager factory;
+ /** The markup language component selector */
+ protected ComponentSelector markupSelector;
+ /** The programming language component selector */
+ protected ComponentSelector languageSelector;
+
/** The working directory */
protected String workDir;
/**
* Set the global component manager. This method also sets the
- * <code>NamedComponentManager</code> used as language factory for both
+ * <code>ComponentSelector</code> used as language factory for both
* markup and programming languages.
*
* @param manager The global component manager
*/
- public void setComponentManager(ComponentManager manager) {
+ public void compose(ComponentManager manager) {
this.manager = manager;
- this.factory = (NamedComponentManager)
this.manager.getComponent("factory");
- this.workDir = ((Cocoon)
this.manager.getComponent("cocoon")).getWorkDir();
+ this.markupSelector = (ComponentSelector)
this.manager.lookup(Roles.MARKUP_LANGUAGE);
+ this.languageSelector = (ComponentSelector)
this.manager.lookup(Roles.PROGRAMMING_LANGUAGE);
+ this.workDir = ((Cocoon) this.manager.lookup(Roles.COCOON)).getWorkDir();
}
/**
@@ -89,7 +94,7 @@
* @param conf The configuration information
* @exception ConfigurationException Not thrown here
*/
- public void setConfiguration(Configuration conf)
+ public void configure(Configuration conf)
throws ConfigurationException
{
Parameters params = Parameters.fromConfiguration(conf);
@@ -114,17 +119,19 @@
) throws Exception {
// Get markup and programming languages
MarkupLanguage markupLanguage = (MarkupLanguage)
- this.factory.getComponent("markup-language", markupLanguageName);
+ this.markupSelector.select(markupLanguageName);
ProgrammingLanguage programmingLanguage = (ProgrammingLanguage)
- this.factory.getComponent("programming-language",
programmingLanguageName);
+ this.languageSelector.select(programmingLanguageName);
+
+ programmingLanguage.setLanguageName(programmingLanguageName);
if (markupLanguage instanceof Composer) {
- ((Composer) markupLanguage).setComponentManager(this.manager);
+ ((Composer) markupLanguage).compose(this.manager);
}
if (programmingLanguage instanceof Composer) {
- ((Composer) programmingLanguage).setComponentManager(this.manager);
+ ((Composer) programmingLanguage).compose(this.manager);
}
// Create filesystem store
No revision
No revision
1.1.2.9 +21 -21
xml-cocoon/src/org/apache/cocoon/components/language/markup/Attic/AbstractMarkupLanguage.java
Index: AbstractMarkupLanguage.java
===================================================================
RCS file:
/home/cvs/xml-cocoon/src/org/apache/cocoon/components/language/markup/Attic/AbstractMarkupLanguage.java,v
retrieving revision 1.1.2.8
retrieving revision 1.1.2.9
diff -u -r1.1.2.8 -r1.1.2.9
--- AbstractMarkupLanguage.java 2000/10/12 16:43:15 1.1.2.8
+++ AbstractMarkupLanguage.java 2000/10/19 14:43:15 1.1.2.9
@@ -17,6 +17,7 @@
import java.util.ArrayList;
import java.util.Hashtable;
import java.util.Enumeration;
+import java.util.Iterator;
import org.xml.sax.InputSource;
import org.xml.sax.EntityResolver;
@@ -34,10 +35,10 @@
import org.apache.avalon.Composer;
import org.apache.avalon.Component;
import org.apache.avalon.ComponentManager;
+import org.apache.avalon.Configurable;
import org.apache.avalon.Configuration;
import org.apache.avalon.ConfigurationException;
-import org.apache.avalon.AbstractNamedComponent;
-import org.apache.avalon.utils.Parameters;
+import org.apache.avalon.Parameters;
import org.apache.cocoon.util.IOUtils;
import org.apache.cocoon.util.NetUtils;
@@ -50,11 +51,10 @@
* be decoupled from this context!!!
*
* @author <a href="mailto:[EMAIL PROTECTED]">Ricardo Rocha</a>
- * @version CVS $Revision: 1.1.2.8 $ $Date: 2000/10/12 16:43:15 $
+ * @version CVS $Revision: 1.1.2.9 $ $Date: 2000/10/19 14:43:15 $
*/
public abstract class AbstractMarkupLanguage
- extends AbstractNamedComponent
- implements MarkupLanguage, Composer
+ implements MarkupLanguage, Composer, Configurable
{
/**
* The supported language table
@@ -84,7 +84,7 @@
*
* @param manager The sitemap-specified component manager
*/
- public void setComponentManager(ComponentManager manager) {
+ public void compose(ComponentManager manager) {
this.manager = manager;
}
@@ -107,8 +107,8 @@
*/
protected void setParameters(Parameters params) throws Exception
{
- this.uri = getRequiredParameter(params, "uri");
- this.prefix = getRequiredParameter(params, "prefix");
+ this.uri = params.getParameter("uri",null);
+ this.prefix = params.getParameter("prefix", null);
}
/**
@@ -118,20 +118,20 @@
* @param conf The language configuration
* @exception ConfigurationException If an error occurs loading
logichseets
*/
- protected void setAdditionalConfiguration(Configuration conf)
+ public void configure(Configuration conf)
throws ConfigurationException
{
try {
- Enumeration l = conf.getConfigurations("target-language");
- while (l.hasMoreElements()) {
- Configuration lc = (Configuration) l.nextElement();
+ Iterator l = conf.getChildren("target-language");
+ while (l.hasNext()) {
+ Configuration lc = (Configuration) l.next();
LanguageDescriptor language = new LanguageDescriptor();
language.setName(lc.getAttribute("name"));
Parameters lcp = Parameters.fromConfiguration(lc);
String logicsheetLocation =
- getRequiredParameter(lcp, "core-logicsheet");
+ lcp.getParameter("core-logicsheet",null);
URL logicsheetURL = NetUtils.getURL(logicsheetLocation);
String logicsheetName = logicsheetURL.toExternalForm();
@@ -142,14 +142,14 @@
this.logicsheetCache.store(logicsheetName, entry);
language.setLogicsheet(logicsheetName);
- Enumeration n = lc.getConfigurations("builtin-logicsheet");
- while (n.hasMoreElements()) {
- Configuration nc = (Configuration) n.nextElement();
+ Iterator n = lc.getChildren("builtin-logicsheet");
+ while (n.hasNext()) {
+ Configuration nc = (Configuration) n.next();
Parameters ncp = Parameters.fromConfiguration(nc);
- String namedLogicsheetPrefix = getRequiredParameter(ncp,
"prefix");
- String namedLogicsheetUri = getRequiredParameter(ncp,
"uri");
- String namedLogicsheetLocation =
getRequiredParameter(ncp, "href");
+ String namedLogicsheetPrefix =
ncp.getParameter("prefix", null);
+ String namedLogicsheetUri = ncp.getParameter("uri",
null);
+ String namedLogicsheetLocation =
ncp.getParameter("href", null);
// FIXME: This is repetitive; add method for both cases
URL namedLogicsheetURL =
NetUtils.getURL(namedLogicsheetLocation);
@@ -173,7 +173,7 @@
} catch (Exception e) {
// FIXME (SSA) Better error handling
e.printStackTrace();
- throw new ConfigurationException(e.getMessage(), conf);
+ throw new ConfigurationException(e.getMessage());
}
}
@@ -267,7 +267,7 @@
InputSource input, String filename, ProgrammingLanguage
programmingLanguage,
EntityResolver resolver
) throws Exception {
- String languageName = programmingLanguage.getName();
+ String languageName = programmingLanguage.getLanguageName();
LanguageDescriptor language =
(LanguageDescriptor) this.languages.get(languageName);
1.1.2.7 +4 -3
xml-cocoon/src/org/apache/cocoon/components/language/markup/Attic/MarkupLanguage.java
Index: MarkupLanguage.java
===================================================================
RCS file:
/home/cvs/xml-cocoon/src/org/apache/cocoon/components/language/markup/Attic/MarkupLanguage.java,v
retrieving revision 1.1.2.6
retrieving revision 1.1.2.7
diff -u -r1.1.2.6 -r1.1.2.7
--- MarkupLanguage.java 2000/10/12 16:43:17 1.1.2.6
+++ MarkupLanguage.java 2000/10/19 14:43:17 1.1.2.7
@@ -9,8 +9,9 @@
import org.xml.sax.XMLReader;
import org.xml.sax.InputSource;
-import org.apache.avalon.NamedComponent;
+import org.apache.avalon.Component;
+
import org.apache.cocoon.components.language.programming.ProgrammingLanguage;
import org.xml.sax.EntityResolver;
@@ -21,9 +22,9 @@
* document augmenting it with dynamic content
*
* @author <a href="mailto:[EMAIL PROTECTED]">Ricardo Rocha</a>
- * @version CVS $Revision: 1.1.2.6 $ $Date: 2000/10/12 16:43:17 $
+ * @version CVS $Revision: 1.1.2.7 $ $Date: 2000/10/19 14:43:17 $
*/
-public interface MarkupLanguage extends NamedComponent {
+public interface MarkupLanguage extends Component {
/**
* Return the input document's encoding or <code>null</code> if it is the
* platform's default encoding.
No revision
No revision
1.1.2.49 +10 -10
xml-cocoon/src/org/apache/cocoon/components/language/markup/sitemap/java/Attic/sitemap.xsl
Index: sitemap.xsl
===================================================================
RCS file:
/home/cvs/xml-cocoon/src/org/apache/cocoon/components/language/markup/sitemap/java/Attic/sitemap.xsl,v
retrieving revision 1.1.2.48
retrieving revision 1.1.2.49
diff -u -r1.1.2.48 -r1.1.2.49
--- sitemap.xsl 2000/10/13 04:14:33 1.1.2.48
+++ sitemap.xsl 2000/10/19 14:43:23 1.1.2.49
@@ -50,8 +50,7 @@
import org.apache.avalon.Configurable;
import org.apache.avalon.Configuration;
import org.apache.avalon.ConfigurationException;
- import org.apache.avalon.SAXConfigurationBuilder;
- import org.apache.avalon.utils.Parameters;
+ import org.apache.avalon.Parameters;
import org.apache.cocoon.Cocoon;
import org.apache.cocoon.ProcessingException;
@@ -62,6 +61,7 @@
import org.apache.cocoon.sitemap.Sitemap;
import org.apache.cocoon.sitemap.ErrorNotifier;
import org.apache.cocoon.sitemap.Manager;
+ import org.apache.cocoon.xml.SAXConfigurationBuilder;
import org.xml.sax.SAXException;
import org.xml.sax.helpers.AttributesImpl;
@@ -70,7 +70,7 @@
* This is the automatically generated class from the sitemap definitions
*
* @author <a href="mailto:[EMAIL PROTECTED]">Giacomo
Pati</a>
- * @version CVS $Revision: 1.1.2.48 $ $Date: 2000/10/13 04:14:33 $
+ * @version CVS $Revision: 1.1.2.49 $ $Date: 2000/10/19 14:43:23 $
*/
public class <xsl:value-of select="@file-name"/> extends AbstractSitemap
{
static {
@@ -183,14 +183,14 @@
* Pass a <code>Configuration</code> instance to this
* <code>Configurable</code> class.
*/
- public void setConfiguration(Configuration conf) throws
ConfigurationException {
+ public void configure(Configuration conf) throws
ConfigurationException {
SAXConfigurationBuilder confBuilder = new SAXConfigurationBuilder ();
Configuration cconf = null;
AttributesImpl attr = new AttributesImpl();
this.sitemapManager = new Manager(super.sitemapComponentManager);
- this.sitemapManager.setComponentManager(this.manager);
- this.sitemapManager.setConfiguration(conf);
+ this.sitemapManager.compose(this.manager);
+ this.sitemapManager.configure(conf);
try {
<!-- configure all components -->
/* Configure special ErrorNotifier and LinkTransformer */
@@ -251,7 +251,7 @@
/* catch any exception thrown by a component during configuration */
} catch (Exception e) {
- throw new ConfigurationException (e.toString(), cconf);
+ throw new ConfigurationException (e.toString()/*, cconf*/);
}
}
@@ -419,7 +419,7 @@
matcher_<xsl:value-of select="$matcher-name2"/>
</xsl:when>
<xsl:otherwise>
-
((Matcher)((ComponentHolder)super.sitemapComponentManager.getComponent("matcher:<xsl:value-of
select="$matcher-type"/>")).get()).match
+
((Matcher)((ComponentHolder)super.sitemapComponentManager.lookup("matcher:<xsl:value-of
select="$matcher-type"/>")).get()).match
</xsl:otherwise>
</xsl:choose>
</xsl:variable>
@@ -495,7 +495,7 @@
selector_<xsl:value-of select="$selector-name2"/>
</xsl:when>
<xsl:otherwise>
-
((Selector)((ComponentHolder)super.sitemapComponentManager.getComponent("selector:<xsl:value-of
select="$selector-type"/>")).get()).select
+
((Selector)((ComponentHolder)super.sitemapComponentManager.lookup("selector:<xsl:value-of
select="$selector-type"/>")).get()).select
</xsl:otherwise>
</xsl:choose>
</xsl:variable>
@@ -530,7 +530,7 @@
<!-- gets the string how the action is to be invoced in java code -->
<xsl:variable name="action-name">
-
((Action)((ComponentHolder)super.sitemapComponentManager.getComponent("action:<xsl:value-of
select="$selector-type"/>")).get()).act
+
((Action)((ComponentHolder)super.sitemapComponentManager.lookup("action:<xsl:value-of
select="$selector-type"/>")).get()).act
</xsl:variable>
<!-- test if we have to define parameters for this action -->
No revision
No revision
1.1.2.9 +5 -4
xml-cocoon/src/org/apache/cocoon/components/language/markup/xsp/Attic/XSPGenerator.java
Index: XSPGenerator.java
===================================================================
RCS file:
/home/cvs/xml-cocoon/src/org/apache/cocoon/components/language/markup/xsp/Attic/XSPGenerator.java,v
retrieving revision 1.1.2.8
retrieving revision 1.1.2.9
diff -u -r1.1.2.8 -r1.1.2.9
--- XSPGenerator.java 2000/08/31 16:41:58 1.1.2.8
+++ XSPGenerator.java 2000/10/19 14:43:30 1.1.2.9
@@ -8,6 +8,7 @@
package org.apache.cocoon.components.language.markup.xsp;
import org.apache.cocoon.Cocoon;
+import org.apache.cocoon.Roles;
import org.apache.avalon.ComponentManager;
import org.apache.cocoon.components.parser.Parser;
@@ -17,7 +18,7 @@
* Base class for XSP-generated <code>ServerPagesGenerator</code> classes
*
* @author <a href="mailto:[EMAIL PROTECTED]">Ricardo Rocha</a>
- * @version CVS $Revision: 1.1.2.8 $ $Date: 2000/08/31 16:41:58 $
+ * @version CVS $Revision: 1.1.2.9 $ $Date: 2000/10/19 14:43:30 $
*/
public abstract class XSPGenerator extends AbstractServerPage {
@@ -29,9 +30,9 @@
*
* @param manager The global component manager
*/
- public void setComponentManager(ComponentManager manager) {
- super.setComponentManager(manager);
+ public void compose(ComponentManager manager) {
+ super.compose(manager);
- this.parser = (Parser) this.manager.getComponent("parser");
+ this.parser = (Parser) this.manager.lookup(Roles.PARSER);
}
}
No revision
No revision
1.1.2.6 +25 -5
xml-cocoon/src/org/apache/cocoon/components/language/programming/Attic/AbstractProgrammingLanguage.java
Index: AbstractProgrammingLanguage.java
===================================================================
RCS file:
/home/cvs/xml-cocoon/src/org/apache/cocoon/components/language/programming/Attic/AbstractProgrammingLanguage.java,v
retrieving revision 1.1.2.5
retrieving revision 1.1.2.6
diff -u -r1.1.2.5 -r1.1.2.6
--- AbstractProgrammingLanguage.java 2000/09/06 23:22:22 1.1.2.5
+++ AbstractProgrammingLanguage.java 2000/10/19 14:43:35 1.1.2.6
@@ -13,8 +13,7 @@
import org.apache.avalon.Configuration;
import org.apache.avalon.ConfigurationException;
-import org.apache.avalon.utils.Parameters;
-import org.apache.avalon.AbstractNamedComponent;
+import org.apache.avalon.Parameters;
import org.apache.cocoon.util.ClassUtils;
import org.apache.cocoon.components.language.LanguageException;
@@ -25,16 +24,29 @@
* unloading.
*
* @author <a href="mailto:[EMAIL PROTECTED]">Ricardo Rocha</a>
- * @version CVS $Revision: 1.1.2.5 $ $Date: 2000/09/06 23:22:22 $
+ * @version CVS $Revision: 1.1.2.6 $ $Date: 2000/10/19 14:43:35 $
*/
public abstract class AbstractProgrammingLanguage
- extends AbstractNamedComponent
- implements ProgrammingLanguage
+ implements ProgrammingLanguage, Configurable
{
/** The source code formatter */
protected Class codeFormatter;
+ protected String languageName;
+
/**
+ * Configure the language
+ */
+ public void configure(Configuration conf) throws ConfigurationException {
+ try {
+ this.setParameters( Parameters.fromConfiguration(conf) );
+ } catch (Exception e) {
+ throw new ConfigurationException("Could not get parameters
because: " +
+ e.getMessage());
+ }
+ }
+
+ /**
* Set the configuration parameters. This method instantiates the
* sitemap-specified source code formatter
*
@@ -91,5 +103,13 @@
file.delete();
this.doUnload(program, filename, baseDirectory);
+ }
+
+ public final void setLanguageName(String name) {
+ this.languageName = name;
+ }
+
+ public final String getLanguageName() {
+ return this.languageName;
}
}
1.1.2.8 +6 -5
xml-cocoon/src/org/apache/cocoon/components/language/programming/Attic/CompiledProgrammingLanguage.java
Index: CompiledProgrammingLanguage.java
===================================================================
RCS file:
/home/cvs/xml-cocoon/src/org/apache/cocoon/components/language/programming/Attic/CompiledProgrammingLanguage.java,v
retrieving revision 1.1.2.7
retrieving revision 1.1.2.8
diff -u -r1.1.2.7 -r1.1.2.8
--- CompiledProgrammingLanguage.java 2000/09/19 00:27:14 1.1.2.7
+++ CompiledProgrammingLanguage.java 2000/10/19 14:43:36 1.1.2.8
@@ -9,13 +9,14 @@
import java.io.File;
-import org.apache.avalon.utils.Parameters;
+import org.apache.avalon.Parameters;
import org.apache.avalon.Composer;
import org.apache.avalon.Component;
import org.apache.avalon.ComponentManager;
import org.apache.cocoon.Cocoon;
+import org.apache.cocoon.Roles;
import org.apache.cocoon.util.ClassUtils;
import org.apache.cocoon.components.language.LanguageException;
@@ -25,7 +26,7 @@
* and object program files
*
* @author <a href="mailto:[EMAIL PROTECTED]">Ricardo Rocha</a>
- * @version CVS $Revision: 1.1.2.7 $ $Date: 2000/09/19 00:27:14 $
+ * @version CVS $Revision: 1.1.2.8 $ $Date: 2000/10/19 14:43:36 $
*/
public abstract class CompiledProgrammingLanguage
extends AbstractProgrammingLanguage
@@ -57,7 +58,7 @@
if (compilerClass == null) {
throw new LanguageException(
"Missing 'compiler' parameter for compiled language '" +
- this.getName() + "'"
+ this.getLanguageName() + "'"
);
}
this.compilerClass = ClassUtils.loadClass(compilerClass);
@@ -70,9 +71,9 @@
*
* @param manager The global component manager
*/
- public void setComponentManager(ComponentManager manager) {
+ public void compose(ComponentManager manager) {
this.manager = manager;
- this.classpath = ((Cocoon)
this.manager.getComponent("cocoon")).getClasspath();
+ this.classpath = ((Cocoon)
this.manager.lookup(Roles.COCOON)).getClasspath();
}
/**
1.1.2.5 +17 -3
xml-cocoon/src/org/apache/cocoon/components/language/programming/Attic/ProgrammingLanguage.java
Index: ProgrammingLanguage.java
===================================================================
RCS file:
/home/cvs/xml-cocoon/src/org/apache/cocoon/components/language/programming/Attic/ProgrammingLanguage.java,v
retrieving revision 1.1.2.4
retrieving revision 1.1.2.5
diff -u -r1.1.2.4 -r1.1.2.5
--- ProgrammingLanguage.java 2000/07/29 18:30:30 1.1.2.4
+++ ProgrammingLanguage.java 2000/10/19 14:43:36 1.1.2.5
@@ -7,7 +7,7 @@
*****************************************************************************/
package org.apache.cocoon.components.language.programming;
-import org.apache.avalon.NamedComponent;
+import org.apache.avalon.Component;
import org.apache.cocoon.components.language.LanguageException;
@@ -15,9 +15,9 @@
* This interface states the functionality of a programming language
processor
*
* @author <a href="mailto:[EMAIL PROTECTED]">Ricardo Rocha</a>
- * @version CVS $Revision: 1.1.2.4 $ $Date: 2000/07/29 18:30:30 $
+ * @version CVS $Revision: 1.1.2.5 $ $Date: 2000/10/19 14:43:36 $
*/
-public interface ProgrammingLanguage extends NamedComponent {
+public interface ProgrammingLanguage extends Component {
/**
* Return the programming language's source file extension
*
@@ -75,4 +75,18 @@
* @return The escaped string
*/
public String quoteString(String constant);
+
+ /**
+ * Set Language Name
+ *
+ * @param name The name of the language
+ */
+ public void setLanguageName(String name);
+
+ /**
+ * Get Language Name
+ *
+ * @return The name of the language
+ */
+ public String getLanguageName();
}
No revision
No revision
1.1.2.10 +9 -8
xml-cocoon/src/org/apache/cocoon/components/language/programming/java/Attic/JavaLanguage.java
Index: JavaLanguage.java
===================================================================
RCS file:
/home/cvs/xml-cocoon/src/org/apache/cocoon/components/language/programming/java/Attic/JavaLanguage.java,v
retrieving revision 1.1.2.9
retrieving revision 1.1.2.10
diff -u -r1.1.2.9 -r1.1.2.10
--- JavaLanguage.java 2000/09/25 15:00:29 1.1.2.9
+++ JavaLanguage.java 2000/10/19 14:43:40 1.1.2.10
@@ -13,12 +13,13 @@
import java.io.IOException;
import java.util.List;
-import org.apache.avalon.utils.Parameters;
+import org.apache.avalon.Parameters;
import org.apache.avalon.Composer;
import org.apache.avalon.Component;
import org.apache.avalon.ComponentManager;
+import org.apache.cocoon.Roles;
import org.apache.cocoon.util.ClassUtils;
import org.apache.cocoon.util.JavaArchiveFilter;
import org.apache.cocoon.components.classloader.ClassLoaderManager;
@@ -29,7 +30,7 @@
* The Java programming language processor
*
* @author <a href="mailto:[EMAIL PROTECTED]">Ricardo Rocha</a>
- * @version CVS $Revision: 1.1.2.9 $ $Date: 2000/09/25 15:00:29 $
+ * @version CVS $Revision: 1.1.2.10 $ $Date: 2000/10/19 14:43:40 $
*/
public class JavaLanguage extends CompiledProgrammingLanguage {
@@ -73,9 +74,9 @@
protected void setParameters(Parameters params) throws Exception {
super.setParameters(params);
- String compilerClass = params.getParameter("class-loader", null);
+ String compilerClass = params.getParameter("class-loader",
"org.apache.cocoon.components.classloader.ClassLoaderManagerImpl");
if (compilerClass != null) {
- this.classLoaderManager = (ClassLoaderManager)
ClassUtils.newInstance(compilerClass);
+ this.classLoaderManager = (ClassLoaderManager)
ClassUtils.newInstance(compilerClass);
}
}
@@ -86,12 +87,12 @@
*
* @param manager The global component manager
*/
- public void setComponentManager(ComponentManager manager) {
- super.setComponentManager(manager);
+ public void compose(ComponentManager manager) {
+ super.compose(manager);
if (this.classLoaderManager == null) {
this.classLoaderManager =
- (ClassLoaderManager) this.manager.getComponent("class-loader");
+ (ClassLoaderManager) this.manager.lookup(Roles.CLASS_LOADER);
}
}
@@ -245,7 +246,7 @@
return buffer.toString();
}
-
+
private String expandDirs(String d) {
File dir = new File(d);
File[] files = dir.listFiles(new JavaArchiveFilter());
No revision
No revision
1.1.2.6 +2 -2
xml-cocoon/src/org/apache/cocoon/generation/Attic/AbstractGenerator.java
Index: AbstractGenerator.java
===================================================================
RCS file:
/home/cvs/xml-cocoon/src/org/apache/cocoon/generation/Attic/AbstractGenerator.java,v
retrieving revision 1.1.2.5
retrieving revision 1.1.2.6
diff -u -r1.1.2.5 -r1.1.2.6
--- AbstractGenerator.java 2000/09/02 21:12:36 1.1.2.5
+++ AbstractGenerator.java 2000/10/19 14:43:46 1.1.2.6
@@ -9,7 +9,7 @@
import java.util.Map;
-import org.apache.avalon.utils.Parameters;
+import org.apache.avalon.Parameters;
import org.apache.cocoon.xml.AbstractXMLProducer;
@@ -19,7 +19,7 @@
*
* @author <a href="mailto:[EMAIL PROTECTED]">Pierpaolo Fumagalli</a>
* (Apache Software Foundation, Exoffice Technologies)
- * @version CVS $Revision: 1.1.2.5 $ $Date: 2000/09/02 21:12:36 $
+ * @version CVS $Revision: 1.1.2.6 $ $Date: 2000/10/19 14:43:46 $
*/
public abstract class AbstractGenerator extends AbstractXMLProducer
implements Generator {
1.1.2.5 +2 -2
xml-cocoon/src/org/apache/cocoon/generation/Attic/ComposerGenerator.java
Index: ComposerGenerator.java
===================================================================
RCS file:
/home/cvs/xml-cocoon/src/org/apache/cocoon/generation/Attic/ComposerGenerator.java,v
retrieving revision 1.1.2.4
retrieving revision 1.1.2.5
diff -u -r1.1.2.4 -r1.1.2.5
--- ComposerGenerator.java 2000/07/28 16:20:18 1.1.2.4
+++ ComposerGenerator.java 2000/10/19 14:43:47 1.1.2.5
@@ -15,7 +15,7 @@
*
* @author <a href="mailto:[EMAIL PROTECTED]">Pierpaolo Fumagalli</a>
* (Apache Software Foundation, Exoffice Technologies)
- * @version CVS $Revision: 1.1.2.4 $ $Date: 2000/07/28 16:20:18 $
+ * @version CVS $Revision: 1.1.2.5 $ $Date: 2000/10/19 14:43:47 $
*/
public abstract class ComposerGenerator extends AbstractGenerator
implements Composer {
@@ -27,7 +27,7 @@
* Set the current <code>ComponentManager</code> instance used by this
* <code>Composer</code>.
*/
- public void setComponentManager(ComponentManager manager) {
+ public void compose(ComponentManager manager) {
this.manager=manager;
}
}
1.1.2.11 +2 -2
xml-cocoon/src/org/apache/cocoon/generation/Attic/DirectoryGenerator.java
Index: DirectoryGenerator.java
===================================================================
RCS file:
/home/cvs/xml-cocoon/src/org/apache/cocoon/generation/Attic/DirectoryGenerator.java,v
retrieving revision 1.1.2.10
retrieving revision 1.1.2.11
diff -u -r1.1.2.10 -r1.1.2.11
--- DirectoryGenerator.java 2000/09/29 01:04:02 1.1.2.10
+++ DirectoryGenerator.java 2000/10/19 14:43:47 1.1.2.11
@@ -20,7 +20,7 @@
import org.xml.sax.SAXException;
import org.xml.sax.helpers.AttributesImpl;
-import org.apache.avalon.utils.Parameters;
+import org.apache.avalon.Parameters;
/**
* Generates an XML directory listing.
@@ -55,7 +55,7 @@
*
* @author <a href="mailto:[EMAIL PROTECTED]">Pierpaolo Fumagalli</a>
* (Apache Software Foundation, Exoffice Technologies)
- * @version CVS $Revision: 1.1.2.10 $ $Date: 2000/09/29 01:04:02 $ */
+ * @version CVS $Revision: 1.1.2.11 $ $Date: 2000/10/19 14:43:47 $ */
public class DirectoryGenerator extends ComposerGenerator {
1.1.2.8 +3 -2
xml-cocoon/src/org/apache/cocoon/generation/Attic/FileGenerator.java
Index: FileGenerator.java
===================================================================
RCS file:
/home/cvs/xml-cocoon/src/org/apache/cocoon/generation/Attic/FileGenerator.java,v
retrieving revision 1.1.2.7
retrieving revision 1.1.2.8
diff -u -r1.1.2.7 -r1.1.2.8
--- FileGenerator.java 2000/10/08 21:05:51 1.1.2.7
+++ FileGenerator.java 2000/10/19 14:43:48 1.1.2.8
@@ -11,13 +11,14 @@
import java.io.IOException;
import org.apache.cocoon.components.parser.Parser;
import org.apache.cocoon.ProcessingException;
+import org.apache.cocoon.Roles;
import org.xml.sax.SAXException;
/**
*
* @author <a href="mailto:[EMAIL PROTECTED]">Pierpaolo Fumagalli</a>
* (Apache Software Foundation, Exoffice Technologies)
- * @version CVS $Revision: 1.1.2.7 $ $Date: 2000/10/08 21:05:51 $
+ * @version CVS $Revision: 1.1.2.8 $ $Date: 2000/10/19 14:43:48 $
*/
public class FileGenerator extends ComposerGenerator implements Poolable {
@@ -26,7 +27,7 @@
*/
public void generate()
throws IOException, SAXException {
- Parser parser=(Parser)this.manager.getComponent("parser");
+ Parser parser=(Parser)this.manager.lookup(Roles.PARSER);
parser.setContentHandler(this.contentHandler);
parser.setLexicalHandler(this.lexicalHandler);
parser.parse(super.resolver.resolveEntity(null,this.source));
1.1.2.8 +2 -2
xml-cocoon/src/org/apache/cocoon/generation/Attic/PhpGenerator.java
Index: PhpGenerator.java
===================================================================
RCS file:
/home/cvs/xml-cocoon/src/org/apache/cocoon/generation/Attic/PhpGenerator.java,v
retrieving revision 1.1.2.7
retrieving revision 1.1.2.8
diff -u -r1.1.2.7 -r1.1.2.8
--- PhpGenerator.java 2000/08/21 17:37:52 1.1.2.7
+++ PhpGenerator.java 2000/10/19 14:43:49 1.1.2.8
@@ -26,7 +26,7 @@
* results into SAX events.
*
* @author <a href="mailto:[EMAIL PROTECTED]">Sam Ruby</a>
- * @version CVS $Revision: 1.1.2.7 $ $Date: 2000/08/21 17:37:52 $
+ * @version CVS $Revision: 1.1.2.8 $ $Date: 2000/10/19 14:43:49 $
*/
public class PhpGenerator extends ServletGenerator {
@@ -125,7 +125,7 @@
new Thread(php).start();
// pipe the results into the parser
- Parser parser=(Parser)this.manager.getComponent("parser");
+ Parser
parser=(Parser)this.manager.getComponent("org.apache.cocoon.components.parser.Parser");
parser.setContentHandler(this.contentHandler);
parser.setLexicalHandler(this.lexicalHandler);
parser.parse(new InputSource(input));
1.1.2.5 +5 -4
xml-cocoon/src/org/apache/cocoon/generation/Attic/RequestGenerator.java
Index: RequestGenerator.java
===================================================================
RCS file:
/home/cvs/xml-cocoon/src/org/apache/cocoon/generation/Attic/RequestGenerator.java,v
retrieving revision 1.1.2.4
retrieving revision 1.1.2.5
diff -u -r1.1.2.4 -r1.1.2.5
--- RequestGenerator.java 2000/08/04 21:11:45 1.1.2.4
+++ RequestGenerator.java 2000/10/19 14:43:50 1.1.2.5
@@ -7,6 +7,7 @@
*****************************************************************************/
package org.apache.cocoon.generation;
+import java.util.Iterator;
import java.util.Enumeration;
import org.xml.sax.SAXException;
@@ -17,7 +18,7 @@
* @author <a href="mailto:[EMAIL PROTECTED]">Pierpaolo Fumagalli</a>
* (Apache Software Foundation, Exoffice Technologies)
* @author <a href="mailto:[EMAIL PROTECTED]">Giacomo Pati</a>
- * @version CVS $Revision: 1.1.2.4 $ $Date: 2000/08/04 21:11:45 $
+ * @version CVS $Revision: 1.1.2.5 $ $Date: 2000/10/19 14:43:50 $
*/
public class RequestGenerator extends ServletGenerator {
@@ -87,9 +88,9 @@
this.data(" ");
this.start("configurationParameters",attr);
this.data("\n");
- Enumeration confparams=super.parameters.getParameterNames();
- while (confparams.hasMoreElements()) {
- String parameter=(String)confparams.nextElement();
+ Iterator confparams=super.parameters.getParameterNames();
+ while (confparams.hasNext()) {
+ String parameter=(String)confparams.next();
this.attribute(attr,"name",parameter);
this.data(" ");
this.start("parameter",attr);
1.1.2.6 +6 -5
xml-cocoon/src/org/apache/cocoon/generation/Attic/ServerPagesGenerator.java
Index: ServerPagesGenerator.java
===================================================================
RCS file:
/home/cvs/xml-cocoon/src/org/apache/cocoon/generation/Attic/ServerPagesGenerator.java,v
retrieving revision 1.1.2.5
retrieving revision 1.1.2.6
diff -u -r1.1.2.5 -r1.1.2.6
--- ServerPagesGenerator.java 2000/08/21 17:37:52 1.1.2.5
+++ ServerPagesGenerator.java 2000/10/19 14:43:50 1.1.2.6
@@ -27,13 +27,14 @@
import org.xml.sax.SAXException;
import java.net.MalformedURLException;
import org.apache.cocoon.ProcessingException;
+import org.apache.cocoon.Roles;
/**
* This class acts as a proxy to a dynamically loaded<code>Generator</code>
* delegating actual SAX event generation.
*
* @author <a href="mailto:[EMAIL PROTECTED]">Ricardo Rocha</a>
- * @version CVS $Revision: 1.1.2.5 $ $Date: 2000/08/21 17:37:52 $
+ * @version CVS $Revision: 1.1.2.6 $ $Date: 2000/10/19 14:43:50 $
*/
public class ServerPagesGenerator
extends ServletGenerator
@@ -50,12 +51,12 @@
*
* @param manager The global component manager
*/
- public void setComponentManager(ComponentManager manager) {
- super.setComponentManager(manager);
+ public void compose(ComponentManager manager) {
+ super.compose(manager);
if (programGenerator == null) {
programGenerator = (ProgramGenerator)
- this.manager.getComponent("program-generator");
+ this.manager.lookup(Roles.PROGRAM_GENERATOR);
}
}
@@ -125,7 +126,7 @@
// Delegate XML production to loaded generator
if (generator instanceof Composer) {
- ((Composer) generator).setComponentManager(this.manager);
+ ((Composer) generator).compose(this.manager);
}
generator.setContentHandler(this);
1.1.2.4 +2 -2
xml-cocoon/src/org/apache/cocoon/generation/Attic/ServletGenerator.java
Index: ServletGenerator.java
===================================================================
RCS file:
/home/cvs/xml-cocoon/src/org/apache/cocoon/generation/Attic/ServletGenerator.java,v
retrieving revision 1.1.2.3
retrieving revision 1.1.2.4
diff -u -r1.1.2.3 -r1.1.2.4
--- ServletGenerator.java 2000/10/06 21:25:29 1.1.2.3
+++ ServletGenerator.java 2000/10/19 14:43:51 1.1.2.4
@@ -15,7 +15,7 @@
import org.apache.avalon.Composer;
import org.apache.avalon.ComponentManager;
-import org.apache.avalon.utils.Parameters;
+import org.apache.avalon.Parameters;
import org.apache.cocoon.Cocoon;
@@ -24,7 +24,7 @@
/**
*
* @author <a href="mailto:[EMAIL PROTECTED]">Giacomo Pati</a>
- * @version CVS $Revision: 1.1.2.3 $ $Date: 2000/10/06 21:25:29 $
+ * @version CVS $Revision: 1.1.2.4 $ $Date: 2000/10/19 14:43:51 $
*/
public abstract class ServletGenerator extends ComposerGenerator
implements Composer {
No revision
No revision
1.1.2.10 +2 -2
xml-cocoon/src/org/apache/cocoon/matching/Attic/RegexpURIMatcherFactory.java
Index: RegexpURIMatcherFactory.java
===================================================================
RCS file:
/home/cvs/xml-cocoon/src/org/apache/cocoon/matching/Attic/RegexpURIMatcherFactory.java,v
retrieving revision 1.1.2.9
retrieving revision 1.1.2.10
diff -u -r1.1.2.9 -r1.1.2.10
--- RegexpURIMatcherFactory.java 2000/10/06 21:25:29 1.1.2.9
+++ RegexpURIMatcherFactory.java 2000/10/19 14:44:00 1.1.2.10
@@ -20,7 +20,7 @@
* for request URIs
*
* @author <a href="mailto:[EMAIL PROTECTED]">Giacomo Pati</a>
- * @version CVS $Revision: 1.1.2.9 $ $Date: 2000/10/06 21:25:29 $
+ * @version CVS $Revision: 1.1.2.10 $ $Date: 2000/10/19 14:44:00 $
*/
public class RegexpURIMatcherFactory implements MatcherFactory {
@@ -58,7 +58,7 @@
.append("));");
return sb.toString();
} catch (RESyntaxException rse) {
- throw new ConfigurationException (rse.getMessage(), null);
+ throw new ConfigurationException (rse.getMessage());
}
}
1.1.2.15 +2 -2
xml-cocoon/src/org/apache/cocoon/matching/Attic/WildcardURIMatcherFactory.java
Index: WildcardURIMatcherFactory.java
===================================================================
RCS file:
/home/cvs/xml-cocoon/src/org/apache/cocoon/matching/Attic/WildcardURIMatcherFactory.java,v
retrieving revision 1.1.2.14
retrieving revision 1.1.2.15
diff -u -r1.1.2.14 -r1.1.2.15
--- WildcardURIMatcherFactory.java 2000/10/06 21:25:29 1.1.2.14
+++ WildcardURIMatcherFactory.java 2000/10/19 14:44:01 1.1.2.15
@@ -18,7 +18,7 @@
*
* @author <a href="mailto:[EMAIL PROTECTED]">Giacomo Pati</a>
* @author <a href="mailto:[EMAIL PROTECTED]">Stefano Mazzocchi</a>
- * @version CVS $Revision: 1.1.2.14 $ $Date: 2000/10/06 21:25:29 $
+ * @version CVS $Revision: 1.1.2.15 $ $Date: 2000/10/19 14:44:01 $
*/
public class WildcardURIMatcherFactory implements MatcherFactory {
@@ -73,7 +73,7 @@
return result.append (sourcePattern[j])
.append ("};").toString();
} catch (NullPointerException pe) {
- throw new ConfigurationException (pe.getMessage(), null);
+ throw new ConfigurationException (pe.getMessage());
}
}
No revision
No revision
1.1.2.5 +2 -2
xml-cocoon/src/org/apache/cocoon/reading/Attic/AbstractReader.java
Index: AbstractReader.java
===================================================================
RCS file:
/home/cvs/xml-cocoon/src/org/apache/cocoon/reading/Attic/AbstractReader.java,v
retrieving revision 1.1.2.4
retrieving revision 1.1.2.5
diff -u -r1.1.2.4 -r1.1.2.5
--- AbstractReader.java 2000/09/02 21:12:38 1.1.2.4
+++ AbstractReader.java 2000/10/19 14:44:07 1.1.2.5
@@ -10,14 +10,14 @@
import java.io.OutputStream;
import java.util.Map;
-import org.apache.avalon.utils.Parameters;
+import org.apache.avalon.Parameters;
import org.xml.sax.EntityResolver;
/**
*
* @author <a href="mailto:[EMAIL PROTECTED]">Giacomo Pati</a>
- * @version CVS $Revision: 1.1.2.4 $ $Date: 2000/09/02 21:12:38 $
+ * @version CVS $Revision: 1.1.2.5 $ $Date: 2000/10/19 14:44:07 $
*/
public abstract class AbstractReader implements Reader {
/** The current <code>EntityResolver</code>. */
No revision
No revision
1.1.2.2 +9 -9
xml-cocoon/src/org/apache/cocoon/serialization/Attic/AbstractTextSerializer.java
Index: AbstractTextSerializer.java
===================================================================
RCS file:
/home/cvs/xml-cocoon/src/org/apache/cocoon/serialization/Attic/AbstractTextSerializer.java,v
retrieving revision 1.1.2.1
retrieving revision 1.1.2.2
diff -u -r1.1.2.1 -r1.1.2.2
--- AbstractTextSerializer.java 2000/09/27 16:15:36 1.1.2.1
+++ AbstractTextSerializer.java 2000/10/19 14:44:13 1.1.2.2
@@ -20,7 +20,7 @@
* @author <a href="mailto:[EMAIL PROTECTED]">Pierpaolo Fumagalli</a>
* (Apache Software Foundation, Exoffice Technologies)
* @author <a href="mailto:[EMAIL PROTECTED]">Stefano Mazzocchi</a>
- * @version CVS $Revision: 1.1.2.1 $ $Date: 2000/09/27 16:15:36 $
+ * @version CVS $Revision: 1.1.2.2 $ $Date: 2000/10/19 14:44:13 $
*/
public abstract class AbstractTextSerializer extends AbstractSerializer
implements Configurable {
@@ -32,40 +32,40 @@
/**
* Set the configurations for this serializer.
*/
- public void setConfiguration(Configuration conf)
+ public void configure(Configuration conf)
throws ConfigurationException {
format = new OutputFormat();
format.setPreserveSpace(true);
- Configuration encoding = conf.getConfiguration("encoding");
+ Configuration encoding = conf.getChild("encoding");
if (encoding != null) {
format.setEncoding(encoding.getValue());
}
- Configuration doctypePublic =
conf.getConfiguration("doctype-public");
- Configuration doctypeSystem =
conf.getConfiguration("doctype-system");
+ Configuration doctypePublic = conf.getChild("doctype-public");
+ Configuration doctypeSystem = conf.getChild("doctype-system");
if (doctypeSystem != null) {
format.setDoctype((doctypePublic != null) ?
doctypePublic.getValue() : null, doctypeSystem.getValue());
}
- Configuration indent = conf.getConfiguration("indent");
+ Configuration indent = conf.getChild("indent");
if (indent != null) {
format.setIndenting(true);
format.setIndent(indent.getValueAsInt());
}
- Configuration preserveSpace =
conf.getConfiguration("preserve-space");
+ Configuration preserveSpace = conf.getChild("preserve-space");
if (preserveSpace != null) {
format.setPreserveSpace(preserveSpace.getValueAsBoolean());
}
- Configuration declaration = conf.getConfiguration("xml-declaration");
+ Configuration declaration = conf.getChild("xml-declaration");
if (declaration != null) {
format.setOmitXMLDeclaration(!declaration.getValueAsBoolean());
}
- Configuration lineWidth = conf.getConfiguration("line-width");
+ Configuration lineWidth = conf.getChild("line-width");
if (lineWidth != null) {
format.setLineWidth(lineWidth.getValueAsInt());
}
1.1.2.12 +12 -11
xml-cocoon/src/org/apache/cocoon/serialization/Attic/SVGSerializer.java
Index: SVGSerializer.java
===================================================================
RCS file:
/home/cvs/xml-cocoon/src/org/apache/cocoon/serialization/Attic/SVGSerializer.java,v
retrieving revision 1.1.2.11
retrieving revision 1.1.2.12
diff -u -r1.1.2.11 -r1.1.2.12
--- SVGSerializer.java 2000/09/27 16:15:43 1.1.2.11
+++ SVGSerializer.java 2000/10/19 14:44:14 1.1.2.12
@@ -57,33 +57,34 @@
/**
* Set the configurations for this serializer.
*/
- public void setConfiguration(Configuration conf) throws
ConfigurationException {
+ public void configure(Configuration conf) throws ConfigurationException {
this.config = conf;
// First, get a DOM parser for the DOM Builder to work with.
- super.factory= (Parser) this.manager.getComponent("parser");
+ super.factory= (Parser) this.manager.lookup(Roles.PARSER);
// What image encoder do I use?
- String enc = this.config.getConfiguration("encoder").getValue();
+ String enc = this.config.getChild("encoder").getValue();
if (enc == null) {
- throw new ConfigurationException("No Image Encoder specified.",
conf);
+ throw new ConfigurationException("No Image Encoder
specified."/*, conf*/);
}
try {
- this.encoder = (ImageEncoder) this.manager.getComponent(enc);
+ ComponentSelector selector = (ComponentSelector)
this.manager.lookup(Roles.IMAGE_ENCODER);
+ this.encoder = (ImageEncoder) selector.select(enc);
} catch (ComponentNotFoundException e) {
throw new ConfigurationException("The ImageEncoder '"
- + enc + "' cannot be found. Check your component
configuration in the sitemap", conf);
+ + enc + "' cannot be found. Check your component
configuration in the sitemap"/*, conf*/);
}
// Configure the encoder
if (this.encoder instanceof Configurable) {
- ((Configurable)this.encoder).setConfiguration(conf);
+ ((Configurable)this.encoder).configure(conf);
}
// Transparent or a solid colour background?
- this.transparent =
this.config.getConfiguration("transparent").getValueAsBoolean(false);
+ this.transparent =
this.config.getChild("transparent").getValueAsBoolean(false);
if (!transparent) {
- String bg =
this.config.getConfiguration("background").getValue("#FFFFFF").trim();
+ String bg =
this.config.getChild("background").getValue("#FFFFFF").trim();
if (bg.startsWith("#")) {
bg = bg.substring(1);
}
@@ -91,7 +92,7 @@
try {
this.backgroundColour = new Color(Integer.parseInt(bg, 16));
} catch (NumberFormatException e) {
- throw new ConfigurationException(bg + " is not a valid
color.", conf);
+ throw new ConfigurationException(bg + " is not a valid
color."/*, conf*/);
}
}
}
@@ -100,7 +101,7 @@
* Set the current <code>ComponentManager</code> instance used by this
* <code>Composer</code>.
*/
- public void setComponentManager(ComponentManager manager) {
+ public void compose(ComponentManager manager) {
this.manager = manager;
}
No revision
No revision
1.1.2.12 +2 -2
xml-cocoon/src/org/apache/cocoon/sitemap/Attic/AbstractSitemap.java
Index: AbstractSitemap.java
===================================================================
RCS file:
/home/cvs/xml-cocoon/src/org/apache/cocoon/sitemap/Attic/AbstractSitemap.java,v
retrieving revision 1.1.2.11
retrieving revision 1.1.2.12
diff -u -r1.1.2.11 -r1.1.2.12
--- AbstractSitemap.java 2000/10/13 04:14:41 1.1.2.11
+++ AbstractSitemap.java 2000/10/19 14:44:17 1.1.2.12
@@ -31,7 +31,7 @@
* Base class for generated <code>Sitemap</code> classes
*
* @author <a href="mailto:[EMAIL PROTECTED]">Giacomo Pati</a>
- * @version CVS $Revision: 1.1.2.11 $ $Date: 2000/10/13 04:14:41 $
+ * @version CVS $Revision: 1.1.2.12 $ $Date: 2000/10/19 14:44:17 $
*/
public abstract class AbstractSitemap implements Sitemap {
@@ -59,7 +59,7 @@
* Set the current <code>ComponentManager</code> instance used by this
* <code>Composer</code>.
*/
- public void setComponentManager(ComponentManager manager) {
+ public void compose(ComponentManager manager) {
this.manager = manager;
}
1.1.2.3 +4 -4
xml-cocoon/src/org/apache/cocoon/sitemap/Attic/DefaultComponentHolder.java
Index: DefaultComponentHolder.java
===================================================================
RCS file:
/home/cvs/xml-cocoon/src/org/apache/cocoon/sitemap/Attic/DefaultComponentHolder.java,v
retrieving revision 1.1.2.2
retrieving revision 1.1.2.3
diff -u -r1.1.2.2 -r1.1.2.3
--- DefaultComponentHolder.java 2000/10/13 04:14:42 1.1.2.2
+++ DefaultComponentHolder.java 2000/10/19 14:44:18 1.1.2.3
@@ -21,7 +21,7 @@
* a spezial behaviour or treatment.
*
* @author <a href="mailto:[EMAIL PROTECTED]">Giacomo Pati</a>
- * @version CVS $Revision: 1.1.2.2 $ $Date: 2000/10/13 04:14:42 $
+ * @version CVS $Revision: 1.1.2.3 $ $Date: 2000/10/19 14:44:18 $
*/
public class DefaultComponentHolder implements ComponentHolder {
@@ -48,10 +48,10 @@
public Component get() throws Exception {
Component comp = (Component) ClassUtils.newInstance (this.className);
if (comp instanceof Composer) {
- ((Composer) comp).setComponentManager (this.manager);
+ ((Composer) comp).compose (this.manager);
}
if (comp instanceof Configurable) {
- ((Configurable) comp).setConfiguration (this.configuration);
+ ((Configurable) comp).configure (this.configuration);
}
return comp;
}
@@ -78,4 +78,4 @@
public String getMimeType() {
return mime_type;
}
-}
\ No newline at end of file
+}
1.1.2.4 +7 -6
xml-cocoon/src/org/apache/cocoon/sitemap/Attic/Handler.java
Index: Handler.java
===================================================================
RCS file:
/home/cvs/xml-cocoon/src/org/apache/cocoon/sitemap/Attic/Handler.java,v
retrieving revision 1.1.2.3
retrieving revision 1.1.2.4
diff -u -r1.1.2.3 -r1.1.2.4
--- Handler.java 2000/10/13 04:14:42 1.1.2.3
+++ Handler.java 2000/10/19 14:44:19 1.1.2.4
@@ -20,6 +20,7 @@
import org.apache.cocoon.ProcessingException;
import org.apache.cocoon.components.language.generator.ProgramGenerator;
import org.apache.cocoon.environment.Environment;
+import org.apache.cocoon.Roles;
import org.apache.avalon.Configurable;
import org.apache.avalon.Configuration;
@@ -31,7 +32,7 @@
*
* @author <a href="mailto:[EMAIL PROTECTED]">Giacomo Pati</a>
* @author <a href="mailto:[EMAIL PROTECTED]">Stefano Mazzocchi</a>
- * @version CVS $Revision: 1.1.2.3 $ $Date: 2000/10/13 04:14:42 $
+ * @version CVS $Revision: 1.1.2.4 $ $Date: 2000/10/19 14:44:19 $
*/
public class Handler implements Runnable, Configurable, Composer, Processor {
@@ -62,11 +63,11 @@
/** the sitemaps base path */
private String basePath;
- public void setComponentManager (ComponentManager manager) {
+ public void compose (ComponentManager manager) {
this.manager = manager;
}
- public void setConfiguration (Configuration conf) {
+ public void configure (Configuration conf) {
this.conf = conf;
}
@@ -147,11 +148,11 @@
String programmingLanguage = "java";
try {
- ProgramGenerator programGenerator = (ProgramGenerator)
this.manager.getComponent("program-generator");
+ ProgramGenerator programGenerator = (ProgramGenerator)
this.manager.lookup(Roles.PROGRAM_GENERATOR);
smap = (Sitemap) programGenerator.load(file, markupLanguage,
programmingLanguage, environment);
smap.setParentSitemapComponentManager
(this.parentSitemapComponentManager);
- if (smap instanceof Composer)
smap.setComponentManager(this.manager);
- if (smap instanceof Configurable)
smap.setConfiguration(this.conf);
+ if (smap instanceof Composer) smap.compose(this.manager);
+ if (smap instanceof Configurable) smap.configure(this.conf);
this.sitemap = smap;
} catch (Exception e) {
this.exception = e;
1.1.2.11 +2 -2
xml-cocoon/src/org/apache/cocoon/sitemap/Attic/LinkTranslator.java
Index: LinkTranslator.java
===================================================================
RCS file:
/home/cvs/xml-cocoon/src/org/apache/cocoon/sitemap/Attic/LinkTranslator.java,v
retrieving revision 1.1.2.10
retrieving revision 1.1.2.11
diff -u -r1.1.2.10 -r1.1.2.11
--- LinkTranslator.java 2000/10/06 21:25:31 1.1.2.10
+++ LinkTranslator.java 2000/10/19 14:44:19 1.1.2.11
@@ -20,7 +20,7 @@
import org.xml.sax.Attributes;
import org.xml.sax.EntityResolver;
-import org.apache.avalon.utils.Parameters;
+import org.apache.avalon.Parameters;
import org.apache.cocoon.Cocoon;
import org.apache.cocoon.ProcessingException;
@@ -30,7 +30,7 @@
/**
* @author <a href="mailto:[EMAIL PROTECTED]">Stefano Mazzocchi</a>
- * @version CVS $Revision: 1.1.2.10 $ $Date: 2000/10/06 21:25:31 $
+ * @version CVS $Revision: 1.1.2.11 $ $Date: 2000/10/19 14:44:19 $
*/
public class LinkTranslator extends ExtendedXLinkPipe implements Transformer
{
1.1.2.3 +5 -5
xml-cocoon/src/org/apache/cocoon/sitemap/Attic/Manager.java
Index: Manager.java
===================================================================
RCS file:
/home/cvs/xml-cocoon/src/org/apache/cocoon/sitemap/Attic/Manager.java,v
retrieving revision 1.1.2.2
retrieving revision 1.1.2.3
diff -u -r1.1.2.2 -r1.1.2.3
--- Manager.java 2000/10/13 04:14:43 1.1.2.2
+++ Manager.java 2000/10/19 14:44:21 1.1.2.3
@@ -32,7 +32,7 @@
* checking regeneration of the sub <code>Sitemap</code>
*
* @author <a href="mailto:[EMAIL PROTECTED]">Giacomo Pati</a>
- * @version CVS $Revision: 1.1.2.2 $ $Date: 2000/10/13 04:14:43 $
+ * @version CVS $Revision: 1.1.2.3 $ $Date: 2000/10/19 14:44:21 $
*/
public class Manager implements Configurable, Composer {
@@ -52,11 +52,11 @@
this.parentSitemapComponentManager = sitemapComponentManager;
}
- public void setConfiguration (Configuration conf) {
+ public void configure (Configuration conf) {
this.conf = conf;
}
- public void setComponentManager (ComponentManager manager) {
+ public void compose (ComponentManager manager) {
this.manager = manager;
}
@@ -77,8 +77,8 @@
}
} else {
sitemapHandler = new Handler(parentSitemapComponentManager,
source, check_reload);
- if (sitemapHandler instanceof Composer)
sitemapHandler.setComponentManager(this.manager);
- if (sitemapHandler instanceof Configurable)
sitemapHandler.setConfiguration(this.conf);
+ if (sitemapHandler instanceof Composer)
sitemapHandler.compose(this.manager);
+ if (sitemapHandler instanceof Configurable)
sitemapHandler.configure(this.conf);
sitemaps.put(source, sitemapHandler);
sitemapHandler.regenerate(environment);
}
1.1.2.3 +4 -3
xml-cocoon/src/org/apache/cocoon/sitemap/Attic/PoolableComponentHolder.java
Index: PoolableComponentHolder.java
===================================================================
RCS file:
/home/cvs/xml-cocoon/src/org/apache/cocoon/sitemap/Attic/PoolableComponentHolder.java,v
retrieving revision 1.1.2.2
retrieving revision 1.1.2.3
diff -u -r1.1.2.2 -r1.1.2.3
--- PoolableComponentHolder.java 2000/10/13 04:14:43 1.1.2.2
+++ PoolableComponentHolder.java 2000/10/19 14:44:22 1.1.2.3
@@ -20,13 +20,14 @@
import org.apache.cocoon.util.ClassUtils;
import org.apache.cocoon.util.ComponentPool;
+import org.apache.cocoon.Roles;
/**
* This class holds a sitemap component which is not specially marked as
having
* a spezial behaviour or treatment.
*
* @author <a href="mailto:[EMAIL PROTECTED]">Giacomo Pati</a>
- * @version CVS $Revision: 1.1.2.2 $ $Date: 2000/10/13 04:14:43 $
+ * @version CVS $Revision: 1.1.2.3 $ $Date: 2000/10/19 14:44:22 $
*/
public class PoolableComponentHolder extends DefaultComponentHolder
implements ObjectFactory {
@@ -55,7 +56,7 @@
} catch (Exception e) {
this.clazz = null;
}
- PoolController pc = (PoolController)super.manager.getComponent
("sitemap-component-pool-controller");
+ PoolController pc = (PoolController)super.manager.lookup
(Roles.POOL_CONTROLLER);
this.pool = new ComponentPool (this, pc, amount, DEFAULT_AMOUNT);
}
@@ -98,4 +99,4 @@
public Class getCreatedClass() {
return this.clazz;
}
-}
\ No newline at end of file
+}
1.1.2.18 +7 -7
xml-cocoon/src/org/apache/cocoon/sitemap/Attic/ResourcePipeline.java
Index: ResourcePipeline.java
===================================================================
RCS file:
/home/cvs/xml-cocoon/src/org/apache/cocoon/sitemap/Attic/ResourcePipeline.java,v
retrieving revision 1.1.2.17
retrieving revision 1.1.2.18
diff -u -r1.1.2.17 -r1.1.2.18
--- ResourcePipeline.java 2000/10/13 04:14:43 1.1.2.17
+++ ResourcePipeline.java 2000/10/19 14:44:23 1.1.2.18
@@ -16,7 +16,7 @@
import org.apache.avalon.ComponentManager;
import org.apache.avalon.Component;
import org.apache.avalon.Composer;
-import org.apache.avalon.utils.Parameters;
+import org.apache.avalon.Parameters;
import org.apache.cocoon.ProcessingException;
import org.apache.cocoon.environment.Environment;
@@ -33,7 +33,7 @@
/**
* @author <a href="mailto:[EMAIL PROTECTED]">Giacomo Pati</a>
- * @version CVS $Revision: 1.1.2.17 $ $Date: 2000/10/13 04:14:43 $
+ * @version CVS $Revision: 1.1.2.18 $ $Date: 2000/10/19 14:44:23 $
*/
public class ResourcePipeline implements Composer {
private ComponentHolder generator;
@@ -62,7 +62,7 @@
this.sitemapComponentManager = sitemapComponentManager;
}
- public void setComponentManager (ComponentManager manager) {
+ public void compose (ComponentManager manager) {
this.manager = manager;
}
@@ -77,7 +77,7 @@
if (this.generator != null) {
throw new ProcessingException ("Generator already set. You can
only select one Generator (" + role + ")");
}
- this.generator =
(ComponentHolder)sitemapComponentManager.getComponent(role);
+ this.generator =
(ComponentHolder)sitemapComponentManager.lookup(role);
this.generatorSource = source;
this.generatorParam = param;
}
@@ -92,7 +92,7 @@
if (this.reader != null) {
throw new ProcessingException ("Reader already set. You can only
select one Reader (" + role + ")");
}
- this.reader =
(ComponentHolder)sitemapComponentManager.getComponent(role);
+ this.reader = (ComponentHolder)sitemapComponentManager.lookup(role);
this.readerSource = source;
this.readerParam = param;
this.readerMimeType = mimeType;
@@ -108,7 +108,7 @@
if (this.serializer != null) {
throw new ProcessingException ("Serializer already set. You can
only select one Serializer (" + role + ")");
}
- this.serializer =
(ComponentHolder)sitemapComponentManager.getComponent(role);
+ this.serializer =
(ComponentHolder)sitemapComponentManager.lookup(role);
this.serializerSource = source;
this.serializerParam = param;
this.serializerMimeType = mimeType;
@@ -116,7 +116,7 @@
public void addTransformer (String role, String source, Parameters param)
throws Exception {
- this.transformers.add
((ComponentHolder)sitemapComponentManager.getComponent(role));
+ this.transformers.add
((ComponentHolder)sitemapComponentManager.lookup(role));
this.transformerSources.add (source);
this.transformerParams.add (param);
}
1.1.2.3 +2 -2
xml-cocoon/src/org/apache/cocoon/sitemap/Attic/SitemapModelComponent.java
Index: SitemapModelComponent.java
===================================================================
RCS file:
/home/cvs/xml-cocoon/src/org/apache/cocoon/sitemap/Attic/SitemapModelComponent.java,v
retrieving revision 1.1.2.2
retrieving revision 1.1.2.3
diff -u -r1.1.2.2 -r1.1.2.3
--- SitemapModelComponent.java 2000/09/02 21:12:39 1.1.2.2
+++ SitemapModelComponent.java 2000/10/19 14:44:24 1.1.2.3
@@ -11,7 +11,7 @@
import java.util.Map;
import org.apache.avalon.Component;
-import org.apache.avalon.utils.Parameters;
+import org.apache.avalon.Parameters;
import org.apache.cocoon.ProcessingException;
import org.xml.sax.SAXException;
@@ -21,7 +21,7 @@
*
* @author <a href="mailto:[EMAIL PROTECTED]">Pierpaolo Fumagalli</a>
* (Apache Software Foundation, Exoffice Technologies)
- * @version CVS $Revision: 1.1.2.2 $ $Date: 2000/09/02 21:12:39 $
+ * @version CVS $Revision: 1.1.2.3 $ $Date: 2000/10/19 14:44:24 $
*/
public interface SitemapModelComponent extends Component {
No revision
No revision
1.1.2.2 +3 -2
xml-cocoon/src/org/apache/cocoon/transformation/Attic/AbstractDOMTransformer.java
Index: AbstractDOMTransformer.java
===================================================================
RCS file:
/home/cvs/xml-cocoon/src/org/apache/cocoon/transformation/Attic/AbstractDOMTransformer.java,v
retrieving revision 1.1.2.1
retrieving revision 1.1.2.2
diff -u -r1.1.2.1 -r1.1.2.2
--- AbstractDOMTransformer.java 2000/10/14 20:52:42 1.1.2.1
+++ AbstractDOMTransformer.java 2000/10/19 14:44:33 1.1.2.2
@@ -14,9 +14,10 @@
import org.apache.cocoon.xml.XMLConsumer;
import org.apache.cocoon.transformation.Transformer;
import org.apache.cocoon.components.parser.Parser;
+import org.apache.cocoon.Roles;
import org.apache.avalon.Composer;
import org.apache.avalon.ComponentManager;
-import org.apache.avalon.utils.Parameters;
+import org.apache.avalon.Parameters;
/**
* An Abstract DOM Transformer, for use when a transformer needs a DOM-based
@@ -59,7 +60,7 @@
public void setComponentManager(ComponentManager manager) {
this.manager = manager;
// Get a parser and use it as a DOM factory
- Parser p = (Parser)manager.getComponent("parser");
+ Parser p = (Parser)manager.lookup(Roles.PARSER);
super.factory = (DOMFactory)p;
}
1.1.2.9 +2 -2
xml-cocoon/src/org/apache/cocoon/transformation/Attic/LogTransformer.java
Index: LogTransformer.java
===================================================================
RCS file:
/home/cvs/xml-cocoon/src/org/apache/cocoon/transformation/Attic/LogTransformer.java,v
retrieving revision 1.1.2.8
retrieving revision 1.1.2.9
diff -u -r1.1.2.8 -r1.1.2.9
--- LogTransformer.java 2000/10/07 20:37:56 1.1.2.8
+++ LogTransformer.java 2000/10/19 14:44:34 1.1.2.9
@@ -7,7 +7,7 @@
*****************************************************************************/
package org.apache.cocoon.transformation;
-import org.apache.avalon.utils.Parameters;
+import org.apache.avalon.Parameters;
import org.apache.cocoon.ProcessingException;
@@ -45,7 +45,7 @@
*
* @author <a href="mailto:[EMAIL PROTECTED]">Giacomo Pati</a>
* (PWR Organisation & Entwicklung)
- * @version CVS $Revision: 1.1.2.8 $ $Date: 2000/10/07 20:37:56 $
+ * @version CVS $Revision: 1.1.2.9 $ $Date: 2000/10/19 14:44:34 $
*
*/
public class LogTransformer extends AbstractTransformer {
1.1.2.11 +2 -2
xml-cocoon/src/org/apache/cocoon/transformation/Attic/SQLTransformer.java
Index: SQLTransformer.java
===================================================================
RCS file:
/home/cvs/xml-cocoon/src/org/apache/cocoon/transformation/Attic/SQLTransformer.java,v
retrieving revision 1.1.2.10
retrieving revision 1.1.2.11
diff -u -r1.1.2.10 -r1.1.2.11
--- SQLTransformer.java 2000/10/07 20:15:53 1.1.2.10
+++ SQLTransformer.java 2000/10/19 14:44:34 1.1.2.11
@@ -19,7 +19,7 @@
import java.util.Map;
import java.util.Enumeration;
-import org.apache.avalon.utils.Parameters;
+import org.apache.avalon.Parameters;
import org.apache.cocoon.ProcessingException;
import org.apache.cocoon.xml.XMLConsumer;
import org.apache.cocoon.xml.XMLProducer;
@@ -38,7 +38,7 @@
* @author <a href="mailto:[EMAIL PROTECTED]">Donald Ball</a>
* @author <a href="mailto:[EMAIL PROTECTED]">Giacomo Pati</a>
* (PWR Organisation & Entwicklung)
- * @version CVS $Revision: 1.1.2.10 $ $Date: 2000/10/07 20:15:53 $ $Author:
giacomo $
+ * @version CVS $Revision: 1.1.2.11 $ $Date: 2000/10/19 14:44:34 $ $Author:
bloritsch $
*/
public class SQLTransformer extends AbstractTransformer {
1.1.2.9 +5 -4
xml-cocoon/src/org/apache/cocoon/transformation/Attic/XIncludeTransformer.java
Index: XIncludeTransformer.java
===================================================================
RCS file:
/home/cvs/xml-cocoon/src/org/apache/cocoon/transformation/Attic/XIncludeTransformer.java,v
retrieving revision 1.1.2.8
retrieving revision 1.1.2.9
diff -u -r1.1.2.8 -r1.1.2.9
--- XIncludeTransformer.java 2000/10/12 16:44:07 1.1.2.8
+++ XIncludeTransformer.java 2000/10/19 14:44:35 1.1.2.9
@@ -25,9 +25,10 @@
import org.w3c.dom.NodeList;
import org.w3c.dom.Node;
import org.w3c.dom.Document;
-import org.apache.avalon.utils.Parameters;
+import org.apache.avalon.Parameters;
import org.apache.avalon.ComponentManager;
import org.apache.avalon.Composer;
+import org.apache.cocoon.Roles;
import org.apache.cocoon.ProcessingException;
import org.apache.cocoon.components.parser.Parser;
import org.apache.cocoon.xml.dom.DOMBuilder;
@@ -42,7 +43,7 @@
* by the SAX event FSM yet.
*
* @author <a href="mailto:[EMAIL PROTECTED]">Donald Ball</a>
- * @version CVS $Revision: 1.1.2.8 $ $Date: 2000/10/12 16:44:07 $ $Author:
giacomo $
+ * @version CVS $Revision: 1.1.2.9 $ $Date: 2000/10/19 14:44:35 $ $Author:
bloritsch $
*/
public class XIncludeTransformer extends AbstractTransformer implements
Composer {
@@ -90,7 +91,7 @@
}
*/
- public void setComponentManager(ComponentManager manager) {
+ public void compose(ComponentManager manager) {
this.manager = manager;
}
@@ -202,7 +203,7 @@
}
} else if (parse.equals("xml")) {
if (debug) { System.err.println("Parse type is XML"); }
- Parser parser = (Parser)manager.getComponent("parser");
+ Parser parser = (Parser)manager.lookup(Roles.PARSER);
InputSource input;
if (object instanceof Reader) {
input = new InputSource((Reader)object);
1.1.2.4 +5 -4
xml-cocoon/src/org/apache/cocoon/transformation/Attic/XTTransformer.java
Index: XTTransformer.java
===================================================================
RCS file:
/home/cvs/xml-cocoon/src/org/apache/cocoon/transformation/Attic/XTTransformer.java,v
retrieving revision 1.1.2.3
retrieving revision 1.1.2.4
diff -u -r1.1.2.3 -r1.1.2.4
--- XTTransformer.java 2000/10/06 21:25:32 1.1.2.3
+++ XTTransformer.java 2000/10/19 14:44:36 1.1.2.4
@@ -20,9 +20,10 @@
import org.apache.avalon.ComponentManager;
import org.apache.avalon.Composer;
import org.apache.avalon.Modifiable;
-import org.apache.avalon.utils.Parameters;
+import org.apache.avalon.Parameters;
import org.apache.cocoon.Cocoon;
+import org.apache.cocoon.Roles;
import org.apache.cocoon.ProcessingException;
import org.apache.cocoon.xml.XMLConsumer;
import org.apache.cocoon.xml.DocumentHandlerAdapter;
@@ -66,7 +67,7 @@
* This Transformer use the XT processor.
*
* @author <a href="mailto:[EMAIL PROTECTED]">Sahuc Sebastien</a>
- * @version CVS $Revision: 1.1.2.3 $ $Date: 2000/10/06 21:25:32 $
+ * @version CVS $Revision: 1.1.2.4 $ $Date: 2000/10/19 14:44:36 $
*/
public class XTTransformer extends DocumentHandlerWrapper
implements Transformer, Composer {
@@ -84,8 +85,8 @@
* Set the current <code>ComponentManager</code> instance used by this
* <code>Composer</code>.
*/
- public void setComponentManager(ComponentManager manager) {
- this.store = (Store) manager.getComponent("store");
+ public void compose(ComponentManager manager) {
+ this.store = (Store) manager.lookup(Roles.STORE);
}
/**
1.1.2.14 +5 -4
xml-cocoon/src/org/apache/cocoon/transformation/Attic/XalanTransformer.java
Index: XalanTransformer.java
===================================================================
RCS file:
/home/cvs/xml-cocoon/src/org/apache/cocoon/transformation/Attic/XalanTransformer.java,v
retrieving revision 1.1.2.13
retrieving revision 1.1.2.14
diff -u -r1.1.2.13 -r1.1.2.14
--- XalanTransformer.java 2000/10/13 04:18:09 1.1.2.13
+++ XalanTransformer.java 2000/10/19 14:44:37 1.1.2.14
@@ -19,9 +19,10 @@
import org.apache.avalon.ComponentManager;
import org.apache.avalon.Composer;
import org.apache.avalon.Poolable;
-import org.apache.avalon.utils.Parameters;
+import org.apache.avalon.Parameters;
import org.apache.cocoon.Cocoon;
+import org.apache.cocoon.Roles;
import org.apache.cocoon.ProcessingException;
import org.apache.cocoon.components.store.Store;
import org.apache.cocoon.xml.XMLConsumer;
@@ -39,7 +40,7 @@
*
* @author <a href="mailto:[EMAIL PROTECTED]">Pierpaolo Fumagalli</a>
* (Apache Software Foundation, Exoffice Technologies)
- * @version CVS $Revision: 1.1.2.13 $ $Date: 2000/10/13 04:18:09 $
+ * @version CVS $Revision: 1.1.2.14 $ $Date: 2000/10/19 14:44:37 $
*/
public class XalanTransformer extends ContentHandlerWrapper
implements Transformer, Composer, Poolable {
@@ -78,8 +79,8 @@
* Set the current <code>ComponentManager</code> instance used by this
* <code>Composer</code>.
*/
- public void setComponentManager(ComponentManager manager) {
- this.store = (Store) manager.getComponent("store");
+ public void compose(ComponentManager manager) {
+ this.store = (Store) manager.lookup(Roles.STORE);
}
/**
No revision
No revision
1.1.2.7 +48 -45 xml-cocoon/webapp/Attic/cocoon.xconf
Index: cocoon.xconf
===================================================================
RCS file: /home/cvs/xml-cocoon/webapp/Attic/cocoon.xconf,v
retrieving revision 1.1.2.6
retrieving revision 1.1.2.7
diff -u -r1.1.2.6 -r1.1.2.7
--- cocoon.xconf 2000/10/13 04:14:45 1.1.2.6
+++ cocoon.xconf 2000/10/19 14:44:45 1.1.2.7
@@ -3,60 +3,63 @@
<!-- ===================== General Components =========================== -->
- <component role="parser"
class="org.apache.cocoon.components.parser.XercesParser"/>
- <component role="store"
class="org.apache.cocoon.components.store.MemoryStore"/>
+ <component role="org.apache.cocoon.components.parser.Parser"
class="org.apache.cocoon.components.parser.XercesParser"/>
+ <component role="org.apache.cocoon.components.store.Store"
class="org.apache.cocoon.components.store.MemoryStore"/>
- <component role="factory"
class="org.apache.avalon.NamedComponentManagerImpl">
- <component-type name="programming-language">
- <component-instance name="java"
class="org.apache.cocoon.components.language.programming.java.JavaLanguage">
- <parameter name="compiler"
value="org.apache.cocoon.components.language.programming.java.Javac"/>
- <parameter name="code-formatter"
value="org.apache.cocoon.components.language.programming.java.JstyleFormatter"/>
- <parameter name="class-loader"
value="org.apache.cocoon.components.classloader.ClassLoaderManagerImpl"/>
- </component-instance>
- </component-type>
-
- <component-type name="markup-language">
- <component-instance name="xsp"
class="org.apache.cocoon.components.language.markup.xsp.XSPMarkupLanguage">
- <parameter name="prefix" value="xsp"/>
- <parameter name="uri" value="http://apache.org/xsp"/>
-
- <target-language name="java">
- <parameter name="core-logicsheet"
value="resource://org/apache/cocoon/components/language/markup/xsp/java/xsp.xsl"/>
-
- <builtin-logicsheet>
- <parameter name="prefix" value="xsp-request"/>
- <parameter name="uri" value="http://apache.org/xsp/request"/>
- <parameter name="href"
value="resource://org/apache/cocoon/components/language/markup/xsp/java/request.xsl"/>
- </builtin-logicsheet>
-
- <builtin-logicsheet>
- <parameter name="prefix" value="xsp-response"/>
- <parameter name="uri" value="http://apache.org/xsp/response"/>
- <parameter name="href"
value="resource://org/apache/cocoon/components/language/markup/xsp/java/response.xsl"/>
- </builtin-logicsheet>
- </target-language>
- </component-instance>
-
- <component-instance name="sitemap"
class="org.apache.cocoon.components.language.markup.sitemap.SitemapMarkupLanguage">
- <parameter name="prefix" value="map"/>
- <parameter name="uri" value="http://apache.org/cocoon/sitemap/1.0"/>
-
- <target-language name="java">
- <parameter name="core-logicsheet"
value="resource://org/apache/cocoon/components/language/markup/sitemap/java/sitemap.xsl"/>
- </target-language>
- </component-instance>
- </component-type>
+ <component
role="org.apache.cocoon.components.language.programming.ProgrammingLanguageSelector"
class="org.apache.cocoon.CocoonComponentSelector">
+ <component-instance name="java"
class="org.apache.cocoon.components.language.programming.java.JavaLanguage">
+ <parameter name="compiler"
value="org.apache.cocoon.components.language.programming.java.Javac"/>
+ <parameter name="code-formatter"
value="org.apache.cocoon.components.language.programming.java.JstyleFormatter"/>
+ <parameter name="class-loader"
value="org.apache.cocoon.components.classloader.ClassLoaderManagerImpl"/>
+ </component-instance>
</component>
- <component role="program-generator"
class="org.apache.cocoon.components.language.generator.ProgramGeneratorImpl">
+ <component
role="org.apache.cocoon.components.classloader.ClassLoaderManager"
class="org.apache.cocoon.components.classloader.ClassLoaderManagerImpl"/>
+
+ <component
role="org.apache.cocoon.components.language.markup.MarkupLanguageSelector"
class="org.apache.cocoon.CocoonComponentSelector">
+ <component-instance name="xsp"
class="org.apache.cocoon.components.language.markup.xsp.XSPMarkupLanguage">
+ <parameter name="prefix" value="xsp"/>
+ <parameter name="uri" value="http://apache.org/xsp"/>
+
+ <target-language name="java">
+ <parameter name="core-logicsheet"
value="resource://org/apache/cocoon/components/language/markup/xsp/java/xsp.xsl"/>
+
+ <builtin-logicsheet>
+ <parameter name="prefix" value="xsp-request"/>
+ <parameter name="uri" value="http://apache.org/xsp/request"/>
+ <parameter name="href"
value="resource://org/apache/cocoon/components/language/markup/xsp/java/request.xsl"/>
+ </builtin-logicsheet>
+
+ <builtin-logicsheet>
+ <parameter name="prefix" value="xsp-response"/>
+ <parameter name="uri" value="http://apache.org/xsp/response"/>
+ <parameter name="href"
value="resource://org/apache/cocoon/components/language/markup/xsp/java/response.xsl"/>
+ </builtin-logicsheet>
+ </target-language>
+ </component-instance>
+
+ <component-instance name="sitemap"
class="org.apache.cocoon.components.language.markup.sitemap.SitemapMarkupLanguage">
+ <parameter name="prefix" value="map"/>
+ <parameter name="uri" value="http://apache.org/cocoon/sitemap/1.0"/>
+
+ <target-language name="java">
+ <parameter name="core-logicsheet"
value="resource://org/apache/cocoon/components/language/markup/sitemap/java/sitemap.xsl"/>
+ </target-language>
+ </component-instance>
+ </component>
+
+ <component
role="org.apache.cocoon.components.language.generator.ProgramGenerator"
class="org.apache.cocoon.components.language.generator.ProgramGeneratorImpl">
<parameter name="auto-reload" value="true"/>
</component>
<!-- these components are the image encoders for the SVG serializer -->
- <component role="jpegencoder"
class="org.apache.cocoon.components.image.JPEGEncoder"/>
+ <component role="org.apache.cocoon.components.image.ImageEncoderSelector"
class="org.apache.cocoon.CocoonComponentSelector">
+ <component-instance name="jpegencoder"
class="org.apache.cocoon.components.image.JPEGEncoder"/>
+ <!--<component-instance name="pngencoder"
class="org.apache.cocoon.components.image.PNGEncoder"/>-->
+ </component>
<!-- these components is used as a PoolController for the sitemap
component pools -->
- <component role="sitemap-component-pool-controller"
class="org.apache.cocoon.util.ComponentPoolController"/>
+ <component role="org.apache.avalon.util.pool.PoolController"
class="org.apache.cocoon.util.ComponentPoolController"/>
<sitemap file="sitemap.xmap"/>
</cocoon>
