[java-identity-provider] branch main updated: Rename Velocity support package.

[Scott Cantor]

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

scantor 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=5fa9f2047b1a0bcdfe8b23e7f062a714179a50f7

The following commit(s) were added to refs/heads/main by this push:
     new 5fa9f2047 Rename Velocity support package.
5fa9f2047 is described below

commit 5fa9f2047b1a0bcdfe8b23e7f062a714179a50f7
Author: Scott Cantor <cantor.2 at osu.edu>
AuthorDate: Tue Sep 20 12:13:42 2022 -0400

    Rename Velocity support package.
---
 .../net/shibboleth/idp/authn/AbstractTemplateSearchDnResolver.java    | 4 ++--
 .../java/net/shibboleth/idp/authn/PooledTemplateSearchDnResolver.java | 2 +-
 .../main/java/net/shibboleth/idp/authn/TemplateSearchDnResolver.java  | 2 +-
 .../src/main/resources/net/shibboleth/idp/conf/global-system.xml      | 3 +++
 4 files changed, 7 insertions(+), 4 deletions(-)

diff --git a/idp-authn-api/src/main/java/net/shibboleth/idp/authn/AbstractTemplateSearchDnResolver.java b/idp-authn-api/src/main/java/net/shibboleth/idp/authn/AbstractTemplateSearchDnResolver.java
index 40497cfe3..99975487b 100644
--- a/idp-authn-api/src/main/java/net/shibboleth/idp/authn/AbstractTemplateSearchDnResolver.java
+++ b/idp-authn-api/src/main/java/net/shibboleth/idp/authn/AbstractTemplateSearchDnResolver.java
@@ -21,8 +21,6 @@ import java.util.ArrayList;
 import java.util.Collection;
 import java.util.List;
 
-import net.shibboleth.utilities.java.support.velocity.Template;
-
 import org.apache.velocity.VelocityContext;
 import org.apache.velocity.app.VelocityEngine;
 import org.apache.velocity.app.event.EventCartridge;
@@ -33,6 +31,8 @@ import org.ldaptive.SearchFilter;
 import org.ldaptive.auth.AbstractSearchDnResolver;
 import org.ldaptive.auth.User;
 
+import net.shibboleth.shared.velocity.Template;
+
 /**
  * Base class for {@link Template} based search dn resolvers.
  */
diff --git a/idp-authn-api/src/main/java/net/shibboleth/idp/authn/PooledTemplateSearchDnResolver.java b/idp-authn-api/src/main/java/net/shibboleth/idp/authn/PooledTemplateSearchDnResolver.java
index 93324ac14..31220358d 100644
--- a/idp-authn-api/src/main/java/net/shibboleth/idp/authn/PooledTemplateSearchDnResolver.java
+++ b/idp-authn-api/src/main/java/net/shibboleth/idp/authn/PooledTemplateSearchDnResolver.java
@@ -26,7 +26,7 @@ import org.ldaptive.pool.PooledConnectionFactory;
 import org.ldaptive.pool.PooledConnectionFactoryManager;
 
 /**
- * {@link net.shibboleth.utilities.java.support.velocity.Template}-based pooled search dn resolver.
+ * {@link net.shibboleth.shared.velocity.Template}-based pooled search dn resolver.
  */
 public class PooledTemplateSearchDnResolver extends AbstractTemplateSearchDnResolver
         implements PooledConnectionFactoryManager {
diff --git a/idp-authn-api/src/main/java/net/shibboleth/idp/authn/TemplateSearchDnResolver.java b/idp-authn-api/src/main/java/net/shibboleth/idp/authn/TemplateSearchDnResolver.java
index b09c59ad6..5bd174777 100644
--- a/idp-authn-api/src/main/java/net/shibboleth/idp/authn/TemplateSearchDnResolver.java
+++ b/idp-authn-api/src/main/java/net/shibboleth/idp/authn/TemplateSearchDnResolver.java
@@ -26,7 +26,7 @@ import org.ldaptive.ConnectionFactoryManager;
 import org.ldaptive.LdapException;
 
 /**
- * {@link net.shibboleth.utilities.java.support.velocity.Template}-based search dn resolver.
+ * {@link net.shibboleth.shared.velocity.Template}-based search dn resolver.
  */
 public class TemplateSearchDnResolver extends AbstractTemplateSearchDnResolver implements ConnectionFactoryManager {
 
diff --git a/idp-conf-impl/src/main/resources/net/shibboleth/idp/conf/global-system.xml b/idp-conf-impl/src/main/resources/net/shibboleth/idp/conf/global-system.xml
index 4a5d99789..f19d6a0fd 100644
--- a/idp-conf-impl/src/main/resources/net/shibboleth/idp/conf/global-system.xml
+++ b/idp-conf-impl/src/main/resources/net/shibboleth/idp/conf/global-system.xml
@@ -46,6 +46,9 @@
             <map>
                 <!-- At present all of these are being added for V5 and would be removable for V6. -->
                 
+                <entry key="net.shibboleth.utilities.java.support.velocity.Template"
+                    value="net.shibboleth.shared.velocity.Template" />
+                
                 <entry key="net.shibboleth.ext.spring.factory.KeyStoreFactoryBean"
                     value="net.shibboleth.shared.spring.security.factory.KeyStoreFactoryBean" />
                 <entry key="net.shibboleth.ext.spring.factory.PKCS11PrivateKeyFactoryBean"

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