[java-identity-provider] branch master updated: IDP-1642 - Migrate configuration into jars where feasible

[Scott Cantor]

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

scantor pushed a commit to branch master
in repository java-identity-provider.

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

The following commit(s) were added to refs/heads/master by this push:
       new  f17f2c014 IDP-1642 - Migrate configuration into jars where feasible
f17f2c014 is described below

commit f17f2c014c77cba16fb1dddb508d7307cb25f467
Author: Scott Cantor <cantor.2 at osu.edu>
AuthorDate: Mon Jul 27 17:50:19 2020 -0400

    IDP-1642 - Migrate configuration into jars where feasible
    
    https://issues.shibboleth.net/jira/browse/IDP-1642
    
    Move remainder of views into idp-conf-impl.
    Remove system views lookup path.
---
 .../src/main/resources/net/shibboleth/idp}/views/cas/footer.vm          | 0
 .../src/main/resources/net/shibboleth/idp}/views/cas/header.vm          | 0
 .../src/main/resources/net/shibboleth/idp}/views/cas/logoutService.vm   | 0
 .../src/main/resources/net/shibboleth/idp}/views/cas/postBack.vm        | 0
 .../src/main/resources/net/shibboleth/idp}/views/cas/proxyFailure.vm    | 0
 .../src/main/resources/net/shibboleth/idp}/views/cas/proxySuccess.vm    | 0
 .../src/main/resources/net/shibboleth/idp}/views/cas/validateFailure.vm | 0
 .../src/main/resources/net/shibboleth/idp}/views/cas/validateSuccess.vm | 0
 .../src/main/resources/net/shibboleth/idp}/views/csrf/csrf-qparam.vm    | 0
 .../src/main/resources/net/shibboleth/idp}/views/csrf/csrf.vm           | 0
 .../src/main/resources/net/shibboleth/idp}/views/logout/propagate.vm    | 0
 .../src/main/resources/net/shibboleth/idp}/views/logout/result.vm       | 0
 .../src/main/resources/net/shibboleth/idp}/views/logout/saml-async.vm   | 0
 .../src/main/resources/net/shibboleth/idp}/views/logout/saml-result.vm  | 0
 idp-conf/src/main/resources/system/conf/mvc-beans.xml                   | 2 +-
 15 files changed, 1 insertion(+), 1 deletion(-)

