Merge remote-tracking branch 'origin/svn'

Change-Id: I478743179fe637965255b3ed1d7d03c0fc0c54ab

diff --git a/bundles/org.simantics.databoard/build.properties b/bundles/org.simantics.databoard/build.properties
index 46daf3633da1862c9cf0ed89425a13af1e1d9b8e..8a93306079747dc9bb8573ffa0f45358184c1812 100644 (file)
--- a/bundles/org.simantics.databoard/build.properties
+++ b/bundles/org.simantics.databoard/build.properties
@@ -11,4 +11,4 @@ src.includes = src/org/simantics/databoard/baseUnits.txt,\
                src/org/simantics/databoard/standardTypes.dbt,\\r
                examples/,\\r
                testcases/,\\r
-               doc-isv/\r
+               src-isv/\r

diff --git a/bundles/org.simantics.db.indexing/META-INF/MANIFEST.MF b/bundles/org.simantics.db.indexing/META-INF/MANIFEST.MF
index d74cdea3664d0d48d24f5f739c10d1c00315c80e..f86c1499ddee0458013e7207a7109ca56ae6c86d 100644 (file)
--- a/bundles/org.simantics.db.indexing/META-INF/MANIFEST.MF
+++ b/bundles/org.simantics.db.indexing/META-INF/MANIFEST.MF
@@ -6,7 +6,9 @@ Bundle-Version: 1.1.0.qualifier
 Bundle-Vendor: VTT Technical Research Centre of Finland\r
 Require-Bundle: org.eclipse.core.runtime,\r
  org.simantics.db.layer0;bundle-version="0.8.0",\r
- org.apache.lucene4;bundle-version="4.9.0",\r
+ org.apache.lucene4.core;bundle-version="4.9.0",\r
+ org.apache.lucene4.queryparser;bundle-version="4.9.0",\r
+ org.apache.lucene4.analyzers-common;bundle-version="4.9.0",\r
  org.simantics.db.services;bundle-version="0.8.0"\r
 Bundle-RequiredExecutionEnvironment: JavaSE-1.8\r
 Export-Package: org.simantics.db.indexing\r

diff --git a/bundles/org.simantics.db.procore.ui/src/org/simantics/db/procore/ui/ProCoreUserAgent.java b/bundles/org.simantics.db.procore.ui/src/org/simantics/db/procore/ui/ProCoreUserAgent.java
index 54b892070e70e4e0c28f534fe3ec98e5e13018eb..9b0438042adf439991a5ffb939a2458563cedb12 100644 (file)
--- a/bundles/org.simantics.db.procore.ui/src/org/simantics/db/procore/ui/ProCoreUserAgent.java
+++ b/bundles/org.simantics.db.procore.ui/src/org/simantics/db/procore/ui/ProCoreUserAgent.java
@@ -8,38 +8,38 @@ import org.simantics.db.procore.ProCoreDriver;
 \r
 public final class ProCoreUserAgent implements DatabaseUserAgent {\r
     private static Shell getShell() {\r
-        Shell shell = null;\r
-        Display d = getDisplay();\r
-        if (d == null)\r
-            return null;\r
-        shell = d.getActiveShell();\r
-        if (null == shell) {\r
-            Shell[] shells = d.getShells();\r
-            if (null != shells && shells.length > 0)\r
-                shell = shells[0];\r
-        }\r
-        return shell;\r
+       Shell shell = null;\r
+       Display d = getDisplay();\r
+       if (d == null)\r
+           return null;\r
+       shell = d.getActiveShell();\r
+       if (null == shell) {\r
+           Shell[] shells = d.getShells();\r
+           if (null != shells && shells.length > 0)\r
+               shell = shells[0];\r
+       }\r
+       return shell;\r
     }\r
     private static Display getDisplay() {\r
-        Display d = Display.getCurrent();\r
-        if (d == null)\r
-            d = Display.getDefault();\r
-        return d;\r
+       Display d = Display.getCurrent();\r
+       if (d == null)\r
+           d = Display.getDefault();\r
+       return d;\r
     }\r
-    @Override\r
-    public boolean handleStart(InternalException exception) {\r
-        Shell shell = getShell();\r
-        if (null == shell)\r
-            return false; // no can do\r
-        try {\r
-            return Auxiliary.handleStart(shell, exception);\r
-        } catch (InternalException e) {\r
-            return false; // no could do\r
-        }\r
-    }\r
-    \r
-    @Override\r
-    public String getId() {\r
-        return ProCoreDriver.ProCoreDriverName;\r
-    }\r
-}
\ No newline at end of file
+        @Override\r
+       public boolean handleStart(InternalException exception) {\r
+           Shell shell = getShell();\r
+           if (null == shell)\r
+               return false; // no can do\r
+           try {\r
+               return Auxiliary.handleStart(shell, exception);\r
+           } catch (InternalException e) {\r
+               return false; // no could do\r
+           }\r
+       }\r
+\r
+        @Override\r
+       public String getId() {\r
+           return ProCoreDriver.ProCoreDriverName;\r
+       }\r
+}\r

diff --git a/bundles/org.simantics.document.server/build.properties b/bundles/org.simantics.document.server/build.properties
index 34f26f88677e827fb40b842f67bd47b7e2136e1d..5a15a6576dd2ac865af5604684be3c1320537021 100644 (file)
--- a/bundles/org.simantics.document.server/build.properties
+++ b/bundles/org.simantics.document.server/build.properties
@@ -4,6 +4,6 @@ bin.includes = META-INF/,\
                .,\\r
                plugin.xml,\\r
                webdefault.xml,\\r
-               scl/,\\r
+               scl/\r
 src.includes = scl/\r
 \r

