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/11/15 14:26:00 UTC
cvs commit: cocoon-2.1/src/blocks/slide/java/org/apache/cocoon/acting PrincipalMultiAction.java
joerg 2003/11/15 05:26:00
Modified: src/blocks/slide/java/org/apache/cocoon/components/repository
Repository.java
src/blocks/slide/java/org/apache/cocoon/components/repository/impl
SlidePrincipalProvider.java SlideRepository.java
src/blocks/slide/java/org/apache/cocoon/acting
PrincipalMultiAction.java
Log:
Component => Service
Revision Changes Path
1.4 +2 -4 cocoon-2.1/src/blocks/slide/java/org/apache/cocoon/components/repository/Repository.java
Index: Repository.java
===================================================================
RCS file: /home/cvs/cocoon-2.1/src/blocks/slide/java/org/apache/cocoon/components/repository/Repository.java,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- Repository.java 5 Sep 2003 07:31:45 -0000 1.3
+++ Repository.java 15 Nov 2003 13:26:00 -0000 1.4
@@ -49,15 +49,13 @@
*/
package org.apache.cocoon.components.repository;
-import org.apache.avalon.framework.component.Component;
-
/**
* This interface represents a repository from a CMS.
*
* @author <a href="mailto:stephan@apache.org">Stephan Michels</a>
* @version CVS $Id$
*/
-public interface Repository extends Component {
+public interface Repository {
/** Role for the component */
public final static String ROLE = "org.apache.cocoon.components.repository.Repository";
1.5 +13 -13 cocoon-2.1/src/blocks/slide/java/org/apache/cocoon/components/repository/impl/SlidePrincipalProvider.java
Index: SlidePrincipalProvider.java
===================================================================
RCS file: /home/cvs/cocoon-2.1/src/blocks/slide/java/org/apache/cocoon/components/repository/impl/SlidePrincipalProvider.java,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- SlidePrincipalProvider.java 24 Sep 2003 22:34:53 -0000 1.4
+++ SlidePrincipalProvider.java 15 Nov 2003 13:26:00 -0000 1.5
@@ -56,13 +56,13 @@
import java.util.Vector;
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.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.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.cocoon.ProcessingException;
import org.apache.cocoon.components.repository.Principal;
import org.apache.cocoon.components.repository.PrincipalGroup;
@@ -97,10 +97,10 @@
* @version CVS $Id$
*/
public class SlidePrincipalProvider extends AbstractLogEnabled
- implements PrincipalProvider, Composable, Configurable, Initializable {
+ implements PrincipalProvider, Serviceable, Configurable, Initializable {
- /** The component manager instance */
- private ComponentManager manager = null;
+ /** The service manager instance */
+ private ServiceManager manager = null;
/** Namespace access token. */
private NamespaceAccessToken nat;
@@ -129,14 +129,14 @@
private String namespace = null;
/**
- * Set the current <code>ComponentManager</code> instance used by this
- * <code>Composable</code>.
+ * Set the current <code>ServiceManager</code> instance used by this
+ * <code>Serviceable</code>.
*
* @param manager
*
- * @throws ComponentException
+ * @throws ServiceException
*/
- public void compose(ComponentManager manager) throws ComponentException {
+ public void service(ServiceManager manager) throws ServiceException {
this.manager = manager;
}
@@ -190,8 +190,8 @@
// this.lock = nat.getLockHelper();
// this.macro = nat.getMacroHelper();
- } catch (ComponentException ce) {
- getLogger().error("Could not lookup for component.", ce);
+ } catch (ServiceException se) {
+ getLogger().error("Could not lookup for component.", se);
} finally {
if (repository!=null) {
this.manager.release(repository);
1.3 +12 -13 cocoon-2.1/src/blocks/slide/java/org/apache/cocoon/components/repository/impl/SlideRepository.java
Index: SlideRepository.java
===================================================================
RCS file: /home/cvs/cocoon-2.1/src/blocks/slide/java/org/apache/cocoon/components/repository/impl/SlideRepository.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- SlideRepository.java 16 Mar 2003 17:49:06 -0000 1.2
+++ SlideRepository.java 15 Nov 2003 13:26:00 -0000 1.3
@@ -54,10 +54,6 @@
import java.util.Hashtable;
import org.apache.avalon.framework.activity.Disposable;
-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.configuration.Configurable;
import org.apache.avalon.framework.configuration.Configuration;
import org.apache.avalon.framework.configuration.ConfigurationException;
@@ -66,6 +62,9 @@
import org.apache.avalon.framework.context.Contextualizable;
import org.apache.avalon.framework.logger.LogEnabled;
import org.apache.avalon.framework.logger.Logger;
+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.Constants;
@@ -89,11 +88,11 @@
* @version CVS $Id$
*/
public class SlideRepository
- implements Repository, ThreadSafe, Composable, Configurable, LogEnabled,
+ implements Repository, ThreadSafe, Serviceable, Configurable, LogEnabled,
Contextualizable, Disposable {
- /** The component manager instance */
- protected ComponentManager manager = null;
+ /** The service manager instance */
+ protected ServiceManager manager = null;
/**
* The SlideRepository will handle the domain lifecycle only,
@@ -116,12 +115,12 @@
}
/**
- * Set the current <code>ComponentManager</code> instance used by this
- * <code>Composable</code>.
+ * Set the current <code>ServiceManager</code> instance used by this
+ * <code>Serviceable</code>.
*
- * @param manager Component manager.
+ * @param manager Service manager.
*/
- public void compose(ComponentManager manager) throws ComponentException {
+ public void service(ServiceManager manager) throws ServiceException {
this.manager = manager;
}
@@ -192,7 +191,7 @@
resolver.release(source);
}
if (parser!=null) {
- this.manager.release((Component) parser);
+ this.manager.release(parser);
}
if (resolver!=null) {
this.manager.release(resolver);
1.2 +33 -33 cocoon-2.1/src/blocks/slide/java/org/apache/cocoon/acting/PrincipalMultiAction.java
Index: PrincipalMultiAction.java
===================================================================
RCS file: /home/cvs/cocoon-2.1/src/blocks/slide/java/org/apache/cocoon/acting/PrincipalMultiAction.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- PrincipalMultiAction.java 9 Mar 2003 00:06:16 -0000 1.1
+++ PrincipalMultiAction.java 15 Nov 2003 13:26:00 -0000 1.2
@@ -53,9 +53,9 @@
import java.util.Map;
-import org.apache.avalon.framework.component.ComponentException;
-import org.apache.avalon.framework.component.ComponentSelector;
import org.apache.avalon.framework.parameters.Parameters;
+import org.apache.avalon.framework.service.ServiceException;
+import org.apache.avalon.framework.service.ServiceSelector;
import org.apache.avalon.framework.thread.ThreadSafe;
import org.apache.cocoon.ProcessingException;
@@ -114,10 +114,10 @@
String principal_password = parameters.getParameter(PRINCIPAL_PASSWORD,
request.getParameter(PRINCIPAL_PASSWORD));
- ComponentSelector principalproviders = null;
+ ServiceSelector principalproviders = null;
PrincipalProvider principalprovider = null;
try {
- principalproviders = (ComponentSelector)this.manager.lookup(PrincipalProvider.ROLE+"Selector");
+ principalproviders = (ServiceSelector)this.manager.lookup(PrincipalProvider.ROLE+"Selector");
principalprovider = (PrincipalProvider)principalproviders.select(principal_provider);
@@ -126,10 +126,10 @@
principalprovider.addPrincipal(caller, principal);
- } catch (ComponentException ce) {
+ } catch (ServiceException se) {
if (getLogger().isDebugEnabled())
- getLogger().debug("Could not lookup for component.", ce);
- throw new ProcessingException("Could not lookup for component.", ce);
+ getLogger().debug("Could not lookup for component.", se);
+ throw new ProcessingException("Could not lookup for component.", se);
} finally {
if (principalprovider!=null)
principalproviders.release(principalprovider);
@@ -164,10 +164,10 @@
String principal_name = parameters.getParameter(PRINCIPAL_NAME,
request.getParameter(PRINCIPAL_NAME));
- ComponentSelector principalproviders = null;
+ ServiceSelector principalproviders = null;
PrincipalProvider principalprovider = null;
try {
- principalproviders = (ComponentSelector)this.manager.lookup(PrincipalProvider.ROLE+"Selector");
+ principalproviders = (ServiceSelector)this.manager.lookup(PrincipalProvider.ROLE+"Selector");
principalprovider = (PrincipalProvider)principalproviders.select(principal_provider);
@@ -176,10 +176,10 @@
principalprovider.removePrincipal(caller, principal);
- } catch (ComponentException ce) {
+ } catch (ServiceException se) {
if (getLogger().isDebugEnabled())
- getLogger().debug("Could not lookup for component.", ce);
- throw new ProcessingException("Could not lookup for component.", ce);
+ getLogger().debug("Could not lookup for component.", se);
+ throw new ProcessingException("Could not lookup for component.", se);
} finally {
if (principalprovider!=null)
principalproviders.release(principalprovider);
@@ -214,10 +214,10 @@
String principal_group_name = parameters.getParameter(PRINCIPAL_GROUP_NAME,
request.getParameter(PRINCIPAL_GROUP_NAME));
- ComponentSelector principalproviders = null;
+ ServiceSelector principalproviders = null;
PrincipalProvider principalprovider = null;
try {
- principalproviders = (ComponentSelector)this.manager.lookup(PrincipalProvider.ROLE+"Selector");
+ principalproviders = (ServiceSelector)this.manager.lookup(PrincipalProvider.ROLE+"Selector");
principalprovider = (PrincipalProvider)principalproviders.select(principal_provider);
@@ -226,10 +226,10 @@
principalprovider.addPrincipalGroup(caller, principalgroup);
- } catch (ComponentException ce) {
+ } catch (ServiceException se) {
if (getLogger().isDebugEnabled())
- getLogger().debug("Could not lookup for component.", ce);
- throw new ProcessingException("Could not lookup for component.", ce);
+ getLogger().debug("Could not lookup for component.", se);
+ throw new ProcessingException("Could not lookup for component.", se);
} finally {
if (principalprovider!=null)
principalproviders.release(principalprovider);
@@ -264,10 +264,10 @@
String principal_group_name = parameters.getParameter(PRINCIPAL_GROUP_NAME,
request.getParameter(PRINCIPAL_GROUP_NAME));
- ComponentSelector principalproviders = null;
+ ServiceSelector principalproviders = null;
PrincipalProvider principalprovider = null;
try {
- principalproviders = (ComponentSelector)this.manager.lookup(PrincipalProvider.ROLE+"Selector");
+ principalproviders = (ServiceSelector)this.manager.lookup(PrincipalProvider.ROLE+"Selector");
principalprovider = (PrincipalProvider)principalproviders.select(principal_provider);
@@ -276,10 +276,10 @@
principalprovider.removePrincipalGroup(caller, principalgroup);
- } catch (ComponentException ce) {
+ } catch (ServiceException se) {
if (getLogger().isDebugEnabled())
- getLogger().debug("Could not lookup for component.", ce);
- throw new ProcessingException("Could not lookup for component.", ce);
+ getLogger().debug("Could not lookup for component.", se);
+ throw new ProcessingException("Could not lookup for component.", se);
} finally {
if (principalprovider!=null)
principalproviders.release(principalprovider);
@@ -317,10 +317,10 @@
String principal_name = parameters.getParameter(PRINCIPAL_NAME,
request.getParameter(PRINCIPAL_NAME));
- ComponentSelector principalproviders = null;
+ ServiceSelector principalproviders = null;
PrincipalProvider principalprovider = null;
try {
- principalproviders = (ComponentSelector)this.manager.lookup(PrincipalProvider.ROLE+"Selector");
+ principalproviders = (ServiceSelector)this.manager.lookup(PrincipalProvider.ROLE+"Selector");
principalprovider = (PrincipalProvider)principalproviders.select(principal_provider);
@@ -330,10 +330,10 @@
principalprovider.addMember(caller, principalgroup, principal);
- } catch (ComponentException ce) {
+ } catch (ServiceException se) {
if (getLogger().isDebugEnabled())
- getLogger().debug("Could not lookup for component.", ce);
- throw new ProcessingException("Could not lookup for component.", ce);
+ getLogger().debug("Could not lookup for component.", se);
+ throw new ProcessingException("Could not lookup for component.", se);
} finally {
if (principalprovider!=null)
principalproviders.release(principalprovider);
@@ -371,10 +371,10 @@
String principal_name = parameters.getParameter(PRINCIPAL_NAME,
request.getParameter(PRINCIPAL_NAME));
- ComponentSelector principalproviders = null;
+ ServiceSelector principalproviders = null;
PrincipalProvider principalprovider = null;
try {
- principalproviders = (ComponentSelector)this.manager.lookup(PrincipalProvider.ROLE+"Selector");
+ principalproviders = (ServiceSelector)this.manager.lookup(PrincipalProvider.ROLE+"Selector");
principalprovider = (PrincipalProvider)principalproviders.select(principal_provider);
@@ -384,10 +384,10 @@
principalprovider.removeMember(caller, principalgroup, principal);
- } catch (ComponentException ce) {
+ } catch (ServiceException se) {
if (getLogger().isDebugEnabled())
- getLogger().debug("Could not lookup for component.", ce);
- throw new ProcessingException("Could not lookup for component.", ce);
+ getLogger().debug("Could not lookup for component.", se);
+ throw new ProcessingException("Could not lookup for component.", se);
} finally {
if (principalprovider!=null)
principalproviders.release(principalprovider);