User: chirino
Date: 01/07/15 19:51:47
Modified: src/main/org/jbossmq/server BasicQueue.java
ClientConsumer.java ExclusiveQueue.java
JBossMQService.java JBossMQServiceMBean.java
JMSDestination.java JMSServer.java
QueueManager.java QueueManagerMBean.java
SharedQueue.java StateManager.java
TopicManager.java TopicManagerMBean.java
Log:
Moved the rest of JBossMQ over to log4j logging.
- The jbossmq-client.jar now includes a log4j.properties which sets up the logging
subsystems on the client side. To chanage the logging levels, just place your
log4j.properties in the classpath betfore the jbossmq-client.jar
Revision Changes Path
1.8 +1 -1 jbossmq/src/main/org/jbossmq/server/BasicQueue.java
Index: BasicQueue.java
===================================================================
RCS file: /cvsroot/jboss/jbossmq/src/main/org/jbossmq/server/BasicQueue.java,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- BasicQueue.java 2001/07/11 02:59:30 1.7
+++ BasicQueue.java 2001/07/16 02:51:47 1.8
@@ -34,7 +34,7 @@
* @author Hiram Chirino ([EMAIL PROTECTED])
* @author Norbert Lataille ([EMAIL PROTECTED])
*
- * @version $Revision: 1.7 $
+ * @version $Revision: 1.8 $
*/
abstract public class BasicQueue implements Runnable {
//List of messages waiting to be dispatched
@@ -183,5 +183,5 @@
}
}
- org.apache.log4j.Category cat =
org.apache.log4j.Category.getInstance(BasicQueue.class);
+ static org.apache.log4j.Category cat =
org.apache.log4j.Category.getInstance(BasicQueue.class);
}
1.9 +1 -1 jbossmq/src/main/org/jbossmq/server/ClientConsumer.java
Index: ClientConsumer.java
===================================================================
RCS file: /cvsroot/jboss/jbossmq/src/main/org/jbossmq/server/ClientConsumer.java,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- ClientConsumer.java 2001/07/11 02:59:30 1.8
+++ ClientConsumer.java 2001/07/16 02:51:47 1.9
@@ -31,7 +31,7 @@
*
* @author Hiram Chirino ([EMAIL PROTECTED])
*
- * @version $Revision: 1.8 $
+ * @version $Revision: 1.9 $
*/
public class ClientConsumer implements Runnable {
//List of messages waiting to be transmitted to the client
@@ -431,7 +431,7 @@
- org.apache.log4j.Category cat =
org.apache.log4j.Category.getInstance(ClientConsumer.class);
+ static org.apache.log4j.Category cat =
org.apache.log4j.Category.getInstance(ClientConsumer.class);
public BasicQueue getSubscribedQueue( Subscription req ) throws
javax.jms.JMSException {
1.7 +1 -1 jbossmq/src/main/org/jbossmq/server/ExclusiveQueue.java
Index: ExclusiveQueue.java
===================================================================
RCS file: /cvsroot/jboss/jbossmq/src/main/org/jbossmq/server/ExclusiveQueue.java,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- ExclusiveQueue.java 2001/07/11 02:59:30 1.6
+++ ExclusiveQueue.java 2001/07/16 02:51:47 1.7
@@ -28,7 +28,7 @@
* @author Hiram Chirino ([EMAIL PROTECTED])
* @author Norbert Lataille ([EMAIL PROTECTED])
*
- * @version $Revision: 1.6 $
+ * @version $Revision: 1.7 $
*/
public class ExclusiveQueue extends BasicQueue {
// Iterate over the consumers asking them to take messages until they stop
@@ -84,5 +84,5 @@
super(server);
}
- org.apache.log4j.Category cat =
org.apache.log4j.Category.getInstance(ExclusiveQueue.class);
+ static org.apache.log4j.Category cat =
org.apache.log4j.Category.getInstance(ExclusiveQueue.class);
}
1.4 +1 -1 jbossmq/src/main/org/jbossmq/server/JBossMQService.java
Index: JBossMQService.java
===================================================================
RCS file: /cvsroot/jboss/jbossmq/src/main/org/jbossmq/server/JBossMQService.java,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- JBossMQService.java 2001/07/11 02:59:30 1.3
+++ JBossMQService.java 2001/07/16 02:51:47 1.4
@@ -31,7 +31,7 @@
* @author <a href="mailto:[EMAIL PROTECTED]";>Juha Lindfors</a>
* @author Hiram Chirino ([EMAIL PROTECTED])
*
- * @version $Revision: 1.3 $
+ * @version $Revision: 1.4 $
*/
public class JBossMQService
extends ServiceMBeanSupport
@@ -45,7 +45,7 @@
public String getName() {
- return "JBossMQ";
+ return "JBossMQ.Server";
}
1.5 +0 -0 jbossmq/src/main/org/jbossmq/server/JBossMQServiceMBean.java
Index: JBossMQServiceMBean.java
===================================================================
RCS file:
/cvsroot/jboss/jbossmq/src/main/org/jbossmq/server/JBossMQServiceMBean.java,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- JBossMQServiceMBean.java 2001/07/11 02:59:30 1.4
+++ JBossMQServiceMBean.java 2001/07/16 02:51:47 1.5
@@ -48,7 +48,7 @@
*
* @see <related>
* @author Vincent Sheffer ([EMAIL PROTECTED])
- * @version $Revision: 1.4 $
+ * @version $Revision: 1.5 $
*/
public interface JBossMQServiceMBean
extends org.jboss.util.ServiceMBean
1.6 +1 -1 jbossmq/src/main/org/jbossmq/server/JMSDestination.java
Index: JMSDestination.java
===================================================================
RCS file: /cvsroot/jboss/jbossmq/src/main/org/jbossmq/server/JMSDestination.java,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- JMSDestination.java 2001/07/11 02:59:30 1.5
+++ JMSDestination.java 2001/07/16 02:51:47 1.6
@@ -29,7 +29,7 @@
* @author Norbert Lataille ([EMAIL PROTECTED])
* @author Hiram Chirino ([EMAIL PROTECTED])
*
- * @version $Revision: 1.5 $
+ * @version $Revision: 1.6 $
*/
public class JMSDestination {
@@ -238,5 +238,5 @@
return clientId+"-"+subscriptionName;
}
- org.apache.log4j.Category cat =
org.apache.log4j.Category.getInstance(JMSDestination.class);
+ static org.apache.log4j.Category cat =
org.apache.log4j.Category.getInstance(JMSDestination.class);
}
1.13 +8 -4 jbossmq/src/main/org/jbossmq/server/JMSServer.java
Index: JMSServer.java
===================================================================
RCS file: /cvsroot/jboss/jbossmq/src/main/org/jbossmq/server/JMSServer.java,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -r1.12 -r1.13
--- JMSServer.java 2001/07/11 02:59:30 1.12
+++ JMSServer.java 2001/07/16 02:51:47 1.13
@@ -34,20 +34,23 @@
import org.jbossmq.pm.PersistenceManager;
+import EDU.oswego.cs.dl.util.concurrent.LinkedQueue;
+
/**
* This class implements the JMS provider
*
* @author Norbert Lataille ([EMAIL PROTECTED])
* @author Hiram Chirino ([EMAIL PROTECTED])
*
- * @version $Revision: 1.12 $
+ * @version $Revision: 1.13 $
*/
public class JMSServer
{
+
+
/////////////////////////////////////////////////////////////////////
// Attributes
/////////////////////////////////////////////////////////////////////
- public static final String OBJECT_NAME = "JMS:service=JMSServer";
//messages pending for a Destination ( HashMap of JMSServerQueue objects )
public HashMap destinations;
@@ -90,7 +93,9 @@
destinations=new HashMap();
threadGroup = new ThreadGroup("JBossMQ Server Threads");
-
+
+ //LinkedQueue lq = new LinkedQueue();
+ //executor = new PooledExecutor(lq, 25);
executor = new PooledExecutor(25);
executor.setMinimumPoolSize(0);
executor.setKeepAliveTime(1000*30);
@@ -778,8 +783,7 @@
}
//XElement serverConfig;
-
- org.apache.log4j.Category cat =
org.apache.log4j.Category.getInstance(JMSServer.class);
+ static org.apache.log4j.Category cat =
org.apache.log4j.Category.getInstance(JMSServer.class);
// This manages our thread pool.
public PooledExecutor executor;
public ThreadGroup threadGroup;
1.2 +0 -0 jbossmq/src/main/org/jbossmq/server/QueueManager.java
Index: QueueManager.java
===================================================================
RCS file: /cvsroot/jboss/jbossmq/src/main/org/jbossmq/server/QueueManager.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- QueueManager.java 2001/07/11 02:59:30 1.1
+++ QueueManager.java 2001/07/16 02:51:47 1.2
@@ -33,7 +33,7 @@
* @author Norbert Lataille ([EMAIL PROTECTED])
* @author Hiram Chirino ([EMAIL PROTECTED])
*
- * @version $Revision: 1.1 $
+ * @version $Revision: 1.2 $
*/
public class QueueManager extends ServiceMBeanSupport
implements QueueManagerMBean, MBeanRegistration {
1.2 +0 -1 jbossmq/src/main/org/jbossmq/server/QueueManagerMBean.java
Index: QueueManagerMBean.java
===================================================================
RCS file: /cvsroot/jboss/jbossmq/src/main/org/jbossmq/server/QueueManagerMBean.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- QueueManagerMBean.java 2001/07/11 02:59:30 1.1
+++ QueueManagerMBean.java 2001/07/16 02:51:47 1.2
@@ -55,13 +55,12 @@
*
* @see <related>
* @author Vincent Sheffer ([EMAIL PROTECTED])
- * @version $Revision: 1.1 $
+ * @version $Revision: 1.2 $
*/
public interface QueueManagerMBean
extends org.jboss.util.ServiceMBean
{
// Constants -----------------------------------------------------
- public static final String OBJECT_NAME = ":service=JBossMQ";
1.6 +1 -1 jbossmq/src/main/org/jbossmq/server/SharedQueue.java
Index: SharedQueue.java
===================================================================
RCS file: /cvsroot/jboss/jbossmq/src/main/org/jbossmq/server/SharedQueue.java,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- SharedQueue.java 2001/07/11 02:59:30 1.5
+++ SharedQueue.java 2001/07/16 02:51:47 1.6
@@ -26,7 +26,7 @@
* @author Hiram Chirino ([EMAIL PROTECTED])
* @author Norbert Lataille ([EMAIL PROTECTED])
*
- * @version $Revision: 1.5 $
+ * @version $Revision: 1.6 $
*/
public class SharedQueue extends BasicQueue {
// Constructor ---------------------------------------------------
@@ -80,5 +80,5 @@
return "SharedQueue";
}
- org.apache.log4j.Category cat =
org.apache.log4j.Category.getInstance(SharedQueue.class);
+ static org.apache.log4j.Category cat =
org.apache.log4j.Category.getInstance(SharedQueue.class);
}
1.3 +4 -4 jbossmq/src/main/org/jbossmq/server/StateManager.java
Index: StateManager.java
===================================================================
RCS file: /cvsroot/jboss/jbossmq/src/main/org/jbossmq/server/StateManager.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- StateManager.java 2001/07/11 03:23:31 1.2
+++ StateManager.java 2001/07/16 02:51:47 1.3
@@ -34,7 +34,7 @@
* @author Norbert Lataille ([EMAIL PROTECTED])
* @author Hiram Chirino ([EMAIL PROTECTED])
*
- * @version $Revision: 1.2 $
+ * @version $Revision: 1.3 $
*/
public class StateManager extends ServiceMBeanSupport implements StateManagerMBean,
MBeanRegistration {
@@ -80,7 +80,7 @@
}
} catch (org.jbossmq.xml.XElementException e ) {
- cat.error( e );
+ category.error( e );
throw new JMSException("Invalid server user configuration.");
}
}
@@ -149,7 +149,7 @@
}
}
- org.apache.log4j.Category cat=
org.apache.log4j.Category.getInstance(StateManager.class);
+
org.jbossmq.xml.XElement stateConfig;
private String stateFile = "jbossmq-state.xml";
@@ -196,14 +196,14 @@
try {
- cat.debug("Restarting Durable Subscription:
"+clientId+","+name+","+topicName);
+ category.debug("Restarting Durable Subscription:
"+clientId+","+name+","+topicName);
SpyTopic topic=new SpyTopic(topicName);
JMSDestination dest = server.getJMSDestination(topic);
dest.createDurableSubscription(clientId, name);
} catch (JMSException e ) {
- cat.error("Could not initialize a durable subscription
for : Client Id="+clientId+", Name="+name+", Topic Name="+topicName,e);
+ category.error("Could not initialize a durable
subscription for : Client Id="+clientId+", Name="+name+", Topic Name="+topicName,e);
}
}
1.2 +0 -0 jbossmq/src/main/org/jbossmq/server/TopicManager.java
Index: TopicManager.java
===================================================================
RCS file: /cvsroot/jboss/jbossmq/src/main/org/jbossmq/server/TopicManager.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- TopicManager.java 2001/07/11 02:59:30 1.1
+++ TopicManager.java 2001/07/16 02:51:47 1.2
@@ -33,7 +33,7 @@
* @author Norbert Lataille ([EMAIL PROTECTED])
* @author Hiram Chirino ([EMAIL PROTECTED])
*
- * @version $Revision: 1.1 $
+ * @version $Revision: 1.2 $
*/
public class TopicManager extends ServiceMBeanSupport
implements TopicManagerMBean, MBeanRegistration {
1.2 +0 -0 jbossmq/src/main/org/jbossmq/server/TopicManagerMBean.java
Index: TopicManagerMBean.java
===================================================================
RCS file: /cvsroot/jboss/jbossmq/src/main/org/jbossmq/server/TopicManagerMBean.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- TopicManagerMBean.java 2001/07/11 02:59:30 1.1
+++ TopicManagerMBean.java 2001/07/16 02:51:47 1.2
@@ -55,7 +55,7 @@
*
* @see <related>
* @author Vincent Sheffer ([EMAIL PROTECTED])
- * @version $Revision: 1.1 $
+ * @version $Revision: 1.2 $
*/
public interface TopicManagerMBean
extends org.jboss.util.ServiceMBean
_______________________________________________
Jboss-development mailing list
[EMAIL PROTECTED]
http://lists.sourceforge.net/lists/listinfo/jboss-development
