Skip to main content
aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--features/org.eclipse.emf.cdo.releng.setup.installer-feature/.project (renamed from features/org.eclipse.emf.cdo.releng.setup.product-feature/.project)2
-rw-r--r--features/org.eclipse.emf.cdo.releng.setup.installer-feature/.settings/org.eclipse.core.resources.prefs (renamed from features/org.eclipse.emf.cdo.releng.setup.product-feature/.settings/org.eclipse.core.resources.prefs)0
-rw-r--r--features/org.eclipse.emf.cdo.releng.setup.installer-feature/.settings/org.eclipse.mylyn.tasks.ui.prefs (renamed from features/org.eclipse.emf.cdo.releng.setup.product-feature/.settings/org.eclipse.mylyn.tasks.ui.prefs)0
-rw-r--r--features/org.eclipse.emf.cdo.releng.setup.installer-feature/.settings/org.eclipse.mylyn.team.ui.prefs (renamed from features/org.eclipse.emf.cdo.releng.setup.product-feature/.settings/org.eclipse.mylyn.team.ui.prefs)0
-rw-r--r--features/org.eclipse.emf.cdo.releng.setup.installer-feature/Setup.product (renamed from features/org.eclipse.emf.cdo.releng.setup.product-feature/Setup.product)8
-rw-r--r--features/org.eclipse.emf.cdo.releng.setup.installer-feature/about.html (renamed from features/org.eclipse.emf.cdo.releng.setup.product-feature/about.html)0
-rw-r--r--features/org.eclipse.emf.cdo.releng.setup.installer-feature/buckminster.cspex (renamed from features/org.eclipse.emf.cdo.releng.setup.product-feature/buckminster.cspex)0
-rw-r--r--features/org.eclipse.emf.cdo.releng.setup.installer-feature/build.properties (renamed from features/org.eclipse.emf.cdo.releng.setup.product-feature/build.properties)0
-rw-r--r--features/org.eclipse.emf.cdo.releng.setup.installer-feature/copyright.txt (renamed from features/org.eclipse.emf.cdo.releng.setup.product-feature/copyright.txt)0
-rw-r--r--features/org.eclipse.emf.cdo.releng.setup.installer-feature/epl-v10.html (renamed from features/org.eclipse.emf.cdo.releng.setup.product-feature/epl-v10.html)0
-rw-r--r--features/org.eclipse.emf.cdo.releng.setup.installer-feature/feature.properties (renamed from features/org.eclipse.emf.cdo.releng.setup.product-feature/feature.properties)4
-rw-r--r--features/org.eclipse.emf.cdo.releng.setup.installer-feature/feature.xml (renamed from features/org.eclipse.emf.cdo.releng.setup.product-feature/feature.xml)6
-rw-r--r--features/org.eclipse.emf.cdo.releng.setup.installer-feature/license.html (renamed from features/org.eclipse.emf.cdo.releng.setup.product-feature/license.html)0
-rw-r--r--features/org.eclipse.emf.cdo.site-feature/category.xml5
-rw-r--r--features/org.eclipse.emf.cdo.site-feature/feature.xml2
-rw-r--r--plugins/org.eclipse.emf.cdo.releng.release/release.properties2
-rw-r--r--plugins/org.eclipse.emf.cdo.releng.setup.editor/src/org/eclipse/emf/cdo/releng/setup/presentation/actions/ManualPerformAction.java2
-rw-r--r--plugins/org.eclipse.emf.cdo.releng.setup.installer.editor/.classpath (renamed from plugins/org.eclipse.emf.cdo.releng.setup.editor.rcp/.classpath)0
-rw-r--r--plugins/org.eclipse.emf.cdo.releng.setup.installer.editor/.project (renamed from plugins/org.eclipse.emf.cdo.releng.setup.editor.rcp/.project)2
-rw-r--r--plugins/org.eclipse.emf.cdo.releng.setup.installer.editor/.settings/org.eclipse.core.resources.prefs (renamed from plugins/org.eclipse.emf.cdo.releng.setup.editor.rcp/.settings/org.eclipse.core.resources.prefs)0
-rw-r--r--plugins/org.eclipse.emf.cdo.releng.setup.installer.editor/.settings/org.eclipse.jdt.core.prefs (renamed from plugins/org.eclipse.emf.cdo.releng.setup.editor.rcp/.settings/org.eclipse.jdt.core.prefs)0
-rw-r--r--plugins/org.eclipse.emf.cdo.releng.setup.installer.editor/.settings/org.eclipse.jdt.ui.prefs (renamed from plugins/org.eclipse.emf.cdo.releng.setup.editor.rcp/.settings/org.eclipse.jdt.ui.prefs)0
-rw-r--r--plugins/org.eclipse.emf.cdo.releng.setup.installer.editor/.settings/org.eclipse.ltk.core.refactoring.prefs (renamed from plugins/org.eclipse.emf.cdo.releng.setup.editor.rcp/.settings/org.eclipse.ltk.core.refactoring.prefs)0
-rw-r--r--plugins/org.eclipse.emf.cdo.releng.setup.installer.editor/.settings/org.eclipse.mylyn.tasks.ui.prefs (renamed from plugins/org.eclipse.emf.cdo.releng.setup.editor.rcp/.settings/org.eclipse.mylyn.tasks.ui.prefs)0
-rw-r--r--plugins/org.eclipse.emf.cdo.releng.setup.installer.editor/.settings/org.eclipse.mylyn.team.ui.prefs (renamed from plugins/org.eclipse.emf.cdo.releng.setup.editor.rcp/.settings/org.eclipse.mylyn.team.ui.prefs)0
-rw-r--r--plugins/org.eclipse.emf.cdo.releng.setup.installer.editor/.settings/org.eclipse.pde.api.tools.prefs (renamed from plugins/org.eclipse.emf.cdo.releng.setup.editor.rcp/.settings/org.eclipse.pde.api.tools.prefs)0
-rw-r--r--plugins/org.eclipse.emf.cdo.releng.setup.installer.editor/.settings/org.eclipse.pde.prefs (renamed from plugins/org.eclipse.emf.cdo.releng.setup.editor.rcp/.settings/org.eclipse.pde.prefs)0
-rw-r--r--plugins/org.eclipse.emf.cdo.releng.setup.installer.editor/META-INF/MANIFEST.MF (renamed from plugins/org.eclipse.emf.cdo.releng.setup.editor.rcp/META-INF/MANIFEST.MF)6
-rw-r--r--plugins/org.eclipse.emf.cdo.releng.setup.installer.editor/about.html (renamed from plugins/org.eclipse.emf.cdo.releng.setup.editor.rcp/about.html)0
-rw-r--r--plugins/org.eclipse.emf.cdo.releng.setup.installer.editor/build.properties (renamed from plugins/org.eclipse.emf.cdo.releng.setup.editor.rcp/build.properties)0
-rw-r--r--plugins/org.eclipse.emf.cdo.releng.setup.installer.editor/copyright.txt (renamed from plugins/org.eclipse.emf.cdo.releng.setup.editor.rcp/copyright.txt)0
-rw-r--r--plugins/org.eclipse.emf.cdo.releng.setup.installer.editor/icons/full/obj16/SetupModelFile.gif (renamed from plugins/org.eclipse.emf.cdo.releng.setup.editor.rcp/icons/full/obj16/SetupModelFile.gif)bin613 -> 613 bytes
-rw-r--r--plugins/org.eclipse.emf.cdo.releng.setup.installer.editor/plugin.properties (renamed from plugins/org.eclipse.emf.cdo.releng.setup.editor.rcp/plugin.properties)14
-rw-r--r--plugins/org.eclipse.emf.cdo.releng.setup.installer.editor/plugin.xml (renamed from plugins/org.eclipse.emf.cdo.releng.setup.editor.rcp/plugin.xml)36
-rw-r--r--plugins/org.eclipse.emf.cdo.releng.setup.installer.editor/src/org/eclipse/emf/cdo/releng/setup/installer/editor/SetupActionBarContributor.java (renamed from plugins/org.eclipse.emf.cdo.releng.setup.editor.rcp/src/org/eclipse/emf/cdo/releng/setup/rcp/presentation/SetupActionBarContributor.java)2
-rw-r--r--plugins/org.eclipse.emf.cdo.releng.setup.installer.editor/src/org/eclipse/emf/cdo/releng/setup/installer/editor/SetupEditor.java (renamed from plugins/org.eclipse.emf.cdo.releng.setup.editor.rcp/src/org/eclipse/emf/cdo/releng/setup/rcp/presentation/SetupEditor.java)15
-rw-r--r--plugins/org.eclipse.emf.cdo.releng.setup.installer.editor/src/org/eclipse/emf/cdo/releng/setup/installer/editor/SetupEditorAdvisor.java (renamed from plugins/org.eclipse.emf.cdo.releng.setup.editor.rcp/src/org/eclipse/emf/cdo/releng/setup/rcp/presentation/SetupEditorAdvisor.java)6
-rw-r--r--plugins/org.eclipse.emf.cdo.releng.setup.installer.editor/src/org/eclipse/emf/cdo/releng/setup/installer/editor/SetupEditorPlugin.java (renamed from plugins/org.eclipse.emf.cdo.releng.setup.editor.rcp/src/org/eclipse/emf/cdo/releng/setup/rcp/presentation/SetupEditorPlugin.java)4
-rw-r--r--plugins/org.eclipse.emf.cdo.releng.setup.installer/.classpath (renamed from plugins/org.eclipse.emf.cdo.releng.setup.product/.classpath)0
-rw-r--r--plugins/org.eclipse.emf.cdo.releng.setup.installer/.project (renamed from plugins/org.eclipse.emf.cdo.releng.setup.product/.project)2
-rw-r--r--plugins/org.eclipse.emf.cdo.releng.setup.installer/.settings/org.eclipse.jdt.core.prefs (renamed from plugins/org.eclipse.emf.cdo.releng.setup.product/.settings/org.eclipse.jdt.core.prefs)0
-rw-r--r--plugins/org.eclipse.emf.cdo.releng.setup.installer/.settings/org.eclipse.jdt.ui.prefs (renamed from plugins/org.eclipse.emf.cdo.releng.setup.product/.settings/org.eclipse.jdt.ui.prefs)0
-rw-r--r--plugins/org.eclipse.emf.cdo.releng.setup.installer/.settings/org.eclipse.ltk.core.refactoring.prefs (renamed from plugins/org.eclipse.emf.cdo.releng.setup.product/.settings/org.eclipse.ltk.core.refactoring.prefs)0
-rw-r--r--plugins/org.eclipse.emf.cdo.releng.setup.installer/.settings/org.eclipse.mylyn.tasks.ui.prefs (renamed from plugins/org.eclipse.emf.cdo.releng.setup.product/.settings/org.eclipse.mylyn.tasks.ui.prefs)0
-rw-r--r--plugins/org.eclipse.emf.cdo.releng.setup.installer/.settings/org.eclipse.mylyn.team.ui.prefs (renamed from plugins/org.eclipse.emf.cdo.releng.setup.product/.settings/org.eclipse.mylyn.team.ui.prefs)0
-rw-r--r--plugins/org.eclipse.emf.cdo.releng.setup.installer/.settings/org.eclipse.pde.api.tools.prefs (renamed from plugins/org.eclipse.emf.cdo.releng.setup.product/.settings/org.eclipse.pde.api.tools.prefs)0
-rw-r--r--plugins/org.eclipse.emf.cdo.releng.setup.installer/.settings/org.eclipse.pde.prefs (renamed from plugins/org.eclipse.emf.cdo.releng.setup.product/.settings/org.eclipse.pde.prefs)0
-rw-r--r--plugins/org.eclipse.emf.cdo.releng.setup.installer/META-INF/MANIFEST.MF (renamed from plugins/org.eclipse.emf.cdo.releng.setup.product/META-INF/MANIFEST.MF)8
-rw-r--r--plugins/org.eclipse.emf.cdo.releng.setup.installer/Setup Dialog.launch (renamed from plugins/org.eclipse.emf.cdo.releng.setup.product/Setup Dialog.launch)6
-rw-r--r--plugins/org.eclipse.emf.cdo.releng.setup.installer/about.html (renamed from plugins/org.eclipse.emf.cdo.releng.setup.product/about.html)0
-rw-r--r--plugins/org.eclipse.emf.cdo.releng.setup.installer/about.ini (renamed from plugins/org.eclipse.emf.cdo.releng.setup.product/about.ini)0
-rw-r--r--plugins/org.eclipse.emf.cdo.releng.setup.installer/about.mappings (renamed from plugins/org.eclipse.emf.cdo.releng.setup.product/about.mappings)0
-rw-r--r--plugins/org.eclipse.emf.cdo.releng.setup.installer/about.properties (renamed from plugins/org.eclipse.emf.cdo.releng.setup.product/about.properties)4
-rw-r--r--plugins/org.eclipse.emf.cdo.releng.setup.installer/build.properties (renamed from plugins/org.eclipse.emf.cdo.releng.setup.product/build.properties)0
-rw-r--r--plugins/org.eclipse.emf.cdo.releng.setup.installer/copyright.txt (renamed from plugins/org.eclipse.emf.cdo.releng.setup.product/copyright.txt)0
-rw-r--r--plugins/org.eclipse.emf.cdo.releng.setup.installer/icons/alt_window_16.gif (renamed from plugins/org.eclipse.emf.cdo.releng.setup.product/icons/alt_window_16.gif)bin1017 -> 1017 bytes
-rw-r--r--plugins/org.eclipse.emf.cdo.releng.setup.installer/icons/alt_window_32.gif (renamed from plugins/org.eclipse.emf.cdo.releng.setup.product/icons/alt_window_32.gif)bin1497 -> 1497 bytes
-rw-r--r--plugins/org.eclipse.emf.cdo.releng.setup.installer/icons/alt_window_48.gif (renamed from plugins/org.eclipse.emf.cdo.releng.setup.product/icons/alt_window_48.gif)bin2070 -> 2070 bytes
-rw-r--r--plugins/org.eclipse.emf.cdo.releng.setup.installer/icons/alt_window_64.gif (renamed from plugins/org.eclipse.emf.cdo.releng.setup.product/icons/alt_window_64.gif)bin2760 -> 2760 bytes
-rw-r--r--plugins/org.eclipse.emf.cdo.releng.setup.installer/icons/dialog_update.gif (renamed from plugins/org.eclipse.emf.cdo.releng.setup.product/icons/dialog_update.gif)bin1201 -> 1201 bytes
-rw-r--r--plugins/org.eclipse.emf.cdo.releng.setup.installer/modeling32.png (renamed from plugins/org.eclipse.emf.cdo.releng.setup.product/modeling32.png)bin2414 -> 2414 bytes
-rw-r--r--plugins/org.eclipse.emf.cdo.releng.setup.installer/plugin.properties (renamed from plugins/org.eclipse.emf.cdo.releng.setup.product/plugin.properties)8
-rw-r--r--plugins/org.eclipse.emf.cdo.releng.setup.installer/plugin.xml (renamed from plugins/org.eclipse.emf.cdo.releng.setup.product/plugin.xml)10
-rw-r--r--plugins/org.eclipse.emf.cdo.releng.setup.installer/src/org/eclipse/emf/cdo/releng/setup/installer/Activator.java (renamed from plugins/org.eclipse.emf.cdo.releng.setup.product/src/org/eclipse/emf/cdo/releng/setup/product/Activator.java)4
-rw-r--r--plugins/org.eclipse.emf.cdo.releng.setup.installer/src/org/eclipse/emf/cdo/releng/setup/installer/Application.java (renamed from plugins/org.eclipse.emf.cdo.releng.setup.product/src/org/eclipse/emf/cdo/releng/setup/product/Application.java)12
-rw-r--r--plugins/org.eclipse.emf.cdo.releng.setup.installer/src/org/eclipse/emf/cdo/releng/setup/installer/InstallerDialog.java (renamed from plugins/org.eclipse.emf.cdo.releng.setup.product/src/org/eclipse/emf/cdo/releng/setup/product/SetupDialog.java)12
-rw-r--r--plugins/org.eclipse.emf.cdo.releng.setup.installer/src/org/eclipse/wb/swt/ResourceManager.java (renamed from plugins/org.eclipse.emf.cdo.releng.setup.product/src/org/eclipse/wb/swt/ResourceManager.java)0
-rw-r--r--plugins/org.eclipse.emf.cdo.releng.setup.installer/src/org/eclipse/wb/swt/SWTResourceManager.java (renamed from plugins/org.eclipse.emf.cdo.releng.setup.product/src/org/eclipse/wb/swt/SWTResourceManager.java)2
-rw-r--r--plugins/org.eclipse.emf.cdo.releng.setup/META-INF/MANIFEST.MF4
-rw-r--r--plugins/org.eclipse.emf.cdo.releng.setup/model/setup.rcp.genmodel37
-rw-r--r--plugins/org.eclipse.emf.cdo.releng.setup/src/org/eclipse/emf/cdo/releng/internal/setup/SetupTaskPerformer.java2
-rw-r--r--plugins/org.eclipse.emf.cdo.releng.setup/src/org/eclipse/emf/cdo/releng/internal/setup/ui/ProgressLogDialog.java10
-rw-r--r--plugins/org.eclipse.emf.cdo.releng/build.xml2
73 files changed, 118 insertions, 121 deletions
diff --git a/features/org.eclipse.emf.cdo.releng.setup.product-feature/.project b/features/org.eclipse.emf.cdo.releng.setup.installer-feature/.project
index f7102dcd51..162ab370f2 100644
--- a/features/org.eclipse.emf.cdo.releng.setup.product-feature/.project
+++ b/features/org.eclipse.emf.cdo.releng.setup.installer-feature/.project
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?>
<projectDescription>
- <name>org.eclipse.emf.cdo.releng.setup.product-feature</name>
+ <name>org.eclipse.emf.cdo.releng.setup.installer-feature</name>
<comment></comment>
<projects>
</projects>
diff --git a/features/org.eclipse.emf.cdo.releng.setup.product-feature/.settings/org.eclipse.core.resources.prefs b/features/org.eclipse.emf.cdo.releng.setup.installer-feature/.settings/org.eclipse.core.resources.prefs
index ea8ba69565..ea8ba69565 100644
--- a/features/org.eclipse.emf.cdo.releng.setup.product-feature/.settings/org.eclipse.core.resources.prefs
+++ b/features/org.eclipse.emf.cdo.releng.setup.installer-feature/.settings/org.eclipse.core.resources.prefs
diff --git a/features/org.eclipse.emf.cdo.releng.setup.product-feature/.settings/org.eclipse.mylyn.tasks.ui.prefs b/features/org.eclipse.emf.cdo.releng.setup.installer-feature/.settings/org.eclipse.mylyn.tasks.ui.prefs
index 34b0796d29..34b0796d29 100644
--- a/features/org.eclipse.emf.cdo.releng.setup.product-feature/.settings/org.eclipse.mylyn.tasks.ui.prefs
+++ b/features/org.eclipse.emf.cdo.releng.setup.installer-feature/.settings/org.eclipse.mylyn.tasks.ui.prefs
diff --git a/features/org.eclipse.emf.cdo.releng.setup.product-feature/.settings/org.eclipse.mylyn.team.ui.prefs b/features/org.eclipse.emf.cdo.releng.setup.installer-feature/.settings/org.eclipse.mylyn.team.ui.prefs
index 0c9f6d5a44..0c9f6d5a44 100644
--- a/features/org.eclipse.emf.cdo.releng.setup.product-feature/.settings/org.eclipse.mylyn.team.ui.prefs
+++ b/features/org.eclipse.emf.cdo.releng.setup.installer-feature/.settings/org.eclipse.mylyn.team.ui.prefs
diff --git a/features/org.eclipse.emf.cdo.releng.setup.product-feature/Setup.product b/features/org.eclipse.emf.cdo.releng.setup.installer-feature/Setup.product
index 3ed4719d9d..ef24c446f6 100644
--- a/features/org.eclipse.emf.cdo.releng.setup.product-feature/Setup.product
+++ b/features/org.eclipse.emf.cdo.releng.setup.installer-feature/Setup.product
@@ -1,14 +1,14 @@
<?xml version="1.0" encoding="UTF-8"?>
<?pde version="3.5"?>
-<product name="Installer" id="org.eclipse.emf.cdo.releng.setup.product.ide" application="org.eclipse.emf.cdo.releng.setup.product.app" version="1.0.0.v20131111-1902" useFeatures="true" includeLaunchers="true">
+<product name="Installer" id="org.eclipse.emf.cdo.releng.setup.installer.product" application="org.eclipse.emf.cdo.releng.setup.installer.application" version="1.0.0.v20131112-0801" useFeatures="true" includeLaunchers="true">
<configIni use="">
</configIni>
<launcherArgs>
<programArgs>--launcher.XXMaxPermSize
-128M
+256M
-data
configuration</programArgs>
<vmArgs>-Xms256M
@@ -17,7 +17,7 @@ configuration</programArgs>
-Dorg.eclipse.swt.internal.carbon.smallFonts</vmArgsMac>
</launcherArgs>
- <windowImages i16="/org.eclipse.emf.cdo.releng.setup.product/icons/alt_window_16.gif" i32="/org.eclipse.emf.cdo.releng.setup.product/icons/alt_window_32.gif" i48="/org.eclipse.emf.cdo.releng.setup.product/icons/alt_window_48.gif" i64="/org.eclipse.emf.cdo.releng.setup.product/icons/alt_window_64.gif"/>
+ <windowImages i16="/org.eclipse.emf.cdo.releng.setup.installer/icons/alt_window_16.gif" i32="/org.eclipse.emf.cdo.releng.setup.installer/icons/alt_window_32.gif" i48="/org.eclipse.emf.cdo.releng.setup.installer/icons/alt_window_48.gif" i64="/org.eclipse.emf.cdo.releng.setup.installer/icons/alt_window_64.gif"/>
<launcher name="setup-eclipse">
<solaris/>
@@ -33,7 +33,7 @@ configuration</programArgs>
</plugins>
<features>
- <feature id="org.eclipse.emf.cdo.releng.setup.product"/>
+ <feature id="org.eclipse.emf.cdo.releng.setup.installer"/>
<feature id="org.eclipse.emf.common"/>
<feature id="org.eclipse.emf.common.ui"/>
<feature id="org.eclipse.emf.ecore"/>
diff --git a/features/org.eclipse.emf.cdo.releng.setup.product-feature/about.html b/features/org.eclipse.emf.cdo.releng.setup.installer-feature/about.html
index d35d5aed64..d35d5aed64 100644
--- a/features/org.eclipse.emf.cdo.releng.setup.product-feature/about.html
+++ b/features/org.eclipse.emf.cdo.releng.setup.installer-feature/about.html
diff --git a/features/org.eclipse.emf.cdo.releng.setup.product-feature/buckminster.cspex b/features/org.eclipse.emf.cdo.releng.setup.installer-feature/buckminster.cspex
index de6e4ebd59..de6e4ebd59 100644
--- a/features/org.eclipse.emf.cdo.releng.setup.product-feature/buckminster.cspex
+++ b/features/org.eclipse.emf.cdo.releng.setup.installer-feature/buckminster.cspex
diff --git a/features/org.eclipse.emf.cdo.releng.setup.product-feature/build.properties b/features/org.eclipse.emf.cdo.releng.setup.installer-feature/build.properties
index 3a6f153b6a..3a6f153b6a 100644
--- a/features/org.eclipse.emf.cdo.releng.setup.product-feature/build.properties
+++ b/features/org.eclipse.emf.cdo.releng.setup.installer-feature/build.properties
diff --git a/features/org.eclipse.emf.cdo.releng.setup.product-feature/copyright.txt b/features/org.eclipse.emf.cdo.releng.setup.installer-feature/copyright.txt
index 1c77978050..1c77978050 100644
--- a/features/org.eclipse.emf.cdo.releng.setup.product-feature/copyright.txt
+++ b/features/org.eclipse.emf.cdo.releng.setup.installer-feature/copyright.txt
diff --git a/features/org.eclipse.emf.cdo.releng.setup.product-feature/epl-v10.html b/features/org.eclipse.emf.cdo.releng.setup.installer-feature/epl-v10.html
index cb1073a4ba..cb1073a4ba 100644
--- a/features/org.eclipse.emf.cdo.releng.setup.product-feature/epl-v10.html
+++ b/features/org.eclipse.emf.cdo.releng.setup.installer-feature/epl-v10.html
diff --git a/features/org.eclipse.emf.cdo.releng.setup.product-feature/feature.properties b/features/org.eclipse.emf.cdo.releng.setup.installer-feature/feature.properties
index 9087797cdb..409bbba69d 100644
--- a/features/org.eclipse.emf.cdo.releng.setup.product-feature/feature.properties
+++ b/features/org.eclipse.emf.cdo.releng.setup.installer-feature/feature.properties
@@ -4,8 +4,8 @@
# which accompanies this distribution, and is available at
# http://www.eclipse.org/legal/epl-v10.html
-featureName = Development Environment Setup Product
-description = Contains the definition of a product for setting up development environments.
+featureName = Development Environment Installer
+description = Contains an installer for development environments.
providerName = Eclipse Modeling Project
updateSiteName = Eclipse Modeling Project Updates
diff --git a/features/org.eclipse.emf.cdo.releng.setup.product-feature/feature.xml b/features/org.eclipse.emf.cdo.releng.setup.installer-feature/feature.xml
index 1216d7642a..9497f026b9 100644
--- a/features/org.eclipse.emf.cdo.releng.setup.product-feature/feature.xml
+++ b/features/org.eclipse.emf.cdo.releng.setup.installer-feature/feature.xml
@@ -10,7 +10,7 @@
Eike Stepper - initial API and implementation
-->
<feature
- id="org.eclipse.emf.cdo.releng.setup.product"
+ id="org.eclipse.emf.cdo.releng.setup.installer"
label="%featureName"
version="1.0.0.qualifier"
provider-name="%providerName"
@@ -48,14 +48,14 @@
unpack="false"/>
<plugin
- id="org.eclipse.emf.cdo.releng.setup.editor.rcp"
+ id="org.eclipse.emf.cdo.releng.setup.installer"
download-size="0"
install-size="0"
version="0.0.0"
unpack="false"/>
<plugin
- id="org.eclipse.emf.cdo.releng.setup.product"
+ id="org.eclipse.emf.cdo.releng.setup.installer.editor"
download-size="0"
install-size="0"
version="0.0.0"
diff --git a/features/org.eclipse.emf.cdo.releng.setup.product-feature/license.html b/features/org.eclipse.emf.cdo.releng.setup.installer-feature/license.html
index f19c483b9c..f19c483b9c 100644
--- a/features/org.eclipse.emf.cdo.releng.setup.product-feature/license.html
+++ b/features/org.eclipse.emf.cdo.releng.setup.installer-feature/license.html
diff --git a/features/org.eclipse.emf.cdo.site-feature/category.xml b/features/org.eclipse.emf.cdo.site-feature/category.xml
index 72b83fecff..0782e576c0 100644
--- a/features/org.eclipse.emf.cdo.site-feature/category.xml
+++ b/features/org.eclipse.emf.cdo.site-feature/category.xml
@@ -178,12 +178,9 @@
<category name="org.eclipse.emf.releng.category"/>
</feature>
<feature id="org.eclipse.emf.cdo.epp" version="0.0.0">
- <category name="org.eclipse.emf.cdo.hidden.category"/>
- </feature>
- <feature id="org.eclipse.emf.cdo.epp" version="0.0.0">
<category name="org.eclipse.emf.releng.hidden.category"/>
</feature>
- <feature id="org.eclipse.emf.cdo.releng.setup.product" version="0.0.0">
+ <feature id="org.eclipse.emf.cdo.releng.setup.installer" version="0.0.0">
<category name="org.eclipse.emf.releng.hidden.category"/>
</feature>
<category-def name="org.eclipse.emf.releng.category" label="CDO Release Engineering"/>
diff --git a/features/org.eclipse.emf.cdo.site-feature/feature.xml b/features/org.eclipse.emf.cdo.site-feature/feature.xml
index 36d242b25e..dbb7974f0a 100644
--- a/features/org.eclipse.emf.cdo.site-feature/feature.xml
+++ b/features/org.eclipse.emf.cdo.site-feature/feature.xml
@@ -99,7 +99,7 @@
version="0.0.0"/>
<includes
- id="org.eclipse.emf.cdo.releng.setup.product"
+ id="org.eclipse.emf.cdo.releng.setup.installer"
version="0.0.0"/>
<includes
diff --git a/plugins/org.eclipse.emf.cdo.releng.release/release.properties b/plugins/org.eclipse.emf.cdo.releng.release/release.properties
index 10fe391421..75a9f6c67e 100644
--- a/plugins/org.eclipse.emf.cdo.releng.release/release.properties
+++ b/plugins/org.eclipse.emf.cdo.releng.release/release.properties
@@ -1,7 +1,7 @@
#
#Wed Oct 23 09:45:30 CEST 2013
baseline.for.integration=true
-root.projects=org.eclipse.emf.cdo.site-feature org.eclipse.net4j.db.db2-feature org.eclipse.emf.cdo.releng org.eclipse.emf.cdo.releng.doc org.eclipse.emf.cdo.releng.release org.eclipse.emf.cdo.examples.clone org.eclipse.emf.cdo.examples.client org.eclipse.emf.cdo.examples.master org.eclipse.emf.cdo.examples.client.offline org.eclipse.emf.cdo.releng.setup.product org.eclipse.emf.cdo.releng.ui org.eclipse.emf.cdo.releng.version.tests
+root.projects=org.eclipse.emf.cdo.site-feature org.eclipse.net4j.db.db2-feature org.eclipse.emf.cdo.releng org.eclipse.emf.cdo.releng.doc org.eclipse.emf.cdo.releng.release org.eclipse.emf.cdo.examples.clone org.eclipse.emf.cdo.examples.client org.eclipse.emf.cdo.examples.master org.eclipse.emf.cdo.examples.client.offline org.eclipse.emf.cdo.releng.setup.installer org.eclipse.emf.cdo.releng.ui org.eclipse.emf.cdo.releng.version.tests
>>>>>>>=aeba188 Improve setup related models
ignored.references=org.eclipse.emf.cdo.examples.installer.client org.eclipse.emf.cdo.examples.installer.clone org.eclipse.emf.cdo.examples.installer.master org.eclipse.net4j.db.derby org.apache.derby org.eclipse.emf.cdo.server.objectivity org.eclipse.emf.cdo.server.objectivity.stub org.eclipse.emf.cdo.tests.objectivity
show.deviations=false
diff --git a/plugins/org.eclipse.emf.cdo.releng.setup.editor/src/org/eclipse/emf/cdo/releng/setup/presentation/actions/ManualPerformAction.java b/plugins/org.eclipse.emf.cdo.releng.setup.editor/src/org/eclipse/emf/cdo/releng/setup/presentation/actions/ManualPerformAction.java
index 344380de88..b3c39fa78a 100644
--- a/plugins/org.eclipse.emf.cdo.releng.setup.editor/src/org/eclipse/emf/cdo/releng/setup/presentation/actions/ManualPerformAction.java
+++ b/plugins/org.eclipse.emf.cdo.releng.setup.editor/src/org/eclipse/emf/cdo/releng/setup/presentation/actions/ManualPerformAction.java
@@ -67,7 +67,7 @@ public class ManualPerformAction implements IWorkbenchWindowActionDelegate
// }
Shell shell = PlatformUI.getWorkbench().getWorkbenchWindows()[0].getShell();
- ProgressLogDialog.run(shell, "Setting up IDE", new ProgressLogRunnable()
+ ProgressLogDialog.run(shell, new ProgressLogRunnable()
{
public boolean run(ProgressLog log) throws Exception
{
diff --git a/plugins/org.eclipse.emf.cdo.releng.setup.editor.rcp/.classpath b/plugins/org.eclipse.emf.cdo.releng.setup.installer.editor/.classpath
index 64c5e31b7a..64c5e31b7a 100644
--- a/plugins/org.eclipse.emf.cdo.releng.setup.editor.rcp/.classpath
+++ b/plugins/org.eclipse.emf.cdo.releng.setup.installer.editor/.classpath
diff --git a/plugins/org.eclipse.emf.cdo.releng.setup.editor.rcp/.project b/plugins/org.eclipse.emf.cdo.releng.setup.installer.editor/.project
index b723a70090..35a8ade56a 100644
--- a/plugins/org.eclipse.emf.cdo.releng.setup.editor.rcp/.project
+++ b/plugins/org.eclipse.emf.cdo.releng.setup.installer.editor/.project
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?>
<projectDescription>
- <name>org.eclipse.emf.cdo.releng.setup.editor.rcp</name>
+ <name>org.eclipse.emf.cdo.releng.setup.installer.editor</name>
<comment></comment>
<projects>
</projects>
diff --git a/plugins/org.eclipse.emf.cdo.releng.setup.editor.rcp/.settings/org.eclipse.core.resources.prefs b/plugins/org.eclipse.emf.cdo.releng.setup.installer.editor/.settings/org.eclipse.core.resources.prefs
index 38ce18d974..38ce18d974 100644
--- a/plugins/org.eclipse.emf.cdo.releng.setup.editor.rcp/.settings/org.eclipse.core.resources.prefs
+++ b/plugins/org.eclipse.emf.cdo.releng.setup.installer.editor/.settings/org.eclipse.core.resources.prefs
diff --git a/plugins/org.eclipse.emf.cdo.releng.setup.editor.rcp/.settings/org.eclipse.jdt.core.prefs b/plugins/org.eclipse.emf.cdo.releng.setup.installer.editor/.settings/org.eclipse.jdt.core.prefs
index a32f23e030..a32f23e030 100644
--- a/plugins/org.eclipse.emf.cdo.releng.setup.editor.rcp/.settings/org.eclipse.jdt.core.prefs
+++ b/plugins/org.eclipse.emf.cdo.releng.setup.installer.editor/.settings/org.eclipse.jdt.core.prefs
diff --git a/plugins/org.eclipse.emf.cdo.releng.setup.editor.rcp/.settings/org.eclipse.jdt.ui.prefs b/plugins/org.eclipse.emf.cdo.releng.setup.installer.editor/.settings/org.eclipse.jdt.ui.prefs
index 3fc140fcdc..3fc140fcdc 100644
--- a/plugins/org.eclipse.emf.cdo.releng.setup.editor.rcp/.settings/org.eclipse.jdt.ui.prefs
+++ b/plugins/org.eclipse.emf.cdo.releng.setup.installer.editor/.settings/org.eclipse.jdt.ui.prefs
diff --git a/plugins/org.eclipse.emf.cdo.releng.setup.editor.rcp/.settings/org.eclipse.ltk.core.refactoring.prefs b/plugins/org.eclipse.emf.cdo.releng.setup.installer.editor/.settings/org.eclipse.ltk.core.refactoring.prefs
index 864e30fe5d..864e30fe5d 100644
--- a/plugins/org.eclipse.emf.cdo.releng.setup.editor.rcp/.settings/org.eclipse.ltk.core.refactoring.prefs
+++ b/plugins/org.eclipse.emf.cdo.releng.setup.installer.editor/.settings/org.eclipse.ltk.core.refactoring.prefs
diff --git a/plugins/org.eclipse.emf.cdo.releng.setup.editor.rcp/.settings/org.eclipse.mylyn.tasks.ui.prefs b/plugins/org.eclipse.emf.cdo.releng.setup.installer.editor/.settings/org.eclipse.mylyn.tasks.ui.prefs
index b050639a54..b050639a54 100644
--- a/plugins/org.eclipse.emf.cdo.releng.setup.editor.rcp/.settings/org.eclipse.mylyn.tasks.ui.prefs
+++ b/plugins/org.eclipse.emf.cdo.releng.setup.installer.editor/.settings/org.eclipse.mylyn.tasks.ui.prefs
diff --git a/plugins/org.eclipse.emf.cdo.releng.setup.editor.rcp/.settings/org.eclipse.mylyn.team.ui.prefs b/plugins/org.eclipse.emf.cdo.releng.setup.installer.editor/.settings/org.eclipse.mylyn.team.ui.prefs
index 2f50f36c0c..2f50f36c0c 100644
--- a/plugins/org.eclipse.emf.cdo.releng.setup.editor.rcp/.settings/org.eclipse.mylyn.team.ui.prefs
+++ b/plugins/org.eclipse.emf.cdo.releng.setup.installer.editor/.settings/org.eclipse.mylyn.team.ui.prefs
diff --git a/plugins/org.eclipse.emf.cdo.releng.setup.editor.rcp/.settings/org.eclipse.pde.api.tools.prefs b/plugins/org.eclipse.emf.cdo.releng.setup.installer.editor/.settings/org.eclipse.pde.api.tools.prefs
index 0c17d59e45..0c17d59e45 100644
--- a/plugins/org.eclipse.emf.cdo.releng.setup.editor.rcp/.settings/org.eclipse.pde.api.tools.prefs
+++ b/plugins/org.eclipse.emf.cdo.releng.setup.installer.editor/.settings/org.eclipse.pde.api.tools.prefs
diff --git a/plugins/org.eclipse.emf.cdo.releng.setup.editor.rcp/.settings/org.eclipse.pde.prefs b/plugins/org.eclipse.emf.cdo.releng.setup.installer.editor/.settings/org.eclipse.pde.prefs
index eb962232b8..eb962232b8 100644
--- a/plugins/org.eclipse.emf.cdo.releng.setup.editor.rcp/.settings/org.eclipse.pde.prefs
+++ b/plugins/org.eclipse.emf.cdo.releng.setup.installer.editor/.settings/org.eclipse.pde.prefs
diff --git a/plugins/org.eclipse.emf.cdo.releng.setup.editor.rcp/META-INF/MANIFEST.MF b/plugins/org.eclipse.emf.cdo.releng.setup.installer.editor/META-INF/MANIFEST.MF
index f20e0f04dc..60eab5e185 100644
--- a/plugins/org.eclipse.emf.cdo.releng.setup.editor.rcp/META-INF/MANIFEST.MF
+++ b/plugins/org.eclipse.emf.cdo.releng.setup.installer.editor/META-INF/MANIFEST.MF
@@ -1,14 +1,14 @@
Manifest-Version: 1.0
Bundle-ManifestVersion: 2
Bundle-Name: %pluginName
-Bundle-SymbolicName: org.eclipse.emf.cdo.releng.setup.editor.rcp;singleton:=true
+Bundle-SymbolicName: org.eclipse.emf.cdo.releng.setup.installer.editor;singleton:=true
Bundle-Version: 1.0.0.qualifier
Bundle-ClassPath: .
-Bundle-Activator: org.eclipse.emf.cdo.releng.setup.rcp.presentation.SetupEditorPlugin$Implementation
+Bundle-Activator: org.eclipse.emf.cdo.releng.setup.installer.editor.SetupEditorPlugin$Implementation
Bundle-Vendor: %providerName
Bundle-Localization: plugin
Bundle-RequiredExecutionEnvironment: J2SE-1.5
-Export-Package: org.eclipse.emf.cdo.releng.setup.rcp.presentation;version="1.0.0"
+Export-Package: org.eclipse.emf.cdo.releng.setup.installer.editor;version="1.0.0"
Require-Bundle: org.eclipse.core.runtime;bundle-version="[3.5.0,4.0.0)",
org.eclipse.emf.cdo.releng.setup.edit;visibility:=reexport;bundle-version="[1.0.0,2.0.0)",
org.eclipse.emf.ecore.xmi;visibility:=reexport;bundle-version="[2.5.0,3.0.0)",
diff --git a/plugins/org.eclipse.emf.cdo.releng.setup.editor.rcp/about.html b/plugins/org.eclipse.emf.cdo.releng.setup.installer.editor/about.html
index d35d5aed64..d35d5aed64 100644
--- a/plugins/org.eclipse.emf.cdo.releng.setup.editor.rcp/about.html
+++ b/plugins/org.eclipse.emf.cdo.releng.setup.installer.editor/about.html
diff --git a/plugins/org.eclipse.emf.cdo.releng.setup.editor.rcp/build.properties b/plugins/org.eclipse.emf.cdo.releng.setup.installer.editor/build.properties
index e970acd6fa..e970acd6fa 100644
--- a/plugins/org.eclipse.emf.cdo.releng.setup.editor.rcp/build.properties
+++ b/plugins/org.eclipse.emf.cdo.releng.setup.installer.editor/build.properties
diff --git a/plugins/org.eclipse.emf.cdo.releng.setup.editor.rcp/copyright.txt b/plugins/org.eclipse.emf.cdo.releng.setup.installer.editor/copyright.txt
index 1c77978050..1c77978050 100644
--- a/plugins/org.eclipse.emf.cdo.releng.setup.editor.rcp/copyright.txt
+++ b/plugins/org.eclipse.emf.cdo.releng.setup.installer.editor/copyright.txt
diff --git a/plugins/org.eclipse.emf.cdo.releng.setup.editor.rcp/icons/full/obj16/SetupModelFile.gif b/plugins/org.eclipse.emf.cdo.releng.setup.installer.editor/icons/full/obj16/SetupModelFile.gif
index a7a177ec90..a7a177ec90 100644
--- a/plugins/org.eclipse.emf.cdo.releng.setup.editor.rcp/icons/full/obj16/SetupModelFile.gif
+++ b/plugins/org.eclipse.emf.cdo.releng.setup.installer.editor/icons/full/obj16/SetupModelFile.gif
Binary files differ
diff --git a/plugins/org.eclipse.emf.cdo.releng.setup.editor.rcp/plugin.properties b/plugins/org.eclipse.emf.cdo.releng.setup.installer.editor/plugin.properties
index 4bb870c10a..6901616f01 100644
--- a/plugins/org.eclipse.emf.cdo.releng.setup.editor.rcp/plugin.properties
+++ b/plugins/org.eclipse.emf.cdo.releng.setup.installer.editor/plugin.properties
@@ -9,7 +9,7 @@
# NLS_MESSAGEFORMAT_VAR
-pluginName = Development Environment Setup Editor for RCP
+pluginName = Development Environment Installer Editor
providerName = Eclipse Modeling Project
_UI_SetupEditor_menu = &Setup Editor
@@ -53,7 +53,7 @@ _UI_Wizard_initial_object_description = Specify a file name and select a model o
_UI_FileConflict_label = File Conflict
_WARN_FileConflict = There are unsaved changes that conflict with changes made outside the editor. Do you wish to discard this editor's changes?
-_UI_SetupEditorAdvisor_ActionSet_label = Setup Action Set
+_UI_SetupEditorAdvisor_ActionSet_label = Development Environment Setup
_UI_Perspective_label = Setup
_UI_Browse_label = &Browse...
@@ -63,7 +63,7 @@ _WARN_FileConflict = The file "{0}" already exists. Do you want to replace the
_UI_Error_title = Error
_WARN_No_Editor = There is no editor registered for the file "{0}".
-_UI_Application_title = Setup Application
+_UI_Application_title = Development Environment Installer
_UI_Menu_File_label = &File
_UI_Menu_New_label = &New
_UI_Menu_Open_label = &Open...
@@ -73,9 +73,9 @@ _UI_Menu_OpenURI_description = Opens a model object loading it from a URI
_UI_Menu_Edit_label = &Edit
_UI_Menu_Window_label = &Window
_UI_Menu_Help_label = &Help
-_UI_Menu_About_label = Setup &About...
-_UI_About_title = Setup Application
-_UI_About_text = Setup Application about box goes here.
+_UI_Menu_About_label = &About...
+_UI_About_title = Development Environment Setup
+_UI_About_text = Development Environment Setup
-_UI_SetupModelWizard_ActionSet_label = Setup Model Action Set
+_UI_SetupModelWizard_ActionSet_label = Development Environment Setup
diff --git a/plugins/org.eclipse.emf.cdo.releng.setup.editor.rcp/plugin.xml b/plugins/org.eclipse.emf.cdo.releng.setup.installer.editor/plugin.xml
index 2c0136410a..8a0caf921a 100644
--- a/plugins/org.eclipse.emf.cdo.releng.setup.editor.rcp/plugin.xml
+++ b/plugins/org.eclipse.emf.cdo.releng.setup.installer.editor/plugin.xml
@@ -18,7 +18,7 @@
id="SetupEditorAdvisorApplication">
<!-- @generated setup-rcp -->
<application>
- <run class="org.eclipse.emf.cdo.releng.setup.rcp.presentation.SetupEditorAdvisor$Application"/>
+ <run class="org.eclipse.emf.cdo.releng.setup.installer.editor.SetupEditorAdvisor$Application"/>
</application>
</extension>
@@ -26,8 +26,8 @@
<!-- @generated setup-rcp -->
<perspective
name="%_UI_Perspective_label"
- class="org.eclipse.emf.cdo.releng.setup.rcp.presentation.SetupEditorAdvisor$Perspective"
- id="org.eclipse.emf.cdo.releng.setup.rcp.presentation.SetupEditorAdvisorPerspective">
+ class="org.eclipse.emf.cdo.releng.setup.installer.editor.SetupEditorAdvisor$Perspective"
+ id="org.eclipse.emf.cdo.releng.setup.installer.editor.SetupEditorAdvisorPerspective">
</perspective>
</extension>
@@ -37,22 +37,22 @@
name="%_UI_Menu_OpenURI_label"
description="%_UI_Menu_OpenURI_description"
categoryId="org.eclipse.ui.category.file"
- id="org.eclipse.emf.cdo.releng.setup.rcp.presentation.SetupEditorAdvisorOpenURICommand"/>
+ id="org.eclipse.emf.cdo.releng.setup.installer.editor.SetupEditorAdvisorOpenURICommand"/>
<command
name="%_UI_Menu_Open_label"
description="%_UI_Menu_Open_description"
categoryId="org.eclipse.ui.category.file"
- id="org.eclipse.emf.cdo.releng.setup.rcp.presentation.SetupEditorAdvisorOpenCommand"/>
+ id="org.eclipse.emf.cdo.releng.setup.installer.editor.SetupEditorAdvisorOpenCommand"/>
</extension>
<extension point="org.eclipse.ui.bindings">
<!-- @generated setup-rcp -->
<key
- commandId="org.eclipse.emf.cdo.releng.setup.rcp.presentation.SetupEditorAdvisorOpenURICommand"
+ commandId="org.eclipse.emf.cdo.releng.setup.installer.editor.SetupEditorAdvisorOpenURICommand"
sequence="M1+U"
schemeId="org.eclipse.ui.defaultAcceleratorConfiguration"/>
<key
- commandId="org.eclipse.emf.cdo.releng.setup.rcp.presentation.SetupEditorAdvisorOpenCommand"
+ commandId="org.eclipse.emf.cdo.releng.setup.installer.editor.SetupEditorAdvisorOpenCommand"
sequence="M1+O"
schemeId="org.eclipse.ui.defaultAcceleratorConfiguration"/>
</extension>
@@ -65,33 +65,33 @@
id="SetupEditorAdvisorActionSet">
<action
label="%_UI_Menu_About_label"
- class="org.eclipse.emf.cdo.releng.setup.rcp.presentation.SetupEditorAdvisor$AboutAction"
+ class="org.eclipse.emf.cdo.releng.setup.installer.editor.SetupEditorAdvisor$AboutAction"
menubarPath="help/additions"
- id="org.eclipse.emf.cdo.releng.setup.rcp.presentation.SetupEditorAdvisorAboutAction"/>
+ id="org.eclipse.emf.cdo.releng.setup.installer.editor.SetupEditorAdvisorAboutAction"/>
<action
label="%_UI_Menu_OpenURI_label"
- definitionId="org.eclipse.emf.cdo.releng.setup.rcp.presentation.SetupEditorAdvisorOpenURICommand"
- class="org.eclipse.emf.cdo.releng.setup.rcp.presentation.SetupEditorAdvisor$OpenURIAction"
+ definitionId="org.eclipse.emf.cdo.releng.setup.installer.editor.SetupEditorAdvisorOpenURICommand"
+ class="org.eclipse.emf.cdo.releng.setup.installer.editor.SetupEditorAdvisor$OpenURIAction"
menubarPath="file/additions"
- id="org.eclipse.emf.cdo.releng.setup.rcp.presentation.SetupEditorAdvisorOpenURIAction"/>
+ id="org.eclipse.emf.cdo.releng.setup.installer.editor.SetupEditorAdvisorOpenURIAction"/>
<action
label="%_UI_Menu_Open_label"
- definitionId="org.eclipse.emf.cdo.releng.setup.rcp.presentation.SetupEditorAdvisorOpenCommand"
- class="org.eclipse.emf.cdo.releng.setup.rcp.presentation.SetupEditorAdvisor$OpenAction"
+ definitionId="org.eclipse.emf.cdo.releng.setup.installer.editor.SetupEditorAdvisorOpenCommand"
+ class="org.eclipse.emf.cdo.releng.setup.installer.editor.SetupEditorAdvisor$OpenAction"
menubarPath="file/additions"
- id="org.eclipse.emf.cdo.releng.setup.rcp.presentation.SetupEditorAdvisorOpenAction"/>
+ id="org.eclipse.emf.cdo.releng.setup.installer.editor.SetupEditorAdvisorOpenAction"/>
</actionSet>
</extension>
<extension point="org.eclipse.ui.editors">
<!-- @generated setup-rcp -->
<editor
- id="org.eclipse.emf.cdo.releng.setup.rcp.presentation.SetupEditorID"
+ id="org.eclipse.emf.cdo.releng.setup.installer.editor.SetupEditorID"
name="%_UI_SetupEditor_label"
icon="icons/full/obj16/SetupModelFile.gif"
extensions="setup"
- class="org.eclipse.emf.cdo.releng.setup.rcp.presentation.SetupEditor"
- contributorClass="org.eclipse.emf.cdo.releng.setup.rcp.presentation.SetupActionBarContributor">
+ class="org.eclipse.emf.cdo.releng.setup.installer.editor.SetupEditor"
+ contributorClass="org.eclipse.emf.cdo.releng.setup.installer.editor.SetupActionBarContributor">
</editor>
</extension>
diff --git a/plugins/org.eclipse.emf.cdo.releng.setup.editor.rcp/src/org/eclipse/emf/cdo/releng/setup/rcp/presentation/SetupActionBarContributor.java b/plugins/org.eclipse.emf.cdo.releng.setup.installer.editor/src/org/eclipse/emf/cdo/releng/setup/installer/editor/SetupActionBarContributor.java
index c6ffcaac03..3e8433bef2 100644
--- a/plugins/org.eclipse.emf.cdo.releng.setup.editor.rcp/src/org/eclipse/emf/cdo/releng/setup/rcp/presentation/SetupActionBarContributor.java
+++ b/plugins/org.eclipse.emf.cdo.releng.setup.installer.editor/src/org/eclipse/emf/cdo/releng/setup/installer/editor/SetupActionBarContributor.java
@@ -8,7 +8,7 @@
* Contributors:
* Eike Stepper - initial API and implementation
*/
-package org.eclipse.emf.cdo.releng.setup.rcp.presentation;
+package org.eclipse.emf.cdo.releng.setup.installer.editor;
import org.eclipse.emf.common.ui.viewer.IViewerProvider;
import org.eclipse.emf.edit.domain.EditingDomain;
diff --git a/plugins/org.eclipse.emf.cdo.releng.setup.editor.rcp/src/org/eclipse/emf/cdo/releng/setup/rcp/presentation/SetupEditor.java b/plugins/org.eclipse.emf.cdo.releng.setup.installer.editor/src/org/eclipse/emf/cdo/releng/setup/installer/editor/SetupEditor.java
index c3d8020051..e25da6e86e 100644
--- a/plugins/org.eclipse.emf.cdo.releng.setup.editor.rcp/src/org/eclipse/emf/cdo/releng/setup/rcp/presentation/SetupEditor.java
+++ b/plugins/org.eclipse.emf.cdo.releng.setup.installer.editor/src/org/eclipse/emf/cdo/releng/setup/installer/editor/SetupEditor.java
@@ -8,10 +8,9 @@
* Contributors:
* Eike Stepper - initial API and implementation
*/
-package org.eclipse.emf.cdo.releng.setup.rcp.presentation;
+package org.eclipse.emf.cdo.releng.setup.installer.editor;
import org.eclipse.emf.cdo.releng.predicates.provider.PredicatesItemProviderAdapterFactory;
-import org.eclipse.emf.cdo.releng.setup.provider.SetupItemProviderAdapterFactory;
import org.eclipse.emf.cdo.releng.setup.util.EMFUtil;
import org.eclipse.emf.cdo.releng.setup.util.SetupResourceFactoryImpl;
import org.eclipse.emf.cdo.releng.workingsets.provider.WorkingSetsItemProviderAdapterFactory;
@@ -495,8 +494,8 @@ public class SetupEditor extends MultiPageEditorPart implements IEditingDomainPr
{
if (updateProblemIndication)
{
- BasicDiagnostic diagnostic = new BasicDiagnostic(Diagnostic.OK, "org.eclipse.emf.cdo.releng.setup.editor.rcp", 0,
- null, new Object[] { editingDomain.getResourceSet() });
+ BasicDiagnostic diagnostic = new BasicDiagnostic(Diagnostic.OK,
+ "org.eclipse.emf.cdo.releng.setup.installer.editor", 0, null, new Object[] { editingDomain.getResourceSet() });
for (Diagnostic childDiagnostic : resourceToDiagnosticMap.values())
{
if (childDiagnostic.getSeverity() != Diagnostic.OK)
@@ -570,7 +569,6 @@ public class SetupEditor extends MultiPageEditorPart implements IEditingDomainPr
adapterFactory = new ComposedAdapterFactory(ComposedAdapterFactory.Descriptor.Registry.INSTANCE);
adapterFactory.addAdapterFactory(new ResourceItemProviderAdapterFactory());
- adapterFactory.addAdapterFactory(new SetupItemProviderAdapterFactory());
adapterFactory.addAdapterFactory(new WorkingSetsItemProviderAdapterFactory());
adapterFactory.addAdapterFactory(new PredicatesItemProviderAdapterFactory());
adapterFactory.addAdapterFactory(new ReflectiveItemProviderAdapterFactory());
@@ -881,15 +879,14 @@ public class SetupEditor extends MultiPageEditorPart implements IEditingDomainPr
if (!resource.getErrors().isEmpty() || !resource.getWarnings().isEmpty())
{
BasicDiagnostic basicDiagnostic = new BasicDiagnostic(Diagnostic.ERROR,
- "org.eclipse.emf.cdo.releng.setup.editor.rcp", 0,
- getString("_UI_CreateModelError_message", resource.getURI()),
- new Object[] { exception == null ? (Object)resource : exception });
+ "org.eclipse.emf.cdo.releng.setup.installer.editor", 0, getString("_UI_CreateModelError_message",
+ resource.getURI()), new Object[] { exception == null ? (Object)resource : exception });
basicDiagnostic.merge(EcoreUtil.computeDiagnostic(resource, true));
return basicDiagnostic;
}
else if (exception != null)
{
- return new BasicDiagnostic(Diagnostic.ERROR, "org.eclipse.emf.cdo.releng.setup.editor.rcp", 0, getString(
+ return new BasicDiagnostic(Diagnostic.ERROR, "org.eclipse.emf.cdo.releng.setup.installer.editor", 0, getString(
"_UI_CreateModelError_message", resource.getURI()), new Object[] { exception });
}
else
diff --git a/plugins/org.eclipse.emf.cdo.releng.setup.editor.rcp/src/org/eclipse/emf/cdo/releng/setup/rcp/presentation/SetupEditorAdvisor.java b/plugins/org.eclipse.emf.cdo.releng.setup.installer.editor/src/org/eclipse/emf/cdo/releng/setup/installer/editor/SetupEditorAdvisor.java
index dc90c75fe5..e534e6aed1 100644
--- a/plugins/org.eclipse.emf.cdo.releng.setup.editor.rcp/src/org/eclipse/emf/cdo/releng/setup/rcp/presentation/SetupEditorAdvisor.java
+++ b/plugins/org.eclipse.emf.cdo.releng.setup.installer.editor/src/org/eclipse/emf/cdo/releng/setup/installer/editor/SetupEditorAdvisor.java
@@ -8,7 +8,7 @@
* Contributors:
* Eike Stepper - initial API and implementation
*/
-package org.eclipse.emf.cdo.releng.setup.rcp.presentation;
+package org.eclipse.emf.cdo.releng.setup.installer.editor;
import org.eclipse.emf.common.ui.URIEditorInput;
import org.eclipse.emf.common.ui.action.WorkbenchWindowActionDelegate;
@@ -87,7 +87,7 @@ public final class SetupEditorAdvisor extends WorkbenchAdvisor
*/
private static String getString(String key, Object s1)
{
- return org.eclipse.emf.cdo.releng.setup.rcp.presentation.SetupEditorPlugin.INSTANCE.getString(key,
+ return org.eclipse.emf.cdo.releng.setup.installer.editor.SetupEditorPlugin.INSTANCE.getString(key,
new Object[] { s1 });
}
@@ -153,7 +153,7 @@ public final class SetupEditorAdvisor extends WorkbenchAdvisor
* <!-- end-user-doc -->
* @generated
*/
- public static final String ID_PERSPECTIVE = "org.eclipse.emf.cdo.releng.setup.rcp.presentation.SetupEditorAdvisorPerspective";
+ public static final String ID_PERSPECTIVE = "org.eclipse.emf.cdo.releng.setup.installer.editor.SetupEditorAdvisorPerspective";
/**
* @see org.eclipse.ui.IPerspectiveFactory#createInitialLayout(org.eclipse.ui.IPageLayout)
diff --git a/plugins/org.eclipse.emf.cdo.releng.setup.editor.rcp/src/org/eclipse/emf/cdo/releng/setup/rcp/presentation/SetupEditorPlugin.java b/plugins/org.eclipse.emf.cdo.releng.setup.installer.editor/src/org/eclipse/emf/cdo/releng/setup/installer/editor/SetupEditorPlugin.java
index 8dbeb0049a..ac890c172c 100644
--- a/plugins/org.eclipse.emf.cdo.releng.setup.editor.rcp/src/org/eclipse/emf/cdo/releng/setup/rcp/presentation/SetupEditorPlugin.java
+++ b/plugins/org.eclipse.emf.cdo.releng.setup.installer.editor/src/org/eclipse/emf/cdo/releng/setup/installer/editor/SetupEditorPlugin.java
@@ -8,7 +8,7 @@
* Contributors:
* Eike Stepper - initial API and implementation
*/
-package org.eclipse.emf.cdo.releng.setup.rcp.presentation;
+package org.eclipse.emf.cdo.releng.setup.installer.editor;
import org.eclipse.emf.cdo.releng.predicates.provider.PredicatesEditPlugin;
import org.eclipse.emf.cdo.releng.workingsets.provider.WorkingSetsEditPlugin;
@@ -109,7 +109,7 @@ public final class SetupEditorPlugin extends EMFPlugin
try
{
CommonPlugin.loadClass("org.eclipse.emf.cdo.releng.setup.editor",
- "org.eclipse.emf.cdo.releng.setup.presentation.SetupEditor");
+ "org.eclipse.emf.cdo.releng.setup.editor.SetupEditor");
}
catch (Throwable ex)
{
diff --git a/plugins/org.eclipse.emf.cdo.releng.setup.product/.classpath b/plugins/org.eclipse.emf.cdo.releng.setup.installer/.classpath
index ff3d0de014..ff3d0de014 100644
--- a/plugins/org.eclipse.emf.cdo.releng.setup.product/.classpath
+++ b/plugins/org.eclipse.emf.cdo.releng.setup.installer/.classpath
diff --git a/plugins/org.eclipse.emf.cdo.releng.setup.product/.project b/plugins/org.eclipse.emf.cdo.releng.setup.installer/.project
index 5f5e9bc3e9..3bfc03f47e 100644
--- a/plugins/org.eclipse.emf.cdo.releng.setup.product/.project
+++ b/plugins/org.eclipse.emf.cdo.releng.setup.installer/.project
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?>
<projectDescription>
- <name>org.eclipse.emf.cdo.releng.setup.product</name>
+ <name>org.eclipse.emf.cdo.releng.setup.installer</name>
<comment></comment>
<projects>
</projects>
diff --git a/plugins/org.eclipse.emf.cdo.releng.setup.product/.settings/org.eclipse.jdt.core.prefs b/plugins/org.eclipse.emf.cdo.releng.setup.installer/.settings/org.eclipse.jdt.core.prefs
index 48aafaf7ea..48aafaf7ea 100644
--- a/plugins/org.eclipse.emf.cdo.releng.setup.product/.settings/org.eclipse.jdt.core.prefs
+++ b/plugins/org.eclipse.emf.cdo.releng.setup.installer/.settings/org.eclipse.jdt.core.prefs
diff --git a/plugins/org.eclipse.emf.cdo.releng.setup.product/.settings/org.eclipse.jdt.ui.prefs b/plugins/org.eclipse.emf.cdo.releng.setup.installer/.settings/org.eclipse.jdt.ui.prefs
index 3fc140fcdc..3fc140fcdc 100644
--- a/plugins/org.eclipse.emf.cdo.releng.setup.product/.settings/org.eclipse.jdt.ui.prefs
+++ b/plugins/org.eclipse.emf.cdo.releng.setup.installer/.settings/org.eclipse.jdt.ui.prefs
diff --git a/plugins/org.eclipse.emf.cdo.releng.setup.product/.settings/org.eclipse.ltk.core.refactoring.prefs b/plugins/org.eclipse.emf.cdo.releng.setup.installer/.settings/org.eclipse.ltk.core.refactoring.prefs
index 864e30fe5d..864e30fe5d 100644
--- a/plugins/org.eclipse.emf.cdo.releng.setup.product/.settings/org.eclipse.ltk.core.refactoring.prefs
+++ b/plugins/org.eclipse.emf.cdo.releng.setup.installer/.settings/org.eclipse.ltk.core.refactoring.prefs
diff --git a/plugins/org.eclipse.emf.cdo.releng.setup.product/.settings/org.eclipse.mylyn.tasks.ui.prefs b/plugins/org.eclipse.emf.cdo.releng.setup.installer/.settings/org.eclipse.mylyn.tasks.ui.prefs
index b050639a54..b050639a54 100644
--- a/plugins/org.eclipse.emf.cdo.releng.setup.product/.settings/org.eclipse.mylyn.tasks.ui.prefs
+++ b/plugins/org.eclipse.emf.cdo.releng.setup.installer/.settings/org.eclipse.mylyn.tasks.ui.prefs
diff --git a/plugins/org.eclipse.emf.cdo.releng.setup.product/.settings/org.eclipse.mylyn.team.ui.prefs b/plugins/org.eclipse.emf.cdo.releng.setup.installer/.settings/org.eclipse.mylyn.team.ui.prefs
index 2f50f36c0c..2f50f36c0c 100644
--- a/plugins/org.eclipse.emf.cdo.releng.setup.product/.settings/org.eclipse.mylyn.team.ui.prefs
+++ b/plugins/org.eclipse.emf.cdo.releng.setup.installer/.settings/org.eclipse.mylyn.team.ui.prefs
diff --git a/plugins/org.eclipse.emf.cdo.releng.setup.product/.settings/org.eclipse.pde.api.tools.prefs b/plugins/org.eclipse.emf.cdo.releng.setup.installer/.settings/org.eclipse.pde.api.tools.prefs
index 0c17d59e45..0c17d59e45 100644
--- a/plugins/org.eclipse.emf.cdo.releng.setup.product/.settings/org.eclipse.pde.api.tools.prefs
+++ b/plugins/org.eclipse.emf.cdo.releng.setup.installer/.settings/org.eclipse.pde.api.tools.prefs
diff --git a/plugins/org.eclipse.emf.cdo.releng.setup.product/.settings/org.eclipse.pde.prefs b/plugins/org.eclipse.emf.cdo.releng.setup.installer/.settings/org.eclipse.pde.prefs
index fd493c44ac..fd493c44ac 100644
--- a/plugins/org.eclipse.emf.cdo.releng.setup.product/.settings/org.eclipse.pde.prefs
+++ b/plugins/org.eclipse.emf.cdo.releng.setup.installer/.settings/org.eclipse.pde.prefs
diff --git a/plugins/org.eclipse.emf.cdo.releng.setup.product/META-INF/MANIFEST.MF b/plugins/org.eclipse.emf.cdo.releng.setup.installer/META-INF/MANIFEST.MF
index 800bc8d3de..4eb9fb15ce 100644
--- a/plugins/org.eclipse.emf.cdo.releng.setup.product/META-INF/MANIFEST.MF
+++ b/plugins/org.eclipse.emf.cdo.releng.setup.installer/META-INF/MANIFEST.MF
@@ -1,18 +1,18 @@
Manifest-Version: 1.0
Bundle-ManifestVersion: 2
-Bundle-SymbolicName: org.eclipse.emf.cdo.releng.setup.product;singleton:=true
+Bundle-SymbolicName: org.eclipse.emf.cdo.releng.setup.installer;singleton:=true
Bundle-Version: 1.0.0.qualifier
Bundle-ClassPath: .
Bundle-Name: %pluginName
Bundle-Vendor: %providerName
Bundle-Localization: plugin
-Bundle-Activator: org.eclipse.emf.cdo.releng.setup.product.Activator
+Bundle-Activator: org.eclipse.emf.cdo.releng.setup.installer.Activator
Require-Bundle: org.eclipse.core.runtime;bundle-version="[3.5.0,4.0.0)",
org.eclipse.emf.ecore.xmi;bundle-version="[2.5.0,3.0.0)",
org.eclipse.emf.edit.ui;bundle-version="[2.5.0,3.0.0)",
org.eclipse.emf.cdo.releng.setup;bundle-version="[1.0.0,2.0.0)",
org.eclipse.emf.cdo.releng.setup.edit;bundle-version="[1.0.0,2.0.0)",
- org.eclipse.emf.cdo.releng.setup.editor.rcp;bundle-version="[1.0.0,2.0.0)",
+ org.eclipse.emf.cdo.releng.setup.installer.editor;bundle-version="[1.0.0,2.0.0)",
org.eclipse.equinox.p2.director.app;bundle-version="[1.0.0,2.0.0)",
org.eclipse.equinox.p2.operations;bundle-version="[2.0.0,3.0.0)",
org.eclipse.equinox.p2.metadata;bundle-version="[2.0.0,3.0.0)",
@@ -24,4 +24,4 @@ Require-Bundle: org.eclipse.core.runtime;bundle-version="[3.5.0,4.0.0)",
org.eclipse.equinox.p2.engine;bundle-version="[2.3.0,3.0.0)"
Bundle-RequiredExecutionEnvironment: J2SE-1.5
Bundle-ActivationPolicy: lazy
-Export-Package: org.eclipse.emf.cdo.releng.setup.product;version="1.0.0";x-internal:=true
+Export-Package: org.eclipse.emf.cdo.releng.setup.installer;version="1.0.0";x-internal:=true
diff --git a/plugins/org.eclipse.emf.cdo.releng.setup.product/Setup Dialog.launch b/plugins/org.eclipse.emf.cdo.releng.setup.installer/Setup Dialog.launch
index 1ea88540bb..d1153e7cd4 100644
--- a/plugins/org.eclipse.emf.cdo.releng.setup.product/Setup Dialog.launch
+++ b/plugins/org.eclipse.emf.cdo.releng.setup.installer/Setup Dialog.launch
@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="UTF-8" standalone="no"?>
<launchConfiguration type="org.eclipse.pde.ui.RuntimeWorkbench">
<booleanAttribute key="append.args" value="true"/>
-<stringAttribute key="application" value="org.eclipse.emf.cdo.releng.setup.product.app"/>
+<stringAttribute key="application" value="org.eclipse.emf.cdo.releng.setup.installer.application"/>
<booleanAttribute key="askclear" value="true"/>
<booleanAttribute key="automaticAdd" value="false"/>
<booleanAttribute key="automaticValidate" value="true"/>
@@ -25,9 +25,9 @@
<stringAttribute key="org.eclipse.jdt.launching.SOURCE_PATH_PROVIDER" value="org.eclipse.pde.ui.workbenchClasspathProvider"/>
<stringAttribute key="org.eclipse.jdt.launching.VM_ARGUMENTS" value="-Xms1024m -Xmx2500m -XX:MaxPermSize=512m&#13;&#10;-Declipse.p2.mirrors=false&#13;&#10;-Declipse.p2.unsignedPolicy=allow&#13;&#10;-Dreleng.urlx=file:/${workspace_loc}/org.eclipse.emf.cdo.releng.setup.update&#13;&#10;-Dsetup.urix=file://${resource_loc:/org.eclipse.emf.cdo.releng.setup/model/Configuration.setup}"/>
<stringAttribute key="pde.version" value="3.3"/>
-<stringAttribute key="product" value="org.eclipse.emf.cdo.releng.setup.product.ide"/>
+<stringAttribute key="product" value="org.eclipse.emf.cdo.releng.setup.installer.product"/>
<stringAttribute key="selected_target_plugins" value="com.ibm.icu@default:default,javax.annotation@default:default,javax.inject@default:default,javax.xml@default:default,org.apache.batik.css@default:default,org.apache.batik.util.gui@default:default,org.apache.batik.util@default:default,org.apache.commons.codec@default:default,org.apache.commons.logging@default:default,org.apache.httpcomponents.httpclient@default:default,org.apache.httpcomponents.httpcore@default:default,org.eclipse.ant.core@default:default,org.eclipse.compare.core@default:default,org.eclipse.core.commands@default:default,org.eclipse.core.contenttype@default:default,org.eclipse.core.databinding.observable@default:default,org.eclipse.core.databinding.property@default:default,org.eclipse.core.databinding@default:default,org.eclipse.core.expressions@default:default,org.eclipse.core.filesystem.win32.x86_64@default:false,org.eclipse.core.filesystem@default:default,org.eclipse.core.jobs@default:default,org.eclipse.core.net.win32.x86_64@default:false,org.eclipse.core.net@default:default,org.eclipse.core.resources.win32.x86_64@default:false,org.eclipse.core.resources@default:default,org.eclipse.core.runtime.compatibility.registry@default:false,org.eclipse.core.runtime@default:true,org.eclipse.core.variables@default:default,org.eclipse.e4.core.commands@default:default,org.eclipse.e4.core.contexts@default:default,org.eclipse.e4.core.di.extensions@default:default,org.eclipse.e4.core.di@default:default,org.eclipse.e4.core.services@default:default,org.eclipse.e4.ui.bindings@default:default,org.eclipse.e4.ui.css.core@default:default,org.eclipse.e4.ui.css.swt.theme@default:default,org.eclipse.e4.ui.css.swt@default:default,org.eclipse.e4.ui.di@default:default,org.eclipse.e4.ui.model.workbench@default:default,org.eclipse.e4.ui.services@default:default,org.eclipse.e4.ui.widgets@default:default,org.eclipse.e4.ui.workbench.addons.swt@default:default,org.eclipse.e4.ui.workbench.renderers.swt@default:default,org.eclipse.e4.ui.workbench.swt@default:default,org.eclipse.e4.ui.workbench3@default:default,org.eclipse.e4.ui.workbench@default:default,org.eclipse.ecf.filetransfer@default:default,org.eclipse.ecf.identity@default:default,org.eclipse.ecf.provider.filetransfer.httpclient4.ssl@default:false,org.eclipse.ecf.provider.filetransfer.httpclient4@default:default,org.eclipse.ecf.provider.filetransfer.ssl@default:false,org.eclipse.ecf.provider.filetransfer@default:default,org.eclipse.ecf.ssl@default:false,org.eclipse.ecf@default:default,org.eclipse.emf.common.ui@default:default,org.eclipse.emf.common@default:default,org.eclipse.emf.ecore.change@default:default,org.eclipse.emf.ecore.xmi@default:default,org.eclipse.emf.ecore@default:default,org.eclipse.emf.edit.ui@default:default,org.eclipse.emf.edit@default:default,org.eclipse.equinox.app@default:default,org.eclipse.equinox.common@2:true,org.eclipse.equinox.ds@1:true,org.eclipse.equinox.event@default:default,org.eclipse.equinox.frameworkadmin.equinox@default:default,org.eclipse.equinox.frameworkadmin@default:default,org.eclipse.equinox.p2.artifact.repository@default:default,org.eclipse.equinox.p2.console@default:default,org.eclipse.equinox.p2.core@default:default,org.eclipse.equinox.p2.director.app@default:default,org.eclipse.equinox.p2.director@default:default,org.eclipse.equinox.p2.engine@default:default,org.eclipse.equinox.p2.garbagecollector@default:default,org.eclipse.equinox.p2.jarprocessor@default:default,org.eclipse.equinox.p2.metadata.repository@default:default,org.eclipse.equinox.p2.metadata@default:default,org.eclipse.equinox.p2.operations@default:default,org.eclipse.equinox.p2.publisher.eclipse@default:default,org.eclipse.equinox.p2.publisher@default:default,org.eclipse.equinox.p2.repository@default:default,org.eclipse.equinox.p2.touchpoint.eclipse@default:default,org.eclipse.equinox.p2.touchpoint.natives@default:default,org.eclipse.equinox.p2.transport.ecf@default:default,org.eclipse.equinox.p2.updatesite@default:default,org.eclipse.equinox.preferences@default:default,org.eclipse.equinox.registry@default:default,org.eclipse.equinox.security.win32.x86_64@default:false,org.eclipse.equinox.security@default:default,org.eclipse.equinox.simpleconfigurator.manipulator@default:default,org.eclipse.equinox.simpleconfigurator@1:true,org.eclipse.equinox.util@default:default,org.eclipse.help@default:default,org.eclipse.jface.databinding@default:default,org.eclipse.jface.text@default:default,org.eclipse.jface@default:default,org.eclipse.osgi.compatibility.state@default:false,org.eclipse.osgi.services@default:default,org.eclipse.osgi@-1:true,org.eclipse.swt.win32.win32.x86_64@default:false,org.eclipse.swt@default:default,org.eclipse.team.core@default:default,org.eclipse.text@default:default,org.eclipse.ui.views@default:default,org.eclipse.ui.workbench@default:default,org.eclipse.ui@default:default,org.sat4j.core@default:default,org.sat4j.pb@default:default,org.w3c.css.sac@default:default,org.w3c.dom.smil@default:default,org.w3c.dom.svg@default:default"/>
-<stringAttribute key="selected_workspace_plugins" value="org.eclipse.emf.cdo.ecore.retrofit@default:false,org.eclipse.emf.cdo.releng.predicates.edit@default:default,org.eclipse.emf.cdo.releng.predicates@default:default,org.eclipse.emf.cdo.releng.setup.edit@default:default,org.eclipse.emf.cdo.releng.setup.editor.rcp@default:default,org.eclipse.emf.cdo.releng.setup.product@default:default,org.eclipse.emf.cdo.releng.setup@default:default,org.eclipse.emf.cdo.releng.workingsets.edit@default:default,org.eclipse.emf.cdo.releng.workingsets@default:default,org.eclipse.net4j.util@default:default"/>
+<stringAttribute key="selected_workspace_plugins" value="org.eclipse.emf.cdo.ecore.retrofit@default:false,org.eclipse.emf.cdo.releng.predicates.edit@default:default,org.eclipse.emf.cdo.releng.predicates@default:default,org.eclipse.emf.cdo.releng.setup.edit@default:default,org.eclipse.emf.cdo.releng.setup.installer.editor@default:default,org.eclipse.emf.cdo.releng.setup.installer@default:default,org.eclipse.emf.cdo.releng.setup@default:default,org.eclipse.emf.cdo.releng.workingsets.edit@default:default,org.eclipse.emf.cdo.releng.workingsets@default:default,org.eclipse.net4j.util@default:default"/>
<booleanAttribute key="show_selected_only" value="true"/>
<stringAttribute key="templateConfig" value="${target_home}\configuration\config.ini"/>
<booleanAttribute key="tracing" value="false"/>
diff --git a/plugins/org.eclipse.emf.cdo.releng.setup.product/about.html b/plugins/org.eclipse.emf.cdo.releng.setup.installer/about.html
index d35d5aed64..d35d5aed64 100644
--- a/plugins/org.eclipse.emf.cdo.releng.setup.product/about.html
+++ b/plugins/org.eclipse.emf.cdo.releng.setup.installer/about.html
diff --git a/plugins/org.eclipse.emf.cdo.releng.setup.product/about.ini b/plugins/org.eclipse.emf.cdo.releng.setup.installer/about.ini
index 32006ae5d6..32006ae5d6 100644
--- a/plugins/org.eclipse.emf.cdo.releng.setup.product/about.ini
+++ b/plugins/org.eclipse.emf.cdo.releng.setup.installer/about.ini
diff --git a/plugins/org.eclipse.emf.cdo.releng.setup.product/about.mappings b/plugins/org.eclipse.emf.cdo.releng.setup.installer/about.mappings
index bddaab4310..bddaab4310 100644
--- a/plugins/org.eclipse.emf.cdo.releng.setup.product/about.mappings
+++ b/plugins/org.eclipse.emf.cdo.releng.setup.installer/about.mappings
diff --git a/plugins/org.eclipse.emf.cdo.releng.setup.product/about.properties b/plugins/org.eclipse.emf.cdo.releng.setup.installer/about.properties
index 5a194c5bfe..8c380624bf 100644
--- a/plugins/org.eclipse.emf.cdo.releng.setup.product/about.properties
+++ b/plugins/org.eclipse.emf.cdo.releng.setup.installer/about.properties
@@ -16,8 +16,8 @@
# append it to the end of the file, and change the code to use the new name.
# ==============================================================================
-featureName = Development Environment Setup Product
-featureText = Development Environment Setup Product\n\
+featureName = Development Environment Installer
+featureText = Development Environment Installer\n\
Version: {featureVersion}\n\
Build id: {0}\n\
\n\
diff --git a/plugins/org.eclipse.emf.cdo.releng.setup.product/build.properties b/plugins/org.eclipse.emf.cdo.releng.setup.installer/build.properties
index bbe09191bb..bbe09191bb 100644
--- a/plugins/org.eclipse.emf.cdo.releng.setup.product/build.properties
+++ b/plugins/org.eclipse.emf.cdo.releng.setup.installer/build.properties
diff --git a/plugins/org.eclipse.emf.cdo.releng.setup.product/copyright.txt b/plugins/org.eclipse.emf.cdo.releng.setup.installer/copyright.txt
index 1c77978050..1c77978050 100644
--- a/plugins/org.eclipse.emf.cdo.releng.setup.product/copyright.txt
+++ b/plugins/org.eclipse.emf.cdo.releng.setup.installer/copyright.txt
diff --git a/plugins/org.eclipse.emf.cdo.releng.setup.product/icons/alt_window_16.gif b/plugins/org.eclipse.emf.cdo.releng.setup.installer/icons/alt_window_16.gif
index cf559acd80..cf559acd80 100644
--- a/plugins/org.eclipse.emf.cdo.releng.setup.product/icons/alt_window_16.gif
+++ b/plugins/org.eclipse.emf.cdo.releng.setup.installer/icons/alt_window_16.gif
Binary files differ
diff --git a/plugins/org.eclipse.emf.cdo.releng.setup.product/icons/alt_window_32.gif b/plugins/org.eclipse.emf.cdo.releng.setup.installer/icons/alt_window_32.gif
index ec2dd359aa..ec2dd359aa 100644
--- a/plugins/org.eclipse.emf.cdo.releng.setup.product/icons/alt_window_32.gif
+++ b/plugins/org.eclipse.emf.cdo.releng.setup.installer/icons/alt_window_32.gif
Binary files differ
diff --git a/plugins/org.eclipse.emf.cdo.releng.setup.product/icons/alt_window_48.gif b/plugins/org.eclipse.emf.cdo.releng.setup.installer/icons/alt_window_48.gif
index 722a783d05..722a783d05 100644
--- a/plugins/org.eclipse.emf.cdo.releng.setup.product/icons/alt_window_48.gif
+++ b/plugins/org.eclipse.emf.cdo.releng.setup.installer/icons/alt_window_48.gif
Binary files differ
diff --git a/plugins/org.eclipse.emf.cdo.releng.setup.product/icons/alt_window_64.gif b/plugins/org.eclipse.emf.cdo.releng.setup.installer/icons/alt_window_64.gif
index fdae407f5d..fdae407f5d 100644
--- a/plugins/org.eclipse.emf.cdo.releng.setup.product/icons/alt_window_64.gif
+++ b/plugins/org.eclipse.emf.cdo.releng.setup.installer/icons/alt_window_64.gif
Binary files differ
diff --git a/plugins/org.eclipse.emf.cdo.releng.setup.product/icons/dialog_update.gif b/plugins/org.eclipse.emf.cdo.releng.setup.installer/icons/dialog_update.gif
index 58913ad934..58913ad934 100644
--- a/plugins/org.eclipse.emf.cdo.releng.setup.product/icons/dialog_update.gif
+++ b/plugins/org.eclipse.emf.cdo.releng.setup.installer/icons/dialog_update.gif
Binary files differ
diff --git a/plugins/org.eclipse.emf.cdo.releng.setup.product/modeling32.png b/plugins/org.eclipse.emf.cdo.releng.setup.installer/modeling32.png
index 6b08de2ada..6b08de2ada 100644
--- a/plugins/org.eclipse.emf.cdo.releng.setup.product/modeling32.png
+++ b/plugins/org.eclipse.emf.cdo.releng.setup.installer/modeling32.png
Binary files differ
diff --git a/plugins/org.eclipse.emf.cdo.releng.setup.product/plugin.properties b/plugins/org.eclipse.emf.cdo.releng.setup.installer/plugin.properties
index 22bc5b1c1b..c171266f56 100644
--- a/plugins/org.eclipse.emf.cdo.releng.setup.product/plugin.properties
+++ b/plugins/org.eclipse.emf.cdo.releng.setup.installer/plugin.properties
@@ -7,8 +7,10 @@
# Contributors:
# Eike Stepper - initial API and implementation
-pluginName = Development Environment Setup Product
+pluginName = Development Environment Installer
providerName = Eclipse Modeling Project
-product.description = A product for setting up development environments
-product.name = Setup Product
+application.name = Development Environment Installer
+
+product.name = Development Environment Installer
+product.description = An installer for development environments
diff --git a/plugins/org.eclipse.emf.cdo.releng.setup.product/plugin.xml b/plugins/org.eclipse.emf.cdo.releng.setup.installer/plugin.xml
index 1e68d06df1..b511433e8e 100644
--- a/plugins/org.eclipse.emf.cdo.releng.setup.product/plugin.xml
+++ b/plugins/org.eclipse.emf.cdo.releng.setup.installer/plugin.xml
@@ -14,24 +14,24 @@
<plugin>
<extension
- id="app"
+ id="application"
point="org.eclipse.core.runtime.applications">
<application
cardinality="singleton-global"
thread="main"
visible="true">
<run
- class="org.eclipse.emf.cdo.releng.setup.product.Application">
+ class="org.eclipse.emf.cdo.releng.setup.installer.Application">
</run>
</application>
</extension>
- <extension id="ide" point="org.eclipse.core.runtime.products">
+ <extension id="product" point="org.eclipse.core.runtime.products">
<product
name="%product.name"
description="%product.description"
- application="org.eclipse.emf.cdo.releng.setup.product.app">
- <property name="appName" value="Setup"/>
+ application="org.eclipse.emf.cdo.releng.setup.installer.application">
+ <property name="appName" value="%application.name"/>
<property name="windowImages" value="icons/alt_window_16.gif,icons/alt_window_32.gif"/>
</product>
</extension>
diff --git a/plugins/org.eclipse.emf.cdo.releng.setup.product/src/org/eclipse/emf/cdo/releng/setup/product/Activator.java b/plugins/org.eclipse.emf.cdo.releng.setup.installer/src/org/eclipse/emf/cdo/releng/setup/installer/Activator.java
index 971de012e9..7b0a041fba 100644
--- a/plugins/org.eclipse.emf.cdo.releng.setup.product/src/org/eclipse/emf/cdo/releng/setup/product/Activator.java
+++ b/plugins/org.eclipse.emf.cdo.releng.setup.installer/src/org/eclipse/emf/cdo/releng/setup/installer/Activator.java
@@ -8,7 +8,7 @@
* Contributors:
* Eike Stepper - initial API and implementation
*/
-package org.eclipse.emf.cdo.releng.setup.product;
+package org.eclipse.emf.cdo.releng.setup.installer;
import org.eclipse.core.runtime.CoreException;
import org.eclipse.core.runtime.IStatus;
@@ -23,7 +23,7 @@ import org.osgi.framework.BundleContext;
*/
public class Activator extends AbstractUIPlugin
{
- public static final String PLUGIN_ID = "org.eclipse.emf.cdo.releng.setup.product";
+ public static final String PLUGIN_ID = "org.eclipse.emf.cdo.releng.setup.installer";
private static Activator plugin;
diff --git a/plugins/org.eclipse.emf.cdo.releng.setup.product/src/org/eclipse/emf/cdo/releng/setup/product/Application.java b/plugins/org.eclipse.emf.cdo.releng.setup.installer/src/org/eclipse/emf/cdo/releng/setup/installer/Application.java
index 6c9fa46cb6..76af13d21a 100644
--- a/plugins/org.eclipse.emf.cdo.releng.setup.product/src/org/eclipse/emf/cdo/releng/setup/product/Application.java
+++ b/plugins/org.eclipse.emf.cdo.releng.setup.installer/src/org/eclipse/emf/cdo/releng/setup/installer/Application.java
@@ -8,11 +8,11 @@
* Contributors:
* Eike Stepper - initial API and implementation
*/
-package org.eclipse.emf.cdo.releng.setup.product;
+package org.eclipse.emf.cdo.releng.setup.installer;
import org.eclipse.emf.cdo.releng.internal.setup.ui.ErrorDialog;
import org.eclipse.emf.cdo.releng.setup.Preferences;
-import org.eclipse.emf.cdo.releng.setup.rcp.presentation.SetupEditorAdvisor;
+import org.eclipse.emf.cdo.releng.setup.installer.editor.SetupEditorAdvisor;
import org.eclipse.emf.common.ui.URIEditorInput;
import org.eclipse.emf.common.util.URI;
@@ -40,15 +40,15 @@ public class Application implements IApplication
int retcode;
for (;;)
{
- SetupDialog dialog = new SetupDialog(null);
+ InstallerDialog dialog = new InstallerDialog(null);
retcode = dialog.open();
- if (retcode == SetupDialog.RETURN_RESTART)
+ if (retcode == InstallerDialog.RETURN_RESTART)
{
return EXIT_RESTART;
}
- if (retcode != SetupDialog.RETURN_WORKBENCH)
+ if (retcode != InstallerDialog.RETURN_WORKBENCH)
{
return EXIT_OK;
}
@@ -70,7 +70,7 @@ public class Application implements IApplication
try
{
IWorkbenchPage page = workbenchWindow.getActivePage();
- page.openEditor(editorInput, "org.eclipse.emf.cdo.releng.setup.rcp.presentation.SetupEditorID");
+ page.openEditor(editorInput, "org.eclipse.emf.cdo.releng.setup.installer.editor.SetupEditorID");
}
catch (PartInitException ex)
{
diff --git a/plugins/org.eclipse.emf.cdo.releng.setup.product/src/org/eclipse/emf/cdo/releng/setup/product/SetupDialog.java b/plugins/org.eclipse.emf.cdo.releng.setup.installer/src/org/eclipse/emf/cdo/releng/setup/installer/InstallerDialog.java
index af56dbba99..b0ba45f208 100644
--- a/plugins/org.eclipse.emf.cdo.releng.setup.product/src/org/eclipse/emf/cdo/releng/setup/product/SetupDialog.java
+++ b/plugins/org.eclipse.emf.cdo.releng.setup.installer/src/org/eclipse/emf/cdo/releng/setup/installer/InstallerDialog.java
@@ -8,7 +8,7 @@
* Contributors:
* Eike Stepper - initial API and implementation
*/
-package org.eclipse.emf.cdo.releng.setup.product;
+package org.eclipse.emf.cdo.releng.setup.installer;
import org.eclipse.emf.cdo.releng.internal.setup.SetupTaskPerformer;
import org.eclipse.emf.cdo.releng.internal.setup.ui.ErrorDialog;
@@ -122,7 +122,7 @@ import java.util.Map;
/**
* @author Eike Stepper
*/
-public class SetupDialog extends TitleAreaDialog
+public class InstallerDialog extends TitleAreaDialog
{
public static final int RETURN_WORKBENCH = -2;
@@ -150,7 +150,7 @@ public class SetupDialog extends TitleAreaDialog
* Create the dialog.
* @param parentShell
*/
- public SetupDialog(Shell parentShell)
+ public InstallerDialog(Shell parentShell)
{
super(parentShell);
setShellStyle(SWT.CLOSE | SWT.RESIZE | SWT.TITLE);
@@ -523,7 +523,7 @@ public class SetupDialog extends TitleAreaDialog
IStatus updateStatus = checkForUpdates(agent, monitor);
if (updateStatus.getCode() == UpdateOperation.STATUS_NOTHING_TO_UPDATE)
{
- SetupDialog.this.getShell().getDisplay().asyncExec(new Runnable()
+ InstallerDialog.this.getShell().getDisplay().asyncExec(new Runnable()
{
public void run()
{
@@ -533,7 +533,7 @@ public class SetupDialog extends TitleAreaDialog
}
else if (updateStatus.getSeverity() != IStatus.ERROR)
{
- SetupDialog.this.getShell().getDisplay().asyncExec(new Runnable()
+ InstallerDialog.this.getShell().getDisplay().asyncExec(new Runnable()
{
public void run()
{
@@ -897,7 +897,7 @@ public class SetupDialog extends TitleAreaDialog
}
}
- ProgressLogDialog.run(getShell(), "Setting up IDE", new ProgressLogRunnable()
+ ProgressLogDialog.run(getShell(), new ProgressLogRunnable()
{
public boolean run(ProgressLog log) throws Exception
{
diff --git a/plugins/org.eclipse.emf.cdo.releng.setup.product/src/org/eclipse/wb/swt/ResourceManager.java b/plugins/org.eclipse.emf.cdo.releng.setup.installer/src/org/eclipse/wb/swt/ResourceManager.java
index 99ccdcd711..99ccdcd711 100644
--- a/plugins/org.eclipse.emf.cdo.releng.setup.product/src/org/eclipse/wb/swt/ResourceManager.java
+++ b/plugins/org.eclipse.emf.cdo.releng.setup.installer/src/org/eclipse/wb/swt/ResourceManager.java
diff --git a/plugins/org.eclipse.emf.cdo.releng.setup.product/src/org/eclipse/wb/swt/SWTResourceManager.java b/plugins/org.eclipse.emf.cdo.releng.setup.installer/src/org/eclipse/wb/swt/SWTResourceManager.java
index 238c34bc81..2188e1e718 100644
--- a/plugins/org.eclipse.emf.cdo.releng.setup.product/src/org/eclipse/wb/swt/SWTResourceManager.java
+++ b/plugins/org.eclipse.emf.cdo.releng.setup.installer/src/org/eclipse/wb/swt/SWTResourceManager.java
@@ -10,7 +10,7 @@
*******************************************************************************/
package org.eclipse.wb.swt;
-import org.eclipse.emf.cdo.releng.setup.product.Activator;
+import org.eclipse.emf.cdo.releng.setup.installer.Activator;
import org.eclipse.swt.SWT;
import org.eclipse.swt.graphics.Color;
diff --git a/plugins/org.eclipse.emf.cdo.releng.setup/META-INF/MANIFEST.MF b/plugins/org.eclipse.emf.cdo.releng.setup/META-INF/MANIFEST.MF
index 10453814bf..fd6fd70272 100644
--- a/plugins/org.eclipse.emf.cdo.releng.setup/META-INF/MANIFEST.MF
+++ b/plugins/org.eclipse.emf.cdo.releng.setup/META-INF/MANIFEST.MF
@@ -59,8 +59,8 @@ Require-Bundle: org.eclipse.net4j.util;bundle-version="[3.0.0,4.0.0)",
org.eclipse.mylyn.tasks.core;bundle-version="[3.0.0,4.0.0)";resolution:=optional
Bundle-RequiredExecutionEnvironment: J2SE-1.5
Bundle-ActivationPolicy: lazy
-Export-Package: org.eclipse.emf.cdo.releng.internal.setup;x-friends:="org.eclipse.emf.cdo.releng.setup.product,org.eclipse.emf.cdo.releng.setup.editor";version="1.0.0",
- org.eclipse.emf.cdo.releng.internal.setup.ui;x-friends:="org.eclipse.emf.cdo.releng.setup.product,org.eclipse.emf.cdo.releng.setup.editor";version="1.0.0",
+Export-Package: org.eclipse.emf.cdo.releng.internal.setup;x-friends:="org.eclipse.emf.cdo.releng.setup.installer,org.eclipse.emf.cdo.releng.setup.editor";version="1.0.0",
+ org.eclipse.emf.cdo.releng.internal.setup.ui;x-friends:="org.eclipse.emf.cdo.releng.setup.installer,org.eclipse.emf.cdo.releng.setup.editor";version="1.0.0",
org.eclipse.emf.cdo.releng.setup;version="1.0.0",
org.eclipse.emf.cdo.releng.setup.impl;version="1.0.0",
org.eclipse.emf.cdo.releng.setup.util;version="1.0.0",
diff --git a/plugins/org.eclipse.emf.cdo.releng.setup/model/setup.rcp.genmodel b/plugins/org.eclipse.emf.cdo.releng.setup/model/setup.rcp.genmodel
index 47a1bcb233..58140fa5e3 100644
--- a/plugins/org.eclipse.emf.cdo.releng.setup/model/setup.rcp.genmodel
+++ b/plugins/org.eclipse.emf.cdo.releng.setup/model/setup.rcp.genmodel
@@ -1,20 +1,20 @@
<?xml version="1.0" encoding="UTF-8"?>
<genmodel:GenModel xmi:version="2.0" xmlns:xmi="http://www.omg.org/XMI" xmlns:ecore="http://www.eclipse.org/emf/2002/Ecore"
xmlns:genmodel="http://www.eclipse.org/emf/2002/GenModel" modelDirectory="/org.eclipse.emf.cdo.releng.setup/src" creationIcons="false"
- editorDirectory="/org.eclipse.emf.cdo.releng.setup.editor.rcp/src" modelPluginID="org.eclipse.emf.cdo.releng.setup"
- modelName="Setup" editorPluginClass="org.eclipse.emf.cdo.releng.setup.rcp.presentation.SetupEditorPlugin"
+ editDirectory="" editorDirectory="/org.eclipse.emf.cdo.releng.setup.installer.editor/src"
+ modelPluginID="org.eclipse.emf.cdo.releng.setup" modelName="Setup" editorPluginClass="org.eclipse.emf.cdo.releng.setup.installer.editor.SetupEditorPlugin"
rootExtendsClass="org.eclipse.emf.ecore.impl.MinimalEObjectImpl$Container" codeFormatting="true"
testsDirectory="" importerID="org.eclipse.emf.importer.ecore" complianceLevel="5.0"
- copyrightFields="false" editorPluginID="org.eclipse.emf.cdo.releng.setup.editor.rcp"
+ copyrightFields="false" editorPluginID="org.eclipse.emf.cdo.releng.setup.installer.editor"
optimizedHasChildren="true" runtimeVersion="2.5" usedGenPackages="../../org.eclipse.emf.cdo.releng.workingsets/model/workingsets.genmodel#//workingsets ../../org.eclipse.emf.cdo.releng.predicates/model/predicates.genmodel#//predicates"
runtimePlatform="RCP" importOrganizing="true">
<foreignModel>setup.ecore</foreignModel>
<genPackages prefix="Setup" basePackage="org.eclipse.emf.cdo.releng" disposableProviderFactory="true"
- presentationPackageSuffix="rcp.presentation" multipleEditorPages="false" generateModelWizard="false"
+ presentationPackageSuffix="installer.editor" multipleEditorPages="false" generateModelWizard="false"
ecorePackage="setup.ecore#/">
<genEnums typeSafeEnumCompatible="false" ecoreEnum="setup.ecore#//SetupTaskScope">
<genEnumLiterals ecoreEnumLiteral="setup.ecore#//SetupTaskScope/None"/>
- <genEnumLiterals ecoreEnumLiteral="setup.ecore#//SetupTaskScope/Configuration"/>
+ <genEnumLiterals ecoreEnumLiteral="setup.ecore#//SetupTaskScope/Eclipse"/>
<genEnumLiterals ecoreEnumLiteral="setup.ecore#//SetupTaskScope/Project"/>
<genEnumLiterals ecoreEnumLiteral="setup.ecore#//SetupTaskScope/Branch"/>
<genEnumLiterals ecoreEnumLiteral="setup.ecore#//SetupTaskScope/User"/>
@@ -35,9 +35,9 @@
<genClasses image="false" ecoreClass="setup.ecore#//TopLevelElement">
<genFeatures createChild="false" ecoreFeature="ecore:EAttribute setup.ecore#//TopLevelElement/toolVersion"/>
</genClasses>
- <genClasses ecoreClass="setup.ecore#//EclipseVersion">
- <genFeatures property="None" notify="false" createChild="false" ecoreFeature="ecore:EReference setup.ecore#//EclipseVersion/configuration"/>
- <genFeatures createChild="false" ecoreFeature="ecore:EAttribute setup.ecore#//EclipseVersion/version"/>
+ <genClasses ecoreClass="setup.ecore#//Eclipse">
+ <genFeatures property="None" notify="false" createChild="false" ecoreFeature="ecore:EReference setup.ecore#//Eclipse/configuration"/>
+ <genFeatures createChild="false" ecoreFeature="ecore:EAttribute setup.ecore#//Eclipse/version"/>
</genClasses>
<genClasses ecoreClass="setup.ecore#//Configuration">
<genFeatures property="None" children="true" createChild="true" ecoreFeature="ecore:EReference setup.ecore#//Configuration/projects"/>
@@ -88,9 +88,6 @@
<genClasses ecoreClass="setup.ecore#//CompoundSetupTask">
<genFeatures createChild="false" ecoreFeature="ecore:EAttribute setup.ecore#//CompoundSetupTask/name"/>
</genClasses>
- <genClasses image="false" ecoreClass="setup.ecore#//OneTimeSetupTask">
- <genFeatures createChild="false" ecoreFeature="ecore:EAttribute setup.ecore#//OneTimeSetupTask/id"/>
- </genClasses>
<genClasses ecoreClass="setup.ecore#//EclipseIniTask">
<genFeatures createChild="false" ecoreFeature="ecore:EAttribute setup.ecore#//EclipseIniTask/option"/>
<genFeatures createChild="false" ecoreFeature="ecore:EAttribute setup.ecore#//EclipseIniTask/value"/>
@@ -105,12 +102,10 @@
<genFeatures property="None" children="true" createChild="true" ecoreFeature="ecore:EReference setup.ecore#//P2Task/installableUnits"/>
</genClasses>
<genClasses ecoreClass="setup.ecore#//InstallableUnit">
- <genFeatures property="None" notify="false" createChild="false" ecoreFeature="ecore:EReference setup.ecore#//InstallableUnit/p2Task"/>
- <genFeatures createChild="false" ecoreFeature="ecore:EAttribute setup.ecore#//InstallableUnit/id"/>
+ <genFeatures createChild="false" ecoreFeature="ecore:EAttribute setup.ecore#//InstallableUnit/iD"/>
</genClasses>
<genClasses ecoreClass="setup.ecore#//P2Repository">
- <genFeatures property="None" notify="false" createChild="false" ecoreFeature="ecore:EReference setup.ecore#//P2Repository/p2Task"/>
- <genFeatures createChild="false" ecoreFeature="ecore:EAttribute setup.ecore#//P2Repository/url"/>
+ <genFeatures createChild="false" ecoreFeature="ecore:EAttribute setup.ecore#//P2Repository/uRL"/>
</genClasses>
<genClasses image="false" ecoreClass="setup.ecore#//BasicMaterializationTask">
<genFeatures createChild="false" ecoreFeature="ecore:EAttribute setup.ecore#//BasicMaterializationTask/targetPlatform"/>
@@ -151,11 +146,14 @@
<genFeatures createChild="false" ecoreFeature="ecore:EAttribute setup.ecore#//ApiBaselineTask/zipLocation"/>
</genClasses>
<genClasses ecoreClass="setup.ecore#//GitCloneTask">
- <genFeatures createChild="false" ecoreFeature="ecore:EAttribute setup.ecore#//GitCloneTask/name"/>
+ <genFeatures createChild="false" ecoreFeature="ecore:EAttribute setup.ecore#//GitCloneTask/location"/>
<genFeatures createChild="false" ecoreFeature="ecore:EAttribute setup.ecore#//GitCloneTask/remoteName"/>
<genFeatures createChild="false" ecoreFeature="ecore:EAttribute setup.ecore#//GitCloneTask/remoteURI"/>
<genFeatures createChild="false" ecoreFeature="ecore:EAttribute setup.ecore#//GitCloneTask/checkoutBranch"/>
</genClasses>
+ <genClasses ecoreClass="setup.ecore#//ProjectSetImportTask">
+ <genFeatures createChild="false" ecoreFeature="ecore:EAttribute setup.ecore#//ProjectSetImportTask/uRL"/>
+ </genClasses>
<genClasses ecoreClass="setup.ecore#//EclipsePreferenceTask">
<genFeatures createChild="false" ecoreFeature="ecore:EAttribute setup.ecore#//EclipsePreferenceTask/key"/>
<genFeatures createChild="false" ecoreFeature="ecore:EAttribute setup.ecore#//EclipsePreferenceTask/value"/>
@@ -173,7 +171,7 @@
<genFeatures createChild="false" ecoreFeature="ecore:EAttribute setup.ecore#//ResourceCreationTask/encoding"/>
</genClasses>
<genClasses ecoreClass="setup.ecore#//TextModifyTask">
- <genFeatures createChild="false" ecoreFeature="ecore:EAttribute setup.ecore#//TextModifyTask/url"/>
+ <genFeatures createChild="false" ecoreFeature="ecore:EAttribute setup.ecore#//TextModifyTask/uRL"/>
<genFeatures property="None" children="true" createChild="true" ecoreFeature="ecore:EReference setup.ecore#//TextModifyTask/modifications"/>
</genClasses>
<genClasses ecoreClass="setup.ecore#//TextModification">
@@ -190,13 +188,14 @@
<genFeatures property="None" children="true" createChild="true" ecoreFeature="ecore:EReference setup.ecore#//KeyBindingTask/commandParameters"/>
</genClasses>
<genClasses ecoreClass="setup.ecore#//CommandParameter">
- <genFeatures createChild="false" ecoreFeature="ecore:EAttribute setup.ecore#//CommandParameter/id"/>
+ <genFeatures createChild="false" ecoreFeature="ecore:EAttribute setup.ecore#//CommandParameter/iD"/>
<genFeatures createChild="false" ecoreFeature="ecore:EAttribute setup.ecore#//CommandParameter/value"/>
</genClasses>
<genClasses ecoreClass="setup.ecore#//MylynQueryTask">
<genFeatures createChild="false" ecoreFeature="ecore:EAttribute setup.ecore#//MylynQueryTask/connectorKind"/>
<genFeatures createChild="false" ecoreFeature="ecore:EAttribute setup.ecore#//MylynQueryTask/summary"/>
- <genFeatures createChild="false" ecoreFeature="ecore:EAttribute setup.ecore#//MylynQueryTask/url"/>
+ <genFeatures createChild="false" ecoreFeature="ecore:EAttribute setup.ecore#//MylynQueryTask/repositoryURL"/>
+ <genFeatures createChild="false" ecoreFeature="ecore:EAttribute setup.ecore#//MylynQueryTask/relativeURL"/>
</genClasses>
</genPackages>
</genmodel:GenModel>
diff --git a/plugins/org.eclipse.emf.cdo.releng.setup/src/org/eclipse/emf/cdo/releng/internal/setup/SetupTaskPerformer.java b/plugins/org.eclipse.emf.cdo.releng.setup/src/org/eclipse/emf/cdo/releng/internal/setup/SetupTaskPerformer.java
index b2933c356f..67052241f1 100644
--- a/plugins/org.eclipse.emf.cdo.releng.setup/src/org/eclipse/emf/cdo/releng/internal/setup/SetupTaskPerformer.java
+++ b/plugins/org.eclipse.emf.cdo.releng.setup/src/org/eclipse/emf/cdo/releng/internal/setup/SetupTaskPerformer.java
@@ -468,7 +468,7 @@ public class SetupTaskPerformer extends HashMap<Object, Object> implements Setup
if (Activator.SETUP_IDE && trigger != Trigger.MANUAL)
{
Shell shell = PlatformUI.getWorkbench().getWorkbenchWindows()[0].getShell();
- ProgressLogDialog.run(shell, "Setting up IDE", new ProgressLogRunnable()
+ ProgressLogDialog.run(shell, new ProgressLogRunnable()
{
public boolean run(ProgressLog log) throws Exception
{
diff --git a/plugins/org.eclipse.emf.cdo.releng.setup/src/org/eclipse/emf/cdo/releng/internal/setup/ui/ProgressLogDialog.java b/plugins/org.eclipse.emf.cdo.releng.setup/src/org/eclipse/emf/cdo/releng/internal/setup/ui/ProgressLogDialog.java
index aac49ce67c..8f1c5ab726 100644
--- a/plugins/org.eclipse.emf.cdo.releng.setup/src/org/eclipse/emf/cdo/releng/internal/setup/ui/ProgressLogDialog.java
+++ b/plugins/org.eclipse.emf.cdo.releng.setup/src/org/eclipse/emf/cdo/releng/internal/setup/ui/ProgressLogDialog.java
@@ -79,7 +79,9 @@ import java.util.List;
public class ProgressLogDialog extends TitleAreaDialog implements ProgressLog
{
- public static final String TITLE = "Setup Development Environment";
+ public static final String TITLE = "Development Environment Setup";
+
+ public static final String JOB_NAME = "Setting up IDE";
private static final SimpleDateFormat TIME = new SimpleDateFormat("HH:mm:ss");
@@ -489,7 +491,7 @@ public class ProgressLogDialog extends TitleAreaDialog implements ProgressLog
return false;
}
- public static void run(final Shell shell, final String jobName, final ProgressLogRunnable runnable,
+ public static void run(final Shell shell, final ProgressLogRunnable runnable,
List<SetupTaskPerformer> setupTaskPerformers)
{
try
@@ -500,7 +502,7 @@ public class ProgressLogDialog extends TitleAreaDialog implements ProgressLog
{
public void run()
{
- final Job job = new Job(jobName)
+ final Job job = new Job(JOB_NAME)
{
@Override
protected IStatus run(IProgressMonitor monitor)
@@ -509,7 +511,7 @@ public class ProgressLogDialog extends TitleAreaDialog implements ProgressLog
try
{
- dialog.log(jobName);
+ dialog.log(JOB_NAME);
restart[0] = runnable.run(dialog);
}
catch (Throwable ex)
diff --git a/plugins/org.eclipse.emf.cdo.releng/build.xml b/plugins/org.eclipse.emf.cdo.releng/build.xml
index 54340f1ebf..96419ada1c 100644
--- a/plugins/org.eclipse.emf.cdo.releng/build.xml
+++ b/plugins/org.eclipse.emf.cdo.releng/build.xml
@@ -359,7 +359,7 @@
<equals arg1="${skip.generate.products.setup}" arg2="true" />
</not>
<then>
- <generate.product id="org.eclipse.emf.cdo.releng.setup.product.ide" profile="Setup" priority="2" />
+ <generate.product id="org.eclipse.emf.cdo.releng.setup.installer.product" profile="Setup" priority="2" />
</then>
</if>
</sequential>

Back to the top