Updated due to the renaming org.hantsuki.gokigenyou to org.eclipse.ecf.protocol.msn.

6 files changed, 19 insertions, 18 deletions

diff --git a/providers/bundles/org.eclipse.ecf.provider.msn/META-INF/MANIFEST.MF b/providers/bundles/org.eclipse.ecf.provider.msn/META-INF/MANIFEST.MF
index 8218925cb..65d8894e3 100644
--- a/providers/bundles/org.eclipse.ecf.provider.msn/META-INF/MANIFEST.MF
+++ b/providers/bundles/org.eclipse.ecf.provider.msn/META-INF/MANIFEST.MF
@@ -8,7 +8,7 @@ Bundle-Vendor: %providerName
 Bundle-Localization: plugin
 Require-Bundle: org.eclipse.ecf,
  org.eclipse.ecf.presence,
- org.hantsuki.gokigenyou
+ org.eclipse.ecf.protocol.msn
 Eclipse-LazyStart: true
 Bundle-RequiredExecutionEnvironment: CDC-1.0/Foundation-1.0,
  J2SE-1.3
diff --git a/providers/bundles/org.eclipse.ecf.provider.msn/plugin.xml b/providers/bundles/org.eclipse.ecf.provider.msn/plugin.xml
index f219b2347..aa790bc10 100644
--- a/providers/bundles/org.eclipse.ecf.provider.msn/plugin.xml
+++ b/providers/bundles/org.eclipse.ecf.provider.msn/plugin.xml
@@ -6,14 +6,15 @@
       <containerFactory
             class="org.eclipse.ecf.internal.provider.msn.MSNContainerInstantiator"
             description="MSN"
-            name="ecf.msn.gokigenyou"/>
+            name="ecf.msn.msnp"
+            server="false"/>
    </extension>
    <extension
          point="org.eclipse.ecf.identity.namespace">
       <namespace
             class="org.eclipse.ecf.internal.provider.msn.MSNNamespace"
             description="MSN Namespace"
-            name="ecf.msn.gokigenyou">
+            name="ecf.msn.msnp">
       </namespace>
    </extension>
 
