Skip to main content
summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMarkus Tiede2015-06-24 09:42:13 +0000
committerMarkus Tiede2015-06-24 09:42:18 +0000
commit49d9c05616bccf049f2607d8718924d51b5b3d40 (patch)
treed94bce17a3888b3199b9248c721a64a958ed22f5 /org.eclipse.jubula.toolkit.common
parent297a699009cbbf734e8e988652debe8ace55d718 (diff)
downloadorg.eclipse.jubula.core-49d9c05616bccf049f2607d8718924d51b5b3d40.tar.gz
org.eclipse.jubula.core-49d9c05616bccf049f2607d8718924d51b5b3d40.tar.xz
org.eclipse.jubula.core-49d9c05616bccf049f2607d8718924d51b5b3d40.zip
Non-sprint task - fix for testexec IDE launch template + reduced dependencies for toolkit common bundle.
Diffstat (limited to 'org.eclipse.jubula.toolkit.common')
-rw-r--r--org.eclipse.jubula.toolkit.common/META-INF/MANIFEST.MF5
-rw-r--r--org.eclipse.jubula.toolkit.common/pom.xml3
-rw-r--r--org.eclipse.jubula.toolkit.common/src/org/eclipse/jubula/toolkit/common/Activator.java (renamed from org.eclipse.jubula.toolkit.common/src/org/eclipse/jubula/toolkit/common/PluginStarter.java)22
-rw-r--r--org.eclipse.jubula.toolkit.common/src/org/eclipse/jubula/toolkit/common/xml/businessprocess/ComponentBuilder.java4
4 files changed, 13 insertions, 21 deletions
diff --git a/org.eclipse.jubula.toolkit.common/META-INF/MANIFEST.MF b/org.eclipse.jubula.toolkit.common/META-INF/MANIFEST.MF
index a84f73eb3..3bb95c68c 100644
--- a/org.eclipse.jubula.toolkit.common/META-INF/MANIFEST.MF
+++ b/org.eclipse.jubula.toolkit.common/META-INF/MANIFEST.MF
@@ -3,7 +3,7 @@ Bundle-ManifestVersion: 2
Bundle-Name: Jubula Toolkit Support
Bundle-SymbolicName: org.eclipse.jubula.toolkit.common;singleton:=true
Bundle-Version: 3.1.0.qualifier
-Bundle-Activator: org.eclipse.jubula.toolkit.common.PluginStarter
+Bundle-Activator: org.eclipse.jubula.toolkit.common.Activator
Bundle-Vendor: Eclipse Jubula
Bundle-Localization: plugin
Require-Bundle: org.eclipse.core.runtime;bundle-version="[3.6.0,4.0.0)",
@@ -11,7 +11,8 @@ Require-Bundle: org.eclipse.core.runtime;bundle-version="[3.6.0,4.0.0)",
org.eclipse.jubula.tools;bundle-version="[3.1.0,3.2.0)",
org.eclipse.core.databinding;bundle-version="[1.3.1,2.0.0)",
org.slf4j.api;bundle-version="[1.7.2,2.0.0)",
- org.eclipse.jubula.ui.compatibility;bundle-version="[3.1.0,3.2.0)"
+ org.eclipse.swt;bundle-version="[3.6.1,4.0.0)";resolution:=optional;visibility:=reexport,
+ org.eclipse.rap.rwt;bundle-version="[2.3.0,3.0.0)";resolution:=optional;visibility:=reexport
Bundle-RequiredExecutionEnvironment: JavaSE-1.7
Bundle-ActivationPolicy: lazy
Export-Package: org.eclipse.jubula.toolkit.common,
diff --git a/org.eclipse.jubula.toolkit.common/pom.xml b/org.eclipse.jubula.toolkit.common/pom.xml
index 0b53dc3e4..1835e2800 100644
--- a/org.eclipse.jubula.toolkit.common/pom.xml
+++ b/org.eclipse.jubula.toolkit.common/pom.xml
@@ -36,10 +36,11 @@
<!-- prefer RCP to RAP for compilation -->
<requirement>
<type>eclipse-plugin</type>
- <id>org.eclipse.ui</id>
+ <id>org.eclipse.swt</id>
<versionRange>[3.6,4.0)</versionRange>
</requirement>
</extraRequirements>
+ <optionalDependencies>ignore</optionalDependencies>
</dependency-resolution>
</configuration>
</plugin>
diff --git a/org.eclipse.jubula.toolkit.common/src/org/eclipse/jubula/toolkit/common/PluginStarter.java b/org.eclipse.jubula.toolkit.common/src/org/eclipse/jubula/toolkit/common/Activator.java
index ebce6cf9b..94cb9a0d9 100644
--- a/org.eclipse.jubula.toolkit.common/src/org/eclipse/jubula/toolkit/common/PluginStarter.java
+++ b/org.eclipse.jubula.toolkit.common/src/org/eclipse/jubula/toolkit/common/Activator.java
@@ -14,31 +14,30 @@ import org.eclipse.core.runtime.IExtension;
import org.eclipse.core.runtime.IExtensionPoint;
import org.eclipse.core.runtime.IExtensionRegistry;
import org.eclipse.core.runtime.Platform;
+import org.eclipse.core.runtime.Plugin;
import org.eclipse.jubula.tools.internal.constants.ToolkitConstants;
-import org.eclipse.ui.plugin.AbstractUIPlugin;
import org.osgi.framework.BundleContext;
/**
* The activator class controls the plug-in life cycle
*/
-public class PluginStarter extends AbstractUIPlugin {
+public class Activator extends Plugin {
/** The plug-in ID */
public static final String PLUGIN_ID = ToolkitConstants.PLUGIN_ID;
/** The shared instance */
- private static PluginStarter plugin;
+ private static Activator plugin;
/**
* The constructor
*/
- public PluginStarter() {
+ public Activator() {
plugin = this;
}
/**
- * @see org.eclipse.ui.plugin.AbstractUIPlugin#start(org.osgi.framework.BundleContext)
* {@inheritDoc}
*/
public void start(BundleContext context) throws Exception {
@@ -46,7 +45,6 @@ public class PluginStarter extends AbstractUIPlugin {
}
/**
- * @see org.eclipse.ui.plugin.AbstractUIPlugin#stop(org.osgi.framework.BundleContext)
* {@inheritDoc}
*/
public void stop(BundleContext context) throws Exception {
@@ -55,17 +53,12 @@ public class PluginStarter extends AbstractUIPlugin {
}
/**
- * Returns the shared instance
- *
* @return the shared instance
*/
- public static PluginStarter getDefault() {
+ public static Activator getDefault() {
return plugin;
}
-
-
-
/**
* Gets all Toolkit Plugins using extension point "toolkitsupport"
* @return an Array of IExtension
@@ -76,7 +69,4 @@ public class PluginStarter extends AbstractUIPlugin {
ToolkitConstants.EXT_POINT_ID);
return extensionPoint.getExtensions();
}
-
-
-
-}
+} \ No newline at end of file
diff --git a/org.eclipse.jubula.toolkit.common/src/org/eclipse/jubula/toolkit/common/xml/businessprocess/ComponentBuilder.java b/org.eclipse.jubula.toolkit.common/src/org/eclipse/jubula/toolkit/common/xml/businessprocess/ComponentBuilder.java
index 76feb6d02..b091d5c8d 100644
--- a/org.eclipse.jubula.toolkit.common/src/org/eclipse/jubula/toolkit/common/xml/businessprocess/ComponentBuilder.java
+++ b/org.eclipse.jubula.toolkit.common/src/org/eclipse/jubula/toolkit/common/xml/businessprocess/ComponentBuilder.java
@@ -22,7 +22,7 @@ import org.eclipse.core.runtime.IConfigurationElement;
import org.eclipse.core.runtime.IExtension;
import org.eclipse.core.runtime.InvalidRegistryObjectException;
import org.eclipse.jubula.toolkit.common.IToolkitProvider;
-import org.eclipse.jubula.toolkit.common.PluginStarter;
+import org.eclipse.jubula.toolkit.common.Activator;
import org.eclipse.jubula.toolkit.common.businessprocess.ToolkitSupportBP;
import org.eclipse.jubula.toolkit.common.exception.ToolkitPluginException;
import org.eclipse.jubula.toolkit.common.i18n.Messages;
@@ -68,7 +68,7 @@ public class ComponentBuilder extends AbstractComponentBuilder {
* Toolkit-Plugins.
*/
private void initCompSystem() throws ToolkitPluginException {
- IExtension[] plugins = PluginStarter.getDefault().findToolkitPlugins();
+ IExtension[] plugins = Activator.getDefault().findToolkitPlugins();
for (IExtension extension : plugins) {
IConfigurationElement[] elements = extension
.getConfigurationElements();

Back to the top