From c8c9c454444e0d44b31ec066b54a5ec4e10d212f Mon Sep 17 00:00:00 2001 From: Markus Alexander Kuppe Date: Wed, 13 Oct 2010 19:22:04 +0200 Subject: RESOLVED - bug 327683: [releng] Align feature project names with .project and feature.xmls --- .../org.eclipse.ecf.server-feature/.project | 17 ------ .../org.eclipse.ecf.server-feature/about.html | 28 ---------- .../bin/startjmsserver.cmd | 56 -------------------- .../bin/startserver.cmd | 52 ------------------ .../bin/startserver.sh | 53 ------------------- .../build.properties | 10 ---- .../org.eclipse.ecf.server-feature/conf/server.xml | 5 -- .../org.eclipse.ecf.server-feature/feature.xml | 58 --------------------- .../org.eclipse.core.runtime_3.2.100.v20061030.jar | Bin 73664 -> 0 bytes .../org.eclipse.equinox.common_3.3.0.v20061023.jar | Bin 82025 -> 0 bytes ....eclipse.equinox.registry_3.2.100.v20061023.jar | Bin 150717 -> 0 bytes .../lib/org.eclipse.osgi_3.3.0.v20061101.jar | Bin 860791 -> 0 bytes .../org.eclipse.ecf.server.feature/.project | 17 ++++++ .../org.eclipse.ecf.server.feature/about.html | 28 ++++++++++ .../bin/startjmsserver.cmd | 56 ++++++++++++++++++++ .../bin/startserver.cmd | 52 ++++++++++++++++++ .../bin/startserver.sh | 53 +++++++++++++++++++ .../build.properties | 10 ++++ .../org.eclipse.ecf.server.feature/conf/server.xml | 5 ++ .../org.eclipse.ecf.server.feature/feature.xml | 58 +++++++++++++++++++++ .../org.eclipse.core.runtime_3.2.100.v20061030.jar | Bin 0 -> 73664 bytes .../org.eclipse.equinox.common_3.3.0.v20061023.jar | Bin 0 -> 82025 bytes ....eclipse.equinox.registry_3.2.100.v20061023.jar | Bin 0 -> 150717 bytes .../lib/org.eclipse.osgi_3.3.0.v20061101.jar | Bin 0 -> 860791 bytes 24 files changed, 279 insertions(+), 279 deletions(-) delete mode 100644 server-side/features/org.eclipse.ecf.server-feature/.project delete mode 100644 server-side/features/org.eclipse.ecf.server-feature/about.html delete mode 100644 server-side/features/org.eclipse.ecf.server-feature/bin/startjmsserver.cmd delete mode 100644 server-side/features/org.eclipse.ecf.server-feature/bin/startserver.cmd delete mode 100644 server-side/features/org.eclipse.ecf.server-feature/bin/startserver.sh delete mode 100644 server-side/features/org.eclipse.ecf.server-feature/build.properties delete mode 100644 server-side/features/org.eclipse.ecf.server-feature/conf/server.xml delete mode 100644 server-side/features/org.eclipse.ecf.server-feature/feature.xml delete mode 100644 server-side/features/org.eclipse.ecf.server-feature/lib/org.eclipse.core.runtime_3.2.100.v20061030.jar delete mode 100644 server-side/features/org.eclipse.ecf.server-feature/lib/org.eclipse.equinox.common_3.3.0.v20061023.jar delete mode 100644 server-side/features/org.eclipse.ecf.server-feature/lib/org.eclipse.equinox.registry_3.2.100.v20061023.jar delete mode 100644 server-side/features/org.eclipse.ecf.server-feature/lib/org.eclipse.osgi_3.3.0.v20061101.jar create mode 100644 server-side/features/org.eclipse.ecf.server.feature/.project create mode 100644 server-side/features/org.eclipse.ecf.server.feature/about.html create mode 100644 server-side/features/org.eclipse.ecf.server.feature/bin/startjmsserver.cmd create mode 100644 server-side/features/org.eclipse.ecf.server.feature/bin/startserver.cmd create mode 100644 server-side/features/org.eclipse.ecf.server.feature/bin/startserver.sh create mode 100644 server-side/features/org.eclipse.ecf.server.feature/build.properties create mode 100644 server-side/features/org.eclipse.ecf.server.feature/conf/server.xml create mode 100644 server-side/features/org.eclipse.ecf.server.feature/feature.xml create mode 100644 server-side/features/org.eclipse.ecf.server.feature/lib/org.eclipse.core.runtime_3.2.100.v20061030.jar create mode 100644 server-side/features/org.eclipse.ecf.server.feature/lib/org.eclipse.equinox.common_3.3.0.v20061023.jar create mode 100644 server-side/features/org.eclipse.ecf.server.feature/lib/org.eclipse.equinox.registry_3.2.100.v20061023.jar create mode 100644 server-side/features/org.eclipse.ecf.server.feature/lib/org.eclipse.osgi_3.3.0.v20061101.jar (limited to 'server-side') diff --git a/server-side/features/org.eclipse.ecf.server-feature/.project b/server-side/features/org.eclipse.ecf.server-feature/.project deleted file mode 100644 index 40faef979..000000000 --- a/server-side/features/org.eclipse.ecf.server-feature/.project +++ /dev/null @@ -1,17 +0,0 @@ - - - org.eclipse.ecf.server-feature - - - - - - org.eclipse.pde.FeatureBuilder - - - - - - org.eclipse.pde.FeatureNature - - diff --git a/server-side/features/org.eclipse.ecf.server-feature/about.html b/server-side/features/org.eclipse.ecf.server-feature/about.html deleted file mode 100644 index 4c79781a5..000000000 --- a/server-side/features/org.eclipse.ecf.server-feature/about.html +++ /dev/null @@ -1,28 +0,0 @@ - - - - -About - - -

