Update to validate checkstyle process
remove inovallee project specific module
Suppress useless LocationResource type
diff --git a/distribution/generator/profile/inovallee/about.html b/distribution/generator/profile/inovallee/about.html
deleted file mode 100644
index c258ef5..0000000
--- a/distribution/generator/profile/inovallee/about.html
+++ /dev/null
@@ -1,28 +0,0 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN"
- "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
-<html xmlns="http://www.w3.org/1999/xhtml">
-<head>
-<meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1"/>
-<title>About</title>
-</head>
-<body lang="EN-US">
-<h2>About This Content</h2>
-
-<p>June 5, 2006</p>
-<h3>License</h3>
-
-<p>The Eclipse Foundation makes available all content in this plug-in ("Content"). Unless otherwise
-indicated below, the Content is provided to you under the terms and conditions of the
-Eclipse Public License Version 1.0 ("EPL"). A copy of the EPL is available
-at <a href="http://www.eclipse.org/legal/epl-v10.html">http://www.eclipse.org/legal/epl-v10.html</a>.
-For purposes of the EPL, "Program" will mean the Content.</p>
-
-<p>If you did not receive this Content directly from the Eclipse Foundation, the Content is
-being redistributed by another party ("Redistributor") and different terms and conditions may
-apply to your use of any object code in the Content. Check the Redistributor's license that was
-provided with the Content. If no such license exists, contact the Redistributor. Unless otherwise
-indicated below, the terms and conditions of the EPL still apply to any source code in the Content
-and such source code may be obtained at <a href="http://www.eclipse.org/">http://www.eclipse.org</a>.</p>
-
-</body>
-</html>
\ No newline at end of file
diff --git a/distribution/generator/profile/inovallee/pom.xml b/distribution/generator/profile/inovallee/pom.xml
deleted file mode 100644
index bba0d1b..0000000
--- a/distribution/generator/profile/inovallee/pom.xml
+++ /dev/null
@@ -1,63 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
- ~ Copyright (c) 2017 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
- -->
-<project xmlns="http://maven.apache.org/POM/4.0.0"
- xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
- xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
- <modelVersion>4.0.0</modelVersion>
-
- <parent>
- <groupId>org.eclipse.sensinact.gateway.distribution</groupId>
- <artifactId>profile</artifactId>
- <version>2.1-SNAPSHOT</version>
- <relativePath>../pom.xml</relativePath>
- </parent>
-
- <artifactId>inovallee</artifactId>
- <packaging>pom</packaging>
-
- <name>sensiNact IoT Gateway - sensiNact Runtime (${project.artifactId} bridge dependencies)</name>
-
- <build>
- <plugins>
- <plugin>
- <artifactId>maven-dependency-plugin</artifactId>
- <inherited>false</inherited>
- <executions>
- <execution>
- <id>copy-dependencies</id>
- <phase>package</phase>
- <goals>
- <goal>copy-dependencies</goal>
- </goals>
- <configuration>
- <outputDirectory>${project.build.directory}/sensinact/load/${artifactId}</outputDirectory>
- <excludeArtifactIds>${excludeArtifactId}</excludeArtifactIds>
- <excludeGroupIds>${excludeGroupId}</excludeGroupIds>
- <excludeTransitive>${excludeTransitive}</excludeTransitive>
- <excludeTypes>pom</excludeTypes>
- </configuration>
- <inherited>false</inherited>
- </execution>
- </executions>
- </plugin>
- </plugins>
- </build>
-
- <dependencies>
- <!-- This is an example of the dependency to provide to generate the profile -->
- <dependency>
- <groupId>org.eclipse.sensinact.gateway.sthbnd.inovallee</groupId>
- <artifactId>sensinact-inovallee</artifactId>
- <version>${project.version}</version>
- </dependency>
- </dependencies>
-</project>
diff --git a/distribution/generator/profile/pom.xml b/distribution/generator/profile/pom.xml
index ebaea44..35a5385 100644
--- a/distribution/generator/profile/pom.xml
+++ b/distribution/generator/profile/pom.xml
@@ -88,7 +88,6 @@
<module>mqtt-nb-profile</module>
<module>mqtt-server</module>
<module>openhab-profile</module>
- <module>inovallee</module>
<module>openweather-profile</module>
<module>onem2m</module>
<module>onem2m-mqttbinding</module>
diff --git a/integration-tests/mqtt-it/src/main/java/org/eclipse/sensinact/gateway/test/integration/mqtt/ConfigAdminDataInstanceConfiguration.java b/integration-tests/mqtt-it/src/main/java/org/eclipse/sensinact/gateway/test/integration/mqtt/ConfigAdminDataInstanceConfiguration.java
index 828a95b..7f64f9c 100644
--- a/integration-tests/mqtt-it/src/main/java/org/eclipse/sensinact/gateway/test/integration/mqtt/ConfigAdminDataInstanceConfiguration.java
+++ b/integration-tests/mqtt-it/src/main/java/org/eclipse/sensinact/gateway/test/integration/mqtt/ConfigAdminDataInstanceConfiguration.java
@@ -1,3 +1,13 @@
+/*
+ * Copyright (c) 2017 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
+ */
package org.eclipse.sensinact.gateway.test.integration.mqtt;
public interface ConfigAdminDataInstanceConfiguration {
diff --git a/integration-tests/mqtt-it/src/main/java/org/eclipse/sensinact/gateway/test/integration/mqtt/ConfigAdminDataInstanceConfigurationImpl.java b/integration-tests/mqtt-it/src/main/java/org/eclipse/sensinact/gateway/test/integration/mqtt/ConfigAdminDataInstanceConfigurationImpl.java
index ac94101..6379f9d 100644
--- a/integration-tests/mqtt-it/src/main/java/org/eclipse/sensinact/gateway/test/integration/mqtt/ConfigAdminDataInstanceConfigurationImpl.java
+++ b/integration-tests/mqtt-it/src/main/java/org/eclipse/sensinact/gateway/test/integration/mqtt/ConfigAdminDataInstanceConfigurationImpl.java
@@ -1,3 +1,13 @@
+/*
+ * Copyright (c) 2017 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
+ */
package org.eclipse.sensinact.gateway.test.integration.mqtt;
import org.osgi.service.cm.Configuration;
diff --git a/platform/northbound/geo-filtering/geojson-filter/src/main/java/org/eclipse/sensinact/gateway/nthbnd/filter/geojson/internal/GeoJSONFiltering.java b/platform/northbound/geo-filtering/geojson-filter/src/main/java/org/eclipse/sensinact/gateway/nthbnd/filter/geojson/internal/GeoJSONFiltering.java
index 505bf45..f0c63f8 100644
--- a/platform/northbound/geo-filtering/geojson-filter/src/main/java/org/eclipse/sensinact/gateway/nthbnd/filter/geojson/internal/GeoJSONFiltering.java
+++ b/platform/northbound/geo-filtering/geojson-filter/src/main/java/org/eclipse/sensinact/gateway/nthbnd/filter/geojson/internal/GeoJSONFiltering.java
@@ -11,9 +11,9 @@
package org.eclipse.sensinact.gateway.nthbnd.filter.geojson.internal;
import org.eclipse.sensinact.gateway.api.core.Filtering;
-import org.eclipse.sensinact.gateway.api.core.LocationResource;
import org.eclipse.sensinact.gateway.api.core.Resource;
import org.eclipse.sensinact.gateway.common.bundle.Mediator;
+import org.eclipse.sensinact.gateway.core.message.SnaConstants;
import org.eclipse.sensinact.gateway.util.LocationUtils;
import org.eclipse.sensinact.gateway.util.json.JSONObjectStatement;
import org.eclipse.sensinact.gateway.util.json.JSONTokenerStatement;
@@ -131,7 +131,7 @@
index++;
}
}
- if (token.ordinal() == JSONToken.JSON_OBJECT_ITEM.ordinal() && token.getContext().key.equals(LocationResource.LOCATION)) {
+ if (token.ordinal() == JSONToken.JSON_OBJECT_ITEM.ordinal() && token.getContext().key.equals(SnaConstants.LOCATION)) {
Integer ind = new Integer(count);
String location = (String) token.getContext().value;
if (location != null) {
diff --git a/platform/northbound/http-tools/src/main/java/org/eclipse/sensinact/gateway/nthbnd/http/callback/CallbackService.java b/platform/northbound/http-tools/src/main/java/org/eclipse/sensinact/gateway/nthbnd/http/callback/CallbackService.java
index 7adccad..853792c 100644
--- a/platform/northbound/http-tools/src/main/java/org/eclipse/sensinact/gateway/nthbnd/http/callback/CallbackService.java
+++ b/platform/northbound/http-tools/src/main/java/org/eclipse/sensinact/gateway/nthbnd/http/callback/CallbackService.java
@@ -10,8 +10,6 @@
*/
package org.eclipse.sensinact.gateway.nthbnd.http.callback;
-import org.eclipse.sensinact.gateway.common.execution.Executable;
-
import java.util.Dictionary;
/**
diff --git a/platform/northbound/http-tools/src/main/java/org/eclipse/sensinact/gateway/nthbnd/http/callback/internal/CallbackFactory.java b/platform/northbound/http-tools/src/main/java/org/eclipse/sensinact/gateway/nthbnd/http/callback/internal/CallbackFactory.java
index 9b21954..0770141 100644
--- a/platform/northbound/http-tools/src/main/java/org/eclipse/sensinact/gateway/nthbnd/http/callback/internal/CallbackFactory.java
+++ b/platform/northbound/http-tools/src/main/java/org/eclipse/sensinact/gateway/nthbnd/http/callback/internal/CallbackFactory.java
@@ -10,7 +10,6 @@
*/
package org.eclipse.sensinact.gateway.nthbnd.http.callback.internal;
-import java.util.Arrays;
import java.util.Collections;
import java.util.Dictionary;
import java.util.HashMap;
@@ -22,8 +21,6 @@
import org.eclipse.sensinact.gateway.common.bundle.Mediator;
import org.eclipse.sensinact.gateway.common.execution.Executable;
import org.eclipse.sensinact.gateway.nthbnd.http.callback.CallbackService;
-import org.osgi.framework.InvalidSyntaxException;
-import org.osgi.framework.ServiceReference;
import org.osgi.framework.ServiceRegistration;
import org.osgi.service.http.whiteboard.HttpWhiteboardConstants;
diff --git a/platform/northbound/http-tools/src/main/java/org/eclipse/sensinact/gateway/nthbnd/http/forward/ForwardingService.java b/platform/northbound/http-tools/src/main/java/org/eclipse/sensinact/gateway/nthbnd/http/forward/ForwardingService.java
index 44b7bdd..aae9dd4 100644
--- a/platform/northbound/http-tools/src/main/java/org/eclipse/sensinact/gateway/nthbnd/http/forward/ForwardingService.java
+++ b/platform/northbound/http-tools/src/main/java/org/eclipse/sensinact/gateway/nthbnd/http/forward/ForwardingService.java
@@ -10,9 +10,6 @@
*/
package org.eclipse.sensinact.gateway.nthbnd.http.forward;
-import org.eclipse.jetty.server.Request;
-import org.eclipse.sensinact.gateway.common.execution.Executable;
-
import java.util.Dictionary;
import javax.servlet.http.HttpServletRequest;
diff --git a/platform/northbound/http-tools/src/main/java/org/eclipse/sensinact/gateway/nthbnd/http/forward/internal/ForwardingFilter.java b/platform/northbound/http-tools/src/main/java/org/eclipse/sensinact/gateway/nthbnd/http/forward/internal/ForwardingFilter.java
index 95ae0ea..41c7892 100644
--- a/platform/northbound/http-tools/src/main/java/org/eclipse/sensinact/gateway/nthbnd/http/forward/internal/ForwardingFilter.java
+++ b/platform/northbound/http-tools/src/main/java/org/eclipse/sensinact/gateway/nthbnd/http/forward/internal/ForwardingFilter.java
@@ -24,7 +24,6 @@
import javax.servlet.ServletRequest;
import javax.servlet.ServletResponse;
import javax.servlet.annotation.WebFilter;
-import javax.servlet.http.HttpServletRequest;
import org.eclipse.jetty.http.HttpURI;
import org.eclipse.jetty.server.Request;
@@ -32,7 +31,6 @@
import org.eclipse.jetty.util.Attributes;
import org.eclipse.jetty.util.MultiMap;
import org.eclipse.sensinact.gateway.common.bundle.Mediator;
-import org.eclipse.sensinact.gateway.common.execution.Executable;
import org.eclipse.sensinact.gateway.nthbnd.http.forward.ForwardingService;
/**
diff --git a/platform/northbound/mqtt/mqtt-agent/src/test/java/org/eclipse/sensinact/gateway/mqtt/inst/test/MQTTAgentTest.java b/platform/northbound/mqtt/mqtt-agent/src/test/java/org/eclipse/sensinact/gateway/mqtt/inst/test/MQTTAgentTest.java
index 025f387..b8d0be4 100755
--- a/platform/northbound/mqtt/mqtt-agent/src/test/java/org/eclipse/sensinact/gateway/mqtt/inst/test/MQTTAgentTest.java
+++ b/platform/northbound/mqtt/mqtt-agent/src/test/java/org/eclipse/sensinact/gateway/mqtt/inst/test/MQTTAgentTest.java
@@ -131,11 +131,15 @@
client.connect();
client.subscribe("/slider/cursor/position");
}
- Thread.sleep(20 * 1000);
+ Thread.sleep(10 * 1000);
- instances.get(3).moveSlider(0);
- String s = instances.get(3).get("slider", "cursor", "position");
+ String s = instances.get(3).providers();
JSONObject j = new JSONObject(s);
+ System.out.println(j);
+
+ instances.get(3).moveSlider(0);
+ s = instances.get(3).get("slider", "cursor", "position");
+ j = new JSONObject(s);
assertEquals(0, j.getJSONObject("response").getInt("value"));
Thread.sleep(2000);
diff --git a/platform/northbound/mqtt/mqtt-agent/src/test/java/org/eclipse/sensinact/gateway/mqtt/inst/test/MidOSGiTestExtended.java b/platform/northbound/mqtt/mqtt-agent/src/test/java/org/eclipse/sensinact/gateway/mqtt/inst/test/MidOSGiTestExtended.java
index fbd2083..54aa419 100755
--- a/platform/northbound/mqtt/mqtt-agent/src/test/java/org/eclipse/sensinact/gateway/mqtt/inst/test/MidOSGiTestExtended.java
+++ b/platform/northbound/mqtt/mqtt-agent/src/test/java/org/eclipse/sensinact/gateway/mqtt/inst/test/MidOSGiTestExtended.java
@@ -90,7 +90,30 @@
configuration.put("felix.cache.rootdir", felixDir.getPath());
configuration.put("org.osgi.framework.storage", cacheDir.getName());
configuration.put("org.osgi.framework.bootdelegation", "*");
- configuration.put("org.osgi.framework.system.packages.extra", "org.eclipse.sensinact.gateway.test,org.slf4j,org.slf4j.impl," + "com.sun.net.httpserver," + "javax.activation," + "javax.net.ssl," + "javax.xml.parsers," + "javax.imageio," + "javax.management," + "javax.naming," + "javax.sql," + "javax.swing," + "javax.swing.border," + "javax.swing.event," + "javax.management.modelmbean," + "javax.management.remote," + "javax.security.auth," + "javax.security.cert," + "org.w3c.dom," + "org.xml.sax," + "org.xml.sax.helpers," + "sun.misc," + "javax.mail," + "javax.mail.internet," + "sun.security.action");
+ configuration.put("org.osgi.framework.system.packages.extra",
+ "org.eclipse.sensinact.gateway.test,"
+ + "org.slf4j,org.slf4j.impl,"
+ + "com.sun.net.httpserver,"
+ + "javax.activation,"
+ + "javax.net.ssl,javax.xml.parsers,"
+ + "javax.imageio,"
+ + "javax.management,"
+ + "javax.naming,"
+ + "javax.sql,"
+ + "javax.swing,"
+ + "javax.swing.border,"
+ + "javax.swing.event,"
+ + "javax.management.modelmbean,"
+ + "javax.management.remote,"
+ + "javax.security.auth,"
+ + "javax.security.cert,"
+ + "org.w3c.dom,"
+ + "org.xml.sax,"
+ + "org.xml.sax.helpers,"
+ + "sun.misc,"
+ + "javax.mail,"
+ + "javax.mail.internet,"
+ + "sun.security.action");
configuration.put("org.osgi.framework.storage.clean", "onFirstInit");
configuration.put("felix.auto.deploy.action", "install");
configuration.put("felix.log.level", "4");
diff --git a/platform/northbound/rest-access/src/main/java/org/eclipse/sensinact/gateway/nthbnd/rest/osgi/Activator.java b/platform/northbound/rest-access/src/main/java/org/eclipse/sensinact/gateway/nthbnd/rest/osgi/Activator.java
index b45c3c0..433f2df 100644
--- a/platform/northbound/rest-access/src/main/java/org/eclipse/sensinact/gateway/nthbnd/rest/osgi/Activator.java
+++ b/platform/northbound/rest-access/src/main/java/org/eclipse/sensinact/gateway/nthbnd/rest/osgi/Activator.java
@@ -12,8 +12,6 @@
import java.io.IOException;
import java.util.Hashtable;
-import java.util.Iterator;
-import java.util.ServiceLoader;
import java.util.concurrent.CountDownLatch;
import java.util.concurrent.atomic.AtomicBoolean;
diff --git a/platform/northbound/storage-agent/src/main/java/org/eclipse/sensinact/gateway/agent/storage/internal/StorageAgent.java b/platform/northbound/storage-agent/src/main/java/org/eclipse/sensinact/gateway/agent/storage/internal/StorageAgent.java
index 16c18cf..6cefacf 100644
--- a/platform/northbound/storage-agent/src/main/java/org/eclipse/sensinact/gateway/agent/storage/internal/StorageAgent.java
+++ b/platform/northbound/storage-agent/src/main/java/org/eclipse/sensinact/gateway/agent/storage/internal/StorageAgent.java
@@ -11,7 +11,6 @@
package org.eclipse.sensinact.gateway.agent.storage.internal;
import org.eclipse.sensinact.gateway.api.core.DataResource;
-import org.eclipse.sensinact.gateway.api.core.LocationResource;
import org.eclipse.sensinact.gateway.api.core.Resource;
import org.eclipse.sensinact.gateway.api.message.AbstractMessageAgentCallback;
import org.eclipse.sensinact.gateway.api.message.ErrorMessageImpl;
@@ -22,6 +21,7 @@
import org.eclipse.sensinact.gateway.common.bundle.Mediator;
import org.eclipse.sensinact.gateway.common.execution.DefaultErrorHandler;
import org.eclipse.sensinact.gateway.common.execution.ErrorHandler;
+import org.eclipse.sensinact.gateway.core.message.SnaConstants;
import org.eclipse.sensinact.gateway.util.UriUtils;
import org.json.JSONObject;
@@ -103,7 +103,7 @@
timestamp = System.currentTimeMillis();
}
String timestampStr = FORMAT.format(new Date(timestamp));
- if (LocationResource.LOCATION.equalsIgnoreCase(resource)) {
+ if (SnaConstants.LOCATION.equalsIgnoreCase(resource)) {
//set location and escape
try {
super.setLocation(serviceProvider, String.valueOf(initialValue));
diff --git a/platform/sensinact-core/src/main/java/org/eclipse/sensinact/gateway/core/ModelInstance.java b/platform/sensinact-core/src/main/java/org/eclipse/sensinact/gateway/core/ModelInstance.java
index 77d0a09..d0f79e5 100644
--- a/platform/sensinact-core/src/main/java/org/eclipse/sensinact/gateway/core/ModelInstance.java
+++ b/platform/sensinact-core/src/main/java/org/eclipse/sensinact/gateway/core/ModelInstance.java
@@ -64,9 +64,7 @@
double systemLongitude = 0d;
try {
systemLatitude = Double.parseDouble(mediator.getContext().getProperty(ServiceProvider.LATITUDE_PROPERTY));
-
systemLongitude = Double.parseDouble(mediator.getContext().getProperty(ServiceProvider.LONGITUDE_PROPERTY));
-
} catch (Exception e) {
systemLatitude = ServiceProvider.DEFAULT_CEA_LOCATION_LATITUDE;
systemLongitude = ServiceProvider.DEFAULT_CEA_LOCATION_LONGITUDE;
@@ -151,8 +149,9 @@
List<String> initialSetOfServices = this.configuration.getFixedServices(name);
initialSetOfServices.addAll(this.configuration.getServices(profileId));
- this.provider = ReflectUtils.getInstance(ServiceProviderImpl.class,
- this.configuration.getProviderImplementationType(), new Object[] { this, name, initialSetOfServices });
+ this.provider = ReflectUtils.getInstance(ServiceProviderImpl.class,
+ this.configuration.getProviderImplementationType(),
+ new Object[] { this, name, initialSetOfServices });
if (this.provider == null) {
throw new InvalidServiceProviderException("Unable to instantiate the root services provider");
@@ -269,7 +268,6 @@
*/
public ResourceBuilder createResourceBuilder(ResourceDescriptor descriptor) {
ResourceConfig resourceConfig = this.configuration().createResourceConfig(descriptor);
-
if (resourceConfig == null) {
return null;
}
@@ -359,8 +357,8 @@
Collection<ServiceReference<SensiNactResourceModel>> references = null;
try {
references = ModelInstance.this.mediator.getContext().getServiceReferences(
- SensiNactResourceModel.class,
- new StringBuilder().append("(name=").append(name).append(")").toString());
+ SensiNactResourceModel.class, new StringBuilder().append("(name="
+ ).append(name).append(")").toString());
} catch (InvalidSyntaxException e) {
ModelInstance.this.mediator.error(e);
}
diff --git a/platform/sensinact-core/src/main/java/org/eclipse/sensinact/gateway/core/ServiceProviderImpl.java b/platform/sensinact-core/src/main/java/org/eclipse/sensinact/gateway/core/ServiceProviderImpl.java
index 1f1aac7..e06a766 100644
--- a/platform/sensinact-core/src/main/java/org/eclipse/sensinact/gateway/core/ServiceProviderImpl.java
+++ b/platform/sensinact-core/src/main/java/org/eclipse/sensinact/gateway/core/ServiceProviderImpl.java
@@ -426,12 +426,15 @@
int index = -1;
if (admin.getResource(ServiceProvider.LIFECYCLE_STATUS) == null) {
- ResourceBuilder statusResourceBuilder = super.getModelInstance()
- .getResourceBuilder(super.getModelInstance().configuration().getResourceDescriptor()
- .withResourceType(PropertyResource.class).withResourceName(ServiceProvider.LIFECYCLE_STATUS)
- .withDataType(ServiceProvider.LifecycleStatus.class)
- .withDataValue(ServiceProvider.LifecycleStatus.INACTIVE).withHidden(true)
- .withUpdatePolicy(UpdatePolicy.AUTO).withModifiable(Modifiable.UPDATABLE), buildPolicy);
+ ResourceBuilder statusResourceBuilder = super.getModelInstance().getResourceBuilder(
+ super.getModelInstance().configuration().getResourceDescriptor(
+ ).withResourceType(PropertyResource.class
+ ).withResourceName(ServiceProvider.LIFECYCLE_STATUS
+ ).withDataType(ServiceProvider.LifecycleStatus.class
+ ).withDataValue(ServiceProvider.LifecycleStatus.INACTIVE
+ ).withHidden(true
+ ).withUpdatePolicy(UpdatePolicy.AUTO
+ ).withModifiable(Modifiable.UPDATABLE), buildPolicy);
admin.addResource(statusResourceBuilder);
}
if (admin.getResource(ServiceProvider.FRIENDLY_NAME) == null) {
@@ -441,7 +444,6 @@
rc = resourceConfigs.get(index);
friendlyNameResourceBuilder = super.getModelInstance().getResourceBuilder(rc);
index = -1;
-
} else {
friendlyNameResourceBuilder = super.getModelInstance().getResourceBuilder(super.getModelInstance()
.configuration().getResourceDescriptor().withResourceType(PropertyResource.class)
@@ -459,11 +461,14 @@
locationResourceBuilder = super.getModelInstance().getResourceBuilder(rc);
index = -1;
} else {
- locationResourceBuilder = super.getModelInstance().getResourceBuilder(super.getModelInstance()
- .configuration().getResourceDescriptor().withResourceType(PropertyResource.class)
- .withResourceName(SnaConstants.LOCATION).withDataType(String.class)
- .withDataValue(ModelInstance.defaultLocation(super.modelInstance.mediator())).withHidden(false)
- .withModifiable(Modifiable.MODIFIABLE), buildPolicy);
+ locationResourceBuilder = super.getModelInstance().getResourceBuilder(
+ super.getModelInstance().configuration().getResourceDescriptor(
+ ).withResourceType(PropertyResource.class
+ ).withResourceName(SnaConstants.LOCATION
+ ).withDataType(String.class
+ ).withDataValue(ModelInstance.defaultLocation(super.modelInstance.mediator())
+ ).withHidden(false
+ ).withModifiable(Modifiable.MODIFIABLE), buildPolicy);
}
locationResourceBuilder.configureName(SnaConstants.LOCATION);
admin.addResource(locationResourceBuilder);
@@ -471,20 +476,18 @@
if (admin.getResource(ServiceProvider.BRIDGE) == null) {
ResourceBuilder bridgeResourceBuilder = null;
try {
- bridgeResourceBuilder = super.getModelInstance()
- .getResourceBuilder(
- super.getModelInstance().configuration().getResourceDescriptor()
- .withResourceType(PropertyResource.class)
- .withResourceName(ServiceProvider.BRIDGE).withDataType(String.class)
- .withDataValue(super.modelInstance.mediator().getContext().getBundle()
- .getSymbolicName())
- .withHidden(false).withUpdatePolicy(UpdatePolicy.AUTO)
- .withModifiable(Modifiable.FIXED),
- buildPolicy);
+ bridgeResourceBuilder = super.getModelInstance().getResourceBuilder(
+ super.getModelInstance().configuration().getResourceDescriptor()
+ .withResourceType(PropertyResource.class)
+ .withResourceName(ServiceProvider.BRIDGE).withDataType(String.class)
+ .withDataValue(super.modelInstance.mediator().getContext().getBundle().getSymbolicName())
+ .withHidden(false).withUpdatePolicy(UpdatePolicy.AUTO)
+ .withModifiable(Modifiable.FIXED), buildPolicy);
admin.addResource(bridgeResourceBuilder);
} catch (Exception e) {
+ e.printStackTrace();
super.modelInstance.mediator().debug("Unable to create the 'bridge' resource");
bridgeResourceBuilder = null;
}
@@ -497,10 +500,14 @@
iconResourceBuilder = super.getModelInstance().getResourceBuilder(rc);
index = -1;
} else {
- iconResourceBuilder = super.getModelInstance().getResourceBuilder(super.getModelInstance()
- .configuration().getResourceDescriptor().withResourceType(PropertyResource.class)
- .withResourceName(ServiceProvider.ICON).withDataType(String.class).withHidden(false)
- .withUpdatePolicy(UpdatePolicy.AUTO).withModifiable(Modifiable.MODIFIABLE), buildPolicy);
+ iconResourceBuilder = super.getModelInstance().getResourceBuilder(
+ super.getModelInstance().configuration().getResourceDescriptor(
+ ).withResourceType(PropertyResource.class
+ ).withResourceName(ServiceProvider.ICON
+ ).withDataType(String.class
+ ).withHidden(false
+ ).withUpdatePolicy(UpdatePolicy.AUTO
+ ).withModifiable(Modifiable.MODIFIABLE), buildPolicy);
}
iconResourceBuilder.configureName(ServiceProvider.ICON);
admin.addResource(iconResourceBuilder);
diff --git a/platform/sensinact-core/src/main/java/org/eclipse/sensinact/gateway/core/remote/AbstractRemoteEndpoint.java b/platform/sensinact-core/src/main/java/org/eclipse/sensinact/gateway/core/remote/AbstractRemoteEndpoint.java
index 0d23c30..7c9569a 100644
--- a/platform/sensinact-core/src/main/java/org/eclipse/sensinact/gateway/core/remote/AbstractRemoteEndpoint.java
+++ b/platform/sensinact-core/src/main/java/org/eclipse/sensinact/gateway/core/remote/AbstractRemoteEndpoint.java
@@ -179,8 +179,6 @@
* @param connected
*/
private void setConnected(boolean connected) {
- System.out.println("SET CONNECTED "+connected);
- Thread.dumpStack();
synchronized(lock) {
this.connected = connected;
}
diff --git a/platform/sensinact-generic/src/main/java/org/eclipse/sensinact/gateway/generic/parser/ResourceInterfaceDefinition.java b/platform/sensinact-generic/src/main/java/org/eclipse/sensinact/gateway/generic/parser/ResourceInterfaceDefinition.java
index 16bc2ed..0520210 100644
--- a/platform/sensinact-generic/src/main/java/org/eclipse/sensinact/gateway/generic/parser/ResourceInterfaceDefinition.java
+++ b/platform/sensinact-generic/src/main/java/org/eclipse/sensinact/gateway/generic/parser/ResourceInterfaceDefinition.java
@@ -63,13 +63,13 @@
private Class resolveInterfaceType(String interfaceName) {
switch(interfaceName) {
- case "org.eclipse.sensinact.gateway.core.StateVariableResource" :
+ case "org.eclipse.sensinact.gateway.api.core.StateVariableResource" :
return XmlResourceConfigHandler.DEFAULT_VARIABLE_INTERFACE;
- case "org.eclipse.sensinact.gateway.core.SensorDataResource" :
+ case "org.eclipse.sensinact.gateway.api.core.SensorDataResource" :
return XmlResourceConfigHandler.DEFAULT_SENSOR_INTERFACE;
- case "org.eclipse.sensinact.gateway.core.PropertyResource":
+ case "org.eclipse.sensinact.gateway.api.core.PropertyResource":
return XmlResourceConfigHandler.DEFAULT_PROPERTY_INTERFACE;
- case "org.eclipse.sensinact.gateway.core.ActionResource":
+ case "org.eclipse.sensinact.gateway.api.core.ActionResource":
return XmlResourceConfigHandler.DEFAULT_ACTION_INTERFACE;
}
return null;
diff --git a/platform/sensinact-security/sensinact-security-core/src/test/resources/sensinact.sqlite b/platform/sensinact-security/sensinact-security-core/src/test/resources/sensinact.sqlite
index bd1a01b..8d8f1fc 100644
--- a/platform/sensinact-security/sensinact-security-core/src/test/resources/sensinact.sqlite
+++ b/platform/sensinact-security/sensinact-security-core/src/test/resources/sensinact.sqlite
Binary files differ
diff --git a/platform/sensinact-utils/src/main/java/org/eclipse/sensinact/gateway/util/ReflectUtils.java b/platform/sensinact-utils/src/main/java/org/eclipse/sensinact/gateway/util/ReflectUtils.java
index 302c2b5..294e94b 100644
--- a/platform/sensinact-utils/src/main/java/org/eclipse/sensinact/gateway/util/ReflectUtils.java
+++ b/platform/sensinact-utils/src/main/java/org/eclipse/sensinact/gateway/util/ReflectUtils.java
@@ -588,7 +588,6 @@
LOGGER.log(Level.CONFIG, baseClass.getName() + " is not assignable from " + implementationClass.getName());
}
} catch (Exception e) {
- e.printStackTrace();
LOGGER.log(Level.CONFIG, e.getMessage(), e);
}
return instance;
@@ -626,7 +625,6 @@
instance = implementationClass.newInstance();
}
} catch (Exception e) {
- e.printStackTrace();
LOGGER.log(Level.CONFIG, e.getMessage(), e);
}
return instance;
diff --git a/platform/southbound/http/openweather-device/src/main/java/org/eclipse/sensinact/gateway/sthbnd/http/openweather/internal/OpenWeatherPacketReader.java b/platform/southbound/http/openweather-device/src/main/java/org/eclipse/sensinact/gateway/sthbnd/http/openweather/internal/OpenWeatherPacketReader.java
index 71f0873..8d9a714 100644
--- a/platform/southbound/http/openweather-device/src/main/java/org/eclipse/sensinact/gateway/sthbnd/http/openweather/internal/OpenWeatherPacketReader.java
+++ b/platform/southbound/http/openweather-device/src/main/java/org/eclipse/sensinact/gateway/sthbnd/http/openweather/internal/OpenWeatherPacketReader.java
@@ -10,9 +10,9 @@
*/
package org.eclipse.sensinact.gateway.sthbnd.http.openweather.internal;
-import org.eclipse.sensinact.gateway.api.core.LocationResource;
import org.eclipse.sensinact.gateway.api.core.ServiceProvider;
import org.eclipse.sensinact.gateway.common.bundle.Mediator;
+import org.eclipse.sensinact.gateway.core.message.SnaConstants;
import org.eclipse.sensinact.gateway.generic.Task.CommandType;
import org.eclipse.sensinact.gateway.generic.packet.InvalidPacketException;
import org.eclipse.sensinact.gateway.generic.packet.SimplePacketReader;
@@ -79,7 +79,7 @@
if (coord != null) {
super.setServiceProviderId(station);
super.setServiceId(ServiceProvider.ADMINISTRATION_SERVICE_NAME);
- super.setResourceId(LocationResource.LOCATION);
+ super.setResourceId(SnaConstants.LOCATION);
super.setData(new StringBuilder().append(coord.optDouble("lat")).append(JSONUtils.COLON).append(coord.optDouble("lon")).toString());
super.setCommand(CommandType.GET);
super.configure();
diff --git a/platform/southbound/inovallee/about.html b/platform/southbound/inovallee/about.html
deleted file mode 100644
index c258ef5..0000000
--- a/platform/southbound/inovallee/about.html
+++ /dev/null
@@ -1,28 +0,0 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN"
- "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
-<html xmlns="http://www.w3.org/1999/xhtml">
-<head>
-<meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1"/>
-<title>About</title>
-</head>
-<body lang="EN-US">
-<h2>About This Content</h2>
-
-<p>June 5, 2006</p>
-<h3>License</h3>
-
-<p>The Eclipse Foundation makes available all content in this plug-in ("Content"). Unless otherwise
-indicated below, the Content is provided to you under the terms and conditions of the
-Eclipse Public License Version 1.0 ("EPL"). A copy of the EPL is available
-at <a href="http://www.eclipse.org/legal/epl-v10.html">http://www.eclipse.org/legal/epl-v10.html</a>.
-For purposes of the EPL, "Program" will mean the Content.</p>
-
-<p>If you did not receive this Content directly from the Eclipse Foundation, the Content is
-being redistributed by another party ("Redistributor") and different terms and conditions may
-apply to your use of any object code in the Content. Check the Redistributor's license that was
-provided with the Content. If no such license exists, contact the Redistributor. Unless otherwise
-indicated below, the terms and conditions of the EPL still apply to any source code in the Content
-and such source code may be obtained at <a href="http://www.eclipse.org/">http://www.eclipse.org</a>.</p>
-
-</body>
-</html>
\ No newline at end of file
diff --git a/platform/southbound/inovallee/pom.xml b/platform/southbound/inovallee/pom.xml
deleted file mode 100644
index 3ae56ab..0000000
--- a/platform/southbound/inovallee/pom.xml
+++ /dev/null
@@ -1,86 +0,0 @@
-<!--
- ~ Copyright (c) 2017 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
- -->
-
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
- xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
- <modelVersion>4.0.0</modelVersion>
-
- <parent>
- <groupId>org.eclipse.sensinact.gateway.sthbnd</groupId>
- <artifactId>parent</artifactId>
- <version>2.1-SNAPSHOT</version>
- </parent>
-
- <groupId>org.eclipse.sensinact.gateway.sthbnd.inovallee</groupId>
- <artifactId>sensinact-inovallee</artifactId>
- <packaging>bundle</packaging>
-
- <name>sensiNact IoT Gateway - Inovallee bridge</name>
-
- <dependencies>
- <dependency>
- <groupId>org.eclipse.sensinact.gateway</groupId>
- <artifactId>sensinact-utils</artifactId>
- <version>${project.version}</version>
- <scope>provided</scope>
- </dependency>
- <dependency>
- <groupId>org.eclipse.sensinact.gateway</groupId>
- <artifactId>sensinact-core</artifactId>
- <version>${project.version}</version>
- <scope>provided</scope>
- </dependency>
- <dependency>
- <groupId>org.eclipse.sensinact.gateway</groupId>
- <artifactId>sensinact-common</artifactId>
- <version>${project.version}</version>
- <scope>provided</scope>
- </dependency>
- <dependency>
- <groupId>org.eclipse.sensinact.gateway</groupId>
- <artifactId>sensinact-generic</artifactId>
- <version>${project.version}</version>
- <scope>provided</scope>
- </dependency>
- <dependency>
- <groupId>org.eclipse.sensinact.gateway.protocol</groupId>
- <artifactId>http</artifactId>
- <version>${project.version}</version>
- <scope>provided</scope>
- </dependency>
- <dependency>
- <groupId>org.slf4j</groupId>
- <artifactId>slf4j-api</artifactId>
- <version>${slf4j.version}</version>
- </dependency>
- </dependencies>
-
- <build>
- <plugins>
- <plugin>
- <groupId>org.apache.felix</groupId>
- <artifactId>maven-bundle-plugin</artifactId>
- <extensions>true</extensions>
- <configuration>
- <instructions>
- <Bundle-Activator>
- org.eclipse.sensinact.gateway.sthbnd.inovallee.InovalleeActivator
- </Bundle-Activator>
- <Include-Resource>
- about.html,
- src/main/resources/
- </Include-Resource>
- </instructions>
- </configuration>
- </plugin>
- </plugins>
- </build>
-</project>
diff --git a/platform/southbound/inovallee/src/main/java/org/eclipse/sensinact/gateway/sthbnd/inovallee/InoResourceImpl.java b/platform/southbound/inovallee/src/main/java/org/eclipse/sensinact/gateway/sthbnd/inovallee/InoResourceImpl.java
deleted file mode 100644
index c16cef5..0000000
--- a/platform/southbound/inovallee/src/main/java/org/eclipse/sensinact/gateway/sthbnd/inovallee/InoResourceImpl.java
+++ /dev/null
@@ -1,65 +0,0 @@
-package org.eclipse.sensinact.gateway.sthbnd.inovallee;
-
-import org.eclipse.sensinact.gateway.common.primitive.InvalidValueException;
-import org.eclipse.sensinact.gateway.core.ModelInstance;
-import org.eclipse.sensinact.gateway.core.ResourceConfig;
-import org.eclipse.sensinact.gateway.core.ResourceImpl;
-import org.eclipse.sensinact.gateway.core.ServiceImpl;
-import org.eclipse.sensinact.gateway.core.method.AbstractAccessMethod;
-import org.eclipse.sensinact.gateway.core.method.AccessMethod;
-import org.eclipse.sensinact.gateway.core.method.AccessMethod.Type;
-import org.eclipse.sensinact.gateway.core.method.AccessMethodExecutor;
-import org.eclipse.sensinact.gateway.core.method.AccessMethodExecutor.ExecutionPolicy;
-import org.eclipse.sensinact.gateway.core.method.AccessMethodResponseBuilder;
-import org.eclipse.sensinact.gateway.core.method.Signature;
-import org.eclipse.sensinact.gateway.generic.ExtModelInstance;
-import org.eclipse.sensinact.gateway.generic.ExtResourceConfig;
-import org.eclipse.sensinact.gateway.generic.ExtResourceImpl;
-import org.eclipse.sensinact.gateway.generic.ExtServiceImpl;
-import org.eclipse.sensinact.gateway.generic.annotation.Act;
-import org.eclipse.sensinact.gateway.generic.annotation.Get;
-import org.eclipse.sensinact.gateway.generic.annotation.Subscribe;
-import org.eclipse.sensinact.gateway.generic.annotation.Unsubscribe;
-import org.eclipse.sensinact.gateway.generic.parser.MethodDefinition;
-import org.eclipse.sensinact.gateway.generic.parser.SignatureDefinition;
-import org.eclipse.sensinact.gateway.util.ReflectUtils;
-import org.json.JSONObject;
-
-import java.lang.annotation.Annotation;
-import java.lang.reflect.Method;
-import java.util.Iterator;
-import java.util.Map;
-import java.util.Set;
-
-
-public class InoResourceImpl extends ExtResourceImpl {
-
- protected InoResourceImpl(ExtModelInstance<?> modelInstance, ExtResourceConfig resourceConfig, ExtServiceImpl service) {
- super(modelInstance, resourceConfig, service);
- System.out.println("-----------> INIT");
- System.out.println("-----------> " + getName());
- System.out.println("-----------> " + getPath());
-
- }
-
- @Get
- public JSONObject notNamedAct() {
- System.out.println("-----------> NO ARGS");
- return new JSONObject();
- }
-
-
- @Get
- public JSONObject notNamedAct(String arg1) {
- System.out.println("-----------> 1 arg : " + arg1);
- return new JSONObject();
- }
-
-
- @Get
- public JSONObject notNamedAct(String arg1, String arg2) {
- System.out.println("-----------> 2 args : " + arg1 + " " + arg2);
- return new JSONObject();
- }
-}
-
diff --git a/platform/southbound/inovallee/src/main/java/org/eclipse/sensinact/gateway/sthbnd/inovallee/InovalleeActivator.java b/platform/southbound/inovallee/src/main/java/org/eclipse/sensinact/gateway/sthbnd/inovallee/InovalleeActivator.java
deleted file mode 100644
index d7d1d72..0000000
--- a/platform/southbound/inovallee/src/main/java/org/eclipse/sensinact/gateway/sthbnd/inovallee/InovalleeActivator.java
+++ /dev/null
@@ -1,88 +0,0 @@
-/*
- * Copyright (c) 2017 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
- */
-package org.eclipse.sensinact.gateway.sthbnd.inovallee;
-
-import static java.util.concurrent.TimeUnit.SECONDS;
-
-import java.util.ArrayList;
-import java.util.List;
-
-import org.eclipse.sensinact.gateway.generic.ExtModelConfigurationBuilder;
-import org.eclipse.sensinact.gateway.generic.GenericActivator;
-import org.eclipse.sensinact.gateway.generic.model.Resource;
-import org.eclipse.sensinact.gateway.generic.model.Tree;
-import org.eclipse.sensinact.gateway.sthbnd.inovallee.fetcher.EliorFetcher;
-import org.eclipse.sensinact.gateway.sthbnd.inovallee.fetcher.MobilityFetcher;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-
-/**
- * sensiNact bundle activator
- */
-public class InovalleeActivator extends GenericActivator {
-
- private static final Logger LOG = LoggerFactory.getLogger(InovalleeActivator.class);
- private Periodic periodic;
-
- @Override
- public void doStart() throws Exception {
- super.doStart();
- LOG.info("Thread created for " + InovalleeActivator.class.getName());
- periodic = new Periodic(new Runnable() {
- @Override
- public void run() {
- try {
- LOG.info("Periodic update triggered " + InovalleeActivator.class.getName());
- updateData();
- } catch (Exception e) {
- LOG.error("Error during periodic update : " + e.getMessage());
- }
- }
- }, 1, 60, SECONDS);
- }
-
- @Override
- protected ExtModelConfigurationBuilder configureBuilder(ExtModelConfigurationBuilder builder) {
- return builder.withResourceImplementationType(InoResourceImpl.class);
- }
-
- @Override
- public void doStop() {
- super.doStop();
- LOG.info("Thread killed for " + InovalleeActivator.class.getName());
- periodic.stop();
- }
-
- void updateData() throws Exception {
- List<InovalleePacket> eliorPackets = treeToPackets(new EliorFetcher().fetch());
- LOG.info("Processing " + eliorPackets.size() + " Elior packets");
- processPackets(eliorPackets);
- List<InovalleePacket> mobilityPackets = treeToPackets(new MobilityFetcher().fetch());
- LOG.info("Processing " + mobilityPackets.size() + " mobility packets");
- processPackets(mobilityPackets);
- }
-
- private List<InovalleePacket> treeToPackets(Tree tree) {
- List<InovalleePacket> list = new ArrayList<>();
- for (Resource r : tree.getResources())
- list.add(new InovalleePacket(r.getProvider().getId(), r.getService().getId(), r.getId(), r.getValue()));
- return list;
- }
-
- @Override
- public InovalleeProtocolStackEndpoint getEndPoint() {
- return new InovalleeProtocolStackEndpoint(mediator);
- }
-
- public Class getPacketClass() {
- return InovalleePacket.class;
- }
-}
diff --git a/platform/southbound/inovallee/src/main/java/org/eclipse/sensinact/gateway/sthbnd/inovallee/InovalleePacket.java b/platform/southbound/inovallee/src/main/java/org/eclipse/sensinact/gateway/sthbnd/inovallee/InovalleePacket.java
deleted file mode 100644
index f6ba1f5..0000000
--- a/platform/southbound/inovallee/src/main/java/org/eclipse/sensinact/gateway/sthbnd/inovallee/InovalleePacket.java
+++ /dev/null
@@ -1,85 +0,0 @@
-/*
- * Copyright (c) 2017 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
- */
-package org.eclipse.sensinact.gateway.sthbnd.inovallee;
-
-import org.eclipse.sensinact.gateway.generic.packet.Packet;
-import org.eclipse.sensinact.gateway.generic.packet.annotation.Data;
-import org.eclipse.sensinact.gateway.generic.packet.annotation.GoodbyeMessage;
-import org.eclipse.sensinact.gateway.generic.packet.annotation.HelloMessage;
-import org.eclipse.sensinact.gateway.generic.packet.annotation.ResourceID;
-import org.eclipse.sensinact.gateway.generic.packet.annotation.ServiceID;
-import org.eclipse.sensinact.gateway.generic.packet.annotation.ServiceProviderID;
-
-public class InovalleePacket implements Packet {
-
- @ServiceProviderID
- private String providerId;
- @ServiceID
- private String serviceId;
- @ResourceID
- private String resourceId;
- @Data
- private String payload;
- @HelloMessage
- private boolean helloMessage;
- @GoodbyeMessage
- private boolean goodbyeMessage;
-
- public InovalleePacket(String providerId) {
- this.providerId = providerId;
- }
-
- public InovalleePacket(String providerId, String serviceId, String resourceId, Object data) {
- this(providerId, serviceId, resourceId, data.toString());
- }
-
- public InovalleePacket(String providerId, String serviceId, String resourceId, String data) {
- this.providerId = providerId;
- this.serviceId = serviceId;
- this.resourceId = resourceId;
- this.payload = data;
- }
-
- public String getProviderId() {
- return providerId;
- }
-
- public String getServiceId() {
- return serviceId;
- }
-
- public String getResourceId() {
- return resourceId;
- }
-
- public String getPayload() {
- return payload;
- }
-
- @Override
- public byte[] getBytes() {
- // legacy. No need.
- return null;
- }
-
- public void setHelloMessage(boolean helloMessage) {
- this.helloMessage = helloMessage;
- }
-
- public void setGoodbyeMessage(boolean goodbyeMessage) {
- this.goodbyeMessage = goodbyeMessage;
- }
-
- @Override
- public String toString() {
- return "InovalleePacket [" + providerId + "/" + serviceId + "/" + resourceId + " = " + payload + "]";
- }
-}
diff --git a/platform/southbound/inovallee/src/main/java/org/eclipse/sensinact/gateway/sthbnd/inovallee/InovalleeProtocolStackEndpoint.java b/platform/southbound/inovallee/src/main/java/org/eclipse/sensinact/gateway/sthbnd/inovallee/InovalleeProtocolStackEndpoint.java
deleted file mode 100644
index 6f58f16..0000000
--- a/platform/southbound/inovallee/src/main/java/org/eclipse/sensinact/gateway/sthbnd/inovallee/InovalleeProtocolStackEndpoint.java
+++ /dev/null
@@ -1,20 +0,0 @@
-/*
- * Copyright (c) 2017 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
- */
-package org.eclipse.sensinact.gateway.sthbnd.inovallee;
-
-import org.eclipse.sensinact.gateway.common.bundle.Mediator;
-import org.eclipse.sensinact.gateway.generic.local.LocalProtocolStackEndpoint;
-
-public class InovalleeProtocolStackEndpoint extends LocalProtocolStackEndpoint<InovalleePacket> {
- public InovalleeProtocolStackEndpoint(Mediator mediator) {
- super(mediator);
- }
-}
diff --git a/platform/southbound/inovallee/src/main/java/org/eclipse/sensinact/gateway/sthbnd/inovallee/Periodic.java b/platform/southbound/inovallee/src/main/java/org/eclipse/sensinact/gateway/sthbnd/inovallee/Periodic.java
deleted file mode 100644
index 884da48..0000000
--- a/platform/southbound/inovallee/src/main/java/org/eclipse/sensinact/gateway/sthbnd/inovallee/Periodic.java
+++ /dev/null
@@ -1,30 +0,0 @@
-/*
- * Copyright (c) 2017 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
- */
-package org.eclipse.sensinact.gateway.sthbnd.inovallee;
-
-import java.util.concurrent.Executors;
-import java.util.concurrent.ScheduledExecutorService;
-import java.util.concurrent.ScheduledFuture;
-import java.util.concurrent.TimeUnit;
-
-public class Periodic {
-
- private final ScheduledExecutorService scheduler = Executors.newScheduledThreadPool(1);
- private final ScheduledFuture<?> handle;
-
- public Periodic(Runnable run, long initialDelay, long period, TimeUnit unit) {
- handle = scheduler.scheduleAtFixedRate(run, initialDelay, period, unit);
- }
-
- public void stop() {
- handle.cancel(true);
- }
-}
diff --git a/platform/southbound/inovallee/src/main/java/org/eclipse/sensinact/gateway/sthbnd/inovallee/fetcher/EliorFetcher.java b/platform/southbound/inovallee/src/main/java/org/eclipse/sensinact/gateway/sthbnd/inovallee/fetcher/EliorFetcher.java
deleted file mode 100644
index e0b9535..0000000
--- a/platform/southbound/inovallee/src/main/java/org/eclipse/sensinact/gateway/sthbnd/inovallee/fetcher/EliorFetcher.java
+++ /dev/null
@@ -1,78 +0,0 @@
-/*
- * Copyright (c) 2017 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
- */
-/*
- * Copyright (c) 2017 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
- */
-package org.eclipse.sensinact.gateway.sthbnd.inovallee.fetcher;
-
-import java.io.IOException;
-
-import org.eclipse.sensinact.gateway.generic.model.Tree;
-import org.eclipse.sensinact.gateway.sthbnd.inovallee.http.BasicHttpClient;
-import org.eclipse.sensinact.gateway.sthbnd.inovallee.http.Response;
-import org.json.JSONArray;
-import org.json.JSONObject;
-
-public class EliorFetcher extends Fetcher {
-
- private final BasicHttpClient client = new BasicHttpClient();
- private final String url = "http://193.48.18.251:8095/restaurants/aggregated";
- //private final String url = "http://localhost:8095/restaurants/aggregated";
-
-
- public Tree fetch() throws IOException {
-
- Response response = get(client, url);
- JSONArray array = new JSONArray(response.getPayload());
-
- Tree tree = new Tree();
- for (int i=0; i< array.length(); i++) {
- JSONObject root = array.getJSONObject(i);
-
- // Restaurant
- JSONObject restau = root.getJSONObject("restaurant");
- Integer id = restau.getInt("id");
- String providerName = "elior-" + id;
- String name = restau.getString("name");
- JSONObject gps = restau.getJSONObject("gps");
- double lat = gps.getDouble("lat");
- double lng = gps.getDouble("lng");
- String location = lat + ":" + lng;
-
- tree.getOrCreateResource(providerName, "admin", "location", location);
- tree.getOrCreateResource(providerName, "admin", "id", id);
- tree.getOrCreateResource(providerName, "admin", "friendlyName", name);
-
- // Fluidité
- JSONObject fluidite = root.getJSONObject("fluidite");
- if (fluidite.get("data") != null) {
- JSONObject data = fluidite.getJSONObject("data");
- tree.getOrCreateResource(providerName, "fluidite", "capacite", data.getInt("capacite"));
- tree.getOrCreateResource(providerName, "fluidite", "dateDebut", data.getString("dateDebut"));
- tree.getOrCreateResource(providerName, "fluidite", "dateFin", data.getString("dateFin"));
- }
-
- // Menus
- JSONObject menus = root.getJSONObject("menus");
- if (menus.get("data") != null) {
- tree.getOrCreateResource(providerName, "menus", "menus", menus.getString("data"));
- }
- }
- return tree;
- }
-}
diff --git a/platform/southbound/inovallee/src/main/java/org/eclipse/sensinact/gateway/sthbnd/inovallee/fetcher/Fetcher.java b/platform/southbound/inovallee/src/main/java/org/eclipse/sensinact/gateway/sthbnd/inovallee/fetcher/Fetcher.java
deleted file mode 100644
index 28dcd20..0000000
--- a/platform/southbound/inovallee/src/main/java/org/eclipse/sensinact/gateway/sthbnd/inovallee/fetcher/Fetcher.java
+++ /dev/null
@@ -1,37 +0,0 @@
-/*
- * Copyright (c) 2017 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
- */
-package org.eclipse.sensinact.gateway.sthbnd.inovallee.fetcher;
-
-import java.io.IOException;
-
-import org.eclipse.sensinact.gateway.sthbnd.inovallee.http.BasicHttpClient;
-import org.eclipse.sensinact.gateway.sthbnd.inovallee.http.Response;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-
-public abstract class Fetcher {
-
- private static final Logger LOG = LoggerFactory.getLogger(Fetcher.class);
-
- protected Response get(BasicHttpClient client, String url) throws IOException {
- Response response = null;
- try {
- response = client.get(url);
- } catch (Exception e) {
- String msg = "Can't fetch " + url + " : " + e.getMessage();
- LOG.error(msg);
- throw new IOException(msg);
- }
- if (! response.isHttp2XX())
- throw new IOException("http " + response.getHttpCode() + " when fetching " + url);
- return response;
- }
-}
diff --git a/platform/southbound/inovallee/src/main/java/org/eclipse/sensinact/gateway/sthbnd/inovallee/fetcher/MobilityFetcher.java b/platform/southbound/inovallee/src/main/java/org/eclipse/sensinact/gateway/sthbnd/inovallee/fetcher/MobilityFetcher.java
deleted file mode 100644
index 04186e5..0000000
--- a/platform/southbound/inovallee/src/main/java/org/eclipse/sensinact/gateway/sthbnd/inovallee/fetcher/MobilityFetcher.java
+++ /dev/null
@@ -1,61 +0,0 @@
-/*
- * Copyright (c) 2017 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
- */
-package org.eclipse.sensinact.gateway.sthbnd.inovallee.fetcher;
-
-import java.io.IOException;
-
-import org.eclipse.sensinact.gateway.generic.model.Tree;
-import org.eclipse.sensinact.gateway.sthbnd.inovallee.http.BasicHttpClient;
-import org.eclipse.sensinact.gateway.sthbnd.inovallee.http.Response;
-import org.json.JSONArray;
-import org.json.JSONObject;
-
-public class MobilityFetcher extends Fetcher {
-
- private final BasicHttpClient client = new BasicHttpClient();
- private final String urlStations = "http://193.48.18.251:8095/mobilite/stations";
- //private final String urlStations = "http://localhost:8095/mobilite/stations";
-
- public Tree fetch() throws IOException {
- Response response = get(client, urlStations);
- JSONArray array = new JSONArray(response.getPayload());
-
- Tree tree = new Tree();
- for (int i = 0; i < array.length(); i++) {
- JSONObject root = array.getJSONObject(i);
-
- String id = root.getString("id");
- String code = root.getString("code");
- String libelle = root.getString("libelle");
- String commune = root.getString("commune");
-
- JSONObject gps = root.getJSONObject("gps");
- double lat = gps.getDouble("lat");
- double lng = gps.getDouble("lng");
- String location = lat + ":" + lng;
-
- String type = root.getString("type");
-
- String providerName = "stop-" + code;
-
- if (type.equals("arret") && id.startsWith("SEM")) {
- tree.getOrCreateResource(providerName, "admin", "location", location);
- tree.getOrCreateResource(providerName, "admin", "id", id);
- tree.getOrCreateResource(providerName, "admin", "code", code);
- tree.getOrCreateResource(providerName, "info", "libelle", libelle);
- tree.getOrCreateResource(providerName, "info", "commune", commune);
- tree.getOrCreateResource(providerName, "info", "type", type);
- }
- }
-
- return tree;
- }
-}
diff --git a/platform/southbound/inovallee/src/main/java/org/eclipse/sensinact/gateway/sthbnd/inovallee/http/BasicHttpClient.java b/platform/southbound/inovallee/src/main/java/org/eclipse/sensinact/gateway/sthbnd/inovallee/http/BasicHttpClient.java
deleted file mode 100644
index 29c8d37..0000000
--- a/platform/southbound/inovallee/src/main/java/org/eclipse/sensinact/gateway/sthbnd/inovallee/http/BasicHttpClient.java
+++ /dev/null
@@ -1,48 +0,0 @@
-/*
- * Copyright (c) 2017 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
- */
-package org.eclipse.sensinact.gateway.sthbnd.inovallee.http;
-
-import java.io.BufferedReader;
-import java.io.IOException;
-import java.io.InputStreamReader;
-import java.net.HttpURLConnection;
-import java.net.URL;
-
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-
-public class BasicHttpClient {
-
- private static final Logger LOG = LoggerFactory.getLogger(BasicHttpClient.class);
-
- public Response get(String url) throws IOException {
- URL obj = new URL(url);
- HttpURLConnection con = (HttpURLConnection) obj.openConnection();
- con.setRequestMethod("GET");
-
- // add request header
- // con.setRequestProperty("key", "value");
-
- int httpCode = con.getResponseCode();
-
- StringBuilder response = new StringBuilder();
- try (BufferedReader in = new BufferedReader(new InputStreamReader(con.getInputStream()))) {
- String line;
- while ((line = in.readLine()) != null) {
- response.append(line);
- }
- } catch (Exception e) {
- LOG.error("Can't parse payload", e);
- }
-
- return new Response(httpCode, response.toString());
- }
-}
diff --git a/platform/southbound/inovallee/src/main/java/org/eclipse/sensinact/gateway/sthbnd/inovallee/http/Response.java b/platform/southbound/inovallee/src/main/java/org/eclipse/sensinact/gateway/sthbnd/inovallee/http/Response.java
deleted file mode 100644
index b8c3317..0000000
--- a/platform/southbound/inovallee/src/main/java/org/eclipse/sensinact/gateway/sthbnd/inovallee/http/Response.java
+++ /dev/null
@@ -1,68 +0,0 @@
-/*
- * Copyright (c) 2017 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
- */
-package org.eclipse.sensinact.gateway.sthbnd.inovallee.http;
-
-public class Response {
-
- private final int httpCode;
- private final String payload;
-
- public Response(int httpCode, String payload) {
- super();
- this.httpCode = httpCode;
- this.payload = payload;
- }
-
- public int getHttpCode() {
- return httpCode;
- }
-
- public boolean isHttp2XX() {
- return httpCode >= 200 && httpCode <= 299;
- }
-
- public String getPayload() {
- return payload;
- }
-
- @Override
- public String toString() {
- return "Response [httpCode=" + httpCode + ", payload=" + payload + "]";
- }
-
- @Override
- public boolean equals(Object obj) {
- if (this == obj)
- return true;
- if (obj == null)
- return false;
- if (getClass() != obj.getClass())
- return false;
- Response other = (Response) obj;
- if (httpCode != other.httpCode)
- return false;
- if (payload == null) {
- if (other.payload != null)
- return false;
- } else if (!payload.equals(other.payload))
- return false;
- return true;
- }
-
- @Override
- public int hashCode() {
- final int prime = 31;
- int result = 1;
- result = prime * result + httpCode;
- result = prime * result + ((payload == null) ? 0 : payload.hashCode());
- return result;
- }
-}
diff --git a/platform/southbound/mqtt/mqtt-device/src/main/java/org/eclipse/sensinact/gateway/sthbnd/mqtt/device/MqttPacket.java b/platform/southbound/mqtt/mqtt-device/src/main/java/org/eclipse/sensinact/gateway/sthbnd/mqtt/device/MqttPacket.java
index 20c9109..59ac618 100644
--- a/platform/southbound/mqtt/mqtt-device/src/main/java/org/eclipse/sensinact/gateway/sthbnd/mqtt/device/MqttPacket.java
+++ b/platform/southbound/mqtt/mqtt-device/src/main/java/org/eclipse/sensinact/gateway/sthbnd/mqtt/device/MqttPacket.java
@@ -10,7 +10,6 @@
*/
package org.eclipse.sensinact.gateway.sthbnd.mqtt.device;
-import org.eclipse.sensinact.gateway.generic.annotation.Get;
import org.eclipse.sensinact.gateway.generic.packet.Packet;
import org.eclipse.sensinact.gateway.generic.packet.annotation.Data;
import org.eclipse.sensinact.gateway.generic.packet.annotation.GoodbyeMessage;
diff --git a/platform/southbound/mqtt/mqtt-device/src/main/java/org/eclipse/sensinact/gateway/sthbnd/mqtt/device/MqttProtocolStackEndpoint.java b/platform/southbound/mqtt/mqtt-device/src/main/java/org/eclipse/sensinact/gateway/sthbnd/mqtt/device/MqttProtocolStackEndpoint.java
index e08c6b3..3bd3cbf 100644
--- a/platform/southbound/mqtt/mqtt-device/src/main/java/org/eclipse/sensinact/gateway/sthbnd/mqtt/device/MqttProtocolStackEndpoint.java
+++ b/platform/southbound/mqtt/mqtt-device/src/main/java/org/eclipse/sensinact/gateway/sthbnd/mqtt/device/MqttProtocolStackEndpoint.java
@@ -10,7 +10,6 @@
*/
package org.eclipse.sensinact.gateway.sthbnd.mqtt.device;
-import org.eclipse.paho.client.mqttv3.MqttException;
import org.eclipse.sensinact.gateway.common.bundle.Mediator;
import org.eclipse.sensinact.gateway.generic.local.LocalProtocolStackEndpoint;
import org.eclipse.sensinact.gateway.sthbnd.mqtt.util.api.MqttBroker;
diff --git a/platform/southbound/openhab/src/main/java/org/eclipse/sensinact/gateway/device/openhab/common/Broker.java b/platform/southbound/openhab/src/main/java/org/eclipse/sensinact/gateway/device/openhab/common/Broker.java
index 6f38325..b1ca84d 100644
--- a/platform/southbound/openhab/src/main/java/org/eclipse/sensinact/gateway/device/openhab/common/Broker.java
+++ b/platform/southbound/openhab/src/main/java/org/eclipse/sensinact/gateway/device/openhab/common/Broker.java
@@ -1,3 +1,13 @@
+/*
+ * Copyright (c) 2017 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
+ */
package org.eclipse.sensinact.gateway.device.openhab.common;
import java.util.HashSet;
diff --git a/platform/southbound/openhab/src/main/java/org/eclipse/sensinact/gateway/device/openhab/common/ServerLocation.java b/platform/southbound/openhab/src/main/java/org/eclipse/sensinact/gateway/device/openhab/common/ServerLocation.java
index f013e60..54a75da 100644
--- a/platform/southbound/openhab/src/main/java/org/eclipse/sensinact/gateway/device/openhab/common/ServerLocation.java
+++ b/platform/southbound/openhab/src/main/java/org/eclipse/sensinact/gateway/device/openhab/common/ServerLocation.java
@@ -1,3 +1,13 @@
+/*
+ * Copyright (c) 2017 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
+ */
package org.eclipse.sensinact.gateway.device.openhab.common;
public class ServerLocation {
diff --git a/platform/southbound/openhab/src/main/java/org/eclipse/sensinact/gateway/device/openhab/internal/OpenhabType.java b/platform/southbound/openhab/src/main/java/org/eclipse/sensinact/gateway/device/openhab/internal/OpenhabType.java
index b82dc1a..5086da6 100644
--- a/platform/southbound/openhab/src/main/java/org/eclipse/sensinact/gateway/device/openhab/internal/OpenhabType.java
+++ b/platform/southbound/openhab/src/main/java/org/eclipse/sensinact/gateway/device/openhab/internal/OpenhabType.java
@@ -1,3 +1,13 @@
+/*
+ * Copyright (c) 2017 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
+ */
package org.eclipse.sensinact.gateway.device.openhab.internal;
import java.text.ParseException;
diff --git a/platform/southbound/openhab/src/main/java/org/eclipse/sensinact/gateway/device/openhab/sensinact/OpenHabActTaskConfigurator.java b/platform/southbound/openhab/src/main/java/org/eclipse/sensinact/gateway/device/openhab/sensinact/OpenHabActTaskConfigurator.java
index a0e8f79..b492159 100644
--- a/platform/southbound/openhab/src/main/java/org/eclipse/sensinact/gateway/device/openhab/sensinact/OpenHabActTaskConfigurator.java
+++ b/platform/southbound/openhab/src/main/java/org/eclipse/sensinact/gateway/device/openhab/sensinact/OpenHabActTaskConfigurator.java
@@ -1,3 +1,13 @@
+/*
+ * Copyright (c) 2017 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
+ */
package org.eclipse.sensinact.gateway.device.openhab.sensinact;
import org.eclipse.sensinact.gateway.sthbnd.http.smpl.HttpTaskConfigurator;
diff --git a/platform/southbound/openhab/src/main/java/org/eclipse/sensinact/gateway/device/openhab/sensinact/OpenHabServerFinder.java b/platform/southbound/openhab/src/main/java/org/eclipse/sensinact/gateway/device/openhab/sensinact/OpenHabServerFinder.java
index 96d24a5..e0ee4d3 100644
--- a/platform/southbound/openhab/src/main/java/org/eclipse/sensinact/gateway/device/openhab/sensinact/OpenHabServerFinder.java
+++ b/platform/southbound/openhab/src/main/java/org/eclipse/sensinact/gateway/device/openhab/sensinact/OpenHabServerFinder.java
@@ -1,3 +1,13 @@
+/*
+ * Copyright (c) 2017 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
+ */
package org.eclipse.sensinact.gateway.device.openhab.sensinact;
import java.io.IOException;
diff --git a/platform/southbound/openhab/src/main/java/org/eclipse/sensinact/gateway/device/openhab/sensinact/OpenHabSetTaskConfigurator.java b/platform/southbound/openhab/src/main/java/org/eclipse/sensinact/gateway/device/openhab/sensinact/OpenHabSetTaskConfigurator.java
index 6d1747e..74f3bc3 100644
--- a/platform/southbound/openhab/src/main/java/org/eclipse/sensinact/gateway/device/openhab/sensinact/OpenHabSetTaskConfigurator.java
+++ b/platform/southbound/openhab/src/main/java/org/eclipse/sensinact/gateway/device/openhab/sensinact/OpenHabSetTaskConfigurator.java
@@ -1,3 +1,13 @@
+/*
+ * Copyright (c) 2017 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
+ */
package org.eclipse.sensinact.gateway.device.openhab.sensinact;
import org.eclipse.sensinact.gateway.sthbnd.http.smpl.HttpTaskConfigurator;
diff --git a/platform/southbound/pom.xml b/platform/southbound/pom.xml
index 6d51ac8..26ddbfe 100644
--- a/platform/southbound/pom.xml
+++ b/platform/southbound/pom.xml
@@ -57,6 +57,5 @@
<module>mqtt</module>
<module>openhab</module>
<module>http</module>
- <module>inovallee</module>
</modules>
</project>
diff --git a/platform/tools/sensinact-test/src/main/java/org/eclipse/sensinact/gateway/test/MidOSGiTest.java b/platform/tools/sensinact-test/src/main/java/org/eclipse/sensinact/gateway/test/MidOSGiTest.java
index 52c4f98..ac7be31 100644
--- a/platform/tools/sensinact-test/src/main/java/org/eclipse/sensinact/gateway/test/MidOSGiTest.java
+++ b/platform/tools/sensinact-test/src/main/java/org/eclipse/sensinact/gateway/test/MidOSGiTest.java
@@ -268,7 +268,30 @@
configuration.put("felix.cache.rootdir", felixDir.getPath());
configuration.put("org.osgi.framework.storage", "felix-cache");
configuration.put("org.osgi.framework.bootdelegation", "*");
- configuration.put("org.osgi.framework.system.packages.extra", "org.eclipse.sensinact.gateway.test,org.slf4j," + "com.sun.net.httpserver," + "javax.activation," + "javax.net.ssl," + "javax.xml.parsers," + "javax.imageio," + "javax.management," + "javax.naming," + "javax.sql," + "javax.swing," + "javax.swing.border," + "javax.swing.event," + "javax.management.modelmbean," + "javax.management.remote," + "javax.security.auth," + "javax.security.cert," + "org.w3c.dom," + "org.xml.sax," + "org.xml.sax.helpers," + "sun.misc," + "javax.mail," + "javax.mail.internet," + "sun.security.action");
+ configuration.put("org.osgi.framework.system.packages.extra",
+ "org.eclipse.sensinact.gateway.test,org.slf4j," +
+ "com.sun.net.httpserver," +
+ "javax.activation," +
+ "javax.net.ssl," +
+ "javax.xml.parsers," +
+ "javax.imageio," +
+ "javax.management," +
+ "javax.naming," +
+ "javax.sql," +
+ "javax.swing," +
+ "javax.swing.border," +
+ "javax.swing.event," +
+ "javax.management.modelmbean," +
+ "javax.management.remote," +
+ "javax.security.auth," +
+ "javax.security.cert," +
+ "org.w3c.dom," +
+ "org.xml.sax," +
+ "org.xml.sax.helpers," +
+ "sun.misc," +
+ "javax.mail," +
+ "javax.mail.internet," +
+ "sun.security.action");
configuration.put("org.osgi.framework.storage.clean", "onFirstInit");
configuration.put("felix.auto.deploy.action", "install");
configuration.put("felix.log.level", "4");
diff --git a/simulated-devices/slider/src/main/resources/slider-resource.xml b/simulated-devices/slider/src/main/resources/slider-resource.xml
index fbdbc97..acabdd7 100644
--- a/simulated-devices/slider/src/main/resources/slider-resource.xml
+++ b/simulated-devices/slider/src/main/resources/slider-resource.xml
@@ -16,7 +16,7 @@
<policies>
<policy name="SENSOR" update="AUTO"/>
</policies>
- <resourceInfo xsi:type="resourceInfoSensor" name="POSITION" target="cursor">
+ <resourceInfo xsi:type="resourceInfoSensor" policy="SENSOR" name="POSITION" target="cursor">
<identifier xsi:type="stringContent">POSITION</identifier>
<attributes>
<attribute name="value" type="int" modifiable="UPDATABLE">
