Converted DMS to Maven project (1/2)

40 files changed, 152 insertions, 43 deletions

diff --git a/.gitignore b/.gitignore
index 6b468b62..edd3cec5 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1 +1,6 @@
 *.class
+.project
+.classpath
+.settings/
+target/
+bin/
diff --git a/Dozentenmodulserver/.classpath b/Dozentenmodulserver/.classpath
deleted file mode 100644
index 7c84817e..00000000
--- a/Dozentenmodulserver/.classpath
+++ /dev/null
@@ -1,13 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>

-<classpath>

-	<classpathentry kind="src" path="src"/>

-	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.7"/>

-	<classpathentry kind="lib" path="lib/mysql-connector-java-5.1.25-bin.jar"/>

-	<classpathentry kind="lib" path="lib/commons-io-2.4.jar"/>

-	<classpathentry kind="lib" path="lib/libthrift-0.9.1.jar"/>

-	<classpathentry kind="lib" path="lib/log4j-1.2.17.jar"/>

-	<classpathentry kind="lib" path="lib/slf4j-api-1.7.5.jar"/>

-	<classpathentry kind="lib" path="lib/ini4j-0.5.2-SNAPSHOT.jar"/>

-	<classpathentry kind="lib" path="lib/slf4j-simple-1.7.5.jar"/>

-	<classpathentry kind="output" path="bin"/>

-</classpath>

diff --git a/Dozentenmodulserver/.project b/Dozentenmodulserver/.project
deleted file mode 100644
index 713974ca..00000000
--- a/Dozentenmodulserver/.project
+++ /dev/null
@@ -1,17 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>

-<projectDescription>

-	<name>bwLehrpoolSuite_Server</name>

-	<comment></comment>

-	<projects>

-	</projects>

-	<buildSpec>

-		<buildCommand>

-			<name>org.eclipse.jdt.core.javabuilder</name>

-			<arguments>

-			</arguments>

-		</buildCommand>

-	</buildSpec>

-	<natures>

-		<nature>org.eclipse.jdt.core.javanature</nature>

-	</natures>

-</projectDescription>

diff --git a/Dozentenmodulserver/.settings/org.eclipse.jdt.core.prefs b/Dozentenmodulserver/.settings/org.eclipse.jdt.core.prefs
deleted file mode 100644
index 838bd9d6..00000000
--- a/Dozentenmodulserver/.settings/org.eclipse.jdt.core.prefs
+++ /dev/null
@@ -1,11 +0,0 @@
-eclipse.preferences.version=1

-org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled

-org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.7

-org.eclipse.jdt.core.compiler.codegen.unusedLocal=preserve

-org.eclipse.jdt.core.compiler.compliance=1.7

-org.eclipse.jdt.core.compiler.debug.lineNumber=generate

-org.eclipse.jdt.core.compiler.debug.localVariable=generate

-org.eclipse.jdt.core.compiler.debug.sourceFile=generate

-org.eclipse.jdt.core.compiler.problem.assertIdentifier=error

-org.eclipse.jdt.core.compiler.problem.enumIdentifier=error

-org.eclipse.jdt.core.compiler.source=1.7

