January 2008 - jbossweb-commits - Jboss List Archives

by jbossweb-commits＠lists.jboss.org

Author: remy.maucherat(a)jboss.com Date: 2008-01-31 09:42:53 -0500 (Thu, 31 Jan 2008) New Revision: 415 Modified: trunk/build.xml Log: - Remove duplication of PHP classes. Modified: trunk/build.xml =================================================================== --- trunk/build.xml 2008-01-31 14:36:54 UTC (rev 414) +++ trunk/build.xml 2008-01-31 14:42:53 UTC (rev 415) @@ -208,6 +208,7 @@ <include name="org/apache/naming/**" /> <include name="org/jboss/web/**" /… [View More]

17 years, 1 month

1
0
0 / 0

JBossWeb SVN: r414 - in trunk: java/org/apache/catalina and 6 other directories.

by jbossweb-commits＠lists.jboss.org

Author: remy.maucherat(a)jboss.com Date: 2008-01-31 09:36:54 -0500 (Thu, 31 Jan 2008) New Revision: 414 Added: trunk/java/org/jboss/web/comet/ Removed: trunk/java/org/apache/comet/ Modified: trunk/java/org/apache/catalina/Valve.java trunk/java/org/apache/catalina/connector/CometEventImpl.java trunk/java/org/apache/catalina/connector/CoyoteAdapter.java trunk/java/org/apache/catalina/core/ApplicationFilterChain.java trunk/java/org/apache/catalina/core/… [View More]ApplicationFilterFactory.java trunk/java/org/apache/catalina/core/StandardContextValve.java trunk/java/org/apache/catalina/core/StandardEngineValve.java trunk/java/org/apache/catalina/core/StandardHostValve.java trunk/java/org/apache/catalina/core/StandardWrapperValve.java trunk/java/org/apache/catalina/valves/CometConnectionManagerValve.java trunk/java/org/apache/catalina/valves/ValveBase.java trunk/java/org/jboss/web/comet/CometEvent.java trunk/java/org/jboss/web/comet/CometFilter.java trunk/java/org/jboss/web/comet/CometFilterChain.java trunk/java/org/jboss/web/comet/CometProcessor.java trunk/webapps/docs/changelog.xml Log: - As the API and functionality is a bit different from the Tomcat version, I think it is more appropriate to move to a different package, at least for now. Modified: trunk/java/org/apache/catalina/Valve.java =================================================================== --- trunk/java/org/apache/catalina/Valve.java 2008-01-31 11:50:48 UTC (rev 413) +++ trunk/java/org/apache/catalina/Valve.java 2008-01-31 14:36:54 UTC (rev 414) @@ -24,7 +24,7 @@ import org.apache.catalina.connector.Request; import org.apache.catalina.connector.Response; -import org.apache.comet.CometEvent; +import org.jboss.web.comet.CometEvent; /** Modified: trunk/java/org/apache/catalina/connector/CometEventImpl.java =================================================================== --- trunk/java/org/apache/catalina/connector/CometEventImpl.java 2008-01-31 11:50:48 UTC (rev 413) +++ trunk/java/org/apache/catalina/connector/CometEventImpl.java 2008-01-31 14:36:54 UTC (rev 414) @@ -24,7 +24,7 @@ import javax.servlet.http.HttpServletResponse; import org.apache.catalina.util.StringManager; -import org.apache.comet.CometEvent; +import org.jboss.web.comet.CometEvent; public class CometEventImpl implements CometEvent { Modified: trunk/java/org/apache/catalina/connector/CoyoteAdapter.java =================================================================== --- trunk/java/org/apache/catalina/connector/CoyoteAdapter.java 2008-01-31 11:50:48 UTC (rev 413) +++ trunk/java/org/apache/catalina/connector/CoyoteAdapter.java 2008-01-31 14:36:54 UTC (rev 414) @@ -25,7 +25,6 @@ import org.apache.catalina.Wrapper; import org.apache.catalina.util.StringManager; import org.apache.catalina.util.URLEncoder; -import org.apache.comet.CometEvent; import org.apache.coyote.ActionCode; import org.apache.coyote.Adapter; import org.apache.tomcat.util.buf.B2CConverter; @@ -36,6 +35,7 @@ import org.apache.tomcat.util.http.ServerCookie; import org.apache.tomcat.util.net.SocketStatus; import org.jboss.logging.Logger; +import org.jboss.web.comet.CometEvent; /** Modified: trunk/java/org/apache/catalina/core/ApplicationFilterChain.java =================================================================== --- trunk/java/org/apache/catalina/core/ApplicationFilterChain.java 2008-01-31 11:50:48 UTC (rev 413) +++ trunk/java/org/apache/catalina/core/ApplicationFilterChain.java 2008-01-31 14:36:54 UTC (rev 414) @@ -37,10 +37,10 @@ import org.apache.catalina.security.SecurityUtil; import org.apache.catalina.util.InstanceSupport; import org.apache.catalina.util.StringManager; -import org.apache.comet.CometEvent; -import org.apache.comet.CometFilter; -import org.apache.comet.CometFilterChain; -import org.apache.comet.CometProcessor; +import org.jboss.web.comet.CometEvent; +import org.jboss.web.comet.CometFilter; +import org.jboss.web.comet.CometFilterChain; +import org.jboss.web.comet.CometProcessor; /** * Implementation of <code>javax.servlet.FilterChain</code> used to manage Modified: trunk/java/org/apache/catalina/core/ApplicationFilterFactory.java =================================================================== --- trunk/java/org/apache/catalina/core/ApplicationFilterFactory.java 2008-01-31 11:50:48 UTC (rev 413) +++ trunk/java/org/apache/catalina/core/ApplicationFilterFactory.java 2008-01-31 14:36:54 UTC (rev 414) @@ -27,7 +27,7 @@ import org.apache.catalina.Wrapper; import org.apache.catalina.connector.Request; import org.apache.catalina.deploy.FilterMap; -import org.apache.comet.CometFilter; +import org.jboss.web.comet.CometFilter; /** * Factory for the creation and caching of Filters and creationg Modified: trunk/java/org/apache/catalina/core/StandardContextValve.java =================================================================== --- trunk/java/org/apache/catalina/core/StandardContextValve.java 2008-01-31 11:50:48 UTC (rev 413) +++ trunk/java/org/apache/catalina/core/StandardContextValve.java 2008-01-31 14:36:54 UTC (rev 414) @@ -34,8 +34,8 @@ import org.apache.catalina.connector.Response; import org.apache.catalina.util.StringManager; import org.apache.catalina.valves.ValveBase; -import org.apache.comet.CometEvent; import org.apache.tomcat.util.buf.MessageBytes; +import org.jboss.web.comet.CometEvent; /** * Valve that implements the default basic behavior for the Modified: trunk/java/org/apache/catalina/core/StandardEngineValve.java =================================================================== --- trunk/java/org/apache/catalina/core/StandardEngineValve.java 2008-01-31 11:50:48 UTC (rev 413) +++ trunk/java/org/apache/catalina/core/StandardEngineValve.java 2008-01-31 14:36:54 UTC (rev 414) @@ -29,7 +29,7 @@ import org.apache.catalina.connector.Response; import org.apache.catalina.util.StringManager; import org.apache.catalina.valves.ValveBase; -import org.apache.comet.CometEvent; +import org.jboss.web.comet.CometEvent; /** Modified: trunk/java/org/apache/catalina/core/StandardHostValve.java =================================================================== --- trunk/java/org/apache/catalina/core/StandardHostValve.java 2008-01-31 11:50:48 UTC (rev 413) +++ trunk/java/org/apache/catalina/core/StandardHostValve.java 2008-01-31 14:36:54 UTC (rev 414) @@ -36,8 +36,8 @@ import org.apache.catalina.util.RequestUtil; import org.apache.catalina.util.StringManager; import org.apache.catalina.valves.ValveBase; -import org.apache.comet.CometEvent; import org.jboss.logging.Logger; +import org.jboss.web.comet.CometEvent; /** Modified: trunk/java/org/apache/catalina/core/StandardWrapperValve.java =================================================================== --- trunk/java/org/apache/catalina/core/StandardWrapperValve.java 2008-01-31 11:50:48 UTC (rev 413) +++ trunk/java/org/apache/catalina/core/StandardWrapperValve.java 2008-01-31 14:36:54 UTC (rev 414) @@ -35,10 +35,10 @@ import org.apache.catalina.connector.Response; import org.apache.catalina.util.StringManager; import org.apache.catalina.valves.ValveBase; -import org.apache.comet.CometEvent; -import org.apache.comet.CometProcessor; import org.apache.tomcat.util.buf.MessageBytes; import org.apache.tomcat.util.log.SystemLogHandler; +import org.jboss.web.comet.CometEvent; +import org.jboss.web.comet.CometProcessor; /** * Valve that implements the default basic behavior for the Modified: trunk/java/org/apache/catalina/valves/CometConnectionManagerValve.java =================================================================== --- trunk/java/org/apache/catalina/valves/CometConnectionManagerValve.java 2008-01-31 11:50:48 UTC (rev 413) +++ trunk/java/org/apache/catalina/valves/CometConnectionManagerValve.java 2008-01-31 14:36:54 UTC (rev 414) @@ -38,7 +38,7 @@ import org.apache.catalina.connector.Response; import org.apache.catalina.util.LifecycleSupport; import org.apache.catalina.util.StringManager; -import org.apache.comet.CometEvent; +import org.jboss.web.comet.CometEvent; /** Modified: trunk/java/org/apache/catalina/valves/ValveBase.java =================================================================== --- trunk/java/org/apache/catalina/valves/ValveBase.java 2008-01-31 11:50:48 UTC (rev 413) +++ trunk/java/org/apache/catalina/valves/ValveBase.java 2008-01-31 14:36:54 UTC (rev 414) @@ -39,8 +39,8 @@ import org.apache.catalina.connector.Response; import org.apache.catalina.core.ContainerBase; import org.apache.catalina.util.StringManager; -import org.apache.comet.CometEvent; import org.jboss.logging.Logger; +import org.jboss.web.comet.CometEvent; /** Copied: trunk/java/org/jboss/web/comet (from rev 413, trunk/java/org/apache/comet) Modified: trunk/java/org/jboss/web/comet/CometEvent.java =================================================================== --- trunk/java/org/apache/comet/CometEvent.java 2008-01-31 11:50:48 UTC (rev 413) +++ trunk/java/org/jboss/web/comet/CometEvent.java 2008-01-31 14:36:54 UTC (rev 414) @@ -16,7 +16,7 @@ */ -package org.apache.comet; +package org.jboss.web.comet; import java.io.IOException; Modified: trunk/java/org/jboss/web/comet/CometFilter.java =================================================================== --- trunk/java/org/apache/comet/CometFilter.java 2008-01-31 11:50:48 UTC (rev 413) +++ trunk/java/org/jboss/web/comet/CometFilter.java 2008-01-31 14:36:54 UTC (rev 414) @@ -16,7 +16,7 @@ */ -package org.apache.comet; +package org.jboss.web.comet; import java.io.IOException; Modified: trunk/java/org/jboss/web/comet/CometFilterChain.java =================================================================== --- trunk/java/org/apache/comet/CometFilterChain.java 2008-01-31 11:50:48 UTC (rev 413) +++ trunk/java/org/jboss/web/comet/CometFilterChain.java 2008-01-31 14:36:54 UTC (rev 414) @@ -16,7 +16,7 @@ */ -package org.apache.comet; +package org.jboss.web.comet; import java.io.IOException; Modified: trunk/java/org/jboss/web/comet/CometProcessor.java =================================================================== --- trunk/java/org/apache/comet/CometProcessor.java 2008-01-31 11:50:48 UTC (rev 413) +++ trunk/java/org/jboss/web/comet/CometProcessor.java 2008-01-31 14:36:54 UTC (rev 414) @@ -16,7 +16,7 @@ */ -package org.apache.comet; +package org.jboss.web.comet; import java.io.IOException; Modified: trunk/webapps/docs/changelog.xml =================================================================== --- trunk/webapps/docs/changelog.xml 2008-01-31 11:50:48 UTC (rev 413) +++ trunk/webapps/docs/changelog.xml 2008-01-31 14:36:54 UTC (rev 414) @@ -56,10 +56,10 @@ <update> Add context listener configuration. (remm) </update> + <add> + Expanded and revised Tomcat 6.0 Comet API as org.jboss.web.comet API. (remm) + </add> <update> - Expanded Comet API as org.apache.comet API. (remm) - </update> - <update> Remove user database functionality, which didn't see any development besides the original memory based backend introduced in Tomcat 4.1. Also remove associated roles management features. (remm) [View Less]

