summaryrefslogtreecommitdiffstats
path: root/sdnr/wt/odlux/core
diff options
context:
space:
mode:
authorMichael DÜrre <michael.duerre@highstreet-technologies.com>2021-06-30 08:26:04 +0200
committerMichael DÜrre <michael.duerre@highstreet-technologies.com>2021-06-30 08:26:22 +0200
commitfa0febc0614b1f9afb4be3c5dd3446f4a554a232 (patch)
treed048ac676d1ea48a9cb00afbc84ed668772d0e4a /sdnr/wt/odlux/core
parent6360ba16069370151019865c504e1bec1d896e8c (diff)
fix sdnr features startup
source out multiple used yang file due resolving conflict Issue-ID: CCSDK-3359 Signed-off-by: Michael DÜrre <michael.duerre@highstreet-technologies.com> Change-Id: I59d863e43a7e29e98d104d20371226ef59837e61 Signed-off-by: Michael DÜrre <michael.duerre@highstreet-technologies.com>
Diffstat (limited to 'sdnr/wt/odlux/core')
-rw-r--r--sdnr/wt/odlux/core/provider/pom.xml1
-rw-r--r--sdnr/wt/odlux/core/provider/src/main/java/org/onap/ccsdk/features/sdnr/wt/odlux/ResFilesServlet.java6
2 files changed, 6 insertions, 1 deletions
diff --git a/sdnr/wt/odlux/core/provider/pom.xml b/sdnr/wt/odlux/core/provider/pom.xml
index 8a7bb807d..fc803df96 100644
--- a/sdnr/wt/odlux/core/provider/pom.xml
+++ b/sdnr/wt/odlux/core/provider/pom.xml
@@ -63,6 +63,7 @@
<groupId>${project.groupId}</groupId>
<artifactId>sdnr-wt-odlux-framework</artifactId>
<version>${project.version}</version>
+ <scope>provided</scope>
</dependency>
<dependency>
<groupId>org.eclipse.jetty</groupId>
diff --git a/sdnr/wt/odlux/core/provider/src/main/java/org/onap/ccsdk/features/sdnr/wt/odlux/ResFilesServlet.java b/sdnr/wt/odlux/core/provider/src/main/java/org/onap/ccsdk/features/sdnr/wt/odlux/ResFilesServlet.java
index b480d89eb..b8afc3329 100644
--- a/sdnr/wt/odlux/core/provider/src/main/java/org/onap/ccsdk/features/sdnr/wt/odlux/ResFilesServlet.java
+++ b/sdnr/wt/odlux/core/provider/src/main/java/org/onap/ccsdk/features/sdnr/wt/odlux/ResFilesServlet.java
@@ -81,7 +81,11 @@ public class ResFilesServlet extends HttpServlet {
//Provide own function that can be overloaded for test
public String getMimeType(String fileName) {
- return getServletContext().getMimeType(fileName);
+ String t = getServletContext().getMimeType(fileName);
+ if(t.startsWith("text")) {
+ t+="; charset=utf-8";
+ }
+ return t;
}
}