mirror of
https://github.com/Athou/commafeed.git
synced 2026-03-21 21:37:29 +00:00
remove app.contextPath setting
This commit is contained in:
@@ -1,9 +1,6 @@
|
|||||||
# CommaFeed settings
|
# CommaFeed settings
|
||||||
# ------------------
|
# ------------------
|
||||||
app:
|
app:
|
||||||
# context path of the application
|
|
||||||
contextPath: /
|
|
||||||
|
|
||||||
# url used to access commafeed
|
# url used to access commafeed
|
||||||
publicUrl: https://@OPENSHIFT_APP_DNS@/
|
publicUrl: https://@OPENSHIFT_APP_DNS@/
|
||||||
|
|
||||||
|
|||||||
@@ -1,5 +1,6 @@
|
|||||||
v 2.1.0
|
v 2.1.0
|
||||||
- dropwizard upgrade to 0.8.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
|
v 2.0.3
|
||||||
- internet explorer ajax cache workaround
|
- internet explorer ajax cache workaround
|
||||||
- categories are now deletable again
|
- categories are now deletable again
|
||||||
|
|||||||
@@ -1,9 +1,6 @@
|
|||||||
# CommaFeed settings
|
# CommaFeed settings
|
||||||
# ------------------
|
# ------------------
|
||||||
app:
|
app:
|
||||||
# context path of the application
|
|
||||||
contextPath: /
|
|
||||||
|
|
||||||
# url used to access commafeed
|
# url used to access commafeed
|
||||||
publicUrl: http://localhost:8082/
|
publicUrl: http://localhost:8082/
|
||||||
|
|
||||||
|
|||||||
@@ -1,9 +1,6 @@
|
|||||||
# CommaFeed settings
|
# CommaFeed settings
|
||||||
# ------------------
|
# ------------------
|
||||||
app:
|
app:
|
||||||
# context path of the application
|
|
||||||
contextPath: /
|
|
||||||
|
|
||||||
# url used to access commafeed
|
# url used to access commafeed
|
||||||
publicUrl: http://localhost:8082/
|
publicUrl: http://localhost:8082/
|
||||||
|
|
||||||
|
|||||||
@@ -105,9 +105,6 @@ public class CommaFeedApplication extends Application<CommaFeedConfiguration> {
|
|||||||
|
|
||||||
@Override
|
@Override
|
||||||
public void run(CommaFeedConfiguration config, Environment environment) throws Exception {
|
public void run(CommaFeedConfiguration config, Environment environment) throws Exception {
|
||||||
// configure context path
|
|
||||||
environment.getApplicationContext().setContextPath(config.getApplicationSettings().getContextPath());
|
|
||||||
|
|
||||||
// guice init
|
// guice init
|
||||||
Injector injector = Guice.createInjector(new CommaFeedModule(hibernateBundle.getSessionFactory(), config, environment.metrics()));
|
Injector injector = Guice.createInjector(new CommaFeedModule(hibernateBundle.getSessionFactory(), config, environment.metrics()));
|
||||||
|
|
||||||
|
|||||||
@@ -62,10 +62,6 @@ public class CommaFeedConfiguration extends Configuration {
|
|||||||
|
|
||||||
@Getter
|
@Getter
|
||||||
public static class ApplicationSettings {
|
public static class ApplicationSettings {
|
||||||
@NotNull
|
|
||||||
@NotBlank
|
|
||||||
private String contextPath;
|
|
||||||
|
|
||||||
@NotNull
|
@NotNull
|
||||||
@NotBlank
|
@NotBlank
|
||||||
private String publicUrl;
|
private String publicUrl;
|
||||||
|
|||||||
Reference in New Issue
Block a user