diff --git a/Sda2/Makefile b/Sda2/Makefile
index 557ec7a83b9b038d960f4c7c9653ede70b909e74..8b7e47d741f7065bf5897be5e0e6d766be757dd4 100644
--- a/Sda2/Makefile
+++ b/Sda2/Makefile
@@ -46,7 +46,6 @@ jdoc: $(foreach pomDir,$(POMDIRS),$(pomDir)/jdoc )
${BUILDNAVI}/index.html ${BUILDNAVI}/printversion.pdf:${SCRIPTBASENAME}.xml
rm -rf $(BUILDBASE) || true
mkdir -p ${BUILDNAVI} ${BUILDNONAVI}
- $(MAKE) jdoc
java -cp ${CP} de.hdm_stuttgart.mi.codeformat.Docbook2docbook ${SCRIPTBASENAME}
saxon9he-xslt -s:${SCRIPTBASENAME}.convert.xml -xsl:../ws/Docbook/Extensions/Xsl/docbook2docbook.xsl > ${SCRIPTBASENAME}.convert.answer.xml
/usr/share/xmlmind/bin/xxetool convert -p suppress.navigation 1 -p eclipse.plugin.id $(PLUGINID) ${PPARAM} db5.toEclipseHelp ${SCRIPTBASENAME}.convert.answer.xml \
diff --git a/Sda2/P/Register/pom.xml b/Sda2/P/Register/pom.xml
index ff333b3be71ffa83177e93333664eabab0629138..7b7447cb916bb2a3a8da9b8528a976e56c19f8c5 100644
--- a/Sda2/P/Register/pom.xml
+++ b/Sda2/P/Register/pom.xml
@@ -103,6 +103,12 @@
<target>1.8</target>
</configuration>
</plugin>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-javadoc-plugin</artifactId>
+ <version>2.10.1</version>
+ <configuration />
+ </plugin>
<!-- As we are doing "inplace" GWT compilation, ensure the widgetset -->
<!-- directory is cleaned properly -->
<plugin>
diff --git a/Sda2/P/Register/src/main/java/de/hdm_stuttgart/mi/MyLogin.java b/Sda2/P/Register/src/main/java/de/hdm_stuttgart/mi/MyLogin.java
index a220d2c814c04b354c5e6450efce991ece329d6b..f901feb3bc96a09d48c3aae2a4ecbee0163959a0 100644
--- a/Sda2/P/Register/src/main/java/de/hdm_stuttgart/mi/MyLogin.java
+++ b/Sda2/P/Register/src/main/java/de/hdm_stuttgart/mi/MyLogin.java
@@ -17,6 +17,10 @@ import com.vaadin.ui.TextField;
import com.vaadin.ui.VerticalLayout;
import com.vaadin.ui.Button.ClickEvent;
+/**
+ * Login handler starting application
+ *
+ */
public class MyLogin extends CustomComponent implements View {
/*- VaadinEditorProperties={"grid":"RegularGrid,20","showGrid":true,"snapToGrid":true,"snapToObject":true,"movingGuides":false,"snappingDistance":10} */
@@ -44,6 +48,9 @@ public class MyLogin extends CustomComponent implements View {
// Manual modifications
private static final long serialVersionUID = 5701668846027080460L;
+ /**
+ * Unique vied id.
+ */
public final static String viewId = "";// The start view's id must be an empty string
/**
* The constructor should first build the main layout, set the
@@ -51,6 +58,8 @@ public class MyLogin extends CustomComponent implements View {
*
* The constructor will not be automatically regenerated by the
* visual editor.
+ *
+ * @param navigator
*/
public MyLogin(final Navigator navigator) {
buildMainLayout();
diff --git a/Sda2/P/Register/src/main/java/de/hdm_stuttgart/mi/MyVaadinUI.java b/Sda2/P/Register/src/main/java/de/hdm_stuttgart/mi/MyVaadinUI.java
index 0f3fb53094c91638605d6f5ade32edaf3f06efc3..1e8a227f94df0281c849d3504210c5b0f091e6c1 100644
--- a/Sda2/P/Register/src/main/java/de/hdm_stuttgart/mi/MyVaadinUI.java
+++ b/Sda2/P/Register/src/main/java/de/hdm_stuttgart/mi/MyVaadinUI.java
@@ -5,6 +5,10 @@ import com.vaadin.server.VaadinRequest;
import com.vaadin.ui.UI;
import com.vaadin.ui.VerticalLayout;
+/**
+ * @author goik
+ *
+ */
@Theme("mytheme")
public class MyVaadinUI extends UI {
private static final long serialVersionUID = -6103978386689058393L;
diff --git a/Sda2/P/Register/src/main/java/de/hdm_stuttgart/mi/NavigatorUI.java b/Sda2/P/Register/src/main/java/de/hdm_stuttgart/mi/NavigatorUI.java
index 80066174fed1b7d4bb688faa762213c6fc08c367..0ab8e4ebf5f355160ceb26df22c4e3e4767d6049 100644
--- a/Sda2/P/Register/src/main/java/de/hdm_stuttgart/mi/NavigatorUI.java
+++ b/Sda2/P/Register/src/main/java/de/hdm_stuttgart/mi/NavigatorUI.java
@@ -9,10 +9,18 @@ import com.vaadin.server.VaadinRequest;
import com.vaadin.server.VaadinServlet;
import com.vaadin.ui.UI;
+/**
+ * @author goik
+ *
+ */
@Theme("mytheme")
public class NavigatorUI extends UI {
private static final long serialVersionUID = -6341836500801165611L;
+ /**
+ * @author goik
+ *
+ */
@WebServlet( value = "/*", asyncSupported = true)
@VaadinServletConfiguration(productionMode = false, ui = NavigatorUI.class)
public static class Servlet extends VaadinServlet {
diff --git a/Sda2/P/Register/src/main/java/de/hdm_stuttgart/mi/Register.java b/Sda2/P/Register/src/main/java/de/hdm_stuttgart/mi/Register.java
index ada075c6d200e05673501bc222944d502921efc2..660e9b6ab1eec42afe055d94874b7d62b136284b 100644
--- a/Sda2/P/Register/src/main/java/de/hdm_stuttgart/mi/Register.java
+++ b/Sda2/P/Register/src/main/java/de/hdm_stuttgart/mi/Register.java
@@ -26,9 +26,16 @@ import de.hdm_stuttgart.mi.tools.ValidateGlobal;
import de.hdm_stuttgart.mi.tools.ValidateSecondIdenticalInput;
+/**
+ * @author goik
+ *
+ */
public class Register extends CustomComponent implements View, ValidateGlobal {
private static final long serialVersionUID = -1309958813377546099L;
+ /**
+ * This view's unique identifier.
+ */
public final static String viewId = Register.class.getCanonicalName();
private final static String
@@ -67,7 +74,6 @@ public class Register extends CustomComponent implements View, ValidateGlobal {
* other views.
*
* @param navigator
- * @throws SQLException
*/
public Register(Navigator navigator) {
diff --git a/Sda2/P/Register/src/main/java/de/hdm_stuttgart/mi/entities/User.java b/Sda2/P/Register/src/main/java/de/hdm_stuttgart/mi/entities/User.java
index 04c388915ebd33bad1d7a0d459024e6ccd661871..b7a81e75fd0db37f3d625cc366f80cb48a3e20bd 100644
--- a/Sda2/P/Register/src/main/java/de/hdm_stuttgart/mi/entities/User.java
+++ b/Sda2/P/Register/src/main/java/de/hdm_stuttgart/mi/entities/User.java
@@ -5,6 +5,10 @@ import java.io.Serializable;
import javax.validation.constraints.NotNull;
import javax.validation.constraints.Size;
+/**
+ * @author goik
+ *
+ */
public class User implements Serializable {
private static final long serialVersionUID = 1L;
@@ -22,25 +26,43 @@ public class User implements Serializable {
String password;
+ /**
+ * @return The user's name
+ */
public String getName() {
return name;
}
+ /**
+ * @param name
+ */
public void setName(String name) {
this.name = name;
}
+ /**
+ * @return The user's mail
+ */
public String getEmail() {
return email;
}
+ /**
+ * @param email
+ */
public void setEmail(String email) {
this.email = email;
}
+ /**
+ * @return he user's password
+ */
public String getPassword() {
return password;
}
+ /**
+ * @param password
+ */
public void setPassword(String password) {
this.password = password;
}
diff --git a/Sda2/P/Register/src/main/java/de/hdm_stuttgart/mi/tools/MyBeanFieldGroup.java b/Sda2/P/Register/src/main/java/de/hdm_stuttgart/mi/tools/MyBeanFieldGroup.java
index b72d8bf7adfc3c7cdf018b9fc43ca2f160dd9052..805d4240017efc416a8cdd037732f00c737fd1f6 100644
--- a/Sda2/P/Register/src/main/java/de/hdm_stuttgart/mi/tools/MyBeanFieldGroup.java
+++ b/Sda2/P/Register/src/main/java/de/hdm_stuttgart/mi/tools/MyBeanFieldGroup.java
@@ -8,17 +8,29 @@ import com.vaadin.ui.Field;
import com.vaadin.ui.PasswordField;
import com.vaadin.ui.TextField;
+/**
+ * @author goik
+ *
+ * @param <T>
+ */
public class MyBeanFieldGroup<T> extends BeanFieldGroup<T> {
final ValidateGlobal validateGlobal;
private static final long serialVersionUID = 757184578224921063L;
+ /**
+ * @param beanType
+ * @param validateGlobal
+ */
public MyBeanFieldGroup(final Class<T> beanType, final ValidateGlobal validateGlobal) {
super(beanType);
this.validateGlobal = validateGlobal;
}
+ /**
+ * @param beanType
+ */
public MyBeanFieldGroup(final Class<T> beanType) {
this(beanType, null);
}
@@ -49,6 +61,10 @@ public class MyBeanFieldGroup<T> extends BeanFieldGroup<T> {
return ret;
}
+ /**
+ * @param item
+ * @param initialValidationIsVisible
+ */
public void setItemDataSource(T item, boolean initialValidationIsVisible) {
super.setItemDataSource(item);
if (!initialValidationIsVisible) {
@@ -68,6 +84,9 @@ public class MyBeanFieldGroup<T> extends BeanFieldGroup<T> {
return ret;
}
+ /**
+ * @param isVisible
+ */
public void setValidationVisibility(final boolean isVisible) {
for (final Field<?> f: getFields()) {
((AbstractField<?>) f).setValidationVisible(isVisible);
diff --git a/Sda2/P/Register/src/main/java/de/hdm_stuttgart/mi/tools/ValidateGlobal.java b/Sda2/P/Register/src/main/java/de/hdm_stuttgart/mi/tools/ValidateGlobal.java
index 9c75a03630e79ac4743bd6a0475032f6e0178d6b..a95b9aeaaf3745bc5758334d6b2d759fdf1b6d06 100644
--- a/Sda2/P/Register/src/main/java/de/hdm_stuttgart/mi/tools/ValidateGlobal.java
+++ b/Sda2/P/Register/src/main/java/de/hdm_stuttgart/mi/tools/ValidateGlobal.java
@@ -1,5 +1,12 @@
package de.hdm_stuttgart.mi.tools;
+/**
+ * @author goik
+ *
+ */
public interface ValidateGlobal {
+ /**
+ *
+ */
public void validateGlobal();
}
diff --git a/Sda2/P/Register/src/main/java/de/hdm_stuttgart/mi/tools/ValidateSecondIdenticalInput.java b/Sda2/P/Register/src/main/java/de/hdm_stuttgart/mi/tools/ValidateSecondIdenticalInput.java
index 605d0e575850b44531ca2e5469d2c38279a4c793..310e2e0a79dfb47eb5eea0ddb0e8305ac74b4917 100644
--- a/Sda2/P/Register/src/main/java/de/hdm_stuttgart/mi/tools/ValidateSecondIdenticalInput.java
+++ b/Sda2/P/Register/src/main/java/de/hdm_stuttgart/mi/tools/ValidateSecondIdenticalInput.java
@@ -4,11 +4,18 @@ import com.vaadin.data.Validator;
import com.vaadin.ui.AbstractField;
import com.vaadin.ui.Field;
+/**
+ * @author goik
+ *
+ */
public class ValidateSecondIdenticalInput implements Validator {
private static final long serialVersionUID = -3334158348944078195L;
final Field<?> reference;
+ /**
+ * @param reference second password field
+ */
public ValidateSecondIdenticalInput(final Field<?> reference) {
this.reference = reference;
}
diff --git a/Sda2/P/UnixSqlLdap/Jndi/Unix2Rdbms/pom.xml b/Sda2/P/UnixSqlLdap/Jndi/Unix2Rdbms/pom.xml
index 3e8755f06f8b61c94a7c66906235789b8a2b6c41..beabb587538e9c4fe63b08df6548684f05e77f24 100644
--- a/Sda2/P/UnixSqlLdap/Jndi/Unix2Rdbms/pom.xml
+++ b/Sda2/P/UnixSqlLdap/Jndi/Unix2Rdbms/pom.xml
@@ -47,6 +47,12 @@
<target>1.8</target>
</configuration>
</plugin>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-javadoc-plugin</artifactId>
+ <version>2.10.1</version>
+ <configuration />
+ </plugin>
</plugins>
</build>
</project>
diff --git a/Sda2/P/account/pom.xml b/Sda2/P/account/pom.xml
index 4126979578ce16f09240a1d40d508c45d63c7827..cf8e14a223b18df83470e17e33de795a5358ad15 100644
--- a/Sda2/P/account/pom.xml
+++ b/Sda2/P/account/pom.xml
@@ -60,6 +60,12 @@
<target>1.8</target>
</configuration>
</plugin>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-javadoc-plugin</artifactId>
+ <version>2.10.1</version>
+ <configuration />
+ </plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-shade-plugin</artifactId>
diff --git a/Sda2/P/forum_1/pom.xml b/Sda2/P/forum_1/pom.xml
index 28eec3923fe1988ab7c2e304c3b626a2cf3b7188..fa13d9b86e93c8f8ae4aca09b3b6821c9477c025 100644
--- a/Sda2/P/forum_1/pom.xml
+++ b/Sda2/P/forum_1/pom.xml
@@ -128,6 +128,13 @@
</dependencies>
<build>
+ <!--
+ <resources>
+ <resource>
+ <directory>${project.build.directory}/generated-sources/metamodel</directory>
+ </resource>
+ </resources>
+ -->
<plugins>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
@@ -153,11 +160,23 @@
<configuration>
<options>
<eclipselink.persistencexml>${basedir}/src/main/resources/META-INF/persistence.xml</eclipselink.persistencexml>
+ <eclipselink.canonicalmodel.subpackage>jpametamodel</eclipselink.canonicalmodel.subpackage>
</options>
+ <outputDirectory>${project.build.directory}/generated-sources/metamodel</outputDirectory>
+ <sources>
+ <source>${project.build.directory}/generated-sources/metamodel</source>
+ </sources>
+ <!--
+
+ <compilerArguments>
+ -Aeclipselink.persistencexml=${basedir}/src/main/resources/META-INF/persistence.xml
+ </compilerArguments>
+ -->
<processors>
<processor>org.eclipse.persistence.internal.jpa.modelgen.CanonicalModelProcessor</processor>
</processors>
+
</configuration>
</execution>
</executions>
@@ -165,7 +184,11 @@
<dependency>
<groupId>org.eclipse.persistence</groupId>
<artifactId>org.eclipse.persistence.jpa.modelgen.processor</artifactId>
+
+ <version>2.6.0-M3</version>
+ <!--
<version>${eclipse.link.version}</version>
+ -->
</dependency>
</dependencies>
</plugin>
diff --git a/Sda2/P/forum_1/src/main/java/de/hdm_stuttgart/mi/sda2/forum/tools/Credential.java b/Sda2/P/forum_1/src/main/java/de/hdm_stuttgart/mi/sda2/forum/tools/Credential.java
index e23f94052eec66c563744cc8d55a63eea84fbf1e..355ecf3608ed7e85e5b97af68923401bf4322d6c 100644
--- a/Sda2/P/forum_1/src/main/java/de/hdm_stuttgart/mi/sda2/forum/tools/Credential.java
+++ b/Sda2/P/forum_1/src/main/java/de/hdm_stuttgart/mi/sda2/forum/tools/Credential.java
@@ -9,7 +9,7 @@ import javax.persistence.criteria.Predicate;
import javax.persistence.criteria.Root;
import de.hdm_stuttgart.mi.sda2.forum.domain.User;
-import de.hdm_stuttgart.mi.sda2.forum.domain.User_;
+import de.hdm_stuttgart.mi.sda2.forum.domain.jpametamodel.User_;
public class Credential {