From: jsimomaa <jani.simomaa@gmail.com>
Date: Wed, 4 Oct 2017 05:09:57 +0000 (+0300)
Subject: Add missing dependencies for REST server and include to desktop-feature
X-Git-Tag: v1.31.0~149
X-Git-Url: https://gerrit.simantics.org/r/gitweb?a=commitdiff_plain;h=3cede9540852ac8386eb61ffdf2947c388c33e7c;p=simantics%2Fplatform.git

Add missing dependencies for REST server and include to desktop-feature

refs #7374

Change-Id: I3c86f071820657d5582bb1240b19db9527497ee3
---

diff --git a/bundles/org.simantics.scl.rest/scl/SCL/REST/Server.scl b/bundles/org.simantics.scl.rest/scl/Server/RESTSCL.scl
similarity index 100%
rename from bundles/org.simantics.scl.rest/scl/SCL/REST/Server.scl
rename to bundles/org.simantics.scl.rest/scl/Server/RESTSCL.scl
diff --git a/bundles/org.simantics.scl.rest/src/org/simantics/scl/rest/SCLRESTServer.java b/bundles/org.simantics.scl.rest/src/org/simantics/scl/rest/SCLRESTServer.java
index 0e642026e..b7e8090b5 100644
--- a/bundles/org.simantics.scl.rest/src/org/simantics/scl/rest/SCLRESTServer.java
+++ b/bundles/org.simantics.scl.rest/src/org/simantics/scl/rest/SCLRESTServer.java
@@ -36,7 +36,6 @@ public class SCLRESTServer {
         server = new Server();
         ServerConnector connector = new ServerConnector(server);
         connector.setPort(preferablePort);
-        connector.setHost("localhost");
         
         server.setConnectors(new Connector[] { connector });
         
diff --git a/features/org.simantics.desktop.product.feature/feature.xml b/features/org.simantics.desktop.product.feature/feature.xml
index 9bd6f1eda..59c224643 100644
--- a/features/org.simantics.desktop.product.feature/feature.xml
+++ b/features/org.simantics.desktop.product.feature/feature.xml
@@ -25,6 +25,10 @@
          id="org.simantics.modeling.ui.workbench.feature"
          version="0.0.0"/>
 
+   <includes
+         id="org.simantics.scl.rest.feature"
+         version="0.0.0"/>
+
    <plugin
          id="org.simantics.desktop.product"
          download-size="0"
diff --git a/features/org.simantics.scl.rest.feature/feature.xml b/features/org.simantics.scl.rest.feature/feature.xml
index 4c9634578..450ecc3f2 100644
--- a/features/org.simantics.scl.rest.feature/feature.xml
+++ b/features/org.simantics.scl.rest.feature/feature.xml
@@ -228,4 +228,95 @@ This Agreement is governed by the laws of the State of New York and the intellec
          version="0.0.0"
          unpack="false"/>
 
+   <plugin
+         id="org.glassfish.jersey.bundles.repackaged.jersey-guava"
+         download-size="0"
+         install-size="0"
+         version="0.0.0"
+         unpack="false"/>
+
+   <plugin
+         id="com.fasterxml.jackson.jaxrs.jackson-jaxrs-base"
+         download-size="0"
+         install-size="0"
+         version="0.0.0"
+         unpack="false"/>
+
+   <plugin
+         id="javax.validation.api"
+         download-size="0"
+         install-size="0"
+         version="0.0.0"
+         unpack="false"/>
+
+   <plugin
+         id="org.glassfish.hk2.api"
+         download-size="0"
+         install-size="0"
+         version="0.0.0"
+         unpack="false"/>
+
+   <plugin
+         id="com.fasterxml.jackson.jaxrs.jackson-jaxrs-json-provider"
+         download-size="0"
+         install-size="0"
+         version="0.0.0"
+         unpack="false"/>
+
+   <plugin
+         id="org.glassfish.hk2.external.aopalliance-repackaged"
+         download-size="0"
+         install-size="0"
+         version="0.0.0"
+         unpack="false"/>
+
+   <plugin
+         id="org.glassfish.hk2.locator"
+         download-size="0"
+         install-size="0"
+         version="0.0.0"
+         unpack="false"/>
+
+   <plugin
+         id="org.glassfish.hk2.osgi-resource-locator"
+         download-size="0"
+         install-size="0"
+         version="0.0.0"
+         unpack="false"/>
+
+   <plugin
+         id="org.glassfish.hk2.utils"
+         download-size="0"
+         install-size="0"
+         version="0.0.0"
+         unpack="false"/>
+
+   <plugin
+         id="org.glassfish.jersey.core.jersey-common"
+         download-size="0"
+         install-size="0"
+         version="0.0.0"
+         unpack="false"/>
+
+   <plugin
+         id="org.glassfish.jersey.ext.jersey-entity-filtering"
+         download-size="0"
+         install-size="0"
+         version="0.0.0"
+         unpack="false"/>
+
+   <plugin
+         id="org.glassfish.jersey.core.jersey-client"
+         download-size="0"
+         install-size="0"
+         version="0.0.0"
+         unpack="false"/>
+
+   <plugin
+         id="javassist"
+         download-size="0"
+         install-size="0"
+         version="0.0.0"
+         unpack="false"/>
+
 </feature>