commit 740d170c7712ec9853638c600239c42d7b0f1092 Author: iwakeh iwakeh@torproject.org Date: Mon Dec 4 11:14:42 2017 +0000
Adapt paths to new inner war resource locations. --- src/main/java/org/torproject/metrics/web/ContentProvider.java | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-)
diff --git a/src/main/java/org/torproject/metrics/web/ContentProvider.java b/src/main/java/org/torproject/metrics/web/ContentProvider.java index f31c3d0..4f3a5ad 100644 --- a/src/main/java/org/torproject/metrics/web/ContentProvider.java +++ b/src/main/java/org/torproject/metrics/web/ContentProvider.java @@ -28,14 +28,15 @@ public class ContentProvider { private ContentProvider() { Gson gson = new GsonBuilder().create(); this.metricsList = Arrays.asList(gson.fromJson(new InputStreamReader( - this.getClass().getClassLoader().getResourceAsStream("metrics.json")), + this.getClass().getClassLoader() + .getResourceAsStream("WEB-INF/json/metrics.json")), Metric[].class)); this.categoriesList = Arrays.asList(gson.fromJson(new InputStreamReader( this.getClass().getClassLoader().getResourceAsStream( - "categories.json")), Category[].class)); + "WEB-INF/json/categories.json")), Category[].class)); this.newsList = Arrays.asList(gson.fromJson(new InputStreamReader( this.getClass().getClassLoader().getResourceAsStream( - "news.json")), News[].class)); + "WEB-INF/json/news.json")), News[].class)); }
public List<Metric> getMetricsList() {