Author: juanpablo
Date: Thu Jan 2 20:57:32 2014
New Revision: 1554913
URL: http://svn.apache.org/r1554913
Log:
JSPWIKI-731: removing jspwiki.org references, interwiki references for Doc: and
JSPWiki: now pointing to jspwiki-wiki.a.o
Modified:
jspwiki/trunk/jspwiki-war/src/main/config/doc/2.10-API.txt
jspwiki/trunk/jspwiki-war/src/main/java/org/apache/wiki/ui/WikiServletFilter.java
jspwiki/trunk/jspwiki-war/src/main/resources/ini/jspwiki.properties
Modified: jspwiki/trunk/jspwiki-war/src/main/config/doc/2.10-API.txt
URL:
http://svn.apache.org/viewvc/jspwiki/trunk/jspwiki-war/src/main/config/doc/2.10-API.txt?rev=1554913&r1=1554912&r2=1554913&view=diff
==============================================================================
--- jspwiki/trunk/jspwiki-war/src/main/config/doc/2.10-API.txt (original)
+++ jspwiki/trunk/jspwiki-war/src/main/config/doc/2.10-API.txt Thu Jan 2
20:57:32 2014
@@ -47,7 +47,7 @@ api.exceptions
api.filters
-> Interface and base classes needed to develop WikiFilters
- -> cfr. with http://doc.jspwiki.org/2.4/wiki/WikiFilters
+ -> cfr. with http://jspwiki-wiki.apache.org/Wiki.jsp?page=WikiFilters
api.plugin
-> Interfaces needed to develop WikiPlugins
Modified:
jspwiki/trunk/jspwiki-war/src/main/java/org/apache/wiki/ui/WikiServletFilter.java
URL:
http://svn.apache.org/viewvc/jspwiki/trunk/jspwiki-war/src/main/java/org/apache/wiki/ui/WikiServletFilter.java?rev=1554913&r1=1554912&r2=1554913&view=diff
==============================================================================
---
jspwiki/trunk/jspwiki-war/src/main/java/org/apache/wiki/ui/WikiServletFilter.java
(original)
+++
jspwiki/trunk/jspwiki-war/src/main/java/org/apache/wiki/ui/WikiServletFilter.java
Thu Jan 2 20:57:32 2014
@@ -119,7 +119,7 @@ public class WikiServletFilter implement
out.print("<h1>JSPWiki has not been started</h1>");
out.print("<p>JSPWiki is not running. This is probably due to a
configuration error in your jspwiki.properties file, ");
out.print("or a problem with your servlet container. Please
double-check everything before issuing a bug report ");
- out.print("at jspwiki.org.</p>");
+ out.print("at jspwiki.apache.org.</p>");
out.print("<p>We apologize for the inconvenience. No, really, we
do. We're trying to ");
out.print("JSPWiki as easy as we can, but there is only so much we
have time to test ");
out.print("platforms.</p>");
Modified: jspwiki/trunk/jspwiki-war/src/main/resources/ini/jspwiki.properties
URL:
http://svn.apache.org/viewvc/jspwiki/trunk/jspwiki-war/src/main/resources/ini/jspwiki.properties?rev=1554913&r1=1554912&r2=1554913&view=diff
==============================================================================
--- jspwiki/trunk/jspwiki-war/src/main/resources/ini/jspwiki.properties
(original)
+++ jspwiki/trunk/jspwiki-war/src/main/resources/ini/jspwiki.properties Thu Jan
2 20:57:32 2014
@@ -44,7 +44,7 @@ jspwiki.applicationName = JSPWiki
# any other computer than where the wiki is running.
#
# Example:
-# jspwiki.baseURL = http://www.jspwiki.org/
+# jspwiki.baseURL = http://jspwiki.apache.org/
#
jspwiki.baseURL=http://localhost:8080/JSPWiki/
@@ -639,7 +639,7 @@ jspwiki.aclManager = org.apache.wiki.aut
#
# This is the JSPWiki home. In future, JSPWiki will probably rely on this
# for error messages, so I don't recommend that you change it.
-jspwiki.interWikiRef.JSPWiki = http://www.ecyrd.com/JSPWiki/Wiki.jsp?page=%s
+jspwiki.interWikiRef.JSPWiki = http://jspwiki-wiki.apache.org/Wiki.jsp?page=%s
# Here's how you can have directly links to the JSPWiki editor.
# Now you can put a hyperlink for editing "MainPage" by making
@@ -662,7 +662,7 @@ jspwiki.interWikiRef.Wikipedia = http://
jspwiki.interWikiRef.Google = http://www.google.com/search?q=%s
# JSPWiki documentation (for this release)
-jspwiki.interWikiRef.Doc = http://doc.jspwiki.org/2.8/wiki/%s
+jspwiki.interWikiRef.Doc = http://jspwiki-wiki.apache.org/Wiki.jsp?page=%s
############################################################################
#
