From 2e1becbe329f90593e352bdaacbd8a27abae007d Mon Sep 17 00:00:00 2001 From: Sem van der Hoeven Date: Sat, 9 Mar 2019 14:12:44 +0100 Subject: [PATCH] REMOVE::removed settings.gradle file in src folder this messed with the paths for the main settings.gradle file --- .classpath | 420 +++++++++++++++++ .project | 17 + src/Client/.classpath | 270 +++++++++++ src/Client/.project | 17 + src/Common/.classpath | 11 + src/Common/.project | 17 + src/Server/.classpath | 439 ++++++++++++++++++ src/Server/.project | 17 + src/Server/build.gradle | 2 +- .../java/gogreen/server/data/model/User.java | 4 +- src/settings.gradle | 5 - 11 files changed, 1211 insertions(+), 8 deletions(-) create mode 100644 .classpath create mode 100644 .project create mode 100644 src/Client/.classpath create mode 100644 src/Client/.project create mode 100644 src/Common/.classpath create mode 100644 src/Common/.project create mode 100644 src/Server/.classpath create mode 100644 src/Server/.project delete mode 100644 src/settings.gradle diff --git a/.classpath b/.classpath new file mode 100644 index 0000000..f3a1f5f --- /dev/null +++ b/.classpath @@ -0,0 +1,420 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/.project b/.project new file mode 100644 index 0000000..dd47242 --- /dev/null +++ b/.project @@ -0,0 +1,17 @@ + + + OOPP + + + + org.eclipse.jdt.core.javanature + + + + org.eclipse.jdt.core.javabuilder + + + + + + diff --git a/src/Client/.classpath b/src/Client/.classpath new file mode 100644 index 0000000..e5b885c --- /dev/null +++ b/src/Client/.classpath @@ -0,0 +1,270 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/src/Client/.project b/src/Client/.project new file mode 100644 index 0000000..2598613 --- /dev/null +++ b/src/Client/.project @@ -0,0 +1,17 @@ + + + Client + + + + org.eclipse.jdt.core.javanature + + + + org.eclipse.jdt.core.javabuilder + + + + + + diff --git a/src/Common/.classpath b/src/Common/.classpath new file mode 100644 index 0000000..b2f987c --- /dev/null +++ b/src/Common/.classpath @@ -0,0 +1,11 @@ + + + + + + + + + + + diff --git a/src/Common/.project b/src/Common/.project new file mode 100644 index 0000000..383e247 --- /dev/null +++ b/src/Common/.project @@ -0,0 +1,17 @@ + + + Common + + + + org.eclipse.jdt.core.javanature + + + + org.eclipse.jdt.core.javabuilder + + + + + + diff --git a/src/Server/.classpath b/src/Server/.classpath new file mode 100644 index 0000000..c0fd52c --- /dev/null +++ b/src/Server/.classpath @@ -0,0 +1,439 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/src/Server/.project b/src/Server/.project new file mode 100644 index 0000000..1b872bc --- /dev/null +++ b/src/Server/.project @@ -0,0 +1,17 @@ + + + Server + + + + org.eclipse.jdt.core.javanature + + + + org.eclipse.jdt.core.javabuilder + + + + + + diff --git a/src/Server/build.gradle b/src/Server/build.gradle index bdd29cb..8bc72ca 100644 --- a/src/Server/build.gradle +++ b/src/Server/build.gradle @@ -42,7 +42,7 @@ targetCompatibility = 1.8 dependencies { compile("org.springframework.boot:spring-boot-starter-web") testCompile('org.springframework.boot:spring-boot-starter-test') - compile project(':src:Common') + compile project(path: ':src:Common') compileOnly 'org.projectlombok:lombok:1.18.6' annotationProcessor 'org.projectlombok:lombok:1.18.6' compile("org.springframework.boot:spring-boot-starter-data-jpa") diff --git a/src/Server/src/main/java/gogreen/server/data/model/User.java b/src/Server/src/main/java/gogreen/server/data/model/User.java index ab1a840..11bb0fb 100644 --- a/src/Server/src/main/java/gogreen/server/data/model/User.java +++ b/src/Server/src/main/java/gogreen/server/data/model/User.java @@ -1,8 +1,8 @@ package gogreen.server.data.model; -import lombok.AllArgsConstructor; import lombok.Data; import lombok.NoArgsConstructor; + import javax.persistence.Entity; import javax.persistence.GeneratedValue; import javax.persistence.GenerationType; @@ -10,7 +10,7 @@ import javax.persistence.Id; @Entity @Data -@AllArgsConstructor +//@AllArgsConstructor @NoArgsConstructor public class User { diff --git a/src/settings.gradle b/src/settings.gradle deleted file mode 100644 index 7e1faf2..0000000 --- a/src/settings.gradle +++ /dev/null @@ -1,5 +0,0 @@ -rootProject.name = 'OOPP' - -include 'Server' -include 'Client' -include 'Common' \ No newline at end of file