Re: svn commit: r383260 - /tomcat/site/tags/TOMCAT_5_5_16/trunk/

[Mark Thomas]

Mark Thomas wrote:
> What happened with the tags for 5.5.16?
> 
> Taking container as an example we seem to have ended up with the
> following for each module:
> 
> /tags
>   /5_5_16 first copy
>   /TOMCAT_5_5_16  second copy
> /tc5.5.x  third copy
> 
> Assuming we want to be consistent with previous tags /tags/5_5_16 and
> /tags/TOMCAT_5_5_16/tc5.5.x can be deleted from each module.
> 
> It also looks like the build.properties.default needs to be tweaked in
> build/tags/TOMCAT_5_5_16 so it reflects the right version number.
> 
> Any reason why I shouldn't remove these extra copies and tweak
> build.properties.default?

No-one has shouted so I am going to do this this weekend.

Mark


-
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]

svn commit: r385068 - /tomcat/container/tc5.5.x/catalina/src/conf/server.xml

[markt]

Author: markt
Date: Sat Mar 11 03:52:24 2006
New Revision: 385068

URL: http://svn.apache.org/viewcvs?rev=385068&view=rev
Log:
Remove reference to experimental valve that was only briefly in the repo.

Modified:
tomcat/container/tc5.5.x/catalina/src/conf/server.xml

Modified: tomcat/container/tc5.5.x/catalina/src/conf/server.xml
URL: 
http://svn.apache.org/viewcvs/tomcat/container/tc5.5.x/catalina/src/conf/server.xml?rev=385068&r1=385067&r2=385068&view=diff
==
--- tomcat/container/tc5.5.x/catalina/src/conf/server.xml (original)
+++ tomcat/container/tc5.5.x/catalina/src/conf/server.xml Sat Mar 11 03:52:24 
2006
@@ -355,22 +355,6 @@
  directory="logs"  prefix="localhost_access_log." suffix=".txt"
  pattern="common" resolveHosts="false"/>
 -->
-
-
 
   
 



-
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]

DO NOT REPLY [Bug 38908] - ByteBufferAccessLogValve given in server.xml is not working

[bugzilla]

DO NOT REPLY TO THIS EMAIL, BUT PLEASE POST YOUR BUG·
RELATED COMMENTS THROUGH THE WEB INTERFACE AVAILABLE AT
.
ANY REPLY MADE TO THIS MESSAGE WILL NOT BE COLLECTED AND·
INSERTED IN THE BUG DATABASE.

http://issues.apache.org/bugzilla/show_bug.cgi?id=38908


[EMAIL PROTECTED] changed:

   What|Removed |Added

 Status|REOPENED|RESOLVED
 Resolution||FIXED




--- Additional Comments From [EMAIL PROTECTED]  2006-03-11 11:55 ---
The ByteBufferAccessLogValve was an experiment that only briefly existed in the
repo. When it was removed, server.xml should have been updated and wasn't.

I have justed removed references to this Valve from server.xml.

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

-
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]

svn commit: r385070 - in /tomcat/container/tc5.5.x/modules: groupcom/etc/cluster-server.xml ha/etc/cluster-server.xml

[markt]

Author: markt
Date: Sat Mar 11 04:01:08 2006
New Revision: 385070

URL: http://svn.apache.org/viewcvs?rev=385070&view=rev
Log:
Modify eol handling before making some changes.

Modified:
tomcat/container/tc5.5.x/modules/groupcom/etc/cluster-server.xml   (props 
changed)
tomcat/container/tc5.5.x/modules/ha/etc/cluster-server.xml   (props changed)

Propchange: tomcat/container/tc5.5.x/modules/groupcom/etc/cluster-server.xml
--
svn:eol-style = native

Propchange: tomcat/container/tc5.5.x/modules/ha/etc/cluster-server.xml
--
svn:eol-style = native



-
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]

svn commit: r385072 - in /tomcat/container/tc5.5.x: catalina/src/share/org/apache/catalina/valves/mbeans-descriptors.xml modules/groupcom/etc/cluster-server.xml modules/ha/etc/cluster-server.xml

[markt]

Author: markt
Date: Sat Mar 11 04:05:15 2006
New Revision: 385072

