Re:RE: About Tomcat transplantation

2011-05-17 Thread
Thank you very much for your answer。
These days,we can complie and run the Tomcat7 source code in the 32bit/64bit 
LFS system .It run very well.But,now,I don't know what to do with this runnable 
tomcat.We can see the cat on the web page,and how can  I make sure that it can 
run the Tomcat's complete function?

And I hava some other question.Thanks.

On my new system(our cpu and OS and JDK),we may modify the source code,include 
remove or add some module.After that ,how can I know the new tomcat is 
complete,in other words,how can I test the Tomcat's function after we alter 
it.Is there any standard about it? I see some 'test' in the Tomcat source 
code.But I see some of those are for the bugs.And can I get all the test info 
after I run "ant test" in Ant?

And,because our JDK is being test,there are some problem in it .I think when I 
test the Tomcat on this JDK there may be some mistake.So I can remove some 
module from Tomcat for look which module can't run on this JDK.I study the 
Tomcat source code for many days,but I don't know which module are 
necessary.This may be a trouble question,or my question is about the test for 
the Tomcat essentially.

Thank you very much!!And my English is poor and use some wrong words .I'm sorry 
about that!



在2011-05-10 11:45:39,"Caldarale, Charles R"  写道:
>> From: 张 [mailto:howzmhw...@126.com] 
>> Subject: About Tomcat transplantation
>
>> I am explanting Tomcat7 application using souce code to an 
>> our own System.
>
>Been there, done that, got several t-shirts.
>
>You shouldn't have to compile Tomcat at all - if your JDK can pass most of the 
>JCK tests (and a bit more).  Since Tomcat proper is pure Java, all you really 
>have to worry about is making the JVM work on your platform.  Besides using 
>Tomcat in production on our extremely proprietary hardware and OS, we also use 
>it to debug our JVM.
>
>If you want to include the Tomcat native library, you'll need to be able to 
>build APR and OpenSSL - but since Tomcat works fine using the JSSE component 
>of the JRE, I wouldn't bother with those.  Concentrate on getting the JVM 
>working.
>
>> what other package or tool is needed on the new system?
>
>Again, nothing other than a Tomcat binary download is needed.  If you do 
>choose to build from source, you'll have to have ant working.  The ant build 
>script for Tomcat will automatically download all the other pieces it needs.  
>However, you can build Tomcat on any platform and then run it on an entirely 
>different one.
>
> - Chuck
>
>
>THIS COMMUNICATION MAY CONTAIN CONFIDENTIAL AND/OR OTHERWISE PROPRIETARY 
>MATERIAL and is thus for use only by the intended recipient. If you received 
>this in error, please contact the sender and delete the e-mail and its 
>attachments from all computers.
>


DO NOT REPLY [Bug 51208] New: SVN TRUNK : JDBC interceptor options are not taken into account

2011-05-17 Thread bugzilla
https://issues.apache.org/bugzilla/show_bug.cgi?id=51208

 Bug #: 51208
   Summary: SVN TRUNK : JDBC interceptor options are not taken
into account
   Product: Tomcat Modules
   Version: unspecified
  Platform: All
OS/Version: All
Status: NEW
  Severity: major
  Priority: P2
 Component: jdbc-pool
AssignedTo: dev@tomcat.apache.org
ReportedBy: p.moua...@ubik-ingenierie.com
Classification: Unclassified


Created attachment 27013
  --> https://issues.apache.org/bugzilla/attachment.cgi?id=27013
Fix

Hello,
I added the following jdbcInterceptor:
org.apache.tomcat.jdbc.pool.interceptor.SlowQueryReportJmx(threshold=100,
maxQueries=5000)

But options are not taken into account, what happens is that options are 
applied to the N-1 interceptor due to the Hard positionning of TrapException.


I provide the patch that fixes the issue.
Regards
Philippe Mouawad
http://www.ubik-ingenierie.com

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



DO NOT REPLY [Bug 51208] SVN TRUNK : JDBC interceptor options are not taken into account

2011-05-17 Thread bugzilla
https://issues.apache.org/bugzilla/show_bug.cgi?id=51208

Philippe Mouawad  changed:

   What|Removed |Added

 CC||p.mouawad@ubik-ingenierie.c
   ||om

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



DO NOT REPLY [Bug 51208] SVN TRUNK : JDBC interceptor options are not taken into account

2011-05-17 Thread bugzilla
https://issues.apache.org/bugzilla/show_bug.cgi?id=51208

Konstantin Kolinko  changed:

   What|Removed |Added

  Attachment #27013|0   |1
   is patch||
  Attachment #27013|application/octet-stream|text/plain
  mime type||

-- 
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: r1104200 - in /tomcat/site/trunk: docs/security-7.html xdocs/security-7.xml

2011-05-17 Thread markt
Author: markt
Date: Tue May 17 12:41:32 2011
New Revision: 1104200

URL: http://svn.apache.org/viewvc?rev=1104200&view=rev
Log:
Update for 7.0.14 release

Modified:
tomcat/site/trunk/docs/security-7.html
tomcat/site/trunk/xdocs/security-7.xml

Modified: tomcat/site/trunk/docs/security-7.html
URL: 
http://svn.apache.org/viewvc/tomcat/site/trunk/docs/security-7.html?rev=1104200&r1=1104199&r2=1104200&view=diff
==
--- tomcat/site/trunk/docs/security-7.html (original)
+++ tomcat/site/trunk/docs/security-7.html Tue May 17 12:41:32 2011
@@ -215,6 +215,9 @@
 Apache Tomcat 7.x 
vulnerabilities
 
 
+Fixed in 
Apache Tomcat 7.0.14 (released 12 May 2011)
+
+
 Fixed in Apache 
Tomcat 7.0.12 (released 6 Apr 2011)
 
 
@@ -290,6 +293,53 @@
 
 
 
+
+
+
+
+Fixed in Apache Tomcat 7.0.14 (released 12 May 2011)
+
+
+
+
+
+
+
+
+
+
+Important: Security constraint bypass
+   http://cve.mitre.org/cgi-bin/cvename.cgi?name=CVE-2011-1582";>
+   CVE-2011-1582
+
+
+An error in the fixes for CVE-2011-1088/CVE-2011-1183 meant that 
security
+   constraints configured via annotations were ignored on the first request
+   to a Servlet. Subsequent requests were secured correctly.
+
+This was fixed in
+   http://svn.apache.org/viewvc?rev=1100832&view=rev";>
+   revision 1100832.
+
+This was identified by the Tomcat security team on 13 April 2011 and
+   made public on 17 May 2011.
+
+Affects: 7.0.12-7.0.13
+  
+  
+
+
+
+
+
+
+
+
+
+
+
+
+
 
 
 

