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 2f24aacc6627d3d59919f3209f1f86c070e1e78e..a5670b70c7eabbe8cf233f10dc9bfeb2fac29f41 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 fa13d9b86e93c8f8ae4aca09b3b6821c9477c025..df966b6e19a84dae658abb3d17f82a78951e94fb 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 0000000000000000000000000000000000000000..a79439de8d21a8b17bbbbf163f7eac1f53e8b8da --- /dev/null +++ b/Sda2/P/forum_1/src/main/java/de/hdm_stuttgart/mi/sda2/forum/domain/.gitignore @@ -0,0 +1 @@ +/jpametamodel/