You are viewing a plain text version of this content. The canonical link for it is here.
Posted to cvs@cocoon.apache.org by jo...@apache.org on 2003/10/31 13:49:06 UTC
cvs commit: cocoon-2.1/src/blocks/repository/java/org/apache/cocoon/components/source/impl SourceDescriptorManager.java XPathSourceInspector.java SimpleJdbcSourceDescriptor.java
joerg 2003/10/31 04:49:06
Modified: src/blocks/repository/java/org/apache/cocoon/generation
TraversableSourceDescriptionGenerator.java
src/blocks/repository/java/org/apache/cocoon/components/source/impl
SourceDescriptorManager.java
XPathSourceInspector.java
SimpleJdbcSourceDescriptor.java
Log:
Composable => Serviceable
Revision Changes Path
1.3 +0 -1 cocoon-2.1/src/blocks/repository/java/org/apache/cocoon/generation/TraversableSourceDescriptionGenerator.java
Index: TraversableSourceDescriptionGenerator.java
===================================================================
RCS file: /home/cvs/cocoon-2.1/src/blocks/repository/java/org/apache/cocoon/generation/TraversableSourceDescriptionGenerator.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- TraversableSourceDescriptionGenerator.java 28 Oct 2003 14:13:23 -0000 1.2
+++ TraversableSourceDescriptionGenerator.java 31 Oct 2003 12:49:06 -0000 1.3
@@ -109,7 +109,6 @@
private static final String PROPERTIES_NODE_NAME = "properties";
private static final String PROPERTIES_NODE_QNAME = PREFIX + ":" + PROPERTIES_NODE_NAME;
- private static final String PROPERTY_TYPE_ATTR_NAME = "type";
private static final String PERMISSIONS_NODE_NAME = "permissions";
private static final String PERMISSIONS_NODE_QNAME = PREFIX + ":" + PERMISSIONS_NODE_NAME;
1.5 +7 -7 cocoon-2.1/src/blocks/repository/java/org/apache/cocoon/components/source/impl/SourceDescriptorManager.java
Index: SourceDescriptorManager.java
===================================================================
RCS file: /home/cvs/cocoon-2.1/src/blocks/repository/java/org/apache/cocoon/components/source/impl/SourceDescriptorManager.java,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- SourceDescriptorManager.java 28 Oct 2003 13:48:12 -0000 1.4
+++ SourceDescriptorManager.java 31 Oct 2003 12:49:06 -0000 1.5
@@ -56,8 +56,6 @@
import org.apache.avalon.framework.activity.Disposable;
import org.apache.avalon.framework.activity.Initializable;
-import org.apache.avalon.framework.component.ComponentManager;
-import org.apache.avalon.framework.component.Composable;
import org.apache.avalon.framework.configuration.Configurable;
import org.apache.avalon.framework.configuration.Configuration;
import org.apache.avalon.framework.configuration.ConfigurationException;
@@ -67,6 +65,8 @@
import org.apache.avalon.framework.context.Contextualizable;
import org.apache.avalon.framework.logger.AbstractLogEnabled;
import org.apache.avalon.framework.parameters.Parameters;
+import org.apache.avalon.framework.service.ServiceManager;
+import org.apache.avalon.framework.service.Serviceable;
import org.apache.avalon.framework.thread.ThreadSafe;
import org.apache.cocoon.components.source.SourceDescriptor;
import org.apache.cocoon.components.source.SourceInspector;
@@ -84,14 +84,14 @@
* @version CVS $Id$
*/
public final class SourceDescriptorManager extends AbstractLogEnabled
-implements SourceDescriptor, Contextualizable, Composable,
+implements SourceDescriptor, Contextualizable, Serviceable,
Configurable, Initializable, Disposable, ThreadSafe {
// the registered inspectors
private Set m_inspectors;
private Context m_context;
- private ComponentManager m_manager;
+ private ServiceManager m_manager;
private Configuration m_configuration;
@@ -104,7 +104,7 @@
m_context = context;
}
- public void compose(ComponentManager manager) {
+ public void service(ServiceManager manager) {
m_manager = manager;
}
@@ -135,7 +135,7 @@
}
ContainerUtil.enableLogging(inspector,getLogger());
ContainerUtil.contextualize(inspector,m_context);
- ContainerUtil.compose(inspector,m_manager);
+ ContainerUtil.service(inspector,m_manager);
ContainerUtil.configure(inspector,children[i]);
ContainerUtil.parameterize(inspector,
Parameters.fromConfiguration(children[i]));
1.4 +16 -15 cocoon-2.1/src/blocks/repository/java/org/apache/cocoon/components/source/impl/XPathSourceInspector.java
Index: XPathSourceInspector.java
===================================================================
RCS file: /home/cvs/cocoon-2.1/src/blocks/repository/java/org/apache/cocoon/components/source/impl/XPathSourceInspector.java,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- XPathSourceInspector.java 27 Oct 2003 09:30:07 -0000 1.3
+++ XPathSourceInspector.java 31 Oct 2003 12:49:06 -0000 1.4
@@ -51,13 +51,12 @@
import java.io.IOException;
-import org.apache.avalon.framework.component.Component;
-import org.apache.avalon.framework.component.ComponentException;
-import org.apache.avalon.framework.component.ComponentManager;
-import org.apache.avalon.framework.component.Composable;
import org.apache.avalon.framework.logger.AbstractLogEnabled;
import org.apache.avalon.framework.parameters.Parameterizable;
import org.apache.avalon.framework.parameters.Parameters;
+import org.apache.avalon.framework.service.ServiceException;
+import org.apache.avalon.framework.service.ServiceManager;
+import org.apache.avalon.framework.service.Serviceable;
import org.apache.avalon.framework.thread.ThreadSafe;
import org.apache.cocoon.components.source.SourceInspector;
import org.apache.cocoon.components.source.helpers.SourceProperty;
@@ -78,7 +77,7 @@
* @version CVS $Id$
*/
public class XPathSourceInspector extends AbstractLogEnabled implements
- SourceInspector, Composable, Parameterizable, ThreadSafe {
+ SourceInspector, Serviceable, Parameterizable, ThreadSafe {
/**
* The default namespace uri of the property exposed by this SourceInspector.
@@ -101,9 +100,9 @@
private String extension;
private String xpath;
- private ComponentManager manager = null;
+ private ServiceManager manager = null;
- public void compose(ComponentManager manager) {
+ public void service(ServiceManager manager) {
this.manager = manager;
}
@@ -131,11 +130,12 @@
+ " is not a valid XML file");
} catch (IOException ioe) {
this.getLogger().error("Could not read file", ioe);
- } catch (ComponentException ce) {
+ } catch (ServiceException ce) {
this.getLogger().error("Could not retrieve component", ce);
} finally {
- if (parser!=null)
- this.manager.release((Component)parser);
+ if (parser != null) {
+ this.manager.release(parser);
+ }
}
if (doc != null) {
@@ -150,11 +150,12 @@
property.setValue(nodelist);
return property;
- } catch (ComponentException ce) {
- this.getLogger().error("Could not retrieve component", ce);
+ } catch (ServiceException se) {
+ this.getLogger().error("Could not retrieve component", se);
} finally {
- if ((processor!=null) && (processor instanceof Component))
- this.manager.release((Component)processor);
+ if (processor != null) {
+ this.manager.release(processor);
+ }
}
}
}
1.3 +8 -8 cocoon-2.1/src/blocks/repository/java/org/apache/cocoon/components/source/impl/SimpleJdbcSourceDescriptor.java
Index: SimpleJdbcSourceDescriptor.java
===================================================================
RCS file: /home/cvs/cocoon-2.1/src/blocks/repository/java/org/apache/cocoon/components/source/impl/SimpleJdbcSourceDescriptor.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- SimpleJdbcSourceDescriptor.java 30 Oct 2003 16:58:43 -0000 1.2
+++ SimpleJdbcSourceDescriptor.java 31 Oct 2003 12:49:06 -0000 1.3
@@ -60,13 +60,13 @@
import org.apache.avalon.excalibur.datasource.DataSourceComponent;
import org.apache.avalon.framework.activity.Disposable;
import org.apache.avalon.framework.activity.Initializable;
-import org.apache.avalon.framework.component.ComponentException;
-import org.apache.avalon.framework.component.ComponentManager;
-import org.apache.avalon.framework.component.ComponentSelector;
-import org.apache.avalon.framework.component.Composable;
import org.apache.avalon.framework.configuration.Configurable;
import org.apache.avalon.framework.configuration.Configuration;
import org.apache.avalon.framework.configuration.ConfigurationException;
+import org.apache.avalon.framework.service.ServiceException;
+import org.apache.avalon.framework.service.ServiceManager;
+import org.apache.avalon.framework.service.ServiceSelector;
+import org.apache.avalon.framework.service.Serviceable;
import org.apache.avalon.framework.thread.ThreadSafe;
import org.apache.cocoon.caching.Cache;
import org.apache.cocoon.caching.EventAware;
@@ -107,7 +107,7 @@
*/
public class SimpleJdbcSourceDescriptor
extends AbstractConfigurableSourceDescriptor
- implements SourceDescriptor, Composable, Configurable, Initializable, Disposable, ThreadSafe {
+ implements SourceDescriptor, Serviceable, Configurable, Initializable, Disposable, ThreadSafe {
private static final String STMT_SELECT_SINGLE =
@@ -122,7 +122,7 @@
private static final String STMT_DELETE =
"DELETE FROM sourceprops WHERE source=? AND namespace=? AND name=?;";
- private ComponentManager m_manager;
+ private ServiceManager m_manager;
private SourceResolver m_resolver;
private EventAware m_cache;
private DataSourceComponent m_datasource;
@@ -136,7 +136,7 @@
public SimpleJdbcSourceDescriptor() {
}
- public void compose(ComponentManager manager) throws ComponentException {
+ public void service(ServiceManager manager) throws ServiceException {
m_manager = manager;
m_resolver = (SourceResolver) manager.lookup(SourceResolver.ROLE);
Cache cache = (Cache) manager.lookup(Cache.ROLE + "/EventAware");
@@ -171,7 +171,7 @@
}
public void initialize() throws Exception {
- ComponentSelector datasources = (ComponentSelector) m_manager.lookup(
+ ServiceSelector datasources = (ServiceSelector) m_manager.lookup(
DataSourceComponent.ROLE + "Selector");
m_datasource = (DataSourceComponent) datasources.select(m_datasourceName);
}