Signing WAR files

2012-01-19 Thread Tomcat Mailing List
Hi,

I added the feature to sign a war file, sothat the war file containing classes 
can run in a security manager.
As already explained I can.t put my signed code in a jar in the lib file but 
have to have it under /classes.

Now I.d like to commit this change back to the community. 
My changes are for Tomcat 7.0.23

Suggestion for Patch:
java/org/apache/catalina/loader/WebappClassLoader.java

change
if (jarEntry != null) {
entry.certificates = jarEntry.getCertificates();
}

to

if (jarEntry != null) {
entry.certificates = jarEntry.getCertificates();
}
else {
JarEntry jEntry=null;
JarFile wFile=null;
try {
   wFile = new 
JarFile(org.apache.naming.resources.WARDirContext.getCurrentPath());
} catch (Exception e) {
}

if (wFile != null) {

try {
jEntry = 
wFile.getJarEntry(current_full_path.substring(1));
InputStream is = 
wFile.getInputStream(jEntry);
int n;
byte[] buffer = new byte[8192];
while ((n = is.read(buffer, 0, 
buffer.length)) != -1) {
}

   if (jEntry != null) {

entry.certificates=jEntry.getCertificates();
}
} catch (Exception exc) {
log.info(Could not read certificates 
from war.);
}
}
}



./java/org/apache/naming/resources/WARDirContext.java
change 
protected ZipFile base = null;
to
protected static ZipFile base = null;

and add the following function:
public static String getCurrentPath() {
if (base != null)
return base.getName();
else
return null;
}

Perhaps there is a much better way for getting the filename of the war file . 
any suggestions? The change to a static variable is only required to get the 
name of the war file that the class file is read from. 

Thanks,
Thomas

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



Re: Signing WAR files

2012-01-19 Thread Mark Thomas
On 19/01/2012 11:28, Tomcat Mailing List wrote:
 Hi,
 
 I added the feature to sign a war file, sothat the war file containing 
 classes can run in a security manager.
 As already explained I can.t put my signed code in a jar in the lib file but 
 have to have it under /classes.
 
 Now I.d like to commit this change back to the community. 
 My changes are for Tomcat 7.0.23
 
 Suggestion for Patch:
 java/org/apache/catalina/loader/WebappClassLoader.java

Please create a bugzilla entry for this and attach your suggested patch
in diff -u format.

Cheers,

Mark

 
 change
 if (jarEntry != null) {
 entry.certificates = jarEntry.getCertificates();
 }
 
 to
 
 if (jarEntry != null) {
 entry.certificates = jarEntry.getCertificates();
 }
 else {
 JarEntry jEntry=null;
 JarFile wFile=null;
 try {
wFile = new 
 JarFile(org.apache.naming.resources.WARDirContext.getCurrentPath());
 } catch (Exception e) {
 }
 
 if (wFile != null) {
 
 try {
 jEntry = 
 wFile.getJarEntry(current_full_path.substring(1));
 InputStream is = 
 wFile.getInputStream(jEntry);
 int n;
 byte[] buffer = new byte[8192];
 while ((n = is.read(buffer, 0, 
 buffer.length)) != -1) {
 }
 
if (jEntry != null) {
 
 entry.certificates=jEntry.getCertificates();
 }
 } catch (Exception exc) {
 log.info(Could not read certificates 
 from war.);
 }
 }
 }
 
 
 
 ./java/org/apache/naming/resources/WARDirContext.java
 change 
 protected ZipFile base = null;
 to
 protected static ZipFile base = null;
 
 and add the following function:
 public static String getCurrentPath() {
 if (base != null)
 return base.getName();
 else
 return null;
 }
 
 Perhaps there is a much better way for getting the filename of the war file . 
 any suggestions? The change to a static variable is only required to get the 
 name of the war file that the class file is read from. 
 
 Thanks,
 Thomas
 
 -
 To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
 For additional commands, e-mail: dev-h...@tomcat.apache.org
 


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



DO NOT REPLY [Bug 52488] New: there is a common typo exipre

2012-01-19 Thread bugzilla
https://issues.apache.org/bugzilla/show_bug.cgi?id=52488

 Bug #: 52488
   Summary: there is a common typo exipre
   Product: Tomcat 6
   Version: 6.0.35
  Platform: PC
OS/Version: Linux
Status: NEW
  Severity: trivial
  Priority: P2
 Component: Cluster
AssignedTo: dev@tomcat.apache.org
ReportedBy: prock...@lse.ac.uk
Classification: Unclassified


Created attachment 28176
  -- https://issues.apache.org/bugzilla/attachment.cgi?id=28176
tomcat-6.0.35-typo.patch fixes the typos

the word expire is typed exipre in a number of places of debug log and mbean
info

patch created also removes a double space

-- 
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 52489] New: Enhancement request for codesigning of war files

