From 029fe7533bb654aee0add25d890944156e3814a9 Mon Sep 17 00:00:00 2001 From: Bill Smith Date: Tue, 6 Apr 2021 15:54:59 -0700 Subject: [PATCH] SHIBUI-1730 Updated classpath handling so that the classpath is built properly when executing the selenium tests. --- backend/build.gradle | 2 +- .../shibboleth/admin/ui/controller/RootUiViewController.java | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/backend/build.gradle b/backend/build.gradle index 59bb93bc1..9744cbf84 100644 --- a/backend/build.gradle +++ b/backend/build.gradle @@ -215,7 +215,7 @@ dependencies { task copyUI(type: Copy) { from tasks.findByPath(':ui:npm_run_buildProd').outputs - into new File(buildDir, 'generated/ui/static') + into new File(buildDir, 'generated/ui/resources') } task integrationTest(type: Test) { diff --git a/backend/src/main/java/edu/internet2/tier/shibboleth/admin/ui/controller/RootUiViewController.java b/backend/src/main/java/edu/internet2/tier/shibboleth/admin/ui/controller/RootUiViewController.java index fe9e4b246..333f5c8c9 100644 --- a/backend/src/main/java/edu/internet2/tier/shibboleth/admin/ui/controller/RootUiViewController.java +++ b/backend/src/main/java/edu/internet2/tier/shibboleth/admin/ui/controller/RootUiViewController.java @@ -30,8 +30,8 @@ public String index() { public void indexHtml(HttpServletRequest request, HttpServletResponse response) throws IOException, URISyntaxException { //This method is necessary in order for Angular framework to honor dynamic ServletContext //under which shib ui application is deployed, both during initial index.html load and subsequest page refreshes - String content = new BufferedReader(new InputStreamReader(request.getServletContext() - .getResourceAsStream("/WEB-INF/classes/resources/index.html"))) + String content = new BufferedReader(new InputStreamReader(this.getClass() + .getResourceAsStream("/resources/index.html"))) .lines() .collect(Collectors.joining("\n"));