Updates for 0.3.2 build

33 files changed, 175 insertions, 88 deletions

diff --git a/doc/bundles/org.eclipse.ecf.doc/html/concepts/container.html b/doc/bundles/org.eclipse.ecf.doc/html/concepts/container.html
index 6aab6aca4..f51660eba 100644
--- a/doc/bundles/org.eclipse.ecf.doc/html/concepts/container.html
+++ b/doc/bundles/org.eclipse.ecf.doc/html/concepts/container.html
@@ -29,7 +29,7 @@ creating ISharedObjectContainer instances called <a
 The lifecycle of a ISharedObjectContainer is typically as follows:
 <ol>
   <li>An ISharedObjectContainer instance is created via
-SharedObjectContainerFactory.makeSharedObjectContainer() </li>
+SharedObjectContainerFactory.getDefault().makeSharedObjectContainer() </li>
   <li>ISharedObjects are created and added to the
 ISharedObjectContainer </li>
   <li>The ISharedObjectContainer 'joins/connects' with a remote
diff --git a/doc/bundles/org.eclipse.ecf.doc/html/concepts/sharedobject.html b/doc/bundles/org.eclipse.ecf.doc/html/concepts/sharedobject.html
index 9185c6eca..2bbc2dbaf 100644
--- a/doc/bundles/org.eclipse.ecf.doc/html/concepts/sharedobject.html
+++ b/doc/bundles/org.eclipse.ecf.doc/html/concepts/sharedobject.html
@@ -77,7 +77,7 @@ ISharedObject.dispose() method.
 <h4>Example Creation Code</h4>
 Here is a code snippet that creates a container and adds a single
 shared object to that container:
-<pre>ISharedObjectContainer container = SharedObjectContainerFactory.makeSharedObjectContainer('standalone');<br>ID newID = IDFactory.makeStringID('foo');<br>SharedObjectDescription sd = new SharedObjectDescription(newID,TestSharedObject.class);<br>container.getSharedObjectManager().createSharedObject(sd,null);<br></pre>
+<pre>ISharedObjectContainer container = SharedObjectContainerFactory.getDefault().makeSharedObjectContainer('standalone');<br>ID newID = IDFactory.makeStringID('foo');<br>SharedObjectDescription sd = new SharedObjectDescription(newID,TestSharedObject.class);<br>container.getSharedObjectManager().createSharedObject(sd,null);<br></pre>
 Note this creates and adds to the container a ISharedObject instance of
 class "TestSharedObject". The TestSharedObject
 null constructor is called, followed by a call to
diff --git a/doc/bundles/org.eclipse.ecf.doc/html/gettingstarted/helloworld.html b/doc/bundles/org.eclipse.ecf.doc/html/gettingstarted/helloworld.html
index 95766da1c..34775b978 100644
--- a/doc/bundles/org.eclipse.ecf.doc/html/gettingstarted/helloworld.html
+++ b/doc/bundles/org.eclipse.ecf.doc/html/gettingstarted/helloworld.html
@@ -33,7 +33,7 @@
         ISharedObjectContainer container = null;
         try {
             // Create container instance via ECF container factory
-            container = SharedObjectContainerFactory.makeSharedObjectContainer(DEFAULT_CONTAINER_TYPE);
+            container = SharedObjectContainerFactory.getDefault().makeSharedObjectContainer(DEFAULT_CONTAINER_TYPE);
             // Create ID for shared object
             ID sharedObjectID = IDFactory.makeStringID(SHARED_OBJECT_ID);
             // Create actual shared object
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 26ba8e450..bfcaa16d0 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
@@ -1,7 +1,7 @@
 Manifest-Version: 1.0
 Bundle-Name: ECF Collaboration Example
 Bundle-SymbolicName: org.eclipse.ecf.example.collab;singleton=true
-Bundle-Version: 0.3.1
+Bundle-Version: 0.3.2
 Bundle-ClassPath: client.jar
 Bundle-Activator: org.eclipse.ecf.example.collab.ClientPlugin
 Bundle-Vendor: Eclipse.org
diff --git a/examples/bundles/org.eclipse.ecf.example.collab/build.properties b/examples/bundles/org.eclipse.ecf.example.collab/build.properties
index 82998fdd7..aa47f64b7 100644
--- a/examples/bundles/org.eclipse.ecf.example.collab/build.properties
+++ b/examples/bundles/org.eclipse.ecf.example.collab/build.properties
@@ -8,9 +8,13 @@
 # Contributors:
 #     IBM Corporation - initial API and implementation
 ###############################################################################
-source.client.jar = src/
-output.client.jar = bin/
 bin.includes = plugin.xml,\
                META-INF/,\
-               client.jar,\
-               icons/
+               icons/,\
+               client.jar
+jars.compile.order = client.jar
+source.client.jar = src/
+output.client.jar = bin/
+src.includes = META-INF/,\
+               icons/,\
+               plugin.xml
diff --git a/examples/bundles/org.eclipse.ecf.example.sdo.editor/META-INF/MANIFEST.MF b/examples/bundles/org.eclipse.ecf.example.sdo.editor/META-INF/MANIFEST.MF
index d39de16a1..07c6e4c9a 100644
--- a/examples/bundles/org.eclipse.ecf.example.sdo.editor/META-INF/MANIFEST.MF
+++ b/examples/bundles/org.eclipse.ecf.example.sdo.editor/META-INF/MANIFEST.MF
@@ -1,7 +1,7 @@
 Manifest-Version: 1.0
 Bundle-Name: ECF SDO Editor Example
 Bundle-SymbolicName: org.eclipse.ecf.example.sdo.editor;singleton=true
-Bundle-Version: 0.3.1
+Bundle-Version: 0.3.2
 Bundle-ClassPath: editor.jar
 Bundle-Activator: org.eclipse.ecf.example.sdo.editor.EditorPlugin
 Bundle-Vendor: Eclipse.org
diff --git a/examples/bundles/org.eclipse.ecf.example.sdo.editor/build.properties b/examples/bundles/org.eclipse.ecf.example.sdo.editor/build.properties
index fdb7933ee..403c0ee45 100644
--- a/examples/bundles/org.eclipse.ecf.example.sdo.editor/build.properties
+++ b/examples/bundles/org.eclipse.ecf.example.sdo.editor/build.properties
@@ -1,6 +1,10 @@
-source.editor.jar = src/
-output.editor.jar = bin/
 bin.includes = plugin.xml,\
                META-INF/,\
-               editor.jar,\
-               icons/
+               icons/,\
+               editor.jar
+jars.compile.order = editor.jar
+source.editor.jar = src/
+src.includes = META-INF/,\
+               icons/,\
+               plugin.xml
+output.editor.jar = bin/
diff --git a/examples/bundles/org.eclipse.ecf.sdo/META-INF/MANIFEST.MF b/examples/bundles/org.eclipse.ecf.sdo/META-INF/MANIFEST.MF
index ae2f29027..2c0b1f3d6 100644
--- a/examples/bundles/org.eclipse.ecf.sdo/META-INF/MANIFEST.MF
+++ b/examples/bundles/org.eclipse.ecf.sdo/META-INF/MANIFEST.MF
@@ -1,7 +1,7 @@
 Manifest-Version: 1.0
 Bundle-Name: ECF SDO API
 Bundle-SymbolicName: org.eclipse.ecf.sdo;singleton=true
-Bundle-Version: 0.3.1
+Bundle-Version: 0.3.2
 Bundle-ClassPath: ecf.sdo.jar
 Bundle-Activator: org.eclipse.ecf.sdo.SDOPlugin$EclipsePlugin
 Bundle-Vendor: Eclipse.org
diff --git a/examples/bundles/org.eclipse.ecf.sdo/build.properties b/examples/bundles/org.eclipse.ecf.sdo/build.properties
index 193cfb156..a21fa47ec 100644
--- a/examples/bundles/org.eclipse.ecf.sdo/build.properties
+++ b/examples/bundles/org.eclipse.ecf.sdo/build.properties
@@ -4,3 +4,6 @@ bin.includes = plugin.xml,\
                META-INF/,\
                ecf.sdo.jar,\
                schema/
+src.includes = META-INF/,\
+               plugin.xml,\
+               schema/
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 92e012302..a0157f4b4 100644
--- a/framework/bundles/org.eclipse.ecf.datashare/META-INF/MANIFEST.MF
+++ b/framework/bundles/org.eclipse.ecf.datashare/META-INF/MANIFEST.MF
@@ -2,7 +2,7 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: ECF DataShare
 Bundle-SymbolicName: org.eclipse.ecf.datashare;singleton:=true
-Bundle-Version: 0.3.1
+Bundle-Version: 0.3.2
 Bundle-ClassPath: datashare.jar
 Bundle-Activator: org.eclipse.ecf.internal.datashare.DataSharePlugin$EclipsePlugin
 Bundle-Vendor: Eclipse.org
diff --git a/framework/bundles/org.eclipse.ecf.datashare/build.properties b/framework/bundles/org.eclipse.ecf.datashare/build.properties
index 4578b1dd7..4a6fae70a 100644
--- a/framework/bundles/org.eclipse.ecf.datashare/build.properties
+++ b/framework/bundles/org.eclipse.ecf.datashare/build.properties
@@ -4,3 +4,6 @@ bin.includes = META-INF/,\
                datashare.jar,\
                schema/,\
                plugin.xml
+src.includes = META-INF/,\
+               plugin.xml,\
+               schema/
diff --git a/framework/bundles/org.eclipse.ecf.discovery/META-INF/MANIFEST.MF b/framework/bundles/org.eclipse.ecf.discovery/META-INF/MANIFEST.MF
index 13858dd41..9569bf0bf 100644
--- a/framework/bundles/org.eclipse.ecf.discovery/META-INF/MANIFEST.MF
+++ b/framework/bundles/org.eclipse.ecf.discovery/META-INF/MANIFEST.MF
@@ -2,7 +2,7 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: ECF Discovery API
 Bundle-SymbolicName: org.eclipse.ecf.discovery
-Bundle-Version: 0.3.1
+Bundle-Version: 0.3.2
 Bundle-ClassPath: discovery.jar
 Bundle-Activator: org.eclipse.ecf.discovery.DiscoveryPlugin
 Bundle-Vendor: Eclipse.org
diff --git a/framework/bundles/org.eclipse.ecf.discovery/build.properties b/framework/bundles/org.eclipse.ecf.discovery/build.properties
index b9a983f1b..8b3ccd224 100644
--- a/framework/bundles/org.eclipse.ecf.discovery/build.properties
+++ b/framework/bundles/org.eclipse.ecf.discovery/build.properties
@@ -2,3 +2,4 @@ source.discovery.jar = src/
 output.discovery.jar = bin/
 bin.includes = META-INF/,\
                discovery.jar
+src.includes = META-INF/
diff --git a/framework/bundles/org.eclipse.ecf.presence/META-INF/MANIFEST.MF b/framework/bundles/org.eclipse.ecf.presence/META-INF/MANIFEST.MF
index 8dde5031b..84386b3ee 100644
--- a/framework/bundles/org.eclipse.ecf.presence/META-INF/MANIFEST.MF
+++ b/framework/bundles/org.eclipse.ecf.presence/META-INF/MANIFEST.MF
@@ -1,7 +1,7 @@
 Manifest-Version: 1.0
 Bundle-Name: ECF Presence API
 Bundle-SymbolicName: org.eclipse.ecf.presence;singleton=true
-Bundle-Version: 0.3.1
+Bundle-Version: 0.3.2
 Bundle-ClassPath: presence.jar
 Bundle-Activator: org.eclipse.ecf.presence.PresencePlugin
 Bundle-Vendor: Eclipse.org
diff --git a/framework/bundles/org.eclipse.ecf.presence/build.properties b/framework/bundles/org.eclipse.ecf.presence/build.properties
index bf31c24b1..c96585b38 100644
--- a/framework/bundles/org.eclipse.ecf.presence/build.properties
+++ b/framework/bundles/org.eclipse.ecf.presence/build.properties
@@ -3,3 +3,5 @@ output.presence.jar = bin/
 bin.includes = plugin.xml,\
                META-INF/,\
                presence.jar
+src.includes = META-INF/,\
+               plugin.xml
diff --git a/framework/bundles/org.eclipse.ecf.provider/META-INF/MANIFEST.MF b/framework/bundles/org.eclipse.ecf.provider/META-INF/MANIFEST.MF
index f3802ae4a..72a0b5936 100644
--- a/framework/bundles/org.eclipse.ecf.provider/META-INF/MANIFEST.MF
+++ b/framework/bundles/org.eclipse.ecf.provider/META-INF/MANIFEST.MF
@@ -1,6 +1,6 @@
 Manifest-Version: 1.0
 Bundle-SymbolicName: org.eclipse.ecf.provider;singleton=true
-Bundle-Version: 0.3.1
+Bundle-Version: 0.3.2
 Bundle-Name: ECF Provider API
 Bundle-Vendor: Eclipse.org
 Bundle-Classpath: provider.jar
diff --git a/framework/bundles/org.eclipse.ecf.provider/build.properties b/framework/bundles/org.eclipse.ecf.provider/build.properties
index fdd135bf2..a1dad2035 100644
--- a/framework/bundles/org.eclipse.ecf.provider/build.properties
+++ b/framework/bundles/org.eclipse.ecf.provider/build.properties
@@ -4,8 +4,7 @@ bin.includes = plugin.xml,\
                provider.jar,\
                META-INF/,\
                conf/
-src.includes = src/,\
-               plugin.xml,\
+src.includes = plugin.xml,\
                provider.jar,\
                META-INF/,\
                conf/
diff --git a/framework/bundles/org.eclipse.ecf.ui/META-INF/MANIFEST.MF b/framework/bundles/org.eclipse.ecf.ui/META-INF/MANIFEST.MF
index 7dd6291db..f3faaf77e 100644
--- a/framework/bundles/org.eclipse.ecf.ui/META-INF/MANIFEST.MF
+++ b/framework/bundles/org.eclipse.ecf.ui/META-INF/MANIFEST.MF
@@ -1,7 +1,7 @@
 Manifest-Version: 1.0
 Bundle-Name: ECF UI API
 Bundle-SymbolicName: org.eclipse.ecf.ui;singleton=true
-Bundle-Version: 0.3.1
+Bundle-Version: 0.3.2
 Bundle-ClassPath: ui.jar
 Bundle-Activator: org.eclipse.ecf.ui.UiPlugin
 Bundle-Vendor: Eclipse.org
diff --git a/framework/bundles/org.eclipse.ecf.ui/build.properties b/framework/bundles/org.eclipse.ecf.ui/build.properties
index 51b812078..4556981aa 100644
--- a/framework/bundles/org.eclipse.ecf.ui/build.properties
+++ b/framework/bundles/org.eclipse.ecf.ui/build.properties
@@ -5,4 +5,5 @@ bin.includes = plugin.xml,\
                ui.jar,\
                icons/
 src.includes = icons/,\
-               META-INF/
+               META-INF/,\
+               plugin.xml
diff --git a/framework/bundles/org.eclipse.ecf/META-INF/MANIFEST.MF b/framework/bundles/org.eclipse.ecf/META-INF/MANIFEST.MF
index bf55f94cb..631f0cf26 100644
--- a/framework/bundles/org.eclipse.ecf/META-INF/MANIFEST.MF
+++ b/framework/bundles/org.eclipse.ecf/META-INF/MANIFEST.MF
@@ -1,7 +1,7 @@
 Manifest-Version: 1.0
 Bundle-Name: ECF Core
 Bundle-SymbolicName: org.eclipse.ecf;singleton=true
-Bundle-Version: 0.3.1
+Bundle-Version: 0.3.2
 Bundle-ClassPath: ecf.jar
 Bundle-Activator: org.eclipse.ecf.internal.core.ECFPlugin
 Bundle-Vendor: Eclipse.org
diff --git a/framework/bundles/org.eclipse.ecf/build.properties b/framework/bundles/org.eclipse.ecf/build.properties
index 308448314..26f78da07 100644
--- a/framework/bundles/org.eclipse.ecf/build.properties
+++ b/framework/bundles/org.eclipse.ecf/build.properties
@@ -3,3 +3,5 @@ output.ecf.jar = bin/
 bin.includes = plugin.xml,\
                META-INF/,\
                ecf.jar
+src.includes = plugin.xml,\
+               META-INF/
diff --git a/framework/bundles/org.eclipse.ecf/doc/org_eclipse_ecf_containerFactory.html b/framework/bundles/org.eclipse.ecf/doc/org_eclipse_ecf_containerFactory.html
index c44a31de9..3eb3ad1f9 100644
--- a/framework/bundles/org.eclipse.ecf/doc/org_eclipse_ecf_containerFactory.html
+++ b/framework/bundles/org.eclipse.ecf/doc/org_eclipse_ecf_containerFactory.html
@@ -138,7 +138,7 @@ In this example, the given class implements the <b>ISharedObjectContainerInstant
 Clients that wish to use the 'foo' container implementation can do so simply by making the following call to create an <b>ISharedObjectContainer</b>:
 
 <pre>
-ISharedObjectContainer newContainer = SharedObjectContainerFactory.makeSharedObjectContainer(&apos;foo&apos;); 
+ISharedObjectContainer newContainer = SharedObjectContainerFactory.getDefault().makeSharedObjectContainer(&apos;foo&apos;); 
 // Further use of newContainer instance here
 
 </pre>
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
index ae5a6452a..31ab5555a 100644
--- 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
@@ -4,6 +4,9 @@ import org.eclipse.core.runtime.IAdaptable;
 import org.eclipse.ecf.core.identity.ID;
 import org.eclipse.ecf.core.security.IJoinContext;
 
+/**
+ * Distributed container contract
+ */
 public interface IContainer extends IAdaptable {
 
 	/**
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 bcae90073..b1284dfbf 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
@@ -28,7 +28,7 @@ import org.eclipse.ecf.internal.core.Trace;
  * <br><br>
  * <code>
  * 	    ISharedObjectContainer container = <br>
- * 			SharedObjectContainerFactory.makeSharedObjectContainer('standalone');
+ * 			SharedObjectContainerFactory.getDefault().makeSharedObjectContainer('standalone');
  *      <br><br>
  *      ...further use of container variable here...
  * </code>
diff --git a/providers/bundles/org.eclipse.ecf.provider.xmpp/META-INF/MANIFEST.MF b/providers/bundles/org.eclipse.ecf.provider.xmpp/META-INF/MANIFEST.MF
index 76bcae452..b3c58535f 100644
--- a/providers/bundles/org.eclipse.ecf.provider.xmpp/META-INF/MANIFEST.MF
+++ b/providers/bundles/org.eclipse.ecf.provider.xmpp/META-INF/MANIFEST.MF
@@ -1,7 +1,7 @@
 Manifest-Version: 1.0
 Bundle-Name: ECF XMPP Provider
 Bundle-SymbolicName: org.eclipse.ecf.provider.xmpp;singleton=true
-Bundle-Version: 0.3.1
+Bundle-Version: 0.3.2
 Bundle-ClassPath: xmpp.jar,
  lib/smackx-debug.jar,
  lib/smack.jar,
diff --git a/providers/bundles/org.eclipse.ecf.provider.xmpp/build.properties b/providers/bundles/org.eclipse.ecf.provider.xmpp/build.properties
index 141ad850f..6c812e8c0 100644
--- a/providers/bundles/org.eclipse.ecf.provider.xmpp/build.properties
+++ b/providers/bundles/org.eclipse.ecf.provider.xmpp/build.properties
@@ -1,15 +1,12 @@
-source.xmpp.jar = src/
-output.xmpp.jar = bin/
 bin.includes = plugin.xml,\
                META-INF/,\
-               xmpp.jar,\
                icons/,\
-               lib/smack.jar,\
-               lib/smackx.jar,\
-               lib/smackx-debug.jar
+               xmpp.jar,\
+               lib/
 jars.compile.order = xmpp.jar
 src.includes = icons/,\
                META-INF/,\
                plugin.xml,\
-               src/,\
                lib/
+source.xmpp.jar = src/
+output.xmpp.jar = bin/
diff --git a/releng/features/org.eclipse.ecf.core-feature/build.properties b/releng/features/org.eclipse.ecf.core-feature/build.properties
index d3864a2f4..32898e10d 100644
--- a/releng/features/org.eclipse.ecf.core-feature/build.properties
+++ b/releng/features/org.eclipse.ecf.core-feature/build.properties
@@ -1,2 +1,4 @@
 bin.includes = feature.xml,\
                about.html
+src.includes = feature.xml,\
+               about.html
diff --git a/releng/features/org.eclipse.ecf.core-feature/feature.xml b/releng/features/org.eclipse.ecf.core-feature/feature.xml
index bef9af3a6..651ace77c 100644
--- a/releng/features/org.eclipse.ecf.core-feature/feature.xml
+++ b/releng/features/org.eclipse.ecf.core-feature/feature.xml
@@ -2,7 +2,7 @@
 <feature
       id="org.eclipse.ecf.core"
       label="ECF Core"
-      version="0.3.1"
+      version="0.3.2"
       provider-name="Eclipse.org">
 
    <description url="http://www.eclipse.org/ecf">
diff --git a/server-side/features/org.eclipse.ecf.server-feature/bin/startserver.bat b/server-side/features/org.eclipse.ecf.server-feature/bin/startserver.bat
index 03ec23c58..6322ba573 100644
--- a/server-side/features/org.eclipse.ecf.server-feature/bin/startserver.bat
+++ b/server-side/features/org.eclipse.ecf.server-feature/bin/startserver.bat
@@ -2,18 +2,18 @@ echo off
 setlocal
 cd %~dp0
 set RP=..\..\..\plugins
-set ECF=%RP%\org.eclipse.ecf_0.3.1\ecf.jar
-set UI=%RP%\org.eclipse.ecf.ui_0.3.1\ui.jar
-set SDO=%RP%\org.eclipse.ecf.sdo_0.3.1\ecf.sdo.jar
-set DS=%RP%\org.eclipse.ecf.datashare_0.3.1\datashare.jar
-set PROVIDER=%RP%\org.eclipse.ecf.provider_0.3.1\provider.jar
-set PRESENCE=%RP%\org.eclipse.ecf.presence_0.3.1\presence.jar
-set GED=%RP%\org.eclipse.ecf.example.sdo.gefeditor_0.3.1\editor.jar
-set ED=%RP%\org.eclipse.ecf.example.sdo.editor_0.3.1\editor.jar
-set LIBRARY=%RP%\org.eclipse.ecf.example.sdo.library_0.3.1\runtime\org.eclipse.ecf.example.library.jar
-set DISCOVERY=%RP%\org.eclipse.ecf.discovery_0.3.1\discovery.jar
-set HELLO=%RP%\org.eclipse.ecf.example.hello_0.3.1\hello.jar
-set COLLAB=%RP%\org.eclipse.ecf.example.collab_0.3.1\client.jar
+set ECF=%RP%\org.eclipse.ecf_0.3.2\ecf.jar
+set UI=%RP%\org.eclipse.ecf.ui_0.3.2\ui.jar
+set SDO=%RP%\org.eclipse.ecf.sdo_0.3.2\ecf.sdo.jar
+set DS=%RP%\org.eclipse.ecf.datashare_0.3.2\datashare.jar
+set PROVIDER=%RP%\org.eclipse.ecf.provider_0.3.2\provider.jar
+set PRESENCE=%RP%\org.eclipse.ecf.presence_0.3.2\presence.jar
+set GED=%RP%\org.eclipse.ecf.example.sdo.gefeditor_0.3.2\editor.jar
+set ED=%RP%\org.eclipse.ecf.example.sdo.editor_0.3.2\editor.jar
+set LIBRARY=%RP%\org.eclipse.ecf.example.sdo.library_0.3.2\runtime\org.eclipse.ecf.example.library.jar
+set DISCOVERY=%RP%\org.eclipse.ecf.discovery_0.3.2\discovery.jar
+set HELLO=%RP%\org.eclipse.ecf.example.hello_0.3.2\hello.jar
+set COLLAB=%RP%\org.eclipse.ecf.example.collab_0.3.2\client.jar
 
 set CP="..\lib\core.jar;..\lib\runtime.jar;..\lib\osgi.jar;%ECF%;%UI%;%SDO%;%PROVIDER%;%PRESENCE%;%GED%;%ED%;%LIBRARY%;%HELLO%;%DS%;%DISCOVERY%;%COLLAB%;."
 
diff --git a/server-side/features/org.eclipse.ecf.server-feature/bin/startserver.cmd b/server-side/features/org.eclipse.ecf.server-feature/bin/startserver.cmd
index 03ec23c58..6322ba573 100644
--- a/server-side/features/org.eclipse.ecf.server-feature/bin/startserver.cmd
+++ b/server-side/features/org.eclipse.ecf.server-feature/bin/startserver.cmd
@@ -2,18 +2,18 @@ echo off
 setlocal
 cd %~dp0
 set RP=..\..\..\plugins
-set ECF=%RP%\org.eclipse.ecf_0.3.1\ecf.jar
-set UI=%RP%\org.eclipse.ecf.ui_0.3.1\ui.jar
-set SDO=%RP%\org.eclipse.ecf.sdo_0.3.1\ecf.sdo.jar
-set DS=%RP%\org.eclipse.ecf.datashare_0.3.1\datashare.jar
-set PROVIDER=%RP%\org.eclipse.ecf.provider_0.3.1\provider.jar
-set PRESENCE=%RP%\org.eclipse.ecf.presence_0.3.1\presence.jar
-set GED=%RP%\org.eclipse.ecf.example.sdo.gefeditor_0.3.1\editor.jar
-set ED=%RP%\org.eclipse.ecf.example.sdo.editor_0.3.1\editor.jar
-set LIBRARY=%RP%\org.eclipse.ecf.example.sdo.library_0.3.1\runtime\org.eclipse.ecf.example.library.jar
-set DISCOVERY=%RP%\org.eclipse.ecf.discovery_0.3.1\discovery.jar
-set HELLO=%RP%\org.eclipse.ecf.example.hello_0.3.1\hello.jar
-set COLLAB=%RP%\org.eclipse.ecf.example.collab_0.3.1\client.jar
+set ECF=%RP%\org.eclipse.ecf_0.3.2\ecf.jar
+set UI=%RP%\org.eclipse.ecf.ui_0.3.2\ui.jar
+set SDO=%RP%\org.eclipse.ecf.sdo_0.3.2\ecf.sdo.jar
+set DS=%RP%\org.eclipse.ecf.datashare_0.3.2\datashare.jar
+set PROVIDER=%RP%\org.eclipse.ecf.provider_0.3.2\provider.jar
+set PRESENCE=%RP%\org.eclipse.ecf.presence_0.3.2\presence.jar
+set GED=%RP%\org.eclipse.ecf.example.sdo.gefeditor_0.3.2\editor.jar
+set ED=%RP%\org.eclipse.ecf.example.sdo.editor_0.3.2\editor.jar
+set LIBRARY=%RP%\org.eclipse.ecf.example.sdo.library_0.3.2\runtime\org.eclipse.ecf.example.library.jar
+set DISCOVERY=%RP%\org.eclipse.ecf.discovery_0.3.2\discovery.jar
+set HELLO=%RP%\org.eclipse.ecf.example.hello_0.3.2\hello.jar
+set COLLAB=%RP%\org.eclipse.ecf.example.collab_0.3.2\client.jar
 
 set CP="..\lib\core.jar;..\lib\runtime.jar;..\lib\osgi.jar;%ECF%;%UI%;%SDO%;%PROVIDER%;%PRESENCE%;%GED%;%ED%;%LIBRARY%;%HELLO%;%DS%;%DISCOVERY%;%COLLAB%;."
 
diff --git a/server-side/features/org.eclipse.ecf.server-feature/bin/startserver.sh b/server-side/features/org.eclipse.ecf.server-feature/bin/startserver.sh
index c4d1ab25d..4c2e261b5 100644
--- a/server-side/features/org.eclipse.ecf.server-feature/bin/startserver.sh
+++ b/server-side/features/org.eclipse.ecf.server-feature/bin/startserver.sh
@@ -2,18 +2,18 @@
 #
 # Relative path for accessing plugins
 RP=../../../plugins
-ECF=${RP}/org.eclipse.ecf_0.3.1/ecf.jar
-UI=${RP}/org.eclipse.ecf.ui_0.3.1/ui.jar
-SDO=${RP}/org.eclipse.ecf.sdo_0.3.1/ecf.sdo.jar
-DS=${RP}/org.eclipse.ecf.datashare_0.3.1/datashare.jar
-PROVIDER=${RP}/org.eclipse.ecf.provider_0.3.1/provider.jar
-PRESENCE=${RP}/org.eclipse.ecf.presence_0.3.1/presence.jar
-GED=${RP}/org.eclipse.ecf.example.sdo.gefeditor_0.3.1/editor.jar
-ED=${RP}/org.eclipse.ecf.example.sdo.editor_0.3.1/editor.jar
-LIBRARY=${RP}/org.eclipse.ecf.example.sdo.library_0.3.1/runtime/org.eclipse.ecf.example.library.jar
-DISCOVERY=${RP}/org.eclipse.ecf.discovery_0.3.1/discovery.jar
-HELLO=${RP}/org.eclipse.ecf.example.hello_0.3.1/hello.jar
-COLLAB=${RP}/org.eclipse.ecf.example.collab_0.3.1/client.jar
+ECF=${RP}/org.eclipse.ecf_0.3.2/ecf.jar
+UI=${RP}/org.eclipse.ecf.ui_0.3.2/ui.jar
+SDO=${RP}/org.eclipse.ecf.sdo_0.3.2/ecf.sdo.jar
+DS=${RP}/org.eclipse.ecf.datashare_0.3.2/datashare.jar
+PROVIDER=${RP}/org.eclipse.ecf.provider_0.3.2/provider.jar
+PRESENCE=${RP}/org.eclipse.ecf.presence_0.3.2/presence.jar
+GED=${RP}/org.eclipse.ecf.example.sdo.gefeditor_0.3.2/editor.jar
+ED=${RP}/org.eclipse.ecf.example.sdo.editor_0.3.2/editor.jar
+LIBRARY=${RP}/org.eclipse.ecf.example.sdo.library_0.3.2/runtime/org.eclipse.ecf.example.library.jar
+DISCOVERY=${RP}/org.eclipse.ecf.discovery_0.3.2/discovery.jar
+HELLO=${RP}/org.eclipse.ecf.example.hello_0.3.2/hello.jar
+COLLAB=${RP}/org.eclipse.ecf.example.collab_0.3.2/client.jar
 
 CP="../lib/core.jar:../lib/runtime.jar:../lib/osgi.jar:${ECF}:${UI}:${SDO}:${PROVIDER}:${PRESENCE}:${GED}:${ED}:${LIBRARY}:${DS}:${HELLO}:${DISCOVERY}:${COLLAB}:."
 
diff --git a/server-side/features/org.eclipse.ecf.server-feature/build.properties b/server-side/features/org.eclipse.ecf.server-feature/build.properties
index a531c6cf7..6b4a1618d 100644
--- a/server-side/features/org.eclipse.ecf.server-feature/build.properties
+++ b/server-side/features/org.eclipse.ecf.server-feature/build.properties
@@ -2,3 +2,7 @@ bin.includes = bin/,\
                lib/,\
                feature.xml,\
                conf/
+src.includes = conf/,\
+               feature.xml,\
+               lib/,\
+               bin/
diff --git a/server-side/features/org.eclipse.ecf.server-feature/feature.xml b/server-side/features/org.eclipse.ecf.server-feature/feature.xml
index 630fdb734..db9f63b95 100644
--- a/server-side/features/org.eclipse.ecf.server-feature/feature.xml
+++ b/server-side/features/org.eclipse.ecf.server-feature/feature.xml
@@ -2,7 +2,7 @@
 <feature
       id="org.eclipse.ecf.serverfeature"
       label="ECF Server"
-      version="0.3.1"
+      version="0.3.2"
       provider-name="Eclipse.org">
 
    <description url="http://www.eclipse.org/ecf">
@@ -42,22 +42,6 @@ otherwise indicated below, the terms and conditions of the EPL
 still apply to any source code in the Content.
    </license>
 
-   <includes
-         id="org.eclipse.ecf.collab"
-         version="0.3.1"/>
-
-   <includes
-         id="org.eclipse.ecf.core"
-         version="0.3.1"/>
-
-   <includes
-         id="org.eclipse.ecf.datashare_feature"
-         version="0.3.1"/>
-
-   <includes
-         id="org.eclipse.ecf.graphshare"
-         version="0.3.1"/>
-
    <requires>
       <import plugin="org.eclipse.osgi"/>
       <import plugin="org.eclipse.core.runtime"/>
@@ -66,6 +50,7 @@ still apply to any source code in the Content.
       <import plugin="org.eclipse.core.resources"/>
       <import plugin="org.eclipse.help.base"/>
       <import plugin="org.eclipse.jface.text"/>
+      <import plugin="org.eclipse.ui.forms"/>
       <import plugin="org.eclipse.emf.ecore"/>
       <import plugin="org.eclipse.emf.commonj.sdo"/>
       <import plugin="org.eclipse.emf.ecore.sdo"/>
@@ -73,7 +58,84 @@ still apply to any source code in the Content.
       <import plugin="org.eclipse.gef"/>
       <import plugin="org.eclipse.ui.views"/>
       <import plugin="org.eclipse.ui.ide"/>
-      <import plugin="org.eclipse.ui.forms"/>
    </requires>
 
+   <plugin
+         id="org.eclipse.ecf"
+         download-size="0"
+         install-size="0"
+         version="0.0.0"/>
+
+   <plugin
+         id="org.eclipse.ecf.datashare"
+         download-size="0"
+         install-size="0"
+         version="0.0.0"/>
+
+   <plugin
+         id="org.eclipse.ecf.discovery"
+         download-size="0"
+         install-size="0"
+         version="0.0.0"/>
+
+   <plugin
+         id="org.eclipse.ecf.example.collab"
+         download-size="0"
+         install-size="0"
+         version="0.0.0"/>
+
+   <plugin
+         id="org.eclipse.ecf.example.datashare.hello"
+         download-size="0"
+         install-size="0"
+         version="0.0.0"/>
+
+   <plugin
+         id="org.eclipse.ecf.example.hello"
+         download-size="0"
+         install-size="0"
+         version="0.0.0"/>
+
+   <plugin
+         id="org.eclipse.ecf.example.library"
+         download-size="0"
+         install-size="0"
+         version="0.0.0"/>
+
+   <plugin
+         id="org.eclipse.ecf.example.sdo.editor"
+         download-size="0"
+         install-size="0"
+         version="0.0.0"/>
+
+   <plugin
+         id="org.eclipse.ecf.example.sdo.gefeditor"
+         download-size="0"
+         install-size="0"
+         version="0.0.0"/>
+
+   <plugin
+         id="org.eclipse.ecf.presence"
+         download-size="0"
+         install-size="0"
+         version="0.0.0"/>
+
+   <plugin
+         id="org.eclipse.ecf.provider"
+         download-size="0"
+         install-size="0"
+         version="0.0.0"/>
+
+   <plugin
+         id="org.eclipse.ecf.sdo"
+         download-size="0"
+         install-size="0"
+         version="0.0.0"/>
+
+   <plugin
+         id="org.eclipse.ecf.ui"
+         download-size="0"
+         install-size="0"
+         version="0.0.0"/>
+
 </feature>