jspwiki-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From mets...@apache.org
Subject svn commit: r1553666 - in /jspwiki/trunk: ChangeLog jspwiki-war/src/main/java/org/apache/wiki/Release.java jspwiki-war/src/test/java/org/apache/wiki/HsqlDbUtils.java
Date Fri, 27 Dec 2013 12:10:57 GMT
Author: metskem
Date: Fri Dec 27 12:10:57 2013
New Revision: 1553666

URL: http://svn.apache.org/r1553666
Log:
2013-12-27  Harry Metske (metskem@apache.org)

       * 2.10.0-svn-60

       * fixed JSPWIKI-808 Refactor of o.a.w.HsqlDbUtils.stop() (simply use the Server.shutdown()
cmd)

Modified:
    jspwiki/trunk/ChangeLog
    jspwiki/trunk/jspwiki-war/src/main/java/org/apache/wiki/Release.java
    jspwiki/trunk/jspwiki-war/src/test/java/org/apache/wiki/HsqlDbUtils.java

Modified: jspwiki/trunk/ChangeLog
URL: http://svn.apache.org/viewvc/jspwiki/trunk/ChangeLog?rev=1553666&r1=1553665&r2=1553666&view=diff
==============================================================================
--- jspwiki/trunk/ChangeLog (original)
+++ jspwiki/trunk/ChangeLog Fri Dec 27 12:10:57 2013
@@ -1,3 +1,9 @@
+2013-12-27  Harry Metske (metskem@apache.org)
+
+       * 2.10.0-svn-60
+
+       * fixed JSPWIKI-808 Refactor of o.a.w.HsqlDbUtils.stop() (simply use the Server.shutdown()
cmd)
+
 2013-12-26  Juan Pablo Santos (juanpablo AT apache DOT org)
 
        * 2.10.0-svn-59

Modified: jspwiki/trunk/jspwiki-war/src/main/java/org/apache/wiki/Release.java
URL: http://svn.apache.org/viewvc/jspwiki/trunk/jspwiki-war/src/main/java/org/apache/wiki/Release.java?rev=1553666&r1=1553665&r2=1553666&view=diff
==============================================================================
--- jspwiki/trunk/jspwiki-war/src/main/java/org/apache/wiki/Release.java (original)
+++ jspwiki/trunk/jspwiki-war/src/main/java/org/apache/wiki/Release.java Fri Dec 27 12:10:57
2013
@@ -72,7 +72,7 @@ public final class Release {
      *  <p>
      *  If the build identifier is empty, it is not added.
      */
-    public static final String     BUILD         = "59";
+    public static final String     BUILD         = "60";
     
     /**
      *  This is the generic version string you should use when printing out the version.
 It is of 

Modified: jspwiki/trunk/jspwiki-war/src/test/java/org/apache/wiki/HsqlDbUtils.java
URL: http://svn.apache.org/viewvc/jspwiki/trunk/jspwiki-war/src/test/java/org/apache/wiki/HsqlDbUtils.java?rev=1553666&r1=1553665&r2=1553666&view=diff
==============================================================================
--- jspwiki/trunk/jspwiki-war/src/test/java/org/apache/wiki/HsqlDbUtils.java (original)
+++ jspwiki/trunk/jspwiki-war/src/test/java/org/apache/wiki/HsqlDbUtils.java Fri Dec 27 12:10:57
2013
@@ -39,7 +39,7 @@ import org.hsqldb.cmdline.SqlFile;
  *   <li>hsqldbu.start()</li>
  *   <li>hsqldbu.exec( "target/etc/db/hsql/hsql-userdb-setup.ddl" )</li>
  *   <li>hsqldbu.exec( "target/etc/db/hsql/hsql-userdb-teardown.ddl" )</li>
- *   <li>hsqldbu.stop()</li>
+ *   <li>hsqldbu.shutdown()</li>
  * </ol>
  * </code>
  * There are also a couple of convenience methods for unit testing:
@@ -79,13 +79,7 @@ public class HsqlDbUtils
     public void tearDown() 
     {
         exec( "src/test/config/hsql-userdb-teardown.ddl" );
-        stop();
-        try {
-        	LOG.info( "Sleeping for 1000 milliseconds." );
-        	Thread.sleep( 1000 );
-        } catch( InterruptedException ex ) {
-        	Thread.currentThread().interrupt();
-        }
+        shutdown();
     }
     
     /**
@@ -139,9 +133,9 @@ public class HsqlDbUtils
     }
 
     /**
-     * Stops the Hypersonic server.
+     * Shutdown the Hypersonic server.
      */
-    public void stop() 
+    public void shutdown()
     {
         LOG.info( "Shutting down Hypersonic JDBC server on localhost." );
         if( hsqlServer != null ) 
@@ -161,8 +155,8 @@ public class HsqlDbUtils
             {
                 close( conn );
             }
-            
-            hsqlServer.stop();
+
+            hsqlServer.shutdown();
         }
     }
     



Mime
View raw message