Skip to content
This repository has been archived by the owner on Oct 7, 2021. It is now read-only.

Commit

Permalink
Merge pull request #180 from eclipse/erwin/enh/145/update-site
Browse files Browse the repository at this point in the history
#145: add feature deps, lazy start in manifests + p2.inf files
  • Loading branch information
erwindl0 committed Oct 4, 2016
2 parents 520ae1a + 69aa3fa commit 57b2ec9
Show file tree
Hide file tree
Showing 18 changed files with 87 additions and 2 deletions.
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
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:
Erwin De Ley - initial API and implementation and/or initial documentation
-->
Expand All @@ -27,6 +27,25 @@
%license
</license>

<url>
<discovery label="Orbit" url="http://download.eclipse.org/tools/orbit/downloads/drops/S20160916162009/repository/"/>
<discovery label="Eclipse Neon" url="http://download.eclipse.org/releases/neon/"/>
</url>

<requires>
<import plugin="org.eclipse.swt"/>
<import plugin="org.eclipse.draw2d"/>
<import plugin="org.eclipse.jface"/>
<import plugin="org.eclipse.core.runtime"/>
<import plugin="org.apache.commons.lang"/>
<import plugin="org.eclipse.triquetrum.workflow.ui"/>
<import plugin="org.eclipse.osgi"/>
<import plugin="ptolemy.core"/>
<import plugin="org.ptolemy.commons"/>
<import plugin="org.slf4j.api"/>
<import plugin="org.eclipse.triquetrum.workflow.editor" version="0.1.0" match="greaterOrEqual"/>
</requires>

<plugin
id="org.eclipse.nebula.visualization.xygraph"
download-size="0"
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -26,3 +26,4 @@ Import-Package: org.apache.commons.lang;version="2.6.0",
ptolemy.kernel.util;version="11.0.0",
ptolemy.util;version="11.0.0"
Export-Package: org.eclipse.triquetrum.workflow.actor.plot;version="0.1.0"
Bundle-ActivationPolicy: lazy
Original file line number Diff line number Diff line change
Expand Up @@ -13,3 +13,4 @@ Import-Package: org.apache.commons.lang.builder;version="2.6.0",
org.slf4j;version="1.7.2"
Export-Package: org.eclipse.triquetrum.processing.model.impl;version="0.1.0"
Service-Component: OSGI-INF/TriqFactory.xml
Bundle-ActivationPolicy: lazy
Original file line number Diff line number Diff line change
Expand Up @@ -15,3 +15,4 @@ Import-Package: org.eclipse.triquetrum;version="0.1.0",
ptolemy.kernel.util;version="11.0.0"
Service-Component: OSGI-INF/TaskProcessingBroker.xml
Export-Package: org.eclipse.triquetrum.processing.service.impl;version="0.1.0"
Bundle-ActivationPolicy: lazy
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
instructions.configure = setStartLevel(startLevel:4); markStarted(started: true);
1 change: 1 addition & 0 deletions org.eclipse.triquetrum.python.service/META-INF/MANIFEST.MF
Original file line number Diff line number Diff line change
Expand Up @@ -12,3 +12,4 @@ Import-Package: org.eclipse.triquetrum.scisoft.analysis.rpc,
Eclipse-BundleShape: dir
Require-Bundle: org.eclipse.equinox.common
Bundle-Vendor: Eclipse Triquetrum
Bundle-ActivationPolicy: lazy
1 change: 1 addition & 0 deletions org.eclipse.triquetrum.python.service/META-INF/p2.inf
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
instructions.configure = setStartLevel(startLevel:4); markStarted(started: true);
Original file line number Diff line number Diff line change
Expand Up @@ -20,4 +20,5 @@ Import-Package: org.eclipse.swt,
ptolemy.util;version="11.0.0"
Bundle-Activator: org.eclipse.triquetrum.workflow.actor.ui.activator.Activator
Require-Bundle: org.eclipse.triquetrum.workflow.ui;bundle-version="0.1.0"
Bundle-ActivationPolicy: lazy

1 change: 1 addition & 0 deletions org.eclipse.triquetrum.workflow.actor.ui/META-INF/p2.inf
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
instructions.configure = setStartLevel(startLevel:4); markStarted(started: true);
22 changes: 22 additions & 0 deletions org.eclipse.triquetrum.workflow.core.feature/feature.xml
Original file line number Diff line number Diff line change
Expand Up @@ -28,6 +28,11 @@
%license
</license>

<url>
<discovery label="Orbit" url="http://download.eclipse.org/tools/orbit/downloads/drops/S20160916162009/repository/"/>
<discovery label="Eclipse Neon" url="http://download.eclipse.org/releases/neon/"/>
</url>

<requires>
<import plugin="org.eclipse.triquetrum.common"/>
<import plugin="org.eclipse.triquetrum.processing.api"/>
Expand All @@ -37,6 +42,16 @@
<import plugin="org.eclipse.emf.ecore"/>
<import feature="org.eclipse.triquetrum.ptolemy.feature" version="0.1.0.qualifier"/>
<import plugin="org.apache.log4j"/>
<import plugin="org.eclipse.swt"/>
<import plugin="org.eclipse.osgi.services"/>
<import plugin="org.eclipse.emf.common"/>
<import plugin="org.eclipse.graphiti.mm"/>
<import plugin="org.eclipse.emf.edit"/>
<import plugin="org.eclipse.emf.ecore.change"/>
<import plugin="org.apache.commons.io"/>
<import feature="org.eclipse.equinox.core.feature" version="1.3.0.v20160603-1336"/>
<import feature="org.eclipse.equinox.core.sdk" version="3.12.0.v20160603-1336"/>
<import feature="org.eclipse.core.runtime.feature" version="1.1.200.v20160606-1342"/>
</requires>

