From d9fd259809709f965d05ca47b9625dcf12fc6680 Mon Sep 17 00:00:00 2001
From: Martin Goik <goik@hdm-stuttgart.de>
Date: Sun, 2 Nov 2014 15:24:11 +0100
Subject: [PATCH] New pom.xml rule provding generated metamodel code
---
.../webapp/VAADIN/themes/mytheme/addons.scss | 3 +-
Sda2/P/forum_1/pom.xml | 32 ++++++-------------
.../mi/sda2/forum/domain/.gitignore | 1 +
3 files changed, 12 insertions(+), 24 deletions(-)
create mode 100644 Sda2/P/forum_1/src/main/java/de/hdm_stuttgart/mi/sda2/forum/domain/.gitignore
diff --git a/Sda2/P/Register/src/main/webapp/VAADIN/themes/mytheme/addons.scss b/Sda2/P/Register/src/main/webapp/VAADIN/themes/mytheme/addons.scss
index 2f24aacc6..a5670b70c 100644
--- a/Sda2/P/Register/src/main/webapp/VAADIN/themes/mytheme/addons.scss
+++ b/Sda2/P/Register/src/main/webapp/VAADIN/themes/mytheme/addons.scss
@@ -3,4 +3,5 @@
/* Import and include this mixin into your project theme to include the addon themes */
@mixin addons {
-}
\ No newline at end of file
+}
+
diff --git a/Sda2/P/forum_1/pom.xml b/Sda2/P/forum_1/pom.xml
index fa13d9b86..df966b6e1 100644
--- a/Sda2/P/forum_1/pom.xml
+++ b/Sda2/P/forum_1/pom.xml
@@ -128,13 +128,6 @@
</dependencies>
<build>
- <!--
- <resources>
- <resource>
- <directory>${project.build.directory}/generated-sources/metamodel</directory>
- </resource>
- </resources>
- -->
<plugins>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
@@ -162,21 +155,16 @@
<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>
- -->
+ <outputDirectory>${basedir}/src/main/java</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>
@@ -184,11 +172,9 @@
<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>
- -->
+ <!-- <version>${eclipse.link.version}</version> -->
</dependency>
</dependencies>
</plugin>
diff --git a/Sda2/P/forum_1/src/main/java/de/hdm_stuttgart/mi/sda2/forum/domain/.gitignore b/Sda2/P/forum_1/src/main/java/de/hdm_stuttgart/mi/sda2/forum/domain/.gitignore
new file mode 100644
index 000000000..a79439de8
--- /dev/null
+++ b/Sda2/P/forum_1/src/main/java/de/hdm_stuttgart/mi/sda2/forum/domain/.gitignore
@@ -0,0 +1 @@
+/jpametamodel/
--
GitLab