From 64981308507e40992a26bf376dc9fc596cb617ee Mon Sep 17 00:00:00 2001
From: Athou <jeremiepanzer@gmail.com>
Date: Tue, 28 Oct 2014 16:39:48 +0100
Subject: [PATCH] remove app.contextPath setting

---
 .openshift/config.mysql.yml                             | 3 ---
 CHANGELOG                                               | 1 +
 config.dev.yml                                          | 3 ---
 config.yml.example                                      | 3 ---
 src/main/java/com/commafeed/CommaFeedApplication.java   | 3 ---
 src/main/java/com/commafeed/CommaFeedConfiguration.java | 4 ----
 6 files changed, 1 insertion(+), 16 deletions(-)

diff --git a/.openshift/config.mysql.yml b/.openshift/config.mysql.yml
index 3cefeb46..04be9c88 100644
--- a/.openshift/config.mysql.yml
+++ b/.openshift/config.mysql.yml
@@ -1,9 +1,6 @@
 # CommaFeed settings
 # ------------------
 app:
-  # context path of the application 
-  contextPath: /
-  
   # url used to access commafeed
   publicUrl: https://@OPENSHIFT_APP_DNS@/
   
diff --git a/CHANGELOG b/CHANGELOG
index d760cde9..39e5971b 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -1,5 +1,6 @@
 v 2.1.0
   - dropwizard upgrade to 0.8.0
+  - remove our custom app.contextPath setting from config, use server.applicationContextPath from dropwizard instead
 v 2.0.3
   - internet explorer ajax cache workaround
   - categories are now deletable again
diff --git a/config.dev.yml b/config.dev.yml
index e2ddf666..8a77db95 100644
--- a/config.dev.yml
+++ b/config.dev.yml
@@ -1,9 +1,6 @@
 # CommaFeed settings
 # ------------------
 app:
-  # context path of the application 
-  contextPath: /
-  
   # url used to access commafeed
   publicUrl: http://localhost:8082/
   
diff --git a/config.yml.example b/config.yml.example
index 9c7ae8c1..8c7bba8d 100644
--- a/config.yml.example
+++ b/config.yml.example
@@ -1,9 +1,6 @@
 # CommaFeed settings
 # ------------------
 app:
-  # context path of the application 
-  contextPath: /
-  
   # url used to access commafeed
   publicUrl: http://localhost:8082/
   
diff --git a/src/main/java/com/commafeed/CommaFeedApplication.java b/src/main/java/com/commafeed/CommaFeedApplication.java
index 60651267..0f0a2a3d 100644
--- a/src/main/java/com/commafeed/CommaFeedApplication.java
+++ b/src/main/java/com/commafeed/CommaFeedApplication.java
@@ -105,9 +105,6 @@ public class CommaFeedApplication extends Application<CommaFeedConfiguration> {
 
 	@Override
 	public void run(CommaFeedConfiguration config, Environment environment) throws Exception {
-		// configure context path
-		environment.getApplicationContext().setContextPath(config.getApplicationSettings().getContextPath());
-
 		// guice init
 		Injector injector = Guice.createInjector(new CommaFeedModule(hibernateBundle.getSessionFactory(), config, environment.metrics()));
 
diff --git a/src/main/java/com/commafeed/CommaFeedConfiguration.java b/src/main/java/com/commafeed/CommaFeedConfiguration.java
index 7e527308..e67d76ab 100644
--- a/src/main/java/com/commafeed/CommaFeedConfiguration.java
+++ b/src/main/java/com/commafeed/CommaFeedConfiguration.java
@@ -62,10 +62,6 @@ public class CommaFeedConfiguration extends Configuration {
 
 	@Getter
 	public static class ApplicationSettings {
-		@NotNull
-		@NotBlank
-		private String contextPath;
-
 		@NotNull
 		@NotBlank
 		private String publicUrl;