Skip to main content
aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorslewis2005-05-06 02:28:48 -0400
committerslewis2005-05-06 02:28:48 -0400
commite5c237a7f4e179b82810fe66b73ec92c6e4fd108 (patch)
treeb02c9819f0886cd9e39e05c5b09e008196aa1cd3 /server-side/features
parent28600909db1d8a643d42dfbd3321b3722e68ad0f (diff)
downloadorg.eclipse.ecf-e5c237a7f4e179b82810fe66b73ec92c6e4fd108.tar.gz
org.eclipse.ecf-e5c237a7f4e179b82810fe66b73ec92c6e4fd108.tar.xz
org.eclipse.ecf-e5c237a7f4e179b82810fe66b73ec92c6e4fd108.zip
Added code for parsing xml config file. See -c param to ServerApplication class in org.eclipse.ecf.provider project
Diffstat (limited to 'server-side/features')
-rw-r--r--server-side/features/org.eclipse.ecf.server-feature/bin/startserver.bat2
-rw-r--r--server-side/features/org.eclipse.ecf.server-feature/bin/startserver.cmd2
-rw-r--r--server-side/features/org.eclipse.ecf.server-feature/bin/startserver.sh2
-rw-r--r--server-side/features/org.eclipse.ecf.server-feature/build.properties3
-rw-r--r--server-side/features/org.eclipse.ecf.server-feature/conf/server.xml5
5 files changed, 10 insertions, 4 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 bb13f17a4..fe013e17f 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
@@ -20,7 +20,7 @@ set TRACE=-Dorg.eclipse.ecf.Trace=true -Dorg.eclipse.ecf.provider.Trace=true
set OPTIONS=
set MAINCLASS=org.eclipse.ecf.provider.app.ServerApplication
-set ARGS=%*
+set ARGS=-c ..\conf\server.xml %*
rem Start server
echo "Starting server with options: %OPTIONS% and args: %ARGS%"
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 bb13f17a4..fe013e17f 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
@@ -20,7 +20,7 @@ set TRACE=-Dorg.eclipse.ecf.Trace=true -Dorg.eclipse.ecf.provider.Trace=true
set OPTIONS=
set MAINCLASS=org.eclipse.ecf.provider.app.ServerApplication
-set ARGS=%*
+set ARGS=-c ..\conf\server.xml %*
rem Start server
echo "Starting server with options: %OPTIONS% and args: %ARGS%"
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 8e68dc565..1ea7d81f0 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
@@ -20,7 +20,7 @@ TRACE="-Dorg.eclipse.ecf.Trace=true -Dorg.eclipse.ecf.provider.Trace=true"
OPTIONS=
MAINCLASS=org.eclipse.ecf.provider.app.ServerApplication
-ARGS=$*
+ARGS=-c ../conf/server.xml $*
# Start server
echo "Starting server with options: ${OPTIONS} and args: ${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
index 842227899..a531c6cf7 100644
--- a/server-side/features/org.eclipse.ecf.server-feature/build.properties
+++ b/server-side/features/org.eclipse.ecf.server-feature/build.properties
@@ -1,3 +1,4 @@
bin.includes = bin/,\
lib/,\
- feature.xml
+ feature.xml,\
+ conf/
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..61399a028
--- /dev/null
+++ b/server-side/features/org.eclipse.ecf.server-feature/conf/server.xml
@@ -0,0 +1,5 @@
+<server>
+ <connector protocol="ecftcp" hostname="localhost" port="3282" timeout="10000">
+ <group name="server"/>
+ </connector>
+</server> \ No newline at end of file

Back to the top