JBossWeb SVN: r493 - trunk/test/org/apache/jboss/web/comet.
by jbossweb-commits＠lists.jboss.org
Author: remy.maucherat(a)jboss.com
Date: 2008-03-12 10:29:56 -0400 (Wed, 12 Mar 2008)
New Revision: 493
Added:
trunk/test/org/apache/jboss/web/comet/CometServletTest1.java
Removed:
trunk/test/org/apache/jboss/web/comet/CometServlet.java
Log:
- Fix oops (bad class name).
Deleted: trunk/test/org/apache/jboss/web/comet/CometServlet.java
===================================================================
--- trunk/test/org/apache/jboss/web/comet/CometServlet.java 2008-03-11 12:24:32 UTC (rev 492)
+++ trunk/test/org/apache/jboss/web/comet/CometServlet.java 2008-03-12 14:29:56 UTC (rev 493)
@@ -1,95 +0,0 @@
-/*
- * JBoss, Home of Professional Open Source
- * Copyright 2008, JBoss Inc., and individual contributors as indicated
- * by the @authors tag. See the copyright.txt in the distribution for a
- * full listing of individual contributors.
- *
- * This is free software; you can redistribute it and/or modify it
- * under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation; either version 2.1 of
- * the License, or (at your option) any later version.
- *
- * This software is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this software; if not, write to the Free
- * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
- * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
- */
-
-
-package org.jboss.web.comet;
-
-import java.io.IOException;
-import java.io.OutputStream;
-
-import javax.servlet.ServletException;
-import javax.servlet.ServletInputStream;
-import javax.servlet.ServletOutputStream;
-import javax.servlet.http.HttpServlet;
-
-import org.jboss.web.comet.CometEvent;
-import org.jboss.web.comet.CometProcessor;
-
-public class CometServletTest1 extends HttpServlet implements CometProcessor {
-
- int count = 0;
-
- public void event(CometEvent event) throws IOException, ServletException {
- System.out.println("[" + event.getHttpServletRequest().getSession(true).getId() + "] " + event.getType());
- switch (event.getType()) {
- case BEGIN:
- //event.suspend();
- break;
- case END:
- break;
- case ERROR:
- event.close();
- break;
- case EVENT:
- ServletOutputStream os = event.getHttpServletResponse().getOutputStream();
- // Using while (true): Not checking if the connection is available to writing immediately
- // will cause the write to be performed in blocking mode.
- // boolean b = true;
- // while (b) {
- while (event.ready()) {
- if (count % 100 == 0) {
- os.println((count++) + " ");
- } else {
- os.print((count++) + " ");
- }
- }
- //if (event.ready())
- // os.flush();
- break;
- case READ:
- ServletInputStream is = event.getHttpServletRequest().getInputStream();
- // Using while (true): Not checking if input is available will trigger a blocking
- // read. No other event should be triggered (the current READ event will be in progress
- // until the read timeouts, which will trigger an ERROR event due to an IOException).
- // while (true) {
- while (is.available() > 0) {
- int c = is.read();
- if (c > 0) {
- System.out.print((char) c);
- } else {
- System.out.print(c);
- break;
- }
- }
- System.out.println();
- break;
- case TIMEOUT:
- // This will cause a generic event to be sent to the servlet every time the connection is idle for
- // a while.
- event.resume();
- break;
- case WRITE:
- break;
- }
- }
-
-}
Copied: trunk/test/org/apache/jboss/web/comet/CometServletTest1.java (from rev 492, trunk/test/org/apache/jboss/web/comet/CometServlet.java)
===================================================================
--- trunk/test/org/apache/jboss/web/comet/CometServletTest1.java (rev 0)
+++ trunk/test/org/apache/jboss/web/comet/CometServletTest1.java 2008-03-12 14:29:56 UTC (rev 493)
@@ -0,0 +1,95 @@
+/*
+ * JBoss, Home of Professional Open Source
+ * Copyright 2008, JBoss Inc., and individual contributors as indicated
+ * by the @authors tag. See the copyright.txt in the distribution for a
+ * full listing of individual contributors.
+ *
+ * This is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU Lesser General Public License as
+ * published by the Free Software Foundation; either version 2.1 of
+ * the License, or (at your option) any later version.
+ *
+ * This software is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this software; if not, write to the Free
+ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
+ * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
+ */
+
+
+package org.jboss.web.comet;
+
+import java.io.IOException;
+import java.io.OutputStream;
+
+import javax.servlet.ServletException;
+import javax.servlet.ServletInputStream;
+import javax.servlet.ServletOutputStream;
+import javax.servlet.http.HttpServlet;
+
+import org.jboss.web.comet.CometEvent;
+import org.jboss.web.comet.CometProcessor;
+
+public class CometServletTest1 extends HttpServlet implements CometProcessor {
+
+ int count = 0;
+
+ public void event(CometEvent event) throws IOException, ServletException {
+ System.out.println("[" + event.getHttpServletRequest().getSession(true).getId() + "] " + event.getType());
+ switch (event.getType()) {
+ case BEGIN:
+ //event.suspend();
+ break;
+ case END:
+ break;
+ case ERROR:
+ event.close();
+ break;
+ case EVENT:
+ ServletOutputStream os = event.getHttpServletResponse().getOutputStream();
+ // Using while (true): Not checking if the connection is available to writing immediately
+ // will cause the write to be performed in blocking mode.
+ // boolean b = true;
+ // while (b) {
+ while (event.ready()) {
+ if (count % 100 == 0) {
+ os.println((count++) + " ");
+ } else {
+ os.print((count++) + " ");
+ }
+ }
+ //if (event.ready())
+ // os.flush();
+ break;
+ case READ:
+ ServletInputStream is = event.getHttpServletRequest().getInputStream();
+ // Using while (true): Not checking if input is available will trigger a blocking
+ // read. No other event should be triggered (the current READ event will be in progress
+ // until the read timeouts, which will trigger an ERROR event due to an IOException).
+ // while (true) {
+ while (is.available() > 0) {
+ int c = is.read();
+ if (c > 0) {
+ System.out.print((char) c);
+ } else {
+ System.out.print(c);
+ break;
+ }
+ }
+ System.out.println();
+ break;
+ case TIMEOUT:
+ // This will cause a generic event to be sent to the servlet every time the connection is idle for
+ // a while.
+ event.resume();
+ break;
+ case WRITE:
+ break;
+ }
+ }
+
+}
16 years, 2 months
JBossWeb SVN: r492 - in trunk: webapps/docs and 1 other directory.
by jbossweb-commits＠lists.jboss.org
Author: remy.maucherat(a)jboss.com
Date: 2008-03-11 08:24:32 -0400 (Tue, 11 Mar 2008)
New Revision: 492
Modified:
trunk/java/org/apache/tomcat/util/net/JIoEndpoint.java
trunk/webapps/docs/changelog.xml
Log:
- Improve bind exception message with address.
Modified: trunk/java/org/apache/tomcat/util/net/JIoEndpoint.java
===================================================================
--- trunk/java/org/apache/tomcat/util/net/JIoEndpoint.java 2008-03-11 12:23:36 UTC (rev 491)
+++ trunk/java/org/apache/tomcat/util/net/JIoEndpoint.java 2008-03-11 12:24:32 UTC (rev 492)
@@ -498,7 +498,12 @@
serverSocket = serverSocketFactory.createSocket(port, backlog, address);
}
} catch (BindException be) {
- throw new BindException(be.getMessage() + ":" + port);
+ if (address == null) {
+ throw new BindException(be.getMessage() + "<null>:" + port);
+ } else {
+ throw new BindException(be.getMessage() + " " +
+ address.toString() + ":" + port);
+ }
}
}
//if( serverTimeout >= 0 )
Modified: trunk/webapps/docs/changelog.xml
===================================================================
--- trunk/webapps/docs/changelog.xml 2008-03-11 12:23:36 UTC (rev 491)
+++ trunk/webapps/docs/changelog.xml 2008-03-11 12:24:32 UTC (rev 492)
@@ -190,6 +190,9 @@
<fix>
Simplify response reset. (remm)
</fix>
+ <fix>
+ <bug>44558</bug>: Include address in bind exception message. (markt)
+ </fix>
</changelog>
</subsection>
<subsection name="Jasper">
16 years, 2 months
JBossWeb SVN: r491 - trunk/webapps/docs.
by jbossweb-commits＠lists.jboss.org
Author: remy.maucherat(a)jboss.com
Date: 2008-03-11 08:23:36 -0400 (Tue, 11 Mar 2008)
New Revision: 491
Modified:
trunk/webapps/docs/aio.xml
Log:
- Minor example code update.
Modified: trunk/webapps/docs/aio.xml
===================================================================
--- trunk/webapps/docs/aio.xml 2008-03-11 12:20:25 UTC (rev 490)
+++ trunk/webapps/docs/aio.xml 2008-03-11 12:23:36 UTC (rev 491)
@@ -201,7 +201,8 @@
throws IOException, ServletException {
HttpServletRequest request = event.getHttpServletRequest();
HttpServletResponse response = event.getHttpServletResponse();
- if (event.getType() == CometEvent.EventType.BEGIN) {
+ switch (event.getType()) {
+ case BEGIN:
log("Begin for session: " + request.getSession(true).getId());
PrintWriter writer = response.getWriter();
writer.println("<!doctype html public \"-//w3c//dtd html 4.0 transitional//en\">");
@@ -210,13 +211,15 @@
synchronized(connections) {
connections.add(response);
}
- } else if (event.getEventType() == CometEvent.EventType.ERROR) {
+ break;
+ case ERROR:
log("Error for session: " + request.getSession(true).getId());
synchronized(connections) {
connections.remove(response);
}
event.close();
- } else if (event.getEventType() == CometEvent.EventType.END) {
+ break;
+ case END:
log("End for session: " + request.getSession(true).getId());
synchronized(connections) {
connections.remove(response);
@@ -224,19 +227,20 @@
PrintWriter writer = response.getWriter();
writer.println("</body></html>");
event.close();
- } else if (event.getEventType() == CometEvent.EventType.READ) {
+ break;
+ case READ:
InputStream is = request.getInputStream();
byte[] buf = new byte[512];
- do {
+ while (is.available() > 0) {
int n = is.read(buf); //can throw an IOException
if (n > 0) {
log("Read " + n + " bytes: " + new String(buf, 0, n)
+ " for session: " + request.getSession(true).getId());
- } else if (n < 0) {
+ } else {
error(event, request, response);
return;
}
- } while (is.available() > 0);
+ }
}
}
@@ -283,6 +287,7 @@
messages.clear();
}
// Send any pending message on all the open connections
+ // If a connection backlogs, there will be an exception
for (int i = 0; i < connections.size(); i++) {
try {
PrintWriter writer = connections.get(i).getWriter();
16 years, 2 months
JBossWeb SVN: r490 - trunk/java/org/apache/coyote/http11.
by jbossweb-commits＠lists.jboss.org
Author: remy.maucherat(a)jboss.com
Date: 2008-03-11 08:20:25 -0400 (Tue, 11 Mar 2008)
New Revision: 490
Modified:
trunk/java/org/apache/coyote/http11/Http11AprProcessor.java
trunk/java/org/apache/coyote/http11/InternalAprInputBuffer.java
Log:
- Remove commented out code (no change).
Modified: trunk/java/org/apache/coyote/http11/Http11AprProcessor.java
===================================================================
--- trunk/java/org/apache/coyote/http11/Http11AprProcessor.java 2008-03-07 23:10:15 UTC (rev 489)
+++ trunk/java/org/apache/coyote/http11/Http11AprProcessor.java 2008-03-11 12:20:25 UTC (rev 490)
@@ -1259,7 +1259,6 @@
internalBuffer.addActiveFilter(savedBody);
} else if (actionCode == ActionCode.ACTION_AVAILABLE) {
- //request.setAvailable(inputBuffer.available());
inputBuffer.useAvailable();
} else if (actionCode == ActionCode.ACTION_COMET_BEGIN) {
comet = true;
Modified: trunk/java/org/apache/coyote/http11/InternalAprInputBuffer.java
===================================================================
--- trunk/java/org/apache/coyote/http11/InternalAprInputBuffer.java 2008-03-07 23:10:15 UTC (rev 489)
+++ trunk/java/org/apache/coyote/http11/InternalAprInputBuffer.java 2008-03-11 12:20:25 UTC (rev 490)
@@ -712,15 +712,6 @@
* Available bytes (note that due to encoding, this may not correspond )
*/
public void useAvailable() {
- /*
- int result = (lastValid - pos);
- if ((result == 0) && (lastActiveFilter >= 0)) {
- for (int i = 0; (result == 0) && (i <= lastActiveFilter); i++) {
- result = activeFilters[i].available();
- }
- }
- return result;
- */
available = true;
}
16 years, 2 months
JBossWeb SVN: r489 - in trunk: webapps/docs and 1 other directory.
by jbossweb-commits＠lists.jboss.org
Author: remy.maucherat(a)jboss.com
Date: 2008-03-07 18:10:15 -0500 (Fri, 07 Mar 2008)
New Revision: 489
Modified:
trunk/java/org/jboss/web/comet/CometEvent.java
trunk/webapps/docs/aio.xml
Log:
- Update docs with update to CometEvent.
Modified: trunk/java/org/jboss/web/comet/CometEvent.java
===================================================================
--- trunk/java/org/jboss/web/comet/CometEvent.java 2008-03-07 18:00:08 UTC (rev 488)
+++ trunk/java/org/jboss/web/comet/CometEvent.java 2008-03-07 23:10:15 UTC (rev 489)
@@ -107,8 +107,7 @@
/**
* 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. An END event will be sent to the
- * servlet.
+ * as part of this request. An END event will be sent to the servlet.
*
* @throws IOException if an IO exception occurs
*/
Modified: trunk/webapps/docs/aio.xml
===================================================================
--- trunk/webapps/docs/aio.xml 2008-03-07 18:00:08 UTC (rev 488)
+++ trunk/webapps/docs/aio.xml 2008-03-07 23:10:15 UTC (rev 489)
@@ -107,11 +107,7 @@
<p>
The close() method 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 conatiner 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 TIMEOUT event).
+ as part of this request. An END event will be sent to the servlet.
</p>
<p>
16 years, 2 months
JBossWeb SVN: r488 - trunk/java/org/apache/tomcat/util/net.
by jbossweb-commits＠lists.jboss.org
Author: remy.maucherat(a)jboss.com
Date: 2008-03-07 13:00:08 -0500 (Fri, 07 Mar 2008)
New Revision: 488
Modified:
trunk/java/org/apache/tomcat/util/net/AprEndpoint.java
Log:
- Implement the fixme and replace the 3 booleans with one int flag.
Modified: trunk/java/org/apache/tomcat/util/net/AprEndpoint.java
===================================================================
--- trunk/java/org/apache/tomcat/util/net/AprEndpoint.java 2008-03-07 17:59:02 UTC (rev 487)
+++ trunk/java/org/apache/tomcat/util/net/AprEndpoint.java 2008-03-07 18:00:08 UTC (rev 488)
@@ -1051,11 +1051,21 @@
* with very little actual use.
*/
public class SocketInfo {
+ public static final int READ = 1;
+ public static final int WRITE = 2;
+ public static final int RESUME = 4;
public long socket;
public int timeout;
- public boolean read;
- public boolean write;
- public boolean resume;
+ public int flags;
+ public boolean read() {
+ return (flags & READ) == READ;
+ }
+ public boolean write() {
+ return (flags & WRITE) == WRITE;
+ }
+ public boolean resume() {
+ return (flags & RESUME) == RESUME;
+ }
}
@@ -1128,10 +1138,7 @@
protected long[] sockets;
protected int[] timeouts;
- // FIXME: replace with an int[] and flags
- protected boolean[] reads;
- protected boolean[] writes;
- protected boolean[] resumes;
+ protected int[] flags;
protected SocketInfo info = new SocketInfo();
@@ -1140,9 +1147,7 @@
pos = 0;
sockets = new long[size];
timeouts = new int[size];
- reads = new boolean[size];
- writes = new boolean[size];
- resumes = new boolean[size];
+ flags = new int[size];
}
public int size() {
@@ -1155,9 +1160,7 @@
} else {
info.socket = sockets[pos];
info.timeout = timeouts[pos];
- info.read = reads[pos];
- info.write = writes[pos];
- info.resume = resumes[pos];
+ info.flags = flags[pos];
pos++;
return info;
}
@@ -1174,9 +1177,9 @@
} else {
sockets[size] = socket;
timeouts[size] = timeout;
- reads[size] = read;
- writes[size] = write;
- resumes[size] = resume;
+ flags[size] = (read ? SocketInfo.READ : 0)
+ | (write ? SocketInfo.WRITE : 0)
+ | (resume ? SocketInfo.RESUME : 0);
size++;
return true;
}
@@ -1187,9 +1190,7 @@
copy.pos = pos;
System.arraycopy(sockets, 0, copy.sockets, 0, size);
System.arraycopy(timeouts, 0, copy.timeouts, 0, size);
- System.arraycopy(reads, 0, copy.reads, 0, size);
- System.arraycopy(writes, 0, copy.writes, 0, size);
- System.arraycopy(resumes, 0, copy.resumes, 0, size);
+ System.arraycopy(flags, 0, copy.timeouts, 0, size);
}
}
@@ -1526,8 +1527,8 @@
}
SocketInfo info = localAddList.get();
while (info != null) {
- if (info.read || info.write) {
- if (info.resume) {
+ if (info.read() || info.write()) {
+ if (info.resume()) {
// Resume event
timeouts.remove(info.socket);
removeFromPoller(info.socket);
@@ -1540,10 +1541,10 @@
}
// Windows only: check status code and loop over the other pollers
int events = 0;
- if (info.read) {
+ if (info.read()) {
events = Poll.APR_POLLIN;
}
- if (info.write) {
+ if (info.write()) {
events = events | Poll.APR_POLLOUT;
}
if (!addToPoller(info.socket, events)) {
@@ -1560,7 +1561,7 @@
} else {
// This is either a resume or a suspend.
if (comet) {
- if (info.resume) {
+ if (info.resume()) {
// Resume event
timeouts.remove(info.socket);
removeFromPoller(info.socket);
16 years, 2 months
JBossWeb SVN: r487 - in trunk/java/org: jboss/web/comet and 1 other directory.
by jbossweb-commits＠lists.jboss.org
Author: remy.maucherat(a)jboss.com
Date: 2008-03-07 12:59:02 -0500 (Fri, 07 Mar 2008)
New Revision: 487
Modified:
trunk/java/org/apache/catalina/connector/CometEventImpl.java
trunk/java/org/apache/catalina/connector/CoyoteAdapter.java
trunk/java/org/jboss/web/comet/CometEvent.java
Log:
- Rework event.close, which is likely going to be asynchronous to actual IO (so if it does a real close right away,
there will be a problem).
Modified: trunk/java/org/apache/catalina/connector/CometEventImpl.java
===================================================================
--- trunk/java/org/apache/catalina/connector/CometEventImpl.java 2008-03-07 12:57:03 UTC (rev 486)
+++ trunk/java/org/apache/catalina/connector/CometEventImpl.java 2008-03-07 17:59:02 UTC (rev 487)
@@ -77,11 +77,8 @@
}
public void close() throws IOException {
- if (request == null) {
- throw new IllegalStateException(sm.getString("cometEvent.nullRequest"));
- }
request.setComet(false);
- response.finishResponse();
+ request.resume();
}
public EventType getType() {
Modified: trunk/java/org/apache/catalina/connector/CoyoteAdapter.java
===================================================================
--- trunk/java/org/apache/catalina/connector/CoyoteAdapter.java 2008-03-07 12:57:03 UTC (rev 486)
+++ trunk/java/org/apache/catalina/connector/CoyoteAdapter.java 2008-03-07 17:59:02 UTC (rev 487)
@@ -141,12 +141,21 @@
boolean error = false;
boolean read = false;
+ boolean close = false;
try {
+ if (response.isClosed()) {
+ // The response IO has been closed asynchronously, so call end
+ // in most cases
+ request.getEvent().setType(CometEvent.EventType.END);
+ request.setComet(false);
+ close = true;
+ }
if (status == SocketStatus.OPEN_READ) {
- if (response.isClosed()) {
+ if (!request.isComet()) {
// The event has been closed asynchronously, so call end instead of
// read to cleanup the pipeline
request.getEvent().setType(CometEvent.EventType.END);
+ close = true;
} else {
try {
// Fill the read buffer of the servlet layer
@@ -167,18 +176,22 @@
}
}
} else if (status == SocketStatus.OPEN_WRITE) {
- if (response.isClosed()) {
+ if (!request.isComet()) {
// The event has been closed asynchronously, so call end instead of
// read to cleanup the pipeline
request.getEvent().setType(CometEvent.EventType.END);
+ close = true;
} else {
request.getEvent().setType(CometEvent.EventType.WRITE);
}
} else if (status == SocketStatus.OPEN_CALLBACK) {
- if (response.isClosed()) {
+ if (!request.isComet()) {
// The event has been closed asynchronously, so call end instead of
// read to cleanup the pipeline
+ // In nearly all cases, the close does a resume which will end up
+ // here
request.getEvent().setType(CometEvent.EventType.END);
+ close = true;
} else {
request.getEvent().setType(CometEvent.EventType.EVENT);
}
@@ -190,11 +203,13 @@
error = true;
} else if (status == SocketStatus.STOP) {
request.getEvent().setType(CometEvent.EventType.END);
+ close = true;
} else if (status == SocketStatus.TIMEOUT) {
- if (response.isClosed()) {
+ if (!request.isComet()) {
// The event has been closed asynchronously, so call end instead of
// read to cleanup the pipeline
request.getEvent().setType(CometEvent.EventType.END);
+ close = true;
} else {
request.getEvent().setType(CometEvent.EventType.TIMEOUT);
}
@@ -205,16 +220,13 @@
// Calling the container
connector.getContainer().getPipeline().getFirst().event(request, response, request.getEvent());
- if (!error && !response.isClosed() && (request.getAttribute(Globals.EXCEPTION_ATTR) != null)) {
+ if (!error && (request.getAttribute(Globals.EXCEPTION_ATTR) != null)) {
// An unexpected exception occurred while processing the event, so
// error should be called
request.getEvent().setType(CometEvent.EventType.ERROR);
error = true;
connector.getContainer().getPipeline().getFirst().event(request, response, request.getEvent());
}
- /*if (response.isClosed() || !request.isComet()) {
- res.action(ActionCode.ACTION_COMET_END, null);
- } else*/
if (!error && read && request.ready()) {
// 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
@@ -223,6 +235,9 @@
error = true;
connector.getContainer().getPipeline().getFirst().event(request, response, request.getEvent());
}
+ if (error || close) {
+ response.finishResponse();
+ }
return (!error);
} catch (Throwable t) {
if (!(t instanceof IOException)) {
@@ -233,7 +248,7 @@
} finally {
req.getRequestProcessor().setWorkerThreadName(null);
// Recycle the wrapper request and response
- if (error || response.isClosed() || !request.isComet()) {
+ if (error || close || response.isClosed()) {
res.action(ActionCode.ACTION_COMET_END, null);
request.recycle();
request.setFilterChain(null);
Modified: trunk/java/org/jboss/web/comet/CometEvent.java
===================================================================
--- trunk/java/org/jboss/web/comet/CometEvent.java 2008-03-07 12:57:03 UTC (rev 486)
+++ trunk/java/org/jboss/web/comet/CometEvent.java 2008-03-07 17:59:02 UTC (rev 487)
@@ -107,12 +107,8 @@
/**
* 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 TIMEOUT event, so the servlet may not recieve the
- * END event immediately after the asynchronous close).
+ * as part of this request. An END event will be sent to the
+ * servlet.
*
* @throws IOException if an IO exception occurs
*/
16 years, 2 months
JBossWeb SVN: r486 - in trunk: lib and 6 other directories.
by jbossweb-commits＠lists.jboss.org
Author: remy.maucherat(a)jboss.com
Date: 2008-03-07 07:57:03 -0500 (Fri, 07 Mar 2008)
New Revision: 486
Added:
trunk/res/jboss/
trunk/res/jboss/org/
trunk/res/jboss/org/apache/
trunk/res/jboss/org/apache/catalina/
trunk/res/jboss/org/apache/catalina/startup/
trunk/res/jboss/org/apache/catalina/startup/catalina.properties
Removed:
trunk/jboss/
trunk/lib/README.txt
trunk/lib/ant.jar
trunk/lib/jasper-jdt.jar
trunk/xdocs/
Modified:
trunk/.classpath
trunk/build.xml
trunk/dist.xml
Log:
- Remove some top level folders from the repository.
- Remove Ant and JDT as they were not very useful, but were using lots of space in the source bundle.
Modified: trunk/.classpath
===================================================================
--- trunk/.classpath 2008-03-07 11:13:13 UTC (rev 485)
+++ trunk/.classpath 2008-03-07 12:57:03 UTC (rev 486)
@@ -2,8 +2,6 @@
<classpath>
<classpathentry excluding="**/.svn/**" kind="src" path="java"/>
<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/>
- <classpathentry kind="lib" path="lib/ant.jar"/>
- <classpathentry kind="lib" path="lib/jasper-jdt.jar"/>
<classpathentry kind="lib" path="lib/jboss-jaxrpc.jar"/>
<classpathentry kind="lib" path="lib/mail.jar"/>
<classpathentry kind="lib" path="lib/wsdl4j.jar"/>
Modified: trunk/build.xml
===================================================================
--- trunk/build.xml 2008-03-07 11:13:13 UTC (rev 485)
+++ trunk/build.xml 2008-03-07 12:57:03 UTC (rev 486)
@@ -64,6 +64,7 @@
<fileset dir="${basedir}/lib">
<include name="*.jar"/>
</fileset>
+ <pathelement path="${jasper-jdt.jar}"/>
</path>
<!-- Just build Tomcat -->
@@ -583,7 +584,7 @@
<!-- Javadoc and i18n exclusions -->
<exclude name="**/package.html" />
</fileset>
- <fileset dir="${basedir}/jboss">
+ <fileset dir="${basedir}/res/jboss">
<include name="org/apache/catalina/startup/catalina.properties" />
</fileset>
</jar>
Modified: trunk/dist.xml
===================================================================
--- trunk/dist.xml 2008-03-07 11:13:13 UTC (rev 485)
+++ trunk/dist.xml 2008-03-07 12:57:03 UTC (rev 486)
@@ -132,10 +132,6 @@
<fixcrlf srcdir="${tomcat.dist}/bin" includes="*.bat" eol="crlf"/>
<chmod dir="${tomcat.dist}/bin" includes="*.sh" perm="+x"/>
- <copy todir="${tomcat.jars}">
- <fileset dir="${tomcat.build}/lib" />
- </copy>
-
</target>
<target name="dist-javadoc" description="Create the Tomcat javadoc" >
Deleted: trunk/lib/README.txt
===================================================================
--- trunk/lib/README.txt 2008-03-07 11:13:13 UTC (rev 485)
+++ trunk/lib/README.txt 2008-03-07 12:57:03 UTC (rev 486)
@@ -1 +0,0 @@
-These JARs are present to facilitate workspace setup in IDEs.
\ No newline at end of file
Deleted: trunk/lib/ant.jar
===================================================================
(Binary files differ)
Deleted: trunk/lib/jasper-jdt.jar
===================================================================
(Binary files differ)
Added: trunk/res/jboss/org/apache/catalina/startup/catalina.properties
===================================================================
--- trunk/res/jboss/org/apache/catalina/startup/catalina.properties (rev 0)
+++ trunk/res/jboss/org/apache/catalina/startup/catalina.properties 2008-03-07 12:57:03 UTC (rev 486)
@@ -0,0 +1,11 @@
+# JBoss AS configuration
+org.apache.catalina.STRICT_SERVLET_COMPLIANCE=true
+org.apache.catalina.core.StandardService.DELAY_CONNECTOR_STARTUP=true
+org.apache.jasper.runtime.BodyContentImpl.LIMIT_BUFFER=true
+org.apache.catalina.connector.Request.SESSION_ID_CHECK=true
+
+# String cache configuration.
+tomcat.util.buf.StringCache.byte.enabled=true
+#tomcat.util.buf.StringCache.char.enabled=true
+#tomcat.util.buf.StringCache.trainThreshold=500000
+#tomcat.util.buf.StringCache.cacheSize=5000
Property changes on: trunk/res/jboss/org/apache/catalina/startup/catalina.properties
___________________________________________________________________
Name: svn:executable
+ *
16 years, 2 months
JBossWeb SVN: r485 - trunk/webapps/docs.
by jbossweb-commits＠lists.jboss.org
Author: jfrederic.clere(a)jboss.com
Date: 2008-03-07 06:13:13 -0500 (Fri, 07 Mar 2008)
New Revision: 485
Modified:
trunk/webapps/docs/php.xml
Log:
Update the link.
Modified: trunk/webapps/docs/php.xml
===================================================================
--- trunk/webapps/docs/php.xml 2008-03-07 10:57:14 UTC (rev 484)
+++ trunk/webapps/docs/php.xml 2008-03-07 11:13:13 UTC (rev 485)
@@ -28,7 +28,7 @@
build the PHP servlet itself. Should should get a tarfile that contains the libraries and a war file with the examples.
</p>
Already build PHP servlets and libraries are available at:
-<a href="http://labs.jboss.com/portal/jbossweb/downloads/native">JBossWeb download area</a>
+<a href="http://labs.jboss.com/jbossweb/downloads/php/">JBossWeb download area</a>
</section>
<section name="Installing">
16 years, 2 months
JBossWeb SVN: r484 - trunk/webapps/docs.
by jbossweb-commits＠lists.jboss.org
Author: jfrederic.clere(a)jboss.com
Date: 2008-03-07 05:57:14 -0500 (Fri, 07 Mar 2008)
New Revision: 484
Modified:
trunk/webapps/docs/apr.xml
Log:
Wrong copy + paste.
Modified: trunk/webapps/docs/apr.xml
===================================================================
--- trunk/webapps/docs/apr.xml 2008-03-07 10:48:01 UTC (rev 483)
+++ trunk/webapps/docs/apr.xml 2008-03-07 10:57:14 UTC (rev 484)
@@ -33,7 +33,7 @@
</p>
<p>
- <a href="http://apr.apache.org/">JBoss Web Native</a> provides bundle for severals platforms.
+ <a href="http://labs.jboss.com/jbossweb/native.html">JBoss Web Native</a> provides bundle for severals platforms.
The bundles contain APR, OpenSSL and tc-native ready to use.
</p>
16 years, 2 months