From 253ad98e6f6d1ee953fadfb55b8e341745116be4 Mon Sep 17 00:00:00 2001 From: Alex O'Ree Date: Mon, 15 Dec 2025 21:06:15 -0500 Subject: [PATCH 1/3] JSPWIKI-1267 form elements are not listed --- .../api/providers/AttachmentProvider.java | 2 +- .../src/main/resources/ini/jspwiki_module.xml | 25 ++++++++++++++++++- 2 files changed, 25 insertions(+), 2 deletions(-) diff --git a/jspwiki-api/src/main/java/org/apache/wiki/api/providers/AttachmentProvider.java b/jspwiki-api/src/main/java/org/apache/wiki/api/providers/AttachmentProvider.java index 88cb03d8bd..40db697534 100644 --- a/jspwiki-api/src/main/java/org/apache/wiki/api/providers/AttachmentProvider.java +++ b/jspwiki-api/src/main/java/org/apache/wiki/api/providers/AttachmentProvider.java @@ -99,7 +99,7 @@ public interface AttachmentProvider extends WikiProvider { * * @param page The parent page * @param name The name of the attachment - * @param version The version of the attachment (it's okay to use WikiPage.LATEST_VERSION to find the latest one) + * @param version The version of the attachment (it's okay to use {@link WikiProvider#.LATEST_VERSION} to find the latest one) * @return An attachment object * @throws ProviderException If the attachment cannot be found or some other error occurs. */ diff --git a/jspwiki-main/src/main/resources/ini/jspwiki_module.xml b/jspwiki-main/src/main/resources/ini/jspwiki_module.xml index 3ef2883c25..3deb6e35d8 100644 --- a/jspwiki-main/src/main/resources/ini/jspwiki_module.xml +++ b/jspwiki-main/src/main/resources/ini/jspwiki_module.xml @@ -145,7 +145,30 @@ ASF 2.4 - + + ASF + 2.6 + + + ASF + 2.6 + + + ASF + 2.6 + + + ASF + 2.6 + + + ASF + 2.6 + + + ASF + 2.6 + Janne Jalkanen 2.6 From bc04cc154783ea35113a1975ef673ca50e02c254 Mon Sep 17 00:00:00 2001 From: Alex O'Ree Date: Mon, 15 Dec 2025 21:07:41 -0500 Subject: [PATCH 2/3] JSPWIKI-1267 form elements are not listed --- jspwiki-main/src/main/resources/ini/jspwiki_module.xml | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/jspwiki-main/src/main/resources/ini/jspwiki_module.xml b/jspwiki-main/src/main/resources/ini/jspwiki_module.xml index 3deb6e35d8..21e53e529d 100644 --- a/jspwiki-main/src/main/resources/ini/jspwiki_module.xml +++ b/jspwiki-main/src/main/resources/ini/jspwiki_module.xml @@ -169,6 +169,10 @@ ASF 2.6 + + ASF + 2.6 + Janne Jalkanen 2.6 From a28455deea370e4df4010af02048470aed460808 Mon Sep 17 00:00:00 2001 From: Alex O'Ree Date: Tue, 16 Dec 2025 07:31:26 -0500 Subject: [PATCH 3/3] JSPWIKI-1267 fixes the test and adds a sorter --- .../wiki/search/DefaultSearchManager.java | 9 +++ .../src/main/resources/ini/jspwiki_module.xml | 2 +- .../wiki/ui/admin/beans/PluginBeanTest.java | 65 ++++++++++--------- 3 files changed, 44 insertions(+), 32 deletions(-) diff --git a/jspwiki-main/src/main/java/org/apache/wiki/search/DefaultSearchManager.java b/jspwiki-main/src/main/java/org/apache/wiki/search/DefaultSearchManager.java index 0cf75e574b..198adfd766 100644 --- a/jspwiki-main/src/main/java/org/apache/wiki/search/DefaultSearchManager.java +++ b/jspwiki-main/src/main/java/org/apache/wiki/search/DefaultSearchManager.java @@ -48,6 +48,8 @@ Licensed to the Apache Software Foundation (ASF) under one import java.io.IOException; import java.util.ArrayList; import java.util.Collection; +import java.util.Collections; +import java.util.Comparator; import java.util.HashMap; import java.util.Iterator; import java.util.List; @@ -126,6 +128,13 @@ public void service( final HttpServletRequest req, if (locale == null) { locale = Locale.getDefault(); } + final Locale sorter = locale; + Collections.sort(plugins, new Comparator() { + @Override + public int compare(Plugin o1, Plugin o2) { + return o1.getDisplayName(sorter).compareTo(o2.getDisplayName(sorter)); + } + }); for (Plugin p : plugins) { try { SimpleSnipData data = new SimpleSnipData(); diff --git a/jspwiki-main/src/main/resources/ini/jspwiki_module.xml b/jspwiki-main/src/main/resources/ini/jspwiki_module.xml index 21e53e529d..4b319f6df6 100644 --- a/jspwiki-main/src/main/resources/ini/jspwiki_module.xml +++ b/jspwiki-main/src/main/resources/ini/jspwiki_module.xml @@ -165,7 +165,7 @@ ASF 2.6 - + ASF 2.6 diff --git a/jspwiki-main/src/test/java/org/apache/wiki/ui/admin/beans/PluginBeanTest.java b/jspwiki-main/src/test/java/org/apache/wiki/ui/admin/beans/PluginBeanTest.java index ebbc575a08..f13a6a087a 100644 --- a/jspwiki-main/src/test/java/org/apache/wiki/ui/admin/beans/PluginBeanTest.java +++ b/jspwiki-main/src/test/java/org/apache/wiki/ui/admin/beans/PluginBeanTest.java @@ -39,37 +39,40 @@ public void testDoGet() throws WikiException, NotCompliantMBeanException { testEngine = new TestEngine(props); final Context context = Wiki.context().create(testEngine, Wiki.contents().page(testEngine, "TestPage01")); final PluginBean pb = new PluginBean(testEngine); - final String expectedHtml = - "
" - + "

Plugins

" - + "" - + "" - + "" - + "" - + "" - + "" - + "" - + "" - + "" - + "" - + "" - + "" - + "" - + "" - + "" - + "" - + "" - + "" - + "" - + "" - + "" - + "" - + "" - + "" - + "" - + "" - + "
NameAliasAuthorNotes
CounterASF
CurrentTimePluginASF
DenounceASF
GroupsASF
IfPluginIfJanne Jalkanen
ImageASF
IndexPluginASF
InsertPageASF
ListLocksPluginASF
NoteJanne Jalkanen
PageViewPluginASF
RecentChangesPluginASF
ReferredPagesPluginASF
ReferringPagesPluginASF
ReferringUndefinedPagesPluginASF
SamplePluginsamplealiasJanne Jalkanen
SamplePlugin2samplealias2Janne Jalkanen
SearchASF
TableOfContentsASF
UndefinedPagesPluginASF
UnusedPagesPluginASF
WeblogArchivePluginASF
WeblogEntryPluginASF
WeblogPluginASF
" - + "
"; + final String expectedHtml + = "

Plugins

" + + "" + + "" + + "" + + "" + + "" + + "" + + "" + + "" + + "" + + "" + + "" + + "" + + "" + + "" + + "" + + "" + + "" + + "" + + "" + + "" + + "" + + "" + + "" + + "" + + "" + + "" + + "" + + "" + + "" + + "" + + "" + + "
NameAliasAuthorNotes
CounterASF
CurrentTimePluginASF
DenounceASF
FormCloseASF
FormInputASF
FormOpenASF
FormOutputASF
FormSelectASF
FormSetASF
FormTextareaASF
GroupsASF
IfPluginIfJanne Jalkanen
ImageASF
IndexPluginASF
InsertPageASF
ListLocksPluginASF
NoteJanne Jalkanen
PageViewPluginASF
RecentChangesPluginASF
ReferredPagesPluginASF
ReferringPagesPluginASF
ReferringUndefinedPagesPluginASF
SamplePluginsamplealiasJanne Jalkanen
SamplePlugin2samplealias2Janne Jalkanen
SearchASF
TableOfContentsASF
UndefinedPagesPluginASF
UnusedPagesPluginASF
WeblogArchivePluginASF
WeblogEntryPluginASF
WeblogPluginASF
"; Assertions.assertEquals(expectedHtml, pb.doGet(context)); }