You are viewing a plain text version of this content. The canonical link for it is here.
Posted to cvs@cocoon.apache.org by cz...@apache.org on 2004/01/07 11:33:55 UTC
cvs commit: cocoon-2.1/src/java/org/apache/cocoon/components/modules/input GlobalInputModule.java
cziegeler 2004/01/07 02:33:55
Modified: src/java/org/apache/cocoon/components/modules/input
GlobalInputModule.java
Log:
Composable -> Serviceable
Revision Changes Path
1.2 +11 -12 cocoon-2.1/src/java/org/apache/cocoon/components/modules/input/GlobalInputModule.java
Index: GlobalInputModule.java
===================================================================
RCS file: /home/cvs/cocoon-2.1/src/java/org/apache/cocoon/components/modules/input/GlobalInputModule.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- GlobalInputModule.java 9 Mar 2003 00:09:03 -0000 1.1
+++ GlobalInputModule.java 7 Jan 2004 10:33:54 -0000 1.2
@@ -50,12 +50,12 @@
*/
package org.apache.cocoon.components.modules.input;
-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.configuration.Configuration;
import org.apache.avalon.framework.configuration.ConfigurationException;
import org.apache.avalon.framework.logger.AbstractLogEnabled;
+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 java.util.Iterator;
@@ -71,14 +71,14 @@
*/
public final class GlobalInputModule
extends AbstractLogEnabled
- implements InputModule, Composable, ThreadSafe {
+ implements InputModule, Serviceable, ThreadSafe {
- private ComponentManager manager;
+ private ServiceManager manager;
/**
- * Composable
+ * Serviceable
*/
- public void compose(ComponentManager manager) {
+ public void service(ServiceManager manager) {
this.manager = manager;
}
@@ -102,7 +102,7 @@
try {
holder = (SitemapVariableHolder)this.manager.lookup(SitemapVariableHolder.ROLE);
return holder.get(name);
- } catch (ComponentException ce) {
+ } catch (ServiceException ce) {
throw new ConfigurationException("Unable to lookup SitemapVariableHolder.", ce);
} finally {
this.manager.release(holder);
@@ -123,9 +123,8 @@
SitemapVariableHolder holder = null;
try {
holder = (SitemapVariableHolder)this.manager.lookup(SitemapVariableHolder.ROLE);
- // return holder.getKeys();
- return null;
- } catch (ComponentException ce) {
+ return holder.getKeys();
+ } catch (ServiceException ce) {
throw new ConfigurationException("Unable to lookup SitemapVariableHolder.", ce);
} finally {
this.manager.release(holder);