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 2022/03/11 13:43:16 UTC
[jspwiki] branch master updated (0a3e775 -> b523109)
This is an automated email from the ASF dual-hosted git repository.
juanpablo pushed a change to branch master
in repository https://gitbox.apache.org/repos/asf/jspwiki.git.
from 0a3e775 2.11.3-git-01 : Fix for Xss vulnerability on XHRHtml2Markup.jsp.
new e35509f Dependency updates
new 798663f update portable launcher binaries
new 459aa2b Make HtmlStringToMarkdownWikiTranslatorTest use a mocked Engine instead of building a TestEngine
new 8f2cac2 Make HtmlStringToWikiTranslatorTest use a mocked Engine instead of building a TestEngine
new 9587999 migrate to CodeLibs' fork of NekoHtml
new 4a1ecae lower log noise
new cc3f6d6 extract jspwiki-wysiwyg module from jspwiki-main
new 5b116ac Update dependencies
new 5e2efc0 use log placeholders
new 6bcf793 add jspwiki-wysiwyg dependency
new 5a69bda Introduce Engine Lifecycle Extensions - see https://jspwiki-wiki.apache.org/Wiki.jsp?page=HowToWriteAnEngineLifecycleExtension
new 410f99e As a result of Engine lifecycle extensions being into the public API, initialize method has being also promoted to public API, with start and stop methods acting as templates for Engine's common initialization and shutdown tasks
new 6772e5d change calls to Engine#initialize and Engine#shutdown to Engine#start and Engine#stop respectively
new 66b9115 Update dependencies' versions on LICENSE
new b523109 2.11.3-git-02
The 15 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails. The revisions
listed as "add" were already present in the repository and have only
been added to this reference.
Summary of changes:
ChangeLog.md | 21 ++++
LICENSE | 62 +++++------
.../src/main/java/org/apache/wiki/api/Release.java | 2 +-
.../main/java/org/apache/wiki/api/core/Engine.java | 41 +++++++-
.../wiki/api/engine/EngineLifecycleExtension.java | 67 ++++++++++++
.../EngineLifecycleExtensionTest.java} | 44 ++++----
.../engine/EngineLifecycleExtensionTestImpl.java} | 29 ++---
...apache.wiki.api.engine.EngineLifecycleExtension | 1 +
jspwiki-main/pom.xml | 117 ++++++++++++---------
.../src/main/java/org/apache/wiki/WikiEngine.java | 56 +++++-----
.../src/main/java/org/apache/wiki/WikiServlet.java | 7 +-
.../src/test/java/org/apache/wiki/TestEngine.java | 66 +++++-------
.../test/java/org/apache/wiki/WikiEngineTest.java | 2 +-
.../wiki/attachment/AttachmentManagerTest.java | 2 +-
.../org/apache/wiki/content/PageRenamerTest.java | 2 +-
.../apache/wiki/pages/DefaultPageManagerTest.java | 2 +-
.../wiki/parser/JSPWikiMarkupParserTest.java | 2 +-
.../wiki/providers/VersioningFileProviderTest.java | 2 +-
.../wiki/references/ReferenceManagerTest.java | 2 +-
.../apache/wiki/render/RenderingManagerTest.java | 2 +-
.../org/apache/wiki/search/SearchManagerTest.java | 2 +-
.../apache/wiki/stress/MassiveRepositoryTest.java | 2 +-
.../apache/wiki/workflow/WorkflowManagerTest.java | 2 +-
.../org/apache/wiki/xmlrpc/RPCHandlerTest.java | 4 +-
jspwiki-markdown/pom.xml | 12 +++
.../MarkdownSetupEngineLifecycleExtension.java | 52 +++++++++
...apache.wiki.api.engine.EngineLifecycleExtension | 1 +
.../HtmlStringToMarkdownWikiTranslatorTest.java | 18 ++--
.../MarkdownSetupEngineLifecycleExtensionTest.java | 30 +++---
.../wiki/render/markdown/MarkdownRendererTest.java | 2 +-
.../tomcat/woas.app/Contents/Java/bootstrap.jar | Bin 34779 -> 34698 bytes
.../tomcat/woas.app/Contents/Java/tomcat-juli.jar | Bin 47110 -> 46898 bytes
.../src/overlay/launchers/tomcat/woas.exe | Bin 3675327 -> 3656529 bytes
.../main/java/org/apache/wiki/util/ClassUtil.java | 12 +--
{jspwiki-bootstrap => jspwiki-wysiwyg}/pom.xml | 29 ++---
.../htmltowiki/HtmlStringToWikiTranslator.java | 3 +-
.../apache/wiki/htmltowiki/SyntaxDecorator.java | 0
.../wiki/htmltowiki/WhitespaceTrimWriter.java | 0
.../htmltowiki/XHtmlElementToWikiTranslator.java | 2 +-
.../apache/wiki/htmltowiki/XHtmlToWikiConfig.java | 0
.../java/org/apache/wiki/htmltowiki/package.html | 0
.../apache/wiki/htmltowiki/syntax/ADecorator.java | 0
.../apache/wiki/htmltowiki/syntax/BrDecorator.java | 0
.../wiki/htmltowiki/syntax/CodeDecorator.java | 0
.../apache/wiki/htmltowiki/syntax/DdDecorator.java | 0
.../apache/wiki/htmltowiki/syntax/DlDecorator.java | 0
.../apache/wiki/htmltowiki/syntax/DtDecorator.java | 0
.../wiki/htmltowiki/syntax/FormDecorator.java | 0
.../apache/wiki/htmltowiki/syntax/H1Decorator.java | 0
.../apache/wiki/htmltowiki/syntax/H2Decorator.java | 0
.../apache/wiki/htmltowiki/syntax/H3Decorator.java | 0
.../apache/wiki/htmltowiki/syntax/H4Decorator.java | 0
.../apache/wiki/htmltowiki/syntax/HrDecorator.java | 0
.../wiki/htmltowiki/syntax/ImageDecorator.java | 0
.../wiki/htmltowiki/syntax/InputDecorator.java | 0
.../apache/wiki/htmltowiki/syntax/LiDecorator.java | 0
.../wiki/htmltowiki/syntax/MarkupHelper.java | 0
.../apache/wiki/htmltowiki/syntax/OlDecorator.java | 0
.../wiki/htmltowiki/syntax/OptionDecorator.java | 0
.../apache/wiki/htmltowiki/syntax/PDecorator.java | 0
.../htmltowiki/syntax/PlainTextBoldDecorator.java | 0
.../htmltowiki/syntax/PlainTextCssDecorator.java | 0
.../syntax/PlainTextCssSpecialDecorator.java | 0
.../wiki/htmltowiki/syntax/PlainTextDecorator.java | 0
.../syntax/PlainTextItalicDecorator.java | 0
.../syntax/PlainTextMonospaceDecorator.java | 0
.../wiki/htmltowiki/syntax/SelectDecorator.java | 0
.../wiki/htmltowiki/syntax/StrikeDecorator.java | 0
.../wiki/htmltowiki/syntax/SubDecorator.java | 0
.../wiki/htmltowiki/syntax/SupDecorator.java | 0
.../wiki/htmltowiki/syntax/TableDecorator.java | 0
.../wiki/htmltowiki/syntax/TbodyDecorator.java | 0
.../apache/wiki/htmltowiki/syntax/TdDecorator.java | 0
.../wiki/htmltowiki/syntax/TextAreaDecorator.java | 0
.../htmltowiki/syntax/TextElementDecorator.java | 0
.../apache/wiki/htmltowiki/syntax/ThDecorator.java | 0
.../wiki/htmltowiki/syntax/TheadDecorator.java | 0
.../apache/wiki/htmltowiki/syntax/TrDecorator.java | 0
.../apache/wiki/htmltowiki/syntax/UlDecorator.java | 0
.../wiki/htmltowiki/syntax/UnderlineDecorator.java | 0
.../htmltowiki/syntax/WikiSyntaxDecorator.java | 0
.../syntax/jspwiki/JSPWikiADecorator.java | 0
.../syntax/jspwiki/JSPWikiBrDecorator.java | 0
.../syntax/jspwiki/JSPWikiCodeDecorator.java | 0
.../syntax/jspwiki/JSPWikiDdDecorator.java | 0
.../syntax/jspwiki/JSPWikiDlDecorator.java | 0
.../syntax/jspwiki/JSPWikiDtDecorator.java | 0
.../syntax/jspwiki/JSPWikiFormDecorator.java | 0
.../syntax/jspwiki/JSPWikiH1Decorator.java | 0
.../syntax/jspwiki/JSPWikiH2Decorator.java | 0
.../syntax/jspwiki/JSPWikiH3Decorator.java | 0
.../syntax/jspwiki/JSPWikiH4Decorator.java | 0
.../syntax/jspwiki/JSPWikiHrDecorator.java | 0
.../syntax/jspwiki/JSPWikiImageDecorator.java | 0
.../syntax/jspwiki/JSPWikiInputDecorator.java | 0
.../syntax/jspwiki/JSPWikiLiDecorator.java | 0
.../syntax/jspwiki/JSPWikiOlDecorator.java | 0
.../syntax/jspwiki/JSPWikiPDecorator.java | 0
.../jspwiki/JSPWikiPlainTextBoldDecorator.java | 0
.../jspwiki/JSPWikiPlainTextCssDecorator.java | 0
.../JSPWikiPlainTextCssSpecialDecorator.java | 0
.../jspwiki/JSPWikiPlainTextItalicDecorator.java | 0
.../JSPWikiPlainTextMonospaceDecorator.java | 0
.../syntax/jspwiki/JSPWikiSelectDecorator.java | 0
.../syntax/jspwiki/JSPWikiStrikeDecorator.java | 0
.../syntax/jspwiki/JSPWikiSubDecorator.java | 0
.../syntax/jspwiki/JSPWikiSupDecorator.java | 0
.../syntax/jspwiki/JSPWikiSyntaxDecorator.java | 0
.../syntax/jspwiki/JSPWikiTdDecorator.java | 0
.../syntax/jspwiki/JSPWikiTextAreaDecorator.java | 0
.../syntax/jspwiki/JSPWikiThDecorator.java | 0
.../syntax/jspwiki/JSPWikiUlDecorator.java | 0
.../syntax/jspwiki/JSPWikiUnderlineDecorator.java | 0
.../wiki/htmltowiki/syntax/jspwiki/package.html | 0
.../org/apache/wiki/htmltowiki/syntax/package.html | 0
.../htmltowiki/HtmlStringToWikiTranslatorTest.java | 18 ++--
pom.xml | 42 ++++----
117 files changed, 474 insertions(+), 286 deletions(-)
create mode 100644 jspwiki-api/src/main/java/org/apache/wiki/api/engine/EngineLifecycleExtension.java
copy jspwiki-api/src/test/java/org/apache/wiki/api/{spi/WikiTest.java => engine/EngineLifecycleExtensionTest.java} (52%)
copy jspwiki-api/src/{main/java/org/apache/wiki/api/spi/EngineSPI.java => test/java/org/apache/wiki/api/engine/EngineLifecycleExtensionTestImpl.java} (62%)
create mode 100644 jspwiki-api/src/test/resources/META-INF/services/org.apache.wiki.api.engine.EngineLifecycleExtension
create mode 100644 jspwiki-markdown/src/main/java/org/apache/wiki/markdown/MarkdownSetupEngineLifecycleExtension.java
create mode 100644 jspwiki-markdown/src/main/resources/META-INF/services/org.apache.wiki.api.engine.EngineLifecycleExtension
copy jspwiki-util/src/test/java/org/apache/wiki/util/comparators/PrincipalComparatorTest.java => jspwiki-markdown/src/test/java/org/apache/wiki/markdown/MarkdownSetupEngineLifecycleExtensionTest.java (54%)
copy {jspwiki-bootstrap => jspwiki-wysiwyg}/pom.xml (83%)
rename {jspwiki-main => jspwiki-wysiwyg}/src/main/java/org/apache/wiki/htmltowiki/HtmlStringToWikiTranslator.java (97%)
rename {jspwiki-main => jspwiki-wysiwyg}/src/main/java/org/apache/wiki/htmltowiki/SyntaxDecorator.java (100%)
rename {jspwiki-main => jspwiki-wysiwyg}/src/main/java/org/apache/wiki/htmltowiki/WhitespaceTrimWriter.java (100%)
rename {jspwiki-main => jspwiki-wysiwyg}/src/main/java/org/apache/wiki/htmltowiki/XHtmlElementToWikiTranslator.java (99%)
rename {jspwiki-main => jspwiki-wysiwyg}/src/main/java/org/apache/wiki/htmltowiki/XHtmlToWikiConfig.java (100%)
rename {jspwiki-main => jspwiki-wysiwyg}/src/main/java/org/apache/wiki/htmltowiki/package.html (100%)
rename {jspwiki-main => jspwiki-wysiwyg}/src/main/java/org/apache/wiki/htmltowiki/syntax/ADecorator.java (100%)
rename {jspwiki-main => jspwiki-wysiwyg}/src/main/java/org/apache/wiki/htmltowiki/syntax/BrDecorator.java (100%)
rename {jspwiki-main => jspwiki-wysiwyg}/src/main/java/org/apache/wiki/htmltowiki/syntax/CodeDecorator.java (100%)
rename {jspwiki-main => jspwiki-wysiwyg}/src/main/java/org/apache/wiki/htmltowiki/syntax/DdDecorator.java (100%)
rename {jspwiki-main => jspwiki-wysiwyg}/src/main/java/org/apache/wiki/htmltowiki/syntax/DlDecorator.java (100%)
rename {jspwiki-main => jspwiki-wysiwyg}/src/main/java/org/apache/wiki/htmltowiki/syntax/DtDecorator.java (100%)
rename {jspwiki-main => jspwiki-wysiwyg}/src/main/java/org/apache/wiki/htmltowiki/syntax/FormDecorator.java (100%)
rename {jspwiki-main => jspwiki-wysiwyg}/src/main/java/org/apache/wiki/htmltowiki/syntax/H1Decorator.java (100%)
rename {jspwiki-main => jspwiki-wysiwyg}/src/main/java/org/apache/wiki/htmltowiki/syntax/H2Decorator.java (100%)
rename {jspwiki-main => jspwiki-wysiwyg}/src/main/java/org/apache/wiki/htmltowiki/syntax/H3Decorator.java (100%)
rename {jspwiki-main => jspwiki-wysiwyg}/src/main/java/org/apache/wiki/htmltowiki/syntax/H4Decorator.java (100%)
rename {jspwiki-main => jspwiki-wysiwyg}/src/main/java/org/apache/wiki/htmltowiki/syntax/HrDecorator.java (100%)
rename {jspwiki-main => jspwiki-wysiwyg}/src/main/java/org/apache/wiki/htmltowiki/syntax/ImageDecorator.java (100%)
rename {jspwiki-main => jspwiki-wysiwyg}/src/main/java/org/apache/wiki/htmltowiki/syntax/InputDecorator.java (100%)
rename {jspwiki-main => jspwiki-wysiwyg}/src/main/java/org/apache/wiki/htmltowiki/syntax/LiDecorator.java (100%)
rename {jspwiki-main => jspwiki-wysiwyg}/src/main/java/org/apache/wiki/htmltowiki/syntax/MarkupHelper.java (100%)
rename {jspwiki-main => jspwiki-wysiwyg}/src/main/java/org/apache/wiki/htmltowiki/syntax/OlDecorator.java (100%)
rename {jspwiki-main => jspwiki-wysiwyg}/src/main/java/org/apache/wiki/htmltowiki/syntax/OptionDecorator.java (100%)
rename {jspwiki-main => jspwiki-wysiwyg}/src/main/java/org/apache/wiki/htmltowiki/syntax/PDecorator.java (100%)
rename {jspwiki-main => jspwiki-wysiwyg}/src/main/java/org/apache/wiki/htmltowiki/syntax/PlainTextBoldDecorator.java (100%)
rename {jspwiki-main => jspwiki-wysiwyg}/src/main/java/org/apache/wiki/htmltowiki/syntax/PlainTextCssDecorator.java (100%)
rename {jspwiki-main => jspwiki-wysiwyg}/src/main/java/org/apache/wiki/htmltowiki/syntax/PlainTextCssSpecialDecorator.java (100%)
rename {jspwiki-main => jspwiki-wysiwyg}/src/main/java/org/apache/wiki/htmltowiki/syntax/PlainTextDecorator.java (100%)
rename {jspwiki-main => jspwiki-wysiwyg}/src/main/java/org/apache/wiki/htmltowiki/syntax/PlainTextItalicDecorator.java (100%)
rename {jspwiki-main => jspwiki-wysiwyg}/src/main/java/org/apache/wiki/htmltowiki/syntax/PlainTextMonospaceDecorator.java (100%)
rename {jspwiki-main => jspwiki-wysiwyg}/src/main/java/org/apache/wiki/htmltowiki/syntax/SelectDecorator.java (100%)
rename {jspwiki-main => jspwiki-wysiwyg}/src/main/java/org/apache/wiki/htmltowiki/syntax/StrikeDecorator.java (100%)
rename {jspwiki-main => jspwiki-wysiwyg}/src/main/java/org/apache/wiki/htmltowiki/syntax/SubDecorator.java (100%)
rename {jspwiki-main => jspwiki-wysiwyg}/src/main/java/org/apache/wiki/htmltowiki/syntax/SupDecorator.java (100%)
rename {jspwiki-main => jspwiki-wysiwyg}/src/main/java/org/apache/wiki/htmltowiki/syntax/TableDecorator.java (100%)
rename {jspwiki-main => jspwiki-wysiwyg}/src/main/java/org/apache/wiki/htmltowiki/syntax/TbodyDecorator.java (100%)
rename {jspwiki-main => jspwiki-wysiwyg}/src/main/java/org/apache/wiki/htmltowiki/syntax/TdDecorator.java (100%)
rename {jspwiki-main => jspwiki-wysiwyg}/src/main/java/org/apache/wiki/htmltowiki/syntax/TextAreaDecorator.java (100%)
rename {jspwiki-main => jspwiki-wysiwyg}/src/main/java/org/apache/wiki/htmltowiki/syntax/TextElementDecorator.java (100%)
rename {jspwiki-main => jspwiki-wysiwyg}/src/main/java/org/apache/wiki/htmltowiki/syntax/ThDecorator.java (100%)
rename {jspwiki-main => jspwiki-wysiwyg}/src/main/java/org/apache/wiki/htmltowiki/syntax/TheadDecorator.java (100%)
rename {jspwiki-main => jspwiki-wysiwyg}/src/main/java/org/apache/wiki/htmltowiki/syntax/TrDecorator.java (100%)
rename {jspwiki-main => jspwiki-wysiwyg}/src/main/java/org/apache/wiki/htmltowiki/syntax/UlDecorator.java (100%)
rename {jspwiki-main => jspwiki-wysiwyg}/src/main/java/org/apache/wiki/htmltowiki/syntax/UnderlineDecorator.java (100%)
rename {jspwiki-main => jspwiki-wysiwyg}/src/main/java/org/apache/wiki/htmltowiki/syntax/WikiSyntaxDecorator.java (100%)
rename {jspwiki-main => jspwiki-wysiwyg}/src/main/java/org/apache/wiki/htmltowiki/syntax/jspwiki/JSPWikiADecorator.java (100%)
rename {jspwiki-main => jspwiki-wysiwyg}/src/main/java/org/apache/wiki/htmltowiki/syntax/jspwiki/JSPWikiBrDecorator.java (100%)
rename {jspwiki-main => jspwiki-wysiwyg}/src/main/java/org/apache/wiki/htmltowiki/syntax/jspwiki/JSPWikiCodeDecorator.java (100%)
rename {jspwiki-main => jspwiki-wysiwyg}/src/main/java/org/apache/wiki/htmltowiki/syntax/jspwiki/JSPWikiDdDecorator.java (100%)
rename {jspwiki-main => jspwiki-wysiwyg}/src/main/java/org/apache/wiki/htmltowiki/syntax/jspwiki/JSPWikiDlDecorator.java (100%)
rename {jspwiki-main => jspwiki-wysiwyg}/src/main/java/org/apache/wiki/htmltowiki/syntax/jspwiki/JSPWikiDtDecorator.java (100%)
rename {jspwiki-main => jspwiki-wysiwyg}/src/main/java/org/apache/wiki/htmltowiki/syntax/jspwiki/JSPWikiFormDecorator.java (100%)
rename {jspwiki-main => jspwiki-wysiwyg}/src/main/java/org/apache/wiki/htmltowiki/syntax/jspwiki/JSPWikiH1Decorator.java (100%)
rename {jspwiki-main => jspwiki-wysiwyg}/src/main/java/org/apache/wiki/htmltowiki/syntax/jspwiki/JSPWikiH2Decorator.java (100%)
rename {jspwiki-main => jspwiki-wysiwyg}/src/main/java/org/apache/wiki/htmltowiki/syntax/jspwiki/JSPWikiH3Decorator.java (100%)
rename {jspwiki-main => jspwiki-wysiwyg}/src/main/java/org/apache/wiki/htmltowiki/syntax/jspwiki/JSPWikiH4Decorator.java (100%)
rename {jspwiki-main => jspwiki-wysiwyg}/src/main/java/org/apache/wiki/htmltowiki/syntax/jspwiki/JSPWikiHrDecorator.java (100%)
rename {jspwiki-main => jspwiki-wysiwyg}/src/main/java/org/apache/wiki/htmltowiki/syntax/jspwiki/JSPWikiImageDecorator.java (100%)
rename {jspwiki-main => jspwiki-wysiwyg}/src/main/java/org/apache/wiki/htmltowiki/syntax/jspwiki/JSPWikiInputDecorator.java (100%)
rename {jspwiki-main => jspwiki-wysiwyg}/src/main/java/org/apache/wiki/htmltowiki/syntax/jspwiki/JSPWikiLiDecorator.java (100%)
rename {jspwiki-main => jspwiki-wysiwyg}/src/main/java/org/apache/wiki/htmltowiki/syntax/jspwiki/JSPWikiOlDecorator.java (100%)
rename {jspwiki-main => jspwiki-wysiwyg}/src/main/java/org/apache/wiki/htmltowiki/syntax/jspwiki/JSPWikiPDecorator.java (100%)
rename {jspwiki-main => jspwiki-wysiwyg}/src/main/java/org/apache/wiki/htmltowiki/syntax/jspwiki/JSPWikiPlainTextBoldDecorator.java (100%)
rename {jspwiki-main => jspwiki-wysiwyg}/src/main/java/org/apache/wiki/htmltowiki/syntax/jspwiki/JSPWikiPlainTextCssDecorator.java (100%)
rename {jspwiki-main => jspwiki-wysiwyg}/src/main/java/org/apache/wiki/htmltowiki/syntax/jspwiki/JSPWikiPlainTextCssSpecialDecorator.java (100%)
rename {jspwiki-main => jspwiki-wysiwyg}/src/main/java/org/apache/wiki/htmltowiki/syntax/jspwiki/JSPWikiPlainTextItalicDecorator.java (100%)
rename {jspwiki-main => jspwiki-wysiwyg}/src/main/java/org/apache/wiki/htmltowiki/syntax/jspwiki/JSPWikiPlainTextMonospaceDecorator.java (100%)
rename {jspwiki-main => jspwiki-wysiwyg}/src/main/java/org/apache/wiki/htmltowiki/syntax/jspwiki/JSPWikiSelectDecorator.java (100%)
rename {jspwiki-main => jspwiki-wysiwyg}/src/main/java/org/apache/wiki/htmltowiki/syntax/jspwiki/JSPWikiStrikeDecorator.java (100%)
rename {jspwiki-main => jspwiki-wysiwyg}/src/main/java/org/apache/wiki/htmltowiki/syntax/jspwiki/JSPWikiSubDecorator.java (100%)
rename {jspwiki-main => jspwiki-wysiwyg}/src/main/java/org/apache/wiki/htmltowiki/syntax/jspwiki/JSPWikiSupDecorator.java (100%)
rename {jspwiki-main => jspwiki-wysiwyg}/src/main/java/org/apache/wiki/htmltowiki/syntax/jspwiki/JSPWikiSyntaxDecorator.java (100%)
rename {jspwiki-main => jspwiki-wysiwyg}/src/main/java/org/apache/wiki/htmltowiki/syntax/jspwiki/JSPWikiTdDecorator.java (100%)
rename {jspwiki-main => jspwiki-wysiwyg}/src/main/java/org/apache/wiki/htmltowiki/syntax/jspwiki/JSPWikiTextAreaDecorator.java (100%)
rename {jspwiki-main => jspwiki-wysiwyg}/src/main/java/org/apache/wiki/htmltowiki/syntax/jspwiki/JSPWikiThDecorator.java (100%)
rename {jspwiki-main => jspwiki-wysiwyg}/src/main/java/org/apache/wiki/htmltowiki/syntax/jspwiki/JSPWikiUlDecorator.java (100%)
rename {jspwiki-main => jspwiki-wysiwyg}/src/main/java/org/apache/wiki/htmltowiki/syntax/jspwiki/JSPWikiUnderlineDecorator.java (100%)
rename {jspwiki-main => jspwiki-wysiwyg}/src/main/java/org/apache/wiki/htmltowiki/syntax/jspwiki/package.html (100%)
rename {jspwiki-main => jspwiki-wysiwyg}/src/main/java/org/apache/wiki/htmltowiki/syntax/package.html (100%)
rename {jspwiki-main => jspwiki-wysiwyg}/src/test/java/org/apache/wiki/htmltowiki/HtmlStringToWikiTranslatorTest.java (98%)
[jspwiki] 07/15: extract jspwiki-wysiwyg module from jspwiki-main
Posted by ju...@apache.org.
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 cc3f6d6a09fc7fb728ca64aa0e9ad8457e056b7f
Author: Juan Pablo Santos Rodríguez <ju...@gmail.com>
AuthorDate: Fri Mar 11 13:22:09 2022 +0100
extract jspwiki-wysiwyg module from jspwiki-main
---
jspwiki-wysiwyg/pom.xml | 90 ++++++++++++++++++++++
.../htmltowiki/HtmlStringToWikiTranslator.java | 0
.../apache/wiki/htmltowiki/SyntaxDecorator.java | 0
.../wiki/htmltowiki/WhitespaceTrimWriter.java | 0
.../htmltowiki/XHtmlElementToWikiTranslator.java | 0
.../apache/wiki/htmltowiki/XHtmlToWikiConfig.java | 0
.../java/org/apache/wiki/htmltowiki/package.html | 0
.../apache/wiki/htmltowiki/syntax/ADecorator.java | 0
.../apache/wiki/htmltowiki/syntax/BrDecorator.java | 0
.../wiki/htmltowiki/syntax/CodeDecorator.java | 0
.../apache/wiki/htmltowiki/syntax/DdDecorator.java | 0
.../apache/wiki/htmltowiki/syntax/DlDecorator.java | 0
.../apache/wiki/htmltowiki/syntax/DtDecorator.java | 0
.../wiki/htmltowiki/syntax/FormDecorator.java | 0
.../apache/wiki/htmltowiki/syntax/H1Decorator.java | 0
.../apache/wiki/htmltowiki/syntax/H2Decorator.java | 0
.../apache/wiki/htmltowiki/syntax/H3Decorator.java | 0
.../apache/wiki/htmltowiki/syntax/H4Decorator.java | 0
.../apache/wiki/htmltowiki/syntax/HrDecorator.java | 0
.../wiki/htmltowiki/syntax/ImageDecorator.java | 0
.../wiki/htmltowiki/syntax/InputDecorator.java | 0
.../apache/wiki/htmltowiki/syntax/LiDecorator.java | 0
.../wiki/htmltowiki/syntax/MarkupHelper.java | 0
.../apache/wiki/htmltowiki/syntax/OlDecorator.java | 0
.../wiki/htmltowiki/syntax/OptionDecorator.java | 0
.../apache/wiki/htmltowiki/syntax/PDecorator.java | 0
.../htmltowiki/syntax/PlainTextBoldDecorator.java | 0
.../htmltowiki/syntax/PlainTextCssDecorator.java | 0
.../syntax/PlainTextCssSpecialDecorator.java | 0
.../wiki/htmltowiki/syntax/PlainTextDecorator.java | 0
.../syntax/PlainTextItalicDecorator.java | 0
.../syntax/PlainTextMonospaceDecorator.java | 0
.../wiki/htmltowiki/syntax/SelectDecorator.java | 0
.../wiki/htmltowiki/syntax/StrikeDecorator.java | 0
.../wiki/htmltowiki/syntax/SubDecorator.java | 0
.../wiki/htmltowiki/syntax/SupDecorator.java | 0
.../wiki/htmltowiki/syntax/TableDecorator.java | 0
.../wiki/htmltowiki/syntax/TbodyDecorator.java | 0
.../apache/wiki/htmltowiki/syntax/TdDecorator.java | 0
.../wiki/htmltowiki/syntax/TextAreaDecorator.java | 0
.../htmltowiki/syntax/TextElementDecorator.java | 0
.../apache/wiki/htmltowiki/syntax/ThDecorator.java | 0
.../wiki/htmltowiki/syntax/TheadDecorator.java | 0
.../apache/wiki/htmltowiki/syntax/TrDecorator.java | 0
.../apache/wiki/htmltowiki/syntax/UlDecorator.java | 0
.../wiki/htmltowiki/syntax/UnderlineDecorator.java | 0
.../htmltowiki/syntax/WikiSyntaxDecorator.java | 0
.../syntax/jspwiki/JSPWikiADecorator.java | 0
.../syntax/jspwiki/JSPWikiBrDecorator.java | 0
.../syntax/jspwiki/JSPWikiCodeDecorator.java | 0
.../syntax/jspwiki/JSPWikiDdDecorator.java | 0
.../syntax/jspwiki/JSPWikiDlDecorator.java | 0
.../syntax/jspwiki/JSPWikiDtDecorator.java | 0
.../syntax/jspwiki/JSPWikiFormDecorator.java | 0
.../syntax/jspwiki/JSPWikiH1Decorator.java | 0
.../syntax/jspwiki/JSPWikiH2Decorator.java | 0
.../syntax/jspwiki/JSPWikiH3Decorator.java | 0
.../syntax/jspwiki/JSPWikiH4Decorator.java | 0
.../syntax/jspwiki/JSPWikiHrDecorator.java | 0
.../syntax/jspwiki/JSPWikiImageDecorator.java | 0
.../syntax/jspwiki/JSPWikiInputDecorator.java | 0
.../syntax/jspwiki/JSPWikiLiDecorator.java | 0
.../syntax/jspwiki/JSPWikiOlDecorator.java | 0
.../syntax/jspwiki/JSPWikiPDecorator.java | 0
.../jspwiki/JSPWikiPlainTextBoldDecorator.java | 0
.../jspwiki/JSPWikiPlainTextCssDecorator.java | 0
.../JSPWikiPlainTextCssSpecialDecorator.java | 0
.../jspwiki/JSPWikiPlainTextItalicDecorator.java | 0
.../JSPWikiPlainTextMonospaceDecorator.java | 0
.../syntax/jspwiki/JSPWikiSelectDecorator.java | 0
.../syntax/jspwiki/JSPWikiStrikeDecorator.java | 0
.../syntax/jspwiki/JSPWikiSubDecorator.java | 0
.../syntax/jspwiki/JSPWikiSupDecorator.java | 0
.../syntax/jspwiki/JSPWikiSyntaxDecorator.java | 0
.../syntax/jspwiki/JSPWikiTdDecorator.java | 0
.../syntax/jspwiki/JSPWikiTextAreaDecorator.java | 0
.../syntax/jspwiki/JSPWikiThDecorator.java | 0
.../syntax/jspwiki/JSPWikiUlDecorator.java | 0
.../syntax/jspwiki/JSPWikiUnderlineDecorator.java | 0
.../wiki/htmltowiki/syntax/jspwiki/package.html | 0
.../org/apache/wiki/htmltowiki/syntax/package.html | 0
.../htmltowiki/HtmlStringToWikiTranslatorTest.java | 0
pom.xml | 1 +
83 files changed, 91 insertions(+)
diff --git a/jspwiki-wysiwyg/pom.xml b/jspwiki-wysiwyg/pom.xml
new file mode 100644
index 0000000..5add175
--- /dev/null
+++ b/jspwiki-wysiwyg/pom.xml
@@ -0,0 +1,90 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+ 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.
+-->
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
+
+ <parent>
+ <groupId>org.apache.jspwiki</groupId>
+ <artifactId>jspwiki-builder</artifactId>
+ <version>2.11.3-SNAPSHOT</version>
+ </parent>
+
+ <modelVersion>4.0.0</modelVersion>
+ <artifactId>jspwiki-wysiwyg</artifactId>
+ <name>Apache JSPWiki WYSIWYG support classes</name>
+
+ <dependencies>
+ <dependency>
+ <groupId>${project.groupId}</groupId>
+ <artifactId>jspwiki-api</artifactId>
+ <version>${project.version}</version>
+ </dependency>
+
+ <dependency>
+ <groupId>org.apache.logging.log4j</groupId>
+ <artifactId>log4j-api</artifactId>
+ </dependency>
+
+ <dependency>
+ <groupId>org.apache.commons</groupId>
+ <artifactId>commons-text</artifactId>
+ </dependency>
+
+ <dependency>
+ <groupId>org.codelibs</groupId>
+ <artifactId>nekohtml</artifactId>
+ </dependency>
+
+ <dependency>
+ <groupId>javax.servlet</groupId>
+ <artifactId>javax.servlet-api</artifactId>
+ <scope>test</scope>
+ </dependency>
+
+ <dependency>
+ <groupId>org.junit.jupiter</groupId>
+ <artifactId>junit-jupiter-api</artifactId>
+ <scope>test</scope>
+ </dependency>
+
+ <dependency>
+ <groupId>org.junit.jupiter</groupId>
+ <artifactId>junit-jupiter-params</artifactId>
+ <scope>test</scope>
+ </dependency>
+
+ <dependency>
+ <groupId>org.junit.jupiter</groupId>
+ <artifactId>junit-jupiter-engine</artifactId>
+ <scope>test</scope>
+ </dependency>
+
+ <dependency>
+ <groupId>org.mockito</groupId>
+ <artifactId>mockito-core</artifactId>
+ <scope>test</scope>
+ </dependency>
+
+ <dependency>
+ <groupId>org.mockito</groupId>
+ <artifactId>mockito-junit-jupiter</artifactId>
+ <scope>test</scope>
+ </dependency>
+ </dependencies>
+</project>
diff --git a/jspwiki-main/src/main/java/org/apache/wiki/htmltowiki/HtmlStringToWikiTranslator.java b/jspwiki-wysiwyg/src/main/java/org/apache/wiki/htmltowiki/HtmlStringToWikiTranslator.java
similarity index 100%
rename from jspwiki-main/src/main/java/org/apache/wiki/htmltowiki/HtmlStringToWikiTranslator.java
rename to jspwiki-wysiwyg/src/main/java/org/apache/wiki/htmltowiki/HtmlStringToWikiTranslator.java
diff --git a/jspwiki-main/src/main/java/org/apache/wiki/htmltowiki/SyntaxDecorator.java b/jspwiki-wysiwyg/src/main/java/org/apache/wiki/htmltowiki/SyntaxDecorator.java
similarity index 100%
rename from jspwiki-main/src/main/java/org/apache/wiki/htmltowiki/SyntaxDecorator.java
rename to jspwiki-wysiwyg/src/main/java/org/apache/wiki/htmltowiki/SyntaxDecorator.java
diff --git a/jspwiki-main/src/main/java/org/apache/wiki/htmltowiki/WhitespaceTrimWriter.java b/jspwiki-wysiwyg/src/main/java/org/apache/wiki/htmltowiki/WhitespaceTrimWriter.java
similarity index 100%
rename from jspwiki-main/src/main/java/org/apache/wiki/htmltowiki/WhitespaceTrimWriter.java
rename to jspwiki-wysiwyg/src/main/java/org/apache/wiki/htmltowiki/WhitespaceTrimWriter.java
diff --git a/jspwiki-main/src/main/java/org/apache/wiki/htmltowiki/XHtmlElementToWikiTranslator.java b/jspwiki-wysiwyg/src/main/java/org/apache/wiki/htmltowiki/XHtmlElementToWikiTranslator.java
similarity index 100%
rename from jspwiki-main/src/main/java/org/apache/wiki/htmltowiki/XHtmlElementToWikiTranslator.java
rename to jspwiki-wysiwyg/src/main/java/org/apache/wiki/htmltowiki/XHtmlElementToWikiTranslator.java
diff --git a/jspwiki-main/src/main/java/org/apache/wiki/htmltowiki/XHtmlToWikiConfig.java b/jspwiki-wysiwyg/src/main/java/org/apache/wiki/htmltowiki/XHtmlToWikiConfig.java
similarity index 100%
rename from jspwiki-main/src/main/java/org/apache/wiki/htmltowiki/XHtmlToWikiConfig.java
rename to jspwiki-wysiwyg/src/main/java/org/apache/wiki/htmltowiki/XHtmlToWikiConfig.java
diff --git a/jspwiki-main/src/main/java/org/apache/wiki/htmltowiki/package.html b/jspwiki-wysiwyg/src/main/java/org/apache/wiki/htmltowiki/package.html
similarity index 100%
rename from jspwiki-main/src/main/java/org/apache/wiki/htmltowiki/package.html
rename to jspwiki-wysiwyg/src/main/java/org/apache/wiki/htmltowiki/package.html
diff --git a/jspwiki-main/src/main/java/org/apache/wiki/htmltowiki/syntax/ADecorator.java b/jspwiki-wysiwyg/src/main/java/org/apache/wiki/htmltowiki/syntax/ADecorator.java
similarity index 100%
rename from jspwiki-main/src/main/java/org/apache/wiki/htmltowiki/syntax/ADecorator.java
rename to jspwiki-wysiwyg/src/main/java/org/apache/wiki/htmltowiki/syntax/ADecorator.java
diff --git a/jspwiki-main/src/main/java/org/apache/wiki/htmltowiki/syntax/BrDecorator.java b/jspwiki-wysiwyg/src/main/java/org/apache/wiki/htmltowiki/syntax/BrDecorator.java
similarity index 100%
rename from jspwiki-main/src/main/java/org/apache/wiki/htmltowiki/syntax/BrDecorator.java
rename to jspwiki-wysiwyg/src/main/java/org/apache/wiki/htmltowiki/syntax/BrDecorator.java
diff --git a/jspwiki-main/src/main/java/org/apache/wiki/htmltowiki/syntax/CodeDecorator.java b/jspwiki-wysiwyg/src/main/java/org/apache/wiki/htmltowiki/syntax/CodeDecorator.java
similarity index 100%
rename from jspwiki-main/src/main/java/org/apache/wiki/htmltowiki/syntax/CodeDecorator.java
rename to jspwiki-wysiwyg/src/main/java/org/apache/wiki/htmltowiki/syntax/CodeDecorator.java
diff --git a/jspwiki-main/src/main/java/org/apache/wiki/htmltowiki/syntax/DdDecorator.java b/jspwiki-wysiwyg/src/main/java/org/apache/wiki/htmltowiki/syntax/DdDecorator.java
similarity index 100%
rename from jspwiki-main/src/main/java/org/apache/wiki/htmltowiki/syntax/DdDecorator.java
rename to jspwiki-wysiwyg/src/main/java/org/apache/wiki/htmltowiki/syntax/DdDecorator.java
diff --git a/jspwiki-main/src/main/java/org/apache/wiki/htmltowiki/syntax/DlDecorator.java b/jspwiki-wysiwyg/src/main/java/org/apache/wiki/htmltowiki/syntax/DlDecorator.java
similarity index 100%
rename from jspwiki-main/src/main/java/org/apache/wiki/htmltowiki/syntax/DlDecorator.java
rename to jspwiki-wysiwyg/src/main/java/org/apache/wiki/htmltowiki/syntax/DlDecorator.java
diff --git a/jspwiki-main/src/main/java/org/apache/wiki/htmltowiki/syntax/DtDecorator.java b/jspwiki-wysiwyg/src/main/java/org/apache/wiki/htmltowiki/syntax/DtDecorator.java
similarity index 100%
rename from jspwiki-main/src/main/java/org/apache/wiki/htmltowiki/syntax/DtDecorator.java
rename to jspwiki-wysiwyg/src/main/java/org/apache/wiki/htmltowiki/syntax/DtDecorator.java
diff --git a/jspwiki-main/src/main/java/org/apache/wiki/htmltowiki/syntax/FormDecorator.java b/jspwiki-wysiwyg/src/main/java/org/apache/wiki/htmltowiki/syntax/FormDecorator.java
similarity index 100%
rename from jspwiki-main/src/main/java/org/apache/wiki/htmltowiki/syntax/FormDecorator.java
rename to jspwiki-wysiwyg/src/main/java/org/apache/wiki/htmltowiki/syntax/FormDecorator.java
diff --git a/jspwiki-main/src/main/java/org/apache/wiki/htmltowiki/syntax/H1Decorator.java b/jspwiki-wysiwyg/src/main/java/org/apache/wiki/htmltowiki/syntax/H1Decorator.java
similarity index 100%
rename from jspwiki-main/src/main/java/org/apache/wiki/htmltowiki/syntax/H1Decorator.java
rename to jspwiki-wysiwyg/src/main/java/org/apache/wiki/htmltowiki/syntax/H1Decorator.java
diff --git a/jspwiki-main/src/main/java/org/apache/wiki/htmltowiki/syntax/H2Decorator.java b/jspwiki-wysiwyg/src/main/java/org/apache/wiki/htmltowiki/syntax/H2Decorator.java
similarity index 100%
rename from jspwiki-main/src/main/java/org/apache/wiki/htmltowiki/syntax/H2Decorator.java
rename to jspwiki-wysiwyg/src/main/java/org/apache/wiki/htmltowiki/syntax/H2Decorator.java
diff --git a/jspwiki-main/src/main/java/org/apache/wiki/htmltowiki/syntax/H3Decorator.java b/jspwiki-wysiwyg/src/main/java/org/apache/wiki/htmltowiki/syntax/H3Decorator.java
similarity index 100%
rename from jspwiki-main/src/main/java/org/apache/wiki/htmltowiki/syntax/H3Decorator.java
rename to jspwiki-wysiwyg/src/main/java/org/apache/wiki/htmltowiki/syntax/H3Decorator.java
diff --git a/jspwiki-main/src/main/java/org/apache/wiki/htmltowiki/syntax/H4Decorator.java b/jspwiki-wysiwyg/src/main/java/org/apache/wiki/htmltowiki/syntax/H4Decorator.java
similarity index 100%
rename from jspwiki-main/src/main/java/org/apache/wiki/htmltowiki/syntax/H4Decorator.java
rename to jspwiki-wysiwyg/src/main/java/org/apache/wiki/htmltowiki/syntax/H4Decorator.java
diff --git a/jspwiki-main/src/main/java/org/apache/wiki/htmltowiki/syntax/HrDecorator.java b/jspwiki-wysiwyg/src/main/java/org/apache/wiki/htmltowiki/syntax/HrDecorator.java
similarity index 100%
rename from jspwiki-main/src/main/java/org/apache/wiki/htmltowiki/syntax/HrDecorator.java
rename to jspwiki-wysiwyg/src/main/java/org/apache/wiki/htmltowiki/syntax/HrDecorator.java
diff --git a/jspwiki-main/src/main/java/org/apache/wiki/htmltowiki/syntax/ImageDecorator.java b/jspwiki-wysiwyg/src/main/java/org/apache/wiki/htmltowiki/syntax/ImageDecorator.java
similarity index 100%
rename from jspwiki-main/src/main/java/org/apache/wiki/htmltowiki/syntax/ImageDecorator.java
rename to jspwiki-wysiwyg/src/main/java/org/apache/wiki/htmltowiki/syntax/ImageDecorator.java
diff --git a/jspwiki-main/src/main/java/org/apache/wiki/htmltowiki/syntax/InputDecorator.java b/jspwiki-wysiwyg/src/main/java/org/apache/wiki/htmltowiki/syntax/InputDecorator.java
similarity index 100%
rename from jspwiki-main/src/main/java/org/apache/wiki/htmltowiki/syntax/InputDecorator.java
rename to jspwiki-wysiwyg/src/main/java/org/apache/wiki/htmltowiki/syntax/InputDecorator.java
diff --git a/jspwiki-main/src/main/java/org/apache/wiki/htmltowiki/syntax/LiDecorator.java b/jspwiki-wysiwyg/src/main/java/org/apache/wiki/htmltowiki/syntax/LiDecorator.java
similarity index 100%
rename from jspwiki-main/src/main/java/org/apache/wiki/htmltowiki/syntax/LiDecorator.java
rename to jspwiki-wysiwyg/src/main/java/org/apache/wiki/htmltowiki/syntax/LiDecorator.java
diff --git a/jspwiki-main/src/main/java/org/apache/wiki/htmltowiki/syntax/MarkupHelper.java b/jspwiki-wysiwyg/src/main/java/org/apache/wiki/htmltowiki/syntax/MarkupHelper.java
similarity index 100%
rename from jspwiki-main/src/main/java/org/apache/wiki/htmltowiki/syntax/MarkupHelper.java
rename to jspwiki-wysiwyg/src/main/java/org/apache/wiki/htmltowiki/syntax/MarkupHelper.java
diff --git a/jspwiki-main/src/main/java/org/apache/wiki/htmltowiki/syntax/OlDecorator.java b/jspwiki-wysiwyg/src/main/java/org/apache/wiki/htmltowiki/syntax/OlDecorator.java
similarity index 100%
rename from jspwiki-main/src/main/java/org/apache/wiki/htmltowiki/syntax/OlDecorator.java
rename to jspwiki-wysiwyg/src/main/java/org/apache/wiki/htmltowiki/syntax/OlDecorator.java
diff --git a/jspwiki-main/src/main/java/org/apache/wiki/htmltowiki/syntax/OptionDecorator.java b/jspwiki-wysiwyg/src/main/java/org/apache/wiki/htmltowiki/syntax/OptionDecorator.java
similarity index 100%
rename from jspwiki-main/src/main/java/org/apache/wiki/htmltowiki/syntax/OptionDecorator.java
rename to jspwiki-wysiwyg/src/main/java/org/apache/wiki/htmltowiki/syntax/OptionDecorator.java
diff --git a/jspwiki-main/src/main/java/org/apache/wiki/htmltowiki/syntax/PDecorator.java b/jspwiki-wysiwyg/src/main/java/org/apache/wiki/htmltowiki/syntax/PDecorator.java
similarity index 100%
rename from jspwiki-main/src/main/java/org/apache/wiki/htmltowiki/syntax/PDecorator.java
rename to jspwiki-wysiwyg/src/main/java/org/apache/wiki/htmltowiki/syntax/PDecorator.java
diff --git a/jspwiki-main/src/main/java/org/apache/wiki/htmltowiki/syntax/PlainTextBoldDecorator.java b/jspwiki-wysiwyg/src/main/java/org/apache/wiki/htmltowiki/syntax/PlainTextBoldDecorator.java
similarity index 100%
rename from jspwiki-main/src/main/java/org/apache/wiki/htmltowiki/syntax/PlainTextBoldDecorator.java
rename to jspwiki-wysiwyg/src/main/java/org/apache/wiki/htmltowiki/syntax/PlainTextBoldDecorator.java
diff --git a/jspwiki-main/src/main/java/org/apache/wiki/htmltowiki/syntax/PlainTextCssDecorator.java b/jspwiki-wysiwyg/src/main/java/org/apache/wiki/htmltowiki/syntax/PlainTextCssDecorator.java
similarity index 100%
rename from jspwiki-main/src/main/java/org/apache/wiki/htmltowiki/syntax/PlainTextCssDecorator.java
rename to jspwiki-wysiwyg/src/main/java/org/apache/wiki/htmltowiki/syntax/PlainTextCssDecorator.java
diff --git a/jspwiki-main/src/main/java/org/apache/wiki/htmltowiki/syntax/PlainTextCssSpecialDecorator.java b/jspwiki-wysiwyg/src/main/java/org/apache/wiki/htmltowiki/syntax/PlainTextCssSpecialDecorator.java
similarity index 100%
rename from jspwiki-main/src/main/java/org/apache/wiki/htmltowiki/syntax/PlainTextCssSpecialDecorator.java
rename to jspwiki-wysiwyg/src/main/java/org/apache/wiki/htmltowiki/syntax/PlainTextCssSpecialDecorator.java
diff --git a/jspwiki-main/src/main/java/org/apache/wiki/htmltowiki/syntax/PlainTextDecorator.java b/jspwiki-wysiwyg/src/main/java/org/apache/wiki/htmltowiki/syntax/PlainTextDecorator.java
similarity index 100%
rename from jspwiki-main/src/main/java/org/apache/wiki/htmltowiki/syntax/PlainTextDecorator.java
rename to jspwiki-wysiwyg/src/main/java/org/apache/wiki/htmltowiki/syntax/PlainTextDecorator.java
diff --git a/jspwiki-main/src/main/java/org/apache/wiki/htmltowiki/syntax/PlainTextItalicDecorator.java b/jspwiki-wysiwyg/src/main/java/org/apache/wiki/htmltowiki/syntax/PlainTextItalicDecorator.java
similarity index 100%
rename from jspwiki-main/src/main/java/org/apache/wiki/htmltowiki/syntax/PlainTextItalicDecorator.java
rename to jspwiki-wysiwyg/src/main/java/org/apache/wiki/htmltowiki/syntax/PlainTextItalicDecorator.java
diff --git a/jspwiki-main/src/main/java/org/apache/wiki/htmltowiki/syntax/PlainTextMonospaceDecorator.java b/jspwiki-wysiwyg/src/main/java/org/apache/wiki/htmltowiki/syntax/PlainTextMonospaceDecorator.java
similarity index 100%
rename from jspwiki-main/src/main/java/org/apache/wiki/htmltowiki/syntax/PlainTextMonospaceDecorator.java
rename to jspwiki-wysiwyg/src/main/java/org/apache/wiki/htmltowiki/syntax/PlainTextMonospaceDecorator.java
diff --git a/jspwiki-main/src/main/java/org/apache/wiki/htmltowiki/syntax/SelectDecorator.java b/jspwiki-wysiwyg/src/main/java/org/apache/wiki/htmltowiki/syntax/SelectDecorator.java
similarity index 100%
rename from jspwiki-main/src/main/java/org/apache/wiki/htmltowiki/syntax/SelectDecorator.java
rename to jspwiki-wysiwyg/src/main/java/org/apache/wiki/htmltowiki/syntax/SelectDecorator.java
diff --git a/jspwiki-main/src/main/java/org/apache/wiki/htmltowiki/syntax/StrikeDecorator.java b/jspwiki-wysiwyg/src/main/java/org/apache/wiki/htmltowiki/syntax/StrikeDecorator.java
similarity index 100%
rename from jspwiki-main/src/main/java/org/apache/wiki/htmltowiki/syntax/StrikeDecorator.java
rename to jspwiki-wysiwyg/src/main/java/org/apache/wiki/htmltowiki/syntax/StrikeDecorator.java
diff --git a/jspwiki-main/src/main/java/org/apache/wiki/htmltowiki/syntax/SubDecorator.java b/jspwiki-wysiwyg/src/main/java/org/apache/wiki/htmltowiki/syntax/SubDecorator.java
similarity index 100%
rename from jspwiki-main/src/main/java/org/apache/wiki/htmltowiki/syntax/SubDecorator.java
rename to jspwiki-wysiwyg/src/main/java/org/apache/wiki/htmltowiki/syntax/SubDecorator.java
diff --git a/jspwiki-main/src/main/java/org/apache/wiki/htmltowiki/syntax/SupDecorator.java b/jspwiki-wysiwyg/src/main/java/org/apache/wiki/htmltowiki/syntax/SupDecorator.java
similarity index 100%
rename from jspwiki-main/src/main/java/org/apache/wiki/htmltowiki/syntax/SupDecorator.java
rename to jspwiki-wysiwyg/src/main/java/org/apache/wiki/htmltowiki/syntax/SupDecorator.java
diff --git a/jspwiki-main/src/main/java/org/apache/wiki/htmltowiki/syntax/TableDecorator.java b/jspwiki-wysiwyg/src/main/java/org/apache/wiki/htmltowiki/syntax/TableDecorator.java
similarity index 100%
rename from jspwiki-main/src/main/java/org/apache/wiki/htmltowiki/syntax/TableDecorator.java
rename to jspwiki-wysiwyg/src/main/java/org/apache/wiki/htmltowiki/syntax/TableDecorator.java
diff --git a/jspwiki-main/src/main/java/org/apache/wiki/htmltowiki/syntax/TbodyDecorator.java b/jspwiki-wysiwyg/src/main/java/org/apache/wiki/htmltowiki/syntax/TbodyDecorator.java
similarity index 100%
rename from jspwiki-main/src/main/java/org/apache/wiki/htmltowiki/syntax/TbodyDecorator.java
rename to jspwiki-wysiwyg/src/main/java/org/apache/wiki/htmltowiki/syntax/TbodyDecorator.java
diff --git a/jspwiki-main/src/main/java/org/apache/wiki/htmltowiki/syntax/TdDecorator.java b/jspwiki-wysiwyg/src/main/java/org/apache/wiki/htmltowiki/syntax/TdDecorator.java
similarity index 100%
rename from jspwiki-main/src/main/java/org/apache/wiki/htmltowiki/syntax/TdDecorator.java
rename to jspwiki-wysiwyg/src/main/java/org/apache/wiki/htmltowiki/syntax/TdDecorator.java
diff --git a/jspwiki-main/src/main/java/org/apache/wiki/htmltowiki/syntax/TextAreaDecorator.java b/jspwiki-wysiwyg/src/main/java/org/apache/wiki/htmltowiki/syntax/TextAreaDecorator.java
similarity index 100%
rename from jspwiki-main/src/main/java/org/apache/wiki/htmltowiki/syntax/TextAreaDecorator.java
rename to jspwiki-wysiwyg/src/main/java/org/apache/wiki/htmltowiki/syntax/TextAreaDecorator.java
diff --git a/jspwiki-main/src/main/java/org/apache/wiki/htmltowiki/syntax/TextElementDecorator.java b/jspwiki-wysiwyg/src/main/java/org/apache/wiki/htmltowiki/syntax/TextElementDecorator.java
similarity index 100%
rename from jspwiki-main/src/main/java/org/apache/wiki/htmltowiki/syntax/TextElementDecorator.java
rename to jspwiki-wysiwyg/src/main/java/org/apache/wiki/htmltowiki/syntax/TextElementDecorator.java
diff --git a/jspwiki-main/src/main/java/org/apache/wiki/htmltowiki/syntax/ThDecorator.java b/jspwiki-wysiwyg/src/main/java/org/apache/wiki/htmltowiki/syntax/ThDecorator.java
similarity index 100%
rename from jspwiki-main/src/main/java/org/apache/wiki/htmltowiki/syntax/ThDecorator.java
rename to jspwiki-wysiwyg/src/main/java/org/apache/wiki/htmltowiki/syntax/ThDecorator.java
diff --git a/jspwiki-main/src/main/java/org/apache/wiki/htmltowiki/syntax/TheadDecorator.java b/jspwiki-wysiwyg/src/main/java/org/apache/wiki/htmltowiki/syntax/TheadDecorator.java
similarity index 100%
rename from jspwiki-main/src/main/java/org/apache/wiki/htmltowiki/syntax/TheadDecorator.java
rename to jspwiki-wysiwyg/src/main/java/org/apache/wiki/htmltowiki/syntax/TheadDecorator.java
diff --git a/jspwiki-main/src/main/java/org/apache/wiki/htmltowiki/syntax/TrDecorator.java b/jspwiki-wysiwyg/src/main/java/org/apache/wiki/htmltowiki/syntax/TrDecorator.java
similarity index 100%
rename from jspwiki-main/src/main/java/org/apache/wiki/htmltowiki/syntax/TrDecorator.java
rename to jspwiki-wysiwyg/src/main/java/org/apache/wiki/htmltowiki/syntax/TrDecorator.java
diff --git a/jspwiki-main/src/main/java/org/apache/wiki/htmltowiki/syntax/UlDecorator.java b/jspwiki-wysiwyg/src/main/java/org/apache/wiki/htmltowiki/syntax/UlDecorator.java
similarity index 100%
rename from jspwiki-main/src/main/java/org/apache/wiki/htmltowiki/syntax/UlDecorator.java
rename to jspwiki-wysiwyg/src/main/java/org/apache/wiki/htmltowiki/syntax/UlDecorator.java
diff --git a/jspwiki-main/src/main/java/org/apache/wiki/htmltowiki/syntax/UnderlineDecorator.java b/jspwiki-wysiwyg/src/main/java/org/apache/wiki/htmltowiki/syntax/UnderlineDecorator.java
similarity index 100%
rename from jspwiki-main/src/main/java/org/apache/wiki/htmltowiki/syntax/UnderlineDecorator.java
rename to jspwiki-wysiwyg/src/main/java/org/apache/wiki/htmltowiki/syntax/UnderlineDecorator.java
diff --git a/jspwiki-main/src/main/java/org/apache/wiki/htmltowiki/syntax/WikiSyntaxDecorator.java b/jspwiki-wysiwyg/src/main/java/org/apache/wiki/htmltowiki/syntax/WikiSyntaxDecorator.java
similarity index 100%
rename from jspwiki-main/src/main/java/org/apache/wiki/htmltowiki/syntax/WikiSyntaxDecorator.java
rename to jspwiki-wysiwyg/src/main/java/org/apache/wiki/htmltowiki/syntax/WikiSyntaxDecorator.java
diff --git a/jspwiki-main/src/main/java/org/apache/wiki/htmltowiki/syntax/jspwiki/JSPWikiADecorator.java b/jspwiki-wysiwyg/src/main/java/org/apache/wiki/htmltowiki/syntax/jspwiki/JSPWikiADecorator.java
similarity index 100%
rename from jspwiki-main/src/main/java/org/apache/wiki/htmltowiki/syntax/jspwiki/JSPWikiADecorator.java
rename to jspwiki-wysiwyg/src/main/java/org/apache/wiki/htmltowiki/syntax/jspwiki/JSPWikiADecorator.java
diff --git a/jspwiki-main/src/main/java/org/apache/wiki/htmltowiki/syntax/jspwiki/JSPWikiBrDecorator.java b/jspwiki-wysiwyg/src/main/java/org/apache/wiki/htmltowiki/syntax/jspwiki/JSPWikiBrDecorator.java
similarity index 100%
rename from jspwiki-main/src/main/java/org/apache/wiki/htmltowiki/syntax/jspwiki/JSPWikiBrDecorator.java
rename to jspwiki-wysiwyg/src/main/java/org/apache/wiki/htmltowiki/syntax/jspwiki/JSPWikiBrDecorator.java
diff --git a/jspwiki-main/src/main/java/org/apache/wiki/htmltowiki/syntax/jspwiki/JSPWikiCodeDecorator.java b/jspwiki-wysiwyg/src/main/java/org/apache/wiki/htmltowiki/syntax/jspwiki/JSPWikiCodeDecorator.java
similarity index 100%
rename from jspwiki-main/src/main/java/org/apache/wiki/htmltowiki/syntax/jspwiki/JSPWikiCodeDecorator.java
rename to jspwiki-wysiwyg/src/main/java/org/apache/wiki/htmltowiki/syntax/jspwiki/JSPWikiCodeDecorator.java
diff --git a/jspwiki-main/src/main/java/org/apache/wiki/htmltowiki/syntax/jspwiki/JSPWikiDdDecorator.java b/jspwiki-wysiwyg/src/main/java/org/apache/wiki/htmltowiki/syntax/jspwiki/JSPWikiDdDecorator.java
similarity index 100%
rename from jspwiki-main/src/main/java/org/apache/wiki/htmltowiki/syntax/jspwiki/JSPWikiDdDecorator.java
rename to jspwiki-wysiwyg/src/main/java/org/apache/wiki/htmltowiki/syntax/jspwiki/JSPWikiDdDecorator.java
diff --git a/jspwiki-main/src/main/java/org/apache/wiki/htmltowiki/syntax/jspwiki/JSPWikiDlDecorator.java b/jspwiki-wysiwyg/src/main/java/org/apache/wiki/htmltowiki/syntax/jspwiki/JSPWikiDlDecorator.java
similarity index 100%
rename from jspwiki-main/src/main/java/org/apache/wiki/htmltowiki/syntax/jspwiki/JSPWikiDlDecorator.java
rename to jspwiki-wysiwyg/src/main/java/org/apache/wiki/htmltowiki/syntax/jspwiki/JSPWikiDlDecorator.java
diff --git a/jspwiki-main/src/main/java/org/apache/wiki/htmltowiki/syntax/jspwiki/JSPWikiDtDecorator.java b/jspwiki-wysiwyg/src/main/java/org/apache/wiki/htmltowiki/syntax/jspwiki/JSPWikiDtDecorator.java
similarity index 100%
rename from jspwiki-main/src/main/java/org/apache/wiki/htmltowiki/syntax/jspwiki/JSPWikiDtDecorator.java
rename to jspwiki-wysiwyg/src/main/java/org/apache/wiki/htmltowiki/syntax/jspwiki/JSPWikiDtDecorator.java
diff --git a/jspwiki-main/src/main/java/org/apache/wiki/htmltowiki/syntax/jspwiki/JSPWikiFormDecorator.java b/jspwiki-wysiwyg/src/main/java/org/apache/wiki/htmltowiki/syntax/jspwiki/JSPWikiFormDecorator.java
similarity index 100%
rename from jspwiki-main/src/main/java/org/apache/wiki/htmltowiki/syntax/jspwiki/JSPWikiFormDecorator.java
rename to jspwiki-wysiwyg/src/main/java/org/apache/wiki/htmltowiki/syntax/jspwiki/JSPWikiFormDecorator.java
diff --git a/jspwiki-main/src/main/java/org/apache/wiki/htmltowiki/syntax/jspwiki/JSPWikiH1Decorator.java b/jspwiki-wysiwyg/src/main/java/org/apache/wiki/htmltowiki/syntax/jspwiki/JSPWikiH1Decorator.java
similarity index 100%
rename from jspwiki-main/src/main/java/org/apache/wiki/htmltowiki/syntax/jspwiki/JSPWikiH1Decorator.java
rename to jspwiki-wysiwyg/src/main/java/org/apache/wiki/htmltowiki/syntax/jspwiki/JSPWikiH1Decorator.java
diff --git a/jspwiki-main/src/main/java/org/apache/wiki/htmltowiki/syntax/jspwiki/JSPWikiH2Decorator.java b/jspwiki-wysiwyg/src/main/java/org/apache/wiki/htmltowiki/syntax/jspwiki/JSPWikiH2Decorator.java
similarity index 100%
rename from jspwiki-main/src/main/java/org/apache/wiki/htmltowiki/syntax/jspwiki/JSPWikiH2Decorator.java
rename to jspwiki-wysiwyg/src/main/java/org/apache/wiki/htmltowiki/syntax/jspwiki/JSPWikiH2Decorator.java
diff --git a/jspwiki-main/src/main/java/org/apache/wiki/htmltowiki/syntax/jspwiki/JSPWikiH3Decorator.java b/jspwiki-wysiwyg/src/main/java/org/apache/wiki/htmltowiki/syntax/jspwiki/JSPWikiH3Decorator.java
similarity index 100%
rename from jspwiki-main/src/main/java/org/apache/wiki/htmltowiki/syntax/jspwiki/JSPWikiH3Decorator.java
rename to jspwiki-wysiwyg/src/main/java/org/apache/wiki/htmltowiki/syntax/jspwiki/JSPWikiH3Decorator.java
diff --git a/jspwiki-main/src/main/java/org/apache/wiki/htmltowiki/syntax/jspwiki/JSPWikiH4Decorator.java b/jspwiki-wysiwyg/src/main/java/org/apache/wiki/htmltowiki/syntax/jspwiki/JSPWikiH4Decorator.java
similarity index 100%
rename from jspwiki-main/src/main/java/org/apache/wiki/htmltowiki/syntax/jspwiki/JSPWikiH4Decorator.java
rename to jspwiki-wysiwyg/src/main/java/org/apache/wiki/htmltowiki/syntax/jspwiki/JSPWikiH4Decorator.java
diff --git a/jspwiki-main/src/main/java/org/apache/wiki/htmltowiki/syntax/jspwiki/JSPWikiHrDecorator.java b/jspwiki-wysiwyg/src/main/java/org/apache/wiki/htmltowiki/syntax/jspwiki/JSPWikiHrDecorator.java
similarity index 100%
rename from jspwiki-main/src/main/java/org/apache/wiki/htmltowiki/syntax/jspwiki/JSPWikiHrDecorator.java
rename to jspwiki-wysiwyg/src/main/java/org/apache/wiki/htmltowiki/syntax/jspwiki/JSPWikiHrDecorator.java
diff --git a/jspwiki-main/src/main/java/org/apache/wiki/htmltowiki/syntax/jspwiki/JSPWikiImageDecorator.java b/jspwiki-wysiwyg/src/main/java/org/apache/wiki/htmltowiki/syntax/jspwiki/JSPWikiImageDecorator.java
similarity index 100%
rename from jspwiki-main/src/main/java/org/apache/wiki/htmltowiki/syntax/jspwiki/JSPWikiImageDecorator.java
rename to jspwiki-wysiwyg/src/main/java/org/apache/wiki/htmltowiki/syntax/jspwiki/JSPWikiImageDecorator.java
diff --git a/jspwiki-main/src/main/java/org/apache/wiki/htmltowiki/syntax/jspwiki/JSPWikiInputDecorator.java b/jspwiki-wysiwyg/src/main/java/org/apache/wiki/htmltowiki/syntax/jspwiki/JSPWikiInputDecorator.java
similarity index 100%
rename from jspwiki-main/src/main/java/org/apache/wiki/htmltowiki/syntax/jspwiki/JSPWikiInputDecorator.java
rename to jspwiki-wysiwyg/src/main/java/org/apache/wiki/htmltowiki/syntax/jspwiki/JSPWikiInputDecorator.java
diff --git a/jspwiki-main/src/main/java/org/apache/wiki/htmltowiki/syntax/jspwiki/JSPWikiLiDecorator.java b/jspwiki-wysiwyg/src/main/java/org/apache/wiki/htmltowiki/syntax/jspwiki/JSPWikiLiDecorator.java
similarity index 100%
rename from jspwiki-main/src/main/java/org/apache/wiki/htmltowiki/syntax/jspwiki/JSPWikiLiDecorator.java
rename to jspwiki-wysiwyg/src/main/java/org/apache/wiki/htmltowiki/syntax/jspwiki/JSPWikiLiDecorator.java
diff --git a/jspwiki-main/src/main/java/org/apache/wiki/htmltowiki/syntax/jspwiki/JSPWikiOlDecorator.java b/jspwiki-wysiwyg/src/main/java/org/apache/wiki/htmltowiki/syntax/jspwiki/JSPWikiOlDecorator.java
similarity index 100%
rename from jspwiki-main/src/main/java/org/apache/wiki/htmltowiki/syntax/jspwiki/JSPWikiOlDecorator.java
rename to jspwiki-wysiwyg/src/main/java/org/apache/wiki/htmltowiki/syntax/jspwiki/JSPWikiOlDecorator.java
diff --git a/jspwiki-main/src/main/java/org/apache/wiki/htmltowiki/syntax/jspwiki/JSPWikiPDecorator.java b/jspwiki-wysiwyg/src/main/java/org/apache/wiki/htmltowiki/syntax/jspwiki/JSPWikiPDecorator.java
similarity index 100%
rename from jspwiki-main/src/main/java/org/apache/wiki/htmltowiki/syntax/jspwiki/JSPWikiPDecorator.java
rename to jspwiki-wysiwyg/src/main/java/org/apache/wiki/htmltowiki/syntax/jspwiki/JSPWikiPDecorator.java
diff --git a/jspwiki-main/src/main/java/org/apache/wiki/htmltowiki/syntax/jspwiki/JSPWikiPlainTextBoldDecorator.java b/jspwiki-wysiwyg/src/main/java/org/apache/wiki/htmltowiki/syntax/jspwiki/JSPWikiPlainTextBoldDecorator.java
similarity index 100%
rename from jspwiki-main/src/main/java/org/apache/wiki/htmltowiki/syntax/jspwiki/JSPWikiPlainTextBoldDecorator.java
rename to jspwiki-wysiwyg/src/main/java/org/apache/wiki/htmltowiki/syntax/jspwiki/JSPWikiPlainTextBoldDecorator.java
diff --git a/jspwiki-main/src/main/java/org/apache/wiki/htmltowiki/syntax/jspwiki/JSPWikiPlainTextCssDecorator.java b/jspwiki-wysiwyg/src/main/java/org/apache/wiki/htmltowiki/syntax/jspwiki/JSPWikiPlainTextCssDecorator.java
similarity index 100%
rename from jspwiki-main/src/main/java/org/apache/wiki/htmltowiki/syntax/jspwiki/JSPWikiPlainTextCssDecorator.java
rename to jspwiki-wysiwyg/src/main/java/org/apache/wiki/htmltowiki/syntax/jspwiki/JSPWikiPlainTextCssDecorator.java
diff --git a/jspwiki-main/src/main/java/org/apache/wiki/htmltowiki/syntax/jspwiki/JSPWikiPlainTextCssSpecialDecorator.java b/jspwiki-wysiwyg/src/main/java/org/apache/wiki/htmltowiki/syntax/jspwiki/JSPWikiPlainTextCssSpecialDecorator.java
similarity index 100%
rename from jspwiki-main/src/main/java/org/apache/wiki/htmltowiki/syntax/jspwiki/JSPWikiPlainTextCssSpecialDecorator.java
rename to jspwiki-wysiwyg/src/main/java/org/apache/wiki/htmltowiki/syntax/jspwiki/JSPWikiPlainTextCssSpecialDecorator.java
diff --git a/jspwiki-main/src/main/java/org/apache/wiki/htmltowiki/syntax/jspwiki/JSPWikiPlainTextItalicDecorator.java b/jspwiki-wysiwyg/src/main/java/org/apache/wiki/htmltowiki/syntax/jspwiki/JSPWikiPlainTextItalicDecorator.java
similarity index 100%
rename from jspwiki-main/src/main/java/org/apache/wiki/htmltowiki/syntax/jspwiki/JSPWikiPlainTextItalicDecorator.java
rename to jspwiki-wysiwyg/src/main/java/org/apache/wiki/htmltowiki/syntax/jspwiki/JSPWikiPlainTextItalicDecorator.java
diff --git a/jspwiki-main/src/main/java/org/apache/wiki/htmltowiki/syntax/jspwiki/JSPWikiPlainTextMonospaceDecorator.java b/jspwiki-wysiwyg/src/main/java/org/apache/wiki/htmltowiki/syntax/jspwiki/JSPWikiPlainTextMonospaceDecorator.java
similarity index 100%
rename from jspwiki-main/src/main/java/org/apache/wiki/htmltowiki/syntax/jspwiki/JSPWikiPlainTextMonospaceDecorator.java
rename to jspwiki-wysiwyg/src/main/java/org/apache/wiki/htmltowiki/syntax/jspwiki/JSPWikiPlainTextMonospaceDecorator.java
diff --git a/jspwiki-main/src/main/java/org/apache/wiki/htmltowiki/syntax/jspwiki/JSPWikiSelectDecorator.java b/jspwiki-wysiwyg/src/main/java/org/apache/wiki/htmltowiki/syntax/jspwiki/JSPWikiSelectDecorator.java
similarity index 100%
rename from jspwiki-main/src/main/java/org/apache/wiki/htmltowiki/syntax/jspwiki/JSPWikiSelectDecorator.java
rename to jspwiki-wysiwyg/src/main/java/org/apache/wiki/htmltowiki/syntax/jspwiki/JSPWikiSelectDecorator.java
diff --git a/jspwiki-main/src/main/java/org/apache/wiki/htmltowiki/syntax/jspwiki/JSPWikiStrikeDecorator.java b/jspwiki-wysiwyg/src/main/java/org/apache/wiki/htmltowiki/syntax/jspwiki/JSPWikiStrikeDecorator.java
similarity index 100%
rename from jspwiki-main/src/main/java/org/apache/wiki/htmltowiki/syntax/jspwiki/JSPWikiStrikeDecorator.java
rename to jspwiki-wysiwyg/src/main/java/org/apache/wiki/htmltowiki/syntax/jspwiki/JSPWikiStrikeDecorator.java
diff --git a/jspwiki-main/src/main/java/org/apache/wiki/htmltowiki/syntax/jspwiki/JSPWikiSubDecorator.java b/jspwiki-wysiwyg/src/main/java/org/apache/wiki/htmltowiki/syntax/jspwiki/JSPWikiSubDecorator.java
similarity index 100%
rename from jspwiki-main/src/main/java/org/apache/wiki/htmltowiki/syntax/jspwiki/JSPWikiSubDecorator.java
rename to jspwiki-wysiwyg/src/main/java/org/apache/wiki/htmltowiki/syntax/jspwiki/JSPWikiSubDecorator.java
diff --git a/jspwiki-main/src/main/java/org/apache/wiki/htmltowiki/syntax/jspwiki/JSPWikiSupDecorator.java b/jspwiki-wysiwyg/src/main/java/org/apache/wiki/htmltowiki/syntax/jspwiki/JSPWikiSupDecorator.java
similarity index 100%
rename from jspwiki-main/src/main/java/org/apache/wiki/htmltowiki/syntax/jspwiki/JSPWikiSupDecorator.java
rename to jspwiki-wysiwyg/src/main/java/org/apache/wiki/htmltowiki/syntax/jspwiki/JSPWikiSupDecorator.java
diff --git a/jspwiki-main/src/main/java/org/apache/wiki/htmltowiki/syntax/jspwiki/JSPWikiSyntaxDecorator.java b/jspwiki-wysiwyg/src/main/java/org/apache/wiki/htmltowiki/syntax/jspwiki/JSPWikiSyntaxDecorator.java
similarity index 100%
rename from jspwiki-main/src/main/java/org/apache/wiki/htmltowiki/syntax/jspwiki/JSPWikiSyntaxDecorator.java
rename to jspwiki-wysiwyg/src/main/java/org/apache/wiki/htmltowiki/syntax/jspwiki/JSPWikiSyntaxDecorator.java
diff --git a/jspwiki-main/src/main/java/org/apache/wiki/htmltowiki/syntax/jspwiki/JSPWikiTdDecorator.java b/jspwiki-wysiwyg/src/main/java/org/apache/wiki/htmltowiki/syntax/jspwiki/JSPWikiTdDecorator.java
similarity index 100%
rename from jspwiki-main/src/main/java/org/apache/wiki/htmltowiki/syntax/jspwiki/JSPWikiTdDecorator.java
rename to jspwiki-wysiwyg/src/main/java/org/apache/wiki/htmltowiki/syntax/jspwiki/JSPWikiTdDecorator.java
diff --git a/jspwiki-main/src/main/java/org/apache/wiki/htmltowiki/syntax/jspwiki/JSPWikiTextAreaDecorator.java b/jspwiki-wysiwyg/src/main/java/org/apache/wiki/htmltowiki/syntax/jspwiki/JSPWikiTextAreaDecorator.java
similarity index 100%
rename from jspwiki-main/src/main/java/org/apache/wiki/htmltowiki/syntax/jspwiki/JSPWikiTextAreaDecorator.java
rename to jspwiki-wysiwyg/src/main/java/org/apache/wiki/htmltowiki/syntax/jspwiki/JSPWikiTextAreaDecorator.java
diff --git a/jspwiki-main/src/main/java/org/apache/wiki/htmltowiki/syntax/jspwiki/JSPWikiThDecorator.java b/jspwiki-wysiwyg/src/main/java/org/apache/wiki/htmltowiki/syntax/jspwiki/JSPWikiThDecorator.java
similarity index 100%
rename from jspwiki-main/src/main/java/org/apache/wiki/htmltowiki/syntax/jspwiki/JSPWikiThDecorator.java
rename to jspwiki-wysiwyg/src/main/java/org/apache/wiki/htmltowiki/syntax/jspwiki/JSPWikiThDecorator.java
diff --git a/jspwiki-main/src/main/java/org/apache/wiki/htmltowiki/syntax/jspwiki/JSPWikiUlDecorator.java b/jspwiki-wysiwyg/src/main/java/org/apache/wiki/htmltowiki/syntax/jspwiki/JSPWikiUlDecorator.java
similarity index 100%
rename from jspwiki-main/src/main/java/org/apache/wiki/htmltowiki/syntax/jspwiki/JSPWikiUlDecorator.java
rename to jspwiki-wysiwyg/src/main/java/org/apache/wiki/htmltowiki/syntax/jspwiki/JSPWikiUlDecorator.java
diff --git a/jspwiki-main/src/main/java/org/apache/wiki/htmltowiki/syntax/jspwiki/JSPWikiUnderlineDecorator.java b/jspwiki-wysiwyg/src/main/java/org/apache/wiki/htmltowiki/syntax/jspwiki/JSPWikiUnderlineDecorator.java
similarity index 100%
rename from jspwiki-main/src/main/java/org/apache/wiki/htmltowiki/syntax/jspwiki/JSPWikiUnderlineDecorator.java
rename to jspwiki-wysiwyg/src/main/java/org/apache/wiki/htmltowiki/syntax/jspwiki/JSPWikiUnderlineDecorator.java
diff --git a/jspwiki-main/src/main/java/org/apache/wiki/htmltowiki/syntax/jspwiki/package.html b/jspwiki-wysiwyg/src/main/java/org/apache/wiki/htmltowiki/syntax/jspwiki/package.html
similarity index 100%
rename from jspwiki-main/src/main/java/org/apache/wiki/htmltowiki/syntax/jspwiki/package.html
rename to jspwiki-wysiwyg/src/main/java/org/apache/wiki/htmltowiki/syntax/jspwiki/package.html
diff --git a/jspwiki-main/src/main/java/org/apache/wiki/htmltowiki/syntax/package.html b/jspwiki-wysiwyg/src/main/java/org/apache/wiki/htmltowiki/syntax/package.html
similarity index 100%
rename from jspwiki-main/src/main/java/org/apache/wiki/htmltowiki/syntax/package.html
rename to jspwiki-wysiwyg/src/main/java/org/apache/wiki/htmltowiki/syntax/package.html
diff --git a/jspwiki-main/src/test/java/org/apache/wiki/htmltowiki/HtmlStringToWikiTranslatorTest.java b/jspwiki-wysiwyg/src/test/java/org/apache/wiki/htmltowiki/HtmlStringToWikiTranslatorTest.java
similarity index 100%
rename from jspwiki-main/src/test/java/org/apache/wiki/htmltowiki/HtmlStringToWikiTranslatorTest.java
rename to jspwiki-wysiwyg/src/test/java/org/apache/wiki/htmltowiki/HtmlStringToWikiTranslatorTest.java
diff --git a/pom.xml b/pom.xml
index 6b87c20..bb2c11d 100644
--- a/pom.xml
+++ b/pom.xml
@@ -126,6 +126,7 @@
<module>jspwiki-api</module>
<module>jspwiki-bootstrap</module>
<module>jspwiki-cache</module>
+ <module>jspwiki-wysiwyg</module>
<module>jspwiki-main</module>
<module>jspwiki-markdown</module>
<module>jspwiki-tika-searchprovider</module>
[jspwiki] 08/15: Update dependencies
Posted by ju...@apache.org.
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 5b116ac739b38c0eaebc879a9801d5a058b5adfe
Author: Juan Pablo Santos Rodríguez <ju...@gmail.com>
AuthorDate: Fri Mar 11 14:31:31 2022 +0100
Update dependencies
* aws kendra java sdk to 1.12.176
* jetty to 9.4.45.v20220203 - closes #175
* maven-compiler-lugin to 3.10.1
also, exclude java spi implementation files from RAT checks
---
pom.xml | 10 ++++++----
1 file changed, 6 insertions(+), 4 deletions(-)
diff --git a/pom.xml b/pom.xml
index bb2c11d..4ff2e6d 100644
--- a/pom.xml
+++ b/pom.xml
@@ -46,7 +46,7 @@
<akismet-java.version>1.02</akismet-java.version>
<awaitility.version>4.1.1</awaitility.version>
- <aws-java-sdk-kendra.version>1.12.59</aws-java-sdk-kendra.version>
+ <aws-java-sdk-kendra.version>1.12.176</aws-java-sdk-kendra.version>
<commons-collections.version>4.4</commons-collections.version>
<commons-fileupload.version>1.4</commons-fileupload.version>
<commons-httpclient.version>3.1</commons-httpclient.version>
@@ -64,7 +64,7 @@
<javax-jsp-api.version>2.3.3</javax-jsp-api.version>
<javax-servlet-api.version>3.1.0</javax-servlet-api.version>
<jdom2.version>2.0.6</jdom2.version>
- <jetty.version>9.4.44.v20210927</jetty.version>
+ <jetty.version>9.4.45.v20220203</jetty.version>
<jrcs-diff.version>0.4.2</jrcs-diff.version>
<junit.version>5.8.2</junit.version>
<log4j2.version>2.17.2</log4j2.version>
@@ -84,7 +84,7 @@
<plugin.antrun.version>3.0.0</plugin.antrun.version>
<plugin.assembly.version>3.3.0</plugin.assembly.version>
<plugin.clean.version>3.1.0</plugin.clean.version>
- <plugin.compiler.version>3.10.0</plugin.compiler.version>
+ <plugin.compiler.version>3.10.1</plugin.compiler.version>
<plugin.dependency.version>3.2.0</plugin.dependency.version>
<plugin.enforcer.version>3.0.0</plugin.enforcer.version>
<plugin.install.version>2.5.2</plugin.install.version>
@@ -716,15 +716,17 @@
<exclude>**/src/main/config/doc/LICENSE.*</exclude> <!-- 3rd party License files -->
<exclude>**/src/main/config/wikipages/**</exclude> <!-- Default wikipages -->
<exclude>**/src/main/config/dev/OldChangeLog</exclude> <!-- ChangeLog excluded by default, this is, well, an old ChangeLog -->
+ <exclude>**/src/main/resources/META-INF/services/*</exclude> <!-- Java SPI implementations files -->
<exclude>**/src/main/scripts/posteditor.js</exclude> <!-- minified file -->
<exclude>**/src/main/scripts/wiki-wysiwyg/**</exclude> <!-- MooEditable src, MIT licensed -->
- <exclude>**/src/main/webapp/scripts/mooeditable/**</exclude> <!-- MooEditable src, MIT licensed -->
<exclude>**/src/main/scripts/moo-extend/Request.File.js</exclude> <!-- MIT licensed -->
<exclude>**/src/main/styles/haddock/fontjspwiki/**</exclude> <!-- MIT/OFL licensed -->
<exclude>**/src/main/webapp/templates/haddock/fonts/FontJspwiki.*</exclude><!-- MIT/OFL licensed -->
<exclude>**/src/main/webapp/templates/reader/fonts/FontJspwiki.*</exclude> <!-- MIT/OFL licensed -->
+ <exclude>**/src/main/webapp/scripts/mooeditable/**</exclude> <!-- MooEditable src, MIT licensed -->
<exclude>**/src/main/webapp/scripts/*.js</exclude> <!-- minified files -->
<exclude>**/src/main/scripts/lib/*.js</exclude> <!-- 3rd party js files -->
+ <exclude>**/src/test/resources/META-INF/services/*</exclude> <!-- Java SPI implementations files -->
<exclude>**/src/test/resources/TextFormattingRules.txt</exclude> <!-- test input data -->
<exclude>**/src/test/resources/test-repo/*.txt</exclude> <!-- web tests input data -->
<exclude>**/src/main/webapp/templates/default/images/SilkIconSet-readme.txt</exclude> <!-- license, required by Silk Icon set cfr. NOTICE, LICENSE, etc. -->
[jspwiki] 02/15: update portable launcher binaries
Posted by ju...@apache.org.
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 798663fabab57b331554b8d97fc20f4cc6268efc
Author: Juan Pablo Santos Rodríguez <ju...@gmail.com>
AuthorDate: Mon Mar 7 14:49:31 2022 +0100
update portable launcher binaries
---
.../tomcat/woas.app/Contents/Java/bootstrap.jar | Bin 34779 -> 34698 bytes
.../tomcat/woas.app/Contents/Java/tomcat-juli.jar | Bin 47110 -> 46898 bytes
.../src/overlay/launchers/tomcat/woas.exe | Bin 3675327 -> 3656529 bytes
3 files changed, 0 insertions(+), 0 deletions(-)
diff --git a/jspwiki-portable/src/overlay/launchers/tomcat/woas.app/Contents/Java/bootstrap.jar b/jspwiki-portable/src/overlay/launchers/tomcat/woas.app/Contents/Java/bootstrap.jar
index c889579..d3c9270 100644
Binary files a/jspwiki-portable/src/overlay/launchers/tomcat/woas.app/Contents/Java/bootstrap.jar and b/jspwiki-portable/src/overlay/launchers/tomcat/woas.app/Contents/Java/bootstrap.jar differ
diff --git a/jspwiki-portable/src/overlay/launchers/tomcat/woas.app/Contents/Java/tomcat-juli.jar b/jspwiki-portable/src/overlay/launchers/tomcat/woas.app/Contents/Java/tomcat-juli.jar
index 718f199..5fa4903 100644
Binary files a/jspwiki-portable/src/overlay/launchers/tomcat/woas.app/Contents/Java/tomcat-juli.jar and b/jspwiki-portable/src/overlay/launchers/tomcat/woas.app/Contents/Java/tomcat-juli.jar differ
diff --git a/jspwiki-portable/src/overlay/launchers/tomcat/woas.exe b/jspwiki-portable/src/overlay/launchers/tomcat/woas.exe
index 5613e76..c8b0962 100644
Binary files a/jspwiki-portable/src/overlay/launchers/tomcat/woas.exe and b/jspwiki-portable/src/overlay/launchers/tomcat/woas.exe differ
[jspwiki] 06/15: lower log noise
Posted by ju...@apache.org.
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 4a1ecae266d5139655286ac144a8ce2cb24fc2cd
Author: Juan Pablo Santos Rodríguez <ju...@gmail.com>
AuthorDate: Mon Mar 7 14:52:30 2022 +0100
lower log noise
---
.../java/org/apache/wiki/htmltowiki/XHtmlElementToWikiTranslator.java | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/jspwiki-main/src/main/java/org/apache/wiki/htmltowiki/XHtmlElementToWikiTranslator.java b/jspwiki-main/src/main/java/org/apache/wiki/htmltowiki/XHtmlElementToWikiTranslator.java
index 6362096..b61fe13 100644
--- a/jspwiki-main/src/main/java/org/apache/wiki/htmltowiki/XHtmlElementToWikiTranslator.java
+++ b/jspwiki-main/src/main/java/org/apache/wiki/htmltowiki/XHtmlElementToWikiTranslator.java
@@ -88,7 +88,7 @@ public class XHtmlElementToWikiTranslator {
LOG.warn( "{} does not subclass {} reverting to default syntax decorator.", sdClass, SyntaxDecorator.class.getName() );
sdClass = DEFAULT_SYNTAX_DECORATOR;
}
- LOG.info( "Using {} as markup parser.", sdClass );
+ LOG.debug( "Using {} as markup parser.", sdClass );
return ClassUtil.buildInstance( sdClass );
}
[jspwiki] 10/15: add jspwiki-wysiwyg dependency
Posted by ju...@apache.org.
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 6bcf793ab98d255f92aa9063451ca0bd468eed19
Author: Juan Pablo Santos Rodríguez <ju...@gmail.com>
AuthorDate: Fri Mar 11 14:32:53 2022 +0100
add jspwiki-wysiwyg dependency
---
jspwiki-main/pom.xml | 6 ++++++
1 file changed, 6 insertions(+)
diff --git a/jspwiki-main/pom.xml b/jspwiki-main/pom.xml
index 205cb4c..0614605 100644
--- a/jspwiki-main/pom.xml
+++ b/jspwiki-main/pom.xml
@@ -55,6 +55,12 @@
</dependency>
<dependency>
+ <groupId>${project.groupId}</groupId>
+ <artifactId>jspwiki-wysiwyg</artifactId>
+ <version>${project.version}</version>
+ </dependency>
+
+ <dependency>
<groupId>com.google.code.gson</groupId>
<artifactId>gson</artifactId>
</dependency>
[jspwiki] 14/15: Update dependencies' versions on LICENSE
Posted by ju...@apache.org.
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 66b91152d26e806ae602743d5d563836054327eb
Author: Juan Pablo Santos Rodríguez <ju...@gmail.com>
AuthorDate: Fri Mar 11 14:42:28 2022 +0100
Update dependencies' versions on LICENSE
---
LICENSE | 62 +++++++++++++++++++++++++++++++-------------------------------
1 file changed, 31 insertions(+), 31 deletions(-)
diff --git a/LICENSE b/LICENSE
index 325d1fe..20d78f6 100644
--- a/LICENSE
+++ b/LICENSE
@@ -221,26 +221,26 @@ commons-lang-3.12.0.jar LICENSE
commons-logging-1.0.4.jar LICENSE
commons-text-1.9.jar LICENSE
ehcache-2.10.9.2.jar LICENSE
-flexmark-0.62.2.jar ./jspwiki-war/src/main/config/doc/LICENSE.flexmark
-flexmark-ext-attributes-0.62.2.jar ./jspwiki-war/src/main/config/doc/LICENSE.flexmark
-flexmark-ext-definition-0.62.2.jar ./jspwiki-war/src/main/config/doc/LICENSE.flexmark
-flexmark-ext-footnotes-0.62.2.jar ./jspwiki-war/src/main/config/doc/LICENSE.flexmark
-flexmark-ext-tables-0.62.2.jar ./jspwiki-war/src/main/config/doc/LICENSE.flexmark
-flexmark-ext-toc-0.62.2.jar ./jspwiki-war/src/main/config/doc/LICENSE.flexmark
-flexmark-util-0.62.2.jar ./jspwiki-war/src/main/config/doc/LICENSE.flexmark
-flexmark-util-ast-0.62.2.jar ./jspwiki-war/src/main/config/doc/LICENSE.flexmark
-flexmark-util-builder-0.62.2.jar ./jspwiki-war/src/main/config/doc/LICENSE.flexmark
-flexmark-util-collection-0.62.2.jar ./jspwiki-war/src/main/config/doc/LICENSE.flexmark
-flexmark-util-data-0.62.2.jar ./jspwiki-war/src/main/config/doc/LICENSE.flexmark
-flexmark-util-dependency-0.62.2.jar ./jspwiki-war/src/main/config/doc/LICENSE.flexmark
-flexmark-util-format-0.62.2.jar ./jspwiki-war/src/main/config/doc/LICENSE.flexmark
-flexmark-util-html-0.62.2.jar ./jspwiki-war/src/main/config/doc/LICENSE.flexmark
-flexmark-util-misc-0.62.2.jar ./jspwiki-war/src/main/config/doc/LICENSE.flexmark
-flexmark-util-options-0.62.2.jar ./jspwiki-war/src/main/config/doc/LICENSE.flexmark
-flexmark-util-sequence-0.62.2.jar ./jspwiki-war/src/main/config/doc/LICENSE.flexmark
-flexmark-util-visitor-0.62.2.jar ./jspwiki-war/src/main/config/doc/LICENSE.flexmark
+flexmark-0.64.0.jar ./jspwiki-war/src/main/config/doc/LICENSE.flexmark
+flexmark-ext-attributes-0.64.0.jar ./jspwiki-war/src/main/config/doc/LICENSE.flexmark
+flexmark-ext-definition-0.64.0.jar ./jspwiki-war/src/main/config/doc/LICENSE.flexmark
+flexmark-ext-footnotes-0.64.0.jar ./jspwiki-war/src/main/config/doc/LICENSE.flexmark
+flexmark-ext-tables-0.64.0.jar ./jspwiki-war/src/main/config/doc/LICENSE.flexmark
+flexmark-ext-toc-0.64.0.jar ./jspwiki-war/src/main/config/doc/LICENSE.flexmark
+flexmark-util-0.64.0.jar ./jspwiki-war/src/main/config/doc/LICENSE.flexmark
+flexmark-util-ast-0.64.0.jar ./jspwiki-war/src/main/config/doc/LICENSE.flexmark
+flexmark-util-builder-0.64.0.jar ./jspwiki-war/src/main/config/doc/LICENSE.flexmark
+flexmark-util-collection-0.64.0.jar ./jspwiki-war/src/main/config/doc/LICENSE.flexmark
+flexmark-util-data-0.64.0.jar ./jspwiki-war/src/main/config/doc/LICENSE.flexmark
+flexmark-util-dependency-0.64.0.jar ./jspwiki-war/src/main/config/doc/LICENSE.flexmark
+flexmark-util-format-0.64.0.jar ./jspwiki-war/src/main/config/doc/LICENSE.flexmark
+flexmark-util-html-0.64.0.jar ./jspwiki-war/src/main/config/doc/LICENSE.flexmark
+flexmark-util-misc-0.64.0.jar ./jspwiki-war/src/main/config/doc/LICENSE.flexmark
+flexmark-util-options-0.64.0.jar ./jspwiki-war/src/main/config/doc/LICENSE.flexmark
+flexmark-util-sequence-0.64.0.jar ./jspwiki-war/src/main/config/doc/LICENSE.flexmark
+flexmark-util-visitor-0.64.0.jar ./jspwiki-war/src/main/config/doc/LICENSE.flexmark
freshcookies-security-0.60.jar LICENSE
-gson-2.8.9 LICENSE
+gson-2.9.0 LICENSE
httpclient-4.5.13 LICENSE
httpcore-4.4.13 LICENSE
ion-java-1.0.2 LICENSE
@@ -253,10 +253,10 @@ jdom2-2.0.6.jar ./jspwiki-war/src/main/config/doc/LI
jmespath-java-1.12.59 LICENSE
joda-time-2.8.1 LICENSE
jstl-1.2.jar LICENSE
-log4j-1.2-api-2.16.0.jar LICENSE
-log4j-api-2.16.0.jar LICENSE
-log4j-core-2.16.0.jar LICENSE
-log4j-slf4j-impl-2.16.0 LICENSE
+log4j-1.2-api-2.17.2.jar LICENSE
+log4j-api-2.17.2.jar LICENSE
+log4j-core-2.17.2.jar LICENSE
+log4j-slf4j-impl-2.17.2 LICENSE
lucene-analyzers-common-8.11.0.jar LICENSE
lucene-backward-codecs-8.11.0.jar LICENSE
lucene-core-8.11.0.jar LICENSE
@@ -266,14 +266,14 @@ lucene-queries-8.11.0.jar LICENSE
lucene-queryparser-8.11.0.jar LICENSE
lucene-sandbox-8.11.0.jar LICENSE
mail-1.4.7.jar ./jspwiki-war/src/main/config/doc/LICENSE.cddl
-nekohtml-1.9.22.jar LICENSE
+nekohtml-2.0.2.jar (codelibs fork) LICENSE
org.suigeneris.jrcs.diff-0.4.2 LICENSE
oro-2.0.8.jar LICENSE
sandler-0.5.jar ./jspwiki-war/src/main/config/doc/LICENSE.sandler
-slf4-api-1.7.32.jar ./jspwiki-war/src/main/config/doc/LICENSE.mit
+slf4-api-1.7.36.jar ./jspwiki-war/src/main/config/doc/LICENSE.mit
xercesImpl-2.10.0.jar LICENSE
-tika-core-2.1.0.jar LICENSE
-tika-parsers-2.1.0.jar LICENSE
+tika-core-2.3.0.jar LICENSE
+tika-parsers-2.3.0.jar LICENSE
xml-apis-1.4.01 LICENSE
xmlrpc-2.0.1.jar LICENSE
xpp3-1.1.3.4-RC3 ./jspwiki-war/src/main/config/doc/LICENSE.cc-cod
@@ -285,10 +285,10 @@ commons-el-1.0.jar LICENSE
custom_rhino-0.4.3.jar ./jspwiki-war/src/main/config/doc/LICENSE.mpl
hsqldb-2.6.1.jar ./jspwiki-war/src/main/config/doc/LICENSE.hsqldb
sqltool-2.6.1.jar ./jspwiki-war/src/main/config/doc/LICENSE.hsqldb
-jetty-all-9.4.44.v20210927.jar LICENSE
+jetty-all-9.4.45.v20220203.jar LICENSE
junit-5.8.2 ./jspwiki-war/src/main/config/doc/LICENSE.cpl
-mockito-core-4.1.0.jar ./jspwiki-war/src/main/config/doc/LICENSE.mit
-selenide-6.2.0.jar ./jspwiki-war/src/main/config/doc/LICENSE.mit
+mockito-core-4.3.1.jar ./jspwiki-war/src/main/config/doc/LICENSE.mit
+selenide-6.3.4.jar ./jspwiki-war/src/main/config/doc/LICENSE.mit
stripes-1.7.0-async.jar LICENSE
yuicompressor-2.4.7.jar ./jspwiki-war/src/main/config/doc/LICENSE.yui
@@ -304,7 +304,7 @@ SlimBox ./jspwiki-war/src/main/config/doc/LI
RESOURCES LICENSE FILE
=============================================================================================================
-Apache Tomcat 9.0.56 LICENSE
+Apache Tomcat 9.0.59 LICENSE
Font Awesome (CSS & LESS files) ./jspwiki-war/src/main/config/doc/LICENSE.mit
Font Awesome (Fonts) ./jspwiki-war/src/main/config/doc/LICENSE.ofl
SilkIconSet ./jspwiki-war/src/main/config/doc/LICENSE.SilkIconSet
[jspwiki] 13/15: change calls to Engine#initialize and Engine#shutdown to Engine#start and Engine#stop respectively
Posted by ju...@apache.org.
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 6772e5d017c86a8897ab1f3bc67869446ffb5016
Author: Juan Pablo Santos Rodríguez <ju...@gmail.com>
AuthorDate: Fri Mar 11 14:41:50 2022 +0100
change calls to Engine#initialize and Engine#shutdown to Engine#start and Engine#stop respectively
---
.../src/main/java/org/apache/wiki/WikiServlet.java | 7 ++-
.../src/test/java/org/apache/wiki/TestEngine.java | 66 ++++++++--------------
.../test/java/org/apache/wiki/WikiEngineTest.java | 2 +-
.../wiki/attachment/AttachmentManagerTest.java | 2 +-
.../org/apache/wiki/content/PageRenamerTest.java | 2 +-
.../apache/wiki/pages/DefaultPageManagerTest.java | 2 +-
.../wiki/parser/JSPWikiMarkupParserTest.java | 2 +-
.../wiki/providers/VersioningFileProviderTest.java | 2 +-
.../wiki/references/ReferenceManagerTest.java | 2 +-
.../apache/wiki/render/RenderingManagerTest.java | 2 +-
.../org/apache/wiki/search/SearchManagerTest.java | 2 +-
.../apache/wiki/stress/MassiveRepositoryTest.java | 2 +-
.../apache/wiki/workflow/WorkflowManagerTest.java | 2 +-
.../org/apache/wiki/xmlrpc/RPCHandlerTest.java | 4 +-
.../wiki/render/markdown/MarkdownRendererTest.java | 2 +-
15 files changed, 43 insertions(+), 58 deletions(-)
diff --git a/jspwiki-main/src/main/java/org/apache/wiki/WikiServlet.java b/jspwiki-main/src/main/java/org/apache/wiki/WikiServlet.java
index 8d8f83f..24793dd 100644
--- a/jspwiki-main/src/main/java/org/apache/wiki/WikiServlet.java
+++ b/jspwiki-main/src/main/java/org/apache/wiki/WikiServlet.java
@@ -21,6 +21,7 @@ package org.apache.wiki;
import org.apache.logging.log4j.LogManager;
import org.apache.logging.log4j.Logger;
import org.apache.wiki.api.core.Engine;
+import org.apache.wiki.api.engine.EngineLifecycleExtension;
import org.apache.wiki.api.spi.Wiki;
import org.apache.wiki.url.URLConstructor;
@@ -57,15 +58,15 @@ public class WikiServlet extends HttpServlet {
/**
* Destroys the WikiServlet; called by the servlet container when shutting down the webapp. This method calls the
- * protected method {@link WikiEngine#shutdown()}, which sends {@link org.apache.wiki.event.WikiEngineEvent#SHUTDOWN}
- * events to registered listeners.
+ * protected method {@link WikiEngine#stop()}, which sends {@link org.apache.wiki.event.WikiEngineEvent#SHUTDOWN}
+ * events to registered listeners, as well as notifying available {@link EngineLifecycleExtension EngineLifecycleExtension}s.
*
* @see javax.servlet.GenericServlet#destroy()
*/
@Override
public void destroy() {
log.info( "WikiServlet shutdown." );
- m_engine.shutdown();
+ m_engine.stop();
super.destroy();
}
diff --git a/jspwiki-main/src/test/java/org/apache/wiki/TestEngine.java b/jspwiki-main/src/test/java/org/apache/wiki/TestEngine.java
index dec2f99..1ccf1ef 100644
--- a/jspwiki-main/src/test/java/org/apache/wiki/TestEngine.java
+++ b/jspwiki-main/src/test/java/org/apache/wiki/TestEngine.java
@@ -25,6 +25,7 @@ import net.sourceforge.stripes.mock.MockServletContext;
import org.apache.commons.lang3.StringUtils;
import org.apache.logging.log4j.LogManager;
import org.apache.logging.log4j.Logger;
+import org.apache.wiki.api.Release;
import org.apache.wiki.api.core.Attachment;
import org.apache.wiki.api.core.Context;
import org.apache.wiki.api.core.ContextEnum;
@@ -175,11 +176,16 @@ public class TestEngine extends WikiEngine {
}
public TestEngine( final Properties props ) throws WikiException {
- super( createServletContext( "test" ), "test", cleanTestProps( props ) );
+ super( createServletContext( "test" ), "test" );
+ try {
+ start( cleanTestProps( props ) );
+ } catch( final Exception e ) {
+ throw new WikiException( Release.APPNAME + ": Unable to load and setup properties from jspwiki.properties. " + e.getMessage(), e );
+ }
// Stash the WikiEngine in the servlet context
final ServletContext servletContext = this.getServletContext();
- servletContext.setAttribute("org.apache.wiki.WikiEngine", this);
+ servletContext.setAttribute( "org.apache.wiki.WikiEngine", this );
}
public static MockServletContext createServletContext( final String contextName ) {
@@ -229,15 +235,15 @@ public class TestEngine extends WikiEngine {
}
public static void emptyWorkDir(Properties properties) {
- if (properties == null) {
+ if( properties == null ) {
properties = getTestProperties();
}
final String workdir = properties.getProperty( WikiEngine.PROP_WORKDIR );
- if ( workdir != null ) {
+ if( workdir != null ) {
final File f = new File( workdir );
- if (f.exists() && f.isDirectory() && new File( f, "refmgr.ser" ).exists()) {
+ if( f.exists() && f.isDirectory() && new File( f, "refmgr.ser" ).exists() ) {
// System.out.println( "Deleting " + f.getAbsolutePath() );
deleteAll( f );
}
@@ -248,67 +254,45 @@ public class TestEngine extends WikiEngine {
emptyWikiDir( null );
}
- public static void emptyWikiDir(Properties properties) {
- if (properties == null) {
+ public static void emptyWikiDir( Properties properties ) {
+ if( properties == null ) {
properties = getTestProperties();
}
-
final String wikidir = properties.getProperty( AbstractFileProvider.PROP_PAGEDIR );
if ( wikidir != null ) {
final File f = new File( wikidir );
-
- if (f.exists() && f.isDirectory()) {
+ if( f.exists() && f.isDirectory() ) {
deleteAll( f );
}
}
}
public static Properties getTestProperties() {
- if (combinedProperties == null) {
+ if( combinedProperties == null ) {
combinedProperties = PropertyReader.getCombinedProperties(PropertyReader.CUSTOM_JSPWIKI_CONFIG);
}
// better to make a copy via putAll instead of Properties(properties)
// constructor, see http://stackoverflow.com/a/2004900
final Properties propCopy = new Properties();
- propCopy.putAll(combinedProperties);
+ propCopy.putAll( combinedProperties );
return propCopy;
}
- public static Properties getTestProperties( final String customPropFile) {
- return PropertyReader.getCombinedProperties(customPropFile);
+ public static Properties getTestProperties( final String customPropFile ) {
+ return PropertyReader.getCombinedProperties( customPropFile );
}
-/*
- public static final InputStream findTestProperties()
- {
- return findTestProperties( "/jspwiki.properties" );
- }
-
- public static final InputStream findTestProperties( String properties )
- {
- InputStream in = TestEngine.class.getResourceAsStream( properties );
-
- if( in == null ) throw new InternalWikiException("Unable to locate test property resource: "+properties);
- return in;
- }
-*/
/**
* Deletes all files under this directory, and does them recursively.
*/
- public static void deleteAll( final File file )
- {
- if( file != null )
- {
- if( file.isDirectory() )
- {
+ public static void deleteAll( final File file ) {
+ if( file != null ) {
+ if( file.isDirectory() ) {
final File[] files = file.listFiles();
-
- if( files != null )
- {
- for ( final File file2 : files) {
- if( file2.isDirectory() )
- {
- deleteAll(file2);
+ if( files != null ) {
+ for( final File file2 : files ) {
+ if( file2.isDirectory() ) {
+ deleteAll( file2 );
}
file2.delete();
diff --git a/jspwiki-main/src/test/java/org/apache/wiki/WikiEngineTest.java b/jspwiki-main/src/test/java/org/apache/wiki/WikiEngineTest.java
index cbe0a14..4a6dc03 100644
--- a/jspwiki-main/src/test/java/org/apache/wiki/WikiEngineTest.java
+++ b/jspwiki-main/src/test/java/org/apache/wiki/WikiEngineTest.java
@@ -66,7 +66,7 @@ public class WikiEngineTest {
}
TestEngine.emptyWorkDir();
- m_engine.shutdown();
+ m_engine.stop();
}
@Test
diff --git a/jspwiki-main/src/test/java/org/apache/wiki/attachment/AttachmentManagerTest.java b/jspwiki-main/src/test/java/org/apache/wiki/attachment/AttachmentManagerTest.java
index 7e4fda2..3021d5c 100644
--- a/jspwiki-main/src/test/java/org/apache/wiki/attachment/AttachmentManagerTest.java
+++ b/jspwiki-main/src/test/java/org/apache/wiki/attachment/AttachmentManagerTest.java
@@ -67,7 +67,7 @@ public class AttachmentManagerTest {
public void tearDown() {
m_engine.deleteTestPage( NAME1 );
m_engine.deleteTestPage( NAMEU );
- m_engine.shutdown();
+ m_engine.stop();
TestEngine.deleteAttachments(NAME1);
TestEngine.deleteAttachments(NAMEU);
diff --git a/jspwiki-main/src/test/java/org/apache/wiki/content/PageRenamerTest.java b/jspwiki-main/src/test/java/org/apache/wiki/content/PageRenamerTest.java
index 24237d6..492e951 100644
--- a/jspwiki-main/src/test/java/org/apache/wiki/content/PageRenamerTest.java
+++ b/jspwiki-main/src/test/java/org/apache/wiki/content/PageRenamerTest.java
@@ -62,7 +62,7 @@ public class PageRenamerTest {
m_engine.deleteTestPage("Link two");
TestEngine.emptyWorkDir();
- m_engine.shutdown();
+ m_engine.stop();
}
@Test
diff --git a/jspwiki-main/src/test/java/org/apache/wiki/pages/DefaultPageManagerTest.java b/jspwiki-main/src/test/java/org/apache/wiki/pages/DefaultPageManagerTest.java
index e6763f1..f794b4c 100644
--- a/jspwiki-main/src/test/java/org/apache/wiki/pages/DefaultPageManagerTest.java
+++ b/jspwiki-main/src/test/java/org/apache/wiki/pages/DefaultPageManagerTest.java
@@ -56,7 +56,7 @@ public class DefaultPageManagerTest {
}
TestEngine.emptyWorkDir();
- engine.shutdown();
+ engine.stop();
}
/**
diff --git a/jspwiki-main/src/test/java/org/apache/wiki/parser/JSPWikiMarkupParserTest.java b/jspwiki-main/src/test/java/org/apache/wiki/parser/JSPWikiMarkupParserTest.java
index 6c517da..10de078 100644
--- a/jspwiki-main/src/test/java/org/apache/wiki/parser/JSPWikiMarkupParserTest.java
+++ b/jspwiki-main/src/test/java/org/apache/wiki/parser/JSPWikiMarkupParserTest.java
@@ -60,7 +60,7 @@ public class JSPWikiMarkupParserTest {
@AfterEach
public void tearDown() {
deleteCreatedPages();
- testEngine.shutdown();
+ testEngine.stop();
}
private void newPage( final String name ) throws WikiException {
diff --git a/jspwiki-main/src/test/java/org/apache/wiki/providers/VersioningFileProviderTest.java b/jspwiki-main/src/test/java/org/apache/wiki/providers/VersioningFileProviderTest.java
index 72e54d9..65c38dd 100644
--- a/jspwiki-main/src/test/java/org/apache/wiki/providers/VersioningFileProviderTest.java
+++ b/jspwiki-main/src/test/java/org/apache/wiki/providers/VersioningFileProviderTest.java
@@ -66,7 +66,7 @@ public class VersioningFileProviderTest {
TestEngine.deleteAll( new File(files) );
// clear the cache at the end of every test case to avoid polluting another test case
- engine.shutdown();
+ engine.stop();
// make sure that the reference manager cache is cleaned first
TestEngine.emptyWorkDir(null);
diff --git a/jspwiki-main/src/test/java/org/apache/wiki/references/ReferenceManagerTest.java b/jspwiki-main/src/test/java/org/apache/wiki/references/ReferenceManagerTest.java
index e04ef22..f344b43 100644
--- a/jspwiki-main/src/test/java/org/apache/wiki/references/ReferenceManagerTest.java
+++ b/jspwiki-main/src/test/java/org/apache/wiki/references/ReferenceManagerTest.java
@@ -50,7 +50,7 @@ public class ReferenceManagerTest {
TestEngine.emptyWikiDir();
// jspwiki always uses a singleton CacheManager, so clear the cache at the end of every test case to avoid polluting another test case
- engine.shutdown();
+ engine.stop();
// make sure that the reference manager cache is cleaned
TestEngine.emptyWorkDir( null );
diff --git a/jspwiki-main/src/test/java/org/apache/wiki/render/RenderingManagerTest.java b/jspwiki-main/src/test/java/org/apache/wiki/render/RenderingManagerTest.java
index 4aed439..9e3bed7 100644
--- a/jspwiki-main/src/test/java/org/apache/wiki/render/RenderingManagerTest.java
+++ b/jspwiki-main/src/test/java/org/apache/wiki/render/RenderingManagerTest.java
@@ -38,7 +38,7 @@ public class RenderingManagerTest {
@AfterEach
public void tearDown() throws Exception {
m_engine.getManager( PageManager.class ).deletePage( "TestPage" );
- m_engine.shutdown();
+ m_engine.stop();
}
@Test
diff --git a/jspwiki-main/src/test/java/org/apache/wiki/search/SearchManagerTest.java b/jspwiki-main/src/test/java/org/apache/wiki/search/SearchManagerTest.java
index f023f06..7eda07d 100644
--- a/jspwiki-main/src/test/java/org/apache/wiki/search/SearchManagerTest.java
+++ b/jspwiki-main/src/test/java/org/apache/wiki/search/SearchManagerTest.java
@@ -61,7 +61,7 @@ public class SearchManagerTest {
@AfterEach
public void tearDown() {
- m_engine.shutdown();
+ m_engine.stop();
TestEngine.emptyWorkDir( props );
}
diff --git a/jspwiki-main/src/test/java/org/apache/wiki/stress/MassiveRepositoryTest.java b/jspwiki-main/src/test/java/org/apache/wiki/stress/MassiveRepositoryTest.java
index a3c2c94..332b9dc 100644
--- a/jspwiki-main/src/test/java/org/apache/wiki/stress/MassiveRepositoryTest.java
+++ b/jspwiki-main/src/test/java/org/apache/wiki/stress/MassiveRepositoryTest.java
@@ -43,7 +43,7 @@ public class MassiveRepositoryTest {
final String files = props.getProperty( FileSystemProvider.PROP_PAGEDIR );
final File f = new File( files );
TestEngine.deleteAll( f );
- engine.shutdown();
+ engine.stop();
}
private String getName( final int i ) {
diff --git a/jspwiki-main/src/test/java/org/apache/wiki/workflow/WorkflowManagerTest.java b/jspwiki-main/src/test/java/org/apache/wiki/workflow/WorkflowManagerTest.java
index 1f76f54..620bc70 100644
--- a/jspwiki-main/src/test/java/org/apache/wiki/workflow/WorkflowManagerTest.java
+++ b/jspwiki-main/src/test/java/org/apache/wiki/workflow/WorkflowManagerTest.java
@@ -58,7 +58,7 @@ public class WorkflowManagerTest {
@AfterEach
public void tearDown() {
- m_engine.shutdown();
+ m_engine.stop();
}
@Test
diff --git a/jspwiki-main/src/test/java/org/apache/wiki/xmlrpc/RPCHandlerTest.java b/jspwiki-main/src/test/java/org/apache/wiki/xmlrpc/RPCHandlerTest.java
index 5bfce65..5f09e61 100644
--- a/jspwiki-main/src/test/java/org/apache/wiki/xmlrpc/RPCHandlerTest.java
+++ b/jspwiki-main/src/test/java/org/apache/wiki/xmlrpc/RPCHandlerTest.java
@@ -54,7 +54,7 @@ public class RPCHandlerTest {
@AfterEach
public void tearDown() {
m_engine.deleteTestPage( NAME1 );
- m_engine.shutdown();
+ m_engine.stop();
TestEngine.deleteAttachments( NAME1 );
TestEngine.emptyWorkDir();
}
@@ -107,7 +107,7 @@ public class RPCHandlerTest {
final Page directInfo = m_engine.getManager( PageManager.class ).getPage( NAME1 );
final Hashtable ht = m_handler.getPageInfo( NAME1 );
- Assertions.assertEquals( ( String ) ht.get( "name" ), NAME1, "name" );
+ Assertions.assertEquals( ht.get( "name" ), NAME1, "name" );
final Date d = ( Date ) ht.get( "lastModified" );
diff --git a/jspwiki-markdown/src/test/java/org/apache/wiki/render/markdown/MarkdownRendererTest.java b/jspwiki-markdown/src/test/java/org/apache/wiki/render/markdown/MarkdownRendererTest.java
index 76070ab..f93caed 100644
--- a/jspwiki-markdown/src/test/java/org/apache/wiki/render/markdown/MarkdownRendererTest.java
+++ b/jspwiki-markdown/src/test/java/org/apache/wiki/render/markdown/MarkdownRendererTest.java
@@ -326,7 +326,7 @@ public class MarkdownRendererTest {
}
created.clear();
- testEngine.shutdown();
+ testEngine.stop();
}
String translate( final String src ) throws Exception {
[jspwiki] 05/15: migrate to CodeLibs' fork of NekoHtml
Posted by ju...@apache.org.
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 9587999bf963c672570811505ac4e3ac22361864
Author: Juan Pablo Santos Rodríguez <ju...@gmail.com>
AuthorDate: Mon Mar 7 14:52:05 2022 +0100
migrate to CodeLibs' fork of NekoHtml
---
.../java/org/apache/wiki/htmltowiki/HtmlStringToWikiTranslator.java | 3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)
diff --git a/jspwiki-main/src/main/java/org/apache/wiki/htmltowiki/HtmlStringToWikiTranslator.java b/jspwiki-main/src/main/java/org/apache/wiki/htmltowiki/HtmlStringToWikiTranslator.java
index 20fa09a..db32a28 100644
--- a/jspwiki-main/src/main/java/org/apache/wiki/htmltowiki/HtmlStringToWikiTranslator.java
+++ b/jspwiki-main/src/main/java/org/apache/wiki/htmltowiki/HtmlStringToWikiTranslator.java
@@ -20,6 +20,7 @@ package org.apache.wiki.htmltowiki;
import org.apache.wiki.api.core.Context;
import org.apache.wiki.api.core.Engine;
+import org.codelibs.nekohtml.parsers.SAXParser;
import org.jdom2.Document;
import org.jdom2.Element;
import org.jdom2.JDOMException;
@@ -37,7 +38,7 @@ import java.io.StringReader;
*/
public class HtmlStringToWikiTranslator {
- private static final String CYBERNEKO_PARSER = "org.cyberneko.html.parsers.SAXParser";
+ private static final String CYBERNEKO_PARSER = SAXParser.class.getName();
private final Engine e;
/**
[jspwiki] 12/15: As a result of Engine lifecycle extensions being into the public API, initialize method has being also promoted to public API, with start and stop methods acting as templates for Engine's common initialization and shutdown tasks
Posted by ju...@apache.org.
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 410f99e39b991c5ecc0142b68b02dfe6d1f1d668
Author: Juan Pablo Santos Rodríguez <ju...@gmail.com>
AuthorDate: Fri Mar 11 14:41:01 2022 +0100
As a result of Engine lifecycle extensions being into the public API, initialize method has being also promoted to public API, with start and stop methods acting as templates for Engine's common initialization and shutdown tasks
---
.../src/main/java/org/apache/wiki/WikiEngine.java | 56 ++++++++++------------
1 file changed, 25 insertions(+), 31 deletions(-)
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 ff4f010..5c21db9 100644
--- a/jspwiki-main/src/main/java/org/apache/wiki/WikiEngine.java
+++ b/jspwiki-main/src/main/java/org/apache/wiki/WikiEngine.java
@@ -176,13 +176,23 @@ public class WikiEngine implements Engine {
WikiEngine engine = ( WikiEngine )context.getAttribute( ATTR_WIKIENGINE );
if( engine == null ) {
final String appid = Integer.toString( context.hashCode() );
- context.log(" Assigning new engine to "+appid);
+ context.log( " Assigning new engine to " + appid );
try {
if( props == null ) {
props = PropertyReader.loadWebAppProps( context );
}
- engine = new WikiEngine( context, appid, props );
+ engine = new WikiEngine( context, appid );
+ try {
+ // Note: May be null, if JSPWiki has been deployed in a WAR file.
+ engine.start( props );
+ LOG.info( "Root path for this Wiki is: '{}'", engine.getRootPath() );
+ } catch( final Exception e ) {
+ final String msg = Release.APPNAME + ": Unable to load and setup properties from jspwiki.properties. " + e.getMessage();
+ context.log( msg );
+ LOG.error( msg, e );
+ throw new WikiException( msg, e );
+ }
context.setAttribute( ATTR_WIKIENGINE, engine );
} catch( final Exception e ) {
context.log( "ERROR: Failed to create a Wiki engine: " + e.getMessage() );
@@ -200,7 +210,7 @@ public class WikiEngine implements Engine {
* @throws WikiException If the initialization fails.
*/
public WikiEngine( final Properties properties ) throws WikiException {
- initialize( properties );
+ start( properties );
}
/**
@@ -209,44 +219,29 @@ public class WikiEngine implements Engine {
*
* @param context A ServletContext.
* @param appid An Application ID. This application is a unique random string which is used to recognize this WikiEngine.
- * @param props The WikiEngine configuration.
* @throws WikiException If the WikiEngine construction fails.
*/
- protected WikiEngine( final ServletContext context, final String appid, final Properties props ) throws WikiException {
+ protected WikiEngine( final ServletContext context, final String appid ) throws WikiException {
m_servletContext = context;
m_appid = appid;
// Stash the WikiEngine in the servlet context
if ( context != null ) {
context.setAttribute( ATTR_WIKIENGINE, this );
- m_rootPath = context.getRealPath("/");
- }
-
- try {
- // Note: May be null, if JSPWiki has been deployed in a WAR file.
- initialize( props );
- LOG.info( "Root path for this Wiki is: '{}'", m_rootPath );
- } catch( final Exception e ) {
- final String msg = Release.APPNAME+": Unable to load and setup properties from jspwiki.properties. "+e.getMessage();
- if ( context != null ) {
- context.log( msg );
- }
- throw new WikiException( msg, e );
+ m_rootPath = context.getRealPath( "/" );
}
}
/**
* Does all the real initialization.
*/
- private void initialize( final Properties props ) throws WikiException {
+ @Override
+ public void initialize( final Properties props ) throws WikiException {
m_startTime = new Date();
m_properties = props;
LOG.info( "*******************************************" );
LOG.info( "{} {} starting. Whee!", Release.APPNAME, Release.getVersionString() );
-
- fireEvent( WikiEngineEvent.INITIALIZING ); // begin initialization
-
LOG.debug( "Java version: {}", System.getProperty( "java.runtime.version" ) );
LOG.debug( "Java vendor: {}", System.getProperty( "java.vm.vendor" ) );
LOG.debug( "OS: {} {} {}", System.getProperty( "os.name" ), System.getProperty( "os.version" ), System.getProperty( "os.arch" ) );
@@ -260,24 +255,23 @@ public class WikiEngine implements Engine {
}
}
+ fireEvent( WikiEngineEvent.INITIALIZING ); // begin initialization
+
LOG.debug( "Configuring WikiEngine..." );
// Create and find the default working directory.
m_workDir = TextUtil.getStringProperty( props, PROP_WORKDIR, null );
if( m_workDir == null ) {
- m_workDir = System.getProperty( "java.io.tmpdir", "." );
- m_workDir += File.separator + Release.APPNAME + "-" + m_appid;
+ m_workDir = System.getProperty( "java.io.tmpdir", "." ) + File.separator + Release.APPNAME + "-" + m_appid;
}
try {
final File f = new File( m_workDir );
- f.mkdirs();
+ final boolean created = f.mkdirs();
- //
// A bunch of sanity checks
- //
- if( !f.exists() ) {
+ if( !created || !f.exists() ) {
throw new WikiException( "Work directory does not exist: " + m_workDir );
}
if( !f.canRead() ) {
@@ -291,7 +285,7 @@ public class WikiEngine implements Engine {
}
} catch( final SecurityException e ) {
LOG.fatal( "Unable to find or create the working directory: {}", m_workDir, e );
- throw new IllegalArgumentException( "Unable to find or create the working dir: " + m_workDir, e );
+ throw new WikiException( "Unable to find or create the working dir: " + m_workDir, e );
}
LOG.info( "JSPWiki working directory is '{}'", m_workDir );
@@ -447,7 +441,7 @@ public class WikiEngine implements Engine {
void enforceValidTemplateDirectory() {
if( m_servletContext != null ) {
final String viewTemplate = "templates" + File.separator + getTemplateDir() + File.separator + "ViewTemplate.jsp";
- boolean exists = new File( m_servletContext.getRealPath("/") + viewTemplate ).exists();
+ boolean exists = new File( m_servletContext.getRealPath( "/" ) + viewTemplate ).exists();
if( !exists ) {
try {
final URL url = m_servletContext.getResource( viewTemplate );
@@ -644,8 +638,8 @@ public class WikiEngine implements Engine {
*/
@Override
public void shutdown() {
- getManager( CachingManager.class ).shutdown();
fireEvent( WikiEngineEvent.SHUTDOWN );
+ getManager( CachingManager.class ).shutdown();
getManager( FilterManager.class ).destroy();
WikiEventManager.shutdown();
}
[jspwiki] 03/15: Make HtmlStringToMarkdownWikiTranslatorTest use a mocked Engine instead of building a TestEngine
Posted by ju...@apache.org.
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 459aa2b876a2a9a0b7b1566b164f22f5f05ce7b6
Author: Juan Pablo Santos Rodríguez <ju...@gmail.com>
AuthorDate: Mon Mar 7 14:50:31 2022 +0100
Make HtmlStringToMarkdownWikiTranslatorTest use a mocked Engine instead of building a TestEngine
---
jspwiki-markdown/pom.xml | 12 ++++++++++++
.../HtmlStringToMarkdownWikiTranslatorTest.java | 18 ++++++++++++------
2 files changed, 24 insertions(+), 6 deletions(-)
diff --git a/jspwiki-markdown/pom.xml b/jspwiki-markdown/pom.xml
index b08aec8..a81ea80 100644
--- a/jspwiki-markdown/pom.xml
+++ b/jspwiki-markdown/pom.xml
@@ -110,6 +110,18 @@
</dependency>
<dependency>
+ <groupId>org.mockito</groupId>
+ <artifactId>mockito-core</artifactId>
+ <scope>test</scope>
+ </dependency>
+
+ <dependency>
+ <groupId>org.mockito</groupId>
+ <artifactId>mockito-junit-jupiter</artifactId>
+ <scope>test</scope>
+ </dependency>
+
+ <dependency>
<groupId>javax.servlet</groupId>
<artifactId>javax.servlet-api</artifactId>
<scope>test</scope>
diff --git a/jspwiki-markdown/src/test/java/org/apache/wiki/htmltowiki/syntax/markdown/HtmlStringToMarkdownWikiTranslatorTest.java b/jspwiki-markdown/src/test/java/org/apache/wiki/htmltowiki/syntax/markdown/HtmlStringToMarkdownWikiTranslatorTest.java
index 69d7fc0..3b51c07 100644
--- a/jspwiki-markdown/src/test/java/org/apache/wiki/htmltowiki/syntax/markdown/HtmlStringToMarkdownWikiTranslatorTest.java
+++ b/jspwiki-markdown/src/test/java/org/apache/wiki/htmltowiki/syntax/markdown/HtmlStringToMarkdownWikiTranslatorTest.java
@@ -18,12 +18,14 @@
*/
package org.apache.wiki.htmltowiki.syntax.markdown;
-import org.apache.wiki.TestEngine;
import org.apache.wiki.api.core.Engine;
import org.apache.wiki.htmltowiki.HtmlStringToWikiTranslator;
import org.junit.jupiter.api.Assertions;
-import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.BeforeAll;
import org.junit.jupiter.api.Test;
+import org.mockito.Mockito;
+
+import java.util.Properties;
/**
@@ -31,11 +33,15 @@ import org.junit.jupiter.api.Test;
*/
public class HtmlStringToMarkdownWikiTranslatorTest {
- static Engine e = TestEngine.build( TestEngine.with( "jspwiki.syntax.decorator", MarkdownSyntaxDecorator.class.getName() ) );
- HtmlStringToWikiTranslator html2wiki;
+ static Engine e;
+ static HtmlStringToWikiTranslator html2wiki;
- @BeforeEach
- public void setUp() {
+ @BeforeAll
+ public static void setUp() {
+ e = Mockito.mock( Engine.class );
+ final Properties properties = new Properties();
+ properties.put( "jspwiki.syntax.decorator", MarkdownSyntaxDecorator.class.getName() );
+ Mockito.doReturn( properties ).when( e ).getWikiProperties();
html2wiki = new HtmlStringToWikiTranslator( e );
}
[jspwiki] 15/15: 2.11.3-git-02
Posted by ju...@apache.org.
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 b52310938471e44474de9d66cdf72eb949c0f990
Author: Juan Pablo Santos Rodríguez <ju...@gmail.com>
AuthorDate: Fri Mar 11 14:42:53 2022 +0100
2.11.3-git-02
---
ChangeLog.md | 21 +++++++++++++++++++++
.../src/main/java/org/apache/wiki/api/Release.java | 2 +-
2 files changed, 22 insertions(+), 1 deletion(-)
diff --git a/ChangeLog.md b/ChangeLog.md
index f710652..44ca6c1 100644
--- a/ChangeLog.md
+++ b/ChangeLog.md
@@ -17,6 +17,27 @@ specific language governing permissions and limitations
under the License.
-->
+**2022-03-11 Juan Pablo Santos (juanpablo AT apache DOT org)**
+
+* _2.11.3-git-02_
+
+* Introduce [Engine Lifecycle Extensions](https://jspwiki-wiki.apache.org/Wiki.jsp?page=HowToWriteAnEngineLifecycleExtension) into JSPWiki's [public API](https://jspwiki-wiki.apache.org/Wiki.jsp?page=JSPWikiPublicAPI).
+
+* Extracted `org.apache.wiki.htmltowiki` to its own module, `jspwiki-wysiwyg`
+
+* Dependency updates
+ * Apache parent pom to 25 - closes [#172](https://github.com/apache/jspwiki/pull/172), thanks to dependabot
+ * AWS Kendra Java SDK to 1.12.176
+ * Flexmark to 0.64.0 - closes [#171](https://github.com/apache/jspwiki/pull/171), thanks to dependabot
+ * Gson to 2.9.0
+ * Jetty to 9.4.45.v20220203 - closes [#175](https://github.com/apache/jspwiki/pull/175), thanks to dependabot
+ * Log4J to 2.17.2
+ * Nekohtml migrated to [CodeLibs' fork](https://github.com/codelibs/nekohtml), version 2.0.2
+ * Selenide to 6.3.4
+ * Tomcat to 9.0.59
+ * Maven compiler plugin to 3.10.1, project info reports plugin to 3.2.2 - closes [#174](https://github.com/apache/jspwiki/pull/174), thanks to dependabot
+
+
**2022-03-05 Dirk Frederickx (brushed AT apache DOT org)**
* _2.11.3-git-01_
diff --git a/jspwiki-api/src/main/java/org/apache/wiki/api/Release.java b/jspwiki-api/src/main/java/org/apache/wiki/api/Release.java
index a7d1580..0da36fc 100644
--- a/jspwiki-api/src/main/java/org/apache/wiki/api/Release.java
+++ b/jspwiki-api/src/main/java/org/apache/wiki/api/Release.java
@@ -69,7 +69,7 @@ public final class Release {
* <p>
* If the build identifier is empty, it is not added.
*/
- public static final String BUILD = "01";
+ public static final String BUILD = "02";
/**
* This is the generic version string you should use when printing out the version. It is of
[jspwiki] 09/15: use log placeholders
Posted by ju...@apache.org.
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 5e2efc03f6df8aaba17c1d7eaff946c2138c04d1
Author: Juan Pablo Santos Rodríguez <ju...@gmail.com>
AuthorDate: Fri Mar 11 14:32:00 2022 +0100
use log placeholders
---
.../src/main/java/org/apache/wiki/util/ClassUtil.java | 12 ++++++------
1 file changed, 6 insertions(+), 6 deletions(-)
diff --git a/jspwiki-util/src/main/java/org/apache/wiki/util/ClassUtil.java b/jspwiki-util/src/main/java/org/apache/wiki/util/ClassUtil.java
index bac608b..84d6f98 100644
--- a/jspwiki-util/src/main/java/org/apache/wiki/util/ClassUtil.java
+++ b/jspwiki-util/src/main/java/org/apache/wiki/util/ClassUtil.java
@@ -74,10 +74,10 @@ public final class ClassUtil {
final String className = f.getChildText( "mappedClass" );
map.put( key, className );
- log.debug( "Mapped class '" + key + "' to class '" + className + "'" );
+ log.debug( "Mapped class '{}' to class '{}'", key, className );
}
} else {
- log.info( "Didn't find class mapping document in " + MAPPINGS );
+ log.info( "Didn't find class mapping document in {}", MAPPINGS );
}
return map;
}
@@ -141,9 +141,9 @@ public final class ClassUtil {
final File jarFile = new File( externaljar );
final URL ucl = jarFile.toURI().toURL();
urls[ i++ ] = ucl;
- log.info( "added " + ucl + " to list of external jars" );
+ log.info( "added {} to list of external jars", ucl );
} catch( final MalformedURLException e ) {
- log.error( "exception (" + e.getMessage() + ") while setting up classloaders for external jar:" + externaljar + ", continuing without external jars." );
+ log.error( "exception ({}) while setting up classloaders for external jar: {}, continuing without external jars.", e.getMessage(), externaljar );
}
}
@@ -216,7 +216,7 @@ public final class ClassUtil {
* @param rootPackage base package.
*/
static void fileEntriesUnder( final List< String > results, final File file, final String rootPackage ) {
- log.debug( "scanning [" + file.getName() + "]" );
+ log.debug( "scanning [{}]", file.getName() );
if( file.isDirectory() ) {
final Iterator< File > files = FileUtils.iterateFiles( file, null, true );
while( files.hasNext() ) {
@@ -239,7 +239,7 @@ public final class ClassUtil {
*/
static void jarEntriesUnder( final List< String > results, final JarURLConnection jurlcon, final String rootPackage ) {
try( final JarFile jar = jurlcon.getJarFile() ) {
- log.debug( "scanning [" + jar.getName() +"]" );
+ log.debug( "scanning [{}]", jar.getName() );
final Enumeration< JarEntry > entries = jar.entries();
while( entries.hasMoreElements() ) {
final JarEntry entry = entries.nextElement();
[jspwiki] 01/15: Dependency updates
Posted by ju...@apache.org.
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 e35509f86e2fc45c6396f5160a31f014afa4d078
Author: Juan Pablo Santos Rodríguez <ju...@gmail.com>
AuthorDate: Mon Mar 7 14:49:12 2022 +0100
Dependency updates
Apache parent pom to 25 - closes #172, thanks to dependabot
Flexmark to 0.64.0 - closes #171, thanks to dependabot
Gson to 2.9.0
Log4J to 2.17.2
Nekohtml migrated to CodeLibs' fork, version 2.0.2
Selenide to 6.3.4
Tomcat to 9.0.59
Maven project info reports to 3.2.2 - closes #174, thanks to dependabot
---
pom.xml | 31 +++++++++++++++----------------
1 file changed, 15 insertions(+), 16 deletions(-)
diff --git a/pom.xml b/pom.xml
index 69f47de..6b87c20 100644
--- a/pom.xml
+++ b/pom.xml
@@ -22,7 +22,7 @@
<parent>
<groupId>org.apache</groupId>
<artifactId>apache</artifactId>
- <version>24</version>
+ <version>25</version>
</parent>
<groupId>org.apache.jspwiki</groupId>
@@ -54,9 +54,9 @@
<commons-lang.version>3.12.0</commons-lang.version>
<commons-text.version>1.9</commons-text.version>
<ehcache.version>2.10.9.2</ehcache.version>
- <flexmark.version>0.62.2</flexmark.version>
+ <flexmark.version>0.64.0</flexmark.version>
<freshcookies-security.version>0.60</freshcookies-security.version>
- <gson.version>2.8.9</gson.version>
+ <gson.version>2.9.0</gson.version>
<hsqldb.version>2.6.1</hsqldb.version>
<jaxen.version>1.2.0</jaxen.version>
<javax-jstl.version>1.2</javax-jstl.version>
@@ -67,17 +67,17 @@
<jetty.version>9.4.44.v20210927</jetty.version>
<jrcs-diff.version>0.4.2</jrcs-diff.version>
<junit.version>5.8.2</junit.version>
- <log4j2.version>2.17.1</log4j2.version>
+ <log4j2.version>2.17.2</log4j2.version>
<lucene.version>8.11.1</lucene.version> <!-- 9.0.0 and above require JDK >= 11 to execute -->
<mockito.version>4.3.1</mockito.version>
- <nekohtml.version>1.9.22</nekohtml.version>
+ <nekohtml.version>2.0.2</nekohtml.version> <!-- 2.1.0 and above require JDK >= 11 to execute -->
<oro.version>2.0.8</oro.version>
<sandler.version>0.5</sandler.version>
- <selenide.version>6.3.3</selenide.version>
+ <selenide.version>6.3.4</selenide.version>
<slf4j.version>1.7.36</slf4j.version>
<stripes.version>1.7.0-async-beta</stripes.version>
<tika.version>2.3.0</tika.version>
- <tomcat.version>9.0.58</tomcat.version>
+ <tomcat.version>9.0.59</tomcat.version>
<wro4j.version>1.8.0</wro4j.version> <!-- 1.9.0 and above require JDK >= 9 to execute -->
<xmlrpc.version>2.0.1</xmlrpc.version>
@@ -91,7 +91,7 @@
<plugin.jar.version>3.2.2</plugin.jar.version>
<plugin.javadoc.version>3.3.2</plugin.javadoc.version>
<plugin.jxr.version>3.1.1</plugin.jxr.version>
- <plugin.project-info-reports.version>3.2.1</plugin.project-info-reports.version>
+ <plugin.project-info-reports.version>3.2.2</plugin.project-info-reports.version>
<plugin.release.version>3.0.0-M5</plugin.release.version>
<plugin.resources.version>3.2.0</plugin.resources.version>
<plugin.source.version>3.2.1</plugin.source.version>
@@ -328,6 +328,12 @@
</dependency>
<dependency>
+ <groupId>org.codelibs</groupId>
+ <artifactId>nekohtml</artifactId>
+ <version>${nekohtml.version}</version>
+ </dependency>
+
+ <dependency>
<groupId>org.freshcookies</groupId>
<artifactId>freshcookies-security</artifactId>
<version>${freshcookies-security.version}</version>
@@ -441,13 +447,6 @@
<artifactId>javax.servlet-api</artifactId>
<version>${javax-servlet-api.version}</version>
</dependency>
-
- <!-- runtime dependencies -->
- <dependency>
- <groupId>net.sourceforge.nekohtml</groupId>
- <artifactId>nekohtml</artifactId>
- <version>${nekohtml.version}</version>
- </dependency>
</dependencies>
</dependencyManagement>
@@ -696,7 +695,7 @@
<dependency>
<groupId>org.mockito</groupId>
<artifactId>mockito-core</artifactId>
- <version>4.1.0</version>
+ <version>${mockito.version}</version>
</dependency>
</dependencies>
</plugin>
[jspwiki] 11/15: Introduce Engine Lifecycle Extensions - see https://jspwiki-wiki.apache.org/Wiki.jsp?page=HowToWriteAnEngineLifecycleExtension
Posted by ju...@apache.org.
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 5a69bda0b0e04f39293e8070c0c7cc4fe5247083
Author: Juan Pablo Santos Rodríguez <ju...@gmail.com>
AuthorDate: Fri Mar 11 14:37:42 2022 +0100
Introduce Engine Lifecycle Extensions - see https://jspwiki-wiki.apache.org/Wiki.jsp?page=HowToWriteAnEngineLifecycleExtension
---
.../main/java/org/apache/wiki/api/core/Engine.java | 41 ++++++++++++-
.../wiki/api/engine/EngineLifecycleExtension.java | 67 ++++++++++++++++++++++
.../api/engine/EngineLifecycleExtensionTest.java | 56 ++++++++++++++++++
.../engine/EngineLifecycleExtensionTestImpl.java | 42 ++++++++++++++
...apache.wiki.api.engine.EngineLifecycleExtension | 1 +
.../MarkdownSetupEngineLifecycleExtension.java | 52 +++++++++++++++++
...apache.wiki.api.engine.EngineLifecycleExtension | 1 +
.../MarkdownSetupEngineLifecycleExtensionTest.java | 42 ++++++++++++++
8 files changed, 301 insertions(+), 1 deletion(-)
diff --git a/jspwiki-api/src/main/java/org/apache/wiki/api/core/Engine.java b/jspwiki-api/src/main/java/org/apache/wiki/api/core/Engine.java
index dab54a5..07e4fb4 100644
--- a/jspwiki-api/src/main/java/org/apache/wiki/api/core/Engine.java
+++ b/jspwiki-api/src/main/java/org/apache/wiki/api/core/Engine.java
@@ -19,7 +19,9 @@
package org.apache.wiki.api.core;
import org.apache.logging.log4j.LogManager;
+import org.apache.wiki.api.engine.EngineLifecycleExtension;
import org.apache.wiki.api.exceptions.ProviderException;
+import org.apache.wiki.api.exceptions.WikiException;
import org.apache.wiki.event.WikiEventListener;
import org.apache.wiki.util.TextUtil;
@@ -37,6 +39,7 @@ import java.util.Collection;
import java.util.Date;
import java.util.List;
import java.util.Properties;
+import java.util.ServiceLoader;
/**
@@ -413,7 +416,43 @@ public interface Engine {
< T > T removeAttribute( String key );
/**
- * Signals that the Engine will be shut down by the servlet container.
+ * Initializes the {@code Engine}, notifying all the {@link EngineLifecycleExtension}s.
+ *
+ * @param properties Wiki configuration properties.
+ * @throws WikiException if something happens while setting up the {@code Engine}.
+ */
+ default void start( final Properties properties ) throws WikiException {
+ final ServiceLoader< EngineLifecycleExtension > loader = ServiceLoader.load( EngineLifecycleExtension.class );
+ for( final EngineLifecycleExtension extension : loader ) {
+ extension.onInit( properties );
+ }
+ initialize( properties );
+ for( final EngineLifecycleExtension extension : loader ) {
+ extension.onStart( this, properties );
+ }
+ }
+
+ /**
+ * Shuts down the {@code Engine}, notifying all the {@link EngineLifecycleExtension}s.
+ */
+ default void stop() {
+ final ServiceLoader< EngineLifecycleExtension > loader = ServiceLoader.load( EngineLifecycleExtension.class );
+ for( final EngineLifecycleExtension extension : loader ) {
+ extension.onShutdown( this, getWikiProperties() );
+ }
+ shutdown();
+ }
+
+ /**
+ * Sets up the application's running {@code Engine}.
+ *
+ * @param properties Wiki configuration properties.
+ * @throws WikiException if something happens while setting up the {@code Engine}.
+ */
+ void initialize( Properties properties ) throws WikiException;
+
+ /**
+ * Signals that the {@code Engine} will be shut down by the servlet container.
*/
void shutdown();
diff --git a/jspwiki-api/src/main/java/org/apache/wiki/api/engine/EngineLifecycleExtension.java b/jspwiki-api/src/main/java/org/apache/wiki/api/engine/EngineLifecycleExtension.java
new file mode 100644
index 0000000..bf03fc3
--- /dev/null
+++ b/jspwiki-api/src/main/java/org/apache/wiki/api/engine/EngineLifecycleExtension.java
@@ -0,0 +1,67 @@
+/*
+ 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.engine;
+
+import org.apache.wiki.api.core.Engine;
+
+import java.util.Properties;
+
+/**
+ * <p>SPI used to notify JSPWiki extensions about {@link Engine}'s initialization & shutdown, without having to deep
+ * dive on {@link Engine}'s internals.</p>
+ *
+ * <p>Examples of {@code EngineLifecycleExtension}'s use cases:
+ * <ul>
+ * <li>Appending a plugin's classpath to {@code jspwiki.plugin.searchPath}, so it can be used as a drop-in, without further configuration.</li>
+ * <li>Providing default parameters for a custom extension.</li>
+ * <li>Setting up that expensive singleton, or disposing resources, without having to use or register a {@link org.apache.wiki.event.WikiEventListener WikiEventListener}.</li>
+ * </ul>
+ * </p>
+ *
+ * <p>As a concrete example, the markdown module uses an {@code EngineLifecycleExtension} to set up all the required properties
+ * if {@code jspwiki.syntax=markdown} is provided on the {@code jspwiki[-custom].properties file}.</p>
+ *
+ * <p>All methods are provided with a {@code default}, do-nothing implementation, so specific EngineLifecycleExtensions only have
+ * to provide implementations for the methods they're really interested in.</p>
+ */
+public interface EngineLifecycleExtension {
+
+ /**
+ * Called before {@link Engine} initialization, after the wiki properties have been sought out.
+ *
+ * @param properties wiki configuration properties.
+ */
+ default void onInit( final Properties properties ) {}
+
+ /**
+ * Called after {@link Engine} initialization.
+ *
+ * @param properties wiki configuration properties.
+ * @param e JSPWiki's ready to be used {@link Engine}.
+ */
+ default void onStart( final Engine e, final Properties properties ) {}
+
+ /**
+ * Called before {@link Engine} shutdown.
+ * @param e JSPWiki's running {@link Engine}.
+ * @param properties wiki configuration properties.
+ */
+ default void onShutdown( final Engine e, final Properties properties ) {}
+
+}
diff --git a/jspwiki-api/src/test/java/org/apache/wiki/api/engine/EngineLifecycleExtensionTest.java b/jspwiki-api/src/test/java/org/apache/wiki/api/engine/EngineLifecycleExtensionTest.java
new file mode 100644
index 0000000..e9589f4
--- /dev/null
+++ b/jspwiki-api/src/test/java/org/apache/wiki/api/engine/EngineLifecycleExtensionTest.java
@@ -0,0 +1,56 @@
+/*
+ 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.engine;
+
+import org.apache.wiki.api.core.Engine;
+import org.junit.jupiter.api.Assertions;
+import org.junit.jupiter.api.Test;
+import org.junit.jupiter.api.extension.ExtendWith;
+import org.mockito.Mock;
+import org.mockito.Mockito;
+import org.mockito.junit.jupiter.MockitoExtension;
+
+import java.util.Properties;
+
+
+@ExtendWith( MockitoExtension.class )
+public class EngineLifecycleExtensionTest {
+
+ @Mock Engine engine;
+
+ @Test
+ void shouldInvokeEngineLifecycleExtensionTestImpl() throws Exception {
+ final Properties properties = new Properties();
+ Mockito.doAnswer( invocation -> {
+ final String actual = invocation.getArgument( 0, Properties.class ).getProperty( "test" );
+ Assertions.assertEquals( "onInit", actual );
+ return null; // void
+ } ).when( engine ).initialize( Mockito.any( Properties.class ) );
+ Mockito.doReturn( properties ).when( engine ).getWikiProperties();
+ Mockito.doCallRealMethod().when( engine ).start( Mockito.any( Properties.class ) );
+ Mockito.doCallRealMethod().when( engine ).stop();
+
+ engine.start( properties );
+ Assertions.assertEquals( "onStart", properties.getProperty( "test" ) );
+
+ engine.stop();
+ Assertions.assertEquals( "onShutdown", properties.getProperty( "test" ) );
+ }
+
+}
diff --git a/jspwiki-api/src/test/java/org/apache/wiki/api/engine/EngineLifecycleExtensionTestImpl.java b/jspwiki-api/src/test/java/org/apache/wiki/api/engine/EngineLifecycleExtensionTestImpl.java
new file mode 100644
index 0000000..5dbfddc
--- /dev/null
+++ b/jspwiki-api/src/test/java/org/apache/wiki/api/engine/EngineLifecycleExtensionTestImpl.java
@@ -0,0 +1,42 @@
+/*
+ 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.engine;
+
+import org.apache.wiki.api.core.Engine;
+
+import java.util.Properties;
+
+public class EngineLifecycleExtensionTestImpl implements EngineLifecycleExtension {
+
+ /** {@inheritDoc */
+ public void onInit( final Properties properties ) {
+ properties.put( "test", "onInit" );
+ }
+
+ /** {@inheritDoc */
+ public void onStart( final Engine e, final Properties properties ) {
+ properties.put( "test", "onStart" );
+ }
+
+ /** {@inheritDoc */
+ public void onShutdown( final Engine e, final Properties properties ) {
+ properties.put( "test", "onShutdown" );
+ }
+
+}
diff --git a/jspwiki-api/src/test/resources/META-INF/services/org.apache.wiki.api.engine.EngineLifecycleExtension b/jspwiki-api/src/test/resources/META-INF/services/org.apache.wiki.api.engine.EngineLifecycleExtension
new file mode 100644
index 0000000..9cfa45f
--- /dev/null
+++ b/jspwiki-api/src/test/resources/META-INF/services/org.apache.wiki.api.engine.EngineLifecycleExtension
@@ -0,0 +1 @@
+org.apache.wiki.api.engine.EngineLifecycleExtensionTestImpl
\ No newline at end of file
diff --git a/jspwiki-markdown/src/main/java/org/apache/wiki/markdown/MarkdownSetupEngineLifecycleExtension.java b/jspwiki-markdown/src/main/java/org/apache/wiki/markdown/MarkdownSetupEngineLifecycleExtension.java
new file mode 100644
index 0000000..76f3b43
--- /dev/null
+++ b/jspwiki-markdown/src/main/java/org/apache/wiki/markdown/MarkdownSetupEngineLifecycleExtension.java
@@ -0,0 +1,52 @@
+/*
+ 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.markdown;
+
+import org.apache.logging.log4j.LogManager;
+import org.apache.logging.log4j.Logger;
+import org.apache.wiki.api.engine.EngineLifecycleExtension;
+
+import java.util.Properties;
+
+
+/**
+ * {@link EngineLifecycleExtension} that sets up all the relevant properties to enable markdown syntax if the
+ * {@code jspwiki.syntax} property has been given, with the {@code markdown} value.
+ */
+public class MarkdownSetupEngineLifecycleExtension implements EngineLifecycleExtension {
+
+ private static final Logger LOG = LogManager.getLogger( MarkdownSetupEngineLifecycleExtension.class );
+
+ /** {@inheritDoc} */
+ @Override
+ public void onInit( final Properties properties ) {
+ if( "markdown".equalsIgnoreCase( properties.getProperty( "jspwiki.syntax" ) ) ) {
+ setWikiProperty( properties, "jspwiki.renderingManager.markupParser", "org.apache.wiki.parser.markdown.MarkdownParser" );
+ setWikiProperty( properties, "jspwiki.renderingManager.renderer", "org.apache.wiki.render.markdown.MarkdownRenderer" );
+ setWikiProperty( properties, "jspwiki.renderingManager.renderer.wysiwyg", "org.apache.wiki.render.markdown.MarkdownRenderer" );
+ setWikiProperty( properties, "jspwiki.syntax.decorator", "org.apache.wiki.htmltowiki.syntax.markdown.MarkdownSyntaxDecorator" );
+ }
+ }
+
+ void setWikiProperty( final Properties properties, final String key, final String value ) {
+ properties.setProperty( key, value );
+ LOG.info( "{} set to {}", key, value );
+ }
+
+}
diff --git a/jspwiki-markdown/src/main/resources/META-INF/services/org.apache.wiki.api.engine.EngineLifecycleExtension b/jspwiki-markdown/src/main/resources/META-INF/services/org.apache.wiki.api.engine.EngineLifecycleExtension
new file mode 100644
index 0000000..766735d
--- /dev/null
+++ b/jspwiki-markdown/src/main/resources/META-INF/services/org.apache.wiki.api.engine.EngineLifecycleExtension
@@ -0,0 +1 @@
+org.apache.wiki.markdown.MarkdownSetupEngineLifecycleExtension
\ No newline at end of file
diff --git a/jspwiki-markdown/src/test/java/org/apache/wiki/markdown/MarkdownSetupEngineLifecycleExtensionTest.java b/jspwiki-markdown/src/test/java/org/apache/wiki/markdown/MarkdownSetupEngineLifecycleExtensionTest.java
new file mode 100644
index 0000000..6c2aecb
--- /dev/null
+++ b/jspwiki-markdown/src/test/java/org/apache/wiki/markdown/MarkdownSetupEngineLifecycleExtensionTest.java
@@ -0,0 +1,42 @@
+/*
+ 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.markdown;
+
+import org.junit.jupiter.api.Assertions;
+import org.junit.jupiter.api.Test;
+
+import java.util.Properties;
+
+public class MarkdownSetupEngineLifecycleExtensionTest {
+
+ @Test
+ void shouldSetUpMarkdownSupportIfJspwikiSyntaxPropertyIsGiven() {
+ final Properties properties = new Properties();
+ properties.put( "jspwiki.syntax", "markdown" );
+ final MarkdownSetupEngineLifecycleExtension sut = new MarkdownSetupEngineLifecycleExtension();
+ sut.onInit( properties );
+ Assertions.assertEquals( 5, properties.size() );
+ Assertions.assertEquals( "org.apache.wiki.parser.markdown.MarkdownParser", properties.getProperty( "jspwiki.renderingManager.markupParser" ) );
+
+ properties.clear();
+ sut.onInit( properties );
+ Assertions.assertEquals( 0, properties.size() );
+ }
+
+}
[jspwiki] 04/15: Make HtmlStringToWikiTranslatorTest use a mocked Engine instead of building a TestEngine
Posted by ju...@apache.org.
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 8f2cac2fac185f692267ce0ab079146d1803f0ff
Author: Juan Pablo Santos Rodríguez <ju...@gmail.com>
AuthorDate: Mon Mar 7 14:51:18 2022 +0100
Make HtmlStringToWikiTranslatorTest use a mocked Engine instead of building a TestEngine
---
jspwiki-main/pom.xml | 113 +++++++++++----------
.../htmltowiki/HtmlStringToWikiTranslatorTest.java | 18 ++--
2 files changed, 72 insertions(+), 59 deletions(-)
diff --git a/jspwiki-main/pom.xml b/jspwiki-main/pom.xml
index b8c0e84..205cb4c 100644
--- a/jspwiki-main/pom.xml
+++ b/jspwiki-main/pom.xml
@@ -55,60 +55,58 @@
</dependency>
<dependency>
- <groupId>xmlrpc</groupId>
- <artifactId>xmlrpc</artifactId>
+ <groupId>com.google.code.gson</groupId>
+ <artifactId>gson</artifactId>
</dependency>
<dependency>
- <groupId>org.apache.commons</groupId>
- <artifactId>commons-collections4</artifactId>
+ <groupId>commons-fileupload</groupId>
+ <artifactId>commons-fileupload</artifactId>
</dependency>
<dependency>
- <groupId>org.apache.lucene</groupId>
- <artifactId>lucene-analyzers-common</artifactId>
+ <groupId>commons-httpclient</groupId>
+ <artifactId>commons-httpclient</artifactId>
</dependency>
<dependency>
- <groupId>org.apache.lucene</groupId>
- <artifactId>lucene-backward-codecs</artifactId>
+ <groupId>net.sourceforge</groupId>
+ <artifactId>akismet-java</artifactId>
</dependency>
<dependency>
- <groupId>org.apache.lucene</groupId>
- <artifactId>lucene-highlighter</artifactId>
+ <groupId>net.sourceforge</groupId>
+ <artifactId>sandler</artifactId>
</dependency>
<dependency>
- <groupId>org.apache.lucene</groupId>
- <artifactId>lucene-queryparser</artifactId>
+ <groupId>javax.servlet</groupId>
+ <artifactId>jstl</artifactId>
</dependency>
<dependency>
- <groupId>javax.servlet</groupId>
- <artifactId>javax.servlet-api</artifactId>
- <scope>provided</scope>
+ <groupId>javax.mail</groupId>
+ <artifactId>mail</artifactId>
</dependency>
<dependency>
- <groupId>javax.servlet.jsp</groupId>
- <artifactId>javax.servlet.jsp-api</artifactId>
- <scope>provided</scope>
+ <groupId>jaxen</groupId>
+ <artifactId>jaxen</artifactId>
</dependency>
<dependency>
- <groupId>net.sourceforge</groupId>
- <artifactId>sandler</artifactId>
+ <groupId>org.apache.commons</groupId>
+ <artifactId>commons-lang3</artifactId>
</dependency>
<dependency>
- <groupId>oro</groupId>
- <artifactId>oro</artifactId>
+ <groupId>org.apache.commons</groupId>
+ <artifactId>commons-collections4</artifactId>
</dependency>
<dependency>
- <groupId>javax.mail</groupId>
- <artifactId>mail</artifactId>
+ <groupId>org.apache.commons</groupId>
+ <artifactId>commons-text</artifactId>
</dependency>
<dependency>
@@ -122,28 +120,28 @@
</dependency>
<dependency>
- <groupId>com.google.code.gson</groupId>
- <artifactId>gson</artifactId>
+ <groupId>org.apache.lucene</groupId>
+ <artifactId>lucene-analyzers-common</artifactId>
</dependency>
<dependency>
- <groupId>org.jvnet.hudson</groupId>
- <artifactId>org.suigeneris.jrcs.diff</artifactId>
+ <groupId>org.apache.lucene</groupId>
+ <artifactId>lucene-backward-codecs</artifactId>
</dependency>
<dependency>
- <groupId>org.jdom</groupId>
- <artifactId>jdom2</artifactId>
+ <groupId>org.apache.lucene</groupId>
+ <artifactId>lucene-highlighter</artifactId>
</dependency>
<dependency>
- <groupId>jaxen</groupId>
- <artifactId>jaxen</artifactId>
+ <groupId>org.apache.lucene</groupId>
+ <artifactId>lucene-queryparser</artifactId>
</dependency>
<dependency>
- <groupId>javax.servlet</groupId>
- <artifactId>jstl</artifactId>
+ <groupId>org.codelibs</groupId>
+ <artifactId>nekohtml</artifactId>
</dependency>
<dependency>
@@ -152,40 +150,41 @@
</dependency>
<dependency>
- <groupId>commons-fileupload</groupId>
- <artifactId>commons-fileupload</artifactId>
+ <groupId>org.jdom</groupId>
+ <artifactId>jdom2</artifactId>
</dependency>
<dependency>
- <groupId>net.sourceforge</groupId>
- <artifactId>akismet-java</artifactId>
+ <groupId>org.jvnet.hudson</groupId>
+ <artifactId>org.suigeneris.jrcs.diff</artifactId>
</dependency>
<dependency>
- <groupId>commons-httpclient</groupId>
- <artifactId>commons-httpclient</artifactId>
+ <groupId>oro</groupId>
+ <artifactId>oro</artifactId>
</dependency>
<dependency>
- <groupId>net.sourceforge.nekohtml</groupId>
- <artifactId>nekohtml</artifactId>
- <scope>runtime</scope>
+ <groupId>xmlrpc</groupId>
+ <artifactId>xmlrpc</artifactId>
</dependency>
<dependency>
- <groupId>net.sourceforge.stripes</groupId>
- <artifactId>stripes</artifactId>
- <scope>test</scope>
+ <groupId>javax.servlet</groupId>
+ <artifactId>javax.servlet-api</artifactId>
+ <scope>provided</scope>
</dependency>
<dependency>
- <groupId>org.apache.commons</groupId>
- <artifactId>commons-lang3</artifactId>
+ <groupId>javax.servlet.jsp</groupId>
+ <artifactId>javax.servlet.jsp-api</artifactId>
+ <scope>provided</scope>
</dependency>
<dependency>
- <groupId>org.apache.commons</groupId>
- <artifactId>commons-text</artifactId>
+ <groupId>net.sourceforge.stripes</groupId>
+ <artifactId>stripes</artifactId>
+ <scope>test</scope>
</dependency>
<dependency>
@@ -232,6 +231,18 @@
<artifactId>junit-jupiter-engine</artifactId>
<scope>test</scope>
</dependency>
+
+ <dependency>
+ <groupId>org.mockito</groupId>
+ <artifactId>mockito-core</artifactId>
+ <scope>test</scope>
+ </dependency>
+
+ <dependency>
+ <groupId>org.mockito</groupId>
+ <artifactId>mockito-junit-jupiter</artifactId>
+ <scope>test</scope>
+ </dependency>
</dependencies>
<build>
@@ -269,7 +280,7 @@
<artifactId>maven-surefire-plugin</artifactId>
<configuration>
<systemPropertyVariables>
- <java.io.tmpdir>${project.build.directory}</java.io.tmpdir>
+ <java.io.tmpdir>${project.build.directory}</java.io.tmpdir>
</systemPropertyVariables>
<excludes>
<!-- time-consuming tests excluded by default -->
diff --git a/jspwiki-main/src/test/java/org/apache/wiki/htmltowiki/HtmlStringToWikiTranslatorTest.java b/jspwiki-main/src/test/java/org/apache/wiki/htmltowiki/HtmlStringToWikiTranslatorTest.java
index 4dc6920..d1fa42e 100644
--- a/jspwiki-main/src/test/java/org/apache/wiki/htmltowiki/HtmlStringToWikiTranslatorTest.java
+++ b/jspwiki-main/src/test/java/org/apache/wiki/htmltowiki/HtmlStringToWikiTranslatorTest.java
@@ -18,11 +18,13 @@
*/
package org.apache.wiki.htmltowiki;
-import org.apache.wiki.TestEngine;
import org.apache.wiki.api.core.Engine;
import org.junit.jupiter.api.Assertions;
-import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.BeforeAll;
import org.junit.jupiter.api.Test;
+import org.mockito.Mockito;
+
+import java.util.Properties;
/**
* JUnit test cases for Converting Html to Wiki Markup.
@@ -30,11 +32,13 @@ import org.junit.jupiter.api.Test;
*/
public class HtmlStringToWikiTranslatorTest {
- static Engine e = TestEngine.build();
- HtmlStringToWikiTranslator html2wiki;
+ static Engine e;
+ static HtmlStringToWikiTranslator html2wiki;
- @BeforeEach
- public void setUp() {
+ @BeforeAll
+ public static void setUp() {
+ e = Mockito.mock( Engine.class );
+ Mockito.doReturn( new Properties() ).when( e ).getWikiProperties();
html2wiki = new HtmlStringToWikiTranslator( e );
}
@@ -63,7 +67,6 @@ public class HtmlStringToWikiTranslatorTest {
// footnote links
Assertions.assertEquals( "[23]", html2wiki.translate( "<a class=\"footnoteref\" href=\"#ref-PageName-23\">[23]</a>" ) );
Assertions.assertEquals( "[something|23]", html2wiki.translate( "<a class=\"footnoteref\" href=\"#ref-PageName-23\">[something]</a>" ) );
-
}
@Test
@@ -100,7 +103,6 @@ public class HtmlStringToWikiTranslatorTest {
public void testRulers() throws Exception {
Assertions.assertEquals( "a\n----\nb", html2wiki.translate( "a<hr/>b" ) );
Assertions.assertEquals( "by\n" + "----\n" + "Dies", html2wiki.translate( "by\n" + "<hr>\n" + "Dies" ) );
-
}
@Test