URL: http://svn.apache.org/viewcvs?rev=385072&view=rev
Log:
Remove all remaining traces of ByteBufferAccessLogValve

Modified:

tomcat/container/tc5.5.x/catalina/src/share/org/apache/catalina/valves/mbeans-descriptors.xml
tomcat/container/tc5.5.x/modules/groupcom/etc/cluster-server.xml
tomcat/container/tc5.5.x/modules/ha/etc/cluster-server.xml

Modified: 
tomcat/container/tc5.5.x/catalina/src/share/org/apache/catalina/valves/mbeans-descriptors.xml
URL: 
http://svn.apache.org/viewcvs/tomcat/container/tc5.5.x/catalina/src/share/org/apache/catalina/valves/mbeans-descriptors.xml?rev=385072&r1=385071&r2=385072&view=diff
==
--- 
tomcat/container/tc5.5.x/catalina/src/share/org/apache/catalina/valves/mbeans-descriptors.xml
 (original)
+++ 
tomcat/container/tc5.5.x/catalina/src/share/org/apache/catalina/valves/mbeans-descriptors.xml
 Sat Mar 11 04:05:15 2006
@@ -51,62 +51,6 @@
type="java.lang.String"/>
   
 
-  
-  
-  
-  
-  
-  
-  
-  
-  
-  
-  
-  
-  
-  
-  
-  
-  
-  
-  
-  
-  
- 
-  
-
-  
-  
-  
   http://svn.apache.org/viewcvs/tomcat/container/tc5.5.x/modules/groupcom/etc/cluster-server.xml?rev=385072&r1=385071&r2=385072&view=diff
==
--- tomcat/container/tc5.5.x/modules/groupcom/etc/cluster-server.xml (original)
+++ tomcat/container/tc5.5.x/modules/groupcom/etc/cluster-server.xml Sat Mar 11 
04:05:15 2006
@@ -369,22 +369,6 @@
  directory="logs"  prefix="localhost_access_log." suffix=".txt"
  pattern="common" resolveHosts="false"/>
 -->
-
-
 
   
 

Modified: tomcat/container/tc5.5.x/modules/ha/etc/cluster-server.xml
URL: 
http://svn.apache.org/viewcvs/tomcat/container/tc5.5.x/modules/ha/etc/cluster-server.xml?rev=385072&r1=385071&r2=385072&view=diff
==
--- tomcat/container/tc5.5.x/modules/ha/etc/cluster-server.xml (original)
+++ tomcat/container/tc5.5.x/modules/ha/etc/cluster-server.xml Sat Mar 11 
04:05:15 2006
@@ -365,22 +365,6 @@
  directory="logs"  prefix="localhost_access_log." suffix=".txt"
  pattern="common" resolveHosts="false"/>
 -->
-
-
 
   
 



-
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]

DO NOT REPLY [Bug 37356] - Tomcat does not invalidate sessions after session-timeout period has passed.

[bugzilla]

DO NOT REPLY TO THIS EMAIL, BUT PLEASE POST YOUR BUG·
RELATED COMMENTS THROUGH THE WEB INTERFACE AVAILABLE AT
.
ANY REPLY MADE TO THIS MESSAGE WILL NOT BE COLLECTED AND·
INSERTED IN THE BUG DATABASE.

http://issues.apache.org/bugzilla/show_bug.cgi?id=37356





--- Additional Comments From [EMAIL PROTECTED]  2006-03-11 12:10 ---
Spare your time. Volatile is not going to save you. While "x++" looks somehow
atomic it simply isn't. Read as "x = x+1". Whether x is volatile or not simply
doesn't matter.

In order to do correct access counting, you need to synchronize or use the
atomics provided in Java 5. And anyone who opposes that should remove the
variable altogether as it doesn't do any good then. And should get some
consulting about his fear of synchronization.

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

-
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]

svn commit: r385107 - /tomcat/container/tc5.5.x/modules/groupcom/src/share/org/apache/catalina/tribes/tcp/bio/FastAsyncSocketSender.java

[fhanik]

Author: fhanik
Date: Sat Mar 11 08:53:32 2006
New Revision: 385107

