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 2014/05/23 07:36:16 UTC
svn commit: r1597012 - in /jspwiki/trunk: ./
jspwiki-war/src/main/java/org/apache/wiki/
jspwiki-war/src/main/java/org/apache/wiki/parser/
jspwiki-war/src/main/webapp/WEB-INF/classes/
jspwiki-war/src/test/java/org/apache/wiki/parser/
Author: metskem
Date: Fri May 23 05:36:16 2014
New Revision: 1597012
URL: http://svn.apache.org/r1597012
Log:
2014-05-23 Harry Metske (metskem@apache.org)
* 2.10.1-svn-17
* Fixed JSPWIKI-535 - direct links to sections with accents doesn't work
Added:
jspwiki/trunk/jspwiki-war/src/main/webapp/WEB-INF/classes/
jspwiki/trunk/jspwiki-war/src/main/webapp/WEB-INF/classes/jspwiki-custom.properties
Modified:
jspwiki/trunk/ChangeLog
jspwiki/trunk/jspwiki-war/src/main/java/org/apache/wiki/Release.java
jspwiki/trunk/jspwiki-war/src/main/java/org/apache/wiki/parser/JSPWikiMarkupParser.java
jspwiki/trunk/jspwiki-war/src/test/java/org/apache/wiki/parser/JSPWikiMarkupParserTest.java
Modified: jspwiki/trunk/ChangeLog
URL: http://svn.apache.org/viewvc/jspwiki/trunk/ChangeLog?rev=1597012&r1=1597011&r2=1597012&view=diff
==============================================================================
--- jspwiki/trunk/ChangeLog (original)
+++ jspwiki/trunk/ChangeLog Fri May 23 05:36:16 2014
@@ -1,3 +1,9 @@
+2014-05-23 Harry Metske (metskem@apache.org)
+
+ * 2.10.1-svn-17
+
+ * Fixed JSPWIKI-535 - direct links to sections with accents doesn't work
+
2014-04-20 Juan Pablo Santos (juanpablo AT apache DOT org)
* 2.10.1-svn-16
Modified: jspwiki/trunk/jspwiki-war/src/main/java/org/apache/wiki/Release.java
URL: http://svn.apache.org/viewvc/jspwiki/trunk/jspwiki-war/src/main/java/org/apache/wiki/Release.java?rev=1597012&r1=1597011&r2=1597012&view=diff
==============================================================================
--- jspwiki/trunk/jspwiki-war/src/main/java/org/apache/wiki/Release.java (original)
+++ jspwiki/trunk/jspwiki-war/src/main/java/org/apache/wiki/Release.java Fri May 23 05:36:16 2014
@@ -72,7 +72,7 @@ public final class Release {
* <p>
* If the build identifier is empty, it is not added.
*/
- public static final String BUILD = "16";
+ public static final String BUILD = "17";
/**
* This is the generic version string you should use when printing out the version. It is of
Modified: jspwiki/trunk/jspwiki-war/src/main/java/org/apache/wiki/parser/JSPWikiMarkupParser.java
URL: http://svn.apache.org/viewvc/jspwiki/trunk/jspwiki-war/src/main/java/org/apache/wiki/parser/JSPWikiMarkupParser.java?rev=1597012&r1=1597011&r2=1597012&view=diff
==============================================================================
--- jspwiki/trunk/jspwiki-war/src/main/java/org/apache/wiki/parser/JSPWikiMarkupParser.java (original)
+++ jspwiki/trunk/jspwiki-war/src/main/java/org/apache/wiki/parser/JSPWikiMarkupParser.java Fri May 23 05:36:16 2014
@@ -257,11 +257,6 @@ public class JSPWikiMarkupParser extends
initialize();
}
- /**
- * @param m_engine The WikiEngine this reader is attached to. Is
- * used to figure out of a page exits.
- */
-
// FIXME: parsers should be pooled for better performance.
@SuppressWarnings("unchecked")
private void initialize()
@@ -1612,7 +1607,7 @@ public class JSPWikiMarkupParser extends
String matchedLink;
if( (matchedLink = linkExists( linkref )) != null )
{
- String sectref = "section-"+m_engine.encodeName(matchedLink)+"-"+wikifyLink(namedSection);
+ String sectref = "section-"+m_engine.encodeName(matchedLink+"-"+wikifyLink(namedSection));
sectref = sectref.replace('%', '_');
makeLink( READ, matchedLink, linktext, sectref, link.getAttributes() );
}
Added: jspwiki/trunk/jspwiki-war/src/main/webapp/WEB-INF/classes/jspwiki-custom.properties
URL: http://svn.apache.org/viewvc/jspwiki/trunk/jspwiki-war/src/main/webapp/WEB-INF/classes/jspwiki-custom.properties?rev=1597012&view=auto
==============================================================================
--- jspwiki/trunk/jspwiki-war/src/main/webapp/WEB-INF/classes/jspwiki-custom.properties (added)
+++ jspwiki/trunk/jspwiki-war/src/main/webapp/WEB-INF/classes/jspwiki-custom.properties Fri May 23 05:36:16 2014
@@ -0,0 +1,27 @@
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements. See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership. The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License. You may obtain a copy of the License at
+#
+# http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied. See the License for the
+# specific language governing permissions and limitations
+# under the License.
+
+#
+# Overriding values on classpath:/ini/jspwiki.properties
+#
+
+jspwiki.basicAttachmentProvider.storageDir=./target/jspwiki-files
+jspwiki.fileSystemProvider.pageDir=./target/jspwiki-files
+jspwiki.applicationName=JSPWiki
+jspwiki.workDir=./target/jspwiki/temp/JSPWiki
+jspwiki.baseURL=http://localhost:8080/JSPWiki/
+log4j.appender.FileLog.File=./target/jspwiki/logs/JSPWiki.log
Modified: jspwiki/trunk/jspwiki-war/src/test/java/org/apache/wiki/parser/JSPWikiMarkupParserTest.java
URL: http://svn.apache.org/viewvc/jspwiki/trunk/jspwiki-war/src/test/java/org/apache/wiki/parser/JSPWikiMarkupParserTest.java?rev=1597012&r1=1597011&r2=1597012&view=diff
==============================================================================
--- jspwiki/trunk/jspwiki-war/src/test/java/org/apache/wiki/parser/JSPWikiMarkupParserTest.java (original)
+++ jspwiki/trunk/jspwiki-war/src/test/java/org/apache/wiki/parser/JSPWikiMarkupParserTest.java Fri May 23 05:36:16 2014
@@ -233,7 +233,19 @@ public class JSPWikiMarkupParserTest ext
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>",
translate(src) );
}
-
+
+ // test hyperlink to a section with non-ASCII character in it
+ public void testHyperlinksNamed4()
+ throws Exception
+ {
+ newPage("HyperLink");
+
+ 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>",
+ translate(src) );
+ }
+
//
// Testing CamelCase hyperlinks
//