eclipse p2 build adjustments
diff --git a/org.eclipse.scout.nls.sdk/META-INF/MANIFEST.MF b/org.eclipse.scout.nls.sdk/META-INF/MANIFEST.MF
index db951f1..5db8841 100644
--- a/org.eclipse.scout.nls.sdk/META-INF/MANIFEST.MF
+++ b/org.eclipse.scout.nls.sdk/META-INF/MANIFEST.MF
@@ -2,7 +2,7 @@
Bundle-ManifestVersion: 2
Bundle-Name: Multilanguage Plug-in
Bundle-SymbolicName: org.eclipse.scout.nls.sdk;singleton:=true
-Bundle-Version: 1.0.2.qualifier
+Bundle-Version: 3.5.5.qualifier
Bundle-Activator: org.eclipse.scout.nls.sdk.NlsCore
Bundle-Vendor: Eclipse Scout Project
Require-Bundle: org.eclipse.ui,
diff --git a/org.eclipse.scout.sdk.feature/build.properties b/org.eclipse.scout.sdk.feature/build.properties
index 8bbcf90..b8ccc2d 100644
--- a/org.eclipse.scout.sdk.feature/build.properties
+++ b/org.eclipse.scout.sdk.feature/build.properties
@@ -1,4 +1,4 @@
bin.includes = feature.xml,\
epl-v10.html,\
license.html,\
- category.xml
+ scoutCategory.xml
diff --git a/org.eclipse.scout.sdk.feature/feature.xml b/org.eclipse.scout.sdk.feature/feature.xml
index b5dec36..1af28ce 100644
--- a/org.eclipse.scout.sdk.feature/feature.xml
+++ b/org.eclipse.scout.sdk.feature/feature.xml
@@ -2,7 +2,7 @@
<feature
id="org.eclipse.scout.sdk.feature"
label="Scout SDK Feature"
- version="3.5.2.qualifier"
+ version="3.5.5.qualifier"
provider-name="Eclipse Scout Project">
<description>
@@ -21,10 +21,11 @@
</copyright>
<license url="%licenseURL">
- %license
+ %license
</license>
<url>
+ <discovery label="Orbit" url="http://download.eclipse.org/tools/orbit/downloads/drops/I20101104194033/repository"/>
<discovery label="The Eclipse Project Updates" url="http://download.eclipse.org/eclipse/updates/3.5"/>
</url>
diff --git a/org.eclipse.scout.sdk.test/META-INF/MANIFEST.MF b/org.eclipse.scout.sdk.test/META-INF/MANIFEST.MF
index 3a7a590..8afdf2a 100644
--- a/org.eclipse.scout.sdk.test/META-INF/MANIFEST.MF
+++ b/org.eclipse.scout.sdk.test/META-INF/MANIFEST.MF
@@ -2,7 +2,7 @@
Bundle-ManifestVersion: 2
Bundle-Name: Scout SDK Test Plug-in
Bundle-SymbolicName: org.eclipse.scout.sdk.test
-Bundle-Version: 1.0.0.qualifier
+Bundle-Version: 3.5.5.qualifier
Bundle-Activator: org.eclipse.scout.sdk.internal.test.ScoutSdkTest
Bundle-Vendor: Eclipse Scout Project
Require-Bundle: org.eclipse.core.runtime,
diff --git a/org.eclipse.scout.sdk.ui/META-INF/MANIFEST.MF b/org.eclipse.scout.sdk.ui/META-INF/MANIFEST.MF
index 10918c4..159dbde 100644
--- a/org.eclipse.scout.sdk.ui/META-INF/MANIFEST.MF
+++ b/org.eclipse.scout.sdk.ui/META-INF/MANIFEST.MF
@@ -2,7 +2,7 @@
Bundle-ManifestVersion: 2
Bundle-Name: Ui Plug-in
Bundle-SymbolicName: org.eclipse.scout.sdk.ui;singleton:=true
-Bundle-Version: 3.5.1.qualifier
+Bundle-Version: 3.5.5.qualifier
Bundle-Activator: org.eclipse.scout.sdk.ui.ScoutSdkUi
Require-Bundle: org.eclipse.core.runtime,
org.eclipse.scout.commons;bundle-version="1.1.2";visibility:=reexport,
diff --git a/org.eclipse.scout.sdk.ui/plugin.xml b/org.eclipse.scout.sdk.ui/plugin.xml
index b7c948e..a0e4ce5 100644
--- a/org.eclipse.scout.sdk.ui/plugin.xml
+++ b/org.eclipse.scout.sdk.ui/plugin.xml
@@ -514,11 +514,9 @@
id="product"
point="org.eclipse.core.runtime.products">
<product
- application="org.eclipse.ui.ide.workbench"
- name="SCOUT SDK">
+ application="org.eclipse.ui.ide.workbench" name="Scout SDK">
<property
- name="appName"
- value="SCOUT SDK">
+ name="appName" value="Scout SDK">
</property>
<property
name="preferenceCustomization"
diff --git a/org.eclipse.scout.sdk.ui/scoutSdk.product b/org.eclipse.scout.sdk.ui/scoutSdk.product
new file mode 100644
index 0000000..494bdd8
--- /dev/null
+++ b/org.eclipse.scout.sdk.ui/scoutSdk.product
@@ -0,0 +1,41 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<?pde version="3.5"?>
+
+<product name="Scout SDK" uid="Scout SDK" id="org.eclipse.scout.sdk.ui.product" application="org.eclipse.ui.ide.workbench" useFeatures="true" includeLaunchers="true">
+
+ <configIni use="default">
+ </configIni>
+
+ <launcherArgs>
+ <programArgs>-consolelog -console</programArgs>
+ <vmArgsMac>-XstartOnFirstThread -Dorg.eclipse.swt.internal.carbon.smallFonts</vmArgsMac>
+ </launcherArgs>
+
+ <windowImages/>
+
+ <launcher name="scoutSdk">
+ <solaris/>
+ <win useIco="false">
+ <bmp/>
+ </win>
+ </launcher>
+
+ <vm>
+ </vm>
+
+ <plugins>
+ </plugins>
+
+ <features>
+ <feature id="org.eclipse.jdt" version="3.6.1.r361_v20100714-0800-7z8XFUSFLFlmgLc5z-Bvrt8-HVkH"/>
+ <feature id="org.eclipse.pde" version="3.6.1.r361_v20100727-7b7mFL-FET3dhESDgE5_bkJ"/>
+ <feature id="org.eclipse.help" version="1.2.0.v20100427-7e7jEQFEp4jsWcboLU9l93"/>
+ <feature id="org.eclipse.equinox.p2.user.ui" version="2.0.1.r361_v20100903-897HFZFFZRuSD2LMtVxyz0Vr"/>
+ <feature id="org.eclipse.cvs" version="1.2.0.v20100427-7B77FKt90GE5h0SBT5FV9A01911"/>
+ <feature id="org.eclipse.platform" version="3.6.1.r361_v20100909-9gF78GrkFqw7GrsZnvz0JWNTeb6fue6896L"/>
+ <feature id="org.eclipse.scout.rt.feature" version="3.5.2.qualifier"/>
+ <feature id="org.eclipse.scout.sdk.feature" version="3.5.2.qualifier"/>
+ </features>
+
+
+</product>
diff --git a/org.eclipse.scout.sdk/META-INF/MANIFEST.MF b/org.eclipse.scout.sdk/META-INF/MANIFEST.MF
index 0724b4a..684f7d0 100644
--- a/org.eclipse.scout.sdk/META-INF/MANIFEST.MF
+++ b/org.eclipse.scout.sdk/META-INF/MANIFEST.MF
@@ -2,7 +2,7 @@
Bundle-ManifestVersion: 2
Bundle-Name: Scout SDK Plug-in
Bundle-SymbolicName: org.eclipse.scout.sdk;singleton:=true
-Bundle-Version: 1.2.4.qualifier
+Bundle-Version: 3.5.5.qualifier
Bundle-Activator: org.eclipse.scout.sdk.ScoutSdk
Bundle-Vendor: Eclipse Scout Project
Require-Bundle: org.apache.ant;bundle-version="1.7.0",