Lots of small fixes for the Simantics SDK build

* org.apache.batik/1.8.0 is taken from external-components/manual now.
  Removed it from this repository.
* org.simantics.sdk now includes plenty of previously missing plug-ins
and features: org.simantics.help.*,
org.simantics.spreadsheet.fileimport, org.apache.pdfbox*,
org.simantics.tests.modelled*, org.simantics.diagram.svg,
org.simantics.browsing.ui.nattable*
* many build.properties fixes, e.g. removal of non-existent files and
addition of missing binary/source artifacts
* added new feature org.simantics.help.addons to bundle together all the
recently added org.simantics.help.* plug-ins for modelled help page
construction in the Simantics Desktop workbench.
* added new feature org.simantics.browsing.ui.nattable.feature to gather
together org.simantics.browsing.ui.nattable and its external component
dependencies (nattable.core, fastutil)
refs #6621

Change-Id: I203c1fac381325d59925e19e26ee338db7ff9852

diff --git a/bundles/org.apache.batik/.classpath b/bundles/org.apache.batik/.classpath
deleted file mode 100644 (file)
index 0f23270..0000000
--- a/bundles/org.apache.batik/.classpath
+++ /dev/null
@@ -1,31 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>\r
-<classpath>\r
-       <classpathentry exported="true" kind="lib" path="lib/xml-apis-ext-1.3.04.jar"/>\r
-       <classpathentry exported="true" kind="lib" path="lib/fop-transcoder-allinone-svn-trunk.jar"/>\r
-       <classpathentry exported="true" kind="lib" path="lib/batik-codec-1.8.jar"/>\r
-       <classpathentry exported="true" kind="lib" path="lib/batik-extension-1.8.jar"/>\r
-       <classpathentry exported="true" kind="lib" path="lib/batik-gui-util-1.8.jar"/>\r
-       <classpathentry exported="true" kind="lib" path="lib/batik-gvt-1.8.jar"/>\r
-       <classpathentry exported="true" kind="lib" path="lib/batik-parser-1.8.jar"/>\r
-       <classpathentry exported="true" kind="lib" path="lib/batik-script-1.8.jar"/>\r
-       <classpathentry exported="true" kind="lib" path="lib/batik-swing-1.8.jar"/>\r
-       <classpathentry exported="true" kind="lib" path="lib/js.jar"/>\r
-       <classpathentry exported="true" kind="lib" path="lib/xalan-2.7.0.jar"/>\r
-       <classpathentry exported="true" kind="lib" path="lib/xerces_2_5_0.jar"/>\r
-       <classpathentry exported="true" kind="lib" path="lib/batik-anim-1.8.jar"/>\r
-       <classpathentry exported="true" kind="lib" path="lib/xmlgraphics-commons-2.0.jar"/>\r
-       <classpathentry exported="true" kind="lib" path="lib/batik-css-1.8.jar"/>\r
-       <classpathentry exported="true" kind="lib" path="lib/batik-bridge-1.8.jar"/>\r
-       <classpathentry exported="true" kind="lib" path="lib/batik-transcoder-1.8.jar"/>\r
-       <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.8"/>\r
-       <classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/>\r
-       <classpathentry kind="src" path="src"/>\r
-       <classpathentry exported="true" kind="lib" path="lib/batik-awt-util-1.8.jar"/>\r
-       <classpathentry exported="true" kind="lib" path="lib/batik-dom-1.8.jar"/>\r
-       <classpathentry exported="true" kind="lib" path="lib/batik-ext-1.8.jar"/>\r
-       <classpathentry exported="true" kind="lib" path="lib/batik-svg-dom-1.8.jar"/>\r
-       <classpathentry exported="true" kind="lib" path="lib/batik-svggen-1.8.jar"/>\r
-       <classpathentry exported="true" kind="lib" path="lib/batik-util-1.8.jar"/>\r
-       <classpathentry exported="true" kind="lib" path="lib/batik-xml-1.8.jar"/>\r
-       <classpathentry kind="output" path="bin"/>\r
-</classpath>\r

diff --git a/bundles/org.apache.batik/.project b/bundles/org.apache.batik/.project
deleted file mode 100644 (file)
index 0feb468..0000000
--- a/bundles/org.apache.batik/.project
+++ /dev/null
@@ -1,28 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>\r
-<projectDescription>\r
-       <name>org.apache.batik</name>\r
-       <comment></comment>\r
-       <projects>\r
-       </projects>\r
-       <buildSpec>\r
-               <buildCommand>\r
-                       <name>org.eclipse.jdt.core.javabuilder</name>\r
-                       <arguments>\r
-                       </arguments>\r
-               </buildCommand>\r
-               <buildCommand>\r
-                       <name>org.eclipse.pde.ManifestBuilder</name>\r
-                       <arguments>\r
-                       </arguments>\r
-               </buildCommand>\r
-               <buildCommand>\r
-                       <name>org.eclipse.pde.SchemaBuilder</name>\r
-                       <arguments>\r
-                       </arguments>\r
-               </buildCommand>\r
-       </buildSpec>\r
-       <natures>\r
-               <nature>org.eclipse.pde.PluginNature</nature>\r
-               <nature>org.eclipse.jdt.core.javanature</nature>\r
-       </natures>\r
-</projectDescription>\r

diff --git a/bundles/org.apache.batik/.settings/org.eclipse.jdt.core.prefs b/bundles/org.apache.batik/.settings/org.eclipse.jdt.core.prefs
deleted file mode 100644 (file)
index 295926d..0000000
--- a/bundles/org.apache.batik/.settings/org.eclipse.jdt.core.prefs
+++ /dev/null
@@ -1,7 +0,0 @@
-eclipse.preferences.version=1\r
-org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled\r
-org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.8\r
-org.eclipse.jdt.core.compiler.compliance=1.8\r
-org.eclipse.jdt.core.compiler.problem.assertIdentifier=error\r
-org.eclipse.jdt.core.compiler.problem.enumIdentifier=error\r
-org.eclipse.jdt.core.compiler.source=1.8\r

