Author: ajaquith
Date: Sun Feb 14 18:34:16 2010
New Revision: 910056
URL: http://svn.apache.org/viewvc?rev=910056&view=rev
Log:
Eliminated WikiRuntimeConfiguration: it is no longer needed because WikiEngine
can easily be obtained without needing a special Stripes config class. Less
classes are always better.
Removed:
incubator/jspwiki/trunk/src/java/org/apache/wiki/ui/stripes/WikiRuntimeConfiguration.java
Modified:
incubator/jspwiki/trunk/src/java/org/apache/wiki/ui/stripes/AdminBeanTypeConverter.java
incubator/jspwiki/trunk/src/java/org/apache/wiki/ui/stripes/GroupTypeConverter.java
incubator/jspwiki/trunk/src/java/org/apache/wiki/ui/stripes/WikiPageTypeConverter.java
Modified:
incubator/jspwiki/trunk/src/java/org/apache/wiki/ui/stripes/AdminBeanTypeConverter.java
URL:
http://svn.apache.org/viewvc/incubator/jspwiki/trunk/src/java/org/apache/wiki/ui/stripes/AdminBeanTypeConverter.java?rev=910056&r1=910055&r2=910056&view=diff
==============================================================================
---
incubator/jspwiki/trunk/src/java/org/apache/wiki/ui/stripes/AdminBeanTypeConverter.java
(original)
+++
incubator/jspwiki/trunk/src/java/org/apache/wiki/ui/stripes/AdminBeanTypeConverter.java
Sun Feb 14 18:34:16 2010
@@ -23,6 +23,7 @@
import java.util.Collection;
import java.util.Locale;
+import net.sourceforge.stripes.config.Configuration;
import net.sourceforge.stripes.controller.StripesFilter;
import net.sourceforge.stripes.validation.LocalizableError;
import net.sourceforge.stripes.validation.TypeConverter;
@@ -62,8 +63,8 @@
*/
public AdminBean convert( String beanId, Class<? extends AdminBean>
targetType, Collection<ValidationError> errors )
{
- WikiRuntimeConfiguration config = (WikiRuntimeConfiguration)
StripesFilter.getConfiguration();
- WikiEngine engine = config.getEngine();
+ Configuration config = StripesFilter.getConfiguration();
+ WikiEngine engine = WikiEngine.getInstance(
config.getServletContext(), null );
AdminBeanManager mgr = engine.getAdminBeanManager();
AdminBean bean = mgr.findBean( beanId );
Modified:
incubator/jspwiki/trunk/src/java/org/apache/wiki/ui/stripes/GroupTypeConverter.java
URL:
http://svn.apache.org/viewvc/incubator/jspwiki/trunk/src/java/org/apache/wiki/ui/stripes/GroupTypeConverter.java?rev=910056&r1=910055&r2=910056&view=diff
==============================================================================
---
incubator/jspwiki/trunk/src/java/org/apache/wiki/ui/stripes/GroupTypeConverter.java
(original)
+++
incubator/jspwiki/trunk/src/java/org/apache/wiki/ui/stripes/GroupTypeConverter.java
Sun Feb 14 18:34:16 2010
@@ -23,17 +23,18 @@
import java.util.Collection;
import java.util.Locale;
+import net.sourceforge.stripes.config.Configuration;
+import net.sourceforge.stripes.controller.StripesFilter;
+import net.sourceforge.stripes.validation.LocalizableError;
+import net.sourceforge.stripes.validation.TypeConverter;
+import net.sourceforge.stripes.validation.ValidationError;
+
import org.apache.wiki.WikiEngine;
import org.apache.wiki.auth.NoSuchPrincipalException;
import org.apache.wiki.auth.WikiSecurityException;
import org.apache.wiki.auth.authorize.Group;
import org.apache.wiki.auth.authorize.GroupManager;
-import net.sourceforge.stripes.controller.StripesFilter;
-import net.sourceforge.stripes.validation.LocalizableError;
-import net.sourceforge.stripes.validation.TypeConverter;
-import net.sourceforge.stripes.validation.ValidationError;
-
/**
* Stripes type converter that converts a Group name, expressed as a String,
@@ -67,8 +68,8 @@
*/
public Group convert( String groupName, Class<? extends Group> targetType,
Collection<ValidationError> errors )
{
- WikiRuntimeConfiguration config = (WikiRuntimeConfiguration)
StripesFilter.getConfiguration();
- WikiEngine engine = config.getEngine();
+ Configuration config = StripesFilter.getConfiguration();
+ WikiEngine engine = WikiEngine.getInstance(
config.getServletContext(), null );
GroupManager mgr = engine.getGroupManager();
Group group = null;
try
Modified:
incubator/jspwiki/trunk/src/java/org/apache/wiki/ui/stripes/WikiPageTypeConverter.java
URL:
http://svn.apache.org/viewvc/incubator/jspwiki/trunk/src/java/org/apache/wiki/ui/stripes/WikiPageTypeConverter.java?rev=910056&r1=910055&r2=910056&view=diff
==============================================================================
---
incubator/jspwiki/trunk/src/java/org/apache/wiki/ui/stripes/WikiPageTypeConverter.java
(original)
+++
incubator/jspwiki/trunk/src/java/org/apache/wiki/ui/stripes/WikiPageTypeConverter.java
Sun Feb 14 18:34:16 2010
@@ -24,6 +24,7 @@
import java.util.Collection;
import java.util.Locale;
+import net.sourceforge.stripes.config.Configuration;
import net.sourceforge.stripes.controller.StripesFilter;
import net.sourceforge.stripes.validation.LocalizableError;
import net.sourceforge.stripes.validation.SimpleError;
@@ -70,8 +71,8 @@
*/
public WikiPage convert( String pageName, Class<? extends WikiPage>
targetType, Collection<ValidationError> errors )
{
- WikiRuntimeConfiguration config = (WikiRuntimeConfiguration)
StripesFilter.getConfiguration();
- WikiEngine engine = config.getEngine();
+ Configuration config = StripesFilter.getConfiguration();
+ WikiEngine engine = WikiEngine.getInstance(
config.getServletContext(), null );
WikiPage page = null;
// Is this a special page?