diff --git a/Dozentenmodulserver/bin/server/Server$getLectureData_args$getLectureData_argsTupleScheme.class b/Dozentenmodulserver/bin/server/Server$getLectureData_args$getLectureData_argsTupleScheme.class
deleted file mode 100644
index 4c38d18d..00000000
--- a/Dozentenmodulserver/bin/server/Server$getLectureData_args$getLectureData_argsTupleScheme.class
+++ /dev/null
diff --git a/Dozentenmodulserver/bin/server/Server$getLectureData_result$_Fields.class b/Dozentenmodulserver/bin/server/Server$getLectureData_result$_Fields.class
deleted file mode 100644
index 4125b7ed..00000000
--- a/Dozentenmodulserver/bin/server/Server$getLectureData_result$_Fields.class
+++ /dev/null
diff --git a/Dozentenmodulserver/bin/server/Server$getPersonData_args$_Fields.class b/Dozentenmodulserver/bin/server/Server$getPersonData_args$_Fields.class
deleted file mode 100644
index 23fdf07e..00000000
--- a/Dozentenmodulserver/bin/server/Server$getPersonData_args$_Fields.class
+++ /dev/null
diff --git a/Dozentenmodulserver/bin/server/Server$getPersonData_result$_Fields.class b/Dozentenmodulserver/bin/server/Server$getPersonData_result$_Fields.class
deleted file mode 100644
index a0551a3c..00000000
--- a/Dozentenmodulserver/bin/server/Server$getPersonData_result$_Fields.class
+++ /dev/null
diff --git a/Dozentenmodulserver/bin/server/Server$startFileCopy_args$startFileCopy_argsTupleSchemeFactory.class b/Dozentenmodulserver/bin/server/Server$startFileCopy_args$startFileCopy_argsTupleSchemeFactory.class
deleted file mode 100644
index e8adfd24..00000000
--- a/Dozentenmodulserver/bin/server/Server$startFileCopy_args$startFileCopy_argsTupleSchemeFactory.class
+++ /dev/null
diff --git a/Dozentenmodulserver/bin/server/Server$startFileCopy_args.class b/Dozentenmodulserver/bin/server/Server$startFileCopy_args.class
deleted file mode 100644
index c6b7ce8d..00000000
--- a/Dozentenmodulserver/bin/server/Server$startFileCopy_args.class
+++ /dev/null
diff --git a/Dozentenmodulserver/bin/server/Server$startFileCopy_result$_Fields.class b/Dozentenmodulserver/bin/server/Server$startFileCopy_result$_Fields.class
deleted file mode 100644
index 0fd71044..00000000
--- a/Dozentenmodulserver/bin/server/Server$startFileCopy_result$_Fields.class
+++ /dev/null
diff --git a/Dozentenmodulserver/bin/server/Server$updateImageData_args.class b/Dozentenmodulserver/bin/server/Server$updateImageData_args.class
deleted file mode 100644
index cbbf2577..00000000
--- a/Dozentenmodulserver/bin/server/Server$updateImageData_args.class
+++ /dev/null
diff --git a/Dozentenmodulserver/bin/server/Server$updateImageData_result$_Fields.class b/Dozentenmodulserver/bin/server/Server$updateImageData_result$_Fields.class
deleted file mode 100644
index e15b535c..00000000
--- a/Dozentenmodulserver/bin/server/Server$updateImageData_result$_Fields.class
+++ /dev/null
diff --git a/Dozentenmodulserver/bin/server/Server$updateImageData_result.class b/Dozentenmodulserver/bin/server/Server$updateImageData_result.class
deleted file mode 100644
index 244244ab..00000000
--- a/Dozentenmodulserver/bin/server/Server$updateImageData_result.class
+++ /dev/null
diff --git a/Dozentenmodulserver/bin/server/Server$writeLecturedata_args$writeLecturedata_argsTupleSchemeFactory.class b/Dozentenmodulserver/bin/server/Server$writeLecturedata_args$writeLecturedata_argsTupleSchemeFactory.class
deleted file mode 100644
index d3767956..00000000
--- a/Dozentenmodulserver/bin/server/Server$writeLecturedata_args$writeLecturedata_argsTupleSchemeFactory.class
+++ /dev/null
diff --git a/Dozentenmodulserver/bin/server/Server$writeLecturedata_args.class b/Dozentenmodulserver/bin/server/Server$writeLecturedata_args.class
deleted file mode 100644
index 20d475b0..00000000
--- a/Dozentenmodulserver/bin/server/Server$writeLecturedata_args.class
+++ /dev/null
diff --git a/Dozentenmodulserver/bin/server/Server$writeLecturedata_result$_Fields.class b/Dozentenmodulserver/bin/server/Server$writeLecturedata_result$_Fields.class
deleted file mode 100644
index 96d62007..00000000
--- a/Dozentenmodulserver/bin/server/Server$writeLecturedata_result$_Fields.class
+++ /dev/null
diff --git a/Dozentenmodulserver/bin/server/Server$writeVLdata_args.class b/Dozentenmodulserver/bin/server/Server$writeVLdata_args.class
deleted file mode 100644
index c55a82b1..00000000
--- a/Dozentenmodulserver/bin/server/Server$writeVLdata_args.class
+++ /dev/null
diff --git a/Dozentenmodulserver/bin/sql/SQL.class b/Dozentenmodulserver/bin/sql/SQL.class
deleted file mode 100644
index f12de705..00000000
--- a/Dozentenmodulserver/bin/sql/SQL.class
+++ /dev/null
diff --git a/Dozentenmodulserver/bin/util/XMLCreator.class b/Dozentenmodulserver/bin/util/XMLCreator.class
deleted file mode 100644
index cfdf6004..00000000
--- a/Dozentenmodulserver/bin/util/XMLCreator.class
+++ /dev/null
diff --git a/Dozentenmodulserver/lib/commons-io-2.4.jar b/Dozentenmodulserver/lib/commons-io-2.4.jar
deleted file mode 100644
index 90035a4f..00000000
--- a/Dozentenmodulserver/lib/commons-io-2.4.jar
+++ /dev/null
diff --git a/Dozentenmodulserver/lib/ini4j-0.5.2-SNAPSHOT.jar b/Dozentenmodulserver/lib/ini4j-0.5.2-SNAPSHOT.jar
deleted file mode 100644
index 6f6877c5..00000000
--- a/Dozentenmodulserver/lib/ini4j-0.5.2-SNAPSHOT.jar
+++ /dev/null
diff --git a/Dozentenmodulserver/lib/libthrift-0.9.1.jar b/Dozentenmodulserver/lib/libthrift-0.9.1.jar
deleted file mode 100644
index ec8ab1d9..00000000
--- a/Dozentenmodulserver/lib/libthrift-0.9.1.jar
+++ /dev/null
diff --git a/Dozentenmodulserver/lib/log4j-1.2.17.jar b/Dozentenmodulserver/lib/log4j-1.2.17.jar
deleted file mode 100644
index 1d425cf7..00000000
--- a/Dozentenmodulserver/lib/log4j-1.2.17.jar
+++ /dev/null
diff --git a/Dozentenmodulserver/lib/mysql-connector-java-5.1.25-bin.jar b/Dozentenmodulserver/lib/mysql-connector-java-5.1.25-bin.jar
deleted file mode 100644
index 207232df..00000000
--- a/Dozentenmodulserver/lib/mysql-connector-java-5.1.25-bin.jar
+++ /dev/null
diff --git a/Dozentenmodulserver/lib/slf4j-api-1.7.5.jar b/Dozentenmodulserver/lib/slf4j-api-1.7.5.jar
deleted file mode 100644
index 8f004d39..00000000
--- a/Dozentenmodulserver/lib/slf4j-api-1.7.5.jar
+++ /dev/null
diff --git a/Dozentenmodulserver/lib/slf4j-simple-1.7.5.jar b/Dozentenmodulserver/lib/slf4j-simple-1.7.5.jar
deleted file mode 100644
index 9dece319..00000000
--- a/Dozentenmodulserver/lib/slf4j-simple-1.7.5.jar
+++ /dev/null
diff --git a/Dozentenmodulserver/pom.xml b/Dozentenmodulserver/pom.xml
new file mode 100644
index 00000000..dc578ff8
--- /dev/null
+++ b/Dozentenmodulserver/pom.xml
@@ -0,0 +1,107 @@
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+  xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+  <modelVersion>4.0.0</modelVersion>
+
+  <groupId>bwlehrpool</groupId>
+  <artifactId>dms</artifactId>
+  <version>1.0-SNAPSHOT</version>
+  <packaging>jar</packaging>
+
+  <name>dms</name>
+  <url>http://maven.apache.org</url>
+
+  <properties>
+    <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
+  </properties>
+
+  <build>
+    <plugins>
+      <plugin>
+        <groupId>org.apache.maven.plugins</groupId>
+        <artifactId>maven-compiler-plugin</artifactId>
+        <version>3.1</version>
+        <configuration>
+          <source>1.7</source>
+          <target>1.7</target>
+        </configuration>
+      </plugin>
+      <plugin>
+        <artifactId>maven-assembly-plugin</artifactId>
+        <executions>
+          <execution>
+            <phase>package</phase>
+            <goals>
+              <goal>single</goal>
+            </goals>
+          </execution>
+        </executions>
+        <configuration>
+          <archive>
+            <manifest>
+              <mainClass>server.StartServer</mainClass>
+            </manifest>
+          </archive>
+          <descriptorRefs>
+            <descriptorRef>jar-with-dependencies</descriptorRef>
+          </descriptorRefs>
+        </configuration>
+      </plugin>
+      <plugin>
+        <artifactId>maven-assembly-plugin</artifactId>
+        <executions>
+          <execution>
+            <phase>package</phase>
+            <goals>
+              <goal>single</goal>
+            </goals>
+          </execution>
+        </executions>
+      </plugin>
+    </plugins>
+  </build>
+
+  <dependencies>
+    <dependency>
+      <groupId>org.apache.thrift</groupId>
+      <artifactId>libthrift</artifactId>
+      <version>0.9.1</version>
+      <scope>compile</scope>
+    </dependency>
+    <dependency>
+      <groupId>mysql</groupId>
+      <artifactId>mysql-connector-java</artifactId>
+      <version>5.1.28</version>
+      <scope>compile</scope>
+    </dependency>
+    <dependency>
+      <groupId>commons-io</groupId>
+      <artifactId>commons-io</artifactId>
+      <version>2.4</version>
+      <scope>compile</scope>
+    </dependency>
+    <dependency>
+      <groupId>log4j</groupId>
+      <artifactId>log4j</artifactId>
+      <version>1.2.17</version>
+      <scope>compile</scope>
+    </dependency>
+    <dependency>
+      <groupId>org.ini4j</groupId>
+      <artifactId>ini4j</artifactId>
+      <version>0.5.2</version>
+    </dependency>
+    <dependency>
+      <groupId>org.slf4j</groupId>
+      <artifactId>slf4j-log4j12</artifactId>
+      <version>1.5.8</version>
+      <scope>compile</scope>
+    </dependency>
+    <dependency>
+      <groupId>junit</groupId>
+      <artifactId>junit</artifactId>
+      <version>3.8.1</version>
+      <scope>test</scope>
+    </dependency>
+  </dependencies>
+</project>
+
diff --git a/Dozentenmodulserver/src/models/Configuration.java b/Dozentenmodulserver/src/main/java/models/Configuration.java
index 1e616466..1e616466 100644
--- a/Dozentenmodulserver/src/models/Configuration.java
+++ b/Dozentenmodulserver/src/main/java/models/Configuration.java
diff --git a/Dozentenmodulserver/src/server/BinaryListener.java b/Dozentenmodulserver/src/main/java/server/BinaryListener.java
index ffeb9bd5..ffeb9bd5 100644
--- a/Dozentenmodulserver/src/server/BinaryListener.java
+++ b/Dozentenmodulserver/src/main/java/server/BinaryListener.java
diff --git a/Dozentenmodulserver/src/server/Image.java b/Dozentenmodulserver/src/main/java/server/Image.java
index 34c2b45c..34c2b45c 100644
--- a/Dozentenmodulserver/src/server/Image.java
+++ b/Dozentenmodulserver/src/main/java/server/Image.java
diff --git a/Dozentenmodulserver/src/server/Lecture.java b/Dozentenmodulserver/src/main/java/server/Lecture.java
index 0c61ad84..0c61ad84 100644
--- a/Dozentenmodulserver/src/server/Lecture.java
+++ b/Dozentenmodulserver/src/main/java/server/Lecture.java
diff --git a/Dozentenmodulserver/src/server/Server.java b/Dozentenmodulserver/src/main/java/server/Server.java
index b652bf7a..b652bf7a 100644
--- a/Dozentenmodulserver/src/server/Server.java
+++ b/Dozentenmodulserver/src/main/java/server/Server.java
diff --git a/Dozentenmodulserver/src/server/ServerHandler.java b/Dozentenmodulserver/src/main/java/server/ServerHandler.java
index b6a50952..b6a50952 100644
--- a/Dozentenmodulserver/src/server/ServerHandler.java
+++ b/Dozentenmodulserver/src/main/java/server/ServerHandler.java
diff --git a/Dozentenmodulserver/src/server/startServer.java b/Dozentenmodulserver/src/main/java/server/StartServer.java
index a5509d04..4d5019e6 100644
--- a/Dozentenmodulserver/src/server/startServer.java
+++ b/Dozentenmodulserver/src/main/java/server/StartServer.java
@@ -23,13 +23,13 @@ import org.apache.thrift.transport.TServerSocket;
 import org.apache.thrift.transport.TServerTransport;
 import org.apache.thrift.transport.TTransportException;
 import org.apache.thrift.server.TThreadPoolServer.Args;
