cleaned up changes and removed paths for calc and gmaps

Author: R4il

build.gradle

@@ -45,7 +45,7 @@ dependencies {
     compile('org.springframework.security:spring-security-test')
     compile('org.springframework.cloud:spring-cloud-starter-eureka')
     compile('org.springframework.cloud:spring-cloud-starter-hystrix')
-    //compile('org.springframework.cloud:spring-cloud-starter-oauth2')
+    compile('org.springframework.cloud:spring-cloud-starter-oauth2')
     compile('org.springframework.cloud:spring-cloud-starter-zuul')
     compile('org.springframework.boot:spring-boot-starter-web')
     providedRuntime('org.springframework.boot:spring-boot-starter-tomcat')

src/main/java/aist/edge/edgeservice/EdgeServiceApplication.java

@@ -5,12 +5,12 @@
 import org.springframework.cloud.netflix.eureka.EnableEurekaClient;
 import org.springframework.cloud.netflix.hystrix.EnableHystrix;
 import org.springframework.cloud.netflix.zuul.EnableZuulProxy;
-//import org.springframework.security.oauth2.config.annotation.web.configuration.EnableResourceServer;
+import org.springframework.security.oauth2.config.annotation.web.configuration.EnableResourceServer;
 
 @SpringBootApplication
 @EnableEurekaClient
 @EnableZuulProxy
-//@EnableResourceServer
+@EnableResourceServer
 @EnableHystrix
 public class EdgeServiceApplication {
     public static void main(String[] args) {

src/main/resources/application.yml

@@ -1,16 +1,20 @@
 spring:
   profiles:
-    active: docker
+    active: development
 ---
 spring:
   profiles: development
   application:
-    name: edge-service
+    name: edgeservice
 zuul:
-  ignored-services: '*'
-  ignoredPatterns: /**/api/**
+  prefix: /api
   routes:
-    example-service: /example/**
+    trip-cmd:
+      path: /trip/cmd/**
+      url: http://tripmanagementcmd:8080/api
+    trip-query:
+      path: /trip/query/**
+      url: http://tripmanagementquery:8080/api
 security:
   oauth2:
     resource:
@@ -29,7 +33,7 @@ eureka:
 spring:
   profiles: docker
   application:
-    name: edge-service
+    name: edgeservice
 zuul:
   prefix: /api
   routes:
@@ -39,12 +43,6 @@ zuul:
     trip-query:
       path: /trip/query/**
       url: http://tripmanagementquery:8080/api
-    gmaps:
-      path: /gmaps/**
-      url: http://gmapsadapter:8080/api
-    calculation:
-      path: /calculation/service/**
-      url: http://calculationservice:8080/api
 security:
   oauth2:
     resource: