Removed javax exception
diff --git a/distribution/studio-product/Sensinact.product b/distribution/studio-product/Sensinact.product
index 26a48b4..439e3d8 100644
--- a/distribution/studio-product/Sensinact.product
+++ b/distribution/studio-product/Sensinact.product
@@ -27,12 +27,12 @@
<splash
location="org.eclipse.sensinact.studio.language.sensinact" />
<launcher>
- <solaris/>
<win useIco="false">
<bmp/>
</win>
</launcher>
+
<vm>
<linux include="false">org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.7</linux>
</vm>
@@ -131,19 +131,25 @@
</license>
<plugins>
+ <plugin id="com.fasterxml.jackson.core.jackson-annotations"/>
+ <plugin id="com.fasterxml.jackson.core.jackson-core"/>
+ <plugin id="com.fasterxml.jackson.core.jackson-databind"/>
<plugin id="com.google.guava"/>
<plugin id="com.google.inject"/>
<plugin id="com.ibm.icu"/>
+ <plugin id="javax.activation"/>
<plugin id="javax.annotation"/>
<plugin id="javax.inject"/>
- <plugin id="javax.xml"/>
+ <plugin id="javax.servlet"/>
<plugin id="org.antlr.runtime"/>
<plugin id="org.apache.ant"/>
+ <plugin id="org.apache.batik.constants"/>
<plugin id="org.apache.batik.css"/>
+ <plugin id="org.apache.batik.i18n"/>
<plugin id="org.apache.batik.util"/>
- <plugin id="org.apache.batik.util.gui"/>
<plugin id="org.apache.commons.cli"/>
<plugin id="org.apache.commons.codec"/>
+ <plugin id="org.apache.commons.io"/>
<plugin id="org.apache.commons.jxpath"/>
<plugin id="org.apache.commons.lang"/>
<plugin id="org.apache.commons.logging"/>
@@ -153,6 +159,7 @@
<plugin id="org.apache.httpcomponents.httpclient"/>
<plugin id="org.apache.httpcomponents.httpcore"/>
<plugin id="org.apache.log4j"/>
+ <plugin id="org.apache.xmlgraphics"/>
<plugin id="org.eclipse.ant.core"/>
<plugin id="org.eclipse.ant.launching"/>
<plugin id="org.eclipse.ant.ui"/>
@@ -168,14 +175,12 @@
<plugin id="org.eclipse.core.externaltools"/>
<plugin id="org.eclipse.core.filebuffers"/>
<plugin id="org.eclipse.core.filesystem"/>
- <plugin id="org.eclipse.core.filesystem.java7" fragment="true"/>
<plugin id="org.eclipse.core.filesystem.linux.x86_64" fragment="true"/>
<plugin id="org.eclipse.core.jobs"/>
<plugin id="org.eclipse.core.net"/>
<plugin id="org.eclipse.core.net.linux.x86_64" fragment="true"/>
<plugin id="org.eclipse.core.resources"/>
<plugin id="org.eclipse.core.runtime"/>
- <plugin id="org.eclipse.core.runtime.compatibility.registry" fragment="true"/>
<plugin id="org.eclipse.core.variables"/>
<plugin id="org.eclipse.debug.core"/>
<plugin id="org.eclipse.debug.ui"/>
@@ -185,6 +190,7 @@
<plugin id="org.eclipse.e4.core.di"/>
<plugin id="org.eclipse.e4.core.di.annotations"/>
<plugin id="org.eclipse.e4.core.di.extensions"/>
+ <plugin id="org.eclipse.e4.core.di.extensions.supplier"/>
<plugin id="org.eclipse.e4.core.services"/>
<plugin id="org.eclipse.e4.emf.xpath"/>
<plugin id="org.eclipse.e4.ui.bindings"/>
@@ -266,8 +272,8 @@
<plugin id="org.eclipse.equinox.app"/>
<plugin id="org.eclipse.equinox.bidi"/>
<plugin id="org.eclipse.equinox.common"/>
+ <plugin id="org.eclipse.equinox.concurrent"/>
<plugin id="org.eclipse.equinox.console"/>
- <plugin id="org.eclipse.equinox.ds"/>
<plugin id="org.eclipse.equinox.event"/>
<plugin id="org.eclipse.equinox.frameworkadmin"/>
<plugin id="org.eclipse.equinox.frameworkadmin.equinox"/>
@@ -301,6 +307,7 @@
<plugin id="org.eclipse.equinox.preferences"/>
<plugin id="org.eclipse.equinox.registry"/>
<plugin id="org.eclipse.equinox.security"/>
+ <plugin id="org.eclipse.equinox.security.linux.x86_64" fragment="true"/>
<plugin id="org.eclipse.equinox.security.ui"/>
<plugin id="org.eclipse.equinox.simpleconfigurator"/>
<plugin id="org.eclipse.equinox.simpleconfigurator.manipulator"/>
@@ -318,6 +325,7 @@
<plugin id="org.eclipse.jdt.launching"/>
<plugin id="org.eclipse.jdt.ui"/>
<plugin id="org.eclipse.jem.util"/>
+ <plugin id="org.eclipse.jetty.io"/>
<plugin id="org.eclipse.jetty.util"/>
<plugin id="org.eclipse.jetty.websocket.api"/>
<plugin id="org.eclipse.jetty.websocket.client"/>
@@ -353,8 +361,10 @@
<plugin id="org.eclipse.pde.ui"/>
<plugin id="org.eclipse.platform"/>
<plugin id="org.eclipse.search"/>
- <plugin id="org.eclipse.sensinact.studio.http"/>
+ <plugin id="org.eclipse.sensinact.studio.http.messages"/>
+ <plugin id="org.eclipse.sensinact.studio.http.services"/>
<plugin id="org.eclipse.sensinact.studio.language.sensinact"/>
+ <plugin id="org.eclipse.sensinact.studio.language.sensinact.ide"/>
<plugin id="org.eclipse.sensinact.studio.language.sensinact.ui"/>
<plugin id="org.eclipse.sensinact.studio.model.manager"/>
<plugin id="org.eclipse.sensinact.studio.model.resource"/>
@@ -380,6 +390,7 @@
<plugin id="org.eclipse.ui.editors"/>
<plugin id="org.eclipse.ui.externaltools"/>
<plugin id="org.eclipse.ui.forms"/>
+ <plugin id="org.eclipse.ui.genericeditor"/>
<plugin id="org.eclipse.ui.ide"/>
<plugin id="org.eclipse.ui.ide.application"/>
<plugin id="org.eclipse.ui.intro"/>
@@ -394,6 +405,7 @@
<plugin id="org.eclipse.ui.workbench.source"/>
<plugin id="org.eclipse.ui.workbench.texteditor"/>
<plugin id="org.eclipse.update.configurator"/>
+ <plugin id="org.eclipse.urischeme"/>
<plugin id="org.eclipse.wst.common.core"/>
<plugin id="org.eclipse.wst.common.emf"/>
<plugin id="org.eclipse.wst.common.emfworkbench.integration"/>
@@ -411,7 +423,6 @@
<plugin id="org.eclipse.xtend.m2e"/>
<plugin id="org.eclipse.xtend.standalone"/>
<plugin id="org.eclipse.xtend.typesystem.emf"/>
- <plugin id="org.eclipse.xtend2.lib"/>
<plugin id="org.eclipse.xtext"/>
<plugin id="org.eclipse.xtext.activities"/>
<plugin id="org.eclipse.xtext.builder"/>
@@ -431,13 +442,16 @@
<plugin id="org.eclipse.xtext.logging" fragment="true"/>
<plugin id="org.eclipse.xtext.m2e"/>
<plugin id="org.eclipse.xtext.purexbase"/>
+ <plugin id="org.eclipse.xtext.purexbase.ide"/>
<plugin id="org.eclipse.xtext.purexbase.ui"/>
<plugin id="org.eclipse.xtext.smap"/>
<plugin id="org.eclipse.xtext.ui"/>
<plugin id="org.eclipse.xtext.ui.codetemplates"/>
+ <plugin id="org.eclipse.xtext.ui.codetemplates.ide"/>
<plugin id="org.eclipse.xtext.ui.codetemplates.ui"/>
<plugin id="org.eclipse.xtext.ui.ecore"/>
<plugin id="org.eclipse.xtext.ui.shared"/>
+ <plugin id="org.eclipse.xtext.ui.testing"/>
<plugin id="org.eclipse.xtext.util"/>
<plugin id="org.eclipse.xtext.xbase"/>
<plugin id="org.eclipse.xtext.xbase.ide"/>
@@ -445,6 +459,7 @@
<plugin id="org.eclipse.xtext.xbase.lib"/>
<plugin id="org.eclipse.xtext.xbase.ui"/>
<plugin id="org.eclipse.xtext.xtext.generator"/>
+ <plugin id="org.eclipse.xtext.xtext.ide"/>
<plugin id="org.eclipse.xtext.xtext.ui"/>
<plugin id="org.eclipse.xtext.xtext.ui.graph"/>
<plugin id="org.eclipse.xtext.xtext.wizard"/>
@@ -453,6 +468,7 @@
<plugin id="org.junit"/>
<plugin id="org.objectweb.asm"/>
<plugin id="org.restlet"/>
+ <plugin id="org.restlet.ext.jackson"/>
<plugin id="org.sat4j.core"/>
<plugin id="org.sat4j.pb"/>
<plugin id="org.tukaani.xz"/>
@@ -463,7 +479,6 @@
</plugins>
<configurations>
- <plugin id="org.eclipse.equinox.ds" autoStart="true" startLevel="0" />
<plugin id="org.eclipse.equinox.event" autoStart="true" startLevel="0" />
<plugin id="org.eclipse.equinox.p2.director" autoStart="false" startLevel="0" />
<plugin id="org.eclipse.equinox.p2.discovery" autoStart="false" startLevel="0" />
@@ -484,10 +499,9 @@
</configurations>
<repositories>
- <repository location="http://download.eclipse.org/releases/mars" enabled="true" />
<repository location="http://download.eclipse.org/technology/nebula/snapshot" enabled="true" />
- <repository location="http://p2.restlet.com/2.2/" enabled="true" />
- <repository location="http://132.168.161.7/eclipse/" enabled="true" />
+ <repository location="http://p2.restlet.com/2.3/" enabled="true" />
+ <repository location="http://download.eclipse.org/releases/2018-12" enabled="true" />
</repositories>
<preferencesInfo>
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 7656285..f2e6cef 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
@@ -15,8 +15,6 @@
import java.util.Optional;
import java.util.stream.Collectors;
-import javax.naming.directory.InvalidAttributesException;
-
import org.apache.log4j.Logger;
import org.eclipse.sensinact.studio.http.messages.snamessage.MsgSensinact;
import org.eclipse.sensinact.studio.http.messages.snamessage.completelist.MsgCompleteList;
@@ -37,6 +35,7 @@
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;
+import org.eclipse.sensinact.studio.model.resource.utils.GPSparsingException;
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;
@@ -189,7 +188,7 @@
try {
GPScoordinates gps = new GPScoordinates(coordinates);
DeviceLocationManager.getInstance().updateLocationInStudio(descriptor, gps);
- } catch (InvalidAttributesException e) {
+ } catch (GPSparsingException e) {
logger.error("coordinates parsing error for " + descriptor + " (" + coordinates + ")");
}
}
diff --git a/services/org.eclipse.sensinact.studio.model.resource/src/org/eclipse/sensinact/studio/model/resource/utils/GPScoordinates.java b/services/org.eclipse.sensinact.studio.model.resource/src/org/eclipse/sensinact/studio/model/resource/utils/GPScoordinates.java
index a96b690..343c635 100644
--- a/services/org.eclipse.sensinact.studio.model.resource/src/org/eclipse/sensinact/studio/model/resource/utils/GPScoordinates.java
+++ b/services/org.eclipse.sensinact.studio.model.resource/src/org/eclipse/sensinact/studio/model/resource/utils/GPScoordinates.java
@@ -10,8 +10,6 @@
*/
package org.eclipse.sensinact.studio.model.resource.utils;
-import javax.naming.directory.InvalidAttributesException;
-
/**
* @author Etienne Gandrille
*/
@@ -29,15 +27,16 @@
*
* @param coords expected format is two flots separated by a ','. ie "3.1245,4.365212"
* @throws InvalidAttributesException
+ * @throws GPSparsingException
*/
- public GPScoordinates(String coords) throws InvalidAttributesException {
+ public GPScoordinates(String coords) throws GPSparsingException {
try {
coords = coords.replace(':', ',');
final String[] coordinates = coords.split(",");
lat = Double.valueOf(coordinates[0].trim());
lng = Double.valueOf(coordinates[1].trim());
} catch (Exception e) {
- throw new InvalidAttributesException("Can't convert " + coords + " into gps coordinates");
+ throw new GPSparsingException();
}
}
@@ -66,5 +65,7 @@
public int hashCode() {
// basic hash, only with lat
return new Double(lat).hashCode();
- }
+ }
+
+
}
diff --git a/services/org.eclipse.sensinact.studio.model.resource/src/org/eclipse/sensinact/studio/model/resource/utils/GPSparsingException.java b/services/org.eclipse.sensinact.studio.model.resource/src/org/eclipse/sensinact/studio/model/resource/utils/GPSparsingException.java
new file mode 100644
index 0000000..7fca9d9
--- /dev/null
+++ b/services/org.eclipse.sensinact.studio.model.resource/src/org/eclipse/sensinact/studio/model/resource/utils/GPSparsingException.java
@@ -0,0 +1,15 @@
+/**
+ * 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.model.resource.utils;
+
+public class GPSparsingException extends Exception {
+
+}