Modified: tomcat/site/trunk/xdocs/security-7.xml
URL: 
http://svn.apache.org/viewvc/tomcat/site/trunk/xdocs/security-7.xml?rev=1104200&r1=1104199&r2=1104200&view=diff
==
--- tomcat/site/trunk/xdocs/security-7.xml (original)
+++ tomcat/site/trunk/xdocs/security-7.xml Tue May 17 12:41:32 2011
@@ -25,6 +25,27 @@
mailto:secur...@tomcat.apache.org";>Tomcat Security 
Team.
   
 
+  
+
+Important: Security constraint bypass
+   http://cve.mitre.org/cgi-bin/cvename.cgi?name=CVE-2011-1582";>
+   CVE-2011-1582
+
+An error in the fixes for CVE-2011-1088/CVE-2011-1183 meant that 
security
+   constraints configured via annotations were ignored on the first request
+   to a Servlet. Subsequent requests were secured correctly.
+
+This was fixed in
+   http://svn.apache.org/viewvc?rev=1100832&view=rev";>
+   revision 1100832.
+
+This was identified by the Tomcat security team on 13 April 2011 and
+   made public on 17 May 2011.
+
+Affects: 7.0.12-7.0.13
+  
+  
+
   
 
 Important: Information disclosure



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



[SECURITY] CVE-2011-1582 Apache Tomcat security constraint bypass

2011-05-17 Thread Mark Thomas
-BEGIN PGP SIGNED MESSAGE-
Hash: SHA1

CVE-2011-1582 Apache Tomcat security constraint bypass

Severity: Important

Vendor: The Apache Software Foundation

Versions Affected:
- - Tomcat 7.0.12-7.0.13
- - Earlier versions are not affected

Description:
An error in the fixes for CVE-2011-1088/CVE-2011-1183 meant that
security constraints configured via annotations were ignored on the
first request to a Servlet. Subsequent requests were secured correctly.

Mitigation:
Users of affected versions should apply one of the following mitigations:
- - Upgrade to a Tomcat 7.0.14 or later
- - Define all security constraints in web.xml

Credit:
This issue was identified by the Apache Tomcat security team.

References:
http://tomcat.apache.org/security.html
http://tomcat.apache.org/security-7.html
-BEGIN PGP SIGNATURE-
Version: GnuPG v1.4.9 (MingW32)
Comment: Using GnuPG with Mozilla - http://enigmail.mozdev.org/

iQIcBAEBAgAGBQJN0m4vAAoJEBDAHFovYFnn5NkQAOBocyvRk9fTGX569Ga95yDJ
vV84ZS3D1jCP3VQ1swh1Ouzd9NdP9pRGVWysTjz6N1bsZ+BMpGIyT/GpMqhfPAPx
OzzbkM2cNow8MR/PG3rFbYjQH1r6D400zSu+drHDtTzrOY2uXS2ClL0UuxUg9LcN
tUfidh9629OMVtuWqA2jwTSrc7fDdye5Ti1HZ0g5vUG5Cvab4LCcRdwh2VWT7g3T
LKUTr6AZAz0mQ/7+QNJOOykX+FJcOL99Q46NLVZzeLPWFoEBZn/BRs8O9WehYnLV
EEZtARSaUzTjssePo/O+oV4xYW5JIA1+5sKG7+xIvIaWKMbIPbdrPEPZusK/X0QR
LjdLbMUGcGzDUVNP0hGzpArIDXcWmslJKJ3YFTCg3VdeamULh12bqxw3AtliAzI9
pSTcMcVNOMWZOUl/Czc2I3t5ehWaOGr5j3D7No8mEFMCcRoQoRTNS7hKqqqKsyY4
hTxMJV9dXox5mIuDY8hLaGY9KuUFIo2AXWnr7lqIBrKGrziVAySuIpKSnzuFvz2z
q2DjPnXrFo/5W2ZVfUk0utCjyJX/NJdizKmW9PdQu4aT2BJdEgjjiW+qzPi20kZy
HgySY8kEFbI8CyM6PqD6Yb5nzA/xR1YAYRQx1pWTrE5Y0B5MTctAaPCIJQoc3nIA
GZ0Ziz0q/PX/x7ug1TnP
=srIH
-END PGP SIGNATURE-



-
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 JamieFrench

2011-05-17 Thread Apache Wiki
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 JamieFrench.
http://wiki.apache.org/tomcat/PoweredBy?action=diff&rev1=331&rev2=332

--

  This section contains cases that publicly described their Tomcat experience 
or installation.
  
  === AppFuse ===
