from:"dvittor"

svn commit: r1659548 - in /jspwiki/trunk: ChangeLog jspwiki-war/src/main/java/org/apache/wiki/preferences/Preferences.java jspwiki-war/src/main/webapp/templates/default/skins/Smart/skin.css

2015-02-13 Thread dvittor

Author: dvittor
Date: Fri Feb 13 12:56:00 2015
New Revision: 1659548

URL: http://svn.apache.org/r1659548
Log:
JSPWIKI-566 - problem with Cookie set preferences and the GSon.fromJson() parser
Fixed search icon in Smart Template search.gif instead of search.png

Modified:
jspwiki/trunk/ChangeLog

jspwiki/trunk/jspwiki-war/src/main/java/org/apache/wiki/preferences/Preferences.java

jspwiki/trunk/jspwiki-war/src/main/webapp/templates/default/skins/Smart/skin.css

Modified: jspwiki/trunk/ChangeLog
URL: 
http://svn.apache.org/viewvc/jspwiki/trunk/ChangeLog?rev=1659548r1=1659547r2=1659548view=diff
==
--- jspwiki/trunk/ChangeLog (original)
+++ jspwiki/trunk/ChangeLog Fri Feb 13 12:56:00 2015
@@ -3,6 +3,10 @@
* 2.10.2-svn-13
 
* Fixed JSPWIKI-867 - Deleting attachments should retain focus on the 
Attach tab
+   
+   * JSPWIKI-566 - problem with Cookie set preferences and the 
GSon.fromJson() parser
+   
+   * Fixed search icon in Smart Template search.gif instead of 
search.png
 
 2015-01-30  David Vittor (dvit...@apache.org)
 

Modified: 
jspwiki/trunk/jspwiki-war/src/main/java/org/apache/wiki/preferences/Preferences.java
URL: 
http://svn.apache.org/viewvc/jspwiki/trunk/jspwiki-war/src/main/java/org/apache/wiki/preferences/Preferences.java?rev=1659548r1=1659547r2=1659548view=diff
==
--- 
jspwiki/trunk/jspwiki-war/src/main/java/org/apache/wiki/preferences/Preferences.java
 (original)
+++ 
jspwiki/trunk/jspwiki-war/src/main/java/org/apache/wiki/preferences/Preferences.java
 Fri Feb 13 12:56:00 2015
@@ -149,11 +149,15 @@ public class Preferences
 Gson gson=new Gson(); 
 MapString,String map = new HashMapString,String();
 // Convert prefVal JSON to a generic hashmap
-map=gson.fromJson(prefVal, map.getClass());
+map= (MapString,String) gson.fromJson(prefVal, map.getClass());
 
 for (String key : map.keySet()) {
 key = TextUtil.replaceEntities( key );
-prefs.put(key, map.get(key) );
+// Sometimes this is not a String as it comes from the Cookie 
set by Javascript
+Object value = map.get(key);
+if (value != null) {
+   prefs.put(key, value.toString() );
+}
 }
 }
 }

Modified: 
jspwiki/trunk/jspwiki-war/src/main/webapp/templates/default/skins/Smart/skin.css
URL: 
http://svn.apache.org/viewvc/jspwiki/trunk/jspwiki-war/src/main/webapp/templates/default/skins/Smart/skin.css?rev=1659548r1=1659547r2=1659548view=diff
==
--- 
jspwiki/trunk/jspwiki-war/src/main/webapp/templates/default/skins/Smart/skin.css
 (original)
+++ 
jspwiki/trunk/jspwiki-war/src/main/webapp/templates/default/skins/Smart/skin.css
 Fri Feb 13 12:56:00 2015
@@ -304,7 +304,7 @@ a.tool:hover, .btn:hover {
 /* +++ 480 PreferencesContent, LoginContent, GroupContent +++ */
 /* +++ 485 SearchBox +++ */
 #searchSubmit {
-   background: url(../../images/search.png) no-repeat center;
+   background: url(../../images/search.gif) no-repeat center;
 }
 #header a:link, #header a:visited, #recentSearches { 
color:#666;

svn commit: r1659729 - /jspwiki/trunk/jspwiki-war/src/main/webapp/WEB-INF/

2015-02-13 Thread dvittor

Author: dvittor
Date: Sat Feb 14 00:23:19 2015
New Revision: 1659729

URL: http://svn.apache.org/r1659729
Log:
Ignore jspwiki-custom.policy

Modified:
jspwiki/trunk/jspwiki-war/src/main/webapp/WEB-INF/   (props changed)

Propchange: jspwiki/trunk/jspwiki-war/src/main/webapp/WEB-INF/
--
--- svn:ignore (added)
+++ svn:ignore Sat Feb 14 00:23:19 2015
@@ -0,0 +1 @@
+jspwiki-custom.policy

svn commit: r1655957 - in /jspwiki/trunk/jspwiki-war/src/main/java/org/apache/wiki: auth/SessionMonitor.java plugin/RPCSamplePlugin.java rpc/RPCCallable.java rpc/RPCManager.java rpc/json/

2015-01-30 Thread dvittor

Author: dvittor
Date: Fri Jan 30 08:25:09 2015
New Revision: 1655957

URL: http://svn.apache.org/r1655957
Log:
JSPWIKI-566: Removed old JSONRPC code.

Removed:

jspwiki/trunk/jspwiki-war/src/main/java/org/apache/wiki/plugin/RPCSamplePlugin.java
jspwiki/trunk/jspwiki-war/src/main/java/org/apache/wiki/rpc/RPCCallable.java
jspwiki/trunk/jspwiki-war/src/main/java/org/apache/wiki/rpc/RPCManager.java
jspwiki/trunk/jspwiki-war/src/main/java/org/apache/wiki/rpc/json/
Modified:

jspwiki/trunk/jspwiki-war/src/main/java/org/apache/wiki/auth/SessionMonitor.java

Modified: 
jspwiki/trunk/jspwiki-war/src/main/java/org/apache/wiki/auth/SessionMonitor.java
URL: 
http://svn.apache.org/viewvc/jspwiki/trunk/jspwiki-war/src/main/java/org/apache/wiki/auth/SessionMonitor.java?rev=1655957r1=1655956r2=1655957view=diff
==
--- 
jspwiki/trunk/jspwiki-war/src/main/java/org/apache/wiki/auth/SessionMonitor.java
 (original)
+++ 
jspwiki/trunk/jspwiki-war/src/main/java/org/apache/wiki/auth/SessionMonitor.java
 Fri Jan 30 08:25:09 2015
@@ -19,20 +19,24 @@
 package org.apache.wiki.auth;
 
 import java.security.Principal;
-import java.util.*;
+import java.util.ArrayList;
+import java.util.Arrays;
+import java.util.Collection;
+import java.util.HashMap;
+import java.util.Iterator;
+import java.util.Map;
+import java.util.WeakHashMap;
 
 import javax.servlet.http.HttpSession;
 import javax.servlet.http.HttpSessionEvent;
 import javax.servlet.http.HttpSessionListener;
 
 import org.apache.log4j.Logger;
