JSPWiki (git) website published

2017-12-16 Thread Apache Jenkins Server 
The Apache Jenkins build system has built jspwiki-site (build #17)

Status: Successful

Check console output at https://builds.apache.org/job/jspwiki-site/17/ to view 
the results.

build.log
Description: Binary data

[jspwiki-site] branch jbake updated: change source links to point to github

2017-12-16 Thread juanpablo 
This is an automated email from the ASF dual-hosted git repository.

juanpablo pushed a commit to branch jbake
in repository https://gitbox.apache.org/repos/asf/jspwiki-site.git


The following commit(s) were added to refs/heads/jbake by this push:
 new 61d1d2d  change source links to point to github
61d1d2d is described below

commit 61d1d2ddb8e15bc474c273e5132856f5c2939353
Author: Juan Pablo Santos Rodriguez 
AuthorDate: Sat Dec 16 11:50:58 2017 +0100

change source links to point to github
---
 src/main/jbake/templates/sidenav.ftl | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/main/jbake/templates/sidenav.ftl 
b/src/main/jbake/templates/sidenav.ftl
index d43523a..63bfbfe 100755
--- a/src/main/jbake/templates/sidenav.ftl
+++ b/src/main/jbake/templates/sidenav.ftl
@@ -24,13 +24,13 @@
 
 Development
 
-  https://git-wip-us.apache.org/repos/asf?p=jspwiki.git;a=summary; 
class="external">Browse Sources
+  https://github.com/apache/jspwiki; class="external">Browse 
Sources
   JavaDocs
   Get and Build 
Source
   https://builds.apache.org/job/JSPWiki/; 
class="external">Jenkins CI
   https://builds.apache.org/analysis/overview?id=org.apache.jspwiki%3Ajspwiki-builder;
 class="external">Sonar Analysis
   Edit Website
-  https://git-wip-us.apache.org/repos/asf?p=jspwiki.git;a=blob;f=ChangeLog; 
class="external">Change Log
+  https://github.com/apache/jspwiki/blob/master/ChangeLog; 
class="external">Change Log
 
 
 PMC

-- 
To stop receiving notification emails like this one, please contact
['"commits@jspwiki.apache.org" '].

[jspwiki-site] branch jbake updated (61d1d2d -> 59d26ef)

2017-12-16 Thread juanpablo 
This is an automated email from the ASF dual-hosted git repository.

juanpablo pushed a change to branch jbake
in repository https://gitbox.apache.org/repos/asf/jspwiki-site.git.


from 61d1d2d  change source links to point to github
 new a180811  change source links to point to github
 new 59d26ef  delete unused template files

The 2 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails.  The revisions
listed as "add" were already present in the repository and have only
been added to this reference.


Summary of changes:
 src/main/jbake/templates/page.ftl|  4 +--
 src/main/jbake/templates/release.ftl |  1 -
 src/main/jbake/templates/sidenav.ftl | 48 
 3 files changed, 2 insertions(+), 51 deletions(-)
 delete mode 100755 src/main/jbake/templates/release.ftl
 delete mode 100755 src/main/jbake/templates/sidenav.ftl

-- 
To stop receiving notification emails like this one, please contact
['"commits@jspwiki.apache.org" '].

[jspwiki-site] 02/02: delete unused template files

2017-12-16 Thread juanpablo 
This is an automated email from the ASF dual-hosted git repository.

juanpablo pushed a commit to branch jbake
in repository https://gitbox.apache.org/repos/asf/jspwiki-site.git

commit 59d26efc6504f3d6bd1b434f683fbd87cffe72fe
Author: Juan Pablo Santos Rodriguez 
AuthorDate: Sat Dec 16 12:01:27 2017 +0100

delete unused template files
---
 src/main/jbake/templates/release.ftl |  1 -
 src/main/jbake/templates/sidenav.ftl | 48 
 2 files changed, 49 deletions(-)

diff --git a/src/main/jbake/templates/release.ftl 
b/src/main/jbake/templates/release.ftl
deleted file mode 100755
index 6b93d6e..000
--- a/src/main/jbake/templates/release.ftl
+++ /dev/null
@@ -1 +0,0 @@
-JSPWiki v2.10.2
\ No newline at end of file
diff --git a/src/main/jbake/templates/sidenav.ftl 
b/src/main/jbake/templates/sidenav.ftl
deleted file mode 100755
index 63bfbfe..000
--- a/src/main/jbake/templates/sidenav.ftl
+++ /dev/null
@@ -1,48 +0,0 @@
-General
-
-  Home
-  Downloads
-  News
-  http://www.apache.org/licenses/; 
class="external">License
-
-
-Documentation
-
-  https://jspwiki-wiki.apache.org; class="external">Wiki
-  https://jspwiki-wiki.apache.org/Wiki.jsp?page=Getting%20Started; 
class="external">Getting started
-
-
-Community
-
-  https://jspwiki-wiki.apache.org/Wiki.jsp?page=Getting%20Involved; 
class="external">Getting Involved
-  Mailing Lists
-  Social Media
-  https://issues.apache.org/jira/browse/JSPWIKI#selectedTab=com.atlassian.jira.plugin.system.project%3Aissues-panel;
 class="external">Issue Tracker
-  http://www.ecyrd.com/JSPWiki/; class="external">Legacy 
Site
-  People
-
-
-Development
-
-  https://github.com/apache/jspwiki; class="external">Browse 
Sources
-  JavaDocs
-  Get and Build 
Source
-  https://builds.apache.org/job/JSPWiki/; 
class="external">Jenkins CI
-  https://builds.apache.org/analysis/overview?id=org.apache.jspwiki%3Ajspwiki-builder;
 class="external">Sonar Analysis
-  Edit Website
-  https://github.com/apache/jspwiki/blob/master/ChangeLog; 
class="external">Change Log
-
-
-PMC
-
-  How to Release
-  Board Reports
-
-
-ASF
-
-  http://www.apache.org; class="external">Website
-  http://www.apache.org/foundation/contributing.html; 
class="external">Donations
-  http://www.apache.org/foundation/sponsorship.html; 
class="external">Sponsorship
-  http://www.apache.org/foundation/thanks.html; 
class="external">Thanks
-
\ No newline at end of file

-- 
To stop receiving notification emails like this one, please contact
"commits@jspwiki.apache.org" .

JSPWiki (git) website published

2017-12-16 Thread Apache Jenkins Server 
The Apache Jenkins build system has built jspwiki-site (build #18)

Status: Successful

Check console output at https://builds.apache.org/job/jspwiki-site/18/ to view 
the results.

build.log
Description: Binary data

[jspwiki-site] branch asf-site updated: Automatic Site Publish by Buildbot

2017-12-16 Thread git-site-role 
This is an automated email from the ASF dual-hosted git repository.

git-site-role pushed a commit to branch asf-site
in repository https://gitbox.apache.org/repos/asf/jspwiki-site.git


The following commit(s) were added to refs/heads/asf-site by this push:
 new 0ae3051  Automatic Site Publish by Buildbot
0ae3051 is described below

commit 0ae3051ff2c786a181d9fb65057f4eb80dded700
Author: jenkins 
AuthorDate: Sat Dec 16 11:02:12 2017 +

Automatic Site Publish by Buildbot
---
 community/mailing_lists.html  | 4 ++--
 community/people.html | 4 ++--
 community/social_media.html   | 4 ++--
 development/edit_website.html | 4 ++--
 development/source_and_guide.html | 4 ++--
 general/downloads.html| 4 ++--
 general/news.html | 4 ++--
 index.html| 4 ++--
 pmc/board_reports.html| 4 ++--
 pmc/how_to_release.html   | 4 ++--
 10 files changed, 20 insertions(+), 20 deletions(-)

diff --git a/community/mailing_lists.html b/community/mailing_lists.html
index 6379aa6..cb2d107 100644
--- a/community/mailing_lists.html
+++ b/community/mailing_lists.html
@@ -204,14 +204,14 @@
 
 
   
-https://git-wip-us.apache.org/repos/asf?p=jspwiki.git;a=summary;>Browse 
sources
+https://github.com/apache/jspwiki;>Browse sources
 http://jspwiki.apache.org/apidocs/index.html;>JavaDoc
 https://jspwiki-wiki.apache.org/Wiki.jsp?page=Building%20from%20source%20code;>Get
 and build source
 https://jspwiki.apache.org/development/edit_website.html;>Editing 
website
 https://issues.apache.org/jira/browse/JSPWIKI;>Issue tracker
 https://builds.apache.org/job/JSPWiki/;>Jenkins build
 https://builds.apache.org/analysis/overview?id=org.apache.jspwiki%3Ajspwiki-builder;>Sonar
 Analysis
-https://git-wip-us.apache.org/repos/asf?p=jspwiki.git;a=blob;f=ChangeLog;>ChangeLog
+https://github.com/apache/jspwiki/blob/master/ChangeLog;>ChangeLog
 https://jspwiki-wiki.apache.org/Wiki.jsp?page=Other%20stuff;>Other 
stuff
   
 
diff --git a/community/people.html b/community/people.html
index e185495..f595759 100644
--- a/community/people.html
+++ b/community/people.html
@@ -228,14 +228,14 @@
 
 
   
-https://git-wip-us.apache.org/repos/asf?p=jspwiki.git;a=summary;>Browse 
sources
+https://github.com/apache/jspwiki;>Browse sources
 http://jspwiki.apache.org/apidocs/index.html;>JavaDoc
 https://jspwiki-wiki.apache.org/Wiki.jsp?page=Building%20from%20source%20code;>Get
 and build source
 https://jspwiki.apache.org/development/edit_website.html;>Editing 
website
 https://issues.apache.org/jira/browse/JSPWIKI;>Issue tracker
 https://builds.apache.org/job/JSPWiki/;>Jenkins build
 https://builds.apache.org/analysis/overview?id=org.apache.jspwiki%3Ajspwiki-builder;>Sonar
 Analysis
-https://git-wip-us.apache.org/repos/asf?p=jspwiki.git;a=blob;f=ChangeLog;>ChangeLog
+https://github.com/apache/jspwiki/blob/master/ChangeLog;>ChangeLog
 https://jspwiki-wiki.apache.org/Wiki.jsp?page=Other%20stuff;>Other 
stuff
   
 
diff --git a/community/social_media.html b/community/social_media.html
index e7489f4..1f3abaf 100644
--- a/community/social_media.html
+++ b/community/social_media.html
@@ -203,14 +203,14 @@
 
 
   
-https://git-wip-us.apache.org/repos/asf?p=jspwiki.git;a=summary;>Browse 
sources
+https://github.com/apache/jspwiki;>Browse sources
 http://jspwiki.apache.org/apidocs/index.html;>JavaDoc
 https://jspwiki-wiki.apache.org/Wiki.jsp?page=Building%20from%20source%20code;>Get
 and build source
 https://jspwiki.apache.org/development/edit_website.html;>Editing 
website
 https://issues.apache.org/jira/browse/JSPWIKI;>Issue tracker
 https://builds.apache.org/job/JSPWiki/;>Jenkins build
 https://builds.apache.org/analysis/overview?id=org.apache.jspwiki%3Ajspwiki-builder;>Sonar
 Analysis
-https://git-wip-us.apache.org/repos/asf?p=jspwiki.git;a=blob;f=ChangeLog;>ChangeLog
+https://github.com/apache/jspwiki/blob/master/ChangeLog;>ChangeLog
 https://jspwiki-wiki.apache.org/Wiki.jsp?page=Other%20stuff;>Other 
stuff
   
 
diff --git a/development/edit_website.html b/development/edit_website.html
index a0b2850..f481ff5 100644
--- a/development/edit_website.html
+++ b/development/edit_website.html
@@ -242,14 +242,14 @@
 
 
   
-

[jspwiki-site] 01/02: change source links to point to github

2017-12-16 Thread juanpablo 
This is an automated email from the ASF dual-hosted git repository.

juanpablo pushed a commit to branch jbake
in repository https://gitbox.apache.org/repos/asf/jspwiki-site.git

commit a180811c5e98d7e870c87c594eeed487dde263c6
Author: Juan Pablo Santos Rodriguez 
AuthorDate: Sat Dec 16 12:00:22 2017 +0100

change source links to point to github
---
 src/main/jbake/templates/page.ftl | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/main/jbake/templates/page.ftl 
b/src/main/jbake/templates/page.ftl
index defc524..88e6472 100755
--- a/src/main/jbake/templates/page.ftl
+++ b/src/main/jbake/templates/page.ftl
@@ -198,14 +198,14 @@
 
 
   
-https://git-wip-us.apache.org/repos/asf?p=jspwiki.git;a=summary;>Browse 
sources
+https://github.com/apache/jspwiki;>Browse sources
 http://jspwiki.apache.org/apidocs/index.html;>JavaDoc
 Get
 and build source
 Editing 
website
 https://issues.apache.org/jira/browse/JSPWIKI;>Issue tracker
 https://builds.apache.org/job/JSPWiki/;>Jenkins build
 https://builds.apache.org/analysis/overview?id=org.apache.jspwiki%3Ajspwiki-builder;>Sonar
 Analysis
-https://git-wip-us.apache.org/repos/asf?p=jspwiki.git;a=blob;f=ChangeLog;>ChangeLog
+https://github.com/apache/jspwiki/blob/master/ChangeLog;>ChangeLog
 Other stuff
   
 

-- 
To stop receiving notification emails like this one, please contact
"commits@jspwiki.apache.org" .

[jspwiki] 04/04: 2.10.3-git-45

2017-12-16 Thread juanpablo 
This is an automated email from the ASF dual-hosted git repository.

juanpablo pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/jspwiki.git

commit 9895f853f90b94815dc50e3930353fd0fc735241
Author: juanpablo 
AuthorDate: Sat Dec 16 20:03:19 2017 +0100

2.10.3-git-45
---
 ChangeLog  | 29 ++
 .../src/main/java/org/apache/wiki/Release.java |  2 +-
 2 files changed, 20 insertions(+), 11 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index 6136842..be6a719 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,28 +1,37 @@
+2017-12-16  Juan Pablo Santos (juanpablo AT apache DOT org)
+
+   * 2.10.3-git-45
+
+   * Fixed JSPWIKI-1064 - Link to non-existing page doesn't change if 
linked page
+ is created
+
+   * Improvement on JSPWIKI-843 - exclude tests from test-jar
+
 2017-12-08  Juan Pablo Santos (juanpablo AT apache DOT org)
 
* 2.10.3-git-44
-   
-   * JSPWIKI-802 - initial markdown support see 
+
+   * JSPWIKI-802 - initial markdown support see
  https://jspwiki-wiki.apache.org/Wiki.jsp?page=Markdown%20Support
  for details
-   
+
 2017-12-03  Juan Pablo Santos (juanpablo AT apache DOT org)
 
* 2.10.3-git-43
-   
+
* Fixed JSPWIKI-843 - generate test-jar for jspwiki-war (wasn't being 
generated)
-   
-   * Extract WikiLink parsing operations from JSPWikiMarkupParser, 
LinkParser, 
+
+   * Extract WikiLink parsing operations from JSPWikiMarkupParser, 
LinkParser,
  VariableManager to their own class, LinkParsingOperations
-   
-   * Move (private) JSPWikiMarkupParser#getLocalBooleanProperty to 
+
+   * Move (private) JSPWikiMarkupParser#getLocalBooleanProperty to
 (public) WikiContext#getBooleanWikiProperty
 
 2017-11-16  Juan Pablo Santos (juanpablo AT apache DOT org)
 
* 2.10.3-git-42
-   
-   * small refactor to move some private constants to public at 
MarkupParser and 
+
+   * small refactor to move some private constants to public at 
MarkupParser and
  WikiRenderer, so they can be reused throughout the code and custom 
extensions.
 
 2017-08-22  Juan Pablo Santos (juanpablo AT apache DOT org)
diff --git a/jspwiki-war/src/main/java/org/apache/wiki/Release.java 
b/jspwiki-war/src/main/java/org/apache/wiki/Release.java
index 3e70952..d6c6947 100644
--- a/jspwiki-war/src/main/java/org/apache/wiki/Release.java
+++ b/jspwiki-war/src/main/java/org/apache/wiki/Release.java
@@ -72,7 +72,7 @@ public final class Release {
  *  
  *  If the build identifier is empty, it is not added.
  */
-public static final String BUILD = "44";
+public static final String BUILD = "45";
 
 /**
  *  This is the generic version string you should use when printing out 
the version.  It is of

-- 
To stop receiving notification emails like this one, please contact
"commits@jspwiki.apache.org" .

[jspwiki] branch master updated (836db9f -> 9895f85)

2017-12-16 Thread juanpablo 
This is an automated email from the ASF dual-hosted git repository.

juanpablo pushed a change to branch master
in repository https://gitbox.apache.org/repos/asf/jspwiki.git.


from 836db9f  NOTICE and LICENSE needed to comlpy with Flexmark 
distribution in binary form
 new 63c2106  Improvement on JSPWIKI-843 - exclude tests from test-jar
 new b37be85  code format plus a couple of really minor refactors
 new f13a308  JSPWIKI-1064 - Link to non-existing page doesn't change if 
linked page is created
 new 9895f85  2.10.3-git-45

The 4 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails.  The revisions
listed as "add" were already present in the repository and have only
been added to this reference.


Summary of changes:
 ChangeLog  | 29 ++---
 jspwiki-war/pom.xml|  4 ++
 .../src/main/java/org/apache/wiki/PageManager.java |  2 +-
 .../src/main/java/org/apache/wiki/Release.java |  2 +-
 .../main/java/org/apache/wiki/WikiProvider.java| 10 +--
 .../src/main/java/org/apache/wiki/WikiServlet.java | 64 +-
 .../apache/wiki/attachment/AttachmentManager.java  | 19 ++
 .../wiki/providers/CachingAttachmentProvider.java  | 39 +--
 .../org/apache/wiki/render/RenderingManager.java   | 75 --
 .../wiki/stress/StressTestVersioningProvider.java  | 42 ++--
 10 files changed, 151 insertions(+), 135 deletions(-)

-- 
To stop receiving notification emails like this one, please contact
['"commits@jspwiki.apache.org" '].

[jspwiki] 02/04: code format plus a couple of really minor refactors

2017-12-16 Thread juanpablo 
This is an automated email from the ASF dual-hosted git repository.

juanpablo pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/jspwiki.git

commit b37be85088152097402a87bbc05a6dbc1ae22a51
Author: juanpablo 
AuthorDate: Sat Dec 16 19:55:12 2017 +0100

code format plus a couple of really minor refactors
---
 .../src/main/java/org/apache/wiki/PageManager.java |  2 +-
 .../main/java/org/apache/wiki/WikiProvider.java| 10 ++--
 .../src/main/java/org/apache/wiki/WikiServlet.java | 64 --
 .../apache/wiki/attachment/AttachmentManager.java  | 19 +++
 .../wiki/providers/CachingAttachmentProvider.java  | 39 ++---
 .../wiki/stress/StressTestVersioningProvider.java  | 42 +++---
 6 files changed, 87 insertions(+), 89 deletions(-)

diff --git a/jspwiki-war/src/main/java/org/apache/wiki/PageManager.java 
b/jspwiki-war/src/main/java/org/apache/wiki/PageManager.java
index 08cdd6d..0482bc0 100644
--- a/jspwiki-war/src/main/java/org/apache/wiki/PageManager.java
+++ b/jspwiki-war/src/main/java/org/apache/wiki/PageManager.java
@@ -693,7 +693,7 @@ public class PageManager extends ModuleManager implements 
WikiEventListener {
  * {@inheritDoc}
  */
 @Override
-public Collection modules() {
+public Collection< WikiModuleInfo > modules() {
 return null;
 }
 
diff --git a/jspwiki-war/src/main/java/org/apache/wiki/WikiProvider.java 
b/jspwiki-war/src/main/java/org/apache/wiki/WikiProvider.java
index 5b5a9e9..ae3460c 100644
--- a/jspwiki-war/src/main/java/org/apache/wiki/WikiProvider.java
+++ b/jspwiki-war/src/main/java/org/apache/wiki/WikiProvider.java
@@ -14,7 +14,7 @@
 "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. 
+under the License.
  */
 package org.apache.wiki;
 
@@ -23,6 +23,7 @@ import java.io.IOException;
 
 import org.apache.wiki.api.exceptions.NoRequiredPropertyException;
 
+
 /**
  *  A generic Wiki provider for all sorts of things that the Wiki can
  *  store.
@@ -38,7 +39,7 @@ public interface WikiProvider
 
 /**
  *  Initializes the page provider.
- *  
+ *
  *  @param engine WikiEngine to own this provider
  *  @param properties A set of properties used to initialize this provider
  *  @throws NoRequiredPropertyException If the provider needs a property 
which is not found in the property set
@@ -49,13 +50,12 @@ public interface WikiProvider
IOException;
 
 /**
- *  Return a valid HTML string for information.  May
- *  be anything.
+ *  Return a valid HTML string for information.  May be anything.
  *  @since 1.6.4
  *  @return A string describing the provider.
  */
-
 String getProviderInfo();
+
 }
 
 
diff --git a/jspwiki-war/src/main/java/org/apache/wiki/WikiServlet.java 
b/jspwiki-war/src/main/java/org/apache/wiki/WikiServlet.java
index 79fc432..b8a405b 100644
--- a/jspwiki-war/src/main/java/org/apache/wiki/WikiServlet.java
+++ b/jspwiki-war/src/main/java/org/apache/wiki/WikiServlet.java
@@ -14,19 +14,25 @@
 "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. 
+under the License.
  */
 package org.apache.wiki;
 
-import javax.servlet.*;
-import javax.servlet.http.*;
-import java.io.*;
+import java.io.IOException;
 
-import net.sf.ehcache.CacheManager;
-import org.apache.log4j.Logger;
+import javax.servlet.RequestDispatcher;
+import javax.servlet.ServletConfig;
+import javax.servlet.ServletException;
+import javax.servlet.http.HttpServlet;
+import javax.servlet.http.HttpServletRequest;
+import javax.servlet.http.HttpServletResponse;
 
+import org.apache.log4j.Logger;
 import org.apache.wiki.url.DefaultURLConstructor;
 
+import net.sf.ehcache.CacheManager;
+
+
 /**
  * This provides a master servlet for dealing with short urls.  It mostly does
  * redirects to the proper JSP pages. It also intercepts the servlet
@@ -35,20 +41,19 @@ import org.apache.wiki.url.DefaultURLConstructor;
  * @since 2.2
  */
 public class WikiServlet extends HttpServlet {
+
 private static final long serialVersionUID = 3258410651167633973L;
 private WikiEngine m_engine;
-static final Logger log = Logger.getLogger(WikiServlet.class.getName());
+static final Logger log = Logger.getLogger( WikiServlet.class.getName() );
 
 /**
  * {@inheritDoc}
  */
-public void init(ServletConfig config)
-throws ServletException {
-super.init(config);
-
-m_engine = WikiEngine.getInstance(config);
-
-log.info("WikiServlet initialized.");
+@Override
+public void init( ServletConfig config ) throws ServletException {
+super.init( config );
+

[jspwiki] 01/04: Improvement on JSPWIKI-843 - exclude tests from test-jar

2017-12-16 Thread juanpablo 
This is an automated email from the ASF dual-hosted git repository.

juanpablo pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/jspwiki.git

commit 63c2106ab3cfc289c2ff123d86b46e0981817ff8
Author: juanpablo 
AuthorDate: Sat Dec 16 19:48:18 2017 +0100

Improvement on JSPWIKI-843 - exclude tests from test-jar
---
 jspwiki-war/pom.xml | 4 
 1 file changed, 4 insertions(+)

diff --git a/jspwiki-war/pom.xml b/jspwiki-war/pom.xml
index 324a5cf..800134b 100644
--- a/jspwiki-war/pom.xml
+++ b/jspwiki-war/pom.xml
@@ -221,7 +221,11 @@
 
   
 **/test*/**
+**/*Test.class
+**/*Test$*.class
+**/*Tests.class
   
+  true
 
   
 

-- 
To stop receiving notification emails like this one, please contact
"commits@jspwiki.apache.org" .

[jspwiki] 03/04: JSPWIKI-1064 - Link to non-existing page doesn't change if linked page is created

2017-12-16 Thread juanpablo 
This is an automated email from the ASF dual-hosted git repository.

juanpablo pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/jspwiki.git

commit f13a30804bd9ba88a9565c0947f1b3c968867a19
Author: juanpablo 
AuthorDate: Sat Dec 16 20:02:45 2017 +0100

JSPWIKI-1064 - Link to non-existing page doesn't change if linked page is 
created
---
 .../org/apache/wiki/render/RenderingManager.java   | 75 --
 1 file changed, 40 insertions(+), 35 deletions(-)

diff --git 
a/jspwiki-war/src/main/java/org/apache/wiki/render/RenderingManager.java 
b/jspwiki-war/src/main/java/org/apache/wiki/render/RenderingManager.java
index 466961a..a8dd7fd 100644
--- a/jspwiki-war/src/main/java/org/apache/wiki/render/RenderingManager.java
+++ b/jspwiki-war/src/main/java/org/apache/wiki/render/RenderingManager.java
@@ -22,7 +22,6 @@ import java.io.IOException;
 import java.io.StringReader;
 import java.lang.reflect.Constructor;
 import java.util.Collection;
-import java.util.Iterator;
 import java.util.Properties;
 
 import org.apache.log4j.Logger;
@@ -38,6 +37,7 @@ import org.apache.wiki.modules.InternalModule;
 import org.apache.wiki.parser.JSPWikiMarkupParser;
 import org.apache.wiki.parser.MarkupParser;
 import org.apache.wiki.parser.WikiDocument;
+import org.apache.wiki.providers.WikiPageProvider;
 import org.apache.wiki.util.ClassUtil;
 
 import net.sf.ehcache.Cache;
@@ -173,7 +173,7 @@ public class RenderingManager implements WikiEventListener, 
InternalModule
 }
 
 /**
- *  Returns the default Paxt
+ *  Returns the wiki Parser
  *  @param pagedata the page data
  *  @return A MarkupParser instance.
  */
@@ -195,46 +195,49 @@ public class RenderingManager implements 
WikiEventListener, InternalModule
  * @throws IOException If rendering cannot be accomplished
  */
 // FIXME: The cache management policy is not very good: deleted/changed 
pages should be detected better.
-protected WikiDocument getRenderedDocument(WikiContext context, String 
pagedata) throws IOException {
+protected WikiDocument getRenderedDocument( WikiContext context, String 
pagedata ) throws IOException {
 String pageid = context.getRealPage().getName() + VERSION_DELIMITER + 
context.getRealPage().getVersion();
-if (m_useCache) {
 
-Element element = m_documentCache.get(pageid);
-if (element != null) {
+if( useCache( context ) ) {
+Element element = m_documentCache.get( pageid );
+if ( element != null ) {
 WikiDocument doc = (WikiDocument) element.getObjectValue();
 
 //
 //  This check is needed in case the different filters have 
actually changed the page data.
 //  FIXME: Figure out a faster method
-if (pagedata.equals(doc.getPageData())) {
-if (log.isDebugEnabled()) log.debug("Using cached HTML for 
page " + pageid);
+if( pagedata.equals( doc.getPageData() ) ) {
+if( log.isDebugEnabled() ) {
+log.debug( "Using cached HTML for page " + pageid );
+}
 return doc;
 }
-} else {
-if (log.isDebugEnabled()) log.debug("Re-rendering and storing 
" + pageid);
+} else if( log.isDebugEnabled() ) {
+log.debug( "Re-rendering and storing " + pageid );
 }
 }
-//
+
 //  Refresh the data content
 //
-try
-{
+try {
 MarkupParser parser = getParser( context, pagedata );
 WikiDocument doc = parser.parse();
 doc.setPageData( pagedata );
-if (m_useCache) {
-m_documentCache.put(new Element(pageid, doc));
+if( useCache( context ) ) {
+m_documentCache.put( new Element( pageid, doc ) );
 }
 return doc;
-}
-catch( IOException ex )
-{
-log.error("Unable to parse",ex);
+} catch( IOException ex ) {
+log.error( "Unable to parse", ex );
 }
 
 return null;
 }
 
+boolean useCache( WikiContext context ) {
+return m_useCache && WikiContext.VIEW.equals( 
context.getRequestContext() );
+}
+
 /**
  *  Simply renders a WikiDocument to a String.  This version does not get 
the document
  *  from the cache - in fact, it does not cache the document at all.  This 
is
@@ -335,30 +338,32 @@ public class RenderingManager implements 
WikiEventListener, InternalModule
 }
 
 /**
- * Flushes the document cache in response to a POST_SAVE_BEGIN event.
+ * {@inheritDoc}
+ *
+ * Flushes the document cache in response to a POST_SAVE_BEGIN event.
  *
  * @see