diff options
author | Eike Stepper | 2011-07-14 18:38:03 +0000 |
---|---|---|
committer | Eike Stepper | 2011-07-14 18:38:03 +0000 |
commit | c50701dc77fb59f540dd100b06769962b18b0e66 (patch) | |
tree | 03e0575bb04cd792d451ca8065da4cc0ad44ed43 /features | |
parent | ff2698a02b408dbfb9d11a9558883c348577632b (diff) | |
download | cdo-c50701dc77fb59f540dd100b06769962b18b0e66.tar.gz cdo-c50701dc77fb59f540dd100b06769962b18b0e66.tar.xz cdo-c50701dc77fb59f540dd100b06769962b18b0e66.zip |
[351616] [releng] Provide platform-specific CDOServer + CDOExplorer downloads
https://bugs.eclipse.org/bugs/show_bug.cgi?id=351616
Diffstat (limited to 'features')
9 files changed, 153 insertions, 445 deletions
diff --git a/features/org.eclipse.emf.cdo.explorer.product-feature/CDOExplorer.product b/features/org.eclipse.emf.cdo.explorer.product-feature/CDOExplorer.product index 8965a3b273..bd68cfa685 100644 --- a/features/org.eclipse.emf.cdo.explorer.product-feature/CDOExplorer.product +++ b/features/org.eclipse.emf.cdo.explorer.product-feature/CDOExplorer.product @@ -1,13 +1,14 @@ <?xml version="1.0" encoding="UTF-8"?>
<?pde version="3.5"?>
-<product name="CDO Explorer" id="org.eclipse.emf.cdo.server.product.tcp_h2" application="org.eclipse.emf.cdo.explorer.app" useFeatures="true" includeLaunchers="true">
+<product name="CDO Explorer" id="org.eclipse.emf.cdo.explorer.product" application="org.eclipse.emf.cdo.explorer.app" useFeatures="true" includeLaunchers="true">
<configIni use="">
</configIni>
<launcherArgs>
- <programArgs>--launcher.XXMaxPermSize + <programArgs>-showsplash
+--launcher.XXMaxPermSize
128M</programArgs>
<vmArgs>-Xms256M -Xmx1024M</vmArgs>
@@ -30,9 +31,12 @@ <vm>
</vm>
+ <plugins>
+ </plugins>
+
<features>
<feature id="org.eclipse.emf.cdo.explorer.product"/>
- <feature id="org.eclipse.equinox.executable"/>
</features>
+
</product>
diff --git a/features/org.eclipse.emf.cdo.explorer.product-feature/build.properties b/features/org.eclipse.emf.cdo.explorer.product-feature/build.properties index 340f939b4b..2de633e708 100644 --- a/features/org.eclipse.emf.cdo.explorer.product-feature/build.properties +++ b/features/org.eclipse.emf.cdo.explorer.product-feature/build.properties @@ -22,5 +22,3 @@ bin.includes = feature.xml,\ src.includes = about.html,\ epl-v10.html,\ license.html - -root=rootfiles diff --git a/features/org.eclipse.emf.cdo.explorer.product-feature/feature.xml b/features/org.eclipse.emf.cdo.explorer.product-feature/feature.xml index ad19434c11..a98493fc27 100644 --- a/features/org.eclipse.emf.cdo.explorer.product-feature/feature.xml +++ b/features/org.eclipse.emf.cdo.explorer.product-feature/feature.xml @@ -33,390 +33,80 @@ <discovery label="%updateSiteName" url="http://www.eclipse.org/modeling/updates/"/>
</url>
- <includes
- id="org.eclipse.equinox.executable"
- version="0.0.0"/>
+ <requires>
+ <import feature="org.eclipse.rcp"/>
+ <import plugin="com.ibm.icu"/>
+ <import plugin="org.eclipse.compare"/>
+ <import plugin="org.eclipse.compare.core"/>
+ <import plugin="org.eclipse.core.commands"/>
+ <import plugin="org.eclipse.core.contenttype"/>
+ <import plugin="org.eclipse.core.databinding"/>
+ <import plugin="org.eclipse.core.databinding.observable"/>
+ <import plugin="org.eclipse.core.databinding.property"/>
+ <import plugin="org.eclipse.core.expressions"/>
+ <import plugin="org.eclipse.core.filebuffers"/>
+ <import plugin="org.eclipse.core.filesystem"/>
+ <import plugin="org.eclipse.core.jobs"/>
+ <import plugin="org.eclipse.core.resources"/>
+ <import plugin="org.eclipse.core.runtime"/>
+ <import plugin="org.eclipse.emf.common"/>
+ <import plugin="org.eclipse.emf.common.ui"/>
+ <import plugin="org.eclipse.emf.ecore"/>
+ <import plugin="org.eclipse.emf.ecore.change"/>
+ <import plugin="org.eclipse.emf.ecore.edit"/>
+ <import plugin="org.eclipse.emf.ecore.xmi"/>
+ <import plugin="org.eclipse.emf.edit"/>
+ <import plugin="org.eclipse.emf.edit.ui"/>
+ <import plugin="org.eclipse.equinox.app"/>
+ <import plugin="org.eclipse.equinox.common"/>
+ <import plugin="org.eclipse.equinox.p2.core"/>
+ <import plugin="org.eclipse.equinox.p2.engine"/>
+ <import plugin="org.eclipse.equinox.p2.metadata"/>
+ <import plugin="org.eclipse.equinox.p2.metadata.repository"/>
+ <import plugin="org.eclipse.equinox.p2.repository"/>
+ <import plugin="org.eclipse.equinox.preferences"/>
+ <import plugin="org.eclipse.equinox.registry"/>
+ <import plugin="org.eclipse.equinox.security"/>
+ <import plugin="org.eclipse.help"/>
+ <import plugin="org.eclipse.jface"/>
+ <import plugin="org.eclipse.jface.databinding"/>
+ <import plugin="org.eclipse.jface.text"/>
+ <import plugin="org.eclipse.ltk.core.refactoring"/>
+ <import plugin="org.eclipse.ltk.ui.refactoring"/>
+ <import plugin="org.eclipse.osgi"/>
+ <import plugin="org.eclipse.swt"/>
+ <import plugin="org.eclipse.team.core"/>
+ <import plugin="org.eclipse.team.ui"/>
+ <import plugin="org.eclipse.text"/>
+ <import plugin="org.eclipse.ui"/>
+ <import plugin="org.eclipse.ui.editors"/>
+ <import plugin="org.eclipse.ui.forms"/>
+ <import plugin="org.eclipse.ui.ide"/>
+ <import plugin="org.eclipse.ui.intro"/>
+ <import plugin="org.eclipse.ui.navigator"/>
+ <import plugin="org.eclipse.ui.navigator.resources"/>
+ <import plugin="org.eclipse.ui.views"/>
+ <import plugin="org.eclipse.ui.views.properties.tabbed"/>
+ <import plugin="org.eclipse.ui.workbench"/>
+ <import plugin="org.eclipse.ui.workbench.texteditor"/>
+ </requires>
<plugin
- id="com.ibm.icu"
- download-size="0"
- install-size="0"
- version="0.0.0"
- unpack="false"/>
-
- <plugin
- id="org.eclipse.compare"
- download-size="0"
- install-size="0"
- version="0.0.0"
- unpack="false"/>
-
- <plugin
- id="org.eclipse.compare.core"
- download-size="0"
- install-size="0"
- version="0.0.0"
- unpack="false"/>
-
- <plugin
- id="org.eclipse.core.commands"
- download-size="0"
- install-size="0"
- version="0.0.0"
- unpack="false"/>
-
- <plugin
- id="org.eclipse.core.contenttype"
- download-size="0"
- install-size="0"
- version="0.0.0"
- unpack="false"/>
-
- <plugin
- id="org.eclipse.core.databinding"
- download-size="0"
- install-size="0"
- version="0.0.0"
- unpack="false"/>
-
- <plugin
- id="org.eclipse.core.databinding.observable"
- download-size="0"
- install-size="0"
- version="0.0.0"
- unpack="false"/>
-
- <plugin
- id="org.eclipse.core.databinding.property"
- download-size="0"
- install-size="0"
- version="0.0.0"
- unpack="false"/>
-
- <plugin
- id="org.eclipse.core.expressions"
- download-size="0"
- install-size="0"
- version="0.0.0"
- unpack="false"/>
-
- <plugin
- id="org.eclipse.core.filebuffers"
- download-size="0"
- install-size="0"
- version="0.0.0"
- unpack="false"/>
-
- <plugin
- id="org.eclipse.core.filesystem"
- download-size="0"
- install-size="0"
- version="0.0.0"
- unpack="false"/>
-
- <plugin
- id="org.eclipse.core.jobs"
- download-size="0"
- install-size="0"
- version="0.0.0"
- unpack="false"/>
-
- <plugin
- id="org.eclipse.core.resources"
- download-size="0"
- install-size="0"
- version="0.0.0"
- unpack="false"/>
-
- <plugin
- id="org.eclipse.core.runtime"
- download-size="0"
- install-size="0"
- version="0.0.0"
- unpack="false"/>
-
- <plugin
- id="org.eclipse.emf.common"
- download-size="0"
- install-size="0"
- version="0.0.0"
- unpack="false"/>
-
- <plugin
- id="org.eclipse.emf.common.ui"
- download-size="0"
- install-size="0"
- version="0.0.0"
- unpack="false"/>
-
- <plugin
- id="org.eclipse.emf.ecore"
- download-size="0"
- install-size="0"
- version="0.0.0"
- unpack="false"/>
-
- <plugin
- id="org.eclipse.emf.ecore.change"
- download-size="0"
- install-size="0"
- version="0.0.0"
- unpack="false"/>
-
- <plugin
- id="org.eclipse.emf.ecore.edit"
- download-size="0"
- install-size="0"
- version="0.0.0"
- unpack="false"/>
-
- <plugin
- id="org.eclipse.emf.ecore.xmi"
- download-size="0"
- install-size="0"
- version="0.0.0"
- unpack="false"/>
-
- <plugin
- id="org.eclipse.emf.edit"
- download-size="0"
- install-size="0"
- version="0.0.0"
- unpack="false"/>
-
- <plugin
- id="org.eclipse.emf.edit.ui"
- download-size="0"
- install-size="0"
- version="0.0.0"
- unpack="false"/>
-
- <plugin
- id="org.eclipse.equinox.app"
- download-size="0"
- install-size="0"
- version="0.0.0"
- unpack="false"/>
-
- <plugin
- id="org.eclipse.equinox.common"
- download-size="0"
- install-size="0"
- version="0.0.0"
- unpack="false"/>
-
- <plugin
- id="org.eclipse.equinox.p2.core"
- download-size="0"
- install-size="0"
- version="0.0.0"
- unpack="false"/>
-
- <plugin
- id="org.eclipse.equinox.p2.engine"
- download-size="0"
- install-size="0"
- version="0.0.0"
- unpack="false"/>
-
- <plugin
- id="org.eclipse.equinox.p2.metadata"
- download-size="0"
- install-size="0"
- version="0.0.0"
- unpack="false"/>
-
- <plugin
- id="org.eclipse.equinox.p2.metadata.repository"
- download-size="0"
- install-size="0"
- version="0.0.0"
- unpack="false"/>
-
- <plugin
- id="org.eclipse.equinox.p2.repository"
- download-size="0"
- install-size="0"
- version="0.0.0"
- unpack="false"/>
-
- <plugin
- id="org.eclipse.equinox.preferences"
- download-size="0"
- install-size="0"
- version="0.0.0"
- unpack="false"/>
-
- <plugin
- id="org.eclipse.equinox.registry"
- download-size="0"
- install-size="0"
- version="0.0.0"
- unpack="false"/>
-
- <plugin
- id="org.eclipse.equinox.security"
- download-size="0"
- install-size="0"
- version="0.0.0"
- unpack="false"/>
-
- <plugin
- id="org.eclipse.help"
- download-size="0"
- install-size="0"
- version="0.0.0"
- unpack="false"/>
-
- <plugin
- id="org.eclipse.jface"
- download-size="0"
- install-size="0"
- version="0.0.0"
- unpack="false"/>
-
- <plugin
- id="org.eclipse.jface.databinding"
- download-size="0"
- install-size="0"
- version="0.0.0"
- unpack="false"/>
-
- <plugin
- id="org.eclipse.jface.text"
- download-size="0"
- install-size="0"
- version="0.0.0"
- unpack="false"/>
-
- <plugin
- id="org.eclipse.ltk.core.refactoring"
- download-size="0"
- install-size="0"
- version="0.0.0"
- unpack="false"/>
-
- <plugin
- id="org.eclipse.ltk.ui.refactoring"
- download-size="0"
- install-size="0"
- version="0.0.0"
- unpack="false"/>
-
- <plugin
- id="org.eclipse.osgi"
- download-size="0"
- install-size="0"
- version="0.0.0"
- unpack="false"/>
-
- <plugin
- id="org.eclipse.swt"
- download-size="0"
- install-size="0"
- version="0.0.0"
- unpack="false"/>
-
- <plugin
- id="org.eclipse.team.core"
- download-size="0"
- install-size="0"
- version="0.0.0"
- unpack="false"/>
-
- <plugin
- id="org.eclipse.team.ui"
- download-size="0"
- install-size="0"
- version="0.0.0"
- unpack="false"/>
-
- <plugin
- id="org.eclipse.text"
- download-size="0"
- install-size="0"
- version="0.0.0"
- unpack="false"/>
-
- <plugin
- id="org.eclipse.ui"
- download-size="0"
- install-size="0"
- version="0.0.0"
- unpack="false"/>
-
- <plugin
- id="org.eclipse.ui.editors"
- download-size="0"
- install-size="0"
- version="0.0.0"
- unpack="false"/>
-
- <plugin
- id="org.eclipse.ui.forms"
- download-size="0"
- install-size="0"
- version="0.0.0"
- unpack="false"/>
-
- <plugin
- id="org.eclipse.ui.ide"
- download-size="0"
- install-size="0"
- version="0.0.0"
- unpack="false"/>
-
- <plugin
- id="org.eclipse.ui.intro"
- download-size="0"
- install-size="0"
- version="0.0.0"
- unpack="false"/>
-
- <plugin
- id="org.eclipse.ui.navigator"
- download-size="0"
- install-size="0"
- version="0.0.0"
- unpack="false"/>
-
- <plugin
- id="org.eclipse.ui.navigator.resources"
- download-size="0"
- install-size="0"
- version="0.0.0"
- unpack="false"/>
-
- <plugin
- id="org.eclipse.ui.views"
- download-size="0"
- install-size="0"
- version="0.0.0"
- unpack="false"/>
-
- <plugin
- id="org.eclipse.ui.views.properties.tabbed"
- download-size="0"
- install-size="0"
- version="0.0.0"
- unpack="false"/>
-
- <plugin
- id="org.eclipse.ui.workbench"
+ id="org.eclipse.emf.cdo.explorer"
download-size="0"
install-size="0"
version="0.0.0"
unpack="false"/>
<plugin
- id="org.eclipse.ui.workbench.texteditor"
+ id="org.eclipse.emf.cdo.examples.company"
download-size="0"
install-size="0"
version="0.0.0"
unpack="false"/>
<plugin
- id="org.eclipse.emf.cdo.explorer"
+ id="org.eclipse.emf.cdo.examples.company.edit"
download-size="0"
install-size="0"
version="0.0.0"
diff --git a/features/org.eclipse.emf.cdo.server-feature/feature.xml b/features/org.eclipse.emf.cdo.server-feature/feature.xml index d44a7b5605..7448ac5145 100644 --- a/features/org.eclipse.emf.cdo.server-feature/feature.xml +++ b/features/org.eclipse.emf.cdo.server-feature/feature.xml @@ -1,4 +1,4 @@ -<?xml version="1.0" encoding="UTF-8"?> +<?xml version="1.0" encoding="UTF-8"?>
<!-- Copyright (c) 2004 - 2011 Eike Stepper (Berlin, Germany) and others. All rights reserved. This program and the accompanying materials @@ -8,64 +8,73 @@ Contributors: Eike Stepper - initial API and implementation ---> -<feature - id="org.eclipse.emf.cdo.server" - label="%featureName" - version="4.0.0.qualifier" - provider-name="%providerName" - image="eclipse_update_120.jpg" license-feature="org.eclipse.emf.cdo.license" license-feature-version="4.0.0.qualifier"> - - <description> - %description - </description> - - <copyright url="%copyrightURL"> - %copyright - </copyright> - - <license url="%licenseURL"> - %license - </license> - - <url> - <update label="%updateSiteName" url="http://www.eclipse.org/modeling/updates/"/> - <discovery label="%updateSiteName" url="http://www.eclipse.org/modeling/updates/"/> - </url> - - <plugin - id="org.eclipse.emf.cdo.common" - download-size="0" - install-size="0" - version="0.0.0" - unpack="false"/> - - <plugin - id="org.eclipse.emf.cdo.server" - download-size="0" - install-size="0" - version="0.0.0" - unpack="false"/> - - <plugin - id="org.eclipse.emf.cdo" - download-size="0" - install-size="0" - version="0.0.0" - unpack="false"/> - - <plugin - id="org.eclipse.emf.cdo.server.net4j" - download-size="0" - install-size="0" - version="0.0.0" - unpack="false"/> - - <plugin - id="org.eclipse.emf.cdo.server.ocl" - download-size="0" - install-size="0" - version="0.0.0" - unpack="false"/> - -</feature> +-->
+<feature
+ id="org.eclipse.emf.cdo.server"
+ label="%featureName"
+ version="4.0.0.qualifier"
+ provider-name="%providerName"
+ image="eclipse_update_120.jpg"
+ license-feature="org.eclipse.emf.cdo.license"
+ license-feature-version="4.0.0.qualifier">
+
+ <description>
+ %description
+ </description>
+
+ <copyright url="%copyrightURL">
+ %copyright
+ </copyright>
+
+ <license url="%licenseURL">
+ %license
+ </license>
+
+ <url>
+ <update label="%updateSiteName" url="http://www.eclipse.org/modeling/updates/"/>
+ <discovery label="%updateSiteName" url="http://www.eclipse.org/modeling/updates/"/>
+ </url>
+
+ <plugin
+ id="org.eclipse.emf.cdo.common"
+ download-size="0"
+ install-size="0"
+ version="0.0.0"
+ unpack="false"/>
+
+ <plugin
+ id="org.eclipse.emf.cdo.server"
+ download-size="0"
+ install-size="0"
+ version="0.0.0"
+ unpack="false"/>
+
+ <plugin
+ id="org.eclipse.emf.cdo"
+ download-size="0"
+ install-size="0"
+ version="0.0.0"
+ unpack="false"/>
+
+ <plugin
+ id="org.eclipse.emf.cdo.server.net4j"
+ download-size="0"
+ install-size="0"
+ version="0.0.0"
+ unpack="false"/>
+
+ <plugin
+ id="org.eclipse.emf.cdo.server.ocl"
+ download-size="0"
+ install-size="0"
+ version="0.0.0"
+ unpack="false"/>
+
+ <plugin
+ id="org.eclipse.emf.cdo.server.product"
+ download-size="0"
+ install-size="0"
+ version="0.0.0"
+ unpack="false"/>
+
+</feature>
diff --git a/features/org.eclipse.emf.cdo.server.product-feature/.settings/org.eclipse.core.resources.prefs b/features/org.eclipse.emf.cdo.server.product-feature/.settings/org.eclipse.core.resources.prefs new file mode 100644 index 0000000000..887244f223 --- /dev/null +++ b/features/org.eclipse.emf.cdo.server.product-feature/.settings/org.eclipse.core.resources.prefs @@ -0,0 +1,3 @@ +#Thu Jul 14 14:37:02 CEST 2011
+eclipse.preferences.version=1
+encoding/buckminster.cspex=UTF-8
diff --git a/features/org.eclipse.emf.cdo.server.product-feature/CDOServer.product b/features/org.eclipse.emf.cdo.server.product-feature/CDOServer.product index f4e8549b1e..1ce9932e00 100644 --- a/features/org.eclipse.emf.cdo.server.product-feature/CDOServer.product +++ b/features/org.eclipse.emf.cdo.server.product-feature/CDOServer.product @@ -1,7 +1,7 @@ <?xml version="1.0" encoding="UTF-8"?>
<?pde version="3.5"?>
-<product name="CDO Server" id="org.eclipse.emf.cdo.server.product" application="org.eclipse.emf.cdo.server.app" useFeatures="true" includeLaunchers="true">
+<product name="CDO Server" id="org.eclipse.emf.cdo.server.product.tcp_h2" application="org.eclipse.emf.cdo.server.app" useFeatures="true" includeLaunchers="true">
<configIni use="">
</configIni>
@@ -31,9 +31,12 @@ <vm>
</vm>
+ <plugins>
+ </plugins>
+
<features>
<feature id="org.eclipse.emf.cdo.server.product"/>
- <feature id="org.eclipse.equinox.executable"/>
</features>
+
</product>
diff --git a/features/org.eclipse.emf.cdo.server.product-feature/buckminster.cspex b/features/org.eclipse.emf.cdo.server.product-feature/buckminster.cspex new file mode 100644 index 0000000000..de6e4ebd59 --- /dev/null +++ b/features/org.eclipse.emf.cdo.server.product-feature/buckminster.cspex @@ -0,0 +1,6 @@ +<?xml version="1.0" encoding="UTF-8"?> +<cs:cspecExtension xmlns:cs="http://www.eclipse.org/buckminster/CSpec-1.0"> + <cs:dependencies> + <cs:dependency name="org.eclipse.equinox.executable" componentType="eclipse.feature"/> + </cs:dependencies> +</cs:cspecExtension>
\ No newline at end of file diff --git a/features/org.eclipse.emf.cdo.server.product-feature/build.properties b/features/org.eclipse.emf.cdo.server.product-feature/build.properties index c67adaaaec..6586d4d9bb 100644 --- a/features/org.eclipse.emf.cdo.server.product-feature/build.properties +++ b/features/org.eclipse.emf.cdo.server.product-feature/build.properties @@ -21,3 +21,4 @@ src.includes = about.html,\ epl-v10.html,\ license.html +root=../../plugins/org.eclipse.emf.cdo.server.product/config diff --git a/features/org.eclipse.emf.cdo.site-feature/category.xml b/features/org.eclipse.emf.cdo.site-feature/category.xml index 1815c7b40b..72aa0d07a1 100644 --- a/features/org.eclipse.emf.cdo.site-feature/category.xml +++ b/features/org.eclipse.emf.cdo.site-feature/category.xml @@ -30,12 +30,6 @@ <feature id="org.eclipse.emf.cdo.server.mongodb" version="0.0.0">
<category name="org.eclipse.emf.cdo.category"/>
</feature>
- <feature id="org.eclipse.emf.cdo.server.product" version="0.0.0">
- <category name="org.eclipse.emf.cdo.category"/>
- </feature>
- <feature id="org.eclipse.emf.cdo.explorer.product" version="0.0.0">
- <category name="org.eclipse.emf.cdo.category"/>
- </feature>
<feature id="org.eclipse.emf.cdo.tests" version="0.0.0">
<category name="org.eclipse.emf.cdo.category"/>
</feature>
|