Make the build runnable locally

10 files changed, 178 insertions, 207 deletions

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
index a47c9dfe8b..d7b02ccf8c 100644
--- 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
@@ -1,3 +1,4 @@
 eclipse.preferences.version=1
+encoding/.project=UTF-8
 encoding/CDOServer.product=UTF-8
 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 507cdab861..aca6ec40c2 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.tcp_h2" application="org.eclipse.emf.cdo.server.app" useFeatures="false" 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>
@@ -32,6 +32,7 @@
    </vm>
 
    <plugins>
+<!--
       <plugin id="org.apache.felix.gogo.command"/>
       <plugin id="org.apache.felix.gogo.runtime"/>
       <plugin id="org.apache.felix.gogo.shell"/>
@@ -66,10 +67,14 @@
       <plugin id="org.eclipse.net4j.util"/>
       <plugin id="org.eclipse.osgi"/>
       <plugin id="org.h2"/>
+-->
    </plugins>
 
-   <features>
-   </features>
-
+  <features>
+		<feature id="org.eclipse.emf.cdo.server.product"/>    
+		<feature id="org.eclipse.equinox.core.feature"/>    
+		<feature id="org.eclipse.emf.common"/>    
+		<feature id="org.eclipse.emf.ecore"/>    
+  </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
index de6e4ebd59..d5071d15ea 100644
--- a/features/org.eclipse.emf.cdo.server.product-feature/buckminster.cspex
+++ b/features/org.eclipse.emf.cdo.server.product-feature/buckminster.cspex
@@ -1,6 +1,7 @@
 <?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.core.feature" componentType="eclipse.feature"/>
 		<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/feature.xml b/features/org.eclipse.emf.cdo.server.product-feature/feature.xml
index fd783a70b9..6a07dabc73 100644
--- a/features/org.eclipse.emf.cdo.server.product-feature/feature.xml
+++ b/features/org.eclipse.emf.cdo.server.product-feature/feature.xml
@@ -40,4 +40,95 @@
          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.server.db"
+         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"
+         download-size="0"
+         install-size="0"
+         version="0.0.0"
+         unpack="false"/>
+
+   <plugin
+         id="org.eclipse.emf.cdo.common"
+         download-size="0"
+         install-size="0"
+         version="0.0.0"
+         unpack="false"/>
+
+   <plugin
+         id="org.eclipse.net4j"
+         download-size="0"
+         install-size="0"
+         version="0.0.0"
+         unpack="false"/>
+
+   <plugin
+         id="org.eclipse.net4j.db"
+         download-size="0"
+         install-size="0"
+         version="0.0.0"
+         unpack="false"/>
+
+   <plugin
+         id="org.eclipse.net4j.db.h2"
+         download-size="0"
+         install-size="0"
+         version="0.0.0"
+         unpack="false"/>
+
+   <plugin
+         id="org.eclipse.net4j.db.jdbc"
+         download-size="0"
+         install-size="0"
+         version="0.0.0"
+         unpack="false"/>
+
+   <plugin
+         id="org.eclipse.net4j.jvm"
+         download-size="0"
+         install-size="0"
+         version="0.0.0"
+         unpack="false"/>
+
+   <plugin
+         id="org.eclipse.net4j.tcp"
+         download-size="0"
+         install-size="0"
+         version="0.0.0"
+         unpack="false"/>
+
+   <plugin
+         id="org.eclipse.net4j.util"
+         download-size="0"
+         install-size="0"
+         version="0.0.0"
+         unpack="false"/>
+
+   <plugin
+         id="org.h2"
+         download-size="0"
+         install-size="0"
+         version="0.0.0"
+         unpack="false"/>
+
 </feature>
diff --git a/features/org.eclipse.emf.cdo.site-feature/feature.xml b/features/org.eclipse.emf.cdo.site-feature/feature.xml
index fcbb9f92df..eaaafbbdd6 100644
--- a/features/org.eclipse.emf.cdo.site-feature/feature.xml
+++ b/features/org.eclipse.emf.cdo.site-feature/feature.xml
@@ -30,197 +30,54 @@
       %license
    </license>
 
