Make the build runnable locally

8 files changed, 116 insertions, 11 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 817cea0f9a..f65b75ec1f 100644
--- a/features/org.eclipse.emf.cdo.explorer.product-feature/CDOExplorer.product
+++ b/features/org.eclipse.emf.cdo.explorer.product-feature/CDOExplorer.product
@@ -33,7 +33,9 @@
    <features>
       <feature id="org.eclipse.emf.cdo.explorer.product"/>
       <feature id="org.eclipse.rcp"/>
+      <!--
       <feature id="org.eclipse.platform"/>
+      -->
       <feature id="org.eclipse.emf.ecore"/>
       <feature id="org.eclipse.emf.edit"/>
       <feature id="org.eclipse.emf.edit.ui"/>
diff --git a/features/org.eclipse.emf.cdo.explorer.product-feature/buckminster.cspex b/features/org.eclipse.emf.cdo.explorer.product-feature/buckminster.cspex
index de6e4ebd59..cd163c3238 100644
--- a/features/org.eclipse.emf.cdo.explorer.product-feature/buckminster.cspex
+++ b/features/org.eclipse.emf.cdo.explorer.product-feature/buckminster.cspex
@@ -1,6 +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:dependency name="org.eclipse.rcp" componentType="eclipse.feature"/>
 	</cs:dependencies>
 </cs:cspecExtension>
\ No newline at end of file
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 f37f000bc8..9184fee3b9 100644
--- a/features/org.eclipse.emf.cdo.explorer.product-feature/feature.xml
+++ b/features/org.eclipse.emf.cdo.explorer.product-feature/feature.xml
@@ -166,4 +166,11 @@
          version="0.0.0"
          unpack="false"/>
 
+   <plugin
+         id="org.eclipse.ui.views"
+         download-size="0"
+         install-size="0"
+         version="0.0.0"
+         unpack="false"/>
+
 </feature>
diff --git a/plugins/org.eclipse.emf.cdo.explorer/plugin.properties b/plugins/org.eclipse.emf.cdo.explorer/plugin.properties
index bf33413fb4..ad45ae585f 100644
--- a/plugins/org.eclipse.emf.cdo.explorer/plugin.properties
+++ b/plugins/org.eclipse.emf.cdo.explorer/plugin.properties
@@ -14,3 +14,5 @@ app.name = CDOExplorer
 
 product.description = The CDO explorer application
 product.name = CDO Explorer
+
+perspective.name = CDO Explorer
diff --git a/plugins/org.eclipse.emf.cdo.explorer/plugin.xml b/plugins/org.eclipse.emf.cdo.explorer/plugin.xml
index 07e112bd70..7a0020e6a1 100644
--- a/plugins/org.eclipse.emf.cdo.explorer/plugin.xml
+++ b/plugins/org.eclipse.emf.cdo.explorer/plugin.xml
@@ -28,4 +28,14 @@
       	</product>
    	</extension>
 
+  <extension
+        point="org.eclipse.ui.perspectives">
+     <perspective
+           class="org.eclipse.emf.cdo.internal.explorer.CDOExplorerPerspective"
+           icon="platform:/plugin/org.eclipse.emf.cdo.ui.shared/icons/full/view16/cdo_sessions.gif"
+           id="org.eclipse.emf.cdo.explorer.CDOExplorerPerspective"
+           name="%perspective.name">
+     </perspective>
+  </extension>
+
 </plugin>
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
new file mode 100644
index 0000000000..0efc26b80f
--- /dev/null
+++ b/plugins/org.eclipse.emf.cdo.explorer/src/org/eclipse/emf/cdo/internal/explorer/CDOExplorerPerspective.java
@@ -0,0 +1,85 @@
+/*
+ * Copyright (c) 2010-2012 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.CDOExplorerPerspective"; //$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 sessionsPane = pageLayout.createFolder("sessionsPane", IPageLayout.LEFT, 0.30f, //$NON-NLS-1$
+        pageLayout.getEditorArea());
+    sessionsPane.addView(CDOSessionsView.ID);
+
+    IFolderLayout propertiesPane = pageLayout.createFolder("propertiesPane", IPageLayout.BOTTOM, 0.70f, //$NON-NLS-1$
+        pageLayout.getEditorArea());
+    propertiesPane.addView(IPageLayout.ID_PROP_SHEET);
+    propertiesPane.addView(CDOWatchListView.ID);
+    propertiesPane.addView(CDORemoteSessionsView.ID);
+
+    IFolderLayout outlinePane = pageLayout.createFolder("outlinePane", IPageLayout.RIGHT, 0.70f, //$NON-NLS-1$
+        pageLayout.getEditorArea());
+    outlinePane.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);
+  }
+
+  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 e2e9e1e854..2244aa097e 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,7 +10,7 @@
  */
 package org.eclipse.emf.cdo.internal.explorer;
 
