http project splitted into two parts: messages and services
diff --git a/services/org.eclipse.sensinact.studio.http/.classpath b/services/org.eclipse.sensinact.studio.http.messages/.classpath
similarity index 94%
rename from services/org.eclipse.sensinact.studio.http/.classpath
rename to services/org.eclipse.sensinact.studio.http.messages/.classpath
index 098194c..eca7bdb 100644
--- a/services/org.eclipse.sensinact.studio.http/.classpath
+++ b/services/org.eclipse.sensinact.studio.http.messages/.classpath
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?>
<classpath>
- <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.7"/>
+ <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.8"/>
<classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/>
<classpathentry kind="src" path="src"/>
<classpathentry kind="output" path="bin"/>
diff --git a/services/org.eclipse.sensinact.studio.http/.project b/services/org.eclipse.sensinact.studio.http.messages/.project
similarity index 91%
rename from services/org.eclipse.sensinact.studio.http/.project
rename to services/org.eclipse.sensinact.studio.http.messages/.project
index 2ea29b1..76b5d3b 100644
--- a/services/org.eclipse.sensinact.studio.http/.project
+++ b/services/org.eclipse.sensinact.studio.http.messages/.project
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?>
<projectDescription>
- <name>org.eclipse.sensinact.studio.http</name>
+ <name>org.eclipse.sensinact.studio.http.messages</name>
<comment></comment>
<projects>
</projects>
diff --git a/services/org.eclipse.sensinact.studio.http.messages/.settings/org.eclipse.jdt.core.prefs b/services/org.eclipse.sensinact.studio.http.messages/.settings/org.eclipse.jdt.core.prefs
new file mode 100644
index 0000000..0c68a61
--- /dev/null
+++ b/services/org.eclipse.sensinact.studio.http.messages/.settings/org.eclipse.jdt.core.prefs
@@ -0,0 +1,7 @@
+eclipse.preferences.version=1
+org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled
+org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.8
+org.eclipse.jdt.core.compiler.compliance=1.8
+org.eclipse.jdt.core.compiler.problem.assertIdentifier=error
+org.eclipse.jdt.core.compiler.problem.enumIdentifier=error
+org.eclipse.jdt.core.compiler.source=1.8
diff --git a/services/org.eclipse.sensinact.studio.http.messages/META-INF/MANIFEST.MF b/services/org.eclipse.sensinact.studio.http.messages/META-INF/MANIFEST.MF
new file mode 100644
index 0000000..cd2490a
--- /dev/null
+++ b/services/org.eclipse.sensinact.studio.http.messages/META-INF/MANIFEST.MF
@@ -0,0 +1,30 @@
+Manifest-Version: 1.0
+Bundle-ManifestVersion: 2
+Bundle-Name: Http-messages
+Bundle-SymbolicName: org.eclipse.sensinact.studio.http.messages
+Bundle-Version: 1.0.0.qualifier
+Bundle-Activator: org.eclipse.sensinact.studio.http.messages.Activator
+Require-Bundle: org.eclipse.core.runtime,
+ org.json,
+ org.restlet,
+ org.eclipse.sensinact.studio.model.resource,
+ org.apache.log4j,
+ org.eclipse.sensinact.studio.preferences,
+ com.fasterxml.jackson.core.jackson-databind;bundle-version="2.6.2",
+ org.restlet.ext.jackson;bundle-version="2.2.3",
+ com.fasterxml.jackson.core.jackson-core;bundle-version="2.6.2",
+ org.eclipse.jetty.websocket.common;bundle-version="9.2.15"
+Bundle-RequiredExecutionEnvironment: JavaSE-1.8
+Bundle-ActivationPolicy: lazy
+Export-Package: org.eclipse.sensinact.studio.http.messages.snamessage,
+ org.eclipse.sensinact.studio.http.messages.snamessage.actresponse,
+ org.eclipse.sensinact.studio.http.messages.snamessage.attributevalueupdated,
+ org.eclipse.sensinact.studio.http.messages.snamessage.basic,
+ org.eclipse.sensinact.studio.http.messages.snamessage.completelist,
+ org.eclipse.sensinact.studio.http.messages.snamessage.describeresource,
+ org.eclipse.sensinact.studio.http.messages.snamessage.getresponse,
+ org.eclipse.sensinact.studio.http.messages.snamessage.lifecycle,
+ org.eclipse.sensinact.studio.http.messages.snamessage.resourceslist,
+ org.eclipse.sensinact.studio.http.messages.snamessage.setresponse,
+ org.eclipse.sensinact.studio.http.messages.snamessage.subscriberesponse,
+ org.eclipse.sensinact.studio.http.messages.snamessage.tokencreation
diff --git a/services/org.eclipse.sensinact.studio.http/about.html b/services/org.eclipse.sensinact.studio.http.messages/about.html
similarity index 100%
rename from services/org.eclipse.sensinact.studio.http/about.html
rename to services/org.eclipse.sensinact.studio.http.messages/about.html
diff --git a/services/org.eclipse.sensinact.studio.http.messages/build.properties b/services/org.eclipse.sensinact.studio.http.messages/build.properties
new file mode 100644
index 0000000..34d2e4d
--- /dev/null
+++ b/services/org.eclipse.sensinact.studio.http.messages/build.properties
@@ -0,0 +1,4 @@
+source.. = src/
+output.. = bin/
+bin.includes = META-INF/,\
+ .
diff --git a/services/org.eclipse.sensinact.studio.http.messages/src/org/eclipse/sensinact/studio/http/messages/Activator.java b/services/org.eclipse.sensinact.studio.http.messages/src/org/eclipse/sensinact/studio/http/messages/Activator.java
new file mode 100644
index 0000000..bd273bb
--- /dev/null
+++ b/services/org.eclipse.sensinact.studio.http.messages/src/org/eclipse/sensinact/studio/http/messages/Activator.java
@@ -0,0 +1,30 @@
+package org.eclipse.sensinact.studio.http.messages;
+
+import org.osgi.framework.BundleActivator;
+import org.osgi.framework.BundleContext;
+
+public class Activator implements BundleActivator {
+
+ private static BundleContext context;
+
+ static BundleContext getContext() {
+ return context;
+ }
+
+ /*
+ * (non-Javadoc)
+ * @see org.osgi.framework.BundleActivator#start(org.osgi.framework.BundleContext)
+ */
+ public void start(BundleContext bundleContext) throws Exception {
+ Activator.context = bundleContext;
+ }
+
+ /*
+ * (non-Javadoc)
+ * @see org.osgi.framework.BundleActivator#stop(org.osgi.framework.BundleContext)
+ */
+ public void stop(BundleContext bundleContext) throws Exception {
+ Activator.context = null;
+ }
+
+}
diff --git a/services/org.eclipse.sensinact.studio.http/src/org/eclipse/sensinact/studio/http/HTTP_CODE.java b/services/org.eclipse.sensinact.studio.http.messages/src/org/eclipse/sensinact/studio/http/messages/HTTP_CODE.java
similarity index 96%
rename from services/org.eclipse.sensinact.studio.http/src/org/eclipse/sensinact/studio/http/HTTP_CODE.java
rename to services/org.eclipse.sensinact.studio.http.messages/src/org/eclipse/sensinact/studio/http/messages/HTTP_CODE.java
index 51b3fc4..8f5ab89 100644
--- a/services/org.eclipse.sensinact.studio.http/src/org/eclipse/sensinact/studio/http/HTTP_CODE.java
+++ b/services/org.eclipse.sensinact.studio.http.messages/src/org/eclipse/sensinact/studio/http/messages/HTTP_CODE.java
@@ -8,9 +8,7 @@
* Contributors:
* CEA - initial API and implementation and/or initial documentation
*/
-package org.eclipse.sensinact.studio.http;
-
-import org.restlet.data.Status;
+package org.eclipse.sensinact.studio.http.messages;
/**
* @author Etienne Gandrille
@@ -135,8 +133,4 @@
return hc;
throw new IllegalArgumentException("Unknown HTTP CODE " + code);
}
-
- public static HTTP_CODE toCode(Status status) {
- return toCode(status.getCode());
- }
}
diff --git a/services/org.eclipse.sensinact.studio.http/src/org/eclipse/sensinact/studio/http/client/snamessage/MsgFactory.java b/services/org.eclipse.sensinact.studio.http.messages/src/org/eclipse/sensinact/studio/http/messages/snamessage/MsgFactory.java
similarity index 90%
rename from services/org.eclipse.sensinact.studio.http/src/org/eclipse/sensinact/studio/http/client/snamessage/MsgFactory.java
rename to services/org.eclipse.sensinact.studio.http.messages/src/org/eclipse/sensinact/studio/http/messages/snamessage/MsgFactory.java
index 5645a5e..e2bf2a5 100644
--- a/services/org.eclipse.sensinact.studio.http/src/org/eclipse/sensinact/studio/http/client/snamessage/MsgFactory.java
+++ b/services/org.eclipse.sensinact.studio.http.messages/src/org/eclipse/sensinact/studio/http/messages/snamessage/MsgFactory.java
@@ -8,14 +8,14 @@
* Contributors:
* CEA - initial API and implementation and/or initial documentation
*/
-package org.eclipse.sensinact.studio.http.client.snamessage;
+package org.eclipse.sensinact.studio.http.messages.snamessage;
import java.io.IOException;
import org.apache.log4j.Logger;
-import org.eclipse.sensinact.studio.http.client.snamessage.basic.MsgExceptionError;
-import org.eclipse.sensinact.studio.http.client.snamessage.basic.MsgHttpError;
-import org.eclipse.sensinact.studio.http.client.snamessage.basic.MsgOk;
+import org.eclipse.sensinact.studio.http.messages.snamessage.basic.MsgExceptionError;
+import org.eclipse.sensinact.studio.http.messages.snamessage.basic.MsgHttpError;
+import org.eclipse.sensinact.studio.http.messages.snamessage.basic.MsgOk;
import org.eclipse.sensinact.studio.model.resource.utils.Segments;
import org.json.JSONObject;
diff --git a/services/org.eclipse.sensinact.studio.http/src/org/eclipse/sensinact/studio/http/client/snamessage/MsgSensinact.java b/services/org.eclipse.sensinact.studio.http.messages/src/org/eclipse/sensinact/studio/http/messages/snamessage/MsgSensinact.java
similarity index 92%
rename from services/org.eclipse.sensinact.studio.http/src/org/eclipse/sensinact/studio/http/client/snamessage/MsgSensinact.java
rename to services/org.eclipse.sensinact.studio.http.messages/src/org/eclipse/sensinact/studio/http/messages/snamessage/MsgSensinact.java
index 7e5f182..f9c05e3 100644
--- a/services/org.eclipse.sensinact.studio.http/src/org/eclipse/sensinact/studio/http/client/snamessage/MsgSensinact.java
+++ b/services/org.eclipse.sensinact.studio.http.messages/src/org/eclipse/sensinact/studio/http/messages/snamessage/MsgSensinact.java
@@ -8,7 +8,7 @@
* Contributors:
* CEA - initial API and implementation and/or initial documentation
*/
-package org.eclipse.sensinact.studio.http.client.snamessage;
+package org.eclipse.sensinact.studio.http.messages.snamessage;
/**
* @author Etienne Gandrille
diff --git a/services/org.eclipse.sensinact.studio.http/src/org/eclipse/sensinact/studio/http/client/snamessage/MsgTypes.java b/services/org.eclipse.sensinact.studio.http.messages/src/org/eclipse/sensinact/studio/http/messages/snamessage/MsgTypes.java
similarity index 67%
rename from services/org.eclipse.sensinact.studio.http/src/org/eclipse/sensinact/studio/http/client/snamessage/MsgTypes.java
rename to services/org.eclipse.sensinact.studio.http.messages/src/org/eclipse/sensinact/studio/http/messages/snamessage/MsgTypes.java
index f1cbb19..194535a 100644
--- a/services/org.eclipse.sensinact.studio.http/src/org/eclipse/sensinact/studio/http/client/snamessage/MsgTypes.java
+++ b/services/org.eclipse.sensinact.studio.http.messages/src/org/eclipse/sensinact/studio/http/messages/snamessage/MsgTypes.java
@@ -8,19 +8,19 @@
* Contributors:
* CEA - initial API and implementation and/or initial documentation
*/
-package org.eclipse.sensinact.studio.http.client.snamessage;
+package org.eclipse.sensinact.studio.http.messages.snamessage;
-import org.eclipse.sensinact.studio.http.client.snamessage.completelist.MsgCompleteList;
-import org.eclipse.sensinact.studio.http.client.snamessage.describeresource.MsgDescribeRessource;
-import org.eclipse.sensinact.studio.http.client.snamessage.lifecycle.*;
-import org.eclipse.sensinact.studio.http.client.snamessage.resourceslist.MsgResourcesList;
-import org.eclipse.sensinact.studio.http.client.snamessage.setresponse.MsgSetResponse;
-import org.eclipse.sensinact.studio.http.client.snamessage.actresponse.MsgActResponse;
-import org.eclipse.sensinact.studio.http.client.snamessage.attributevalueupdated.MsgAttributeValueUpdated;
-import org.eclipse.sensinact.studio.http.client.snamessage.getresponse.MsgGetResponse;
-import org.eclipse.sensinact.studio.http.client.snamessage.subscriberesponse.MsgSubscribeResponse;
-import org.eclipse.sensinact.studio.http.client.snamessage.tokencreation.MsgTokenCreation;
-import org.eclipse.sensinact.studio.http.client.snamessage.unsubscriberesponse.MsgUnsubscribeResponse;
+import org.eclipse.sensinact.studio.http.messages.snamessage.actresponse.MsgActResponse;
+import org.eclipse.sensinact.studio.http.messages.snamessage.attributevalueupdated.MsgAttributeValueUpdated;
+import org.eclipse.sensinact.studio.http.messages.snamessage.completelist.MsgCompleteList;
+import org.eclipse.sensinact.studio.http.messages.snamessage.describeresource.MsgDescribeRessource;
+import org.eclipse.sensinact.studio.http.messages.snamessage.getresponse.MsgGetResponse;
+import org.eclipse.sensinact.studio.http.messages.snamessage.lifecycle.*;
+import org.eclipse.sensinact.studio.http.messages.snamessage.resourceslist.MsgResourcesList;
+import org.eclipse.sensinact.studio.http.messages.snamessage.setresponse.MsgSetResponse;
+import org.eclipse.sensinact.studio.http.messages.snamessage.subscriberesponse.MsgSubscribeResponse;
+import org.eclipse.sensinact.studio.http.messages.snamessage.tokencreation.MsgTokenCreation;
+import org.eclipse.sensinact.studio.http.messages.snamessage.unsubscriberesponse.MsgUnsubscribeResponse;
/**
* @author Etienne Gandrille
diff --git a/services/org.eclipse.sensinact.studio.http/src/org/eclipse/sensinact/studio/http/client/snamessage/NameTypeValueDeserializer.java b/services/org.eclipse.sensinact.studio.http.messages/src/org/eclipse/sensinact/studio/http/messages/snamessage/NameTypeValueDeserializer.java
similarity index 96%
rename from services/org.eclipse.sensinact.studio.http/src/org/eclipse/sensinact/studio/http/client/snamessage/NameTypeValueDeserializer.java
rename to services/org.eclipse.sensinact.studio.http.messages/src/org/eclipse/sensinact/studio/http/messages/snamessage/NameTypeValueDeserializer.java
index 283cbd2..82451cd 100644
--- a/services/org.eclipse.sensinact.studio.http/src/org/eclipse/sensinact/studio/http/client/snamessage/NameTypeValueDeserializer.java
+++ b/services/org.eclipse.sensinact.studio.http.messages/src/org/eclipse/sensinact/studio/http/messages/snamessage/NameTypeValueDeserializer.java
@@ -8,7 +8,7 @@
* Contributors:
* CEA - initial API and implementation and/or initial documentation
*/
-package org.eclipse.sensinact.studio.http.client.snamessage;
+package org.eclipse.sensinact.studio.http.messages.snamessage;
import java.io.IOException;
import java.util.Optional;
diff --git a/services/org.eclipse.sensinact.studio.http/src/org/eclipse/sensinact/studio/http/client/snamessage/ObjectNameTypeValue.java b/services/org.eclipse.sensinact.studio.http.messages/src/org/eclipse/sensinact/studio/http/messages/snamessage/ObjectNameTypeValue.java
similarity index 97%
rename from services/org.eclipse.sensinact.studio.http/src/org/eclipse/sensinact/studio/http/client/snamessage/ObjectNameTypeValue.java
rename to services/org.eclipse.sensinact.studio.http.messages/src/org/eclipse/sensinact/studio/http/messages/snamessage/ObjectNameTypeValue.java
index f4b5cbc..ceec859 100644
--- a/services/org.eclipse.sensinact.studio.http/src/org/eclipse/sensinact/studio/http/client/snamessage/ObjectNameTypeValue.java
+++ b/services/org.eclipse.sensinact.studio.http.messages/src/org/eclipse/sensinact/studio/http/messages/snamessage/ObjectNameTypeValue.java
@@ -8,7 +8,7 @@
* Contributors:
* CEA - initial API and implementation and/or initial documentation
*/
-package org.eclipse.sensinact.studio.http.client.snamessage;
+package org.eclipse.sensinact.studio.http.messages.snamessage;
import java.util.Optional;
diff --git a/services/org.eclipse.sensinact.studio.http/src/org/eclipse/sensinact/studio/http/client/snamessage/ValueType.java b/services/org.eclipse.sensinact.studio.http.messages/src/org/eclipse/sensinact/studio/http/messages/snamessage/ValueType.java
similarity index 96%
rename from services/org.eclipse.sensinact.studio.http/src/org/eclipse/sensinact/studio/http/client/snamessage/ValueType.java
rename to services/org.eclipse.sensinact.studio.http.messages/src/org/eclipse/sensinact/studio/http/messages/snamessage/ValueType.java
index ed22e08..5b905ca 100644
--- a/services/org.eclipse.sensinact.studio.http/src/org/eclipse/sensinact/studio/http/client/snamessage/ValueType.java
+++ b/services/org.eclipse.sensinact.studio.http.messages/src/org/eclipse/sensinact/studio/http/messages/snamessage/ValueType.java
@@ -8,7 +8,7 @@
* Contributors:
* CEA - initial API and implementation and/or initial documentation
*/
-package org.eclipse.sensinact.studio.http.client.snamessage;
+package org.eclipse.sensinact.studio.http.messages.snamessage;
import java.util.ArrayList;
import java.util.Iterator;
diff --git a/services/org.eclipse.sensinact.studio.http/src/org/eclipse/sensinact/studio/http/client/snamessage/actresponse/MsgActResponse.java b/services/org.eclipse.sensinact.studio.http.messages/src/org/eclipse/sensinact/studio/http/messages/snamessage/actresponse/MsgActResponse.java
similarity index 91%
rename from services/org.eclipse.sensinact.studio.http/src/org/eclipse/sensinact/studio/http/client/snamessage/actresponse/MsgActResponse.java
rename to services/org.eclipse.sensinact.studio.http.messages/src/org/eclipse/sensinact/studio/http/messages/snamessage/actresponse/MsgActResponse.java
index adbe567..4910a67 100644
--- a/services/org.eclipse.sensinact.studio.http/src/org/eclipse/sensinact/studio/http/client/snamessage/actresponse/MsgActResponse.java
+++ b/services/org.eclipse.sensinact.studio.http.messages/src/org/eclipse/sensinact/studio/http/messages/snamessage/actresponse/MsgActResponse.java
@@ -8,12 +8,12 @@
* Contributors:
* CEA - initial API and implementation and/or initial documentation
*/
-package org.eclipse.sensinact.studio.http.client.snamessage.actresponse;
+package org.eclipse.sensinact.studio.http.messages.snamessage.actresponse;
import java.util.List;
-import org.eclipse.sensinact.studio.http.client.snamessage.MsgSensinact;
-import org.eclipse.sensinact.studio.http.client.snamessage.ObjectNameTypeValue;
+import org.eclipse.sensinact.studio.http.messages.snamessage.MsgSensinact;
+import org.eclipse.sensinact.studio.http.messages.snamessage.ObjectNameTypeValue;
/**
* @author Etienne Gandrille
diff --git a/services/org.eclipse.sensinact.studio.http/src/org/eclipse/sensinact/studio/http/client/snamessage/actresponse/ObjectResponse.java b/services/org.eclipse.sensinact.studio.http.messages/src/org/eclipse/sensinact/studio/http/messages/snamessage/actresponse/ObjectResponse.java
similarity index 96%
rename from services/org.eclipse.sensinact.studio.http/src/org/eclipse/sensinact/studio/http/client/snamessage/actresponse/ObjectResponse.java
rename to services/org.eclipse.sensinact.studio.http.messages/src/org/eclipse/sensinact/studio/http/messages/snamessage/actresponse/ObjectResponse.java
index bd38927..82e401a 100644
--- a/services/org.eclipse.sensinact.studio.http/src/org/eclipse/sensinact/studio/http/client/snamessage/actresponse/ObjectResponse.java
+++ b/services/org.eclipse.sensinact.studio.http.messages/src/org/eclipse/sensinact/studio/http/messages/snamessage/actresponse/ObjectResponse.java
@@ -8,7 +8,7 @@
* Contributors:
* CEA - initial API and implementation and/or initial documentation
*/
-package org.eclipse.sensinact.studio.http.client.snamessage.actresponse;
+package org.eclipse.sensinact.studio.http.messages.snamessage.actresponse;
/**
* @author Etienne Gandrille
diff --git a/services/org.eclipse.sensinact.studio.http/src/org/eclipse/sensinact/studio/http/client/snamessage/attributevalueupdated/MsgAttributeValueUpdated.java b/services/org.eclipse.sensinact.studio.http.messages/src/org/eclipse/sensinact/studio/http/messages/snamessage/attributevalueupdated/MsgAttributeValueUpdated.java
similarity index 88%
rename from services/org.eclipse.sensinact.studio.http/src/org/eclipse/sensinact/studio/http/client/snamessage/attributevalueupdated/MsgAttributeValueUpdated.java
rename to services/org.eclipse.sensinact.studio.http.messages/src/org/eclipse/sensinact/studio/http/messages/snamessage/attributevalueupdated/MsgAttributeValueUpdated.java
index 3eddca0..4dce7ce 100644
--- a/services/org.eclipse.sensinact.studio.http/src/org/eclipse/sensinact/studio/http/client/snamessage/attributevalueupdated/MsgAttributeValueUpdated.java
+++ b/services/org.eclipse.sensinact.studio.http.messages/src/org/eclipse/sensinact/studio/http/messages/snamessage/attributevalueupdated/MsgAttributeValueUpdated.java
@@ -8,11 +8,11 @@
* Contributors:
* CEA - initial API and implementation and/or initial documentation
*/
-package org.eclipse.sensinact.studio.http.client.snamessage.attributevalueupdated;
+package org.eclipse.sensinact.studio.http.messages.snamessage.attributevalueupdated;
-import org.eclipse.sensinact.studio.http.client.snamessage.MsgSensinact;
-import org.eclipse.sensinact.studio.http.client.snamessage.ObjectNameTypeValue;
+import org.eclipse.sensinact.studio.http.messages.snamessage.MsgSensinact;
+import org.eclipse.sensinact.studio.http.messages.snamessage.ObjectNameTypeValue;
/**
* @author Etienne Gandrille
diff --git a/services/org.eclipse.sensinact.studio.http.messages/src/org/eclipse/sensinact/studio/http/messages/snamessage/basic/MsgBasic.java b/services/org.eclipse.sensinact.studio.http.messages/src/org/eclipse/sensinact/studio/http/messages/snamessage/basic/MsgBasic.java
new file mode 100644
index 0000000..0cddc8b
--- /dev/null
+++ b/services/org.eclipse.sensinact.studio.http.messages/src/org/eclipse/sensinact/studio/http/messages/snamessage/basic/MsgBasic.java
@@ -0,0 +1,10 @@
+package org.eclipse.sensinact.studio.http.messages.snamessage.basic;
+
+import org.eclipse.sensinact.studio.http.messages.snamessage.MsgSensinact;
+
+public abstract class MsgBasic extends MsgSensinact {
+
+ public MsgBasic(String type) {
+ super(type);
+ }
+}
diff --git a/services/org.eclipse.sensinact.studio.http/src/org/eclipse/sensinact/studio/http/client/snamessage/basic/MsgError.java b/services/org.eclipse.sensinact.studio.http.messages/src/org/eclipse/sensinact/studio/http/messages/snamessage/basic/MsgError.java
similarity index 88%
rename from services/org.eclipse.sensinact.studio.http/src/org/eclipse/sensinact/studio/http/client/snamessage/basic/MsgError.java
rename to services/org.eclipse.sensinact.studio.http.messages/src/org/eclipse/sensinact/studio/http/messages/snamessage/basic/MsgError.java
index ce9479e..79c6753 100644
--- a/services/org.eclipse.sensinact.studio.http/src/org/eclipse/sensinact/studio/http/client/snamessage/basic/MsgError.java
+++ b/services/org.eclipse.sensinact.studio.http.messages/src/org/eclipse/sensinact/studio/http/messages/snamessage/basic/MsgError.java
@@ -8,7 +8,7 @@
* Contributors:
* CEA - initial API and implementation and/or initial documentation
*/
-package org.eclipse.sensinact.studio.http.client.snamessage.basic;
+package org.eclipse.sensinact.studio.http.messages.snamessage.basic;
/**
* @author Etienne Gandrille
diff --git a/services/org.eclipse.sensinact.studio.http/src/org/eclipse/sensinact/studio/http/client/snamessage/basic/MsgExceptionError.java b/services/org.eclipse.sensinact.studio.http.messages/src/org/eclipse/sensinact/studio/http/messages/snamessage/basic/MsgExceptionError.java
similarity index 96%
rename from services/org.eclipse.sensinact.studio.http/src/org/eclipse/sensinact/studio/http/client/snamessage/basic/MsgExceptionError.java
rename to services/org.eclipse.sensinact.studio.http.messages/src/org/eclipse/sensinact/studio/http/messages/snamessage/basic/MsgExceptionError.java
index b9ea0f2..7fbc688 100644
--- a/services/org.eclipse.sensinact.studio.http/src/org/eclipse/sensinact/studio/http/client/snamessage/basic/MsgExceptionError.java
+++ b/services/org.eclipse.sensinact.studio.http.messages/src/org/eclipse/sensinact/studio/http/messages/snamessage/basic/MsgExceptionError.java
@@ -8,7 +8,7 @@
* Contributors:
* CEA - initial API and implementation and/or initial documentation
*/
-package org.eclipse.sensinact.studio.http.client.snamessage.basic;
+package org.eclipse.sensinact.studio.http.messages.snamessage.basic;
import org.eclipse.sensinact.studio.model.resource.utils.Segments;
diff --git a/services/org.eclipse.sensinact.studio.http/src/org/eclipse/sensinact/studio/http/client/snamessage/basic/MsgHttpError.java b/services/org.eclipse.sensinact.studio.http.messages/src/org/eclipse/sensinact/studio/http/messages/snamessage/basic/MsgHttpError.java
similarity index 95%
rename from services/org.eclipse.sensinact.studio.http/src/org/eclipse/sensinact/studio/http/client/snamessage/basic/MsgHttpError.java
rename to services/org.eclipse.sensinact.studio.http.messages/src/org/eclipse/sensinact/studio/http/messages/snamessage/basic/MsgHttpError.java
index fe04115..7b7a6e7 100644
--- a/services/org.eclipse.sensinact.studio.http/src/org/eclipse/sensinact/studio/http/client/snamessage/basic/MsgHttpError.java
+++ b/services/org.eclipse.sensinact.studio.http.messages/src/org/eclipse/sensinact/studio/http/messages/snamessage/basic/MsgHttpError.java
@@ -8,7 +8,7 @@
* Contributors:
* CEA - initial API and implementation and/or initial documentation
*/
-package org.eclipse.sensinact.studio.http.client.snamessage.basic;
+package org.eclipse.sensinact.studio.http.messages.snamessage.basic;
import org.json.JSONObject;
diff --git a/services/org.eclipse.sensinact.studio.http/src/org/eclipse/sensinact/studio/http/client/snamessage/basic/MsgOk.java b/services/org.eclipse.sensinact.studio.http.messages/src/org/eclipse/sensinact/studio/http/messages/snamessage/basic/MsgOk.java
similarity index 95%
rename from services/org.eclipse.sensinact.studio.http/src/org/eclipse/sensinact/studio/http/client/snamessage/basic/MsgOk.java
rename to services/org.eclipse.sensinact.studio.http.messages/src/org/eclipse/sensinact/studio/http/messages/snamessage/basic/MsgOk.java
index 087d940..d183944 100644
--- a/services/org.eclipse.sensinact.studio.http/src/org/eclipse/sensinact/studio/http/client/snamessage/basic/MsgOk.java
+++ b/services/org.eclipse.sensinact.studio.http.messages/src/org/eclipse/sensinact/studio/http/messages/snamessage/basic/MsgOk.java
@@ -8,7 +8,7 @@
* Contributors:
* CEA - initial API and implementation and/or initial documentation
*/
-package org.eclipse.sensinact.studio.http.client.snamessage.basic;
+package org.eclipse.sensinact.studio.http.messages.snamessage.basic;
import org.json.JSONObject;
diff --git a/services/org.eclipse.sensinact.studio.http/src/org/eclipse/sensinact/studio/http/client/snamessage/completelist/MsgCompleteList.java b/services/org.eclipse.sensinact.studio.http.messages/src/org/eclipse/sensinact/studio/http/messages/snamessage/completelist/MsgCompleteList.java
similarity index 93%
rename from services/org.eclipse.sensinact.studio.http/src/org/eclipse/sensinact/studio/http/client/snamessage/completelist/MsgCompleteList.java
rename to services/org.eclipse.sensinact.studio.http.messages/src/org/eclipse/sensinact/studio/http/messages/snamessage/completelist/MsgCompleteList.java
index 50d3326..001cf58 100644
--- a/services/org.eclipse.sensinact.studio.http/src/org/eclipse/sensinact/studio/http/client/snamessage/completelist/MsgCompleteList.java
+++ b/services/org.eclipse.sensinact.studio.http.messages/src/org/eclipse/sensinact/studio/http/messages/snamessage/completelist/MsgCompleteList.java
@@ -8,11 +8,11 @@
* Contributors:
* CEA - initial API and implementation and/or initial documentation
*/
-package org.eclipse.sensinact.studio.http.client.snamessage.completelist;
+package org.eclipse.sensinact.studio.http.messages.snamessage.completelist;
import java.util.List;
-import org.eclipse.sensinact.studio.http.client.snamessage.MsgSensinact;
+import org.eclipse.sensinact.studio.http.messages.snamessage.MsgSensinact;
/**
* @author Etienne Gandrille
diff --git a/services/org.eclipse.sensinact.studio.http/src/org/eclipse/sensinact/studio/http/client/snamessage/completelist/ObjectProvider.java b/services/org.eclipse.sensinact.studio.http.messages/src/org/eclipse/sensinact/studio/http/messages/snamessage/completelist/ObjectProvider.java
similarity index 96%
rename from services/org.eclipse.sensinact.studio.http/src/org/eclipse/sensinact/studio/http/client/snamessage/completelist/ObjectProvider.java
rename to services/org.eclipse.sensinact.studio.http.messages/src/org/eclipse/sensinact/studio/http/messages/snamessage/completelist/ObjectProvider.java
index f22a73d..b83f1c1 100644
--- a/services/org.eclipse.sensinact.studio.http/src/org/eclipse/sensinact/studio/http/client/snamessage/completelist/ObjectProvider.java
+++ b/services/org.eclipse.sensinact.studio.http.messages/src/org/eclipse/sensinact/studio/http/messages/snamessage/completelist/ObjectProvider.java
@@ -8,7 +8,7 @@
* Contributors:
* CEA - initial API and implementation and/or initial documentation
*/
-package org.eclipse.sensinact.studio.http.client.snamessage.completelist;
+package org.eclipse.sensinact.studio.http.messages.snamessage.completelist;
import java.util.List;
diff --git a/services/org.eclipse.sensinact.studio.http/src/org/eclipse/sensinact/studio/http/client/snamessage/completelist/ObjectResource.java b/services/org.eclipse.sensinact.studio.http.messages/src/org/eclipse/sensinact/studio/http/messages/snamessage/completelist/ObjectResource.java
similarity index 94%
rename from services/org.eclipse.sensinact.studio.http/src/org/eclipse/sensinact/studio/http/client/snamessage/completelist/ObjectResource.java
rename to services/org.eclipse.sensinact.studio.http.messages/src/org/eclipse/sensinact/studio/http/messages/snamessage/completelist/ObjectResource.java
index 134a5b8..a010549 100644
--- a/services/org.eclipse.sensinact.studio.http/src/org/eclipse/sensinact/studio/http/client/snamessage/completelist/ObjectResource.java
+++ b/services/org.eclipse.sensinact.studio.http.messages/src/org/eclipse/sensinact/studio/http/messages/snamessage/completelist/ObjectResource.java
@@ -8,7 +8,7 @@
* Contributors:
* CEA - initial API and implementation and/or initial documentation
*/
-package org.eclipse.sensinact.studio.http.client.snamessage.completelist;
+package org.eclipse.sensinact.studio.http.messages.snamessage.completelist;
/**
* @author Etienne Gandrille
diff --git a/services/org.eclipse.sensinact.studio.http/src/org/eclipse/sensinact/studio/http/client/snamessage/completelist/ObjectService.java b/services/org.eclipse.sensinact.studio.http.messages/src/org/eclipse/sensinact/studio/http/messages/snamessage/completelist/ObjectService.java
similarity index 95%
rename from services/org.eclipse.sensinact.studio.http/src/org/eclipse/sensinact/studio/http/client/snamessage/completelist/ObjectService.java
rename to services/org.eclipse.sensinact.studio.http.messages/src/org/eclipse/sensinact/studio/http/messages/snamessage/completelist/ObjectService.java
index d0191d8..f7f36d3 100644
--- a/services/org.eclipse.sensinact.studio.http/src/org/eclipse/sensinact/studio/http/client/snamessage/completelist/ObjectService.java
+++ b/services/org.eclipse.sensinact.studio.http.messages/src/org/eclipse/sensinact/studio/http/messages/snamessage/completelist/ObjectService.java
@@ -8,7 +8,7 @@
* Contributors:
* CEA - initial API and implementation and/or initial documentation
*/
-package org.eclipse.sensinact.studio.http.client.snamessage.completelist;
+package org.eclipse.sensinact.studio.http.messages.snamessage.completelist;
import java.util.List;
diff --git a/services/org.eclipse.sensinact.studio.http/src/org/eclipse/sensinact/studio/http/client/snamessage/describeresource/MsgDescribeRessource.java b/services/org.eclipse.sensinact.studio.http.messages/src/org/eclipse/sensinact/studio/http/messages/snamessage/describeresource/MsgDescribeRessource.java
similarity index 92%
rename from services/org.eclipse.sensinact.studio.http/src/org/eclipse/sensinact/studio/http/client/snamessage/describeresource/MsgDescribeRessource.java
rename to services/org.eclipse.sensinact.studio.http.messages/src/org/eclipse/sensinact/studio/http/messages/snamessage/describeresource/MsgDescribeRessource.java
index 1fc86d3..67fbddc 100644
--- a/services/org.eclipse.sensinact.studio.http/src/org/eclipse/sensinact/studio/http/client/snamessage/describeresource/MsgDescribeRessource.java
+++ b/services/org.eclipse.sensinact.studio.http.messages/src/org/eclipse/sensinact/studio/http/messages/snamessage/describeresource/MsgDescribeRessource.java
@@ -8,9 +8,9 @@
* Contributors:
* CEA - initial API and implementation and/or initial documentation
*/
-package org.eclipse.sensinact.studio.http.client.snamessage.describeresource;
+package org.eclipse.sensinact.studio.http.messages.snamessage.describeresource;
-import org.eclipse.sensinact.studio.http.client.snamessage.MsgSensinact;
+import org.eclipse.sensinact.studio.http.messages.snamessage.MsgSensinact;
/**
* @author Etienne Gandrille
diff --git a/services/org.eclipse.sensinact.studio.http/src/org/eclipse/sensinact/studio/http/client/snamessage/describeresource/ObjectAccessMethods.java b/services/org.eclipse.sensinact.studio.http.messages/src/org/eclipse/sensinact/studio/http/messages/snamessage/describeresource/ObjectAccessMethods.java
similarity index 95%
rename from services/org.eclipse.sensinact.studio.http/src/org/eclipse/sensinact/studio/http/client/snamessage/describeresource/ObjectAccessMethods.java
rename to services/org.eclipse.sensinact.studio.http.messages/src/org/eclipse/sensinact/studio/http/messages/snamessage/describeresource/ObjectAccessMethods.java
index f8df55b..5aeff39 100644
--- a/services/org.eclipse.sensinact.studio.http/src/org/eclipse/sensinact/studio/http/client/snamessage/describeresource/ObjectAccessMethods.java
+++ b/services/org.eclipse.sensinact.studio.http.messages/src/org/eclipse/sensinact/studio/http/messages/snamessage/describeresource/ObjectAccessMethods.java
@@ -8,7 +8,7 @@
* Contributors:
* CEA - initial API and implementation and/or initial documentation
*/
-package org.eclipse.sensinact.studio.http.client.snamessage.describeresource;
+package org.eclipse.sensinact.studio.http.messages.snamessage.describeresource;
import java.util.List;
diff --git a/services/org.eclipse.sensinact.studio.http/src/org/eclipse/sensinact/studio/http/client/snamessage/describeresource/ObjectAttribute.java b/services/org.eclipse.sensinact.studio.http.messages/src/org/eclipse/sensinact/studio/http/messages/snamessage/describeresource/ObjectAttribute.java
similarity index 93%
rename from services/org.eclipse.sensinact.studio.http/src/org/eclipse/sensinact/studio/http/client/snamessage/describeresource/ObjectAttribute.java
rename to services/org.eclipse.sensinact.studio.http.messages/src/org/eclipse/sensinact/studio/http/messages/snamessage/describeresource/ObjectAttribute.java
index ba190f5..c7cb8ad 100644
--- a/services/org.eclipse.sensinact.studio.http/src/org/eclipse/sensinact/studio/http/client/snamessage/describeresource/ObjectAttribute.java
+++ b/services/org.eclipse.sensinact.studio.http.messages/src/org/eclipse/sensinact/studio/http/messages/snamessage/describeresource/ObjectAttribute.java
@@ -8,11 +8,11 @@
* Contributors:
* CEA - initial API and implementation and/or initial documentation
*/
-package org.eclipse.sensinact.studio.http.client.snamessage.describeresource;
+package org.eclipse.sensinact.studio.http.messages.snamessage.describeresource;
import java.util.List;
-import org.eclipse.sensinact.studio.http.client.snamessage.ObjectNameTypeValue;
+import org.eclipse.sensinact.studio.http.messages.snamessage.ObjectNameTypeValue;
/**
* @author Etienne Gandrille
diff --git a/services/org.eclipse.sensinact.studio.http/src/org/eclipse/sensinact/studio/http/client/snamessage/describeresource/ObjectConstraint.java b/services/org.eclipse.sensinact.studio.http.messages/src/org/eclipse/sensinact/studio/http/messages/snamessage/describeresource/ObjectConstraint.java
similarity index 96%
rename from services/org.eclipse.sensinact.studio.http/src/org/eclipse/sensinact/studio/http/client/snamessage/describeresource/ObjectConstraint.java
rename to services/org.eclipse.sensinact.studio.http.messages/src/org/eclipse/sensinact/studio/http/messages/snamessage/describeresource/ObjectConstraint.java
index dc5f76a..8a7e533 100644
--- a/services/org.eclipse.sensinact.studio.http/src/org/eclipse/sensinact/studio/http/client/snamessage/describeresource/ObjectConstraint.java
+++ b/services/org.eclipse.sensinact.studio.http.messages/src/org/eclipse/sensinact/studio/http/messages/snamessage/describeresource/ObjectConstraint.java
@@ -8,7 +8,7 @@
* Contributors:
* CEA - initial API and implementation and/or initial documentation
*/
-package org.eclipse.sensinact.studio.http.client.snamessage.describeresource;
+package org.eclipse.sensinact.studio.http.messages.snamessage.describeresource;
/**
* @author Etienne Gandrille
diff --git a/services/org.eclipse.sensinact.studio.http/src/org/eclipse/sensinact/studio/http/client/snamessage/describeresource/ObjectParameter.java b/services/org.eclipse.sensinact.studio.http.messages/src/org/eclipse/sensinact/studio/http/messages/snamessage/describeresource/ObjectParameter.java
similarity index 96%
rename from services/org.eclipse.sensinact.studio.http/src/org/eclipse/sensinact/studio/http/client/snamessage/describeresource/ObjectParameter.java
rename to services/org.eclipse.sensinact.studio.http.messages/src/org/eclipse/sensinact/studio/http/messages/snamessage/describeresource/ObjectParameter.java
index f9f88fa..de0f650 100644
--- a/services/org.eclipse.sensinact.studio.http/src/org/eclipse/sensinact/studio/http/client/snamessage/describeresource/ObjectParameter.java
+++ b/services/org.eclipse.sensinact.studio.http.messages/src/org/eclipse/sensinact/studio/http/messages/snamessage/describeresource/ObjectParameter.java
@@ -8,7 +8,7 @@
* Contributors:
* CEA - initial API and implementation and/or initial documentation
*/
-package org.eclipse.sensinact.studio.http.client.snamessage.describeresource;
+package org.eclipse.sensinact.studio.http.messages.snamessage.describeresource;
import java.util.List;
diff --git a/services/org.eclipse.sensinact.studio.http/src/org/eclipse/sensinact/studio/http/client/snamessage/describeresource/ObjectResponse.java b/services/org.eclipse.sensinact.studio.http.messages/src/org/eclipse/sensinact/studio/http/messages/snamessage/describeresource/ObjectResponse.java
similarity index 96%
rename from services/org.eclipse.sensinact.studio.http/src/org/eclipse/sensinact/studio/http/client/snamessage/describeresource/ObjectResponse.java
rename to services/org.eclipse.sensinact.studio.http.messages/src/org/eclipse/sensinact/studio/http/messages/snamessage/describeresource/ObjectResponse.java
index 9e8fe5f..358e4ff 100644
--- a/services/org.eclipse.sensinact.studio.http/src/org/eclipse/sensinact/studio/http/client/snamessage/describeresource/ObjectResponse.java
+++ b/services/org.eclipse.sensinact.studio.http.messages/src/org/eclipse/sensinact/studio/http/messages/snamessage/describeresource/ObjectResponse.java
@@ -8,7 +8,7 @@
* Contributors:
* CEA - initial API and implementation and/or initial documentation
*/
-package org.eclipse.sensinact.studio.http.client.snamessage.describeresource;
+package org.eclipse.sensinact.studio.http.messages.snamessage.describeresource;
import java.util.List;
diff --git a/services/org.eclipse.sensinact.studio.http/src/org/eclipse/sensinact/studio/http/client/snamessage/getresponse/MsgGetResponse.java b/services/org.eclipse.sensinact.studio.http.messages/src/org/eclipse/sensinact/studio/http/messages/snamessage/getresponse/MsgGetResponse.java
similarity index 89%
rename from services/org.eclipse.sensinact.studio.http/src/org/eclipse/sensinact/studio/http/client/snamessage/getresponse/MsgGetResponse.java
rename to services/org.eclipse.sensinact.studio.http.messages/src/org/eclipse/sensinact/studio/http/messages/snamessage/getresponse/MsgGetResponse.java
index 4568e36..f07c99d 100644
--- a/services/org.eclipse.sensinact.studio.http/src/org/eclipse/sensinact/studio/http/client/snamessage/getresponse/MsgGetResponse.java
+++ b/services/org.eclipse.sensinact.studio.http.messages/src/org/eclipse/sensinact/studio/http/messages/snamessage/getresponse/MsgGetResponse.java
@@ -8,10 +8,10 @@
* Contributors:
* CEA - initial API and implementation and/or initial documentation
*/
-package org.eclipse.sensinact.studio.http.client.snamessage.getresponse;
+package org.eclipse.sensinact.studio.http.messages.snamessage.getresponse;
-import org.eclipse.sensinact.studio.http.client.snamessage.MsgSensinact;
-import org.eclipse.sensinact.studio.http.client.snamessage.ObjectNameTypeValue;
+import org.eclipse.sensinact.studio.http.messages.snamessage.MsgSensinact;
+import org.eclipse.sensinact.studio.http.messages.snamessage.ObjectNameTypeValue;
/**
* @author Etienne Gandrille
diff --git a/services/org.eclipse.sensinact.studio.http/src/org/eclipse/sensinact/studio/http/client/snamessage/lifecycle/MsgProviderAppearing.java b/services/org.eclipse.sensinact.studio.http.messages/src/org/eclipse/sensinact/studio/http/messages/snamessage/lifecycle/MsgProviderAppearing.java
similarity index 93%
rename from services/org.eclipse.sensinact.studio.http/src/org/eclipse/sensinact/studio/http/client/snamessage/lifecycle/MsgProviderAppearing.java
rename to services/org.eclipse.sensinact.studio.http.messages/src/org/eclipse/sensinact/studio/http/messages/snamessage/lifecycle/MsgProviderAppearing.java
index aadc503..2fa1a80 100644
--- a/services/org.eclipse.sensinact.studio.http/src/org/eclipse/sensinact/studio/http/client/snamessage/lifecycle/MsgProviderAppearing.java
+++ b/services/org.eclipse.sensinact.studio.http.messages/src/org/eclipse/sensinact/studio/http/messages/snamessage/lifecycle/MsgProviderAppearing.java
@@ -8,9 +8,9 @@
* Contributors:
* CEA - initial API and implementation and/or initial documentation
*/
-package org.eclipse.sensinact.studio.http.client.snamessage.lifecycle;
+package org.eclipse.sensinact.studio.http.messages.snamessage.lifecycle;
-import org.eclipse.sensinact.studio.http.client.snamessage.MsgSensinact;
+import org.eclipse.sensinact.studio.http.messages.snamessage.MsgSensinact;
/**
* @author Etienne Gandrille
diff --git a/services/org.eclipse.sensinact.studio.http/src/org/eclipse/sensinact/studio/http/client/snamessage/lifecycle/MsgProviderDisappearing.java b/services/org.eclipse.sensinact.studio.http.messages/src/org/eclipse/sensinact/studio/http/messages/snamessage/lifecycle/MsgProviderDisappearing.java
similarity index 93%
rename from services/org.eclipse.sensinact.studio.http/src/org/eclipse/sensinact/studio/http/client/snamessage/lifecycle/MsgProviderDisappearing.java
rename to services/org.eclipse.sensinact.studio.http.messages/src/org/eclipse/sensinact/studio/http/messages/snamessage/lifecycle/MsgProviderDisappearing.java
index 72d45ae..1396690 100644
--- a/services/org.eclipse.sensinact.studio.http/src/org/eclipse/sensinact/studio/http/client/snamessage/lifecycle/MsgProviderDisappearing.java
+++ b/services/org.eclipse.sensinact.studio.http.messages/src/org/eclipse/sensinact/studio/http/messages/snamessage/lifecycle/MsgProviderDisappearing.java
@@ -8,9 +8,9 @@
* Contributors:
* CEA - initial API and implementation and/or initial documentation
*/
-package org.eclipse.sensinact.studio.http.client.snamessage.lifecycle;
+package org.eclipse.sensinact.studio.http.messages.snamessage.lifecycle;
-import org.eclipse.sensinact.studio.http.client.snamessage.MsgSensinact;
+import org.eclipse.sensinact.studio.http.messages.snamessage.MsgSensinact;
/**
* @author Etienne Gandrille
diff --git a/services/org.eclipse.sensinact.studio.http/src/org/eclipse/sensinact/studio/http/client/snamessage/lifecycle/MsgResourceAppearing.java b/services/org.eclipse.sensinact.studio.http.messages/src/org/eclipse/sensinact/studio/http/messages/snamessage/lifecycle/MsgResourceAppearing.java
similarity index 91%
rename from services/org.eclipse.sensinact.studio.http/src/org/eclipse/sensinact/studio/http/client/snamessage/lifecycle/MsgResourceAppearing.java
rename to services/org.eclipse.sensinact.studio.http.messages/src/org/eclipse/sensinact/studio/http/messages/snamessage/lifecycle/MsgResourceAppearing.java
index 0b9b462..60aeb94 100644
--- a/services/org.eclipse.sensinact.studio.http/src/org/eclipse/sensinact/studio/http/client/snamessage/lifecycle/MsgResourceAppearing.java
+++ b/services/org.eclipse.sensinact.studio.http.messages/src/org/eclipse/sensinact/studio/http/messages/snamessage/lifecycle/MsgResourceAppearing.java
@@ -8,10 +8,10 @@
* Contributors:
* CEA - initial API and implementation and/or initial documentation
*/
-package org.eclipse.sensinact.studio.http.client.snamessage.lifecycle;
+package org.eclipse.sensinact.studio.http.messages.snamessage.lifecycle;
-import org.eclipse.sensinact.studio.http.client.snamessage.MsgSensinact;
-import org.eclipse.sensinact.studio.http.client.snamessage.ObjectNameTypeValue;
+import org.eclipse.sensinact.studio.http.messages.snamessage.MsgSensinact;
+import org.eclipse.sensinact.studio.http.messages.snamessage.ObjectNameTypeValue;
/**
* @author Etienne Gandrille
diff --git a/services/org.eclipse.sensinact.studio.http/src/org/eclipse/sensinact/studio/http/client/snamessage/lifecycle/MsgResourceDisappearing.java b/services/org.eclipse.sensinact.studio.http.messages/src/org/eclipse/sensinact/studio/http/messages/snamessage/lifecycle/MsgResourceDisappearing.java
similarity index 93%
rename from services/org.eclipse.sensinact.studio.http/src/org/eclipse/sensinact/studio/http/client/snamessage/lifecycle/MsgResourceDisappearing.java
rename to services/org.eclipse.sensinact.studio.http.messages/src/org/eclipse/sensinact/studio/http/messages/snamessage/lifecycle/MsgResourceDisappearing.java
index c02e835..d61bab2 100644
--- a/services/org.eclipse.sensinact.studio.http/src/org/eclipse/sensinact/studio/http/client/snamessage/lifecycle/MsgResourceDisappearing.java
+++ b/services/org.eclipse.sensinact.studio.http.messages/src/org/eclipse/sensinact/studio/http/messages/snamessage/lifecycle/MsgResourceDisappearing.java
@@ -8,9 +8,9 @@
* Contributors:
* CEA - initial API and implementation and/or initial documentation
*/
-package org.eclipse.sensinact.studio.http.client.snamessage.lifecycle;
+package org.eclipse.sensinact.studio.http.messages.snamessage.lifecycle;
-import org.eclipse.sensinact.studio.http.client.snamessage.MsgSensinact;
+import org.eclipse.sensinact.studio.http.messages.snamessage.MsgSensinact;
/**
* @author Etienne Gandrille
diff --git a/services/org.eclipse.sensinact.studio.http/src/org/eclipse/sensinact/studio/http/client/snamessage/lifecycle/MsgServiceAppearing.java b/services/org.eclipse.sensinact.studio.http.messages/src/org/eclipse/sensinact/studio/http/messages/snamessage/lifecycle/MsgServiceAppearing.java
similarity index 92%
rename from services/org.eclipse.sensinact.studio.http/src/org/eclipse/sensinact/studio/http/client/snamessage/lifecycle/MsgServiceAppearing.java
rename to services/org.eclipse.sensinact.studio.http.messages/src/org/eclipse/sensinact/studio/http/messages/snamessage/lifecycle/MsgServiceAppearing.java
index d4c81c9..5293b1d 100644
--- a/services/org.eclipse.sensinact.studio.http/src/org/eclipse/sensinact/studio/http/client/snamessage/lifecycle/MsgServiceAppearing.java
+++ b/services/org.eclipse.sensinact.studio.http.messages/src/org/eclipse/sensinact/studio/http/messages/snamessage/lifecycle/MsgServiceAppearing.java
@@ -8,9 +8,9 @@
* Contributors:
* CEA - initial API and implementation and/or initial documentation
*/
-package org.eclipse.sensinact.studio.http.client.snamessage.lifecycle;
+package org.eclipse.sensinact.studio.http.messages.snamessage.lifecycle;
-import org.eclipse.sensinact.studio.http.client.snamessage.MsgSensinact;
+import org.eclipse.sensinact.studio.http.messages.snamessage.MsgSensinact;
/**
* @author Etienne Gandrille
diff --git a/services/org.eclipse.sensinact.studio.http/src/org/eclipse/sensinact/studio/http/client/snamessage/lifecycle/MsgServiceDisappearing.java b/services/org.eclipse.sensinact.studio.http.messages/src/org/eclipse/sensinact/studio/http/messages/snamessage/lifecycle/MsgServiceDisappearing.java
similarity index 93%
rename from services/org.eclipse.sensinact.studio.http/src/org/eclipse/sensinact/studio/http/client/snamessage/lifecycle/MsgServiceDisappearing.java
rename to services/org.eclipse.sensinact.studio.http.messages/src/org/eclipse/sensinact/studio/http/messages/snamessage/lifecycle/MsgServiceDisappearing.java
index 210bc61..8e4dfbb 100644
--- a/services/org.eclipse.sensinact.studio.http/src/org/eclipse/sensinact/studio/http/client/snamessage/lifecycle/MsgServiceDisappearing.java
+++ b/services/org.eclipse.sensinact.studio.http.messages/src/org/eclipse/sensinact/studio/http/messages/snamessage/lifecycle/MsgServiceDisappearing.java
@@ -8,9 +8,9 @@
* Contributors:
* CEA - initial API and implementation and/or initial documentation
*/
-package org.eclipse.sensinact.studio.http.client.snamessage.lifecycle;
+package org.eclipse.sensinact.studio.http.messages.snamessage.lifecycle;
-import org.eclipse.sensinact.studio.http.client.snamessage.MsgSensinact;
+import org.eclipse.sensinact.studio.http.messages.snamessage.MsgSensinact;
/**
* @author Etienne Gandrille
diff --git a/services/org.eclipse.sensinact.studio.http/src/org/eclipse/sensinact/studio/http/client/snamessage/lifecycle/ObjectNotification.java b/services/org.eclipse.sensinact.studio.http.messages/src/org/eclipse/sensinact/studio/http/messages/snamessage/lifecycle/ObjectNotification.java
similarity index 94%
rename from services/org.eclipse.sensinact.studio.http/src/org/eclipse/sensinact/studio/http/client/snamessage/lifecycle/ObjectNotification.java
rename to services/org.eclipse.sensinact.studio.http.messages/src/org/eclipse/sensinact/studio/http/messages/snamessage/lifecycle/ObjectNotification.java
index 8b3c400..439ffbc 100644
--- a/services/org.eclipse.sensinact.studio.http/src/org/eclipse/sensinact/studio/http/client/snamessage/lifecycle/ObjectNotification.java
+++ b/services/org.eclipse.sensinact.studio.http.messages/src/org/eclipse/sensinact/studio/http/messages/snamessage/lifecycle/ObjectNotification.java
@@ -8,7 +8,7 @@
* Contributors:
* CEA - initial API and implementation and/or initial documentation
*/
-package org.eclipse.sensinact.studio.http.client.snamessage.lifecycle;
+package org.eclipse.sensinact.studio.http.messages.snamessage.lifecycle;
/**
* @author Etienne Gandrille
diff --git a/services/org.eclipse.sensinact.studio.http/src/org/eclipse/sensinact/studio/http/client/snamessage/lifecycle/ObjectNotificationWithType.java b/services/org.eclipse.sensinact.studio.http.messages/src/org/eclipse/sensinact/studio/http/messages/snamessage/lifecycle/ObjectNotificationWithType.java
similarity index 95%
rename from services/org.eclipse.sensinact.studio.http/src/org/eclipse/sensinact/studio/http/client/snamessage/lifecycle/ObjectNotificationWithType.java
rename to services/org.eclipse.sensinact.studio.http.messages/src/org/eclipse/sensinact/studio/http/messages/snamessage/lifecycle/ObjectNotificationWithType.java
index 1431d23..4f0c4b7 100644
--- a/services/org.eclipse.sensinact.studio.http/src/org/eclipse/sensinact/studio/http/client/snamessage/lifecycle/ObjectNotificationWithType.java
+++ b/services/org.eclipse.sensinact.studio.http.messages/src/org/eclipse/sensinact/studio/http/messages/snamessage/lifecycle/ObjectNotificationWithType.java
@@ -8,7 +8,7 @@
* Contributors:
* CEA - initial API and implementation and/or initial documentation
*/
-package org.eclipse.sensinact.studio.http.client.snamessage.lifecycle;
+package org.eclipse.sensinact.studio.http.messages.snamessage.lifecycle;
/**
* @author Etienne Gandrille
diff --git a/services/org.eclipse.sensinact.studio.http/src/org/eclipse/sensinact/studio/http/client/snamessage/resourceslist/MsgResourcesList.java b/services/org.eclipse.sensinact.studio.http.messages/src/org/eclipse/sensinact/studio/http/messages/snamessage/resourceslist/MsgResourcesList.java
similarity index 92%
rename from services/org.eclipse.sensinact.studio.http/src/org/eclipse/sensinact/studio/http/client/snamessage/resourceslist/MsgResourcesList.java
rename to services/org.eclipse.sensinact.studio.http.messages/src/org/eclipse/sensinact/studio/http/messages/snamessage/resourceslist/MsgResourcesList.java
index 95eecba..05831dd 100644
--- a/services/org.eclipse.sensinact.studio.http/src/org/eclipse/sensinact/studio/http/client/snamessage/resourceslist/MsgResourcesList.java
+++ b/services/org.eclipse.sensinact.studio.http.messages/src/org/eclipse/sensinact/studio/http/messages/snamessage/resourceslist/MsgResourcesList.java
@@ -1,8 +1,8 @@
-package org.eclipse.sensinact.studio.http.client.snamessage.resourceslist;
+package org.eclipse.sensinact.studio.http.messages.snamessage.resourceslist;
import java.util.List;
-import org.eclipse.sensinact.studio.http.client.snamessage.MsgSensinact;
+import org.eclipse.sensinact.studio.http.messages.snamessage.MsgSensinact;
/**
* @author Etienne Gandrille
diff --git a/services/org.eclipse.sensinact.studio.http/src/org/eclipse/sensinact/studio/http/client/snamessage/setresponse/MsgSetResponse.java b/services/org.eclipse.sensinact.studio.http.messages/src/org/eclipse/sensinact/studio/http/messages/snamessage/setresponse/MsgSetResponse.java
similarity index 89%
rename from services/org.eclipse.sensinact.studio.http/src/org/eclipse/sensinact/studio/http/client/snamessage/setresponse/MsgSetResponse.java
rename to services/org.eclipse.sensinact.studio.http.messages/src/org/eclipse/sensinact/studio/http/messages/snamessage/setresponse/MsgSetResponse.java
index 8426312..87db24e 100644
--- a/services/org.eclipse.sensinact.studio.http/src/org/eclipse/sensinact/studio/http/client/snamessage/setresponse/MsgSetResponse.java
+++ b/services/org.eclipse.sensinact.studio.http.messages/src/org/eclipse/sensinact/studio/http/messages/snamessage/setresponse/MsgSetResponse.java
@@ -8,10 +8,10 @@
* Contributors:
* CEA - initial API and implementation and/or initial documentation
*/
-package org.eclipse.sensinact.studio.http.client.snamessage.setresponse;
+package org.eclipse.sensinact.studio.http.messages.snamessage.setresponse;
-import org.eclipse.sensinact.studio.http.client.snamessage.MsgSensinact;
-import org.eclipse.sensinact.studio.http.client.snamessage.ObjectNameTypeValue;
+import org.eclipse.sensinact.studio.http.messages.snamessage.MsgSensinact;
+import org.eclipse.sensinact.studio.http.messages.snamessage.ObjectNameTypeValue;
/**
* @author Etienne Gandrille
diff --git a/services/org.eclipse.sensinact.studio.http/src/org/eclipse/sensinact/studio/http/client/snamessage/subscriberesponse/MsgSubscribeResponse.java b/services/org.eclipse.sensinact.studio.http.messages/src/org/eclipse/sensinact/studio/http/messages/snamessage/subscriberesponse/MsgSubscribeResponse.java
similarity index 92%
rename from services/org.eclipse.sensinact.studio.http/src/org/eclipse/sensinact/studio/http/client/snamessage/subscriberesponse/MsgSubscribeResponse.java
rename to services/org.eclipse.sensinact.studio.http.messages/src/org/eclipse/sensinact/studio/http/messages/snamessage/subscriberesponse/MsgSubscribeResponse.java
index 1e76258..189542b 100644
--- a/services/org.eclipse.sensinact.studio.http/src/org/eclipse/sensinact/studio/http/client/snamessage/subscriberesponse/MsgSubscribeResponse.java
+++ b/services/org.eclipse.sensinact.studio.http.messages/src/org/eclipse/sensinact/studio/http/messages/snamessage/subscriberesponse/MsgSubscribeResponse.java
@@ -8,9 +8,9 @@
* Contributors:
* CEA - initial API and implementation and/or initial documentation
*/
-package org.eclipse.sensinact.studio.http.client.snamessage.subscriberesponse;
+package org.eclipse.sensinact.studio.http.messages.snamessage.subscriberesponse;
-import org.eclipse.sensinact.studio.http.client.snamessage.MsgSensinact;
+import org.eclipse.sensinact.studio.http.messages.snamessage.MsgSensinact;
/**
* @author Etienne Gandrille
diff --git a/services/org.eclipse.sensinact.studio.http/src/org/eclipse/sensinact/studio/http/client/snamessage/subscriberesponse/ObjectResponse.java b/services/org.eclipse.sensinact.studio.http.messages/src/org/eclipse/sensinact/studio/http/messages/snamessage/subscriberesponse/ObjectResponse.java
similarity index 91%
rename from services/org.eclipse.sensinact.studio.http/src/org/eclipse/sensinact/studio/http/client/snamessage/subscriberesponse/ObjectResponse.java
rename to services/org.eclipse.sensinact.studio.http.messages/src/org/eclipse/sensinact/studio/http/messages/snamessage/subscriberesponse/ObjectResponse.java
index b82730b..6b42a86 100644
--- a/services/org.eclipse.sensinact.studio.http/src/org/eclipse/sensinact/studio/http/client/snamessage/subscriberesponse/ObjectResponse.java
+++ b/services/org.eclipse.sensinact.studio.http.messages/src/org/eclipse/sensinact/studio/http/messages/snamessage/subscriberesponse/ObjectResponse.java
@@ -8,11 +8,11 @@
* Contributors:
* CEA - initial API and implementation and/or initial documentation
*/
-package org.eclipse.sensinact.studio.http.client.snamessage.subscriberesponse;
+package org.eclipse.sensinact.studio.http.messages.snamessage.subscriberesponse;
import java.util.Optional;
-import org.eclipse.sensinact.studio.http.client.snamessage.ObjectNameTypeValue;
+import org.eclipse.sensinact.studio.http.messages.snamessage.ObjectNameTypeValue;
/**
* @author Etienne Gandrille
diff --git a/services/org.eclipse.sensinact.studio.http/src/org/eclipse/sensinact/studio/http/client/snamessage/tokencreation/MsgTokenCreation.java b/services/org.eclipse.sensinact.studio.http.messages/src/org/eclipse/sensinact/studio/http/messages/snamessage/tokencreation/MsgTokenCreation.java
similarity index 93%
rename from services/org.eclipse.sensinact.studio.http/src/org/eclipse/sensinact/studio/http/client/snamessage/tokencreation/MsgTokenCreation.java
rename to services/org.eclipse.sensinact.studio.http.messages/src/org/eclipse/sensinact/studio/http/messages/snamessage/tokencreation/MsgTokenCreation.java
index dd23f28..b8621b5 100644
--- a/services/org.eclipse.sensinact.studio.http/src/org/eclipse/sensinact/studio/http/client/snamessage/tokencreation/MsgTokenCreation.java
+++ b/services/org.eclipse.sensinact.studio.http.messages/src/org/eclipse/sensinact/studio/http/messages/snamessage/tokencreation/MsgTokenCreation.java
@@ -8,9 +8,9 @@
* Contributors:
* CEA - initial API and implementation and/or initial documentation
*/
-package org.eclipse.sensinact.studio.http.client.snamessage.tokencreation;
+package org.eclipse.sensinact.studio.http.messages.snamessage.tokencreation;
-import org.eclipse.sensinact.studio.http.client.snamessage.MsgSensinact;
+import org.eclipse.sensinact.studio.http.messages.snamessage.MsgSensinact;
/**
* @author Etienne Gandrille
diff --git a/services/org.eclipse.sensinact.studio.http/src/org/eclipse/sensinact/studio/http/client/snamessage/unsubscriberesponse/MsgUnsubscribeResponse.java b/services/org.eclipse.sensinact.studio.http.messages/src/org/eclipse/sensinact/studio/http/messages/snamessage/unsubscriberesponse/MsgUnsubscribeResponse.java
similarity index 92%
rename from services/org.eclipse.sensinact.studio.http/src/org/eclipse/sensinact/studio/http/client/snamessage/unsubscriberesponse/MsgUnsubscribeResponse.java
rename to services/org.eclipse.sensinact.studio.http.messages/src/org/eclipse/sensinact/studio/http/messages/snamessage/unsubscriberesponse/MsgUnsubscribeResponse.java
index 16ea817..122b436 100644
--- a/services/org.eclipse.sensinact.studio.http/src/org/eclipse/sensinact/studio/http/client/snamessage/unsubscriberesponse/MsgUnsubscribeResponse.java
+++ b/services/org.eclipse.sensinact.studio.http.messages/src/org/eclipse/sensinact/studio/http/messages/snamessage/unsubscriberesponse/MsgUnsubscribeResponse.java
@@ -8,9 +8,9 @@
* Contributors:
* CEA - initial API and implementation and/or initial documentation
*/
-package org.eclipse.sensinact.studio.http.client.snamessage.unsubscriberesponse;
+package org.eclipse.sensinact.studio.http.messages.snamessage.unsubscriberesponse;
-import org.eclipse.sensinact.studio.http.client.snamessage.MsgSensinact;
+import org.eclipse.sensinact.studio.http.messages.snamessage.MsgSensinact;
/**
* @author Etienne Gandrille
diff --git a/services/org.eclipse.sensinact.studio.http/src/org/eclipse/sensinact/studio/http/client/snamessage/unsubscriberesponse/ObjectResponse.java b/services/org.eclipse.sensinact.studio.http.messages/src/org/eclipse/sensinact/studio/http/messages/snamessage/unsubscriberesponse/ObjectResponse.java
similarity index 93%
rename from services/org.eclipse.sensinact.studio.http/src/org/eclipse/sensinact/studio/http/client/snamessage/unsubscriberesponse/ObjectResponse.java
rename to services/org.eclipse.sensinact.studio.http.messages/src/org/eclipse/sensinact/studio/http/messages/snamessage/unsubscriberesponse/ObjectResponse.java
index 75672e0..f2c8f2f 100644
--- a/services/org.eclipse.sensinact.studio.http/src/org/eclipse/sensinact/studio/http/client/snamessage/unsubscriberesponse/ObjectResponse.java
+++ b/services/org.eclipse.sensinact.studio.http.messages/src/org/eclipse/sensinact/studio/http/messages/snamessage/unsubscriberesponse/ObjectResponse.java
@@ -8,7 +8,7 @@
* Contributors:
* CEA - initial API and implementation and/or initial documentation
*/
-package org.eclipse.sensinact.studio.http.client.snamessage.unsubscriberesponse;
+package org.eclipse.sensinact.studio.http.messages.snamessage.unsubscriberesponse;
/**
* @author Etienne Gandrille
diff --git a/services/org.eclipse.sensinact.studio.http/.classpath b/services/org.eclipse.sensinact.studio.http.services/.classpath
similarity index 94%
copy from services/org.eclipse.sensinact.studio.http/.classpath
copy to services/org.eclipse.sensinact.studio.http.services/.classpath
index 098194c..eca7bdb 100644
--- a/services/org.eclipse.sensinact.studio.http/.classpath
+++ b/services/org.eclipse.sensinact.studio.http.services/.classpath
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?>
<classpath>
- <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.7"/>
+ <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.8"/>
<classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/>
<classpathentry kind="src" path="src"/>
<classpathentry kind="output" path="bin"/>
diff --git a/services/org.eclipse.sensinact.studio.http/.project b/services/org.eclipse.sensinact.studio.http.services/.project
similarity index 91%
copy from services/org.eclipse.sensinact.studio.http/.project
copy to services/org.eclipse.sensinact.studio.http.services/.project
index 2ea29b1..7dc962b 100644
--- a/services/org.eclipse.sensinact.studio.http/.project
+++ b/services/org.eclipse.sensinact.studio.http.services/.project
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?>
<projectDescription>
- <name>org.eclipse.sensinact.studio.http</name>
+ <name>org.eclipse.sensinact.studio.http.services</name>
<comment></comment>
<projects>
</projects>
diff --git a/services/org.eclipse.sensinact.studio.http.services/.settings/org.eclipse.jdt.core.prefs b/services/org.eclipse.sensinact.studio.http.services/.settings/org.eclipse.jdt.core.prefs
new file mode 100644
index 0000000..0c68a61
--- /dev/null
+++ b/services/org.eclipse.sensinact.studio.http.services/.settings/org.eclipse.jdt.core.prefs
@@ -0,0 +1,7 @@
+eclipse.preferences.version=1
+org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled
+org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.8
+org.eclipse.jdt.core.compiler.compliance=1.8
+org.eclipse.jdt.core.compiler.problem.assertIdentifier=error
+org.eclipse.jdt.core.compiler.problem.enumIdentifier=error
+org.eclipse.jdt.core.compiler.source=1.8
diff --git a/services/org.eclipse.sensinact.studio.http.services/META-INF/MANIFEST.MF b/services/org.eclipse.sensinact.studio.http.services/META-INF/MANIFEST.MF
new file mode 100644
index 0000000..5567aed
--- /dev/null
+++ b/services/org.eclipse.sensinact.studio.http.services/META-INF/MANIFEST.MF
@@ -0,0 +1,27 @@
+Manifest-Version: 1.0
+Bundle-ManifestVersion: 2
+Bundle-Name: Http-services
+Bundle-SymbolicName: org.eclipse.sensinact.studio.http.services
+Bundle-Version: 1.0.0.qualifier
+Bundle-Activator: org.eclipse.sensinact.studio.http.services.Activator
+Require-Bundle: org.eclipse.core.runtime,
+ org.json,
+ org.restlet,
+ org.eclipse.sensinact.studio.model.resource,
+ org.apache.log4j,
+ org.eclipse.sensinact.studio.preferences,
+ com.fasterxml.jackson.core.jackson-databind;bundle-version="2.6.2",
+ org.restlet.ext.jackson;bundle-version="2.2.3",
+ com.fasterxml.jackson.core.jackson-core;bundle-version="2.6.2",
+ org.eclipse.jetty.websocket.common;bundle-version="9.2.15",
+ org.eclipse.sensinact.studio.http.messages;bundle-version="1.0.0"
+Bundle-RequiredExecutionEnvironment: JavaSE-1.8
+Bundle-ActivationPolicy: lazy
+Export-Package: org.eclipse.sensinact.studio.http.services.client,
+ org.eclipse.sensinact.studio.http.services.client.connectionmanager,
+ org.eclipse.sensinact.studio.http.services.client.subscribe.agent,
+ org.eclipse.sensinact.studio.http.services.client.subscribe.standard,
+ org.eclipse.sensinact.studio.http.services.client.websockets,
+ org.eclipse.sensinact.studio.http.services.server,
+ org.eclipse.sensinact.studio.http.services.server.serverstarted
+Import-Package: org.apache.log4j,org.eclipse.jetty.websocket.client,org.eclipse.jetty.websocket.api.annotations,org.eclipse.jetty.websocket.api,org.eclipse.jetty.util.component
diff --git a/services/org.eclipse.sensinact.studio.http/about.html b/services/org.eclipse.sensinact.studio.http.services/about.html
similarity index 100%
copy from services/org.eclipse.sensinact.studio.http/about.html
copy to services/org.eclipse.sensinact.studio.http.services/about.html
diff --git a/services/org.eclipse.sensinact.studio.http.services/build.properties b/services/org.eclipse.sensinact.studio.http.services/build.properties
new file mode 100644
index 0000000..34d2e4d
--- /dev/null
+++ b/services/org.eclipse.sensinact.studio.http.services/build.properties
@@ -0,0 +1,4 @@
+source.. = src/
+output.. = bin/
+bin.includes = META-INF/,\
+ .
diff --git a/services/org.eclipse.sensinact.studio.http.services/src/org/eclipse/sensinact/studio/http/services/Activator.java b/services/org.eclipse.sensinact.studio.http.services/src/org/eclipse/sensinact/studio/http/services/Activator.java
new file mode 100644
index 0000000..12f982b
--- /dev/null
+++ b/services/org.eclipse.sensinact.studio.http.services/src/org/eclipse/sensinact/studio/http/services/Activator.java
@@ -0,0 +1,30 @@
+package org.eclipse.sensinact.studio.http.services;
+
+import org.osgi.framework.BundleActivator;
+import org.osgi.framework.BundleContext;
+
+public class Activator implements BundleActivator {
+
+ private static BundleContext context;
+
+ static BundleContext getContext() {
+ return context;
+ }
+
+ /*
+ * (non-Javadoc)
+ * @see org.osgi.framework.BundleActivator#start(org.osgi.framework.BundleContext)
+ */
+ public void start(BundleContext bundleContext) throws Exception {
+ Activator.context = bundleContext;
+ }
+
+ /*
+ * (non-Javadoc)
+ * @see org.osgi.framework.BundleActivator#stop(org.osgi.framework.BundleContext)
+ */
+ public void stop(BundleContext bundleContext) throws Exception {
+ Activator.context = null;
+ }
+
+}
diff --git a/services/org.eclipse.sensinact.studio.http/src/org/eclipse/sensinact/studio/http/client/AccessToken.java b/services/org.eclipse.sensinact.studio.http.services/src/org/eclipse/sensinact/studio/http/services/client/AccessToken.java
similarity index 85%
rename from services/org.eclipse.sensinact.studio.http/src/org/eclipse/sensinact/studio/http/client/AccessToken.java
rename to services/org.eclipse.sensinact.studio.http.services/src/org/eclipse/sensinact/studio/http/services/client/AccessToken.java
index a131d63..ce4a663 100644
--- a/services/org.eclipse.sensinact.studio.http/src/org/eclipse/sensinact/studio/http/client/AccessToken.java
+++ b/services/org.eclipse.sensinact.studio.http.services/src/org/eclipse/sensinact/studio/http/services/client/AccessToken.java
@@ -8,11 +8,11 @@
* Contributors:
* CEA - initial API and implementation and/or initial documentation
*/
-package org.eclipse.sensinact.studio.http.client;
+package org.eclipse.sensinact.studio.http.services.client;
import java.util.Date;
-import org.eclipse.sensinact.studio.http.client.snamessage.tokencreation.MsgTokenCreation;
+import org.eclipse.sensinact.studio.http.messages.snamessage.tokencreation.MsgTokenCreation;
/**
* @author Etienne Gandrille
diff --git a/services/org.eclipse.sensinact.studio.http/src/org/eclipse/sensinact/studio/http/client/BasicConfigurator.java b/services/org.eclipse.sensinact.studio.http.services/src/org/eclipse/sensinact/studio/http/services/client/BasicConfigurator.java
similarity index 91%
rename from services/org.eclipse.sensinact.studio.http/src/org/eclipse/sensinact/studio/http/client/BasicConfigurator.java
rename to services/org.eclipse.sensinact.studio.http.services/src/org/eclipse/sensinact/studio/http/services/client/BasicConfigurator.java
index 3b2c405..b92e2ad 100644
--- a/services/org.eclipse.sensinact.studio.http/src/org/eclipse/sensinact/studio/http/client/BasicConfigurator.java
+++ b/services/org.eclipse.sensinact.studio.http.services/src/org/eclipse/sensinact/studio/http/services/client/BasicConfigurator.java
@@ -8,7 +8,7 @@
* Contributors:
* CEA - initial API and implementation and/or initial documentation
*/
-package org.eclipse.sensinact.studio.http.client;
+package org.eclipse.sensinact.studio.http.services.client;
import org.eclipse.sensinact.studio.preferences.GatewayHttpConfig;
import org.restlet.resource.ClientResource;
diff --git a/services/org.eclipse.sensinact.studio.http/src/org/eclipse/sensinact/studio/http/client/GatewayHttpClient.java b/services/org.eclipse.sensinact.studio.http.services/src/org/eclipse/sensinact/studio/http/services/client/GatewayHttpClient.java
similarity index 96%
rename from services/org.eclipse.sensinact.studio.http/src/org/eclipse/sensinact/studio/http/client/GatewayHttpClient.java
rename to services/org.eclipse.sensinact.studio.http.services/src/org/eclipse/sensinact/studio/http/services/client/GatewayHttpClient.java
index ed967b1..81c2cd9 100644
--- a/services/org.eclipse.sensinact.studio.http/src/org/eclipse/sensinact/studio/http/client/GatewayHttpClient.java
+++ b/services/org.eclipse.sensinact.studio.http.services/src/org/eclipse/sensinact/studio/http/services/client/GatewayHttpClient.java
@@ -8,7 +8,7 @@
* Contributors:
* CEA - initial API and implementation and/or initial documentation
*/
-package org.eclipse.sensinact.studio.http.client;
+package org.eclipse.sensinact.studio.http.services.client;
import java.io.IOException;
import java.io.StringWriter;
@@ -17,9 +17,9 @@
import java.util.Map;
import org.apache.log4j.Logger;
-import org.eclipse.sensinact.studio.http.client.snamessage.MsgFactory;
-import org.eclipse.sensinact.studio.http.client.snamessage.MsgSensinact;
-import org.eclipse.sensinact.studio.http.client.snamessage.tokencreation.MsgTokenCreation;
+import org.eclipse.sensinact.studio.http.messages.snamessage.MsgFactory;
+import org.eclipse.sensinact.studio.http.messages.snamessage.MsgSensinact;
+import org.eclipse.sensinact.studio.http.messages.snamessage.tokencreation.MsgTokenCreation;
import org.eclipse.sensinact.studio.model.resource.utils.JsonUtil;
import org.eclipse.sensinact.studio.model.resource.utils.Segments;
import org.eclipse.sensinact.studio.preferences.ConfigurationManager;
diff --git a/services/org.eclipse.sensinact.studio.http/src/org/eclipse/sensinact/studio/http/client/RequestConfigurator.java b/services/org.eclipse.sensinact.studio.http.services/src/org/eclipse/sensinact/studio/http/services/client/RequestConfigurator.java
similarity index 94%
rename from services/org.eclipse.sensinact.studio.http/src/org/eclipse/sensinact/studio/http/client/RequestConfigurator.java
rename to services/org.eclipse.sensinact.studio.http.services/src/org/eclipse/sensinact/studio/http/services/client/RequestConfigurator.java
index 65f46e0..0bb34fe 100644
--- a/services/org.eclipse.sensinact.studio.http/src/org/eclipse/sensinact/studio/http/client/RequestConfigurator.java
+++ b/services/org.eclipse.sensinact.studio.http.services/src/org/eclipse/sensinact/studio/http/services/client/RequestConfigurator.java
@@ -8,7 +8,7 @@
* Contributors:
* CEA - initial API and implementation and/or initial documentation
*/
-package org.eclipse.sensinact.studio.http.client;
+package org.eclipse.sensinact.studio.http.services.client;
import java.util.Map;
diff --git a/services/org.eclipse.sensinact.studio.http/src/org/eclipse/sensinact/studio/http/client/RequestConfiguratorCred.java b/services/org.eclipse.sensinact.studio.http.services/src/org/eclipse/sensinact/studio/http/services/client/RequestConfiguratorCred.java
similarity index 94%
rename from services/org.eclipse.sensinact.studio.http/src/org/eclipse/sensinact/studio/http/client/RequestConfiguratorCred.java
rename to services/org.eclipse.sensinact.studio.http.services/src/org/eclipse/sensinact/studio/http/services/client/RequestConfiguratorCred.java
index a426149..d783954 100644
--- a/services/org.eclipse.sensinact.studio.http/src/org/eclipse/sensinact/studio/http/client/RequestConfiguratorCred.java
+++ b/services/org.eclipse.sensinact.studio.http.services/src/org/eclipse/sensinact/studio/http/services/client/RequestConfiguratorCred.java
@@ -8,7 +8,7 @@
* Contributors:
* CEA - initial API and implementation and/or initial documentation
*/
-package org.eclipse.sensinact.studio.http.client;
+package org.eclipse.sensinact.studio.http.services.client;
import org.eclipse.sensinact.studio.preferences.GatewayHttpConfig;
import org.restlet.data.ChallengeScheme;
diff --git a/services/org.eclipse.sensinact.studio.http/src/org/eclipse/sensinact/studio/http/client/RequestConfiguratorToken.java b/services/org.eclipse.sensinact.studio.http.services/src/org/eclipse/sensinact/studio/http/services/client/RequestConfiguratorToken.java
similarity index 94%
rename from services/org.eclipse.sensinact.studio.http/src/org/eclipse/sensinact/studio/http/client/RequestConfiguratorToken.java
rename to services/org.eclipse.sensinact.studio.http.services/src/org/eclipse/sensinact/studio/http/services/client/RequestConfiguratorToken.java
index fbb1d4a..dd531ba 100644
--- a/services/org.eclipse.sensinact.studio.http/src/org/eclipse/sensinact/studio/http/client/RequestConfiguratorToken.java
+++ b/services/org.eclipse.sensinact.studio.http.services/src/org/eclipse/sensinact/studio/http/services/client/RequestConfiguratorToken.java
@@ -8,7 +8,7 @@
* Contributors:
* CEA - initial API and implementation and/or initial documentation
*/
-package org.eclipse.sensinact.studio.http.client;
+package org.eclipse.sensinact.studio.http.services.client;
import org.eclipse.sensinact.studio.preferences.GatewayHttpConfig;
import org.restlet.engine.header.Header;
diff --git a/services/org.eclipse.sensinact.studio.http/src/org/eclipse/sensinact/studio/http/client/StudioRequest.java b/services/org.eclipse.sensinact.studio.http.services/src/org/eclipse/sensinact/studio/http/services/client/StudioRequest.java
similarity index 87%
rename from services/org.eclipse.sensinact.studio.http/src/org/eclipse/sensinact/studio/http/client/StudioRequest.java
rename to services/org.eclipse.sensinact.studio.http.services/src/org/eclipse/sensinact/studio/http/services/client/StudioRequest.java
index df25774..6b8c112 100644
--- a/services/org.eclipse.sensinact.studio.http/src/org/eclipse/sensinact/studio/http/client/StudioRequest.java
+++ b/services/org.eclipse.sensinact.studio.http.services/src/org/eclipse/sensinact/studio/http/services/client/StudioRequest.java
@@ -8,16 +8,16 @@
* Contributors:
* CEA - initial API and implementation and/or initial documentation
*/
-package org.eclipse.sensinact.studio.http.client;
+package org.eclipse.sensinact.studio.http.services.client;
import java.io.IOException;
import java.util.Collection;
import org.apache.log4j.Logger;
-import org.eclipse.sensinact.studio.http.client.UIResult.DialogStatus;
-import org.eclipse.sensinact.studio.http.client.snamessage.MsgSensinact;
-import org.eclipse.sensinact.studio.http.client.snamessage.actresponse.MsgActResponse;
-import org.eclipse.sensinact.studio.http.client.snamessage.getresponse.MsgGetResponse;
+import org.eclipse.sensinact.studio.http.messages.snamessage.MsgSensinact;
+import org.eclipse.sensinact.studio.http.messages.snamessage.actresponse.MsgActResponse;
+import org.eclipse.sensinact.studio.http.messages.snamessage.getresponse.MsgGetResponse;
+import org.eclipse.sensinact.studio.http.services.client.UIResult.DialogStatus;
import org.eclipse.sensinact.studio.model.resource.utils.ResourceDescriptor;
import org.eclipse.sensinact.studio.model.resource.utils.Segments;
import org.eclipse.sensinact.studio.resource.AccessMethodType;
diff --git a/services/org.eclipse.sensinact.studio.http/src/org/eclipse/sensinact/studio/http/client/UIResult.java b/services/org.eclipse.sensinact.studio.http.services/src/org/eclipse/sensinact/studio/http/services/client/UIResult.java
similarity index 95%
rename from services/org.eclipse.sensinact.studio.http/src/org/eclipse/sensinact/studio/http/client/UIResult.java
rename to services/org.eclipse.sensinact.studio.http.services/src/org/eclipse/sensinact/studio/http/services/client/UIResult.java
index 80a8bba..a4d4c8f 100644
--- a/services/org.eclipse.sensinact.studio.http/src/org/eclipse/sensinact/studio/http/client/UIResult.java
+++ b/services/org.eclipse.sensinact.studio.http.services/src/org/eclipse/sensinact/studio/http/services/client/UIResult.java
@@ -8,7 +8,7 @@
* Contributors:
* CEA - initial API and implementation and/or initial documentation
*/
-package org.eclipse.sensinact.studio.http.client;
+package org.eclipse.sensinact.studio.http.services.client;
import org.apache.log4j.Logger;
import org.json.JSONException;
diff --git a/services/org.eclipse.sensinact.studio.http/src/org/eclipse/sensinact/studio/http/client/connectionmanager/ConnectionManager.java b/services/org.eclipse.sensinact.studio.http.services/src/org/eclipse/sensinact/studio/http/services/client/connectionmanager/ConnectionManager.java
similarity index 89%
rename from services/org.eclipse.sensinact.studio.http/src/org/eclipse/sensinact/studio/http/client/connectionmanager/ConnectionManager.java
rename to services/org.eclipse.sensinact.studio.http.services/src/org/eclipse/sensinact/studio/http/services/client/connectionmanager/ConnectionManager.java
index 356d4d3..8100ee4 100644
--- a/services/org.eclipse.sensinact.studio.http/src/org/eclipse/sensinact/studio/http/client/connectionmanager/ConnectionManager.java
+++ b/services/org.eclipse.sensinact.studio.http.services/src/org/eclipse/sensinact/studio/http/services/client/connectionmanager/ConnectionManager.java
@@ -8,7 +8,7 @@
* Contributors:
* CEA - initial API and implementation and/or initial documentation
*/
-package org.eclipse.sensinact.studio.http.client.connectionmanager;
+package org.eclipse.sensinact.studio.http.services.client.connectionmanager;
import java.net.ConnectException;
import java.net.URI;
@@ -16,8 +16,8 @@
import org.apache.log4j.Logger;
import org.eclipse.core.runtime.IProgressMonitor;
-import org.eclipse.sensinact.studio.http.client.subscribe.agent.Agent;
-import org.eclipse.sensinact.studio.http.client.websockets.SensinactWebSocketConnectionManager;
+import org.eclipse.sensinact.studio.http.services.client.subscribe.agent.Agent;
+import org.eclipse.sensinact.studio.http.services.client.websockets.SensinactWebSocketConnectionManager;
import org.eclipse.sensinact.studio.preferences.ConfigurationManager;
import org.eclipse.sensinact.studio.preferences.GatewayHttpConfig;
diff --git a/services/org.eclipse.sensinact.studio.http/src/org/eclipse/sensinact/studio/http/client/subscribe/agent/Agent.java b/services/org.eclipse.sensinact.studio.http.services/src/org/eclipse/sensinact/studio/http/services/client/subscribe/agent/Agent.java
similarity index 93%
rename from services/org.eclipse.sensinact.studio.http/src/org/eclipse/sensinact/studio/http/client/subscribe/agent/Agent.java
rename to services/org.eclipse.sensinact.studio.http.services/src/org/eclipse/sensinact/studio/http/services/client/subscribe/agent/Agent.java
index c944f14..b53bf83 100644
--- a/services/org.eclipse.sensinact.studio.http/src/org/eclipse/sensinact/studio/http/client/subscribe/agent/Agent.java
+++ b/services/org.eclipse.sensinact.studio.http.services/src/org/eclipse/sensinact/studio/http/services/client/subscribe/agent/Agent.java
@@ -8,14 +8,14 @@
* Contributors:
* CEA - initial API and implementation and/or initial documentation
*/
-package org.eclipse.sensinact.studio.http.client.subscribe.agent;
+package org.eclipse.sensinact.studio.http.services.client.subscribe.agent;
import java.io.IOException;
import java.util.List;
-import org.eclipse.sensinact.studio.http.client.GatewayHttpClient;
-import org.eclipse.sensinact.studio.http.client.snamessage.MsgSensinact;
-import org.eclipse.sensinact.studio.http.client.snamessage.subscriberesponse.MsgSubscribeResponse;
+import org.eclipse.sensinact.studio.http.messages.snamessage.MsgSensinact;
+import org.eclipse.sensinact.studio.http.messages.snamessage.subscriberesponse.MsgSubscribeResponse;
+import org.eclipse.sensinact.studio.http.services.client.GatewayHttpClient;
import org.eclipse.sensinact.studio.model.resource.utils.Segments;
import org.eclipse.sensinact.studio.preferences.ConfigurationManager;
import org.eclipse.sensinact.studio.preferences.GatewayHttpConfig;
diff --git a/services/org.eclipse.sensinact.studio.http/src/org/eclipse/sensinact/studio/http/client/subscribe/agent/Subscription.java b/services/org.eclipse.sensinact.studio.http.services/src/org/eclipse/sensinact/studio/http/services/client/subscribe/agent/Subscription.java
similarity index 96%
rename from services/org.eclipse.sensinact.studio.http/src/org/eclipse/sensinact/studio/http/client/subscribe/agent/Subscription.java
rename to services/org.eclipse.sensinact.studio.http.services/src/org/eclipse/sensinact/studio/http/services/client/subscribe/agent/Subscription.java
index d8d59e4..92d247c 100644
--- a/services/org.eclipse.sensinact.studio.http/src/org/eclipse/sensinact/studio/http/client/subscribe/agent/Subscription.java
+++ b/services/org.eclipse.sensinact.studio.http.services/src/org/eclipse/sensinact/studio/http/services/client/subscribe/agent/Subscription.java
@@ -8,7 +8,7 @@
* Contributors:
* CEA - initial API and implementation and/or initial documentation
*/
-package org.eclipse.sensinact.studio.http.client.subscribe.agent;
+package org.eclipse.sensinact.studio.http.services.client.subscribe.agent;
/**
* @author Etienne Gandrille
diff --git a/services/org.eclipse.sensinact.studio.http/src/org/eclipse/sensinact/studio/http/client/subscribe/agent/SubscriptionListener.java b/services/org.eclipse.sensinact.studio.http.services/src/org/eclipse/sensinact/studio/http/services/client/subscribe/agent/SubscriptionListener.java
similarity index 80%
rename from services/org.eclipse.sensinact.studio.http/src/org/eclipse/sensinact/studio/http/client/subscribe/agent/SubscriptionListener.java
rename to services/org.eclipse.sensinact.studio.http.services/src/org/eclipse/sensinact/studio/http/services/client/subscribe/agent/SubscriptionListener.java
index 6e24377..5a447a5 100644
--- a/services/org.eclipse.sensinact.studio.http/src/org/eclipse/sensinact/studio/http/client/subscribe/agent/SubscriptionListener.java
+++ b/services/org.eclipse.sensinact.studio.http.services/src/org/eclipse/sensinact/studio/http/services/client/subscribe/agent/SubscriptionListener.java
@@ -8,11 +8,11 @@
* Contributors:
* CEA - initial API and implementation and/or initial documentation
*/
-package org.eclipse.sensinact.studio.http.client.subscribe.agent;
+package org.eclipse.sensinact.studio.http.services.client.subscribe.agent;
import java.util.List;
-import org.eclipse.sensinact.studio.http.client.snamessage.MsgSensinact;
+import org.eclipse.sensinact.studio.http.messages.snamessage.MsgSensinact;
/**
* @author Etienne Gandrille
diff --git a/services/org.eclipse.sensinact.studio.http/src/org/eclipse/sensinact/studio/http/client/subscribe/agent/SubscriptionManager.java b/services/org.eclipse.sensinact.studio.http.services/src/org/eclipse/sensinact/studio/http/services/client/subscribe/agent/SubscriptionManager.java
similarity index 89%
rename from services/org.eclipse.sensinact.studio.http/src/org/eclipse/sensinact/studio/http/client/subscribe/agent/SubscriptionManager.java
rename to services/org.eclipse.sensinact.studio.http.services/src/org/eclipse/sensinact/studio/http/services/client/subscribe/agent/SubscriptionManager.java
index ba68770..bcacd69 100644
--- a/services/org.eclipse.sensinact.studio.http/src/org/eclipse/sensinact/studio/http/client/subscribe/agent/SubscriptionManager.java
+++ b/services/org.eclipse.sensinact.studio.http.services/src/org/eclipse/sensinact/studio/http/services/client/subscribe/agent/SubscriptionManager.java
@@ -8,12 +8,12 @@
* Contributors:
* CEA - initial API and implementation and/or initial documentation
*/
-package org.eclipse.sensinact.studio.http.client.subscribe.agent;
+package org.eclipse.sensinact.studio.http.services.client.subscribe.agent;
import java.util.ArrayList;
import java.util.List;
-import org.eclipse.sensinact.studio.http.client.snamessage.MsgSensinact;
+import org.eclipse.sensinact.studio.http.messages.snamessage.MsgSensinact;
/**
* @author Etienne Gandrille
diff --git a/services/org.eclipse.sensinact.studio.http/src/org/eclipse/sensinact/studio/http/client/subscribe/agent/SubscriptionStorage.java b/services/org.eclipse.sensinact.studio.http.services/src/org/eclipse/sensinact/studio/http/services/client/subscribe/agent/SubscriptionStorage.java
similarity index 94%
rename from services/org.eclipse.sensinact.studio.http/src/org/eclipse/sensinact/studio/http/client/subscribe/agent/SubscriptionStorage.java
rename to services/org.eclipse.sensinact.studio.http.services/src/org/eclipse/sensinact/studio/http/services/client/subscribe/agent/SubscriptionStorage.java
index 9b1425b..2b0d06e 100644
--- a/services/org.eclipse.sensinact.studio.http/src/org/eclipse/sensinact/studio/http/client/subscribe/agent/SubscriptionStorage.java
+++ b/services/org.eclipse.sensinact.studio.http.services/src/org/eclipse/sensinact/studio/http/services/client/subscribe/agent/SubscriptionStorage.java
@@ -8,7 +8,7 @@
* Contributors:
* CEA - initial API and implementation and/or initial documentation
*/
-package org.eclipse.sensinact.studio.http.client.subscribe.agent;
+package org.eclipse.sensinact.studio.http.services.client.subscribe.agent;
import java.util.HashMap;
import java.util.Map;
diff --git a/services/org.eclipse.sensinact.studio.http/src/org/eclipse/sensinact/studio/http/client/subscribe/standard/SubscriptionListener.java b/services/org.eclipse.sensinact.studio.http.services/src/org/eclipse/sensinact/studio/http/services/client/subscribe/standard/SubscriptionListener.java
similarity index 80%
rename from services/org.eclipse.sensinact.studio.http/src/org/eclipse/sensinact/studio/http/client/subscribe/standard/SubscriptionListener.java
rename to services/org.eclipse.sensinact.studio.http.services/src/org/eclipse/sensinact/studio/http/services/client/subscribe/standard/SubscriptionListener.java
index 8f99500..8f70df3 100644
--- a/services/org.eclipse.sensinact.studio.http/src/org/eclipse/sensinact/studio/http/client/subscribe/standard/SubscriptionListener.java
+++ b/services/org.eclipse.sensinact.studio.http.services/src/org/eclipse/sensinact/studio/http/services/client/subscribe/standard/SubscriptionListener.java
@@ -8,9 +8,9 @@
* Contributors:
* CEA - initial API and implementation and/or initial documentation
*/
-package org.eclipse.sensinact.studio.http.client.subscribe.standard;
+package org.eclipse.sensinact.studio.http.services.client.subscribe.standard;
-import org.eclipse.sensinact.studio.http.client.snamessage.MsgSensinact;
+import org.eclipse.sensinact.studio.http.messages.snamessage.MsgSensinact;
import org.eclipse.sensinact.studio.model.resource.utils.ResourceDescriptor;
/**
diff --git a/services/org.eclipse.sensinact.studio.http/src/org/eclipse/sensinact/studio/http/client/subscribe/standard/SubscriptionManager.java b/services/org.eclipse.sensinact.studio.http.services/src/org/eclipse/sensinact/studio/http/services/client/subscribe/standard/SubscriptionManager.java
similarity index 95%
rename from services/org.eclipse.sensinact.studio.http/src/org/eclipse/sensinact/studio/http/client/subscribe/standard/SubscriptionManager.java
rename to services/org.eclipse.sensinact.studio.http.services/src/org/eclipse/sensinact/studio/http/services/client/subscribe/standard/SubscriptionManager.java
index 543a65e..7c47e1b 100644
--- a/services/org.eclipse.sensinact.studio.http/src/org/eclipse/sensinact/studio/http/client/subscribe/standard/SubscriptionManager.java
+++ b/services/org.eclipse.sensinact.studio.http.services/src/org/eclipse/sensinact/studio/http/services/client/subscribe/standard/SubscriptionManager.java
@@ -8,7 +8,7 @@
* Contributors:
* CEA - initial API and implementation and/or initial documentation
*/
-package org.eclipse.sensinact.studio.http.client.subscribe.standard;
+package org.eclipse.sensinact.studio.http.services.client.subscribe.standard;
import java.io.IOException;
import java.util.ArrayList;
@@ -19,9 +19,9 @@
import java.util.Set;
import org.apache.log4j.Logger;
-import org.eclipse.sensinact.studio.http.client.GatewayHttpClient;
-import org.eclipse.sensinact.studio.http.client.snamessage.MsgSensinact;
-import org.eclipse.sensinact.studio.http.client.snamessage.subscriberesponse.MsgSubscribeResponse;
+import org.eclipse.sensinact.studio.http.messages.snamessage.MsgSensinact;
+import org.eclipse.sensinact.studio.http.messages.snamessage.subscriberesponse.MsgSubscribeResponse;
+import org.eclipse.sensinact.studio.http.services.client.GatewayHttpClient;
import org.eclipse.sensinact.studio.model.resource.utils.JsonUtil;
import org.eclipse.sensinact.studio.model.resource.utils.ResourceDescriptor;
import org.eclipse.sensinact.studio.model.resource.utils.Segments;
diff --git a/services/org.eclipse.sensinact.studio.http/src/org/eclipse/sensinact/studio/http/client/websockets/SensinactSocket.java b/services/org.eclipse.sensinact.studio.http.services/src/org/eclipse/sensinact/studio/http/services/client/websockets/SensinactSocket.java
similarity index 95%
rename from services/org.eclipse.sensinact.studio.http/src/org/eclipse/sensinact/studio/http/client/websockets/SensinactSocket.java
rename to services/org.eclipse.sensinact.studio.http.services/src/org/eclipse/sensinact/studio/http/services/client/websockets/SensinactSocket.java
index b7d0fa6..0484091 100644
--- a/services/org.eclipse.sensinact.studio.http/src/org/eclipse/sensinact/studio/http/client/websockets/SensinactSocket.java
+++ b/services/org.eclipse.sensinact.studio.http.services/src/org/eclipse/sensinact/studio/http/services/client/websockets/SensinactSocket.java
@@ -8,7 +8,7 @@
* Contributors:
* CEA - initial API and implementation and/or initial documentation
*/
-package org.eclipse.sensinact.studio.http.client.websockets;
+package org.eclipse.sensinact.studio.http.services.client.websockets;
import java.util.concurrent.CountDownLatch;
import java.util.concurrent.TimeUnit;
@@ -19,7 +19,7 @@
import org.eclipse.jetty.websocket.api.annotations.OnWebSocketConnect;
import org.eclipse.jetty.websocket.api.annotations.OnWebSocketMessage;
import org.eclipse.jetty.websocket.api.annotations.WebSocket;
-import org.eclipse.sensinact.studio.http.client.subscribe.agent.Agent;
+import org.eclipse.sensinact.studio.http.services.client.subscribe.agent.Agent;
import org.eclipse.sensinact.studio.preferences.ConfigurationManager;
import org.eclipse.sensinact.studio.preferences.GatewayHttpConfig;
import org.json.JSONException;
diff --git a/services/org.eclipse.sensinact.studio.http/src/org/eclipse/sensinact/studio/http/client/websockets/SensinactWebSocketConnectionManager.java b/services/org.eclipse.sensinact.studio.http.services/src/org/eclipse/sensinact/studio/http/services/client/websockets/SensinactWebSocketConnectionManager.java
similarity index 96%
rename from services/org.eclipse.sensinact.studio.http/src/org/eclipse/sensinact/studio/http/client/websockets/SensinactWebSocketConnectionManager.java
rename to services/org.eclipse.sensinact.studio.http.services/src/org/eclipse/sensinact/studio/http/services/client/websockets/SensinactWebSocketConnectionManager.java
index a2ae513..aec03d9 100644
--- a/services/org.eclipse.sensinact.studio.http/src/org/eclipse/sensinact/studio/http/client/websockets/SensinactWebSocketConnectionManager.java
+++ b/services/org.eclipse.sensinact.studio.http.services/src/org/eclipse/sensinact/studio/http/services/client/websockets/SensinactWebSocketConnectionManager.java
@@ -8,7 +8,7 @@
* Contributors:
* CEA - initial API and implementation and/or initial documentation
*/
-package org.eclipse.sensinact.studio.http.client.websockets;
+package org.eclipse.sensinact.studio.http.services.client.websockets;
import java.net.ConnectException;
import java.net.URI;
diff --git a/services/org.eclipse.sensinact.studio.http/src/org/eclipse/sensinact/studio/http/server/BundleResourceClientHelper.java b/services/org.eclipse.sensinact.studio.http.services/src/org/eclipse/sensinact/studio/http/services/server/BundleResourceClientHelper.java
similarity index 97%
rename from services/org.eclipse.sensinact.studio.http/src/org/eclipse/sensinact/studio/http/server/BundleResourceClientHelper.java
rename to services/org.eclipse.sensinact.studio.http.services/src/org/eclipse/sensinact/studio/http/services/server/BundleResourceClientHelper.java
index 148aeea..08a9852 100644
--- a/services/org.eclipse.sensinact.studio.http/src/org/eclipse/sensinact/studio/http/server/BundleResourceClientHelper.java
+++ b/services/org.eclipse.sensinact.studio.http.services/src/org/eclipse/sensinact/studio/http/services/server/BundleResourceClientHelper.java
@@ -8,7 +8,7 @@
* Contributors:
* CEA - initial API and implementation and/or initial documentation
*/
-package org.eclipse.sensinact.studio.http.server;
+package org.eclipse.sensinact.studio.http.services.server;
import java.net.URL;
import java.util.Date;
diff --git a/services/org.eclipse.sensinact.studio.http/src/org/eclipse/sensinact/studio/http/server/GatewayHttpServer.java b/services/org.eclipse.sensinact.studio.http.services/src/org/eclipse/sensinact/studio/http/services/server/GatewayHttpServer.java
similarity index 92%
rename from services/org.eclipse.sensinact.studio.http/src/org/eclipse/sensinact/studio/http/server/GatewayHttpServer.java
rename to services/org.eclipse.sensinact.studio.http.services/src/org/eclipse/sensinact/studio/http/services/server/GatewayHttpServer.java
index af4ee88..363c721 100644
--- a/services/org.eclipse.sensinact.studio.http/src/org/eclipse/sensinact/studio/http/server/GatewayHttpServer.java
+++ b/services/org.eclipse.sensinact.studio.http.services/src/org/eclipse/sensinact/studio/http/services/server/GatewayHttpServer.java
@@ -8,16 +8,16 @@
* Contributors:
* CEA - initial API and implementation and/or initial documentation
*/
-package org.eclipse.sensinact.studio.http.server;
+package org.eclipse.sensinact.studio.http.services.server;
import java.util.ArrayList;
import java.util.List;
import java.util.logging.Level;
import org.apache.log4j.Logger;
-import org.eclipse.sensinact.studio.http.server.serverstarted.PortUpdate;
-import org.eclipse.sensinact.studio.http.server.serverstarted.ResourceAddedUpdate;
-import org.eclipse.sensinact.studio.http.server.serverstarted.ServerUpdatedManager;
+import org.eclipse.sensinact.studio.http.services.server.serverstarted.PortUpdate;
+import org.eclipse.sensinact.studio.http.services.server.serverstarted.ResourceAddedUpdate;
+import org.eclipse.sensinact.studio.http.services.server.serverstarted.ServerUpdatedManager;
import org.eclipse.sensinact.studio.preferences.ConfigurationListerner;
import org.eclipse.sensinact.studio.preferences.ConfigurationManager;
import org.eclipse.sensinact.studio.preferences.GatewayHttpConfig;
diff --git a/services/org.eclipse.sensinact.studio.http/src/org/eclipse/sensinact/studio/http/server/RouteUtil.java b/services/org.eclipse.sensinact.studio.http.services/src/org/eclipse/sensinact/studio/http/services/server/RouteUtil.java
similarity index 95%
rename from services/org.eclipse.sensinact.studio.http/src/org/eclipse/sensinact/studio/http/server/RouteUtil.java
rename to services/org.eclipse.sensinact.studio.http.services/src/org/eclipse/sensinact/studio/http/services/server/RouteUtil.java
index 3616732..e8cd67b 100644
--- a/services/org.eclipse.sensinact.studio.http/src/org/eclipse/sensinact/studio/http/server/RouteUtil.java
+++ b/services/org.eclipse.sensinact.studio.http.services/src/org/eclipse/sensinact/studio/http/services/server/RouteUtil.java
@@ -8,7 +8,7 @@
* Contributors:
* CEA - initial API and implementation and/or initial documentation
*/
-package org.eclipse.sensinact.studio.http.server;
+package org.eclipse.sensinact.studio.http.services.server;
import org.apache.log4j.Logger;
import org.restlet.Application;
diff --git a/services/org.eclipse.sensinact.studio.http/src/org/eclipse/sensinact/studio/http/server/SensinactServerResource.java b/services/org.eclipse.sensinact.studio.http.services/src/org/eclipse/sensinact/studio/http/services/server/SensinactServerResource.java
similarity index 92%
rename from services/org.eclipse.sensinact.studio.http/src/org/eclipse/sensinact/studio/http/server/SensinactServerResource.java
rename to services/org.eclipse.sensinact.studio.http.services/src/org/eclipse/sensinact/studio/http/services/server/SensinactServerResource.java
index 4e96827..ffe3aec 100644
--- a/services/org.eclipse.sensinact.studio.http/src/org/eclipse/sensinact/studio/http/server/SensinactServerResource.java
+++ b/services/org.eclipse.sensinact.studio.http.services/src/org/eclipse/sensinact/studio/http/services/server/SensinactServerResource.java
@@ -8,7 +8,7 @@
* Contributors:
* CEA - initial API and implementation and/or initial documentation
*/
-package org.eclipse.sensinact.studio.http.server;
+package org.eclipse.sensinact.studio.http.services.server;
import java.io.UnsupportedEncodingException;
import java.net.URLDecoder;
diff --git a/services/org.eclipse.sensinact.studio.http/src/org/eclipse/sensinact/studio/http/server/serverstarted/PortUpdate.java b/services/org.eclipse.sensinact.studio.http.services/src/org/eclipse/sensinact/studio/http/services/server/serverstarted/PortUpdate.java
similarity index 89%
rename from services/org.eclipse.sensinact.studio.http/src/org/eclipse/sensinact/studio/http/server/serverstarted/PortUpdate.java
rename to services/org.eclipse.sensinact.studio.http.services/src/org/eclipse/sensinact/studio/http/services/server/serverstarted/PortUpdate.java
index dc9d53e..4757ab4 100644
--- a/services/org.eclipse.sensinact.studio.http/src/org/eclipse/sensinact/studio/http/server/serverstarted/PortUpdate.java
+++ b/services/org.eclipse.sensinact.studio.http.services/src/org/eclipse/sensinact/studio/http/services/server/serverstarted/PortUpdate.java
@@ -8,7 +8,7 @@
* Contributors:
* CEA - initial API and implementation and/or initial documentation
*/
-package org.eclipse.sensinact.studio.http.server.serverstarted;
+package org.eclipse.sensinact.studio.http.services.server.serverstarted;
/**
* @author Etienne Gandrille
diff --git a/services/org.eclipse.sensinact.studio.http/src/org/eclipse/sensinact/studio/http/server/serverstarted/ResourceAddedUpdate.java b/services/org.eclipse.sensinact.studio.http.services/src/org/eclipse/sensinact/studio/http/services/server/serverstarted/ResourceAddedUpdate.java
similarity index 92%
rename from services/org.eclipse.sensinact.studio.http/src/org/eclipse/sensinact/studio/http/server/serverstarted/ResourceAddedUpdate.java
rename to services/org.eclipse.sensinact.studio.http.services/src/org/eclipse/sensinact/studio/http/services/server/serverstarted/ResourceAddedUpdate.java
index d9d23b5..9bf506f 100644
--- a/services/org.eclipse.sensinact.studio.http/src/org/eclipse/sensinact/studio/http/server/serverstarted/ResourceAddedUpdate.java
+++ b/services/org.eclipse.sensinact.studio.http.services/src/org/eclipse/sensinact/studio/http/services/server/serverstarted/ResourceAddedUpdate.java
@@ -8,7 +8,7 @@
* Contributors:
* CEA - initial API and implementation and/or initial documentation
*/
-package org.eclipse.sensinact.studio.http.server.serverstarted;
+package org.eclipse.sensinact.studio.http.services.server.serverstarted;
import java.util.List;
diff --git a/services/org.eclipse.sensinact.studio.http/src/org/eclipse/sensinact/studio/http/server/serverstarted/ServerUpdatedListener.java b/services/org.eclipse.sensinact.studio.http.services/src/org/eclipse/sensinact/studio/http/services/server/serverstarted/ServerUpdatedListener.java
similarity index 87%
rename from services/org.eclipse.sensinact.studio.http/src/org/eclipse/sensinact/studio/http/server/serverstarted/ServerUpdatedListener.java
rename to services/org.eclipse.sensinact.studio.http.services/src/org/eclipse/sensinact/studio/http/services/server/serverstarted/ServerUpdatedListener.java
index dfb47b9..6b2d057 100644
--- a/services/org.eclipse.sensinact.studio.http/src/org/eclipse/sensinact/studio/http/server/serverstarted/ServerUpdatedListener.java
+++ b/services/org.eclipse.sensinact.studio.http.services/src/org/eclipse/sensinact/studio/http/services/server/serverstarted/ServerUpdatedListener.java
@@ -8,7 +8,7 @@
* Contributors:
* CEA - initial API and implementation and/or initial documentation
*/
-package org.eclipse.sensinact.studio.http.server.serverstarted;
+package org.eclipse.sensinact.studio.http.services.server.serverstarted;
/**
* @author Etienne Gandrille
diff --git a/services/org.eclipse.sensinact.studio.http/src/org/eclipse/sensinact/studio/http/server/serverstarted/ServerUpdatedManager.java b/services/org.eclipse.sensinact.studio.http.services/src/org/eclipse/sensinact/studio/http/services/server/serverstarted/ServerUpdatedManager.java
similarity index 94%
rename from services/org.eclipse.sensinact.studio.http/src/org/eclipse/sensinact/studio/http/server/serverstarted/ServerUpdatedManager.java
rename to services/org.eclipse.sensinact.studio.http.services/src/org/eclipse/sensinact/studio/http/services/server/serverstarted/ServerUpdatedManager.java
index f0b228a..73c3d8c 100644
--- a/services/org.eclipse.sensinact.studio.http/src/org/eclipse/sensinact/studio/http/server/serverstarted/ServerUpdatedManager.java
+++ b/services/org.eclipse.sensinact.studio.http.services/src/org/eclipse/sensinact/studio/http/services/server/serverstarted/ServerUpdatedManager.java
@@ -8,7 +8,7 @@
* Contributors:
* CEA - initial API and implementation and/or initial documentation
*/
-package org.eclipse.sensinact.studio.http.server.serverstarted;
+package org.eclipse.sensinact.studio.http.services.server.serverstarted;
import java.util.HashSet;
import java.util.Set;
diff --git a/services/org.eclipse.sensinact.studio.http/src/org/eclipse/sensinact/studio/http/server/serverstarted/UpdateDescriptor.java b/services/org.eclipse.sensinact.studio.http.services/src/org/eclipse/sensinact/studio/http/services/server/serverstarted/UpdateDescriptor.java
similarity index 89%
rename from services/org.eclipse.sensinact.studio.http/src/org/eclipse/sensinact/studio/http/server/serverstarted/UpdateDescriptor.java
rename to services/org.eclipse.sensinact.studio.http.services/src/org/eclipse/sensinact/studio/http/services/server/serverstarted/UpdateDescriptor.java
index 055050b..e9495f6 100644
--- a/services/org.eclipse.sensinact.studio.http/src/org/eclipse/sensinact/studio/http/server/serverstarted/UpdateDescriptor.java
+++ b/services/org.eclipse.sensinact.studio.http.services/src/org/eclipse/sensinact/studio/http/services/server/serverstarted/UpdateDescriptor.java
@@ -8,7 +8,7 @@
* Contributors:
* CEA - initial API and implementation and/or initial documentation
*/
-package org.eclipse.sensinact.studio.http.server.serverstarted;
+package org.eclipse.sensinact.studio.http.services.server.serverstarted;
/**
* @author Etienne Gandrille
diff --git a/services/org.eclipse.sensinact.studio.http/META-INF/MANIFEST.MF b/services/org.eclipse.sensinact.studio.http/META-INF/MANIFEST.MF
deleted file mode 100644
index 88fab04..0000000
--- a/services/org.eclipse.sensinact.studio.http/META-INF/MANIFEST.MF
+++ /dev/null
@@ -1,37 +0,0 @@
-Manifest-Version: 1.0
-Bundle-ManifestVersion: 2
-Bundle-Name: Http
-Bundle-SymbolicName: org.eclipse.sensinact.studio.http
-Bundle-Version: 1.0.0.qualifier
-Bundle-Activator: org.eclipse.sensinact.studio.http.Activator
-Require-Bundle: org.eclipse.core.runtime,
- org.json,
- org.restlet,
- org.eclipse.sensinact.studio.model.resource,
- org.apache.log4j,
- org.eclipse.sensinact.studio.preferences,
- com.fasterxml.jackson.core.jackson-databind;bundle-version="2.6.2",
- org.restlet.ext.jackson;bundle-version="2.2.3",
- com.fasterxml.jackson.core.jackson-core;bundle-version="2.6.2",
- org.eclipse.jetty.websocket.common;bundle-version="9.2.15"
-Bundle-RequiredExecutionEnvironment: JavaSE-1.8
-Bundle-ActivationPolicy: lazy
-Export-Package: org.eclipse.sensinact.studio.http.client,
- org.eclipse.sensinact.studio.http.client.connectionmanager,
- org.eclipse.sensinact.studio.http.client.snamessage,
- org.eclipse.sensinact.studio.http.client.snamessage.attributevalueupdated,
- org.eclipse.sensinact.studio.http.client.snamessage.basic,
- org.eclipse.sensinact.studio.http.client.snamessage.completelist,
- org.eclipse.sensinact.studio.http.client.snamessage.describeresource,
- org.eclipse.sensinact.studio.http.client.snamessage.getresponse,
- org.eclipse.sensinact.studio.http.client.snamessage.lifecycle,
- org.eclipse.sensinact.studio.http.client.snamessage.resourceslist,
- org.eclipse.sensinact.studio.http.client.snamessage.setresponse,
- org.eclipse.sensinact.studio.http.client.snamessage.subscriberesponse,
- org.eclipse.sensinact.studio.http.client.subscribe.agent,
- org.eclipse.sensinact.studio.http.client.subscribe.standard,
- org.eclipse.sensinact.studio.http.client.websockets,
- org.eclipse.sensinact.studio.http.server,
- org.eclipse.sensinact.studio.http.server.serverstarted
-Import-Package: org.apache.log4j,org.eclipse.jetty.websocket.client,org.eclipse.jetty.websocket.api.annotations,org.eclipse.jetty.websocket.api,org.eclipse.jetty.util.component
-
diff --git a/services/org.eclipse.sensinact.studio.http/build.properties b/services/org.eclipse.sensinact.studio.http/build.properties
deleted file mode 100644
index 411adc5..0000000
--- a/services/org.eclipse.sensinact.studio.http/build.properties
+++ /dev/null
@@ -1,15 +0,0 @@
-#
-# Copyright (c) 2018 CEA.
-# All rights reserved. This program and the accompanying materials
-# are made available under the terms of the Eclipse Public License v1.0
-# which accompanies this distribution, and is available at
-# http://www.eclipse.org/legal/epl-v10.html
-#
-# Contributors:
-# CEA - initial API and implementation and/or initial documentation
-#
-
-source.. = src/
-output.. = bin/
-bin.includes = META-INF/,\
- .
diff --git a/services/org.eclipse.sensinact.studio.http/definition.target b/services/org.eclipse.sensinact.studio.http/definition.target
deleted file mode 100644
index e4bdd75..0000000
--- a/services/org.eclipse.sensinact.studio.http/definition.target
+++ /dev/null
@@ -1,16 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<?pde version="3.8"?><target name="Running Platform" sequenceNumber="5">
-<locations>
-<location path="${eclipse_home}" type="Profile"/>
-<location path="/home/nj246216/Images/bundlejetty" type="Directory"/>
-</locations>
-<environment>
-<os>linux</os>
-<ws>gtk</ws>
-<arch>x86_64</arch>
-<nl>fr_FR</nl>
-</environment>
-<launcherArgs>
-<vmArgs>-Dosgi.requiredJavaVersion=1.7 -XX:MaxPermSize=256m -Xms256m -Xmx1024m</vmArgs>
-</launcherArgs>
-</target>
diff --git a/services/org.eclipse.sensinact.studio.http/src/org/eclipse/sensinact/studio/http/Activator.java b/services/org.eclipse.sensinact.studio.http/src/org/eclipse/sensinact/studio/http/Activator.java
deleted file mode 100644
index a0b5686..0000000
--- a/services/org.eclipse.sensinact.studio.http/src/org/eclipse/sensinact/studio/http/Activator.java
+++ /dev/null
@@ -1,48 +0,0 @@
-/**
- * Copyright (c) 2018 CEA.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * CEA - initial API and implementation and/or initial documentation
- */
-package org.eclipse.sensinact.studio.http;
-
-import org.osgi.framework.BundleActivator;
-import org.osgi.framework.BundleContext;
-
-/**
- * The activator class controls the plug-in life cycle
- */
-public class Activator implements BundleActivator {
-
- // The shared instance
- private static Activator plugin;
-
- /**
- * The constructor
- */
- public Activator() {
- }
-
- @Override
- public void start(BundleContext context) throws Exception {
- plugin = this;
- }
-
- @Override
- public void stop(BundleContext context) throws Exception {
- plugin = null;
- }
-
- /**
- * Returns the shared instance
- *
- * @return the shared instance
- */
- public static Activator getDefault() {
- return plugin;
- }
-}
diff --git a/services/org.eclipse.sensinact.studio.http/src/org/eclipse/sensinact/studio/http/client/snamessage/basic/MsgBasic.java b/services/org.eclipse.sensinact.studio.http/src/org/eclipse/sensinact/studio/http/client/snamessage/basic/MsgBasic.java
deleted file mode 100644
index 92a7d0f..0000000
--- a/services/org.eclipse.sensinact.studio.http/src/org/eclipse/sensinact/studio/http/client/snamessage/basic/MsgBasic.java
+++ /dev/null
@@ -1,10 +0,0 @@
-package org.eclipse.sensinact.studio.http.client.snamessage.basic;
-
-import org.eclipse.sensinact.studio.http.client.snamessage.MsgSensinact;
-
-public abstract class MsgBasic extends MsgSensinact {
-
- public MsgBasic(String type) {
- super(type);
- }
-}
diff --git a/services/org.eclipse.sensinact.studio.model.manager/META-INF/MANIFEST.MF b/services/org.eclipse.sensinact.studio.model.manager/META-INF/MANIFEST.MF
index 45a059a..110ea7e 100644
--- a/services/org.eclipse.sensinact.studio.model.manager/META-INF/MANIFEST.MF
+++ b/services/org.eclipse.sensinact.studio.model.manager/META-INF/MANIFEST.MF
@@ -8,9 +8,10 @@
org.eclipse.emf.transaction,
org.restlet,
org.eclipse.sensinact.studio.model.resource,
- org.eclipse.sensinact.studio.http,
org.apache.log4j,
- org.eclipse.sensinact.studio.preferences
+ org.eclipse.sensinact.studio.preferences,
+ org.eclipse.sensinact.studio.http.services,
+ org.eclipse.sensinact.studio.http.messages
Bundle-RequiredExecutionEnvironment: JavaSE-1.8
Bundle-ActivationPolicy: lazy
Export-Package: org.eclipse.sensinact.studio.model.manager.listener.devicelocation,
diff --git a/services/org.eclipse.sensinact.studio.model.manager/src/org/eclipse/sensinact/studio/model/manager/http/DeviceInfoRoute.java b/services/org.eclipse.sensinact.studio.model.manager/src/org/eclipse/sensinact/studio/model/manager/http/DeviceInfoRoute.java
index 3d87494..4003a55 100644
--- a/services/org.eclipse.sensinact.studio.model.manager/src/org/eclipse/sensinact/studio/model/manager/http/DeviceInfoRoute.java
+++ b/services/org.eclipse.sensinact.studio.model.manager/src/org/eclipse/sensinact/studio/model/manager/http/DeviceInfoRoute.java
@@ -15,7 +15,7 @@
import java.util.List;
import org.apache.log4j.Logger;
-import org.eclipse.sensinact.studio.http.server.SensinactServerResource;
+import org.eclipse.sensinact.studio.http.services.server.SensinactServerResource;
import org.eclipse.sensinact.studio.model.manager.modelupdater.ModelEditor;
import org.eclipse.sensinact.studio.model.manager.modelupdater.ModelUpdater;
import org.restlet.resource.Get;
diff --git a/services/org.eclipse.sensinact.studio.model.manager/src/org/eclipse/sensinact/studio/model/manager/http/GatewayHttpServerRoute.java b/services/org.eclipse.sensinact.studio.model.manager/src/org/eclipse/sensinact/studio/model/manager/http/GatewayHttpServerRoute.java
index 4443a57..edd3cc2 100644
--- a/services/org.eclipse.sensinact.studio.model.manager/src/org/eclipse/sensinact/studio/model/manager/http/GatewayHttpServerRoute.java
+++ b/services/org.eclipse.sensinact.studio.model.manager/src/org/eclipse/sensinact/studio/model/manager/http/GatewayHttpServerRoute.java
@@ -14,9 +14,9 @@
import java.util.List;
import org.apache.log4j.Logger;
-import org.eclipse.sensinact.studio.http.client.snamessage.MsgFactory;
-import org.eclipse.sensinact.studio.http.client.snamessage.MsgSensinact;
-import org.eclipse.sensinact.studio.http.server.SensinactServerResource;
+import org.eclipse.sensinact.studio.http.messages.snamessage.MsgFactory;
+import org.eclipse.sensinact.studio.http.messages.snamessage.MsgSensinact;
+import org.eclipse.sensinact.studio.http.services.server.SensinactServerResource;
import org.json.JSONArray;
import org.json.JSONException;
import org.json.JSONObject;
diff --git a/services/org.eclipse.sensinact.studio.model.manager/src/org/eclipse/sensinact/studio/model/manager/http/GatewayHttpServerRouteNew.java b/services/org.eclipse.sensinact.studio.model.manager/src/org/eclipse/sensinact/studio/model/manager/http/GatewayHttpServerRouteNew.java
index bb20775..cc3ac86 100644
--- a/services/org.eclipse.sensinact.studio.model.manager/src/org/eclipse/sensinact/studio/model/manager/http/GatewayHttpServerRouteNew.java
+++ b/services/org.eclipse.sensinact.studio.model.manager/src/org/eclipse/sensinact/studio/model/manager/http/GatewayHttpServerRouteNew.java
@@ -12,8 +12,8 @@
import java.util.List;
-import org.eclipse.sensinact.studio.http.client.snamessage.MsgSensinact;
-import org.eclipse.sensinact.studio.http.client.subscribe.agent.Agent;
+import org.eclipse.sensinact.studio.http.messages.snamessage.MsgSensinact;
+import org.eclipse.sensinact.studio.http.services.client.subscribe.agent.Agent;
import org.restlet.Response;
import org.restlet.data.Status;
import org.restlet.resource.Post;
diff --git a/services/org.eclipse.sensinact.studio.model.manager/src/org/eclipse/sensinact/studio/model/manager/http/GatewayHttpServerRouteOld.java b/services/org.eclipse.sensinact.studio.model.manager/src/org/eclipse/sensinact/studio/model/manager/http/GatewayHttpServerRouteOld.java
index a6ea6e0..48900af 100644
--- a/services/org.eclipse.sensinact.studio.model.manager/src/org/eclipse/sensinact/studio/model/manager/http/GatewayHttpServerRouteOld.java
+++ b/services/org.eclipse.sensinact.studio.model.manager/src/org/eclipse/sensinact/studio/model/manager/http/GatewayHttpServerRouteOld.java
@@ -12,8 +12,8 @@
import java.util.List;
-import org.eclipse.sensinact.studio.http.client.snamessage.MsgSensinact;
-import org.eclipse.sensinact.studio.http.client.subscribe.standard.SubscriptionManager;
+import org.eclipse.sensinact.studio.http.messages.snamessage.MsgSensinact;
+import org.eclipse.sensinact.studio.http.services.client.subscribe.standard.SubscriptionManager;
import org.restlet.Response;
import org.restlet.data.Status;
import org.restlet.resource.Post;
diff --git a/services/org.eclipse.sensinact.studio.model.manager/src/org/eclipse/sensinact/studio/model/manager/http/InitRoutes.java b/services/org.eclipse.sensinact.studio.model.manager/src/org/eclipse/sensinact/studio/model/manager/http/InitRoutes.java
index c536dfe..856427c 100644
--- a/services/org.eclipse.sensinact.studio.model.manager/src/org/eclipse/sensinact/studio/model/manager/http/InitRoutes.java
+++ b/services/org.eclipse.sensinact.studio.model.manager/src/org/eclipse/sensinact/studio/model/manager/http/InitRoutes.java
@@ -10,9 +10,9 @@
*/
package org.eclipse.sensinact.studio.model.manager.http;
-import org.eclipse.sensinact.studio.http.client.subscribe.agent.Agent;
-import org.eclipse.sensinact.studio.http.client.subscribe.standard.SubscriptionManager;
-import org.eclipse.sensinact.studio.http.server.RouteUtil;
+import org.eclipse.sensinact.studio.http.services.client.subscribe.agent.Agent;
+import org.eclipse.sensinact.studio.http.services.client.subscribe.standard.SubscriptionManager;
+import org.eclipse.sensinact.studio.http.services.server.RouteUtil;
/**
* @author Etienne Gandrille
diff --git a/services/org.eclipse.sensinact.studio.model.manager/src/org/eclipse/sensinact/studio/model/manager/http/PerformActionRoute.java b/services/org.eclipse.sensinact.studio.model.manager/src/org/eclipse/sensinact/studio/model/manager/http/PerformActionRoute.java
index 37911d9..7ca85cc 100644
--- a/services/org.eclipse.sensinact.studio.model.manager/src/org/eclipse/sensinact/studio/model/manager/http/PerformActionRoute.java
+++ b/services/org.eclipse.sensinact.studio.model.manager/src/org/eclipse/sensinact/studio/model/manager/http/PerformActionRoute.java
@@ -13,9 +13,9 @@
import java.io.UnsupportedEncodingException;
import org.apache.log4j.Logger;
-import org.eclipse.sensinact.studio.http.client.StudioRequest;
-import org.eclipse.sensinact.studio.http.client.UIResult;
-import org.eclipse.sensinact.studio.http.server.SensinactServerResource;
+import org.eclipse.sensinact.studio.http.services.client.StudioRequest;
+import org.eclipse.sensinact.studio.http.services.client.UIResult;
+import org.eclipse.sensinact.studio.http.services.server.SensinactServerResource;
import org.eclipse.sensinact.studio.model.resource.utils.ResourceDescriptor;
import org.restlet.resource.Get;
diff --git a/services/org.eclipse.sensinact.studio.model.manager/src/org/eclipse/sensinact/studio/model/manager/http/ServiceInfoRoute.java b/services/org.eclipse.sensinact.studio.model.manager/src/org/eclipse/sensinact/studio/model/manager/http/ServiceInfoRoute.java
index 6e61551..bce75a4 100644
--- a/services/org.eclipse.sensinact.studio.model.manager/src/org/eclipse/sensinact/studio/model/manager/http/ServiceInfoRoute.java
+++ b/services/org.eclipse.sensinact.studio.model.manager/src/org/eclipse/sensinact/studio/model/manager/http/ServiceInfoRoute.java
@@ -14,10 +14,10 @@
import java.util.List;
import org.apache.log4j.Logger;
-import org.eclipse.sensinact.studio.http.client.StudioRequest;
-import org.eclipse.sensinact.studio.http.client.snamessage.MsgSensinact;
-import org.eclipse.sensinact.studio.http.client.snamessage.getresponse.MsgGetResponse;
-import org.eclipse.sensinact.studio.http.server.SensinactServerResource;
+import org.eclipse.sensinact.studio.http.messages.snamessage.MsgSensinact;
+import org.eclipse.sensinact.studio.http.messages.snamessage.getresponse.MsgGetResponse;
+import org.eclipse.sensinact.studio.http.services.client.StudioRequest;
+import org.eclipse.sensinact.studio.http.services.server.SensinactServerResource;
import org.eclipse.sensinact.studio.model.manager.modelupdater.ModelEditor;
import org.eclipse.sensinact.studio.model.resource.utils.ResourceDescriptor;
import org.restlet.resource.Get;
diff --git a/services/org.eclipse.sensinact.studio.model.manager/src/org/eclipse/sensinact/studio/model/manager/http/UpdateLocationRoute.java b/services/org.eclipse.sensinact.studio.model.manager/src/org/eclipse/sensinact/studio/model/manager/http/UpdateLocationRoute.java
index b335789..bc9445f 100644
--- a/services/org.eclipse.sensinact.studio.model.manager/src/org/eclipse/sensinact/studio/model/manager/http/UpdateLocationRoute.java
+++ b/services/org.eclipse.sensinact.studio.model.manager/src/org/eclipse/sensinact/studio/model/manager/http/UpdateLocationRoute.java
@@ -13,7 +13,7 @@
import java.io.UnsupportedEncodingException;
import org.apache.log4j.Logger;
-import org.eclipse.sensinact.studio.http.server.SensinactServerResource;
+import org.eclipse.sensinact.studio.http.services.server.SensinactServerResource;
import org.eclipse.sensinact.studio.model.manager.listener.devicelocation.DeviceLocationManager;
import org.eclipse.sensinact.studio.model.resource.utils.DeviceDescriptor;
import org.eclipse.sensinact.studio.model.resource.utils.GPScoordinates;
diff --git a/services/org.eclipse.sensinact.studio.model.manager/src/org/eclipse/sensinact/studio/model/manager/modelupdater/ModelEditor.java b/services/org.eclipse.sensinact.studio.model.manager/src/org/eclipse/sensinact/studio/model/manager/modelupdater/ModelEditor.java
index 028d6d5..811980d 100644
--- a/services/org.eclipse.sensinact.studio.model.manager/src/org/eclipse/sensinact/studio/model/manager/modelupdater/ModelEditor.java
+++ b/services/org.eclipse.sensinact.studio.model.manager/src/org/eclipse/sensinact/studio/model/manager/modelupdater/ModelEditor.java
@@ -24,11 +24,11 @@
import org.eclipse.emf.transaction.RecordingCommand;
import org.eclipse.emf.transaction.RunnableWithResult;
import org.eclipse.emf.transaction.TransactionalEditingDomain;
-import org.eclipse.sensinact.studio.http.client.GatewayHttpClient;
-import org.eclipse.sensinact.studio.http.client.snamessage.MsgSensinact;
-import org.eclipse.sensinact.studio.http.client.snamessage.describeresource.MsgDescribeRessource;
-import org.eclipse.sensinact.studio.http.client.snamessage.describeresource.ObjectAccessMethods;
-import org.eclipse.sensinact.studio.http.client.snamessage.describeresource.ObjectParameter;
+import org.eclipse.sensinact.studio.http.messages.snamessage.MsgSensinact;
+import org.eclipse.sensinact.studio.http.messages.snamessage.describeresource.MsgDescribeRessource;
+import org.eclipse.sensinact.studio.http.messages.snamessage.describeresource.ObjectAccessMethods;
+import org.eclipse.sensinact.studio.http.messages.snamessage.describeresource.ObjectParameter;
+import org.eclipse.sensinact.studio.http.services.client.GatewayHttpClient;
import org.eclipse.sensinact.studio.model.manager.listener.devicelocation.DeviceLocationManager;
import org.eclipse.sensinact.studio.model.resource.utils.DeviceDescriptor;
import org.eclipse.sensinact.studio.model.resource.utils.ResourceDescriptor;
diff --git a/services/org.eclipse.sensinact.studio.model.manager/src/org/eclipse/sensinact/studio/model/manager/modelupdater/ModelUpdater.java b/services/org.eclipse.sensinact.studio.model.manager/src/org/eclipse/sensinact/studio/model/manager/modelupdater/ModelUpdater.java
index cfd69cc..79a0318 100644
--- a/services/org.eclipse.sensinact.studio.model.manager/src/org/eclipse/sensinact/studio/model/manager/modelupdater/ModelUpdater.java
+++ b/services/org.eclipse.sensinact.studio.model.manager/src/org/eclipse/sensinact/studio/model/manager/modelupdater/ModelUpdater.java
@@ -18,22 +18,22 @@
import javax.naming.directory.InvalidAttributesException;
import org.apache.log4j.Logger;
-import org.eclipse.sensinact.studio.http.client.GatewayHttpClient;
-import org.eclipse.sensinact.studio.http.client.GatewayHttpClient.RequestParameter;
-import org.eclipse.sensinact.studio.http.client.snamessage.MsgSensinact;
-import org.eclipse.sensinact.studio.http.client.snamessage.completelist.MsgCompleteList;
-import org.eclipse.sensinact.studio.http.client.snamessage.completelist.ObjectProvider;
-import org.eclipse.sensinact.studio.http.client.snamessage.completelist.ObjectResource;
-import org.eclipse.sensinact.studio.http.client.snamessage.completelist.ObjectService;
-import org.eclipse.sensinact.studio.http.client.snamessage.lifecycle.MsgProviderAppearing;
-import org.eclipse.sensinact.studio.http.client.snamessage.lifecycle.MsgProviderDisappearing;
-import org.eclipse.sensinact.studio.http.client.snamessage.lifecycle.MsgResourceAppearing;
-import org.eclipse.sensinact.studio.http.client.snamessage.lifecycle.MsgResourceDisappearing;
-import org.eclipse.sensinact.studio.http.client.snamessage.lifecycle.MsgServiceAppearing;
-import org.eclipse.sensinact.studio.http.client.snamessage.lifecycle.MsgServiceDisappearing;
-import org.eclipse.sensinact.studio.http.client.snamessage.resourceslist.MsgResourcesList;
-import org.eclipse.sensinact.studio.http.client.subscribe.agent.SubscriptionListener;
-import org.eclipse.sensinact.studio.http.client.subscribe.agent.SubscriptionManager;
+import org.eclipse.sensinact.studio.http.messages.snamessage.MsgSensinact;
+import org.eclipse.sensinact.studio.http.messages.snamessage.completelist.MsgCompleteList;
+import org.eclipse.sensinact.studio.http.messages.snamessage.completelist.ObjectProvider;
+import org.eclipse.sensinact.studio.http.messages.snamessage.completelist.ObjectResource;
+import org.eclipse.sensinact.studio.http.messages.snamessage.completelist.ObjectService;
+import org.eclipse.sensinact.studio.http.messages.snamessage.lifecycle.MsgProviderAppearing;
+import org.eclipse.sensinact.studio.http.messages.snamessage.lifecycle.MsgProviderDisappearing;
+import org.eclipse.sensinact.studio.http.messages.snamessage.lifecycle.MsgResourceAppearing;
+import org.eclipse.sensinact.studio.http.messages.snamessage.lifecycle.MsgResourceDisappearing;
+import org.eclipse.sensinact.studio.http.messages.snamessage.lifecycle.MsgServiceAppearing;
+import org.eclipse.sensinact.studio.http.messages.snamessage.lifecycle.MsgServiceDisappearing;
+import org.eclipse.sensinact.studio.http.messages.snamessage.resourceslist.MsgResourcesList;
+import org.eclipse.sensinact.studio.http.services.client.GatewayHttpClient;
+import org.eclipse.sensinact.studio.http.services.client.GatewayHttpClient.RequestParameter;
+import org.eclipse.sensinact.studio.http.services.client.subscribe.agent.SubscriptionListener;
+import org.eclipse.sensinact.studio.http.services.client.subscribe.agent.SubscriptionManager;
import org.eclipse.sensinact.studio.model.manager.listener.devicelocation.DeviceLocationManager;
import org.eclipse.sensinact.studio.model.resource.utils.DeviceDescriptor;
import org.eclipse.sensinact.studio.model.resource.utils.GPScoordinates;
diff --git a/ui/org.eclipse.sensinact.studio.navigator.device/META-INF/MANIFEST.MF b/ui/org.eclipse.sensinact.studio.navigator.device/META-INF/MANIFEST.MF
index 1b68463..2d29633 100644
--- a/ui/org.eclipse.sensinact.studio.navigator.device/META-INF/MANIFEST.MF
+++ b/ui/org.eclipse.sensinact.studio.navigator.device/META-INF/MANIFEST.MF
@@ -14,11 +14,12 @@
org.eclipse.sensinact.studio.model.resource,
org.json,
org.eclipse.sensinact.studio.view.outdoor,
- org.eclipse.sensinact.studio.http,
org.eclipse.sensinact.studio.model.manager,
org.apache.log4j,
org.eclipse.sensinact.studio.ui.common,
org.eclipse.emf.transaction,
org.eclipse.jface,
- org.eclipse.sensinact.studio.preferences
+ org.eclipse.sensinact.studio.preferences,
+ org.eclipse.sensinact.studio.http.services,
+ org.eclipse.sensinact.studio.http.messages
Export-Package: org.eclipse.sensinact.studio.navigator.device
diff --git a/ui/org.eclipse.sensinact.studio.navigator.device/src/org/eclipse/sensinact/studio/navigator/device/doubleclick/BasicQueryResourceHelper.java b/ui/org.eclipse.sensinact.studio.navigator.device/src/org/eclipse/sensinact/studio/navigator/device/doubleclick/BasicQueryResourceHelper.java
index aa5772a..5e3c6a2 100644
--- a/ui/org.eclipse.sensinact.studio.navigator.device/src/org/eclipse/sensinact/studio/navigator/device/doubleclick/BasicQueryResourceHelper.java
+++ b/ui/org.eclipse.sensinact.studio.navigator.device/src/org/eclipse/sensinact/studio/navigator/device/doubleclick/BasicQueryResourceHelper.java
@@ -11,8 +11,8 @@
package org.eclipse.sensinact.studio.navigator.device.doubleclick;
import org.eclipse.jface.dialogs.MessageDialog;
-import org.eclipse.sensinact.studio.http.client.StudioRequest;
-import org.eclipse.sensinact.studio.http.client.UIResult;
+import org.eclipse.sensinact.studio.http.services.client.StudioRequest;
+import org.eclipse.sensinact.studio.http.services.client.UIResult;
import org.eclipse.sensinact.studio.model.manager.modelupdater.ModelEditor;
import org.eclipse.sensinact.studio.model.resource.utils.ResourceDescriptor;
import org.eclipse.sensinact.studio.navigator.device.ui.dialogs.resourceInvoker.ResourceInvokerDialog;
diff --git a/ui/org.eclipse.sensinact.studio.navigator.device/src/org/eclipse/sensinact/studio/navigator/device/toolbar/ConnectHandler.java b/ui/org.eclipse.sensinact.studio.navigator.device/src/org/eclipse/sensinact/studio/navigator/device/toolbar/ConnectHandler.java
index c87611f..5005c20 100644
--- a/ui/org.eclipse.sensinact.studio.navigator.device/src/org/eclipse/sensinact/studio/navigator/device/toolbar/ConnectHandler.java
+++ b/ui/org.eclipse.sensinact.studio.navigator.device/src/org/eclipse/sensinact/studio/navigator/device/toolbar/ConnectHandler.java
@@ -20,7 +20,7 @@
import org.eclipse.jface.dialogs.MessageDialog;
import org.eclipse.jface.dialogs.ProgressMonitorDialog;
import org.eclipse.jface.operation.IRunnableWithProgress;
-import org.eclipse.sensinact.studio.http.client.subscribe.agent.Agent;
+import org.eclipse.sensinact.studio.http.services.client.subscribe.agent.Agent;
import org.eclipse.sensinact.studio.model.manager.modelupdater.ModelUpdater;
import org.eclipse.sensinact.studio.preferences.ConfigurationManager;
import org.eclipse.sensinact.studio.preferences.GatewayHttpConfig;
diff --git a/ui/org.eclipse.sensinact.studio.navigator.device/src/org/eclipse/sensinact/studio/navigator/device/toolbar/ConnectJob.java b/ui/org.eclipse.sensinact.studio.navigator.device/src/org/eclipse/sensinact/studio/navigator/device/toolbar/ConnectJob.java
index 03c0ac4..b0a9a30 100644
--- a/ui/org.eclipse.sensinact.studio.navigator.device/src/org/eclipse/sensinact/studio/navigator/device/toolbar/ConnectJob.java
+++ b/ui/org.eclipse.sensinact.studio.navigator.device/src/org/eclipse/sensinact/studio/navigator/device/toolbar/ConnectJob.java
@@ -19,8 +19,8 @@
import org.eclipse.core.runtime.Status;
import org.eclipse.core.runtime.jobs.Job;
import org.eclipse.jface.dialogs.MessageDialog;
-import org.eclipse.sensinact.studio.http.client.connectionmanager.ConnectionManager;
-import org.eclipse.sensinact.studio.http.client.subscribe.agent.Agent;
+import org.eclipse.sensinact.studio.http.services.client.connectionmanager.ConnectionManager;
+import org.eclipse.sensinact.studio.http.services.client.subscribe.agent.Agent;
import org.eclipse.sensinact.studio.preferences.ConfigurationManager;
import org.eclipse.sensinact.studio.preferences.GatewayHttpConfig;
import org.eclipse.swt.widgets.Display;
diff --git a/ui/org.eclipse.sensinact.studio.navigator.device/src/org/eclipse/sensinact/studio/navigator/device/toolbar/DisconnectHandler.java b/ui/org.eclipse.sensinact.studio.navigator.device/src/org/eclipse/sensinact/studio/navigator/device/toolbar/DisconnectHandler.java
index 8b46aff..bb26fd1 100644
--- a/ui/org.eclipse.sensinact.studio.navigator.device/src/org/eclipse/sensinact/studio/navigator/device/toolbar/DisconnectHandler.java
+++ b/ui/org.eclipse.sensinact.studio.navigator.device/src/org/eclipse/sensinact/studio/navigator/device/toolbar/DisconnectHandler.java
@@ -16,8 +16,8 @@
import org.eclipse.core.commands.ExecutionEvent;
import org.eclipse.core.commands.ExecutionException;
import org.eclipse.jface.dialogs.MessageDialog;
-import org.eclipse.sensinact.studio.http.client.subscribe.agent.Agent;
-import org.eclipse.sensinact.studio.http.client.websockets.SensinactWebSocketConnectionManager;
+import org.eclipse.sensinact.studio.http.services.client.subscribe.agent.Agent;
+import org.eclipse.sensinact.studio.http.services.client.websockets.SensinactWebSocketConnectionManager;
import org.eclipse.sensinact.studio.model.manager.modelupdater.ModelEditor;
import org.eclipse.sensinact.studio.preferences.ConfigurationManager;
import org.eclipse.sensinact.studio.preferences.GatewayHttpConfig;
diff --git a/ui/org.eclipse.sensinact.studio.navigator.device/src/org/eclipse/sensinact/studio/navigator/device/ui/dialogs/resourceInvoker/ParametersComposite.java b/ui/org.eclipse.sensinact.studio.navigator.device/src/org/eclipse/sensinact/studio/navigator/device/ui/dialogs/resourceInvoker/ParametersComposite.java
index 1f9d624..a49c848 100644
--- a/ui/org.eclipse.sensinact.studio.navigator.device/src/org/eclipse/sensinact/studio/navigator/device/ui/dialogs/resourceInvoker/ParametersComposite.java
+++ b/ui/org.eclipse.sensinact.studio.navigator.device/src/org/eclipse/sensinact/studio/navigator/device/ui/dialogs/resourceInvoker/ParametersComposite.java
@@ -13,7 +13,7 @@
import java.util.ArrayList;
import java.util.List;
-import org.eclipse.sensinact.studio.http.client.GatewayHttpClient.RequestParameter;
+import org.eclipse.sensinact.studio.http.services.client.GatewayHttpClient.RequestParameter;
import org.eclipse.sensinact.studio.navigator.device.ui.dialogs.resourceInvoker.parameterfield.ParameterField;
import org.eclipse.swt.SWT;
import org.eclipse.swt.layout.GridData;
diff --git a/ui/org.eclipse.sensinact.studio.navigator.device/src/org/eclipse/sensinact/studio/navigator/device/ui/dialogs/resourceInvoker/ResourceInvokerDialog.java b/ui/org.eclipse.sensinact.studio.navigator.device/src/org/eclipse/sensinact/studio/navigator/device/ui/dialogs/resourceInvoker/ResourceInvokerDialog.java
index db731a3..84ae13c 100644
--- a/ui/org.eclipse.sensinact.studio.navigator.device/src/org/eclipse/sensinact/studio/navigator/device/ui/dialogs/resourceInvoker/ResourceInvokerDialog.java
+++ b/ui/org.eclipse.sensinact.studio.navigator.device/src/org/eclipse/sensinact/studio/navigator/device/ui/dialogs/resourceInvoker/ResourceInvokerDialog.java
@@ -13,9 +13,9 @@
import org.apache.log4j.Logger;
import org.eclipse.jface.dialogs.IDialogConstants;
import org.eclipse.jface.dialogs.TitleAreaDialog;
-import org.eclipse.sensinact.studio.http.client.GatewayHttpClient;
-import org.eclipse.sensinact.studio.http.client.GatewayHttpClient.RequestParameter;
-import org.eclipse.sensinact.studio.http.client.snamessage.MsgSensinact;
+import org.eclipse.sensinact.studio.http.messages.snamessage.MsgSensinact;
+import org.eclipse.sensinact.studio.http.services.client.GatewayHttpClient;
+import org.eclipse.sensinact.studio.http.services.client.GatewayHttpClient.RequestParameter;
import org.eclipse.sensinact.studio.model.resource.utils.ResourceDescriptor;
import org.eclipse.sensinact.studio.model.resource.utils.Segments;
import org.eclipse.sensinact.studio.navigator.device.ui.dialogs.resourceInvoker.methodprovider.MethodProvider;
diff --git a/ui/org.eclipse.sensinact.studio.view.outdoor/META-INF/MANIFEST.MF b/ui/org.eclipse.sensinact.studio.view.outdoor/META-INF/MANIFEST.MF
index 8ea3765..a9f77e7 100644
--- a/ui/org.eclipse.sensinact.studio.view.outdoor/META-INF/MANIFEST.MF
+++ b/ui/org.eclipse.sensinact.studio.view.outdoor/META-INF/MANIFEST.MF
@@ -11,7 +11,8 @@
org.eclipse.core.runtime,
org.eclipse.sensinact.studio.model.resource,
org.eclipse.sensinact.studio.webapp.outdoor,
- org.eclipse.sensinact.studio.http,
+ org.eclipse.sensinact.studio.http.messages,
+ org.eclipse.sensinact.studio.http.services,
org.eclipse.sensinact.studio.model.manager,
org.apache.log4j,
org.eclipse.sensinact.studio.preferences
diff --git a/ui/org.eclipse.sensinact.studio.view.outdoor/src/org/eclipse/sensinact/studio/view/outdoor/OutdoorDeploymentView.java b/ui/org.eclipse.sensinact.studio.view.outdoor/src/org/eclipse/sensinact/studio/view/outdoor/OutdoorDeploymentView.java
index 80cb109..eaff729 100644
--- a/ui/org.eclipse.sensinact.studio.view.outdoor/src/org/eclipse/sensinact/studio/view/outdoor/OutdoorDeploymentView.java
+++ b/ui/org.eclipse.sensinact.studio.view.outdoor/src/org/eclipse/sensinact/studio/view/outdoor/OutdoorDeploymentView.java
@@ -18,12 +18,12 @@
import org.apache.log4j.Logger;
import org.eclipse.jface.dialogs.MessageDialog;
-import org.eclipse.sensinact.studio.http.server.GatewayHttpServer;
-import org.eclipse.sensinact.studio.http.server.serverstarted.PortUpdate;
-import org.eclipse.sensinact.studio.http.server.serverstarted.ResourceAddedUpdate;
-import org.eclipse.sensinact.studio.http.server.serverstarted.ServerUpdatedListener;
-import org.eclipse.sensinact.studio.http.server.serverstarted.ServerUpdatedManager;
-import org.eclipse.sensinact.studio.http.server.serverstarted.UpdateDescriptor;
+import org.eclipse.sensinact.studio.http.services.server.GatewayHttpServer;
+import org.eclipse.sensinact.studio.http.services.server.serverstarted.PortUpdate;
+import org.eclipse.sensinact.studio.http.services.server.serverstarted.ResourceAddedUpdate;
+import org.eclipse.sensinact.studio.http.services.server.serverstarted.ServerUpdatedListener;
+import org.eclipse.sensinact.studio.http.services.server.serverstarted.ServerUpdatedManager;
+import org.eclipse.sensinact.studio.http.services.server.serverstarted.UpdateDescriptor;
import org.eclipse.sensinact.studio.model.manager.listener.devicelocation.DeviceLocationListener;
import org.eclipse.sensinact.studio.model.manager.listener.devicelocation.DeviceLocationManager;
import org.eclipse.sensinact.studio.model.resource.utils.DeviceDescriptor;
diff --git a/ui/org.eclipse.sensinact.studio.view.piax/META-INF/MANIFEST.MF b/ui/org.eclipse.sensinact.studio.view.piax/META-INF/MANIFEST.MF
index 2726c23..01ca64e 100644
--- a/ui/org.eclipse.sensinact.studio.view.piax/META-INF/MANIFEST.MF
+++ b/ui/org.eclipse.sensinact.studio.view.piax/META-INF/MANIFEST.MF
@@ -10,7 +10,8 @@
org.eclipse.sensinact.studio.model.resource,
org.json,
org.eclipse.sensinact.studio.model.manager,
- org.eclipse.sensinact.studio.http,
+ org.eclipse.sensinact.studio.http.messages,
+ org.eclipse.sensinact.studio.http.services,
org.eclipse.sensinact.studio.ui.common,
org.eclipse.sensinact.studio.preferences
Bundle-RequiredExecutionEnvironment: JavaSE-1.8
diff --git a/ui/org.eclipse.sensinact.studio.view.projectexplorer/META-INF/MANIFEST.MF b/ui/org.eclipse.sensinact.studio.view.projectexplorer/META-INF/MANIFEST.MF
index 75a1576..d8aaf1a 100644
--- a/ui/org.eclipse.sensinact.studio.view.projectexplorer/META-INF/MANIFEST.MF
+++ b/ui/org.eclipse.sensinact.studio.view.projectexplorer/META-INF/MANIFEST.MF
@@ -11,7 +11,8 @@
org.eclipse.core.resources,
org.eclipse.sensinact.studio.language.sensinact,
org.eclipse.sensinact.studio.model.manager,
- org.eclipse.sensinact.studio.http,
+ org.eclipse.sensinact.studio.http.messages,
+ org.eclipse.sensinact.studio.http.services,
org.apache.log4j,
org.eclipse.sensinact.studio.ui.common
Bundle-RequiredExecutionEnvironment: JavaSE-1.8
diff --git a/ui/org.eclipse.sensinact.studio.view.projectexplorer/src/org/eclipse/sensinact/studio/view/projectexplorer/handler/SnaAppHandler.java b/ui/org.eclipse.sensinact.studio.view.projectexplorer/src/org/eclipse/sensinact/studio/view/projectexplorer/handler/SnaAppHandler.java
index a8aa2a2..859fd4c 100644
--- a/ui/org.eclipse.sensinact.studio.view.projectexplorer/src/org/eclipse/sensinact/studio/view/projectexplorer/handler/SnaAppHandler.java
+++ b/ui/org.eclipse.sensinact.studio.view.projectexplorer/src/org/eclipse/sensinact/studio/view/projectexplorer/handler/SnaAppHandler.java
@@ -22,7 +22,7 @@
import org.eclipse.jface.dialogs.MessageDialog;
import org.eclipse.sensinact.studio.ui.common.dialog.SnaHandler;
import org.eclipse.swt.widgets.Shell;
-import org.eclipse.sensinact.studio.http.client.snamessage.MsgSensinact;
+import org.eclipse.sensinact.studio.http.messages.snamessage.MsgSensinact;
import org.eclipse.sensinact.studio.language.sensinact.DSL_SENSINACT;
import org.eclipse.sensinact.studio.language.sensinact.Sensinact;
diff --git a/ui/org.eclipse.sensinact.studio.view.projectexplorer/src/org/eclipse/sensinact/studio/view/projectexplorer/handler/SnaDeployHandler.java b/ui/org.eclipse.sensinact.studio.view.projectexplorer/src/org/eclipse/sensinact/studio/view/projectexplorer/handler/SnaDeployHandler.java
index 5d6c6b2..d65ca39 100644
--- a/ui/org.eclipse.sensinact.studio.view.projectexplorer/src/org/eclipse/sensinact/studio/view/projectexplorer/handler/SnaDeployHandler.java
+++ b/ui/org.eclipse.sensinact.studio.view.projectexplorer/src/org/eclipse/sensinact/studio/view/projectexplorer/handler/SnaDeployHandler.java
@@ -19,8 +19,8 @@
import org.eclipse.emf.common.util.URI;
import org.eclipse.jface.dialogs.MessageDialog;
import org.eclipse.jface.window.Window;
-import org.eclipse.sensinact.studio.http.client.GatewayHttpClient;
-import org.eclipse.sensinact.studio.http.client.snamessage.MsgSensinact;
+import org.eclipse.sensinact.studio.http.messages.snamessage.MsgSensinact;
+import org.eclipse.sensinact.studio.http.services.client.GatewayHttpClient;
import org.eclipse.sensinact.studio.model.manager.modelupdater.ModelEditor;
import org.eclipse.sensinact.studio.model.resource.utils.Constants;
import org.eclipse.sensinact.studio.model.resource.utils.ResourceDescriptor;
diff --git a/ui/org.eclipse.sensinact.studio.view.projectexplorer/src/org/eclipse/sensinact/studio/view/projectexplorer/handler/SnaRemoveHandler.java b/ui/org.eclipse.sensinact.studio.view.projectexplorer/src/org/eclipse/sensinact/studio/view/projectexplorer/handler/SnaRemoveHandler.java
index 7b3ead5..0d7458d 100644
--- a/ui/org.eclipse.sensinact.studio.view.projectexplorer/src/org/eclipse/sensinact/studio/view/projectexplorer/handler/SnaRemoveHandler.java
+++ b/ui/org.eclipse.sensinact.studio.view.projectexplorer/src/org/eclipse/sensinact/studio/view/projectexplorer/handler/SnaRemoveHandler.java
@@ -20,8 +20,8 @@
import org.eclipse.emf.common.util.URI;
import org.eclipse.jface.dialogs.MessageDialog;
import org.eclipse.jface.window.Window;
-import org.eclipse.sensinact.studio.http.client.GatewayHttpClient;
-import org.eclipse.sensinact.studio.http.client.snamessage.MsgSensinact;
+import org.eclipse.sensinact.studio.http.messages.snamessage.MsgSensinact;
+import org.eclipse.sensinact.studio.http.services.client.GatewayHttpClient;
import org.eclipse.sensinact.studio.model.manager.modelupdater.ModelEditor;
import org.eclipse.sensinact.studio.model.resource.utils.Constants;
import org.eclipse.sensinact.studio.model.resource.utils.JsonUtil;
diff --git a/ui/org.eclipse.sensinact.studio.view.visualizer/META-INF/MANIFEST.MF b/ui/org.eclipse.sensinact.studio.view.visualizer/META-INF/MANIFEST.MF
index 80bddc2..d26f19a 100644
--- a/ui/org.eclipse.sensinact.studio.view.visualizer/META-INF/MANIFEST.MF
+++ b/ui/org.eclipse.sensinact.studio.view.visualizer/META-INF/MANIFEST.MF
@@ -12,7 +12,8 @@
org.eclipse.sensinact.studio.model.resource,
org.json,
org.eclipse.sensinact.studio.model.manager,
- org.eclipse.sensinact.studio.http,
+ org.eclipse.sensinact.studio.http.messages,
+ org.eclipse.sensinact.studio.http.services,
org.apache.log4j,
org.eclipse.sensinact.studio.preferences;bundle-version="1.0.0"
Bundle-RequiredExecutionEnvironment: JavaSE-1.8
diff --git a/ui/org.eclipse.sensinact.studio.view.visualizer/src/org/eclipse/sensinact/studio/view/visualizer/VisualizerView.java b/ui/org.eclipse.sensinact.studio.view.visualizer/src/org/eclipse/sensinact/studio/view/visualizer/VisualizerView.java
index 9635e11..9372028 100644
--- a/ui/org.eclipse.sensinact.studio.view.visualizer/src/org/eclipse/sensinact/studio/view/visualizer/VisualizerView.java
+++ b/ui/org.eclipse.sensinact.studio.view.visualizer/src/org/eclipse/sensinact/studio/view/visualizer/VisualizerView.java
@@ -18,11 +18,11 @@
import org.apache.log4j.Logger;
import org.eclipse.draw2d.LightweightSystem;
import org.eclipse.nebula.visualization.xygraph.figures.XYGraph;
-import org.eclipse.sensinact.studio.http.client.snamessage.MsgSensinact;
-import org.eclipse.sensinact.studio.http.client.snamessage.ValueType;
-import org.eclipse.sensinact.studio.http.client.snamessage.attributevalueupdated.MsgAttributeValueUpdated;
-import org.eclipse.sensinact.studio.http.client.subscribe.standard.SubscriptionListener;
-import org.eclipse.sensinact.studio.http.client.subscribe.standard.SubscriptionManager;
+import org.eclipse.sensinact.studio.http.messages.snamessage.MsgSensinact;
+import org.eclipse.sensinact.studio.http.messages.snamessage.ValueType;
+import org.eclipse.sensinact.studio.http.messages.snamessage.attributevalueupdated.MsgAttributeValueUpdated;
+import org.eclipse.sensinact.studio.http.services.client.subscribe.standard.SubscriptionListener;
+import org.eclipse.sensinact.studio.http.services.client.subscribe.standard.SubscriptionManager;
import org.eclipse.sensinact.studio.model.resource.utils.ResourceDescriptor;
import org.eclipse.sensinact.studio.view.visualizer.graphmanager.GraphManager;
import org.eclipse.swt.SWT;
diff --git a/webapp/org.eclipse.sensinact.studio.webapp.indoor/META-INF/MANIFEST.MF b/webapp/org.eclipse.sensinact.studio.webapp.indoor/META-INF/MANIFEST.MF
index 90de349..17bd674 100644
--- a/webapp/org.eclipse.sensinact.studio.webapp.indoor/META-INF/MANIFEST.MF
+++ b/webapp/org.eclipse.sensinact.studio.webapp.indoor/META-INF/MANIFEST.MF
@@ -7,7 +7,8 @@
Bundle-Vendor: CEA-LETI
Require-Bundle: org.eclipse.core.runtime,
org.restlet,
- org.eclipse.sensinact.studio.http,
+ org.eclipse.sensinact.studio.http.messages,
+ org.eclipse.sensinact.studio.http.services,
org.eclipse.ui.workbench,
org.apache.log4j
Bundle-RequiredExecutionEnvironment: JavaSE-1.8
diff --git a/webapp/org.eclipse.sensinact.studio.webapp.indoor/src/org/eclipse/sensinact/studio/webapp/indoor/Startup.java b/webapp/org.eclipse.sensinact.studio.webapp.indoor/src/org/eclipse/sensinact/studio/webapp/indoor/Startup.java
index 413f23f..3a7d343 100644
--- a/webapp/org.eclipse.sensinact.studio.webapp.indoor/src/org/eclipse/sensinact/studio/webapp/indoor/Startup.java
+++ b/webapp/org.eclipse.sensinact.studio.webapp.indoor/src/org/eclipse/sensinact/studio/webapp/indoor/Startup.java
@@ -10,7 +10,7 @@
*/
package org.eclipse.sensinact.studio.webapp.indoor;
-import org.eclipse.sensinact.studio.http.server.RouteUtil;
+import org.eclipse.sensinact.studio.http.services.server.RouteUtil;
import org.eclipse.sensinact.studio.webapp.indoor.content.IndoorApplication;
import org.eclipse.ui.IStartup;
diff --git a/webapp/org.eclipse.sensinact.studio.webapp.outdoor/META-INF/MANIFEST.MF b/webapp/org.eclipse.sensinact.studio.webapp.outdoor/META-INF/MANIFEST.MF
index c0b6977..f13205e 100644
--- a/webapp/org.eclipse.sensinact.studio.webapp.outdoor/META-INF/MANIFEST.MF
+++ b/webapp/org.eclipse.sensinact.studio.webapp.outdoor/META-INF/MANIFEST.MF
@@ -7,7 +7,8 @@
Bundle-Vendor: CEA-LETI
Require-Bundle: org.eclipse.core.runtime,
org.restlet,
- org.eclipse.sensinact.studio.http,
+ org.eclipse.sensinact.studio.http.messages,
+ org.eclipse.sensinact.studio.http.services,
org.eclipse.ui.workbench,
org.apache.log4j
Bundle-RequiredExecutionEnvironment: JavaSE-1.8
diff --git a/webapp/org.eclipse.sensinact.studio.webapp.outdoor/src/org/eclipse/sensinact/studio/webapp/outdoor/Startup.java b/webapp/org.eclipse.sensinact.studio.webapp.outdoor/src/org/eclipse/sensinact/studio/webapp/outdoor/Startup.java
index d019eb5..78415c1 100644
--- a/webapp/org.eclipse.sensinact.studio.webapp.outdoor/src/org/eclipse/sensinact/studio/webapp/outdoor/Startup.java
+++ b/webapp/org.eclipse.sensinact.studio.webapp.outdoor/src/org/eclipse/sensinact/studio/webapp/outdoor/Startup.java
@@ -10,7 +10,7 @@
*/
package org.eclipse.sensinact.studio.webapp.outdoor;
-import org.eclipse.sensinact.studio.http.server.RouteUtil;
+import org.eclipse.sensinact.studio.http.services.server.RouteUtil;
import org.eclipse.sensinact.studio.webapp.outdoor.content.OutdoorInit;
import org.eclipse.sensinact.studio.webapp.outdoor.content.OutdoorResources;
import org.eclipse.ui.IStartup;
diff --git a/webapp/org.eclipse.sensinact.studio.webapp.outdoor/src/org/eclipse/sensinact/studio/webapp/outdoor/content/OutdoorInit.java b/webapp/org.eclipse.sensinact.studio.webapp.outdoor/src/org/eclipse/sensinact/studio/webapp/outdoor/content/OutdoorInit.java
index 4e15e4f..eeed7bd 100644
--- a/webapp/org.eclipse.sensinact.studio.webapp.outdoor/src/org/eclipse/sensinact/studio/webapp/outdoor/content/OutdoorInit.java
+++ b/webapp/org.eclipse.sensinact.studio.webapp.outdoor/src/org/eclipse/sensinact/studio/webapp/outdoor/content/OutdoorInit.java
@@ -10,7 +10,7 @@
*/
package org.eclipse.sensinact.studio.webapp.outdoor.content;
-import org.eclipse.sensinact.studio.http.server.SensinactServerResource;
+import org.eclipse.sensinact.studio.http.services.server.SensinactServerResource;
import org.restlet.resource.Get;
/**
