From: Hannu Niemistö <hannu.niemisto@semantum.fi>
Date: Mon, 15 Aug 2016 11:19:15 +0000 (+0300)
Subject: Merge remote-tracking branch 'origin/svn'
X-Git-Tag: v1.25.0~180
X-Git-Url: https://gerrit.simantics.org/r/gitweb?p=simantics%2Fplatform.git;a=commitdiff_plain;h=3303fe4a3b363e88662ac75a4f7e873ddb3ab352;hp=9a175feb652b2b7bba7afa540831b9076be3c10e

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 46daf3633..8a9330607 100644
--- 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,\
                examples/,\
                testcases/,\
-               doc-isv/
+               src-isv/
diff --git a/bundles/org.simantics.db.indexing/META-INF/MANIFEST.MF b/bundles/org.simantics.db.indexing/META-INF/MANIFEST.MF
index d74cdea36..f86c1499d 100644
--- 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
 Require-Bundle: org.eclipse.core.runtime,
  org.simantics.db.layer0;bundle-version="0.8.0",
- org.apache.lucene4;bundle-version="4.9.0",
+ org.apache.lucene4.core;bundle-version="4.9.0",
+ org.apache.lucene4.queryparser;bundle-version="4.9.0",
+ org.apache.lucene4.analyzers-common;bundle-version="4.9.0",
  org.simantics.db.services;bundle-version="0.8.0"
 Bundle-RequiredExecutionEnvironment: JavaSE-1.8
 Export-Package: org.simantics.db.indexing
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 54b892070..9b0438042 100644
--- 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;
 
 public final class ProCoreUserAgent implements DatabaseUserAgent {
     private static Shell getShell() {
-        Shell shell = null;
-        Display d = getDisplay();
-        if (d == null)
-            return null;
-        shell = d.getActiveShell();
-        if (null == shell) {
-            Shell[] shells = d.getShells();
-            if (null != shells && shells.length > 0)
-                shell = shells[0];
-        }
-        return shell;
+	Shell shell = null;
+	Display d = getDisplay();
+	if (d == null)
+	    return null;
+	shell = d.getActiveShell();
+	if (null == shell) {
+	    Shell[] shells = d.getShells();
+	    if (null != shells && shells.length > 0)
+		shell = shells[0];
+	}
+	return shell;
     }
     private static Display getDisplay() {
-        Display d = Display.getCurrent();
-        if (d == null)
-            d = Display.getDefault();
-        return d;
+	Display d = Display.getCurrent();
+	if (d == null)
+	    d = Display.getDefault();
+	return d;
     }
-    @Override
-    public boolean handleStart(InternalException exception) {
-        Shell shell = getShell();
-        if (null == shell)
-            return false; // no can do
-        try {
-            return Auxiliary.handleStart(shell, exception);
-        } catch (InternalException e) {
-            return false; // no could do
-        }
-    }
-    
-    @Override
-    public String getId() {
-        return ProCoreDriver.ProCoreDriverName;
-    }
-}
\ No newline at end of file
+        @Override
+	public boolean handleStart(InternalException exception) {
+	    Shell shell = getShell();
+	    if (null == shell)
+		return false; // no can do
+	    try {
+		return Auxiliary.handleStart(shell, exception);
+	    } catch (InternalException e) {
+		return false; // no could do
+	    }
+	}
+
+        @Override
+	public String getId() {
+	    return ProCoreDriver.ProCoreDriverName;
+	}
+}
diff --git a/bundles/org.simantics.document.server/build.properties b/bundles/org.simantics.document.server/build.properties
index 34f26f886..5a15a6576 100644
--- a/bundles/org.simantics.document.server/build.properties
+++ b/bundles/org.simantics.document.server/build.properties
@@ -4,6 +4,6 @@ bin.includes = META-INF/,\
                .,\
                plugin.xml,\
                webdefault.xml,\
-               scl/,\
+               scl/
 src.includes = scl/
 
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 67b11fbaa..995960f94 100644
--- 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.
             */
             if(iStack.size() <= 1)
