Fixes for warnings in containerFactory schema. Added IUser interface class and org.eclipse.core.user package.

5 files changed, 34 insertions, 8 deletions

diff --git a/framework/bundles/org.eclipse.ecf.provider/src/org/eclipse/ecf/provider/generic/SOContainer.java b/framework/bundles/org.eclipse.ecf.provider/src/org/eclipse/ecf/provider/generic/SOContainer.java
index 47620db92..0e1b9147a 100644
--- a/framework/bundles/org.eclipse.ecf.provider/src/org/eclipse/ecf/provider/generic/SOContainer.java
+++ b/framework/bundles/org.eclipse.ecf.provider/src/org/eclipse/ecf/provider/generic/SOContainer.java
@@ -340,7 +340,7 @@ public abstract class SOContainer implements ISharedObjectContainer {
 	 *            the SharedObjectDescription that describes the shared object
 	 *            to be created
 	 * 
-	 * @returns Object null if the create message is to be ignored, non-null if
+	 * @return Object null if the create message is to be ignored, non-null if
 	 *          the creation should continue
 	 * 
 	 * @throws Exception
diff --git a/framework/bundles/org.eclipse.ecf/META-INF/MANIFEST.MF b/framework/bundles/org.eclipse.ecf/META-INF/MANIFEST.MF
index f04260209..b147f5820 100644
--- a/framework/bundles/org.eclipse.ecf/META-INF/MANIFEST.MF
+++ b/framework/bundles/org.eclipse.ecf/META-INF/MANIFEST.MF
@@ -16,4 +16,5 @@ Provide-Package: org.eclipse.ecf.core,
  org.eclipse.ecf.core.provider,
  org.eclipse.ecf.core.comm,
  org.eclipse.ecf.core.comm.provider,
+ ort.eclipse.ecf.core.user,
  org.eclipse.ecf.core.util
diff --git a/framework/bundles/org.eclipse.ecf/javadoc.xml b/framework/bundles/org.eclipse.ecf/javadoc.xml
index 1c7d3a096..3e4ff9ec5 100644
--- a/framework/bundles/org.eclipse.ecf/javadoc.xml
+++ b/framework/bundles/org.eclipse.ecf/javadoc.xml
@@ -1,8 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <project default="javadoc">
-    <target name="javadoc">
-        <javadoc destdir="../ecf website/org.eclipse.ecf.docs/api" access="protected" use="true" notree="false" nonavbar="false" noindex="false" splitindex="true" author="false" version="true" nodeprecatedlist="false" nodeprecated="false" packagenames="org.eclipse.ecf.core.identity.provider,org.eclipse.ecf.core.comm.provider,org.eclipse.ecf.core,org.eclipse.ecf.core.comm,org.eclipse.ecf.provider.app,org.eclipse.ecf.provider.generic.gmm,org.eclipse.ecf.core.events,org.eclipse.ecf.provider,org.eclipse.ecf.core.util,org.eclipse.ecf.core.identity,org.eclipse.ecf.core.provider,org.eclipse.ecf.provider.generic,org.eclipse.ecf.provider.comm.tcp,org.eclipse.ecf.provider.generic.events" sourcepath="src;../org.eclipse.ecf.provider/src" classpath="../org.eclipse.ecf.provider/bin;C:\301\eclipse\plugins\org.eclipse.osgi_3.0.1\osgi.jar;C:\301\eclipse\plugins\org.eclipse.core.runtime_3.0.1\runtime.jar;C:\301\eclipse\plugins\org.eclipse.osgi_3.0.1\defaultAdaptor.jar;C:\301\eclipse\plugins\org.eclipse.osgi_3.0.1\core.jar;bin;C:\301\eclipse\plugins\org.eclipse.osgi_3.0.1\eclipseAdaptor.jar;C:\301\eclipse\plugins\org.eclipse.osgi_3.0.1\resolver.jar;C:\301\eclipse\plugins\org.eclipse.osgi_3.0.1\console.jar" doctitle="Eclipse Communication Framework (ECF) 0.3.0">
-            <link href="http://java.sun.com/j2se/1.4.2/docs/api"/>
-        </javadoc>
-    </target>
+<target name="javadoc">
+<javadoc access="protected" author="false" classpath="." destdir="../ecf documentation/org.eclipse.ecf.docs/api" doctitle="Eclipse Communication Framework (ECF) 0.4.0" nodeprecated="false" nodeprecatedlist="false" noindex="false" nonavbar="false" notree="false" packagenames="org.eclipse.ecf.core.comm,org.eclipse.ecf.core.identity,org.eclipse.ecf.provider.generic.events,org.eclipse.ecf.core,org.eclipse.ecf.provider.generic.sobject,org.eclipse.ecf.core.user,org.eclipse.ecf.core.identity.provider,org.eclipse.ecf.core.provider,org.eclipse.ecf.provider.comm.tcp,org.eclipse.ecf.core.events,org.eclipse.ecf.core.util,org.eclipse.ecf.provider.generic.gmm,org.eclipse.ecf.provider.app,org.eclipse.ecf.core.comm.provider,org.eclipse.ecf.provider.generic" sourcepath="../org.eclipse.ecf.provider/src;src" splitindex="true" use="true" version="true"/>
+</target>
 </project>
diff --git a/framework/bundles/org.eclipse.ecf/src/org/eclipse/ecf/core/IOSGIService.java b/framework/bundles/org.eclipse.ecf/src/org/eclipse/ecf/core/IOSGIService.java
index b54dc63d8..27c42bbd3 100644
--- a/framework/bundles/org.eclipse.ecf/src/org/eclipse/ecf/core/IOSGIService.java
+++ b/framework/bundles/org.eclipse.ecf/src/org/eclipse/ecf/core/IOSGIService.java
@@ -19,8 +19,6 @@ import org.osgi.framework.ServiceRegistration;
  * Interaction with local OSGI services via ECF plugin.  
  * Provided to ISharedObject instances via ISharedObjectContext
  * 
- * @see ISharedObjectConfig#getContext()
- * @see org.osgi.framework.BundleContext
  */
 public interface IOSGIService {
 
diff --git a/framework/bundles/org.eclipse.ecf/src/org/eclipse/ecf/core/user/IUser.java b/framework/bundles/org.eclipse.ecf/src/org/eclipse/ecf/core/user/IUser.java
new file mode 100644
index 000000000..baa85849d
--- /dev/null
+++ b/framework/bundles/org.eclipse.ecf/src/org/eclipse/ecf/core/user/IUser.java
@@ -0,0 +1,29 @@
+/****************************************************************************
+* Copyright (c) 2004 Composent, Inc. 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:
+*    Composent, Inc. - initial API and implementation
+*****************************************************************************/
+
+package org.eclipse.ecf.core.user;
+
+import java.io.Serializable;
+import java.util.Map;
+
+import org.eclipse.ecf.core.IIdentifiable;
+
+/**
+ * Interface for arbitrary ECF system user.  Instances represent a user within ECF providers and/or clients.
+ */
+public interface IUser extends IIdentifiable, Serializable {
+
+	/**
+	 * Get map of properties associated with this user.
+	 * @return Map
+	 */
+	public Map getProperties();
+}