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/26 12:44:00 UTC
[1/5] jspwiki git commit: JSPWIKI-1038
Repository: jspwiki
Updated Branches:
refs/heads/JSPWIKI-1035 10596bdec -> 08573754a
JSPWIKI-1038
Project: http://git-wip-us.apache.org/repos/asf/jspwiki/repo
Commit: http://git-wip-us.apache.org/repos/asf/jspwiki/commit/e1f1c352
Tree: http://git-wip-us.apache.org/repos/asf/jspwiki/tree/e1f1c352
Diff: http://git-wip-us.apache.org/repos/asf/jspwiki/diff/e1f1c352
Branch: refs/heads/JSPWIKI-1035
Commit: e1f1c35225169a3c067258c0c6b1fc8846a4680a
Parents: cb0a11e
Author: brushed <di...@gmail.com>
Authored: Sun Dec 18 22:28:01 2016 +0100
Committer: brushed <di...@gmail.com>
Committed: Sun Dec 18 22:28:01 2016 +0100
----------------------------------------------------------------------
ChangeLog | 8 ++++++++
jspwiki-war/src/main/java/org/apache/wiki/Release.java | 2 +-
jspwiki-war/src/main/scripts/wiki/Wiki.js | 10 ++++++++++
3 files changed, 19 insertions(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/jspwiki/blob/e1f1c352/ChangeLog
----------------------------------------------------------------------
diff --git a/ChangeLog b/ChangeLog
index 34c0e12..28e6155 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,11 @@
+2016-12-18 Dirk Frederickx (brushed AT apache DOT org)
+
+ * 2.10.3-svn-21 Various HADDOCK updates & fixes.
+
+ * [JSPWIKI-1038]: IE's flexbox implementation is broken,
+ no workaround for now.
+
+
2016-12-17 Dirk Frederickx (brushed AT apache DOT org)
* Fixing RSSGenerator test with latest WeblogPlugin changes
http://git-wip-us.apache.org/repos/asf/jspwiki/blob/e1f1c352/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 b37ef14..4a71a2c 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 = "20";
+ public static final String BUILD = "21";
/**
* 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/e1f1c352/jspwiki-war/src/main/scripts/wiki/Wiki.js
----------------------------------------------------------------------
diff --git a/jspwiki-war/src/main/scripts/wiki/Wiki.js b/jspwiki-war/src/main/scripts/wiki/Wiki.js
index 7455244..1e4fd51 100644
--- a/jspwiki-war/src/main/scripts/wiki/Wiki.js
+++ b/jspwiki-war/src/main/scripts/wiki/Wiki.js
@@ -187,12 +187,22 @@ var Wiki = {
//Modernizr.addTest('flexbox', testAllProps('flexBasis', '1px', true));
+ /*
var hasNativeFlex = document.createElement('b');
hasNativeFlex.style.cssText = "flex-basis:1px;";
if( hasNativeFlex.style.length ){
body.addClass("can-flex");
}
+ */
+
+ //support for flexbox is broken in IE, let's do it the hard-way
+ console.log(navigator.appVersion);
+
+ if ( !navigator.appVersion.match(/MSIE/) ){
+ //alert("Aha, no IE. Let's play flexbox");
+ body.addClass("can-flex");
+ }
},
[3/5] 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/JSPWIKI-1035
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(-)
----------------------------------------------------------------------
[4/5] 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/JSPWIKI-1035
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 )
[2/5] jspwiki git commit: [JSPWIKI-1038]: Fix allowing flexbox in
Edge. (but not in IE)
Posted by me...@apache.org.
[JSPWIKI-1038]: Fix allowing flexbox in Edge. (but not in IE)
Project: http://git-wip-us.apache.org/repos/asf/jspwiki/repo
Commit: http://git-wip-us.apache.org/repos/asf/jspwiki/commit/82949d60
Tree: http://git-wip-us.apache.org/repos/asf/jspwiki/tree/82949d60
Diff: http://git-wip-us.apache.org/repos/asf/jspwiki/diff/82949d60
Branch: refs/heads/JSPWIKI-1035
Commit: 82949d6033bea8d29de9da81258361e441b60956
Parents: e1f1c35
Author: brushed <di...@gmail.com>
Authored: Mon Dec 19 23:20:29 2016 +0100
Committer: brushed <di...@gmail.com>
Committed: Mon Dec 19 23:20:29 2016 +0100
----------------------------------------------------------------------
ChangeLog | 7 +++++++
jspwiki-war/src/main/java/org/apache/wiki/Release.java | 2 +-
jspwiki-war/src/main/scripts/wiki/Wiki.js | 4 +++-
3 files changed, 11 insertions(+), 2 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/jspwiki/blob/82949d60/ChangeLog
----------------------------------------------------------------------
diff --git a/ChangeLog b/ChangeLog
index 28e6155..9c1acc8 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,10 @@
+2016-12-19 Dirk Frederickx (brushed AT apache DOT org)
+
+ * 2.10.3-svn-22 Various HADDOCK updates & fixes.
+
+ * [JSPWIKI-1038]: Fix allowing flexbox in Edge. (but not in IE)
+
+
2016-12-18 Dirk Frederickx (brushed AT apache DOT org)
* 2.10.3-svn-21 Various HADDOCK updates & fixes.
http://git-wip-us.apache.org/repos/asf/jspwiki/blob/82949d60/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 4a71a2c..9cf5f0d 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 = "21";
+ public static final String BUILD = "22";
/**
* 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/82949d60/jspwiki-war/src/main/scripts/wiki/Wiki.js
----------------------------------------------------------------------
diff --git a/jspwiki-war/src/main/scripts/wiki/Wiki.js b/jspwiki-war/src/main/scripts/wiki/Wiki.js
index 1e4fd51..1e9610c 100644
--- a/jspwiki-war/src/main/scripts/wiki/Wiki.js
+++ b/jspwiki-war/src/main/scripts/wiki/Wiki.js
@@ -199,7 +199,9 @@ var Wiki = {
//support for flexbox is broken in IE, let's do it the hard-way
console.log(navigator.appVersion);
- if ( !navigator.appVersion.match(/MSIE/) ){
+ var nav = navigator.appVersion;
+
+ if ( nav.match(/Edge/) || !nav.match(/MSIE/) ){
//alert("Aha, no IE. Let's play flexbox");
body.addClass("can-flex");
}
[5/5] 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/JSPWIKI-1035
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