Author: cziegeler
Date: Thu Oct 21 13:50:36 2004
New Revision: 55258
Removed:
cocoon/trunk/src/deprecated/java/org/apache/cocoon/acting/ComposerAction.java
cocoon/trunk/src/deprecated/java/org/apache/cocoon/acting/ConfigurableComposerAction.java
cocoon/trunk/src/deprecated/java/org/apache/cocoon/generation/ComposerGenerator.java
cocoon/trunk/src/deprecated/java/org/apache/cocoon/reading/ComposerReader.java
Modified:
cocoon/trunk/blocks.properties
cocoon/trunk/src/blocks/session-fw/java/org/apache/cocoon/components/language/markup/xsp/XSPSessionFwHelper.java
cocoon/trunk/src/java/org/apache/cocoon/components/modules/input/InputModuleHelper.java
cocoon/trunk/src/java/org/apache/cocoon/components/treeprocessor/variables/VariableResolverFactory.java
cocoon/trunk/src/test/org/apache/cocoon/SitemapComponentTestCase.java
cocoon/trunk/src/test/org/apache/cocoon/components/source/SourceResolverAdapter.java
cocoon/trunk/src/test/org/apache/cocoon/components/treeprocessor/variables/PreparedVariableResolverTestCase.java
Log:
Removed further usage of ComponentManager, Composable
We compile again and the start page comes up :)
Modified: cocoon/trunk/blocks.properties
==============================================================================
--- cocoon/trunk/blocks.properties (original)
+++ cocoon/trunk/blocks.properties Thu Oct 21 13:50:36 2004
@@ -14,26 +14,6 @@
# limitations under the License.
#
-# NOTICE - we have to exclude the following blocks until all
-# of the code is migrated to the new container
-include.block.databases=false
-include.block.hsqldb=false
-include.block.php=false
-include.block.python=false
-include.block.xmldb=false
-include.block.xsp=false
-include.block.eventcache=false
-include.block.javaflow=false
-include.block.jms=false
-include.block.ojb=false
-include.block.petstore=false
-include.block.repository=false
-include.block.scratchpad=false
-include.block.slide=false
-include.block.webdav=false
-# END NOTICE
-
-
#------------------------------------------------------------------------------#
# Cocoon Blocks
#
#------------------------------------------------------------------------------#
Modified:
cocoon/trunk/src/blocks/session-fw/java/org/apache/cocoon/components/language/markup/xsp/XSPSessionFwHelper.java
==============================================================================
---
cocoon/trunk/src/blocks/session-fw/java/org/apache/cocoon/components/language/markup/xsp/XSPSessionFwHelper.java
(original)
+++
cocoon/trunk/src/blocks/session-fw/java/org/apache/cocoon/components/language/markup/xsp/XSPSessionFwHelper.java
Thu Oct 21 13:50:36 2004
@@ -15,9 +15,8 @@
*/
package org.apache.cocoon.components.language.markup.xsp;
-import org.apache.avalon.framework.component.Component;
-import org.apache.avalon.framework.component.ComponentManager;
-import org.apache.avalon.framework.component.ComponentException;
+import org.apache.avalon.framework.service.ServiceException;
+import org.apache.avalon.framework.service.ServiceManager;
import org.apache.cocoon.ProcessingException;
@@ -29,7 +28,7 @@
* The <code>Session-fw</code> object helper
*
* @author <a href="mailto:[EMAIL PROTECTED]">Antonio Gallardo</a>
- * @version CVS $Id: XSPSessionFwHelper.java,v 1.8 2004/03/05 13:02:22
bdelacretaz Exp $
+ * @version CVS $Id$
* @since 2.1.1
*/
public class XSPSessionFwHelper {
@@ -41,7 +40,7 @@
* @param context The Session context tha define where to search
* @param path The parameter path
**/
- public static DocumentFragment getXML(ComponentManager cm, String context,
String path) throws ProcessingException {
+ public static DocumentFragment getXML(ServiceManager cm, String context,
String path) throws ProcessingException {
SessionManager sessionManager = null;
try {
@@ -50,11 +49,11 @@
// Get the fragment
DocumentFragment df = sessionManager.getContextFragment(context,
path);
return df;
- } catch (ComponentException ce) {
+ } catch (ServiceException ce) {
throw new ProcessingException("Error during lookup of
SessionManager component.", ce);
} finally {
// End releasing the sessionmanager
- cm.release((Component)sessionManager);
+ cm.release(sessionManager);
}
}
@@ -65,7 +64,7 @@
* @param context The Session context tha define where to search
* @param path The parameter path
**/
- public static String getXMLAsString(ComponentManager cm, String context,
String path) throws ProcessingException {
+ public static String getXMLAsString(ServiceManager cm, String context,
String path) throws ProcessingException {
DocumentFragment df = getXML(cm, context, path);
return df != null ? df.getFirstChild().getNodeValue() : "";
}
Modified:
cocoon/trunk/src/java/org/apache/cocoon/components/modules/input/InputModuleHelper.java
==============================================================================
---
cocoon/trunk/src/java/org/apache/cocoon/components/modules/input/InputModuleHelper.java
(original)
+++
cocoon/trunk/src/java/org/apache/cocoon/components/modules/input/InputModuleHelper.java
Thu Oct 21 13:50:36 2004
@@ -16,8 +16,6 @@
package org.apache.cocoon.components.modules.input;
import org.apache.avalon.framework.CascadingRuntimeException;
-import org.apache.avalon.framework.component.ComponentManager;
-import org.apache.avalon.framework.component.ComponentSelector;
import org.apache.avalon.framework.configuration.Configuration;
import org.apache.avalon.framework.service.ServiceManager;
import org.apache.avalon.framework.service.ServiceSelector;
@@ -28,7 +26,7 @@
/**
* @author <a href="mailto:[EMAIL PROTECTED]">Christian Haul</a>
- * @version CVS $Id: InputModuleHelper.java,v 1.2 2004/04/30 23:07:55 joerg
Exp $
+ * @version CVS $Id$
*/
public class InputModuleHelper {
@@ -43,8 +41,6 @@
private Map inputModules;
- private ComponentManager componentManager;
- private ComponentSelector componentInputSelector;
private ServiceManager serviceManager;
private ServiceSelector serviceInputSelector;
@@ -59,14 +55,8 @@
InputModule module = (InputModule) this.inputModules.get(name);
if ( module == null ) {
try {
- if ( this.componentManager != null ) {
- if (this.componentInputSelector.hasComponent(name)) {
- module = (InputModule)
this.componentInputSelector.select(name);
- }
- } else {
- if (this.serviceInputSelector.isSelectable(name)) {
- module = (InputModule)
this.serviceInputSelector.select(name);
- }
+ if (this.serviceInputSelector.isSelectable(name)) {
+ module = (InputModule)
this.serviceInputSelector.select(name);
}
} catch (Exception e) {
throw new CascadingRuntimeException("Unable to lookup input
module " + name, e);
@@ -132,25 +122,6 @@
/**
* Initializes the instance for first use. Stores references to
- * component manager and component selector in instance
- *
- * @param manager a <code>ComponentManager</code> value
- * @exception RuntimeException if an error occurs
- * @deprecated Use the [EMAIL PROTECTED] #setup(ServiceManager)} method
instead
- */
- public void setup(ComponentManager manager) throws RuntimeException {
-
- this.inputModules = new HashMap();
- this.componentManager = manager;
- try {
- this.componentInputSelector = (ComponentSelector)
this.componentManager.lookup(INPUT_MODULE_SELECTOR);
- } catch (Exception e) {
- throw new CascadingRuntimeException("Could not obtain selector for
InputModule.",e);
- }
- }
-
- /**
- * Initializes the instance for first use. Stores references to
* service manager and service selector in instance
*
* @param manager a <code>ServiceManager</code> value
@@ -258,22 +229,6 @@
public void releaseAll() throws RuntimeException {
if ( this.inputModules != null ) {
- // test for component manager
- if ( this.componentManager != null ) {
- try {
- Iterator iter = this.inputModules.keySet().iterator();
- while (iter.hasNext()) {
- this.componentInputSelector.release((InputModule)
this.inputModules.get(iter.next()));
- }
- this.inputModules = null;
- this.componentManager.release(this.componentInputSelector);
- this.componentManager = null;
- this.inputModules = null;
- } catch (Exception e) {
- throw new CascadingRuntimeException("Could not release
InputModules.",e);
- }
-
- }
if ( this.serviceManager != null ) {
try {
Iterator iter = this.inputModules.keySet().iterator();
Modified:
cocoon/trunk/src/java/org/apache/cocoon/components/treeprocessor/variables/VariableResolverFactory.java
==============================================================================
---
cocoon/trunk/src/java/org/apache/cocoon/components/treeprocessor/variables/VariableResolverFactory.java
(original)
+++
cocoon/trunk/src/java/org/apache/cocoon/components/treeprocessor/variables/VariableResolverFactory.java
Thu Oct 21 13:50:36 2004
@@ -15,9 +15,7 @@
*/
package org.apache.cocoon.components.treeprocessor.variables;
-import org.apache.avalon.framework.component.ComponentManager;
import org.apache.avalon.framework.service.ServiceManager;
-import org.apache.avalon.framework.service.WrapperServiceManager;
import org.apache.cocoon.sitemap.PatternException;
@@ -95,16 +93,6 @@
}
return buf.toString();
- }
-
- /**
- * Get a resolver for a given expression. Chooses the most efficient
implementation
- * depending on <code>expression</code>.
- *
- * @deprecated use the version with <code>ServiceManager</service>
- */
- public static VariableResolver getResolver(String expression,
ComponentManager manager) throws PatternException {
- return getResolver(expression, new WrapperServiceManager(manager));
}
/**
Modified: cocoon/trunk/src/test/org/apache/cocoon/SitemapComponentTestCase.java
==============================================================================
--- cocoon/trunk/src/test/org/apache/cocoon/SitemapComponentTestCase.java
(original)
+++ cocoon/trunk/src/test/org/apache/cocoon/SitemapComponentTestCase.java
Thu Oct 21 13:50:36 2004
@@ -35,6 +35,7 @@
import org.apache.avalon.framework.component.ComponentSelector;
import org.apache.avalon.framework.context.DefaultContext;
import org.apache.avalon.framework.parameters.Parameters;
+import org.apache.avalon.framework.service.WrapperServiceManager;
import org.apache.cocoon.acting.Action;
import org.apache.cocoon.components.ContextHelper;
import org.apache.cocoon.components.flow.AbstractInterpreter;
@@ -67,7 +68,7 @@
*
* @author <a href="mailto:[EMAIL PROTECTED]">Stephan Michels</a>
* @author <a href="mailto:[EMAIL PROTECTED]">Mark Leicester</a>
- * @version CVS $Id: SitemapComponentTestCase.java,v 1.9 2004/07/04 17:52:29
huber Exp $
+ * @version CVS $Id$
*/
public abstract class SitemapComponentTestCase extends ExcaliburTestCase
{
@@ -240,7 +241,7 @@
action = (Action) selector.select(type);
assertNotNull("Test lookup of action", action);
- result = action.act(redirector, new
SourceResolverAdapter(resolver, this.manager),
+ result = action.act(redirector, new
SourceResolverAdapter(resolver, new WrapperServiceManager(manager)),
objectmodel, source, parameters);
} catch (ComponentException ce) {
@@ -288,7 +289,7 @@
generator = (Generator) selector.select(type);
assertNotNull("Test lookup of generator", generator);
- generator.setup(new SourceResolverAdapter(resolver, this.manager),
+ generator.setup(new SourceResolverAdapter(resolver, new
WrapperServiceManager(manager)),
objectmodel, source, parameters);
DOMBuilder builder = new DOMBuilder();
@@ -351,7 +352,7 @@
transformer = (Transformer) selector.select(type);
assertNotNull("Test lookup of transformer", transformer);
- transformer.setup(new SourceResolverAdapter(resolver,
this.manager),
+ transformer.setup(new SourceResolverAdapter(resolver, new
WrapperServiceManager(manager)),
objectmodel, source, parameters);
DOMBuilder builder = new DOMBuilder();
Modified:
cocoon/trunk/src/test/org/apache/cocoon/components/source/SourceResolverAdapter.java
==============================================================================
---
cocoon/trunk/src/test/org/apache/cocoon/components/source/SourceResolverAdapter.java
(original)
+++
cocoon/trunk/src/test/org/apache/cocoon/components/source/SourceResolverAdapter.java
Thu Oct 21 13:50:36 2004
@@ -20,7 +20,7 @@
import java.net.MalformedURLException;
import java.util.Map;
-import org.apache.avalon.framework.component.ComponentManager;
+import org.apache.avalon.framework.service.ServiceManager;
import org.apache.cocoon.environment.SourceResolver;
import org.apache.excalibur.source.Source;
import org.apache.excalibur.source.SourceException;
@@ -28,13 +28,13 @@
/**
* An adapter for the Excalibur SourceResolver.
*
- * @version CVS $Id: SourceResolverAdapter.java,v 1.11 2004/05/24 11:26:40
cziegeler Exp $
+ * @version CVS $Id$
*/
public class SourceResolverAdapter implements SourceResolver
{
private org.apache.excalibur.source.SourceResolver resolver;
- public SourceResolverAdapter(org.apache.excalibur.source.SourceResolver
resolver, ComponentManager manager) {
+ public SourceResolverAdapter(org.apache.excalibur.source.SourceResolver
resolver, ServiceManager manager) {
this.resolver = resolver;
}
Modified:
cocoon/trunk/src/test/org/apache/cocoon/components/treeprocessor/variables/PreparedVariableResolverTestCase.java
==============================================================================
---
cocoon/trunk/src/test/org/apache/cocoon/components/treeprocessor/variables/PreparedVariableResolverTestCase.java
(original)
+++
cocoon/trunk/src/test/org/apache/cocoon/components/treeprocessor/variables/PreparedVariableResolverTestCase.java
Thu Oct 21 13:50:36 2004
@@ -21,6 +21,7 @@
import org.apache.avalon.framework.component.ComponentException;
import org.apache.avalon.framework.logger.LogKitLogger;
+import org.apache.avalon.framework.service.WrapperServiceManager;
import org.apache.cocoon.SitemapComponentTestCase;
import org.apache.cocoon.components.treeprocessor.InvokeContext;
import org.apache.cocoon.environment.mock.MockRequest;
@@ -30,7 +31,7 @@
* Test case for the nested variant of the PreparedVariableResolver
*
* @author <a href="mailto:[EMAIL PROTECTED]">Upayavira</a>
- * @version CVS $Id: PreparedVariableResolverTestCase.java,v 1.6 2004/07/16
12:36:46 sylvain Exp $
+ * @version CVS $Id$
*/
public class PreparedVariableResolverTestCase extends SitemapComponentTestCase
{
@@ -50,7 +51,7 @@
Map sitemapElements = new HashMap();
context.pushMap("sitemap", sitemapElements);
- VariableResolver resolver = VariableResolverFactory.getResolver(expr,
manager);
+ VariableResolver resolver = VariableResolverFactory.getResolver(expr,
new WrapperServiceManager(manager));
assertEquals("123", resolver.resolve(context, getObjectModel()));
}
@@ -65,7 +66,7 @@
Map sitemapElements = new HashMap();
sitemapElements.put("1", "oo");
context.pushMap("sitemap", sitemapElements);
- VariableResolver resolver = VariableResolverFactory.getResolver(expr,
manager);
+ VariableResolver resolver = VariableResolverFactory.getResolver(expr,
new WrapperServiceManager(manager));
assertEquals("123", resolver.resolve(context, getObjectModel()));
}
@@ -78,7 +79,7 @@
Map sitemapElements = new HashMap();
sitemapElements.put("name", "123");
context.pushMap("label", sitemapElements);
- VariableResolver resolver = VariableResolverFactory.getResolver(expr,
manager);
+ VariableResolver resolver = VariableResolverFactory.getResolver(expr,
new WrapperServiceManager(manager));
assertEquals("123", resolver.resolve(context, getObjectModel()));
}
@@ -91,7 +92,7 @@
Map sitemapElements = new HashMap();
sitemapElements.put("1", "abc");
context.pushMap("label", sitemapElements);
- VariableResolver resolver = VariableResolverFactory.getResolver(expr,
manager);
+ VariableResolver resolver = VariableResolverFactory.getResolver(expr,
new WrapperServiceManager(manager));
assertEquals("123abc", resolver.resolve(context, getObjectModel()));
}
@@ -104,7 +105,7 @@
Map sitemapElements = new HashMap();
sitemapElements.put("1", "abc");
context.pushMap("label", sitemapElements);
- VariableResolver resolver = VariableResolverFactory.getResolver(expr,
manager);
+ VariableResolver resolver = VariableResolverFactory.getResolver(expr,
new WrapperServiceManager(manager));
assertEquals("123abc/def", resolver.resolve(context,
getObjectModel()));
}
@@ -117,7 +118,7 @@
Map sitemapElements = new HashMap();
sitemapElements.put("1", "abc");
context.pushMap("label", sitemapElements);
- VariableResolver resolver = VariableResolverFactory.getResolver(expr,
manager);
+ VariableResolver resolver = VariableResolverFactory.getResolver(expr,
new WrapperServiceManager(manager));
assertEquals("123abc/def", resolver.resolve(context,
getObjectModel()));
}
@@ -136,7 +137,7 @@
sitemapElements.put("1", "oscar");
context.pushMap("label2", sitemapElements);
- VariableResolver resolver = VariableResolverFactory.getResolver(expr,
manager);
+ VariableResolver resolver = VariableResolverFactory.getResolver(expr,
new WrapperServiceManager(manager));
assertEquals("from juliet to oscar", resolver.resolve(context,
getObjectModel()));
}
@@ -155,7 +156,7 @@
sitemapElements.put("1", "oscar");
context.pushMap("label2", sitemapElements);
- VariableResolver resolver = VariableResolverFactory.getResolver(expr,
manager);
+ VariableResolver resolver = VariableResolverFactory.getResolver(expr,
new WrapperServiceManager(manager));
assertEquals("from juliet to oscar", resolver.resolve(context,
getObjectModel()));
}
@@ -169,7 +170,7 @@
sitemapElements = new HashMap();
context.pushMap("label", sitemapElements);
- VariableResolver resolver = VariableResolverFactory.getResolver(expr,
manager);
+ VariableResolver resolver = VariableResolverFactory.getResolver(expr,
new WrapperServiceManager(manager));
assertEquals("http://cocoon.apache.org";, resolver.resolve(context,
getObjectModel()));
}
@@ -183,7 +184,7 @@
sitemapElements = new HashMap();
context.pushMap("label", sitemapElements);
- VariableResolver resolver = VariableResolverFactory.getResolver(expr,
manager);
+ VariableResolver resolver = VariableResolverFactory.getResolver(expr,
new WrapperServiceManager(manager));
assertEquals(":colon-starts-this", resolver.resolve(context,
getObjectModel()));
}
@@ -198,7 +199,7 @@
sitemapElements.put("1", "abc");
context.pushMap("label", sitemapElements);
- VariableResolver resolver = VariableResolverFactory.getResolver(expr,
manager);
+ VariableResolver resolver = VariableResolverFactory.getResolver(expr,
new WrapperServiceManager(manager));
assertEquals("abc:abc", resolver.resolve(context, getObjectModel()));
}
@@ -212,7 +213,7 @@
sitemapElements = new HashMap();
context.pushMap("label", sitemapElements);
- VariableResolver resolver = VariableResolverFactory.getResolver(expr,
manager);
+ VariableResolver resolver = VariableResolverFactory.getResolver(expr,
new WrapperServiceManager(manager));
assertEquals("This is a {brace}", resolver.resolve(context,
getObjectModel()));
}
@@ -223,7 +224,7 @@
Map sitemapElements = new HashMap();
context.pushMap("sitemap", sitemapElements);
- VariableResolver resolver = VariableResolverFactory.getResolver(expr,
manager);
+ VariableResolver resolver = VariableResolverFactory.getResolver(expr,
new WrapperServiceManager(manager));
assertEquals("", resolver.resolve(context, getObjectModel()));
}
}
