diff --git a/Klausuren/Sd1/Test001/Exam/pom.xml b/Klausuren/Sd1/Test001/Exam/pom.xml
index bab8d68239152c782232f5e4fad1bc483b4dc468..d0d265da155a39f628b70a7707229e6ced58ae42 100644
--- a/Klausuren/Sd1/Test001/Exam/pom.xml
+++ b/Klausuren/Sd1/Test001/Exam/pom.xml
@@ -1,96 +1,139 @@
<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>de.hdm_stuttgart.mi.sd1</groupId>
- <artifactId>sd1_test_0100</artifactId>
- <version>0.8</version>
- <packaging>jar</packaging>
-
- <name>sd1_test_0100</name>
-
- <url>https://freedocs.mi.hdm-stuttgart.de/sd1FirstJavaProject.html</url>
-
- <properties>
- <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
- </properties>
-
- <repositories>
- <repository>
- <id>hdm-mi-internal-maven-repo</id>
- <url>https://maven.mi.hdm-stuttgart.de/artifacts</url>
- </repository>
- </repositories>
-
-
- <dependencies>
- <dependency>
- <groupId>junit</groupId>
- <artifactId>junit</artifactId>
- <version>4.13</version>
- <scope>test</scope>
- </dependency>
-
- <dependency>
- <groupId>org.apache.logging.log4j</groupId>
- <artifactId>log4j-core</artifactId>
- <version>2.16.0</version>
- </dependency>
-
- <dependency>
- <groupId>de.hdm_stuttgart.mi.exam</groupId>
- <artifactId>unitmarking</artifactId>
- <version>1.1</version>
- </dependency>
-
- </dependencies>
-
- <build>
- <plugins>
-
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-compiler-plugin</artifactId>
- <version>3.8.1</version>
- <configuration>
- <source>11</source>
- <target>11</target>
- </configuration>
- </plugin>
-
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-javadoc-plugin</artifactId>
- <version>3.1.1</version>
- <configuration>
- <javadocExecutable>${java.home}/bin/javadoc</javadocExecutable>
- </configuration>
- </plugin>
-
- <plugin>
- <artifactId>maven-assembly-plugin</artifactId>
- <version>2.3</version>
- <configuration>
- <descriptor>src/main/assembly/assembly.xml</descriptor>
- </configuration>
- <executions>
- <execution>
- <id>make-assembly</id>
- <phase>package</phase>
- <goals>
- <goal>single</goal>
- </goals>
- <configuration>
- <archive>
- <manifest>
- <mainClass>de.hdm_stuttgart.mi.sd1.test.ShowReachedPoints</mainClass>
- </manifest>
- </archive>
- </configuration>
- </execution>
- </executions>
- </plugin>
-
- </plugins>
- </build>
+ 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>de.hdm_stuttgart.mi.sd1</groupId>
+ <artifactId>sd1_test001_exam</artifactId>
+ <version>0.9</version>
+ <packaging>jar</packaging>
+
+ <name>sd1_test001_exam</name>
+
+ <url>https://freedocs.mi.hdm-stuttgart.de/sd1_sect_mavenCli.html</url>
+
+ <properties>
+ <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
+
+ <maven.compiler.release>17</maven.compiler.release>
+
+ <freedocs.url>https://freedocs.mi.hdm-stuttgart.de</freedocs.url>
+ <jdk.api_17.url>${freedocs.url}/doc/openjdk-17-doc/api/</jdk.api_17.url>
+ <mathjax.url>${freedocs.url}/lib/MathJax/es5/tex-chtml.js</mathjax.url>
+ <libhighlight.url>${freedocs.url}/lib/highlight.js</libhighlight.url>
+ </properties>
+
+ <repositories>
+ <repository>
+ <id>hdm-mi-internal-maven-repo</id>
+ <url>https://maven.mi.hdm-stuttgart.de/nexus/repository/mi-maven/</url>
+ </repository>
+ </repositories>
+
+ <dependencies>
+ <dependency>
+ <groupId>de.hdm_stuttgart.mi.exam</groupId>
+ <artifactId>unitmarking</artifactId>
+ <version>1.2</version>
+ </dependency>
+ </dependencies>
+
+ <build>
+ <plugins>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-compiler-plugin</artifactId>
+ <version>3.11.0</version>
+ </plugin>
+
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-antrun-plugin</artifactId>
+ <version>3.1.0</version>
+ <executions>
+ <execution>
+ <phase>generate-sources</phase>
+ <goals>
+ <goal>run</goal>
+ </goals>
+ <configuration>
+ <target>
+ <echo>Javadoc root at file://${project.basedir}/target/site/apidocs/index.html</echo>
+ </target>
+ </configuration>
+ </execution>
+ </executions>
+ </plugin>
+
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-javadoc-plugin</artifactId>
+ <version>3.5.0</version>
+ <configuration>
+ <release>17</release>
+ <doclint>all</doclint>
+ <show>public</show>
+ <docfilessubdirs>true</docfilessubdirs>
+ <addStylesheets>
+ <stylesheet>resources/jdocSupplement.css</stylesheet>
+ </addStylesheets>
+
+ <windowtitle>Exam documentation</windowtitle>
+
+ <links>
+ <link>${freedocs.url}/doc/openjdk-17-doc/api/</link>
+ </links>
+
+ <additionalOptions>
+ <additionalOption>-html5 --allow-script-in-comments</additionalOption>
+ </additionalOptions>
+ <nohelp>true</nohelp>
+
+ <header><![CDATA[
+ <script>
+ MathJax = {
+ chtml: { displayAlign: 'left',
+ displayIndent: '5ex'}
+ };
+ </script>
+ <script type="text/javascript" src="${mathjax.url}"></script>
+ <script type="text/javascript" src="{@docRoot}/resources/jdocSupplement.js"></script>
+
+ <link rel="stylesheet" href="${libhighlight.url}/styles/idea.min.css">
+ <script src="${libhighlight.url}/highlight.min.js"></script>
+ <script type="text/javascript">hljs.highlightAll();</script>]]>
+ </header>
+ <bottom><![CDATA[Copyright © 2023 Stuttgart Media University / MI. Licensed under
+ <a style="font-weight:bold;" href="https://creativecommons.org/licenses/by/4.0/legalcode" target="_blank"
+ >Creative Commons Attribution 4.0 International Public License</a>.]]></bottom>
+ </configuration>
+ </plugin>
+
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-assembly-plugin</artifactId>
+ <version>3.6.0</version>
+ <configuration>
+ <descriptors>
+ <descriptor>src/main/assembly/assembly.xml</descriptor>
+ </descriptors>
+ </configuration>
+ <executions>
+ <execution>
+ <id>make-assembly</id>
+ <phase>package</phase>
+ <goals>
+ <goal>single</goal>
+ </goals>
+ <configuration>
+ <archive>
+ <manifest>
+ <mainClass>de.hdm_stuttgart.mi.sd1.ShowReachedPoints</mainClass>
+ </manifest>
+ </archive>
+ </configuration>
+ </execution>
+ </executions>
+ </plugin>
+ </plugins>
+ </build>
</project>
diff --git a/Klausuren/Sd1/Test001/Exam/src/main/java/de/hdm_stuttgart/mi/sd1/aufgabe1/Helper.java b/Klausuren/Sd1/Test001/Exam/src/main/java/de/hdm_stuttgart/mi/sd1/task1/Helper.java
similarity index 96%
rename from Klausuren/Sd1/Test001/Exam/src/main/java/de/hdm_stuttgart/mi/sd1/aufgabe1/Helper.java
rename to Klausuren/Sd1/Test001/Exam/src/main/java/de/hdm_stuttgart/mi/sd1/task1/Helper.java
index 4d7bf3d9738d6531f3264ae8ac03b5441a34c17d..87fd4c78f425ef938e2dac9c192473f05a57bfe4 100644
--- a/Klausuren/Sd1/Test001/Exam/src/main/java/de/hdm_stuttgart/mi/sd1/aufgabe1/Helper.java
+++ b/Klausuren/Sd1/Test001/Exam/src/main/java/de/hdm_stuttgart/mi/sd1/task1/Helper.java
@@ -1,4 +1,4 @@
-package de.hdm_stuttgart.mi.sd1.aufgabe1;
+package de.hdm_stuttgart.mi.sd1.task1;
/**
* Helper methods borrowed from
diff --git a/Klausuren/Sd1/Test001/Exam/src/main/javadoc/resources/fonts/dejavu.css b/Klausuren/Sd1/Test001/Exam/src/main/javadoc/resources/fonts/dejavu.css
new file mode 100644
index 0000000000000000000000000000000000000000..4fec2b593cdcc719fd7edd6744a33a3395ca8401
--- /dev/null
+++ b/Klausuren/Sd1/Test001/Exam/src/main/javadoc/resources/fonts/dejavu.css
@@ -0,0 +1,3 @@
+/* shame on you, javadoc! Still providing
+@import url('resources/fonts/dejavu.css') line in stylesheet.css
+*/
\ No newline at end of file
diff --git a/Klausuren/Sd1/Test001/Exam/src/main/javadoc/resources/jdocSupplement.css b/Klausuren/Sd1/Test001/Exam/src/main/javadoc/resources/jdocSupplement.css
new file mode 100644
index 0000000000000000000000000000000000000000..08840cdbf55d1f43368245d0a965659c4411b2ee
--- /dev/null
+++ b/Klausuren/Sd1/Test001/Exam/src/main/javadoc/resources/jdocSupplement.css
@@ -0,0 +1,72 @@
+/* Javadoc extensions: */
+
+ul > li > ul {
+ list-style-type: circle;
+}
+
+table.goikTableDefaults,
+table.goikTableDefaults>caption,
+table.goikTableDefaults>tr>th,
+table.goikTableDefaults>tr>td,
+table.goikTableDefaults>tbody>tr>th,
+table.goikTableDefaults>tbody>tr>td {
+ border: 2px solid black;
+ border-collapse: collapse;
+ padding: 1ex;
+ vertical-align: top;
+}
+
+table.goikTableDefaults>caption {
+ /* border-top-style: solid; border-left-style: solid; border-right-style: solid' */
+ border-bottom-style: none;
+ font-weight: bold;
+ background:#dee3e9;
+ text-align:left;
+ padding:8px 3px 3px 7px;
+}
+
+table.goikTableDefaults>tbody>tr>td {
+ vertical-align:top;
+}
+table.goikTableDefaults {
+ border-spacing: 0px !important;
+}
+
+table.indexTable {
+ border-collapse: collapse;
+ border-style: hidden;
+}
+
+table.indexTable caption {
+ text-align: left;
+}
+
+table.indexTable td, table.indexTable th {
+ border: 1px solid black;
+ padding: 0.5ex;
+}
+
+em {
+ font-weight: bold;
+ font-style: normal;
+}
+section.implementationHints>h3 {
+ font-weight: bold;
+ background-color: rgb(222, 227, 233);
+}
+
+code {
+ white-space: pre;
+}
+
+.implementationHints {
+ background-color: hsl(120, 100%, 95%) !important;
+}
+
+.myRed {
+ color: red;
+}
+
+.myGreen {
+ color: limegreen;
+}
diff --git a/Klausuren/Sd1/Test001/Exam/src/main/javadoc/resources/jdocSupplement.js b/Klausuren/Sd1/Test001/Exam/src/main/javadoc/resources/jdocSupplement.js
new file mode 100644
index 0000000000000000000000000000000000000000..97911e5581090aac5e37323427450f8c8c8a3f94
--- /dev/null
+++ b/Klausuren/Sd1/Test001/Exam/src/main/javadoc/resources/jdocSupplement.js
@@ -0,0 +1,7 @@
+for(var i in document.links) {
+ var link = document.links[i];
+ if (link.href && link.href.indexOf('http') === 0) {
+ link.target = '_blank';
+ }
+}
+
diff --git a/Klausuren/Sd1/Test001/Exam/src/test/java/de/hdm_stuttgart/mi/sd1/test/ShowReachedPoints.java b/Klausuren/Sd1/Test001/Exam/src/test/java/de/hdm_stuttgart/mi/sd1/ShowReachedPoints.java
similarity index 57%
rename from Klausuren/Sd1/Test001/Exam/src/test/java/de/hdm_stuttgart/mi/sd1/test/ShowReachedPoints.java
rename to Klausuren/Sd1/Test001/Exam/src/test/java/de/hdm_stuttgart/mi/sd1/ShowReachedPoints.java
index 31ef70d322c33eba66dba26e2dbb1e83df0ac760..dee72337c55e8b8dd9eaef218c89682043869666 100644
--- a/Klausuren/Sd1/Test001/Exam/src/test/java/de/hdm_stuttgart/mi/sd1/test/ShowReachedPoints.java
+++ b/Klausuren/Sd1/Test001/Exam/src/test/java/de/hdm_stuttgart/mi/sd1/ShowReachedPoints.java
@@ -1,9 +1,9 @@
-package de.hdm_stuttgart.mi.sd1.test;
+package de.hdm_stuttgart.mi.sd1;
import de.hdm_stuttgart.mi.exam.unitmarking.RunTests;
-import de.hdm_stuttgart.mi.sd1.test.aufgabe1.TestGetMinimumOfThree;
-import de.hdm_stuttgart.mi.sd1.test.aufgabe1.TestGetMinimumOfTwo;
-import de.hdm_stuttgart.mi.sd1.test.aufgabe1.TestSleepIn;
+import de.hdm_stuttgart.mi.sd1.task1.TestSleepIn;
+import de.hdm_stuttgart.mi.sd1.task1.TestGetMinimumOfThree;
+import de.hdm_stuttgart.mi.sd1.task1.TestGetMinimumOfTwo;
public class ShowReachedPoints {
@@ -14,7 +14,7 @@ public class ShowReachedPoints {
*/
public static void main(String[] args) {
RunTests.exec(
- "Aufgabe 1",
+ "Task 1",
TestGetMinimumOfTwo.class, TestGetMinimumOfThree.class, TestSleepIn.class);
}
diff --git a/Klausuren/Sd1/Test001/Solve/src/test/java/de/hdm_stuttgart/mi/sd1/test/aufgabe1/TestGetMinimumOfThree.java b/Klausuren/Sd1/Test001/Exam/src/test/java/de/hdm_stuttgart/mi/sd1/task1/TestGetMinimumOfThree.java
similarity index 92%
rename from Klausuren/Sd1/Test001/Solve/src/test/java/de/hdm_stuttgart/mi/sd1/test/aufgabe1/TestGetMinimumOfThree.java
rename to Klausuren/Sd1/Test001/Exam/src/test/java/de/hdm_stuttgart/mi/sd1/task1/TestGetMinimumOfThree.java
index 064d9d1a3fdccaec20d4b284b37ee07ebff41635..889e4e9bac0f8ad402a9366110689eacbdabcb10 100644
--- a/Klausuren/Sd1/Test001/Solve/src/test/java/de/hdm_stuttgart/mi/sd1/test/aufgabe1/TestGetMinimumOfThree.java
+++ b/Klausuren/Sd1/Test001/Exam/src/test/java/de/hdm_stuttgart/mi/sd1/task1/TestGetMinimumOfThree.java
@@ -1,7 +1,6 @@
-package de.hdm_stuttgart.mi.sd1.test.aufgabe1;
+package de.hdm_stuttgart.mi.sd1.task1;
import de.hdm_stuttgart.mi.exam.unitmarking.ExaminationTestDefaults;
-import de.hdm_stuttgart.mi.sd1.aufgabe1.Helper;
import org.junit.Assert;
import org.junit.FixMethodOrder;
import org.junit.Test;
diff --git a/Klausuren/Sd1/Test001/Solve/src/test/java/de/hdm_stuttgart/mi/sd1/test/aufgabe1/TestGetMinimumOfTwo.java b/Klausuren/Sd1/Test001/Exam/src/test/java/de/hdm_stuttgart/mi/sd1/task1/TestGetMinimumOfTwo.java
similarity index 93%
rename from Klausuren/Sd1/Test001/Solve/src/test/java/de/hdm_stuttgart/mi/sd1/test/aufgabe1/TestGetMinimumOfTwo.java
rename to Klausuren/Sd1/Test001/Exam/src/test/java/de/hdm_stuttgart/mi/sd1/task1/TestGetMinimumOfTwo.java
index d3b5db211700e3fbcd7eaae0db4f24fade299b75..74002c6e40f76e87763730bc8743a1f264a7d367 100644
--- a/Klausuren/Sd1/Test001/Solve/src/test/java/de/hdm_stuttgart/mi/sd1/test/aufgabe1/TestGetMinimumOfTwo.java
+++ b/Klausuren/Sd1/Test001/Exam/src/test/java/de/hdm_stuttgart/mi/sd1/task1/TestGetMinimumOfTwo.java
@@ -1,4 +1,4 @@
-package de.hdm_stuttgart.mi.sd1.test.aufgabe1;
+package de.hdm_stuttgart.mi.sd1.task1;
import org.junit.Assert;
import org.junit.FixMethodOrder;
@@ -7,7 +7,6 @@ import org.junit.runners.MethodSorters;
import de.hdm_stuttgart.mi.exam.unitmarking.ExaminationTestDefaults;
import de.hdm_stuttgart.mi.exam.unitmarking.Marking;
-import de.hdm_stuttgart.mi.sd1.aufgabe1.Helper;
@FixMethodOrder(MethodSorters.NAME_ASCENDING)
public class TestGetMinimumOfTwo extends ExaminationTestDefaults {
diff --git a/Klausuren/Sd1/Test001/Exam/src/test/java/de/hdm_stuttgart/mi/sd1/test/aufgabe1/TestSleepIn.java b/Klausuren/Sd1/Test001/Exam/src/test/java/de/hdm_stuttgart/mi/sd1/task1/TestSleepIn.java
similarity index 90%
rename from Klausuren/Sd1/Test001/Exam/src/test/java/de/hdm_stuttgart/mi/sd1/test/aufgabe1/TestSleepIn.java
rename to Klausuren/Sd1/Test001/Exam/src/test/java/de/hdm_stuttgart/mi/sd1/task1/TestSleepIn.java
index 24cc261a67b803c14a029783cf37fc8ad03ac2c7..81db38d47d94bfb7b469183930f26204be53283e 100644
--- a/Klausuren/Sd1/Test001/Exam/src/test/java/de/hdm_stuttgart/mi/sd1/test/aufgabe1/TestSleepIn.java
+++ b/Klausuren/Sd1/Test001/Exam/src/test/java/de/hdm_stuttgart/mi/sd1/task1/TestSleepIn.java
@@ -1,7 +1,6 @@
-package de.hdm_stuttgart.mi.sd1.test.aufgabe1;
+package de.hdm_stuttgart.mi.sd1.task1;
import de.hdm_stuttgart.mi.exam.unitmarking.ExaminationTestDefaults;
-import de.hdm_stuttgart.mi.sd1.aufgabe1.Helper;
import org.junit.Assert;
import org.junit.FixMethodOrder;
import org.junit.Test;
diff --git a/Klausuren/Sd1/Test001/Solve/Doc/klausur.xml b/Klausuren/Sd1/Test001/Solve/Doc/klausur.xml
index 262fce53b877629fcdde278d80db5d4a35da40dc..c23dcba5ef90de07926bef8c09b670a675136b91 100644
--- a/Klausuren/Sd1/Test001/Solve/Doc/klausur.xml
+++ b/Klausuren/Sd1/Test001/Solve/Doc/klausur.xml
@@ -36,7 +36,7 @@
<title>Aufgabe</title>
<para>Vervollständigen Sie die Implementierung aller drei Methoden der
- Klasse <classname>de.hdm_stuttgart.mi.sd1.aufgabe1.Helper</classname>
+ Klasse <classname>de.hdm_stuttgart.mi.sd1.task1.Helper</classname>
gemäß den jeweiligen <productname>Javadoc</productname> Beschreibungen.
Sie bekommen bei unvollständiger Implementierung Teilpunkte.</para>
@@ -48,15 +48,15 @@
<itemizedlist>
<listitem>
- <para><classname>de.hdm_stuttgart.mi.sd1.test.aufgabe1.TestGetMinimumOfTwo</classname></para>
+ <para><classname>aufgabe1.de.hdm_stuttgart.mi.sd1.TestGetMinimumOfTwo</classname></para>
</listitem>
<listitem>
- <para><classname>de.hdm_stuttgart.mi.sd1.test.aufgabe1.TestGetMinimumOfThree</classname></para>
+ <para><classname>aufgabe1.de.hdm_stuttgart.mi.sd1.TestGetMinimumOfThree</classname></para>
</listitem>
<listitem>
- <para><classname>de.hdm_stuttgart.mi.sd1.test.aufgabe1.TestSleepIn</classname></para>
+ <para><classname>aufgabe1.de.hdm_stuttgart.mi.sd1.TestSleepIn</classname></para>
</listitem>
</itemizedlist>
</listitem>
@@ -64,7 +64,7 @@
<listitem>
<para><emphasis role="red">Ändern Sie diese Tests
nicht!</emphasis> Durch Ausführung von
- <classname>de.hdm_stuttgart.mi.sd1.test.ShowReachedPoints</classname>
+ <classname>de.hdm_stuttgart.mi.sd1.ShowReachedPoints</classname>
als Java Programm können Sie Ihre bereits erreichten Punkte
erfahren.</para>
</listitem>
diff --git a/Klausuren/Sd1/Test001/Solve/pom.xml b/Klausuren/Sd1/Test001/Solve/pom.xml
index 2ce233557f3240c0f05783451739d15d7e5b987e..e2123ca6c90e1bf17fb021019512deea02642833 100644
--- a/Klausuren/Sd1/Test001/Solve/pom.xml
+++ b/Klausuren/Sd1/Test001/Solve/pom.xml
@@ -1,96 +1,139 @@
<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>de.hdm_stuttgart.mi.sd1</groupId>
- <artifactId>sd1_test_001</artifactId>
- <version>0.9</version>
- <packaging>jar</packaging>
-
- <name>sd1_test_001</name>
-
- <url>https://freedocs.mi.hdm-stuttgart.de/sd1FirstJavaProject.html</url>
-
- <properties>
- <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
- </properties>
-
- <repositories>
- <repository>
- <id>hdm-mi-internal-maven-repo</id>
- <url>https://maven.mi.hdm-stuttgart.de/artifacts</url>
- </repository>
- </repositories>
-
-
- <dependencies>
- <dependency>
- <groupId>junit</groupId>
- <artifactId>junit</artifactId>
- <version>4.13</version>
- <scope>test</scope>
- </dependency>
-
- <dependency>
- <groupId>org.apache.logging.log4j</groupId>
- <artifactId>log4j-core</artifactId>
- <version>2.16.0</version>
- </dependency>
-
- <dependency>
- <groupId>de.hdm_stuttgart.mi.exam</groupId>
- <artifactId>unitmarking</artifactId>
- <version>1.1</version>
- </dependency>
-
- </dependencies>
-
- <build>
- <plugins>
-
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-compiler-plugin</artifactId>
- <version>3.8.1</version>
- <configuration>
- <source>11</source>
- <target>11</target>
- </configuration>
- </plugin>
-
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-javadoc-plugin</artifactId>
- <version>3.1.1</version>
- <configuration>
- <javadocExecutable>${java.home}/bin/javadoc</javadocExecutable>
- </configuration>
- </plugin>
-
- <plugin>
- <artifactId>maven-assembly-plugin</artifactId>
- <version>2.3</version>
- <configuration>
- <descriptor>src/main/assembly/assembly.xml</descriptor>
- </configuration>
- <executions>
- <execution>
- <id>make-assembly</id>
- <phase>package</phase>
- <goals>
- <goal>single</goal>
- </goals>
- <configuration>
- <archive>
- <manifest>
- <mainClass>de.hdm_stuttgart.mi.sd1.test.ShowReachedPoints</mainClass>
- </manifest>
- </archive>
- </configuration>
- </execution>
- </executions>
- </plugin>
-
- </plugins>
- </build>
+ 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>de.hdm_stuttgart.mi.sd1</groupId>
+ <artifactId>sd1_test001_solve</artifactId>
+ <version>0.9</version>
+ <packaging>jar</packaging>
+
+ <name>sd1_test001_solve</name>
+
+ <url>https://freedocs.mi.hdm-stuttgart.de/sd1_sect_mavenCli.html</url>
+
+ <properties>
+ <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
+
+ <maven.compiler.release>17</maven.compiler.release>
+
+ <freedocs.url>https://freedocs.mi.hdm-stuttgart.de</freedocs.url>
+ <jdk.api_17.url>${freedocs.url}/doc/openjdk-17-doc/api/</jdk.api_17.url>
+ <mathjax.url>${freedocs.url}/lib/MathJax/es5/tex-chtml.js</mathjax.url>
+ <libhighlight.url>${freedocs.url}/lib/highlight.js</libhighlight.url>
+ </properties>
+
+ <repositories>
+ <repository>
+ <id>hdm-mi-internal-maven-repo</id>
+ <url>https://maven.mi.hdm-stuttgart.de/nexus/repository/mi-maven</url>
+ </repository>
+ </repositories>
+
+ <dependencies>
+ <dependency>
+ <groupId>de.hdm_stuttgart.mi.exam</groupId>
+ <artifactId>unitmarking</artifactId>
+ <version>1.2</version>
+ </dependency>
+ </dependencies>
+
+ <build>
+ <plugins>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-compiler-plugin</artifactId>
+ <version>3.11.0</version>
+ </plugin>
+
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-antrun-plugin</artifactId>
+ <version>3.1.0</version>
+ <executions>
+ <execution>
+ <phase>generate-sources</phase>
+ <goals>
+ <goal>run</goal>
+ </goals>
+ <configuration>
+ <target>
+ <echo>Javadoc root at file://${project.basedir}/target/site/apidocs/index.html</echo>
+ </target>
+ </configuration>
+ </execution>
+ </executions>
+ </plugin>
+
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-javadoc-plugin</artifactId>
+ <version>3.5.0</version>
+ <configuration>
+ <release>17</release>
+ <doclint>all</doclint>
+ <show>public</show>
+ <docfilessubdirs>true</docfilessubdirs>
+ <addStylesheets>
+ <stylesheet>resources/jdocSupplement.css</stylesheet>
+ </addStylesheets>
+
+ <windowtitle>Exam documentation</windowtitle>
+
+ <links>
+ <link>${freedocs.url}/doc/openjdk-17-doc/api/</link>
+ </links>
+
+ <additionalOptions>
+ <additionalOption>-html5 --allow-script-in-comments</additionalOption>
+ </additionalOptions>
+ <nohelp>true</nohelp>
+
+ <header><![CDATA[
+ <script>
+ MathJax = {
+ chtml: { displayAlign: 'left',
+ displayIndent: '5ex'}
+ };
+ </script>
+ <script type="text/javascript" src="${mathjax.url}"></script>
+ <script type="text/javascript" src="{@docRoot}/resources/jdocSupplement.js"></script>
+
+ <link rel="stylesheet" href="${libhighlight.url}/styles/idea.min.css">
+ <script src="${libhighlight.url}/highlight.min.js"></script>
+ <script type="text/javascript">hljs.highlightAll();</script>]]>
+ </header>
+ <bottom><![CDATA[Copyright © 2023 Stuttgart Media University / MI. Licensed under
+ <a style="font-weight:bold;" href="https://creativecommons.org/licenses/by/4.0/legalcode" target="_blank"
+ >Creative Commons Attribution 4.0 International Public License</a>.]]></bottom>
+ </configuration>
+ </plugin>
+
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-assembly-plugin</artifactId>
+ <version>3.6.0</version>
+ <configuration>
+ <descriptors>
+ <descriptor>src/main/assembly/assembly.xml</descriptor>
+ </descriptors>
+ </configuration>
+ <executions>
+ <execution>
+ <id>make-assembly</id>
+ <phase>package</phase>
+ <goals>
+ <goal>single</goal>
+ </goals>
+ <configuration>
+ <archive>
+ <manifest>
+ <mainClass>de.hdm_stuttgart.mi.sd1.ShowReachedPoints</mainClass>
+ </manifest>
+ </archive>
+ </configuration>
+ </execution>
+ </executions>
+ </plugin>
+ </plugins>
+ </build>
</project>
diff --git a/Klausuren/Sd1/Test001/Solve/src/main/java/de/hdm_stuttgart/mi/sd1/aufgabe1/Helper.java b/Klausuren/Sd1/Test001/Solve/src/main/java/de/hdm_stuttgart/mi/sd1/task1/Helper.java
similarity index 96%
rename from Klausuren/Sd1/Test001/Solve/src/main/java/de/hdm_stuttgart/mi/sd1/aufgabe1/Helper.java
rename to Klausuren/Sd1/Test001/Solve/src/main/java/de/hdm_stuttgart/mi/sd1/task1/Helper.java
index 2787405e556f4e5e1e0b4e3e203756d3f203e3e4..dee591d19466bfcb48ccd62044f508a4dc34a568 100644
--- a/Klausuren/Sd1/Test001/Solve/src/main/java/de/hdm_stuttgart/mi/sd1/aufgabe1/Helper.java
+++ b/Klausuren/Sd1/Test001/Solve/src/main/java/de/hdm_stuttgart/mi/sd1/task1/Helper.java
@@ -1,4 +1,4 @@
-package de.hdm_stuttgart.mi.sd1.aufgabe1;
+package de.hdm_stuttgart.mi.sd1.task1;
/**
* Helper methods borrowed from
diff --git a/Klausuren/Sd1/Test001/Solve/src/main/javadoc/resources/fonts/dejavu.css b/Klausuren/Sd1/Test001/Solve/src/main/javadoc/resources/fonts/dejavu.css
new file mode 100644
index 0000000000000000000000000000000000000000..4fec2b593cdcc719fd7edd6744a33a3395ca8401
--- /dev/null
+++ b/Klausuren/Sd1/Test001/Solve/src/main/javadoc/resources/fonts/dejavu.css
@@ -0,0 +1,3 @@
+/* shame on you, javadoc! Still providing
+@import url('resources/fonts/dejavu.css') line in stylesheet.css
+*/
\ No newline at end of file
diff --git a/Klausuren/Sd1/Test001/Solve/src/main/javadoc/resources/jdocSupplement.css b/Klausuren/Sd1/Test001/Solve/src/main/javadoc/resources/jdocSupplement.css
new file mode 100644
index 0000000000000000000000000000000000000000..08840cdbf55d1f43368245d0a965659c4411b2ee
--- /dev/null
+++ b/Klausuren/Sd1/Test001/Solve/src/main/javadoc/resources/jdocSupplement.css
@@ -0,0 +1,72 @@
+/* Javadoc extensions: */
+
+ul > li > ul {
+ list-style-type: circle;
+}
+
+table.goikTableDefaults,
+table.goikTableDefaults>caption,
+table.goikTableDefaults>tr>th,
+table.goikTableDefaults>tr>td,
+table.goikTableDefaults>tbody>tr>th,
+table.goikTableDefaults>tbody>tr>td {
+ border: 2px solid black;
+ border-collapse: collapse;
+ padding: 1ex;
+ vertical-align: top;
+}
+
+table.goikTableDefaults>caption {
+ /* border-top-style: solid; border-left-style: solid; border-right-style: solid' */
+ border-bottom-style: none;
+ font-weight: bold;
+ background:#dee3e9;
+ text-align:left;
+ padding:8px 3px 3px 7px;
+}
+
+table.goikTableDefaults>tbody>tr>td {
+ vertical-align:top;
+}
+table.goikTableDefaults {
+ border-spacing: 0px !important;
+}
+
+table.indexTable {
+ border-collapse: collapse;
+ border-style: hidden;
+}
+
+table.indexTable caption {
+ text-align: left;
+}
+
+table.indexTable td, table.indexTable th {
+ border: 1px solid black;
+ padding: 0.5ex;
+}
+
+em {
+ font-weight: bold;
+ font-style: normal;
+}
+section.implementationHints>h3 {
+ font-weight: bold;
+ background-color: rgb(222, 227, 233);
+}
+
+code {
+ white-space: pre;
+}
+
+.implementationHints {
+ background-color: hsl(120, 100%, 95%) !important;
+}
+
+.myRed {
+ color: red;
+}
+
+.myGreen {
+ color: limegreen;
+}
diff --git a/Klausuren/Sd1/Test001/Solve/src/main/javadoc/resources/jdocSupplement.js b/Klausuren/Sd1/Test001/Solve/src/main/javadoc/resources/jdocSupplement.js
new file mode 100644
index 0000000000000000000000000000000000000000..97911e5581090aac5e37323427450f8c8c8a3f94
--- /dev/null
+++ b/Klausuren/Sd1/Test001/Solve/src/main/javadoc/resources/jdocSupplement.js
@@ -0,0 +1,7 @@
+for(var i in document.links) {
+ var link = document.links[i];
+ if (link.href && link.href.indexOf('http') === 0) {
+ link.target = '_blank';
+ }
+}
+
diff --git a/Klausuren/Sd1/Test001/Solve/src/test/java/de/hdm_stuttgart/mi/sd1/test/ShowReachedPoints.java b/Klausuren/Sd1/Test001/Solve/src/test/java/de/hdm_stuttgart/mi/sd1/ShowReachedPoints.java
similarity index 57%
rename from Klausuren/Sd1/Test001/Solve/src/test/java/de/hdm_stuttgart/mi/sd1/test/ShowReachedPoints.java
rename to Klausuren/Sd1/Test001/Solve/src/test/java/de/hdm_stuttgart/mi/sd1/ShowReachedPoints.java
index 31ef70d322c33eba66dba26e2dbb1e83df0ac760..40840401f2956880eb0dd873e43920c47d3ce342 100644
--- a/Klausuren/Sd1/Test001/Solve/src/test/java/de/hdm_stuttgart/mi/sd1/test/ShowReachedPoints.java
+++ b/Klausuren/Sd1/Test001/Solve/src/test/java/de/hdm_stuttgart/mi/sd1/ShowReachedPoints.java
@@ -1,9 +1,9 @@
-package de.hdm_stuttgart.mi.sd1.test;
+package de.hdm_stuttgart.mi.sd1;
import de.hdm_stuttgart.mi.exam.unitmarking.RunTests;
-import de.hdm_stuttgart.mi.sd1.test.aufgabe1.TestGetMinimumOfThree;
-import de.hdm_stuttgart.mi.sd1.test.aufgabe1.TestGetMinimumOfTwo;
-import de.hdm_stuttgart.mi.sd1.test.aufgabe1.TestSleepIn;
+import de.hdm_stuttgart.mi.sd1.task1.TestGetMinimumOfThree;
+import de.hdm_stuttgart.mi.sd1.task1.TestGetMinimumOfTwo;
+import de.hdm_stuttgart.mi.sd1.task1.TestSleepIn;
public class ShowReachedPoints {
@@ -14,7 +14,7 @@ public class ShowReachedPoints {
*/
public static void main(String[] args) {
RunTests.exec(
- "Aufgabe 1",
+ "Task 1",
TestGetMinimumOfTwo.class, TestGetMinimumOfThree.class, TestSleepIn.class);
}
diff --git a/Klausuren/Sd1/Test001/Exam/src/test/java/de/hdm_stuttgart/mi/sd1/test/aufgabe1/TestGetMinimumOfThree.java b/Klausuren/Sd1/Test001/Solve/src/test/java/de/hdm_stuttgart/mi/sd1/task1/TestGetMinimumOfThree.java
similarity index 92%
rename from Klausuren/Sd1/Test001/Exam/src/test/java/de/hdm_stuttgart/mi/sd1/test/aufgabe1/TestGetMinimumOfThree.java
rename to Klausuren/Sd1/Test001/Solve/src/test/java/de/hdm_stuttgart/mi/sd1/task1/TestGetMinimumOfThree.java
index 064d9d1a3fdccaec20d4b284b37ee07ebff41635..889e4e9bac0f8ad402a9366110689eacbdabcb10 100644
--- a/Klausuren/Sd1/Test001/Exam/src/test/java/de/hdm_stuttgart/mi/sd1/test/aufgabe1/TestGetMinimumOfThree.java
+++ b/Klausuren/Sd1/Test001/Solve/src/test/java/de/hdm_stuttgart/mi/sd1/task1/TestGetMinimumOfThree.java
@@ -1,7 +1,6 @@
-package de.hdm_stuttgart.mi.sd1.test.aufgabe1;
+package de.hdm_stuttgart.mi.sd1.task1;
import de.hdm_stuttgart.mi.exam.unitmarking.ExaminationTestDefaults;
-import de.hdm_stuttgart.mi.sd1.aufgabe1.Helper;
import org.junit.Assert;
import org.junit.FixMethodOrder;
import org.junit.Test;
diff --git a/Klausuren/Sd1/Test001/Exam/src/test/java/de/hdm_stuttgart/mi/sd1/test/aufgabe1/TestGetMinimumOfTwo.java b/Klausuren/Sd1/Test001/Solve/src/test/java/de/hdm_stuttgart/mi/sd1/task1/TestGetMinimumOfTwo.java
similarity index 93%
rename from Klausuren/Sd1/Test001/Exam/src/test/java/de/hdm_stuttgart/mi/sd1/test/aufgabe1/TestGetMinimumOfTwo.java
rename to Klausuren/Sd1/Test001/Solve/src/test/java/de/hdm_stuttgart/mi/sd1/task1/TestGetMinimumOfTwo.java
index d3b5db211700e3fbcd7eaae0db4f24fade299b75..74002c6e40f76e87763730bc8743a1f264a7d367 100644
--- a/Klausuren/Sd1/Test001/Exam/src/test/java/de/hdm_stuttgart/mi/sd1/test/aufgabe1/TestGetMinimumOfTwo.java
+++ b/Klausuren/Sd1/Test001/Solve/src/test/java/de/hdm_stuttgart/mi/sd1/task1/TestGetMinimumOfTwo.java
@@ -1,4 +1,4 @@
-package de.hdm_stuttgart.mi.sd1.test.aufgabe1;
+package de.hdm_stuttgart.mi.sd1.task1;
import org.junit.Assert;
import org.junit.FixMethodOrder;
@@ -7,7 +7,6 @@ import org.junit.runners.MethodSorters;
import de.hdm_stuttgart.mi.exam.unitmarking.ExaminationTestDefaults;
import de.hdm_stuttgart.mi.exam.unitmarking.Marking;
-import de.hdm_stuttgart.mi.sd1.aufgabe1.Helper;
@FixMethodOrder(MethodSorters.NAME_ASCENDING)
public class TestGetMinimumOfTwo extends ExaminationTestDefaults {
diff --git a/Klausuren/Sd1/Test001/Solve/src/test/java/de/hdm_stuttgart/mi/sd1/test/aufgabe1/TestSleepIn.java b/Klausuren/Sd1/Test001/Solve/src/test/java/de/hdm_stuttgart/mi/sd1/task1/TestSleepIn.java
similarity index 90%
rename from Klausuren/Sd1/Test001/Solve/src/test/java/de/hdm_stuttgart/mi/sd1/test/aufgabe1/TestSleepIn.java
rename to Klausuren/Sd1/Test001/Solve/src/test/java/de/hdm_stuttgart/mi/sd1/task1/TestSleepIn.java
index 24cc261a67b803c14a029783cf37fc8ad03ac2c7..81db38d47d94bfb7b469183930f26204be53283e 100644
--- a/Klausuren/Sd1/Test001/Solve/src/test/java/de/hdm_stuttgart/mi/sd1/test/aufgabe1/TestSleepIn.java
+++ b/Klausuren/Sd1/Test001/Solve/src/test/java/de/hdm_stuttgart/mi/sd1/task1/TestSleepIn.java
@@ -1,7 +1,6 @@
-package de.hdm_stuttgart.mi.sd1.test.aufgabe1;
+package de.hdm_stuttgart.mi.sd1.task1;
import de.hdm_stuttgart.mi.exam.unitmarking.ExaminationTestDefaults;
-import de.hdm_stuttgart.mi.sd1.aufgabe1.Helper;
import org.junit.Assert;
import org.junit.FixMethodOrder;
import org.junit.Test;
diff --git a/Klausuren/Sd1/Test002/Exam/pom.xml b/Klausuren/Sd1/Test002/Exam/pom.xml
index 344afd73423134c62ad7c060ce1f3d6af086fc29..9037fc4e7f80f5fc83c1bf078c600de2e3195653 100644
--- a/Klausuren/Sd1/Test002/Exam/pom.xml
+++ b/Klausuren/Sd1/Test002/Exam/pom.xml
@@ -3,19 +3,18 @@
<modelVersion>4.0.0</modelVersion>
<groupId>de.hdm_stuttgart.mi.sd1</groupId>
- <artifactId>sd1_test_02_exam</artifactId>
+ <artifactId>sd1_test002_exam</artifactId>
<version>0.9</version>
<packaging>jar</packaging>
- <name>sd1_test_01_exam</name>
+ <name>sd1_test002_exam</name>
<url>https://freedocs.mi.hdm-stuttgart.de/sd1_sect_mavenCli.html</url>
<properties>
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
- <maven.compiler.target>17</maven.compiler.target>
- <maven.compiler.source>17</maven.compiler.source>
+ <maven.compiler.release>17</maven.compiler.release>
<freedocs.url>https://freedocs.mi.hdm-stuttgart.de</freedocs.url>
<jdk.api_17.url>${freedocs.url}/doc/openjdk-17-doc/api/</jdk.api_17.url>
@@ -36,7 +35,6 @@
<artifactId>unitmarking</artifactId>
<version>1.2</version>
</dependency>
-
</dependencies>
<build>
@@ -44,13 +42,32 @@
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-compiler-plugin</artifactId>
- <version>3.10.1</version>
+ <version>3.11.0</version>
+ </plugin>
+
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-antrun-plugin</artifactId>
+ <version>3.1.0</version>
+ <executions>
+ <execution>
+ <phase>generate-sources</phase>
+ <goals>
+ <goal>run</goal>
+ </goals>
+ <configuration>
+ <target>
+ <echo>Javadoc root at file://${project.basedir}/target/site/apidocs/index.html</echo>
+ </target>
+ </configuration>
+ </execution>
+ </executions>
</plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-javadoc-plugin</artifactId>
- <version>3.4.1</version>
+ <artifactId>maven-javadoc-plugin</artifactId>
+ <version>3.5.0</version>
<configuration>
<release>17</release>
<doclint>all</doclint>
@@ -63,7 +80,7 @@
<windowtitle>Exam documentation</windowtitle>
<links>
- <link>https://freedocs.mi.hdm-stuttgart.de/doc/openjdk-17-doc/api/</link>
+ <link>${freedocs.url}/doc/openjdk-17-doc/api/</link>
</links>
<additionalOptions>
@@ -72,20 +89,29 @@
<nohelp>true</nohelp>
<header><![CDATA[
+ <script>
+ MathJax = {
+ chtml: { displayAlign: 'left',
+ displayIndent: '5ex'}
+ };
+ </script>
<script type="text/javascript" src="${mathjax.url}"></script>
<script type="text/javascript" src="{@docRoot}/resources/jdocSupplement.js"></script>
-
+
<link rel="stylesheet" href="${libhighlight.url}/styles/idea.min.css">
<script src="${libhighlight.url}/highlight.min.js"></script>
<script type="text/javascript">hljs.highlightAll();</script>]]>
</header>
+ <bottom><![CDATA[Copyright © 2023 Stuttgart Media University / MI. Licensed under
+ <a style="font-weight:bold;" href="https://creativecommons.org/licenses/by/4.0/legalcode" target="_blank"
+ >Creative Commons Attribution 4.0 International Public License</a>.]]></bottom>
</configuration>
</plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-assembly-plugin</artifactId>
- <version>3.4.2</version>
+ <version>3.6.0</version>
<configuration>
<descriptors>
<descriptor>src/main/assembly/assembly.xml</descriptor>
diff --git a/Klausuren/Sd1/Test002/Exam/src/test/java/de/hdm_stuttgart/mi/sd1/test/ShowReachedPoints.java b/Klausuren/Sd1/Test002/Exam/src/test/java/de/hdm_stuttgart/mi/sd1/ShowReachedPoints.java
similarity index 62%
rename from Klausuren/Sd1/Test002/Exam/src/test/java/de/hdm_stuttgart/mi/sd1/test/ShowReachedPoints.java
rename to Klausuren/Sd1/Test002/Exam/src/test/java/de/hdm_stuttgart/mi/sd1/ShowReachedPoints.java
index c82bb78da40bd87776c20fdbd7a581d21c2168ff..d7c7d62c8958bb6d1b45ba4e701f9950e49b8d34 100644
--- a/Klausuren/Sd1/Test002/Exam/src/test/java/de/hdm_stuttgart/mi/sd1/test/ShowReachedPoints.java
+++ b/Klausuren/Sd1/Test002/Exam/src/test/java/de/hdm_stuttgart/mi/sd1/ShowReachedPoints.java
@@ -1,9 +1,9 @@
-package de.hdm_stuttgart.mi.sd1.test;
+package de.hdm_stuttgart.mi.sd1;
import de.hdm_stuttgart.mi.exam.unitmarking.RunTests;
-import de.hdm_stuttgart.mi.sd1.test.task1.TestHelperMax;
-import de.hdm_stuttgart.mi.sd1.test.task1.TestHelperMaxAbsDiff;
-import de.hdm_stuttgart.mi.sd1.test.task1.TestHelperMultipleCopy;
+import de.hdm_stuttgart.mi.sd1.task1.TestHelperMax;
+import de.hdm_stuttgart.mi.sd1.task1.TestHelperMaxAbsDiff;
+import de.hdm_stuttgart.mi.sd1.task1.TestHelperMultipleCopy;
public class ShowReachedPoints {
diff --git a/Klausuren/Sd1/Test002/Exam/src/test/java/de/hdm_stuttgart/mi/sd1/test/task1/TestHelperMax.java b/Klausuren/Sd1/Test002/Exam/src/test/java/de/hdm_stuttgart/mi/sd1/task1/TestHelperMax.java
similarity index 95%
rename from Klausuren/Sd1/Test002/Exam/src/test/java/de/hdm_stuttgart/mi/sd1/test/task1/TestHelperMax.java
rename to Klausuren/Sd1/Test002/Exam/src/test/java/de/hdm_stuttgart/mi/sd1/task1/TestHelperMax.java
index f3062d565a409429df5ef00a837cfd7cc2dd25bb..6b3636adafe59b067e5586a08c4658f4a9ce2e73 100644
--- a/Klausuren/Sd1/Test002/Exam/src/test/java/de/hdm_stuttgart/mi/sd1/test/task1/TestHelperMax.java
+++ b/Klausuren/Sd1/Test002/Exam/src/test/java/de/hdm_stuttgart/mi/sd1/task1/TestHelperMax.java
@@ -1,4 +1,4 @@
-package de.hdm_stuttgart.mi.sd1.test.task1;
+package de.hdm_stuttgart.mi.sd1.task1;
import de.hdm_stuttgart.mi.exam.unitmarking.ExaminationTestDefaults;
import de.hdm_stuttgart.mi.sd1.task1.Helper;
diff --git a/Klausuren/Sd1/Test002/Exam/src/test/java/de/hdm_stuttgart/mi/sd1/test/task1/TestHelperMaxAbsDiff.java b/Klausuren/Sd1/Test002/Exam/src/test/java/de/hdm_stuttgart/mi/sd1/task1/TestHelperMaxAbsDiff.java
similarity index 96%
rename from Klausuren/Sd1/Test002/Exam/src/test/java/de/hdm_stuttgart/mi/sd1/test/task1/TestHelperMaxAbsDiff.java
rename to Klausuren/Sd1/Test002/Exam/src/test/java/de/hdm_stuttgart/mi/sd1/task1/TestHelperMaxAbsDiff.java
index ff8789cc5729e0ab65d054386367f5e7a672fae4..05ed7cf8c8b877a0a61c407efe15af1cd9c938b2 100644
--- a/Klausuren/Sd1/Test002/Exam/src/test/java/de/hdm_stuttgart/mi/sd1/test/task1/TestHelperMaxAbsDiff.java
+++ b/Klausuren/Sd1/Test002/Exam/src/test/java/de/hdm_stuttgart/mi/sd1/task1/TestHelperMaxAbsDiff.java
@@ -1,4 +1,4 @@
-package de.hdm_stuttgart.mi.sd1.test.task1;
+package de.hdm_stuttgart.mi.sd1.task1;
import static org.junit.Assert.assertEquals;
diff --git a/Klausuren/Sd1/Test002/Exam/src/test/java/de/hdm_stuttgart/mi/sd1/test/task1/TestHelperMultipleCopy.java b/Klausuren/Sd1/Test002/Exam/src/test/java/de/hdm_stuttgart/mi/sd1/task1/TestHelperMultipleCopy.java
similarity index 93%
rename from Klausuren/Sd1/Test002/Exam/src/test/java/de/hdm_stuttgart/mi/sd1/test/task1/TestHelperMultipleCopy.java
rename to Klausuren/Sd1/Test002/Exam/src/test/java/de/hdm_stuttgart/mi/sd1/task1/TestHelperMultipleCopy.java
index 9d0fdd34cdf6223ffaeec24a6cec9df41f7fb37f..33fd8c0f897d317d8678da5ec58c2c8949d91610 100644
--- a/Klausuren/Sd1/Test002/Exam/src/test/java/de/hdm_stuttgart/mi/sd1/test/task1/TestHelperMultipleCopy.java
+++ b/Klausuren/Sd1/Test002/Exam/src/test/java/de/hdm_stuttgart/mi/sd1/task1/TestHelperMultipleCopy.java
@@ -1,4 +1,4 @@
-package de.hdm_stuttgart.mi.sd1.test.task1;
+package de.hdm_stuttgart.mi.sd1.task1;
import de.hdm_stuttgart.mi.exam.unitmarking.ExaminationTestDefaults;
import de.hdm_stuttgart.mi.sd1.task1.Helper;
diff --git a/Klausuren/Sd1/Test002/Solve/pom.xml b/Klausuren/Sd1/Test002/Solve/pom.xml
index dc5c014f5ceeb25a5efddf01ec08e8e63208931d..5154f6ed37031d6d2befc9e6a4d4b53be9671617 100644
--- a/Klausuren/Sd1/Test002/Solve/pom.xml
+++ b/Klausuren/Sd1/Test002/Solve/pom.xml
@@ -3,19 +3,18 @@
<modelVersion>4.0.0</modelVersion>
<groupId>de.hdm_stuttgart.mi.sd1</groupId>
- <artifactId>sd1_test_02_solve</artifactId>
+ <artifactId>sd1_test002_solve</artifactId>
<version>0.9</version>
<packaging>jar</packaging>
- <name>sd1_test_01_solve</name>
+ <name>sd1_test002_solve</name>
<url>https://freedocs.mi.hdm-stuttgart.de/sd1_sect_mavenCli.html</url>
<properties>
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
- <maven.compiler.target>17</maven.compiler.target>
- <maven.compiler.source>17</maven.compiler.source>
+ <maven.compiler.release>17</maven.compiler.release>
<freedocs.url>https://freedocs.mi.hdm-stuttgart.de</freedocs.url>
<jdk.api_17.url>${freedocs.url}/doc/openjdk-17-doc/api/</jdk.api_17.url>
@@ -36,7 +35,6 @@
<artifactId>unitmarking</artifactId>
<version>1.2</version>
</dependency>
-
</dependencies>
<build>
@@ -44,13 +42,32 @@
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-compiler-plugin</artifactId>
- <version>3.10.1</version>
+ <version>3.11.0</version>
+ </plugin>
+
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-antrun-plugin</artifactId>
+ <version>3.1.0</version>
+ <executions>
+ <execution>
+ <phase>generate-sources</phase>
+ <goals>
+ <goal>run</goal>
+ </goals>
+ <configuration>
+ <target>
+ <echo>Javadoc root at file://${project.basedir}/target/site/apidocs/index.html</echo>
+ </target>
+ </configuration>
+ </execution>
+ </executions>
</plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-javadoc-plugin</artifactId>
- <version>3.4.1</version>
+ <artifactId>maven-javadoc-plugin</artifactId>
+ <version>3.5.0</version>
<configuration>
<release>17</release>
<doclint>all</doclint>
@@ -63,7 +80,7 @@
<windowtitle>Exam documentation</windowtitle>
<links>
- <link>https://freedocs.mi.hdm-stuttgart.de/doc/openjdk-17-doc/api/</link>
+ <link>${freedocs.url}/doc/openjdk-17-doc/api/</link>
</links>
<additionalOptions>
@@ -72,20 +89,29 @@
<nohelp>true</nohelp>
<header><![CDATA[
+ <script>
+ MathJax = {
+ chtml: { displayAlign: 'left',
+ displayIndent: '5ex'}
+ };
+ </script>
<script type="text/javascript" src="${mathjax.url}"></script>
<script type="text/javascript" src="{@docRoot}/resources/jdocSupplement.js"></script>
-
+
<link rel="stylesheet" href="${libhighlight.url}/styles/idea.min.css">
<script src="${libhighlight.url}/highlight.min.js"></script>
<script type="text/javascript">hljs.highlightAll();</script>]]>
</header>
+ <bottom><![CDATA[Copyright © 2023 Stuttgart Media University / MI. Licensed under
+ <a style="font-weight:bold;" href="https://creativecommons.org/licenses/by/4.0/legalcode" target="_blank"
+ >Creative Commons Attribution 4.0 International Public License</a>.]]></bottom>
</configuration>
</plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-assembly-plugin</artifactId>
- <version>3.4.2</version>
+ <version>3.6.0</version>
<configuration>
<descriptors>
<descriptor>src/main/assembly/assembly.xml</descriptor>
diff --git a/Klausuren/Sd1/Test002/Solve/src/test/java/de/hdm_stuttgart/mi/sd1/test/ShowReachedPoints.java b/Klausuren/Sd1/Test002/Solve/src/test/java/de/hdm_stuttgart/mi/sd1/ShowReachedPoints.java
similarity index 62%
rename from Klausuren/Sd1/Test002/Solve/src/test/java/de/hdm_stuttgart/mi/sd1/test/ShowReachedPoints.java
rename to Klausuren/Sd1/Test002/Solve/src/test/java/de/hdm_stuttgart/mi/sd1/ShowReachedPoints.java
index c82bb78da40bd87776c20fdbd7a581d21c2168ff..d7c7d62c8958bb6d1b45ba4e701f9950e49b8d34 100644
--- a/Klausuren/Sd1/Test002/Solve/src/test/java/de/hdm_stuttgart/mi/sd1/test/ShowReachedPoints.java
+++ b/Klausuren/Sd1/Test002/Solve/src/test/java/de/hdm_stuttgart/mi/sd1/ShowReachedPoints.java
@@ -1,9 +1,9 @@
-package de.hdm_stuttgart.mi.sd1.test;
+package de.hdm_stuttgart.mi.sd1;
import de.hdm_stuttgart.mi.exam.unitmarking.RunTests;
-import de.hdm_stuttgart.mi.sd1.test.task1.TestHelperMax;
-import de.hdm_stuttgart.mi.sd1.test.task1.TestHelperMaxAbsDiff;
-import de.hdm_stuttgart.mi.sd1.test.task1.TestHelperMultipleCopy;
+import de.hdm_stuttgart.mi.sd1.task1.TestHelperMax;
+import de.hdm_stuttgart.mi.sd1.task1.TestHelperMaxAbsDiff;
+import de.hdm_stuttgart.mi.sd1.task1.TestHelperMultipleCopy;
public class ShowReachedPoints {
diff --git a/Klausuren/Sd1/Test002/Solve/src/test/java/de/hdm_stuttgart/mi/sd1/test/task1/TestHelperMax.java b/Klausuren/Sd1/Test002/Solve/src/test/java/de/hdm_stuttgart/mi/sd1/task1/TestHelperMax.java
similarity index 95%
rename from Klausuren/Sd1/Test002/Solve/src/test/java/de/hdm_stuttgart/mi/sd1/test/task1/TestHelperMax.java
rename to Klausuren/Sd1/Test002/Solve/src/test/java/de/hdm_stuttgart/mi/sd1/task1/TestHelperMax.java
index f3062d565a409429df5ef00a837cfd7cc2dd25bb..6b3636adafe59b067e5586a08c4658f4a9ce2e73 100644
--- a/Klausuren/Sd1/Test002/Solve/src/test/java/de/hdm_stuttgart/mi/sd1/test/task1/TestHelperMax.java
+++ b/Klausuren/Sd1/Test002/Solve/src/test/java/de/hdm_stuttgart/mi/sd1/task1/TestHelperMax.java
@@ -1,4 +1,4 @@
-package de.hdm_stuttgart.mi.sd1.test.task1;
+package de.hdm_stuttgart.mi.sd1.task1;
import de.hdm_stuttgart.mi.exam.unitmarking.ExaminationTestDefaults;
import de.hdm_stuttgart.mi.sd1.task1.Helper;
diff --git a/Klausuren/Sd1/Test002/Solve/src/test/java/de/hdm_stuttgart/mi/sd1/test/task1/TestHelperMaxAbsDiff.java b/Klausuren/Sd1/Test002/Solve/src/test/java/de/hdm_stuttgart/mi/sd1/task1/TestHelperMaxAbsDiff.java
similarity index 96%
rename from Klausuren/Sd1/Test002/Solve/src/test/java/de/hdm_stuttgart/mi/sd1/test/task1/TestHelperMaxAbsDiff.java
rename to Klausuren/Sd1/Test002/Solve/src/test/java/de/hdm_stuttgart/mi/sd1/task1/TestHelperMaxAbsDiff.java
index ff8789cc5729e0ab65d054386367f5e7a672fae4..05ed7cf8c8b877a0a61c407efe15af1cd9c938b2 100644
--- a/Klausuren/Sd1/Test002/Solve/src/test/java/de/hdm_stuttgart/mi/sd1/test/task1/TestHelperMaxAbsDiff.java
+++ b/Klausuren/Sd1/Test002/Solve/src/test/java/de/hdm_stuttgart/mi/sd1/task1/TestHelperMaxAbsDiff.java
@@ -1,4 +1,4 @@
-package de.hdm_stuttgart.mi.sd1.test.task1;
+package de.hdm_stuttgart.mi.sd1.task1;
import static org.junit.Assert.assertEquals;
diff --git a/Klausuren/Sd1/Test002/Solve/src/test/java/de/hdm_stuttgart/mi/sd1/test/task1/TestHelperMultipleCopy.java b/Klausuren/Sd1/Test002/Solve/src/test/java/de/hdm_stuttgart/mi/sd1/task1/TestHelperMultipleCopy.java
similarity index 93%
rename from Klausuren/Sd1/Test002/Solve/src/test/java/de/hdm_stuttgart/mi/sd1/test/task1/TestHelperMultipleCopy.java
rename to Klausuren/Sd1/Test002/Solve/src/test/java/de/hdm_stuttgart/mi/sd1/task1/TestHelperMultipleCopy.java
index 9d0fdd34cdf6223ffaeec24a6cec9df41f7fb37f..33fd8c0f897d317d8678da5ec58c2c8949d91610 100644
--- a/Klausuren/Sd1/Test002/Solve/src/test/java/de/hdm_stuttgart/mi/sd1/test/task1/TestHelperMultipleCopy.java
+++ b/Klausuren/Sd1/Test002/Solve/src/test/java/de/hdm_stuttgart/mi/sd1/task1/TestHelperMultipleCopy.java
@@ -1,4 +1,4 @@
-package de.hdm_stuttgart.mi.sd1.test.task1;
+package de.hdm_stuttgart.mi.sd1.task1;
import de.hdm_stuttgart.mi.exam.unitmarking.ExaminationTestDefaults;
import de.hdm_stuttgart.mi.sd1.task1.Helper;
diff --git a/Klausuren/Sd1/Test003/Exam/pom.xml b/Klausuren/Sd1/Test003/Exam/pom.xml
index b8888e5fdd29bfd609e7ee1629bd66ba202829d9..04f2ecb39ca93fc107d8b276b03b1ccbf0e3326f 100644
--- a/Klausuren/Sd1/Test003/Exam/pom.xml
+++ b/Klausuren/Sd1/Test003/Exam/pom.xml
@@ -1,97 +1,139 @@
<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>de.hdm_stuttgart.mi.sd1</groupId>
- <artifactId>sd1_test_3</artifactId>
- <version>0.8</version>
- <packaging>jar</packaging>
-
- <name>sd1_test_3</name>
-
- <url>http://www.mi.hdm-stuttgart.de/freedocs/topic/de.hdm_stuttgart.mi.lectures/sd1SectUsingMaven.html</url>
-
- <properties>
- <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
- </properties>
-
- <repositories>
- <repository>
- <id>hdm-mi-internal-maven-repo</id>
- <url>https://maven.mi.hdm-stuttgart.de/artifacts</url>
- </repository>
- </repositories>
-
-
- <dependencies>
- <dependency>
- <groupId>junit</groupId>
- <artifactId>junit</artifactId>
- <version>4.13</version>
- <scope>test</scope>
- </dependency>
-
- <dependency>
- <groupId>org.apache.logging.log4j</groupId>
- <artifactId>log4j-core</artifactId>
- <version>2.16.0</version>
- </dependency>
-
- <dependency>
- <groupId>de.hdm_stuttgart.mi.exam</groupId>
- <artifactId>unitmarking</artifactId>
- <version>1.1</version>
- </dependency>
-
- </dependencies>
-
- <build>
- <plugins>
-
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-compiler-plugin</artifactId>
- <version>3.8.1</version>
- <configuration>
- <source>11</source>
- <target>11</target>
- </configuration>
- </plugin>
-
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-javadoc-plugin</artifactId>
- <version>3.1.1</version>
- <configuration>
- <doclint>none</doclint>
- <javadocExecutable>${java.home}/bin/javadoc</javadocExecutable>
- </configuration>
- </plugin>
-
- <plugin>
- <artifactId>maven-assembly-plugin</artifactId>
- <version>2.3</version>
- <configuration>
- <descriptor>src/main/assembly/assembly.xml</descriptor>
- </configuration>
- <executions>
- <execution>
- <id>make-assembly</id>
- <phase>package</phase>
- <goals>
- <goal>single</goal>
- </goals>
- <configuration>
- <archive>
- <manifest>
- <mainClass>de.hdm_stuttgart.mi.sd1.test.ShowReachedPoints</mainClass>
- </manifest>
- </archive>
- </configuration>
- </execution>
- </executions>
- </plugin>
-
- </plugins>
- </build>
+ 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>de.hdm_stuttgart.mi.sd1</groupId>
+ <artifactId>sd1_test003_exam</artifactId>
+ <version>0.9</version>
+ <packaging>jar</packaging>
+
+ <name>sd1_test003_exam</name>
+
+ <url>https://freedocs.mi.hdm-stuttgart.de/sd1_sect_mavenCli.html</url>
+
+ <properties>
+ <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
+
+ <maven.compiler.release>17</maven.compiler.release>
+
+ <freedocs.url>https://freedocs.mi.hdm-stuttgart.de</freedocs.url>
+ <jdk.api_17.url>${freedocs.url}/doc/openjdk-17-doc/api/</jdk.api_17.url>
+ <mathjax.url>${freedocs.url}/lib/MathJax/es5/tex-chtml.js</mathjax.url>
+ <libhighlight.url>${freedocs.url}/lib/highlight.js</libhighlight.url>
+ </properties>
+
+ <repositories>
+ <repository>
+ <id>hdm-mi-internal-maven-repo</id>
+ <url>https://maven.mi.hdm-stuttgart.de/nexus/repository/mi-maven/</url>
+ </repository>
+ </repositories>
+
+ <dependencies>
+ <dependency>
+ <groupId>de.hdm_stuttgart.mi.exam</groupId>
+ <artifactId>unitmarking</artifactId>
+ <version>1.2</version>
+ </dependency>
+ </dependencies>
+
+ <build>
+ <plugins>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-compiler-plugin</artifactId>
+ <version>3.11.0</version>
+ </plugin>
+
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-antrun-plugin</artifactId>
+ <version>3.1.0</version>
+ <executions>
+ <execution>
+ <phase>generate-sources</phase>
+ <goals>
+ <goal>run</goal>
+ </goals>
+ <configuration>
+ <target>
+ <echo>Javadoc root at file://${project.basedir}/target/site/apidocs/index.html</echo>
+ </target>
+ </configuration>
+ </execution>
+ </executions>
+ </plugin>
+
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-javadoc-plugin</artifactId>
+ <version>3.5.0</version>
+ <configuration>
+ <release>17</release>
+ <doclint>all</doclint>
+ <show>public</show>
+ <docfilessubdirs>true</docfilessubdirs>
+ <addStylesheets>
+ <stylesheet>resources/jdocSupplement.css</stylesheet>
+ </addStylesheets>
+
+ <windowtitle>Exam documentation</windowtitle>
+
+ <links>
+ <link>${freedocs.url}/doc/openjdk-17-doc/api/</link>
+ </links>
+
+ <additionalOptions>
+ <additionalOption>-html5 --allow-script-in-comments</additionalOption>
+ </additionalOptions>
+ <nohelp>true</nohelp>
+
+ <header><![CDATA[
+ <script>
+ MathJax = {
+ chtml: { displayAlign: 'left',
+ displayIndent: '5ex'}
+ };
+ </script>
+ <script type="text/javascript" src="${mathjax.url}"></script>
+ <script type="text/javascript" src="{@docRoot}/resources/jdocSupplement.js"></script>
+
+ <link rel="stylesheet" href="${libhighlight.url}/styles/idea.min.css">
+ <script src="${libhighlight.url}/highlight.min.js"></script>
+ <script type="text/javascript">hljs.highlightAll();</script>]]>
+ </header>
+ <bottom><![CDATA[Copyright © 2023 Stuttgart Media University / MI. Licensed under
+ <a style="font-weight:bold;" href="https://creativecommons.org/licenses/by/4.0/legalcode" target="_blank"
+ >Creative Commons Attribution 4.0 International Public License</a>.]]></bottom>
+ </configuration>
+ </plugin>
+
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-assembly-plugin</artifactId>
+ <version>3.6.0</version>
+ <configuration>
+ <descriptors>
+ <descriptor>src/main/assembly/assembly.xml</descriptor>
+ </descriptors>
+ </configuration>
+ <executions>
+ <execution>
+ <id>make-assembly</id>
+ <phase>package</phase>
+ <goals>
+ <goal>single</goal>
+ </goals>
+ <configuration>
+ <archive>
+ <manifest>
+ <mainClass>de.hdm_stuttgart.mi.sd1.ShowReachedPoints</mainClass>
+ </manifest>
+ </archive>
+ </configuration>
+ </execution>
+ </executions>
+ </plugin>
+ </plugins>
+ </build>
</project>
diff --git a/Klausuren/Sd1/Test003/Exam/src/main/java/de/hdm_stuttgart/mi/sd1/aufgabe1/BodenlegerKosten.java b/Klausuren/Sd1/Test003/Exam/src/main/java/de/hdm_stuttgart/mi/sd1/task1/BodenlegerKosten.java
similarity index 98%
rename from Klausuren/Sd1/Test003/Exam/src/main/java/de/hdm_stuttgart/mi/sd1/aufgabe1/BodenlegerKosten.java
rename to Klausuren/Sd1/Test003/Exam/src/main/java/de/hdm_stuttgart/mi/sd1/task1/BodenlegerKosten.java
index ac5f82147a766cab03b47a808a78c7f45ce1d66c..2f1020b9b19795b9938cce6613405d2343d32682 100644
--- a/Klausuren/Sd1/Test003/Exam/src/main/java/de/hdm_stuttgart/mi/sd1/aufgabe1/BodenlegerKosten.java
+++ b/Klausuren/Sd1/Test003/Exam/src/main/java/de/hdm_stuttgart/mi/sd1/task1/BodenlegerKosten.java
@@ -1,4 +1,4 @@
-package de.hdm_stuttgart.mi.sd1.aufgabe1;
+package de.hdm_stuttgart.mi.sd1.task1;
/**
* <p>Kostenabrechnung der Bodenverlegung eines einzelnen, rechteckförmigen Raums.
diff --git a/Klausuren/Sd1/Test003/Exam/src/main/java/de/hdm_stuttgart/mi/sd1/aufgabe1/Helper.java b/Klausuren/Sd1/Test003/Exam/src/main/java/de/hdm_stuttgart/mi/sd1/task1/Helper.java
similarity index 90%
rename from Klausuren/Sd1/Test003/Exam/src/main/java/de/hdm_stuttgart/mi/sd1/aufgabe1/Helper.java
rename to Klausuren/Sd1/Test003/Exam/src/main/java/de/hdm_stuttgart/mi/sd1/task1/Helper.java
index d163c7ac3393fbf11b885d58f38ef8403512bf2b..5d95a843bfc8018473568123dd8fe441972f2d16 100644
--- a/Klausuren/Sd1/Test003/Exam/src/main/java/de/hdm_stuttgart/mi/sd1/aufgabe1/Helper.java
+++ b/Klausuren/Sd1/Test003/Exam/src/main/java/de/hdm_stuttgart/mi/sd1/task1/Helper.java
@@ -1,4 +1,4 @@
-package de.hdm_stuttgart.mi.sd1.aufgabe1;
+package de.hdm_stuttgart.mi.sd1.task1;
public class Helper {
diff --git a/Klausuren/Sd1/Test003/Exam/src/main/java/de/hdm_stuttgart/mi/sd1/aufgabe2/Kreis.java b/Klausuren/Sd1/Test003/Exam/src/main/java/de/hdm_stuttgart/mi/sd1/task2/Kreis.java
similarity index 91%
rename from Klausuren/Sd1/Test003/Exam/src/main/java/de/hdm_stuttgart/mi/sd1/aufgabe2/Kreis.java
rename to Klausuren/Sd1/Test003/Exam/src/main/java/de/hdm_stuttgart/mi/sd1/task2/Kreis.java
index 742b7695b5139b6a9ccb9689821528b25b48b734..9ac28af676ca646c5f49eac0c1bdf79d20e7f2d6 100644
--- a/Klausuren/Sd1/Test003/Exam/src/main/java/de/hdm_stuttgart/mi/sd1/aufgabe2/Kreis.java
+++ b/Klausuren/Sd1/Test003/Exam/src/main/java/de/hdm_stuttgart/mi/sd1/task2/Kreis.java
@@ -1,4 +1,4 @@
-package de.hdm_stuttgart.mi.sd1.aufgabe2;
+package de.hdm_stuttgart.mi.sd1.task2;
public class Kreis {
diff --git a/Klausuren/Sd1/Test003/Exam/src/main/javadoc/resources/fonts/dejavu.css b/Klausuren/Sd1/Test003/Exam/src/main/javadoc/resources/fonts/dejavu.css
new file mode 100644
index 0000000000000000000000000000000000000000..4fec2b593cdcc719fd7edd6744a33a3395ca8401
--- /dev/null
+++ b/Klausuren/Sd1/Test003/Exam/src/main/javadoc/resources/fonts/dejavu.css
@@ -0,0 +1,3 @@
+/* shame on you, javadoc! Still providing
+@import url('resources/fonts/dejavu.css') line in stylesheet.css
+*/
\ No newline at end of file
diff --git a/Klausuren/Sd1/Test003/Exam/src/main/javadoc/resources/jdocSupplement.css b/Klausuren/Sd1/Test003/Exam/src/main/javadoc/resources/jdocSupplement.css
new file mode 100644
index 0000000000000000000000000000000000000000..08840cdbf55d1f43368245d0a965659c4411b2ee
--- /dev/null
+++ b/Klausuren/Sd1/Test003/Exam/src/main/javadoc/resources/jdocSupplement.css
@@ -0,0 +1,72 @@
+/* Javadoc extensions: */
+
+ul > li > ul {
+ list-style-type: circle;
+}
+
+table.goikTableDefaults,
+table.goikTableDefaults>caption,
+table.goikTableDefaults>tr>th,
+table.goikTableDefaults>tr>td,
+table.goikTableDefaults>tbody>tr>th,
+table.goikTableDefaults>tbody>tr>td {
+ border: 2px solid black;
+ border-collapse: collapse;
+ padding: 1ex;
+ vertical-align: top;
+}
+
+table.goikTableDefaults>caption {
+ /* border-top-style: solid; border-left-style: solid; border-right-style: solid' */
+ border-bottom-style: none;
+ font-weight: bold;
+ background:#dee3e9;
+ text-align:left;
+ padding:8px 3px 3px 7px;
+}
+
+table.goikTableDefaults>tbody>tr>td {
+ vertical-align:top;
+}
+table.goikTableDefaults {
+ border-spacing: 0px !important;
+}
+
+table.indexTable {
+ border-collapse: collapse;
+ border-style: hidden;
+}
+
+table.indexTable caption {
+ text-align: left;
+}
+
+table.indexTable td, table.indexTable th {
+ border: 1px solid black;
+ padding: 0.5ex;
+}
+
+em {
+ font-weight: bold;
+ font-style: normal;
+}
+section.implementationHints>h3 {
+ font-weight: bold;
+ background-color: rgb(222, 227, 233);
+}
+
+code {
+ white-space: pre;
+}
+
+.implementationHints {
+ background-color: hsl(120, 100%, 95%) !important;
+}
+
+.myRed {
+ color: red;
+}
+
+.myGreen {
+ color: limegreen;
+}
diff --git a/Klausuren/Sd1/Test003/Exam/src/main/javadoc/resources/jdocSupplement.js b/Klausuren/Sd1/Test003/Exam/src/main/javadoc/resources/jdocSupplement.js
new file mode 100644
index 0000000000000000000000000000000000000000..97911e5581090aac5e37323427450f8c8c8a3f94
--- /dev/null
+++ b/Klausuren/Sd1/Test003/Exam/src/main/javadoc/resources/jdocSupplement.js
@@ -0,0 +1,7 @@
+for(var i in document.links) {
+ var link = document.links[i];
+ if (link.href && link.href.indexOf('http') === 0) {
+ link.target = '_blank';
+ }
+}
+
diff --git a/Klausuren/Sd1/Test003/Exam/src/test/java/de/hdm_stuttgart/mi/sd1/test/ShowReachedPoints.java b/Klausuren/Sd1/Test003/Exam/src/test/java/de/hdm_stuttgart/mi/sd1/ShowReachedPoints.java
similarity index 63%
rename from Klausuren/Sd1/Test003/Exam/src/test/java/de/hdm_stuttgart/mi/sd1/test/ShowReachedPoints.java
rename to Klausuren/Sd1/Test003/Exam/src/test/java/de/hdm_stuttgart/mi/sd1/ShowReachedPoints.java
index 43259d064914c42ae021e1097039d67fa194c673..9293d8e972163dbdf06bde3c1568584ac75a13bc 100644
--- a/Klausuren/Sd1/Test003/Exam/src/test/java/de/hdm_stuttgart/mi/sd1/test/ShowReachedPoints.java
+++ b/Klausuren/Sd1/Test003/Exam/src/test/java/de/hdm_stuttgart/mi/sd1/ShowReachedPoints.java
@@ -1,9 +1,9 @@
-package de.hdm_stuttgart.mi.sd1.test;
+package de.hdm_stuttgart.mi.sd1;
import de.hdm_stuttgart.mi.exam.unitmarking.RunTests;
-import de.hdm_stuttgart.mi.sd1.test.aufgabe1.TestBodenlegerKosten;
-import de.hdm_stuttgart.mi.sd1.test.aufgabe1.TestHelper;
-import de.hdm_stuttgart.mi.sd1.test.aufgabe2.TestKreis;
+import de.hdm_stuttgart.mi.sd1.task1.TestBodenlegerKosten;
+import de.hdm_stuttgart.mi.sd1.task1.TestHelper;
+import de.hdm_stuttgart.mi.sd1.task2.TestKreis;
public class ShowReachedPoints {
diff --git a/Klausuren/Sd1/Test003/Exam/src/test/java/de/hdm_stuttgart/mi/sd1/test/aufgabe1/TestBodenlegerKosten.java b/Klausuren/Sd1/Test003/Exam/src/test/java/de/hdm_stuttgart/mi/sd1/task1/TestBodenlegerKosten.java
similarity index 94%
rename from Klausuren/Sd1/Test003/Exam/src/test/java/de/hdm_stuttgart/mi/sd1/test/aufgabe1/TestBodenlegerKosten.java
rename to Klausuren/Sd1/Test003/Exam/src/test/java/de/hdm_stuttgart/mi/sd1/task1/TestBodenlegerKosten.java
index fac549414099e9f15c58359e4ebcb5ddd1c9c9b1..899120ba4e4aab7f215dab311dcf2d5b20e55931 100644
--- a/Klausuren/Sd1/Test003/Exam/src/test/java/de/hdm_stuttgart/mi/sd1/test/aufgabe1/TestBodenlegerKosten.java
+++ b/Klausuren/Sd1/Test003/Exam/src/test/java/de/hdm_stuttgart/mi/sd1/task1/TestBodenlegerKosten.java
@@ -1,4 +1,4 @@
-package de.hdm_stuttgart.mi.sd1.test.aufgabe1;
+package de.hdm_stuttgart.mi.sd1.task1;
import org.junit.Assert;
import org.junit.FixMethodOrder;
@@ -7,7 +7,6 @@ import org.junit.runners.MethodSorters;
import de.hdm_stuttgart.mi.exam.unitmarking.ExaminationTestDefaults;
import de.hdm_stuttgart.mi.exam.unitmarking.Marking;
-import de.hdm_stuttgart.mi.sd1.aufgabe1.BodenlegerKosten;
/**
* <p>Testen des Auftretens eines Teil-String in einem vorgegebenen String.</p>
diff --git a/Klausuren/Sd1/Test003/Solve/src/test/java/de/hdm_stuttgart/mi/sd1/test/aufgabe1/TestHelper.java b/Klausuren/Sd1/Test003/Exam/src/test/java/de/hdm_stuttgart/mi/sd1/task1/TestHelper.java
similarity index 89%
rename from Klausuren/Sd1/Test003/Solve/src/test/java/de/hdm_stuttgart/mi/sd1/test/aufgabe1/TestHelper.java
rename to Klausuren/Sd1/Test003/Exam/src/test/java/de/hdm_stuttgart/mi/sd1/task1/TestHelper.java
index d1401ff962dbc9b6b62ffabd625edafa8545e376..f134aa59140d4297e0b63fc8ebb22cfb0e66a21f 100644
--- a/Klausuren/Sd1/Test003/Solve/src/test/java/de/hdm_stuttgart/mi/sd1/test/aufgabe1/TestHelper.java
+++ b/Klausuren/Sd1/Test003/Exam/src/test/java/de/hdm_stuttgart/mi/sd1/task1/TestHelper.java
@@ -1,9 +1,7 @@
-package de.hdm_stuttgart.mi.sd1.test.aufgabe1;
+package de.hdm_stuttgart.mi.sd1.task1;
import de.hdm_stuttgart.mi.exam.unitmarking.ExaminationTestDefaults;
import de.hdm_stuttgart.mi.exam.unitmarking.Marking;
-import de.hdm_stuttgart.mi.sd1.aufgabe1.BodenlegerKosten;
-import de.hdm_stuttgart.mi.sd1.aufgabe1.Helper;
import org.junit.Assert;
import org.junit.FixMethodOrder;
import org.junit.Test;
diff --git a/Klausuren/Sd1/Test003/Exam/src/test/java/de/hdm_stuttgart/mi/sd1/test/aufgabe2/TestKreis.java b/Klausuren/Sd1/Test003/Exam/src/test/java/de/hdm_stuttgart/mi/sd1/task2/TestKreis.java
similarity index 94%
rename from Klausuren/Sd1/Test003/Exam/src/test/java/de/hdm_stuttgart/mi/sd1/test/aufgabe2/TestKreis.java
rename to Klausuren/Sd1/Test003/Exam/src/test/java/de/hdm_stuttgart/mi/sd1/task2/TestKreis.java
index 2a79c0f4526608e084fa57596c16d72bd636217d..9b2f531ee6fc01f49c0c1859fc805e3b40ca7919 100644
--- a/Klausuren/Sd1/Test003/Exam/src/test/java/de/hdm_stuttgart/mi/sd1/test/aufgabe2/TestKreis.java
+++ b/Klausuren/Sd1/Test003/Exam/src/test/java/de/hdm_stuttgart/mi/sd1/task2/TestKreis.java
@@ -1,6 +1,5 @@
-package de.hdm_stuttgart.mi.sd1.test.aufgabe2;
+package de.hdm_stuttgart.mi.sd1.task2;
-import de.hdm_stuttgart.mi.sd1.aufgabe2.Kreis;
import org.junit.Assert;
import org.junit.FixMethodOrder;
import org.junit.Test;
diff --git a/Klausuren/Sd1/Test003/Solve/Doc/klausur.xml b/Klausuren/Sd1/Test003/Solve/Doc/klausur.xml
index 059ae43c6e18a9767a0c38759cb623f4034cf373..0dbffb5b373b42c1f0f8def375d21a5e599a229d 100644
--- a/Klausuren/Sd1/Test003/Solve/Doc/klausur.xml
+++ b/Klausuren/Sd1/Test003/Solve/Doc/klausur.xml
@@ -51,7 +51,7 @@
<para>Vervollständigen Sie die Implementierung aller Methoden aus
folgenden Klassen im <foreignphrase
xml:lang="en">package</foreignphrase>
- <package>de.hdm_stuttgart.mi.sd1.aufgabe1</package>:</para>
+ <package>de.hdm_stuttgart.mi.sd1.task1</package>:</para>
<itemizedlist>
<listitem>
@@ -129,7 +129,7 @@ Laminat, 2€ pro Meter Sockelleiste und 37 Km Anfahrt betragen 298.1€</scree
<para>Das <productname>Maven</productname> Projektskelett enthält eine
Klasse <classname>Kreis</classname> im <foreignphrase
xml:lang="en">Package</foreignphrase>
- <package>de.hdm_stuttgart.mi.sd1.aufgabe2</package>.</para>
+ <package>de.hdm_stuttgart.mi.sd1.task2</package>.</para>
<para>Implementieren Sie die Klasse und insbesondere den Konstruktor
sowie die Methode <methodname>enthaelt(...)</methodname>. Nutzen Sie zum
diff --git a/Klausuren/Sd1/Test003/Solve/pom.xml b/Klausuren/Sd1/Test003/Solve/pom.xml
index 49217d7206e17ee93b775a061f6bee4d8266b627..16a10603e5844487fc0907c64ea775a35f28c6aa 100644
--- a/Klausuren/Sd1/Test003/Solve/pom.xml
+++ b/Klausuren/Sd1/Test003/Solve/pom.xml
@@ -1,97 +1,139 @@
<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>de.hdm_stuttgart.mi.sd1</groupId>
- <artifactId>sd1_test_3</artifactId>
- <version>0.9</version>
- <packaging>jar</packaging>
-
- <name>sd1_test_3</name>
-
- <url>http://www.mi.hdm-stuttgart.de/freedocs/topic/de.hdm_stuttgart.mi.lectures/sd1SectUsingMaven.html</url>
-
- <properties>
- <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
- </properties>
-
- <repositories>
- <repository>
- <id>hdm-mi-internal-maven-repo</id>
- <url>https://maven.mi.hdm-stuttgart.de/artifacts</url>
- </repository>
- </repositories>
-
-
- <dependencies>
- <dependency>
- <groupId>junit</groupId>
- <artifactId>junit</artifactId>
- <version>4.13</version>
- <scope>test</scope>
- </dependency>
-
- <dependency>
- <groupId>org.apache.logging.log4j</groupId>
- <artifactId>log4j-core</artifactId>
- <version>2.16.0</version>
- </dependency>
-
- <dependency>
- <groupId>de.hdm_stuttgart.mi.exam</groupId>
- <artifactId>unitmarking</artifactId>
- <version>1.1</version>
- </dependency>
-
- </dependencies>
-
- <build>
- <plugins>
-
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-compiler-plugin</artifactId>
- <version>3.8.1</version>
- <configuration>
- <source>11</source>
- <target>11</target>
- </configuration>
- </plugin>
-
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-javadoc-plugin</artifactId>
- <version>3.1.1</version>
- <configuration>
- <doclint>none</doclint>
- <javadocExecutable>${java.home}/bin/javadoc</javadocExecutable>
- </configuration>
- </plugin>
-
- <plugin>
- <artifactId>maven-assembly-plugin</artifactId>
- <version>2.3</version>
- <configuration>
- <descriptor>src/main/assembly/assembly.xml</descriptor>
- </configuration>
- <executions>
- <execution>
- <id>make-assembly</id>
- <phase>package</phase>
- <goals>
- <goal>single</goal>
- </goals>
- <configuration>
- <archive>
- <manifest>
- <mainClass>de.hdm_stuttgart.mi.sd1.test.ShowReachedPoints</mainClass>
- </manifest>
- </archive>
- </configuration>
- </execution>
- </executions>
- </plugin>
-
- </plugins>
- </build>
+ 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>de.hdm_stuttgart.mi.sd1</groupId>
+ <artifactId>sd1_test003_solve</artifactId>
+ <version>0.9</version>
+ <packaging>jar</packaging>
+
+ <name>sd1_test003_solve</name>
+
+ <url>https://freedocs.mi.hdm-stuttgart.de/sd1_sect_mavenCli.html</url>
+
+ <properties>
+ <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
+
+ <maven.compiler.release>17</maven.compiler.release>
+
+ <freedocs.url>https://freedocs.mi.hdm-stuttgart.de</freedocs.url>
+ <jdk.api_17.url>${freedocs.url}/doc/openjdk-17-doc/api/</jdk.api_17.url>
+ <mathjax.url>${freedocs.url}/lib/MathJax/es5/tex-chtml.js</mathjax.url>
+ <libhighlight.url>${freedocs.url}/lib/highlight.js</libhighlight.url>
+ </properties>
+
+ <repositories>
+ <repository>
+ <id>hdm-mi-internal-maven-repo</id>
+ <url>https://maven.mi.hdm-stuttgart.de/nexus/repository/mi-maven/</url>
+ </repository>
+ </repositories>
+
+ <dependencies>
+ <dependency>
+ <groupId>de.hdm_stuttgart.mi.exam</groupId>
+ <artifactId>unitmarking</artifactId>
+ <version>1.2</version>
+ </dependency>
+ </dependencies>
+
+ <build>
+ <plugins>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-compiler-plugin</artifactId>
+ <version>3.11.0</version>
+ </plugin>
+
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-antrun-plugin</artifactId>
+ <version>3.1.0</version>
+ <executions>
+ <execution>
+ <phase>generate-sources</phase>
+ <goals>
+ <goal>run</goal>
+ </goals>
+ <configuration>
+ <target>
+ <echo>Javadoc root at file://${project.basedir}/target/site/apidocs/index.html</echo>
+ </target>
+ </configuration>
+ </execution>
+ </executions>
+ </plugin>
+
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-javadoc-plugin</artifactId>
+ <version>3.5.0</version>
+ <configuration>
+ <release>17</release>
+ <doclint>all</doclint>
+ <show>public</show>
+ <docfilessubdirs>true</docfilessubdirs>
+ <addStylesheets>
+ <stylesheet>resources/jdocSupplement.css</stylesheet>
+ </addStylesheets>
+
+ <windowtitle>Exam documentation</windowtitle>
+
+ <links>
+ <link>${freedocs.url}/doc/openjdk-17-doc/api/</link>
+ </links>
+
+ <additionalOptions>
+ <additionalOption>-html5 --allow-script-in-comments</additionalOption>
+ </additionalOptions>
+ <nohelp>true</nohelp>
+
+ <header><![CDATA[
+ <script>
+ MathJax = {
+ chtml: { displayAlign: 'left',
+ displayIndent: '5ex'}
+ };
+ </script>
+ <script type="text/javascript" src="${mathjax.url}"></script>
+ <script type="text/javascript" src="{@docRoot}/resources/jdocSupplement.js"></script>
+
+ <link rel="stylesheet" href="${libhighlight.url}/styles/idea.min.css">
+ <script src="${libhighlight.url}/highlight.min.js"></script>
+ <script type="text/javascript">hljs.highlightAll();</script>]]>
+ </header>
+ <bottom><![CDATA[Copyright © 2023 Stuttgart Media University / MI. Licensed under
+ <a style="font-weight:bold;" href="https://creativecommons.org/licenses/by/4.0/legalcode" target="_blank"
+ >Creative Commons Attribution 4.0 International Public License</a>.]]></bottom>
+ </configuration>
+ </plugin>
+
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-assembly-plugin</artifactId>
+ <version>3.6.0</version>
+ <configuration>
+ <descriptors>
+ <descriptor>src/main/assembly/assembly.xml</descriptor>
+ </descriptors>
+ </configuration>
+ <executions>
+ <execution>
+ <id>make-assembly</id>
+ <phase>package</phase>
+ <goals>
+ <goal>single</goal>
+ </goals>
+ <configuration>
+ <archive>
+ <manifest>
+ <mainClass>de.hdm_stuttgart.mi.sd1.ShowReachedPoints</mainClass>
+ </manifest>
+ </archive>
+ </configuration>
+ </execution>
+ </executions>
+ </plugin>
+ </plugins>
+ </build>
</project>
diff --git a/Klausuren/Sd1/Test003/Solve/src/main/java/de/hdm_stuttgart/mi/sd1/aufgabe1/BodenlegerKosten.java b/Klausuren/Sd1/Test003/Solve/src/main/java/de/hdm_stuttgart/mi/sd1/task1/BodenlegerKosten.java
similarity index 98%
rename from Klausuren/Sd1/Test003/Solve/src/main/java/de/hdm_stuttgart/mi/sd1/aufgabe1/BodenlegerKosten.java
rename to Klausuren/Sd1/Test003/Solve/src/main/java/de/hdm_stuttgart/mi/sd1/task1/BodenlegerKosten.java
index 392a906aab11517c6c05b048b44f1d9d8a8b5e38..1534ce094028f2fe37aca0e4c3517e89dc0795fe 100644
--- a/Klausuren/Sd1/Test003/Solve/src/main/java/de/hdm_stuttgart/mi/sd1/aufgabe1/BodenlegerKosten.java
+++ b/Klausuren/Sd1/Test003/Solve/src/main/java/de/hdm_stuttgart/mi/sd1/task1/BodenlegerKosten.java
@@ -1,4 +1,4 @@
-package de.hdm_stuttgart.mi.sd1.aufgabe1;
+package de.hdm_stuttgart.mi.sd1.task1;
/**
* <p>Kostenabrechnung der Bodenverlegung eines einzelnen, rechteckförmigen Raums.
diff --git a/Klausuren/Sd1/Test003/Solve/src/main/java/de/hdm_stuttgart/mi/sd1/aufgabe1/Helper.java b/Klausuren/Sd1/Test003/Solve/src/main/java/de/hdm_stuttgart/mi/sd1/task1/Helper.java
similarity index 91%
rename from Klausuren/Sd1/Test003/Solve/src/main/java/de/hdm_stuttgart/mi/sd1/aufgabe1/Helper.java
rename to Klausuren/Sd1/Test003/Solve/src/main/java/de/hdm_stuttgart/mi/sd1/task1/Helper.java
index 15c6b708b00e1a716c7caf2e73f0737787e4b69c..e2a43b310572d0a762e45ebca45e96aae2a86dcd 100644
--- a/Klausuren/Sd1/Test003/Solve/src/main/java/de/hdm_stuttgart/mi/sd1/aufgabe1/Helper.java
+++ b/Klausuren/Sd1/Test003/Solve/src/main/java/de/hdm_stuttgart/mi/sd1/task1/Helper.java
@@ -1,4 +1,4 @@
-package de.hdm_stuttgart.mi.sd1.aufgabe1;
+package de.hdm_stuttgart.mi.sd1.task1;
public class Helper {
diff --git a/Klausuren/Sd1/Test003/Solve/src/main/java/de/hdm_stuttgart/mi/sd1/aufgabe1/beispiele/Boden.java b/Klausuren/Sd1/Test003/Solve/src/main/java/de/hdm_stuttgart/mi/sd1/task1/beispiele/Boden.java
similarity index 74%
rename from Klausuren/Sd1/Test003/Solve/src/main/java/de/hdm_stuttgart/mi/sd1/aufgabe1/beispiele/Boden.java
rename to Klausuren/Sd1/Test003/Solve/src/main/java/de/hdm_stuttgart/mi/sd1/task1/beispiele/Boden.java
index e235b444198faff32de728695fff823c0e984266..ebf38011399d18a8d3aadce8ca26438649f12503 100644
--- a/Klausuren/Sd1/Test003/Solve/src/main/java/de/hdm_stuttgart/mi/sd1/aufgabe1/beispiele/Boden.java
+++ b/Klausuren/Sd1/Test003/Solve/src/main/java/de/hdm_stuttgart/mi/sd1/task1/beispiele/Boden.java
@@ -1,6 +1,6 @@
-package de.hdm_stuttgart.mi.sd1.aufgabe1.beispiele;
+package de.hdm_stuttgart.mi.sd1.task1.beispiele;
-import de.hdm_stuttgart.mi.sd1.aufgabe1.BodenlegerKosten;
+import de.hdm_stuttgart.mi.sd1.task1.BodenlegerKosten;
public class Boden {
diff --git a/Klausuren/Sd1/Test003/Solve/src/main/java/de/hdm_stuttgart/mi/sd1/aufgabe1/beispiele/Quersumme.java b/Klausuren/Sd1/Test003/Solve/src/main/java/de/hdm_stuttgart/mi/sd1/task1/beispiele/Quersumme.java
similarity index 65%
rename from Klausuren/Sd1/Test003/Solve/src/main/java/de/hdm_stuttgart/mi/sd1/aufgabe1/beispiele/Quersumme.java
rename to Klausuren/Sd1/Test003/Solve/src/main/java/de/hdm_stuttgart/mi/sd1/task1/beispiele/Quersumme.java
index ab81470b3432d87a0938ccd9feca1fef424c4b36..5f69860dad2cec3705fcf734d5ce1cf815709547 100644
--- a/Klausuren/Sd1/Test003/Solve/src/main/java/de/hdm_stuttgart/mi/sd1/aufgabe1/beispiele/Quersumme.java
+++ b/Klausuren/Sd1/Test003/Solve/src/main/java/de/hdm_stuttgart/mi/sd1/task1/beispiele/Quersumme.java
@@ -1,6 +1,6 @@
-package de.hdm_stuttgart.mi.sd1.aufgabe1.beispiele;
+package de.hdm_stuttgart.mi.sd1.task1.beispiele;
-import de.hdm_stuttgart.mi.sd1.aufgabe1.Helper;
+import de.hdm_stuttgart.mi.sd1.task1.Helper;
public class Quersumme {
diff --git a/Klausuren/Sd1/Test003/Solve/src/main/java/de/hdm_stuttgart/mi/sd1/aufgabe2/Kreis.java b/Klausuren/Sd1/Test003/Solve/src/main/java/de/hdm_stuttgart/mi/sd1/task2/Kreis.java
similarity index 93%
rename from Klausuren/Sd1/Test003/Solve/src/main/java/de/hdm_stuttgart/mi/sd1/aufgabe2/Kreis.java
rename to Klausuren/Sd1/Test003/Solve/src/main/java/de/hdm_stuttgart/mi/sd1/task2/Kreis.java
index cad7c567eb4bf9c1cc79399fb2a8f6dd8ca9f6c2..68fa12dde9fcbee42c8eb981ca813c24ce59ee8a 100644
--- a/Klausuren/Sd1/Test003/Solve/src/main/java/de/hdm_stuttgart/mi/sd1/aufgabe2/Kreis.java
+++ b/Klausuren/Sd1/Test003/Solve/src/main/java/de/hdm_stuttgart/mi/sd1/task2/Kreis.java
@@ -1,4 +1,4 @@
-package de.hdm_stuttgart.mi.sd1.aufgabe2;
+package de.hdm_stuttgart.mi.sd1.task2;
public class Kreis {
diff --git a/Klausuren/Sd1/Test003/Solve/src/main/java/de/hdm_stuttgart/mi/sd1/aufgabe2/beispiel/EnthaltenOderNicht.java b/Klausuren/Sd1/Test003/Solve/src/main/java/de/hdm_stuttgart/mi/sd1/task2/beispiel/EnthaltenOderNicht.java
similarity index 78%
rename from Klausuren/Sd1/Test003/Solve/src/main/java/de/hdm_stuttgart/mi/sd1/aufgabe2/beispiel/EnthaltenOderNicht.java
rename to Klausuren/Sd1/Test003/Solve/src/main/java/de/hdm_stuttgart/mi/sd1/task2/beispiel/EnthaltenOderNicht.java
index acc3baf4cd35c26c390441e4c410080a114a8ff7..15f86546a3940d4e09a27e7b129fd337f027a12f 100644
--- a/Klausuren/Sd1/Test003/Solve/src/main/java/de/hdm_stuttgart/mi/sd1/aufgabe2/beispiel/EnthaltenOderNicht.java
+++ b/Klausuren/Sd1/Test003/Solve/src/main/java/de/hdm_stuttgart/mi/sd1/task2/beispiel/EnthaltenOderNicht.java
@@ -1,6 +1,6 @@
-package de.hdm_stuttgart.mi.sd1.aufgabe2.beispiel;
+package de.hdm_stuttgart.mi.sd1.task2.beispiel;
-import de.hdm_stuttgart.mi.sd1.aufgabe2.Kreis;
+import de.hdm_stuttgart.mi.sd1.task2.Kreis;
public class EnthaltenOderNicht {
diff --git a/Klausuren/Sd1/Test003/Solve/src/main/javadoc/resources/fonts/dejavu.css b/Klausuren/Sd1/Test003/Solve/src/main/javadoc/resources/fonts/dejavu.css
new file mode 100644
index 0000000000000000000000000000000000000000..4fec2b593cdcc719fd7edd6744a33a3395ca8401
--- /dev/null
+++ b/Klausuren/Sd1/Test003/Solve/src/main/javadoc/resources/fonts/dejavu.css
@@ -0,0 +1,3 @@
+/* shame on you, javadoc! Still providing
+@import url('resources/fonts/dejavu.css') line in stylesheet.css
+*/
\ No newline at end of file
diff --git a/Klausuren/Sd1/Test003/Solve/src/main/javadoc/resources/jdocSupplement.css b/Klausuren/Sd1/Test003/Solve/src/main/javadoc/resources/jdocSupplement.css
new file mode 100644
index 0000000000000000000000000000000000000000..08840cdbf55d1f43368245d0a965659c4411b2ee
--- /dev/null
+++ b/Klausuren/Sd1/Test003/Solve/src/main/javadoc/resources/jdocSupplement.css
@@ -0,0 +1,72 @@
+/* Javadoc extensions: */
+
+ul > li > ul {
+ list-style-type: circle;
+}
+
+table.goikTableDefaults,
+table.goikTableDefaults>caption,
+table.goikTableDefaults>tr>th,
+table.goikTableDefaults>tr>td,
+table.goikTableDefaults>tbody>tr>th,
+table.goikTableDefaults>tbody>tr>td {
+ border: 2px solid black;
+ border-collapse: collapse;
+ padding: 1ex;
+ vertical-align: top;
+}
+
+table.goikTableDefaults>caption {
+ /* border-top-style: solid; border-left-style: solid; border-right-style: solid' */
+ border-bottom-style: none;
+ font-weight: bold;
+ background:#dee3e9;
+ text-align:left;
+ padding:8px 3px 3px 7px;
+}
+
+table.goikTableDefaults>tbody>tr>td {
+ vertical-align:top;
+}
+table.goikTableDefaults {
+ border-spacing: 0px !important;
+}
+
+table.indexTable {
+ border-collapse: collapse;
+ border-style: hidden;
+}
+
+table.indexTable caption {
+ text-align: left;
+}
+
+table.indexTable td, table.indexTable th {
+ border: 1px solid black;
+ padding: 0.5ex;
+}
+
+em {
+ font-weight: bold;
+ font-style: normal;
+}
+section.implementationHints>h3 {
+ font-weight: bold;
+ background-color: rgb(222, 227, 233);
+}
+
+code {
+ white-space: pre;
+}
+
+.implementationHints {
+ background-color: hsl(120, 100%, 95%) !important;
+}
+
+.myRed {
+ color: red;
+}
+
+.myGreen {
+ color: limegreen;
+}
diff --git a/Klausuren/Sd1/Test003/Solve/src/main/javadoc/resources/jdocSupplement.js b/Klausuren/Sd1/Test003/Solve/src/main/javadoc/resources/jdocSupplement.js
new file mode 100644
index 0000000000000000000000000000000000000000..97911e5581090aac5e37323427450f8c8c8a3f94
--- /dev/null
+++ b/Klausuren/Sd1/Test003/Solve/src/main/javadoc/resources/jdocSupplement.js
@@ -0,0 +1,7 @@
+for(var i in document.links) {
+ var link = document.links[i];
+ if (link.href && link.href.indexOf('http') === 0) {
+ link.target = '_blank';
+ }
+}
+
diff --git a/Klausuren/Sd1/Test003/Solve/src/test/java/de/hdm_stuttgart/mi/sd1/test/ShowReachedPoints.java b/Klausuren/Sd1/Test003/Solve/src/test/java/de/hdm_stuttgart/mi/sd1/ShowReachedPoints.java
similarity index 63%
rename from Klausuren/Sd1/Test003/Solve/src/test/java/de/hdm_stuttgart/mi/sd1/test/ShowReachedPoints.java
rename to Klausuren/Sd1/Test003/Solve/src/test/java/de/hdm_stuttgart/mi/sd1/ShowReachedPoints.java
index 43259d064914c42ae021e1097039d67fa194c673..9293d8e972163dbdf06bde3c1568584ac75a13bc 100644
--- a/Klausuren/Sd1/Test003/Solve/src/test/java/de/hdm_stuttgart/mi/sd1/test/ShowReachedPoints.java
+++ b/Klausuren/Sd1/Test003/Solve/src/test/java/de/hdm_stuttgart/mi/sd1/ShowReachedPoints.java
@@ -1,9 +1,9 @@
-package de.hdm_stuttgart.mi.sd1.test;
+package de.hdm_stuttgart.mi.sd1;
import de.hdm_stuttgart.mi.exam.unitmarking.RunTests;
-import de.hdm_stuttgart.mi.sd1.test.aufgabe1.TestBodenlegerKosten;
-import de.hdm_stuttgart.mi.sd1.test.aufgabe1.TestHelper;
-import de.hdm_stuttgart.mi.sd1.test.aufgabe2.TestKreis;
+import de.hdm_stuttgart.mi.sd1.task1.TestBodenlegerKosten;
+import de.hdm_stuttgart.mi.sd1.task1.TestHelper;
+import de.hdm_stuttgart.mi.sd1.task2.TestKreis;
public class ShowReachedPoints {
diff --git a/Klausuren/Sd1/Test003/Solve/src/test/java/de/hdm_stuttgart/mi/sd1/test/aufgabe1/TestBodenlegerKosten.java b/Klausuren/Sd1/Test003/Solve/src/test/java/de/hdm_stuttgart/mi/sd1/task1/TestBodenlegerKosten.java
similarity index 94%
rename from Klausuren/Sd1/Test003/Solve/src/test/java/de/hdm_stuttgart/mi/sd1/test/aufgabe1/TestBodenlegerKosten.java
rename to Klausuren/Sd1/Test003/Solve/src/test/java/de/hdm_stuttgart/mi/sd1/task1/TestBodenlegerKosten.java
index fac549414099e9f15c58359e4ebcb5ddd1c9c9b1..899120ba4e4aab7f215dab311dcf2d5b20e55931 100644
--- a/Klausuren/Sd1/Test003/Solve/src/test/java/de/hdm_stuttgart/mi/sd1/test/aufgabe1/TestBodenlegerKosten.java
+++ b/Klausuren/Sd1/Test003/Solve/src/test/java/de/hdm_stuttgart/mi/sd1/task1/TestBodenlegerKosten.java
@@ -1,4 +1,4 @@
-package de.hdm_stuttgart.mi.sd1.test.aufgabe1;
+package de.hdm_stuttgart.mi.sd1.task1;
import org.junit.Assert;
import org.junit.FixMethodOrder;
@@ -7,7 +7,6 @@ import org.junit.runners.MethodSorters;
import de.hdm_stuttgart.mi.exam.unitmarking.ExaminationTestDefaults;
import de.hdm_stuttgart.mi.exam.unitmarking.Marking;
-import de.hdm_stuttgart.mi.sd1.aufgabe1.BodenlegerKosten;
/**
* <p>Testen des Auftretens eines Teil-String in einem vorgegebenen String.</p>
diff --git a/Klausuren/Sd1/Test003/Exam/src/test/java/de/hdm_stuttgart/mi/sd1/test/aufgabe1/TestHelper.java b/Klausuren/Sd1/Test003/Solve/src/test/java/de/hdm_stuttgart/mi/sd1/task1/TestHelper.java
similarity index 89%
rename from Klausuren/Sd1/Test003/Exam/src/test/java/de/hdm_stuttgart/mi/sd1/test/aufgabe1/TestHelper.java
rename to Klausuren/Sd1/Test003/Solve/src/test/java/de/hdm_stuttgart/mi/sd1/task1/TestHelper.java
index d1401ff962dbc9b6b62ffabd625edafa8545e376..f134aa59140d4297e0b63fc8ebb22cfb0e66a21f 100644
--- a/Klausuren/Sd1/Test003/Exam/src/test/java/de/hdm_stuttgart/mi/sd1/test/aufgabe1/TestHelper.java
+++ b/Klausuren/Sd1/Test003/Solve/src/test/java/de/hdm_stuttgart/mi/sd1/task1/TestHelper.java
@@ -1,9 +1,7 @@
-package de.hdm_stuttgart.mi.sd1.test.aufgabe1;
+package de.hdm_stuttgart.mi.sd1.task1;
import de.hdm_stuttgart.mi.exam.unitmarking.ExaminationTestDefaults;
import de.hdm_stuttgart.mi.exam.unitmarking.Marking;
-import de.hdm_stuttgart.mi.sd1.aufgabe1.BodenlegerKosten;
-import de.hdm_stuttgart.mi.sd1.aufgabe1.Helper;
import org.junit.Assert;
import org.junit.FixMethodOrder;
import org.junit.Test;
diff --git a/Klausuren/Sd1/Test003/Solve/src/test/java/de/hdm_stuttgart/mi/sd1/test/aufgabe2/TestKreis.java b/Klausuren/Sd1/Test003/Solve/src/test/java/de/hdm_stuttgart/mi/sd1/task2/TestKreis.java
similarity index 94%
rename from Klausuren/Sd1/Test003/Solve/src/test/java/de/hdm_stuttgart/mi/sd1/test/aufgabe2/TestKreis.java
rename to Klausuren/Sd1/Test003/Solve/src/test/java/de/hdm_stuttgart/mi/sd1/task2/TestKreis.java
index 2a79c0f4526608e084fa57596c16d72bd636217d..9b2f531ee6fc01f49c0c1859fc805e3b40ca7919 100644
--- a/Klausuren/Sd1/Test003/Solve/src/test/java/de/hdm_stuttgart/mi/sd1/test/aufgabe2/TestKreis.java
+++ b/Klausuren/Sd1/Test003/Solve/src/test/java/de/hdm_stuttgart/mi/sd1/task2/TestKreis.java
@@ -1,6 +1,5 @@
-package de.hdm_stuttgart.mi.sd1.test.aufgabe2;
+package de.hdm_stuttgart.mi.sd1.task2;
-import de.hdm_stuttgart.mi.sd1.aufgabe2.Kreis;
import org.junit.Assert;
import org.junit.FixMethodOrder;
import org.junit.Test;
diff --git a/Klausuren/Sd1/Test004/Exam/pom.xml b/Klausuren/Sd1/Test004/Exam/pom.xml
index d5ab02ea3949b92d65083b933e696f81aacbedfc..d7cf2c84e259dcc31c14bdc36be8ff45a9c325a4 100644
--- a/Klausuren/Sd1/Test004/Exam/pom.xml
+++ b/Klausuren/Sd1/Test004/Exam/pom.xml
@@ -1,97 +1,149 @@
<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>de.hdm_stuttgart.mi.sd1</groupId>
- <artifactId>sd1_test_4</artifactId>
- <version>0.8</version>
- <packaging>jar</packaging>
-
- <name>sd1_test_4</name>
-
- <url>http://www.mi.hdm-stuttgart.de/freedocs/topic/de.hdm_stuttgart.mi.lectures/sd1SectUsingMaven.html</url>
-
- <properties>
- <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
- </properties>
-
- <repositories>
- <repository>
- <id>hdm-mi-internal-maven-repo</id>
- <url>https://maven.mi.hdm-stuttgart.de/artifacts</url>
- </repository>
- </repositories>
-
-
- <dependencies>
- <dependency>
- <groupId>junit</groupId>
- <artifactId>junit</artifactId>
- <version>4.13</version>
- <scope>test</scope>
- </dependency>
-
- <dependency>
- <groupId>org.apache.logging.log4j</groupId>
- <artifactId>log4j-core</artifactId>
- <version>2.16.0</version>
- </dependency>
-
- <dependency>
- <groupId>de.hdm_stuttgart.mi.exam</groupId>
- <artifactId>unitmarking</artifactId>
- <version>1.1</version>
- </dependency>
-
- </dependencies>
-
- <build>
- <plugins>
-
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-compiler-plugin</artifactId>
- <version>3.8.1</version>
- <configuration>
- <source>11</source>
- <target>11</target>
- </configuration>
- </plugin>
-
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-javadoc-plugin</artifactId>
- <version>3.1.1</version>
- <configuration>
- <doclint>none</doclint>
- <javadocExecutable>${java.home}/bin/javadoc</javadocExecutable>
- </configuration>
- </plugin>
-
- <plugin>
- <artifactId>maven-assembly-plugin</artifactId>
- <version>2.3</version>
- <configuration>
- <descriptor>src/main/assembly/assembly.xml</descriptor>
- </configuration>
- <executions>
- <execution>
- <id>make-assembly</id>
- <phase>package</phase>
- <goals>
- <goal>single</goal>
- </goals>
- <configuration>
- <archive>
- <manifest>
- <mainClass>de.hdm_stuttgart.mi.sd1.test.ShowReachedPoints</mainClass>
- </manifest>
- </archive>
- </configuration>
- </execution>
- </executions>
- </plugin>
-
- </plugins>
- </build>
+ 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>de.hdm_stuttgart.mi.sd1</groupId>
+ <artifactId>sd1_test004_exam</artifactId>
+ <version>0.9</version>
+ <packaging>jar</packaging>
+
+ <name>sd1_test004_exam</name>
+
+ <url>https://freedocs.mi.hdm-stuttgart.de/sd1_sect_mavenCli.html</url>
+
+ <properties>
+ <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
+
+ <maven.compiler.release>17</maven.compiler.release>
+
+ <freedocs.url>https://freedocs.mi.hdm-stuttgart.de</freedocs.url>
+ <jdk.api_17.url>${freedocs.url}/doc/openjdk-17-doc/api/</jdk.api_17.url>
+ <mathjax.url>${freedocs.url}/lib/MathJax/es5/tex-chtml.js</mathjax.url>
+ <libhighlight.url>${freedocs.url}/lib/highlight.js</libhighlight.url>
+ </properties>
+
+ <repositories>
+ <repository>
+ <id>central</id>
+ <name>Maven Central</name>
+ <layout>default</layout>
+ <url>https://repo1.maven.org/maven2</url>
+ <snapshots>
+ <enabled>false</enabled>
+ </snapshots>
+ </repository>
+
+ <repository>
+ <id>hdm-mi-internal-maven-repo</id>
+ <url>https://maven.mi.hdm-stuttgart.de/nexus/repository/mi-maven/</url>
+ </repository>
+ </repositories>
+
+ <dependencies>
+ <dependency>
+ <groupId>de.hdm_stuttgart.mi.exam</groupId>
+ <artifactId>unitmarking</artifactId>
+ <version>1.2</version>
+ </dependency>
+ </dependencies>
+
+ <build>
+ <plugins>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-compiler-plugin</artifactId>
+ <version>3.11.0</version>
+ </plugin>
+
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-antrun-plugin</artifactId>
+ <version>3.1.0</version>
+ <executions>
+ <execution>
+ <phase>generate-sources</phase>
+ <goals>
+ <goal>run</goal>
+ </goals>
+ <configuration>
+ <target>
+ <echo>Javadoc root at file://${project.basedir}/target/site/apidocs/index.html</echo>
+ </target>
+ </configuration>
+ </execution>
+ </executions>
+ </plugin>
+
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-javadoc-plugin</artifactId>
+ <version>3.5.0</version>
+ <configuration>
+ <release>17</release>
+ <doclint>all</doclint>
+ <show>public</show>
+ <docfilessubdirs>true</docfilessubdirs>
+ <addStylesheets>
+ <stylesheet>resources/jdocSupplement.css</stylesheet>
+ </addStylesheets>
+
+ <windowtitle>Exam documentation</windowtitle>
+
+ <links>
+ <link>${freedocs.url}/doc/openjdk-17-doc/api/</link>
+ </links>
+
+ <additionalOptions>
+ <additionalOption>-html5 --allow-script-in-comments</additionalOption>
+ </additionalOptions>
+ <nohelp>true</nohelp>
+
+ <header><![CDATA[
+ <script>
+ MathJax = {
+ chtml: { displayAlign: 'left',
+ displayIndent: '5ex'}
+ };
+ </script>
+ <script type="text/javascript" src="${mathjax.url}"></script>
+ <script type="text/javascript" src="{@docRoot}/resources/jdocSupplement.js"></script>
+
+ <link rel="stylesheet" href="${libhighlight.url}/styles/idea.min.css">
+ <script src="${libhighlight.url}/highlight.min.js"></script>
+ <script type="text/javascript">hljs.highlightAll();</script>]]>
+ </header>
+ <bottom><![CDATA[Copyright © 2023 Stuttgart Media University / MI. Licensed under
+ <a style="font-weight:bold;" href="https://creativecommons.org/licenses/by/4.0/legalcode" target="_blank"
+ >Creative Commons Attribution 4.0 International Public License</a>.]]></bottom>
+ </configuration>
+ </plugin>
+
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-assembly-plugin</artifactId>
+ <version>3.6.0</version>
+ <configuration>
+ <descriptors>
+ <descriptor>src/main/assembly/assembly.xml</descriptor>
+ </descriptors>
+ </configuration>
+ <executions>
+ <execution>
+ <id>make-assembly</id>
+ <phase>package</phase>
+ <goals>
+ <goal>single</goal>
+ </goals>
+ <configuration>
+ <archive>
+ <manifest>
+ <mainClass>de.hdm_stuttgart.mi.sd1.ShowReachedPoints</mainClass>
+ </manifest>
+ </archive>
+ </configuration>
+ </execution>
+ </executions>
+ </plugin>
+ </plugins>
+ </build>
</project>
diff --git a/Klausuren/Sd1/Test004/Exam/src/main/java/de/hdm_stuttgart/mi/sd1/aufgabe1/Helper.java b/Klausuren/Sd1/Test004/Exam/src/main/java/de/hdm_stuttgart/mi/sd1/task1/Helper.java
similarity index 98%
rename from Klausuren/Sd1/Test004/Exam/src/main/java/de/hdm_stuttgart/mi/sd1/aufgabe1/Helper.java
rename to Klausuren/Sd1/Test004/Exam/src/main/java/de/hdm_stuttgart/mi/sd1/task1/Helper.java
index 188e846954087dc9647bee509141840053b2d299..447809bc377adae84a7a8a1cd9f1ae07c4145a7a 100644
--- a/Klausuren/Sd1/Test004/Exam/src/main/java/de/hdm_stuttgart/mi/sd1/aufgabe1/Helper.java
+++ b/Klausuren/Sd1/Test004/Exam/src/main/java/de/hdm_stuttgart/mi/sd1/task1/Helper.java
@@ -1,4 +1,4 @@
-package de.hdm_stuttgart.mi.sd1.aufgabe1;
+package de.hdm_stuttgart.mi.sd1.task1;
/**
diff --git a/Klausuren/Sd1/Test004/Exam/src/main/java/de/hdm_stuttgart/mi/sd1/aufgabe2/DummyZinsen.java b/Klausuren/Sd1/Test004/Exam/src/main/java/de/hdm_stuttgart/mi/sd1/task2/DummyZinsen.java
similarity index 94%
rename from Klausuren/Sd1/Test004/Exam/src/main/java/de/hdm_stuttgart/mi/sd1/aufgabe2/DummyZinsen.java
rename to Klausuren/Sd1/Test004/Exam/src/main/java/de/hdm_stuttgart/mi/sd1/task2/DummyZinsen.java
index c69f35101c670def5f3a169c6a14ca4c1fda51db..b8542f2c8f9f2c2c36b694b2cac6d59e99ab1589 100644
--- a/Klausuren/Sd1/Test004/Exam/src/main/java/de/hdm_stuttgart/mi/sd1/aufgabe2/DummyZinsen.java
+++ b/Klausuren/Sd1/Test004/Exam/src/main/java/de/hdm_stuttgart/mi/sd1/task2/DummyZinsen.java
@@ -1,4 +1,4 @@
-package de.hdm_stuttgart.mi.sd1.aufgabe2;
+package de.hdm_stuttgart.mi.sd1.task2;
/**
diff --git a/Klausuren/Sd1/Test004/Exam/src/main/java/de/hdm_stuttgart/mi/sd1/aufgabe2/Konto.java b/Klausuren/Sd1/Test004/Exam/src/main/java/de/hdm_stuttgart/mi/sd1/task2/Konto.java
similarity index 98%
rename from Klausuren/Sd1/Test004/Exam/src/main/java/de/hdm_stuttgart/mi/sd1/aufgabe2/Konto.java
rename to Klausuren/Sd1/Test004/Exam/src/main/java/de/hdm_stuttgart/mi/sd1/task2/Konto.java
index 84c04c931682bc5ca9c2b4c9eb0fa87bd240cdef..456b796c63dbc773eefd65304da5798fcf4db2f9 100644
--- a/Klausuren/Sd1/Test004/Exam/src/main/java/de/hdm_stuttgart/mi/sd1/aufgabe2/Konto.java
+++ b/Klausuren/Sd1/Test004/Exam/src/main/java/de/hdm_stuttgart/mi/sd1/task2/Konto.java
@@ -1,4 +1,4 @@
-package de.hdm_stuttgart.mi.sd1.aufgabe2;
+package de.hdm_stuttgart.mi.sd1.task2;
/**
* <p>Verzinsung von Guthaben oder Schulden. Es gelten folgende Regeln:</p>
diff --git a/Klausuren/Sd1/Test004/Exam/src/main/javadoc/resources/fonts/dejavu.css b/Klausuren/Sd1/Test004/Exam/src/main/javadoc/resources/fonts/dejavu.css
new file mode 100644
index 0000000000000000000000000000000000000000..4fec2b593cdcc719fd7edd6744a33a3395ca8401
--- /dev/null
+++ b/Klausuren/Sd1/Test004/Exam/src/main/javadoc/resources/fonts/dejavu.css
@@ -0,0 +1,3 @@
+/* shame on you, javadoc! Still providing
+@import url('resources/fonts/dejavu.css') line in stylesheet.css
+*/
\ No newline at end of file
diff --git a/Klausuren/Sd1/Test004/Exam/src/main/javadoc/resources/jdocSupplement.css b/Klausuren/Sd1/Test004/Exam/src/main/javadoc/resources/jdocSupplement.css
new file mode 100644
index 0000000000000000000000000000000000000000..08840cdbf55d1f43368245d0a965659c4411b2ee
--- /dev/null
+++ b/Klausuren/Sd1/Test004/Exam/src/main/javadoc/resources/jdocSupplement.css
@@ -0,0 +1,72 @@
+/* Javadoc extensions: */
+
+ul > li > ul {
+ list-style-type: circle;
+}
+
+table.goikTableDefaults,
+table.goikTableDefaults>caption,
+table.goikTableDefaults>tr>th,
+table.goikTableDefaults>tr>td,
+table.goikTableDefaults>tbody>tr>th,
+table.goikTableDefaults>tbody>tr>td {
+ border: 2px solid black;
+ border-collapse: collapse;
+ padding: 1ex;
+ vertical-align: top;
+}
+
+table.goikTableDefaults>caption {
+ /* border-top-style: solid; border-left-style: solid; border-right-style: solid' */
+ border-bottom-style: none;
+ font-weight: bold;
+ background:#dee3e9;
+ text-align:left;
+ padding:8px 3px 3px 7px;
+}
+
+table.goikTableDefaults>tbody>tr>td {
+ vertical-align:top;
+}
+table.goikTableDefaults {
+ border-spacing: 0px !important;
+}
+
+table.indexTable {
+ border-collapse: collapse;
+ border-style: hidden;
+}
+
+table.indexTable caption {
+ text-align: left;
+}
+
+table.indexTable td, table.indexTable th {
+ border: 1px solid black;
+ padding: 0.5ex;
+}
+
+em {
+ font-weight: bold;
+ font-style: normal;
+}
+section.implementationHints>h3 {
+ font-weight: bold;
+ background-color: rgb(222, 227, 233);
+}
+
+code {
+ white-space: pre;
+}
+
+.implementationHints {
+ background-color: hsl(120, 100%, 95%) !important;
+}
+
+.myRed {
+ color: red;
+}
+
+.myGreen {
+ color: limegreen;
+}
diff --git a/Klausuren/Sd1/Test004/Exam/src/main/javadoc/resources/jdocSupplement.js b/Klausuren/Sd1/Test004/Exam/src/main/javadoc/resources/jdocSupplement.js
new file mode 100644
index 0000000000000000000000000000000000000000..97911e5581090aac5e37323427450f8c8c8a3f94
--- /dev/null
+++ b/Klausuren/Sd1/Test004/Exam/src/main/javadoc/resources/jdocSupplement.js
@@ -0,0 +1,7 @@
+for(var i in document.links) {
+ var link = document.links[i];
+ if (link.href && link.href.indexOf('http') === 0) {
+ link.target = '_blank';
+ }
+}
+
diff --git a/Klausuren/Sd1/Test004/Exam/src/test/java/de/hdm_stuttgart/mi/sd1/test/ShowReachedPoints.java b/Klausuren/Sd1/Test004/Exam/src/test/java/de/hdm_stuttgart/mi/sd1/ShowReachedPoints.java
similarity index 71%
rename from Klausuren/Sd1/Test004/Exam/src/test/java/de/hdm_stuttgart/mi/sd1/test/ShowReachedPoints.java
rename to Klausuren/Sd1/Test004/Exam/src/test/java/de/hdm_stuttgart/mi/sd1/ShowReachedPoints.java
index 2881d978661bbef425af015d05f41ad4c8b6346c..5f29f3d715faeb67df36bce65787bc354b0faeae 100644
--- a/Klausuren/Sd1/Test004/Exam/src/test/java/de/hdm_stuttgart/mi/sd1/test/ShowReachedPoints.java
+++ b/Klausuren/Sd1/Test004/Exam/src/test/java/de/hdm_stuttgart/mi/sd1/ShowReachedPoints.java
@@ -1,8 +1,8 @@
-package de.hdm_stuttgart.mi.sd1.test;
+package de.hdm_stuttgart.mi.sd1;
import de.hdm_stuttgart.mi.exam.unitmarking.RunTests;
-import de.hdm_stuttgart.mi.sd1.test.aufgabe1.TestHelper;
-import de.hdm_stuttgart.mi.sd1.test.aufgabe2.TestKonto;
+import de.hdm_stuttgart.mi.sd1.task1.TestHelper;
+import de.hdm_stuttgart.mi.sd1.task2.TestKonto;
public class ShowReachedPoints {
diff --git a/Klausuren/Sd1/Test004/Exam/src/test/java/de/hdm_stuttgart/mi/sd1/test/aufgabe1/TestHelper.java b/Klausuren/Sd1/Test004/Exam/src/test/java/de/hdm_stuttgart/mi/sd1/task1/TestHelper.java
similarity index 96%
rename from Klausuren/Sd1/Test004/Exam/src/test/java/de/hdm_stuttgart/mi/sd1/test/aufgabe1/TestHelper.java
rename to Klausuren/Sd1/Test004/Exam/src/test/java/de/hdm_stuttgart/mi/sd1/task1/TestHelper.java
index 678ec33340f838e09bd2cc51b013c9332cd17e71..cc5441cd6dd396c0e5a9d09382c6f8c8c933d97b 100644
--- a/Klausuren/Sd1/Test004/Exam/src/test/java/de/hdm_stuttgart/mi/sd1/test/aufgabe1/TestHelper.java
+++ b/Klausuren/Sd1/Test004/Exam/src/test/java/de/hdm_stuttgart/mi/sd1/task1/TestHelper.java
@@ -1,7 +1,6 @@
-package de.hdm_stuttgart.mi.sd1.test.aufgabe1;
+package de.hdm_stuttgart.mi.sd1.task1;
import de.hdm_stuttgart.mi.exam.unitmarking.ExaminationTestDefaults;
-import de.hdm_stuttgart.mi.sd1.aufgabe1.Helper;
import org.junit.Assert;
import org.junit.FixMethodOrder;
import org.junit.Rule;
diff --git a/Klausuren/Sd1/Test004/Solve/src/test/java/de/hdm_stuttgart/mi/sd1/test/aufgabe2/TestKonto.java b/Klausuren/Sd1/Test004/Exam/src/test/java/de/hdm_stuttgart/mi/sd1/task2/TestKonto.java
similarity index 96%
rename from Klausuren/Sd1/Test004/Solve/src/test/java/de/hdm_stuttgart/mi/sd1/test/aufgabe2/TestKonto.java
rename to Klausuren/Sd1/Test004/Exam/src/test/java/de/hdm_stuttgart/mi/sd1/task2/TestKonto.java
index 9079b773d34be7301b387e26afd011e47f51274b..36c94d71e7219191a169ab903d47d67c51410329 100644
--- a/Klausuren/Sd1/Test004/Solve/src/test/java/de/hdm_stuttgart/mi/sd1/test/aufgabe2/TestKonto.java
+++ b/Klausuren/Sd1/Test004/Exam/src/test/java/de/hdm_stuttgart/mi/sd1/task2/TestKonto.java
@@ -1,7 +1,6 @@
-package de.hdm_stuttgart.mi.sd1.test.aufgabe2;
+package de.hdm_stuttgart.mi.sd1.task2;
import de.hdm_stuttgart.mi.exam.unitmarking.ExaminationTestDefaults;
-import de.hdm_stuttgart.mi.sd1.aufgabe2.Konto;
import org.junit.Assert;
import org.junit.FixMethodOrder;
import org.junit.Rule;
diff --git a/Klausuren/Sd1/Test004/Solve/Doc/klausur.xml b/Klausuren/Sd1/Test004/Solve/Doc/klausur.xml
index 3d5d71afe5761acb185a464f7a1e8937c1ad4826..00d7ed6e92d62672dd46e629acfaa41584c605ea 100644
--- a/Klausuren/Sd1/Test004/Solve/Doc/klausur.xml
+++ b/Klausuren/Sd1/Test004/Solve/Doc/klausur.xml
@@ -47,11 +47,11 @@
<para>Vervollständigen Sie die Implementierung aller Methoden der
Klasse<foreignphrase xml:lang="en"> package</foreignphrase>
- <package>de.hdm_stuttgart.mi.sd1.aufgabe1.Helper</package>.</para>
+ <package>de.hdm_stuttgart.mi.sd1.task1.Helper</package>.</para>
<tip>
<para>Das <foreignphrase xml:lang="en">package</foreignphrase>
- <package>de.hdm_stuttgart.mi.sd1.test.aufgabe1</package> im Test Zweig
+ <package>de.hdm_stuttgart.mi.sd1.test.task1</package> im Test Zweig
Ihres Projekts enthält eine zugehörige
<productname>Junit</productname> Testklasse
<classname>TestHelper</classname>.</para>
@@ -89,18 +89,18 @@
<title>Beschreibung</title>
<para>Vervollständigen Sie die Implementierung der Klasse
- <classname>de.hdm_stuttgart.mi.sd1.aufgabe2.Konto</classname> gemäß den
+ <classname>de.hdm_stuttgart.mi.sd1.task2.Konto</classname> gemäß den
angegebenen Javadoc Kommentaren. Hilfreich sind:</para>
<orderedlist>
<listitem>
<para>Eine beispielhafte Applikation in
- <classname>de.hdm_stuttgart.mi.sd1.aufgabe2.DummyZinsen</classname>.</para>
+ <classname>de.hdm_stuttgart.mi.sd1.task2.DummyZinsen</classname>.</para>
</listitem>
<listitem>
<para>Die zugehörige Testklasse in
- <classname>de.hdm_stuttgart.mi.sd1.test.aufgabe2.TestKonto</classname>.</para>
+ <classname>task2.de.hdm_stuttgart.mi.sd1.TestKonto</classname>.</para>
</listitem>
</orderedlist>
</section>
diff --git a/Klausuren/Sd1/Test004/Solve/pom.xml b/Klausuren/Sd1/Test004/Solve/pom.xml
index 54896b769bca458bd447a08ad7249b787b62a3f7..ace7a6b09f89cbdcb6a1b5f02600a132867a962c 100644
--- a/Klausuren/Sd1/Test004/Solve/pom.xml
+++ b/Klausuren/Sd1/Test004/Solve/pom.xml
@@ -1,97 +1,139 @@
<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>de.hdm_stuttgart.mi.sd1</groupId>
- <artifactId>sd1_test_4</artifactId>
- <version>0.9</version>
- <packaging>jar</packaging>
-
- <name>sd1_test_4</name>
-
- <url>http://www.mi.hdm-stuttgart.de/freedocs/topic/de.hdm_stuttgart.mi.lectures/sd1SectUsingMaven.html</url>
-
- <properties>
- <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
- </properties>
-
- <repositories>
- <repository>
- <id>hdm-mi-internal-maven-repo</id>
- <url>https://maven.mi.hdm-stuttgart.de/artifacts</url>
- </repository>
- </repositories>
-
-
- <dependencies>
- <dependency>
- <groupId>junit</groupId>
- <artifactId>junit</artifactId>
- <version>4.13</version>
- <scope>test</scope>
- </dependency>
-
- <dependency>
- <groupId>org.apache.logging.log4j</groupId>
- <artifactId>log4j-core</artifactId>
- <version>2.16.0</version>
- </dependency>
-
- <dependency>
- <groupId>de.hdm_stuttgart.mi.exam</groupId>
- <artifactId>unitmarking</artifactId>
- <version>1.1</version>
- </dependency>
-
- </dependencies>
-
- <build>
- <plugins>
-
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-compiler-plugin</artifactId>
- <version>3.8.1</version>
- <configuration>
- <source>11</source>
- <target>11</target>
- </configuration>
- </plugin>
-
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-javadoc-plugin</artifactId>
- <version>3.1.1</version>
- <configuration>
- <doclint>none</doclint>
- <javadocExecutable>${java.home}/bin/javadoc</javadocExecutable>
- </configuration>
- </plugin>
-
- <plugin>
- <artifactId>maven-assembly-plugin</artifactId>
- <version>2.3</version>
- <configuration>
- <descriptor>src/main/assembly/assembly.xml</descriptor>
- </configuration>
- <executions>
- <execution>
- <id>make-assembly</id>
- <phase>package</phase>
- <goals>
- <goal>single</goal>
- </goals>
- <configuration>
- <archive>
- <manifest>
- <mainClass>de.hdm_stuttgart.mi.sd1.test.ShowReachedPoints</mainClass>
- </manifest>
- </archive>
- </configuration>
- </execution>
- </executions>
- </plugin>
-
- </plugins>
- </build>
+ 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>de.hdm_stuttgart.mi.sd1</groupId>
+ <artifactId>sd1_test004_solve</artifactId>
+ <version>0.9</version>
+ <packaging>jar</packaging>
+
+ <name>sd1_test004_solve</name>
+
+ <url>https://freedocs.mi.hdm-stuttgart.de/sd1_sect_mavenCli.html</url>
+
+ <properties>
+ <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
+
+ <maven.compiler.release>17</maven.compiler.release>
+
+ <freedocs.url>https://freedocs.mi.hdm-stuttgart.de</freedocs.url>
+ <jdk.api_17.url>${freedocs.url}/doc/openjdk-17-doc/api/</jdk.api_17.url>
+ <mathjax.url>${freedocs.url}/lib/MathJax/es5/tex-chtml.js</mathjax.url>
+ <libhighlight.url>${freedocs.url}/lib/highlight.js</libhighlight.url>
+ </properties>
+
+ <repositories>
+ <repository>
+ <id>hdm-mi-internal-maven-repo</id>
+ <url>https://maven.mi.hdm-stuttgart.de/nexus/repository/mi-maven/</url>
+ </repository>
+ </repositories>
+
+ <dependencies>
+ <dependency>
+ <groupId>de.hdm_stuttgart.mi.exam</groupId>
+ <artifactId>unitmarking</artifactId>
+ <version>1.2</version>
+ </dependency>
+ </dependencies>
+
+ <build>
+ <plugins>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-compiler-plugin</artifactId>
+ <version>3.11.0</version>
+ </plugin>
+
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-antrun-plugin</artifactId>
+ <version>3.1.0</version>
+ <executions>
+ <execution>
+ <phase>generate-sources</phase>
+ <goals>
+ <goal>run</goal>
+ </goals>
+ <configuration>
+ <target>
+ <echo>Javadoc root at file://${project.basedir}/target/site/apidocs/index.html</echo>
+ </target>
+ </configuration>
+ </execution>
+ </executions>
+ </plugin>
+
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-javadoc-plugin</artifactId>
+ <version>3.5.0</version>
+ <configuration>
+ <release>17</release>
+ <doclint>all</doclint>
+ <show>public</show>
+ <docfilessubdirs>true</docfilessubdirs>
+ <addStylesheets>
+ <stylesheet>resources/jdocSupplement.css</stylesheet>
+ </addStylesheets>
+
+ <windowtitle>Exam documentation</windowtitle>
+
+ <links>
+ <link>${freedocs.url}/doc/openjdk-17-doc/api/</link>
+ </links>
+
+ <additionalOptions>
+ <additionalOption>-html5 --allow-script-in-comments</additionalOption>
+ </additionalOptions>
+ <nohelp>true</nohelp>
+
+ <header><![CDATA[
+ <script>
+ MathJax = {
+ chtml: { displayAlign: 'left',
+ displayIndent: '5ex'}
+ };
+ </script>
+ <script type="text/javascript" src="${mathjax.url}"></script>
+ <script type="text/javascript" src="{@docRoot}/resources/jdocSupplement.js"></script>
+
+ <link rel="stylesheet" href="${libhighlight.url}/styles/idea.min.css">
+ <script src="${libhighlight.url}/highlight.min.js"></script>
+ <script type="text/javascript">hljs.highlightAll();</script>]]>
+ </header>
+ <bottom><![CDATA[Copyright © 2023 Stuttgart Media University / MI. Licensed under
+ <a style="font-weight:bold;" href="https://creativecommons.org/licenses/by/4.0/legalcode" target="_blank"
+ >Creative Commons Attribution 4.0 International Public License</a>.]]></bottom>
+ </configuration>
+ </plugin>
+
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-assembly-plugin</artifactId>
+ <version>3.6.0</version>
+ <configuration>
+ <descriptors>
+ <descriptor>src/main/assembly/assembly.xml</descriptor>
+ </descriptors>
+ </configuration>
+ <executions>
+ <execution>
+ <id>make-assembly</id>
+ <phase>package</phase>
+ <goals>
+ <goal>single</goal>
+ </goals>
+ <configuration>
+ <archive>
+ <manifest>
+ <mainClass>de.hdm_stuttgart.mi.sd1.ShowReachedPoints</mainClass>
+ </manifest>
+ </archive>
+ </configuration>
+ </execution>
+ </executions>
+ </plugin>
+ </plugins>
+ </build>
</project>
diff --git a/Klausuren/Sd1/Test004/Solve/src/main/java/de/hdm_stuttgart/mi/sd1/aufgabe1/Helper.java b/Klausuren/Sd1/Test004/Solve/src/main/java/de/hdm_stuttgart/mi/sd1/task1/Helper.java
similarity index 98%
rename from Klausuren/Sd1/Test004/Solve/src/main/java/de/hdm_stuttgart/mi/sd1/aufgabe1/Helper.java
rename to Klausuren/Sd1/Test004/Solve/src/main/java/de/hdm_stuttgart/mi/sd1/task1/Helper.java
index c1fcb98569883f4f9a373c698aa4adcc634c832c..943a29a1b29e3e7aad6be20f076a84ee0af9931d 100644
--- a/Klausuren/Sd1/Test004/Solve/src/main/java/de/hdm_stuttgart/mi/sd1/aufgabe1/Helper.java
+++ b/Klausuren/Sd1/Test004/Solve/src/main/java/de/hdm_stuttgart/mi/sd1/task1/Helper.java
@@ -1,4 +1,4 @@
-package de.hdm_stuttgart.mi.sd1.aufgabe1;
+package de.hdm_stuttgart.mi.sd1.task1;
/**
diff --git a/Klausuren/Sd1/Test004/Solve/src/main/java/de/hdm_stuttgart/mi/sd1/aufgabe2/DummyZinsen.java b/Klausuren/Sd1/Test004/Solve/src/main/java/de/hdm_stuttgart/mi/sd1/task2/DummyZinsen.java
similarity index 94%
rename from Klausuren/Sd1/Test004/Solve/src/main/java/de/hdm_stuttgart/mi/sd1/aufgabe2/DummyZinsen.java
rename to Klausuren/Sd1/Test004/Solve/src/main/java/de/hdm_stuttgart/mi/sd1/task2/DummyZinsen.java
index c69f35101c670def5f3a169c6a14ca4c1fda51db..b8542f2c8f9f2c2c36b694b2cac6d59e99ab1589 100644
--- a/Klausuren/Sd1/Test004/Solve/src/main/java/de/hdm_stuttgart/mi/sd1/aufgabe2/DummyZinsen.java
+++ b/Klausuren/Sd1/Test004/Solve/src/main/java/de/hdm_stuttgart/mi/sd1/task2/DummyZinsen.java
@@ -1,4 +1,4 @@
-package de.hdm_stuttgart.mi.sd1.aufgabe2;
+package de.hdm_stuttgart.mi.sd1.task2;
/**
diff --git a/Klausuren/Sd1/Test004/Solve/src/main/java/de/hdm_stuttgart/mi/sd1/aufgabe2/Konto.java b/Klausuren/Sd1/Test004/Solve/src/main/java/de/hdm_stuttgart/mi/sd1/task2/Konto.java
similarity index 99%
rename from Klausuren/Sd1/Test004/Solve/src/main/java/de/hdm_stuttgart/mi/sd1/aufgabe2/Konto.java
rename to Klausuren/Sd1/Test004/Solve/src/main/java/de/hdm_stuttgart/mi/sd1/task2/Konto.java
index 798627f10a84e5b94c119730b3a29ab9650cf0f1..c7a8e539460089a7bf1e509989a895a2eae0a2ac 100644
--- a/Klausuren/Sd1/Test004/Solve/src/main/java/de/hdm_stuttgart/mi/sd1/aufgabe2/Konto.java
+++ b/Klausuren/Sd1/Test004/Solve/src/main/java/de/hdm_stuttgart/mi/sd1/task2/Konto.java
@@ -1,4 +1,4 @@
-package de.hdm_stuttgart.mi.sd1.aufgabe2;
+package de.hdm_stuttgart.mi.sd1.task2;
/**
* <p>Verzinsung von Guthaben oder Schulden. Es gelten folgende Regeln:</p>
diff --git a/Klausuren/Sd1/Test004/Solve/src/main/javadoc/resources/fonts/dejavu.css b/Klausuren/Sd1/Test004/Solve/src/main/javadoc/resources/fonts/dejavu.css
new file mode 100644
index 0000000000000000000000000000000000000000..4fec2b593cdcc719fd7edd6744a33a3395ca8401
--- /dev/null
+++ b/Klausuren/Sd1/Test004/Solve/src/main/javadoc/resources/fonts/dejavu.css
@@ -0,0 +1,3 @@
+/* shame on you, javadoc! Still providing
+@import url('resources/fonts/dejavu.css') line in stylesheet.css
+*/
\ No newline at end of file
diff --git a/Klausuren/Sd1/Test004/Solve/src/main/javadoc/resources/jdocSupplement.css b/Klausuren/Sd1/Test004/Solve/src/main/javadoc/resources/jdocSupplement.css
new file mode 100644
index 0000000000000000000000000000000000000000..08840cdbf55d1f43368245d0a965659c4411b2ee
--- /dev/null
+++ b/Klausuren/Sd1/Test004/Solve/src/main/javadoc/resources/jdocSupplement.css
@@ -0,0 +1,72 @@
+/* Javadoc extensions: */
+
+ul > li > ul {
+ list-style-type: circle;
+}
+
+table.goikTableDefaults,
+table.goikTableDefaults>caption,
+table.goikTableDefaults>tr>th,
+table.goikTableDefaults>tr>td,
+table.goikTableDefaults>tbody>tr>th,
+table.goikTableDefaults>tbody>tr>td {
+ border: 2px solid black;
+ border-collapse: collapse;
+ padding: 1ex;
+ vertical-align: top;
+}
+
+table.goikTableDefaults>caption {
+ /* border-top-style: solid; border-left-style: solid; border-right-style: solid' */
+ border-bottom-style: none;
+ font-weight: bold;
+ background:#dee3e9;
+ text-align:left;
+ padding:8px 3px 3px 7px;
+}
+
+table.goikTableDefaults>tbody>tr>td {
+ vertical-align:top;
+}
+table.goikTableDefaults {
+ border-spacing: 0px !important;
+}
+
+table.indexTable {
+ border-collapse: collapse;
+ border-style: hidden;
+}
+
+table.indexTable caption {
+ text-align: left;
+}
+
+table.indexTable td, table.indexTable th {
+ border: 1px solid black;
+ padding: 0.5ex;
+}
+
+em {
+ font-weight: bold;
+ font-style: normal;
+}
+section.implementationHints>h3 {
+ font-weight: bold;
+ background-color: rgb(222, 227, 233);
+}
+
+code {
+ white-space: pre;
+}
+
+.implementationHints {
+ background-color: hsl(120, 100%, 95%) !important;
+}
+
+.myRed {
+ color: red;
+}
+
+.myGreen {
+ color: limegreen;
+}
diff --git a/Klausuren/Sd1/Test004/Solve/src/main/javadoc/resources/jdocSupplement.js b/Klausuren/Sd1/Test004/Solve/src/main/javadoc/resources/jdocSupplement.js
new file mode 100644
index 0000000000000000000000000000000000000000..97911e5581090aac5e37323427450f8c8c8a3f94
--- /dev/null
+++ b/Klausuren/Sd1/Test004/Solve/src/main/javadoc/resources/jdocSupplement.js
@@ -0,0 +1,7 @@
+for(var i in document.links) {
+ var link = document.links[i];
+ if (link.href && link.href.indexOf('http') === 0) {
+ link.target = '_blank';
+ }
+}
+
diff --git a/Klausuren/Sd1/Test004/Solve/src/test/java/de/hdm_stuttgart/mi/sd1/test/ShowReachedPoints.java b/Klausuren/Sd1/Test004/Solve/src/test/java/de/hdm_stuttgart/mi/sd1/ShowReachedPoints.java
similarity index 71%
rename from Klausuren/Sd1/Test004/Solve/src/test/java/de/hdm_stuttgart/mi/sd1/test/ShowReachedPoints.java
rename to Klausuren/Sd1/Test004/Solve/src/test/java/de/hdm_stuttgart/mi/sd1/ShowReachedPoints.java
index c65edb43f65e7e31c92bf902524186e81d6b42cb..acac69e4a6c7da4e2cec8f8d69174a68ec358f2d 100644
--- a/Klausuren/Sd1/Test004/Solve/src/test/java/de/hdm_stuttgart/mi/sd1/test/ShowReachedPoints.java
+++ b/Klausuren/Sd1/Test004/Solve/src/test/java/de/hdm_stuttgart/mi/sd1/ShowReachedPoints.java
@@ -1,8 +1,8 @@
-package de.hdm_stuttgart.mi.sd1.test;
+package de.hdm_stuttgart.mi.sd1;
import de.hdm_stuttgart.mi.exam.unitmarking.RunTests;
-import de.hdm_stuttgart.mi.sd1.test.aufgabe1.TestHelper;
-import de.hdm_stuttgart.mi.sd1.test.aufgabe2.TestKonto;
+import de.hdm_stuttgart.mi.sd1.task1.TestHelper;
+import de.hdm_stuttgart.mi.sd1.task2.TestKonto;
public class ShowReachedPoints {
diff --git a/Klausuren/Sd1/Test004/Solve/src/test/java/de/hdm_stuttgart/mi/sd1/test/aufgabe1/TestHelper.java b/Klausuren/Sd1/Test004/Solve/src/test/java/de/hdm_stuttgart/mi/sd1/task1/TestHelper.java
similarity index 96%
rename from Klausuren/Sd1/Test004/Solve/src/test/java/de/hdm_stuttgart/mi/sd1/test/aufgabe1/TestHelper.java
rename to Klausuren/Sd1/Test004/Solve/src/test/java/de/hdm_stuttgart/mi/sd1/task1/TestHelper.java
index 2fd1fdab22fc05eaa6a66d5a066a1589e6fbc934..cbce587554e0e60790107fb0db1c7a539c8c53b0 100644
--- a/Klausuren/Sd1/Test004/Solve/src/test/java/de/hdm_stuttgart/mi/sd1/test/aufgabe1/TestHelper.java
+++ b/Klausuren/Sd1/Test004/Solve/src/test/java/de/hdm_stuttgart/mi/sd1/task1/TestHelper.java
@@ -1,7 +1,7 @@
-package de.hdm_stuttgart.mi.sd1.test.aufgabe1;
+package de.hdm_stuttgart.mi.sd1.task1;
import de.hdm_stuttgart.mi.exam.unitmarking.ExaminationTestDefaults;
-import de.hdm_stuttgart.mi.sd1.aufgabe1.Helper;
+import de.hdm_stuttgart.mi.sd1.task1.Helper;
import org.junit.Assert;
import org.junit.FixMethodOrder;
import org.junit.Rule;
diff --git a/Klausuren/Sd1/Test004/Exam/src/test/java/de/hdm_stuttgart/mi/sd1/test/aufgabe2/TestKonto.java b/Klausuren/Sd1/Test004/Solve/src/test/java/de/hdm_stuttgart/mi/sd1/task2/TestKonto.java
similarity index 96%
rename from Klausuren/Sd1/Test004/Exam/src/test/java/de/hdm_stuttgart/mi/sd1/test/aufgabe2/TestKonto.java
rename to Klausuren/Sd1/Test004/Solve/src/test/java/de/hdm_stuttgart/mi/sd1/task2/TestKonto.java
index 9079b773d34be7301b387e26afd011e47f51274b..ab6c8a0afc96079372c0b63d7c754ba921e09504 100644
--- a/Klausuren/Sd1/Test004/Exam/src/test/java/de/hdm_stuttgart/mi/sd1/test/aufgabe2/TestKonto.java
+++ b/Klausuren/Sd1/Test004/Solve/src/test/java/de/hdm_stuttgart/mi/sd1/task2/TestKonto.java
@@ -1,7 +1,7 @@
-package de.hdm_stuttgart.mi.sd1.test.aufgabe2;
+package de.hdm_stuttgart.mi.sd1.task2;
import de.hdm_stuttgart.mi.exam.unitmarking.ExaminationTestDefaults;
-import de.hdm_stuttgart.mi.sd1.aufgabe2.Konto;
+import de.hdm_stuttgart.mi.sd1.task2.Konto;
import org.junit.Assert;
import org.junit.FixMethodOrder;
import org.junit.Rule;