Author: cziegeler
Date: Wed Oct 20 11:08:26 2004
New Revision: 55174
Modified:
cocoon/trunk/src/blocks/apples/java/org/apache/cocoon/components/flow/apples/ApplesProcessor.java
cocoon/trunk/src/blocks/forms/java/org/apache/cocoon/forms/acting/HandleFormSubmitAction.java
cocoon/trunk/src/blocks/forms/java/org/apache/cocoon/forms/binding/JXPathBindingManager.java
cocoon/trunk/src/blocks/forms/java/org/apache/cocoon/forms/datatype/JavaSelectionListBuilder.java
cocoon/trunk/src/blocks/forms/java/org/apache/cocoon/forms/util/SimpleServiceSelector.java
cocoon/trunk/src/blocks/repository/java/org/apache/cocoon/components/repository/RepositoryManager.java
cocoon/trunk/src/blocks/webdav/java/org/apache/cocoon/components/repository/impl/WebDAVRepository.java
cocoon/trunk/src/blocks/woody/java/org/apache/cocoon/woody/acting/HandleFormSubmitAction.java
cocoon/trunk/src/blocks/woody/java/org/apache/cocoon/woody/util/SimpleServiceSelector.java
cocoon/trunk/src/java/org/apache/cocoon/components/LifecycleHelper.java
cocoon/trunk/src/java/org/apache/cocoon/components/flow/javascript/fom/FOM_Cocoon.java
cocoon/trunk/src/java/org/apache/cocoon/components/treeprocessor/DefaultTreeBuilder.java
cocoon/trunk/src/java/org/apache/cocoon/components/treeprocessor/sitemap/SitemapLanguage.java
Log:
Remove lifecycle support for Composable and RoleManageable
Modified:
cocoon/trunk/src/blocks/apples/java/org/apache/cocoon/components/flow/apples/ApplesProcessor.java
==============================================================================
---
cocoon/trunk/src/blocks/apples/java/org/apache/cocoon/components/flow/apples/ApplesProcessor.java
(original)
+++
cocoon/trunk/src/blocks/apples/java/org/apache/cocoon/components/flow/apples/ApplesProcessor.java
Wed Oct 20 11:08:26 2004
@@ -18,7 +18,6 @@
import java.util.List;
import org.apache.avalon.framework.activity.Disposable;
-import org.apache.avalon.framework.component.WrapperComponentManager;
import org.apache.avalon.framework.context.DefaultContext;
import org.apache.avalon.framework.service.ServiceException;
import org.apache.avalon.framework.service.ServiceManager;
@@ -64,8 +63,9 @@
}
LifecycleHelper.setupComponent( app, getLogger(), appleContext,
- this.serviceManager, new
WrapperComponentManager(this.serviceManager),
- null, null, true);
+ this.serviceManager,
+ null,
+ true);
processApple(params, redirector, app, wk);
}
Modified:
cocoon/trunk/src/blocks/forms/java/org/apache/cocoon/forms/acting/HandleFormSubmitAction.java
==============================================================================
---
cocoon/trunk/src/blocks/forms/java/org/apache/cocoon/forms/acting/HandleFormSubmitAction.java
(original)
+++
cocoon/trunk/src/blocks/forms/java/org/apache/cocoon/forms/acting/HandleFormSubmitAction.java
Wed Oct 20 11:08:26 2004
@@ -45,7 +45,7 @@
* <li><strong>attribute-name</strong>: name of the request attribute in
which the form instance should be stored
* </ul>
*
- * @version $Id: HandleFormSubmitAction.java,v 1.4 2004/03/28 20:51:24 antonio
Exp $
+ * @version $Id$
*/
public class HandleFormSubmitAction extends AbstractFormsAction implements
Action, ThreadSafe {
@@ -72,7 +72,7 @@
// TODO cache these classes
Class clazz = Class.forName(formHandlerClassName);
formHandler = (FormHandler)clazz.newInstance();
- LifecycleHelper.setupComponent(formHandler, null, null,
manager, null, null);
+ LifecycleHelper.setupComponent(formHandler, null, null,
manager, null);
form.setFormHandler(formHandler);
}
Modified:
cocoon/trunk/src/blocks/forms/java/org/apache/cocoon/forms/binding/JXPathBindingManager.java
==============================================================================
---
cocoon/trunk/src/blocks/forms/java/org/apache/cocoon/forms/binding/JXPathBindingManager.java
(original)
+++
cocoon/trunk/src/blocks/forms/java/org/apache/cocoon/forms/binding/JXPathBindingManager.java
Wed Oct 20 11:08:26 2004
@@ -86,7 +86,6 @@
getLogger(),
this.avalonContext,
this.manager,
- null, // RoleManager,
configuration.getChild("bindings"));
}
Modified:
cocoon/trunk/src/blocks/forms/java/org/apache/cocoon/forms/datatype/JavaSelectionListBuilder.java
==============================================================================
---
cocoon/trunk/src/blocks/forms/java/org/apache/cocoon/forms/datatype/JavaSelectionListBuilder.java
(original)
+++
cocoon/trunk/src/blocks/forms/java/org/apache/cocoon/forms/datatype/JavaSelectionListBuilder.java
Wed Oct 20 11:08:26 2004
@@ -54,7 +54,7 @@
JavaSelectionList list = (JavaSelectionList)
clasz
.newInstance();
LifecycleHelper.setupComponent(list,
getLogger(), null,
- this.manager, null, null, true);
+ this.manager, null, true);
list.setDatatype(datatype);
list.setNullable(nullable);
// pass the attributes to the SelectionList
Modified:
cocoon/trunk/src/blocks/forms/java/org/apache/cocoon/forms/util/SimpleServiceSelector.java
==============================================================================
---
cocoon/trunk/src/blocks/forms/java/org/apache/cocoon/forms/util/SimpleServiceSelector.java
(original)
+++
cocoon/trunk/src/blocks/forms/java/org/apache/cocoon/forms/util/SimpleServiceSelector.java
Wed Oct 20 11:08:26 2004
@@ -37,7 +37,7 @@
/**
* A very simple ServiceSelector for ThreadSafe services.
*
- * @version $Id: SimpleServiceSelector.java,v 1.3 2004/06/15 07:33:44 sylvain
Exp $
+ * @version $Id$
*/
public class SimpleServiceSelector extends AbstractLogEnabled implements
ServiceSelector, Configurable, LogEnabled,
Serviceable, Disposable, Contextualizable {
@@ -84,7 +84,6 @@
getLogger(),
context,
serviceManager,
- null, // RoleManager
componentConfs[i]);
} catch (Exception e) {
throw new ConfigurationException("Error creating " +
hintShortHand + " declared at " + componentConfs[i].getLocation(), e);
Modified:
cocoon/trunk/src/blocks/repository/java/org/apache/cocoon/components/repository/RepositoryManager.java
==============================================================================
---
cocoon/trunk/src/blocks/repository/java/org/apache/cocoon/components/repository/RepositoryManager.java
(original)
+++
cocoon/trunk/src/blocks/repository/java/org/apache/cocoon/components/repository/RepositoryManager.java
Wed Oct 20 11:08:26 2004
@@ -111,7 +111,6 @@
this.getLogger(),
null,
this.manager,
- null,
repoConfiguration,
true);
Modified:
cocoon/trunk/src/blocks/webdav/java/org/apache/cocoon/components/repository/impl/WebDAVRepository.java
==============================================================================
---
cocoon/trunk/src/blocks/webdav/java/org/apache/cocoon/components/repository/impl/WebDAVRepository.java
(original)
+++
cocoon/trunk/src/blocks/webdav/java/org/apache/cocoon/components/repository/impl/WebDAVRepository.java
Wed Oct 20 11:08:26 2004
@@ -108,7 +108,6 @@
LifecycleHelper lh = new LifecycleHelper(this.getLogger(),
null,
this.manager,
- null,
null);
lh.setupComponent(this.propertyHelper, true);
lh.setupComponent(this.transactionHelper, true);
Modified:
cocoon/trunk/src/blocks/woody/java/org/apache/cocoon/woody/acting/HandleFormSubmitAction.java
==============================================================================
---
cocoon/trunk/src/blocks/woody/java/org/apache/cocoon/woody/acting/HandleFormSubmitAction.java
(original)
+++
cocoon/trunk/src/blocks/woody/java/org/apache/cocoon/woody/acting/HandleFormSubmitAction.java
Wed Oct 20 11:08:26 2004
@@ -45,7 +45,7 @@
* <li><strong>attribute-name</strong>: name of the request attribute in
which the form instance should be stored
* </ul>
*
- * @version $Id: HandleFormSubmitAction.java,v 1.16 2004/03/09 13:54:22
reinhard Exp $
+ * @version $Id$
*/
public class HandleFormSubmitAction extends AbstractWoodyAction implements
Action, ThreadSafe {
@@ -71,7 +71,7 @@
// TODO cache these classes
Class clazz = Class.forName(formHandlerClassName);
formHandler = (FormHandler)clazz.newInstance();
- LifecycleHelper.setupComponent(formHandler, null, null,
manager, null, null);
+ LifecycleHelper.setupComponent(formHandler, null, null,
manager, null);
form.setFormHandler(formHandler);
}
Modified:
cocoon/trunk/src/blocks/woody/java/org/apache/cocoon/woody/util/SimpleServiceSelector.java
==============================================================================
---
cocoon/trunk/src/blocks/woody/java/org/apache/cocoon/woody/util/SimpleServiceSelector.java
(original)
+++
cocoon/trunk/src/blocks/woody/java/org/apache/cocoon/woody/util/SimpleServiceSelector.java
Wed Oct 20 11:08:26 2004
@@ -34,7 +34,7 @@
/**
* A very simple ServiceSelector for ThreadSafe services.
*
- * @version $Id: SimpleServiceSelector.java,v 1.9 2004/03/09 13:54:24 reinhard
Exp $
+ * @version $Id$
*/
public class SimpleServiceSelector extends AbstractLogEnabled implements
ServiceSelector, Configurable, LogEnabled,
Serviceable, Disposable {
@@ -71,7 +71,7 @@
Object component = null;
try {
component = clazz.newInstance();
- LifecycleHelper lifecycleHelper = new
LifecycleHelper(getLogger(), null, serviceManager, null, componentConfs[i]);
+ LifecycleHelper lifecycleHelper = new
LifecycleHelper(getLogger(), null, serviceManager, componentConfs[i]);
lifecycleHelper.setupComponent(component);
} catch (Exception e) {
throw new ConfigurationException("Error creating " +
hintShortHand + " declared at " + componentConfs[i].getLocation(), e);
Modified:
cocoon/trunk/src/java/org/apache/cocoon/components/LifecycleHelper.java
==============================================================================
--- cocoon/trunk/src/java/org/apache/cocoon/components/LifecycleHelper.java
(original)
+++ cocoon/trunk/src/java/org/apache/cocoon/components/LifecycleHelper.java
Wed Oct 20 11:08:26 2004
@@ -18,8 +18,6 @@
import org.apache.avalon.framework.activity.Disposable;
import org.apache.avalon.framework.activity.Initializable;
import org.apache.avalon.framework.activity.Startable;
-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.context.Context;
@@ -31,68 +29,31 @@
import org.apache.avalon.framework.service.ServiceManager;
import org.apache.avalon.framework.service.Serviceable;
-import org.apache.avalon.excalibur.component.RoleManageable;
-import org.apache.avalon.excalibur.component.RoleManager;
-
/**
* Utility class for setting up Avalon components. Similar to Excalibur's
* <code>DefaultComponentFactory</code>, but on existing objects.
* <p>
- * To be moved to Avalon ?
*
* @author <a href="mailto:[EMAIL PROTECTED]">Sylvain Wallez</a>
- * @version CVS $Id: LifecycleHelper.java,v 1.7 2004/03/05 13:02:45
bdelacretaz Exp $
+ * @version CVS $Id$
*/
-
-// FIXME : need to handle also LogEnabled.
-
public class LifecycleHelper {
+
/** The Logger for the component
*/
- final private Logger m_logger;
+ final private Logger logger;
/** The Context for the component
*/
- final private Context m_context;
-
- /** The component manager for this component.
- */
- final private ComponentManager m_componentManager;
+ final private Context context;
/** The service manager for this component.
*/
- final private ServiceManager m_serviceManager;
+ final private ServiceManager serviceManager;
/** The configuration for this component.
*/
- final private Configuration m_configuration;
-
- /** The RoleManager for child ComponentSelectors
- */
- final private RoleManager m_roles;
-
- /**
- * Construct a new <code>LifecycleHelper</code> that can be used
repeatedly to
- * setup several components.
- * <p>
- * <b>Note</b> : if a parameter is <code>null</code>,
- * the corresponding method isn't called (e.g. if
<code>configuration</code> is
- * <code>null</code>, <code>configure()</code> isn't called).
- *
- * @param logger the <code>Logger</code> to pass to
<code>LogEnabled</code>s, unless there is
- * a <code>LogKitManager</code> and the configuration specifies a
logger name.
- * @param context the <code>Context</code> to pass to
<code>Contexutalizable</code>s.
- * @param componentManager the component manager to pass to
<code>Composable</code>s.
- * @param roles the <code>RoleManager</code> to pass to
<code>DefaultComponentSelector</code>s.
- * @param configuration the <code>Configuration</code> object to pass to
new instances.
- */
- public LifecycleHelper(final Logger logger,
- final Context context,
- final ComponentManager componentManager,
- final RoleManager roles,
- final Configuration configuration) {
- this(logger, context, null, componentManager, roles, configuration);
- }
+ final private Configuration configuration;
/**
* Construct a new <code>LifecycleHelper</code> that can be used
repeatedly to
@@ -106,45 +67,16 @@
* a <code>LogKitManager</code> and the configuration specifies a
logger name.
* @param context the <code>Context</code> to pass to
<code>Contexutalizable</code>s.
* @param serviceManager the service manager to pass to
<code>Serviceable</code>s.
- * @param roles the <code>RoleManager</code> to pass to
<code>DefaultComponentSelector</code>s.
* @param configuration the <code>Configuration</code> object to pass to
new instances.
*/
public LifecycleHelper(final Logger logger,
- final Context context,
- final ServiceManager serviceManager,
- final RoleManager roles,
+ final Context context,
+ final ServiceManager serviceManager,
final Configuration configuration) {
- this(logger, context, serviceManager, null, roles, configuration);
- }
-
- /**
- * Construct a new <code>LifecycleHelper</code> that can be used
repeatedly to
- * setup several components.
- * <p>
- * <b>Note</b> : if a parameter is <code>null</code>,
- * the corresponding method isn't called (e.g. if
<code>configuration</code> is
- * <code>null</code>, <code>configure()</code> isn't called).
- *
- * @param logger the <code>Logger</code> to pass to
<code>LogEnabled</code>s, unless there is
- * a <code>LogKitManager</code> and the configuration specifies a
logger name.
- * @param context the <code>Context</code> to pass to
<code>Contexutalizable</code>s.
- * @param serviceManager the service manager to pass to
<code>Serviceable</code>s.
- * @param componentManager the component manager to pass to
<code>Composable</code>s.
- * @param roles the <code>RoleManager</code> to pass to
<code>DefaultComponentSelector</code>s.
- * @param configuration the <code>Configuration</code> object to pass to
new instances.
- */
- public LifecycleHelper(final Logger logger,
- final Context context,
- final ServiceManager serviceManager,
- final ComponentManager componentManager,
- final RoleManager roles,
- final Configuration configuration) {
- m_logger = logger;
- m_context = context;
- m_serviceManager = serviceManager;
- m_componentManager = componentManager;
- m_roles = roles;
- m_configuration = configuration;
+ this.logger = logger;
+ this.context = context;
+ this.serviceManager = serviceManager;
+ this.configuration = configuration;
}
@@ -173,44 +105,20 @@
throws Exception {
return setupComponent(
component,
- m_logger,
- m_context,
- m_serviceManager,
- m_componentManager,
- m_roles,
- m_configuration,
+ this.logger,
+ this.context,
+ this.serviceManager,
+ this.configuration,
initializeAndStart);
}
/**
- * Static equivalent to [EMAIL PROTECTED] #setupComponent(Object)}, to be
used when there's only one
- * component to setup.
- */
- public static Object setupComponent(final Object component,
- final Logger logger,
- final Context context,
- final ComponentManager
componentManager,
- final RoleManager roles,
- final Configuration configuration)
- throws Exception {
- return setupComponent(
- component,
- logger,
- context,
- componentManager,
- roles,
- configuration,
- true);
- }
-
- /**
* Alternative setupComponent method that takes a ServiceManager instead
of a ComponentManger.
*/
public static Object setupComponent(final Object component,
final Logger logger,
final Context context,
final ServiceManager serviceManager,
- final RoleManager roles,
final Configuration configuration)
throws Exception {
return setupComponent(
@@ -218,68 +126,19 @@
logger,
context,
serviceManager,
- roles,
configuration,
true);
}
/**
- * Static equivalent to [EMAIL PROTECTED] #setupComponent(Object,
boolean)}, to be used when there's only one
- * component to setup.
- */
- public static Object setupComponent(final Object component,
- final Logger logger,
- final Context context,
- final ComponentManager
componentManager,
- final RoleManager roles,
- final Configuration configuration,
- final boolean initializeAndStart)
- throws Exception {
- return setupComponent(
- component,
- logger,
- context,
- null,
- componentManager,
- roles,
- configuration,
- initializeAndStart);
- }
-
- /**
* Alternative setupComponent method that takes a ServiceManager instead
of a ComponentManger.
*/
public static Object setupComponent(final Object component,
- final Logger logger,
- final Context context,
- final ServiceManager serviceManager,
- final RoleManager roles,
+ final Logger logger,
+ final Context context,
+ final ServiceManager serviceManager,
final Configuration configuration,
- final boolean initializeAndStart)
- throws Exception {
- return setupComponent(
- component,
- logger,
- context,
- serviceManager,
- null,
- roles,
- configuration,
- initializeAndStart);
- }
-
- /**
- * Static equivalent to [EMAIL PROTECTED] #setupComponent(Object,
boolean)}, to be used when there's only one
- * component to setup.
- */
- public static Object setupComponent(final Object component,
- final Logger logger,
- final Context context,
- final ServiceManager serviceManager,
- final ComponentManager componentManager,
- final RoleManager roles,
- final Configuration configuration,
- final boolean initializeAndStart)
+ final boolean initializeAndStart)
throws Exception {
if (component instanceof LogEnabled) {
((LogEnabled) component).enableLogging(logger);
@@ -289,18 +148,10 @@
((Contextualizable) component).contextualize(context);
}
- if (null != componentManager && component instanceof Composable) {
- ((Composable) component).compose(componentManager);
- }
-
if (null != serviceManager && component instanceof Serviceable) {
((Serviceable) component).service(serviceManager);
}
- if (null != roles && component instanceof RoleManageable) {
- ((RoleManageable) component).setRoleManager(roles);
- }
-
if (null != configuration && component instanceof Configurable) {
((Configurable) component).configure(configuration);
}
Modified:
cocoon/trunk/src/java/org/apache/cocoon/components/flow/javascript/fom/FOM_Cocoon.java
==============================================================================
---
cocoon/trunk/src/java/org/apache/cocoon/components/flow/javascript/fom/FOM_Cocoon.java
(original)
+++
cocoon/trunk/src/java/org/apache/cocoon/components/flow/javascript/fom/FOM_Cocoon.java
Wed Oct 20 11:08:26 2004
@@ -27,7 +27,6 @@
import java.util.Locale;
import java.util.Map;
-import org.apache.avalon.framework.component.WrapperComponentManager;
import org.apache.avalon.framework.context.Context;
import org.apache.avalon.framework.logger.Logger;
import org.apache.avalon.framework.service.ServiceManager;
@@ -371,8 +370,6 @@
this.getLogger(),
this.getAvalonContext(),
this.getServiceManager(),
- new WrapperComponentManager(this.getServiceManager()),
- null,// roleManager
null,// configuration
true);
return obj;
Modified:
cocoon/trunk/src/java/org/apache/cocoon/components/treeprocessor/DefaultTreeBuilder.java
==============================================================================
---
cocoon/trunk/src/java/org/apache/cocoon/components/treeprocessor/DefaultTreeBuilder.java
(original)
+++
cocoon/trunk/src/java/org/apache/cocoon/components/treeprocessor/DefaultTreeBuilder.java
Wed Oct 20 11:08:26 2004
@@ -27,7 +27,6 @@
import org.apache.avalon.excalibur.pool.Recyclable;
import org.apache.avalon.framework.activity.Disposable;
import org.apache.avalon.framework.activity.Initializable;
-import org.apache.avalon.framework.component.WrapperComponentManager;
import org.apache.avalon.framework.configuration.Configuration;
import org.apache.avalon.framework.configuration.ConfigurationException;
import org.apache.avalon.framework.configuration.SAXConfigurationHandler;
@@ -52,7 +51,7 @@
/**
*
* @author <a href="mailto:[EMAIL PROTECTED]">Sylvain Wallez</a>
- * @version CVS $Id: DefaultTreeBuilder.java,v 1.15 2004/07/17 10:51:15 joerg
Exp $
+ * @version CVS $Id$
*/
public class DefaultTreeBuilder
extends AbstractLogEnabled
@@ -174,8 +173,6 @@
getLogger(),
this.context,
this.ownManager,
- new WrapperComponentManager(this.ownManager),
- this.ownRoleManager,
config.getChild("nodes", false),
true
);
@@ -336,7 +333,6 @@
this.lifecycle = new LifecycleHelper(getLogger(),
this.context,
this.processorManager,
- this.ownRoleManager,
null // configuration
);
Modified:
cocoon/trunk/src/java/org/apache/cocoon/components/treeprocessor/sitemap/SitemapLanguage.java
==============================================================================
---
cocoon/trunk/src/java/org/apache/cocoon/components/treeprocessor/sitemap/SitemapLanguage.java
(original)
+++
cocoon/trunk/src/java/org/apache/cocoon/components/treeprocessor/sitemap/SitemapLanguage.java
Wed Oct 20 11:08:26 2004
@@ -54,7 +54,7 @@
* The tree builder for the sitemap language.
*
* @author <a href="mailto:[EMAIL PROTECTED]">Sylvain Wallez</a>
- * @version CVS $Id: SitemapLanguage.java,v 1.14 2004/07/16 12:36:45 sylvain
Exp $
+ * @version CVS $Id$
*/
public class SitemapLanguage extends DefaultTreeBuilder {
