cocoon-cvs mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From cziege...@apache.org
Subject svn commit: rev 55135 - cocoon/branches/BRANCH_2_1_X/src/samples/org/apache/cocoon/acting/modular
Date Wed, 20 Oct 2004 06:47:09 GMT
Author: cziegeler
Date: Tue Oct 19 23:47:08 2004
New Revision: 55135

Modified:
   cocoon/branches/BRANCH_2_1_X/src/samples/org/apache/cocoon/acting/modular/TestAction.java
Log:
Move from Composable to Serviceable

Modified: cocoon/branches/BRANCH_2_1_X/src/samples/org/apache/cocoon/acting/modular/TestAction.java
==============================================================================
--- cocoon/branches/BRANCH_2_1_X/src/samples/org/apache/cocoon/acting/modular/TestAction.java
(original)
+++ cocoon/branches/BRANCH_2_1_X/src/samples/org/apache/cocoon/acting/modular/TestAction.java
Tue Oct 19 23:47:08 2004
@@ -16,11 +16,11 @@
 
 package org.apache.cocoon.acting.modular;
 
-import org.apache.avalon.framework.component.ComponentSelector;
 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.parameters.Parameters;
+import org.apache.avalon.framework.service.ServiceSelector;
 import org.apache.avalon.framework.thread.ThreadSafe;
 import org.apache.cocoon.acting.ServiceableAction;
 import org.apache.cocoon.components.modules.input.InputModule;
@@ -90,18 +90,18 @@
         boolean useGetValues = param.getParameterAsBoolean("use-getValues",this.useGetValues);
         InputModule input = null;
         OutputModule output = null;
-        ComponentSelector inputSelector = null;
-        ComponentSelector outputSelector = null;
+        ServiceSelector inputSelector = null;
+        ServiceSelector outputSelector = null;
 
         try {
             if (getLogger().isDebugEnabled()) getLogger().debug("start...");
             // obtain input and output components
-            inputSelector=(ComponentSelector) this.manager.lookup(INPUT_MODULE_SELECTOR);

-            if (inputName != null && inputSelector != null && inputSelector.hasComponent(inputName)){
+            inputSelector=(ServiceSelector) this.manager.lookup(INPUT_MODULE_SELECTOR); 
+            if (inputName != null && inputSelector != null && inputSelector.isSelectable(inputName)){
                 input = (InputModule) inputSelector.select(inputName);
             }
-            outputSelector=(ComponentSelector) this.manager.lookup(OUTPUT_MODULE_SELECTOR);

-            if (outputName != null && outputSelector != null && outputSelector.hasComponent(outputName)){
+            outputSelector=(ServiceSelector) this.manager.lookup(OUTPUT_MODULE_SELECTOR);

+            if (outputName != null && outputSelector != null && outputSelector.isSelectable(outputName)){
                 output = (OutputModule) outputSelector.select(outputName);
             }
 

Mime
View raw message