Author: metskem
Date: Sun Apr 5 15:26:15 2009
New Revision: 762104
URL: http://svn.apache.org/viewvc?rev=762104&view=rev
Log:
repairing some "collateral damage" :-)
Modified:
incubator/jspwiki/trunk/src/java/org/apache/wiki/WikiEngine.java
incubator/jspwiki/trunk/src/java/org/apache/wiki/action/UserPreferencesActionBean.java
incubator/jspwiki/trunk/src/java/org/apache/wiki/action/ViewActionBean.java
Modified: incubator/jspwiki/trunk/src/java/org/apache/wiki/WikiEngine.java
URL:
http://svn.apache.org/viewvc/incubator/jspwiki/trunk/src/java/org/apache/wiki/WikiEngine.java?rev=762104&r1=762103&r2=762104&view=diff
==============================================================================
--- incubator/jspwiki/trunk/src/java/org/apache/wiki/WikiEngine.java (original)
+++ incubator/jspwiki/trunk/src/java/org/apache/wiki/WikiEngine.java Sun Apr 5
15:26:15 2009
@@ -1116,7 +1116,7 @@
* <p>If the page is a special page, then returns a direct URL
* to that page. Otherwise returns <code>null</code>.
* This method delegates requests to
- * {...@link org.apache.wiki.action.WikiContextFactory#getSpecialPageURI}.
+ * {...@link
org.apache.wiki.content.SpecialPageNameResolver#getSpecialPageURI}.
* </p>
* <p>
* Special pages are defined in jspwiki.properties using the
jspwiki.specialPage
Modified:
incubator/jspwiki/trunk/src/java/org/apache/wiki/action/UserPreferencesActionBean.java
URL:
http://svn.apache.org/viewvc/incubator/jspwiki/trunk/src/java/org/apache/wiki/action/UserPreferencesActionBean.java?rev=762104&r1=762103&r2=762104&view=diff
==============================================================================
---
incubator/jspwiki/trunk/src/java/org/apache/wiki/action/UserPreferencesActionBean.java
(original)
+++
incubator/jspwiki/trunk/src/java/org/apache/wiki/action/UserPreferencesActionBean.java
Sun Apr 5 15:26:15 2009
@@ -51,7 +51,7 @@
@UrlBinding( "/UserPreferences.action" )
public class UserPreferencesActionBean extends AbstractActionBean
{
- private Logger log = LoggerFactory.getLogger( "JSPWiki" );
+ private static final Logger log = LoggerFactory.getLogger( "JSPWiki" );
private String m_assertedName = null;
Modified:
incubator/jspwiki/trunk/src/java/org/apache/wiki/action/ViewActionBean.java
URL:
http://svn.apache.org/viewvc/incubator/jspwiki/trunk/src/java/org/apache/wiki/action/ViewActionBean.java?rev=762104&r1=762103&r2=762104&view=diff
==============================================================================
--- incubator/jspwiki/trunk/src/java/org/apache/wiki/action/ViewActionBean.java
(original)
+++ incubator/jspwiki/trunk/src/java/org/apache/wiki/action/ViewActionBean.java
Sun Apr 5 15:26:15 2009
@@ -49,7 +49,7 @@
@UrlBinding( "/Wiki.action" )
public class ViewActionBean extends AbstractPageActionBean
{
- private Logger log = LoggerFactory.getLogger( ViewActionBean.class );
+ private static final Logger log = LoggerFactory.getLogger(
ViewActionBean.class );
private String m_renameTo = null;
@@ -112,7 +112,7 @@
* special page names from <code>jspwiki.properties</code>, and possible
* aliases. To determine whether the page is a special page, this method
* calls
- * {...@link
org.apache.wiki.action.WikiContextFactory#getSpecialPageURI(String)}.
+ * {...@link
org.apache.wiki.content.SpecialPageNameResolver#getSpecialPageURI(String)}.
*
* @return a {...@link net.sourceforge.stripes.action.RedirectResolution}
to
* the special page's real URL, if a special page was specified, or