This is an automated email from the ASF dual-hosted git repository.
github-bot pushed a change to branch dependabot/maven/org.jdom-jdom2-2.0.6.1
in repository https://gitbox.apache.org/repos/asf/jspwiki.git
omit 14c5be984 Bump jdom2 from 2.0.6 to 2.0.6.1
add 37ea946fe Update dependencies
add 70b7c1605 Add missing Finnish translations in properties file.
add ab7dfeb5d Merge pull request #305 from arturobernalg/JSPWIKI-778
add 3a732365a [JSPWIKI-1165] wrap long inline preformatted text
add 86da49709 [JSPWIKI-1167] prettify line numbering is wrong with longer
lines
add 96d54b732 JSPWIKI-1181 - Fix: Correct URL generation for pages with
special characters
add 41f558601 Merge pull request #310 from arturobernalg/JSPWIKI-1181
add cdd36ac22 update kendra to 1.12.565
add ed406bc16 fix failing test under windows os
add 9f81a345e update portable binaries to tomcat 9.0.80
add a295baf2b update LICENSE file
add 777ac8d8d Complete ChangeLog entries
add f9cc0c8a1 2.12.2-git-04
add a468244e7 revert to new default subject lines
add 041cd532b JSPWIKI-1056: Enhance Absolute URL Utility Methods in
HttpUtil
add 0cf7a0429 Merge pull request #311 from arturobernalg/JSPWIKI-1056
add 0e7032239 JSPWIKI-925: Add missing i18n literals for multiple languages
add 59f1678bf Merge pull request #312 from arturobernalg/JSPWIKI-925
add e2f0bf68e This commit replaces instances of 'size() == 0' with
'isEmpty()' in relevant code files. The change is aimed at:
add c37247ab5 Merge pull request #314 from arturobernalg/isEmpty
add aaf37c166 JSPWIKI-1184: Image missing and German text typo
add d5d66d435 AttachmentServlet now respects
jspwiki.attachment.forceDownload pattern and will refuse to inline content
matching those extensions
add 18f83cf84 Added .svg to default jspwiki.attachment.forceDownload
patterns
add 19d568ff8 Dependency updates
add ef6a509c0 update tomcat portable binaries to 9.0.83
add 84653bf76 2.12.2-git-08
add 921f8bbcd Fix test compilation due to move to Jamm 0.4.0
add 432361b4d Update URLConstructor.java
add 4b2323ce6 Update Viewer.js
add 87bbf3fa7 Add some unit tests for URLConstructor#parsePageFromURL
add 2340cd013 fix typo
add 2c83da12c Update dependencies
add 7b4e95c13 2.12.2-git-09
add 03fba43cc udpate project-info-reports-plugin to 3.5.0 - no version bump
add 1ee6fd6c3 use engine.getEncoding instead of response.getEncoding
add 082fae508 url decode name, it's needed to get the appropiate page name
add e5d70645f update commons-lang to 3.14.0
add d18dc3ac6 Introduce CustomWikiEventListeners, as an easy way to
register 3rd party listeners
add 815861430 update commons-lang to 3.14.0
add c14fb662d Update cargo to 1.10.11 - closes #324, thanks to dependabot
add 1ce7f38c5 2.12.2-git-10
add abd3d8b60 Call ServletRequest#setCharacterEncoding prior to calling
URLConstructor#parsePageFrom URL
add 557469452 Dependency updates
add f46c00b63 2.12.2-git-11
add d09539131 Dependency updates
add 203ab122d publish SBOMs
add fc1409682 Update tomcat binaries
add c1375efd7 BasicAttachmentProvider doesn't throw an Exception if
attachment metadata files are not correctly formed
add b5b328374 2.12.2-git-12
add b553be9b9 JSPWIKI-1188 system property expansion
add b10f148f1 JSPWIKI-1188 additional test coverage
add 2b06d7a78 JSPWIKI-1188 rearranges the config loading to support the
property replacement
add 183b7a83d Extract system property expansion to its own method
add 8cdd18796 MailUtil now uses every mail.smtp / mail.smtps property
provided through your jspwiki(-custom).properties file
add 2cc751fbd Add missing license
add 4c88d8fa1 Update dependencies * Apache parent to 32 * Commons
Text to 1.12.0 * JavaMail to 1.6.2 * Jetty to 9.4.54.v20240208 *
Tomcat to 9.0.88 * Maven plugins: jar to 3.4.1, cargo to 1.10.12, sonar to
3.11.0.3922
add 412091421 Update portable build binaries
add d718b8225 2.12.2-git-13
add b5201a55c try TLSv1.2 for sendMail test
add cc60beeee Show test stdout, stderr and stacktraces on test
failure/error
add 8c0d55e34 Seems that sonarcloud.io now requires running JDK-17 for the
local analysis, hopefully this completes fixing the CI build
add 52f050153 Thanks to the sonarqube scanner, we now have 3 mvn builds,
so let's skip running tests on deploy, as we've already passed them.
add 75024462e fix typo
add 59ad1a530 Fix possible ArrayIndexOutOfBOundsException
add f79d41cb5 JSPWIKI-1190: generate markdown flavour of wikipages as part
of the build
add 3cefebd7a Update dependencies * Awaitility to 4.2.1 * Log4J to
2.23.1 * Maven plugins: install to 3.1.2, cargo to 1.10.13
add 936486065 2.12.2-git-14
add d29db6532 fix typo
add da7dc7dcf generate markdown wikipages even when setting -DskipTests -
use -Dskip-markdown-pages-generation to skip this step
add 480e900b8 JSPWIKI-1186: Windows, install.jsp double escapes the
jspwiki.workDir and nothing else
add f29e0baf4 Update tomcat binaries and dependencies
add 9256c8101 2.12.2-git-15
add 4bf69d9b2 fix Dockerfile build - no version bump
add b9d58b7af fix Dockerfile build - no version bump
add 55d6a3bfc Always generate test-jar
add e67a9b1f0 Build with jdk21 instead of 19
add 640a7891a Dependencies and plugins update - closes #344, closes #345,
closes #346
add e78bd8fe6 2.12.2-git-16
add 71424cc58 prepare for 2.12.2
add efe50b0e1 [maven-release-plugin] prepare release 2.12.2-RC1
add 867e9b4e0 [maven-release-plugin] prepare for next development iteration
add 196767ef5 Update CalendarTag.java
add 9c6e10268 Update jspwiki.tld
add b677253a4 Update Sidebar.jsp
add 6c558f378 Update CalendarTag.java
add 5283a2ec4 Update Tomcat to 9.0.90 and several maven plugins
add a96e93453 update portable binaries
add 6235b10a6 Fix issue with CI build not findind a test-jar
add 31f539a1f 2.12.3-git-01
add b3847dcb9 Make MBeans
add 58614efa6 Fix SampleAjaxPlugin
add 5eeb34041 minor change to use the os utils class commons-lang3 that
was already in the classpath
add 9073db5b8 jspwiki.attachment.forceDownload now accepts * as a way to
always enforce attachment download
add abb701cd0 add .pdf and .xml extensions to
jspwiki.attachment.forceDownload default value
add 008c9f7f3 Dependency updates, closes #353, closes #364, closes #365
add e438af054 Update portable binaries + provide working URLs to download
launch4j files
add 7bf665751 2.12.3-git-02
add bd412b29b JSPWIKI-1197 fix for if and when someone, other software
(antivirus, etc) or a human deletes an attachment from disk and leaves behind a
properties file in the attachment director for a given wiki page. Before this
change jspwiki would not boot up in this condition. After it will and simply
logs this error condition.
add 76669e391 formatting
add 101f7c28c Update dependencies
add 5ad653676 2.12.3-git-03
add a184e0a53 Update portable build binaries
add 402f9a18b [SECURITY][XBOW-024-109] Fix XSS vulnerability in header
link rendering
add f4089cb6d Merge pull request #376 from arturobernalg/JSPWIKI-1204
add 5ab4d876a Move escapeHTMLEntities to TextUtil
add 5a9ac33f9 Move xstream version to parent pom
add a49b2fd5c Allow data: or javascript: uris on src attribute of Image
plugin only if jspwiki.translatorReader.allowHTML is enabled
add c21f6e164 Additional tests + small refactors
add 1af646697 Proper fix + use constant from MarkupParser
add 44d70e4a5 Allow text to be wrapped on a given tag
add bd790309b Update dependencies
add 184f18595 Update tomcat launcher binary files to 9.0.102
add 5b9dab428 Proper HTML escaping + introduce WikiHtmlInline to be able
to avoid HTML escaping performed by Flexmark
add 629ac8c96 2.12.3-git-05
add 777d5e472 Normalize user input in registration
add 814459402 Polish tests
add 40f59e632 Proper digest comparison on CryptoUtil.verifySaltedPassword
add 77608854a Update dependencies, closes #373, closes #375
add f7d8573f5 2.12.3-git-06
add 835e5664c Introduce CachingManager#registerListener(..) so that
caching providers are able to register expired cache listeners - closes #362
add c8ecc2324 Upgrade dependencies - closes #379, closes #382, closes #383
add 05d4a079f upgrade tomcat portable binaries
add 3bce33ddd Extract suitable jspwiki.woas.version property for portable
build from project.version instead of hard coding it into build.xml
add 8f92f38ca 2.12.3-git-07
add f53252333 add bin to list of ignored patterns
add 93583f018 Fix StringIndexOutOfBoundsException
add 8e27da0a2 es_ES translation tweaks
add 0ea257298 Upgrate dependencies - closes #385, closes #386, closes #387
add cf20ca07c Upgrade tomcat portable binaries
add 812b86a16 refer closed PRs from dependabot
add 33c83bcbb 2.12.3-git-08
add 611768828 Ensure that Log4J2 configuration from only loads Log4J2
related properties, as it's needed when upgrading it to 2.25
add 897b5508b Dependencies upgrade
add 1d6ab1b26 2.12.3-git-09
add 3787eb422 Update JUnit to 5.13.4, sonar-maven-plugin to 5.1.0.4751
(closes #393) - No version bump
add 6f1245b7a Prepare 2.12.3
add 9721a8152 [maven-release-plugin] prepare release 2.12.3-RC1
add 70e19515d [maven-release-plugin] prepare for next development iteration
add e1b8f280e back to 2.12.3-SNAPSHOT
add c19aa0b79 2.12.3-git-10: further fixes to ensure that Log4J2 only
processes properties related to it
add dd7ed1376 prepare again for 2.12.3
add 0aaa83fa0 restore correct value
add e04dda38b [maven-release-plugin] prepare release 2.12.3-RC2
add 988075c26 [maven-release-plugin] prepare for next development iteration
add 7f8cb4db6 First push post 2.12.3 release
add 456025f66 javax to jakarta
add 3d0c11c97 AttachmentServlet to Commons FileUpload 2
add f20237340 jakarta schemaLocation
add 21336c2a1 Fixed most unit tests
add 52863553a MailUtilTest
add d9e9a2aed remaining Tests work
add 5f308e751 remove Stripes, http mocking is done through Mockito at the
HttpMockFactory class
add cf21830bf remove Jetty usage
add 63e325d4f Rework poms
add 631395db9 Removes angus-mail definition, as it not used anywhere + fix
a typo
add f718f0346 pulled out xmlrpc
add ca4cc28d1 typo
add d1569d697 moved xmlrpc to web-fragment
add 6129d90ba add jboss-deployment-structure.xml
add 905cb4c79 Delete jspwiki-wikipages/de/.gitignore
add 4fe2aed89 Depedencies update
add 13d2c910f Update tomcat binaries
add 017d45d9c 3.0.0-git-01
add f1cb3a80e Leftovers from proper rebase from master
add c0b16bff0 Dockerfile FROM tomcat 10.1
add 9a4374877 Remove deprecated libraries usage + use some jdk-17
constructs
add 30656981e remove extra whitespace
add 5a3a93574 Update dependencies
add f01aabfeb Update wro4j maven plugin to 2.1.1 + fix typo preventing
including polyfills.js to be processed by wro4j
add 705b7c6aa Update dependencies
add c31d4f284 3.0.0-git-02
add 784d30488 JSPWIKI-1183 applies the suggestion change and patch file as
submitted
add 4523bfbdc JSPWIKI-1183 switches to commons-net to keep inline with
apache guidance
add 72a33aa27 JSPWIKI-1217 should resolve the maven parallel build failure
on the ci server.
add c22370070 JSPWIKI-1183 potential fix for the rss generator test
failure when running in parallel
add 471b66704 JSPWIKI-1183 potential fix for the rss generator test
failure when running in parallel. adds JDK25 check for security manager related
behavior change
add ebffd26d1 JSPWIKI-1183 potential fix for the rss generator test
failure when running in parallel. adds JDK25 check for security manager related
behavior change
add 1b963fcf7 temporarily turn on unit test output to diagnosis ci failures
add d006fc706 temporarily turn on unit test output to diagnosis ci failures
add 10b8a8be1 temporarily turn on unit test output to diagnosis ci failures
add 755c8f742 JSPWIKI-1213 adds jacoco to the build
add 7d46d9fdc Merge pull request #409 from spyhunter99/feature/JSPWIKI-1213
add 3e455866d JSPWIKI-615 adds some javadocs to the WikiEvent class as
requested
add 14e158808 typo
add fe415816a Merge pull request #411 from
spyhunter99/feature/JSPWIKI-615-docs
add 575d8ede3 Merge branch 'master' into
feature/JSPWIKI-1183-if-with-ip-check
add 247af3a6a JSPWIKI-1211 minor tweak to fix a bootup issue when the rss
directory path does not exist
add fdbd3fffe JSPWIKI-1211 adds notes for the rss path calculation
add 14c3762ce Merge pull request #408 from spyhunter99/bug/JSPWIKI-1211
add 2bdeb73fb JSPWIKI-1207 temporary fix for the ehcache causing bootup
crashes on the portable builds
add 4e9fd2796 Merge pull request #404 from spyhunter99/bug/JSPWIKI-1207
add 14a779fac JSPWIKI-1183 another attempt to remove the duplicate test
and get the ci builds working again
add e0e182a7d Merge pull request #413 from apache/bug/disableSecondRssTest
add ce43eb1de JSPWIKI-1216 removes references to the WikiWizard
template/editor types. adds a test to ensure that there are no missing I18N
strings among all the i18n properties files, none were found
add e40b065bf Merge pull request #412 from spyhunter99/bug/JSPWIKI-1216
add a31f8b817 Merge branch 'master' into
feature/JSPWIKI-1183-if-with-ip-check
add 7d1b0754e Merge pull request #410 from
spyhunter99/feature/JSPWIKI-1183-if-with-ip-check
add c203c8430 Bump jakarta.mail:jakarta.mail-api from 2.1.3 to 2.1.5
add 7f3ce88b3 Merge pull request #400 from
apache/dependabot/maven/jakarta.mail-jakarta.mail-api-2.1.5
add 6a8b400ea Bump jdom2 from 2.0.6 to 2.0.6.1
This update added new revisions after undoing existing revisions.
That is to say, some revisions that were in the old version of the
branch are not in the new version. This situation occurs
when a user --force pushes a change and generates a repository
containing something like this:
* -- * -- B -- O -- O -- O (14c5be984)
\
N -- N -- N refs/heads/dependabot/maven/org.jdom-jdom2-2.0.6.1
(6a8b400ea)
You should already have received notification emails for all of the O
revisions, and so the following emails describe only the N revisions
from the common base, B.
Any revisions marked "omit" are not gone; other references still
refer to them. Any revisions marked "discard" are gone forever.
No new revisions were added by this update.
Summary of changes:
.asf.yaml | 20 +-
.gitignore | 23 +-
ChangeLog.md | 365 ++++++++++++
Dockerfile | 8 +-
Jenkinsfile | 33 +-
LICENSE | 114 ++--
README.md | 8 +-
ReleaseNotes | 5 +
jspwiki-210-adapters/pom.xml | 32 +-
jspwiki-210-test-adaptees/pom.xml | 3 +-
jspwiki-api/pom.xml | 165 +++---
.../src/main/java/org/apache/wiki/api/Release.java | 10 +-
.../java/org/apache/wiki/api/core/Context.java | 4 +-
.../main/java/org/apache/wiki/api/core/Engine.java | 16 +-
.../CustomWikiEventListener.java} | 26 +-
.../java/org/apache/wiki/api/events}/package.html | 4 +-
.../wiki/api/providers/AttachmentProvider.java | 2 +-
.../java/org/apache/wiki/api/spi/ContextDSL.java | 2 +-
.../java/org/apache/wiki/api/spi/ContextSPI.java | 2 +-
.../java/org/apache/wiki/api/spi/EngineDSL.java | 4 +-
.../java/org/apache/wiki/api/spi/EngineSPI.java | 2 +-
.../java/org/apache/wiki/api/spi/SessionDSL.java | 2 +-
.../java/org/apache/wiki/api/spi/SessionSPI.java | 2 +-
.../main/java/org/apache/wiki/api/spi/Wiki.java | 2 +-
.../test/java/org/apache/wiki/api/ReleaseTest.java | 3 +
.../CustomWikiEventListenerTest.java} | 32 +-
.../CustomWikiEventListenerTestImpl.java} | 29 +-
.../apache/wiki/api/spi/ContextSPITestImpl.java | 2 +-
.../org/apache/wiki/api/spi/EngineSPITestImpl.java | 2 +-
.../apache/wiki/api/spi/SessionSPITestImpl.java | 2 +-
.../java/org/apache/wiki/api/spi/WikiTest.java | 4 +-
....apache.wiki.api.events.CustomWikiEventListener | 1 +
jspwiki-bom/pom.xml | 4 +-
jspwiki-bootstrap/pom.xml | 12 +-
.../WikiBootstrapServletContextListener.java | 31 +-
.../WikiBootstrapServletContextListenerTest.java | 6 +-
.../wiki/bootstrap/spi/ContextSPITestImpl.java | 2 +-
.../wiki/bootstrap/spi/EngineSPITestImpl.java | 2 +-
.../wiki/bootstrap/spi/SessionSPITestImpl.java | 2 +-
jspwiki-cache/pom.xml | 2 +-
.../java/org/apache/wiki/cache/CachingManager.java | 9 +
.../apache/wiki/cache/EhcacheCachingManager.java | 21 +-
jspwiki-event/pom.xml | 2 +-
.../main/java/org/apache/wiki/event/WikiEvent.java | 5 +-
jspwiki-http/pom.xml | 14 +-
.../wiki/http/filter/CsrfProtectionFilter.java | 16 +-
jspwiki-it-tests/jspwiki-it-test-cma-jdbc/pom.xml | 2 +-
jspwiki-it-tests/jspwiki-it-test-cma/pom.xml | 2 +-
.../jspwiki-it-test-custom-absolute-urls/pom.xml | 2 +-
.../jspwiki-it-test-custom-jdbc/pom.xml | 2 +-
jspwiki-it-tests/jspwiki-it-test-custom/pom.xml | 2 +-
jspwiki-it-tests/jspwiki-selenide-tests/pom.xml | 2 +-
jspwiki-it-tests/pom.xml | 2 +-
jspwiki-kendra-searchprovider/pom.xml | 29 +-
.../wiki/search/kendra/KendraSearchProvider.java | 52 +-
.../search/kendra/KendraSearchProviderTest.java | 8 +-
jspwiki-main/pom.xml | 619 ++++++++++---------
.../java/org/apache/wiki/TranslationsCheck.java | 2 +-
.../src/main/java/org/apache/wiki/WikiContext.java | 6 +-
.../src/main/java/org/apache/wiki/WikiEngine.java | 4 +-
.../src/main/java/org/apache/wiki/WikiServlet.java | 14 +-
.../src/main/java/org/apache/wiki/WikiSession.java | 6 +-
.../main/java/org/apache/wiki/ajax/AjaxUtil.java | 9 +-
.../wiki/ajax/WikiAjaxDispatcherServlet.java | 10 +-
.../java/org/apache/wiki/ajax/WikiAjaxServlet.java | 6 +-
.../apache/wiki/attachment/AttachmentManager.java | 2 +-
.../apache/wiki/attachment/AttachmentServlet.java | 89 +--
.../wiki/attachment/DefaultAttachmentManager.java | 5 +-
.../apache/wiki/auth/AuthenticationManager.java | 2 +-
.../org/apache/wiki/auth/AuthorizationManager.java | 2 +-
.../main/java/org/apache/wiki/auth/Authorizer.java | 2 +-
.../wiki/auth/DefaultAuthenticationManager.java | 14 +-
.../wiki/auth/DefaultAuthorizationManager.java | 2 +-
.../org/apache/wiki/auth/DefaultUserManager.java | 12 +-
.../org/apache/wiki/auth/SecurityVerifier.java | 38 +-
.../java/org/apache/wiki/auth/SessionMonitor.java | 8 +-
.../apache/wiki/auth/authorize/GroupManager.java | 2 +-
.../apache/wiki/auth/authorize/WebAuthorizer.java | 6 +-
.../auth/authorize/WebContainerAuthorizer.java | 12 +-
.../wiki/auth/authorize/XMLGroupDatabase.java | 7 +-
.../wiki/auth/login/AbstractLoginModule.java | 2 +-
.../wiki/auth/login/AnonymousLoginModule.java | 4 +-
.../auth/login/CookieAssertionLoginModule.java | 8 +-
.../login/CookieAuthenticationLoginModule.java | 6 +-
.../wiki/auth/login/HttpRequestCallback.java | 6 +-
.../auth/login/WebContainerCallbackHandler.java | 2 +-
.../wiki/auth/login/WebContainerLoginModule.java | 4 +-
.../wiki/auth/login/WikiCallbackHandler.java | 2 +-
.../apache/wiki/auth/user/DefaultUserProfile.java | 2 +-
.../apache/wiki/auth/user/JDBCUserDatabase.java | 3 +-
.../org/apache/wiki/auth/user/UserProfile.java | 2 +-
.../org/apache/wiki/auth/user/XMLUserDatabase.java | 11 +-
.../java/org/apache/wiki/filters/SpamFilter.java | 6 +-
.../apache/wiki/parser/JSPWikiMarkupParser.java | 188 +++---
.../apache/wiki/plugin/DefaultPluginManager.java | 2 +-
.../main/java/org/apache/wiki/plugin/Denounce.java | 2 +-
.../main/java/org/apache/wiki/plugin/IfPlugin.java | 18 +-
.../main/java/org/apache/wiki/plugin/Image.java | 32 +-
.../org/apache/wiki/plugin/ListLocksPlugin.java | 2 +-
.../org/apache/wiki/plugin/PageViewPlugin.java | 4 +-
.../apache/wiki/plugin/ReferringPagesPlugin.java | 4 +-
.../org/apache/wiki/plugin/SampleAjaxPlugin.java | 32 +-
.../org/apache/wiki/plugin/UnusedPagesPlugin.java | 2 +-
.../apache/wiki/plugin/WeblogArchivePlugin.java | 2 +-
.../org/apache/wiki/preferences/Preferences.java | 4 +-
.../wiki/providers/AbstractFileProvider.java | 6 +-
.../wiki/providers/BasicAttachmentProvider.java | 15 +-
.../wiki/providers/CachingAttachmentProvider.java | 8 +-
.../org/apache/wiki/providers/CachingProvider.java | 8 +-
.../wiki/references/DefaultReferenceManager.java | 2 +-
.../org/apache/wiki/rpc/atom/AtomAPIServlet.java | 10 +-
.../main/java/org/apache/wiki/rss/AtomFeed.java | 2 +-
.../org/apache/wiki/rss/DefaultRSSGenerator.java | 5 +
.../src/main/java/org/apache/wiki/rss/Feed.java | 2 +-
.../main/java/org/apache/wiki/rss/RSS20Feed.java | 2 +-
.../java/org/apache/wiki/rss/RSSGenerator.java | 2 +-
.../apache/wiki/search/DefaultSearchManager.java | 4 +-
.../apache/wiki/search/LuceneSearchProvider.java | 14 +-
.../org/apache/wiki/spi/ContextSPIDefaultImpl.java | 2 +-
.../org/apache/wiki/spi/EngineSPIDefaultImpl.java | 2 +-
.../org/apache/wiki/spi/SessionSPIDefaultImpl.java | 2 +-
.../apache/wiki/tags/AdminBeanIteratorInfo.java | 6 +-
.../apache/wiki/tags/AttachmentsIteratorInfo.java | 6 +-
.../apache/wiki/tags/AttachmentsIteratorTag.java | 4 +-
.../java/org/apache/wiki/tags/BreadcrumbsTag.java | 4 +-
.../java/org/apache/wiki/tags/CalendarTag.java | 40 +-
.../java/org/apache/wiki/tags/CheckLockInfo.java | 6 +-
.../java/org/apache/wiki/tags/CheckLockTag.java | 2 +-
.../java/org/apache/wiki/tags/CommentLinkTag.java | 2 +-
.../main/java/org/apache/wiki/tags/ContentTag.java | 4 +-
.../main/java/org/apache/wiki/tags/CookieTag.java | 12 +-
.../java/org/apache/wiki/tags/DiffLinkTag.java | 2 +-
.../java/org/apache/wiki/tags/EditLinkTag.java | 2 +-
.../org/apache/wiki/tags/EditorIteratorInfo.java | 6 +-
.../main/java/org/apache/wiki/tags/EditorTag.java | 4 +-
.../org/apache/wiki/tags/HistoryIteratorInfo.java | 6 +-
.../org/apache/wiki/tags/HistoryIteratorTag.java | 4 +-
.../org/apache/wiki/tags/IfNoSearchResultsTag.java | 4 +-
.../main/java/org/apache/wiki/tags/IncludeTag.java | 4 +-
.../java/org/apache/wiki/tags/InsertDiffTag.java | 4 +-
.../java/org/apache/wiki/tags/InsertPageTag.java | 2 +-
.../java/org/apache/wiki/tags/IteratorTag.java | 8 +-
.../main/java/org/apache/wiki/tags/LinkTag.java | 8 +-
.../main/java/org/apache/wiki/tags/LinkToTag.java | 2 +-
.../java/org/apache/wiki/tags/PageInfoLinkTag.java | 2 +-
.../main/java/org/apache/wiki/tags/ParamTag.java | 6 +-
.../main/java/org/apache/wiki/tags/PluginTag.java | 4 +-
.../java/org/apache/wiki/tags/RSSImageLinkTag.java | 2 +-
.../apache/wiki/tags/SearchResultIteratorInfo.java | 6 +-
.../apache/wiki/tags/SearchResultIteratorTag.java | 6 +-
.../org/apache/wiki/tags/SearchResultsSizeTag.java | 2 +-
.../org/apache/wiki/tags/SearchResultsTag.java | 2 +-
.../org/apache/wiki/tags/SetPaginationTag.java | 2 +-
.../org/apache/wiki/tags/SpamFilterInputsTag.java | 4 +-
.../src/main/java/org/apache/wiki/tags/TabTag.java | 2 +-
.../org/apache/wiki/tags/TabbedSectionTag.java | 4 +-
.../java/org/apache/wiki/tags/TranslateTag.java | 8 +-
.../java/org/apache/wiki/tags/UploadLinkTag.java | 2 +-
.../java/org/apache/wiki/tags/UserNameTag.java | 2 +-
.../java/org/apache/wiki/tags/UserProfileTag.java | 6 +-
.../java/org/apache/wiki/tags/VariableTag.java | 4 +-
.../java/org/apache/wiki/tags/WikiBodyTag.java | 8 +-
.../java/org/apache/wiki/tags/WikiTagBase.java | 8 +-
.../wiki/tasks/auth/SaveUserProfileTask.java | 10 +-
.../java/org/apache/wiki/ui/CommandResolver.java | 2 +-
.../org/apache/wiki/ui/DefaultCommandResolver.java | 2 +-
.../org/apache/wiki/ui/DefaultTemplateManager.java | 8 +-
.../java/org/apache/wiki/ui/EditorManager.java | 2 +-
.../java/org/apache/wiki/ui/InputValidator.java | 2 +-
.../main/java/org/apache/wiki/ui/Installer.java | 46 +-
.../java/org/apache/wiki/ui/TemplateManager.java | 7 +-
.../java/org/apache/wiki/ui/WikiJSPFilter.java | 28 +-
.../org/apache/wiki/ui/WikiRequestWrapper.java | 4 +-
.../java/org/apache/wiki/ui/WikiServletFilter.java | 26 +-
.../wiki/ui/admin/DefaultAdminBeanManager.java | 4 +-
.../apache/wiki/ui/admin/WikiFormAdminBean.java | 4 +-
.../wiki/ui/admin/beans/PlainEditorAdminBean.java | 2 +-
.../org/apache/wiki/ui/admin/beans/UserBean.java | 4 +-
.../wiki/ui/progress/DefaultProgressManager.java | 4 +-
.../org/apache/wiki/url/DefaultURLConstructor.java | 8 +-
.../org/apache/wiki/url/ShortURLConstructor.java | 2 +-
.../apache/wiki/url/ShortViewURLConstructor.java | 2 +-
.../java/org/apache/wiki/url/URLConstructor.java | 9 +-
.../wiki/variables/DefaultVariableManager.java | 4 +-
.../wiki/workflow/DefaultWorkflowManager.java | 2 +-
.../src/main/resources/CoreResources_fi.properties | 10 +
.../src/main/resources/CoreResources_it.properties | 6 +-
.../src/main/resources/CoreResources_nl.properties | 3 +
.../main/resources/CoreResources_pt_BR.properties | 5 +
.../src/main/resources/CoreResources_ru.properties | 5 +
.../main/resources/CoreResources_zh_CN.properties | 5 +
.../src/main/resources/META-INF/jspwiki.tld | 8 +-
.../src/main/resources/ini/jspwiki.properties | 26 +-
.../src/main/resources/ini/jspwiki_module.xml | 9 -
.../main/resources/templates/default.properties | 2 -
.../main/resources/templates/default_de.properties | 324 +++++-----
.../main/resources/templates/default_es.properties | 440 +++++++-------
.../main/resources/templates/default_fi.properties | 587 ++++++++++--------
.../main/resources/templates/default_fr.properties | 660 ++++++++++-----------
.../main/resources/templates/default_it.properties | 73 ++-
.../main/resources/templates/default_nl.properties | 32 +-
.../resources/templates/default_pt_BR.properties | 481 +++++++++------
.../main/resources/templates/default_ru.properties | 35 +-
.../resources/templates/default_zh_CN.properties | 78 ++-
.../test/java/org/apache/wiki/HttpMockFactory.java | 152 +++++
.../test/java/org/apache/wiki/MemoryProfiling.java | 6 +-
.../src/test/java/org/apache/wiki/TestEngine.java | 65 +-
.../test/java/org/apache/wiki/WikiServletTest.java | 38 +-
.../test/java/org/apache/wiki/WikiSessionTest.java | 198 +++----
.../wiki/auth/AuthenticationManagerTest.java | 5 +-
.../apache/wiki/auth/AuthorizationManagerTest.java | 25 +-
.../apache/wiki/auth/DefaultUserManagerTest.java | 76 +++
.../java/org/apache/wiki/auth/TestAuthorizer.java | 6 +-
.../java/org/apache/wiki/auth/UserManagerTest.java | 59 +-
.../java/org/apache/wiki/auth/acl/AclImplTest.java | 2 +-
.../wiki/auth/authorize/XMLGroupDatabaseTest.java | 64 +-
.../wiki/auth/login/AnonymousLoginModuleTest.java | 68 +--
.../auth/login/CookieAssertionLoginModuleTest.java | 71 +--
.../auth/login/WebContainerLoginModuleTest.java | 73 +--
.../wiki/auth/permissions/GroupPermissionTest.java | 8 +
.../apache/wiki/auth/user/XMLUserDatabaseTest.java | 1 +
.../wiki/i18n/InternationalizationManagerTest.java | 118 ++--
.../wiki/parser/CreoleToJSPWikiTranslatorTest.java | 14 -
.../wiki/parser/JSPWikiMarkupParserTest.java | 476 ++++++++-------
.../java/org/apache/wiki/plugin/DenounceTest.java | 0
.../java/org/apache/wiki/plugin/GroupsTest.java | 2 +-
.../java/org/apache/wiki/plugin/IfPluginTest.java | 53 +-
.../wiki/plugin/ReferringPagesPluginTest.java | 32 +-
.../plugin/ReferringUndefinedPagesPluginTest.java | 19 +-
.../java/org/apache/wiki/plugin/SamplePlugin.java | 13 +-
.../java/org/apache/wiki/rss/RSSGeneratorTest.java | 37 +-
.../org/apache/wiki/search/SearchManagerTest.java | 36 +-
.../wiki/tasks/pages/SaveWikiPageTaskTest.java | 11 +-
.../org/apache/wiki/ui/CommandResolverTest.java | 50 +-
.../org/apache/wiki/url/UrlConstructorTest.java | 48 ++
.../java/org/apache/wiki/web/StreamRedirector.java | 46 --
.../java/org/apache/wiki/web/TestContainer.java | 296 ---------
.../apache/wiki/workflow/ApprovalWorkflowTest.java | 29 +-
jspwiki-main/src/test/resources/WEB-INF/web.xml | 10 +-
.../src/test/resources/jspwiki-custom.properties | 2 +
jspwiki-markdown/pom.xml | 44 +-
.../JSPWikiLinkAttributeProvider.java | 9 +-
.../ImageLinkNodePostProcessorState.java | 7 +-
.../JSPWikiLinkNodePostProcessor.java | 6 +-
.../LocalLinkNodePostProcessorState.java | 11 +-
.../NodePostProcessorStateCommonOperations.java | 11 +-
.../PluginLinkNodePostProcessorState.java | 15 +-
.../VariableLinkNodePostProcessorState.java | 5 +-
.../jspwikilinks/postprocessor/WikiHtmlInline.java | 52 ++
.../markdown/renderer/JSPWikiLinkRenderer.java | 13 +-
.../wiki/parser/markdown/MarkdownDocument.java | 6 +-
.../markdown/migration/WikiSyntaxConverter.java | 34 +-
.../wiki/render/markdown/MarkdownRendererTest.java | 39 +-
jspwiki-portable/build.xml | 9 +-
jspwiki-portable/pom.xml | 30 +-
.../src/main/resources/jspwiki-custom.properties | 2 +
.../launchers/tomcat/woas.app/Contents/Info.plist | 2 +-
.../tomcat/woas.app/Contents/Java/bootstrap.jar | Bin 35211 -> 36410 bytes
.../tomcat/woas.app/Contents/Java/tomcat-juli.jar | Bin 48970 -> 52557 bytes
.../src/overlay/launchers/tomcat/woas.exe | Bin 3732220 -> 3892627
bytes
.../WEB-INF/classes/jspwiki-custom.properties | 2 +-
.../WEB-INF/classes/jspwiki-custom.properties | 2 +-
jspwiki-tika-searchprovider/pom.xml | 21 +-
.../wiki/search/tika/TikaSearchProviderTest.java | 2 +
.../src/test/resources/jspwiki-custom.properties | 2 +
jspwiki-util/pom.xml | 24 +-
.../main/java/org/apache/wiki/util/ClassUtil.java | 2 +-
.../main/java/org/apache/wiki/util/CryptoUtil.java | 97 ++-
.../main/java/org/apache/wiki/util/FormUtil.java | 6 +-
.../main/java/org/apache/wiki/util/HttpUtil.java | 99 +++-
.../main/java/org/apache/wiki/util/MailUtil.java | 116 ++--
.../java/org/apache/wiki/util/PropertyReader.java | 128 ++--
.../main/java/org/apache/wiki/util/TextUtil.java | 51 +-
.../main/java/org/apache/wiki/util/URIScheme.java | 38 +-
.../main/java/org/apache/wiki/util/XmlUtil.java | 2 +-
.../java/org/apache/wiki/util/CryptoUtilTest.java | 3 +-
.../java/org/apache/wiki/util/HttpUtilTest.java | 129 +++-
.../java/org/apache/wiki/util/MailUtilTest.java | 61 +-
.../org/apache/wiki/util/PropertyReaderTest.java | 68 ++-
.../src/test/resources/ini/jspwiki.properties | 2 +
.../src/test/resources/jspwiki-custom.properties | 3 +
.../test/resources/templates/default.properties | 2 -
jspwiki-war/pom.xml | 479 ++++++++-------
jspwiki-war/src/main/config/dev/OldChangeLog | 2 +-
jspwiki-war/src/main/config/wro/wro-haddock.xml | 2 +-
jspwiki-war/src/main/scripts/behaviors/Viewer.js | 4 +-
jspwiki-war/src/main/scripts/wiki/Wiki.js | 16 +-
.../src/main/styles/haddock/default/prettify.less | 6 +
.../src/main/styles/haddock/default/type.less | 12 +-
jspwiki-war/src/main/webapp/Captcha.jsp | 4 +-
jspwiki-war/src/main/webapp/Comment.jsp | 12 +-
jspwiki-war/src/main/webapp/Edit.jsp | 2 +-
jspwiki-war/src/main/webapp/Error.jsp | 6 +-
jspwiki-war/src/main/webapp/Install.jsp | 3 +-
jspwiki-war/src/main/webapp/LostPassword.jsp | 4 +-
jspwiki-war/src/main/webapp/Rename.jsp | 4 +-
jspwiki-war/src/main/webapp/Search.jsp | 2 +-
...database.xml => jboss-deployment-structure.xml} | 17 +-
jspwiki-war/src/main/webapp/WEB-INF/web.xml | 72 +--
jspwiki-war/src/main/webapp/XHRHtml2Markup.jsp | 2 +-
jspwiki-war/src/main/webapp/rss.jsp | 2 +-
.../main/webapp/templates/210/AttachmentTab.jsp | 2 +-
.../main/webapp/templates/210/CommentContent.jsp | 4 +-
.../main/webapp/templates/210/ConflictContent.jsp | 4 +-
.../src/main/webapp/templates/210/DiffTab.jsp | 6 +-
.../main/webapp/templates/210/DisplayMessage.jsp | 4 +-
.../src/main/webapp/templates/210/EditContent.jsp | 6 +-
.../main/webapp/templates/210/EditGroupContent.jsp | 4 +-
.../src/main/webapp/templates/210/EditTemplate.jsp | 2 +-
.../src/main/webapp/templates/210/Favorites.jsp | 4 +-
.../src/main/webapp/templates/210/FindContent.jsp | 6 +-
.../src/main/webapp/templates/210/Footer.jsp | 4 +-
.../src/main/webapp/templates/210/GroupContent.jsp | 4 +-
.../src/main/webapp/templates/210/GroupTab.jsp | 4 +-
.../src/main/webapp/templates/210/Header.jsp | 2 +-
.../src/main/webapp/templates/210/InfoContent.jsp | 8 +-
.../src/main/webapp/templates/210/LoginContent.jsp | 6 +-
.../main/webapp/templates/210/NewGroupContent.jsp | 4 +-
.../webapp/templates/210/PageActionsBottom.jsp | 4 +-
.../main/webapp/templates/210/PageActionsTop.jsp | 4 +-
.../src/main/webapp/templates/210/PageContent.jsp | 4 +-
.../src/main/webapp/templates/210/PageTab.jsp | 4 +-
.../webapp/templates/210/PreferencesContent.jsp | 4 +-
.../main/webapp/templates/210/PreferencesTab.jsp | 8 +-
.../main/webapp/templates/210/PreviewContent.jsp | 4 +-
.../src/main/webapp/templates/210/ProfileTab.jsp | 6 +-
.../src/main/webapp/templates/210/SearchBox.jsp | 2 +-
.../main/webapp/templates/210/UploadTemplate.jsp | 4 +-
.../src/main/webapp/templates/210/UserBox.jsp | 4 +-
.../src/main/webapp/templates/210/ViewTemplate.jsp | 2 +-
.../main/webapp/templates/210/WorkflowContent.jsp | 6 +-
.../webapp/templates/210/admin/UserManagement.jsp | 4 +-
.../src/main/webapp/templates/210/commonheader.jsp | 4 +-
.../main/webapp/templates/210/editors/CKeditor.jsp | 4 +-
.../src/main/webapp/templates/210/editors/FCK.jsp | 4 +-
.../main/webapp/templates/210/editors/TinyMCE.jsp | 4 +-
.../main/webapp/templates/210/editors/plain.jsp | 4 +-
.../main/webapp/templates/210/editors/preview.jsp | 4 +-
.../main/webapp/templates/210/editors/wysiwyg.jsp | 4 +-
.../main/webapp/templates/default/AJAXPreview.jsp | 2 +-
.../main/webapp/templates/default/AJAXSearch.jsp | 6 +-
.../webapp/templates/default/AttachmentTab.jsp | 6 +-
.../webapp/templates/default/CommentContent.jsp | 6 +-
.../webapp/templates/default/ConflictContent.jsp | 4 +-
.../src/main/webapp/templates/default/DiffTab.jsp | 6 +-
.../webapp/templates/default/DisplayMessage.jsp | 4 +-
.../main/webapp/templates/default/EditContent.jsp | 6 +-
.../webapp/templates/default/EditGroupContent.jsp | 8 +-
.../main/webapp/templates/default/EditTemplate.jsp | 2 +-
.../main/webapp/templates/default/FindContent.jsp | 6 +-
.../src/main/webapp/templates/default/Footer.jsp | 4 +-
.../src/main/webapp/templates/default/GroupTab.jsp | 6 +-
.../src/main/webapp/templates/default/Header.jsp | 6 +-
.../main/webapp/templates/default/InfoContent.jsp | 10 +-
.../main/webapp/templates/default/LoginContent.jsp | 6 +-
.../src/main/webapp/templates/default/Nav.jsp | 8 +-
.../main/webapp/templates/default/PageContent.jsp | 4 +-
.../src/main/webapp/templates/default/PageInfo.jsp | 4 +-
.../src/main/webapp/templates/default/PageTab.jsp | 6 +-
.../templates/default/PreferencesContent.jsp | 6 +-
.../webapp/templates/default/PreferencesTab.jsp | 8 +-
.../webapp/templates/default/PreviewContent.jsp | 4 +-
.../main/webapp/templates/default/ProfileTab.jsp | 6 +-
.../main/webapp/templates/default/SearchBox.jsp | 2 +-
.../src/main/webapp/templates/default/Sidebar.jsp | 10 +-
.../webapp/templates/default/UploadTemplate.jsp | 6 +-
.../src/main/webapp/templates/default/UserBox.jsp | 6 +-
.../main/webapp/templates/default/ViewTemplate.jsp | 4 +-
.../webapp/templates/default/WorkflowContent.jsp | 8 +-
.../templates/default/admin/UserManagement.jsp | 4 +-
.../main/webapp/templates/default/commonheader.jsp | 4 +-
.../webapp/templates/default/editors/CKeditor.jsp | 6 +-
.../webapp/templates/default/editors/TinyMCE.jsp | 6 +-
.../webapp/templates/default/editors/plain.jsp | 6 +-
.../webapp/templates/default/editors/preview.jsp | 4 +-
.../webapp/templates/default/editors/wysiwyg.jsp | 6 +-
.../templates/{210 => default}/images/note.png | Bin
.../main/webapp/templates/reader/ViewTemplate.jsp | 2 +-
jspwiki-wikipages/.gitignore | 1 +
.../assembly/{zip.xml => zip-markdown.xml} | 4 +-
jspwiki-wikipages/assembly/zip.xml | 6 +-
jspwiki-wikipages/de/pom.xml | 2 +-
jspwiki-wikipages/en/pom.xml | 2 +-
jspwiki-wikipages/es/pom.xml | 2 +-
jspwiki-wikipages/fi/pom.xml | 2 +-
jspwiki-wikipages/fr/pom.xml | 2 +-
jspwiki-wikipages/it/pom.xml | 2 +-
jspwiki-wikipages/nl/pom.xml | 2 +-
jspwiki-wikipages/pom.xml | 17 +-
jspwiki-wikipages/pt_BR/pom.xml | 2 +-
jspwiki-wikipages/ru/pom.xml | 2 +-
jspwiki-wikipages/zh_CN/pom.xml | 2 +-
jspwiki-wysiwyg/pom.xml | 19 +-
.../htmltowiki/XHtmlElementToWikiTranslator.java | 2 +-
.../org/apache/wiki/xmlrpc/AbstractRPCHandler.java | 0
.../org/apache/wiki/xmlrpc/MetaWeblogHandler.java | 0
.../java/org/apache/wiki/xmlrpc/RPCHandler.java | 0
.../org/apache/wiki/xmlrpc/RPCHandlerUTF8.java | 0
.../java/org/apache/wiki/xmlrpc/RPCServlet.java | 10 +-
.../org/apache/wiki/xmlrpc/WikiRPCHandler.java | 0
.../src/main/resources/META-INF/web-fragment.xml | 90 +++
.../org/apache/wiki/xmlrpc/RPCHandlerTest.java | 0
mvn_cheat-sheet.md | 2 +-
pom.xml | 380 +++++++-----
404 files changed, 6054 insertions(+), 4550 deletions(-)
copy jspwiki-api/src/main/java/org/apache/wiki/api/{engine/Initializable.java
=> events/CustomWikiEventListener.java} (54%)
copy
{jspwiki-it-tests/jspwiki-selenide-tests/src/main/java/org/apache/wiki/pages =>
jspwiki-api/src/main/java/org/apache/wiki/api/events}/package.html (91%)
copy
jspwiki-api/src/test/java/org/apache/wiki/api/{engine/EngineLifecycleExtensionTest.java
=> events/CustomWikiEventListenerTest.java} (63%)
copy
jspwiki-api/src/test/java/org/apache/wiki/api/{engine/EngineLifecycleExtensionTestImpl.java
=> events/CustomWikiEventListenerTestImpl.java} (58%)
create mode 100644
jspwiki-api/src/test/resources/META-INF/services/org.apache.wiki.api.events.CustomWikiEventListener
create mode 100755
jspwiki-main/src/test/java/org/apache/wiki/HttpMockFactory.java
create mode 100644
jspwiki-main/src/test/java/org/apache/wiki/auth/DefaultUserManagerTest.java
mode change 100755 => 100644
jspwiki-main/src/test/java/org/apache/wiki/plugin/DenounceTest.java
create mode 100644
jspwiki-main/src/test/java/org/apache/wiki/url/UrlConstructorTest.java
delete mode 100644
jspwiki-main/src/test/java/org/apache/wiki/web/StreamRedirector.java
delete mode 100644
jspwiki-main/src/test/java/org/apache/wiki/web/TestContainer.java
create mode 100644
jspwiki-markdown/src/main/java/org/apache/wiki/markdown/extensions/jspwikilinks/postprocessor/WikiHtmlInline.java
copy
jspwiki-wysiwyg/src/main/java/org/apache/wiki/htmltowiki/syntax/jspwiki/JSPWikiDlDecorator.java
=> jspwiki-util/src/main/java/org/apache/wiki/util/URIScheme.java (58%)
copy jspwiki-war/src/main/webapp/WEB-INF/{groupdatabase.xml =>
jboss-deployment-structure.xml} (73%)
rename jspwiki-war/src/main/webapp/templates/{210 => default}/images/note.png
(100%)
create mode 100644 jspwiki-wikipages/.gitignore
copy jspwiki-wikipages/assembly/{zip.xml => zip-markdown.xml} (93%)
rename {jspwiki-main =>
jspwiki-xmlrpc}/src/main/java/org/apache/wiki/xmlrpc/AbstractRPCHandler.java
(100%)
rename {jspwiki-main =>
jspwiki-xmlrpc}/src/main/java/org/apache/wiki/xmlrpc/MetaWeblogHandler.java
(100%)
rename {jspwiki-main =>
jspwiki-xmlrpc}/src/main/java/org/apache/wiki/xmlrpc/RPCHandler.java (100%)
rename {jspwiki-main =>
jspwiki-xmlrpc}/src/main/java/org/apache/wiki/xmlrpc/RPCHandlerUTF8.java (100%)
rename {jspwiki-main =>
jspwiki-xmlrpc}/src/main/java/org/apache/wiki/xmlrpc/RPCServlet.java (97%)
rename {jspwiki-main =>
jspwiki-xmlrpc}/src/main/java/org/apache/wiki/xmlrpc/WikiRPCHandler.java (100%)
create mode 100644 jspwiki-xmlrpc/src/main/resources/META-INF/web-fragment.xml
rename {jspwiki-main =>
jspwiki-xmlrpc}/src/test/java/org/apache/wiki/xmlrpc/RPCHandlerTest.java (100%)
