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 <[email protected]> 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>
