Skip to main content
aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorEike Stepper2011-07-14 14:38:03 -0400
committerEike Stepper2011-07-14 14:38:03 -0400
commitc50701dc77fb59f540dd100b06769962b18b0e66 (patch)
tree03e0575bb04cd792d451ca8065da4cc0ad44ed43
parentff2698a02b408dbfb9d11a9558883c348577632b (diff)
downloadcdo-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
-rw-r--r--features/org.eclipse.emf.cdo.explorer.product-feature/CDOExplorer.product10
-rw-r--r--features/org.eclipse.emf.cdo.explorer.product-feature/build.properties2
-rw-r--r--features/org.eclipse.emf.cdo.explorer.product-feature/feature.xml430
-rw-r--r--features/org.eclipse.emf.cdo.server-feature/feature.xml133
-rw-r--r--features/org.eclipse.emf.cdo.server.product-feature/.settings/org.eclipse.core.resources.prefs3
-rw-r--r--features/org.eclipse.emf.cdo.server.product-feature/CDOServer.product7
-rw-r--r--features/org.eclipse.emf.cdo.server.product-feature/buckminster.cspex6
-rw-r--r--features/org.eclipse.emf.cdo.server.product-feature/build.properties1
-rw-r--r--features/org.eclipse.emf.cdo.site-feature/category.xml6
-rw-r--r--plugins/org.eclipse.emf.cdo.explorer/plugin.xml8
-rw-r--r--plugins/org.eclipse.emf.cdo.explorer/src/org/eclipse/emf/cdo/internal/explorer/CDOExplorerPerspective.java90
-rw-r--r--plugins/org.eclipse.emf.cdo.explorer/src/org/eclipse/emf/cdo/internal/explorer/CDOExplorerWorkbenchAdvisor.java2
-rw-r--r--plugins/org.eclipse.emf.cdo.releng/buckminster.cspex1
-rw-r--r--plugins/org.eclipse.emf.cdo.releng/build.mspec2
-rw-r--r--plugins/org.eclipse.emf.cdo.releng/build.xml158
-rw-r--r--plugins/org.eclipse.emf.cdo.releng/local.mspec2
-rw-r--r--plugins/org.eclipse.emf.cdo.releng/rootfiles/epl-v10.html328
-rw-r--r--plugins/org.eclipse.emf.cdo.releng/rootfiles/notice.html162
-rw-r--r--plugins/org.eclipse.emf.cdo.server.product/build.properties2
-rw-r--r--plugins/org.eclipse.emf.cdo.server/build.properties3
-rw-r--r--plugins/org.eclipse.emf.cdo.server/plugin.properties3
-rw-r--r--plugins/org.eclipse.emf.cdo.server/plugin.xml9
-rw-r--r--plugins/org.eclipse.emf.cdo.ui/src/org/eclipse/emf/cdo/internal/ui/perspectives/CDOExplorerPerspective.java21
23 files changed, 264 insertions, 1125 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>
diff --git a/plugins/org.eclipse.emf.cdo.explorer/plugin.xml b/plugins/org.eclipse.emf.cdo.explorer/plugin.xml
index 35191cc375..7a280629aa 100644
--- a/plugins/org.eclipse.emf.cdo.explorer/plugin.xml
+++ b/plugins/org.eclipse.emf.cdo.explorer/plugin.xml
@@ -29,14 +29,6 @@
</product>
</extension>
- <extension point="org.eclipse.ui.perspectives">
- <perspective
- name="RCP Perspective"
- class="org.eclipse.emf.cdo.internal.explorer.CDOExplorerPerspective"
- id="org.eclipse.emf.cdo.explorer.perspective">
- </perspective>
- </extension>
-
<extension point="org.eclipse.ui.intro">
<intro
class="org.eclipse.ui.intro.config.CustomizableIntroPart"
diff --git a/plugins/org.eclipse.emf.cdo.explorer/src/org/eclipse/emf/cdo/internal/explorer/CDOExplorerPerspective.java b/plugins/org.eclipse.emf.cdo.explorer/src/org/eclipse/emf/cdo/internal/explorer/CDOExplorerPerspective.java
deleted file mode 100644
index 1c5c4add38..0000000000
--- a/plugins/org.eclipse.emf.cdo.explorer/src/org/eclipse/emf/cdo/internal/explorer/CDOExplorerPerspective.java
+++ /dev/null
@@ -1,90 +0,0 @@
-/**
- * Copyright (c) 2004 - 2011 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:
- * Victor Roldan Betancort - initial API and implementation
- * Eike Stepper - maintenance
- */
-package org.eclipse.emf.cdo.internal.explorer;
-
-import org.eclipse.emf.cdo.internal.ui.views.CDORemoteSessionsView;
-import org.eclipse.emf.cdo.internal.ui.views.CDOSessionsView;
-import org.eclipse.emf.cdo.internal.ui.views.CDOWatchListView;
-
-import org.eclipse.ui.IFolderLayout;
-import org.eclipse.ui.IPageLayout;
-import org.eclipse.ui.IPerspectiveFactory;
-import org.eclipse.ui.PlatformUI;
-
-/**
- * @author Victor Roldan Betancort
- */
-public class CDOExplorerPerspective implements IPerspectiveFactory
-{
- public static final String ID = "org.eclipse.emf.cdo.explorer.perspective"; //$NON-NLS-1$
-
- private IPageLayout pageLayout;
-
- public CDOExplorerPerspective()
- {
- }
-
- public IPageLayout getPageLayout()
- {
- return pageLayout;
- }
-
- public void createInitialLayout(IPageLayout pageLayout)
- {
- this.pageLayout = pageLayout;
- addViews();
- addPerspectiveShortcuts();
- addViewShortcuts();
- }
-
- protected void addViews()
- {
- IFolderLayout BrowsingFolderLayout0 = pageLayout.createFolder("cdoFolderLayout0", IPageLayout.LEFT, 0.20f, //$NON-NLS-1$
- pageLayout.getEditorArea());
- BrowsingFolderLayout0.addView(IPageLayout.ID_PROJECT_EXPLORER);
-
- IFolderLayout BrowsingFolderLayout1 = pageLayout.createFolder("cdoFolderLayout1", IPageLayout.BOTTOM, 0.70f, //$NON-NLS-1$
- IPageLayout.ID_PROJECT_EXPLORER);
- BrowsingFolderLayout1.addView(CDOSessionsView.ID);
-
- IFolderLayout BrowsingFolderLayout2 = pageLayout.createFolder("cdoFolderLayout3", IPageLayout.BOTTOM, 0.70f, //$NON-NLS-1$
- pageLayout.getEditorArea());
- BrowsingFolderLayout2.addView(IPageLayout.ID_PROP_SHEET);
- BrowsingFolderLayout2.addView(CDOWatchListView.ID);
- BrowsingFolderLayout2.addView(CDORemoteSessionsView.ID);
-
- IFolderLayout BrowsingFolderLayout3 = pageLayout.createFolder("cdoFolderLayout2", IPageLayout.RIGHT, 0.8f, //$NON-NLS-1$
- pageLayout.getEditorArea());
- BrowsingFolderLayout3.addView(IPageLayout.ID_OUTLINE);
- }
-
- protected void addViewShortcuts()
- {
- pageLayout.addShowViewShortcut(CDOSessionsView.ID);
- pageLayout.addShowViewShortcut(CDOWatchListView.ID);
- pageLayout.addShowViewShortcut(CDORemoteSessionsView.ID);
- pageLayout.addShowViewShortcut(IPageLayout.ID_OUTLINE);
- pageLayout.addShowViewShortcut(IPageLayout.ID_PROP_SHEET);
- pageLayout.addShowViewShortcut(IPageLayout.ID_PROJECT_EXPLORER);
- }
-
- protected void addPerspectiveShortcuts()
- {
- pageLayout.addPerspectiveShortcut(ID);
- }
-
- static public boolean isCurrent()
- {
- return PlatformUI.getWorkbench().getActiveWorkbenchWindow().getActivePage().getPerspective().getId()
- .equals(CDOExplorerPerspective.ID);
- }
-}
diff --git a/plugins/org.eclipse.emf.cdo.explorer/src/org/eclipse/emf/cdo/internal/explorer/CDOExplorerWorkbenchAdvisor.java b/plugins/org.eclipse.emf.cdo.explorer/src/org/eclipse/emf/cdo/internal/explorer/CDOExplorerWorkbenchAdvisor.java
index 025c3aadcb..de7ac71846 100644
--- a/plugins/org.eclipse.emf.cdo.explorer/src/org/eclipse/emf/cdo/internal/explorer/CDOExplorerWorkbenchAdvisor.java
+++ b/plugins/org.eclipse.emf.cdo.explorer/src/org/eclipse/emf/cdo/internal/explorer/CDOExplorerWorkbenchAdvisor.java
@@ -10,6 +10,8 @@
*/
package org.eclipse.emf.cdo.internal.explorer;
+import org.eclipse.emf.cdo.internal.ui.perspectives.CDOExplorerPerspective;
+
import org.eclipse.ui.application.IWorkbenchConfigurer;
import org.eclipse.ui.application.IWorkbenchWindowConfigurer;
import org.eclipse.ui.application.WorkbenchAdvisor;
diff --git a/plugins/org.eclipse.emf.cdo.releng/buckminster.cspex b/plugins/org.eclipse.emf.cdo.releng/buckminster.cspex
index ef75f05486..30a47eeaad 100644
--- a/plugins/org.eclipse.emf.cdo.releng/buckminster.cspex
+++ b/plugins/org.eclipse.emf.cdo.releng/buckminster.cspex
@@ -2,7 +2,6 @@
<cs:cspecExtension xmlns:cs="http://www.eclipse.org/buckminster/CSpec-1.0">
<cs:dependencies>
<cs:dependency name="org.eclipse.emf.cdo.site" componentType="eclipse.feature"/>
- <cs:dependency name="org.eclipse.emf.cdo.examples.server" componentType="osgi.bundle"/>
<cs:dependency name="org.eclipse.emf.cdo.efs" componentType="osgi.bundle"/>
<cs:dependency name="org.eclipse.emf.cdo.ui.efs" componentType="osgi.bundle"/>
diff --git a/plugins/org.eclipse.emf.cdo.releng/build.mspec b/plugins/org.eclipse.emf.cdo.releng/build.mspec
index 62c0fba20c..6da6f57c2d 100644
--- a/plugins/org.eclipse.emf.cdo.releng/build.mspec
+++ b/plugins/org.eclipse.emf.cdo.releng/build.mspec
@@ -4,7 +4,5 @@
<mspec:property key="target.ws" value="*"/>
<mspec:property key="target.arch" value="*"/>
<mspec:property key="resolve.target.platform" value="true"/>
- <mspec:mspecNode namePattern="^org\.eclipse\.emf\.cdo\.server\.product$" materializer="workspace" resourcePath="org.eclipse.emf.cdo.server.product-feature"/>
- <mspec:mspecNode namePattern="^org\.eclipse\.emf\.cdo\.explorer\.product$" materializer="workspace" resourcePath="org.eclipse.emf.cdo.explorer.product-feature"/>
<mspec:mspecNode materializer="workspace" filter="(buckminster.source=true)"/>
</mspec:mspec>
diff --git a/plugins/org.eclipse.emf.cdo.releng/build.xml b/plugins/org.eclipse.emf.cdo.releng/build.xml
index 66e15f6f56..24dd37d0e5 100644
--- a/plugins/org.eclipse.emf.cdo.releng/build.xml
+++ b/plugins/org.eclipse.emf.cdo.releng/build.xml
@@ -77,33 +77,44 @@
</sequential>
</macrodef>
- <macrodef name="generate-product">
+ <macrodef name="generate.product">
+ <attribute name="id" />
<attribute name="profile" />
- <attribute name="feature" />
<attribute name="platform" />
<attribute name="os" />
<attribute name="ws" />
<attribute name="arch" />
<attribute name="priority" />
<sequential>
- <echo message=""/>
- <echo message="Generating @{profile} for @{platform}"/>
- <mkdir dir="${temp.product}" />
+ <echo message="" />
+ <echo message="Generating @{profile} for @{platform}" />
+ <mkdir dir="${temp.products}/@{profile}-@{platform}" />
+
<eclipse.launch app="director">
<properties>
<sysproperty key="eclipse.p2.mirrors" value="false" />
</properties>
<args>
+ <!--
+ <arg value="-debug" />
+ <arg value="-consoleLog" />
+ -->
<arg value="-r" />
<arg value="file:${hudson.WORKSPACE}" />
<arg value="-r" />
<arg value="${eclipse.downloads}/releases/${train}" />
+ <arg value="-r" />
+ <arg value="${eclipse.downloads}/eclipse/updates/3.7milestones" />
+ <arg value="-r" />
+ <arg value="${eclipse.downloads}/eclipse/updates/3.7" />
+ <!--
+ -->
<arg value="-d" />
- <arg value="${temp.product}" />
+ <arg value="${temp.products}/@{profile}-@{platform}" />
<arg value="-p" />
<arg value="@{profile}" />
<arg value="-i" />
- <arg value="@{feature}" />
+ <arg value="@{id}" />
<arg value="-p2.os" />
<arg value="@{os}" />
<arg value="-p2.ws" />
@@ -112,27 +123,32 @@
<arg value="@{arch}" />
</args>
</eclipse.launch>
+
<delete includeemptydirs="true" quiet="true">
- <fileset dir="${temp.product}">
+ <fileset dir="${temp.products}/@{profile}-@{platform}">
<include name="p2/**" />
<include name="launcher.exe" />
+ <include name="eclipsec.exe" />
</fileset>
</delete>
- <fileset dir="${temp.product}" id="@{profile}-@{platform}-files">
- <include name="**" />
- </fileset>
- <zip destfile="${hudson.WORKSPACE}/zips/emf-cdo-${build.qualifier}-@{profile}-@{platform}.zip">
- <fileset refid="@{profile}-@{platform}-files" />
+ <copy todir="${temp.products}/@{profile}-@{platform}" failonerror="true">
+ <fileset dir="${ws}/features/org.eclipse.emf.cdo.license-feature/rootfiles">
+ <include name="epl-v10.html" />
+ <include name="notice.html" />
+ </fileset>
+ </copy>
+
+ <zip destfile="${zips}/emf-cdo-${build.qualifier}-@{profile}-@{platform}.zip">
+ <fileset dir="${temp.products}/@{profile}-@{platform}">
+ <include name="**" />
+ </fileset>
</zip>
- <delete includeemptydirs="true" quiet="true">
- <fileset refid="@{profile}-@{platform}-files" />
- </delete>
<echo message="description=for execution on @{platform}."
- file="${hudson.WORKSPACE}/zips/emf-cdo-${build.qualifier}-@{profile}-@{platform}.properties" />
+ file="${zips}/emf-cdo-${build.qualifier}-@{profile}-@{platform}.properties" />
<echo message="priority=@{priority}"
- file="${hudson.WORKSPACE}/zips/emf-cdo-${build.qualifier}-@{profile}-@{platform}.properties"
+ file="${zips}/emf-cdo-${build.qualifier}-@{profile}-@{platform}.properties"
append="true" />
</sequential>
</macrodef>
@@ -183,6 +199,8 @@
<delete dir="${buckminster.output.root}" includeemptydirs="true" failonerror="true" quiet="true" />
<delete dir="${buckminster.temp.root}" includeemptydirs="true" failonerror="true" quiet="true" />
+
+ <mkdir dir="${result}" />
</target >
<!-- ========== -->
@@ -299,16 +317,17 @@
<property file="${build.qualifier.tmp}" />
<echo message="build.qualifier = ${build.qualifier}" />
<echoxml file="${hudson.WORKSPACE}/build-info.xml">
- <build type="${build.type}"
+ <build stream="${stream}"
+ branch="${branch}"
+ train="${train}"
+ type="${build.type}"
timestamp="${build.timestamp}"
qualifier="${build.qualifier}"
+ trigger="${build.trigger}"
hudson="${hudson.HUDSON_URL}"
revision="${hudson.SVN_REVISION}"
- stream="${stream}"
- branch="${branch}"
job="${hudson.JOB_NAME}"
- number="${hudson.BUILD_NUMBER}"
- trigger="${build.trigger}" />
+ number="${hudson.BUILD_NUMBER}" />
</echoxml>
<condition property="site.signing" value="true" else="false">
@@ -489,7 +508,7 @@
<!-- ============= -->
<target name="generate.only" depends="-init.properties" description="Runs the post-site.p2 generators">
- <echo message="Loading build-info.xml"/>
+ <echo message="Loading build-info.xml" />
<xmlproperty file="${hudson.WORKSPACE}/build-info.xml" collapseAttributes="true" />
<antcall target="-generate.all" />
</target>
@@ -499,9 +518,14 @@
<!-- ============ -->
<target name="-generate.all">
+ <property name="zips" location="${hudson.WORKSPACE}/zips" />
+ <mkdir dir="${zips}" />
+
+ <!--
<antcall target="-generate.index" />
<antcall target="-generate.bookmarks" />
<antcall target="-generate.dropins" />
+ -->
<antcall target="-generate.products" />
</target>
@@ -555,20 +579,22 @@
<!-- ================ -->
<target name="-generate.dropins">
- <property name="temp.zips" location="${buckminster.temp.root}/zips" />
- <mkdir dir="${temp.zips}" />
- <delete failonerror="false" includeemptydirs="true">
- <fileset dir="${temp.zips}" defaultexcludes="false">
+ <property name="temp.dropins" location="${buckminster.temp.root}/_dropins" />
+ <delete failonerror="false" includeemptydirs="true" quiet="true">
+ <fileset dir="${temp.dropins}" defaultexcludes="false">
<include name="**/*" />
</fileset>
</delete>
- <copy todir="${temp.zips}">
- <fileset dir="rootfiles">
- <include name="**/*" />
+ <mkdir dir="${temp.dropins}" />
+
+ <copy todir="${temp.dropins}" failonerror="true">
+ <fileset dir="${ws}/features/org.eclipse.emf.cdo.license-feature/rootfiles">
+ <include name="epl-v10.html" />
+ <include name="notice.html" />
</fileset>
</copy>
- <copy todir="${temp.zips}/features" flatten="true">
+ <copy todir="${temp.dropins}/features" flatten="true">
<fileset dir="${buckminster.output.root}">
<include name="*-eclipse.feature/jar/*" />
<include name="*-eclipse.feature/source.jar/*" />
@@ -578,21 +604,20 @@
</fileset>
</copy>
- <copy todir="${temp.zips}/plugins" flatten="true">
+ <copy todir="${temp.dropins}/plugins" flatten="true">
<fileset dir="${buckminster.output.root}">
<include name="*-osgi.bundle/jar/*" />
<include name="*-osgi.bundle/source.jar/*" />
</fileset>
</copy>
- <mkdir dir="${hudson.WORKSPACE}/zips" />
- <zip destfile="${hudson.WORKSPACE}/zips/emf-cdo-${build.qualifier}-Dropins.zip">
- <fileset dir="${temp.zips}">
+ <zip destfile="${zips}/emf-cdo-${build.qualifier}-Dropins.zip">
+ <fileset dir="${temp.dropins}">
<include name="**/*" />
</fileset>
</zip>
<echo message=" for use with a &lt;a href=&quot;http://help.eclipse.org/indigo/index.jsp?topic=/org.eclipse.platform.doc.isv/reference/misc/p2_dropins_format.html&quot;&gt;dropins&lt;/a&gt; folder."
- file="${hudson.WORKSPACE}/zips/emf-cdo-${build.qualifier}-Dropins.properties" />
+ file="${zips}/emf-cdo-${build.qualifier}-Dropins.properties" />
</target>
<!-- ================= -->
@@ -600,56 +625,63 @@
<!-- ================= -->
<target name="-generate.products">
- <property name="temp.product" location="${buckminster.temp.root}/product" />
- <echo message="Temp folder: ${temp.product}"/>
+ <property name="temp.products" location="${buckminster.temp.root}/_products" />
+ <delete includeemptydirs="true" failonerror="true" quiet="true">
+ <fileset dir="${temp.products}">
+ <include name="**" />
+ </fileset>
+ </delete>
+ <mkdir dir="${temp.products}" />
- <generate-product profile="CDOServer"
- feature="org.eclipse.emf.cdo.server.product"
+ <generate.product id="org.eclipse.emf.cdo.server.product.tcp_h2"
+ profile="CDOServer"
platform="Windows"
os="win32"
ws="win32"
arch="x86"
priority="450" />
- <generate-product profile="CDOServer"
- feature="org.eclipse.emf.cdo.server.product"
- platform="Linux"
- os="linux"
- ws="gtk"
- arch="x86"
- priority="440" />
-
- <generate-product profile="CDOServer"
- feature="org.eclipse.emf.cdo.server.product"
- platform="Mac"
- os="macosx"
- ws="carbon"
- arch="x86"
- priority="430" />
-
- <generate-product profile="CDOExplorer"
- feature="org.eclipse.emf.cdo.explorer.product"
+ <generate.product id="org.eclipse.emf.cdo.explorer.product"
+ profile="CDOExplorer"
platform="Windows"
os="win32"
ws="win32"
arch="x86"
priority="350" />
- <generate-product profile="CDOExplorer"
- feature="org.eclipse.emf.cdo.explorer.product"
+ <!--
+ <generate.product id="org.eclipse.emf.cdo.server.product.tcp_h2"
+ profile="CDOServer"
+ platform="Linux"
+ os="linux"
+ ws="gtk"
+ arch="x86"
+ priority="440" />
+
+ <generate.product id="org.eclipse.emf.cdo.explorer.product"
+ profile="CDOExplorer"
platform="Linux"
os="linux"
ws="gtk"
arch="x86"
priority="340" />
- <generate-product profile="CDOExplorer"
- feature="org.eclipse.emf.cdo.explorer.product"
+ <generate.product id="org.eclipse.emf.cdo.server.product.tcp_h2"
+ profile="CDOServer"
+ platform="Mac"
+ os="macosx"
+ ws="carbon"
+ arch="x86"
+ priority="430" />
+
+ <generate.product id="org.eclipse.emf.cdo.explorer.product"
+ profile="CDOExplorer"
platform="Mac"
os="macosx"
ws="carbon"
arch="x86"
priority="330" />
+ -->
</target>
</project>
diff --git a/plugins/org.eclipse.emf.cdo.releng/local.mspec b/plugins/org.eclipse.emf.cdo.releng/local.mspec
index 1eceed1fb2..b16e1e223f 100644
--- a/plugins/org.eclipse.emf.cdo.releng/local.mspec
+++ b/plugins/org.eclipse.emf.cdo.releng/local.mspec
@@ -6,7 +6,9 @@
<mspec:property key="eclipse.downloads" value="http://download.eclipse.org"/>
<mspec:property key="resolve.target.platform" value="true"/>
<mspec:property key="buckminster.download.source" value="true"/>
+ <!--
<mspec:mspecNode namePattern="^org\.eclipse\.emf\.cdo\.server\.product$" materializer="workspace" resourcePath="org.eclipse.emf.cdo.server.product-feature"/>
<mspec:mspecNode namePattern="^org\.eclipse\.emf\.cdo\.explorer\.product$" materializer="workspace" resourcePath="org.eclipse.emf.cdo.explorer.product-feature"/>
+ -->
<mspec:mspecNode materializer="workspace" filter="(buckminster.source=true)"/>
</mspec:mspec>
diff --git a/plugins/org.eclipse.emf.cdo.releng/rootfiles/epl-v10.html b/plugins/org.eclipse.emf.cdo.releng/rootfiles/epl-v10.html
deleted file mode 100644
index ed4b196655..0000000000
--- a/plugins/org.eclipse.emf.cdo.releng/rootfiles/epl-v10.html
+++ /dev/null
@@ -1,328 +0,0 @@
-<html xmlns:o="urn:schemas-microsoft-com:office:office"
-xmlns:w="urn:schemas-microsoft-com:office:word"
-xmlns="http://www.w3.org/TR/REC-html40">
-
-<head>
-<meta http-equiv=Content-Type content="text/html; charset=windows-1252">
-<meta name=ProgId content=Word.Document>
-<meta name=Generator content="Microsoft Word 9">
-<meta name=Originator content="Microsoft Word 9">
-<link rel=File-List
-href="./Eclipse%20EPL%202003_11_10%20Final_files/filelist.xml">
-<title>Eclipse Public License - Version 1.0</title>
-<!--[if gte mso 9]><xml>
- <o:DocumentProperties>
- <o:Revision>2</o:Revision>
- <o:TotalTime>3</o:TotalTime>
- <o:Created>2004-03-05T23:03:00Z</o:Created>
- <o:LastSaved>2004-03-05T23:03:00Z</o:LastSaved>
- <o:Pages>4</o:Pages>
- <o:Words>1626</o:Words>
- <o:Characters>9270</o:Characters>
- <o:Lines>77</o:Lines>
- <o:Paragraphs>18</o:Paragraphs>
- <o:CharactersWithSpaces>11384</o:CharactersWithSpaces>
- <o:Version>9.4402</o:Version>
- </o:DocumentProperties>
-</xml><![endif]--><!--[if gte mso 9]><xml>
- <w:WordDocument>
- <w:TrackRevisions/>
- </w:WordDocument>
-</xml><![endif]-->
-<style>
-<!--
- /* Font Definitions */
-@font-face
- {font-family:Tahoma;
- panose-1:2 11 6 4 3 5 4 4 2 4;
- mso-font-charset:0;
- mso-generic-font-family:swiss;
- mso-font-pitch:variable;
- mso-font-signature:553679495 -2147483648 8 0 66047 0;}
- /* Style Definitions */
-p.MsoNormal, li.MsoNormal, div.MsoNormal
- {mso-style-parent:"";
- margin:0in;
- margin-bottom:.0001pt;
- mso-pagination:widow-orphan;
- font-size:12.0pt;
- font-family:"Times New Roman";
- mso-fareast-font-family:"Times New Roman";}
-p
- {margin-right:0in;
- mso-margin-top-alt:auto;
- mso-margin-bottom-alt:auto;
- margin-left:0in;
- mso-pagination:widow-orphan;
- font-size:12.0pt;
- font-family:"Times New Roman";
- mso-fareast-font-family:"Times New Roman";}
-p.BalloonText, li.BalloonText, div.BalloonText
- {mso-style-name:"Balloon Text";
- margin:0in;
- margin-bottom:.0001pt;
- mso-pagination:widow-orphan;
- font-size:8.0pt;
- font-family:Tahoma;
- mso-fareast-font-family:"Times New Roman";}
-@page Section1
- {size:8.5in 11.0in;
- margin:1.0in 1.25in 1.0in 1.25in;
- mso-header-margin:.5in;
- mso-footer-margin:.5in;
- mso-paper-source:0;}
-div.Section1
- {page:Section1;}
--->
-</style>
-</head>
-
-<body lang=EN-US style='tab-interval:.5in'>
-
-<div class=Section1>
-
-<p align=center style='text-align:center'><b>Eclipse Public License - v 1.0</b>
-</p>
-
-<p><span style='font-size:10.0pt'>THE ACCOMPANYING PROGRAM IS PROVIDED UNDER
-THE TERMS OF THIS ECLIPSE PUBLIC LICENSE (&quot;AGREEMENT&quot;). ANY USE,
-REPRODUCTION OR DISTRIBUTION OF THE PROGRAM CONSTITUTES RECIPIENT'S ACCEPTANCE
-OF THIS AGREEMENT.</span> </p>
-
-<p><b><span style='font-size:10.0pt'>1. DEFINITIONS</span></b> </p>
-
-<p><span style='font-size:10.0pt'>&quot;Contribution&quot; means:</span> </p>
-
-<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>a)
-in the case of the initial Contributor, the initial code and documentation
-distributed under this Agreement, and<br clear=left>
-b) in the case of each subsequent Contributor:</span></p>
-
-<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>i)
-changes to the Program, and</span></p>
-
-<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>ii)
-additions to the Program;</span></p>
-
-<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>where
-such changes and/or additions to the Program originate from and are distributed
-by that particular Contributor. A Contribution 'originates' from a Contributor
-if it was added to the Program by such Contributor itself or anyone acting on
-such Contributor's behalf. Contributions do not include additions to the
-Program which: (i) are separate modules of software distributed in conjunction
-with the Program under their own license agreement, and (ii) are not derivative
-works of the Program. </span></p>
-
-<p><span style='font-size:10.0pt'>&quot;Contributor&quot; means any person or
-entity that distributes the Program.</span> </p>
-
-<p><span style='font-size:10.0pt'>&quot;Licensed Patents &quot; mean patent
-claims licensable by a Contributor which are necessarily infringed by the use
-or sale of its Contribution alone or when combined with the Program. </span></p>
-
-<p><span style='font-size:10.0pt'>&quot;Program&quot; means the Contributions
-distributed in accordance with this Agreement.</span> </p>
-
-<p><span style='font-size:10.0pt'>&quot;Recipient&quot; means anyone who
-receives the Program under this Agreement, including all Contributors.</span> </p>
-
-<p><b><span style='font-size:10.0pt'>2. GRANT OF RIGHTS</span></b> </p>
-
-<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>a)
-Subject to the terms of this Agreement, each Contributor hereby grants Recipient
-a non-exclusive, worldwide, royalty-free copyright license to<span
-style='color:red'> </span>reproduce, prepare derivative works of, publicly
-display, publicly perform, distribute and sublicense the Contribution of such
-Contributor, if any, and such derivative works, in source code and object code
-form.</span></p>
-
-<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>b)
-Subject to the terms of this Agreement, each Contributor hereby grants
-Recipient a non-exclusive, worldwide,<span style='color:green'> </span>royalty-free
-patent license under Licensed Patents to make, use, sell, offer to sell, import
-and otherwise transfer the Contribution of such Contributor, if any, in source
-code and object code form. This patent license shall apply to the combination
-of the Contribution and the Program if, at the time the Contribution is added
-by the Contributor, such addition of the Contribution causes such combination
-to be covered by the Licensed Patents. The patent license shall not apply to
-any other combinations which include the Contribution. No hardware per se is
-licensed hereunder. </span></p>
-
-<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>c)
-Recipient understands that although each Contributor grants the licenses to its
-Contributions set forth herein, no assurances are provided by any Contributor
-that the Program does not infringe the patent or other intellectual property
-rights of any other entity. Each Contributor disclaims any liability to Recipient
-for claims brought by any other entity based on infringement of intellectual
-property rights or otherwise. As a condition to exercising the rights and
-licenses granted hereunder, each Recipient hereby assumes sole responsibility
-to secure any other intellectual property rights needed, if any. For example,
-if a third party patent license is required to allow Recipient to distribute
-the Program, it is Recipient's responsibility to acquire that license before
-distributing the Program.</span></p>
-
-<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>d)
-Each Contributor represents that to its knowledge it has sufficient copyright
-rights in its Contribution, if any, to grant the copyright license set forth in
-this Agreement. </span></p>
-
-<p><b><span style='font-size:10.0pt'>3. REQUIREMENTS</span></b> </p>
-
-<p><span style='font-size:10.0pt'>A Contributor may choose to distribute the
-Program in object code form under its own license agreement, provided that:</span>
-</p>
-
-<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>a)
-it complies with the terms and conditions of this Agreement; and</span></p>
-
-<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>b)
-its license agreement:</span></p>
-
-<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>i)
-effectively disclaims on behalf of all Contributors all warranties and
-conditions, express and implied, including warranties or conditions of title
-and non-infringement, and implied warranties or conditions of merchantability
-and fitness for a particular purpose; </span></p>
-
-<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>ii)
-effectively excludes on behalf of all Contributors all liability for damages,
-including direct, indirect, special, incidental and consequential damages, such
-as lost profits; </span></p>
-
-<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>iii)
-states that any provisions which differ from this Agreement are offered by that
-Contributor alone and not by any other party; and</span></p>
-
-<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>iv)
-states that source code for the Program is available from such Contributor, and
-informs licensees how to obtain it in a reasonable manner on or through a
-medium customarily used for software exchange.<span style='color:blue'> </span></span></p>
-
-<p><span style='font-size:10.0pt'>When the Program is made available in source
-code form:</span> </p>
-
-<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>a)
-it must be made available under this Agreement; and </span></p>
-
-<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>b) a
-copy of this Agreement must be included with each copy of the Program. </span></p>
-
-<p><span style='font-size:10.0pt'>Contributors may not remove or alter any
-copyright notices contained within the Program. </span></p>
-
-<p><span style='font-size:10.0pt'>Each Contributor must identify itself as the
-originator of its Contribution, if any, in a manner that reasonably allows
-subsequent Recipients to identify the originator of the Contribution. </span></p>
-
-<p><b><span style='font-size:10.0pt'>4. COMMERCIAL DISTRIBUTION</span></b> </p>
-
-<p><span style='font-size:10.0pt'>Commercial distributors of software may
-accept certain responsibilities with respect to end users, business partners
-and the like. While this license is intended to facilitate the commercial use
-of the Program, the Contributor who includes the Program in a commercial
-product offering should do so in a manner which does not create potential
-liability for other Contributors. Therefore, if a Contributor includes the
-Program in a commercial product offering, such Contributor (&quot;Commercial
-Contributor&quot;) hereby agrees to defend and indemnify every other
-Contributor (&quot;Indemnified Contributor&quot;) against any losses, damages and
-costs (collectively &quot;Losses&quot;) arising from claims, lawsuits and other
-legal actions brought by a third party against the Indemnified Contributor to
-the extent caused by the acts or omissions of such Commercial Contributor in
-connection with its distribution of the Program in a commercial product
-offering. The obligations in this section do not apply to any claims or Losses
-relating to any actual or alleged intellectual property infringement. In order
-to qualify, an Indemnified Contributor must: a) promptly notify the Commercial
-Contributor in writing of such claim, and b) allow the Commercial Contributor
-to control, and cooperate with the Commercial Contributor in, the defense and
-any related settlement negotiations. The Indemnified Contributor may participate
-in any such claim at its own expense.</span> </p>
-
-<p><span style='font-size:10.0pt'>For example, a Contributor might include the
-Program in a commercial product offering, Product X. That Contributor is then a
-Commercial Contributor. If that Commercial Contributor then makes performance
-claims, or offers warranties related to Product X, those performance claims and
-warranties are such Commercial Contributor's responsibility alone. Under this
-section, the Commercial Contributor would have to defend claims against the
-other Contributors related to those performance claims and warranties, and if a
-court requires any other Contributor to pay any damages as a result, the
-Commercial Contributor must pay those damages.</span> </p>
-
-<p><b><span style='font-size:10.0pt'>5. NO WARRANTY</span></b> </p>
-
-<p><span style='font-size:10.0pt'>EXCEPT AS EXPRESSLY SET FORTH IN THIS
-AGREEMENT, THE PROGRAM IS PROVIDED ON AN &quot;AS IS&quot; BASIS, WITHOUT
-WARRANTIES OR CONDITIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED INCLUDING,
-WITHOUT LIMITATION, ANY WARRANTIES OR CONDITIONS OF TITLE, NON-INFRINGEMENT,
-MERCHANTABILITY OR FITNESS FOR A PARTICULAR PURPOSE. Each Recipient is solely
-responsible for determining the appropriateness of using and distributing the
-Program and assumes all risks associated with its exercise of rights under this
-Agreement , including but not limited to the risks and costs of program errors,
-compliance with applicable laws, damage to or loss of data, programs or
-equipment, and unavailability or interruption of operations. </span></p>
-
-<p><b><span style='font-size:10.0pt'>6. DISCLAIMER OF LIABILITY</span></b> </p>
-
-<p><span style='font-size:10.0pt'>EXCEPT AS EXPRESSLY SET FORTH IN THIS
-AGREEMENT, NEITHER RECIPIENT NOR ANY CONTRIBUTORS SHALL HAVE ANY LIABILITY FOR
-ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
-(INCLUDING WITHOUT LIMITATION LOST PROFITS), HOWEVER CAUSED AND ON ANY THEORY
-OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING
-NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OR DISTRIBUTION OF
-THE PROGRAM OR THE EXERCISE OF ANY RIGHTS GRANTED HEREUNDER, EVEN IF ADVISED OF
-THE POSSIBILITY OF SUCH DAMAGES.</span> </p>
-
-<p><b><span style='font-size:10.0pt'>7. GENERAL</span></b> </p>
-
-<p><span style='font-size:10.0pt'>If any provision of this Agreement is invalid
-or unenforceable under applicable law, it shall not affect the validity or
-enforceability of the remainder of the terms of this Agreement, and without
-further action by the parties hereto, such provision shall be reformed to the
-minimum extent necessary to make such provision valid and enforceable.</span> </p>
-
-<p><span style='font-size:10.0pt'>If Recipient institutes patent litigation
-against any entity (including a cross-claim or counterclaim in a lawsuit)
-alleging that the Program itself (excluding combinations of the Program with
-other software or hardware) infringes such Recipient's patent(s), then such
-Recipient's rights granted under Section 2(b) shall terminate as of the date
-such litigation is filed. </span></p>
-
-<p><span style='font-size:10.0pt'>All Recipient's rights under this Agreement
-shall terminate if it fails to comply with any of the material terms or
-conditions of this Agreement and does not cure such failure in a reasonable
-period of time after becoming aware of such noncompliance. If all Recipient's
-rights under this Agreement terminate, Recipient agrees to cease use and
-distribution of the Program as soon as reasonably practicable. However,
-Recipient's obligations under this Agreement and any licenses granted by
-Recipient relating to the Program shall continue and survive. </span></p>
-
-<p><span style='font-size:10.0pt'>Everyone is permitted to copy and distribute
-copies of this Agreement, but in order to avoid inconsistency the Agreement is
-copyrighted and may only be modified in the following manner. The Agreement
-Steward reserves the right to publish new versions (including revisions) of
-this Agreement from time to time. No one other than the Agreement Steward has
-the right to modify this Agreement. The Eclipse Foundation is the initial
-Agreement Steward. The Eclipse Foundation may assign the responsibility to
-serve as the Agreement Steward to a suitable separate entity. Each new version
-of the Agreement will be given a distinguishing version number. The Program
-(including Contributions) may always be distributed subject to the version of
-the Agreement under which it was received. In addition, after a new version of
-the Agreement is published, Contributor may elect to distribute the Program
-(including its Contributions) under the new version. Except as expressly stated
-in Sections 2(a) and 2(b) above, Recipient receives no rights or licenses to
-the intellectual property of any Contributor under this Agreement, whether
-expressly, by implication, estoppel or otherwise. All rights in the Program not
-expressly granted under this Agreement are reserved.</span> </p>
-
-<p><span style='font-size:10.0pt'>This Agreement is governed by the laws of the
-State of New York and the intellectual property laws of the United States of
-America. No party to this Agreement will bring a legal action under this
-Agreement more than one year after the cause of action arose. Each party waives
-its rights to a jury trial in any resulting litigation.</span> </p>
-
-<p class=MsoNormal><![if !supportEmptyParas]>&nbsp;<![endif]><o:p></o:p></p>
-
-</div>
-
-</body>
-
-</html> \ No newline at end of file
diff --git a/plugins/org.eclipse.emf.cdo.releng/rootfiles/notice.html b/plugins/org.eclipse.emf.cdo.releng/rootfiles/notice.html
deleted file mode 100644
index dc5aefd675..0000000000
--- a/plugins/org.eclipse.emf.cdo.releng/rootfiles/notice.html
+++ /dev/null
@@ -1,162 +0,0 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
-<html xmlns="http://www.w3.org/1999/xhtml"><head>
-
-
-
-<meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1">
-<title>Eclipse Foundation Software User Agreement</title>
-</head><body lang="EN-US">
-<h2>Eclipse Foundation Software User Agreement</h2>
-<p>February 1, 2011</p>
-
-<h3>Usage Of Content</h3>
-
-<p>THE ECLIPSE FOUNDATION MAKES AVAILABLE SOFTWARE, DOCUMENTATION, INFORMATION AND/OR OTHER MATERIALS FOR OPEN SOURCE PROJECTS
- (COLLECTIVELY "CONTENT"). USE OF THE CONTENT IS GOVERNED BY THE TERMS AND CONDITIONS OF THIS AGREEMENT AND/OR THE TERMS AND
- CONDITIONS OF LICENSE AGREEMENTS OR NOTICES INDICATED OR REFERENCED BELOW. BY USING THE CONTENT, YOU AGREE THAT YOUR USE
- OF THE CONTENT IS GOVERNED BY THIS AGREEMENT AND/OR THE TERMS AND CONDITIONS OF ANY APPLICABLE LICENSE AGREEMENTS OR
- NOTICES INDICATED OR REFERENCED BELOW. IF YOU DO NOT AGREE TO THE TERMS AND CONDITIONS OF THIS AGREEMENT AND THE TERMS AND
- CONDITIONS OF ANY APPLICABLE LICENSE AGREEMENTS OR NOTICES INDICATED OR REFERENCED BELOW, THEN YOU MAY NOT USE THE CONTENT.</p>
-
-<h3>Applicable Licenses</h3>
-
-<p>Unless otherwise indicated, all Content made available by the Eclipse
- Foundation is provided to you under the terms and conditions of the
-Eclipse Public License Version 1.0
- ("EPL"). A copy of the EPL is provided with this Content and is also
- available at <a href="http://www.eclipse.org/legal/epl-v10.html">http://www.eclipse.org/legal/epl-v10.html</a>.
- For purposes of the EPL, "Program" will mean the Content.</p>
-
-<p>Content includes, but is not limited to, source code, object code,
-documentation and other files maintained in the Eclipse Foundation
-source code
- repository ("Repository") in software modules ("Modules") and made
-available as downloadable archives ("Downloads").</p>
-
-<ul>
- <li>Content may be structured and packaged into modules to
-facilitate delivering, extending, and upgrading the Content. Typical
-modules may include plug-ins ("Plug-ins"), plug-in fragments
-("Fragments"), and features ("Features").</li>
- <li>Each Plug-in or Fragment may be packaged as a sub-directory or JAR (Java&#8482; ARchive) in a directory named "plugins".</li>
- <li>A Feature is a bundle of one or more Plug-ins and/or
-Fragments and associated material. Each Feature may be packaged as a
-sub-directory in a directory named "features". Within a Feature, files
-named "feature.xml" may contain a list of the names and version numbers
-of the Plug-ins
- and/or Fragments associated with that Feature.</li>
- <li>Features may also include other Features ("Included
-Features"). Within a Feature, files named "feature.xml" may contain a
-list of the names and version numbers of Included Features.</li>
-</ul>
-
-<p>The terms and conditions governing Plug-ins and Fragments should be
-contained in files named "about.html" ("Abouts"). The terms and
-conditions governing Features and
-Included Features should be contained in files named "license.html"
-("Feature Licenses"). Abouts and Feature Licenses may be located in any
- directory of a Download or Module
-including, but not limited to the following locations:</p>
-
-<ul>
- <li>The top-level (root) directory</li>
- <li>Plug-in and Fragment directories</li>
- <li>Inside Plug-ins and Fragments packaged as JARs</li>
- <li>Sub-directories of the directory named "src" of certain Plug-ins</li>
- <li>Feature directories</li>
-</ul>
-
-<p>Note: if a Feature made available by the Eclipse Foundation is
-installed using the Provisioning Technology (as defined below), you must
- agree to a license ("Feature Update License") during the
-installation process. If the Feature contains Included Features, the
-Feature Update License should either provide you with the terms and
-conditions governing the Included Features or
-inform you where you can locate them. Feature Update Licenses may be
-found in the "license" property of files named "feature.properties"
-found within a Feature.
-Such Abouts, Feature Licenses, and Feature Update Licenses contain the
-terms and conditions (or references to such terms and conditions) that
-govern your use of the associated Content in
-that directory.</p>
-
-<p>THE ABOUTS, FEATURE LICENSES, AND FEATURE UPDATE LICENSES MAY REFER
-TO THE EPL OR OTHER LICENSE AGREEMENTS, NOTICES OR TERMS AND CONDITIONS.
- SOME OF THESE
-OTHER LICENSE AGREEMENTS MAY INCLUDE (BUT ARE NOT LIMITED TO):</p>
-
-<ul>
- <li>Eclipse Distribution License Version 1.0 (available at <a href="http://www.eclipse.org/licenses/edl-v10.html">http://www.eclipse.org/licenses/edl-v1.0.html</a>)</li>
- <li>Common Public License Version 1.0 (available at <a href="http://www.eclipse.org/legal/cpl-v10.html">http://www.eclipse.org/legal/cpl-v10.html</a>)</li>
- <li>Apache Software License 1.1 (available at <a href="http://www.apache.org/licenses/LICENSE">http://www.apache.org/licenses/LICENSE</a>)</li>
- <li>Apache Software License 2.0 (available at <a href="http://www.apache.org/licenses/LICENSE-2.0">http://www.apache.org/licenses/LICENSE-2.0</a>)</li>
- <li>Metro Link Public License 1.00 (available at <a href="http://www.opengroup.org/openmotif/supporters/metrolink/license.html">http://www.opengroup.org/openmotif/supporters/metrolink/license.html</a>)</li>
- <li>Mozilla Public License Version 1.1 (available at <a href="http://www.mozilla.org/MPL/MPL-1.1.html">http://www.mozilla.org/MPL/MPL-1.1.html</a>)</li>
-</ul>
-
-<p>IT IS YOUR OBLIGATION TO READ AND ACCEPT ALL SUCH TERMS AND
-CONDITIONS PRIOR TO USE OF THE CONTENT. If no About, Feature License,
-or Feature Update License is provided, please
-contact the Eclipse Foundation to determine what terms and conditions
-govern that particular Content.</p>
-
-
-<h3>Use of Provisioning Technology</h3>
-
-<p>The Eclipse Foundation makes available provisioning software,
-examples of which include, but are not limited to, p2 and the Eclipse
- Update Manager ("Provisioning Technology") for the purpose of
-allowing users to install software, documentation, information and/or
- other materials (collectively "Installable Software"). This
-capability is provided with the intent of allowing such users to
- install, extend and update Eclipse-based products. Information about
-packaging Installable Software is available at <a href="http://eclipse.org/equinox/p2/repository_packaging.html">http://eclipse.org/equinox/p2/repository_packaging.html</a>
- ("Specification").</p>
-
-<p>You may use Provisioning Technology to allow other parties to install
- Installable Software. You shall be responsible for enabling the
- applicable license agreements relating to the Installable Software to
- be presented to, and accepted by, the users of the Provisioning
-Technology
- in accordance with the Specification. By using Provisioning
-Technology in such a manner and making it available in accordance with
-the
- Specification, you further acknowledge your agreement to, and the
-acquisition of all necessary rights to permit the following:</p>
-
-<ol>
- <li>A series of actions may occur ("Provisioning Process") in
-which a user may execute the Provisioning Technology
- on a machine ("Target Machine") with the intent of installing,
-extending or updating the functionality of an Eclipse-based
- product.</li>
- <li>During the Provisioning Process, the Provisioning Technology
-may cause third party Installable Software or a portion thereof to be
- accessed and copied to the Target Machine.</li>
- <li>Pursuant to the Specification, you will provide to the user
-the terms and conditions that govern the use of the Installable
- Software ("Installable Software Agreement") and such Installable
-Software Agreement shall be accessed from the Target
- Machine in accordance with the Specification. Such Installable
-Software Agreement must inform the user of the terms and conditions that
- govern
- the Installable Software and must solicit acceptance by the end
-user in the manner prescribed in such Installable Software Agreement.
-Upon such
- indication of agreement by the user, the provisioning Technology
-will complete installation of the Installable Software.</li>
-</ol>
-
-<h3>Cryptography</h3>
-
-<p>Content may contain encryption software. The country in which you are
- currently may have restrictions on the import, possession, and use,
-and/or re-export to
- another country, of encryption software. BEFORE using any encryption
-software, please check the country's laws, regulations and policies
-concerning the import,
- possession, or use, and re-export of encryption software, to see if
-this is permitted.</p>
-
-<p><small>Java and all Java-based trademarks are trademarks of Oracle Corporation in the United States, other countries, or both.</small></p>
-</body></html> \ No newline at end of file
diff --git a/plugins/org.eclipse.emf.cdo.server.product/build.properties b/plugins/org.eclipse.emf.cdo.server.product/build.properties
index 837e0de5f4..58735c9b68 100644
--- a/plugins/org.eclipse.emf.cdo.server.product/build.properties
+++ b/plugins/org.eclipse.emf.cdo.server.product/build.properties
@@ -24,5 +24,3 @@ src.includes = about.html,\
jars.compile.order = .
source.. = src/
output.. = bin/
-
-root=config
diff --git a/plugins/org.eclipse.emf.cdo.server/build.properties b/plugins/org.eclipse.emf.cdo.server/build.properties
index fe74414624..2c3acd3537 100644
--- a/plugins/org.eclipse.emf.cdo.server/build.properties
+++ b/plugins/org.eclipse.emf.cdo.server/build.properties
@@ -26,6 +26,7 @@ source.. = src/
output.. = bin/
src.includes = about.html,\
copyright.txt,\
- CDOServer.launch
+ CDOServer.launch,\
+ CDOServer_SSL.launch
org.eclipse.emf.cdo.releng.javadoc.project = org.eclipse.emf.cdo.doc
diff --git a/plugins/org.eclipse.emf.cdo.server/plugin.properties b/plugins/org.eclipse.emf.cdo.server/plugin.properties
index 28cc3bbff4..9cc5cf8608 100644
--- a/plugins/org.eclipse.emf.cdo.server/plugin.properties
+++ b/plugins/org.eclipse.emf.cdo.server/plugin.properties
@@ -12,9 +12,6 @@ providerName = Eclipse Modeling Project
app.name = CDOServer
-product.description = An example of a CDO server
-product.name = CDO Server
-
extension-point.name = CDO Store Factories
extension-point.name.0 = CDO Repository Factories
extension-point.name.1 = CDO Application Extensions
diff --git a/plugins/org.eclipse.emf.cdo.server/plugin.xml b/plugins/org.eclipse.emf.cdo.server/plugin.xml
index b55369c489..124577ba01 100644
--- a/plugins/org.eclipse.emf.cdo.server/plugin.xml
+++ b/plugins/org.eclipse.emf.cdo.server/plugin.xml
@@ -51,13 +51,4 @@
</application>
</extension>
- <extension id="product" point="org.eclipse.core.runtime.products">
- <product
- name="%product.name"
- description="%product.description"
- application="org.eclipse.emf.cdo.server.app">
- <property name="appName" value="CDO Server"/>
- </product>
- </extension>
-
</plugin>
diff --git a/plugins/org.eclipse.emf.cdo.ui/src/org/eclipse/emf/cdo/internal/ui/perspectives/CDOExplorerPerspective.java b/plugins/org.eclipse.emf.cdo.ui/src/org/eclipse/emf/cdo/internal/ui/perspectives/CDOExplorerPerspective.java
index 249f580f66..0660752dfd 100644
--- a/plugins/org.eclipse.emf.cdo.ui/src/org/eclipse/emf/cdo/internal/ui/perspectives/CDOExplorerPerspective.java
+++ b/plugins/org.eclipse.emf.cdo.ui/src/org/eclipse/emf/cdo/internal/ui/perspectives/CDOExplorerPerspective.java
@@ -48,23 +48,23 @@ public class CDOExplorerPerspective implements IPerspectiveFactory
protected void addViews()
{
- IFolderLayout BrowsingFolderLayout0 = pageLayout.createFolder("cdoFolderLayout0", IPageLayout.LEFT, 0.20f, //$NON-NLS-1$
+ IFolderLayout navigationPane = pageLayout.createFolder("navigationPane", IPageLayout.LEFT, 0.30f, //$NON-NLS-1$
pageLayout.getEditorArea());
- BrowsingFolderLayout0.addView(IPageLayout.ID_PROJECT_EXPLORER);
+ navigationPane.addView(IPageLayout.ID_PROJECT_EXPLORER);
- IFolderLayout BrowsingFolderLayout1 = pageLayout.createFolder("cdoFolderLayout1", IPageLayout.BOTTOM, 0.70f, //$NON-NLS-1$
+ IFolderLayout sessionsPane = pageLayout.createFolder("sessionsPane", IPageLayout.BOTTOM, 0.70f, //$NON-NLS-1$
IPageLayout.ID_PROJECT_EXPLORER);
- BrowsingFolderLayout1.addView(CDOSessionsView.ID);
+ sessionsPane.addView(CDOSessionsView.ID);
- IFolderLayout BrowsingFolderLayout2 = pageLayout.createFolder("cdoFolderLayout3", IPageLayout.BOTTOM, 0.70f, //$NON-NLS-1$
+ IFolderLayout propertiesPane = pageLayout.createFolder("propertiesPane", IPageLayout.BOTTOM, 0.70f, //$NON-NLS-1$
pageLayout.getEditorArea());
- BrowsingFolderLayout2.addView(IPageLayout.ID_PROP_SHEET);
- BrowsingFolderLayout2.addView(CDOWatchListView.ID);
- BrowsingFolderLayout2.addView(CDORemoteSessionsView.ID);
+ propertiesPane.addView(IPageLayout.ID_PROP_SHEET);
+ propertiesPane.addView(CDOWatchListView.ID);
+ propertiesPane.addView(CDORemoteSessionsView.ID);
- IFolderLayout BrowsingFolderLayout3 = pageLayout.createFolder("cdoFolderLayout2", IPageLayout.RIGHT, 0.8f, //$NON-NLS-1$
+ IFolderLayout outlinePane = pageLayout.createFolder("outlinePane", IPageLayout.RIGHT, 0.70f, //$NON-NLS-1$
pageLayout.getEditorArea());
- BrowsingFolderLayout3.addView(IPageLayout.ID_OUTLINE);
+ outlinePane.addView(IPageLayout.ID_OUTLINE);
}
protected void addViewShortcuts()
@@ -87,5 +87,4 @@ public class CDOExplorerPerspective implements IPerspectiveFactory
return PlatformUI.getWorkbench().getActiveWorkbenchWindow().getActivePage().getPerspective().getId()
.equals(CDOExplorerPerspective.ID);
}
-
}

Back to the top