diff --git a/providers/bundles/org.eclipse.ecf.provider.msn/src/org/eclipse/ecf/internal/provider/msn/Activator.java b/providers/bundles/org.eclipse.ecf.provider.msn/src/org/eclipse/ecf/internal/provider/msn/Activator.java
index 00010ccb2..5e0bf3051 100644
--- a/providers/bundles/org.eclipse.ecf.provider.msn/src/org/eclipse/ecf/internal/provider/msn/Activator.java
+++ b/providers/bundles/org.eclipse.ecf.provider.msn/src/org/eclipse/ecf/internal/provider/msn/Activator.java
@@ -22,7 +22,7 @@ public final class Activator implements BundleActivator {
 
 	public static final String PLUGIN_ID = "org.eclipse.ecf.provider.msn"; //$NON-NLS-1$
 
-	static final String NAMESPACE_ID = "ecf.msn.gokigenyou"; //$NON-NLS-1$
+	static final String NAMESPACE_ID = "ecf.msn.msnp"; //$NON-NLS-1$
 
 	private static Activator plugin;
 
diff --git a/providers/bundles/org.eclipse.ecf.provider.msn/src/org/eclipse/ecf/internal/provider/msn/MSNContainer.java b/providers/bundles/org.eclipse.ecf.provider.msn/src/org/eclipse/ecf/internal/provider/msn/MSNContainer.java
index f06e3b2e2..f9da08048 100644
--- a/providers/bundles/org.eclipse.ecf.provider.msn/src/org/eclipse/ecf/internal/provider/msn/MSNContainer.java
+++ b/providers/bundles/org.eclipse.ecf.provider.msn/src/org/eclipse/ecf/internal/provider/msn/MSNContainer.java
@@ -58,20 +58,20 @@ import org.eclipse.ecf.presence.roster.IRoster;
 import org.eclipse.ecf.presence.roster.IRosterEntry;
 import org.eclipse.ecf.presence.roster.IRosterGroup;
 import org.eclipse.ecf.presence.roster.IRosterItem;
+import org.eclipse.ecf.presence.roster.IRosterListener;
 import org.eclipse.ecf.presence.roster.IRosterManager;
 import org.eclipse.ecf.presence.roster.IRosterSubscriptionListener;
 import org.eclipse.ecf.presence.roster.IRosterSubscriptionSender;
-import org.eclipse.ecf.presence.roster.IRosterListener;
 import org.eclipse.ecf.presence.service.IPresenceService;
-import org.hantsuki.gokigenyou.ChatSession;
-import org.hantsuki.gokigenyou.Contact;
-import org.hantsuki.gokigenyou.Group;
-import org.hantsuki.gokigenyou.MsnClient;
-import org.hantsuki.gokigenyou.Status;
-import org.hantsuki.gokigenyou.events.IChatSessionListener;
-import org.hantsuki.gokigenyou.events.IContactListListener;
-import org.hantsuki.gokigenyou.events.IContactListener;
-import org.hantsuki.gokigenyou.events.ISessionListener;
+import org.eclipse.ecf.protocol.msn.ChatSession;
+import org.eclipse.ecf.protocol.msn.Contact;
+import org.eclipse.ecf.protocol.msn.Group;
+import org.eclipse.ecf.protocol.msn.MsnClient;
+import org.eclipse.ecf.protocol.msn.Status;
+import org.eclipse.ecf.protocol.msn.events.IChatSessionListener;
+import org.eclipse.ecf.protocol.msn.events.IContactListListener;
+import org.eclipse.ecf.protocol.msn.events.IContactListener;
+import org.eclipse.ecf.protocol.msn.events.ISessionListener;
 
 final class MSNContainer implements IContainer, IChatManager,
 		IChatMessageSender, IPresenceService, IPresenceSender, IRoster,
diff --git a/providers/bundles/org.eclipse.ecf.provider.msn/src/org/eclipse/ecf/internal/provider/msn/MSNRosterEntry.java b/providers/bundles/org.eclipse.ecf.provider.msn/src/org/eclipse/ecf/internal/provider/msn/MSNRosterEntry.java
index 333b8bfc2..cf8d1dd7c 100644
--- a/providers/bundles/org.eclipse.ecf.provider.msn/src/org/eclipse/ecf/internal/provider/msn/MSNRosterEntry.java
+++ b/providers/bundles/org.eclipse.ecf.provider.msn/src/org/eclipse/ecf/internal/provider/msn/MSNRosterEntry.java
@@ -24,8 +24,8 @@ import org.eclipse.ecf.presence.IPresence;
 import org.eclipse.ecf.presence.roster.IRoster;
 import org.eclipse.ecf.presence.roster.IRosterEntry;
 import org.eclipse.ecf.presence.roster.IRosterItem;
-import org.hantsuki.gokigenyou.Contact;
-import org.hantsuki.gokigenyou.Status;
+import org.eclipse.ecf.protocol.msn.Contact;
+import org.eclipse.ecf.protocol.msn.Status;
 
 final class MSNRosterEntry implements IPresence, IRosterEntry, IUser {
 
diff --git a/providers/bundles/org.eclipse.ecf.provider.msn/src/org/eclipse/ecf/internal/provider/msn/MSNRosterGroup.java b/providers/bundles/org.eclipse.ecf.provider.msn/src/org/eclipse/ecf/internal/provider/msn/MSNRosterGroup.java
index 25127a8c2..27f8e17ec 100644
--- a/providers/bundles/org.eclipse.ecf.provider.msn/src/org/eclipse/ecf/internal/provider/msn/MSNRosterGroup.java
+++ b/providers/bundles/org.eclipse.ecf.provider.msn/src/org/eclipse/ecf/internal/provider/msn/MSNRosterGroup.java
@@ -18,8 +18,8 @@ import java.util.List;
 import org.eclipse.ecf.presence.roster.IRoster;
 import org.eclipse.ecf.presence.roster.IRosterGroup;
 import org.eclipse.ecf.presence.roster.IRosterItem;
-import org.hantsuki.gokigenyou.Contact;
-import org.hantsuki.gokigenyou.Group;
+import org.eclipse.ecf.protocol.msn.Contact;
+import org.eclipse.ecf.protocol.msn.Group;
 
 final class MSNRosterGroup implements IRosterGroup {