You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@jspwiki.apache.org by me...@apache.org on 2016/12/31 14:23:36 UTC
[01/12] jspwiki git commit: JSPWIKI-1035 - first updates from Jurgen
Repository: jspwiki
Updated Branches:
refs/heads/master f35556f6a -> 36e7fd461
JSPWIKI-1035 - first updates from Jurgen
Project: http://git-wip-us.apache.org/repos/asf/jspwiki/repo
Commit: http://git-wip-us.apache.org/repos/asf/jspwiki/commit/7ab07298
Tree: http://git-wip-us.apache.org/repos/asf/jspwiki/tree/7ab07298
Diff: http://git-wip-us.apache.org/repos/asf/jspwiki/diff/7ab07298
Branch: refs/heads/master
Commit: 7ab07298811f5a3984dcacb712778ca2261321d6
Parents: 1ebca68
Author: Harry Metske <ha...@gmail.com>
Authored: Fri Dec 16 20:04:32 2016 +0100
Committer: Harry Metske <ha...@gmail.com>
Committed: Fri Dec 16 20:04:32 2016 +0100
----------------------------------------------------------------------
.../src/main/java/org/apache/wiki/WikiEngine.java | 13 ++++---------
.../apache/wiki/url/DefaultURLConstructor.java | 18 +-----------------
.../src/main/resources/ini/jspwiki.properties | 13 -------------
3 files changed, 5 insertions(+), 39 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/jspwiki/blob/7ab07298/jspwiki-war/src/main/java/org/apache/wiki/WikiEngine.java
----------------------------------------------------------------------
diff --git a/jspwiki-war/src/main/java/org/apache/wiki/WikiEngine.java b/jspwiki-war/src/main/java/org/apache/wiki/WikiEngine.java
index 39b4417..afb34f5 100644
--- a/jspwiki-war/src/main/java/org/apache/wiki/WikiEngine.java
+++ b/jspwiki-war/src/main/java/org/apache/wiki/WikiEngine.java
@@ -198,9 +198,6 @@ public class WikiEngine
/** If true, uses UTF8 encoding for all data */
private boolean m_useUTF8 = true;
- /** Stores the base URL. */
- private String m_baseURL;
-
/** Store the file path to the basic URL. When we're not running as
a servlet, it defaults to the user's current directory. */
private String m_rootPath = System.getProperty("user.dir");
@@ -533,11 +530,6 @@ public class WikiEngine
m_saveUserInfo );
m_useUTF8 = "UTF-8".equals( TextUtil.getStringProperty( props, PROP_ENCODING, "ISO-8859-1" ) );
- m_baseURL = TextUtil.getStringProperty(props, PROP_BASEURL, "");
- if (!m_baseURL.endsWith("/"))
- {
- m_baseURL = m_baseURL + "/";
- }
m_beautifyTitle = TextUtil.getBooleanProperty( props,
PROP_BEAUTIFYTITLE,
@@ -795,9 +787,12 @@ public class WikiEngine
public String getBaseURL()
{
- return m_baseURL;
+ String contextPath = m_servletContext.getContextPath();
+
+ return contextPath;
}
+
/**
* Returns the moment when this engine was started.
*
http://git-wip-us.apache.org/repos/asf/jspwiki/blob/7ab07298/jspwiki-war/src/main/java/org/apache/wiki/url/DefaultURLConstructor.java
----------------------------------------------------------------------
diff --git a/jspwiki-war/src/main/java/org/apache/wiki/url/DefaultURLConstructor.java b/jspwiki-war/src/main/java/org/apache/wiki/url/DefaultURLConstructor.java
index 458bfca..8d8779c 100644
--- a/jspwiki-war/src/main/java/org/apache/wiki/url/DefaultURLConstructor.java
+++ b/jspwiki-war/src/main/java/org/apache/wiki/url/DefaultURLConstructor.java
@@ -60,23 +60,7 @@ public class DefaultURLConstructor
{
m_engine = engine;
- String baseurl = engine.getBaseURL();
-
- if( baseurl != null && baseurl.length() > 0 )
- {
- try
- {
- URL url = new URL( baseurl );
-
- String path = url.getPath();
-
- m_pathPrefix = path;
- }
- catch( MalformedURLException e )
- {
- m_pathPrefix = "/JSPWiki/"; // Just a guess.
- }
- }
+ m_pathPrefix = engine.getBaseURL() + "/";
}
/**
http://git-wip-us.apache.org/repos/asf/jspwiki/blob/7ab07298/jspwiki-war/src/main/resources/ini/jspwiki.properties
----------------------------------------------------------------------
diff --git a/jspwiki-war/src/main/resources/ini/jspwiki.properties b/jspwiki-war/src/main/resources/ini/jspwiki.properties
index c00c7f7..589cc8b 100644
--- a/jspwiki-war/src/main/resources/ini/jspwiki.properties
+++ b/jspwiki-war/src/main/resources/ini/jspwiki.properties
@@ -36,19 +36,6 @@
jspwiki.applicationName = JSPWiki
#
-# Describe where your wiki lives (the real URL through which it is available
-# through the internet/intranet). This is a mandatory attribute.
-#
-# Be careful if you use a localhost address (http://localhost/ or http://127.0.0.1/),
-# as this will cause some unwanted side effects if your wiki is accessed from
-# any other computer than where the wiki is running.
-#
-# Example:
-# jspwiki.baseURL = http://jspwiki.apache.org/
-#
-jspwiki.baseURL=http://localhost:8080/JSPWiki/
-
-#
# Which page provider class to use. Possibilities are:
#
# FileSystemProvider - for simple pure file storage with no version information
[12/12] jspwiki git commit: 2016-12-31 Harry Metske
(metskem@apache.org)
Posted by me...@apache.org.
2016-12-31 Harry Metske (metskem@apache.org)
* 2.10.3-git-24.
* Fixed JSPWIKI-1035 - merged branch JSPWIKI-1035 back to master
Project: http://git-wip-us.apache.org/repos/asf/jspwiki/repo
Commit: http://git-wip-us.apache.org/repos/asf/jspwiki/commit/36e7fd46
Tree: http://git-wip-us.apache.org/repos/asf/jspwiki/tree/36e7fd46
Diff: http://git-wip-us.apache.org/repos/asf/jspwiki/diff/36e7fd46
Branch: refs/heads/master
Commit: 36e7fd46173c5ca537a3bfe909dedf3ec133efdc
Parents: e94bcb1
Author: Harry Metske <ha...@gmail.com>
Authored: Sat Dec 31 15:23:16 2016 +0100
Committer: Harry Metske <ha...@gmail.com>
Committed: Sat Dec 31 15:23:16 2016 +0100
----------------------------------------------------------------------
ChangeLog | 6 ++++++
README.md | 2 +-
jspwiki-portable/src/main/resources/jspwiki-custom.properties | 1 -
jspwiki-war/src/main/java/org/apache/wiki/Release.java | 2 +-
jspwiki-war/src/main/resources/ini/jspwiki.properties | 2 --
5 files changed, 8 insertions(+), 5 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/jspwiki/blob/36e7fd46/ChangeLog
----------------------------------------------------------------------
diff --git a/ChangeLog b/ChangeLog
index 16455aa..a93f45e 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+2016-12-31 Harry Metske (metskem@apache.org)
+
+ * 2.10.3-git-24.
+
+ * Fixed JSPWIKI-1035 - merged branch JSPWIKI-1035 back to master
+
2016-12-27 Dirk Frederickx (brushed AT apache DOT org)
* 2.10.3-svn-23.
http://git-wip-us.apache.org/repos/asf/jspwiki/blob/36e7fd46/README.md
----------------------------------------------------------------------
diff --git a/README.md b/README.md
index 9e603c4..b8a88ca 100644
--- a/README.md
+++ b/README.md
@@ -90,7 +90,7 @@ 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.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.
http://git-wip-us.apache.org/repos/asf/jspwiki/blob/36e7fd46/jspwiki-portable/src/main/resources/jspwiki-custom.properties
----------------------------------------------------------------------
diff --git a/jspwiki-portable/src/main/resources/jspwiki-custom.properties b/jspwiki-portable/src/main/resources/jspwiki-custom.properties
index 12bd191..e9374ab 100644
--- a/jspwiki-portable/src/main/resources/jspwiki-custom.properties
+++ b/jspwiki-portable/src/main/resources/jspwiki-custom.properties
@@ -28,7 +28,6 @@ jspwiki.rss.channelDescription = JSPWiki Portable
jspwiki.applicationName=JSPWiki
jspwiki.security=jaas
jspwiki.workDir=./temp/JSPWiki
-jspwiki.baseURL=http://localhost:9627/JSPWiki/
jspwiki.attachment.maxsize=4000000
jspwiki.attachment.forbid=.html .htm .php .asp .exe .sh .dll
jspwiki.breakTitleWithSpaces=true
http://git-wip-us.apache.org/repos/asf/jspwiki/blob/36e7fd46/jspwiki-war/src/main/java/org/apache/wiki/Release.java
----------------------------------------------------------------------
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 6d807cb..a25b96e 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 {
* <p>
* If the build identifier is empty, it is not added.
*/
- public static final String BUILD = "23";
+ public static final String BUILD = "24";
/**
* This is the generic version string you should use when printing out the version. It is of
http://git-wip-us.apache.org/repos/asf/jspwiki/blob/36e7fd46/jspwiki-war/src/main/resources/ini/jspwiki.properties
----------------------------------------------------------------------
diff --git a/jspwiki-war/src/main/resources/ini/jspwiki.properties b/jspwiki-war/src/main/resources/ini/jspwiki.properties
index 1c3fc7c..e6dac87 100644
--- a/jspwiki-war/src/main/resources/ini/jspwiki.properties
+++ b/jspwiki-war/src/main/resources/ini/jspwiki.properties
@@ -710,8 +710,6 @@ jspwiki.interWikiRef.JIRA = https://issues.apache.org/jira/browse/JSPWIKI-%s
#
# All of these settings were added in JSPWiki 1.7.6.
#
-# Note that jspwiki.baseURL MUST BE DEFINED if you want to enable RSS!
-#
# Determine if the RSS file should be generated at all. Allowed values
# are "true" and "false". Default is "false".
#
[05/12] jspwiki git commit: Merge branch 'master' into JSPWIKI-1035
Posted by me...@apache.org.
Merge branch 'master' into JSPWIKI-1035
Project: http://git-wip-us.apache.org/repos/asf/jspwiki/repo
Commit: http://git-wip-us.apache.org/repos/asf/jspwiki/commit/10596bde
Tree: http://git-wip-us.apache.org/repos/asf/jspwiki/tree/10596bde
Diff: http://git-wip-us.apache.org/repos/asf/jspwiki/diff/10596bde
Branch: refs/heads/master
Commit: 10596bdec0763dd81bb1a8626bc0a06eb898160e
Parents: c404436 cb0a11e
Author: Harry Metske <ha...@gmail.com>
Authored: Sun Dec 18 18:22:12 2016 +0100
Committer: Harry Metske <ha...@gmail.com>
Committed: Sun Dec 18 18:22:12 2016 +0100
----------------------------------------------------------------------
ChangeLog | 46 +
jspwiki-war/src/main/config/wro/wro.properties | 4 +-
.../src/main/java/org/apache/wiki/Release.java | 2 +-
.../apache/wiki/plugin/WeblogArchivePlugin.java | 28 +-
.../org/apache/wiki/plugin/WeblogPlugin.java | 20 +-
.../apache/wiki/xmlrpc/MetaWeblogHandler.java | 34 +-
.../resources/plugin/PluginResources.properties | 1 +
.../main/resources/templates/default.properties | 17 +-
.../src/main/scripts/behaviors/Accordion.js | 4 +-
.../src/main/scripts/behaviors/AddCSS.js | 11 +-
.../src/main/scripts/behaviors/Columns.js | 2 +-
jspwiki-war/src/main/scripts/behaviors/Flip.js | 2 +-
.../src/main/scripts/behaviors/GraphBar.js | 3 +-
.../src/main/scripts/behaviors/TableX.js | 5 +-
.../src/main/scripts/behaviors/Viewer.js | 4 +-
.../src/main/scripts/dialog/Dialog.Selection.js | 41 +-
jspwiki-war/src/main/scripts/dialog/Dialog.js | 35 +-
.../scripts/moo-extend/Array.NaturalSort.js | 2 +-
.../src/main/scripts/moo-extend/Behavior.js | 25 +-
.../src/main/scripts/moo-extend/Color.js | 21 +-
.../main/scripts/moo-extend/Element.Extend.js | 2 +-
.../main/scripts/moo-extend/String.Extend.js | 15 +-
.../src/main/scripts/moo-extend/Textarea.js | 9 +
.../main/scripts/wiki-edit/Snipe.Commands.js | 16 +-
.../main/scripts/wiki-edit/Snipe.Sections.js | 150 ++-
.../src/main/scripts/wiki-edit/Snipe.Snips.js | 42 +-
jspwiki-war/src/main/scripts/wiki-edit/Snipe.js | 317 +++---
.../src/main/scripts/wiki-edit/Undoable.js | 7 +-
.../src/main/scripts/wiki-edit/Wiki.Edit.js | 278 +++---
.../src/main/scripts/wiki-edit/Wiki.Snips.js | 962 +++++++++----------
jspwiki-war/src/main/scripts/wiki/Category.js | 4 +-
jspwiki-war/src/main/scripts/wiki/Recents.js | 2 +-
.../src/main/scripts/wiki/Wiki.Behaviors.js | 67 +-
jspwiki-war/src/main/scripts/wiki/Wiki.js | 130 ++-
.../main/styles/haddock/bootstrap/.csscomb.json | 304 ++++++
.../main/styles/haddock/bootstrap/.csslintrc | 19 +
.../main/styles/haddock/bootstrap/alerts.less | 32 +-
.../main/styles/haddock/bootstrap/badges.less | 73 +-
.../styles/haddock/bootstrap/bootstrap.less | 31 +-
.../styles/haddock/bootstrap/breadcrumbs.less | 25 +-
.../styles/haddock/bootstrap/button-groups.less | 91 +-
.../main/styles/haddock/bootstrap/buttons.less | 73 +-
.../main/styles/haddock/bootstrap/carousel.less | 82 +-
.../main/styles/haddock/bootstrap/close.less | 21 +-
.../src/main/styles/haddock/bootstrap/code.less | 38 +-
.../haddock/bootstrap/component-animations.less | 34 +-
.../styles/haddock/bootstrap/dropdowns.less | 69 +-
.../main/styles/haddock/bootstrap/forms.less | 406 ++++++--
.../styles/haddock/bootstrap/glyphicons.less | 112 ++-
.../src/main/styles/haddock/bootstrap/grid.less | 75 +-
.../styles/haddock/bootstrap/input-groups.less | 101 +-
.../styles/haddock/bootstrap/jumbotron.less | 46 +-
.../main/styles/haddock/bootstrap/labels.less | 22 +-
.../styles/haddock/bootstrap/list-group.less | 90 +-
.../main/styles/haddock/bootstrap/media.less | 66 ++
.../main/styles/haddock/bootstrap/mixins.less | 897 +----------------
.../styles/haddock/bootstrap/mixins/alerts.less | 14 +
.../bootstrap/mixins/background-variant.less | 9 +
.../haddock/bootstrap/mixins/border-radius.less | 18 +
.../haddock/bootstrap/mixins/buttons.less | 65 ++
.../haddock/bootstrap/mixins/center-block.less | 7 +
.../haddock/bootstrap/mixins/clearfix.less | 22 +
.../styles/haddock/bootstrap/mixins/forms.less | 85 ++
.../haddock/bootstrap/mixins/gradients.less | 59 ++
.../bootstrap/mixins/grid-framework.less | 91 ++
.../styles/haddock/bootstrap/mixins/grid.less | 122 +++
.../haddock/bootstrap/mixins/hide-text.less | 21 +
.../styles/haddock/bootstrap/mixins/image.less | 33 +
.../styles/haddock/bootstrap/mixins/labels.less | 12 +
.../haddock/bootstrap/mixins/list-group.less | 30 +
.../haddock/bootstrap/mixins/nav-divider.less | 10 +
.../bootstrap/mixins/nav-vertical-align.less | 9 +
.../haddock/bootstrap/mixins/opacity.less | 8 +
.../haddock/bootstrap/mixins/pagination.less | 24 +
.../styles/haddock/bootstrap/mixins/panels.less | 24 +
.../haddock/bootstrap/mixins/progress-bar.less | 10 +
.../haddock/bootstrap/mixins/reset-filter.less | 8 +
.../haddock/bootstrap/mixins/reset-text.less | 18 +
.../styles/haddock/bootstrap/mixins/resize.less | 6 +
.../bootstrap/mixins/responsive-visibility.less | 15 +
.../styles/haddock/bootstrap/mixins/size.less | 10 +
.../haddock/bootstrap/mixins/tab-focus.less | 9 +
.../haddock/bootstrap/mixins/table-row.less | 28 +
.../haddock/bootstrap/mixins/text-emphasis.less | 9 +
.../haddock/bootstrap/mixins/text-overflow.less | 8 +
.../bootstrap/mixins/vendor-prefixes.less | 227 +++++
.../main/styles/haddock/bootstrap/modals.less | 71 +-
.../main/styles/haddock/bootstrap/navbar.less | 154 +--
.../src/main/styles/haddock/bootstrap/navs.less | 28 +-
.../styles/haddock/bootstrap/normalize.less | 318 +++---
.../main/styles/haddock/bootstrap/pager.less | 33 +-
.../styles/haddock/bootstrap/pagination.less | 38 +-
.../main/styles/haddock/bootstrap/panels.less | 217 +++--
.../main/styles/haddock/bootstrap/popovers.less | 56 +-
.../main/styles/haddock/bootstrap/print.less | 216 ++---
.../styles/haddock/bootstrap/progress-bars.less | 37 +-
.../haddock/bootstrap/responsive-embed.less | 35 +
.../haddock/bootstrap/responsive-utilities.less | 253 +++--
.../styles/haddock/bootstrap/scaffolding.less | 72 +-
.../main/styles/haddock/bootstrap/tables.less | 55 +-
.../main/styles/haddock/bootstrap/theme.less | 90 +-
.../styles/haddock/bootstrap/thumbnails.less | 36 +
.../main/styles/haddock/bootstrap/tooltip.less | 42 +-
.../src/main/styles/haddock/bootstrap/type.less | 213 ++--
.../styles/haddock/bootstrap/utilities.less | 21 -
.../styles/haddock/bootstrap/variables.less | 650 ++++++++-----
.../main/styles/haddock/bootstrap/wells.less | 29 +
.../src/main/styles/haddock/default/.crunch | 123 +++
.../main/styles/haddock/default/Calendar.less | 48 -
.../src/main/styles/haddock/default/Dialog.less | 19 +-
.../main/styles/haddock/default/Invisibles.less | 2 +-
.../haddock/default/RecentChangesPlugin.less | 10 +-
.../main/styles/haddock/default/TOCPlugin.less | 20 +-
.../haddock/default/Template.Content.less | 4 +-
.../styles/haddock/default/Template.Edit.less | 147 ++-
.../src/main/styles/haddock/default/Tips.less | 7 +-
.../styles/haddock/default/WeblogPlugin.less | 63 +-
.../src/main/styles/haddock/default/build.less | 13 +-
.../src/main/styles/haddock/default/grid.less | 2 +-
.../main/styles/haddock/default/prettify.less | 14 +-
.../src/main/styles/haddock/default/type.less | 145 ++-
.../main/styles/haddock/default/variables.less | 8 +-
.../main/styles/haddock/fontjspwiki/core.less | 13 +-
.../main/styles/haddock/fontjspwiki/path.less | 13 +-
jspwiki-war/src/main/webapp/Comment.jsp | 3 +-
jspwiki-war/src/main/webapp/DeleteGroup.jsp | 11 +-
jspwiki-war/src/main/webapp/Install.jsp | 62 +-
.../src/main/webapp/XHRMarkup2Wysiwyg.jsp | 84 ++
.../webapp/templates/haddock/AttachmentTab.jsp | 2 +-
.../webapp/templates/haddock/CommentContent.jsp | 18 +-
.../main/webapp/templates/haddock/DiffTab.jsp | 2 +-
.../webapp/templates/haddock/EditTemplate.jsp | 2 +-
.../main/webapp/templates/haddock/Header.jsp | 2 +-
.../webapp/templates/haddock/InfoContent.jsp | 2 +-
.../src/main/webapp/templates/haddock/Nav.jsp | 15 +-
.../main/webapp/templates/haddock/PageTab.jsp | 2 -
.../webapp/templates/haddock/PreferencesTab.jsp | 21 +-
.../webapp/templates/haddock/ProfileTab.jsp | 10 +-
.../main/webapp/templates/haddock/Sidebar.jsp | 8 +-
.../webapp/templates/haddock/ViewTemplate.jsp | 3 +-
.../webapp/templates/haddock/commonheader.jsp | 11 +-
.../templates/haddock/editors/CKeditor.jsp | 65 +-
.../templates/haddock/editors/TinyMCE.jsp | 64 +-
.../webapp/templates/haddock/editors/plain.jsp | 183 ++--
.../templates/haddock/editors/wysiwyg.jsp | 74 +-
.../org/apache/wiki/rss/RSSGeneratorTest.java | 8 +-
146 files changed, 5854 insertions(+), 4139 deletions(-)
----------------------------------------------------------------------
[06/12] jspwiki git commit: Merge branch 'master' into JSPWIKI-1035
Posted by me...@apache.org.
Merge branch 'master' into JSPWIKI-1035
Project: http://git-wip-us.apache.org/repos/asf/jspwiki/repo
Commit: http://git-wip-us.apache.org/repos/asf/jspwiki/commit/a5224087
Tree: http://git-wip-us.apache.org/repos/asf/jspwiki/tree/a5224087
Diff: http://git-wip-us.apache.org/repos/asf/jspwiki/diff/a5224087
Branch: refs/heads/master
Commit: a522408775316a9501799bce3830dbf5a20ec532
Parents: 10596bd 82949d6
Author: Harry Metske <ha...@gmail.com>
Authored: Tue Dec 20 19:16:59 2016 +0100
Committer: Harry Metske <ha...@gmail.com>
Committed: Tue Dec 20 19:16:59 2016 +0100
----------------------------------------------------------------------
ChangeLog | 15 +++++++++++++++
.../src/main/java/org/apache/wiki/Release.java | 2 +-
jspwiki-war/src/main/scripts/wiki/Wiki.js | 12 ++++++++++++
3 files changed, 28 insertions(+), 1 deletion(-)
----------------------------------------------------------------------
[11/12] jspwiki git commit: merged Changelog
Posted by me...@apache.org.
merged Changelog
Project: http://git-wip-us.apache.org/repos/asf/jspwiki/repo
Commit: http://git-wip-us.apache.org/repos/asf/jspwiki/commit/e94bcb12
Tree: http://git-wip-us.apache.org/repos/asf/jspwiki/tree/e94bcb12
Diff: http://git-wip-us.apache.org/repos/asf/jspwiki/diff/e94bcb12
Branch: refs/heads/master
Commit: e94bcb12ccd305995c495bcd1df61fd4ba73d1d7
Parents: 67d7249
Author: Harry Metske <ha...@gmail.com>
Authored: Wed Dec 28 20:00:55 2016 +0100
Committer: Harry Metske <ha...@gmail.com>
Committed: Wed Dec 28 20:00:55 2016 +0100
----------------------------------------------------------------------
ChangeLog | 10 +++++-----
1 file changed, 5 insertions(+), 5 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/jspwiki/blob/e94bcb12/ChangeLog
----------------------------------------------------------------------
diff --git a/ChangeLog b/ChangeLog
index bd03286..16455aa 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,14 +1,14 @@
-2016-12-26 Harry Metske (metskem@apache.org)
- * Fixed JSPWIKI-1035 - Get rid of jspwiki.baseURL
- fixed remaining unit tests
- * changed Release postfix from "svn" to "git"
-
2016-12-27 Dirk Frederickx (brushed AT apache DOT org)
* 2.10.3-svn-23.
* Fix nesting of ul/li in RefferedPAgesPlugin.
+2016-12-26 Harry Metske (metskem@apache.org)
+ * Fixed JSPWIKI-1035 - Get rid of jspwiki.baseURL
+ fixed remaining unit tests
+ * changed Release postfix from "svn" to "git"
+
2016-12-19 Dirk Frederickx (brushed AT apache DOT org)
* 2.10.3-svn-22 Various HADDOCK updates & fixes.
[10/12] jspwiki git commit: Merge branch 'master' into JSPWIKI-1035
Posted by me...@apache.org.
Merge branch 'master' into JSPWIKI-1035
# Conflicts:
# ChangeLog
Project: http://git-wip-us.apache.org/repos/asf/jspwiki/repo
Commit: http://git-wip-us.apache.org/repos/asf/jspwiki/commit/67d7249b
Tree: http://git-wip-us.apache.org/repos/asf/jspwiki/tree/67d7249b
Diff: http://git-wip-us.apache.org/repos/asf/jspwiki/diff/67d7249b
Branch: refs/heads/master
Commit: 67d7249b65bd02713f97da8a24c41d10bf0d50a2
Parents: 3a1773a f35556f
Author: Harry Metske <ha...@gmail.com>
Authored: Wed Dec 28 19:52:05 2016 +0100
Committer: Harry Metske <ha...@gmail.com>
Committed: Wed Dec 28 19:52:05 2016 +0100
----------------------------------------------------------------------
ChangeLog | 6 +++++
.../apache/wiki/plugin/ReferredPagesPlugin.java | 23 +++++++++++++-------
2 files changed, 21 insertions(+), 8 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/jspwiki/blob/67d7249b/ChangeLog
----------------------------------------------------------------------
diff --cc ChangeLog
index 70e0ae8,16db93c..bd03286
--- a/ChangeLog
+++ b/ChangeLog
@@@ -1,8 -1,9 +1,14 @@@
+2016-12-26 Harry Metske (metskem@apache.org)
+ * Fixed JSPWIKI-1035 - Get rid of jspwiki.baseURL
+ fixed remaining unit tests
+ * changed Release postfix from "svn" to "git"
+
+ 2016-12-27 Dirk Frederickx (brushed AT apache DOT org)
+
+ * 2.10.3-svn-23.
+
+ * Fix nesting of ul/li in RefferedPAgesPlugin.
+
2016-12-19 Dirk Frederickx (brushed AT apache DOT org)
* 2.10.3-svn-22 Various HADDOCK updates & fixes.
[07/12] jspwiki git commit: 2016-12-26 Harry Metske
(metskem@apache.org) * Fixed JSPWIKI-1035 - Get rid of jspwiki.baseURL fixed
remaining unit tests * changed Release postfix from "svn" to "git"
Posted by me...@apache.org.
2016-12-26 Harry Metske (metskem@apache.org)
* Fixed JSPWIKI-1035 - Get rid of jspwiki.baseURL
fixed remaining unit tests
* changed Release postfix from "svn" to "git"
Project: http://git-wip-us.apache.org/repos/asf/jspwiki/repo
Commit: http://git-wip-us.apache.org/repos/asf/jspwiki/commit/72e1acee
Tree: http://git-wip-us.apache.org/repos/asf/jspwiki/tree/72e1acee
Diff: http://git-wip-us.apache.org/repos/asf/jspwiki/diff/72e1acee
Branch: refs/heads/master
Commit: 72e1acee0dc9ca1348bf381fc12f529b9bccf055
Parents: a522408
Author: Harry Metske <ha...@gmail.com>
Authored: Mon Dec 26 11:59:25 2016 +0100
Committer: Harry Metske <ha...@gmail.com>
Committed: Mon Dec 26 11:59:25 2016 +0100
----------------------------------------------------------------------
ChangeLog | 5 ++
.../src/main/java/org/apache/wiki/Release.java | 4 +-
.../apache/wiki/url/DefaultURLConstructor.java | 2 +-
.../org/apache/wiki/ui/CommandResolverTest.java | 4 +-
.../wiki/url/DefaultURLConstructorTest.java | 51 ++++++++++----------
.../wiki/url/ShortURLConstructorTest.java | 51 ++++++++++----------
.../wiki/url/ShortViewURLConstructorTest.java | 51 ++++++++++----------
.../org/apache/wiki/xmlrpc/RPCHandlerTest.java | 6 +--
8 files changed, 88 insertions(+), 86 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/jspwiki/blob/72e1acee/ChangeLog
----------------------------------------------------------------------
diff --git a/ChangeLog b/ChangeLog
index 9c1acc8..70e0ae8 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2016-12-26 Harry Metske (metskem@apache.org)
+ * Fixed JSPWIKI-1035 - Get rid of jspwiki.baseURL
+ fixed remaining unit tests
+ * changed Release postfix from "svn" to "git"
+
2016-12-19 Dirk Frederickx (brushed AT apache DOT org)
* 2.10.3-svn-22 Various HADDOCK updates & fixes.
http://git-wip-us.apache.org/repos/asf/jspwiki/blob/72e1acee/jspwiki-war/src/main/java/org/apache/wiki/Release.java
----------------------------------------------------------------------
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 9cf5f0d..6d807cb 100644
--- a/jspwiki-war/src/main/java/org/apache/wiki/Release.java
+++ b/jspwiki-war/src/main/java/org/apache/wiki/Release.java
@@ -52,7 +52,7 @@ public final class Release {
* <p>
* If the POSTFIX is empty, it is not added to the version string.
*/
- private static final String POSTFIX = "svn";
+ private static final String POSTFIX = "git";
/** The JSPWiki major version. */
public static final int VERSION = 2;
@@ -72,7 +72,7 @@ public final class Release {
* <p>
* If the build identifier is empty, it is not added.
*/
- public static final String BUILD = "22";
+ public static final String BUILD = "23";
/**
* This is the generic version string you should use when printing out the version. It is of
http://git-wip-us.apache.org/repos/asf/jspwiki/blob/72e1acee/jspwiki-war/src/main/java/org/apache/wiki/url/DefaultURLConstructor.java
----------------------------------------------------------------------
diff --git a/jspwiki-war/src/main/java/org/apache/wiki/url/DefaultURLConstructor.java b/jspwiki-war/src/main/java/org/apache/wiki/url/DefaultURLConstructor.java
index 8d8779c..dca6d25 100644
--- a/jspwiki-war/src/main/java/org/apache/wiki/url/DefaultURLConstructor.java
+++ b/jspwiki-war/src/main/java/org/apache/wiki/url/DefaultURLConstructor.java
@@ -84,7 +84,7 @@ public class DefaultURLConstructor
{
String baseurl = m_pathPrefix;
- if( absolute ) baseurl = m_engine.getBaseURL();
+ if( absolute ) baseurl = m_engine.getBaseURL() + "/";
baseptrn = TextUtil.replaceString( baseptrn, "%u", baseurl );
baseptrn = TextUtil.replaceString( baseptrn, "%U", m_engine.getBaseURL() );
http://git-wip-us.apache.org/repos/asf/jspwiki/blob/72e1acee/jspwiki-war/src/test/java/org/apache/wiki/ui/CommandResolverTest.java
----------------------------------------------------------------------
diff --git a/jspwiki-war/src/test/java/org/apache/wiki/ui/CommandResolverTest.java b/jspwiki-war/src/test/java/org/apache/wiki/ui/CommandResolverTest.java
index 721d757..4fdab21 100644
--- a/jspwiki-war/src/test/java/org/apache/wiki/ui/CommandResolverTest.java
+++ b/jspwiki-war/src/test/java/org/apache/wiki/ui/CommandResolverTest.java
@@ -225,10 +225,10 @@ public class CommandResolverTest extends TestCase
{
String url;
url = resolver.getSpecialPageReference( "RecentChanges" );
- assertEquals( "http://localhost/RecentChanges.jsp", url );
+ assertEquals( "/test/RecentChanges.jsp", url );
url = resolver.getSpecialPageReference( "Search" );
- assertEquals( "http://localhost/Search.jsp", url );
+ assertEquals( "/test/Search.jsp", url );
// UserPrefs doesn't exist in our test properties
url = resolver.getSpecialPageReference( "UserPrefs" );
http://git-wip-us.apache.org/repos/asf/jspwiki/blob/72e1acee/jspwiki-war/src/test/java/org/apache/wiki/url/DefaultURLConstructorTest.java
----------------------------------------------------------------------
diff --git a/jspwiki-war/src/test/java/org/apache/wiki/url/DefaultURLConstructorTest.java b/jspwiki-war/src/test/java/org/apache/wiki/url/DefaultURLConstructorTest.java
index fc3df0b..0cab8ac 100644
--- a/jspwiki-war/src/test/java/org/apache/wiki/url/DefaultURLConstructorTest.java
+++ b/jspwiki-war/src/test/java/org/apache/wiki/url/DefaultURLConstructorTest.java
@@ -39,10 +39,9 @@ public class DefaultURLConstructorTest extends TestCase
Properties props = TestEngine.getTestProperties();
- private URLConstructor getConstructor( String baseURL, String prefix )
+ private URLConstructor getConstructor( String prefix )
throws WikiException
{
- props.setProperty( WikiEngine.PROP_BASEURL, baseURL );
if( prefix != null ) props.setProperty( ShortViewURLConstructor.PROP_PREFIX, prefix );
testEngine = new TestEngine(props);
@@ -56,97 +55,97 @@ public class DefaultURLConstructorTest extends TestCase
public void testViewURL1()
throws Exception
{
- URLConstructor c = getConstructor( "http://localhost/", "wiki/" );
+ URLConstructor c = getConstructor("wiki/" );
- assertEquals( "http://localhost/Wiki.jsp?page=Main", c.makeURL(WikiContext.VIEW,"Main",true,null) );
+ assertEquals( "/test/Wiki.jsp?page=Main", c.makeURL(WikiContext.VIEW,"Main",true,null) );
}
public void testViewURL2()
throws Exception
{
- URLConstructor c = getConstructor( "http://localhost/mywiki/", null );
+ URLConstructor c = getConstructor( null );
- assertEquals( "http://localhost/mywiki/Wiki.jsp?page=Main", c.makeURL(WikiContext.VIEW,"Main",true,null) );
+ assertEquals( "/test/Wiki.jsp?page=Main", c.makeURL(WikiContext.VIEW,"Main",true,null) );
}
public void testViewURL3()
throws Exception
{
- URLConstructor c = getConstructor( "http://localhost:8080/", null );
+ URLConstructor c = getConstructor( null );
- assertEquals( "http://localhost:8080/Wiki.jsp?page=Main", c.makeURL(WikiContext.VIEW,"Main",true,null) );
+ assertEquals( "/test/Wiki.jsp?page=Main", c.makeURL(WikiContext.VIEW,"Main",true,null) );
}
public void testViewURL4()
throws Exception
{
- URLConstructor c = getConstructor( "http://localhost/mywiki/", null );
+ URLConstructor c = getConstructor( null );
- assertEquals( "/mywiki/Wiki.jsp?page=Main", c.makeURL(WikiContext.VIEW,"Main",false,null) );
+ assertEquals( "/test/Wiki.jsp?page=Main", c.makeURL(WikiContext.VIEW,"Main",false,null) );
}
public void testViewURL5()
throws Exception
{
- URLConstructor c = getConstructor( "http://localhost/", "" );
+ URLConstructor c = getConstructor( "" );
- assertEquals( "http://localhost/Wiki.jsp?page=Main", c.makeURL(WikiContext.VIEW,"Main",true,null) );
+ assertEquals( "/test/Wiki.jsp?page=Main", c.makeURL(WikiContext.VIEW,"Main",true,null) );
}
public void testViewURL6()
throws Exception
{
- URLConstructor c = getConstructor( "http://localhost/mywiki/app1/", null );
+ URLConstructor c = getConstructor( null );
- assertEquals( "http://localhost/mywiki/app1/Wiki.jsp?page=Main", c.makeURL(WikiContext.VIEW,"Main",true,null) );
+ assertEquals( "/test/Wiki.jsp?page=Main", c.makeURL(WikiContext.VIEW,"Main",true,null) );
}
public void testViewURL7()
throws Exception
{
- URLConstructor c = getConstructor( "http://localhost/mywiki/app1/", "view/" );
+ URLConstructor c = getConstructor( "view/" );
- assertEquals( "http://localhost/mywiki/app1/Wiki.jsp?page=Main", c.makeURL(WikiContext.VIEW,"Main",true,null) );
+ assertEquals( "/test/Wiki.jsp?page=Main", c.makeURL(WikiContext.VIEW,"Main",true,null) );
}
public void testEditURL1()
throws Exception
{
- URLConstructor c = getConstructor( "http://localhost/mywiki/", null );
+ URLConstructor c = getConstructor( null );
- assertEquals( "http://localhost/mywiki/Edit.jsp?page=Main", c.makeURL(WikiContext.EDIT,"Main",true,null) );
+ assertEquals( "/test/Edit.jsp?page=Main", c.makeURL(WikiContext.EDIT,"Main",true,null) );
}
public void testAttachURL1()
throws Exception
{
- URLConstructor c = getConstructor( "http://localhost/mywiki/", null );
+ URLConstructor c = getConstructor( null );
- assertEquals( "http://localhost/mywiki/attach/Main/foo.txt", c.makeURL(WikiContext.ATTACH,"Main/foo.txt",true,null) );
+ assertEquals( "/test/attach/Main/foo.txt", c.makeURL(WikiContext.ATTACH,"Main/foo.txt",true,null) );
}
public void testAttachURLRelative1()
throws Exception
{
- URLConstructor c = getConstructor( "http://localhost/mywiki/", null );
+ URLConstructor c = getConstructor( null );
- assertEquals( "/mywiki/attach/Main/foo.txt", c.makeURL(WikiContext.ATTACH,"Main/foo.txt",false,null) );
+ assertEquals( "/test/attach/Main/foo.txt", c.makeURL(WikiContext.ATTACH,"Main/foo.txt",false,null) );
}
public void testOtherURL1()
throws Exception
{
- URLConstructor c = getConstructor( "http://localhost/mywiki/", null );
+ URLConstructor c = getConstructor( null );
- assertEquals( "http://localhost/mywiki/foo.jsp", c.makeURL(WikiContext.NONE,"foo.jsp",true,null) );
+ assertEquals( "/test/foo.jsp", c.makeURL(WikiContext.NONE,"foo.jsp",true,null) );
}
public void testOtherURL2()
throws Exception
{
- URLConstructor c = getConstructor( "http://localhost/mywiki/dobble/", null );
+ URLConstructor c = getConstructor( null );
- assertEquals( "http://localhost/mywiki/dobble/foo.jsp?a=1&b=2", c.makeURL(WikiContext.NONE,"foo.jsp",true,"a=1&b=2") );
+ assertEquals( "/test/foo.jsp?a=1&b=2", c.makeURL(WikiContext.NONE,"foo.jsp",true,"a=1&b=2") );
}
public static Test suite()
http://git-wip-us.apache.org/repos/asf/jspwiki/blob/72e1acee/jspwiki-war/src/test/java/org/apache/wiki/url/ShortURLConstructorTest.java
----------------------------------------------------------------------
diff --git a/jspwiki-war/src/test/java/org/apache/wiki/url/ShortURLConstructorTest.java b/jspwiki-war/src/test/java/org/apache/wiki/url/ShortURLConstructorTest.java
index 5cc7024..6b7de52 100644
--- a/jspwiki-war/src/test/java/org/apache/wiki/url/ShortURLConstructorTest.java
+++ b/jspwiki-war/src/test/java/org/apache/wiki/url/ShortURLConstructorTest.java
@@ -39,10 +39,9 @@ public class ShortURLConstructorTest extends TestCase
Properties props = TestEngine.getTestProperties();
- private URLConstructor getConstructor( String baseURL, String prefix )
+ private URLConstructor getConstructor(String prefix)
throws WikiException
{
- props.setProperty( WikiEngine.PROP_BASEURL, baseURL );
if( prefix != null ) props.setProperty( ShortURLConstructor.PROP_PREFIX, prefix );
testEngine = new TestEngine(props);
@@ -56,97 +55,97 @@ public class ShortURLConstructorTest extends TestCase
public void testViewURL1()
throws Exception
{
- URLConstructor c = getConstructor( "http://localhost/", "wiki/" );
+ URLConstructor c = getConstructor("wiki/" );
- assertEquals( "http://localhost/wiki/Main", c.makeURL(WikiContext.VIEW,"Main",true,null) );
+ assertEquals( "/test/wiki/Main", c.makeURL(WikiContext.VIEW,"Main",true,null) );
}
public void testViewURL2()
throws Exception
{
- URLConstructor c = getConstructor( "http://localhost/mywiki/", null );
+ URLConstructor c = getConstructor(null );
- assertEquals( "http://localhost/mywiki/wiki/Main", c.makeURL(WikiContext.VIEW,"Main",true,null) );
+ assertEquals( "/test/wiki/Main", c.makeURL(WikiContext.VIEW,"Main",true,null) );
}
public void testViewURL3()
throws Exception
{
- URLConstructor c = getConstructor( "http://localhost:8080/", null );
+ URLConstructor c = getConstructor(null );
- assertEquals( "http://localhost:8080/wiki/Main", c.makeURL(WikiContext.VIEW,"Main",true,null) );
+ assertEquals( "/test/wiki/Main", c.makeURL(WikiContext.VIEW,"Main",true,null) );
}
public void testViewURL4()
throws Exception
{
- URLConstructor c = getConstructor( "http://localhost/mywiki/", null );
+ URLConstructor c = getConstructor(null );
- assertEquals( "/mywiki/wiki/Main", c.makeURL(WikiContext.VIEW,"Main",false,null) );
+ assertEquals( "/test/wiki/Main", c.makeURL(WikiContext.VIEW,"Main",false,null) );
}
public void testViewURL5()
throws Exception
{
- URLConstructor c = getConstructor( "http://localhost/", "" );
+ URLConstructor c = getConstructor("" );
- assertEquals( "http://localhost/Main", c.makeURL(WikiContext.VIEW,"Main",true,null) );
+ assertEquals( "/test/Main", c.makeURL(WikiContext.VIEW,"Main",true,null) );
}
public void testViewURL6()
throws Exception
{
- URLConstructor c = getConstructor( "http://localhost/mywiki/app1/", null );
+ URLConstructor c = getConstructor(null );
- assertEquals( "http://localhost/mywiki/app1/wiki/Main", c.makeURL(WikiContext.VIEW,"Main",true,null) );
+ assertEquals( "/test/wiki/Main", c.makeURL(WikiContext.VIEW,"Main",true,null) );
}
public void testViewURL7()
throws Exception
{
- URLConstructor c = getConstructor( "http://localhost/mywiki/app1/", "view/" );
+ URLConstructor c = getConstructor("view/" );
- assertEquals( "http://localhost/mywiki/app1/view/Main", c.makeURL(WikiContext.VIEW,"Main",true,null) );
+ assertEquals( "/test/view/Main", c.makeURL(WikiContext.VIEW,"Main",true,null) );
}
public void testEditURL1()
throws Exception
{
- URLConstructor c = getConstructor( "http://localhost/mywiki/", null );
+ URLConstructor c = getConstructor(null );
- assertEquals( "http://localhost/mywiki/wiki/Main?do=Edit", c.makeURL(WikiContext.EDIT,"Main",true,null) );
+ assertEquals( "/test/wiki/Main?do=Edit", c.makeURL(WikiContext.EDIT,"Main",true,null) );
}
public void testAttachURL1()
throws Exception
{
- URLConstructor c = getConstructor( "http://localhost/mywiki/", null );
+ URLConstructor c = getConstructor(null );
- assertEquals( "http://localhost/mywiki/attach/Main/foo.txt", c.makeURL(WikiContext.ATTACH,"Main/foo.txt",true,null) );
+ assertEquals( "/test/attach/Main/foo.txt", c.makeURL(WikiContext.ATTACH,"Main/foo.txt",true,null) );
}
public void testAttachURLRelative1()
throws Exception
{
- URLConstructor c = getConstructor( "http://localhost/mywiki/", null );
+ URLConstructor c = getConstructor(null );
- assertEquals( "/mywiki/attach/Main/foo.txt", c.makeURL(WikiContext.ATTACH,"Main/foo.txt",false,null) );
+ assertEquals( "/test/attach/Main/foo.txt", c.makeURL(WikiContext.ATTACH,"Main/foo.txt",false,null) );
}
public void testOtherURL1()
throws Exception
{
- URLConstructor c = getConstructor( "http://localhost/mywiki/", null );
+ URLConstructor c = getConstructor(null );
- assertEquals( "http://localhost/mywiki/foo.jsp", c.makeURL(WikiContext.NONE,"foo.jsp",true,null) );
+ assertEquals( "/test/foo.jsp", c.makeURL(WikiContext.NONE,"foo.jsp",true,null) );
}
public void testOtherURL2()
throws Exception
{
- URLConstructor c = getConstructor( "http://localhost/mywiki/dobble/", null );
+ URLConstructor c = getConstructor(null );
- assertEquals( "http://localhost/mywiki/dobble/foo.jsp?a=1&b=2", c.makeURL(WikiContext.NONE,"foo.jsp",true,"a=1&b=2") );
+ assertEquals( "/test/foo.jsp?a=1&b=2", c.makeURL(WikiContext.NONE,"foo.jsp",true,"a=1&b=2") );
}
public static Test suite()
http://git-wip-us.apache.org/repos/asf/jspwiki/blob/72e1acee/jspwiki-war/src/test/java/org/apache/wiki/url/ShortViewURLConstructorTest.java
----------------------------------------------------------------------
diff --git a/jspwiki-war/src/test/java/org/apache/wiki/url/ShortViewURLConstructorTest.java b/jspwiki-war/src/test/java/org/apache/wiki/url/ShortViewURLConstructorTest.java
index 2a1e1bc..3270a59 100644
--- a/jspwiki-war/src/test/java/org/apache/wiki/url/ShortViewURLConstructorTest.java
+++ b/jspwiki-war/src/test/java/org/apache/wiki/url/ShortViewURLConstructorTest.java
@@ -39,10 +39,9 @@ public class ShortViewURLConstructorTest extends TestCase
Properties props = TestEngine.getTestProperties();
- private URLConstructor getConstructor( String baseURL, String prefix )
+ private URLConstructor getConstructor(String prefix)
throws WikiException
{
- props.setProperty( WikiEngine.PROP_BASEURL, baseURL );
if( prefix != null ) props.setProperty( ShortViewURLConstructor.PROP_PREFIX, prefix );
testEngine = new TestEngine(props);
@@ -56,97 +55,97 @@ public class ShortViewURLConstructorTest extends TestCase
public void testViewURL1()
throws Exception
{
- URLConstructor c = getConstructor( "http://localhost/", "wiki/" );
+ URLConstructor c = getConstructor("wiki/" );
- assertEquals( "http://localhost/wiki/Main", c.makeURL(WikiContext.VIEW,"Main",true,null) );
+ assertEquals( "/test/wiki/Main", c.makeURL(WikiContext.VIEW,"Main",true,null) );
}
public void testViewURL2()
throws Exception
{
- URLConstructor c = getConstructor( "http://localhost/mywiki/", null );
+ URLConstructor c = getConstructor(null );
- assertEquals( "http://localhost/mywiki/wiki/Main", c.makeURL(WikiContext.VIEW,"Main",true,null) );
+ assertEquals( "/test/wiki/Main", c.makeURL(WikiContext.VIEW,"Main",true,null) );
}
public void testViewURL3()
throws Exception
{
- URLConstructor c = getConstructor( "http://localhost:8080/", null );
+ URLConstructor c = getConstructor(null );
- assertEquals( "http://localhost:8080/wiki/Main", c.makeURL(WikiContext.VIEW,"Main",true,null) );
+ assertEquals( "/test/wiki/Main", c.makeURL(WikiContext.VIEW,"Main",true,null) );
}
public void testViewURL4()
throws Exception
{
- URLConstructor c = getConstructor( "http://localhost/mywiki/", null );
+ URLConstructor c = getConstructor(null );
- assertEquals( "/mywiki/wiki/Main", c.makeURL(WikiContext.VIEW,"Main",false,null) );
+ assertEquals( "/test/wiki/Main", c.makeURL(WikiContext.VIEW,"Main",false,null) );
}
public void testViewURL5()
throws Exception
{
- URLConstructor c = getConstructor( "http://localhost/", "" );
+ URLConstructor c = getConstructor("" );
- assertEquals( "http://localhost/Main", c.makeURL(WikiContext.VIEW,"Main",true,null) );
+ assertEquals( "/test/Main", c.makeURL(WikiContext.VIEW,"Main",true,null) );
}
public void testViewURL6()
throws Exception
{
- URLConstructor c = getConstructor( "http://localhost/mywiki/app1/", null );
+ URLConstructor c = getConstructor(null );
- assertEquals( "http://localhost/mywiki/app1/wiki/Main", c.makeURL(WikiContext.VIEW,"Main",true,null) );
+ assertEquals( "/test/wiki/Main", c.makeURL(WikiContext.VIEW,"Main",true,null) );
}
public void testViewURL7()
throws Exception
{
- URLConstructor c = getConstructor( "http://localhost/mywiki/app1/", "view/" );
+ URLConstructor c = getConstructor("view/" );
- assertEquals( "http://localhost/mywiki/app1/view/Main", c.makeURL(WikiContext.VIEW,"Main",true,null) );
+ assertEquals( "/test/view/Main", c.makeURL(WikiContext.VIEW,"Main",true,null) );
}
public void testEditURL1()
throws Exception
{
- URLConstructor c = getConstructor( "http://localhost/mywiki/", null );
+ URLConstructor c = getConstructor(null );
- assertEquals( "http://localhost/mywiki/Edit.jsp?page=Main", c.makeURL(WikiContext.EDIT,"Main",true,null) );
+ assertEquals( "/test/Edit.jsp?page=Main", c.makeURL(WikiContext.EDIT,"Main",true,null) );
}
public void testAttachURL1()
throws Exception
{
- URLConstructor c = getConstructor( "http://localhost/mywiki/", null );
+ URLConstructor c = getConstructor(null );
- assertEquals( "http://localhost/mywiki/attach/Main/foo.txt", c.makeURL(WikiContext.ATTACH,"Main/foo.txt",true,null) );
+ assertEquals( "/test/attach/Main/foo.txt", c.makeURL(WikiContext.ATTACH,"Main/foo.txt",true,null) );
}
public void testAttachURLRelative1()
throws Exception
{
- URLConstructor c = getConstructor( "http://localhost/mywiki/", null );
+ URLConstructor c = getConstructor(null );
- assertEquals( "/mywiki/attach/Main/foo.txt", c.makeURL(WikiContext.ATTACH,"Main/foo.txt",false,null) );
+ assertEquals( "/test/attach/Main/foo.txt", c.makeURL(WikiContext.ATTACH,"Main/foo.txt",false,null) );
}
public void testOtherURL1()
throws Exception
{
- URLConstructor c = getConstructor( "http://localhost/mywiki/", null );
+ URLConstructor c = getConstructor(null );
- assertEquals( "http://localhost/mywiki/foo.jsp", c.makeURL(WikiContext.NONE,"foo.jsp",true,null) );
+ assertEquals( "/test/foo.jsp", c.makeURL(WikiContext.NONE,"foo.jsp",true,null) );
}
public void testOtherURL2()
throws Exception
{
- URLConstructor c = getConstructor( "http://localhost/mywiki/dobble/", null );
+ URLConstructor c = getConstructor(null );
- assertEquals( "http://localhost/mywiki/dobble/foo.jsp?a=1&b=2", c.makeURL(WikiContext.NONE,"foo.jsp",true,"a=1&b=2") );
+ assertEquals( "/test/foo.jsp?a=1&b=2", c.makeURL(WikiContext.NONE,"foo.jsp",true,"a=1&b=2") );
}
public static Test suite()
http://git-wip-us.apache.org/repos/asf/jspwiki/blob/72e1acee/jspwiki-war/src/test/java/org/apache/wiki/xmlrpc/RPCHandlerTest.java
----------------------------------------------------------------------
diff --git a/jspwiki-war/src/test/java/org/apache/wiki/xmlrpc/RPCHandlerTest.java b/jspwiki-war/src/test/java/org/apache/wiki/xmlrpc/RPCHandlerTest.java
index e300e19..d13340c 100644
--- a/jspwiki-war/src/test/java/org/apache/wiki/xmlrpc/RPCHandlerTest.java
+++ b/jspwiki-war/src/test/java/org/apache/wiki/xmlrpc/RPCHandlerTest.java
@@ -158,7 +158,7 @@ public class RPCHandlerTest extends TestCase
assertEquals( "name", "Foobar", linkinfo.get("page") );
assertEquals( "type", "local", linkinfo.get("type") );
- assertEquals( "href", "http://localhost/Edit.jsp?page=Foobar", linkinfo.get("href") );
+ assertEquals( "href", "/test/Edit.jsp?page=Foobar", linkinfo.get("href") );
}
@@ -184,13 +184,13 @@ public class RPCHandlerTest extends TestCase
assertEquals( "edit name", "Foobar", linkinfo.get("page") );
assertEquals( "edit type", "local", linkinfo.get("type") );
- assertEquals( "edit href", "http://localhost/Edit.jsp?page=Foobar", linkinfo.get("href") );
+ assertEquals( "edit href", "/test/Edit.jsp?page=Foobar", linkinfo.get("href") );
linkinfo = (Hashtable) links.elementAt(1);
assertEquals( "att name", NAME1+"/TestAtt.txt", linkinfo.get("page") );
assertEquals( "att type", "local", linkinfo.get("type") );
- assertEquals( "att href", "http://localhost/attach/"+NAME1+"/TestAtt.txt", linkinfo.get("href") );
+ assertEquals( "att href", "/test/attach/"+NAME1+"/TestAtt.txt", linkinfo.get("href") );
}
private Date getCalendarTime( Date modifiedDate )
[03/12] jspwiki git commit: JSPWIKI 1035 fix plugin tests.
Posted by me...@apache.org.
JSPWIKI 1035 fix plugin tests.
Project: http://git-wip-us.apache.org/repos/asf/jspwiki/repo
Commit: http://git-wip-us.apache.org/repos/asf/jspwiki/commit/d5b597e8
Tree: http://git-wip-us.apache.org/repos/asf/jspwiki/tree/d5b597e8
Diff: http://git-wip-us.apache.org/repos/asf/jspwiki/diff/d5b597e8
Branch: refs/heads/master
Commit: d5b597e810cc8dc533496580555c9ad381bb2500
Parents: 77d2e45
Author: Harry Metske <ha...@gmail.com>
Authored: Sat Dec 17 13:08:08 2016 +0100
Committer: Harry Metske <ha...@gmail.com>
Committed: Sat Dec 17 13:08:08 2016 +0100
----------------------------------------------------------------------
.../java/org/apache/wiki/plugin/GroupsTest.java | 8 ++++----
.../wiki/plugin/RecentChangesPluginTest.java | 18 +++++++++---------
.../wiki/plugin/ReferringPagesPluginTest.java | 2 +-
.../ReferringUndefinedPagesPluginTest.java | 20 ++++++++++----------
4 files changed, 24 insertions(+), 24 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/jspwiki/blob/d5b597e8/jspwiki-war/src/test/java/org/apache/wiki/plugin/GroupsTest.java
----------------------------------------------------------------------
diff --git a/jspwiki-war/src/test/java/org/apache/wiki/plugin/GroupsTest.java b/jspwiki-war/src/test/java/org/apache/wiki/plugin/GroupsTest.java
index c2dd13b..f5f6481 100644
--- a/jspwiki-war/src/test/java/org/apache/wiki/plugin/GroupsTest.java
+++ b/jspwiki-war/src/test/java/org/apache/wiki/plugin/GroupsTest.java
@@ -58,10 +58,10 @@ public class GroupsTest extends TestCase
String res = testEngine.getHTML( "Test" );
- assertEquals( "<a href=\"/Group.jsp?group=Admin\">Admin</a>, "
- + "<a href=\"/Group.jsp?group=Art\">Art</a>, "
- + "<a href=\"/Group.jsp?group=Literature\">Literature</a>, "
- + "<a href=\"/Group.jsp?group=TV\">TV</a>\n"
+ assertEquals( "<a href=\"/test/Group.jsp?group=Admin\">Admin</a>, "
+ + "<a href=\"/test/Group.jsp?group=Art\">Art</a>, "
+ + "<a href=\"/test/Group.jsp?group=Literature\">Literature</a>, "
+ + "<a href=\"/test/Group.jsp?group=TV\">TV</a>\n"
, res );
}
http://git-wip-us.apache.org/repos/asf/jspwiki/blob/d5b597e8/jspwiki-war/src/test/java/org/apache/wiki/plugin/RecentChangesPluginTest.java
----------------------------------------------------------------------
diff --git a/jspwiki-war/src/test/java/org/apache/wiki/plugin/RecentChangesPluginTest.java b/jspwiki-war/src/test/java/org/apache/wiki/plugin/RecentChangesPluginTest.java
index 32974b1..e5b24db 100644
--- a/jspwiki-war/src/test/java/org/apache/wiki/plugin/RecentChangesPluginTest.java
+++ b/jspwiki-war/src/test/java/org/apache/wiki/plugin/RecentChangesPluginTest.java
@@ -74,9 +74,9 @@ public class RecentChangesPluginTest extends TestCase {
// we don't want to compare the complete html returned, but check if
// certain Strings are present and other Strings are not present
assertTrue(res.contains("<table class=\"recentchanges\" cellpadding=\"4\">"));
- assertTrue(res.contains("<a href=\"/Wiki.jsp?page=TestPage01\">Test Page 01</a>"));
- assertTrue(res.contains("<a href=\"/Wiki.jsp?page=TestPage02\">Test Page 02</a>"));
- assertTrue(res.contains("<a href=\"/Wiki.jsp?page=TestPage03\">Test Page 03</a>"));
+ assertTrue(res.contains("<a href=\"/test/Wiki.jsp?page=TestPage01\">Test Page 01</a>"));
+ assertTrue(res.contains("<a href=\"/test/Wiki.jsp?page=TestPage02\">Test Page 02</a>"));
+ assertTrue(res.contains("<a href=\"/test/Wiki.jsp?page=TestPage03\">Test Page 03</a>"));
}
/**
@@ -91,9 +91,9 @@ public class RecentChangesPluginTest extends TestCase {
"{INSERT org.apache.wiki.plugin.RecentChangesPlugin include='TestPage02*'}" );
assertTrue(res.contains("<table class=\"recentchanges\" cellpadding=\"4\">"));
- assertFalse(res.contains("<a href=\"/Wiki.jsp?page=TestPage01\">Test Page 01</a>"));
- assertTrue(res.contains("<a href=\"/Wiki.jsp?page=TestPage02\">Test Page 02</a>"));
- assertFalse(res.contains("<a href=\"/Wiki.jsp?page=TestPage03\">Test Page 03</a>"));
+ assertFalse(res.contains("<a href=\"/test/Wiki.jsp?page=TestPage01\">Test Page 01</a>"));
+ assertTrue(res.contains("<a href=\"/test/Wiki.jsp?page=TestPage02\">Test Page 02</a>"));
+ assertFalse(res.contains("<a href=\"/test/Wiki.jsp?page=TestPage03\">Test Page 03</a>"));
}
/**
@@ -108,9 +108,9 @@ public class RecentChangesPluginTest extends TestCase {
"{INSERT org.apache.wiki.plugin.RecentChangesPlugin exclude='TestPage03*'}" );
assertTrue(res.contains("<table class=\"recentchanges\" cellpadding=\"4\">"));
- assertTrue(res.contains("<a href=\"/Wiki.jsp?page=TestPage01\">Test Page 01</a>"));
- assertTrue(res.contains("<a href=\"/Wiki.jsp?page=TestPage02\">Test Page 02</a>"));
- assertFalse(res.contains("<a href=\"/Wiki.jsp?page=TestPage03\">Test Page 03</a>"));
+ assertTrue(res.contains("<a href=\"/test/Wiki.jsp?page=TestPage01\">Test Page 01</a>"));
+ assertTrue(res.contains("<a href=\"/test/Wiki.jsp?page=TestPage02\">Test Page 02</a>"));
+ assertFalse(res.contains("<a href=\"/test/Wiki.jsp?page=TestPage03\">Test Page 03</a>"));
}
/**
http://git-wip-us.apache.org/repos/asf/jspwiki/blob/d5b597e8/jspwiki-war/src/test/java/org/apache/wiki/plugin/ReferringPagesPluginTest.java
----------------------------------------------------------------------
diff --git a/jspwiki-war/src/test/java/org/apache/wiki/plugin/ReferringPagesPluginTest.java b/jspwiki-war/src/test/java/org/apache/wiki/plugin/ReferringPagesPluginTest.java
index 8bba332..b0f40c1 100644
--- a/jspwiki-war/src/test/java/org/apache/wiki/plugin/ReferringPagesPluginTest.java
+++ b/jspwiki-war/src/test/java/org/apache/wiki/plugin/ReferringPagesPluginTest.java
@@ -82,7 +82,7 @@ public class ReferringPagesPluginTest extends TestCase
private String mkFullLink( String page, String link )
{
- return "<a class=\"wikipage\" href=\"/Wiki.jsp?page="+link+"\">"+page+"</a>";
+ return "<a class=\"wikipage\" href=\"/test/Wiki.jsp?page="+link+"\">"+page+"</a>";
}
public void testSingleReferral()
http://git-wip-us.apache.org/repos/asf/jspwiki/blob/d5b597e8/jspwiki-war/src/test/java/org/apache/wiki/plugin/ReferringUndefinedPagesPluginTest.java
----------------------------------------------------------------------
diff --git a/jspwiki-war/src/test/java/org/apache/wiki/plugin/ReferringUndefinedPagesPluginTest.java b/jspwiki-war/src/test/java/org/apache/wiki/plugin/ReferringUndefinedPagesPluginTest.java
index dbb6934..88bded8 100644
--- a/jspwiki-war/src/test/java/org/apache/wiki/plugin/ReferringUndefinedPagesPluginTest.java
+++ b/jspwiki-war/src/test/java/org/apache/wiki/plugin/ReferringUndefinedPagesPluginTest.java
@@ -66,7 +66,7 @@ public class ReferringUndefinedPagesPluginTest extends TestCase {
*/
public void testSimple() throws Exception {
String res = manager.execute(context, "{INSERT ReferringUndefinedPagesPlugin}");
- assertTrue(res.contains("href=\"/Wiki.jsp?page=TestPage01\""));
+ assertTrue(res.contains("href=\"/test/Wiki.jsp?page=TestPage01\""));
}
/**
@@ -76,9 +76,9 @@ public class ReferringUndefinedPagesPluginTest extends TestCase {
*/
public void testParmInClude() throws Exception {
String res = manager.execute(context, "{INSERT ReferringUndefinedPagesPlugin} include='TestPage02*'}");
- assertFalse(res.contains("href=\"/Wiki.jsp?page=TestPage01\""));
- assertTrue(res.contains("href=\"/Wiki.jsp?page=TestPage02\""));
- assertFalse(res.contains("href=\"/Wiki.jsp?page=TestPage03\""));
+ assertFalse(res.contains("href=\"/test/Wiki.jsp?page=TestPage01\""));
+ assertTrue(res.contains("href=\"/test/Wiki.jsp?page=TestPage02\""));
+ assertFalse(res.contains("href=\"/test/Wiki.jsp?page=TestPage03\""));
}
/**
@@ -89,9 +89,9 @@ public class ReferringUndefinedPagesPluginTest extends TestCase {
public void testParmExClude() throws Exception {
String res = manager.execute(context,"{INSERT ReferringUndefinedPagesPlugin} exclude='TestPage02*'}");
- assertTrue(res.contains("href=\"/Wiki.jsp?page=TestPage01\""));
- assertFalse(res.contains("href=\"/Wiki.jsp?page=TestPage02\""));
- assertTrue(res.contains("href=\"/Wiki.jsp?page=TestPage03\""));
+ assertTrue(res.contains("href=\"/test/Wiki.jsp?page=TestPage01\""));
+ assertFalse(res.contains("href=\"/test/Wiki.jsp?page=TestPage02\""));
+ assertTrue(res.contains("href=\"/test/Wiki.jsp?page=TestPage03\""));
}
/**
@@ -102,9 +102,9 @@ public class ReferringUndefinedPagesPluginTest extends TestCase {
public void testParmMax() throws Exception {
String res = manager.execute(context,"{INSERT ReferringUndefinedPagesPlugin} max='2'}");
- assertTrue(res.contains("href=\"/Wiki.jsp?page=TestPage01\""));
- assertTrue(res.contains("href=\"/Wiki.jsp?page=TestPage02\""));
- assertFalse(res.contains("href=\"/Wiki.jsp?page=TestPage03\""));
+ assertTrue(res.contains("href=\"/test/Wiki.jsp?page=TestPage01\""));
+ assertTrue(res.contains("href=\"/test/Wiki.jsp?page=TestPage02\""));
+ assertFalse(res.contains("href=\"/test/Wiki.jsp?page=TestPage03\""));
assertTrue(res.contains("...and 1 more"));
}
[04/12] jspwiki git commit: Merge branch 'master' into JSPWIKI-1035
Posted by me...@apache.org.
Merge branch 'master' into JSPWIKI-1035
Project: http://git-wip-us.apache.org/repos/asf/jspwiki/repo
Commit: http://git-wip-us.apache.org/repos/asf/jspwiki/commit/c4044360
Tree: http://git-wip-us.apache.org/repos/asf/jspwiki/tree/c4044360
Diff: http://git-wip-us.apache.org/repos/asf/jspwiki/diff/c4044360
Branch: refs/heads/master
Commit: c40443601ba67e8bf5d203b9fea2c7b88c682c04
Parents: d5b597e 014dc67
Author: Harry Metske <ha...@gmail.com>
Authored: Sat Dec 17 13:34:13 2016 +0100
Committer: Harry Metske <ha...@gmail.com>
Committed: Sat Dec 17 13:34:13 2016 +0100
----------------------------------------------------------------------
ChangeLog | 15 +++++
.../src/main/java/org/apache/wiki/Release.java | 2 +-
.../main/java/org/apache/wiki/plugin/Image.java | 36 +++++++-----
.../java/org/apache/wiki/util/XhtmlUtil.java | 60 ++++++++++----------
.../main/styles/haddock/default/Category.less | 4 +-
.../styles/haddock/default/Template.View.less | 11 +++-
.../main/styles/haddock/default/variables.less | 2 +-
7 files changed, 78 insertions(+), 52 deletions(-)
----------------------------------------------------------------------
[09/12] jspwiki git commit: JSPWIKI-1035 - removed detection of
jspwiki.baseURL absence. We can no longer detect this,
user has to point directly to Install.jsp (as instructed in the docs)
Posted by me...@apache.org.
JSPWIKI-1035 - removed detection of jspwiki.baseURL absence. We can no longer detect this, user has to point directly to Install.jsp (as instructed in the docs)
Project: http://git-wip-us.apache.org/repos/asf/jspwiki/repo
Commit: http://git-wip-us.apache.org/repos/asf/jspwiki/commit/3a1773a7
Tree: http://git-wip-us.apache.org/repos/asf/jspwiki/tree/3a1773a7
Diff: http://git-wip-us.apache.org/repos/asf/jspwiki/diff/3a1773a7
Branch: refs/heads/master
Commit: 3a1773a7be26430b531920b08c6ccf88ea04be50
Parents: 0857375
Author: Harry Metske <ha...@gmail.com>
Authored: Mon Dec 26 14:36:51 2016 +0100
Committer: Harry Metske <ha...@gmail.com>
Committed: Mon Dec 26 14:36:51 2016 +0100
----------------------------------------------------------------------
.../java/org/apache/wiki/ui/WikiServletFilter.java | 16 ----------------
1 file changed, 16 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/jspwiki/blob/3a1773a7/jspwiki-war/src/main/java/org/apache/wiki/ui/WikiServletFilter.java
----------------------------------------------------------------------
diff --git a/jspwiki-war/src/main/java/org/apache/wiki/ui/WikiServletFilter.java b/jspwiki-war/src/main/java/org/apache/wiki/ui/WikiServletFilter.java
index 59f915e..2d9be35 100644
--- a/jspwiki-war/src/main/java/org/apache/wiki/ui/WikiServletFilter.java
+++ b/jspwiki-war/src/main/java/org/apache/wiki/ui/WikiServletFilter.java
@@ -134,22 +134,6 @@ public class WikiServletFilter implements Filter
// Set the character encoding
httpRequest.setCharacterEncoding( m_engine.getContentEncoding() );
- if( m_engine.getBaseURL().length() == 0 && !httpRequest.getRequestURI().endsWith("Install.jsp") )
- {
- PrintWriter out = response.getWriter();
-
- out.print( "<html><head><title>JSPWiki installation start</title></head>" );
- out.print( "<body>" );
- out.print( "<h1>JSPWiki installation</h1>" );
- out.print( "<p>Hello! It appears that this is your first jspwiki installation." );
- out.print( "Therefore, you will need to start the installation process. " );
- out.print( "Please <a href='Install.jsp'>continue to the installer</a>." );
- out.print( "</p>");
- out.print( "<p>If you just used the installer, then please restart your servlet container to get rid of this message.</p>" );
- out.print("</body></html>");
- return;
- }
-
if ( !isWrapped( request ) )
{
// Prepare the WikiSession
[08/12] jspwiki git commit: removed almost all occurrences of baseURL
where not appropriate anymore fixed Installer and RSS
Posted by me...@apache.org.
removed almost all occurrences of baseURL where not appropriate anymore
fixed Installer and RSS
Project: http://git-wip-us.apache.org/repos/asf/jspwiki/repo
Commit: http://git-wip-us.apache.org/repos/asf/jspwiki/commit/08573754
Tree: http://git-wip-us.apache.org/repos/asf/jspwiki/tree/08573754
Diff: http://git-wip-us.apache.org/repos/asf/jspwiki/diff/08573754
Branch: refs/heads/master
Commit: 08573754a09625727775725ebaed6b65c34172a9
Parents: 72e1ace
Author: Harry Metske <ha...@gmail.com>
Authored: Mon Dec 26 13:43:50 2016 +0100
Committer: Harry Metske <ha...@gmail.com>
Committed: Mon Dec 26 13:43:50 2016 +0100
----------------------------------------------------------------------
README | 2 +-
.../src/main/resources/jspwiki-custom.properties | 1 -
.../WEB-INF/classes/jspwiki-custom.properties | 1 -
.../personal/WEB-INF/classes/jspwiki-custom.properties | 1 -
.../src/main/java/org/apache/wiki/WikiEngine.java | 5 +----
.../src/main/java/org/apache/wiki/rss/RSSGenerator.java | 12 ++----------
.../src/main/java/org/apache/wiki/tags/BaseURLTag.java | 2 +-
.../src/main/java/org/apache/wiki/ui/Installer.java | 10 +---------
.../main/java/org/apache/wiki/ui/WikiServletFilter.java | 1 -
jspwiki-war/src/main/resources/CoreResources.properties | 1 -
.../src/main/resources/CoreResources_nl.properties | 5 ++---
jspwiki-war/src/main/resources/ini/jspwiki.properties | 6 ++----
jspwiki-war/src/main/webapp/Install.jsp | 11 ++---------
jspwiki-war/src/main/webapp/rss.jsp | 11 +++--------
.../test/java/org/apache/wiki/rss/RSSGeneratorTest.java | 1 -
.../src/test/resources/jspwiki-custom.properties | 1 -
.../en/src/main/resources/InstallationTips.txt | 2 +-
.../es/src/main/resources/InstallationTips.txt | 2 +-
.../fr/src/main/resources/InstallationTips.txt | 4 +---
.../it/src/main/resources/InstallationTips.txt | 2 +-
.../nl/src/main/resources/InstallationTips.txt | 2 +-
.../pt_BR/src/main/resources/InstallationTips.txt | 2 +-
.../ru/src/main/resources/InstallationTips.txt | 2 --
.../zh_CN/src/main/resources/InstallationTips.txt | 4 ++--
24 files changed, 23 insertions(+), 68 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/jspwiki/blob/08573754/README
----------------------------------------------------------------------
diff --git a/README b/README
index 21509cc..de834c9 100644
--- a/README
+++ b/README
@@ -96,7 +96,7 @@ 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.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.
http://git-wip-us.apache.org/repos/asf/jspwiki/blob/08573754/jspwiki-it-tests/jspwiki-selenium-tests/src/main/resources/jspwiki-custom.properties
----------------------------------------------------------------------
diff --git a/jspwiki-it-tests/jspwiki-selenium-tests/src/main/resources/jspwiki-custom.properties b/jspwiki-it-tests/jspwiki-selenium-tests/src/main/resources/jspwiki-custom.properties
index 09c71cf..57e097c 100644
--- a/jspwiki-it-tests/jspwiki-selenium-tests/src/main/resources/jspwiki-custom.properties
+++ b/jspwiki-it-tests/jspwiki-selenium-tests/src/main/resources/jspwiki-custom.properties
@@ -21,7 +21,6 @@ jspwiki.groupdatabase = ${it-jspwiki.groupdatabase}
jspwiki.referenceStyle = ${it-jspwiki.referenceStyle}
jspwiki.userdatabase = ${it-jspwiki.userdatabase}
-jspwiki.baseURL = http://localhost:8080/${project.artifactId}/
jspwiki.fileSystemProvider.pageDir = ./${project.artifactId}/target/test-classes/test-repo
jspwiki.basicAttachmentProvider.storageDir = ./${project.artifactId}/target/test-classes/test-repo/attachments
jspwiki.workDir = ./${project.artifactId}/target/test-classes/workdir-${project.artifactId}
http://git-wip-us.apache.org/repos/asf/jspwiki/blob/08573754/jspwiki-portable/src/overlay/woas/webapps/department/WEB-INF/classes/jspwiki-custom.properties
----------------------------------------------------------------------
diff --git a/jspwiki-portable/src/overlay/woas/webapps/department/WEB-INF/classes/jspwiki-custom.properties b/jspwiki-portable/src/overlay/woas/webapps/department/WEB-INF/classes/jspwiki-custom.properties
index d79343f..0245216 100644
--- a/jspwiki-portable/src/overlay/woas/webapps/department/WEB-INF/classes/jspwiki-custom.properties
+++ b/jspwiki-portable/src/overlay/woas/webapps/department/WEB-INF/classes/jspwiki-custom.properties
@@ -20,7 +20,6 @@
#
jspwiki.applicationName=department
-jspwiki.baseURL=http://localhost:9627/department/
jspwiki.basicAttachmentProvider.storageDir=./data/department
jspwiki.fileSystemProvider.pageDir=./data/department
jspwiki.pageProvider=VersioningFileProvider
http://git-wip-us.apache.org/repos/asf/jspwiki/blob/08573754/jspwiki-portable/src/overlay/woas/webapps/personal/WEB-INF/classes/jspwiki-custom.properties
----------------------------------------------------------------------
diff --git a/jspwiki-portable/src/overlay/woas/webapps/personal/WEB-INF/classes/jspwiki-custom.properties b/jspwiki-portable/src/overlay/woas/webapps/personal/WEB-INF/classes/jspwiki-custom.properties
index 1727c08..0f7993b 100644
--- a/jspwiki-portable/src/overlay/woas/webapps/personal/WEB-INF/classes/jspwiki-custom.properties
+++ b/jspwiki-portable/src/overlay/woas/webapps/personal/WEB-INF/classes/jspwiki-custom.properties
@@ -20,7 +20,6 @@
#
jspwiki.applicationName=personal
-jspwiki.baseURL=http://localhost:9627/personal/
jspwiki.basicAttachmentProvider.storageDir=./data/personal
jspwiki.fileSystemProvider.pageDir=./data/personal
jspwiki.workDir=./temp/personal
http://git-wip-us.apache.org/repos/asf/jspwiki/blob/08573754/jspwiki-war/src/main/java/org/apache/wiki/WikiEngine.java
----------------------------------------------------------------------
diff --git a/jspwiki-war/src/main/java/org/apache/wiki/WikiEngine.java b/jspwiki-war/src/main/java/org/apache/wiki/WikiEngine.java
index afb34f5..e64b1ad 100644
--- a/jspwiki-war/src/main/java/org/apache/wiki/WikiEngine.java
+++ b/jspwiki-war/src/main/java/org/apache/wiki/WikiEngine.java
@@ -145,9 +145,6 @@ public class WikiEngine
Double negative, cause for most servers you don't need the property */
public static final String PROP_NO_FILTER_ENCODING = "jspwiki.nofilterencoding";
- /** The name for the base URL to use in all references. */
- public static final String PROP_BASEURL = "jspwiki.baseURL";
-
/** The name for the property which allows you to set the current reference
* style. The value is {@value}.
*/
@@ -2229,7 +2226,7 @@ public class WikiEngine
{
if( m_rssGenerator != null && m_rssGenerator.isEnabled() )
{
- return getBaseURL()+m_rssFile;
+ return getBaseURL()+ "/" + m_rssFile;
}
return null;
http://git-wip-us.apache.org/repos/asf/jspwiki/blob/08573754/jspwiki-war/src/main/java/org/apache/wiki/rss/RSSGenerator.java
----------------------------------------------------------------------
diff --git a/jspwiki-war/src/main/java/org/apache/wiki/rss/RSSGenerator.java b/jspwiki-war/src/main/java/org/apache/wiki/rss/RSSGenerator.java
index 3b289b4..33bba9d 100644
--- a/jspwiki-war/src/main/java/org/apache/wiki/rss/RSSGenerator.java
+++ b/jspwiki-war/src/main/java/org/apache/wiki/rss/RSSGenerator.java
@@ -155,9 +155,8 @@ public class RSSGenerator
private static final int MAX_CHARACTERS = Integer.MAX_VALUE-1;
/**
- * Initialize the RSS generator for a given WikiEngine. Currently the only
- * required property is <tt>{@value org.apache.wiki.WikiEngine#PROP_BASEURL}</tt>.
- *
+ * Initialize the RSS generator for a given WikiEngine.
+ *
* @param engine The WikiEngine.
* @param properties The properties.
* @throws NoRequiredPropertyException If something is missing from the given property set.
@@ -167,13 +166,6 @@ public class RSSGenerator
{
m_engine = engine;
- // FIXME: This assumes a bit too much.
- if( engine.getBaseURL() == null || engine.getBaseURL().length() == 0 )
- {
- throw new NoRequiredPropertyException( "RSS requires jspwiki.baseURL to be set!",
- WikiEngine.PROP_BASEURL );
- }
-
m_channelDescription = properties.getProperty( PROP_CHANNEL_DESCRIPTION,
m_channelDescription );
m_channelLanguage = properties.getProperty( PROP_CHANNEL_LANGUAGE,
http://git-wip-us.apache.org/repos/asf/jspwiki/blob/08573754/jspwiki-war/src/main/java/org/apache/wiki/tags/BaseURLTag.java
----------------------------------------------------------------------
diff --git a/jspwiki-war/src/main/java/org/apache/wiki/tags/BaseURLTag.java b/jspwiki-war/src/main/java/org/apache/wiki/tags/BaseURLTag.java
index 4b3c15f..0e03b0e 100644
--- a/jspwiki-war/src/main/java/org/apache/wiki/tags/BaseURLTag.java
+++ b/jspwiki-war/src/main/java/org/apache/wiki/tags/BaseURLTag.java
@@ -21,7 +21,7 @@ package org.apache.wiki.tags;
import java.io.IOException;
/**
- * Writes the jspwiki.baseURL property.
+ * Writes the jspwiki baseURL.
*
* @since 2.2
*/
http://git-wip-us.apache.org/repos/asf/jspwiki/blob/08573754/jspwiki-war/src/main/java/org/apache/wiki/ui/Installer.java
----------------------------------------------------------------------
diff --git a/jspwiki-war/src/main/java/org/apache/wiki/ui/Installer.java b/jspwiki-war/src/main/java/org/apache/wiki/ui/Installer.java
index 315a23d..f236feb 100644
--- a/jspwiki-war/src/main/java/org/apache/wiki/ui/Installer.java
+++ b/jspwiki-war/src/main/java/org/apache/wiki/ui/Installer.java
@@ -60,7 +60,6 @@ public class Installer
public static final String INSTALL_ERROR = "Installer.Error";
public static final String INSTALL_WARNING = "Installer.Warning";
public static final String APP_NAME = WikiEngine.PROP_APPNAME;
- public static final String BASE_URL = WikiEngine.PROP_BASEURL;
public static final String STORAGE_DIR = BasicAttachmentProvider.PROP_STORAGEDIR;
public static final String LOG_FILE = "log4j.appender.FileLog.File";
public static final String PAGE_DIR = FileSystemProvider.PROP_PAGEDIR;
@@ -205,13 +204,7 @@ public class Installer
// Get application name
String nullValue = m_props.getProperty( APP_NAME, rb.getString( "install.installer.default.appname" ) );
parseProperty( APP_NAME, nullValue );
-
- // Get/sanitize base URL
- nullValue = m_request.getRequestURL().toString();
- nullValue = nullValue.substring( 0, nullValue.lastIndexOf('/') )+"/";
- parseProperty( BASE_URL, nullValue );
- sanitizeURL( BASE_URL );
-
+
// Get/sanitize page directory
nullValue = m_props.getProperty( PAGE_DIR, rb.getString( "install.installer.default.pagedir" ) );
parseProperty( PAGE_DIR, nullValue );
@@ -265,7 +258,6 @@ public class Installer
ResourceBundle rb = ResourceBundle.getBundle( InternationalizationManager.CORE_BUNDLE, m_session.getLocale() );
m_session.clearMessages( INSTALL_ERROR );
parseProperties();
- validateNotNull( BASE_URL, rb.getString( "install.installer.validate.baseurl" ) );
validateNotNull( PAGE_DIR, rb.getString( "install.installer.validate.pagedir" ) );
validateNotNull( APP_NAME, rb.getString( "install.installer.validate.appname" ) );
validateNotNull( WORK_DIR, rb.getString( "install.installer.validate.workdir" ) );
http://git-wip-us.apache.org/repos/asf/jspwiki/blob/08573754/jspwiki-war/src/main/java/org/apache/wiki/ui/WikiServletFilter.java
----------------------------------------------------------------------
diff --git a/jspwiki-war/src/main/java/org/apache/wiki/ui/WikiServletFilter.java b/jspwiki-war/src/main/java/org/apache/wiki/ui/WikiServletFilter.java
index 80d9b49..59f915e 100644
--- a/jspwiki-war/src/main/java/org/apache/wiki/ui/WikiServletFilter.java
+++ b/jspwiki-war/src/main/java/org/apache/wiki/ui/WikiServletFilter.java
@@ -142,7 +142,6 @@ public class WikiServletFilter implements Filter
out.print( "<body>" );
out.print( "<h1>JSPWiki installation</h1>" );
out.print( "<p>Hello! It appears that this is your first jspwiki installation." );
- out.print( "(Or, you have removed jspwiki.baseURL from your property file.) " );
out.print( "Therefore, you will need to start the installation process. " );
out.print( "Please <a href='Install.jsp'>continue to the installer</a>." );
out.print( "</p>");
http://git-wip-us.apache.org/repos/asf/jspwiki/blob/08573754/jspwiki-war/src/main/resources/CoreResources.properties
----------------------------------------------------------------------
diff --git a/jspwiki-war/src/main/resources/CoreResources.properties b/jspwiki-war/src/main/resources/CoreResources.properties
index e2be67f..cfb461b 100644
--- a/jspwiki-war/src/main/resources/CoreResources.properties
+++ b/jspwiki-war/src/main/resources/CoreResources.properties
@@ -202,7 +202,6 @@ install.installer.default.appname=MyWiki
install.installer.default.pagedir=Please provide a directory for the pages!
install.installer.props.saved=Your new properties have been saved to {0}. Copy this file to a directory that is on the classpath of your container (tomcat lib directory for example), then restart your container. Scroll down a bit to see your new jspwiki-custom.properties.
install.installer.props.notsaved=Unable to write properties\: {0}. Please copy the file below as your jspwiki-custom.properties\:\n{1}
-install.installer.validate.baseurl=You must define the baseURL for this wiki.
install.installer.validate.pagedir=You must define the location where the pages are stored.
install.installer.validate.appname=You must define the application name.
install.installer.validate.workdir=You must define a work directory.
http://git-wip-us.apache.org/repos/asf/jspwiki/blob/08573754/jspwiki-war/src/main/resources/CoreResources_nl.properties
----------------------------------------------------------------------
diff --git a/jspwiki-war/src/main/resources/CoreResources_nl.properties b/jspwiki-war/src/main/resources/CoreResources_nl.properties
index 7498eac..abfdd8b 100644
--- a/jspwiki-war/src/main/resources/CoreResources_nl.properties
+++ b/jspwiki-war/src/main/resources/CoreResources_nl.properties
@@ -60,7 +60,7 @@ security.error.illegalloginname=Ongeldige Login naam "{0}";
security.error.cannot.rename=Kan niet hernoemen: de Login naam ''{0}'' is al in gebruik.
security.error.fullname.taken=De volledige naam ''{0}'' is al in gebruik.
security.error.login.taken=De Login naam ''{0}'' is al in gebruik.
-security.error.email.taken=Het email adres ''{0}'' is al in gebruik, je kunt een email adres maar voor \ufffd\ufffdn profile gebruiken.
+security.error.email.taken=Het email adres ''{0}'' is al in gebruik, je kunt een email adres maar voor \ufffd\ufffdn profile gebruiken.
# These should roughly match whatever is used in default.properties for UserProfile.jsp
security.user.loginname=Login naam
@@ -103,7 +103,7 @@ lostpwd.reset.submit=Herstel wachtwoord!
diff.traditional.added=Op lijn {0} werden {1} toegevoegd
diff.traditional.changed=Op lijn {0} werden {1} gewijzigd
diff.traditional.removed=Op lijn {0} werden {1} verwijderd
-diff.traditional.oneline=\ufffd\ufffdn lijn
+diff.traditional.oneline=\ufffd\ufffdn lijn
diff.traditional.lines={2} lijnen
# InputValidator
@@ -207,7 +207,6 @@ install.installer.props.saved=Je nieuwe properties zijn opgeslagen in {0}. Copy
classpath van je container staat (tomcat lib directory b.v.), daarna je container herstarten.\
Scroll naar beneden om je nieuwe jspwiki.properties te zien.
install.installer.props.notsaved=Kan de properties niet wegschrijven: {0}. Sla onderstaande file op als jspwiki-custom.properties:\n{1}
-install.installer.validate.baseurl=Je moet de baseURL voor deze wiki definieren.
install.installer.validate.pagedir=Je moet de plek configureren waar de pagina's moeten worden opgeslagen.
install.installer.validate.appname=Je moet de applicatie naam opgeven
install.installer.validate.workdir=Je moet de work directory opgeven.
http://git-wip-us.apache.org/repos/asf/jspwiki/blob/08573754/jspwiki-war/src/main/resources/ini/jspwiki.properties
----------------------------------------------------------------------
diff --git a/jspwiki-war/src/main/resources/ini/jspwiki.properties b/jspwiki-war/src/main/resources/ini/jspwiki.properties
index 589cc8b..1c3fc7c 100644
--- a/jspwiki-war/src/main/resources/ini/jspwiki.properties
+++ b/jspwiki-war/src/main/resources/ini/jspwiki.properties
@@ -195,10 +195,8 @@ jspwiki.attachmentProvider = BasicAttachmentProvider
#
jspwiki.diffProvider = TraditionalDiffProvider
-# Determines if you need to have relative urls or not. If the baseURL
-# is not set, then this has no effect, but if you set the baseURL (which
-# is highly recommended), you can use this to set relative urls.
-#
+# Determines if you need to have relative urls or not.
+
# Possible values are "absolute" and "relative".
#
#jspwiki.referenceStyle=relative
http://git-wip-us.apache.org/repos/asf/jspwiki/blob/08573754/jspwiki-war/src/main/webapp/Install.jsp
----------------------------------------------------------------------
diff --git a/jspwiki-war/src/main/webapp/Install.jsp b/jspwiki-war/src/main/webapp/Install.jsp
index 6d58bc4..050b787 100644
--- a/jspwiki-war/src/main/webapp/Install.jsp
+++ b/jspwiki-war/src/main/webapp/Install.jsp
@@ -118,13 +118,6 @@ if ( !installer.adminExists() )
<fmt:message key="install.jsp.basics.appname.desc"/>
</div>
- <label class="control-label" ><fmt:message key="install.jsp.basics.baseurl.label" />
- <input class="form-control" type="url" name="<%=Installer.BASE_URL%>" size="40" value="<%=installer.getProperty( Installer.BASE_URL )%>"/>
- </label>
- <div class="help-block">
- <fmt:message key="install.jsp.basics.baseurl.desc" />
- </div>
-
<label class="control-label" ><fmt:message key="install.jsp.basics.page.storage.label" />
<input class="form-control" type="text" name="<%=Installer.PAGE_DIR%>" size="40" value="<%=installer.getProperty( Installer.PAGE_DIR )%>"/>
</label>
@@ -164,14 +157,14 @@ if ( !installer.adminExists() )
<h3><fmt:message key="install.jsp.adv.settings.title" /></h3>
<label class="control-label" ><fmt:message key="install.jsp.adv.settings.logfile.label" />
- <input class="form-control" type="url" name="<%=Installer.LOG_FILE%>" value="<%=installer.getProperty( Installer.LOG_FILE )%>" size="40"/>
+ <input class="form-control" type="text" name="<%=Installer.LOG_FILE%>" value="<%=installer.getProperty( Installer.LOG_FILE )%>" size="40"/>
</label>
<div class="help-block">
<fmt:message key="install.jsp.adv.settings.logfile.desc" />
</div> <br/>
<label class="control-label" ><fmt:message key="install.jsp.adv.settings.workdir.label" />
- <input class="form-control" type="url" name="<%=Installer.WORK_DIR%>" size="40" value="<%=installer.getProperty( Installer.WORK_DIR )%>"/>
+ <input class="form-control" type="text" name="<%=Installer.WORK_DIR%>" size="40" value="<%=installer.getProperty( Installer.WORK_DIR )%>"/>
</label>
<div class="help-block">
<fmt:message key="install.jsp.adv.settings.workdir.desc" />
http://git-wip-us.apache.org/repos/asf/jspwiki/blob/08573754/jspwiki-war/src/main/webapp/rss.jsp
----------------------------------------------------------------------
diff --git a/jspwiki-war/src/main/webapp/rss.jsp b/jspwiki-war/src/main/webapp/rss.jsp
index 082ca0f..9912b3c 100644
--- a/jspwiki-war/src/main/webapp/rss.jsp
+++ b/jspwiki-war/src/main/webapp/rss.jsp
@@ -53,13 +53,8 @@
if(!wiki.getAuthorizationManager().hasAccess( wikiContext, response )) return;
WikiPage wikipage = wikiContext.getPage();
- // Redirect if baseURL not set or RSS generation not on
- if( wiki.getBaseURL().length() == 0 )
- {
- response.sendError( 500, "The jspwiki.baseURL property has not been defined for this wiki - cannot generate RSS" );
- return;
- }
-
+ // Redirect if RSS generation not on
+
if( wiki.getRSSGenerator() == null )
{
response.sendError( 404, "RSS feeds are disabled at administrator request" );
@@ -106,7 +101,7 @@
if( mode.equals("blog") )
{
org.apache.wiki.plugin.WeblogPlugin plug = new org.apache.wiki.plugin.WeblogPlugin();
- changed = plug.findBlogEntries(wiki.getPageManager(),
+ changed = plug.findBlogEntries(wiki,
wikipage.getName(),
new Date(0L),
new Date());
http://git-wip-us.apache.org/repos/asf/jspwiki/blob/08573754/jspwiki-war/src/test/java/org/apache/wiki/rss/RSSGeneratorTest.java
----------------------------------------------------------------------
diff --git a/jspwiki-war/src/test/java/org/apache/wiki/rss/RSSGeneratorTest.java b/jspwiki-war/src/test/java/org/apache/wiki/rss/RSSGeneratorTest.java
index 2fc1864..3be134c 100644
--- a/jspwiki-war/src/test/java/org/apache/wiki/rss/RSSGeneratorTest.java
+++ b/jspwiki-war/src/test/java/org/apache/wiki/rss/RSSGeneratorTest.java
@@ -55,7 +55,6 @@ public class RSSGeneratorTest extends TestCase
protected void setUp() throws Exception
{
- props.setProperty( WikiEngine.PROP_BASEURL, "http://localhost/" );
props.setProperty( RSSGenerator.PROP_GENERATE_RSS, "true" );
CacheManager.getInstance().removeAllCaches();
m_testEngine = new TestEngine(props);
http://git-wip-us.apache.org/repos/asf/jspwiki/blob/08573754/jspwiki-war/src/test/resources/jspwiki-custom.properties
----------------------------------------------------------------------
diff --git a/jspwiki-war/src/test/resources/jspwiki-custom.properties b/jspwiki-war/src/test/resources/jspwiki-custom.properties
index 1e1abab..f02e61f 100644
--- a/jspwiki-war/src/test/resources/jspwiki-custom.properties
+++ b/jspwiki-war/src/test/resources/jspwiki-custom.properties
@@ -28,7 +28,6 @@ jspwiki.translatorReader.useOutlinkImage = false
jspwiki.basicAttachmentProvider.storageDir = target/test-classes/testrepository
jspwiki.encoding = ISO-8859-1
jspwiki.filterConfig = /filters.xml
-jspwiki.baseURL = http://localhost/
jspwiki.referenceStyle = relative
jspwiki.authorizer=org.apache.wiki.TestAuthorizer
http://git-wip-us.apache.org/repos/asf/jspwiki/blob/08573754/jspwiki-wikipages/en/src/main/resources/InstallationTips.txt
----------------------------------------------------------------------
diff --git a/jspwiki-wikipages/en/src/main/resources/InstallationTips.txt b/jspwiki-wikipages/en/src/main/resources/InstallationTips.txt
index cc0f02e..02a6501 100644
--- a/jspwiki-wikipages/en/src/main/resources/InstallationTips.txt
+++ b/jspwiki-wikipages/en/src/main/resources/InstallationTips.txt
@@ -57,7 +57,7 @@ The lower part of the left hand side is similarly called [LeftMenuFooter], and i
!Enabling the [RSS|http://blogspace.com/rss/] feed
-In your jspwiki.properties -file, you'll need to set the "jspwiki.rss.generate" to "true", and also set the "jspwiki.baseURL" to point at your Wiki. Otherwise the RSS generator can't figure out how its links should go... :-)
+In your jspwiki.properties -file, you'll need to set the "jspwiki.rss.generate" to "true".
!I don't like ~ThingsSquashedTogether in the page titles. What can I do?
http://git-wip-us.apache.org/repos/asf/jspwiki/blob/08573754/jspwiki-wikipages/es/src/main/resources/InstallationTips.txt
----------------------------------------------------------------------
diff --git a/jspwiki-wikipages/es/src/main/resources/InstallationTips.txt b/jspwiki-wikipages/es/src/main/resources/InstallationTips.txt
index 714a11f..6bf4f86 100644
--- a/jspwiki-wikipages/es/src/main/resources/InstallationTips.txt
+++ b/jspwiki-wikipages/es/src/main/resources/InstallationTips.txt
@@ -57,7 +57,7 @@ La parte inferior de la secci�n de la izquierda es otra p�gina m�s, llamada [
!Activando el feed [RSS|http://blogspace.com/rss/]
-En tu archivo jspwiki.properties, tienes que establecer el par�metro "jspwiki.rss.generate" a "true", y tambi�n establecer el par�metro "jspwiki.baseURL" para que apunte a tu Wiki. De otro modo el generador de RSS no sabr� a d�nde deben ir los enlaces... :-)
+En tu archivo jspwiki.properties, tienes que establecer el par�metro "jspwiki.rss.generate" a "true".
!No me gusta que ~LasPalabrasSeAmontonenEnLosTitulos en los t�tulos de las p�ginas. �Puedo hacer algo al respecto?
http://git-wip-us.apache.org/repos/asf/jspwiki/blob/08573754/jspwiki-wikipages/fr/src/main/resources/InstallationTips.txt
----------------------------------------------------------------------
diff --git a/jspwiki-wikipages/fr/src/main/resources/InstallationTips.txt b/jspwiki-wikipages/fr/src/main/resources/InstallationTips.txt
index b67ea2a..331ef39 100644
--- a/jspwiki-wikipages/fr/src/main/resources/InstallationTips.txt
+++ b/jspwiki-wikipages/fr/src/main/resources/InstallationTips.txt
@@ -73,9 +73,7 @@ et elle est elle aussi totalement �ditable.
!Activer [RSS|http://blogspace.com/rss/]
Dans votre fichier {{jspwiki.properties}}, vous devrez modifier le param�tre
-{{jspwiki.rss.generate}} � la valeur {{true}}. Vous devrez aussi y changer le param�tre
-{{jspwiki.baseURL}} qui donne l'URL compl�te de votre Wiki. Sinon, le g�n�rateur RSS ne
-saura pas vers o� ses liens doivent pointer... :-)
+{{jspwiki.rss.generate}} � la valeur {{true}}.
!Je n'aime pas les ~TitresTousCollesCommeCa. Qu'est-ce que je peux faire ?
http://git-wip-us.apache.org/repos/asf/jspwiki/blob/08573754/jspwiki-wikipages/it/src/main/resources/InstallationTips.txt
----------------------------------------------------------------------
diff --git a/jspwiki-wikipages/it/src/main/resources/InstallationTips.txt b/jspwiki-wikipages/it/src/main/resources/InstallationTips.txt
index 9b029b4..ee5c78b 100644
--- a/jspwiki-wikipages/it/src/main/resources/InstallationTips.txt
+++ b/jspwiki-wikipages/it/src/main/resources/InstallationTips.txt
@@ -57,7 +57,7 @@ Analogamente, la parte bassa del menu sinistro � la pagina [LeftMenuFooter], an
!Abilitare il feed [RSS|http://blogspace.com/rss/]
-Nel file jspwiki.properties, dovete modificare la propriet� "jspwiki.rss.generate" a "true", e anche far si che la propriet� "jspwiki.baseURL" corrisponda al vostro Wiki. Altrimenti il generatore RSS non avr� idea del come costruire i link ... :-)
+Nel file jspwiki.properties, dovete modificare la propriet� "jspwiki.rss.generate" a "true".
!Non mi piace avere cose del tipo ~ThingsSquashedTogether nei titoli delle pagine. E' possibile cambiare questo comportamento?
http://git-wip-us.apache.org/repos/asf/jspwiki/blob/08573754/jspwiki-wikipages/nl/src/main/resources/InstallationTips.txt
----------------------------------------------------------------------
diff --git a/jspwiki-wikipages/nl/src/main/resources/InstallationTips.txt b/jspwiki-wikipages/nl/src/main/resources/InstallationTips.txt
index 2023db2..0dc21cd 100644
--- a/jspwiki-wikipages/nl/src/main/resources/InstallationTips.txt
+++ b/jspwiki-wikipages/nl/src/main/resources/InstallationTips.txt
@@ -57,7 +57,7 @@ Het onderste gedeelte van het linker menu is (niet erg verrassend) genaamd [Left
![RSS|http://blogspace.com/rss/] feed aanzetten
-In je jspwiki.properties -file, moet je de "jspwiki.rss.generate" op "true" zetten, en ook de "jspwiki.baseURL" moet een valide waarde hebben. Anders kan RSS niet weten hoe de links er uit moeten zien....:-)
+In je jspwiki.properties -file, moet je de "jspwiki.rss.generate" op "true" zetten.
!Ik hou niet van ~DingenAanElkaarGeplakt in de pagina titels. Wat nu?
http://git-wip-us.apache.org/repos/asf/jspwiki/blob/08573754/jspwiki-wikipages/pt_BR/src/main/resources/InstallationTips.txt
----------------------------------------------------------------------
diff --git a/jspwiki-wikipages/pt_BR/src/main/resources/InstallationTips.txt b/jspwiki-wikipages/pt_BR/src/main/resources/InstallationTips.txt
index 6cb7265..de5a719 100644
--- a/jspwiki-wikipages/pt_BR/src/main/resources/InstallationTips.txt
+++ b/jspwiki-wikipages/pt_BR/src/main/resources/InstallationTips.txt
@@ -56,7 +56,7 @@ A parte mais baixa deste menu � chamada similarmente de [LeftMenuFooter] (Baixo
!Habilitanto o [RSS|http://blogspace.com/rss/] feed
-No seu arquivo jspwiki.properties, voc� precisar� de alterar o atributo "jspwiki.rss.generate" para "true" (verdadeiro), e tamb�m precisar� alterar o atributo "jspwiki.baseURL" para apontar para a sua Wiki. Se n�o fizer isso o gerador de RSS n�o conseguir� saber para onde os links devem ir... :-)
+No seu arquivo jspwiki.properties, voc� precisar� de alterar o atributo "jspwiki.rss.generate" para "true" (verdadeiro).
!Eu n�o gosto que as ~CoisasFiquemJuntas nos t�tulos das p�ginas. O que eu posso fazer?
http://git-wip-us.apache.org/repos/asf/jspwiki/blob/08573754/jspwiki-wikipages/ru/src/main/resources/InstallationTips.txt
----------------------------------------------------------------------
diff --git a/jspwiki-wikipages/ru/src/main/resources/InstallationTips.txt b/jspwiki-wikipages/ru/src/main/resources/InstallationTips.txt
index 9177250..b15164b 100644
--- a/jspwiki-wikipages/ru/src/main/resources/InstallationTips.txt
+++ b/jspwiki-wikipages/ru/src/main/resources/InstallationTips.txt
@@ -64,8 +64,6 @@
! \u0420\u0430\u0437\u0440\u0435\u0448\u0435\u043d\u0438\u0435 \u043a\u0430\u043d\u0430\u043b\u0430 [RSS|http://blogspace.com/rss/]
\u0412 \u0412\u0430\u0448\u0435\u043c \u0444\u0430\u0439\u043b\u0435 jspwiki.properties, \u0412\u044b \u0434\u043e\u043b\u0436\u043d\u044b \u0431\u0443\u0434\u0435\u0442\u0435 \u0443\u0441\u0442\u0430\u043d\u043e\u0432\u0438\u0442\u044c "jspwiki.rss.generate" \u0432 "true",
-\u0438 \u0442\u0430\u043a\u0436\u0435 \u0443\u0441\u0442\u0430\u043d\u043e\u0432\u0438\u0442\u044c "jspwiki.baseURL", \u0447\u0442\u043e\u0431\u044b \u0443\u043a\u0430\u0437\u0430\u0442\u044c \u043d\u0430 \u0412\u0430\u0448\u0443 Wiki.
-\u0418\u043d\u0430\u0447\u0435 \u0433\u0435\u043d\u0435\u0440\u0430\u0442\u043e\u0440 RSS \u043d\u0435 \u043c\u043e\u0436\u0435\u0442 \u0432\u044b\u044f\u0441\u043d\u0438\u0442\u044c, \u043a\u0430\u043a \u0435\u0433\u043e \u0441\u0441\u044b\u043b\u043a\u0438 \u0434\u043e\u043b\u0436\u043d\u044b \u043f\u043e\u0439\u0442\u0438... :-)
! \u041c\u043d\u0435 \u043d\u0435 \u043d\u0440\u0430\u0432\u0438\u0442\u0441\u044f ~ThingsSquashedTogether \u0432 \u043d\u0430\u0437\u0432\u0430\u043d\u0438\u044f\u0445 \u0441\u0442\u0440\u0430\u043d\u0438\u0446\u044b. \u0427\u0442\u043e \u044f \u043c\u043e\u0433\u0443 \u0441\u0434\u0435\u043b\u0430\u0442\u044c?
http://git-wip-us.apache.org/repos/asf/jspwiki/blob/08573754/jspwiki-wikipages/zh_CN/src/main/resources/InstallationTips.txt
----------------------------------------------------------------------
diff --git a/jspwiki-wikipages/zh_CN/src/main/resources/InstallationTips.txt b/jspwiki-wikipages/zh_CN/src/main/resources/InstallationTips.txt
index d40ddc1..8952987 100644
--- a/jspwiki-wikipages/zh_CN/src/main/resources/InstallationTips.txt
+++ b/jspwiki-wikipages/zh_CN/src/main/resources/InstallationTips.txt
@@ -57,8 +57,8 @@
!\u542f\u7528 [RSS|http://blogspace.com/rss/] \u8ba2\u9605
-\u5728 jspwiki.properties \u6587\u4ef6\u4e2d\uff0c\u60a8\u9700\u8981\u5c06 "jspwiki.rss.generate" \u8bbe\u7f6e\u4e3a "true"\uff0c\u53e6\u5916\u4e5f\u9700\u8981\u8bbe\u7f6e "jspwiki.baseURL" \u4f7f\u5176\u6307\u5411\u60a8\u7684Wiki \u7cfb\u7edf\u3002\u5426\u5219\uff0cRSS \u751f\u6210\u7a0b\u5e8f\u6ca1\u6cd5\u77e5\u9053\u5b83\u7684\u94fe\u63a5\u5e94\u8be5\u6307\u5411\u4f55\u5904\u2026\u2026
+\u5728 jspwiki.properties \u6587\u4ef6\u4e2d\uff0c\u60a8\u9700\u8981\u5c06 "jspwiki.rss.generate" \u8bbe\u7f6e\u4e3a "true"\uff0c
!\u6211\u4e0d\u559c\u6b22\u9875\u9762\u6807\u9898\u4e2d\u7684 ~ThingsSquashedTogether\uff0c\u600e\u4e48\u529e\uff1f
-\u6b63\u5982 Finns \u6240\u8bf4\uff0c"voe tokkiinsa"\uff0c\u610f\u4e3a\u201c\u662f\u7684\uff0c\u5f53\u7136\u201d\u3002\u60a8\u53ea\u9700\u8981\u5728 jspwiki.properties \u6587\u4ef6\u4e2d\u5c06 "jspwiki.breakTitleWithSpaces" \u5c5e\u6027\u8bbe\u7f6e\u4e3a "true"\u3002
\ No newline at end of file
+\u6b63\u5982 Finns \u6240\u8bf4\uff0c"voe tokkiinsa"\uff0c\u610f\u4e3a\u201c\u662f\u7684\uff0c\u5f53\u7136\u201d\u3002\u60a8\u53ea\u9700\u8981\u5728 jspwiki.properties \u6587\u4ef6\u4e2d\u5c06 "jspwiki.breakTitleWithSpaces" \u5c5e\u6027\u8bbe\u7f6e\u4e3a "true"\u3002
[02/12] jspwiki git commit: JSPWIKI-1035 fix JSPWikiMarkupParserTest
Posted by me...@apache.org.
JSPWIKI-1035 fix JSPWikiMarkupParserTest
Project: http://git-wip-us.apache.org/repos/asf/jspwiki/repo
Commit: http://git-wip-us.apache.org/repos/asf/jspwiki/commit/77d2e457
Tree: http://git-wip-us.apache.org/repos/asf/jspwiki/tree/77d2e457
Diff: http://git-wip-us.apache.org/repos/asf/jspwiki/diff/77d2e457
Branch: refs/heads/master
Commit: 77d2e4576201aea2b001364f16ced993b59fff06
Parents: 7ab0729
Author: Harry Metske <ha...@gmail.com>
Authored: Fri Dec 16 20:09:51 2016 +0100
Committer: Harry Metske <ha...@gmail.com>
Committed: Fri Dec 16 20:09:51 2016 +0100
----------------------------------------------------------------------
.../wiki/parser/JSPWikiMarkupParserTest.java | 118 +++++++++----------
1 file changed, 59 insertions(+), 59 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/jspwiki/blob/77d2e457/jspwiki-war/src/test/java/org/apache/wiki/parser/JSPWikiMarkupParserTest.java
----------------------------------------------------------------------
diff --git a/jspwiki-war/src/test/java/org/apache/wiki/parser/JSPWikiMarkupParserTest.java b/jspwiki-war/src/test/java/org/apache/wiki/parser/JSPWikiMarkupParserTest.java
index b2506a0..e9aa00a 100644
--- a/jspwiki-war/src/test/java/org/apache/wiki/parser/JSPWikiMarkupParserTest.java
+++ b/jspwiki-war/src/test/java/org/apache/wiki/parser/JSPWikiMarkupParserTest.java
@@ -164,7 +164,7 @@ public class JSPWikiMarkupParserTest extends TestCase
String src = "This should be a [hyperlink]";
- assertEquals( "This should be a <a class=\"wikipage\" href=\"/Wiki.jsp?page=Hyperlink\">hyperlink</a>",
+ assertEquals( "This should be a <a class=\"wikipage\" href=\"/test/Wiki.jsp?page=Hyperlink\">hyperlink</a>",
translate(src) );
}
@@ -175,7 +175,7 @@ public class JSPWikiMarkupParserTest extends TestCase
String src = "This should be a [hyperlink too]";
- assertEquals( "This should be a <a class=\"wikipage\" href=\"/Wiki.jsp?page=HyperlinkToo\">hyperlink too</a>",
+ assertEquals( "This should be a <a class=\"wikipage\" href=\"/test/Wiki.jsp?page=HyperlinkToo\">hyperlink too</a>",
translate(src) );
}
@@ -186,7 +186,7 @@ public class JSPWikiMarkupParserTest extends TestCase
String src = "This should be a [HyperLink]";
- assertEquals( "This should be a <a class=\"wikipage\" href=\"/Wiki.jsp?page=HyperLink\">HyperLink</a>",
+ assertEquals( "This should be a <a class=\"wikipage\" href=\"/test/Wiki.jsp?page=HyperLink\">HyperLink</a>",
translate(src) );
}
@@ -197,7 +197,7 @@ public class JSPWikiMarkupParserTest extends TestCase
String src = "This should be a [here|HyperLink]";
- assertEquals( "This should be a <a class=\"wikipage\" href=\"/Wiki.jsp?page=HyperLink\">here</a>",
+ assertEquals( "This should be a <a class=\"wikipage\" href=\"/test/Wiki.jsp?page=HyperLink\">here</a>",
translate(src) );
}
@@ -208,7 +208,7 @@ public class JSPWikiMarkupParserTest extends TestCase
String src = "This should be a [here|HyperLink#heading]";
- assertEquals( "This should be a <a class=\"wikipage\" href=\"/Wiki.jsp?page=HyperLink#section-HyperLink-Heading\">here</a>",
+ assertEquals( "This should be a <a class=\"wikipage\" href=\"/test/Wiki.jsp?page=HyperLink#section-HyperLink-Heading\">here</a>",
translate(src) );
}
@@ -219,7 +219,7 @@ public class JSPWikiMarkupParserTest extends TestCase
String src = "This should be a [HyperLink#heading]";
- assertEquals( "This should be a <a class=\"wikipage\" href=\"/Wiki.jsp?page=HyperLink#section-HyperLink-Heading\">HyperLink#heading</a>",
+ assertEquals( "This should be a <a class=\"wikipage\" href=\"/test/Wiki.jsp?page=HyperLink#section-HyperLink-Heading\">HyperLink#heading</a>",
translate(src) );
}
@@ -230,7 +230,7 @@ public class JSPWikiMarkupParserTest extends TestCase
String src = "!Heading Too\r\nThis should be a [HyperLink#heading too]";
- assertEquals( "<h4 id=\"section-testpage-HeadingToo\">Heading Too<a class=\"hashlink\" href=\"#section-testpage-HeadingToo\">#</a></h4>\nThis should be a <a class=\"wikipage\" href=\"/Wiki.jsp?page=HyperLink#section-HyperLink-HeadingToo\">HyperLink#heading too</a>",
+ assertEquals( "<h4 id=\"section-testpage-HeadingToo\">Heading Too<a class=\"hashlink\" href=\"#section-testpage-HeadingToo\">#</a></h4>\nThis should be a <a class=\"wikipage\" href=\"/test/Wiki.jsp?page=HyperLink#section-HyperLink-HeadingToo\">HyperLink#heading too</a>",
translate(src) );
}
@@ -242,7 +242,7 @@ public class JSPWikiMarkupParserTest extends TestCase
String src = "This should be a [HyperLink#headingwithnonASCIIZolt�n]";
- assertEquals( "This should be a <a class=\"wikipage\" href=\"/Wiki.jsp?page=HyperLink#section-HyperLink-HeadingwithnonASCIIZolt_E1n\">HyperLink#headingwithnonASCIIZolt�n</a>",
+ assertEquals( "This should be a <a class=\"wikipage\" href=\"/test/Wiki.jsp?page=HyperLink#section-HyperLink-HeadingwithnonASCIIZolt_E1n\">HyperLink#headingwithnonASCIIZolt�n</a>",
translate(src) );
}
@@ -258,7 +258,7 @@ public class JSPWikiMarkupParserTest extends TestCase
String src = "[DiscussionAboutWiki] [WikiMarkupDevelopment].";
- assertEquals( "<a class=\"wikipage\" href=\"/Wiki.jsp?page=DiscussionAboutWiki\">DiscussionAboutWiki</a> <a class=\"wikipage\" href=\"/Wiki.jsp?page=WikiMarkupDevelopment\">WikiMarkupDevelopment</a>.",
+ assertEquals( "<a class=\"wikipage\" href=\"/test/Wiki.jsp?page=DiscussionAboutWiki\">DiscussionAboutWiki</a> <a class=\"wikipage\" href=\"/test/Wiki.jsp?page=WikiMarkupDevelopment\">WikiMarkupDevelopment</a>.",
translate(src) );
}
@@ -269,7 +269,7 @@ public class JSPWikiMarkupParserTest extends TestCase
String src = "This should be a HyperLink.";
- assertEquals( "This should be a <a class=\"wikipage\" href=\"/Wiki.jsp?page=HyperLink\">HyperLink</a>.",
+ assertEquals( "This should be a <a class=\"wikipage\" href=\"/test/Wiki.jsp?page=HyperLink\">HyperLink</a>.",
translate(src) );
}
@@ -278,7 +278,7 @@ public class JSPWikiMarkupParserTest extends TestCase
{
String src = "This should be a HyperLink.";
- assertEquals( "This should be a <a class=\"createpage\" href=\"/Edit.jsp?page=HyperLink\" title=\"Create "HyperLink"\">HyperLink</a>.",
+ assertEquals( "This should be a <a class=\"createpage\" href=\"/test/Edit.jsp?page=HyperLink\" title=\"Create "HyperLink"\">HyperLink</a>.",
translate(src) );
}
@@ -294,7 +294,7 @@ public class JSPWikiMarkupParserTest extends TestCase
String src = "This should be a [ HyperLink ].";
- assertEquals( "This should be a <a class=\"wikipage\" href=\"/Wiki.jsp?page=HyperLink\"> HyperLink </a>.",
+ assertEquals( "This should be a <a class=\"wikipage\" href=\"/test/Wiki.jsp?page=HyperLink\"> HyperLink </a>.",
translate(src) );
}
@@ -318,7 +318,7 @@ public class JSPWikiMarkupParserTest extends TestCase
String src = "This should be a HyperLink, and ThisToo.";
- assertEquals( "This should be a <a class=\"wikipage\" href=\"/Wiki.jsp?page=HyperLink\">HyperLink</a>, and <a class=\"wikipage\" href=\"/Wiki.jsp?page=ThisToo\">ThisToo</a>.",
+ assertEquals( "This should be a <a class=\"wikipage\" href=\"/test/Wiki.jsp?page=HyperLink\">HyperLink</a>, and <a class=\"wikipage\" href=\"/test/Wiki.jsp?page=ThisToo\">ThisToo</a>.",
translate(src) );
}
@@ -333,7 +333,7 @@ public class JSPWikiMarkupParserTest extends TestCase
String src = "This should be a [HyperLink], and ThisToo.";
- assertEquals( "This should be a <a class=\"wikipage\" href=\"/Wiki.jsp?page=HyperLink\">HyperLink</a>, and <a class=\"wikipage\" href=\"/Wiki.jsp?page=ThisToo\">ThisToo</a>.",
+ assertEquals( "This should be a <a class=\"wikipage\" href=\"/test/Wiki.jsp?page=HyperLink\">HyperLink</a>, and <a class=\"wikipage\" href=\"/test/Wiki.jsp?page=ThisToo\">ThisToo</a>.",
translate(src) );
}
@@ -347,7 +347,7 @@ public class JSPWikiMarkupParserTest extends TestCase
String src = "] This ] should be a HyperLink], and ThisToo.";
- assertEquals( "] This ] should be a <a class=\"wikipage\" href=\"/Wiki.jsp?page=HyperLink\">HyperLink</a>], and <a class=\"wikipage\" href=\"/Wiki.jsp?page=ThisToo\">ThisToo</a>.",
+ assertEquals( "] This ] should be a <a class=\"wikipage\" href=\"/test/Wiki.jsp?page=HyperLink\">HyperLink</a>], and <a class=\"wikipage\" href=\"/test/Wiki.jsp?page=ThisToo\">ThisToo</a>.",
translate(src) );
}
@@ -360,7 +360,7 @@ public class JSPWikiMarkupParserTest extends TestCase
String src = "HyperLink, and ThisToo";
- assertEquals( "<a class=\"wikipage\" href=\"/Wiki.jsp?page=HyperLink\">HyperLink</a>, and <a class=\"wikipage\" href=\"/Wiki.jsp?page=ThisToo\">ThisToo</a>",
+ assertEquals( "<a class=\"wikipage\" href=\"/test/Wiki.jsp?page=HyperLink\">HyperLink</a>, and <a class=\"wikipage\" href=\"/test/Wiki.jsp?page=ThisToo\">ThisToo</a>",
translate(src) );
}
@@ -429,10 +429,10 @@ public class JSPWikiMarkupParserTest extends TestCase
public void testHyperlinksCCURLs6()
throws Exception
{
- String src = "This should not be a link: http://''some.server''/wiki//Wiki.jsp\nIs it?";
+ String src = "This should not be a link: http://''some.server''/wiki//test/Wiki.jsp\nIs it?";
// System.out.println( "EX:"+translate(src) );
- assertEquals( "This should not be a link: http://<i>some.server</i>/wiki//Wiki.jsp\nIs it?",
+ assertEquals( "This should not be a link: http://<i>some.server</i>/wiki//test/Wiki.jsp\nIs it?",
translate(src) );
}
@@ -510,7 +510,7 @@ public class JSPWikiMarkupParserTest extends TestCase
String src = "*HyperLink";
- assertEquals( "<ul><li><a class=\"wikipage\" href=\"/Wiki.jsp?page=HyperLink\">HyperLink</a></li></ul>",
+ assertEquals( "<ul><li><a class=\"wikipage\" href=\"/test/Wiki.jsp?page=HyperLink\">HyperLink</a></li></ul>",
translate(src) );
}
@@ -521,7 +521,7 @@ public class JSPWikiMarkupParserTest extends TestCase
String src = "__BoldHyperLink__";
- assertEquals( "<b><a class=\"wikipage\" href=\"/Wiki.jsp?page=BoldHyperLink\">BoldHyperLink</a></b>",
+ assertEquals( "<b><a class=\"wikipage\" href=\"/test/Wiki.jsp?page=BoldHyperLink\">BoldHyperLink</a></b>",
translate(src) );
}
@@ -532,7 +532,7 @@ public class JSPWikiMarkupParserTest extends TestCase
String src = "Let's see, if a bold __HyperLink__ is correct?";
- assertEquals( "Let's see, if a bold <b><a class=\"wikipage\" href=\"/Wiki.jsp?page=HyperLink\">HyperLink</a></b> is correct?",
+ assertEquals( "Let's see, if a bold <b><a class=\"wikipage\" href=\"/test/Wiki.jsp?page=HyperLink\">HyperLink</a></b> is correct?",
translate(src) );
}
@@ -543,7 +543,7 @@ public class JSPWikiMarkupParserTest extends TestCase
String src = "''ItalicHyperLink''";
- assertEquals( "<i><a class=\"wikipage\" href=\"/Wiki.jsp?page=ItalicHyperLink\">ItalicHyperLink</a></i>",
+ assertEquals( "<i><a class=\"wikipage\" href=\"/test/Wiki.jsp?page=ItalicHyperLink\">ItalicHyperLink</a></i>",
translate(src) );
}
@@ -554,7 +554,7 @@ public class JSPWikiMarkupParserTest extends TestCase
String src = "Test. Punctuation. HyperLink.";
- assertEquals( "Test. Punctuation. <a class=\"wikipage\" href=\"/Wiki.jsp?page=HyperLink\">HyperLink</a>.",
+ assertEquals( "Test. Punctuation. <a class=\"wikipage\" href=\"/test/Wiki.jsp?page=HyperLink\">HyperLink</a>.",
translate(src) );
}
@@ -566,7 +566,7 @@ public class JSPWikiMarkupParserTest extends TestCase
String src = "Punctuations: HyperLink,ThisToo.";
- assertEquals( "Punctuations: <a class=\"wikipage\" href=\"/Wiki.jsp?page=HyperLink\">HyperLink</a>,<a class=\"wikipage\" href=\"/Wiki.jsp?page=ThisToo\">ThisToo</a>.",
+ assertEquals( "Punctuations: <a class=\"wikipage\" href=\"/test/Wiki.jsp?page=HyperLink\">HyperLink</a>,<a class=\"wikipage\" href=\"/test/Wiki.jsp?page=ThisToo\">ThisToo</a>.",
translate(src) );
}
@@ -577,7 +577,7 @@ public class JSPWikiMarkupParserTest extends TestCase
String src = "Onko t\u00e4m\u00e4 hyperlinkki: \u00c4itiSy\u00f6\u00d6ljy\u00e4?";
- assertEquals( "Onko t\u00e4m\u00e4 hyperlinkki: <a class=\"wikipage\" href=\"/Wiki.jsp?page=%C4itiSy%F6%D6ljy%E4\">\u00c4itiSy\u00f6\u00d6ljy\u00e4</a>?",
+ assertEquals( "Onko t\u00e4m\u00e4 hyperlinkki: <a class=\"wikipage\" href=\"/test/Wiki.jsp?page=%C4itiSy%F6%D6ljy%E4\">\u00c4itiSy\u00f6\u00d6ljy\u00e4</a>?",
translate(src) );
}
@@ -620,7 +620,7 @@ public class JSPWikiMarkupParserTest extends TestCase
newPage("HyperLink");
- assertEquals( "This should be a <a class=\"wikipage\" href=\"/Wiki.jsp?page=HyperLink\">HyperLinks</a>",
+ assertEquals( "This should be a <a class=\"wikipage\" href=\"/test/Wiki.jsp?page=HyperLink\">HyperLinks</a>",
translate(src) );
}
@@ -629,7 +629,7 @@ public class JSPWikiMarkupParserTest extends TestCase
{
String src = "This should be a [HyperLinks]";
- assertEquals( "This should be a <a class=\"createpage\" href=\"/Edit.jsp?page=HyperLinks\" title=\"Create "HyperLinks"\">HyperLinks</a>",
+ assertEquals( "This should be a <a class=\"createpage\" href=\"/test/Edit.jsp?page=HyperLinks\" title=\"Create "HyperLinks"\">HyperLinks</a>",
translate(src) );
}
@@ -640,7 +640,7 @@ public class JSPWikiMarkupParserTest extends TestCase
newPage("HyperLinks");
- assertEquals( "This should be a <a class=\"wikipage\" href=\"/Wiki.jsp?page=HyperLinks\">HyperLink</a>",
+ assertEquals( "This should be a <a class=\"wikipage\" href=\"/test/Wiki.jsp?page=HyperLinks\">HyperLink</a>",
translate(src) );
}
@@ -651,7 +651,7 @@ public class JSPWikiMarkupParserTest extends TestCase
newPage("HyperLink");
- assertEquals( "This should be a <a class=\"wikipage\" href=\"/Wiki.jsp?page=HyperLink\">Hyper links</a>",
+ assertEquals( "This should be a <a class=\"wikipage\" href=\"/test/Wiki.jsp?page=HyperLink\">Hyper links</a>",
translate(src) );
}
@@ -694,8 +694,8 @@ public class JSPWikiMarkupParserTest extends TestCase
String src = "This should be an [attachment link|Test/TestAtt.txt]";
- assertEquals( "This should be an <a class=\"attachment\" href=\"/attach/Test/TestAtt.txt\">attachment link</a>"+
- "<a href=\"/PageInfo.jsp?page=Test/TestAtt.txt\" class=\"infolink\"><img src=\"/images/attachment_small.png\" border=\"0\" alt=\"(info)\" /></a>",
+ assertEquals( "This should be an <a class=\"attachment\" href=\"/test/attach/Test/TestAtt.txt\">attachment link</a>"+
+ "<a href=\"/test/PageInfo.jsp?page=Test/TestAtt.txt\" class=\"infolink\"><img src=\"/test/images/attachment_small.png\" border=\"0\" alt=\"(info)\" /></a>",
translate(src));
}
@@ -717,8 +717,8 @@ public class JSPWikiMarkupParserTest extends TestCase
String src = "This should be an [attachment link|Test/TestAtt.txt]";
- assertEquals( "This should be an <a class=\"attachment\" href=\"/attach/Test/TestAtt.txt\">attachment link</a>"+
- "<a href=\"/PageInfo.jsp?page=Test/TestAtt.txt\" class=\"infolink\"><img src=\"/images/attachment_small.png\" border=\"0\" alt=\"(info)\" /></a>",
+ assertEquals( "This should be an <a class=\"attachment\" href=\"/test/attach/Test/TestAtt.txt\">attachment link</a>"+
+ "<a href=\"/test/PageInfo.jsp?page=Test/TestAtt.txt\" class=\"infolink\"><img src=\"/test/images/attachment_small.png\" border=\"0\" alt=\"(info)\" /></a>",
translate(testEngine2,src));
}
@@ -740,8 +740,8 @@ public class JSPWikiMarkupParserTest extends TestCase
String src = "[Test page/TestAtt.txt]";
- assertEquals( "<a class=\"attachment\" href=\"/attach/TestPage/TestAtt.txt\">Test page/TestAtt.txt</a>"+
- "<a href=\"/PageInfo.jsp?page=TestPage/TestAtt.txt\" class=\"infolink\"><img src=\"/images/attachment_small.png\" border=\"0\" alt=\"(info)\" /></a>",
+ assertEquals( "<a class=\"attachment\" href=\"/test/attach/TestPage/TestAtt.txt\">Test page/TestAtt.txt</a>"+
+ "<a href=\"/test/PageInfo.jsp?page=TestPage/TestAtt.txt\" class=\"infolink\"><img src=\"/test/images/attachment_small.png\" border=\"0\" alt=\"(info)\" /></a>",
translate(testEngine2,src));
}
@@ -760,8 +760,8 @@ public class JSPWikiMarkupParserTest extends TestCase
String src = "["+testEngine2.beautifyTitle("TestPage/TestAtt.txt")+"]";
- assertEquals( "<a class=\"attachment\" href=\"/attach/TestPage/TestAtt.txt\">Test Page/TestAtt.txt</a>"+
- "<a href=\"/PageInfo.jsp?page=TestPage/TestAtt.txt\" class=\"infolink\"><img src=\"/images/attachment_small.png\" border=\"0\" alt=\"(info)\" /></a>",
+ assertEquals( "<a class=\"attachment\" href=\"/test/attach/TestPage/TestAtt.txt\">Test Page/TestAtt.txt</a>"+
+ "<a href=\"/test/PageInfo.jsp?page=TestPage/TestAtt.txt\" class=\"infolink\"><img src=\"/test/images/attachment_small.png\" border=\"0\" alt=\"(info)\" /></a>",
translate(testEngine2,src));
}
@@ -828,7 +828,7 @@ public class JSPWikiMarkupParserTest extends TestCase
newPage("Test_page");
- assertEquals("Link <a class=\"wikipage\" href=\"/Wiki.jsp?page=Test_page\">test_page</a>",
+ assertEquals("Link <a class=\"wikipage\" href=\"/test/Wiki.jsp?page=Test_page\">test_page</a>",
translate(src) );
}
@@ -839,7 +839,7 @@ public class JSPWikiMarkupParserTest extends TestCase
newPage("Test.page");
- assertEquals("Link <a class=\"wikipage\" href=\"/Wiki.jsp?page=Test.page\">test.page</a>",
+ assertEquals("Link <a class=\"wikipage\" href=\"/test/Wiki.jsp?page=Test.page\">test.page</a>",
translate(src) );
}
@@ -850,7 +850,7 @@ public class JSPWikiMarkupParserTest extends TestCase
newPage(".testpage_");
- assertEquals("Link <a class=\"wikipage\" href=\"/Wiki.jsp?page=.testpage_\">.testpage_</a>",
+ assertEquals("Link <a class=\"wikipage\" href=\"/test/Wiki.jsp?page=.testpage_\">.testpage_</a>",
translate(src) );
}
@@ -916,7 +916,7 @@ public class JSPWikiMarkupParserTest extends TestCase
newPage("SandBox");
- assertEquals("Link <a class=\"wikipage\" href=\"/Wiki.jsp?page=SandBox\"><img class=\"inline\" src=\"http://foobar.jpg\" alt=\"SandBox\" /></a>",
+ assertEquals("Link <a class=\"wikipage\" href=\"/test/Wiki.jsp?page=SandBox\"><img class=\"inline\" src=\"http://foobar.jpg\" alt=\"SandBox\" /></a>",
translate(src) );
}
@@ -927,7 +927,7 @@ public class JSPWikiMarkupParserTest extends TestCase
newPage("\u00C5\u00E4Test"); // FIXME: Should be capital
- assertEquals("Link <a class=\"wikipage\" href=\"/Wiki.jsp?page=%C5%E4Test\">\u00c5\u00e4Test</a>",
+ assertEquals("Link <a class=\"wikipage\" href=\"/test/Wiki.jsp?page=%C5%E4Test\">\u00c5\u00e4Test</a>",
translate(src));
}
@@ -946,8 +946,8 @@ public class JSPWikiMarkupParserTest extends TestCase
newPage( "WikiEtiquette" );
- assertEquals( "<p><a class=\"wikipage\" href=\"/Wiki.jsp?page=WikiEtiquette\">WikiEtiquette</a>\n</p>"+
- "<p><a class=\"wikipage\" href=\"/Wiki.jsp?page=Search\">Search</a></p>", translate(src) );
+ assertEquals( "<p><a class=\"wikipage\" href=\"/test/Wiki.jsp?page=WikiEtiquette\">WikiEtiquette</a>\n</p>"+
+ "<p><a class=\"wikipage\" href=\"/test/Wiki.jsp?page=Search\">Search</a></p>", translate(src) );
}
public void testParagraph3()
@@ -969,10 +969,10 @@ public class JSPWikiMarkupParserTest extends TestCase
newPage("Search");
newPage("UnusedPages");
- assertEquals( "<p><a class=\"wikipage\" href=\"/Wiki.jsp?page=RecentChanges\">Recent Changes</a><br />\n"+
- "<a class=\"wikipage\" href=\"/Wiki.jsp?page=WikiEtiquette\">WikiEtiquette</a>\n</p>\n"+
- "<p><a class=\"wikipage\" href=\"/Wiki.jsp?page=Search\">Find pages</a><br />\n"+
- "<a class=\"wikipage\" href=\"/Wiki.jsp?page=UnusedPages\">Unused pages</a></p>",
+ assertEquals( "<p><a class=\"wikipage\" href=\"/test/Wiki.jsp?page=RecentChanges\">Recent Changes</a><br />\n"+
+ "<a class=\"wikipage\" href=\"/test/Wiki.jsp?page=WikiEtiquette\">WikiEtiquette</a>\n</p>\n"+
+ "<p><a class=\"wikipage\" href=\"/test/Wiki.jsp?page=Search\">Find pages</a><br />\n"+
+ "<a class=\"wikipage\" href=\"/test/Wiki.jsp?page=UnusedPages\">Unused pages</a></p>",
translate(src) );
}
@@ -1063,7 +1063,7 @@ public class JSPWikiMarkupParserTest extends TestCase
newPage("ALink");
- assertEquals( "1<tt>\n2345\n<a class=\"wikipage\" href=\"/Wiki.jsp?page=ALink\">a link</a>\n</tt>6", translate(src) );
+ assertEquals( "1<tt>\n2345\n<a class=\"wikipage\" href=\"/test/Wiki.jsp?page=ALink\">a link</a>\n</tt>6", translate(src) );
}
public void testPre()
@@ -1930,7 +1930,7 @@ public class JSPWikiMarkupParserTest extends TestCase
assertEquals( "<table class=\"wikitable\" border=\"1\">"+
"<tr class=\"odd\"><td>Cell 1</td><td> Cell 2</td></tr>\n"+
- "<tr><td><a class=\"wikipage\" href=\"/Wiki.jsp?page=ReallyALink\">Cell 3</a></td><td>Cell 4</td></tr>\n"+
+ "<tr><td><a class=\"wikipage\" href=\"/test/Wiki.jsp?page=ReallyALink\">Cell 3</a></td><td>Cell 4</td></tr>\n"+
"</table><p />",
translate(src) );
}
@@ -1944,7 +1944,7 @@ public class JSPWikiMarkupParserTest extends TestCase
assertEquals( "<table class=\"wikitable\" border=\"1\">"+
"<tr class=\"odd\"><td>Cell 1</td><td> Cell| 2</td></tr>\n"+
- "<tr><td><a class=\"wikipage\" href=\"/Wiki.jsp?page=ReallyALink\">Cell 3</a></td><td>Cell 4</td></tr>\n"+
+ "<tr><td><a class=\"wikipage\" href=\"/test/Wiki.jsp?page=ReallyALink\">Cell 3</a></td><td>Cell 4</td></tr>\n"+
"</table><p />",
translate(src) );
}
@@ -2090,7 +2090,7 @@ public class JSPWikiMarkupParserTest extends TestCase
{
String src="!!![Hello]";
- assertEquals( "<h2 id=\"section-testpage-Hello\"><a class=\"createpage\" href=\"/Edit.jsp?page=Hello\" title=\"Create "Hello"\">Hello</a><a class=\"hashlink\" href=\"#section-testpage-Hello\">#</a></h2>",
+ assertEquals( "<h2 id=\"section-testpage-Hello\"><a class=\"createpage\" href=\"/test/Edit.jsp?page=Hello\" title=\"Create "Hello"\">Hello</a><a class=\"hashlink\" href=\"#section-testpage-Hello\">#</a></h2>",
translate(src) );
}
@@ -2583,7 +2583,7 @@ public class JSPWikiMarkupParserTest extends TestCase
{
String src = "[-phobous]";
- assertEquals( "<a class=\"createpage\" href=\"/Edit.jsp?page=-phobous\" title=\"Create "-phobous"\">-phobous</a>", translate(src) );
+ assertEquals( "<a class=\"createpage\" href=\"/test/Edit.jsp?page=-phobous\" title=\"Create "-phobous"\">-phobous</a>", translate(src) );
}
public void testPunctuatedWikiNames2()
@@ -2591,7 +2591,7 @@ public class JSPWikiMarkupParserTest extends TestCase
{
String src = "[?phobous]";
- assertEquals( "<a class=\"createpage\" href=\"/Edit.jsp?page=Phobous\" title=\"Create "Phobous"\">?phobous</a>", translate(src) );
+ assertEquals( "<a class=\"createpage\" href=\"/test/Edit.jsp?page=Phobous\" title=\"Create "Phobous"\">?phobous</a>", translate(src) );
}
public void testPunctuatedWikiNames3()
@@ -2599,7 +2599,7 @@ public class JSPWikiMarkupParserTest extends TestCase
{
String src = "[Brightness (apical)]";
- assertEquals( "<a class=\"createpage\" href=\"/Edit.jsp?page=Brightness%20%28apical%29\" title=\"Create "Brightness (apical)"\">Brightness (apical)</a>", translate(src) );
+ assertEquals( "<a class=\"createpage\" href=\"/test/Edit.jsp?page=Brightness%20%28apical%29\" title=\"Create "Brightness (apical)"\">Brightness (apical)</a>", translate(src) );
}
public void testDeadlySpammer()
@@ -2628,7 +2628,7 @@ public class JSPWikiMarkupParserTest extends TestCase
newPage("Foo bar");
String src = "[Foo bar]";
- assertEquals( "<a class=\"wikipage\" href=\"/Wiki.jsp?page=Foo%20bar\">Foo bar</a>", translate(src) );
+ assertEquals( "<a class=\"wikipage\" href=\"/test/Wiki.jsp?page=Foo%20bar\">Foo bar</a>", translate(src) );
}
/** Too many spaces */
@@ -2637,7 +2637,7 @@ public class JSPWikiMarkupParserTest extends TestCase
newPage("Foo bar");
String src = "[Foo bar]";
- assertEquals( "<a class=\"wikipage\" href=\"/Wiki.jsp?page=Foo%20bar\">Foo bar</a>", translate(src) );
+ assertEquals( "<a class=\"wikipage\" href=\"/test/Wiki.jsp?page=Foo%20bar\">Foo bar</a>", translate(src) );
}
public void testIllegalXML() throws Exception
@@ -2665,7 +2665,7 @@ public class JSPWikiMarkupParserTest extends TestCase
String dst = translate(src);
- assertEquals( "<a class=\"wikipage\" href=\"/Wiki.jsp?page=Foo%26Bar\">Foo&Bar</a>", dst );
+ assertEquals( "<a class=\"wikipage\" href=\"/test/Wiki.jsp?page=Foo%26Bar\">Foo&Bar</a>", dst );
}
public void testAmpersand2() throws Exception
@@ -2675,7 +2675,7 @@ public class JSPWikiMarkupParserTest extends TestCase
String dst = translate(src);
- assertEquals( "<a class=\"wikipage\" href=\"/Wiki.jsp?page=Foo%20%26%20Bar\">Foo & Bar</a>", dst );
+ assertEquals( "<a class=\"wikipage\" href=\"/test/Wiki.jsp?page=Foo%20%26%20Bar\">Foo & Bar</a>", dst );
}
// This is a random find: the following page text caused an eternal loop in V2.0.x.