You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@jspwiki.apache.org by gi...@apache.org on 2022/03/11 13:49:12 UTC

[jspwiki] branch dependabot/maven/org.jdom-jdom2-2.0.6.1 updated (9575df8 -> b5f5682)

This is an automated email from the ASF dual-hosted git repository.

github-bot pushed a change to branch dependabot/maven/org.jdom-jdom2-2.0.6.1
in repository https://gitbox.apache.org/repos/asf/jspwiki.git.


 discard 9575df8  Bump jdom2 from 2.0.6 to 2.0.6.1
     add de8e6bb  Update .gitignore
     add 9cca533  Some small refactors on htmltowiki decorators. Most notably, `<a>` syntax decorator only performs tasks related to syntax decoration.
     add 3d61f01  format, fix some typos, use log placeholders
     add 9e308da  JSPWIKI-1168: Simplify required configuration to log on file
     add a7d1249  JSPWIKI-1169: Add Bill of materials module to build
     add 504e870  `DefaultReferenceManager` now only synchronizes when (un)serializing data, since the underlying ready handling cmaps used are aloncurrency.
     add 6b3aeba  Added AttributesExtension to jspwiki-markdown in order to add support for Markdown Extra attributes.
     add bd73e02  fix compilation
     add e585f53  Update dependencies
     add 479edef  2.11.2-git-01
     add 8d9660b  fix build: add missing else branch + undo one refactor on ADecorator
     add 6e5da62  Merge branch 'master' of https://github.com/apache/jspwiki
     add 98f3ee1  2.11.2-git-02 Protect the meta 'wikiUserName' tag against XSS vuln.
     add 2409cc0  refactor org.apache.wiki.htmltowiki.syntax.jspwiki package
     add 931c20d  remove unneeded escapes
     add 005a392  fix javadoc typo
     add f75e562  remove unneeded escapes
     add ff593e5  JSPWIKI-802: add definition and tables flexmark extensions'
     add c52d4a3  JSPWIKI-802: enable definition and tables extensions, and provided tests for markup allowed by newly introduced extensions
     add 0769ce9  JSPWIKI-802: add Markdown support for WYSIWYG editor
     add c5b3a9a  code format + use log placeholders when possible
     add acd1af6  more code formatting
     add 00ffc39  XMLUserDatabase does not allow empty wiki names
     add 2bc8d77  same for JDBC user database
     add eaa892b  Update Selenide to 6.2.0 - closes #165
     add 3148468  Update cargo plugin to 1.9.9 - closes #166
     add b445b00  Update release plugin to 3.0.0-M5 - closes #164
     add deb5417  2.11.2-git-03
     add 63c82a0  Refactored the org.apache.wiki.htmltowiki package,
     add a91f9cd  javadoc fixes
     add 6513f07  code format
     add 92ccfaa  Dependency updates
     add 07e1f82  JSPWIKI-79 - Ounce Labs Security Finding: Authentication - Change Password
     add a09f19e  2.11.2-git-04
     add b1a08c9  wait a bit so that all references are properly accounted for - test seems to fail spuriously on CI
     add 4e5c76f  Update project info reports maven plugin to 3.2.1
     add f10c7af  reference to relevant PRs
     add e26eede  Trying to remove test flakiness - remove awaitily call, only use pages created on test
     add 4559a26  Prepare 2.11.2 release vote
     add c85363b  [maven-release-plugin] prepare release 2.11.2-RC1
     add 4a5bff0  [maven-release-plugin] prepare for next development iteration
     add 0a3e775  2.11.3-git-01 : Fix for Xss vulnerability on XHRHtml2Markup.jsp.
     add e35509f  Dependency updates
     add 798663f  update portable launcher binaries
     add 459aa2b  Make HtmlStringToMarkdownWikiTranslatorTest use a mocked Engine instead of building a TestEngine
     add 8f2cac2  Make HtmlStringToWikiTranslatorTest use a mocked Engine instead of building a TestEngine
     add 9587999  migrate to CodeLibs' fork of NekoHtml
     add 4a1ecae  lower log noise
     add cc3f6d6  extract jspwiki-wysiwyg module from jspwiki-main
     add 5b116ac  Update dependencies
     add 5e2efc0  use log placeholders
     add 6bcf793  add jspwiki-wysiwyg dependency
     add 5a69bda  Introduce Engine Lifecycle Extensions - see https://jspwiki-wiki.apache.org/Wiki.jsp?page=HowToWriteAnEngineLifecycleExtension
     add 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
     add 6772e5d  change calls to Engine#initialize and Engine#shutdown to Engine#start and Engine#stop respectively
     add 66b9115  Update dependencies' versions on LICENSE
     add b523109  2.11.3-git-02
     add b5f5682  Bump jdom2 from 2.0.6 to 2.0.6.1

This update added new revisions after undoing existing revisions.
That is to say, some revisions that were in the old version of the
branch are not in the new version.  This situation occurs
when a user --force pushes a change and generates a repository
containing something like this:

 * -- * -- B -- O -- O -- O   (9575df8)
            \
             N -- N -- N   refs/heads/dependabot/maven/org.jdom-jdom2-2.0.6.1 (b5f5682)

You should already have received notification emails for all of the O
revisions, and so the following emails describe only the N revisions
from the common base, B.

Any revisions marked "omit" are not gone; other references still
refer to them.  Any revisions marked "discard" are gone forever.

No new revisions were added by this update.