diff --git a/bundles/org.simantics.graph.compiler/src/org/simantics/graph/compiler/internal/parsing/Graph.g b/bundles/org.simantics.graph.compiler/src/org/simantics/graph/compiler/internal/parsing/Graph.g
index 67b11fbaa7a1abc257a4c7117387036f4ae89758..995960f94b5019322e562cf8accc10a68cd229b5 100644 (file)
--- a/bundles/org.simantics.graph.compiler/src/org/simantics/graph/compiler/internal/parsing/Graph.g
+++ b/bundles/org.simantics.graph.compiler/src/org/simantics/graph/compiler/internal/parsing/Graph.g
@@ -85,7 +85,7 @@ public Token nextToken() {
                emit balancing number of DEDENT tokens.\r
             */\r
             if(iStack.size() <= 1)\r
-                return Token.EOF_TOKEN;\r
+                return getEOFToken();\r
             else {                \r
                 while(iStack.size() > 1) {\r
                     iStack.removeAt(iStack.size()-1);\r
@@ -450,4 +450,4 @@ mapAssignment
     : value '=' value\r
     -> ^(ASSIGNMENT value*) \r
     ;\r
-        
\ No newline at end of file
+        \r

diff --git a/bundles/org.simantics.graph.compiler/src/org/simantics/graph/compiler/internal/parsing/GraphLexer.java b/bundles/org.simantics.graph.compiler/src/org/simantics/graph/compiler/internal/parsing/GraphLexer.java
index 98a10ec9769a48ca85a68659ca75acbb247aff50..d75d8cc93f96eb30710baf90a8b0bc1fd258746b 100644 (file)
--- a/bundles/org.simantics.graph.compiler/src/org/simantics/graph/compiler/internal/parsing/GraphLexer.java
+++ b/bundles/org.simantics.graph.compiler/src/org/simantics/graph/compiler/internal/parsing/GraphLexer.java
@@ -108,7 +108,7 @@ public class GraphLexer extends Lexer {
                    emit balancing number of DEDENT tokens.\r
                 */\r
                 if(iStack.size() <= 1)\r
-                    return Token.EOF_TOKEN;\r
+                    return getEOFToken();\r
                 else {                \r
                     while(iStack.size() > 1) {\r
                         iStack.removeAt(iStack.size()-1);\r
@@ -2471,4 +2471,4 @@ public class GraphLexer extends Lexer {
     }\r
  \r
 \r
-}
\ No newline at end of file
+}\r

diff --git a/bundles/org.simantics.history/build.properties b/bundles/org.simantics.history/build.properties
index f68e9a0aa2d037abb977c2aef105b65869f7583d..b55c7d489558ac3fab5c889e0373dc47d5b7ab17 100644 (file)
--- a/bundles/org.simantics.history/build.properties
+++ b/bundles/org.simantics.history/build.properties
@@ -6,4 +6,4 @@ bin.includes = META-INF/,\
 src.includes = history.txt,\\r
                examples/,\\r
                test/,\\r
-               doc-isv/\r
+               src-isv/\r

diff --git a/bundles/org.simantics.layer0x.ontology/graph.tg b/bundles/org.simantics.layer0x.ontology/graph.tg
index 41c077cc8f14509f368f89923855046055c451b0..6463535e85d520ba780ffb50c8a1e9d93f3286f2 100644 (file)
Binary files a/bundles/org.simantics.layer0x.ontology/graph.tg and b/bundles/org.simantics.layer0x.ontology/graph.tg differ

diff --git a/bundles/org.simantics.modeling.ui/META-INF/MANIFEST.MF b/bundles/org.simantics.modeling.ui/META-INF/MANIFEST.MF
index 1b915e3a7a9e0daa82aaad885ec679e9d3aee27e..561e41e10919faa1239e398ebcc98838159a35c8 100644 (file)
--- a/bundles/org.simantics.modeling.ui/META-INF/MANIFEST.MF
+++ b/bundles/org.simantics.modeling.ui/META-INF/MANIFEST.MF
@@ -32,7 +32,7 @@ Require-Bundle: org.simantics.project;bundle-version="1.0.0",
  org.simantics.issues;bundle-version="1.1.0",
  org.simantics.document;bundle-version="1.0.0",
  org.simantics.graph.db;bundle-version="1.1.9",
- org.bouncycastle;bundle-version="1.47.0",
+ org.bouncycastle.bcprov-jdk14;bundle-version="1.38.0",
  org.simantics.image2.ontology;bundle-version="1.1.0",
  org.simantics.scl.compiler;bundle-version="0.4.0",
  org.simantics.scl.compiler.dummy;bundle-version="1.0.0",

diff --git a/bundles/org.simantics.scl.data/build.properties b/bundles/org.simantics.scl.data/build.properties
index 507256bd73a20437bba8bd7d7e0d4c29c61d76fc..0a709036f3937962d4e168c04d9428a072dc8170 100644 (file)
--- a/bundles/org.simantics.scl.data/build.properties
+++ b/bundles/org.simantics.scl.data/build.properties
@@ -3,5 +3,4 @@ output.. = bin/
 bin.includes = META-INF/,\\r
                .,\\r
                scl/\r
-src.includes = scl/,\\r
-               jdom-2.0.6.jar\r
+src.includes = scl/\r

diff --git a/bundles/org.simantics.scl.runtime/build.properties b/bundles/org.simantics.scl.runtime/build.properties
index cbbb8252da9b540f127d71c919d632dd206ff4d7..cd7bc40446f1a1d29395145bcef3bfe25fa61cc2 100755 (executable)
--- a/bundles/org.simantics.scl.runtime/build.properties
+++ b/bundles/org.simantics.scl.runtime/build.properties
@@ -3,4 +3,4 @@ output.. = bin/
 bin.includes = META-INF/,\\r
                .,\\r
                scl/,\\r
-               schema/
\ No newline at end of file
+               schema/\r

diff --git a/bundles/org.simantics.spreadsheet.graph/META-INF/MANIFEST.MF b/bundles/org.simantics.spreadsheet.graph/META-INF/MANIFEST.MF
index 967272c074c03e5dd6f6624d5ed6a3fc60373b2f..a5eef2fb2265eaec3cb1921bface8a1e4a103578 100644 (file)
--- a/bundles/org.simantics.spreadsheet.graph/META-INF/MANIFEST.MF
+++ b/bundles/org.simantics.spreadsheet.graph/META-INF/MANIFEST.MF
@@ -21,7 +21,8 @@ Require-Bundle: org.simantics.layer0.utils,
  org.simantics.datatypes.ontology;bundle-version="1.1.0",
  org.simantics.document.server.io;bundle-version="0.0.1",
  org.simantics.simulator.variable,
- org.apache.poi;bundle-version="3.10.0",
+ org.apache.poi;bundle-version="3.14.0",
+ org.apache.poi.ooxml;bundle-version="3.14.0",
  it.unimi.dsi.fastutil,
  org.simantics.structural.synchronization.client,
  org.simantics.db.indexing,

diff --git a/bundles/org.simantics.spreadsheet.graph/src/org/simantics/spreadsheet/graph/ExcelImport.java b/bundles/org.simantics.spreadsheet.graph/src/org/simantics/spreadsheet/graph/ExcelImport.java
index 81aa67eaae38d20a9b7421d713414a874c416872..444054c8b23e088da2a1840a057aa4e2b29bc118 100644 (file)
--- a/bundles/org.simantics.spreadsheet.graph/src/org/simantics/spreadsheet/graph/ExcelImport.java
+++ b/bundles/org.simantics.spreadsheet.graph/src/org/simantics/spreadsheet/graph/ExcelImport.java
@@ -398,7 +398,7 @@ public class ExcelImport {
             XSSFColor fontColor = xssfFont.getXSSFColor();\r
             if (fontColor != null) {\r
                 \r
-                byte[] rgb = fontColor.getRgbWithTint();\r
+                byte[] rgb = fontColor.getRGBWithTint();\r
                 \r
                 String ix = fontColor.getARGBHex();\r
                 RGB.Integer s = hex2Rgb(ix);\r

diff --git a/bundles/org.simantics.utils.datastructures/build.properties b/bundles/org.simantics.utils.datastructures/build.properties
index b088bf189f5cea2ed5bd984e45bc934ad442ca44..12cb67a4b5e6668a45bbf3c3437398f614478077 100644 (file)
--- a/bundles/org.simantics.utils.datastructures/build.properties
+++ b/bundles/org.simantics.utils.datastructures/build.properties
@@ -13,3 +13,4 @@ source.. = src/
 output.. = bin/\r
 bin.includes = META-INF/,\\r
                .\r
+\r

diff --git a/bundles/org.simantics/build.properties b/bundles/org.simantics/build.properties
index b2e37f933fbaee8f3678fb5e32ee66a2d28e466c..6f20375d6c7d98fbc80bb5da99be9866b1fe2f73 100644 (file)
--- a/bundles/org.simantics/build.properties
+++ b/bundles/org.simantics/build.properties
@@ -2,5 +2,4 @@ source.. = src/
 output.. = bin/\r
 bin.includes = META-INF/,\\r
                .,\\r
-               plugin.xml,\\r
-               scl/\r
+               plugin.xml\r

diff --git a/bundles/pom.xml b/bundles/pom.xml
index aa1e3ebd141d5b39475bf62254ca49847c98027c..4641096f897c74ba92b63b4fac16e5afff9ffd03 100644 (file)
--- a/bundles/pom.xml
+++ b/bundles/pom.xml
@@ -13,6 +13,32 @@
         <version>1.0.0-SNAPSHOT</version>\r
     </parent>\r
 \r
+    <build>\r
+        <plugins>\r
+            <plugin>\r
+                <groupId>org.eclipse.tycho</groupId>\r
+                <artifactId>tycho-compiler-plugin</artifactId>\r
+                <version>${tycho.version}</version>\r
+                <configuration>\r
+                    <compilerArgument>-err:-forbidden</compilerArgument>\r
+                </configuration>\r
+            </plugin>\r
+            <plugin>\r
+                <groupId>org.eclipse.tycho</groupId>\r
+                <artifactId>tycho-source-plugin</artifactId>\r
+                <version>${tycho.version}</version>\r
+                <executions>\r
+                    <execution>\r
+                        <id>plugin-source</id>\r
+                        <goals>\r
+                            <goal>plugin-source</goal>\r
+                        </goals>\r
+                    </execution>\r
+                </executions>\r
+            </plugin>\r
+        </plugins>\r
+    </build>\r
+\r
     <modules>\r
         <module>com.famfamfam.silk</module>\r
         <module>org.simantics</module>\r
@@ -174,4 +200,4 @@
         <module>org.simantics.workbench.search</module>\r
         <module>winterwell.markdown</module>\r
     </modules>\r
-</project>
\ No newline at end of file
+</project>\r

diff --git a/bundles/winterwell.markdown/build.properties b/bundles/winterwell.markdown/build.properties
index ccfe656edf44bb47646ab831b540a2674d3c9bfc..7c6d8104468fa0d6ca61a05912bffee67ef53044 100644 (file)
--- a/bundles/winterwell.markdown/build.properties
+++ b/bundles/winterwell.markdown/build.properties
@@ -5,7 +5,6 @@ bin.includes = META-INF/,\
                .,\
                lib/
 src.includes = src/,\
-               pom.xml,\
                plugin.xml,\
                icons/,\
                lib/,\

diff --git a/features/com.lowagie.text.feature/.gitignore b/features/com.lowagie.text.feature/.gitignore
index 46281dc83d12bb22762d3d5e877aac30c590ae6e..c4130baed5fd59eff0d3ac20d556edc8d70a37d2 100644 (file)
--- a/features/com.lowagie.text.feature/.gitignore
+++ b/features/com.lowagie.text.feature/.gitignore
@@ -1 +1 @@
-/target/**\r
+/target/**

diff --git a/features/org.apache.lucene4.feature/.gitignore b/features/org.apache.lucene4.feature/.gitignore
index 46281dc83d12bb22762d3d5e877aac30c590ae6e..c4130baed5fd59eff0d3ac20d556edc8d70a37d2 100644 (file)
--- a/features/org.apache.lucene4.feature/.gitignore
+++ b/features/org.apache.lucene4.feature/.gitignore
@@ -1 +1 @@
-/target/**\r
+/target/**

diff --git a/features/org.simantics.charts.feature/feature.xml b/features/org.simantics.charts.feature/feature.xml
index 65acfa3903b2059fb9554576fc578421bffa8a98..32d412a74fb649d291c06cf0f5287cb624db1280 100644 (file)
--- a/features/org.simantics.charts.feature/feature.xml
+++ b/features/org.simantics.charts.feature/feature.xml
@@ -17,16 +17,12 @@
       [Enter License Description here.]\r
    </license>\r
 \r
-   <includes\r
-         id="org.jfree"\r
-         version="0.0.0"/>\r
-\r
    <includes\r
          id="org.simantics.g2d"\r
          version="0.0.0"/>\r
 \r
    <includes\r
-         id="org.simantics.event"\r
+         id="org.simantics.event.feature"\r
          version="0.0.0"/>\r
 \r
    <plugin\r

diff --git a/features/org.simantics.eclipsec.launcher.feature/bin/win32/win32/x86/eclipsec.exe b/features/org.simantics.eclipsec.launcher.feature/bin/win32/win32/x86/eclipsec.exe
new file mode 100644 (file)
index 0000000..e5c6f3b
Binary files /dev/null and b/features/org.simantics.eclipsec.launcher.feature/bin/win32/win32/x86/eclipsec.exe differ

diff --git a/features/org.simantics.eclipsec.launcher.feature/bin/win32/win32/x86_64/eclipsec.exe b/features/org.simantics.eclipsec.launcher.feature/bin/win32/win32/x86_64/eclipsec.exe
new file mode 100644 (file)
index 0000000..ffc52a8
Binary files /dev/null and b/features/org.simantics.eclipsec.launcher.feature/bin/win32/win32/x86_64/eclipsec.exe differ

diff --git a/features/org.simantics.eclipsec.launcher.feature/build.properties b/features/org.simantics.eclipsec.launcher.feature/build.properties
index b91d19e0e6f745ab3a8d6a3b24edfb5b97320441..ef8dccc6329e0e470c7905e8f95c16e5cf188e11 100644 (file)
--- a/features/org.simantics.eclipsec.launcher.feature/build.properties
+++ b/features/org.simantics.eclipsec.launcher.feature/build.properties
@@ -10,6 +10,6 @@
 #     VTT Technical Research Centre of Finland - initial API and implementation\r
 #     Semantum Oy - update to Eclipse Mars.1 (4.5.1)\r
 ###############################################################################\r
-bin.includes=features.xml\r
+bin.includes=feature.xml\r
 root.win32.win32.x86=bin/win32/win32/x86\r
-root.win32.win32.x86_64=bin/win32/win32/x86_64
\ No newline at end of file
+root.win32.win32.x86_64=bin/win32/win32/x86_64\r

diff --git a/features/org.simantics.event.feature/feature.xml b/features/org.simantics.event.feature/feature.xml
index 5d129d61925875875f7fdbd8750a6a0dfc22c20e..54796e239f926ab2dbb96b225c3e1842f3a64083 100644 (file)
--- a/features/org.simantics.event.feature/feature.xml
+++ b/features/org.simantics.event.feature/feature.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>\r
 <feature\r
-      id="org.simantics.event"\r
+      id="org.simantics.event.feature"\r
       label="Event Log Feature"\r
       version="0.0.1.qualifier"\r
       provider-name="Semantum Oy">\r

diff --git a/features/org.simantics.g2d.feature/feature.xml b/features/org.simantics.g2d.feature/feature.xml
index 060e326e097b2f46caafed78a6e7634339c0d462..00eab1cb3df85a4b46a0d68ef0f87ea6de63224f 100644 (file)
--- a/features/org.simantics.g2d.feature/feature.xml
+++ b/features/org.simantics.g2d.feature/feature.xml
@@ -33,11 +33,7 @@
          version="0.0.0"/>\r
 \r
    <includes\r
-         id="org.jfree"\r
-         version="0.0.0"/>\r
-\r
-   <includes\r
-         id="org.simantics.views.swt"\r
+         id="org.simantics.views.swt.feature"\r
          version="0.0.0"/>\r
 \r
    <plugin\r
@@ -96,13 +92,6 @@
          version="0.0.0"\r
          unpack="false"/>\r
 \r
-   <plugin\r
-         id="net.sf.cglib"\r
-         download-size="0"\r
-         install-size="0"\r
-         version="0.0.0"\r
-         unpack="false"/>\r
-\r
    <plugin\r
          id="org.objectweb.asm"\r
          download-size="0"\r

diff --git a/features/org.simantics.issues.feature/feature.xml b/features/org.simantics.issues.feature/feature.xml
index 78aa3eed4f5306a5e554ba1175516854387e5f29..fc37ff353ad12076a1630f8e78065a8d441644b0 100644 (file)
--- a/features/org.simantics.issues.feature/feature.xml
+++ b/features/org.simantics.issues.feature/feature.xml
@@ -11,7 +11,7 @@
         VTT Technical Research Centre of Finland - initial API and implementation
  -->\r
 <feature\r
-      id="org.simantics.issues"\r
+      id="org.simantics.issues.feature"\r
       label="Issue Subsystem"\r
       version="1.1.0.qualifier"\r
       provider-name="VTT Technical Research Centre of Finland">\r

diff --git a/features/org.simantics.issues.ui.feature/feature.xml b/features/org.simantics.issues.ui.feature/feature.xml
index 035aa296cc78a0aae720a0080ffd9dc6f5ae8a4b..71b86dfd0f6d8dab17ce351532fffb8aa068865c 100644 (file)
--- a/features/org.simantics.issues.ui.feature/feature.xml
+++ b/features/org.simantics.issues.ui.feature/feature.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>\r
 <feature\r
-      id="org.simantics.issues.ui"\r
+      id="org.simantics.issues.ui.feature"\r
       label="Issue UI Feature"\r
       version="1.1.1.qualifier"\r
       provider-name="Semantum Oy">\r
@@ -18,7 +18,7 @@
    </license>\r
 \r
    <includes\r
-         id="org.simantics.issues"\r
+         id="org.simantics.issues.feature"\r
          version="0.0.0"/>\r
 \r
    <plugin\r

diff --git a/features/org.simantics.modeling.feature/feature.xml b/features/org.simantics.modeling.feature/feature.xml
index e77581d801a439f5a6b979d12b241063c702639e..fa10579e32adfb7f03ef54e241b23db22999b888 100644 (file)
--- a/features/org.simantics.modeling.feature/feature.xml
+++ b/features/org.simantics.modeling.feature/feature.xml
@@ -28,10 +28,6 @@
       Licensed under Eclipse Public License (EPL) 1.0.\r
    </license>\r
 \r
-   <includes\r
-         id="org.jfree"\r
-         version="0.0.0"/>\r
-\r
    <includes\r
          id="com.lowagie.text"\r
          version="0.0.0"/>\r

diff --git a/features/org.simantics.platform.ui.feature/feature.xml b/features/org.simantics.platform.ui.feature/feature.xml
index c3efa01b5827ad8f45913d35bddd747ca5dac4a0..000aad2c7fb878784bcc02da0ac6cd91addb8b37 100644 (file)
--- a/features/org.simantics.platform.ui.feature/feature.xml
+++ b/features/org.simantics.platform.ui.feature/feature.xml
@@ -32,7 +32,7 @@ reusable components implemented on top of the platform.
          version="0.0.0"/>\r
 \r
    <includes\r
-         id="org.simantics.utils.ui"\r
+         id="org.simantics.utils.ui.feature"\r
          version="0.0.0"/>\r
 \r
    <includes\r
@@ -56,7 +56,7 @@ reusable components implemented on top of the platform.
          version="0.0.0"/>\r
 \r
    <includes\r
-         id="org.simantics.wiki.ui"\r
+         id="org.simantics.wiki.ui.feature"\r
          version="0.0.0"/>\r
 \r
    <includes\r

diff --git a/features/org.simantics.sdk.feature/feature.xml b/features/org.simantics.sdk.feature/feature.xml
index 41c08423a25f697be346a3d5d50a45837dc27211..d7e7e3644cf336c3373536ba1108a73b2c927ab3 100644 (file)
--- a/features/org.simantics.sdk.feature/feature.xml
+++ b/features/org.simantics.sdk.feature/feature.xml
@@ -49,7 +49,7 @@
          version="0.0.0"/>\r
 \r
    <includes\r
-         id="org.simantics.utils.ui"\r
+         id="org.simantics.utils.ui.feature"\r
          version="0.0.0"/>\r
 \r
    <includes\r
@@ -97,11 +97,19 @@
          version="0.0.0"/>\r
 \r
    <includes\r
-         id="org.simantics.issues"\r
+         id="org.simantics.issues.feature"\r
          version="0.0.0"/>\r
 \r
    <includes\r
-         id="org.simantics.issues.ui"\r
+         id="org.simantics.issues.ui.feature"\r
+         version="0.0.0"/>\r
+\r
+   <includes\r
+         id="org.simantics.views.swt.client.feature"\r
+         version="0.0.0"/>\r
+
+   <includes\r
+         id="org.simantics.views.swt.feature"\r
          version="0.0.0"/>\r
 \r
    <includes\r
@@ -113,7 +121,7 @@
          version="0.0.0"/>\r
 \r
    <includes\r
-         id="org.simantics.event"\r
+         id="org.simantics.event.feature"\r
          version="0.0.0"/>\r
 \r
    <includes\r
@@ -121,7 +129,7 @@
          version="0.0.0"/>\r
 \r
    <includes\r
-         id="org.simantics.wiki.ui"\r
+         id="org.simantics.wiki.ui.feature"\r
          version="0.0.0"/>\r
 \r
    <includes\r

diff --git a/features/org.simantics.spreadsheet.feature/feature.xml b/features/org.simantics.spreadsheet.feature/feature.xml
index 20b434dc5ed85c6653d2dbad0e1cb23dd56bf33b..dd1af072701285d81d48650d84e172bb800ee373 100644 (file)
--- a/features/org.simantics.spreadsheet.feature/feature.xml
+++ b/features/org.simantics.spreadsheet.feature/feature.xml
@@ -121,4 +121,18 @@ This Agreement is governed by the laws of the State of New York and the intellec
          version="0.0.0"\r
          unpack="false"/>\r
 \r
+   <plugin\r
+         id="org.apache.poi.ooxml"\r
+         download-size="0"\r
+         install-size="0"\r
+         version="0.0.0"\r
+         unpack="false"/>\r
+\r
+   <plugin\r
+         id="org.apache.poi.ooxml-schemas"\r
+         download-size="0"\r
+         install-size="0"\r
+         version="0.0.0"\r
+         unpack="false"/>\r
+\r
 </feature>\r

diff --git a/features/org.simantics.utils.feature/feature.xml b/features/org.simantics.utils.feature/feature.xml
index 3892f7d0865aeac36e372f7cbd783d4af8a46aca..b81e2e567e8fd6337f569dc28878becdae467388 100644 (file)
--- a/features/org.simantics.utils.feature/feature.xml
+++ b/features/org.simantics.utils.feature/feature.xml
@@ -1,14 +1,14 @@
 <?xml version="1.0" encoding="UTF-8"?>\r
-<!--
-    Copyright (c) 2007, 2010 Association for Decentralized Information Management
-    in Industry THTH ry.
-    All rights reserved. This program and the accompanying materials
-    are made available under the terms of the Eclipse Public License v1.0
-    which accompanies this distribution, and is available at
-    http://www.eclipse.org/legal/epl-v10.html
-   
-    Contributors:
-        VTT Technical Research Centre of Finland - initial API and implementation
+<!--\r
+    Copyright (c) 2007, 2010 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
+        VTT Technical Research Centre of Finland - initial API and implementation\r
  -->\r
 <feature\r
       id="org.simantics.utils"\r
@@ -28,10 +28,6 @@
       [Enter License Description here.]\r
    </license>\r
 \r
-   <includes\r
-         id="org.apache.commons"\r
-         version="0.0.0"/>\r
-\r
    <requires>\r
       <import plugin="org.eclipse.core.runtime"/>\r
       <import plugin="org.eclipse.core.resources"/>\r
@@ -39,28 +35,35 @@
    </requires>\r
 \r
    <plugin\r
-         id="org.simantics.utils"\r
+         id="org.apache.commons.collections"\r
          download-size="0"\r
          install-size="0"\r
          version="0.0.0"\r
          unpack="false"/>\r
 \r
    <plugin\r
-         id="org.simantics.utils.datastructures"\r
+         id="org.apache.commons.io"\r
          download-size="0"\r
          install-size="0"\r
          version="0.0.0"\r
          unpack="false"/>\r
 \r
    <plugin\r
-         id="org.simantics.utils.thread"\r
+         id="org.simantics.utils"\r
          download-size="0"\r
          install-size="0"\r
          version="0.0.0"\r
          unpack="false"/>\r
 \r
    <plugin\r
-         id="xtc.parser.runtime"\r
+         id="org.simantics.utils.datastructures"\r
+         download-size="0"\r
+         install-size="0"\r
+         version="0.0.0"\r
+         unpack="false"/>\r
+\r
+   <plugin\r
+         id="org.simantics.utils.thread"\r
          download-size="0"\r
          install-size="0"\r
          version="0.0.0"\r

diff --git a/features/org.simantics.utils.ui.feature/feature.xml b/features/org.simantics.utils.ui.feature/feature.xml
index e5cc91c1ea8df99726e171252d931dbb51b75b9f..6924e60acaa672050fa2ac1b029200b448579671 100644 (file)
--- a/features/org.simantics.utils.ui.feature/feature.xml
+++ b/features/org.simantics.utils.ui.feature/feature.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>\r
 <feature\r
-      id="org.simantics.utils.ui"\r
+      id="org.simantics.utils.ui.feature"\r
       label="UI Utils Feature"\r
       version="1.25.0.qualifier"\r
       provider-name="VTT Technical Research Centre of Finland">\r

diff --git a/features/org.simantics.views.swt.client.feature/feature.xml b/features/org.simantics.views.swt.client.feature/feature.xml
index ae293d67491c2ad6e8924682c448d94dff8fddb0..d8b3cc81f27c88dddb71da2c5d407ae34509221b 100644 (file)
--- a/features/org.simantics.views.swt.client.feature/feature.xml
+++ b/features/org.simantics.views.swt.client.feature/feature.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>\r
 <feature\r
-      id="org.simantics.views.swt.client"\r
+      id="org.simantics.views.swt.client.feature"\r
       label="SWT views client"\r
       version="1.0.1.qualifier"\r
       provider-name="Semantum Oy">\r

diff --git a/features/org.simantics.views.swt.feature/feature.xml b/features/org.simantics.views.swt.feature/feature.xml
index f94557de7183356f2a04380945f159ab921e84dd..e80360cf625ae6c3846b110a09e4fabe92f32976 100644 (file)
--- a/features/org.simantics.views.swt.feature/feature.xml
+++ b/features/org.simantics.views.swt.feature/feature.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>\r
 <feature\r
-      id="org.simantics.views.swt"\r
+      id="org.simantics.views.swt.feature"\r
       label="SWT views"\r
       version="1.0.1.qualifier"\r
       provider-name="Semantum Oy">\r
@@ -17,12 +17,9 @@
       [Enter License Description here.]\r
    </license>\r
 \r
-   <plugin\r
-         id="org.simantics.views"\r
-         download-size="0"\r
-         install-size="0"\r
-         version="0.0.0"\r
-         unpack="false"/>\r
+   <includes\r
+         id="org.simantics.views.swt.client.feature"\r
+         version="0.0.0"/>\r
 \r
    <plugin\r
          id="org.simantics.views.ontology"\r
@@ -38,11 +35,4 @@
          version="0.0.0"\r
          unpack="false"/>\r
 \r
-   <plugin\r
-         id="org.simantics.views.swt.client"\r
-         download-size="0"\r
-         install-size="0"\r
-         version="0.0.0"\r
-         unpack="false"/>\r
-\r
 </feature>\r

diff --git a/features/org.simantics.wiki.ui.feature/feature.xml b/features/org.simantics.wiki.ui.feature/feature.xml
index 8284fb3c0d7bbb62504577228952f662780c1c48..5569344e7ce964d83a336ed13a3cc10fbfdd9a3d 100644 (file)
--- a/features/org.simantics.wiki.ui.feature/feature.xml
+++ b/features/org.simantics.wiki.ui.feature/feature.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>\r
 <feature\r
-      id="org.simantics.wiki.ui"\r
+      id="org.simantics.wiki.ui.feature"\r
       label="Wiki Documentation Feature"\r
       version="1.25.0.qualifier"\r
       provider-name="Semantum Oy">\r

diff --git a/features/pom.xml b/features/pom.xml
index 9a61e3cc056ed3188f20d65d87f5751c1e8f96fc..5ad3c0dfa6f1ac5f4263cc97e4026bbf4bc8dfb9 100644 (file)
--- a/features/pom.xml
+++ b/features/pom.xml
@@ -13,6 +13,87 @@
         <version>1.0.0-SNAPSHOT</version>\r
     </parent>\r
 \r
+    <build>\r
+      <plugins>\r
+        <plugin>\r
+          <groupId>org.eclipse.tycho.extras</groupId>\r
+          <artifactId>tycho-source-feature-plugin</artifactId>\r
+          <version>${tycho.extras.version}</version>\r
+          <executions>\r
+            <execution>\r
+              <id>source-feature</id>\r
+              <phase>package</phase>\r
+              <goals>\r
+                <goal>source-feature</goal>\r
+              </goals>\r
+              <configuration>\r
+                <excludes>\r
+                  <!-- ID of the non-source bundle(s) to exclude from the generated source feature -->\r
+                  <plugin id="com.famfamfam.silk"/>\r
+                  <plugin id="javax.vecmath"/>\r
+                  <plugin id="org.apache.poi.ooxml-schemas"/>\r
+\r
+                  <plugin id="org.eclipse.core.filesystem.aix.ppc"/>\r
+                  <plugin id="org.eclipse.core.filesystem.aix.ppc64"/>\r
+                  <plugin id="org.eclipse.core.filesystem.hpux.ia64"/>\r
+                  <plugin id="org.eclipse.core.filesystem.linux.x86"/>\r
+                  <plugin id="org.eclipse.core.filesystem.linux.x86_64"/>\r
+                  <plugin id="org.eclipse.core.filesystem.linux.ppc"/>\r
+                  <plugin id="org.eclipse.core.filesystem.linux.ppc64"/>\r
+                  <plugin id="org.eclipse.core.filesystem.linux.ppc64le"/>\r
+                  <plugin id="org.eclipse.core.filesystem.macosx"/>\r
+                  <plugin id="org.eclipse.core.filesystem.solaris.sparc"/>\r
+                  <plugin id="org.eclipse.core.filesystem.win32.x86"/>\r
+                  <plugin id="org.eclipse.core.filesystem.win32.x86_64"/>\r
+                  <plugin id="org.eclipse.core.net.linux.x86"/>\r
+                  <plugin id="org.eclipse.core.net.linux.x86_64"/>\r
+                  <plugin id="org.eclipse.core.net.win32.x86"/>\r
+                  <plugin id="org.eclipse.core.net.win32.x86_64"/>\r
+                  <plugin id="org.eclipse.core.resources.win32.x86"/>\r
+                  <plugin id="org.eclipse.core.resources.win32.x86_64"/>\r
+                  <plugin id="javax.xml"/>\r
+                  <plugin id="org.sat4j.core"/>\r
+                  <plugin id="org.sat4j.pb"/>\r
+                  <plugin id="org.eclipse.mylyn.wikitext.core"/>\r
+                  <plugin id="org.eclipse.mylyn.wikitext.core.ant"/>\r
+                  <plugin id="org.eclipse.mylyn.wikitext.core.osgi"/>\r
+                  <plugin id="org.eclipse.mylyn.wikitext.mediawiki.core"/>\r
+                  <plugin id="org.eclipse.mylyn.wikitext.mediawiki.ui"/>\r
+                  <plugin id="org.eclipse.mylyn.wikitext.ui"/>\r
+\r
+                  <feature id="org.eclipse.ecf.core.feature"/>\r
+                  <feature id="org.eclipse.ecf.core.ssl.feature"/>\r
+                  <feature id="org.eclipse.ecf.filetransfer.feature"/>\r
+                  <feature id="org.eclipse.ecf.filetransfer.ssl.feature"/>\r
+                  <feature id="org.eclipse.ecf.filetransfer.httpclient4.feature"/>\r
+                  <feature id="org.eclipse.ecf.filetransfer.httpclient4.ssl.feature"/>\r
+                  <feature id="org.eclipse.emf.common"/>\r
+                  <feature id="org.eclipse.emf.ecore"/>\r
+                  <feature id="org.eclipse.epp.mpc"/>\r
+                  <feature id="org.eclipse.equinox.p2.discovery.feature"/>\r
+                  <feature id="org.eclipse.equinox.executable"/>\r
+                </excludes>\r
+              </configuration>\r
+            </execution>\r
+          </executions>\r
+        </plugin>\r
+        <plugin>\r
+          <groupId>org.eclipse.tycho</groupId>\r
+          <artifactId>tycho-p2-plugin</artifactId>\r
+          <version>${tycho.version}</version>\r
+          <executions>\r
+            <execution>\r
+              <id>attach-p2-metadata</id>\r
+              <phase>package</phase>\r
+              <goals>\r
+                <goal>p2-metadata</goal>\r
+              </goals>\r
+            </execution>\r
+          </executions>\r
+        </plugin>\r
+      </plugins>\r
+    </build>\r
+    \r
     <modules>\r
         <module>com.lowagie.text.feature</module>\r
         <module>org.apache.lucene4.feature</module>\r
@@ -55,4 +136,4 @@
         <module>org.simantics.wiki.ui.feature</module>\r
         <module>org.simantics.workbench.feature</module>\r
     </modules>\r
-</project>
\ No newline at end of file
+</project>\r

diff --git a/releng/org.simantics.sdk.build.p2.site/pom.xml b/releng/org.simantics.sdk.build.p2.site/pom.xml
index 2890fb24ab9287ed8a7cae3e8c270b813de0e94f..69674c0e94e2ede780b0243e17f5dfb18e9ce121 100644 (file)
--- a/releng/org.simantics.sdk.build.p2.site/pom.xml
+++ b/releng/org.simantics.sdk.build.p2.site/pom.xml
@@ -6,7 +6,7 @@
     <groupId>org.simantics</groupId>\r
     <artifactId>org.simantics.sdk.build.p2.site</artifactId>\r
     <packaging>pom</packaging>\r
-    <version>1.24.0</version>\r
+    <version>1.25.0</version>\r
 \r
     <properties>\r
         <lucene.version>4.9.0</lucene.version>\r
@@ -296,4 +296,4 @@
         </pluginRepository>\r
     </pluginRepositories>\r
 \r
-</project>
\ No newline at end of file
+</project>\r

diff --git a/releng/org.simantics.sdk.build.targetdefinition/org.simantics.sdk.build.targetdefinition.target b/releng/org.simantics.sdk.build.targetdefinition/org.simantics.sdk.build.targetdefinition.target
index 3f8417100daf19a4b0250c0230a9e568391a9a0b..9a85c879fabd1d1a0c8a8f8cc1525b02dc4d5650 100644 (file)
--- a/releng/org.simantics.sdk.build.targetdefinition/org.simantics.sdk.build.targetdefinition.target
+++ b/releng/org.simantics.sdk.build.targetdefinition/org.simantics.sdk.build.targetdefinition.target
@@ -161,7 +161,7 @@
 <repository location="http://www.simantics.org/update/external-components/master"/>\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.v20160520-1109"/>\r
+<unit id="org.eclipse.e4.tools.spies.feature.feature.group" version="0.17.0.v20160811-1516"/>\r
 <repository location="http://download.eclipse.org/e4/snapshots/org.eclipse.e4.tools/latest/"/>\r
 </location>\r
 <location includeAllPlatforms="true" includeConfigurePhase="false" includeMode="slicer" includeSource="true" type="InstallableUnit">\r

diff --git a/releng/org.simantics.sdk.repository/category.xml b/releng/org.simantics.sdk.repository/category.xml
index 647e31cb5865d9192f64a78f82e66683954467c8..f97fc75744c111369b30c66e56b15480f8637a5c 100644 (file)
--- a/releng/org.simantics.sdk.repository/category.xml
+++ b/releng/org.simantics.sdk.repository/category.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>\r
 <site>\r
-   <feature url="features/org.simantics.sdk_1.24.0.jar" id="org.simantics.sdk" version="1.24.0">\r
+   <feature url="features/org.simantics.sdk_1.25.0.jar" id="org.simantics.sdk" version="1.25.0">\r
       <category name="org.simantics.target"/>\r
    </feature>\r
    <category-def name="org.simantics.target" label="Simantics Target">\r

diff --git a/releng/org.simantics.sdk.repository/pom.xml b/releng/org.simantics.sdk.repository/pom.xml
index c25ad3ee7649da860e902bd318637dfef19767ab..5731d5fd6f3f183a6c4e1f2d8d0cb535b4d1629c 100644 (file)
--- a/releng/org.simantics.sdk.repository/pom.xml
+++ b/releng/org.simantics.sdk.repository/pom.xml
@@ -2,7 +2,7 @@
        xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">\r
        <modelVersion>4.0.0</modelVersion>\r
        <artifactId>org.simantics.sdk.repository</artifactId>\r
-       <version>1.24.0-SNAPSHOT</version>\r
+       <version>1.25.0-SNAPSHOT</version>\r
        <packaging>eclipse-repository</packaging>\r
 \r
        <parent>\r
@@ -69,4 +69,4 @@
                        </plugins>\r
                </pluginManagement>\r
        </build>\r
-</project>
\ No newline at end of file
+</project>\r

diff --git a/releng/org.simantics.tycho.configuration/pom.xml b/releng/org.simantics.tycho.configuration/pom.xml
index 53b07f5e9fe325d7c1dbd2c7a2e1851a1fade2d4..81bfafa92f0f5fb1aa94929aebfaeddfbd217b3f 100644 (file)
--- a/releng/org.simantics.tycho.configuration/pom.xml
+++ b/releng/org.simantics.tycho.configuration/pom.xml
@@ -9,6 +9,7 @@
 \r
        <properties>\r
                <tycho.version>0.25.0</tycho.version>\r
+               <tycho.extras.version>0.25.0</tycho.extras.version>\r
                <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>\r
                <mars-repo.url>http://download.eclipse.org/releases/mars</mars-repo.url>\r
        </properties>\r
@@ -44,6 +45,7 @@
                                                </artifact>\r
                                        </target>\r
                                        <environments>\r
+<!--\r
                                                <environment>\r
                                                        <os>linux</os>\r
                                                        <ws>gtk</ws>\r
@@ -54,6 +56,7 @@
                                                        <ws>gtk</ws>\r
                                                        <arch>x86_64</arch>\r
                                                </environment>\r
+-->\r
                                                <environment>\r
                                                        <os>win32</os>\r
                                                        <ws>win32</ws>\r
@@ -64,14 +67,16 @@
                                                        <ws>win32</ws>\r
                                                        <arch>x86_64</arch>\r
                                                </environment>\r
+<!--\r
                                                <environment>\r
                                                        <os>macosx</os>\r
                                                        <ws>cocoa</ws>\r
                                                        <arch>x86_64</arch>\r
                                                </environment>\r
+-->\r
                                        </environments>\r
                                </configuration>\r
                        </plugin>\r
                </plugins>\r
        </build>\r
-</project>
\ No newline at end of file
+</project>\r