-
 import org.apache.wiki.WikiEngine;
 import org.apache.wiki.WikiSession;
 import org.apache.wiki.event.WikiEventListener;
 import org.apache.wiki.event.WikiEventManager;
 import org.apache.wiki.event.WikiSecurityEvent;
-import org.apache.wiki.rpc.json.JSONRPCManager;
 
 /**
  *  pManages WikiSession's for different WikiEngine's./p
@@ -249,8 +253,6 @@ public class SessionMonitor implements H
 public void sessionCreated( HttpSessionEvent se )
 {
 HttpSession session = se.getSession();
-
-JSONRPCManager.sessionCreated(session);
 }
 
 /**

svn commit: r1687033 - /jspwiki/branches/JSPWIKI_2_10_PICO_BRANCH/

2015-06-23 Thread dvittor

Author: dvittor
Date: Tue Jun 23 11:25:19 2015
New Revision: 1687033

URL: http://svn.apache.org/r1687033
Log: (empty)

Removed:
jspwiki/branches/JSPWIKI_2_10_PICO_BRANCH/

svn commit: r1687034 - /jspwiki/branches/JSPWIKI_2_10_PICO_BRANCH/

2015-06-23 Thread dvittor

Author: dvittor
Date: Tue Jun 23 11:25:50 2015
New Revision: 1687034

URL: http://svn.apache.org/r1687034
Log: (empty)

Added:
jspwiki/branches/JSPWIKI_2_10_PICO_BRANCH/
  - copied from r1687032, jspwiki/trunk/

svn commit: r1687036 - in /jspwiki/branches/JSPWIKI_2_10_PICO_BRANCH/jspwiki-war/src/test/java/org/apache/wiki: ./ filters/ i18n/ plugin/ search/ util/

2015-06-23 Thread dvittor

Author: dvittor
Date: Tue Jun 23 11:39:36 2015
New Revision: 1687036

URL: http://svn.apache.org/r1687036
Log:
[2.10.2-svn-18] Introducing the PicoContainer for Dependency Injection into the 
WikiEngine.

Modified:

jspwiki/branches/JSPWIKI_2_10_PICO_BRANCH/jspwiki-war/src/test/java/org/apache/wiki/PageManagerTest.java

jspwiki/branches/JSPWIKI_2_10_PICO_BRANCH/jspwiki-war/src/test/java/org/apache/wiki/PropertyReaderTest.java

jspwiki/branches/JSPWIKI_2_10_PICO_BRANCH/jspwiki-war/src/test/java/org/apache/wiki/TestEngine.java

jspwiki/branches/JSPWIKI_2_10_PICO_BRANCH/jspwiki-war/src/test/java/org/apache/wiki/VariableManagerTest.java

jspwiki/branches/JSPWIKI_2_10_PICO_BRANCH/jspwiki-war/src/test/java/org/apache/wiki/filters/DefaultFilterManagerTest.java

jspwiki/branches/JSPWIKI_2_10_PICO_BRANCH/jspwiki-war/src/test/java/org/apache/wiki/i18n/InternationalizationManagerTest.java

jspwiki/branches/JSPWIKI_2_10_PICO_BRANCH/jspwiki-war/src/test/java/org/apache/wiki/plugin/DefaultPluginManagerTest.java

jspwiki/branches/JSPWIKI_2_10_PICO_BRANCH/jspwiki-war/src/test/java/org/apache/wiki/plugin/PageViewPluginTest.java

jspwiki/branches/JSPWIKI_2_10_PICO_BRANCH/jspwiki-war/src/test/java/org/apache/wiki/plugin/RecentChangesPluginTest.java

jspwiki/branches/JSPWIKI_2_10_PICO_BRANCH/jspwiki-war/src/test/java/org/apache/wiki/plugin/ReferringPagesPluginTest.java

jspwiki/branches/JSPWIKI_2_10_PICO_BRANCH/jspwiki-war/src/test/java/org/apache/wiki/plugin/ReferringUndefinedPagesPluginTest.java

jspwiki/branches/JSPWIKI_2_10_PICO_BRANCH/jspwiki-war/src/test/java/org/apache/wiki/plugin/UndefinedPagesPluginTest.java

jspwiki/branches/JSPWIKI_2_10_PICO_BRANCH/jspwiki-war/src/test/java/org/apache/wiki/search/SearchManagerTest.java

jspwiki/branches/JSPWIKI_2_10_PICO_BRANCH/jspwiki-war/src/test/java/org/apache/wiki/util/TextUtilTest.java

Modified: 
jspwiki/branches/JSPWIKI_2_10_PICO_BRANCH/jspwiki-war/src/test/java/org/apache/wiki/PageManagerTest.java
URL: 
http://svn.apache.org/viewvc/jspwiki/branches/JSPWIKI_2_10_PICO_BRANCH/jspwiki-war/src/test/java/org/apache/wiki/PageManagerTest.java?rev=1687036r1=1687035r2=1687036view=diff
==
--- 
jspwiki/branches/JSPWIKI_2_10_PICO_BRANCH/jspwiki-war/src/test/java/org/apache/wiki/PageManagerTest.java
 (original)
+++ 
jspwiki/branches/JSPWIKI_2_10_PICO_BRANCH/jspwiki-war/src/test/java/org/apache/wiki/PageManagerTest.java
 Tue Jun 23 11:39:36 2015
@@ -26,7 +26,10 @@ import junit.framework.TestCase;
 import junit.framework.TestSuite;
 
 import org.apache.log4j.PropertyConfigurator;
+import org.apache.wiki.api.engine.FilterManager;
+import org.apache.wiki.filters.DefaultFilterManager;
 import org.apache.wiki.providers.CachingProvider;
+import org.apache.wiki.util.ClassUtil;
 
 public class PageManagerTest extends TestCase
 {
@@ -54,7 +57,7 @@ public class PageManagerTest extends Tes
 throws Exception
 {
 props.setProperty( jspwiki.usePageCache, true );
-PageManager m = new PageManager( engine, props );
+PageManager m = 
(PageManager)ClassUtil.getMappedObject(PageManager.class.getName(), engine, 
props);
 
 assertTrue( m.getProvider() instanceof CachingProvider );
 }
@@ -63,7 +66,7 @@ public class PageManagerTest extends Tes
 throws Exception
 {
 props.setProperty( jspwiki.usePageCache, false );
-PageManager m = new PageManager( engine, props );
+PageManager m = 
(PageManager)ClassUtil.getMappedObject(PageManager.class.getName(), engine, 
props);
 
 assertTrue( !(m.getProvider() instanceof CachingProvider) );
 }

Modified: 
jspwiki/branches/JSPWIKI_2_10_PICO_BRANCH/jspwiki-war/src/test/java/org/apache/wiki/PropertyReaderTest.java
URL: 
http://svn.apache.org/viewvc/jspwiki/branches/JSPWIKI_2_10_PICO_BRANCH/jspwiki-war/src/test/java/org/apache/wiki/PropertyReaderTest.java?rev=1687036r1=1687035r2=1687036view=diff
==
--- 
jspwiki/branches/JSPWIKI_2_10_PICO_BRANCH/jspwiki-war/src/test/java/org/apache/wiki/PropertyReaderTest.java
 (original)
+++ 
jspwiki/branches/JSPWIKI_2_10_PICO_BRANCH/jspwiki-war/src/test/java/org/apache/wiki/PropertyReaderTest.java
 Tue Jun 23 11:39:36 2015
@@ -20,6 +20,7 @@ package org.apache.wiki;
 
 import java.util.Properties;
 
+import org.apache.wiki.providers.AbstractFileProvider;
 import org.apache.wiki.util.PropertyReader;
 
 import junit.framework.Test;
@@ -34,16 +35,16 @@ public class PropertyReaderTest extends
 
 p.put(var.basedir, /p/mywiki);
 
-p.put(jspwiki.fileSystemProvider.pageDir, $basedir/www/);
+p.put(AbstractFileProvider.PROP_PAGEDIR, $basedir/www/);
 p.put(jspwiki.basicAttachmentProvider.storageDir, $basedir/www/);
 p.put(jspwiki.workDir, $basedir/wrk/);
 p.put(jspwiki.xyz, test basedir); //don't

svn commit: r1687038 - in /jspwiki/branches/JSPWIKI_2_10_PICO_BRANCH: ./ jspwiki-war/ jspwiki-war/src/main/java/org/apache/wiki/ jspwiki-war/src/main/java/org/apache/wiki/api/engine/ jspwiki-war/src/m

2015-06-23 Thread dvittor

Author: dvittor
Date: Tue Jun 23 11:42:14 2015
New Revision: 1687038

URL: http://svn.apache.org/r1687038
Log:
[2.10.2-svn-18] Introducing the PicoContainer for Dependency Injection into the 
WikiEngine.

Modified:
jspwiki/branches/JSPWIKI_2_10_PICO_BRANCH/ChangeLog
jspwiki/branches/JSPWIKI_2_10_PICO_BRANCH/jspwiki-war/pom.xml

jspwiki/branches/JSPWIKI_2_10_PICO_BRANCH/jspwiki-war/src/main/java/org/apache/wiki/PageManager.java

jspwiki/branches/JSPWIKI_2_10_PICO_BRANCH/jspwiki-war/src/main/java/org/apache/wiki/ReferenceManager.java

jspwiki/branches/JSPWIKI_2_10_PICO_BRANCH/jspwiki-war/src/main/java/org/apache/wiki/Release.java

jspwiki/branches/JSPWIKI_2_10_PICO_BRANCH/jspwiki-war/src/main/java/org/apache/wiki/VariableManager.java

jspwiki/branches/JSPWIKI_2_10_PICO_BRANCH/jspwiki-war/src/main/java/org/apache/wiki/WikiEngine.java

jspwiki/branches/JSPWIKI_2_10_PICO_BRANCH/jspwiki-war/src/main/java/org/apache/wiki/api/engine/AdminBeanManager.java

jspwiki/branches/JSPWIKI_2_10_PICO_BRANCH/jspwiki-war/src/main/java/org/apache/wiki/api/filters/BasicPageFilter.java

jspwiki/branches/JSPWIKI_2_10_PICO_BRANCH/jspwiki-war/src/main/java/org/apache/wiki/api/filters/PageFilter.java

jspwiki/branches/JSPWIKI_2_10_PICO_BRANCH/jspwiki-war/src/main/java/org/apache/wiki/attachment/AttachmentManager.java

jspwiki/branches/JSPWIKI_2_10_PICO_BRANCH/jspwiki-war/src/main/java/org/apache/wiki/auth/AuthenticationManager.java

jspwiki/branches/JSPWIKI_2_10_PICO_BRANCH/jspwiki-war/src/main/java/org/apache/wiki/auth/AuthorizationManager.java

jspwiki/branches/JSPWIKI_2_10_PICO_BRANCH/jspwiki-war/src/main/java/org/apache/wiki/auth/UserManager.java

jspwiki/branches/JSPWIKI_2_10_PICO_BRANCH/jspwiki-war/src/main/java/org/apache/wiki/auth/authorize/GroupManager.java

jspwiki/branches/JSPWIKI_2_10_PICO_BRANCH/jspwiki-war/src/main/java/org/apache/wiki/diff/DifferenceManager.java

jspwiki/branches/JSPWIKI_2_10_PICO_BRANCH/jspwiki-war/src/main/java/org/apache/wiki/filters/DefaultFilterManager.java

jspwiki/branches/JSPWIKI_2_10_PICO_BRANCH/jspwiki-war/src/main/java/org/apache/wiki/i18n/InternationalizationManager.java

jspwiki/branches/JSPWIKI_2_10_PICO_BRANCH/jspwiki-war/src/main/java/org/apache/wiki/modules/InternalModule.java

jspwiki/branches/JSPWIKI_2_10_PICO_BRANCH/jspwiki-war/src/main/java/org/apache/wiki/modules/ModuleManager.java

jspwiki/branches/JSPWIKI_2_10_PICO_BRANCH/jspwiki-war/src/main/java/org/apache/wiki/plugin/DefaultPluginManager.java

jspwiki/branches/JSPWIKI_2_10_PICO_BRANCH/jspwiki-war/src/main/java/org/apache/wiki/rss/RSSGenerator.java

jspwiki/branches/JSPWIKI_2_10_PICO_BRANCH/jspwiki-war/src/main/java/org/apache/wiki/search/SearchManager.java

jspwiki/branches/JSPWIKI_2_10_PICO_BRANCH/jspwiki-war/src/main/java/org/apache/wiki/ui/EditorManager.java

jspwiki/branches/JSPWIKI_2_10_PICO_BRANCH/jspwiki-war/src/main/java/org/apache/wiki/ui/TemplateManager.java

jspwiki/branches/JSPWIKI_2_10_PICO_BRANCH/jspwiki-war/src/main/java/org/apache/wiki/ui/admin/DefaultAdminBeanManager.java

jspwiki/branches/JSPWIKI_2_10_PICO_BRANCH/jspwiki-war/src/main/java/org/apache/wiki/util/ClassUtil.java

jspwiki/branches/JSPWIKI_2_10_PICO_BRANCH/jspwiki-war/src/main/java/org/apache/wiki/workflow/WorkflowManager.java
jspwiki/branches/JSPWIKI_2_10_PICO_BRANCH/pom.xml

Modified: jspwiki/branches/JSPWIKI_2_10_PICO_BRANCH/ChangeLog
URL: 
http://svn.apache.org/viewvc/jspwiki/branches/JSPWIKI_2_10_PICO_BRANCH/ChangeLog?rev=1687038r1=1687037r2=1687038view=diff
==
--- jspwiki/branches/JSPWIKI_2_10_PICO_BRANCH/ChangeLog (original)
+++ jspwiki/branches/JSPWIKI_2_10_PICO_BRANCH/ChangeLog Tue Jun 23 11:42:14 2015
@@ -1,3 +1,9 @@
+2015-05-23  David Vittor (dvit...@apache.org)
+
+   * 2.10.2-svn-18
+
+   * Introducing the PicoContainer for Dependency Injection into the 
WikiEngine
+   
 2015-06-22  Dirk Frederickx (brushed AT apache DOT org)
 
* 2.10.2-svn-17

Modified: jspwiki/branches/JSPWIKI_2_10_PICO_BRANCH/jspwiki-war/pom.xml
URL: 
http://svn.apache.org/viewvc/jspwiki/branches/JSPWIKI_2_10_PICO_BRANCH/jspwiki-war/pom.xml?rev=1687038r1=1687037r2=1687038view=diff
==
--- jspwiki/branches/JSPWIKI_2_10_PICO_BRANCH/jspwiki-war/pom.xml (original)
+++ jspwiki/branches/JSPWIKI_2_10_PICO_BRANCH/jspwiki-war/pom.xml Tue Jun 23 
11:42:14 2015
@@ -45,6 +45,11 @@
   groupIdorg.apache.lucene/groupId
   artifactIdlucene-highlighter/artifactId
 /dependency
+
+   dependency
+   groupIdorg.picocontainer/groupId
+   artifactIdpicocontainer/artifactId
+   /dependency
 
 dependency
   groupIdorg.apache.lucene/groupId

Modified: 
jspwiki/branches/JSPWIKI_2_10_PICO_BRANCH/jspwiki-war/src/main/java/org/apache/wiki/PageManager.java
URL

svn commit: r1688207 [2/2] - in /jspwiki/branches/JSPWIKI_2_10_PICO_BRANCH/jspwiki-war/src: main/java/org/apache/wiki/ main/java/org/apache/wiki/api/engine/ main/java/org/apache/wiki/api/filters/ main

2015-06-29 Thread dvittor

Modified: 
jspwiki/branches/JSPWIKI_2_10_PICO_BRANCH/jspwiki-war/src/main/java/org/apache/wiki/workflow/WorkflowManager.java
URL: 
http://svn.apache.org/viewvc/jspwiki/branches/JSPWIKI_2_10_PICO_BRANCH/jspwiki-war/src/main/java/org/apache/wiki/workflow/WorkflowManager.java?rev=1688207r1=1688206r2=1688207view=diff
==
--- 
jspwiki/branches/JSPWIKI_2_10_PICO_BRANCH/jspwiki-war/src/main/java/org/apache/wiki/workflow/WorkflowManager.java
 (original)
+++ 
jspwiki/branches/JSPWIKI_2_10_PICO_BRANCH/jspwiki-war/src/main/java/org/apache/wiki/workflow/WorkflowManager.java
 Mon Jun 29 13:29:39 2015
@@ -30,13 +30,13 @@ import java.util.Properties;
 import java.util.Set;
 
 import org.apache.wiki.WikiEngine;
+import org.apache.wiki.WikiInternalModule;
 import org.apache.wiki.WikiSession;
 import org.apache.wiki.api.exceptions.WikiException;
 import org.apache.wiki.auth.acl.UnresolvedPrincipal;
 import org.apache.wiki.event.WikiEvent;
 import org.apache.wiki.event.WikiEventListener;
 import org.apache.wiki.event.WorkflowEvent;
-import org.apache.wiki.modules.InternalModule;
 
 
 /**
@@ -46,7 +46,7 @@ import org.apache.wiki.modules.InternalM
  * Workflows.
  * /p
  */
