Merge "(refs #7526) Allow population of UC to diagram directly"

diff --git a/bundles/org.simantics.diagram/src/org/simantics/diagram/connection/ConnectionVisuals.java b/bundles/org.simantics.diagram/src/org/simantics/diagram/connection/ConnectionVisuals.java
index 5f62ac31469798b15ac2d95ec2712a75b108bcc2..802881e1610efa52d787e0670edddb4c291e45de 100644 (file)
--- a/bundles/org.simantics.diagram/src/org/simantics/diagram/connection/ConnectionVisuals.java
+++ b/bundles/org.simantics.diagram/src/org/simantics/diagram/connection/ConnectionVisuals.java
@@ -28,6 +28,10 @@ public class ConnectionVisuals {
     public final Double branchPointRadius;
     public final Double rounding;
 
+    public ConnectionVisuals(float[] color, StrokeType strokeType, Stroke stroke, Double rounding) {
+       this(color, strokeType, stroke, null, rounding);
+    }
+
     public ConnectionVisuals(float[] color, StrokeType strokeType, Stroke stroke, Double branchPointRadius, Double rounding) {
         if (color != null && color.length < 3)
             throw new IllegalArgumentException("colors must have at least 3 components (rgb), got " + color.length);

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 0e642026ea39ef953b52036a2116aa0092f49712..b7e8090b506fd05036e8c60346aaeadc2d1e7050 100644 (file)
--- 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 9bd6f1eda661db7ee46421d7914ad21322f29b5a..59c22464375383ef51b34e2c4080e9c80a8b8937 100644 (file)
--- 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 4c963457817131119f3815932931b376f0392cf5..72371382e5d8c7419072486839acc3d239778e28 100644 (file)
--- a/features/org.simantics.scl.rest.feature/feature.xml
+++ b/features/org.simantics.scl.rest.feature/feature.xml
@@ -228,4 +228,102 @@ 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"/>
+
+   <plugin
+         id="com.fasterxml.jackson.module.jackson-module-jaxb-annotations"
+         download-size="0"
+         install-size="0"
+         version="0.0.0"
+         unpack="false"/>
+
 </feature>