[jboss-cvs] JBoss Messaging SVN: r2115 - in trunk: src/main/org/jboss/messaging/core/plugin/postoffice/cluster and 4 other directories.
jboss-cvs-commits at lists.jboss.org
jboss-cvs-commits at lists.jboss.org
Wed Jan 31 06:29:27 EST 2007
Author: ovidiu.feodorov at jboss.com
Date: 2007-01-31 06:29:26 -0500 (Wed, 31 Jan 2007)
New Revision: 2115
Modified:
trunk/src/main/org/jboss/messaging/core/plugin/ClusteredPostOfficeService.java
trunk/src/main/org/jboss/messaging/core/plugin/postoffice/cluster/DefaultClusteredPostOffice.java
trunk/src/main/org/jboss/messaging/core/plugin/postoffice/cluster/jchannelfactory/JChannelFactory.java
trunk/tests/src/org/jboss/test/messaging/core/plugin/postoffice/DefaultPostOfficeTest.java
trunk/tests/src/org/jboss/test/messaging/tools/ServerManagement.java
trunk/tests/src/org/jboss/test/messaging/tools/jmx/rmi/LocalTestServer.java
trunk/tests/src/org/jboss/test/messaging/tools/jmx/rmi/RemoteTestServer.java
Log:
minor refactoring, logging changes
Modified: trunk/src/main/org/jboss/messaging/core/plugin/ClusteredPostOfficeService.java
===================================================================
--- trunk/src/main/org/jboss/messaging/core/plugin/ClusteredPostOfficeService.java 2007-01-31 11:14:20 UTC (rev 2114)
+++ trunk/src/main/org/jboss/messaging/core/plugin/ClusteredPostOfficeService.java 2007-01-31 11:29:26 UTC (rev 2115)
@@ -168,7 +168,6 @@
this.officeName = name;
}
-
public ObjectName getChannelFactoryName()
{
return channelFactoryName;
@@ -343,11 +342,14 @@
catch (Exception e)
{
// log.error("Error", e);
- // noop... means we couldn't find the channel hence we should use regular XMLChannelFactories
+ // noop... means we couldn't find the channel hence we should use regular
+ // XMLChannelFactories
}
- if (info!=null)
+
+ if (info != null)
{
log.debug(this + " uses MultiplexerJChannelFactory");
+
jChannelFactory =
new MultiplexerJChannelFactory(server, channelFactoryName, channelPartitionName,
syncChannelName, asyncChannelName);
Modified: trunk/src/main/org/jboss/messaging/core/plugin/postoffice/cluster/DefaultClusteredPostOffice.java
===================================================================
--- trunk/src/main/org/jboss/messaging/core/plugin/postoffice/cluster/DefaultClusteredPostOffice.java 2007-01-31 11:14:20 UTC (rev 2114)
+++ trunk/src/main/org/jboss/messaging/core/plugin/postoffice/cluster/DefaultClusteredPostOffice.java 2007-01-31 11:29:26 UTC (rev 2115)
@@ -86,9 +86,6 @@
import EDU.oswego.cs.dl.util.concurrent.QueuedExecutor;
/**
- *
- * A DefaultClusteredPostOffice
- *
* @author <a href="mailto:tim.fox at jboss.com">Tim Fox</a>
* @author <a href="mailto:ovidiu at jboss.org">Ovidiu Feodorov</a>
* @author <a href="mailto:clebert.suconic at jboss.com">Clebert Suconic</a>
Modified: trunk/src/main/org/jboss/messaging/core/plugin/postoffice/cluster/jchannelfactory/JChannelFactory.java
===================================================================
--- trunk/src/main/org/jboss/messaging/core/plugin/postoffice/cluster/jchannelfactory/JChannelFactory.java 2007-01-31 11:14:20 UTC (rev 2114)
+++ trunk/src/main/org/jboss/messaging/core/plugin/postoffice/cluster/jchannelfactory/JChannelFactory.java 2007-01-31 11:29:26 UTC (rev 2115)
@@ -5,11 +5,11 @@
/**
* @author <a href="mailto:clebert.suconic at jboss.org">Clebert Suconic</a>
* @version <tt>$Revision$</tt>
- * <p/>
- * $Id$
+ *
+ * $Id$
*/
public interface JChannelFactory
{
- public JChannel createSyncChannel() throws Exception;
- public JChannel createASyncChannel() throws Exception;
+ JChannel createSyncChannel() throws Exception;
+ JChannel createASyncChannel() throws Exception;
}
Modified: trunk/tests/src/org/jboss/test/messaging/core/plugin/postoffice/DefaultPostOfficeTest.java
===================================================================
--- trunk/tests/src/org/jboss/test/messaging/core/plugin/postoffice/DefaultPostOfficeTest.java 2007-01-31 11:14:20 UTC (rev 2114)
+++ trunk/tests/src/org/jboss/test/messaging/core/plugin/postoffice/DefaultPostOfficeTest.java 2007-01-31 11:29:26 UTC (rev 2115)
@@ -66,20 +66,6 @@
// Public --------------------------------------------------------
- public void setUp() throws Exception
- {
- super.setUp();
-
- }
-
- public void tearDown() throws Exception
- {
- super.tearDown();
- }
-
- // Public --------------------------------------------------------
-
-
public final void testBind() throws Throwable
{
PostOffice office1 = null;
@@ -1093,9 +1079,18 @@
assertEquals(binding1.getQueue().getChannelID(), binding2.getQueue().getChannelID());
assertEquals(binding1.getQueue().isRecoverable(), binding2.getQueue().isRecoverable());
}
-
-
-
+
+ protected void setUp() throws Exception
+ {
+ super.setUp();
+
+ }
+
+ protected void tearDown() throws Exception
+ {
+ super.tearDown();
+ }
+
// Private -------------------------------------------------------
// Inner classes -------------------------------------------------
Modified: trunk/tests/src/org/jboss/test/messaging/tools/ServerManagement.java
===================================================================
--- trunk/tests/src/org/jboss/test/messaging/tools/ServerManagement.java 2007-01-31 11:14:20 UTC (rev 2114)
+++ trunk/tests/src/org/jboss/test/messaging/tools/ServerManagement.java 2007-01-31 11:29:26 UTC (rev 2115)
@@ -1122,11 +1122,12 @@
{
if (servers[i] == null)
{
- throw new Exception("The server " + i + " has not been created!");
+ throw new Exception("Server " + i + " has not been created!");
}
+
if (!servers[i].getServer().isStarted())
{
- throw new Exception("The server " + i + " has not been started!");
+ throw new Exception("Server " + i + " has not been started!");
}
}
Modified: trunk/tests/src/org/jboss/test/messaging/tools/jmx/rmi/LocalTestServer.java
===================================================================
--- trunk/tests/src/org/jboss/test/messaging/tools/jmx/rmi/LocalTestServer.java 2007-01-31 11:14:20 UTC (rev 2114)
+++ trunk/tests/src/org/jboss/test/messaging/tools/jmx/rmi/LocalTestServer.java 2007-01-31 11:29:26 UTC (rev 2115)
@@ -324,7 +324,7 @@
if (clustered && !databaseType.equals("hsqldb"))
{
- //HSQL can't be used for clustered server peer - since it's not a shared database
+ // HSQL can't be used for clustered server peer - since it's not a shared database
persistenceConfigFile =
"server/default/deploy/clustered-" + databaseType + "-persistence-service.xml";
@@ -386,6 +386,7 @@
{
serverPeerConfig.setConstructorArgumentValue(0, 1, defaultQueueJNDIContext);
}
+
if (defaultTopicJNDIContext != null)
{
serverPeerConfig.setConstructorArgumentValue(0, 2, defaultTopicJNDIContext);
@@ -582,7 +583,6 @@
return true;
}
-
public ObjectName getServerPeerObjectName()
{
return serverPeerObjectName;
Modified: trunk/tests/src/org/jboss/test/messaging/tools/jmx/rmi/RemoteTestServer.java
===================================================================
--- trunk/tests/src/org/jboss/test/messaging/tools/jmx/rmi/RemoteTestServer.java 2007-01-31 11:14:20 UTC (rev 2114)
+++ trunk/tests/src/org/jboss/test/messaging/tools/jmx/rmi/RemoteTestServer.java 2007-01-31 11:29:26 UTC (rev 2115)
@@ -26,8 +26,6 @@
import org.jboss.messaging.core.plugin.contract.PersistenceManager;
/**
- *
- *
* @author <a href="mailto:ovidiu at jboss.org">Ovidiu Feodorov</a>
* @author <a href="mailto:tim.fox at jboss.com">Tim Fox</a>
* @version <tt>1.1</tt>
@@ -43,7 +41,7 @@
// Attributes -----------------------------------------------------------------------------------
// Constructors ---------------------------------------------------------------------------------
-
+
public RemoteTestServer(int serverIndex)
{
super(serverIndex);
@@ -55,16 +53,16 @@
* Only for in-VM use!
*/
public MessageStore getMessageStore() throws Exception
- {
- throw new UnsupportedOperationException("This method shouldn't be invoked on a remote server");
+ {
+ throw new UnsupportedOperationException("This method shouldn't be invoked on a remote server");
}
/**
* Only for in-VM use!
*/
public DestinationManager getDestinationManager() throws Exception
- {
- throw new UnsupportedOperationException("This method shouldn't be invoked on a remote server");
+ {
+ throw new UnsupportedOperationException("This method shouldn't be invoked on a remote server");
}
/**
@@ -72,11 +70,11 @@
*/
public PersistenceManager getPersistenceManager() throws Exception
{
- throw new UnsupportedOperationException("This method shouldn't be invoked on a remote server");
+ throw new UnsupportedOperationException("This method shouldn't be invoked on a remote server");
}
// Public ---------------------------------------------------------------------------------------
-
+
// Package protected ----------------------------------------------------------------------------
// Protected ------------------------------------------------------------------------------------
@@ -84,5 +82,5 @@
// Private --------------------------------------------------------------------------------------
// Inner classes --------------------------------------------------------------------------------
-
+
}
More information about the jboss-cvs-commits
mailing list