Return-Path: X-Original-To: apmail-jspwiki-commits-archive@www.apache.org Delivered-To: apmail-jspwiki-commits-archive@www.apache.org Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by minotaur.apache.org (Postfix) with SMTP id 19A0A10669 for ; Tue, 3 Dec 2013 22:24:18 +0000 (UTC) Received: (qmail 87134 invoked by uid 500); 3 Dec 2013 22:24:18 -0000 Delivered-To: apmail-jspwiki-commits-archive@jspwiki.apache.org Received: (qmail 87114 invoked by uid 500); 3 Dec 2013 22:24:18 -0000 Mailing-List: contact commits-help@jspwiki.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: dev@jspwiki.apache.org Delivered-To: mailing list commits@jspwiki.apache.org Received: (qmail 87107 invoked by uid 99); 3 Dec 2013 22:24:18 -0000 Received: from nike.apache.org (HELO nike.apache.org) (192.87.106.230) by apache.org (qpsmtpd/0.29) with ESMTP; Tue, 03 Dec 2013 22:24:18 +0000 X-ASF-Spam-Status: No, hits=-2000.0 required=5.0 tests=ALL_TRUSTED X-Spam-Check-By: apache.org Received: from [140.211.11.4] (HELO eris.apache.org) (140.211.11.4) by apache.org (qpsmtpd/0.29) with ESMTP; Tue, 03 Dec 2013 22:24:11 +0000 Received: from eris.apache.org (localhost [127.0.0.1]) by eris.apache.org (Postfix) with ESMTP id A969A23888FE; Tue, 3 Dec 2013 22:23:48 +0000 (UTC) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r1547613 - in /jspwiki/trunk/jspwiki-war/src: main/java/org/apache/wiki/ main/java/org/apache/wiki/api/exceptions/ main/java/org/apache/wiki/attachment/ main/java/org/apache/wiki/auth/ main/java/org/apache/wiki/auth/authorize/ main/java/org... Date: Tue, 03 Dec 2013 22:23:47 -0000 To: commits@jspwiki.apache.org From: juanpablo@apache.org X-Mailer: svnmailer-1.0.9 Message-Id: <20131203222348.A969A23888FE@eris.apache.org> X-Virus-Checked: Checked by ClamAV on apache.org Author: juanpablo Date: Tue Dec 3 22:23:46 2013 New Revision: 1547613 URL: http://svn.apache.org/r1547613 Log: * moved o.a.w.NoRequiredPropertyException to o.a.w.api.exceptions.NoRequiredPropertyException Added: jspwiki/trunk/jspwiki-war/src/main/java/org/apache/wiki/api/exceptions/NoRequiredPropertyException.java - copied, changed from r1546194, jspwiki/trunk/jspwiki-war/src/main/java/org/apache/wiki/NoRequiredPropertyException.java Removed: jspwiki/trunk/jspwiki-war/src/main/java/org/apache/wiki/NoRequiredPropertyException.java Modified: jspwiki/trunk/jspwiki-war/src/main/java/org/apache/wiki/attachment/AttachmentManager.java jspwiki/trunk/jspwiki-war/src/main/java/org/apache/wiki/auth/AuthorizationManager.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/GroupDatabase.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/authorize/XMLGroupDatabase.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/java/org/apache/wiki/auth/user/XMLUserDatabase.java jspwiki/trunk/jspwiki-war/src/main/java/org/apache/wiki/diff/ContextualDiffProvider.java jspwiki/trunk/jspwiki-war/src/main/java/org/apache/wiki/diff/DiffProvider.java jspwiki/trunk/jspwiki-war/src/main/java/org/apache/wiki/diff/DifferenceManager.java jspwiki/trunk/jspwiki-war/src/main/java/org/apache/wiki/diff/ExternalDiffProvider.java jspwiki/trunk/jspwiki-war/src/main/java/org/apache/wiki/diff/TraditionalDiffProvider.java jspwiki/trunk/jspwiki-war/src/main/java/org/apache/wiki/providers/AbstractFileProvider.java jspwiki/trunk/jspwiki-war/src/main/java/org/apache/wiki/providers/BasicAttachmentProvider.java jspwiki/trunk/jspwiki-war/src/main/java/org/apache/wiki/providers/CachingAttachmentProvider.java jspwiki/trunk/jspwiki-war/src/main/java/org/apache/wiki/providers/CachingProvider.java jspwiki/trunk/jspwiki-war/src/main/java/org/apache/wiki/providers/RCSFileProvider.java jspwiki/trunk/jspwiki-war/src/main/java/org/apache/wiki/providers/VersioningFileProvider.java jspwiki/trunk/jspwiki-war/src/main/java/org/apache/wiki/rss/RSSGenerator.java jspwiki/trunk/jspwiki-war/src/main/java/org/apache/wiki/search/BasicSearchProvider.java jspwiki/trunk/jspwiki-war/src/main/java/org/apache/wiki/search/LuceneSearchProvider.java jspwiki/trunk/jspwiki-war/src/main/java/org/apache/wiki/search/SearchManager.java jspwiki/trunk/jspwiki-war/src/main/java/org/apache/wiki/util/TextUtil.java jspwiki/trunk/jspwiki-war/src/test/java/org/apache/wiki/auth/login/AnonymousLoginModuleTest.java jspwiki/trunk/jspwiki-war/src/test/java/org/apache/wiki/auth/login/CookieAssertionLoginModuleTest.java jspwiki/trunk/jspwiki-war/src/test/java/org/apache/wiki/auth/login/UserDatabaseLoginModuleTest.java jspwiki/trunk/jspwiki-war/src/test/java/org/apache/wiki/auth/login/WebContainerLoginModuleTest.java jspwiki/trunk/jspwiki-war/src/test/java/org/apache/wiki/parser/JSPWikiMarkupParserTest.java jspwiki/trunk/jspwiki-war/src/test/java/org/apache/wiki/plugin/CounterPluginTest.java jspwiki/trunk/jspwiki-war/src/test/java/org/apache/wiki/util/TextUtilTest.java Copied: jspwiki/trunk/jspwiki-war/src/main/java/org/apache/wiki/api/exceptions/NoRequiredPropertyException.java (from r1546194, jspwiki/trunk/jspwiki-war/src/main/java/org/apache/wiki/NoRequiredPropertyException.java) URL: http://svn.apache.org/viewvc/jspwiki/trunk/jspwiki-war/src/main/java/org/apache/wiki/api/exceptions/NoRequiredPropertyException.java?p2=jspwiki/trunk/jspwiki-war/src/main/java/org/apache/wiki/api/exceptions/NoRequiredPropertyException.java&p1=jspwiki/trunk/jspwiki-war/src/main/java/org/apache/wiki/NoRequiredPropertyException.java&r1=1546194&r2=1547613&rev=1547613&view=diff ============================================================================== --- jspwiki/trunk/jspwiki-war/src/main/java/org/apache/wiki/NoRequiredPropertyException.java (original) +++ jspwiki/trunk/jspwiki-war/src/main/java/org/apache/wiki/api/exceptions/NoRequiredPropertyException.java Tue Dec 3 22:23:46 2013 @@ -16,20 +16,18 @@ specific language governing permissions and limitations under the License. */ -package org.apache.wiki; +package org.apache.wiki.api.exceptions; + -import org.apache.wiki.api.exceptions.WikiException; /** - * Marks an erroneus jspwiki.properties file. Certain properties - * have been marked as "required", and if you do not provide - * a good value for a property, you'll see this exception. + * Marks an erroneus jspwiki.properties file. Certain properties have been marked as "required", and if you + * do not provide a good value for a property, you'll see this exception. *

