October 2010 - jbossweb-commits - Jboss List Archives

JBossWeb SVN: r1571 - trunk/java/org/apache/catalina/core.

by jbossweb-commits＠lists.jboss.org

Author: remy.maucherat(a)jboss.com Date: 2010-10-28 13:00:24 -0400 (Thu, 28 Oct 2010) New Revision: 1571 Modified: trunk/java/org/apache/catalina/core/StandardHost.java Log: - Don't default to ContextConfig. Modified: trunk/java/org/apache/catalina/core/StandardHost.java =================================================================== --- trunk/java/org/apache/catalina/core/StandardHost.java 2010-10-28 16:46:14 UTC (rev 1570) +++ trunk/java/org/apache/catalina/core/StandardHost.java 2010-10-28 17:00:24 UTC (rev 1571) @@ -89,7 +89,7 @@ * for deployed web applications. */ private String configClass = - System.getProperty("org.apache.catalina.core.StandardHost.configClass", "org.apache.catalina.startup.ContextConfig"); + System.getProperty("org.apache.catalina.core.StandardHost.configClass", null); /**

15 years

1
0
0 / 0

JBossWeb SVN: r1570 - in trunk: webapps/docs and 1 other directory.

by jbossweb-commits＠lists.jboss.org

Author: remy.maucherat(a)jboss.com Date: 2010-10-28 12:46:14 -0400 (Thu, 28 Oct 2010) New Revision: 1570 Modified: trunk/java/org/apache/catalina/authenticator/SingleSignOnEntry.java trunk/webapps/docs/changelog.xml Log: - JBAS-8571: Allow a Servlet 3 login to reauthenticate. Modified: trunk/java/org/apache/catalina/authenticator/SingleSignOnEntry.java =================================================================== --- trunk/java/org/apache/catalina/authenticator/SingleSignOnEntry.java 2010-10-28 16:28:22 UTC (rev 1569) +++ trunk/java/org/apache/catalina/authenticator/SingleSignOnEntry.java 2010-10-28 16:46:14 UTC (rev 1570) @@ -185,7 +185,8 @@ this.password = password; this.canReauthenticate = (HttpServletRequest.BASIC_AUTH.equals(authType) - || HttpServletRequest.FORM_AUTH.equals(authType)); + || HttpServletRequest.FORM_AUTH.equals(authType) + || Constants.LOGIN_METHOD.equals(authType)); } } Modified: trunk/webapps/docs/changelog.xml =================================================================== --- trunk/webapps/docs/changelog.xml 2010-10-28 16:28:22 UTC (rev 1569) +++ trunk/webapps/docs/changelog.xml 2010-10-28 16:46:14 UTC (rev 1570) @@ -17,6 +17,13 @@ <body> <section name="JBoss Web 3.0.0.Beta8 (remm)"> + <subsection name="Catalina"> + <changelog> + <fix> + <jboss-jira>JBAS-8571</jboss-jira>: Allow a Servlet 3.0 login to reauthenticate with SSO. (remm) + </fix> + </changelog> + </subsection> <subsection name="Jasper"> <changelog> <fix>

15 years

1
0
0 / 0

JBossWeb SVN: r1569 - in trunk: java/org/apache/jasper/compiler and 2 other directories.

by jbossweb-commits＠lists.jboss.org

