From 9b98c6de943ac2e5b6c258566252d9fd15483a0a Mon Sep 17 00:00:00 2001
From: Mathieu Baudier <mbaudier@argeo.org>
Date: Sun, 28 Oct 2018 18:52:21 +0100
Subject: [PATCH] Move Nebula Editor tests to RAP specific

---
 org.argeo.cms.e4.rap/bnd.bnd                                    | 1 +
 .../e4xmi/cms-demo-rap.e4xmi                                    | 2 +-
 org.argeo.cms.e4.rap/src/org/argeo/cms/e4/rap/CmsE4DemoApp.java | 2 +-
 .../src/org/argeo/cms/e4/rap}/parts/CkEditor-removeButtons.js   | 0
 .../src/org/argeo/cms/e4/rap}/parts/CkEditor-toolbar.js         | 0
 .../src/org/argeo/cms/e4/rap}/parts/CkEditor-toolbarGroups.json | 0
 .../src/org/argeo/cms/e4/rap}/parts/HtmlEditor.java             | 2 +-
 .../src/org/argeo/cms/e4/rap}/parts/test.json                   | 0
 org.argeo.cms.e4/bnd.bnd                                        | 1 -
 9 files changed, 4 insertions(+), 4 deletions(-)
 rename org.argeo.cms.e4/e4xmi/cms-demo.e4xmi => org.argeo.cms.e4.rap/e4xmi/cms-demo-rap.e4xmi (97%)
 rename {org.argeo.cms.e4/src/org/argeo/cms/e4 => org.argeo.cms.e4.rap/src/org/argeo/cms/e4/rap}/parts/CkEditor-removeButtons.js (100%)
 rename {org.argeo.cms.e4/src/org/argeo/cms/e4 => org.argeo.cms.e4.rap/src/org/argeo/cms/e4/rap}/parts/CkEditor-toolbar.js (100%)
 rename {org.argeo.cms.e4/src/org/argeo/cms/e4 => org.argeo.cms.e4.rap/src/org/argeo/cms/e4/rap}/parts/CkEditor-toolbarGroups.json (100%)
 rename {org.argeo.cms.e4/src/org/argeo/cms/e4 => org.argeo.cms.e4.rap/src/org/argeo/cms/e4/rap}/parts/HtmlEditor.java (99%)
 rename {org.argeo.cms.e4/src/org/argeo/cms/e4 => org.argeo.cms.e4.rap/src/org/argeo/cms/e4/rap}/parts/test.json (100%)

diff --git a/org.argeo.cms.e4.rap/bnd.bnd b/org.argeo.cms.e4.rap/bnd.bnd
index 61e39b09f..32ff6d1f1 100644
--- a/org.argeo.cms.e4.rap/bnd.bnd
+++ b/org.argeo.cms.e4.rap/bnd.bnd
@@ -10,4 +10,5 @@ org.eclipse.swt.graphics,\
 org.eclipse.e4.ui.workbench,\
 org.eclipse.rap.rwt.client,\
 org.argeo.cms.script,\
+org.eclipse.nebula.widgets.richtext;resolution:=optional,\
 *
diff --git a/org.argeo.cms.e4/e4xmi/cms-demo.e4xmi b/org.argeo.cms.e4.rap/e4xmi/cms-demo-rap.e4xmi
similarity index 97%
rename from org.argeo.cms.e4/e4xmi/cms-demo.e4xmi
rename to org.argeo.cms.e4.rap/e4xmi/cms-demo-rap.e4xmi
index 673fc6db9..36064f041 100644
--- a/org.argeo.cms.e4/e4xmi/cms-demo.e4xmi
+++ b/org.argeo.cms.e4.rap/e4xmi/cms-demo-rap.e4xmi
@@ -12,7 +12,7 @@
           <children xsi:type="menu:HandledToolItem" xmi:id="_r3TEMMcmEeiIG7Bq51Btuw" elementId="org.argeo.cms.e4.handledtoolitem.0" command="_vsxg8McmEeiIG7Bq51Btuw"/>
         </toolbar>
       </children>
-      <children xsi:type="basic:Part" xmi:id="_cIlegMb4EeiIG7Bq51Btuw" elementId="org.argeo.cms.e4.part.htmleditor" contributionURI="bundleclass://org.argeo.cms.e4/org.argeo.cms.e4.parts.HtmlEditor" label="HTML Editor"/>
+      <children xsi:type="basic:Part" xmi:id="_cIlegMb4EeiIG7Bq51Btuw" elementId="org.argeo.cms.e4.part.htmleditor" contributionURI="bundleclass://org.argeo.cms.e4.rap/org.argeo.cms.e4.rap.parts.HtmlEditor" label="HTML Editor"/>
     </children>
   </children>
   <handlers xmi:id="_zqabMMcmEeiIG7Bq51Btuw" elementId="org.argeo.cms.e4.handler.0" contributionURI="bundleclass://org.argeo.cms.e4/org.argeo.cms.e4.handlers.SavePart" command="_vsxg8McmEeiIG7Bq51Btuw"/>
