<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
<html xmlns="http://www.w3.org/1999/xhtml">
<head>
<meta http-equiv="Content-Type" content="text/html; charset=utf-8">
<meta name="viewport" content="width=device-width, initial-scale=1.0, maximum-scale=1.0">
<base href="https://issues.shibboleth.net/jira">
<title>Message Title</title>
</head>
<body class="jira" style="color: #333333; font-family: Arial, sans-serif; font-size: 14px; line-height: 1.429">
<table id="background-table" cellpadding="0" cellspacing="0" width="100%" style="border-collapse: collapse; mso-table-lspace: 0pt; mso-table-rspace: 0pt; background-color: #f5f5f5; border-collapse: collapse; mso-table-lspace: 0pt; mso-table-rspace: 0pt" bgcolor="#f5f5f5">
<!-- header here -->
<tbody>
<tr>
<td id="header-pattern-container" style="padding: 0px; border-collapse: collapse; padding: 10px 20px">
<table id="header-pattern" cellspacing="0" cellpadding="0" border="0" style="border-collapse: collapse; mso-table-lspace: 0pt; mso-table-rspace: 0pt">
<tbody>
<tr>
<td id="header-avatar-image-container" valign="top" style="padding: 0px; border-collapse: collapse; vertical-align: top; width: 32px; padding-right: 8px" width="32"> <img id="header-avatar-image" class="image_fix" src="cid:jira-generated-image-avatar-c56ce77e-e134-429a-a200-bc62b0345e54" height="32" width="32" border="0" style="border-radius: 3px; vertical-align: top"> </td>
<td id="header-text-container" valign="middle" style="padding: 0px; border-collapse: collapse; vertical-align: middle; font-family: Arial, sans-serif; font-size: 14px; line-height: 20px; mso-line-height-rule: exactly; mso-text-raise: 1px"> <a class="user-hover" rel="cantor.2@osu.edu" id="email_cantor.2@osu.edu" href="https://issues.shibboleth.net/jira/secure/ViewProfile.jspa?name=cantor.2%40osu.edu" style="color:#0052cc;; color: #3b73af; text-decoration: none">Scott Cantor</a> <strong>commented</strong> on <a href="https://issues.shibboleth.net/jira/browse/IDP-1349" style="color: #3b73af; text-decoration: none"><img src="cid:jira-generated-image-avatar-757503d0-4518-4291-8902-6f558238f0cb" height="16" width="16" border="0" align="absmiddle" alt="Task"> IDP-1349</a> </td>
</tr>
</tbody>
</table> </td>
</tr>
<tr>
<td id="email-content-container" style="padding: 0px; border-collapse: collapse; padding: 0 20px">
<table id="email-content-table" cellspacing="0" cellpadding="0" border="0" width="100%" style="border-collapse: collapse; mso-table-lspace: 0pt; mso-table-rspace: 0pt; border-spacing: 0; border-collapse: separate">
<tbody>
<tr>
<!-- there needs to be content in the cell for it to render in some clients -->
<td class="email-content-rounded-top mobile-expand" style="padding: 0px; border-collapse: collapse; color: #ffffff; padding: 0 15px 0 16px; height: 15px; background-color: #ffffff; border-left: 1px solid #cccccc; border-top: 1px solid #cccccc; border-right: 1px solid #cccccc; border-bottom: 0; border-top-right-radius: 5px; border-top-left-radius: 5px; height: 10px; line-height: 10px; padding: 0 15px 0 16px; mso-line-height-rule: exactly" height="10" bgcolor="#ffffff"> </td>
</tr>
<tr>
<td class="email-content-main mobile-expand " style="padding: 0px; border-collapse: collapse; border-left: 1px solid #cccccc; border-right: 1px solid #cccccc; border-top: 0; border-bottom: 0; padding: 0 15px 0 16px; background-color: #ffffff" bgcolor="#ffffff">
<table class="page-title-pattern" cellspacing="0" cellpadding="0" border="0" width="100%" style="border-collapse: collapse; mso-table-lspace: 0pt; mso-table-rspace: 0pt">
<tbody>
<tr>
<td style="vertical-align: top;; padding: 0px; border-collapse: collapse; padding-right: 5px; font-size: 20px; line-height: 30px; mso-line-height-rule: exactly" class="page-title-pattern-header-container"> <span class="page-title-pattern-header" style="font-family: Arial, sans-serif; padding: 0; font-size: 20px; line-height: 30px; mso-text-raise: 2px; mso-line-height-rule: exactly; vertical-align: middle"> <a href="https://issues.shibboleth.net/jira/browse/IDP-1349" style="color: #3b73af; text-decoration: none">Re: Migrate existing code base to Spring 5 and SWF 2.5</a> </span> </td>
</tr>
</tbody>
</table> </td>
</tr>
<tr>
<td id="text-paragraph-pattern-top" class="email-content-main mobile-expand comment-top-pattern" style="padding: 0px; border-collapse: collapse; border-left: 1px solid #cccccc; border-right: 1px solid #cccccc; border-top: 0; border-bottom: 0; padding: 0 15px 0 16px; background-color: #ffffff; border-bottom: none; padding-bottom: 0" bgcolor="#ffffff">
<table class="text-paragraph-pattern" cellspacing="0" cellpadding="0" border="0" width="100%" style="border-collapse: collapse; mso-table-lspace: 0pt; mso-table-rspace: 0pt; font-family: Arial, sans-serif; font-size: 14px; line-height: 20px; mso-line-height-rule: exactly; mso-text-raise: 2px">
<tbody>
<tr>
<td class="text-paragraph-pattern-container mobile-resize-text " style="padding: 0px; border-collapse: collapse; padding: 0 0 10px 0"> <p style="margin: 10px 0 0 0; margin-top: 0">Trying to consolidate the engines causes trouble making the Spring resource resolution work, which breaks the testbed among other things. Easier to let it be, but I left out all the Toolbox code.</p> <p style="margin: 10px 0 0 0">The code is checked in, but there are additional patches needed to the wiring besides just these classes. For now, embedding patch here.</p>
<div class="code panel" style="border-width: 1px;; border: 1px solid #cccccc; background: #f5f5f5; font-size: 12px; line-height: 1.333; font-family: monospace; border: 1px solid #cccccc; -moz-border-radius: 3px 3px 3px 3px; border-radius: 3px 3px 3px 3px; margin: 9px 0">
<div class="codeContent panelContent" style="padding: 9px 12px">
<pre class="code-java" style="margin: 10px 0 0 0; margin-top: 0; max-height: 30em; overflow: auto; white-space: pre-wrap; word-wrap: normal">diff --git a/idp-conf/src/main/resources/system/conf/global-system.xml b/idp-conf/src/main/resources/system/conf/global-system.xml
index a77b110..a9a2a88 100644
--- a/idp-conf/src/main/resources/system/conf/global-system.xml
+++ b/idp-conf/src/main/resources/system/conf/global-system.xml
@@ -94,14 +94,10 @@
</property>
</bean>
- <bean id=<span class="code-quote" style="color: #009100">"shibboleth.VelocityEngine"</span> class=<span class="code-quote" style="color: #009100">"org.springframework.ui.velocity.VelocityEngineFactoryBean"</span>
+ <bean id=<span class="code-quote" style="color: #009100">"shibboleth.VelocityEngine"</span> class=<span class="code-quote" style="color: #009100">"net.shibboleth.ext.spring.velocity.VelocityEngineFactoryBean"</span>
depends-on=<span class="code-quote" style="color: #009100">"shibboleth.LoggingService"</span>>
- <property name=<span class="code-quote" style="color: #009100">"overrideLogging"</span> value=<span class="code-quote" style="color: #009100">"<span class="code-keyword" style="color: #000091; color: #009100">false</span>"</span>/>
<property name=<span class="code-quote" style="color: #009100">"velocityProperties"</span>>
<props>
- <prop key=<span class="code-quote" style="color: #009100">"runtime.log.logsystem.class"</span>>
- net.shibboleth.utilities.java.support.velocity.SLF4JLogChute
- </prop>
<prop key=<span class="code-quote" style="color: #009100">"input.encoding"</span>>UTF-8</prop>
<prop key=<span class="code-quote" style="color: #009100">"output.encoding"</span>>UTF-8</prop>
<prop key=<span class="code-quote" style="color: #009100">"resource.loader"</span>>file, classpath, string</prop>
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 c08fb03..a67a3b2 100644
--- a/idp-conf/src/main/resources/system/conf/mvc-beans.xml
+++ b/idp-conf/src/main/resources/system/conf/mvc-beans.xml
@@ -34,7 +34,7 @@
<bean class=<span class="code-quote" style="color: #009100">"org.springframework.web.servlet.handler.BeanNameUrlHandlerMapping"</span> p:order=<span class="code-quote" style="color: #009100">"1"</span> />
- <bean class=<span class="code-quote" style="color: #009100">"org.springframework.web.servlet.mvc.annotation.DefaultAnnotationHandlerMapping"</span> p:order=<span class="code-quote" style="color: #009100">"2"</span> />
+ <bean class=<span class="code-quote" style="color: #009100">"org.springframework.web.servlet.mvc.method.annotation.RequestMappingHandlerMapping"</span> p:order=<span class="code-quote" style="color: #009100">"2"</span> />
<!-- Add <span class="code-keyword" style="color: #000091">this</span> one to mount any additional MVC controllers we create. -->
@@ -61,7 +61,7 @@
<bean class=<span class="code-quote" style="color: #009100">"org.springframework.web.servlet.mvc.SimpleControllerHandlerAdapter"</span> />
- <bean class=<span class="code-quote" style="color: #009100">"org.springframework.web.servlet.mvc.annotation.AnnotationMethodHandlerAdapter"</span> />
+ <bean class=<span class="code-quote" style="color: #009100">"org.springframework.web.servlet.mvc.method.annotation.RequestMappingHandlerAdapter"</span> />
<!-- Additional MVC controllers -->
@@ -84,7 +84,7 @@
<property name=<span class="code-quote" style="color: #009100">"order"</span> value=<span class="code-quote" style="color: #009100">"1"</span> />
</bean>
- <bean id=<span class="code-quote" style="color: #009100">"shibboleth.VelocityViewResolver"</span> class=<span class="code-quote" style="color: #009100">"org.springframework.web.servlet.view.velocity.VelocityViewResolver"</span>>
+ <bean id=<span class="code-quote" style="color: #009100">"shibboleth.VelocityViewResolver"</span> class=<span class="code-quote" style="color: #009100">"net.shibboleth.ext.spring.velocity.VelocityViewResolver"</span>>
<property name=<span class="code-quote" style="color: #009100">"order"</span> value=<span class="code-quote" style="color: #009100">"2"</span> />
<property name=<span class="code-quote" style="color: #009100">"cache"</span> value=<span class="code-quote" style="color: #009100">"<span class="code-keyword" style="color: #000091; color: #009100">true</span>"</span>/>
<property name=<span class="code-quote" style="color: #009100">"prefix"</span> value=""/>
@@ -100,17 +100,16 @@
<property name=<span class="code-quote" style="color: #009100">"contentType"</span> value=<span class="code-quote" style="color: #009100">"text/html;charset=utf-8"</span> />
</bean>
- <bean class=<span class="code-quote" style="color: #009100">"org.springframework.web.servlet.view.velocity.VelocityConfigurer"</span>>
+ <bean class=<span class="code-quote" style="color: #009100">"net.shibboleth.ext.spring.velocity.VelocityConfigurer"</span>>
<property name=<span class="code-quote" style="color: #009100">"resourceLoaderPath"</span> value=<span class="code-quote" style="color: #009100">"#{<span class="code-quote" style="color: #009100">'%{idp.views:%{idp.home}/views}'</span>.trim()},%{idp.home}/system/views"</span> />
<property name=<span class="code-quote" style="color: #009100">"velocityProperties"</span>>
<props>
- <prop key=<span class="code-quote" style="color: #009100">"runtime.log.logsystem.class"</span>>net.shibboleth.utilities.java.support.velocity.SLF4JLogChute</prop>
<prop key=<span class="code-quote" style="color: #009100">"input.encoding"</span>>UTF-8</prop>
<prop key=<span class="code-quote" style="color: #009100">"output.encoding"</span>>UTF-8</prop>
</props>
</property>
</bean>
-
+
<!-- Import any user defined beans or overrides <span class="code-keyword" style="color: #000091">for</span> the MVC config. -->
<<span class="code-keyword" style="color: #000091">import</span> resource=<span class="code-quote" style="color: #009100">"conditional:${idp.home}/conf/mvc-beans.xml"</span> />
</pre>
</div>
</div> </td>
</tr>
</tbody>
</table> </td>
</tr>
<tr>
<td class="email-content-main mobile-expand " style="padding: 0px; border-collapse: collapse; border-left: 1px solid #cccccc; border-right: 1px solid #cccccc; border-top: 0; border-bottom: 0; padding: 0 15px 0 16px; background-color: #ffffff" bgcolor="#ffffff">
<table id="actions-pattern" cellspacing="0" cellpadding="0" border="0" width="100%" style="border-collapse: collapse; mso-table-lspace: 0pt; mso-table-rspace: 0pt; font-family: Arial, sans-serif; font-size: 14px; line-height: 20px; mso-line-height-rule: exactly; mso-text-raise: 1px">
<tbody>
<tr>
<td id="actions-pattern-container" valign="middle" style="padding: 0px; border-collapse: collapse; padding: 10px 0 10px 24px; vertical-align: middle; padding-left: 0">
<table align="left" style="border-collapse: collapse; mso-table-lspace: 0pt; mso-table-rspace: 0pt">
<tbody>
<tr>
<td class="actions-pattern-action-icon-container" style="padding: 0px; border-collapse: collapse; font-family: Arial, sans-serif; font-size: 14px; line-height: 20px; mso-line-height-rule: exactly; mso-text-raise: 0; vertical-align: middle"> <a href="https://issues.shibboleth.net/jira/browse/IDP-1349#add-comment" target="_blank" title="Add Comment" style="color: #3b73af; text-decoration: none"> <img class="actions-pattern-action-icon-image" src="cid:jira-generated-image-static-comment-icon-980bcc45-0e5f-44b7-b11d-317924645a12" alt="Add Comment" title="Add Comment" height="16" width="16" border="0" style="vertical-align: middle"> </a> </td>
<td class="actions-pattern-action-text-container" style="padding: 0px; border-collapse: collapse; font-family: Arial, sans-serif; font-size: 14px; line-height: 20px; mso-line-height-rule: exactly; mso-text-raise: 4px; padding-left: 5px"> <a href="https://issues.shibboleth.net/jira/browse/IDP-1349#add-comment" target="_blank" title="Add Comment" style="color: #3b73af; text-decoration: none">Add Comment</a> </td>
</tr>
</tbody>
</table> </td>
</tr>
</tbody>
</table> </td>
</tr>
<!-- there needs to be content in the cell for it to render in some clients -->
<tr>
<td class="email-content-rounded-bottom mobile-expand" style="padding: 0px; border-collapse: collapse; color: #ffffff; padding: 0 15px 0 16px; height: 5px; line-height: 5px; background-color: #ffffff; border-top: 0; border-left: 1px solid #cccccc; border-bottom: 1px solid #cccccc; border-right: 1px solid #cccccc; border-bottom-right-radius: 5px; border-bottom-left-radius: 5px; mso-line-height-rule: exactly" height="5" bgcolor="#ffffff"> </td>
</tr>
</tbody>
</table> </td>
</tr>
<tr>
<td id="footer-pattern" style="padding: 0px; border-collapse: collapse; padding: 12px 20px">
<table id="footer-pattern-container" cellspacing="0" cellpadding="0" border="0" style="border-collapse: collapse; mso-table-lspace: 0pt; mso-table-rspace: 0pt">
<tbody>
<tr>
<td id="footer-pattern-text" class="mobile-resize-text" width="100%" style="padding: 0px; border-collapse: collapse; color: #999999; font-size: 12px; line-height: 18px; font-family: Arial, sans-serif; mso-line-height-rule: exactly; mso-text-raise: 2px"> This message was sent by Atlassian Jira <span id="footer-build-information">(v7.12.2#712003-<span title="61a922d5458c2b34faa51a4f8074da7e37e442eb" data-commit-id="61a922d5458c2b34faa51a4f8074da7e37e442eb}">sha1:61a922d</span>)</span> </td>
<td id="footer-pattern-logo-desktop-container" valign="top" style="padding: 0px; border-collapse: collapse; padding-left: 20px; vertical-align: top">
<table style="border-collapse: collapse; mso-table-lspace: 0pt; mso-table-rspace: 0pt">
<tbody>
<tr>
<td id="footer-pattern-logo-desktop-padding" style="padding: 0px; border-collapse: collapse; padding-top: 3px"> <img id="footer-pattern-logo-desktop" src="https://issues.shibboleth.net/jira/images/mail/atlassian-email-logo.png" alt="Atlassian logo" title="Atlassian logo" width="191" height="24" class="image_fix"> </td>
</tr>
</tbody>
</table> </td>
</tr>
</tbody>
</table> </td>
</tr>
</tbody>
</table>
</body>
</html>