From: Miro Richard Eklund Date: Wed, 9 Aug 2017 06:53:38 +0000 (+0300) Subject: Merge branch 'master' into private/eclipse-4.7 X-Git-Tag: v1.31.0~264 X-Git-Url: https://gerrit.simantics.org/r/gitweb?a=commitdiff_plain;h=6f11a60dee43d620d500c0cf5af34a1d91c80a8b;hp=4b5b16eec880434af849ddd6522332884bfb5538;p=simantics%2Fplatform.git Merge branch 'master' into private/eclipse-4.7 Resolved Conflicts: releng/org.simantics.sdk.build.targetdefinition/simantics.target refs #7358 Change-Id: Idefea4e4c60de59664904bdd0a2a0a517af8db4c --- diff --git a/.project b/.project index fb77e3820..4b7d21c7e 100644 --- a/.project +++ b/.project @@ -5,7 +5,13 @@ + + org.eclipse.m2e.core.maven2Builder + + + + org.eclipse.m2e.core.maven2Nature diff --git a/bundles/org.simantics.browsing.ui.platform/src/org/simantics/browsing/ui/platform/PageBookView.java b/bundles/org.simantics.browsing.ui.platform/src/org/simantics/browsing/ui/platform/PageBookView.java index e6f027a73..54da13baa 100644 --- a/bundles/org.simantics.browsing.ui.platform/src/org/simantics/browsing/ui/platform/PageBookView.java +++ b/bundles/org.simantics.browsing.ui.platform/src/org/simantics/browsing/ui/platform/PageBookView.java @@ -17,6 +17,7 @@ import java.util.Map; import java.util.Set; import org.eclipse.core.commands.common.EventManager; +import org.eclipse.core.runtime.Adapters; import org.eclipse.core.runtime.Platform; import org.eclipse.jface.action.IAction; import org.eclipse.jface.util.IPropertyChangeListener; @@ -608,7 +609,7 @@ public abstract class PageBookView extends ViewPart implements IPartListener { public Object getAdapter(Class key) { // delegate to the current page, if supported IPage page = getCurrentPage(); - Object adapter = Util.getAdapter(page, key); + Object adapter = Adapters.adapt(page, key); if (adapter != null) { return adapter; } diff --git a/bundles/org.simantics.browsing.ui.swt/META-INF/MANIFEST.MF b/bundles/org.simantics.browsing.ui.swt/META-INF/MANIFEST.MF index 4eaa04be3..28233b62d 100644 --- a/bundles/org.simantics.browsing.ui.swt/META-INF/MANIFEST.MF +++ b/bundles/org.simantics.browsing.ui.swt/META-INF/MANIFEST.MF @@ -15,7 +15,9 @@ Require-Bundle: org.simantics.utils.thread.swt;bundle-version="1.0.0", org.eclipse.ui.forms;bundle-version="3.4.1", com.lowagie.text;bundle-version="2.1.5", org.eclipse.e4.core.contexts;bundle-version="1.4.0", - org.slf4j.api;bundle-version="1.7.20" + org.slf4j.api;bundle-version="1.7.20", + org.eclipse.mylyn.wikitext;bundle-version="3.0.6", + org.eclipse.mylyn.wikitext.mediawiki;bundle-version="3.0.6" Bundle-RequiredExecutionEnvironment: JavaSE-1.8 Export-Package: org.simantics.browsing.ui.swt, org.simantics.browsing.ui.swt.contentassist, diff --git a/bundles/org.simantics.browsing.ui.swt/src/org/simantics/browsing/ui/swt/TabbedPropertyPage.java b/bundles/org.simantics.browsing.ui.swt/src/org/simantics/browsing/ui/swt/TabbedPropertyPage.java index 81e089848..dd5545716 100644 --- a/bundles/org.simantics.browsing.ui.swt/src/org/simantics/browsing/ui/swt/TabbedPropertyPage.java +++ b/bundles/org.simantics.browsing.ui.swt/src/org/simantics/browsing/ui/swt/TabbedPropertyPage.java @@ -27,6 +27,7 @@ import java.util.ArrayList; import java.util.List; import org.eclipse.core.commands.util.Tracing; +import org.eclipse.core.runtime.Adapters; import org.eclipse.core.runtime.Assert; import org.eclipse.core.runtime.ISafeRunnable; import org.eclipse.core.runtime.SafeRunner; @@ -1001,7 +1002,7 @@ public abstract class TabbedPropertyPage extends ViewPart { // see bug 138823 - prevent some subclasses from causing // an infinite loop if (innerEditor != null && innerEditor != this) { - result = Util.getAdapter(innerEditor, adapter); + result = Adapters.adapt(innerEditor, adapter); } } return result; diff --git a/bundles/org.simantics.browsing.ui.swt/src/org/simantics/browsing/ui/swt/widgets/WikiBrowser.java b/bundles/org.simantics.browsing.ui.swt/src/org/simantics/browsing/ui/swt/widgets/WikiBrowser.java index 270958f9e..3936893bc 100644 --- a/bundles/org.simantics.browsing.ui.swt/src/org/simantics/browsing/ui/swt/widgets/WikiBrowser.java +++ b/bundles/org.simantics.browsing.ui.swt/src/org/simantics/browsing/ui/swt/widgets/WikiBrowser.java @@ -11,7 +11,7 @@ *******************************************************************************/ package org.simantics.browsing.ui.swt.widgets; -import org.eclipse.mylyn.wikitext.core.parser.MarkupParser; +import org.eclipse.mylyn.wikitext.parser.MarkupParser; import org.eclipse.swt.browser.Browser; import org.eclipse.swt.widgets.Composite; import org.eclipse.swt.widgets.Control; diff --git a/bundles/org.simantics.desktop.ui/META-INF/MANIFEST.MF b/bundles/org.simantics.desktop.ui/META-INF/MANIFEST.MF index 28c6e2018..27e7007ed 100644 --- a/bundles/org.simantics.desktop.ui/META-INF/MANIFEST.MF +++ b/bundles/org.simantics.desktop.ui/META-INF/MANIFEST.MF @@ -1,4 +1,4 @@ -Manifest-Version: 1.0 +Manifest-Version: 1.0 Bundle-ManifestVersion: 2 Bundle-Name: Simantics Desktop UI Bundle-SymbolicName: org.simantics.desktop.ui;singleton:=true @@ -6,9 +6,9 @@ Bundle-Version: 1.0.0.qualifier Bundle-Activator: org.simantics.desktop.ui.internal.Activator Bundle-Vendor: Semantum Oy Require-Bundle: org.simantics.workbench;bundle-version="1.5.1", - org.eclipse.epp.mpc.core;bundle-version="1.1.1", - org.eclipse.epp.mpc.help.ui;bundle-version="1.1.1", - org.eclipse.epp.mpc.ui;bundle-version="1.1.1", + org.eclipse.epp.mpc.core;bundle-version="1.6.0", + org.eclipse.epp.mpc.help.ui;bundle-version="1.6.0", + org.eclipse.epp.mpc.ui;bundle-version="1.6.0", org.eclipse.ui.browser;bundle-version="3.3.100", org.simantics.platform.ui.ontology;bundle-version="1.0.0", org.simantics.spreadsheet.ontology;bundle-version="1.2.0", @@ -16,6 +16,8 @@ Require-Bundle: org.simantics.workbench;bundle-version="1.5.1", org.simantics.selectionview;bundle-version="1.0.0", org.eclipse.e4.ui.model.workbench;bundle-version="1.1.100.v20150407-1430", org.simantics.spreadsheet.graph, - org.simantics.spreadsheet;bundle-version="1.1.0" + org.simantics.spreadsheet;bundle-version="1.1.0", + org.eclipse.ui.intro;bundle-version="3.5.100", + org.eclipse.ui.intro.quicklinks;bundle-version="1.0.100" Bundle-RequiredExecutionEnvironment: JavaSE-1.8 Bundle-ActivationPolicy: lazy diff --git a/bundles/org.simantics.document/META-INF/MANIFEST.MF b/bundles/org.simantics.document/META-INF/MANIFEST.MF index 44e4db9dc..b39033119 100644 --- a/bundles/org.simantics.document/META-INF/MANIFEST.MF +++ b/bundles/org.simantics.document/META-INF/MANIFEST.MF @@ -10,12 +10,14 @@ Require-Bundle: org.simantics;bundle-version="1.0.0", org.simantics.scenegraph.loader;bundle-version="1.0.0", org.simantics.views;bundle-version="1.1.0", org.simantics.scenegraph.ontology;bundle-version="1.0.0", - org.simantics.wiki.ui;bundle-version="1.1.0", org.simantics.export.core;bundle-version="1.0.0", org.simantics.utils.ui;bundle-version="1.1.0", org.simantics.image2.ontology;bundle-version="1.2.0", org.simantics.graphfile.ontology;bundle-version="0.1.0", - org.simantics.graphfile;bundle-version="0.1.0" + org.simantics.graphfile;bundle-version="0.1.0", + org.simantics.wiki.ui;bundle-version="1.1.0", + org.eclipse.mylyn.wikitext;bundle-version="3.0.6", + org.eclipse.mylyn.wikitext.mediawiki;bundle-version="3.0.6" Export-Package: org.simantics.document, org.simantics.document.export, org.simantics.document.function, diff --git a/bundles/org.simantics.document/src/org/simantics/document/Exportable.java b/bundles/org.simantics.document/src/org/simantics/document/Exportable.java index a6dd790de..0908fd0f4 100644 --- a/bundles/org.simantics.document/src/org/simantics/document/Exportable.java +++ b/bundles/org.simantics.document/src/org/simantics/document/Exportable.java @@ -18,8 +18,8 @@ import java.io.IOException; import java.io.InputStream; import java.net.URL; -import org.eclipse.mylyn.wikitext.core.parser.MarkupParser; -import org.eclipse.mylyn.wikitext.mediawiki.core.MediaWikiLanguage; +import org.eclipse.mylyn.wikitext.mediawiki.MediaWikiLanguage; +import org.eclipse.mylyn.wikitext.parser.MarkupParser; import org.simantics.Simantics; import org.simantics.db.ReadGraph; import org.simantics.db.Resource; diff --git a/bundles/org.simantics.document/src/org/simantics/document/export/ExportWikiPdf.java b/bundles/org.simantics.document/src/org/simantics/document/export/ExportWikiPdf.java index a74a2a6d3..5c237d9dd 100644 --- a/bundles/org.simantics.document/src/org/simantics/document/export/ExportWikiPdf.java +++ b/bundles/org.simantics.document/src/org/simantics/document/export/ExportWikiPdf.java @@ -5,8 +5,8 @@ import java.util.Collections; import java.util.List; import org.eclipse.core.runtime.IProgressMonitor; -import org.eclipse.mylyn.wikitext.core.parser.MarkupParser; -import org.eclipse.mylyn.wikitext.mediawiki.core.MediaWikiLanguage; +import org.eclipse.mylyn.wikitext.parser.MarkupParser; +import org.simantics.wiki.ui.language.MediaWikiLanguage; import org.osgi.service.prefs.Preferences; import org.simantics.databoard.binding.mutable.Variant; import org.simantics.databoard.type.RecordType; diff --git a/bundles/org.simantics.graphfile/src/org/simantics/graphfile/hack/SystemProject.java b/bundles/org.simantics.graphfile/src/org/simantics/graphfile/hack/SystemProject.java index ac07e10ab..704209961 100644 --- a/bundles/org.simantics.graphfile/src/org/simantics/graphfile/hack/SystemProject.java +++ b/bundles/org.simantics.graphfile/src/org/simantics/graphfile/hack/SystemProject.java @@ -832,5 +832,11 @@ public class SystemProject implements IProject{ return false; } + @Override + public void clearCachedDynamicReferences() { + // TODO Auto-generated method stub + + } + } diff --git a/bundles/org.simantics.help.core/META-INF/MANIFEST.MF b/bundles/org.simantics.help.core/META-INF/MANIFEST.MF index f1fbea12c..0382bd087 100644 --- a/bundles/org.simantics.help.core/META-INF/MANIFEST.MF +++ b/bundles/org.simantics.help.core/META-INF/MANIFEST.MF @@ -15,8 +15,8 @@ Require-Bundle: org.eclipse.ui, winterwell.markdown, org.simantics, org.simantics.document.base.ontology, - org.eclipse.mylyn.wikitext.core, - org.eclipse.mylyn.wikitext.mediawiki.core + org.eclipse.mylyn.wikitext;bundle-version="3.0.6", + org.eclipse.mylyn.wikitext.mediawiki;bundle-version="3.0.6" Bundle-RequiredExecutionEnvironment: JavaSE-1.8 Bundle-ActivationPolicy: lazy Export-Package: org.simantics.help.core diff --git a/bundles/org.simantics.help.core/src/org/simantics/help/core/HelpUtils.java b/bundles/org.simantics.help.core/src/org/simantics/help/core/HelpUtils.java index 7e562d7f3..b4e33c8af 100644 --- a/bundles/org.simantics.help.core/src/org/simantics/help/core/HelpUtils.java +++ b/bundles/org.simantics.help.core/src/org/simantics/help/core/HelpUtils.java @@ -18,9 +18,9 @@ import java.util.Map; import java.util.Map.Entry; import java.util.TreeMap; -import org.eclipse.mylyn.wikitext.core.parser.MarkupParser; -import org.eclipse.mylyn.wikitext.core.parser.builder.HtmlDocumentBuilder; -import org.eclipse.mylyn.wikitext.mediawiki.core.MediaWikiLanguage; +import org.eclipse.mylyn.wikitext.parser.MarkupParser; +import org.eclipse.mylyn.wikitext.parser.builder.HtmlDocumentBuilder; +import org.eclipse.mylyn.wikitext.mediawiki.MediaWikiLanguage; import org.eclipse.ui.PlatformUI; import org.eclipse.ui.help.IWorkbenchHelpSystem; import org.simantics.databoard.Bindings; diff --git a/bundles/org.simantics.views.swt.client/META-INF/MANIFEST.MF b/bundles/org.simantics.views.swt.client/META-INF/MANIFEST.MF index fc6ba878d..525cac953 100644 --- a/bundles/org.simantics.views.swt.client/META-INF/MANIFEST.MF +++ b/bundles/org.simantics.views.swt.client/META-INF/MANIFEST.MF @@ -15,7 +15,9 @@ Require-Bundle: org.eclipse.core.runtime, org.simantics;bundle-version="1.0.0", org.simantics.browsing.ui.swt;bundle-version="1.1.0", org.simantics.scenegraph.loader;bundle-version="1.0.0", - org.simantics.utils.thread.swt;bundle-version="1.1.0" + org.simantics.utils.thread.swt;bundle-version="1.1.0", + org.eclipse.mylyn.wikitext;bundle-version="3.0.6", + org.eclipse.mylyn.wikitext.mediawiki;bundle-version="3.0.6" Bundle-ActivationPolicy: lazy Bundle-RequiredExecutionEnvironment: JavaSE-1.8 Export-Package: org.simantics.views.swt.client.base, diff --git a/bundles/org.simantics.views.swt.client/src/org/simantics/views/swt/client/impl/SWTWikiBrowser.java b/bundles/org.simantics.views.swt.client/src/org/simantics/views/swt/client/impl/SWTWikiBrowser.java index 20c172545..f8dd5895e 100644 --- a/bundles/org.simantics.views.swt.client/src/org/simantics/views/swt/client/impl/SWTWikiBrowser.java +++ b/bundles/org.simantics.views.swt.client/src/org/simantics/views/swt/client/impl/SWTWikiBrowser.java @@ -1,10 +1,8 @@ package org.simantics.views.swt.client.impl; -import java.io.IOException; - import org.eclipse.jface.layout.GridDataFactory; import org.eclipse.jface.layout.GridLayoutFactory; -import org.eclipse.mylyn.wikitext.core.parser.MarkupParser; +import org.eclipse.mylyn.wikitext.parser.MarkupParser; import org.eclipse.swt.browser.Browser; import org.eclipse.swt.widgets.Composite; import org.simantics.Simantics; @@ -14,9 +12,7 @@ import org.simantics.db.exception.DatabaseException; import org.simantics.db.layer0.variable.Variable; import org.simantics.db.request.Read; import org.simantics.scl.runtime.function.Function1; -import org.simantics.utils.FileUtils; import org.simantics.utils.datastructures.map.Tuple; -import org.simantics.utils.ui.BundleUtils; import org.simantics.views.swt.client.base.SingleSWTViewNode; import org.simantics.wiki.ui.SimanticsDialect; import org.simantics.wiki.ui.language.MediaWikiLanguage; diff --git a/bundles/org.simantics.views.text/META-INF/MANIFEST.MF b/bundles/org.simantics.views.text/META-INF/MANIFEST.MF index 6e60a5a19..c6646a208 100644 --- a/bundles/org.simantics.views.text/META-INF/MANIFEST.MF +++ b/bundles/org.simantics.views.text/META-INF/MANIFEST.MF @@ -9,12 +9,12 @@ Require-Bundle: org.eclipse.ui, org.eclipse.ui.editors;bundle-version="3.9.0", org.eclipse.core.runtime, org.eclipse.jface.text;bundle-version="3.10.0", - org.eclipse.mylyn.wikitext.core;bundle-version="2.7.0", - org.eclipse.mylyn.wikitext.mediawiki.core;bundle-version="2.7.0", - org.eclipse.mylyn.wikitext.ui;bundle-version="2.7.0", - org.eclipse.mylyn.wikitext.mediawiki.ui;bundle-version="2.7.0", org.simantics.views;bundle-version="1.1.0", org.simantics.views.swt;bundle-version="1.0.0", - org.simantics.views.swt.client;bundle-version="1.0.0" + org.simantics.views.swt.client;bundle-version="1.0.0", + org.eclipse.mylyn.wikitext;bundle-version="3.0.6", + org.eclipse.mylyn.wikitext.mediawiki;bundle-version="3.0.6", + org.eclipse.mylyn.wikitext.ui;bundle-version="3.0.6", + org.eclipse.mylyn.wikitext.mediawiki.ui;bundle-version="3.0.6" Bundle-RequiredExecutionEnvironment: JavaSE-1.8 Bundle-ActivationPolicy: lazy diff --git a/bundles/org.simantics.views.text/src/org/simantics/views/text/internal/SWTMarkupSourceViewer.java b/bundles/org.simantics.views.text/src/org/simantics/views/text/internal/SWTMarkupSourceViewer.java index 756dfe21a..10985f080 100644 --- a/bundles/org.simantics.views.text/src/org/simantics/views/text/internal/SWTMarkupSourceViewer.java +++ b/bundles/org.simantics.views.text/src/org/simantics/views/text/internal/SWTMarkupSourceViewer.java @@ -12,8 +12,8 @@ package org.simantics.views.text.internal; import org.eclipse.jface.text.Document; -import org.eclipse.mylyn.wikitext.core.parser.markup.MarkupLanguage; -import org.eclipse.mylyn.wikitext.mediawiki.core.MediaWikiLanguage; +import org.eclipse.mylyn.wikitext.mediawiki.MediaWikiLanguage; +import org.eclipse.mylyn.wikitext.parser.markup.MarkupLanguage; import org.eclipse.mylyn.wikitext.ui.editor.MarkupSourceViewer; import org.eclipse.mylyn.wikitext.ui.editor.MarkupSourceViewerConfiguration; import org.eclipse.mylyn.wikitext.ui.editor.ShowInTargetBridge; diff --git a/bundles/org.simantics.wiki.ui/META-INF/MANIFEST.MF b/bundles/org.simantics.wiki.ui/META-INF/MANIFEST.MF index e5b2fae20..1518bd4af 100644 --- a/bundles/org.simantics.wiki.ui/META-INF/MANIFEST.MF +++ b/bundles/org.simantics.wiki.ui/META-INF/MANIFEST.MF @@ -7,8 +7,6 @@ Bundle-Activator: org.simantics.wiki.ui.Activator Require-Bundle: org.eclipse.ui, org.eclipse.core.runtime, org.simantics.ui;bundle-version="1.0.0", - org.eclipse.mylyn.wikitext.core;bundle-version="1.5.1";visibility:=reexport, - org.eclipse.mylyn.wikitext.mediawiki.core;bundle-version="1.5.2";visibility:=reexport, com.lowagie.text;bundle-version="2.1.5";visibility:=reexport, org.simantics.layer0.utils, org.simantics.db.layer0;bundle-version="0.8.0", @@ -17,7 +15,9 @@ Require-Bundle: org.eclipse.ui, org.simantics.diagram.ontology;bundle-version="1.0.0", org.simantics.g2d;bundle-version="1.1.1", org.simantics.scenegraph.swing;bundle-version="1.0.0", - org.simantics.image2.ontology;bundle-version="1.1.0" + org.simantics.image2.ontology;bundle-version="1.1.0", + org.eclipse.mylyn.wikitext;bundle-version="3.0.6", + org.eclipse.mylyn.wikitext.mediawiki;bundle-version="3.0.6" Bundle-ActivationPolicy: lazy Bundle-RequiredExecutionEnvironment: JavaSE-1.8 Export-Package: org.simantics.wiki.ui, diff --git a/bundles/org.simantics.wiki.ui/src/org/simantics/wiki/ui/language/MediaWikiLanguage.java b/bundles/org.simantics.wiki.ui/src/org/simantics/wiki/ui/language/MediaWikiLanguage.java index 32a10ecca..2416dc939 100644 --- a/bundles/org.simantics.wiki.ui/src/org/simantics/wiki/ui/language/MediaWikiLanguage.java +++ b/bundles/org.simantics.wiki.ui/src/org/simantics/wiki/ui/language/MediaWikiLanguage.java @@ -11,12 +11,12 @@ *******************************************************************************/ package org.simantics.wiki.ui.language; -import org.eclipse.mylyn.internal.wikitext.mediawiki.core.phrase.EscapePhraseModifier; -import org.eclipse.mylyn.internal.wikitext.mediawiki.core.phrase.SimplePhraseModifier; -import org.eclipse.mylyn.wikitext.core.parser.DocumentBuilder.SpanType; -import org.eclipse.mylyn.wikitext.core.parser.markup.phrase.HtmlCommentPhraseModifier; -import org.eclipse.mylyn.wikitext.core.parser.markup.phrase.LimitedHtmlEndTagPhraseModifier; -import org.eclipse.mylyn.wikitext.core.parser.markup.phrase.LimitedHtmlStartTagPhraseModifier; +import org.eclipse.mylyn.wikitext.mediawiki.internal.phrase.EscapePhraseModifier; +import org.eclipse.mylyn.wikitext.mediawiki.internal.phrase.SimplePhraseModifier; +import org.eclipse.mylyn.wikitext.parser.DocumentBuilder.SpanType; +import org.eclipse.mylyn.wikitext.parser.markup.phrase.HtmlCommentPhraseModifier; +import org.eclipse.mylyn.wikitext.parser.markup.phrase.LimitedHtmlEndTagPhraseModifier; +import org.eclipse.mylyn.wikitext.parser.markup.phrase.LimitedHtmlStartTagPhraseModifier; /** * A markup language for MediaWiki 0) { - title = NLS.bind(IDEWorkbenchMessages.WorkbenchWindow_shellTitle, - workspaceName, title); + //IDEWorkbenchMessages.WorkbenchWindow_shellTitle == "{0} - {1}" + title = NLS.bind("{0} - {1}", workspaceName, title); } return title; diff --git a/features/org.simantics.desktop.feature/feature.xml b/features/org.simantics.desktop.feature/feature.xml index a66de8d15..59e0ec2e9 100644 --- a/features/org.simantics.desktop.feature/feature.xml +++ b/features/org.simantics.desktop.feature/feature.xml @@ -45,10 +45,6 @@ id="org.simantics.eclipsec.launcher" version="0.0.0"/> - - @@ -67,4 +63,31 @@ version="0.0.0" unpack="false"/> + + + + + + + diff --git a/features/org.simantics.desktop.product.oxygen.feature/.project b/features/org.simantics.desktop.product.oxygen.feature/.project new file mode 100644 index 000000000..cbecb48b2 --- /dev/null +++ b/features/org.simantics.desktop.product.oxygen.feature/.project @@ -0,0 +1,17 @@ + + + org.simantics.desktop.product.oxygen.feature + + + + + + org.eclipse.pde.FeatureBuilder + + + + + + org.eclipse.pde.FeatureNature + + diff --git a/features/org.simantics.desktop.product.oxygen.feature/build.properties b/features/org.simantics.desktop.product.oxygen.feature/build.properties new file mode 100644 index 000000000..64f93a9f0 --- /dev/null +++ b/features/org.simantics.desktop.product.oxygen.feature/build.properties @@ -0,0 +1 @@ +bin.includes = feature.xml diff --git a/features/org.simantics.desktop.product.oxygen.feature/feature.xml b/features/org.simantics.desktop.product.oxygen.feature/feature.xml new file mode 100644 index 000000000..f467a77ac --- /dev/null +++ b/features/org.simantics.desktop.product.oxygen.feature/feature.xml @@ -0,0 +1,103 @@ + + + + + [Enter Feature Description here.] + + + + [Enter Copyright Description here.] + + + + [Enter License Description here.] + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/features/org.simantics.help.feature/feature.xml b/features/org.simantics.help.feature/feature.xml index 78b77bff9..658c26f6c 100644 --- a/features/org.simantics.help.feature/feature.xml +++ b/features/org.simantics.help.feature/feature.xml @@ -45,20 +45,6 @@ version="0.0.0" unpack="false"/> - - - - + + + + + + + + diff --git a/features/org.simantics.rcp.feature/feature.xml b/features/org.simantics.rcp.feature/feature.xml index c1610fdc6..3a2453610 100644 --- a/features/org.simantics.rcp.feature/feature.xml +++ b/features/org.simantics.rcp.feature/feature.xml @@ -153,44 +153,6 @@ This Agreement is governed by the laws of the State of New York and the intellec version="0.0.0" unpack="false"/> - - - - - - - - - - - - - - @@ -248,22 +244,22 @@ + + + + + + diff --git a/features/org.simantics.ui.workbench.feature/feature.xml b/features/org.simantics.ui.workbench.feature/feature.xml index b234acd5c..2fb2dd544 100644 --- a/features/org.simantics.ui.workbench.feature/feature.xml +++ b/features/org.simantics.ui.workbench.feature/feature.xml @@ -271,4 +271,11 @@ version="0.0.0" unpack="false"/> + + diff --git a/features/org.simantics.wiki.ui.feature/feature.xml b/features/org.simantics.wiki.ui.feature/feature.xml index a81a21e11..d1dc4dd43 100644 --- a/features/org.simantics.wiki.ui.feature/feature.xml +++ b/features/org.simantics.wiki.ui.feature/feature.xml @@ -36,51 +36,58 @@ unpack="false"/> + + + version="0.0.0" + unpack="false"/> diff --git a/features/pom.xml b/features/pom.xml index 7c31bd537..7a9a67a3f 100644 --- a/features/pom.xml +++ b/features/pom.xml @@ -62,7 +62,9 @@ + + @@ -110,6 +112,7 @@ org.simantics.db.services.feature org.simantics.desktop.feature org.simantics.desktop.product.feature + org.simantics.desktop.product.oxygen.feature org.simantics.document.base.feature org.simantics.document.linking.feature org.simantics.document.swt.feature diff --git a/releng/org.simantics.desktop.rcp.product/simantics-desktop.product b/releng/org.simantics.desktop.rcp.product/simantics-desktop.product index f68f507c0..f3900f496 100644 --- a/releng/org.simantics.desktop.rcp.product/simantics-desktop.product +++ b/releng/org.simantics.desktop.rcp.product/simantics-desktop.product @@ -39,7 +39,6 @@ org.eclipse.e4.ui.css.theme.e4_classic - @@ -58,16 +57,9 @@ org.eclipse.e4.ui.css.theme.e4_classic + - - - - - - - - @@ -76,4 +68,11 @@ org.eclipse.e4.ui.css.theme.e4_classic + + + + + + + diff --git a/releng/org.simantics.sdk.build.p2.site/pom.xml b/releng/org.simantics.sdk.build.p2.site/pom.xml index a42b854b1..b5a9dd167 100644 --- a/releng/org.simantics.sdk.build.p2.site/pom.xml +++ b/releng/org.simantics.sdk.build.p2.site/pom.xml @@ -306,6 +306,16 @@ org.mozilla:rhino:1.7.7.1 true + + + net.java.dev.jna:jna:4.1.0 + true + + + + net.java.dev.jna:jna-platform:4.1.0 + true + net.java.dev.jna:jna:4.3.0 true 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 9a6325344..d99e6fd4f 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 @@ -1,102 +1,138 @@ - + - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + - - + + + + + + + + + + + - - - - - - - - - - - - - - - - + + + + @@ -107,8 +143,8 @@ - - + + @@ -140,26 +176,28 @@ - + + + + + + - - - @@ -168,49 +206,53 @@ - - - - + + + + + + + + - - + + - - - - + + + + + + + + + + - - - - - - @@ -219,26 +261,22 @@ - - - - - - - + + + + - - + - + - - + + @@ -251,28 +289,18 @@ - - - - - - - - - - - - + + - + - - + + diff --git a/releng/org.simantics.sdk.build.targetdefinition/org.simantics.sdk.build.targetdefinition.tpd b/releng/org.simantics.sdk.build.targetdefinition/org.simantics.sdk.build.targetdefinition.tpd index a4149954e..1fc2f710c 100644 --- a/releng/org.simantics.sdk.build.targetdefinition/org.simantics.sdk.build.targetdefinition.tpd +++ b/releng/org.simantics.sdk.build.targetdefinition/org.simantics.sdk.build.targetdefinition.tpd @@ -1,6 +1,304 @@ -target "Eclipse Mars.2" +target "Eclipse Oxygen" with source allEnvironments -// TODO +location "http://www.simantics.org/update/tools/orbit/downloads/drops/R20170516192513" { + com.google.guava + com.google.guava.source + org.jsoup + org.jsoup.source + org.objectweb.asm + org.objectweb.asm.analysis + org.objectweb.asm.analysis.source + org.objectweb.asm.commons + org.objectweb.asm.commons.source + org.objectweb.asm.source + org.objectweb.asm.tree + org.objectweb.asm.tree.source + org.objectweb.asm.util + org.objectweb.asm.util.source + org.objectweb.asm.xml + org.objectweb.asm.xml.source +} +location "http://www.simantics.org/update/oxygen/" { + javax.xml + org.apache.commons.httpclient + org.apache.commons.httpclient.source + org.apache.xerces + org.apache.xml.resolver + org.apache.xml.serializer + org.eclipse.draw2d.feature.group + org.eclipse.emf.sdk.feature.group + org.eclipse.epp.mpc.feature.group + org.eclipse.epp.mpc.source.feature.group + org.eclipse.mylyn.commons.feature.group + org.eclipse.mylyn.commons.identity.feature.group + org.eclipse.mylyn.commons.net + org.eclipse.mylyn.commons.net.source + org.eclipse.mylyn.commons.notifications.feature.group + org.eclipse.mylyn.commons.repositories.core + org.eclipse.mylyn.commons.repositories.core.source + org.eclipse.mylyn.commons.repositories.ui + org.eclipse.mylyn.commons.repositories.ui.source + org.eclipse.mylyn.context_feature.feature.group + org.eclipse.mylyn.monitor.feature.group + org.eclipse.mylyn.tasks.core + org.eclipse.mylyn.tasks.core.source + org.eclipse.mylyn.tasks.ui + org.eclipse.mylyn.tasks.ui.source + org.eclipse.mylyn.wikitext_feature.feature.group + org.eclipse.mylyn.wikitext.ant.source + org.eclipse.mylyn.wikitext.mediawiki.source + org.eclipse.mylyn.wikitext.osgi.source + org.eclipse.mylyn.wikitext.source + org.eclipse.userstorage.feature.group + org.eclipse.userstorage.oauth + org.eclipse.userstorage.oauth.source + org.eclipse.userstorage.source + org.eclipse.userstorage.ui.source +} + +location "http://www.simantics.org/update/eclipse/updates/4.7/" { + org.apache.httpcomponents.httpclient + org.apache.httpcomponents.httpclient.source + org.apache.httpcomponents.httpcore + org.apache.httpcomponents.httpcore.source + org.eclipse.core.runtime.feature.feature.group + org.eclipse.e4.core.tools.feature.feature.group + org.eclipse.e4.core.tools.feature.source.feature.group + org.eclipse.ecf.core.feature.feature.group + org.eclipse.ecf.core.feature.source.feature.group + org.eclipse.ecf.core.ssl.feature.feature.group + org.eclipse.ecf.core.ssl.feature.source.feature.group + org.eclipse.ecf.filetransfer.feature.feature.group + org.eclipse.ecf.filetransfer.feature.source.feature.group + org.eclipse.ecf.filetransfer.httpclient4.feature.feature.group + org.eclipse.ecf.filetransfer.httpclient4.feature.source.feature.group + org.eclipse.ecf.filetransfer.httpclient4.ssl.feature.feature.group + org.eclipse.ecf.filetransfer.httpclient4.ssl.feature.source.feature.group + org.eclipse.ecf.filetransfer.ssl.feature.feature.group + org.eclipse.ecf.filetransfer.ssl.feature.source.feature.group + org.eclipse.equinox.p2.discovery.feature.feature.group + org.eclipse.equinox.sdk.feature.group + org.eclipse.help.feature.group + org.eclipse.help.source.feature.group + org.eclipse.platform.feature.group + org.eclipse.platform.source.feature.group + org.eclipse.rcp.feature.group + org.eclipse.rcp.source.feature.group + org.eclipse.releng.tools.feature.group + org.eclipse.sdk.ide + org.eclipse.swt.tools.feature.feature.group +} + +location "http://download.eclipse.org/nebula/releases/latest" { + org.eclipse.nebula.cwt.feature.feature.group + org.eclipse.nebula.effects.stw.feature.feature.group + org.eclipse.nebula.examples.feature.feature.group + org.eclipse.nebula.examples.release.feature.feature.group + org.eclipse.nebula.feature.feature.group + org.eclipse.nebula.visualization.feature.feature.group + org.eclipse.nebula.widgets.cdatetime.feature.feature.group + org.eclipse.nebula.widgets.compositetable.feature.feature.group + org.eclipse.nebula.widgets.gallery.feature.feature.group + org.eclipse.nebula.widgets.ganttchart.feature.feature.group + org.eclipse.nebula.widgets.grid.feature.feature.group + org.eclipse.nebula.widgets.oscilloscope.feature.feature.group + org.eclipse.nebula.widgets.paperclips.feature.feature.group + org.eclipse.nebula.widgets.pgroup.feature.feature.group + org.eclipse.nebula.widgets.pshelf.css.feature.feature.group + org.eclipse.nebula.widgets.pshelf.feature.feature.group + org.eclipse.nebula.widgets.richtext.feature.feature.group + org.eclipse.nebula.widgets.tablecombo.feature.feature.group + org.eclipse.nebula.widgets.xviewer.feature.feature.group +} + +location "http://download.eclipse.org/nattable/releases/1.5.0/repository" { + org.eclipse.nebula.widgets.nattable.core.feature.feature.group + org.eclipse.nebula.widgets.nattable.core.source.feature.feature.group + org.eclipse.nebula.widgets.nattable.extension.e4.feature.feature.group + org.eclipse.nebula.widgets.nattable.extension.e4.source.feature.feature.group + org.eclipse.nebula.widgets.nattable.extension.glazedlists.feature.feature.group + org.eclipse.nebula.widgets.nattable.extension.glazedlists.source.feature.feature.group + org.eclipse.nebula.widgets.nattable.extension.nebula.feature.feature.group + org.eclipse.nebula.widgets.nattable.extension.nebula.source.feature.feature.group + org.eclipse.nebula.widgets.nattable.extension.poi.feature.feature.group + org.eclipse.nebula.widgets.nattable.extension.poi.source.feature.feature.group +} + +location "http://download.eclipse.org/e4/snapshots/org.eclipse.e4.tools/latest/" { + org.eclipse.e4.tools.spies.feature.feature.group +} + +location "http://www.simantics.org/download/private/eclipse-4.7/external-components/maven" { + bouncycastle.bcmail-jdk14 + bouncycastle.bcprov-jdk14 + ch.qos.logback.classic + ch.qos.logback.classic.source + ch.qos.logback.core + ch.qos.logback.core.source + com.esotericsoftware.kryo + com.esotericsoftware.kryo.source + com.esotericsoftware.minlog + com.esotericsoftware.minlog.source + com.esotericsoftware.reflectasm + com.esotericsoftware.reflectasm.source + com.fasterxml.jackson.core.jackson-annotations + com.fasterxml.jackson.core.jackson-annotations.source + com.fasterxml.jackson.core.jackson-core + com.fasterxml.jackson.core.jackson-core.source + com.fasterxml.jackson.core.jackson-databind + com.fasterxml.jackson.core.jackson-databind.source + com.fasterxml.jackson.dataformat.jackson-dataformat-csv + com.fasterxml.jackson.dataformat.jackson-dataformat-csv.source + com.fasterxml.jackson.dataformat.jackson-dataformat-xml + com.fasterxml.jackson.dataformat.jackson-dataformat-xml.source + com.fasterxml.jackson.datatype.jackson-datatype-jsr310 + com.fasterxml.jackson.datatype.jackson-datatype-jsr310.source + com.fasterxml.jackson.jaxrs.jackson-jaxrs-base + com.fasterxml.jackson.jaxrs.jackson-jaxrs-base.source + com.fasterxml.jackson.jaxrs.jackson-jaxrs-json-provider + com.fasterxml.jackson.jaxrs.jackson-jaxrs-json-provider.source + com.fasterxml.jackson.module.jackson-module-jaxb-annotations + com.fasterxml.jackson.module.jackson-module-jaxb-annotations.source + com.fasterxml.woodstox.woodstox-core + com.fasterxml.woodstox.woodstox-core.source + com.github.virtuald.curvesapi + com.github.virtuald.curvesapi.source + com.healthmarketscience.jackcess + com.healthmarketscience.jackcess.source + com.koloboke.api-jdk8 + com.koloboke.api-jdk8.source + com.koloboke.compile + com.koloboke.compile.source + com.koloboke.impl-common-jdk8 + com.koloboke.impl-common-jdk8.source + com.lowagie.text + com.lowagie.text.source + com.sun.jna + com.sun.jna.platform + com.sun.jna.platform.source + com.sun.jna.source + freemarker + freemarker.source + gnu.trove3 + gnu.trove3.source + it.unimi.dsi.fastutil + it.unimi.dsi.fastutil.source + jakarta-regexp + javassist + javassist.source + javax.validation.api + javax.validation.api.source + javax.ws.rs-api + javax.ws.rs-api.source + net.jcip.annotations + net.jcip.annotations.source + net.ucanaccess + net.ucanaccess.source + org.antlr.runtime + org.antlr.runtime.source + org.apache.commons.codec + org.apache.commons.codec.source + org.apache.commons.collections + org.apache.commons.collections.source + org.apache.commons.collections4 + org.apache.commons.collections4.source + org.apache.commons.compress + org.apache.commons.compress.source + org.apache.commons.io + org.apache.commons.io.source + org.apache.commons.lang + org.apache.commons.lang.source + org.apache.commons.logging + org.apache.commons.logging.source + org.apache.commons.math3 + org.apache.commons.math3.source + org.apache.log4j + org.apache.log4j.source + org.apache.lucene4.analyzers-common + org.apache.lucene4.analyzers-common.source + org.apache.lucene4.core + org.apache.lucene4.core.source + org.apache.lucene4.queries + org.apache.lucene4.queries.source + org.apache.lucene4.queryparser + org.apache.lucene4.queryparser.source + org.apache.lucene4.sandbox + org.apache.lucene4.sandbox.source + org.apache.pdfbox + org.apache.pdfbox.fontbox + org.apache.pdfbox.fontbox.source + org.apache.pdfbox.source + org.apache.pdfbox.xmpbox + org.apache.pdfbox.xmpbox.source + org.apache.xmlbeans + org.bouncycastle.bcmail-jdk14 + org.bouncycastle.bcmail-jdk14.source + org.bouncycastle.bcprov-jdk14 + org.bouncycastle.bcprov-jdk14.source + org.bouncycastle.bctsp-jdk14 + org.bouncycastle.bctsp-jdk14.source + org.eclipse.collections.eclipse-collections + org.eclipse.collections.eclipse-collections.source + org.glassfish.hk2.api + org.glassfish.hk2.api.source + org.glassfish.hk2.external.aopalliance-repackaged + org.glassfish.hk2.external.aopalliance-repackaged.source + org.glassfish.hk2.locator + org.glassfish.hk2.locator.source + org.glassfish.hk2.osgi-resource-locator + org.glassfish.hk2.osgi-resource-locator.source + org.glassfish.hk2.utils + org.glassfish.hk2.utils.source + org.glassfish.jersey.bundles.repackaged.jersey-guava + org.glassfish.jersey.bundles.repackaged.jersey-guava.source + org.glassfish.jersey.core.jersey-common + org.glassfish.jersey.core.jersey-common.source + org.glassfish.jersey.core.jersey-server + org.glassfish.jersey.core.jersey-server.source + org.glassfish.jersey.ext.jersey-entity-filtering + org.glassfish.jersey.ext.jersey-entity-filtering.source + org.glassfish.jersey.media.jersey-media-multipart + org.glassfish.jersey.media.jersey-media-multipart.source + org.hsqldb.hsqldb + org.hsqldb.hsqldb.source + org.ini4j + org.ini4j.source + org.jboss.windup.decompiler.api.forge-addon + org.jboss.windup.decompiler.api.forge-addon.source + org.jboss.windup.decompiler.procyon + org.jboss.windup.decompiler.procyon.source + org.jboss.windup.decompiler.procyon.windup-procyon-compilertools + org.jboss.windup.decompiler.procyon.windup-procyon-compilertools.source + org.jboss.windup.decompiler.procyon.windup-procyon-core + org.jboss.windup.decompiler.procyon.windup-procyon-core.source + org.jboss.windup.decompiler.procyon.windup-procyon-reflection + org.jboss.windup.decompiler.procyon.windup-procyon-reflection.source + org.jboss.windup.utils.windup-utils.forge-addon + org.jboss.windup.utils.windup-utils.forge-addon.source + org.jdom2 + org.jdom2.source + org.jfree.jchart + org.jfree.jchart.source + org.jfree.jcommon + org.jfree.jcommon.source + org.jvnet.mimepull + org.jvnet.mimepull.source + org.mozilla.rhino + org.mozilla.rhino.source + org.objenesis + org.objenesis.source + org.slf4j.api + org.slf4j.api.source + org.supercsv + org.supercsv.source + stax2-api + stax2-api.source +} + +location "http://www.simantics.org/download/private/eclipse-4.7/external-components/manual" { + org.apache.batik + org.apache.poi.feature.feature.group +} \ No newline at end of file diff --git a/releng/org.simantics.sdk.build.targetdefinition/simantics.target b/releng/org.simantics.sdk.build.targetdefinition/simantics.target index a17c650bb..9290a8b82 100644 --- a/releng/org.simantics.sdk.build.targetdefinition/simantics.target +++ b/releng/org.simantics.sdk.build.targetdefinition/simantics.target @@ -1,272 +1,313 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/releng/org.simantics.sdk.build.targetdefinition/simantics.tpd b/releng/org.simantics.sdk.build.targetdefinition/simantics.tpd new file mode 100644 index 000000000..cb0e15abc --- /dev/null +++ b/releng/org.simantics.sdk.build.targetdefinition/simantics.tpd @@ -0,0 +1,10 @@ +target "Simantics 1.30.0 Oxygen" + +with source allEnvironments + +include "org.simantics.sdk.build.targetdefinition.tpd" + +location "http://www.simantics.org/download/private/eclipse-4.7/sdk" { + org.simantics.sdk.feature.group + org.simantics.sdk.source.feature.group +}