1) Added IContainer super interface for ISharedObjectContainer. Moved up joinGroup, leaveGroup, dispose.

2) Changed API to SharedObjectContainerFactory to remove static methods and rather use SharedObjectContainer.getDefault().<method>.  NOTE:  This requires clients to update their use of the SharedObjectContainerFactory as static methods are now gone.  Updated all dependant code (examples and tests)
3) Fixed some documentation-generation routines in org.eclipse.ecf.doc
4) Updated classpath for all plugins
5) Added 'explode plugin jar upon install' for org.eclipse.ecf.provider plugin
6) Removed compile warnings throughout codebase

33 files changed, 126 insertions, 157 deletions

diff --git a/doc/bundles/org.eclipse.ecf.doc/buildapitoc.xml b/doc/bundles/org.eclipse.ecf.doc/buildapitoc.xml
index 45e8b0e8b..467c4e2f4 100644
--- a/doc/bundles/org.eclipse.ecf.doc/buildapitoc.xml
+++ b/doc/bundles/org.eclipse.ecf.doc/buildapitoc.xml
@@ -1,4 +1,4 @@
-<project default="toc">
+<project default="toc" basedir=".">
 
 	<target name="init">
 		<property name="package-list.path" location="${basedir}/html/reference/api/package-list"/>
@@ -10,7 +10,7 @@
 <toc label="JavaDoc">
 ]]></echo>
 		<java classname="BuildAPITOC" classpath="." output="tocapi.xml" append="true">
