made yalp ubuntu compatiblemaster

git-svn-id: http://manut.eu/svn/yalp/trunk@18 f059d3a0-6783-47b7-97ff-1fe0bbf25129

8 files changed, 14 insertions, 8 deletions

diff --git a/ClientConfiguration.xml b/ClientConfiguration.xml
index fef3b6b..1cfa4c1 100644
--- a/ClientConfiguration.xml
+++ b/ClientConfiguration.xml
@@ -3,5 +3,5 @@
  <string>127.0.0.1</string>
  <int>5002</int>
  <int>5001</int>
- <string>&quot;/usr/bin/vlc&quot;</string>
+ <string>&quot;/usr/bin/vlc&quot;;</string>
 </java>
diff --git a/build.sh b/build.sh
new file mode 100755
index 0000000..22a7030
--- /dev/null
+++ b/build.sh
@@ -0,0 +1 @@
+CLASSPATH=./lib/log4j-1.2.15.jar:./lib/commons-net-1.4.1.jar:./lib/postgresql-8.1-404.jdbc3.jar:./lib/yajil-0.3.3.jar:/usr/share/java/swt.jar ant $@
diff --git a/build.xml b/build.xml
index abe42b2..02f682f 100644
--- a/build.xml
+++ b/build.xml
@@ -25,7 +25,7 @@
 

 	<property name="log4jLibs" value="lib/log4j-1.2.15.jar"/>

 	<property name="vlctelnetLibs" value="lib/commons-net-1.4.1.jar"/>

-	<property name="swtLibs" value="/usr/share/swt-3/lib/swt.jar /usr/lib/java/swt.jar"/>

+	<property name="swtLibs" value="/usr/share/swt-3/lib/swt.jar /usr/lib/java/swt.jar /usr/share/java/swt.jar"/>

 	<property name="indexerLibs" value="lib/yajil-0.3.3.jar"/>

 	<property name="dbLibs" value="lib/postgresql-8.1-404.jdbc3.jar"/>

 

diff --git a/client.policy b/client.policy
index 9b5a629..0a0cdcc 100644
--- a/client.policy
+++ b/client.policy
@@ -6,8 +6,8 @@ grant {
 	

 	permission java.util.PropertyPermission "org.eclipse.swt.internal.carbon.smallFonts", "read";

 	permission java.util.PropertyPermission "org.eclipse.swt.internal.carbon.noFocusRing", "read";

-	permission java.lang.RuntimePermission "loadLibrary.swt-gtk-3139", "read";

-	permission java.lang.RuntimePermission "loadLibrary.swt-pi-gtk-3139", "read";

+	permission java.lang.RuntimePermission "loadLibrary.swt-gtk-3448", "read";

+	permission java.lang.RuntimePermission "loadLibrary.swt-pi-gtk-3448", "read";

 	permission java.lang.RuntimePermission "loadLibrary.swt-pi-gtk", "read";

 	permission java.lang.RuntimePermission "loadLibrary.swt-pi-carbon","read";

 	permission java.lang.RuntimePermission "loadLibrary.swt-pi-carbon-3139" ,"read";

diff --git a/client.sh b/client.sh
index 7766aee..e8adf20 100755
--- a/client.sh
+++ b/client.sh
@@ -1,2 +1,7 @@
 export LD_LIBRARY_PATH=/usr/lib/jni
-java -Dswt.library.path=/usr/lib/java -jar yalpSWTClient.jar -ORBInitialPort 1050 -ORBInitialHost 10.0.3.20 -ORBInitRef NameService=corbaloc:iiop:10.0.3.20:1050/NameService
+CLASSPATH=/usr/share/java/swt.jar
+java -Dswt.library.path=/usr/lib/jni \
+-Djava.library.path=/usr/share/java -jar yalpSWTClient.jar \
+-cp /usr/share/java/swt-gtk-3.4.jar \
+-ORBInitialPort 1050 -ORBInitialHost localhost \
+-ORBInitRef NameService=corbaloc:iiop:localhost:1050/NameService
diff --git a/server.sh b/server.sh
index e070402..89735a4 100755
--- a/server.sh
+++ b/server.sh
@@ -1,4 +1,4 @@
 /usr/bin/orbd -ORBInitialPort 1050 &
 sleep 2
-java -Djava.library.path=./lib -jar yalpServer.jar -ORBInitialPort 1050 -ORBInitialHost 10.0.3.20
+java -Djava.library.path=./lib -jar yalpServer.jar -ORBInitialPort 1050 -ORBInitialHost localhost
 killall -9 orbd
diff --git a/src/YalpAuth/YalpPGSqlAuth/YalpPGSqlAuth.java b/src/YalpAuth/YalpPGSqlAuth/YalpPGSqlAuth.java
index 53ddde1..bf9077f 100644
--- a/src/YalpAuth/YalpPGSqlAuth/YalpPGSqlAuth.java
+++ b/src/YalpAuth/YalpPGSqlAuth/YalpPGSqlAuth.java
@@ -12,7 +12,7 @@ package YalpAuth.YalpPGSqlAuth;
 import YalpInterfaces.*;
 
 /*
- * Class YalpPGSqlAuth 
+ * Class YalpPGSqlAuth
  *
  * <em>Implements functionality of the DBConnectionInterface</em>
  *
diff --git a/src/YalpClients/SwtClient/Model.java b/src/YalpClients/SwtClient/Model.java
index 1c2bf48..5423dc4 100755
--- a/src/YalpClients/SwtClient/Model.java
+++ b/src/YalpClients/SwtClient/Model.java
@@ -507,7 +507,7 @@ public class Model {
 		switch (this.actualStream.getAccess()){

 			case UDP:

 			*/

-				vlcCmd += " udp://@localhost:";

+				vlcCmd += " udp://@:";

 				/*

 				break;

 			case HTTP: