You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@jspwiki.apache.org by me...@apache.org on 2013/06/11 21:00:08 UTC
svn commit: r1491906 - in /incubator/jspwiki/trunk: ./
jspwiki-it-tests/jspwiki-it-test-container-jdbc/
jspwiki-it-tests/jspwiki-it-test-custom-jdbc/
jspwiki-it-tests/jspwiki-selenium-tests/
jspwiki-it-tests/jspwiki-selenium-tests/src/main/java/org/apa...
Author: metskem
Date: Tue Jun 11 19:00:07 2013
New Revision: 1491906
URL: http://svn.apache.org/r1491906
Log:
2013-06-11 Harry Metske (metskem@apache.org)
* 2.10.0-svn-10
* upgraded hsqldb from 1.8.0.10 (very old, no more sources and docs in central)
to 2.2.9 (current release)
* removed (illegal according to IntelliJ IDEA) cobertura systemProperties from pom.xml
Modified:
incubator/jspwiki/trunk/ChangeLog
incubator/jspwiki/trunk/LICENSE
incubator/jspwiki/trunk/jspwiki-it-tests/jspwiki-it-test-container-jdbc/pom.xml
incubator/jspwiki/trunk/jspwiki-it-tests/jspwiki-it-test-custom-jdbc/pom.xml
incubator/jspwiki/trunk/jspwiki-it-tests/jspwiki-selenium-tests/pom.xml
incubator/jspwiki/trunk/jspwiki-it-tests/jspwiki-selenium-tests/src/main/java/org/apache/wiki/HsqlDbUtils.java
incubator/jspwiki/trunk/jspwiki-it-tests/jspwiki-selenium-tests/src/main/resources/jdbc.properties
incubator/jspwiki/trunk/jspwiki-war/pom.xml
incubator/jspwiki/trunk/jspwiki-war/src/main/java/org/apache/wiki/Release.java
incubator/jspwiki/trunk/jspwiki-war/src/test/config/hsql-userdb-setup.ddl
incubator/jspwiki/trunk/jspwiki-war/src/test/config/hsql-userdb-teardown.ddl
incubator/jspwiki/trunk/jspwiki-war/src/test/java/org/apache/wiki/HsqlDbUtils.java
incubator/jspwiki/trunk/jspwiki-war/src/test/java/org/apache/wiki/auth/authorize/JDBCGroupDatabaseTest.java
incubator/jspwiki/trunk/jspwiki-war/src/test/java/org/apache/wiki/auth/user/JDBCUserDatabaseTest.java
incubator/jspwiki/trunk/jspwiki-war/src/test/java/org/apache/wiki/web/TestContainer.java
incubator/jspwiki/trunk/jspwiki-war/src/test/resources/jdbc.properties
incubator/jspwiki/trunk/pom.xml
Modified: incubator/jspwiki/trunk/ChangeLog
URL: http://svn.apache.org/viewvc/incubator/jspwiki/trunk/ChangeLog?rev=1491906&r1=1491905&r2=1491906&view=diff
==============================================================================
--- incubator/jspwiki/trunk/ChangeLog (original)
+++ incubator/jspwiki/trunk/ChangeLog Tue Jun 11 19:00:07 2013
@@ -1,3 +1,11 @@
+2013-06-11 Harry Metske (metskem@apache.org)
+
+ * 2.10.0-svn-10
+
+ * upgraded hsqldb from 1.8.0.10 (very old, no more sources and docs in central)
+ to 2.2.9 (current release)
+ * removed (illegal according to IntelliJ IDEA) cobertura systemProperties from pom.xml
+
2013-06-09 Harry Metske (metskem@apache.org)
* 2.10.0-svn-9
Modified: incubator/jspwiki/trunk/LICENSE
URL: http://svn.apache.org/viewvc/incubator/jspwiki/trunk/LICENSE?rev=1491906&r1=1491905&r2=1491906&view=diff
==============================================================================
--- incubator/jspwiki/trunk/LICENSE (original)
+++ incubator/jspwiki/trunk/LICENSE Tue Jun 11 19:00:07 2013
@@ -240,7 +240,8 @@ TEST LIBRARY
=============================================================================================================
commons-el-1.0.jar LICENSE
custom_rhino-0.4.3.jar doc/LICENSE.mpl
-hsqldb-1.8.0.10.jar doc/LICENSE.hsqldb
+hsqldb-2.2.9.jar doc/LICENSE.hsqldb
+sqltool-2.2.9.jar doc/LICENSE.hsqldb
jasper-compiler-5.5.23.jar LICENSE
jasper-runtime-5.5.23.jar LICENSE
jetty-all-7.6.7.v20120910.jar LICENSE
@@ -1693,4 +1694,4 @@ CONTRIBUTORS BE LIABLE FOR ANY DIRECT, I
DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF
USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY,
WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY
-WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
\ No newline at end of file
+WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
Modified: incubator/jspwiki/trunk/jspwiki-it-tests/jspwiki-it-test-container-jdbc/pom.xml
URL: http://svn.apache.org/viewvc/incubator/jspwiki/trunk/jspwiki-it-tests/jspwiki-it-test-container-jdbc/pom.xml?rev=1491906&r1=1491905&r2=1491906&view=diff
==============================================================================
--- incubator/jspwiki/trunk/jspwiki-it-tests/jspwiki-it-test-container-jdbc/pom.xml (original)
+++ incubator/jspwiki/trunk/jspwiki-it-tests/jspwiki-it-test-container-jdbc/pom.xml Tue Jun 11 19:00:07 2013
@@ -101,11 +101,17 @@
<groupId>log4j</groupId>
<artifactId>log4j</artifactId>
</dependency>
-
+
<dependency>
- <groupId>org.hsqldb</groupId>
- <artifactId>hsqldb</artifactId>
- <scope>compile</scope>
+ <groupId>org.hsqldb</groupId>
+ <artifactId>hsqldb</artifactId>
+ <scope>compile</scope>
+ </dependency>
+
+ <dependency>
+ <groupId>org.hsqldb</groupId>
+ <artifactId>sqltool</artifactId>
+ <scope>compile</scope>
</dependency>
</dependencies>
</project>
\ No newline at end of file
Modified: incubator/jspwiki/trunk/jspwiki-it-tests/jspwiki-it-test-custom-jdbc/pom.xml
URL: http://svn.apache.org/viewvc/incubator/jspwiki/trunk/jspwiki-it-tests/jspwiki-it-test-custom-jdbc/pom.xml?rev=1491906&r1=1491905&r2=1491906&view=diff
==============================================================================
--- incubator/jspwiki/trunk/jspwiki-it-tests/jspwiki-it-test-custom-jdbc/pom.xml (original)
+++ incubator/jspwiki/trunk/jspwiki-it-tests/jspwiki-it-test-custom-jdbc/pom.xml Tue Jun 11 19:00:07 2013
@@ -101,11 +101,17 @@
<groupId>log4j</groupId>
<artifactId>log4j</artifactId>
</dependency>
-
+
<dependency>
- <groupId>org.hsqldb</groupId>
- <artifactId>hsqldb</artifactId>
- <scope>compile</scope>
+ <groupId>org.hsqldb</groupId>
+ <artifactId>hsqldb</artifactId>
+ <scope>compile</scope>
+ </dependency>
+
+ <dependency>
+ <groupId>org.hsqldb</groupId>
+ <artifactId>sqltool</artifactId>
+ <scope>compile</scope>
</dependency>
</dependencies>
</project>
\ No newline at end of file
Modified: incubator/jspwiki/trunk/jspwiki-it-tests/jspwiki-selenium-tests/pom.xml
URL: http://svn.apache.org/viewvc/incubator/jspwiki/trunk/jspwiki-it-tests/jspwiki-selenium-tests/pom.xml?rev=1491906&r1=1491905&r2=1491906&view=diff
==============================================================================
--- incubator/jspwiki/trunk/jspwiki-it-tests/jspwiki-selenium-tests/pom.xml (original)
+++ incubator/jspwiki/trunk/jspwiki-it-tests/jspwiki-selenium-tests/pom.xml Tue Jun 11 19:00:07 2013
@@ -51,11 +51,17 @@
<groupId>log4j</groupId>
<artifactId>log4j</artifactId>
</dependency>
-
- <dependency>
- <groupId>org.hsqldb</groupId>
- <artifactId>hsqldb</artifactId>
- <scope>compile</scope>
- </dependency>
+
+ <dependency>
+ <groupId>org.hsqldb</groupId>
+ <artifactId>hsqldb</artifactId>
+ <scope>compile</scope>
+ </dependency>
+
+ <dependency>
+ <groupId>org.hsqldb</groupId>
+ <artifactId>sqltool</artifactId>
+ <scope>compile</scope>
+ </dependency>
</dependencies>
</project>
\ No newline at end of file
Modified: incubator/jspwiki/trunk/jspwiki-it-tests/jspwiki-selenium-tests/src/main/java/org/apache/wiki/HsqlDbUtils.java
URL: http://svn.apache.org/viewvc/incubator/jspwiki/trunk/jspwiki-it-tests/jspwiki-selenium-tests/src/main/java/org/apache/wiki/HsqlDbUtils.java?rev=1491906&r1=1491905&r2=1491906&view=diff
==============================================================================
--- incubator/jspwiki/trunk/jspwiki-it-tests/jspwiki-selenium-tests/src/main/java/org/apache/wiki/HsqlDbUtils.java (original)
+++ incubator/jspwiki/trunk/jspwiki-it-tests/jspwiki-selenium-tests/src/main/java/org/apache/wiki/HsqlDbUtils.java Tue Jun 11 19:00:07 2013
@@ -30,7 +30,7 @@ import org.apache.commons.lang.ArrayUtil
import org.apache.commons.lang.StringUtils;
import org.apache.log4j.Logger;
import org.hsqldb.Server;
-import org.hsqldb.util.SqlFile;
+import org.hsqldb.cmdline.SqlFile;
/**
@@ -59,7 +59,6 @@ public class HsqlDbUtils
private static final Logger LOG = Logger.getLogger( HsqlDbUtils.class );
- Properties hProps = null;
Server hsqlServer = null;
/**
@@ -121,8 +120,9 @@ public class HsqlDbUtils
try
{
conn = getConnection();
- SqlFile userDbSetup = new SqlFile( new File( file ), false, null );
- userDbSetup.execute( conn, true );
+ SqlFile userDbSetup = new SqlFile( new File( file ));
+ userDbSetup.setConnection( conn );
+ userDbSetup.execute();
}
catch( Exception e )
{
Modified: incubator/jspwiki/trunk/jspwiki-it-tests/jspwiki-selenium-tests/src/main/resources/jdbc.properties
URL: http://svn.apache.org/viewvc/incubator/jspwiki/trunk/jspwiki-it-tests/jspwiki-selenium-tests/src/main/resources/jdbc.properties?rev=1491906&r1=1491905&r2=1491906&view=diff
==============================================================================
--- incubator/jspwiki/trunk/jspwiki-it-tests/jspwiki-selenium-tests/src/main/resources/jdbc.properties (original)
+++ incubator/jspwiki/trunk/jspwiki-it-tests/jspwiki-selenium-tests/src/main/resources/jdbc.properties Tue Jun 11 19:00:07 2013
@@ -26,7 +26,6 @@ jdbc.admin.id=SA
jdbc.admin.password=
jdbc.driver.class=org.hsqldb.jdbcDriver
jdbc.driver.id=hsql
-jdbc.driver.jar=hsqldb-1.8.0.10.jar
jdbc.driver.url=jdbc\:hsqldb\:hsql\://localhost/jspwiki
jdbc.user.id=jspwiki
jdbc.user.password=password
Modified: incubator/jspwiki/trunk/jspwiki-war/pom.xml
URL: http://svn.apache.org/viewvc/incubator/jspwiki/trunk/jspwiki-war/pom.xml?rev=1491906&r1=1491905&r2=1491906&view=diff
==============================================================================
--- incubator/jspwiki/trunk/jspwiki-war/pom.xml (original)
+++ incubator/jspwiki/trunk/jspwiki-war/pom.xml Tue Jun 11 19:00:07 2013
@@ -161,6 +161,11 @@
</dependency>
<dependency>
+ <groupId>org.hsqldb</groupId>
+ <artifactId>sqltool</artifactId>
+ </dependency>
+
+ <dependency>
<groupId>tomcat</groupId>
<artifactId>jasper-runtime</artifactId>
</dependency>
Modified: incubator/jspwiki/trunk/jspwiki-war/src/main/java/org/apache/wiki/Release.java
URL: http://svn.apache.org/viewvc/incubator/jspwiki/trunk/jspwiki-war/src/main/java/org/apache/wiki/Release.java?rev=1491906&r1=1491905&r2=1491906&view=diff
==============================================================================
--- incubator/jspwiki/trunk/jspwiki-war/src/main/java/org/apache/wiki/Release.java (original)
+++ incubator/jspwiki/trunk/jspwiki-war/src/main/java/org/apache/wiki/Release.java Tue Jun 11 19:00:07 2013
@@ -75,7 +75,7 @@ public final class Release
* <p>
* If the build identifier is empty, it is not added.
*/
- public static final String BUILD = "9";
+ public static final String BUILD = "10";
/**
* This is the generic version string you should use
Modified: incubator/jspwiki/trunk/jspwiki-war/src/test/config/hsql-userdb-setup.ddl
URL: http://svn.apache.org/viewvc/incubator/jspwiki/trunk/jspwiki-war/src/test/config/hsql-userdb-setup.ddl?rev=1491906&r1=1491905&r2=1491906&view=diff
==============================================================================
--- incubator/jspwiki/trunk/jspwiki-war/src/test/config/hsql-userdb-setup.ddl (original)
+++ incubator/jspwiki/trunk/jspwiki-war/src/test/config/hsql-userdb-setup.ddl Tue Jun 11 19:00:07 2013
@@ -16,7 +16,7 @@ drop table users if exists;
drop table roles if exists;
drop table groups if exists;
drop table group_members if exists;
-drop user jspwiki;
+--drop user "jspwiki";
create table users (
uid varchar(100),
@@ -53,12 +53,12 @@ create table group_members (
(name,member)
);
-create user jspwiki password "password";
+create user "jspwiki" password "password";
-grant select, insert, update, delete on users to jspwiki;
-grant select, insert, update, delete on roles to jspwiki;
-grant select, insert, update, delete on groups to jspwiki;
-grant select, insert, update, delete on group_members to jspwiki;
+grant select, insert, update, delete on users to "jspwiki";
+grant select, insert, update, delete on roles to "jspwiki";
+grant select, insert, update, delete on groups to "jspwiki";
+grant select, insert, update, delete on group_members to "jspwiki";
insert into users (
uid,
@@ -201,4 +201,3 @@ insert into group_members (
'Admin',
'Administrator'
);
-
Modified: incubator/jspwiki/trunk/jspwiki-war/src/test/config/hsql-userdb-teardown.ddl
URL: http://svn.apache.org/viewvc/incubator/jspwiki/trunk/jspwiki-war/src/test/config/hsql-userdb-teardown.ddl?rev=1491906&r1=1491905&r2=1491906&view=diff
==============================================================================
--- incubator/jspwiki/trunk/jspwiki-war/src/test/config/hsql-userdb-teardown.ddl (original)
+++ incubator/jspwiki/trunk/jspwiki-war/src/test/config/hsql-userdb-teardown.ddl Tue Jun 11 19:00:07 2013
@@ -16,4 +16,4 @@ drop table users if exists;
drop table roles if exists;
drop table groups if exists;
drop table group_members if exists;
-drop user jspwiki;
+drop user "jspwiki";
Modified: incubator/jspwiki/trunk/jspwiki-war/src/test/java/org/apache/wiki/HsqlDbUtils.java
URL: http://svn.apache.org/viewvc/incubator/jspwiki/trunk/jspwiki-war/src/test/java/org/apache/wiki/HsqlDbUtils.java?rev=1491906&r1=1491905&r2=1491906&view=diff
==============================================================================
--- incubator/jspwiki/trunk/jspwiki-war/src/test/java/org/apache/wiki/HsqlDbUtils.java (original)
+++ incubator/jspwiki/trunk/jspwiki-war/src/test/java/org/apache/wiki/HsqlDbUtils.java Tue Jun 11 19:00:07 2013
@@ -26,7 +26,7 @@ import java.util.Properties;
import org.apache.log4j.Logger;
import org.hsqldb.Server;
-import org.hsqldb.util.SqlFile;
+import org.hsqldb.cmdline.SqlFile;
/**
@@ -55,7 +55,6 @@ public class HsqlDbUtils
private static final Logger LOG = Logger.getLogger( HsqlDbUtils.class );
- Properties hProps = null;
Server hsqlServer = null;
/**
@@ -119,8 +118,9 @@ public class HsqlDbUtils
try
{
conn = getConnection();
- SqlFile userDbSetup = new SqlFile( new File( file ), false, null );
- userDbSetup.execute( conn, true );
+ SqlFile userDbSetup = new SqlFile( new File( file ) );
+ userDbSetup.setConnection(conn);
+ userDbSetup.execute();
}
catch( Exception e )
{
Modified: incubator/jspwiki/trunk/jspwiki-war/src/test/java/org/apache/wiki/auth/authorize/JDBCGroupDatabaseTest.java
URL: http://svn.apache.org/viewvc/incubator/jspwiki/trunk/jspwiki-war/src/test/java/org/apache/wiki/auth/authorize/JDBCGroupDatabaseTest.java?rev=1491906&r1=1491905&r2=1491906&view=diff
==============================================================================
--- incubator/jspwiki/trunk/jspwiki-war/src/test/java/org/apache/wiki/auth/authorize/JDBCGroupDatabaseTest.java (original)
+++ incubator/jspwiki/trunk/jspwiki-war/src/test/java/org/apache/wiki/auth/authorize/JDBCGroupDatabaseTest.java Tue Jun 11 19:00:07 2013
@@ -86,8 +86,7 @@ public class JDBCGroupDatabaseTest exten
catch( SQLException e )
{
System.err.println("Looks like your database could not be connected to - "+
- "please make sure that you have started your database "+
- "(e.g. by running ant hsql-start)");
+ "please make sure that you have started your database, exception: " + e);
throw (SQLException) e.fillInStackTrace();
}
Modified: incubator/jspwiki/trunk/jspwiki-war/src/test/java/org/apache/wiki/auth/user/JDBCUserDatabaseTest.java
URL: http://svn.apache.org/viewvc/incubator/jspwiki/trunk/jspwiki-war/src/test/java/org/apache/wiki/auth/user/JDBCUserDatabaseTest.java?rev=1491906&r1=1491905&r2=1491906&view=diff
==============================================================================
--- incubator/jspwiki/trunk/jspwiki-war/src/test/java/org/apache/wiki/auth/user/JDBCUserDatabaseTest.java (original)
+++ incubator/jspwiki/trunk/jspwiki-war/src/test/java/org/apache/wiki/auth/user/JDBCUserDatabaseTest.java Tue Jun 11 19:00:07 2013
@@ -126,8 +126,7 @@ public class JDBCUserDatabaseTest extend
catch( SQLException e )
{
System.err.println("Looks like your database could not be connected to - "+
- "please make sure that you have started your database "+
- "(e.g. by running ant hsql-start)");
+ "please make sure that you have started your database, exception: " + e);
throw (SQLException) e.fillInStackTrace();
}
Modified: incubator/jspwiki/trunk/jspwiki-war/src/test/java/org/apache/wiki/web/TestContainer.java
URL: http://svn.apache.org/viewvc/incubator/jspwiki/trunk/jspwiki-war/src/test/java/org/apache/wiki/web/TestContainer.java?rev=1491906&r1=1491905&r2=1491906&view=diff
==============================================================================
--- incubator/jspwiki/trunk/jspwiki-war/src/test/java/org/apache/wiki/web/TestContainer.java (original)
+++ incubator/jspwiki/trunk/jspwiki-war/src/test/java/org/apache/wiki/web/TestContainer.java Tue Jun 11 19:00:07 2013
@@ -48,7 +48,7 @@ import org.eclipse.jetty.server.bio.Sock
import org.eclipse.jetty.server.handler.*;
import org.eclipse.jetty.util.security.Password;
import org.eclipse.jetty.webapp.WebAppContext;
-import org.hsqldb.jdbc.jdbcDataSource;
+import org.hsqldb.jdbc.JDBCDataSource;
/**
@@ -115,7 +115,7 @@ public class TestContainer
m_hu.setUp();
// Create the connection pool
- jdbcDataSource cpds = new jdbcDataSource();
+ JDBCDataSource cpds = new JDBCDataSource();
cpds.setDatabase( "jdbc:hsqldb:hsql://localhost/jspwiki" );
cpds.setLoginTimeout( 10 );
cpds.setUser( "SA" );
Modified: incubator/jspwiki/trunk/jspwiki-war/src/test/resources/jdbc.properties
URL: http://svn.apache.org/viewvc/incubator/jspwiki/trunk/jspwiki-war/src/test/resources/jdbc.properties?rev=1491906&r1=1491905&r2=1491906&view=diff
==============================================================================
--- incubator/jspwiki/trunk/jspwiki-war/src/test/resources/jdbc.properties (original)
+++ incubator/jspwiki/trunk/jspwiki-war/src/test/resources/jdbc.properties Tue Jun 11 19:00:07 2013
@@ -26,7 +26,6 @@ jdbc.admin.id=SA
jdbc.admin.password=
jdbc.driver.class=org.hsqldb.jdbcDriver
jdbc.driver.id=hsql
-jdbc.driver.jar=hsqldb-1.8.0.10.jar
jdbc.driver.url=jdbc\:hsqldb\:hsql\://localhost/jspwiki
jdbc.user.id=jspwiki
jdbc.user.password=password
Modified: incubator/jspwiki/trunk/pom.xml
URL: http://svn.apache.org/viewvc/incubator/jspwiki/trunk/pom.xml?rev=1491906&r1=1491905&r2=1491906&view=diff
==============================================================================
--- incubator/jspwiki/trunk/pom.xml (original)
+++ incubator/jspwiki/trunk/pom.xml Tue Jun 11 19:00:07 2013
@@ -220,7 +220,14 @@
<dependency>
<groupId>org.hsqldb</groupId>
<artifactId>hsqldb</artifactId>
- <version>1.8.0.10</version>
+ <version>2.2.9</version>
+ <scope>test</scope>
+ </dependency>
+
+ <dependency>
+ <groupId>org.hsqldb</groupId>
+ <artifactId>sqltool</artifactId>
+ <version>2.2.9</version>
<scope>test</scope>
</dependency>
@@ -498,16 +505,6 @@
<format>html</format>
<format>xml</format>
</formats>
- <systemProperties>
- <property>
- <name>net.sourceforge.cobertura.datafile</name>
- <value>${maven.build.dir}/cobertura/cobertura.ser</value>
- </property>
- <property>
- <name>cobertura.use.java.nio</name>
- <value>false</value>
- </property>
- </systemProperties>
</configuration>
</plugin>