Merge branch 'master' of ssh://git.openslx.org/openslx-ng/tutor-module

Conflicts:
	Dozentenmodul/bin/gui/image/FTPCreateUploader_GUI$6.class
	Dozentenmodul/bin/gui/image/FTPCreateUploader_GUI$7.class
	Dozentenmodul/bin/gui/image/FTPCreateUploader_GUI$8.class
	Dozentenmodul/bin/gui/image/FTPCreateUploader_GUI.class
	Dozentenmodul/bin/gui/image/FTPEditUploader_GUI$1.class
	Dozentenmodul/bin/gui/image/FTPEditUploader_GUI$2.class
	Dozentenmodul/bin/gui/image/FTPEditUploader_GUI$3.class
	Dozentenmodul/bin/gui/image/FTPEditUploader_GUI$4.class
	Dozentenmodul/bin/gui/image/FTPEditUploader_GUI$5.class
	Dozentenmodul/bin/gui/image/FTPEditUploader_GUI$6.class
	Dozentenmodul/bin/gui/image/FTPEditUploader_GUI.class
	Dozentenmodul/bin/gui/lecture/EditLectureAllgemein_GUI$3.class
	Dozentenmodul/bin/gui/lecture/EditLectureAllgemein_GUI$4.class
	Dozentenmodul/bin/gui/lecture/EditLectureAllgemein_GUI.class

1 files changed, 39 insertions, 0 deletions

diff --git a/Dozentenmodulserver/src/models/Configuration.java b/Dozentenmodulserver/src/models/Configuration.java
new file mode 100644
index 00000000..1e616466
--- /dev/null
+++ b/Dozentenmodulserver/src/models/Configuration.java
@@ -0,0 +1,39 @@
+package models;
+
+public class Configuration {
+	
+	private String absolute_path;
+	private String sql_connection;
+	private String sql_user;
+	private String sql_pass;
+	
+	public static Configuration config =new Configuration();
+	
+	public String getAbsolute_path() {
+		return absolute_path;
+	}
+	public void setAbsolute_path(String absolute_path) {
+		this.absolute_path = absolute_path;
+	}
+	public String getSql_connection() {
+		return sql_connection;
+	}
+	public void setSql_connection(String sql_connection) {
+		this.sql_connection = sql_connection;
+	}
+	public String getSql_user() {
+		return sql_user;
+	}
+	public void setSql_user(String sql_user) {
+		this.sql_user = sql_user;
+	}
+	public String getSql_pass() {
+		return sql_pass;
+	}
+	public void setSql_pass(String sql_pass) {
+		this.sql_pass = sql_pass;
+	}
+	
+	
+
+}