Re: svn commit: r1397291 - in /tomcat/trunk/java/javax/servlet/http: HttpServletRequest.java HttpServletRequestWrapper.java ProtocolHandler.java WebConnection.java
2012/10/12 : > Author: markt > Date: Thu Oct 11 20:29:01 2012 > New Revision: 1397291 > > URL: http://svn.apache.org/viewvc?rev=1397291&view=rev > Log: > Fill in some of the HTTP upgrade Javadoc > > Modified: > tomcat/trunk/java/javax/servlet/http/HttpServletRequest.java > tomcat/trunk/java/javax/servlet/http/HttpServletRequestWrapper.java > tomcat/trunk/java/javax/servlet/http/ProtocolHandler.java > tomcat/trunk/java/javax/servlet/http/WebConnection.java > > > /** > - * TODO SERVLET 3.1 > + * Start the HTTP upgrade process and pass the connection to the provided > + * protocol handler once the current request/response pair has completed > + * processing. > */ > -public abstract void upgrade(javax.servlet.http.ProtocolHandler handler) > -throws java.io.IOException; > +public void upgrade(ProtocolHandler handler) throws java.io.IOException; It would be better to mark such new API as "@since Servlet 3.1" - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
Buidlbot for trunk (was: Re: svn commit: r1397390)
2012/10/12 Mark Thomas : > On 12/10/2012 01:21, ma...@apache.org wrote: >> Author: markt >> Date: Fri Oct 12 00:21:23 2012 >> New Revision: 1397390 >> >> URL: http://svn.apache.org/viewvc?rev=1397390&view=rev >> Log: >> Fix Eclipse Javadoc warning > > This commit is primarily to test buildbot as it now has Java 7 available > and without Java 7, trunk builds have been failing. > Congratulations - Buildbot is working now. The trunk build for r1397390 compiled successfully - first time is several months. But it failed when running tests. There is only 1 failure there: Test org.apache.tomcat.util.net.TestSsl FAILED (for NIO) http://ci.apache.org/projects/tomcat/tomcat8/logs/1397390/TEST-org.apache.tomcat.util.net.TestSsl.NIO.txt [[[ Testcase: testRenegotiateWorks took 3.722 sec Caused an ERROR Connection reset java.net.SocketException: Connection reset at java.net.SocketInputStream.read(SocketInputStream.java:189) at java.net.SocketInputStream.read(SocketInputStream.java:121) at sun.security.ssl.InputRecord.readFully(InputRecord.java:312) at sun.security.ssl.InputRecord.read(InputRecord.java:350) at sun.security.ssl.SSLSocketImpl.readRecord(SSLSocketImpl.java:927) at sun.security.ssl.SSLSocketImpl.readDataRecord(SSLSocketImpl.java:884) at sun.security.ssl.AppInputStream.read(AppInputStream.java:102) at sun.nio.cs.StreamDecoder.readBytes(StreamDecoder.java:283) at sun.nio.cs.StreamDecoder.implRead(StreamDecoder.java:325) at sun.nio.cs.StreamDecoder.read(StreamDecoder.java:177) at java.io.InputStreamReader.read(InputStreamReader.java:184) at java.io.BufferedReader.fill(BufferedReader.java:154) at java.io.BufferedReader.readLine(BufferedReader.java:317) at java.io.BufferedReader.readLine(BufferedReader.java:382) at org.apache.tomcat.util.net.TestSsl.testRenegotiateWorks(TestSsl.java:197) ]]] Best regards, Konstantin Kolinko - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
[Bug 53986] Comment end tag preceded directly by a dash causes JSP fail compilation
https://issues.apache.org/bugzilla/show_bug.cgi?id=53986
--- Comment #10 from Konstantin Kolinko ---
(In reply to comment #9)
> (In reply to comment #8)
> > The JspReader.skipUntil(..) method is invoked with the following arguments:
> > skipUntil(" > skipUntil("--%>");
> > skipUntil("%>");
> > skipUntil("<");
> > skipUntil(">");
> > skipUntil("]]>");
> > skipUntil(":root");
> >
> > An '<' cannot occur in "tag". So the only places where the issue can happen
> > are
> > skipUntil("--%>");
> > skipUntil("]]>");
>
> It may be true that a *valid* document may not include '<' within a tag but
> that doesn't mean that someone won't try it. As long as the resulting error
> message(s) make sense, I think this is an okay assumption.
The skipUntil("
svn commit: r1397464 - in /tomcat/trunk/java/javax/servlet/http: Cookie.java HttpServlet.java
Author: markt
Date: Fri Oct 12 08:21:27 2012
New Revision: 1397464
URL: http://svn.apache.org/viewvc?rev=1397464&view=rev
Log:
Clean-up
- Servlet 3.0 Javadoc
- line-length
Modified:
tomcat/trunk/java/javax/servlet/http/Cookie.java
tomcat/trunk/java/javax/servlet/http/HttpServlet.java
Modified: tomcat/trunk/java/javax/servlet/http/Cookie.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/javax/servlet/http/Cookie.java?rev=1397464&r1=1397463&r2=1397464&view=diff
==
--- tomcat/trunk/java/javax/servlet/http/Cookie.java (original)
+++ tomcat/trunk/java/javax/servlet/http/Cookie.java Fri Oct 12 08:21:27 2012
@@ -50,9 +50,6 @@ import java.util.ResourceBundle;
* This class supports both the Version 0 (by Netscape) and Version 1 (by RFC
* 2109) cookie specifications. By default, cookies are created using Version 0
* to ensure the best interoperability.
- *
- * @author Various
- * @version $Version$
*/
public class Cookie implements Cloneable, Serializable {
@@ -395,11 +392,13 @@ public class Cookie implements Cloneable
"org.apache.catalina.STRICT_SERVLET_COMPLIANCE",
"false")).booleanValue();
-String fwdSlashIsSeparator =
System.getProperty("org.apache.tomcat.util.http.ServerCookie.FWD_SLASH_IS_SEPARATOR");
+String fwdSlashIsSeparator = System.getProperty(
+
"org.apache.tomcat.util.http.ServerCookie.FWD_SLASH_IS_SEPARATOR");
if (fwdSlashIsSeparator == null) {
FWD_SLASH_IS_SEPARATOR = STRICT_SERVLET_COMPLIANCE;
} else {
-FWD_SLASH_IS_SEPARATOR =
Boolean.valueOf(fwdSlashIsSeparator).booleanValue();
+FWD_SLASH_IS_SEPARATOR =
+Boolean.valueOf(fwdSlashIsSeparator).booleanValue();
}
if (FWD_SLASH_IS_SEPARATOR) {
@@ -408,7 +407,8 @@ public class Cookie implements Cloneable
tspecials2 = tspecials2NoSlash;
}
-String strictNaming =
System.getProperty("org.apache.tomcat.util.http.ServerCookie.STRICT_NAMING");
+String strictNaming = System.getProperty(
+"org.apache.tomcat.util.http.ServerCookie.STRICT_NAMING");
if (strictNaming == null) {
STRICT_NAMING = STRICT_SERVLET_COMPLIANCE;
} else {
@@ -452,16 +452,24 @@ public class Cookie implements Cloneable
}
/**
- * @param httpOnly
- * @since Servlet 3.0 TODO SERVLET3 - Add comments
+ * Sets the flag that controls if this cookie will be hidden from scripts
on
+ * the client side.
+ *
+ * @param httpOnly The new value of the flag
+ *
+ * @since Servlet 3.0
*/
public void setHttpOnly(boolean httpOnly) {
this.httpOnly = httpOnly;
}
/**
- * @return TODO
- * @since Servlet 3.0 TODO SERVLET3 - Add comments
+ * Gets the flag that controls if this cookie will be hidden from scripts
on
+ * the client side.
+ *
+ * @return true if the cookie is hidden from scripts, else
+ * false
+ * @since Servlet 3.0
*/
public boolean isHttpOnly() {
return httpOnly;
Modified: tomcat/trunk/java/javax/servlet/http/HttpServlet.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/javax/servlet/http/HttpServlet.java?rev=1397464&r1=1397463&r2=1397464&view=diff
==
--- tomcat/trunk/java/javax/servlet/http/HttpServlet.java (original)
+++ tomcat/trunk/java/javax/servlet/http/HttpServlet.java Fri Oct 12 08:21:27
2012
@@ -52,7 +52,7 @@ import javax.servlet.ServletResponse;
* There's almost no reason to override the service
* method. service handles standard HTTP
* requests by dispatching them to the handler methods
- * for each HTTP request type (the doXXX
+ * for each HTTP request type (the doMethod
* methods listed above).
*
* Likewise, there's almost no reason to override the
@@ -586,7 +586,7 @@ public abstract class HttpServlet extend
/**
* Receives standard HTTP requests from the public
* service method and dispatches
- * them to the doXXX methods defined in
+ * them to the doMethod methods defined in
* this class. This method is an HTTP-specific version of the
* {@link javax.servlet.Servlet#service} method. There's no
* need to override this method.
@@ -842,9 +842,7 @@ class NoBodyOutputStream extends Servlet
}
@Override
-public void write(byte buf[], int offset, int len)
-throws IOException
-{
+public void write(byte buf[], int offset, int len) throws IOException {
if (len >= 0) {
contentLength += len;
} else {
-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
svn commit: r1397465 - in /tomcat/tc7.0.x/trunk/java/javax/servlet/http: Cookie.java HttpServlet.java
Author: markt
Date: Fri Oct 12 08:24:42 2012
New Revision: 1397465
URL: http://svn.apache.org/viewvc?rev=1397465&view=rev
Log:
Clean-up
- Servlet 3.0 Javadoc
- line-length
Modified:
tomcat/tc7.0.x/trunk/java/javax/servlet/http/Cookie.java
tomcat/tc7.0.x/trunk/java/javax/servlet/http/HttpServlet.java
Modified: tomcat/tc7.0.x/trunk/java/javax/servlet/http/Cookie.java
URL:
http://svn.apache.org/viewvc/tomcat/tc7.0.x/trunk/java/javax/servlet/http/Cookie.java?rev=1397465&r1=1397464&r2=1397465&view=diff
==
--- tomcat/tc7.0.x/trunk/java/javax/servlet/http/Cookie.java (original)
+++ tomcat/tc7.0.x/trunk/java/javax/servlet/http/Cookie.java Fri Oct 12
08:24:42 2012
@@ -50,9 +50,6 @@ import java.util.ResourceBundle;
* This class supports both the Version 0 (by Netscape) and Version 1 (by RFC
* 2109) cookie specifications. By default, cookies are created using Version 0
* to ensure the best interoperability.
- *
- * @author Various
- * @version $Version$
*/
public class Cookie implements Cloneable, Serializable {
@@ -96,7 +93,7 @@ public class Cookie implements Cloneable
* By default, cookies are created according to the Netscape cookie
* specification. The version can be changed with the
* setVersion method.
- *
+ *
* @param name
*a String specifying the name of the cookie
* @param value
@@ -140,7 +137,7 @@ public class Cookie implements Cloneable
* Specifies a comment that describes a cookie's purpose. The comment is
* useful if the browser presents the cookie to the user. Comments are not
* supported by Netscape Version 0 cookies.
- *
+ *
* @param purpose
*a String specifying the comment to display to
the
*user
@@ -153,7 +150,7 @@ public class Cookie implements Cloneable
/**
* Returns the comment describing the purpose of this cookie, or
* null if the cookie has no comment.
- *
+ *
* @return a String containing the comment, or
* null if none
* @see #setComment
@@ -170,7 +167,7 @@ public class Cookie implements Cloneable
* visible to servers in a specified Domain Name System (DNS) zone (for
* example, www.foo.com, but not a.b.foo.com). By
* default, cookies are only returned to the server that sent them.
- *
+ *
* @param pattern
*a String containing the domain name within which
*this cookie is visible; form is according to RFC 2109
@@ -183,7 +180,7 @@ public class Cookie implements Cloneable
/**
* Returns the domain name set for this cookie. The form of the domain name
* is set by RFC 2109.
- *
+ *
* @return a String containing the domain name
* @see #setDomain
*/
@@ -201,7 +198,7 @@ public class Cookie implements Cloneable
* A negative value means that the cookie is not stored persistently and
* will be deleted when the Web browser exits. A zero value causes the
* cookie to be deleted.
- *
+ *
* @param expiry
*an integer specifying the maximum age of the cookie in
*seconds; if negative, means the cookie is not stored; if
zero,
@@ -216,7 +213,7 @@ public class Cookie implements Cloneable
* Returns the maximum age of the cookie, specified in seconds, By default,
* -1 indicating the cookie will persist until browser
* shutdown.
- *
+ *
* @return an integer specifying the maximum age of the cookie in seconds;
if
* negative, means the cookie persists until browser shutdown
* @see #setMaxAge
@@ -237,7 +234,7 @@ public class Cookie implements Cloneable
*
* Consult RFC 2109 (available on the Internet) for more information on
* setting path names for cookies.
- *
+ *
* @param uri
*a String specifying a path
* @see #getPath
@@ -249,7 +246,7 @@ public class Cookie implements Cloneable
/**
* Returns the path on the server to which the browser returns this cookie.
* The cookie is visible to all subpaths on the server.
- *
+ *
* @return a String specifying a path that contains a servlet
* name, for example, /catalog
* @see #setPath
@@ -263,7 +260,7 @@ public class Cookie implements Cloneable
* secure protocol, such as HTTPS or SSL.
*
* The default value is false.
- *
+ *
* @param flag
*if true, sends the cookie from the browser to
the
*server only when using a secure protocol; if
@@ -278,7 +275,7 @@ public class Cookie implements Cloneable
* Returns true if the browser is sending cookies only over a
* secure protocol, or false if the browser can send cookies
* using any protocol.
- *
+ *
* @return true if the
svn commit: r1397466 - /tomcat/trunk/java/javax/servlet/http/HttpServlet.java
Author: markt
Date: Fri Oct 12 08:38:53 2012
New Revision: 1397466
URL: http://svn.apache.org/viewvc?rev=1397466&view=rev
Log:
Fix a long standing TODO so correct exceptions are thrown.
Clean-up Javadoc.
Modified:
tomcat/trunk/java/javax/servlet/http/HttpServlet.java
Modified: tomcat/trunk/java/javax/servlet/http/HttpServlet.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/javax/servlet/http/HttpServlet.java?rev=1397466&r1=1397465&r2=1397466&view=diff
==
--- tomcat/trunk/java/javax/servlet/http/HttpServlet.java (original)
+++ tomcat/trunk/java/javax/servlet/http/HttpServlet.java Fri Oct 12 08:38:53
2012
@@ -843,32 +843,32 @@ class NoBodyOutputStream extends Servlet
@Override
public void write(byte buf[], int offset, int len) throws IOException {
-if (len >= 0) {
-contentLength += len;
-} else {
-// XXX
-// isn't this really an IllegalArgumentException?
+if (buf == null) {
+throw new NullPointerException(
+lStrings.getString("err.io.nullArray"));
+}
-String msg = lStrings.getString("err.io.negativelength");
-throw new IOException(msg);
+if (offset < 0 || len < 0 || offset+len < buf.length) {
+String msg = lStrings.getString("err.io.indexOutOfBounds");
+Object[] msgArgs = new Object[3];
+msgArgs[0] = Integer.valueOf(offset);
+msgArgs[1] = Integer.valueOf(len);
+msgArgs[2] = Integer.valueOf(offset + len);
+msg = MessageFormat.format(msg, msgArgs);
+throw new IndexOutOfBoundsException(msg);
}
+
+contentLength += len;
}
-/**
- * TODO SERVLET 3.1
- * @return
- */
@Override
public boolean canWrite() {
+// TODO SERVLET 3.1
return false;
}
-/**
- * TODO SERVLET 3.1
- * @param listener
- */
@Override
public void setWriteListener(javax.servlet.WriteListener listener) {
-
+// TODO SERVLET 3.1
}
}
-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
svn commit: r1397474 - /tomcat/trunk/java/javax/servlet/http/HttpServletRequest.java
Author: markt Date: Fri Oct 12 08:53:36 2012 New Revision: 1397474 URL: http://svn.apache.org/viewvc?rev=1397474&view=rev Log: Servlet 3.1 Javadoc improvements Modified: tomcat/trunk/java/javax/servlet/http/HttpServletRequest.java Modified: tomcat/trunk/java/javax/servlet/http/HttpServletRequest.java URL: http://svn.apache.org/viewvc/tomcat/trunk/java/javax/servlet/http/HttpServletRequest.java?rev=1397474&r1=1397473&r2=1397474&view=diff == --- tomcat/trunk/java/javax/servlet/http/HttpServletRequest.java (original) +++ tomcat/trunk/java/javax/servlet/http/HttpServletRequest.java Fri Oct 12 08:53:36 2012 @@ -495,6 +495,8 @@ public interface HttpServletRequest exte * Start the HTTP upgrade process and pass the connection to the provided * protocol handler once the current request/response pair has completed * processing. + * + * @since Servlet 3.1 */ public void upgrade(ProtocolHandler handler) throws java.io.IOException; } - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
svn commit: r1397472 - /tomcat/trunk/java/javax/servlet/http/HttpServletRequest.java
Author: markt
Date: Fri Oct 12 08:53:16 2012
New Revision: 1397472
URL: http://svn.apache.org/viewvc?rev=1397472&view=rev
Log:
Servlet 3.0 Javadoc improvements
Modified:
tomcat/trunk/java/javax/servlet/http/HttpServletRequest.java
Modified: tomcat/trunk/java/javax/servlet/http/HttpServletRequest.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/javax/servlet/http/HttpServletRequest.java?rev=1397472&r1=1397471&r2=1397472&view=diff
==
--- tomcat/trunk/java/javax/servlet/http/HttpServletRequest.java (original)
+++ tomcat/trunk/java/javax/servlet/http/HttpServletRequest.java Fri Oct 12
08:53:16 2012
@@ -29,10 +29,8 @@ import javax.servlet.ServletRequest;
* information for HTTP servlets.
*
* The servlet container creates an HttpServletRequest object and
- * passes it as an argument to the servlet's service methods
(doGet, doPost, etc).
- *
- * @author Various
- * @version $Version$
+ * passes it as an argument to the servlet's service methods
+ * (doGet, doPost, etc).
*/
public interface HttpServletRequest extends ServletRequest {
@@ -310,11 +308,11 @@ public interface HttpServletRequest exte
*
*
* To reconstruct an URL with a scheme and host, use
- * {@link HttpUtils#getRequestURL}.
+ * {@link #getRequestURL}.
*
* @return a String containing the part of the URL from the
* protocol name up to the query string
- * @see HttpUtils#getRequestURL
+ * @see #getRequestURL
*/
public String getRequestURI();
@@ -391,7 +389,6 @@ public interface HttpServletRequest exte
* in the current session context; false otherwise
* @see #getRequestedSessionId
* @see #getSession
- * @see HttpSessionContext
*/
public boolean isRequestedSessionIdValid();
@@ -423,32 +420,42 @@ public interface HttpServletRequest exte
public boolean isRequestedSessionIdFromUrl();
/**
- * @param response
- * @return TODO
- * @throws IOException
- * @throws ServletException
- * @since Servlet 3.0 TODO SERVLET3 - Add comments
+ * Triggers the same authentication process as would be triggered if the
+ * request is for a resource that is protected by a security constraint.
+ *
+ * @param response The response to use to return any authentication
+ * challenge
+ * @return true if the user is successfully authenticated and
+ * false if not
+ *
+ * @since Servlet 3.0
*/
public boolean authenticate(HttpServletResponse response)
throws IOException, ServletException;
/**
- * @param username
- * @param password
+ * Authenticate the provided user name and password and then associated the
+ * authenticated user with the request.
+ *
+ * @param username The user name to authenticate
+ * @param password The password to use to authenticate the user
+ *
* @throws ServletException
* If any of {@link #getRemoteUser()},
* {@link #getUserPrincipal()} or {@link #getAuthType()} are
* non-null, if the configured authenticator does not support
* user name and password authentication or if the
* authentication fails
- * @since Servlet 3.0 TODO SERVLET3 - Add comments
+ * @since Servlet 3.0
*/
public void login(String username, String password) throws
ServletException;
/**
+ * Removes any authenticated user from the request.
+ *
* @throws ServletException
* If the logout fails
- * @since Servlet 3.0 TODO SERVLET3 - Add comments
+ * @since Servlet 3.0
*/
public void logout() throws ServletException;
-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
svn commit: r1397476 - in /tomcat/tc7.0.x/trunk: ./ java/javax/servlet/http/HttpServlet.java java/javax/servlet/http/HttpServletRequest.java
Author: markt
Date: Fri Oct 12 08:56:58 2012
New Revision: 1397476
URL: http://svn.apache.org/viewvc?rev=1397476&view=rev
Log:
Fix a long standing TODO so correct exceptions are thrown.
Clean-up Javadoc.
Modified:
tomcat/tc7.0.x/trunk/ (props changed)
tomcat/tc7.0.x/trunk/java/javax/servlet/http/HttpServlet.java
tomcat/tc7.0.x/trunk/java/javax/servlet/http/HttpServletRequest.java
Propchange: tomcat/tc7.0.x/trunk/
--
Merged /tomcat/trunk:r1397464,1397466,1397472
Modified: tomcat/tc7.0.x/trunk/java/javax/servlet/http/HttpServlet.java
URL:
http://svn.apache.org/viewvc/tomcat/tc7.0.x/trunk/java/javax/servlet/http/HttpServlet.java?rev=1397476&r1=1397475&r2=1397476&view=diff
==
--- tomcat/tc7.0.x/trunk/java/javax/servlet/http/HttpServlet.java (original)
+++ tomcat/tc7.0.x/trunk/java/javax/servlet/http/HttpServlet.java Fri Oct 12
08:56:58 2012
@@ -837,14 +837,21 @@ class NoBodyOutputStream extends Servlet
@Override
public void write(byte buf[], int offset, int len) throws IOException {
-if (len >= 0) {
-contentLength += len;
-} else {
-// XXX
-// isn't this really an IllegalArgumentException?
+if (buf == null) {
+throw new NullPointerException(
+lStrings.getString("err.io.nullArray"));
+}
-String msg = lStrings.getString("err.io.negativelength");
-throw new IOException(msg);
+if (offset < 0 || len < 0 || offset+len < buf.length) {
+String msg = lStrings.getString("err.io.indexOutOfBounds");
+Object[] msgArgs = new Object[3];
+msgArgs[0] = Integer.valueOf(offset);
+msgArgs[1] = Integer.valueOf(len);
+msgArgs[2] = Integer.valueOf(offset + len);
+msg = MessageFormat.format(msg, msgArgs);
+throw new IndexOutOfBoundsException(msg);
}
+
+contentLength += len;
}
}
Modified: tomcat/tc7.0.x/trunk/java/javax/servlet/http/HttpServletRequest.java
URL:
http://svn.apache.org/viewvc/tomcat/tc7.0.x/trunk/java/javax/servlet/http/HttpServletRequest.java?rev=1397476&r1=1397475&r2=1397476&view=diff
==
--- tomcat/tc7.0.x/trunk/java/javax/servlet/http/HttpServletRequest.java
(original)
+++ tomcat/tc7.0.x/trunk/java/javax/servlet/http/HttpServletRequest.java Fri
Oct 12 08:56:58 2012
@@ -29,10 +29,8 @@ import javax.servlet.ServletRequest;
* information for HTTP servlets.
*
* The servlet container creates an HttpServletRequest object and
- * passes it as an argument to the servlet's service methods
(doGet, doPost, etc).
- *
- * @author Various
- * @version $Version$
+ * passes it as an argument to the servlet's service methods
+ * (doGet, doPost, etc).
*/
public interface HttpServletRequest extends ServletRequest {
@@ -310,11 +308,11 @@ public interface HttpServletRequest exte
*
*
* To reconstruct an URL with a scheme and host, use
- * {@link HttpUtils#getRequestURL}.
+ * {@link #getRequestURL}.
*
* @return a String containing the part of the URL from the
* protocol name up to the query string
- * @see HttpUtils#getRequestURL
+ * @see #getRequestURL
*/
public String getRequestURI();
@@ -391,7 +389,6 @@ public interface HttpServletRequest exte
* in the current session context; false otherwise
* @see #getRequestedSessionId
* @see #getSession
- * @see HttpSessionContext
*/
public boolean isRequestedSessionIdValid();
@@ -423,32 +420,42 @@ public interface HttpServletRequest exte
public boolean isRequestedSessionIdFromUrl();
/**
- * @param response
- * @return TODO
- * @throws IOException
- * @throws ServletException
- * @since Servlet 3.0 TODO SERVLET3 - Add comments
+ * Triggers the same authentication process as would be triggered if the
+ * request is for a resource that is protected by a security constraint.
+ *
+ * @param response The response to use to return any authentication
+ * challenge
+ * @return true if the user is successfully authenticated and
+ * false if not
+ *
+ * @since Servlet 3.0
*/
public boolean authenticate(HttpServletResponse response)
throws IOException, ServletException;
/**
- * @param username
- * @param password
+ * Authenticate the provided user name and password and then associated the
+ * authenticated user with the request.
+ *
+ * @param username The user name to authenticate
+ * @param password The password to use to authenticate the user
+ *
* @throws ServletException
* If any of {@link #getRemote
svn commit: r1397482 - /tomcat/trunk/java/javax/servlet/http/LocalStrings.properties
Author: markt
Date: Fri Oct 12 09:12:05 2012
New Revision: 1397482
URL: http://svn.apache.org/viewvc?rev=1397482&view=rev
Log:
Update strings missed in r1397466
Modified:
tomcat/trunk/java/javax/servlet/http/LocalStrings.properties
Modified: tomcat/trunk/java/javax/servlet/http/LocalStrings.properties
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/javax/servlet/http/LocalStrings.properties?rev=1397482&r1=1397481&r2=1397482&view=diff
==
--- tomcat/trunk/java/javax/servlet/http/LocalStrings.properties (original)
+++ tomcat/trunk/java/javax/servlet/http/LocalStrings.properties Fri Oct 12
09:12:05 2012
@@ -18,7 +18,8 @@
err.cookie_name_is_token=Cookie name \"{0}\" is a reserved token
err.cookie_name_blank=Cookie name may not be null or zero length
-err.io.negativelength=Negative Length given in write method
+err.io.nullArray=Null passed for byte array in write method
+err.io.indexOutOfBounds=Invalid offset [{0}] and / or length [{1}] specified
for array of size [{2}]
err.io.short_read=Short Read
http.method_not_implemented=Method {0} is not is not implemented by this
servlet for this URI
-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
svn commit: r1397483 - in /tomcat/tc7.0.x/trunk: ./ java/javax/servlet/http/LocalStrings.properties
Author: markt
Date: Fri Oct 12 09:12:41 2012
New Revision: 1397483
URL: http://svn.apache.org/viewvc?rev=1397483&view=rev
Log:
Update strings missed in r1397476
Modified:
tomcat/tc7.0.x/trunk/ (props changed)
tomcat/tc7.0.x/trunk/java/javax/servlet/http/LocalStrings.properties
Propchange: tomcat/tc7.0.x/trunk/
--
Merged /tomcat/trunk:r1397482
Modified: tomcat/tc7.0.x/trunk/java/javax/servlet/http/LocalStrings.properties
URL:
http://svn.apache.org/viewvc/tomcat/tc7.0.x/trunk/java/javax/servlet/http/LocalStrings.properties?rev=1397483&r1=1397482&r2=1397483&view=diff
==
--- tomcat/tc7.0.x/trunk/java/javax/servlet/http/LocalStrings.properties
(original)
+++ tomcat/tc7.0.x/trunk/java/javax/servlet/http/LocalStrings.properties Fri
Oct 12 09:12:41 2012
@@ -18,7 +18,8 @@
err.cookie_name_is_token=Cookie name \"{0}\" is a reserved token
err.cookie_name_blank=Cookie name may not be null or zero length
-err.io.negativelength=Negative Length given in write method
+err.io.nullArray=Null passed for byte array in write method
+err.io.indexOutOfBounds=Invalid offset [{0}] and / or length [{1}] specified
for array of size [{2}]
err.io.short_read=Short Read
http.method_not_implemented=Method {0} is not is not implemented by this
servlet for this URI
-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
svn commit: r1397484 - /tomcat/trunk/java/javax/servlet/http/HttpServletRequestWrapper.java
Author: markt
Date: Fri Oct 12 09:13:42 2012
New Revision: 1397484
URL: http://svn.apache.org/viewvc?rev=1397484&view=rev
Log:
Servlet 3.0 Javadoc improvements
Modified:
tomcat/trunk/java/javax/servlet/http/HttpServletRequestWrapper.java
Modified: tomcat/trunk/java/javax/servlet/http/HttpServletRequestWrapper.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/javax/servlet/http/HttpServletRequestWrapper.java?rev=1397484&r1=1397483&r2=1397484&view=diff
==
--- tomcat/trunk/java/javax/servlet/http/HttpServletRequestWrapper.java
(original)
+++ tomcat/trunk/java/javax/servlet/http/HttpServletRequestWrapper.java Fri Oct
12 09:13:42 2012
@@ -279,7 +279,13 @@ public class HttpServletRequestWrapper e
}
/**
- * @since Servlet 3.0 TODO SERVLET3 - Add comments
+ * {@inheritDoc}
+ *
+ * The default behavior of this method is to return
+ * {@link HttpServletRequest#authenticate(HttpServletResponse)}
+ * on the wrapped request object.
+ *
+ * @since Servlet 3.0
*/
@Override
public boolean authenticate(HttpServletResponse response)
@@ -288,7 +294,13 @@ public class HttpServletRequestWrapper e
}
/**
- * @since Servlet 3.0 TODO SERVLET3 - Add comments
+ * {@inheritDoc}
+ *
+ * The default behavior of this method is to return
+ * {@link HttpServletRequest#login(String, String)}
+ * on the wrapped request object.
+ *
+ * @since Servlet 3.0
*/
@Override
public void login(String username, String password) throws
ServletException {
@@ -296,7 +308,13 @@ public class HttpServletRequestWrapper e
}
/**
- * @since Servlet 3.0 TODO SERVLET3 - Add comments
+ * {@inheritDoc}
+ *
+ * The default behavior of this method is to return
+ * {@link HttpServletRequest#logout()}
+ * on the wrapped request object.
+ *
+ * @since Servlet 3.0
*/
@Override
public void logout() throws ServletException {
@@ -304,7 +322,13 @@ public class HttpServletRequestWrapper e
}
/**
- * @since Servlet 3.0 TODO SERVLET3 - Add comments
+ * {@inheritDoc}
+ *
+ * The default behavior of this method is to return
+ * {@link HttpServletRequest#getParts()}
+ * on the wrapped request object.
+ *
+ * @since Servlet 3.0
*/
@Override
public Collection getParts() throws IOException,
@@ -313,10 +337,13 @@ public class HttpServletRequestWrapper e
}
/**
- * @throws ServletException
- * @throws IOException
- * @throws IllegalStateException
- * @since Servlet 3.0 TODO SERVLET3 - Add comments
+ * {@inheritDoc}
+ *
+ * The default behavior of this method is to return
+ * {@link HttpServletRequest#getPart(String)}
+ * on the wrapped request object.
+ *
+ * @since Servlet 3.0
*/
@Override
public Part getPart(String name) throws IOException,
-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
svn commit: r1397485 - /tomcat/trunk/java/javax/servlet/http/HttpServletRequestWrapper.java
Author: markt
Date: Fri Oct 12 09:13:58 2012
New Revision: 1397485
URL: http://svn.apache.org/viewvc?rev=1397485&view=rev
Log:
Servlet 3.1 Javadoc improvements
Modified:
tomcat/trunk/java/javax/servlet/http/HttpServletRequestWrapper.java
Modified: tomcat/trunk/java/javax/servlet/http/HttpServletRequestWrapper.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/javax/servlet/http/HttpServletRequestWrapper.java?rev=1397485&r1=1397484&r2=1397485&view=diff
==
--- tomcat/trunk/java/javax/servlet/http/HttpServletRequestWrapper.java
(original)
+++ tomcat/trunk/java/javax/servlet/http/HttpServletRequestWrapper.java Fri Oct
12 09:13:58 2012
@@ -353,6 +353,12 @@ public class HttpServletRequestWrapper e
/**
* {@inheritDoc}
+ *
+ * The default behavior of this method is to return
+ * {@link HttpServletRequest#upgrade(ProtocolHandler)}
+ * on the wrapped request object.
+ *
+ * @since Servlet 3.1
*/
@Override
public void upgrade(ProtocolHandler handler) throws java.io.IOException {
-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
svn commit: r1397486 - in /tomcat/tc7.0.x/trunk: ./ java/javax/servlet/http/HttpServletRequestWrapper.java
Author: markt
Date: Fri Oct 12 09:14:57 2012
New Revision: 1397486
URL: http://svn.apache.org/viewvc?rev=1397486&view=rev
Log:
Servlet 3.0 Javadoc improvements
Modified:
tomcat/tc7.0.x/trunk/ (props changed)
tomcat/tc7.0.x/trunk/java/javax/servlet/http/HttpServletRequestWrapper.java
Propchange: tomcat/tc7.0.x/trunk/
--
Merged /tomcat/trunk:r1397484
Modified:
tomcat/tc7.0.x/trunk/java/javax/servlet/http/HttpServletRequestWrapper.java
URL:
http://svn.apache.org/viewvc/tomcat/tc7.0.x/trunk/java/javax/servlet/http/HttpServletRequestWrapper.java?rev=1397486&r1=1397485&r2=1397486&view=diff
==
--- tomcat/tc7.0.x/trunk/java/javax/servlet/http/HttpServletRequestWrapper.java
(original)
+++ tomcat/tc7.0.x/trunk/java/javax/servlet/http/HttpServletRequestWrapper.java
Fri Oct 12 09:14:57 2012
@@ -279,7 +279,13 @@ public class HttpServletRequestWrapper e
}
/**
- * @since Servlet 3.0 TODO SERVLET3 - Add comments
+ * {@inheritDoc}
+ *
+ * The default behavior of this method is to return
+ * {@link HttpServletRequest#authenticate(HttpServletResponse)}
+ * on the wrapped request object.
+ *
+ * @since Servlet 3.0
*/
@Override
public boolean authenticate(HttpServletResponse response)
@@ -288,7 +294,13 @@ public class HttpServletRequestWrapper e
}
/**
- * @since Servlet 3.0 TODO SERVLET3 - Add comments
+ * {@inheritDoc}
+ *
+ * The default behavior of this method is to return
+ * {@link HttpServletRequest#login(String, String)}
+ * on the wrapped request object.
+ *
+ * @since Servlet 3.0
*/
@Override
public void login(String username, String password) throws
ServletException {
@@ -296,7 +308,13 @@ public class HttpServletRequestWrapper e
}
/**
- * @since Servlet 3.0 TODO SERVLET3 - Add comments
+ * {@inheritDoc}
+ *
+ * The default behavior of this method is to return
+ * {@link HttpServletRequest#logout()}
+ * on the wrapped request object.
+ *
+ * @since Servlet 3.0
*/
@Override
public void logout() throws ServletException {
@@ -304,7 +322,13 @@ public class HttpServletRequestWrapper e
}
/**
- * @since Servlet 3.0 TODO SERVLET3 - Add comments
+ * {@inheritDoc}
+ *
+ * The default behavior of this method is to return
+ * {@link HttpServletRequest#getParts()}
+ * on the wrapped request object.
+ *
+ * @since Servlet 3.0
*/
@Override
public Collection getParts() throws IllegalStateException,
@@ -313,10 +337,13 @@ public class HttpServletRequestWrapper e
}
/**
- * @throws ServletException
- * @throws IOException
- * @throws IllegalStateException
- * @since Servlet 3.0 TODO SERVLET3 - Add comments
+ * {@inheritDoc}
+ *
+ * The default behavior of this method is to return
+ * {@link HttpServletRequest#getPart(String)}
+ * on the wrapped request object.
+ *
+ * @since Servlet 3.0
*/
@Override
public Part getPart(String name) throws IllegalStateException, IOException,
-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
svn commit: r1397487 - in /tomcat/trunk: java/javax/servlet/http/ProtocolHandler.java java/javax/servlet/http/WebConnection.java res/checkstyle/javax-import-control.xml
Author: markt
Date: Fri Oct 12 09:19:25 2012
New Revision: 1397487
URL: http://svn.apache.org/viewvc?rev=1397487&view=rev
Log:
Add @since tags.
Modified:
tomcat/trunk/java/javax/servlet/http/ProtocolHandler.java
tomcat/trunk/java/javax/servlet/http/WebConnection.java
tomcat/trunk/res/checkstyle/javax-import-control.xml
Modified: tomcat/trunk/java/javax/servlet/http/ProtocolHandler.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/javax/servlet/http/ProtocolHandler.java?rev=1397487&r1=1397486&r2=1397487&view=diff
==
--- tomcat/trunk/java/javax/servlet/http/ProtocolHandler.java (original)
+++ tomcat/trunk/java/javax/servlet/http/ProtocolHandler.java Fri Oct 12
09:19:25 2012
@@ -18,16 +18,20 @@ package javax.servlet.http;
/**
* Interface between the HTTP upgrade process and the new protocol.
+ *
+ * @since Servlet 3.1
*/
public interface ProtocolHandler {
/**
* This method is called once the request/response pair where
- * {@link HttpServletRequest#upgrade(ProtocolHandler) is called has
+ * {@link HttpServletRequest#upgrade(ProtocolHandler)} is called has
* completed processing and is the point where control of the connection
* passes from the container to the {@link ProtocolHandler}.
*
* @param connectionThe connection that has been upgraded
+ *
+ * @since Servlet 3.1
*/
void init(WebConnection connection);
}
Modified: tomcat/trunk/java/javax/servlet/http/WebConnection.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/javax/servlet/http/WebConnection.java?rev=1397487&r1=1397486&r2=1397487&view=diff
==
--- tomcat/trunk/java/javax/servlet/http/WebConnection.java (original)
+++ tomcat/trunk/java/javax/servlet/http/WebConnection.java Fri Oct 12 09:19:25
2012
@@ -24,18 +24,24 @@ import javax.servlet.ServletOutputStream
/**
* The interface used by a {@link ProtocolHandler} to interact with an upgraded
* HTTP connection.
+ *
+ * @since Servlet 3.1
*/
public interface WebConnection {
/**
* Provides access to the {@link ServletInputStream} for reading data from
* the client.
+ *
+ * @since Servlet 3.1
*/
ServletInputStream getInputStream() throws IOException;
/**
* Provides access to the {@link ServletOutputStream} for writing data to
* the client.
+ *
+ * @since Servlet 3.1
*/
ServletOutputStream getOutputStream() throws IOException;
}
\ No newline at end of file
Modified: tomcat/trunk/res/checkstyle/javax-import-control.xml
URL:
http://svn.apache.org/viewvc/tomcat/trunk/res/checkstyle/javax-import-control.xml?rev=1397487&r1=1397486&r2=1397487&view=diff
==
--- tomcat/trunk/res/checkstyle/javax-import-control.xml (original)
+++ tomcat/trunk/res/checkstyle/javax-import-control.xml Fri Oct 12 09:19:25
2012
@@ -33,6 +33,10 @@
+
+
+
+
-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
Re: Time for 6.0.36?
On 11.10.2012 15:23, jean-frederic clere wrote: On 10/10/2012 05:04 PM, Mark Thomas wrote: It has been just over 10 months since the last 6.0.x release. The change log is looking pretty lengthy. I think we need a release. Jean-Frederic? Someone else? I think I can do that next week. Cool, then +1 for 6.0.36 next week. Regards, Rainer - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
Re: svn commit: r1397291 - in /tomcat/trunk/java/javax/servlet/http: HttpServletRequest.java HttpServletRequestWrapper.java ProtocolHandler.java WebConnection.java
On 12/10/2012 08:54, Konstantin Kolinko wrote: > 2012/10/12 : >> Author: markt >> Date: Thu Oct 11 20:29:01 2012 >> New Revision: 1397291 >> >> URL: http://svn.apache.org/viewvc?rev=1397291&view=rev >> Log: >> Fill in some of the HTTP upgrade Javadoc >> >> Modified: >> tomcat/trunk/java/javax/servlet/http/HttpServletRequest.java >> tomcat/trunk/java/javax/servlet/http/HttpServletRequestWrapper.java >> tomcat/trunk/java/javax/servlet/http/ProtocolHandler.java >> tomcat/trunk/java/javax/servlet/http/WebConnection.java >> > >> >> /** >> - * TODO SERVLET 3.1 >> + * Start the HTTP upgrade process and pass the connection to the >> provided >> + * protocol handler once the current request/response pair has completed >> + * processing. >> */ >> -public abstract void upgrade(javax.servlet.http.ProtocolHandler handler) >> -throws java.io.IOException; >> +public void upgrade(ProtocolHandler handler) throws java.io.IOException; > > It would be better to mark such new API as "@since Servlet 3.1" Agreed. I've done this and cleaned up / filled-in the Servlet 3.0 and Servlet 3.1 Javadoc for those classes. There is a fair amount of clean-up required in the Javadoc. I'm aiming to fix these as I touch the classes / have a spare 5 minutes to fill. Mark - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
svn commit: r1397523 - in /tomcat/trunk: build.xml res/META-INF/websocket-api.jar.manifest
Author: markt
Date: Fri Oct 12 11:48:22 2012
New Revision: 1397523
URL: http://svn.apache.org/viewvc?rev=1397523&view=rev
Log:
Update the build to include a JAR for the WebSocket API
Added:
tomcat/trunk/res/META-INF/websocket-api.jar.manifest (with props)
Modified:
tomcat/trunk/build.xml
Modified: tomcat/trunk/build.xml
URL:
http://svn.apache.org/viewvc/tomcat/trunk/build.xml?rev=1397523&r1=1397522&r2=1397523&view=diff
==
--- tomcat/trunk/build.xml (original)
+++ tomcat/trunk/build.xml Fri Oct 12 11:48:22 2012
@@ -47,6 +47,7 @@
+
@@ -74,7 +75,7 @@
-
+
@@ -87,6 +88,7 @@
+
@@ -111,6 +113,7 @@
+
@@ -278,6 +281,10 @@
+
+
+
+
@@ -368,6 +375,7 @@
+
+
+
+
+
+
+
+
+
+
+
http://docs.oracle.com/javase/6/docs/api/"/>
http://commons.apache.org/io/api-release/"/>
http://docs.oracle.com/javaee/6/api/"/>
@@ -1680,6 +1713,7 @@ Apache Tomcat ${version} native binaries
+
@@ -2209,6 +2243,12 @@ Apache Tomcat ${version} native binaries
filesId="files.el-api"
manifest="${tomcat.manifests}/el-api.jar.manifest" />
+
+
+
http://svn.apache.org/viewvc/tomcat/trunk/res/META-INF/websocket-api.jar.manifest?rev=1397523&view=auto
==
--- tomcat/trunk/res/META-INF/websocket-api.jar.manifest (added)
+++ tomcat/trunk/res/META-INF/websocket-api.jar.manifest Fri Oct 12 11:48:22
2012
@@ -0,0 +1,11 @@
+Manifest-version: 1.0
+X-Compile-Source-JDK: @source.jdk@
+X-Compile-Target-JDK: @target.jdk@
+
+Name: javax/el/
+Specification-Title: WebSocket
+Specification-Version: 1.0
+Specification-Vendor: Oracle, Inc.
+Implementation-Title: javax.net.websocket
+Implementation-Version: 1.0.@websocket.revision@
+Implementation-Vendor: Apache Software Foundation
Propchange: tomcat/trunk/res/META-INF/websocket-api.jar.manifest
--
svn:eol-style = native
-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
Re: svn commit: r1397522 - in /tomcat/trunk/java/javax/net: ./ websocket/ websocket/annotations/ websocket/extensions/
On 12/10/2012 13:24, Martin Grigorov wrote: Please use quoting, particularly when you have a few short comments on a very large e-mail. Without quoting, your comments were more effort to find. >> Added: tomcat/trunk/java/javax/net/websocket/HandshakeRequest.java >> URL: >> http://svn.apache.org/viewvc/tomcat/trunk/java/javax/net/websocket/HandshakeRequest.java?rev=1397522&view=auto >> +Object getSession(); > > ^^ > Shouldn't this return a Session instead ? No. That is an HTTP Session object and Object is used to avoid a dependency on the Servlet spec. I'll add some Javadoc. (I can't just copy the RI's Javadoc because of licensing). >> Added: tomcat/trunk/java/javax/net/websocket/Session.java >> URL: >> http://svn.apache.org/viewvc/tomcat/trunk/java/javax/net/websocket/Session.java?rev=1397522&view=auto >> +RemoteEndpoint getRemote(); >> + >> +RemoteEndpoint getRemoteL(Class c); > > Is there a typo in the method name ? Is the 'L' needed ? That is what the spec currently says. It looks like a typo. I've raised it with the EG. Thanks for the review. Mark - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
svn commit: r1397543 - /tomcat/trunk/java/javax/net/websocket/HandshakeRequest.java
Author: markt
Date: Fri Oct 12 12:39:50 2012
New Revision: 1397543
URL: http://svn.apache.org/viewvc?rev=1397543&view=rev
Log:
Add some Javadoc for clarification as this is non-obvious.
Modified:
tomcat/trunk/java/javax/net/websocket/HandshakeRequest.java
Modified: tomcat/trunk/java/javax/net/websocket/HandshakeRequest.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/javax/net/websocket/HandshakeRequest.java?rev=1397543&r1=1397542&r2=1397543&view=diff
==
--- tomcat/trunk/java/javax/net/websocket/HandshakeRequest.java (original)
+++ tomcat/trunk/java/javax/net/websocket/HandshakeRequest.java Fri Oct 12
12:39:50 2012
@@ -31,6 +31,10 @@ public interface HandshakeRequest {
boolean isUserInRole(String role);
+/**
+ * Get the HTTP Session object associated with this request. Object is used
+ * to avoid a direct dependency on the Servlet API.
+ */
Object getSession();
Map getParameterMap();
-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
[Tomcat Wiki] Update of "PoweredBy" by Alize
Dear Wiki user,
You have subscribed to a wiki page or wiki category on "Tomcat Wiki" for change
notification.
The "PoweredBy" page has been changed by Alize:
http://wiki.apache.org/tomcat/PoweredBy?action=diff&rev1=443&rev2=444
=== iPoint Portal ===
{{http://www.ipointportal.com/iPoint/schemes/c2b2/logo1.gif}}
[[http://www.ipointportal.com|The Open Source Collaborative Portal]] - iPoint
Portal is an Open Source Collaborative Portal which is compatible with JSR168
and runs on Tomcat.
+
+ === ilaclama ===
+ [[http://www.ilaclamaportali.com/|ilaçlama]]
[[http://www.ilaclamaportali.com/|ilaçlama şirketleri]]
[[http://www.ilaclamaportali.com/|Böcek ilaçlama]] uses Tomcat for own
production systems and development services.
=== iTanum Webdesign ===
{{http://www.itanum.com/images/logo.jpg}} iTanum -
[[http://www.itanum.com|Webdesign]] delivers all Content Management solutions
and Web business applications on Tomcat.
-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
[Tomcat Wiki] Update of "PoweredBy" by Tim Davis
Dear Wiki user,
You have subscribed to a wiki page or wiki category on "Tomcat Wiki" for change
notification.
The "PoweredBy" page has been changed by Tim Davis:
http://wiki.apache.org/tomcat/PoweredBy?action=diff&rev1=444&rev2=445
=== Pickaweb - UK Web Hosting ===
[[http://www.pickaweb.co.uk|{{http://www.pickaweb.co.uk/images/logo.png|http://www.pickaweb.co.uk}}]]
[[http://www.pickaweb.co.uk|UK Web Hosting]] - Supporting Tomcat in all of our
web hosting plans. Professional UK based web hosting services since 2000. 24x7
Support via chat, phone & email.
+
+ === Revion.com Oracle and tomcat hosting ===
+ {{http://www.revion.com/static/revion_logo.png}}
[[http://www.revion.com|Revion.com Oracle abnd Tomcat Web Hosting]] -
Revion.com is a premier provider of Oracle hosting, Tomcat, Jboss, website,
database, and application hosting
=== RimuHosting.com ===
{{http://blog.rimuhosting.com/wp-content/themes/rimuhosting/images/logo2.png}}
[[http://www.rimuhosting.com|RimuHosting.com VPS with Tomcat Web Hosting]] -
provides a VPS and support for you to host your Tomcat the way you want.
-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
[Tomcat Wiki] Update of "PoweredBy" by Tim Davis
Dear Wiki user,
You have subscribed to a wiki page or wiki category on "Tomcat Wiki" for change
notification.
The "PoweredBy" page has been changed by Tim Davis:
http://wiki.apache.org/tomcat/PoweredBy?action=diff&rev1=445&rev2=446
=== Pickaweb - UK Web Hosting ===
[[http://www.pickaweb.co.uk|{{http://www.pickaweb.co.uk/images/logo.png|http://www.pickaweb.co.uk}}]]
[[http://www.pickaweb.co.uk|UK Web Hosting]] - Supporting Tomcat in all of our
web hosting plans. Professional UK based web hosting services since 2000. 24x7
Support via chat, phone & email.
- === Revion.com Oracle and tomcat hosting ===
+ === Revion.com ===
- {{http://www.revion.com/static/revion_logo.png}}
[[http://www.revion.com|Revion.com Oracle abnd Tomcat Web Hosting]] -
Revion.com is a premier provider of Oracle hosting, Tomcat, Jboss, website,
database, and application hosting
+ {{http://www.revion.com/static/revion_logo.png}}
[[http://www.revion.com|Revion.com Oracle and Tomcat Web Hosting]] - Revion.com
is a premier provider of Oracle hosting, Tomcat, Jboss, website, database, and
application hosting
=== RimuHosting.com ===
{{http://blog.rimuhosting.com/wp-content/themes/rimuhosting/images/logo2.png}}
[[http://www.rimuhosting.com|RimuHosting.com VPS with Tomcat Web Hosting]] -
provides a VPS and support for you to host your Tomcat the way you want.
-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
[GUMP@vmgump]: Project tomcat-taglibs-standard (in module tomcat-taglibs) failed
To whom it may engage...
This is an automated request, but not an unsolicited one. For
more information please visit http://gump.apache.org/nagged.html,
and/or contact the folk at gene...@gump.apache.org.
Project tomcat-taglibs-standard has an issue affecting its community
integration.
This issue affects 2 projects,
and has been outstanding for 126 runs.
The current state of this project is 'Failed', with reason 'Build Failed'.
For reference only, the following projects are affected by this:
- tomcat-taglibs-standard : Standard Taglib
- tomcat-taglibs-standard-install : JSP Taglibs
Full details are available at:
http://vmgump.apache.org/gump/public/tomcat-taglibs/tomcat-taglibs-standard/index.html
That said, some information snippets are provided here.
The following annotations (debug/informational/warning/error messages) were
provided:
-INFO- Optional dependency httpunit failed with reason build failed
-DEBUG- (Apache Gump generated) Apache Maven Settings in:
/srv/gump/public/workspace/tomcat-taglibs/standard/gump_mvn_settings.xml
-INFO- Failed with reason build failed
-DEBUG- Maven POM in:
/srv/gump/public/workspace/tomcat-taglibs/standard/pom.xml
-INFO- Failed to extract fallback artifacts from Gump Repository
The following work was performed:
http://vmgump.apache.org/gump/public/tomcat-taglibs/tomcat-taglibs-standard/gump_work/build_tomcat-taglibs_tomcat-taglibs-standard.html
Work Name: build_tomcat-taglibs_tomcat-taglibs-standard (Type: Build)
Work ended in a state of : Failed
Elapsed: 24 secs
Command Line: /opt/maven2/bin/mvn --batch-mode -DskipTests=true --settings
/srv/gump/public/workspace/tomcat-taglibs/standard/gump_mvn_settings.xml
install
[Working Directory: /srv/gump/public/workspace/tomcat-taglibs/standard]
M2_HOME: /opt/maven2
-
[INFO] [compiler:compile {execution: default-compile}]
[INFO] Nothing to compile - all classes are up to date
[debug] execute contextualize
[INFO] [resources:testResources {execution: default-testResources}]
[INFO] Using 'UTF-8' encoding to copy filtered resources.
[INFO] skip non existing resourceDirectory
/srv/gump/public/workspace/tomcat-taglibs/standard/spec/src/test/resources
[INFO] Copying 3 resources
[INFO] [compiler:testCompile {execution: default-testCompile}]
[INFO] No sources to compile
[INFO] [surefire:test {execution: default-test}]
[INFO] Tests are skipped.
[INFO] [bundle:bundle {execution: default-bundle}]
[INFO] [install:install {execution: default-install}]
[INFO] Installing
/srv/gump/public/workspace/tomcat-taglibs/standard/spec/target/taglibs-standard-spec-1.2-SNAPSHOT.jar
to
/srv/gump/public/workspace/mvnlocalrepo/shared/org/apache/taglibs/taglibs-standard-spec/1.2-SNAPSHOT/taglibs-standard-spec-1.2-SNAPSHOT.jar
[INFO] [bundle:install {execution: default-install}]
[INFO] Parsing
file:/srv/gump/public/workspace/mvnlocalrepo/shared/repository.xml
[INFO] Installing
org/apache/taglibs/taglibs-standard-spec/1.2-SNAPSHOT/taglibs-standard-spec-1.2-SNAPSHOT.jar
[INFO] Writing OBR metadata
[INFO]
[INFO] Building JSTL Implementation
[INFO]task-segment: [install]
[INFO]
[INFO] [remote-resources:process {execution: default}]
[INFO] snapshot org.apache.taglibs:taglibs-standard-spec:1.2-SNAPSHOT: checking
for updates from apache.snapshots
[debug] execute contextualize
[INFO] [resources:resources {execution: default-resources}]
[INFO] Using 'UTF-8' encoding to copy filtered resources.
[INFO] Copying 14 resources
[INFO] Copying 3 resources
[INFO] [compiler:compile {execution: default-compile}]
[INFO] Compiling 96 source files to
/srv/gump/public/workspace/tomcat-taglibs/standard/impl/target/classes
[INFO] -
[ERROR] COMPILATION ERROR :
[INFO] -
[ERROR]
/srv/gump/public/workspace/tomcat-taglibs/standard/impl/src/main/java/org/apache/taglibs/standard/tag/common/sql/DataSourceWrapper.java:[38,7]
error: DataSourceWrapper is not abstract and does not override abstract method
getParentLogger() in CommonDataSource
[INFO] 1 error
[INFO] -
[INFO]
[ERROR] BUILD FAILURE
[INFO]
[INFO] Compilation failure
/srv/gump/public/workspace/tomcat-taglibs/standard/impl/src/main/java/org/apache/taglibs/standard/tag/common/sql/DataSourceWrapper.java:[38,7]
error: DataSourceWrapper is not abstract and does not override abstract method
getParentLogger() in CommonDataSource
[INFO]
[INFO] For more information, run Maven with the -e switch
[INFO] --
svn commit: r1397656 - /tomcat/trunk/build.xml
Author: markt
Date: Fri Oct 12 17:48:00 2012
New Revision: 1397656
URL: http://svn.apache.org/viewvc?rev=1397656&view=rev
Log:
Tab police
Modified:
tomcat/trunk/build.xml
Modified: tomcat/trunk/build.xml
URL:
http://svn.apache.org/viewvc/tomcat/trunk/build.xml?rev=1397656&r1=1397655&r2=1397656&view=diff
==
--- tomcat/trunk/build.xml (original)
+++ tomcat/trunk/build.xml Fri Oct 12 17:48:00 2012
@@ -1713,7 +1713,7 @@ Apache Tomcat ${version} native binaries
-
+
-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
Re: Buidlbot for trunk (was: Re: svn commit: r1397390)
On 12/10/2012 09:01, Konstantin Kolinko wrote: > 2012/10/12 Mark Thomas : >> On 12/10/2012 01:21, ma...@apache.org wrote: >>> Author: markt >>> Date: Fri Oct 12 00:21:23 2012 >>> New Revision: 1397390 >>> >>> URL: http://svn.apache.org/viewvc?rev=1397390&view=rev >>> Log: >>> Fix Eclipse Javadoc warning >> >> This commit is primarily to test buildbot as it now has Java 7 available >> and without Java 7, trunk builds have been failing. >> > > Congratulations - Buildbot is working now. > The trunk build for r1397390 compiled successfully - first time is > several months. > > But it failed when running tests. > > There is only 1 failure there: > Test org.apache.tomcat.util.net.TestSsl FAILED (for NIO) I see the same problem on a Linux VM but not on Windows. Need to find some time to dig into this. Mark - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