-   <includes
-         id="org.eclipse.net4j.sdk"
-         version="0.0.0"/>
-
-   <includes
-         id="org.eclipse.net4j.db.derby"
-         version="0.0.0"/>
-
-   <includes
-         id="org.eclipse.net4j.db.h2"
-         version="0.0.0"/>
-
-   <includes
-         id="org.eclipse.net4j.db.hsqldb"
-         version="0.0.0"/>
-
-   <includes
-         id="org.eclipse.net4j.db.mysql"
-         version="0.0.0"/>
-
-   <includes
-         id="org.eclipse.net4j.db.oracle"
-         version="0.0.0"/>
-
-   <includes
-         id="org.eclipse.net4j.db.postgresql"
-         version="0.0.0"/>
-
-   <includes
-         id="org.eclipse.net4j.tests"
-         version="0.0.0"/>
-
-   <includes
-         id="org.eclipse.net4j.examples"
-         version="0.0.0"/>
-
-   <includes
-         id="org.eclipse.emf.cdo.epp"
-         version="0.0.0"/>
-
-   <includes
-         id="org.eclipse.emf.cdo.dawn.sdk"
-         version="0.0.0"/>
-
-   <includes
-         id="org.eclipse.emf.cdo.sdk"
-         version="0.0.0"/>
-
-   <includes
-         id="org.eclipse.emf.cdo.compare"
-         version="0.0.0"/>
-
-   <includes
-         id="org.eclipse.emf.cdo.server"
-         version="0.0.0"/>
-
-   <includes
-         id="org.eclipse.emf.cdo.server.objectivity"
-         version="0.0.0"/>
-
-   <includes
-         id="org.eclipse.emf.cdo.server.hibernate"
-         version="0.0.0"/>
-
-   <includes
-         id="org.eclipse.emf.cdo.examples.hibernate"
-         version="0.0.0"/>
-
-   <includes
-         id="org.eclipse.emf.cdo.explorer.product"
-         version="0.0.0"/>
-
-   <includes
-         id="org.eclipse.emf.cdo.server.product"
-         version="0.0.0"/>
-
-   <includes
-         id="org.eclipse.emf.cdo.tests.hibernate"
-         version="0.0.0"/>
-
-   <includes
-         id="org.eclipse.emf.cdo.server.db4o"
-         version="0.0.0"/>
-
-   <includes
-         id="org.eclipse.emf.cdo.server.mongodb"
-         version="0.0.0"/>
-
-   <includes
-         id="org.eclipse.emf.cdo.server.lissome"
-         version="0.0.0"/>
-
-   <includes
-         id="org.eclipse.emf.cdo.tests"
-         version="0.0.0"/>
-
-   <includes
-         id="org.eclipse.emf.cdo.examples"
-         version="0.0.0"/>
-
-   <includes
-         id="org.gastro"
-         version="0.0.0"/>
-
-   <includes
-         id="org.eclipse.emf.cdo.releng.version"
-         version="0.0.0"/>
-
-   <includes
-         id="org.eclipse.emf.cdo.releng.version.doc"
-         version="0.0.0"/>
-
-   <includes
-         id="org.eclipse.emf.cdo.releng.version.tests"
-         version="0.0.0"/>
-
-   <includes
-         id="org.eclipse.emf.cdo.releng.version.headless"
-         version="0.0.0"/>
-
-   <includes
-         id="org.eclipse.emf.cdo.releng.version.sdk"
-         version="0.0.0"/>
-
-   <includes
-         id="org.eclipse.emf.cdo.releng.help"
-         version="0.0.0"/>
-
-   <includes
-         id="org.eclipse.emf.cdo.releng.buildstamp"
-         version="0.0.0"/>
-
-   <includes
-         id="org.eclipse.emf.cdo.releng.launches"
-         version="0.0.0"/>
-
-   <includes
-         id="org.eclipse.emf.cdo.releng.apireports"
-         version="0.0.0"/>
-
-   <includes
-         id="org.eclipse.emf.cdo.releng.manifests"
-         version="0.0.0"/>
-
-   <includes
-         id="org.eclipse.emf.cdo.releng.projectcopy"
-         version="0.0.0"/>
-
-   <includes
-         id="org.eclipse.emf.cdo.releng.relativepaths"
-         version="0.0.0"/>
-
-   <includes
-         id="org.eclipse.emf.cdo.releng.tasks"
-         version="0.0.0"/>
-
-   <includes
-         id="org.eclipse.emf.cdo.releng.windowtitle"
-         version="0.0.0"/>
-
-   <includes
-         id="org.eclipse.emf.cdo.releng.winexplorer"
-         version="0.0.0"/>
-
-   <includes
-         id="org.eclipse.emf.cdo.releng.gitbash"
-         version="0.0.0"/>
-
-   <includes
-         id="org.eclipse.emf.cdo.releng.workingsets"
-         version="0.0.0"/>
-
-   <includes
-         id="org.eclipse.emf.cdo.dawn.codegen.gmf"
-         version="0.0.0"/>
-
-   <includes
-         id="org.eclipse.emf.cdo.dawn.tests"
-         version="0.0.0"/>
-
-   <includes
-         id="org.eclipse.emf.cdo.releng.setup.editor"
-         version="0.0.0"/>
-
-   <includes
-         id="org.eclipse.emf.cdo.releng.setup.ide"
-         version="0.0.0"/>
-
-   <includes
-         id="org.eclipse.emf.cdo.releng.setup.product"
-         version="0.0.0"/>
+   <includes id="org.eclipse.emf.cdo.compare" version="0.0.0"/>
+   <includes id="org.eclipse.emf.cdo.dawn.codegen.gmf" version="0.0.0"/>
+   <includes id="org.eclipse.emf.cdo.dawn.sdk" version="0.0.0"/>
+   <includes id="org.eclipse.emf.cdo.dawn.tests" version="0.0.0"/>
+   <includes id="org.eclipse.emf.cdo.epp" version="0.0.0"/>
+   <includes id="org.eclipse.emf.cdo.examples" version="0.0.0"/>
+   <includes id="org.eclipse.emf.cdo.examples.hibernate" version="0.0.0"/>
+   <includes id="org.eclipse.emf.cdo.explorer.product" version="0.0.0"/>
+   <includes id="org.eclipse.emf.cdo.releng.apireports" version="0.0.0"/>
+   <includes id="org.eclipse.emf.cdo.releng.buildstamp" version="0.0.0"/>
+   <includes id="org.eclipse.emf.cdo.releng.gitbash" version="0.0.0"/>
+   <includes id="org.eclipse.emf.cdo.releng.help" version="0.0.0"/>
+   <includes id="org.eclipse.emf.cdo.releng.launches" version="0.0.0"/>
+   <includes id="org.eclipse.emf.cdo.releng.manifests" version="0.0.0"/>
+   <includes id="org.eclipse.emf.cdo.releng.projectcopy" version="0.0.0"/>
+   <includes id="org.eclipse.emf.cdo.releng.relativepaths" version="0.0.0"/>
+   <includes id="org.eclipse.emf.cdo.releng.setup.editor" version="0.0.0"/>
+   <includes id="org.eclipse.emf.cdo.releng.setup.ide" version="0.0.0"/>
+   <includes id="org.eclipse.emf.cdo.releng.setup.product" version="0.0.0"/>
+   <includes id="org.eclipse.emf.cdo.releng.tasks" version="0.0.0"/>
+   <includes id="org.eclipse.emf.cdo.releng.version" version="0.0.0"/>
+   <includes id="org.eclipse.emf.cdo.releng.version.doc" version="0.0.0"/>
+   <includes id="org.eclipse.emf.cdo.releng.version.headless" version="0.0.0"/>
+   <includes id="org.eclipse.emf.cdo.releng.version.sdk" version="0.0.0"/>
+   <includes id="org.eclipse.emf.cdo.releng.version.tests" version="0.0.0"/>
+   <includes id="org.eclipse.emf.cdo.releng.windowtitle" version="0.0.0"/>
+   <includes id="org.eclipse.emf.cdo.releng.winexplorer" version="0.0.0"/>
+   <includes id="org.eclipse.emf.cdo.releng.workingsets" version="0.0.0"/>
+   <includes id="org.eclipse.emf.cdo.sdk" version="0.0.0"/>
+   <includes id="org.eclipse.emf.cdo.server" version="0.0.0"/>
+   <includes id="org.eclipse.emf.cdo.server.db4o" version="0.0.0"/>
+   <includes id="org.eclipse.emf.cdo.server.hibernate" version="0.0.0"/>
+   <includes id="org.eclipse.emf.cdo.server.lissome" version="0.0.0"/>
+   <includes id="org.eclipse.emf.cdo.server.mongodb" version="0.0.0"/>
+   <includes id="org.eclipse.emf.cdo.server.objectivity" version="0.0.0"/>
+   <includes id="org.eclipse.emf.cdo.server.product" version="0.0.0"/>
+   <includes id="org.eclipse.emf.cdo.tests" version="0.0.0"/>
+   <includes id="org.eclipse.emf.cdo.tests.hibernate" version="0.0.0"/>
+   <includes id="org.eclipse.net4j.db.derby" version="0.0.0"/>
+   <includes id="org.eclipse.net4j.db.h2" version="0.0.0"/>
+   <includes id="org.eclipse.net4j.db.hsqldb" version="0.0.0"/>
+   <includes id="org.eclipse.net4j.db.mysql" version="0.0.0"/>
+   <includes id="org.eclipse.net4j.db.oracle" version="0.0.0"/>
+   <includes id="org.eclipse.net4j.db.postgresql" version="0.0.0"/>
+   <includes id="org.eclipse.net4j.examples" version="0.0.0"/>
+   <includes id="org.eclipse.net4j.sdk" version="0.0.0"/>
+   <includes id="org.eclipse.net4j.tests" version="0.0.0"/>
+   <includes id="org.gastro" version="0.0.0"/>
 
    <plugin
          id="org.eclipse.emf.cdo.tests.objectivity"
