You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@turbine.apache.org by sg...@apache.org on 2010/07/30 14:33:17 UTC
svn commit: r980758 - in /turbine/fulcrum/trunk/hsqldb: ./
src/java/org/apache/fulcrum/hsqldb/ src/test/
src/test/org/apache/fulcrum/hsqldb/ xdocs/
Author: sgoeschl
Date: Fri Jul 30 12:33:16 2010
New Revision: 980758
URL: http://svn.apache.org/viewvc?rev=980758&view=rev
Log:
Preparing release
Modified:
turbine/fulcrum/trunk/hsqldb/NOTICE.txt
turbine/fulcrum/trunk/hsqldb/src/java/org/apache/fulcrum/hsqldb/HSQLService.java
turbine/fulcrum/trunk/hsqldb/src/java/org/apache/fulcrum/hsqldb/HSQLServiceImpl.java
turbine/fulcrum/trunk/hsqldb/src/test/org/apache/fulcrum/hsqldb/HSQLServiceTest.java
turbine/fulcrum/trunk/hsqldb/src/test/test.properties
turbine/fulcrum/trunk/hsqldb/xdocs/changes.xml
Modified: turbine/fulcrum/trunk/hsqldb/NOTICE.txt
URL: http://svn.apache.org/viewvc/turbine/fulcrum/trunk/hsqldb/NOTICE.txt?rev=980758&r1=980757&r2=980758&view=diff
==============================================================================
--- turbine/fulcrum/trunk/hsqldb/NOTICE.txt (original)
+++ turbine/fulcrum/trunk/hsqldb/NOTICE.txt Fri Jul 30 12:33:16 2010
@@ -1,5 +1,5 @@
-Turbine Fulcrum Spring
-Copyright 2002-2009 The Apache Software Foundation.
+Turbine Fulcrum HSQLDB
+Copyright 2002- 2010 The Apache Software Foundation.
This product includes software developed at
The Apache Software Foundation (http://www.apache.org/).
Modified: turbine/fulcrum/trunk/hsqldb/src/java/org/apache/fulcrum/hsqldb/HSQLService.java
URL: http://svn.apache.org/viewvc/turbine/fulcrum/trunk/hsqldb/src/java/org/apache/fulcrum/hsqldb/HSQLService.java?rev=980758&r1=980757&r2=980758&view=diff
==============================================================================
--- turbine/fulcrum/trunk/hsqldb/src/java/org/apache/fulcrum/hsqldb/HSQLService.java (original)
+++ turbine/fulcrum/trunk/hsqldb/src/java/org/apache/fulcrum/hsqldb/HSQLService.java Fri Jul 30 12:33:16 2010
@@ -19,8 +19,6 @@ package org.apache.fulcrum.hsqldb;
* under the License.
*/
-import org.apache.avalon.framework.activity.Startable;
-
/**
* A definition for a HSQLService component which configures a single hsqldb
* database.
@@ -30,4 +28,10 @@ import org.apache.avalon.framework.activ
*/
public interface HSQLService
{
+ /**
+ * Is the HSQLDB server online and will accept SQL queries?
+ *
+ * @return true if the HSQLDB server is online
+ */
+ boolean isOnline();
}
Modified: turbine/fulcrum/trunk/hsqldb/src/java/org/apache/fulcrum/hsqldb/HSQLServiceImpl.java
URL: http://svn.apache.org/viewvc/turbine/fulcrum/trunk/hsqldb/src/java/org/apache/fulcrum/hsqldb/HSQLServiceImpl.java?rev=980758&r1=980757&r2=980758&view=diff
==============================================================================
--- turbine/fulcrum/trunk/hsqldb/src/java/org/apache/fulcrum/hsqldb/HSQLServiceImpl.java (original)
+++ turbine/fulcrum/trunk/hsqldb/src/java/org/apache/fulcrum/hsqldb/HSQLServiceImpl.java Fri Jul 30 12:33:16 2010
@@ -128,7 +128,7 @@ public class HSQLServiceImpl
public void start() throws Exception
{
// The method start() waits for current state to change from
- // SERVER_STATE_OPENNING. In order to discover the success or failure
+ // SERVER_STATE_OPENING. In order to discover the success or failure
// of this operation, server state must be polled or a subclass of Server
// must be used that overrides the setState method to provide state
// change notification.
@@ -169,8 +169,7 @@ public class HSQLServiceImpl
// Service Interface Implementation
/////////////////////////////////////////////////////////////////////////
- public boolean isRunning() {
- // return true id server is online
+ public boolean isOnline() {
return server.getState() == ServerConstants.SERVER_STATE_ONLINE;
}
Modified: turbine/fulcrum/trunk/hsqldb/src/test/org/apache/fulcrum/hsqldb/HSQLServiceTest.java
URL: http://svn.apache.org/viewvc/turbine/fulcrum/trunk/hsqldb/src/test/org/apache/fulcrum/hsqldb/HSQLServiceTest.java?rev=980758&r1=980757&r2=980758&view=diff
==============================================================================
--- turbine/fulcrum/trunk/hsqldb/src/test/org/apache/fulcrum/hsqldb/HSQLServiceTest.java (original)
+++ turbine/fulcrum/trunk/hsqldb/src/test/org/apache/fulcrum/hsqldb/HSQLServiceTest.java Fri Jul 30 12:33:16 2010
@@ -24,6 +24,7 @@ import java.sql.DriverManager;
import java.sql.ResultSet;
import java.sql.Statement;
+import org.apache.avalon.framework.activity.Startable;
import org.apache.fulcrum.testcontainer.BaseUnitTest;
/**
@@ -91,9 +92,12 @@ public class HSQLServiceTest extends Bas
while( rs.next() )
{
String loginName = rs.getString("LOGIN_NAME");
- System.out.println(loginName);
+ System.out.println("Found the following user : " + loginName);
assertTrue( loginName.length() > 0 );
}
+
+ rs.close();
+ stmt.close();
}
catch (Exception e)
{
@@ -109,11 +113,11 @@ public class HSQLServiceTest extends Bas
}
}
- public void testIsRunning() throws Exception
+ public void testIsOnline() throws Exception
{
- assertTrue("Server was not started", ((HSQLServiceImpl) service).isRunning());
- ((HSQLServiceImpl) service).stop();
- assertFalse("Server is still running", ((HSQLServiceImpl) service).isRunning());
+ assertTrue("Server is online", service.isOnline());
+ ((Startable) service).stop();
+ assertFalse("Server is offline", service.isOnline());
}
/**
@@ -126,6 +130,6 @@ public class HSQLServiceTest extends Bas
Connection conn = this.getConnection("test");
Statement stmt = conn.createStatement();
stmt.execute("SHUTDOWN;");
- assertFalse("Server is still running", ((HSQLServiceImpl) service).isRunning());
+ assertFalse("Server is still running", (service).isOnline());
}
}
Modified: turbine/fulcrum/trunk/hsqldb/src/test/test.properties
URL: http://svn.apache.org/viewvc/turbine/fulcrum/trunk/hsqldb/src/test/test.properties?rev=980758&r1=980757&r2=980758&view=diff
==============================================================================
--- turbine/fulcrum/trunk/hsqldb/src/test/test.properties (original)
+++ turbine/fulcrum/trunk/hsqldb/src/test/test.properties Fri Jul 30 12:33:16 2010
@@ -1,5 +1,5 @@
#HSQL Database Engine 1.8.0.10
-#Tue Jan 26 15:12:35 CET 2010
+#Fri Jul 30 14:31:10 CEST 2010
hsqldb.script_format=0
runtime.gc_interval=0
sql.enforce_strict_size=false
@@ -11,7 +11,7 @@ version=1.8.0
hsqldb.default_table_type=memory
hsqldb.cache_file_scale=1
hsqldb.log_size=200
-modified=no
+modified=yes
hsqldb.cache_version=1.7.0
hsqldb.original_version=1.8.0
hsqldb.compatible_version=1.8.0
Modified: turbine/fulcrum/trunk/hsqldb/xdocs/changes.xml
URL: http://svn.apache.org/viewvc/turbine/fulcrum/trunk/hsqldb/xdocs/changes.xml?rev=980758&r1=980757&r2=980758&view=diff
==============================================================================
--- turbine/fulcrum/trunk/hsqldb/xdocs/changes.xml (original)
+++ turbine/fulcrum/trunk/hsqldb/xdocs/changes.xml Fri Jul 30 12:33:16 2010
@@ -23,7 +23,12 @@
<author email="siegfried.goeschl@it20one.at">Siegfried Goeschl</author>
</properties>
<body>
- <release version="1.0.1-dev" date="as in SVN">
+ <release version="1.0.0-SNAPSHOT" date="as in SVN">
+ <action dev="sgoeschl" type="update">
+ Removing the "Startable" interface from HSQLService because the
+ service lifecycle is managed by the container and not the
+ application.
+ </action>
<action dev="sgoeschl" type="update">
Removing the access to the Avalon context since it was never used.
</action>
@@ -40,8 +45,6 @@
stop the database since the cast fails when using dynamic
proxies
</action>
- </release>
- <release version="1.0.0" date="as in CVS">
<action dev="epugh" type="update">
Add additional tests submitted by Peter Tillemans in Scarab version of
this service.