About This Content

- -

June 25, 2008

-

License

- -

The Eclipse Foundation makes available all content in this plug-in ("Content"). Unless otherwise -indicated below, the Content is provided to you under the terms and conditions of the -Eclipse Public License Version 1.0 ("EPL"). A copy of the EPL is available -at http://www.eclipse.org/legal/epl-v10.html. -For purposes of the EPL, "Program" will mean the Content.

- -

If you did not receive this Content directly from the Eclipse Foundation, the Content is -being redistributed by another party ("Redistributor") and different terms and conditions may -apply to your use of any object code in the Content. Check the Redistributor'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 -and such source code may be obtained at http://www.eclipse.org.

- - - \ No newline at end of file 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 deleted file mode 100644 index ef0c3a6fd..000000000 --- a/server-side/features/org.eclipse.ecf.server-feature/bin/startjmsserver.cmd +++ /dev/null @@ -1,56 +0,0 @@ -setlocal -cd %~dp0 -set RP=..\..\..\plugins - -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 - -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=".;%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" -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 92ac25793..000000000 --- a/server-side/features/org.eclipse.ecf.server-feature/bin/startserver.cmd +++ /dev/null @@ -1,52 +0,0 @@ -echo off -setlocal -cd %~dp0 -set RP=..\..\..\plugins - -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" -rem Entire classpath together -set CP="%RUNTIME%;.;%CORE%;%EXAMPLES%" - -set MAINCLASS=org.eclipse.ecf.provider.app.ServerApplication -set ARGS=-c ..\conf\server.xml %* - -rem Start server -echo "Starting server" -echo "Main class: %MAINCLASS%" -echo "Classpath: %CP%" -echo "Args: %ARGS%" -rem start main class with classpath and args -java -cp %CP% %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 8b499cbe0..000000000 --- a/server-side/features/org.eclipse.ecf.server-feature/bin/startserver.sh +++ /dev/null @@ -1,53 +0,0 @@ -# ECF Server Start Script -# location of plugins relative to this script -RP=../../../plugins -CURRENT=`pwd` -cd ${CURRENT} -# Relative path for accessing core ECF plugins -CALL=${RP}/org.eclipse.ecf.call_0.9.4.jar -DS=${RP}/org.eclipse.ecf.datashare_0.9.4.jar -DISCOVERY=${RP}/org.eclipse.ecf.discovery_0.9.4.jar -DOC=${RP}/org.eclipse.ecf.doc_0.9.4.jar -FT=${RP}/org.eclipse.ecf.filetransfer_0.9.4.jar -IDENTITY=${RP}/org.eclipse.ecf.identity_0.9.4.jar -PRESENCE=${RP}/org.eclipse.ecf.presence_0.9.4.jar -DSP=${RP}/org.eclipse.ecf.provider.datashare_0.9.4.jar -FTP=${RP}/org.eclipse.ecf.provider.filetransfer_0.9.4.jar -IRCP=${RP}/org.eclipse.ecf.provider.irc_0.9.4.jar -JMDNS=${RP}/org.eclipse.ecf.provider.jmdns_0.9.4.jar -RSP=${RP}/org.eclipse.ecf.provider.remoteservice_0.9.4.jar -UIP=${RP}/org.eclipse.ecf.provider.ui_0.9.4.jar -XMPPP=${RP}/org.eclipse.ecf.provider.xmpp_0.9.4.jar -PROVIDER=${RP}/org.eclipse.ecf.provider_0.9.4.jar -RS=${RP}/org.eclipse.ecf.remoteservice_0.9.4.jar -SERVER=${RP}/org.eclipse.ecf.server_0.9.4.jar -SO=${RP}/org.eclipse.ecf.sharedobject_0.9.4.jar -UI=${RP}/org.eclipse.ecf.ui_0.9.4.jar -ECF=${RP}/org.eclipse.ecf_0.9.4.jar -SMACK=${RP}/org.jivesoftware.smack_2.2.0.jar -# Now all together -CORE="${CALL}:${DS}:${DISCOVERY}:${DOC}:${FT}:${IDENTITY}:${PRESENCE}:${DSP}:${FTP}:${IRCP}:${JMDNS}:${RSP}:${UIP}:${XMPPP}:${PROVIDER}:${RS}:${SERVER}:${SO}:${UI}:${ECF}:${SMACK}" - -# examples plugins -CLIENTS=${RP}/org.eclipse.ecf.example.clients_0.9.4.jar -CED=${RP}/org.eclipse.ecf.example.collab.editor_0.9.4.jar -COLLAB=${RP}/org.eclipse.ecf.example.collab_0.9.4.jar -# now all together -EXAMPLES="${CLIENTS}:${CED}:${COLLAB}" -# Eclipse 3.2 runtime classes -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" -# Entire classpath together -CP="${RUNTIME}:.:${CORE}:${EXAMPLES}" - -MAINCLASS=org.eclipse.ecf.provider.app.ServerApplication -ARGS="-c ../conf/server.xml $*" - -# Start server -echo "Starting server" -echo "Main class: ${MAINCLASS}" -echo "Classpath: ${CP}" -echo "Args: ${ARGS}" -# start main class with classpath and args -java -cp ${CP} ${MAINCLASS} ${ARGS} - - diff --git a/server-side/features/org.eclipse.ecf.server-feature/build.properties b/server-side/features/org.eclipse.ecf.server-feature/build.properties deleted file mode 100644 index 6379b393d..000000000 --- a/server-side/features/org.eclipse.ecf.server-feature/build.properties +++ /dev/null @@ -1,10 +0,0 @@ -bin.includes = bin/,\ - lib/,\ - feature.xml,\ - conf/,\ - about.html -src.includes = conf/,\ - feature.xml,\ - lib/,\ - bin/,\ - about.html 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 @@ - - - - - \ No newline at end of file diff --git a/server-side/features/org.eclipse.ecf.server-feature/feature.xml b/server-side/features/org.eclipse.ecf.server-feature/feature.xml deleted file mode 100644 index 69ee2e162..000000000 --- a/server-side/features/org.eclipse.ecf.server-feature/feature.xml +++ /dev/null @@ -1,58 +0,0 @@ - - - - - This feature provides a ECF reference server implementation - - - - /******************************************************************************* -* 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 -******************************************************************************/ - - - - About This Content -May 2, 2006 -License - -The Eclipse Foundation makes available all content in this plug-in -(Content). Unless otherwise indicated below, the Content -is provided to you under the terms and conditions of the Eclipse -Public License Version 1.0 (EPL). A copy of the EPL is -available at http://www.eclipse.org/legal/epl-v10.html. For -purposes of the EPL, Program will mean the Content. - -If you did not receive this Content directly from the Eclipse -Foundation, the Content is being redistributed by another party -(Redistributor) and different terms and conditions may apply -to your use of any object code in the Content. Check the -Redistributor'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 and such source code may be -obtained at http://www.eclipse.org. - - - - - - - - - diff --git a/server-side/features/org.eclipse.ecf.server-feature/lib/org.eclipse.core.runtime_3.2.100.v20061030.jar b/server-side/features/org.eclipse.ecf.server-feature/lib/org.eclipse.core.runtime_3.2.100.v20061030.jar deleted file mode 100644 index 514d615e2..000000000 Binary files a/server-side/features/org.eclipse.ecf.server-feature/lib/org.eclipse.core.runtime_3.2.100.v20061030.jar and /dev/null differ diff --git a/server-side/features/org.eclipse.ecf.server-feature/lib/org.eclipse.equinox.common_3.3.0.v20061023.jar b/server-side/features/org.eclipse.ecf.server-feature/lib/org.eclipse.equinox.common_3.3.0.v20061023.jar deleted file mode 100644 index 5015f21df..000000000 Binary files a/server-side/features/org.eclipse.ecf.server-feature/lib/org.eclipse.equinox.common_3.3.0.v20061023.jar and /dev/null differ diff --git a/server-side/features/org.eclipse.ecf.server-feature/lib/org.eclipse.equinox.registry_3.2.100.v20061023.jar b/server-side/features/org.eclipse.ecf.server-feature/lib/org.eclipse.equinox.registry_3.2.100.v20061023.jar deleted file mode 100644 index 431a91d7c..000000000 Binary files a/server-side/features/org.eclipse.ecf.server-feature/lib/org.eclipse.equinox.registry_3.2.100.v20061023.jar and /dev/null differ diff --git a/server-side/features/org.eclipse.ecf.server-feature/lib/org.eclipse.osgi_3.3.0.v20061101.jar b/server-side/features/org.eclipse.ecf.server-feature/lib/org.eclipse.osgi_3.3.0.v20061101.jar deleted file mode 100644 index f5bc23023..000000000 Binary files a/server-side/features/org.eclipse.ecf.server-feature/lib/org.eclipse.osgi_3.3.0.v20061101.jar and /dev/null differ diff --git a/server-side/features/org.eclipse.ecf.server.feature/.project b/server-side/features/org.eclipse.ecf.server.feature/.project new file mode 100644 index 000000000..45bfe2d3f --- /dev/null +++ b/server-side/features/org.eclipse.ecf.server.feature/.project @@ -0,0 +1,17 @@ + + + org.eclipse.ecf.server.feature + + + + + + org.eclipse.pde.FeatureBuilder + + + + + + org.eclipse.pde.FeatureNature + + diff --git a/server-side/features/org.eclipse.ecf.server.feature/about.html b/server-side/features/org.eclipse.ecf.server.feature/about.html new file mode 100644 index 000000000..4c79781a5 --- /dev/null +++ b/server-side/features/org.eclipse.ecf.server.feature/about.html @@ -0,0 +1,28 @@ + + + + +About + + +

