From 8a74a5ff63891fc55bb887ec858be6b254e4273e Mon Sep 17 00:00:00 2001
From: Martin Goik <goik@hdm-stuttgart.de>
Date: Wed, 20 Dec 2023 14:27:51 +0100
Subject: [PATCH] Renaming packages and correcting MI Maven URL
---
Klausuren/Sd1/Test001/Exam/pom.xml | 231 ++++++++++-------
.../mi/sd1/{aufgabe1 => task1}/Helper.java | 2 +-
.../main/javadoc/resources/fonts/dejavu.css | 3 +
.../main/javadoc/resources/jdocSupplement.css | 72 ++++++
.../main/javadoc/resources/jdocSupplement.js | 7 +
.../mi/sd1/{test => }/ShowReachedPoints.java | 10 +-
.../mi/sd1/task1}/TestGetMinimumOfThree.java | 3 +-
.../mi/sd1/task1}/TestGetMinimumOfTwo.java | 3 +-
.../{test/aufgabe1 => task1}/TestSleepIn.java | 3 +-
Klausuren/Sd1/Test001/Solve/Doc/klausur.xml | 10 +-
Klausuren/Sd1/Test001/Solve/pom.xml | 231 ++++++++++-------
.../mi/sd1/{aufgabe1 => task1}/Helper.java | 2 +-
.../main/javadoc/resources/fonts/dejavu.css | 3 +
.../main/javadoc/resources/jdocSupplement.css | 72 ++++++
.../main/javadoc/resources/jdocSupplement.js | 7 +
.../mi/sd1/{test => }/ShowReachedPoints.java | 10 +-
.../mi/sd1/task1}/TestGetMinimumOfThree.java | 3 +-
.../mi/sd1/task1}/TestGetMinimumOfTwo.java | 3 +-
.../{test/aufgabe1 => task1}/TestSleepIn.java | 3 +-
Klausuren/Sd1/Test002/Exam/pom.xml | 48 +++-
.../mi/sd1/{test => }/ShowReachedPoints.java | 8 +-
.../sd1/{test => }/task1/TestHelperMax.java | 2 +-
.../task1/TestHelperMaxAbsDiff.java | 2 +-
.../task1/TestHelperMultipleCopy.java | 2 +-
Klausuren/Sd1/Test002/Solve/pom.xml | 48 +++-
.../mi/sd1/{test => }/ShowReachedPoints.java | 8 +-
.../sd1/{test => }/task1/TestHelperMax.java | 2 +-
.../task1/TestHelperMaxAbsDiff.java | 2 +-
.../task1/TestHelperMultipleCopy.java | 2 +-
Klausuren/Sd1/Test003/Exam/pom.xml | 232 ++++++++++-------
.../{aufgabe1 => task1}/BodenlegerKosten.java | 2 +-
.../mi/sd1/{aufgabe1 => task1}/Helper.java | 2 +-
.../mi/sd1/{aufgabe2 => task2}/Kreis.java | 2 +-
.../main/javadoc/resources/fonts/dejavu.css | 3 +
.../main/javadoc/resources/jdocSupplement.css | 72 ++++++
.../main/javadoc/resources/jdocSupplement.js | 7 +
.../mi/sd1/{test => }/ShowReachedPoints.java | 8 +-
.../TestBodenlegerKosten.java | 3 +-
.../mi/sd1/task1}/TestHelper.java | 4 +-
.../{test/aufgabe2 => task2}/TestKreis.java | 3 +-
Klausuren/Sd1/Test003/Solve/Doc/klausur.xml | 4 +-
Klausuren/Sd1/Test003/Solve/pom.xml | 232 ++++++++++-------
.../{aufgabe1 => task1}/BodenlegerKosten.java | 2 +-
.../mi/sd1/{aufgabe1 => task1}/Helper.java | 2 +-
.../{aufgabe1 => task1}/beispiele/Boden.java | 4 +-
.../beispiele/Quersumme.java | 4 +-
.../mi/sd1/{aufgabe2 => task2}/Kreis.java | 2 +-
.../beispiel/EnthaltenOderNicht.java | 4 +-
.../main/javadoc/resources/fonts/dejavu.css | 3 +
.../main/javadoc/resources/jdocSupplement.css | 72 ++++++
.../main/javadoc/resources/jdocSupplement.js | 7 +
.../mi/sd1/{test => }/ShowReachedPoints.java | 8 +-
.../TestBodenlegerKosten.java | 3 +-
.../mi/sd1/task1}/TestHelper.java | 4 +-
.../{test/aufgabe2 => task2}/TestKreis.java | 3 +-
Klausuren/Sd1/Test004/Exam/pom.xml | 242 +++++++++++-------
.../mi/sd1/{aufgabe1 => task1}/Helper.java | 2 +-
.../sd1/{aufgabe2 => task2}/DummyZinsen.java | 2 +-
.../mi/sd1/{aufgabe2 => task2}/Konto.java | 2 +-
.../main/javadoc/resources/fonts/dejavu.css | 3 +
.../main/javadoc/resources/jdocSupplement.css | 72 ++++++
.../main/javadoc/resources/jdocSupplement.js | 7 +
.../mi/sd1/{test => }/ShowReachedPoints.java | 6 +-
.../{test/aufgabe1 => task1}/TestHelper.java | 3 +-
.../mi/sd1/task2}/TestKonto.java | 3 +-
Klausuren/Sd1/Test004/Solve/Doc/klausur.xml | 10 +-
Klausuren/Sd1/Test004/Solve/pom.xml | 232 ++++++++++-------
.../mi/sd1/{aufgabe1 => task1}/Helper.java | 2 +-
.../sd1/{aufgabe2 => task2}/DummyZinsen.java | 2 +-
.../mi/sd1/{aufgabe2 => task2}/Konto.java | 2 +-
.../main/javadoc/resources/fonts/dejavu.css | 3 +
.../main/javadoc/resources/jdocSupplement.css | 72 ++++++
.../main/javadoc/resources/jdocSupplement.js | 7 +
.../mi/sd1/{test => }/ShowReachedPoints.java | 6 +-
.../{test/aufgabe1 => task1}/TestHelper.java | 4 +-
.../mi/sd1/task2}/TestKonto.java | 4 +-
76 files changed, 1486 insertions(+), 694 deletions(-)
rename Klausuren/Sd1/Test001/Exam/src/main/java/de/hdm_stuttgart/mi/sd1/{aufgabe1 => task1}/Helper.java (96%)
create mode 100644 Klausuren/Sd1/Test001/Exam/src/main/javadoc/resources/fonts/dejavu.css
create mode 100644 Klausuren/Sd1/Test001/Exam/src/main/javadoc/resources/jdocSupplement.css
create mode 100644 Klausuren/Sd1/Test001/Exam/src/main/javadoc/resources/jdocSupplement.js
rename Klausuren/Sd1/Test001/Exam/src/test/java/de/hdm_stuttgart/mi/sd1/{test => }/ShowReachedPoints.java (57%)
rename Klausuren/Sd1/Test001/{Solve/src/test/java/de/hdm_stuttgart/mi/sd1/test/aufgabe1 => Exam/src/test/java/de/hdm_stuttgart/mi/sd1/task1}/TestGetMinimumOfThree.java (92%)
rename Klausuren/Sd1/Test001/{Solve/src/test/java/de/hdm_stuttgart/mi/sd1/test/aufgabe1 => Exam/src/test/java/de/hdm_stuttgart/mi/sd1/task1}/TestGetMinimumOfTwo.java (93%)
rename Klausuren/Sd1/Test001/Exam/src/test/java/de/hdm_stuttgart/mi/sd1/{test/aufgabe1 => task1}/TestSleepIn.java (90%)
rename Klausuren/Sd1/Test001/Solve/src/main/java/de/hdm_stuttgart/mi/sd1/{aufgabe1 => task1}/Helper.java (96%)
create mode 100644 Klausuren/Sd1/Test001/Solve/src/main/javadoc/resources/fonts/dejavu.css
create mode 100644 Klausuren/Sd1/Test001/Solve/src/main/javadoc/resources/jdocSupplement.css
create mode 100644 Klausuren/Sd1/Test001/Solve/src/main/javadoc/resources/jdocSupplement.js
rename Klausuren/Sd1/Test001/Solve/src/test/java/de/hdm_stuttgart/mi/sd1/{test => }/ShowReachedPoints.java (57%)
rename Klausuren/Sd1/Test001/{Exam/src/test/java/de/hdm_stuttgart/mi/sd1/test/aufgabe1 => Solve/src/test/java/de/hdm_stuttgart/mi/sd1/task1}/TestGetMinimumOfThree.java (92%)
rename Klausuren/Sd1/Test001/{Exam/src/test/java/de/hdm_stuttgart/mi/sd1/test/aufgabe1 => Solve/src/test/java/de/hdm_stuttgart/mi/sd1/task1}/TestGetMinimumOfTwo.java (93%)
rename Klausuren/Sd1/Test001/Solve/src/test/java/de/hdm_stuttgart/mi/sd1/{test/aufgabe1 => task1}/TestSleepIn.java (90%)
rename Klausuren/Sd1/Test002/Exam/src/test/java/de/hdm_stuttgart/mi/sd1/{test => }/ShowReachedPoints.java (62%)
rename Klausuren/Sd1/Test002/Exam/src/test/java/de/hdm_stuttgart/mi/sd1/{test => }/task1/TestHelperMax.java (95%)
rename Klausuren/Sd1/Test002/Exam/src/test/java/de/hdm_stuttgart/mi/sd1/{test => }/task1/TestHelperMaxAbsDiff.java (96%)
rename Klausuren/Sd1/Test002/Exam/src/test/java/de/hdm_stuttgart/mi/sd1/{test => }/task1/TestHelperMultipleCopy.java (93%)
rename Klausuren/Sd1/Test002/Solve/src/test/java/de/hdm_stuttgart/mi/sd1/{test => }/ShowReachedPoints.java (62%)
rename Klausuren/Sd1/Test002/Solve/src/test/java/de/hdm_stuttgart/mi/sd1/{test => }/task1/TestHelperMax.java (95%)
rename Klausuren/Sd1/Test002/Solve/src/test/java/de/hdm_stuttgart/mi/sd1/{test => }/task1/TestHelperMaxAbsDiff.java (96%)
rename Klausuren/Sd1/Test002/Solve/src/test/java/de/hdm_stuttgart/mi/sd1/{test => }/task1/TestHelperMultipleCopy.java (93%)
rename Klausuren/Sd1/Test003/Exam/src/main/java/de/hdm_stuttgart/mi/sd1/{aufgabe1 => task1}/BodenlegerKosten.java (98%)
rename Klausuren/Sd1/Test003/Exam/src/main/java/de/hdm_stuttgart/mi/sd1/{aufgabe1 => task1}/Helper.java (90%)
rename Klausuren/Sd1/Test003/Exam/src/main/java/de/hdm_stuttgart/mi/sd1/{aufgabe2 => task2}/Kreis.java (91%)
create mode 100644 Klausuren/Sd1/Test003/Exam/src/main/javadoc/resources/fonts/dejavu.css
create mode 100644 Klausuren/Sd1/Test003/Exam/src/main/javadoc/resources/jdocSupplement.css
create mode 100644 Klausuren/Sd1/Test003/Exam/src/main/javadoc/resources/jdocSupplement.js
rename Klausuren/Sd1/Test003/Exam/src/test/java/de/hdm_stuttgart/mi/sd1/{test => }/ShowReachedPoints.java (63%)
rename Klausuren/Sd1/Test003/Exam/src/test/java/de/hdm_stuttgart/mi/sd1/{test/aufgabe1 => task1}/TestBodenlegerKosten.java (94%)
rename Klausuren/Sd1/Test003/{Solve/src/test/java/de/hdm_stuttgart/mi/sd1/test/aufgabe1 => Exam/src/test/java/de/hdm_stuttgart/mi/sd1/task1}/TestHelper.java (89%)
rename Klausuren/Sd1/Test003/Exam/src/test/java/de/hdm_stuttgart/mi/sd1/{test/aufgabe2 => task2}/TestKreis.java (94%)
rename Klausuren/Sd1/Test003/Solve/src/main/java/de/hdm_stuttgart/mi/sd1/{aufgabe1 => task1}/BodenlegerKosten.java (98%)
rename Klausuren/Sd1/Test003/Solve/src/main/java/de/hdm_stuttgart/mi/sd1/{aufgabe1 => task1}/Helper.java (91%)
rename Klausuren/Sd1/Test003/Solve/src/main/java/de/hdm_stuttgart/mi/sd1/{aufgabe1 => task1}/beispiele/Boden.java (74%)
rename Klausuren/Sd1/Test003/Solve/src/main/java/de/hdm_stuttgart/mi/sd1/{aufgabe1 => task1}/beispiele/Quersumme.java (65%)
rename Klausuren/Sd1/Test003/Solve/src/main/java/de/hdm_stuttgart/mi/sd1/{aufgabe2 => task2}/Kreis.java (93%)
rename Klausuren/Sd1/Test003/Solve/src/main/java/de/hdm_stuttgart/mi/sd1/{aufgabe2 => task2}/beispiel/EnthaltenOderNicht.java (78%)
create mode 100644 Klausuren/Sd1/Test003/Solve/src/main/javadoc/resources/fonts/dejavu.css
create mode 100644 Klausuren/Sd1/Test003/Solve/src/main/javadoc/resources/jdocSupplement.css
create mode 100644 Klausuren/Sd1/Test003/Solve/src/main/javadoc/resources/jdocSupplement.js
rename Klausuren/Sd1/Test003/Solve/src/test/java/de/hdm_stuttgart/mi/sd1/{test => }/ShowReachedPoints.java (63%)
rename Klausuren/Sd1/Test003/Solve/src/test/java/de/hdm_stuttgart/mi/sd1/{test/aufgabe1 => task1}/TestBodenlegerKosten.java (94%)
rename Klausuren/Sd1/Test003/{Exam/src/test/java/de/hdm_stuttgart/mi/sd1/test/aufgabe1 => Solve/src/test/java/de/hdm_stuttgart/mi/sd1/task1}/TestHelper.java (89%)
rename Klausuren/Sd1/Test003/Solve/src/test/java/de/hdm_stuttgart/mi/sd1/{test/aufgabe2 => task2}/TestKreis.java (94%)
rename Klausuren/Sd1/Test004/Exam/src/main/java/de/hdm_stuttgart/mi/sd1/{aufgabe1 => task1}/Helper.java (98%)
rename Klausuren/Sd1/Test004/Exam/src/main/java/de/hdm_stuttgart/mi/sd1/{aufgabe2 => task2}/DummyZinsen.java (94%)
rename Klausuren/Sd1/Test004/Exam/src/main/java/de/hdm_stuttgart/mi/sd1/{aufgabe2 => task2}/Konto.java (98%)
create mode 100644 Klausuren/Sd1/Test004/Exam/src/main/javadoc/resources/fonts/dejavu.css
create mode 100644 Klausuren/Sd1/Test004/Exam/src/main/javadoc/resources/jdocSupplement.css
create mode 100644 Klausuren/Sd1/Test004/Exam/src/main/javadoc/resources/jdocSupplement.js
rename Klausuren/Sd1/Test004/Exam/src/test/java/de/hdm_stuttgart/mi/sd1/{test => }/ShowReachedPoints.java (71%)
rename Klausuren/Sd1/Test004/Exam/src/test/java/de/hdm_stuttgart/mi/sd1/{test/aufgabe1 => task1}/TestHelper.java (96%)
rename Klausuren/Sd1/Test004/{Solve/src/test/java/de/hdm_stuttgart/mi/sd1/test/aufgabe2 => Exam/src/test/java/de/hdm_stuttgart/mi/sd1/task2}/TestKonto.java (96%)
rename Klausuren/Sd1/Test004/Solve/src/main/java/de/hdm_stuttgart/mi/sd1/{aufgabe1 => task1}/Helper.java (98%)
rename Klausuren/Sd1/Test004/Solve/src/main/java/de/hdm_stuttgart/mi/sd1/{aufgabe2 => task2}/DummyZinsen.java (94%)
rename Klausuren/Sd1/Test004/Solve/src/main/java/de/hdm_stuttgart/mi/sd1/{aufgabe2 => task2}/Konto.java (99%)
create mode 100644 Klausuren/Sd1/Test004/Solve/src/main/javadoc/resources/fonts/dejavu.css
create mode 100644 Klausuren/Sd1/Test004/Solve/src/main/javadoc/resources/jdocSupplement.css
create mode 100644 Klausuren/Sd1/Test004/Solve/src/main/javadoc/resources/jdocSupplement.js
rename Klausuren/Sd1/Test004/Solve/src/test/java/de/hdm_stuttgart/mi/sd1/{test => }/ShowReachedPoints.java (71%)
rename Klausuren/Sd1/Test004/Solve/src/test/java/de/hdm_stuttgart/mi/sd1/{test/aufgabe1 => task1}/TestHelper.java (96%)
rename Klausuren/Sd1/Test004/{Exam/src/test/java/de/hdm_stuttgart/mi/sd1/test/aufgabe2 => Solve/src/test/java/de/hdm_stuttgart/mi/sd1/task2}/TestKonto.java (96%)
diff --git a/Klausuren/Sd1/Test001/Exam/pom.xml b/Klausuren/Sd1/Test001/Exam/pom.xml
index bab8d6823..d0d265da1 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 4d7bf3d97..87fd4c78f 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 000000000..4fec2b593
--- /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 000000000..08840cdbf
--- /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 000000000..97911e558
--- /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 31ef70d32..dee72337c 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 064d9d1a3..889e4e9ba 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 d3b5db211..74002c6e4 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 24cc261a6..81db38d47 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 262fce53b..c23dcba5e 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 2ce233557..e2123ca6c 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 2787405e5..dee591d19 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 000000000..4fec2b593
--- /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 000000000..08840cdbf
--- /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 000000000..97911e558
--- /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 31ef70d32..40840401f 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 064d9d1a3..889e4e9ba 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 d3b5db211..74002c6e4 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 24cc261a6..81db38d47 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 344afd734..9037fc4e7 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 c82bb78da..d7c7d62c8 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 f3062d565..6b3636ada 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 ff8789cc5..05ed7cf8c 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 9d0fdd34c..33fd8c0f8 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 dc5c014f5..5154f6ed3 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 c82bb78da..d7c7d62c8 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 f3062d565..6b3636ada 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 ff8789cc5..05ed7cf8c 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 9d0fdd34c..33fd8c0f8 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 b8888e5fd..04f2ecb39 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 ac5f82147..2f1020b9b 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 d163c7ac3..5d95a843b 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 742b7695b..9ac28af67 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 000000000..4fec2b593
--- /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 000000000..08840cdbf
--- /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 000000000..97911e558
--- /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 43259d064..9293d8e97 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 fac549414..899120ba4 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 d1401ff96..f134aa591 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 2a79c0f45..9b2f531ee 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 059ae43c6..0dbffb5b3 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 49217d720..16a10603e 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 392a906aa..1534ce094 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 15c6b708b..e2a43b310 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 e235b4441..ebf380113 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 ab81470b3..5f69860da 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 cad7c567e..68fa12dde 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 acc3baf4c..15f86546a 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 000000000..4fec2b593
--- /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 000000000..08840cdbf
--- /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 000000000..97911e558
--- /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 43259d064..9293d8e97 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 fac549414..899120ba4 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 d1401ff96..f134aa591 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 2a79c0f45..9b2f531ee 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 d5ab02ea3..d7cf2c84e 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 188e84695..447809bc3 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 c69f35101..b8542f2c8 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 84c04c931..456b796c6 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 000000000..4fec2b593
--- /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 000000000..08840cdbf
--- /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 000000000..97911e558
--- /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 2881d9786..5f29f3d71 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 678ec3334..cc5441cd6 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 9079b773d..36c94d71e 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 3d5d71afe..00d7ed6e9 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 54896b769..ace7a6b09 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 c1fcb9856..943a29a1b 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 c69f35101..b8542f2c8 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 798627f10..c7a8e5394 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 000000000..4fec2b593
--- /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 000000000..08840cdbf
--- /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 000000000..97911e558
--- /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 c65edb43f..acac69e4a 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 2fd1fdab2..cbce58755 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 9079b773d..ab6c8a0af 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;
--
GitLab