Summary of changes:
 .gitignore                                         |   4 +-
 ChangeLog.md                                       | 184 ++++++++----
 LICENSE                                            |  59 ++--
 jspwiki-210-adapters/pom.xml                       |   2 +-
 jspwiki-210-test-adaptees/pom.xml                  |   2 +-
 jspwiki-api/pom.xml                                |   2 +-
 .../src/main/java/org/apache/wiki/api/Release.java |   6 +-
 .../java/org/apache/wiki/api/core/Command.java     |   8 +-
 .../java/org/apache/wiki/api/core/Context.java     |  26 +-
 .../main/java/org/apache/wiki/api/core/Engine.java |  41 ++-
 .../wiki/api/engine/EngineLifecycleExtension.java  |  67 +++++
 .../api/engine/EngineLifecycleExtensionTest.java   |  56 ++++
 .../engine/EngineLifecycleExtensionTestImpl.java   |  25 +-
 ...apache.wiki.api.engine.EngineLifecycleExtension |   1 +
 jspwiki-bom/pom.xml                                | 222 +++++++++++++++
 jspwiki-bootstrap/pom.xml                          |   2 +-
 .../WikiBootstrapServletContextListenerTest.java   |   2 +-
 .../src/test/resources/ini/jspwiki.properties      |  19 +-
 jspwiki-cache/pom.xml                              |   2 +-
 jspwiki-event/pom.xml                              |   2 +-
 jspwiki-it-tests/jspwiki-it-test-cma-jdbc/pom.xml  |   2 +-
 jspwiki-it-tests/jspwiki-it-test-cma/pom.xml       |   2 +-
 .../jspwiki-it-test-custom-absolute-urls/pom.xml   |   2 +-
 .../jspwiki-it-test-custom-jdbc/pom.xml            |   2 +-
 jspwiki-it-tests/jspwiki-it-test-custom/pom.xml    |   2 +-
 jspwiki-it-tests/jspwiki-selenide-tests/pom.xml    |   2 +-
 jspwiki-it-tests/pom.xml                           |   2 +-
 jspwiki-kendra-searchprovider/pom.xml              |   2 +-
 jspwiki-main/pom.xml                               | 119 ++++----
 .../main/java/org/apache/wiki/LinkCollector.java   |   2 +-
 .../src/main/java/org/apache/wiki/WikiEngine.java  |  56 ++--
 .../src/main/java/org/apache/wiki/WikiServlet.java |   7 +-
 .../org/apache/wiki/auth/DefaultUserManager.java   |   9 +-
 .../auth/authorize/WebContainerAuthorizer.java     | 123 ++++----
 .../wiki/auth/authorize/XMLGroupDatabase.java      |  31 +-
 .../wiki/auth/user/AbstractUserDatabase.java       |   7 +-
 .../apache/wiki/auth/user/JDBCUserDatabase.java    |  47 ++-
 .../org/apache/wiki/auth/user/XMLUserDatabase.java |  44 +--
 .../wiki/htmltowiki/syntax/jspwiki/ADecorator.java | 168 -----------
 .../htmltowiki/syntax/jspwiki/ImageDecorator.java  |  73 -----
 .../htmltowiki/syntax/jspwiki/InputDecorator.java  |  74 -----
 .../syntax/jspwiki/PlainTextCssDecorator.java      |  68 -----
 .../jspwiki/PlainTextCssSpecialDecorator.java      |  66 -----
 .../jspwiki/PlainTextMonospaceDecorator.java       |  79 ------
 .../htmltowiki/syntax/jspwiki/SubDecorator.java    |  52 ----
 .../syntax/jspwiki/TextAreaDecorator.java          |  69 -----
 .../wiki/references/DefaultReferenceManager.java   |  57 ++--
 .../java/org/apache/wiki/ui/AbstractCommand.java   |   2 +-
 .../java/org/apache/wiki/ui/InputValidator.java    |   8 +-
 .../src/main/resources/ini/jspwiki.properties      |  17 ++
 .../main/resources/templates/default.properties    |   2 +
 .../main/resources/templates/default_es.properties |   2 +
 .../main/resources/templates/default_fr.properties |   2 +
 .../src/test/java/org/apache/wiki/TestEngine.java  |  66 ++---
 .../test/java/org/apache/wiki/WikiEngineTest.java  |   2 +-
 .../wiki/attachment/AttachmentManagerTest.java     |   2 +-
 .../wiki/auth/authorize/XMLGroupDatabaseTest.java  | 316 ++++++++++-----------
 .../wiki/auth/user/JDBCUserDatabaseTest.java       | 220 ++++++--------
 .../apache/wiki/auth/user/XMLUserDatabaseTest.java |  15 +-
 .../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      |  14 +-
 .../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                           |  29 +-
 .../syntax/markdown/MarkdownADecorator.java        |  82 ++++++
 .../syntax/markdown/MarkdownBrDecorator.java       |  32 +--
 .../syntax/markdown/MarkdownCodeDecorator.java     |  34 ++-
 .../syntax/markdown/MarkdownDdDecorator.java       |  21 +-
 .../syntax/markdown/MarkdownDlDecorator.java       |  33 +--
 .../syntax/markdown/MarkdownDtDecorator.java       |  21 +-
 .../syntax/markdown/MarkdownFormDecorator.java     |  38 +--
 .../syntax/markdown/MarkdownH1Decorator.java       |  21 +-
 .../syntax/markdown/MarkdownH2Decorator.java       |  21 +-
 .../syntax/markdown/MarkdownH3Decorator.java       |  21 +-
 .../syntax/markdown/MarkdownH4Decorator.java       |  21 +-
 .../syntax/markdown/MarkdownHrDecorator.java       |  21 +-
 .../syntax/markdown/MarkdownImageDecorator.java    |  60 ++++
 .../syntax/markdown/MarkdownInputDecorator.java    |  39 +--
 .../syntax/markdown/MarkdownLiDecorator.java       |  36 +--
 .../syntax/markdown/MarkdownOlDecorator.java       |  22 +-
 .../syntax/markdown/MarkdownPDecorator.java        |  33 +--
 .../markdown/MarkdownPlainTextBoldDecorator.java   |  34 ++-
 .../markdown/MarkdownPlainTextCssDecorator.java    |  61 ++++
 .../MarkdownPlainTextCssSpecialDecorator.java      |  60 ++++
 .../markdown/MarkdownPlainTextItalicDecorator.java |  34 ++-
 .../MarkdownPlainTextMonospaceDecorator.java       |  36 ++-
 .../syntax/markdown/MarkdownSelectDecorator.java   |  49 ++--
 .../syntax/markdown/MarkdownStrikeDecorator.java   |  33 +--
 .../syntax/markdown/MarkdownSubDecorator.java      |  33 +--
 .../syntax/markdown/MarkdownSupDecorator.java      |  33 +--
 .../syntax/markdown/MarkdownSyntaxDecorator.java   |  94 ++++++
 .../syntax/markdown/MarkdownTdDecorator.java       |  22 +-
 .../syntax/markdown/MarkdownTextAreaDecorator.java |  39 +--
 .../syntax/markdown/MarkdownThDecorator.java       |  22 +-
 .../syntax/markdown/MarkdownTheadDecorator.java    |  38 +--
 .../syntax/markdown/MarkdownUlDecorator.java       |  22 +-
 .../markdown/MarkdownUnderlineDecorator.java       |  33 +--
 .../wiki/htmltowiki/syntax/markdown}/package.html  |   9 +-
 .../MarkdownSetupEngineLifecycleExtension.java     |  52 ++++
 .../wiki/parser/markdown/MarkdownDocument.java     |  57 ++--
 ...apache.wiki.api.engine.EngineLifecycleExtension |   1 +
 .../HtmlStringToMarkdownWikiTranslatorTest.java    | 176 ++++++------
 .../MarkdownSetupEngineLifecycleExtensionTest.java |  42 +++
 .../wiki/render/markdown/MarkdownRendererTest.java |  42 ++-
 jspwiki-portable/pom.xml                           |   2 +-
 .../tomcat/woas.app/Contents/Java/bootstrap.jar    | Bin 34755 -> 34698 bytes
 .../tomcat/woas.app/Contents/Java/tomcat-juli.jar  | Bin 47109 -> 46898 bytes
 .../src/overlay/launchers/tomcat/woas.exe          | Bin 3680299 -> 3656529 bytes
 jspwiki-tika-searchprovider/pom.xml                |   2 +-
 jspwiki-util/pom.xml                               |   2 +-
 .../main/java/org/apache/wiki/util/ClassUtil.java  |  12 +-
 .../main/java/org/apache/wiki/util/XmlUtil.java    |  19 +-
 jspwiki-war/pom.xml                                |   2 +-
 jspwiki-war/src/main/webapp/NewGroup.jsp           |  25 +-
 jspwiki-war/src/main/webapp/UserPreferences.jsp    |  43 +--
 jspwiki-war/src/main/webapp/XHRHtml2Markup.jsp     |   2 +-
 .../src/main/webapp/templates/210/ProfileTab.jsp   |  10 +-
 .../main/webapp/templates/default/ProfileTab.jsp   |  10 +-
 .../main/webapp/templates/default/commonheader.jsp |   2 +-
 jspwiki-wikipages/de/pom.xml                       |   3 +-
 jspwiki-wikipages/en/pom.xml                       |   3 +-
 jspwiki-wikipages/es/pom.xml                       |   3 +-
 jspwiki-wikipages/fi/pom.xml                       |   3 +-
 jspwiki-wikipages/fr/pom.xml                       |   3 +-
 jspwiki-wikipages/it/pom.xml                       |   3 +-
 jspwiki-wikipages/nl/pom.xml                       |   3 +-
 jspwiki-wikipages/pom.xml                          |   2 +-
 jspwiki-wikipages/pt_BR/pom.xml                    |   3 +-
 jspwiki-wikipages/ru/pom.xml                       |   3 +-
 jspwiki-wikipages/zh_CN/pom.xml                    |   3 +-
 {jspwiki-bootstrap => jspwiki-wysiwyg}/pom.xml     |  31 +-
 .../htmltowiki/HtmlStringToWikiTranslator.java     |   5 +-
 .../apache/wiki/htmltowiki/SyntaxDecorator.java    |  39 ++-
 .../wiki/htmltowiki/WhitespaceTrimWriter.java      |   5 +-
 .../htmltowiki/XHtmlElementToWikiTranslator.java   |  56 +++-
 .../apache/wiki/htmltowiki/XHtmlToWikiConfig.java  |   0
 .../java/org/apache/wiki/htmltowiki/package.html   |   0
 .../apache/wiki/htmltowiki/syntax/ADecorator.java  | 120 ++++++++
 .../wiki/htmltowiki/syntax}/BrDecorator.java       |  31 +-
 .../wiki/htmltowiki/syntax}/CodeDecorator.java     |  42 ++-
 .../apache/wiki/htmltowiki/syntax/DdDecorator.java |  29 +-
 .../wiki/htmltowiki/syntax}/DlDecorator.java       |  34 ++-
 .../apache/wiki/htmltowiki/syntax/DtDecorator.java |  26 +-
 .../wiki/htmltowiki/syntax}/FormDecorator.java     |  40 ++-
 .../wiki/htmltowiki/syntax}/H1Decorator.java       |  25 +-
 .../wiki/htmltowiki/syntax}/H2Decorator.java       |  25 +-
 .../wiki/htmltowiki/syntax}/H3Decorator.java       |  25 +-
 .../wiki/htmltowiki/syntax}/H4Decorator.java       |  25 +-
 .../wiki/htmltowiki/syntax}/HrDecorator.java       |  25 +-
 .../wiki/htmltowiki/syntax/ImageDecorator.java     |  89 ++++++
 .../wiki/htmltowiki/syntax/InputDecorator.java     |  91 ++++++
 .../wiki/htmltowiki/syntax}/LiDecorator.java       |  29 +-
 .../wiki/htmltowiki/syntax/MarkupHelper.java       | 120 ++++++++
 .../wiki/htmltowiki/syntax}/OlDecorator.java       |  31 +-
 .../wiki/htmltowiki/syntax}/OptionDecorator.java   |  19 +-
 .../apache/wiki/htmltowiki/syntax}/PDecorator.java |  34 ++-
 .../htmltowiki/syntax}/PlainTextBoldDecorator.java |  49 ++--
 .../htmltowiki/syntax/PlainTextCssDecorator.java   |  93 ++++++
 .../syntax/PlainTextCssSpecialDecorator.java       |  95 +++++++
 .../htmltowiki/syntax}/PlainTextDecorator.java     |  25 +-
 .../syntax}/PlainTextItalicDecorator.java          |  49 ++--
 .../syntax/PlainTextMonospaceDecorator.java        |  93 ++++++
 .../wiki/htmltowiki/syntax/SelectDecorator.java    |  90 ++++++
 .../wiki/htmltowiki/syntax}/StrikeDecorator.java   |  34 ++-
 .../wiki/htmltowiki/syntax/SubDecorator.java       |  43 +--
 .../wiki/htmltowiki/syntax}/SupDecorator.java      |  34 ++-
 .../wiki/htmltowiki/syntax}/TableDecorator.java    |  18 +-
 .../wiki/htmltowiki/syntax/TbodyDecorator.java     |  21 +-
 .../wiki/htmltowiki/syntax}/TdDecorator.java       |  29 +-
 .../wiki/htmltowiki/syntax/TextAreaDecorator.java  |  89 ++++++
 .../htmltowiki/syntax}/TextElementDecorator.java   |  18 +-
 .../wiki/htmltowiki/syntax}/ThDecorator.java       |  29 +-
 .../wiki/htmltowiki/syntax/TheadDecorator.java     |  21 +-
 .../wiki/htmltowiki/syntax}/TrDecorator.java       |  16 +-
 .../wiki/htmltowiki/syntax}/UlDecorator.java       |  31 +-
 .../htmltowiki/syntax}/UnderlineDecorator.java     |  34 ++-
 .../htmltowiki/syntax/WikiSyntaxDecorator.java     | 173 +++++------
 .../syntax/jspwiki/JSPWikiADecorator.java          |  82 ++++++
 .../syntax/jspwiki/JSPWikiBrDecorator.java         |  20 +-
 .../syntax/jspwiki/JSPWikiCodeDecorator.java       |  32 +--
 .../syntax/jspwiki/JSPWikiDdDecorator.java         |  19 +-
 .../syntax/jspwiki/JSPWikiDlDecorator.java         |  31 +-
 .../syntax/jspwiki/JSPWikiDtDecorator.java         |  19 +-
 .../syntax/jspwiki/JSPWikiFormDecorator.java       |  37 +--
 .../syntax/jspwiki/JSPWikiH1Decorator.java         |  19 +-
 .../syntax/jspwiki/JSPWikiH2Decorator.java         |  19 +-
 .../syntax/jspwiki/JSPWikiH3Decorator.java         |  19 +-
 .../syntax/jspwiki/JSPWikiH4Decorator.java         |  19 +-
 .../syntax/jspwiki/JSPWikiHrDecorator.java         |  19 +-
 .../syntax/jspwiki/JSPWikiImageDecorator.java      |  60 ++++
 .../syntax/jspwiki/JSPWikiInputDecorator.java      |  38 +--
 .../syntax/jspwiki/JSPWikiLiDecorator.java         |  35 +--
 .../syntax/jspwiki/JSPWikiOlDecorator.java         |  20 +-
 .../syntax/jspwiki/JSPWikiPDecorator.java          |  31 +-
 .../jspwiki/JSPWikiPlainTextBoldDecorator.java     |  33 +--
 .../jspwiki/JSPWikiPlainTextCssDecorator.java      |  61 ++++
 .../JSPWikiPlainTextCssSpecialDecorator.java       |  53 ++--
 .../jspwiki/JSPWikiPlainTextItalicDecorator.java   |  33 +--
 .../JSPWikiPlainTextMonospaceDecorator.java        |  33 ++-
 .../syntax/jspwiki/JSPWikiSelectDecorator.java     |  47 +--
 .../syntax/jspwiki/JSPWikiStrikeDecorator.java     |  31 +-
 .../syntax/jspwiki/JSPWikiSubDecorator.java        |  31 +-
 .../syntax/jspwiki/JSPWikiSupDecorator.java        |  31 +-
 .../syntax/jspwiki/JSPWikiSyntaxDecorator.java     |  95 +++++++
 .../syntax/jspwiki/JSPWikiTdDecorator.java         |  20 +-
 .../syntax/jspwiki/JSPWikiTextAreaDecorator.java   |  37 +--
 .../syntax/jspwiki/JSPWikiThDecorator.java         |  20 +-
 .../syntax/jspwiki/JSPWikiUlDecorator.java         |  20 +-
 .../syntax/jspwiki/JSPWikiUnderlineDecorator.java  |  31 +-
 .../wiki/htmltowiki/syntax/jspwiki/package.html    |   0
 .../apache/wiki/htmltowiki/syntax}/package.html    |  16 +-
 .../htmltowiki/HtmlStringToWikiTranslatorTest.java |  40 ++-
 pom.xml                                            |  81 ++++--
 219 files changed, 4757 insertions(+), 2912 deletions(-)
 create mode 100644 jspwiki-api/src/main/java/org/apache/wiki/api/engine/EngineLifecycleExtension.java
 create mode 100644 jspwiki-api/src/test/java/org/apache/wiki/api/engine/EngineLifecycleExtensionTest.java
 copy jspwiki-main/src/main/java/org/apache/wiki/htmltowiki/syntax/jspwiki/MarkupHelper.java => jspwiki-api/src/test/java/org/apache/wiki/api/engine/EngineLifecycleExtensionTestImpl.java (57%)
 create mode 100644 jspwiki-api/src/test/resources/META-INF/services/org.apache.wiki.api.engine.EngineLifecycleExtension
 create mode 100644 jspwiki-bom/pom.xml
 delete mode 100644 jspwiki-main/src/main/java/org/apache/wiki/htmltowiki/syntax/jspwiki/ADecorator.java
 delete mode 100644 jspwiki-main/src/main/java/org/apache/wiki/htmltowiki/syntax/jspwiki/ImageDecorator.java
 delete mode 100644 jspwiki-main/src/main/java/org/apache/wiki/htmltowiki/syntax/jspwiki/InputDecorator.java
 delete mode 100644 jspwiki-main/src/main/java/org/apache/wiki/htmltowiki/syntax/jspwiki/PlainTextCssDecorator.java
 delete mode 100644 jspwiki-main/src/main/java/org/apache/wiki/htmltowiki/syntax/jspwiki/PlainTextCssSpecialDecorator.java
 delete mode 100644 jspwiki-main/src/main/java/org/apache/wiki/htmltowiki/syntax/jspwiki/PlainTextMonospaceDecorator.java
 delete mode 100644 jspwiki-main/src/main/java/org/apache/wiki/htmltowiki/syntax/jspwiki/SubDecorator.java
 delete mode 100644 jspwiki-main/src/main/java/org/apache/wiki/htmltowiki/syntax/jspwiki/TextAreaDecorator.java
 create mode 100644 jspwiki-markdown/src/main/java/org/apache/wiki/htmltowiki/syntax/markdown/MarkdownADecorator.java
 copy jspwiki-main/src/main/java/org/apache/wiki/htmltowiki/syntax/jspwiki/DtDecorator.java => jspwiki-markdown/src/main/java/org/apache/wiki/htmltowiki/syntax/markdown/MarkdownBrDecorator.java (56%)
 copy jspwiki-main/src/main/java/org/apache/wiki/htmltowiki/syntax/jspwiki/DtDecorator.java => jspwiki-markdown/src/main/java/org/apache/wiki/htmltowiki/syntax/markdown/MarkdownCodeDecorator.java (59%)
 copy jspwiki-main/src/main/java/org/apache/wiki/htmltowiki/syntax/jspwiki/MarkupHelper.java => jspwiki-markdown/src/main/java/org/apache/wiki/htmltowiki/syntax/markdown/MarkdownDdDecorator.java (63%)
 copy jspwiki-main/src/main/java/org/apache/wiki/htmltowiki/syntax/jspwiki/DtDecorator.java => jspwiki-markdown/src/main/java/org/apache/wiki/htmltowiki/syntax/markdown/MarkdownDlDecorator.java (59%)
 copy jspwiki-main/src/main/java/org/apache/wiki/htmltowiki/syntax/jspwiki/MarkupHelper.java => jspwiki-markdown/src/main/java/org/apache/wiki/htmltowiki/syntax/markdown/MarkdownDtDecorator.java (63%)
 copy jspwiki-main/src/main/java/org/apache/wiki/htmltowiki/syntax/jspwiki/DtDecorator.java => jspwiki-markdown/src/main/java/org/apache/wiki/htmltowiki/syntax/markdown/MarkdownFormDecorator.java (56%)
 copy jspwiki-main/src/main/java/org/apache/wiki/htmltowiki/syntax/jspwiki/MarkupHelper.java => jspwiki-markdown/src/main/java/org/apache/wiki/htmltowiki/syntax/markdown/MarkdownH1Decorator.java (63%)
 copy jspwiki-main/src/main/java/org/apache/wiki/htmltowiki/syntax/jspwiki/MarkupHelper.java => jspwiki-markdown/src/main/java/org/apache/wiki/htmltowiki/syntax/markdown/MarkdownH2Decorator.java (63%)
 copy jspwiki-main/src/main/java/org/apache/wiki/htmltowiki/syntax/jspwiki/MarkupHelper.java => jspwiki-markdown/src/main/java/org/apache/wiki/htmltowiki/syntax/markdown/MarkdownH3Decorator.java (63%)
 copy jspwiki-main/src/main/java/org/apache/wiki/htmltowiki/syntax/jspwiki/MarkupHelper.java => jspwiki-markdown/src/main/java/org/apache/wiki/htmltowiki/syntax/markdown/MarkdownH4Decorator.java (63%)
 copy jspwiki-main/src/main/java/org/apache/wiki/htmltowiki/syntax/jspwiki/MarkupHelper.java => jspwiki-markdown/src/main/java/org/apache/wiki/htmltowiki/syntax/markdown/MarkdownHrDecorator.java (63%)
 create mode 100644 jspwiki-markdown/src/main/java/org/apache/wiki/htmltowiki/syntax/markdown/MarkdownImageDecorator.java
 copy jspwiki-main/src/main/java/org/apache/wiki/htmltowiki/syntax/jspwiki/DtDecorator.java => jspwiki-markdown/src/main/java/org/apache/wiki/htmltowiki/syntax/markdown/MarkdownInputDecorator.java (55%)
 copy jspwiki-main/src/main/java/org/apache/wiki/htmltowiki/syntax/jspwiki/TableDecorator.java => jspwiki-markdown/src/main/java/org/apache/wiki/htmltowiki/syntax/markdown/MarkdownLiDecorator.java (53%)
 copy jspwiki-main/src/main/java/org/apache/wiki/htmltowiki/syntax/jspwiki/MarkupHelper.java => jspwiki-markdown/src/main/java/org/apache/wiki/htmltowiki/syntax/markdown/MarkdownOlDecorator.java (60%)
 copy jspwiki-main/src/main/java/org/apache/wiki/htmltowiki/syntax/jspwiki/DtDecorator.java => jspwiki-markdown/src/main/java/org/apache/wiki/htmltowiki/syntax/markdown/MarkdownPDecorator.java (59%)
 copy jspwiki-main/src/main/java/org/apache/wiki/htmltowiki/syntax/jspwiki/DtDecorator.java => jspwiki-markdown/src/main/java/org/apache/wiki/htmltowiki/syntax/markdown/MarkdownPlainTextBoldDecorator.java (57%)
 create mode 100644 jspwiki-markdown/src/main/java/org/apache/wiki/htmltowiki/syntax/markdown/MarkdownPlainTextCssDecorator.java
 create mode 100644 jspwiki-markdown/src/main/java/org/apache/wiki/htmltowiki/syntax/markdown/MarkdownPlainTextCssSpecialDecorator.java
 copy jspwiki-main/src/main/java/org/apache/wiki/htmltowiki/syntax/jspwiki/DtDecorator.java => jspwiki-markdown/src/main/java/org/apache/wiki/htmltowiki/syntax/markdown/MarkdownPlainTextItalicDecorator.java (56%)
 copy jspwiki-main/src/main/java/org/apache/wiki/htmltowiki/syntax/jspwiki/H1Decorator.java => jspwiki-markdown/src/main/java/org/apache/wiki/htmltowiki/syntax/markdown/MarkdownPlainTextMonospaceDecorator.java (53%)
 copy jspwiki-main/src/main/java/org/apache/wiki/htmltowiki/syntax/jspwiki/DlDecorator.java => jspwiki-markdown/src/main/java/org/apache/wiki/htmltowiki/syntax/markdown/MarkdownSelectDecorator.java (52%)
 copy jspwiki-main/src/main/java/org/apache/wiki/htmltowiki/syntax/jspwiki/DtDecorator.java => jspwiki-markdown/src/main/java/org/apache/wiki/htmltowiki/syntax/markdown/MarkdownStrikeDecorator.java (59%)
 copy jspwiki-main/src/main/java/org/apache/wiki/htmltowiki/syntax/jspwiki/DtDecorator.java => jspwiki-markdown/src/main/java/org/apache/wiki/htmltowiki/syntax/markdown/MarkdownSubDecorator.java (59%)
 copy jspwiki-main/src/main/java/org/apache/wiki/htmltowiki/syntax/jspwiki/DtDecorator.java => jspwiki-markdown/src/main/java/org/apache/wiki/htmltowiki/syntax/markdown/MarkdownSupDecorator.java (59%)
 create mode 100644 jspwiki-markdown/src/main/java/org/apache/wiki/htmltowiki/syntax/markdown/MarkdownSyntaxDecorator.java
 copy jspwiki-main/src/main/java/org/apache/wiki/htmltowiki/syntax/jspwiki/MarkupHelper.java => jspwiki-markdown/src/main/java/org/apache/wiki/htmltowiki/syntax/markdown/MarkdownTdDecorator.java (60%)
 copy jspwiki-main/src/main/java/org/apache/wiki/htmltowiki/syntax/jspwiki/DtDecorator.java => jspwiki-markdown/src/main/java/org/apache/wiki/htmltowiki/syntax/markdown/MarkdownTextAreaDecorator.java (54%)
 copy jspwiki-main/src/main/java/org/apache/wiki/htmltowiki/syntax/jspwiki/MarkupHelper.java => jspwiki-markdown/src/main/java/org/apache/wiki/htmltowiki/syntax/markdown/MarkdownThDecorator.java (60%)
 copy jspwiki-main/src/main/java/org/apache/wiki/htmltowiki/syntax/jspwiki/PDecorator.java => jspwiki-markdown/src/main/java/org/apache/wiki/htmltowiki/syntax/markdown/MarkdownTheadDecorator.java (53%)
 copy jspwiki-main/src/main/java/org/apache/wiki/htmltowiki/syntax/jspwiki/MarkupHelper.java => jspwiki-markdown/src/main/java/org/apache/wiki/htmltowiki/syntax/markdown/MarkdownUlDecorator.java (60%)
 copy jspwiki-main/src/main/java/org/apache/wiki/htmltowiki/syntax/jspwiki/DtDecorator.java => jspwiki-markdown/src/main/java/org/apache/wiki/htmltowiki/syntax/markdown/MarkdownUnderlineDecorator.java (59%)
 rename {jspwiki-main/src/main/java/org/apache/wiki/htmltowiki/syntax => jspwiki-markdown/src/main/java/org/apache/wiki/htmltowiki/syntax/markdown}/package.html (68%)
 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-main/src/test/java/org/apache/wiki/htmltowiki/HtmlStringToWikiTranslatorTest.java => jspwiki-markdown/src/test/java/org/apache/wiki/htmltowiki/syntax/markdown/HtmlStringToMarkdownWikiTranslatorTest.java (61%)
 create mode 100644 jspwiki-markdown/src/test/java/org/apache/wiki/markdown/MarkdownSetupEngineLifecycleExtensionTest.java
 copy {jspwiki-bootstrap => jspwiki-wysiwyg}/pom.xml (81%)
 rename {jspwiki-main => jspwiki-wysiwyg}/src/main/java/org/apache/wiki/htmltowiki/HtmlStringToWikiTranslator.java (94%)
 rename {jspwiki-main => jspwiki-wysiwyg}/src/main/java/org/apache/wiki/htmltowiki/SyntaxDecorator.java (90%)
 rename {jspwiki-main => jspwiki-wysiwyg}/src/main/java/org/apache/wiki/htmltowiki/WhitespaceTrimWriter.java (96%)
 rename {jspwiki-main => jspwiki-wysiwyg}/src/main/java/org/apache/wiki/htmltowiki/XHtmlElementToWikiTranslator.java (87%)
 rename {jspwiki-main => jspwiki-wysiwyg}/src/main/java/org/apache/wiki/htmltowiki/XHtmlToWikiConfig.java (100%)
 copy {jspwiki-main => jspwiki-wysiwyg}/src/main/java/org/apache/wiki/htmltowiki/package.html (100%)
 create mode 100644 jspwiki-wysiwyg/src/main/java/org/apache/wiki/htmltowiki/syntax/ADecorator.java
 rename {jspwiki-main/src/main/java/org/apache/wiki/htmltowiki/syntax/jspwiki => jspwiki-wysiwyg/src/main/java/org/apache/wiki/htmltowiki/syntax}/BrDecorator.java (69%)
 rename {jspwiki-main/src/main/java/org/apache/wiki/htmltowiki/syntax/jspwiki => jspwiki-wysiwyg/src/main/java/org/apache/wiki/htmltowiki/syntax}/CodeDecorator.java (55%)
 copy jspwiki-main/src/main/java/org/apache/wiki/htmltowiki/syntax/jspwiki/DlDecorator.java => jspwiki-wysiwyg/src/main/java/org/apache/wiki/htmltowiki/syntax/DdDecorator.java (64%)
 copy {jspwiki-main/src/main/java/org/apache/wiki/htmltowiki/syntax/jspwiki => jspwiki-wysiwyg/src/main/java/org/apache/wiki/htmltowiki/syntax}/DlDecorator.java (58%)
 copy jspwiki-main/src/main/java/org/apache/wiki/htmltowiki/syntax/jspwiki/H1Decorator.java => jspwiki-wysiwyg/src/main/java/org/apache/wiki/htmltowiki/syntax/DtDecorator.java (64%)
 rename {jspwiki-main/src/main/java/org/apache/wiki/htmltowiki/syntax/jspwiki => jspwiki-wysiwyg/src/main/java/org/apache/wiki/htmltowiki/syntax}/FormDecorator.java (59%)
 rename {jspwiki-main/src/main/java/org/apache/wiki/htmltowiki/syntax/jspwiki => jspwiki-wysiwyg/src/main/java/org/apache/wiki/htmltowiki/syntax}/H1Decorator.java (63%)
 copy {jspwiki-main/src/main/java/org/apache/wiki/htmltowiki/syntax/jspwiki => jspwiki-wysiwyg/src/main/java/org/apache/wiki/htmltowiki/syntax}/H2Decorator.java (63%)
 rename {jspwiki-main/src/main/java/org/apache/wiki/htmltowiki/syntax/jspwiki => jspwiki-wysiwyg/src/main/java/org/apache/wiki/htmltowiki/syntax}/H3Decorator.java (63%)
 rename {jspwiki-main/src/main/java/org/apache/wiki/htmltowiki/syntax/jspwiki => jspwiki-wysiwyg/src/main/java/org/apache/wiki/htmltowiki/syntax}/H4Decorator.java (63%)
 rename {jspwiki-main/src/main/java/org/apache/wiki/htmltowiki/syntax/jspwiki => jspwiki-wysiwyg/src/main/java/org/apache/wiki/htmltowiki/syntax}/HrDecorator.java (64%)
 create mode 100644 jspwiki-wysiwyg/src/main/java/org/apache/wiki/htmltowiki/syntax/ImageDecorator.java
 create mode 100644 jspwiki-wysiwyg/src/main/java/org/apache/wiki/htmltowiki/syntax/InputDecorator.java
 rename {jspwiki-main/src/main/java/org/apache/wiki/htmltowiki/syntax/jspwiki => jspwiki-wysiwyg/src/main/java/org/apache/wiki/htmltowiki/syntax}/LiDecorator.java (68%)
 create mode 100644 jspwiki-wysiwyg/src/main/java/org/apache/wiki/htmltowiki/syntax/MarkupHelper.java
 rename {jspwiki-main/src/main/java/org/apache/wiki/htmltowiki/syntax/jspwiki => jspwiki-wysiwyg/src/main/java/org/apache/wiki/htmltowiki/syntax}/OlDecorator.java (60%)
 rename {jspwiki-main/src/main/java/org/apache/wiki/htmltowiki/syntax/jspwiki => jspwiki-wysiwyg/src/main/java/org/apache/wiki/htmltowiki/syntax}/OptionDecorator.java (72%)
 copy {jspwiki-main/src/main/java/org/apache/wiki/htmltowiki/syntax/jspwiki => jspwiki-wysiwyg/src/main/java/org/apache/wiki/htmltowiki/syntax}/PDecorator.java (58%)
 rename {jspwiki-main/src/main/java/org/apache/wiki/htmltowiki/syntax/jspwiki => jspwiki-wysiwyg/src/main/java/org/apache/wiki/htmltowiki/syntax}/PlainTextBoldDecorator.java (51%)
 create mode 100644 jspwiki-wysiwyg/src/main/java/org/apache/wiki/htmltowiki/syntax/PlainTextCssDecorator.java
 create mode 100644 jspwiki-wysiwyg/src/main/java/org/apache/wiki/htmltowiki/syntax/PlainTextCssSpecialDecorator.java
 rename {jspwiki-main/src/main/java/org/apache/wiki/htmltowiki/syntax/jspwiki => jspwiki-wysiwyg/src/main/java/org/apache/wiki/htmltowiki/syntax}/PlainTextDecorator.java (62%)
 rename {jspwiki-main/src/main/java/org/apache/wiki/htmltowiki/syntax/jspwiki => jspwiki-wysiwyg/src/main/java/org/apache/wiki/htmltowiki/syntax}/PlainTextItalicDecorator.java (50%)
 create mode 100644 jspwiki-wysiwyg/src/main/java/org/apache/wiki/htmltowiki/syntax/PlainTextMonospaceDecorator.java
 create mode 100644 jspwiki-wysiwyg/src/main/java/org/apache/wiki/htmltowiki/syntax/SelectDecorator.java
 rename {jspwiki-main/src/main/java/org/apache/wiki/htmltowiki/syntax/jspwiki => jspwiki-wysiwyg/src/main/java/org/apache/wiki/htmltowiki/syntax}/StrikeDecorator.java (55%)
 copy jspwiki-main/src/main/java/org/apache/wiki/htmltowiki/syntax/jspwiki/SelectDecorator.java => jspwiki-wysiwyg/src/main/java/org/apache/wiki/htmltowiki/syntax/SubDecorator.java (56%)
 rename {jspwiki-main/src/main/java/org/apache/wiki/htmltowiki/syntax/jspwiki => jspwiki-wysiwyg/src/main/java/org/apache/wiki/htmltowiki/syntax}/SupDecorator.java (56%)
 rename {jspwiki-main/src/main/java/org/apache/wiki/htmltowiki/syntax/jspwiki => jspwiki-wysiwyg/src/main/java/org/apache/wiki/htmltowiki/syntax}/TableDecorator.java (71%)
 rename jspwiki-main/src/main/java/org/apache/wiki/htmltowiki/syntax/jspwiki/DtDecorator.java => jspwiki-wysiwyg/src/main/java/org/apache/wiki/htmltowiki/syntax/TbodyDecorator.java (66%)
 rename {jspwiki-main/src/main/java/org/apache/wiki/htmltowiki/syntax/jspwiki => jspwiki-wysiwyg/src/main/java/org/apache/wiki/htmltowiki/syntax}/TdDecorator.java (62%)
 create mode 100644 jspwiki-wysiwyg/src/main/java/org/apache/wiki/htmltowiki/syntax/TextAreaDecorator.java
 rename {jspwiki-main/src/main/java/org/apache/wiki/htmltowiki/syntax/jspwiki => jspwiki-wysiwyg/src/main/java/org/apache/wiki/htmltowiki/syntax}/TextElementDecorator.java (74%)
 rename {jspwiki-main/src/main/java/org/apache/wiki/htmltowiki/syntax/jspwiki => jspwiki-wysiwyg/src/main/java/org/apache/wiki/htmltowiki/syntax}/ThDecorator.java (62%)
 copy jspwiki-main/src/main/java/org/apache/wiki/htmltowiki/syntax/jspwiki/DdDecorator.java => jspwiki-wysiwyg/src/main/java/org/apache/wiki/htmltowiki/syntax/TheadDecorator.java (66%)
 rename {jspwiki-main/src/main/java/org/apache/wiki/htmltowiki/syntax/jspwiki => jspwiki-wysiwyg/src/main/java/org/apache/wiki/htmltowiki/syntax}/TrDecorator.java (72%)
 rename {jspwiki-main/src/main/java/org/apache/wiki/htmltowiki/syntax/jspwiki => jspwiki-wysiwyg/src/main/java/org/apache/wiki/htmltowiki/syntax}/UlDecorator.java (60%)
 rename {jspwiki-main/src/main/java/org/apache/wiki/htmltowiki/syntax/jspwiki => jspwiki-wysiwyg/src/main/java/org/apache/wiki/htmltowiki/syntax}/UnderlineDecorator.java (54%)
 rename jspwiki-main/src/main/java/org/apache/wiki/htmltowiki/syntax/jspwiki/JSPWikiSyntaxDecorator.java => jspwiki-wysiwyg/src/main/java/org/apache/wiki/htmltowiki/syntax/WikiSyntaxDecorator.java (62%)
 create mode 100644 jspwiki-wysiwyg/src/main/java/org/apache/wiki/htmltowiki/syntax/jspwiki/JSPWikiADecorator.java
 copy jspwiki-main/src/main/java/org/apache/wiki/htmltowiki/syntax/jspwiki/MarkupHelper.java => jspwiki-wysiwyg/src/main/java/org/apache/wiki/htmltowiki/syntax/jspwiki/JSPWikiBrDecorator.java (64%)
 copy jspwiki-main/src/main/java/org/apache/wiki/htmltowiki/syntax/jspwiki/DdDecorator.java => jspwiki-wysiwyg/src/main/java/org/apache/wiki/htmltowiki/syntax/jspwiki/JSPWikiCodeDecorator.java (62%)
 copy jspwiki-main/src/main/java/org/apache/wiki/htmltowiki/syntax/jspwiki/MarkupHelper.java => jspwiki-wysiwyg/src/main/java/org/apache/wiki/htmltowiki/syntax/jspwiki/JSPWikiDdDecorator.java (67%)
 copy jspwiki-main/src/main/java/org/apache/wiki/htmltowiki/syntax/jspwiki/DdDecorator.java => jspwiki-wysiwyg/src/main/java/org/apache/wiki/htmltowiki/syntax/jspwiki/JSPWikiDlDecorator.java (62%)
 copy jspwiki-main/src/main/java/org/apache/wiki/htmltowiki/syntax/jspwiki/MarkupHelper.java => jspwiki-wysiwyg/src/main/java/org/apache/wiki/htmltowiki/syntax/jspwiki/JSPWikiDtDecorator.java (67%)
 copy jspwiki-main/src/main/java/org/apache/wiki/htmltowiki/syntax/jspwiki/H2Decorator.java => jspwiki-wysiwyg/src/main/java/org/apache/wiki/htmltowiki/syntax/jspwiki/JSPWikiFormDecorator.java (59%)
 copy jspwiki-main/src/main/java/org/apache/wiki/htmltowiki/syntax/jspwiki/MarkupHelper.java => jspwiki-wysiwyg/src/main/java/org/apache/wiki/htmltowiki/syntax/jspwiki/JSPWikiH1Decorator.java (67%)
 copy jspwiki-main/src/main/java/org/apache/wiki/htmltowiki/syntax/jspwiki/MarkupHelper.java => jspwiki-wysiwyg/src/main/java/org/apache/wiki/htmltowiki/syntax/jspwiki/JSPWikiH2Decorator.java (67%)
 copy jspwiki-main/src/main/java/org/apache/wiki/htmltowiki/syntax/jspwiki/MarkupHelper.java => jspwiki-wysiwyg/src/main/java/org/apache/wiki/htmltowiki/syntax/jspwiki/JSPWikiH3Decorator.java (67%)
 copy jspwiki-main/src/main/java/org/apache/wiki/htmltowiki/syntax/jspwiki/MarkupHelper.java => jspwiki-wysiwyg/src/main/java/org/apache/wiki/htmltowiki/syntax/jspwiki/JSPWikiH4Decorator.java (67%)
 copy jspwiki-main/src/main/java/org/apache/wiki/htmltowiki/syntax/jspwiki/MarkupHelper.java => jspwiki-wysiwyg/src/main/java/org/apache/wiki/htmltowiki/syntax/jspwiki/JSPWikiHrDecorator.java (67%)
 create mode 100644 jspwiki-wysiwyg/src/main/java/org/apache/wiki/htmltowiki/syntax/jspwiki/JSPWikiImageDecorator.java
 copy jspwiki-main/src/main/java/org/apache/wiki/htmltowiki/syntax/jspwiki/H2Decorator.java => jspwiki-wysiwyg/src/main/java/org/apache/wiki/htmltowiki/syntax/jspwiki/JSPWikiInputDecorator.java (58%)
 rename jspwiki-main/src/main/java/org/apache/wiki/htmltowiki/syntax/jspwiki/PDecorator.java => jspwiki-wysiwyg/src/main/java/org/apache/wiki/htmltowiki/syntax/jspwiki/JSPWikiLiDecorator.java (58%)
 copy jspwiki-main/src/main/java/org/apache/wiki/htmltowiki/syntax/jspwiki/MarkupHelper.java => jspwiki-wysiwyg/src/main/java/org/apache/wiki/htmltowiki/syntax/jspwiki/JSPWikiOlDecorator.java (64%)
 copy jspwiki-main/src/main/java/org/apache/wiki/htmltowiki/syntax/jspwiki/DdDecorator.java => jspwiki-wysiwyg/src/main/java/org/apache/wiki/htmltowiki/syntax/jspwiki/JSPWikiPDecorator.java (62%)
 copy jspwiki-main/src/main/java/org/apache/wiki/htmltowiki/syntax/jspwiki/H2Decorator.java => jspwiki-wysiwyg/src/main/java/org/apache/wiki/htmltowiki/syntax/jspwiki/JSPWikiPlainTextBoldDecorator.java (60%)
 create mode 100644 jspwiki-wysiwyg/src/main/java/org/apache/wiki/htmltowiki/syntax/jspwiki/JSPWikiPlainTextCssDecorator.java
 rename jspwiki-main/src/main/java/org/apache/wiki/htmltowiki/syntax/jspwiki/SelectDecorator.java => jspwiki-wysiwyg/src/main/java/org/apache/wiki/htmltowiki/syntax/jspwiki/JSPWikiPlainTextCssSpecialDecorator.java (51%)
 rename jspwiki-main/src/main/java/org/apache/wiki/htmltowiki/syntax/jspwiki/H2Decorator.java => jspwiki-wysiwyg/src/main/java/org/apache/wiki/htmltowiki/syntax/jspwiki/JSPWikiPlainTextItalicDecorator.java (59%)
 copy jspwiki-main/src/main/java/org/apache/wiki/htmltowiki/syntax/jspwiki/DdDecorator.java => jspwiki-wysiwyg/src/main/java/org/apache/wiki/htmltowiki/syntax/jspwiki/JSPWikiPlainTextMonospaceDecorator.java (56%)
 rename jspwiki-main/src/main/java/org/apache/wiki/htmltowiki/syntax/jspwiki/DlDecorator.java => jspwiki-wysiwyg/src/main/java/org/apache/wiki/htmltowiki/syntax/jspwiki/JSPWikiSelectDecorator.java (55%)
 copy jspwiki-main/src/main/java/org/apache/wiki/htmltowiki/syntax/jspwiki/DdDecorator.java => jspwiki-wysiwyg/src/main/java/org/apache/wiki/htmltowiki/syntax/jspwiki/JSPWikiStrikeDecorator.java (62%)
 copy jspwiki-main/src/main/java/org/apache/wiki/htmltowiki/syntax/jspwiki/DdDecorator.java => jspwiki-wysiwyg/src/main/java/org/apache/wiki/htmltowiki/syntax/jspwiki/JSPWikiSubDecorator.java (62%)
 copy jspwiki-main/src/main/java/org/apache/wiki/htmltowiki/syntax/jspwiki/DdDecorator.java => jspwiki-wysiwyg/src/main/java/org/apache/wiki/htmltowiki/syntax/jspwiki/JSPWikiSupDecorator.java (62%)
 create mode 100644 jspwiki-wysiwyg/src/main/java/org/apache/wiki/htmltowiki/syntax/jspwiki/JSPWikiSyntaxDecorator.java
 copy jspwiki-main/src/main/java/org/apache/wiki/htmltowiki/syntax/jspwiki/MarkupHelper.java => jspwiki-wysiwyg/src/main/java/org/apache/wiki/htmltowiki/syntax/jspwiki/JSPWikiTdDecorator.java (64%)
 copy jspwiki-main/src/main/java/org/apache/wiki/htmltowiki/syntax/jspwiki/DdDecorator.java => jspwiki-wysiwyg/src/main/java/org/apache/wiki/htmltowiki/syntax/jspwiki/JSPWikiTextAreaDecorator.java (57%)
 copy jspwiki-main/src/main/java/org/apache/wiki/htmltowiki/syntax/jspwiki/MarkupHelper.java => jspwiki-wysiwyg/src/main/java/org/apache/wiki/htmltowiki/syntax/jspwiki/JSPWikiThDecorator.java (64%)
 rename jspwiki-main/src/main/java/org/apache/wiki/htmltowiki/syntax/jspwiki/MarkupHelper.java => jspwiki-wysiwyg/src/main/java/org/apache/wiki/htmltowiki/syntax/jspwiki/JSPWikiUlDecorator.java (64%)
 rename jspwiki-main/src/main/java/org/apache/wiki/htmltowiki/syntax/jspwiki/DdDecorator.java => jspwiki-wysiwyg/src/main/java/org/apache/wiki/htmltowiki/syntax/jspwiki/JSPWikiUnderlineDecorator.java (62%)
 rename {jspwiki-main => jspwiki-wysiwyg}/src/main/java/org/apache/wiki/htmltowiki/syntax/jspwiki/package.html (100%)
 rename {jspwiki-main/src/main/java/org/apache/wiki/htmltowiki => jspwiki-wysiwyg/src/main/java/org/apache/wiki/htmltowiki/syntax}/package.html (55%)
 rename {jspwiki-main => jspwiki-wysiwyg}/src/test/java/org/apache/wiki/htmltowiki/HtmlStringToWikiTranslatorTest.java (93%)