[jboss-cvs] JBoss Messaging SVN: r4410 - in trunk: src/main/org/jboss/messaging/core/deployers/impl and 4 other directories.
jboss-cvs-commits at lists.jboss.org
jboss-cvs-commits at lists.jboss.org
Sat Jun 7 16:17:50 EDT 2008
Author: timfox
Date: 2008-06-07 16:17:50 -0400 (Sat, 07 Jun 2008)
New Revision: 4410
Modified:
trunk/src/main/org/jboss/messaging/core/deployers/Deployer.java
trunk/src/main/org/jboss/messaging/core/deployers/impl/FileDeploymentManager.java
trunk/src/main/org/jboss/messaging/core/deployers/impl/XmlDeployer.java
trunk/src/main/org/jboss/messaging/core/server/impl/MessagingServerImpl.java
trunk/src/main/org/jboss/messaging/core/server/impl/MessagingServerPacketHandler.java
trunk/src/main/org/jboss/messaging/core/server/impl/ServerPacketHandlerSupport.java
trunk/src/main/org/jboss/messaging/core/settings/impl/QueueSettings.java
trunk/src/main/org/jboss/messaging/jms/server/impl/JMSServerDeployer.java
trunk/src/main/org/jboss/messaging/jms/server/impl/JMSServerManagerImpl.java
trunk/tests/jms-tests/src/org/jboss/test/messaging/tools/container/LocalTestServer.java
Log:
Remove dependencies to org.jboss.logging
Modified: trunk/src/main/org/jboss/messaging/core/deployers/Deployer.java
===================================================================
--- trunk/src/main/org/jboss/messaging/core/deployers/Deployer.java 2008-06-06 15:16:23 UTC (rev 4409)
+++ trunk/src/main/org/jboss/messaging/core/deployers/Deployer.java 2008-06-07 20:17:50 UTC (rev 4410)
@@ -21,19 +21,10 @@
*/
package org.jboss.messaging.core.deployers;
-import org.jboss.logging.Logger;
-import org.jboss.messaging.core.server.MessagingComponent;
-import org.jboss.messaging.util.XMLUtil;
-import org.w3c.dom.Element;
-import org.w3c.dom.Node;
-import org.w3c.dom.NodeList;
-
import java.net.URL;
-import java.util.ArrayList;
-import java.util.Collection;
-import java.util.HashMap;
-import java.util.Set;
+import org.jboss.messaging.core.server.MessagingComponent;
+
/**
* abstract class that helps with deployment of messaging components.
*
Modified: trunk/src/main/org/jboss/messaging/core/deployers/impl/FileDeploymentManager.java
===================================================================
--- trunk/src/main/org/jboss/messaging/core/deployers/impl/FileDeploymentManager.java 2008-06-06 15:16:23 UTC (rev 4409)
+++ trunk/src/main/org/jboss/messaging/core/deployers/impl/FileDeploymentManager.java 2008-06-07 20:17:50 UTC (rev 4410)
@@ -21,18 +21,22 @@
*/
package org.jboss.messaging.core.deployers.impl;
-import org.jboss.logging.Logger;
-import org.jboss.messaging.core.deployers.DeploymentManager;
-import org.jboss.messaging.core.deployers.Deployer;
-
-import java.util.*;
+import java.io.File;
+import java.io.IOException;
+import java.net.URL;
+import java.util.ArrayList;
+import java.util.Collection;
+import java.util.Enumeration;
+import java.util.HashMap;
+import java.util.Iterator;
+import java.util.concurrent.Executors;
import java.util.concurrent.ScheduledExecutorService;
-import java.util.concurrent.Executors;
import java.util.concurrent.TimeUnit;
-import java.net.URL;
-import java.io.File;
-import java.io.IOException;
+import org.jboss.messaging.core.deployers.Deployer;
+import org.jboss.messaging.core.deployers.DeploymentManager;
+import org.jboss.messaging.core.logging.Logger;
+
/**
* @author <a href="ataylor at redhat.com">Andy Taylor</a>
*/
Modified: trunk/src/main/org/jboss/messaging/core/deployers/impl/XmlDeployer.java
===================================================================
--- trunk/src/main/org/jboss/messaging/core/deployers/impl/XmlDeployer.java 2008-06-06 15:16:23 UTC (rev 4409)
+++ trunk/src/main/org/jboss/messaging/core/deployers/impl/XmlDeployer.java 2008-06-07 20:17:50 UTC (rev 4410)
@@ -21,19 +21,22 @@
*/
package org.jboss.messaging.core.deployers.impl;
+import java.io.InputStreamReader;
+import java.io.Reader;
+import java.net.URL;
+import java.util.ArrayList;
+import java.util.Collection;
+import java.util.HashMap;
+import java.util.Set;
+
import org.jboss.messaging.core.deployers.Deployer;
+import org.jboss.messaging.core.logging.Logger;
import org.jboss.messaging.core.server.MessagingComponent;
import org.jboss.messaging.util.XMLUtil;
-import org.jboss.logging.Logger;
+import org.w3c.dom.Element;
import org.w3c.dom.Node;
-import org.w3c.dom.Element;
import org.w3c.dom.NodeList;
-import java.net.URL;
-import java.util.*;
-import java.io.InputStreamReader;
-import java.io.Reader;
-
/**
* @author <a href="ataylor at redhat.com">Andy Taylor</a>
*/
Modified: trunk/src/main/org/jboss/messaging/core/server/impl/MessagingServerImpl.java
===================================================================
--- trunk/src/main/org/jboss/messaging/core/server/impl/MessagingServerImpl.java 2008-06-06 15:16:23 UTC (rev 4409)
+++ trunk/src/main/org/jboss/messaging/core/server/impl/MessagingServerImpl.java 2008-06-07 20:17:50 UTC (rev 4410)
@@ -21,7 +21,10 @@
*/
package org.jboss.messaging.core.server.impl;
-import org.jboss.logging.Logger;
+import java.util.HashSet;
+import java.util.concurrent.ScheduledExecutorService;
+import java.util.concurrent.ScheduledThreadPoolExecutor;
+
import org.jboss.messaging.core.config.Configuration;
import org.jboss.messaging.core.config.impl.ConfigurationImpl;
import org.jboss.messaging.core.deployers.Deployer;
@@ -30,6 +33,7 @@
import org.jboss.messaging.core.deployers.impl.QueueSettingsDeployer;
import org.jboss.messaging.core.deployers.impl.SecurityDeployer;
import org.jboss.messaging.core.exception.MessagingException;
+import org.jboss.messaging.core.logging.Logger;
import org.jboss.messaging.core.memory.MemoryManager;
import org.jboss.messaging.core.memory.impl.SimpleMemoryManager;
import org.jboss.messaging.core.persistence.StorageManager;
@@ -60,10 +64,6 @@
import org.jboss.messaging.core.version.Version;
import org.jboss.messaging.util.VersionLoader;
-import java.util.HashSet;
-import java.util.concurrent.ScheduledExecutorService;
-import java.util.concurrent.ScheduledThreadPoolExecutor;
-
/**
* A Messaging Server
*
Modified: trunk/src/main/org/jboss/messaging/core/server/impl/MessagingServerPacketHandler.java
===================================================================
--- trunk/src/main/org/jboss/messaging/core/server/impl/MessagingServerPacketHandler.java 2008-06-06 15:16:23 UTC (rev 4409)
+++ trunk/src/main/org/jboss/messaging/core/server/impl/MessagingServerPacketHandler.java 2008-06-07 20:17:50 UTC (rev 4410)
@@ -21,17 +21,22 @@
*/
package org.jboss.messaging.core.server.impl;
-import org.jboss.logging.Logger;
+import static org.jboss.messaging.core.remoting.impl.wireformat.EmptyPacket.CREATECONNECTION;
+
+import java.util.concurrent.ScheduledExecutorService;
+
import org.jboss.messaging.core.exception.MessagingException;
+import org.jboss.messaging.core.logging.Logger;
import org.jboss.messaging.core.remoting.KeepAliveFactory;
import org.jboss.messaging.core.remoting.Packet;
import org.jboss.messaging.core.remoting.PacketReturner;
-import org.jboss.messaging.core.remoting.impl.wireformat.*;
-import static org.jboss.messaging.core.remoting.impl.wireformat.EmptyPacket.CREATECONNECTION;
+import org.jboss.messaging.core.remoting.impl.wireformat.CreateConnectionRequest;
+import org.jboss.messaging.core.remoting.impl.wireformat.CreateConnectionResponse;
+import org.jboss.messaging.core.remoting.impl.wireformat.EmptyPacket;
+import org.jboss.messaging.core.remoting.impl.wireformat.Ping;
+import org.jboss.messaging.core.remoting.impl.wireformat.Pong;
import org.jboss.messaging.core.server.MessagingServer;
-import java.util.concurrent.ScheduledExecutorService;
-
/**
* A packet handler for all packets that need to be handled at the server level
*
Modified: trunk/src/main/org/jboss/messaging/core/server/impl/ServerPacketHandlerSupport.java
===================================================================
--- trunk/src/main/org/jboss/messaging/core/server/impl/ServerPacketHandlerSupport.java 2008-06-06 15:16:23 UTC (rev 4409)
+++ trunk/src/main/org/jboss/messaging/core/server/impl/ServerPacketHandlerSupport.java 2008-06-07 20:17:50 UTC (rev 4410)
@@ -21,8 +21,8 @@
*/
package org.jboss.messaging.core.server.impl;
-import org.jboss.logging.Logger;
import org.jboss.messaging.core.exception.MessagingException;
+import org.jboss.messaging.core.logging.Logger;
import org.jboss.messaging.core.remoting.Packet;
import org.jboss.messaging.core.remoting.PacketHandler;
import org.jboss.messaging.core.remoting.PacketReturner;
Modified: trunk/src/main/org/jboss/messaging/core/settings/impl/QueueSettings.java
===================================================================
--- trunk/src/main/org/jboss/messaging/core/settings/impl/QueueSettings.java 2008-06-06 15:16:23 UTC (rev 4409)
+++ trunk/src/main/org/jboss/messaging/core/settings/impl/QueueSettings.java 2008-06-07 20:17:50 UTC (rev 4410)
@@ -21,7 +21,7 @@
*/
package org.jboss.messaging.core.settings.impl;
-import org.jboss.logging.Logger;
+import org.jboss.messaging.core.logging.Logger;
import org.jboss.messaging.core.server.DistributionPolicy;
import org.jboss.messaging.core.server.impl.RoundRobinDistributionPolicy;
import org.jboss.messaging.core.settings.Mergeable;
Modified: trunk/src/main/org/jboss/messaging/jms/server/impl/JMSServerDeployer.java
===================================================================
--- trunk/src/main/org/jboss/messaging/jms/server/impl/JMSServerDeployer.java 2008-06-06 15:16:23 UTC (rev 4409)
+++ trunk/src/main/org/jboss/messaging/jms/server/impl/JMSServerDeployer.java 2008-06-07 20:17:50 UTC (rev 4410)
@@ -21,8 +21,8 @@
*/
package org.jboss.messaging.jms.server.impl;
-import org.jboss.logging.Logger;
import org.jboss.messaging.core.deployers.impl.XmlDeployer;
+import org.jboss.messaging.core.logging.Logger;
import org.jboss.messaging.core.server.MessagingServer;
import org.jboss.messaging.jms.server.JMSServerManager;
import org.w3c.dom.Node;
Modified: trunk/src/main/org/jboss/messaging/jms/server/impl/JMSServerManagerImpl.java
===================================================================
--- trunk/src/main/org/jboss/messaging/jms/server/impl/JMSServerManagerImpl.java 2008-06-06 15:16:23 UTC (rev 4409)
+++ trunk/src/main/org/jboss/messaging/jms/server/impl/JMSServerManagerImpl.java 2008-06-07 20:17:50 UTC (rev 4410)
@@ -30,7 +30,7 @@
import javax.naming.InitialContext;
import javax.naming.NamingException;
-import org.jboss.logging.Logger;
+import org.jboss.messaging.core.logging.Logger;
import org.jboss.messaging.core.management.MessagingServerManagement;
import org.jboss.messaging.core.server.Queue;
import org.jboss.messaging.jms.JBossQueue;
Modified: trunk/tests/jms-tests/src/org/jboss/test/messaging/tools/container/LocalTestServer.java
===================================================================
--- trunk/tests/jms-tests/src/org/jboss/test/messaging/tools/container/LocalTestServer.java 2008-06-06 15:16:23 UTC (rev 4409)
+++ trunk/tests/jms-tests/src/org/jboss/test/messaging/tools/container/LocalTestServer.java 2008-06-07 20:17:50 UTC (rev 4410)
@@ -42,7 +42,7 @@
import javax.transaction.UserTransaction;
import org.jboss.kernel.spi.deployment.KernelDeployment;
-import org.jboss.logging.Logger;
+import org.jboss.messaging.core.logging.Logger;
import org.jboss.messaging.core.security.Role;
import org.jboss.messaging.core.server.MessagingServer;
import org.jboss.messaging.core.settings.impl.QueueSettings;
More information about the jboss-cvs-commits
mailing list