You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@jspwiki.apache.org by gm...@apache.org on 2013/07/03 17:42:01 UTC
svn commit: r1499446 - in /incubator/jspwiki/trunk: ./ jspwiki-war/
jspwiki-war/src/main/config/doc/ jspwiki-war/src/main/filters/
jspwiki-war/src/main/java/org/apache/wiki/
jspwiki-war/src/main/java/org/apache/wiki/auth/
jspwiki-war/src/main/java/org/...
Author: gmazza
Date: Wed Jul 3 15:42:00 2013
New Revision: 1499446
URL: http://svn.apache.org/r1499446
Log:
Upgrade to JDOM2 and JUnit 4.11, filters file moved to src/test/filter from src/main/filter
Added:
incubator/jspwiki/trunk/jspwiki-war/src/main/java/org/apache/wiki/render/CustomXMLOutputProcessor.java
incubator/jspwiki/trunk/jspwiki-war/src/test/filters/
incubator/jspwiki/trunk/jspwiki-war/src/test/filters/filters.properties
- copied unchanged from r1498905, incubator/jspwiki/trunk/jspwiki-war/src/main/filters/filters.properties
Removed:
incubator/jspwiki/trunk/jspwiki-war/src/main/config/doc/Compiling.txt
incubator/jspwiki/trunk/jspwiki-war/src/main/config/doc/Translating.txt
incubator/jspwiki/trunk/jspwiki-war/src/main/filters/filters.properties
Modified:
incubator/jspwiki/trunk/ (props changed)
incubator/jspwiki/trunk/ChangeLog
incubator/jspwiki/trunk/jspwiki-war/pom.xml
incubator/jspwiki/trunk/jspwiki-war/src/main/config/doc/LICENSE.jaxen
incubator/jspwiki/trunk/jspwiki-war/src/main/config/doc/LICENSE.jdom
incubator/jspwiki/trunk/jspwiki-war/src/main/config/doc/LICENSE.yui
incubator/jspwiki/trunk/jspwiki-war/src/main/java/org/apache/wiki/Release.java
incubator/jspwiki/trunk/jspwiki-war/src/main/java/org/apache/wiki/auth/SecurityVerifier.java
incubator/jspwiki/trunk/jspwiki-war/src/main/java/org/apache/wiki/auth/authorize/WebContainerAuthorizer.java
incubator/jspwiki/trunk/jspwiki-war/src/main/java/org/apache/wiki/filters/DefaultFilterManager.java
incubator/jspwiki/trunk/jspwiki-war/src/main/java/org/apache/wiki/htmltowiki/HtmlStringToWikiTranslator.java
incubator/jspwiki/trunk/jspwiki-war/src/main/java/org/apache/wiki/htmltowiki/XHtmlElementToWikiTranslator.java
incubator/jspwiki/trunk/jspwiki-war/src/main/java/org/apache/wiki/modules/WikiModuleInfo.java
incubator/jspwiki/trunk/jspwiki-war/src/main/java/org/apache/wiki/parser/JSPWikiMarkupParser.java
incubator/jspwiki/trunk/jspwiki-war/src/main/java/org/apache/wiki/parser/LinkParser.java
incubator/jspwiki/trunk/jspwiki-war/src/main/java/org/apache/wiki/parser/PluginContent.java
incubator/jspwiki/trunk/jspwiki-war/src/main/java/org/apache/wiki/parser/VariableContent.java
incubator/jspwiki/trunk/jspwiki-war/src/main/java/org/apache/wiki/parser/WikiDocument.java
incubator/jspwiki/trunk/jspwiki-war/src/main/java/org/apache/wiki/plugin/DefaultPluginManager.java
incubator/jspwiki/trunk/jspwiki-war/src/main/java/org/apache/wiki/render/CleanTextRenderer.java
incubator/jspwiki/trunk/jspwiki-war/src/main/java/org/apache/wiki/render/CreoleRenderer.java
incubator/jspwiki/trunk/jspwiki-war/src/main/java/org/apache/wiki/render/WysiwygEditingRenderer.java
incubator/jspwiki/trunk/jspwiki-war/src/main/java/org/apache/wiki/render/XHTMLRenderer.java
incubator/jspwiki/trunk/jspwiki-war/src/main/java/org/apache/wiki/rss/AtomFeed.java
incubator/jspwiki/trunk/jspwiki-war/src/main/java/org/apache/wiki/rss/RSS20Feed.java
incubator/jspwiki/trunk/jspwiki-war/src/main/java/org/apache/wiki/ui/EditorManager.java
incubator/jspwiki/trunk/jspwiki-war/src/main/java/org/apache/wiki/util/ClassUtil.java
incubator/jspwiki/trunk/jspwiki-war/src/test/java/org/apache/wiki/auth/authorize/WebContainerAuthorizerTest.java
incubator/jspwiki/trunk/mvn_cheat-sheet.txt
incubator/jspwiki/trunk/pom.xml
Propchange: incubator/jspwiki/trunk/
------------------------------------------------------------------------------
--- svn:ignore (original)
+++ svn:ignore Wed Jul 3 15:42:00 2013
@@ -1,3 +1 @@
.project
-.settings
-target
Modified: incubator/jspwiki/trunk/ChangeLog
URL: http://svn.apache.org/viewvc/incubator/jspwiki/trunk/ChangeLog?rev=1499446&r1=1499445&r2=1499446&view=diff
==============================================================================
--- incubator/jspwiki/trunk/ChangeLog (original)
+++ incubator/jspwiki/trunk/ChangeLog Wed Jul 3 15:42:00 2013
@@ -1,3 +1,16 @@
+2013-07-03 Glen Mazza (gmazza AT apache DOT org)
+
+ * 2.10.0-svn-14
+
+ * Switched from org.jdom:jdom:1.2 to org.jdom:jdom2:2.0.5, to JUnit 4.11
+
+ * Updated Maven cheat sheet to provide debugging info
+
+ * Moved filters file from src/main/filters to src/test/filters as test
+ is the only place using it.
+
+ * Updated some licenses to most recent.
+
2013-07-01 Glen Mazza (gmazza AT apache DOT org)
* 2.10.0-svn-13
Modified: incubator/jspwiki/trunk/jspwiki-war/pom.xml
URL: http://svn.apache.org/viewvc/incubator/jspwiki/trunk/jspwiki-war/pom.xml?rev=1499446&r1=1499445&r2=1499446&view=diff
==============================================================================
--- incubator/jspwiki/trunk/jspwiki-war/pom.xml (original)
+++ incubator/jspwiki/trunk/jspwiki-war/pom.xml Wed Jul 3 15:42:00 2013
@@ -93,9 +93,14 @@
<dependency>
<groupId>org.jdom</groupId>
- <artifactId>jdom</artifactId>
+ <artifactId>jdom2</artifactId>
</dependency>
-
+
+ <dependency>
+ <groupId>jaxen</groupId>
+ <artifactId>jaxen</artifactId>
+ </dependency>
+
<dependency>
<groupId>javax.servlet</groupId>
<artifactId>jstl</artifactId>
@@ -176,7 +181,7 @@
<finalName>JSPWiki</finalName>
<!-- filtering: http://maven.apache.org/plugins/maven-resources-plugin/examples/filter.html -->
<filters>
- <filter>src/main/filters/filters.properties</filter>
+ <filter>src/test/filters/filters.properties</filter>
</filters>
<resources>
Modified: incubator/jspwiki/trunk/jspwiki-war/src/main/config/doc/LICENSE.jaxen
URL: http://svn.apache.org/viewvc/incubator/jspwiki/trunk/jspwiki-war/src/main/config/doc/LICENSE.jaxen?rev=1499446&r1=1499445&r2=1499446&view=diff
==============================================================================
--- incubator/jspwiki/trunk/jspwiki-war/src/main/config/doc/LICENSE.jaxen (original)
+++ incubator/jspwiki/trunk/jspwiki-war/src/main/config/doc/LICENSE.jaxen Wed Jul 3 15:42:00 2013
@@ -1,45 +1,33 @@
/*
- $Id: LICENSE.txt,v 1.3 2003/06/29 18:22:02 ssanders Exp $
+ $Id: LICENSE.txt 1128 2006-02-05 21:49:04Z elharo $
- Copyright 2003 (C) The Werken Company. All Rights Reserved.
-
- Redistribution and use of this software and associated documentation
- ("Software"), with or without modification, are permitted provided
- that the following conditions are met:
-
- 1. Redistributions of source code must retain copyright
- statements and notices. Redistributions must also contain a
- copy of this document.
-
- 2. Redistributions in binary form must reproduce the
- above copyright notice, this list of conditions and the
- following disclaimer in the documentation and/or other
- materials provided with the distribution.
-
- 3. The name "jaxen" must not be used to endorse or promote
- products derived from this Software without prior written
- permission of The Werken Company. For written permission,
- please contact bob@werken.com.
-
- 4. Products derived from this Software may not be called "jaxen"
- nor may "jaxen" appear in their names without prior written
- permission of The Werken Company. "jaxen" is a registered
- trademark of The Werken Company.
-
- 5. Due credit should be given to The Werken Company.
- (http://jaxen.werken.com/).
-
- THIS SOFTWARE IS PROVIDED BY THE WERKEN COMPANY AND CONTRIBUTORS
- ``AS IS'' AND ANY EXPRESSED OR IMPLIED WARRANTIES, INCLUDING, BUT
- NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND
- FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL
- THE WERKEN COMPANY OR ITS CONTRIBUTORS BE LIABLE FOR ANY DIRECT,
- INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
- (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR
- SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
- HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT,
- STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
- ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED
- OF THE POSSIBILITY OF SUCH DAMAGE.
+ Copyright 2003-2006 The Werken Company. All Rights Reserved.
- */
+ Redistribution and use in source and binary forms, with or without
+ modification, are permitted provided that the following conditions are
+ met:
+
+ * Redistributions of source code must retain the above copyright
+ notice, this list of conditions and the following disclaimer.
+
+ * Redistributions in binary form must reproduce the above copyright
+ notice, this list of conditions and the following disclaimer in the
+ documentation and/or other materials provided with the distribution.
+
+ * Neither the name of the Jaxen Project nor the names of its
+ contributors may be used to endorse or promote products derived
+ from this software without specific prior written permission.
+
+THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS
+IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED
+TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A
+PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER
+OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL,
+EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
+PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR
+PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF
+LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING
+NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
+SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+
+*/
Modified: incubator/jspwiki/trunk/jspwiki-war/src/main/config/doc/LICENSE.jdom
URL: http://svn.apache.org/viewvc/incubator/jspwiki/trunk/jspwiki-war/src/main/config/doc/LICENSE.jdom?rev=1499446&r1=1499445&r2=1499446&view=diff
==============================================================================
--- incubator/jspwiki/trunk/jspwiki-war/src/main/config/doc/LICENSE.jdom (original)
+++ incubator/jspwiki/trunk/jspwiki-war/src/main/config/doc/LICENSE.jdom Wed Jul 3 15:42:00 2013
@@ -1,36 +1,34 @@
-/*--
+/*--
- $Id: LICENSE.txt,v 1.11 2004/02/06 09:32:57 jhunter Exp $
-
- Copyright (C) 2000-2004 Jason Hunter & Brett McLaughlin.
+ Copyright (C) 2000-2012 Jason Hunter & Brett McLaughlin.
All rights reserved.
-
+
Redistribution and use in source and binary forms, with or without
modification, are permitted provided that the following conditions
are met:
-
+
1. Redistributions of source code must retain the above copyright
notice, this list of conditions, and the following disclaimer.
-
+
2. Redistributions in binary form must reproduce the above copyright
- notice, this list of conditions, and the disclaimer that follows
- these conditions in the documentation and/or other materials
+ notice, this list of conditions, and the disclaimer that follows
+ these conditions in the documentation and/or other materials
provided with the distribution.
3. The name "JDOM" must not be used to endorse or promote products
derived from this software without prior written permission. For
written permission, please contact <request_AT_jdom_DOT_org>.
-
+
4. Products derived from this software may not be called "JDOM", nor
may "JDOM" appear in their name, without prior written permission
from the JDOM Project Management <request_AT_jdom_DOT_org>.
-
- In addition, we request (but do not require) that you include in the
- end-user documentation provided with the redistribution and/or in the
+
+ In addition, we request (but do not require) that you include in the
+ end-user documentation provided with the redistribution and/or in the
software itself an acknowledgement equivalent to the following:
"This product includes software developed by the
JDOM Project (http://www.jdom.org/)."
- Alternatively, the acknowledgment may be graphical using the logos
+ Alternatively, the acknowledgment may be graphical using the logos
available at http://www.jdom.org/images/logos.
THIS SOFTWARE IS PROVIDED ``AS IS'' AND ANY EXPRESSED OR IMPLIED
@@ -46,11 +44,10 @@
OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
SUCH DAMAGE.
- This software consists of voluntary contributions made by many
- individuals on behalf of the JDOM Project and was originally
+ This software consists of voluntary contributions made by many
+ individuals on behalf of the JDOM Project and was originally
created by Jason Hunter <jhunter_AT_jdom_DOT_org> and
Brett McLaughlin <brett_AT_jdom_DOT_org>. For more information
- on the JDOM Project, please see <http://www.jdom.org/>.
-
- */
+ on the JDOM Project, please see <http://www.jdom.org/>.
+*/
Modified: incubator/jspwiki/trunk/jspwiki-war/src/main/config/doc/LICENSE.yui
URL: http://svn.apache.org/viewvc/incubator/jspwiki/trunk/jspwiki-war/src/main/config/doc/LICENSE.yui?rev=1499446&r1=1499445&r2=1499446&view=diff
==============================================================================
--- incubator/jspwiki/trunk/jspwiki-war/src/main/config/doc/LICENSE.yui (original)
+++ incubator/jspwiki/trunk/jspwiki-war/src/main/config/doc/LICENSE.yui Wed Jul 3 15:42:00 2013
@@ -19,4 +19,4 @@ CONTRIBUTORS BE LIABLE FOR ANY DIRECT, I
DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF
USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY,
WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY
-WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
\ No newline at end of file
+WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
Modified: incubator/jspwiki/trunk/jspwiki-war/src/main/java/org/apache/wiki/Release.java
URL: http://svn.apache.org/viewvc/incubator/jspwiki/trunk/jspwiki-war/src/main/java/org/apache/wiki/Release.java?rev=1499446&r1=1499445&r2=1499446&view=diff
==============================================================================
--- incubator/jspwiki/trunk/jspwiki-war/src/main/java/org/apache/wiki/Release.java (original)
+++ incubator/jspwiki/trunk/jspwiki-war/src/main/java/org/apache/wiki/Release.java Wed Jul 3 15:42:00 2013
@@ -75,7 +75,7 @@ public final class Release
* <p>
* If the build identifier is empty, it is not added.
*/
- public static final String BUILD = "13";
+ public static final String BUILD = "14";
/**
* This is the generic version string you should use
Modified: incubator/jspwiki/trunk/jspwiki-war/src/main/java/org/apache/wiki/auth/SecurityVerifier.java
URL: http://svn.apache.org/viewvc/incubator/jspwiki/trunk/jspwiki-war/src/main/java/org/apache/wiki/auth/SecurityVerifier.java?rev=1499446&r1=1499445&r2=1499446&view=diff
==============================================================================
--- incubator/jspwiki/trunk/jspwiki-war/src/main/java/org/apache/wiki/auth/SecurityVerifier.java (original)
+++ incubator/jspwiki/trunk/jspwiki-war/src/main/java/org/apache/wiki/auth/SecurityVerifier.java Wed Jul 3 15:42:00 2013
@@ -44,7 +44,7 @@ import org.apache.wiki.auth.permissions.
import org.apache.wiki.auth.user.UserDatabase;
import org.apache.wiki.auth.user.UserProfile;
import org.freshcookies.security.policy.PolicyReader;
-import org.jdom.JDOMException;
+import org.jdom2.JDOMException;
/**
* Helper class for verifying JSPWiki's security configuration. Invoked by
Modified: incubator/jspwiki/trunk/jspwiki-war/src/main/java/org/apache/wiki/auth/authorize/WebContainerAuthorizer.java
URL: http://svn.apache.org/viewvc/incubator/jspwiki/trunk/jspwiki-war/src/main/java/org/apache/wiki/auth/authorize/WebContainerAuthorizer.java?rev=1499446&r1=1499445&r2=1499446&view=diff
==============================================================================
--- incubator/jspwiki/trunk/jspwiki-war/src/main/java/org/apache/wiki/auth/authorize/WebContainerAuthorizer.java (original)
+++ incubator/jspwiki/trunk/jspwiki-war/src/main/java/org/apache/wiki/auth/authorize/WebContainerAuthorizer.java Wed Jul 3 15:42:00 2013
@@ -30,12 +30,12 @@ import java.util.Set;
import javax.servlet.http.HttpServletRequest;
import org.apache.log4j.Logger;
-import org.jdom.Document;
-import org.jdom.Element;
-import org.jdom.Namespace;
-import org.jdom.JDOMException;
-import org.jdom.input.SAXBuilder;
-import org.jdom.xpath.XPath;
+import org.jdom2.Document;
+import org.jdom2.Element;
+import org.jdom2.Namespace;
+import org.jdom2.JDOMException;
+import org.jdom2.input.SAXBuilder;
+import org.jdom2.xpath.XPath;
import org.xml.sax.EntityResolver;
import org.xml.sax.InputSource;
import org.xml.sax.SAXException;
@@ -356,7 +356,7 @@ public class WebContainerAuthorizer impl
}
/**
- * Returns an {@link org.jdom.Document} representing JSPWiki's web
+ * Returns an {@link org.jdom2.Document} representing JSPWiki's web
* application deployment descriptor. The document is obtained by calling
* the servlet context's <code>getResource()</code> method and requesting
* <code>/WEB-INF/web.xml</code>. For non-servlet applications, this
Modified: incubator/jspwiki/trunk/jspwiki-war/src/main/java/org/apache/wiki/filters/DefaultFilterManager.java
URL: http://svn.apache.org/viewvc/incubator/jspwiki/trunk/jspwiki-war/src/main/java/org/apache/wiki/filters/DefaultFilterManager.java?rev=1499446&r1=1499445&r2=1499446&view=diff
==============================================================================
--- incubator/jspwiki/trunk/jspwiki-war/src/main/java/org/apache/wiki/filters/DefaultFilterManager.java (original)
+++ incubator/jspwiki/trunk/jspwiki-war/src/main/java/org/apache/wiki/filters/DefaultFilterManager.java Wed Jul 3 15:42:00 2013
@@ -37,11 +37,11 @@ import org.apache.wiki.modules.ModuleMan
import org.apache.wiki.modules.WikiModuleInfo;
import org.apache.wiki.util.ClassUtil;
import org.apache.wiki.util.PriorityList;
-import org.jdom.Document;
-import org.jdom.Element;
-import org.jdom.JDOMException;
-import org.jdom.input.SAXBuilder;
-import org.jdom.xpath.XPath;
+import org.jdom2.Document;
+import org.jdom2.Element;
+import org.jdom2.JDOMException;
+import org.jdom2.input.SAXBuilder;
+import org.jdom2.xpath.XPath;
/**
Modified: incubator/jspwiki/trunk/jspwiki-war/src/main/java/org/apache/wiki/htmltowiki/HtmlStringToWikiTranslator.java
URL: http://svn.apache.org/viewvc/incubator/jspwiki/trunk/jspwiki-war/src/main/java/org/apache/wiki/htmltowiki/HtmlStringToWikiTranslator.java?rev=1499446&r1=1499445&r2=1499446&view=diff
==============================================================================
--- incubator/jspwiki/trunk/jspwiki-war/src/main/java/org/apache/wiki/htmltowiki/HtmlStringToWikiTranslator.java (original)
+++ incubator/jspwiki/trunk/jspwiki-war/src/main/java/org/apache/wiki/htmltowiki/HtmlStringToWikiTranslator.java Wed Jul 3 15:42:00 2013
@@ -21,11 +21,11 @@ package org.apache.wiki.htmltowiki;
import java.io.IOException;
import java.io.StringReader;
-import org.jdom.Document;
-import org.jdom.Element;
-import org.jdom.JDOMException;
-import org.jdom.input.SAXBuilder;
-import org.jdom.output.XMLOutputter;
+import org.jdom2.Document;
+import org.jdom2.Element;
+import org.jdom2.JDOMException;
+import org.jdom2.input.SAXBuilder;
+import org.jdom2.output.XMLOutputter;
import org.apache.wiki.WikiContext;
Modified: incubator/jspwiki/trunk/jspwiki-war/src/main/java/org/apache/wiki/htmltowiki/XHtmlElementToWikiTranslator.java
URL: http://svn.apache.org/viewvc/incubator/jspwiki/trunk/jspwiki-war/src/main/java/org/apache/wiki/htmltowiki/XHtmlElementToWikiTranslator.java?rev=1499446&r1=1499445&r2=1499446&view=diff
==============================================================================
--- incubator/jspwiki/trunk/jspwiki-war/src/main/java/org/apache/wiki/htmltowiki/XHtmlElementToWikiTranslator.java (original)
+++ incubator/jspwiki/trunk/jspwiki-war/src/main/java/org/apache/wiki/htmltowiki/XHtmlElementToWikiTranslator.java Wed Jul 3 15:42:00 2013
@@ -29,11 +29,11 @@ import java.util.LinkedHashMap;
import java.util.Map;
import org.apache.commons.lang.StringEscapeUtils;
-import org.jdom.Element;
-import org.jdom.Attribute;
-import org.jdom.JDOMException;
-import org.jdom.Text;
-import org.jdom.xpath.XPath;
+import org.jdom2.Element;
+import org.jdom2.Attribute;
+import org.jdom2.JDOMException;
+import org.jdom2.Text;
+import org.jdom2.xpath.XPath;
/**
* Converting XHtml to Wiki Markup. This is the class which does all of the heavy loading.
Modified: incubator/jspwiki/trunk/jspwiki-war/src/main/java/org/apache/wiki/modules/WikiModuleInfo.java
URL: http://svn.apache.org/viewvc/incubator/jspwiki/trunk/jspwiki-war/src/main/java/org/apache/wiki/modules/WikiModuleInfo.java?rev=1499446&r1=1499445&r2=1499446&view=diff
==============================================================================
--- incubator/jspwiki/trunk/jspwiki-war/src/main/java/org/apache/wiki/modules/WikiModuleInfo.java (original)
+++ incubator/jspwiki/trunk/jspwiki-war/src/main/java/org/apache/wiki/modules/WikiModuleInfo.java Wed Jul 3 15:42:00 2013
@@ -23,7 +23,7 @@ import java.io.ByteArrayOutputStream;
import java.io.IOException;
import java.net.URL;
-import org.jdom.Element;
+import org.jdom2.Element;
import org.apache.wiki.util.FileUtil;
Modified: incubator/jspwiki/trunk/jspwiki-war/src/main/java/org/apache/wiki/parser/JSPWikiMarkupParser.java
URL: http://svn.apache.org/viewvc/incubator/jspwiki/trunk/jspwiki-war/src/main/java/org/apache/wiki/parser/JSPWikiMarkupParser.java?rev=1499446&r1=1499445&r2=1499446&view=diff
==============================================================================
--- incubator/jspwiki/trunk/jspwiki-war/src/main/java/org/apache/wiki/parser/JSPWikiMarkupParser.java (original)
+++ incubator/jspwiki/trunk/jspwiki-war/src/main/java/org/apache/wiki/parser/JSPWikiMarkupParser.java Wed Jul 3 15:42:00 2013
@@ -45,7 +45,7 @@ import org.apache.wiki.providers.Provide
import org.apache.wiki.render.CleanTextRenderer;
import org.apache.wiki.render.RenderingManager;
import org.apache.wiki.util.TextUtil;
-import org.jdom.*;
+import org.jdom2.*;
/**
* Parses JSPWiki-style markup into a WikiDocument DOM tree. This class is the
Modified: incubator/jspwiki/trunk/jspwiki-war/src/main/java/org/apache/wiki/parser/LinkParser.java
URL: http://svn.apache.org/viewvc/incubator/jspwiki/trunk/jspwiki-war/src/main/java/org/apache/wiki/parser/LinkParser.java?rev=1499446&r1=1499445&r2=1499446&view=diff
==============================================================================
--- incubator/jspwiki/trunk/jspwiki-war/src/main/java/org/apache/wiki/parser/LinkParser.java (original)
+++ incubator/jspwiki/trunk/jspwiki-war/src/main/java/org/apache/wiki/parser/LinkParser.java Wed Jul 3 15:42:00 2013
@@ -22,7 +22,7 @@ package org.apache.wiki.parser;
import java.util.*;
import org.apache.log4j.Logger;
-import org.jdom.Attribute;
+import org.jdom2.Attribute;
/**
* Parses JSPWiki-style "augmented" link markup into a Link object
Modified: incubator/jspwiki/trunk/jspwiki-war/src/main/java/org/apache/wiki/parser/PluginContent.java
URL: http://svn.apache.org/viewvc/incubator/jspwiki/trunk/jspwiki-war/src/main/java/org/apache/wiki/parser/PluginContent.java?rev=1499446&r1=1499445&r2=1499446&view=diff
==============================================================================
--- incubator/jspwiki/trunk/jspwiki-war/src/main/java/org/apache/wiki/parser/PluginContent.java (original)
+++ incubator/jspwiki/trunk/jspwiki-war/src/main/java/org/apache/wiki/parser/PluginContent.java Wed Jul 3 15:42:00 2013
@@ -31,7 +31,7 @@ import org.apache.wiki.api.plugin.Parser
import org.apache.wiki.api.plugin.WikiPlugin;
import org.apache.wiki.preferences.Preferences;
import org.apache.wiki.render.RenderingManager;
-import org.jdom.Text;
+import org.jdom2.Text;
/**
* Stores the contents of a plugin in a WikiDocument DOM tree.
Modified: incubator/jspwiki/trunk/jspwiki-war/src/main/java/org/apache/wiki/parser/VariableContent.java
URL: http://svn.apache.org/viewvc/incubator/jspwiki/trunk/jspwiki-war/src/main/java/org/apache/wiki/parser/VariableContent.java?rev=1499446&r1=1499445&r2=1499446&view=diff
==============================================================================
--- incubator/jspwiki/trunk/jspwiki-war/src/main/java/org/apache/wiki/parser/VariableContent.java (original)
+++ incubator/jspwiki/trunk/jspwiki-war/src/main/java/org/apache/wiki/parser/VariableContent.java Wed Jul 3 15:42:00 2013
@@ -19,7 +19,7 @@
package org.apache.wiki.parser;
import org.apache.commons.lang.StringEscapeUtils;
-import org.jdom.Text;
+import org.jdom2.Text;
import org.apache.wiki.NoSuchVariableException;
import org.apache.wiki.WikiContext;
Modified: incubator/jspwiki/trunk/jspwiki-war/src/main/java/org/apache/wiki/parser/WikiDocument.java
URL: http://svn.apache.org/viewvc/incubator/jspwiki/trunk/jspwiki-war/src/main/java/org/apache/wiki/parser/WikiDocument.java?rev=1499446&r1=1499445&r2=1499446&view=diff
==============================================================================
--- incubator/jspwiki/trunk/jspwiki-war/src/main/java/org/apache/wiki/parser/WikiDocument.java (original)
+++ incubator/jspwiki/trunk/jspwiki-war/src/main/java/org/apache/wiki/parser/WikiDocument.java Wed Jul 3 15:42:00 2013
@@ -20,7 +20,7 @@ package org.apache.wiki.parser;
import java.lang.ref.WeakReference;
-import org.jdom.Document;
+import org.jdom2.Document;
import org.apache.wiki.WikiContext;
import org.apache.wiki.WikiPage;
Modified: incubator/jspwiki/trunk/jspwiki-war/src/main/java/org/apache/wiki/plugin/DefaultPluginManager.java
URL: http://svn.apache.org/viewvc/incubator/jspwiki/trunk/jspwiki-war/src/main/java/org/apache/wiki/plugin/DefaultPluginManager.java?rev=1499446&r1=1499445&r2=1499446&view=diff
==============================================================================
--- incubator/jspwiki/trunk/jspwiki-war/src/main/java/org/apache/wiki/plugin/DefaultPluginManager.java (original)
+++ incubator/jspwiki/trunk/jspwiki-war/src/main/java/org/apache/wiki/plugin/DefaultPluginManager.java Wed Jul 3 15:42:00 2013
@@ -41,11 +41,11 @@ import org.apache.wiki.preferences.Prefe
import org.apache.wiki.util.ClassUtil;
import org.apache.wiki.util.FileUtil;
import org.apache.wiki.util.TextUtil;
-import org.jdom.Document;
-import org.jdom.Element;
-import org.jdom.JDOMException;
-import org.jdom.input.SAXBuilder;
-import org.jdom.xpath.XPath;
+import org.jdom2.Document;
+import org.jdom2.Element;
+import org.jdom2.JDOMException;
+import org.jdom2.input.SAXBuilder;
+import org.jdom2.xpath.XPath;
/**
* Manages plugin classes. There exists a single instance of PluginManager
Modified: incubator/jspwiki/trunk/jspwiki-war/src/main/java/org/apache/wiki/render/CleanTextRenderer.java
URL: http://svn.apache.org/viewvc/incubator/jspwiki/trunk/jspwiki-war/src/main/java/org/apache/wiki/render/CleanTextRenderer.java?rev=1499446&r1=1499445&r2=1499446&view=diff
==============================================================================
--- incubator/jspwiki/trunk/jspwiki-war/src/main/java/org/apache/wiki/render/CleanTextRenderer.java (original)
+++ incubator/jspwiki/trunk/jspwiki-war/src/main/java/org/apache/wiki/render/CleanTextRenderer.java Wed Jul 3 15:42:00 2013
@@ -23,9 +23,9 @@ import java.util.Iterator;
import java.util.List;
import org.apache.log4j.Logger;
-import org.jdom.JDOMException;
-import org.jdom.Text;
-import org.jdom.xpath.XPath;
+import org.jdom2.JDOMException;
+import org.jdom2.Text;
+import org.jdom2.xpath.XPath;
import org.apache.wiki.WikiContext;
import org.apache.wiki.parser.WikiDocument;
Modified: incubator/jspwiki/trunk/jspwiki-war/src/main/java/org/apache/wiki/render/CreoleRenderer.java
URL: http://svn.apache.org/viewvc/incubator/jspwiki/trunk/jspwiki-war/src/main/java/org/apache/wiki/render/CreoleRenderer.java?rev=1499446&r1=1499445&r2=1499446&view=diff
==============================================================================
--- incubator/jspwiki/trunk/jspwiki-war/src/main/java/org/apache/wiki/render/CreoleRenderer.java (original)
+++ incubator/jspwiki/trunk/jspwiki-war/src/main/java/org/apache/wiki/render/CreoleRenderer.java Wed Jul 3 15:42:00 2013
@@ -23,9 +23,9 @@ import java.util.ArrayList;
import java.util.Iterator;
import java.util.List;
-import org.jdom.Content;
-import org.jdom.Element;
-import org.jdom.Text;
+import org.jdom2.Content;
+import org.jdom2.Element;
+import org.jdom2.Text;
import org.apache.wiki.WikiContext;
import org.apache.wiki.parser.PluginContent;
Added: incubator/jspwiki/trunk/jspwiki-war/src/main/java/org/apache/wiki/render/CustomXMLOutputProcessor.java
URL: http://svn.apache.org/viewvc/incubator/jspwiki/trunk/jspwiki-war/src/main/java/org/apache/wiki/render/CustomXMLOutputProcessor.java?rev=1499446&view=auto
==============================================================================
--- incubator/jspwiki/trunk/jspwiki-war/src/main/java/org/apache/wiki/render/CustomXMLOutputProcessor.java (added)
+++ incubator/jspwiki/trunk/jspwiki-war/src/main/java/org/apache/wiki/render/CustomXMLOutputProcessor.java Wed Jul 3 15:42:00 2013
@@ -0,0 +1,43 @@
+/*
+ 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.
+ */
+package org.apache.wiki.render;
+
+import org.jdom2.output.Format;
+import org.jdom2.output.support.AbstractXMLOutputProcessor;
+import org.jdom2.output.support.FormatStack;
+
+import java.io.IOException;
+import java.io.Writer;
+
+/**
+ * Override added to ensure attribute values including ampersands and quotes still get escaped even if
+ * disable-output-escaping processing instruction (meant to keep rest of HTML string as-is) set.
+ *
+ * @since 2.10
+ */
+public class CustomXMLOutputProcessor extends AbstractXMLOutputProcessor {
+
+ protected void attributeEscapedEntitiesFilter(final Writer out,
+ final FormatStack fstack, final String value) throws IOException {
+
+ write(out, Format.escapeAttribute(fstack.getEscapeStrategy(), value));
+
+ }
+
+}
Modified: incubator/jspwiki/trunk/jspwiki-war/src/main/java/org/apache/wiki/render/WysiwygEditingRenderer.java
URL: http://svn.apache.org/viewvc/incubator/jspwiki/trunk/jspwiki-war/src/main/java/org/apache/wiki/render/WysiwygEditingRenderer.java?rev=1499446&r1=1499445&r2=1499446&view=diff
==============================================================================
--- incubator/jspwiki/trunk/jspwiki-war/src/main/java/org/apache/wiki/render/WysiwygEditingRenderer.java (original)
+++ incubator/jspwiki/trunk/jspwiki-war/src/main/java/org/apache/wiki/render/WysiwygEditingRenderer.java Wed Jul 3 15:42:00 2013
@@ -22,10 +22,10 @@ import java.io.IOException;
import java.io.StringWriter;
import java.util.Iterator;
-import org.jdom.Attribute;
-import org.jdom.Element;
-import org.jdom.output.Format;
-import org.jdom.output.XMLOutputter;
+import org.jdom2.Attribute;
+import org.jdom2.Element;
+import org.jdom2.output.Format;
+import org.jdom2.output.XMLOutputter;
import org.apache.wiki.WikiContext;
import org.apache.wiki.htmltowiki.XHtmlToWikiConfig;
Modified: incubator/jspwiki/trunk/jspwiki-war/src/main/java/org/apache/wiki/render/XHTMLRenderer.java
URL: http://svn.apache.org/viewvc/incubator/jspwiki/trunk/jspwiki-war/src/main/java/org/apache/wiki/render/XHTMLRenderer.java?rev=1499446&r1=1499445&r2=1499446&view=diff
==============================================================================
--- incubator/jspwiki/trunk/jspwiki-war/src/main/java/org/apache/wiki/render/XHTMLRenderer.java (original)
+++ incubator/jspwiki/trunk/jspwiki-war/src/main/java/org/apache/wiki/render/XHTMLRenderer.java Wed Jul 3 15:42:00 2013
@@ -21,8 +21,8 @@ package org.apache.wiki.render;
import java.io.IOException;
import java.io.StringWriter;
-import org.jdom.output.Format;
-import org.jdom.output.XMLOutputter;
+import org.jdom2.output.Format;
+import org.jdom2.output.XMLOutputter;
import org.apache.wiki.WikiContext;
import org.apache.wiki.parser.WikiDocument;
@@ -58,7 +58,8 @@ public class XHTMLRenderer
{
m_document.setContext( m_context );
- XMLOutputter output = new XMLOutputter();
+ CustomXMLOutputProcessor processor = new CustomXMLOutputProcessor();
+ XMLOutputter output = new XMLOutputter(processor);
StringWriter out = new StringWriter();
@@ -69,6 +70,7 @@ public class XHTMLRenderer
output.setFormat( fmt );
output.outputElementContent( m_document.getRootElement(), out );
- return out.toString();
+ String result = out.toString();
+ return result;
}
}
Modified: incubator/jspwiki/trunk/jspwiki-war/src/main/java/org/apache/wiki/rss/AtomFeed.java
URL: http://svn.apache.org/viewvc/incubator/jspwiki/trunk/jspwiki-war/src/main/java/org/apache/wiki/rss/AtomFeed.java?rev=1499446&r1=1499445&r2=1499446&view=diff
==============================================================================
--- incubator/jspwiki/trunk/jspwiki-war/src/main/java/org/apache/wiki/rss/AtomFeed.java (original)
+++ incubator/jspwiki/trunk/jspwiki-war/src/main/java/org/apache/wiki/rss/AtomFeed.java Wed Jul 3 15:42:00 2013
@@ -28,10 +28,10 @@ import java.util.Iterator;
import javax.servlet.ServletContext;
import org.apache.commons.lang.time.DateFormatUtils;
-import org.jdom.Element;
-import org.jdom.Namespace;
-import org.jdom.output.Format;
-import org.jdom.output.XMLOutputter;
+import org.jdom2.Element;
+import org.jdom2.Namespace;
+import org.jdom2.output.Format;
+import org.jdom2.output.XMLOutputter;
import org.apache.wiki.Release;
import org.apache.wiki.WikiContext;
Modified: incubator/jspwiki/trunk/jspwiki-war/src/main/java/org/apache/wiki/rss/RSS20Feed.java
URL: http://svn.apache.org/viewvc/incubator/jspwiki/trunk/jspwiki-war/src/main/java/org/apache/wiki/rss/RSS20Feed.java?rev=1499446&r1=1499445&r2=1499446&view=diff
==============================================================================
--- incubator/jspwiki/trunk/jspwiki-war/src/main/java/org/apache/wiki/rss/RSS20Feed.java (original)
+++ incubator/jspwiki/trunk/jspwiki-war/src/main/java/org/apache/wiki/rss/RSS20Feed.java Wed Jul 3 15:42:00 2013
@@ -25,9 +25,9 @@ import java.util.*;
import javax.servlet.ServletContext;
-import org.jdom.Element;
-import org.jdom.output.Format;
-import org.jdom.output.XMLOutputter;
+import org.jdom2.Element;
+import org.jdom2.output.Format;
+import org.jdom2.output.XMLOutputter;
import org.apache.wiki.Release;
import org.apache.wiki.WikiContext;
Modified: incubator/jspwiki/trunk/jspwiki-war/src/main/java/org/apache/wiki/ui/EditorManager.java
URL: http://svn.apache.org/viewvc/incubator/jspwiki/trunk/jspwiki-war/src/main/java/org/apache/wiki/ui/EditorManager.java?rev=1499446&r1=1499445&r2=1499446&view=diff
==============================================================================
--- incubator/jspwiki/trunk/jspwiki-war/src/main/java/org/apache/wiki/ui/EditorManager.java (original)
+++ incubator/jspwiki/trunk/jspwiki-war/src/main/java/org/apache/wiki/ui/EditorManager.java Wed Jul 3 15:42:00 2013
@@ -24,11 +24,11 @@ import java.util.*;
import javax.servlet.jsp.PageContext;
import org.apache.log4j.Logger;
-import org.jdom.Document;
-import org.jdom.Element;
-import org.jdom.JDOMException;
-import org.jdom.input.SAXBuilder;
-import org.jdom.xpath.XPath;
+import org.jdom2.Document;
+import org.jdom2.Element;
+import org.jdom2.JDOMException;
+import org.jdom2.input.SAXBuilder;
+import org.jdom2.xpath.XPath;
import org.apache.wiki.NoSuchVariableException;
import org.apache.wiki.WikiContext;
Modified: incubator/jspwiki/trunk/jspwiki-war/src/main/java/org/apache/wiki/util/ClassUtil.java
URL: http://svn.apache.org/viewvc/incubator/jspwiki/trunk/jspwiki-war/src/main/java/org/apache/wiki/util/ClassUtil.java?rev=1499446&r1=1499445&r2=1499446&view=diff
==============================================================================
--- incubator/jspwiki/trunk/jspwiki-war/src/main/java/org/apache/wiki/util/ClassUtil.java (original)
+++ incubator/jspwiki/trunk/jspwiki-war/src/main/java/org/apache/wiki/util/ClassUtil.java Wed Jul 3 15:42:00 2013
@@ -33,10 +33,10 @@ import org.apache.commons.io.FileUtils;
import org.apache.commons.lang.StringUtils;
import org.apache.log4j.Logger;
import org.apache.wiki.api.exceptions.WikiException;
-import org.jdom.Document;
-import org.jdom.Element;
-import org.jdom.input.SAXBuilder;
-import org.jdom.xpath.XPath;
+import org.jdom2.Document;
+import org.jdom2.Element;
+import org.jdom2.input.SAXBuilder;
+import org.jdom2.xpath.XPath;
/**
* Contains useful utilities for class file manipulation. This is a static class,
Modified: incubator/jspwiki/trunk/jspwiki-war/src/test/java/org/apache/wiki/auth/authorize/WebContainerAuthorizerTest.java
URL: http://svn.apache.org/viewvc/incubator/jspwiki/trunk/jspwiki-war/src/test/java/org/apache/wiki/auth/authorize/WebContainerAuthorizerTest.java?rev=1499446&r1=1499445&r2=1499446&view=diff
==============================================================================
--- incubator/jspwiki/trunk/jspwiki-war/src/test/java/org/apache/wiki/auth/authorize/WebContainerAuthorizerTest.java (original)
+++ incubator/jspwiki/trunk/jspwiki-war/src/test/java/org/apache/wiki/auth/authorize/WebContainerAuthorizerTest.java Wed Jul 3 15:42:00 2013
@@ -26,7 +26,7 @@ import junit.framework.TestCase;
import junit.framework.TestSuite;
import org.apache.commons.lang.ArrayUtils;
-import org.jdom.Document;
+import org.jdom2.Document;
import org.apache.wiki.TestEngine;
import org.apache.wiki.WikiEngine;
Modified: incubator/jspwiki/trunk/mvn_cheat-sheet.txt
URL: http://svn.apache.org/viewvc/incubator/jspwiki/trunk/mvn_cheat-sheet.txt?rev=1499446&r1=1499445&r2=1499446&view=diff
==============================================================================
--- incubator/jspwiki/trunk/mvn_cheat-sheet.txt (original)
+++ incubator/jspwiki/trunk/mvn_cheat-sheet.txt Wed Jul 3 15:42:00 2013
@@ -6,8 +6,13 @@ mvn idea:idea : generates IDEA Int
Build specific
**************
mvn clean install : performs a build
-mvn clean install -Dmaven.skip.test : performs a build, skipping the tests (not recommended)
+mvn clean install -Dmaven.test.skip : performs a build, skipping the tests (not recommended)
mvn clean test : compiles the source and executes the tests
+mvn test -Dtest=JSPWikiMarkupParserTest : run just a single test class
+mvn test -Dtest=JSPWikiMarkupParserTest#testHeadingHyperlinks3 : run just a single test within a test class
+mvn test -Dtest=TestClassName#methodName -Dmaven.surefire.debug : debug a test in Eclipse or IDEA to see why it's failing
+ (see http://www.jroller.com/gmazza/entry/jpa_and_junit#debugging)
+
mvn tomcat7:run-war : (from a war module) starts JSPWiki on a
Tomcat7 instance at http://localhost:8080/JSPWiki
mvn clean deploy -Papache-release -Dgpg.passphrase=<passphrase> : deploys generated artifact to a repository
@@ -15,6 +20,7 @@ mvn clean deploy -Papache-release -Dgpg.
running
mvn clean install -Pintegration-tests : performs a build, enabling Selenium tests execution
+
Reports specific
****************
mvn apache-rat:check : creates an Apache RAT report. See:
Modified: incubator/jspwiki/trunk/pom.xml
URL: http://svn.apache.org/viewvc/incubator/jspwiki/trunk/pom.xml?rev=1499446&r1=1499445&r2=1499446&view=diff
==============================================================================
--- incubator/jspwiki/trunk/pom.xml (original)
+++ incubator/jspwiki/trunk/pom.xml Wed Jul 3 15:42:00 2013
@@ -107,20 +107,14 @@
<dependency>
<groupId>org.jdom</groupId>
- <artifactId>jdom</artifactId>
- <version>1.1.2</version>
+ <artifactId>jdom2</artifactId>
+ <version>2.0.5</version>
</dependency>
- <!-- Jaxen has to be specified, else jdom above brings in
- jaxen:1.1.3, which uses older Maven 1.x cobertura
- and findbugs deps no longer available in Central
- TODO: Upgrade to org.jdom:jdom2:2.0.5 which uses
- Jaxen 1.1.4 by default.
- -->
- <dependency>
- <groupId>jaxen</groupId>
- <artifactId>jaxen</artifactId>
- <version>1.1.4</version>
+ <dependency>
+ <groupId>jaxen</groupId>
+ <artifactId>jaxen</artifactId>
+ <version>1.1.4</version>
</dependency>
<dependency>
@@ -199,7 +193,7 @@
<dependency>
<groupId>junit</groupId>
<artifactId>junit</artifactId>
- <version>3.8.2</version>
+ <version>4.11</version>
<scope>test</scope>
</dependency>
@@ -322,6 +316,16 @@
</plugin>
<plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-idea-plugin</artifactId>
+ <version>2.2</version>
+ <configuration>
+ <downloadSources>true</downloadSources>
+ <downloadJavadocs>true</downloadJavadocs>
+ </configuration>
+ </plugin>
+
+ <plugin>
<artifactId>maven-enforcer-plugin</artifactId>
<version>1.2</version>
<configuration>