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 2009/04/10 15:16:19 UTC
svn commit: r763924 [2/2] - in /incubator/jspwiki/trunk: ./
src/java/org/apache/wiki/ src/java/org/apache/wiki/attachment/
src/java/org/apache/wiki/auth/ src/java/org/apache/wiki/auth/login/
src/java/org/apache/wiki/forms/ src/java/org/apache/wiki/mana...
Modified: incubator/jspwiki/trunk/src/java/org/apache/wiki/search/BasicSearchProvider.java
URL: http://svn.apache.org/viewvc/incubator/jspwiki/trunk/src/java/org/apache/wiki/search/BasicSearchProvider.java?rev=763924&r1=763923&r2=763924&view=diff
==============================================================================
--- incubator/jspwiki/trunk/src/java/org/apache/wiki/search/BasicSearchProvider.java (original)
+++ incubator/jspwiki/trunk/src/java/org/apache/wiki/search/BasicSearchProvider.java Fri Apr 10 13:16:16 2009
@@ -21,20 +21,14 @@
package org.apache.wiki.search;
import java.io.IOException;
-import java.util.Collection;
-import java.util.Iterator;
-import java.util.Properties;
-import java.util.StringTokenizer;
-import java.util.TreeSet;
+import java.util.*;
import org.apache.wiki.NoRequiredPropertyException;
import org.apache.wiki.WikiEngine;
import org.apache.wiki.api.WikiPage;
-import org.apache.wiki.content.PageNotFoundException;
import org.apache.wiki.log.Logger;
import org.apache.wiki.log.LoggerFactory;
import org.apache.wiki.providers.ProviderException;
-import org.apache.wiki.providers.WikiPageProvider;
@@ -125,7 +119,7 @@
{
if(m_engine.getAttachmentManager().hasAttachments(page))
{
- Collection attachments;
+ Collection<WikiPage> attachments;
try
{
attachments = m_engine.getAttachmentManager().listAttachments(page);
@@ -137,9 +131,9 @@
}
StringBuilder attachmentNames = new StringBuilder();
- for( Iterator it = attachments.iterator(); it.hasNext(); )
+ for( Iterator<WikiPage> it = attachments.iterator(); it.hasNext(); )
{
- WikiPage att = (WikiPage) it.next();
+ WikiPage att = it.next();
attachmentNames.append(att.getName());
if(it.hasNext())
attachmentNames.append(separator);
Modified: incubator/jspwiki/trunk/src/java/org/apache/wiki/search/LuceneSearchProvider.java
URL: http://svn.apache.org/viewvc/incubator/jspwiki/trunk/src/java/org/apache/wiki/search/LuceneSearchProvider.java?rev=763924&r1=763923&r2=763924&view=diff
==============================================================================
--- incubator/jspwiki/trunk/src/java/org/apache/wiki/search/LuceneSearchProvider.java (original)
+++ incubator/jspwiki/trunk/src/java/org/apache/wiki/search/LuceneSearchProvider.java Fri Apr 10 13:16:16 2009
@@ -213,10 +213,8 @@
true );
Collection<WikiPage> allPages = m_engine.getContentManager().getAllPages(null);
- for( Iterator iterator = allPages.iterator(); iterator.hasNext(); )
+ for( WikiPage page : allPages )
{
- WikiPage page = (WikiPage) iterator.next();
-
try
{
String text = page.getContentAsString();
@@ -401,7 +399,7 @@
InstantiationException,
IllegalAccessException
{
- Class clazz = ClassUtil.findClass( "", m_analyzerClass );
+ Class<?> clazz = ClassUtil.findClass( "", m_analyzerClass );
Analyzer analyzer = (Analyzer)clazz.newInstance();
return analyzer;
}
@@ -456,12 +454,11 @@
// Now add the names of the attachments of this page
try
{
- Collection attachments = m_engine.getAttachmentManager().listAttachments(page);
+ Collection<WikiPage> attachments = m_engine.getAttachmentManager().listAttachments(page);
String attachmentNames = "";
- for( Iterator it = attachments.iterator(); it.hasNext(); )
+ for( WikiPage att : attachments )
{
- WikiPage att = (WikiPage) it.next();
attachmentNames += att.getName() + ";";
}
field = new Field(LUCENE_ATTACHMENTS, attachmentNames,
@@ -535,7 +532,7 @@
/**
* {@inheritDoc}
*/
- public Collection findPages( String query )
+ public Collection<SearchResult> findPages( String query )
throws ProviderException
{
return findPages( query, FLAG_CONTEXTS );
@@ -555,7 +552,7 @@
* @return A Collection of SearchResult instances
* @throws ProviderException if there is a problem with the backend
*/
- public Collection findPages( String query, int flags )
+ public Collection<SearchResult> findPages( String query, int flags )
throws ProviderException
{
Searcher searcher = null;
Modified: incubator/jspwiki/trunk/src/java/org/apache/wiki/search/SearchManager.java
URL: http://svn.apache.org/viewvc/incubator/jspwiki/trunk/src/java/org/apache/wiki/search/SearchManager.java?rev=763924&r1=763923&r2=763924&view=diff
==============================================================================
--- incubator/jspwiki/trunk/src/java/org/apache/wiki/search/SearchManager.java (original)
+++ incubator/jspwiki/trunk/src/java/org/apache/wiki/search/SearchManager.java Fri Apr 10 13:16:16 2009
@@ -107,7 +107,7 @@
* @param maxLength maximum number of suggestions
* @return the suggestions
*/
- public List getSuggestions( String wikiName, int maxLength )
+ public List<String> getSuggestions( String wikiName, int maxLength )
{
StopWatch sw = new StopWatch();
sw.start();
@@ -165,18 +165,18 @@
* @param maxLength How many hits to return
* @return the pages found
*/
- public List findPages( String searchString, int maxLength )
+ public List<HashMap<String,Object>> findPages( String searchString, int maxLength )
{
StopWatch sw = new StopWatch();
sw.start();
- List<HashMap> list = new ArrayList<HashMap>(maxLength);
+ List<HashMap<String,Object>> list = new ArrayList<HashMap<String,Object>>(maxLength);
if( searchString.length() > 0 )
{
try
{
- Collection c;
+ Collection<SearchResult> c;
if( m_searchProvider instanceof LuceneSearchProvider )
c = ((LuceneSearchProvider)m_searchProvider).findPages( searchString, 0 );
@@ -184,9 +184,9 @@
c = m_searchProvider.findPages( searchString );
int count = 0;
- for( Iterator i = c.iterator(); i.hasNext() && count < maxLength; count++ )
+ for( Iterator<SearchResult> i = c.iterator(); i.hasNext() && count < maxLength; count++ )
{
- SearchResult sr = (SearchResult)i.next();
+ SearchResult sr = i.next();
HashMap<String,Object> hm = new HashMap<String,Object>();
hm.put( "page", sr.getPage().getName() );
hm.put( "score", sr.getScore() );
@@ -266,7 +266,7 @@
try
{
- Class providerClass = ClassUtil.findClass( "org.apache.wiki.search", providerClassName );
+ Class<?> providerClass = ClassUtil.findClass( "org.apache.wiki.search", providerClassName );
m_searchProvider = (SearchProvider)providerClass.newInstance();
}
catch( ClassNotFoundException e )
@@ -309,11 +309,11 @@
* @throws ProviderException If the provider fails and a search cannot be completed.
* @throws IOException If something else goes wrong.
*/
- public Collection findPages( String query )
+ public Collection<SearchResult> findPages( String query )
throws ProviderException, IOException
{
if( query == null ) query = "";
- Collection c = m_searchProvider.findPages( query );
+ Collection<SearchResult> c = m_searchProvider.findPages( query );
return c;
}
Modified: incubator/jspwiki/trunk/src/java/org/apache/wiki/search/SearchProvider.java
URL: http://svn.apache.org/viewvc/incubator/jspwiki/trunk/src/java/org/apache/wiki/search/SearchProvider.java?rev=763924&r1=763923&r2=763924&view=diff
==============================================================================
--- incubator/jspwiki/trunk/src/java/org/apache/wiki/search/SearchProvider.java (original)
+++ incubator/jspwiki/trunk/src/java/org/apache/wiki/search/SearchProvider.java Fri Apr 10 13:16:16 2009
@@ -58,5 +58,5 @@
* @throws ProviderException if the search provider failed.
* @throws IOException if for some reason the query could not be executed.
*/
- public Collection findPages(String query) throws ProviderException, IOException;
+ public Collection<SearchResult> findPages(String query) throws ProviderException, IOException;
}
Modified: incubator/jspwiki/trunk/src/java/org/apache/wiki/tags/AdminBeanIteratorTag.java
URL: http://svn.apache.org/viewvc/incubator/jspwiki/trunk/src/java/org/apache/wiki/tags/AdminBeanIteratorTag.java?rev=763924&r1=763923&r2=763924&view=diff
==============================================================================
--- incubator/jspwiki/trunk/src/java/org/apache/wiki/tags/AdminBeanIteratorTag.java (original)
+++ incubator/jspwiki/trunk/src/java/org/apache/wiki/tags/AdminBeanIteratorTag.java Fri Apr 10 13:16:16 2009
@@ -22,7 +22,6 @@
import java.util.ArrayList;
import java.util.Collection;
-import java.util.Iterator;
import org.apache.wiki.ui.admin.AdminBean;
import org.apache.wiki.ui.admin.AdminBeanManager;
@@ -56,14 +55,12 @@
{
AdminBeanManager mgr = m_wikiContext.getEngine().getAdminBeanManager();
- Collection beans = mgr.getAllBeans();
+ Collection<AdminBean> beans = mgr.getAllBeans();
ArrayList<AdminBean> typedBeans = new ArrayList<AdminBean>();
- for( Iterator i = beans.iterator(); i.hasNext(); )
+ for( AdminBean ab : beans )
{
- AdminBean ab = (AdminBean)i.next();
-
if( ab.getType() == m_type )
{
typedBeans.add( ab );
Modified: incubator/jspwiki/trunk/src/java/org/apache/wiki/tags/AttachmentsIteratorTag.java
URL: http://svn.apache.org/viewvc/incubator/jspwiki/trunk/src/java/org/apache/wiki/tags/AttachmentsIteratorTag.java?rev=763924&r1=763923&r2=763924&view=diff
==============================================================================
--- incubator/jspwiki/trunk/src/java/org/apache/wiki/tags/AttachmentsIteratorTag.java (original)
+++ incubator/jspwiki/trunk/src/java/org/apache/wiki/tags/AttachmentsIteratorTag.java Fri Apr 10 13:16:16 2009
@@ -78,7 +78,7 @@
{
if( page != null && engine.pageExists(page) )
{
- Collection atts = mgr.listAttachments( page );
+ Collection<WikiPage> atts = mgr.listAttachments( page );
if( atts == null )
{
@@ -91,7 +91,7 @@
if( m_iterator.hasNext() )
{
- WikiPage att = (WikiPage) m_iterator.next();
+ WikiPage att = (WikiPage)m_iterator.next();
WikiContext context = (WikiContext)m_wikiContext.clone();
context.setPage( att );
Modified: incubator/jspwiki/trunk/src/java/org/apache/wiki/tags/CookieTag.java
URL: http://svn.apache.org/viewvc/incubator/jspwiki/trunk/src/java/org/apache/wiki/tags/CookieTag.java?rev=763924&r1=763923&r2=763924&view=diff
==============================================================================
--- incubator/jspwiki/trunk/src/java/org/apache/wiki/tags/CookieTag.java (original)
+++ incubator/jspwiki/trunk/src/java/org/apache/wiki/tags/CookieTag.java Fri Apr 10 13:16:16 2009
@@ -25,7 +25,6 @@
import java.net.URLDecoder;
import java.net.URLEncoder;
import java.util.HashMap;
-import java.util.Iterator;
import java.util.Map;
import javax.servlet.http.Cookie;
@@ -319,8 +318,8 @@
return null;
}
String in = c.getValue();
- Map values = parseCookieValues( in );
- return (String)values.get( item );
+ Map<String,String> values = parseCookieValues( in );
+ return values.get( item );
}
@@ -357,7 +356,7 @@
* Encodes name-value pairs in the map into a single string, in a format
* understood by this class and JavaScript decodeURIComponent().
*/
- private String encodeValues( Map values )
+ private String encodeValues( Map<String,String> values )
{
StringBuilder rval = new StringBuilder();
if( values == null || values.size() == 0 )
@@ -365,12 +364,10 @@
return rval.toString();
}
- Iterator it = values.entrySet().iterator();
- while( it.hasNext() )
+ for( Map.Entry<String,String> e : values.entrySet() )
{
- Map.Entry e = (Map.Entry) it.next();
- String n = (String)e.getKey();
- String v = (String)e.getValue();
+ String n = e.getKey();
+ String v = e.getValue();
if( v != null )
{
String nv = n + "=" + v;
Modified: incubator/jspwiki/trunk/src/java/org/apache/wiki/tags/IteratorTag.java
URL: http://svn.apache.org/viewvc/incubator/jspwiki/trunk/src/java/org/apache/wiki/tags/IteratorTag.java?rev=763924&r1=763923&r2=763924&view=diff
==============================================================================
--- incubator/jspwiki/trunk/src/java/org/apache/wiki/tags/IteratorTag.java (original)
+++ incubator/jspwiki/trunk/src/java/org/apache/wiki/tags/IteratorTag.java Fri Apr 10 13:16:16 2009
@@ -53,7 +53,7 @@
{
protected String m_pageName;
- protected Iterator m_iterator;
+ protected Iterator<?> m_iterator;
protected WikiContext m_wikiContext;
private static Logger log = LoggerFactory.getLogger( IteratorTag.class );
@@ -63,7 +63,7 @@
*
* @param arg A Collection which will be iterated.
*/
- public void setList( Collection arg )
+ public void setList( Collection<?> arg )
{
if( arg != null )
m_iterator = arg.iterator();
Modified: incubator/jspwiki/trunk/src/java/org/apache/wiki/tags/PluginTag.java
URL: http://svn.apache.org/viewvc/incubator/jspwiki/trunk/src/java/org/apache/wiki/tags/PluginTag.java?rev=763924&r1=763923&r2=763924&view=diff
==============================================================================
--- incubator/jspwiki/trunk/src/java/org/apache/wiki/tags/PluginTag.java (original)
+++ incubator/jspwiki/trunk/src/java/org/apache/wiki/tags/PluginTag.java Fri Apr 10 13:16:16 2009
@@ -102,7 +102,7 @@
m_evaluated = true;
- Map<String, String> argmap = pm.parseArgs( args );
+ Map<String, Object> argmap = pm.parseArgs( args );
if( body != null )
{
Modified: incubator/jspwiki/trunk/src/java/org/apache/wiki/tags/SearchResultIteratorTag.java
URL: http://svn.apache.org/viewvc/incubator/jspwiki/trunk/src/java/org/apache/wiki/tags/SearchResultIteratorTag.java?rev=763924&r1=763923&r2=763924&view=diff
==============================================================================
--- incubator/jspwiki/trunk/src/java/org/apache/wiki/tags/SearchResultIteratorTag.java (original)
+++ incubator/jspwiki/trunk/src/java/org/apache/wiki/tags/SearchResultIteratorTag.java Fri Apr 10 13:16:16 2009
@@ -73,6 +73,7 @@
m_start = arg;
}
+ @SuppressWarnings("unchecked")
public final int doStartTag()
{
//
@@ -80,7 +81,7 @@
//
if( m_iterator == null )
{
- Collection searchresults = (Collection) pageContext.getAttribute( "searchresults",
+ Collection<SearchResult> searchresults = (Collection<SearchResult>) pageContext.getAttribute( "searchresults",
PageContext.REQUEST_SCOPE );
setList( searchresults );
Modified: incubator/jspwiki/trunk/src/java/org/apache/wiki/tags/SearchResultsSizeTag.java
URL: http://svn.apache.org/viewvc/incubator/jspwiki/trunk/src/java/org/apache/wiki/tags/SearchResultsSizeTag.java?rev=763924&r1=763923&r2=763924&view=diff
==============================================================================
--- incubator/jspwiki/trunk/src/java/org/apache/wiki/tags/SearchResultsSizeTag.java (original)
+++ incubator/jspwiki/trunk/src/java/org/apache/wiki/tags/SearchResultsSizeTag.java Fri Apr 10 13:16:16 2009
@@ -24,6 +24,8 @@
import java.util.Collection;
import javax.servlet.jsp.PageContext;
+import org.apache.wiki.search.SearchResult;
+
/**
* Outputs the size of the search results list, if it contains any items.
* Otherwise outputs an empty string.
@@ -35,10 +37,11 @@
{
private static final long serialVersionUID = 0L;
+ @SuppressWarnings("unchecked")
public final int doWikiStartTag()
throws IOException
{
- Collection list = (Collection)pageContext.getAttribute( "searchresults",
+ Collection<SearchResult> list = (Collection<SearchResult>)pageContext.getAttribute( "searchresults",
PageContext.REQUEST_SCOPE );
if( list != null )
{
Modified: incubator/jspwiki/trunk/src/java/org/apache/wiki/tags/SearchResultsTag.java
URL: http://svn.apache.org/viewvc/incubator/jspwiki/trunk/src/java/org/apache/wiki/tags/SearchResultsTag.java?rev=763924&r1=763923&r2=763924&view=diff
==============================================================================
--- incubator/jspwiki/trunk/src/java/org/apache/wiki/tags/SearchResultsTag.java (original)
+++ incubator/jspwiki/trunk/src/java/org/apache/wiki/tags/SearchResultsTag.java Fri Apr 10 13:16:16 2009
@@ -24,6 +24,8 @@
import java.util.Collection;
import javax.servlet.jsp.PageContext;
+import org.apache.wiki.search.SearchResult;
+
/**
* Includes the body content, if there are any search results.
*
@@ -34,10 +36,11 @@
{
private static final long serialVersionUID = 0L;
+ @SuppressWarnings("unchecked")
public final int doWikiStartTag()
throws IOException
{
- Collection list = (Collection)pageContext.getAttribute( "searchresults",
+ Collection<SearchResult> list = (Collection<SearchResult>)pageContext.getAttribute( "searchresults",
PageContext.REQUEST_SCOPE );
if( list != null )
Modified: incubator/jspwiki/trunk/src/java/org/apache/wiki/ui/EditorManager.java
URL: http://svn.apache.org/viewvc/incubator/jspwiki/trunk/src/java/org/apache/wiki/ui/EditorManager.java?rev=763924&r1=763923&r2=763924&view=diff
==============================================================================
--- incubator/jspwiki/trunk/src/java/org/apache/wiki/ui/EditorManager.java (original)
+++ incubator/jspwiki/trunk/src/java/org/apache/wiki/ui/EditorManager.java Fri Apr 10 13:16:16 2009
@@ -124,11 +124,11 @@
// Get all resources of all modules
//
- Enumeration resources = getClass().getClassLoader().getResources( MODULE_RESOURCE_LOCATION );
+ Enumeration<URL> resources = getClass().getClassLoader().getResources( MODULE_RESOURCE_LOCATION );
while( resources.hasMoreElements() )
{
- URL resource = (URL) resources.nextElement();
+ URL resource = resources.nextElement();
try
{
@@ -136,9 +136,9 @@
Document doc = builder.build( resource );
- List plugins = XPath.selectNodes( doc, "/modules/editor");
+ List<?> plugins = XPath.selectNodes( doc, "/modules/editor");
- for( Iterator i = plugins.iterator(); i.hasNext(); )
+ for( Iterator<?> i = plugins.iterator(); i.hasNext(); )
{
Element pluginEl = (Element) i.next();
@@ -349,7 +349,7 @@
}
}
- public Collection modules()
+ public Collection<WikiModuleInfo> modules()
{
ArrayList<WikiModuleInfo> ls = new ArrayList<WikiModuleInfo>();
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=763924&r1=763923&r2=763924&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 Fri Apr 10 13:16:16 2009
@@ -38,6 +38,7 @@
import org.apache.wiki.log.Logger;
import org.apache.wiki.log.LoggerFactory;
import org.apache.wiki.modules.ModuleManager;
+import org.apache.wiki.modules.WikiModuleInfo;
import org.apache.wiki.preferences.Preferences;
import org.apache.wiki.preferences.Preferences.TimeFormat;
@@ -151,6 +152,8 @@
* List of time zones, used by {@link #listTimeZones(HttpServletRequest)}.
*/
private static final List<TimeZone> TIME_ZONES;
+
+ private static final List<WikiModuleInfo> EMPTY_MODULE_LIST = new ArrayList<WikiModuleInfo>();
static
{
@@ -474,14 +477,14 @@
* @return map of TimeFormats
* @since 2.7.x
*/
- public Map listTimeFormats( WikiContext context )
+ public Map<String,String> listTimeFormats( WikiContext context )
{
Properties props = m_engine.getWikiProperties();
ArrayList<String> tfArr = new ArrayList<String>( 40 );
LinkedHashMap<String, String> resultMap = new LinkedHashMap<String, String>();
/* filter timeformat properties */
- for( Enumeration e = props.propertyNames(); e.hasMoreElements(); )
+ for( Enumeration<?> e = props.propertyNames(); e.hasMoreElements(); )
{
String name = (String) e.nextElement();
@@ -633,9 +636,9 @@
boolean first = true;
- for( Enumeration en = rb.getKeys(); en.hasMoreElements(); )
+ for( Enumeration<String> en = rb.getKeys(); en.hasMoreElements(); )
{
- String key = (String) en.nextElement();
+ String key = en.nextElement();
if( key.startsWith( "javascript" ) )
{
@@ -794,8 +797,8 @@
*
* @return {@inheritDoc}
*/
- public Collection modules()
+ public Collection<WikiModuleInfo> modules()
{
- return new ArrayList();
+ return EMPTY_MODULE_LIST;
}
}
Modified: incubator/jspwiki/trunk/src/java/org/apache/wiki/ui/WikiRequestWrapper.java
URL: http://svn.apache.org/viewvc/incubator/jspwiki/trunk/src/java/org/apache/wiki/ui/WikiRequestWrapper.java?rev=763924&r1=763923&r2=763924&view=diff
==============================================================================
--- incubator/jspwiki/trunk/src/java/org/apache/wiki/ui/WikiRequestWrapper.java (original)
+++ incubator/jspwiki/trunk/src/java/org/apache/wiki/ui/WikiRequestWrapper.java Fri Apr 10 13:16:16 2009
@@ -87,9 +87,10 @@
* value {@link org.apache.wiki.preferences.Preferences#PREFS_LOCALE},
* that value is returned as the first item in the array.
*/
- public Enumeration getLocales()
+ @SuppressWarnings("unchecked")
+ public Enumeration<Locale> getLocales()
{
- Enumeration requestLocales = super.getLocales();
+ Enumeration<Locale> requestLocales = (Enumeration<Locale>)super.getLocales();
if( m_locale == null )
{
return requestLocales;
Modified: incubator/jspwiki/trunk/src/java/org/apache/wiki/ui/admin/AdminBeanManager.java
URL: http://svn.apache.org/viewvc/incubator/jspwiki/trunk/src/java/org/apache/wiki/ui/admin/AdminBeanManager.java?rev=763924&r1=763923&r2=763924&view=diff
==============================================================================
--- incubator/jspwiki/trunk/src/java/org/apache/wiki/ui/admin/AdminBeanManager.java (original)
+++ incubator/jspwiki/trunk/src/java/org/apache/wiki/ui/admin/AdminBeanManager.java Fri Apr 10 13:16:16 2009
@@ -24,7 +24,6 @@
import java.security.AccessControlException;
import java.util.ArrayList;
import java.util.Collection;
-import java.util.Iterator;
import java.util.List;
import javax.management.*;
@@ -167,19 +166,19 @@
* Registers all the beans from a collection of WikiModuleInfos. If some of the beans
* fail, logs the message and keeps going to the next bean.
*
- * @param c Collection of WikiModuleInfo instances
+ * @param modules Collection of WikiModuleInfo instances
*/
- private void registerBeans( Collection c )
+ private void registerBeans( Collection<? extends WikiModuleInfo> modules )
{
- for( Iterator i = c.iterator(); i.hasNext(); )
+ for( WikiModuleInfo module : modules )
{
- String abname = ((WikiModuleInfo)i.next()).getAdminBeanClass();
+ String abname = module.getAdminBeanClass();
try
{
if( abname != null && abname.length() > 0 )
{
- Class abclass = Class.forName(abname);
+ Class<?> abclass = Class.forName(abname);
AdminBean ab = (AdminBean) abclass.newInstance();
@@ -232,7 +231,7 @@
*
* @return all AdminBeans known to the manager
*/
- public List getAllBeans()
+ public List<AdminBean> getAllBeans()
{
if( m_allBeans == null ) reload();
@@ -248,14 +247,11 @@
*/
public AdminBean findBean( String id )
{
- for( Iterator i = m_allBeans.iterator(); i.hasNext(); )
+ for( AdminBean ab : m_allBeans )
{
- AdminBean ab = (AdminBean) i.next();
-
if( ab.getId().equals(id) )
return ab;
}
-
return null;
}
@@ -287,11 +283,10 @@
{
if( ((WikiEngineEvent)event).getType() == WikiEngineEvent.SHUTDOWN )
{
- for( Iterator i = m_allBeans.iterator(); i.hasNext(); )
+ for( AdminBean ab : m_allBeans )
{
try
{
- AdminBean ab = (AdminBean) i.next();
ObjectName on = getObjectName( ab );
if( m_mbeanServer.isRegistered( on ) )
{
Modified: incubator/jspwiki/trunk/src/java/org/apache/wiki/ui/admin/WikiFormAdminBean.java
URL: http://svn.apache.org/viewvc/incubator/jspwiki/trunk/src/java/org/apache/wiki/ui/admin/WikiFormAdminBean.java?rev=763924&r1=763923&r2=763924&view=diff
==============================================================================
--- incubator/jspwiki/trunk/src/java/org/apache/wiki/ui/admin/WikiFormAdminBean.java (original)
+++ incubator/jspwiki/trunk/src/java/org/apache/wiki/ui/admin/WikiFormAdminBean.java Fri Apr 10 13:16:16 2009
@@ -40,7 +40,7 @@
{
public abstract String getForm( WikiContext context );
- public abstract void handleResponse( WikiContext context, Map params );
+ public abstract void handleResponse( WikiContext context, Map<?,?> params );
public String doGet(WikiContext context)
{
@@ -58,7 +58,6 @@
}
catch (IOException e)
{
- // TODO Auto-generated catch block
e.printStackTrace();
}
Modified: incubator/jspwiki/trunk/tests/java/org/apache/wiki/auth/AuthenticationManagerTest.java
URL: http://svn.apache.org/viewvc/incubator/jspwiki/trunk/tests/java/org/apache/wiki/auth/AuthenticationManagerTest.java?rev=763924&r1=763923&r2=763924&view=diff
==============================================================================
--- incubator/jspwiki/trunk/tests/java/org/apache/wiki/auth/AuthenticationManagerTest.java (original)
+++ incubator/jspwiki/trunk/tests/java/org/apache/wiki/auth/AuthenticationManagerTest.java Fri Apr 10 13:16:16 2009
@@ -24,7 +24,10 @@
import java.util.Map;
import java.util.Properties;
+import javax.servlet.http.HttpServletRequest;
+
import org.apache.wiki.TestEngine;
+import org.apache.wiki.WikiEngine;
import org.apache.wiki.WikiSession;
import org.apache.wiki.WikiSessionTest;
import org.apache.wiki.auth.AuthenticationManager;
@@ -34,6 +37,7 @@
import org.apache.wiki.auth.authorize.Group;
import org.apache.wiki.auth.authorize.GroupManager;
import org.apache.wiki.auth.authorize.Role;
+import org.apache.wiki.auth.authorize.WebAuthorizer;
import org.apache.wiki.auth.login.CookieAssertionLoginModule;
import junit.framework.Test;
@@ -43,18 +47,63 @@
/**
* Tests the AuthorizationManager class.
+ *
* @author Janne Jalkanen
*/
public class AuthenticationManagerTest extends TestCase
{
+ public static class DummyAuthorizer implements WebAuthorizer
+ {
+ private static Principal[] m_roles = new Principal[] { new Role( "ContainerRole" ), new Role( "AuthorizerRole" ),
+ new Role( "DummyRole" ) };
+
+ public Principal findRole( String role )
+ {
+ for( Principal principal : m_roles )
+ {
+ if( principal.getName().equals( role ) )
+ {
+ return principal;
+ }
+ }
+ return null;
+ }
+
+ public Principal[] getRoles()
+ {
+ return m_roles;
+ }
+
+ public void initialize( WikiEngine engine, Properties props ) throws WikiSecurityException
+ {
+ }
+
+ public boolean isUserInRole( HttpServletRequest request, Principal role )
+ {
+ return request != null && "ContainerRole".equals( role.getName() );
+ }
+
+ public boolean isUserInRole( WikiSession session, Principal role )
+ {
+ return session != null && "AuthorizerRole".equals( role.getName() );
+ }
+ }
+
+ public static Test suite()
+ {
+ TestSuite suite = new TestSuite( "Authentication Manager test" );
+ suite.addTestSuite( AuthenticationManagerTest.class );
+ return suite;
+ }
+
private AuthenticationManager m_auth;
- private TestEngine m_engine;
-
- private GroupManager m_groupMgr;
-
- private WikiSession m_session;
-
+ private TestEngine m_engine;
+
+ private GroupManager m_groupMgr;
+
+ private WikiSession m_session;
+
public AuthenticationManagerTest( String s )
{
super( s );
@@ -70,20 +119,42 @@
m_session = WikiSessionTest.adminSession( m_engine );
}
- protected void tearDown() throws Exception
+ /**
+ * Tests a dummy WebAuthorizer that is guaranteed to return true for one
+ * role for each of the two <code>isInRole</code> methods.
+ *
+ * @throws Exception
+ */
+ public void testCustomAuthorizer() throws Exception
{
- super.tearDown();
- m_engine.shutdown();
- }
+ Properties props = new Properties();
+ props.load( TestEngine.findTestProperties() );
+ props.put( AuthorizationManager.PROP_AUTHORIZER, "org.apache.wiki.auth.AuthenticationManagerTest$DummyAuthorizer" );
+ m_engine = new TestEngine( props );
- public void testIsUserPrincipal()
- {
- assertTrue( AuthenticationManager.isUserPrincipal( new WikiPrincipal( "Foo" ) ) );
- assertFalse( AuthenticationManager.isUserPrincipal( new GroupPrincipal( "Group1" ) ) );
- assertFalse( AuthenticationManager.isUserPrincipal( new Role( "Role1" ) ) );
- assertFalse( AuthenticationManager.isUserPrincipal( Role.ANONYMOUS ) );
+ // Start a session without any container roles: DummyAuthorizer should ALWAYS allow AuthorizerRole
+ WikiSession session = WikiSessionTest.authenticatedSession( m_engine, Users.JANNE, Users.JANNE_PASS );
+ assertTrue( session.hasPrincipal( Role.ALL ) );
+ assertTrue( session.hasPrincipal( Role.AUTHENTICATED ) );
+ assertTrue( session.hasPrincipal( new WikiPrincipal( Users.JANNE, WikiPrincipal.LOGIN_NAME ) ) );
+ assertTrue( session.hasPrincipal( new WikiPrincipal( "JanneJalkanen", WikiPrincipal.WIKI_NAME ) ) );
+ assertTrue( session.hasPrincipal( new WikiPrincipal( "Janne Jalkanen", WikiPrincipal.FULL_NAME ) ) );
+ assertTrue( session.hasPrincipal( new Role( "AuthorizerRole") ) );
+ assertFalse( session.hasPrincipal( new Role( "ContainerRole") ) );
+ assertFalse( session.hasPrincipal( new Role( "DummyRole") ) );
+
+ // Try again with a container-authenticated session: DummyAuthorizer should ALSO allow ContainerRole
+ session = WikiSessionTest.containerAuthenticatedSession( m_engine, Users.JANNE, new Principal[0] );
+ assertTrue( session.hasPrincipal( Role.ALL ) );
+ assertTrue( session.hasPrincipal( Role.AUTHENTICATED ) );
+ assertTrue( session.hasPrincipal( new WikiPrincipal( Users.JANNE, WikiPrincipal.LOGIN_NAME ) ) );
+ assertTrue( session.hasPrincipal( new WikiPrincipal( "JanneJalkanen", WikiPrincipal.WIKI_NAME ) ) );
+ assertTrue( session.hasPrincipal( new WikiPrincipal( "Janne Jalkanen", WikiPrincipal.FULL_NAME ) ) );
+ assertTrue( session.hasPrincipal( new Role( "AuthorizerRole") ) );
+ assertTrue( session.hasPrincipal( new Role( "ContainerRole") ) );
+ assertFalse( session.hasPrincipal( new Role( "DummyRole") ) );
}
-
+
public void testCustomJAASLoginModule() throws Exception
{
Properties props = new Properties();
@@ -92,10 +163,10 @@
// Supply a custom LoginModule class
props.put( "jspwiki.loginModule.class", "org.apache.wiki.auth.login.CookieAssertionLoginModule" );
- // Init the engine and verify that we initialized with a custom auth login module
- m_engine.shutdown();
- m_engine = new TestEngine( props );
- AuthenticationManager authMgr= m_engine.getAuthenticationManager();
+ // Init the engine and verify that we initialized with a custom auth
+ // login module
+ WikiEngine engine = new TestEngine( props );
+ AuthenticationManager authMgr = engine.getAuthenticationManager();
assertEquals( CookieAssertionLoginModule.class, authMgr.m_loginModuleClass );
}
@@ -103,24 +174,32 @@
{
Properties props = new Properties();
props.load( TestEngine.findTestProperties() );
-
+
// Supply a custom LoginModule options
props.put( "jspwiki.loginModule.options.key1", "value1" );
props.put( "jspwiki.loginModule.options.key2", "value2" );
props.put( "jspwiki.loginModule.options.key3", "value3" );
-
- // Init the engine and verify that we initialized with the correct options
- m_engine.shutdown();
- m_engine = new TestEngine( props );
- AuthenticationManager authMgr= m_engine.getAuthenticationManager();
- Map<String,String> options = authMgr.m_loginModuleOptions;
+
+ // Init the engine and verify that we initialized with the correct
+ // options
+ WikiEngine engine = new TestEngine( props );
+ AuthenticationManager authMgr = engine.getAuthenticationManager();
+ Map<String, String> options = authMgr.m_loginModuleOptions;
assertEquals( 3, options.size() );
assertTrue( options.containsKey( "key1" ) );
assertTrue( options.containsKey( "key2" ) );
assertTrue( options.containsKey( "key3" ) );
- assertEquals( "value1", options.get( "key1") );
- assertEquals( "value2", options.get( "key2") );
- assertEquals( "value3", options.get( "key3") );
+ assertEquals( "value1", options.get( "key1" ) );
+ assertEquals( "value2", options.get( "key2" ) );
+ assertEquals( "value3", options.get( "key3" ) );
+ }
+
+ public void testIsUserPrincipal()
+ {
+ assertTrue( AuthenticationManager.isUserPrincipal( new WikiPrincipal( "Foo" ) ) );
+ assertFalse( AuthenticationManager.isUserPrincipal( new GroupPrincipal( "Group1" ) ) );
+ assertFalse( AuthenticationManager.isUserPrincipal( new Role( "Role1" ) ) );
+ assertFalse( AuthenticationManager.isUserPrincipal( Role.ANONYMOUS ) );
}
public void testLoginCustom() throws Exception
@@ -130,30 +209,31 @@
assertTrue( session.hasPrincipal( Role.AUTHENTICATED ) );
assertTrue( session.hasPrincipal( new WikiPrincipal( Users.JANNE, WikiPrincipal.LOGIN_NAME ) ) );
assertTrue( session.hasPrincipal( new WikiPrincipal( "JanneJalkanen", WikiPrincipal.WIKI_NAME ) ) );
- assertTrue( session.hasPrincipal( new WikiPrincipal( "Janne Jalkanen", WikiPrincipal.FULL_NAME ) ) );
+ assertTrue( session.hasPrincipal( new WikiPrincipal( "Janne Jalkanen", WikiPrincipal.FULL_NAME ) ) );
}
-
+
public void testLoginCustomWithGroup() throws Exception
{
- // Flush any pre-existing groups (left over from previous failures, perhaps)
+ // Flush any pre-existing groups (left over from previous failures,
+ // perhaps)
try
{
m_groupMgr.removeGroup( "Test1" );
m_groupMgr.removeGroup( "Test2" );
}
- catch ( NoSuchPrincipalException e )
+ catch( NoSuchPrincipalException e )
{
-
+
}
-
+
// Log in 'janne' and verify there are 5 principals in the subject
// (ALL, AUTHENTICATED, login, fullname, wikiname Principals)
WikiSession session = WikiSession.guestSession( m_engine );
- m_auth.login( session, Users.JANNE, Users.JANNE_PASS );
+ m_auth.login( session, null, Users.JANNE, Users.JANNE_PASS );
assertEquals( 3, session.getPrincipals().length );
assertEquals( 2, session.getRoles().length );
- assertTrue( session.hasPrincipal( new WikiPrincipal( "JanneJalkanen", WikiPrincipal.WIKI_NAME ) ) );
-
+ assertTrue( session.hasPrincipal( new WikiPrincipal( "JanneJalkanen", WikiPrincipal.WIKI_NAME ) ) );
+
// Listen for any manager group-add events
GroupManager manager = m_engine.getGroupManager();
SecurityEventTrap trap = new SecurityEventTrap();
@@ -164,43 +244,38 @@
m_groupMgr.setGroup( m_session, groupTest1 );
groupTest1 = m_groupMgr.getGroup( "Test1" );
Principal principalTest1 = groupTest1.getPrincipal();
-
+
Group groupTest2 = m_groupMgr.parseGroup( "Test2", "Alice \n Bob \n Charlie", true );
m_groupMgr.setGroup( m_session, groupTest2 );
groupTest2 = m_groupMgr.getGroup( "Test2" );
Principal principalTest2 = groupTest2.getPrincipal();
-
+
// We should see two security events (one for each group create)
// We should also see a GroupPrincipal for group Test1, but not Test2
assertEquals( 2, trap.events().length );
assertTrue( session.hasPrincipal( principalTest1 ) );
assertFalse( session.hasPrincipal( principalTest2 ) );
-
+
// If we remove Test1, the GroupPrincipal should disappear
m_groupMgr.removeGroup( "Test1" );
assertFalse( session.hasPrincipal( principalTest1 ) );
assertFalse( session.hasPrincipal( principalTest2 ) );
-
- // Now, add 'JanneJalkanen' to Test2 group manually; we should see the GroupPrincipal
+
+ // Now, add 'JanneJalkanen' to Test2 group manually; we should see the
+ // GroupPrincipal
groupTest2.add( new WikiPrincipal( "JanneJalkanen" ) );
m_groupMgr.setGroup( session, groupTest2 );
assertFalse( session.hasPrincipal( principalTest1 ) );
assertTrue( session.hasPrincipal( principalTest2 ) );
-
+
// Remove 'JanneJalkenen' manually; the GroupPrincipal should disappear
groupTest2.remove( new WikiPrincipal( "JanneJalkanen" ) );
m_groupMgr.setGroup( session, groupTest2 );
assertFalse( session.hasPrincipal( principalTest1 ) );
assertFalse( session.hasPrincipal( principalTest2 ) );
-
+
// Clean up
m_groupMgr.removeGroup( "Test2" );
}
-
- public static Test suite()
- {
- TestSuite suite = new TestSuite("Authentication Manager test");
- suite.addTestSuite( AuthenticationManagerTest.class );
- return suite;
- }
-}
\ No newline at end of file
+
+}
Modified: incubator/jspwiki/trunk/tests/java/org/apache/wiki/auth/AuthorizationManagerTest.java
URL: http://svn.apache.org/viewvc/incubator/jspwiki/trunk/tests/java/org/apache/wiki/auth/AuthorizationManagerTest.java?rev=763924&r1=763923&r2=763924&view=diff
==============================================================================
--- incubator/jspwiki/trunk/tests/java/org/apache/wiki/auth/AuthorizationManagerTest.java (original)
+++ incubator/jspwiki/trunk/tests/java/org/apache/wiki/auth/AuthorizationManagerTest.java Fri Apr 10 13:16:16 2009
@@ -20,7 +20,6 @@
*/
package org.apache.wiki.auth;
-import java.io.File;
import java.security.Permission;
import java.security.Principal;
import java.util.Properties;
@@ -33,7 +32,6 @@
import org.apache.wiki.*;
import org.apache.wiki.api.WikiException;
import org.apache.wiki.api.WikiPage;
-import org.apache.wiki.attachment.Attachment;
import org.apache.wiki.auth.AuthorizationManager;
import org.apache.wiki.auth.GroupPrincipal;
import org.apache.wiki.auth.WikiPrincipal;
Modified: incubator/jspwiki/trunk/tests/java/org/apache/wiki/auth/login/AnonymousLoginModuleTest.java
URL: http://svn.apache.org/viewvc/incubator/jspwiki/trunk/tests/java/org/apache/wiki/auth/login/AnonymousLoginModuleTest.java?rev=763924&r1=763923&r2=763924&view=diff
==============================================================================
--- incubator/jspwiki/trunk/tests/java/org/apache/wiki/auth/login/AnonymousLoginModuleTest.java (original)
+++ incubator/jspwiki/trunk/tests/java/org/apache/wiki/auth/login/AnonymousLoginModuleTest.java Fri Apr 10 13:16:16 2009
@@ -32,10 +32,10 @@
import javax.servlet.http.HttpServletRequest;
import org.apache.wiki.NoRequiredPropertyException;
-import org.apache.wiki.TestAuthorizer;
import org.apache.wiki.TestEngine;
-import org.apache.wiki.auth.Authorizer;
+import org.apache.wiki.api.WikiException;
import org.apache.wiki.auth.WikiPrincipal;
+import org.apache.wiki.auth.WikiSecurityException;
import org.apache.wiki.auth.authorize.Role;
import org.apache.wiki.auth.login.AnonymousLoginModule;
import org.apache.wiki.auth.login.WebContainerCallbackHandler;
@@ -50,26 +50,24 @@
*/
public class AnonymousLoginModuleTest extends TestCase
{
- Authorizer authorizer;
+ UserDatabase m_db;
- UserDatabase db;
-
- Subject subject;
+ Subject m_subject;
private TestEngine m_engine;
- public final void testLogin()
+ public final void testLogin() throws WikiException
{
HttpServletRequest request = m_engine.newHttpRequest();
try
{
// Test using IP address (AnonymousLoginModule succeeds)
- CallbackHandler handler = new WebContainerCallbackHandler( m_engine, request, authorizer );
+ CallbackHandler handler = new WebContainerCallbackHandler( m_engine, request );
LoginModule module = new AnonymousLoginModule();
- module.initialize(subject, handler, new HashMap<String, Object>(), new HashMap<String, Object>());
+ module.initialize( m_subject, handler, new HashMap<String, Object>(), new HashMap<String, Object>() );
module.login();
module.commit();
- Set<Principal> principals = subject.getPrincipals();
+ Set<Principal> principals = m_subject.getPrincipals();
assertEquals( 1, principals.size() );
assertTrue( principals.contains( new WikiPrincipal( "127.0.0.1" ) ) );
assertFalse( principals.contains( Role.ANONYMOUS ) );
@@ -82,19 +80,19 @@
}
}
- public final void testLogout()
+ public final void testLogout() throws WikiSecurityException
{
HttpServletRequest request = m_engine.newHttpRequest();
try
{
- CallbackHandler handler = new WebContainerCallbackHandler( m_engine, request, authorizer );
+ CallbackHandler handler = new WebContainerCallbackHandler( m_engine, request );
LoginModule module = new AnonymousLoginModule();
- module.initialize(subject, handler,
+ module.initialize( m_subject, handler,
new HashMap<String, Object>(),
- new HashMap<String, Object>());
+ new HashMap<String, Object>() );
module.login();
module.commit();
- Set<Principal> principals = subject.getPrincipals();
+ Set<Principal> principals = m_subject.getPrincipals();
assertEquals( 1, principals.size() );
assertTrue( principals.contains( new WikiPrincipal( "127.0.0.1" ) ) );
assertFalse( principals.contains( Role.ANONYMOUS ) );
@@ -118,13 +116,11 @@
props.load( TestEngine.findTestProperties() );
props.put(XMLUserDatabase.PROP_USERDATABASE, "tests/etc/userdatabase.xml");
m_engine = new TestEngine(props);
- authorizer = new TestAuthorizer();
- authorizer.initialize( m_engine, props );
- db = new XMLUserDatabase();
- subject = new Subject();
+ m_db = new XMLUserDatabase();
+ m_subject = new Subject();
try
{
- db.initialize( m_engine, props );
+ m_db.initialize( m_engine, props );
}
catch( NoRequiredPropertyException e )
{
@@ -133,10 +129,4 @@
}
}
- protected void tearDown() throws Exception
- {
- super.tearDown();
- m_engine.shutdown();
- }
-
}
\ No newline at end of file
Modified: incubator/jspwiki/trunk/tests/java/org/apache/wiki/auth/login/CookieAssertionLoginModuleTest.java
URL: http://svn.apache.org/viewvc/incubator/jspwiki/trunk/tests/java/org/apache/wiki/auth/login/CookieAssertionLoginModuleTest.java?rev=763924&r1=763923&r2=763924&view=diff
==============================================================================
--- incubator/jspwiki/trunk/tests/java/org/apache/wiki/auth/login/CookieAssertionLoginModuleTest.java (original)
+++ incubator/jspwiki/trunk/tests/java/org/apache/wiki/auth/login/CookieAssertionLoginModuleTest.java Fri Apr 10 13:16:16 2009
@@ -31,36 +31,30 @@
import javax.security.auth.spi.LoginModule;
import javax.servlet.http.Cookie;
+import junit.framework.TestCase;
+import net.sourceforge.stripes.mock.MockHttpServletRequest;
+
import org.apache.wiki.NoRequiredPropertyException;
-import org.apache.wiki.TestAuthorizer;
import org.apache.wiki.TestEngine;
-import org.apache.wiki.auth.Authorizer;
import org.apache.wiki.auth.WikiPrincipal;
+import org.apache.wiki.auth.WikiSecurityException;
import org.apache.wiki.auth.authorize.Role;
-import org.apache.wiki.auth.login.CookieAssertionLoginModule;
-import org.apache.wiki.auth.login.WebContainerCallbackHandler;
import org.apache.wiki.auth.user.UserDatabase;
import org.apache.wiki.auth.user.XMLUserDatabase;
-import net.sourceforge.stripes.mock.MockHttpServletRequest;
-
-import junit.framework.TestCase;
-
/**
* @author Andrew R. Jaquith
*/
public class CookieAssertionLoginModuleTest extends TestCase
{
- Authorizer authorizer;
-
- UserDatabase db;
+ UserDatabase m_db;
- Subject subject;
+ Subject m_subject;
private TestEngine m_engine;
- public final void testLogin()
+ public final void testLogin() throws WikiSecurityException
{
MockHttpServletRequest request = m_engine.newHttpRequest();
try
@@ -71,15 +65,15 @@
// Test using Cookie and IP address (AnonymousLoginModule succeeds)
Cookie cookie = new Cookie( CookieAssertionLoginModule.PREFS_COOKIE_NAME, "Bullwinkle" );
request.setCookies( new Cookie[] { cookie } );
- subject = new Subject();
- CallbackHandler handler = new WebContainerCallbackHandler( m_engine, request, authorizer );
+ m_subject = new Subject();
+ CallbackHandler handler = new WebContainerCallbackHandler( m_engine, request );
LoginModule module = new CookieAssertionLoginModule();
- module.initialize(subject, handler,
+ module.initialize( m_subject, handler,
new HashMap<String, Object>(),
- new HashMap<String, Object>());
+ new HashMap<String, Object>() );
module.login();
module.commit();
- Set<Principal> principals = subject.getPrincipals();
+ Set<Principal> principals = m_subject.getPrincipals();
assertEquals( 1, principals.size() );
assertTrue( principals.contains( new WikiPrincipal( "Bullwinkle" ) ) );
assertFalse( principals.contains( Role.ASSERTED ) );
@@ -92,21 +86,21 @@
}
}
- public final void testLogout()
+ public final void testLogout() throws WikiSecurityException
{
MockHttpServletRequest request = m_engine.newHttpRequest();
Cookie cookie = new Cookie( CookieAssertionLoginModule.PREFS_COOKIE_NAME, "Bullwinkle" );
request.setCookies( new Cookie[] { cookie } );
try
{
- CallbackHandler handler = new WebContainerCallbackHandler( m_engine, request, authorizer );
+ CallbackHandler handler = new WebContainerCallbackHandler( m_engine, request );
LoginModule module = new CookieAssertionLoginModule();
- module.initialize(subject, handler,
+ module.initialize( m_subject, handler,
new HashMap<String, Object>(),
- new HashMap<String, Object>());
+ new HashMap<String, Object>() );
module.login();
module.commit();
- Set<Principal> principals = subject.getPrincipals();
+ Set<Principal> principals = m_subject.getPrincipals();
assertEquals( 1, principals.size() );
assertTrue( principals.contains( new WikiPrincipal( "Bullwinkle" ) ) );
assertFalse( principals.contains( Role.ANONYMOUS ) );
@@ -130,13 +124,11 @@
props.load( TestEngine.findTestProperties() );
props.put(XMLUserDatabase.PROP_USERDATABASE, "tests/etc/userdatabase.xml");
m_engine = new TestEngine(props);
- authorizer = new TestAuthorizer();
- authorizer.initialize( m_engine, props );
- db = new XMLUserDatabase();
- subject = new Subject();
+ m_db = new XMLUserDatabase();
+ m_subject = new Subject();
try
{
- db.initialize( m_engine, props );
+ m_db.initialize( m_engine, props );
}
catch( NoRequiredPropertyException e )
{
@@ -145,10 +137,4 @@
}
}
- protected void tearDown() throws Exception
- {
- super.tearDown();
- m_engine.shutdown();
- }
-
}
\ No newline at end of file
Modified: incubator/jspwiki/trunk/tests/java/org/apache/wiki/auth/login/UserDatabaseLoginModuleTest.java
URL: http://svn.apache.org/viewvc/incubator/jspwiki/trunk/tests/java/org/apache/wiki/auth/login/UserDatabaseLoginModuleTest.java?rev=763924&r1=763923&r2=763924&view=diff
==============================================================================
--- incubator/jspwiki/trunk/tests/java/org/apache/wiki/auth/login/UserDatabaseLoginModuleTest.java (original)
+++ incubator/jspwiki/trunk/tests/java/org/apache/wiki/auth/login/UserDatabaseLoginModuleTest.java Fri Apr 10 13:16:16 2009
@@ -22,7 +22,6 @@
import java.security.Principal;
import java.util.HashMap;
-import java.util.Locale;
import java.util.Properties;
import java.util.Set;
@@ -31,28 +30,27 @@
import javax.security.auth.login.LoginException;
import javax.security.auth.spi.LoginModule;
+import junit.framework.TestCase;
+
import org.apache.wiki.NoRequiredPropertyException;
import org.apache.wiki.TestEngine;
+import org.apache.wiki.WikiEngine;
import org.apache.wiki.auth.WikiPrincipal;
import org.apache.wiki.auth.authorize.Role;
-import org.apache.wiki.auth.login.UserDatabaseLoginModule;
-import org.apache.wiki.auth.login.WikiCallbackHandler;
import org.apache.wiki.auth.user.UserDatabase;
import org.apache.wiki.auth.user.XMLUserDatabase;
-import junit.framework.TestCase;
-
/**
* @author Andrew R. Jaquith
*/
public class UserDatabaseLoginModuleTest extends TestCase
{
- UserDatabase db;
+ WikiEngine m_engine;
- Subject subject;
-
- private TestEngine m_engine = null;
+ UserDatabase m_db;
+
+ Subject m_subject;
public final void testLogin()
{
@@ -61,27 +59,27 @@
// Log in with a user that isn't in the database
CallbackHandler handler = new WikiCallbackHandler( m_engine, null, "user", "password" );
LoginModule module = new UserDatabaseLoginModule();
- module.initialize(subject, handler,
+ module.initialize( m_subject, handler,
new HashMap<String, Object>(),
- new HashMap<String, Object>());
+ new HashMap<String, Object>() );
module.login();
module.commit();
- Set<Principal> principals = subject.getPrincipals();
+ Set<Principal> principals = m_subject.getPrincipals();
assertEquals( 1, principals.size() );
assertTrue( principals.contains( new WikiPrincipal( "user", WikiPrincipal.LOGIN_NAME ) ) );
assertFalse( principals.contains( Role.AUTHENTICATED ) );
assertFalse( principals.contains( Role.ALL ) );
// Login with a user that IS in the database
- subject = new Subject();
+ m_subject = new Subject();
handler = new WikiCallbackHandler( m_engine, null, "janne", "myP@5sw0rd" );
module = new UserDatabaseLoginModule();
- module.initialize(subject, handler,
+ module.initialize( m_subject, handler,
new HashMap<String, Object>(),
- new HashMap<String, Object>());
+ new HashMap<String, Object>() );
module.login();
module.commit();
- principals = subject.getPrincipals();
+ principals = m_subject.getPrincipals();
assertEquals( 1, principals.size() );
assertTrue( principals.contains( new WikiPrincipal( "janne", WikiPrincipal.LOGIN_NAME ) ) );
assertFalse( principals.contains( Role.AUTHENTICATED ) );
@@ -100,12 +98,12 @@
{
CallbackHandler handler = new WikiCallbackHandler( m_engine, null, "user", "password" );
LoginModule module = new UserDatabaseLoginModule();
- module.initialize(subject, handler,
+ module.initialize( m_subject, handler,
new HashMap<String, Object>(),
- new HashMap<String, Object>());
+ new HashMap<String, Object>() );
module.login();
module.commit();
- Set<Principal> principals = subject.getPrincipals();
+ Set<Principal> principals = m_subject.getPrincipals();
assertEquals( 1, principals.size() );
assertTrue( principals.contains( new WikiPrincipal( "user", WikiPrincipal.LOGIN_NAME ) ) );
assertFalse( principals.contains( Role.AUTHENTICATED ) );
@@ -128,12 +126,12 @@
Properties props = new Properties();
props.load( TestEngine.findTestProperties() );
props.put(XMLUserDatabase.PROP_USERDATABASE, "tests/etc/userdatabase.xml");
- m_engine = new TestEngine(props);
- db = new XMLUserDatabase();
- subject = new Subject();
+ m_engine = new TestEngine(props);
+ m_db = new XMLUserDatabase();
+ m_subject = new Subject();
try
{
- db.initialize( m_engine, props );
+ m_db.initialize( m_engine, props );
}
catch( NoRequiredPropertyException e )
{
@@ -142,9 +140,4 @@
}
}
- protected void tearDown() throws Exception
- {
- super.tearDown();
- m_engine.shutdown();
- }
}
\ No newline at end of file
Modified: incubator/jspwiki/trunk/tests/java/org/apache/wiki/auth/login/WebContainerLoginModuleTest.java
URL: http://svn.apache.org/viewvc/incubator/jspwiki/trunk/tests/java/org/apache/wiki/auth/login/WebContainerLoginModuleTest.java?rev=763924&r1=763923&r2=763924&view=diff
==============================================================================
--- incubator/jspwiki/trunk/tests/java/org/apache/wiki/auth/login/WebContainerLoginModuleTest.java (original)
+++ incubator/jspwiki/trunk/tests/java/org/apache/wiki/auth/login/WebContainerLoginModuleTest.java Fri Apr 10 13:16:16 2009
@@ -22,7 +22,6 @@
import java.security.Principal;
import java.util.HashMap;
-import java.util.HashSet;
import java.util.Properties;
import java.util.Set;
@@ -31,36 +30,30 @@
import javax.security.auth.login.LoginException;
import javax.security.auth.spi.LoginModule;
+import junit.framework.TestCase;
+import net.sourceforge.stripes.mock.MockHttpServletRequest;
+
import org.apache.wiki.NoRequiredPropertyException;
-import org.apache.wiki.TestAuthorizer;
import org.apache.wiki.TestEngine;
-import org.apache.wiki.auth.Authorizer;
import org.apache.wiki.auth.WikiPrincipal;
+import org.apache.wiki.auth.WikiSecurityException;
import org.apache.wiki.auth.authorize.Role;
-import org.apache.wiki.auth.login.WebContainerCallbackHandler;
-import org.apache.wiki.auth.login.WebContainerLoginModule;
import org.apache.wiki.auth.user.UserDatabase;
import org.apache.wiki.auth.user.XMLUserDatabase;
-import net.sourceforge.stripes.mock.MockHttpServletRequest;
-
-import junit.framework.TestCase;
-
/**
* @author Andrew R. Jaquith
*/
public class WebContainerLoginModuleTest extends TestCase
{
- Authorizer authorizer;
-
- UserDatabase db;
+ UserDatabase m_db;
- Subject subject;
+ Subject m_subject;
private TestEngine m_engine;
- public final void testLogin()
+ public final void testLogin() throws WikiSecurityException
{
Principal principal = new WikiPrincipal( "Andrew Jaquith" );
MockHttpServletRequest request = m_engine.newHttpRequest();
@@ -68,14 +61,14 @@
try
{
// Test using Principal (WebContainerLoginModule succeeds)
- CallbackHandler handler = new WebContainerCallbackHandler( m_engine, request, authorizer );
+ CallbackHandler handler = new WebContainerCallbackHandler( m_engine, request );
LoginModule module = new WebContainerLoginModule();
- module.initialize(subject, handler,
+ module.initialize( m_subject, handler,
new HashMap<String, Object>(),
new HashMap<String, Object>());
module.login();
module.commit();
- Set<Principal> principals = subject.getPrincipals();
+ Set<Principal> principals = m_subject.getPrincipals();
assertEquals( 1, principals.size() );
assertTrue( principals.contains( principal ) );
assertFalse( principals.contains( Role.ANONYMOUS ) );
@@ -90,51 +83,21 @@
}
}
- public final void testLoginWithRoles() throws Exception
- {
- // Create user with 2 container roles; TestAuthorizer knows about these
- Principal principal = new WikiPrincipal( "Andrew Jaquith" );
- MockHttpServletRequest request = m_engine.newHttpRequest();
- request.setUserPrincipal( principal );
- Set<String> roles = new HashSet<String>();
- roles.add( "IT" );
- roles.add( "Engineering" );
- request.setRoles( roles );
-
- // Test using Principal (WebContainerLoginModule succeeds)
- CallbackHandler handler = new WebContainerCallbackHandler( m_engine, request, authorizer );
- LoginModule module = new WebContainerLoginModule();
- module.initialize(subject, handler,
- new HashMap<String, Object>(),
- new HashMap<String, Object>());
- module.login();
- module.commit();
- Set<Principal> principals = subject.getPrincipals();
- assertEquals( 3, principals.size() );
- assertTrue( principals.contains( principal ) );
- assertFalse( principals.contains( Role.ANONYMOUS ) );
- assertFalse( principals.contains( Role.ASSERTED ) );
- assertFalse( principals.contains( Role.AUTHENTICATED ) );
- assertFalse( principals.contains( Role.ALL ) );
- assertTrue( principals.contains( new Role( "IT" ) ) );
- assertTrue( principals.contains( new Role( "Engineering" ) ) );
- }
-
- public final void testLogout()
+ public final void testLogout() throws WikiSecurityException
{
Principal principal = new WikiPrincipal( "Andrew Jaquith" );
MockHttpServletRequest request = m_engine.newHttpRequest();
request.setUserPrincipal( principal );
try
{
- CallbackHandler handler = new WebContainerCallbackHandler( m_engine, request, authorizer );
+ CallbackHandler handler = new WebContainerCallbackHandler( m_engine, request );
LoginModule module = new WebContainerLoginModule();
- module.initialize(subject, handler,
+ module.initialize( m_subject, handler,
new HashMap<String, Object>(),
new HashMap<String, Object>());
module.login();
module.commit();
- Set<Principal> principals = subject.getPrincipals();
+ Set<Principal> principals = m_subject.getPrincipals();
assertEquals( 1, principals.size() );
assertTrue( principals.contains( principal ) );
assertFalse( principals.contains( Role.AUTHENTICATED ) );
@@ -158,13 +121,11 @@
props.load( TestEngine.findTestProperties() );
props.put(XMLUserDatabase.PROP_USERDATABASE, "tests/etc/userdatabase.xml");
m_engine = new TestEngine(props);
- authorizer = new TestAuthorizer();
- authorizer.initialize( m_engine, props );
- db = new XMLUserDatabase();
- subject = new Subject();
+ m_db = new XMLUserDatabase();
+ m_subject = new Subject();
try
{
- db.initialize( m_engine, props );
+ m_db.initialize( m_engine, props );
}
catch( NoRequiredPropertyException e )
{
@@ -172,11 +133,5 @@
assertTrue( false );
}
}
-
- protected void tearDown() throws Exception
- {
- super.tearDown();
- m_engine.shutdown();
- }
}
\ No newline at end of file
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=763924&r1=763923&r2=763924&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 Fri Apr 10 13:16:16 2009
@@ -87,12 +87,12 @@
Thread.sleep( 10000L ); // Should cover for both index and initial delay
- Collection res = m_mgr.findPages( "mankind" );
+ Collection<SearchResult> res = m_mgr.findPages( "mankind" );
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 testSimpleSearch2()
@@ -108,12 +108,12 @@
Thread.sleep( 10000L ); // Should cover for both index and initial delay
- Collection res = m_mgr.findPages( "mankind" );
+ Collection<SearchResult> res = m_mgr.findPages( "mankind" );
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 testSimpleSearch3()
@@ -134,7 +134,7 @@
Thread.sleep( 10000L ); // Should cover for both index and initial delay
- Collection res = m_mgr.findPages( "mankind" );
+ Collection<SearchResult> res = m_mgr.findPages( "mankind" );
assertNotNull( "found results", res );
assertEquals( "empty results", 0, res.size() );
@@ -143,7 +143,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 testTitleSearch()
Modified: incubator/jspwiki/trunk/tests/java/org/apache/wiki/ui/migrator/BundleMigratorTest.java
URL: http://svn.apache.org/viewvc/incubator/jspwiki/trunk/tests/java/org/apache/wiki/ui/migrator/BundleMigratorTest.java?rev=763924&r1=763923&r2=763924&view=diff
==============================================================================
--- incubator/jspwiki/trunk/tests/java/org/apache/wiki/ui/migrator/BundleMigratorTest.java (original)
+++ incubator/jspwiki/trunk/tests/java/org/apache/wiki/ui/migrator/BundleMigratorTest.java Fri Apr 10 13:16:16 2009
@@ -80,10 +80,10 @@
{
// Delete sample "to" and "from" property files
File sourcePropfile = new File( tmp, ( locale.length() == 0 ? "source" : "source_" + locale ) + ".properties" );
- //sourcePropfile.delete();
+ sourcePropfile.delete();
File destPropfile = new File( tmp, ( locale.length() == 0 ? "dest" : "dest_" + locale ) + ".properties" );
- //destPropfile.delete();
+ destPropfile.delete();
}
}
Modified: incubator/jspwiki/trunk/tests/java/org/apache/wiki/ui/migrator/JSPWikiJspTransformerTest.java
URL: http://svn.apache.org/viewvc/incubator/jspwiki/trunk/tests/java/org/apache/wiki/ui/migrator/JSPWikiJspTransformerTest.java?rev=763924&r1=763923&r2=763924&view=diff
==============================================================================
--- incubator/jspwiki/trunk/tests/java/org/apache/wiki/ui/migrator/JSPWikiJspTransformerTest.java (original)
+++ incubator/jspwiki/trunk/tests/java/org/apache/wiki/ui/migrator/JSPWikiJspTransformerTest.java Fri Apr 10 13:16:16 2009
@@ -24,8 +24,6 @@
import java.util.List;
import java.util.Map;
-import org.apache.wiki.ui.migrator.*;
-
import junit.framework.Test;
import junit.framework.TestCase;
import junit.framework.TestSuite;
Modified: incubator/jspwiki/trunk/tests/java/org/apache/wiki/ui/migrator/JspParserTest.java
URL: http://svn.apache.org/viewvc/incubator/jspwiki/trunk/tests/java/org/apache/wiki/ui/migrator/JspParserTest.java?rev=763924&r1=763923&r2=763924&view=diff
==============================================================================
--- incubator/jspwiki/trunk/tests/java/org/apache/wiki/ui/migrator/JspParserTest.java (original)
+++ incubator/jspwiki/trunk/tests/java/org/apache/wiki/ui/migrator/JspParserTest.java Fri Apr 10 13:16:16 2009
@@ -23,8 +23,6 @@
import java.io.File;
import java.util.List;
-import org.apache.wiki.ui.migrator.*;
-
import junit.framework.Test;
import junit.framework.TestCase;
import junit.framework.TestSuite;
Modified: incubator/jspwiki/trunk/tests/java/org/apache/wiki/ui/migrator/StripesJspTransformerTest.java
URL: http://svn.apache.org/viewvc/incubator/jspwiki/trunk/tests/java/org/apache/wiki/ui/migrator/StripesJspTransformerTest.java?rev=763924&r1=763923&r2=763924&view=diff
==============================================================================
--- incubator/jspwiki/trunk/tests/java/org/apache/wiki/ui/migrator/StripesJspTransformerTest.java (original)
+++ incubator/jspwiki/trunk/tests/java/org/apache/wiki/ui/migrator/StripesJspTransformerTest.java Fri Apr 10 13:16:16 2009
@@ -24,8 +24,6 @@
import java.util.List;
import java.util.Map;
-import org.apache.wiki.ui.migrator.*;
-
import junit.framework.Test;
import junit.framework.TestCase;
import junit.framework.TestSuite;
Modified: incubator/jspwiki/trunk/tests/java/org/apache/wiki/util/ClassUtilTest.java
URL: http://svn.apache.org/viewvc/incubator/jspwiki/trunk/tests/java/org/apache/wiki/util/ClassUtilTest.java?rev=763924&r1=763923&r2=763924&view=diff
==============================================================================
--- incubator/jspwiki/trunk/tests/java/org/apache/wiki/util/ClassUtilTest.java (original)
+++ incubator/jspwiki/trunk/tests/java/org/apache/wiki/util/ClassUtilTest.java Fri Apr 10 13:16:16 2009
@@ -38,7 +38,7 @@
public void testFindClass()
throws Exception
{
- Class foo = ClassUtil.findClass( "org.apache.wiki.api", "WikiPage" );
+ Class<?> foo = ClassUtil.findClass( "org.apache.wiki.api", "WikiPage" );
assertEquals( foo.getName(), "org.apache.wiki.api.WikiPage" );
}
@@ -51,7 +51,7 @@
{
try
{
- Class foo = ClassUtil.findClass( "org.apache.jspwiki", "MubbleBubble" );
+ Class<?> foo = ClassUtil.findClass( "org.apache.jspwiki", "MubbleBubble" );
fail("Found class:"+foo);
}
catch( ClassNotFoundException e )
Modified: incubator/jspwiki/trunk/tests/java/org/apache/wiki/util/PriorityListTest.java
URL: http://svn.apache.org/viewvc/incubator/jspwiki/trunk/tests/java/org/apache/wiki/util/PriorityListTest.java?rev=763924&r1=763923&r2=763924&view=diff
==============================================================================
--- incubator/jspwiki/trunk/tests/java/org/apache/wiki/util/PriorityListTest.java (original)
+++ incubator/jspwiki/trunk/tests/java/org/apache/wiki/util/PriorityListTest.java Fri Apr 10 13:16:16 2009
@@ -34,7 +34,7 @@
public void testInsert()
{
- PriorityList p = new PriorityList();
+ PriorityList<String> p = new PriorityList<String>();
p.add( "One", 1 );
p.add( "Two", 2 );
@@ -51,7 +51,7 @@
*/
public void testInsertSame()
{
- PriorityList p = new PriorityList();
+ PriorityList<String> p = new PriorityList<String>();
p.add( "One", 1 );
p.add( "Two", 1 );
@@ -64,7 +64,7 @@
public void testInsertSame2()
{
- PriorityList p = new PriorityList();
+ PriorityList<String> p = new PriorityList<String>();
p.add( "One", 1 );
p.add( "Two", 2 );
@@ -88,7 +88,7 @@
public void testInsertSame3()
{
- PriorityList p = new PriorityList();
+ PriorityList<String> p = new PriorityList<String>();
p.add( "One", 1 );
p.add( "Two", 2 );