-public class WorkflowManager implements WikiEventListener, InternalModule {
+public class WorkflowManager extends WikiInternalModule implements 
WikiEventListener {
 
 private final DecisionQueue m_queue = new DecisionQueue();
 
@@ -106,8 +106,6 @@ public class WorkflowManager implements
 return new ArrayListWorkflow( m_completed );
 }
 
-private WikiEngine m_engine = null;
-
 /**
  * Initializes the WorkflowManager using a specfied WikiEngine and
  * properties. Any properties that begin with
@@ -123,9 +121,9 @@ public class WorkflowManager implements
  * @param engine the wiki engine to associate with this WorkflowManager
  * @param props the wiki engine's properties
  */
-public void initialize( WikiEngine engine, Properties props )
+public void initialize( WikiEngine engine, Properties props ) throws 
WikiException
 {
-m_engine = engine;
+super.initialize(engine, props);
 
 // Identify the workflows requiring approvals
 for ( Iterator? it = props.keySet().iterator(); it.hasNext(); )

Modified: 
jspwiki/branches/JSPWIKI_2_10_PICO_BRANCH/jspwiki-war/src/main/resources/ini/classmappings.xml
URL: 
http://svn.apache.org/viewvc/jspwiki/branches/JSPWIKI_2_10_PICO_BRANCH/jspwiki-war/src/main/resources/ini/classmappings.xml?rev=1688207r1=1688206r2=1688207view=diff
==
--- 
jspwiki/branches/JSPWIKI_2_10_PICO_BRANCH/jspwiki-war/src/main/resources/ini/classmappings.xml
 (original)
+++ 
jspwiki/branches/JSPWIKI_2_10_PICO_BRANCH/jspwiki-war/src/main/resources/ini/classmappings.xml
 Mon Jun 29 13:29:39 2015
@@ -123,4 +123,20 @@
 requestedClassorg.apache.wiki.workflow.WorkflowManager/requestedClass
 mappedClassorg.apache.wiki.workflow.WorkflowManager/mappedClass
   /mapping
+  mapping
+requestedClassorg.apache.wiki.url.URLConstructor/requestedClass
+mappedClassorg.apache.wiki.url.DefaultURLConstructor/mappedClass
+  /mapping  
+  mapping
+requestedClassorg.apache.wiki.content.PageRenamer/requestedClass
+mappedClassorg.apache.wiki.content.PageRenamer/mappedClass
+  /mapping
+  mapping
+requestedClassorg.apache.wiki.PageSorter/requestedClass
+mappedClassorg.apache.wiki.PageSorter/mappedClass
+  /mapping
+  mapping
+requestedClassorg.apache.wiki.rss.RSSGenerator/requestedClass
+mappedClassorg.apache.wiki.rss.RSSGenerator/mappedClass
+  /mapping
 /classmappings

Modified: 
jspwiki/branches/JSPWIKI_2_10_PICO_BRANCH/jspwiki-war/src/test/java/org/apache/wiki/PageSorterTest.java
URL: 
http://svn.apache.org/viewvc/jspwiki/branches/JSPWIKI_2_10_PICO_BRANCH/jspwiki-war/src/test/java/org/apache/wiki/PageSorterTest.java?rev=1688207r1=1688206r2=1688207view=diff
==
--- 
jspwiki/branches/JSPWIKI_2_10_PICO_BRANCH/jspwiki-war/src/test/java/org/apache/wiki/PageSorterTest.java
 (original)
+++ 
jspwiki/branches/JSPWIKI_2_10_PICO_BRANCH/jspwiki-war/src/test/java/org/apache/wiki/PageSorterTest.java
 Mon Jun 29 13:29:39 2015
@@ -25,6 +25,9 @@ import junit.framework.Test;
 import junit.framework.TestCase;
 import junit.framework.TestSuite;
 
+import org.apache.log4j.PropertyConfigurator;
+import org.apache.wiki.api.exceptions.WikiException;
+import org.apache.wiki.util.ClassUtil;
 import org.apache.wiki.util.comparators.HumanComparator;
 import org.apache.wiki.util.comparators.LocaleComparator;
 
@@ -36,60 +39,71 @@ import org.apache.wiki.util.comparators.
  */
 public class PageSorterTest extends TestCase
 {
-public static Test suite()
+private Properties props = TestEngine.getTestProperties();
+
+private TestEngine engine;
+
+

svn commit: r1688207 [1/2] - in /jspwiki/branches/JSPWIKI_2_10_PICO_BRANCH/jspwiki-war/src: main/java/org/apache/wiki/ main/java/org/apache/wiki/api/engine/ main/java/org/apache/wiki/api/filters/ main

2015-06-29 Thread dvittor

Author: dvittor
Date: Mon Jun 29 13:29:39 2015
New Revision: 1688207

URL: http://svn.apache.org/r1688207
Log:
More code for the pico container

Added:

jspwiki/branches/JSPWIKI_2_10_PICO_BRANCH/jspwiki-war/src/main/java/org/apache/wiki/WikiInternalModule.java
   (with props)
Modified:

jspwiki/branches/JSPWIKI_2_10_PICO_BRANCH/jspwiki-war/src/main/java/org/apache/wiki/PageManager.java

jspwiki/branches/JSPWIKI_2_10_PICO_BRANCH/jspwiki-war/src/main/java/org/apache/wiki/PageSorter.java

jspwiki/branches/JSPWIKI_2_10_PICO_BRANCH/jspwiki-war/src/main/java/org/apache/wiki/ReferenceManager.java

jspwiki/branches/JSPWIKI_2_10_PICO_BRANCH/jspwiki-war/src/main/java/org/apache/wiki/VariableManager.java

jspwiki/branches/JSPWIKI_2_10_PICO_BRANCH/jspwiki-war/src/main/java/org/apache/wiki/WikiEngine.java

jspwiki/branches/JSPWIKI_2_10_PICO_BRANCH/jspwiki-war/src/main/java/org/apache/wiki/api/engine/FilterManager.java

jspwiki/branches/JSPWIKI_2_10_PICO_BRANCH/jspwiki-war/src/main/java/org/apache/wiki/api/engine/PluginManager.java

jspwiki/branches/JSPWIKI_2_10_PICO_BRANCH/jspwiki-war/src/main/java/org/apache/wiki/api/filters/BasicPageFilter.java

jspwiki/branches/JSPWIKI_2_10_PICO_BRANCH/jspwiki-war/src/main/java/org/apache/wiki/attachment/AttachmentManager.java

jspwiki/branches/JSPWIKI_2_10_PICO_BRANCH/jspwiki-war/src/main/java/org/apache/wiki/auth/AuthenticationManager.java

jspwiki/branches/JSPWIKI_2_10_PICO_BRANCH/jspwiki-war/src/main/java/org/apache/wiki/auth/AuthorizationManager.java

jspwiki/branches/JSPWIKI_2_10_PICO_BRANCH/jspwiki-war/src/main/java/org/apache/wiki/auth/UserManager.java

jspwiki/branches/JSPWIKI_2_10_PICO_BRANCH/jspwiki-war/src/main/java/org/apache/wiki/auth/acl/AclManager.java

jspwiki/branches/JSPWIKI_2_10_PICO_BRANCH/jspwiki-war/src/main/java/org/apache/wiki/auth/acl/DefaultAclManager.java

jspwiki/branches/JSPWIKI_2_10_PICO_BRANCH/jspwiki-war/src/main/java/org/apache/wiki/auth/authorize/GroupManager.java

jspwiki/branches/JSPWIKI_2_10_PICO_BRANCH/jspwiki-war/src/main/java/org/apache/wiki/content/PageRenamer.java

jspwiki/branches/JSPWIKI_2_10_PICO_BRANCH/jspwiki-war/src/main/java/org/apache/wiki/diff/DifferenceManager.java

jspwiki/branches/JSPWIKI_2_10_PICO_BRANCH/jspwiki-war/src/main/java/org/apache/wiki/filters/DefaultFilterManager.java

jspwiki/branches/JSPWIKI_2_10_PICO_BRANCH/jspwiki-war/src/main/java/org/apache/wiki/i18n/InternationalizationManager.java

jspwiki/branches/JSPWIKI_2_10_PICO_BRANCH/jspwiki-war/src/main/java/org/apache/wiki/modules/InternalModule.java

jspwiki/branches/JSPWIKI_2_10_PICO_BRANCH/jspwiki-war/src/main/java/org/apache/wiki/modules/ModuleManager.java

jspwiki/branches/JSPWIKI_2_10_PICO_BRANCH/jspwiki-war/src/main/java/org/apache/wiki/render/RenderingManager.java

jspwiki/branches/JSPWIKI_2_10_PICO_BRANCH/jspwiki-war/src/main/java/org/apache/wiki/rss/RSSGenerator.java

jspwiki/branches/JSPWIKI_2_10_PICO_BRANCH/jspwiki-war/src/main/java/org/apache/wiki/search/SearchManager.java

jspwiki/branches/JSPWIKI_2_10_PICO_BRANCH/jspwiki-war/src/main/java/org/apache/wiki/ui/admin/DefaultAdminBeanManager.java

jspwiki/branches/JSPWIKI_2_10_PICO_BRANCH/jspwiki-war/src/main/java/org/apache/wiki/url/DefaultURLConstructor.java

jspwiki/branches/JSPWIKI_2_10_PICO_BRANCH/jspwiki-war/src/main/java/org/apache/wiki/url/ShortURLConstructor.java

jspwiki/branches/JSPWIKI_2_10_PICO_BRANCH/jspwiki-war/src/main/java/org/apache/wiki/url/ShortViewURLConstructor.java

jspwiki/branches/JSPWIKI_2_10_PICO_BRANCH/jspwiki-war/src/main/java/org/apache/wiki/url/URLConstructor.java

jspwiki/branches/JSPWIKI_2_10_PICO_BRANCH/jspwiki-war/src/main/java/org/apache/wiki/util/ClassUtil.java

jspwiki/branches/JSPWIKI_2_10_PICO_BRANCH/jspwiki-war/src/main/java/org/apache/wiki/workflow/WorkflowManager.java

jspwiki/branches/JSPWIKI_2_10_PICO_BRANCH/jspwiki-war/src/main/resources/ini/classmappings.xml

jspwiki/branches/JSPWIKI_2_10_PICO_BRANCH/jspwiki-war/src/test/java/org/apache/wiki/PageSorterTest.java

jspwiki/branches/JSPWIKI_2_10_PICO_BRANCH/jspwiki-war/src/test/java/org/apache/wiki/TestEngine.java

jspwiki/branches/JSPWIKI_2_10_PICO_BRANCH/jspwiki-war/src/test/java/org/apache/wiki/VariableManagerTest.java

jspwiki/branches/JSPWIKI_2_10_PICO_BRANCH/jspwiki-war/src/test/java/org/apache/wiki/util/XmlUtilTest.java

Modified: 
jspwiki/branches/JSPWIKI_2_10_PICO_BRANCH/jspwiki-war/src/main/java/org/apache/wiki/PageManager.java
URL: 
http://svn.apache.org/viewvc/jspwiki/branches/JSPWIKI_2_10_PICO_BRANCH/jspwiki-war/src/main/java/org/apache/wiki/PageManager.java?rev=1688207r1=1688206r2=1688207view=diff
==
--- 
jspwiki/branches/JSPWIKI_2_10_PICO_BRANCH/jspwiki-war/src/main/java/org/apache/wiki/PageManager.java
 (original)
+++ 
jspwiki/branches/JSPWIKI_2_10_PICO_BRANCH/jspwiki-war/src

svn commit: r1694053 - /jspwiki/trunk/jspwiki-war/src/main/java/org/apache/wiki/forms/FormTextarea.java

2015-08-04 Thread dvittor

Author: dvittor
Date: Tue Aug  4 13:08:39 2015
New Revision: 1694053

URL: http://svn.apache.org/r1694053
Log:
[JSPWIKI-900]: Fixed Problem with the WikiFormsPlugin Text Area

Modified:

jspwiki/trunk/jspwiki-war/src/main/java/org/apache/wiki/forms/FormTextarea.java

Modified: 
jspwiki/trunk/jspwiki-war/src/main/java/org/apache/wiki/forms/FormTextarea.java
URL: 
http://svn.apache.org/viewvc/jspwiki/trunk/jspwiki-war/src/main/java/org/apache/wiki/forms/FormTextarea.java?rev=1694053r1=1694052r2=1694053view=diff
==
--- 
jspwiki/trunk/jspwiki-war/src/main/java/org/apache/wiki/forms/FormTextarea.java 
(original)
+++ 
jspwiki/trunk/jspwiki-war/src/main/java/org/apache/wiki/forms/FormTextarea.java 
Tue Aug  4 13:08:39 2015
@@ -26,6 +26,7 @@ import org.apache.wiki.preferences.Prefe
 import org.apache.wiki.util.XHTML;
 import org.apache.wiki.util.XhtmlUtil;
 import org.jdom2.Element;
+import org.jdom2.output.Format;
 
 import java.util.HashMap;
 import java.util.Map;
@@ -67,7 +68,7 @@ public class FormTextarea extends FormEl
 Element field = buildTextArea( params, previousValues, rb );
 
 // We should look for extra params, e.g. width, ..., here.
-return XhtmlUtil.serialize(field); // 
ctx.getEngine().getContentEncoding()
+return XhtmlUtil.serialize(field, XhtmlUtil.EXPAND_EMPTY_NODES ); // 
ctx.getEngine().getContentEncoding()
 }
 
 private Element buildTextArea(

svn commit: r1694054 - in /jspwiki/trunk: ChangeLog jspwiki-war/src/main/java/org/apache/wiki/Release.java

2015-08-04 Thread dvittor

Author: dvittor
Date: Tue Aug  4 13:13:00 2015
New Revision: 1694054

URL: http://svn.apache.org/r1694054
Log:
[JSPWIKI-900]: Fixed Problem with the WikiFormsPlugin Text Area

Modified:
jspwiki/trunk/ChangeLog
jspwiki/trunk/jspwiki-war/src/main/java/org/apache/wiki/Release.java

Modified: jspwiki/trunk/ChangeLog
URL: 
http://svn.apache.org/viewvc/jspwiki/trunk/ChangeLog?rev=1694054r1=1694053r2=1694054view=diff
==
--- jspwiki/trunk/ChangeLog (original)
+++ jspwiki/trunk/ChangeLog Tue Aug  4 13:13:00 2015
@@ -1,3 +1,9 @@
+2015-08-04  David Vittor (dvit...@apache.org)
+
+   * 2.10.2-svn-30
+
+   * [JSPWIKI-900]: Fixed Problem with the WikiFormsPlugin Text Area
+
 2015-08-02  Dirk Frederickx (brushed AT apache DOT org)
 
* Fixed the unit tests for HtmlStringToWikiTranslatorTest
@@ -266,7 +272,7 @@
 
* Fixed JSPWIKI-878 (following up JSPWIKI-660) you can now also use 
environment variables to configure JSPWiki
 
-2015-02-12  David Vittor ()
+2015-02-12  David Vittor (dvit...@apache.org)
 
* 2.10.2-svn-13
 

Modified: jspwiki/trunk/jspwiki-war/src/main/java/org/apache/wiki/Release.java
URL: 
http://svn.apache.org/viewvc/jspwiki/trunk/jspwiki-war/src/main/java/org/apache/wiki/Release.java?rev=1694054r1=1694053r2=1694054view=diff
==
--- jspwiki/trunk/jspwiki-war/src/main/java/org/apache/wiki/Release.java 
(original)
+++ jspwiki/trunk/jspwiki-war/src/main/java/org/apache/wiki/Release.java Tue 
Aug  4 13:13:00 2015
@@ -72,7 +72,7 @@ public final class Release {
  *  p
  *  If the build identifier is empty, it is not added.
  */
-public static final String BUILD = 29;
+public static final String BUILD = 30;
 
 /**
  *  This is the generic version string you should use when printing out 
the version.  It is of

svn commit: r1694212 - /jspwiki/trunk/jspwiki-portable/pom.xml

2015-08-05 Thread dvittor

Author: dvittor
Date: Wed Aug  5 13:40:55 2015
New Revision: 1694212

URL: http://svn.apache.org/r1694212
Log:
Fixed mvn test issue - [ERROR] Failed to execute goal 
org.apache.maven.plugins:maven-dependency-plugin:2.8:unpack(unpack-wikipages-private)
 on project jspwiki-war: Artifact has not been packaged yet. When used on 
reactor artifact, unpack should be executed after packaging: see MDEP-98. - 
[Help 1]

Modified:
jspwiki/trunk/jspwiki-portable/pom.xml

Modified: jspwiki/trunk/jspwiki-portable/pom.xml
URL: 
http://svn.apache.org/viewvc/jspwiki/trunk/jspwiki-portable/pom.xml?rev=1694212r1=1694211r2=1694212view=diff
==
--- jspwiki/trunk/jspwiki-portable/pom.xml (original)
+++ jspwiki/trunk/jspwiki-portable/pom.xml Wed Aug  5 13:40:55 2015
@@ -102,7 +102,7 @@
   !-- Unpack the JSP Wiki web archive --
   execution
 idunpack-jspwiki-war/id
-phasegenerate-resources/phase
+phasepackage/phase
 goals
   goalunpack/goal
 /goals

svn commit: r1694221 - /jspwiki/trunk/jspwiki-portable/pom.xml

2015-08-05 Thread dvittor

Author: dvittor
Date: Wed Aug  5 14:04:15 2015
New Revision: 1694221

URL: http://svn.apache.org/r1694221
Log:
Reverted last change. Not a simple fix.

Modified:
jspwiki/trunk/jspwiki-portable/pom.xml

Modified: jspwiki/trunk/jspwiki-portable/pom.xml
URL: 
http://svn.apache.org/viewvc/jspwiki/trunk/jspwiki-portable/pom.xml?rev=1694221r1=1694220r2=1694221view=diff
==
--- jspwiki/trunk/jspwiki-portable/pom.xml (original)
+++ jspwiki/trunk/jspwiki-portable/pom.xml Wed Aug  5 14:04:15 2015
@@ -102,7 +102,7 @@
   !-- Unpack the JSP Wiki web archive --
   execution
 idunpack-jspwiki-war/id
-phasepackage/phase
+phasegenerate-resources/phase
 goals
   goalunpack/goal
 /goals

jspwiki git commit: ChangeLog test commit into git repo

2016-09-16 Thread dvittor

Repository: jspwiki
Updated Branches:
  refs/heads/master a625d82d3 -> dc45a6626


ChangeLog test commit into git repo


Project: http://git-wip-us.apache.org/repos/asf/jspwiki/repo
Commit: http://git-wip-us.apache.org/repos/asf/jspwiki/commit/dc45a662
Tree: http://git-wip-us.apache.org/repos/asf/jspwiki/tree/dc45a662
Diff: http://git-wip-us.apache.org/repos/asf/jspwiki/diff/dc45a662

Branch: refs/heads/master
Commit: dc45a66265007873e310bba4785bec0ea3a64fc3
Parents: a625d82
Author: David Vittor 
Authored: Fri Sep 16 20:40:00 2016 +1000
Committer: David Vittor 
Committed: Fri Sep 16 20:40:00 2016 +1000

--
 ChangeLog | 3 +++
 1 file changed, 3 insertions(+)
--


http://git-wip-us.apache.org/repos/asf/jspwiki/blob/dc45a662/ChangeLog
--
diff --git a/ChangeLog b/ChangeLog
index 7504b51..65d175a 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,6 @@
+2016-09-16  David Vittor (dvit...@apache.org)
+   * Test commit to our new git repo.
+
 2016-09-16  Harry Metske (mets...@apache.org)
* Test commit to see how our new git repo works.

[jspwiki] Git Push Summary

2016-09-16 Thread dvittor

Repository: jspwiki
Updated Branches:
  refs/heads/JSPWIKI-877 [created] dc45a6626

jspwiki git commit: New README.md

2016-09-16 Thread dvittor

Repository: jspwiki
Updated Branches:
  refs/heads/JSPWIKI-877 dc45a6626 -> 970feaef5


New README.md


Project: http://git-wip-us.apache.org/repos/asf/jspwiki/repo
Commit: http://git-wip-us.apache.org/repos/asf/jspwiki/commit/970feaef
Tree: http://git-wip-us.apache.org/repos/asf/jspwiki/tree/970feaef
Diff: http://git-wip-us.apache.org/repos/asf/jspwiki/diff/970feaef

Branch: refs/heads/JSPWIKI-877
Commit: 970feaef5e2dc85b1e42a38d5e0cfb4eaae7bdf7
Parents: dc45a66
Author: David Vittor 
Authored: Fri Sep 16 21:01:53 2016 +1000
Committer: David Vittor 
Committed: Fri Sep 16 21:01:53 2016 +1000

--
 README.md | 130 +
 1 file changed, 130 insertions(+)
--


http://git-wip-us.apache.org/repos/asf/jspwiki/blob/970feaef/README.md
--
diff --git a/README.md b/README.md
new file mode 100644
index 000..9e603c4
--- /dev/null
+++ b/README.md
@@ -0,0 +1,130 @@
+# Apache JSPWiki 2.10 - Documentation
+
+Licensed to the Apache Software Foundation (ASF) under one
+or more contributor license agreements.  See the NOTICE file
+distributed with this work for additional information
+regarding copyright ownership.  The ASF licenses this file
+to you under the Apache License, Version 2.0 (the
+"License"); you may not use this file except in compliance
+with the License.  You may obtain a copy of the License at
+
+   http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing,
+software distributed under the License is distributed on an
+"AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+KIND, either express or implied.  See the License for the
+specific language governing permissions and limitations
+under the License.  
+
+The license file can be found in LICENSE.
+
+
+## What is JSPWiki?
+
+JSPWiki is a simple (well, not any more) WikiWiki clone, written in Java
+and JSP.  A WikiWiki is a web site which allows anyone to participate
+in its development.  JSPWiki supports all the traditional wiki features,
+as well as very detailed access control and security integration using JAAS. 
+
+* For more information see https://jspwiki-wiki.apache.org/
+
+## Pre-requirements
+
+Okay, so you wanna Wiki?  You'll need the following things:
+
+REQUIRED:
+
+* A JSP engine that supports Servlet API 2.5.  We recommend Tomcat from
+  http://tomcat.apache.org/ for a really easy installation.
+  Tomcat 6.x or later is supported.
+
+* Some previous administration experience...  If you've ever installed
+  Apache or any other web server, you should be pretty well off.
+
+* And of course, a server to run the JSP engine on.
+
+* JDK 1.6+
+
+
+OPTIONAL:
+
+* JavaMail package from java.sun.com, if you want to use log4j mailing
+  capabilities.  You'll also need the Java Activation Framework.
+
+## Really simple installation
+
+This section is meant for you, if you just want to have a really quick
+install without much worries.  If you want to have a more complicated
+installation (with more power as to how to do things), 
+check out the "Install" section below.
+
+Since JSPWiki 2.1.153, JSPWiki comes with a really simple installation
+engine.  Just do the following:
+
+1) Install Tomcat from http://tomcat.apache.org/ (or any other servlet
+   container)
+
+2) Rename the JSPWiki.war file from the download and rename it based on
+   your desired URL (if you want it different from /JSPWiki).  For example,
+   if you want your URL to be http://.../wiki, rename it to wiki.war.
+   This name will be referred to as  below.
+   Place this WAR in your $TOMCAT_HOME/webapps folder and then start Tomcat.
+
+3) Point your browser at http:Install.jsp
+
+4) Answer a couple of simple questions
+
+5) Restart your container
+
+6) Point your browser to http:
+
+That's it!
+
+
+## Advanced Installation
+
+In the $TOMCAT_HOME/lib folder (or equivalent based on your servlet container),
+place a jspwiki-custom.properties file, which can contain any overrides to the 
+default ini/jspwiki.properties file in the JSPWiki JAR.  For any values not 
+placed in jspwiki-custom.properties file JSPWiki will rely on the default file.
+Review the default file to look for values you may wish to override in the 
custom
+file.  Some common values to override in your custom file include 
+jspwiki.baseURL, jspwiki.xmlUserDatabaseFile, jspwiki.xmlGroupDatabaseFile
+jspwiki.fileSystemProvider.pageDir, 
jspwiki.basicAttachmentProvider.storageDir, 
+and log4j.appender.FileLog.File.  The comments in the default file will 
suggest 
+appropriate values to override them with. 
+
+The custom file can also be placed in the WEB-INF/ folder of the WAR, but 
storing
+this file in TOMCAT_HOME/lib

jspwiki git commit: New README.md

2016-09-16 Thread dvittor

Repository: jspwiki
Updated Branches:
  refs/heads/develop dc45a6626 -> 970feaef5


New README.md


Project: http://git-wip-us.apache.org/repos/asf/jspwiki/repo
Commit: http://git-wip-us.apache.org/repos/asf/jspwiki/commit/970feaef
Tree: http://git-wip-us.apache.org/repos/asf/jspwiki/tree/970feaef
Diff: http://git-wip-us.apache.org/repos/asf/jspwiki/diff/970feaef

Branch: refs/heads/develop
Commit: 970feaef5e2dc85b1e42a38d5e0cfb4eaae7bdf7
Parents: dc45a66
Author: David Vittor 
Authored: Fri Sep 16 21:01:53 2016 +1000
Committer: David Vittor 
Committed: Fri Sep 16 21:01:53 2016 +1000

--
 README.md | 130 +
 1 file changed, 130 insertions(+)
--


http://git-wip-us.apache.org/repos/asf/jspwiki/blob/970feaef/README.md
--
diff --git a/README.md b/README.md
new file mode 100644
index 000..9e603c4
--- /dev/null
+++ b/README.md
@@ -0,0 +1,130 @@
+# Apache JSPWiki 2.10 - Documentation
+
+Licensed to the Apache Software Foundation (ASF) under one
+or more contributor license agreements.  See the NOTICE file
+distributed with this work for additional information
+regarding copyright ownership.  The ASF licenses this file
+to you under the Apache License, Version 2.0 (the
+"License"); you may not use this file except in compliance
+with the License.  You may obtain a copy of the License at
+
+   http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing,
+software distributed under the License is distributed on an
+"AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+KIND, either express or implied.  See the License for the
+specific language governing permissions and limitations
+under the License.  
+
+The license file can be found in LICENSE.
+
+
+## What is JSPWiki?
+
+JSPWiki is a simple (well, not any more) WikiWiki clone, written in Java
+and JSP.  A WikiWiki is a web site which allows anyone to participate
+in its development.  JSPWiki supports all the traditional wiki features,
+as well as very detailed access control and security integration using JAAS. 
+
+* For more information see https://jspwiki-wiki.apache.org/
+
+## Pre-requirements
+
+Okay, so you wanna Wiki?  You'll need the following things:
+
+REQUIRED:
+
+* A JSP engine that supports Servlet API 2.5.  We recommend Tomcat from
+  http://tomcat.apache.org/ for a really easy installation.
+  Tomcat 6.x or later is supported.
+
+* Some previous administration experience...  If you've ever installed
+  Apache or any other web server, you should be pretty well off.
+
+* And of course, a server to run the JSP engine on.
+
+* JDK 1.6+
+
+
+OPTIONAL:
+
+* JavaMail package from java.sun.com, if you want to use log4j mailing
+  capabilities.  You'll also need the Java Activation Framework.
+
+## Really simple installation
+
+This section is meant for you, if you just want to have a really quick
+install without much worries.  If you want to have a more complicated
+installation (with more power as to how to do things), 
+check out the "Install" section below.
+
+Since JSPWiki 2.1.153, JSPWiki comes with a really simple installation
+engine.  Just do the following:
+
+1) Install Tomcat from http://tomcat.apache.org/ (or any other servlet
+   container)
+
+2) Rename the JSPWiki.war file from the download and rename it based on
+   your desired URL (if you want it different from /JSPWiki).  For example,
+   if you want your URL to be http://.../wiki, rename it to wiki.war.
+   This name will be referred to as  below.
+   Place this WAR in your $TOMCAT_HOME/webapps folder and then start Tomcat.
+
+3) Point your browser at http:Install.jsp
+
+4) Answer a couple of simple questions
+
+5) Restart your container
+
+6) Point your browser to http:
+
+That's it!
+
+
+## Advanced Installation
+
+In the $TOMCAT_HOME/lib folder (or equivalent based on your servlet container),
+place a jspwiki-custom.properties file, which can contain any overrides to the 
+default ini/jspwiki.properties file in the JSPWiki JAR.  For any values not 
+placed in jspwiki-custom.properties file JSPWiki will rely on the default file.
+Review the default file to look for values you may wish to override in the 
custom
+file.  Some common values to override in your custom file include 
+jspwiki.baseURL, jspwiki.xmlUserDatabaseFile, jspwiki.xmlGroupDatabaseFile
+jspwiki.fileSystemProvider.pageDir, 
jspwiki.basicAttachmentProvider.storageDir, 
+and log4j.appender.FileLog.File.  The comments in the default file will 
suggest 
+appropriate values to override them with. 
+
+The custom file can also be placed in the WEB-INF/ folder of the WAR, but 
storing
+this file in TOMCAT_HOME/lib allows

svn commit: r1659548 - in /jspwiki/trunk: ChangeLog jspwiki-war/src/main/java/org/apache/wiki/preferences/Preferences.java jspwiki-war/src/main/webapp/templates/default/skins/Smart/skin.css

svn commit: r1659729 - /jspwiki/trunk/jspwiki-war/src/main/webapp/WEB-INF/

svn commit: r1655957 - in /jspwiki/trunk/jspwiki-war/src/main/java/org/apache/wiki: auth/SessionMonitor.java plugin/RPCSamplePlugin.java rpc/RPCCallable.java rpc/RPCManager.java rpc/json/

svn commit: r1687033 - /jspwiki/branches/JSPWIKI_2_10_PICO_BRANCH/

svn commit: r1687034 - /jspwiki/branches/JSPWIKI_2_10_PICO_BRANCH/

svn commit: r1687036 - in /jspwiki/branches/JSPWIKI_2_10_PICO_BRANCH/jspwiki-war/src/test/java/org/apache/wiki: ./ filters/ i18n/ plugin/ search/ util/

svn commit: r1687038 - in /jspwiki/branches/JSPWIKI_2_10_PICO_BRANCH: ./ jspwiki-war/ jspwiki-war/src/main/java/org/apache/wiki/ jspwiki-war/src/main/java/org/apache/wiki/api/engine/ jspwiki-war/src/m

svn commit: r1688207 [2/2] - in /jspwiki/branches/JSPWIKI_2_10_PICO_BRANCH/jspwiki-war/src: main/java/org/apache/wiki/ main/java/org/apache/wiki/api/engine/ main/java/org/apache/wiki/api/filters/ main

svn commit: r1688207 [1/2] - in /jspwiki/branches/JSPWIKI_2_10_PICO_BRANCH/jspwiki-war/src: main/java/org/apache/wiki/ main/java/org/apache/wiki/api/engine/ main/java/org/apache/wiki/api/filters/ main

svn commit: r1694053 - /jspwiki/trunk/jspwiki-war/src/main/java/org/apache/wiki/forms/FormTextarea.java

svn commit: r1694054 - in /jspwiki/trunk: ChangeLog jspwiki-war/src/main/java/org/apache/wiki/Release.java

svn commit: r1694212 - /jspwiki/trunk/jspwiki-portable/pom.xml

svn commit: r1694221 - /jspwiki/trunk/jspwiki-portable/pom.xml

jspwiki git commit: ChangeLog test commit into git repo

[jspwiki] Git Push Summary

jspwiki git commit: New README.md

jspwiki git commit: New README.md

17 matches

Site Navigation

Mail list logo

Footer information