You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@jspwiki.apache.org by ju...@apache.org on 2020/01/03 09:03:21 UTC
[jspwiki] 12/18: Renamed WikiVariableManager to
DefaultVariableManager and moved it, along with VariableManager,
to their own package under org.apache.wiki.variables
This is an automated email from the ASF dual-hosted git repository.
juanpablo pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/jspwiki.git
commit d858bd8e69af32e2852a916657c8dfcda288d334
Author: juanpablo <ju...@apache.org>
AuthorDate: Thu Jan 2 23:56:07 2020 +0100
Renamed WikiVariableManager to DefaultVariableManager and moved it, along with VariableManager, to their own package under org.apache.wiki.variables
---
jspwiki-main/src/main/java/org/apache/wiki/WikiEngine.java | 3 ++-
.../DefaultVariableManager.java} | 13 +++++++++----
.../org/apache/wiki/{ => variables}/VariableManager.java | 3 ++-
jspwiki-main/src/main/resources/ini/classmappings.xml | 8 ++++----
.../DefaultVariableManagerTest.java} | 11 +++++++----
5 files changed, 24 insertions(+), 14 deletions(-)
diff --git a/jspwiki-main/src/main/java/org/apache/wiki/WikiEngine.java b/jspwiki-main/src/main/java/org/apache/wiki/WikiEngine.java
index 227ec74..e8a322c 100644
--- a/jspwiki-main/src/main/java/org/apache/wiki/WikiEngine.java
+++ b/jspwiki-main/src/main/java/org/apache/wiki/WikiEngine.java
@@ -62,6 +62,7 @@ import org.apache.wiki.url.URLConstructor;
import org.apache.wiki.util.ClassUtil;
import org.apache.wiki.util.PropertyReader;
import org.apache.wiki.util.TextUtil;
+import org.apache.wiki.variables.VariableManager;
import org.apache.wiki.workflow.Decision;
import org.apache.wiki.workflow.DecisionRequiredException;
import org.apache.wiki.workflow.Fact;
@@ -202,7 +203,7 @@ public class WikiEngine {
private PluginManager m_pluginManager;
/** Stores the Variable manager */
- private VariableManager m_variableManager;
+ private VariableManager m_variableManager;
/** Stores the Attachment manager */
private AttachmentManager m_attachmentManager = null;
diff --git a/jspwiki-main/src/main/java/org/apache/wiki/WikiVariableManager.java b/jspwiki-main/src/main/java/org/apache/wiki/variables/DefaultVariableManager.java
similarity index 97%
rename from jspwiki-main/src/main/java/org/apache/wiki/WikiVariableManager.java
rename to jspwiki-main/src/main/java/org/apache/wiki/variables/DefaultVariableManager.java
index fad2226..171760d 100644
--- a/jspwiki-main/src/main/java/org/apache/wiki/WikiVariableManager.java
+++ b/jspwiki-main/src/main/java/org/apache/wiki/variables/DefaultVariableManager.java
@@ -16,9 +16,14 @@
specific language governing permissions and limitations
under the License.
*/
-package org.apache.wiki;
+package org.apache.wiki.variables;
import org.apache.log4j.Logger;
+import org.apache.wiki.Release;
+import org.apache.wiki.WikiContext;
+import org.apache.wiki.WikiPage;
+import org.apache.wiki.WikiProvider;
+import org.apache.wiki.WikiSession;
import org.apache.wiki.api.engine.FilterManager;
import org.apache.wiki.api.exceptions.NoSuchVariableException;
import org.apache.wiki.api.filters.PageFilter;
@@ -42,9 +47,9 @@ import java.util.ResourceBundle;
*
* @since 1.9.20.
*/
-public class WikiVariableManager implements VariableManager {
+public class DefaultVariableManager implements VariableManager {
- private static final Logger log = Logger.getLogger( WikiVariableManager.class );
+ private static final Logger log = Logger.getLogger( DefaultVariableManager.class );
/**
* Contains a list of those properties that shall never be shown. Put names here in lower case.
@@ -57,7 +62,7 @@ public class WikiVariableManager implements VariableManager {
* Creates a VariableManager object using the property list given.
* @param props The properties.
*/
- public WikiVariableManager( final Properties props ) {
+ public DefaultVariableManager( final Properties props ) {
}
/**
diff --git a/jspwiki-main/src/main/java/org/apache/wiki/VariableManager.java b/jspwiki-main/src/main/java/org/apache/wiki/variables/VariableManager.java
similarity index 98%
rename from jspwiki-main/src/main/java/org/apache/wiki/VariableManager.java
rename to jspwiki-main/src/main/java/org/apache/wiki/variables/VariableManager.java
index dda06a6..043c395 100644
--- a/jspwiki-main/src/main/java/org/apache/wiki/VariableManager.java
+++ b/jspwiki-main/src/main/java/org/apache/wiki/variables/VariableManager.java
@@ -16,8 +16,9 @@
specific language governing permissions and limitations
under the License.
*/
-package org.apache.wiki;
+package org.apache.wiki.variables;
+import org.apache.wiki.WikiContext;
import org.apache.wiki.api.exceptions.NoSuchVariableException;
import org.apache.wiki.parser.LinkParsingOperations;
diff --git a/jspwiki-main/src/main/resources/ini/classmappings.xml b/jspwiki-main/src/main/resources/ini/classmappings.xml
index dbd3cdb..c2fbecf 100644
--- a/jspwiki-main/src/main/resources/ini/classmappings.xml
+++ b/jspwiki-main/src/main/resources/ini/classmappings.xml
@@ -52,10 +52,6 @@
<mappedClass>org.apache.wiki.pages.DefaultPageManager</mappedClass>
</mapping>
<mapping>
- <requestedClass>org.apache.wiki.VariableManager</requestedClass>
- <mappedClass>org.apache.wiki.WikiVariableManager</mappedClass>
- </mapping>
- <mapping>
<requestedClass>org.apache.wiki.api.engine.FilterManager</requestedClass>
<mappedClass>org.apache.wiki.filters.DefaultFilterManager</mappedClass>
</mapping>
@@ -128,6 +124,10 @@
<mappedClass>org.apache.wiki.ui.TemplateManager</mappedClass>
</mapping>
<mapping>
+ <requestedClass>org.apache.wiki.variables.VariableManager</requestedClass>
+ <mappedClass>org.apache.wiki.variables.DefaultVariableManager</mappedClass>
+ </mapping>
+ <mapping>
<requestedClass>org.apache.wiki.workflow.WorkflowManager</requestedClass>
<mappedClass>org.apache.wiki.workflow.WorkflowManager</mappedClass>
</mapping>
diff --git a/jspwiki-main/src/test/java/org/apache/wiki/WikiVariableManagerTest.java b/jspwiki-main/src/test/java/org/apache/wiki/variables/DefaultVariableManagerTest.java
similarity index 92%
rename from jspwiki-main/src/test/java/org/apache/wiki/WikiVariableManagerTest.java
rename to jspwiki-main/src/test/java/org/apache/wiki/variables/DefaultVariableManagerTest.java
index 86f8259..63a4826 100644
--- a/jspwiki-main/src/test/java/org/apache/wiki/WikiVariableManagerTest.java
+++ b/jspwiki-main/src/test/java/org/apache/wiki/variables/DefaultVariableManagerTest.java
@@ -17,25 +17,28 @@
under the License.
*/
-package org.apache.wiki;
+package org.apache.wiki.variables;
+import org.apache.wiki.TestEngine;
+import org.apache.wiki.WikiContext;
+import org.apache.wiki.WikiPage;
import org.apache.wiki.api.exceptions.NoSuchVariableException;
import org.junit.jupiter.api.Assertions;
import org.junit.jupiter.api.BeforeAll;
import org.junit.jupiter.api.Test;
-public class WikiVariableManagerTest {
+public class DefaultVariableManagerTest {
static VariableManager m_variableManager;
- static WikiContext m_context;
+ static WikiContext m_context;
static final String PAGE_NAME = "TestPage";
@BeforeAll
public static void setUp() {
final TestEngine testEngine = TestEngine.build();
- m_variableManager = new WikiVariableManager( TestEngine.getTestProperties() );
+ m_variableManager = new DefaultVariableManager( TestEngine.getTestProperties() );
m_context = new WikiContext( testEngine, new WikiPage( testEngine, PAGE_NAME ) );
}