Added datashare classpath to start scripts

4 files changed, 35 insertions, 29 deletions

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 d2436f89c..03ec23c58 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
@@ -5,6 +5,7 @@ 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
@@ -14,7 +15,7 @@ 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 CP="..\lib\core.jar;..\lib\runtime.jar;..\lib\osgi.jar;%ECF%;%UI%;%SDO%;%PROVIDER%;%PRESENCE%;%GED%;%ED%;%LIBRARY%;%HELLO%;%DISCOVERY%;%COLLAB%;."
+set CP="..\lib\core.jar;..\lib\runtime.jar;..\lib\osgi.jar;%ECF%;%UI%;%SDO%;%PROVIDER%;%PRESENCE%;%GED%;%ED%;%LIBRARY%;%HELLO%;%DS%;%DISCOVERY%;%COLLAB%;."
 
 set TRACE=-Dorg.eclipse.ecf.Trace=true -Dorg.eclipse.ecf.provider.Trace=true
 
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 d2436f89c..03ec23c58 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
@@ -5,6 +5,7 @@ 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
@@ -14,7 +15,7 @@ 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 CP="..\lib\core.jar;..\lib\runtime.jar;..\lib\osgi.jar;%ECF%;%UI%;%SDO%;%PROVIDER%;%PRESENCE%;%GED%;%ED%;%LIBRARY%;%HELLO%;%DISCOVERY%;%COLLAB%;."
+set CP="..\lib\core.jar;..\lib\runtime.jar;..\lib\osgi.jar;%ECF%;%UI%;%SDO%;%PROVIDER%;%PRESENCE%;%GED%;%ED%;%LIBRARY%;%HELLO%;%DS%;%DISCOVERY%;%COLLAB%;."
 
 set TRACE=-Dorg.eclipse.ecf.Trace=true -Dorg.eclipse.ecf.provider.Trace=true
 
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 20278e70e..c4d1ab25d 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
@@ -5,6 +5,7 @@ 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
@@ -14,7 +15,7 @@ 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
 
-CP="../lib/core.jar:../lib/runtime.jar:../lib/osgi.jar:${ECF}:${UI}:${SDO}:${PROVIDER}:${PRESENCE}:${GED}:${ED}:${LIBRARY}:${HELLO}:${DISCOVERY}:${COLLAB}:."
+CP="../lib/core.jar:../lib/runtime.jar:../lib/osgi.jar:${ECF}:${UI}:${SDO}:${PROVIDER}:${PRESENCE}:${GED}:${ED}:${LIBRARY}:${DS}:${HELLO}:${DISCOVERY}:${COLLAB}:."
 
 TRACE="-Dorg.eclipse.ecf.Trace=true -Dorg.eclipse.ecf.provider.Trace=true" 
 
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 59f551900..87ece4987 100644
--- a/server-side/features/org.eclipse.ecf.server-feature/feature.xml
+++ b/server-side/features/org.eclipse.ecf.server-feature/feature.xml
@@ -12,43 +12,34 @@
    <copyright url="http://www.eclipse.org/ecf">
       /*******************************************************************************
 * 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
+* 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
 ******************************************************************************/
    </copyright>
 
    <license url="http://www.eclipse.org/ecf">
-      &lt;h2&gt;About This Content&lt;/h2&gt;
-
-&lt;p&gt;
-February 24, 2005&lt;/p&gt; 
-&lt;h3&gt;License&lt;/h3&gt;
-
-&lt;p&gt;
+      About This Content
+February 24, 2005
+License
 The Eclipse Foundation makes available all content in this plug-in
-(&amp;quot;Content&amp;quot;).  Unless otherwise indicated below, the
+&quot;Content&quot;.  Unless otherwise indicated below, the
 Content is provided to you under the terms and conditions of
-the
-Eclipse Public License Version 1.0 (&amp;quot;EPL&amp;quot;).  A copy
-of the EPL is available at &lt;a href=&quot;http://www.eclipse.org/legal/epl-v10.html&quot;&gt;http://www.eclipse.org/legal/epl-v10.html&lt;/a&gt;.
-For purposes of the EPL, &amp;quot;Program&amp;quot; will mean the Content.&lt;/p&gt;
-
-&lt;p&gt;
+the Eclipse Public License Version 1.0 &quot;EPL&quot;.  A copy
+of the EPL is available at http://www.eclipse.org/legal/epl-v10.html.
+For purposes of the EPL, &quot;Program&quot; will mean the Content.
 If you did not receive this Content directly from the Eclipse
 Foundation, the Content is being redistributed by another party
-(&amp;quot;Redistributor&amp;quot;) and different terms and conditions
-may
-apply to your use of any object code in the Content.  Check the
+&quot;Redistributor&quot; and different terms and conditions
+may apply to your use of any object code in the Content.  Check
+the
 Redistributor&apos;s license that was provided with the Content. 
 If no such license exists, contact the Redistributor.  Unless
-otherwise
-indicated below, the terms and conditions of the EPL still apply
-to any source code in the Content.&lt;/p&gt;
+otherwise indicated below, the terms and conditions of the EPL
+still apply to any source code in the Content.
    </license>
 
    <plugin
@@ -104,7 +95,7 @@ to any source code in the Content.&lt;/p&gt;
          download-size="0"
          install-size="0"
          version="0.0.0"
-         unpack="false" />
+         unpack="false"/>
 
    <plugin
          id="org.eclipse.ecf.sdo"
@@ -118,4 +109,16 @@ to any source code in the Content.&lt;/p&gt;
          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.example.datashare.hello"
+         download-size="0"
+         install-size="0"
+         version="0.0.0"/>
+
 </feature>