Author: metskem
Date: Sun Aug 16 13:23:38 2009
New Revision: 804691
URL: http://svn.apache.org/viewvc?rev=804691&view=rev
Log:
3.0.0-svn-141 got rid of a bunch of Javadoc and compile warnings, and added an
extra error(String, Throwable) method to the Logger interface.
Modified:
incubator/jspwiki/trunk/ChangeLog
incubator/jspwiki/trunk/src/java/org/apache/wiki/Release.java
incubator/jspwiki/trunk/src/java/org/apache/wiki/WikiEngine.java
incubator/jspwiki/trunk/src/java/org/apache/wiki/attachment/AttachmentServlet.java
incubator/jspwiki/trunk/src/java/org/apache/wiki/auth/AuthenticationManager.java
incubator/jspwiki/trunk/src/java/org/apache/wiki/content/ContentManager.java
incubator/jspwiki/trunk/src/java/org/apache/wiki/content/ReferenceManager.java
incubator/jspwiki/trunk/src/java/org/apache/wiki/content/jcr/JCRWikiPage.java
incubator/jspwiki/trunk/src/java/org/apache/wiki/filters/SpamFilter.java
incubator/jspwiki/trunk/src/java/org/apache/wiki/log/Logger.java
incubator/jspwiki/trunk/src/java/org/apache/wiki/log/LoggerImpl.java
incubator/jspwiki/trunk/src/java/org/apache/wiki/parser/PluginContent.java
incubator/jspwiki/trunk/src/java/org/apache/wiki/plugin/Denounce.java
incubator/jspwiki/trunk/src/java/org/apache/wiki/plugin/PluginManager.java
incubator/jspwiki/trunk/src/java/org/apache/wiki/plugin/ReferredPagesPlugin.java
incubator/jspwiki/trunk/src/java/org/apache/wiki/render/RenderingManager.java
incubator/jspwiki/trunk/src/java/org/apache/wiki/rss/RSSGenerator.java
incubator/jspwiki/trunk/src/java/org/apache/wiki/ui/TemplateManager.java
incubator/jspwiki/trunk/src/java/org/apache/wiki/util/WatchDog.java
incubator/jspwiki/trunk/src/java/org/apache/wiki/xmlrpc/MetaWeblogHandler.java
incubator/jspwiki/trunk/tests/java/org/apache/wiki/Util.java
incubator/jspwiki/trunk/tests/java/org/apache/wiki/WikiEngineTest.java
incubator/jspwiki/trunk/tests/java/org/apache/wiki/content/AllTests.java
incubator/jspwiki/trunk/tests/java/org/apache/wiki/content/ReferenceManagerTest.java
incubator/jspwiki/trunk/tests/java/org/apache/wiki/search/SearchManagerTest.java
Modified: incubator/jspwiki/trunk/ChangeLog
URL:
http://svn.apache.org/viewvc/incubator/jspwiki/trunk/ChangeLog?rev=804691&r1=804690&r2=804691&view=diff
==============================================================================
--- incubator/jspwiki/trunk/ChangeLog (original)
+++ incubator/jspwiki/trunk/ChangeLog Sun Aug 16 13:23:38 2009
@@ -1,3 +1,16 @@
+2009-08-16 Harry Metske <[email protected]>
+
+ * 3.0.0-svn-141
+
+ * got rid of a bunch of Javadoc and compile warnings
+
+ * added an extra error(String, Throwable) method to the Logger
interface.
+ When we switched to the varargs interfaces we lost the (log4j)
+ option to automagically dump the stacktrace with the exception.
+ WikiEngine's initialize method now uses this new method, so we
+ can better diagnose problems with new features and things like
+ JackRabbit.
+
2009-08-15 Andrew Jaquith <ajaquith AT apache DOT org>
* 3.0.0-svn-140
Modified: incubator/jspwiki/trunk/src/java/org/apache/wiki/Release.java
URL:
http://svn.apache.org/viewvc/incubator/jspwiki/trunk/src/java/org/apache/wiki/Release.java?rev=804691&r1=804690&r2=804691&view=diff
==============================================================================
--- incubator/jspwiki/trunk/src/java/org/apache/wiki/Release.java (original)
+++ incubator/jspwiki/trunk/src/java/org/apache/wiki/Release.java Sun Aug 16
13:23:38 2009
@@ -77,7 +77,7 @@
* <p>
* If the build identifier is empty, it is not added.
*/
- public static final String BUILD = "140";
+ public static final String BUILD = "141";
/**
* This is the generic version string you should use
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=804691&r1=804690&r2=804691&view=diff
==============================================================================
--- incubator/jspwiki/trunk/src/java/org/apache/wiki/WikiEngine.java (original)
+++ incubator/jspwiki/trunk/src/java/org/apache/wiki/WikiEngine.java Sun Aug 16
13:23:38 2009
@@ -67,7 +67,6 @@
import org.apache.wiki.parser.WikiDocument;
import org.apache.wiki.plugin.PluginManager;
import org.apache.wiki.providers.ProviderException;
-import org.apache.wiki.providers.WikiPageProvider;
import org.apache.wiki.render.RenderingManager;
import org.apache.wiki.rss.RSSGenerator;
import org.apache.wiki.rss.RSSThread;
@@ -621,34 +620,35 @@
m_searchManager = (SearchManager)
ClassUtil.getMappedObject(SearchManager.class.getName() );
m_searchManager.initialize( this, props );
+
}
catch( RuntimeException e )
{
// RuntimeExceptions may occur here, even if they shouldn't.
- log.error( "%1$s %2$s", "Failed to start managers.", e );
+ log.error( "Failed to start managers, stacktrace follows: ", e );
throw new WikiException( "Failed to start managers:
"+e.getMessage(), e );
}
catch (ClassNotFoundException e)
{
- log.error( "%1$s %2$s", "JSPWiki could not start, URLConstructor
was not found: ", e );
+ log.error( "JSPWiki could not start, URLConstructor was not found,
stacktrace follows: ", e );
throw new WikiException( e.getMessage(), e );
}
catch (InstantiationException e)
{
- log.error( "%1$s %2$s", "JSPWiki could not start, URLConstructor
could not be instantiated: ", e );
+ log.error( "JSPWiki could not start, URLConstructor could not be
instantiated, stacktrace follows: ", e );
throw new WikiException( e.getMessage(), e );
}
catch (IllegalAccessException e)
{
- log.error( "%1$s %2$s", "JSPWiki could not start, URLConstructor
cannot be accessed: ", e );
+ log.error( "JSPWiki could not start, URLConstructor cannot be
accessed, stacktrace follows: ", e );
throw new WikiException( e.getMessage(), e );
}
catch( Exception e )
{
// Final catch-all for everything
- log.error( "%1$s %2$s", "JSPWiki could not start, due to an
unknown exception when starting.", e );
+ log.error( "JSPWiki could not start, due to an unknown exception
while starting, stacktrace follows: ", e );
throw new WikiException( "Failed to start; please check log files
for better information.", e );
}
Modified:
incubator/jspwiki/trunk/src/java/org/apache/wiki/attachment/AttachmentServlet.java
URL:
http://svn.apache.org/viewvc/incubator/jspwiki/trunk/src/java/org/apache/wiki/attachment/AttachmentServlet.java?rev=804691&r1=804690&r2=804691&view=diff
==============================================================================
---
incubator/jspwiki/trunk/src/java/org/apache/wiki/attachment/AttachmentServlet.java
(original)
+++
incubator/jspwiki/trunk/src/java/org/apache/wiki/attachment/AttachmentServlet.java
Sun Aug 16 13:23:38 2009
@@ -800,7 +800,6 @@
{
public long m_currentBytes;
public long m_totalBytes;
- public String m_uid;
public void update(long recvdBytes, long totalBytes, int item)
{
Modified:
incubator/jspwiki/trunk/src/java/org/apache/wiki/auth/AuthenticationManager.java
URL:
http://svn.apache.org/viewvc/incubator/jspwiki/trunk/src/java/org/apache/wiki/auth/AuthenticationManager.java?rev=804691&r1=804690&r2=804691&view=diff
==============================================================================
---
incubator/jspwiki/trunk/src/java/org/apache/wiki/auth/AuthenticationManager.java
(original)
+++
incubator/jspwiki/trunk/src/java/org/apache/wiki/auth/AuthenticationManager.java
Sun Aug 16 13:23:38 2009
@@ -176,7 +176,7 @@
* The path to the keychain, if needed for loading. If a fully-qualified
* path is not specified, keychain will be assumed to be relative to
* WEB-INF/. If the path is not set at all, it will default to
- * {...@link #DEFAULT_KEYSTORE_PATH}.
+ * {...@link #DEFAULT_KEYCHAIN_PATH}.
*/
public static final String PROP_KEYCHAIN_PATH = "jspwiki.keychainPath";
Modified:
incubator/jspwiki/trunk/src/java/org/apache/wiki/content/ContentManager.java
URL:
http://svn.apache.org/viewvc/incubator/jspwiki/trunk/src/java/org/apache/wiki/content/ContentManager.java?rev=804691&r1=804690&r2=804691&view=diff
==============================================================================
---
incubator/jspwiki/trunk/src/java/org/apache/wiki/content/ContentManager.java
(original)
+++
incubator/jspwiki/trunk/src/java/org/apache/wiki/content/ContentManager.java
Sun Aug 16 13:23:38 2009
@@ -1566,7 +1566,7 @@
List<WikiPage> pages = getAllPages( null );
for ( Iterator<WikiPage> it = pages.iterator(); it.hasNext(); )
{
- WikiPage page = (WikiPage)it.next();
+ WikiPage page = it.next();
Acl acl = changeAcl( page, oldPrincipals, newPrincipal );
if ( acl != null )
{
@@ -1615,7 +1615,7 @@
Collection<AclEntry> entriesToRemove = new ArrayList<AclEntry>();
while ( entries.hasMoreElements() )
{
- AclEntry entry = (AclEntry)entries.nextElement();
+ AclEntry entry = entries.nextElement();
if ( ArrayUtils.contains( oldPrincipals, entry.getPrincipal()
) )
{
// Create new entry
@@ -1624,7 +1624,7 @@
Enumeration<Permission> permissions = entry.permissions();
while ( permissions.hasMoreElements() )
{
- Permission permission =
(Permission)permissions.nextElement();
+ Permission permission = permissions.nextElement();
newEntry.addPermission(permission);
}
aclChanged = true;
@@ -1634,12 +1634,12 @@
}
for ( Iterator<AclEntry> ix = entriesToRemove.iterator();
ix.hasNext(); )
{
- AclEntry entry = (AclEntry)ix.next();
+ AclEntry entry = ix.next();
acl.removeEntry( entry );
}
for ( Iterator<AclEntry> ix = entriesToAdd.iterator();
ix.hasNext(); )
{
- AclEntry entry = (AclEntry)ix.next();
+ AclEntry entry = ix.next();
acl.addEntry( entry );
}
}
Modified:
incubator/jspwiki/trunk/src/java/org/apache/wiki/content/ReferenceManager.java
URL:
http://svn.apache.org/viewvc/incubator/jspwiki/trunk/src/java/org/apache/wiki/content/ReferenceManager.java?rev=804691&r1=804690&r2=804691&view=diff
==============================================================================
---
incubator/jspwiki/trunk/src/java/org/apache/wiki/content/ReferenceManager.java
(original)
+++
incubator/jspwiki/trunk/src/java/org/apache/wiki/content/ReferenceManager.java
Sun Aug 16 13:23:38 2009
@@ -827,7 +827,7 @@
try
{
boolean notFound = true;
- Property p = (Property) node.getProperty( property );
+ Property p = node.getProperty( property );
Value[] values = p.getValues();
for( int i = 0; i < values.length; i++ )
{
@@ -947,7 +947,7 @@
String[] stringValues = NO_VALUES;
try
{
- Property p = (Property) node.getProperty( property );
+ Property p = node.getProperty( property );
Value[] values = p.getValues();
stringValues = new String[values.length];
for( int i = 0; i < values.length; i++ )
@@ -1004,7 +1004,7 @@
List<String> newValues = new ArrayList<String>();
try
{
- Property p = (Property) node.getProperty( property );
+ Property p = node.getProperty( property );
Value[] values = p.getValues();
for( int i = 0; i < values.length; i++ )
{
Modified:
incubator/jspwiki/trunk/src/java/org/apache/wiki/content/jcr/JCRWikiPage.java
URL:
http://svn.apache.org/viewvc/incubator/jspwiki/trunk/src/java/org/apache/wiki/content/jcr/JCRWikiPage.java?rev=804691&r1=804690&r2=804691&view=diff
==============================================================================
---
incubator/jspwiki/trunk/src/java/org/apache/wiki/content/jcr/JCRWikiPage.java
(original)
+++
incubator/jspwiki/trunk/src/java/org/apache/wiki/content/jcr/JCRWikiPage.java
Sun Aug 16 13:23:38 2009
@@ -461,7 +461,7 @@
*/
public int compareTo( WikiPage o )
{
- WikiPage c = (WikiPage)o;
+ WikiPage c = o;
int res = this.getName().compareTo(c.getName());
Modified:
incubator/jspwiki/trunk/src/java/org/apache/wiki/filters/SpamFilter.java
URL:
http://svn.apache.org/viewvc/incubator/jspwiki/trunk/src/java/org/apache/wiki/filters/SpamFilter.java?rev=804691&r1=804690&r2=804691&view=diff
==============================================================================
--- incubator/jspwiki/trunk/src/java/org/apache/wiki/filters/SpamFilter.java
(original)
+++ incubator/jspwiki/trunk/src/java/org/apache/wiki/filters/SpamFilter.java
Sun Aug 16 13:23:38 2009
@@ -1210,7 +1210,7 @@
throws MissingParameterException
{
WikiActionBeanContext context = actionBean.getContext();
- HttpServletRequest request = (HttpServletRequest) context.getRequest();
+ HttpServletRequest request = context.getRequest();
// Recover the encrypted parameter and then validate the trap and token
// fields
Modified: incubator/jspwiki/trunk/src/java/org/apache/wiki/log/Logger.java
URL:
http://svn.apache.org/viewvc/incubator/jspwiki/trunk/src/java/org/apache/wiki/log/Logger.java?rev=804691&r1=804690&r2=804691&view=diff
==============================================================================
--- incubator/jspwiki/trunk/src/java/org/apache/wiki/log/Logger.java (original)
+++ incubator/jspwiki/trunk/src/java/org/apache/wiki/log/Logger.java Sun Aug 16
13:23:38 2009
@@ -52,6 +52,14 @@
void error( String string, Object... params );
/**
+ * Log an error.
+ *
+ * @param string The string to log.
+ * @param t , the Throwable to log, including the stacktrace
+ */
+ void error( String string, Throwable t);
+
+ /**
* Log a warning.
*
* @param string The string to log. May contain {...@link Formatter}
-specific
Modified: incubator/jspwiki/trunk/src/java/org/apache/wiki/log/LoggerImpl.java
URL:
http://svn.apache.org/viewvc/incubator/jspwiki/trunk/src/java/org/apache/wiki/log/LoggerImpl.java?rev=804691&r1=804690&r2=804691&view=diff
==============================================================================
--- incubator/jspwiki/trunk/src/java/org/apache/wiki/log/LoggerImpl.java
(original)
+++ incubator/jspwiki/trunk/src/java/org/apache/wiki/log/LoggerImpl.java Sun
Aug 16 13:23:38 2009
@@ -57,6 +57,16 @@
}
/** {...@inheritdoc} */
+
+ public void error( String string, Throwable t )
+ {
+ if( isErrorEnabled() )
+ {
+ m_slf4jLogger.error( string, t );
+ }
+ }
+
+ /** {...@inheritdoc} */
public void warn( String string, Object... params )
{
if( isWarnEnabled() )
Modified:
incubator/jspwiki/trunk/src/java/org/apache/wiki/parser/PluginContent.java
URL:
http://svn.apache.org/viewvc/incubator/jspwiki/trunk/src/java/org/apache/wiki/parser/PluginContent.java?rev=804691&r1=804690&r2=804691&view=diff
==============================================================================
--- incubator/jspwiki/trunk/src/java/org/apache/wiki/parser/PluginContent.java
(original)
+++ incubator/jspwiki/trunk/src/java/org/apache/wiki/parser/PluginContent.java
Sun Aug 16 13:23:38 2009
@@ -189,7 +189,7 @@
val = engine.getVariableManager().expandVariables(
context, (String)val );
}
- parsedParams.put( (String)e.getKey(), val );
+ parsedParams.put( e.getKey(), val );
}
result = engine.getPluginManager().execute( context,
Modified: incubator/jspwiki/trunk/src/java/org/apache/wiki/plugin/Denounce.java
URL:
http://svn.apache.org/viewvc/incubator/jspwiki/trunk/src/java/org/apache/wiki/plugin/Denounce.java?rev=804691&r1=804690&r2=804691&view=diff
==============================================================================
--- incubator/jspwiki/trunk/src/java/org/apache/wiki/plugin/Denounce.java
(original)
+++ incubator/jspwiki/trunk/src/java/org/apache/wiki/plugin/Denounce.java Sun
Aug 16 13:23:38 2009
@@ -60,8 +60,6 @@
private static final String PROP_HOSTPATTERN = "denounce.hostpattern.";
private static final String PROP_REFERERPATTERN =
"denounce.refererpattern.";
- private static final String PROP_DENOUNCETEXT = "denounce.denouncetext";
-
private static ArrayList<Pattern> c_refererPatterns = new
ArrayList<Pattern>();
private static ArrayList<Pattern> c_agentPatterns = new
ArrayList<Pattern>();
private static ArrayList<Pattern> c_hostPatterns = new
ArrayList<Pattern>();
@@ -169,7 +167,7 @@
{
for( Iterator<Pattern> i = list.iterator(); i.hasNext(); )
{
- Pattern pattern = (Pattern)i.next();
+ Pattern pattern = i.next();
if (pattern.matcher(path).find())
{
return true;
Modified:
incubator/jspwiki/trunk/src/java/org/apache/wiki/plugin/PluginManager.java
URL:
http://svn.apache.org/viewvc/incubator/jspwiki/trunk/src/java/org/apache/wiki/plugin/PluginManager.java?rev=804691&r1=804690&r2=804691&view=diff
==============================================================================
--- incubator/jspwiki/trunk/src/java/org/apache/wiki/plugin/PluginManager.java
(original)
+++ incubator/jspwiki/trunk/src/java/org/apache/wiki/plugin/PluginManager.java
Sun Aug 16 13:23:38 2009
@@ -606,7 +606,6 @@
* @return A DOM element
* @throws PluginException If plugin invocation is faulty
*/
- @SuppressWarnings("unchecked")
public PluginContent parsePluginLine( WikiContext context, String
commandline, int pos )
throws PluginException
{
Modified:
incubator/jspwiki/trunk/src/java/org/apache/wiki/plugin/ReferredPagesPlugin.java
URL:
http://svn.apache.org/viewvc/incubator/jspwiki/trunk/src/java/org/apache/wiki/plugin/ReferredPagesPlugin.java?rev=804691&r1=804690&r2=804691&view=diff
==============================================================================
---
incubator/jspwiki/trunk/src/java/org/apache/wiki/plugin/ReferredPagesPlugin.java
(original)
+++
incubator/jspwiki/trunk/src/java/org/apache/wiki/plugin/ReferredPagesPlugin.java
Sun Aug 16 13:23:38 2009
@@ -166,7 +166,6 @@
* @throws PageNotFoundException
* @throws ProviderException
*/
- @SuppressWarnings("unchecked")
private void getReferredPages( WikiContext context, WikiPath path, int
depth ) throws ProviderException, PageNotFoundException
{
if( depth >= m_depth ) return; // end of recursion
Modified:
incubator/jspwiki/trunk/src/java/org/apache/wiki/render/RenderingManager.java
URL:
http://svn.apache.org/viewvc/incubator/jspwiki/trunk/src/java/org/apache/wiki/render/RenderingManager.java?rev=804691&r1=804690&r2=804691&view=diff
==============================================================================
---
incubator/jspwiki/trunk/src/java/org/apache/wiki/render/RenderingManager.java
(original)
+++
incubator/jspwiki/trunk/src/java/org/apache/wiki/render/RenderingManager.java
Sun Aug 16 13:23:38 2009
@@ -45,7 +45,6 @@
import org.apache.wiki.parser.JSPWikiMarkupParser;
import org.apache.wiki.parser.MarkupParser;
import org.apache.wiki.parser.WikiDocument;
-import org.apache.wiki.providers.CachingProvider;
import org.apache.wiki.providers.ProviderException;
import org.apache.wiki.util.TextUtil;
@@ -64,7 +63,7 @@
* You can turn caching completely off by stating a cacheSize of zero.
* <p>
* Since 3.0, the underlying cache implementation is based on EhCache, with
the cache
- * name set to {...@link RenderingManager#CACHE_NAME} (Currently set to
{...@value RenderingManager#CACHE_NAME}.)
+ * name set to {...@link RenderingManager#CACHE_NAME} (Currently set to
{...@value CACHE_NAME}.)
* If a cache by that name exists already (e.g. configured in ehcache.xml),
then that
* cache is used. If the cache does not exist, then we'll just simply use
the settings
* from jspwiki.properties.
@@ -352,7 +351,6 @@
* @see
org.apache.wiki.event.WikiEventListener#actionPerformed(org.apache.wiki.event.WikiEvent)
* @param event {...@inheritdoc}
*/
- @SuppressWarnings("deprecation")
public void actionPerformed(WikiEvent event)
{
if( (event instanceof WikiPageEvent) && (event.getType() ==
WikiPageEvent.POST_SAVE_BEGIN) )
Modified: incubator/jspwiki/trunk/src/java/org/apache/wiki/rss/RSSGenerator.java
URL:
http://svn.apache.org/viewvc/incubator/jspwiki/trunk/src/java/org/apache/wiki/rss/RSSGenerator.java?rev=804691&r1=804690&r2=804691&view=diff
==============================================================================
--- incubator/jspwiki/trunk/src/java/org/apache/wiki/rss/RSSGenerator.java
(original)
+++ incubator/jspwiki/trunk/src/java/org/apache/wiki/rss/RSSGenerator.java Sun
Aug 16 13:23:38 2009
@@ -275,7 +275,7 @@
{
if( page.isAttachment() )
{
- res = getAttachmentDescription( (WikiPage)page );
+ res = getAttachmentDescription( page );
}
else
{
Modified:
incubator/jspwiki/trunk/src/java/org/apache/wiki/ui/TemplateManager.java
URL:
http://svn.apache.org/viewvc/incubator/jspwiki/trunk/src/java/org/apache/wiki/ui/TemplateManager.java?rev=804691&r1=804690&r2=804691&view=diff
==============================================================================
--- incubator/jspwiki/trunk/src/java/org/apache/wiki/ui/TemplateManager.java
(original)
+++ incubator/jspwiki/trunk/src/java/org/apache/wiki/ui/TemplateManager.java
Sun Aug 16 13:23:38 2009
@@ -671,7 +671,7 @@
// Iterate through all of the resources in the default map
String templatePrefix = "/" + DIRECTORY + "/" + template + "/";
- Set<String> templateResources =
(Set<String>)servletContext.getResourcePaths( templatePrefix );
+ Set<String> templateResources = servletContext.getResourcePaths(
templatePrefix );
Set<String> alreadyProcessed = new HashSet<String>();
// Add all of the resources the template contains
@@ -687,7 +687,7 @@
// Add resources the template does not contain, but default does
templatePrefix = "/" + DIRECTORY + "/" + DEFAULT_TEMPLATE + "/";
- Set<String> defaultResources =
(Set<String>)servletContext.getResourcePaths( templatePrefix );
+ Set<String> defaultResources = servletContext.getResourcePaths(
templatePrefix );
if ( defaultResources != null )
{
for ( String resource : defaultResources )
Modified: incubator/jspwiki/trunk/src/java/org/apache/wiki/util/WatchDog.java
URL:
http://svn.apache.org/viewvc/incubator/jspwiki/trunk/src/java/org/apache/wiki/util/WatchDog.java?rev=804691&r1=804690&r2=804691&view=diff
==============================================================================
--- incubator/jspwiki/trunk/src/java/org/apache/wiki/util/WatchDog.java
(original)
+++ incubator/jspwiki/trunk/src/java/org/apache/wiki/util/WatchDog.java Sun Aug
16 13:23:38 2009
@@ -419,7 +419,7 @@
WeakReference<WatchDog> wr = entry.getValue();
- WatchDog w = (WatchDog) wr.get();
+ WatchDog w = wr.get();
if( w != null )
{
Modified:
incubator/jspwiki/trunk/src/java/org/apache/wiki/xmlrpc/MetaWeblogHandler.java
URL:
http://svn.apache.org/viewvc/incubator/jspwiki/trunk/src/java/org/apache/wiki/xmlrpc/MetaWeblogHandler.java?rev=804691&r1=804690&r2=804691&view=diff
==============================================================================
---
incubator/jspwiki/trunk/src/java/org/apache/wiki/xmlrpc/MetaWeblogHandler.java
(original)
+++
incubator/jspwiki/trunk/src/java/org/apache/wiki/xmlrpc/MetaWeblogHandler.java
Sun Aug 16 13:23:38 2009
@@ -30,7 +30,6 @@
import org.apache.wiki.WikiEngine;
import org.apache.wiki.api.WikiPage;
import org.apache.wiki.attachment.Attachment;
-import org.apache.wiki.attachment.AttachmentManager;
import org.apache.wiki.auth.AuthenticationManager;
import org.apache.wiki.auth.AuthorizationManager;
import org.apache.wiki.auth.WikiSecurityException;
@@ -363,7 +362,6 @@
String name = (String) content.get( "name" );
byte[] data = (byte[]) content.get( "bits" );
- AttachmentManager attmgr = engine.getAttachmentManager();
Attachment att = engine.getContentManager().addPage(
WikiPath.valueOf( blogid ).resolve( name ),
"application/octet-stream"); //FIXME! Needs a better guess
att.setAuthor( username );
Modified: incubator/jspwiki/trunk/tests/java/org/apache/wiki/Util.java
URL:
http://svn.apache.org/viewvc/incubator/jspwiki/trunk/tests/java/org/apache/wiki/Util.java?rev=804691&r1=804690&r2=804691&view=diff
==============================================================================
--- incubator/jspwiki/trunk/tests/java/org/apache/wiki/Util.java (original)
+++ incubator/jspwiki/trunk/tests/java/org/apache/wiki/Util.java Sun Aug 16
13:23:38 2009
@@ -39,7 +39,7 @@
{
for ( String cap : container )
{
- if( cap instanceof String && captive.equals( cap ) )
+ if( cap != null && captive.equals( cap ) )
return true;
}
Modified: incubator/jspwiki/trunk/tests/java/org/apache/wiki/WikiEngineTest.java
URL:
http://svn.apache.org/viewvc/incubator/jspwiki/trunk/tests/java/org/apache/wiki/WikiEngineTest.java?rev=804691&r1=804690&r2=804691&view=diff
==============================================================================
--- incubator/jspwiki/trunk/tests/java/org/apache/wiki/WikiEngineTest.java
(original)
+++ incubator/jspwiki/trunk/tests/java/org/apache/wiki/WikiEngineTest.java Sun
Aug 16 13:23:38 2009
@@ -28,8 +28,6 @@
import org.apache.wiki.api.WikiPage;
import org.apache.wiki.content.PageNotFoundException;
import org.apache.wiki.content.WikiPath;
-import org.apache.wiki.providers.*;
-import org.apache.wiki.util.FileUtil;
import org.apache.wiki.util.TextUtil;
@@ -660,6 +658,7 @@
try
{
+ @SuppressWarnings( "unused" )
WikiPage p = m_engine.getPage( NAME1, 3 );
fail("got page");
}
Modified:
incubator/jspwiki/trunk/tests/java/org/apache/wiki/content/AllTests.java
URL:
http://svn.apache.org/viewvc/incubator/jspwiki/trunk/tests/java/org/apache/wiki/content/AllTests.java?rev=804691&r1=804690&r2=804691&view=diff
==============================================================================
--- incubator/jspwiki/trunk/tests/java/org/apache/wiki/content/AllTests.java
(original)
+++ incubator/jspwiki/trunk/tests/java/org/apache/wiki/content/AllTests.java
Sun Aug 16 13:23:38 2009
@@ -21,9 +21,6 @@
package org.apache.wiki.content;
-import org.apache.wiki.content.resolver.EnglishPluralsPageNameResolverTest;
-import org.apache.wiki.content.resolver.SpecialPageNameResolverTest;
-
import junit.framework.Test;
import junit.framework.TestCase;
import junit.framework.TestSuite;
Modified:
incubator/jspwiki/trunk/tests/java/org/apache/wiki/content/ReferenceManagerTest.java
URL:
http://svn.apache.org/viewvc/incubator/jspwiki/trunk/tests/java/org/apache/wiki/content/ReferenceManagerTest.java?rev=804691&r1=804690&r2=804691&view=diff
==============================================================================
---
incubator/jspwiki/trunk/tests/java/org/apache/wiki/content/ReferenceManagerTest.java
(original)
+++
incubator/jspwiki/trunk/tests/java/org/apache/wiki/content/ReferenceManagerTest.java
Sun Aug 16 13:23:38 2009
@@ -328,28 +328,28 @@
public void testRebuild() throws Exception
{
ContentManager cm = engine.getContentManager();
- Node node = (Node)cm.getJCRNode( ReferenceManager.REFERENCES_ROOT );
+ Node node = cm.getJCRNode( ReferenceManager.REFERENCES_ROOT );
assertNotNull( node );
assertNotSame( 0, node.getNodes().getSize() );
mgr.rebuild();
// Should see just 3 children of REFERENCES_ROOT
- node = (Node)cm.getJCRNode( ReferenceManager.REFERENCES_ROOT );
+ node = cm.getJCRNode( ReferenceManager.REFERENCES_ROOT );
assertNotNull( node );
assertEquals( 3, node.getNodes().getSize() );
// Make sure all of the inbound references got deleted
- node = (Node)cm.getJCRNode( ReferenceManager.REFERRED_BY );
+ node = cm.getJCRNode( ReferenceManager.REFERRED_BY );
assertNotNull( node );
assertEquals( 0, node.getNodes().getSize() );
// Make sure all of the uncreated references got deleted
- node = (Node)cm.getJCRNode( ReferenceManager.NOT_CREATED );
+ node = cm.getJCRNode( ReferenceManager.NOT_CREATED );
assertNotNull( node );
assertEquals( 0, node.getNodes().getSize() );
// Make sure all of the unreferenced references got deleted
- node = (Node)cm.getJCRNode( ReferenceManager.NOT_REFERENCED );
+ node = cm.getJCRNode( ReferenceManager.NOT_REFERENCED );
assertNotNull( node );
assertEquals( 0, node.getNodes().getSize() );
}
Modified:
incubator/jspwiki/trunk/tests/java/org/apache/wiki/search/SearchManagerTest.java
URL:
http://svn.apache.org/viewvc/incubator/jspwiki/trunk/tests/java/org/apache/wiki/search/SearchManagerTest.java?rev=804691&r1=804690&r2=804691&view=diff
==============================================================================
---
incubator/jspwiki/trunk/tests/java/org/apache/wiki/search/SearchManagerTest.java
(original)
+++
incubator/jspwiki/trunk/tests/java/org/apache/wiki/search/SearchManagerTest.java
Sun Aug 16 13:23:38 2009
@@ -162,7 +162,7 @@
assertNotNull( "null result", res );
assertEquals( "no pages", 1, res.size() );
- assertEquals( "page","TestPage",
((SearchResult)res.iterator().next()).getPage().getName() );
+ assertEquals( "page","TestPage",
res.iterator().next().getPage().getName() );
}
public void testTitleSearch2()
@@ -181,7 +181,7 @@
assertNotNull( "null result", res );
assertEquals( "no pages", 1, res.size() );
- assertEquals( "page","TestPage",
((SearchResult)res.iterator().next()).getPage().getName() );
+ assertEquals( "page","TestPage",
res.iterator().next().getPage().getName() );
}
public static Test suite()
