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 <manut@mecka.net>

Conflicts:

	src/YalpAuth/YalpPGSqlAuth/YalpPGSqlAuth.java

8 files changed, 50 insertions, 12 deletions

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 1668684..1bc4b45 100644
--- a/src/YalpAuth/YalpPGSqlAuth/YalpPGSqlAuth.java
+++ b/src/YalpAuth/YalpPGSqlAuth/YalpPGSqlAuth.java
@@ -1,3 +1,4 @@
+<<<<<<< HEAD
 /*

  * Copyright (c) 2006 Manuel Traut and Volker Dahnke

  * All rights reserved. This program and the accompanying materials

@@ -31,3 +32,38 @@ public class YalpPGSqlAuth {
 		PGSqlAuth auth = new PGSqlAuth(args);

 	}

 }

+=======
+/*
+ * 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;
+
+import YalpInterfaces.*;
+
+/*
+ * Class YalpPGSqlAuth
+ *
+ * <em>Implements functionality of the DBConnectionInterface</em>
+ *
+ * @author Volker Dahnke / Manuel Traut
+ *
+ * @version 1 02-04-2006<br>
+ */
+
+public class YalpPGSqlAuth {
+	private YalpAuthPluginImpl con;
+	private DatabaseDefines config;
+
+	public static void main(String[] args)
+	{
+		System.out.println("YalpPGSqlAuth\n");
+		PGSqlAuth auth = new PGSqlAuth(args);
+	}
+}
+>>>>>>> b794b9e... startup: cleanup startup scripts
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