User: norbert
Date: 00/06/19 14:52:01
Modified: src/java/org/spydermq/distributed/server
ConnectionReceiverOIL.java
ConnectionReceiverOILClient.java
ConnectionReceiverRMI.java
ConnectionReceiverRMIImpl.java
DistributedJMSServerOIL.java
DistributedTopicConnectionFactoryRMIImpl.java
Added: src/java/org/spydermq/distributed/server
DistributedJMSServerOILMBean.java
Log:
OIL... the next step
Revision Changes Path
1.5 +10 -9
spyderMQ/src/java/org/spydermq/distributed/server/ConnectionReceiverOIL.java
Index: ConnectionReceiverOIL.java
===================================================================
RCS file:
/products/cvs/ejboss/spyderMQ/src/java/org/spydermq/distributed/server/ConnectionReceiverOIL.java,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- ConnectionReceiverOIL.java 2000/06/19 04:23:14 1.4
+++ ConnectionReceiverOIL.java 2000/06/19 21:52:00 1.5
@@ -19,6 +19,7 @@
import org.spydermq.Log;
import org.spydermq.NoReceiverException;
import org.spydermq.distributed.interfaces.ConnectionReceiver;
+import org.spydermq.distributed.interfaces.ConnectionReceiverSetup;
import java.util.Hashtable;
import java.util.HashSet;
import java.util.Iterator;
@@ -38,10 +39,10 @@
*
* @author Norbert Lataille ([EMAIL PROTECTED])
*
- * @version $Revision: 1.4 $
+ * @version $Revision: 1.5 $
*/
public class ConnectionReceiverOIL
- implements Runnable
+ implements Runnable, ConnectionReceiverSetup
{
// Attributes ----------------------------------------------------
@@ -59,8 +60,6 @@
}
// Internals -----------------------------------------------------
- // Should be hold in an "extension" and the ConnectionReceiver logic should be
in a separated object
- // We could generate a dynamic proxy for that...
static final int RECEIVE = 1;
static final int RECEIVE_MULTIPLE = 2;
@@ -165,17 +164,19 @@
Log.error(e);
}
- public ConnectionReceiver createClient() throws Exception
- {
- return new
ConnectionReceiverOILClient(InetAddress.getLocalHost(),serverSocket.getLocalPort());
- }
-
// Public --------------------------------------------------------
public void setConnection(SpyConnection connection)
{
this.connection=connection;
}
+
+ public ConnectionReceiver createClient() throws Exception
+ {
+ return new
ConnectionReceiverOILClient(InetAddress.getLocalHost(),serverSocket.getLocalPort());
+ }
+
+ // ---
//<DEBUG>
1.6 +0 -12
spyderMQ/src/java/org/spydermq/distributed/server/ConnectionReceiverOILClient.java
Index: ConnectionReceiverOILClient.java
===================================================================
RCS file:
/products/cvs/ejboss/spyderMQ/src/java/org/spydermq/distributed/server/ConnectionReceiverOILClient.java,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- ConnectionReceiverOILClient.java 2000/06/19 04:23:14 1.5
+++ ConnectionReceiverOILClient.java 2000/06/19 21:52:00 1.6
@@ -104,16 +104,4 @@
waitAnswer();
}
- public void setConnection(SpyConnection connection) throws Exception
- {
- //SHOULD NOT be there !!! - separate the interfaces
- }
-
- public ConnectionReceiver createClient() throws Exception
- {
- return null;
- //SHOULD NOT be there !!! - separate the interfaces
- }
-
-
}
1.3 +3 -2
spyderMQ/src/java/org/spydermq/distributed/server/ConnectionReceiverRMI.java
Index: ConnectionReceiverRMI.java
===================================================================
RCS file:
/products/cvs/ejboss/spyderMQ/src/java/org/spydermq/distributed/server/ConnectionReceiverRMI.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- ConnectionReceiverRMI.java 2000/06/15 04:02:28 1.2
+++ ConnectionReceiverRMI.java 2000/06/19 21:52:00 1.3
@@ -19,9 +19,10 @@
*
* @author Norbert Lataille ([EMAIL PROTECTED])
*
- * @version $Revision: 1.2 $
+ * @version $Revision: 1.3 $
*/
-public interface ConnectionReceiverRMI extends ConnectionReceiver, Remote
+public interface ConnectionReceiverRMI
+ extends ConnectionReceiver, Remote
{
// Public --------------------------------------------------------
1.11 +3 -2
spyderMQ/src/java/org/spydermq/distributed/server/ConnectionReceiverRMIImpl.java
Index: ConnectionReceiverRMIImpl.java
===================================================================
RCS file:
/products/cvs/ejboss/spyderMQ/src/java/org/spydermq/distributed/server/ConnectionReceiverRMIImpl.java,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- ConnectionReceiverRMIImpl.java 2000/06/19 04:23:14 1.10
+++ ConnectionReceiverRMIImpl.java 2000/06/19 21:52:00 1.11
@@ -24,17 +24,18 @@
import java.util.HashSet;
import java.util.Iterator;
import org.spydermq.distributed.interfaces.ConnectionReceiver;
+import org.spydermq.distributed.interfaces.ConnectionReceiverSetup;
/**
* The RMI implementation of the ConnectionReceiver object
*
* @author Norbert Lataille ([EMAIL PROTECTED])
*
- * @version $Revision: 1.10 $
+ * @version $Revision: 1.11 $
*/
public class ConnectionReceiverRMIImpl
extends UnicastRemoteObject
- implements ConnectionReceiverRMI
+ implements ConnectionReceiverRMI, ConnectionReceiverSetup
{
// Attributes ----------------------------------------------------
1.2 +2 -2
spyderMQ/src/java/org/spydermq/distributed/server/DistributedJMSServerOIL.java
Index: DistributedJMSServerOIL.java
===================================================================
RCS file:
/products/cvs/ejboss/spyderMQ/src/java/org/spydermq/distributed/server/DistributedJMSServerOIL.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- DistributedJMSServerOIL.java 2000/06/19 04:23:14 1.1
+++ DistributedJMSServerOIL.java 2000/06/19 21:52:00 1.2
@@ -25,13 +25,13 @@
import java.io.IOException;
public class DistributedJMSServerOIL
- implements Runnable, DistributedJMSServerSetup
+ implements Runnable, DistributedJMSServerSetup, DistributedJMSServerOILMBean
{
// Attributes ----------------------------------------------------
//The server implementation
- private JMSServer server;
+ private static JMSServer server;
// Constructor ---------------------------------------------------
1.4 +4 -2
spyderMQ/src/java/org/spydermq/distributed/server/DistributedTopicConnectionFactoryRMIImpl.java
Index: DistributedTopicConnectionFactoryRMIImpl.java
===================================================================
RCS file:
/products/cvs/ejboss/spyderMQ/src/java/org/spydermq/distributed/server/DistributedTopicConnectionFactoryRMIImpl.java,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- DistributedTopicConnectionFactoryRMIImpl.java 2000/06/14 23:34:13 1.3
+++ DistributedTopicConnectionFactoryRMIImpl.java 2000/06/19 21:52:00 1.4
@@ -21,9 +21,11 @@
*
* @author Norbert Lataille ([EMAIL PROTECTED])
*
- * @version $Revision: 1.3 $
+ * @version $Revision: 1.4 $
*/
-public class DistributedTopicConnectionFactoryRMIImpl extends UnicastRemoteObject
implements DistributedTopicConnectionFactoryRMI,
DistributedTopicConnectionFactoryRMIImplMBean
+public class DistributedTopicConnectionFactoryRMIImpl
+ extends UnicastRemoteObject
+ implements DistributedTopicConnectionFactoryRMI,
DistributedTopicConnectionFactoryRMIImplMBean
{
// Attributes ----------------------------------------------------
1.1
spyderMQ/src/java/org/spydermq/distributed/server/DistributedJMSServerOILMBean.java
Index: DistributedJMSServerOILMBean.java
===================================================================
package org.spydermq.distributed.server;
public interface DistributedJMSServerOILMBean
{
}