* Check jspwiki.properties for the required properties. */ -public class NoRequiredPropertyException - extends WikiException -{ +public class NoRequiredPropertyException extends WikiException { + private static final long serialVersionUID = 1L; /** @@ -38,8 +36,8 @@ public class NoRequiredPropertyException * @param msg Message to show * @param key The key of the property in question. */ - public NoRequiredPropertyException( String msg, String key ) - { - super(msg+": key="+key); + public NoRequiredPropertyException( String msg, String key ) { + super( msg + ": key=" + key ); } + } Modified: jspwiki/trunk/jspwiki-war/src/main/java/org/apache/wiki/attachment/AttachmentManager.java URL: http://svn.apache.org/viewvc/jspwiki/trunk/jspwiki-war/src/main/java/org/apache/wiki/attachment/AttachmentManager.java?rev=1547613&r1=1547612&r2=1547613&view=diff ============================================================================== --- jspwiki/trunk/jspwiki-war/src/main/java/org/apache/wiki/attachment/AttachmentManager.java (original) +++ jspwiki/trunk/jspwiki-war/src/main/java/org/apache/wiki/attachment/AttachmentManager.java Tue Dec 3 22:23:46 2013 @@ -27,9 +27,11 @@ import java.util.*; import net.sf.ehcache.Cache; import net.sf.ehcache.CacheManager; import net.sf.ehcache.Element; + import org.apache.commons.lang.StringUtils; import org.apache.log4j.Logger; import org.apache.wiki.*; +import org.apache.wiki.api.exceptions.NoRequiredPropertyException; import org.apache.wiki.api.exceptions.WikiException; import org.apache.wiki.parser.MarkupParser; import org.apache.wiki.providers.ProviderException; Modified: jspwiki/trunk/jspwiki-war/src/main/java/org/apache/wiki/auth/AuthorizationManager.java URL: http://svn.apache.org/viewvc/jspwiki/trunk/jspwiki-war/src/main/java/org/apache/wiki/auth/AuthorizationManager.java?rev=1547613&r1=1547612&r2=1547613&view=diff ============================================================================== --- jspwiki/trunk/jspwiki-war/src/main/java/org/apache/wiki/auth/AuthorizationManager.java (original) +++ jspwiki/trunk/jspwiki-war/src/main/java/org/apache/wiki/auth/AuthorizationManager.java Tue Dec 3 22:23:46 2013 @@ -34,6 +34,7 @@ import javax.servlet.http.HttpServletRes import org.apache.log4j.Logger; import org.apache.wiki.*; +import org.apache.wiki.api.exceptions.NoRequiredPropertyException; import org.apache.wiki.api.exceptions.WikiException; import org.apache.wiki.auth.acl.Acl; import org.apache.wiki.auth.acl.AclEntry; 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=1547613&r1=1547612&r2=1547613&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 Tue Dec 3 22:23:46 2013 @@ -28,11 +28,11 @@ import javax.mail.internet.AddressExcept import javax.servlet.http.HttpServletRequest; import org.apache.log4j.Logger; -import org.apache.wiki.NoRequiredPropertyException; import org.apache.wiki.WikiContext; import org.apache.wiki.WikiEngine; import org.apache.wiki.WikiSession; import org.apache.wiki.api.engine.FilterManager; +import org.apache.wiki.api.exceptions.NoRequiredPropertyException; import org.apache.wiki.api.exceptions.WikiException; import org.apache.wiki.api.filters.PageFilter; import org.apache.wiki.auth.permissions.AllPermission; Modified: jspwiki/trunk/jspwiki-war/src/main/java/org/apache/wiki/auth/authorize/GroupDatabase.java URL: http://svn.apache.org/viewvc/jspwiki/trunk/jspwiki-war/src/main/java/org/apache/wiki/auth/authorize/GroupDatabase.java?rev=1547613&r1=1547612&r2=1547613&view=diff ============================================================================== --- jspwiki/trunk/jspwiki-war/src/main/java/org/apache/wiki/auth/authorize/GroupDatabase.java (original) +++ jspwiki/trunk/jspwiki-war/src/main/java/org/apache/wiki/auth/authorize/GroupDatabase.java Tue Dec 3 22:23:46 2013 @@ -21,8 +21,8 @@ package org.apache.wiki.auth.authorize; import java.security.Principal; import java.util.Properties; -import org.apache.wiki.NoRequiredPropertyException; import org.apache.wiki.WikiEngine; +import org.apache.wiki.api.exceptions.NoRequiredPropertyException; import org.apache.wiki.auth.WikiSecurityException; /** 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=1547613&r1=1547612&r2=1547613&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 Tue Dec 3 22:23:46 2013 @@ -25,10 +25,10 @@ import javax.servlet.http.HttpServletReq import org.apache.commons.lang.ArrayUtils; import org.apache.log4j.Logger; -import org.apache.wiki.NoRequiredPropertyException; import org.apache.wiki.WikiContext; import org.apache.wiki.WikiEngine; import org.apache.wiki.WikiSession; +import org.apache.wiki.api.exceptions.NoRequiredPropertyException; import org.apache.wiki.api.exceptions.WikiException; import org.apache.wiki.auth.AuthenticationManager; import org.apache.wiki.auth.Authorizer; 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=1547613&r1=1547612&r2=1547613&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 Tue Dec 3 22:23:46 2013 @@ -29,9 +29,8 @@ import javax.naming.NamingException; import javax.sql.DataSource; import org.apache.log4j.Logger; - -import org.apache.wiki.NoRequiredPropertyException; import org.apache.wiki.WikiEngine; +import org.apache.wiki.api.exceptions.NoRequiredPropertyException; import org.apache.wiki.auth.NoSuchPrincipalException; import org.apache.wiki.auth.WikiPrincipal; import org.apache.wiki.auth.WikiSecurityException; Modified: jspwiki/trunk/jspwiki-war/src/main/java/org/apache/wiki/auth/authorize/XMLGroupDatabase.java URL: http://svn.apache.org/viewvc/jspwiki/trunk/jspwiki-war/src/main/java/org/apache/wiki/auth/authorize/XMLGroupDatabase.java?rev=1547613&r1=1547612&r2=1547613&view=diff ============================================================================== --- jspwiki/trunk/jspwiki-war/src/main/java/org/apache/wiki/auth/authorize/XMLGroupDatabase.java (original) +++ jspwiki/trunk/jspwiki-war/src/main/java/org/apache/wiki/auth/authorize/XMLGroupDatabase.java Tue Dec 3 22:23:46 2013 @@ -43,9 +43,8 @@ import org.w3c.dom.Document; import org.w3c.dom.Element; import org.w3c.dom.NodeList; import org.xml.sax.SAXException; - -import org.apache.wiki.NoRequiredPropertyException; import org.apache.wiki.WikiEngine; +import org.apache.wiki.api.exceptions.NoRequiredPropertyException; import org.apache.wiki.auth.NoSuchPrincipalException; import org.apache.wiki.auth.WikiPrincipal; import org.apache.wiki.auth.WikiSecurityException; 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=1547613&r1=1547612&r2=1547613&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 Tue Dec 3 22:23:46 2013 @@ -26,9 +26,8 @@ import java.util.*; import org.apache.catalina.util.HexUtils; import org.apache.log4j.Logger; - -import org.apache.wiki.NoRequiredPropertyException; import org.apache.wiki.WikiEngine; +import org.apache.wiki.api.exceptions.NoRequiredPropertyException; import org.apache.wiki.auth.NoSuchPrincipalException; import org.apache.wiki.auth.WikiPrincipal; import org.apache.wiki.auth.WikiSecurityException; 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=1547613&r1=1547612&r2=1547613&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 Tue Dec 3 22:23:46 2013 @@ -29,8 +29,8 @@ import javax.naming.InitialContext; import javax.naming.NamingException; import javax.sql.DataSource; -import org.apache.wiki.NoRequiredPropertyException; import org.apache.wiki.WikiEngine; +import org.apache.wiki.api.exceptions.NoRequiredPropertyException; import org.apache.wiki.auth.NoSuchPrincipalException; import org.apache.wiki.auth.WikiPrincipal; import org.apache.wiki.auth.WikiSecurityException; 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=1547613&r1=1547612&r2=1547613&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 Tue Dec 3 22:23:46 2013 @@ -21,8 +21,8 @@ package org.apache.wiki.auth.user; import java.security.Principal; import java.util.Properties; -import org.apache.wiki.NoRequiredPropertyException; import org.apache.wiki.WikiEngine; +import org.apache.wiki.api.exceptions.NoRequiredPropertyException; import org.apache.wiki.auth.NoSuchPrincipalException; import org.apache.wiki.auth.WikiSecurityException; Modified: jspwiki/trunk/jspwiki-war/src/main/java/org/apache/wiki/auth/user/XMLUserDatabase.java URL: http://svn.apache.org/viewvc/jspwiki/trunk/jspwiki-war/src/main/java/org/apache/wiki/auth/user/XMLUserDatabase.java?rev=1547613&r1=1547612&r2=1547613&view=diff ============================================================================== --- jspwiki/trunk/jspwiki-war/src/main/java/org/apache/wiki/auth/user/XMLUserDatabase.java (original) +++ jspwiki/trunk/jspwiki-war/src/main/java/org/apache/wiki/auth/user/XMLUserDatabase.java Tue Dec 3 22:23:46 2013 @@ -30,9 +30,8 @@ import javax.xml.parsers.ParserConfigura import org.w3c.dom.*; import org.xml.sax.SAXException; - -import org.apache.wiki.NoRequiredPropertyException; import org.apache.wiki.WikiEngine; +import org.apache.wiki.api.exceptions.NoRequiredPropertyException; import org.apache.wiki.auth.NoSuchPrincipalException; import org.apache.wiki.auth.WikiPrincipal; import org.apache.wiki.auth.WikiSecurityException; Modified: jspwiki/trunk/jspwiki-war/src/main/java/org/apache/wiki/diff/ContextualDiffProvider.java URL: http://svn.apache.org/viewvc/jspwiki/trunk/jspwiki-war/src/main/java/org/apache/wiki/diff/ContextualDiffProvider.java?rev=1547613&r1=1547612&r2=1547613&view=diff ============================================================================== --- jspwiki/trunk/jspwiki-war/src/main/java/org/apache/wiki/diff/ContextualDiffProvider.java (original) +++ jspwiki/trunk/jspwiki-war/src/main/java/org/apache/wiki/diff/ContextualDiffProvider.java Tue Dec 3 22:23:46 2013 @@ -26,9 +26,9 @@ import java.util.Properties; import java.util.StringTokenizer; import org.apache.log4j.Logger; -import org.apache.wiki.NoRequiredPropertyException; import org.apache.wiki.WikiContext; import org.apache.wiki.WikiEngine; +import org.apache.wiki.api.exceptions.NoRequiredPropertyException; import org.apache.wiki.util.TextUtil; import org.suigeneris.jrcs.diff.Diff; import org.suigeneris.jrcs.diff.DifferentiationFailedException; Modified: jspwiki/trunk/jspwiki-war/src/main/java/org/apache/wiki/diff/DiffProvider.java URL: http://svn.apache.org/viewvc/jspwiki/trunk/jspwiki-war/src/main/java/org/apache/wiki/diff/DiffProvider.java?rev=1547613&r1=1547612&r2=1547613&view=diff ============================================================================== --- jspwiki/trunk/jspwiki-war/src/main/java/org/apache/wiki/diff/DiffProvider.java (original) +++ jspwiki/trunk/jspwiki-war/src/main/java/org/apache/wiki/diff/DiffProvider.java Tue Dec 3 22:23:46 2013 @@ -21,10 +21,10 @@ package org.apache.wiki.diff; import java.io.IOException; import java.util.Properties; -import org.apache.wiki.NoRequiredPropertyException; import org.apache.wiki.WikiContext; import org.apache.wiki.WikiEngine; import org.apache.wiki.WikiProvider; +import org.apache.wiki.api.exceptions.NoRequiredPropertyException; /** * Provides an SPI for creating a diff between two page versions. Modified: jspwiki/trunk/jspwiki-war/src/main/java/org/apache/wiki/diff/DifferenceManager.java URL: http://svn.apache.org/viewvc/jspwiki/trunk/jspwiki-war/src/main/java/org/apache/wiki/diff/DifferenceManager.java?rev=1547613&r1=1547612&r2=1547613&view=diff ============================================================================== --- jspwiki/trunk/jspwiki-war/src/main/java/org/apache/wiki/diff/DifferenceManager.java (original) +++ jspwiki/trunk/jspwiki-war/src/main/java/org/apache/wiki/diff/DifferenceManager.java Tue Dec 3 22:23:46 2013 @@ -23,10 +23,9 @@ import java.io.IOException; import java.util.Properties; import org.apache.log4j.Logger; - -import org.apache.wiki.NoRequiredPropertyException; import org.apache.wiki.WikiContext; import org.apache.wiki.WikiEngine; +import org.apache.wiki.api.exceptions.NoRequiredPropertyException; import org.apache.wiki.util.ClassUtil; Modified: jspwiki/trunk/jspwiki-war/src/main/java/org/apache/wiki/diff/ExternalDiffProvider.java URL: http://svn.apache.org/viewvc/jspwiki/trunk/jspwiki-war/src/main/java/org/apache/wiki/diff/ExternalDiffProvider.java?rev=1547613&r1=1547612&r2=1547613&view=diff ============================================================================== --- jspwiki/trunk/jspwiki-war/src/main/java/org/apache/wiki/diff/ExternalDiffProvider.java (original) +++ jspwiki/trunk/jspwiki-war/src/main/java/org/apache/wiki/diff/ExternalDiffProvider.java Tue Dec 3 22:23:46 2013 @@ -26,9 +26,9 @@ import java.io.StringReader; import java.util.Properties; import org.apache.log4j.Logger; -import org.apache.wiki.NoRequiredPropertyException; import org.apache.wiki.WikiContext; import org.apache.wiki.WikiEngine; +import org.apache.wiki.api.exceptions.NoRequiredPropertyException; import org.apache.wiki.util.FileUtil; import org.apache.wiki.util.TextUtil; Modified: jspwiki/trunk/jspwiki-war/src/main/java/org/apache/wiki/diff/TraditionalDiffProvider.java URL: http://svn.apache.org/viewvc/jspwiki/trunk/jspwiki-war/src/main/java/org/apache/wiki/diff/TraditionalDiffProvider.java?rev=1547613&r1=1547612&r2=1547613&view=diff ============================================================================== --- jspwiki/trunk/jspwiki-war/src/main/java/org/apache/wiki/diff/TraditionalDiffProvider.java (original) +++ jspwiki/trunk/jspwiki-war/src/main/java/org/apache/wiki/diff/TraditionalDiffProvider.java Tue Dec 3 22:23:46 2013 @@ -28,9 +28,9 @@ import java.util.Properties; import java.util.ResourceBundle; import org.apache.log4j.Logger; -import org.apache.wiki.NoRequiredPropertyException; import org.apache.wiki.WikiContext; import org.apache.wiki.WikiEngine; +import org.apache.wiki.api.exceptions.NoRequiredPropertyException; import org.apache.wiki.i18n.InternationalizationManager; import org.apache.wiki.preferences.Preferences; import org.apache.wiki.util.TextUtil; Modified: jspwiki/trunk/jspwiki-war/src/main/java/org/apache/wiki/providers/AbstractFileProvider.java URL: http://svn.apache.org/viewvc/jspwiki/trunk/jspwiki-war/src/main/java/org/apache/wiki/providers/AbstractFileProvider.java?rev=1547613&r1=1547612&r2=1547613&view=diff ============================================================================== --- jspwiki/trunk/jspwiki-war/src/main/java/org/apache/wiki/providers/AbstractFileProvider.java (original) +++ jspwiki/trunk/jspwiki-war/src/main/java/org/apache/wiki/providers/AbstractFileProvider.java Tue Dec 3 22:23:46 2013 @@ -23,6 +23,7 @@ import java.util.*; import org.apache.log4j.Logger; import org.apache.wiki.*; +import org.apache.wiki.api.exceptions.NoRequiredPropertyException; import org.apache.wiki.util.FileUtil; import org.apache.wiki.util.TextUtil; Modified: jspwiki/trunk/jspwiki-war/src/main/java/org/apache/wiki/providers/BasicAttachmentProvider.java URL: http://svn.apache.org/viewvc/jspwiki/trunk/jspwiki-war/src/main/java/org/apache/wiki/providers/BasicAttachmentProvider.java?rev=1547613&r1=1547612&r2=1547613&view=diff ============================================================================== --- jspwiki/trunk/jspwiki-war/src/main/java/org/apache/wiki/providers/BasicAttachmentProvider.java (original) +++ jspwiki/trunk/jspwiki-war/src/main/java/org/apache/wiki/providers/BasicAttachmentProvider.java Tue Dec 3 22:23:46 2013 @@ -25,6 +25,7 @@ import java.util.regex.Pattern; import org.apache.log4j.Logger; import org.apache.wiki.*; +import org.apache.wiki.api.exceptions.NoRequiredPropertyException; import org.apache.wiki.attachment.Attachment; import org.apache.wiki.util.FileUtil; import org.apache.wiki.util.TextUtil; Modified: jspwiki/trunk/jspwiki-war/src/main/java/org/apache/wiki/providers/CachingAttachmentProvider.java URL: http://svn.apache.org/viewvc/jspwiki/trunk/jspwiki-war/src/main/java/org/apache/wiki/providers/CachingAttachmentProvider.java?rev=1547613&r1=1547612&r2=1547613&view=diff ============================================================================== --- jspwiki/trunk/jspwiki-war/src/main/java/org/apache/wiki/providers/CachingAttachmentProvider.java (original) +++ jspwiki/trunk/jspwiki-war/src/main/java/org/apache/wiki/providers/CachingAttachmentProvider.java Tue Dec 3 22:23:46 2013 @@ -25,8 +25,10 @@ import java.util.*; import net.sf.ehcache.Cache; import net.sf.ehcache.CacheManager; import net.sf.ehcache.Element; + import org.apache.log4j.Logger; import org.apache.wiki.*; +import org.apache.wiki.api.exceptions.NoRequiredPropertyException; import org.apache.wiki.attachment.Attachment; import org.apache.wiki.attachment.AttachmentManager; import org.apache.wiki.util.ClassUtil; Modified: jspwiki/trunk/jspwiki-war/src/main/java/org/apache/wiki/providers/CachingProvider.java URL: http://svn.apache.org/viewvc/jspwiki/trunk/jspwiki-war/src/main/java/org/apache/wiki/providers/CachingProvider.java?rev=1547613&r1=1547612&r2=1547613&view=diff ============================================================================== --- jspwiki/trunk/jspwiki-war/src/main/java/org/apache/wiki/providers/CachingProvider.java (original) +++ jspwiki/trunk/jspwiki-war/src/main/java/org/apache/wiki/providers/CachingProvider.java Tue Dec 3 22:23:46 2013 @@ -24,8 +24,10 @@ import java.util.*; import net.sf.ehcache.Cache; import net.sf.ehcache.Element; import net.sf.ehcache.CacheManager; + import org.apache.log4j.Logger; import org.apache.wiki.*; +import org.apache.wiki.api.exceptions.NoRequiredPropertyException; import org.apache.wiki.parser.MarkupParser; import org.apache.wiki.render.RenderingManager; import org.apache.wiki.util.ClassUtil; Modified: jspwiki/trunk/jspwiki-war/src/main/java/org/apache/wiki/providers/RCSFileProvider.java URL: http://svn.apache.org/viewvc/jspwiki/trunk/jspwiki-war/src/main/java/org/apache/wiki/providers/RCSFileProvider.java?rev=1547613&r1=1547612&r2=1547613&view=diff ============================================================================== --- jspwiki/trunk/jspwiki-war/src/main/java/org/apache/wiki/providers/RCSFileProvider.java (original) +++ jspwiki/trunk/jspwiki-war/src/main/java/org/apache/wiki/providers/RCSFileProvider.java Tue Dec 3 22:23:46 2013 @@ -26,6 +26,7 @@ import java.util.*; import org.apache.log4j.Logger; import org.apache.oro.text.regex.*; import org.apache.wiki.*; +import org.apache.wiki.api.exceptions.NoRequiredPropertyException; import org.apache.wiki.util.FileUtil; import org.apache.wiki.util.TextUtil; Modified: jspwiki/trunk/jspwiki-war/src/main/java/org/apache/wiki/providers/VersioningFileProvider.java URL: http://svn.apache.org/viewvc/jspwiki/trunk/jspwiki-war/src/main/java/org/apache/wiki/providers/VersioningFileProvider.java?rev=1547613&r1=1547612&r2=1547613&view=diff ============================================================================== --- jspwiki/trunk/jspwiki-war/src/main/java/org/apache/wiki/providers/VersioningFileProvider.java (original) +++ jspwiki/trunk/jspwiki-war/src/main/java/org/apache/wiki/providers/VersioningFileProvider.java Tue Dec 3 22:23:46 2013 @@ -23,6 +23,7 @@ import java.util.*; import org.apache.log4j.Logger; import org.apache.wiki.*; +import org.apache.wiki.api.exceptions.NoRequiredPropertyException; import org.apache.wiki.util.FileUtil; /** Modified: jspwiki/trunk/jspwiki-war/src/main/java/org/apache/wiki/rss/RSSGenerator.java URL: http://svn.apache.org/viewvc/jspwiki/trunk/jspwiki-war/src/main/java/org/apache/wiki/rss/RSSGenerator.java?rev=1547613&r1=1547612&r2=1547613&view=diff ============================================================================== --- jspwiki/trunk/jspwiki-war/src/main/java/org/apache/wiki/rss/RSSGenerator.java (original) +++ jspwiki/trunk/jspwiki-war/src/main/java/org/apache/wiki/rss/RSSGenerator.java Tue Dec 3 22:23:46 2013 @@ -22,6 +22,7 @@ import java.util.*; import org.apache.log4j.Logger; import org.apache.wiki.*; +import org.apache.wiki.api.exceptions.NoRequiredPropertyException; import org.apache.wiki.attachment.Attachment; import org.apache.wiki.auth.permissions.PagePermission; import org.apache.wiki.providers.ProviderException; Modified: jspwiki/trunk/jspwiki-war/src/main/java/org/apache/wiki/search/BasicSearchProvider.java URL: http://svn.apache.org/viewvc/jspwiki/trunk/jspwiki-war/src/main/java/org/apache/wiki/search/BasicSearchProvider.java?rev=1547613&r1=1547612&r2=1547613&view=diff ============================================================================== --- jspwiki/trunk/jspwiki-war/src/main/java/org/apache/wiki/search/BasicSearchProvider.java (original) +++ jspwiki/trunk/jspwiki-war/src/main/java/org/apache/wiki/search/BasicSearchProvider.java Tue Dec 3 22:23:46 2013 @@ -26,14 +26,13 @@ import java.util.StringTokenizer; import java.util.TreeSet; import org.apache.log4j.Logger; - -import org.apache.wiki.NoRequiredPropertyException; import org.apache.wiki.QueryItem; import org.apache.wiki.SearchMatcher; import org.apache.wiki.SearchResult; import org.apache.wiki.SearchResultComparator; import org.apache.wiki.WikiEngine; import org.apache.wiki.WikiPage; +import org.apache.wiki.api.exceptions.NoRequiredPropertyException; import org.apache.wiki.attachment.Attachment; import org.apache.wiki.providers.ProviderException; import org.apache.wiki.providers.WikiPageProvider; Modified: jspwiki/trunk/jspwiki-war/src/main/java/org/apache/wiki/search/LuceneSearchProvider.java URL: http://svn.apache.org/viewvc/jspwiki/trunk/jspwiki-war/src/main/java/org/apache/wiki/search/LuceneSearchProvider.java?rev=1547613&r1=1547612&r2=1547613&view=diff ============================================================================== --- jspwiki/trunk/jspwiki-war/src/main/java/org/apache/wiki/search/LuceneSearchProvider.java (original) +++ jspwiki/trunk/jspwiki-war/src/main/java/org/apache/wiki/search/LuceneSearchProvider.java Tue Dec 3 22:23:46 2013 @@ -64,11 +64,11 @@ import org.apache.lucene.store.LockObtai import org.apache.lucene.store.SimpleFSDirectory; import org.apache.lucene.util.Version; import org.apache.wiki.InternalWikiException; -import org.apache.wiki.NoRequiredPropertyException; import org.apache.wiki.SearchResult; import org.apache.wiki.WikiEngine; import org.apache.wiki.WikiPage; import org.apache.wiki.WikiProvider; +import org.apache.wiki.api.exceptions.NoRequiredPropertyException; import org.apache.wiki.attachment.Attachment; import org.apache.wiki.attachment.AttachmentManager; import org.apache.wiki.parser.MarkupParser; Modified: jspwiki/trunk/jspwiki-war/src/main/java/org/apache/wiki/search/SearchManager.java URL: http://svn.apache.org/viewvc/jspwiki/trunk/jspwiki-war/src/main/java/org/apache/wiki/search/SearchManager.java?rev=1547613&r1=1547612&r2=1547613&view=diff ============================================================================== --- jspwiki/trunk/jspwiki-war/src/main/java/org/apache/wiki/search/SearchManager.java (original) +++ jspwiki/trunk/jspwiki-war/src/main/java/org/apache/wiki/search/SearchManager.java Tue Dec 3 22:23:46 2013 @@ -25,6 +25,7 @@ import org.apache.commons.lang.time.Stop import org.apache.log4j.Logger; import org.apache.wiki.*; import org.apache.wiki.api.exceptions.FilterException; +import org.apache.wiki.api.exceptions.NoRequiredPropertyException; import org.apache.wiki.api.filters.BasicPageFilter; import org.apache.wiki.event.WikiEvent; import org.apache.wiki.event.WikiEventListener; Modified: jspwiki/trunk/jspwiki-war/src/main/java/org/apache/wiki/util/TextUtil.java URL: http://svn.apache.org/viewvc/jspwiki/trunk/jspwiki-war/src/main/java/org/apache/wiki/util/TextUtil.java?rev=1547613&r1=1547612&r2=1547613&view=diff ============================================================================== --- jspwiki/trunk/jspwiki-war/src/main/java/org/apache/wiki/util/TextUtil.java (original) +++ jspwiki/trunk/jspwiki-war/src/main/java/org/apache/wiki/util/TextUtil.java Tue Dec 3 22:23:46 2013 @@ -24,7 +24,7 @@ import java.util.Properties; import java.util.Random; import org.apache.wiki.InternalWikiException; -import org.apache.wiki.NoRequiredPropertyException; +import org.apache.wiki.api.exceptions.NoRequiredPropertyException; /** Modified: jspwiki/trunk/jspwiki-war/src/test/java/org/apache/wiki/auth/login/AnonymousLoginModuleTest.java URL: http://svn.apache.org/viewvc/jspwiki/trunk/jspwiki-war/src/test/java/org/apache/wiki/auth/login/AnonymousLoginModuleTest.java?rev=1547613&r1=1547612&r2=1547613&view=diff ============================================================================== --- jspwiki/trunk/jspwiki-war/src/test/java/org/apache/wiki/auth/login/AnonymousLoginModuleTest.java (original) +++ jspwiki/trunk/jspwiki-war/src/test/java/org/apache/wiki/auth/login/AnonymousLoginModuleTest.java Tue Dec 3 22:23:46 2013 @@ -30,8 +30,8 @@ import javax.servlet.http.HttpServletReq import junit.framework.TestCase; -import org.apache.wiki.NoRequiredPropertyException; import org.apache.wiki.TestEngine; +import org.apache.wiki.api.exceptions.NoRequiredPropertyException; import org.apache.wiki.auth.WikiPrincipal; import org.apache.wiki.auth.authorize.Role; import org.apache.wiki.auth.user.UserDatabase; Modified: jspwiki/trunk/jspwiki-war/src/test/java/org/apache/wiki/auth/login/CookieAssertionLoginModuleTest.java URL: http://svn.apache.org/viewvc/jspwiki/trunk/jspwiki-war/src/test/java/org/apache/wiki/auth/login/CookieAssertionLoginModuleTest.java?rev=1547613&r1=1547612&r2=1547613&view=diff ============================================================================== --- jspwiki/trunk/jspwiki-war/src/test/java/org/apache/wiki/auth/login/CookieAssertionLoginModuleTest.java (original) +++ jspwiki/trunk/jspwiki-war/src/test/java/org/apache/wiki/auth/login/CookieAssertionLoginModuleTest.java Tue Dec 3 22:23:46 2013 @@ -31,8 +31,8 @@ import javax.servlet.http.Cookie; import junit.framework.TestCase; import net.sourceforge.stripes.mock.MockHttpServletRequest; -import org.apache.wiki.NoRequiredPropertyException; import org.apache.wiki.TestEngine; +import org.apache.wiki.api.exceptions.NoRequiredPropertyException; import org.apache.wiki.auth.WikiPrincipal; import org.apache.wiki.auth.authorize.Role; import org.apache.wiki.auth.user.UserDatabase; Modified: jspwiki/trunk/jspwiki-war/src/test/java/org/apache/wiki/auth/login/UserDatabaseLoginModuleTest.java URL: http://svn.apache.org/viewvc/jspwiki/trunk/jspwiki-war/src/test/java/org/apache/wiki/auth/login/UserDatabaseLoginModuleTest.java?rev=1547613&r1=1547612&r2=1547613&view=diff ============================================================================== --- jspwiki/trunk/jspwiki-war/src/test/java/org/apache/wiki/auth/login/UserDatabaseLoginModuleTest.java (original) +++ jspwiki/trunk/jspwiki-war/src/test/java/org/apache/wiki/auth/login/UserDatabaseLoginModuleTest.java Tue Dec 3 22:23:46 2013 @@ -29,9 +29,9 @@ import javax.security.auth.spi.LoginModu import junit.framework.TestCase; -import org.apache.wiki.NoRequiredPropertyException; import org.apache.wiki.TestEngine; import org.apache.wiki.WikiEngine; +import org.apache.wiki.api.exceptions.NoRequiredPropertyException; import org.apache.wiki.auth.WikiPrincipal; import org.apache.wiki.auth.authorize.Role; import org.apache.wiki.auth.user.UserDatabase; Modified: jspwiki/trunk/jspwiki-war/src/test/java/org/apache/wiki/auth/login/WebContainerLoginModuleTest.java URL: http://svn.apache.org/viewvc/jspwiki/trunk/jspwiki-war/src/test/java/org/apache/wiki/auth/login/WebContainerLoginModuleTest.java?rev=1547613&r1=1547612&r2=1547613&view=diff ============================================================================== --- jspwiki/trunk/jspwiki-war/src/test/java/org/apache/wiki/auth/login/WebContainerLoginModuleTest.java (original) +++ jspwiki/trunk/jspwiki-war/src/test/java/org/apache/wiki/auth/login/WebContainerLoginModuleTest.java Tue Dec 3 22:23:46 2013 @@ -31,8 +31,8 @@ import javax.security.auth.spi.LoginModu import junit.framework.TestCase; import net.sourceforge.stripes.mock.MockHttpServletRequest; -import org.apache.wiki.NoRequiredPropertyException; import org.apache.wiki.TestEngine; +import org.apache.wiki.api.exceptions.NoRequiredPropertyException; import org.apache.wiki.auth.WikiPrincipal; import org.apache.wiki.auth.authorize.Role; import org.apache.wiki.auth.user.UserDatabase; Modified: jspwiki/trunk/jspwiki-war/src/test/java/org/apache/wiki/parser/JSPWikiMarkupParserTest.java URL: http://svn.apache.org/viewvc/jspwiki/trunk/jspwiki-war/src/test/java/org/apache/wiki/parser/JSPWikiMarkupParserTest.java?rev=1547613&r1=1547612&r2=1547613&view=diff ============================================================================== --- jspwiki/trunk/jspwiki-war/src/test/java/org/apache/wiki/parser/JSPWikiMarkupParserTest.java (original) +++ jspwiki/trunk/jspwiki-war/src/test/java/org/apache/wiki/parser/JSPWikiMarkupParserTest.java Tue Dec 3 22:23:46 2013 @@ -35,11 +35,11 @@ import junit.framework.TestSuite; import net.sf.ehcache.CacheManager; import org.apache.wiki.LinkCollector; -import org.apache.wiki.NoRequiredPropertyException; import org.apache.wiki.TestEngine; import org.apache.wiki.WikiContext; import org.apache.wiki.WikiEngine; import org.apache.wiki.WikiPage; +import org.apache.wiki.api.exceptions.NoRequiredPropertyException; import org.apache.wiki.api.exceptions.WikiException; import org.apache.wiki.attachment.Attachment; import org.apache.wiki.providers.BasicAttachmentProvider; Modified: jspwiki/trunk/jspwiki-war/src/test/java/org/apache/wiki/plugin/CounterPluginTest.java URL: http://svn.apache.org/viewvc/jspwiki/trunk/jspwiki-war/src/test/java/org/apache/wiki/plugin/CounterPluginTest.java?rev=1547613&r1=1547612&r2=1547613&view=diff ============================================================================== --- jspwiki/trunk/jspwiki-war/src/test/java/org/apache/wiki/plugin/CounterPluginTest.java (original) +++ jspwiki/trunk/jspwiki-war/src/test/java/org/apache/wiki/plugin/CounterPluginTest.java Tue Dec 3 22:23:46 2013 @@ -29,10 +29,10 @@ import junit.framework.Test; import junit.framework.TestCase; import junit.framework.TestSuite; -import org.apache.wiki.NoRequiredPropertyException; import org.apache.wiki.TestEngine; import org.apache.wiki.WikiContext; import org.apache.wiki.WikiPage; +import org.apache.wiki.api.exceptions.NoRequiredPropertyException; import org.apache.wiki.parser.JSPWikiMarkupParser; import org.apache.wiki.parser.MarkupParser; import org.apache.wiki.parser.WikiDocument; Modified: jspwiki/trunk/jspwiki-war/src/test/java/org/apache/wiki/util/TextUtilTest.java URL: http://svn.apache.org/viewvc/jspwiki/trunk/jspwiki-war/src/test/java/org/apache/wiki/util/TextUtilTest.java?rev=1547613&r1=1547612&r2=1547613&view=diff ============================================================================== --- jspwiki/trunk/jspwiki-war/src/test/java/org/apache/wiki/util/TextUtilTest.java (original) +++ jspwiki/trunk/jspwiki-war/src/test/java/org/apache/wiki/util/TextUtilTest.java Tue Dec 3 22:23:46 2013 @@ -21,7 +21,7 @@ package org.apache.wiki.util; import java.io.File; import java.util.Properties; -import org.apache.wiki.NoRequiredPropertyException; +import org.apache.wiki.api.exceptions.NoRequiredPropertyException; import junit.framework.Test; import junit.framework.TestCase;