diff --git a/bundles/org.apache.batik/META-INF/MANIFEST.MF b/bundles/org.apache.batik/META-INF/MANIFEST.MF
deleted file mode 100644 (file)
index 22d86a0..0000000
--- a/bundles/org.apache.batik/META-INF/MANIFEST.MF
+++ /dev/null
@@ -1,288 +0,0 @@
-Manifest-Version: 1.0
-Bundle-ManifestVersion: 2
-Bundle-Name: Batik
-Bundle-SymbolicName: org.apache.batik;singleton:=true
-Bundle-Version: 1.8.0.qualifier
-Bundle-RequiredExecutionEnvironment: JavaSE-1.8
-Export-Package: java_cup.runtime,
- org.apache.avalon.framework,
- org.apache.avalon.framework.activity,
- org.apache.avalon.framework.configuration,
- org.apache.avalon.framework.container,
- org.apache.batik,
- org.apache.batik.anim,
- org.apache.batik.anim.dom,
- org.apache.batik.anim.timing,
- org.apache.batik.anim.values,
- org.apache.batik.bridge,
- org.apache.batik.bridge.svg12,
- org.apache.batik.css.dom,
- org.apache.batik.css.engine,
- org.apache.batik.css.engine.sac,
- org.apache.batik.css.engine.value,
- org.apache.batik.css.engine.value.css2,
- org.apache.batik.css.engine.value.svg,
- org.apache.batik.css.engine.value.svg12,
- org.apache.batik.css.parser,
- org.apache.batik.dom,
- org.apache.batik.dom.events,
- org.apache.batik.dom.svg,
- org.apache.batik.dom.svg12,
- org.apache.batik.dom.traversal,
- org.apache.batik.dom.util,
- org.apache.batik.dom.xbl,
- org.apache.batik.ext.awt,
- org.apache.batik.ext.awt.color,
- org.apache.batik.ext.awt.font,
- org.apache.batik.ext.awt.g2d,
- org.apache.batik.ext.awt.geom,
- org.apache.batik.ext.awt.image,
- org.apache.batik.ext.awt.image.codec.png,
- org.apache.batik.ext.awt.image.codec.tiff,
- org.apache.batik.ext.awt.image.codec.util,
- org.apache.batik.ext.awt.image.renderable,
- org.apache.batik.ext.awt.image.rendered,
- org.apache.batik.ext.awt.image.spi,
- org.apache.batik.ext.swing,
- org.apache.batik.extension,
- org.apache.batik.extension.svg,
- org.apache.batik.gvt,
- org.apache.batik.gvt.event,
- org.apache.batik.gvt.filter,
- org.apache.batik.gvt.flow,
- org.apache.batik.gvt.font,
- org.apache.batik.gvt.renderer,
- org.apache.batik.gvt.text,
- org.apache.batik.i18n,
- org.apache.batik.parser,
- org.apache.batik.script,
- org.apache.batik.script.rhino,
- org.apache.batik.svggen,
- org.apache.batik.svggen.font,
- org.apache.batik.svggen.font.table,
- org.apache.batik.swing,
- org.apache.batik.swing.gvt,
- org.apache.batik.swing.svg,
- org.apache.batik.transcoder,
- org.apache.batik.transcoder.image,
- org.apache.batik.transcoder.image.resources,
- org.apache.batik.transcoder.keys,
- org.apache.batik.transcoder.print,
- org.apache.batik.transcoder.svg2svg,
- org.apache.batik.transcoder.wmf,
- org.apache.batik.transcoder.wmf.tosvg,
- org.apache.batik.util,
- org.apache.batik.util.gui,
- org.apache.batik.util.gui.resource,
- org.apache.batik.util.gui.xmleditor,
- org.apache.batik.util.io,
- org.apache.batik.util.resources,
- org.apache.batik.xml,
- org.apache.bcel,
- org.apache.bcel.classfile,
- org.apache.bcel.generic,
- org.apache.bcel.util,
- org.apache.bcel.verifier,
- org.apache.bcel.verifier.exc,
- org.apache.bcel.verifier.statics,
- org.apache.bcel.verifier.structurals,
- org.apache.commons.io,
- org.apache.commons.io.filefilter,
- org.apache.commons.io.output,
- org.apache.commons.logging,
- org.apache.commons.logging.impl,
- org.apache.fop,
- org.apache.fop.accessibility,
- org.apache.fop.apps,
- org.apache.fop.apps.io,
- org.apache.fop.complexscripts.bidi,
- org.apache.fop.complexscripts.fonts,
- org.apache.fop.complexscripts.util,
- org.apache.fop.events,
- org.apache.fop.fo,
- org.apache.fop.fonts,
- org.apache.fop.fonts.apps,
- org.apache.fop.fonts.autodetect,
- org.apache.fop.fonts.base14,
- org.apache.fop.fonts.cff,
- org.apache.fop.fonts.substitute,
- org.apache.fop.fonts.truetype,
- org.apache.fop.fonts.type1,
- org.apache.fop.image.loader.batik,
- org.apache.fop.pdf,
- org.apache.fop.pdf.xref,
- org.apache.fop.render,
- org.apache.fop.render.gradient,
- org.apache.fop.render.intermediate,
- org.apache.fop.render.pdf,
- org.apache.fop.render.pdf.extensions,
- org.apache.fop.render.ps,
- org.apache.fop.render.ps.extensions,
- org.apache.fop.render.ps.fonts,
- org.apache.fop.render.ps.svg,
- org.apache.fop.svg,
- org.apache.fop.svg.font,
- org.apache.fop.svg.text,
- org.apache.fop.traits,
- org.apache.fop.util,
- org.apache.html.dom,
- org.apache.regexp,
- org.apache.wml,
- org.apache.wml.dom,
- org.apache.xalan,
- org.apache.xalan.client,
- org.apache.xalan.extensions,
- org.apache.xalan.lib,
- org.apache.xalan.lib.sql,
- org.apache.xalan.processor,
- org.apache.xalan.res,
- org.apache.xalan.serialize,
- org.apache.xalan.templates,
- org.apache.xalan.trace,
- org.apache.xalan.transformer,
- org.apache.xalan.xslt,
- org.apache.xalan.xsltc,
- org.apache.xalan.xsltc.cmdline,
- org.apache.xalan.xsltc.cmdline.getopt,
- org.apache.xalan.xsltc.compiler,
- org.apache.xalan.xsltc.compiler.util,
- org.apache.xalan.xsltc.dom,
- org.apache.xalan.xsltc.runtime,
- org.apache.xalan.xsltc.runtime.output,
- org.apache.xalan.xsltc.trax,
- org.apache.xalan.xsltc.util,
- org.apache.xerces.dom,
- org.apache.xerces.dom.events,
- org.apache.xerces.dom3,
- org.apache.xerces.dom3.as,
- org.apache.xerces.dom3.bootstrap,
- org.apache.xerces.impl,
- org.apache.xerces.impl.dtd,
- org.apache.xerces.impl.dtd.models,
- org.apache.xerces.impl.dv,
- org.apache.xerces.impl.dv.dtd,
- org.apache.xerces.impl.dv.util,
- org.apache.xerces.impl.dv.xs,
- org.apache.xerces.impl.io,
- org.apache.xerces.impl.msg,
- org.apache.xerces.impl.validation,
- org.apache.xerces.impl.xpath,
- org.apache.xerces.impl.xpath.regex,
- org.apache.xerces.impl.xs,
- org.apache.xerces.impl.xs.identity,
- org.apache.xerces.impl.xs.models,
- org.apache.xerces.impl.xs.opti,
- org.apache.xerces.impl.xs.psvi,
- org.apache.xerces.impl.xs.traversers,
- org.apache.xerces.impl.xs.util,
- org.apache.xerces.jaxp,
- org.apache.xerces.parsers,
- org.apache.xerces.util,
- org.apache.xerces.xinclude,
- org.apache.xerces.xni,
- org.apache.xerces.xni.grammars,
- org.apache.xerces.xni.parser,
- org.apache.xerces.xni.psvi,
- org.apache.xml.dtm,
- org.apache.xml.dtm.ref,
- org.apache.xml.dtm.ref.dom2dtm,
- org.apache.xml.dtm.ref.sax2dtm,
- org.apache.xml.res,
- org.apache.xml.serialize,
- org.apache.xml.utils,
- org.apache.xml.utils.res,
- org.apache.xmlgraphics.fonts,
- org.apache.xmlgraphics.image,
- org.apache.xmlgraphics.image.codec.png,
- org.apache.xmlgraphics.image.codec.tiff,
- org.apache.xmlgraphics.image.codec.util,
- org.apache.xmlgraphics.image.loader,
- org.apache.xmlgraphics.image.loader.cache,
- org.apache.xmlgraphics.image.loader.impl,
- org.apache.xmlgraphics.image.loader.impl.imageio,
- org.apache.xmlgraphics.image.loader.pipeline,
- org.apache.xmlgraphics.image.loader.spi,
- org.apache.xmlgraphics.image.loader.util,
- org.apache.xmlgraphics.image.rendered,
- org.apache.xmlgraphics.image.writer,
- org.apache.xmlgraphics.image.writer.imageio,
- org.apache.xmlgraphics.image.writer.internal,
- org.apache.xmlgraphics.io,
- org.apache.xmlgraphics.java2d,
- org.apache.xmlgraphics.java2d.color,
- org.apache.xmlgraphics.java2d.color.profile,
- org.apache.xmlgraphics.java2d.ps,
- org.apache.xmlgraphics.ps,
- org.apache.xmlgraphics.ps.dsc,
- org.apache.xmlgraphics.ps.dsc.events,
- org.apache.xmlgraphics.ps.dsc.tools,
- org.apache.xmlgraphics.util,
- org.apache.xmlgraphics.util.dijkstra,
- org.apache.xmlgraphics.util.i18n,
- org.apache.xmlgraphics.util.io,
- org.apache.xmlgraphics.util.uri,
- org.apache.xmlgraphics.xmp,
- org.apache.xmlgraphics.xmp.merge,
- org.apache.xmlgraphics.xmp.schemas,
- org.apache.xmlgraphics.xmp.schemas.pdf,
- org.apache.xpath,
- org.apache.xpath.axes,
- org.apache.xpath.compiler,
- org.apache.xpath.domapi,
- org.apache.xpath.functions,
- org.apache.xpath.jaxp,
- org.apache.xpath.objects,
- org.apache.xpath.operations,
- org.apache.xpath.patterns,
- org.apache.xpath.res,
- org.mozilla.classfile,
- org.mozilla.javascript,
- org.mozilla.javascript.continuations,
- org.mozilla.javascript.debug,
- org.mozilla.javascript.jdk11,
- org.mozilla.javascript.jdk13,
- org.mozilla.javascript.optimizer,
- org.mozilla.javascript.regexp,
- org.mozilla.javascript.serialize,
- org.mozilla.javascript.tools,
- org.mozilla.javascript.tools.debugger,
- org.mozilla.javascript.tools.debugger.downloaded,
- org.mozilla.javascript.tools.idswitch,
- org.mozilla.javascript.tools.jsc,
- org.mozilla.javascript.tools.shell,
- org.mozilla.javascript.xml,
- org.mozilla.javascript.xmlimpl,
- org.w3c.css.sac,
- org.w3c.css.sac.helpers,
- org.w3c.dom,
- org.w3c.dom.events,
- org.w3c.dom.html,
- org.w3c.dom.ls,
- org.w3c.dom.smil,
- org.w3c.dom.svg
-Bundle-ClassPath: lib/batik-awt-util-1.8.jar,
- lib/batik-dom-1.8.jar,
- lib/batik-ext-1.8.jar,
- lib/batik-svg-dom-1.8.jar,
- lib/batik-svggen-1.8.jar,
- lib/batik-util-1.8.jar,
- lib/batik-xml-1.8.jar,
- lib/batik-transcoder-1.8.jar,
- lib/batik-bridge-1.8.jar,
- lib/batik-css-1.8.jar,
- lib/xmlgraphics-commons-2.0.jar,
- lib/batik-anim-1.8.jar,
- .,
- lib/batik-codec-1.8.jar,
- lib/batik-extension-1.8.jar,
- lib/batik-gui-util-1.8.jar,
- lib/batik-gvt-1.8.jar,
- lib/batik-parser-1.8.jar,
- lib/batik-script-1.8.jar,
- lib/batik-swing-1.8.jar,
- lib/js.jar,
- lib/xalan-2.7.0.jar,
- lib/xerces_2_5_0.jar,
- lib/fop-transcoder-allinone-svn-trunk.jar,
- lib/xml-apis-ext-1.3.04.jar
-Require-Bundle: javax.xml;bundle-version="1.3.4"

diff --git a/bundles/org.apache.batik/build.properties b/bundles/org.apache.batik/build.properties
deleted file mode 100644 (file)
index d435895..0000000
--- a/bundles/org.apache.batik/build.properties
+++ /dev/null
@@ -1,29 +0,0 @@
-source.. = src/\r
-output.. = bin/\r
-bin.includes = META-INF/,\\r
-               .,\\r
-               lib/,\\r
-               lib/batik-awt-util-1.8.jar,\\r
-               lib/batik-dom-1.8.jar,\\r
-               lib/batik-ext-1.8.jar,\\r
-               lib/batik-svg-dom-1.8.jar,\\r
-               lib/batik-svggen-1.8.jar,\\r
-               lib/batik-util-1.8.jar,\\r
-               lib/batik-xml-1.8.jar,\\r
-               lib/batik-transcoder-1.8.jar,\\r
-               lib/batik-bridge-1.8.jar,\\r
-               lib/batik-css-1.8.jar,\\r
-               lib/xmlgraphics-commons-2.0.jar,\\r
-               lib/batik-anim-1.8.jar,\\r
-               lib/batik-codec-1.8.jar,\\r
-               lib/batik-extension-1.8.jar,\\r
-               lib/batik-gui-util-1.8.jar,\\r
-               lib/batik-gvt-1.8.jar,\\r
-               lib/batik-parser-1.8.jar,\\r
-               lib/batik-script-1.8.jar,\\r
-               lib/batik-swing-1.8.jar,\\r
-               lib/js.jar,\\r
-               lib/xalan-2.7.0.jar,\\r
-               lib/xerces_2_5_0.jar,\\r
-               lib/fop-transcoder-allinone-svn-trunk.jar,\\r
-               lib/xml-apis-ext-1.3.04.jar\r