2012-01-19 Thread bugzilla
https://issues.apache.org/bugzilla/show_bug.cgi?id=52489

 Bug #: 52489
   Summary: Enhancement request for codesigning of war files
   Product: Tomcat 7
   Version: 7.0.23
  Platform: PC
OS/Version: Linux
Status: NEW
  Severity: enhancement
  Priority: P2
 Component: Catalina
AssignedTo: dev@tomcat.apache.org
ReportedBy: tomcatmail...@ttsecure.org
Classification: Unclassified


Created attachment 28177
  -- https://issues.apache.org/bugzilla/attachment.cgi?id=28177
Patch for enabling signature support for .war files (signing classes under
/WEB-INF/classes/)

Hi,

while it is easy to run Tomcat with a security manager when the webapps are
included in /WEB-INF/lib/*.jar this is not possible right now when using files
under /WEB-INF/classes/. As I am in the situation of having to keep all classes
under /WEB-INF/classes/, I wrote a patch to add this capability for Tomcat. So
with this patch it is possible to sign a .war file and to have the classes
contained in the .war files signed and run correctly withing a Tomcat with
enabled security manager.

Currently only packed war files are supported (so uncompress in server.xml must
be false). Perhaps there is an easier way of getting the file name of the
original war file, enabling a support also for uncompressed .war files.

Attached is the patch file in diff -u format.

-- 
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 52489] Enhancement request for code signing of war files

2012-01-19 Thread bugzilla
https://issues.apache.org/bugzilla/show_bug.cgi?id=52489

Sebb s...@apache.org changed:

   What|Removed |Added

Summary|Enhancement request for |Enhancement request for
   |codesigning of war files|code signing of war files

-- 
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: DO NOT REPLY [Bug 52489] Enhancement request for code signing of war files

2012-01-19 Thread sebb
On 19 January 2012 14:51,  bugzi...@apache.org wrote:
 https://issues.apache.org/bugzilla/show_bug.cgi?id=52489

 Sebb s...@apache.org changed:

           What    |Removed                     |Added
 
            Summary|Enhancement request for     |Enhancement request for
                   |codesigning of war files    |code signing of war files

FYI:

codesigning was ambiguous: code signing or co-designing?

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



svn commit: r1233413 - /tomcat/trunk/java/org/apache/tomcat/util/buf/B2CConverter.java

2012-01-19 Thread markt
Author: markt
Date: Thu Jan 19 15:02:42 2012
New Revision: 1233413

URL: http://svn.apache.org/viewvc?rev=1233413view=rev
Log:
Provide easy access to the two most frequently used Charsets

Modified:
tomcat/trunk/java/org/apache/tomcat/util/buf/B2CConverter.java

Modified: tomcat/trunk/java/org/apache/tomcat/util/buf/B2CConverter.java
URL: 
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/tomcat/util/buf/B2CConverter.java?rev=1233413r1=1233412r2=1233413view=diff
==
--- tomcat/trunk/java/org/apache/tomcat/util/buf/B2CConverter.java (original)
+++ tomcat/trunk/java/org/apache/tomcat/util/buf/B2CConverter.java Thu Jan 19 
15:02:42 2012
@@ -50,6 +50,9 @@ public class B2CConverter {
 private static final MapString, Charset encodingToCharsetCache =
 new HashMapString, Charset();
 
+public static final Charset ISO_8859_1;
+public static final Charset UTF_8;
+
 static {
 for (Charset charset: Charset.availableCharsets().values()) {
 encodingToCharsetCache.put(
@@ -59,6 +62,17 @@ public class B2CConverter {
 alias.toLowerCase(Locale.US), charset);
 }
 }
+Charset iso88591 = null;
+Charset utf8 = null;
+try {
+iso88591 = getCharset(ISO-8859-1);
+utf8 = getCharset(UTF-8);
+} catch (UnsupportedEncodingException e) {
+// Impossible. All JVMs must support these.
+e.printStackTrace();
+}
+ISO_8859_1 = iso88591;
+UTF_8 = utf8;
 }
 
 public static Charset getCharset(String enc)



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



svn commit: r1233415 - in /tomcat/trunk/java/org/apache: catalina/ant/ catalina/authenticator/ catalina/realm/ catalina/servlets/ catalina/util/ catalina/valves/ coyote/http11/filters/ jasper/ jasper/

2012-01-19 Thread markt
Author: markt
Date: Thu Jan 19 15:04:34 2012
New Revision: 1233415

URL: http://svn.apache.org/viewvc?rev=1233415view=rev
Log:
Fix https://issues.apache.org/bugzilla/show_bug.cgi?id=51408
Don't use Charset.defaultCharset(). Use ISO-8859-1 charset explicitly.

Modified:
tomcat/trunk/java/org/apache/catalina/ant/AbstractCatalinaTask.java
tomcat/trunk/java/org/apache/catalina/authenticator/DigestAuthenticator.java
tomcat/trunk/java/org/apache/catalina/realm/JNDIRealm.java
tomcat/trunk/java/org/apache/catalina/realm/RealmBase.java
tomcat/trunk/java/org/apache/catalina/servlets/WebdavServlet.java
tomcat/trunk/java/org/apache/catalina/util/RequestUtil.java
tomcat/trunk/java/org/apache/catalina/valves/AccessLogValve.java
tomcat/trunk/java/org/apache/catalina/valves/SSLValve.java
tomcat/trunk/java/org/apache/coyote/http11/filters/BufferedInputFilter.java
tomcat/trunk/java/org/apache/coyote/http11/filters/ChunkedInputFilter.java
tomcat/trunk/java/org/apache/coyote/http11/filters/IdentityInputFilter.java
tomcat/trunk/java/org/apache/coyote/http11/filters/VoidInputFilter.java
tomcat/trunk/java/org/apache/jasper/Constants.java
tomcat/trunk/java/org/apache/jasper/compiler/SmapUtil.java
tomcat/trunk/java/org/apache/naming/resources/Constants.java
tomcat/trunk/java/org/apache/naming/resources/ProxyDirContext.java
tomcat/trunk/java/org/apache/tomcat/util/buf/MessageBytes.java

Modified: tomcat/trunk/java/org/apache/catalina/ant/AbstractCatalinaTask.java
URL: 
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/ant/AbstractCatalinaTask.java?rev=1233415r1=1233414r2=1233415view=diff
==
--- tomcat/trunk/java/org/apache/catalina/ant/AbstractCatalinaTask.java 
(original)
+++ tomcat/trunk/java/org/apache/catalina/ant/AbstractCatalinaTask.java Thu Jan 
19 15:04:34 2012
@@ -26,9 +26,9 @@ import java.io.InputStreamReader;
 import java.net.HttpURLConnection;
 import java.net.URL;
 import java.net.URLConnection;
-import java.nio.charset.Charset;
 
 import org.apache.catalina.util.Base64;
+import org.apache.tomcat.util.buf.B2CConverter;
 import org.apache.tools.ant.BuildException;
 import org.apache.tools.ant.Project;
 
@@ -202,7 +202,7 @@ public abstract class AbstractCatalinaTa
 // Set up an authorization header with our credentials
 String input = username + : + password;
 String output =
-Base64.encode(input.getBytes(Charset.defaultCharset()));
+Base64.encode(input.getBytes(B2CConverter.ISO_8859_1));
 hconn.setRequestProperty(Authorization,
  Basic  + output);
 

Modified: 
tomcat/trunk/java/org/apache/catalina/authenticator/DigestAuthenticator.java
URL: 
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/authenticator/DigestAuthenticator.java?rev=1233415r1=1233414r2=1233415view=diff
==
--- 
tomcat/trunk/java/org/apache/catalina/authenticator/DigestAuthenticator.java 
(original)
+++ 
tomcat/trunk/java/org/apache/catalina/authenticator/DigestAuthenticator.java 
Thu Jan 19 15:04:34 2012
@@ -20,7 +20,6 @@ package org.apache.catalina.authenticato
 
 
 import java.io.IOException;
-import java.nio.charset.Charset;
 import java.security.MessageDigest;
 import java.security.NoSuchAlgorithmException;
 import java.security.Principal;
@@ -38,6 +37,7 @@ import org.apache.catalina.deploy.LoginC
 import org.apache.catalina.util.MD5Encoder;
 import org.apache.juli.logging.Log;
 import org.apache.juli.logging.LogFactory;
+import org.apache.tomcat.util.buf.B2CConverter;
 
 
 
@@ -368,7 +368,7 @@ public class DigestAuthenticator extends
 byte[] buffer;
 synchronized (md5Helper) {
 buffer = md5Helper.digest(
-ipTimeKey.getBytes(Charset.defaultCharset()));
+ipTimeKey.getBytes(B2CConverter.ISO_8859_1));
 }
 
 return currentTime + : + md5Encoder.encode(buffer);
@@ -619,7 +619,7 @@ public class DigestAuthenticator extends
 byte[] buffer = null;
 synchronized (md5Helper) {
 buffer = md5Helper.digest(
-serverIpTimeKey.getBytes(Charset.defaultCharset()));
+serverIpTimeKey.getBytes(B2CConverter.ISO_8859_1));
 }
 String md5ServerIpTimeKey = md5Encoder.encode(buffer);
 if (!md5ServerIpTimeKey.equals(md5clientIpTimeKey)) {
@@ -681,7 +681,7 @@ public class DigestAuthenticator extends
 
 byte[] buffer;
 synchronized (md5Helper) {
-buffer = 
md5Helper.digest(a2.getBytes(Charset.defaultCharset()));
+buffer = 
md5Helper.digest(a2.getBytes(B2CConverter.ISO_8859_1));
 }
 String md5a2 = md5Encoder.encode(buffer);
 


svn commit: r1233417 - /tomcat/trunk/webapps/docs/changelog.xml

2012-01-19 Thread markt
Author: markt
Date: Thu Jan 19 15:05:08 2012
New Revision: 1233417

URL: http://svn.apache.org/viewvc?rev=1233417view=rev
Log:
Update change log

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

Modified: tomcat/trunk/webapps/docs/changelog.xml
URL: 
http://svn.apache.org/viewvc/tomcat/trunk/webapps/docs/changelog.xml?rev=1233417r1=1233416r2=1233417view=diff
==
--- tomcat/trunk/webapps/docs/changelog.xml (original)
+++ tomcat/trunk/webapps/docs/changelog.xml Thu Jan 19 15:05:08 2012
@@ -53,6 +53,10 @@
 Remove duplicate code that converted a Hostapos;s appBase attribute to
 a canonical file. (markt)
   /scode
+  scode
+bug51408/bug: Remove calls to codeCharset.defaultCharset()/code
+with an explicit reference to the ISO-8859-1 Charset. (markt)
+  /scode
 /changelog
   /subsection
   subsection name=Tribes



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



DO NOT REPLY [Bug 51408] String.getBytes() and new String(byte[]) use default charset - may cause problems in some Locales

2012-01-19 Thread bugzilla
https://issues.apache.org/bugzilla/show_bug.cgi?id=51408

Mark Thomas ma...@apache.org changed:

   What|Removed |Added

 Status|REOPENED|RESOLVED
 Resolution||FIXED

--- Comment #6 from Mark Thomas ma...@apache.org 2012-01-19 15:05:26 UTC ---
I'm reluctant to change this for 7.0.x since there is a risk it could break
something and no-one has reported a bug as a result of this.

I have changed these to explicitly use ISO-8859-1 for 8.0.x onwards. There are
some places where UTF-8 may be a better choice in the future as standards move
towards UTF-8. We can change these as users request it.

-- 
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: [GUMP@vmgump]: Project tomcat-trunk-validate (in module tomcat-trunk) failed

2012-01-19 Thread Konstantin Kolinko
2012/1/19 Bill Barker billbar...@apache.org:
 To whom it may engage...

 This is an automated request, but not an unsolicited one. For
 more information please visit http://gump.apache.org/nagged.html,
 and/or contact the folk at gene...@gump.apache.org.

 Project tomcat-trunk-validate has an issue affecting its community 
 integration.
 This issue affects 1 projects.
 The current state of this project is 'Failed', with reason 'Build Failed'.
 For reference only, the following projects are affected by this:
    - tomcat-trunk-validate :  Tomcat 8.x, a web server implementing Java 
 Servlet 3.1,
    ...


 Full details are available at:
    
 http://vmgump.apache.org/gump/public/tomcat-trunk/tomcat-trunk-validate/index.html


 [checkstyle] 
 /srv/gump/public/workspace/tomcat-trunk/modules/jdbc-pool/jdbc-pool/src/test/java/org/apache/tomcat/jdbc/test/DefaultTestCase.java:186:19:
  'static' modifier out of order with the JLS suggestions.


False alarm.  Note jdbc-pool/jdbc-pool in the above path.

It is stale code that should not be there.

As I remember several months ago somebody was experimenting with
svn:externals on the modules folder of trunk. That nested jdbc-pool
must be a nested working copy created from such external.

The svn 1.6 client (used at Gump) leaves stale nested working copy
generated from an external when external is unset. That is why those
files are still there.

I'll add a command to delete those files to our build.xml, and will
revert the change once Gump is fixed.

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: r1233423 - in /tomcat/trunk: java/org/apache/catalina/util/Base64.java java/org/apache/tomcat/util/buf/ByteChunk.java test/org/apache/tomcat/util/http/TesterParametersPerformance.java

2012-01-19 Thread markt
Author: markt
Date: Thu Jan 19 15:13:16 2012
New Revision: 1233423

URL: http://svn.apache.org/viewvc?rev=1233423view=rev
Log:
Take advantage of newly exposed Charset constants

Modified:
tomcat/trunk/java/org/apache/catalina/util/Base64.java
tomcat/trunk/java/org/apache/tomcat/util/buf/ByteChunk.java

tomcat/trunk/test/org/apache/tomcat/util/http/TesterParametersPerformance.java

Modified: tomcat/trunk/java/org/apache/catalina/util/Base64.java
URL: 
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/util/Base64.java?rev=1233423r1=1233422r2=1233423view=diff
==
--- tomcat/trunk/java/org/apache/catalina/util/Base64.java (original)
+++ tomcat/trunk/java/org/apache/catalina/util/Base64.java Thu Jan 19 15:13:16 
2012
@@ -17,8 +17,6 @@
 
 package org.apache.catalina.util;
 
-import java.io.UnsupportedEncodingException;
-
 import org.apache.tomcat.util.buf.B2CConverter;
 import org.apache.tomcat.util.buf.ByteChunk;
 import org.apache.tomcat.util.buf.CharChunk;
@@ -172,15 +170,7 @@ public final class  Base64
 encodedData[encodedIndex + 3] = PAD;
 }
 
-String result;
-try {
-result = new String(encodedData,
-B2CConverter.getCharset(ISO-8859-1));
-} catch (UnsupportedEncodingException e) {
-// Should never happen but in case it does...
-result = new String(encodedData);
-}
-return result;
+return new String(encodedData, B2CConverter.ISO_8859_1);
 }
 
 /**

Modified: tomcat/trunk/java/org/apache/tomcat/util/buf/ByteChunk.java
URL: 
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/tomcat/util/buf/ByteChunk.java?rev=1233423r1=1233422r2=1233423view=diff
==
--- tomcat/trunk/java/org/apache/tomcat/util/buf/ByteChunk.java (original)
+++ tomcat/trunk/java/org/apache/tomcat/util/buf/ByteChunk.java Thu Jan 19 
15:13:16 2012
@@ -18,7 +18,6 @@ package org.apache.tomcat.util.buf;
 
 import java.io.IOException;
 import java.io.Serializable;
-import java.io.UnsupportedEncodingException;
 import java.nio.ByteBuffer;
 import java.nio.CharBuffer;
 import java.nio.charset.Charset;
@@ -100,17 +99,7 @@ public final class ByteChunk implements 
 as most standards seem to converge, but the servlet API requires
 8859_1, and this object is used mostly for servlets.
 */
