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 2013/01/09 20:37:11 UTC
svn commit: r1431026 - in /incubator/jspwiki/trunk: ./ doc/ etc/ini/
src/org/apache/wiki/ src/org/apache/wiki/api/
src/org/apache/wiki/api/engine/ src/org/apache/wiki/api/exceptions/
src/org/apache/wiki/api/filters/ src/org/apache/wiki/api/plugin/ src/...
Author: juanpablo
Date: Wed Jan 9 19:37:10 2013
New Revision: 1431026
URL: http://svn.apache.org/viewvc?rev=1431026&view=rev
Log:
* deprecated WikiEngine.getRequiredProperty( props, key ) in favour of
TextUtil.getRequiredProperty( props, key ). The former will be deleted in 2.10 scope
* new API package org.apache.wiki.api.engine, intended to hold WikiEngine, its managers and
related classes. FilterManager and PluginManager moved there (cfr. JSPWIKI-155, JSPWIKI-303
and $SVN/trunk/doc/2.10-API.txt).
Added:
incubator/jspwiki/trunk/doc/2.10-API.txt
incubator/jspwiki/trunk/src/org/apache/wiki/api/engine/
incubator/jspwiki/trunk/src/org/apache/wiki/api/engine/FilterManager.java
- copied, changed from r1431004, incubator/jspwiki/trunk/src/org/apache/wiki/api/filters/FilterManager.java
incubator/jspwiki/trunk/src/org/apache/wiki/api/engine/PluginManager.java
- copied, changed from r1431004, incubator/jspwiki/trunk/src/org/apache/wiki/api/plugin/PluginManager.java
incubator/jspwiki/trunk/src/org/apache/wiki/api/engine/package.html
incubator/jspwiki/trunk/src/org/apache/wiki/api/exceptions/package.html
incubator/jspwiki/trunk/src/org/apache/wiki/api/filters/package.html
incubator/jspwiki/trunk/src/org/apache/wiki/api/package.html
incubator/jspwiki/trunk/src/org/apache/wiki/api/plugin/package.html
Removed:
incubator/jspwiki/trunk/src/org/apache/wiki/api/filters/FilterManager.java
incubator/jspwiki/trunk/src/org/apache/wiki/api/plugin/PluginManager.java
Modified:
incubator/jspwiki/trunk/UPGRADING
incubator/jspwiki/trunk/etc/ini/classmappings.xml
incubator/jspwiki/trunk/src/org/apache/wiki/PageManager.java
incubator/jspwiki/trunk/src/org/apache/wiki/VariableManager.java
incubator/jspwiki/trunk/src/org/apache/wiki/WikiEngine.java
incubator/jspwiki/trunk/src/org/apache/wiki/auth/UserManager.java
incubator/jspwiki/trunk/src/org/apache/wiki/event/WikiEventUtils.java
incubator/jspwiki/trunk/src/org/apache/wiki/filters/DefaultFilterManager.java
incubator/jspwiki/trunk/src/org/apache/wiki/forms/FormOutput.java
incubator/jspwiki/trunk/src/org/apache/wiki/parser/JSPWikiMarkupParser.java
incubator/jspwiki/trunk/src/org/apache/wiki/parser/PluginContent.java
incubator/jspwiki/trunk/src/org/apache/wiki/plugin/DefaultPluginManager.java
incubator/jspwiki/trunk/src/org/apache/wiki/plugin/TableOfContents.java
incubator/jspwiki/trunk/src/org/apache/wiki/tags/PluginTag.java
incubator/jspwiki/trunk/src/org/apache/wiki/ui/admin/AdminBeanManager.java
incubator/jspwiki/trunk/src/org/apache/wiki/ui/admin/beans/PluginBean.java
incubator/jspwiki/trunk/tests/org/apache/wiki/filters/DefaultFilterManagerTest.java
incubator/jspwiki/trunk/tests/org/apache/wiki/plugin/PageViewPluginTest.java
incubator/jspwiki/trunk/tests/org/apache/wiki/plugin/ReferringPagesPluginTest.java
incubator/jspwiki/trunk/tests/org/apache/wiki/plugin/UndefinedPagesPluginTest.java
incubator/jspwiki/trunk/tests/org/apache/wiki/providers/BasicAttachmentProviderTest.java
incubator/jspwiki/trunk/tests/org/apache/wiki/workflow/ApprovalWorkflowTest.java
Modified: incubator/jspwiki/trunk/UPGRADING
URL: http://svn.apache.org/viewvc/incubator/jspwiki/trunk/UPGRADING?rev=1431026&r1=1431025&r2=1431026&view=diff
==============================================================================
--- incubator/jspwiki/trunk/UPGRADING (original)
+++ incubator/jspwiki/trunk/UPGRADING Wed Jan 9 19:37:10 2013
@@ -38,71 +38,8 @@ shouldn't affect your custom plugins.
2. JSPWiki API
-The package org.apache.wiki.api aims to provide an API to give access to JSPWiki internals.
-
-Classes affected:
-@Deprecated
- -> all classes / methods anotated with @Deprecated because of the API changes will be removed
- in 2.10 timeframe
-
-api
- -> new package org.apache.wiki.api, which should compile without depending on other packages
-
-api.exceptions
- -> new package org.apache.wiki.api.exceptions with copies of the original Exceptions declared by
- the API methods
- -> to retain backwards compatibility, "old" exceptions will inherit new ones, also the former ones
- are marked as @Deprecated
- * e.g.: org.apache.wiki.plugin.PluginException will inherit
- org.apache.wiki.api.exceptions.PluginException which (ultimately) inherits WikiException
- * note that, until the API is completed, regarding exceptions there will be an somewhat
- awkward jump: org.apache.wiki.api.exceptions.*Exception -> org.apache.wiki.WikiException ->
- org.apache.wiki.api.exceptions.WikiException. It allows us to achieve compatibility with
- 2.9 derived source (regarding exceptions).
-
-org.apache.wiki.filters.FilterManager
- -> new interface org.apache.wiki.api.filters.FilterManager
- -> moved to org.apache.wiki.filters.DefaultFilterManager
- -> WikiEngine.getFilterManager returns org.apache.wiki.api.filters.FilterManager
-
-org.apache.wiki.filters.BasicPageFilter
- -> moved to new class org.apache.wiki.api.filter.BasicPageFilter
- -> org.apache.wiki.filters.BasicPageFilter marked with @Deprecated + extends
- org.apache.wiki.api.filter.BasicPageFilter
-
-org.apache.wiki.filters.PageFilter
- -> moved to new interface org.apache.wiki.api.filter.PageFilter
- -> org.apache.wiki.filters.PageFilter marked with @Deprecated + extends
- org.apache.wiki.api.filter.PageFilter
- -> all core wikifilters implementing the "old" interface now implement the new one
-
-org.apache.wiki.parser.PluginContent
- -> getParameter returns String instead of Object (internally, it was returning a String)
-
-org.apache.wiki.plugin.PluginManager
- -> new interface org.apache.wiki.api.plugin.PluginManager
- -> moved to org.apache.wiki.plugin.DefaultPluginManager
- -> @Deprecated public static boolean isPluginLink( String link )
- * equivalent method on org.apache.wiki.parser.JSPWikiMarkupParser
- -> WikiEngine.getPluginManager returns org.apache.wiki.api.plugin.PluginManager
-
-org.apache.wiki.plugin.InitializablePlugin
- -> new interface org.apache.wiki.api.plugin.InitializablePlugin
- -> all core wikiplugins and wikiforms implementing the "old" interface now implement the new one
- -> org.apache.wiki.plugin.InitializablePlugin marked with @Deprecated + extends
- org.apache.wiki.api.plugin.InitializablePlugin
-
-org.apache.wiki.plugin.ParserStagePlugin
- -> new interface org.apache.wiki.api.plugins.ParserStagePlugin
- -> all core wikiplugins and wikiforms implementing the "old" interface now implement the new one
- -> org.apache.wiki.plugin.ParserStagePlugin marked with @Deprecated + extends
- org.apache.wiki.api.plugin.ParserStagePlugin
-
-org.apache.wiki.plugin.WikiPlugin
- -> new interface org.apache.wiki.api.plugins.WikiPlugin
- -> all core wikiplugins and wikiforms implement the new interface
- -> org.apache.wiki.plugin.WikiPlugin marked with @Deprecated + extends
- org.apache.wiki.api.plugin.WikiPlugin
+The package org.apache.wiki.api aims to provide an API to give access to JSPWiki internals. Check
+doc/2.10-API.txt to see its packages, classes affected and to be removed when 2.10, etc.
Upgrading JSPWiki from 2.8.x to 2.9.0
Added: incubator/jspwiki/trunk/doc/2.10-API.txt
URL: http://svn.apache.org/viewvc/incubator/jspwiki/trunk/doc/2.10-API.txt?rev=1431026&view=auto
==============================================================================
--- incubator/jspwiki/trunk/doc/2.10-API.txt (added)
+++ incubator/jspwiki/trunk/doc/2.10-API.txt Wed Jan 9 19:37:10 2013
@@ -0,0 +1,88 @@
+1. JSPWiki API
+==============
+
+The package org.apache.wiki.api aims to provide an API to give access to JSPWiki internals.
+
+1.1. API modules
+----------------
+api
+ -> new package org.apache.wiki.api, which should compile without depending on other packages
+
+api.exceptions
+ -> new package org.apache.wiki.api.exceptions with copies of the original Exceptions declared by
+ the API methods
+ -> to retain backwards compatibility, "old" exceptions will inherit new ones, also the former ones
+ are marked as @Deprecated
+ * e.g.: org.apache.wiki.plugin.PluginException will inherit
+ org.apache.wiki.api.exceptions.PluginException which (ultimately) inherits WikiException
+ * note that, until the API is completed, regarding exceptions there will be an somewhat
+ awkward jump: org.apache.wiki.api.exceptions.*Exception -> org.apache.wiki.api.WikiException ->
+ org.apache.wiki.WikiException. It allows us to achieve compatibility with
+ 2.9 derived source (regarding exceptions).
+
+api.filters
+ -> Interface and base classes needed to develop WikiFilters
+ -> cfr. with http://doc.jspwiki.org/2.4/wiki/WikiFilters
+
+api.plugin
+ -> Interfaces needed to develop WikiPlugins
+ -> cfr. with http://www.jspwiki.org/wiki/WritingPlugins
+
+
+1.2. Other classes affected
+---------------------------
+@Deprecated
+ -> all classes / methods anotated with @Deprecated because of the API changes will be removed
+ in 2.10 timeframe
+
+org.apache.wiki.WikiEngine
+ -> @Deprecated WikiEngine.getRequiredProperty( props, key ) in favour of
+ TextUtil.getRequiredProperty( props, key )
+
+org.apache.wiki.FileUtil and org.apache.wiki.TextUtil
+ -> Moved to org.apache.wiki.util.FileUtil and org.apache.wiki.util.TextUtil respectively
+ -> original classes marked with @Deprecated and forwarding to the new ones until 2.10
+
+org.apache.wiki.filters.FilterManager
+ -> new interface org.apache.wiki.api.engine.FilterManager
+ -> moved to org.apache.wiki.filters.DefaultFilterManager
+ -> WikiEngine.getFilterManager returns org.apache.wiki.api.engine.FilterManager
+
+org.apache.wiki.filters.BasicPageFilter
+ -> moved to new class org.apache.wiki.api.filter.BasicPageFilter
+ -> org.apache.wiki.filters.BasicPageFilter marked with @Deprecated + extends
+ org.apache.wiki.api.filter.BasicPageFilter
+
+org.apache.wiki.filters.PageFilter
+ -> moved to new interface org.apache.wiki.api.filter.PageFilter
+ -> org.apache.wiki.filters.PageFilter marked with @Deprecated + extends
+ org.apache.wiki.api.filter.PageFilter
+ -> all core wikifilters implementing the "old" interface now implement the new one
+
+org.apache.wiki.parser.PluginContent
+ -> getParameter returns String instead of Object (internally, it was returning a String)
+
+org.apache.wiki.plugin.PluginManager
+ -> new interface org.apache.wiki.api.engine.PluginManager
+ -> moved to org.apache.wiki.plugin.DefaultPluginManager
+ -> @Deprecated public static boolean isPluginLink( String link )
+ * equivalent method on org.apache.wiki.parser.JSPWikiMarkupParser
+ -> WikiEngine.getPluginManager returns org.apache.wiki.api.engine.PluginManager
+
+org.apache.wiki.plugin.InitializablePlugin
+ -> new interface org.apache.wiki.api.plugin.InitializablePlugin
+ -> all core wikiplugins and wikiforms implementing the "old" interface now implement the new one
+ -> org.apache.wiki.plugin.InitializablePlugin marked with @Deprecated + extends
+ org.apache.wiki.api.plugin.InitializablePlugin
+
+org.apache.wiki.plugin.ParserStagePlugin
+ -> new interface org.apache.wiki.api.plugins.ParserStagePlugin
+ -> all core wikiplugins and wikiforms implementing the "old" interface now implement the new one
+ -> org.apache.wiki.plugin.ParserStagePlugin marked with @Deprecated + extends
+ org.apache.wiki.api.plugin.ParserStagePlugin
+
+org.apache.wiki.plugin.WikiPlugin
+ -> new interface org.apache.wiki.api.plugins.WikiPlugin
+ -> all core wikiplugins and wikiforms implement the new interface
+ -> org.apache.wiki.plugin.WikiPlugin marked with @Deprecated + extends
+ org.apache.wiki.api.plugin.WikiPlugin
\ No newline at end of file
Modified: incubator/jspwiki/trunk/etc/ini/classmappings.xml
URL: http://svn.apache.org/viewvc/incubator/jspwiki/trunk/etc/ini/classmappings.xml?rev=1431026&r1=1431025&r2=1431026&view=diff
==============================================================================
--- incubator/jspwiki/trunk/etc/ini/classmappings.xml (original)
+++ incubator/jspwiki/trunk/etc/ini/classmappings.xml Wed Jan 9 19:37:10 2013
@@ -88,7 +88,7 @@
<mappedClass>org.apache.wiki.diff.DifferenceManager</mappedClass>
</mapping>
<mapping>
- <requestedClass>org.apache.wiki.api.filters.FilterManager</requestedClass>
+ <requestedClass>org.apache.wiki.api.engine.FilterManager</requestedClass>
<mappedClass>org.apache.wiki.filters.FilterManager</mappedClass> <!-- to be replaced in 2.10 -->
<!-- <mappedClass>org.apache.wiki.filters.DefaultFilterManager</mappedClass> --> <!-- replacing the former in 2.10 -->
</mapping>
@@ -97,7 +97,7 @@
<mappedClass>org.apache.wiki.i18n.InternationalizationManager</mappedClass>
</mapping>
<mapping>
- <requestedClass>org.apache.wiki.api.plugin.PluginManager</requestedClass>
+ <requestedClass>org.apache.wiki.api.engine.PluginManager</requestedClass>
<mappedClass>org.apache.wiki.plugin.PluginManager</mappedClass> <!-- to be replaced in 2.10 -->
<!-- <mappedClass>org.apache.wiki.plugin.DefaultPluginManager</mappedClass> --> <!-- replacing the former in 2.10 -->
</mapping>
Modified: incubator/jspwiki/trunk/src/org/apache/wiki/PageManager.java
URL: http://svn.apache.org/viewvc/incubator/jspwiki/trunk/src/org/apache/wiki/PageManager.java?rev=1431026&r1=1431025&r2=1431026&view=diff
==============================================================================
--- incubator/jspwiki/trunk/src/org/apache/wiki/PageManager.java (original)
+++ incubator/jspwiki/trunk/src/org/apache/wiki/PageManager.java Wed Jan 9 19:37:10 2013
@@ -25,8 +25,8 @@ import java.util.*;
import org.apache.commons.lang.ArrayUtils;
import org.apache.log4j.Logger;
+import org.apache.wiki.api.engine.FilterManager;
import org.apache.wiki.api.exceptions.WikiException;
-import org.apache.wiki.api.filters.FilterManager;
import org.apache.wiki.auth.WikiPrincipal;
import org.apache.wiki.auth.WikiSecurityException;
import org.apache.wiki.auth.acl.Acl;
@@ -148,7 +148,7 @@ public class PageManager extends ModuleM
}
else
{
- classname = WikiEngine.getRequiredProperty( props, PROP_PAGEPROVIDER );
+ classname = TextUtil.getRequiredProperty( props, PROP_PAGEPROVIDER );
}
try
Modified: incubator/jspwiki/trunk/src/org/apache/wiki/VariableManager.java
URL: http://svn.apache.org/viewvc/incubator/jspwiki/trunk/src/org/apache/wiki/VariableManager.java?rev=1431026&r1=1431025&r2=1431026&view=diff
==============================================================================
--- incubator/jspwiki/trunk/src/org/apache/wiki/VariableManager.java (original)
+++ incubator/jspwiki/trunk/src/org/apache/wiki/VariableManager.java Wed Jan 9 19:37:10 2013
@@ -27,7 +27,7 @@ import javax.servlet.http.HttpSession;
import org.apache.log4j.Logger;
-import org.apache.wiki.api.filters.FilterManager;
+import org.apache.wiki.api.engine.FilterManager;
import org.apache.wiki.api.filters.PageFilter;
import org.apache.wiki.i18n.InternationalizationManager;
import org.apache.wiki.modules.InternalModule;
Modified: incubator/jspwiki/trunk/src/org/apache/wiki/WikiEngine.java
URL: http://svn.apache.org/viewvc/incubator/jspwiki/trunk/src/org/apache/wiki/WikiEngine.java?rev=1431026&r1=1431025&r2=1431026&view=diff
==============================================================================
--- incubator/jspwiki/trunk/src/org/apache/wiki/WikiEngine.java (original)
+++ incubator/jspwiki/trunk/src/org/apache/wiki/WikiEngine.java Wed Jan 9 19:37:10 2013
@@ -34,10 +34,10 @@ import javax.servlet.http.HttpServletReq
import org.apache.commons.lang.time.StopWatch;
import org.apache.log4j.Logger;
import org.apache.log4j.PropertyConfigurator;
+import org.apache.wiki.api.engine.FilterManager;
+import org.apache.wiki.api.engine.PluginManager;
import org.apache.wiki.api.exceptions.FilterException;
import org.apache.wiki.api.exceptions.WikiException;
-import org.apache.wiki.api.filters.FilterManager;
-import org.apache.wiki.api.plugin.PluginManager;
import org.apache.wiki.attachment.Attachment;
import org.apache.wiki.attachment.AttachmentManager;
import org.apache.wiki.auth.AuthenticationManager;
@@ -712,29 +712,22 @@ public class WikiEngine
/**
- * Throws an exception if a property is not found.
+ * Throws an exception if a property is not found.
*
- * @param props A set of properties to search the key in.
- * @param key The key to look for.
- * @return The required property
- *
- * @throws NoRequiredPropertyException If the search key is not
- * in the property set.
+ * @param props A set of properties to search the key in.
+ * @param key The key to look for.
+ * @return The required property
+ *
+ * @throws NoRequiredPropertyException If the search key is not
+ * in the property set.
+ * @deprecated will be removed in 2.10 scope. Consider using {@link TextUtil#getRequiredProperty(Properties, String)}
+ * instead
*/
-
- // FIXME: Should really be in some util file.
+ @Deprecated
public static String getRequiredProperty( Properties props, String key )
throws NoRequiredPropertyException
{
- String value = TextUtil.getStringProperty( props, key, null );
-
- if( value == null )
- {
- throw new NoRequiredPropertyException( "Required property not found",
- key );
- }
-
- return value;
+ return TextUtil.getRequiredProperty( props, key );
}
/**
Copied: incubator/jspwiki/trunk/src/org/apache/wiki/api/engine/FilterManager.java (from r1431004, incubator/jspwiki/trunk/src/org/apache/wiki/api/filters/FilterManager.java)
URL: http://svn.apache.org/viewvc/incubator/jspwiki/trunk/src/org/apache/wiki/api/engine/FilterManager.java?p2=incubator/jspwiki/trunk/src/org/apache/wiki/api/engine/FilterManager.java&p1=incubator/jspwiki/trunk/src/org/apache/wiki/api/filters/FilterManager.java&r1=1431004&r2=1431026&rev=1431026&view=diff
==============================================================================
--- incubator/jspwiki/trunk/src/org/apache/wiki/api/filters/FilterManager.java (original)
+++ incubator/jspwiki/trunk/src/org/apache/wiki/api/engine/FilterManager.java Wed Jan 9 19:37:10 2013
@@ -1,10 +1,11 @@
-package org.apache.wiki.api.filters;
+package org.apache.wiki.api.engine;
import java.util.Collection;
import java.util.List;
import org.apache.wiki.WikiContext;
import org.apache.wiki.api.exceptions.FilterException;
+import org.apache.wiki.api.filters.PageFilter;
public interface FilterManager
{
Copied: incubator/jspwiki/trunk/src/org/apache/wiki/api/engine/PluginManager.java (from r1431004, incubator/jspwiki/trunk/src/org/apache/wiki/api/plugin/PluginManager.java)
URL: http://svn.apache.org/viewvc/incubator/jspwiki/trunk/src/org/apache/wiki/api/engine/PluginManager.java?p2=incubator/jspwiki/trunk/src/org/apache/wiki/api/engine/PluginManager.java&p1=incubator/jspwiki/trunk/src/org/apache/wiki/api/plugin/PluginManager.java&r1=1431004&r2=1431026&rev=1431026&view=diff
==============================================================================
--- incubator/jspwiki/trunk/src/org/apache/wiki/api/plugin/PluginManager.java (original)
+++ incubator/jspwiki/trunk/src/org/apache/wiki/api/engine/PluginManager.java Wed Jan 9 19:37:10 2013
@@ -1,4 +1,4 @@
-package org.apache.wiki.api.plugin;
+package org.apache.wiki.api.engine;
import java.io.IOException;
import java.util.Collection;
Added: incubator/jspwiki/trunk/src/org/apache/wiki/api/engine/package.html
URL: http://svn.apache.org/viewvc/incubator/jspwiki/trunk/src/org/apache/wiki/api/engine/package.html?rev=1431026&view=auto
==============================================================================
--- incubator/jspwiki/trunk/src/org/apache/wiki/api/engine/package.html (added)
+++ incubator/jspwiki/trunk/src/org/apache/wiki/api/engine/package.html Wed Jan 9 19:37:10 2013
@@ -0,0 +1,36 @@
+<!--
+ 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.
+-->
+
+<!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
+<html>
+<head>
+<meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
+<title>WikiEngine Managers</title>
+</head>
+<body>
+JSPWiki's WikiEngine Managers package.
+
+This package holds all the Managers provided by WikiEngine and associated classes.
+
+<h3>Package Specification</h3>
+
+<h3>Related Documentation</h3>
+
+</body>
+</html>
\ No newline at end of file
Added: incubator/jspwiki/trunk/src/org/apache/wiki/api/exceptions/package.html
URL: http://svn.apache.org/viewvc/incubator/jspwiki/trunk/src/org/apache/wiki/api/exceptions/package.html?rev=1431026&view=auto
==============================================================================
--- incubator/jspwiki/trunk/src/org/apache/wiki/api/exceptions/package.html (added)
+++ incubator/jspwiki/trunk/src/org/apache/wiki/api/exceptions/package.html Wed Jan 9 19:37:10 2013
@@ -0,0 +1,36 @@
+<!--
+ 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.
+-->
+
+<!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
+<html>
+<head>
+<meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
+<title>JSPWiki's API exceptions package</title>
+</head>
+<body>
+JSPWiki's API exceptions package.
+
+This package holds all the exceptions used by JSPWiki APIs.
+
+<h3>Package Specification</h3>
+
+<h3>Related Documentation</h3>
+
+</body>
+</html>
\ No newline at end of file
Added: incubator/jspwiki/trunk/src/org/apache/wiki/api/filters/package.html
URL: http://svn.apache.org/viewvc/incubator/jspwiki/trunk/src/org/apache/wiki/api/filters/package.html?rev=1431026&view=auto
==============================================================================
--- incubator/jspwiki/trunk/src/org/apache/wiki/api/filters/package.html (added)
+++ incubator/jspwiki/trunk/src/org/apache/wiki/api/filters/package.html Wed Jan 9 19:37:10 2013
@@ -0,0 +1,36 @@
+<!--
+ 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.
+-->
+
+<!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
+<html>
+<head>
+<meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
+<title>JSPWiki's Filter API</title>
+</head>
+<body>
+Filter's API package of JSPWiki.
+
+This package holds JSPWiki's Filter API.
+
+<h3>Package Specification</h3>
+
+<h3>Related Documentation</h3>
+
+</body>
+</html>
\ No newline at end of file
Added: incubator/jspwiki/trunk/src/org/apache/wiki/api/package.html
URL: http://svn.apache.org/viewvc/incubator/jspwiki/trunk/src/org/apache/wiki/api/package.html?rev=1431026&view=auto
==============================================================================
--- incubator/jspwiki/trunk/src/org/apache/wiki/api/package.html (added)
+++ incubator/jspwiki/trunk/src/org/apache/wiki/api/package.html Wed Jan 9 19:37:10 2013
@@ -0,0 +1,36 @@
+<!--
+ 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.
+-->
+
+<!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
+<html>
+<head>
+<meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
+<title>JSPWiki's APIs</title>
+</head>
+<body>
+JSPWiki's API package.
+
+This package holds all the APIs provided by JSPWiki.
+
+<h3>Package Specification</h3>
+
+<h3>Related Documentation</h3>
+
+</body>
+</html>
\ No newline at end of file
Added: incubator/jspwiki/trunk/src/org/apache/wiki/api/plugin/package.html
URL: http://svn.apache.org/viewvc/incubator/jspwiki/trunk/src/org/apache/wiki/api/plugin/package.html?rev=1431026&view=auto
==============================================================================
--- incubator/jspwiki/trunk/src/org/apache/wiki/api/plugin/package.html (added)
+++ incubator/jspwiki/trunk/src/org/apache/wiki/api/plugin/package.html Wed Jan 9 19:37:10 2013
@@ -0,0 +1,36 @@
+<!--
+ 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.
+-->
+
+<!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
+<html>
+<head>
+<meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
+<title>JSPWiki's Plugin API</title>
+</head>
+<body>
+Plugin's API package of JSPWiki.
+
+This package holds JSPWiki's Plugin API.
+
+<h3>Package Specification</h3>
+
+<h3>Related Documentation</h3>
+
+</body>
+</html>
\ No newline at end of file
Modified: incubator/jspwiki/trunk/src/org/apache/wiki/auth/UserManager.java
URL: http://svn.apache.org/viewvc/incubator/jspwiki/trunk/src/org/apache/wiki/auth/UserManager.java?rev=1431026&r1=1431025&r2=1431026&view=diff
==============================================================================
--- incubator/jspwiki/trunk/src/org/apache/wiki/auth/UserManager.java (original)
+++ incubator/jspwiki/trunk/src/org/apache/wiki/auth/UserManager.java Wed Jan 9 19:37:10 2013
@@ -29,12 +29,9 @@ import javax.mail.internet.AddressExcept
import javax.servlet.http.HttpServletRequest;
import org.apache.log4j.Logger;
-import org.apache.wiki.NoRequiredPropertyException;
-import org.apache.wiki.WikiContext;
-import org.apache.wiki.WikiEngine;
-import org.apache.wiki.WikiSession;
+import org.apache.wiki.*;
+import org.apache.wiki.api.engine.FilterManager;
import org.apache.wiki.api.exceptions.WikiException;
-import org.apache.wiki.api.filters.FilterManager;
import org.apache.wiki.api.filters.PageFilter;
import org.apache.wiki.auth.permissions.AllPermission;
import org.apache.wiki.auth.permissions.WikiPermission;
@@ -145,7 +142,7 @@ public final class UserManager
try
{
- dbClassName = WikiEngine.getRequiredProperty( m_engine.getWikiProperties(),
+ dbClassName = TextUtil.getRequiredProperty( m_engine.getWikiProperties(),
PROP_DATABASE );
log.info("Attempting to load user database class "+dbClassName);
Modified: incubator/jspwiki/trunk/src/org/apache/wiki/event/WikiEventUtils.java
URL: http://svn.apache.org/viewvc/incubator/jspwiki/trunk/src/org/apache/wiki/event/WikiEventUtils.java?rev=1431026&r1=1431025&r2=1431026&view=diff
==============================================================================
--- incubator/jspwiki/trunk/src/org/apache/wiki/event/WikiEventUtils.java (original)
+++ incubator/jspwiki/trunk/src/org/apache/wiki/event/WikiEventUtils.java Wed Jan 9 19:37:10 2013
@@ -20,7 +20,7 @@
package org.apache.wiki.event;
import org.apache.wiki.WikiEngine;
-import org.apache.wiki.api.filters.FilterManager;
+import org.apache.wiki.api.engine.FilterManager;
/**
* A utility class that adds some JSPWiki-specific functionality to the
Modified: incubator/jspwiki/trunk/src/org/apache/wiki/filters/DefaultFilterManager.java
URL: http://svn.apache.org/viewvc/incubator/jspwiki/trunk/src/org/apache/wiki/filters/DefaultFilterManager.java?rev=1431026&r1=1431025&r2=1431026&view=diff
==============================================================================
--- incubator/jspwiki/trunk/src/org/apache/wiki/filters/DefaultFilterManager.java (original)
+++ incubator/jspwiki/trunk/src/org/apache/wiki/filters/DefaultFilterManager.java Wed Jan 9 19:37:10 2013
@@ -91,7 +91,7 @@ import org.jdom.xpath.XPath;
*
* FIXME: this class should be final in 2.10. It isn't right now because of compatibility reasons
*/
-public class DefaultFilterManager extends ModuleManager implements org.apache.wiki.api.filters.FilterManager
+public class DefaultFilterManager extends ModuleManager implements org.apache.wiki.api.engine.FilterManager
{
private PriorityList<PageFilter> m_pageFilters = new PriorityList<PageFilter>();
Modified: incubator/jspwiki/trunk/src/org/apache/wiki/forms/FormOutput.java
URL: http://svn.apache.org/viewvc/incubator/jspwiki/trunk/src/org/apache/wiki/forms/FormOutput.java?rev=1431026&r1=1431025&r2=1431026&view=diff
==============================================================================
--- incubator/jspwiki/trunk/src/org/apache/wiki/forms/FormOutput.java (original)
+++ incubator/jspwiki/trunk/src/org/apache/wiki/forms/FormOutput.java Wed Jan 9 19:37:10 2013
@@ -23,8 +23,8 @@ import java.util.Map;
import java.util.ResourceBundle;
import org.apache.wiki.WikiContext;
+import org.apache.wiki.api.engine.PluginManager;
import org.apache.wiki.api.exceptions.PluginException;
-import org.apache.wiki.api.plugin.PluginManager;
import org.apache.wiki.api.plugin.WikiPlugin;
import org.apache.wiki.plugin.DefaultPluginManager;
import org.apache.wiki.util.FormUtil;
Modified: incubator/jspwiki/trunk/src/org/apache/wiki/parser/JSPWikiMarkupParser.java
URL: http://svn.apache.org/viewvc/incubator/jspwiki/trunk/src/org/apache/wiki/parser/JSPWikiMarkupParser.java?rev=1431026&r1=1431025&r2=1431026&view=diff
==============================================================================
--- incubator/jspwiki/trunk/src/org/apache/wiki/parser/JSPWikiMarkupParser.java (original)
+++ incubator/jspwiki/trunk/src/org/apache/wiki/parser/JSPWikiMarkupParser.java Wed Jan 9 19:37:10 2013
@@ -32,8 +32,8 @@ import org.apache.log4j.Logger;
import org.apache.oro.text.GlobCompiler;
import org.apache.oro.text.regex.*;
import org.apache.wiki.*;
+import org.apache.wiki.api.engine.PluginManager;
import org.apache.wiki.api.exceptions.PluginException;
-import org.apache.wiki.api.plugin.PluginManager;
import org.apache.wiki.api.plugin.WikiPlugin;
import org.apache.wiki.attachment.Attachment;
import org.apache.wiki.attachment.AttachmentManager;
Modified: incubator/jspwiki/trunk/src/org/apache/wiki/parser/PluginContent.java
URL: http://svn.apache.org/viewvc/incubator/jspwiki/trunk/src/org/apache/wiki/parser/PluginContent.java?rev=1431026&r1=1431025&r2=1431026&view=diff
==============================================================================
--- incubator/jspwiki/trunk/src/org/apache/wiki/parser/PluginContent.java (original)
+++ incubator/jspwiki/trunk/src/org/apache/wiki/parser/PluginContent.java Wed Jan 9 19:37:10 2013
@@ -25,8 +25,8 @@ import java.util.ResourceBundle;
import org.apache.wiki.WikiContext;
import org.apache.wiki.WikiEngine;
+import org.apache.wiki.api.engine.PluginManager;
import org.apache.wiki.api.exceptions.PluginException;
-import org.apache.wiki.api.plugin.PluginManager;
import org.apache.wiki.api.plugin.WikiPlugin;
import org.apache.wiki.render.RenderingManager;
import org.jdom.Text;
Modified: incubator/jspwiki/trunk/src/org/apache/wiki/plugin/DefaultPluginManager.java
URL: http://svn.apache.org/viewvc/incubator/jspwiki/trunk/src/org/apache/wiki/plugin/DefaultPluginManager.java?rev=1431026&r1=1431025&r2=1431026&view=diff
==============================================================================
--- incubator/jspwiki/trunk/src/org/apache/wiki/plugin/DefaultPluginManager.java (original)
+++ incubator/jspwiki/trunk/src/org/apache/wiki/plugin/DefaultPluginManager.java Wed Jan 9 19:37:10 2013
@@ -28,10 +28,10 @@ import org.apache.ecs.xhtml.*;
import org.apache.log4j.Logger;
import org.apache.oro.text.regex.*;
import org.apache.wiki.*;
+import org.apache.wiki.api.engine.PluginManager;
import org.apache.wiki.api.exceptions.PluginException;
import org.apache.wiki.api.plugin.InitializablePlugin;
import org.apache.wiki.api.plugin.ParserStagePlugin;
-import org.apache.wiki.api.plugin.PluginManager;
import org.apache.wiki.api.plugin.WikiPlugin;
import org.apache.wiki.modules.ModuleManager;
import org.apache.wiki.modules.WikiModuleInfo;
Modified: incubator/jspwiki/trunk/src/org/apache/wiki/plugin/TableOfContents.java
URL: http://svn.apache.org/viewvc/incubator/jspwiki/trunk/src/org/apache/wiki/plugin/TableOfContents.java?rev=1431026&r1=1431025&r2=1431026&view=diff
==============================================================================
--- incubator/jspwiki/trunk/src/org/apache/wiki/plugin/TableOfContents.java (original)
+++ incubator/jspwiki/trunk/src/org/apache/wiki/plugin/TableOfContents.java Wed Jan 9 19:37:10 2013
@@ -25,8 +25,8 @@ import java.util.ResourceBundle;
import org.apache.log4j.Logger;
import org.apache.wiki.*;
+import org.apache.wiki.api.engine.FilterManager;
import org.apache.wiki.api.exceptions.PluginException;
-import org.apache.wiki.api.filters.FilterManager;
import org.apache.wiki.api.plugin.WikiPlugin;
import org.apache.wiki.parser.Heading;
import org.apache.wiki.parser.HeadingListener;
Modified: incubator/jspwiki/trunk/src/org/apache/wiki/tags/PluginTag.java
URL: http://svn.apache.org/viewvc/incubator/jspwiki/trunk/src/org/apache/wiki/tags/PluginTag.java?rev=1431026&r1=1431025&r2=1431026&view=diff
==============================================================================
--- incubator/jspwiki/trunk/src/org/apache/wiki/tags/PluginTag.java (original)
+++ incubator/jspwiki/trunk/src/org/apache/wiki/tags/PluginTag.java Wed Jan 9 19:37:10 2013
@@ -25,8 +25,8 @@ import javax.servlet.jsp.JspException;
import javax.servlet.jsp.tagext.BodyContent;
import org.apache.wiki.WikiEngine;
+import org.apache.wiki.api.engine.PluginManager;
import org.apache.wiki.api.exceptions.PluginException;
-import org.apache.wiki.api.plugin.PluginManager;
/**
* Inserts any Wiki plugin. The body of the tag becomes then
Modified: incubator/jspwiki/trunk/src/org/apache/wiki/ui/admin/AdminBeanManager.java
URL: http://svn.apache.org/viewvc/incubator/jspwiki/trunk/src/org/apache/wiki/ui/admin/AdminBeanManager.java?rev=1431026&r1=1431025&r2=1431026&view=diff
==============================================================================
--- incubator/jspwiki/trunk/src/org/apache/wiki/ui/admin/AdminBeanManager.java (original)
+++ incubator/jspwiki/trunk/src/org/apache/wiki/ui/admin/AdminBeanManager.java Wed Jan 9 19:37:10 2013
@@ -29,7 +29,7 @@ import javax.management.*;
import org.apache.log4j.Logger;
import org.apache.wiki.Release;
import org.apache.wiki.WikiEngine;
-import org.apache.wiki.api.plugin.PluginManager;
+import org.apache.wiki.api.engine.PluginManager;
import org.apache.wiki.event.WikiEngineEvent;
import org.apache.wiki.event.WikiEvent;
import org.apache.wiki.event.WikiEventListener;
Modified: incubator/jspwiki/trunk/src/org/apache/wiki/ui/admin/beans/PluginBean.java
URL: http://svn.apache.org/viewvc/incubator/jspwiki/trunk/src/org/apache/wiki/ui/admin/beans/PluginBean.java?rev=1431026&r1=1431025&r2=1431026&view=diff
==============================================================================
--- incubator/jspwiki/trunk/src/org/apache/wiki/ui/admin/beans/PluginBean.java (original)
+++ incubator/jspwiki/trunk/src/org/apache/wiki/ui/admin/beans/PluginBean.java Wed Jan 9 19:37:10 2013
@@ -27,7 +27,7 @@ import org.apache.ecs.xhtml.*;
import org.apache.wiki.Release;
import org.apache.wiki.WikiContext;
import org.apache.wiki.WikiEngine;
-import org.apache.wiki.api.plugin.PluginManager;
+import org.apache.wiki.api.engine.PluginManager;
import org.apache.wiki.plugin.DefaultPluginManager.WikiPluginInfo;
import org.apache.wiki.ui.admin.SimpleAdminBean;
Modified: incubator/jspwiki/trunk/tests/org/apache/wiki/filters/DefaultFilterManagerTest.java
URL: http://svn.apache.org/viewvc/incubator/jspwiki/trunk/tests/org/apache/wiki/filters/DefaultFilterManagerTest.java?rev=1431026&r1=1431025&r2=1431026&view=diff
==============================================================================
--- incubator/jspwiki/trunk/tests/org/apache/wiki/filters/DefaultFilterManagerTest.java (original)
+++ incubator/jspwiki/trunk/tests/org/apache/wiki/filters/DefaultFilterManagerTest.java Wed Jan 9 19:37:10 2013
@@ -30,7 +30,7 @@ import junit.framework.TestSuite;
import org.apache.log4j.PropertyConfigurator;
import org.apache.wiki.TestEngine;
import org.apache.wiki.WikiException;
-import org.apache.wiki.api.filters.FilterManager;
+import org.apache.wiki.api.engine.FilterManager;
import org.apache.wiki.api.filters.PageFilter;
public class DefaultFilterManagerTest extends TestCase
Modified: incubator/jspwiki/trunk/tests/org/apache/wiki/plugin/PageViewPluginTest.java
URL: http://svn.apache.org/viewvc/incubator/jspwiki/trunk/tests/org/apache/wiki/plugin/PageViewPluginTest.java?rev=1431026&r1=1431025&r2=1431026&view=diff
==============================================================================
--- incubator/jspwiki/trunk/tests/org/apache/wiki/plugin/PageViewPluginTest.java (original)
+++ incubator/jspwiki/trunk/tests/org/apache/wiki/plugin/PageViewPluginTest.java Wed Jan 9 19:37:10 2013
@@ -27,7 +27,7 @@ import junit.framework.TestSuite;
import org.apache.wiki.TestEngine;
import org.apache.wiki.WikiContext;
import org.apache.wiki.WikiPage;
-import org.apache.wiki.api.plugin.PluginManager;
+import org.apache.wiki.api.engine.PluginManager;
public class PageViewPluginTest extends TestCase
Modified: incubator/jspwiki/trunk/tests/org/apache/wiki/plugin/ReferringPagesPluginTest.java
URL: http://svn.apache.org/viewvc/incubator/jspwiki/trunk/tests/org/apache/wiki/plugin/ReferringPagesPluginTest.java?rev=1431026&r1=1431025&r2=1431026&view=diff
==============================================================================
--- incubator/jspwiki/trunk/tests/org/apache/wiki/plugin/ReferringPagesPluginTest.java (original)
+++ incubator/jspwiki/trunk/tests/org/apache/wiki/plugin/ReferringPagesPluginTest.java Wed Jan 9 19:37:10 2013
@@ -29,8 +29,8 @@ import junit.framework.TestSuite;
import org.apache.wiki.TestEngine;
import org.apache.wiki.WikiContext;
import org.apache.wiki.WikiPage;
+import org.apache.wiki.api.engine.PluginManager;
import org.apache.wiki.api.exceptions.PluginException;
-import org.apache.wiki.api.plugin.PluginManager;
public class ReferringPagesPluginTest extends TestCase
{
Modified: incubator/jspwiki/trunk/tests/org/apache/wiki/plugin/UndefinedPagesPluginTest.java
URL: http://svn.apache.org/viewvc/incubator/jspwiki/trunk/tests/org/apache/wiki/plugin/UndefinedPagesPluginTest.java?rev=1431026&r1=1431025&r2=1431026&view=diff
==============================================================================
--- incubator/jspwiki/trunk/tests/org/apache/wiki/plugin/UndefinedPagesPluginTest.java (original)
+++ incubator/jspwiki/trunk/tests/org/apache/wiki/plugin/UndefinedPagesPluginTest.java Wed Jan 9 19:37:10 2013
@@ -28,8 +28,8 @@ import junit.framework.Test;
import org.apache.wiki.TestEngine;
import org.apache.wiki.WikiContext;
import org.apache.wiki.WikiPage;
+import org.apache.wiki.api.engine.PluginManager;
import org.apache.wiki.api.exceptions.PluginException;
-import org.apache.wiki.api.plugin.PluginManager;
public class UndefinedPagesPluginTest extends TestCase
{
Modified: incubator/jspwiki/trunk/tests/org/apache/wiki/providers/BasicAttachmentProviderTest.java
URL: http://svn.apache.org/viewvc/incubator/jspwiki/trunk/tests/org/apache/wiki/providers/BasicAttachmentProviderTest.java?rev=1431026&r1=1431025&r2=1431026&view=diff
==============================================================================
--- incubator/jspwiki/trunk/tests/org/apache/wiki/providers/BasicAttachmentProviderTest.java (original)
+++ incubator/jspwiki/trunk/tests/org/apache/wiki/providers/BasicAttachmentProviderTest.java Wed Jan 9 19:37:10 2013
@@ -54,7 +54,7 @@ public class BasicAttachmentProviderTest
m_engine = new TestEngine(props);
- TestEngine.deleteAll( new File(TestEngine.getRequiredProperty( props, BasicAttachmentProvider.PROP_STORAGEDIR )) );
+ TestEngine.deleteAll( new File(TextUtil.getRequiredProperty( props, BasicAttachmentProvider.PROP_STORAGEDIR )) );
m_provider = new BasicAttachmentProvider();
m_provider.initialize( m_engine, props );
Modified: incubator/jspwiki/trunk/tests/org/apache/wiki/workflow/ApprovalWorkflowTest.java
URL: http://svn.apache.org/viewvc/incubator/jspwiki/trunk/tests/org/apache/wiki/workflow/ApprovalWorkflowTest.java?rev=1431026&r1=1431025&r2=1431026&view=diff
==============================================================================
--- incubator/jspwiki/trunk/tests/org/apache/wiki/workflow/ApprovalWorkflowTest.java (original)
+++ incubator/jspwiki/trunk/tests/org/apache/wiki/workflow/ApprovalWorkflowTest.java Wed Jan 9 19:37:10 2013
@@ -28,10 +28,10 @@ import junit.framework.TestCase;
import org.apache.wiki.PageManager;
import org.apache.wiki.TestEngine;
import org.apache.wiki.WikiContext;
+import org.apache.wiki.api.engine.FilterManager;
import org.apache.wiki.api.exceptions.FilterException;
import org.apache.wiki.api.exceptions.WikiException;
import org.apache.wiki.api.filters.BasicPageFilter;
-import org.apache.wiki.api.filters.FilterManager;
import org.apache.wiki.auth.Users;
import org.apache.wiki.auth.WikiPrincipal;