Client starts up and login works... (Tested on Linux only!)

8 files changed, 29 insertions, 3 deletions

diff --git a/.gitignore b/.gitignore
index 831dc3cb..86c19e18 100644
--- a/.gitignore
+++ b/.gitignore
@@ -5,3 +5,4 @@
 target/
 bin/
 dependency-reduced-pom.xml
+C:*
diff --git a/Dozentenmodul/pom.xml b/Dozentenmodul/pom.xml
index 02ab3756..d36ff7d4 100644
--- a/Dozentenmodul/pom.xml
+++ b/Dozentenmodul/pom.xml
@@ -57,6 +57,11 @@
             </goals>
             <configuration>
               <minimizeJar>true</minimizeJar>
+              <transformers>
+                <transformer implementation="org.apache.maven.plugins.shade.resource.ManifestResourceTransformer">
+                  <mainClass>gui.intro.Login_GUI</mainClass>
+                </transformer>
+              </transformers>
             </configuration>
           </execution>
         </executions>
diff --git a/Dozentenmodul/src/main/java/gui/intro/About_GUI.java b/Dozentenmodul/src/main/java/gui/intro/About_GUI.java
index 447f18ee..3e10d1d9 100644
--- a/Dozentenmodul/src/main/java/gui/intro/About_GUI.java
+++ b/Dozentenmodul/src/main/java/gui/intro/About_GUI.java
@@ -65,7 +65,7 @@ public class About_GUI extends JFrame {
 		// Pfadangabe des Logos
 
 		ImageIcon icon = new ImageIcon(getClass().getResource(
-				"/Logo_bwLehrpool.png"), "Logo");
+				"/img/Logo_bwLehrpool.png"), "Logo");
 		// Skalierung des Logos
 		Image scaled = icon.getImage().getScaledInstance(270, 64, 0);
 		imgLabel.setIcon(new ImageIcon(scaled));
diff --git a/Dozentenmodul/src/main/java/gui/intro/Login_GUI.java b/Dozentenmodul/src/main/java/gui/intro/Login_GUI.java
index 70f4b1f2..0e289610 100644
--- a/Dozentenmodul/src/main/java/gui/intro/Login_GUI.java
+++ b/Dozentenmodul/src/main/java/gui/intro/Login_GUI.java
@@ -130,7 +130,7 @@ public class Login_GUI extends JFrame {
 		// Pfadangabe des Logos
 
 		ImageIcon icon = new ImageIcon(getClass().getResource(
-				"/Logo_bwLehrpool.png"), "Logo");
+				"/img/Logo_bwLehrpool.png"), "Logo");
 		// Skalierung des Logos
 		Image scaled = icon.getImage().getScaledInstance(270, 64, 0);
 		imgLabel.setIcon(new ImageIcon(scaled));
diff --git a/Dozentenmodul/src/main/java/gui/intro/MainMenue_GUI.java b/Dozentenmodul/src/main/java/gui/intro/MainMenue_GUI.java
index 2954ca3b..7a57cd90 100644
--- a/Dozentenmodul/src/main/java/gui/intro/MainMenue_GUI.java
+++ b/Dozentenmodul/src/main/java/gui/intro/MainMenue_GUI.java
@@ -318,7 +318,7 @@ public class MainMenue_GUI extends JFrame {
 						+ "Intelligenz\" lauten und referenzieren dabei auf das allgemeine Image <br>"
 						+ "\"Programmieren\".</html>");
 		lblGrafik.setIcon(new ImageIcon(MainMenue_GUI.class
-				.getResource("/Image_zu_Veranstaltung_HDD.png")));
+				.getResource("/img/Image_zu_Veranstaltung_HDD.png")));
 		// ToolTipp lange anzeigen - 60sec
 		ToolTipManager.sharedInstance().setDismissDelay(60000);
 		ToolTipManager.sharedInstance().registerComponent(lblGrafik);
diff --git a/Dozentenmodul/img/Image_zu_Veranstaltung_HDD.png b/Dozentenmodul/src/main/resources/img/Image_zu_Veranstaltung_HDD.png
index 39b3bac6..39b3bac6 100644
--- a/Dozentenmodul/img/Image_zu_Veranstaltung_HDD.png
+++ b/Dozentenmodul/src/main/resources/img/Image_zu_Veranstaltung_HDD.png
diff --git a/Dozentenmodul/img/Logo_bwLehrpool.png b/Dozentenmodul/src/main/resources/img/Logo_bwLehrpool.png
index b897d9f1..b897d9f1 100644
--- a/Dozentenmodul/img/Logo_bwLehrpool.png
+++ b/Dozentenmodul/src/main/resources/img/Logo_bwLehrpool.png
diff --git a/Dozentenmodulserver/pom.xml b/Dozentenmodulserver/pom.xml
index 05ca9bec..d65527ae 100644
--- a/Dozentenmodulserver/pom.xml
+++ b/Dozentenmodulserver/pom.xml
@@ -47,6 +47,26 @@
         </configuration>
       </plugin>
       <plugin>
+        <groupId>org.apache.maven.plugins</groupId>
+        <artifactId>maven-shade-plugin</artifactId>
+        <executions>
+          <execution>
+            <phase>package</phase>
+            <goals>
+              <goal>shade</goal>
+            </goals>
+            <configuration>
+              <minimizeJar>true</minimizeJar>
+              <transformers>
+                <transformer implementation="org.apache.maven.plugins.shade.resource.ManifestResourceTransformer">
+                  <mainClass>server.StartServer</mainClass>
+                </transformer>
+              </transformers>
+            </configuration>
+          </execution>
+        </executions>
+      </plugin>
+      <plugin>
         <artifactId>maven-assembly-plugin</artifactId>
         <executions>
           <execution>