From 05d5a5495b6a4d76b5ea2908c1341b31f9dd1823 Mon Sep 17 00:00:00 2001 From: Sem van der Hoeven Date: Sun, 24 Feb 2019 13:22:54 +0100 Subject: [PATCH 01/10] added gitignore to server folder --- .gitignore | 19 +++++++++++++++++++ Server/.gitignore | 40 ++++++++++++++++++++++++++++++++++++++++ 2 files changed, 59 insertions(+) create mode 100644 Server/.gitignore diff --git a/.gitignore b/.gitignore index 53511ca..2c0e722 100644 --- a/.gitignore +++ b/.gitignore @@ -209,4 +209,23 @@ buildNumber.properties # Ignore all local history of files .history +### Gradle ### +.gradle +build/ + +# Ignore Gradle GUI config +gradle-app.setting + +# Avoid ignoring Gradle wrapper jar file (.jar files are usually ignored) +!gradle-wrapper.jar + +# Cache of project +.gradletasknamecache + +# # Work around https://youtrack.jetbrains.com/issue/IDEA-116898 +# gradle/wrapper/gradle-wrapper.properties + +### Gradle Patch ### +**/build/ + # End of https://www.gitignore.io/api/java,maven,eclipse,intellij,visualstudiocode \ No newline at end of file diff --git a/Server/.gitignore b/Server/.gitignore new file mode 100644 index 0000000..5d77dac --- /dev/null +++ b/Server/.gitignore @@ -0,0 +1,40 @@ +# # Maven ignores +# target/ +# pom.xml.tag +# pom.xml.releaseBackup +# pom.xml.versionsBackup +# pom.xml.next +# release.properties +# dependency-reduced-pom.xml +# buildNumber.properties +# .mvn/timing.properties + +# # Exclude maven wrapper +# !/.mvn/wrapper/maven-wrapper.jar + + + + +# Created by https://www.gitignore.io/api/java,maven,eclipse,intellij,visualstudiocode +# Edit at https://www.gitignore.io/?templates=java,maven,eclipse,intellij,visualstudiocode + +### Gradle ### +.gradle +build/ + +# Ignore Gradle GUI config +gradle-app.setting + +# Avoid ignoring Gradle wrapper jar file (.jar files are usually ignored) +!gradle-wrapper.jar + +# Cache of project +.gradletasknamecache + +# # Work around https://youtrack.jetbrains.com/issue/IDEA-116898 +# gradle/wrapper/gradle-wrapper.properties + +### Gradle Patch ### +**/build/ + +# End of https://www.gitignore.io/api/java,maven,eclipse,intellij,visualstudiocode \ No newline at end of file From bbaa0c4ada9eb8b765ce664e634395522071640d Mon Sep 17 00:00:00 2001 From: Sem van der Hoeven Date: Mon, 25 Feb 2019 07:52:56 +0100 Subject: [PATCH 02/10] Added a general overview of the API's and frameworks we've come across --- Project Details/overview API's.md | 12 ++++++++++++ 1 file changed, 12 insertions(+) create mode 100644 Project Details/overview API's.md diff --git a/Project Details/overview API's.md b/Project Details/overview API's.md new file mode 100644 index 0000000..42bf496 --- /dev/null +++ b/Project Details/overview API's.md @@ -0,0 +1,12 @@ +### API's and things we've come across + +# Maven +Apache Maven is a software project management and comprehension tool. It can manage a project's build, reporting and documentation from a central piece of information. It is used for building and managing Jav-based projects +# Gradle +Gradle is a build automation tool that is designed to be flexible enough to build almost any type of software. it uses domain-specific language (DSL) instead of the XML form used by Apache Maven +# Spring +Spring is a framework for dependency-injection which is a pattern that allows to build very decoupled systems. +# Tomcat +Tomcat is a Java Servlet Container. It implements several Java EE specifications including Java Servlet, JavaServer Pages (JSP), Java EL, and WebSocket, and provides a "pure Java" HTTP web server environment in which Java code can run. +# Jersey +A standard portable JAX-RS API made to simplify development of RESTful Web Services. From 115402896adf325a23f53f713f6994db792dca12 Mon Sep 17 00:00:00 2001 From: Sem van der Hoeven Date: Mon, 25 Feb 2019 07:59:10 +0100 Subject: [PATCH 03/10] Added a few comments to server java files --- Server/src/main/java/hello/Application.java | 2 ++ Server/src/main/java/hello/GreetingController.java | 1 + 2 files changed, 3 insertions(+) diff --git a/Server/src/main/java/hello/Application.java b/Server/src/main/java/hello/Application.java index 09ac9d8..c85fdb0 100644 --- a/Server/src/main/java/hello/Application.java +++ b/Server/src/main/java/hello/Application.java @@ -3,9 +3,11 @@ package hello; import org.springframework.boot.SpringApplication; import org.springframework.boot.autoconfigure.SpringBootApplication; +//application to boot with spring @SpringBootApplication public class Application { + //run the application public static void main(String[] args) { SpringApplication.run(Application.class, args); } diff --git a/Server/src/main/java/hello/GreetingController.java b/Server/src/main/java/hello/GreetingController.java index 49499f6..30e8af3 100644 --- a/Server/src/main/java/hello/GreetingController.java +++ b/Server/src/main/java/hello/GreetingController.java @@ -13,6 +13,7 @@ public class GreetingController { @RequestMapping("/greeting") public Greeting greeting(@RequestParam(value="name", defaultValue="World") String name) { + //increment the id every time the page is refreshed (a new user visits the page) return new Greeting(counter.incrementAndGet(), String.format(template, name)); } From d7da1944fb60ec2eb5cc4ef2a163c3b7b281d987 Mon Sep 17 00:00:00 2001 From: Sem van der Hoeven Date: Mon, 25 Feb 2019 14:14:58 +0000 Subject: [PATCH 04/10] Update 20190225_agenda.md --- doc/meetings/20190225_agenda.md | 1 + 1 file changed, 1 insertion(+) diff --git a/doc/meetings/20190225_agenda.md b/doc/meetings/20190225_agenda.md index ff92cc8..9da224e 100644 --- a/doc/meetings/20190225_agenda.md +++ b/doc/meetings/20190225_agenda.md @@ -71,6 +71,7 @@ ## Question round - Questions for the TA - questions that were already present + - wrong email in gitlab - questions that rose during the meeting ## Closing From 09f5492e57d11099beb2dc49af6dc8394e89d366 Mon Sep 17 00:00:00 2001 From: Sem van der Hoeven Date: Mon, 25 Feb 2019 14:17:32 +0000 Subject: [PATCH 05/10] Update 20190225_agenda.md --- doc/meetings/20190225_agenda.md | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/doc/meetings/20190225_agenda.md b/doc/meetings/20190225_agenda.md index 9da224e..6c79933 100644 --- a/doc/meetings/20190225_agenda.md +++ b/doc/meetings/20190225_agenda.md @@ -72,7 +72,8 @@ - Questions for the TA - questions that were already present - wrong email in gitlab - - questions that rose during the meeting + - is our current SCRUM board a good start? + - questions that arose during the meeting ## Closing > Demo 1 is done, good job guys! From 42b493c9ea5b312e2e6e9e5b7beb95ac4305a53e Mon Sep 17 00:00:00 2001 From: Sem van der Hoeven Date: Mon, 25 Feb 2019 14:25:18 +0000 Subject: [PATCH 06/10] Update 20190225_agenda.md --- doc/meetings/20190225_agenda.md | 2 ++ 1 file changed, 2 insertions(+) diff --git a/doc/meetings/20190225_agenda.md b/doc/meetings/20190225_agenda.md index 6c79933..d30cfe9 100644 --- a/doc/meetings/20190225_agenda.md +++ b/doc/meetings/20190225_agenda.md @@ -63,6 +63,8 @@ - JSON - read into the database part and try to set one up - Brushing up on JSON and implementing it in the client-server communication + - Branches + - **be sure to use branches!** ## Any other business From f0d30fa3e8671f9419e9928d5afaa8141c5af8db Mon Sep 17 00:00:00 2001 From: Sem van der Hoeven Date: Mon, 25 Feb 2019 14:47:47 +0000 Subject: [PATCH 07/10] Update 20190225_agenda.md --- doc/meetings/20190225_agenda.md | 1 + 1 file changed, 1 insertion(+) diff --git a/doc/meetings/20190225_agenda.md b/doc/meetings/20190225_agenda.md index d30cfe9..5338db6 100644 --- a/doc/meetings/20190225_agenda.md +++ b/doc/meetings/20190225_agenda.md @@ -76,6 +76,7 @@ - wrong email in gitlab - is our current SCRUM board a good start? - questions that arose during the meeting + - sprint: brightspace: every week, Andy said length is 2 weeks ## Closing > Demo 1 is done, good job guys! From 10cbf84cde5f919a02fa03c118bce6ccef07c10d Mon Sep 17 00:00:00 2001 From: Sem van der Hoeven Date: Mon, 25 Feb 2019 14:59:00 +0000 Subject: [PATCH 08/10] Update 20190225_agenda.md --- doc/meetings/20190225_agenda.md | 1 + 1 file changed, 1 insertion(+) diff --git a/doc/meetings/20190225_agenda.md b/doc/meetings/20190225_agenda.md index 5338db6..5d8ac54 100644 --- a/doc/meetings/20190225_agenda.md +++ b/doc/meetings/20190225_agenda.md @@ -77,6 +77,7 @@ - is our current SCRUM board a good start? - questions that arose during the meeting - sprint: brightspace: every week, Andy said length is 2 weeks + - 'Add license' issue on gitlab ## Closing > Demo 1 is done, good job guys! From b52319380bc87e8f0a4e0e4cf79ffbd2a50855ca Mon Sep 17 00:00:00 2001 From: Sem van der Hoeven Date: Mon, 25 Feb 2019 16:02:04 +0100 Subject: [PATCH 09/10] small update to gitignore, it should now exclude the .gradle and .idea folders in the client and server folder --- .gitignore | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/.gitignore b/.gitignore index 2c0e722..a79044c 100644 --- a/.gitignore +++ b/.gitignore @@ -228,4 +228,10 @@ gradle-app.setting ### Gradle Patch ### **/build/ +### Server and Client ### +Server/.gradle +Server/.idea + +Client/.gradle +Client/.idea # End of https://www.gitignore.io/api/java,maven,eclipse,intellij,visualstudiocode \ No newline at end of file From 651dd6cf394f9df4555627db6829eef34ecdd4e1 Mon Sep 17 00:00:00 2001 From: Sem van der Hoeven Date: Mon, 25 Feb 2019 15:22:34 +0000 Subject: [PATCH 10/10] Update 20190225_agenda.md --- doc/meetings/20190225_agenda.md | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/doc/meetings/20190225_agenda.md b/doc/meetings/20190225_agenda.md index 5d8ac54..29ee180 100644 --- a/doc/meetings/20190225_agenda.md +++ b/doc/meetings/20190225_agenda.md @@ -3,12 +3,12 @@ ## Opening > Check if everyone is present: - [ ] Nivard Jansen -- [ ] Kristin Peneva -- [ ] Daan Sneep -- [ ] Merel SteenBergen -- [ ] Ceren Uğurlu -- [ ] Mika Wauben -- [ ] Sem van der Hoeven +- [x] Kristin Peneva +- [x] Daan Sneep +- [x] Merel SteenBergen +- [x] Ceren Uğurlu +- [x] Mika Wauben +- [x] Sem van der Hoeven ## Points of action @@ -18,9 +18,9 @@ ### pre/during meeting - Make sure the server and client connections work - - Our server uses spring and maven + - Our server uses spring and gradle - make sure everyone knows how spring works/what it is - - make sure everyone knows how maven works/what it is + - make sure everyone knows how gradle works/what it is - Discuss what we learned this week - what did we find online? - what did we get to know from tutorials we followed?