diff --git a/plugins/org.eclipse.emf.cdo.explorer/META-INF/MANIFEST.MF b/plugins/org.eclipse.emf.cdo.explorer/META-INF/MANIFEST.MF
index 61ec3eaa16..df2a6b11c5 100644
--- a/plugins/org.eclipse.emf.cdo.explorer/META-INF/MANIFEST.MF
+++ b/plugins/org.eclipse.emf.cdo.explorer/META-INF/MANIFEST.MF
@@ -2,7 +2,7 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: %pluginName
 Bundle-SymbolicName: org.eclipse.emf.cdo.explorer;singleton:=true
-Bundle-Version: 4.1.100.qualifier
+Bundle-Version: 4.1.200.qualifier
 Bundle-Activator: org.eclipse.emf.cdo.internal.explorer.bundle.OM$Activator
 Bundle-Vendor: %providerName
 Bundle-ClassPath: .
@@ -10,8 +10,8 @@ Bundle-Localization: plugin
 Bundle-ActivationPolicy: lazy
 Bundle-RequiredExecutionEnvironment: J2SE-1.5
 Require-Bundle: org.eclipse.core.runtime;bundle-version="[3.5.0,4.0.0)",
- org.eclipse.emf.cdo.ui.ide;bundle-version="[4.0.0,5.0.0)",
+ org.eclipse.emf.cdo.ui;bundle-version="[4.0.0,5.0.0)",
  org.eclipse.emf.cdo.net4j;bundle-version="[4.0.0,5.0.0)",
  org.eclipse.net4j.tcp;bundle-version="[4.0.0,5.0.0)"
