diff --git a/Makefile b/Makefile
index fe887dbc73488fd8d77094fb2f6cfa58f6e39694..91d74399b17c20b8926a9b758b7e3308cfebf31b 100644
--- a/Makefile
+++ b/Makefile
@@ -12,15 +12,12 @@ K := $(foreach exec,$(EXECUTABLES),\
REVEALHOME=/usr/share/reveal.js
K := $(if $(shell ls ${REVEALHOME}),some string,$(error "No ${REVEALHOME} found, please execute git clone https://github.com/hakimel/reveal.js)))
-DOCMODULES = Sd1 Sda1 Sda2 Tdoc Sdi Persist
-
doc:
cd Doc;$(MAKE) -j ${numCores} all
all:doc
- mvn -T ${numCores} --fail-at-end install || echo
- mvn -T ${numCores} --fail-at-end install || echo
- mvn -T ${numCores} --fail-at-end javadoc:javadoc || exit 0
+# mvn -T ${numCores} --fail-at-end install || echo
+ mvn --fail-at-end install javadoc:javadoc || exit 0
find P -type f \( -name \*.css -o -name \*.html -o -name \*.js \) -print | tar --files-from=- -c| tar -x -C Doc/target/webhelp
clean:
diff --git a/ws/eclipse/HtmlExtensionTaglet/.gitignore b/P/Deps/HtmlExtensionTaglet/.gitignore
similarity index 100%
rename from ws/eclipse/HtmlExtensionTaglet/.gitignore
rename to P/Deps/HtmlExtensionTaglet/.gitignore
diff --git a/ws/eclipse/HtmlExtensionTaglet/pom.xml b/P/Deps/HtmlExtensionTaglet/pom.xml
similarity index 88%
rename from ws/eclipse/HtmlExtensionTaglet/pom.xml
rename to P/Deps/HtmlExtensionTaglet/pom.xml
index 7afbef63b696cf06f4bfa467eb3dfcc9a2b28eec..5077d953d9cd92451b3a7d5c1d6ee9c136b386b8 100644
--- a/ws/eclipse/HtmlExtensionTaglet/pom.xml
+++ b/P/Deps/HtmlExtensionTaglet/pom.xml
@@ -2,13 +2,6 @@
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>
- <parent>
- <groupId>de.hdm-stuttgart.mi</groupId>
- <artifactId>lecturenotes-base-pom</artifactId>
- <version>1.0</version>
- <relativePath>../../../pom.xml</relativePath>
- </parent>
-
<groupId>de.hdm-stuttgart.sd1</groupId>
<artifactId>taglet</artifactId>
<version>1.2</version>
@@ -37,7 +30,15 @@
<version>1.8.0</version>
<scope>system</scope>
<systemPath>${java.home}/../lib/tools.jar</systemPath>
- </dependency>
+ </dependency>
+
+ <dependency>
+ <groupId>junit</groupId>
+ <artifactId>junit</artifactId>
+ <version>4.12</version>
+ <scope>test</scope>
+ </dependency>
+
</dependencies>
<build>
diff --git a/ws/eclipse/HtmlExtensionTaglet/src/main/java/de/hdm_stuttgart/sd1/taglet/HtmlExtensionTaglet.java b/P/Deps/HtmlExtensionTaglet/src/main/java/de/hdm_stuttgart/sd1/taglet/HtmlExtensionTaglet.java
similarity index 100%
rename from ws/eclipse/HtmlExtensionTaglet/src/main/java/de/hdm_stuttgart/sd1/taglet/HtmlExtensionTaglet.java
rename to P/Deps/HtmlExtensionTaglet/src/main/java/de/hdm_stuttgart/sd1/taglet/HtmlExtensionTaglet.java
diff --git a/ws/eclipse/HtmlExtensionTaglet/src/main/java/de/hdm_stuttgart/sd1/taglet/TestMe.java b/P/Deps/HtmlExtensionTaglet/src/main/java/de/hdm_stuttgart/sd1/taglet/TestMe.java
similarity index 81%
rename from ws/eclipse/HtmlExtensionTaglet/src/main/java/de/hdm_stuttgart/sd1/taglet/TestMe.java
rename to P/Deps/HtmlExtensionTaglet/src/main/java/de/hdm_stuttgart/sd1/taglet/TestMe.java
index afc28ab68c20bd880d524422abb96e62a827a42d..6ca7e5d79c543b7e3c0885480c2b75bbe3df7f4a 100644
--- a/ws/eclipse/HtmlExtensionTaglet/src/main/java/de/hdm_stuttgart/sd1/taglet/TestMe.java
+++ b/P/Deps/HtmlExtensionTaglet/src/main/java/de/hdm_stuttgart/sd1/taglet/TestMe.java
@@ -7,8 +7,14 @@ public class TestMe {
*
* Comment will involve mathml.
*
- * @return Some value according to:
+ * @return Some value according to: See down below, cannot yet be used, since taglet dep cannot
+ * reference itself in pom.xml, sorry!
*
+ */
+ public String someMethod() {return "";}
+}
+
+/*
* {@html.extend <math display="inline" xmlns="http://www.w3.org/1998/Math/MathML">
<mrow>
<mrow>
@@ -37,6 +43,3 @@ public class TestMe {
</mrow>
</math>}
*/
- public String someMethod() {return "";}
-
-}
diff --git a/ws/eclipse/HtmlExtensionTaglet/src/test/java/de/hdm_stuttgart/sd1/taglet/AppTest.java b/P/Deps/HtmlExtensionTaglet/src/test/java/de/hdm_stuttgart/sd1/taglet/AppTest.java
similarity index 100%
rename from ws/eclipse/HtmlExtensionTaglet/src/test/java/de/hdm_stuttgart/sd1/taglet/AppTest.java
rename to P/Deps/HtmlExtensionTaglet/src/test/java/de/hdm_stuttgart/sd1/taglet/AppTest.java
diff --git a/P/Makefile b/P/Makefile
index 315cc9a71315a6a048490c922d1d85632f4d145b..ed1842ac6a8904bc930d0bd1a5039080446702c9 100644
--- a/P/Makefile
+++ b/P/Makefile
@@ -6,14 +6,22 @@ PROJECTROOTS=$(shell for module in ${DOCMODULES}; do \
find $$module -name pom.xml| sed -e s/\\/pom.xml//g;\
done;)
-install:
- for subdir in ${PROJECTROOTS}; do \
- pushd $$subdir; \
- rm -f target/project.zip; \
- zip -r target/project.zip . --exclude project.zip target/\*; \
- popd; \
- done;
- mkdir -p ../Doc/target/navi/de.hdm_stuttgart.mi.lectures/P
- tar c- ${DOCMODULES}|tar -x -C ../Doc/target/navi/de.hdm_stuttgart.mi.lectures/P
+%/pom.install: %/pom.xml
+ cd $*; mvn install && touch pom.install || echo;
+
+%/pom.javadoc: %/pom.xml
+ cd $*; mvn javadoc:javadoc && touch pom.javadoc || echo ;
+
+%/pom.clean: %/pom.xml
+ cd $*; mvn clean eclipse:clean
+
+all:
+ $(MAKE) try
+ $(MAKE) try
+
+try: $(foreach PROOT, $(PROJECTROOTS), $(PROOT)/pom.install $(PROOT)/pom.javadoc)
+
+
+clean: $(foreach PROOT, $(PROJECTROOTS), $(PROOT)/pom.clean)
#end
diff --git a/P/Sd1/Projects/PoorMansGrep/.gitignore b/P/Sd1/Projects/PoorMansGrep/.gitignore
new file mode 100644
index 0000000000000000000000000000000000000000..8cce575781a794c2fd93f683f55c90de4641e76b
--- /dev/null
+++ b/P/Sd1/Projects/PoorMansGrep/.gitignore
@@ -0,0 +1,3 @@
+dependency-reduced-pom.xml
+A1.log
+
diff --git a/P/Sd1/Projects/PoorMansGrep/src/main/resources/log4j2.xml.template b/P/Sd1/Projects/PoorMansGrep/src/main/resources/log4j2.xml
similarity index 100%
rename from P/Sd1/Projects/PoorMansGrep/src/main/resources/log4j2.xml.template
rename to P/Sd1/Projects/PoorMansGrep/src/main/resources/log4j2.xml
diff --git a/P/Sd1/plot/Basic/.gitignore b/P/Sd1/plot/Basic/.gitignore
index 60016e96da599c851cb07593bb0abf254784b14e..8cce575781a794c2fd93f683f55c90de4641e76b 100644
--- a/P/Sd1/plot/Basic/.gitignore
+++ b/P/Sd1/plot/Basic/.gitignore
@@ -1,5 +1,3 @@
-/target/
-/.settings/
-.classpath
-.project
+dependency-reduced-pom.xml
A1.log
+
diff --git a/P/Sd1/plot/Interface/.gitignore b/P/Sd1/plot/Interface/.gitignore
index 60016e96da599c851cb07593bb0abf254784b14e..8cce575781a794c2fd93f683f55c90de4641e76b 100644
--- a/P/Sd1/plot/Interface/.gitignore
+++ b/P/Sd1/plot/Interface/.gitignore
@@ -1,5 +1,3 @@
-/target/
-/.settings/
-.classpath
-.project
+dependency-reduced-pom.xml
A1.log
+
diff --git a/P/Sda1/Jpa/rdbms2catalog/skeleton/.gitignore b/P/Sda1/Jpa/rdbms2catalog/skeleton/.gitignore
index 660be2a5fdb9e3019ef8fc737d47fba56fc32ff3..8cce575781a794c2fd93f683f55c90de4641e76b 100644
--- a/P/Sda1/Jpa/rdbms2catalog/skeleton/.gitignore
+++ b/P/Sda1/Jpa/rdbms2catalog/skeleton/.gitignore
@@ -1,5 +1,3 @@
-.project
-.classpath
-/.settings/
-/target/
-A1.log
\ No newline at end of file
+dependency-reduced-pom.xml
+A1.log
+
diff --git a/P/Sda1/Jpa/rdbms2catalog/skeleton/pom.xml b/P/Sda1/Jpa/rdbms2catalog/skeleton/pom.xml
index dafc4821466caca0169139c506bf09946c86d7a9..bd2508bb6985ecbabb65839612acc7bfe4d7a521 100644
--- a/P/Sda1/Jpa/rdbms2catalog/skeleton/pom.xml
+++ b/P/Sda1/Jpa/rdbms2catalog/skeleton/pom.xml
@@ -120,7 +120,7 @@
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-shade-plugin</artifactId>
- <version>${org.apache.maven.plugins.maven-shade-plugin}</version>
+ <version>3.1.0</version>
<configuration>
<transformers>
<transformer
diff --git a/P/pom.xml b/P/pom.xml
index ee50985895fea96224d5a52cf4a68915c0386c4f..f5f9ce05e233f07f793995d4c2c181098b123d3a 100644
--- a/P/pom.xml
+++ b/P/pom.xml
@@ -19,8 +19,76 @@
<name>Martin Goik lecture note examples</name>
<modules>
-
- <!-- Software development 1 stanalone pom.xml files -->
+ <!-- Mathml related extension -->
+
+ <module>Deps/HtmlExtensionTaglet</module>
+
+ <!-- Software development 1 standalone pom.xml files -->
+
+ <module>Sd1/Marks/Solution1</module>
+ <module>Sd1/Marks/Solution2</module>
+ <module>Sd1/Array/integerStoreUnbounded</module>
+ <module>Sd1/Array/integerStore</module>
+ <module>Sd1/Array/arraycalcSolution</module>
+ <module>Sd1/Array/integerStoreMedianAnswer</module>
+ <module>Sd1/Array/integerStoreSkeleton</module>
+ <module>Sd1/Array/StringArray2Html</module>
+ <module>Sd1/Array/medianCmdLine</module>
+ <module>Sd1/Array/arraycalcExercise</module>
+ <module>Sd1/Array/integerStoreStat</module>
+ <module>Sd1/Array/marking</module>
+ <module>Sd1/Euler/11/largestproductingrid</module>
+ <module>Sd1/Wc/readFile</module>
+ <module>Sd1/Wc/wc</module>
+ <module>Sd1/Binomial/V1</module>
+ <module>Sd1/Binomial/V3</module>
+ <module>Sd1/Collection/Intro/LookupSet</module>
+ <module>Sd1/Prime/V1</module>
+ <module>Sd1/Prime/V2</module>
+ <module>Sd1/NonsenseGenerator</module>
+ <module>Sd1/CollectionImplement/StringSet/Solution</module>
+ <module>Sd1/summing</module>
+ <module>Sd1/StringLengthSort/Solution</module>
+ <module>Sd1/Gcd/V1</module>
+ <module>Sd1/interest/V1</module>
+ <module>Sd1/interest/V2</module>
+ <module>Sd1/WordFrequency1/Solution</module>
+ <module>Sd1/Projects/PoorMansGrep</module>
+ <module>Sd1/rounding</module>
+ <module>Sd1/WordFrequency2/Solution1</module>
+ <module>Sd1/WordFrequency2/Solution2</module>
+ <module>Sd1/fraction/V1</module>
+ <module>Sd1/fraction/V05</module>
+ <module>Sd1/fraction/V2</module>
+ <module>Sd1/SyncTest</module>
+ <module>Sd1/Figure/ToString</module>
+ <module>Sd1/Figure/Scale</module>
+ <module>Sd1/Figure/BaseClass</module>
+ <module>Sd1/CarJump/V5</module>
+ <module>Sd1/CarJump/V1</module>
+ <module>Sd1/CarJump/V2</module>
+ <module>Sd1/math/V0_7</module>
+ <module>Sd1/math/V1</module>
+ <module>Sd1/math/V3</module>
+ <module>Sd1/math/V4</module>
+ <module>Sd1/math/V2</module>
+ <module>Sd1/math/V0_5</module>
+ <module>Sd1/HtmlFormatting/Simple/Exercise</module>
+ <module>Sd1/HtmlFormatting/Simple/Solution</module>
+ <module>Sd1/TicTacToe/V1</module>
+ <module>Sd1/TicTacToe/V4</module>
+ <module>Sd1/TicTacToe/V2</module>
+ <module>Sd1/ConsoleSum/V1</module>
+ <module>Sd1/ConsoleSum/V3</module>
+ <module>Sd1/Wordlist/Solution2</module>
+ <module>Sd1/Wordlist/Solution</module>
+ <module>Sd1/plot/Interface</module>
+ <module>Sd1/plot/Basic</module>
+ <module>Sd1/loop/question</module>
+ <module>Sd1/loop/answer</module>
+ <module>Sd1/leapYear</module>
+ <module>Sd1/Filepath</module>
+ <module>Sd1/Navigation/V2</module>
<!-- Structured data and applications 1 -->
diff --git a/pom.xml b/pom.xml
index a86f9034cc541584f1bdf25dd807d5b86e6dc46f..4fc21d121a819c1c2c72f69fa34713223e6f7b7d 100644
--- a/pom.xml
+++ b/pom.xml
@@ -26,9 +26,8 @@
<url>https://freedocs.mi.hdm-stuttgart.de</url>
<modules>
- <module>ws/eclipse/HtmlExtensionTaglet</module>
- <module>ws/eclipse/Jdbc</module>
<module>P</module>
+ <module>ws/eclipse/Jdbc</module>
</modules>
<build>
diff --git a/ws/eclipse/Jdbc/pom.xml b/ws/eclipse/Jdbc/pom.xml
index 96dd86c374b00615b52c670292537d18b0d0f939..60df56faa3f4abefbcab556d280c5aecfbaaba8e 100644
--- a/ws/eclipse/Jdbc/pom.xml
+++ b/ws/eclipse/Jdbc/pom.xml
@@ -51,4 +51,39 @@
<version>1.2</version>
</dependency>
</dependencies>
+
+ <build>
+ <plugins>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-javadoc-plugin</artifactId>
+ <version>2.10.4</version>
+ <configuration>
+ <linksource>true</linksource>
+ <additionalparam>--allow-script-in-comments -header <![CDATA['<script type="text/javascript" src="https://freedocs.mi.hdm-stuttgart.de/mathjax/MathJax.js?config=TeX-AMS-MML_HTMLorMML"></script>']]></additionalparam>
+ <taglets>
+ <taglet>
+ <tagletClass>de.hdm_stuttgart.sd1.taglet.HtmlExtensionTaglet</tagletClass>
+ <tagletArtifact>
+ <groupId>de.hdm-stuttgart.sd1</groupId>
+ <artifactId>taglet</artifactId>
+ <version>1.2</version>
+ </tagletArtifact>
+ </taglet>
+ </taglets>
+ </configuration>
+ </plugin>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-compiler-plugin</artifactId>
+ <version>3.7.0</version>
+ <configuration>
+ <source>1.8</source>
+ <target>1.8</target>
+ </configuration>
+ </plugin>
+
+ </plugins>
+ </build>
+
</project>