8 files changed, 43 insertions, 140 deletions
diff --git a/server-side/features/org.eclipse.ecf.server-feature/bin/startjmsserver.cmd b/server-side/features/org.eclipse.ecf.server-feature/bin/startjmsserver.cmd
index 2eabde636..ef0c3a6fd 100644
--- a/server-side/features/org.eclipse.ecf.server-feature/bin/startjmsserver.cmd
+++ b/server-side/features/org.eclipse.ecf.server-feature/bin/startjmsserver.cmd
@@ -1,41 +1,56 @@
 setlocal
 cd %~dp0
 set RP=..\..\..\plugins
-set JMS=%RP%\org.eclipse.ecf.provider.jms_0.9.3
-set ECF=%RP%\org.eclipse.ecf_0.9.3\ecf.jar
-set JMSP=%JMS%\jmsprovider.jar
-set UI=%RP%\org.eclipse.ecf.ui_0.9.3\ui.jar
-set SDO=%RP%\org.eclipse.ecf.sdo_0.9.3\ecf.sdo.jar
-set DS=%RP%\org.eclipse.ecf.datashare_0.9.3\datashare.jar
-set DSP=%RP%\org.eclipse.ecf.provider.datashare_0.9.3\dsprovider.jar
-set FS=%RP%\org.eclipse.ecf.fileshare_0.9.3\fileshare.jar
-set FSP=%RP%\org.eclipse.ecf.provider.fileshare_0.9.3\fsprovider.jar
-set PROVIDER=%RP%\org.eclipse.ecf.provider_0.9.3\provider.jar
-set PRESENCE=%RP%\org.eclipse.ecf.presence_0.9.3\presence.jar
-set GED=%RP%\org.eclipse.ecf.example.sdo.gefeditor_0.9.3\editor.jar
-set ED=%RP%\org.eclipse.ecf.example.sdo.editor_0.9.3\editor.jar
-set LIBRARY=%RP%\org.eclipse.ecf.example.sdo.library_0.9.3\runtime\org.eclipse.ecf.example.library.jar
-set DISCOVERY=%RP%\org.eclipse.ecf.discovery_0.9.3\discovery.jar
-set HELLO=%RP%\org.eclipse.ecf.example.hello_0.9.3\hello.jar
-set COLLAB=%RP%\org.eclipse.ecf.example.collab_0.9.3\client.jar
-set CED=%RP%\org.eclipse.ecf.example.collab.editor_0.9.3\collabeditor.jar
-
-set JMSL=%JMS%\lib\activemq3.1M5
 
