Author: juanpablo
Date: Tue Dec 3 22:26:18 2013
New Revision: 1547616
URL: http://svn.apache.org/r1547616
Log:
* moved o.a.w.NoSuchVariableException to
o.a.w.api.exceptions.NoSuchVariableException
Added:
jspwiki/trunk/jspwiki-war/src/main/java/org/apache/wiki/api/exceptions/NoSuchVariableException.java
- copied, changed from r1546194,
jspwiki/trunk/jspwiki-war/src/main/java/org/apache/wiki/NoSuchVariableException.java
Removed:
jspwiki/trunk/jspwiki-war/src/main/java/org/apache/wiki/NoSuchVariableException.java
Modified:
jspwiki/trunk/jspwiki-war/src/main/java/org/apache/wiki/Release.java
jspwiki/trunk/jspwiki-war/src/main/java/org/apache/wiki/VariableManager.java
jspwiki/trunk/jspwiki-war/src/main/java/org/apache/wiki/WikiEngine.java
jspwiki/trunk/jspwiki-war/src/main/java/org/apache/wiki/parser/VariableContent.java
jspwiki/trunk/jspwiki-war/src/main/java/org/apache/wiki/tags/VariableTag.java
jspwiki/trunk/jspwiki-war/src/main/java/org/apache/wiki/ui/EditorManager.java
jspwiki/trunk/jspwiki-war/src/main/java/org/apache/wiki/util/BlogUtil.java
jspwiki/trunk/jspwiki-war/src/test/java/org/apache/wiki/VariableManagerTest.java
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=1547616&r1=1547615&r2=1547616&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 Tue
Dec 3 22:26:18 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 = "51";
+ public static final String BUILD = "52";
/**
* This is the generic version string you should use
Modified:
jspwiki/trunk/jspwiki-war/src/main/java/org/apache/wiki/VariableManager.java
URL:
http://svn.apache.org/viewvc/jspwiki/trunk/jspwiki-war/src/main/java/org/apache/wiki/VariableManager.java?rev=1547616&r1=1547615&r2=1547616&view=diff
==============================================================================
---
jspwiki/trunk/jspwiki-war/src/main/java/org/apache/wiki/VariableManager.java
(original)
+++
jspwiki/trunk/jspwiki-war/src/main/java/org/apache/wiki/VariableManager.java
Tue Dec 3 22:26:18 2013
@@ -27,6 +27,7 @@ import javax.servlet.http.HttpSession;
import org.apache.log4j.Logger;
import org.apache.wiki.api.engine.FilterManager;
+import org.apache.wiki.api.exceptions.NoSuchVariableException;
import org.apache.wiki.api.filters.PageFilter;
import org.apache.wiki.i18n.InternationalizationManager;
import org.apache.wiki.modules.InternalModule;
Modified:
jspwiki/trunk/jspwiki-war/src/main/java/org/apache/wiki/WikiEngine.java
URL:
http://svn.apache.org/viewvc/jspwiki/trunk/jspwiki-war/src/main/java/org/apache/wiki/WikiEngine.java?rev=1547616&r1=1547615&r2=1547616&view=diff
==============================================================================
--- jspwiki/trunk/jspwiki-war/src/main/java/org/apache/wiki/WikiEngine.java
(original)
+++ jspwiki/trunk/jspwiki-war/src/main/java/org/apache/wiki/WikiEngine.java Tue
Dec 3 22:26:18 2013
@@ -38,6 +38,7 @@ import org.apache.wiki.api.engine.Filter
import org.apache.wiki.api.engine.PluginManager;
import org.apache.wiki.api.exceptions.FilterException;
import org.apache.wiki.api.exceptions.NoRequiredPropertyException;
+import org.apache.wiki.api.exceptions.NoSuchVariableException;
import org.apache.wiki.api.exceptions.WikiException;
import org.apache.wiki.attachment.Attachment;
import org.apache.wiki.attachment.AttachmentManager;
Copied:
jspwiki/trunk/jspwiki-war/src/main/java/org/apache/wiki/api/exceptions/NoSuchVariableException.java
(from r1546194,
jspwiki/trunk/jspwiki-war/src/main/java/org/apache/wiki/NoSuchVariableException.java)
URL:
http://svn.apache.org/viewvc/jspwiki/trunk/jspwiki-war/src/main/java/org/apache/wiki/api/exceptions/NoSuchVariableException.java?p2=jspwiki/trunk/jspwiki-war/src/main/java/org/apache/wiki/api/exceptions/NoSuchVariableException.java&p1=jspwiki/trunk/jspwiki-war/src/main/java/org/apache/wiki/NoSuchVariableException.java&r1=1546194&r2=1547616&rev=1547616&view=diff
==============================================================================
---
jspwiki/trunk/jspwiki-war/src/main/java/org/apache/wiki/NoSuchVariableException.java
(original)
+++
jspwiki/trunk/jspwiki-war/src/main/java/org/apache/wiki/api/exceptions/NoSuchVariableException.java
Tue Dec 3 22:26:18 2013
@@ -16,16 +16,15 @@
specific language governing permissions and limitations
under the License.
*/
-package org.apache.wiki;
+package org.apache.wiki.api.exceptions;
+
-import org.apache.wiki.api.exceptions.WikiException;
/**
* Marks that no such variable was located.
*/
-public class NoSuchVariableException
- extends WikiException
-{
+public class NoSuchVariableException extends WikiException {
+
private static final long serialVersionUID = 1L;
/**
@@ -33,8 +32,8 @@ public class NoSuchVariableException
*
* @param msg Message to show
*/
- public NoSuchVariableException( String msg )
- {
- super(msg);
+ public NoSuchVariableException( String msg ) {
+ super( msg );
}
+
}
Modified:
jspwiki/trunk/jspwiki-war/src/main/java/org/apache/wiki/parser/VariableContent.java
URL:
http://svn.apache.org/viewvc/jspwiki/trunk/jspwiki-war/src/main/java/org/apache/wiki/parser/VariableContent.java?rev=1547616&r1=1547615&r2=1547616&view=diff
==============================================================================
---
jspwiki/trunk/jspwiki-war/src/main/java/org/apache/wiki/parser/VariableContent.java
(original)
+++
jspwiki/trunk/jspwiki-war/src/main/java/org/apache/wiki/parser/VariableContent.java
Tue Dec 3 22:26:18 2013
@@ -20,9 +20,8 @@ package org.apache.wiki.parser;
import org.apache.commons.lang.StringEscapeUtils;
import org.jdom2.Text;
-
-import org.apache.wiki.NoSuchVariableException;
import org.apache.wiki.WikiContext;
+import org.apache.wiki.api.exceptions.NoSuchVariableException;
import org.apache.wiki.render.RenderingManager;
/**
Modified:
jspwiki/trunk/jspwiki-war/src/main/java/org/apache/wiki/tags/VariableTag.java
URL:
http://svn.apache.org/viewvc/jspwiki/trunk/jspwiki-war/src/main/java/org/apache/wiki/tags/VariableTag.java?rev=1547616&r1=1547615&r2=1547616&view=diff
==============================================================================
---
jspwiki/trunk/jspwiki-war/src/main/java/org/apache/wiki/tags/VariableTag.java
(original)
+++
jspwiki/trunk/jspwiki-war/src/main/java/org/apache/wiki/tags/VariableTag.java
Tue Dec 3 22:26:18 2013
@@ -19,11 +19,12 @@
package org.apache.wiki.tags;
import java.io.IOException;
+
import javax.servlet.jsp.JspWriter;
import javax.servlet.jsp.JspException;
import org.apache.wiki.WikiEngine;
-import org.apache.wiki.NoSuchVariableException;
+import org.apache.wiki.api.exceptions.NoSuchVariableException;
import org.apache.wiki.util.TextUtil;
/**
Modified:
jspwiki/trunk/jspwiki-war/src/main/java/org/apache/wiki/ui/EditorManager.java
URL:
http://svn.apache.org/viewvc/jspwiki/trunk/jspwiki-war/src/main/java/org/apache/wiki/ui/EditorManager.java?rev=1547616&r1=1547615&r2=1547616&view=diff
==============================================================================
---
jspwiki/trunk/jspwiki-war/src/main/java/org/apache/wiki/ui/EditorManager.java
(original)
+++
jspwiki/trunk/jspwiki-war/src/main/java/org/apache/wiki/ui/EditorManager.java
Tue Dec 3 22:26:18 2013
@@ -29,10 +29,9 @@ 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;
import org.apache.wiki.WikiEngine;
+import org.apache.wiki.api.exceptions.NoSuchVariableException;
import org.apache.wiki.modules.ModuleManager;
import org.apache.wiki.modules.WikiModuleInfo;
import org.apache.wiki.plugin.DefaultPluginManager;
Modified:
jspwiki/trunk/jspwiki-war/src/main/java/org/apache/wiki/util/BlogUtil.java
URL:
http://svn.apache.org/viewvc/jspwiki/trunk/jspwiki-war/src/main/java/org/apache/wiki/util/BlogUtil.java?rev=1547616&r1=1547615&r2=1547616&view=diff
==============================================================================
--- jspwiki/trunk/jspwiki-war/src/main/java/org/apache/wiki/util/BlogUtil.java
(original)
+++ jspwiki/trunk/jspwiki-war/src/main/java/org/apache/wiki/util/BlogUtil.java
Tue Dec 3 22:26:18 2013
@@ -18,9 +18,9 @@
*/
package org.apache.wiki.util;
-import org.apache.wiki.NoSuchVariableException;
import org.apache.wiki.WikiContext;
import org.apache.wiki.WikiEngine;
+import org.apache.wiki.api.exceptions.NoSuchVariableException;
/**
Modified:
jspwiki/trunk/jspwiki-war/src/test/java/org/apache/wiki/VariableManagerTest.java
URL:
http://svn.apache.org/viewvc/jspwiki/trunk/jspwiki-war/src/test/java/org/apache/wiki/VariableManagerTest.java?rev=1547616&r1=1547615&r2=1547616&view=diff
==============================================================================
---
jspwiki/trunk/jspwiki-war/src/test/java/org/apache/wiki/VariableManagerTest.java
(original)
+++
jspwiki/trunk/jspwiki-war/src/test/java/org/apache/wiki/VariableManagerTest.java
Tue Dec 3 22:26:18 2013
@@ -20,9 +20,12 @@
package org.apache.wiki;
import junit.framework.*;
+
import java.io.*;
import java.util.*;
+
import org.apache.log4j.*;
+import org.apache.wiki.api.exceptions.NoSuchVariableException;
public class VariableManagerTest extends TestCase
{
