User: hiram
Date: 01/03/01 17:13:04
Modified: src/main/org/jbossmq/server AbstractQueue.java
BasicQueue.java ClientConsumer.java
ExclusiveQueue.java InvocationLayerFactory.java
JBossMQService.java JBossMQServiceMBean.java
JMSDestination.java JMSServer.java
JMSServerMBean.java PersistenceManager.java
SharedQueue.java StartServer.java Task.java
UserManager.java
Log:
- Changed Source references of GPL to LGPL.
- QueueBrowser Selector fix.
- Persistence data files now do not get corrupted after a source rebuild
Revision Changes Path
1.2 +2 -2 jbossmq/src/main/org/jbossmq/server/AbstractQueue.java
Index: AbstractQueue.java
===================================================================
RCS file:
/products/cvs/ejboss/jbossmq/src/main/org/jbossmq/server/AbstractQueue.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- AbstractQueue.java 2001/01/26 00:43:52 1.1
+++ AbstractQueue.java 2001/03/02 01:13:01 1.2
@@ -1,7 +1,7 @@
/*
* JBossMQ, the OpenSource JMS implementation
*
- * Distributable under GPL license.
+ * Distributable under LGPL license.
* See terms of license at gnu.org.
*/
package org.jbossmq.server;
@@ -17,7 +17,7 @@
*
* @author Hiram Chirino ([EMAIL PROTECTED])
*
- * @version $Revision: 1.1 $
+ * @version $Revision: 1.2 $
*/
public interface AbstractQueue {
public void addConsumer(ClientConsumer consumer) throws JMSException;
1.2 +2 -2 jbossmq/src/main/org/jbossmq/server/BasicQueue.java
Index: BasicQueue.java
===================================================================
RCS file: /products/cvs/ejboss/jbossmq/src/main/org/jbossmq/server/BasicQueue.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- BasicQueue.java 2001/01/26 00:43:52 1.1
+++ BasicQueue.java 2001/03/02 01:13:01 1.2
@@ -1,7 +1,7 @@
/*
* JBossMQ, the OpenSource JMS implementation
*
- * Distributable under GPL license.
+ * Distributable under LGPL license.
* See terms of license at gnu.org.
*/
package org.jbossmq.server;
@@ -32,7 +32,7 @@
* @author Hiram Chirino ([EMAIL PROTECTED])
* @author Norbert Lataille ([EMAIL PROTECTED])
*
- * @version $Revision: 1.1 $
+ * @version $Revision: 1.2 $
*/
abstract public class BasicQueue implements Task, AbstractQueue {
1.3 +8 -13 jbossmq/src/main/org/jbossmq/server/ClientConsumer.java
Index: ClientConsumer.java
===================================================================
RCS file:
/products/cvs/ejboss/jbossmq/src/main/org/jbossmq/server/ClientConsumer.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- ClientConsumer.java 2001/02/21 22:52:00 1.2
+++ ClientConsumer.java 2001/03/02 01:13:01 1.3
@@ -1,7 +1,7 @@
/*
* JBossMQ, the OpenSource JMS implementation
*
- * Distributable under GPL license.
+ * Distributable under LGPL license.
* See terms of license at gnu.org.
*/
package org.jbossmq.server;
@@ -31,7 +31,7 @@
*
* @author Hiram Chirino ([EMAIL PROTECTED])
*
- * @version $Revision: 1.2 $
+ * @version $Revision: 1.3 $
*/
public class ClientConsumer implements Task {
@@ -70,18 +70,13 @@
int subscriptionId;
RestoreMessageTask(SpyMessage m,int subscriptionId) { message
= m; this.subscriptionId=subscriptionId; }
public void run() {
- try {
- Log.log("Restoring message: " +
message.getJMSMessageID());
- String
queueId=JMSDestination.DEFAULT_QUEUE_ID;;
- if( message.getJMSDestination() instanceof
SpyTopic ) {
- Subscription req =
(Subscription)subscriptions.get(new Integer(subscriptionId));
- queueId =
JMSDestination.durableSubscriptionToQueueId(dc.getClientID(),req.durableSubscriptionName);
- }
- server.restoreMessage(message,queueId);
- } catch ( JMSException e ) {
- Log.error("Could not restore a
message:"+message);
- Log.error(e);
+ Log.log("Restoring message: " +
message.getJMSMessageID());
+ String queueId=JMSDestination.DEFAULT_QUEUE_ID;;
+ if( message.getJMSDestination() instanceof SpyTopic ) {
+ Subscription req =
(Subscription)subscriptions.get(new Integer(subscriptionId));
+ queueId =
JMSDestination.durableSubscriptionToQueueId(dc.getClientID(),req.durableSubscriptionName);
}
+ server.restoreMessage(message,queueId);
}
}
1.2 +2 -2 jbossmq/src/main/org/jbossmq/server/ExclusiveQueue.java
Index: ExclusiveQueue.java
===================================================================
RCS file:
/products/cvs/ejboss/jbossmq/src/main/org/jbossmq/server/ExclusiveQueue.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- ExclusiveQueue.java 2001/01/26 00:43:53 1.1
+++ ExclusiveQueue.java 2001/03/02 01:13:01 1.2
@@ -1,7 +1,7 @@
/*
* JBossMQ, the OpenSource JMS implementation
*
- * Distributable under GPL license.
+ * Distributable under LGPL license.
* See terms of license at gnu.org.
*/
package org.jbossmq.server;
@@ -28,7 +28,7 @@
* @author Hiram Chirino ([EMAIL PROTECTED])
* @author Norbert Lataille ([EMAIL PROTECTED])
*
- * @version $Revision: 1.1 $
+ * @version $Revision: 1.2 $
*/
public class ExclusiveQueue extends BasicQueue {
1.2 +1 -1 jbossmq/src/main/org/jbossmq/server/InvocationLayerFactory.java
Index: InvocationLayerFactory.java
===================================================================
RCS file:
/products/cvs/ejboss/jbossmq/src/main/org/jbossmq/server/InvocationLayerFactory.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- InvocationLayerFactory.java 2001/01/26 00:43:53 1.1
+++ InvocationLayerFactory.java 2001/03/02 01:13:01 1.2
@@ -1,7 +1,7 @@
/*
* JBossMQ, the OpenSource JMS implementation
*
- * Distributable under GPL license.
+ * Distributable under LGPL license.
* See terms of license at gnu.org.
*/
package org.jbossmq.server;
1.2 +2 -2 jbossmq/src/main/org/jbossmq/server/JBossMQService.java
Index: JBossMQService.java
===================================================================
RCS file:
/products/cvs/ejboss/jbossmq/src/main/org/jbossmq/server/JBossMQService.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- JBossMQService.java 2001/01/26 00:43:53 1.1
+++ JBossMQService.java 2001/03/02 01:13:01 1.2
@@ -1,7 +1,7 @@
/*
* jBoss, the OpenSource EJB server
*
- * Distributable under GPL license.
+ * Distributable under LGPL license.
* See terms of license at gnu.org.
*/
package org.jbossmq.server;
@@ -28,7 +28,7 @@
* @author <a href="mailto:[EMAIL PROTECTED]">Juha Lindfors</a>
* @author Hiram Chirino ([EMAIL PROTECTED])
*
- * @version $Revision: 1.1 $
+ * @version $Revision: 1.2 $
*/
public class JBossMQService
extends ServiceMBeanSupport
1.2 +12 -5 jbossmq/src/main/org/jbossmq/server/JBossMQServiceMBean.java
Index: JBossMQServiceMBean.java
===================================================================
RCS file:
/products/cvs/ejboss/jbossmq/src/main/org/jbossmq/server/JBossMQServiceMBean.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- JBossMQServiceMBean.java 2001/01/26 00:43:53 1.1
+++ JBossMQServiceMBean.java 2001/03/02 01:13:01 1.2
@@ -1,7 +1,7 @@
/*
* jBoss, the OpenSource EJB server
*
- * Distributable under GPL license.
+ * Distributable under LGPL license.
* See terms of license at gnu.org.
*/
@@ -10,31 +10,38 @@
/*
* jBoss, the OpenSource EJB server
*
- * Distributable under GPL license.
+ * Distributable under LGPL license.
* See terms of license at gnu.org.
*/
/*
* jBoss, the OpenSource EJB server
*
- * Distributable under GPL license.
+ * Distributable under LGPL license.
* See terms of license at gnu.org.
*/
/*
* jBoss, the OpenSource EJB server
*
- * Distributable under GPL license.
+ * Distributable under LGPL license.
* See terms of license at gnu.org.
*/
+/*
+ * jBoss, the OpenSource EJB server
+ *
+ * Distributable under LGPL license.
+ * See terms of license at gnu.org.
+ */
+
/**
* <description>
* MBean interface for the JBossMQ JMX service.
*
* @see <related>
* @author Vincent Sheffer ([EMAIL PROTECTED])
- * @version $Revision: 1.1 $
+ * @version $Revision: 1.2 $
*/
public interface JBossMQServiceMBean
extends org.jboss.util.ServiceMBean
1.2 +2 -2 jbossmq/src/main/org/jbossmq/server/JMSDestination.java
Index: JMSDestination.java
===================================================================
RCS file:
/products/cvs/ejboss/jbossmq/src/main/org/jbossmq/server/JMSDestination.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- JMSDestination.java 2001/01/26 00:43:54 1.1
+++ JMSDestination.java 2001/03/02 01:13:02 1.2
@@ -1,7 +1,7 @@
/*
* JBossMQ, the OpenSource JMS implementation
*
- * Distributable under GPL license.
+ * Distributable under LGPL license.
* See terms of license at gnu.org.
*/
package org.jbossmq.server;
@@ -29,7 +29,7 @@
* @author Norbert Lataille ([EMAIL PROTECTED])
* @author Hiram Chirino ([EMAIL PROTECTED])
*
- * @version $Revision: 1.1 $
+ * @version $Revision: 1.2 $
*/
public class JMSDestination {
1.4 +6 -11 jbossmq/src/main/org/jbossmq/server/JMSServer.java
Index: JMSServer.java
===================================================================
RCS file: /products/cvs/ejboss/jbossmq/src/main/org/jbossmq/server/JMSServer.java,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- JMSServer.java 2001/02/18 03:51:06 1.3
+++ JMSServer.java 2001/03/02 01:13:02 1.4
@@ -1,7 +1,7 @@
/*
* JBossMQ, the OpenSource JMS implementation
*
- * Distributable under GPL license.
+ * Distributable under LGPL license.
* See terms of license at gnu.org.
*/
package org.jbossmq.server;
@@ -30,7 +30,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
@@ -501,15 +501,10 @@
public void restoreMessage(SpyMessage message, String queueId)
{
- try {
- JMSDestination
queue=(JMSDestination)messageQueue.get(message.getJMSDestination());
- if (queue==null) throw new RuntimeException("This destination
does not exist!");
- //Add the message to the queue
- queue.restoreMessage(message, queueId);
- } catch ( JMSException e ) {
- Log.error("Could not restore a message:"+message);
- Log.error(e);
- }
+ JMSDestination
queue=(JMSDestination)messageQueue.get(message.getJMSDestination());
+ if (queue==null) throw new RuntimeException("This destination does not
exist!");
+ //Add the message to the queue
+ queue.restoreMessage(message, queueId);
}
public void saveConfig() throws java.io.IOException {
1.2 +2 -2 jbossmq/src/main/org/jbossmq/server/JMSServerMBean.java
Index: JMSServerMBean.java
===================================================================
RCS file:
/products/cvs/ejboss/jbossmq/src/main/org/jbossmq/server/JMSServerMBean.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- JMSServerMBean.java 2001/01/26 00:43:55 1.1
+++ JMSServerMBean.java 2001/03/02 01:13:02 1.2
@@ -1,7 +1,7 @@
/*
* JBossMQ, the OpenSource JMS implementation
*
- * Distributable under GPL license.
+ * Distributable under LGPL license.
* See terms of license at gnu.org.
*/
package org.jbossmq.server;
@@ -16,7 +16,7 @@
* @author Norbert Lataille ([EMAIL PROTECTED])
* @author Hiram Chirino ([EMAIL PROTECTED])
*
- * @version $Revision: 1.1 $
+ * @version $Revision: 1.2 $
*/
public interface JMSServerMBean
{
1.2 +3 -3 jbossmq/src/main/org/jbossmq/server/PersistenceManager.java
Index: PersistenceManager.java
===================================================================
RCS file:
/products/cvs/ejboss/jbossmq/src/main/org/jbossmq/server/PersistenceManager.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- PersistenceManager.java 2001/01/26 00:43:55 1.1
+++ PersistenceManager.java 2001/03/02 01:13:02 1.2
@@ -1,7 +1,7 @@
/*
* JBossMQ, the OpenSource JMS implementation
*
- * Distributable under GPL license.
+ * Distributable under LGPL license.
* See terms of license at gnu.org.
*/
package org.jbossmq.server;
@@ -26,7 +26,7 @@
*
* @author Hiram Chirino ([EMAIL PROTECTED])
*
- * @version $Revision: 1.1 $
+ * @version $Revision: 1.2 $
*/
public class PersistenceManager {
@@ -343,4 +343,4 @@
logInfo.log.remove(message, null);
}
-}
+}
\ No newline at end of file
1.2 +2 -2 jbossmq/src/main/org/jbossmq/server/SharedQueue.java
Index: SharedQueue.java
===================================================================
RCS file: /products/cvs/ejboss/jbossmq/src/main/org/jbossmq/server/SharedQueue.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- SharedQueue.java 2001/01/26 00:43:55 1.1
+++ SharedQueue.java 2001/03/02 01:13:02 1.2
@@ -1,7 +1,7 @@
/*
* JBossMQ, the OpenSource JMS implementation
*
- * Distributable under GPL license.
+ * Distributable under LGPL license.
* See terms of license at gnu.org.
*/
package org.jbossmq.server;
@@ -26,7 +26,7 @@
* @author Hiram Chirino ([EMAIL PROTECTED])
* @author Norbert Lataille ([EMAIL PROTECTED])
*
- * @version $Revision: 1.1 $
+ * @version $Revision: 1.2 $
*/
public class SharedQueue extends BasicQueue {
1.2 +3 -3 jbossmq/src/main/org/jbossmq/server/StartServer.java
Index: StartServer.java
===================================================================
RCS file: /products/cvs/ejboss/jbossmq/src/main/org/jbossmq/server/StartServer.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- StartServer.java 2001/01/26 00:43:56 1.1
+++ StartServer.java 2001/03/02 01:13:02 1.2
@@ -1,7 +1,7 @@
/*
* JBossMQ, the OpenSource JMS implementation
*
- * Distributable under GPL license.
+ * Distributable under LGPL license.
* See terms of license at gnu.org.
*/
package org.jbossmq.server;
@@ -48,7 +48,7 @@
* @author Vincent Sheffer ([EMAIL PROTECTED])
* @author Hiram Chirino ([EMAIL PROTECTED])
*
- * @version $Revision: 1.1 $
+ * @version $Revision: 1.2 $
*/
public class StartServer implements Runnable
{
@@ -247,4 +247,4 @@
}
}
-}
+}
\ No newline at end of file
1.2 +2 -2 jbossmq/src/main/org/jbossmq/server/Task.java
Index: Task.java
===================================================================
RCS file: /products/cvs/ejboss/jbossmq/src/main/org/jbossmq/server/Task.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- Task.java 2001/01/26 00:43:56 1.1
+++ Task.java 2001/03/02 01:13:02 1.2
@@ -1,7 +1,7 @@
/*
* JBossMQ, the OpenSource JMS implementation
*
- * Distributable under GPL license.
+ * Distributable under LGPL license.
* See terms of license at gnu.org.
*/
package org.jbossmq.server;
@@ -14,7 +14,7 @@
*
* @author Hiram Chirino ([EMAIL PROTECTED])
*
- * @version $Revision: 1.1 $
+ * @version $Revision: 1.2 $
*/
public interface Task {
public void run() throws JMSException;
1.3 +2 -2 jbossmq/src/main/org/jbossmq/server/UserManager.java
Index: UserManager.java
===================================================================
RCS file: /products/cvs/ejboss/jbossmq/src/main/org/jbossmq/server/UserManager.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- UserManager.java 2001/02/18 03:51:05 1.2
+++ UserManager.java 2001/03/02 01:13:02 1.3
@@ -1,7 +1,7 @@
/*
* JBossMQ, the OpenSource JMS implementation
*
- * Distributable under GPL license.
+ * Distributable under LGPL license.
* See terms of license at gnu.org.
*/
package org.jbossmq.server;
@@ -30,7 +30,7 @@
* @author Norbert Lataille ([EMAIL PROTECTED])
* @author Hiram Chirino ([EMAIL PROTECTED])
*
- * @version $Revision: 1.2 $
+ * @version $Revision: 1.3 $
*/
public class UserManager {