-Export-Package: org.eclipse.emf.cdo.internal.explorer;version="4.1.100";x-internal:=true,
- org.eclipse.emf.cdo.internal.explorer.bundle;version="4.1.100";x-internal:=true
+Export-Package: org.eclipse.emf.cdo.internal.explorer;version="4.1.200";x-internal:=true,
+ org.eclipse.emf.cdo.internal.explorer.bundle;version="4.1.200";x-internal:=true
diff --git a/plugins/org.eclipse.emf.cdo.explorer/plugin.xml b/plugins/org.eclipse.emf.cdo.explorer/plugin.xml
index f24e2187a5..07e112bd70 100644
--- a/plugins/org.eclipse.emf.cdo.explorer/plugin.xml
+++ b/plugins/org.eclipse.emf.cdo.explorer/plugin.xml
@@ -21,11 +21,10 @@
    
    	<extension id="product" point="org.eclipse.core.runtime.products">
       	<product
-        	name="%product.name"
+        	name="CDO Explorer"
           description="%product.description"
           application="org.eclipse.emf.cdo.explorer.app">
         		<property name="appName" value="CDO Explorer"/>
-         		<property name="windowImages" value="icons/alt_window_16.gif,icons/alt_window_32.gif"/>
       	</product>
    	</extension>
 
diff --git a/plugins/org.eclipse.emf.cdo.explorer/src/org/eclipse/emf/cdo/internal/explorer/CDOExplorerActionBarAdvisor.java b/plugins/org.eclipse.emf.cdo.explorer/src/org/eclipse/emf/cdo/internal/explorer/CDOExplorerActionBarAdvisor.java
index 505eccffd3..2df5311f3c 100644
--- a/plugins/org.eclipse.emf.cdo.explorer/src/org/eclipse/emf/cdo/internal/explorer/CDOExplorerActionBarAdvisor.java
+++ b/plugins/org.eclipse.emf.cdo.explorer/src/org/eclipse/emf/cdo/internal/explorer/CDOExplorerActionBarAdvisor.java
@@ -12,6 +12,7 @@ package org.eclipse.emf.cdo.internal.explorer;
 
 import org.eclipse.jface.action.IMenuManager;
 import org.eclipse.jface.action.MenuManager;
+import org.eclipse.jface.action.Separator;
 import org.eclipse.ui.IWorkbenchActionConstants;
 import org.eclipse.ui.IWorkbenchWindow;
 import org.eclipse.ui.actions.ActionFactory;