17 years, 1 month

1
0
0 / 0

JBossWeb SVN: r413 - trunk/java/org/apache/comet.

by jbossweb-commits＠lists.jboss.org

Author: remy.maucherat(a)jboss.com Date: 2008-01-31 06:50:48 -0500 (Thu, 31 Jan 2008) New Revision: 413 Modified: trunk/java/org/apache/comet/CometEvent.java Log: - Some javadocs clarifications on END. Modified: trunk/java/org/apache/comet/CometEvent.java =================================================================== --- trunk/java/org/apache/comet/CometEvent.java 2008-01-31 11:44:51 UTC (rev 412) +++ trunk/java/org/apache/comet/CometEvent.java 2008-01-31 11:50:48 UTC (rev 413) @@ -59,… [View More]

17 years, 1 month

1
0
0 / 0

JBossWeb SVN: r412 - in trunk/java/org/apache: catalina/valves and 1 other directories.

by jbossweb-commits＠lists.jboss.org

Author: remy.maucherat(a)jboss.com Date: 2008-01-31 06:44:51 -0500 (Thu, 31 Jan 2008) New Revision: 412 Modified: trunk/java/org/apache/catalina/connector/CometEventImpl.java trunk/java/org/apache/catalina/connector/CoyoteAdapter.java trunk/java/org/apache/catalina/valves/CometConnectionManagerValve.java trunk/java/org/apache/comet/CometEvent.java Log: - Get rid of event subtype. This removes the need to separate TIMEOUT from the other ERROR types. Also removes the different … [View More]sorts of END events, which are quite pointless. Modified: trunk/java/org/apache/catalina/connector/CometEventImpl.java =================================================================== --- trunk/java/org/apache/catalina/connector/CometEventImpl.java 2008-01-31 07:30:52 UTC (rev 411) +++ trunk/java/org/apache/catalina/connector/CometEventImpl.java 2008-01-31 11:44:51 UTC (rev 412) @@ -62,11 +62,6 @@ protected EventType eventType = EventType.BEGIN; - /** - * Event sub type. - */ - protected EventSubType eventSubType = null; - // --------------------------------------------------------- Public Methods /** @@ -77,14 +72,10 @@ response = null; } - public void setEventType(EventType eventType) { + public void setType(EventType eventType) { this.eventType = eventType; } - public void setEventSubType(EventSubType eventSubType) { - this.eventSubType = eventSubType; - } - public void close() throws IOException { if (request == null) { throw new IllegalStateException(sm.getString("cometEvent.nullRequest")); @@ -93,11 +84,7 @@ response.finishResponse(); } - public EventSubType getEventSubType() { - return eventSubType; - } - - public EventType getEventType() { + public EventType getType() { return eventType; } @@ -129,9 +116,7 @@ StringBuffer buf = new StringBuffer("CometEventImpl["); buf.append(super.toString()); buf.append("] Event:"); - buf.append(getEventType()); - buf.append(" SubType:"); - buf.append(getEventSubType()); + buf.append(getType()); return buf.toString(); } Modified: trunk/java/org/apache/catalina/connector/CoyoteAdapter.java =================================================================== --- trunk/java/org/apache/catalina/connector/CoyoteAdapter.java 2008-01-31 07:30:52 UTC (rev 411) +++ trunk/java/org/apache/catalina/connector/CoyoteAdapter.java 2008-01-31 11:44:51 UTC (rev 412) @@ -146,8 +146,7 @@ if (response.isClosed()) { // The event has been closed asynchronously, so call end instead of // read to cleanup the pipeline - request.getEvent().setEventType(CometEvent.EventType.END); - request.getEvent().setEventSubType(null); + request.getEvent().setType(CometEvent.EventType.END); } else { try { // Fill the read buffer of the servlet layer @@ -158,11 +157,9 @@ error = true; } if (read) { - request.getEvent().setEventType(CometEvent.EventType.READ); - request.getEvent().setEventSubType(null); + request.getEvent().setType(CometEvent.EventType.READ); } else if (error) { - request.getEvent().setEventType(CometEvent.EventType.ERROR); - request.getEvent().setEventSubType(CometEvent.EventSubType.CLIENT_DISCONNECT); + request.getEvent().setType(CometEvent.EventType.ERROR); } else { // Data was present on the socket, but it did not translate into actual // entity body bytes @@ -173,42 +170,33 @@ if (response.isClosed()) { // The event has been closed asynchronously, so call end instead of // read to cleanup the pipeline - request.getEvent().setEventType(CometEvent.EventType.END); - request.getEvent().setEventSubType(null); + request.getEvent().setType(CometEvent.EventType.END); } else { - request.getEvent().setEventType(CometEvent.EventType.WRITE); - request.getEvent().setEventSubType(null); + request.getEvent().setType(CometEvent.EventType.WRITE); } } else if (status == SocketStatus.OPEN_CALLBACK) { if (response.isClosed()) { // The event has been closed asynchronously, so call end instead of // read to cleanup the pipeline - request.getEvent().setEventType(CometEvent.EventType.END); - request.getEvent().setEventSubType(null); + request.getEvent().setType(CometEvent.EventType.END); } else { - request.getEvent().setEventType(CometEvent.EventType.EVENT); - request.getEvent().setEventSubType(null); + request.getEvent().setType(CometEvent.EventType.EVENT); } } else if (status == SocketStatus.DISCONNECT) { - request.getEvent().setEventType(CometEvent.EventType.ERROR); - request.getEvent().setEventSubType(CometEvent.EventSubType.CLIENT_DISCONNECT); + request.getEvent().setType(CometEvent.EventType.ERROR); error = true; } else if (status == SocketStatus.ERROR) { - request.getEvent().setEventType(CometEvent.EventType.ERROR); - request.getEvent().setEventSubType(CometEvent.EventSubType.IOEXCEPTION); + request.getEvent().setType(CometEvent.EventType.ERROR); error = true; } else if (status == SocketStatus.STOP) { - request.getEvent().setEventType(CometEvent.EventType.END); - request.getEvent().setEventSubType(CometEvent.EventSubType.SERVER_SHUTDOWN); + request.getEvent().setType(CometEvent.EventType.END); } else if (status == SocketStatus.TIMEOUT) { if (response.isClosed()) { // The event has been closed asynchronously, so call end instead of // read to cleanup the pipeline - request.getEvent().setEventType(CometEvent.EventType.END); - request.getEvent().setEventSubType(null); + request.getEvent().setType(CometEvent.EventType.END); } else { - request.getEvent().setEventType(CometEvent.EventType.ERROR); - request.getEvent().setEventSubType(CometEvent.EventSubType.TIMEOUT); + request.getEvent().setType(CometEvent.EventType.TIMEOUT); } } @@ -220,8 +208,7 @@ if (!error && !response.isClosed() && (request.getAttribute(Globals.EXCEPTION_ATTR) != null)) { // An unexpected exception occurred while processing the event, so // error should be called - request.getEvent().setEventType(CometEvent.EventType.ERROR); - request.getEvent().setEventSubType(null); + request.getEvent().setType(CometEvent.EventType.ERROR); error = true; connector.getContainer().getPipeline().getFirst().event(request, response, request.getEvent()); } @@ -232,8 +219,7 @@ // If this was a read and not all bytes have been read, or if no data // was read from the connector, then it is an error log.error(sm.getString("coyoteAdapter.read")); - request.getEvent().setEventType(CometEvent.EventType.ERROR); - request.getEvent().setEventSubType(CometEvent.EventSubType.IOEXCEPTION); + request.getEvent().setType(CometEvent.EventType.ERROR); error = true; connector.getContainer().getPipeline().getFirst().event(request, response, request.getEvent()); } Modified: trunk/java/org/apache/catalina/valves/CometConnectionManagerValve.java =================================================================== --- trunk/java/org/apache/catalina/valves/CometConnectionManagerValve.java 2008-01-31 07:30:52 UTC (rev 411) +++ trunk/java/org/apache/catalina/valves/CometConnectionManagerValve.java 2008-01-31 11:44:51 UTC (rev 412) @@ -215,8 +215,7 @@ for (int i = 0; i < connectionInfos.length; i++) { ConnectionInfo connectionInfo = connectionInfos[i]; try { - ((CometEventImpl) connectionInfo.event).setEventType(CometEvent.EventType.END); - ((CometEventImpl) connectionInfo.event).setEventSubType(CometEvent.EventSubType.WEBAPP_RELOAD); + ((CometEventImpl) connectionInfo.event).setType(CometEvent.EventType.END); getNext().event(connectionInfo.request, connectionInfo.response, connectionInfo.event); connectionInfo.event.close(); } catch (Exception e) { @@ -304,9 +303,8 @@ ok = true; } finally { if (!ok || response.isClosed() - || (event.getEventType() == CometEvent.EventType.END) - || (event.getEventType() == CometEvent.EventType.ERROR - && !(event.getEventSubType() == CometEvent.EventSubType.TIMEOUT))) { + || (event.getType() == CometEvent.EventType.END) + || (event.getType() == CometEvent.EventType.ERROR)) { // Remove from tracked list, the connection is done HttpSession session = request.getSession(true); synchronized (session) { @@ -346,8 +344,7 @@ for (int i = 0; i < connectionInfos.length; i++) { ConnectionInfo connectionInfo = connectionInfos[i]; try { - ((CometEventImpl) connectionInfo.event).setEventType(CometEvent.EventType.END); - ((CometEventImpl) connectionInfo.event).setEventSubType(CometEvent.EventSubType.SESSION_END); + ((CometEventImpl) connectionInfo.event).setType(CometEvent.EventType.END); getNext().event(connectionInfo.request, connectionInfo.response, connectionInfo.event); connectionInfo.event.close(); } catch (Exception e) { Modified: trunk/java/org/apache/comet/CometEvent.java =================================================================== --- trunk/java/org/apache/comet/CometEvent.java 2008-01-31 07:30:52 UTC (rev 411) +++ trunk/java/org/apache/comet/CometEvent.java 2008-01-31 11:44:51 UTC (rev 412) @@ -65,6 +65,8 @@ * been initialized in the begin method should be reset. After this event has * been processed, the request and response objects, as well as all their dependent * objects will be recycled and used to process other requests.</li> + * <li>TIMEOUT - the connection timed out, but the connection will not be closed unless + * the servlet uses the close method of the event</li> * <li>EVENT - Event will be called by the container after the resume() method is called, * during which any operations can be performed, including closing the Comet connection * using the close() method.</li> @@ -74,30 +76,10 @@ * method always returns true.</li> * </ul> */ - public enum EventType {BEGIN, READ, END, ERROR, WRITE, EVENT} + public enum EventType { BEGIN, READ, END, TIMEOUT, ERROR, WRITE, EVENT } /** - * Enumeration containing event sub categories. - * <br> - * END events sub types: - * <ul> - * <li>WEBAPP_RELOAD - the web application is being reloaded</li> - * <li>SERVER_SHUTDOWN - the server is shutting down</li> - * <li>SESSION_END - the servlet ended the session</li> - * </ul> - * ERROR events sub types: - * <ul> - * <li>TIMEOUT - the connection timed out; note that this ERROR type is not fatal, and - * the connection will not be closed unless the servlet uses the close method of the event</li> - * <li>CLIENT_DISCONNECT - the client connection was closed</li> - * <li>IOEXCEPTION - an IO exception occurred, such as invalid content, for example, an invalid chunk block</li> - * </ul> - */ - public enum EventSubType { TIMEOUT, CLIENT_DISCONNECT, IOEXCEPTION, WEBAPP_RELOAD, SERVER_SHUTDOWN, SESSION_END } - - - /** * Returns the HttpServletRequest. * * @return HttpServletRequest @@ -117,24 +99,16 @@ * @return EventType * @see #EventType */ - public EventType getEventType(); + public EventType getType(); /** - * Returns the sub type of this event. - * - * @return EventSubType - * @see #EventSubType - */ - public EventSubType getEventSubType(); - - /** * Ends the request, which marks the end of the comet session. This will send * back to the client a notice that the server has no more data to send * as part of this request. If this method is called from a Tomcat provided thread * (during the processing of an event), the container will not call an END event. * If this method is called asynchronously, an END event will be sent to the * servlet (note that this event will be sent whenever another event would have - * been sent, such as a READ or ERROR/TIMEOUT event). + * been sent, such as a READ or TIMEOUT event). * * @throws IOException if an IO exception occurs */ @@ -143,7 +117,7 @@ /** * This method sets the timeout in milliseconds of idle time on the connection. * The timeout is reset every time data is received from the connection. If a timeout occurs, the - * servlet will receive an ERROR/TIMEOUT event which will not result in automatically closing + * servlet will receive an TIMEOUT event which will not result in automatically closing * the event (the event may be closed using the close() method). * * @param timeout The timeout in milliseconds for this connection, must be a positive value, larger than 0 [View Less]