-public static final Charset DEFAULT_CHARSET;
-
-static {
-Charset c = null;
-try {
-c = B2CConverter.getCharset(ISO-8859-1);
-} catch (UnsupportedEncodingException e) {
-// Should never happen since all JVMs must support ISO-8859-1
-}
-DEFAULT_CHARSET = c;
-}
+public static final Charset DEFAULT_CHARSET = B2CConverter.ISO_8859_1;
 
 // byte[]
 private byte[] buff;

Modified: 
tomcat/trunk/test/org/apache/tomcat/util/http/TesterParametersPerformance.java
URL: 
http://svn.apache.org/viewvc/tomcat/trunk/test/org/apache/tomcat/util/http/TesterParametersPerformance.java?rev=1233423r1=1233422r2=1233423view=diff
==
--- 
tomcat/trunk/test/org/apache/tomcat/util/http/TesterParametersPerformance.java 
(original)
+++ 
tomcat/trunk/test/org/apache/tomcat/util/http/TesterParametersPerformance.java 
Thu Jan 19 15:13:16 2012
@@ -109,13 +109,7 @@ public class TesterParametersPerformance
 System.arraycopy(inputBytes, 0, bytes, 0, inputLength);
 
 String[] result = new String[loops];
-Charset charset = null;
-try {
-charset = B2CConverter.getCharset(ISO-8859-1);
-} catch (UnsupportedEncodingException e) {
-// TODO Auto-generated catch block
-e.printStackTrace();
-}
+Charset charset = B2CConverter.ISO_8859_1;
 
 long start = System.nanoTime();
 for (int i = 0; i  loops; i++) {



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



svn commit: r1233424 - in /tomcat/tc7.0.x/trunk: ./ java/org/apache/catalina/util/Base64.java java/org/apache/tomcat/util/buf/B2CConverter.java java/org/apache/tomcat/util/buf/ByteChunk.java webapps/d

2012-01-19 Thread markt
Author: markt
Date: Thu Jan 19 15:18:06 2012
New Revision: 1233424

URL: http://svn.apache.org/viewvc?rev=1233424view=rev
Log:
Simplify obtaining references to common Charsets

Modified:
tomcat/tc7.0.x/trunk/   (props changed)
tomcat/tc7.0.x/trunk/java/org/apache/catalina/util/Base64.java
tomcat/tc7.0.x/trunk/java/org/apache/tomcat/util/buf/B2CConverter.java
tomcat/tc7.0.x/trunk/java/org/apache/tomcat/util/buf/ByteChunk.java
tomcat/tc7.0.x/trunk/webapps/docs/changelog.xml

Propchange: tomcat/tc7.0.x/trunk/
--
--- svn:mergeinfo (original)
+++ svn:mergeinfo Thu Jan 19 15:18:06 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

svn commit: r1233426 - in /tomcat/trunk/java/org/apache/catalina: ha/session/DeltaManager.java ha/session/mbeans-descriptors.xml tribes/membership/McastServiceImpl.java

2012-01-19 Thread markt
Author: markt
Date: Thu Jan 19 15:21:30 2012
New Revision: 1233426

URL: http://svn.apache.org/viewvc?rev=1233426view=rev
Log:
s/exipre/expire/g

Modified:
tomcat/trunk/java/org/apache/catalina/ha/session/DeltaManager.java
tomcat/trunk/java/org/apache/catalina/ha/session/mbeans-descriptors.xml

tomcat/trunk/java/org/apache/catalina/tribes/membership/McastServiceImpl.java

Modified: tomcat/trunk/java/org/apache/catalina/ha/session/DeltaManager.java
URL: 
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/ha/session/DeltaManager.java?rev=1233426r1=1233425r2=1233426view=diff
==
--- tomcat/trunk/java/org/apache/catalina/ha/session/DeltaManager.java 
(original)
+++ tomcat/trunk/java/org/apache/catalina/ha/session/DeltaManager.java Thu Jan 
19 15:21:30 2012
@@ -1193,7 +1193,7 @@ public class DeltaManager extends Cluste
 }//end if
 }//for
 long timeEnd = System.currentTimeMillis();
