User: hiram
Date: 00/12/21 14:33:59
Modified: src/java/org/spydermq/server JMSServer.java
SpyderMQService.java StartServer.java
Log:
Added ConnectionConsumer so that work on the ASF part of
spyderMQ can start.
Revision Changes Path
1.4 +3 -8 spyderMQ/src/java/org/spydermq/server/JMSServer.java
Index: JMSServer.java
===================================================================
RCS file: /products/cvs/ejboss/spyderMQ/src/java/org/spydermq/server/JMSServer.java,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- JMSServer.java 2000/12/19 06:43:36 1.3
+++ JMSServer.java 2000/12/21 22:33:59 1.4
@@ -26,7 +26,7 @@
* @author Norbert Lataille ([EMAIL PROTECTED])
* @author Hiram Chirino ([EMAIL PROTECTED])
*
- * @version $Revision: 1.3 $
+ * @version $Revision: 1.4 $
*/
public class JMSServer
implements Runnable, JMSServerMBean
@@ -162,7 +162,7 @@
// Administration calls
public SpyTopic newTopic(String name) throws JMSException
{
- Log.notice("[JMSServer] new topic : "+name);
+ Log.notice("new topic : "+name);
SpyTopic newTopic=new SpyTopic(name);
if (messageQueue.containsKey(newTopic)) throw new JMSException("This
topic already exists !");
@@ -182,7 +182,7 @@
public SpyQueue newQueue(String name) throws JMSException
{
- Log.notice("[JMSServer] new queue : "+name);
+ Log.notice("new queue : "+name);
SpyQueue newQueue=new SpyQueue(name);
if (messageQueue.containsKey(newQueue)) throw new JMSException("This
queue already exists !");
@@ -306,7 +306,7 @@
public synchronized void deleteTemporaryDestination(SpyDestination dest)
{
- Log.log("JMSServer: deleteDestination(dest="+dest.toString()+")");
+ Log.log("deleteDestination(dest="+dest.toString()+")");
synchronized (messageQueue) {
HashMap newMap=(HashMap)messageQueue.clone();
@@ -321,11 +321,6 @@
securityManager.addClientID(ID);
}
- public void finalize()
- {
- Log.error("JMSServer.finalize()");
- }
-
//Sent by a client to Ack or Nack a message.
public void acknowledge(SpyDistributedConnection dc, SpyAcknowledgementItem
item) throws JMSException
{
1.3 +19 -37 spyderMQ/src/java/org/spydermq/server/SpyderMQService.java
Index: SpyderMQService.java
===================================================================
RCS file:
/products/cvs/ejboss/spyderMQ/src/java/org/spydermq/server/SpyderMQService.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- SpyderMQService.java 2000/12/12 05:58:43 1.2
+++ SpyderMQService.java 2000/12/21 22:33:59 1.3
@@ -28,7 +28,7 @@
* @author Vincent Sheffer ([EMAIL PROTECTED])
* @author <a href="mailto:[EMAIL PROTECTED]">Juha Lindfors</a>
*
- * @version $Revision: 1.2 $
+ * @version $Revision: 1.3 $
*/
public class SpyderMQService
extends ServiceMBeanSupport
@@ -39,8 +39,8 @@
// Attributes ----------------------------------------------------
MBeanServer mBeanServer = null;
- Object spyderMQServer = null;
+
public SpyderMQService() {
}
@@ -55,37 +55,25 @@
return "SpyderMQ";
}
- public void startService()
- throws Exception {
- if (spyderMQServer == null) {
+ public void startService() throws Exception {
+
+ if (startServer == null) {
final Log log = this.log;
- try {
- log.log("Testing if SpyderMQ is present....");
- try {
- spyderMQServer =
Thread.currentThread().getContextClassLoader().loadClass("org.spydermq.server.StartServer").newInstance();
- log.log("OK");
- }catch(Exception e) {
- log.log("failed");
- log.log("SpyderMQ wasn't found:");
- log.debug(e.getMessage());
- return;
- }
+ try {
+
+ startServer = new StartServer();
+ startServer.start(mBeanServer);
- Class[] spyderMQArgsClasses = { MBeanServer.class };
- Object[] spyderMQArgs = { mBeanServer };
-
- Method startMethod =
spyderMQServer.getClass().getMethod("start",
-
spyderMQArgsClasses);
+ } catch (Exception e) {
- Logger.log("Starting SpyderMQ...");
- startMethod.invoke(spyderMQServer, spyderMQArgs);
- }
- catch (Exception e) {
- log.error("SpyderMQ failed");
+ log.error("SpyderMQ Start Failed");
log.exception(e);
+
}
+
}
+
}
public void stopService() {
@@ -93,23 +81,17 @@
Method stopMethod = null;
Object [] spyderMQArgs = null;
- if (this.spyderMQServer != null) {
+ if (this.startServer != null) {
try {
- spyderMQArgsClasses = new Class[0];
- stopMethod =
this.spyderMQServer.getClass().getMethod("stop",
-
spyderMQArgsClasses);
- spyderMQArgs = new Object[0];
- // [FIXME] jpl
- // This causes some error messages on the console
so
- // disabled for now
+ startServer.stop();
- //stopMethod.invoke(spyderMQServer, spyderMQArgs);
- this.spyderMQServer = null;
} catch (Exception e) {
- log.error("SpyderMQ failed");
+ log.error("SpyderMQ Stop Failed");
log.exception(e);
}
}
}
+
+ StartServer startServer = null;
}
1.6 +3 -2 spyderMQ/src/java/org/spydermq/server/StartServer.java
Index: StartServer.java
===================================================================
RCS file:
/products/cvs/ejboss/spyderMQ/src/java/org/spydermq/server/StartServer.java,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- StartServer.java 2000/12/19 06:43:35 1.5
+++ StartServer.java 2000/12/21 22:33:59 1.6
@@ -48,7 +48,7 @@
* @author Vincent Sheffer ([EMAIL PROTECTED])
* @author Hiram Chirino ([EMAIL PROTECTED])
*
- * @version $Revision: 1.5 $
+ * @version $Revision: 1.6 $
*/
public class StartServer implements Runnable
{
@@ -144,10 +144,9 @@
}
public void run() {
- System.out.println("SpyderMQ [v0.5]");
try {
-
+
//Load the property file
InputStream in =
getClass().getClassLoader().getResource("spyderMQ.xml").openStream();
XElement serverCfg = XElement.createFrom(in);
@@ -245,6 +244,8 @@
ctx.rebind(xaQueueConnectionFactoryJNDI,invocationLayerFactory.spyXAQueueConnectionFactory);
}
+
+ System.out.println("SpyderMQ 0.6 Started");
} catch (Exception e) {