-public class startServer {
+public class StartServer {
 
 	/**
 	 * @param args
 	 */
 	
-	private static Logger log = Logger.getLogger( startServer.class );
+	private static Logger log = Logger.getLogger( StartServer.class );
 
 	private static List<Thread> servers = new ArrayList<>();
 	
diff --git a/Dozentenmodulserver/src/server/TBinaryProtocolSafe.java b/Dozentenmodulserver/src/main/java/server/TBinaryProtocolSafe.java
index 843b58b1..843b58b1 100644
--- a/Dozentenmodulserver/src/server/TBinaryProtocolSafe.java
+++ b/Dozentenmodulserver/src/main/java/server/TBinaryProtocolSafe.java
diff --git a/Dozentenmodulserver/src/server/User.java b/Dozentenmodulserver/src/main/java/server/User.java
index 7bf98cc4..7bf98cc4 100644
--- a/Dozentenmodulserver/src/server/User.java
+++ b/Dozentenmodulserver/src/main/java/server/User.java
diff --git a/Dozentenmodulserver/src/sql/SQL.java b/Dozentenmodulserver/src/main/java/sql/SQL.java
index 98fc8ef7..98fc8ef7 100644
--- a/Dozentenmodulserver/src/sql/SQL.java
+++ b/Dozentenmodulserver/src/main/java/sql/SQL.java
diff --git a/Dozentenmodulserver/src/util/XMLCreator.java b/Dozentenmodulserver/src/main/java/util/XMLCreator.java
index 564543fa..564543fa 100644
--- a/Dozentenmodulserver/src/util/XMLCreator.java
+++ b/Dozentenmodulserver/src/main/java/util/XMLCreator.java
diff --git a/Dozentenmodulserver/src/test/java/bwlehrpool/AppTest.java b/Dozentenmodulserver/src/test/java/bwlehrpool/AppTest.java
new file mode 100644
index 00000000..ffcdcc2e
--- /dev/null
+++ b/Dozentenmodulserver/src/test/java/bwlehrpool/AppTest.java
@@ -0,0 +1,38 @@
+package bwlehrpool;
+
+import junit.framework.Test;
+import junit.framework.TestCase;
+import junit.framework.TestSuite;
+
+/**
+ * Unit test for simple App.
+ */
+public class AppTest 
+    extends TestCase
+{
+    /**
+     * Create the test case
+     *
+     * @param testName name of the test case
+     */
+    public AppTest( String testName )
+    {
+        super( testName );
+    }
+
+    /**
+     * @return the suite of tests being tested
+     */
+    public static Test suite()
+    {
+        return new TestSuite( AppTest.class );
+    }
+
+    /**
+     * Rigourous Test :-)
+     */
+    public void testApp()
+    {
+        assertTrue( true );
+    }
+}