-set JMSLIB=%JMSL%\activeio-1.1.jar;%JMSL%\activemq-core-3.1-M5.jar;%JMSL%\commons-logging-1.0.3.jar;%JMSL%\concurrent-1.3.4.jar;%JMSL%\geronimo-spec-j2ee-jacc-1.0-rc4.jar;%JMSL%\geronimo-spec-j2ee-management-1.0-rc4.jar;%JMSL%\geronimo-spec-jms-1.1-rc4.jar;%JMSL%\geronimo-spec-jta-1.0.1B-rc4.jar;%JMSL%\log4j-1.2.8.jar;%JMSL%\spring-1.2.2.jar
-
-set CP="..\lib\core.jar;..\lib\runtime.jar;..\lib\osgi.jar;%JMSLIB%;%ECF%;%PROVIDER%;%PRESENCE%;%JMSP%;%DISCOVERY%;%UI%;%SDO%;%DS%;%DSP%;%FS%;%FSP%;%GED%;%ED%;%LIBRARY%;%HELLO%;%COLLAB%;%CED%;."
+rem Relative path for accessing core ECF plugins
+set CALL=%RP%\org.eclipse.ecf.call_0.9.4.jar
+set DS=%RP%\org.eclipse.ecf.datashare_0.9.4.jar
+set DISCOVERY=%RP%\org.eclipse.ecf.discovery_0.9.4.jar
+set DOC=%RP%\org.eclipse.ecf.doc_0.9.4.jar
+set FT=%RP%\org.eclipse.ecf.filetransfer_0.9.4.jar
+set IDENTITY=%RP%\org.eclipse.ecf.identity_0.9.4.jar
+set PRESENCE=%RP%\org.eclipse.ecf.presence_0.9.4.jar
+set DSP=%RP%\org.eclipse.ecf.provider.datashare_0.9.4.jar
+set FTP=%RP%\org.eclipse.ecf.provider.filetransfer_0.9.4.jar
+set IRCP=%RP%\org.eclipse.ecf.provider.irc_0.9.4.jar
+set JMDNS=%RP%\org.eclipse.ecf.provider.jmdns_0.9.4.jar
+set RSP=%RP%\org.eclipse.ecf.provider.remoteservice_0.9.4.jar
+set UIP=%RP%\org.eclipse.ecf.provider.ui_0.9.4.jar
+set XMPPP=%RP%\org.eclipse.ecf.provider.xmpp_0.9.4.jar
+set PROVIDER=%RP%\org.eclipse.ecf.provider_0.9.4.jar
+set RS=%RP%\org.eclipse.ecf.remoteservice_0.9.4.jar
+set SERVER=%RP%\org.eclipse.ecf.server_0.9.4.jar
+set SO=%RP%\org.eclipse.ecf.sharedobject_0.9.4.jar
+set UI=%RP%\org.eclipse.ecf.ui_0.9.4.jar
+set ECF=%RP%\org.eclipse.ecf_0.9.4.jar
+set SMACK=%RP%\org.jivesoftware.smack_2.2.0.jar
+rem Now all together
+set CORE="%CALL%;%DS%;%DISCOVERY%;%DOC%;%FT%;%IDENTITY%;%PRESENCE%;%DSP%;%FTP%;%IRCP%;%JMDNS%;%RSP%;%UIP%;%XMPPP%;%PROVIDER%;%RS%;%SERVER%;%SO%;%UI%;%ECF%;%SMACK%"
+
+rem examples plugins
+set CLIENTS=%RP%\org.eclipse.ecf.example.clients_0.9.4.jar
+set CED=%RP%\org.eclipse.ecf.example.collab.editor_0.9.4.jar
+set COLLAB=%RP%\org.eclipse.ecf.example.collab_0.9.4.jar
+rem now all together
+set EXAMPLES="%CLIENTS%;%CED%;%COLLAB%"
+rem Eclipse 3.2 runtime classes
+set RUNTIME="..\lib\org.eclipse.equinox.registry_3.2.100.v20061023.jar;..\lib\org.eclipse.core.runtime_3.2.100.v20061030.jar;..\lib\org.eclipse.equinox.common_3.3.0.v20061023.jar;..\lib\org.eclipse.osgi_3.3.0.v20061101.jar"
+
+set JMS=jar:%RP%\org.eclipse.ecf.provider.jms_0.9.4.jar
+set JMSL=%JMS%!lib\activemq3.1M5
 
-rem set TRACE=-Dorg.eclipse.ecf.provider.jms.Trace=true -Dorg.eclipse.ecf.provider.Trace=true
-set TRACE=-Dorg.eclipse.ecf.provider.Trace -Dorg.eclipse.ecf.Trace -Dorg.eclipse.ecf.provider.jms.Trace
+set JMSLIB=%JMSL%\activeio-1.1.jar;%JMSL%\activemq-core-3.1-M5.jar;%JMSL%\commons-logging-1.0.3.jar;%JMSL%\concurrent-1.3.4.jar;%JMSL%\geronimo-spec-j2ee-jacc-1.0-rc4.jar;%JMSL%\geronimo-spec-j2ee-management-1.0-rc4.jar;%JMSL%\geronimo-spec-jms-1.1-rc4.jar;%JMSL%\geronimo-spec-jta-1.0.1B-rc4.jar;%JMSL%\log4j-1.2.8.jar;%JMSL%\spring-1.2.2.jar
 
