You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@jspwiki.apache.org by ju...@apache.org on 2013/08/01 13:37:54 UTC
svn commit: r1509174 - in /jspwiki/trunk: ./
jspwiki-war/src/main/java/org/apache/wiki/
jspwiki-war/src/main/java/org/apache/wiki/api/exceptions/
jspwiki-war/src/test/java/org/apache/wiki/filters/
Author: juanpablo
Date: Thu Aug 1 11:37:54 2013
New Revision: 1509174
URL: http://svn.apache.org/r1509174
Log:
* 2.10.0-svn-26
* Removed org.apache.wiki.WikiException in favour of org.apache.wiki.api.exceptions.WikiException
Removed:
jspwiki/trunk/jspwiki-war/src/main/java/org/apache/wiki/WikiException.java
Modified:
jspwiki/trunk/ChangeLog
jspwiki/trunk/jspwiki-war/src/main/java/org/apache/wiki/Release.java
jspwiki/trunk/jspwiki-war/src/main/java/org/apache/wiki/api/exceptions/WikiException.java
jspwiki/trunk/jspwiki-war/src/test/java/org/apache/wiki/filters/DefaultFilterManagerTest.java
Modified: jspwiki/trunk/ChangeLog
URL: http://svn.apache.org/viewvc/jspwiki/trunk/ChangeLog?rev=1509174&r1=1509173&r2=1509174&view=diff
==============================================================================
--- jspwiki/trunk/ChangeLog (original)
+++ jspwiki/trunk/ChangeLog Thu Aug 1 11:37:54 2013
@@ -1,3 +1,9 @@
+2013-08-01 Juan Pablo Santos (juanpablo AT apache DOT org)
+
+ * 2.10.0-svn-26
+
+ * Removed org.apache.wiki.WikiException in favour of org.apache.wiki.api.exceptions.WikiException
+
2013-07-31 Glen Mazza (gmazza AT apache DOT org)
* 2.10.0-svn-25
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=1509174&r1=1509173&r2=1509174&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 Thu Aug 1 11:37:54 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 = "25";
+ public static final String BUILD = "26";
/**
* This is the generic version string you should use
Modified: jspwiki/trunk/jspwiki-war/src/main/java/org/apache/wiki/api/exceptions/WikiException.java
URL: http://svn.apache.org/viewvc/jspwiki/trunk/jspwiki-war/src/main/java/org/apache/wiki/api/exceptions/WikiException.java?rev=1509174&r1=1509173&r2=1509174&view=diff
==============================================================================
--- jspwiki/trunk/jspwiki-war/src/main/java/org/apache/wiki/api/exceptions/WikiException.java (original)
+++ jspwiki/trunk/jspwiki-war/src/main/java/org/apache/wiki/api/exceptions/WikiException.java Thu Aug 1 11:37:54 2013
@@ -18,23 +18,22 @@
*/
package org.apache.wiki.api.exceptions;
+
/**
* A generic Wiki exception.
*
* @since 2.0
*/
-public class WikiException
- extends org.apache.wiki.WikiException
-{
- private static final long serialVersionUID = 3257290231723210803L;
+public class WikiException extends Exception {
+
+ private static final long serialVersionUID = 3257290231723210803L;
/**
* Constructs an exception.
*
* @param msg the message in the exception.
*/
- public WikiException( String msg )
- {
+ public WikiException( String msg ) {
super( msg );
}
@@ -44,8 +43,8 @@ public class WikiException
* @param msg the message in the exception.
* @param cause the cause of the exception
*/
- public WikiException( String msg, Throwable cause )
- {
+ public WikiException( String msg, Throwable cause ) {
super( msg, cause );
}
+
}
Modified: jspwiki/trunk/jspwiki-war/src/test/java/org/apache/wiki/filters/DefaultFilterManagerTest.java
URL: http://svn.apache.org/viewvc/jspwiki/trunk/jspwiki-war/src/test/java/org/apache/wiki/filters/DefaultFilterManagerTest.java?rev=1509174&r1=1509173&r2=1509174&view=diff
==============================================================================
--- jspwiki/trunk/jspwiki-war/src/test/java/org/apache/wiki/filters/DefaultFilterManagerTest.java (original)
+++ jspwiki/trunk/jspwiki-war/src/test/java/org/apache/wiki/filters/DefaultFilterManagerTest.java Thu Aug 1 11:37:54 2013
@@ -29,36 +29,25 @@ import junit.framework.TestSuite;
import org.apache.log4j.PropertyConfigurator;
import org.apache.wiki.TestEngine;
-import org.apache.wiki.WikiException;
import org.apache.wiki.api.engine.FilterManager;
import org.apache.wiki.api.filters.PageFilter;
-public class DefaultFilterManagerTest extends TestCase
-{
+public class DefaultFilterManagerTest extends TestCase {
Properties props = new Properties();
TestEngine engine;
- public DefaultFilterManagerTest( String s )
- {
+ public DefaultFilterManagerTest( String s ) {
super( s );
}
- public void setUp()
- throws Exception
- {
+ public void setUp() throws Exception {
props.load( TestEngine.findTestProperties() );
PropertyConfigurator.configure(props);
engine = new TestEngine(props);
}
- public void tearDown()
- {
- }
-
- public void testInitFilters()
- throws Exception
- {
+ public void testInitFilters() throws Exception {
FilterManager m = new DefaultFilterManager( engine, props );
List l = m.getFilterList();
@@ -75,9 +64,7 @@ public class DefaultFilterManagerTest ex
assertTrue("Not a Testfilter", f2 instanceof TestFilter);
}
- public void testInitParams()
- throws Exception
- {
+ public void testInitParams() throws Exception {
FilterManager m = new DefaultFilterManager( engine, props );
List l = m.getFilterList();
@@ -93,8 +80,7 @@ public class DefaultFilterManagerTest ex
assertEquals("no blatblaa", "5", p.getProperty( "blatblaa" ) );
}
- public static Test suite()
- {
+ public static Test suite() {
return new TestSuite( DefaultFilterManagerTest.class );
}