diff --git a/idp-conf/src/main/resources/system/views/cas/footer.vm b/idp-conf-impl/src/main/resources/net/shibboleth/idp/views/cas/footer.vm
similarity index 100%
rename from idp-conf/src/main/resources/system/views/cas/footer.vm
rename to idp-conf-impl/src/main/resources/net/shibboleth/idp/views/cas/footer.vm
diff --git a/idp-conf/src/main/resources/system/views/cas/header.vm b/idp-conf-impl/src/main/resources/net/shibboleth/idp/views/cas/header.vm
similarity index 100%
rename from idp-conf/src/main/resources/system/views/cas/header.vm
rename to idp-conf-impl/src/main/resources/net/shibboleth/idp/views/cas/header.vm
diff --git a/idp-conf/src/main/resources/system/views/cas/logoutService.vm b/idp-conf-impl/src/main/resources/net/shibboleth/idp/views/cas/logoutService.vm
similarity index 100%
rename from idp-conf/src/main/resources/system/views/cas/logoutService.vm
rename to idp-conf-impl/src/main/resources/net/shibboleth/idp/views/cas/logoutService.vm
diff --git a/idp-conf/src/main/resources/system/views/cas/postBack.vm b/idp-conf-impl/src/main/resources/net/shibboleth/idp/views/cas/postBack.vm
similarity index 100%
rename from idp-conf/src/main/resources/system/views/cas/postBack.vm
rename to idp-conf-impl/src/main/resources/net/shibboleth/idp/views/cas/postBack.vm
diff --git a/idp-conf/src/main/resources/system/views/cas/proxyFailure.vm b/idp-conf-impl/src/main/resources/net/shibboleth/idp/views/cas/proxyFailure.vm
similarity index 100%
rename from idp-conf/src/main/resources/system/views/cas/proxyFailure.vm
rename to idp-conf-impl/src/main/resources/net/shibboleth/idp/views/cas/proxyFailure.vm
diff --git a/idp-conf/src/main/resources/system/views/cas/proxySuccess.vm b/idp-conf-impl/src/main/resources/net/shibboleth/idp/views/cas/proxySuccess.vm
similarity index 100%
rename from idp-conf/src/main/resources/system/views/cas/proxySuccess.vm
rename to idp-conf-impl/src/main/resources/net/shibboleth/idp/views/cas/proxySuccess.vm
diff --git a/idp-conf/src/main/resources/system/views/cas/validateFailure.vm b/idp-conf-impl/src/main/resources/net/shibboleth/idp/views/cas/validateFailure.vm
similarity index 100%
rename from idp-conf/src/main/resources/system/views/cas/validateFailure.vm
rename to idp-conf-impl/src/main/resources/net/shibboleth/idp/views/cas/validateFailure.vm
diff --git a/idp-conf/src/main/resources/system/views/cas/validateSuccess.vm b/idp-conf-impl/src/main/resources/net/shibboleth/idp/views/cas/validateSuccess.vm
similarity index 100%
rename from idp-conf/src/main/resources/system/views/cas/validateSuccess.vm
rename to idp-conf-impl/src/main/resources/net/shibboleth/idp/views/cas/validateSuccess.vm
diff --git a/idp-conf/src/main/resources/system/views/csrf/csrf-qparam.vm b/idp-conf-impl/src/main/resources/net/shibboleth/idp/views/csrf/csrf-qparam.vm
similarity index 100%
rename from idp-conf/src/main/resources/system/views/csrf/csrf-qparam.vm
rename to idp-conf-impl/src/main/resources/net/shibboleth/idp/views/csrf/csrf-qparam.vm
diff --git a/idp-conf/src/main/resources/system/views/csrf/csrf.vm b/idp-conf-impl/src/main/resources/net/shibboleth/idp/views/csrf/csrf.vm
similarity index 100%
rename from idp-conf/src/main/resources/system/views/csrf/csrf.vm
rename to idp-conf-impl/src/main/resources/net/shibboleth/idp/views/csrf/csrf.vm
diff --git a/idp-conf/src/main/resources/system/views/logout/propagate.vm b/idp-conf-impl/src/main/resources/net/shibboleth/idp/views/logout/propagate.vm
similarity index 100%
rename from idp-conf/src/main/resources/system/views/logout/propagate.vm
rename to idp-conf-impl/src/main/resources/net/shibboleth/idp/views/logout/propagate.vm
diff --git a/idp-conf/src/main/resources/system/views/logout/result.vm b/idp-conf-impl/src/main/resources/net/shibboleth/idp/views/logout/result.vm
similarity index 100%
rename from idp-conf/src/main/resources/system/views/logout/result.vm
rename to idp-conf-impl/src/main/resources/net/shibboleth/idp/views/logout/result.vm
diff --git a/idp-conf/src/main/resources/system/views/logout/saml-async.vm b/idp-conf-impl/src/main/resources/net/shibboleth/idp/views/logout/saml-async.vm
similarity index 100%
rename from idp-conf/src/main/resources/system/views/logout/saml-async.vm
rename to idp-conf-impl/src/main/resources/net/shibboleth/idp/views/logout/saml-async.vm
diff --git a/idp-conf/src/main/resources/system/views/logout/saml-result.vm b/idp-conf-impl/src/main/resources/net/shibboleth/idp/views/logout/saml-result.vm
similarity index 100%
rename from idp-conf/src/main/resources/system/views/logout/saml-result.vm
rename to idp-conf-impl/src/main/resources/net/shibboleth/idp/views/logout/saml-result.vm
diff --git a/idp-conf/src/main/resources/system/conf/mvc-beans.xml b/idp-conf/src/main/resources/system/conf/mvc-beans.xml
index ea9fe50ce..d6c328b0c 100644
--- a/idp-conf/src/main/resources/system/conf/mvc-beans.xml
+++ b/idp-conf/src/main/resources/system/conf/mvc-beans.xml
@@ -94,7 +94,7 @@
     <!-- Note that non-file paths are passed through to Spring's DefaultResourceLoader, thus can be targeted classpath trees. -->
     <bean class="net.shibboleth.ext.spring.velocity.VelocityConfigurer">
         <property name="resourceLoaderPath"
-            value="#{'%{idp.views:%{idp.home}/views}'.trim()},%{idp.home}/system/views,classpath:/net/shibboleth/idp/views" />
+            value="#{'%{idp.views:%{idp.home}/views}'.trim()},classpath:/net/shibboleth/idp/views" />
     </bean>
     
     <!-- Import any user defined beans or overrides for the MVC config. -->

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