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/12 10:06:41 UTC
cvs commit: jakarta-avalon-cornerstone/src/java/org/apache/avalon/cornerstone/blocks/transport/subscription AbstractSubscriber.java RmiSubscriber.java SocketObjectStreamSubscriber.java
donaldp 02/05/12 01:06:41
Modified: src/java/org/apache/avalon/cornerstone/blocks/connection
DefaultConnectionManager.java
src/java/org/apache/avalon/cornerstone/blocks/datasource
DefaultDataSourceSelector.java
src/java/org/apache/avalon/cornerstone/blocks/dom
DOMBuilderFactory.java
src/java/org/apache/avalon/cornerstone/blocks/masterstore
RepositoryManager.java
src/java/org/apache/avalon/cornerstone/blocks/packet
DefaultPacketManager.java
src/java/org/apache/avalon/cornerstone/blocks/rmification
DefaultRMIfication.java
src/java/org/apache/avalon/cornerstone/blocks/sax
SAXParserFactoryImpl.java
src/java/org/apache/avalon/cornerstone/blocks/scheduler
DefaultTimeScheduler.java
src/java/org/apache/avalon/cornerstone/blocks/soapification/glue
Glue.java
src/java/org/apache/avalon/cornerstone/blocks/sockets
DefaultSocketManager.java
src/java/org/apache/avalon/cornerstone/blocks/threads
DefaultThreadManager.java
src/java/org/apache/avalon/cornerstone/blocks/transport/authentication
DefaultAuthenticator.java
src/java/org/apache/avalon/cornerstone/blocks/transport/autopublishing
AutoPublisher.java PublicationInfo.java
src/java/org/apache/avalon/cornerstone/blocks/transport/publishing
AbstractPublisher.java RmiPublisher.java
SocketStreamPublisher.java
src/java/org/apache/avalon/cornerstone/blocks/transport/subscription
AbstractSubscriber.java RmiSubscriber.java
SocketObjectStreamSubscriber.java
Log:
Add in @phoenix:* javadoc tags in preparation for auotgeneration of the .xinfo files.
Revision Changes Path
1.16 +2 -2 jakarta-avalon-cornerstone/src/java/org/apache/avalon/cornerstone/blocks/connection/DefaultConnectionManager.java
Index: DefaultConnectionManager.java
===================================================================
RCS file: /home/cvs/jakarta-avalon-cornerstone/src/java/org/apache/avalon/cornerstone/blocks/connection/DefaultConnectionManager.java,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -r1.15 -r1.16
--- DefaultConnectionManager.java 12 May 2002 07:32:00 -0000 1.15
+++ DefaultConnectionManager.java 12 May 2002 08:06:40 -0000 1.16
@@ -23,9 +23,9 @@
/**
* This is the service through which ConnectionManagement occurs.
*
- * @author <a href="mailto:peter@apache.org">Peter Donald</a>
- *
* @phoenix:service name="org.apache.avalon.cornerstone.services.connection.ConnectionManager"
+ *
+ * @author <a href="mailto:peter@apache.org">Peter Donald</a>
*/
public class DefaultConnectionManager
extends AbstractLogEnabled
1.17 +2 -0 jakarta-avalon-cornerstone/src/java/org/apache/avalon/cornerstone/blocks/datasource/DefaultDataSourceSelector.java
Index: DefaultDataSourceSelector.java
===================================================================
RCS file: /home/cvs/jakarta-avalon-cornerstone/src/java/org/apache/avalon/cornerstone/blocks/datasource/DefaultDataSourceSelector.java,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -r1.16 -r1.17
--- DefaultDataSourceSelector.java 3 Apr 2002 10:12:15 -0000 1.16
+++ DefaultDataSourceSelector.java 12 May 2002 08:06:40 -0000 1.17
@@ -44,6 +44,8 @@
* </data-sources>
* </pre>
*
+ * @phoenix:service name="org.apache.avalon.cornerstone.services.datasource.DataSourceSelector"
+ *
* @author <a href="mailto:colus@apache.org">Eung-ju Park</a>
*/
public class DefaultDataSourceSelector
1.5 +2 -0 jakarta-avalon-cornerstone/src/java/org/apache/avalon/cornerstone/blocks/dom/DOMBuilderFactory.java
Index: DOMBuilderFactory.java
===================================================================
RCS file: /home/cvs/jakarta-avalon-cornerstone/src/java/org/apache/avalon/cornerstone/blocks/dom/DOMBuilderFactory.java,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- DOMBuilderFactory.java 16 Mar 2002 00:18:33 -0000 1.4
+++ DOMBuilderFactory.java 12 May 2002 08:06:40 -0000 1.5
@@ -20,6 +20,8 @@
* Block implementation of the DocumentBuilderFactory service. That service being
* a non abstract/static clone of the javax.xml.parsers class of the same name.
*
+ * @phoenix:service name="org.apache.avalon.cornerstone.services.dom.DocumentBuilderFactory"
+ *
* @author <a href="mailto:Paul_Hammant@yahoo.com">Paul Hammant</a>
*/
public class DOMBuilderFactory
1.6 +2 -0 jakarta-avalon-cornerstone/src/java/org/apache/avalon/cornerstone/blocks/masterstore/RepositoryManager.java
Index: RepositoryManager.java
===================================================================
RCS file: /home/cvs/jakarta-avalon-cornerstone/src/java/org/apache/avalon/cornerstone/blocks/masterstore/RepositoryManager.java,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- RepositoryManager.java 16 Mar 2002 00:18:33 -0000 1.5
+++ RepositoryManager.java 12 May 2002 08:06:40 -0000 1.6
@@ -27,6 +27,8 @@
/**
*
+ * @phoenix:service name="org.apache.avalon.cornerstone.services.store.Store"
+ *
* @author <a href="mailto:fede@apache.org">Federico Barbieri</a>
*/
public class RepositoryManager
1.10 +5 -0 jakarta-avalon-cornerstone/src/java/org/apache/avalon/cornerstone/blocks/packet/DefaultPacketManager.java
Index: DefaultPacketManager.java
===================================================================
RCS file: /home/cvs/jakarta-avalon-cornerstone/src/java/org/apache/avalon/cornerstone/blocks/packet/DefaultPacketManager.java,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- DefaultPacketManager.java 16 Mar 2002 00:18:33 -0000 1.9
+++ DefaultPacketManager.java 12 May 2002 08:06:40 -0000 1.10
@@ -24,6 +24,8 @@
/**
* This is the service through which PacketManagement occurs.
*
+ * @phoenix:service name="org.apache.avalon.cornerstone.services.packet.PacketManager"
+ *
* @author <a href="mailto:peter@apache.org">Peter Donald</a>
*/
public class DefaultPacketManager
@@ -33,6 +35,9 @@
private HashMap m_acceptors = new HashMap();
private ThreadManager m_threadManager;
+ /**
+ * @phoenix:dependency name="org.apache.avalon.cornerstone.services.threads.ThreadManager"
+ */
public void compose( final ComponentManager componentManager )
throws ComponentException
{
1.6 +3 -1 jakarta-avalon-cornerstone/src/java/org/apache/avalon/cornerstone/blocks/rmification/DefaultRMIfication.java
Index: DefaultRMIfication.java
===================================================================
RCS file: /home/cvs/jakarta-avalon-cornerstone/src/java/org/apache/avalon/cornerstone/blocks/rmification/DefaultRMIfication.java,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- DefaultRMIfication.java 16 Mar 2002 00:18:34 -0000 1.5
+++ DefaultRMIfication.java 12 May 2002 08:06:40 -0000 1.6
@@ -29,8 +29,10 @@
* FIXME: INPROGRESS and NOT TESTED
* Default implementation of <code>RMIfication</code>.
*
+ * @phoenix:service name="org.apache.avalon.cornerstone.services.rmification.RMIfication"
+ *
* @author <a href="mailto:colus@apache.org">Eung-ju Park</a>
- * @version $Revision: 1.5 $
+ * @version $Revision: 1.6 $
*/
public class DefaultRMIfication
extends AbstractLogEnabled
1.4 +2 -0 jakarta-avalon-cornerstone/src/java/org/apache/avalon/cornerstone/blocks/sax/SAXParserFactoryImpl.java
Index: SAXParserFactoryImpl.java
===================================================================
RCS file: /home/cvs/jakarta-avalon-cornerstone/src/java/org/apache/avalon/cornerstone/blocks/sax/SAXParserFactoryImpl.java,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- SAXParserFactoryImpl.java 16 Mar 2002 00:18:34 -0000 1.3
+++ SAXParserFactoryImpl.java 12 May 2002 08:06:40 -0000 1.4
@@ -21,6 +21,8 @@
* Block implementation of the SAXParserFactory service. That service being
* a non abstract/static clone of the javax.xml.parsers class of the same name.
*
+ * @phoenix:service name="org.apache.avalon.cornerstone.services.sax.SAXParserFactory"
+ *
* @author <a href="mailto:Paul_Hammant@yahoo.com">Paul Hammant</a>
*/
public class SAXParserFactoryImpl
1.13 +5 -0 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.12
retrieving revision 1.13
diff -u -r1.12 -r1.13
--- DefaultTimeScheduler.java 16 Mar 2002 00:18:34 -0000 1.12
+++ DefaultTimeScheduler.java 12 May 2002 08:06:41 -0000 1.13
@@ -29,6 +29,8 @@
/**
* Default implementation of TimeScheduler service.
*
+ * @phoenix:service name="org.apache.avalon.cornerstone.services.scheduler.TimeScheduler"
+ *
* @author <a href="mailto:peter@apache.org">Peter Donald</a>
* @author <a href="mailto:ram.chidambaram@telus.com">Ram Chidambaram</a>
*/
@@ -41,6 +43,9 @@
private PriorityQueue m_priorityQueue;
private ThreadManager m_threadManager;
+ /**
+ * @phoenix:dependency name="org.apache.avalon.cornerstone.services.threads.ThreadManager"
+ */
public void compose( final ComponentManager componentManager )
throws ComponentException
{
1.12 +6 -12 jakarta-avalon-cornerstone/src/java/org/apache/avalon/cornerstone/blocks/soapification/glue/Glue.java
Index: Glue.java
===================================================================
RCS file: /home/cvs/jakarta-avalon-cornerstone/src/java/org/apache/avalon/cornerstone/blocks/soapification/glue/Glue.java,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- Glue.java 16 Mar 2002 00:18:34 -0000 1.11
+++ Glue.java 12 May 2002 08:06:41 -0000 1.12
@@ -39,28 +39,22 @@
* jnet.jar
* jsse.jar
*
+ * @phoenix:service name="org.apache.avalon.cornerstone.services.soapification.SOAPification"
+ *
* @author <a href="mailto:Paul_Hammant@yahoo.com">Paul Hammant</>
*/
public class Glue
extends AbstractLogEnabled
- implements Block, SOAPification, Initializable, Startable, Disposable, Configurable
+ implements Block, SOAPification, Configurable, Startable
{
-
protected Configuration mConfiguration;
protected int mPort;
protected String mBindingAddress;
protected WebServer mWebServer;
protected String mBaseName;
- public void initialize()
- {
- }
-
- public void dispose()
- {
- }
-
- public void configure( Configuration configuration ) throws ConfigurationException
+ public void configure( final Configuration configuration )
+ throws ConfigurationException
{
mConfiguration = configuration;
mPort = configuration.getChild( "port" ).getValueAsInteger( 8765 );
@@ -140,7 +134,7 @@
public static void main( String[] args ) throws Exception
{
- Glue glue = new Glue();
+ final Glue glue = new Glue();
glue.mPort = 1234;
glue.mBindingAddress = "127.0.0.1";
glue.mBaseName = "soap";
1.6 +2 -0 jakarta-avalon-cornerstone/src/java/org/apache/avalon/cornerstone/blocks/sockets/DefaultSocketManager.java
Index: DefaultSocketManager.java
===================================================================
RCS file: /home/cvs/jakarta-avalon-cornerstone/src/java/org/apache/avalon/cornerstone/blocks/sockets/DefaultSocketManager.java,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- DefaultSocketManager.java 16 Mar 2002 00:18:34 -0000 1.5
+++ DefaultSocketManager.java 12 May 2002 08:06:41 -0000 1.6
@@ -25,6 +25,8 @@
/**
* Implementation of SocketManager.
*
+ * @phoenix:service name="org.apache.avalon.cornerstone.services.sockets.SocketManager"
+ *
* @author <a href="mailto:fede@apache.org">Federico Barbieri</a>
* @author <a href="mailto:peter@apache.org">Peter Donald</a>
*/
1.8 +2 -0 jakarta-avalon-cornerstone/src/java/org/apache/avalon/cornerstone/blocks/threads/DefaultThreadManager.java
Index: DefaultThreadManager.java
===================================================================
RCS file: /home/cvs/jakarta-avalon-cornerstone/src/java/org/apache/avalon/cornerstone/blocks/threads/DefaultThreadManager.java,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- DefaultThreadManager.java 9 Apr 2002 11:10:49 -0000 1.7
+++ DefaultThreadManager.java 12 May 2002 08:06:41 -0000 1.8
@@ -21,6 +21,8 @@
/**
* Default implementation of ThreadManager.
*
+ * @phoenix:service name="org.apache.avalon.cornerstone.services.threads.ThreadManager"
+ *
* @author <a href="mailto:peter@apache.org">Peter Donald</a>
*/
public class DefaultThreadManager
1.5 +10 -29 jakarta-avalon-cornerstone/src/java/org/apache/avalon/cornerstone/blocks/transport/authentication/DefaultAuthenticator.java
Index: DefaultAuthenticator.java
===================================================================
RCS file: /home/cvs/jakarta-avalon-cornerstone/src/java/org/apache/avalon/cornerstone/blocks/transport/authentication/DefaultAuthenticator.java,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- DefaultAuthenticator.java 3 Apr 2002 12:02:21 -0000 1.4
+++ DefaultAuthenticator.java 12 May 2002 08:06:41 -0000 1.5
@@ -8,24 +8,22 @@
package org.apache.avalon.cornerstone.blocks.transport.authentication;
import org.apache.avalon.framework.activity.Initializable;
-import org.apache.avalon.framework.logger.AbstractLogEnabled;
import org.apache.avalon.phoenix.Block;
import org.apache.excalibur.altrmi.common.AltrmiAuthentication;
import org.apache.excalibur.altrmi.common.AltrmiAuthenticationException;
import org.apache.excalibur.altrmi.server.AltrmiAuthenticator;
/**
- * Class DefaultAuthenticator
*
+ * @phoenix:service name="org.apache.excalibur.altrmi.server.AltrmiAuthenticator"
*
* @author Paul Hammant <a href="mailto:Paul_Hammant@yahoo.com">Paul_Hammant@yahoo.com</a>
- * @version $Revision: 1.4 $
+ * @version $Revision: 1.5 $
*/
-public class DefaultAuthenticator extends AbstractLogEnabled
+public class DefaultAuthenticator
implements AltrmiAuthenticator, Initializable, Block
{
-
- protected AltrmiAuthenticator mAltrmiAuthenticator;
+ private AltrmiAuthenticator m_altrmiAuthenticator;
/**
* Initialialize the component. Initialization includes
@@ -34,38 +32,21 @@
*
* @exception Exception if an error occurs
*/
- public void initialize() throws Exception
+ public void initialize()
+ throws Exception
{
- mAltrmiAuthenticator = new org.apache.excalibur.altrmi.server.impl.DefaultAuthenticator();
+ m_altrmiAuthenticator =
+ new org.apache.excalibur.altrmi.server.impl.DefaultAuthenticator();
}
- /**
- * Method checkAuthority
- *
- *
- * @param authentication
- * @param publishedName
- *
- * @return
- *
- * @throws AltrmiAuthenticationException
- *
- */
public void checkAuthority( AltrmiAuthentication authentication, String publishedName )
throws AltrmiAuthenticationException
{
- mAltrmiAuthenticator.checkAuthority( authentication, publishedName );
+ m_altrmiAuthenticator.checkAuthority( authentication, publishedName );
}
- /**
- * Method getTextToSign
- *
- *
- * @return
- *
- */
public String getTextToSign()
{
- return mAltrmiAuthenticator.getTextToSign();
+ return m_altrmiAuthenticator.getTextToSign();
}
}
1.9 +3 -59 jakarta-avalon-cornerstone/src/java/org/apache/avalon/cornerstone/blocks/transport/autopublishing/AutoPublisher.java
Index: AutoPublisher.java
===================================================================
RCS file: /home/cvs/jakarta-avalon-cornerstone/src/java/org/apache/avalon/cornerstone/blocks/transport/autopublishing/AutoPublisher.java,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- AutoPublisher.java 3 Apr 2002 12:02:21 -0000 1.8
+++ AutoPublisher.java 12 May 2002 08:06:41 -0000 1.9
@@ -22,31 +22,20 @@
import org.apache.excalibur.altrmi.server.PublicationException;
/**
- * Class AutoPublisher
- *
* Publishes so configured services automatically after block start().
*
*
* @author Paul Hammant <a href="mailto:Paul_Hammant@yahoo.com">Paul_Hammant@yahoo.com</a>
- * @version $Revision: 1.8 $
+ * @version $Revision: 1.9 $
*/
-public class AutoPublisher implements Configurable, ApplicationListener
+public class AutoPublisher
+ implements Configurable, ApplicationListener
{
-
private String m_publisherName;
private AltrmiPublisher m_altrmiPublisher;
private Map m_publications;
private Vector m_events = new Vector();
- /**
- * Method configure
- *
- *
- * @param configuration
- *
- * @throws ConfigurationException
- *
- */
public void configure( final Configuration configuration ) throws ConfigurationException
{
@@ -66,13 +55,6 @@
}
}
- /**
- * Method blockAdded
- *
- *
- * @param event
- *
- */
public void blockAdded( final BlockEvent event )
{
@@ -87,35 +69,14 @@
}
}
- /**
- * Method blockRemoved
- *
- *
- * @param event
- *
- */
public void blockRemoved( final BlockEvent event )
{
}
- /**
- * Method applicationStarting
- *
- *
- * @param event
- *
- * @throws Exception
- *
- */
public void applicationStarting( ApplicationEvent event ) throws Exception
{
}
- /**
- * Method applicationStarted
- *
- *
- */
public void applicationStarted()
{
@@ -144,11 +105,6 @@
}
}
- /**
- * Method applicationStopping
- *
- *
- */
public void applicationStopping()
{
@@ -174,22 +130,10 @@
}
}
- /**
- * Method applicationStopped
- *
- *
- */
public void applicationStopped()
{
}
- /**
- * Method applicationFailure
- *
- *
- * @param e
- *
- */
public void applicationFailure( Exception e )
{
}
1.4 +7 -25 jakarta-avalon-cornerstone/src/java/org/apache/avalon/cornerstone/blocks/transport/autopublishing/PublicationInfo.java
Index: PublicationInfo.java
===================================================================
RCS file: /home/cvs/jakarta-avalon-cornerstone/src/java/org/apache/avalon/cornerstone/blocks/transport/autopublishing/PublicationInfo.java,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- PublicationInfo.java 16 Mar 2002 00:18:34 -0000 1.3
+++ PublicationInfo.java 12 May 2002 08:06:41 -0000 1.4
@@ -8,30 +8,19 @@
package org.apache.avalon.cornerstone.blocks.transport.autopublishing;
/**
- * Class PublicationInfo
- *
*
* @author Paul Hammant <a href="mailto:Paul_Hammant@yahoo.com">Paul_Hammant@yahoo.com</a>
- * @version $Revision: 1.3 $
+ * @version $Revision: 1.4 $
*/
public class PublicationInfo
{
+ private final String m_publishAsName;
+ private final String m_interfaceToPublish;
- private final String mPublishAsName;
- private final String mInterfaceToPublish;
-
- /**
- * Constructor PublicationInfo
- *
- *
- * @param publishAsName
- * @param interfaceToPublish
- *
- */
public PublicationInfo( String publishAsName, String interfaceToPublish )
{
- mPublishAsName = publishAsName;
- mInterfaceToPublish = interfaceToPublish;
+ m_publishAsName = publishAsName;
+ m_interfaceToPublish = interfaceToPublish;
}
/**
@@ -43,18 +32,11 @@
*/
public String getPublishAsName()
{
- return mPublishAsName;
+ return m_publishAsName;
}
- /**
- * Method getInterfaceToPublish
- *
- *
- * @return
- *
- */
public String getInterfaceToPublish()
{
- return mInterfaceToPublish;
+ return m_interfaceToPublish;
}
}
1.15 +26 -39 jakarta-avalon-cornerstone/src/java/org/apache/avalon/cornerstone/blocks/transport/publishing/AbstractPublisher.java
Index: AbstractPublisher.java
===================================================================
RCS file: /home/cvs/jakarta-avalon-cornerstone/src/java/org/apache/avalon/cornerstone/blocks/transport/publishing/AbstractPublisher.java,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -r1.14 -r1.15
--- AbstractPublisher.java 3 Apr 2002 12:02:21 -0000 1.14
+++ AbstractPublisher.java 12 May 2002 08:06:41 -0000 1.15
@@ -37,21 +37,21 @@
import org.apache.excalibur.altrmi.server.impl.classretrievers.NoClassRetriever;
/**
- * Class AbstractPublisher
- *
+ * @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.14 $
+ * @version $Revision: 1.15 $
*/
-public abstract class AbstractPublisher extends AbstractLogEnabled
+public abstract class AbstractPublisher
+ extends AbstractLogEnabled
implements AltrmiPublisher, Startable, Composable, Contextualizable, Configurable,
Initializable, Block
{
- protected AbstractServer m_AbstractServer;
- private ClassRetriever m_ClassRetriever;
- protected AltrmiAuthenticator m_AltrmiAuthenticator;
- protected File mBaseDirectory;
+ protected AbstractServer m_abstractServer;
+ private ClassRetriever m_classRetriever;
+ protected AltrmiAuthenticator m_altrmiAuthenticator;
+ protected File m_baseDirectory;
/**
* Pass the <code>Configuration</code> to the <code>Configurable</code>
@@ -80,7 +80,7 @@
if( url.startsWith( "./" ) )
{
- File file = new File( mBaseDirectory, url.substring( 2, url.length() ) );
+ File file = new File( m_baseDirectory, url.substring( 2, url.length() ) );
vector.add( file.toURL() );
}
@@ -101,11 +101,11 @@
vector.copyInto( urls );
- m_ClassRetriever = new JarFileClassRetriever( urls );
+ m_classRetriever = new JarFileClassRetriever( urls );
}
else if( classRetrieverType.equals( "none" ) )
{
- m_ClassRetriever = new NoClassRetriever();
+ m_classRetriever = new NoClassRetriever();
}
else
{
@@ -114,31 +114,18 @@
}
}
- /**
- * Method contextualize
- *
- *
- *
- * @param context
- *
- */
public void contextualize( final Context context )
{
- mBaseDirectory = ( (BlockContext)context ).getBaseDirectory();
+ m_baseDirectory = ( (BlockContext)context ).getBaseDirectory();
}
/**
- * Method compose
- *
- *
- * @param manager
- *
- * @throws ComponentException
- *
+ * @phoenix:dependency name="org.apache.excalibur.altrmi.server.AltrmiAuthenticator"
*/
- public void compose( ComponentManager manager ) throws ComponentException
+ public void compose( ComponentManager manager )
+ throws ComponentException
{
- m_AltrmiAuthenticator =
+ m_altrmiAuthenticator =
(AltrmiAuthenticator)manager.lookup( AltrmiAuthenticator.class.getName() );
}
@@ -151,8 +138,8 @@
*/
public void initialize() throws Exception
{
- m_AbstractServer.setClassRetriever( m_ClassRetriever );
- m_AbstractServer.setAuthenticator( m_AltrmiAuthenticator );
+ m_abstractServer.setClassRetriever( m_classRetriever );
+ m_abstractServer.setAuthenticator( m_altrmiAuthenticator );
}
/**
@@ -170,7 +157,7 @@
public void publish( Object implementation, String asName, Class interfaceToExpose )
throws PublicationException
{
- m_AbstractServer.publish( implementation, asName, interfaceToExpose );
+ m_abstractServer.publish( implementation, asName, interfaceToExpose );
}
/**
@@ -189,7 +176,7 @@
Object implementation, String asName, PublicationDescription publicationDescription )
throws PublicationException
{
- m_AbstractServer.publish( implementation, asName, publicationDescription );
+ m_abstractServer.publish( implementation, asName, publicationDescription );
}
/**
@@ -205,7 +192,7 @@
*/
public void unPublish( Object o, String s ) throws PublicationException
{
- m_AbstractServer.unPublish( o, s );
+ m_abstractServer.unPublish( o, s );
}
/**
@@ -222,7 +209,7 @@
*/
public void replacePublished( Object o, String s, Object o1 ) throws PublicationException
{
- m_AbstractServer.replacePublished( o, s, o1 );
+ m_abstractServer.replacePublished( o, s, o1 );
}
/**
@@ -232,7 +219,7 @@
*/
public void start() throws Exception
{
- m_AbstractServer.start();
+ m_abstractServer.start();
}
/**
@@ -242,7 +229,7 @@
*/
public void stop() throws Exception
{
- m_AbstractServer.stop();
+ m_abstractServer.stop();
}
/**
@@ -257,11 +244,11 @@
*/
public MethodInvocationHandler getMethodInvocationHandler( MethodRequest request, String publishedName )
{
- return m_AbstractServer.getMethodInvocationHandler( request, publishedName );
+ return m_abstractServer.getMethodInvocationHandler( request, publishedName );
}
public MethodInvocationHandler getMethodInvocationHandler(String publishedName)
{
- return m_AbstractServer.getMethodInvocationHandler( publishedName );
+ return m_abstractServer.getMethodInvocationHandler( publishedName );
}
}
1.9 +21 -11 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.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- RmiPublisher.java 3 Apr 2002 12:02:21 -0000 1.8
+++ RmiPublisher.java 12 May 2002 08:06:41 -0000 1.9
@@ -9,20 +9,21 @@
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.excalibur.altrmi.server.impl.rmi.RmiServer;
/**
- * Class RmiPublisher
- *
+ * @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.8 $
+ * @version $Revision: 1.9 $
*/
-public class RmiPublisher extends AbstractPublisher
+public class RmiPublisher
+ extends AbstractPublisher
{
-
- private String mHost;
- private int mPort;
+ private String m_host;
+ private int m_port;
/**
* Pass the <code>Configuration</code> to the <code>Configurable</code>
@@ -36,8 +37,8 @@
super.configure( configuration );
- mPort = configuration.getChild( "port" ).getValueAsInteger();
- mHost = configuration.getChild( "host" ).getValue();
+ m_port = configuration.getChild( "port" ).getValueAsInteger();
+ m_host = configuration.getChild( "host" ).getValue();
}
/**
@@ -50,9 +51,18 @@
public void initialize() throws Exception
{
- m_AbstractServer = new RmiServer( mHost, mPort );
+ m_abstractServer = new RmiServer( m_host, m_port );
- setupLogger( m_AbstractServer );
+ setupLogger( m_abstractServer );
super.initialize();
+ }
+
+ /**
+ * @phoenix:dependency name="org.apache.excalibur.altrmi.server.AltrmiAuthenticator"
+ */
+ public void compose( ComponentManager manager )
+ throws ComponentException
+ {
+ super.compose( manager );
}
}
1.2 +13 -19 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.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- SocketStreamPublisher.java 13 Apr 2002 10:36:08 -0000 1.1
+++ SocketStreamPublisher.java 12 May 2002 08:06:41 -0000 1.2
@@ -30,18 +30,17 @@
/**
- * Class AbstractStreamPublisher
- *
+ * @phoenix:service name="org.apache.excalibur.altrmi.server.AltrmiPublisher"
*
* @author Paul Hammant <a href="mailto:Paul_Hammant@yahoo.com">Paul_Hammant@yahoo.com</a>
* @author Mike Miller.
* @author Peter Royal.
- * @version $Revision: 1.1 $
+ * @version $Revision: 1.2 $
*/
-public class SocketStreamPublisher extends AbstractPublisher
- implements ConnectionHandlerFactory
+public class SocketStreamPublisher
+ extends AbstractPublisher
+ implements ConnectionHandlerFactory
{
-
protected SocketManager m_socketManager;
protected ConnectionManager m_connectionManager;
private int m_port;
@@ -87,17 +86,13 @@
}
/**
- * Method compose
- *
- *
- * @param manager
- *
- * @throws ComponentException
- *
+ * @phoenix:dependency name="org.apache.excalibur.altrmi.server.AltrmiAuthenticator"
+ * @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 compose(ComponentManager manager)
+ throws ComponentException
{
-
super.compose(manager);
m_socketManager = (SocketManager) manager.lookup(SocketManager.ROLE);
@@ -127,10 +122,9 @@
*/
public ConnectionHandler createConnectionHandler() throws Exception
{
-
final PartialSocketStreamConnectionHandler handler =
new PartialSocketStreamConnectionHandler(
- (AbstractPartialSocketStreamServer) m_AbstractServer );
+ (AbstractPartialSocketStreamServer) m_abstractServer );
setupLogger( handler );
@@ -154,9 +148,9 @@
*/
public void initialize() throws Exception
{
- m_AbstractServer = (AbstractPartialSocketStreamServer) Class.forName(m_socketStreamServerClass).newInstance();
+ m_abstractServer = (AbstractPartialSocketStreamServer) Class.forName(m_socketStreamServerClass).newInstance();
- setupLogger( m_AbstractServer );
+ setupLogger( m_abstractServer );
super.initialize();
m_connectionManager.connect( "SocketStreamListener", makeServerSocket(), this );
}
1.11 +14 -50 jakarta-avalon-cornerstone/src/java/org/apache/avalon/cornerstone/blocks/transport/subscription/AbstractSubscriber.java
Index: AbstractSubscriber.java
===================================================================
RCS file: /home/cvs/jakarta-avalon-cornerstone/src/java/org/apache/avalon/cornerstone/blocks/transport/subscription/AbstractSubscriber.java,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- AbstractSubscriber.java 3 Apr 2002 12:02:21 -0000 1.10
+++ AbstractSubscriber.java 12 May 2002 08:06:41 -0000 1.11
@@ -22,18 +22,17 @@
import org.apache.excalibur.altrmi.common.AltrmiConnectionException;
/**
- * Class AbstractSubscriber
- *
+ * @phoenix:service name="org.apache.excalibur.altrmi.client.AltrmiInterfaceLookup"
*
* @author Paul Hammant <a href="mailto:Paul_Hammant@yahoo.com">Paul_Hammant@yahoo.com</a>
- * @version $Revision: 1.10 $
+ * @version $Revision: 1.11 $
*/
-public abstract class AbstractSubscriber extends AbstractLogEnabled
+public abstract class AbstractSubscriber
+ extends AbstractLogEnabled
implements AltrmiInterfaceLookup, Configurable, Initializable, Block
{
-
- protected AltrmiFactory mAltrmiFactory;
- protected AltrmiHostContext mHostContext;
+ protected AltrmiFactory m_altrmiFactory;
+ protected AltrmiHostContext m_hostContext;
/**
* Pass the <code>Configuration</code> to the <code>Configurable</code>
@@ -49,11 +48,11 @@
if( proxyClassLocation.equals( "client" ) )
{
- mAltrmiFactory = new ClientClassAltrmiFactory( false );
+ m_altrmiFactory = new ClientClassAltrmiFactory( false );
}
else if( proxyClassLocation.equals( "server" ) )
{
- mAltrmiFactory = new ServerClassAltrmiFactory( false );
+ m_altrmiFactory = new ServerClassAltrmiFactory( false );
}
else
{
@@ -61,50 +60,20 @@
}
}
- /**
- * Method lookup
- *
- *
- * @param publishedName
- *
- * @return
- *
- * @throws AltrmiConnectionException
- *
- */
public Object lookup( String publishedName ) throws AltrmiConnectionException
{
- return mAltrmiFactory.lookup( publishedName );
+ return m_altrmiFactory.lookup( publishedName );
}
- /**
- * Method lookup
- *
- *
- * @param publishedName
- * @param authentication
- *
- * @return
- *
- * @throws AltrmiConnectionException
- *
- */
public Object lookup( String publishedName, AltrmiAuthentication authentication )
throws AltrmiConnectionException
{
- return mAltrmiFactory.lookup( publishedName, authentication );
+ return m_altrmiFactory.lookup( publishedName, authentication );
}
- /**
- * Method getTextToSignForAuthentication
- *
- *
- * @return
- *
- */
public String getTextToSignForAuthentication()
{
- return mAltrmiFactory.getTextToSignForAuthentication();
+ return m_altrmiFactory.getTextToSignForAuthentication();
}
/**
@@ -116,21 +85,16 @@
*/
public void initialize() throws Exception
{
- mAltrmiFactory.setHostContext( mHostContext );
+ m_altrmiFactory.setHostContext( m_hostContext );
}
- /**
- * Method close
- *
- *
- */
public void close()
{
- mAltrmiFactory.close();
+ m_altrmiFactory.close();
}
public String[] list()
{
- return mAltrmiFactory.list();
+ return m_altrmiFactory.list();
}
}
1.7 +13 -14 jakarta-avalon-cornerstone/src/java/org/apache/avalon/cornerstone/blocks/transport/subscription/RmiSubscriber.java
Index: RmiSubscriber.java
===================================================================
RCS file: /home/cvs/jakarta-avalon-cornerstone/src/java/org/apache/avalon/cornerstone/blocks/transport/subscription/RmiSubscriber.java,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- RmiSubscriber.java 3 Apr 2002 12:02:21 -0000 1.6
+++ RmiSubscriber.java 12 May 2002 08:06:41 -0000 1.7
@@ -12,17 +12,16 @@
import org.apache.excalibur.altrmi.client.impl.rmi.RmiHostContext;
/**
- * Class RmiSubscriber
- *
+ * @phoenix:service name="org.apache.excalibur.altrmi.client.AltrmiInterfaceLookup"
*
* @author Paul Hammant <a href="mailto:Paul_Hammant@yahoo.com">Paul_Hammant@yahoo.com</a>
- * @version $Revision: 1.6 $
+ * @version $Revision: 1.7 $
*/
-public class RmiSubscriber extends AbstractSubscriber
+public class RmiSubscriber
+ extends AbstractSubscriber
{
-
- private String mHost;
- private int mPort;
+ private String m_host;
+ private int m_port;
/**
* Pass the <code>Configuration</code> to the <code>Configurable</code>
@@ -31,13 +30,14 @@
*
* @param configuration the class configurations.
*/
- public void configure( Configuration configuration ) throws ConfigurationException
+ public void configure( final Configuration configuration )
+ throws ConfigurationException
{
super.configure( configuration );
- mPort = configuration.getChild( "port" ).getValueAsInteger();
- mHost = configuration.getChild( "host" ).getValue();
+ m_port = configuration.getChild( "port" ).getValueAsInteger();
+ m_host = configuration.getChild( "host" ).getValue();
}
/**
@@ -47,11 +47,10 @@
*
* @exception Exception if an error occurs
*/
- public void initialize() throws Exception
+ public void initialize()
+ throws Exception
{
-
- mHostContext = new RmiHostContext( mHost, mPort );
-
+ m_hostContext = new RmiHostContext( m_host, m_port );
super.initialize();
}
}
1.8 +13 -15 jakarta-avalon-cornerstone/src/java/org/apache/avalon/cornerstone/blocks/transport/subscription/SocketObjectStreamSubscriber.java
Index: SocketObjectStreamSubscriber.java
===================================================================
RCS file: /home/cvs/jakarta-avalon-cornerstone/src/java/org/apache/avalon/cornerstone/blocks/transport/subscription/SocketObjectStreamSubscriber.java,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- SocketObjectStreamSubscriber.java 3 Apr 2002 12:02:21 -0000 1.7
+++ SocketObjectStreamSubscriber.java 12 May 2002 08:06:41 -0000 1.8
@@ -12,17 +12,16 @@
import org.apache.excalibur.altrmi.client.impl.socket.SocketObjectStreamHostContext;
/**
- * Class SocketObjectStreamSubscriber
- *
+ * @phoenix:service name="org.apache.excalibur.altrmi.client.AltrmiInterfaceLookup"
*
* @author Paul Hammant <a href="mailto:Paul_Hammant@yahoo.com">Paul_Hammant@yahoo.com</a>
- * @version $Revision: 1.7 $
+ * @version $Revision: 1.8 $
*/
-public class SocketObjectStreamSubscriber extends AbstractSubscriber
+public class SocketObjectStreamSubscriber
+ extends AbstractSubscriber
{
-
- private String mHost;
- private int mPort;
+ private String m_host;
+ private int m_port;
/**
* Pass the <code>Configuration</code> to the <code>Configurable</code>
@@ -31,13 +30,13 @@
*
* @param configuration the class configurations.
*/
- public void configure( Configuration configuration ) throws ConfigurationException
+ public void configure( final Configuration configuration )
+ throws ConfigurationException
{
-
super.configure( configuration );
- mPort = configuration.getChild( "port" ).getValueAsInteger();
- mHost = configuration.getChild( "host" ).getValue();
+ m_port = configuration.getChild( "port" ).getValueAsInteger();
+ m_host = configuration.getChild( "host" ).getValue();
}
/**
@@ -47,11 +46,10 @@
*
* @exception Exception if an error occurs
*/
- public void initialize() throws Exception
+ public void initialize()
+ throws Exception
{
-
- mHostContext = new SocketObjectStreamHostContext( mHost, mPort );
-
+ m_hostContext = new SocketObjectStreamHostContext( m_host, m_port );
super.initialize();
}
}
--
To unsubscribe, e-mail: <ma...@jakarta.apache.org>
For additional commands, e-mail: <ma...@jakarta.apache.org>