You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@jspwiki.apache.org by aj...@apache.org on 2008/11/30 19:29:55 UTC
svn commit: r721869 [1/2] - in
/incubator/jspwiki/branches/JSPWIKI_2_9_STRIPES_BRANCH/src:
com/ecyrd/jspwiki/ com/ecyrd/jspwiki/attachment/ com/ecyrd/jspwiki/auth/
com/ecyrd/jspwiki/auth/acl/ com/ecyrd/jspwiki/auth/authorize/
com/ecyrd/jspwiki/auth/log...
Author: ajaquith
Date: Sun Nov 30 10:29:52 2008
New Revision: 721869
URL: http://svn.apache.org/viewvc?rev=721869&view=rev
Log:
Partial merge with trunk...
Added:
incubator/jspwiki/branches/JSPWIKI_2_9_STRIPES_BRANCH/src/webdocs/templates/default/images/favclose.gif (props changed)
- copied unchanged from r721865, incubator/jspwiki/trunk/src/webdocs/templates/default/images/favclose.gif
incubator/jspwiki/branches/JSPWIKI_2_9_STRIPES_BRANCH/src/webdocs/templates/default/images/favopen.gif (props changed)
- copied unchanged from r721865, incubator/jspwiki/trunk/src/webdocs/templates/default/images/favopen.gif
incubator/jspwiki/branches/JSPWIKI_2_9_STRIPES_BRANCH/src/webdocs/templates/default/images/slimbox.gif (props changed)
- copied unchanged from r721865, incubator/jspwiki/trunk/src/webdocs/templates/default/images/slimbox.gif
Modified:
incubator/jspwiki/branches/JSPWIKI_2_9_STRIPES_BRANCH/src/com/ecyrd/jspwiki/PageTimeComparator.java
incubator/jspwiki/branches/JSPWIKI_2_9_STRIPES_BRANCH/src/com/ecyrd/jspwiki/ReferenceManager.java
incubator/jspwiki/branches/JSPWIKI_2_9_STRIPES_BRANCH/src/com/ecyrd/jspwiki/Release.java
incubator/jspwiki/branches/JSPWIKI_2_9_STRIPES_BRANCH/src/com/ecyrd/jspwiki/VariableManager.java
incubator/jspwiki/branches/JSPWIKI_2_9_STRIPES_BRANCH/src/com/ecyrd/jspwiki/WikiContext.java
incubator/jspwiki/branches/JSPWIKI_2_9_STRIPES_BRANCH/src/com/ecyrd/jspwiki/attachment/AttachmentManager.java
incubator/jspwiki/branches/JSPWIKI_2_9_STRIPES_BRANCH/src/com/ecyrd/jspwiki/attachment/AttachmentServlet.java
incubator/jspwiki/branches/JSPWIKI_2_9_STRIPES_BRANCH/src/com/ecyrd/jspwiki/auth/AuthenticationManager.java
incubator/jspwiki/branches/JSPWIKI_2_9_STRIPES_BRANCH/src/com/ecyrd/jspwiki/auth/AuthorizationManager.java
incubator/jspwiki/branches/JSPWIKI_2_9_STRIPES_BRANCH/src/com/ecyrd/jspwiki/auth/SecurityVerifier.java
incubator/jspwiki/branches/JSPWIKI_2_9_STRIPES_BRANCH/src/com/ecyrd/jspwiki/auth/SessionMonitor.java
incubator/jspwiki/branches/JSPWIKI_2_9_STRIPES_BRANCH/src/com/ecyrd/jspwiki/auth/UserManager.java
incubator/jspwiki/branches/JSPWIKI_2_9_STRIPES_BRANCH/src/com/ecyrd/jspwiki/auth/acl/Acl.java
incubator/jspwiki/branches/JSPWIKI_2_9_STRIPES_BRANCH/src/com/ecyrd/jspwiki/auth/acl/AclEntry.java
incubator/jspwiki/branches/JSPWIKI_2_9_STRIPES_BRANCH/src/com/ecyrd/jspwiki/auth/acl/AclEntryImpl.java
incubator/jspwiki/branches/JSPWIKI_2_9_STRIPES_BRANCH/src/com/ecyrd/jspwiki/auth/acl/AclImpl.java
incubator/jspwiki/branches/JSPWIKI_2_9_STRIPES_BRANCH/src/com/ecyrd/jspwiki/auth/acl/DefaultAclManager.java
incubator/jspwiki/branches/JSPWIKI_2_9_STRIPES_BRANCH/src/com/ecyrd/jspwiki/auth/authorize/GroupManager.java
incubator/jspwiki/branches/JSPWIKI_2_9_STRIPES_BRANCH/src/com/ecyrd/jspwiki/auth/authorize/JDBCGroupDatabase.java
incubator/jspwiki/branches/JSPWIKI_2_9_STRIPES_BRANCH/src/com/ecyrd/jspwiki/auth/authorize/WebContainerAuthorizer.java
incubator/jspwiki/branches/JSPWIKI_2_9_STRIPES_BRANCH/src/com/ecyrd/jspwiki/auth/authorize/XMLGroupDatabase.java
incubator/jspwiki/branches/JSPWIKI_2_9_STRIPES_BRANCH/src/com/ecyrd/jspwiki/auth/login/AbstractLoginModule.java
incubator/jspwiki/branches/JSPWIKI_2_9_STRIPES_BRANCH/src/com/ecyrd/jspwiki/auth/login/AnonymousLoginModule.java
incubator/jspwiki/branches/JSPWIKI_2_9_STRIPES_BRANCH/src/com/ecyrd/jspwiki/auth/login/CookieAssertionLoginModule.java
incubator/jspwiki/branches/JSPWIKI_2_9_STRIPES_BRANCH/src/com/ecyrd/jspwiki/auth/login/CookieAuthenticationLoginModule.java
incubator/jspwiki/branches/JSPWIKI_2_9_STRIPES_BRANCH/src/com/ecyrd/jspwiki/auth/login/UserDatabaseLoginModule.java
incubator/jspwiki/branches/JSPWIKI_2_9_STRIPES_BRANCH/src/com/ecyrd/jspwiki/auth/login/WebContainerLoginModule.java
incubator/jspwiki/branches/JSPWIKI_2_9_STRIPES_BRANCH/src/com/ecyrd/jspwiki/auth/user/AbstractUserDatabase.java
incubator/jspwiki/branches/JSPWIKI_2_9_STRIPES_BRANCH/src/com/ecyrd/jspwiki/auth/user/XMLUserDatabase.java
incubator/jspwiki/branches/JSPWIKI_2_9_STRIPES_BRANCH/src/com/ecyrd/jspwiki/content/PageRenamer.java
incubator/jspwiki/branches/JSPWIKI_2_9_STRIPES_BRANCH/src/com/ecyrd/jspwiki/dav/RawPagesDavProvider.java
incubator/jspwiki/branches/JSPWIKI_2_9_STRIPES_BRANCH/src/com/ecyrd/jspwiki/dav/WikiDavServlet.java
incubator/jspwiki/branches/JSPWIKI_2_9_STRIPES_BRANCH/src/com/ecyrd/jspwiki/dav/methods/PropFindMethod.java
incubator/jspwiki/branches/JSPWIKI_2_9_STRIPES_BRANCH/src/com/ecyrd/jspwiki/diff/ContextualDiffProvider.java
incubator/jspwiki/branches/JSPWIKI_2_9_STRIPES_BRANCH/src/com/ecyrd/jspwiki/diff/DifferenceManager.java
incubator/jspwiki/branches/JSPWIKI_2_9_STRIPES_BRANCH/src/com/ecyrd/jspwiki/diff/ExternalDiffProvider.java
incubator/jspwiki/branches/JSPWIKI_2_9_STRIPES_BRANCH/src/com/ecyrd/jspwiki/diff/TraditionalDiffProvider.java
incubator/jspwiki/branches/JSPWIKI_2_9_STRIPES_BRANCH/src/com/ecyrd/jspwiki/filters/FilterManager.java
incubator/jspwiki/branches/JSPWIKI_2_9_STRIPES_BRANCH/src/com/ecyrd/jspwiki/filters/PingWeblogsComFilter.java
incubator/jspwiki/branches/JSPWIKI_2_9_STRIPES_BRANCH/src/com/ecyrd/jspwiki/filters/ProfanityFilter.java
incubator/jspwiki/branches/JSPWIKI_2_9_STRIPES_BRANCH/src/com/ecyrd/jspwiki/filters/SpamFilter.java
incubator/jspwiki/branches/JSPWIKI_2_9_STRIPES_BRANCH/src/com/ecyrd/jspwiki/modules/ModuleManager.java
incubator/jspwiki/branches/JSPWIKI_2_9_STRIPES_BRANCH/src/com/ecyrd/jspwiki/plugin/AbstractReferralPlugin.java
incubator/jspwiki/branches/JSPWIKI_2_9_STRIPES_BRANCH/src/com/ecyrd/jspwiki/plugin/BugReportHandler.java
incubator/jspwiki/branches/JSPWIKI_2_9_STRIPES_BRANCH/src/com/ecyrd/jspwiki/plugin/Counter.java
incubator/jspwiki/branches/JSPWIKI_2_9_STRIPES_BRANCH/src/com/ecyrd/jspwiki/plugin/CurrentTimePlugin.java
incubator/jspwiki/branches/JSPWIKI_2_9_STRIPES_BRANCH/src/com/ecyrd/jspwiki/plugin/Denounce.java
incubator/jspwiki/branches/JSPWIKI_2_9_STRIPES_BRANCH/src/com/ecyrd/jspwiki/plugin/IndexPlugin.java
incubator/jspwiki/branches/JSPWIKI_2_9_STRIPES_BRANCH/src/com/ecyrd/jspwiki/plugin/PluginManager.java
incubator/jspwiki/branches/JSPWIKI_2_9_STRIPES_BRANCH/src/com/ecyrd/jspwiki/plugin/RecentChangesPlugin.java
incubator/jspwiki/branches/JSPWIKI_2_9_STRIPES_BRANCH/src/com/ecyrd/jspwiki/plugin/ReferredPagesPlugin.java
incubator/jspwiki/branches/JSPWIKI_2_9_STRIPES_BRANCH/src/com/ecyrd/jspwiki/plugin/ReferringPagesPlugin.java
incubator/jspwiki/branches/JSPWIKI_2_9_STRIPES_BRANCH/src/com/ecyrd/jspwiki/plugin/Search.java
incubator/jspwiki/branches/JSPWIKI_2_9_STRIPES_BRANCH/src/com/ecyrd/jspwiki/plugin/TableOfContents.java
incubator/jspwiki/branches/JSPWIKI_2_9_STRIPES_BRANCH/src/com/ecyrd/jspwiki/plugin/WeblogArchivePlugin.java
incubator/jspwiki/branches/JSPWIKI_2_9_STRIPES_BRANCH/src/com/ecyrd/jspwiki/plugin/WeblogEntryPlugin.java
incubator/jspwiki/branches/JSPWIKI_2_9_STRIPES_BRANCH/src/com/ecyrd/jspwiki/plugin/WeblogPlugin.java
incubator/jspwiki/branches/JSPWIKI_2_9_STRIPES_BRANCH/src/com/ecyrd/jspwiki/rpc/atom/AtomAPIServlet.java
incubator/jspwiki/branches/JSPWIKI_2_9_STRIPES_BRANCH/src/com/ecyrd/jspwiki/rpc/json/JSONRPCManager.java
incubator/jspwiki/branches/JSPWIKI_2_9_STRIPES_BRANCH/src/com/ecyrd/jspwiki/search/BasicSearchProvider.java
incubator/jspwiki/branches/JSPWIKI_2_9_STRIPES_BRANCH/src/com/ecyrd/jspwiki/search/LuceneSearchProvider.java
incubator/jspwiki/branches/JSPWIKI_2_9_STRIPES_BRANCH/src/com/ecyrd/jspwiki/search/SearchManager.java
incubator/jspwiki/branches/JSPWIKI_2_9_STRIPES_BRANCH/src/com/ecyrd/jspwiki/tags/AttachmentsIteratorTag.java
incubator/jspwiki/branches/JSPWIKI_2_9_STRIPES_BRANCH/src/com/ecyrd/jspwiki/tags/BreadcrumbsTag.java
incubator/jspwiki/branches/JSPWIKI_2_9_STRIPES_BRANCH/src/com/ecyrd/jspwiki/tags/CookieTag.java
incubator/jspwiki/branches/JSPWIKI_2_9_STRIPES_BRANCH/src/com/ecyrd/jspwiki/tags/EditorIteratorTag.java
incubator/jspwiki/branches/JSPWIKI_2_9_STRIPES_BRANCH/src/com/ecyrd/jspwiki/tags/HasAttachmentsTag.java
incubator/jspwiki/branches/JSPWIKI_2_9_STRIPES_BRANCH/src/com/ecyrd/jspwiki/tags/HistoryIteratorTag.java
incubator/jspwiki/branches/JSPWIKI_2_9_STRIPES_BRANCH/src/com/ecyrd/jspwiki/tags/IteratorTag.java
incubator/jspwiki/branches/JSPWIKI_2_9_STRIPES_BRANCH/src/com/ecyrd/jspwiki/tags/SearchResultIteratorTag.java
incubator/jspwiki/branches/JSPWIKI_2_9_STRIPES_BRANCH/src/com/ecyrd/jspwiki/tags/TranslateTag.java
incubator/jspwiki/branches/JSPWIKI_2_9_STRIPES_BRANCH/src/com/ecyrd/jspwiki/tags/WikiBodyTag.java
incubator/jspwiki/branches/JSPWIKI_2_9_STRIPES_BRANCH/src/com/ecyrd/jspwiki/tags/WikiTagBase.java
incubator/jspwiki/branches/JSPWIKI_2_9_STRIPES_BRANCH/src/com/ecyrd/jspwiki/url/ShortURLConstructor.java
incubator/jspwiki/branches/JSPWIKI_2_9_STRIPES_BRANCH/src/com/ecyrd/jspwiki/xmlrpc/MetaWeblogHandler.java
incubator/jspwiki/branches/JSPWIKI_2_9_STRIPES_BRANCH/src/com/ecyrd/jspwiki/xmlrpc/RPCHandler.java
incubator/jspwiki/branches/JSPWIKI_2_9_STRIPES_BRANCH/src/com/ecyrd/jspwiki/xmlrpc/RPCServlet.java
incubator/jspwiki/branches/JSPWIKI_2_9_STRIPES_BRANCH/src/webdocs/Captcha.jsp
incubator/jspwiki/branches/JSPWIKI_2_9_STRIPES_BRANCH/src/webdocs/Comment.jsp
incubator/jspwiki/branches/JSPWIKI_2_9_STRIPES_BRANCH/src/webdocs/Delete.jsp
incubator/jspwiki/branches/JSPWIKI_2_9_STRIPES_BRANCH/src/webdocs/DeleteGroup.jsp
incubator/jspwiki/branches/JSPWIKI_2_9_STRIPES_BRANCH/src/webdocs/Diff.jsp
incubator/jspwiki/branches/JSPWIKI_2_9_STRIPES_BRANCH/src/webdocs/Edit.jsp
incubator/jspwiki/branches/JSPWIKI_2_9_STRIPES_BRANCH/src/webdocs/EditGroup.jsp
incubator/jspwiki/branches/JSPWIKI_2_9_STRIPES_BRANCH/src/webdocs/Error.jsp
incubator/jspwiki/branches/JSPWIKI_2_9_STRIPES_BRANCH/src/webdocs/Group.jsp
incubator/jspwiki/branches/JSPWIKI_2_9_STRIPES_BRANCH/src/webdocs/Install.jsp
incubator/jspwiki/branches/JSPWIKI_2_9_STRIPES_BRANCH/src/webdocs/LoginForm.jsp
incubator/jspwiki/branches/JSPWIKI_2_9_STRIPES_BRANCH/src/webdocs/LostPassword.jsp
incubator/jspwiki/branches/JSPWIKI_2_9_STRIPES_BRANCH/src/webdocs/Message.jsp
incubator/jspwiki/branches/JSPWIKI_2_9_STRIPES_BRANCH/src/webdocs/NewBlogEntry.jsp
incubator/jspwiki/branches/JSPWIKI_2_9_STRIPES_BRANCH/src/webdocs/NewGroup.jsp
incubator/jspwiki/branches/JSPWIKI_2_9_STRIPES_BRANCH/src/webdocs/PageInfo.jsp
incubator/jspwiki/branches/JSPWIKI_2_9_STRIPES_BRANCH/src/webdocs/PageModified.jsp
incubator/jspwiki/branches/JSPWIKI_2_9_STRIPES_BRANCH/src/webdocs/Preview.jsp
incubator/jspwiki/branches/JSPWIKI_2_9_STRIPES_BRANCH/src/webdocs/Rename.jsp
incubator/jspwiki/branches/JSPWIKI_2_9_STRIPES_BRANCH/src/webdocs/Search.jsp
incubator/jspwiki/branches/JSPWIKI_2_9_STRIPES_BRANCH/src/webdocs/SisterSites.jsp
incubator/jspwiki/branches/JSPWIKI_2_9_STRIPES_BRANCH/src/webdocs/Upload.jsp
incubator/jspwiki/branches/JSPWIKI_2_9_STRIPES_BRANCH/src/webdocs/UserPreferences.jsp
incubator/jspwiki/branches/JSPWIKI_2_9_STRIPES_BRANCH/src/webdocs/Wiki.jsp
incubator/jspwiki/branches/JSPWIKI_2_9_STRIPES_BRANCH/src/webdocs/Workflow.jsp
incubator/jspwiki/branches/JSPWIKI_2_9_STRIPES_BRANCH/src/webdocs/rss.jsp
incubator/jspwiki/branches/JSPWIKI_2_9_STRIPES_BRANCH/src/webdocs/templates/default/skins/OrderedList/skin.css
incubator/jspwiki/branches/JSPWIKI_2_9_STRIPES_BRANCH/src/webdocs/templates/default/skins/PlainVanilla 1024x768/skin.css
Modified: incubator/jspwiki/branches/JSPWIKI_2_9_STRIPES_BRANCH/src/com/ecyrd/jspwiki/PageTimeComparator.java
URL: http://svn.apache.org/viewvc/incubator/jspwiki/branches/JSPWIKI_2_9_STRIPES_BRANCH/src/com/ecyrd/jspwiki/PageTimeComparator.java?rev=721869&r1=721868&r2=721869&view=diff
==============================================================================
--- incubator/jspwiki/branches/JSPWIKI_2_9_STRIPES_BRANCH/src/com/ecyrd/jspwiki/PageTimeComparator.java (original)
+++ incubator/jspwiki/branches/JSPWIKI_2_9_STRIPES_BRANCH/src/com/ecyrd/jspwiki/PageTimeComparator.java Sun Nov 30 10:29:52 2008
@@ -22,7 +22,8 @@
import java.io.Serializable;
import java.util.*;
-import org.apache.log4j.Logger;
+import com.ecyrd.jspwiki.log.Logger;
+import com.ecyrd.jspwiki.log.LoggerFactory;
/**
* Compares the lastModified date of its arguments. Both o1 and o2 MUST
@@ -39,7 +40,7 @@
{
private static final long serialVersionUID = 0L;
- static Logger log = Logger.getLogger( PageTimeComparator.class );
+ static Logger log = LoggerFactory.getLogger( PageTimeComparator.class );
/**
* {@inheritDoc}
Modified: incubator/jspwiki/branches/JSPWIKI_2_9_STRIPES_BRANCH/src/com/ecyrd/jspwiki/ReferenceManager.java
URL: http://svn.apache.org/viewvc/incubator/jspwiki/branches/JSPWIKI_2_9_STRIPES_BRANCH/src/com/ecyrd/jspwiki/ReferenceManager.java?rev=721869&r1=721868&r2=721869&view=diff
==============================================================================
--- incubator/jspwiki/branches/JSPWIKI_2_9_STRIPES_BRANCH/src/com/ecyrd/jspwiki/ReferenceManager.java (original)
+++ incubator/jspwiki/branches/JSPWIKI_2_9_STRIPES_BRANCH/src/com/ecyrd/jspwiki/ReferenceManager.java Sun Nov 30 10:29:52 2008
@@ -26,7 +26,8 @@
import java.util.*;
import org.apache.commons.lang.time.StopWatch;
-import org.apache.log4j.Logger;
+import com.ecyrd.jspwiki.log.Logger;
+import com.ecyrd.jspwiki.log.LoggerFactory;
import com.ecyrd.jspwiki.attachment.Attachment;
import com.ecyrd.jspwiki.event.WikiEvent;
@@ -136,7 +137,7 @@
private boolean m_matchEnglishPlurals = false;
- private static Logger log = Logger.getLogger(ReferenceManager.class);
+ private static Logger log = LoggerFactory.getLogger(ReferenceManager.class);
private static final String SERIALIZATION_FILE = "refmgr.ser";
private static final String SERIALIZATION_DIR = "refmgr-attr";
@@ -255,7 +256,7 @@
if( page.getLastModified() == null )
{
- log.fatal( "Provider returns null lastModified. Please submit a bug report." );
+ log.error( "Provider returns null lastModified. Please submit a bug report." );
}
else if( page.getLastModified().getTime() > saved )
{
@@ -475,7 +476,7 @@
}
catch( NoSuchAlgorithmException e )
{
- log.fatal("No MD5!?!");
+ log.error("No MD5!?!");
}
finally
{
@@ -551,7 +552,7 @@
}
catch( NoSuchAlgorithmException e )
{
- log.fatal("No MD5 algorithm!?!");
+ log.error("No MD5 algorithm!?!");
}
finally
{
@@ -827,7 +828,7 @@
}
catch( ClassCastException e )
{
- log.fatal( "Invalid collection entry in ReferenceManager.buildKeyLists().", e );
+ log.error( "Invalid collection entry in ReferenceManager.buildKeyLists().", e );
}
}
Modified: incubator/jspwiki/branches/JSPWIKI_2_9_STRIPES_BRANCH/src/com/ecyrd/jspwiki/Release.java
URL: http://svn.apache.org/viewvc/incubator/jspwiki/branches/JSPWIKI_2_9_STRIPES_BRANCH/src/com/ecyrd/jspwiki/Release.java?rev=721869&r1=721868&r2=721869&view=diff
==============================================================================
--- incubator/jspwiki/branches/JSPWIKI_2_9_STRIPES_BRANCH/src/com/ecyrd/jspwiki/Release.java (original)
+++ incubator/jspwiki/branches/JSPWIKI_2_9_STRIPES_BRANCH/src/com/ecyrd/jspwiki/Release.java Sun Nov 30 10:29:52 2008
@@ -77,7 +77,7 @@
* <p>
* If the build identifier is empty, it is not added.
*/
- public static final String BUILD = "12";
+ public static final String BUILD = "17";
/**
* This is the generic version string you should use
Modified: incubator/jspwiki/branches/JSPWIKI_2_9_STRIPES_BRANCH/src/com/ecyrd/jspwiki/VariableManager.java
URL: http://svn.apache.org/viewvc/incubator/jspwiki/branches/JSPWIKI_2_9_STRIPES_BRANCH/src/com/ecyrd/jspwiki/VariableManager.java?rev=721869&r1=721868&r2=721869&view=diff
==============================================================================
--- incubator/jspwiki/branches/JSPWIKI_2_9_STRIPES_BRANCH/src/com/ecyrd/jspwiki/VariableManager.java (original)
+++ incubator/jspwiki/branches/JSPWIKI_2_9_STRIPES_BRANCH/src/com/ecyrd/jspwiki/VariableManager.java Sun Nov 30 10:29:52 2008
@@ -27,7 +27,8 @@
import javax.servlet.http.HttpServletRequest;
import javax.servlet.http.HttpSession;
-import org.apache.log4j.Logger;
+import com.ecyrd.jspwiki.log.Logger;
+import com.ecyrd.jspwiki.log.LoggerFactory;
import com.ecyrd.jspwiki.filters.PageFilter;
import com.ecyrd.jspwiki.i18n.InternationalizationManager;
@@ -41,7 +42,7 @@
*/
public class VariableManager
{
- private static Logger log = Logger.getLogger( VariableManager.class );
+ private static Logger log = LoggerFactory.getLogger( VariableManager.class );
// FIXME: These are probably obsolete.
public static final String VAR_ERROR = "error";
Modified: incubator/jspwiki/branches/JSPWIKI_2_9_STRIPES_BRANCH/src/com/ecyrd/jspwiki/WikiContext.java
URL: http://svn.apache.org/viewvc/incubator/jspwiki/branches/JSPWIKI_2_9_STRIPES_BRANCH/src/com/ecyrd/jspwiki/WikiContext.java?rev=721869&r1=721868&r2=721869&view=diff
==============================================================================
--- incubator/jspwiki/branches/JSPWIKI_2_9_STRIPES_BRANCH/src/com/ecyrd/jspwiki/WikiContext.java (original)
+++ incubator/jspwiki/branches/JSPWIKI_2_9_STRIPES_BRANCH/src/com/ecyrd/jspwiki/WikiContext.java Sun Nov 30 10:29:52 2008
@@ -25,6 +25,15 @@
import java.util.ResourceBundle;
import javax.servlet.http.HttpServletRequest;
+<<<<<<< .working
+=======
+import javax.servlet.http.HttpServletResponse;
+import javax.servlet.http.HttpSession;
+import javax.servlet.jsp.PageContext;
+
+import com.ecyrd.jspwiki.log.Logger;
+import com.ecyrd.jspwiki.log.LoggerFactory;
+>>>>>>> .merge-right.r721865
import com.ecyrd.jspwiki.action.*;
@@ -136,8 +145,134 @@
public static final String OTHER = "other";
/** User is doing administrative things. */
+<<<<<<< .working
public static final String ADMIN = "admin";
+=======
+ public static final String ADMIN = WikiCommand.ADMIN.getRequestContext();
+
+ private static final Logger log = LoggerFactory.getLogger( WikiContext.class );
+
+ private static final Permission DUMMY_PERMISSION = new java.util.PropertyPermission( "os.name", "read" );
+
+ /**
+ * Create a new WikiContext for the given WikiPage. Delegates to
+ * {@link #WikiContext(WikiEngine, HttpServletRequest, WikiPage)}.
+ * @param engine The WikiEngine that is handling the request.
+ * @param page The WikiPage. If you want to create a
+ * WikiContext for an older version of a page, you must use this
+ * constructor.
+ */
+ public WikiContext( WikiEngine engine, WikiPage page )
+ {
+ this( engine, null, findCommand( engine, null, page ) );
+ }
+
+ /**
+ * <p>
+ * Creates a new WikiContext for the given WikiEngine, Command and
+ * HttpServletRequest.
+ * </p>
+ * <p>
+ * This constructor will also look up the HttpSession associated with the
+ * request, and determine if a WikiSession object is present. If not, a new
+ * one is created.
+ * </p>
+ * @param engine The WikiEngine that is handling the request
+ * @param request The HttpServletRequest that should be associated with this
+ * context. This parameter may be <code>null</code>.
+ * @param command the command
+ * @throws IllegalArgumentException if <code>engine</code> or
+ * <code>command</code> are <code>null</code>
+ */
+ public WikiContext( WikiEngine engine, HttpServletRequest request, Command command )
+ throws IllegalArgumentException
+ {
+ super();
+ if ( engine == null || command == null )
+ {
+ throw new IllegalArgumentException( "Parameter engine and command must not be null." );
+ }
+
+ m_engine = engine;
+ m_request = request;
+ m_session = WikiSession.getWikiSession( engine, request );
+ m_command = command;
+
+ // If PageCommand, get the WikiPage
+ if( command instanceof PageCommand )
+ {
+ m_page = (WikiPage)((PageCommand)command).getTarget();
+ }
+
+ // If page not supplied, default to front page to avoid NPEs
+ if( m_page == null )
+ {
+ m_page = m_engine.getPage( m_engine.getFrontPage() );
+
+ // Front page does not exist?
+ if( m_page == null )
+ {
+ m_page = new WikiPage( m_engine, m_engine.getFrontPage() );
+ }
+ }
+
+ m_realPage = m_page;
+
+ // Special case: retarget any empty 'view' PageCommands to the front page
+ if ( PageCommand.VIEW.equals( command ) && command.getTarget() == null )
+ {
+ m_command = command.targetedCommand( m_page );
+ }
+
+ // Debugging...
+ if( log.isDebugEnabled() )
+ {
+ HttpSession session = ( request == null ) ? null : request.getSession( false );
+ String sid = ( session == null ) ? "(null)" : session.getId();
+ log.debug( "Creating WikiContext for session ID=" + sid + "; target=" + getName() );
+ }
+
+ // Figure out what template to use
+ setDefaultTemplate( request );
+ }
+
+ /**
+ * Creates a new WikiContext for the given WikiEngine, WikiPage and
+ * HttpServletRequest. This method simply looks up the appropriate Command
+ * using {@link #findCommand(WikiEngine, HttpServletRequest, WikiPage)} and
+ * delegates to
+ * {@link #WikiContext(WikiEngine, HttpServletRequest, Command)}.
+ * @param engine The WikiEngine that is handling the request
+ * @param request The HttpServletRequest that should be associated with this
+ * context. This parameter may be <code>null</code>.
+ * @param page The WikiPage. If you want to create a WikiContext for an
+ * older version of a page, you must supply this parameter
+ */
+ public WikiContext(WikiEngine engine, HttpServletRequest request, WikiPage page)
+ {
+ this( engine, request, findCommand( engine, request, page ) );
+ }
+
+ /**
+ * {@inheritDoc}
+ * @see com.ecyrd.jspwiki.ui.Command#getContentTemplate()
+ */
+ public String getContentTemplate()
+ {
+ return m_command.getContentTemplate();
+ }
+
+ /**
+ * {@inheritDoc}
+ * @see com.ecyrd.jspwiki.ui.Command#getJSP()
+ */
+ public String getJSP()
+ {
+ return m_command.getContentTemplate();
+ }
+
+>>>>>>> .merge-right.r721865
/**
* Sets a reference to the real page whose content is currently being
* rendered.
Modified: incubator/jspwiki/branches/JSPWIKI_2_9_STRIPES_BRANCH/src/com/ecyrd/jspwiki/attachment/AttachmentManager.java
URL: http://svn.apache.org/viewvc/incubator/jspwiki/branches/JSPWIKI_2_9_STRIPES_BRANCH/src/com/ecyrd/jspwiki/attachment/AttachmentManager.java?rev=721869&r1=721868&r2=721869&view=diff
==============================================================================
--- incubator/jspwiki/branches/JSPWIKI_2_9_STRIPES_BRANCH/src/com/ecyrd/jspwiki/attachment/AttachmentManager.java (original)
+++ incubator/jspwiki/branches/JSPWIKI_2_9_STRIPES_BRANCH/src/com/ecyrd/jspwiki/attachment/AttachmentManager.java Sun Nov 30 10:29:52 2008
@@ -27,7 +27,8 @@
import java.util.*;
import org.apache.commons.lang.StringUtils;
-import org.apache.log4j.Logger;
+import com.ecyrd.jspwiki.log.Logger;
+import com.ecyrd.jspwiki.log.LoggerFactory;
import com.ecyrd.jspwiki.*;
import com.ecyrd.jspwiki.parser.MarkupParser;
@@ -69,7 +70,7 @@
*/
public static final String PROP_FORDBIDDENEXTENSIONS = "jspwiki.attachment.forbidden";
- static Logger log = Logger.getLogger( AttachmentManager.class );
+ static Logger log = LoggerFactory.getLogger( AttachmentManager.class );
private WikiAttachmentProvider m_provider;
private WikiEngine m_engine;
Modified: incubator/jspwiki/branches/JSPWIKI_2_9_STRIPES_BRANCH/src/com/ecyrd/jspwiki/attachment/AttachmentServlet.java
URL: http://svn.apache.org/viewvc/incubator/jspwiki/branches/JSPWIKI_2_9_STRIPES_BRANCH/src/com/ecyrd/jspwiki/attachment/AttachmentServlet.java?rev=721869&r1=721868&r2=721869&view=diff
==============================================================================
--- incubator/jspwiki/branches/JSPWIKI_2_9_STRIPES_BRANCH/src/com/ecyrd/jspwiki/attachment/AttachmentServlet.java (original)
+++ incubator/jspwiki/branches/JSPWIKI_2_9_STRIPES_BRANCH/src/com/ecyrd/jspwiki/attachment/AttachmentServlet.java Sun Nov 30 10:29:52 2008
@@ -42,7 +42,8 @@
import org.apache.commons.fileupload.ProgressListener;
import org.apache.commons.fileupload.disk.DiskFileItemFactory;
import org.apache.commons.fileupload.servlet.ServletFileUpload;
-import org.apache.log4j.Logger;
+import com.ecyrd.jspwiki.log.Logger;
+import com.ecyrd.jspwiki.log.LoggerFactory;
import com.ecyrd.jspwiki.*;
import com.ecyrd.jspwiki.auth.AuthorizationManager;
@@ -81,7 +82,7 @@
private static final long serialVersionUID = 3257282552187531320L;
private WikiEngine m_engine;
- static Logger log = Logger.getLogger(AttachmentServlet.class.getName());
+ static Logger log = LoggerFactory.getLogger(AttachmentServlet.class.getName());
private static final String HDR_VERSION = "version";
// private static final String HDR_NAME = "page";
@@ -157,7 +158,7 @@
}
else if( !f.isDirectory() )
{
- log.fatal("A file already exists where the temporary dir is supposed to be: "+m_tmpDir+". Please remove it.");
+ log.error("A file already exists where the temporary dir is supposed to be: "+m_tmpDir+". Please remove it.");
}
log.debug( "UploadServlet initialized. Using " +
Modified: incubator/jspwiki/branches/JSPWIKI_2_9_STRIPES_BRANCH/src/com/ecyrd/jspwiki/auth/AuthenticationManager.java
URL: http://svn.apache.org/viewvc/incubator/jspwiki/branches/JSPWIKI_2_9_STRIPES_BRANCH/src/com/ecyrd/jspwiki/auth/AuthenticationManager.java?rev=721869&r1=721868&r2=721869&view=diff
==============================================================================
--- incubator/jspwiki/branches/JSPWIKI_2_9_STRIPES_BRANCH/src/com/ecyrd/jspwiki/auth/AuthenticationManager.java (original)
+++ incubator/jspwiki/branches/JSPWIKI_2_9_STRIPES_BRANCH/src/com/ecyrd/jspwiki/auth/AuthenticationManager.java Sun Nov 30 10:29:52 2008
@@ -33,7 +33,8 @@
import javax.servlet.http.HttpServletRequest;
import javax.servlet.http.HttpSession;
-import org.apache.log4j.Logger;
+import com.ecyrd.jspwiki.log.Logger;
+import com.ecyrd.jspwiki.log.LoggerFactory;
import com.ecyrd.jspwiki.TextUtil;
import com.ecyrd.jspwiki.WikiEngine;
@@ -100,7 +101,7 @@
/** Whether logins should be throttled to limit brute-forcing attempts. Defaults to true. */
public static final String PROP_LOGIN_THROTTLING = "jspwiki.login.throttling";
- protected static final Logger log = Logger.getLogger( AuthenticationManager.class );
+ protected static final Logger log = LoggerFactory.getLogger( AuthenticationManager.class );
/** Prefix for LoginModule options key/value pairs. */
protected static final String PREFIX_LOGIN_MODULE_OPTIONS = "jspwiki.loginModule.options.";
@@ -614,7 +615,7 @@
catch( MalformedURLException e )
{
// This should never happen unless I screw up
- log.fatal("Your code is b0rked. You are a bad person.");
+ log.error("Your code is b0rked. You are a bad person.");
}
}
Modified: incubator/jspwiki/branches/JSPWIKI_2_9_STRIPES_BRANCH/src/com/ecyrd/jspwiki/auth/AuthorizationManager.java
URL: http://svn.apache.org/viewvc/incubator/jspwiki/branches/JSPWIKI_2_9_STRIPES_BRANCH/src/com/ecyrd/jspwiki/auth/AuthorizationManager.java?rev=721869&r1=721868&r2=721869&view=diff
==============================================================================
--- incubator/jspwiki/branches/JSPWIKI_2_9_STRIPES_BRANCH/src/com/ecyrd/jspwiki/auth/AuthorizationManager.java (original)
+++ incubator/jspwiki/branches/JSPWIKI_2_9_STRIPES_BRANCH/src/com/ecyrd/jspwiki/auth/AuthorizationManager.java Sun Nov 30 10:29:52 2008
@@ -29,7 +29,8 @@
import java.util.Properties;
import java.util.WeakHashMap;
-import org.apache.log4j.Logger;
+import com.ecyrd.jspwiki.log.Logger;
+import com.ecyrd.jspwiki.log.LoggerFactory;
import org.freshcookies.security.policy.LocalPolicy;
import org.freshcookies.security.policy.PolicyException;
@@ -86,7 +87,7 @@
*/
public final class AuthorizationManager
{
- private static final Logger log = Logger.getLogger( AuthorizationManager.class );
+ private static final Logger log = LoggerFactory.getLogger( AuthorizationManager.class );
/**
* The default external Authorizer is the {@link com.ecyrd.jspwiki.auth.authorize.WebContainerAuthorizer}
*/
@@ -424,7 +425,7 @@
sb.append( "This file should exist regardless of the existance of a global policy file. " );
sb.append( "The global policy file is identified by the java.security.policy variable. " );
WikiSecurityException wse = new WikiSecurityException( sb.toString() );
- log.fatal( sb.toString(), wse );
+ log.error( sb.toString(), wse );
throw wse;
}
}
@@ -472,17 +473,17 @@
}
catch( ClassNotFoundException e )
{
- log.fatal( "Authorizer " + clazz + " cannot be found", e );
+ log.error( "Authorizer " + clazz + " cannot be found", e );
throw new WikiException( "Authorizer " + clazz + " cannot be found" );
}
catch( InstantiationException e )
{
- log.fatal( "Authorizer " + clazz + " cannot be created", e );
+ log.error( "Authorizer " + clazz + " cannot be created", e );
throw new WikiException( "Authorizer " + clazz + " cannot be created" );
}
catch( IllegalAccessException e )
{
- log.fatal( "You are not allowed to access this authorizer class", e );
+ log.error( "You are not allowed to access this authorizer class", e );
throw new WikiException( "You are not allowed to access this authorizer class" );
}
}
Modified: incubator/jspwiki/branches/JSPWIKI_2_9_STRIPES_BRANCH/src/com/ecyrd/jspwiki/auth/SecurityVerifier.java
URL: http://svn.apache.org/viewvc/incubator/jspwiki/branches/JSPWIKI_2_9_STRIPES_BRANCH/src/com/ecyrd/jspwiki/auth/SecurityVerifier.java?rev=721869&r1=721868&r2=721869&view=diff
==============================================================================
--- incubator/jspwiki/branches/JSPWIKI_2_9_STRIPES_BRANCH/src/com/ecyrd/jspwiki/auth/SecurityVerifier.java (original)
+++ incubator/jspwiki/branches/JSPWIKI_2_9_STRIPES_BRANCH/src/com/ecyrd/jspwiki/auth/SecurityVerifier.java Sun Nov 30 10:29:52 2008
@@ -33,7 +33,8 @@
import javax.security.auth.spi.LoginModule;
import org.apache.commons.lang.ArrayUtils;
-import org.apache.log4j.Logger;
+import com.ecyrd.jspwiki.log.Logger;
+import com.ecyrd.jspwiki.log.LoggerFactory;
import org.freshcookies.security.policy.PolicyReader;
import org.jdom.JDOMException;
@@ -130,7 +131,7 @@
private static final String BG_RED = "bgcolor=\"#ffc0c0\"";
- private static final Logger LOG = Logger.getLogger( SecurityVerifier.class.getName() );
+ private static final Logger LOG = LoggerFactory.getLogger( SecurityVerifier.class.getName() );
/**
* Constructs a new SecurityVerifier for a supplied WikiEngine and WikiSession.
Modified: incubator/jspwiki/branches/JSPWIKI_2_9_STRIPES_BRANCH/src/com/ecyrd/jspwiki/auth/SessionMonitor.java
URL: http://svn.apache.org/viewvc/incubator/jspwiki/branches/JSPWIKI_2_9_STRIPES_BRANCH/src/com/ecyrd/jspwiki/auth/SessionMonitor.java?rev=721869&r1=721868&r2=721869&view=diff
==============================================================================
--- incubator/jspwiki/branches/JSPWIKI_2_9_STRIPES_BRANCH/src/com/ecyrd/jspwiki/auth/SessionMonitor.java (original)
+++ incubator/jspwiki/branches/JSPWIKI_2_9_STRIPES_BRANCH/src/com/ecyrd/jspwiki/auth/SessionMonitor.java Sun Nov 30 10:29:52 2008
@@ -27,7 +27,8 @@
import javax.servlet.http.HttpSessionEvent;
import javax.servlet.http.HttpSessionListener;
-import org.apache.log4j.Logger;
+import com.ecyrd.jspwiki.log.Logger;
+import com.ecyrd.jspwiki.log.LoggerFactory;
import com.ecyrd.jspwiki.WikiEngine;
import com.ecyrd.jspwiki.WikiSession;
@@ -46,7 +47,7 @@
*/
public class SessionMonitor implements HttpSessionListener
{
- private static Logger log = Logger.getLogger( SessionMonitor.class );
+ private static Logger log = LoggerFactory.getLogger( SessionMonitor.class );
/** Map with WikiEngines as keys, and SessionMonitors as values. */
private static Map<WikiEngine, SessionMonitor> c_monitors = new HashMap<WikiEngine, SessionMonitor>();
Modified: incubator/jspwiki/branches/JSPWIKI_2_9_STRIPES_BRANCH/src/com/ecyrd/jspwiki/auth/UserManager.java
URL: http://svn.apache.org/viewvc/incubator/jspwiki/branches/JSPWIKI_2_9_STRIPES_BRANCH/src/com/ecyrd/jspwiki/auth/UserManager.java?rev=721869&r1=721868&r2=721869&view=diff
==============================================================================
--- incubator/jspwiki/branches/JSPWIKI_2_9_STRIPES_BRANCH/src/com/ecyrd/jspwiki/auth/UserManager.java (original)
+++ incubator/jspwiki/branches/JSPWIKI_2_9_STRIPES_BRANCH/src/com/ecyrd/jspwiki/auth/UserManager.java Sun Nov 30 10:29:52 2008
@@ -30,7 +30,8 @@
import javax.mail.internet.AddressException;
import javax.servlet.http.HttpServletRequest;
-import org.apache.log4j.Logger;
+import com.ecyrd.jspwiki.log.Logger;
+import com.ecyrd.jspwiki.log.LoggerFactory;
import com.ecyrd.jspwiki.*;
import com.ecyrd.jspwiki.auth.permissions.AllPermission;
@@ -69,7 +70,7 @@
private WikiEngine m_engine;
- private static Logger log = Logger.getLogger(UserManager.class);
+ private static Logger log = LoggerFactory.getLogger(UserManager.class);
/** Message key for the "save profile" message. */
public static final String SAVE_APPROVER = "workflow.createUserProfile";
Modified: incubator/jspwiki/branches/JSPWIKI_2_9_STRIPES_BRANCH/src/com/ecyrd/jspwiki/auth/acl/Acl.java
URL: http://svn.apache.org/viewvc/incubator/jspwiki/branches/JSPWIKI_2_9_STRIPES_BRANCH/src/com/ecyrd/jspwiki/auth/acl/Acl.java?rev=721869&r1=721868&r2=721869&view=diff
==============================================================================
--- incubator/jspwiki/branches/JSPWIKI_2_9_STRIPES_BRANCH/src/com/ecyrd/jspwiki/auth/acl/Acl.java (original)
+++ incubator/jspwiki/branches/JSPWIKI_2_9_STRIPES_BRANCH/src/com/ecyrd/jspwiki/auth/acl/Acl.java Sun Nov 30 10:29:52 2008
@@ -74,7 +74,6 @@
* enumeration is of type AclEntry.
* @return an enumeration of the entries in this ACL.
*/
- @SuppressWarnings("unchecked")
public Enumeration entries();
/**
Modified: incubator/jspwiki/branches/JSPWIKI_2_9_STRIPES_BRANCH/src/com/ecyrd/jspwiki/auth/acl/AclEntry.java
URL: http://svn.apache.org/viewvc/incubator/jspwiki/branches/JSPWIKI_2_9_STRIPES_BRANCH/src/com/ecyrd/jspwiki/auth/acl/AclEntry.java?rev=721869&r1=721868&r2=721869&view=diff
==============================================================================
--- incubator/jspwiki/branches/JSPWIKI_2_9_STRIPES_BRANCH/src/com/ecyrd/jspwiki/auth/acl/AclEntry.java (original)
+++ incubator/jspwiki/branches/JSPWIKI_2_9_STRIPES_BRANCH/src/com/ecyrd/jspwiki/auth/acl/AclEntry.java Sun Nov 30 10:29:52 2008
@@ -80,7 +80,6 @@
* Returns an enumeration of the permissions in this ACL entry.
* @return an enumeration of the permissions
*/
- @SuppressWarnings("unchecked")
public Enumeration permissions();
/**
Modified: incubator/jspwiki/branches/JSPWIKI_2_9_STRIPES_BRANCH/src/com/ecyrd/jspwiki/auth/acl/AclEntryImpl.java
URL: http://svn.apache.org/viewvc/incubator/jspwiki/branches/JSPWIKI_2_9_STRIPES_BRANCH/src/com/ecyrd/jspwiki/auth/acl/AclEntryImpl.java?rev=721869&r1=721868&r2=721869&view=diff
==============================================================================
--- incubator/jspwiki/branches/JSPWIKI_2_9_STRIPES_BRANCH/src/com/ecyrd/jspwiki/auth/acl/AclEntryImpl.java (original)
+++ incubator/jspwiki/branches/JSPWIKI_2_9_STRIPES_BRANCH/src/com/ecyrd/jspwiki/auth/acl/AclEntryImpl.java Sun Nov 30 10:29:52 2008
@@ -96,7 +96,6 @@
* Returns an enumeration of the permissions in this ACL entry.
* @return an enumeration of the permissions
*/
- @SuppressWarnings("unchecked")
public Enumeration permissions()
{
return m_permissions.elements();
Modified: incubator/jspwiki/branches/JSPWIKI_2_9_STRIPES_BRANCH/src/com/ecyrd/jspwiki/auth/acl/AclImpl.java
URL: http://svn.apache.org/viewvc/incubator/jspwiki/branches/JSPWIKI_2_9_STRIPES_BRANCH/src/com/ecyrd/jspwiki/auth/acl/AclImpl.java?rev=721869&r1=721868&r2=721869&view=diff
==============================================================================
--- incubator/jspwiki/branches/JSPWIKI_2_9_STRIPES_BRANCH/src/com/ecyrd/jspwiki/auth/acl/AclImpl.java (original)
+++ incubator/jspwiki/branches/JSPWIKI_2_9_STRIPES_BRANCH/src/com/ecyrd/jspwiki/auth/acl/AclImpl.java Sun Nov 30 10:29:52 2008
@@ -142,7 +142,6 @@
* enumeration is of type AclEntry.
* @return an enumeration of the entries in this ACL.
*/
- @SuppressWarnings("unchecked")
public Enumeration entries()
{
return m_entries.elements();
Modified: incubator/jspwiki/branches/JSPWIKI_2_9_STRIPES_BRANCH/src/com/ecyrd/jspwiki/auth/acl/DefaultAclManager.java
URL: http://svn.apache.org/viewvc/incubator/jspwiki/branches/JSPWIKI_2_9_STRIPES_BRANCH/src/com/ecyrd/jspwiki/auth/acl/DefaultAclManager.java?rev=721869&r1=721868&r2=721869&view=diff
==============================================================================
--- incubator/jspwiki/branches/JSPWIKI_2_9_STRIPES_BRANCH/src/com/ecyrd/jspwiki/auth/acl/DefaultAclManager.java (original)
+++ incubator/jspwiki/branches/JSPWIKI_2_9_STRIPES_BRANCH/src/com/ecyrd/jspwiki/auth/acl/DefaultAclManager.java Sun Nov 30 10:29:52 2008
@@ -26,7 +26,8 @@
import java.util.regex.Matcher;
import java.util.regex.Pattern;
-import org.apache.log4j.Logger;
+import com.ecyrd.jspwiki.log.Logger;
+import com.ecyrd.jspwiki.log.LoggerFactory;
import com.ecyrd.jspwiki.*;
import com.ecyrd.jspwiki.attachment.Attachment;
@@ -45,7 +46,7 @@
*/
public class DefaultAclManager implements AclManager
{
- static Logger log = Logger.getLogger( DefaultAclManager.class );
+ static Logger log = LoggerFactory.getLogger( DefaultAclManager.class );
private AuthorizationManager m_auth = null;
private WikiEngine m_engine = null;
Modified: incubator/jspwiki/branches/JSPWIKI_2_9_STRIPES_BRANCH/src/com/ecyrd/jspwiki/auth/authorize/GroupManager.java
URL: http://svn.apache.org/viewvc/incubator/jspwiki/branches/JSPWIKI_2_9_STRIPES_BRANCH/src/com/ecyrd/jspwiki/auth/authorize/GroupManager.java?rev=721869&r1=721868&r2=721869&view=diff
==============================================================================
--- incubator/jspwiki/branches/JSPWIKI_2_9_STRIPES_BRANCH/src/com/ecyrd/jspwiki/auth/authorize/GroupManager.java (original)
+++ incubator/jspwiki/branches/JSPWIKI_2_9_STRIPES_BRANCH/src/com/ecyrd/jspwiki/auth/authorize/GroupManager.java Sun Nov 30 10:29:52 2008
@@ -31,7 +31,8 @@
import javax.servlet.http.HttpServletRequest;
import org.apache.commons.lang.ArrayUtils;
-import org.apache.log4j.Logger;
+import com.ecyrd.jspwiki.log.Logger;
+import com.ecyrd.jspwiki.log.LoggerFactory;
import com.ecyrd.jspwiki.NoRequiredPropertyException;
import com.ecyrd.jspwiki.WikiContext;
@@ -70,7 +71,7 @@
private static final String PROP_GROUPDATABASE = "jspwiki.groupdatabase";
- static final Logger log = Logger.getLogger( GroupManager.class );
+ static final Logger log = LoggerFactory.getLogger( GroupManager.class );
protected WikiEngine m_engine;
Modified: incubator/jspwiki/branches/JSPWIKI_2_9_STRIPES_BRANCH/src/com/ecyrd/jspwiki/auth/authorize/JDBCGroupDatabase.java
URL: http://svn.apache.org/viewvc/incubator/jspwiki/branches/JSPWIKI_2_9_STRIPES_BRANCH/src/com/ecyrd/jspwiki/auth/authorize/JDBCGroupDatabase.java?rev=721869&r1=721868&r2=721869&view=diff
==============================================================================
--- incubator/jspwiki/branches/JSPWIKI_2_9_STRIPES_BRANCH/src/com/ecyrd/jspwiki/auth/authorize/JDBCGroupDatabase.java (original)
+++ incubator/jspwiki/branches/JSPWIKI_2_9_STRIPES_BRANCH/src/com/ecyrd/jspwiki/auth/authorize/JDBCGroupDatabase.java Sun Nov 30 10:29:52 2008
@@ -30,7 +30,8 @@
import javax.naming.NamingException;
import javax.sql.DataSource;
-import org.apache.log4j.Logger;
+import com.ecyrd.jspwiki.log.Logger;
+import com.ecyrd.jspwiki.log.LoggerFactory;
import com.ecyrd.jspwiki.NoRequiredPropertyException;
import com.ecyrd.jspwiki.WikiEngine;
@@ -192,7 +193,7 @@
/** The column containing the name of the user who last modified the group. */
public static final String PROP_GROUPDB_MODIFIER = "jspwiki.groupdatabase.modifier";
- protected static final Logger log = Logger.getLogger( JDBCGroupDatabase.class );
+ protected static final Logger log = LoggerFactory.getLogger( JDBCGroupDatabase.class );
private DataSource m_ds = null;
Modified: incubator/jspwiki/branches/JSPWIKI_2_9_STRIPES_BRANCH/src/com/ecyrd/jspwiki/auth/authorize/WebContainerAuthorizer.java
URL: http://svn.apache.org/viewvc/incubator/jspwiki/branches/JSPWIKI_2_9_STRIPES_BRANCH/src/com/ecyrd/jspwiki/auth/authorize/WebContainerAuthorizer.java?rev=721869&r1=721868&r2=721869&view=diff
==============================================================================
--- incubator/jspwiki/branches/JSPWIKI_2_9_STRIPES_BRANCH/src/com/ecyrd/jspwiki/auth/authorize/WebContainerAuthorizer.java (original)
+++ incubator/jspwiki/branches/JSPWIKI_2_9_STRIPES_BRANCH/src/com/ecyrd/jspwiki/auth/authorize/WebContainerAuthorizer.java Sun Nov 30 10:29:52 2008
@@ -31,7 +31,8 @@
import javax.servlet.http.HttpServletRequest;
-import org.apache.log4j.Logger;
+import com.ecyrd.jspwiki.log.Logger;
+import com.ecyrd.jspwiki.log.LoggerFactory;
import org.jdom.Document;
import org.jdom.Element;
import org.jdom.Namespace;
@@ -59,7 +60,7 @@
{
private static final String J2EE_SCHEMA_24_NAMESPACE = "http://java.sun.com/xml/ns/j2ee";
- protected static final Logger log = Logger.getLogger( WebContainerAuthorizer.class );
+ protected static final Logger log = LoggerFactory.getLogger( WebContainerAuthorizer.class );
protected WikiEngine m_engine;
Modified: incubator/jspwiki/branches/JSPWIKI_2_9_STRIPES_BRANCH/src/com/ecyrd/jspwiki/auth/authorize/XMLGroupDatabase.java
URL: http://svn.apache.org/viewvc/incubator/jspwiki/branches/JSPWIKI_2_9_STRIPES_BRANCH/src/com/ecyrd/jspwiki/auth/authorize/XMLGroupDatabase.java?rev=721869&r1=721868&r2=721869&view=diff
==============================================================================
--- incubator/jspwiki/branches/JSPWIKI_2_9_STRIPES_BRANCH/src/com/ecyrd/jspwiki/auth/authorize/XMLGroupDatabase.java (original)
+++ incubator/jspwiki/branches/JSPWIKI_2_9_STRIPES_BRANCH/src/com/ecyrd/jspwiki/auth/authorize/XMLGroupDatabase.java Sun Nov 30 10:29:52 2008
@@ -40,7 +40,8 @@
import javax.xml.parsers.ParserConfigurationException;
import org.apache.commons.lang.StringEscapeUtils;
-import org.apache.log4j.Logger;
+import com.ecyrd.jspwiki.log.Logger;
+import com.ecyrd.jspwiki.log.LoggerFactory;
import org.w3c.dom.Document;
import org.w3c.dom.Element;
import org.w3c.dom.NodeList;
@@ -77,7 +78,7 @@
*/
public class XMLGroupDatabase implements GroupDatabase
{
- protected static final Logger log = Logger.getLogger( XMLGroupDatabase.class );
+ protected static final Logger log = LoggerFactory.getLogger( XMLGroupDatabase.class );
/**
* The jspwiki.properties property specifying the file system location of
@@ -294,7 +295,7 @@
}
catch( ParserConfigurationException e )
{
- log.fatal( "Could not create in-memory DOM" );
+ log.error( "Could not create in-memory DOM" );
}
}
@@ -404,7 +405,7 @@
{
if ( m_dom == null )
{
- log.fatal( "Group database doesn't exist in memory." );
+ log.error( "Group database doesn't exist in memory." );
}
File newFile = new File( m_file.getAbsolutePath() + ".new" );
Modified: incubator/jspwiki/branches/JSPWIKI_2_9_STRIPES_BRANCH/src/com/ecyrd/jspwiki/auth/login/AbstractLoginModule.java
URL: http://svn.apache.org/viewvc/incubator/jspwiki/branches/JSPWIKI_2_9_STRIPES_BRANCH/src/com/ecyrd/jspwiki/auth/login/AbstractLoginModule.java?rev=721869&r1=721868&r2=721869&view=diff
==============================================================================
--- incubator/jspwiki/branches/JSPWIKI_2_9_STRIPES_BRANCH/src/com/ecyrd/jspwiki/auth/login/AbstractLoginModule.java (original)
+++ incubator/jspwiki/branches/JSPWIKI_2_9_STRIPES_BRANCH/src/com/ecyrd/jspwiki/auth/login/AbstractLoginModule.java Sun Nov 30 10:29:52 2008
@@ -30,7 +30,8 @@
import javax.security.auth.login.LoginException;
import javax.security.auth.spi.LoginModule;
-import org.apache.log4j.Logger;
+import com.ecyrd.jspwiki.log.Logger;
+import com.ecyrd.jspwiki.log.LoggerFactory;
import com.ecyrd.jspwiki.auth.WikiPrincipal;
@@ -46,7 +47,7 @@
public abstract class AbstractLoginModule implements LoginModule
{
- private static final Logger log = Logger.getLogger( AbstractLoginModule.class );
+ private static final Logger log = LoggerFactory.getLogger( AbstractLoginModule.class );
protected CallbackHandler m_handler;
Modified: incubator/jspwiki/branches/JSPWIKI_2_9_STRIPES_BRANCH/src/com/ecyrd/jspwiki/auth/login/AnonymousLoginModule.java
URL: http://svn.apache.org/viewvc/incubator/jspwiki/branches/JSPWIKI_2_9_STRIPES_BRANCH/src/com/ecyrd/jspwiki/auth/login/AnonymousLoginModule.java?rev=721869&r1=721868&r2=721869&view=diff
==============================================================================
--- incubator/jspwiki/branches/JSPWIKI_2_9_STRIPES_BRANCH/src/com/ecyrd/jspwiki/auth/login/AnonymousLoginModule.java (original)
+++ incubator/jspwiki/branches/JSPWIKI_2_9_STRIPES_BRANCH/src/com/ecyrd/jspwiki/auth/login/AnonymousLoginModule.java Sun Nov 30 10:29:52 2008
@@ -28,7 +28,8 @@
import javax.servlet.http.HttpServletRequest;
import javax.servlet.http.HttpSession;
-import org.apache.log4j.Logger;
+import com.ecyrd.jspwiki.log.Logger;
+import com.ecyrd.jspwiki.log.LoggerFactory;
import com.ecyrd.jspwiki.auth.WikiPrincipal;
@@ -62,7 +63,7 @@
*/
public static final String PROMPT = "User name";
- protected static final Logger log = Logger.getLogger( AnonymousLoginModule.class );
+ protected static final Logger log = LoggerFactory.getLogger( AnonymousLoginModule.class );
/**
* Logs in the user by calling back to the registered CallbackHandler with an
Modified: incubator/jspwiki/branches/JSPWIKI_2_9_STRIPES_BRANCH/src/com/ecyrd/jspwiki/auth/login/CookieAssertionLoginModule.java
URL: http://svn.apache.org/viewvc/incubator/jspwiki/branches/JSPWIKI_2_9_STRIPES_BRANCH/src/com/ecyrd/jspwiki/auth/login/CookieAssertionLoginModule.java?rev=721869&r1=721868&r2=721869&view=diff
==============================================================================
--- incubator/jspwiki/branches/JSPWIKI_2_9_STRIPES_BRANCH/src/com/ecyrd/jspwiki/auth/login/CookieAssertionLoginModule.java (original)
+++ incubator/jspwiki/branches/JSPWIKI_2_9_STRIPES_BRANCH/src/com/ecyrd/jspwiki/auth/login/CookieAssertionLoginModule.java Sun Nov 30 10:29:52 2008
@@ -31,7 +31,8 @@
import javax.servlet.http.HttpServletResponse;
import javax.servlet.http.HttpSession;
-import org.apache.log4j.Logger;
+import com.ecyrd.jspwiki.log.Logger;
+import com.ecyrd.jspwiki.log.LoggerFactory;
import com.ecyrd.jspwiki.TextUtil;
import com.ecyrd.jspwiki.auth.WikiPrincipal;
@@ -69,7 +70,7 @@
* @deprecated */
public static final String PROMPT = "User name";
- protected static final Logger log = Logger.getLogger( CookieAssertionLoginModule.class );
+ protected static final Logger log = LoggerFactory.getLogger( CookieAssertionLoginModule.class );
/**
* Logs in the user by calling back to the registered CallbackHandler with
Modified: incubator/jspwiki/branches/JSPWIKI_2_9_STRIPES_BRANCH/src/com/ecyrd/jspwiki/auth/login/CookieAuthenticationLoginModule.java
URL: http://svn.apache.org/viewvc/incubator/jspwiki/branches/JSPWIKI_2_9_STRIPES_BRANCH/src/com/ecyrd/jspwiki/auth/login/CookieAuthenticationLoginModule.java?rev=721869&r1=721868&r2=721869&view=diff
==============================================================================
--- incubator/jspwiki/branches/JSPWIKI_2_9_STRIPES_BRANCH/src/com/ecyrd/jspwiki/auth/login/CookieAuthenticationLoginModule.java (original)
+++ incubator/jspwiki/branches/JSPWIKI_2_9_STRIPES_BRANCH/src/com/ecyrd/jspwiki/auth/login/CookieAuthenticationLoginModule.java Sun Nov 30 10:29:52 2008
@@ -30,7 +30,8 @@
import javax.servlet.http.HttpServletRequest;
import javax.servlet.http.HttpServletResponse;
-import org.apache.log4j.Logger;
+import com.ecyrd.jspwiki.log.Logger;
+import com.ecyrd.jspwiki.log.LoggerFactory;
import com.ecyrd.jspwiki.FileUtil;
import com.ecyrd.jspwiki.TextUtil;
@@ -68,7 +69,7 @@
public class CookieAuthenticationLoginModule extends AbstractLoginModule
{
- private static final Logger log = Logger.getLogger( CookieAuthenticationLoginModule.class );
+ private static final Logger log = LoggerFactory.getLogger( CookieAuthenticationLoginModule.class );
private static final String LOGIN_COOKIE_NAME = "JSPWikiUID";
/** The directory name under which the cookies are stored. The value is {@value}. */
Modified: incubator/jspwiki/branches/JSPWIKI_2_9_STRIPES_BRANCH/src/com/ecyrd/jspwiki/auth/login/UserDatabaseLoginModule.java
URL: http://svn.apache.org/viewvc/incubator/jspwiki/branches/JSPWIKI_2_9_STRIPES_BRANCH/src/com/ecyrd/jspwiki/auth/login/UserDatabaseLoginModule.java?rev=721869&r1=721868&r2=721869&view=diff
==============================================================================
--- incubator/jspwiki/branches/JSPWIKI_2_9_STRIPES_BRANCH/src/com/ecyrd/jspwiki/auth/login/UserDatabaseLoginModule.java (original)
+++ incubator/jspwiki/branches/JSPWIKI_2_9_STRIPES_BRANCH/src/com/ecyrd/jspwiki/auth/login/UserDatabaseLoginModule.java Sun Nov 30 10:29:52 2008
@@ -29,7 +29,8 @@
import javax.security.auth.login.FailedLoginException;
import javax.security.auth.login.LoginException;
-import org.apache.log4j.Logger;
+import com.ecyrd.jspwiki.log.Logger;
+import com.ecyrd.jspwiki.log.LoggerFactory;
import com.ecyrd.jspwiki.auth.NoSuchPrincipalException;
import com.ecyrd.jspwiki.auth.WikiPrincipal;
@@ -60,7 +61,7 @@
public class UserDatabaseLoginModule extends AbstractLoginModule
{
- private static final Logger log = Logger.getLogger( UserDatabaseLoginModule.class );
+ private static final Logger log = LoggerFactory.getLogger( UserDatabaseLoginModule.class );
/**
* @see javax.security.auth.spi.LoginModule#login()
Modified: incubator/jspwiki/branches/JSPWIKI_2_9_STRIPES_BRANCH/src/com/ecyrd/jspwiki/auth/login/WebContainerLoginModule.java
URL: http://svn.apache.org/viewvc/incubator/jspwiki/branches/JSPWIKI_2_9_STRIPES_BRANCH/src/com/ecyrd/jspwiki/auth/login/WebContainerLoginModule.java?rev=721869&r1=721868&r2=721869&view=diff
==============================================================================
--- incubator/jspwiki/branches/JSPWIKI_2_9_STRIPES_BRANCH/src/com/ecyrd/jspwiki/auth/login/WebContainerLoginModule.java (original)
+++ incubator/jspwiki/branches/JSPWIKI_2_9_STRIPES_BRANCH/src/com/ecyrd/jspwiki/auth/login/WebContainerLoginModule.java Sun Nov 30 10:29:52 2008
@@ -32,7 +32,8 @@
import javax.servlet.http.HttpServletRequest;
import javax.servlet.http.HttpSession;
-import org.apache.log4j.Logger;
+import com.ecyrd.jspwiki.log.Logger;
+import com.ecyrd.jspwiki.log.LoggerFactory;
import com.ecyrd.jspwiki.auth.Authorizer;
import com.ecyrd.jspwiki.auth.WikiPrincipal;
@@ -70,7 +71,7 @@
public class WebContainerLoginModule extends AbstractLoginModule
{
- protected static final Logger log = Logger.getLogger( WebContainerLoginModule.class );
+ protected static final Logger log = LoggerFactory.getLogger( WebContainerLoginModule.class );
/**
* Logs in the user.
Modified: incubator/jspwiki/branches/JSPWIKI_2_9_STRIPES_BRANCH/src/com/ecyrd/jspwiki/auth/user/AbstractUserDatabase.java
URL: http://svn.apache.org/viewvc/incubator/jspwiki/branches/JSPWIKI_2_9_STRIPES_BRANCH/src/com/ecyrd/jspwiki/auth/user/AbstractUserDatabase.java?rev=721869&r1=721868&r2=721869&view=diff
==============================================================================
--- incubator/jspwiki/branches/JSPWIKI_2_9_STRIPES_BRANCH/src/com/ecyrd/jspwiki/auth/user/AbstractUserDatabase.java (original)
+++ incubator/jspwiki/branches/JSPWIKI_2_9_STRIPES_BRANCH/src/com/ecyrd/jspwiki/auth/user/AbstractUserDatabase.java Sun Nov 30 10:29:52 2008
@@ -27,7 +27,8 @@
import java.util.*;
import org.apache.catalina.util.HexUtils;
-import org.apache.log4j.Logger;
+import com.ecyrd.jspwiki.log.Logger;
+import com.ecyrd.jspwiki.log.LoggerFactory;
import com.ecyrd.jspwiki.NoRequiredPropertyException;
import com.ecyrd.jspwiki.WikiEngine;
@@ -45,7 +46,7 @@
public abstract class AbstractUserDatabase implements UserDatabase
{
- protected static final Logger log = Logger.getLogger( AbstractUserDatabase.class );
+ protected static final Logger log = LoggerFactory.getLogger( AbstractUserDatabase.class );
protected static final String SHA_PREFIX = "{SHA}";
protected static final String SSHA_PREFIX = "{SSHA}";
@@ -264,7 +265,7 @@
}
catch( UnsupportedEncodingException e )
{
- log.fatal( "You do not have UTF-8!?!" );
+ log.error( "You do not have UTF-8!?!" );
}
catch( WikiSecurityException e )
{
@@ -324,7 +325,7 @@
}
catch( UnsupportedEncodingException e )
{
- log.fatal("You do not have UTF-8!?!");
+ log.error("You do not have UTF-8!?!");
}
return hash;
}
@@ -353,7 +354,7 @@
}
catch (UnsupportedEncodingException e)
{
- log.fatal("UTF-8 not supported!?!");
+ log.error("UTF-8 not supported!?!");
}
return hash;
}
Modified: incubator/jspwiki/branches/JSPWIKI_2_9_STRIPES_BRANCH/src/com/ecyrd/jspwiki/auth/user/XMLUserDatabase.java
URL: http://svn.apache.org/viewvc/incubator/jspwiki/branches/JSPWIKI_2_9_STRIPES_BRANCH/src/com/ecyrd/jspwiki/auth/user/XMLUserDatabase.java?rev=721869&r1=721868&r2=721869&view=diff
==============================================================================
--- incubator/jspwiki/branches/JSPWIKI_2_9_STRIPES_BRANCH/src/com/ecyrd/jspwiki/auth/user/XMLUserDatabase.java (original)
+++ incubator/jspwiki/branches/JSPWIKI_2_9_STRIPES_BRANCH/src/com/ecyrd/jspwiki/auth/user/XMLUserDatabase.java Sun Nov 30 10:29:52 2008
@@ -334,7 +334,7 @@
}
catch( ParserConfigurationException e )
{
- log.fatal( "Could not create in-memory DOM" );
+ log.error( "Could not create in-memory DOM" );
}
}
}
@@ -343,7 +343,7 @@
{
if ( c_dom == null )
{
- log.fatal( "User database doesn't exist in memory." );
+ log.error( "User database doesn't exist in memory." );
}
File newFile = new File( c_file.getAbsolutePath() + ".new" );
@@ -450,7 +450,7 @@
{
if ( c_dom == null )
{
- log.fatal( "Could not rename profile '" + loginName + "'; database does not exist" );
+ log.error( "Could not rename profile '" + loginName + "'; database does not exist" );
throw new IllegalStateException( "FATAL: database does not exist" );
}
checkForRefresh();
@@ -504,7 +504,7 @@
{
if ( c_dom == null )
{
- log.fatal( "Could not save profile " + profile + " database does not exist" );
+ log.error( "Could not save profile " + profile + " database does not exist" );
throw new IllegalStateException( "FATAL: database does not exist" );
}
Modified: incubator/jspwiki/branches/JSPWIKI_2_9_STRIPES_BRANCH/src/com/ecyrd/jspwiki/content/PageRenamer.java
URL: http://svn.apache.org/viewvc/incubator/jspwiki/branches/JSPWIKI_2_9_STRIPES_BRANCH/src/com/ecyrd/jspwiki/content/PageRenamer.java?rev=721869&r1=721868&r2=721869&view=diff
==============================================================================
--- incubator/jspwiki/branches/JSPWIKI_2_9_STRIPES_BRANCH/src/com/ecyrd/jspwiki/content/PageRenamer.java (original)
+++ incubator/jspwiki/branches/JSPWIKI_2_9_STRIPES_BRANCH/src/com/ecyrd/jspwiki/content/PageRenamer.java Sun Nov 30 10:29:52 2008
@@ -26,7 +26,8 @@
import java.util.regex.Matcher;
import java.util.regex.Pattern;
-import org.apache.log4j.Logger;
+import com.ecyrd.jspwiki.log.Logger;
+import com.ecyrd.jspwiki.log.LoggerFactory;
import com.ecyrd.jspwiki.*;
import com.ecyrd.jspwiki.attachment.Attachment;
@@ -44,7 +45,7 @@
public class PageRenamer
{
- private static final Logger log = Logger.getLogger( PageRenamer.class );
+ private static final Logger log = LoggerFactory.getLogger( PageRenamer.class );
private boolean m_camelCase = false;
@@ -171,7 +172,6 @@
* @param fromPage The old page
* @param toPage The new page
*/
- @SuppressWarnings("unchecked")
private void updateReferrers( WikiContext context, WikiPage fromPage, WikiPage toPage, Set<String>referrers )
{
WikiEngine engine = context.getEngine();
Modified: incubator/jspwiki/branches/JSPWIKI_2_9_STRIPES_BRANCH/src/com/ecyrd/jspwiki/dav/RawPagesDavProvider.java
URL: http://svn.apache.org/viewvc/incubator/jspwiki/branches/JSPWIKI_2_9_STRIPES_BRANCH/src/com/ecyrd/jspwiki/dav/RawPagesDavProvider.java?rev=721869&r1=721868&r2=721869&view=diff
==============================================================================
--- incubator/jspwiki/branches/JSPWIKI_2_9_STRIPES_BRANCH/src/com/ecyrd/jspwiki/dav/RawPagesDavProvider.java (original)
+++ incubator/jspwiki/branches/JSPWIKI_2_9_STRIPES_BRANCH/src/com/ecyrd/jspwiki/dav/RawPagesDavProvider.java Sun Nov 30 10:29:52 2008
@@ -25,7 +25,8 @@
import java.util.Collections;
import java.util.Iterator;
-import org.apache.log4j.Logger;
+import com.ecyrd.jspwiki.log.Logger;
+import com.ecyrd.jspwiki.log.LoggerFactory;
import com.ecyrd.jspwiki.WikiContext;
import com.ecyrd.jspwiki.WikiEngine;
@@ -45,7 +46,7 @@
*/
public class RawPagesDavProvider extends WikiDavProvider
{
- protected static final Logger log = Logger.getLogger( RawPagesDavProvider.class );
+ protected static final Logger log = LoggerFactory.getLogger( RawPagesDavProvider.class );
private Cache m_davItemCache = new Cache(true,false,false);
Modified: incubator/jspwiki/branches/JSPWIKI_2_9_STRIPES_BRANCH/src/com/ecyrd/jspwiki/dav/WikiDavServlet.java
URL: http://svn.apache.org/viewvc/incubator/jspwiki/branches/JSPWIKI_2_9_STRIPES_BRANCH/src/com/ecyrd/jspwiki/dav/WikiDavServlet.java?rev=721869&r1=721868&r2=721869&view=diff
==============================================================================
--- incubator/jspwiki/branches/JSPWIKI_2_9_STRIPES_BRANCH/src/com/ecyrd/jspwiki/dav/WikiDavServlet.java (original)
+++ incubator/jspwiki/branches/JSPWIKI_2_9_STRIPES_BRANCH/src/com/ecyrd/jspwiki/dav/WikiDavServlet.java Sun Nov 30 10:29:52 2008
@@ -28,7 +28,8 @@
import javax.servlet.http.HttpServletResponse;
import org.apache.commons.lang.time.StopWatch;
-import org.apache.log4j.Logger;
+import com.ecyrd.jspwiki.log.Logger;
+import com.ecyrd.jspwiki.log.LoggerFactory;
import com.ecyrd.jspwiki.WikiEngine;
import com.ecyrd.jspwiki.dav.methods.DavMethod;
@@ -44,7 +45,7 @@
private static final long serialVersionUID = 1L;
private WikiEngine m_engine;
- Logger log = Logger.getLogger(this.getClass().getName());
+ Logger log = LoggerFactory.getLogger(this.getClass().getName());
private DavProvider m_rawProvider;
private DavProvider m_rootProvider;
private DavProvider m_htmlProvider;
Modified: incubator/jspwiki/branches/JSPWIKI_2_9_STRIPES_BRANCH/src/com/ecyrd/jspwiki/dav/methods/PropFindMethod.java
URL: http://svn.apache.org/viewvc/incubator/jspwiki/branches/JSPWIKI_2_9_STRIPES_BRANCH/src/com/ecyrd/jspwiki/dav/methods/PropFindMethod.java?rev=721869&r1=721868&r2=721869&view=diff
==============================================================================
--- incubator/jspwiki/branches/JSPWIKI_2_9_STRIPES_BRANCH/src/com/ecyrd/jspwiki/dav/methods/PropFindMethod.java (original)
+++ incubator/jspwiki/branches/JSPWIKI_2_9_STRIPES_BRANCH/src/com/ecyrd/jspwiki/dav/methods/PropFindMethod.java Sun Nov 30 10:29:52 2008
@@ -30,7 +30,8 @@
import javax.servlet.http.HttpServletRequest;
import javax.servlet.http.HttpServletResponse;
-import org.apache.log4j.Logger;
+import com.ecyrd.jspwiki.log.Logger;
+import com.ecyrd.jspwiki.log.LoggerFactory;
import org.jdom.Document;
import org.jdom.Element;
import org.jdom.JDOMException;
@@ -54,7 +55,7 @@
public class PropFindMethod
extends DavMethod
{
- private static Logger log = Logger.getLogger( PropFindMethod.class );
+ private static Logger log = LoggerFactory.getLogger( PropFindMethod.class );
/**
*
Modified: incubator/jspwiki/branches/JSPWIKI_2_9_STRIPES_BRANCH/src/com/ecyrd/jspwiki/diff/ContextualDiffProvider.java
URL: http://svn.apache.org/viewvc/incubator/jspwiki/branches/JSPWIKI_2_9_STRIPES_BRANCH/src/com/ecyrd/jspwiki/diff/ContextualDiffProvider.java?rev=721869&r1=721868&r2=721869&view=diff
==============================================================================
--- incubator/jspwiki/branches/JSPWIKI_2_9_STRIPES_BRANCH/src/com/ecyrd/jspwiki/diff/ContextualDiffProvider.java (original)
+++ incubator/jspwiki/branches/JSPWIKI_2_9_STRIPES_BRANCH/src/com/ecyrd/jspwiki/diff/ContextualDiffProvider.java Sun Nov 30 10:29:52 2008
@@ -29,7 +29,8 @@
import org.apache.commons.jrcs.diff.*;
import org.apache.commons.jrcs.diff.myers.MyersDiff;
-import org.apache.log4j.Logger;
+import com.ecyrd.jspwiki.log.Logger;
+import com.ecyrd.jspwiki.log.LoggerFactory;
import com.ecyrd.jspwiki.NoRequiredPropertyException;
import com.ecyrd.jspwiki.TextUtil;
@@ -49,7 +50,7 @@
public class ContextualDiffProvider implements DiffProvider
{
- private static final Logger log = Logger.getLogger( ContextualDiffProvider.class );
+ private static final Logger log = LoggerFactory.getLogger( ContextualDiffProvider.class );
/**
* A jspwiki.properties value to define how many characters are shown around the change context.
Modified: incubator/jspwiki/branches/JSPWIKI_2_9_STRIPES_BRANCH/src/com/ecyrd/jspwiki/diff/DifferenceManager.java
URL: http://svn.apache.org/viewvc/incubator/jspwiki/branches/JSPWIKI_2_9_STRIPES_BRANCH/src/com/ecyrd/jspwiki/diff/DifferenceManager.java?rev=721869&r1=721868&r2=721869&view=diff
==============================================================================
--- incubator/jspwiki/branches/JSPWIKI_2_9_STRIPES_BRANCH/src/com/ecyrd/jspwiki/diff/DifferenceManager.java (original)
+++ incubator/jspwiki/branches/JSPWIKI_2_9_STRIPES_BRANCH/src/com/ecyrd/jspwiki/diff/DifferenceManager.java Sun Nov 30 10:29:52 2008
@@ -24,7 +24,8 @@
import java.io.IOException;
import java.util.Properties;
-import org.apache.log4j.Logger;
+import com.ecyrd.jspwiki.log.Logger;
+import com.ecyrd.jspwiki.log.LoggerFactory;
import com.ecyrd.jspwiki.NoRequiredPropertyException;
import com.ecyrd.jspwiki.WikiContext;
@@ -40,7 +41,7 @@
*/
public class DifferenceManager
{
- private static final Logger log = Logger.getLogger(DifferenceManager.class);
+ private static final Logger log = LoggerFactory.getLogger(DifferenceManager.class);
/** Property value for storing a diff provider. Value is {@value}. */
public static final String PROP_DIFF_PROVIDER = "jspwiki.diffProvider";
Modified: incubator/jspwiki/branches/JSPWIKI_2_9_STRIPES_BRANCH/src/com/ecyrd/jspwiki/diff/ExternalDiffProvider.java
URL: http://svn.apache.org/viewvc/incubator/jspwiki/branches/JSPWIKI_2_9_STRIPES_BRANCH/src/com/ecyrd/jspwiki/diff/ExternalDiffProvider.java?rev=721869&r1=721868&r2=721869&view=diff
==============================================================================
--- incubator/jspwiki/branches/JSPWIKI_2_9_STRIPES_BRANCH/src/com/ecyrd/jspwiki/diff/ExternalDiffProvider.java (original)
+++ incubator/jspwiki/branches/JSPWIKI_2_9_STRIPES_BRANCH/src/com/ecyrd/jspwiki/diff/ExternalDiffProvider.java Sun Nov 30 10:29:52 2008
@@ -27,7 +27,8 @@
import java.io.StringReader;
import java.util.Properties;
-import org.apache.log4j.Logger;
+import com.ecyrd.jspwiki.log.Logger;
+import com.ecyrd.jspwiki.log.LoggerFactory;
import com.ecyrd.jspwiki.*;
@@ -37,7 +38,7 @@
*/
public class ExternalDiffProvider implements DiffProvider
{
- private static final Logger log = Logger.getLogger(ExternalDiffProvider.class);
+ private static final Logger log = LoggerFactory.getLogger(ExternalDiffProvider.class);
/**
* Determines the command to be used for 'diff'. This program must be able
Modified: incubator/jspwiki/branches/JSPWIKI_2_9_STRIPES_BRANCH/src/com/ecyrd/jspwiki/diff/TraditionalDiffProvider.java
URL: http://svn.apache.org/viewvc/incubator/jspwiki/branches/JSPWIKI_2_9_STRIPES_BRANCH/src/com/ecyrd/jspwiki/diff/TraditionalDiffProvider.java?rev=721869&r1=721868&r2=721869&view=diff
==============================================================================
--- incubator/jspwiki/branches/JSPWIKI_2_9_STRIPES_BRANCH/src/com/ecyrd/jspwiki/diff/TraditionalDiffProvider.java (original)
+++ incubator/jspwiki/branches/JSPWIKI_2_9_STRIPES_BRANCH/src/com/ecyrd/jspwiki/diff/TraditionalDiffProvider.java Sun Nov 30 10:29:52 2008
@@ -31,7 +31,8 @@
import org.apache.commons.jrcs.diff.*;
import org.apache.commons.jrcs.diff.myers.MyersDiff;
-import org.apache.log4j.Logger;
+import com.ecyrd.jspwiki.log.Logger;
+import com.ecyrd.jspwiki.log.LoggerFactory;
import com.ecyrd.jspwiki.NoRequiredPropertyException;
import com.ecyrd.jspwiki.TextUtil;
@@ -50,7 +51,7 @@
public class TraditionalDiffProvider implements DiffProvider
{
- private static final Logger log = Logger.getLogger(TraditionalDiffProvider.class);
+ private static final Logger log = LoggerFactory.getLogger(TraditionalDiffProvider.class);
private static final String CSS_DIFF_ADDED = "<tr><td class=\"diffadd\">";
private static final String CSS_DIFF_REMOVED = "<tr><td class=\"diffrem\">";
Modified: incubator/jspwiki/branches/JSPWIKI_2_9_STRIPES_BRANCH/src/com/ecyrd/jspwiki/filters/FilterManager.java
URL: http://svn.apache.org/viewvc/incubator/jspwiki/branches/JSPWIKI_2_9_STRIPES_BRANCH/src/com/ecyrd/jspwiki/filters/FilterManager.java?rev=721869&r1=721868&r2=721869&view=diff
==============================================================================
--- incubator/jspwiki/branches/JSPWIKI_2_9_STRIPES_BRANCH/src/com/ecyrd/jspwiki/filters/FilterManager.java (original)
+++ incubator/jspwiki/branches/JSPWIKI_2_9_STRIPES_BRANCH/src/com/ecyrd/jspwiki/filters/FilterManager.java Sun Nov 30 10:29:52 2008
@@ -24,12 +24,12 @@
import java.io.FileInputStream;
import java.io.IOException;
import java.io.InputStream;
-import java.net.URL;
import java.util.*;
import net.sourceforge.stripes.util.ResolverUtil;
-import org.apache.log4j.Logger;
+import com.ecyrd.jspwiki.log.Logger;
+import com.ecyrd.jspwiki.log.LoggerFactory;
import org.jdom.Document;
import org.jdom.Element;
import org.jdom.JDOMException;
@@ -43,8 +43,6 @@
import com.ecyrd.jspwiki.event.WikiPageEvent;
import com.ecyrd.jspwiki.modules.ModuleManager;
import com.ecyrd.jspwiki.modules.WikiModuleInfo;
-import com.ecyrd.jspwiki.plugin.WikiPlugin;
-import com.ecyrd.jspwiki.plugin.PluginManager.WikiPluginInfo;
import com.ecyrd.jspwiki.util.ClassUtil;
import com.ecyrd.jspwiki.util.PriorityList;
@@ -101,7 +99,7 @@
private HashMap<String, PageFilterInfo> m_filterClassMap = new HashMap<String,PageFilterInfo>();
- private static final Logger log = Logger.getLogger(WikiEngine.class);
+ private static final Logger log = LoggerFactory.getLogger(WikiEngine.class);
/** Property name for setting the filter XML property file. Value is <tt>{@value}</tt>. */
public static final String PROP_FILTERXML = "jspwiki.filterConfig";
Modified: incubator/jspwiki/branches/JSPWIKI_2_9_STRIPES_BRANCH/src/com/ecyrd/jspwiki/filters/PingWeblogsComFilter.java
URL: http://svn.apache.org/viewvc/incubator/jspwiki/branches/JSPWIKI_2_9_STRIPES_BRANCH/src/com/ecyrd/jspwiki/filters/PingWeblogsComFilter.java?rev=721869&r1=721868&r2=721869&view=diff
==============================================================================
--- incubator/jspwiki/branches/JSPWIKI_2_9_STRIPES_BRANCH/src/com/ecyrd/jspwiki/filters/PingWeblogsComFilter.java (original)
+++ incubator/jspwiki/branches/JSPWIKI_2_9_STRIPES_BRANCH/src/com/ecyrd/jspwiki/filters/PingWeblogsComFilter.java Sun Nov 30 10:29:52 2008
@@ -26,7 +26,8 @@
import java.net.URL;
import java.net.MalformedURLException;
import java.util.*;
-import org.apache.log4j.Logger;
+import com.ecyrd.jspwiki.log.Logger;
+import com.ecyrd.jspwiki.log.LoggerFactory;
/**
* A very dumb class that pings weblogs.com on each save. INTERNAL USE ONLY SO FAR!
@@ -39,7 +40,7 @@
public class PingWeblogsComFilter
extends BasicPageFilter
{
- static Logger log = Logger.getLogger( PingWeblogsComFilter.class );
+ static Logger log = LoggerFactory.getLogger( PingWeblogsComFilter.class );
private String m_pingURL;
Modified: incubator/jspwiki/branches/JSPWIKI_2_9_STRIPES_BRANCH/src/com/ecyrd/jspwiki/filters/ProfanityFilter.java
URL: http://svn.apache.org/viewvc/incubator/jspwiki/branches/JSPWIKI_2_9_STRIPES_BRANCH/src/com/ecyrd/jspwiki/filters/ProfanityFilter.java?rev=721869&r1=721868&r2=721869&view=diff
==============================================================================
--- incubator/jspwiki/branches/JSPWIKI_2_9_STRIPES_BRANCH/src/com/ecyrd/jspwiki/filters/ProfanityFilter.java (original)
+++ incubator/jspwiki/branches/JSPWIKI_2_9_STRIPES_BRANCH/src/com/ecyrd/jspwiki/filters/ProfanityFilter.java Sun Nov 30 10:29:52 2008
@@ -27,7 +27,8 @@
import java.util.ArrayList;
import java.util.List;
-import org.apache.log4j.Logger;
+import com.ecyrd.jspwiki.log.Logger;
+import com.ecyrd.jspwiki.log.LoggerFactory;
import com.ecyrd.jspwiki.TextUtil;
import com.ecyrd.jspwiki.WikiContext;
@@ -42,7 +43,7 @@
@Deprecated
public class ProfanityFilter extends BasicPageFilter
{
- private static Logger log = Logger.getLogger(ProfanityFilter.class);
+ private static Logger log = LoggerFactory.getLogger(ProfanityFilter.class);
private static final String PROPERTYFILE = "com/ecyrd/jspwiki/filters/profanity.properties";
private static String[] c_profanities = new String[0];
Modified: incubator/jspwiki/branches/JSPWIKI_2_9_STRIPES_BRANCH/src/com/ecyrd/jspwiki/filters/SpamFilter.java
URL: http://svn.apache.org/viewvc/incubator/jspwiki/branches/JSPWIKI_2_9_STRIPES_BRANCH/src/com/ecyrd/jspwiki/filters/SpamFilter.java?rev=721869&r1=721868&r2=721869&view=diff
==============================================================================
--- incubator/jspwiki/branches/JSPWIKI_2_9_STRIPES_BRANCH/src/com/ecyrd/jspwiki/filters/SpamFilter.java (original)
+++ incubator/jspwiki/branches/JSPWIKI_2_9_STRIPES_BRANCH/src/com/ecyrd/jspwiki/filters/SpamFilter.java Sun Nov 30 10:29:52 2008
@@ -33,7 +33,8 @@
import org.apache.commons.jrcs.diff.myers.MyersDiff;
import org.apache.commons.lang.time.StopWatch;
import org.apache.jspwiki.api.ModuleData;
-import org.apache.log4j.Logger;
+import com.ecyrd.jspwiki.log.Logger;
+import com.ecyrd.jspwiki.log.LoggerFactory;
import org.apache.oro.text.regex.*;
import com.ecyrd.jspwiki.*;
@@ -147,8 +148,8 @@
private Date m_lastRebuild = new Date( 0L );
- private static Logger c_spamlog = Logger.getLogger( "SpamLog" );
- private static Logger log = Logger.getLogger( SpamFilter.class );
+ private static Logger c_spamlog = LoggerFactory.getLogger( "SpamLog" );
+ private static Logger log = LoggerFactory.getLogger( SpamFilter.class );
private Vector<Host> m_temporaryBanList = new Vector<Host>();
@@ -241,7 +242,7 @@
}
catch( MalformedPatternException e )
{
- log.fatal("Internal error: Someone put in a faulty pattern.",e);
+ log.error("Internal error: Someone put in a faulty pattern.",e);
throw new InternalWikiException("Faulty pattern.");
}
Modified: incubator/jspwiki/branches/JSPWIKI_2_9_STRIPES_BRANCH/src/com/ecyrd/jspwiki/modules/ModuleManager.java
URL: http://svn.apache.org/viewvc/incubator/jspwiki/branches/JSPWIKI_2_9_STRIPES_BRANCH/src/com/ecyrd/jspwiki/modules/ModuleManager.java?rev=721869&r1=721868&r2=721869&view=diff
==============================================================================
--- incubator/jspwiki/branches/JSPWIKI_2_9_STRIPES_BRANCH/src/com/ecyrd/jspwiki/modules/ModuleManager.java (original)
+++ incubator/jspwiki/branches/JSPWIKI_2_9_STRIPES_BRANCH/src/com/ecyrd/jspwiki/modules/ModuleManager.java Sun Nov 30 10:29:52 2008
@@ -23,7 +23,8 @@
import java.net.URL;
import java.util.*;
-import org.apache.log4j.Logger;
+import com.ecyrd.jspwiki.log.Logger;
+import com.ecyrd.jspwiki.log.LoggerFactory;
import org.jdom.Attribute;
import org.jdom.Document;
import org.jdom.JDOMException;
@@ -52,7 +53,7 @@
protected WikiEngine m_engine;
- private static Logger log = Logger.getLogger( ModuleManager.class );
+ private static Logger log = LoggerFactory.getLogger( ModuleManager.class );
private boolean m_loadIncompatibleModules = false;
Modified: incubator/jspwiki/branches/JSPWIKI_2_9_STRIPES_BRANCH/src/com/ecyrd/jspwiki/plugin/AbstractReferralPlugin.java
URL: http://svn.apache.org/viewvc/incubator/jspwiki/branches/JSPWIKI_2_9_STRIPES_BRANCH/src/com/ecyrd/jspwiki/plugin/AbstractReferralPlugin.java?rev=721869&r1=721868&r2=721869&view=diff
==============================================================================
--- incubator/jspwiki/branches/JSPWIKI_2_9_STRIPES_BRANCH/src/com/ecyrd/jspwiki/plugin/AbstractReferralPlugin.java (original)
+++ incubator/jspwiki/branches/JSPWIKI_2_9_STRIPES_BRANCH/src/com/ecyrd/jspwiki/plugin/AbstractReferralPlugin.java Sun Nov 30 10:29:52 2008
@@ -25,7 +25,8 @@
import java.util.*;
import org.apache.commons.lang.StringUtils;
-import org.apache.log4j.Logger;
+import com.ecyrd.jspwiki.log.Logger;
+import com.ecyrd.jspwiki.log.LoggerFactory;
import org.apache.oro.text.GlobCompiler;
import org.apache.oro.text.regex.*;
@@ -56,7 +57,7 @@
public abstract class AbstractReferralPlugin
implements WikiPlugin
{
- private static Logger log = Logger.getLogger( AbstractReferralPlugin.class );
+ private static Logger log = LoggerFactory.getLogger( AbstractReferralPlugin.class );
/** Magic value for rendering all items. */
public static final int ALL_ITEMS = -1;
Modified: incubator/jspwiki/branches/JSPWIKI_2_9_STRIPES_BRANCH/src/com/ecyrd/jspwiki/plugin/BugReportHandler.java
URL: http://svn.apache.org/viewvc/incubator/jspwiki/branches/JSPWIKI_2_9_STRIPES_BRANCH/src/com/ecyrd/jspwiki/plugin/BugReportHandler.java?rev=721869&r1=721868&r2=721869&view=diff
==============================================================================
--- incubator/jspwiki/branches/JSPWIKI_2_9_STRIPES_BRANCH/src/com/ecyrd/jspwiki/plugin/BugReportHandler.java (original)
+++ incubator/jspwiki/branches/JSPWIKI_2_9_STRIPES_BRANCH/src/com/ecyrd/jspwiki/plugin/BugReportHandler.java Sun Nov 30 10:29:52 2008
@@ -27,7 +27,8 @@
import java.text.SimpleDateFormat;
import java.util.*;
-import org.apache.log4j.Logger;
+import com.ecyrd.jspwiki.log.Logger;
+import com.ecyrd.jspwiki.log.LoggerFactory;
import com.ecyrd.jspwiki.WikiContext;
import com.ecyrd.jspwiki.WikiEngine;
@@ -52,7 +53,7 @@
public class BugReportHandler
implements WikiPlugin
{
- private static Logger log = Logger.getLogger( BugReportHandler.class );
+ private static Logger log = LoggerFactory.getLogger( BugReportHandler.class );
/** Parameter name for setting the title. Value is <tt>{@value}</tt>. */
public static final String PARAM_TITLE = "title";
Modified: incubator/jspwiki/branches/JSPWIKI_2_9_STRIPES_BRANCH/src/com/ecyrd/jspwiki/plugin/Counter.java
URL: http://svn.apache.org/viewvc/incubator/jspwiki/branches/JSPWIKI_2_9_STRIPES_BRANCH/src/com/ecyrd/jspwiki/plugin/Counter.java?rev=721869&r1=721868&r2=721869&view=diff
==============================================================================
--- incubator/jspwiki/branches/JSPWIKI_2_9_STRIPES_BRANCH/src/com/ecyrd/jspwiki/plugin/Counter.java (original)
+++ incubator/jspwiki/branches/JSPWIKI_2_9_STRIPES_BRANCH/src/com/ecyrd/jspwiki/plugin/Counter.java Sun Nov 30 10:29:52 2008
@@ -40,7 +40,7 @@
public class Counter
implements WikiPlugin
{
- // private static Logger log = Logger.getLogger( Counter.class );
+ // private static Logger log = LoggerFactory.getLogger( Counter.class );
/** Parameter name for setting the name. Value is <tt>{@value}</tt>. */
public static final String PARAM_NAME = "name";
Modified: incubator/jspwiki/branches/JSPWIKI_2_9_STRIPES_BRANCH/src/com/ecyrd/jspwiki/plugin/CurrentTimePlugin.java
URL: http://svn.apache.org/viewvc/incubator/jspwiki/branches/JSPWIKI_2_9_STRIPES_BRANCH/src/com/ecyrd/jspwiki/plugin/CurrentTimePlugin.java?rev=721869&r1=721868&r2=721869&view=diff
==============================================================================
--- incubator/jspwiki/branches/JSPWIKI_2_9_STRIPES_BRANCH/src/com/ecyrd/jspwiki/plugin/CurrentTimePlugin.java (original)
+++ incubator/jspwiki/branches/JSPWIKI_2_9_STRIPES_BRANCH/src/com/ecyrd/jspwiki/plugin/CurrentTimePlugin.java Sun Nov 30 10:29:52 2008
@@ -41,7 +41,7 @@
public class CurrentTimePlugin
implements WikiPlugin
{
- // private static Logger log = Logger.getLogger( CurrentTimePlugin.class );
+ // private static Logger log = LoggerFactory.getLogger( CurrentTimePlugin.class );
/**
* {@inheritDoc}
Modified: incubator/jspwiki/branches/JSPWIKI_2_9_STRIPES_BRANCH/src/com/ecyrd/jspwiki/plugin/Denounce.java
URL: http://svn.apache.org/viewvc/incubator/jspwiki/branches/JSPWIKI_2_9_STRIPES_BRANCH/src/com/ecyrd/jspwiki/plugin/Denounce.java?rev=721869&r1=721868&r2=721869&view=diff
==============================================================================
--- incubator/jspwiki/branches/JSPWIKI_2_9_STRIPES_BRANCH/src/com/ecyrd/jspwiki/plugin/Denounce.java (original)
+++ incubator/jspwiki/branches/JSPWIKI_2_9_STRIPES_BRANCH/src/com/ecyrd/jspwiki/plugin/Denounce.java Sun Nov 30 10:29:52 2008
@@ -23,7 +23,8 @@
package com.ecyrd.jspwiki.plugin;
import com.ecyrd.jspwiki.*;
-import org.apache.log4j.Logger;
+import com.ecyrd.jspwiki.log.Logger;
+import com.ecyrd.jspwiki.log.LoggerFactory;
import org.apache.oro.text.*;
import org.apache.oro.text.regex.*;
@@ -47,7 +48,7 @@
*/
public class Denounce implements WikiPlugin
{
- private static Logger log = Logger.getLogger(Denounce.class);
+ private static Logger log = LoggerFactory.getLogger(Denounce.class);
/** Parameter name for setting the link. Value is <tt>{@value}</tt>. */
public static final String PARAM_LINK = "link";
Modified: incubator/jspwiki/branches/JSPWIKI_2_9_STRIPES_BRANCH/src/com/ecyrd/jspwiki/plugin/IndexPlugin.java
URL: http://svn.apache.org/viewvc/incubator/jspwiki/branches/JSPWIKI_2_9_STRIPES_BRANCH/src/com/ecyrd/jspwiki/plugin/IndexPlugin.java?rev=721869&r1=721868&r2=721869&view=diff
==============================================================================
--- incubator/jspwiki/branches/JSPWIKI_2_9_STRIPES_BRANCH/src/com/ecyrd/jspwiki/plugin/IndexPlugin.java (original)
+++ incubator/jspwiki/branches/JSPWIKI_2_9_STRIPES_BRANCH/src/com/ecyrd/jspwiki/plugin/IndexPlugin.java Sun Nov 30 10:29:52 2008
@@ -26,7 +26,8 @@
import org.apache.ecs.Element;
import org.apache.ecs.xhtml.div;
import org.apache.ecs.xhtml.span;
-import org.apache.log4j.Logger;
+import com.ecyrd.jspwiki.log.Logger;
+import com.ecyrd.jspwiki.log.LoggerFactory;
import com.ecyrd.jspwiki.WikiContext;
import com.ecyrd.jspwiki.providers.ProviderException;
@@ -44,7 +45,7 @@
*/
public class IndexPlugin extends AbstractReferralPlugin implements WikiPlugin
{
- private static Logger log = Logger.getLogger( IndexPlugin.class );
+ private static Logger log = LoggerFactory.getLogger( IndexPlugin.class );
/**
* {@inheritDoc}
Modified: incubator/jspwiki/branches/JSPWIKI_2_9_STRIPES_BRANCH/src/com/ecyrd/jspwiki/plugin/PluginManager.java
URL: http://svn.apache.org/viewvc/incubator/jspwiki/branches/JSPWIKI_2_9_STRIPES_BRANCH/src/com/ecyrd/jspwiki/plugin/PluginManager.java?rev=721869&r1=721868&r2=721869&view=diff
==============================================================================
--- incubator/jspwiki/branches/JSPWIKI_2_9_STRIPES_BRANCH/src/com/ecyrd/jspwiki/plugin/PluginManager.java (original)
+++ incubator/jspwiki/branches/JSPWIKI_2_9_STRIPES_BRANCH/src/com/ecyrd/jspwiki/plugin/PluginManager.java Sun Nov 30 10:29:52 2008
@@ -21,6 +21,7 @@
package com.ecyrd.jspwiki.plugin;
import java.io.*;
+import java.lang.reflect.Modifier;
import java.text.MessageFormat;
import java.util.*;
@@ -29,9 +30,9 @@
import org.apache.commons.lang.ClassUtils;
import org.apache.ecs.xhtml.*;
import org.apache.jspwiki.api.ModuleData;
-import org.apache.log4j.Logger;
+import com.ecyrd.jspwiki.log.Logger;
+import com.ecyrd.jspwiki.log.LoggerFactory;
import org.apache.oro.text.regex.*;
-import org.jdom.Element;
import com.ecyrd.jspwiki.*;
import com.ecyrd.jspwiki.modules.ModuleManager;
@@ -140,7 +141,7 @@
{
private static final String PLUGIN_INSERT_PATTERN = "\\{?(INSERT)?\\s*([\\w\\._]+)[ \\t]*(WHERE)?[ \\t]*";
- private static Logger log = Logger.getLogger( PluginManager.class );
+ private static Logger log = LoggerFactory.getLogger( PluginManager.class );
/**
* This is the default package to try in case the instantiation
@@ -212,7 +213,7 @@
}
catch( MalformedPatternException e )
{
- log.fatal("Internal error: someone messed with pluginmanager patterns.", e );
+ log.error("Internal error: someone messed with pluginmanager patterns.", e );
throw new InternalWikiException( "PluginManager patterns are broken" );
}
@@ -666,7 +667,7 @@
name = pluginClass.getName();
if(name != null)
{
- log.debug("Registering plugin [name]: " + name);
+ log.debug("Registering plugin [name]: %s", name);
m_pluginClassMap.put(name, pluginClass);
}
@@ -676,7 +677,7 @@
{
for( String a : aliases )
{
- log.debug("Registering plugin [shortName]: " + a);
+ log.debug("Registering plugin [shortName]: %s", a);
m_pluginClassMap.put(a, pluginClass);
}
}
@@ -685,7 +686,7 @@
name = pluginClass.getClassName();
if(name != null)
{
- log.debug("Registering plugin [className]: " + name);
+ log.debug("Registering plugin [className]: %s", name);
m_pluginClassMap.put(name, pluginClass);
}
@@ -707,16 +708,21 @@
Set<Class<? extends WikiPlugin>> resultSet = resolver.getClasses();
- log.debug( "Found "+resultSet.size()+" plugins" );
+ log.debug( "Found %d plugins", resultSet.size() );
for( Class<? extends WikiPlugin> clazz : resultSet )
{
- WikiPluginInfo pluginInfo = WikiPluginInfo.newInstance( clazz );
-
- if( pluginInfo != null )
+ if( !clazz.isInterface() & !Modifier.isAbstract( clazz.getModifiers() ) )
{
- registerPlugin( pluginInfo );
- }
+ WikiPluginInfo pluginInfo = WikiPluginInfo.newInstance( clazz );
+
+ if( pluginInfo != null )
+ {
+ registerPlugin( pluginInfo );
+ }
+ } else {
+ log.debug( "Plugin class " + clazz.getName() +" not registered, it is either an interface or it is abstract");
+ }
}
}
@@ -902,7 +908,7 @@
}
catch( Exception e )
{
- log.info( "Cannot initialize plugin "+m_clazz.getCanonicalName(), e );
+ log.info( "Cannot initialize plugin '%s'", e, m_clazz.getCanonicalName() );
}
}
}
Modified: incubator/jspwiki/branches/JSPWIKI_2_9_STRIPES_BRANCH/src/com/ecyrd/jspwiki/plugin/RecentChangesPlugin.java
URL: http://svn.apache.org/viewvc/incubator/jspwiki/branches/JSPWIKI_2_9_STRIPES_BRANCH/src/com/ecyrd/jspwiki/plugin/RecentChangesPlugin.java?rev=721869&r1=721868&r2=721869&view=diff
==============================================================================
--- incubator/jspwiki/branches/JSPWIKI_2_9_STRIPES_BRANCH/src/com/ecyrd/jspwiki/plugin/RecentChangesPlugin.java (original)
+++ incubator/jspwiki/branches/JSPWIKI_2_9_STRIPES_BRANCH/src/com/ecyrd/jspwiki/plugin/RecentChangesPlugin.java Sun Nov 30 10:29:52 2008
@@ -25,7 +25,8 @@
import java.util.*;
import org.apache.ecs.xhtml.*;
-import org.apache.log4j.Logger;
+import com.ecyrd.jspwiki.log.Logger;
+import com.ecyrd.jspwiki.log.LoggerFactory;
import com.ecyrd.jspwiki.TextUtil;
import com.ecyrd.jspwiki.WikiContext;
@@ -63,8 +64,7 @@
public static final String DEFAULT_TIME_FORMAT ="HH:mm:ss";
public static final String DEFAULT_DATE_FORMAT ="dd.MM.yyyy";
- private static Logger log = Logger.getLogger( RecentChangesPlugin.class );
-
+ private static Logger log = LoggerFactory.getLogger( RecentChangesPlugin.class );
private boolean isSameDay( Date a, Date b )
{
Calendar aa = Calendar.getInstance(); aa.setTime(a);
Modified: incubator/jspwiki/branches/JSPWIKI_2_9_STRIPES_BRANCH/src/com/ecyrd/jspwiki/plugin/ReferredPagesPlugin.java
URL: http://svn.apache.org/viewvc/incubator/jspwiki/branches/JSPWIKI_2_9_STRIPES_BRANCH/src/com/ecyrd/jspwiki/plugin/ReferredPagesPlugin.java?rev=721869&r1=721868&r2=721869&view=diff
==============================================================================
--- incubator/jspwiki/branches/JSPWIKI_2_9_STRIPES_BRANCH/src/com/ecyrd/jspwiki/plugin/ReferredPagesPlugin.java (original)
+++ incubator/jspwiki/branches/JSPWIKI_2_9_STRIPES_BRANCH/src/com/ecyrd/jspwiki/plugin/ReferredPagesPlugin.java Sun Nov 30 10:29:52 2008
@@ -22,7 +22,8 @@
import java.util.*;
-import org.apache.log4j.Logger;
+import com.ecyrd.jspwiki.log.Logger;
+import com.ecyrd.jspwiki.log.LoggerFactory;
import org.apache.oro.text.regex.*;
import com.ecyrd.jspwiki.*;
@@ -45,7 +46,7 @@
*/
public class ReferredPagesPlugin implements WikiPlugin
{
- private static Logger log = Logger.getLogger( ReferredPagesPlugin.class );
+ private static Logger log = LoggerFactory.getLogger( ReferredPagesPlugin.class );
private WikiEngine m_engine;
private int m_depth;
private HashSet<String> m_exists = new HashSet<String>();