Commit dae331d3 authored by Mathijs den Burger's avatar Mathijs den Burger

CMS7-7538: moved all CKEditor frontend code to a separate module

parent cb596bee
......@@ -2433,6 +2433,10 @@ reporting/repository/src/main/resources/hippoecm-extension.xml -text
reporting/repository/src/main/resources/hipporeport.cnd -text
reporting/repository/src/main/resources/reporting-dashboard.xml -text
reporting/repository/src/main/resources/reports-cluster-loader.xml -text
richtext/ckeditor/frontend/pom.xml -text
richtext/ckeditor/frontend/src/main/java/org/hippoecm/frontend/plugins/ckeditor/DeclarativeKeystrokesConverter.java -text
richtext/ckeditor/frontend/src/main/java/org/hippoecm/frontend/plugins/ckeditor/ckeditor-loading.gif -text
richtext/ckeditor/frontend/src/test/java/org/hippoecm/frontend/plugins/ckeditor/DeclarativeKeystrokesConverterTest.java -text
richtext/ckeditor/plugins/src/main/resources/ckeditor/plugins/hippopicker/icons/hidpi/pickimage.png -text svneol=unset#image/png
richtext/ckeditor/plugins/src/main/resources/ckeditor/plugins/hippopicker/icons/hidpi/pickinternallink.png -text svneol=unset#image/png
richtext/ckeditor/plugins/src/main/resources/ckeditor/plugins/hippopicker/icons/pickimage.png -text svneol=unset#image/png
......@@ -2515,8 +2519,6 @@ richtext/ckeditor/resources/src/main/resources/ckeditor/skins/moono/images/lock.
richtext/ckeditor/resources/src/main/resources/ckeditor/skins/moono/images/refresh.png -text svneol=unset#image/png
richtext/ckeditor/resources/src/main/resources/ckeditor/skins/moono/readme.md -text
richtext/frontend/pom.xml -text
richtext/frontend/src/main/java/org/hippoecm/frontend/plugins/ckeditor/DeclarativeKeystrokesConverter.java -text
richtext/frontend/src/main/java/org/hippoecm/frontend/plugins/ckeditor/ckeditor-loading.gif -text
richtext/frontend/src/main/java/org/hippoecm/frontend/plugins/richtext/IHtmlCleanerService.java -text
richtext/frontend/src/main/java/org/hippoecm/frontend/plugins/richtext/IImageURLProvider.java svneol=native#text/plain
richtext/frontend/src/main/java/org/hippoecm/frontend/plugins/richtext/ILinkDecorator.java svneol=native#text/plain
......@@ -2577,7 +2579,6 @@ richtext/frontend/src/main/java/org/hippoecm/frontend/plugins/richtext/model/Ric
richtext/frontend/src/main/java/org/hippoecm/frontend/plugins/richtext/model/RichTextImageMetaDataModel.java svneol=native#text/plain
richtext/frontend/src/site/apt/index.apt -text
richtext/frontend/src/site/site.xml svneol=native#text/plain
richtext/frontend/src/test/java/org/hippoecm/frontend/plugins/ckeditor/DeclarativeKeystrokesConverterTest.java -text
richtext/frontend/src/test/java/org/hippoecm/frontend/plugins/richtext/RichTextProcessorTest.java svneol=native#text/plain
richtext/frontend/src/test/java/org/hippoecm/frontend/plugins/richtext/jcr/JcrRichTextLinkFactoryTest.java svneol=native#text/plain
richtext/frontend/src/test/java/org/hippoecm/frontend/plugins/richtext/model/BrowsableModelTest.java -text
......
......@@ -293,6 +293,8 @@ repository-dependencies/target
richtext/*.iml
richtext/.project
richtext/.settings
richtext/ckeditor/frontend/*.iml
richtext/ckeditor/frontend/target
richtext/ckeditor/plugins/*.iml
richtext/ckeditor/plugins/target
richtext/ckeditor/resources/*.iml
......
......@@ -94,6 +94,11 @@
<artifactId>hippo-cms-richtext-ckeditor-plugins</artifactId>
<version>${project.version}</version>
</dependency>
<dependency>
<groupId>org.onehippo.cms7</groupId>
<artifactId>hippo-cms-richtext-ckeditor-frontend</artifactId>
<version>${project.version}</version>
</dependency>
<dependency>
<groupId>org.onehippo.cms7</groupId>
<artifactId>hippo-cms-richtext-frontend</artifactId>
......
<?xml version="1.0" encoding="UTF-8"?>
<!--
Copyright 2013 Hippo B.V. (http://www.onehippo.com)
Licensed 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/xsd/maven-4.0.0.xsd">
<modelVersion>4.0.0</modelVersion>
<parent>
<groupId>org.onehippo.cms7</groupId>
<artifactId>hippo-cms-richtext-ckeditor</artifactId>
<version>2.25.04-SNAPSHOT</version>
</parent>
<name>CMS Rich Text CKEditor Frontend</name>
<description>CMS Rich Text CKEditor Frontend</description>
<artifactId>hippo-cms-richtext-ckeditor-frontend</artifactId>
<dependencies>
<dependency>
<groupId>org.onehippo.cms7</groupId>
<artifactId>hippo-repository-api</artifactId>
</dependency>
<dependency>
<groupId>org.onehippo.cms7</groupId>
<artifactId>hippo-repository-builtin</artifactId>
</dependency>
<dependency>
<groupId>org.onehippo.cms7</groupId>
<artifactId>hippo-cms-api</artifactId>
<version>${project.version}</version>
<scope>provided</scope>
</dependency>
<dependency>
<groupId>org.onehippo.cms7</groupId>
<artifactId>hippo-cms-richtext-frontend</artifactId>
<version>${project.version}</version>
</dependency>
<dependency>
<groupId>org.onehippo.cms7</groupId>
<artifactId>hippo-cms-richtext-ckeditor-resources</artifactId>
<version>${project.version}</version>
</dependency>
<dependency>
<groupId>org.onehippo.cms7</groupId>
<artifactId>hippo-cms-richtext-ckeditor-plugins</artifactId>
<version>${project.version}</version>
</dependency>
<!-- test -->
<dependency>
<groupId>junit</groupId>
<artifactId>junit</artifactId>
</dependency>
<dependency>
<groupId>org.easymock</groupId>
<artifactId>easymockclassextension</artifactId>
</dependency>
</dependencies>
<build>
<defaultGoal>package</defaultGoal>
<resources>
<resource>
<filtering>false</filtering>
<directory>${basedir}/src/main/java</directory>
<includes>
<include>**/*.css</include>
<include>**/*.gif</include>
<include>**/*.html</include>
<include>**/*.js</include>
</includes>
</resource>
</resources>
<plugins>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-surefire-plugin</artifactId>
<configuration>
<forkMode>always</forkMode>
</configuration>
</plugin>
<plugin>
<groupId>org.codehaus.mojo</groupId>
<artifactId>jslint-maven-plugin</artifactId>
<configuration>
<predefinedVars>
CKEDITOR,
Hippo,
HippoAjax,
jQuery,
Wicket,
window
</predefinedVars>
<sourceJsFolder>${basedir}/src/main/java</sourceJsFolder>
<assumeConsoleAlertEtc>true</assumeConsoleAlertEtc>
</configuration>
</plugin>
</plugins>
</build>
</project>
\ No newline at end of file
......@@ -24,10 +24,12 @@ import org.hippoecm.frontend.plugins.richtext.dialog.images.ImagePickerBehavior;
import org.hippoecm.frontend.plugins.richtext.dialog.links.LinkPickerBehavior;
import org.hippoecm.frontend.plugins.ckeditor.hippopicker.HippoPicker;
import org.json.JSONObject;
import org.junit.Assert;
import org.junit.Before;
import org.junit.Test;
import static org.easymock.EasyMock.expect;
import static org.easymock.classextension.EasyMock.createMock;
import static org.easymock.classextension.EasyMock.replay;
import static org.easymock.classextension.EasyMock.verify;
import static org.junit.Assert.assertEquals;
......@@ -44,8 +46,8 @@ public class CKEditorPanelPickerExtensionTest {
@Before
public void setUp() {
linkPickerBehavior = EasyMock.createMock(LinkPickerBehavior.class);
imagePickerBehavior = EasyMock.createMock(ImagePickerBehavior.class);
linkPickerBehavior = createMock(LinkPickerBehavior.class);
imagePickerBehavior = createMock(ImagePickerBehavior.class);
extension = new CKEditorPanelPickerExtension(linkPickerBehavior, imagePickerBehavior);
}
......
......@@ -26,7 +26,6 @@
<name>CMS Rich Text CKEditor Plugins</name>
<description>CMS Rich Text CKEditor Plugins</description>
<artifactId>hippo-cms-richtext-ckeditor-plugins</artifactId>
<packaging>jar</packaging>
<build>
<plugins>
......
......@@ -31,6 +31,7 @@
<modules>
<module>resources</module>
<module>plugins</module>
<module>frontend</module>
</modules>
</project>
......@@ -55,17 +55,6 @@
<version>${project.version}</version>
</dependency>
<dependency>
<groupId>org.onehippo.cms7</groupId>
<artifactId>hippo-cms-richtext-ckeditor-resources</artifactId>
<version>${project.version}</version>
</dependency>
<dependency>
<groupId>org.onehippo.cms7</groupId>
<artifactId>hippo-cms-richtext-ckeditor-plugins</artifactId>
<version>${project.version}</version>
</dependency>
<dependency>
<groupId>hippo</groupId>
<artifactId>htmlcleaner</artifactId>
......@@ -77,6 +66,7 @@
</exclusion>
</exclusions>
</dependency>
<!-- test -->
<dependency>
<groupId>org.onehippo.cms7</groupId>
......@@ -104,10 +94,8 @@
<filtering>false</filtering>
<directory>${basedir}/src/main/java</directory>
<includes>
<include>**/*.js</include>
<include>**/*.html</include>
<include>**/*.css</include>
<include>**/*.gif</include>
<include>**/*.png</include>
<include>**/*.properties</include>
</includes>
......@@ -129,24 +117,6 @@
<forkMode>always</forkMode>
</configuration>
</plugin>
<plugin>
<groupId>org.codehaus.mojo</groupId>
<artifactId>jslint-maven-plugin</artifactId>
<configuration>
<predefinedVars>
CKEDITOR,
Hippo,
HippoAjax,
jQuery,
YAHOO,
Wicket,
window
</predefinedVars>
<sourceJsFolder>${basedir}/src/main/java</sourceJsFolder>
<assumeConsoleAlertEtc>true</assumeConsoleAlertEtc>
<disallowInsecureCharsInRegExp>false</disallowInsecureCharsInRegExp>
</configuration>
</plugin>
</plugins>
</build>
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment