Refactoring for addressing bug 237169v20080615-2252

23 files changed, 56 insertions, 51 deletions

diff --git a/framework/bundles/org.eclipse.ecf.docshare/.options b/framework/bundles/org.eclipse.ecf.docshare/.options
index e96177b5a..5c4de4132 100644
--- a/framework/bundles/org.eclipse.ecf.docshare/.options
+++ b/framework/bundles/org.eclipse.ecf.docshare/.options
@@ -1,16 +1,16 @@
-# Debugging options for the org.eclipse.ecf.docshare plug-in
+# Debugging options for the org.eclipse.ecf.internal.provisional.docshare plug-in
 
-# Turn on general debugging for the org.eclipse.ecf.docshare plug-in
-org.eclipse.ecf.docshare/debug=true
-org.eclipse.ecf.docshare/debug/filter = *
-org.eclipse.ecf.docshare/debug/flag = true
+# Turn on general debugging for the org.eclipse.ecf.internal.provisional.docshare plug-in
+org.eclipse.ecf.internal.provisional.docshare/debug=true
+org.eclipse.ecf.internal.provisional.docshare/debug/filter = *
+org.eclipse.ecf.internal.provisional.docshare/debug/flag = true
 
 # Trace when exceptions are caught
-org.eclipse.ecf.docshare/debug/exceptions/catching=false
+org.eclipse.ecf.internal.provisional.docshare/debug/exceptions/catching=false
 # Trace when exceptions are thrown
-org.eclipse.ecf.docshare/debug/exceptions/throwing=false
+org.eclipse.ecf.internal.provisional.docshare/debug/exceptions/throwing=false
 
 # Trace when methods are entered
-org.eclipse.ecf.docshare/debug/methods/entering=false
+org.eclipse.ecf.internal.provisional.docshare/debug/methods/entering=false
 # Trace when methods are exited
-org.eclipse.ecf.docshare/debug/methods/exiting=false
+org.eclipse.ecf.internal.provisional.docshare/debug/methods/exiting=false
diff --git a/framework/bundles/org.eclipse.ecf.docshare/.project b/framework/bundles/org.eclipse.ecf.docshare/.project
index b639ba8e0..918d78d14 100644
--- a/framework/bundles/org.eclipse.ecf.docshare/.project
+++ b/framework/bundles/org.eclipse.ecf.docshare/.project
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <projectDescription>
-	<name>org.eclipse.ecf.docshare</name>
+	<name>org.eclipse.ecf.internal.provisional.docshare</name>
 	<comment></comment>
 	<projects>
 	</projects>
diff --git a/framework/bundles/org.eclipse.ecf.docshare/META-INF/MANIFEST.MF b/framework/bundles/org.eclipse.ecf.docshare/META-INF/MANIFEST.MF
index 8ef7f237c..2b0e032af 100644
--- a/framework/bundles/org.eclipse.ecf.docshare/META-INF/MANIFEST.MF
+++ b/framework/bundles/org.eclipse.ecf.docshare/META-INF/MANIFEST.MF
@@ -15,13 +15,13 @@ Require-Bundle: org.eclipse.ui,
  org.eclipse.ecf.presence.ui,
  org.eclipse.ecf.presence,
  org.eclipse.ui.ide,
- org.eclipse.ecf.ui,
  org.eclipse.core.filesystem
 Bundle-RequiredExecutionEnvironment: J2SE-1.4
 Eclipse-LazyStart: true
-Export-Package: org.eclipse.ecf.docshare,
- org.eclipse.ecf.docshare.menu,
- org.eclipse.ecf.docshare.messages,
- org.eclipse.ecf.internal.docshare;x-internal:=true
+Export-Package: org.eclipse.ecf.internal.docshare;x-internal:=true,
+ org.eclipse.ecf.internal.provisional.docshare;x-internal:=true,
+ org.eclipse.ecf.internal.provisional.docshare.cola;x-internal:=true,
+ org.eclipse.ecf.internal.provisional.docshare.menu;x-internal:=true,
+ org.eclipse.ecf.internal.provisional.docshare.messages;x-internal:=true
 Eclipse-BuddyPolicy: global
 Bundle-ActivationPolicy: lazy
diff --git a/framework/bundles/org.eclipse.ecf.docshare/plugin.properties b/framework/bundles/org.eclipse.ecf.docshare/plugin.properties
index 918864ace..37ffc0334 100644
--- a/framework/bundles/org.eclipse.ecf.docshare/plugin.properties
+++ b/framework/bundles/org.eclipse.ecf.docshare/plugin.properties
@@ -1,10 +1,7 @@
-/****************************************************************************
 * Copyright (c) 2007 Composent Inc., IBM Corp. 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
-*
-*****************************************************************************/
 plugin.provider = Eclipse.org
 plugin.name = ECF DocShare Plugin
\ No newline at end of file
diff --git a/framework/bundles/org.eclipse.ecf.docshare/plugin.xml b/framework/bundles/org.eclipse.ecf.docshare/plugin.xml
index c5cacf536..d8d3e6c8c 100644
--- a/framework/bundles/org.eclipse.ecf.docshare/plugin.xml
+++ b/framework/bundles/org.eclipse.ecf.docshare/plugin.xml
@@ -12,7 +12,7 @@
       <menuContribution
             locationURI="popup:#CompilationUnitEditorContext">
          <dynamic
-               class="org.eclipse.ecf.docshare.menu.DocShareRosterMenuContributionItem"
+               class="org.eclipse.ecf.internal.provisional.docshare.menu.DocShareRosterMenuContributionItem"
                id="org.eclipse.ecf.editorshare.dynamic1">
          </dynamic>
       </menuContribution>
@@ -23,7 +23,7 @@
       <menuContribution
             locationURI="popup:#TextEditorContext">
          <dynamic
-               class="org.eclipse.ecf.docshare.menu.DocShareRosterMenuContributionItem"
+               class="org.eclipse.ecf.internal.provisional.docshare.menu.DocShareRosterMenuContributionItem"
                id="org.eclipse.ecf.editorshare.dynamic2">
          </dynamic>
       </menuContribution>
diff --git a/framework/bundles/org.eclipse.ecf.docshare/src/org/eclipse/ecf/internal/docshare/Activator.java b/framework/bundles/org.eclipse.ecf.docshare/src/org/eclipse/ecf/internal/docshare/Activator.java
index a39d9daf1..13387378f 100644
--- a/framework/bundles/org.eclipse.ecf.docshare/src/org/eclipse/ecf/internal/docshare/Activator.java
+++ b/framework/bundles/org.eclipse.ecf.docshare/src/org/eclipse/ecf/internal/docshare/Activator.java
@@ -1,12 +1,13 @@
 package org.eclipse.ecf.internal.docshare;
 
+import org.eclipse.ecf.internal.provisional.docshare.DocShare;
+
 import java.util.Hashtable;
 
 import org.eclipse.ecf.core.IContainerManager;
 import org.eclipse.ecf.core.identity.ID;
 import org.eclipse.ecf.core.util.ECFException;
 import org.eclipse.ecf.datashare.IChannelContainerAdapter;
-import org.eclipse.ecf.docshare.DocShare;
 import org.eclipse.ui.plugin.AbstractUIPlugin;
 import org.osgi.framework.BundleContext;
 import org.osgi.util.tracker.ServiceTracker;
@@ -17,7 +18,7 @@ import org.osgi.util.tracker.ServiceTracker;
 public class Activator extends AbstractUIPlugin {
 
 	// The plug-in ID
-	public static final String PLUGIN_ID = "org.eclipse.ecf.docshare"; //$NON-NLS-1$
+	public static final String PLUGIN_ID = "org.eclipse.ecf.internal.provisional.docshare"; //$NON-NLS-1$
 
 	// The shared instance
 	private static Activator plugin;
diff --git a/framework/bundles/org.eclipse.ecf.docshare/src/org/eclipse/ecf/docshare/DocShare.java b/framework/bundles/org.eclipse.ecf.docshare/src/org/eclipse/ecf/internal/provisional/docshare/DocShare.java
index 089197309..99b9be863 100644
--- a/framework/bundles/org.eclipse.ecf.docshare/src/org/eclipse/ecf/docshare/DocShare.java
+++ b/framework/bundles/org.eclipse.ecf.docshare/src/org/eclipse/ecf/internal/provisional/docshare/DocShare.java
@@ -10,7 +10,10 @@
  *    Mustafa K. Isik - conflict resolution via operational transformations
  *****************************************************************************/
 
-package org.eclipse.ecf.docshare;
+package org.eclipse.ecf.internal.provisional.docshare;
+
+import org.eclipse.ecf.internal.provisional.docshare.cola.ColaSynchronizer;
+import org.eclipse.ecf.internal.provisional.docshare.messages.*;
 
 import java.io.*;
 import org.eclipse.core.filesystem.EFS;
@@ -23,8 +26,6 @@ import org.eclipse.ecf.core.util.Trace;
 import org.eclipse.ecf.datashare.AbstractShare;
 import org.eclipse.ecf.datashare.IChannelContainerAdapter;
 import org.eclipse.ecf.datashare.events.IChannelDisconnectEvent;
-import org.eclipse.ecf.docshare.cola.ColaSynchronizer;
-import org.eclipse.ecf.docshare.messages.*;
 import org.eclipse.ecf.internal.docshare.*;
 import org.eclipse.jface.dialogs.MessageDialog;
 import org.eclipse.jface.text.*;
diff --git a/framework/bundles/org.eclipse.ecf.docshare/src/org/eclipse/ecf/docshare/DocShareEditorInput.java b/framework/bundles/org.eclipse.ecf.docshare/src/org/eclipse/ecf/internal/provisional/docshare/DocShareEditorInput.java
index a615e624d..83948483a 100644
--- a/framework/bundles/org.eclipse.ecf.docshare/src/org/eclipse/ecf/docshare/DocShareEditorInput.java
+++ b/framework/bundles/org.eclipse.ecf.docshare/src/org/eclipse/ecf/internal/provisional/docshare/DocShareEditorInput.java
@@ -9,7 +9,7 @@
  *    Composent, Inc. - initial API and implementation
  *****************************************************************************/
 
-package org.eclipse.ecf.docshare;
+package org.eclipse.ecf.internal.provisional.docshare;
 
 import org.eclipse.core.filesystem.IFileStore;
 import org.eclipse.ui.ide.FileStoreEditorInput;
diff --git a/framework/bundles/org.eclipse.ecf.docshare/src/org/eclipse/ecf/docshare/IdentityMapping.java b/framework/bundles/org.eclipse.ecf.docshare/src/org/eclipse/ecf/internal/provisional/docshare/IdentityMapping.java
index 771a2e4d8..ec2bdc88d 100644
--- a/framework/bundles/org.eclipse.ecf.docshare/src/org/eclipse/ecf/docshare/IdentityMapping.java
+++ b/framework/bundles/org.eclipse.ecf.docshare/src/org/eclipse/ecf/internal/provisional/docshare/IdentityMapping.java
@@ -9,9 +9,9 @@
  *    Mustafa K. Isik - initial API and implementation
  *****************************************************************************/
 
-package org.eclipse.ecf.docshare;
+package org.eclipse.ecf.internal.provisional.docshare;
 
-import org.eclipse.ecf.docshare.messages.UpdateMessage;
+import org.eclipse.ecf.internal.provisional.docshare.messages.UpdateMessage;
 
 public class IdentityMapping implements SynchronizationStrategy {
 
diff --git a/framework/bundles/org.eclipse.ecf.docshare/src/org/eclipse/ecf/docshare/SynchronizationStrategy.java b/framework/bundles/org.eclipse.ecf.docshare/src/org/eclipse/ecf/internal/provisional/docshare/SynchronizationStrategy.java
index 4252af871..ce7c9e45b 100644
--- a/framework/bundles/org.eclipse.ecf.docshare/src/org/eclipse/ecf/docshare/SynchronizationStrategy.java
+++ b/framework/bundles/org.eclipse.ecf.docshare/src/org/eclipse/ecf/internal/provisional/docshare/SynchronizationStrategy.java
@@ -9,9 +9,9 @@
  *    Mustafa K. Isik - initial API and implementation
  *****************************************************************************/
 
-package org.eclipse.ecf.docshare;
+package org.eclipse.ecf.internal.provisional.docshare;
 
-import org.eclipse.ecf.docshare.messages.UpdateMessage;
+import org.eclipse.ecf.internal.provisional.docshare.messages.UpdateMessage;
 
 public interface SynchronizationStrategy {
 
diff --git a/framework/bundles/org.eclipse.ecf.docshare/src/org/eclipse/ecf/docshare/cola/ColaDeletion.java b/framework/bundles/org.eclipse.ecf.docshare/src/org/eclipse/ecf/internal/provisional/docshare/cola/ColaDeletion.java
index fe5d11c4d..19bd205b2 100644
--- a/framework/bundles/org.eclipse.ecf.docshare/src/org/eclipse/ecf/docshare/cola/ColaDeletion.java
+++ b/framework/bundles/org.eclipse.ecf.docshare/src/org/eclipse/ecf/internal/provisional/docshare/cola/ColaDeletion.java
@@ -9,10 +9,11 @@
  *    Mustafa K. Isik - initial API and implementation
  *****************************************************************************/
 
-package org.eclipse.ecf.docshare.cola;
+package org.eclipse.ecf.internal.provisional.docshare.cola;
+
+import org.eclipse.ecf.internal.provisional.docshare.messages.UpdateMessage;
 
 import org.eclipse.ecf.core.util.Trace;
-import org.eclipse.ecf.docshare.messages.UpdateMessage;
 import org.eclipse.ecf.internal.docshare.Activator;
 import org.eclipse.ecf.internal.docshare.DocshareDebugOptions;
 
diff --git a/framework/bundles/org.eclipse.ecf.docshare/src/org/eclipse/ecf/docshare/cola/ColaInsertion.java b/framework/bundles/org.eclipse.ecf.docshare/src/org/eclipse/ecf/internal/provisional/docshare/cola/ColaInsertion.java
index 3bc53a055..6fdf1f2b8 100644
--- a/framework/bundles/org.eclipse.ecf.docshare/src/org/eclipse/ecf/docshare/cola/ColaInsertion.java
+++ b/framework/bundles/org.eclipse.ecf.docshare/src/org/eclipse/ecf/internal/provisional/docshare/cola/ColaInsertion.java
@@ -9,10 +9,11 @@
  *    Mustafa K. Isik - initial API and implementation
  *****************************************************************************/
 
-package org.eclipse.ecf.docshare.cola;
+package org.eclipse.ecf.internal.provisional.docshare.cola;
+
+import org.eclipse.ecf.internal.provisional.docshare.messages.UpdateMessage;
 
 import org.eclipse.ecf.core.util.Trace;
-import org.eclipse.ecf.docshare.messages.UpdateMessage;
 import org.eclipse.ecf.internal.docshare.Activator;
 import org.eclipse.ecf.internal.docshare.DocshareDebugOptions;
 
diff --git a/framework/bundles/org.eclipse.ecf.docshare/src/org/eclipse/ecf/docshare/cola/ColaReplacement.java b/framework/bundles/org.eclipse.ecf.docshare/src/org/eclipse/ecf/internal/provisional/docshare/cola/ColaReplacement.java
index 13f48de2f..ecc538083 100644
--- a/framework/bundles/org.eclipse.ecf.docshare/src/org/eclipse/ecf/docshare/cola/ColaReplacement.java
+++ b/framework/bundles/org.eclipse.ecf.docshare/src/org/eclipse/ecf/internal/provisional/docshare/cola/ColaReplacement.java
@@ -9,7 +9,7 @@
  *    Mustafa K. Isik - initial API and implementation
  *****************************************************************************/
 
-package org.eclipse.ecf.docshare.cola;
+package org.eclipse.ecf.internal.provisional.docshare.cola;
 
 import org.eclipse.ecf.core.util.Trace;
 import org.eclipse.ecf.internal.docshare.Activator;
diff --git a/framework/bundles/org.eclipse.ecf.docshare/src/org/eclipse/ecf/docshare/cola/ColaSynchronizer.java b/framework/bundles/org.eclipse.ecf.docshare/src/org/eclipse/ecf/internal/provisional/docshare/cola/ColaSynchronizer.java
index 187681f82..0bff09038 100644
--- a/framework/bundles/org.eclipse.ecf.docshare/src/org/eclipse/ecf/docshare/cola/ColaSynchronizer.java
+++ b/framework/bundles/org.eclipse.ecf.docshare/src/org/eclipse/ecf/internal/provisional/docshare/cola/ColaSynchronizer.java
@@ -9,14 +9,15 @@
  *    Mustafa K. Isik - initial API and implementation
  *****************************************************************************/
 
-package org.eclipse.ecf.docshare.cola;
+package org.eclipse.ecf.internal.provisional.docshare.cola;
+
+import org.eclipse.ecf.internal.provisional.docshare.DocShare;
+import org.eclipse.ecf.internal.provisional.docshare.SynchronizationStrategy;
+import org.eclipse.ecf.internal.provisional.docshare.messages.UpdateMessage;
 
 import java.util.*;
 import org.eclipse.core.runtime.Assert;
 import org.eclipse.ecf.core.util.Trace;
-import org.eclipse.ecf.docshare.DocShare;
-import org.eclipse.ecf.docshare.SynchronizationStrategy;
-import org.eclipse.ecf.docshare.messages.UpdateMessage;
 import org.eclipse.ecf.internal.docshare.Activator;
 import org.eclipse.ecf.internal.docshare.DocshareDebugOptions;
 import org.eclipse.osgi.util.NLS;
diff --git a/framework/bundles/org.eclipse.ecf.docshare/src/org/eclipse/ecf/docshare/cola/ColaUpdateMessage.java b/framework/bundles/org.eclipse.ecf.docshare/src/org/eclipse/ecf/internal/provisional/docshare/cola/ColaUpdateMessage.java
index 22c9fe45b..e02538272 100644
--- a/framework/bundles/org.eclipse.ecf.docshare/src/org/eclipse/ecf/docshare/cola/ColaUpdateMessage.java
+++ b/framework/bundles/org.eclipse.ecf.docshare/src/org/eclipse/ecf/internal/provisional/docshare/cola/ColaUpdateMessage.java
@@ -9,12 +9,13 @@
  *    Mustafa K. Isik - initial API and implementation
  *****************************************************************************/
 
-package org.eclipse.ecf.docshare.cola;
+package org.eclipse.ecf.internal.provisional.docshare.cola;
+
+import org.eclipse.ecf.internal.provisional.docshare.messages.UpdateMessage;
 
 import java.util.LinkedList;
 import java.util.List;
 import org.eclipse.ecf.core.util.Trace;
-import org.eclipse.ecf.docshare.messages.UpdateMessage;
 import org.eclipse.ecf.internal.docshare.Activator;
 import org.eclipse.ecf.internal.docshare.DocshareDebugOptions;
 
diff --git a/framework/bundles/org.eclipse.ecf.docshare/src/org/eclipse/ecf/docshare/cola/TransformationStrategy.java b/framework/bundles/org.eclipse.ecf.docshare/src/org/eclipse/ecf/internal/provisional/docshare/cola/TransformationStrategy.java
index 90b5affec..8cff04e96 100644
--- a/framework/bundles/org.eclipse.ecf.docshare/src/org/eclipse/ecf/docshare/cola/TransformationStrategy.java
+++ b/framework/bundles/org.eclipse.ecf.docshare/src/org/eclipse/ecf/internal/provisional/docshare/cola/TransformationStrategy.java
@@ -9,7 +9,7 @@
  *    Mustafa K. Isik - initial API and implementation
  *****************************************************************************/
 
-package org.eclipse.ecf.docshare.cola;
+package org.eclipse.ecf.internal.provisional.docshare.cola;
 
 import java.io.Serializable;
 
diff --git a/framework/bundles/org.eclipse.ecf.docshare/src/org/eclipse/ecf/docshare/menu/DocShareRosterMenuContributionItem.java b/framework/bundles/org.eclipse.ecf.docshare/src/org/eclipse/ecf/internal/provisional/docshare/menu/DocShareRosterMenuContributionItem.java
index 066b7cee2..e3af6b88c 100644
--- a/framework/bundles/org.eclipse.ecf.docshare/src/org/eclipse/ecf/docshare/menu/DocShareRosterMenuContributionItem.java
+++ b/framework/bundles/org.eclipse.ecf.docshare/src/org/eclipse/ecf/internal/provisional/docshare/menu/DocShareRosterMenuContributionItem.java
@@ -1,11 +1,12 @@
-package org.eclipse.ecf.docshare.menu;
+package org.eclipse.ecf.internal.provisional.docshare.menu;
+
+import org.eclipse.ecf.internal.provisional.docshare.DocShare;
 
 import java.util.Iterator;
 import java.util.List;
 
 import org.eclipse.ecf.core.IContainer;
 import org.eclipse.ecf.core.identity.ID;
-import org.eclipse.ecf.docshare.DocShare;
 import org.eclipse.ecf.internal.docshare.Activator;
 import org.eclipse.ecf.internal.docshare.Messages;
 import org.eclipse.ecf.presence.IPresenceContainerAdapter;
diff --git a/framework/bundles/org.eclipse.ecf.docshare/src/org/eclipse/ecf/docshare/menu/DocShareRosterMenuHandler.java b/framework/bundles/org.eclipse.ecf.docshare/src/org/eclipse/ecf/internal/provisional/docshare/menu/DocShareRosterMenuHandler.java
index 93c021078..caf244f36 100644
--- a/framework/bundles/org.eclipse.ecf.docshare/src/org/eclipse/ecf/docshare/menu/DocShareRosterMenuHandler.java
+++ b/framework/bundles/org.eclipse.ecf.docshare/src/org/eclipse/ecf/internal/provisional/docshare/menu/DocShareRosterMenuHandler.java
@@ -9,13 +9,14 @@
  *    Composent, Inc. - initial API and implementation
  *****************************************************************************/
 
-package org.eclipse.ecf.docshare.menu;
+package org.eclipse.ecf.internal.provisional.docshare.menu;
+
+import org.eclipse.ecf.internal.provisional.docshare.DocShare;
 
 import org.eclipse.core.commands.ExecutionEvent;
 import org.eclipse.core.commands.ExecutionException;
 import org.eclipse.ecf.core.IContainer;
 import org.eclipse.ecf.core.user.IUser;
-import org.eclipse.ecf.docshare.DocShare;
 import org.eclipse.ecf.internal.docshare.Activator;
 import org.eclipse.ecf.internal.docshare.Messages;
 import org.eclipse.ecf.presence.roster.IRosterEntry;
diff --git a/framework/bundles/org.eclipse.ecf.docshare/src/org/eclipse/ecf/docshare/messages/Message.java b/framework/bundles/org.eclipse.ecf.docshare/src/org/eclipse/ecf/internal/provisional/docshare/messages/Message.java
index fc0ec734b..453ff6f0b 100644
--- a/framework/bundles/org.eclipse.ecf.docshare/src/org/eclipse/ecf/docshare/messages/Message.java
+++ b/framework/bundles/org.eclipse.ecf.docshare/src/org/eclipse/ecf/internal/provisional/docshare/messages/Message.java
@@ -9,7 +9,7 @@
  *    Composent, Inc. - initial API and implementation
  *****************************************************************************/
 
-package org.eclipse.ecf.docshare.messages;
+package org.eclipse.ecf.internal.provisional.docshare.messages;
 
 import java.io.ByteArrayInputStream;
 import java.io.ByteArrayOutputStream;
diff --git a/framework/bundles/org.eclipse.ecf.docshare/src/org/eclipse/ecf/docshare/messages/SelectionMessage.java b/framework/bundles/org.eclipse.ecf.docshare/src/org/eclipse/ecf/internal/provisional/docshare/messages/SelectionMessage.java
index 3ebd666ea..3b48ca970 100644
--- a/framework/bundles/org.eclipse.ecf.docshare/src/org/eclipse/ecf/docshare/messages/SelectionMessage.java
+++ b/framework/bundles/org.eclipse.ecf.docshare/src/org/eclipse/ecf/internal/provisional/docshare/messages/SelectionMessage.java
@@ -9,7 +9,7 @@
  *    Composent, Inc. - initial API and implementation
  *****************************************************************************/
 
-package org.eclipse.ecf.docshare.messages;
+package org.eclipse.ecf.internal.provisional.docshare.messages;
 
 /**
  *
diff --git a/framework/bundles/org.eclipse.ecf.docshare/src/org/eclipse/ecf/docshare/messages/StartMessage.java b/framework/bundles/org.eclipse.ecf.docshare/src/org/eclipse/ecf/internal/provisional/docshare/messages/StartMessage.java
index 4f7cddeef..bb97db5b4 100644
--- a/framework/bundles/org.eclipse.ecf.docshare/src/org/eclipse/ecf/docshare/messages/StartMessage.java
+++ b/framework/bundles/org.eclipse.ecf.docshare/src/org/eclipse/ecf/internal/provisional/docshare/messages/StartMessage.java
@@ -9,7 +9,7 @@
  *    Composent, Inc. - initial API and implementation
  *****************************************************************************/
 
-package org.eclipse.ecf.docshare.messages;
+package org.eclipse.ecf.internal.provisional.docshare.messages;
 
 import org.eclipse.ecf.core.identity.ID;
 
diff --git a/framework/bundles/org.eclipse.ecf.docshare/src/org/eclipse/ecf/docshare/messages/StopMessage.java b/framework/bundles/org.eclipse.ecf.docshare/src/org/eclipse/ecf/internal/provisional/docshare/messages/StopMessage.java
index f5db0b945..40d45a5b5 100644
--- a/framework/bundles/org.eclipse.ecf.docshare/src/org/eclipse/ecf/docshare/messages/StopMessage.java
+++ b/framework/bundles/org.eclipse.ecf.docshare/src/org/eclipse/ecf/internal/provisional/docshare/messages/StopMessage.java
@@ -9,7 +9,7 @@
  *    Composent, Inc. - initial API and implementation
  *****************************************************************************/
 
-package org.eclipse.ecf.docshare.messages;
+package org.eclipse.ecf.internal.provisional.docshare.messages;
 
 /**
  *
diff --git a/framework/bundles/org.eclipse.ecf.docshare/src/org/eclipse/ecf/docshare/messages/UpdateMessage.java b/framework/bundles/org.eclipse.ecf.docshare/src/org/eclipse/ecf/internal/provisional/docshare/messages/UpdateMessage.java
index 5333f7ecd..15d08ccd3 100644
--- a/framework/bundles/org.eclipse.ecf.docshare/src/org/eclipse/ecf/docshare/messages/UpdateMessage.java
+++ b/framework/bundles/org.eclipse.ecf.docshare/src/org/eclipse/ecf/internal/provisional/docshare/messages/UpdateMessage.java
@@ -10,7 +10,7 @@
  *    Mustafa K. Isik
  *****************************************************************************/
 
-package org.eclipse.ecf.docshare.messages;
+package org.eclipse.ecf.internal.provisional.docshare.messages;
 
 /**
  *