Author: painter Date: Wed Oct 24 21:47:54 2018 New Revision: 1844792 URL: http://svn.apache.org/viewvc?rev=1844792&view=rev Log: Update commons-lang references, documentation cleanup
Modified: turbine/core/trunk/extensions/torque/src/java/org/apache/turbine/services/schedule/JobEntryTorque.java turbine/core/trunk/extensions/torque/src/java/org/apache/turbine/services/schedule/TurbineNonPersistentSchedulerService.java turbine/core/trunk/extensions/torque/src/java/org/apache/turbine/services/security/torque/TorqueSecurityService.java turbine/core/trunk/extensions/torque/src/java/org/apache/turbine/services/security/torque/TorqueUserManager.java turbine/core/trunk/proposals/epugh/hibernate/org/apache/turbine/util/hibernate/PersistenceException.java turbine/core/trunk/proposals/seade/UIService/org/apache/turbine/services/ui/TurbineUIService.java turbine/core/trunk/proposals/tv/osgi/service/java/org/apache/turbine/services/osgi/TurbineOSGiComponentService.java turbine/core/trunk/src/java/org/apache/turbine/Turbine.java turbine/core/trunk/src/java/org/apache/turbine/TurbineConstants.java turbine/core/trunk/src/java/org/apache/turbine/annotation/AnnotationProcessor.java turbine/core/trunk/src/java/org/apache/turbine/modules/ActionEvent.java turbine/core/trunk/src/java/org/apache/turbine/modules/actions/LoginUser.java turbine/core/trunk/src/java/org/apache/turbine/modules/actions/LogoutUser.java turbine/core/trunk/src/java/org/apache/turbine/modules/actions/sessionvalidator/DefaultSessionValidator.java turbine/core/trunk/src/java/org/apache/turbine/modules/actions/sessionvalidator/TemplateSecureSessionValidator.java turbine/core/trunk/src/java/org/apache/turbine/modules/actions/sessionvalidator/TemplateSessionValidator.java turbine/core/trunk/src/java/org/apache/turbine/modules/layouts/JspLayout.java turbine/core/trunk/src/java/org/apache/turbine/modules/layouts/VelocityOnlyLayout.java turbine/core/trunk/src/java/org/apache/turbine/modules/layouts/VelocityXslLayout.java turbine/core/trunk/src/java/org/apache/turbine/modules/pages/DefaultPage.java turbine/core/trunk/src/java/org/apache/turbine/modules/screens/BaseJspScreen.java turbine/core/trunk/src/java/org/apache/turbine/modules/screens/VelocityCachedScreen.java turbine/core/trunk/src/java/org/apache/turbine/modules/screens/VelocityDirectScreen.java turbine/core/trunk/src/java/org/apache/turbine/modules/screens/VelocityScreen.java turbine/core/trunk/src/java/org/apache/turbine/pipeline/DetermineRedirectRequestedValve.java turbine/core/trunk/src/java/org/apache/turbine/services/BaseServiceBroker.java turbine/core/trunk/src/java/org/apache/turbine/services/assemblerbroker/util/java/JavaBaseFactory.java turbine/core/trunk/src/java/org/apache/turbine/services/assemblerbroker/util/python/PythonBaseFactory.java turbine/core/trunk/src/java/org/apache/turbine/services/jsp/TurbineJspService.java turbine/core/trunk/src/java/org/apache/turbine/services/pull/util/DateFormatter.java turbine/core/trunk/src/java/org/apache/turbine/services/rundata/DefaultTurbineRunData.java turbine/core/trunk/src/java/org/apache/turbine/services/schedule/AbstractJobEntry.java turbine/core/trunk/src/java/org/apache/turbine/services/schedule/JobEntryQuartz.java turbine/core/trunk/src/java/org/apache/turbine/services/schedule/TurbineNonPersistentSchedulerService.java turbine/core/trunk/src/java/org/apache/turbine/services/security/DefaultSecurityService.java turbine/core/trunk/src/java/org/apache/turbine/services/template/TurbineTemplateService.java turbine/core/trunk/src/java/org/apache/turbine/services/template/mapper/BaseMapper.java turbine/core/trunk/src/java/org/apache/turbine/services/template/mapper/BaseTemplateMapper.java turbine/core/trunk/src/java/org/apache/turbine/services/template/mapper/ClassMapper.java turbine/core/trunk/src/java/org/apache/turbine/services/template/mapper/DirectMapper.java turbine/core/trunk/src/java/org/apache/turbine/services/template/mapper/DirectTemplateMapper.java turbine/core/trunk/src/java/org/apache/turbine/services/template/mapper/LayoutTemplateMapper.java turbine/core/trunk/src/java/org/apache/turbine/services/template/mapper/ScreenDefaultTemplateMapper.java turbine/core/trunk/src/java/org/apache/turbine/services/template/mapper/ScreenTemplateMapper.java turbine/core/trunk/src/java/org/apache/turbine/services/ui/TurbineUIService.java turbine/core/trunk/src/java/org/apache/turbine/services/velocity/TurbineVelocityService.java turbine/core/trunk/src/java/org/apache/turbine/util/HttpUtils.java turbine/core/trunk/src/java/org/apache/turbine/util/InputFilterUtils.java turbine/core/trunk/src/java/org/apache/turbine/util/LocaleUtils.java turbine/core/trunk/src/java/org/apache/turbine/util/ServerData.java turbine/core/trunk/src/java/org/apache/turbine/util/ServletUtils.java turbine/core/trunk/src/java/org/apache/turbine/util/template/HtmlPageAttributes.java turbine/core/trunk/src/java/org/apache/turbine/util/uri/BaseURI.java turbine/core/trunk/src/java/org/apache/turbine/util/uri/TemplateURI.java turbine/core/trunk/src/java/org/apache/turbine/util/uri/TurbineURI.java turbine/core/trunk/src/java/org/apache/turbine/util/uri/URIParam.java turbine/core/trunk/src/java/org/apache/turbine/util/velocity/VelocityEmail.java turbine/core/trunk/src/java/org/apache/turbine/util/velocity/VelocityHtmlEmail.java turbine/core/trunk/src/test/org/apache/turbine/services/pull/tools/UIToolTest.java turbine/core/trunk/src/test/org/apache/turbine/test/HsqlDB.java Modified: turbine/core/trunk/extensions/torque/src/java/org/apache/turbine/services/schedule/JobEntryTorque.java URL: http://svn.apache.org/viewvc/turbine/core/trunk/extensions/torque/src/java/org/apache/turbine/services/schedule/JobEntryTorque.java?rev=1844792&r1=1844791&r2=1844792&view=diff ============================================================================== --- turbine/core/trunk/extensions/torque/src/java/org/apache/turbine/services/schedule/JobEntryTorque.java (original) +++ turbine/core/trunk/extensions/torque/src/java/org/apache/turbine/services/schedule/JobEntryTorque.java Wed Oct 24 21:47:54 2018 @@ -22,7 +22,7 @@ package org.apache.turbine.services.sche import java.util.Calendar; import java.util.Date; -import org.apache.commons.lang.StringUtils; +import org.apache.commons.lang3.StringUtils; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; Modified: turbine/core/trunk/extensions/torque/src/java/org/apache/turbine/services/schedule/TurbineNonPersistentSchedulerService.java URL: http://svn.apache.org/viewvc/turbine/core/trunk/extensions/torque/src/java/org/apache/turbine/services/schedule/TurbineNonPersistentSchedulerService.java?rev=1844792&r1=1844791&r2=1844792&view=diff ============================================================================== --- turbine/core/trunk/extensions/torque/src/java/org/apache/turbine/services/schedule/TurbineNonPersistentSchedulerService.java (original) +++ turbine/core/trunk/extensions/torque/src/java/org/apache/turbine/services/schedule/TurbineNonPersistentSchedulerService.java Wed Oct 24 21:47:54 2018 @@ -26,7 +26,7 @@ import javax.servlet.ServletConfig; import org.apache.commons.configuration2.Configuration; -import org.apache.commons.lang.StringUtils; +import org.apache.commons.lang3.StringUtils; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; Modified: turbine/core/trunk/extensions/torque/src/java/org/apache/turbine/services/security/torque/TorqueSecurityService.java URL: http://svn.apache.org/viewvc/turbine/core/trunk/extensions/torque/src/java/org/apache/turbine/services/security/torque/TorqueSecurityService.java?rev=1844792&r1=1844791&r2=1844792&view=diff ============================================================================== --- turbine/core/trunk/extensions/torque/src/java/org/apache/turbine/services/security/torque/TorqueSecurityService.java (original) +++ turbine/core/trunk/extensions/torque/src/java/org/apache/turbine/services/security/torque/TorqueSecurityService.java Wed Oct 24 21:47:54 2018 @@ -26,7 +26,7 @@ import java.util.List; import org.apache.commons.configuration2.Configuration; -import org.apache.commons.lang.StringUtils; +import org.apache.commons.lang3.StringUtils; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; Modified: turbine/core/trunk/extensions/torque/src/java/org/apache/turbine/services/security/torque/TorqueUserManager.java URL: http://svn.apache.org/viewvc/turbine/core/trunk/extensions/torque/src/java/org/apache/turbine/services/security/torque/TorqueUserManager.java?rev=1844792&r1=1844791&r2=1844792&view=diff ============================================================================== --- turbine/core/trunk/extensions/torque/src/java/org/apache/turbine/services/security/torque/TorqueUserManager.java (original) +++ turbine/core/trunk/extensions/torque/src/java/org/apache/turbine/services/security/torque/TorqueUserManager.java Wed Oct 24 21:47:54 2018 @@ -25,7 +25,7 @@ import java.util.List; import org.apache.commons.configuration2.Configuration; -import org.apache.commons.lang.StringUtils; +import org.apache.commons.lang3.StringUtils; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; Modified: turbine/core/trunk/proposals/epugh/hibernate/org/apache/turbine/util/hibernate/PersistenceException.java URL: http://svn.apache.org/viewvc/turbine/core/trunk/proposals/epugh/hibernate/org/apache/turbine/util/hibernate/PersistenceException.java?rev=1844792&r1=1844791&r2=1844792&view=diff ============================================================================== --- turbine/core/trunk/proposals/epugh/hibernate/org/apache/turbine/util/hibernate/PersistenceException.java (original) +++ turbine/core/trunk/proposals/epugh/hibernate/org/apache/turbine/util/hibernate/PersistenceException.java Wed Oct 24 21:47:54 2018 @@ -16,7 +16,7 @@ package org.apache.turbine.util.hibernat * limitations under the License. */ -import org.apache.commons.lang.exception.NestableException; +import org.apache.commons.lang3.exception.NestableException; /** * A general PersistenceException that can be thrown by * Hibernate DAO classes. Modified: turbine/core/trunk/proposals/seade/UIService/org/apache/turbine/services/ui/TurbineUIService.java URL: http://svn.apache.org/viewvc/turbine/core/trunk/proposals/seade/UIService/org/apache/turbine/services/ui/TurbineUIService.java?rev=1844792&r1=1844791&r2=1844792&view=diff ============================================================================== --- turbine/core/trunk/proposals/seade/UIService/org/apache/turbine/services/ui/TurbineUIService.java (original) +++ turbine/core/trunk/proposals/seade/UIService/org/apache/turbine/services/ui/TurbineUIService.java Wed Oct 24 21:47:54 2018 @@ -22,7 +22,7 @@ import java.io.FilenameFilter; import java.util.HashMap; import java.util.Properties; -import org.apache.commons.lang.StringUtils; +import org.apache.commons.lang3.StringUtils; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; import org.apache.turbine.Turbine; Modified: turbine/core/trunk/proposals/tv/osgi/service/java/org/apache/turbine/services/osgi/TurbineOSGiComponentService.java URL: http://svn.apache.org/viewvc/turbine/core/trunk/proposals/tv/osgi/service/java/org/apache/turbine/services/osgi/TurbineOSGiComponentService.java?rev=1844792&r1=1844791&r2=1844792&view=diff ============================================================================== --- turbine/core/trunk/proposals/tv/osgi/service/java/org/apache/turbine/services/osgi/TurbineOSGiComponentService.java (original) +++ turbine/core/trunk/proposals/tv/osgi/service/java/org/apache/turbine/services/osgi/TurbineOSGiComponentService.java Wed Oct 24 21:47:54 2018 @@ -25,7 +25,7 @@ import java.util.Iterator; import java.util.List; import org.apache.commons.configuration2.Configuration; -import org.apache.commons.lang.StringUtils; +import org.apache.commons.lang3.StringUtils; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; import org.apache.felix.framework.Felix; Modified: turbine/core/trunk/src/java/org/apache/turbine/Turbine.java URL: http://svn.apache.org/viewvc/turbine/core/trunk/src/java/org/apache/turbine/Turbine.java?rev=1844792&r1=1844791&r2=1844792&view=diff ============================================================================== --- turbine/core/trunk/src/java/org/apache/turbine/Turbine.java (original) +++ turbine/core/trunk/src/java/org/apache/turbine/Turbine.java Wed Oct 24 21:47:54 2018 @@ -53,9 +53,9 @@ import org.apache.commons.configuration2 import org.apache.commons.configuration2.builder.fluent.Parameters; import org.apache.commons.configuration2.convert.DefaultListDelimiterHandler; import org.apache.commons.configuration2.io.HomeDirectoryLocationStrategy; -import org.apache.commons.lang.NotImplementedException; -import org.apache.commons.lang.StringUtils; -import org.apache.commons.lang.exception.ExceptionUtils; +import org.apache.commons.lang3.NotImplementedException; +import org.apache.commons.lang3.StringUtils; +import org.apache.commons.lang3.exception.ExceptionUtils; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; import org.apache.log4j.PropertyConfigurator; @@ -927,7 +927,7 @@ public class Turbine extends HttpServlet { try { - res.setContentType("text/plain"); + res.setContentType( TurbineConstants.DEFAULT_TEXT_CONTENT_TYPE ); res.setStatus(200); PrintWriter writer = res.getWriter(); writer.println("Horrible Exception: "); Modified: turbine/core/trunk/src/java/org/apache/turbine/TurbineConstants.java URL: http://svn.apache.org/viewvc/turbine/core/trunk/src/java/org/apache/turbine/TurbineConstants.java?rev=1844792&r1=1844791&r2=1844792&view=diff ============================================================================== --- turbine/core/trunk/src/java/org/apache/turbine/TurbineConstants.java (original) +++ turbine/core/trunk/src/java/org/apache/turbine/TurbineConstants.java Wed Oct 24 21:47:54 2018 @@ -221,6 +221,11 @@ public interface TurbineConstants String DEFAULT_HTML_DOCTYPE_URI_DEFAULT = "http://www.w3.org/TR/1999/REC-html401-19991224/loose.dtd"; + /** Define content types **/ + String DEFAULT_HTML_CONTENT_TYPE = "text/html"; + String DEFAULT_TEXT_CONTENT_TYPE = "text/plain"; + String DEFAULT_CSS_CONTENT_TYPE = "text/css"; + /** Default Language property */ String LOCALE_DEFAULT_LANGUAGE_KEY = "locale.default.language"; Modified: turbine/core/trunk/src/java/org/apache/turbine/annotation/AnnotationProcessor.java URL: http://svn.apache.org/viewvc/turbine/core/trunk/src/java/org/apache/turbine/annotation/AnnotationProcessor.java?rev=1844792&r1=1844791&r2=1844792&view=diff ============================================================================== --- turbine/core/trunk/src/java/org/apache/turbine/annotation/AnnotationProcessor.java (original) +++ turbine/core/trunk/src/java/org/apache/turbine/annotation/AnnotationProcessor.java Wed Oct 24 21:47:54 2018 @@ -27,7 +27,7 @@ import java.util.concurrent.ConcurrentHa import java.util.concurrent.ConcurrentMap; import org.apache.commons.configuration2.Configuration; -import org.apache.commons.lang.StringUtils; +import org.apache.commons.lang3.StringUtils; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; import org.apache.fulcrum.security.model.turbine.TurbineAccessControlList; Modified: turbine/core/trunk/src/java/org/apache/turbine/modules/ActionEvent.java URL: http://svn.apache.org/viewvc/turbine/core/trunk/src/java/org/apache/turbine/modules/ActionEvent.java?rev=1844792&r1=1844791&r2=1844792&view=diff ============================================================================== --- turbine/core/trunk/src/java/org/apache/turbine/modules/ActionEvent.java (original) +++ turbine/core/trunk/src/java/org/apache/turbine/modules/ActionEvent.java Wed Oct 24 21:47:54 2018 @@ -26,7 +26,7 @@ import java.util.Arrays; import java.util.concurrent.ConcurrentHashMap; import java.util.concurrent.ConcurrentMap; -import org.apache.commons.lang.StringUtils; +import org.apache.commons.lang3.StringUtils; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; import org.apache.fulcrum.parser.ParameterParser; Modified: turbine/core/trunk/src/java/org/apache/turbine/modules/actions/LoginUser.java URL: http://svn.apache.org/viewvc/turbine/core/trunk/src/java/org/apache/turbine/modules/actions/LoginUser.java?rev=1844792&r1=1844791&r2=1844792&view=diff ============================================================================== --- turbine/core/trunk/src/java/org/apache/turbine/modules/actions/LoginUser.java (original) +++ turbine/core/trunk/src/java/org/apache/turbine/modules/actions/LoginUser.java Wed Oct 24 21:47:54 2018 @@ -19,7 +19,7 @@ package org.apache.turbine.modules.actio * under the License. */ -import org.apache.commons.lang.StringUtils; +import org.apache.commons.lang3.StringUtils; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; import org.apache.fulcrum.security.util.DataBackendException; @@ -139,6 +139,7 @@ public class LoginUser // Set Error Message and clean out the user. data.setMessage(loginError); + User anonymousUser = security.getAnonymousUser(); data.setUser(anonymousUser); Modified: turbine/core/trunk/src/java/org/apache/turbine/modules/actions/LogoutUser.java URL: http://svn.apache.org/viewvc/turbine/core/trunk/src/java/org/apache/turbine/modules/actions/LogoutUser.java?rev=1844792&r1=1844791&r2=1844792&view=diff ============================================================================== --- turbine/core/trunk/src/java/org/apache/turbine/modules/actions/LogoutUser.java (original) +++ turbine/core/trunk/src/java/org/apache/turbine/modules/actions/LogoutUser.java Wed Oct 24 21:47:54 2018 @@ -102,7 +102,7 @@ public class LogoutUser // Retrieve an anonymous user. User anonymousUser = security.getAnonymousUser(); data.setUser(anonymousUser); - data.save(); + data.save(); // In the event that the current screen or related navigations // require acl info, we cannot wait for Turbine to handle Modified: turbine/core/trunk/src/java/org/apache/turbine/modules/actions/sessionvalidator/DefaultSessionValidator.java URL: http://svn.apache.org/viewvc/turbine/core/trunk/src/java/org/apache/turbine/modules/actions/sessionvalidator/DefaultSessionValidator.java?rev=1844792&r1=1844791&r2=1844792&view=diff ============================================================================== --- turbine/core/trunk/src/java/org/apache/turbine/modules/actions/sessionvalidator/DefaultSessionValidator.java (original) +++ turbine/core/trunk/src/java/org/apache/turbine/modules/actions/sessionvalidator/DefaultSessionValidator.java Wed Oct 24 21:47:54 2018 @@ -19,7 +19,7 @@ package org.apache.turbine.modules.actio * under the License. */ -import org.apache.commons.lang.StringUtils; +import org.apache.commons.lang3.StringUtils; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; import org.apache.turbine.Turbine; @@ -71,9 +71,9 @@ public class DefaultSessionValidator /** - * Execute the action. The default is to populate the PipelineData - * object and, if the user is unknown, to force a login screen (as - * set in the tr.props). + * Execute the action. The default behavior is to populate the PipelineData + * object, and if the user is unknown, to then force a redirect + * to the login screen (as set in the tr.props). * * @see org.apache.turbine.modules.screens.error.InvalidState * @param pipelineData Turbine PipelineData context information. @@ -91,7 +91,7 @@ public class DefaultSessionValidator // The user may have not logged in, so create a "guest/anonymous" user. if (data.getUser() == null) { - log.debug("Fixing up empty User Object!"); + log.debug("Creating an anonymous user object!"); User anonymousUser = security.getAnonymousUser(); data.setUser(anonymousUser); data.save(); Modified: turbine/core/trunk/src/java/org/apache/turbine/modules/actions/sessionvalidator/TemplateSecureSessionValidator.java URL: http://svn.apache.org/viewvc/turbine/core/trunk/src/java/org/apache/turbine/modules/actions/sessionvalidator/TemplateSecureSessionValidator.java?rev=1844792&r1=1844791&r2=1844792&view=diff ============================================================================== --- turbine/core/trunk/src/java/org/apache/turbine/modules/actions/sessionvalidator/TemplateSecureSessionValidator.java (original) +++ turbine/core/trunk/src/java/org/apache/turbine/modules/actions/sessionvalidator/TemplateSecureSessionValidator.java Wed Oct 24 21:47:54 2018 @@ -19,7 +19,7 @@ package org.apache.turbine.modules.actio * under the License. */ -import org.apache.commons.lang.StringUtils; +import org.apache.commons.lang3.StringUtils; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; import org.apache.turbine.Turbine; @@ -91,7 +91,7 @@ public class TemplateSecureSessionValida // The user may have not logged in, so create a "guest/anonymous" user. if (data.getUser() == null) { - log.debug("Fixing up empty User Object!"); + log.debug("Creating an anonymous user object!"); User anonymousUser = security.getAnonymousUser(); data.setUser(anonymousUser); data.save(); Modified: turbine/core/trunk/src/java/org/apache/turbine/modules/actions/sessionvalidator/TemplateSessionValidator.java URL: http://svn.apache.org/viewvc/turbine/core/trunk/src/java/org/apache/turbine/modules/actions/sessionvalidator/TemplateSessionValidator.java?rev=1844792&r1=1844791&r2=1844792&view=diff ============================================================================== --- turbine/core/trunk/src/java/org/apache/turbine/modules/actions/sessionvalidator/TemplateSessionValidator.java (original) +++ turbine/core/trunk/src/java/org/apache/turbine/modules/actions/sessionvalidator/TemplateSessionValidator.java Wed Oct 24 21:47:54 2018 @@ -19,7 +19,7 @@ package org.apache.turbine.modules.actio * under the License. */ -import org.apache.commons.lang.StringUtils; +import org.apache.commons.lang3.StringUtils; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; import org.apache.turbine.Turbine; @@ -69,7 +69,7 @@ public class TemplateSessionValidator // The user may have not logged in, so create a "guest/anonymous" user. if (data.getUser() == null) { - log.debug("Fixing up empty User Object!"); + log.debug("Creating an anonymous user object!"); User anonymousUser = security.getAnonymousUser(); data.setUser(anonymousUser); data.save(); Modified: turbine/core/trunk/src/java/org/apache/turbine/modules/layouts/JspLayout.java URL: http://svn.apache.org/viewvc/turbine/core/trunk/src/java/org/apache/turbine/modules/layouts/JspLayout.java?rev=1844792&r1=1844791&r2=1844792&view=diff ============================================================================== --- turbine/core/trunk/src/java/org/apache/turbine/modules/layouts/JspLayout.java (original) +++ turbine/core/trunk/src/java/org/apache/turbine/modules/layouts/JspLayout.java Wed Oct 24 21:47:54 2018 @@ -60,7 +60,7 @@ public class JspLayout throws Exception { RunData data = getRunData(pipelineData); - data.getResponse().setContentType("text/html"); + data.getResponse().setContentType( TurbineConstants.DEFAULT_HTML_CONTENT_TYPE ); data.declareDirectResponse(); // variable to reference the screen in the layout template Modified: turbine/core/trunk/src/java/org/apache/turbine/modules/layouts/VelocityOnlyLayout.java URL: http://svn.apache.org/viewvc/turbine/core/trunk/src/java/org/apache/turbine/modules/layouts/VelocityOnlyLayout.java?rev=1844792&r1=1844791&r2=1844792&view=diff ============================================================================== --- turbine/core/trunk/src/java/org/apache/turbine/modules/layouts/VelocityOnlyLayout.java (original) +++ turbine/core/trunk/src/java/org/apache/turbine/modules/layouts/VelocityOnlyLayout.java Wed Oct 24 21:47:54 2018 @@ -21,7 +21,7 @@ package org.apache.turbine.modules.layou */ -import org.apache.commons.lang.StringUtils; +import org.apache.commons.lang3.StringUtils; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; import org.apache.turbine.TurbineConstants; Modified: turbine/core/trunk/src/java/org/apache/turbine/modules/layouts/VelocityXslLayout.java URL: http://svn.apache.org/viewvc/turbine/core/trunk/src/java/org/apache/turbine/modules/layouts/VelocityXslLayout.java?rev=1844792&r1=1844791&r2=1844792&view=diff ============================================================================== --- turbine/core/trunk/src/java/org/apache/turbine/modules/layouts/VelocityXslLayout.java (original) +++ turbine/core/trunk/src/java/org/apache/turbine/modules/layouts/VelocityXslLayout.java Wed Oct 24 21:47:54 2018 @@ -23,7 +23,7 @@ package org.apache.turbine.modules.layou import java.io.StringReader; -import org.apache.commons.lang.StringUtils; +import org.apache.commons.lang3.StringUtils; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; import org.apache.fulcrum.xslt.XSLTService; @@ -93,7 +93,7 @@ public class VelocityXslLayout extends L // Get the context needed by Velocity. Context context = velocityService.getContext(pipelineData); - data.getResponse().setContentType("text/html"); + data.getResponse().setContentType(TurbineConstants.DEFAULT_HTML_CONTENT_TYPE); String screenName = data.getScreen(); Modified: turbine/core/trunk/src/java/org/apache/turbine/modules/pages/DefaultPage.java URL: http://svn.apache.org/viewvc/turbine/core/trunk/src/java/org/apache/turbine/modules/pages/DefaultPage.java?rev=1844792&r1=1844791&r2=1844792&view=diff ============================================================================== --- turbine/core/trunk/src/java/org/apache/turbine/modules/pages/DefaultPage.java (original) +++ turbine/core/trunk/src/java/org/apache/turbine/modules/pages/DefaultPage.java Wed Oct 24 21:47:54 2018 @@ -21,7 +21,7 @@ package org.apache.turbine.modules.pages */ -import org.apache.commons.lang.StringUtils; +import org.apache.commons.lang3.StringUtils; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; import org.apache.turbine.annotation.TurbineLoader; Modified: turbine/core/trunk/src/java/org/apache/turbine/modules/screens/BaseJspScreen.java URL: http://svn.apache.org/viewvc/turbine/core/trunk/src/java/org/apache/turbine/modules/screens/BaseJspScreen.java?rev=1844792&r1=1844791&r2=1844792&view=diff ============================================================================== --- turbine/core/trunk/src/java/org/apache/turbine/modules/screens/BaseJspScreen.java (original) +++ turbine/core/trunk/src/java/org/apache/turbine/modules/screens/BaseJspScreen.java Wed Oct 24 21:47:54 2018 @@ -19,7 +19,7 @@ package org.apache.turbine.modules.scree * under the License. */ -import org.apache.commons.lang.StringUtils; +import org.apache.commons.lang3.StringUtils; import org.apache.turbine.annotation.TurbineService; import org.apache.turbine.pipeline.PipelineData; import org.apache.turbine.services.jsp.JspService; Modified: turbine/core/trunk/src/java/org/apache/turbine/modules/screens/VelocityCachedScreen.java URL: http://svn.apache.org/viewvc/turbine/core/trunk/src/java/org/apache/turbine/modules/screens/VelocityCachedScreen.java?rev=1844792&r1=1844791&r2=1844792&view=diff ============================================================================== --- turbine/core/trunk/src/java/org/apache/turbine/modules/screens/VelocityCachedScreen.java (original) +++ turbine/core/trunk/src/java/org/apache/turbine/modules/screens/VelocityCachedScreen.java Wed Oct 24 21:47:54 2018 @@ -19,8 +19,8 @@ package org.apache.turbine.modules.scree * under the License. */ -import org.apache.commons.lang.StringUtils; -import org.apache.commons.lang.exception.ExceptionUtils; +import org.apache.commons.lang3.StringUtils; +import org.apache.commons.lang3.exception.ExceptionUtils; import org.apache.turbine.TurbineConstants; import org.apache.turbine.pipeline.PipelineData; import org.apache.turbine.util.RunData; Modified: turbine/core/trunk/src/java/org/apache/turbine/modules/screens/VelocityDirectScreen.java URL: http://svn.apache.org/viewvc/turbine/core/trunk/src/java/org/apache/turbine/modules/screens/VelocityDirectScreen.java?rev=1844792&r1=1844791&r2=1844792&view=diff ============================================================================== --- turbine/core/trunk/src/java/org/apache/turbine/modules/screens/VelocityDirectScreen.java (original) +++ turbine/core/trunk/src/java/org/apache/turbine/modules/screens/VelocityDirectScreen.java Wed Oct 24 21:47:54 2018 @@ -19,8 +19,8 @@ package org.apache.turbine.modules.scree * under the License. */ -import org.apache.commons.lang.StringUtils; -import org.apache.commons.lang.exception.ExceptionUtils; +import org.apache.commons.lang3.StringUtils; +import org.apache.commons.lang3.exception.ExceptionUtils; import org.apache.turbine.TurbineConstants; import org.apache.turbine.pipeline.PipelineData; import org.apache.turbine.util.RunData; Modified: turbine/core/trunk/src/java/org/apache/turbine/modules/screens/VelocityScreen.java URL: http://svn.apache.org/viewvc/turbine/core/trunk/src/java/org/apache/turbine/modules/screens/VelocityScreen.java?rev=1844792&r1=1844791&r2=1844792&view=diff ============================================================================== --- turbine/core/trunk/src/java/org/apache/turbine/modules/screens/VelocityScreen.java (original) +++ turbine/core/trunk/src/java/org/apache/turbine/modules/screens/VelocityScreen.java Wed Oct 24 21:47:54 2018 @@ -19,8 +19,8 @@ package org.apache.turbine.modules.scree * under the License. */ -import org.apache.commons.lang.StringUtils; -import org.apache.commons.lang.exception.ExceptionUtils; +import org.apache.commons.lang3.StringUtils; +import org.apache.commons.lang3.exception.ExceptionUtils; import org.apache.turbine.TurbineConstants; import org.apache.turbine.annotation.TurbineConfiguration; import org.apache.turbine.annotation.TurbineService; Modified: turbine/core/trunk/src/java/org/apache/turbine/pipeline/DetermineRedirectRequestedValve.java URL: http://svn.apache.org/viewvc/turbine/core/trunk/src/java/org/apache/turbine/pipeline/DetermineRedirectRequestedValve.java?rev=1844792&r1=1844791&r2=1844792&view=diff ============================================================================== --- turbine/core/trunk/src/java/org/apache/turbine/pipeline/DetermineRedirectRequestedValve.java (original) +++ turbine/core/trunk/src/java/org/apache/turbine/pipeline/DetermineRedirectRequestedValve.java Wed Oct 24 21:47:54 2018 @@ -23,7 +23,7 @@ package org.apache.turbine.pipeline; import java.io.IOException; -import org.apache.commons.lang.StringUtils; +import org.apache.commons.lang3.StringUtils; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; import org.apache.turbine.util.RunData; Modified: turbine/core/trunk/src/java/org/apache/turbine/services/BaseServiceBroker.java URL: http://svn.apache.org/viewvc/turbine/core/trunk/src/java/org/apache/turbine/services/BaseServiceBroker.java?rev=1844792&r1=1844791&r2=1844792&view=diff ============================================================================== --- turbine/core/trunk/src/java/org/apache/turbine/services/BaseServiceBroker.java (original) +++ turbine/core/trunk/src/java/org/apache/turbine/services/BaseServiceBroker.java Wed Oct 24 21:47:54 2018 @@ -30,7 +30,7 @@ import java.util.concurrent.ConcurrentHa import java.util.concurrent.locks.ReentrantLock; import org.apache.commons.configuration2.Configuration; -import org.apache.commons.lang.StringUtils; +import org.apache.commons.lang3.StringUtils; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; Modified: turbine/core/trunk/src/java/org/apache/turbine/services/assemblerbroker/util/java/JavaBaseFactory.java URL: http://svn.apache.org/viewvc/turbine/core/trunk/src/java/org/apache/turbine/services/assemblerbroker/util/java/JavaBaseFactory.java?rev=1844792&r1=1844791&r2=1844792&view=diff ============================================================================== --- turbine/core/trunk/src/java/org/apache/turbine/services/assemblerbroker/util/java/JavaBaseFactory.java (original) +++ turbine/core/trunk/src/java/org/apache/turbine/services/assemblerbroker/util/java/JavaBaseFactory.java Wed Oct 24 21:47:54 2018 @@ -23,7 +23,7 @@ package org.apache.turbine.services.asse import java.util.List; import java.util.concurrent.ConcurrentHashMap; -import org.apache.commons.lang.StringUtils; +import org.apache.commons.lang3.StringUtils; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; import org.apache.turbine.modules.Assembler; Modified: turbine/core/trunk/src/java/org/apache/turbine/services/assemblerbroker/util/python/PythonBaseFactory.java URL: http://svn.apache.org/viewvc/turbine/core/trunk/src/java/org/apache/turbine/services/assemblerbroker/util/python/PythonBaseFactory.java?rev=1844792&r1=1844791&r2=1844792&view=diff ============================================================================== --- turbine/core/trunk/src/java/org/apache/turbine/services/assemblerbroker/util/python/PythonBaseFactory.java (original) +++ turbine/core/trunk/src/java/org/apache/turbine/services/assemblerbroker/util/python/PythonBaseFactory.java Wed Oct 24 21:47:54 2018 @@ -24,7 +24,7 @@ package org.apache.turbine.services.asse import java.io.File; import org.apache.commons.configuration2.Configuration; -import org.apache.commons.lang.StringUtils; +import org.apache.commons.lang3.StringUtils; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; import org.apache.turbine.modules.Assembler; Modified: turbine/core/trunk/src/java/org/apache/turbine/services/jsp/TurbineJspService.java URL: http://svn.apache.org/viewvc/turbine/core/trunk/src/java/org/apache/turbine/services/jsp/TurbineJspService.java?rev=1844792&r1=1844791&r2=1844792&view=diff ============================================================================== --- turbine/core/trunk/src/java/org/apache/turbine/services/jsp/TurbineJspService.java (original) +++ turbine/core/trunk/src/java/org/apache/turbine/services/jsp/TurbineJspService.java Wed Oct 24 21:47:54 2018 @@ -28,7 +28,7 @@ import javax.servlet.RequestDispatcher; import javax.servlet.http.HttpServletRequest; import org.apache.commons.configuration2.Configuration; -import org.apache.commons.lang.StringUtils; +import org.apache.commons.lang3.StringUtils; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; import org.apache.turbine.Turbine; Modified: turbine/core/trunk/src/java/org/apache/turbine/services/pull/util/DateFormatter.java URL: http://svn.apache.org/viewvc/turbine/core/trunk/src/java/org/apache/turbine/services/pull/util/DateFormatter.java?rev=1844792&r1=1844791&r2=1844792&view=diff ============================================================================== --- turbine/core/trunk/src/java/org/apache/turbine/services/pull/util/DateFormatter.java (original) +++ turbine/core/trunk/src/java/org/apache/turbine/services/pull/util/DateFormatter.java Wed Oct 24 21:47:54 2018 @@ -24,7 +24,7 @@ package org.apache.turbine.services.pull import java.text.SimpleDateFormat; import java.util.Date; -import org.apache.commons.lang.StringUtils; +import org.apache.commons.lang3.StringUtils; import org.apache.turbine.Turbine; import org.apache.turbine.services.pull.ApplicationTool; Modified: turbine/core/trunk/src/java/org/apache/turbine/services/rundata/DefaultTurbineRunData.java URL: http://svn.apache.org/viewvc/turbine/core/trunk/src/java/org/apache/turbine/services/rundata/DefaultTurbineRunData.java?rev=1844792&r1=1844791&r2=1844792&view=diff ============================================================================== --- turbine/core/trunk/src/java/org/apache/turbine/services/rundata/DefaultTurbineRunData.java (original) +++ turbine/core/trunk/src/java/org/apache/turbine/services/rundata/DefaultTurbineRunData.java Wed Oct 24 21:47:54 2018 @@ -34,7 +34,7 @@ import javax.servlet.http.HttpServletReq import javax.servlet.http.HttpServletResponse; import javax.servlet.http.HttpSession; -import org.apache.commons.lang.StringUtils; +import org.apache.commons.lang3.StringUtils; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; import org.apache.fulcrum.parser.CookieParser; Modified: turbine/core/trunk/src/java/org/apache/turbine/services/schedule/AbstractJobEntry.java URL: http://svn.apache.org/viewvc/turbine/core/trunk/src/java/org/apache/turbine/services/schedule/AbstractJobEntry.java?rev=1844792&r1=1844791&r2=1844792&view=diff ============================================================================== --- turbine/core/trunk/src/java/org/apache/turbine/services/schedule/AbstractJobEntry.java (original) +++ turbine/core/trunk/src/java/org/apache/turbine/services/schedule/AbstractJobEntry.java Wed Oct 24 21:47:54 2018 @@ -22,7 +22,7 @@ package org.apache.turbine.services.sche import java.util.Calendar; import java.util.Date; -import org.apache.commons.lang.StringUtils; +import org.apache.commons.lang3.StringUtils; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; import org.apache.turbine.util.TurbineException; Modified: turbine/core/trunk/src/java/org/apache/turbine/services/schedule/JobEntryQuartz.java URL: http://svn.apache.org/viewvc/turbine/core/trunk/src/java/org/apache/turbine/services/schedule/JobEntryQuartz.java?rev=1844792&r1=1844791&r2=1844792&view=diff ============================================================================== --- turbine/core/trunk/src/java/org/apache/turbine/services/schedule/JobEntryQuartz.java (original) +++ turbine/core/trunk/src/java/org/apache/turbine/services/schedule/JobEntryQuartz.java Wed Oct 24 21:47:54 2018 @@ -22,7 +22,7 @@ package org.apache.turbine.services.sche import java.util.Date; import java.util.concurrent.atomic.AtomicBoolean; -import org.apache.commons.lang.StringUtils; +import org.apache.commons.lang3.StringUtils; import org.apache.turbine.modules.ScheduledJobLoader; import org.apache.turbine.util.TurbineException; import org.quartz.Job; Modified: turbine/core/trunk/src/java/org/apache/turbine/services/schedule/TurbineNonPersistentSchedulerService.java URL: http://svn.apache.org/viewvc/turbine/core/trunk/src/java/org/apache/turbine/services/schedule/TurbineNonPersistentSchedulerService.java?rev=1844792&r1=1844791&r2=1844792&view=diff ============================================================================== --- turbine/core/trunk/src/java/org/apache/turbine/services/schedule/TurbineNonPersistentSchedulerService.java (original) +++ turbine/core/trunk/src/java/org/apache/turbine/services/schedule/TurbineNonPersistentSchedulerService.java Wed Oct 24 21:47:54 2018 @@ -23,7 +23,7 @@ import java.util.ArrayList; import java.util.List; import org.apache.commons.configuration2.Configuration; -import org.apache.commons.lang.StringUtils; +import org.apache.commons.lang3.StringUtils; import org.apache.turbine.util.TurbineException; /** Modified: turbine/core/trunk/src/java/org/apache/turbine/services/security/DefaultSecurityService.java URL: http://svn.apache.org/viewvc/turbine/core/trunk/src/java/org/apache/turbine/services/security/DefaultSecurityService.java?rev=1844792&r1=1844791&r2=1844792&view=diff ============================================================================== --- turbine/core/trunk/src/java/org/apache/turbine/services/security/DefaultSecurityService.java (original) +++ turbine/core/trunk/src/java/org/apache/turbine/services/security/DefaultSecurityService.java Wed Oct 24 21:47:54 2018 @@ -371,8 +371,9 @@ public class DefaultSecurityService } /** - * Authenticates an user, and constructs an User object to represent - * him/her. + * Retrieves a User object representing an individual who has + * properly identified themselves with their verified + * username and password * * @param username The user name. * @param password The user password. @@ -392,7 +393,8 @@ public class DefaultSecurityService /** * Constructs an User object to represent a registered user of the - * application. + * application. This method does not authenticate that the proper + * credentials were supplied (see @link #getAuthenticatedUser()}) * * @param username The user name. * @return A Turbine User. Modified: turbine/core/trunk/src/java/org/apache/turbine/services/template/TurbineTemplateService.java URL: http://svn.apache.org/viewvc/turbine/core/trunk/src/java/org/apache/turbine/services/template/TurbineTemplateService.java?rev=1844792&r1=1844791&r2=1844792&view=diff ============================================================================== --- turbine/core/trunk/src/java/org/apache/turbine/services/template/TurbineTemplateService.java (original) +++ turbine/core/trunk/src/java/org/apache/turbine/services/template/TurbineTemplateService.java Wed Oct 24 21:47:54 2018 @@ -26,7 +26,7 @@ import java.util.concurrent.ConcurrentHa import java.util.concurrent.ConcurrentMap; import org.apache.commons.configuration2.Configuration; -import org.apache.commons.lang.StringUtils; +import org.apache.commons.lang3.StringUtils; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; import org.apache.fulcrum.factory.FactoryException; Modified: turbine/core/trunk/src/java/org/apache/turbine/services/template/mapper/BaseMapper.java URL: http://svn.apache.org/viewvc/turbine/core/trunk/src/java/org/apache/turbine/services/template/mapper/BaseMapper.java?rev=1844792&r1=1844791&r2=1844792&view=diff ============================================================================== --- turbine/core/trunk/src/java/org/apache/turbine/services/template/mapper/BaseMapper.java (original) +++ turbine/core/trunk/src/java/org/apache/turbine/services/template/mapper/BaseMapper.java Wed Oct 24 21:47:54 2018 @@ -24,7 +24,7 @@ package org.apache.turbine.services.temp import java.util.HashMap; import java.util.Map; -import org.apache.commons.lang.StringUtils; +import org.apache.commons.lang3.StringUtils; import org.apache.turbine.services.TurbineServices; import org.apache.turbine.services.template.TemplateEngineService; import org.apache.turbine.services.template.TemplateService; Modified: turbine/core/trunk/src/java/org/apache/turbine/services/template/mapper/BaseTemplateMapper.java URL: http://svn.apache.org/viewvc/turbine/core/trunk/src/java/org/apache/turbine/services/template/mapper/BaseTemplateMapper.java?rev=1844792&r1=1844791&r2=1844792&view=diff ============================================================================== --- turbine/core/trunk/src/java/org/apache/turbine/services/template/mapper/BaseTemplateMapper.java (original) +++ turbine/core/trunk/src/java/org/apache/turbine/services/template/mapper/BaseTemplateMapper.java Wed Oct 24 21:47:54 2018 @@ -21,7 +21,7 @@ package org.apache.turbine.services.temp */ -import org.apache.commons.lang.StringUtils; +import org.apache.commons.lang3.StringUtils; import org.apache.turbine.services.TurbineServices; import org.apache.turbine.services.template.TemplateService; Modified: turbine/core/trunk/src/java/org/apache/turbine/services/template/mapper/ClassMapper.java URL: http://svn.apache.org/viewvc/turbine/core/trunk/src/java/org/apache/turbine/services/template/mapper/ClassMapper.java?rev=1844792&r1=1844791&r2=1844792&view=diff ============================================================================== --- turbine/core/trunk/src/java/org/apache/turbine/services/template/mapper/ClassMapper.java (original) +++ turbine/core/trunk/src/java/org/apache/turbine/services/template/mapper/ClassMapper.java Wed Oct 24 21:47:54 2018 @@ -25,7 +25,7 @@ import java.util.ArrayList; import java.util.Arrays; import java.util.List; -import org.apache.commons.lang.StringUtils; +import org.apache.commons.lang3.StringUtils; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; import org.apache.turbine.modules.Assembler; Modified: turbine/core/trunk/src/java/org/apache/turbine/services/template/mapper/DirectMapper.java URL: http://svn.apache.org/viewvc/turbine/core/trunk/src/java/org/apache/turbine/services/template/mapper/DirectMapper.java?rev=1844792&r1=1844791&r2=1844792&view=diff ============================================================================== --- turbine/core/trunk/src/java/org/apache/turbine/services/template/mapper/DirectMapper.java (original) +++ turbine/core/trunk/src/java/org/apache/turbine/services/template/mapper/DirectMapper.java Wed Oct 24 21:47:54 2018 @@ -21,7 +21,7 @@ package org.apache.turbine.services.temp */ -import org.apache.commons.lang.StringUtils; +import org.apache.commons.lang3.StringUtils; import org.apache.turbine.services.template.TemplateService; /** Modified: turbine/core/trunk/src/java/org/apache/turbine/services/template/mapper/DirectTemplateMapper.java URL: http://svn.apache.org/viewvc/turbine/core/trunk/src/java/org/apache/turbine/services/template/mapper/DirectTemplateMapper.java?rev=1844792&r1=1844791&r2=1844792&view=diff ============================================================================== --- turbine/core/trunk/src/java/org/apache/turbine/services/template/mapper/DirectTemplateMapper.java (original) +++ turbine/core/trunk/src/java/org/apache/turbine/services/template/mapper/DirectTemplateMapper.java Wed Oct 24 21:47:54 2018 @@ -21,7 +21,7 @@ package org.apache.turbine.services.temp */ -import org.apache.commons.lang.StringUtils; +import org.apache.commons.lang3.StringUtils; import org.apache.turbine.services.template.TemplateService; /** Modified: turbine/core/trunk/src/java/org/apache/turbine/services/template/mapper/LayoutTemplateMapper.java URL: http://svn.apache.org/viewvc/turbine/core/trunk/src/java/org/apache/turbine/services/template/mapper/LayoutTemplateMapper.java?rev=1844792&r1=1844791&r2=1844792&view=diff ============================================================================== --- turbine/core/trunk/src/java/org/apache/turbine/services/template/mapper/LayoutTemplateMapper.java (original) +++ turbine/core/trunk/src/java/org/apache/turbine/services/template/mapper/LayoutTemplateMapper.java Wed Oct 24 21:47:54 2018 @@ -25,7 +25,7 @@ import java.util.ArrayList; import java.util.Arrays; import java.util.List; -import org.apache.commons.lang.StringUtils; +import org.apache.commons.lang3.StringUtils; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; import org.apache.turbine.services.TurbineServices; Modified: turbine/core/trunk/src/java/org/apache/turbine/services/template/mapper/ScreenDefaultTemplateMapper.java URL: http://svn.apache.org/viewvc/turbine/core/trunk/src/java/org/apache/turbine/services/template/mapper/ScreenDefaultTemplateMapper.java?rev=1844792&r1=1844791&r2=1844792&view=diff ============================================================================== --- turbine/core/trunk/src/java/org/apache/turbine/services/template/mapper/ScreenDefaultTemplateMapper.java (original) +++ turbine/core/trunk/src/java/org/apache/turbine/services/template/mapper/ScreenDefaultTemplateMapper.java Wed Oct 24 21:47:54 2018 @@ -25,7 +25,7 @@ import java.util.ArrayList; import java.util.Arrays; import java.util.List; -import org.apache.commons.lang.StringUtils; +import org.apache.commons.lang3.StringUtils; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; import org.apache.turbine.services.TurbineServices; Modified: turbine/core/trunk/src/java/org/apache/turbine/services/template/mapper/ScreenTemplateMapper.java URL: http://svn.apache.org/viewvc/turbine/core/trunk/src/java/org/apache/turbine/services/template/mapper/ScreenTemplateMapper.java?rev=1844792&r1=1844791&r2=1844792&view=diff ============================================================================== --- turbine/core/trunk/src/java/org/apache/turbine/services/template/mapper/ScreenTemplateMapper.java (original) +++ turbine/core/trunk/src/java/org/apache/turbine/services/template/mapper/ScreenTemplateMapper.java Wed Oct 24 21:47:54 2018 @@ -21,7 +21,7 @@ package org.apache.turbine.services.temp */ -import org.apache.commons.lang.StringUtils; +import org.apache.commons.lang3.StringUtils; import org.apache.turbine.services.TurbineServices; import org.apache.turbine.services.template.TemplateEngineService; import org.apache.turbine.services.template.TemplateService; Modified: turbine/core/trunk/src/java/org/apache/turbine/services/ui/TurbineUIService.java URL: http://svn.apache.org/viewvc/turbine/core/trunk/src/java/org/apache/turbine/services/ui/TurbineUIService.java?rev=1844792&r1=1844791&r2=1844792&view=diff ============================================================================== --- turbine/core/trunk/src/java/org/apache/turbine/services/ui/TurbineUIService.java (original) +++ turbine/core/trunk/src/java/org/apache/turbine/services/ui/TurbineUIService.java Wed Oct 24 21:47:54 2018 @@ -26,7 +26,7 @@ import java.util.Properties; import java.util.concurrent.ConcurrentHashMap; import org.apache.commons.configuration2.Configuration; -import org.apache.commons.lang.StringUtils; +import org.apache.commons.lang3.StringUtils; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; import org.apache.turbine.Turbine; Modified: turbine/core/trunk/src/java/org/apache/turbine/services/velocity/TurbineVelocityService.java URL: http://svn.apache.org/viewvc/turbine/core/trunk/src/java/org/apache/turbine/services/velocity/TurbineVelocityService.java?rev=1844792&r1=1844791&r2=1844792&view=diff ============================================================================== --- turbine/core/trunk/src/java/org/apache/turbine/services/velocity/TurbineVelocityService.java (original) +++ turbine/core/trunk/src/java/org/apache/turbine/services/velocity/TurbineVelocityService.java Wed Oct 24 21:47:54 2018 @@ -29,7 +29,7 @@ import java.util.Iterator; import java.util.List; import org.apache.commons.configuration2.Configuration; -import org.apache.commons.lang.StringUtils; +import org.apache.commons.lang3.StringUtils; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; import org.apache.turbine.Turbine; Modified: turbine/core/trunk/src/java/org/apache/turbine/util/HttpUtils.java URL: http://svn.apache.org/viewvc/turbine/core/trunk/src/java/org/apache/turbine/util/HttpUtils.java?rev=1844792&r1=1844791&r2=1844792&view=diff ============================================================================== --- turbine/core/trunk/src/java/org/apache/turbine/util/HttpUtils.java (original) +++ turbine/core/trunk/src/java/org/apache/turbine/util/HttpUtils.java Wed Oct 24 21:47:54 2018 @@ -25,7 +25,7 @@ import java.util.TimeZone; import javax.servlet.http.HttpServletResponse; -import org.apache.commons.lang.time.FastDateFormat; +import org.apache.commons.lang3.time.FastDateFormat; import org.apache.turbine.Turbine; import org.apache.turbine.pipeline.PipelineData; Modified: turbine/core/trunk/src/java/org/apache/turbine/util/InputFilterUtils.java URL: http://svn.apache.org/viewvc/turbine/core/trunk/src/java/org/apache/turbine/util/InputFilterUtils.java?rev=1844792&r1=1844791&r2=1844792&view=diff ============================================================================== --- turbine/core/trunk/src/java/org/apache/turbine/util/InputFilterUtils.java (original) +++ turbine/core/trunk/src/java/org/apache/turbine/util/InputFilterUtils.java Wed Oct 24 21:47:54 2018 @@ -21,8 +21,8 @@ package org.apache.turbine.util; */ -import org.apache.commons.lang.StringEscapeUtils; -import org.apache.commons.lang.StringUtils; +import org.apache.commons.lang3.StringEscapeUtils; +import org.apache.commons.lang3.StringUtils; /** * Some filter methods that have been orphaned in the Screen class. @@ -44,7 +44,7 @@ public abstract class InputFilterUtils */ public static String prepareText(String s) { - return StringEscapeUtils.escapeHtml(s); + return StringEscapeUtils.escapeHtml4(s); } /** Modified: turbine/core/trunk/src/java/org/apache/turbine/util/LocaleUtils.java URL: http://svn.apache.org/viewvc/turbine/core/trunk/src/java/org/apache/turbine/util/LocaleUtils.java?rev=1844792&r1=1844791&r2=1844792&view=diff ============================================================================== --- turbine/core/trunk/src/java/org/apache/turbine/util/LocaleUtils.java (original) +++ turbine/core/trunk/src/java/org/apache/turbine/util/LocaleUtils.java Wed Oct 24 21:47:54 2018 @@ -21,7 +21,7 @@ package org.apache.turbine.util; import java.util.Locale; -import org.apache.commons.lang.StringUtils; +import org.apache.commons.lang3.StringUtils; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; import org.apache.fulcrum.mimetype.MimeTypeService; Modified: turbine/core/trunk/src/java/org/apache/turbine/util/ServerData.java URL: http://svn.apache.org/viewvc/turbine/core/trunk/src/java/org/apache/turbine/util/ServerData.java?rev=1844792&r1=1844791&r2=1844792&view=diff ============================================================================== --- turbine/core/trunk/src/java/org/apache/turbine/util/ServerData.java (original) +++ turbine/core/trunk/src/java/org/apache/turbine/util/ServerData.java Wed Oct 24 21:47:54 2018 @@ -23,7 +23,7 @@ package org.apache.turbine.util; import javax.servlet.http.HttpServletRequest; -import org.apache.commons.lang.StringUtils; +import org.apache.commons.lang3.StringUtils; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; Modified: turbine/core/trunk/src/java/org/apache/turbine/util/ServletUtils.java URL: http://svn.apache.org/viewvc/turbine/core/trunk/src/java/org/apache/turbine/util/ServletUtils.java?rev=1844792&r1=1844791&r2=1844792&view=diff ============================================================================== --- turbine/core/trunk/src/java/org/apache/turbine/util/ServletUtils.java (original) +++ turbine/core/trunk/src/java/org/apache/turbine/util/ServletUtils.java Wed Oct 24 21:47:54 2018 @@ -28,7 +28,7 @@ import java.util.StringTokenizer; import javax.servlet.ServletConfig; import javax.servlet.ServletContext; -import org.apache.commons.lang.StringUtils; +import org.apache.commons.lang3.StringUtils; import org.apache.turbine.Turbine; /** Modified: turbine/core/trunk/src/java/org/apache/turbine/util/template/HtmlPageAttributes.java URL: http://svn.apache.org/viewvc/turbine/core/trunk/src/java/org/apache/turbine/util/template/HtmlPageAttributes.java?rev=1844792&r1=1844791&r2=1844792&view=diff ============================================================================== --- turbine/core/trunk/src/java/org/apache/turbine/util/template/HtmlPageAttributes.java (original) +++ turbine/core/trunk/src/java/org/apache/turbine/util/template/HtmlPageAttributes.java Wed Oct 24 21:47:54 2018 @@ -26,7 +26,7 @@ import java.util.LinkedHashMap; import java.util.List; import java.util.Map; -import org.apache.commons.lang.StringUtils; +import org.apache.commons.lang3.StringUtils; import org.apache.turbine.TurbineConstants; import org.apache.turbine.annotation.TurbineConfiguration; import org.apache.turbine.services.pull.ApplicationTool; Modified: turbine/core/trunk/src/java/org/apache/turbine/util/uri/BaseURI.java URL: http://svn.apache.org/viewvc/turbine/core/trunk/src/java/org/apache/turbine/util/uri/BaseURI.java?rev=1844792&r1=1844791&r2=1844792&view=diff ============================================================================== --- turbine/core/trunk/src/java/org/apache/turbine/util/uri/BaseURI.java (original) +++ turbine/core/trunk/src/java/org/apache/turbine/util/uri/BaseURI.java Wed Oct 24 21:47:54 2018 @@ -23,7 +23,7 @@ package org.apache.turbine.util.uri; import javax.servlet.http.HttpServletResponse; -import org.apache.commons.lang.StringUtils; +import org.apache.commons.lang3.StringUtils; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; Modified: turbine/core/trunk/src/java/org/apache/turbine/util/uri/TemplateURI.java URL: http://svn.apache.org/viewvc/turbine/core/trunk/src/java/org/apache/turbine/util/uri/TemplateURI.java?rev=1844792&r1=1844791&r2=1844792&view=diff ============================================================================== --- turbine/core/trunk/src/java/org/apache/turbine/util/uri/TemplateURI.java (original) +++ turbine/core/trunk/src/java/org/apache/turbine/util/uri/TemplateURI.java Wed Oct 24 21:47:54 2018 @@ -23,7 +23,7 @@ package org.apache.turbine.util.uri; import java.util.Iterator; -import org.apache.commons.lang.StringUtils; +import org.apache.commons.lang3.StringUtils; import org.apache.fulcrum.parser.ParameterParser; import org.apache.turbine.util.RunData; import org.apache.turbine.util.ServerData; Modified: turbine/core/trunk/src/java/org/apache/turbine/util/uri/TurbineURI.java URL: http://svn.apache.org/viewvc/turbine/core/trunk/src/java/org/apache/turbine/util/uri/TurbineURI.java?rev=1844792&r1=1844791&r2=1844792&view=diff ============================================================================== --- turbine/core/trunk/src/java/org/apache/turbine/util/uri/TurbineURI.java (original) +++ turbine/core/trunk/src/java/org/apache/turbine/util/uri/TurbineURI.java Wed Oct 24 21:47:54 2018 @@ -26,7 +26,7 @@ import java.util.Collection; import java.util.Iterator; import java.util.List; -import org.apache.commons.lang.StringUtils; +import org.apache.commons.lang3.StringUtils; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; import org.apache.fulcrum.parser.ParameterParser; Modified: turbine/core/trunk/src/java/org/apache/turbine/util/uri/URIParam.java URL: http://svn.apache.org/viewvc/turbine/core/trunk/src/java/org/apache/turbine/util/uri/URIParam.java?rev=1844792&r1=1844791&r2=1844792&view=diff ============================================================================== --- turbine/core/trunk/src/java/org/apache/turbine/util/uri/URIParam.java (original) +++ turbine/core/trunk/src/java/org/apache/turbine/util/uri/URIParam.java Wed Oct 24 21:47:54 2018 @@ -21,7 +21,7 @@ package org.apache.turbine.util.uri; */ -import org.apache.commons.lang.StringUtils; +import org.apache.commons.lang3.StringUtils; /** * Helper Class to keep a key and a value together in Modified: turbine/core/trunk/src/java/org/apache/turbine/util/velocity/VelocityEmail.java URL: http://svn.apache.org/viewvc/turbine/core/trunk/src/java/org/apache/turbine/util/velocity/VelocityEmail.java?rev=1844792&r1=1844791&r2=1844792&view=diff ============================================================================== --- turbine/core/trunk/src/java/org/apache/turbine/util/velocity/VelocityEmail.java (original) +++ turbine/core/trunk/src/java/org/apache/turbine/util/velocity/VelocityEmail.java Wed Oct 24 21:47:54 2018 @@ -20,8 +20,8 @@ package org.apache.turbine.util.velocity * under the License. */ -import org.apache.commons.lang.StringUtils; -import org.apache.commons.lang.WordUtils; +import org.apache.commons.lang3.StringUtils; +import org.apache.commons.lang3.text.WordUtils; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; import org.apache.commons.mail.EmailException; Modified: turbine/core/trunk/src/java/org/apache/turbine/util/velocity/VelocityHtmlEmail.java URL: http://svn.apache.org/viewvc/turbine/core/trunk/src/java/org/apache/turbine/util/velocity/VelocityHtmlEmail.java?rev=1844792&r1=1844791&r2=1844792&view=diff ============================================================================== --- turbine/core/trunk/src/java/org/apache/turbine/util/velocity/VelocityHtmlEmail.java (original) +++ turbine/core/trunk/src/java/org/apache/turbine/util/velocity/VelocityHtmlEmail.java Wed Oct 24 21:47:54 2018 @@ -24,7 +24,7 @@ package org.apache.turbine.util.velocity import java.net.URL; import java.util.Hashtable; -import org.apache.commons.lang.StringUtils; +import org.apache.commons.lang3.StringUtils; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; import org.apache.commons.mail.EmailException; Modified: turbine/core/trunk/src/test/org/apache/turbine/services/pull/tools/UIToolTest.java URL: http://svn.apache.org/viewvc/turbine/core/trunk/src/test/org/apache/turbine/services/pull/tools/UIToolTest.java?rev=1844792&r1=1844791&r2=1844792&view=diff ============================================================================== --- turbine/core/trunk/src/test/org/apache/turbine/services/pull/tools/UIToolTest.java (original) +++ turbine/core/trunk/src/test/org/apache/turbine/services/pull/tools/UIToolTest.java Wed Oct 24 21:47:54 2018 @@ -26,7 +26,7 @@ import static org.junit.Assert.assertTru import java.util.HashMap; import java.util.Map; -import org.apache.commons.lang.ArrayUtils; +import org.apache.commons.lang3.ArrayUtils; import org.apache.turbine.TurbineConstants; import org.apache.turbine.services.TurbineServices; import org.apache.turbine.services.jsonrpc.JsonrpcServicelTest; Modified: turbine/core/trunk/src/test/org/apache/turbine/test/HsqlDB.java URL: http://svn.apache.org/viewvc/turbine/core/trunk/src/test/org/apache/turbine/test/HsqlDB.java?rev=1844792&r1=1844791&r2=1844792&view=diff ============================================================================== --- turbine/core/trunk/src/test/org/apache/turbine/test/HsqlDB.java (original) +++ turbine/core/trunk/src/test/org/apache/turbine/test/HsqlDB.java Wed Oct 24 21:47:54 2018 @@ -25,7 +25,7 @@ import java.sql.DriverManager; import java.sql.SQLException; import java.sql.Statement; -import org.apache.commons.lang.StringUtils; +import org.apache.commons.lang3.StringUtils; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; import org.hsqldb.jdbcDriver;