From 43ace24fa78cf5041f38e6e2ee9ba729dc6cc740 Mon Sep 17 00:00:00 2001 From: Ceren U_urlu Date: Tue, 26 Feb 2019 07:56:07 +0000 Subject: [PATCH] Revert "Merge branch 'master' of https://gitlab.ewi.tudelft.nl/cse1105/2018-2019/oopp-group-43/template" This reverts commit 4d09f82aecce025b2c5240445d600664d6d810b5 --- .gitignore | 25 ------------ Project Details/overview API's.md | 12 ------ Server/.gitignore | 40 ------------------- Server/src/main/java/hello/Application.java | 2 - .../main/java/hello/GreetingController.java | 1 - doc/meetings/20190225_agenda.md | 24 +++++------ 6 files changed, 9 insertions(+), 95 deletions(-) delete mode 100644 Project Details/overview API's.md delete mode 100644 Server/.gitignore diff --git a/.gitignore b/.gitignore index a79044c..53511ca 100644 --- a/.gitignore +++ b/.gitignore @@ -209,29 +209,4 @@ 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/ - -### 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 diff --git a/Project Details/overview API's.md b/Project Details/overview API's.md deleted file mode 100644 index 42bf496..0000000 --- a/Project Details/overview API's.md +++ /dev/null @@ -1,12 +0,0 @@ -### 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. diff --git a/Server/.gitignore b/Server/.gitignore deleted file mode 100644 index 5d77dac..0000000 --- a/Server/.gitignore +++ /dev/null @@ -1,40 +0,0 @@ -# # 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 diff --git a/Server/src/main/java/hello/Application.java b/Server/src/main/java/hello/Application.java index c85fdb0..09ac9d8 100644 --- a/Server/src/main/java/hello/Application.java +++ b/Server/src/main/java/hello/Application.java @@ -3,11 +3,9 @@ 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 30e8af3..49499f6 100644 --- a/Server/src/main/java/hello/GreetingController.java +++ b/Server/src/main/java/hello/GreetingController.java @@ -13,7 +13,6 @@ 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)); } diff --git a/doc/meetings/20190225_agenda.md b/doc/meetings/20190225_agenda.md index 29ee180..ff92cc8 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 -- [x] Kristin Peneva -- [x] Daan Sneep -- [x] Merel SteenBergen -- [x] Ceren Uğurlu -- [x] Mika Wauben -- [x] Sem van der Hoeven +- [ ] Kristin Peneva +- [ ] Daan Sneep +- [ ] Merel SteenBergen +- [ ] Ceren Uğurlu +- [ ] Mika Wauben +- [ ] 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 gradle + - Our server uses spring and maven - make sure everyone knows how spring works/what it is - - make sure everyone knows how gradle works/what it is + - make sure everyone knows how maven 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? @@ -63,8 +63,6 @@ - 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 @@ -73,11 +71,7 @@ ## Question round - Questions for the TA - questions that were already present - - 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 - - 'Add license' issue on gitlab + - questions that rose during the meeting ## Closing > Demo 1 is done, good job guys!