[java-identity-provider] branch main updated: Fix classpath location for plugin-webapp

[Rod Widdowson]

This is an automated email from the git hooks/post-receive script.

rdw pushed a commit to branch main
in repository java-identity-provider.

View the commit online:
http://git.shibboleth.net/view/?p=java-identity-provider.git;a=commit;h=a4ea440a423dc05318ea8428164ada21b782e492

The following commit(s) were added to refs/heads/main by this push:
       new  a4ea440a4 Fix classpath location for plugin-webapp
a4ea440a4 is described below

commit a4ea440a423dc05318ea8428164ada21b782e492
Author: Rod Widdowson <rdw at steadingsoftware.com>
AuthorDate: Sat Oct 17 15:28:16 2020 +0100

    Fix classpath location for plugin-webapp
---
 idp-distribution/src/main/resources/bin/runclass.bat | 2 +-
 idp-distribution/src/main/resources/bin/runclass.sh  | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/idp-distribution/src/main/resources/bin/runclass.bat b/idp-distribution/src/main/resources/bin/runclass.bat
index 6a561da9d..cc153179c 100644
--- a/idp-distribution/src/main/resources/bin/runclass.bat
+++ b/idp-distribution/src/main/resources/bin/runclass.bat
@@ -24,7 +24,7 @@ if not exist %JAVACMD% (
 if defined NO_PLUGIN_WEBAPP (
    set WEBAPPCP=%~dp0..\edit-webapp\WEB-INF\lib\*
 ) else (
-   set WEBAPPCP=%~dp0..\edit-webapp\WEB-INF\lib\*;%~dp0..\plugin-webapp\WEB-INF\lib\*
+   set WEBAPPCP=%~dp0..\edit-webapp\WEB-INF\lib\*;%~dp0..\dist\plugin-webapp\WEB-INF\lib\*
 )
 
 REM add in the dependency .jar files
diff --git a/idp-distribution/src/main/resources/bin/runclass.sh b/idp-distribution/src/main/resources/bin/runclass.sh
index 011d7eee3..5ee60f20d 100755
--- a/idp-distribution/src/main/resources/bin/runclass.sh
+++ b/idp-distribution/src/main/resources/bin/runclass.sh
@@ -39,7 +39,7 @@ fi
 
 LOCALCLASSPATH="$LOCATION/../dist/webapp/WEB-INF/lib/*":$LOCALCLASSPATH
 if [ -z "$NO_PLUGIN_WEBAPP" ] ; then
-  LOCALCLASSPATH="$LOCATION/../plugin-webapp/WEB-INF/lib/*":$LOCALCLASSPATH
+  LOCALCLASSPATH="$LOCATION/../dist/plugin-webapp/WEB-INF/lib/*":$LOCALCLASSPATH
 fi
 LOCALCLASSPATH="$LOCATION/../edit-webapp/WEB-INF/lib/*":$LOCALCLASSPATH
 LOCALCLASSPATH="$LOCATION/lib/*":$LOCALCLASSPATH

-- 
To stop receiving notification emails like this one, please contact
the administrator of this repository.