diff options
| author | Nicole Vreden <damba@slartibartfast.traut> | 2009-12-30 19:20:54 +0100 |
|---|---|---|
| committer | Nicole Vreden <damba@slartibartfast.traut> | 2009-12-30 19:20:54 +0100 |
| commit | a02ae21955b5fbc6e1922debb514392739790628 (patch) | |
| tree | 3090475c0ec91d98ab6ec9b03e72eacce511c3d4 /server.sh | |
| parent | 97ecea2efaff1daa73492ecbc56835f985be62f3 (diff) | |
| parent | 662d4edc187427bbabb75bad3daa3a02007f783c (diff) | |
Merge branch 'damba' of ssh://mecka.net/home/git/yalp into damba
Conflicts:
src/YalpClients/EflClient/list_test.edc
src/YalpClients/EflClient/list_test_elem.py
Signed-off-by: Nicole Vreden <damba@slartibartfast.traut>
Diffstat (limited to 'server.sh')
| -rwxr-xr-x | server.sh | 7 |
1 files changed, 2 insertions, 5 deletions
@@ -1,7 +1,4 @@ -/usr/bin/orbd \ --J-Djava.net.preferIPv4Stack=true \ --J-Dorg.omg.CORBA.ORBInitialHost=127.0.0.1 \ --ORBInitialPort 1050 -ORBInitialHost 127.0.0.1 & +/usr/bin/orbd -ORBInitialPort 1050 & sleep 4 -./start-java.sh yalpServer.jar +java -Djava.library.path=./lib -jar yalpServer.jar -ORBInitialPort 1050 -ORBInitialHost localhost killall -9 orbd |