@@ -34,17 +35,25 @@ public class CDOExplorerActionBarAdvisor extends ActionBarAdvisor
   @Override
   protected void makeActions(IWorkbenchWindow window)
   {
-    introAction = ActionFactory.INTRO.create(window);
-    register(introAction);
+    if (window.getWorkbench().getIntroManager().hasIntro())
+    {
+      introAction = ActionFactory.INTRO.create(window);
+      register(introAction);
+    }
   }
 
   @Override
   protected void fillMenuBar(IMenuManager menuBar)
   {
+    menuBar.add(new Separator("additions"));
+
+    // Help
     MenuManager helpMenu = new MenuManager("&Help", IWorkbenchActionConstants.M_HELP);
     menuBar.add(helpMenu);
 
-    // Help
-    helpMenu.add(introAction);
+    if (introAction != null)
+    {
+      helpMenu.add(introAction);
+    }
   }
 }
diff --git a/plugins/org.eclipse.emf.cdo.releng.release/release.properties b/plugins/org.eclipse.emf.cdo.releng.release/release.properties
index b3a74771d9..0718209125 100644
--- a/plugins/org.eclipse.emf.cdo.releng.release/release.properties
+++ b/plugins/org.eclipse.emf.cdo.releng.release/release.properties
@@ -1,6 +1,6 @@
 #
 #Tue Aug 27 08:29:53 CEST 2013
-root.projects=org.eclipse.emf.cdo.site-feature org.eclipse.net4j.db.db2-feature org.eclipse.emf.cdo.releng org.eclipse.emf.cdo.releng.doc org.eclipse.emf.cdo.releng.release org.eclipse.emf.cdo.examples.clone org.eclipse.emf.cdo.examples.client org.eclipse.emf.cdo.examples.master org.eclipse.emf.cdo.examples.client.offline org.eclipse.emf.cdo.releng.setup.product org.eclipse.emf.cdo.releng.setup.product-feature org.eclipse.emf.cdo.server.product-feature org.eclipse.emf.cdo.explorer.product-feature
+root.projects=org.eclipse.emf.cdo.site-feature org.eclipse.net4j.db.db2-feature org.eclipse.emf.cdo.releng org.eclipse.emf.cdo.releng.doc org.eclipse.emf.cdo.releng.release org.eclipse.emf.cdo.examples.clone org.eclipse.emf.cdo.examples.client org.eclipse.emf.cdo.examples.master org.eclipse.emf.cdo.examples.client.offline
 baseline.for.integration=true
 show.deviations=false
 ignored.references=org.eclipse.emf.cdo.examples.installer.client org.eclipse.emf.cdo.examples.installer.clone org.eclipse.emf.cdo.examples.installer.master org.eclipse.net4j.db.derby org.apache.derby org.eclipse.emf.cdo.server.objectivity org.eclipse.emf.cdo.server.objectivity.stub org.eclipse.emf.cdo.tests.objectivity
diff --git a/plugins/org.eclipse.emf.cdo.releng/build.rmap b/plugins/org.eclipse.emf.cdo.releng/build.rmap
index 75db66f214..edc7b42e0c 100644
--- a/plugins/org.eclipse.emf.cdo.releng/build.rmap
+++ b/plugins/org.eclipse.emf.cdo.releng/build.rmap
@@ -4,9 +4,10 @@
 
 	<!-- Properties -->
 
+	<rm:property mutable="true" key="train" value="luna"/>
 	<rm:property mutable="true" key="platform.version" value="4.4milestones"/>
 	<rm:property mutable="true" key="emf.version" value="2.10milestones"/>
-	<rm:property mutable="true" key="orbit.version" value="I20130816141634"/>
+	<rm:property mutable="true" key="orbit.version" value="I20130827062727"/>
 
 	<!-- Locators -->
 
@@ -44,6 +45,13 @@
 	
 	<rm:searchPath name="p2">
 
+		<!-- RELEASE TRAIN -->
+		<rm:provider componentTypes="eclipse.feature,osgi.bundle" readerType="p2" source="false" mutable="false">
+			<rm:uri format="http://download.eclipse.org/releases/{0}">
+				<bc:propertyRef key="train"/>
+			</rm:uri>
+		</rm:provider>
+
 		<!-- PLATFORM -->
 		<rm:provider componentTypes="eclipse.feature,osgi.bundle" readerType="p2" source="false" mutable="false">
 			<rm:uri format="http://download.eclipse.org/eclipse/updates/{0}">