Correcting build process

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 \

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>

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();

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;

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 {

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) {
 		

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;
 	}

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);

Sda2/P/Register/src/main/java/de/hdm_stuttgart/mi/tools/ValidateGlobal.java

 package de.hdm_stuttgart.mi.tools;
 
+/**
+ * @author goik
+ *
+ */
 public interface ValidateGlobal {
+	/**
+	 * 
+	 */
 	public void validateGlobal();
 }

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;
 	}

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>

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>

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>

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 {