Removing old web.xml and spring xml files.

Adding default config service url and security credentials.
Updating to Greenwich.M2

Author: gm2552

pom.xml

@@ -75,7 +75,7 @@
 			<dependency>
 				<groupId>org.springframework.cloud</groupId>
 				<artifactId>spring-cloud-starter-parent</artifactId>
-				 <version>Greenwich.M1</version>
+				 <version>Greenwich.M2</version>
 				<type>pom</type>
 				<scope>import</scope>		
 			</dependency>											

src/main/java/org/nhind/xdm/springconfig/CXFWSServiceConfig.java

@@ -9,7 +9,9 @@
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.boot.autoconfigure.condition.ConditionalOnMissingBean;
 import org.springframework.context.annotation.Bean;
+import org.springframework.context.annotation.Configuration;
 
+@Configuration
 public class CXFWSServiceConfig
 {
 	@Autowired

src/main/java/org/nhind/xdm/springconfig/WebSecurityConfiguration.java

@@ -20,6 +20,8 @@ public void configure(WebSecurity web) throws Exception
     protected void configure(HttpSecurity http) throws Exception
     {
         http.authorizeRequests().antMatchers("/").permitAll();
+        
+        http.csrf().disable();
     }
 }
 

src/main/resources/bootstrap.properties

@@ -1,11 +1,21 @@
 spring.application.name=direct-xd
 spring.jpa.open_in_view=false
 
-#Disable eureka client.  Set this to true and set eureka client properties to
+#Disable eureka client and set the direct.config.service.url.  Set this to true and set eureka client properties to
 #connect to eureka.
 eureka.client.enabled=false
 
+#If not using Eureka, then set the config-service URL.  This should be set to a empty value
+#if you are using Eureka
+direct.config.service.url=http://localhost:8080/config-service
+
 #Don't use rabbit as part of the health check
 management.health.rabbit.enabled=false
 
 spring.main.allow-bean-definition-overriding=true
+
+#unique jmx names to avoid collisions when running
+#multiple spring boot apps in an web container
+endpoints.jmx.default-domain=direct-xd
+endpoints.jmx.uniqueNames=true
+spring.jmx.default-domain=direct-xd