About This Content

+ +

June 25, 2008

+

License

+ +

The Eclipse Foundation makes available all content in this plug-in ("Content"). Unless otherwise +indicated below, the Content is provided to you under the terms and conditions of the +Eclipse Public License Version 1.0 ("EPL"). A copy of the EPL is available +at http://www.eclipse.org/legal/epl-v10.html. +For purposes of the EPL, "Program" will mean the Content.

+ +

If you did not receive this Content directly from the Eclipse Foundation, the Content is +being redistributed by another party ("Redistributor") and different terms and conditions may +apply to your use of any object code in the Content. Check the Redistributor'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 +and such source code may be obtained at http://www.eclipse.org.

+ + + \ No newline at end of file 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 new file mode 100644 index 000000000..ef0c3a6fd --- /dev/null +++ b/server-side/features/org.eclipse.ecf.server.feature/bin/startjmsserver.cmd @@ -0,0 +1,56 @@ +setlocal +cd %~dp0 +set RP=..\..\..\plugins + +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 + +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=".;%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" +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 new file mode 100644 index 000000000..92ac25793 --- /dev/null +++ b/server-side/features/org.eclipse.ecf.server.feature/bin/startserver.cmd @@ -0,0 +1,52 @@ +echo off +setlocal +cd %~dp0 +set RP=..\..\..\plugins + +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" +rem Entire classpath together +set CP="%RUNTIME%;.;%CORE%;%EXAMPLES%" + +set MAINCLASS=org.eclipse.ecf.provider.app.ServerApplication +set ARGS=-c ..\conf\server.xml %* + +rem Start server +echo "Starting server" +echo "Main class: %MAINCLASS%" +echo "Classpath: %CP%" +echo "Args: %ARGS%" +rem start main class with classpath and args +java -cp %CP% %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 new file mode 100644 index 000000000..8b499cbe0 --- /dev/null +++ b/server-side/features/org.eclipse.ecf.server.feature/bin/startserver.sh @@ -0,0 +1,53 @@ +# ECF Server Start Script +# location of plugins relative to this script +RP=../../../plugins +CURRENT=`pwd` +cd ${CURRENT} +# Relative path for accessing core ECF plugins +CALL=${RP}/org.eclipse.ecf.call_0.9.4.jar +DS=${RP}/org.eclipse.ecf.datashare_0.9.4.jar +DISCOVERY=${RP}/org.eclipse.ecf.discovery_0.9.4.jar +DOC=${RP}/org.eclipse.ecf.doc_0.9.4.jar +FT=${RP}/org.eclipse.ecf.filetransfer_0.9.4.jar +IDENTITY=${RP}/org.eclipse.ecf.identity_0.9.4.jar +PRESENCE=${RP}/org.eclipse.ecf.presence_0.9.4.jar +DSP=${RP}/org.eclipse.ecf.provider.datashare_0.9.4.jar +FTP=${RP}/org.eclipse.ecf.provider.filetransfer_0.9.4.jar +IRCP=${RP}/org.eclipse.ecf.provider.irc_0.9.4.jar +JMDNS=${RP}/org.eclipse.ecf.provider.jmdns_0.9.4.jar +RSP=${RP}/org.eclipse.ecf.provider.remoteservice_0.9.4.jar +UIP=${RP}/org.eclipse.ecf.provider.ui_0.9.4.jar +XMPPP=${RP}/org.eclipse.ecf.provider.xmpp_0.9.4.jar +PROVIDER=${RP}/org.eclipse.ecf.provider_0.9.4.jar +RS=${RP}/org.eclipse.ecf.remoteservice_0.9.4.jar +SERVER=${RP}/org.eclipse.ecf.server_0.9.4.jar +SO=${RP}/org.eclipse.ecf.sharedobject_0.9.4.jar +UI=${RP}/org.eclipse.ecf.ui_0.9.4.jar +ECF=${RP}/org.eclipse.ecf_0.9.4.jar +SMACK=${RP}/org.jivesoftware.smack_2.2.0.jar +# Now all together +CORE="${CALL}:${DS}:${DISCOVERY}:${DOC}:${FT}:${IDENTITY}:${PRESENCE}:${DSP}:${FTP}:${IRCP}:${JMDNS}:${RSP}:${UIP}:${XMPPP}:${PROVIDER}:${RS}:${SERVER}:${SO}:${UI}:${ECF}:${SMACK}" + +# examples plugins +CLIENTS=${RP}/org.eclipse.ecf.example.clients_0.9.4.jar +CED=${RP}/org.eclipse.ecf.example.collab.editor_0.9.4.jar +COLLAB=${RP}/org.eclipse.ecf.example.collab_0.9.4.jar +# now all together +EXAMPLES="${CLIENTS}:${CED}:${COLLAB}" +# Eclipse 3.2 runtime classes +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" +# Entire classpath together +CP="${RUNTIME}:.:${CORE}:${EXAMPLES}" + +MAINCLASS=org.eclipse.ecf.provider.app.ServerApplication +ARGS="-c ../conf/server.xml $*" + +# Start server +echo "Starting server" +echo "Main class: ${MAINCLASS}" +echo "Classpath: ${CP}" +echo "Args: ${ARGS}" +# start main class with classpath and args +java -cp ${CP} ${MAINCLASS} ${ARGS} + + diff --git a/server-side/features/org.eclipse.ecf.server.feature/build.properties b/server-side/features/org.eclipse.ecf.server.feature/build.properties new file mode 100644 index 000000000..6379b393d --- /dev/null +++ b/server-side/features/org.eclipse.ecf.server.feature/build.properties @@ -0,0 +1,10 @@ +bin.includes = bin/,\ + lib/,\ + feature.xml,\ + conf/,\ + about.html +src.includes = conf/,\ + feature.xml,\ + lib/,\ + bin/,\ + about.html 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 new file mode 100644 index 000000000..d39048dd5 --- /dev/null +++ b/server-side/features/org.eclipse.ecf.server.feature/conf/server.xml @@ -0,0 +1,5 @@ + + + + + \ No newline at end of file diff --git a/server-side/features/org.eclipse.ecf.server.feature/feature.xml b/server-side/features/org.eclipse.ecf.server.feature/feature.xml new file mode 100644 index 000000000..69ee2e162 --- /dev/null +++ b/server-side/features/org.eclipse.ecf.server.feature/feature.xml @@ -0,0 +1,58 @@ + + + + + This feature provides a ECF reference server implementation + + + + /******************************************************************************* +* 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 +******************************************************************************/ + + + + About This Content +May 2, 2006 +License + +The Eclipse Foundation makes available all content in this plug-in +(Content). Unless otherwise indicated below, the Content +is provided to you under the terms and conditions of the Eclipse +Public License Version 1.0 (EPL). A copy of the EPL is +available at http://www.eclipse.org/legal/epl-v10.html. For +purposes of the EPL, Program will mean the Content. + +If you did not receive this Content directly from the Eclipse +Foundation, the Content is being redistributed by another party +(Redistributor) and different terms and conditions may apply +to your use of any object code in the Content. Check the +Redistributor'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 and such source code may be +obtained at http://www.eclipse.org. + + + + + + + + + diff --git a/server-side/features/org.eclipse.ecf.server.feature/lib/org.eclipse.core.runtime_3.2.100.v20061030.jar b/server-side/features/org.eclipse.ecf.server.feature/lib/org.eclipse.core.runtime_3.2.100.v20061030.jar new file mode 100644 index 000000000..514d615e2 Binary files /dev/null and b/server-side/features/org.eclipse.ecf.server.feature/lib/org.eclipse.core.runtime_3.2.100.v20061030.jar differ diff --git a/server-side/features/org.eclipse.ecf.server.feature/lib/org.eclipse.equinox.common_3.3.0.v20061023.jar b/server-side/features/org.eclipse.ecf.server.feature/lib/org.eclipse.equinox.common_3.3.0.v20061023.jar new file mode 100644 index 000000000..5015f21df Binary files /dev/null and b/server-side/features/org.eclipse.ecf.server.feature/lib/org.eclipse.equinox.common_3.3.0.v20061023.jar differ diff --git a/server-side/features/org.eclipse.ecf.server.feature/lib/org.eclipse.equinox.registry_3.2.100.v20061023.jar b/server-side/features/org.eclipse.ecf.server.feature/lib/org.eclipse.equinox.registry_3.2.100.v20061023.jar new file mode 100644 index 000000000..431a91d7c Binary files /dev/null and b/server-side/features/org.eclipse.ecf.server.feature/lib/org.eclipse.equinox.registry_3.2.100.v20061023.jar differ diff --git a/server-side/features/org.eclipse.ecf.server.feature/lib/org.eclipse.osgi_3.3.0.v20061101.jar b/server-side/features/org.eclipse.ecf.server.feature/lib/org.eclipse.osgi_3.3.0.v20061101.jar new file mode 100644 index 000000000..f5bc23023 Binary files /dev/null and b/server-side/features/org.eclipse.ecf.server.feature/lib/org.eclipse.osgi_3.3.0.v20061101.jar differ -- cgit v1.2.3