You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@jspwiki.apache.org by gm...@apache.org on 2013/08/18 03:46:09 UTC
svn commit: r1515057 - in /jspwiki/trunk: ./
jspwiki-site/src/site/trunk/content/jspwiki/development/
jspwiki-site/src/site/trunk/templates/
jspwiki-war/src/main/java/org/apache/wiki/
jspwiki-war/src/main/java/org/apache/wiki/auth/ jspwiki-war/src/main...
Author: gmazza
Date: Sun Aug 18 01:46:09 2013
New Revision: 1515057
URL: http://svn.apache.org/r1515057
Log:
Update from org.hsqldb.jdbcDriver to org.hsqldb.jdbc.JDBCDriver
Modified:
jspwiki/trunk/ChangeLog
jspwiki/trunk/jspwiki-site/src/site/trunk/content/jspwiki/development/changelog.mdtext
jspwiki/trunk/jspwiki-site/src/site/trunk/templates/release.mdtext
jspwiki/trunk/jspwiki-war/src/main/java/org/apache/wiki/Release.java
jspwiki/trunk/jspwiki-war/src/main/java/org/apache/wiki/auth/UserManager.java
jspwiki/trunk/jspwiki-war/src/main/java/org/apache/wiki/auth/authorize/GroupManager.java
jspwiki/trunk/jspwiki-war/src/main/java/org/apache/wiki/auth/authorize/JDBCGroupDatabase.java
jspwiki/trunk/jspwiki-war/src/main/java/org/apache/wiki/auth/user/AbstractUserDatabase.java
jspwiki/trunk/jspwiki-war/src/main/java/org/apache/wiki/auth/user/JDBCUserDatabase.java
jspwiki/trunk/jspwiki-war/src/main/java/org/apache/wiki/auth/user/UserDatabase.java
jspwiki/trunk/jspwiki-war/src/main/resources/ini/jspwiki.properties
jspwiki/trunk/jspwiki-war/src/test/java/org/apache/wiki/HsqlDbUtils.java
jspwiki/trunk/jspwiki-war/src/test/resources/jspwiki-custom.properties
Modified: jspwiki/trunk/ChangeLog
URL: http://svn.apache.org/viewvc/jspwiki/trunk/ChangeLog?rev=1515057&r1=1515056&r2=1515057&view=diff
==============================================================================
--- jspwiki/trunk/ChangeLog (original)
+++ jspwiki/trunk/ChangeLog Sun Aug 18 01:46:09 2013
@@ -1,3 +1,18 @@
+2013-08-17 Glen Mazza (gmazza AT apache DOT org)
+
+ * 2.10.0-svn-42
+
+ * Updated code from using org.hsqldb.jdbcDriver to org.hsqldb.jdbc.JDBCDriver
+
+ * Switched from inaccurate NoRequiredPropertyException to somewhat better WikiSecurityException
+ for database errors in JDBCGroup/UserDatabase (former was giving confusing error messages
+ when the underlying problem was just DB-related).
+
+ * More work in IT tests, for JDBC tests to become operative again (not yet finished).
+
+ * Renamed HsqlDbUtils to HsqlDBUtilsIT in it-tests, to fully ensure HsqlDBUtils in jspwiki-war
+ isn't being run instead.
+
2013-08-15 Glen Mazza (gmazza AT apache DOT org)
* 2.10.0-svn-41
Modified: jspwiki/trunk/jspwiki-site/src/site/trunk/content/jspwiki/development/changelog.mdtext
URL: http://svn.apache.org/viewvc/jspwiki/trunk/jspwiki-site/src/site/trunk/content/jspwiki/development/changelog.mdtext?rev=1515057&r1=1515056&r2=1515057&view=diff
==============================================================================
--- jspwiki/trunk/jspwiki-site/src/site/trunk/content/jspwiki/development/changelog.mdtext (original)
+++ jspwiki/trunk/jspwiki-site/src/site/trunk/content/jspwiki/development/changelog.mdtext Sun Aug 18 01:46:09 2013
@@ -2,6 +2,14 @@ Title: Changelog
#### 2013-08-15 Glen Mazza (gmazza AT apache DOT org)
+* 2.10.0-svn-41
+
+* Removed "incubator" from JSPWiki taglib URI, removed deprecated in 2004 RSSLinkTag
+
+* Some simplifications to web.xml put in, taking advantage of 2.5 web.xml format.
+
+#### 2013-08-15 Glen Mazza (gmazza AT apache DOT org)
+
* 2.10.0-svn-40
* Removed unneeded config files in Selenium IT module, changed its packaging to WAR
Modified: jspwiki/trunk/jspwiki-site/src/site/trunk/templates/release.mdtext
URL: http://svn.apache.org/viewvc/jspwiki/trunk/jspwiki-site/src/site/trunk/templates/release.mdtext?rev=1515057&r1=1515056&r2=1515057&view=diff
==============================================================================
--- jspwiki/trunk/jspwiki-site/src/site/trunk/templates/release.mdtext (original)
+++ jspwiki/trunk/jspwiki-site/src/site/trunk/templates/release.mdtext Sun Aug 18 01:46:09 2013
@@ -1 +1 @@
-JSPWiki v2.10.0-svn-40
\ No newline at end of file
+JSPWiki v2.10.0-svn-41
\ No newline at end of file
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=1515057&r1=1515056&r2=1515057&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 Sun Aug 18 01:46:09 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 = "41";
+ public static final String BUILD = "42";
/**
* This is the generic version string you should use
Modified: jspwiki/trunk/jspwiki-war/src/main/java/org/apache/wiki/auth/UserManager.java
URL: http://svn.apache.org/viewvc/jspwiki/trunk/jspwiki-war/src/main/java/org/apache/wiki/auth/UserManager.java?rev=1515057&r1=1515056&r2=1515057&view=diff
==============================================================================
--- jspwiki/trunk/jspwiki-war/src/main/java/org/apache/wiki/auth/UserManager.java (original)
+++ jspwiki/trunk/jspwiki-war/src/main/java/org/apache/wiki/auth/UserManager.java Sun Aug 18 01:46:09 2013
@@ -171,6 +171,10 @@ public final class UserManager
{
log.error( "You are not allowed to access this user database class", e );
}
+ catch( WikiSecurityException e )
+ {
+ log.error( "Exception initializing user database: " + e.getMessage() );
+ }
finally
{
if( m_database == null )
@@ -669,6 +673,7 @@ public final class UserManager
/**
* No-op.
+ *
* @param engine the wiki engine
* @param props the properties used to initialize the wiki engine
* @throws NoRequiredPropertyException never...
@@ -720,7 +725,7 @@ public final class UserManager
* Constructs a new Task for saving a user profile.
* @param engine the wiki engine
* @deprecated will be removed in 2.10 scope. Consider using
- * {@link UserManager.SaveUserProfileTask#UserManager.SaveUserProfileTask(WikiEngine, Locale)} instead
+ * {@link UserManager.SaveUserProfileTask(WikiEngine, Locale)} instead
*/
@Deprecated
public SaveUserProfileTask( WikiEngine engine )
Modified: jspwiki/trunk/jspwiki-war/src/main/java/org/apache/wiki/auth/authorize/GroupManager.java
URL: http://svn.apache.org/viewvc/jspwiki/trunk/jspwiki-war/src/main/java/org/apache/wiki/auth/authorize/GroupManager.java?rev=1515057&r1=1515056&r2=1515057&view=diff
==============================================================================
--- jspwiki/trunk/jspwiki-war/src/main/java/org/apache/wiki/auth/authorize/GroupManager.java (original)
+++ jspwiki/trunk/jspwiki-war/src/main/java/org/apache/wiki/auth/authorize/GroupManager.java Sun Aug 18 01:46:09 2013
@@ -30,7 +30,12 @@ import org.apache.wiki.WikiContext;
import org.apache.wiki.WikiEngine;
import org.apache.wiki.WikiSession;
import org.apache.wiki.api.exceptions.WikiException;
-import org.apache.wiki.auth.*;
+import org.apache.wiki.auth.AuthenticationManager;
+import org.apache.wiki.auth.Authorizer;
+import org.apache.wiki.auth.GroupPrincipal;
+import org.apache.wiki.auth.NoSuchPrincipalException;
+import org.apache.wiki.auth.WikiPrincipal;
+import org.apache.wiki.auth.WikiSecurityException;
import org.apache.wiki.auth.user.UserProfile;
import org.apache.wiki.event.WikiEvent;
import org.apache.wiki.event.WikiEventListener;
Modified: jspwiki/trunk/jspwiki-war/src/main/java/org/apache/wiki/auth/authorize/JDBCGroupDatabase.java
URL: http://svn.apache.org/viewvc/jspwiki/trunk/jspwiki-war/src/main/java/org/apache/wiki/auth/authorize/JDBCGroupDatabase.java?rev=1515057&r1=1515056&r2=1515057&view=diff
==============================================================================
--- jspwiki/trunk/jspwiki-war/src/main/java/org/apache/wiki/auth/authorize/JDBCGroupDatabase.java (original)
+++ jspwiki/trunk/jspwiki-war/src/main/java/org/apache/wiki/auth/authorize/JDBCGroupDatabase.java Sun Aug 18 01:46:09 2013
@@ -534,8 +534,8 @@ public class JDBCGroupDatabase implement
}
catch( SQLException e )
{
- log.error( "JDBCGroupDatabase initialization error: " + e );
- throw new NoRequiredPropertyException( PROP_GROUPDB_DATASOURCE, "JDBCGroupDatabase initialization error: " + e );
+ log.error( "DB connectivity error: " + e.getMessage() );
+ throw new WikiSecurityException("DB connectivity error: " + e.getMessage(), e );
}
finally
{
@@ -564,7 +564,6 @@ public class JDBCGroupDatabase implement
catch( SQLException e )
{
log.warn( "JDBCGroupDatabase warning: user database doesn't seem to support transactions. Reason: " + e);
- throw new NoRequiredPropertyException( PROP_GROUPDB_DATASOURCE, "JDBCGroupDatabase initialization error: " + e);
}
finally
{
Modified: jspwiki/trunk/jspwiki-war/src/main/java/org/apache/wiki/auth/user/AbstractUserDatabase.java
URL: http://svn.apache.org/viewvc/jspwiki/trunk/jspwiki-war/src/main/java/org/apache/wiki/auth/user/AbstractUserDatabase.java?rev=1515057&r1=1515056&r2=1515057&view=diff
==============================================================================
--- jspwiki/trunk/jspwiki-war/src/main/java/org/apache/wiki/auth/user/AbstractUserDatabase.java (original)
+++ jspwiki/trunk/jspwiki-war/src/main/java/org/apache/wiki/auth/user/AbstractUserDatabase.java Sun Aug 18 01:46:09 2013
@@ -183,7 +183,8 @@ public abstract class AbstractUserDataba
* {@inheritDoc}
* @see org.apache.wiki.auth.user.UserDatabase#initialize(org.apache.wiki.WikiEngine, java.util.Properties)
*/
- public abstract void initialize( WikiEngine engine, Properties props ) throws NoRequiredPropertyException;
+ public abstract void initialize( WikiEngine engine, Properties props ) throws NoRequiredPropertyException,
+ WikiSecurityException;
/**
* Factory method that instantiates a new DefaultUserProfile with a new, distinct
Modified: jspwiki/trunk/jspwiki-war/src/main/java/org/apache/wiki/auth/user/JDBCUserDatabase.java
URL: http://svn.apache.org/viewvc/jspwiki/trunk/jspwiki-war/src/main/java/org/apache/wiki/auth/user/JDBCUserDatabase.java?rev=1515057&r1=1515056&r2=1515057&view=diff
==============================================================================
--- jspwiki/trunk/jspwiki-war/src/main/java/org/apache/wiki/auth/user/JDBCUserDatabase.java (original)
+++ jspwiki/trunk/jspwiki-war/src/main/java/org/apache/wiki/auth/user/JDBCUserDatabase.java Sun Aug 18 01:46:09 2013
@@ -450,7 +450,7 @@ public class JDBCUserDatabase extends Ab
* @see org.apache.wiki.auth.user.UserDatabase#initialize(org.apache.wiki.WikiEngine,
* java.util.Properties)
*/
- public void initialize( WikiEngine engine, Properties props ) throws NoRequiredPropertyException
+ public void initialize( WikiEngine engine, Properties props ) throws NoRequiredPropertyException, WikiSecurityException
{
String userTable;
String role;
@@ -542,8 +542,8 @@ public class JDBCUserDatabase extends Ab
}
catch( SQLException e )
{
- log.error( "JDBCUserDatabase initialization error: " + e.getMessage() );
- throw new NoRequiredPropertyException( PROP_DB_DATASOURCE, "JDBCUserDatabase initialization error: " + e.getMessage() );
+ log.error( "DB connectivity error: " + e.getMessage() );
+ throw new WikiSecurityException("DB connectivity error: " + e.getMessage(), e );
}
finally
{
@@ -572,7 +572,6 @@ public class JDBCUserDatabase extends Ab
catch( SQLException e )
{
log.warn( "JDBCUserDatabase warning: user database doesn't seem to support transactions. Reason: " + e.getMessage() );
- throw new NoRequiredPropertyException( PROP_DB_DATASOURCE, "JDBCUserDatabase initialization error: " + e.getMessage() );
}
finally
{
Modified: jspwiki/trunk/jspwiki-war/src/main/java/org/apache/wiki/auth/user/UserDatabase.java
URL: http://svn.apache.org/viewvc/jspwiki/trunk/jspwiki-war/src/main/java/org/apache/wiki/auth/user/UserDatabase.java?rev=1515057&r1=1515056&r2=1515057&view=diff
==============================================================================
--- jspwiki/trunk/jspwiki-war/src/main/java/org/apache/wiki/auth/user/UserDatabase.java (original)
+++ jspwiki/trunk/jspwiki-war/src/main/java/org/apache/wiki/auth/user/UserDatabase.java Sun Aug 18 01:46:09 2013
@@ -155,7 +155,7 @@ public interface UserDatabase
/**
* Initializes the user database based on values from a Properties object.
*/
- void initialize( WikiEngine engine, Properties props ) throws NoRequiredPropertyException;
+ void initialize( WikiEngine engine, Properties props ) throws NoRequiredPropertyException, WikiSecurityException;
/**
* Factory method that instantiates a new user profile.
Modified: jspwiki/trunk/jspwiki-war/src/main/resources/ini/jspwiki.properties
URL: http://svn.apache.org/viewvc/jspwiki/trunk/jspwiki-war/src/main/resources/ini/jspwiki.properties?rev=1515057&r1=1515056&r2=1515057&view=diff
==============================================================================
--- jspwiki/trunk/jspwiki-war/src/main/resources/ini/jspwiki.properties (original)
+++ jspwiki/trunk/jspwiki-war/src/main/resources/ini/jspwiki.properties Sun Aug 18 01:46:09 2013
@@ -741,7 +741,7 @@ jspwiki.rss.channelLanguage = en-us
#jdbc.admin.id=SA
#jdbc.admin.password=
-#jdbc.driver.class=org.hsqldb.jdbcDriver
+#jdbc.driver.class=org.hsqldb.jdbc.JDBCDriver
#jdbc.driver.id=hsql
#jdbc.driver.jar=MyDatabasesJDBCDriver.jar
#jdbc.driver.url=jdbc\:hsqldb\:hsql\://localhost/jspwiki
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=1515057&r1=1515056&r2=1515057&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 Sun Aug 18 01:46:09 2013
@@ -103,7 +103,7 @@ public class HsqlDbUtils
hsqlServer.setDatabasePath( 0, hProps.getProperty( "server.database.0" ) );
hsqlServer.start();
- Class.forName( "org.hsqldb.jdbcDriver" );
+ Class.forName( "org.hsqldb.jdbc.JDBCDriver" );
hsqlServer.checkRunning( true ); // throws RuntimeException if not running
}
Modified: jspwiki/trunk/jspwiki-war/src/test/resources/jspwiki-custom.properties
URL: http://svn.apache.org/viewvc/jspwiki/trunk/jspwiki-war/src/test/resources/jspwiki-custom.properties?rev=1515057&r1=1515056&r2=1515057&view=diff
==============================================================================
--- jspwiki/trunk/jspwiki-war/src/test/resources/jspwiki-custom.properties (original)
+++ jspwiki/trunk/jspwiki-war/src/test/resources/jspwiki-custom.properties Sun Aug 18 01:46:09 2013
@@ -74,7 +74,7 @@ server.dbname.0=jspwiki
jdbc.admin.id=SA
jdbc.admin.password=
-jdbc.driver.class=org.hsqldb.jdbcDriver
+jdbc.driver.class=org.hsqldb.jdbc.JDBCDriver
jdbc.driver.id=hsql
jdbc.driver.url=jdbc\:hsqldb\:hsql\://localhost/jspwiki
jdbc.user.id=jspwiki