URL: http://svn.apache.org/viewcvs?rev=385107&view=rev
Log:
Fixed imports

Modified:

tomcat/container/tc5.5.x/modules/groupcom/src/share/org/apache/catalina/tribes/tcp/bio/FastAsyncSocketSender.java

Modified: 
tomcat/container/tc5.5.x/modules/groupcom/src/share/org/apache/catalina/tribes/tcp/bio/FastAsyncSocketSender.java
URL: 
http://svn.apache.org/viewcvs/tomcat/container/tc5.5.x/modules/groupcom/src/share/org/apache/catalina/tribes/tcp/bio/FastAsyncSocketSender.java?rev=385107&r1=385106&r2=385107&view=diff
==
--- 
tomcat/container/tc5.5.x/modules/groupcom/src/share/org/apache/catalina/tribes/tcp/bio/FastAsyncSocketSender.java
 (original)
+++ 
tomcat/container/tc5.5.x/modules/groupcom/src/share/org/apache/catalina/tribes/tcp/bio/FastAsyncSocketSender.java
 Sat Mar 11 08:53:32 2006
@@ -18,13 +18,12 @@
 
 import java.net.InetAddress;
 
+import org.apache.catalina.tribes.ChannelException;
 import org.apache.catalina.tribes.ChannelMessage;
-import org.apache.catalina.tribes.util.FastQueue;
-import org.apache.catalina.tribes.util.IQueue;
-import org.apache.catalina.tribes.util.LinkObject;
 import org.apache.catalina.tribes.io.XByteBuffer;
