summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorManuel Traut <manut@vogone.traut>2009-12-30 20:25:49 +0100
committerManuel Traut <manut@vogone.traut>2009-12-30 20:25:49 +0100
commit30df095df63b3b101076f7ac64949b9f4d0481b3 (patch)
tree0eee26da0a0550bb8a5a92acb2f046491f990f0c /src
parent662d4edc187427bbabb75bad3daa3a02007f783c (diff)
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
Diffstat (limited to 'src')
-rw-r--r--src/YalpAuth/YalpPGSqlAuth/YalpPGSqlAuth.java36
1 files changed, 36 insertions, 0 deletions
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