svn commit: r1242254 - in /tomcat/trunk/java/org/apache: catalina/connector/RequestFacade.java catalina/util/LifecycleMBeanBase.java tomcat/jni/Poll.java

[markt]

Author: markt
Date: Thu Feb  9 09:41:13 2012
New Revision: 1242254

URL: http://svn.apache.org/viewvc?rev=1242254&view=rev
Log:
Fix Javadoc warnings

Modified:
tomcat/trunk/java/org/apache/catalina/connector/RequestFacade.java
tomcat/trunk/java/org/apache/catalina/util/LifecycleMBeanBase.java
tomcat/trunk/java/org/apache/tomcat/jni/Poll.java

Modified: tomcat/trunk/java/org/apache/catalina/connector/RequestFacade.java
URL: 
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/connector/RequestFacade.java?rev=1242254&r1=1242253&r2=1242254&view=diff
==
--- tomcat/trunk/java/org/apache/catalina/connector/RequestFacade.java 
(original)
+++ tomcat/trunk/java/org/apache/catalina/connector/RequestFacade.java Thu Feb  
9 09:41:13 2012
@@ -1088,7 +1088,7 @@ public class RequestFacade implements Ht
 
 /**
  * Sets the response status to {@link
- * HttpServletResponse.SC_SWITCHING_PROTOCOLS} and flushes the response.
+ * HttpServletResponse#SC_SWITCHING_PROTOCOLS} and flushes the response.
  * Protocol specific headers must have already been set before this method
  * is called.
  *

Modified: tomcat/trunk/java/org/apache/catalina/util/LifecycleMBeanBase.java
URL: 
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/util/LifecycleMBeanBase.java?rev=1242254&r1=1242253&r2=1242254&view=diff
==
--- tomcat/trunk/java/org/apache/catalina/util/LifecycleMBeanBase.java 
(original)
+++ tomcat/trunk/java/org/apache/catalina/util/LifecycleMBeanBase.java Thu Feb  
9 09:41:13 2012
@@ -133,8 +133,8 @@ public abstract class LifecycleMBeanBase
 
 /**
  * Utility method to enable sub-classes to easily register additional
- * components that don't implement {@link MBeanRegistration} with
- * an MBean server.
+ * components that don't implement {@link JmxEnabled} with an MBean server.
+ * 
  * Note: This method should only be used once {@link #initInternal()} has
  * been called and before {@link #destroyInternal()} has been called.
  *
@@ -173,8 +173,8 @@ public abstract class LifecycleMBeanBase
 
 /**
  * Utility method to enable sub-classes to easily unregister additional
- * components that don't implement {@link MBeanRegistration} with
- * an MBean server.
+ * components that don't implement {@link JmxEnabled} with an MBean server.
+ * 
  * Note: This method should only be used once {@link #initInternal()} has
  * been called and before {@link #destroyInternal()} has been called.
  *

Modified: tomcat/trunk/java/org/apache/tomcat/jni/Poll.java
URL: 
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/tomcat/jni/Poll.java?rev=1242254&r1=1242253&r2=1242254&view=diff
==
--- tomcat/trunk/java/org/apache/tomcat/jni/Poll.java (original)
+++ tomcat/trunk/java/org/apache/tomcat/jni/Poll.java Thu Feb  9 09:41:13 2012
@@ -155,8 +155,8 @@ public class Poll {
 /**
  * Make poll() return.
  *
- * @param pollset
- * @return
+ * @param   pollset
+ * @return  Negative APR error code
  */
 public static native int interrupt(long pollset);
 
@@ -164,7 +164,8 @@ public class Poll {
  * Check if interrupt() is allowed.
  *
  * @param pollset
- * @return
+ * @return  true if {@link #interrupt(long)} is allowed, else
+ *  false
  */
 public static native boolean wakeable(long pollset);
 }



-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org

DO NOT REPLY [Bug 52629] New: minIdle property behaviour is not the described one

[bugzilla]

https://issues.apache.org/bugzilla/show_bug.cgi?id=52629

 Bug #: 52629
   Summary: minIdle property behaviour is not the described one
   Product: Tomcat Modules
   Version: unspecified
  Platform: PC
Status: NEW
  Severity: normal
  Priority: P2
 Component: jdbc-pool
AssignedTo: dev@tomcat.apache.org
ReportedBy: guenther.dem...@wuerth-phoenix.com
Classification: Unclassified


Currently (Tomcat JDBC Connection Pool 1.1.0.0) the description of property
midIdle is:

"(int) The minimum number of established connections that should be kept in the
pool at all times ..."

This behaviour is not guaranteed at all times,
it works only in release phases (= when the use is returning more connections
than borrowing) while in growth-phases the pool starves of idle connections.

Example:
If I define the pool with parameters maxActive=300, initialSize=50, minIdle=10 
then when the number of active connections reaches 50, the number of idle
connection will be 0 and remain to 0 also after pool-cleaner thread cycle end
and there were no validation queries failing.



If I use indeed c3p0 and define it with parameters  maxPoolSize=300,
initialPoolSize=50, minPoolSize=10,
then I have almost always more or less 10 idle connections,
even when the number of active connections reaches 50.

-- 
Configure bugmail: https://issues.apache.org/bugzilla/userprefs.cgi?tab=email
--- You are receiving this mail because: ---
You are the assignee for the bug.

-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org

Re: WebSocket progress report

[Jeremy brown]

Hi Jonathan and Petr,

I'm an Application Development Graduate Student at Illinois Institute of
Technology and I'd like to get started contributing to Tomcat. If you have
any tasks I can help out with please let me know. I'd even be happy to
start with simple tasks in order begin to familiarize myself with the
project and code base, such as writing or formatting javadoc or cleaning up
white space.

Cheers, Jeremy

On Wed, Feb 8, 2012 at 8:41 PM, Petr Praus  wrote:

> On Tue, Feb 7, 2012 at 03:47, Mark Thomas  wrote:
>
> > On 07/02/2012 02:23, Jonathan Drake wrote:
> > > I'm one the three CS grad students working on WebSocket (along with
> Petr
> > > Praus).
> > >
> > > Just wanted to give an update on our progress, to let you know what
> we're
> > > working on:
> > >
> > > Adding support for fragmented payloads:
> >
> > Excellent. That and handling control frames are the biggest gaps right
> > now in my view.
> >
> > > Right now, after receiving a frame, StreamInbound unmasks the payload
> in
> > a
> > > WsInputStream and passes it up to the servlet via
> > > onBinaryData()/onTextData().
> > > To support fragmented frames, we add an intermediate step: after
> > unmasking
> > > the payload, write it to a PipedOutputStream connected to a
> > > PipedInputStream that we pass upward via onBinaryData()/onTextData().
> > When
> > > the next fragment arrives, keep streaming data through the pipe.
> >
> > Piped[Input|Output]Stream are intended to be used with a separate thread
> > at each end. There is currently only a single thread processing the
> > incoming data. How do you propose to provide the additional thread?
> >
>
> Ah, then it's different. I thought the client handler is running in
> different thread. Then we'll probably need something different.
>
>
> > > This has the advantage of also allowing us to stream huge payloads (RFC
> > > 6455 allows for a 64-bit extended length field---way too much data to
> > > buffer in memory all at once).
> >
> > That is certainly a requirement. However, there is more than one way to
> > meet that requirement.
> >
>
> Our initial idea was some form of a streaming API where the reader code
> receiving the message fills a stream that's somehow connected to a client
> code that would be consuming it. Hence the Piped[Input|Output]Stream stuff.
> I also think the individual frames of a fragmented messages should not be
> exposed to the client code. If I remember correctly, RFC specifies that its
> up to the implementation to decide. What do you think?
>
> And, what are your other ideas for supporting huge payloads?
>
>
> >
> > > It has the minor disadvantage of breaking the ByteBuffer wrappers from
> > > MessageInbound (we can still use them for small payloads if we buffer
> > > fragments in memory)
> >
> > Could you clarify what is broken in what circumstances please.
> > MessageInbound is expected to work providing that the message
> > (regardless of how many fragments it is spread across) is smaller than
> > the available buffer size.
> >
> > My expectation is that the current echo example would continue to work
> > regardless of whether or not the messages were in a single fragment or
> > multiple fragments.
>
>
> > > I'm working on a patch that implements this...maybe a day or two.
> > >
> > > I'd appreciate any early criticism you may have---otherwise I mainly
> just
> > > want to prevent duplicate work by explaining what we're up to.
> >
> > Thanks for the heads up.
> >
> > The approach you describe isn't the one I had in mind, but that is a
> > good thing. It provides an opportunity to compare and to take the best
> > from both.
> >
> > It would be nice to have a test case or an example client for this.
> > Unless there is an easy way to force a browser to fragment packets, I
> > suspect a test case will be required.
> >
>
> I'm not sure about other browsers but Chrome 16 fragments payloads so that
> WS frames fit into MSS of the underlying protocol (TCP). So if I sent
> string larger than roughly 1450 bytes from the client javascript, I got
> fragments packets. Beware that "lo" device on Linux has by default MTU
> 16436 so on localhost, the above value of 1450 bytes is much larger.
>
>
> > Given that the implementation currently uses blocking IO
>
> Just to make sure, processor.read() calls are always blocking, right? I'm
> somewhat confused by Nio/Bio/Apr in combination with this. As I understand
> it, any of the three can be used at the user's will and so the processor
> can be of type UpgradeNioProcessor. In that case the read on the underlying
> socket is not blocking. So how come read on the UpgradeProcessor will
> always be blocking? Can you shed some light on this? Thanks
>
>
> >  , my approach
>
> was going to be something along the lines of:
> > a) read the headers
> > b) call onBinaryData() / onTextData()
> > c) make the payload available via WsInputStream until the end of the
> > fragment
> > d) read the headers for the next fragment
> > e) make the payload