Author: remy.maucherat(a)jboss.com Date: 2010-10-28 12:28:22 -0400 (Thu, 28 Oct 2010) New Revision: 1569 Modified: trunk/java/org/apache/catalina/core/StandardContext.java trunk/java/org/apache/jasper/compiler/JspDocumentParser.java trunk/java/org/apache/jasper/compiler/TagLibraryInfoImpl.java trunk/java/org/apache/jasper/resources/LocalStrings.properties trunk/webapps/docs/changelog.xml Log: - JBAS-8579: Should default to JSP for body content. - Cosmetic. Modified: trunk/java/org/apache/catalina/core/StandardContext.java =================================================================== --- trunk/java/org/apache/catalina/core/StandardContext.java 2010-10-27 07:58:42 UTC (rev 1568) +++ trunk/java/org/apache/catalina/core/StandardContext.java 2010-10-28 16:28:22 UTC (rev 1569) @@ -86,7 +86,6 @@ import org.apache.catalina.deploy.SessionCookie; import org.apache.catalina.deploy.jsp.TagLibraryInfo; import org.apache.catalina.session.StandardManager; -import org.apache.catalina.startup.ContextConfig; import org.apache.catalina.util.CharsetMapper; import org.apache.catalina.util.ExtensionValidator; import org.apache.catalina.util.RequestUtil; Modified: trunk/java/org/apache/jasper/compiler/JspDocumentParser.java =================================================================== --- trunk/java/org/apache/jasper/compiler/JspDocumentParser.java 2010-10-27 07:58:42 UTC (rev 1568) +++ trunk/java/org/apache/jasper/compiler/JspDocumentParser.java 2010-10-28 16:28:22 UTC (rev 1569) @@ -793,7 +793,7 @@ taglibInfo = getTaglibInfo(prefix, uri); } catch (JasperException je) { throw new SAXParseException( - Localizer.getMessage("jsp.error.could.not.add.taglibraries"), + Localizer.getMessage("jsp.error.could.not.add.taglibraries", je.getMessage()), locator, je); } Modified: trunk/java/org/apache/jasper/compiler/TagLibraryInfoImpl.java =================================================================== --- trunk/java/org/apache/jasper/compiler/TagLibraryInfoImpl.java 2010-10-27 07:58:42 UTC (rev 1568) +++ trunk/java/org/apache/jasper/compiler/TagLibraryInfoImpl.java 2010-10-28 16:28:22 UTC (rev 1569) @@ -301,8 +301,13 @@ e); } } - - return new TagInfo(tagInfo.getTagName(), tagInfo.getTagClassName(), tagInfo.getBodyContent(), + + String tagBodyContent = tagInfo.getBodyContent(); + if (tagBodyContent == null) { + tagBodyContent = TagInfo.BODY_CONTENT_JSP; + } + + return new TagInfo(tagInfo.getTagName(), tagInfo.getTagClassName(), tagBodyContent, tagInfo.getInfoString(), this, tei, attributeInfos.toArray(new TagAttributeInfo[0]), tagInfo.getDisplayName(), tagInfo.getSmallIcon(), tagInfo.getLargeIcon(), variableInfos.toArray(new TagVariableInfo[0]), dynamicAttributes); Modified: trunk/java/org/apache/jasper/resources/LocalStrings.properties =================================================================== --- trunk/java/org/apache/jasper/resources/LocalStrings.properties 2010-10-27 07:58:42 UTC (rev 1568) +++ trunk/java/org/apache/jasper/resources/LocalStrings.properties 2010-10-28 16:28:22 UTC (rev 1569) @@ -344,7 +344,7 @@ jsp.error.coerce_to_type=Cannot coerce value ({2}) to type ({1}) for attribute {0}. jsp.error.jspelement.missing.name=Mandatory XML-style \'name\' attribute missing jsp.error.xmlns.redefinition.notimplemented=Internal error: Attempt to redefine xmlns:{0}. Redefinition of namespaces is not implemented. -jsp.error.could.not.add.taglibraries=Could not add one or more tag libraries. +jsp.error.could.not.add.taglibraries=Could not add one or more tag libraries: {0} jsp.error.duplicate.name.jspattribute=The attribute {0} specified in the standard or custom action also appears as the value of the name attribute in the enclosed jsp:attribute jsp.error.not.in.template={0} not allowed in a template text body. jsp.error.badStandardAction=Invalid standard action Modified: trunk/webapps/docs/changelog.xml =================================================================== --- trunk/webapps/docs/changelog.xml 2010-10-27 07:58:42 UTC (rev 1568) +++ trunk/webapps/docs/changelog.xml 2010-10-28 16:28:22 UTC (rev 1569) @@ -16,6 +16,16 @@ <body> +<section name="JBoss Web 3.0.0.Beta8 (remm)"> + <subsection name="Jasper"> + <changelog> + <fix> + <jboss-jira>JBAS-8579</jboss-jira>: Fix default for tag body content. (remm) + </fix> + </changelog> + </subsection> +</section> + <section name="JBoss Web 3.0.0.Beta7 (remm)"> <subsection name="Genral"> <changelog>

15 years

1
0
0 / 0

JBossWeb SVN: r1568 - trunk/java/org/apache/jasper/compiler.

by jbossweb-commits＠lists.jboss.org

Author: remy.maucherat(a)jboss.com Date: 2010-10-27 03:58:42 -0400 (Wed, 27 Oct 2010) New Revision: 1568 Modified: trunk/java/org/apache/jasper/compiler/TagFileProcessor.java Log: - ... Modified: trunk/java/org/apache/jasper/compiler/TagFileProcessor.java =================================================================== --- trunk/java/org/apache/jasper/compiler/TagFileProcessor.java 2010-10-26 13:38:08 UTC (rev 1567) +++ trunk/java/org/apache/jasper/compiler/TagFileProcessor.java 2010-10-27 07:58:42 UTC (rev 1568) @@ -21,7 +21,6 @@ import java.io.IOException; import java.net.MalformedURLException; import java.net.URL; -import java.net.URLClassLoader; import java.util.HashMap; import java.util.Iterator; import java.util.List; @@ -596,8 +595,7 @@ rctxt.addWrapper(tagFileJarPath + tagFilePath, wrapper); // Use same classloader and classpath for compiling tag files - wrapper.getJspEngineContext().setClassLoader( - (URLClassLoader) ctxt.getClassLoader()); + wrapper.getJspEngineContext().setClassLoader(ctxt.getClassLoader()); wrapper.getJspEngineContext().setClassPath(ctxt.getClassPath()); } else { // Make sure that JspCompilationContext gets the latest TagInfo

15 years

1
0
0 / 0

JBossWeb SVN: r1567 - trunk/java/org/apache/catalina/core.

by jbossweb-commits＠lists.jboss.org

Author: remy.maucherat(a)jboss.com Date: 2010-10-26 09:38:08 -0400 (Tue, 26 Oct 2010) New Revision: 1567 Modified: trunk/java/org/apache/catalina/core/StandardContext.java Log: - Add a system property for the cross context default. Modified: trunk/java/org/apache/catalina/core/StandardContext.java =================================================================== --- trunk/java/org/apache/catalina/core/StandardContext.java 2010-10-26 13:37:40 UTC (rev 1566) +++ trunk/java/org/apache/catalina/core/StandardContext.java 2010-10-26 13:38:08 UTC (rev 1567) @@ -310,7 +310,8 @@ * Should we allow the <code>ServletContext.getContext()</code> method * to access the context of other web applications in this server? */ - protected boolean crossContext = false; + protected boolean crossContext = + Boolean.valueOf(System.getProperty("org.apache.catalina.core.StandardContext.CROSS_CONTEXT", "false")).booleanValue(); /** @@ -4716,14 +4717,14 @@ if (configClassName != null) { Class clazz = Class.forName(configClassName); config = (LifecycleListener) clazz.newInstance(); - } else { - config = new ContextConfig(); } } catch (Exception e) { log.warn("Error creating ContextConfig for " + parentName, e); throw e; } - this.addLifecycleListener(config); + if (config != null) { + this.addLifecycleListener(config); + } if (log.isDebugEnabled()) { log.debug("AddChild " + parentName + " " + this);

15 years

1
0
0 / 0

JBossWeb SVN: r1566 - trunk/java/org/apache/tomcat/util/http.

by jbossweb-commits＠lists.jboss.org

Author: remy.maucherat(a)jboss.com Date: 2010-10-26 09:37:40 -0400 (Tue, 26 Oct 2010) New Revision: 1566 Modified: trunk/java/org/apache/tomcat/util/http/FastHttpDateFormat.java Log: - Port patch, supposedly improving sync. Modified: trunk/java/org/apache/tomcat/util/http/FastHttpDateFormat.java =================================================================== --- trunk/java/org/apache/tomcat/util/http/FastHttpDateFormat.java 2010-10-25 08:24:25 UTC (rev 1565) +++ trunk/java/org/apache/tomcat/util/http/FastHttpDateFormat.java 2010-10-26 13:37:40 UTC (rev 1566) @@ -36,28 +36,28 @@ // -------------------------------------------------------------- Variables - protected static final int CACHE_SIZE = + private static final int CACHE_SIZE = Integer.parseInt(System.getProperty("org.apache.tomcat.util.http.FastHttpDateFormat.CACHE_SIZE", "1000")); /** * HTTP date format. */ - protected static final SimpleDateFormat format = + private static final SimpleDateFormat format = new SimpleDateFormat("EEE, dd MMM yyyy HH:mm:ss zzz", Locale.US); /** * The set of SimpleDateFormat formats to use in getDateHeader(). */ - protected static final SimpleDateFormat formats[] = { + private static final SimpleDateFormat formats[] = { new SimpleDateFormat("EEE, dd MMM yyyy HH:mm:ss zzz", Locale.US), new SimpleDateFormat("EEEEEE, dd-MMM-yy HH:mm:ss zzz", Locale.US), new SimpleDateFormat("EEE MMMM d HH:mm:ss yyyy", Locale.US) }; - protected final static TimeZone gmtZone = TimeZone.getTimeZone("GMT"); + private final static TimeZone gmtZone = TimeZone.getTimeZone("GMT"); /** @@ -77,26 +77,26 @@ /** * Instant on which the currentDate object was generated. */ - protected static long currentDateGenerated = 0L; + private static long currentDateGenerated = 0L; /** * Current formatted date. */ - protected static String currentDate = null; + private static String currentDate = null; /** * Formatter cache. */ - protected static final ConcurrentHashMap<Long, String> formatCache = + private static final ConcurrentHashMap<Long, String> formatCache = new ConcurrentHashMap<Long, String>(CACHE_SIZE); /** * Parser cache. */ - protected static final ConcurrentHashMap<String, Long> parseCache = + private static final ConcurrentHashMap<String, Long> parseCache = new ConcurrentHashMap<String, Long>(CACHE_SIZE); @@ -112,8 +112,8 @@ if ((now - currentDateGenerated) > 1000) { synchronized (format) { if ((now - currentDateGenerated) > 1000) { + currentDate = format.format(new Date(now)); currentDateGenerated = now; - currentDate = format.format(new Date(now)); } } }

15 years

1
0
0 / 0

JBossWeb SVN: r1565 - trunk/java/org/apache/catalina/connector.

by jbossweb-commits＠lists.jboss.org

Author: remy.maucherat(a)jboss.com Date: 2010-10-25 04:24:25 -0400 (Mon, 25 Oct 2010) New Revision: 1565 Modified: trunk/java/org/apache/catalina/connector/Request.java Log: - JBWEB-187: Avoid NPE since the "flag" is set too late. Modified: trunk/java/org/apache/catalina/connector/Request.java =================================================================== --- trunk/java/org/apache/catalina/connector/Request.java 2010-10-19 11:59:15 UTC (rev 1564) +++ trunk/java/org/apache/catalina/connector/Request.java 2010-10-25 08:24:25 UTC (rev 1565) @@ -57,6 +57,7 @@ import java.text.SimpleDateFormat; import java.util.ArrayList; import java.util.Collection; +import java.util.Collections; import java.util.Enumeration; import java.util.HashMap; import java.util.Iterator; @@ -2874,6 +2875,8 @@ protected void parseMultipart() throws IOException, ServletException { + parts = Collections.emptyMap(); + if (context == null) return;

15 years

1
0
0 / 0

JBossWeb SVN: r1564 - trunk/java/org/apache/catalina/core.

by jbossweb-commits＠lists.jboss.org

Author: remy.maucherat(a)jboss.com Date: 2010-10-19 07:59:15 -0400 (Tue, 19 Oct 2010) New Revision: 1564 Modified: trunk/java/org/apache/catalina/core/ServiceMapperListener.java Log: - Dynamic host add/remove was not working so well ... Modified: trunk/java/org/apache/catalina/core/ServiceMapperListener.java =================================================================== --- trunk/java/org/apache/catalina/core/ServiceMapperListener.java 2010-09-29 19:42:12 UTC (rev 1563) +++ trunk/java/org/apache/catalina/core/ServiceMapperListener.java 2010-10-19 11:59:15 UTC (rev 1564) @@ -79,8 +79,8 @@ } } else if (container instanceof Engine) { // Deploying a host - container.addContainerListener(this); Host host = (Host) event.getData(); + host.addContainerListener(this); mapper.addHost(host.getName(), host.findAliases(), host); } } else if (type.equals(Container.REMOVE_CHILD_EVENT)) { @@ -91,8 +91,8 @@ mapper.removeContext(container.getName(), context.getName()); } else if (container instanceof Engine) { // Undeploying a host - container.removeContainerListener(this); Host host = (Host) event.getData(); + host.removeContainerListener(this); mapper.removeHost(host.getName()); } } else if (type == Host.ADD_ALIAS_EVENT) {

15 years

1
0
0 / 0

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

jbossweb-commits October 2010