You are viewing a plain text version of this content. The canonical link for it is here.
Posted to cvs@avalon.apache.org by do...@apache.org on 2002/05/18 06:18:53 UTC
cvs commit: jakarta-avalon-cornerstone/src/java/org/apache/avalon/cornerstone/blocks/transport/publishing RmiPublisher.java SocketStreamPublisher.java
donaldp 02/05/17 21:18:52
Modified: src/java/org/apache/avalon/cornerstone/blocks/scheduler
DefaultTimeScheduler.java
src/java/org/apache/avalon/cornerstone/blocks/security
DefaultRoleManager.java
src/java/org/apache/avalon/cornerstone/blocks/transport/publishing
RmiPublisher.java SocketStreamPublisher.java
Log:
Composable->Serviceable
Revision Changes Path
1.15 +7 -7 jakarta-avalon-cornerstone/src/java/org/apache/avalon/cornerstone/blocks/scheduler/DefaultTimeScheduler.java
Index: DefaultTimeScheduler.java
===================================================================
RCS file: /home/cvs/jakarta-avalon-cornerstone/src/java/org/apache/avalon/cornerstone/blocks/scheduler/DefaultTimeScheduler.java,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -r1.14 -r1.15
--- DefaultTimeScheduler.java 18 May 2002 03:55:41 -0000 1.14
+++ DefaultTimeScheduler.java 18 May 2002 04:18:52 -0000 1.15
@@ -19,10 +19,10 @@
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.ComponentException;
-import org.apache.avalon.framework.component.ComponentManager;
-import org.apache.avalon.framework.component.Composable;
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.phoenix.Block;
/**
@@ -35,7 +35,7 @@
*/
public class DefaultTimeScheduler
extends AbstractLogEnabled
- implements Block, TimeScheduler, Composable, Initializable, Startable, Disposable, Runnable
+ implements Block, TimeScheduler, Serviceable, Initializable, Startable, Disposable, Runnable
{
private boolean m_running;
private Hashtable m_entries;
@@ -45,10 +45,10 @@
/**
* @phoenix:dependency name="org.apache.avalon.cornerstone.services.threads.ThreadManager"
*/
- public void compose( final ComponentManager componentManager )
- throws ComponentException
+ public void service( final ServiceManager serviceManager )
+ throws ServiceException
{
- m_threadManager = (ThreadManager)componentManager.lookup( ThreadManager.ROLE );
+ m_threadManager = (ThreadManager)serviceManager.lookup( ThreadManager.ROLE );
}
public void initialize()
1.5 +1 -1 jakarta-avalon-cornerstone/src/java/org/apache/avalon/cornerstone/blocks/security/DefaultRoleManager.java
Index: DefaultRoleManager.java
===================================================================
RCS file: /home/cvs/jakarta-avalon-cornerstone/src/java/org/apache/avalon/cornerstone/blocks/security/DefaultRoleManager.java,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- DefaultRoleManager.java 16 Mar 2002 00:18:34 -0000 1.4
+++ DefaultRoleManager.java 18 May 2002 04:18:52 -0000 1.5
@@ -22,7 +22,7 @@
* @author <a href="mailto:peter@apache.org">Peter Donald</a>
*/
public class DefaultRoleManager
- implements Block, RoleManager
+ implements RoleManager
{
protected Hashtable m_principals = new Hashtable();
1.10 +6 -6 jakarta-avalon-cornerstone/src/java/org/apache/avalon/cornerstone/blocks/transport/publishing/RmiPublisher.java
Index: RmiPublisher.java
===================================================================
RCS file: /home/cvs/jakarta-avalon-cornerstone/src/java/org/apache/avalon/cornerstone/blocks/transport/publishing/RmiPublisher.java,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- RmiPublisher.java 12 May 2002 08:06:41 -0000 1.9
+++ RmiPublisher.java 18 May 2002 04:18:52 -0000 1.10
@@ -9,15 +9,15 @@
import org.apache.avalon.framework.configuration.Configuration;
import org.apache.avalon.framework.configuration.ConfigurationException;
-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.excalibur.altrmi.server.impl.rmi.RmiServer;
/**
* @phoenix:service name="org.apache.excalibur.altrmi.server.AltrmiPublisher"
*
* @author Paul Hammant <a href="mailto:Paul_Hammant@yahoo.com">Paul_Hammant@yahoo.com</a>
- * @version $Revision: 1.9 $
+ * @version $Revision: 1.10 $
*/
public class RmiPublisher
extends AbstractPublisher
@@ -60,9 +60,9 @@
/**
* @phoenix:dependency name="org.apache.excalibur.altrmi.server.AltrmiAuthenticator"
*/
- public void compose( ComponentManager manager )
- throws ComponentException
+ public void service( ServiceManager manager )
+ throws ServiceException
{
- super.compose( manager );
+ super.service( manager );
}
}
1.3 +6 -4 jakarta-avalon-cornerstone/src/java/org/apache/avalon/cornerstone/blocks/transport/publishing/SocketStreamPublisher.java
Index: SocketStreamPublisher.java
===================================================================
RCS file: /home/cvs/jakarta-avalon-cornerstone/src/java/org/apache/avalon/cornerstone/blocks/transport/publishing/SocketStreamPublisher.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- SocketStreamPublisher.java 12 May 2002 08:06:41 -0000 1.2
+++ SocketStreamPublisher.java 18 May 2002 04:18:52 -0000 1.3
@@ -25,6 +25,8 @@
import org.apache.avalon.framework.component.ComponentManager;
import org.apache.avalon.framework.configuration.Configuration;
import org.apache.avalon.framework.configuration.ConfigurationException;
+import org.apache.avalon.framework.service.ServiceManager;
+import org.apache.avalon.framework.service.ServiceException;
import org.apache.excalibur.altrmi.server.impl.socket.PartialSocketCustomStreamServer;
import org.apache.excalibur.altrmi.server.impl.socket.AbstractPartialSocketStreamServer;
@@ -35,7 +37,7 @@
* @author Paul Hammant <a href="mailto:Paul_Hammant@yahoo.com">Paul_Hammant@yahoo.com</a>
* @author Mike Miller.
* @author Peter Royal.
- * @version $Revision: 1.2 $
+ * @version $Revision: 1.3 $
*/
public class SocketStreamPublisher
extends AbstractPublisher
@@ -90,10 +92,10 @@
* @phoenix:dependency name="org.apache.avalon.cornerstone.services.sockets.SocketManager"
* @phoenix:dependency name="org.apache.avalon.cornerstone.services.connection.ConnectionManager"
*/
- public final void compose(ComponentManager manager)
- throws ComponentException
+ public final void service( final ServiceManager manager)
+ throws ServiceException
{
- super.compose(manager);
+ super.service(manager);
m_socketManager = (SocketManager) manager.lookup(SocketManager.ROLE);
m_connectionManager = (ConnectionManager) manager.lookup(ConnectionManager.ROLE);
--
To unsubscribe, e-mail: <ma...@jakarta.apache.org>
For additional commands, e-mail: <ma...@jakarta.apache.org>