Re: WebSocket progress report

[Mark Thomas]

On 09/02/2012 02:41, Petr Praus wrote:
> Our initial idea was some form of a streaming API where the reader code
> receiving the message fills a stream that's somehow connected to a client
> code that would be consuming it. Hence the Piped[Input|Output]Stream stuff.
> I also think the individual frames of a fragmented messages should not be
> exposed to the client code. If I remember correctly, RFC specifies that its
> up to the implementation to decide. What do you think?

I agree.

> And, what are your other ideas for supporting huge payloads?

Streaming is the only (scalable / efficient) game in town for that.

> I'm not sure about other browsers but Chrome 16 fragments payloads so that
> WS frames fit into MSS of the underlying protocol (TCP). So if I sent
> string larger than roughly 1450 bytes from the client javascript, I got
> fragments packets. Beware that "lo" device on Linux has by default MTU
> 16436 so on localhost, the above value of 1450 bytes is much larger.

Ah. Interesting. That could be very useful.

>> Given that the implementation currently uses blocking IO
> 
> Just to make sure, processor.read() calls are always blocking, right?

I assume you mean UpgradeProcessor.read() rather than Processor.read()
(which doesn't exist). Yes, UpgradeProcessor.read() is (currently)
always blocking.

> I'm
> somewhat confused by Nio/Bio/Apr in combination with this. As I understand
> it, any of the three can be used at the user's will and so the processor
> can be of type UpgradeNioProcessor. In that case the read on the underlying
> socket is not blocking.

Yes it is. It is performed using a blocking Selector. The parameter is
there to allow non-blocking reads but that makes the whole API a lot
more complicated so it is currently on the "We'll look at implementing
it a) if there is a demand for it and b) we can come up with a sane API"
category.

> So how come read on the UpgradeProcessor will
> always be blocking? Can you shed some light on this? Thanks

Take a look at UpgradeNioProcessor.readSocket() and the value of the
block parameter whenever that method is called.

>> my approach was going to be something along the lines of:
>> a) read the headers
>> b) call onBinaryData() / onTextData()
>> c) make the payload available via WsInputStream until the end of the
>> fragment
>> d) read the headers for the next fragment
>> e) make the payload available via WsInputStream until the end of the
>> fragment
>> f) repeat d) & e) until the final fragment is processed
>> g) return EOF on the next read
> 
> 
>> This would mean moving most of the code currently in
>> StreamInBound.onData() to WsInputStream
>>
>> I haven't tried coding this up or anything so there is no guarantee it
>> would actually work.
>>
> 
> This seems like a sensible approach, I'll look into it.

Sounds good.

Mark

-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org

Re: WebSocket progress report

[Mark Thomas]

On 09/02/2012 15:07, Jeremy brown wrote:
> Hi Jonathan and Petr,
> 
> I'm an Application Development Graduate Student at Illinois Institute of
> Technology and I'd like to get started contributing to Tomcat. If you have
> any tasks I can help out with please let me know. I'd even be happy to
> start with simple tasks in order begin to familiarize myself with the
> project and code base, such as writing or formatting javadoc or cleaning up
> white space.
> 
> Cheers, Jeremy


Jeremy,

In addition to the WebSocket work, there are ~100 enhancement requests
in various states in Bugzilla. You could also take a look at those and
see if one sparks your interest. If you have an interest in web design
the the Tomcat web site and documentation is long overdue an overhaul.

Mark

-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org

svn commit: r1242370 - /tomcat/trunk/java/org/apache/catalina/startup/Bootstrap.java

[markt]

Author: markt
Date: Thu Feb  9 16:07:47 2012
New Revision: 1242370

URL: http://svn.apache.org/viewvc?rev=1242370&view=rev
Log:
Remove JMX registration of removed StandardClassLoader (note no
attributes or methods were exposed anyway).

Modified:
tomcat/trunk/java/org/apache/catalina/startup/Bootstrap.java

Modified: tomcat/trunk/java/org/apache/catalina/startup/Bootstrap.java
URL: 
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/startup/Bootstrap.java?rev=1242370&r1=1242369&r2=1242370&view=diff
==
--- tomcat/trunk/java/org/apache/catalina/startup/Bootstrap.java (original)
+++ tomcat/trunk/java/org/apache/catalina/startup/Bootstrap.java Thu Feb  9 
16:07:47 2012
@@ -14,14 +14,10 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-
-
 package org.apache.catalina.startup;
 
-
 import java.io.File;
 import java.io.IOException;
-import java.lang.management.ManagementFactory;
 import java.lang.reflect.InvocationTargetException;
 import java.lang.reflect.Method;
 import java.net.MalformedURLException;
@@ -30,10 +26,6 @@ import java.util.ArrayList;
 import java.util.List;
 import java.util.StringTokenizer;
 
-import javax.management.MBeanServer;
-import javax.management.MBeanServerFactory;
-import javax.management.ObjectName;
-
 import org.apache.catalina.Globals;
 import org.apache.catalina.security.SecurityClassLoad;
 import org.apache.catalina.startup.ClassLoaderFactory.Repository;
@@ -55,7 +47,6 @@ import org.apache.juli.logging.LogFactor
  * @author Remy Maucherat
  * @version $Id$
  */
-
 public final class Bootstrap {
 
 private static final Log log = LogFactory.getLog(Bootstrap.class);
@@ -214,24 +205,7 @@ public final class Bootstrap {
 }
 }
 