-if(log.isDebugEnabled()) log.debug(End expire sessions  + getName() 
+  exipre processingTime  + (timeEnd - timeNow) +  expired direct sessions: 
 + expireDirect +  expired direct sessions:  + expireIndirect);
+if(log.isDebugEnabled()) log.debug(End expire sessions  + getName() 
+  expire processingTime  + (timeEnd - timeNow) +  expired direct sessions: 
 + expireDirect +  expired direct sessions:  + expireIndirect);
 
 }
 

Modified: 
tomcat/trunk/java/org/apache/catalina/ha/session/mbeans-descriptors.xml
URL: 
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/ha/session/mbeans-descriptors.xml?rev=1233426r1=1233425r2=1233426view=diff
==
--- tomcat/trunk/java/org/apache/catalina/ha/session/mbeans-descriptors.xml 
(original)
+++ tomcat/trunk/java/org/apache/catalina/ha/session/mbeans-descriptors.xml Thu 
Jan 19 15:21:30 2012
@@ -204,7 +204,7 @@
 attribute
   name=expireSessionsOnShutdown
   is=true
-  description=exipre all sessions cluster wide as one node goes down
+  description=expire all sessions cluster wide as one node goes down
   type=boolean/
 attribute
   name=invalidatedSessions
@@ -325,7 +325,7 @@
 /operation
 operation
   name=expireAllLocalSessions
