Improve setup related models

Change-Id: I3655dbc05e79a6e2daee7f517f67dab68d74e134
Signed-off-by: Ed Merks <ed.merks@gmail.com>

10 files changed, 5 insertions, 53 deletions

diff --git a/plugins/org.eclipse.emf.cdo.releng.manifests/plugin.xml b/plugins/org.eclipse.emf.cdo.releng.manifests/plugin.xml
index 3daa4ca248..a7a6592bee 100644
--- a/plugins/org.eclipse.emf.cdo.releng.manifests/plugin.xml
+++ b/plugins/org.eclipse.emf.cdo.releng.manifests/plugin.xml
@@ -16,7 +16,7 @@
    <extension
          point="org.eclipse.ui.commands">
       <category
-            name="CDO Release Engineering"
+            name="Release Engineering"
             id="org.eclipse.emf.cdo.releng">
       </category>
       <command
diff --git a/plugins/org.eclipse.emf.cdo.releng.predicates/about.ini b/plugins/org.eclipse.emf.cdo.releng.predicates/about.ini
deleted file mode 100644
index 32006ae5d6..0000000000
--- a/plugins/org.eclipse.emf.cdo.releng.predicates/about.ini
+++ /dev/null
@@ -1,15 +0,0 @@
-# about.ini
-# contains information about a feature
-# java.io.Properties file (ISO 8859-1 with "\" escapes)
-# "%key" are externalized strings defined in about.properties
-# This file does not need to be translated.
-
-# Property "aboutText" contains blurb for "About" dialog (translated)
-aboutText=%featureText 
-
-# Property "featureImage" contains path to feature image (32x32)
-featureImage=modeling32.png
-
-# Property "appName" contains name of the application (translated)
-appName=%featureName
-
diff --git a/plugins/org.eclipse.emf.cdo.releng.predicates/about.mappings b/plugins/org.eclipse.emf.cdo.releng.predicates/about.mappings
deleted file mode 100644
index bddaab4310..0000000000
--- a/plugins/org.eclipse.emf.cdo.releng.predicates/about.mappings
+++ /dev/null
@@ -1,6 +0,0 @@
-# about.mappings
-# contains fill-ins for about.properties
-# java.io.Properties file (ISO 8859-1 with "\" escapes)
-# This file does not need to be translated.
-
-0=@build@
\ No newline at end of file
diff --git a/plugins/org.eclipse.emf.cdo.releng.predicates/about.properties b/plugins/org.eclipse.emf.cdo.releng.predicates/about.properties
deleted file mode 100644
index 38db50e325..0000000000
--- a/plugins/org.eclipse.emf.cdo.releng.predicates/about.properties
+++ /dev/null
@@ -1,23 +0,0 @@
-# Copyright (c) 2013 Eike Stepper (Berlin, Germany) and others.
-# All rights reserved. This program and the accompanying materials
-# are made available under the terms of the Eclipse Public License v1.0
-# which accompanies this distribution, and is available at
-# http://www.eclipse.org/legal/epl-v10.html
-#
-# Contributors:
-#    Eike Stepper - initial API and implementation
-
-# NLS_MESSAGEFORMAT_VAR
-
-# ==============================================================================
-# Do not change the properties between this line and the last line containing:
-# %%% END OF TRANSLATED PROPERTIES %%%
-# Instead, either redefine an existing property, or create a new property,
-# append it to the end of the file, and change the code to use the new name.
-# ==============================================================================
-
-featureName = Project Predicates
-featureText = Project Predicates\n\
-Version: {featureVersion}\n\
-Build id: {0}\n\
-\n\
diff --git a/plugins/org.eclipse.emf.cdo.releng.predicates/build.properties b/plugins/org.eclipse.emf.cdo.releng.predicates/build.properties
index a85815f30a..21b49823ac 100644
--- a/plugins/org.eclipse.emf.cdo.releng.predicates/build.properties
+++ b/plugins/org.eclipse.emf.cdo.releng.predicates/build.properties
@@ -15,11 +15,7 @@ bin.includes = META-INF/,\
                .,\
                plugin.xml,\
                about.html,\
-               about.ini,\
-               about.mappings,\
-               about.properties,\
                copyright.txt,\
-               modeling32.png,\
                plugin.properties,\
                model/
 src.includes = about.html,\
