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/03/06 18:04:36 UTC
[jspwiki] 34/35: JSPWIKI-303: promote o.a.w.Release to o.a.w.api
package
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 0db9623ba227dd63278a2dbfb8a22abef2bd3926
Author: juanpablo <ju...@apache.org>
AuthorDate: Fri Mar 6 19:01:06 2020 +0100
JSPWIKI-303: promote o.a.w.Release to o.a.w.api package
---
.../java/org/apache/wiki/TranslationsCheck.java | 46 +++---
.../src/main/java/org/apache/wiki/WikiEngine.java | 1 +
.../java/org/apache/wiki/{ => api}/Release.java | 6 +-
.../org/apache/wiki/modules/BaseModuleManager.java | 6 +-
.../main/java/org/apache/wiki/rss/AtomFeed.java | 16 +--
.../main/java/org/apache/wiki/rss/RSS20Feed.java | 2 +-
.../wiki/ui/admin/DefaultAdminBeanManager.java | 2 +-
.../org/apache/wiki/ui/admin/beans/CoreBean.java | 31 ++--
.../org/apache/wiki/ui/admin/beans/ModuleBean.java | 2 +-
.../wiki/variables/DefaultVariableManager.java | 2 +-
.../src/test/java/org/apache/wiki/ReleaseTest.java | 156 ---------------------
.../test/java/org/apache/wiki/api/ReleaseTest.java | 133 ++++++++++++++++++
.../src/main/webapp/templates/210/Favorites.jsp | 3 +-
.../src/main/webapp/templates/210/Footer.jsp | 1 +
.../src/main/webapp/templates/default/Footer.jsp | 2 +-
15 files changed, 193 insertions(+), 216 deletions(-)
diff --git a/jspwiki-main/src/main/java/org/apache/wiki/TranslationsCheck.java b/jspwiki-main/src/main/java/org/apache/wiki/TranslationsCheck.java
index 17869a9..71bd2bd 100644
--- a/jspwiki-main/src/main/java/org/apache/wiki/TranslationsCheck.java
+++ b/jspwiki-main/src/main/java/org/apache/wiki/TranslationsCheck.java
@@ -13,6 +13,8 @@
*/
package org.apache.wiki;
+import org.apache.wiki.api.Release;
+
import java.io.FileNotFoundException;
import java.io.IOException;
import java.util.ArrayList;
@@ -40,14 +42,14 @@ import java.util.TreeSet;
*/
public class TranslationsCheck
{
- private static final TreeSet<String> allProps = new TreeSet<String>(); // sorted, no duplicates
- private static final TreeSet<String> duplProps = new TreeSet<String>();
+ private static final TreeSet<String> allProps = new TreeSet<>(); // sorted, no duplicates
+ private static final TreeSet<String> duplProps = new TreeSet<>();
// Change these to your settings...
static String base = ".";
static String suffix = null;
- public static void main(String[] args) throws IOException
+ public static void main( final String[] args) throws IOException
{
if( args.length == 0 )
{
@@ -71,7 +73,7 @@ public class TranslationsCheck
diff("/CoreResources.properties", "/CoreResources_" + suffix + ".properties");
detectDuplicates("/CoreResources_" + suffix + ".properties");
}
- catch( FileNotFoundException e )
+ catch( final FileNotFoundException e )
{
System.err.println("Unable to locate "+"/CoreResources_" + suffix + ".properties");
}
@@ -81,7 +83,7 @@ public class TranslationsCheck
diff("/templates/default.properties", "/templates/default_" + suffix + ".properties");
detectDuplicates("/templates/default_" + suffix + ".properties");
}
- catch( FileNotFoundException e )
+ catch( final FileNotFoundException e )
{
System.err.println("Unable to locate "+"/templates/default_" + suffix + ".properties");
}
@@ -94,7 +96,7 @@ public class TranslationsCheck
System.out.println("Duplicates overall (two or more occurences):");
System.out.println("--------------------------------------------");
- Iterator< String > iter = duplProps.iterator();
+ final Iterator< String > iter = duplProps.iterator();
if (duplProps.size() == 0)
System.out.println("(none)");
else
@@ -102,7 +104,7 @@ public class TranslationsCheck
System.out.println(iter.next());
System.out.println();
}
- catch( FileNotFoundException e )
+ catch( final FileNotFoundException e )
{
System.err.println("Unable to locate "+"/plugin/PluginResources_" + suffix + ".properties");
}
@@ -112,25 +114,25 @@ public class TranslationsCheck
"Moving them to a special section in the file may be the better solution.");
}
- public static Map< String, Integer > diff(String source1, String source2) throws FileNotFoundException, IOException
+ public static Map< String, Integer > diff( final String source1, final String source2) throws FileNotFoundException, IOException
{
int missing = 0, outdated = 0;
// Standard Properties
- Properties p1 = new Properties();
+ final Properties p1 = new Properties();
p1.load( TranslationsCheck.class.getClassLoader().getResourceAsStream( base + source1 ) );
- Properties p2 = new Properties();
+ final Properties p2 = new Properties();
p2.load( TranslationsCheck.class.getClassLoader().getResourceAsStream( base + source2 ) );
- String msg = "Checking " + source2 + "...";
+ final String msg = "Checking " + source2 + "...";
System.out.println(msg);
Iterator< String > iter = sortedNames(p1).iterator();
while (iter.hasNext())
{
- String name = iter.next();
- String value = p1.getProperty(name);
+ final String name = iter.next();
+ final String value = p1.getProperty(name);
if (p2.get(name) == null)
{
@@ -151,8 +153,8 @@ public class TranslationsCheck
iter = sortedNames(p2).iterator();
while (iter.hasNext())
{
- String name = iter.next();
- String value = p2.getProperty(name);
+ final String name = iter.next();
+ final String value = p2.getProperty(name);
if (p1.get(name) == null)
{
@@ -170,16 +172,16 @@ public class TranslationsCheck
System.out.println();
}
- Map< String, Integer > diff = new HashMap< String, Integer >( 2 );
+ final Map< String, Integer > diff = new HashMap<>( 2 );
diff.put( "missing", missing );
diff.put( "outdated", outdated );
return diff;
}
- private static List<String> sortedNames(Properties p)
+ private static List<String> sortedNames( final Properties p)
{
- List<String> list = new ArrayList<String>();
- Enumeration<?> iter = p.propertyNames();
+ final List<String> list = new ArrayList<>();
+ final Enumeration<?> iter = p.propertyNames();
while (iter.hasMoreElements())
{
list.add( (String)iter.nextElement() );
@@ -189,12 +191,12 @@ public class TranslationsCheck
return list;
}
- public static int detectDuplicates(String source) throws IOException
+ public static int detectDuplicates( final String source) throws IOException
{
- Properties p = new Properties();
+ final Properties p = new Properties();
p.load( TranslationsCheck.class.getClassLoader().getResourceAsStream( base + source ) );
- Enumeration<?> iter = p.propertyNames();
+ final Enumeration<?> iter = p.propertyNames();
String currentStr;
while (iter.hasMoreElements())
{
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 223817c..3b6e81a 100644
--- a/jspwiki-main/src/main/java/org/apache/wiki/WikiEngine.java
+++ b/jspwiki-main/src/main/java/org/apache/wiki/WikiEngine.java
@@ -21,6 +21,7 @@ package org.apache.wiki;
import org.apache.commons.lang3.StringUtils;
import org.apache.log4j.Logger;
import org.apache.log4j.PropertyConfigurator;
+import org.apache.wiki.api.Release;
import org.apache.wiki.api.core.Engine;
import org.apache.wiki.api.exceptions.ProviderException;
import org.apache.wiki.api.exceptions.WikiException;
diff --git a/jspwiki-main/src/main/java/org/apache/wiki/Release.java b/jspwiki-main/src/main/java/org/apache/wiki/api/Release.java
similarity index 98%
rename from jspwiki-main/src/main/java/org/apache/wiki/Release.java
rename to jspwiki-main/src/main/java/org/apache/wiki/api/Release.java
index 9300941..4bd4ab5 100644
--- a/jspwiki-main/src/main/java/org/apache/wiki/Release.java
+++ b/jspwiki-main/src/main/java/org/apache/wiki/api/Release.java
@@ -17,7 +17,7 @@
under the License.
*/
-package org.apache.wiki;
+package org.apache.wiki.api;
import org.apache.commons.lang3.StringUtils;
@@ -26,7 +26,7 @@ import org.apache.commons.lang3.StringUtils;
* Contains release and version information. You may also invoke this class directly, in which case it prints
* out the version string. This is a handy way of checking which JSPWiki version you have - just type from a command line:
* <pre>
- * % java -cp JSPWiki.jar org.apache.wiki.Release
+ * % java -cp JSPWiki.jar org.apache.wiki.api.Release
* 2.5.38
* </pre>
* <p>
@@ -160,7 +160,7 @@ public final class Release {
* things like different command line tools.
* <P>Example:
* <PRE>
- * % java org.apache.wiki.Release
+ * % java org.apache.wiki.api.Release
* 1.9.26-cvs
* </PRE>
*
diff --git a/jspwiki-main/src/main/java/org/apache/wiki/modules/BaseModuleManager.java b/jspwiki-main/src/main/java/org/apache/wiki/modules/BaseModuleManager.java
index ffdab86..b096520 100644
--- a/jspwiki-main/src/main/java/org/apache/wiki/modules/BaseModuleManager.java
+++ b/jspwiki-main/src/main/java/org/apache/wiki/modules/BaseModuleManager.java
@@ -18,7 +18,7 @@
*/
package org.apache.wiki.modules;
-import org.apache.wiki.Release;
+import org.apache.wiki.api.Release;
import org.apache.wiki.api.core.Engine;
import java.util.Collection;
@@ -67,9 +67,7 @@ public abstract class BaseModuleManager implements ModuleManager {
final Set< WikiModuleInfo > ls = new TreeSet<>();
for( final Iterator< T > i = iterator; i.hasNext(); ) {
final WikiModuleInfo wmi = i.next();
- if( !ls.contains( wmi ) ) {
- ls.add( wmi );
- }
+ ls.add( wmi );
}
return ls;
diff --git a/jspwiki-main/src/main/java/org/apache/wiki/rss/AtomFeed.java b/jspwiki-main/src/main/java/org/apache/wiki/rss/AtomFeed.java
index 887accb..a67539a 100644
--- a/jspwiki-main/src/main/java/org/apache/wiki/rss/AtomFeed.java
+++ b/jspwiki-main/src/main/java/org/apache/wiki/rss/AtomFeed.java
@@ -19,9 +19,9 @@
package org.apache.wiki.rss;
import org.apache.commons.lang3.time.DateFormatUtils;
-import org.apache.wiki.Release;
import org.apache.wiki.WikiContext;
import org.apache.wiki.WikiPage;
+import org.apache.wiki.api.Release;
import org.apache.wiki.api.core.Engine;
import org.apache.wiki.api.exceptions.ProviderException;
import org.apache.wiki.attachment.Attachment;
@@ -132,20 +132,20 @@ public class AtomFeed extends Feed {
Date lastModified = new Date(0L);
for( final Entry e : m_entries ) {
- if( e.getPage().getLastModified().after( lastModified ) )
+ if( e.getPage().getLastModified().after( lastModified ) ) {
lastModified = e.getPage().getLastModified();
+ }
}
// Mandatory parts
- root.addContent( getElement("title").setText( getChannelTitle() ) );
- root.addContent( getElement("id").setText(getFeedID()) );
- root.addContent( getElement("updated").setText(DateFormatUtils.formatUTC( lastModified,
- RFC3339FORMAT ) ));
+ root.addContent( getElement( "title" ).setText( getChannelTitle() ) );
+ root.addContent( getElement( "id" ).setText( getFeedID() ) );
+ root.addContent( getElement( "updated" ).setText( DateFormatUtils.formatUTC( lastModified, RFC3339FORMAT ) ) );
// Optional
// root.addContent( getElement("author").addContent(getElement("name").setText(format())))
- root.addContent( getElement("link").setAttribute("href",engine.getBaseURL()));
- root.addContent( getElement("generator").setText("JSPWiki "+Release.VERSTR));
+ root.addContent( getElement( "link" ).setAttribute( "href", engine.getBaseURL() ) );
+ root.addContent( getElement( "generator" ).setText( "JSPWiki " + Release.VERSTR ) );
final String rssFeedURL = engine.getURL(WikiContext.NONE, "rss.jsp",
"page=" + engine.encodeName( m_wikiContext.getPage().getName() ) +
diff --git a/jspwiki-main/src/main/java/org/apache/wiki/rss/RSS20Feed.java b/jspwiki-main/src/main/java/org/apache/wiki/rss/RSS20Feed.java
index a14b8d8..52874d7 100644
--- a/jspwiki-main/src/main/java/org/apache/wiki/rss/RSS20Feed.java
+++ b/jspwiki-main/src/main/java/org/apache/wiki/rss/RSS20Feed.java
@@ -18,9 +18,9 @@
*/
package org.apache.wiki.rss;
-import org.apache.wiki.Release;
import org.apache.wiki.WikiContext;
import org.apache.wiki.WikiPage;
+import org.apache.wiki.api.Release;
import org.apache.wiki.api.core.Engine;
import org.apache.wiki.api.exceptions.ProviderException;
import org.apache.wiki.attachment.Attachment;
diff --git a/jspwiki-main/src/main/java/org/apache/wiki/ui/admin/DefaultAdminBeanManager.java b/jspwiki-main/src/main/java/org/apache/wiki/ui/admin/DefaultAdminBeanManager.java
index 1627b2c..3a3aa93 100644
--- a/jspwiki-main/src/main/java/org/apache/wiki/ui/admin/DefaultAdminBeanManager.java
+++ b/jspwiki-main/src/main/java/org/apache/wiki/ui/admin/DefaultAdminBeanManager.java
@@ -19,7 +19,7 @@
package org.apache.wiki.ui.admin;
import org.apache.log4j.Logger;
-import org.apache.wiki.Release;
+import org.apache.wiki.api.Release;
import org.apache.wiki.api.core.Engine;
import org.apache.wiki.event.WikiEngineEvent;
import org.apache.wiki.event.WikiEvent;
diff --git a/jspwiki-main/src/main/java/org/apache/wiki/ui/admin/beans/CoreBean.java b/jspwiki-main/src/main/java/org/apache/wiki/ui/admin/beans/CoreBean.java
index 7d201df..537b9dd 100644
--- a/jspwiki-main/src/main/java/org/apache/wiki/ui/admin/beans/CoreBean.java
+++ b/jspwiki-main/src/main/java/org/apache/wiki/ui/admin/beans/CoreBean.java
@@ -18,7 +18,7 @@
*/
package org.apache.wiki.ui.admin.beans;
-import org.apache.wiki.Release;
+import org.apache.wiki.api.Release;
import org.apache.wiki.api.core.Engine;
import org.apache.wiki.pages.PageManager;
import org.apache.wiki.ui.admin.SimpleAdminBean;
@@ -47,43 +47,40 @@ public class CoreBean extends SimpleAdminBean {
return m_engine.getManager( PageManager.class ).getTotalPageCount();
}
- public String getPagesDescription()
- {
+ public String getPagesDescription() {
return "The total number of pages in this wiki";
}
- public String getVersion()
- {
+ public String getVersion() {
return Release.VERSTR;
}
- public String getVersionDescription()
- {
+ public String getVersionDescription() {
return "The JSPWiki engine version";
}
- @Override public String getTitle()
- {
+ @Override
+ public String getTitle() {
return "Core bean";
}
- @Override public int getType()
- {
+ @Override
+ public int getType() {
return CORE;
}
- @Override public String getId()
- {
+ @Override
+ public String getId() {
return "corebean";
}
- @Override public String[] getAttributeNames()
- {
+ @Override
+ public String[] getAttributeNames() {
return ATTRIBUTES;
}
- @Override public String[] getMethodNames()
- {
+ @Override
+ public String[] getMethodNames() {
return METHODS;
}
diff --git a/jspwiki-main/src/main/java/org/apache/wiki/ui/admin/beans/ModuleBean.java b/jspwiki-main/src/main/java/org/apache/wiki/ui/admin/beans/ModuleBean.java
index 228e50a..9266d1e 100644
--- a/jspwiki-main/src/main/java/org/apache/wiki/ui/admin/beans/ModuleBean.java
+++ b/jspwiki-main/src/main/java/org/apache/wiki/ui/admin/beans/ModuleBean.java
@@ -19,8 +19,8 @@
package org.apache.wiki.ui.admin.beans;
import org.apache.commons.lang3.StringUtils;
-import org.apache.wiki.Release;
import org.apache.wiki.WikiContext;
+import org.apache.wiki.api.Release;
import org.apache.wiki.api.core.Engine;
import org.apache.wiki.modules.WikiModuleInfo;
import org.apache.wiki.ui.admin.SimpleAdminBean;
diff --git a/jspwiki-main/src/main/java/org/apache/wiki/variables/DefaultVariableManager.java b/jspwiki-main/src/main/java/org/apache/wiki/variables/DefaultVariableManager.java
index 4858655..d02b7f8 100644
--- a/jspwiki-main/src/main/java/org/apache/wiki/variables/DefaultVariableManager.java
+++ b/jspwiki-main/src/main/java/org/apache/wiki/variables/DefaultVariableManager.java
@@ -19,10 +19,10 @@
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.api.Release;
import org.apache.wiki.api.core.Session;
import org.apache.wiki.api.exceptions.NoSuchVariableException;
import org.apache.wiki.api.filters.PageFilter;
diff --git a/jspwiki-main/src/test/java/org/apache/wiki/ReleaseTest.java b/jspwiki-main/src/test/java/org/apache/wiki/ReleaseTest.java
deleted file mode 100644
index be9c452..0000000
--- a/jspwiki-main/src/test/java/org/apache/wiki/ReleaseTest.java
+++ /dev/null
@@ -1,156 +0,0 @@
-/*
- 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;
-
-import org.junit.jupiter.api.Test;
-import org.junit.jupiter.api.Assertions;
-
-public class ReleaseTest
-{
- @Test
- public void testNewer1()
- {
- Assertions.assertTrue( Release.isNewerOrEqual("1.0.100") );
- }
-
- @Test
- public void testNewer2()
- {
- Assertions.assertTrue( Release.isNewerOrEqual("2.0.0-alpha") );
- }
-
- @Test
- public void testNewer3()
- {
- Assertions.assertFalse( Release.isNewerOrEqual("10.0.0") );
- }
-
- @Test
- public void testNewer4()
- {
- Assertions.assertTrue( Release.isNewerOrEqual(Release.VERSTR) );
- }
-
- @Test
- public void testNewer5()
- {
- String rel = Release.VERSION+"."+Release.REVISION+"."+(Release.MINORREVISION+1)+"-cvs";
-
- Assertions.assertFalse( Release.isNewerOrEqual(rel) );
- }
-
- @Test
- public void testNewer6()
- {
- String rel = null;
-
- if( Release.MINORREVISION != 0 )
- rel = Release.VERSION+"."+Release.REVISION+"."+(Release.MINORREVISION-1)+"-cvs";
- else
- rel = Release.VERSION+"."+(Release.REVISION-1)+".9999"+"-cvs";
-
- Assertions.assertTrue( Release.isNewerOrEqual(rel) );
- }
-
- @Test
- public void testNewer7()
- {
- String rel = Release.VERSION+"."+Release.REVISION;
-
- Assertions.assertTrue( Release.isNewerOrEqual(rel) );
- }
-
- @Test
- public void testNewer8()
- {
- String rel = Release.VERSION+"";
-
- Assertions.assertTrue( Release.isNewerOrEqual(rel) );
- }
-
- @Test
- public void testOlder1()
- {
- Assertions.assertFalse( Release.isOlderOrEqual("1.0.100") );
- }
-
- @Test
- public void testOlder2()
- {
- Assertions.assertFalse( Release.isOlderOrEqual("2.0.0-alpha") );
- }
-
- @Test
- public void testOlder3()
- {
- Assertions.assertTrue( Release.isOlderOrEqual("10.0.0") );
- }
-
- @Test
- public void testOlder4()
- {
- Assertions.assertTrue( Release.isOlderOrEqual(Release.VERSTR) );
- }
-
- @Test
- public void testOlder5()
- {
- String rel = Release.VERSION+"."+Release.REVISION+"."+(Release.MINORREVISION+1)+"-cvs";
-
- Assertions.assertTrue( Release.isOlderOrEqual(rel) );
- }
-
- @Test
- public void testOlder6()
- {
- String rel;
-
- if( Release.MINORREVISION != 0 )
- rel = Release.VERSION+"."+Release.REVISION+"."+(Release.MINORREVISION-1)+"-cvs";
- else
- rel = Release.VERSION+"."+(Release.REVISION-1)+".9999"+"-cvs";
-
- Assertions.assertFalse( Release.isOlderOrEqual(rel) );
- }
-
- @Test
- public void testOlder7()
- {
- String rel = Release.VERSION+"."+Release.REVISION;
-
- Assertions.assertTrue( Release.isOlderOrEqual(rel) );
- }
-
- @Test
- public void testOlder8()
- {
- String rel = Release.VERSION+"";
-
- Assertions.assertTrue( Release.isOlderOrEqual(rel) );
- }
-
- @Test
- public void testOlder9()
- {
- String rel = "";
-
- Assertions.assertTrue( Release.isOlderOrEqual(rel) );
- }
-
-}
diff --git a/jspwiki-main/src/test/java/org/apache/wiki/api/ReleaseTest.java b/jspwiki-main/src/test/java/org/apache/wiki/api/ReleaseTest.java
new file mode 100644
index 0000000..76308bd
--- /dev/null
+++ b/jspwiki-main/src/test/java/org/apache/wiki/api/ReleaseTest.java
@@ -0,0 +1,133 @@
+/*
+ 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.api;
+
+import org.junit.jupiter.api.Assertions;
+import org.junit.jupiter.api.Test;
+
+
+public class ReleaseTest {
+
+ @Test
+ public void testNewer1() {
+ Assertions.assertTrue( Release.isNewerOrEqual( "1.0.100" ) );
+ }
+
+ @Test
+ public void testNewer2() {
+ Assertions.assertTrue( Release.isNewerOrEqual( "2.0.0-alpha" ) );
+ }
+
+ @Test
+ public void testNewer3() {
+ Assertions.assertFalse( Release.isNewerOrEqual( "10.0.0" ) );
+ }
+
+ @Test
+ public void testNewer4() {
+ Assertions.assertTrue( Release.isNewerOrEqual( Release.VERSTR ) );
+ }
+
+ @Test
+ public void testNewer5() {
+ final String rel = Release.VERSION + "." + Release.REVISION + "." + ( Release.MINORREVISION + 1 ) + "-cvs";
+ Assertions.assertFalse( Release.isNewerOrEqual( rel ) );
+ }
+
+ @Test
+ public void testNewer6() {
+ final String rel;
+ if( Release.MINORREVISION != 0 ) {
+ rel = Release.VERSION + "." + Release.REVISION + "." + ( Release.MINORREVISION - 1 ) + "-cvs";
+ } else {
+ rel = Release.VERSION + "." + ( Release.REVISION - 1 ) + ".9999" + "-cvs";
+ }
+
+ Assertions.assertTrue( Release.isNewerOrEqual( rel ) );
+ }
+
+ @Test
+ public void testNewer7() {
+ final String rel = Release.VERSION + "." + Release.REVISION;
+ Assertions.assertTrue( Release.isNewerOrEqual( rel ) );
+ }
+
+ @Test
+ public void testNewer8() {
+ final String rel = Release.VERSION + "";
+ Assertions.assertTrue( Release.isNewerOrEqual( rel ) );
+ }
+
+ @Test
+ public void testOlder1() {
+ Assertions.assertFalse( Release.isOlderOrEqual( "1.0.100" ) );
+ }
+
+ @Test
+ public void testOlder2() {
+ Assertions.assertFalse( Release.isOlderOrEqual( "2.0.0-alpha" ) );
+ }
+
+ @Test
+ public void testOlder3() {
+ Assertions.assertTrue( Release.isOlderOrEqual( "10.0.0" ) );
+ }
+
+ @Test
+ public void testOlder4() {
+ Assertions.assertTrue( Release.isOlderOrEqual( Release.VERSTR ) );
+ }
+
+ @Test
+ public void testOlder5() {
+ final String rel = Release.VERSION + "." + Release.REVISION + "." + ( Release.MINORREVISION + 1 ) + "-cvs";
+ Assertions.assertTrue( Release.isOlderOrEqual( rel ) );
+ }
+
+ @Test
+ public void testOlder6() {
+ final String rel;
+ if( Release.MINORREVISION != 0 ) {
+ rel = Release.VERSION + "." + Release.REVISION + "." + ( Release.MINORREVISION - 1 ) + "-cvs";
+ } else {
+ rel = Release.VERSION + "." + ( Release.REVISION - 1 ) + ".9999" + "-cvs";
+ }
+
+ Assertions.assertFalse( Release.isOlderOrEqual( rel ) );
+ }
+
+ @Test
+ public void testOlder7() {
+ final String rel = Release.VERSION + "." + Release.REVISION;
+ Assertions.assertTrue( Release.isOlderOrEqual( rel ) );
+ }
+
+ @Test
+ public void testOlder8() {
+ final String rel = Release.VERSION + "";
+ Assertions.assertTrue( Release.isOlderOrEqual( rel ) );
+ }
+
+ @Test
+ public void testOlder9() {
+ final String rel = "";
+ Assertions.assertTrue( Release.isOlderOrEqual( rel ) );
+ }
+
+}
diff --git a/jspwiki-war/src/main/webapp/templates/210/Favorites.jsp b/jspwiki-war/src/main/webapp/templates/210/Favorites.jsp
index 8918836..fd2ee5d 100644
--- a/jspwiki-war/src/main/webapp/templates/210/Favorites.jsp
+++ b/jspwiki-war/src/main/webapp/templates/210/Favorites.jsp
@@ -20,9 +20,10 @@
<%@ taglib uri="http://jspwiki.apache.org/tags" prefix="wiki" %>
<%@ taglib uri="http://java.sun.com/jsp/jstl/fmt" prefix="fmt" %>
<%@ page import="javax.servlet.jsp.jstl.fmt.*" %>
+<%@ page import="org.apache.wiki.*" %>
+<%@ page import="org.apache.wiki.api.Release" %>
<fmt:setLocale value="${prefs.Language}" />
<fmt:setBundle basename="templates.default"/>
-<%@ page import="org.apache.wiki.*" %>
<div id="favorites">
diff --git a/jspwiki-war/src/main/webapp/templates/210/Footer.jsp b/jspwiki-war/src/main/webapp/templates/210/Footer.jsp
index 4bc20de..8cc7c35 100644
--- a/jspwiki-war/src/main/webapp/templates/210/Footer.jsp
+++ b/jspwiki-war/src/main/webapp/templates/210/Footer.jsp
@@ -20,6 +20,7 @@
<%@ taglib uri="http://jspwiki.apache.org/tags" prefix="wiki" %>
<%@ taglib uri="http://java.sun.com/jsp/jstl/fmt" prefix="fmt" %>
<%@ page import="org.apache.wiki.*" %>
+<%@ page import="org.apache.wiki.api.Release" %>
<%@ page import="javax.servlet.jsp.jstl.fmt.*" %>
<fmt:setLocale value="${prefs.Language}" />
<fmt:setBundle basename="templates.default"/>
diff --git a/jspwiki-war/src/main/webapp/templates/default/Footer.jsp b/jspwiki-war/src/main/webapp/templates/default/Footer.jsp
index 83bde9d..a3ee529 100644
--- a/jspwiki-war/src/main/webapp/templates/default/Footer.jsp
+++ b/jspwiki-war/src/main/webapp/templates/default/Footer.jsp
@@ -19,7 +19,7 @@
<%@ taglib uri="http://jspwiki.apache.org/tags" prefix="wiki" %>
<%@ taglib uri="http://java.sun.com/jsp/jstl/fmt" prefix="fmt" %>
-<%@ page import="org.apache.wiki.*" %>
+<%@ page import="org.apache.wiki.api.Release" %>
<%@ page import="javax.servlet.jsp.jstl.fmt.*" %>
<fmt:setLocale value="${prefs.Language}" />
<fmt:setBundle basename="templates.default"/>