From c62ff958823168d7622b397609220db8b67fa731 Mon Sep 17 00:00:00 2001 From: Zippy Date: Sun, 27 Dec 2009 13:46:05 +0100 Subject: revert doofer commit Signed-off-by: Zippy --- src/YalpAuth/YalpPGSqlAuth/DatabaseDefines.java | 130 ++++++++++++------------ 1 file changed, 65 insertions(+), 65 deletions(-) (limited to 'src/YalpAuth') diff --git a/src/YalpAuth/YalpPGSqlAuth/DatabaseDefines.java b/src/YalpAuth/YalpPGSqlAuth/DatabaseDefines.java index 5ff92c7..70c00d7 100644 --- a/src/YalpAuth/YalpPGSqlAuth/DatabaseDefines.java +++ b/src/YalpAuth/YalpPGSqlAuth/DatabaseDefines.java @@ -1,65 +1,65 @@ -/* - * Copyright (c) 2006 Manuel Traut and Volker Dahnke - * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Common Public License v1.0 - * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/cpl-v10.html - * - * Contributors: Manuel Traut and Volker Dahnke - */ -package YalpAuth.YalpPGSqlAuth; - -/* - * Class DatabaseDefines - * - * - * - * @author Manuel Traut - * - * @version 0.1 28-08-2008
- * - */ - -public class DatabaseDefines { - - public String dbConnection="jdbc:postgresql://10.0.3.20:5432/yalp_user"; - public String dbUser="yalp"; - public String dbPasswd="huhu"; - -/* - * set string for dbConnection - * @param dbConnection - * "jdbc:postgresql://:/"; - */ - public void setDBConnection(String dbConnection){ - this.dbConnection = dbConnection; - } - -/* - * set userName for db Edit - * @param dbUser - */ - public void setDBUser(String dbUser){ - this.dbUser = dbUser; - } - -/* - * set string for db Password - * @param DBPasswd - */ - public void setDBPasswd(String DBPasswd){ - this.dbPasswd = DBPasswd; - } - - public String getDBConnection(){ - return this.dbConnection; - } - - public String getDBUser(){ - return this.dbUser; - } - - public String getDBPasswd(){ - return this.dbPasswd; - } -} +/* + * Copyright (c) 2006 Manuel Traut and Volker Dahnke + * All rights reserved. This program and the accompanying materials + * are made available under the terms of the Common Public License v1.0 + * which accompanies this distribution, and is available at + * http://www.eclipse.org/legal/cpl-v10.html + * + * Contributors: Manuel Traut and Volker Dahnke + */ +package YalpAuth.YalpPGSqlAuth; + +/* + * Class DatabaseDefines + * + * + * + * @author Manuel Traut + * + * @version 0.1 28-08-2008
+ * + */ + +public class DatabaseDefines { + + public String dbConnection="jdbc:postgresql://10.0.3.20:5432/yalp_user"; + public String dbUser="yalp"; + public String dbPasswd="huhu"; + +/* + * set string for dbConnection + * @param dbConnection + * "jdbc:postgresql://:/"; + */ + public void setDBConnection(String dbConnection){ + this.dbConnection = dbConnection; + } + +/* + * set userName for db Edit + * @param dbUser + */ + public void setDBUser(String dbUser){ + this.dbUser = dbUser; + } + +/* + * set string for db Password + * @param DBPasswd + */ + public void setDBPasswd(String DBPasswd){ + this.dbPasswd = DBPasswd; + } + + public String getDBConnection(){ + return this.dbConnection; + } + + public String getDBUser(){ + return this.dbUser; + } + + public String getDBPasswd(){ + return this.dbPasswd; + } +} -- cgit v1.2.3 From b794b9e4f98fc8ed1809953d9303b219d5aebc1d Mon Sep 17 00:00:00 2001 From: Manuel Traut Date: Sun, 27 Dec 2009 14:21:13 +0100 Subject: startup: cleanup startup scripts - remove scripts for each jar file - start-java.sh introtuced - apps can now be started by e.g. ./start-java.sh yalpPGSqlAuth.jar Signed-off-by: Manuel Traut --- auth.sh | 1 - client.sh | 7 ------- input.sh | 1 - output.sh | 1 - server.policy | 1 + server.sh | 7 +++++-- src/YalpAuth/YalpPGSqlAuth/YalpPGSqlAuth.java | 2 +- start-java.sh | 8 ++++++++ 8 files changed, 15 insertions(+), 13 deletions(-) delete mode 100755 auth.sh delete mode 100755 client.sh delete mode 100755 input.sh delete mode 100755 output.sh create mode 100755 start-java.sh (limited to 'src/YalpAuth') diff --git a/auth.sh b/auth.sh deleted file mode 100755 index dd0fe2f..0000000 --- a/auth.sh +++ /dev/null @@ -1 +0,0 @@ -java -Djava.library.path=./lib -jar yalpPGSqlAuth.jar -ORBInitialPort 1050 -ORBInitialHost localhost diff --git a/client.sh b/client.sh deleted file mode 100755 index e8adf20..0000000 --- a/client.sh +++ /dev/null @@ -1,7 +0,0 @@ -export LD_LIBRARY_PATH=/usr/lib/jni -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/input.sh b/input.sh deleted file mode 100755 index b77419f..0000000 --- a/input.sh +++ /dev/null @@ -1 +0,0 @@ -java -Djava.library.path=./lib -jar yalpPGSqlInput.jar -ORBInitialPort 1050 -ORBInitialHost localhost diff --git a/output.sh b/output.sh deleted file mode 100755 index cdad4fd..0000000 --- a/output.sh +++ /dev/null @@ -1 +0,0 @@ -java -Djava.library.path=./lib -jar yalpVlcTelnetOutput.jar -ORBInitialPort 1050 -ORBInitialHost localhost diff --git a/server.policy b/server.policy index e07e45d..a7bb177 100644 --- a/server.policy +++ b/server.policy @@ -3,6 +3,7 @@ grant { permission java.io.FilePermission "C:\\Programme\\VideoLAN\\VLC\\vlc","execute"; permission java.io.FilePermission "/Applications/VLC.app/Contents/MacOS/VLC","execute"; permission java.net.SocketPermission "*:1024-","connect,accept,resolve"; + permission java.net.SocketPermission "localhost:1050","connect,accept,resolve"; permission java.util.PropertyPermission "id3.default_language", "read"; permission java.util.PropertyPermission "id3.default_encoding", "read"; }; diff --git a/server.sh b/server.sh index bb38d65..66cd5fd 100755 --- a/server.sh +++ b/server.sh @@ -1,4 +1,7 @@ -/usr/bin/orbd -ORBInitialPort 1050 & +/usr/bin/orbd \ +-J-Djava.net.preferIPv4Stack=true \ +-J-Dorg.omg.CORBA.ORBInitialHost=127.0.0.1 \ +-ORBInitialPort 1050 -ORBInitialHost 127.0.0.1 & sleep 4 -java -Djava.library.path=./lib -jar yalpServer.jar -ORBInitialPort 1050 -ORBInitialHost localhost +./start-java.sh yalpServer.jar killall -9 orbd diff --git a/src/YalpAuth/YalpPGSqlAuth/YalpPGSqlAuth.java b/src/YalpAuth/YalpPGSqlAuth/YalpPGSqlAuth.java index 676fe3c..d497c3d 100644 --- a/src/YalpAuth/YalpPGSqlAuth/YalpPGSqlAuth.java +++ b/src/YalpAuth/YalpPGSqlAuth/YalpPGSqlAuth.java @@ -22,7 +22,7 @@ import YalpInterfaces.*; */ public class YalpPGSqlAuth { - private YalpAuthInterfaceImpl con; + private YalpAuthPluginImpl con; private DatabaseDefines config; public static void main(String[] args) diff --git a/start-java.sh b/start-java.sh new file mode 100755 index 0000000..9652578 --- /dev/null +++ b/start-java.sh @@ -0,0 +1,8 @@ +java \ +-Djava.net.preferIPv4Stack=true \ +-Dorg.omg.CORBA.ORBInitialHost=127.0.0.1 \ +-Djava.library.path=./lib \ +-jar $@ \ +-ORBInitialPort 1050 -ORBInitialHost 127.0.0.1 \ +-ORBInitRef NameService=corbaloc:iiop:127.0.0.1:1050/NameService \ +-ORBDottedDecimalAddresses 1 -- cgit v1.2.3