-                return Token.EOF_TOKEN;
+                return getEOFToken();
             else {                
                 while(iStack.size() > 1) {
                     iStack.removeAt(iStack.size()-1);
@@ -450,4 +450,4 @@ mapAssignment
     : value '=' value
     -> ^(ASSIGNMENT value*) 
     ;
-        
\ No newline at end of file
+        
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 98a10ec97..d75d8cc93 100644
--- 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.
                 */
                 if(iStack.size() <= 1)
-                    return Token.EOF_TOKEN;
+                    return getEOFToken();
                 else {                
                     while(iStack.size() > 1) {
                         iStack.removeAt(iStack.size()-1);
@@ -2471,4 +2471,4 @@ public class GraphLexer extends Lexer {
     }
  
 
-}
\ No newline at end of file
+}
diff --git a/bundles/org.simantics.history/build.properties b/bundles/org.simantics.history/build.properties
index f68e9a0aa..b55c7d489 100644
--- 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,\
                examples/,\
                test/,\
-               doc-isv/
+               src-isv/
diff --git a/bundles/org.simantics.layer0x.ontology/graph.tg b/bundles/org.simantics.layer0x.ontology/graph.tg
index 41c077cc8..6463535e8 100644
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 1b915e3a7..561e41e10 100644
--- 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 507256bd7..0a709036f 100644
--- 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/,\
                .,\
                scl/
-src.includes = scl/,\
-               jdom-2.0.6.jar
+src.includes = scl/
diff --git a/bundles/org.simantics.scl.runtime/build.properties b/bundles/org.simantics.scl.runtime/build.properties
index cbbb8252d..cd7bc4044 100755
--- 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/,\
                .,\
                scl/,\
-               schema/
\ No newline at end of file
+               schema/
diff --git a/bundles/org.simantics.spreadsheet.graph/META-INF/MANIFEST.MF b/bundles/org.simantics.spreadsheet.graph/META-INF/MANIFEST.MF
index 967272c07..a5eef2fb2 100644
--- 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 81aa67eaa..444054c8b 100644
--- 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();
             if (fontColor != null) {
                 
-                byte[] rgb = fontColor.getRgbWithTint();
+                byte[] rgb = fontColor.getRGBWithTint();
                 
                 String ix = fontColor.getARGBHex();
                 RGB.Integer s = hex2Rgb(ix);
diff --git a/bundles/org.simantics.utils.datastructures/build.properties b/bundles/org.simantics.utils.datastructures/build.properties
index b088bf189..12cb67a4b 100644
--- a/bundles/org.simantics.utils.datastructures/build.properties
+++ b/bundles/org.simantics.utils.datastructures/build.properties
@@ -13,3 +13,4 @@ source.. = src/
 output.. = bin/
 bin.includes = META-INF/,\
                .
+
diff --git a/bundles/org.simantics/build.properties b/bundles/org.simantics/build.properties
index b2e37f933..6f20375d6 100644
--- a/bundles/org.simantics/build.properties
+++ b/bundles/org.simantics/build.properties
@@ -2,5 +2,4 @@ source.. = src/
 output.. = bin/
 bin.includes = META-INF/,\
                .,\
-               plugin.xml,\
-               scl/
+               plugin.xml
diff --git a/bundles/pom.xml b/bundles/pom.xml
index aa1e3ebd1..4641096f8 100644
--- a/bundles/pom.xml
+++ b/bundles/pom.xml
@@ -13,6 +13,32 @@
         <version>1.0.0-SNAPSHOT</version>
     </parent>
 
+    <build>
+        <plugins>
+            <plugin>
+                <groupId>org.eclipse.tycho</groupId>
+                <artifactId>tycho-compiler-plugin</artifactId>
+                <version>${tycho.version}</version>
+                <configuration>
+                    <compilerArgument>-err:-forbidden</compilerArgument>
+                </configuration>
+            </plugin>
+            <plugin>
+                <groupId>org.eclipse.tycho</groupId>
+                <artifactId>tycho-source-plugin</artifactId>
+                <version>${tycho.version}</version>
+                <executions>
+                    <execution>
+                        <id>plugin-source</id>
+                        <goals>
+                            <goal>plugin-source</goal>
+                        </goals>
+                    </execution>
+                </executions>
+            </plugin>
+        </plugins>
+    </build>
+
     <modules>
         <module>com.famfamfam.silk</module>
         <module>org.simantics</module>
@@ -174,4 +200,4 @@
         <module>org.simantics.workbench.search</module>
         <module>winterwell.markdown</module>
     </modules>
-</project>
\ No newline at end of file
+</project>
diff --git a/bundles/winterwell.markdown/build.properties b/bundles/winterwell.markdown/build.properties
index ccfe656ed..7c6d81044 100644
--- 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 46281dc83..c4130baed 100644
--- a/features/com.lowagie.text.feature/.gitignore
+++ b/features/com.lowagie.text.feature/.gitignore
@@ -1 +1 @@
-/target/**
+/target/**
diff --git a/features/org.apache.lucene4.feature/.gitignore b/features/org.apache.lucene4.feature/.gitignore
index 46281dc83..c4130baed 100644
--- a/features/org.apache.lucene4.feature/.gitignore
+++ b/features/org.apache.lucene4.feature/.gitignore
@@ -1 +1 @@
-/target/**
+/target/**
diff --git a/features/org.simantics.charts.feature/feature.xml b/features/org.simantics.charts.feature/feature.xml
index 65acfa390..32d412a74 100644
--- a/features/org.simantics.charts.feature/feature.xml
+++ b/features/org.simantics.charts.feature/feature.xml
@@ -17,16 +17,12 @@
       [Enter License Description here.]
    </license>
 
-   <includes
-         id="org.jfree"
-         version="0.0.0"/>
-
    <includes
          id="org.simantics.g2d"
          version="0.0.0"/>
 
    <includes
-         id="org.simantics.event"
+         id="org.simantics.event.feature"
          version="0.0.0"/>
 
    <plugin
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
index 000000000..e5c6f3bbb
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
index 000000000..ffc52a8ba
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 b91d19e0e..ef8dccc63 100644
--- 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
 #     Semantum Oy - update to Eclipse Mars.1 (4.5.1)
 ###############################################################################
-bin.includes=features.xml
+bin.includes=feature.xml
 root.win32.win32.x86=bin/win32/win32/x86
-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
diff --git a/features/org.simantics.event.feature/feature.xml b/features/org.simantics.event.feature/feature.xml
index 5d129d619..54796e239 100644
--- 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"?>
 <feature
-      id="org.simantics.event"
+      id="org.simantics.event.feature"
       label="Event Log Feature"
       version="0.0.1.qualifier"
       provider-name="Semantum Oy">
diff --git a/features/org.simantics.g2d.feature/feature.xml b/features/org.simantics.g2d.feature/feature.xml
index 060e326e0..00eab1cb3 100644
--- a/features/org.simantics.g2d.feature/feature.xml
+++ b/features/org.simantics.g2d.feature/feature.xml
@@ -33,11 +33,7 @@
          version="0.0.0"/>
 
    <includes
-         id="org.jfree"
-         version="0.0.0"/>
-
-   <includes
-         id="org.simantics.views.swt"
+         id="org.simantics.views.swt.feature"
          version="0.0.0"/>
 
    <plugin
@@ -96,13 +92,6 @@
          version="0.0.0"
          unpack="false"/>
 
-   <plugin
-         id="net.sf.cglib"
-         download-size="0"
-         install-size="0"
-         version="0.0.0"
-         unpack="false"/>
-
    <plugin
          id="org.objectweb.asm"
          download-size="0"
diff --git a/features/org.simantics.issues.feature/feature.xml b/features/org.simantics.issues.feature/feature.xml
index 78aa3eed4..fc37ff353 100644
--- 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
  -->
 <feature
-      id="org.simantics.issues"
+      id="org.simantics.issues.feature"
       label="Issue Subsystem"
       version="1.1.0.qualifier"
       provider-name="VTT Technical Research Centre of Finland">
diff --git a/features/org.simantics.issues.ui.feature/feature.xml b/features/org.simantics.issues.ui.feature/feature.xml
index 035aa296c..71b86dfd0 100644
--- 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"?>
 <feature
-      id="org.simantics.issues.ui"
+      id="org.simantics.issues.ui.feature"
       label="Issue UI Feature"
       version="1.1.1.qualifier"
       provider-name="Semantum Oy">
@@ -18,7 +18,7 @@
    </license>
 
    <includes
-         id="org.simantics.issues"
+         id="org.simantics.issues.feature"
          version="0.0.0"/>
 
    <plugin
diff --git a/features/org.simantics.modeling.feature/feature.xml b/features/org.simantics.modeling.feature/feature.xml
index e77581d80..fa10579e3 100644
--- 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.
    </license>
 
-   <includes
-         id="org.jfree"
-         version="0.0.0"/>
-
    <includes
          id="com.lowagie.text"
          version="0.0.0"/>
diff --git a/features/org.simantics.platform.ui.feature/feature.xml b/features/org.simantics.platform.ui.feature/feature.xml
index c3efa01b5..000aad2c7 100644
--- 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"/>
 
    <includes
-         id="org.simantics.utils.ui"
+         id="org.simantics.utils.ui.feature"
          version="0.0.0"/>
 
    <includes
@@ -56,7 +56,7 @@ reusable components implemented on top of the platform.
          version="0.0.0"/>
 
    <includes
-         id="org.simantics.wiki.ui"
+         id="org.simantics.wiki.ui.feature"
          version="0.0.0"/>
 
    <includes
diff --git a/features/org.simantics.sdk.feature/feature.xml b/features/org.simantics.sdk.feature/feature.xml
index 41c08423a..d7e7e3644 100644
--- a/features/org.simantics.sdk.feature/feature.xml
+++ b/features/org.simantics.sdk.feature/feature.xml
@@ -49,7 +49,7 @@
          version="0.0.0"/>
 
    <includes
-         id="org.simantics.utils.ui"
+         id="org.simantics.utils.ui.feature"
          version="0.0.0"/>
 
    <includes
@@ -97,11 +97,19 @@
          version="0.0.0"/>
 
    <includes
-         id="org.simantics.issues"
+         id="org.simantics.issues.feature"
          version="0.0.0"/>
 
    <includes
-         id="org.simantics.issues.ui"
+         id="org.simantics.issues.ui.feature"
+         version="0.0.0"/>
+
+   <includes
+         id="org.simantics.views.swt.client.feature"
+         version="0.0.0"/>
+
+   <includes
+         id="org.simantics.views.swt.feature"
          version="0.0.0"/>
 
    <includes
@@ -113,7 +121,7 @@
          version="0.0.0"/>
 
    <includes
-         id="org.simantics.event"
+         id="org.simantics.event.feature"
          version="0.0.0"/>
 
    <includes
@@ -121,7 +129,7 @@
          version="0.0.0"/>
 
    <includes
-         id="org.simantics.wiki.ui"
+         id="org.simantics.wiki.ui.feature"
          version="0.0.0"/>
 
    <includes
diff --git a/features/org.simantics.spreadsheet.feature/feature.xml b/features/org.simantics.spreadsheet.feature/feature.xml
index 20b434dc5..dd1af0727 100644
--- 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"
          unpack="false"/>
 
+   <plugin
+         id="org.apache.poi.ooxml"
+         download-size="0"
+         install-size="0"
+         version="0.0.0"
+         unpack="false"/>
+
+   <plugin
+         id="org.apache.poi.ooxml-schemas"
+         download-size="0"
+         install-size="0"
+         version="0.0.0"
+         unpack="false"/>
+
 </feature>
diff --git a/features/org.simantics.utils.feature/feature.xml b/features/org.simantics.utils.feature/feature.xml
index 3892f7d08..b81e2e567 100644
--- 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"?>
-<!--
-    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
+<!--
+    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
  -->
 <feature
       id="org.simantics.utils"
@@ -28,10 +28,6 @@
       [Enter License Description here.]
    </license>
 
-   <includes
-         id="org.apache.commons"
-         version="0.0.0"/>
-
    <requires>
       <import plugin="org.eclipse.core.runtime"/>
       <import plugin="org.eclipse.core.resources"/>
@@ -39,28 +35,35 @@
    </requires>
 
    <plugin
-         id="org.simantics.utils"
+         id="org.apache.commons.collections"
          download-size="0"
          install-size="0"
          version="0.0.0"
          unpack="false"/>
 
    <plugin
-         id="org.simantics.utils.datastructures"
+         id="org.apache.commons.io"
          download-size="0"
          install-size="0"
          version="0.0.0"
          unpack="false"/>
 
    <plugin
-         id="org.simantics.utils.thread"
+         id="org.simantics.utils"
          download-size="0"
          install-size="0"
          version="0.0.0"
          unpack="false"/>
 
    <plugin
-         id="xtc.parser.runtime"
+         id="org.simantics.utils.datastructures"
+         download-size="0"
+         install-size="0"
+         version="0.0.0"
+         unpack="false"/>
+
+   <plugin
+         id="org.simantics.utils.thread"
          download-size="0"
          install-size="0"
          version="0.0.0"
diff --git a/features/org.simantics.utils.ui.feature/feature.xml b/features/org.simantics.utils.ui.feature/feature.xml
index e5cc91c1e..6924e60ac 100644
--- 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"?>
 <feature
-      id="org.simantics.utils.ui"
+      id="org.simantics.utils.ui.feature"
       label="UI Utils Feature"
       version="1.25.0.qualifier"
       provider-name="VTT Technical Research Centre of Finland">
diff --git a/features/org.simantics.views.swt.client.feature/feature.xml b/features/org.simantics.views.swt.client.feature/feature.xml
index ae293d674..d8b3cc81f 100644
--- 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"?>
 <feature
-      id="org.simantics.views.swt.client"
+      id="org.simantics.views.swt.client.feature"
       label="SWT views client"
       version="1.0.1.qualifier"
       provider-name="Semantum Oy">
diff --git a/features/org.simantics.views.swt.feature/feature.xml b/features/org.simantics.views.swt.feature/feature.xml
index f94557de7..e80360cf6 100644
--- 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"?>
 <feature
-      id="org.simantics.views.swt"
+      id="org.simantics.views.swt.feature"
       label="SWT views"
       version="1.0.1.qualifier"
       provider-name="Semantum Oy">
@@ -17,12 +17,9 @@
       [Enter License Description here.]
    </license>
 
-   <plugin
-         id="org.simantics.views"
-         download-size="0"
-         install-size="0"
-         version="0.0.0"
-         unpack="false"/>
+   <includes
+         id="org.simantics.views.swt.client.feature"
+         version="0.0.0"/>
 
    <plugin
          id="org.simantics.views.ontology"
@@ -38,11 +35,4 @@
          version="0.0.0"
          unpack="false"/>
 
-   <plugin
-         id="org.simantics.views.swt.client"
-         download-size="0"
-         install-size="0"
-         version="0.0.0"
-         unpack="false"/>
-
 </feature>
diff --git a/features/org.simantics.wiki.ui.feature/feature.xml b/features/org.simantics.wiki.ui.feature/feature.xml
index 8284fb3c0..5569344e7 100644
--- 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"?>
 <feature
-      id="org.simantics.wiki.ui"
+      id="org.simantics.wiki.ui.feature"
       label="Wiki Documentation Feature"
       version="1.25.0.qualifier"
       provider-name="Semantum Oy">
diff --git a/features/pom.xml b/features/pom.xml
index 9a61e3cc0..5ad3c0dfa 100644
--- a/features/pom.xml
+++ b/features/pom.xml
@@ -13,6 +13,87 @@
         <version>1.0.0-SNAPSHOT</version>
     </parent>
 
+    <build>
+      <plugins>
+        <plugin>
+          <groupId>org.eclipse.tycho.extras</groupId>
+          <artifactId>tycho-source-feature-plugin</artifactId>
+          <version>${tycho.extras.version}</version>
+          <executions>
+            <execution>
+              <id>source-feature</id>
+              <phase>package</phase>
+              <goals>
+                <goal>source-feature</goal>
+              </goals>
+              <configuration>
+                <excludes>
+                  <!-- ID of the non-source bundle(s) to exclude from the generated source feature -->
+                  <plugin id="com.famfamfam.silk"/>
+                  <plugin id="javax.vecmath"/>
+                  <plugin id="org.apache.poi.ooxml-schemas"/>
+
+                  <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.linux.x86"/>
+                  <plugin id="org.eclipse.core.filesystem.linux.x86_64"/>
+                  <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.macosx"/>
+                  <plugin id="org.eclipse.core.filesystem.solaris.sparc"/>
+                  <plugin id="org.eclipse.core.filesystem.win32.x86"/>
+                  <plugin id="org.eclipse.core.filesystem.win32.x86_64"/>
+                  <plugin id="org.eclipse.core.net.linux.x86"/>
+                  <plugin id="org.eclipse.core.net.linux.x86_64"/>
+                  <plugin id="org.eclipse.core.net.win32.x86"/>
+                  <plugin id="org.eclipse.core.net.win32.x86_64"/>
+                  <plugin id="org.eclipse.core.resources.win32.x86"/>
+                  <plugin id="org.eclipse.core.resources.win32.x86_64"/>
+                  <plugin id="javax.xml"/>
+                  <plugin id="org.sat4j.core"/>
+                  <plugin id="org.sat4j.pb"/>
+                  <plugin id="org.eclipse.mylyn.wikitext.core"/>
+                  <plugin id="org.eclipse.mylyn.wikitext.core.ant"/>
+                  <plugin id="org.eclipse.mylyn.wikitext.core.osgi"/>
+                  <plugin id="org.eclipse.mylyn.wikitext.mediawiki.core"/>
+                  <plugin id="org.eclipse.mylyn.wikitext.mediawiki.ui"/>
+                  <plugin id="org.eclipse.mylyn.wikitext.ui"/>
+
+                  <feature id="org.eclipse.ecf.core.feature"/>
+                  <feature id="org.eclipse.ecf.core.ssl.feature"/>
+                  <feature id="org.eclipse.ecf.filetransfer.feature"/>
+                  <feature id="org.eclipse.ecf.filetransfer.ssl.feature"/>
+                  <feature id="org.eclipse.ecf.filetransfer.httpclient4.feature"/>
+                  <feature id="org.eclipse.ecf.filetransfer.httpclient4.ssl.feature"/>
+                  <feature id="org.eclipse.emf.common"/>
+                  <feature id="org.eclipse.emf.ecore"/>
+                  <feature id="org.eclipse.epp.mpc"/>
+                  <feature id="org.eclipse.equinox.p2.discovery.feature"/>
+                  <feature id="org.eclipse.equinox.executable"/>
+                </excludes>
+              </configuration>
+            </execution>
+          </executions>
+        </plugin>
+        <plugin>
+          <groupId>org.eclipse.tycho</groupId>
+          <artifactId>tycho-p2-plugin</artifactId>
+          <version>${tycho.version}</version>
+          <executions>
+            <execution>
+              <id>attach-p2-metadata</id>
+              <phase>package</phase>
+              <goals>
+                <goal>p2-metadata</goal>
+              </goals>
+            </execution>
+          </executions>
+        </plugin>
+      </plugins>
+    </build>
+    
     <modules>
         <module>com.lowagie.text.feature</module>
         <module>org.apache.lucene4.feature</module>
@@ -55,4 +136,4 @@
         <module>org.simantics.wiki.ui.feature</module>
         <module>org.simantics.workbench.feature</module>
     </modules>
-</project>
\ No newline at end of file
+</project>
diff --git a/releng/org.simantics.sdk.build.p2.site/pom.xml b/releng/org.simantics.sdk.build.p2.site/pom.xml
index 2890fb24a..69674c0e9 100644
--- 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>
     <artifactId>org.simantics.sdk.build.p2.site</artifactId>
     <packaging>pom</packaging>
-    <version>1.24.0</version>
+    <version>1.25.0</version>
 
     <properties>
         <lucene.version>4.9.0</lucene.version>
@@ -296,4 +296,4 @@
         </pluginRepository>
     </pluginRepositories>
 
-</project>
\ No newline at end of file
+</project>
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 3f8417100..9a85c879f 100644
--- 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"/>
 </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.v20160520-1109"/>
+<unit id="org.eclipse.e4.tools.spies.feature.feature.group" version="0.17.0.v20160811-1516"/>
 <repository location="http://download.eclipse.org/e4/snapshots/org.eclipse.e4.tools/latest/"/>
 </location>
 <location includeAllPlatforms="true" includeConfigurePhase="false" includeMode="slicer" includeSource="true" type="InstallableUnit">
diff --git a/releng/org.simantics.sdk.repository/category.xml b/releng/org.simantics.sdk.repository/category.xml
index 647e31cb5..f97fc7574 100644
--- 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"?>
 <site>
-   <feature url="features/org.simantics.sdk_1.24.0.jar" id="org.simantics.sdk" version="1.24.0">
+   <feature url="features/org.simantics.sdk_1.25.0.jar" id="org.simantics.sdk" version="1.25.0">
       <category name="org.simantics.target"/>
    </feature>
    <category-def name="org.simantics.target" label="Simantics Target">
diff --git a/releng/org.simantics.sdk.repository/pom.xml b/releng/org.simantics.sdk.repository/pom.xml
index c25ad3ee7..5731d5fd6 100644
--- 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">
 	<modelVersion>4.0.0</modelVersion>
 	<artifactId>org.simantics.sdk.repository</artifactId>
-	<version>1.24.0-SNAPSHOT</version>
+	<version>1.25.0-SNAPSHOT</version>
 	<packaging>eclipse-repository</packaging>
 
 	<parent>
@@ -69,4 +69,4 @@
 			</plugins>
 		</pluginManagement>
 	</build>
-</project>
\ No newline at end of file
+</project>
diff --git a/releng/org.simantics.tycho.configuration/pom.xml b/releng/org.simantics.tycho.configuration/pom.xml
index 53b07f5e9..81bfafa92 100644
--- a/releng/org.simantics.tycho.configuration/pom.xml
+++ b/releng/org.simantics.tycho.configuration/pom.xml
@@ -9,6 +9,7 @@
 
 	<properties>
 		<tycho.version>0.25.0</tycho.version>
+		<tycho.extras.version>0.25.0</tycho.extras.version>
 		<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
 		<mars-repo.url>http://download.eclipse.org/releases/mars</mars-repo.url>
 	</properties>
@@ -44,6 +45,7 @@
 						</artifact>
 					</target>
 					<environments>
+<!--
 						<environment>
 							<os>linux</os>
 							<ws>gtk</ws>
@@ -54,6 +56,7 @@
 							<ws>gtk</ws>
 							<arch>x86_64</arch>
 						</environment>
+-->
 						<environment>
 							<os>win32</os>
 							<ws>win32</ws>
@@ -64,14 +67,16 @@
 							<ws>win32</ws>
 							<arch>x86_64</arch>
 						</environment>
+<!--
 						<environment>
 							<os>macosx</os>
 							<ws>cocoa</ws>
 							<arch>x86_64</arch>
 						</environment>
+-->
 					</environments>
 				</configuration>
 			</plugin>
 		</plugins>
 	</build>
-</project>
\ No newline at end of file
+</project>