From f0d00719dba0f9ef37d2596ac0f378694b467fbf Mon Sep 17 00:00:00 2001 From: slewis Date: Mon, 19 Dec 2005 00:02:11 +0000 Subject: Update to manifests for 0.5.5 stable build --- .../org.eclipse.ecf.doc/META-INF/MANIFEST.MF | 2 +- .../META-INF/MANIFEST.MF | 2 +- .../META-INF/MANIFEST.MF | 2 +- .../META-INF/MANIFEST.MF | 2 +- .../org.eclipse.ecf.sdo/META-INF/MANIFEST.MF | 2 +- .../org.eclipse.ecf.datashare/META-INF/MANIFEST.MF | 2 +- .../org.eclipse.ecf.discovery/META-INF/MANIFEST.MF | 2 +- .../org.eclipse.ecf.presence/META-INF/MANIFEST.MF | 2 +- .../org.eclipse.ecf.provider/META-INF/MANIFEST.MF | 2 +- .../org.eclipse.ecf.ui/META-INF/MANIFEST.MF | 2 +- .../META-INF/MANIFEST.MF | 2 +- .../META-INF/MANIFEST.MF | 2 +- .../org.eclipse.ecf.core-feature/feature.xml | 2 +- .../bin/startserver.cmd | 24 ++++++++-------- .../bin/startserver.sh | 24 ++++++++-------- .../bin/startserverlog.sh | 32 ++++++++++++++++++++++ .../org.eclipse.ecf.server-feature/feature.xml | 2 +- 17 files changed, 70 insertions(+), 38 deletions(-) create mode 100644 server-side/features/org.eclipse.ecf.server-feature/bin/startserverlog.sh diff --git a/doc/bundles/org.eclipse.ecf.doc/META-INF/MANIFEST.MF b/doc/bundles/org.eclipse.ecf.doc/META-INF/MANIFEST.MF index 5d4a55cfd..7247c1cf1 100644 --- a/doc/bundles/org.eclipse.ecf.doc/META-INF/MANIFEST.MF +++ b/doc/bundles/org.eclipse.ecf.doc/META-INF/MANIFEST.MF @@ -2,7 +2,7 @@ Manifest-Version: 1.0 Bundle-ManifestVersion: 2 Bundle-Name: ECF Documentation Bundle-SymbolicName: org.eclipse.ecf.doc; singleton:=true -Bundle-Version: 0.5.4 +Bundle-Version: 0.5.5 Bundle-Vendor: Eclipse.org Bundle-Localization: plugin Require-Bundle: org.eclipse.help diff --git a/examples/bundles/org.eclipse.ecf.example.clients/META-INF/MANIFEST.MF b/examples/bundles/org.eclipse.ecf.example.clients/META-INF/MANIFEST.MF index 34dbdc1ec..3a1e474fe 100644 --- a/examples/bundles/org.eclipse.ecf.example.clients/META-INF/MANIFEST.MF +++ b/examples/bundles/org.eclipse.ecf.example.clients/META-INF/MANIFEST.MF @@ -2,7 +2,7 @@ Manifest-Version: 1.0 Bundle-ManifestVersion: 2 Bundle-Name: ECF Example Clients Bundle-SymbolicName: org.eclipse.ecf.example.clients;singleton:=true -Bundle-Version: 0.5.4 +Bundle-Version: 0.5.5 Bundle-Vendor: Eclipse.org Bundle-Localization: plugin Require-Bundle: org.eclipse.ecf, 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 b2a4d6fee..735173875 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.5.4 +Bundle-Version: 0.5.5 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.sdo.editor/META-INF/MANIFEST.MF b/examples/bundles/org.eclipse.ecf.example.sdo.editor/META-INF/MANIFEST.MF index e44022dda..ee6fc3a69 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.5.4 +Bundle-Version: 0.5.5 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.sdo/META-INF/MANIFEST.MF b/examples/bundles/org.eclipse.ecf.sdo/META-INF/MANIFEST.MF index ca7d98ccd..1a2d76f67 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.5.4 +Bundle-Version: 0.5.5 Bundle-ClassPath: ecf.sdo.jar Bundle-Activator: org.eclipse.ecf.sdo.SDOPlugin$EclipsePlugin Bundle-Vendor: Eclipse.org 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 fd2554bde..57d37cb98 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.5.4 +Bundle-Version: 0.5.5 Bundle-ClassPath: datashare.jar Bundle-Vendor: Eclipse.org Bundle-Localization: plugin 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 dca820d35..9dd26c842 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.5.4 +Bundle-Version: 0.5.5 Bundle-ClassPath: discovery.jar Bundle-Activator: org.eclipse.ecf.discovery.DiscoveryPlugin Bundle-Vendor: Eclipse.org 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 e6866eec5..eaf96667b 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.5.4 +Bundle-Version: 0.5.5 Bundle-ClassPath: presence.jar Bundle-Activator: org.eclipse.ecf.presence.PresencePlugin Bundle-Vendor: Eclipse.org 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 61679c06b..f1f30a95a 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.5.4 +Bundle-Version: 0.5.5 Bundle-Name: ECF Provider API Bundle-Vendor: Eclipse.org Bundle-ClassPath: provider.jar 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 2f0afaf4b..403e30949 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.5.4 +Bundle-Version: 0.5.5 Bundle-ClassPath: ui.jar Bundle-Activator: org.eclipse.ecf.ui.UiPlugin Bundle-Vendor: Eclipse.org diff --git a/providers/bundles/org.eclipse.ecf.provider.jmdns/META-INF/MANIFEST.MF b/providers/bundles/org.eclipse.ecf.provider.jmdns/META-INF/MANIFEST.MF index 7f832a379..b70fd1d12 100644 --- a/providers/bundles/org.eclipse.ecf.provider.jmdns/META-INF/MANIFEST.MF +++ b/providers/bundles/org.eclipse.ecf.provider.jmdns/META-INF/MANIFEST.MF @@ -2,7 +2,7 @@ Manifest-Version: 1.0 Bundle-ManifestVersion: 2 Bundle-Name: ECF Zeroconf Discovery Provider Bundle-SymbolicName: org.eclipse.ecf.provider.jmdns;singleton:=true -Bundle-Version: 0.5.4 +Bundle-Version: 0.5.5 Bundle-Activator: org.eclipse.ecf.provider.jmdns.JmdnsPlugin Bundle-Vendor: Eclipse.org Bundle-Localization: plugin 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 e34429371..2f9511cfd 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.5.4 +Bundle-Version: 0.5.5 Bundle-ClassPath: xmpp.jar, lib/smackx-debug.jar, lib/smack.jar, diff --git a/releng/features/org.eclipse.ecf.core-feature/feature.xml b/releng/features/org.eclipse.ecf.core-feature/feature.xml index 22b5bda2d..adcc8fdbb 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 @@ 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 7f2d13319..c2a13ba26 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.5.4\ecf.jar -set UI=%RP%\org.eclipse.ecf.ui_0.5.4\ui.jar -set SDO=%RP%\org.eclipse.ecf.sdo_0.5.4\ecf.sdo.jar -set DS=%RP%\org.eclipse.ecf.datashare_0.5.4\datashare.jar -set PROVIDER=%RP%\org.eclipse.ecf.provider_0.5.4\provider.jar -set PRESENCE=%RP%\org.eclipse.ecf.presence_0.5.4\presence.jar -set GED=%RP%\org.eclipse.ecf.example.sdo.gefeditor_0.5.4\editor.jar -set ED=%RP%\org.eclipse.ecf.example.sdo.editor_0.5.4\editor.jar -set LIBRARY=%RP%\org.eclipse.ecf.example.sdo.library_0.5.4\runtime\org.eclipse.ecf.example.library.jar -set DISCOVERY=%RP%\org.eclipse.ecf.discovery_0.5.4\discovery.jar -set HELLO=%RP%\org.eclipse.ecf.example.hello_0.5.4\hello.jar -set COLLAB=%RP%\org.eclipse.ecf.example.collab_0.5.4\client.jar +set ECF=%RP%\org.eclipse.ecf_0.5.5\ecf.jar +set UI=%RP%\org.eclipse.ecf.ui_0.5.5\ui.jar +set SDO=%RP%\org.eclipse.ecf.sdo_0.5.5\ecf.sdo.jar +set DS=%RP%\org.eclipse.ecf.datashare_0.5.5\datashare.jar +set PROVIDER=%RP%\org.eclipse.ecf.provider_0.5.5\provider.jar +set PRESENCE=%RP%\org.eclipse.ecf.presence_0.5.5\presence.jar +set GED=%RP%\org.eclipse.ecf.example.sdo.gefeditor_0.5.5\editor.jar +set ED=%RP%\org.eclipse.ecf.example.sdo.editor_0.5.5\editor.jar +set LIBRARY=%RP%\org.eclipse.ecf.example.sdo.library_0.5.5\runtime\org.eclipse.ecf.example.library.jar +set DISCOVERY=%RP%\org.eclipse.ecf.discovery_0.5.5\discovery.jar +set HELLO=%RP%\org.eclipse.ecf.example.hello_0.5.5\hello.jar +set COLLAB=%RP%\org.eclipse.ecf.example.collab_0.5.5\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 832671140..dd215032f 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 @@ -4,18 +4,18 @@ RP=../../../plugins CURRENT=`pwd` cd ${CURRENT} # Relative path for accessing plugins -ECF=${RP}/org.eclipse.ecf_0.5.4/ecf.jar -UI=${RP}/org.eclipse.ecf.ui_0.5.4/ui.jar -SDO=${RP}/org.eclipse.ecf.sdo_0.5.4/ecf.sdo.jar -DS=${RP}/org.eclipse.ecf.datashare_0.5.4/datashare.jar -PROVIDER=${RP}/org.eclipse.ecf.provider_0.5.4/provider.jar -PRESENCE=${RP}/org.eclipse.ecf.presence_0.5.4/presence.jar -GED=${RP}/org.eclipse.ecf.example.sdo.gefeditor_0.5.4/editor.jar -ED=${RP}/org.eclipse.ecf.example.sdo.editor_0.5.4/editor.jar -LIBRARY=${RP}/org.eclipse.ecf.example.sdo.library_0.5.4/runtime/org.eclipse.ecf.example.library.jar -DISCOVERY=${RP}/org.eclipse.ecf.discovery_0.5.4/discovery.jar -HELLO=${RP}/org.eclipse.ecf.example.hello_0.5.4/hello.jar -COLLAB=${RP}/org.eclipse.ecf.example.collab_0.5.4/client.jar +ECF=${RP}/org.eclipse.ecf_0.5.5/ecf.jar +UI=${RP}/org.eclipse.ecf.ui_0.5.5/ui.jar +SDO=${RP}/org.eclipse.ecf.sdo_0.5.5/ecf.sdo.jar +DS=${RP}/org.eclipse.ecf.datashare_0.5.5/datashare.jar +PROVIDER=${RP}/org.eclipse.ecf.provider_0.5.5/provider.jar +PRESENCE=${RP}/org.eclipse.ecf.presence_0.5.5/presence.jar +GED=${RP}/org.eclipse.ecf.example.sdo.gefeditor_0.5.5/editor.jar +ED=${RP}/org.eclipse.ecf.example.sdo.editor_0.5.5/editor.jar +LIBRARY=${RP}/org.eclipse.ecf.example.sdo.library_0.5.5/runtime/org.eclipse.ecf.example.library.jar +DISCOVERY=${RP}/org.eclipse.ecf.discovery_0.5.5/discovery.jar +HELLO=${RP}/org.eclipse.ecf.example.hello_0.5.5/hello.jar +COLLAB=${RP}/org.eclipse.ecf.example.collab_0.5.5/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/bin/startserverlog.sh b/server-side/features/org.eclipse.ecf.server-feature/bin/startserverlog.sh new file mode 100644 index 000000000..f283b6d37 --- /dev/null +++ b/server-side/features/org.eclipse.ecf.server-feature/bin/startserverlog.sh @@ -0,0 +1,32 @@ +# ECF Server Start Script +# +RP=../../../plugins +CURRENT=`pwd` +cd ${CURRENT} +# Relative path for accessing plugins +ECF=${RP}/org.eclipse.ecf_0.5.5/ecf.jar +UI=${RP}/org.eclipse.ecf.ui_0.5.5/ui.jar +SDO=${RP}/org.eclipse.ecf.sdo_0.5.5/ecf.sdo.jar +DS=${RP}/org.eclipse.ecf.datashare_0.5.5/datashare.jar +PROVIDER=${RP}/org.eclipse.ecf.provider_0.5.5/provider.jar +PRESENCE=${RP}/org.eclipse.ecf.presence_0.5.5/presence.jar +GED=${RP}/org.eclipse.ecf.example.sdo.gefeditor_0.5.5/editor.jar +ED=${RP}/org.eclipse.ecf.example.sdo.editor_0.5.5/editor.jar +LIBRARY=${RP}/org.eclipse.ecf.example.sdo.library_0.5.5/runtime/org.eclipse.ecf.example.library.jar +DISCOVERY=${RP}/org.eclipse.ecf.discovery_0.5.5/discovery.jar +HELLO=${RP}/org.eclipse.ecf.example.hello_0.5.5/hello.jar +COLLAB=${RP}/org.eclipse.ecf.example.collab_0.5.5/client.jar + +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" + +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/feature.xml b/server-side/features/org.eclipse.ecf.server-feature/feature.xml index bb4773c54..5cf9570a1 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 @@ -- cgit v1.2.3