diff --git a/plugins/org.eclipse.emf.cdo.releng.predicates/modeling32.png b/plugins/org.eclipse.emf.cdo.releng.predicates/modeling32.png
deleted file mode 100644
index 6b08de2ada..0000000000
--- a/plugins/org.eclipse.emf.cdo.releng.predicates/modeling32.png
+++ /dev/null
diff --git a/plugins/org.eclipse.emf.cdo.releng.projectcopy/plugin.xml b/plugins/org.eclipse.emf.cdo.releng.projectcopy/plugin.xml
index bff39b7f1f..7704c20c75 100644
--- a/plugins/org.eclipse.emf.cdo.releng.projectcopy/plugin.xml
+++ b/plugins/org.eclipse.emf.cdo.releng.projectcopy/plugin.xml
@@ -21,7 +21,7 @@
             objectClass="org.eclipse.core.resources.IProject">
          <menu
                id="org.eclipse.emf.cdo.releng"
-               label="CDO Release Engineering"
+               label="Release Engineering"
                path="additions">
             <separator
                   name="group1">
diff --git a/plugins/org.eclipse.emf.cdo.releng.relativepaths/plugin.xml b/plugins/org.eclipse.emf.cdo.releng.relativepaths/plugin.xml
index 11dc889cef..1459659c45 100644
--- a/plugins/org.eclipse.emf.cdo.releng.relativepaths/plugin.xml
+++ b/plugins/org.eclipse.emf.cdo.releng.relativepaths/plugin.xml
@@ -21,7 +21,7 @@
             objectClass="org.eclipse.core.resources.IResource">
          <menu
                id="org.eclipse.emf.cdo.releng"
-               label="CDO Release Engineering"
+               label="Release Engineering"
                path="additions">
             <separator
                   name="group1">
diff --git a/plugins/org.eclipse.emf.cdo.releng.setup.product/Setup Dialog.launch b/plugins/org.eclipse.emf.cdo.releng.setup.product/Setup Dialog.launch
index 2a5a6b5979..be7cf4f08e 100644
--- a/plugins/org.eclipse.emf.cdo.releng.setup.product/Setup Dialog.launch
+++ b/plugins/org.eclipse.emf.cdo.releng.setup.product/Setup Dialog.launch
@@ -22,7 +22,7 @@
 <stringAttribute key="org.eclipse.jdt.launching.JRE_CONTAINER" value="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.6"/>
 <stringAttribute key="org.eclipse.jdt.launching.PROGRAM_ARGUMENTS" value="-os ${target.os} -ws ${target.ws} -arch ${target.arch} -nl ${target.nl} -consoleLog"/>
 <stringAttribute key="org.eclipse.jdt.launching.SOURCE_PATH_PROVIDER" value="org.eclipse.pde.ui.workbenchClasspathProvider"/>
-<stringAttribute key="org.eclipse.jdt.launching.VM_ARGUMENTS" value="-Declipse.p2.mirrors=false -Declipse.p2.unsignedPolicy=allow -Xms1024m -Xmx2500m -Dreleng.url=file:/${workspace_loc}/org.eclipse.emf.cdo.releng.setup.update -Dsetup.uri=file://${resource_loc:/org.eclipse.emf.cdo.releng.setup/model/Configuration.setup}"/>
+<stringAttribute key="org.eclipse.jdt.launching.VM_ARGUMENTS" value="-Declipse.p2.mirrors=false -Declipse.p2.unsignedPolicy=allow -Xms1024m -Xmx2500m -Dreleng.urlx=file:/${workspace_loc}/org.eclipse.emf.cdo.releng.setup.update -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="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@default:default,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.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"/>
diff --git a/plugins/org.eclipse.emf.cdo.releng.tasks/plugin.xml b/plugins/org.eclipse.emf.cdo.releng.tasks/plugin.xml
index b11d85431d..a02f276829 100644
--- a/plugins/org.eclipse.emf.cdo.releng.tasks/plugin.xml
+++ b/plugins/org.eclipse.emf.cdo.releng.tasks/plugin.xml
@@ -59,7 +59,7 @@
          point="org.eclipse.ui.commands">
       <category
             id="org.eclipse.emf.cdo.releng"
-            name="CDO Release Engineering">
+            name="Release Engineering">
       </category>
       <command
             categoryId="org.eclipse.emf.cdo.releng"