You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@qpid.apache.org by ri...@apache.org on 2008/07/16 14:40:05 UTC

svn commit: r677262 - in /incubator/qpid/trunk/qpid/java/systests/src/main/java/org/apache/qpid/test: unit/ct/DurableSubscriberTest.java unit/xa/QueueTest.java unit/xa/TopicTest.java utils/QpidTestCase.java

Author: ritchiem
Date: Wed Jul 16 05:40:04 2008
New Revision: 677262

URL: http://svn.apache.org/viewvc?rev=677262&view=rev
Log:
Renamed shutdownServer to restartBroker as that is what is does

Modified:
    incubator/qpid/trunk/qpid/java/systests/src/main/java/org/apache/qpid/test/unit/ct/DurableSubscriberTest.java
    incubator/qpid/trunk/qpid/java/systests/src/main/java/org/apache/qpid/test/unit/xa/QueueTest.java
    incubator/qpid/trunk/qpid/java/systests/src/main/java/org/apache/qpid/test/unit/xa/TopicTest.java
    incubator/qpid/trunk/qpid/java/systests/src/main/java/org/apache/qpid/test/utils/QpidTestCase.java

Modified: incubator/qpid/trunk/qpid/java/systests/src/main/java/org/apache/qpid/test/unit/ct/DurableSubscriberTest.java
URL: http://svn.apache.org/viewvc/incubator/qpid/trunk/qpid/java/systests/src/main/java/org/apache/qpid/test/unit/ct/DurableSubscriberTest.java?rev=677262&r1=677261&r2=677262&view=diff
==============================================================================
--- incubator/qpid/trunk/qpid/java/systests/src/main/java/org/apache/qpid/test/unit/ct/DurableSubscriberTest.java (original)
+++ incubator/qpid/trunk/qpid/java/systests/src/main/java/org/apache/qpid/test/unit/ct/DurableSubscriberTest.java Wed Jul 16 05:40:04 2008
@@ -67,7 +67,7 @@
             //now stop the server
             try
             {
-                shutdownServer();
+                restartBroker();
             }
             catch (Exception e)
             {
@@ -117,7 +117,7 @@
             //now stop the server
             try
             {
-                shutdownServer();
+                restartBroker();
             }
             catch (Exception e)
             {

Modified: incubator/qpid/trunk/qpid/java/systests/src/main/java/org/apache/qpid/test/unit/xa/QueueTest.java
URL: http://svn.apache.org/viewvc/incubator/qpid/trunk/qpid/java/systests/src/main/java/org/apache/qpid/test/unit/xa/QueueTest.java?rev=677262&r1=677261&r2=677262&view=diff
==============================================================================
--- incubator/qpid/trunk/qpid/java/systests/src/main/java/org/apache/qpid/test/unit/xa/QueueTest.java (original)
+++ incubator/qpid/trunk/qpid/java/systests/src/main/java/org/apache/qpid/test/unit/xa/QueueTest.java Wed Jul 16 05:40:04 2008
@@ -372,7 +372,7 @@
             try
             {
                 _logger.debug("stopping broker");
-                shutdownServer();
+                restartBroker();
                 init();
             }
             catch (Exception e)
@@ -561,7 +561,7 @@
             try
             {
                 _logger.debug("stopping broker");
-                shutdownServer();
+                restartBroker();
                 init();
             }
             catch (Exception e)

Modified: incubator/qpid/trunk/qpid/java/systests/src/main/java/org/apache/qpid/test/unit/xa/TopicTest.java
URL: http://svn.apache.org/viewvc/incubator/qpid/trunk/qpid/java/systests/src/main/java/org/apache/qpid/test/unit/xa/TopicTest.java?rev=677262&r1=677261&r2=677262&view=diff
==============================================================================
--- incubator/qpid/trunk/qpid/java/systests/src/main/java/org/apache/qpid/test/unit/xa/TopicTest.java (original)
+++ incubator/qpid/trunk/qpid/java/systests/src/main/java/org/apache/qpid/test/unit/xa/TopicTest.java Wed Jul 16 05:40:04 2008
@@ -829,7 +829,7 @@
                 /////// stop the broker now !!
                 try
                 {
-                    shutdownServer();
+                    restartBroker();
                     init();
                 }
                 catch (Exception e)
@@ -1110,7 +1110,7 @@
                 /////// stop the server now !!
                 try
                 {
-                    shutdownServer();
+                    restartBroker();
                     init();
                 }
                 catch (Exception e)
@@ -1288,7 +1288,7 @@
                 /////// stop the server now !!
                 try
                 {
-                    shutdownServer();
+                    restartBroker();
                     init();
                 }
                 catch (Exception e)

Modified: incubator/qpid/trunk/qpid/java/systests/src/main/java/org/apache/qpid/test/utils/QpidTestCase.java
URL: http://svn.apache.org/viewvc/incubator/qpid/trunk/qpid/java/systests/src/main/java/org/apache/qpid/test/utils/QpidTestCase.java?rev=677262&r1=677261&r2=677262&view=diff
==============================================================================
--- incubator/qpid/trunk/qpid/java/systests/src/main/java/org/apache/qpid/test/utils/QpidTestCase.java (original)
+++ incubator/qpid/trunk/qpid/java/systests/src/main/java/org/apache/qpid/test/utils/QpidTestCase.java Wed Jul 16 05:40:04 2008
@@ -356,7 +356,7 @@
         return _brokerVersion.equals(VERSION_010);
     }
 
-    public void shutdownServer() throws Exception
+    public void restartBroker() throws Exception
     {
         stopBroker();
         startBroker();
@@ -369,7 +369,7 @@
      *
      * @return an initial context
      *
-     * @throws Exception if there is an error getting the context
+     * @throws NamingException if there is an error getting the context
      */
     public InitialContext getInitialContext() throws NamingException
     {