Merge "Some Acorn improvements"

diff --git a/bundles/org.simantics.acorn/META-INF/MANIFEST.MF b/bundles/org.simantics.acorn/META-INF/MANIFEST.MF
index 24f576bdc166c033c4278cf9ead5e248172fc664..9152acafd81bca244dc924c6c94350fc07b0730b 100644 (file)
--- a/bundles/org.simantics.acorn/META-INF/MANIFEST.MF
+++ b/bundles/org.simantics.acorn/META-INF/MANIFEST.MF
@@ -4,17 +4,13 @@ Bundle-Name: Acorn Database for Simantics
 Bundle-SymbolicName: org.simantics.acorn
 Bundle-Version: 1.1.2.qualifier
 Bundle-Vendor: Semantum Oy
-Require-Bundle: org.apache.log4j;visibility:=reexport,
- org.simantics.db;bundle-version="0.8.0";visibility:=reexport,
- org.simantics.db.common;bundle-version="0.8.0";visibility:=reexport,
- gnu.trove3;bundle-version="3.0.0",
+Require-Bundle: gnu.trove3;bundle-version="3.0.0",
  gnu.trove2;bundle-version="2.0.4",
  org.simantics.db.impl;bundle-version="0.8.0",
  org.simantics.db.server;bundle-version="1.0.0",
  org.simantics.compressions;bundle-version="1.0.0",
  org.simantics.backup,
  org.eclipse.core.runtime;bundle-version="3.11.1",
- org.simantics.fastlz;bundle-version="1.2.1",
  org.simantics.db.procore
 Bundle-RequiredExecutionEnvironment: JavaSE-1.8
 Bundle-ActivationPolicy: lazy

diff --git a/bundles/org.simantics.acorn/OSGI-INF/component.xml b/bundles/org.simantics.acorn/OSGI-INF/component.xml
index 75dd81fd9d6d4135a5e86c765822e742ff4ecf56..5b88ac3c0efb1a2b9831dec96decd72d6be8e2ed 100644 (file)
--- a/bundles/org.simantics.acorn/OSGI-INF/component.xml
+++ b/bundles/org.simantics.acorn/OSGI-INF/component.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <scr:component xmlns:scr="http://www.osgi.org/xmlns/scr/v1.1.0" name="org.simantics.acorn.backupProvider">
-    <implementation class="org.siorg.simantics.acorn.backup.AcornBackupProvider"/>
+    <implementation class="org.simantics.acorn.backup.AcornBackupProvider"/>
     <service>
         <provide interface="org.simantics.backup.IBackupProvider"/>
     </service>

diff --git a/bundles/org.simantics.charts/src/org/simantics/charts/Charts.java b/bundles/org.simantics.charts/src/org/simantics/charts/Charts.java
index 69aea11ee2773f0ea4ed3f93fefdab99b2f74ced..dd7ae02a08bf809c4b5aaa607a7681e89af5520b 100644 (file)
--- a/bundles/org.simantics.charts/src/org/simantics/charts/Charts.java
+++ b/bundles/org.simantics.charts/src/org/simantics/charts/Charts.java
@@ -10,8 +10,8 @@ import org.simantics.databoard.binding.error.BindingException;
 import org.simantics.databoard.util.Bean;\r
 import org.simantics.db.ReadGraph;\r
 import org.simantics.db.Resource;\r
+import org.simantics.db.common.request.PossibleIndexRoot;\r
 import org.simantics.db.exception.DatabaseException;\r
-import org.simantics.db.layer0.request.PossibleModel;\r
 import org.simantics.history.HistoryException;\r
 import org.simantics.history.HistorySamplerItem;\r
 import org.simantics.history.ItemManager;\r
