Removed/commented out code that referenced CVS update operations. This allows removal of dependencies on CVS and team plugins from manifest.mf/plugin.xml

3 files changed, 7 insertions, 13 deletions

diff --git a/examples/bundles/org.eclipse.ecf.example.collab/META-INF/MANIFEST.MF b/examples/bundles/org.eclipse.ecf.example.collab/META-INF/MANIFEST.MF
index 3acdc9b77..0bd5332f6 100644
--- a/examples/bundles/org.eclipse.ecf.example.collab/META-INF/MANIFEST.MF
+++ b/examples/bundles/org.eclipse.ecf.example.collab/META-INF/MANIFEST.MF
@@ -9,14 +9,9 @@ Bundle-Localization: plugin
 Require-Bundle: org.eclipse.ui,
  org.eclipse.core.runtime,
  org.eclipse.jdt.core,
- org.eclipse.team.cvs.core,
- org.eclipse.team.cvs.ui,
  org.eclipse.core.resources,
- org.eclipse.team.ui,
  org.eclipse.ecf,
  org.eclipse.help.base,
- org.eclipse.team.core,
- org.eclipse.jface.text,
- org.junit
+ org.eclipse.jface.text
 Export-Package: org.eclipse.ecf.example.collab.share, org.eclipse.ecf.example.collab.share.url, org.eclipse.ecf.example.collab.share.io
 Eclipse-AutoStart: true
diff --git a/examples/bundles/org.eclipse.ecf.example.collab/build.properties b/examples/bundles/org.eclipse.ecf.example.collab/build.properties
index ccd839b35..501150ae9 100644
--- a/examples/bundles/org.eclipse.ecf.example.collab/build.properties
+++ b/examples/bundles/org.eclipse.ecf.example.collab/build.properties
@@ -2,4 +2,5 @@ source.client.jar = src/
 output.client.jar = bin/
 bin.includes = plugin.xml,\
                META-INF/,\
-               client.jar
+               client.jar,\
+               icons/
diff --git a/examples/bundles/org.eclipse.ecf.example.collab/src/org/eclipse/ecf/example/collab/share/EclipseCollabSharedObject.java b/examples/bundles/org.eclipse.ecf.example.collab/src/org/eclipse/ecf/example/collab/share/EclipseCollabSharedObject.java
index bc26bd83a..8464942ee 100644
--- a/examples/bundles/org.eclipse.ecf.example.collab/src/org/eclipse/ecf/example/collab/share/EclipseCollabSharedObject.java
+++ b/examples/bundles/org.eclipse.ecf.example.collab/src/org/eclipse/ecf/example/collab/share/EclipseCollabSharedObject.java
@@ -13,7 +13,6 @@ package org.eclipse.ecf.example.collab.share;
 
 import java.io.File;
 import java.io.IOException;
-import java.lang.reflect.InvocationTargetException;
 import java.net.URL;
 import java.net.URLClassLoader;
 import java.util.Date;
@@ -36,10 +35,6 @@ import org.eclipse.jface.dialogs.MessageDialog;
 import org.eclipse.swt.widgets.Control;
 import org.eclipse.swt.widgets.Display;
 import org.eclipse.swt.widgets.Shell;
-import org.eclipse.team.internal.ccvs.core.client.Command;
-import org.eclipse.team.internal.ccvs.core.resources.CVSWorkspaceRoot;
-import org.eclipse.team.internal.ccvs.ui.CVSUIPlugin;
-import org.eclipse.team.internal.ccvs.ui.operations.UpdateOperation;
 import org.eclipse.ui.IViewPart;
 import org.eclipse.ui.IWorkbenchPage;
 import org.eclipse.ui.IWorkbenchWindow;
@@ -696,7 +691,8 @@ public class EclipseCollabSharedObject extends GenericSharedObject implements
 
     public boolean isCVSShared() {
         try {
-            return CVSWorkspaceRoot.isSharedWithCVS(getProject());
+            //return CVSWorkspaceRoot.isSharedWithCVS(getProject());
+            return false;
         } catch (Exception e) {
             ClientPlugin
                     .log(
@@ -707,6 +703,7 @@ public class EclipseCollabSharedObject extends GenericSharedObject implements
     }
 
     protected void doCVSUpdateOperation(IProject proj, User fromUser) {
+        /*
         IResource[] resources = new IResource[1];
         resources[0] = proj;
         try {
@@ -719,6 +716,7 @@ public class EclipseCollabSharedObject extends GenericSharedObject implements
                     null, e);
         } catch (InterruptedException e) {
         }
+        */
     }
 
     protected void handleCVSProjectUpdateRequest(final User fromUser,