Skip to main content
aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--bundles/org.eclipse.equinox.p2.reconciler.dropins/Bootstrap.product12
-rw-r--r--bundles/org.eclipse.equinox.p2.reconciler.dropins/config.ini4
-rw-r--r--bundles/org.eclipse.equinox.p2.reconciler.dropins/plugin.xml31
-rw-r--r--bundles/org.eclipse.equinox.p2.reconciler.dropins/src/org/eclipse/equinox/internal/p2/reconciler/dropins/Application.java16
-rw-r--r--bundles/org.eclipse.equinox.p2.reconciler/Bootstrap.product12
-rw-r--r--bundles/org.eclipse.equinox.p2.reconciler/config.ini4
-rw-r--r--bundles/org.eclipse.equinox.p2.reconciler/plugin.xml31
-rw-r--r--bundles/org.eclipse.equinox.p2.reconciler/src/org/eclipse/equinox/internal/p2/reconciler/dropins/Application.java16
8 files changed, 108 insertions, 18 deletions
diff --git a/bundles/org.eclipse.equinox.p2.reconciler.dropins/Bootstrap.product b/bundles/org.eclipse.equinox.p2.reconciler.dropins/Bootstrap.product
index 11707f2b2..379426a8f 100644
--- a/bundles/org.eclipse.equinox.p2.reconciler.dropins/Bootstrap.product
+++ b/bundles/org.eclipse.equinox.p2.reconciler.dropins/Bootstrap.product
@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="UTF-8"?>
<?pde version="3.4"?>
-<product name="P2 Bootstrap" id="org.eclipse.equinox.p2.reconciler.dropins.product" application="org.eclipse.equinox.app.error" useFeatures="false">
+<product name="p2 bootstrap" id="org.eclipse.equinox.p2.reconciler.dropins.product" application="org.eclipse.equinox.p2.reconciler.application" useFeatures="false">
<configIni use="default">
<linux>/org.eclipse.equinox.p2.reconciler.dropins/config.ini</linux>
@@ -9,13 +9,15 @@
<solaris>/org.eclipse.equinox.p2.reconciler.dropins/config.ini</solaris>
<win32>/org.eclipse.equinox.p2.reconciler.dropins/config.ini</win32>
</configIni>
-
+
<launcherArgs>
+ <vmArgs>-Dorg.eclipse.equinox.p2.reconciler.noConfig=true</vmArgs>
<vmArgsMac>-XstartOnFirstThread -Dorg.eclipse.swt.internal.carbon.smallFonts</vmArgsMac>
</launcherArgs>
<windowImages/>
+
<launcher>
<solaris/>
<win useIco="false">
@@ -23,12 +25,14 @@
</win>
</launcher>
-
<vm>
</vm>
<plugins>
<plugin id="org.eclipse.core.jobs"/>
+ <plugin id="org.eclipse.core.net"/>
+ <plugin id="org.eclipse.core.net.win32.x86" fragment="true"/>
+ <plugin id="org.eclipse.core.runtime.compatibility.registry" fragment="true"/>
<plugin id="org.eclipse.ecf"/>
<plugin id="org.eclipse.ecf.filetransfer"/>
<plugin id="org.eclipse.ecf.identity"/>
@@ -45,6 +49,7 @@
<plugin id="org.eclipse.equinox.p2.exemplarysetup"/>
<plugin id="org.eclipse.equinox.p2.extensionlocation"/>
<plugin id="org.eclipse.equinox.p2.garbagecollector"/>
+ <plugin id="org.eclipse.equinox.p2.jarprocessor"/>
<plugin id="org.eclipse.equinox.p2.metadata"/>
<plugin id="org.eclipse.equinox.p2.metadata.generator"/>
<plugin id="org.eclipse.equinox.p2.metadata.repository"/>
@@ -53,6 +58,7 @@
<plugin id="org.eclipse.equinox.preferences"/>
<plugin id="org.eclipse.equinox.registry"/>
<plugin id="org.eclipse.equinox.security"/>
+ <plugin id="org.eclipse.equinox.security.win32.x86" fragment="true"/>
<plugin id="org.eclipse.equinox.simpleconfigurator"/>
<plugin id="org.eclipse.equinox.simpleconfigurator.manipulator"/>
<plugin id="org.eclipse.osgi"/>
diff --git a/bundles/org.eclipse.equinox.p2.reconciler.dropins/config.ini b/bundles/org.eclipse.equinox.p2.reconciler.dropins/config.ini
index 6a98802df..079c9efbb 100644
--- a/bundles/org.eclipse.equinox.p2.reconciler.dropins/config.ini
+++ b/bundles/org.eclipse.equinox.p2.reconciler.dropins/config.ini
@@ -39,12 +39,12 @@ osgi.splashPath = platform:/base/plugins/org.eclipse.platform
# Simple bundle locations are interepreted as relative to the framework's parent directory.
# The startlevel indicates the OSGi start level at which the bundle should run.
# If this value is not set, the system computes an appropriate default.
-osgi.bundles=org.eclipse.equinox.org.eclipse.equinox.common@2:start, org.eclipse.equinox.p2.reconciler.dropins@4:start, org.eclipse.core.runtime@start
+osgi.bundles=org.eclipse.equinox.org.eclipse.equinox.common@2:start, org.eclipse.equinox.app@3:start, org.eclipse.equinox.p2.reconciler.dropins@4:start
# The product to run. A given Eclipse configuration may contain many products.
# The product identified will supply the branding (window icons, title bar text) etc
# as well as define the default application to run.
-eclipse.product=org.eclipse.equinox.p2.reconciler.bootstrap
+eclipse.application=org.eclipse.equinox.p2.reconciler.application
# End of file marker - must be here
eof=eof \ No newline at end of file
diff --git a/bundles/org.eclipse.equinox.p2.reconciler.dropins/plugin.xml b/bundles/org.eclipse.equinox.p2.reconciler.dropins/plugin.xml
index 5dc01f2fc..fecf9b4f6 100644
--- a/bundles/org.eclipse.equinox.p2.reconciler.dropins/plugin.xml
+++ b/bundles/org.eclipse.equinox.p2.reconciler.dropins/plugin.xml
@@ -3,16 +3,39 @@
<plugin>
<extension
+ id="org.eclipse.equinox.p2.reconciler.dropins.product"
+ point="org.eclipse.core.runtime.products">
+ <product
+ application="org.eclipse.equinox.p2.reconciler.application"
+ name="p2 reconciliation product">
+ <property
+ name="appName"
+ value="p2 reconciliation product">
+ </property>
+ </product>
+ </extension>
+ <extension
+ id="org.eclipse.equinox.p2.reconciler.application"
+ point="org.eclipse.core.runtime.applications">
+ <application
+ cardinality="singleton-global"
+ thread="any"
+ visible="true">
+ <run
+ class="org.eclipse.equinox.internal.p2.reconciler.dropins.Application">
+ </run>
+ </application>
+ </extension>
+ <extension
id="product"
point="org.eclipse.core.runtime.products">
<product
- application="org.eclipse.equinox.app.error"
- name="P2 Bootstrap">
+ application="org.eclipse.equinox.p2.reconciler.application"
+ name="p2 reconciliation application">
<property
name="appName"
- value="P2 Bootstrap">
+ value="p2 reconciliation application">
</property>
</product>
</extension>
-
</plugin>
diff --git a/bundles/org.eclipse.equinox.p2.reconciler.dropins/src/org/eclipse/equinox/internal/p2/reconciler/dropins/Application.java b/bundles/org.eclipse.equinox.p2.reconciler.dropins/src/org/eclipse/equinox/internal/p2/reconciler/dropins/Application.java
new file mode 100644
index 000000000..ddab617c2
--- /dev/null
+++ b/bundles/org.eclipse.equinox.p2.reconciler.dropins/src/org/eclipse/equinox/internal/p2/reconciler/dropins/Application.java
@@ -0,0 +1,16 @@
+package org.eclipse.equinox.internal.p2.reconciler.dropins;
+
+import org.eclipse.equinox.app.IApplication;
+import org.eclipse.equinox.app.IApplicationContext;
+
+public class Application implements IApplication {
+
+ public Object start(IApplicationContext context) throws Exception {
+ return null;
+ }
+
+ public void stop() {
+ //Nothing to do
+ }
+
+}
diff --git a/bundles/org.eclipse.equinox.p2.reconciler/Bootstrap.product b/bundles/org.eclipse.equinox.p2.reconciler/Bootstrap.product
index 11707f2b2..379426a8f 100644
--- a/bundles/org.eclipse.equinox.p2.reconciler/Bootstrap.product
+++ b/bundles/org.eclipse.equinox.p2.reconciler/Bootstrap.product
@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="UTF-8"?>
<?pde version="3.4"?>
-<product name="P2 Bootstrap" id="org.eclipse.equinox.p2.reconciler.dropins.product" application="org.eclipse.equinox.app.error" useFeatures="false">
+<product name="p2 bootstrap" id="org.eclipse.equinox.p2.reconciler.dropins.product" application="org.eclipse.equinox.p2.reconciler.application" useFeatures="false">
<configIni use="default">
<linux>/org.eclipse.equinox.p2.reconciler.dropins/config.ini</linux>
@@ -9,13 +9,15 @@
<solaris>/org.eclipse.equinox.p2.reconciler.dropins/config.ini</solaris>
<win32>/org.eclipse.equinox.p2.reconciler.dropins/config.ini</win32>
</configIni>
-
+
<launcherArgs>
+ <vmArgs>-Dorg.eclipse.equinox.p2.reconciler.noConfig=true</vmArgs>
<vmArgsMac>-XstartOnFirstThread -Dorg.eclipse.swt.internal.carbon.smallFonts</vmArgsMac>
</launcherArgs>
<windowImages/>
+
<launcher>
<solaris/>
<win useIco="false">
@@ -23,12 +25,14 @@
</win>
</launcher>
-
<vm>
</vm>
<plugins>
<plugin id="org.eclipse.core.jobs"/>
+ <plugin id="org.eclipse.core.net"/>
+ <plugin id="org.eclipse.core.net.win32.x86" fragment="true"/>
+ <plugin id="org.eclipse.core.runtime.compatibility.registry" fragment="true"/>
<plugin id="org.eclipse.ecf"/>
<plugin id="org.eclipse.ecf.filetransfer"/>
<plugin id="org.eclipse.ecf.identity"/>
@@ -45,6 +49,7 @@
<plugin id="org.eclipse.equinox.p2.exemplarysetup"/>
<plugin id="org.eclipse.equinox.p2.extensionlocation"/>
<plugin id="org.eclipse.equinox.p2.garbagecollector"/>
+ <plugin id="org.eclipse.equinox.p2.jarprocessor"/>
<plugin id="org.eclipse.equinox.p2.metadata"/>
<plugin id="org.eclipse.equinox.p2.metadata.generator"/>
<plugin id="org.eclipse.equinox.p2.metadata.repository"/>
@@ -53,6 +58,7 @@
<plugin id="org.eclipse.equinox.preferences"/>
<plugin id="org.eclipse.equinox.registry"/>
<plugin id="org.eclipse.equinox.security"/>
+ <plugin id="org.eclipse.equinox.security.win32.x86" fragment="true"/>
<plugin id="org.eclipse.equinox.simpleconfigurator"/>
<plugin id="org.eclipse.equinox.simpleconfigurator.manipulator"/>
<plugin id="org.eclipse.osgi"/>
diff --git a/bundles/org.eclipse.equinox.p2.reconciler/config.ini b/bundles/org.eclipse.equinox.p2.reconciler/config.ini
index 6a98802df..079c9efbb 100644
--- a/bundles/org.eclipse.equinox.p2.reconciler/config.ini
+++ b/bundles/org.eclipse.equinox.p2.reconciler/config.ini
@@ -39,12 +39,12 @@ osgi.splashPath = platform:/base/plugins/org.eclipse.platform
# Simple bundle locations are interepreted as relative to the framework's parent directory.
# The startlevel indicates the OSGi start level at which the bundle should run.
# If this value is not set, the system computes an appropriate default.
-osgi.bundles=org.eclipse.equinox.org.eclipse.equinox.common@2:start, org.eclipse.equinox.p2.reconciler.dropins@4:start, org.eclipse.core.runtime@start
+osgi.bundles=org.eclipse.equinox.org.eclipse.equinox.common@2:start, org.eclipse.equinox.app@3:start, org.eclipse.equinox.p2.reconciler.dropins@4:start
# The product to run. A given Eclipse configuration may contain many products.
# The product identified will supply the branding (window icons, title bar text) etc
# as well as define the default application to run.
-eclipse.product=org.eclipse.equinox.p2.reconciler.bootstrap
+eclipse.application=org.eclipse.equinox.p2.reconciler.application
# End of file marker - must be here
eof=eof \ No newline at end of file
diff --git a/bundles/org.eclipse.equinox.p2.reconciler/plugin.xml b/bundles/org.eclipse.equinox.p2.reconciler/plugin.xml
index 5dc01f2fc..fecf9b4f6 100644
--- a/bundles/org.eclipse.equinox.p2.reconciler/plugin.xml
+++ b/bundles/org.eclipse.equinox.p2.reconciler/plugin.xml
@@ -3,16 +3,39 @@
<plugin>
<extension
+ id="org.eclipse.equinox.p2.reconciler.dropins.product"
+ point="org.eclipse.core.runtime.products">
+ <product
+ application="org.eclipse.equinox.p2.reconciler.application"
+ name="p2 reconciliation product">
+ <property
+ name="appName"
+ value="p2 reconciliation product">
+ </property>
+ </product>
+ </extension>
+ <extension
+ id="org.eclipse.equinox.p2.reconciler.application"
+ point="org.eclipse.core.runtime.applications">
+ <application
+ cardinality="singleton-global"
+ thread="any"
+ visible="true">
+ <run
+ class="org.eclipse.equinox.internal.p2.reconciler.dropins.Application">
+ </run>
+ </application>
+ </extension>
+ <extension
id="product"
point="org.eclipse.core.runtime.products">
<product
- application="org.eclipse.equinox.app.error"
- name="P2 Bootstrap">
+ application="org.eclipse.equinox.p2.reconciler.application"
+ name="p2 reconciliation application">
<property
name="appName"
- value="P2 Bootstrap">
+ value="p2 reconciliation application">
</property>
</product>
</extension>
-
</plugin>
diff --git a/bundles/org.eclipse.equinox.p2.reconciler/src/org/eclipse/equinox/internal/p2/reconciler/dropins/Application.java b/bundles/org.eclipse.equinox.p2.reconciler/src/org/eclipse/equinox/internal/p2/reconciler/dropins/Application.java
new file mode 100644
index 000000000..ddab617c2
--- /dev/null
+++ b/bundles/org.eclipse.equinox.p2.reconciler/src/org/eclipse/equinox/internal/p2/reconciler/dropins/Application.java
@@ -0,0 +1,16 @@
+package org.eclipse.equinox.internal.p2.reconciler.dropins;
+
+import org.eclipse.equinox.app.IApplication;
+import org.eclipse.equinox.app.IApplicationContext;
+
+public class Application implements IApplication {
+
+ public Object start(IApplicationContext context) throws Exception {
+ return null;
+ }
+
+ public void stop() {
+ //Nothing to do
+ }
+
+}

Back to the top