-			<arg line="${package-list.path}"/>
+			<arg value="${package-list.path}"/>
 		</java>
 		<echo file="tocapi.xml" append="true"><![CDATA[
 </toc>
@@ -22,6 +22,7 @@
 import java.io.*;
 public class BuildAPITOC {
 	public static void main(String[] args) throws Exception {
+	    System.out.println("args[0] is "+args[0]);
 		BufferedReader r = new BufferedReader(new FileReader(args[0]));
 		String line;
 		try {
diff --git a/doc/bundles/org.eclipse.ecf.doc/buildschematoc.xml b/doc/bundles/org.eclipse.ecf.doc/buildschematoc.xml
index 864553a69..5004ef1f8 100644
--- a/doc/bundles/org.eclipse.ecf.doc/buildschematoc.xml
+++ b/doc/bundles/org.eclipse.ecf.doc/buildschematoc.xml
@@ -1,4 +1,4 @@
-<project default="toc">
+<project default="toc" basedir=".">
 	
 	<target name="init">
 		<property name="dest.path" location="${basedir}/html/reference/extension-points"/>
@@ -12,7 +12,7 @@
 <toc label="Extension Points">
 ]]></echo>
 		<java classname="BuildExtPointTOC" classpath="." output="tocextpoint.xml" append="true">
-			<arg line="${dest.path}"/>
+			<arg value="${dest.path}"/>
 		</java>
 		<echo file="tocextpoint.xml" append="true"><![CDATA[
 </toc>
diff --git a/doc/bundles/org.eclipse.ecf.doc/javadoc.xml b/doc/bundles/org.eclipse.ecf.doc/javadoc.xml
index 9e366f7a1..b11de47d0 100644
--- a/doc/bundles/org.eclipse.ecf.doc/javadoc.xml
+++ b/doc/bundles/org.eclipse.ecf.doc/javadoc.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <project default="javadoc">
     <target name="javadoc">
-        <javadoc access="public" author="true" classpath="." destdir="html/reference/api" doctitle="Eclipse Communication Framework (ECF) 1.0.0" nodeprecated="false" nodeprecatedlist="false" noindex="false" nonavbar="false" notree="false" packagenames="org.eclipse.ecf.core.comm,org.eclipse.ecf.provider,org.eclipse.ecf.sdo.emf,org.eclipse.ecf.core.identity,org.eclipse.ecf.provider.generic.events,org.eclipse.ecf.core.identity.provider,org.eclipse.ecf.provider.comm.tcp,org.eclipse.ecf.provider.generic.gmm,org.eclipse.ecf.provider.app,org.eclipse.ecf.provider.generic,org.eclipse.ecf.sdo,org.eclipse.ecf.provider.generic.user,org.eclipse.ecf.core,org.eclipse.ecf.provider.generic.sobject,org.eclipse.ecf.core.user,org.eclipse.ecf.core.provider,org.eclipse.ecf.core.events,org.eclipse.ecf.core.util,org.eclipse.ecf.core.comm.provider" source="1.4" sourcepath="../org.eclipse.ecf.sdo/src;../org.eclipse.ecf.provider/src;../org.eclipse.ecf/src" splitindex="true" use="true" version="true">
+        <javadoc access="protected" author="true" classpath=".;C:\eclipse\plugins\org.eclipse.osgi_3.1.0.jar;../org.eclipse.ecf.sdo/bin;C:\eclipse\plugins\org.eclipse.core.runtime_3.1.0.jar;C:\eclipse\plugins\org.eclipse.emf.commonj.sdo_2.1.0.jar;C:\eclipse\plugins\org.eclipse.emf.ecore_2.1.0.jar;C:\eclipse\plugins\org.eclipse.emf.ecore.sdo_2.1.0.jar" destdir="html/reference/api" doctitle="Eclipse Communication Framework (ECF)" nodeprecated="false" nodeprecatedlist="false" noindex="false" nonavbar="false" notree="false" packagenames="org.eclipse.ecf.core.comm,org.eclipse.ecf.provider,org.eclipse.ecf.sdo.emf,org.eclipse.ecf.core.identity,org.eclipse.ecf.provider.generic.events,org.eclipse.ecf.core.identity.provider,org.eclipse.ecf.provider.comm.tcp,org.eclipse.ecf.provider.generic.gmm,org.eclipse.ecf.provider.app,org.eclipse.ecf.provider.generic,org.eclipse.ecf.sdo,org.eclipse.ecf.provider.generic.user,org.eclipse.ecf.core,org.eclipse.ecf.provider.generic.sobject,org.eclipse.ecf.core.user,org.eclipse.ecf.core.provider,org.eclipse.ecf.core.events,org.eclipse.ecf.core.util,org.eclipse.ecf.core.comm.provider" source="1.4" sourcepath="../org.eclipse.ecf.sdo/src;../org.eclipse.ecf.provider/src;../org.eclipse.ecf/src" splitindex="true" use="true" version="true">
             <link href="http://java.sun.com/j2se/1.4.2/docs/api"/>
         </javadoc>
     </target>
diff --git a/examples/bundles/org.eclipse.ecf.example.collab/.classpath b/examples/bundles/org.eclipse.ecf.example.collab/.classpath
index 065ac06e1..751c8f2e5 100644
--- a/examples/bundles/org.eclipse.ecf.example.collab/.classpath
+++ b/examples/bundles/org.eclipse.ecf.example.collab/.classpath
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <classpath>
 	<classpathentry kind="src" path="src"/>
-	<classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/>
 	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/>
+	<classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/>
 	<classpathentry kind="output" path="bin"/>
 </classpath>
diff --git a/examples/bundles/org.eclipse.ecf.example.collab/src/org/eclipse/ecf/example/collab/Client.java b/examples/bundles/org.eclipse.ecf.example.collab/src/org/eclipse/ecf/example/collab/Client.java
index 0c6278cd3..bf312c723 100644
--- a/examples/bundles/org.eclipse.ecf.example.collab/src/org/eclipse/ecf/example/collab/Client.java
+++ b/examples/bundles/org.eclipse.ecf.example.collab/src/org/eclipse/ecf/example/collab/Client.java
@@ -298,7 +298,7 @@ public class Client {
         
         String containerType = (type==null)?GENERIC_CONTAINER_CLIENT_NAME:type;
         final ISharedObjectContainer client = SharedObjectContainerFactory
-        .makeSharedObjectContainer(containerType);
+        .getDefault().makeSharedObjectContainer(containerType);
         final ClientEntry newClient = new ClientEntry(containerType,client);
         final ID groupID = (gID==null)?defaultGroupID:gID;
         
diff --git a/examples/bundles/org.eclipse.ecf.example.collab/src/org/eclipse/ecf/example/collab/DiscoveryStartup.java b/examples/bundles/org.eclipse.ecf.example.collab/src/org/eclipse/ecf/example/collab/DiscoveryStartup.java
index 78b5e1331..a6327bc01 100644
--- a/examples/bundles/org.eclipse.ecf.example.collab/src/org/eclipse/ecf/example/collab/DiscoveryStartup.java
+++ b/examples/bundles/org.eclipse.ecf.example.collab/src/org/eclipse/ecf/example/collab/DiscoveryStartup.java
@@ -68,7 +68,7 @@ public class DiscoveryStartup {
 		if (discovery == null && ClientPlugin.getDefault().getPreferenceStore().getBoolean(ClientPlugin.PREF_REGISTER_SERVER)) {
 			try {
 				socontainer = SharedObjectContainerFactory
-						.makeSharedObjectContainer(DISCOVERY_CONTAINER);
+						.getDefault().makeSharedObjectContainer(DISCOVERY_CONTAINER);
 				discovery = (IDiscoveryContainer) socontainer
 						.getAdapter(IDiscoveryContainer.class);
 				if (discovery != null) {
diff --git a/examples/bundles/org.eclipse.ecf.example.collab/src/org/eclipse/ecf/example/collab/actions/ProjectPopupComposentAction.java b/examples/bundles/org.eclipse.ecf.example.collab/src/org/eclipse/ecf/example/collab/actions/ProjectPopupComposentAction.java
index 065b8a312..c1d77ddfb 100644
--- a/examples/bundles/org.eclipse.ecf.example.collab/src/org/eclipse/ecf/example/collab/actions/ProjectPopupComposentAction.java
+++ b/examples/bundles/org.eclipse.ecf.example.collab/src/org/eclipse/ecf/example/collab/actions/ProjectPopupComposentAction.java
@@ -15,7 +15,6 @@ import org.eclipse.jdt.core.IJavaProject;
 import org.eclipse.jface.action.IAction;
 import org.eclipse.jface.viewers.ISelection;
 import org.eclipse.jface.viewers.IStructuredSelection;
-import org.eclipse.ui.IActionDelegate;
 import org.eclipse.ui.IObjectActionDelegate;
 import org.eclipse.ui.IWorkbenchPart;
 import org.eclipse.ui.part.IShowInSource;
diff --git a/examples/bundles/org.eclipse.ecf.example.collab/src/org/eclipse/ecf/example/collab/actions/ProjectPopupLocalhostAction.java b/examples/bundles/org.eclipse.ecf.example.collab/src/org/eclipse/ecf/example/collab/actions/ProjectPopupLocalhostAction.java
index 251ea5837..766e6fb4a 100644
--- a/examples/bundles/org.eclipse.ecf.example.collab/src/org/eclipse/ecf/example/collab/actions/ProjectPopupLocalhostAction.java
+++ b/examples/bundles/org.eclipse.ecf.example.collab/src/org/eclipse/ecf/example/collab/actions/ProjectPopupLocalhostAction.java
@@ -15,7 +15,6 @@ import org.eclipse.jdt.core.IJavaProject;
 import org.eclipse.jface.action.IAction;
 import org.eclipse.jface.viewers.ISelection;
 import org.eclipse.jface.viewers.IStructuredSelection;
-import org.eclipse.ui.IActionDelegate;
 import org.eclipse.ui.IObjectActionDelegate;
 import org.eclipse.ui.IWorkbenchPart;
 import org.eclipse.ui.part.IShowInSource;
diff --git a/examples/bundles/org.eclipse.ecf.example.collab/src/org/eclipse/ecf/example/collab/ui/ChatComposite.java b/examples/bundles/org.eclipse.ecf.example.collab/src/org/eclipse/ecf/example/collab/ui/ChatComposite.java
index 68a586112..c644d51f0 100644
--- a/examples/bundles/org.eclipse.ecf.example.collab/src/org/eclipse/ecf/example/collab/ui/ChatComposite.java
+++ b/examples/bundles/org.eclipse.ecf.example.collab/src/org/eclipse/ecf/example/collab/ui/ChatComposite.java
@@ -31,7 +31,6 @@ import org.eclipse.ecf.example.collab.share.io.FileTransferParams;
 import org.eclipse.jface.action.Action;
 import org.eclipse.jface.action.IMenuListener;
 import org.eclipse.jface.action.IMenuManager;
-import org.eclipse.jface.action.IToolBarManager;
 import org.eclipse.jface.action.MenuManager;
 import org.eclipse.jface.action.Separator;
 import org.eclipse.jface.dialogs.IDialogSettings;
@@ -387,7 +386,7 @@ public class ChatComposite extends Composite {
 		manager.add(new Separator());
 		manager.add(closeGroup);
 	}
-	
+	/*
 	private void fillLocalToolBar(IToolBarManager manager) {
 		manager.add(outputCopy);
 		manager.add(outputPaste);
@@ -401,14 +400,13 @@ public class ChatComposite extends Composite {
 		manager.add(appShare);
 		manager.add(new Separator());
 		manager.add(sendMessage);
-		/*
-		 * manager.add(new Separator()); manager.add(sendComponent);
-		 * manager.add(sendComponentToServer);
-		 * manager.add(sendEclipseComponent);
-		 */
+		//manager.add(new Separator()); manager.add(sendComponent);
+		//manager.add(sendComponentToServer);
+		//manager.add(sendEclipseComponent);
 		manager.add(new Separator());
 		manager.add(closeGroup);
 	}
+	*/
 	
 	private void fillTreeContextMenu(IMenuManager manager) {
 		User ud = treeView.getSelectionUser();
@@ -832,7 +830,6 @@ public class ChatComposite extends Composite {
 		}
 	}
 	protected void sendShowViewRequest(User touser) {
-		String viewid = null;
 		IWorkbenchWindow ww = PlatformUI.getWorkbench()
 				.getActiveWorkbenchWindow();
 		IWorkbenchPage page = ww.getActivePage();
diff --git a/examples/bundles/org.eclipse.ecf.example.collab/src/org/eclipse/ecf/example/collab/ui/ChatTreeViewer.java b/examples/bundles/org.eclipse.ecf.example.collab/src/org/eclipse/ecf/example/collab/ui/ChatTreeViewer.java
index 295ec8ed4..74d1ff936 100644
--- a/examples/bundles/org.eclipse.ecf.example.collab/src/org/eclipse/ecf/example/collab/ui/ChatTreeViewer.java
+++ b/examples/bundles/org.eclipse.ecf.example.collab/src/org/eclipse/ecf/example/collab/ui/ChatTreeViewer.java
@@ -39,7 +39,6 @@ class ChatTreeViewer extends TreeViewer {
 
 	public User getSelectionUser() {
 		User result = null;
-		ViewContentProvider cp = (ViewContentProvider) getContentProvider();
 		ISelection s = getSelection();
 		if (s != null && s instanceof IStructuredSelection) {
 			IStructuredSelection ss = (IStructuredSelection) s;
diff --git a/examples/bundles/org.eclipse.ecf.example.collab/src/org/eclipse/ecf/example/collab/ui/JoinGroupWizard.java b/examples/bundles/org.eclipse.ecf.example.collab/src/org/eclipse/ecf/example/collab/ui/JoinGroupWizard.java
index fa1463f3a..925458def 100644
--- a/examples/bundles/org.eclipse.ecf.example.collab/src/org/eclipse/ecf/example/collab/ui/JoinGroupWizard.java
+++ b/examples/bundles/org.eclipse.ecf.example.collab/src/org/eclipse/ecf/example/collab/ui/JoinGroupWizard.java
@@ -26,12 +26,10 @@ import org.eclipse.ui.IWorkbench;
 public class JoinGroupWizard extends Wizard {
     JoinGroupWizardPage mainPage;
     private IResource project;
-    private IWorkbench workbench;
 
     public JoinGroupWizard(IResource project, IWorkbench workbench) {
         super();
         this.project = project;
-        this.workbench = workbench;
     }
 
     protected ISchedulingRule getSchedulingRule() {
diff --git a/examples/bundles/org.eclipse.ecf.example.collab/src/org/eclipse/ecf/example/collab/ui/JoinGroupWizardPage.java b/examples/bundles/org.eclipse.ecf.example.collab/src/org/eclipse/ecf/example/collab/ui/JoinGroupWizardPage.java
index 26c897a75..72209f337 100644
--- a/examples/bundles/org.eclipse.ecf.example.collab/src/org/eclipse/ecf/example/collab/ui/JoinGroupWizardPage.java
+++ b/examples/bundles/org.eclipse.ecf.example.collab/src/org/eclipse/ecf/example/collab/ui/JoinGroupWizardPage.java
@@ -14,6 +14,7 @@ import java.util.ArrayList;
 import java.util.Iterator;
 import java.util.List;
 import java.util.Map;
+
 import org.eclipse.ecf.core.SharedObjectContainerDescription;
 import org.eclipse.ecf.core.SharedObjectContainerFactory;
 import org.eclipse.jface.wizard.WizardPage;
@@ -114,7 +115,7 @@ public class JoinGroupWizardPage extends WizardPage {
         }
     }
     protected void fillCombo() {
-        List rawDescriptions = SharedObjectContainerFactory.getDescriptions();
+        List rawDescriptions = SharedObjectContainerFactory.getDefault().getDescriptions();
         int index = 0;
         int def = 0;
         Map defProps = null;
@@ -166,8 +167,6 @@ public class JoinGroupWizardPage extends WizardPage {
         final GridData gridData_1 = new GridData(GridData.HORIZONTAL_ALIGN_FILL);
         combo.setLayoutData(gridData_1);
 
-        final Label label_2 = new Label(container, SWT.NONE);
-
         example_label = new Label(container, SWT.NONE);
         example_label.setText(template_url);
 
@@ -199,7 +198,6 @@ public class JoinGroupWizardPage extends WizardPage {
         nickname_text.setText(System.getProperty(USER_NAME_SYSTEM_PROPERTY));
         nickname_text.addFocusListener(new FocusListener() {
             public void focusGained(FocusEvent e) {
-                String t = nickname_text.getText();
                     nickname_text.selectAll();
             }
 
diff --git a/examples/bundles/org.eclipse.ecf.example.collab/src/org/eclipse/ecf/example/collab/ui/LineChatClientView.java b/examples/bundles/org.eclipse.ecf.example.collab/src/org/eclipse/ecf/example/collab/ui/LineChatClientView.java
index f22b878c6..e1eccea04 100644
--- a/examples/bundles/org.eclipse.ecf.example.collab/src/org/eclipse/ecf/example/collab/ui/LineChatClientView.java
+++ b/examples/bundles/org.eclipse.ecf.example.collab/src/org/eclipse/ecf/example/collab/ui/LineChatClientView.java
@@ -532,13 +532,12 @@ public class LineChatClientView implements FileSenderUI {
 		if (user == null || item == null)
 			return false;
 		TreeParent root = getPresenceRoot();
-		boolean res = false;
 		for (Iterator childs = root.children().iterator(); childs.hasNext();) {
 			TreeUser ut = (TreeUser) childs.next();
 			User a = ut.getUser();
 			if (a != null && (user.equals(a.getUserID()))) {
 				// Found user...now find tree item
-				res = updateUserTree(ut, item);
+				updateUserTree(ut, item);
 				refreshTreeView();
 				return true;
 			}
diff --git a/examples/bundles/org.eclipse.ecf.example.collab/src/org/eclipse/ecf/example/collab/ui/TreeCategory.java b/examples/bundles/org.eclipse.ecf.example.collab/src/org/eclipse/ecf/example/collab/ui/TreeCategory.java
index 7a9970a60..2406c6a3b 100644
--- a/examples/bundles/org.eclipse.ecf.example.collab/src/org/eclipse/ecf/example/collab/ui/TreeCategory.java
+++ b/examples/bundles/org.eclipse.ecf.example.collab/src/org/eclipse/ecf/example/collab/ui/TreeCategory.java
@@ -12,10 +12,8 @@
 package org.eclipse.ecf.example.collab.ui;
 
 class TreeCategory extends TreeParent {
-    private LineChatClientView view;
 
     TreeCategory(LineChatClientView view, String name) {
         super(view, name);
-        this.view = view;
     }
 }
\ No newline at end of file
diff --git a/examples/bundles/org.eclipse.ecf.example.collab/src/org/eclipse/ecf/example/collab/ui/TreeParent.java b/examples/bundles/org.eclipse.ecf.example.collab/src/org/eclipse/ecf/example/collab/ui/TreeParent.java
index 7f16666b3..8a7f0ed0e 100644
--- a/examples/bundles/org.eclipse.ecf.example.collab/src/org/eclipse/ecf/example/collab/ui/TreeParent.java
+++ b/examples/bundles/org.eclipse.ecf.example.collab/src/org/eclipse/ecf/example/collab/ui/TreeParent.java
@@ -18,12 +18,10 @@ import java.util.List;
 import org.eclipse.ecf.example.collab.share.TreeItem;
 
 class TreeParent extends TreeObject {
-    private LineChatClientView view;
     private List children;
     private TreeItem treeItem;
     public TreeParent(LineChatClientView view, String name) {
         super(name);
-        this.view = view;
         children = Collections.synchronizedList(new ArrayList());
     }
     public TreeParent(LineChatClientView view, TreeItem item) {
diff --git a/examples/bundles/org.eclipse.ecf.example.collab/src/org/eclipse/ecf/example/collab/ui/TreeUser.java b/examples/bundles/org.eclipse.ecf.example.collab/src/org/eclipse/ecf/example/collab/ui/TreeUser.java
index d0fa47001..59f4f8ff0 100644
--- a/examples/bundles/org.eclipse.ecf.example.collab/src/org/eclipse/ecf/example/collab/ui/TreeUser.java
+++ b/examples/bundles/org.eclipse.ecf.example.collab/src/org/eclipse/ecf/example/collab/ui/TreeUser.java
@@ -14,11 +14,9 @@ package org.eclipse.ecf.example.collab.ui;
 import org.eclipse.ecf.example.collab.share.User;
 
 class TreeUser extends TreeParent {
-    private LineChatClientView view;
     User ud;
     TreeUser(LineChatClientView view, User ud) {
         super(view, ud.getNickname());
-        this.view = view;
         this.ud = ud;
     }
     User getUser() {
diff --git a/examples/bundles/org.eclipse.ecf.example.sdo.editor/.classpath b/examples/bundles/org.eclipse.ecf.example.sdo.editor/.classpath
index 065ac06e1..751c8f2e5 100644
--- a/examples/bundles/org.eclipse.ecf.example.sdo.editor/.classpath
+++ b/examples/bundles/org.eclipse.ecf.example.sdo.editor/.classpath
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <classpath>
 	<classpathentry kind="src" path="src"/>
-	<classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/>
 	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/>
+	<classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/>
 	<classpathentry kind="output" path="bin"/>
 </classpath>
diff --git a/examples/bundles/org.eclipse.ecf.sdo/.classpath b/examples/bundles/org.eclipse.ecf.sdo/.classpath
index 065ac06e1..751c8f2e5 100644
--- a/examples/bundles/org.eclipse.ecf.sdo/.classpath
+++ b/examples/bundles/org.eclipse.ecf.sdo/.classpath
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <classpath>
 	<classpathentry kind="src" path="src"/>
-	<classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/>
 	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/>
+	<classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/>
 	<classpathentry kind="output" path="bin"/>
 </classpath>
diff --git a/framework/bundles/org.eclipse.ecf.datashare/.classpath b/framework/bundles/org.eclipse.ecf.datashare/.classpath
index 065ac06e1..751c8f2e5 100644
--- a/framework/bundles/org.eclipse.ecf.datashare/.classpath
+++ b/framework/bundles/org.eclipse.ecf.datashare/.classpath
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <classpath>
 	<classpathentry kind="src" path="src"/>
-	<classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/>
 	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/>
+	<classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/>
 	<classpathentry kind="output" path="bin"/>
 </classpath>
diff --git a/framework/bundles/org.eclipse.ecf.datashare/META-INF/MANIFEST.MF b/framework/bundles/org.eclipse.ecf.datashare/META-INF/MANIFEST.MF
index ba97b565e..92e012302 100644
--- a/framework/bundles/org.eclipse.ecf.datashare/META-INF/MANIFEST.MF
+++ b/framework/bundles/org.eclipse.ecf.datashare/META-INF/MANIFEST.MF
@@ -7,7 +7,7 @@ Bundle-ClassPath: datashare.jar
 Bundle-Activator: org.eclipse.ecf.internal.datashare.DataSharePlugin$EclipsePlugin
 Bundle-Vendor: Eclipse.org
 Bundle-Localization: plugin
-Require-Bundle: org.eclipse.core.runtime,
+Require-Bundle: org.eclipse.core.runtime;visibility:=reexport,
  org.eclipse.ecf;visibility:=reexport
 Eclipse-AutoStart: true
 Export-Package: org.eclipse.ecf.datashare,
diff --git a/framework/bundles/org.eclipse.ecf.datashare/src/org/eclipse/ecf/internal/datashare/ServerBootstrap.java b/framework/bundles/org.eclipse.ecf.datashare/src/org/eclipse/ecf/internal/datashare/ServerBootstrap.java
index e8453997b..8ff66f2ab 100644
--- a/framework/bundles/org.eclipse.ecf.datashare/src/org/eclipse/ecf/internal/datashare/ServerBootstrap.java
+++ b/framework/bundles/org.eclipse.ecf.datashare/src/org/eclipse/ecf/internal/datashare/ServerBootstrap.java
@@ -62,11 +62,11 @@ public class ServerBootstrap implements IBootstrap {
 		if (config.getContext().isGroupServer()) // TODO how about isGroupManager()?
 			agent.doBootstrap(containerID);
 	}
-
+	/*
 	private void handleError(Throwable t) {
 		t.printStackTrace();
 	}
-
+	*/
 	/*
 	 * (non-Javadoc)
 	 * 
diff --git a/framework/bundles/org.eclipse.ecf.discovery/.classpath b/framework/bundles/org.eclipse.ecf.discovery/.classpath
index 065ac06e1..751c8f2e5 100644
--- a/framework/bundles/org.eclipse.ecf.discovery/.classpath
+++ b/framework/bundles/org.eclipse.ecf.discovery/.classpath
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <classpath>
 	<classpathentry kind="src" path="src"/>
-	<classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/>
 	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/>
+	<classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/>
 	<classpathentry kind="output" path="bin"/>
 </classpath>
diff --git a/framework/bundles/org.eclipse.ecf.presence/.classpath b/framework/bundles/org.eclipse.ecf.presence/.classpath
index 065ac06e1..751c8f2e5 100644
--- a/framework/bundles/org.eclipse.ecf.presence/.classpath
+++ b/framework/bundles/org.eclipse.ecf.presence/.classpath
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <classpath>
 	<classpathentry kind="src" path="src"/>
-	<classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/>
 	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/>
+	<classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/>
 	<classpathentry kind="output" path="bin"/>
 </classpath>
diff --git a/framework/bundles/org.eclipse.ecf.provider/.classpath b/framework/bundles/org.eclipse.ecf.provider/.classpath
index 065ac06e1..751c8f2e5 100644
--- a/framework/bundles/org.eclipse.ecf.provider/.classpath
+++ b/framework/bundles/org.eclipse.ecf.provider/.classpath
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <classpath>
 	<classpathentry kind="src" path="src"/>
-	<classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/>
 	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/>
+	<classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/>
 	<classpathentry kind="output" path="bin"/>
 </classpath>
diff --git a/framework/bundles/org.eclipse.ecf.provider/src/org/eclipse/ecf/provider/app/ClientApplication.java b/framework/bundles/org.eclipse.ecf.provider/src/org/eclipse/ecf/provider/app/ClientApplication.java
index ea0c14867..e5264c8c2 100644
--- a/framework/bundles/org.eclipse.ecf.provider/src/org/eclipse/ecf/provider/app/ClientApplication.java
+++ b/framework/bundles/org.eclipse.ecf.provider/src/org/eclipse/ecf/provider/app/ClientApplication.java
@@ -67,7 +67,7 @@ public class ClientApplication {
 		ConnectionDescription cd = new ConnectionDescription(ClientApplication.class.getClassLoader(),CONNECTION_NAME,CONNECTION_CLASS,null);
 		ConnectionFactory.addDescription(cd);
 		contd = new SharedObjectContainerDescription(ClientApplication.class.getClassLoader(),CONTAINER_FACTORY_NAME,CONTAINER_FACTORY_CLASS,null);
-		SharedObjectContainerFactory.addDescription(contd);
+		SharedObjectContainerFactory.getDefault().addDescription(contd);
 		for(int i=0; i < clientCount; i++) {
 			sm[i] = makeClient();
 		}
@@ -76,7 +76,7 @@ public class ClientApplication {
 	protected ISharedObjectContainer makeClient() throws Exception {
 		// Make identity instance for the new container
 		ID newContainerID = IDFactory.makeGUID();
-		ISharedObjectContainer result =  SharedObjectContainerFactory.makeSharedObjectContainer(contd,null,new Object[] { newContainerID, new Integer(DEFAULT_TIMEOUT)});
+		ISharedObjectContainer result =  SharedObjectContainerFactory.getDefault().makeSharedObjectContainer(contd,null,new Object[] { newContainerID, new Integer(DEFAULT_TIMEOUT)});
 		return result;
 	}
 	
diff --git a/framework/bundles/org.eclipse.ecf.ui/.classpath b/framework/bundles/org.eclipse.ecf.ui/.classpath
index 065ac06e1..751c8f2e5 100644
--- a/framework/bundles/org.eclipse.ecf.ui/.classpath
+++ b/framework/bundles/org.eclipse.ecf.ui/.classpath
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <classpath>
 	<classpathentry kind="src" path="src"/>
-	<classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/>
 	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/>
+	<classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/>
 	<classpathentry kind="output" path="bin"/>
 </classpath>
diff --git a/framework/bundles/org.eclipse.ecf/.classpath b/framework/bundles/org.eclipse.ecf/.classpath
index 065ac06e1..751c8f2e5 100644
--- a/framework/bundles/org.eclipse.ecf/.classpath
+++ b/framework/bundles/org.eclipse.ecf/.classpath
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <classpath>
 	<classpathentry kind="src" path="src"/>
-	<classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/>
 	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/>
+	<classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/>
 	<classpathentry kind="output" path="bin"/>
 </classpath>
diff --git a/framework/bundles/org.eclipse.ecf/src/org/eclipse/ecf/core/IContainer.java b/framework/bundles/org.eclipse.ecf/src/org/eclipse/ecf/core/IContainer.java
new file mode 100644
index 000000000..ae5a6452a
--- /dev/null
+++ b/framework/bundles/org.eclipse.ecf/src/org/eclipse/ecf/core/IContainer.java
@@ -0,0 +1,46 @@
+package org.eclipse.ecf.core;
+
+import org.eclipse.core.runtime.IAdaptable;
+import org.eclipse.ecf.core.identity.ID;
+import org.eclipse.ecf.core.security.IJoinContext;
+
+public interface IContainer extends IAdaptable {
+
+	/**
+	 * Join a container group. The group to join is identified by the first
+	 * parameter (groupID) using any required authentication provided via the
+	 * second parameter (joinContext). This method provides an implementation
+	 * independent way for container implementations to connect, authenticate,
+	 * and communicate with a remote service or group of services. Providers are
+	 * responsible for implementing this operation in a way appropriate to the
+	 * given remote service and expected protocol.
+	 * 
+	 * @param groupID
+	 *            the ID of the remote service to join
+	 * @param joinContext
+	 *            any required context to allow this container to authenticate
+	 *            on join with remote containers
+	 * @exception SharedObjectContainerJoinException
+	 *                thrown if communication cannot be established with remote
+	 *                service
+	 */
+	public void joinGroup(ID groupID, IJoinContext joinContext)
+			throws SharedObjectContainerJoinException;
+
+	/**
+	 * Leave a container group. This operation will disconnect the local
+	 * container instance from any previously joined group.
+	 */
+	public void leaveGroup();
+
+	/**
+	 * Dispose this ISharedObjectContainer instance. The container instance will
+	 * be made inactive after the completion of this method and will be
+	 * unavailable for subsequent usage
+	 * 
+	 * @param waittime
+	 */
+	public void dispose(long waittime);
+
+
+}
diff --git a/framework/bundles/org.eclipse.ecf/src/org/eclipse/ecf/core/ISharedObjectContainer.java b/framework/bundles/org.eclipse.ecf/src/org/eclipse/ecf/core/ISharedObjectContainer.java
index 21d964f47..8713fecea 100644
--- a/framework/bundles/org.eclipse.ecf/src/org/eclipse/ecf/core/ISharedObjectContainer.java
+++ b/framework/bundles/org.eclipse.ecf/src/org/eclipse/ecf/core/ISharedObjectContainer.java
@@ -10,13 +10,12 @@
 package org.eclipse.ecf.core;
 
 import org.eclipse.ecf.core.identity.ID;
-import org.eclipse.ecf.core.security.IJoinContext;
 
 /**
  * Core interface that must be implemented by all ECF container instances.
  * Instances are typically created via {@link SharedObjectContainerFactory}
  */
-public interface ISharedObjectContainer {
+public interface ISharedObjectContainer extends IContainer {
 
 	/**
 	 * Return the ISharedObjectContainerConfig for this ISharedObjectContainer.
@@ -47,42 +46,6 @@ public interface ISharedObjectContainer {
 	public void removeListener(ISharedObjectContainerListener l);
 
 	/**
-	 * Dispose this ISharedObjectContainer instance. The container instance will
-	 * be made inactive after the completion of this method and will be
-	 * unavailable for subsequent usage
-	 * 
-	 * @param waittime
-	 */
-	public void dispose(long waittime);
-
-	/**
-	 * Join a container group. The group to join is identified by the first
-	 * parameter (groupID) using any required authentication provided via the
-	 * second parameter (joinContext). This method provides an implementation
-	 * independent way for container implementations to connect, authenticate,
-	 * and communicate with a remote service or group of services. Providers are
-	 * responsible for implementing this operation in a way appropriate to the
-	 * given remote service and expected protocol.
-	 * 
-	 * @param groupID
-	 *            the ID of the remote service to join
-	 * @param joinContext
-	 *            any required context to allow this container to authenticate
-	 *            on join with remote containers
-	 * @exception SharedObjectContainerJoinException
-	 *                thrown if communication cannot be established with remote
-	 *                service
-	 */
-	public void joinGroup(ID groupID, IJoinContext joinContext)
-			throws SharedObjectContainerJoinException;
-
-	/**
-	 * Leave a container group. This operation will disconnect the local
-	 * container instance from any previously joined group.
-	 */
-	public void leaveGroup();
-
-	/**
 	 * Get the group id that this container has joined. Return null if no group
 	 * has previously been joined.
 	 * 
@@ -111,15 +74,4 @@ public interface ISharedObjectContainer {
 	 */
 	public ISharedObjectManager getSharedObjectManager();
 
-	/**
-	 * Returns an object which is an instance of the given class associated with
-	 * this object.
-	 * 
-	 * @param adapter
-	 *            the adapter class to lookup
-	 * @return Object a object castable to the given class, or null if this
-	 *         object does not have an adapter for the given class
-	 */
-	public Object getAdapter(Class adapter);
-
 }
\ No newline at end of file
diff --git a/framework/bundles/org.eclipse.ecf/src/org/eclipse/ecf/core/SharedObjectContainerFactory.java b/framework/bundles/org.eclipse.ecf/src/org/eclipse/ecf/core/SharedObjectContainerFactory.java
index 950542260..bcae90073 100644
--- a/framework/bundles/org.eclipse.ecf/src/org/eclipse/ecf/core/SharedObjectContainerFactory.java
+++ b/framework/bundles/org.eclipse.ecf/src/org/eclipse/ecf/core/SharedObjectContainerFactory.java
@@ -39,7 +39,27 @@ public class SharedObjectContainerFactory {
     private static Trace debug = Trace.create("containerfactory");
     
     private static Hashtable containerdescriptions = new Hashtable();
+    protected static SharedObjectContainerFactory instance = null;
+    
+    static {
+    	instance = new SharedObjectContainerFactory();
+    }
+    protected SharedObjectContainerFactory() {
+    }
+    public static SharedObjectContainerFactory getDefault() {
+    	return instance;
+    }
+    private static void trace(String msg) {
+        if (Trace.ON && debug != null) {
+            debug.msg(msg);
+        }
+    }
 
+    private static void dumpStack(String msg, Throwable e) {
+        if (Trace.ON && debug != null) {
+            debug.dumpStack(e, msg);
+        }
+    }
     /*
      * Add a SharedObjectContainerDescription to the set of known
      * SharedObjectContainerDescriptions.
@@ -48,9 +68,9 @@ public class SharedObjectContainerFactory {
      * @return SharedObjectContainerDescription the old description of the same
      * name, null if none found
      */
-    public final static SharedObjectContainerDescription addDescription(
+    public SharedObjectContainerDescription addDescription(
             SharedObjectContainerDescription scd) {
-        debug("addDescription("+scd+")");
+        trace("addDescription("+scd+")");
         return addDescription0(scd);
     }
     /**
@@ -61,24 +81,13 @@ public class SharedObjectContainerFactory {
      * 
      * @return List of SharedObjectContainerDescription instances
      */
-    public final static List getDescriptions() {
+    public List getDescriptions() {
         return getDescriptions0();
     }
-    private static void debug(String msg) {
-        if (Trace.ON && debug != null) {
-            debug.msg(msg);
-        }
-    }
-
-    private static void dumpStack(String msg, Throwable e) {
-        if (Trace.ON && debug != null) {
-            debug.dumpStack(e, msg);
-        }
-    }
-    protected static List getDescriptions0() {
+    protected List getDescriptions0() {
         return new ArrayList(containerdescriptions.values());
     }
-    protected static SharedObjectContainerDescription addDescription0(
+    protected SharedObjectContainerDescription addDescription0(
             SharedObjectContainerDescription n) {
         if (n == null)
             return null;
@@ -93,24 +102,24 @@ public class SharedObjectContainerFactory {
      *            the SharedObjectContainerDescription to look for
      * @return true if description is already known to factory, false otherwise
      */
-    public final static boolean containsDescription(
+    public boolean containsDescription(
             SharedObjectContainerDescription scd) {
         return containsDescription0(scd);
     }
-    protected static boolean containsDescription0(
+    protected boolean containsDescription0(
             SharedObjectContainerDescription scd) {
         if (scd == null)
             return false;
         return containerdescriptions.containsKey(scd.getName());
     }
-    protected static SharedObjectContainerDescription getDescription0(
+    protected SharedObjectContainerDescription getDescription0(
             SharedObjectContainerDescription scd) {
         if (scd == null)
             return null;
         return (SharedObjectContainerDescription) containerdescriptions.get(scd
                 .getName());
     }
-    protected static SharedObjectContainerDescription getDescription0(
+    protected SharedObjectContainerDescription getDescription0(
             String name) {
         if (name == null)
             return null;
@@ -123,9 +132,9 @@ public class SharedObjectContainerFactory {
      * @return SharedObjectContainerDescription found
      * @throws SharedObjectContainerInstantiationException
      */
-    public final static SharedObjectContainerDescription getDescriptionByName(
+    public SharedObjectContainerDescription getDescriptionByName(
             String name) throws SharedObjectContainerInstantiationException {
-        debug("getDescriptionByName("+name+")");
+        trace("getDescriptionByName("+name+")");
         SharedObjectContainerDescription res = getDescription0(name);
         if (res == null) {
             throw new SharedObjectContainerInstantiationException(
@@ -159,10 +168,10 @@ public class SharedObjectContainerFactory {
      * @return a valid instance of ISharedObjectContainer
      * @throws SharedObjectContainerInstantiationException
      */
-    public static ISharedObjectContainer makeSharedObjectContainer(
+    public ISharedObjectContainer makeSharedObjectContainer(
             SharedObjectContainerDescription desc, String[] argTypes,
             Object[] args) throws SharedObjectContainerInstantiationException {
-        debug("makeSharedObjectContainer("+desc+","+Trace.convertStringAToString(argTypes)+","+Trace.convertObjectAToString(args)+")");
+        trace("makeSharedObjectContainer("+desc+","+Trace.convertStringAToString(argTypes)+","+Trace.convertObjectAToString(args)+")");
         if (desc == null)
             throw new SharedObjectContainerInstantiationException(
                     "SharedObjectContainerDescription cannot be null");
@@ -210,7 +219,7 @@ public class SharedObjectContainerFactory {
      * @return a valid instance of ISharedObjectContainer
      * @throws SharedObjectContainerInstantiationException
      */
-    public static ISharedObjectContainer makeSharedObjectContainer(
+    public ISharedObjectContainer makeSharedObjectContainer(
             String descriptionName)
             throws SharedObjectContainerInstantiationException {
         return makeSharedObjectContainer(
@@ -237,7 +246,7 @@ public class SharedObjectContainerFactory {
      * @return a valid instance of ISharedObjectContainer
      * @throws SharedObjectContainerInstantiationException
      */
-    public static ISharedObjectContainer makeSharedObjectContainer(
+    public ISharedObjectContainer makeSharedObjectContainer(
             String descriptionName, Object[] args)
             throws SharedObjectContainerInstantiationException {
         return makeSharedObjectContainer(
@@ -266,7 +275,7 @@ public class SharedObjectContainerFactory {
      * @return a valid instance of ISharedObjectContainer
      * @throws SharedObjectContainerInstantiationException
      */
-    public static ISharedObjectContainer makeSharedObjectContainer(
+    public ISharedObjectContainer makeSharedObjectContainer(
             String descriptionName, String[] argsTypes, Object[] args)
             throws SharedObjectContainerInstantiationException {
         return makeSharedObjectContainer(
@@ -280,12 +289,12 @@ public class SharedObjectContainerFactory {
      * @return the removed SharedObjectContainerDescription, null if nothing
      *         removed
      */
-    public final static SharedObjectContainerDescription removeDescription(
+    public SharedObjectContainerDescription removeDescription(
             SharedObjectContainerDescription scd) {
-        debug("removeDescription("+scd+")");
+        trace("removeDescription("+scd+")");
         return removeDescription0(scd);
     }
-    protected static SharedObjectContainerDescription removeDescription0(
+    protected SharedObjectContainerDescription removeDescription0(
             SharedObjectContainerDescription n) {
         if (n == null)
             return null;
@@ -293,8 +302,4 @@ public class SharedObjectContainerFactory {
                 .getName());
     }
 
-    private SharedObjectContainerFactory() {
-        // No instantiation other than as factory
-    }
-
 }
\ No newline at end of file
diff --git a/framework/bundles/org.eclipse.ecf/src/org/eclipse/ecf/internal/core/ECFPlugin.java b/framework/bundles/org.eclipse.ecf/src/org/eclipse/ecf/internal/core/ECFPlugin.java
index ae9f1fec7..87a55126e 100644
--- a/framework/bundles/org.eclipse.ecf/src/org/eclipse/ecf/internal/core/ECFPlugin.java
+++ b/framework/bundles/org.eclipse.ecf/src/org/eclipse/ecf/internal/core/ECFPlugin.java
@@ -216,12 +216,13 @@ public class ECFPlugin extends Plugin {
                         description, defaults.getTypes(), defaults
                                 .getDefaults(), defaults.getNames(), properties);
                 debug("setupContainerExtensionPoint:created description:" + scd);
-                if (SharedObjectContainerFactory.containsDescription(scd)) {
+                SharedObjectContainerFactory factory = SharedObjectContainerFactory.getDefault();
+                if (factory.containsDescription(scd)) {
                     throw new CoreException(getStatusForContException(
                             extension, bundleName, name));
                 }
                 // Now add the description and we're ready to go.
-                SharedObjectContainerFactory.addDescription(scd);
+                factory.addDescription(scd);
                 debug("setupContainerExtensionPoint:added description to factory:"
                         + scd);
             } catch (CoreException e) {
diff --git a/providers/bundles/org.eclipse.ecf.provider.xmpp/.classpath b/providers/bundles/org.eclipse.ecf.provider.xmpp/.classpath
index 2c3d6b606..1c00cd28b 100644
--- a/providers/bundles/org.eclipse.ecf.provider.xmpp/.classpath
+++ b/providers/bundles/org.eclipse.ecf.provider.xmpp/.classpath
@@ -1,28 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <classpath>
-	<classpathentry kind="src" path="src">
-		<attributes>
-		</attributes>
-	</classpathentry>
-	<classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins">
-		<attributes>
-		</attributes>
-	</classpathentry>
-	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER">
-		<attributes>
-		</attributes>
-	</classpathentry>
-	<classpathentry sourcepath="C:/Documents and Settings/slewis/Desktop/smack-dev-1.5.0/source" kind="lib" path="lib/smack.jar">
-		<attributes>
-		</attributes>
-	</classpathentry>
-	<classpathentry sourcepath="C:/Documents and Settings/slewis/Desktop/smack-dev-1.5.0/source" kind="lib" path="lib/smackx.jar">
-		<attributes>
-		</attributes>
-	</classpathentry>
-	<classpathentry sourcepath="C:/Documents and Settings/slewis/Desktop/smack-dev-1.5.0/source" kind="lib" path="lib/smackx-debug.jar">
-		<attributes>
-		</attributes>
-	</classpathentry>
+	<classpathentry kind="src" path="src"/>
+	<classpathentry exported="true" kind="lib" path="lib/smackx-debug.jar"/>
+	<classpathentry exported="true" kind="lib" path="lib/smack.jar"/>
+	<classpathentry exported="true" kind="lib" path="lib/smackx.jar"/>
+	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/>
+	<classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/>
 	<classpathentry kind="output" path="bin"/>
 </classpath>
diff --git a/releng/features/org.eclipse.ecf.core-feature/feature.xml b/releng/features/org.eclipse.ecf.core-feature/feature.xml
index a0f2671cf..bef9af3a6 100644
--- a/releng/features/org.eclipse.ecf.core-feature/feature.xml
+++ b/releng/features/org.eclipse.ecf.core-feature/feature.xml
@@ -83,8 +83,7 @@ still apply to any source code in the Content.
          id="org.eclipse.ecf.provider"
          download-size="0"
          install-size="0"
-         version="0.0.0"
-         unpack="false"/>
+         version="0.0.0"/>
 
    <plugin
          id="org.eclipse.ecf.ui"