Update package imports to change in RAP (Part 2)
Package org.eclipse.rwt has been moved to org.eclipse.rap in RAP commit
01da7187a68224ef205c15495e205839db00dc68
See bug 272792: Non-conforming use of namespace org.eclipse.rwt
https://bugs.eclipse.org/bugs/show_bug.cgi?id=272792
diff --git a/bundles/org.eclipse.rap.clientscripting.demo/src/org/eclipse/rap/clientscripting/demo/Demo.java b/bundles/org.eclipse.rap.clientscripting.demo/src/org/eclipse/rap/clientscripting/demo/Demo.java
index 2086b00..0894080 100644
--- a/bundles/org.eclipse.rap.clientscripting.demo/src/org/eclipse/rap/clientscripting/demo/Demo.java
+++ b/bundles/org.eclipse.rap.clientscripting.demo/src/org/eclipse/rap/clientscripting/demo/Demo.java
@@ -10,7 +10,7 @@
******************************************************************************/
package org.eclipse.rap.clientscripting.demo;
-import org.eclipse.rwt.lifecycle.IEntryPoint;
+import org.eclipse.rap.rwt.lifecycle.IEntryPoint;
import org.eclipse.swt.SWT;
import org.eclipse.swt.events.FocusAdapter;
import org.eclipse.swt.events.FocusEvent;
diff --git a/bundles/org.eclipse.rap.clientscripting/META-INF/MANIFEST.MF b/bundles/org.eclipse.rap.clientscripting/META-INF/MANIFEST.MF
index 8c257c9..90aa381 100644
--- a/bundles/org.eclipse.rap.clientscripting/META-INF/MANIFEST.MF
+++ b/bundles/org.eclipse.rap.clientscripting/META-INF/MANIFEST.MF
@@ -8,11 +8,11 @@
org.eclipse.rap.clientscripting.internal;version="0.1.100";x-friends:="org.eclipse.rap.clientscripting.test",
org.eclipse.rap.clientscripting.internal.resources;version="0.1.100";x-friends:="org.eclipse.rap.clientscripting.jstest"
Bundle-Vendor: Eclipse.org - RAP Incubator
-Import-Package: org.eclipse.rap.rwt.internal.protocol;version="[2.0.0,3.0.0)",
- org.eclipse.rwt;version="[2.0.0,3.0.0)",
- org.eclipse.rwt.lifecycle;version="[2.0.0,3.0.0)",
- org.eclipse.rwt.resources;version="[2.0.0,3.0.0)",
- org.eclipse.rwt.service;version="[2.0.0,3.0.0)",
+Import-Package: org.eclipse.rap.rwt;version="[2.0.0,3.0.0)",
+ org.eclipse.rap.rwt.internal.protocol;version="[2.0.0,3.0.0)",
+ org.eclipse.rap.rwt.lifecycle;version="[2.0.0,3.0.0)",
+ org.eclipse.rap.rwt.resources;version="[2.0.0,3.0.0)",
+ org.eclipse.rap.rwt.service;version="[2.0.0,3.0.0)",
org.eclipse.swt,
org.eclipse.swt.events,
org.eclipse.swt.widgets
diff --git a/bundles/org.eclipse.rap.clientscripting/src/org/eclipse/rap/clientscripting/ClientListener.java b/bundles/org.eclipse.rap.clientscripting/src/org/eclipse/rap/clientscripting/ClientListener.java
index 2a24ae4..bef9179 100644
--- a/bundles/org.eclipse.rap.clientscripting/src/org/eclipse/rap/clientscripting/ClientListener.java
+++ b/bundles/org.eclipse.rap.clientscripting/src/org/eclipse/rap/clientscripting/ClientListener.java
@@ -19,8 +19,8 @@
import org.eclipse.rap.clientscripting.internal.ClientListenerManager;
import org.eclipse.rap.clientscripting.internal.IClientObjectAdapter2;
import org.eclipse.rap.clientscripting.internal.ClientObjectAdapterImpl;
+import org.eclipse.rap.rwt.Adaptable;
import org.eclipse.rap.rwt.internal.protocol.IClientObjectAdapter;
-import org.eclipse.rwt.Adaptable;
import org.eclipse.swt.SWT;
import org.eclipse.swt.events.DisposeEvent;
import org.eclipse.swt.events.DisposeListener;
diff --git a/bundles/org.eclipse.rap.clientscripting/src/org/eclipse/rap/clientscripting/internal/ClientListenerBinding.java b/bundles/org.eclipse.rap.clientscripting/src/org/eclipse/rap/clientscripting/internal/ClientListenerBinding.java
index 94f3bbe..515cac1 100644
--- a/bundles/org.eclipse.rap.clientscripting/src/org/eclipse/rap/clientscripting/internal/ClientListenerBinding.java
+++ b/bundles/org.eclipse.rap.clientscripting/src/org/eclipse/rap/clientscripting/internal/ClientListenerBinding.java
@@ -11,8 +11,8 @@
package org.eclipse.rap.clientscripting.internal;
import org.eclipse.rap.clientscripting.ClientListener;
+import org.eclipse.rap.rwt.Adaptable;
import org.eclipse.rap.rwt.internal.protocol.IClientObjectAdapter;
-import org.eclipse.rwt.Adaptable;
import org.eclipse.swt.widgets.Widget;
diff --git a/bundles/org.eclipse.rap.clientscripting/src/org/eclipse/rap/clientscripting/internal/ClientListenerBindingSynchronizer.java b/bundles/org.eclipse.rap.clientscripting/src/org/eclipse/rap/clientscripting/internal/ClientListenerBindingSynchronizer.java
index 283a036..03c935e 100644
--- a/bundles/org.eclipse.rap.clientscripting/src/org/eclipse/rap/clientscripting/internal/ClientListenerBindingSynchronizer.java
+++ b/bundles/org.eclipse.rap.clientscripting/src/org/eclipse/rap/clientscripting/internal/ClientListenerBindingSynchronizer.java
@@ -11,10 +11,10 @@
package org.eclipse.rap.clientscripting.internal;
import org.eclipse.rap.clientscripting.ClientListener;
+import org.eclipse.rap.rwt.Adaptable;
import org.eclipse.rap.rwt.internal.protocol.IClientObject;
import org.eclipse.rap.rwt.internal.protocol.IClientObjectAdapter;
-import org.eclipse.rwt.Adaptable;
-import org.eclipse.rwt.lifecycle.WidgetUtil;
+import org.eclipse.rap.rwt.lifecycle.WidgetUtil;
@SuppressWarnings( "restriction" )
diff --git a/bundles/org.eclipse.rap.clientscripting/src/org/eclipse/rap/clientscripting/internal/ClientListenerManager.java b/bundles/org.eclipse.rap.clientscripting/src/org/eclipse/rap/clientscripting/internal/ClientListenerManager.java
index ff05e66..bc76b46 100644
--- a/bundles/org.eclipse.rap.clientscripting/src/org/eclipse/rap/clientscripting/internal/ClientListenerManager.java
+++ b/bundles/org.eclipse.rap.clientscripting/src/org/eclipse/rap/clientscripting/internal/ClientListenerManager.java
@@ -15,7 +15,7 @@
import java.util.Collections;
import org.eclipse.rap.clientscripting.ClientListener;
-import org.eclipse.rwt.SessionSingletonBase;
+import org.eclipse.rap.rwt.SessionSingletonBase;
public class ClientListenerManager {
diff --git a/bundles/org.eclipse.rap.clientscripting/src/org/eclipse/rap/clientscripting/internal/ClientScriptingRenderer.java b/bundles/org.eclipse.rap.clientscripting/src/org/eclipse/rap/clientscripting/internal/ClientScriptingRenderer.java
index 2f24f55..f0839d2 100644
--- a/bundles/org.eclipse.rap.clientscripting/src/org/eclipse/rap/clientscripting/internal/ClientScriptingRenderer.java
+++ b/bundles/org.eclipse.rap.clientscripting/src/org/eclipse/rap/clientscripting/internal/ClientScriptingRenderer.java
@@ -13,13 +13,13 @@
import java.util.Collection;
import org.eclipse.rap.clientscripting.ClientListener;
+import org.eclipse.rap.rwt.RWT;
import org.eclipse.rap.rwt.internal.protocol.ClientObjectFactory;
import org.eclipse.rap.rwt.internal.protocol.IClientObject;
-import org.eclipse.rwt.RWT;
-import org.eclipse.rwt.lifecycle.PhaseEvent;
-import org.eclipse.rwt.lifecycle.PhaseId;
-import org.eclipse.rwt.lifecycle.PhaseListener;
-import org.eclipse.rwt.service.IApplicationStore;
+import org.eclipse.rap.rwt.lifecycle.PhaseEvent;
+import org.eclipse.rap.rwt.lifecycle.PhaseId;
+import org.eclipse.rap.rwt.lifecycle.PhaseListener;
+import org.eclipse.rap.rwt.service.IApplicationStore;
@SuppressWarnings( { "restriction", "serial" } )
diff --git a/bundles/org.eclipse.rap.clientscripting/src/org/eclipse/rap/clientscripting/internal/resources/ClientScriptingResource.java b/bundles/org.eclipse.rap.clientscripting/src/org/eclipse/rap/clientscripting/internal/resources/ClientScriptingResource.java
index de97694..94f1fe7 100644
--- a/bundles/org.eclipse.rap.clientscripting/src/org/eclipse/rap/clientscripting/internal/resources/ClientScriptingResource.java
+++ b/bundles/org.eclipse.rap.clientscripting/src/org/eclipse/rap/clientscripting/internal/resources/ClientScriptingResource.java
@@ -10,8 +10,8 @@
******************************************************************************/
package org.eclipse.rap.clientscripting.internal.resources;
-import org.eclipse.rwt.resources.IResource;
-import org.eclipse.rwt.resources.IResourceManager.RegisterOptions;
+import org.eclipse.rap.rwt.resources.IResource;
+import org.eclipse.rap.rwt.resources.IResourceManager.RegisterOptions;
public abstract class ClientScriptingResource implements IResource {
diff --git a/bundles/org.eclipse.rap.demo.clientscripting/src/org/eclipse/rap/demo/clientscripting/internal/ValidationExampleContribution.java b/bundles/org.eclipse.rap.demo.clientscripting/src/org/eclipse/rap/demo/clientscripting/internal/ValidationExampleContribution.java
index dc56882..99a3834 100644
--- a/bundles/org.eclipse.rap.demo.clientscripting/src/org/eclipse/rap/demo/clientscripting/internal/ValidationExampleContribution.java
+++ b/bundles/org.eclipse.rap.demo.clientscripting/src/org/eclipse/rap/demo/clientscripting/internal/ValidationExampleContribution.java
@@ -13,8 +13,8 @@
import org.eclipse.rap.clientscripting.internal.resources.ClientScriptingResource;
import org.eclipse.rap.examples.IExampleContribution;
import org.eclipse.rap.examples.IExamplePage;
-import org.eclipse.rwt.application.Application;
-import org.eclipse.rwt.resources.IResource;
+import org.eclipse.rap.rwt.application.Application;
+import org.eclipse.rap.rwt.resources.IResource;
@SuppressWarnings( "restriction" )
diff --git a/tests/org.eclipse.rap.clientscripting.test/src/org/eclipse/rap/clientscripting/ClientListener_Test.java b/tests/org.eclipse.rap.clientscripting.test/src/org/eclipse/rap/clientscripting/ClientListener_Test.java
index d6fd04d..7f60a41 100644
--- a/tests/org.eclipse.rap.clientscripting.test/src/org/eclipse/rap/clientscripting/ClientListener_Test.java
+++ b/tests/org.eclipse.rap.clientscripting.test/src/org/eclipse/rap/clientscripting/ClientListener_Test.java
@@ -17,8 +17,8 @@
import org.eclipse.rap.clientscripting.internal.ClientListenerManager;
import org.eclipse.rap.clientscripting.internal.IClientObjectAdapter2;
import org.eclipse.rap.clientscripting.test.TestUtil;
+import org.eclipse.rap.rwt.lifecycle.PhaseId;
import org.eclipse.rap.rwt.testfixture.Fixture;
-import org.eclipse.rwt.lifecycle.PhaseId;
import org.eclipse.swt.SWT;
import org.eclipse.swt.widgets.Display;
import org.eclipse.swt.widgets.Label;
diff --git a/tests/org.eclipse.rap.clientscripting.test/src/org/eclipse/rap/clientscripting/internal/ClientListenerBindingSynchronizer_Test.java b/tests/org.eclipse.rap.clientscripting.test/src/org/eclipse/rap/clientscripting/internal/ClientListenerBindingSynchronizer_Test.java
index f305ff9..6688465 100644
--- a/tests/org.eclipse.rap.clientscripting.test/src/org/eclipse/rap/clientscripting/internal/ClientListenerBindingSynchronizer_Test.java
+++ b/tests/org.eclipse.rap.clientscripting.test/src/org/eclipse/rap/clientscripting/internal/ClientListenerBindingSynchronizer_Test.java
@@ -15,10 +15,10 @@
import org.eclipse.rap.clientscripting.ClientListener;
import org.eclipse.rap.rwt.internal.protocol.ClientObjectFactory;
import org.eclipse.rap.rwt.internal.protocol.IClientObject;
+import org.eclipse.rap.rwt.lifecycle.WidgetUtil;
import org.eclipse.rap.rwt.testfixture.Fixture;
import org.eclipse.rap.rwt.testfixture.Message;
import org.eclipse.rap.rwt.testfixture.Message.CreateOperation;
-import org.eclipse.rwt.lifecycle.WidgetUtil;
import org.eclipse.swt.SWT;
import org.eclipse.swt.widgets.Display;
import org.eclipse.swt.widgets.Label;
diff --git a/tests/org.eclipse.rap.clientscripting.test/src/org/eclipse/rap/clientscripting/internal/ClientObjectUtil.java b/tests/org.eclipse.rap.clientscripting.test/src/org/eclipse/rap/clientscripting/internal/ClientObjectUtil.java
index aa99c28..e30d672 100644
--- a/tests/org.eclipse.rap.clientscripting.test/src/org/eclipse/rap/clientscripting/internal/ClientObjectUtil.java
+++ b/tests/org.eclipse.rap.clientscripting.test/src/org/eclipse/rap/clientscripting/internal/ClientObjectUtil.java
@@ -10,8 +10,8 @@
******************************************************************************/
package org.eclipse.rap.clientscripting.internal;
+import org.eclipse.rap.rwt.Adaptable;
import org.eclipse.rap.rwt.internal.protocol.IClientObjectAdapter;
-import org.eclipse.rwt.Adaptable;
@SuppressWarnings( "restriction" )
