summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorguest <guest@f059d3a0-6783-47b7-97ff-1fe0bbf25129>2008-10-12 20:35:49 +0000
committerguest <guest@f059d3a0-6783-47b7-97ff-1fe0bbf25129>2008-10-12 20:35:49 +0000
commit767a0b11171c8ef9cf32c5d35fcf99bb33d3e300 (patch)
tree71cf4b5e8a9d29842f65db26ab6be82ad376d5c3
parent6ce02d206803e03fb6869e31484ea2c4f79975f6 (diff)
script modificaitons for real network
git-svn-id: http://manut.eu/svn/yalp/trunk@10 f059d3a0-6783-47b7-97ff-1fe0bbf25129
-rw-r--r--ServerSettings.xml12
-rw-r--r--bashrc_example2
-rwxr-xr-xclient.sh2
-rwxr-xr-xidlj.sh2
-rwxr-xr-xserver.sh4
-rwxr-xr-xsrc/YalpServer/InitServer.java3
6 files changed, 13 insertions, 12 deletions
diff --git a/ServerSettings.xml b/ServerSettings.xml
index fd0f623..11dd45d 100644
--- a/ServerSettings.xml
+++ b/ServerSettings.xml
@@ -1,6 +1,6 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<java version="1.6.0_07" class="java.beans.XMLDecoder">
- <string>jdbc:postgresql://localhost:5432/yalp</string>
- <string>huhu</string>
- <string>yalp</string>
-</java>
+<?xml version="1.0" encoding="UTF-8"?>
+<java version="1.6.0_0" class="java.beans.XMLDecoder">
+ <string>jdbc:postgresql://localhost:5432/yalp</string>
+ <string>huhu</string>
+ <string>yalp</string>
+</java>
diff --git a/bashrc_example b/bashrc_example
new file mode 100644
index 0000000..888dcff
--- /dev/null
+++ b/bashrc_example
@@ -0,0 +1,2 @@
+export CLASSPATH="/home/manut/Projects/yalp/dev/lib/yajil-0.3.3.jar:/home/manut/Projects/yalp/dev/lib/swt.jar:/home/manut/Projects/yalp/dev/lib/postgresql-8.1-404.jdbc3.jar:/home/manut/Projects/yalp/dev/lib/jarbundler-1.4.jar:/home/manut/Projects/yalp/dev/lib/id3-1.6.0d9.jar:/home/manut/Projects/yalp/dev/lib/log4j-1.2.15.jar:/home/manut/Projects/yalp/dev/lib/commons-net-1.4.1.jar"
+
diff --git a/client.sh b/client.sh
index e1d2711..ec5be80 100755
--- a/client.sh
+++ b/client.sh
@@ -1 +1 @@
-java -Djava.library.path=./lib -jar yalpSWTClient.jar -ORBInitialPort 1050 -ORBInitialHost localhost
+java -Djava.library.path=./lib -jar yalpSWTClient.jar -ORBInitialPort 1050 -ORBInitialHost 10.0.3.20 -ORBInitRef NameService=corbaloc:iiop:10.0.3.20:1050/NameService
diff --git a/idlj.sh b/idlj.sh
index 4344b70..df8fd5e 100755
--- a/idlj.sh
+++ b/idlj.sh
@@ -1,3 +1,3 @@
#!/bin/bash
-/opt/sun-jdk-1.6.0.07/bin/idlj -fall $@
+/usr/bin/idlj -fall $@
#/opt/ibm-java-i386-60/bin/idlj -fall $@
diff --git a/server.sh b/server.sh
index 585302a..e070402 100755
--- a/server.sh
+++ b/server.sh
@@ -1,4 +1,4 @@
-/opt/sun-jdk-1.6.0.07/bin/orbd -ORBInitialPort 1050 &
+/usr/bin/orbd -ORBInitialPort 1050 &
sleep 2
-java -Djava.library.path=./lib -jar yalpServer.jar -ORBInitialPort 1050 -ORBInitialHost localhost
+java -Djava.library.path=./lib -jar yalpServer.jar -ORBInitialPort 1050 -ORBInitialHost 10.0.3.20
killall -9 orbd
diff --git a/src/YalpServer/InitServer.java b/src/YalpServer/InitServer.java
index 8ad17cf..387d23a 100755
--- a/src/YalpServer/InitServer.java
+++ b/src/YalpServer/InitServer.java
@@ -6,7 +6,6 @@
* http://www.eclipse.org/legal/cpl-v10.html
*
* Contributors: Manuel Traut and Volker Dahnke
- *
*/
package YalpServer;
@@ -80,7 +79,7 @@ public class InitServer {
/* t.b.d. error handling */
System.out.println("couldn't resolve hostname");
}
-
+ System.out.println("host: " + serverIP);
/* bind ServerControl to ORB and NamingService */
this.orb = ORB.init(orbArgs, null);