17 years, 1 month

1
0
0 / 0

JBossWeb SVN: r411 - trunk/webapps/ROOT.

by jbossweb-commits＠lists.jboss.org

Author: mladen.turk(a)jboss.com Date: 2008-01-31 02:30:52 -0500 (Thu, 31 Jan 2008) New Revision: 411 Added: trunk/webapps/ROOT/jbossweblogo.gif Modified: trunk/webapps/ROOT/index.html trunk/webapps/ROOT/jboss_logo.gif Log: Use nicer images for default web page Modified: trunk/webapps/ROOT/index.html =================================================================== --- trunk/webapps/ROOT/index.html 2008-01-28 15:10:27 UTC (rev 410) +++ trunk/webapps/ROOT/index.html 2008-01-31 07:30:… [View More]

17 years, 1 month

1
0
0 / 0

JBossWeb SVN: r410 - in trunk: java/org/apache/tomcat/util/net/jsse and 1 other directories.

by jbossweb-commits＠lists.jboss.org

Author: remy.maucherat(a)jboss.com Date: 2008-01-28 10:10:27 -0500 (Mon, 28 Jan 2008) New Revision: 410 Modified: trunk/java/org/apache/catalina/core/LocalStrings.properties trunk/java/org/apache/catalina/core/StandardContext.java trunk/java/org/apache/tomcat/util/net/jsse/JSSESocketFactory.java trunk/webapps/docs/changelog.xml Log: - Minor fixes. Modified: trunk/java/org/apache/catalina/core/LocalStrings.properties ==================================================================… [View More]= --- trunk/java/org/apache/catalina/core/LocalStrings.properties 2008-01-28 10:40:31 UTC (rev 409) +++ trunk/java/org/apache/catalina/core/LocalStrings.properties 2008-01-28 15:10:27 UTC (rev 410) @@ -54,6 +54,7 @@ standardContext.applicationSkipped=Skipped installing application listeners due to previous error(s) standardContext.badRequest=Invalid request path ({0}). standardContext.crlfinurl=The URL pattern "{0}" contains a CR or LF and so can never be matched. +standardContext.duplicateListener=The listener "{0}" is already configured for this context. The duplicate definition has been ignored. standardContext.errorPage.error=Error page location {0} must start with a ''/'' standardContext.errorPage.required=ErrorPage cannot be null standardContext.errorPage.warning=WARNING: Error page location {0} must start with a ''/'' in Servlet 2.4 Modified: trunk/java/org/apache/catalina/core/StandardContext.java =================================================================== --- trunk/java/org/apache/catalina/core/StandardContext.java 2008-01-28 10:40:31 UTC (rev 409) +++ trunk/java/org/apache/catalina/core/StandardContext.java 2008-01-28 15:10:27 UTC (rev 410) @@ -1996,8 +1996,10 @@ synchronized (applicationListeners) { String results[] =new String[applicationListeners.length + 1]; for (int i = 0; i < applicationListeners.length; i++) { - if (listener.equals(applicationListeners[i])) + if (listener.equals(applicationListeners[i])) { + log.info(sm.getString("standardContext.duplicateListener", listener)); return; + } results[i] = applicationListeners[i]; } results[applicationListeners.length] = listener; Modified: trunk/java/org/apache/tomcat/util/net/jsse/JSSESocketFactory.java =================================================================== --- trunk/java/org/apache/tomcat/util/net/jsse/JSSESocketFactory.java 2008-01-28 10:40:31 UTC (rev 409) +++ trunk/java/org/apache/tomcat/util/net/jsse/JSSESocketFactory.java 2008-01-28 15:10:27 UTC (rev 410) @@ -283,6 +283,9 @@ log.debug("TrustPass = " + trustStorePassword); } String truststoreType = (String)attributes.get("truststoreType"); + if( truststoreType == null) { + truststoreType = System.getProperty("javax.net.ssl.trustStoreType"); + } if(truststoreType == null) { truststoreType = keystoreType; } Modified: trunk/webapps/docs/changelog.xml =================================================================== --- trunk/webapps/docs/changelog.xml 2008-01-28 10:40:31 UTC (rev 409) +++ trunk/webapps/docs/changelog.xml 2008-01-28 15:10:27 UTC (rev 410) @@ -143,6 +143,9 @@ <fix> Set correct StandardManager.sessionCounter after reload/restart. (pero) </fix> + <fix> + <bug>44268</bug>: Log a warning when a duplicate listener is ignored. (markt) + </fix> </changelog> </subsection> <subsection name="Coyote"> @@ -167,6 +170,9 @@ <fix> <bug>43868</bug>: MBean methods getInvoke() and getSetter() were broken. (markt) </fix> + <fix> + <bug>44223</bug>: Add support for remaining truststore system property. (markt) + </fix> </changelog> </subsection> <subsection name="Jasper"> [View Less]