diff --git a/org.argeo.cms.e4.rap/src/org/argeo/cms/e4/rap/CmsE4DemoApp.java b/org.argeo.cms.e4.rap/src/org/argeo/cms/e4/rap/CmsE4DemoApp.java
index 358980b08..2987e4da3 100644
--- a/org.argeo.cms.e4.rap/src/org/argeo/cms/e4/rap/CmsE4DemoApp.java
+++ b/org.argeo.cms.e4.rap/src/org/argeo/cms/e4/rap/CmsE4DemoApp.java
@@ -3,7 +3,7 @@ package org.argeo.cms.e4.rap;
 public class CmsE4DemoApp extends AbstractRapE4App {
 	public CmsE4DemoApp() {
 		setPageTitle("CMS Demo");
-		setE4Xmi("org.argeo.cms.e4/e4xmi/cms-demo.e4xmi");
+		setE4Xmi("org.argeo.cms.e4.rap/e4xmi/cms-demo-rap.e4xmi");
 		setPath("/cms-e4");
 	}
 
diff --git a/org.argeo.cms.e4/src/org/argeo/cms/e4/parts/CkEditor-removeButtons.js b/org.argeo.cms.e4.rap/src/org/argeo/cms/e4/rap/parts/CkEditor-removeButtons.js
similarity index 100%
rename from org.argeo.cms.e4/src/org/argeo/cms/e4/parts/CkEditor-removeButtons.js
rename to org.argeo.cms.e4.rap/src/org/argeo/cms/e4/rap/parts/CkEditor-removeButtons.js
diff --git a/org.argeo.cms.e4/src/org/argeo/cms/e4/parts/CkEditor-toolbar.js b/org.argeo.cms.e4.rap/src/org/argeo/cms/e4/rap/parts/CkEditor-toolbar.js
similarity index 100%
rename from org.argeo.cms.e4/src/org/argeo/cms/e4/parts/CkEditor-toolbar.js
rename to org.argeo.cms.e4.rap/src/org/argeo/cms/e4/rap/parts/CkEditor-toolbar.js
diff --git a/org.argeo.cms.e4/src/org/argeo/cms/e4/parts/CkEditor-toolbarGroups.json b/org.argeo.cms.e4.rap/src/org/argeo/cms/e4/rap/parts/CkEditor-toolbarGroups.json
similarity index 100%
rename from org.argeo.cms.e4/src/org/argeo/cms/e4/parts/CkEditor-toolbarGroups.json
rename to org.argeo.cms.e4.rap/src/org/argeo/cms/e4/rap/parts/CkEditor-toolbarGroups.json
diff --git a/org.argeo.cms.e4/src/org/argeo/cms/e4/parts/HtmlEditor.java b/org.argeo.cms.e4.rap/src/org/argeo/cms/e4/rap/parts/HtmlEditor.java
similarity index 99%
rename from org.argeo.cms.e4/src/org/argeo/cms/e4/parts/HtmlEditor.java
rename to org.argeo.cms.e4.rap/src/org/argeo/cms/e4/rap/parts/HtmlEditor.java
index 9b8c2d0b6..68963f9b5 100644
--- a/org.argeo.cms.e4/src/org/argeo/cms/e4/parts/HtmlEditor.java
+++ b/org.argeo.cms.e4.rap/src/org/argeo/cms/e4/rap/parts/HtmlEditor.java
@@ -1,4 +1,4 @@
-package org.argeo.cms.e4.parts;
+package org.argeo.cms.e4.rap.parts;
 
 import java.io.IOException;
 import java.nio.charset.StandardCharsets;
diff --git a/org.argeo.cms.e4/src/org/argeo/cms/e4/parts/test.json b/org.argeo.cms.e4.rap/src/org/argeo/cms/e4/rap/parts/test.json
similarity index 100%
rename from org.argeo.cms.e4/src/org/argeo/cms/e4/parts/test.json
rename to org.argeo.cms.e4.rap/src/org/argeo/cms/e4/rap/parts/test.json
diff --git a/org.argeo.cms.e4/bnd.bnd b/org.argeo.cms.e4/bnd.bnd
index 700bdcb52..a851c7739 100644
--- a/org.argeo.cms.e4/bnd.bnd
+++ b/org.argeo.cms.e4/bnd.bnd
@@ -12,5 +12,4 @@ org.argeo.jcr.docbook,\
 org.eclipse.core.commands.common,\
 org.eclipse.jface.window,\
 org.argeo.cms.widgets.auth,\
-org.eclipse.nebula.widgets.richtext;resolution:=optional,\
 *
-- 
2.30.2