Skip to content

Bug/jspwiki 1267 registers the remaining plugins #485

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
spyhunter99 merged 3 commits into from
Dec 16, 2025
Merged

Bug/jspwiki 1267 registers the remaining plugins #485

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
253ad98
JSPWIKI-1267 form elements are not listed
spyhunter99 Dec 16, 2025
bc04cc1
JSPWIKI-1267 form elements are not listed
spyhunter99 Dec 16, 2025
a28455d
JSPWIKI-1267 fixes the test and adds a sorter
spyhunter99 Dec 16, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion jspwiki-api/src/main/java/org/apache/wiki/api/providers/AttachmentProvider.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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.
*/
Expand Down
9 changes: 9 additions & 0 deletions jspwiki-main/src/main/java/org/apache/wiki/search/DefaultSearchManager.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down Expand Up @@ -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<Plugin>() {
@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();
Expand Down
29 changes: 28 additions & 1 deletion jspwiki-main/src/main/resources/ini/jspwiki_module.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -145,7 +145,34 @@
<author>ASF</author>
<minVersion>2.4</minVersion>
</plugin>

<plugin class="org.apache.wiki.forms.FormClose">
<author>ASF</author>
<minVersion>2.6</minVersion>
</plugin>
<plugin class="org.apache.wiki.forms.FormOpen">
<author>ASF</author>
<minVersion>2.6</minVersion>
</plugin>
<plugin class="org.apache.wiki.forms.FormInput">
<author>ASF</author>
<minVersion>2.6</minVersion>
</plugin>
<plugin class="org.apache.wiki.forms.FormOutput">
<author>ASF</author>
<minVersion>2.6</minVersion>
</plugin>
<plugin class="org.apache.wiki.forms.FormSelect">
<author>ASF</author>
<minVersion>2.6</minVersion>
</plugin>
<plugin class="org.apache.wiki.forms.FormTextarea">
<author>ASF</author>
<minVersion>2.6</minVersion>
</plugin>
<plugin class="org.apache.wiki.forms.FormSet">
<author>ASF</author>
<minVersion>2.6</minVersion>
</plugin>
<filter class="org.apache.wiki.filters.SpamFilter">
<author>Janne Jalkanen</author>
<minVersion>2.6</minVersion>
Expand Down
65 changes: 34 additions & 31 deletions jspwiki-main/src/test/java/org/apache/wiki/ui/admin/beans/PluginBeanTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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 =
"<div>"
+ "<h4>Plugins</h4>"
+ "<table border=\"1\">"
+ "<tr><th>Name</th><th>Alias</th><th>Author</th><th>Notes</th></tr>"
+ "<tr><td>Counter</td><td></td><td>ASF</td><td></td></tr>"
+ "<tr><td>CurrentTimePlugin</td><td></td><td>ASF</td><td></td></tr>"
+ "<tr><td>Denounce</td><td></td><td>ASF</td><td></td></tr>"
+ "<tr><td>Groups</td><td></td><td>ASF</td><td></td></tr>"
+ "<tr><td>IfPlugin</td><td>If</td><td>Janne Jalkanen</td><td></td></tr>"
+ "<tr><td>Image</td><td></td><td>ASF</td><td></td></tr>"
+ "<tr><td>IndexPlugin</td><td></td><td>ASF</td><td></td></tr>"
+ "<tr><td>InsertPage</td><td></td><td>ASF</td><td></td></tr>"
+ "<tr><td>ListLocksPlugin</td><td></td><td>ASF</td><td></td></tr>"
+ "<tr><td>Note</td><td></td><td>Janne Jalkanen</td><td></td></tr>"
+ "<tr><td>PageViewPlugin</td><td></td><td>ASF</td><td></td></tr>"
+ "<tr><td>RecentChangesPlugin</td><td></td><td>ASF</td><td></td></tr>"
+ "<tr><td>ReferredPagesPlugin</td><td></td><td>ASF</td><td></td></tr>"
+ "<tr><td>ReferringPagesPlugin</td><td></td><td>ASF</td><td></td></tr>"
+ "<tr><td>ReferringUndefinedPagesPlugin</td><td></td><td>ASF</td><td></td></tr>"
+ "<tr><td>SamplePlugin</td><td>samplealias</td><td>Janne Jalkanen</td><td></td></tr>"
+ "<tr><td>SamplePlugin2</td><td>samplealias2</td><td>Janne Jalkanen</td><td></td></tr>"
+ "<tr><td>Search</td><td></td><td>ASF</td><td></td></tr>"
+ "<tr><td>TableOfContents</td><td></td><td>ASF</td><td></td></tr>"
+ "<tr><td>UndefinedPagesPlugin</td><td></td><td>ASF</td><td></td></tr>"
+ "<tr><td>UnusedPagesPlugin</td><td></td><td>ASF</td><td></td></tr>"
+ "<tr><td>WeblogArchivePlugin</td><td></td><td>ASF</td><td></td></tr>"
+ "<tr><td>WeblogEntryPlugin</td><td></td><td>ASF</td><td></td></tr>"
+ "<tr><td>WeblogPlugin</td><td></td><td>ASF</td><td></td></tr>"
+ "</table>"
+ "</div>";
final String expectedHtml
= "<div><h4>Plugins</h4><table border=\"1\">"
+ "<tr><th>Name</th><th>Alias</th><th>Author</th><th>Notes</th></tr>"
+ "<tr><td>Counter</td><td></td><td>ASF</td><td></td></tr>"
+ "<tr><td>CurrentTimePlugin</td><td></td><td>ASF</td><td></td></tr>"
+ "<tr><td>Denounce</td><td></td><td>ASF</td><td></td></tr>"
+ "<tr><td>FormClose</td><td></td><td>ASF</td><td></td></tr>"
+ "<tr><td>FormInput</td><td></td><td>ASF</td><td></td></tr>"
+ "<tr><td>FormOpen</td><td></td><td>ASF</td><td></td></tr>"
+ "<tr><td>FormOutput</td><td></td><td>ASF</td><td></td></tr>"
+ "<tr><td>FormSelect</td><td></td><td>ASF</td><td></td></tr>"
+ "<tr><td>FormSet</td><td></td><td>ASF</td><td></td></tr>"
+ "<tr><td>FormTextarea</td><td></td><td>ASF</td><td></td></tr>"
+ "<tr><td>Groups</td><td></td><td>ASF</td><td></td></tr>"
+ "<tr><td>IfPlugin</td><td>If</td><td>Janne Jalkanen</td><td></td></tr>"
+ "<tr><td>Image</td><td></td><td>ASF</td><td></td></tr>"
+ "<tr><td>IndexPlugin</td><td></td><td>ASF</td><td></td></tr>"
+ "<tr><td>InsertPage</td><td></td><td>ASF</td><td></td></tr>"
+ "<tr><td>ListLocksPlugin</td><td></td><td>ASF</td><td></td></tr>"
+ "<tr><td>Note</td><td></td><td>Janne Jalkanen</td><td></td></tr>"
+ "<tr><td>PageViewPlugin</td><td></td><td>ASF</td><td></td></tr>"
+ "<tr><td>RecentChangesPlugin</td><td></td><td>ASF</td><td></td></tr>"
+ "<tr><td>ReferredPagesPlugin</td><td></td><td>ASF</td><td></td></tr>"
+ "<tr><td>ReferringPagesPlugin</td><td></td><td>ASF</td><td></td></tr>"
+ "<tr><td>ReferringUndefinedPagesPlugin</td><td></td><td>ASF</td><td></td></tr>"
+ "<tr><td>SamplePlugin</td><td>samplealias</td><td>Janne Jalkanen</td><td></td></tr>"
+ "<tr><td>SamplePlugin2</td><td>samplealias2</td><td>Janne Jalkanen</td><td></td></tr>"
+ "<tr><td>Search</td><td></td><td>ASF</td><td></td></tr>"
+ "<tr><td>TableOfContents</td><td></td><td>ASF</td><td></td></tr>"
+ "<tr><td>UndefinedPagesPlugin</td><td></td><td>ASF</td><td></td></tr>"
+ "<tr><td>UnusedPagesPlugin</td><td></td><td>ASF</td><td></td></tr>"
+ "<tr><td>WeblogArchivePlugin</td><td></td><td>ASF</td><td></td></tr>"
+ "<tr><td>WeblogEntryPlugin</td><td></td><td>ASF</td><td></td></tr>"
+ "<tr><td>WeblogPlugin</td><td></td><td>ASF</td><td></td></tr></table></div>";
Assertions.assertEquals(expectedHtml, pb.doGet(context));
}

Expand Down
Loading