<plugin
Expand Down Expand Up @@ -96,4 +111,11 @@
version="0.0.0"
unpack="false"/>

<plugin
id="org.eclipse.triquetrum.workflow.model.edit"
download-size="0"
install-size="0"
version="0.0.0"
unpack="false"/>

</feature>
1 change: 1 addition & 0 deletions org.eclipse.triquetrum.workflow.editor/META-INF/p2.inf
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
instructions.configure = setStartLevel(startLevel:4); markStarted(started: true);
Original file line number Diff line number Diff line change
Expand Up @@ -17,3 +17,4 @@ Import-Package: org.apache.commons.lang.builder;version="2.6.0",
ptolemy.kernel;version="10.1.0",
ptolemy.kernel.util;version="11.0.0"
Service-Component: OSGI-INF/WorkflowExecutionService.xml
Bundle-ActivationPolicy: lazy
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
instructions.configure = setStartLevel(startLevel:4); markStarted(started: true);
31 changes: 30 additions & 1 deletion org.eclipse.triquetrum.workflow.rcp.feature/feature.xml
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
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:
Erwin De Ley - initial API and implementation and/or initial documentation
-->
Expand All @@ -28,10 +28,39 @@
%license
</license>

<url>
<discovery label="Orbit" url="http://download.eclipse.org/tools/orbit/downloads/drops/S20160916162009/repository/"/>
<discovery label="Eclipse Neon" url="http://download.eclipse.org/releases/neon/"/>
</url>

<requires>
<import feature="org.eclipse.rcp" version="4.5.1.v20150904-0015"/>
<import feature="org.eclipse.triquetrum.core.feature" version="0.1.0.qualifier"/>
<import feature="org.eclipse.triquetrum.workflow.core.feature" version="0.1.0.qualifier"/>
<import feature="org.eclipse.graphiti.feature" version="0.13.0.v20160608-1043"/>
<import feature="org.eclipse.gmf.runtime.thirdparty" version="1.10.0.201606071959"/>
<import feature="org.eclipse.emf" version="2.12.0.v20160526-0356"/>
<import feature="org.eclipse.emf.ecp.emfforms.runtime.feature" version="1.8.0.20160216-1319"/>
<import feature="org.eclipse.emf.ecp.feature" version="1.8.0.20160216-1319"/>
<import feature="org.eclipse.emf.edit" version="2.12.0.v20160526-0356"/>
<import feature="org.eclipse.emf.edit.ui" version="2.12.0.v20160526-0356"/>
<import feature="org.eclipse.emf.transaction" version="1.10.0.201606071900"/>
<import feature="org.eclipse.emf.validation" version="1.10.0.201606071713"/>
<import feature="org.eclipse.gmf" version="1.10.0.201606071959"/>
<import feature="org.eclipse.emf.ecp.view.table.feature" version="1.8.0.20160216-1319"/>
<import feature="org.eclipse.emf.ecp.view.treemasterdetail.feature" version="1.8.0.20160216-1319"/>
<import feature="org.eclipse.emf.ecp.viewmodel.feature" version="1.8.0.20160216-1319"/>
<import feature="org.eclipse.draw2d" version="3.10.100.201606061308"/>
<import feature="org.eclipse.emf.databinding" version="1.4.0.v20160526-0356"/>
<import plugin="org.eclipse.jface"/>
<import feature="org.eclipse.emf.ecp.e3.feature" version="1.8.0.20160216-1319"/>
<import feature="org.eclipse.emf.ecp.view.table.celleditor.rcp.feature" version="1.8.0.20160216-1319"/>
<import feature="org.eclipse.graphiti.export.feature" version="0.13.0.v20160608-1043"/>
<import feature="org.eclipse.graphiti.feature.tools" version="0.13.0.v20160608-1043"/>
<import feature="org.eclipse.ocl" version="3.6.0.v20160523-1914"/>
<import feature="org.eclipse.net4j" version="4.5.0.v20160607-1254"/>
<import feature="org.eclipse.net4j.util" version="4.5.0.v20160607-1254"/>
<import feature="org.eclipse.net4j.util.ui" version="4.5.0.v20160607-1254"/>
</requires>

<plugin
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -19,3 +19,4 @@ Import-Package: org.apache.commons.io;version="2.2.0",
ptolemy.kernel.util;version="11.0.0"
Bundle-Activator: org.eclipse.triquetrum.workflow.repository.impl.filesystem.activator.Activator
Export-Package: org.eclipse.triquetrum.workflow.repository.impl.filesystem;version="0.1.0"
Bundle-ActivationPolicy: lazy
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
instructions.configure = setStartLevel(startLevel:4); markStarted(started: true);
1 change: 1 addition & 0 deletions org.eclipse.triquetrum.workflow.ui/META-INF/MANIFEST.MF
Original file line number Diff line number Diff line change
Expand Up @@ -21,3 +21,4 @@ Import-Package: org.eclipse.swt,
ptolemy.kernel.util;version="11.0.0"
Export-Package: org.eclipse.triquetrum.workflow.ui;version="0.1.0"
Bundle-Activator: org.eclipse.triquetrum.workflow.ui.activator.Activator
Bundle-ActivationPolicy: lazy
1 change: 1 addition & 0 deletions org.eclipse.triquetrum.workflow.ui/META-INF/p2.inf
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
instructions.configure = setStartLevel(startLevel:4); markStarted(started: true);

0 comments on commit 57b2ec9

Please sign in to comment.