diff --git a/bundles/org.apache.batik/lib/batik-anim-1.8.jar b/bundles/org.apache.batik/lib/batik-anim-1.8.jar
deleted file mode 100644 (file)
index 9470058..0000000
Binary files a/bundles/org.apache.batik/lib/batik-anim-1.8.jar and /dev/null differ

diff --git a/bundles/org.apache.batik/lib/batik-awt-util-1.8.jar b/bundles/org.apache.batik/lib/batik-awt-util-1.8.jar
deleted file mode 100644 (file)
index 740acb7..0000000
Binary files a/bundles/org.apache.batik/lib/batik-awt-util-1.8.jar and /dev/null differ

diff --git a/bundles/org.apache.batik/lib/batik-bridge-1.8.jar b/bundles/org.apache.batik/lib/batik-bridge-1.8.jar
deleted file mode 100644 (file)
index 36e8e03..0000000
Binary files a/bundles/org.apache.batik/lib/batik-bridge-1.8.jar and /dev/null differ

diff --git a/bundles/org.apache.batik/lib/batik-codec-1.8.jar b/bundles/org.apache.batik/lib/batik-codec-1.8.jar
deleted file mode 100644 (file)
index 07b6e79..0000000
Binary files a/bundles/org.apache.batik/lib/batik-codec-1.8.jar and /dev/null differ

diff --git a/bundles/org.apache.batik/lib/batik-css-1.8.jar b/bundles/org.apache.batik/lib/batik-css-1.8.jar
deleted file mode 100644 (file)
index 1c9fb19..0000000
Binary files a/bundles/org.apache.batik/lib/batik-css-1.8.jar and /dev/null differ

diff --git a/bundles/org.apache.batik/lib/batik-dom-1.8.jar b/bundles/org.apache.batik/lib/batik-dom-1.8.jar
deleted file mode 100644 (file)
index 4899b51..0000000
Binary files a/bundles/org.apache.batik/lib/batik-dom-1.8.jar and /dev/null differ

diff --git a/bundles/org.apache.batik/lib/batik-ext-1.8.jar b/bundles/org.apache.batik/lib/batik-ext-1.8.jar
deleted file mode 100644 (file)
index d7c850b..0000000
Binary files a/bundles/org.apache.batik/lib/batik-ext-1.8.jar and /dev/null differ

diff --git a/bundles/org.apache.batik/lib/batik-extension-1.8.jar b/bundles/org.apache.batik/lib/batik-extension-1.8.jar
deleted file mode 100644 (file)
index 5aa9b7a..0000000
Binary files a/bundles/org.apache.batik/lib/batik-extension-1.8.jar and /dev/null differ

diff --git a/bundles/org.apache.batik/lib/batik-gui-util-1.8.jar b/bundles/org.apache.batik/lib/batik-gui-util-1.8.jar
deleted file mode 100644 (file)
index 15eb196..0000000
Binary files a/bundles/org.apache.batik/lib/batik-gui-util-1.8.jar and /dev/null differ

diff --git a/bundles/org.apache.batik/lib/batik-gvt-1.8.jar b/bundles/org.apache.batik/lib/batik-gvt-1.8.jar
deleted file mode 100644 (file)
index 7bb4e58..0000000
Binary files a/bundles/org.apache.batik/lib/batik-gvt-1.8.jar and /dev/null differ

diff --git a/bundles/org.apache.batik/lib/batik-parser-1.8.jar b/bundles/org.apache.batik/lib/batik-parser-1.8.jar
deleted file mode 100644 (file)
index 1c1223d..0000000
Binary files a/bundles/org.apache.batik/lib/batik-parser-1.8.jar and /dev/null differ

diff --git a/bundles/org.apache.batik/lib/batik-script-1.8.jar b/bundles/org.apache.batik/lib/batik-script-1.8.jar
deleted file mode 100644 (file)
index c3e9a9f..0000000
Binary files a/bundles/org.apache.batik/lib/batik-script-1.8.jar and /dev/null differ

diff --git a/bundles/org.apache.batik/lib/batik-svg-dom-1.8.jar b/bundles/org.apache.batik/lib/batik-svg-dom-1.8.jar
deleted file mode 100644 (file)
index 6429550..0000000
Binary files a/bundles/org.apache.batik/lib/batik-svg-dom-1.8.jar and /dev/null differ

diff --git a/bundles/org.apache.batik/lib/batik-svggen-1.8.jar b/bundles/org.apache.batik/lib/batik-svggen-1.8.jar
deleted file mode 100644 (file)
index 9aaa826..0000000
Binary files a/bundles/org.apache.batik/lib/batik-svggen-1.8.jar and /dev/null differ

diff --git a/bundles/org.apache.batik/lib/batik-swing-1.8.jar b/bundles/org.apache.batik/lib/batik-swing-1.8.jar
deleted file mode 100644 (file)
index 43fa2e0..0000000
Binary files a/bundles/org.apache.batik/lib/batik-swing-1.8.jar and /dev/null differ

diff --git a/bundles/org.apache.batik/lib/batik-transcoder-1.8.jar b/bundles/org.apache.batik/lib/batik-transcoder-1.8.jar
deleted file mode 100644 (file)
index f3c3c4f..0000000
Binary files a/bundles/org.apache.batik/lib/batik-transcoder-1.8.jar and /dev/null differ

diff --git a/bundles/org.apache.batik/lib/batik-util-1.8.jar b/bundles/org.apache.batik/lib/batik-util-1.8.jar
deleted file mode 100644 (file)
index 23e3625..0000000
Binary files a/bundles/org.apache.batik/lib/batik-util-1.8.jar and /dev/null differ

diff --git a/bundles/org.apache.batik/lib/batik-xml-1.8.jar b/bundles/org.apache.batik/lib/batik-xml-1.8.jar
deleted file mode 100644 (file)
index 1101455..0000000
Binary files a/bundles/org.apache.batik/lib/batik-xml-1.8.jar and /dev/null differ

diff --git a/bundles/org.apache.batik/lib/fop-transcoder-allinone-svn-trunk.jar b/bundles/org.apache.batik/lib/fop-transcoder-allinone-svn-trunk.jar
deleted file mode 100644 (file)
index e3cfee6..0000000
Binary files a/bundles/org.apache.batik/lib/fop-transcoder-allinone-svn-trunk.jar and /dev/null differ

diff --git a/bundles/org.apache.batik/lib/js.jar b/bundles/org.apache.batik/lib/js.jar
deleted file mode 100644 (file)
index ccad3cc..0000000
Binary files a/bundles/org.apache.batik/lib/js.jar and /dev/null differ

diff --git a/bundles/org.apache.batik/lib/xalan-2.7.0.jar b/bundles/org.apache.batik/lib/xalan-2.7.0.jar
deleted file mode 100644 (file)
index 979ee76..0000000
Binary files a/bundles/org.apache.batik/lib/xalan-2.7.0.jar and /dev/null differ

diff --git a/bundles/org.apache.batik/lib/xerces_2_5_0.jar b/bundles/org.apache.batik/lib/xerces_2_5_0.jar
deleted file mode 100644 (file)
index c6455ee..0000000
Binary files a/bundles/org.apache.batik/lib/xerces_2_5_0.jar and /dev/null differ

diff --git a/bundles/org.apache.batik/lib/xml-apis-1.3.04.jar b/bundles/org.apache.batik/lib/xml-apis-1.3.04.jar
deleted file mode 100644 (file)
index d42c0ea..0000000
Binary files a/bundles/org.apache.batik/lib/xml-apis-1.3.04.jar and /dev/null differ

diff --git a/bundles/org.apache.batik/lib/xml-apis-ext-1.3.04.jar b/bundles/org.apache.batik/lib/xml-apis-ext-1.3.04.jar
deleted file mode 100644 (file)
index a7869d6..0000000
Binary files a/bundles/org.apache.batik/lib/xml-apis-ext-1.3.04.jar and /dev/null differ

diff --git a/bundles/org.apache.batik/lib/xmlgraphics-commons-2.0.jar b/bundles/org.apache.batik/lib/xmlgraphics-commons-2.0.jar
deleted file mode 100644 (file)
index a168e4f..0000000
Binary files a/bundles/org.apache.batik/lib/xmlgraphics-commons-2.0.jar and /dev/null differ

diff --git a/bundles/org.apache.batik/src/.keep b/bundles/org.apache.batik/src/.keep
deleted file mode 100644 (file)
index e69de29..0000000

diff --git a/bundles/org.simantics.browsing.ui.common/src/org/simantics/browsing/ui/common/EvaluatorDataImpl.java b/bundles/org.simantics.browsing.ui.common/src/org/simantics/browsing/ui/common/EvaluatorDataImpl.java
index 03bceb6e639cab5c8da44c704b5612f0b7d83a7b..6c7c588ee23d05737bc8da5791bd871b916cde28 100644 (file)
--- a/bundles/org.simantics.browsing.ui.common/src/org/simantics/browsing/ui/common/EvaluatorDataImpl.java
+++ b/bundles/org.simantics.browsing.ui.common/src/org/simantics/browsing/ui/common/EvaluatorDataImpl.java
@@ -202,9 +202,10 @@ public class EvaluatorDataImpl implements EvaluatorData {
         }\r
     }\r
 \r
+    @SuppressWarnings("unchecked")\r
     @Override\r
     public <T> T getBrowseContext() {\r
-       return (T)browseContext;\r
+        return (T)browseContext;\r
     }\r
     \r
 }\r