-import org.apache.catalina.tribes.tcp.*;
-import org.apache.catalina.tribes.ChannelException;
+import org.apache.catalina.tribes.tcp.bio.util.FastQueue;
+import org.apache.catalina.tribes.tcp.bio.util.IQueue;
+import org.apache.catalina.tribes.tcp.bio.util.LinkObject;
 
 /**
  * Send cluster messages from a Message queue with only one socket. Ack and 
keep



-
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]

svn commit: r385160 - in /tomcat: connectors/trunk/util/java/org/apache/tomcat/util/net/jsse/JSSE13SocketFactory.java connectors/trunk/util/java/org/apache/tomcat/util/net/jsse/JSSE14SocketFactory.jav

[markt]

Author: markt
Date: Sat Mar 11 12:45:10 2006
New Revision: 385160

URL: http://svn.apache.org/viewcvs?rev=385160&view=rev
Log:
Change default cipher suites to remove insecure ones.

Modified:

tomcat/connectors/trunk/util/java/org/apache/tomcat/util/net/jsse/JSSE13SocketFactory.java

tomcat/connectors/trunk/util/java/org/apache/tomcat/util/net/jsse/JSSE14SocketFactory.java
tomcat/container/tc5.5.x/webapps/docs/changelog.xml

Modified: 
tomcat/connectors/trunk/util/java/org/apache/tomcat/util/net/jsse/JSSE13SocketFactory.java
URL: 
http://svn.apache.org/viewcvs/tomcat/connectors/trunk/util/java/org/apache/tomcat/util/net/jsse/JSSE13SocketFactory.java?rev=385160&r1=385159&r2=385160&view=diff
==
--- 
tomcat/connectors/trunk/util/java/org/apache/tomcat/util/net/jsse/JSSE13SocketFactory.java
 (original)
+++ 
tomcat/connectors/trunk/util/java/org/apache/tomcat/util/net/jsse/JSSE13SocketFactory.java
 Sat Mar 11 12:45:10 2006
@@ -126,7 +126,7 @@
 // Determine which cipher suites to enable
 String requestedCiphers = (String)attributes.get("ciphers");
 enabledCiphers = getEnabledCiphers(requestedCiphers,
- sslProxy.getSupportedCipherSuites());
+ sslProxy.getDefaultCipherSuites());
 
 } catch(Exception e) {
 if( e instanceof IOException )

Modified: 
tomcat/connectors/trunk/util/java/org/apache/tomcat/util/net/jsse/JSSE14SocketFactory.java
URL: 
http://svn.apache.org/viewcvs/tomcat/connectors/trunk/util/java/org/apache/tomcat/util/net/jsse/JSSE14SocketFactory.java?rev=385160&r1=385159&r2=385160&view=diff
==
--- 
tomcat/connectors/trunk/util/java/org/apache/tomcat/util/net/jsse/JSSE14SocketFactory.java
 (original)
+++ 
tomcat/connectors/trunk/util/java/org/apache/tomcat/util/net/jsse/JSSE14SocketFactory.java
 Sat Mar 11 12:45:10 2006
@@ -117,7 +117,7 @@
 // Determine which cipher suites to enable
 String requestedCiphers = (String)attributes.get("ciphers");
 enabledCiphers = getEnabledCiphers(requestedCiphers,
-   
sslProxy.getSupportedCipherSuites());
+   
sslProxy.getDefaultCipherSuites());
 
 } catch(Exception e) {
 if( e instanceof IOException )

Modified: tomcat/container/tc5.5.x/webapps/docs/changelog.xml
URL: 
http://svn.apache.org/viewcvs/tomcat/container/tc5.5.x/webapps/docs/changelog.xml?rev=385160&r1=385159&r2=385160&view=diff
==
--- tomcat/container/tc5.5.x/webapps/docs/changelog.xml (original)
+++ tomcat/container/tc5.5.x/webapps/docs/changelog.xml Sat Mar 11 12:45:10 2006
@@ -28,6 +28,16 @@
   
 
   
+  
+
+  
+Make the default cipher suites available for SSL the same as the set 
of cipher
+suites enabled by default rather than the set of all cipher suites. 
This prevents
+ciphers suites that do not provide confidentiality protection and/or 
server
+authentication being used by default. (markt)
+  
+
+  
   
 
   



-
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]

Re: svn commit: r385160 - in /tomcat: connectors/trunk/util/java/org/apache/tomcat/util/net/jsse/JSSE13SocketFactory.java connectors/trunk/util/java/org/apache/tomcat/util/net/jsse/JSSE14SocketFactory

[Bill Barker]

<[EMAIL PROTECTED]> wrote in message 
news:[EMAIL PROTECTED]
> Author: markt
> Date: Sat Mar 11 12:45:10 2006
> New Revision: 385160
>
> URL: http://svn.apache.org/viewcvs?rev=385160&view=rev
> Log:
> Change default cipher suites to remove insecure ones.
>

Actually, it removes the really high-grade ones as well.  But it's probably 
better to make those people that want the really high-grade ones configure 
it themselves then to allow the low-grade ones in the default.




-
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]

svn commit: r385199 - in /tomcat/container/branches/tc3.3.x/src: admin/WEB-INF/classes/tadm/ examples/WEB-INF/classes/ facade22/org/apache/tomcat/facade/ share/org/apache/jasper/compiler/ share/org/ap

[billbarker]

Author: billbarker
Date: Sat Mar 11 15:29:48 2006
New Revision: 385199

URL: http://svn.apache.org/viewcvs?rev=385199&view=rev
Log:
Quit wimping out on the Java5 build.

The default is still to build for 1.2, but now TC 3 builds happily if you 
override the defaults to specify 1.5.

This should make it possible for anybody that is interested to be able to 
develop a facade25 ;-).


Modified:

tomcat/container/branches/tc3.3.x/src/admin/WEB-INF/classes/tadm/TomcatIterate.java

tomcat/container/branches/tc3.3.x/src/examples/WEB-INF/classes/SnoopServlet.java

tomcat/container/branches/tc3.3.x/src/facade22/org/apache/tomcat/facade/JspInterceptor.java

tomcat/container/branches/tc3.3.x/src/facade22/org/apache/tomcat/facade/LoadOnStartupInterceptor.java

tomcat/container/branches/tc3.3.x/src/facade22/org/apache/tomcat/facade/Servlet22Interceptor.java

tomcat/container/branches/tc3.3.x/src/share/org/apache/jasper/compiler/JspUtil.java

tomcat/container/branches/tc3.3.x/src/share/org/apache/tomcat/ant/Tomcat3Precompiler.java

tomcat/container/branches/tc3.3.x/src/share/org/apache/tomcat/core/ContextManager.java

tomcat/container/branches/tc3.3.x/src/share/org/apache/tomcat/modules/config/ApacheConfig.java

tomcat/container/branches/tc3.3.x/src/share/org/apache/tomcat/modules/config/IISConfig.java

tomcat/container/branches/tc3.3.x/src/share/org/apache/tomcat/modules/config/JservConfig.java

tomcat/container/branches/tc3.3.x/src/share/org/apache/tomcat/modules/config/NSConfig.java

tomcat/container/branches/tc3.3.x/src/share/org/apache/tomcat/modules/config/PolicyInterceptor.java

tomcat/container/branches/tc3.3.x/src/share/org/apache/tomcat/util/log/LogManager.java

Modified: 
tomcat/container/branches/tc3.3.x/src/admin/WEB-INF/classes/tadm/TomcatIterate.java
URL: 
http://svn.apache.org/viewcvs/tomcat/container/branches/tc3.3.x/src/admin/WEB-INF/classes/tadm/TomcatIterate.java?rev=385199&r1=385198&r2=385199&view=diff
==
--- 
tomcat/container/branches/tc3.3.x/src/admin/WEB-INF/classes/tadm/TomcatIterate.java
 (original)
+++ 
tomcat/container/branches/tc3.3.x/src/admin/WEB-INF/classes/tadm/TomcatIterate.java
 Sat Mar 11 15:29:48 2006
@@ -27,7 +27,7 @@
  */
 public class TomcatIterate extends BodyTagSupport {
 PageContext pageContext;
-Enumeration enum;
+Enumeration enumx;
 Object array[];
 int pos=0;
 String name;
@@ -36,7 +36,7 @@
 public TomcatIterate() {}
 
 public void setEnumeration( Enumeration e ) {
-   enum=e;
+   enumx=e;
 }
 
 public void setArray( Object array[] ) {
@@ -61,12 +61,12 @@
 }
 
 public int doStartTag() throws JspException {
-   if( enum == null && array == null ) 
+   if( enumx == null && array == null ) 
return SKIP_BODY;
-   if( enum !=null ) {
-   if( ! enum.hasMoreElements() )
+   if( enumx !=null ) {
+   if( ! enumx.hasMoreElements() )
return SKIP_BODY;
-   pageContext.setAttribute( name , enum.nextElement(),
+   pageContext.setAttribute( name , enumx.nextElement(),
  PageContext.PAGE_SCOPE );
return EVAL_BODY_TAG;
}
@@ -82,9 +82,9 @@
 }
 
 public int doAfterBody() throws JspException {
-   if( enum!=null )
-   if( enum.hasMoreElements() ) {
-   pageContext.setAttribute( name , enum.nextElement(),
+   if( enumx!=null )
+   if( enumx.hasMoreElements() ) {
+   pageContext.setAttribute( name , enumx.nextElement(),
  PageContext.PAGE_SCOPE );
return EVAL_BODY_TAG;
}

Modified: 
tomcat/container/branches/tc3.3.x/src/examples/WEB-INF/classes/SnoopServlet.java
URL: 
http://svn.apache.org/viewcvs/tomcat/container/branches/tc3.3.x/src/examples/WEB-INF/classes/SnoopServlet.java?rev=385199&r1=385198&r2=385199&view=diff
==
--- 
tomcat/container/branches/tc3.3.x/src/examples/WEB-INF/classes/SnoopServlet.java
 (original)
+++ 
tomcat/container/branches/tc3.3.x/src/examples/WEB-INF/classes/SnoopServlet.java
 Sat Mar 11 15:29:48 2006
@@ -59,18 +59,18 @@
 
out.println("Context init parameters:");
ServletContext context = getServletContext();
-   Enumeration enum = context.getInitParameterNames();
-   while (enum.hasMoreElements()) {
-   String key = (String)enum.nextElement();
+   Enumeration enumx = context.getInitParameterNames();
+   while (enumx.hasMoreElements()) {
+   String key = (String)enumx.nextElement();
 Object value = context.getInitParameter(key);
 out.println("   " + key + " = " + value);
}
out.println();
 
out.println("Context attributes:");
-   enum = context.getAttributeNames();