17 years, 1 month

1
0
0 / 0

JBossWeb SVN: r409 - trunk/webapps/manager/WEB-INF.

by jbossweb-commits＠lists.jboss.org

Author: remy.maucherat(a)jboss.com Date: 2008-01-28 05:40:31 -0500 (Mon, 28 Jan 2008) New Revision: 409 Modified: trunk/webapps/manager/WEB-INF/web.xml Log: - Add missing web.xml mapping. Modified: trunk/webapps/manager/WEB-INF/web.xml =================================================================== --- trunk/webapps/manager/WEB-INF/web.xml 2008-01-23 16:34:36 UTC (rev 408) +++ trunk/webapps/manager/WEB-INF/web.xml 2008-01-28 10:40:31 UTC (rev 409) @@ -78,6 +78,10 @@ </servlet-… [View More]

17 years, 1 month

1
0
0 / 0

JBossWeb SVN: r408 - tags.

by jbossweb-commits＠lists.jboss.org

Author: remy.maucherat(a)jboss.com Date: 2008-01-23 11:34:36 -0500 (Wed, 23 Jan 2008) New Revision: 408 Added: tags/JBOSSWEB_2_1_0_CR12/ Log: - New CR (includes fixes + the Jasper CL modification). Copied: tags/JBOSSWEB_2_1_0_CR12 (from rev 407, trunk)