- {{http://today.java.net/images/tiles/111-appfuse.gif}} Raible Designs' 
[[http://today.java.net/pub/a/today/2004/07/15/thefuse.html|AppFuse]] runs best 
on Tomcat. They wrote 
[[http://raibledesigns.com/page/rd?anchor=resin_slower_than_tomcat_fails|an 
interesting post]] comparing standards-compliance and performance on Tomcat and 
other containers.
+ {{http://today.java.net/images/tiles/111-appfuse.gif}} Raible Designs' 
[[http://today.java.net/pub/a/today/2004/07/15/thefuse.html|AppFuse]] 
[[http://www.uebersetzung1.wordpress.com|Übersetzung Deutsch Englisch]] runs 
best on Tomcat. They wrote 
[[http://raibledesigns.com/page/rd?anchor=resin_slower_than_tomcat_fails|an 
interesting post]] comparing standards-compliance and performance on Tomcat and 
other containers.
  
  === Bonhams ===
  {{http://www.bonhams.com/images/BonLogoGrey.jpg}} 
[[http://www.bonhams.com/|Bonhams]] is an auction house founded in 1793, 
running Tomcat and other open-source software, as detailed in 
[[http://www.cio.com/archive/071506/open_source.html?action=print|this 
article]] from [[http://www.cio.com|CIO Magazine]].

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



svn commit: r1104288 - /tomcat/trunk/modules/jdbc-pool/src/main/java/org/apache/tomcat/jdbc/pool/PoolProperties.java

2011-05-17 Thread fhanik
Author: fhanik
Date: Tue May 17 14:41:09 2011
New Revision: 1104288

URL: http://svn.apache.org/viewvc?rev=1104288&view=rev
Log:
https://issues.apache.org/bugzilla/show_bug.cgi?id=51208


Modified:

tomcat/trunk/modules/jdbc-pool/src/main/java/org/apache/tomcat/jdbc/pool/PoolProperties.java

Modified: 
tomcat/trunk/modules/jdbc-pool/src/main/java/org/apache/tomcat/jdbc/pool/PoolProperties.java
URL: 
http://svn.apache.org/viewvc/tomcat/trunk/modules/jdbc-pool/src/main/java/org/apache/tomcat/jdbc/pool/PoolProperties.java?rev=1104288&r1=1104287&r2=1104288&view=diff
==
--- 
tomcat/trunk/modules/jdbc-pool/src/main/java/org/apache/tomcat/jdbc/pool/PoolProperties.java
 (original)
+++ 
tomcat/trunk/modules/jdbc-pool/src/main/java/org/apache/tomcat/jdbc/pool/PoolProperties.java
 Tue May 17 14:41:09 2011
@@ -431,7 +431,7 @@ public class PoolProperties implements P
 int pidx = props[j].indexOf("=");
 String propName = 
props[j].substring(0,pidx).trim();
 String propValue = 
props[j].substring(pidx+1).trim();
-definitions[i].addProperty(new 
InterceptorProperty(propName,propValue));
+definitions[i+1].addProperty(new 
InterceptorProperty(propName,propValue));
 }
 }
 }



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



DO NOT REPLY [Bug 51208] SVN TRUNK : JDBC interceptor options are not taken into account

2011-05-17 Thread bugzilla
https://issues.apache.org/bugzilla/show_bug.cgi?id=51208

Filip Hanik  changed:

   What|Removed |Added

 Status|NEW |RESOLVED
 Resolution||FIXED

--- Comment #1 from Filip Hanik  2011-05-17 14:41:14 UTC ---
Thank you. Patch applied to r1104288

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



PoweredBy reverted to revision 331 on Tomcat Wiki

2011-05-17 Thread Apache Wiki
Dear wiki user,

You have subscribed to a wiki page "Tomcat Wiki" for change notification.

The page PoweredBy has been reverted to revision 331 by KonstantinKolinko.
The comment on this change is: Revert to r331 to remove spam.
http://wiki.apache.org/tomcat/PoweredBy?action=diff&rev1=332&rev2=333

--

  This section contains cases that publicly described their Tomcat experience 
or installation.
  
  === AppFuse ===
- {{http://today.java.net/images/tiles/111-appfuse.gif}} Raible Designs' 
[[http://today.java.net/pub/a/today/2004/07/15/thefuse.html|AppFuse]] 
[[http://www.uebersetzung1.wordpress.com|Übersetzung Deutsch Englisch]] runs 
best on Tomcat. They wrote 
[[http://raibledesigns.com/page/rd?anchor=resin_slower_than_tomcat_fails|an 
interesting post]] comparing standards-compliance and performance on Tomcat and 
other containers.
+ {{http://today.java.net/images/tiles/111-appfuse.gif}} Raible Designs' 
[[http://today.java.net/pub/a/today/2004/07/15/thefuse.html|AppFuse]] runs best 
on Tomcat. They wrote 
[[http://raibledesigns.com/page/rd?anchor=resin_slower_than_tomcat_fails|an 
interesting post]] comparing standards-compliance and performance on Tomcat and 
other containers.
  
  === Bonhams ===
  {{http://www.bonhams.com/images/BonLogoGrey.jpg}} 
[[http://www.bonhams.com/|Bonhams]] is an auction house founded in 1793, 
running Tomcat and other open-source software, as detailed in 
[[http://www.cio.com/archive/071506/open_source.html?action=print|this 
article]] from [[http://www.cio.com|CIO Magazine]].

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



svn commit: r1104328 - /tomcat/trunk/RELEASE-NOTES

2011-05-17 Thread markt
Author: markt
Date: Tue May 17 15:21:38 2011
New Revision: 1104328

URL: http://svn.apache.org/viewvc?rev=1104328&view=rev
Log:
webapps is relative to base not home

Modified:
tomcat/trunk/RELEASE-NOTES

Modified: tomcat/trunk/RELEASE-NOTES
URL: 
http://svn.apache.org/viewvc/tomcat/trunk/RELEASE-NOTES?rev=1104328&r1=1104327&r2=1104328&view=diff
==
--- tomcat/trunk/RELEASE-NOTES (original)
+++ tomcat/trunk/RELEASE-NOTES Tue May 17 15:21:38 2011
@@ -173,7 +173,7 @@ In order to grant security permissions t
 web application repository, use URLs of of the following format
 in your policy file:
 
-file:${catalina.home}/webapps/examples/WEB-INF/lib/driver.jar
+file:${catalina.base}/webapps/examples/WEB-INF/lib/driver.jar
 
 
 



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



DO NOT REPLY [Bug 51212] New: QueryStats has synchornisation issues

2011-05-17 Thread bugzilla
https://issues.apache.org/bugzilla/show_bug.cgi?id=51212

 Bug #: 51212
   Summary: QueryStats has synchornisation issues
   Product: Tomcat Modules
   Version: unspecified
  Platform: All
Status: NEW
  Severity: major
  Priority: P2
 Component: jdbc-pool
AssignedTo: dev@tomcat.apache.org
ReportedBy: p.moua...@ubik-ingenierie.com
Classification: Unclassified


Created attachment 27017
  --> https://issues.apache.org/bugzilla/attachment.cgi?id=27017
Patch with Atomic approach

Hello,
I don't know if it is volontary but I think QueryStats fields should be Atomic
because they are accessed by multiple threads at same time.
I made a Load test with heavy load and collected results of SlowQueryReport and
I get Sql queries with 0 as number of executions which is wrong as they have
been executed at least once.

By the way I don't know which approach will perform better:
- synchronize add/failure
- Use Atomic
Maybe you did this for performance reasons.

Regards
Philippe Mouawad
http://www.ubik-ingenierie.com

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



DO NOT REPLY [Bug 51212] QueryStats has synchornisation issues

2011-05-17 Thread bugzilla
https://issues.apache.org/bugzilla/show_bug.cgi?id=51212

Philippe Mouawad  changed:

   What|Removed |Added

 CC||p.mouawad@ubik-ingenierie.c
   ||om
 OS/Version||All

-- 
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: r1104403 - in /tomcat/trunk/java/org/apache/coyote/ajp: AjpAprProtocol.java AjpNioProtocol.java AjpProtocol.java

2011-05-17 Thread markt
Author: markt
Date: Tue May 17 16:52:51 2011
New Revision: 1104403

URL: http://svn.apache.org/viewvc?rev=1104403&view=rev
Log:
Better align AJP connector code
Fix some copy/paste errors

Modified:
tomcat/trunk/java/org/apache/coyote/ajp/AjpAprProtocol.java
tomcat/trunk/java/org/apache/coyote/ajp/AjpNioProtocol.java
tomcat/trunk/java/org/apache/coyote/ajp/AjpProtocol.java

Modified: tomcat/trunk/java/org/apache/coyote/ajp/AjpAprProtocol.java
URL: 
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/coyote/ajp/AjpAprProtocol.java?rev=1104403&r1=1104402&r2=1104403&view=diff
==
--- tomcat/trunk/java/org/apache/coyote/ajp/AjpAprProtocol.java (original)
+++ tomcat/trunk/java/org/apache/coyote/ajp/AjpAprProtocol.java Tue May 17 
16:52:51 2011
@@ -70,7 +70,8 @@ public class AjpAprProtocol extends Abst
 setSoLinger(Constants.DEFAULT_CONNECTION_LINGER);
 setSoTimeout(Constants.DEFAULT_CONNECTION_TIMEOUT);
 setTcpNoDelay(Constants.DEFAULT_TCP_NO_DELAY);
-setUseSendfile(Constants.DEFAULT_USE_SENDFILE);
+// AJP does not use Send File
+((AprEndpoint) endpoint).setUseSendfile(false);
 }
 
 
@@ -86,11 +87,6 @@ public class AjpAprProtocol extends Abst
 // - Public Methods
 
 
-public boolean getUseSendfile() { return endpoint.getUseSendfile(); }
-public void setUseSendfile(@SuppressWarnings("unused") boolean 
useSendfile) {
-/* No sendfile for AJP */
-}
-
 public int getPollTime() { return ((AprEndpoint)endpoint).getPollTime(); }
 public void setPollTime(int pollTime) { 
((AprEndpoint)endpoint).setPollTime(pollTime); }
 
@@ -120,7 +116,7 @@ public class AjpAprProtocol extends Abst
 new ConcurrentHashMap, AjpAprProcessor>();
 
 protected ConcurrentLinkedQueue recycledProcessors = 
-new ConcurrentLinkedQueue() {
+new ConcurrentLinkedQueue() {
 private static final long serialVersionUID = 1L;
 protected AtomicInteger size = new AtomicInteger(0);
 @Override

Modified: tomcat/trunk/java/org/apache/coyote/ajp/AjpNioProtocol.java
URL: 
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/coyote/ajp/AjpNioProtocol.java?rev=1104403&r1=1104402&r2=1104403&view=diff
==
--- tomcat/trunk/java/org/apache/coyote/ajp/AjpNioProtocol.java (original)
+++ tomcat/trunk/java/org/apache/coyote/ajp/AjpNioProtocol.java Tue May 17 
16:52:51 2011
@@ -84,13 +84,6 @@ public class AjpNioProtocol extends Abst
 private AjpConnectionHandler cHandler;
 
 
-// - Public Methods
-
-
-// AJP does not use Send File.
-public boolean getUseSendfile() { return false; }
-
-
 // - JMX related 
methods
 
 @Override
@@ -194,7 +187,7 @@ public class AjpNioProtocol extends Abst
 
 /**
  * Use this only if the processor is not available, otherwise use
- * {@link #release(NioChannel, Http11NioProcessor).
+ * {@link #release(NioChannel, AjpNioProcessor).
  */
 @Override
 public void release(NioChannel socket) {
@@ -232,7 +225,7 @@ public class AjpNioProtocol extends Abst
 // with "ERROR" level, so it will show up even on
 // less-than-verbose logs.
 AjpNioProtocol.log.error
-(sm.getString("http11protocol.proto.error"), e);
+(sm.getString("ajpprotocol.proto.error"), e);
 } finally {
 if (processor.isAsync()) {
 state = processor.asyncPostProcess();

Modified: tomcat/trunk/java/org/apache/coyote/ajp/AjpProtocol.java
URL: 
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/coyote/ajp/AjpProtocol.java?rev=1104403&r1=1104402&r2=1104403&view=diff
==
--- tomcat/trunk/java/org/apache/coyote/ajp/AjpProtocol.java (original)
+++ tomcat/trunk/java/org/apache/coyote/ajp/AjpProtocol.java Tue May 17 
16:52:51 2011
@@ -105,7 +105,7 @@ public class AjpProtocol extends Abstrac
 new ConcurrentHashMap, AjpProcessor>();
 
 protected ConcurrentLinkedQueue recycledProcessors = 
-new ConcurrentLinkedQueue() {
+new ConcurrentLinkedQueue() {
 private static final long serialVersionUID = 1L;
 protected AtomicInteger size = new AtomicInteger(0);
 @Override



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



Re: About Tomcat transplantation

2011-05-17 Thread Mark Thomas
On 17/05/2011 08:33, ?? wrote:
> Thank you very much for your answer??
> These days,we can complie and run the Tomcat7 source code in the 32bit/64bit 
> LFS system .It run very well.But,now,I don't know what to do with this 
> runnable tomcat.We can see the cat on the web page,and how can  I make sure 
> that it can run the Tomcat's complete function?
> 
> And I hava some other question.Thanks.
> 
> On my new system(our cpu and OS and JDK),we may modify the source 
> code,include remove or add some module.After that ,how can I know the new 
> tomcat is complete,in other words,how can I test the Tomcat's function after 
> we alter it.Is there any standard about it? I see some 'test' in the Tomcat 
> source code.But I see some of those are for the bugs.And can I get all the 
> test info after I run "ant test" in Ant?

ant test will run all the unit tests.

If you want to test compliance to the Servlet, JSP and EL TCKs you'll
need to license those from Oracle. That is likely to be expensive.

> And,because our JDK is being test,there are some problem in it .I think when 
> I test the Tomcat on this JDK there may be some mistake.So I can remove some 
> module from Tomcat for look which module can't run on this JDK.I study the 
> Tomcat source code for many days,but I don't know which module are 
> necessary.This may be a trouble question,or my question is about the test for 
> the Tomcat essentially.

There isn't really anything that ships with Tomcat that is optional.

Mark

> 
> Thank you very much!!And my English is poor and use some wrong words .I'm 
> sorry about that!
> 
> 
> 
> ??2011-05-10 11:45:39??"Caldarale, Charles R"  
> ??
>>> From: ?? [mailto:howzmhw...@126.com] 
>>> Subject: About Tomcat transplantation
>>
>>> I am explanting Tomcat7 application using souce code to an 
>>> our own System.
>>
>> Been there, done that, got several t-shirts.
>>
>> You shouldn't have to compile Tomcat at all - if your JDK can pass most of 
>> the JCK tests (and a bit more).  Since Tomcat proper is pure Java, all you 
>> really have to worry about is making the JVM work on your platform.  Besides 
>> using Tomcat in production on our extremely proprietary hardware and OS, we 
>> also use it to debug our JVM.
>>
>> If you want to include the Tomcat native library, you'll need to be able to 
>> build APR and OpenSSL - but since Tomcat works fine using the JSSE component 
>> of the JRE, I wouldn't bother with those.  Concentrate on getting the JVM 
>> working.
>>
>>> what other package or tool is needed on the new system?
>>
>> Again, nothing other than a Tomcat binary download is needed.  If you do 
>> choose to build from source, you'll have to have ant working.  The ant build 
>> script for Tomcat will automatically download all the other pieces it needs. 
>>  However, you can build Tomcat on any platform and then run it on an 
>> entirely different one.
>>
>> - Chuck
>>
>>
>> THIS COMMUNICATION MAY CONTAIN CONFIDENTIAL AND/OR OTHERWISE PROPRIETARY 
>> MATERIAL and is thus for use only by the intended recipient. If you received 
>> this in error, please contact the sender and delete the e-mail and its 
>> attachments from all computers.
>>




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



svn commit: r1104422 - in /tomcat/trunk/webapps/docs: changelog.xml config/ajp.xml

2011-05-17 Thread markt
Author: markt
Date: Tue May 17 17:24:36 2011
New Revision: 1104422

URL: http://svn.apache.org/viewvc?rev=1104422&view=rev
Log:
Add remaining attributes to documentation
AJP-NIO now passes Servlet TCK - remove experimental label

Modified:
tomcat/trunk/webapps/docs/changelog.xml
tomcat/trunk/webapps/docs/config/ajp.xml

Modified: tomcat/trunk/webapps/docs/changelog.xml
URL: 
http://svn.apache.org/viewvc/tomcat/trunk/webapps/docs/changelog.xml?rev=1104422&r1=1104421&r2=1104422&view=diff
==
--- tomcat/trunk/webapps/docs/changelog.xml (original)
+++ tomcat/trunk/webapps/docs/changelog.xml Tue May 17 17:24:36 2011
@@ -46,8 +46,7 @@
   
 
   
-51145: Add an experimental (not all TCK tests pass at the
-moment) AJP-NIO connector. (markt/rjung)
+51145: Add an AJP-NIO connector. (markt/rjung)
   
 
   

Modified: tomcat/trunk/webapps/docs/config/ajp.xml
URL: 
http://svn.apache.org/viewvc/tomcat/trunk/webapps/docs/config/ajp.xml?rev=1104422&r1=1104421&r2=1104422&view=diff
==
--- tomcat/trunk/webapps/docs/config/ajp.xml (original)
+++ tomcat/trunk/webapps/docs/config/ajp.xml Tue May 17 17:24:36 2011
@@ -161,10 +161,6 @@
 Take a look at our Connector
 Comparison chart.
   
-  
-WARNING: The NIO connector 
for AJP
-is experimentaland not yet fully functional.
-  
 
 
 
@@ -485,6 +481,111 @@
 
   
 
+  
+
+The following attributes are specific to the NIO connector.
+
+
+
+  
+(bool)Boolean value, whether to use direct ByteBuffers or java 
mapped
+ByteBuffers. Default is false.
+When you are using direct buffers, make sure you allocate the
+appropriate amount of memory for the direct memory space. On Sun's JDK
+that would be something like -XX:MaxDirectMemorySize=256m.
+
+  
+  
+  
+(int)Each connection that is opened up in Tomcat get associated with
+a read ByteBuffer. This attribute controls the size of this buffer. By
+default this read buffer is sized at 8192 bytes. For lower
+concurrency, you can increase this to buffer more data. For an extreme
+amount of keep alive connections, decrease this number or increase your
+heap size.
+  
+
+  
+(int)Each connection that is opened up in Tomcat get associated with
+a write ByteBuffer. This attribute controls the size of this buffer. By
+default this write buffer is sized at 8192 bytes. For low
+concurrency you can increase this to buffer more response data. For an
+extreme amount of keep alive connections, decrease this number or
+increase your heap size.
+The default value here is pretty low, you should up it if you are not
+dealing with tens of thousands concurrent connections.
+  
+
+  
+(int)The NIO connector uses a class called NioChannel that holds
+elements linked to a socket. To reduce garbage collection, the NIO
+connector caches these channel objects. This value specifies the size 
of
+this cache. The default value is 500, and represents that
+the cache will hold 500 NioChannel objects. Other values are
+-1 for unlimited cache and 0 for no 
cache.
+  
+
+  
+(int)The NioChannel pool can also be size based, not used object
+based. The size is calculated as follows:
+NioChannel
+buffer size = read buffer size + write buffer size
+SecureNioChannel buffer size = application read buffer size +
+application write buffer size + network read buffer size +
+network write buffer size
+The value is in bytes, the default value is 1024*1024*100
+(100MB).
+  
+
+  
+(int)Tomcat will cache SocketProcessor objects to reduce garbage
+collection. The integer value specifies how many objects to keep in the
+cache at most. The default is 500. Other values are
+-1 for unlimited cache and 0 for no 
cache.
+  
+
+  
+(int)Tomcat will cache KeyAttachment objects to reduce garbage
+collection. The integer value specifies how many objects to keep in the
+cache at most. The default is 500. Other values are
+-1 for unlimited cache and 0 for no 
cache.
+  
+
+  
+(int)Tomcat will cache PollerEvent objects to reduce garbage
+collection. The integer value specifies how many objects to keep in the
+cache at most. The default is 500. Other values are
+-1 for unlimited cache and 0 for no 
cache.
+  
+
+  
+(int)The max selectors to be used in the pool, to reduce selector
+contention. Use this option when the command line
+org.apache.tomcat.util.net.NioSelectorShared value i

DO NOT REPLY [Bug 51145] Need a NIO-based AJP connector

2011-05-17 Thread bugzilla
https://issues.apache.org/bugzilla/show_bug.cgi?id=51145

Mark Thomas  changed:

   What|Removed |Added

 Status|NEW |RESOLVED
 Resolution||FIXED

--- Comment #2 from Mark Thomas  2011-05-17 17:25:24 UTC ---
This has been implemented in 7.0.x and will be included in 7.0.15 onwards.

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



DO NOT REPLY [Bug 51145] Need a NIO-based AJP connector

2011-05-17 Thread bugzilla
https://issues.apache.org/bugzilla/show_bug.cgi?id=51145

--- Comment #3 from Jess Holle  2011-05-17 17:25:59 UTC ---
Does it pass TCK tests yet?

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



DO NOT REPLY [Bug 51145] Need a NIO-based AJP connector

2011-05-17 Thread bugzilla
https://issues.apache.org/bugzilla/show_bug.cgi?id=51145

--- Comment #4 from Mark Thomas  2011-05-17 17:27:50 UTC ---
Yep. It passes the Servlet 3.0 TCK with mod_jk and mod_proxy_ajp.

-- 
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: r1104509 - /tomcat/tc6.0.x/trunk/RELEASE-NOTES

2011-05-17 Thread kkolinko
Author: kkolinko
Date: Tue May 17 20:05:06 2011
New Revision: 1104509

URL: http://svn.apache.org/viewvc?rev=1104509&view=rev
Log:
backport of r1104328
s/catalina.home/catalina.base/ in policy configuration example in RELEASE-NOTES
This is because webapps is relative to base not home
and because the catalina.policy file in TC6 was already updated with the same 
changes.
CTR: docs

Modified:
tomcat/tc6.0.x/trunk/RELEASE-NOTES

Modified: tomcat/tc6.0.x/trunk/RELEASE-NOTES
URL: 
http://svn.apache.org/viewvc/tomcat/tc6.0.x/trunk/RELEASE-NOTES?rev=1104509&r1=1104508&r2=1104509&view=diff
==
--- tomcat/tc6.0.x/trunk/RELEASE-NOTES (original)
+++ tomcat/tc6.0.x/trunk/RELEASE-NOTES Tue May 17 20:05:06 2011
@@ -153,7 +153,7 @@ In order to grant security permissions t
 web application repository, use URLs of of the following format
 in your policy file:
 
-file:${catalina.home}/webapps/examples/WEB-INF/lib/driver.jar
+file:${catalina.base}/webapps/examples/WEB-INF/lib/driver.jar
 
 
 



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



svn commit: r1104528 - /tomcat/trunk/java/javax/servlet/jsp/el/ScopedAttributeELResolver.java

2011-05-17 Thread kkolinko
Author: kkolinko
Date: Tue May 17 20:30:49 2011
New Revision: 1104528

URL: http://svn.apache.org/viewvc?rev=1104528&view=rev
Log:
Add missing @since comment.

Modified:
tomcat/trunk/java/javax/servlet/jsp/el/ScopedAttributeELResolver.java

Modified: tomcat/trunk/java/javax/servlet/jsp/el/ScopedAttributeELResolver.java
URL: 
http://svn.apache.org/viewvc/tomcat/trunk/java/javax/servlet/jsp/el/ScopedAttributeELResolver.java?rev=1104528&r1=1104527&r2=1104528&view=diff
==
--- tomcat/trunk/java/javax/servlet/jsp/el/ScopedAttributeELResolver.java 
(original)
+++ tomcat/trunk/java/javax/servlet/jsp/el/ScopedAttributeELResolver.java Tue 
May 17 20:30:49 2011
@@ -30,6 +30,10 @@ import javax.el.PropertyNotWritableExcep
 import javax.servlet.jsp.JspContext;
 import javax.servlet.jsp.PageContext;
 
+/**
+*
+* @since 2.1
+*/
 public class ScopedAttributeELResolver extends ELResolver {
 
 public ScopedAttributeELResolver() {



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



svn commit: r1104539 - in /tomcat/tc6.0.x/trunk: java/javax/servlet/jsp/el/ webapps/docs/

2011-05-17 Thread kkolinko
Author: kkolinko
Date: Tue May 17 20:40:12 2011
New Revision: 1104539

URL: http://svn.apache.org/viewvc?rev=1104539&view=rev
Log:
Add comments to @deprecated tags that have none in javax.servlet.jsp.el.*
Its backport of r1100125, r1104528
The patch for trunk was provided by sebb
CTR: javadoc

Modified:
tomcat/tc6.0.x/trunk/java/javax/servlet/jsp/el/ELException.java
tomcat/tc6.0.x/trunk/java/javax/servlet/jsp/el/ELParseException.java
tomcat/tc6.0.x/trunk/java/javax/servlet/jsp/el/Expression.java
tomcat/tc6.0.x/trunk/java/javax/servlet/jsp/el/ExpressionEvaluator.java
tomcat/tc6.0.x/trunk/java/javax/servlet/jsp/el/FunctionMapper.java

tomcat/tc6.0.x/trunk/java/javax/servlet/jsp/el/ScopedAttributeELResolver.java
tomcat/tc6.0.x/trunk/java/javax/servlet/jsp/el/VariableResolver.java
tomcat/tc6.0.x/trunk/webapps/docs/changelog.xml

Modified: tomcat/tc6.0.x/trunk/java/javax/servlet/jsp/el/ELException.java
URL: 
http://svn.apache.org/viewvc/tomcat/tc6.0.x/trunk/java/javax/servlet/jsp/el/ELException.java?rev=1104539&r1=1104538&r2=1104539&view=diff
==
--- tomcat/tc6.0.x/trunk/java/javax/servlet/jsp/el/ELException.java (original)
+++ tomcat/tc6.0.x/trunk/java/javax/servlet/jsp/el/ELException.java Tue May 17 
20:40:12 2011
@@ -23,7 +23,7 @@ package javax.servlet.jsp.el;
  * operation evaluation of the evaluator.
  *
  * @since 2.0
- * @deprecated
+ * @deprecated As of JSP 2.1, replaced by javax.el.ELException
  */
 @SuppressWarnings("dep-ann") // TCK signature test fails with annotation
 public class ELException extends Exception {

Modified: tomcat/tc6.0.x/trunk/java/javax/servlet/jsp/el/ELParseException.java
URL: 
http://svn.apache.org/viewvc/tomcat/tc6.0.x/trunk/java/javax/servlet/jsp/el/ELParseException.java?rev=1104539&r1=1104538&r2=1104539&view=diff
==
--- tomcat/tc6.0.x/trunk/java/javax/servlet/jsp/el/ELParseException.java 
(original)
+++ tomcat/tc6.0.x/trunk/java/javax/servlet/jsp/el/ELParseException.java Tue 
May 17 20:40:12 2011
@@ -22,7 +22,7 @@ package javax.servlet.jsp.el;
  * Represents a parsing error encountered while parsing an EL expression.
  *
  * @since 2.0
- * @deprecated
+ * @deprecated As of JSP 2.1, replaced by javax.el.ELException
  */
 @SuppressWarnings("dep-ann") // TCK signature test fails with annotation
 public class ELParseException extends ELException {

Modified: tomcat/tc6.0.x/trunk/java/javax/servlet/jsp/el/Expression.java
URL: 
http://svn.apache.org/viewvc/tomcat/tc6.0.x/trunk/java/javax/servlet/jsp/el/Expression.java?rev=1104539&r1=1104538&r2=1104539&view=diff
==
--- tomcat/tc6.0.x/trunk/java/javax/servlet/jsp/el/Expression.java (original)
+++ tomcat/tc6.0.x/trunk/java/javax/servlet/jsp/el/Expression.java Tue May 17 
20:40:12 2011
@@ -30,7 +30,7 @@ package javax.servlet.jsp.el;
  * where ELParseException exceptions are raised. 
  *
  * @since 2.0
- * @deprecated
+ * @deprecated As of JSP 2.1, replaced by javax.el.ValueExpression
  */
 @SuppressWarnings("dep-ann") // TCK signature test fails with annotation
 public abstract class Expression {

Modified: 
tomcat/tc6.0.x/trunk/java/javax/servlet/jsp/el/ExpressionEvaluator.java
URL: 
http://svn.apache.org/viewvc/tomcat/tc6.0.x/trunk/java/javax/servlet/jsp/el/ExpressionEvaluator.java?rev=1104539&r1=1104538&r2=1104539&view=diff
==
--- tomcat/tc6.0.x/trunk/java/javax/servlet/jsp/el/ExpressionEvaluator.java 
(original)
+++ tomcat/tc6.0.x/trunk/java/javax/servlet/jsp/el/ExpressionEvaluator.java Tue 
May 17 20:40:12 2011
@@ -51,7 +51,7 @@ package javax.servlet.jsp.el;
  * 
  *
  * @since 2.0
- * @deprecated
+ * @deprecated As of JSP 2.1, replaced by javax.el.ExpressionFactory
  */
 @SuppressWarnings("dep-ann") // TCK signature test fails with annotation
 public abstract class ExpressionEvaluator {

Modified: tomcat/tc6.0.x/trunk/java/javax/servlet/jsp/el/FunctionMapper.java
URL: 
http://svn.apache.org/viewvc/tomcat/tc6.0.x/trunk/java/javax/servlet/jsp/el/FunctionMapper.java?rev=1104539&r1=1104538&r2=1104539&view=diff
==
--- tomcat/tc6.0.x/trunk/java/javax/servlet/jsp/el/FunctionMapper.java 
(original)
+++ tomcat/tc6.0.x/trunk/java/javax/servlet/jsp/el/FunctionMapper.java Tue May 
17 20:40:12 2011
@@ -24,7 +24,7 @@ package javax.servlet.jsp.el;
  * information to resolve the map. 
  *
  * @since 2.0
- * @deprecated
+ * @deprecated As of JSP 2.1, replaced by javax.el.FunctionMapper
  */
 @SuppressWarnings("dep-ann") // TCK signature test fails with annotation
 public interface FunctionMapper {

Modified: 
tomcat/tc6.0.x/trunk/java/javax/servlet/jsp/el/ScopedAttributeELResolver.java
URL: 
http://svn.apache.org/viewvc/tomcat/tc6.0.x/trunk/ja

svn commit: r1104557 - in /tomcat/trunk/java/org/apache/catalina: core/ApplicationContextFacade.java core/ApplicationHttpResponse.java session/StandardSessionFacade.java

2011-05-17 Thread kkolinko
Author: kkolinko
Date: Tue May 17 20:57:46 2011
New Revision: 1104557

URL: http://svn.apache.org/viewvc?rev=1104557&view=rev
Log:
Add @deprecation comments

Modified:
tomcat/trunk/java/org/apache/catalina/core/ApplicationContextFacade.java
tomcat/trunk/java/org/apache/catalina/core/ApplicationHttpResponse.java
tomcat/trunk/java/org/apache/catalina/session/StandardSessionFacade.java

Modified: 
tomcat/trunk/java/org/apache/catalina/core/ApplicationContextFacade.java
URL: 
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/core/ApplicationContextFacade.java?rev=1104557&r1=1104556&r2=1104557&view=diff
==
--- tomcat/trunk/java/org/apache/catalina/core/ApplicationContextFacade.java 
(original)
+++ tomcat/trunk/java/org/apache/catalina/core/ApplicationContextFacade.java 
Tue May 17 20:57:46 2011
@@ -237,7 +237,7 @@ public class ApplicationContextFacade im
 
 
 /**
- * @deprecated
+ * @deprecated As of Java Servlet API 2.1, with no direct replacement.
  */
 @Override
 @Deprecated
@@ -261,7 +261,7 @@ public class ApplicationContextFacade im
 
 
 /**
- * @deprecated
+ * @deprecated As of Java Servlet API 2.1, with no direct replacement.
  */
 @Override
 @SuppressWarnings("unchecked") // doPrivileged() returns the correct type
@@ -276,7 +276,7 @@ public class ApplicationContextFacade im
 
 
 /**
- * @deprecated
+ * @deprecated As of Java Servlet API 2.1, with no direct replacement.
  */
 @Override
 @SuppressWarnings("unchecked") // doPrivileged() returns the correct type
@@ -301,7 +301,8 @@ public class ApplicationContextFacade im
 
 
 /**
- * @deprecated
+ * @deprecated As of Java Servlet API 2.1, use
+ *  log(String, Throwable) instead
  */
 @Override
 @Deprecated

Modified: 
tomcat/trunk/java/org/apache/catalina/core/ApplicationHttpResponse.java
URL: 
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/core/ApplicationHttpResponse.java?rev=1104557&r1=1104556&r2=1104557&view=diff
==
--- tomcat/trunk/java/org/apache/catalina/core/ApplicationHttpResponse.java 
(original)
+++ tomcat/trunk/java/org/apache/catalina/core/ApplicationHttpResponse.java Tue 
May 17 20:57:46 2011
@@ -339,7 +339,10 @@ class ApplicationHttpResponse extends Ht
  *
  * @param sc The new status code
  * @param msg The new message
- * @deprecated
+ * @deprecated As of version 2.1, due to ambiguous meaning of the message
+ * parameter. To set a status code use
+ * setStatus(int), to send an error with a
+ * description use sendError(int, String).
  */
 @Deprecated
 @Override

Modified: 
tomcat/trunk/java/org/apache/catalina/session/StandardSessionFacade.java
URL: 
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/session/StandardSessionFacade.java?rev=1104557&r1=1104556&r2=1104557&view=diff
==
--- tomcat/trunk/java/org/apache/catalina/session/StandardSessionFacade.java 
(original)
+++ tomcat/trunk/java/org/apache/catalina/session/StandardSessionFacade.java 
Tue May 17 20:57:46 2011
@@ -108,7 +108,8 @@ public class StandardSessionFacade
 
 
 /**
- * @deprecated
+ * @deprecated As of Version 2.1, this method is deprecated and has no
+ * replacement.
  */
 @Override
 @Deprecated
@@ -124,7 +125,8 @@ public class StandardSessionFacade
 
 
 /**
- * @deprecated
+ * @deprecated As of Version 2.2, this method is replaced by
+ * {@link #getAttribute}.
  */
 @Override
 @Deprecated
@@ -140,7 +142,8 @@ public class StandardSessionFacade
 
 
 /**
- * @deprecated
+ * @deprecated As of Version 2.2, this method is replaced by
+ * {@link #getAttributeNames}
  */
 @Override
 @Deprecated
@@ -156,7 +159,8 @@ public class StandardSessionFacade
 
 
 /**
- * @deprecated
+ * @deprecated As of Version 2.2, this method is replaced by
+ * {@link #setAttribute}
  */
 @Override
 @Deprecated
@@ -172,7 +176,8 @@ public class StandardSessionFacade
 
 
 /**
- * @deprecated
+ * @deprecated As of Version 2.2, this method is replaced by
+ * {@link #removeAttribute}
  */
 @Override
 @Deprecated



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



Re: svn commit: r1104422 - in /tomcat/trunk/webapps/docs: changelog.xml config/ajp.xml

2011-05-17 Thread Rainer Jung
On 17.05.2011 19:24, ma...@apache.org wrote:
> Author: markt
> Date: Tue May 17 17:24:36 2011
> New Revision: 1104422
> 
> URL: http://svn.apache.org/viewvc?rev=1104422&view=rev
> Log:
> Add remaining attributes to documentation
> AJP-NIO now passes Servlet TCK - remove experimental label

w00t!


0xEE8E0DD5.asc
Description: application/pgp-keys

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

svn commit: r1104606 - /tomcat/tc6.0.x/trunk/webapps/docs/changelog.xml

2011-05-17 Thread markt
Author: markt
Date: Tue May 17 22:30:21 2011
New Revision: 1104606

URL: http://svn.apache.org/viewvc?rev=1104606&view=rev
Log:
Name the subsection

Modified:
tomcat/tc6.0.x/trunk/webapps/docs/changelog.xml

Modified: tomcat/tc6.0.x/trunk/webapps/docs/changelog.xml
URL: 
http://svn.apache.org/viewvc/tomcat/tc6.0.x/trunk/webapps/docs/changelog.xml?rev=1104606&r1=1104605&r2=1104606&view=diff
==
--- tomcat/tc6.0.x/trunk/webapps/docs/changelog.xml (original)
+++ tomcat/tc6.0.x/trunk/webapps/docs/changelog.xml Tue May 17 22:30:21 2011
@@ -153,7 +153,7 @@
   
 
   
-  
+  
 
   
 51155: Add comments to @deprecated tags that have none. 
Patch



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



svn commit: r1104696 - /tomcat/tc6.0.x/trunk/STATUS.txt

2011-05-17 Thread kfujino
Author: kfujino
Date: Wed May 18 06:27:44 2011
New Revision: 1104696

URL: http://svn.apache.org/viewvc?rev=1104696&view=rev
Log:
vote

Modified:
tomcat/tc6.0.x/trunk/STATUS.txt

Modified: tomcat/tc6.0.x/trunk/STATUS.txt
URL: 
http://svn.apache.org/viewvc/tomcat/tc6.0.x/trunk/STATUS.txt?rev=1104696&r1=1104695&r2=1104696&view=diff
==
--- tomcat/tc6.0.x/trunk/STATUS.txt (original)
+++ tomcat/tc6.0.x/trunk/STATUS.txt Wed May 18 06:27:44 2011
@@ -182,24 +182,24 @@ PATCHES PROPOSED TO BACKPORT:
   Throw an exception and do not start the APR connector if it is configured for
   SSL and an invalid value is provided for SSLProtocol.
   http://svn.apache.org/viewvc?view=revision&revision=1094089
-  +1: markt, kkolinko
+  +1: markt, kkolinko, kfujino
   -1: 
 
 * Fix https://issues.apache.org/bugzilla/show_bug.cgi?id=51147
   Fix deploy for HTML Manager app that was broken when CSRF prevention was 
added
   Patch provided by Alexis Hassler.
   https://issues.apache.org/bugzilla/attachment.cgi?id=26957&action=diff
-  +1: markt, kkolinko
+  +1: markt, kkolinko, kfujino
   -1: 
 
 * Fix https://issues.apache.org/bugzilla/show_bug.cgi?id=51119
   Add JAAS authentication support to the JmxRemoteLifecycleListener
   Patch provided by Neil Laurance
   http://svn.apache.org/viewvc?rev=1099586&view=rev
-  +1: markt, kkolinko
+  +1: markt, kkolinko, kfujino
   -1: 
 
 * Fix SSLValve so it returns key size as an Integer rather than a String
   http://svn.apache.org/viewvc?rev=1100822&view=rev
-  +1: markt, kkolinko
+  +1: markt, kkolinko, kfujino
   -1: 



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