-ClassLoader classLoader = ClassLoaderFactory.createClassLoader
-(repositories, parent);
-
-// Retrieving MBean server
-MBeanServer mBeanServer = null;
-if (MBeanServerFactory.findMBeanServer(null).size() > 0) {
-mBeanServer = MBeanServerFactory.findMBeanServer(null).get(0);
-} else {
-mBeanServer = ManagementFactory.getPlatformMBeanServer();
-}
-
-// Register the server classloader
-ObjectName objectName =
-new ObjectName("Catalina:type=ServerClassLoader,name=" + name);
-mBeanServer.registerMBean(classLoader, objectName);
-
-return classLoader;
-
+return ClassLoaderFactory.createClassLoader(repositories, parent);
 }
 
 /**



-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org

svn commit: r1242371 - in /tomcat/trunk: ./ java/org/apache/juli/logging/ java/org/apache/tomcat/util/http/ java/org/apache/tomcat/util/log/

[markt]

Author: markt
Date: Thu Feb  9 16:08:49 2012
New Revision: 1242371

URL: http://svn.apache.org/viewvc?rev=1242371&view=rev
Log:
Fix a couple of issues with the UserDataHelper
1. Packaging. It should have been packaged with juli-adapters.jar. The
class has been moved so this is no longer an issue.
2. The wrong class/method was reported if the extras were used. The
logging code has been pushed back to the caller. In return for a small
amount of code duplication, the caller class/method will now always be
correct.

Added:
tomcat/trunk/java/org/apache/tomcat/util/log/UserDataHelper.java
  - copied, changed from r1242370, 
tomcat/trunk/java/org/apache/juli/logging/UserDataHelper.java
Removed:
tomcat/trunk/java/org/apache/juli/logging/UserDataHelper.java
Modified:
tomcat/trunk/build.xml
tomcat/trunk/java/org/apache/juli/logging/DirectJDKLog.java
tomcat/trunk/java/org/apache/tomcat/util/http/Cookies.java
tomcat/trunk/java/org/apache/tomcat/util/http/Parameters.java

Modified: tomcat/trunk/build.xml
URL: 
http://svn.apache.org/viewvc/tomcat/trunk/build.xml?rev=1242371&r1=1242370&r2=1242371&view=diff
==
--- tomcat/trunk/build.xml (original)
+++ tomcat/trunk/build.xml Thu Feb  9 16:08:49 2012
@@ -1248,7 +1248,6 @@
   
   
 
-
 
 
 

Modified: tomcat/trunk/java/org/apache/juli/logging/DirectJDKLog.java
URL: 
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/juli/logging/DirectJDKLog.java?rev=1242371&r1=1242370&r2=1242371&view=diff
==
--- tomcat/trunk/java/org/apache/juli/logging/DirectJDKLog.java (original)
+++ tomcat/trunk/java/org/apache/juli/logging/DirectJDKLog.java Thu Feb  9 
16:08:49 2012
@@ -172,26 +172,13 @@ class DirectJDKLog implements Log {
 Throwable dummyException=new Throwable();
 StackTraceElement locations[]=dummyException.getStackTrace();
 // Caller will be the third element (or later if logger is wrapped)
-String cname = null;
-String method = null;
-if (locations != null) {
-int i = 2;
-while (locations.length > i) {
-StackTraceElement caller = locations[i];
-if (caller.getClassName().startsWith("org.apache.juli")) {
-i++;
-} else {
-cname = caller.getClassName();
-method = caller.getMethodName();
-break;
-}
-}
+String cname = "unknown";
+String method = "unknown";
+if (locations != null && locations.length >2) {
+StackTraceElement caller = locations[2];
+cname = caller.getClassName();
+method = caller.getMethodName();
 }
-if (cname == null) {
-cname = "unknown";
-method = "unknown";
-}
-
 if (ex==null) {
 logger.logp(level, cname, method, msg);
 } else {

Modified: tomcat/trunk/java/org/apache/tomcat/util/http/Cookies.java
URL: 
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/tomcat/util/http/Cookies.java?rev=1242371&r1=1242370&r2=1242371&view=diff
==
--- tomcat/trunk/java/org/apache/tomcat/util/http/Cookies.java (original)
+++ tomcat/trunk/java/org/apache/tomcat/util/http/Cookies.java Thu Feb  9 
16:08:49 2012
@@ -21,9 +21,9 @@ import java.io.StringWriter;
 
 import org.apache.juli.logging.Log;
 import org.apache.juli.logging.LogFactory;
-import org.apache.juli.logging.UserDataHelper;
 import org.apache.tomcat.util.buf.ByteChunk;
 import org.apache.tomcat.util.buf.MessageBytes;
+import org.apache.tomcat.util.log.UserDataHelper;
 import org.apache.tomcat.util.res.StringManager;
 
 /**
@@ -356,11 +356,19 @@ public final class Cookies {
 // not valid.
 UserDataHelper.Mode logMode = 
userDataLog.getNextMode();
 if (logMode != null) {
-String message = 
sm.getString("cookies.invalidCookieToken");
-if (logMode.fallToDebug()) {
-message += sm.getString("cookies.fallToDebug");
+String message = sm.getString(
+"cookies.invalidCookieToken");
+switch (logMode) {
+case INFO_THEN_DEBUG:
+message += sm.getString(
+"cookies.fallToDebug");
+//$FALL-THROUGH$
+case INFO:
+   

svn commit: r1242374 - in /tomcat/tc7.0.x/trunk: ./ java/org/apache/juli/logging/ java/org/apache/tomcat/util/http/ java/org/apache/tomcat/util/log/ webapps/docs/

[markt]

Author: markt
Date: Thu Feb  9 16:16:49 2012
New Revision: 1242374

URL: http://svn.apache.org/viewvc?rev=1242374&view=rev
Log:
Fix a couple of issues with the UserDataHelper
1. Packaging. It should have been packaged with juli-adapters.jar. The
class has been moved so this is no longer an issue.
2. The wrong class/method was reported if the extras were used. The
logging code has been pushed back to the caller. In return for a small
amount of code duplication, the caller class/method will now always be
correct.

Added:
tomcat/tc7.0.x/trunk/java/org/apache/tomcat/util/log/UserDataHelper.java
  - copied unchanged from r1242371, 
tomcat/trunk/java/org/apache/tomcat/util/log/UserDataHelper.java
Removed:
tomcat/tc7.0.x/trunk/java/org/apache/juli/logging/UserDataHelper.java
Modified:
tomcat/tc7.0.x/trunk/   (props changed)
tomcat/tc7.0.x/trunk/build.xml
tomcat/tc7.0.x/trunk/java/org/apache/juli/logging/DirectJDKLog.java
tomcat/tc7.0.x/trunk/java/org/apache/tomcat/util/http/Cookies.java
tomcat/tc7.0.x/trunk/java/org/apache/tomcat/util/http/Parameters.java
tomcat/tc7.0.x/trunk/webapps/docs/changelog.xml

Propchange: tomcat/tc7.0.x/trunk/
--
--- svn:mergeinfo (original)
+++ svn:mergeinfo Thu Feb  9 16:16:49 2012
@@ -1 +1 @@
-/tomcat/trunk:1156115,1156171,1156276,1156304,1156519,1156530,1156602,1157015,1157018,1157151,1157198,1157204,1157810,1157832,1157834,1157847,1157908,1157939,1158155,1158160,1158176,1158195,1158198-1158199,1158227,1158331,1158334-1158335,1158426,1160347,1160592,1160611,1160619,1160626,1160639,1160652,1160720-1160721,1160772,1160774,1160776,1161303,1161310,1161322,1161339,1161486,1161540,1161549,1161584,1162082,1162149,1162169,1162721,1162769,1162836,1162932,1163630,1164419,1164438,1164469,1164480,1164567,1165234,1165247-1165248,1165253,1165273,1165282,1165309,1165331,1165338,1165347,1165360-1165361,1165367-1165368,1165602,1165608,1165677,1165693,1165721,1165723,1165728,1165730,1165738,1165746,1165765,1165777,1165918,1165921,1166077,1166150-1166151,1166290,1166366,1166620,1166686,1166693,1166752,1166757,1167368,1167394,1169447,1170647,1171692,1172233-1172234,1172236,1172269,1172278,1172282,1172556,1172610,1172664,1172689,1172711,1173020-1173021,1173082,1173088,1173090,1173096
 
,1173241,1173256,1173288,117,1173342,1173461,1173614,1173630,1173659,1173722,1174061,1174239,1174322,1174325,1174329-1174330,1174337-1174339,1174343,1174353,1174799,1174882,1174884,1174975,1174983,1175155,1175158,1175167,1175182,1175190,1175201,1175272,1175275,1175283,1175582,1175589-1175590,1175594,1175602,1175613,1175633,1175690,1175713,1175798,1175889,1175896,1175907,1176584,1176590,1176799,1177050,1177060,1177125,1177152,1177160,1177245,1177850,1177862,1177978,1178209,1178228,1178233,1178449,1178542,1178681,1178684,1178721,1179268,1179274,1180261,1180865,1180891,1180894,1180907,1181028,1181123,1181125,1181136,1181291,1181743,1182796,1183078,1183105,1183142,1183328,1183339-1183340,1183492-1183494,1183605,1184917,1184919,1185018,1185020,1185200,1185588,1185626,1185756,1185758,1186011,1186042-1186045,1186104,1186123,1186137,1186153,1186254,1186257,1186377-1186379,1186479-1186480,1186712,1186743,1186750,1186763,1186890-1186892,1186894,1186949,1187018,1187027-1187028,1187
 
381,1187753,1187755,1187775,1187801,1187806,1187809,1187827,1188301,1188303-1188305,1188399,1188822,1188930-1188931,1189116,1189129,1189183,1189240,1189256,1189386,1189413-1189414,1189477,1189685,1189805,1189857,1189864,1189882,1190034,1190185,1190279,1190339,1190371,1190388-1190389,1190474,1190481,1194915,1195222-1195223,1195531,1195899,1195905,1195943,1195949,1195953,1195955,1195965,1195968,1196175,1196212,1196223,1196304-1196305,1196735,1196825,1196827,1197158,1197261,1197263,1197299-1197300,1197305,1197339-1197340,1197343,1197382,1197386-1197387,1197480,1197578,1198497,1198528,1198552,1198602,1198604,1198607,1198622,1198640,1198696,1198707,1199418,1199432,1199436,1199513,1199529,1199980,116,1200056,1200089,1200106-1200107,1200263,1200316,1200320,1200398-1200399,1200445-1200446,1200555,1200627,1200696,1200725,1200937,1200941,1201069,1201087,1201180,1201235-1201237,1201508,1201521,1201542,1201545-1201546,1201548,1201555-1201556,1201568,1201576,1201608,1201921-1201922,1
 
201931,1202035,1202039,1202271,1202565,1202578,1202705,1202828,1202860,1203047-1203052,1203078,1203091,1203253,1203278,1204182,1204856,1204867,1204936,1204938,1204982,1205033,1205065,1205082,1205097,1205112,1206200,1207692,1208046,1208073,1208096,1208114,1208145,1208772,1209194,1209277-1209278,1209686-1209731,1210894,1212091,1212095,1212099,1212118,1213469,1213906,1214853,1214855,1214864,1215115,1215118-1215119,1215121,1220293,1220295,1221038,1221842,1222189,101,176,1222300,1222690,1222850,1222852,1222855,1224607,1224617,1224648-1224652,1224657,1224662-1224663,1224682,1224801,1224910,1225000,1225219,1225343,1225465,1225627,1225629,1225634,1226069,1226158-1226

Timing for 7.0.26

[Mark Thomas]

FYI: I intend to start the 7.0.26 release process once Commons Daemon
1.0.9 is released.

Mark

-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org

Re: svn commit: r1242374 - in /tomcat/tc7.0.x/trunk: ./ java/org/apache/juli/logging/ java/org/apache/tomcat/util/http/ java/org/apache/tomcat/util/log/ webapps/docs/

[Konstantin Kolinko]

2012/2/9  :
> Author: markt
> Date: Thu Feb  9 16:16:49 2012
> New Revision: 1242374
>
> URL: http://svn.apache.org/viewvc?rev=1242374&view=rev
> Log:
> Fix a couple of issues with the UserDataHelper
> 1. Packaging. It should have been packaged with juli-adapters.jar. The
> class has been moved so this is no longer an issue.
> 2. The wrong class/method was reported if the extras were used. The
> logging code has been pushed back to the caller. In return for a small
> amount of code duplication, the caller class/method will now always be
> correct.
>
> Added:
>    tomcat/tc7.0.x/trunk/java/org/apache/tomcat/util/log/UserDataHelper.java
>      - copied unchanged from r1242371, 
> tomcat/trunk/java/org/apache/tomcat/util/log/UserDataHelper.java
> Removed:
>    tomcat/tc7.0.x/trunk/java/org/apache/juli/logging/UserDataHelper.java
> Modified:
>    tomcat/tc7.0.x/trunk/   (props changed)
>    tomcat/tc7.0.x/trunk/build.xml
>    tomcat/tc7.0.x/trunk/java/org/apache/juli/logging/DirectJDKLog.java
>    tomcat/tc7.0.x/trunk/java/org/apache/tomcat/util/http/Cookies.java
>    tomcat/tc7.0.x/trunk/java/org/apache/tomcat/util/http/Parameters.java
>    tomcat/tc7.0.x/trunk/webapps/docs/changelog.xml
>

Good. Reverting the trick in DirectJDKLog aligns it with pristine
commons-logging code.  The code added to Cookies/Parameters classes is
less scary than I thought it would be.

> --- tomcat/tc7.0.x/trunk/java/org/apache/juli/logging/DirectJDKLog.java 
> (original)
> +++ tomcat/tc7.0.x/trunk/java/org/apache/juli/logging/DirectJDKLog.java Thu 
> Feb  9 16:16:49 2012
> @@ -172,26 +172,13 @@ class DirectJDKLog implements Log {
>             Throwable dummyException=new Throwable();
>             StackTraceElement locations[]=dummyException.getStackTrace();
>             // Caller will be the third element (or later if logger is 
> wrapped)

The "or later" part of the above comment should be removed as well.
It was brought in by r1212093 [1] but it is no more relevant, because
you reverted the code.

[1] 
http://svn.apache.org/viewvc/tomcat/tc7.0.x/trunk/java/org/apache/juli/logging/DirectJDKLog.java?r1=1155369&r2=1212093&diff_format=h

> -            String cname = null;
> -            String method = null;
> -            if (locations != null) {
> -                int i = 2;
> -                while (locations.length > i) {
> -                    StackTraceElement caller = locations[i];
> -                    if (caller.getClassName().startsWith("org.apache.juli")) 
> {
> -                        i++;
> -                    } else {
> -                        cname = caller.getClassName();
> -                        method = caller.getMethodName();
> -                        break;
> -                    }
> -                }
> +            String cname = "unknown";
> +            String method = "unknown";
> +            if (locations != null && locations.length >2) {
> +                StackTraceElement caller = locations[2];
> +                cname = caller.getClassName();
> +                method = caller.getMethodName();
>             }
> -            if (cname == null) {
> -                cname = "unknown";
> -                method = "unknown";
> -            }
> -
>             if (ex==null) {
>                 logger.logp(level, cname, method, msg);
>             } else {
>

(...)

Best regards,
Konstantin Kolinko

-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org

svn commit: r1242434 - /tomcat/trunk/java/org/apache/juli/logging/DirectJDKLog.java

[markt]

Author: markt
Date: Thu Feb  9 18:16:23 2012
New Revision: 1242434

URL: http://svn.apache.org/viewvc?rev=1242434&view=rev
Log:
Fix comment

Modified:
tomcat/trunk/java/org/apache/juli/logging/DirectJDKLog.java

Modified: tomcat/trunk/java/org/apache/juli/logging/DirectJDKLog.java
URL: 
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/juli/logging/DirectJDKLog.java?rev=1242434&r1=1242433&r2=1242434&view=diff
==
--- tomcat/trunk/java/org/apache/juli/logging/DirectJDKLog.java (original)
+++ tomcat/trunk/java/org/apache/juli/logging/DirectJDKLog.java Thu Feb  9 
18:16:23 2012
@@ -171,7 +171,7 @@ class DirectJDKLog implements Log {
 // Hack (?) to get the stack trace.
 Throwable dummyException=new Throwable();
 StackTraceElement locations[]=dummyException.getStackTrace();
-// Caller will be the third element (or later if logger is wrapped)
+// Caller will be the third element
 String cname = "unknown";
 String method = "unknown";
 if (locations != null && locations.length >2) {



-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org

svn commit: r1242437 - in /tomcat/tc7.0.x/trunk: ./ java/org/apache/juli/logging/DirectJDKLog.java

[markt]

Author: markt
Date: Thu Feb  9 18:21:01 2012
New Revision: 1242437

URL: http://svn.apache.org/viewvc?rev=1242437&view=rev
Log:
Fix ocmment

Modified:
tomcat/tc7.0.x/trunk/   (props changed)
tomcat/tc7.0.x/trunk/java/org/apache/juli/logging/DirectJDKLog.java

Propchange: tomcat/tc7.0.x/trunk/
--
--- svn:mergeinfo (original)
+++ svn:mergeinfo Thu Feb  9 18:21:01 2012
@@ -1 +1 @@
-/tomcat/trunk:1156115,1156171,1156276,1156304,1156519,1156530,1156602,1157015,1157018,1157151,1157198,1157204,1157810,1157832,1157834,1157847,1157908,1157939,1158155,1158160,1158176,1158195,1158198-1158199,1158227,1158331,1158334-1158335,1158426,1160347,1160592,1160611,1160619,1160626,1160639,1160652,1160720-1160721,1160772,1160774,1160776,1161303,1161310,1161322,1161339,1161486,1161540,1161549,1161584,1162082,1162149,1162169,1162721,1162769,1162836,1162932,1163630,1164419,1164438,1164469,1164480,1164567,1165234,1165247-1165248,1165253,1165273,1165282,1165309,1165331,1165338,1165347,1165360-1165361,1165367-1165368,1165602,1165608,1165677,1165693,1165721,1165723,1165728,1165730,1165738,1165746,1165765,1165777,1165918,1165921,1166077,1166150-1166151,1166290,1166366,1166620,1166686,1166693,1166752,1166757,1167368,1167394,1169447,1170647,1171692,1172233-1172234,1172236,1172269,1172278,1172282,1172556,1172610,1172664,1172689,1172711,1173020-1173021,1173082,1173088,1173090,1173096
 
,1173241,1173256,1173288,117,1173342,1173461,1173614,1173630,1173659,1173722,1174061,1174239,1174322,1174325,1174329-1174330,1174337-1174339,1174343,1174353,1174799,1174882,1174884,1174975,1174983,1175155,1175158,1175167,1175182,1175190,1175201,1175272,1175275,1175283,1175582,1175589-1175590,1175594,1175602,1175613,1175633,1175690,1175713,1175798,1175889,1175896,1175907,1176584,1176590,1176799,1177050,1177060,1177125,1177152,1177160,1177245,1177850,1177862,1177978,1178209,1178228,1178233,1178449,1178542,1178681,1178684,1178721,1179268,1179274,1180261,1180865,1180891,1180894,1180907,1181028,1181123,1181125,1181136,1181291,1181743,1182796,1183078,1183105,1183142,1183328,1183339-1183340,1183492-1183494,1183605,1184917,1184919,1185018,1185020,1185200,1185588,1185626,1185756,1185758,1186011,1186042-1186045,1186104,1186123,1186137,1186153,1186254,1186257,1186377-1186379,1186479-1186480,1186712,1186743,1186750,1186763,1186890-1186892,1186894,1186949,1187018,1187027-1187028,1187
 
381,1187753,1187755,1187775,1187801,1187806,1187809,1187827,1188301,1188303-1188305,1188399,1188822,1188930-1188931,1189116,1189129,1189183,1189240,1189256,1189386,1189413-1189414,1189477,1189685,1189805,1189857,1189864,1189882,1190034,1190185,1190279,1190339,1190371,1190388-1190389,1190474,1190481,1194915,1195222-1195223,1195531,1195899,1195905,1195943,1195949,1195953,1195955,1195965,1195968,1196175,1196212,1196223,1196304-1196305,1196735,1196825,1196827,1197158,1197261,1197263,1197299-1197300,1197305,1197339-1197340,1197343,1197382,1197386-1197387,1197480,1197578,1198497,1198528,1198552,1198602,1198604,1198607,1198622,1198640,1198696,1198707,1199418,1199432,1199436,1199513,1199529,1199980,116,1200056,1200089,1200106-1200107,1200263,1200316,1200320,1200398-1200399,1200445-1200446,1200555,1200627,1200696,1200725,1200937,1200941,1201069,1201087,1201180,1201235-1201237,1201508,1201521,1201542,1201545-1201546,1201548,1201555-1201556,1201568,1201576,1201608,1201921-1201922,1
 
201931,1202035,1202039,1202271,1202565,1202578,1202705,1202828,1202860,1203047-1203052,1203078,1203091,1203253,1203278,1204182,1204856,1204867,1204936,1204938,1204982,1205033,1205065,1205082,1205097,1205112,1206200,1207692,1208046,1208073,1208096,1208114,1208145,1208772,1209194,1209277-1209278,1209686-1209731,1210894,1212091,1212095,1212099,1212118,1213469,1213906,1214853,1214855,1214864,1215115,1215118-1215119,1215121,1220293,1220295,1221038,1221842,1222189,101,176,1222300,1222690,1222850,1222852,1222855,1224607,1224617,1224648-1224652,1224657,1224662-1224663,1224682,1224801,1224910,1225000,1225219,1225343,1225465,1225627,1225629,1225634,1226069,1226158-1226159,1226177,1226196,1226214-1226215,1226385,1226394,1226500,1226537-1226538,1226546,1226551,1226975,1228196,1228360,1228376,1228724,1228908,1228918,1228920,1228922,1228929,1228969,1229307,1229536,1229549,1229724,1229726-1229731,1229997,1230539,1230711,1230729,1230762-1230763,1230765,1230955,1230957,1231285,123129
 
0,1231308,1231310,1231337,1231460-1231461,1231542-1231543,1231546-1231547,1231620-1231621,1231624-1231625,1231630,1231654-1231655,1231738,1231740,1231762-1231763,1231856,1231886,1231923,1231947,1232345,1232368,1232380,1232447,1232760,1232813,1232842-1232843,1232869,1233413,1233423,1233426,1234143,1234567,1235207,1236906-1236907,1236914,1237146,1237154-1237156,1237332,1237334,1237425,1237427,1237604,1237975,1237981,1237985,1238070,1238073,1239024,1239048,1239050,1239060,1239135,1239483,1239485,1240101,1240106,1240109,1240112,1240114,1240116,1240118,1240121,124

DO NOT REPLY [Bug 52634] New: Typos in Examples

[bugzilla]

https://issues.apache.org/bugzilla/show_bug.cgi?id=52634

 Bug #: 52634
   Summary: Typos in Examples
   Product: Tomcat 7
   Version: trunk
  Platform: All
OS/Version: All
Status: NEW
  Severity: trivial
  Priority: P2
 Component: Examples
AssignedTo: dev@tomcat.apache.org
ReportedBy: felix.schumac...@internetallee.de
Classification: Unclassified


Created attachment 28295
  --> https://issues.apache.org/bugzilla/attachment.cgi?id=28295
Correct a typo lanaguage->language, add an 'are' and remove version number 5
from tomcat

Three minor glitches in the examples jsp's.
 * Lanaguage -> Language 
  this mistake seems to be copied in modules/jdbc-pool
 * mentioning of tomcat 5
  While this is certainly true, it is also true for 6, 7 and trunk. So removing
the number seems right to me
 * add an 'are'
  Here I am not 100% sure, if are is really missing.

-- 
Configure bugmail: https://issues.apache.org/bugzilla/userprefs.cgi?tab=email
--- You are receiving this mail because: ---
You are the assignee for the bug.

-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org

svn commit: r1242495 - in /tomcat/trunk/webapps/examples/jsp: jsp2/el/implicit-objects.jsp tagplugin/howto.html tagplugin/notes.html

[rjung]

Author: rjung
Date: Thu Feb  9 19:56:54 2012
New Revision: 1242495

URL: http://svn.apache.org/viewvc?rev=1242495&view=rev
Log:
BZ 52634: Typos in Examples.

Patch provided by Felix Schumacher.

Modified:
tomcat/trunk/webapps/examples/jsp/jsp2/el/implicit-objects.jsp
tomcat/trunk/webapps/examples/jsp/tagplugin/howto.html
tomcat/trunk/webapps/examples/jsp/tagplugin/notes.html

Modified: tomcat/trunk/webapps/examples/jsp/jsp2/el/implicit-objects.jsp
URL: 
http://svn.apache.org/viewvc/tomcat/trunk/webapps/examples/jsp/jsp2/el/implicit-objects.jsp?rev=1242495&r1=1242494&r2=1242495&view=diff
==
--- tomcat/trunk/webapps/examples/jsp/jsp2/el/implicit-objects.jsp (original)
+++ tomcat/trunk/webapps/examples/jsp/jsp2/el/implicit-objects.jsp Thu Feb  9 
19:56:54 2012
@@ -24,7 +24,7 @@
 JSP 2.0 Expression Language - Implicit Objects
 
 This example illustrates some of the implicit objects available
-in the Expression Lanaguage.  The following implicit objects are
+in the Expression Language.  The following implicit objects are
 available (not all illustrated here):
 
   pageContext - the PageContext object

Modified: tomcat/trunk/webapps/examples/jsp/tagplugin/howto.html
URL: 
http://svn.apache.org/viewvc/tomcat/trunk/webapps/examples/jsp/tagplugin/howto.html?rev=1242495&r1=1242494&r2=1242495&view=diff
==
--- tomcat/trunk/webapps/examples/jsp/tagplugin/howto.html (original)
+++ tomcat/trunk/webapps/examples/jsp/tagplugin/howto.html Thu Feb  9 19:56:54 
2012
@@ -21,7 +21,7 @@
   
 How to write tag plugins
 
-  To write a plugin, you'll need to download the source for Tomcat 5.
+  To write a plugin, you'll need to download the source for Tomcat.
   There are two steps:
 
   

Modified: tomcat/trunk/webapps/examples/jsp/tagplugin/notes.html
URL: 
http://svn.apache.org/viewvc/tomcat/trunk/webapps/examples/jsp/tagplugin/notes.html?rev=1242495&r1=1242494&r2=1242495&view=diff
==
--- tomcat/trunk/webapps/examples/jsp/tagplugin/notes.html (original)
+++ tomcat/trunk/webapps/examples/jsp/tagplugin/notes.html Thu Feb  9 19:56:54 
2012
@@ -21,17 +21,17 @@
   
 Tag Plugins: Introductory Notes
 
-  Tomcat 5 provides a framework for implementing tag plugins.  The
+  Tomcat provides a framework for implementing tag plugins.  The
   plugins instruct Jasper, at translation time, to replace tag handler
   calls with Java scriptlets.
   The framework allows tag library authors to implement plugins for
   their tags.
 
 
-  Tomcat 5 is released with plugins for several JSTL tags.  Note
+  Tomcat is released with plugins for several JSTL tags.  Note
   that these plugins work with JSTL 1.1 as well as JSTL 1.0, though
   the examples uses JSTL 1.1 and JSP 2.0.
-  These plugins are not complete (for instance, some item types not
+  These plugins are not complete (for instance, some item types are not
   handled in ).
   They do serve as examples to show plugins in action (just
   examine the generated Java files), and how they can be implemented.



-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org

svn commit: r1242499 - in /tomcat/tc7.0.x/trunk: ./ webapps/docs/changelog.xml webapps/examples/jsp/jsp2/el/implicit-objects.jsp webapps/examples/jsp/tagplugin/howto.html webapps/examples/jsp/tagplugi

[rjung]

Author: rjung
Date: Thu Feb  9 20:01:41 2012
New Revision: 1242499

URL: http://svn.apache.org/viewvc?rev=1242499&view=rev
Log:
BZ 52634: Fix typos in JSP examples.
Patch provided by Felix Schumacher.

Backport of r1242495 from trunk.

Modified:
tomcat/tc7.0.x/trunk/   (props changed)
tomcat/tc7.0.x/trunk/webapps/docs/changelog.xml
tomcat/tc7.0.x/trunk/webapps/examples/jsp/jsp2/el/implicit-objects.jsp
tomcat/tc7.0.x/trunk/webapps/examples/jsp/tagplugin/howto.html
tomcat/tc7.0.x/trunk/webapps/examples/jsp/tagplugin/notes.html

Propchange: tomcat/tc7.0.x/trunk/
--
--- svn:mergeinfo (original)
+++ svn:mergeinfo Thu Feb  9 20:01:41 2012
@@ -1 +1 @@
-/tomcat/trunk:1156115,1156171,1156276,1156304,1156519,1156530,1156602,1157015,1157018,1157151,1157198,1157204,1157810,1157832,1157834,1157847,1157908,1157939,1158155,1158160,1158176,1158195,1158198-1158199,1158227,1158331,1158334-1158335,1158426,1160347,1160592,1160611,1160619,1160626,1160639,1160652,1160720-1160721,1160772,1160774,1160776,1161303,1161310,1161322,1161339,1161486,1161540,1161549,1161584,1162082,1162149,1162169,1162721,1162769,1162836,1162932,1163630,1164419,1164438,1164469,1164480,1164567,1165234,1165247-1165248,1165253,1165273,1165282,1165309,1165331,1165338,1165347,1165360-1165361,1165367-1165368,1165602,1165608,1165677,1165693,1165721,1165723,1165728,1165730,1165738,1165746,1165765,1165777,1165918,1165921,1166077,1166150-1166151,1166290,1166366,1166620,1166686,1166693,1166752,1166757,1167368,1167394,1169447,1170647,1171692,1172233-1172234,1172236,1172269,1172278,1172282,1172556,1172610,1172664,1172689,1172711,1173020-1173021,1173082,1173088,1173090,1173096
 
,1173241,1173256,1173288,117,1173342,1173461,1173614,1173630,1173659,1173722,1174061,1174239,1174322,1174325,1174329-1174330,1174337-1174339,1174343,1174353,1174799,1174882,1174884,1174975,1174983,1175155,1175158,1175167,1175182,1175190,1175201,1175272,1175275,1175283,1175582,1175589-1175590,1175594,1175602,1175613,1175633,1175690,1175713,1175798,1175889,1175896,1175907,1176584,1176590,1176799,1177050,1177060,1177125,1177152,1177160,1177245,1177850,1177862,1177978,1178209,1178228,1178233,1178449,1178542,1178681,1178684,1178721,1179268,1179274,1180261,1180865,1180891,1180894,1180907,1181028,1181123,1181125,1181136,1181291,1181743,1182796,1183078,1183105,1183142,1183328,1183339-1183340,1183492-1183494,1183605,1184917,1184919,1185018,1185020,1185200,1185588,1185626,1185756,1185758,1186011,1186042-1186045,1186104,1186123,1186137,1186153,1186254,1186257,1186377-1186379,1186479-1186480,1186712,1186743,1186750,1186763,1186890-1186892,1186894,1186949,1187018,1187027-1187028,1187
 
381,1187753,1187755,1187775,1187801,1187806,1187809,1187827,1188301,1188303-1188305,1188399,1188822,1188930-1188931,1189116,1189129,1189183,1189240,1189256,1189386,1189413-1189414,1189477,1189685,1189805,1189857,1189864,1189882,1190034,1190185,1190279,1190339,1190371,1190388-1190389,1190474,1190481,1194915,1195222-1195223,1195531,1195899,1195905,1195943,1195949,1195953,1195955,1195965,1195968,1196175,1196212,1196223,1196304-1196305,1196735,1196825,1196827,1197158,1197261,1197263,1197299-1197300,1197305,1197339-1197340,1197343,1197382,1197386-1197387,1197480,1197578,1198497,1198528,1198552,1198602,1198604,1198607,1198622,1198640,1198696,1198707,1199418,1199432,1199436,1199513,1199529,1199980,116,1200056,1200089,1200106-1200107,1200263,1200316,1200320,1200398-1200399,1200445-1200446,1200555,1200627,1200696,1200725,1200937,1200941,1201069,1201087,1201180,1201235-1201237,1201508,1201521,1201542,1201545-1201546,1201548,1201555-1201556,1201568,1201576,1201608,1201921-1201922,1
 
201931,1202035,1202039,1202271,1202565,1202578,1202705,1202828,1202860,1203047-1203052,1203078,1203091,1203253,1203278,1204182,1204856,1204867,1204936,1204938,1204982,1205033,1205065,1205082,1205097,1205112,1206200,1207692,1208046,1208073,1208096,1208114,1208145,1208772,1209194,1209277-1209278,1209686-1209731,1210894,1212091,1212095,1212099,1212118,1213469,1213906,1214853,1214855,1214864,1215115,1215118-1215119,1215121,1220293,1220295,1221038,1221842,1222189,101,176,1222300,1222690,1222850,1222852,1222855,1224607,1224617,1224648-1224652,1224657,1224662-1224663,1224682,1224801,1224910,1225000,1225219,1225343,1225465,1225627,1225629,1225634,1226069,1226158-1226159,1226177,1226196,1226214-1226215,1226385,1226394,1226500,1226537-1226538,1226546,1226551,1226975,1228196,1228360,1228376,1228724,1228908,1228918,1228920,1228922,1228929,1228969,1229307,1229536,1229549,1229724,1229726-1229731,1229997,1230539,1230711,1230729,1230762-1230763,1230765,1230955,1230957,1231285,123129
 
0,1231308,1231310,1231337,1231460-1231461,1231542-1231543,1231546-1231547,1231620-1231621,1231624-1231625,1231630,1231654-1231655,1231738,1231740,1231762-1231763,1231856,1231886,1231923,1231947,1232345,1232368,1232380,1232447,1232760,1232813,1232842-1232843,1232869,1233413,1233423

DO NOT REPLY [Bug 52634] Typos in Examples

[bugzilla]

https://issues.apache.org/bugzilla/show_bug.cgi?id=52634

--- Comment #1 from Rainer Jung  2012-02-09 20:03:22 
UTC ---
Thanks Felix. Applied to trunk in r1242495 and to TC 7 in r1242499. Will be
part of 7.0.26. Keep the contributions coming :)

Regards,

Rainer

-- 
Configure bugmail: https://issues.apache.org/bugzilla/userprefs.cgi?tab=email
--- You are receiving this mail because: ---
You are the assignee for the bug.

-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org

Misconfigured Git-SVN once again

[Konstantin Kolinko]

Hi!

Some recent Mark's commits once again caused several new files to have
wrong line ends at the server side.

This is a technical issue where the "pristine" texts for the files
that have svn:eol-style=native property set at the server side have
CRLF line ends, instead of LFs as required by svn.

The consequence of this can be seen in "r1241441" e-mail where there
are huge whole-file diffs for simple changes.

To prevent such huge diffs for those files from occurring in the
future, I am going to fix those files.

My plan is the following:
1. Do clean checkout of trunk
2. "touch" all the files, i.e. update their timestamp
3. Commit.

The essence is that after "touch" the "svn status" command cannot
treat the files as unmodified but will be forced to compare the actual
files and their pristine copies. The broken files will be shown as
modified ones.

The affected files are the following:
>svn st
M   trunk\java\org\apache\coyote\http11\upgrade\Constants.java
M   trunk\java\org\apache\coyote\http11\upgrade\UpgradeBioProcessor.java
M   trunk\java\org\apache\coyote\http11\upgrade\UpgradeProcessor.java
M   trunk\java\org\apache\coyote\http11\upgrade\UpgradeAprProcessor.java
M   trunk\java\org\apache\coyote\http11\upgrade\UpgradeNioProcessor.java
M   trunk\webapps\examples\websocket\index.html


Best regards,
Konstantin Kolinko

-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org

svn commit: r1242584 - in /tomcat/trunk: java/org/apache/coyote/http11/upgrade/ webapps/examples/websocket/

[kkolinko]

Author: kkolinko
Date: Thu Feb  9 22:50:52 2012
New Revision: 1242584

URL: http://svn.apache.org/viewvc?rev=1242584&view=rev
Log:
Fix line ends in the files.

This is technical commit to recover from eoln brokeness from commits via 
svn-git intergration. See thread on dev@. This commit should not change 
anything besides the line ends.

Modified:
tomcat/trunk/java/org/apache/coyote/http11/upgrade/Constants.java
tomcat/trunk/java/org/apache/coyote/http11/upgrade/UpgradeAprProcessor.java
tomcat/trunk/java/org/apache/coyote/http11/upgrade/UpgradeBioProcessor.java
tomcat/trunk/java/org/apache/coyote/http11/upgrade/UpgradeNioProcessor.java
tomcat/trunk/java/org/apache/coyote/http11/upgrade/UpgradeProcessor.java
tomcat/trunk/webapps/examples/websocket/index.html

Modified: tomcat/trunk/java/org/apache/coyote/http11/upgrade/Constants.java
URL: 
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/coyote/http11/upgrade/Constants.java?rev=1242584&r1=1242583&r2=1242584&view=diff
==
--- tomcat/trunk/java/org/apache/coyote/http11/upgrade/Constants.java (original)
+++ tomcat/trunk/java/org/apache/coyote/http11/upgrade/Constants.java Thu Feb  
9 22:50:52 2012
@@ -1,22 +1,22 @@
-/*
- *  Licensed to the Apache Software Foundation (ASF) under one or more
- *  contributor license agreements.  See the NOTICE file distributed with
- *  this work for additional information regarding copyright ownership.
- *  The ASF licenses this file to You under the Apache License, Version 2.0
- *  (the "License"); you may not use this file except in compliance with
- *  the License.  You may obtain a copy of the License at
- *
- *  http://www.apache.org/licenses/LICENSE-2.0
- *
- *  Unless required by applicable law or agreed to in writing, software
- *  distributed under the License is distributed on an "AS IS" BASIS,
- *  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- *  See the License for the specific language governing permissions and
- *  limitations under the License.
- */
-package org.apache.coyote.http11.upgrade;
-
-public class Constants {
-
-public static final String Package = "org.apache.coyote.http11.upgrade";
-}
+/*
+ *  Licensed to the Apache Software Foundation (ASF) under one or more
+ *  contributor license agreements.  See the NOTICE file distributed with
+ *  this work for additional information regarding copyright ownership.
+ *  The ASF licenses this file to You under the Apache License, Version 2.0
+ *  (the "License"); you may not use this file except in compliance with
+ *  the License.  You may obtain a copy of the License at
+ *
+ *  http://www.apache.org/licenses/LICENSE-2.0
+ *
+ *  Unless required by applicable law or agreed to in writing, software
+ *  distributed under the License is distributed on an "AS IS" BASIS,
+ *  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ *  See the License for the specific language governing permissions and
+ *  limitations under the License.
+ */
+package org.apache.coyote.http11.upgrade;
+
+public class Constants {
+
+public static final String Package = "org.apache.coyote.http11.upgrade";
+}