-set OPTIONS=%TRACE%
+set CP=".;%JMSLIB%;%RUNTIME%;%CORE%;%EXAMPLES%"
 
 set MAINCLASS=org.eclipse.ecf.provider.jms.app.ServerApplication
 set ARGS=tcp://localhost:3240/server
 
 rem Start server
-echo "Starting server with options: %OPTIONS% and args: %ARGS%"
-java -cp %CP% %OPTIONS% %MAINCLASS% %ARGS% 
+echo "Starting server"
+echo "Main class: %MAINCLASS%"
+echo "Classpath: %CP%"
+echo "Args: %ARGS%"
+java -cp %CP% %MAINCLASS% %ARGS% 
 
 endlocal
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
deleted file mode 100644
index 9aafd29c2..000000000
--- a/server-side/features/org.eclipse.ecf.server-feature/bin/startserver.cmd
+++ /dev/null
@@ -1,35 +0,0 @@
-echo off
-setlocal
-cd %~dp0
-set RP=..\..\..\plugins
-set ECF=%RP%\org.eclipse.ecf_0.9.3\ecf.jar
-set UI=%RP%\org.eclipse.ecf.ui_0.9.3\ui.jar
-set SDO=%RP%\org.eclipse.ecf.sdo_0.9.3\ecf.sdo.jar
-set DS=%RP%\org.eclipse.ecf.datashare_0.9.3\datashare.jar
-set DSP=%RP%\org.eclipse.ecf.provider.datashare_0.9.3\dsprovider.jar
-set FS=%RP%\org.eclipse.ecf.fileshare_0.9.3\fileshare.jar
-set FSP=%RP%\org.eclipse.ecf.provider.fileshare_0.9.3\fsprovider.jar
-set PROVIDER=%RP%\org.eclipse.ecf.provider_0.9.3\provider.jar
-set PRESENCE=%RP%\org.eclipse.ecf.presence_0.9.3\presence.jar
-set GED=%RP%\org.eclipse.ecf.example.sdo.gefeditor_0.9.3\editor.jar
-set ED=%RP%\org.eclipse.ecf.example.sdo.editor_0.9.3\editor.jar
-set LIBRARY=%RP%\org.eclipse.ecf.example.sdo.library_0.9.3\runtime\org.eclipse.ecf.example.library.jar
-set DISCOVERY=%RP%\org.eclipse.ecf.discovery_0.9.3\discovery.jar
-set HELLO=%RP%\org.eclipse.ecf.example.hello_0.9.3\hello.jar
-set COLLAB=%RP%\org.eclipse.ecf.example.collab_0.9.3\client.jar
-set CED=%RP%\org.eclipse.ecf.example.collab.editor_0.9.3\collabeditor.jar
-
-set CP="..\lib\core.jar;..\lib\runtime.jar;..\lib\osgi.jar;%ECF%;%UI%;%SDO%;%PROVIDER%;%PRESENCE%;%GED%;%ED%;%LIBRARY%;%HELLO%;%DS%;%DSP%;%FS%;%FsSP%;%DISCOVERY%;%COLLAB%;%CED%;."
-
-set TRACE=-Dorg.eclipse.ecf.Trace -Dorg.eclipse.ecf.provider.Trace
-
-set OPTIONS=%TRACE%
-
-set MAINCLASS=org.eclipse.ecf.provider.app.ServerApplication
-set ARGS=-c ..\conf\server.xml %*
-
-rem Start server
-echo "Starting server with options: %OPTIONS% and args: %ARGS%"
-java -cp %CP% %OPTIONS% %MAINCLASS% %ARGS% 
-
-endlocal
-\ No newline at end of file
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
deleted file mode 100644
index e1a87d418..000000000
--- a/server-side/features/org.eclipse.ecf.server-feature/bin/startserver.sh
+++ /dev/null
@@ -1,36 +0,0 @@
-# ECF Server Start Script
-#
-RP=../../../plugins
-CURRENT=`pwd`
-cd ${CURRENT}
-# Relative path for accessing plugins
-ECF=${RP}/org.eclipse.ecf_0.9.3/ecf.jar
-UI=${RP}/org.eclipse.ecf.ui_0.9.3/ui.jar
-SDO=${RP}/org.eclipse.ecf.sdo_0.9.3/ecf.sdo.jar
-DS=${RP}/org.eclipse.ecf.datashare_0.9.3/datashare.jar
-DSP=${RP}/org.eclipse.ecf.provider.datashare_0.9.3/dsprovider.jar
-FS=${RP}/org.eclipse.ecf.fileshare_0.9.3/fileshare.jar
-FSP=${RP}/org.eclipse.ecf.provider.fileshare_0.9.3/fsprovider.jar
-PROVIDER=${RP}/org.eclipse.ecf.provider_0.9.3/provider.jar
-PRESENCE=${RP}/org.eclipse.ecf.presence_0.9.3/presence.jar
-GED=${RP}/org.eclipse.ecf.example.sdo.gefeditor_0.9.3/editor.jar
-ED=${RP}/org.eclipse.ecf.example.sdo.editor_0.9.3/editor.jar
-LIBRARY=${RP}/org.eclipse.ecf.example.sdo.library_0.9.3/runtime/org.eclipse.ecf.example.library.jar
-DISCOVERY=${RP}/org.eclipse.ecf.discovery_0.9.3/discovery.jar
-HELLO=${RP}/org.eclipse.ecf.example.hello_0.9.3/hello.jar
-COLLAB=${RP}/org.eclipse.ecf.example.collab_0.9.3/client.jar
-CED=${RP}/org.eclipse.ecf.example.collab.editor_0.9.3/collabeditor.jar
-
-CP="../lib/core.jar:../lib/runtime.jar:../lib/osgi.jar:${ECF}:${UI}:${SDO}:${PROVIDER}:${PRESENCE}:${GED}:${ED}:${LIBRARY}:${DS}:${DSP}:${FS}:${FSP}:${HELLO}:${DISCOVERY}:${COLLAB}:${CED}:."
-
-TRACE="-Dorg.eclipse.ecf.Trace -Dorg.eclipse.ecf.provider.Trace" 
-
-OPTIONS=${TRACE}
-
-MAINCLASS=org.eclipse.ecf.provider.app.ServerApplication
-ARGS="-c ../conf/server.xml $*"
-
-# Start server
-echo "Starting server with options: ${OPTIONS} and args: ${ARGS}"
-# java -cp ${CP} ${OPTIONS} ${MAINCLASS} ${ARGS} 
-java -cp ${CP} ${OPTIONS} ${MAINCLASS} ${ARGS}
diff --git a/server-side/features/org.eclipse.ecf.server-feature/bin/startserverlog.sh b/server-side/features/org.eclipse.ecf.server-feature/bin/startserverlog.sh
deleted file mode 100644
index 0c6f992fb..000000000
--- a/server-side/features/org.eclipse.ecf.server-feature/bin/startserverlog.sh
+++ /dev/null
@@ -1,36 +0,0 @@
-# ECF Server Start Script
-#
-RP=../../../plugins
-CURRENT=`pwd`
-cd ${CURRENT}
-# Relative path for accessing plugins
-ECF=${RP}/org.eclipse.ecf_0.9.3/ecf.jar
-UI=${RP}/org.eclipse.ecf.ui_0.9.3/ui.jar
-SDO=${RP}/org.eclipse.ecf.sdo_0.9.3/ecf.sdo.jar
-DS=${RP}/org.eclipse.ecf.datashare_0.9.3/datashare.jar
-DSP=${RP}/org.eclipse.ecf.provider.datashare_0.9.3/dsprovider.jar
-FS=${RP}/org.eclipse.ecf.fileshare_0.9.3/fileshare.jar
-FSP=${RP}/org.eclipse.ecf.provider.fileshare_0.9.3/fsprovider.jar
-PROVIDER=${RP}/org.eclipse.ecf.provider_0.9.3/provider.jar
-PRESENCE=${RP}/org.eclipse.ecf.presence_0.9.3/presence.jar
-GED=${RP}/org.eclipse.ecf.example.sdo.gefeditor_0.9.3/editor.jar
-ED=${RP}/org.eclipse.ecf.example.sdo.editor_0.9.3/editor.jar
-LIBRARY=${RP}/org.eclipse.ecf.example.sdo.library_0.9.3/runtime/org.eclipse.ecf.example.library.jar
-DISCOVERY=${RP}/org.eclipse.ecf.discovery_0.9.3/discovery.jar
-HELLO=${RP}/org.eclipse.ecf.example.hello_0.9.3/hello.jar
-COLLAB=${RP}/org.eclipse.ecf.example.collab_0.9.3/client.jar
-CED=${RP}/org.eclipse.ecf.example.collab.editor_0.9.3/collabeditor.jar
-
-CP="../lib/core.jar:../lib/runtime.jar:../lib/osgi.jar:${ECF}:${UI}:${SDO}:${PROVIDER}:${PRESENCE}:${GED}:${ED}:${LIBRARY}:${DS}:${DSP}:${FS}:${FSP}:${HELLO}:${DISCOVERY}:${COLLAB}:${CED}:."
-
-TRACE="-Dorg.eclipse.ecf.Trace -Dorg.eclipse.ecf.provider.Trace"
-
-OPTIONS=${TRACE}
-
-MAINCLASS=org.eclipse.ecf.provider.app.ServerApplication
-ARGS="-c ../conf/server.xml $*"
-
-# Start server
-echo "Starting server with options: ${OPTIONS} and args: ${ARGS}"
-java -cp ${CP} ${OPTIONS} ${MAINCLASS} ${ARGS} > ../../../logs/3282/`date +%s`.log &
-
diff --git a/server-side/features/org.eclipse.ecf.server-feature/conf/server.xml b/server-side/features/org.eclipse.ecf.server-feature/conf/server.xml
deleted file mode 100644
index d39048dd5..000000000
--- a/server-side/features/org.eclipse.ecf.server-feature/conf/server.xml
+++ /dev/null
@@ -1,5 +0,0 @@
-<server>
-	<connector protocol="ecftcp"  hostname="localhost" port="3282" timeout="30000">
-		<group name="server"/>
-	</connector>
-</server>
-\ No newline at end of file
diff --git a/server-side/features/org.eclipse.ecf.server-feature/lib/core.jar b/server-side/features/org.eclipse.ecf.server-feature/lib/core.jar
deleted file mode 100644
index 565a925c4..000000000
--- a/server-side/features/org.eclipse.ecf.server-feature/lib/core.jar
+++ /dev/null
diff --git a/server-side/features/org.eclipse.ecf.server-feature/lib/osgi.jar b/server-side/features/org.eclipse.ecf.server-feature/lib/osgi.jar
deleted file mode 100644
index 3c02ce086..000000000
--- a/server-side/features/org.eclipse.ecf.server-feature/lib/osgi.jar
+++ /dev/null
diff --git a/server-side/features/org.eclipse.ecf.server-feature/lib/runtime.jar b/server-side/features/org.eclipse.ecf.server-feature/lib/runtime.jar
deleted file mode 100644
index eee1cd05d..000000000
--- a/server-side/features/org.eclipse.ecf.server-feature/lib/runtime.jar
+++ /dev/null