-  description=Exipre all active local sessions and replicate the invalid 
sessions
+  description=expire all active local sessions and replicate the invalid 
sessions
   impact=ACTION
   returnType=void/
 operation
@@ -453,7 +453,7 @@
 attribute
   name=expireSessionsOnShutdown
   is=true
-  description=exipre all sessions cluster wide as one node goes down
+  description=expire all sessions cluster wide as one node goes down
   type=boolean/
 attribute
   name=invalidatedSessions

Modified: 
tomcat/trunk/java/org/apache/catalina/tribes/membership/McastServiceImpl.java
URL: 
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/tribes/membership/McastServiceImpl.java?rev=1233426r1=1233425r2=1233426view=diff
==
--- 
tomcat/trunk/java/org/apache/catalina/tribes/membership/McastServiceImpl.java 
(original)
+++ 
tomcat/trunk/java/org/apache/catalina/tribes/membership/McastServiceImpl.java 
Thu Jan 19 15:21:30 2012
@@ -447,7 +447,7 @@ public class McastServiceImpl
 for (int i = 0; i  expired.length; i++) {
 final MemberImpl member = expired[i];
 if (log.isDebugEnabled())
-log.debug(Mcast exipre  member  + expired[i]);
+log.debug(Mcast expire  member  + expired[i]);
 try {
 Runnable t = new Runnable() {
 @Override



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



svn commit: r1233428 - in /tomcat/trunk: build.xml webapps/docs/changelog.xml

2012-01-19 Thread kkolinko
Author: kkolinko
Date: Thu Jan 19 15:22:17 2012
New Revision: 1233428

URL: http://svn.apache.org/viewvc?rev=1233428view=rev
Log:
Temporarily add a command to build.xml to fix tomcat-trunk-validate failures at 
Gump. I'll remove it tomorrow.
Correct typo in the changelog.

Modified:
tomcat/trunk/build.xml
tomcat/trunk/webapps/docs/changelog.xml

Modified: tomcat/trunk/build.xml
URL: 
http://svn.apache.org/viewvc/tomcat/trunk/build.xml?rev=1233428r1=1233427r2=1233428view=diff
==
--- tomcat/trunk/build.xml (original)
+++ tomcat/trunk/build.xml Thu Jan 19 15:22:17 2012
@@ -439,6 +439,9 @@
   /target
 
   target name=validate depends=download-validate if=${execute.validate}
+!-- FIXME: Temporary trick to remove stale svn checkout at Gump. 
2012-01-19 --
+delete defaultexcludes=false dir=modules/jdbc-pool/jdbc-pool 
includeemptydirs=true /
+
 !-- Required so we can cache checkstyle results --
 mkdir dir=${tomcat.output}/res/checkstyle/
 

Modified: tomcat/trunk/webapps/docs/changelog.xml
URL: 
http://svn.apache.org/viewvc/tomcat/trunk/webapps/docs/changelog.xml?rev=1233428r1=1233427r2=1233428view=diff
==
--- tomcat/trunk/webapps/docs/changelog.xml (original)
+++ tomcat/trunk/webapps/docs/changelog.xml Thu Jan 19 15:22:17 2012
@@ -54,7 +54,7 @@
 a canonical file. (markt)
   /scode
   scode
-bug51408/bug: Remove calls to codeCharset.defaultCharset()/code
+bug51408/bug: Replace calls to 
codeCharset.defaultCharset()/code
 with an explicit reference to the ISO-8859-1 Charset. (markt)
   /scode
 /changelog



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



svn commit: r1233431 - in /tomcat/tc7.0.x/trunk: ./ java/org/apache/catalina/ha/session/ java/org/apache/catalina/tribes/membership/ webapps/docs/

2012-01-19 Thread markt
Author: markt
Date: Thu Jan 19 15:25:50 2012
New Revision: 1233431

URL: http://svn.apache.org/viewvc?rev=1233431view=rev
Log:
Fix https://issues.apache.org/bugzilla/show_bug.cgi?id=52488
s/exipre/expire/g

Modified:
tomcat/tc7.0.x/trunk/   (props changed)
tomcat/tc7.0.x/trunk/java/org/apache/catalina/ha/session/DeltaManager.java

tomcat/tc7.0.x/trunk/java/org/apache/catalina/ha/session/mbeans-descriptors.xml

tomcat/tc7.0.x/trunk/java/org/apache/catalina/tribes/membership/McastServiceImpl.java
tomcat/tc7.0.x/trunk/webapps/docs/changelog.xml

Propchange: tomcat/tc7.0.x/trunk/
--
--- svn:mergeinfo (original)
+++ svn:mergeinfo Thu Jan 19 15:25:50 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
 

svn commit: r1233433 - in /tomcat/tc6.0.x/trunk: ./ java/org/apache/catalina/ha/session/ java/org/apache/catalina/tribes/membership/ webapps/docs/

2012-01-19 Thread markt
Author: markt
Date: Thu Jan 19 15:32:27 2012
New Revision: 1233433

URL: http://svn.apache.org/viewvc?rev=1233433view=rev
Log:
Fix https://issues.apache.org/bugzilla/show_bug.cgi?id=52488
s/exipre/expire/g

Modified:
tomcat/tc6.0.x/trunk/   (props changed)
tomcat/tc6.0.x/trunk/java/org/apache/catalina/ha/session/DeltaManager.java

tomcat/tc6.0.x/trunk/java/org/apache/catalina/ha/session/mbeans-descriptors.xml

tomcat/tc6.0.x/trunk/java/org/apache/catalina/tribes/membership/McastServiceImpl.java
tomcat/tc6.0.x/trunk/webapps/docs/changelog.xml

Propchange: tomcat/tc6.0.x/trunk/
--
--- svn:mergeinfo (original)
+++ svn:mergeinfo Thu Jan 19 15:32:27 2012
@@ -1,3 +1,3 @@
 /tomcat/tc6.0.x/trunk:1224802
 /tomcat/tc7.0.x/trunk:1224802
-/tomcat/trunk:601180,606992,612607,630314,640888,652744,653247,666232,673796,673820,677910,683969,683982,684001,684081,684234,684269-684270,685177,687503,687645,689402,690781,691392,691805,692748,693378,694992,695053,695311,696780,696782,698012,698227,698236,698613,699427,699634,701355,709294,709811,709816,710063,710066,710125,710205,711126,711600,712461,712467,713953,714002,718360,719119,719124,719602,719626,719628,720046,720069,721040,721286,721708,721886,723404,723738,726052,727303,728032,728768,728947,729057,729567,729569,729571,729681,729809,729815,729934,730250,730590,731651,732859,732863,734734,740675,740684,742677,742697,742714,744160,744238,746321,746384,746425,747834,747863,748344,750258,750291,750921,751286-751287,751289,751295,752323,753039,757335,757774,758249,758365,758596,758616,758664,759074,761601,762868,762929,762936-762937,763166,763183,763193,763228,763262,763298,763302,763325,763599,763611,763654,763681,763706,764985,764997,765662,768335,769979,770716,77
 
0809,770876,772872,776921,776924,776935,776945,777464,777466,777576,777625,778379,778523-778524,781528,781779,782145,782791,783316,783696,783724,783756,783762,783766,783863,783934,784453,784602,784614,785381,785688,785768,785859,786468,786487,786490,786496,786667,787627,787770,787985,789389,790405,791041,791184,791194,791224,791243,791326,791328,791789,792740,793372,793757,793882,793981,794082,794673,794822,795043,795152,795210,795457,795466,797168,797425,797596,797607,802727,802940,804462,804544,804734,805153,809131,809603,810916,810977,812125,812137,812432,813001,813013,813866,814180,814708,814876,815972,816252,817442,817822,819339,819361,820110,820132,820874,820954,821397,828196,828201,828210,828225,828759,830378-830379,830999,831106,831774,831785,831828,831850,831860,832214,832218,833121,833545,834047,835036,835336,836405,881396,881412,883130,883134,883146,883165,883177,883362,883565,884341,885038,885231,885241,885260,885901,885991,886019,888072,889363,889606,889716,8901
 
39,890265,890349-890350,890417,891185-891187,891583,892198,892341,892415,892464,892555,892812,892814,892817,892843,892887,893321,893493,894580,894586,894805,894831,895013,895045,895057,895191,895392,895703,896370,896384,897380-897381,897776,898126,898256,898468,898527,898555,898558,898718,898836,898906,899284,899348,899420,899653,899769-899770,899783,899788,899792,899916,899918-899919,899935,899949,903916,905020,905151,905722,905728,905735,907311,907513,907538,907652,907819,907825,907864,908002,908721,908754,908759,909097,909206,909212,909525,909636,909869,909875,909887,910266,910370,910442,910471,910485,910974,915226,915737,915861,916097,916141,916157,916170,917598,917633,918093,918489,918594,918684,918787,918792,918799,918803,918885,919851,919914,920025,920055,920298,920449,920596,920824,920840,921444,922010,926716,927062,927621,928482,928695,928732,928798,931709,932357,932967,935105,935983,939491,939551,940064,941356,941463,943112,944409,944416,945231,945808,945835,945841
 
,946686,948057,950164,950596,950614,950851,950905,951615,953434,954435,955648,955655,956832,957130,957830,958192,960701,961948,962865,962872,962881,962900,963106,963865,963868,964614,966177-966178,966292,966692,966863,981815,988448,991837,993042,1001955,1002185,1002263,1002274,1002349,1002359,1002362,1002481,1002514,1003461,1003481,1003488,1003556,1003572,1003581,1003861,1004393,1004409,1004415,1004868-1004869,1004912,1005452,1005467,1005647,1005802,1022120,1022134,1022323,1022415,1022606,1022623,1024224,1024251,1026042,1026784,1026912,1026920,1029767,1033415,1033448,1033842,1033897,1037715,1037794,1037887,1037924,1038041,1042022,1042029,1042447,1042452,1042494,1044944,1044987,1050249,1055055,1055236,1055458,1055975,1056264,1056828,1056889,1059881,1061412,1061442,1061446,1062398,1064652,1066244,1066772,1067039,1067139,1069824,1070139,1070420,1070609,1072042,1073393,1075458,1076212,1078409,1078412,1079801,1081334,1088179,1088460,1090022,1094069,1094089,1095138,1097899,1099575
 

DO NOT REPLY [Bug 52488] there is a common typo exipre

2012-01-19 Thread bugzilla
https://issues.apache.org/bugzilla/show_bug.cgi?id=52488

Mark Thomas ma...@apache.org changed:

   What|Removed |Added

 Status|NEW |RESOLVED
 Resolution||FIXED

--- Comment #1 from Mark Thomas ma...@apache.org 2012-01-19 15:33:03 UTC ---
Thanks for the report and the patch. This has been fixed in trunk, 7.0.x and
6.0.x and will be included in 7.0.26 onwards and 6.0.36 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 51181] Add support for Web Sockets

2012-01-19 Thread bugzilla
https://issues.apache.org/bugzilla/show_bug.cgi?id=51181

David Corley davidcor...@gmail.com changed:

   What|Removed |Added

 CC||davidcor...@gmail.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 52474] Do not load listeners declared with blank spaces on tld file.

2012-01-19 Thread bugzilla
https://issues.apache.org/bugzilla/show_bug.cgi?id=52474

Helio Frota heliofr...@gmail.com changed:

   What|Removed |Added

 Status|RESOLVED|REOPENED
 Resolution|INVALID |

-- 
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: r1233755 - /tomcat/trunk/build.xml

2012-01-19 Thread kkolinko
Author: kkolinko
Date: Fri Jan 20 04:38:25 2012
New Revision: 1233755

URL: http://svn.apache.org/viewvc?rev=1233755view=rev
Log:
Revert r1233428.
The issue with tomcat-trunk-validate at Gump is fixed - it did run successfully.

Modified:
tomcat/trunk/build.xml

Modified: tomcat/trunk/build.xml
URL: 
http://svn.apache.org/viewvc/tomcat/trunk/build.xml?rev=1233755r1=1233754r2=1233755view=diff
==
--- tomcat/trunk/build.xml (original)
+++ tomcat/trunk/build.xml Fri Jan 20 04:38:25 2012
@@ -439,9 +439,6 @@
   /target
 
   target name=validate depends=download-validate if=${execute.validate}
-!-- FIXME: Temporary trick to remove stale svn checkout at Gump. 
2012-01-19 --
-delete defaultexcludes=false dir=modules/jdbc-pool/jdbc-pool 
includeemptydirs=true /
-
 !-- Required so we can cache checkstyle results --
 mkdir dir=${tomcat.output}/res/checkstyle/
 



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