diff --git a/Klausuren/Sda1/SoSe2015/Exam/pom.xml b/Klausuren/Sda1/SoSe2015/Exam/pom.xml index ad4bbe6b50766daa85f05a74eb5f1490c8c7d841..885703a4e9d936713ea62767c22b9f79b996b231 100644 --- a/Klausuren/Sda1/SoSe2015/Exam/pom.xml +++ b/Klausuren/Sda1/SoSe2015/Exam/pom.xml @@ -3,14 +3,13 @@ <modelVersion>4.0.0</modelVersion> <groupId>de.hdm-stuttgart.mi.sda1</groupId> - <artifactId>scripts</artifactId> + <artifactId>sda1_2015sommer</artifactId> <version>1.0</version> <packaging>jar</packaging> - <name>scripts</name> + <name>sda1_2015sommer</name> - <!--Fixme: Add a sensible project related domain here --> - <url>http://somedomain.org</url> + <url>http://freedocs.mi.hdm-stuttgart.de</url> <properties> <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding> @@ -20,7 +19,7 @@ <dependency> <groupId>junit</groupId> <artifactId>junit</artifactId> - <version>4.11</version> + <version>4.12</version> <scope>test</scope> </dependency> @@ -61,7 +60,7 @@ <plugin> <groupId>org.apache.maven.plugins</groupId> <artifactId>maven-compiler-plugin</artifactId> - <version>3.1</version> + <version>3.5.1</version> <configuration> <source>1.8</source> <target>1.8</target> @@ -75,30 +74,6 @@ <configuration /> </plugin> - <plugin> - <groupId>org.apache.maven.plugins</groupId> - <artifactId>maven-shade-plugin</artifactId> - <version>2.3</version> - <configuration> - <transformers> - <transformer - implementation="org.apache.maven.plugins.shade.resource.ManifestResourceTransformer"> - <manifestEntries> - <Main-Class>de.hdm_stuttgart.mi.sda1.scripts.App</Main-Class> - </manifestEntries> - </transformer> - </transformers> - </configuration> - <executions> - <execution> - <phase>package</phase> - <goals> - <goal>shade</goal> - </goals> - </execution> - </executions> - </plugin> - </plugins> </build> </project> diff --git a/Klausuren/Sda1/SoSe2015/Exam_solution/.gitignore b/Klausuren/Sda1/SoSe2015/Exam_solve/.gitignore similarity index 100% rename from Klausuren/Sda1/SoSe2015/Exam_solution/.gitignore rename to Klausuren/Sda1/SoSe2015/Exam_solve/.gitignore diff --git a/Klausuren/Sda1/SoSe2015/Exam_solution/Doc/scriptXsd.xhtml b/Klausuren/Sda1/SoSe2015/Exam_solve/Doc/scriptXsd.xhtml similarity index 100% rename from Klausuren/Sda1/SoSe2015/Exam_solution/Doc/scriptXsd.xhtml rename to Klausuren/Sda1/SoSe2015/Exam_solve/Doc/scriptXsd.xhtml diff --git a/Klausuren/Sda1/SoSe2015/Exam_solution/Doc/scriptsJdbc.xhtml b/Klausuren/Sda1/SoSe2015/Exam_solve/Doc/scriptsJdbc.xhtml similarity index 100% rename from Klausuren/Sda1/SoSe2015/Exam_solution/Doc/scriptsJdbc.xhtml rename to Klausuren/Sda1/SoSe2015/Exam_solve/Doc/scriptsJdbc.xhtml diff --git a/Klausuren/Sda1/SoSe2015/Exam_solution/Doc/scriptsSchemaSql.xhtml b/Klausuren/Sda1/SoSe2015/Exam_solve/Doc/scriptsSchemaSql.xhtml similarity index 100% rename from Klausuren/Sda1/SoSe2015/Exam_solution/Doc/scriptsSchemaSql.xhtml rename to Klausuren/Sda1/SoSe2015/Exam_solve/Doc/scriptsSchemaSql.xhtml diff --git a/Klausuren/Sda1/SoSe2015/Exam_solution/Schema/sampledata.xml b/Klausuren/Sda1/SoSe2015/Exam_solve/Schema/sampledata.xml similarity index 100% rename from Klausuren/Sda1/SoSe2015/Exam_solution/Schema/sampledata.xml rename to Klausuren/Sda1/SoSe2015/Exam_solve/Schema/sampledata.xml diff --git a/Klausuren/Sda1/SoSe2015/Exam_solution/Schema/scripts.sql b/Klausuren/Sda1/SoSe2015/Exam_solve/Schema/scripts.sql similarity index 100% rename from Klausuren/Sda1/SoSe2015/Exam_solution/Schema/scripts.sql rename to Klausuren/Sda1/SoSe2015/Exam_solve/Schema/scripts.sql diff --git a/Klausuren/Sda1/SoSe2015/Exam_solution/Schema/scripts.xsd b/Klausuren/Sda1/SoSe2015/Exam_solve/Schema/scripts.xsd similarity index 100% rename from Klausuren/Sda1/SoSe2015/Exam_solution/Schema/scripts.xsd rename to Klausuren/Sda1/SoSe2015/Exam_solve/Schema/scripts.xsd diff --git a/Klausuren/Sda1/SoSe2015/Exam_solution/SchemaTest/invalidHasReference.xml b/Klausuren/Sda1/SoSe2015/Exam_solve/SchemaTest/invalidHasReference.xml similarity index 100% rename from Klausuren/Sda1/SoSe2015/Exam_solution/SchemaTest/invalidHasReference.xml rename to Klausuren/Sda1/SoSe2015/Exam_solve/SchemaTest/invalidHasReference.xml diff --git a/Klausuren/Sda1/SoSe2015/Exam_solution/SchemaTest/invalidIdNoSpace.xml b/Klausuren/Sda1/SoSe2015/Exam_solve/SchemaTest/invalidIdNoSpace.xml similarity index 100% rename from Klausuren/Sda1/SoSe2015/Exam_solution/SchemaTest/invalidIdNoSpace.xml rename to Klausuren/Sda1/SoSe2015/Exam_solve/SchemaTest/invalidIdNoSpace.xml diff --git a/Klausuren/Sda1/SoSe2015/Exam_solution/SchemaTest/invalidMultipleReference.xml b/Klausuren/Sda1/SoSe2015/Exam_solve/SchemaTest/invalidMultipleReference.xml similarity index 100% rename from Klausuren/Sda1/SoSe2015/Exam_solution/SchemaTest/invalidMultipleReference.xml rename to Klausuren/Sda1/SoSe2015/Exam_solve/SchemaTest/invalidMultipleReference.xml diff --git a/Klausuren/Sda1/SoSe2015/Exam_solution/SchemaTest/invalidSingleReference.xml b/Klausuren/Sda1/SoSe2015/Exam_solve/SchemaTest/invalidSingleReference.xml similarity index 100% rename from Klausuren/Sda1/SoSe2015/Exam_solution/SchemaTest/invalidSingleReference.xml rename to Klausuren/Sda1/SoSe2015/Exam_solve/SchemaTest/invalidSingleReference.xml diff --git a/Klausuren/Sda1/SoSe2015/Exam_solution/SchemaTest/invalidUniqueId.xml b/Klausuren/Sda1/SoSe2015/Exam_solve/SchemaTest/invalidUniqueId.xml similarity index 100% rename from Klausuren/Sda1/SoSe2015/Exam_solution/SchemaTest/invalidUniqueId.xml rename to Klausuren/Sda1/SoSe2015/Exam_solve/SchemaTest/invalidUniqueId.xml diff --git a/Klausuren/Sda1/SoSe2015/Exam_solution/SchemaTest/invalidUniqueLanguage.xml b/Klausuren/Sda1/SoSe2015/Exam_solve/SchemaTest/invalidUniqueLanguage.xml similarity index 100% rename from Klausuren/Sda1/SoSe2015/Exam_solution/SchemaTest/invalidUniqueLanguage.xml rename to Klausuren/Sda1/SoSe2015/Exam_solve/SchemaTest/invalidUniqueLanguage.xml diff --git a/Klausuren/Sda1/SoSe2015/Exam_solution/SchemaTest/invalidUniqueMultipleLanguageRef_err.xml b/Klausuren/Sda1/SoSe2015/Exam_solve/SchemaTest/invalidUniqueMultipleLanguageRef_err.xml similarity index 100% rename from Klausuren/Sda1/SoSe2015/Exam_solution/SchemaTest/invalidUniqueMultipleLanguageRef_err.xml rename to Klausuren/Sda1/SoSe2015/Exam_solve/SchemaTest/invalidUniqueMultipleLanguageRef_err.xml diff --git a/Klausuren/Sda1/SoSe2015/Exam_solution/SchemaTest/preconditionHasReference.xml b/Klausuren/Sda1/SoSe2015/Exam_solve/SchemaTest/preconditionHasReference.xml similarity index 100% rename from Klausuren/Sda1/SoSe2015/Exam_solution/SchemaTest/preconditionHasReference.xml rename to Klausuren/Sda1/SoSe2015/Exam_solve/SchemaTest/preconditionHasReference.xml diff --git a/Klausuren/Sda1/SoSe2015/Exam_solution/SchemaTest/preconditionIdNoSpace.xml b/Klausuren/Sda1/SoSe2015/Exam_solve/SchemaTest/preconditionIdNoSpace.xml similarity index 100% rename from Klausuren/Sda1/SoSe2015/Exam_solution/SchemaTest/preconditionIdNoSpace.xml rename to Klausuren/Sda1/SoSe2015/Exam_solve/SchemaTest/preconditionIdNoSpace.xml diff --git a/Klausuren/Sda1/SoSe2015/Exam_solution/SchemaTest/preconditionMultipleReference.xml b/Klausuren/Sda1/SoSe2015/Exam_solve/SchemaTest/preconditionMultipleReference.xml similarity index 100% rename from Klausuren/Sda1/SoSe2015/Exam_solution/SchemaTest/preconditionMultipleReference.xml rename to Klausuren/Sda1/SoSe2015/Exam_solve/SchemaTest/preconditionMultipleReference.xml diff --git a/Klausuren/Sda1/SoSe2015/Exam_solution/SchemaTest/preconditionSingleReference.xml b/Klausuren/Sda1/SoSe2015/Exam_solve/SchemaTest/preconditionSingleReference.xml similarity index 100% rename from Klausuren/Sda1/SoSe2015/Exam_solution/SchemaTest/preconditionSingleReference.xml rename to Klausuren/Sda1/SoSe2015/Exam_solve/SchemaTest/preconditionSingleReference.xml diff --git a/Klausuren/Sda1/SoSe2015/Exam_solution/SchemaTest/preconditionUniqueId.xml b/Klausuren/Sda1/SoSe2015/Exam_solve/SchemaTest/preconditionUniqueId.xml similarity index 100% rename from Klausuren/Sda1/SoSe2015/Exam_solution/SchemaTest/preconditionUniqueId.xml rename to Klausuren/Sda1/SoSe2015/Exam_solve/SchemaTest/preconditionUniqueId.xml diff --git a/Klausuren/Sda1/SoSe2015/Exam_solution/SchemaTest/preconditionUniqueLanguage.xml b/Klausuren/Sda1/SoSe2015/Exam_solve/SchemaTest/preconditionUniqueLanguage.xml similarity index 100% rename from Klausuren/Sda1/SoSe2015/Exam_solution/SchemaTest/preconditionUniqueLanguage.xml rename to Klausuren/Sda1/SoSe2015/Exam_solve/SchemaTest/preconditionUniqueLanguage.xml diff --git a/Klausuren/Sda1/SoSe2015/Exam_solution/SchemaTest/preconditionUniqueMultipleLanguageRef.xml b/Klausuren/Sda1/SoSe2015/Exam_solve/SchemaTest/preconditionUniqueMultipleLanguageRef.xml similarity index 100% rename from Klausuren/Sda1/SoSe2015/Exam_solution/SchemaTest/preconditionUniqueMultipleLanguageRef.xml rename to Klausuren/Sda1/SoSe2015/Exam_solve/SchemaTest/preconditionUniqueMultipleLanguageRef.xml diff --git a/Klausuren/Sda1/SoSe2015/Exam_solution/SchemaTest/validFull.xml b/Klausuren/Sda1/SoSe2015/Exam_solve/SchemaTest/validFull.xml similarity index 100% rename from Klausuren/Sda1/SoSe2015/Exam_solution/SchemaTest/validFull.xml rename to Klausuren/Sda1/SoSe2015/Exam_solve/SchemaTest/validFull.xml diff --git a/Klausuren/Sda1/SoSe2015/Exam_solution/pom.xml b/Klausuren/Sda1/SoSe2015/Exam_solve/pom.xml similarity index 67% rename from Klausuren/Sda1/SoSe2015/Exam_solution/pom.xml rename to Klausuren/Sda1/SoSe2015/Exam_solve/pom.xml index ad4bbe6b50766daa85f05a74eb5f1490c8c7d841..25d2213916cfa26f16012935d26cdb025d20fb8b 100644 --- a/Klausuren/Sda1/SoSe2015/Exam_solution/pom.xml +++ b/Klausuren/Sda1/SoSe2015/Exam_solve/pom.xml @@ -3,14 +3,13 @@ <modelVersion>4.0.0</modelVersion> <groupId>de.hdm-stuttgart.mi.sda1</groupId> - <artifactId>scripts</artifactId> + <artifactId>sda1_2015sommer_solve</artifactId> <version>1.0</version> <packaging>jar</packaging> - <name>scripts</name> + <name>sda1_2015sommer_solve</name> - <!--Fixme: Add a sensible project related domain here --> - <url>http://somedomain.org</url> + <url>http://freedocs.mi.hdm-stuttgart.de</url> <properties> <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding> @@ -20,7 +19,7 @@ <dependency> <groupId>junit</groupId> <artifactId>junit</artifactId> - <version>4.11</version> + <version>4.12</version> <scope>test</scope> </dependency> @@ -61,7 +60,7 @@ <plugin> <groupId>org.apache.maven.plugins</groupId> <artifactId>maven-compiler-plugin</artifactId> - <version>3.1</version> + <version>3.5.1</version> <configuration> <source>1.8</source> <target>1.8</target> @@ -75,30 +74,6 @@ <configuration /> </plugin> - <plugin> - <groupId>org.apache.maven.plugins</groupId> - <artifactId>maven-shade-plugin</artifactId> - <version>2.3</version> - <configuration> - <transformers> - <transformer - implementation="org.apache.maven.plugins.shade.resource.ManifestResourceTransformer"> - <manifestEntries> - <Main-Class>de.hdm_stuttgart.mi.sda1.scripts.App</Main-Class> - </manifestEntries> - </transformer> - </transformers> - </configuration> - <executions> - <execution> - <phase>package</phase> - <goals> - <goal>shade</goal> - </goals> - </execution> - </executions> - </plugin> - </plugins> </build> </project> diff --git a/Klausuren/Sda1/SoSe2015/Exam_solution/src/main/java/de/hdm_stuttgart/mi/sda1/scripts/DbHandler.java b/Klausuren/Sda1/SoSe2015/Exam_solve/src/main/java/de/hdm_stuttgart/mi/sda1/scripts/DbHandler.java similarity index 100% rename from Klausuren/Sda1/SoSe2015/Exam_solution/src/main/java/de/hdm_stuttgart/mi/sda1/scripts/DbHandler.java rename to Klausuren/Sda1/SoSe2015/Exam_solve/src/main/java/de/hdm_stuttgart/mi/sda1/scripts/DbHandler.java diff --git a/Klausuren/Sda1/SoSe2015/Exam_solution/src/main/java/de/hdm_stuttgart/mi/sda1/scripts/Transform.java b/Klausuren/Sda1/SoSe2015/Exam_solve/src/main/java/de/hdm_stuttgart/mi/sda1/scripts/Transform.java similarity index 100% rename from Klausuren/Sda1/SoSe2015/Exam_solution/src/main/java/de/hdm_stuttgart/mi/sda1/scripts/Transform.java rename to Klausuren/Sda1/SoSe2015/Exam_solve/src/main/java/de/hdm_stuttgart/mi/sda1/scripts/Transform.java diff --git a/Klausuren/Sda1/SoSe2015/Exam_solution/src/main/java/de/hdm_stuttgart/mi/sda1/scripts/Xml2Rdbms.java b/Klausuren/Sda1/SoSe2015/Exam_solve/src/main/java/de/hdm_stuttgart/mi/sda1/scripts/Xml2Rdbms.java similarity index 100% rename from Klausuren/Sda1/SoSe2015/Exam_solution/src/main/java/de/hdm_stuttgart/mi/sda1/scripts/Xml2Rdbms.java rename to Klausuren/Sda1/SoSe2015/Exam_solve/src/main/java/de/hdm_stuttgart/mi/sda1/scripts/Xml2Rdbms.java diff --git a/Klausuren/Sda1/SoSe2015/Exam_solution/src/main/resources/log4j2.xml b/Klausuren/Sda1/SoSe2015/Exam_solve/src/main/resources/log4j2.xml similarity index 100% rename from Klausuren/Sda1/SoSe2015/Exam_solution/src/main/resources/log4j2.xml rename to Klausuren/Sda1/SoSe2015/Exam_solve/src/main/resources/log4j2.xml diff --git a/Klausuren/Sda1/SoSe2015/Exam_solution/src/test/java/de/hdm_stuttgart/mi/sda1/exam/test/ignore/InstanceSetEvaluation.java b/Klausuren/Sda1/SoSe2015/Exam_solve/src/test/java/de/hdm_stuttgart/mi/sda1/exam/test/ignore/InstanceSetEvaluation.java similarity index 100% rename from Klausuren/Sda1/SoSe2015/Exam_solution/src/test/java/de/hdm_stuttgart/mi/sda1/exam/test/ignore/InstanceSetEvaluation.java rename to Klausuren/Sda1/SoSe2015/Exam_solve/src/test/java/de/hdm_stuttgart/mi/sda1/exam/test/ignore/InstanceSetEvaluation.java diff --git a/Klausuren/Sda1/SoSe2015/Exam_solution/src/test/java/de/hdm_stuttgart/mi/sda1/exam/test/ignore/InstanceTest.java b/Klausuren/Sda1/SoSe2015/Exam_solve/src/test/java/de/hdm_stuttgart/mi/sda1/exam/test/ignore/InstanceTest.java similarity index 100% rename from Klausuren/Sda1/SoSe2015/Exam_solution/src/test/java/de/hdm_stuttgart/mi/sda1/exam/test/ignore/InstanceTest.java rename to Klausuren/Sda1/SoSe2015/Exam_solve/src/test/java/de/hdm_stuttgart/mi/sda1/exam/test/ignore/InstanceTest.java diff --git a/Klausuren/Sda1/SoSe2015/Exam_solution/src/test/java/de/hdm_stuttgart/mi/sda1/scripts/SchemaTest.java b/Klausuren/Sda1/SoSe2015/Exam_solve/src/test/java/de/hdm_stuttgart/mi/sda1/scripts/SchemaTest.java similarity index 100% rename from Klausuren/Sda1/SoSe2015/Exam_solution/src/test/java/de/hdm_stuttgart/mi/sda1/scripts/SchemaTest.java rename to Klausuren/Sda1/SoSe2015/Exam_solve/src/test/java/de/hdm_stuttgart/mi/sda1/scripts/SchemaTest.java