-import org.eclipse.emf.cdo.internal.ui.perspectives.CDOExplorerPerspective;
+import org.eclipse.emf.cdo.internal.ui.perspectives.CDOPerspective;
 
 import org.eclipse.ui.application.IWorkbenchConfigurer;
 import org.eclipse.ui.application.IWorkbenchWindowConfigurer;
@@ -38,6 +38,6 @@ public class CDOExplorerWorkbenchAdvisor extends WorkbenchAdvisor
   @Override
   public String getInitialWindowPerspectiveId()
   {
-    return CDOExplorerPerspective.ID;
+    return CDOPerspective.ID;
   }
 }
diff --git a/plugins/org.eclipse.emf.cdo.transfer.ui/META-INF/MANIFEST.MF b/plugins/org.eclipse.emf.cdo.transfer.ui/META-INF/MANIFEST.MF
index 783287dee1..9e5f6acd24 100644
--- a/plugins/org.eclipse.emf.cdo.transfer.ui/META-INF/MANIFEST.MF
+++ b/plugins/org.eclipse.emf.cdo.transfer.ui/META-INF/MANIFEST.MF
@@ -2,7 +2,7 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: %pluginName
 Bundle-SymbolicName: org.eclipse.emf.cdo.transfer.ui;singleton:=true
-Bundle-Version: 4.2.0.qualifier
+Bundle-Version: 4.2.100.qualifier
 Bundle-ClassPath: .
 Bundle-Vendor: %providerName
 Bundle-Localization: plugin
@@ -10,17 +10,16 @@ Bundle-RequiredExecutionEnvironment: J2SE-1.5
 Require-Bundle: org.eclipse.core.runtime;bundle-version="[3.5.0,4.0.0)",
  org.eclipse.ui;bundle-version="[3.5.0,4.0.0)";visibility:=reexport,
  org.eclipse.ui.navigator;bundle-version="[3.5.0,4.0.0)";resolution:=optional,
- org.eclipse.ui.navigator.resources;bundle-version="[3.4.0,4.0.0)";resolution:=optional,
  org.eclipse.net4j.util.ui;bundle-version="[3.0.0,4.0.0)";visibility:=reexport,
  org.eclipse.net4j.ui.shared;bundle-version="[4.1.0,5.0.0)",
  org.eclipse.emf.cdo.ui.shared;bundle-version="[4.1.0,5.0.0)",
  org.eclipse.emf.cdo.transfer;bundle-version="[4.2.0,5.0.0)";visibility:=reexport,
  org.eclipse.emf.cdo.transfer.workspace;bundle-version="[4.2.0,5.0.0)";resolution:=optional
-Export-Package: org.eclipse.emf.cdo.transfer.internal.ui;version="4.2.0";x-internal:=true,
- org.eclipse.emf.cdo.transfer.internal.ui.bundle;version="4.2.0";x-internal:=true,
- org.eclipse.emf.cdo.transfer.spi.ui;version="4.2.0",
- org.eclipse.emf.cdo.transfer.ui;version="4.2.0",
- org.eclipse.emf.cdo.transfer.ui.swt;version="4.2.0",
- org.eclipse.wb.swt;version="4.2.0";x-internal:=true
+Export-Package: org.eclipse.emf.cdo.transfer.internal.ui;version="4.2.100";x-internal:=true,
+ org.eclipse.emf.cdo.transfer.internal.ui.bundle;version="4.2.100";x-internal:=true,
+ org.eclipse.emf.cdo.transfer.spi.ui;version="4.2.100",
+ org.eclipse.emf.cdo.transfer.ui;version="4.2.100",
+ org.eclipse.emf.cdo.transfer.ui.swt;version="4.2.100",
+ org.eclipse.wb.swt;version="4.2.100";x-internal:=true
 Bundle-ActivationPolicy: lazy
 Bundle-Activator: org.eclipse.emf.cdo.transfer.internal.ui.bundle.OM$Activator