diff --git a/bundles/org.simantics.browsing.ui.common/src/org/simantics/browsing/ui/common/internal/GECache.java b/bundles/org.simantics.browsing.ui.common/src/org/simantics/browsing/ui/common/internal/GECache.java
index ac911a458fe0dedf99fb5e376f078748e88eb657..600d16ff3cb2444252925877a085b37b5f6d055e 100644 (file)
--- a/bundles/org.simantics.browsing.ui.common/src/org/simantics/browsing/ui/common/internal/GECache.java
+++ b/bundles/org.simantics.browsing.ui.common/src/org/simantics/browsing/ui/common/internal/GECache.java
@@ -83,9 +83,8 @@ public class GECache implements IGECache {
      * store the key, this is not used.\r
      */\r
     NodeContext getNC = new NodeContext() {\r
-       @SuppressWarnings("rawtypes")\r
                @Override\r
-       public Object getAdapter(Class adapter) {\r
+       public <T> T getAdapter(Class<T> adapter) {\r
                return null;\r
        }\r
        \r

diff --git a/bundles/org.simantics.browsing.ui.common/src/org/simantics/browsing/ui/common/modifiers/Enumeration.java b/bundles/org.simantics.browsing.ui.common/src/org/simantics/browsing/ui/common/modifiers/Enumeration.java
index 29ec0d89471fe59531c719bc24fd0eebfcf8354c..db5bd5629f3101d9d4208c9b60b961afc3821209 100644 (file)
--- a/bundles/org.simantics.browsing.ui.common/src/org/simantics/browsing/ui/common/modifiers/Enumeration.java
+++ b/bundles/org.simantics.browsing.ui.common/src/org/simantics/browsing/ui/common/modifiers/Enumeration.java
@@ -28,6 +28,7 @@ public class Enumeration<T> {
         return new Enumeration<T>(values);\r
     }\r
 \r
+    @SafeVarargs\r
     public static <T> Enumeration<T> make(EnumeratedValue<T>... values) {\r
         return new Enumeration<T>(Arrays.asList(values));\r
     }\r

diff --git a/bundles/org.simantics.browsing.ui.common/src/org/simantics/browsing/ui/common/node/AbstractNode.java b/bundles/org.simantics.browsing.ui.common/src/org/simantics/browsing/ui/common/node/AbstractNode.java
index a95678bca1496d55266106100df93529f092d567..621b0107c3e54bae02dd29f48f35f70729f56eaf 100644 (file)
--- a/bundles/org.simantics.browsing.ui.common/src/org/simantics/browsing/ui/common/node/AbstractNode.java
+++ b/bundles/org.simantics.browsing.ui.common/src/org/simantics/browsing/ui/common/node/AbstractNode.java
@@ -45,17 +45,17 @@ public abstract class AbstractNode<T> implements IAdaptable {
         return data.equals(other.data);\r
     }\r
 \r
-    @SuppressWarnings({ "rawtypes" })\r
+    @SuppressWarnings("unchecked")\r
     @Override\r
-    public Object getAdapter(Class adapter) {\r
+    public <A> A getAdapter(Class<A> adapter) {\r
         if(clazz == adapter)\r
-            return data;\r
+            return (A) data;\r
         if(Imager.class == adapter)\r
-            return getImager();\r
+            return (A) getImager();\r
         if(ImageURLs.class == adapter)\r
-            return getImageURLs();\r
+            return (A) getImageURLs();\r
         if(Labeler.class == adapter)\r
-            return getLabeler();\r
+            return (A) getLabeler();\r
         return null;\r
     }\r
 \r

diff --git a/bundles/org.simantics.browsing.ui.nattable/META-INF/MANIFEST.MF b/bundles/org.simantics.browsing.ui.nattable/META-INF/MANIFEST.MF
index 47fd31caee575b27b41ba9aca9b489ddfcb79189..dfb78e1ed5ecf6d3daab6a75dbe4668d03f09a34 100644 (file)
--- a/bundles/org.simantics.browsing.ui.nattable/META-INF/MANIFEST.MF
+++ b/bundles/org.simantics.browsing.ui.nattable/META-INF/MANIFEST.MF
@@ -1,6 +1,6 @@
 Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
-Bundle-Name: Nattable
+Bundle-Name: Nebula NatTable Browsing Control
 Bundle-SymbolicName: org.simantics.browsing.ui.nattable
 Bundle-Version: 1.0.0.qualifier
 Bundle-Activator: org.simantics.browsing.ui.nattable.Activator
@@ -16,3 +16,4 @@ Require-Bundle: org.eclipse.ui,
 Bundle-RequiredExecutionEnvironment: JavaSE-1.8
 Bundle-ActivationPolicy: lazy
 Export-Package: org.simantics.browsing.ui.nattable
+Bundle-Vendor: VTT Technical Research Centre of Finland

diff --git a/bundles/org.simantics.browsing.ui.nattable/build.properties b/bundles/org.simantics.browsing.ui.nattable/build.properties
index 41eb6ade2b4f20b43023591aff3c2d34c4d95883..1dd145021f107cf0b6967bc80c1aa2cf4edbf5e8 100644 (file)
--- a/bundles/org.simantics.browsing.ui.nattable/build.properties
+++ b/bundles/org.simantics.browsing.ui.nattable/build.properties
@@ -1,4 +1,5 @@
 source.. = src/\r
 output.. = bin/\r
 bin.includes = META-INF/,\\r
-               .\r
+               .,\\r
+               images/\r

diff --git a/bundles/org.simantics.browsing.ui.nattable/src/org/simantics/browsing/ui/nattable/GEEditBindings.java b/bundles/org.simantics.browsing.ui.nattable/src/org/simantics/browsing/ui/nattable/GEEditBindings.java
index 19ada0233438a652234946fac56967ae804771e1..040f8ae0c8d42cfa110c175d9089f0610f8397d5 100644 (file)
--- a/bundles/org.simantics.browsing.ui.nattable/src/org/simantics/browsing/ui/nattable/GEEditBindings.java
+++ b/bundles/org.simantics.browsing.ui.nattable/src/org/simantics/browsing/ui/nattable/GEEditBindings.java
@@ -6,7 +6,6 @@ import org.eclipse.nebula.widgets.nattable.edit.action.KeyEditAction;
 import org.eclipse.nebula.widgets.nattable.edit.action.MouseEditAction;\r
 import org.eclipse.nebula.widgets.nattable.grid.GridRegion;\r
 import org.eclipse.nebula.widgets.nattable.painter.cell.CheckBoxPainter;\r
-import org.eclipse.nebula.widgets.nattable.selection.SelectionLayer;\r
 import org.eclipse.nebula.widgets.nattable.ui.binding.UiBindingRegistry;\r
 import org.eclipse.nebula.widgets.nattable.ui.matcher.CellEditorMouseEventMatcher;\r
 import org.eclipse.nebula.widgets.nattable.ui.matcher.CellPainterMouseEventMatcher;\r

diff --git a/bundles/org.simantics.browsing.ui.platform/src/org/simantics/browsing/ui/platform/PageSite.java b/bundles/org.simantics.browsing.ui.platform/src/org/simantics/browsing/ui/platform/PageSite.java
index 4bee0eb5594e2750b0db861e4f372e69ca5aea2c..7e9df0f84ec3e361bbc0e8e79be394c0c11158aa 100644 (file)
--- a/bundles/org.simantics.browsing.ui.platform/src/org/simantics/browsing/ui/platform/PageSite.java
+++ b/bundles/org.simantics.browsing.ui.platform/src/org/simantics/browsing/ui/platform/PageSite.java
@@ -201,7 +201,7 @@ public class PageSite implements IPageSite, INestable {
      * @see org.eclipse.core.runtime.IAdaptable#getAdapter(java.lang.Class)
      */
     @Override
-    public Object getAdapter(Class adapter) {
+    public <T> T getAdapter(Class<T> adapter) {
         return Platform.getAdapterManager().getAdapter(this, adapter);
     }
 

diff --git a/bundles/org.simantics.browsing.ui.platform/src/org/simantics/browsing/ui/platform/VariablesPageView.java b/bundles/org.simantics.browsing.ui.platform/src/org/simantics/browsing/ui/platform/VariablesPageView.java
index d42f383157f45263b4a80376fb7ce9590111897e..f56cdfcf59697deae2109f830e5fe369956e4950 100644 (file)
--- a/bundles/org.simantics.browsing.ui.platform/src/org/simantics/browsing/ui/platform/VariablesPageView.java
+++ b/bundles/org.simantics.browsing.ui.platform/src/org/simantics/browsing/ui/platform/VariablesPageView.java
@@ -126,14 +126,14 @@ public class VariablesPageView extends PageBookView implements ISelectionListene
      * \r
      * @see org.eclipse.ui.part.PageBookView#getAdapter(java.lang.Class)\r
      */\r
-    @SuppressWarnings({ "rawtypes" })\r
+    @SuppressWarnings("unchecked")\r
     @Override\r
-    public Object getAdapter(Class adapter) {\r
+    public <T> T getAdapter(Class<T> adapter) {\r
         if (adapter == IContributedContentsView.class) {\r
             // This makes it possible to duplicate a PropertyPageView with another\r
             // secondary ID and make it show the same property page that was showing\r
             // in the original property page view.\r
-            return new IContributedContentsView() {\r
+            return (T) new IContributedContentsView() {\r
                 @Override\r
                 public IWorkbenchPart getContributingPart() {\r
                     return getContributingEditor();\r
@@ -141,7 +141,7 @@ public class VariablesPageView extends PageBookView implements ISelectionListene
             };\r
         }\r
         if (adapter == ISessionContextProvider.class)\r
-            return contextProvider;\r
+            return (T) contextProvider;\r
         return super.getAdapter(adapter);\r
     }\r
 \r

diff --git a/bundles/org.simantics.browsing.ui/src/org/simantics/browsing/ui/NodeContextPath.java b/bundles/org.simantics.browsing.ui/src/org/simantics/browsing/ui/NodeContextPath.java
index 6b5fcbf874fd9736699abdaa7bb3826f8bfca44d..9c09bc4dde914ba88b200010fb936045202be091 100644 (file)
--- a/bundles/org.simantics.browsing.ui/src/org/simantics/browsing/ui/NodeContextPath.java
+++ b/bundles/org.simantics.browsing.ui/src/org/simantics/browsing/ui/NodeContextPath.java
@@ -243,11 +243,11 @@ public final class NodeContextPath implements IAdaptable {
         return new NodeContextPath(childSegments);\r
     }\r
 \r
-    @SuppressWarnings("rawtypes")\r
+    @SuppressWarnings("unchecked")\r
     @Override\r
-    public Object getAdapter(Class adapter) {\r
+    public <T> T getAdapter(Class<T> adapter) {\r
         if (NodeContext.class == adapter)\r
-            return getLastSegment();\r
+            return (T) getLastSegment();\r
         NodeContext last = getLastSegment();\r
         if (last instanceof IAdaptable)\r
             return ((IAdaptable) last).getAdapter(adapter);\r

diff --git a/bundles/org.simantics.desktop.ui.ontology/build.properties b/bundles/org.simantics.desktop.ui.ontology/build.properties
index 022de1735b3f377a077bbc56b320d9bf79fb835c..fb164279d32b25779889cf3b7a5500310f85e3ea 100644 (file)
--- a/bundles/org.simantics.desktop.ui.ontology/build.properties
+++ b/bundles/org.simantics.desktop.ui.ontology/build.properties
@@ -1,6 +1,6 @@
 source.. = src/\r
 output.. = bin/\r
-bin.includes = plugin.xml,\\r
-               META-INF/,\\r
+bin.includes = META-INF/,\\r
                .,\\r
                graph.tg\r
+src.includes = graph/\r

diff --git a/bundles/org.simantics.diagram.svg/src/org/simantics/diagram/svg/export/SVGBuilder.java b/bundles/org.simantics.diagram.svg/src/org/simantics/diagram/svg/export/SVGBuilder.java
index 4f2d79b4535e0361edf5f8f48ab183907e00b271..86bdbcd8e9327f7673a4909b0de0111c2421ac22 100644 (file)
--- a/bundles/org.simantics.diagram.svg/src/org/simantics/diagram/svg/export/SVGBuilder.java
+++ b/bundles/org.simantics.diagram.svg/src/org/simantics/diagram/svg/export/SVGBuilder.java
@@ -18,7 +18,6 @@ import org.simantics.g2d.participant.TransformUtil;
 import org.simantics.scenegraph.g2d.G2DRenderingHints;\r
 import org.simantics.scenegraph.utils.QualityHints;\r
 import org.simantics.utils.page.MarginUtils;\r
-import org.simantics.utils.page.MarginUtils.Margin;\r
 import org.simantics.utils.page.MarginUtils.Margins;\r
 import org.w3c.dom.DOMImplementation;\r
 import org.w3c.dom.Document;\r

diff --git a/bundles/org.simantics.g2d/src/org/simantics/g2d/elementclass/FlagClass.java b/bundles/org.simantics.g2d/src/org/simantics/g2d/elementclass/FlagClass.java
index ab80abf7fc087ab43b2114898011b8a2c8595bc2..15b5194908014303778357ecbef2b96b7c4513ba 100644 (file)
--- a/bundles/org.simantics.g2d/src/org/simantics/g2d/elementclass/FlagClass.java
+++ b/bundles/org.simantics.g2d/src/org/simantics/g2d/elementclass/FlagClass.java
@@ -47,9 +47,6 @@ import org.simantics.g2d.utils.geom.DirectionSet;
 import org.simantics.scenegraph.Node;\r
 import org.simantics.scenegraph.g2d.G2DParentNode;\r
 import org.simantics.scenegraph.g2d.nodes.FlagNode;\r
-import org.simantics.scenegraph.g2d.nodes.TextNode;\r
-import org.simantics.ui.colors.Colors;\r
-import org.simantics.ui.fonts.Fonts;\r
 import org.simantics.utils.datastructures.hints.IHintContext.Key;\r
 import org.simantics.utils.datastructures.hints.IHintContext.KeyOf;\r
 \r

diff --git a/bundles/org.simantics.help.core/META-INF/MANIFEST.MF b/bundles/org.simantics.help.core/META-INF/MANIFEST.MF
index dacb90faaa1b6bd9a13b3982763b553e7e4f4743..f1fbea12c343b2cc724c92435b1eb00c4e469820 100644 (file)
--- a/bundles/org.simantics.help.core/META-INF/MANIFEST.MF
+++ b/bundles/org.simantics.help.core/META-INF/MANIFEST.MF
@@ -20,3 +20,4 @@ Require-Bundle: org.eclipse.ui,
 Bundle-RequiredExecutionEnvironment: JavaSE-1.8
 Bundle-ActivationPolicy: lazy
 Export-Package: org.simantics.help.core
+Bundle-Vendor: Semantum Oy

diff --git a/bundles/org.simantics.help.core/build.properties b/bundles/org.simantics.help.core/build.properties
index 4e3c13e70b651db2bdd8d57eacb4ea5f4093bcd0..42bacfb62966eecb7865d32e0d14d7b29e46870b 100644 (file)
--- a/bundles/org.simantics.help.core/build.properties
+++ b/bundles/org.simantics.help.core/build.properties
@@ -3,4 +3,5 @@ output.. = bin/
 bin.includes = META-INF/,\\r
                .,\\r
                scl/,\\r
-               plugin.xml\r
+               plugin.xml,\\r
+               css/\r

diff --git a/bundles/org.simantics.help.feature/build.properties b/bundles/org.simantics.help.feature/build.properties
deleted file mode 100644 (file)
index 0c85ae7..0000000
--- a/bundles/org.simantics.help.feature/build.properties
+++ /dev/null
@@ -1,12 +0,0 @@
-###############################################################################\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
-bin.includes = feature.xml\r

diff --git a/bundles/org.simantics.help.feature/feature.xml b/bundles/org.simantics.help.feature/feature.xml
deleted file mode 100644 (file)
index 24eaf09..0000000
--- a/bundles/org.simantics.help.feature/feature.xml
+++ /dev/null
@@ -1,209 +0,0 @@
-<?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
-<feature\r
-      id="org.simantics.help"\r
-      label="Simantics Help"\r
-      version="1.1.1.qualifier"\r
-      provider-name="VTT Technical Research Centre of Finland">\r
-\r
-   <description>\r
-      This feature gather together the parts of Eclipse SDK that are needed to use the Eclipse help system and cheat sheets.\r
-   </description>\r
-\r
-   <license url="http://www.eclipse.org/legal/epl-v10.html">\r
-      Licensed under Eclipse Public License (EPL) 1.0.\r
-   </license>\r
-\r
-   <plugin\r
-         id="org.eclipse.help"\r
-         download-size="0"\r
-         install-size="0"\r
-         version="0.0.0"\r
-         unpack="false"/>\r
-\r
-   <plugin\r
-         id="org.eclipse.help.base"\r
-         download-size="0"\r
-         install-size="0"\r
-         version="0.0.0"\r
-         unpack="false"/>\r
-\r
-   <plugin\r
-         id="org.eclipse.help.ui"\r
-         download-size="0"\r
-         install-size="0"\r
-         version="0.0.0"\r
-         unpack="false"/>\r
-\r
-   <plugin\r
-         id="org.apache.lucene.analysis"\r
-         download-size="887"\r
-         install-size="1772"\r
-         version="3.5.0.v20120725-1805"\r
-         unpack="false"/>\r
-\r
-   <plugin\r
-         id="org.apache.lucene.core"\r
-         download-size="1513"\r
-         install-size="3048"\r
-         version="3.5.0.v20120725-1805"\r
-         unpack="false"/>\r
-\r
-   <plugin\r
-         id="org.eclipse.help.webapp"\r
-         download-size="0"\r
-         install-size="0"\r
-         version="0.0.0"\r
-         unpack="false"/>\r
-\r
-   <plugin\r
-         id="org.eclipse.equinox.http.registry"\r
-         download-size="0"\r
-         install-size="0"\r
-         version="0.0.0"\r
-         unpack="false"/>\r
-\r
-   <plugin\r
-         id="javax.servlet"\r
-         download-size="0"\r
-         install-size="0"\r
-         version="0.0.0"\r
-         unpack="false"/>\r
-\r
-   <plugin\r
-         id="javax.servlet.jsp"\r
-         download-size="0"\r
-         install-size="0"\r
-         version="0.0.0"\r
-         unpack="false"/>\r
-\r
-   <plugin\r
-         id="org.eclipse.equinox.jsp.jasper"\r
-         download-size="0"\r
-         install-size="0"\r
-         version="0.0.0"\r
-         unpack="false"/>\r
-\r
-   <plugin\r
-         id="org.eclipse.equinox.jsp.jasper.registry"\r
-         download-size="0"\r
-         install-size="0"\r
-         version="0.0.0"\r
-         unpack="false"/>\r
-\r
-   <plugin\r
-         id="org.eclipse.equinox.http.jetty"\r
-         download-size="0"\r
-         install-size="0"\r
-         version="0.0.0"\r
-         unpack="false"/>\r
-\r
-   <plugin\r
-         id="org.eclipse.equinox.http.servlet"\r
-         download-size="0"\r
-         install-size="0"\r
-         version="0.0.0"\r
-         unpack="false"/>\r
-\r
-   <plugin\r
-         id="org.eclipse.ui.cheatsheets"\r
-         download-size="0"\r
-         install-size="0"\r
-         version="0.0.0"\r
-         unpack="false"/>\r
-\r
-   <plugin\r
-         id="javax.el"\r
-         download-size="0"\r
-         install-size="0"\r
-         version="0.0.0"\r
-         unpack="false"/>\r
-\r
-   <plugin\r
-         id="com.sun.el"\r
-         download-size="0"\r
-         install-size="0"\r
-         version="0.0.0"\r
-         unpack="false"/>\r
-\r
-   <plugin\r
-         id="org.apache.commons.logging"\r
-         download-size="0"\r
-         install-size="0"\r
-         version="0.0.0"\r
-         unpack="false"/>\r
-\r
-   <plugin\r
-         id="org.apache.jasper.glassfish"\r
-         download-size="0"\r
-         install-size="0"\r
-         version="0.0.0"\r
-         unpack="false"/>\r
-\r
-   <plugin\r
-         id="org.eclipse.jetty.continuation"\r
-         download-size="0"\r
-         install-size="0"\r
-         version="0.0.0"\r
-         unpack="false"/>\r
-\r
-   <plugin\r
-         id="org.eclipse.jetty.http"\r
-         download-size="0"\r
-         install-size="0"\r
-         version="0.0.0"\r
-         unpack="false"/>\r
-\r
-   <plugin\r
-         id="org.eclipse.jetty.io"\r
-         download-size="0"\r
-         install-size="0"\r
-         version="0.0.0"\r
-         unpack="false"/>\r
-\r
-   <plugin\r
-         id="org.eclipse.jetty.security"\r
-         download-size="0"\r
-         install-size="0"\r
-         version="0.0.0"\r
-         unpack="false"/>\r
-\r
-   <plugin\r
-         id="org.eclipse.jetty.server"\r
-         download-size="0"\r
-         install-size="0"\r
-         version="0.0.0"\r
-         unpack="false"/>\r
-\r
-   <plugin\r
-         id="org.eclipse.jetty.servlet"\r
-         download-size="0"\r
-         install-size="0"\r
-         version="0.0.0"\r
-         unpack="false"/>\r
-\r
-   <plugin\r
-         id="org.eclipse.jetty.util"\r
-         download-size="0"\r
-         install-size="0"\r
-         version="0.0.0"\r
-         unpack="false"/>\r
-\r
-   <plugin\r
-         id="winterwell.markdown"\r
-         download-size="0"\r
-         install-size="0"\r
-         version="0.0.0"\r
-         unpack="false"/>\r
-\r
-</feature>\r

diff --git a/bundles/org.simantics.help.files/META-INF/MANIFEST.MF b/bundles/org.simantics.help.files/META-INF/MANIFEST.MF
index 61896e16900582c4b6c7f33814285d96e2b8e7d7..2acf39fe82b67598ee643ab1b6b970b43e01e160 100644 (file)
--- a/bundles/org.simantics.help.files/META-INF/MANIFEST.MF
+++ b/bundles/org.simantics.help.files/META-INF/MANIFEST.MF
@@ -3,3 +3,4 @@ Bundle-ManifestVersion: 2
 Bundle-Name: Simantics Help Files Location
 Bundle-SymbolicName: org.simantics.help.files
 Bundle-Version: 1.0.0.qualifier
+Bundle-Vendor: Semantum Oy

diff --git a/bundles/org.simantics.help.files/build.properties b/bundles/org.simantics.help.files/build.properties
index 5e3728557e2e653d45cad084a78023da5346c3e2..fcf314f57962e96394d138fe8f4e27000f80b96b 100644 (file)
--- a/bundles/org.simantics.help.files/build.properties
+++ b/bundles/org.simantics.help.files/build.properties
@@ -1 +1,2 @@
-bin.includes = META-INF/\r
+bin.includes = META-INF/,\\r
+               html/\r

diff --git a/bundles/org.simantics.help.ontology/META-INF/MANIFEST.MF b/bundles/org.simantics.help.ontology/META-INF/MANIFEST.MF
index c2a6f1c0bef8794cc69e636e56fee8572ec10257..ca70f3810cde2152d6fb2b3c1afba4725be85413 100644 (file)
--- a/bundles/org.simantics.help.ontology/META-INF/MANIFEST.MF
+++ b/bundles/org.simantics.help.ontology/META-INF/MANIFEST.MF
@@ -9,3 +9,4 @@ Require-Bundle: org.simantics.layer0,
  org.simantics.silk.ontology;bundle-version="1.1.0"
 Bundle-RequiredExecutionEnvironment: JavaSE-1.8
 Export-Package: org.simantics.help
+Bundle-Vendor: Semantum Oy

diff --git a/bundles/org.simantics.help.ontology/build.properties b/bundles/org.simantics.help.ontology/build.properties
index 022de1735b3f377a077bbc56b320d9bf79fb835c..fb164279d32b25779889cf3b7a5500310f85e3ea 100644 (file)
--- a/bundles/org.simantics.help.ontology/build.properties
+++ b/bundles/org.simantics.help.ontology/build.properties
@@ -1,6 +1,6 @@
 source.. = src/\r
 output.. = bin/\r
-bin.includes = plugin.xml,\\r
-               META-INF/,\\r
+bin.includes = META-INF/,\\r
                .,\\r
                graph.tg\r
+src.includes = graph/\r

diff --git a/bundles/org.simantics.help.ui/META-INF/MANIFEST.MF b/bundles/org.simantics.help.ui/META-INF/MANIFEST.MF
index 0bc7d909d0794da47c7240ec71c5740b99f66c50..8a88398f1d14bcea80b7c0483ed6df00e0c40dcc 100644 (file)
--- a/bundles/org.simantics.help.ui/META-INF/MANIFEST.MF
+++ b/bundles/org.simantics.help.ui/META-INF/MANIFEST.MF
@@ -17,3 +17,4 @@ Require-Bundle: org.eclipse.ui,
 Bundle-RequiredExecutionEnvironment: JavaSE-1.8
 Bundle-ActivationPolicy: lazy
 Bundle-ClassPath: .
+Bundle-Vendor: Semantum Oy

diff --git a/bundles/org.simantics.spreadsheet.fileimport/META-INF/MANIFEST.MF b/bundles/org.simantics.spreadsheet.fileimport/META-INF/MANIFEST.MF
index b2c4d0f7d8d8f27c398c681bd84b31516de34c82..2c2e5c14479140644083a4bcf3d9cd5d91dda797 100644 (file)
--- a/bundles/org.simantics.spreadsheet.fileimport/META-INF/MANIFEST.MF
+++ b/bundles/org.simantics.spreadsheet.fileimport/META-INF/MANIFEST.MF
@@ -1,6 +1,6 @@
 Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
-Bundle-Name: Fileimport
+Bundle-Name: Spreadsheet File Import
 Bundle-SymbolicName: org.simantics.spreadsheet.fileimport
 Bundle-Version: 1.0.0.qualifier
 Bundle-Activator: org.simantics.spreadsheet.fileimport.Activator
@@ -10,3 +10,4 @@ Require-Bundle: org.eclipse.core.runtime,
 Bundle-RequiredExecutionEnvironment: JavaSE-1.8
 Bundle-ActivationPolicy: lazy
 Service-Component: OSGI-INF/component.xml
+Bundle-Vendor: Semantum Oy

diff --git a/bundles/org.simantics.tests.modelled.ontology/META-INF/MANIFEST.MF b/bundles/org.simantics.tests.modelled.ontology/META-INF/MANIFEST.MF
index 2320422c5153331ccd7e541889cb208ef3122439..66d1bc3342353589f2740aac50bb3db45ff3f6cc 100644 (file)
--- a/bundles/org.simantics.tests.modelled.ontology/META-INF/MANIFEST.MF
+++ b/bundles/org.simantics.tests.modelled.ontology/META-INF/MANIFEST.MF
@@ -6,3 +6,4 @@ Bundle-Version: 1.0.0.qualifier
 Require-Bundle: org.simantics.layer0
 Bundle-RequiredExecutionEnvironment: JavaSE-1.8
 Export-Package: org.simantics.tests.modelled.ontology
+Bundle-Vendor: Semantum Oy

diff --git a/bundles/org.simantics.tests.modelled.ontology/build.properties b/bundles/org.simantics.tests.modelled.ontology/build.properties
index 022de1735b3f377a077bbc56b320d9bf79fb835c..fb164279d32b25779889cf3b7a5500310f85e3ea 100644 (file)
--- a/bundles/org.simantics.tests.modelled.ontology/build.properties
+++ b/bundles/org.simantics.tests.modelled.ontology/build.properties
@@ -1,6 +1,6 @@
 source.. = src/\r
 output.. = bin/\r
-bin.includes = plugin.xml,\\r
-               META-INF/,\\r
+bin.includes = META-INF/,\\r
                .,\\r
                graph.tg\r
+src.includes = graph/\r

diff --git a/bundles/org.simantics.tests.modelled.ui.ontology/META-INF/MANIFEST.MF b/bundles/org.simantics.tests.modelled.ui.ontology/META-INF/MANIFEST.MF
index 4ad1a0df99860ed6582bc1c537f6b3e9bf45e7b4..4cf2070eb0a243f3a6787768a52f422a398121f7 100644 (file)
--- a/bundles/org.simantics.tests.modelled.ui.ontology/META-INF/MANIFEST.MF
+++ b/bundles/org.simantics.tests.modelled.ui.ontology/META-INF/MANIFEST.MF
@@ -11,3 +11,4 @@ Require-Bundle: org.simantics.layer0,
  org.simantics.silk.ontology;bundle-version="1.1.0",
  org.simantics.image2.ontology;bundle-version="1.2.0"
 Bundle-RequiredExecutionEnvironment: JavaSE-1.8
+Bundle-Vendor: Semantum Oy

diff --git a/bundles/org.simantics.tests.modelled.ui.ontology/build.properties b/bundles/org.simantics.tests.modelled.ui.ontology/build.properties
index 815829b35f044e51ff632ecd1d568890c660f3f6..fb164279d32b25779889cf3b7a5500310f85e3ea 100644 (file)
--- a/bundles/org.simantics.tests.modelled.ui.ontology/build.properties
+++ b/bundles/org.simantics.tests.modelled.ui.ontology/build.properties
@@ -1,8 +1,6 @@
 source.. = src/\r
 output.. = bin/\r
-bin.includes = plugin.xml,\\r
-               META-INF/,\\r
+bin.includes = META-INF/,\\r
                .,\\r
-               graph.tg,\\r
-               graph/scl/\r
-src.includes = graph/scl/\r
+               graph.tg\r
+src.includes = graph/\r

diff --git a/bundles/org.simantics.tests.modelled.ui/META-INF/MANIFEST.MF b/bundles/org.simantics.tests.modelled.ui/META-INF/MANIFEST.MF
index e9aba00c1c90e70b9b4acda034594dda9842736b..0e787d233303517dc0361e7b3057889fb26fdeb5 100644 (file)
--- a/bundles/org.simantics.tests.modelled.ui/META-INF/MANIFEST.MF
+++ b/bundles/org.simantics.tests.modelled.ui/META-INF/MANIFEST.MF
@@ -18,3 +18,4 @@ Require-Bundle: org.eclipse.ui,
  org.simantics.scl.osgi
 Bundle-RequiredExecutionEnvironment: JavaSE-1.8
 Bundle-ActivationPolicy: lazy
+Bundle-Vendor: Semantum Oy

diff --git a/bundles/org.simantics.tests.modelled/META-INF/MANIFEST.MF b/bundles/org.simantics.tests.modelled/META-INF/MANIFEST.MF
index c0b1ba43acb8f4a590cc87585794625786d84793..042896151d58bcaeca3173384a42776eb85f8931 100644 (file)
--- a/bundles/org.simantics.tests.modelled/META-INF/MANIFEST.MF
+++ b/bundles/org.simantics.tests.modelled/META-INF/MANIFEST.MF
@@ -13,3 +13,4 @@ Bundle-RequiredExecutionEnvironment: JavaSE-1.8
 Bundle-ActivationPolicy: lazy
 Export-Package: org.simantics.tests.modelled,
  org.simantics.tests.modelled.junit
+Bundle-Vendor: Semantum Oy

diff --git a/bundles/pom.xml b/bundles/pom.xml
index 0b2a85da4e23bbc2ca65c163faf8c18c60f94dc7..ff9e3f992588668154c39cc0b04756aee7bd1403 100644 (file)
--- a/bundles/pom.xml
+++ b/bundles/pom.xml
@@ -42,8 +42,8 @@
     <modules>
         <module>com.famfamfam.silk</module>
         <module>org.simantics</module>
-        <module>org.simantics.action.ontology</module>
         <module>org.simantics.acorn</module>
+        <module>org.simantics.action.ontology</module>
         <module>org.simantics.annotation.ontology</module>
         <module>org.simantics.annotation.ui</module>
         <module>org.simantics.application</module>
@@ -56,6 +56,7 @@
         <module>org.simantics.browsing.ui.graph</module>
         <module>org.simantics.browsing.ui.graph.impl</module>
         <module>org.simantics.browsing.ui.model</module>
+        <module>org.simantics.browsing.ui.nattable</module>
         <module>org.simantics.browsing.ui.ontology</module>
         <module>org.simantics.browsing.ui.platform</module>
         <module>org.simantics.browsing.ui.swt</module>
@@ -82,10 +83,14 @@
         <module>org.simantics.debug.browser.ui</module>
         <module>org.simantics.debug.graphical</module>
         <module>org.simantics.debug.ui</module>
+        <module>org.simantics.desktop.product</module>
+        <module>org.simantics.desktop.ui</module>
+        <module>org.simantics.desktop.ui.ontology</module>
         <module>org.simantics.diagram</module>
         <module>org.simantics.diagram.connection</module>
         <module>org.simantics.diagram.ontology</module>
         <module>org.simantics.diagram.profile</module>
+        <module>org.simantics.diagram.svg</module>
         <module>org.simantics.document</module>
         <module>org.simantics.document.base.ontology</module>
         <module>org.simantics.document.linking.ontology</module>
@@ -118,6 +123,11 @@
         <module>org.simantics.graphfile.ontology</module>
         <module>org.simantics.graphviz</module>
         <module>org.simantics.graphviz.ui</module>
+        <module>org.simantics.help.base</module>
+        <module>org.simantics.help.core</module>
+        <module>org.simantics.help.files</module>
+        <module>org.simantics.help.ontology</module>
+        <module>org.simantics.help.ui</module>
         <module>org.simantics.history</module>
         <module>org.simantics.image.ontology</module>
         <module>org.simantics.image.ui</module>
@@ -177,6 +187,7 @@
         <module>org.simantics.softwareconfiguration.ontology</module>
         <module>org.simantics.spreadsheet</module>
         <module>org.simantics.spreadsheet.common</module>
+        <module>org.simantics.spreadsheet.fileimport</module>
         <module>org.simantics.spreadsheet.graph</module>
         <module>org.simantics.spreadsheet.ontology</module>
         <module>org.simantics.spreadsheet.ui</module>
@@ -186,6 +197,10 @@
         <module>org.simantics.structural.ui</module>
         <module>org.simantics.structural2</module>
         <module>org.simantics.team.ui</module>
+        <module>org.simantics.tests.modelled</module>
+        <module>org.simantics.tests.modelled.ontology</module>
+        <module>org.simantics.tests.modelled.ui</module>
+        <module>org.simantics.tests.modelled.ui.ontology</module>
         <module>org.simantics.threadlog</module>
         <module>org.simantics.trend</module>
         <module>org.simantics.ui</module>

diff --git a/features/org.simantics.browsing.ui.nattable.feature/.project b/features/org.simantics.browsing.ui.nattable.feature/.project
new file mode 100644 (file)
index 0000000..66c6e1d
--- /dev/null
+++ b/features/org.simantics.browsing.ui.nattable.feature/.project
@@ -0,0 +1,17 @@
+<?xml version="1.0" encoding="UTF-8"?>\r
+<projectDescription>\r
+       <name>org.simantics.browsing.ui.nattable.feature</name>\r
+       <comment></comment>\r
+       <projects>\r
+       </projects>\r
+       <buildSpec>\r
+               <buildCommand>\r
+                       <name>org.eclipse.pde.FeatureBuilder</name>\r
+                       <arguments>\r
+                       </arguments>\r
+               </buildCommand>\r
+       </buildSpec>\r
+       <natures>\r
+               <nature>org.eclipse.pde.FeatureNature</nature>\r
+       </natures>\r
+</projectDescription>\r

diff --git a/features/org.simantics.browsing.ui.nattable.feature/build.properties b/features/org.simantics.browsing.ui.nattable.feature/build.properties
new file mode 100644 (file)
index 0000000..82ab19c
--- /dev/null
+++ b/features/org.simantics.browsing.ui.nattable.feature/build.properties
@@ -0,0 +1 @@
+bin.includes = feature.xml\r

diff --git a/features/org.simantics.browsing.ui.nattable.feature/feature.xml b/features/org.simantics.browsing.ui.nattable.feature/feature.xml
new file mode 100644 (file)
index 0000000..ac8eb16
--- /dev/null
+++ b/features/org.simantics.browsing.ui.nattable.feature/feature.xml
@@ -0,0 +1,54 @@
+<?xml version="1.0" encoding="UTF-8"?>\r
+<feature\r
+      id="org.simantics.browsing.ui.nattable.feature"\r
+      label="Browsing Control Nebula NatTable Feature"\r
+      version="1.4.0.qualifier"\r
+      provider-name="VTT Technical Research Centre of Finland">\r
+\r
+   <description url="http://www.example.com/description">\r
+      [Enter Feature Description here.]\r
+   </description>\r
+\r
+   <copyright url="http://www.example.com/copyright">\r
+      [Enter Copyright Description here.]\r
+   </copyright>\r
+\r
+   <license url="http://www.example.com/license">\r
+      [Enter License Description here.]\r
+   </license>\r
+\r
+   <requires>\r
+      <import plugin="org.eclipse.ui"/>\r
+      <import plugin="org.eclipse.core.runtime"/>\r
+      <import plugin="org.simantics" version="1.0.0" match="greaterOrEqual"/>\r
+      <import plugin="org.simantics.ui" version="1.0.0" match="greaterOrEqual"/>\r
+      <import plugin="org.simantics.utils.ui" version="1.1.0" match="greaterOrEqual"/>\r
+      <import plugin="org.simantics.utils.thread.swt" version="1.1.0" match="greaterOrEqual"/>\r
+      <import plugin="org.simantics.browsing.ui.swt" version="1.1.0" match="greaterOrEqual"/>\r
+      <import plugin="org.eclipse.nebula.widgets.nattable.core" version="1.4.0" match="greaterOrEqual"/>\r
+      <import plugin="it.unimi.dsi.fastutil" version="7.0.6" match="greaterOrEqual"/>\r
+      <import plugin="org.eclipse.equinox.common"/>\r
+   </requires>\r
+\r
+   <plugin\r
+         id="org.simantics.browsing.ui.nattable"\r
+         download-size="0"\r
+         install-size="0"\r
+         version="0.0.0"\r
+         unpack="false"/>\r
+\r
+   <plugin\r
+         id="org.eclipse.nebula.widgets.nattable.core"\r
+         download-size="0"\r
+         install-size="0"\r
+         version="0.0.0"\r
+         unpack="false"/>\r
+\r
+   <plugin\r
+         id="it.unimi.dsi.fastutil"\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.g2d.feature/feature.xml b/features/org.simantics.g2d.feature/feature.xml
index e3e9eb0d30951352c6f82dd0c54ce88dafea4a88..ed8b2a136ded92237420f6b26482b0be4c457958 100644 (file)
--- a/features/org.simantics.g2d.feature/feature.xml
+++ b/features/org.simantics.g2d.feature/feature.xml
@@ -89,6 +89,13 @@
          version="0.0.0"\r
          unpack="false"/>\r
 \r
+   <plugin\r
+         id="org.simantics.diagram.svg"\r
+         download-size="0"\r
+         install-size="0"\r
+         version="0.0.0"\r
+         unpack="false"/>\r
+\r
    <plugin\r
          id="org.simantics.basicexpression"\r
          download-size="0"\r

diff --git a/bundles/org.simantics.help.feature/.project b/features/org.simantics.help.addons.feature/.project
similarity index 83%
rename from bundles/org.simantics.help.feature/.project
rename to features/org.simantics.help.addons.feature/.project
index 5f32fab93fcac9a613e81620a466caa937b869c9..13c48262b52e4c93eb992e3a9576535167427d13 100644 (file)
--- a/bundles/org.simantics.help.feature/.project
+++ b/features/org.simantics.help.addons.feature/.project
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>\r
 <projectDescription>\r
-       <name>org.simantics.help.feature</name>\r
+       <name>org.simantics.help.addons.feature</name>\r
        <comment></comment>\r
        <projects>\r
        </projects>\r

diff --git a/features/org.simantics.help.addons.feature/build.properties b/features/org.simantics.help.addons.feature/build.properties
new file mode 100644 (file)
index 0000000..82ab19c
--- /dev/null
+++ b/features/org.simantics.help.addons.feature/build.properties
@@ -0,0 +1 @@
+bin.includes = feature.xml\r

diff --git a/features/org.simantics.help.addons.feature/feature.xml b/features/org.simantics.help.addons.feature/feature.xml
new file mode 100644 (file)
index 0000000..d9c4dc5
--- /dev/null
+++ b/features/org.simantics.help.addons.feature/feature.xml
@@ -0,0 +1,72 @@
+<?xml version="1.0" encoding="UTF-8"?>\r
+<feature\r
+      id="org.simantics.help.addons"\r
+      label="Simantics Help Add-on Features"\r
+      version="1.25.0.qualifier"\r
+      provider-name="Semantum Oy">\r
+\r
+   <description url="http://www.example.com/description">\r
+      [Enter Feature Description here.]\r
+   </description>\r
+\r
+   <copyright url="http://www.example.com/copyright">\r
+      [Enter Copyright Description here.]\r
+   </copyright>\r
+\r
+   <license url="http://www.example.com/license">\r
+      [Enter License Description here.]\r
+   </license>\r
+\r
+   <includes\r
+         id="org.simantics.help"\r
+         version="0.0.0"/>\r
+\r
+   <plugin\r
+         id="org.simantics.help.base"\r
+         download-size="0"\r
+         install-size="0"\r
+         version="0.0.0"\r
+         unpack="false"/>\r
+\r
+   <plugin\r
+         id="org.simantics.help.core"\r
+         download-size="0"\r
+         install-size="0"\r
+         version="0.0.0"\r
+         unpack="false"/>\r
+\r
+   <plugin\r
+         id="org.simantics.help.files"\r
+         download-size="0"\r
+         install-size="0"\r
+         version="0.0.0"/>\r
+\r
+   <plugin\r
+         id="org.simantics.help.ontology"\r
+         download-size="0"\r
+         install-size="0"\r
+         version="0.0.0"\r
+         unpack="false"/>\r
+\r
+   <plugin\r
+         id="org.simantics.help.ui"\r
+         download-size="0"\r
+         install-size="0"\r
+         version="0.0.0"\r
+         unpack="false"/>\r
+\r
+   <plugin\r
+         id="org.apache.pdfbox"\r
+         download-size="0"\r
+         install-size="0"\r
+         version="0.0.0"\r
+         unpack="false"/>\r
+\r
+   <plugin\r
+         id="org.apache.pdfbox.fontbox"\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.sdk.feature/feature.xml b/features/org.simantics.sdk.feature/feature.xml
index ed48ad311a546fd0dc75fbfefff77bcbc22d8e16..3f04c136f8590e673e0d22811ba793546314b7aa 100644 (file)
--- a/features/org.simantics.sdk.feature/feature.xml
+++ b/features/org.simantics.sdk.feature/feature.xml
@@ -60,6 +60,10 @@
          id="org.simantics.db.client"\r
          version="0.0.0"/>\r
 \r
+   <includes\r
+         id="org.simantics.acorn.feature"\r
+         version="0.0.0"/>\r
+\r
    <includes\r
          id="org.simantics.layer0"\r
          version="0.0.0"/>\r
@@ -92,6 +96,10 @@
          id="org.simantics.browsing.ui"\r
          version="0.0.0"/>\r
 \r
+   <includes\r
+         id="org.simantics.browsing.ui.nattable.feature"\r
+         version="0.0.0"/>\r
+\r
    <includes\r
          id="org.simantics.platform.ui"\r
          version="0.0.0"/>\r
@@ -107,7 +115,7 @@
    <includes\r
          id="org.simantics.views.swt.client.feature"\r
          version="0.0.0"/>\r
-
+\r
    <includes\r
          id="org.simantics.views.swt.feature"\r
          version="0.0.0"/>\r
@@ -148,10 +156,26 @@
          id="org.simantics.help"\r
          version="0.0.0"/>\r
 \r
+   <includes\r
+         id="org.simantics.help.addons"\r
+         version="0.0.0"/>\r
+\r
    <includes\r
          id="org.simantics.document.linking"\r
          version="0.0.0"/>\r
 \r
+   <includes\r
+         id="org.simantics.tests.modelled.feature"\r
+         version="0.0.0"/>\r
+\r
+   <includes\r
+         id="org.simantics.tests.modelled.ui.feature"\r
+         version="0.0.0"/>\r
+\r
+   <includes\r
+         id="org.simantics.desktop"\r
+         version="0.0.0"/>\r
+\r
    <plugin\r
          id="org.simantics.fileimport"\r
          download-size="0"\r
@@ -166,4 +190,25 @@
          version="0.0.0"\r
          unpack="false"/>\r
 \r
+   <plugin\r
+         id="org.simantics.backup.ontology"\r
+         download-size="0"\r
+         install-size="0"\r
+         version="0.0.0"\r
+         unpack="false"/>\r
+\r
+   <plugin\r
+         id="org.simantics.backup.db"\r
+         download-size="0"\r
+         install-size="0"\r
+         version="0.0.0"\r
+         unpack="false"/>\r
+\r
+   <plugin\r
+         id="org.apache.batik"\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.spreadsheet.feature/feature.xml b/features/org.simantics.spreadsheet.feature/feature.xml
index 7e922e19e0fd88aef9080d690dc1d73d33a3e27c..3f0f8654e10ae1462330153b9a681668a14cf189 100644 (file)
--- a/features/org.simantics.spreadsheet.feature/feature.xml
+++ b/features/org.simantics.spreadsheet.feature/feature.xml
@@ -118,4 +118,11 @@ 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.simantics.spreadsheet.fileimport"\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.tests.modelled.feature/feature.xml b/features/org.simantics.tests.modelled.feature/feature.xml
index 780d5dc6ce9e041108dccee3476a473950a08184..820439dc22c727d26a4948567c41b5ceec8a5b4d 100644 (file)
--- a/features/org.simantics.tests.modelled.feature/feature.xml
+++ b/features/org.simantics.tests.modelled.feature/feature.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>\r
 <feature\r
-      id="org.simantics.tests.feature"\r
-      label="Simantics Tests Feature"\r
+      id="org.simantics.tests.modelled.feature"\r
+      label="Simantics Modelled Tests Feature"\r
       version="1.0.0.qualifier"\r
       provider-name="Semantum Oy">\r
 \r

diff --git a/features/org.simantics.tests.modelled.ui.feature/feature.xml b/features/org.simantics.tests.modelled.ui.feature/feature.xml
index ae4c6981d8d278fea4312f29d33decb527c4b8e3..6c2b546080b0ab3af2867a673209487f6d4bb884 100644 (file)
--- a/features/org.simantics.tests.modelled.ui.feature/feature.xml
+++ b/features/org.simantics.tests.modelled.ui.feature/feature.xml
@@ -1,8 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>\r
 <feature\r
-      id="org.simantics.tests.ui.feature"\r
-      label="Simantics Tests UI Feature"\r
-      version="1.0.0.qualifier">\r
+      id="org.simantics.tests.modelled.ui.feature"\r
+      label="Simantics Modelled Tests UI Feature"\r
+      version="1.0.0.qualifier"\r
+      provider-name="Semantum Oy">\r
 \r
    <description url="http://www.example.com/description">\r
       [Enter Feature Description here.]\r

diff --git a/features/pom.xml b/features/pom.xml
index 6d5450ad890f103177548e1fc4ee7c0e00ea1bb4..5534d183279b083a9c7fbab0df6e78cc35a5a76a 100644 (file)
--- a/features/pom.xml
+++ b/features/pom.xml
@@ -31,6 +31,7 @@
                   <!-- 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.batik"/>\r
                   <plugin id="org.apache.poi"/>\r
 \r
                   <plugin id="org.eclipse.core.filesystem.aix.ppc"/>\r
@@ -60,6 +61,7 @@
                   <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
+                  <plugin id="org.simantics.help.files"/>\r
 \r
                   <feature id="org.apache.poi.feature"/>\r
                   <feature id="org.eclipse.ecf.core.feature"/>\r
@@ -101,10 +103,12 @@
         <module>org.jfree.feature</module>\r
         <module>org.simantics.acorn.feature</module>\r
         <module>org.simantics.browsing.ui.feature</module>\r
+        <module>org.simantics.browsing.ui.nattable.feature</module>\r
         <module>org.simantics.charts.feature</module>\r
         <module>org.simantics.data.feature</module>\r
         <module>org.simantics.db.client.feature</module>\r
         <module>org.simantics.db.services.feature</module>\r
+        <module>org.simantics.desktop.feature</module>\r
         <module>org.simantics.document.base.feature</module>\r
         <module>org.simantics.document.linking.feature</module>\r
         <module>org.simantics.document.swt.feature</module>\r
@@ -113,6 +117,7 @@
         <module>org.simantics.export.feature</module>\r
         <module>org.simantics.g2d.feature</module>\r
         <module>org.simantics.help.feature</module>\r
+        <module>org.simantics.help.addons.feature</module>\r
         <module>org.simantics.image.feature</module>\r
         <module>org.simantics.issues.feature</module>\r
         <module>org.simantics.issues.ui.feature</module>\r
@@ -131,6 +136,8 @@
         <module>org.simantics.spreadsheet.ui.feature</module>\r
         <module>org.simantics.structural.feature</module>\r
         <module>org.simantics.team.feature</module>\r
+        <module>org.simantics.tests.modelled.feature</module>\r
+        <module>org.simantics.tests.modelled.ui.feature</module>\r
         <module>org.simantics.ui.workbench.feature</module>\r
         <module>org.simantics.utils.feature</module>\r
         <module>org.simantics.utils.ui.feature</module>\r

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
index ac4aafb613abb60564a0eac7c4fabeaad68253a0..5e9ecc8e31be5c22cb467c9ec8dca8e2b90249eb 100644 (file)
--- 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
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<?pde version="3.8"?><target name="Eclipse Mars.2" sequenceNumber="220">
+<?pde version="3.8"?><target name="Eclipse Mars.2" sequenceNumber="222">
 <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"/>
@@ -183,6 +183,7 @@
 </location>
 <location includeAllPlatforms="true" includeConfigurePhase="false" includeMode="slicer" includeSource="true" type="InstallableUnit">
 <unit id="org.apache.poi.feature.feature.group" version="3.15.0.b0002"/>
+<unit id="org.apache.batik" version="1.8.0.201611220734"/>
 <repository location="http://www.simantics.org/download/master/external-components/manual"/>
 </location>
 <location includeAllPlatforms="true" includeConfigurePhase="false" includeMode="slicer" includeSource="true" type="InstallableUnit">

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 445f91ea367e5c2a58c4f4d9fac35a9d6825ef2a..2d9a3d3bb8d0699d8f5c8e80f8daa64a60d0ec9b 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
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<?pde version="3.8"?><target name="Eclipse Mars.2" sequenceNumber="220">
+<?pde version="3.8"?><target name="Eclipse Mars.2" sequenceNumber="222">
 <locations>
 <location includeAllPlatforms="true" includeConfigurePhase="false" includeMode="slicer" includeSource="true" type="InstallableUnit">
 <unit id="org.objectweb.asm.xml.source" version="5.0.1.v201404251740"/>
@@ -200,6 +200,7 @@
 </location>
 <location includeAllPlatforms="true" includeConfigurePhase="false" includeMode="slicer" includeSource="true" type="InstallableUnit">
 <unit id="org.apache.poi.feature.feature.group" version="3.15.0.b0002"/>
+<unit id="org.apache.batik" version="1.8.0.201611220734"/>
 <repository location="http://www.simantics.org/download/master/external-components/manual"/>
 </location>
 </locations>