17 years, 2 months

1
0
0 / 0

JBossWeb SVN: r407 - trunk.

by jbossweb-commits＠lists.jboss.org

Author: remy.maucherat(a)jboss.com Date: 2008-01-23 11:24:02 -0500 (Wed, 23 Jan 2008) New Revision: 407 Modified: trunk/build.xml Log: - New deps path. Modified: trunk/build.xml =================================================================== --- trunk/build.xml 2008-01-22 15:30:40 UTC (rev 406) +++ trunk/build.xml 2008-01-23 16:24:02 UTC (rev 407) @@ -52,8 +52,8 @@ <property name="jasper.jar" value="${tomcat.build}/lib/jasper.jar"/> <property name="jasper-el.jar" value="$… [View More]

17 years, 2 months

1
0
0 / 0

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

by jbossweb-commits＠lists.jboss.org

Author: remy.maucherat(a)jboss.com Date: 2008-01-22 10:30:40 -0500 (Tue, 22 Jan 2008) New Revision: 406 Modified: trunk/java/org/apache/catalina/manager/LocalStrings.properties trunk/java/org/apache/catalina/manager/ManagerServlet.java trunk/webapps/docs/changelog.xml Log: Modified: trunk/java/org/apache/catalina/manager/LocalStrings.properties =================================================================== --- trunk/java/org/apache/catalina/manager/LocalStrings.properties 2008-… [View More]01-22 14:49:24 UTC (rev 405) +++ trunk/java/org/apache/catalina/manager/LocalStrings.properties 2008-01-22 15:30:40 UTC (rev 406) @@ -58,6 +58,7 @@ managerServlet.noDirectory=FAIL - Non-directory document base for path {0} managerServlet.noDocBase=FAIL - Cannot undeploy document base for path {0} managerServlet.noGlobal=FAIL - No global JNDI resources are available +managerServlet.noManager=FAIL - No manager exists for path {0} managerServlet.noReload=FAIL - Reload not supported on WAR deployed at path {0} managerServlet.noRename=FAIL - Cannot deploy uploaded WAR for path {0} managerServlet.noRole=FAIL - User does not possess role {0} Modified: trunk/java/org/apache/catalina/manager/ManagerServlet.java =================================================================== --- trunk/java/org/apache/catalina/manager/ManagerServlet.java 2008-01-22 14:49:24 UTC (rev 405) +++ trunk/java/org/apache/catalina/manager/ManagerServlet.java 2008-01-22 15:30:40 UTC (rev 406) @@ -44,6 +44,7 @@ import org.apache.catalina.Globals; import org.apache.catalina.Host; import org.apache.catalina.Lifecycle; +import org.apache.catalina.Manager; import org.apache.catalina.Server; import org.apache.catalina.ServerFactory; import org.apache.catalina.Session; @@ -1059,8 +1060,14 @@ RequestUtil.filter(displayPath))); return; } + Manager manager = context.getManager() ; + if (manager == null) { + writer.println(sm.getString("managerServlet.noManager", + RequestUtil.filter(displayPath))); + return; + } int maxCount = 60; - int maxInactiveInterval = context.getManager().getMaxInactiveInterval()/60; + int maxInactiveInterval = manager.getMaxInactiveInterval()/60; int histoInterval = maxInactiveInterval / maxCount; if ( histoInterval * maxCount < maxInactiveInterval ) histoInterval++; @@ -1071,13 +1078,13 @@ writer.println(sm.getString("managerServlet.sessions", displayPath)); writer.println(sm.getString("managerServlet.sessiondefaultmax", "" + maxInactiveInterval)); - Session [] sessions = context.getManager().findSessions(); + Session [] sessions = manager.findSessions(); int [] timeout = new int[maxCount]; int notimeout = 0; int expired = 0; long now = System.currentTimeMillis(); for (int i = 0; i < sessions.length; i++) { - int time = (int)((now-sessions[i].getLastAccessedTime())/1000); + int time = (int)((now-sessions[i].getLastAccessedTimeInternal())/1000); if (idle >= 0 && time >= idle*60) { sessions[i].expire(); idle++; Modified: trunk/webapps/docs/changelog.xml =================================================================== --- trunk/webapps/docs/changelog.xml 2008-01-22 14:49:24 UTC (rev 405) +++ trunk/webapps/docs/changelog.xml 2008-01-22 15:30:40 UTC (rev 406) @@ -224,6 +224,10 @@ problems when listing contexts. Patch provided by Lucas Galfaso. (markt) </fix> </changelog> + <fix> + Fix ManagerServlet.exipreSession throws Exceptions as iterate longer + session lists at production servers. (pero) + </fix> </subsection> </section> [View Less]

17 years, 2 months

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 January 2008