@@ -42,7 +42,7 @@ public final class Charts {
                \r
                try {\r
 \r
-                       Resource model = graph.syncRequest(new PossibleModel(subscriptionItem));\r
+                       Resource model = graph.syncRequest(new PossibleIndexRoot(subscriptionItem));\r
                        if ( model == null ) {\r
                                throw new DatabaseException("There is no model for " + subscriptionItem);\r
                        }\r

diff --git a/bundles/org.simantics.databoard/src/org/simantics/databoard/util/URIStringUtils.java b/bundles/org.simantics.databoard/src/org/simantics/databoard/util/URIStringUtils.java
index dde498a2c38bdcadbe3fb025cce664e2e0575c74..1cd658ba90614dd36d2050c8f0d736987eccfc8c 100644 (file)
--- a/bundles/org.simantics.databoard/src/org/simantics/databoard/util/URIStringUtils.java
+++ b/bundles/org.simantics.databoard/src/org/simantics/databoard/util/URIStringUtils.java
@@ -335,6 +335,50 @@ public final class URIStringUtils {
     final private static Charset UTF8 = Charset.forName("UTF-8");\r
     final private static Charset ASCII = Charset.forName("US-ASCII");\r
 \r
+    /*\r
+     * RFC 3986 section 2.2 Reserved Characters (January 2005)\r
+     * !*'();:@&=+$,/?#[]\r
+     */\r
+    private static boolean[] UNESCAPED_US_ASCII_CHARS = new boolean[128];\r
+\r
+    static {\r
+        for(char ch='A';ch <= 'Z';++ch)\r
+            UNESCAPED_US_ASCII_CHARS[ch] = true;\r
+        for(char ch='a';ch <= 'z';++ch)\r
+            UNESCAPED_US_ASCII_CHARS[ch] = true;\r
+        for(char ch='0';ch <= '9';++ch)\r
+            UNESCAPED_US_ASCII_CHARS[ch] = true;\r
+        UNESCAPED_US_ASCII_CHARS[';'] = true;\r
+        UNESCAPED_US_ASCII_CHARS['?'] = true;\r
+        UNESCAPED_US_ASCII_CHARS[':'] = true;\r
+        UNESCAPED_US_ASCII_CHARS['@'] = true;\r
+        UNESCAPED_US_ASCII_CHARS['='] = true;\r
+        UNESCAPED_US_ASCII_CHARS['+'] = true;\r
+        UNESCAPED_US_ASCII_CHARS['$'] = true;\r
+        UNESCAPED_US_ASCII_CHARS['.'] = true;\r
+        UNESCAPED_US_ASCII_CHARS[','] = true;\r
+        UNESCAPED_US_ASCII_CHARS['-'] = true;\r
+        UNESCAPED_US_ASCII_CHARS['_'] = true;\r
+        UNESCAPED_US_ASCII_CHARS['!'] = true;\r
+        UNESCAPED_US_ASCII_CHARS['~'] = true;\r
+        UNESCAPED_US_ASCII_CHARS['*'] = true;\r
+        UNESCAPED_US_ASCII_CHARS['\''] = true;\r
+        UNESCAPED_US_ASCII_CHARS['('] = true;\r
+        UNESCAPED_US_ASCII_CHARS[')'] = true;\r
+        UNESCAPED_US_ASCII_CHARS['['] = true;\r
+        UNESCAPED_US_ASCII_CHARS[']'] = true;\r
+    }\r
+\r
+    private static boolean needsEscaping(String unicode) {\r
+        int len = unicode.length();\r
+        for (int i = 0; i < len; ++i) {\r
+            char ch = unicode.charAt(i);\r
+            if (ch >= 128 || !UNESCAPED_US_ASCII_CHARS[ch])\r
+                return true;\r
+        }\r
+        return false;\r
+    }\r
+\r
     /* Copied and modified from Jena 2.4 com.hp.hpl.jena.util.URIref */\r
     private static String encode(String unicode) {\r
         boolean needsEscapes = needsEscaping(unicode);\r
@@ -346,17 +390,13 @@ public final class URIStringUtils {
         int in = 0;\r
         int out = 0;\r
         while (in < utf8.length) {\r
-            switch (utf8[in]) {\r
-                case (byte)'a': case (byte)'b': case (byte)'c': case (byte)'d': case (byte)'e': case (byte)'f': case (byte)'g': case (byte)'h': case (byte)'i': case (byte)'j': case (byte)'k': case (byte)'l': case (byte)'m': case (byte)'n': case (byte)'o': case (byte)'p': case (byte)'q': case (byte)'r': case (byte)'s': case (byte)'t': case (byte)'u': case (byte)'v': case (byte)'w': case (byte)'x': case (byte)'y': case (byte)'z':\r
-                case (byte)'A': case (byte)'B': case (byte)'C': case (byte)'D': case (byte)'E': case (byte)'F': case (byte)'G': case (byte)'H': case (byte)'I': case (byte)'J': case (byte)'K': case (byte)'L': case (byte)'M': case (byte)'N': case (byte)'O': case (byte)'P': case (byte)'Q': case (byte)'R': case (byte)'S': case (byte)'T': case (byte)'U': case (byte)'V': case (byte)'W': case (byte)'X': case (byte)'Y': case (byte)'Z':\r
-                case (byte)'0': case (byte)'1': case (byte)'2': case (byte)'3': case (byte)'4': case (byte)'5': case (byte)'6': case (byte)'7': case (byte)'8': case (byte)'9':\r
-                case (byte)';': case (byte)'?': case (byte)':': case (byte)'@': case (byte)'=': case (byte)'+': case (byte)'$': case (byte)',':\r
-                case (byte)'-': case (byte)'_': case (byte)'.': case (byte)'!': case (byte)'~': case (byte)'*': case (byte)'\'': case (byte)'(': case (byte)')':\r
-                case (byte)'[': case (byte)']':\r
-                    rsltAscii[out] = utf8[in];\r
-                    out++;\r
-                    in++;\r
-                    break;\r
+            byte inCh = utf8[in];\r
+            if (inCh >= 0 && inCh < 128 && UNESCAPED_US_ASCII_CHARS[inCh]) {\r
+                rsltAscii[out] = inCh;\r
+                out++;\r
+                in++;\r
+            } else {\r
+                switch (inCh) {\r
                 case (byte)' ':\r
                     rsltAscii[out++] = (byte) '%';\r
                     rsltAscii[out++] = '2';\r
@@ -366,7 +406,7 @@ public final class URIStringUtils {
                 case (byte) '%':\r
                     // [lehtonen] NOTE: all input needs to be escaped, i.e. "%01" should result in "%2501", not "%01".\r
                     // escape+unescape is a bijection, not an idempotent operation. \r
-                    // Fall through to to escape '%' as '%25'\r
+                    // Fall through to escape '%' as '%25'\r
                 case (byte) '#':\r
                 case (byte) '/':\r
                     // Fall through to escape '/'\r
@@ -376,52 +416,17 @@ public final class URIStringUtils {
                 default:\r
                     rsltAscii[out++] = (byte) '%';\r
                     // Get rid of sign ...\r
-                    int c = (utf8[in]) & 255;\r
+                    int c = (inCh) & 255;\r
                     rsltAscii[out++] = hexEncode(c / 16);\r
                     rsltAscii[out++] = hexEncode(c % 16);\r
                     in++;\r
                     break;\r
+                }\r
             }\r
         }\r
         return new String(rsltAscii, 0, out, ASCII);\r
     }\r
 \r
-    /*\r
-     * RFC 3986 section 2.2 Reserved Characters (January 2005)\r
-     * !*'();:@&=+$,/?#[]\r
-     */\r
-    private static boolean needsEscaping(String unicode) {\r
-        int len = unicode.length();\r
-        for (int i = 0; i < len; ++i) {\r
-            switch (unicode.charAt(i)) {\r
-                case (byte)'!':\r
-                case (byte)'*':\r
-                case (byte)'\'':\r
-                case (byte)'(':\r
-                case (byte)')':\r
-                case (byte)';':\r
-                case (byte)':':\r
-                case (byte)'@':\r
-                case (byte)'=': \r
-                case (byte)'+':\r
-                case (byte)'$':\r
-                case (byte)',':\r
-                case (byte)'?':\r
-                case (byte)'~':\r
-                case (byte)'[':\r
-                case (byte)']':\r
-                    break;\r
-                case (byte)' ':\r
-                case (byte) '#':\r
-                case (byte) '%':\r
-                case (byte) '/':\r
-                case (byte)'&':\r
-                    return true;\r
-            }\r
-        }\r
-        return false;\r
-    }\r
-\r
     private static boolean needsUnescaping(String unicode) {\r
         return unicode.indexOf('%') > -1;\r
     }\r
@@ -513,6 +518,8 @@ public final class URIStringUtils {
         testEscape("%", "%25");\r
         testEscape("%01", "%2501");\r
         testEscape("%GG", "%25GG");\r
+        testEscape("säätö venttiili", "s%C3%A4%C3%A4t%C3%B6%20venttiili");\r
+        testEscape("säätö", "s%C3%A4%C3%A4t%C3%B6");\r
     }\r
 \r
     private static void testEscape(String unescaped, String expectedEscaped) {\r

diff --git a/bundles/org.simantics.db.layer0/src/org/simantics/db/layer0/request/PossibleActiveExperiment.java b/bundles/org.simantics.db.layer0/src/org/simantics/db/layer0/request/PossibleActiveExperiment.java
index 3db016d79bcc5fc28154fc2b89d2fa404d454dfc..6caca12c5fe20cb00572fdeb0674fe0d90f6fc4d 100644 (file)
--- a/bundles/org.simantics.db.layer0/src/org/simantics/db/layer0/request/PossibleActiveExperiment.java
+++ b/bundles/org.simantics.db.layer0/src/org/simantics/db/layer0/request/PossibleActiveExperiment.java
@@ -13,6 +13,7 @@ package org.simantics.db.layer0.request;
 \r
 import org.simantics.db.ReadGraph;\r
 import org.simantics.db.Resource;\r
+import org.simantics.db.common.request.PossibleIndexRoot;\r
 import org.simantics.db.common.request.ResourceRead;\r
 import org.simantics.db.exception.DatabaseException;\r
 import org.simantics.layer0.Layer0;\r
@@ -27,7 +28,7 @@ public class PossibleActiveExperiment extends ResourceRead<Resource> {
     @Override\r
     public Resource perform(ReadGraph graph) throws DatabaseException {\r
 \r
-       Resource model = graph.sync(new PossibleModel(resource));\r
+       Resource model = graph.sync(new PossibleIndexRoot(resource));\r
        if(model == null) return null;\r
        \r
        Layer0 b = Layer0.getInstance(graph);\r

diff --git a/bundles/org.simantics.db.layer0/src/org/simantics/db/layer0/util/DomainProcessorState.java b/bundles/org.simantics.db.layer0/src/org/simantics/db/layer0/util/DomainProcessorState.java
index d4f0dbe017674ec2f9c82f0147e4190aee0e3c84..de8a17c78787bfb9e986cd295f9fa417c26ef8dd 100644 (file)
--- a/bundles/org.simantics.db.layer0/src/org/simantics/db/layer0/util/DomainProcessorState.java
+++ b/bundles/org.simantics.db.layer0/src/org/simantics/db/layer0/util/DomainProcessorState.java
@@ -16,6 +16,7 @@ public class DomainProcessorState {
        public TIntIntHashMap inverses = new TIntIntHashMap();\r
        public TIntHashSet externals = new TIntHashSet();\r
        public TIntIntHashMap ids = new TIntIntHashMap(100, 0.6f, -1, -1);\r
+       public TIntHashSet pending = new TIntHashSet();\r
 \r
        public int statementCount;\r
        public int valueCount;\r

diff --git a/bundles/org.simantics.db.layer0/src/org/simantics/db/layer0/util/ModelTransferableGraphSource.java b/bundles/org.simantics.db.layer0/src/org/simantics/db/layer0/util/ModelTransferableGraphSource.java
index 2636bb0d7a3dcf43a9e4b888cc53c75a1d4247e7..79f0937480dff59eeea2de8935576aea8e8809cf 100644 (file)
--- a/bundles/org.simantics.db.layer0/src/org/simantics/db/layer0/util/ModelTransferableGraphSource.java
+++ b/bundles/org.simantics.db.layer0/src/org/simantics/db/layer0/util/ModelTransferableGraphSource.java
@@ -248,7 +248,9 @@ public class ModelTransferableGraphSource implements TransferableGraphSource {
                                int p = state.otherStatementsInput.readInt();\r
                                int o = state.otherStatementsInput.readInt();\r
                                if(!exclude) {\r
-                                       if(state.excludedShared.contains(o)) {\r
+                                       if(state.pending.contains(o)) {\r
+                                               System.err.println("excluding garbage statement " + s + " " + p + " " + o + ", object resource is garbage");\r
+                                       } else if(state.excludedShared.contains(o)) {\r
                                                System.err.println("excluding shared " + s + " " + p + " " + o);\r
                                        } else {\r
                                                \r

diff --git a/bundles/org.simantics.db.layer0/src/org/simantics/db/layer0/util/ModelTransferableGraphSourceRequest.java b/bundles/org.simantics.db.layer0/src/org/simantics/db/layer0/util/ModelTransferableGraphSourceRequest.java
index c61fdadcbabf5d2f6667e1a8b1947ba3a6159c93..d7fe5c690ddb64760b4f351ec9917e9bb028991f 100644 (file)
--- a/bundles/org.simantics.db.layer0/src/org/simantics/db/layer0/util/ModelTransferableGraphSourceRequest.java
+++ b/bundles/org.simantics.db.layer0/src/org/simantics/db/layer0/util/ModelTransferableGraphSourceRequest.java
@@ -440,8 +440,10 @@ public class ModelTransferableGraphSourceRequest extends UniqueRead<ModelTransfe
                                String uri = graph.getPossibleURI(r);\r
                                if(uri != null)\r
                                        state.externals.add(transientId);\r
-                               else\r
+                               else {\r
+                                       state.pending.add(transientId);\r
                                        System.err.println("Pending status in export: " + NameUtils.getSafeName(graph, r, true) + " (" + graph.getPossibleURI(r) + ")");\r
+                               }\r
                        }\r
                }\r
 \r

diff --git a/bundles/org.simantics.db.layer0/src/org/simantics/db/layer0/util/TransferableGraphRequest2.java b/bundles/org.simantics.db.layer0/src/org/simantics/db/layer0/util/TransferableGraphRequest2.java
index 446786171fca84d578aae9a452a0f0a4d214a3b6..6678e71c68dcf4939ee9a48a28d2b0060ea5d0ba 100644 (file)
--- a/bundles/org.simantics.db.layer0/src/org/simantics/db/layer0/util/TransferableGraphRequest2.java
+++ b/bundles/org.simantics.db.layer0/src/org/simantics/db/layer0/util/TransferableGraphRequest2.java
@@ -60,6 +60,10 @@ import org.simantics.graph.representation.Value;
 import org.simantics.layer0.Layer0;\r
 import org.simantics.utils.datastructures.Pair;\r
 \r
+/**\r
+ * @deprecated in favor of {@link ModelTransferableGraphSourceRequest}\r
+ */\r
+@Deprecated\r
 public class TransferableGraphRequest2 implements Read<TransferableGraph1> {\r
 \r
        public static String LOG_FILE = "transferableGraph.log";\r

diff --git a/bundles/org.simantics.db.layer0/src/org/simantics/db/layer0/variable/Variables.java b/bundles/org.simantics.db.layer0/src/org/simantics/db/layer0/variable/Variables.java
index 81e1e46e94a3d027faed3853938a739e8d78d05e..e323f4f8c28bc4cb755bb38e609b7d0c6461ea44 100644 (file)
--- a/bundles/org.simantics.db.layer0/src/org/simantics/db/layer0/variable/Variables.java
+++ b/bundles/org.simantics.db.layer0/src/org/simantics/db/layer0/variable/Variables.java
@@ -26,13 +26,13 @@ import org.simantics.databoard.util.URIStringUtils;
 import org.simantics.db.ReadGraph;\r
 import org.simantics.db.RequestProcessor;\r
 import org.simantics.db.Resource;\r
+import org.simantics.db.common.request.PossibleIndexRoot;\r
 import org.simantics.db.common.request.TernaryRead;\r
 import org.simantics.db.common.utils.Logger;\r
 import org.simantics.db.exception.DatabaseException;\r
 import org.simantics.db.layer0.exception.MissingVariableException;\r
 import org.simantics.db.layer0.request.Model;\r
 import org.simantics.db.layer0.request.PossibleActiveVariableFromVariable;\r
-import org.simantics.db.layer0.request.PossibleModel;\r
 import org.simantics.db.layer0.request.PossibleVariableIndexRoot;\r
 import org.simantics.db.layer0.request.PossibleVariableModel;\r
 import org.simantics.db.layer0.request.PropertyInfo;\r
@@ -332,7 +332,7 @@ final public class Variables {
 \r
     public static Variable getPossibleConfigurationContext(ReadGraph graph, Resource resource) throws DatabaseException {\r
         SimulationResource SIMU = SimulationResource.getInstance(graph);\r
-        if (!graph.isInstanceOf(resource, SIMU.Model)) resource = graph.sync(new PossibleModel(resource));\r
+        if (!graph.isInstanceOf(resource, SIMU.Model)) resource = graph.sync(new PossibleIndexRoot(resource));\r
         if (resource == null)\r
             return null;\r
         Resource configurationResource = graph.getPossibleObject(resource, SIMU.HasConfiguration);\r
@@ -343,7 +343,7 @@ final public class Variables {
 \r
     public static Variable getPossibleConfigurationContext(ReadGraph graph, Variable variable) throws DatabaseException {\r
         SimulationResource SIMU = SimulationResource.getInstance(graph);\r
-        Resource model = getPossibleModel(graph, variable);\r
+        Resource model = getPossibleIndexRoot(graph, variable);\r
         if (model == null)\r
             return null;\r
         Resource configurationResource = graph.getPossibleObject(model, SIMU.HasConfiguration);\r

diff --git a/bundles/org.simantics.diagram.ontology/graph.tg b/bundles/org.simantics.diagram.ontology/graph.tg
index 543a0a3e3fdef857a646da16cfbd547742a35a5d..ab1473989a6c62d35bca5b833272126c1d841a7e 100644 (file)
Binary files a/bundles/org.simantics.diagram.ontology/graph.tg and b/bundles/org.simantics.diagram.ontology/graph.tg differ

diff --git a/bundles/org.simantics.diagram.ontology/graph/DiagramScenegraph.pgraph b/bundles/org.simantics.diagram.ontology/graph/DiagramScenegraph.pgraph
index 0a7cc33fff20ae08e20360f64a66913cab5574d9..364b539faa44eedc5cc760694e606d64424bf5b7 100644 (file)
--- a/bundles/org.simantics.diagram.ontology/graph/DiagramScenegraph.pgraph
+++ b/bundles/org.simantics.diagram.ontology/graph/DiagramScenegraph.pgraph
@@ -12,6 +12,7 @@ DIA.Scenegraph.Node <T SG.Node
 \r
 DIA.Scenegraph.Composite <T DIA.Scenegraph.Node\r
   >-- DIA.Scenegraph.Composite.transform --> G2D.Transform <R SG.Node.HasProperty : SEL.GenericParameterType\r
+    ==> "Vector Double"\r
 \r
 DIA.Scenegraph.Component <T DIA.Scenegraph.Node\r
 \r
@@ -26,7 +27,7 @@ DIA.Scenegraph.AbstractText <T DIA.Scenegraph.Component
   >-- DIA.Scenegraph.AbstractText.color --> DATATYPES.RGB.Integer <R SG.Node.HasProperty : SEL.ColorParameterType\r
   >-- DIA.Scenegraph.AbstractText.font --> DATATYPES.Font <R SG.Node.HasProperty : SEL.FontParameterType\r
   >-- DIA.Scenegraph.AbstractText.transform --> G2D.Transform <R SG.Node.HasProperty : SEL.GenericParameterType\r
-    ==> "DoubleArray"\r
+    ==> "Vector Double"\r
   >-- DIA.Scenegraph.AbstractText.borderWidth --> L0.Value <R SG.Node.HasProperty : SEL.GenericParameterType\r
     ==> "Float"\r
   >-- DIA.Scenegraph.AbstractText.borderColor --> DATATYPES.RGB.Integer <R SG.Node.HasProperty : SEL.ColorParameterType\r
@@ -74,6 +75,7 @@ DIA.Scenegraph.SVGImage <T DIA.Scenegraph.Component
   >-- DIA.Scenegraph.SVGImage.document --> L0.Value <R SG.Node.HasProperty : SEL.GenericParameterType\r
     ==> "String"\r
   >-- DIA.Scenegraph.SVGImage.transform --> G2D.Transform <R SG.Node.HasProperty : SEL.GenericParameterType\r
+    ==> "Vector Double"\r
   @L0.assert DIA.Scenegraph.SVGImage.transform\r
     [1,0,0,1,0,0] : G2D.Transform\r
   
\ No newline at end of file

diff --git a/bundles/org.simantics.document.server/scl/Document/All.scl b/bundles/org.simantics.document.server/scl/Document/All.scl
index 53124fb464194fcbbf53eab3cfc04c3d1e6fab8c..3d63eaf6a9463ade923a41b168ac0ba78a4d9fd5 100644 (file)
--- a/bundles/org.simantics.document.server/scl/Document/All.scl
+++ b/bundles/org.simantics.document.server/scl/Document/All.scl
@@ -115,6 +115,8 @@ importJava "org.simantics.document.server.Functions" where
     @JavaName getPropertyValueCached\r
     propertyValueCached_ :: Variable -> String -> Binding a -> <ReadGraph> a\r
     \r
+    stateVariable :: Variable -> <ReadGraph> Variable\r
+    \r
 propertyValueCached :: Serializable a => Typeable a => Variable -> String -> <ReadGraph> a\r
 propertyValueCached var prop = propertyValueCached_ var prop binding\r
     \r

diff --git a/bundles/org.simantics.document.server/src/org/simantics/document/server/Functions.java b/bundles/org.simantics.document.server/src/org/simantics/document/server/Functions.java
index 2fd422f5eb5447df01bbe491fd5349e5b861f0c8..2ba85b733adc1d10d8888afe9cb0f27f6161c1bd 100644 (file)
--- a/bundles/org.simantics.document.server/src/org/simantics/document/server/Functions.java
+++ b/bundles/org.simantics.document.server/src/org/simantics/document/server/Functions.java
@@ -185,6 +185,13 @@ public class Functions {
        return Variables.getVariable(graph, uri);\r
     }\r
     \r
+    public static Variable stateVariable(ReadGraph graph, Variable self) throws DatabaseException {\r
+       Variable session = graph.syncRequest(new ProxySessionRequest(self));\r
+       if (session == null)\r
+               throw new DatabaseException("No state for " + self.getURI(graph));\r
+       return session.getPossibleChild(graph, "__scl__");\r
+    }\r
+    \r
     @SCLValue(type = "ReadGraph -> Resource -> Variable -> Variable")\r
     public static Variable state(ReadGraph graph, Resource converter, Variable context) throws DatabaseException {\r
        Variable session = graph.syncRequest(new ProxySessionRequest(context));\r

diff --git a/bundles/org.simantics.document/simantics-wiki-documents-default-model.css b/bundles/org.simantics.document/simantics-wiki-documents-default-model.css
index 6fa388daebd3789ff9030ca3a613caafd9edec6f..47b66055eb545de8d2505822d14af837df43f000 100644 (file)
--- a/bundles/org.simantics.document/simantics-wiki-documents-default-model.css
+++ b/bundles/org.simantics.document/simantics-wiki-documents-default-model.css
@@ -15,7 +15,7 @@ div.description {
     font-family: "Times New Roman";\r
     font-size: 1.5em;\r
     color: black;\r
-    margin-left: 10px;\r
+    margin-left: 0px;\r
     margin-bottom: 10px;\r
     margin-right: 0px;\r
     margin-top: 0px;\r
@@ -27,7 +27,7 @@ p {
     font-size: 1.0em;\r
     color: black;\r
     margin-top: 10px;\r
-    margin-bottom: 10px;\r
+    margin-bottom: 15px;\r
 }\r
 \r
 /* Level 1 header */\r
@@ -35,17 +35,17 @@ h1 {
     font-family: "Times New Roman";\r
     font-size: 1.6em;\r
     color: black;\r
-       margin-top: 16px;\r
-       margin-bottom: 2px;\r
+    margin-top: 16px;\r
+    margin-bottom: 2px;\r
 }\r
 \r
 /* Level 2 header */\r
 h2 {\r
     font-family: "Times New Roman";\r
-       font-size: 1.4em;\r
+    font-size: 1.4em;\r
     color: black;\r
-       margin-top: 14px;\r
-       margin-bottom: 2px;\r
+    margin-top: 14px;\r
+    margin-bottom: 2px;\r
 }\r
 \r
 /* Level 3 header */\r
@@ -53,8 +53,8 @@ h3 {
     font-family: "Times New Roman";\r
     font-size: 1.2em;\r
     color: black;\r
-       margin-top: 12px;\r
-       margin-bottom: 2px;\r
+    margin-top: 12px;\r
+    margin-bottom: 2px;\r
 }\r
 \r
 /* Level 4 header */\r
@@ -62,8 +62,8 @@ h4 {
     font-family: "Times New Roman";\r
     font-size: 1.0em;\r
     color: black;\r
-       margin-top: 10px;\r
-       margin-bottom: 2px;\r
+    margin-top: 10px;\r
+    margin-bottom: 2px;\r
 }\r
 \r
 /* Numbered list items */\r
@@ -84,23 +84,52 @@ ol li {
     margin-bottom: 1px;\r
 }\r
 \r
+/* Links */\r
+a {\r
+    font-family: "Times New Roman";\r
+    font-size: 1.0em;\r
+    margin-left: 2px;\r
+    margin-top: 1px;\r
+    margin-bottom: 1px;\r
+}\r
+\r
 /* Table items */\r
 td div {\r
     font-family: "Times New Roman";\r
-    font-size: 1.0em;\r
+    font-size: 0.6em;\r
+    line-height: 1.2;\r
+    padding: 2px;\r
 }\r
 \r
 /* Tables items */\r
 table {\r
+    table-layout: auto;\r
+    width: auto;\r
+\r
     margin-top: 10px;\r
     margin-bottom: 10px;\r
+    margin-left: 15px;\r
+    margin-right: 30px;\r
+\r
+    border-collapse: collapse;\r
+    border: 0px solid black;\r
+\r
+    -webkit-user-select: text;\r
+    -moz-user-select: text;\r
+    -ms-user-select: text;\r
+    user-select: text;\r
 }\r
 \r
-/* Links */\r
-a {\r
-    font-family: "Times New Roman";\r
-    font-size: 1.0em;\r
-    margin-left: 2px;\r
-    margin-top: 1px;\r
-    margin-bottom: 1px;\r
+table div {\r
+    white-space: normal;\r
+}\r
+\r
+th, td {\r
+    text-align: left;\r
+    border: 1px solid black;\r
+    padding: 2px;\r
+}\r
+\r
+td div, th div {\r
+    border: none;\r
 }\r

diff --git a/bundles/org.simantics.document/simantics-wiki-documents.css b/bundles/org.simantics.document/simantics-wiki-documents.css
index 101e698c927fe547bb1a634a8ad8ab48df22bc93..c28af5b17e9ad164f93482b1ac0350a629d20b05 100644 (file)
--- a/bundles/org.simantics.document/simantics-wiki-documents.css
+++ b/bundles/org.simantics.document/simantics-wiki-documents.css
@@ -37,18 +37,18 @@ div {
 }\r
 \r
 table {\r
-       \r
        border-collapse: collapse;\r
-       width: 100%;\r
        table-layout: fixed;\r
+       box-sizing: border-box;\r
+       width: 100%;\r
+\r
        -webkit-user-select: text;\r
        -moz-user-select: text;\r
        -ms-user-select: text;\r
        user-select: text;\r
+\r
        border: 0px;\r
        padding: 0px;\r
-       box-sizing: border-box;\r
-\r
 }\r
 \r
 td {\r
@@ -75,24 +75,23 @@ table th:first-child div {
 }\r
 \r
 table div {\r
+       height: auto;\r
+       width: auto;\r
 \r
        padding-left: 1px;\r
 \r
        border-right: 1px;\r
        border-left: 1px;\r
-\r
        border-top: 1px;\r
        border-bottom: 1px;\r
+       \r
        margin-bottom: -1px;\r
        margin-left: -1px;\r
        \r
        border-style: solid;\r
-       text-overflow: ellipsis;\r
        overflow: hidden;\r
+       text-overflow: ellipsis;\r
        white-space: nowrap;\r
-       height: auto;\r
-       width: auto;\r
        page-break-inside: avoid;\r
-    box-sizing: border-box;\r
-               \r
+       box-sizing: border-box;\r
 }\r

diff --git a/bundles/org.simantics.document/src/org/simantics/document/Exportable.java b/bundles/org.simantics.document/src/org/simantics/document/Exportable.java
index 74a739352a27ae2ba951b3ed18cac2574196fd55..637340b909b0379dc46f7d2812d9d18fe03816d2 100644 (file)
--- a/bundles/org.simantics.document/src/org/simantics/document/Exportable.java
+++ b/bundles/org.simantics.document/src/org/simantics/document/Exportable.java
@@ -74,8 +74,7 @@ public class Exportable implements IExportable {
                this.settings = settings;\r
                \r
                MarkupParser markupParser = new MarkupParser();\r
-               MediaWikiLanguage language = new MediaWikiLanguage();\r
-               markupParser.setMarkupLanguage(language);\r
+               markupParser.setMarkupLanguage(new MediaWikiLanguage());\r
                String html = markupParser.parseToHtml(wiki);\r
                \r
                String width = "width:" + (210-settings.marginLeft-settings.marginRight) + "mm;";\r
@@ -95,7 +94,7 @@ public class Exportable implements IExportable {
                html = html.replace("<th>", "<th><div>");\r
                html = html.replace("</td>", "</div></td>");\r
                html = html.replace("</th>", "</div></th>");\r
-               html = html.replace("</head>", "<style type=\"text/css\">" + DEFAULT_CSS + css +  "</style></head>");\r
+               html = html.replace("</head>", "<style type=\"text/css\">\n" + DEFAULT_CSS + css +  "\n</style>\n</head>\n");\r
                \r
                this.html = html;\r
                \r

diff --git a/bundles/org.simantics.export.core/META-INF/MANIFEST.MF b/bundles/org.simantics.export.core/META-INF/MANIFEST.MF
index a194cf13392bee3b9baa7ac84513145e58d9d3da..eadcf7e08be678758677bb3c7e08cac3d32ac497 100644 (file)
--- a/bundles/org.simantics.export.core/META-INF/MANIFEST.MF
+++ b/bundles/org.simantics.export.core/META-INF/MANIFEST.MF
@@ -24,3 +24,5 @@ Export-Package: org.simantics.export.core,
  org.simantics.export.core.manager,
  org.simantics.export.core.pdf,
  org.simantics.export.core.util
+Bundle-ActivationPolicy: lazy
+Bundle-Activator: org.simantics.export.core.internal.Activator

diff --git a/bundles/org.simantics.export.core/src/org/simantics/export/core/internal/Activator.java b/bundles/org.simantics.export.core/src/org/simantics/export/core/internal/Activator.java
new file mode 100644 (file)
index 0000000..e07fa58
--- /dev/null
+++ b/bundles/org.simantics.export.core/src/org/simantics/export/core/internal/Activator.java
@@ -0,0 +1,28 @@
+package org.simantics.export.core.internal;\r
+\r
+import org.osgi.framework.BundleActivator;\r
+import org.osgi.framework.BundleContext;\r
+\r
+/**\r
+ * @author Tuukka Lehtonen\r
+ * @since 1.22.2\r
+ */\r
+public class Activator implements BundleActivator {\r
+\r
+       private static BundleContext context;\r
+\r
+       public static BundleContext getContext() {\r
+               return context;\r
+       }\r
+\r
+       @Override\r
+       public void start(BundleContext context) throws Exception {\r
+               Activator.context = context;\r
+       }\r
+\r
+       @Override\r
+       public void stop(BundleContext context) throws Exception {\r
+               Activator.context = null;\r
+       }\r
+\r
+}\r

diff --git a/bundles/org.simantics.export.core/src/org/simantics/export/core/pdf/ExportPdfWriter.java b/bundles/org.simantics.export.core/src/org/simantics/export/core/pdf/ExportPdfWriter.java
index 7a490e642dd5ea601faa9324e783e7b4a41fb19f..6318e5de2d5bdb5d90cb40e274504a8b2b1df71d 100644 (file)
--- a/bundles/org.simantics.export.core/src/org/simantics/export/core/pdf/ExportPdfWriter.java
+++ b/bundles/org.simantics.export.core/src/org/simantics/export/core/pdf/ExportPdfWriter.java
@@ -399,6 +399,7 @@ public class ExportPdfWriter {
                                this.pdfWriter = PdfWriter.getInstance(document, fos);\r
                                this.pdfWriter.setPdfVersion(PdfWriter.PDF_VERSION_1_7);\r
                                this.pdfWriter.setCompressionLevel( compressionLevel );\r
+                               this.pdfWriter.setPageEvent(new ServiceBasedPdfExportPageEvent());\r
                                this.document.open();\r
                                this.cb = this.pdfWriter.getDirectContent();\r
                                if (!this.document.newPage()) throw new ExportException("Failed to create new page.");\r

diff --git a/bundles/org.simantics.export.core/src/org/simantics/export/core/pdf/PdfExportPageEvent.java b/bundles/org.simantics.export.core/src/org/simantics/export/core/pdf/PdfExportPageEvent.java
new file mode 100644 (file)
index 0000000..60573fa
--- /dev/null
+++ b/bundles/org.simantics.export.core/src/org/simantics/export/core/pdf/PdfExportPageEvent.java
@@ -0,0 +1,9 @@
+package org.simantics.export.core.pdf;\r
+\r
+import com.lowagie.text.pdf.PdfPageEvent;\r
+\r
+/**\r
+ * @author Tuukka Lehtonen\r
+ */\r
+public interface PdfExportPageEvent extends PdfPageEvent {\r
+}\r

diff --git a/bundles/org.simantics.export.core/src/org/simantics/export/core/pdf/ServiceBasedPdfExportPageEvent.java b/bundles/org.simantics.export.core/src/org/simantics/export/core/pdf/ServiceBasedPdfExportPageEvent.java
new file mode 100644 (file)
index 0000000..c513654
--- /dev/null
+++ b/bundles/org.simantics.export.core/src/org/simantics/export/core/pdf/ServiceBasedPdfExportPageEvent.java
@@ -0,0 +1,126 @@
+/*******************************************************************************\r
+ * Copyright (c) 2016 Association for Decentralized Information Management\r
+ * in Industry THTH ry.\r
+ * All rights reserved. This program and the accompanying materials\r
+ * are made available under the terms of the Eclipse Public License v1.0\r
+ * which accompanies this distribution, and is available at\r
+ * http://www.eclipse.org/legal/epl-v10.html\r
+ *\r
+ * Contributors:\r
+ *     Semantum Oy - initial API and implementation\r
+ *******************************************************************************/\r
+package org.simantics.export.core.pdf;\r
+\r
+import java.util.Collection;\r
+import java.util.Collections;\r
+import java.util.HashMap;\r
+import java.util.Map;\r
+import java.util.function.Consumer;\r
+\r
+import org.osgi.framework.BundleContext;\r
+import org.osgi.framework.InvalidSyntaxException;\r
+import org.osgi.framework.ServiceReference;\r
+import org.simantics.Logger;\r
+import org.simantics.export.core.internal.Activator;\r
+\r
+import com.lowagie.text.Document;\r
+import com.lowagie.text.Paragraph;\r
+import com.lowagie.text.Rectangle;\r
+import com.lowagie.text.pdf.PdfPageEventHelper;\r
+import com.lowagie.text.pdf.PdfWriter;\r
+\r
+/**\r
+ * @author Tuukka Lehtonen\r
+ * @since 1.22.2\r
+ */\r
+public class ServiceBasedPdfExportPageEvent extends PdfPageEventHelper {\r
+\r
+       Map<String, PdfExportPageEvent> events;\r
+       \r
+       public ServiceBasedPdfExportPageEvent() {\r
+               // Read all page event contributions from the OSGi service\r
+               events = collectEvents();\r
+       }\r
+\r
+       private static Map<String, PdfExportPageEvent> collectEvents() {\r
+               BundleContext context = Activator.getContext();\r
+               Collection<ServiceReference<PdfExportPageEvent>> serviceReferences;\r
+               try {\r
+                       serviceReferences = context.getServiceReferences(PdfExportPageEvent.class, null);\r
+               } catch (InvalidSyntaxException e) {\r
+                       e.printStackTrace();\r
+                       serviceReferences = Collections.emptyList();\r
+               }\r
+               Map<String, PdfExportPageEvent> events = new HashMap<>(serviceReferences.size());\r
+               for (ServiceReference<PdfExportPageEvent> reference : serviceReferences) {\r
+                       PdfExportPageEvent event = context.getService(reference);\r
+                       String eventName = event.toString();\r
+                       events.put(eventName, event);\r
+               }\r
+               return events;\r
+       }\r
+\r
+       private void safeInvoke(String eventName, PdfExportPageEvent event, Consumer<PdfExportPageEvent> r) {\r
+               try {\r
+                       r.accept(event);\r
+               } catch (Exception e) {\r
+                       Logger.defaultLogError("Failed to invoke PdfExportPageEvent::" + eventName + " for " + event.toString(), e);\r
+               }\r
+       }\r
+\r
+       @Override\r
+       public void onChapter(PdfWriter writer, Document document, float paragraphPosition, Paragraph title) {\r
+               events.values().forEach(e -> safeInvoke("onChapter", e, ee -> ee.onChapter(writer, document, paragraphPosition, title)));\r
+       }\r
+\r
+       @Override\r
+       public void onChapterEnd(PdfWriter writer, Document document, float position) {\r
+               events.values().forEach(e -> safeInvoke("onChapterEnd", e, ee -> ee.onChapterEnd(writer, document, position)));\r
+       }\r
+\r
+       @Override\r
+       public void onGenericTag(PdfWriter writer, Document document, Rectangle rect, String text) {\r
+               events.values().forEach(e -> safeInvoke("onGenericTag", e, ee -> ee.onGenericTag(writer, document, rect, text)));\r
+       }\r
+\r
+       @Override\r
+       public void onOpenDocument(PdfWriter writer, Document document) {\r
+               events.values().forEach(e -> safeInvoke("onOpenDocument", e, ee -> ee.onOpenDocument(writer, document)));\r
+       }\r
+\r
+       @Override\r
+       public void onCloseDocument(PdfWriter writer, Document document) {\r
+               events.values().forEach(e -> safeInvoke("onCloseDocument", e, ee -> ee.onCloseDocument(writer, document)));\r
+       }\r
+\r
+       @Override\r
+       public void onParagraph(PdfWriter writer, Document document, float paragraphPosition) {\r
+               events.values().forEach(e -> safeInvoke("onParagraph", e, ee -> ee.onParagraph(writer, document, paragraphPosition)));\r
+       }\r
+\r
+       @Override\r
+       public void onParagraphEnd(PdfWriter writer, Document document, float paragraphPosition) {\r
+               events.values().forEach(e -> safeInvoke("onParagraphEnd", e, ee -> ee.onParagraphEnd(writer, document, paragraphPosition)));\r
+       }\r
+\r
+       @Override\r
+       public void onSection(PdfWriter writer, Document document, float paragraphPosition, int depth, Paragraph title) {\r
+               events.values().forEach(e -> safeInvoke("onSection", e, ee -> ee.onSection(writer, document, paragraphPosition, depth, title)));\r
+       }\r
+\r
+       @Override\r
+       public void onSectionEnd(PdfWriter writer, Document document, float position) {\r
+               events.values().forEach(e -> safeInvoke("onSectionEnd", e, ee -> ee.onSectionEnd(writer, document, position)));\r
+       }\r
+\r
+       @Override\r
+       public void onStartPage(PdfWriter writer, Document document) {\r
+               events.values().forEach(e -> safeInvoke("onStartPage", e, ee -> ee.onStartPage(writer, document)));\r
+       }\r
+\r
+       @Override\r
+       public void onEndPage(PdfWriter writer, Document document) {\r
+               events.values().forEach(e -> safeInvoke("onEndPage", e, ee -> ee.onEndPage(writer, document)));\r
+       }\r
+\r
+}\r

diff --git a/bundles/org.simantics.g2d.ontology/graph.tg b/bundles/org.simantics.g2d.ontology/graph.tg
index c215a73ccd3c34537d95647fac75e11a81766ea1..362c08c0753448e2524f8a6fb4865baf0d1efb51 100644 (file)
Binary files a/bundles/org.simantics.g2d.ontology/graph.tg and b/bundles/org.simantics.g2d.ontology/graph.tg differ

diff --git a/bundles/org.simantics.g2d.ontology/graph/G2D.pgraph b/bundles/org.simantics.g2d.ontology/graph/G2D.pgraph
index e055f69cce1aa5d401b849dfceeaddd68a397dfc..6f0de29e4e770f4236373e971a4e487c4d5ed97e 100644 (file)
--- a/bundles/org.simantics.g2d.ontology/graph/G2D.pgraph
+++ b/bundles/org.simantics.g2d.ontology/graph/G2D.pgraph
@@ -26,6 +26,7 @@ G2D.HasPoint2DArray <R L0.DependsOn
 // FIXME: use proper datatypes\r
 G2D.Transform <T L0.Literal\r
     @L0.assert L0.HasDataType $(Double[6])\r
+    @L0.assert L0.HasValueType "Vector Double"\r
     L0.HasDescription "A 2x3 matrix of six doubles representing an affine 2D transformation in column-major order."\r
 \r
 G2D.Transform."i-0" <R L0.HasProperty : L0.FunctionalRelation : SEL.GenericParameterType\r

diff --git a/bundles/org.simantics.modeling.ontology/graph.tg b/bundles/org.simantics.modeling.ontology/graph.tg
index 011801300faaceaa4a09d7fd28eecc0d90914ac3..e07cd6b11b928adca1ce721d835b9440f14604d2 100644 (file)
Binary files a/bundles/org.simantics.modeling.ontology/graph.tg and b/bundles/org.simantics.modeling.ontology/graph.tg differ

diff --git a/bundles/org.simantics.modeling.ontology/graph/Modeling.pgraph b/bundles/org.simantics.modeling.ontology/graph/Modeling.pgraph
index 1bd459db5b94c296171b02414bfdda76aba4f170..b8ab1cbfa2017cb5d3ab1f13664a4d1eb9e50f53 100644 (file)
--- a/bundles/org.simantics.modeling.ontology/graph/Modeling.pgraph
+++ b/bundles/org.simantics.modeling.ontology/graph/Modeling.pgraph
@@ -121,7 +121,7 @@ MOD.ConnectionMappingSpecification <T L0.Entity
     // MOD.DiagramConnectionRelationToConnectionRelationC\r
     // MOD.DiagramConnectionRelationToComponentType\r
 MOD.ConnectionRelationToConnectionMappingSpecification <R L0.IsRelatedTo\r
-    L0.HasDomain DIA.Connector\r
+    L0.HasDomain STR.ConnectionRelation\r
     L0.HasRange MOD.ConnectionMappingSpecification\r
 MOD.NeedsConnectionMappingSpecification <R L0.IsRelatedTo : L0.Tag : L0.FunctionalRelation\r
     L0.HasDescription "Tells a connection relation that a diagram connection using it will require a DIA.Connector that has MOD.HasConnectionMappingSpecification statement attached to it if the used connection type has a MOD.ConnectionTypeToConnectionMappingSpecification specified. It guides connection creation."\r

diff --git a/bundles/org.simantics.modeling.ui/META-INF/MANIFEST.MF b/bundles/org.simantics.modeling.ui/META-INF/MANIFEST.MF
index 561e41e10919faa1239e398ebcc98838159a35c8..76aec39f30184755d4f1f67103611eabc95c21f4 100644 (file)
--- a/bundles/org.simantics.modeling.ui/META-INF/MANIFEST.MF
+++ b/bundles/org.simantics.modeling.ui/META-INF/MANIFEST.MF
@@ -60,7 +60,8 @@ Require-Bundle: org.simantics.project;bundle-version="1.0.0",
  org.eclipse.swt,
  org.simantics.db.layer0,
  org.simantics.silk.ontology;bundle-version="1.1.0",
- org.simantics.image.ui;bundle-version="1.0.0"
+ org.simantics.image.ui;bundle-version="1.0.0",
+ org.simantics.export.core;bundle-version="1.0.0"
 Export-Package: org.simantics.modeling.ui,
  org.simantics.modeling.ui.actions,
  org.simantics.modeling.ui.chart.property,

diff --git a/bundles/org.simantics.modeling.ui/src/org/simantics/modeling/ui/pdf/DiagramPrinter.java b/bundles/org.simantics.modeling.ui/src/org/simantics/modeling/ui/pdf/DiagramPrinter.java
index ccdf57fbe89f8ec655bef4fb1dd3b5b5f7ed8986..1b916fcb0b884524614d205b1da61851b70a236d 100644 (file)
--- a/bundles/org.simantics.modeling.ui/src/org/simantics/modeling/ui/pdf/DiagramPrinter.java
+++ b/bundles/org.simantics.modeling.ui/src/org/simantics/modeling/ui/pdf/DiagramPrinter.java
@@ -30,6 +30,7 @@ import org.simantics.db.layer0.util.SessionGarbageCollection;
 import org.simantics.db.management.ISessionContext;\r
 import org.simantics.document.DocumentSettings;\r
 import org.simantics.document.DocumentUtils;\r
+import org.simantics.export.core.pdf.ServiceBasedPdfExportPageEvent;\r
 import org.simantics.modeling.requests.CollectionRequest;\r
 import org.simantics.modeling.requests.CollectionResult;\r
 import org.simantics.modeling.requests.Node;\r
@@ -115,6 +116,7 @@ public class DiagramPrinter {
                     document = new Document(pageSize);\r
                     writer = PdfWriter.getInstance(document, new FileOutputStream(exportPath));\r
                    writer.setPdfVersion(PdfWriter.PDF_VERSION_1_7);\r
+                   writer.setPageEvent(new ServiceBasedPdfExportPageEvent());\r
                    if ( exportPlan.attachTG ) {\r
                        writer.addViewerPreference(PdfName.USEATTACHMENTS, PdfBoolean.PDFTRUE);\r
                    }\r

diff --git a/bundles/org.simantics.modeling/src/org/simantics/modeling/mapping/DiagramToCompositeMapping3.java b/bundles/org.simantics.modeling/src/org/simantics/modeling/mapping/DiagramToCompositeMapping3.java
index df54d5426f2dc3ffc71c541baf23e5afc69500a8..d44e4c16269d9a9f7c00ce386fe93229650c4091 100644 (file)
--- a/bundles/org.simantics.modeling/src/org/simantics/modeling/mapping/DiagramToCompositeMapping3.java
+++ b/bundles/org.simantics.modeling/src/org/simantics/modeling/mapping/DiagramToCompositeMapping3.java
@@ -237,6 +237,11 @@ public class DiagramToCompositeMapping3 extends MappingBase {
                         bb(DIA.FlagIsJoinedBy, Element, Join)\r
                         ),\r
                         deny(bb(STR.Joins, Join, Connection)))\r
+        ),\r
+        if_(and(bf(L0.ConsistsOf, Diagram, Element),\r
+                bf(MOD.DiagramConnectionToConnectionSpecial, Element, Connection),\r
+                not(b(new Tag(STR.Connects), Connection))),\r
+                deny(exists(Connection))\r
         ));\r
        }\r
        \r

diff --git a/bundles/org.simantics.modeling/src/org/simantics/modeling/subscription/SubscriptionItemLabel.java b/bundles/org.simantics.modeling/src/org/simantics/modeling/subscription/SubscriptionItemLabel.java
index ac35599c20afa4926b4ac24cb56f794bd33ba920..ddc33342085cd9cf983a8ad9e87ccdd22f8e5bc9 100644 (file)
--- a/bundles/org.simantics.modeling/src/org/simantics/modeling/subscription/SubscriptionItemLabel.java
+++ b/bundles/org.simantics.modeling/src/org/simantics/modeling/subscription/SubscriptionItemLabel.java
@@ -11,9 +11,9 @@ import org.simantics.databoard.util.URIStringUtils;
 import org.simantics.db.ReadGraph;\r
 import org.simantics.db.Resource;\r
 import org.simantics.db.common.procedure.adapter.TransientCacheAsyncListener;\r
+import org.simantics.db.common.request.PossibleIndexRoot;\r
 import org.simantics.db.exception.DatabaseException;\r
 import org.simantics.db.layer0.exception.PendingVariableException;\r
-import org.simantics.db.layer0.request.PossibleModel;\r
 import org.simantics.db.layer0.request.PossibleVariableValue;\r
 import org.simantics.db.layer0.variable.RVI;\r
 import org.simantics.db.layer0.variable.Variable;\r
@@ -54,7 +54,7 @@ public class SubscriptionItemLabel {
         if (rvi == null)\r
             return NO_VARIABLE_ID;\r
 \r
-        Resource model = graph.syncRequest(new PossibleModel(item));\r
+        Resource model = graph.syncRequest(new PossibleIndexRoot(item));\r
         if (model != null) {\r
             ModelContexts contexts = graph.syncRequest(new ModelContextsRequest(model), TransientCacheAsyncListener.<ModelContexts>instance());\r
             Variable configurationContext = contexts.getConfigurationContext();\r

diff --git a/bundles/org.simantics.project/src/org/simantics/project/management/ServerManagerFactory.java b/bundles/org.simantics.project/src/org/simantics/project/management/ServerManagerFactory.java
index 3bde5dc422a4a2a810f32ba4f6faf67d101e0b6e..4a673b97dce934bf7165bdded2744db8382b63f8 100644 (file)
--- a/bundles/org.simantics.project/src/org/simantics/project/management/ServerManagerFactory.java
+++ b/bundles/org.simantics.project/src/org/simantics/project/management/ServerManagerFactory.java
@@ -33,8 +33,8 @@ public class ServerManagerFactory {
     public static ServerManager create(String databaseId, String address) throws IOException, DatabaseException {\r
         Driver driver = Manager.getDriver(databaseId);\r
         if (driver == null)\r
-            throw new IllegalArgumentException("Database driver for ID " + databaseId + " Could not be found!");\r
-        System.out.println("ServerManagerFactory.create called with databaseId=" + databaseId + " and driver is " + driver.toString());\r
+            throw new IllegalArgumentException("Database driver with ID " + databaseId + " could not be found!");\r
+        System.out.println("ServerManagerFactory.create called with id " + databaseId + ", driver is " + driver.toString());\r
         DatabaseUserAgent agent = Manager.getUserAgent(databaseId);\r
         if (agent != null)\r
             driver.setDatabaseUserAgent(address, agent);\r

diff --git a/bundles/org.simantics.structural2/src/org/simantics/structural2/Functions.java b/bundles/org.simantics.structural2/src/org/simantics/structural2/Functions.java
index 70b9ab03942b400eb16604ff5e93d354618489ae..fd4012355b9005022abcdd056713a0aacd280f0b 100644 (file)
--- a/bundles/org.simantics.structural2/src/org/simantics/structural2/Functions.java
+++ b/bundles/org.simantics.structural2/src/org/simantics/structural2/Functions.java
@@ -26,12 +26,12 @@ import org.simantics.db.common.issue.StandardIssue;
 import org.simantics.db.common.procedure.adapter.TransientCacheAsyncListener;\r
 import org.simantics.db.common.procedure.adapter.TransientCacheListener;\r
 import org.simantics.db.common.request.ObjectsWithType;\r
+import org.simantics.db.common.request.PossibleIndexRoot;\r
 import org.simantics.db.common.request.ResourceRead;\r
 import org.simantics.db.common.uri.UnescapedChildMapOfResource;\r
 import org.simantics.db.exception.DatabaseException;\r
 import org.simantics.db.layer0.function.All;\r
 import org.simantics.db.layer0.function.StandardChildDomainChildren;\r
-import org.simantics.db.layer0.request.PossibleModel;\r
 import org.simantics.db.layer0.request.PropertyInfo;\r
 import org.simantics.db.layer0.request.PropertyInfoRequest;\r
 import org.simantics.db.layer0.request.VariableRead;\r
@@ -372,7 +372,7 @@ public class Functions {
 \r
                        Layer0 L0 = Layer0.getInstance(graph);\r
                        SimulationResource SIMU = SimulationResource.getInstance(graph);\r
-                       Resource model = graph.sync(new PossibleModel(resource));\r
+                       Resource model = graph.sync(new PossibleIndexRoot(resource));\r
                        if(graph.isInstanceOf(model, L0.RVIContext)) {\r
                                return fromContext(graph, model);\r
                        }\r

diff --git a/bundles/org.simantics.workbench/src/org/simantics/workbench/internal/SimanticsWorkbenchAdvisor.java b/bundles/org.simantics.workbench/src/org/simantics/workbench/internal/SimanticsWorkbenchAdvisor.java
index 2d054eaa7d0d7a1fa2367fce88996772f4023f5a..362102172a7a7a9d9c38a4302d8a4be8e41786c6 100644 (file)
--- a/bundles/org.simantics.workbench/src/org/simantics/workbench/internal/SimanticsWorkbenchAdvisor.java
+++ b/bundles/org.simantics.workbench/src/org/simantics/workbench/internal/SimanticsWorkbenchAdvisor.java
@@ -134,7 +134,7 @@ public class SimanticsWorkbenchAdvisor extends WorkbenchAdvisor {
     /**\r
      * Default database ID\r
      */\r
-    private static final String DEFAULT_DATABASE_ID = "procore";\r
+    private static final String DEFAULT_DATABASE_ID = "acorn";\r
     \r
     /**\r
      * The arguments received by the application.\r

diff --git a/bundles/org.simantics/src/org/simantics/SimanticsPlatform.java b/bundles/org.simantics/src/org/simantics/SimanticsPlatform.java
index 89a5d3dbd52df2e7376cafb836b9b7f7724145ec..611cfa575843857d7f6b4e476d15641e6185d29d 100644 (file)
--- a/bundles/org.simantics/src/org/simantics/SimanticsPlatform.java
+++ b/bundles/org.simantics/src/org/simantics/SimanticsPlatform.java
@@ -39,8 +39,6 @@ import org.eclipse.core.runtime.Platform;
 import org.eclipse.core.runtime.Status;\r
 import org.eclipse.core.runtime.SubMonitor;\r
 import org.eclipse.osgi.service.resolver.BundleDescription;\r
-import org.simantics.SimanticsPlatform.OntologyRecoveryPolicy;\r
-import org.simantics.SimanticsPlatform.RecoveryPolicy;\r
 import org.simantics.databoard.Bindings;\r
 import org.simantics.databoard.Databoard;\r
 import org.simantics.datatypes.literal.Font;\r
@@ -286,7 +284,9 @@ public class SimanticsPlatform implements LifecycleListener {
                     // Check hash of transferable graph to know whether to update or not.\r
                     if (platformBundle.getHashcode() == existingBundle.getHashcode())\r
                         continue;\r
-                    System.out.println("Ontology hashcodes does not match! platformBundle" + platformBundle.getName() + ".getHashCode()=" + platformBundle.getHashcode() + " existingBundle" + existingBundle.getName() + ".getHashCode()=" + existingBundle.getHashcode());\r
+                    System.out.println("Ontology hashcodes do not match: platform bundle="\r
+                            + platformBundle.getVersionedId() + ", hash=" + platformBundle.getHashcode()\r
+                            + "; existing bundle=" + existingBundle.getVersionedId() + ", hash=" + existingBundle.getHashcode());\r
                     reinstallTGs.put(platformBundle, existingBundle);\r
                 }\r
             }\r

diff --git a/features/org.simantics.db.client.feature/feature.xml b/features/org.simantics.db.client.feature/feature.xml
index d6101139cacbbb1c5df0ad01a1c0990d71b4e387..14ecb0bf65a4112810ed8297ecb8f571d789dad5 100644 (file)
--- a/features/org.simantics.db.client.feature/feature.xml
+++ b/features/org.simantics.db.client.feature/feature.xml
@@ -73,6 +73,13 @@
          install-size="0"\r
          version="0.0.0"/>\r
 \r
+   <plugin\r
+         id="org.simantics.acorn"\r
+         download-size="0"\r
+         install-size="0"\r
+         version="0.0.0"\r
+         unpack="false"/>\r
+\r
    <plugin\r
          id="org.simantics.databoard"\r
          download-size="0"\r
@@ -115,4 +122,11 @@
          version="0.0.0"\r
          unpack="false"/>\r
 \r
+   <plugin\r
+         id="org.simantics.backup"\r
+         download-size="0"\r
+         install-size="0"\r
+         version="0.0.0"\r
+         unpack="false"/>\r
+\r
 </feature>\r

diff --git a/releng/org.simantics.sdk.build.targetdefinition/org.simantics.sdk.build.targetdefinition-semantum-intra.target b/releng/org.simantics.sdk.build.targetdefinition/org.simantics.sdk.build.targetdefinition-semantum-intra.target
deleted file mode 100644 (file)
index 8391ce8..0000000
--- a/releng/org.simantics.sdk.build.targetdefinition/org.simantics.sdk.build.targetdefinition-semantum-intra.target
+++ /dev/null
@@ -1,1122 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<?pde version="3.8"?><target name="Eclipse Mars.2" sequenceNumber="133">
-<locations>
-<location includeAllPlatforms="true" includeConfigurePhase="false" includeMode="slicer" includeSource="true" type="InstallableUnit">
-<unit id="org.eclipse.mylyn.wikitext_feature.feature.group" version="2.7.0.v20151015-1452"/>
-<unit id="org.eclipse.emf.sdk.feature.group" version="2.11.2.v20160208-0841"/>
-<unit id="org.eclipse.epp.mpc.feature.group" version="1.4.2.v20160210-2005"/>
-<repository location="http://intra.simupedia.com/download/mars"/>
-</location>
-<location includeAllPlatforms="true" includeConfigurePhase="false" includeMode="slicer" includeSource="true" type="InstallableUnit">
-<unit id="org.eclipse.ecf.core.ssl.feature.feature.group" version="1.1.0.v20151130-0157"/>
-<unit id="org.eclipse.rcp.source.feature.group" version="4.5.2.v20160212-1500"/>
-<unit id="org.eclipse.e4.core.tools.feature.feature.group" version="4.5.1.v20160129-0959"/>
-<unit id="org.eclipse.ecf.filetransfer.source.feature.feature.group" version="3.12.0.v20151130-0157"/>
-<unit id="org.eclipse.ecf.filetransfer.ssl.feature.feature.group" version="1.1.0.v20151130-0157"/>
-<unit id="org.eclipse.help.feature.group" version="2.1.2.v20160212-1500"/>
-<unit id="org.eclipse.ecf.filetransfer.httpclient4.source.feature.feature.group" version="3.12.0.v20151130-0157"/>
-<unit id="org.eclipse.e4.core.tools.feature.source.feature.group" version="4.5.1.v20160129-0959"/>
-<unit id="org.eclipse.swt.tools.feature.feature.group" version="3.104.2.v20160128-0900"/>
-<unit id="org.eclipse.ecf.filetransfer.httpclient4.feature.feature.group" version="3.12.0.v20151130-0157"/>
-<unit id="org.eclipse.ecf.filetransfer.ssl.source.feature.feature.group" version="1.1.0.v20151130-0157"/>
-<unit id="org.eclipse.platform.feature.group" version="4.5.2.v20160212-1500"/>
-<unit id="org.eclipse.ecf.core.ssl.source.feature.feature.group" version="1.1.0.v20151130-0157"/>
-<unit id="org.eclipse.rcp.feature.group" version="4.5.2.v20160212-1500"/>
-<unit id="org.eclipse.equinox.p2.discovery.feature.feature.group" version="1.0.300.v20150430-1836"/>
-<unit id="org.eclipse.ecf.core.feature.feature.group" version="1.2.0.v20151130-0157"/>
-<unit id="org.eclipse.ecf.core.source.feature.feature.group" version="1.2.0.v20151130-0157"/>
-<unit id="org.eclipse.equinox.sdk.feature.group" version="3.11.2.v20160202-2102"/>
-<unit id="org.eclipse.platform.source.feature.group" version="4.5.2.v20160212-1500"/>
-<unit id="org.eclipse.releng.tools.feature.group" version="3.6.0.v20150527-0145"/>
-<unit id="org.eclipse.ecf.filetransfer.feature.feature.group" version="3.12.0.v20151130-0157"/>
-<unit id="org.eclipse.sdk.ide" version="4.5.2.M20160212-1500"/>
-<unit id="org.eclipse.ecf.filetransfer.httpclient4.ssl.feature.feature.group" version="1.1.0.v20151130-0157"/>
-<unit id="org.eclipse.help.source.feature.group" version="2.1.2.v20160212-1500"/>
-<unit id="org.eclipse.ecf.filetransfer.httpclient4.ssl.source.feature.feature.group" version="1.1.0.v20151130-0157"/>
-<repository location="http://intra.simupedia.com/download/eclipse/updates/4.5"/>
-</location>
-<location includeAllPlatforms="true" includeConfigurePhase="false" includeMode="slicer" includeSource="true" type="InstallableUnit">
-<unit id="org.eclipse.nebula.effects.stw.feature.feature.group" version="1.0.0.201605182147"/>
-<unit id="org.eclipse.nebula.visualization.feature.feature.group" version="1.0.0.201605182147"/>
-<unit id="org.eclipse.nebula.widgets.calendarcombo.feature.feature.group" version="1.0.0.201605182147"/>
-<unit id="org.eclipse.nebula.widgets.gallery.feature.feature.group" version="1.0.0.201605182147"/>
-<unit id="org.eclipse.nebula.feature.feature.group" version="1.0.0.201605182147"/>
-<unit id="org.eclipse.nebula.cwt.feature.feature.group" version="1.0.0.201605182147"/>
-<unit id="org.eclipse.nebula.widgets.oscilloscope.feature.feature.group" version="1.2.0.201605182147"/>
-<unit id="org.eclipse.nebula.widgets.pshelf.css.feature.feature.group" version="1.0.0.201605182147"/>
-<unit id="org.eclipse.nebula.widgets.ganttchart.feature.feature.group" version="1.0.0.201605182147"/>
-<unit id="org.eclipse.nebula.widgets.xviewer.feature.feature.group" version="1.0.0.201605182147"/>
-<unit id="org.eclipse.nebula.widgets.compositetable.feature.feature.group" version="1.0.0.201605182147"/>
-<unit id="org.eclipse.nebula.widgets.grid.feature.feature.group" version="1.0.0.201605182147"/>
-<unit id="org.eclipse.nebula.widgets.cdatetime.feature.feature.group" version="1.0.0.201605182147"/>
-<unit id="org.eclipse.nebula.widgets.pshelf.feature.feature.group" version="1.0.0.201605182147"/>
-<unit id="org.eclipse.nebula.widgets.richtext.feature.feature.group" version="1.0.0.201605182147"/>
-<unit id="org.eclipse.nebula.widgets.tablecombo.feature.feature.group" version="1.0.0.201605182147"/>
-<unit id="org.eclipse.nebula.widgets.paperclips.feature.feature.group" version="2.0.0.201605182147"/>
-<unit id="org.eclipse.nebula.examples.release.feature.feature.group" version="1.0.4.201605182147"/>
-<unit id="org.eclipse.nebula.widgets.pgroup.feature.feature.group" version="1.0.0.201605182147"/>
-<repository location="http://intra.simupedia.com/download/nebula/Q22016/release/"/>
-</location>
-<location includeAllPlatforms="true" includeConfigurePhase="false" includeMode="slicer" includeSource="true" type="InstallableUnit">
-<unit id="org.eclipse.e4.tools.spies.feature.feature.group" version="0.17.0.v20160811-1516"/>
-<repository location="http://intra.simupedia.com/download/e4/snapshots/org.eclipse.e4.tools/latest/"/>
-</location>
-<location includeAllPlatforms="true" includeConfigurePhase="false" includeMode="slicer" includeSource="true" type="InstallableUnit">
-<unit id="org.eclipse.nebula.incubation.feature.feature.group" version="1.0.0.201605182147"/>
-<unit id="org.eclipse.nebula.examples.incubation.feature.feature.group" version="1.0.0.201605182147"/>
-<repository location="http://intra.simupedia.com/download/nebula/Q22016/incubation"/>
-</location>
-<location includeAllPlatforms="true" includeConfigurePhase="false" includeMode="slicer" includeSource="true" type="InstallableUnit">
-<unit id="org.eclipse.nebula.widgets.nattable.core.feature.feature.group" version="1.4.0.201606011907"/>
-<unit id="org.eclipse.nebula.widgets.nattable.extension.e4.source.feature.feature.group" version="1.0.0.201606011907"/>
-<unit id="org.eclipse.nebula.widgets.nattable.extension.poi.feature.feature.group" version="1.4.0.201606011907"/>
-<unit id="org.eclipse.nebula.widgets.nattable.extension.glazedlists.feature.feature.group" version="1.4.0.201606011907"/>
-<unit id="org.eclipse.nebula.widgets.nattable.core.source.feature.feature.group" version="1.4.0.201606011907"/>
-<unit id="org.eclipse.nebula.widgets.nattable.extension.glazedlists.source.feature.feature.group" version="1.4.0.201606011907"/>
-<unit id="org.eclipse.nebula.widgets.nattable.extension.nebula.feature.feature.group" version="1.0.0.201606011907"/>
-<unit id="org.eclipse.nebula.widgets.nattable.extension.e4.feature.feature.group" version="1.0.0.201606011907"/>
-<unit id="org.eclipse.nebula.widgets.nattable.extension.nebula.source.feature.feature.group" version="1.0.0.201606011907"/>
-<unit id="org.eclipse.nebula.widgets.nattable.extension.poi.source.feature.feature.group" version="1.4.0.201606011907"/>
-<repository location="http://intra.simupedia.com/download/nebula/nattable/releases/1.4.0/repository/"/>
-</location>
-<location includeAllPlatforms="true" includeConfigurePhase="false" includeMode="slicer" includeSource="true" type="InstallableUnit">
-<unit id="org.apache.commons.lang.source" version="2.6.0"/>
-<unit id="org.apache.commons.compress" version="1.12.0"/>
-<unit id="org.apache.pdfbox.source" version="2.0.2"/>
-<unit id="org.bouncycastle.bcmail-jdk14.source" version="1.38.0"/>
-<unit id="org.ini4j" version="0.5.4"/>
-<unit id="org.jdom2.source" version="2.0.6"/>
-<unit id="org.apache.commons.logging" version="1.2.0"/>
-<unit id="net.ucanaccess" version="3.0.6"/>
-<unit id="gnu.trove2" version="2.1.0"/>
-<unit id="net.ucanaccess.source" version="3.0.6"/>
-<unit id="org.eclipse.collections.eclipse-collections.source" version="7.1.0"/>
-<unit id="freemarker" version="2.3.23.stable"/>
-<unit id="com.github.virtuald.curvesapi.source" version="1.3.0"/>
-<unit id="org.apache.commons.collections.source" version="3.2.2"/>
-<unit id="org.apache.pdfbox.fontbox" version="2.0.2"/>
-<unit id="org.apache.commons.compress.source" version="1.12.0"/>
-<unit id="org.apache.lucene4.queryparser.source" version="4.9.0.b0003"/>
-<unit id="org.mozilla.rhino.source" version="1.7.7.1"/>
-<unit id="freemarker.source" version="2.3.23.stable"/>
-<unit id="jakarta-regexp" version="1.4.0"/>
-<unit id="net.jcip.annotations.source" version="1.0.0"/>
-<unit id="org.apache.log4j.source" version="1.2.17"/>
-<unit id="org.apache.commons.logging.source" version="1.2.0"/>
-<unit id="org.apache.commons.io.source" version="1.4.0"/>
-<unit id="com.healthmarketscience.jackcess" version="2.1.3"/>
-<unit id="org.bouncycastle.bctsp-jdk14.source" version="1.38.0"/>
-<unit id="org.eclipse.collections.eclipse-collections-api" version="7.1.0"/>
-<unit id="gnu.trove3.source" version="3.0.3"/>
-<unit id="it.unimi.dsi.fastutil.source" version="7.0.12"/>
-<unit id="org.hsqldb.hsqldb.source" version="2.3.1"/>
-<unit id="org.apache.poi.source" version="3.14.0"/>
-<unit id="org.apache.lucene4.sandbox.source" version="4.9.0.b0003"/>
-<unit id="org.apache.xmlbeans" version="2.6.0"/>
-<unit id="org.supercsv" version="2.4.0"/>
-<unit id="org.mozilla.rhino" version="1.7.7.1"/>
-<unit id="org.apache.commons.codec" version="1.10.0"/>
-<unit id="com.healthmarketscience.jackcess.source" version="2.1.3"/>
-<unit id="org.eclipse.collections.eclipse-collections-api.source" version="7.1.0"/>
-<unit id="org.bouncycastle.bcprov-jdk14.source" version="1.38.0"/>
-<unit id="stax.api" version="1.0.1"/>
-<unit id="org.apache.pdfbox.fontbox.source" version="2.0.2"/>
-<unit id="it.unimi.dsi.fastutil" version="7.0.12"/>
-<unit id="com.lowagie.text.source" version="2.1.7.b1"/>
-<unit id="net.jcip.annotations" version="1.0.0"/>
-<unit id="org.apache.lucene4.queryparser" version="4.9.0.b0003"/>
-<unit id="org.bouncycastle.bctsp-jdk14" version="1.38.0"/>
-<unit id="org.jfree.jchart.source" version="1.0.19"/>
-<unit id="com.lowagie.text" version="2.1.7.b1"/>
-<unit id="org.apache.poi.ooxml-schemas" version="3.14.0"/>
-<unit id="org.bouncycastle.bcprov-jdk14" version="1.38.0"/>
-<unit id="org.apache.poi" version="3.14.0"/>
-<unit id="org.jdom2" version="2.0.6"/>
-<unit id="org.apache.commons.lang" version="2.6.0"/>
-<unit id="org.jfree.jchart" version="1.0.19"/>
-<unit id="org.apache.lucene4.sandbox" version="4.9.0.b0003"/>
-<unit id="org.apache.commons.codec.source" version="1.10.0"/>
-<unit id="org.supercsv.source" version="2.4.0"/>
-<unit id="com.github.virtuald.curvesapi" version="1.3.0"/>
-<unit id="org.eclipse.collections.eclipse-collections" version="7.1.0"/>
-<unit id="org.apache.log4j" version="1.2.17"/>
-<unit id="org.apache.lucene4.queries.source" version="4.9.0.b0003"/>
-<unit id="org.apache.lucene4.core.source" version="4.9.0.b0003"/>
-<unit id="org.apache.poi.ooxml" version="3.14.0"/>
-<unit id="org.apache.lucene4.analyzers-common.source" version="4.9.0.b0003"/>
-<unit id="org.apache.pdfbox" version="2.0.2"/>
-<unit id="org.bouncycastle.bcmail-jdk14" version="1.38.0"/>
-<unit id="org.jfree.jcommon" version="1.0.23"/>
-<unit id="org.apache.lucene4.analyzers-common" version="4.9.0.b0003"/>
-<unit id="org.apache.commons.collections" version="3.2.2"/>
-<unit id="org.apache.poi.ooxml.source" version="3.14.0"/>
-<unit id="org.apache.lucene4.core" version="4.9.0.b0003"/>
-<unit id="gnu.trove2.source" version="2.1.0"/>
-<unit id="gnu.trove3" version="3.0.3"/>
-<unit id="org.jfree.jcommon.source" version="1.0.23"/>
-<unit id="org.hsqldb.hsqldb" version="2.3.1"/>
-<unit id="org.apache.commons.io" version="1.4.0"/>
-<unit id="bouncycastle.bcmail-jdk14" version="138.0.0"/>
-<unit id="org.apache.lucene4.queries" version="4.9.0.b0003"/>
-<unit id="javax.vecmath" version="1.5.2"/>
-<unit id="bouncycastle.bcprov-jdk14" version="138.0.0"/>
-<unit id="org.ini4j.source" version="0.5.4"/>
-<repository location="http://intra.simupedia.com/download/master/external-components"/>
-</location>
-<location includeAllPlatforms="true" includeConfigurePhase="false" includeMode="slicer" includeSource="true" type="InstallableUnit">
-<unit id="org.objectweb.asm.xml.source" version="5.0.1.v201404251740"/>
-<unit id="org.objectweb.asm.util.source" version="5.0.1.v201404251740"/>
-<unit id="org.objectweb.asm.source" version="5.0.1.v201404251740"/>
-<unit id="com.google.guava" version="15.0.0.v201403281430"/>
-<unit id="org.objectweb.asm.util" version="5.0.1.v201404251740"/>
-<unit id="org.antlr.runtime" version="4.3.0.v201502022030"/>
-<unit id="org.objectweb.asm.xml" version="5.0.1.v201404251740"/>
-<unit id="com.google.guava.source" version="15.0.0.v201403281430"/>
-<unit id="org.objectweb.asm" version="5.0.1.v201404251740"/>
-<unit id="org.objectweb.asm.commons" version="5.0.1.v201404251740"/>
-<unit id="org.objectweb.asm.analysis.source" version="5.0.1.v201505121915"/>
-<unit id="org.objectweb.asm.commons.source" version="5.0.1.v201404251740"/>
-<unit id="org.objectweb.asm.tree.source" version="5.0.1.v201404251740"/>
-<unit id="org.objectweb.asm.analysis" version="5.0.1.v201505121915"/>
-<unit id="org.objectweb.asm.tree" version="5.0.1.v201404251740"/>
-<unit id="org.antlr.runtime.source" version="4.3.0.v201502022030"/>
-<repository location="http://intra.simupedia.com/download/tools/orbit/downloads/drops/R20160221192158/repository/"/>
-</location>
-</locations>
-<includeBundles>
-<plugin id="bouncycastle.bcmail-jdk14"/>
-<plugin id="bouncycastle.bcprov-jdk14"/>
-<plugin id="ca.odell.glazedlists"/>
-<plugin id="ca.odell.glazedlists.source"/>
-<plugin id="com.github.virtuald.curvesapi"/>
-<plugin id="com.github.virtuald.curvesapi.source"/>
-<plugin id="com.google.guava"/>
-<plugin id="com.google.guava.source"/>
-<plugin id="com.healthmarketscience.jackcess"/>
-<plugin id="com.healthmarketscience.jackcess.source"/>
-<plugin id="com.ibm.icu"/>
-<plugin id="com.ibm.icu.source"/>
-<plugin id="com.jcraft.jsch"/>
-<plugin id="com.jcraft.jsch.source"/>
-<plugin id="com.lowagie.text"/>
-<plugin id="com.lowagie.text.source"/>
-<plugin id="com.sun.el"/>
-<plugin id="com.sun.el.source"/>
-<plugin id="freemarker"/>
-<plugin id="freemarker.source"/>
-<plugin id="gnu.trove2"/>
-<plugin id="gnu.trove2.source"/>
-<plugin id="gnu.trove3"/>
-<plugin id="gnu.trove3.source"/>
-<plugin id="it.unimi.dsi.fastutil"/>
-<plugin id="it.unimi.dsi.fastutil.source"/>
-<plugin id="jakarta-regexp"/>
-<plugin id="javax.annotation"/>
-<plugin id="javax.annotation.source"/>
-<plugin id="javax.el"/>
-<plugin id="javax.el.source"/>
-<plugin id="javax.inject"/>
-<plugin id="javax.inject.source"/>
-<plugin id="javax.servlet"/>
-<plugin id="javax.servlet.jsp"/>
-<plugin id="javax.servlet.jsp.source"/>
-<plugin id="javax.servlet.source"/>
-<plugin id="javax.vecmath"/>
-<plugin id="javax.xml"/>
-<plugin id="net.jcip.annotations"/>
-<plugin id="net.jcip.annotations.source"/>
-<plugin id="net.ucanaccess"/>
-<plugin id="net.ucanaccess.source"/>
-<plugin id="org.antlr.runtime"/>
-<plugin id="org.antlr.runtime.source"/>
-<plugin id="org.apache.ant"/>
-<plugin id="org.apache.ant.source"/>
-<plugin id="org.apache.batik.css"/>
-<plugin id="org.apache.batik.css.source"/>
-<plugin id="org.apache.batik.util"/>
-<plugin id="org.apache.batik.util.gui"/>
-<plugin id="org.apache.batik.util.gui.source"/>
-<plugin id="org.apache.batik.util.source"/>
-<plugin id="org.apache.commons.codec" version="1.6.0.v201305230611"/>
-<plugin id="org.apache.commons.codec" version="1.10.0"/>
-<plugin id="org.apache.commons.codec" version="1.6.0.v201305230611"/>
-<plugin id="org.apache.commons.codec.source" version="1.6.0.v201305230611"/>
-<plugin id="org.apache.commons.codec.source" version="1.10.0"/>
-<plugin id="org.apache.commons.codec.source" version="1.6.0.v201305230611"/>
-<plugin id="org.apache.commons.collections"/>
-<plugin id="org.apache.commons.collections.source"/>
-<plugin id="org.apache.commons.compress"/>
-<plugin id="org.apache.commons.compress.source"/>
-<plugin id="org.apache.commons.io"/>
-<plugin id="org.apache.commons.io.source"/>
-<plugin id="org.apache.commons.jxpath"/>
-<plugin id="org.apache.commons.jxpath.source"/>
-<plugin id="org.apache.commons.lang"/>
-<plugin id="org.apache.commons.lang.source"/>
-<plugin id="org.apache.commons.logging" version="1.1.1.v201101211721"/>
-<plugin id="org.apache.commons.logging" version="1.2.0"/>
-<plugin id="org.apache.commons.logging" version="1.1.1.v201101211721"/>
-<plugin id="org.apache.commons.logging.source" version="1.1.1.v201101211721"/>
-<plugin id="org.apache.commons.logging.source" version="1.2.0"/>
-<plugin id="org.apache.commons.logging.source" version="1.1.1.v201101211721"/>
-<plugin id="org.apache.felix.gogo.command"/>
-<plugin id="org.apache.felix.gogo.command.source"/>
-<plugin id="org.apache.felix.gogo.runtime"/>
-<plugin id="org.apache.felix.gogo.runtime.source"/>
-<plugin id="org.apache.felix.gogo.shell"/>
-<plugin id="org.apache.felix.gogo.shell.source"/>
-<plugin id="org.apache.httpcomponents.httpclient" version="4.3.6.v201411290715"/>
-<plugin id="org.apache.httpcomponents.httpclient" version="4.3.6.v201411290715"/>
-<plugin id="org.apache.httpcomponents.httpclient.source" version="4.3.6.v201411290715"/>
-<plugin id="org.apache.httpcomponents.httpclient.source" version="4.3.6.v201411290715"/>
-<plugin id="org.apache.httpcomponents.httpcore" version="4.3.3.v201411290715"/>
-<plugin id="org.apache.httpcomponents.httpcore" version="4.3.3.v201411290715"/>
-<plugin id="org.apache.httpcomponents.httpcore.source" version="4.3.3.v201411290715"/>
-<plugin id="org.apache.httpcomponents.httpcore.source" version="4.3.3.v201411290715"/>
-<plugin id="org.apache.jasper.glassfish"/>
-<plugin id="org.apache.jasper.glassfish.source"/>
-<plugin id="org.apache.log4j"/>
-<plugin id="org.apache.log4j.source"/>
-<plugin id="org.apache.lucene.analysis"/>
-<plugin id="org.apache.lucene.analysis.source"/>
-<plugin id="org.apache.lucene.core"/>
-<plugin id="org.apache.lucene.core.source"/>
-<plugin id="org.apache.lucene4.analyzers-common"/>
-<plugin id="org.apache.lucene4.analyzers-common.source"/>
-<plugin id="org.apache.lucene4.core"/>
-<plugin id="org.apache.lucene4.core.source"/>
-<plugin id="org.apache.lucene4.queries"/>
-<plugin id="org.apache.lucene4.queries.source"/>
-<plugin id="org.apache.lucene4.queryparser"/>
-<plugin id="org.apache.lucene4.queryparser.source"/>
-<plugin id="org.apache.lucene4.sandbox"/>
-<plugin id="org.apache.lucene4.sandbox.source"/>
-<plugin id="org.apache.mina.core"/>
-<plugin id="org.apache.mina.core.source"/>
-<plugin id="org.apache.pdfbox"/>
-<plugin id="org.apache.pdfbox.fontbox"/>
-<plugin id="org.apache.pdfbox.fontbox.source"/>
-<plugin id="org.apache.pdfbox.source"/>
-<plugin id="org.apache.poi" version="3.14.0"/>
-<plugin id="org.apache.poi.ooxml"/>
-<plugin id="org.apache.poi.ooxml-schemas"/>
-<plugin id="org.apache.poi.ooxml.source"/>
-<plugin id="org.apache.poi.source" version="3.14.0"/>
-<plugin id="org.apache.sshd.core"/>
-<plugin id="org.apache.sshd.core.source"/>
-<plugin id="org.apache.xmlbeans"/>
-<plugin id="org.bouncycastle.bcmail-jdk14"/>
-<plugin id="org.bouncycastle.bcmail-jdk14.source"/>
-<plugin id="org.bouncycastle.bcprov-jdk14"/>
-<plugin id="org.bouncycastle.bcprov-jdk14.source"/>
-<plugin id="org.bouncycastle.bctsp-jdk14"/>
-<plugin id="org.bouncycastle.bctsp-jdk14.source"/>
-<plugin id="org.eclipse.ant.core"/>
-<plugin id="org.eclipse.ant.core.source"/>
-<plugin id="org.eclipse.ant.launching"/>
-<plugin id="org.eclipse.ant.launching.source"/>
-<plugin id="org.eclipse.ant.ui"/>
-<plugin id="org.eclipse.ant.ui.source"/>
-<plugin id="org.eclipse.collections.eclipse-collections"/>
-<plugin id="org.eclipse.collections.eclipse-collections-api"/>
-<plugin id="org.eclipse.collections.eclipse-collections-api.source"/>
-<plugin id="org.eclipse.collections.eclipse-collections.source"/>
-<plugin id="org.eclipse.compare"/>
-<plugin id="org.eclipse.compare.core"/>
-<plugin id="org.eclipse.compare.core.source"/>
-<plugin id="org.eclipse.compare.source"/>
-<plugin id="org.eclipse.compare.win32"/>
-<plugin id="org.eclipse.compare.win32.source"/>
-<plugin id="org.eclipse.core.commands"/>
-<plugin id="org.eclipse.core.commands.source"/>
-<plugin id="org.eclipse.core.contenttype"/>
-<plugin id="org.eclipse.core.contenttype.source"/>
-<plugin id="org.eclipse.core.databinding"/>
-<plugin id="org.eclipse.core.databinding.beans"/>
-<plugin id="org.eclipse.core.databinding.beans.source"/>
-<plugin id="org.eclipse.core.databinding.observable"/>
-<plugin id="org.eclipse.core.databinding.observable.source"/>
-<plugin id="org.eclipse.core.databinding.property"/>
-<plugin id="org.eclipse.core.databinding.property.source"/>
-<plugin id="org.eclipse.core.databinding.source"/>
-<plugin id="org.eclipse.core.expressions"/>
-<plugin id="org.eclipse.core.expressions.source"/>
-<plugin id="org.eclipse.core.externaltools"/>
-<plugin id="org.eclipse.core.externaltools.source"/>
-<plugin id="org.eclipse.core.filebuffers"/>
-<plugin id="org.eclipse.core.filebuffers.source"/>
-<plugin id="org.eclipse.core.filesystem"/>
-<plugin id="org.eclipse.core.filesystem.aix.ppc"/>
-<plugin id="org.eclipse.core.filesystem.aix.ppc64"/>
-<plugin id="org.eclipse.core.filesystem.hpux.ia64"/>
-<plugin id="org.eclipse.core.filesystem.java7"/>
-<plugin id="org.eclipse.core.filesystem.java7.source"/>
-<plugin id="org.eclipse.core.filesystem.linux.ppc"/>
-<plugin id="org.eclipse.core.filesystem.linux.ppc64"/>
-<plugin id="org.eclipse.core.filesystem.linux.ppc64le"/>
-<plugin id="org.eclipse.core.filesystem.linux.x86"/>
-<plugin id="org.eclipse.core.filesystem.linux.x86_64"/>
-<plugin id="org.eclipse.core.filesystem.macosx"/>
-<plugin id="org.eclipse.core.filesystem.solaris.sparc"/>
-<plugin id="org.eclipse.core.filesystem.source"/>
-<plugin id="org.eclipse.core.filesystem.win32.x86"/>
-<plugin id="org.eclipse.core.filesystem.win32.x86_64"/>
-<plugin id="org.eclipse.core.jobs"/>
-<plugin id="org.eclipse.core.jobs.source"/>
-<plugin id="org.eclipse.core.net"/>
-<plugin id="org.eclipse.core.net.linux.x86"/>
-<plugin id="org.eclipse.core.net.linux.x86_64"/>
-<plugin id="org.eclipse.core.net.source"/>
-<plugin id="org.eclipse.core.net.win32.x86"/>
-<plugin id="org.eclipse.core.net.win32.x86_64"/>
-<plugin id="org.eclipse.core.resources"/>
-<plugin id="org.eclipse.core.resources.source"/>
-<plugin id="org.eclipse.core.resources.win32.x86"/>
-<plugin id="org.eclipse.core.resources.win32.x86_64"/>
-<plugin id="org.eclipse.core.runtime"/>
-<plugin id="org.eclipse.core.runtime.compatibility"/>
-<plugin id="org.eclipse.core.runtime.compatibility.registry"/>
-<plugin id="org.eclipse.core.runtime.compatibility.registry.source"/>
-<plugin id="org.eclipse.core.runtime.compatibility.source"/>
-<plugin id="org.eclipse.core.runtime.source"/>
-<plugin id="org.eclipse.core.variables"/>
-<plugin id="org.eclipse.core.variables.source"/>
-<plugin id="org.eclipse.cvs"/>
-<plugin id="org.eclipse.debug.core"/>
-<plugin id="org.eclipse.debug.core.source"/>
-<plugin id="org.eclipse.debug.ui"/>
-<plugin id="org.eclipse.debug.ui.source"/>
-<plugin id="org.eclipse.e4.core.commands"/>
-<plugin id="org.eclipse.e4.core.commands.source"/>
-<plugin id="org.eclipse.e4.core.contexts"/>
-<plugin id="org.eclipse.e4.core.contexts.source"/>
-<plugin id="org.eclipse.e4.core.di"/>
-<plugin id="org.eclipse.e4.core.di.annotations"/>
-<plugin id="org.eclipse.e4.core.di.annotations.source"/>
-<plugin id="org.eclipse.e4.core.di.extensions"/>
-<plugin id="org.eclipse.e4.core.di.extensions.source"/>
-<plugin id="org.eclipse.e4.core.di.source"/>
-<plugin id="org.eclipse.e4.core.services"/>
-<plugin id="org.eclipse.e4.core.services.source"/>
-<plugin id="org.eclipse.e4.emf.xpath"/>
-<plugin id="org.eclipse.e4.emf.xpath.source"/>
-<plugin id="org.eclipse.e4.tools"/>
-<plugin id="org.eclipse.e4.tools.bundle.spy"/>
-<plugin id="org.eclipse.e4.tools.compat"/>
-<plugin id="org.eclipse.e4.tools.compat.source"/>
-<plugin id="org.eclipse.e4.tools.context.spy"/>
-<plugin id="org.eclipse.e4.tools.css.spy"/>
-<plugin id="org.eclipse.e4.tools.css.spy.source"/>
-<plugin id="org.eclipse.e4.tools.emf.editor3x"/>
-<plugin id="org.eclipse.e4.tools.emf.editor3x.source"/>
-<plugin id="org.eclipse.e4.tools.emf.ui"/>
-<plugin id="org.eclipse.e4.tools.emf.ui.source"/>
-<plugin id="org.eclipse.e4.tools.event.spy"/>
-<plugin id="org.eclipse.e4.tools.event.spy.source"/>
-<plugin id="org.eclipse.e4.tools.jdt.templates"/>
-<plugin id="org.eclipse.e4.tools.jdt.templates.source"/>
-<plugin id="org.eclipse.e4.tools.model.spy"/>
-<plugin id="org.eclipse.e4.tools.preference.spy"/>
-<plugin id="org.eclipse.e4.tools.services"/>
-<plugin id="org.eclipse.e4.tools.services.source"/>
-<plugin id="org.eclipse.e4.tools.source"/>
-<plugin id="org.eclipse.e4.tools.spy"/>
-<plugin id="org.eclipse.e4.tools.spy.source"/>
-<plugin id="org.eclipse.e4.ui.bindings"/>
-<plugin id="org.eclipse.e4.ui.bindings.source"/>
-<plugin id="org.eclipse.e4.ui.css.core"/>
-<plugin id="org.eclipse.e4.ui.css.core.source"/>
-<plugin id="org.eclipse.e4.ui.css.swt"/>
-<plugin id="org.eclipse.e4.ui.css.swt.source"/>
-<plugin id="org.eclipse.e4.ui.css.swt.theme"/>
-<plugin id="org.eclipse.e4.ui.css.swt.theme.source"/>
-<plugin id="org.eclipse.e4.ui.di"/>
-<plugin id="org.eclipse.e4.ui.di.source"/>
-<plugin id="org.eclipse.e4.ui.dialogs"/>
-<plugin id="org.eclipse.e4.ui.dialogs.source"/>
-<plugin id="org.eclipse.e4.ui.model.workbench"/>
-<plugin id="org.eclipse.e4.ui.model.workbench.source"/>
-<plugin id="org.eclipse.e4.ui.services"/>
-<plugin id="org.eclipse.e4.ui.services.source"/>
-<plugin id="org.eclipse.e4.ui.swt.gtk"/>
-<plugin id="org.eclipse.e4.ui.swt.gtk.source"/>
-<plugin id="org.eclipse.e4.ui.widgets"/>
-<plugin id="org.eclipse.e4.ui.widgets.source"/>
-<plugin id="org.eclipse.e4.ui.workbench"/>
-<plugin id="org.eclipse.e4.ui.workbench.addons.swt"/>
-<plugin id="org.eclipse.e4.ui.workbench.addons.swt.source"/>
-<plugin id="org.eclipse.e4.ui.workbench.renderers.swt"/>
-<plugin id="org.eclipse.e4.ui.workbench.renderers.swt.cocoa"/>
-<plugin id="org.eclipse.e4.ui.workbench.renderers.swt.cocoa.source"/>
-<plugin id="org.eclipse.e4.ui.workbench.renderers.swt.source"/>
-<plugin id="org.eclipse.e4.ui.workbench.source"/>
-<plugin id="org.eclipse.e4.ui.workbench.swt"/>
-<plugin id="org.eclipse.e4.ui.workbench.swt.source"/>
-<plugin id="org.eclipse.e4.ui.workbench3"/>
-<plugin id="org.eclipse.e4.ui.workbench3.source"/>
-<plugin id="org.eclipse.ecf"/>
-<plugin id="org.eclipse.ecf.filetransfer"/>
-<plugin id="org.eclipse.ecf.filetransfer.source"/>
-<plugin id="org.eclipse.ecf.identity"/>
-<plugin id="org.eclipse.ecf.identity.source"/>
-<plugin id="org.eclipse.ecf.provider.filetransfer"/>
-<plugin id="org.eclipse.ecf.provider.filetransfer.httpclient4"/>
-<plugin id="org.eclipse.ecf.provider.filetransfer.httpclient4.source"/>
-<plugin id="org.eclipse.ecf.provider.filetransfer.httpclient4.ssl"/>
-<plugin id="org.eclipse.ecf.provider.filetransfer.httpclient4.ssl.source"/>
-<plugin id="org.eclipse.ecf.provider.filetransfer.source"/>
-<plugin id="org.eclipse.ecf.provider.filetransfer.ssl"/>
-<plugin id="org.eclipse.ecf.provider.filetransfer.ssl.source"/>
-<plugin id="org.eclipse.ecf.source"/>
-<plugin id="org.eclipse.ecf.ssl"/>
-<plugin id="org.eclipse.ecf.ssl.source"/>
-<plugin id="org.eclipse.emf"/>
-<plugin id="org.eclipse.emf.ant"/>
-<plugin id="org.eclipse.emf.ant.source"/>
-<plugin id="org.eclipse.emf.cheatsheets"/>
-<plugin id="org.eclipse.emf.cheatsheets.source"/>
-<plugin id="org.eclipse.emf.codegen"/>
-<plugin id="org.eclipse.emf.codegen.ecore"/>
-<plugin id="org.eclipse.emf.codegen.ecore.source"/>
-<plugin id="org.eclipse.emf.codegen.ecore.ui"/>
-<plugin id="org.eclipse.emf.codegen.ecore.ui.source"/>
-<plugin id="org.eclipse.emf.codegen.source"/>
-<plugin id="org.eclipse.emf.codegen.ui"/>
-<plugin id="org.eclipse.emf.codegen.ui.source"/>
-<plugin id="org.eclipse.emf.common"/>
-<plugin id="org.eclipse.emf.common.source"/>
-<plugin id="org.eclipse.emf.common.ui"/>
-<plugin id="org.eclipse.emf.common.ui.source"/>
-<plugin id="org.eclipse.emf.converter"/>
-<plugin id="org.eclipse.emf.converter.source"/>
-<plugin id="org.eclipse.emf.databinding"/>
-<plugin id="org.eclipse.emf.databinding.edit"/>
-<plugin id="org.eclipse.emf.databinding.edit.source"/>
-<plugin id="org.eclipse.emf.databinding.source"/>
-<plugin id="org.eclipse.emf.doc"/>
-<plugin id="org.eclipse.emf.ecore"/>
-<plugin id="org.eclipse.emf.ecore.change"/>
-<plugin id="org.eclipse.emf.ecore.change.edit"/>
-<plugin id="org.eclipse.emf.ecore.change.edit.source"/>
-<plugin id="org.eclipse.emf.ecore.change.source"/>
-<plugin id="org.eclipse.emf.ecore.edit"/>
-<plugin id="org.eclipse.emf.ecore.edit.source"/>
-<plugin id="org.eclipse.emf.ecore.editor"/>
-<plugin id="org.eclipse.emf.ecore.editor.source"/>
-<plugin id="org.eclipse.emf.ecore.source"/>
-<plugin id="org.eclipse.emf.ecore.xmi"/>
-<plugin id="org.eclipse.emf.ecore.xmi.source"/>
-<plugin id="org.eclipse.emf.edit"/>
-<plugin id="org.eclipse.emf.edit.source"/>
-<plugin id="org.eclipse.emf.edit.ui"/>
-<plugin id="org.eclipse.emf.edit.ui.source"/>
-<plugin id="org.eclipse.emf.example.installer"/>
-<plugin id="org.eclipse.emf.exporter"/>
-<plugin id="org.eclipse.emf.exporter.source"/>
-<plugin id="org.eclipse.emf.importer"/>
-<plugin id="org.eclipse.emf.importer.ecore"/>
-<plugin id="org.eclipse.emf.importer.ecore.source"/>
-<plugin id="org.eclipse.emf.importer.java"/>
-<plugin id="org.eclipse.emf.importer.java.source"/>
-<plugin id="org.eclipse.emf.importer.rose"/>
-<plugin id="org.eclipse.emf.importer.rose.source"/>
-<plugin id="org.eclipse.emf.importer.source"/>
-<plugin id="org.eclipse.emf.mapping"/>
-<plugin id="org.eclipse.emf.mapping.ecore"/>
-<plugin id="org.eclipse.emf.mapping.ecore.editor"/>
-<plugin id="org.eclipse.emf.mapping.ecore2ecore"/>
-<plugin id="org.eclipse.emf.mapping.ecore2ecore.editor"/>
-<plugin id="org.eclipse.emf.mapping.ecore2ecore.editor.source"/>
-<plugin id="org.eclipse.emf.mapping.ecore2ecore.source"/>
-<plugin id="org.eclipse.emf.mapping.ecore2xml"/>
-<plugin id="org.eclipse.emf.mapping.ecore2xml.source"/>
-<plugin id="org.eclipse.emf.mapping.ecore2xml.ui"/>
-<plugin id="org.eclipse.emf.mapping.ecore2xml.ui.source"/>
-<plugin id="org.eclipse.emf.mapping.source"/>
-<plugin id="org.eclipse.emf.mapping.ui"/>
-<plugin id="org.eclipse.emf.mapping.ui.source"/>
-<plugin id="org.eclipse.epp.mpc.core"/>
-<plugin id="org.eclipse.epp.mpc.core.source"/>
-<plugin id="org.eclipse.epp.mpc.help.ui"/>
-<plugin id="org.eclipse.epp.mpc.ui"/>
-<plugin id="org.eclipse.epp.mpc.ui.source"/>
-<plugin id="org.eclipse.equinox.app"/>
-<plugin id="org.eclipse.equinox.app.source"/>
-<plugin id="org.eclipse.equinox.bidi"/>
-<plugin id="org.eclipse.equinox.bidi.source"/>
-<plugin id="org.eclipse.equinox.cm"/>
-<plugin id="org.eclipse.equinox.cm.source"/>
-<plugin id="org.eclipse.equinox.common"/>
-<plugin id="org.eclipse.equinox.common.source"/>
-<plugin id="org.eclipse.equinox.concurrent"/>
-<plugin id="org.eclipse.equinox.concurrent.source"/>
-<plugin id="org.eclipse.equinox.console"/>
-<plugin id="org.eclipse.equinox.console.jaas.fragment"/>
-<plugin id="org.eclipse.equinox.console.source"/>
-<plugin id="org.eclipse.equinox.console.ssh"/>
-<plugin id="org.eclipse.equinox.console.ssh.source"/>
-<plugin id="org.eclipse.equinox.coordinator"/>
-<plugin id="org.eclipse.equinox.coordinator.source"/>
-<plugin id="org.eclipse.equinox.device"/>
-<plugin id="org.eclipse.equinox.device.source"/>
-<plugin id="org.eclipse.equinox.ds"/>
-<plugin id="org.eclipse.equinox.ds.source"/>
-<plugin id="org.eclipse.equinox.event"/>
-<plugin id="org.eclipse.equinox.event.source"/>
-<plugin id="org.eclipse.equinox.frameworkadmin"/>
-<plugin id="org.eclipse.equinox.frameworkadmin.equinox"/>
-<plugin id="org.eclipse.equinox.frameworkadmin.equinox.source"/>
-<plugin id="org.eclipse.equinox.frameworkadmin.source"/>
-<plugin id="org.eclipse.equinox.http.jetty"/>
-<plugin id="org.eclipse.equinox.http.jetty.source"/>
-<plugin id="org.eclipse.equinox.http.registry"/>
-<plugin id="org.eclipse.equinox.http.registry.source"/>
-<plugin id="org.eclipse.equinox.http.servlet"/>
-<plugin id="org.eclipse.equinox.http.servlet.source"/>
-<plugin id="org.eclipse.equinox.http.servletbridge"/>
-<plugin id="org.eclipse.equinox.http.servletbridge.source"/>
-<plugin id="org.eclipse.equinox.io"/>
-<plugin id="org.eclipse.equinox.io.source"/>
-<plugin id="org.eclipse.equinox.ip"/>
-<plugin id="org.eclipse.equinox.ip.source"/>
-<plugin id="org.eclipse.equinox.jsp.jasper"/>
-<plugin id="org.eclipse.equinox.jsp.jasper.registry"/>
-<plugin id="org.eclipse.equinox.jsp.jasper.registry.source"/>
-<plugin id="org.eclipse.equinox.jsp.jasper.source"/>
-<plugin id="org.eclipse.equinox.launcher"/>
-<plugin id="org.eclipse.equinox.launcher.cocoa.macosx.x86_64"/>
-<plugin id="org.eclipse.equinox.launcher.gtk.aix.ppc"/>
-<plugin id="org.eclipse.equinox.launcher.gtk.aix.ppc64"/>
-<plugin id="org.eclipse.equinox.launcher.gtk.hpux.ia64"/>
-<plugin id="org.eclipse.equinox.launcher.gtk.linux.ppc"/>
-<plugin id="org.eclipse.equinox.launcher.gtk.linux.ppc64"/>
-<plugin id="org.eclipse.equinox.launcher.gtk.linux.ppc64le"/>
-<plugin id="org.eclipse.equinox.launcher.gtk.linux.s390"/>
-<plugin id="org.eclipse.equinox.launcher.gtk.linux.s390x"/>
-<plugin id="org.eclipse.equinox.launcher.gtk.linux.x86"/>
-<plugin id="org.eclipse.equinox.launcher.gtk.linux.x86_64"/>
-<plugin id="org.eclipse.equinox.launcher.gtk.solaris.sparc"/>
-<plugin id="org.eclipse.equinox.launcher.gtk.solaris.x86"/>
-<plugin id="org.eclipse.equinox.launcher.source"/>
-<plugin id="org.eclipse.equinox.launcher.win32.win32.x86"/>
-<plugin id="org.eclipse.equinox.launcher.win32.win32.x86_64"/>
-<plugin id="org.eclipse.equinox.log"/>
-<plugin id="org.eclipse.equinox.log.source"/>
-<plugin id="org.eclipse.equinox.metatype"/>
-<plugin id="org.eclipse.equinox.metatype.source"/>
-<plugin id="org.eclipse.equinox.p2.artifact.repository"/>
-<plugin id="org.eclipse.equinox.p2.artifact.repository.source"/>
-<plugin id="org.eclipse.equinox.p2.console"/>
-<plugin id="org.eclipse.equinox.p2.console.source"/>
-<plugin id="org.eclipse.equinox.p2.core"/>
-<plugin id="org.eclipse.equinox.p2.core.source"/>
-<plugin id="org.eclipse.equinox.p2.director"/>
-<plugin id="org.eclipse.equinox.p2.director.app"/>
-<plugin id="org.eclipse.equinox.p2.director.app.source"/>
-<plugin id="org.eclipse.equinox.p2.director.source"/>
-<plugin id="org.eclipse.equinox.p2.directorywatcher"/>
-<plugin id="org.eclipse.equinox.p2.directorywatcher.source"/>
-<plugin id="org.eclipse.equinox.p2.discovery"/>
-<plugin id="org.eclipse.equinox.p2.discovery.compatibility"/>
-<plugin id="org.eclipse.equinox.p2.discovery.compatibility.source"/>
-<plugin id="org.eclipse.equinox.p2.discovery.source"/>
-<plugin id="org.eclipse.equinox.p2.engine"/>
-<plugin id="org.eclipse.equinox.p2.engine.source"/>
-<plugin id="org.eclipse.equinox.p2.extensionlocation"/>
-<plugin id="org.eclipse.equinox.p2.extensionlocation.source"/>
-<plugin id="org.eclipse.equinox.p2.garbagecollector"/>
-<plugin id="org.eclipse.equinox.p2.garbagecollector.source"/>
-<plugin id="org.eclipse.equinox.p2.jarprocessor"/>
-<plugin id="org.eclipse.equinox.p2.jarprocessor.source"/>
-<plugin id="org.eclipse.equinox.p2.metadata"/>
-<plugin id="org.eclipse.equinox.p2.metadata.repository"/>
-<plugin id="org.eclipse.equinox.p2.metadata.repository.source"/>
-<plugin id="org.eclipse.equinox.p2.metadata.source"/>
-<plugin id="org.eclipse.equinox.p2.operations"/>
-<plugin id="org.eclipse.equinox.p2.operations.source"/>
-<plugin id="org.eclipse.equinox.p2.publisher"/>
-<plugin id="org.eclipse.equinox.p2.publisher.eclipse"/>
-<plugin id="org.eclipse.equinox.p2.publisher.eclipse.source"/>
-<plugin id="org.eclipse.equinox.p2.publisher.source"/>
-<plugin id="org.eclipse.equinox.p2.reconciler.dropins"/>
-<plugin id="org.eclipse.equinox.p2.reconciler.dropins.source"/>
-<plugin id="org.eclipse.equinox.p2.repository"/>
-<plugin id="org.eclipse.equinox.p2.repository.source"/>
-<plugin id="org.eclipse.equinox.p2.repository.tools"/>
-<plugin id="org.eclipse.equinox.p2.repository.tools.source"/>
-<plugin id="org.eclipse.equinox.p2.touchpoint.eclipse"/>
-<plugin id="org.eclipse.equinox.p2.touchpoint.eclipse.source"/>
-<plugin id="org.eclipse.equinox.p2.touchpoint.natives"/>
-<plugin id="org.eclipse.equinox.p2.touchpoint.natives.source"/>
-<plugin id="org.eclipse.equinox.p2.transport.ecf"/>
-<plugin id="org.eclipse.equinox.p2.transport.ecf.source"/>
-<plugin id="org.eclipse.equinox.p2.ui"/>
-<plugin id="org.eclipse.equinox.p2.ui.discovery"/>
-<plugin id="org.eclipse.equinox.p2.ui.discovery.source"/>
-<plugin id="org.eclipse.equinox.p2.ui.importexport"/>
-<plugin id="org.eclipse.equinox.p2.ui.importexport.source"/>
-<plugin id="org.eclipse.equinox.p2.ui.sdk"/>
-<plugin id="org.eclipse.equinox.p2.ui.sdk.scheduler"/>
-<plugin id="org.eclipse.equinox.p2.ui.sdk.scheduler.source"/>
-<plugin id="org.eclipse.equinox.p2.ui.sdk.source"/>
-<plugin id="org.eclipse.equinox.p2.ui.source"/>
-<plugin id="org.eclipse.equinox.p2.updatechecker"/>
-<plugin id="org.eclipse.equinox.p2.updatechecker.source"/>
-<plugin id="org.eclipse.equinox.p2.updatesite"/>
-<plugin id="org.eclipse.equinox.p2.updatesite.source"/>
-<plugin id="org.eclipse.equinox.preferences"/>
-<plugin id="org.eclipse.equinox.preferences.source"/>
-<plugin id="org.eclipse.equinox.region"/>
-<plugin id="org.eclipse.equinox.region.source"/>
-<plugin id="org.eclipse.equinox.registry"/>
-<plugin id="org.eclipse.equinox.registry.source"/>
-<plugin id="org.eclipse.equinox.security"/>
-<plugin id="org.eclipse.equinox.security.macosx"/>
-<plugin id="org.eclipse.equinox.security.macosx.source"/>
-<plugin id="org.eclipse.equinox.security.source"/>
-<plugin id="org.eclipse.equinox.security.ui"/>
-<plugin id="org.eclipse.equinox.security.ui.source"/>
-<plugin id="org.eclipse.equinox.security.win32.x86"/>
-<plugin id="org.eclipse.equinox.security.win32.x86.source"/>
-<plugin id="org.eclipse.equinox.security.win32.x86_64"/>
-<plugin id="org.eclipse.equinox.security.win32.x86_64.source"/>
-<plugin id="org.eclipse.equinox.servletbridge"/>
-<plugin id="org.eclipse.equinox.servletbridge.source"/>
-<plugin id="org.eclipse.equinox.simpleconfigurator"/>
-<plugin id="org.eclipse.equinox.simpleconfigurator.manipulator"/>
-<plugin id="org.eclipse.equinox.simpleconfigurator.manipulator.source"/>
-<plugin id="org.eclipse.equinox.simpleconfigurator.source"/>
-<plugin id="org.eclipse.equinox.supplement"/>
-<plugin id="org.eclipse.equinox.supplement.source"/>
-<plugin id="org.eclipse.equinox.transforms.hook"/>
-<plugin id="org.eclipse.equinox.transforms.hook.source"/>
-<plugin id="org.eclipse.equinox.transforms.xslt"/>
-<plugin id="org.eclipse.equinox.transforms.xslt.source"/>
-<plugin id="org.eclipse.equinox.useradmin"/>
-<plugin id="org.eclipse.equinox.useradmin.source"/>
-<plugin id="org.eclipse.equinox.util"/>
-<plugin id="org.eclipse.equinox.util.source"/>
-<plugin id="org.eclipse.equinox.weaving.aspectj"/>
-<plugin id="org.eclipse.equinox.weaving.aspectj.source"/>
-<plugin id="org.eclipse.equinox.weaving.caching"/>
-<plugin id="org.eclipse.equinox.weaving.caching.j9"/>
-<plugin id="org.eclipse.equinox.weaving.caching.j9.source"/>
-<plugin id="org.eclipse.equinox.weaving.caching.source"/>
-<plugin id="org.eclipse.equinox.weaving.hook"/>
-<plugin id="org.eclipse.equinox.weaving.hook.source"/>
-<plugin id="org.eclipse.equinox.wireadmin"/>
-<plugin id="org.eclipse.equinox.wireadmin.source"/>
-<plugin id="org.eclipse.help"/>
-<plugin id="org.eclipse.help.base"/>
-<plugin id="org.eclipse.help.base.source"/>
-<plugin id="org.eclipse.help.source"/>
-<plugin id="org.eclipse.help.ui"/>
-<plugin id="org.eclipse.help.ui.source"/>
-<plugin id="org.eclipse.help.webapp"/>
-<plugin id="org.eclipse.help.webapp.source"/>
-<plugin id="org.eclipse.jdt"/>
-<plugin id="org.eclipse.jdt.annotation" version="2.0.100.v20150311-1658"/>
-<plugin id="org.eclipse.jdt.annotation" version="1.1.100.v20140704-0625"/>
-<plugin id="org.eclipse.jdt.annotation.source" version="2.0.100.v20150311-1658"/>
-<plugin id="org.eclipse.jdt.annotation.source" version="1.1.100.v20140704-0625"/>
-<plugin id="org.eclipse.jdt.apt.core"/>
-<plugin id="org.eclipse.jdt.apt.core.source"/>
-<plugin id="org.eclipse.jdt.apt.pluggable.core"/>
-<plugin id="org.eclipse.jdt.apt.pluggable.core.source"/>
-<plugin id="org.eclipse.jdt.apt.ui"/>
-<plugin id="org.eclipse.jdt.apt.ui.source"/>
-<plugin id="org.eclipse.jdt.compiler.apt"/>
-<plugin id="org.eclipse.jdt.compiler.apt.source"/>
-<plugin id="org.eclipse.jdt.compiler.tool"/>
-<plugin id="org.eclipse.jdt.compiler.tool.source"/>
-<plugin id="org.eclipse.jdt.core"/>
-<plugin id="org.eclipse.jdt.core.manipulation"/>
-<plugin id="org.eclipse.jdt.core.manipulation.source"/>
-<plugin id="org.eclipse.jdt.core.source"/>
-<plugin id="org.eclipse.jdt.debug"/>
-<plugin id="org.eclipse.jdt.debug.source"/>
-<plugin id="org.eclipse.jdt.debug.ui"/>
-<plugin id="org.eclipse.jdt.debug.ui.source"/>
-<plugin id="org.eclipse.jdt.doc.isv"/>
-<plugin id="org.eclipse.jdt.doc.user"/>
-<plugin id="org.eclipse.jdt.junit"/>
-<plugin id="org.eclipse.jdt.junit.core"/>
-<plugin id="org.eclipse.jdt.junit.core.source"/>
-<plugin id="org.eclipse.jdt.junit.runtime"/>
-<plugin id="org.eclipse.jdt.junit.runtime.source"/>
-<plugin id="org.eclipse.jdt.junit.source"/>
-<plugin id="org.eclipse.jdt.junit4.runtime"/>
-<plugin id="org.eclipse.jdt.junit4.runtime.source"/>
-<plugin id="org.eclipse.jdt.launching"/>
-<plugin id="org.eclipse.jdt.launching.macosx"/>
-<plugin id="org.eclipse.jdt.launching.macosx.source"/>
-<plugin id="org.eclipse.jdt.launching.source"/>
-<plugin id="org.eclipse.jdt.launching.ui.macosx"/>
-<plugin id="org.eclipse.jdt.launching.ui.macosx.source"/>
-<plugin id="org.eclipse.jdt.ui"/>
-<plugin id="org.eclipse.jdt.ui.source"/>
-<plugin id="org.eclipse.jetty.continuation"/>
-<plugin id="org.eclipse.jetty.continuation.source"/>
-<plugin id="org.eclipse.jetty.http"/>
-<plugin id="org.eclipse.jetty.http.source"/>
-<plugin id="org.eclipse.jetty.io"/>
-<plugin id="org.eclipse.jetty.io.source"/>
-<plugin id="org.eclipse.jetty.security"/>
-<plugin id="org.eclipse.jetty.security.source"/>
-<plugin id="org.eclipse.jetty.server"/>
-<plugin id="org.eclipse.jetty.server.source"/>
-<plugin id="org.eclipse.jetty.servlet"/>
-<plugin id="org.eclipse.jetty.servlet.source"/>
-<plugin id="org.eclipse.jetty.util"/>
-<plugin id="org.eclipse.jetty.util.source"/>
-<plugin id="org.eclipse.jface"/>
-<plugin id="org.eclipse.jface.databinding"/>
-<plugin id="org.eclipse.jface.databinding.source"/>
-<plugin id="org.eclipse.jface.source"/>
-<plugin id="org.eclipse.jface.text"/>
-<plugin id="org.eclipse.jface.text.source"/>
-<plugin id="org.eclipse.jsch.core"/>
-<plugin id="org.eclipse.jsch.core.source"/>
-<plugin id="org.eclipse.jsch.ui"/>
-<plugin id="org.eclipse.jsch.ui.source"/>
-<plugin id="org.eclipse.ltk.core.refactoring"/>
-<plugin id="org.eclipse.ltk.core.refactoring.source"/>
-<plugin id="org.eclipse.ltk.ui.refactoring"/>
-<plugin id="org.eclipse.ltk.ui.refactoring.source"/>
-<plugin id="org.eclipse.mylyn.wikitext.confluence.core"/>
-<plugin id="org.eclipse.mylyn.wikitext.confluence.core.source"/>
-<plugin id="org.eclipse.mylyn.wikitext.confluence.ui"/>
-<plugin id="org.eclipse.mylyn.wikitext.confluence.ui.source"/>
-<plugin id="org.eclipse.mylyn.wikitext.context.ui"/>
-<plugin id="org.eclipse.mylyn.wikitext.context.ui.source"/>
-<plugin id="org.eclipse.mylyn.wikitext.core"/>
-<plugin id="org.eclipse.mylyn.wikitext.core.ant"/>
-<plugin id="org.eclipse.mylyn.wikitext.core.ant.source"/>
-<plugin id="org.eclipse.mylyn.wikitext.core.osgi"/>
-<plugin id="org.eclipse.mylyn.wikitext.core.osgi.source"/>
-<plugin id="org.eclipse.mylyn.wikitext.core.source"/>
-<plugin id="org.eclipse.mylyn.wikitext.help.ui"/>
-<plugin id="org.eclipse.mylyn.wikitext.html.core"/>
-<plugin id="org.eclipse.mylyn.wikitext.html.core.source"/>
-<plugin id="org.eclipse.mylyn.wikitext.markdown.core"/>
-<plugin id="org.eclipse.mylyn.wikitext.markdown.core.source"/>
-<plugin id="org.eclipse.mylyn.wikitext.markdown.ui"/>
-<plugin id="org.eclipse.mylyn.wikitext.markdown.ui.source"/>
-<plugin id="org.eclipse.mylyn.wikitext.mediawiki.core"/>
-<plugin id="org.eclipse.mylyn.wikitext.mediawiki.core.source"/>
-<plugin id="org.eclipse.mylyn.wikitext.mediawiki.ui"/>
-<plugin id="org.eclipse.mylyn.wikitext.mediawiki.ui.source"/>
-<plugin id="org.eclipse.mylyn.wikitext.tasks.ui"/>
-<plugin id="org.eclipse.mylyn.wikitext.tasks.ui.source"/>
-<plugin id="org.eclipse.mylyn.wikitext.textile.core"/>
-<plugin id="org.eclipse.mylyn.wikitext.textile.core.source"/>
-<plugin id="org.eclipse.mylyn.wikitext.textile.ui"/>
-<plugin id="org.eclipse.mylyn.wikitext.textile.ui.source"/>
-<plugin id="org.eclipse.mylyn.wikitext.tracwiki.core"/>
-<plugin id="org.eclipse.mylyn.wikitext.tracwiki.core.source"/>
-<plugin id="org.eclipse.mylyn.wikitext.tracwiki.ui"/>
-<plugin id="org.eclipse.mylyn.wikitext.tracwiki.ui.source"/>
-<plugin id="org.eclipse.mylyn.wikitext.twiki.core"/>
-<plugin id="org.eclipse.mylyn.wikitext.twiki.core.source"/>
-<plugin id="org.eclipse.mylyn.wikitext.twiki.ui"/>
-<plugin id="org.eclipse.mylyn.wikitext.twiki.ui.source"/>
-<plugin id="org.eclipse.mylyn.wikitext.ui"/>
-<plugin id="org.eclipse.mylyn.wikitext.ui.source"/>
-<plugin id="org.eclipse.nebula.cwt"/>
-<plugin id="org.eclipse.nebula.cwt.source"/>
-<plugin id="org.eclipse.nebula.effects.stw"/>
-<plugin id="org.eclipse.nebula.effects.stw.example"/>
-<plugin id="org.eclipse.nebula.effects.stw.example.source"/>
-<plugin id="org.eclipse.nebula.effects.stw.source"/>
-<plugin id="org.eclipse.nebula.jface.cdatetime"/>
-<plugin id="org.eclipse.nebula.jface.cdatetime.source"/>
-<plugin id="org.eclipse.nebula.paperclips.core"/>
-<plugin id="org.eclipse.nebula.paperclips.core.source"/>
-<plugin id="org.eclipse.nebula.paperclips.widgets"/>
-<plugin id="org.eclipse.nebula.paperclips.widgets.source"/>
-<plugin id="org.eclipse.nebula.visualization.widgets"/>
-<plugin id="org.eclipse.nebula.visualization.widgets.source"/>
-<plugin id="org.eclipse.nebula.visualization.xygraph"/>
-<plugin id="org.eclipse.nebula.visualization.xygraph.source"/>
-<plugin id="org.eclipse.nebula.widgets.calendarcombo"/>
-<plugin id="org.eclipse.nebula.widgets.calendarcombo.example"/>
-<plugin id="org.eclipse.nebula.widgets.calendarcombo.example.source"/>
-<plugin id="org.eclipse.nebula.widgets.calendarcombo.source"/>
-<plugin id="org.eclipse.nebula.widgets.cdatetime"/>
-<plugin id="org.eclipse.nebula.widgets.cdatetime.example"/>
-<plugin id="org.eclipse.nebula.widgets.cdatetime.example.source"/>
-<plugin id="org.eclipse.nebula.widgets.cdatetime.source"/>
-<plugin id="org.eclipse.nebula.widgets.collapsiblebuttons"/>
-<plugin id="org.eclipse.nebula.widgets.collapsiblebuttons.source"/>
-<plugin id="org.eclipse.nebula.widgets.compositetable"/>
-<plugin id="org.eclipse.nebula.widgets.compositetable.source"/>
-<plugin id="org.eclipse.nebula.widgets.datechooser"/>
-<plugin id="org.eclipse.nebula.widgets.datechooser.example"/>
-<plugin id="org.eclipse.nebula.widgets.datechooser.example.source"/>
-<plugin id="org.eclipse.nebula.widgets.datechooser.source"/>
-<plugin id="org.eclipse.nebula.widgets.formattedtext"/>
-<plugin id="org.eclipse.nebula.widgets.formattedtext.source"/>
-<plugin id="org.eclipse.nebula.widgets.gallery"/>
-<plugin id="org.eclipse.nebula.widgets.gallery.example"/>
-<plugin id="org.eclipse.nebula.widgets.gallery.example.source"/>
-<plugin id="org.eclipse.nebula.widgets.gallery.source"/>
-<plugin id="org.eclipse.nebula.widgets.ganttchart"/>
-<plugin id="org.eclipse.nebula.widgets.ganttchart.example"/>
-<plugin id="org.eclipse.nebula.widgets.ganttchart.example.source"/>
-<plugin id="org.eclipse.nebula.widgets.ganttchart.source"/>
-<plugin id="org.eclipse.nebula.widgets.geomap"/>
-<plugin id="org.eclipse.nebula.widgets.geomap.example"/>
-<plugin id="org.eclipse.nebula.widgets.geomap.example.source"/>
-<plugin id="org.eclipse.nebula.widgets.geomap.source"/>
-<plugin id="org.eclipse.nebula.widgets.grid"/>
-<plugin id="org.eclipse.nebula.widgets.grid.example"/>
-<plugin id="org.eclipse.nebula.widgets.grid.example.source"/>
-<plugin id="org.eclipse.nebula.widgets.grid.source"/>
-<plugin id="org.eclipse.nebula.widgets.nattable.core"/>
-<plugin id="org.eclipse.nebula.widgets.nattable.core.source"/>
-<plugin id="org.eclipse.nebula.widgets.nattable.extension.e4"/>
-<plugin id="org.eclipse.nebula.widgets.nattable.extension.e4.source"/>
-<plugin id="org.eclipse.nebula.widgets.nattable.extension.glazedlists"/>
-<plugin id="org.eclipse.nebula.widgets.nattable.extension.glazedlists.source"/>
-<plugin id="org.eclipse.nebula.widgets.nattable.extension.nebula"/>
-<plugin id="org.eclipse.nebula.widgets.nattable.extension.nebula.source"/>
-<plugin id="org.eclipse.nebula.widgets.nattable.extension.poi"/>
-<plugin id="org.eclipse.nebula.widgets.nattable.extension.poi.source"/>
-<plugin id="org.eclipse.nebula.widgets.oscilloscope"/>
-<plugin id="org.eclipse.nebula.widgets.oscilloscope.example"/>
-<plugin id="org.eclipse.nebula.widgets.oscilloscope.example.source"/>
-<plugin id="org.eclipse.nebula.widgets.oscilloscope.source"/>
-<plugin id="org.eclipse.nebula.widgets.pagination"/>
-<plugin id="org.eclipse.nebula.widgets.pagination.example"/>
-<plugin id="org.eclipse.nebula.widgets.pagination.example.source"/>
-<plugin id="org.eclipse.nebula.widgets.pagination.source"/>
-<plugin id="org.eclipse.nebula.widgets.paperclips.example"/>
-<plugin id="org.eclipse.nebula.widgets.paperclips.example.source"/>
-<plugin id="org.eclipse.nebula.widgets.pgroup"/>
-<plugin id="org.eclipse.nebula.widgets.pgroup.example"/>
-<plugin id="org.eclipse.nebula.widgets.pgroup.example.source"/>
-<plugin id="org.eclipse.nebula.widgets.pgroup.source"/>
-<plugin id="org.eclipse.nebula.widgets.picture"/>
-<plugin id="org.eclipse.nebula.widgets.picture.example"/>
-<plugin id="org.eclipse.nebula.widgets.picture.example.source"/>
-<plugin id="org.eclipse.nebula.widgets.picture.source"/>
-<plugin id="org.eclipse.nebula.widgets.pshelf"/>
-<plugin id="org.eclipse.nebula.widgets.pshelf.css"/>
-<plugin id="org.eclipse.nebula.widgets.pshelf.css.source"/>
-<plugin id="org.eclipse.nebula.widgets.pshelf.example"/>
-<plugin id="org.eclipse.nebula.widgets.pshelf.example.source"/>
-<plugin id="org.eclipse.nebula.widgets.pshelf.source"/>
-<plugin id="org.eclipse.nebula.widgets.radiogroup"/>
-<plugin id="org.eclipse.nebula.widgets.radiogroup.example"/>
-<plugin id="org.eclipse.nebula.widgets.radiogroup.example.source"/>
-<plugin id="org.eclipse.nebula.widgets.radiogroup.source"/>
-<plugin id="org.eclipse.nebula.widgets.richtext" version="1.0.0.201605312033"/>
-<plugin id="org.eclipse.nebula.widgets.richtext" version="1.0.0.201605182147"/>
-<plugin id="org.eclipse.nebula.widgets.richtext.source" version="1.0.0.201605182147"/>
-<plugin id="org.eclipse.nebula.widgets.richtext.source" version="1.0.0.201605312033"/>
-<plugin id="org.eclipse.nebula.widgets.tablecombo"/>
-<plugin id="org.eclipse.nebula.widgets.tablecombo.example"/>
-<plugin id="org.eclipse.nebula.widgets.tablecombo.example.source"/>
-<plugin id="org.eclipse.nebula.widgets.tablecombo.source"/>
-<plugin id="org.eclipse.nebula.widgets.treemapper"/>
-<plugin id="org.eclipse.nebula.widgets.treemapper.examples"/>
-<plugin id="org.eclipse.nebula.widgets.treemapper.examples.source"/>
-<plugin id="org.eclipse.nebula.widgets.treemapper.source"/>
-<plugin id="org.eclipse.nebula.widgets.xviewer"/>
-<plugin id="org.eclipse.nebula.widgets.xviewer.core"/>
-<plugin id="org.eclipse.nebula.widgets.xviewer.core.source"/>
-<plugin id="org.eclipse.nebula.widgets.xviewer.example"/>
-<plugin id="org.eclipse.nebula.widgets.xviewer.example.source"/>
-<plugin id="org.eclipse.nebula.widgets.xviewer.source"/>
-<plugin id="org.eclipse.osgi"/>
-<plugin id="org.eclipse.osgi.compatibility.state"/>
-<plugin id="org.eclipse.osgi.compatibility.state.source"/>
-<plugin id="org.eclipse.osgi.services"/>
-<plugin id="org.eclipse.osgi.services.source"/>
-<plugin id="org.eclipse.osgi.source"/>
-<plugin id="org.eclipse.osgi.util"/>
-<plugin id="org.eclipse.osgi.util.source"/>
-<plugin id="org.eclipse.pde"/>
-<plugin id="org.eclipse.pde.api.tools"/>
-<plugin id="org.eclipse.pde.api.tools.annotations"/>
-<plugin id="org.eclipse.pde.api.tools.annotations.source"/>
-<plugin id="org.eclipse.pde.api.tools.source"/>
-<plugin id="org.eclipse.pde.api.tools.ui"/>
-<plugin id="org.eclipse.pde.api.tools.ui.source"/>
-<plugin id="org.eclipse.pde.build"/>
-<plugin id="org.eclipse.pde.build.source"/>
-<plugin id="org.eclipse.pde.core"/>
-<plugin id="org.eclipse.pde.core.source"/>
-<plugin id="org.eclipse.pde.doc.user"/>
-<plugin id="org.eclipse.pde.ds.core"/>
-<plugin id="org.eclipse.pde.ds.core.source"/>
-<plugin id="org.eclipse.pde.ds.ui"/>
-<plugin id="org.eclipse.pde.ds.ui.source"/>
-<plugin id="org.eclipse.pde.junit.runtime"/>
-<plugin id="org.eclipse.pde.junit.runtime.source"/>
-<plugin id="org.eclipse.pde.launching"/>
-<plugin id="org.eclipse.pde.launching.source"/>
-<plugin id="org.eclipse.pde.runtime"/>
-<plugin id="org.eclipse.pde.runtime.source"/>
-<plugin id="org.eclipse.pde.ua.core"/>
-<plugin id="org.eclipse.pde.ua.core.source"/>
-<plugin id="org.eclipse.pde.ua.ui"/>
-<plugin id="org.eclipse.pde.ua.ui.source"/>
-<plugin id="org.eclipse.pde.ui"/>
-<plugin id="org.eclipse.pde.ui.source"/>
-<plugin id="org.eclipse.pde.ui.templates"/>
-<plugin id="org.eclipse.pde.ui.templates.source"/>
-<plugin id="org.eclipse.platform"/>
-<plugin id="org.eclipse.platform.doc.isv"/>
-<plugin id="org.eclipse.platform.doc.user"/>
-<plugin id="org.eclipse.platform.source"/>
-<plugin id="org.eclipse.rcp"/>
-<plugin id="org.eclipse.releng.tools"/>
-<plugin id="org.eclipse.sdk"/>
-<plugin id="org.eclipse.search"/>
-<plugin id="org.eclipse.search.source"/>
-<plugin id="org.eclipse.swt"/>
-<plugin id="org.eclipse.swt.cocoa.macosx.x86_64"/>
-<plugin id="org.eclipse.swt.cocoa.macosx.x86_64.source"/>
-<plugin id="org.eclipse.swt.gtk.aix.ppc"/>
-<plugin id="org.eclipse.swt.gtk.aix.ppc.source"/>
-<plugin id="org.eclipse.swt.gtk.aix.ppc64"/>
-<plugin id="org.eclipse.swt.gtk.aix.ppc64.source"/>
-<plugin id="org.eclipse.swt.gtk.hpux.ia64"/>
-<plugin id="org.eclipse.swt.gtk.hpux.ia64.source"/>
-<plugin id="org.eclipse.swt.gtk.linux.ppc"/>
-<plugin id="org.eclipse.swt.gtk.linux.ppc.source"/>
-<plugin id="org.eclipse.swt.gtk.linux.ppc64"/>
-<plugin id="org.eclipse.swt.gtk.linux.ppc64.source"/>
-<plugin id="org.eclipse.swt.gtk.linux.ppc64le"/>
-<plugin id="org.eclipse.swt.gtk.linux.ppc64le.source"/>
-<plugin id="org.eclipse.swt.gtk.linux.s390"/>
-<plugin id="org.eclipse.swt.gtk.linux.s390.source"/>
-<plugin id="org.eclipse.swt.gtk.linux.s390x"/>
-<plugin id="org.eclipse.swt.gtk.linux.s390x.source"/>
-<plugin id="org.eclipse.swt.gtk.linux.x86"/>
-<plugin id="org.eclipse.swt.gtk.linux.x86.source"/>
-<plugin id="org.eclipse.swt.gtk.linux.x86_64"/>
-<plugin id="org.eclipse.swt.gtk.linux.x86_64.source"/>
-<plugin id="org.eclipse.swt.gtk.solaris.sparc"/>
-<plugin id="org.eclipse.swt.gtk.solaris.sparc.source"/>
-<plugin id="org.eclipse.swt.gtk.solaris.x86"/>
-<plugin id="org.eclipse.swt.gtk.solaris.x86.source"/>
-<plugin id="org.eclipse.swt.tools"/>
-<plugin id="org.eclipse.swt.win32.win32.x86"/>
-<plugin id="org.eclipse.swt.win32.win32.x86.source"/>
-<plugin id="org.eclipse.swt.win32.win32.x86_64"/>
-<plugin id="org.eclipse.swt.win32.win32.x86_64.source"/>
-<plugin id="org.eclipse.team.core"/>
-<plugin id="org.eclipse.team.core.source"/>
-<plugin id="org.eclipse.team.cvs.core"/>
-<plugin id="org.eclipse.team.cvs.core.source"/>
-<plugin id="org.eclipse.team.cvs.ssh2"/>
-<plugin id="org.eclipse.team.cvs.ssh2.source"/>
-<plugin id="org.eclipse.team.cvs.ui"/>
-<plugin id="org.eclipse.team.cvs.ui.source"/>
-<plugin id="org.eclipse.team.ui"/>
-<plugin id="org.eclipse.team.ui.source"/>
-<plugin id="org.eclipse.text"/>
-<plugin id="org.eclipse.text.source"/>
-<plugin id="org.eclipse.ui"/>
-<plugin id="org.eclipse.ui.browser"/>
-<plugin id="org.eclipse.ui.browser.source"/>
-<plugin id="org.eclipse.ui.cheatsheets"/>
-<plugin id="org.eclipse.ui.cheatsheets.source"/>
-<plugin id="org.eclipse.ui.cocoa"/>
-<plugin id="org.eclipse.ui.cocoa.source"/>
-<plugin id="org.eclipse.ui.console"/>
-<plugin id="org.eclipse.ui.console.source"/>
-<plugin id="org.eclipse.ui.editors"/>
-<plugin id="org.eclipse.ui.editors.source"/>
-<plugin id="org.eclipse.ui.externaltools"/>
-<plugin id="org.eclipse.ui.externaltools.source"/>
-<plugin id="org.eclipse.ui.forms"/>
-<plugin id="org.eclipse.ui.forms.source"/>
-<plugin id="org.eclipse.ui.ide"/>
-<plugin id="org.eclipse.ui.ide.application"/>
-<plugin id="org.eclipse.ui.ide.application.source"/>
-<plugin id="org.eclipse.ui.ide.source"/>
-<plugin id="org.eclipse.ui.intro"/>
-<plugin id="org.eclipse.ui.intro.source"/>
-<plugin id="org.eclipse.ui.intro.universal"/>
-<plugin id="org.eclipse.ui.intro.universal.source"/>
-<plugin id="org.eclipse.ui.monitoring"/>
-<plugin id="org.eclipse.ui.monitoring.source"/>
-<plugin id="org.eclipse.ui.navigator"/>
-<plugin id="org.eclipse.ui.navigator.resources"/>
-<plugin id="org.eclipse.ui.navigator.resources.source"/>
-<plugin id="org.eclipse.ui.navigator.source"/>
-<plugin id="org.eclipse.ui.net"/>
-<plugin id="org.eclipse.ui.net.source"/>
-<plugin id="org.eclipse.ui.source"/>
-<plugin id="org.eclipse.ui.themes"/>
-<plugin id="org.eclipse.ui.themes.source"/>
-<plugin id="org.eclipse.ui.trace"/>
-<plugin id="org.eclipse.ui.trace.source"/>
-<plugin id="org.eclipse.ui.views"/>
-<plugin id="org.eclipse.ui.views.log"/>
-<plugin id="org.eclipse.ui.views.log.source"/>
-<plugin id="org.eclipse.ui.views.properties.tabbed"/>
-<plugin id="org.eclipse.ui.views.properties.tabbed.source"/>
-<plugin id="org.eclipse.ui.views.source"/>
-<plugin id="org.eclipse.ui.win32"/>
-<plugin id="org.eclipse.ui.win32.source"/>
-<plugin id="org.eclipse.ui.workbench"/>
-<plugin id="org.eclipse.ui.workbench.source"/>
-<plugin id="org.eclipse.ui.workbench.texteditor"/>
-<plugin id="org.eclipse.ui.workbench.texteditor.source"/>
-<plugin id="org.eclipse.update.configurator"/>
-<plugin id="org.eclipse.update.configurator.source"/>
-<plugin id="org.hamcrest.core"/>
-<plugin id="org.hamcrest.core.source"/>
-<plugin id="org.hsqldb.hsqldb"/>
-<plugin id="org.hsqldb.hsqldb.source"/>
-<plugin id="org.ini4j"/>
-<plugin id="org.ini4j.source"/>
-<plugin id="org.jdom2"/>
-<plugin id="org.jdom2.source"/>
-<plugin id="org.jfree.jchart"/>
-<plugin id="org.jfree.jchart.source"/>
-<plugin id="org.jfree.jcommon"/>
-<plugin id="org.jfree.jcommon.source"/>
-<plugin id="org.junit"/>
-<plugin id="org.junit.source"/>
-<plugin id="org.mozilla.rhino"/>
-<plugin id="org.mozilla.rhino.source"/>
-<plugin id="org.objectweb.asm" version="5.0.1.v201404251740"/>
-<plugin id="org.objectweb.asm" version="5.0.1.v201404251740"/>
-<plugin id="org.objectweb.asm.analysis"/>
-<plugin id="org.objectweb.asm.analysis.source"/>
-<plugin id="org.objectweb.asm.commons"/>
-<plugin id="org.objectweb.asm.commons.source"/>
-<plugin id="org.objectweb.asm.source" version="5.0.1.v201404251740"/>
-<plugin id="org.objectweb.asm.source" version="5.0.1.v201404251740"/>
-<plugin id="org.objectweb.asm.tree" version="5.0.1.v201404251740"/>
-<plugin id="org.objectweb.asm.tree" version="5.0.1.v201404251740"/>
-<plugin id="org.objectweb.asm.tree.source" version="5.0.1.v201404251740"/>
-<plugin id="org.objectweb.asm.tree.source" version="5.0.1.v201404251740"/>
-<plugin id="org.objectweb.asm.util"/>
-<plugin id="org.objectweb.asm.util.source"/>
-<plugin id="org.objectweb.asm.xml"/>
-<plugin id="org.objectweb.asm.xml.source"/>
-<plugin id="org.sat4j.core"/>
-<plugin id="org.sat4j.pb"/>
-<plugin id="org.slf4j.api"/>
-<plugin id="org.slf4j.api.source"/>
-<plugin id="org.supercsv"/>
-<plugin id="org.supercsv.source"/>
-<plugin id="org.tukaani.xz"/>
-<plugin id="org.tukaani.xz.source"/>
-<plugin id="org.w3c.css.sac"/>
-<plugin id="org.w3c.css.sac.source"/>
-<plugin id="org.w3c.dom.events"/>
-<plugin id="org.w3c.dom.events.source"/>
-<plugin id="org.w3c.dom.smil"/>
-<plugin id="org.w3c.dom.smil.source"/>
-<plugin id="org.w3c.dom.svg"/>
-<plugin id="org.w3c.dom.svg.source"/>
-<plugin id="stax.api"/>
-</includeBundles>
-</target>

diff --git a/releng/org.simantics.sdk.build.targetdefinition/org.simantics.sdk.build.targetdefinition-semantum.target b/releng/org.simantics.sdk.build.targetdefinition/org.simantics.sdk.build.targetdefinition-semantum.target
new file mode 100644 (file)
index 0000000..5e8b799
--- /dev/null
+++ b/releng/org.simantics.sdk.build.targetdefinition/org.simantics.sdk.build.targetdefinition-semantum.target
@@ -0,0 +1,192 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>\r
+<?pde version="3.8"?><target name="Eclipse Mars.2" sequenceNumber="140">\r
+<locations>\r
+<location includeAllPlatforms="true" includeConfigurePhase="false" includeMode="slicer" includeSource="true" type="InstallableUnit">\r
+<unit id="org.eclipse.mylyn.wikitext_feature.feature.group" version="2.7.0.v20151015-1452"/>\r
+<unit id="org.eclipse.emf.sdk.feature.group" version="2.11.2.v20160208-0841"/>\r
+<unit id="org.eclipse.epp.mpc.feature.group" version="1.4.2.v20160210-2005"/>\r
+<repository location="http://dev.simupedia.com/download/mars"/>\r
+</location>\r
+<location includeAllPlatforms="true" includeConfigurePhase="false" includeMode="slicer" includeSource="true" type="InstallableUnit">\r
+<unit id="org.eclipse.ecf.core.ssl.feature.feature.group" version="1.1.0.v20151130-0157"/>\r
+<unit id="org.eclipse.rcp.source.feature.group" version="4.5.2.v20160212-1500"/>\r
+<unit id="org.eclipse.e4.core.tools.feature.feature.group" version="4.5.1.v20160129-0959"/>\r
+<unit id="org.eclipse.ecf.filetransfer.source.feature.feature.group" version="3.12.0.v20151130-0157"/>\r
+<unit id="org.eclipse.ecf.filetransfer.ssl.feature.feature.group" version="1.1.0.v20151130-0157"/>\r
+<unit id="org.eclipse.help.feature.group" version="2.1.2.v20160212-1500"/>\r
+<unit id="org.eclipse.ecf.filetransfer.httpclient4.source.feature.feature.group" version="3.12.0.v20151130-0157"/>\r
+<unit id="org.eclipse.e4.core.tools.feature.source.feature.group" version="4.5.1.v20160129-0959"/>\r
+<unit id="org.eclipse.swt.tools.feature.feature.group" version="3.104.2.v20160128-0900"/>\r
+<unit id="org.eclipse.ecf.filetransfer.httpclient4.feature.feature.group" version="3.12.0.v20151130-0157"/>\r
+<unit id="org.eclipse.ecf.filetransfer.ssl.source.feature.feature.group" version="1.1.0.v20151130-0157"/>\r
+<unit id="org.eclipse.platform.feature.group" version="4.5.2.v20160212-1500"/>\r
+<unit id="org.eclipse.ecf.core.ssl.source.feature.feature.group" version="1.1.0.v20151130-0157"/>\r
+<unit id="org.eclipse.rcp.feature.group" version="4.5.2.v20160212-1500"/>\r
+<unit id="org.eclipse.equinox.p2.discovery.feature.feature.group" version="1.0.300.v20150430-1836"/>\r
+<unit id="org.eclipse.ecf.core.feature.feature.group" version="1.2.0.v20151130-0157"/>\r
+<unit id="org.eclipse.ecf.core.source.feature.feature.group" version="1.2.0.v20151130-0157"/>\r
+<unit id="org.eclipse.equinox.sdk.feature.group" version="3.11.2.v20160202-2102"/>\r
+<unit id="org.eclipse.platform.source.feature.group" version="4.5.2.v20160212-1500"/>\r
+<unit id="org.eclipse.releng.tools.feature.group" version="3.6.0.v20150527-0145"/>\r
+<unit id="org.eclipse.ecf.filetransfer.feature.feature.group" version="3.12.0.v20151130-0157"/>\r
+<unit id="org.eclipse.sdk.ide" version="4.5.2.M20160212-1500"/>\r
+<unit id="org.eclipse.ecf.filetransfer.httpclient4.ssl.feature.feature.group" version="1.1.0.v20151130-0157"/>\r
+<unit id="org.eclipse.help.source.feature.group" version="2.1.2.v20160212-1500"/>\r
+<unit id="org.eclipse.ecf.filetransfer.httpclient4.ssl.source.feature.feature.group" version="1.1.0.v20151130-0157"/>\r
+<repository location="http://dev.simupedia.com/download/eclipse/updates/4.5"/>\r
+</location>\r
+<location includeAllPlatforms="true" includeConfigurePhase="false" includeMode="slicer" includeSource="true" type="InstallableUnit">\r
+<unit id="org.eclipse.nebula.effects.stw.feature.feature.group" version="1.0.0.201605182147"/>\r
+<unit id="org.eclipse.nebula.visualization.feature.feature.group" version="1.0.0.201605182147"/>\r
+<unit id="org.eclipse.nebula.widgets.calendarcombo.feature.feature.group" version="1.0.0.201605182147"/>\r
+<unit id="org.eclipse.nebula.widgets.gallery.feature.feature.group" version="1.0.0.201605182147"/>\r
+<unit id="org.eclipse.nebula.feature.feature.group" version="1.0.0.201605182147"/>\r
+<unit id="org.eclipse.nebula.cwt.feature.feature.group" version="1.0.0.201605182147"/>\r
+<unit id="org.eclipse.nebula.widgets.oscilloscope.feature.feature.group" version="1.2.0.201605182147"/>\r
+<unit id="org.eclipse.nebula.widgets.pshelf.css.feature.feature.group" version="1.0.0.201605182147"/>\r
+<unit id="org.eclipse.nebula.widgets.ganttchart.feature.feature.group" version="1.0.0.201605182147"/>\r
+<unit id="org.eclipse.nebula.widgets.xviewer.feature.feature.group" version="1.0.0.201605182147"/>\r
+<unit id="org.eclipse.nebula.widgets.compositetable.feature.feature.group" version="1.0.0.201605182147"/>\r
+<unit id="org.eclipse.nebula.widgets.grid.feature.feature.group" version="1.0.0.201605182147"/>\r
+<unit id="org.eclipse.nebula.widgets.cdatetime.feature.feature.group" version="1.0.0.201605182147"/>\r
+<unit id="org.eclipse.nebula.widgets.pshelf.feature.feature.group" version="1.0.0.201605182147"/>\r
+<unit id="org.eclipse.nebula.widgets.richtext.feature.feature.group" version="1.0.0.201605182147"/>\r
+<unit id="org.eclipse.nebula.widgets.tablecombo.feature.feature.group" version="1.0.0.201605182147"/>\r
+<unit id="org.eclipse.nebula.widgets.paperclips.feature.feature.group" version="2.0.0.201605182147"/>\r
+<unit id="org.eclipse.nebula.examples.release.feature.feature.group" version="1.0.4.201605182147"/>\r
+<unit id="org.eclipse.nebula.widgets.pgroup.feature.feature.group" version="1.0.0.201605182147"/>\r
+<repository location="http://dev.simupedia.com/download/nebula/Q22016/release/"/>\r
+</location>\r
+<location includeAllPlatforms="true" includeConfigurePhase="false" includeMode="slicer" includeSource="true" type="InstallableUnit">\r
+<unit id="org.eclipse.e4.tools.spies.feature.feature.group" version="0.17.0.v20160811-1516"/>\r
+<repository location="http://dev.simupedia.com/download/e4/snapshots/org.eclipse.e4.tools/latest/"/>\r
+</location>\r
+<location includeAllPlatforms="true" includeConfigurePhase="false" includeMode="slicer" includeSource="true" type="InstallableUnit">\r
+<unit id="org.eclipse.nebula.incubation.feature.feature.group" version="1.0.0.201605182147"/>\r
+<unit id="org.eclipse.nebula.examples.incubation.feature.feature.group" version="1.0.0.201605182147"/>\r
+<repository location="http://dev.simupedia.com/download/nebula/Q22016/incubation"/>\r
+</location>\r
+<location includeAllPlatforms="true" includeConfigurePhase="false" includeMode="slicer" includeSource="true" type="InstallableUnit">\r
+<unit id="org.eclipse.nebula.widgets.nattable.core.feature.feature.group" version="1.4.0.201606011907"/>\r
+<unit id="org.eclipse.nebula.widgets.nattable.extension.e4.source.feature.feature.group" version="1.0.0.201606011907"/>\r
+<unit id="org.eclipse.nebula.widgets.nattable.extension.poi.feature.feature.group" version="1.4.0.201606011907"/>\r
+<unit id="org.eclipse.nebula.widgets.nattable.extension.glazedlists.feature.feature.group" version="1.4.0.201606011907"/>\r
+<unit id="org.eclipse.nebula.widgets.nattable.core.source.feature.feature.group" version="1.4.0.201606011907"/>\r
+<unit id="org.eclipse.nebula.widgets.nattable.extension.glazedlists.source.feature.feature.group" version="1.4.0.201606011907"/>\r
+<unit id="org.eclipse.nebula.widgets.nattable.extension.nebula.feature.feature.group" version="1.0.0.201606011907"/>\r
+<unit id="org.eclipse.nebula.widgets.nattable.extension.e4.feature.feature.group" version="1.0.0.201606011907"/>\r
+<unit id="org.eclipse.nebula.widgets.nattable.extension.nebula.source.feature.feature.group" version="1.0.0.201606011907"/>\r
+<unit id="org.eclipse.nebula.widgets.nattable.extension.poi.source.feature.feature.group" version="1.4.0.201606011907"/>\r
+<repository location="http://dev.simupedia.com/download/nebula/nattable/releases/1.4.0/repository/"/>\r
+</location>\r
+<location includeAllPlatforms="true" includeConfigurePhase="false" includeMode="slicer" includeSource="true" type="InstallableUnit">\r
+<unit id="org.apache.commons.lang.source" version="2.6.0"/>\r
+<unit id="org.antlr.runtime.source" version="3.5.2"/>\r
+<unit id="org.apache.commons.compress" version="1.12.0"/>\r
+<unit id="org.apache.pdfbox.source" version="2.0.2"/>\r
+<unit id="org.bouncycastle.bcmail-jdk14.source" version="1.38.0"/>\r
+<unit id="org.ini4j" version="0.5.4"/>\r
+<unit id="org.jdom2.source" version="2.0.6"/>\r
+<unit id="org.apache.commons.logging" version="1.2.0"/>\r
+<unit id="org.apache.pdfbox.xmpbox.source" version="2.0.2"/>\r
+<unit id="net.ucanaccess" version="3.0.6"/>\r
+<unit id="gnu.trove2" version="2.1.0"/>\r
+<unit id="net.ucanaccess.source" version="3.0.6"/>\r
+<unit id="org.eclipse.collections.eclipse-collections.source" version="7.1.0"/>\r
+<unit id="freemarker" version="2.3.23.stable"/>\r
+<unit id="com.github.virtuald.curvesapi.source" version="1.3.0"/>\r
+<unit id="org.apache.commons.collections.source" version="3.2.2"/>\r
+<unit id="org.apache.pdfbox.fontbox" version="2.0.2"/>\r
+<unit id="org.apache.commons.compress.source" version="1.12.0"/>\r
+<unit id="org.apache.lucene4.queryparser.source" version="4.9.0.b0003"/>\r
+<unit id="org.mozilla.rhino.source" version="1.7.7.1"/>\r
+<unit id="freemarker.source" version="2.3.23.stable"/>\r
+<unit id="jakarta-regexp" version="1.4.0"/>\r
+<unit id="net.jcip.annotations.source" version="1.0.0"/>\r
+<unit id="org.apache.log4j.source" version="1.2.17"/>\r
+<unit id="org.apache.commons.logging.source" version="1.2.0"/>\r
+<unit id="org.apache.commons.io.source" version="1.4.0"/>\r
+<unit id="com.healthmarketscience.jackcess" version="2.1.3"/>\r
+<unit id="org.bouncycastle.bctsp-jdk14.source" version="1.38.0"/>\r
+<unit id="org.eclipse.collections.eclipse-collections-api" version="7.1.0"/>\r
+<unit id="gnu.trove3.source" version="3.0.3"/>\r
+<unit id="it.unimi.dsi.fastutil.source" version="7.0.12"/>\r
+<unit id="org.hsqldb.hsqldb.source" version="2.3.1"/>\r
+<unit id="org.apache.poi.source" version="3.14.0"/>\r
+<unit id="org.apache.lucene4.sandbox.source" version="4.9.0.b0003"/>\r
+<unit id="org.apache.xmlbeans" version="2.6.0"/>\r
+<unit id="org.supercsv" version="2.4.0"/>\r
+<unit id="org.mozilla.rhino" version="1.7.7.1"/>\r
+<unit id="org.apache.pdfbox.xmpbox" version="2.0.2"/>\r
+<unit id="org.apache.commons.codec" version="1.10.0"/>\r
+<unit id="com.healthmarketscience.jackcess.source" version="2.1.3"/>\r
+<unit id="org.eclipse.collections.eclipse-collections-api.source" version="7.1.0"/>\r
+<unit id="org.bouncycastle.bcprov-jdk14.source" version="1.38.0"/>\r
+<unit id="stax.api" version="1.0.1"/>\r
+<unit id="org.apache.pdfbox.fontbox.source" version="2.0.2"/>\r
+<unit id="it.unimi.dsi.fastutil" version="7.0.12"/>\r
+<unit id="com.lowagie.text.source" version="2.1.7.b1"/>\r
+<unit id="net.jcip.annotations" version="1.0.0"/>\r
+<unit id="org.apache.lucene4.queryparser" version="4.9.0.b0003"/>\r
+<unit id="org.bouncycastle.bctsp-jdk14" version="1.38.0"/>\r
+<unit id="org.jfree.jchart.source" version="1.0.19"/>\r
+<unit id="com.lowagie.text" version="2.1.7.b1"/>\r
+<unit id="org.apache.poi.ooxml-schemas" version="3.14.0"/>\r
+<unit id="org.bouncycastle.bcprov-jdk14" version="1.38.0"/>\r
+<unit id="com.sun.jna" version="4.2.2"/>\r
+<unit id="org.apache.poi" version="3.14.0"/>\r
+<unit id="org.jdom2" version="2.0.6"/>\r
+<unit id="org.apache.commons.lang" version="2.6.0"/>\r
+<unit id="org.jfree.jchart" version="1.0.19"/>\r
+<unit id="org.apache.lucene4.sandbox" version="4.9.0.b0003"/>\r
+<unit id="org.apache.commons.codec.source" version="1.10.0"/>\r
+<unit id="org.supercsv.source" version="2.4.0"/>\r
+<unit id="com.github.virtuald.curvesapi" version="1.3.0"/>\r
+<unit id="org.eclipse.collections.eclipse-collections" version="7.1.0"/>\r
+<unit id="org.apache.log4j" version="1.2.17"/>\r
+<unit id="org.apache.lucene4.queries.source" version="4.9.0.b0003"/>\r
+<unit id="org.apache.lucene4.core.source" version="4.9.0.b0003"/>\r
+<unit id="com.sun.jna.source" version="4.2.2"/>\r
+<unit id="org.apache.poi.ooxml" version="3.14.0"/>\r
+<unit id="com.sun.jna.platform" version="4.2.2"/>\r
+<unit id="org.apache.lucene4.analyzers-common.source" version="4.9.0.b0003"/>\r
+<unit id="org.apache.pdfbox" version="2.0.2"/>\r
+<unit id="org.bouncycastle.bcmail-jdk14" version="1.38.0"/>\r
+<unit id="org.jfree.jcommon" version="1.0.23"/>\r
+<unit id="org.apache.lucene4.analyzers-common" version="4.9.0.b0003"/>\r
+<unit id="org.apache.commons.collections" version="3.2.2"/>\r
+<unit id="org.apache.poi.ooxml.source" version="3.14.0"/>\r
+<unit id="org.apache.lucene4.core" version="4.9.0.b0003"/>\r
+<unit id="gnu.trove2.source" version="2.1.0"/>\r
+<unit id="gnu.trove3" version="3.0.3"/>\r
+<unit id="org.antlr.runtime" version="3.5.2"/>\r
+<unit id="org.jfree.jcommon.source" version="1.0.23"/>\r
+<unit id="org.hsqldb.hsqldb" version="2.3.1"/>\r
+<unit id="org.apache.commons.io" version="1.4.0"/>\r
+<unit id="bouncycastle.bcmail-jdk14" version="138.0.0"/>\r
+<unit id="org.apache.lucene4.queries" version="4.9.0.b0003"/>\r
+<unit id="com.sun.jna.platform.source" version="4.2.2"/>\r
+<unit id="javax.vecmath" version="1.5.2"/>\r
+<unit id="bouncycastle.bcprov-jdk14" version="138.0.0"/>\r
+<unit id="org.ini4j.source" version="0.5.4"/>\r
+<repository location="http://dev.simupedia.com/download/master/external-components"/>\r
+</location>\r
+<location includeAllPlatforms="true" includeConfigurePhase="false" includeMode="slicer" includeSource="true" type="InstallableUnit">\r
+<unit id="org.objectweb.asm.xml.source" version="5.0.1.v201404251740"/>\r
+<unit id="org.objectweb.asm.util.source" version="5.0.1.v201404251740"/>\r
+<unit id="org.objectweb.asm.source" version="5.0.1.v201404251740"/>\r
+<unit id="com.google.guava" version="15.0.0.v201403281430"/>\r
+<unit id="org.objectweb.asm.util" version="5.0.1.v201404251740"/>\r
+<unit id="org.objectweb.asm.xml" version="5.0.1.v201404251740"/>\r
+<unit id="com.google.guava.source" version="15.0.0.v201403281430"/>\r
+<unit id="org.objectweb.asm" version="5.0.1.v201404251740"/>\r
+<unit id="org.objectweb.asm.commons" version="5.0.1.v201404251740"/>\r
+<unit id="org.objectweb.asm.analysis.source" version="5.0.1.v201505121915"/>\r
+<unit id="org.objectweb.asm.commons.source" version="5.0.1.v201404251740"/>\r
+<unit id="org.objectweb.asm.tree.source" version="5.0.1.v201404251740"/>\r
+<unit id="org.objectweb.asm.analysis" version="5.0.1.v201505121915"/>\r
+<unit id="org.objectweb.asm.tree" version="5.0.1.v201404251740"/>\r
+<repository location="http://dev.simupedia.com/download/tools/orbit/downloads/drops/R20160221192158/repository/"/>\r
+</location>\r
+</locations>\r
+</target>\r