Modified: 
tomcat/trunk/java/org/apache/coyote/http11/upgrade/UpgradeAprProcessor.java
URL: 
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/coyote/http11/upgrade/UpgradeAprProcessor.java?rev=1242584&r1=1242583&r2=1242584&view=diff
==
--- tomcat/trunk/java/org/apache/coyote/http11/upgrade/UpgradeAprProcessor.java 
(original)
+++ tomcat/trunk/java/org/apache/coyote/http11/upgrade/UpgradeAprProcessor.java 
Thu Feb  9 22:50:52 2012
@@ -1,73 +1,73 @@
-/*
- *  Licensed to the Apache Software Foundation (ASF) under one or more
- *  contributor license agreements.  See the NOTICE file distributed with
- *  this work for additional information regarding copyright ownership.
- *  The ASF licenses this file to You under the Apache License, Version 2.0
- *  (the "License"); you may not use this file except in compliance with
- *  the License.  You may obtain a copy of the License at
- *
- *  http://www.apache.org/licenses/LICENSE-2.0
- *
- *  Unless required by applicable law or agreed to in writing, software
- *  distributed under the License is distributed on an "AS IS" BASIS,
- *  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- *  See the License for the specific language governing permissions and
- *  limitations under the License.
- */
-package org.apache.coyote.http11.upgrade;
-
-import java.io.IOException;
-
-import org.apache.tomcat.jni.Socket;
-import org.apache.tomcat.util.net.SocketWrapper;
-
-/**
- * Implementation note: The need to extend Http11Processor could probably be
- * removed if the Processor interface was expanded to cover all of the methods
- * required by the AbstractProtocol. That wou

Re: Misconfigured Git-SVN once again

[Konstantin Kolinko]

2012/2/10 Konstantin Kolinko :
> Hi!
>
> Some recent Mark's commits once again caused several new files to have
> wrong line ends at the server side.
>
> This is a technical issue where the "pristine" texts for the files
> that have svn:eol-style=native property set at the server side have
> CRLF line ends, instead of LFs as required by svn.
>
> The consequence of this can be seen in "r1241441" e-mail where there
> are huge whole-file diffs for simple changes.
>
> To prevent such huge diffs for those files from occurring in the
> future, I am going to fix those files.
>
> My plan is the following:
> 1. Do clean checkout of trunk
> 2. "touch" all the files, i.e. update their timestamp
> 3. Commit.
>
> The essence is that after "touch" the "svn status" command cannot
> treat the files as unmodified but will be forced to compare the actual
> files and their pristine copies. The broken files will be shown as
> modified ones.
>
> The affected files are the following:
>>svn st
> M       trunk\java\org\apache\coyote\http11\upgrade\Constants.java
> M       trunk\java\org\apache\coyote\http11\upgrade\UpgradeBioProcessor.java
> M       trunk\java\org\apache\coyote\http11\upgrade\UpgradeProcessor.java
> M       trunk\java\org\apache\coyote\http11\upgrade\UpgradeAprProcessor.java
> M       trunk\java\org\apache\coyote\http11\upgrade\UpgradeNioProcessor.java
> M       trunk\webapps\examples\websocket\index.html
>

Fixed in trunk in r1242584.

I've also checked that tc7.0.x does not have this issue.

Best regards,
Konstantin Kolinko

-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org

DO NOT REPLY [Bug 51181] Add support for Web Sockets

[bugzilla]

https://issues.apache.org/bugzilla/show_bug.cgi?id=51181

--- Comment #32 from Adam Walczak  2012-02-09 23:53:16 
UTC ---
PS. Oracle just put out JSR-356 for WebSockect:
http://jcp.org/en/jsr/detail?id=356
might come in handy for this issue

-- 
Configure bugmail: https://issues.apache.org/bugzilla/userprefs.cgi?tab=email
--- You are receiving this mail because: ---
You are the assignee for the bug.

-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org

svn commit: r1242669 - /tomcat/taglibs/site/src/site/xdoc/site/using.xml

[bayard]

Author: bayard
Date: Fri Feb 10 04:51:55 2012
New Revision: 1242669

URL: http://svn.apache.org/viewvc?rev=1242669&view=rev
Log:
Removing link to Jakarta download pag

Modified:
tomcat/taglibs/site/src/site/xdoc/site/using.xml

Modified: tomcat/taglibs/site/src/site/xdoc/site/using.xml
URL: 
http://svn.apache.org/viewvc/tomcat/taglibs/site/src/site/xdoc/site/using.xml?rev=1242669&r1=1242668&r2=1242669&view=diff
==
--- tomcat/taglibs/site/src/site/xdoc/site/using.xml (original)
+++ tomcat/taglibs/site/src/site/xdoc/site/using.xml Fri Feb 10 04:51:55 2012
@@ -10,10 +10,7 @@
 
 
 
-Binary downloads of released versions of the Apache Taglibs
-distributions are available via the download link - 
-at http://jakarta.apache.org/site/downloads/downloads_taglibs.html";>http://jakarta.apache.org/site/downloads/downloads_taglibs.html.
-Download and unpack the distribution archive into a convenient subdirectory.
+Binary downloads of released versions of the Apache Taglibs distributions 
are available from each components website. 
 
 Note that for now, these distributions are legacy versions from the Jakarta 
Taglibs days. While current development is built 
 using Maven, the binary builds were created, and the source builds require, an 
Ant build system. 



-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org

svn commit: r1242671 - /tomcat/taglibs/site/src/site/xdoc/site/news.xml

[bayard]

Author: bayard
Date: Fri Feb 10 04:56:24 2012
New Revision: 1242671

URL: http://svn.apache.org/viewvc?rev=1242671&view=rev
Log:
Pointing links to archive downloads

Modified:
tomcat/taglibs/site/src/site/xdoc/site/news.xml

Modified: tomcat/taglibs/site/src/site/xdoc/site/news.xml
URL: 
http://svn.apache.org/viewvc/tomcat/taglibs/site/src/site/xdoc/site/news.xml?rev=1242671&r1=1242670&r2=1242671&view=diff
==
--- tomcat/taglibs/site/src/site/xdoc/site/news.xml (original)
+++ tomcat/taglibs/site/src/site/xdoc/site/news.xml Fri Feb 10 04:56:24 2012
@@ -67,14 +67,14 @@
   
 
 Version 1.0.0 of the Reusable Dialog Components (RDC) Taglib has been 
-http://jakarta.apache.org/site/downloads/downloads_taglibs-rdc.cgi";>
+http://archive.apache.org/dist/jakarta/taglibs/rdc/";>
 released.
   
   10/25/2004
 [http://jakarta.apache.org/taglibs/doc/standard-doc/intro.html";>standard]
   
 Version 1.1.2 of the Standard Taglib 1.1 (JSTL 1.1) has been 
-http://jakarta.apache.org/site/binindex.cgi#Release%20Builds";>
+http://archive.apache.org/dist/jakarta/taglibs/standard/";>
 
 released.
   
@@ -82,7 +82,7 @@
 [http://jakarta.apache.org/taglibs/doc/standard-doc/intro.html";>standard]
   
 Version 1.1.1 of the Standard Taglib 1.1 (JSTL 1.1) has been 
-http://jakarta.apache.org/site/binindex.cgi#Release%20Builds";>
+http://archive.apache.org/dist/jakarta/taglibs/standard/";>
 released.
   
 
@@ -90,7 +90,7 @@
 [http://jakarta.apache.org/taglibs/doc/standard-1.0-doc/intro.html";>standard-1.0]
   
 Version 1.0.6 of the Standard Taglib 1.0 (JSTL 1.0) has been 
-http://jakarta.apache.org/site/binindex.cgi#Release%20Builds";>
+http://archive.apache.org/dist/jakarta/taglibs/standard/";>
 released.
   
   05/17/2004
@@ -113,25 +113,25 @@
   01/30/2004
Standard Taglib version 1.1.0 - First official release of our 
implementation of JSTL 1.1 - is now
-   available from the http://jakarta.apache.org/site/binindex.cgi#Release%20Builds";>
+   available from the http://archive.apache.org/dist/jakarta/taglibs/standard/";>
 
Apache Jakarta Project Mirrors.
   
   01/30/2004
Standard Taglib version 1.0.5 (JSTL 1.0) - another bugfix release - is 
now
-   available from the http://jakarta.apache.org/site/binindex.cgi#Release%20Builds";>
+   available from the http://archive.apache.org/dist/jakarta/taglibs/standard/";>
Apache Jakarta Project Mirrors.
   
   09/25/2003
 
Standard Taglib version 1.1.0-B1 - early access (Beta 1) of our 
implementation of JSTL 1.1 - is now
-   available from the http://jakarta.apache.org/site/binindex.cgi#Release%20Builds";>
+   available from the http://archive.apache.org/dist/jakarta/taglibs/standard/";>
Apache Jakarta Project Mirrors.
   
   09/25/2003
Standard Taglib version 1.0.4 (JSTL 1.0) - another bugfix release - is 
now
-   available from the http://jakarta.apache.org/site/binindex.cgi#Release%20Builds";>
+   available from the http://archive.apache.org/dist/jakarta/taglibs/standard/";>
Apache Jakarta Project Mirrors.
   
 
@@ -249,7 +249,7 @@
   
   7/27/2002
Standard Taglib version 1.0.1 -- a minor bugfix release -- is now
-   http://www.apache.org/dist/jakarta/taglibs/releases/standard/";>
+   http://archive.apache.org/dist/jakarta/taglibs/standard/";>
available.
   
 
@@ -259,7 +259,7 @@
 Final 1.0 release of Jakarta Taglibs's Standard Taglib,
 an implementation of the JSP Standard Tag Library (JSTL),
 is now available for
-http://www.apache.org/dist/jakarta/taglibs/releases/standard/";>
+http://archive.apache.org/dist/jakarta/taglibs/standard/";>
 download.
   
 



-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org

svn commit: r1242673 - /tomcat/taglibs/rdc/trunk/src/site/xdoc/index.xml

[bayard]

Author: bayard
Date: Fri Feb 10 04:59:42 2012
New Revision: 1242673

URL: http://svn.apache.org/viewvc?rev=1242673&view=rev
Log:
Fixing download link to point to archives

Modified:
tomcat/taglibs/rdc/trunk/src/site/xdoc/index.xml

Modified: tomcat/taglibs/rdc/trunk/src/site/xdoc/index.xml
URL: 
http://svn.apache.org/viewvc/tomcat/taglibs/rdc/trunk/src/site/xdoc/index.xml?rev=1242673&r1=1242672&r2=1242673&view=diff
==
--- tomcat/taglibs/rdc/trunk/src/site/xdoc/index.xml (original)
+++ tomcat/taglibs/rdc/trunk/src/site/xdoc/index.xml Fri Feb 10 04:59:42 2012
@@ -135,9 +135,9 @@ Tag handlers implemented in Java extend 
   Components (RDC) Tag Library:
   
   
-Download the RDC Tag Library 1.0 release from an
-http://jakarta.apache.org/site/downloads/downloads_taglibs-rdc.cgi";>
-Apache Jakarta Project Mirror
+Download the RDC Tag Library 1.0 release from the
+http://archive.apache.org/dist/jakarta/taglibs/rdc/";>
+Apache Archives
   
   
   



-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org

svn commit: r1242674 - /tomcat/taglibs/standard/trunk/src/site/xdoc/index.xml

[bayard]

Author: bayard
Date: Fri Feb 10 05:00:55 2012
New Revision: 1242674

URL: http://svn.apache.org/viewvc?rev=1242674&view=rev
Log:
Fix the download link to point to the archives

Modified:
tomcat/taglibs/standard/trunk/src/site/xdoc/index.xml

Modified: tomcat/taglibs/standard/trunk/src/site/xdoc/index.xml
URL: 
http://svn.apache.org/viewvc/tomcat/taglibs/standard/trunk/src/site/xdoc/index.xml?rev=1242674&r1=1242673&r2=1242674&view=diff
==
--- tomcat/taglibs/standard/trunk/src/site/xdoc/index.xml (original)
+++ tomcat/taglibs/standard/trunk/src/site/xdoc/index.xml Fri Feb 10 05:00:55 
2012
@@ -48,13 +48,13 @@
 Standard 1.1
 JSTL 1.1
 Servlet 2.4, JavaServer Pages 2.0
-http://jakarta.apache.org/site/downloads/downloads_taglibs-standard.cgi";>download
+http://archive.apache.org/dist/jakarta/taglibs/standard/";>download
   
   
 Standard 1.0
 JSTL 1.0
 Servlet 2.3, JavaServer Pages 1.2
-http://jakarta.apache.org/site/downloads/downloads_taglibs-standard-1.0.cgi";>download
+http://archive.apache.org/dist/jakarta/taglibs/standard/";>download
   
 
 



-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org

DO NOT REPLY [Bug 51382] Link to download pages are broken

[bugzilla]

https://issues.apache.org/bugzilla/show_bug.cgi?id=51382

--- Comment #3 from Henri Yandell  2012-02-10 05:02:14 UTC 
---
I've pointed the various site links away from Jakarta and to the Archives.

-- 
Configure bugmail: https://issues.apache.org/bugzilla/userprefs.cgi?tab=email
--- You are receiving this mail because: ---
You are the assignee for the bug.

-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org

svn commit: r1242676 - /tomcat/taglibs/rdc/trunk/src/site/xdoc/index.xml

[bayard]

Author: bayard
Date: Fri Feb 10 05:06:33 2012
New Revision: 1242676

URL: http://svn.apache.org/viewvc?rev=1242676&view=rev
Log:
Fixing links

Modified:
tomcat/taglibs/rdc/trunk/src/site/xdoc/index.xml

Modified: tomcat/taglibs/rdc/trunk/src/site/xdoc/index.xml
URL: 
http://svn.apache.org/viewvc/tomcat/taglibs/rdc/trunk/src/site/xdoc/index.xml?rev=1242676&r1=1242675&r2=1242676&view=diff
==
--- tomcat/taglibs/rdc/trunk/src/site/xdoc/index.xml (original)
+++ tomcat/taglibs/rdc/trunk/src/site/xdoc/index.xml Fri Feb 10 05:06:33 2012
@@ -145,12 +145,12 @@ Tag handlers implemented in Java extend 
   For information on how to use the distributions in the download section,
 look at the following documentation:
   
-Using the Jakarta-Taglibs
-  http://jakarta.apache.org/taglibs/site/using.html";>
+Using the Apache Taglibs
+  http://tomcat.apache.org/taglibs/site/using.html";>
   Binary Distribution
 
-Using the Jakarta-Taglibs
-  http://jakarta.apache.org/taglibs/site/building.html";>
+Using the Apache Taglibs
+  http://tomcat.apache.org/taglibs/site/building.html";>
   Source Distribution
 
   



-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org

DO NOT REPLY [Bug 50825] Site still has links to Jakarta for mailing lists etc

[bugzilla]

https://issues.apache.org/bugzilla/show_bug.cgi?id=50825

--- Comment #1 from Henri Yandell  2012-02-10 05:10:18 UTC 
---
I've judiciously regexped it:

 perl -pi -e 's/jakarta.apache.org\/taglibs/tomcat.apache.org\/taglibs/' * */*
 perl -pi -e 's/jakarta.apache.org\/tomcat/tomcat.apache.org/g' * */*

-- 
Configure bugmail: https://issues.apache.org/bugzilla/userprefs.cgi?tab=email
--- You are receiving this mail because: ---
You are the assignee for the bug.

-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org