svn commit: r1729132 - in /tomcat/site/trunk/docs/tomcat-9.0-doc: ./ api/ api/org/apache/catalina/ api/org/apache/catalina/ant/ api/org/apache/catalina/ant/jmx/ api/org/apache/catalina/authenticator/

2016-02-08 Thread markt
Author: markt
Date: Mon Feb  8 11:13:07 2016
New Revision: 1729132

URL: http://svn.apache.org/viewvc?rev=1729132&view=rev
Log:
Update docs for 9.0.0.M3


[This commit notification would consist of 146 parts, 
which exceeds the limit of 50 ones, so it was shortened to the summary.]

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



[RESULT][VOTE] Release Apache Tomcat 8.0.32

2016-02-08 Thread Mark Thomas
The following votes were cast:

Binding:
+1: markt, violetagg, kfujino, remm, fschumacher, mgrigorov, schultz

Non-binding:
+1: ognjen


This vote therefore passes. Thanks to every one who tested and/or voted.
I'll start the final release steps shortly.

Mark

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



svn commit: r1729134 - in /tomcat/site/trunk: build.properties.default docs/download-90.html docs/index.html docs/oldnews.html docs/whichversion.html xdocs/download-90.xml xdocs/index.xml xdocs/oldnew

2016-02-08 Thread markt
Author: markt
Date: Mon Feb  8 11:18:26 2016
New Revision: 1729134

URL: http://svn.apache.org/viewvc?rev=1729134&view=rev
Log:
Update docs for 9.0.0.M3 release

Modified:
tomcat/site/trunk/build.properties.default
tomcat/site/trunk/docs/download-90.html
tomcat/site/trunk/docs/index.html
tomcat/site/trunk/docs/oldnews.html
tomcat/site/trunk/docs/whichversion.html
tomcat/site/trunk/xdocs/download-90.xml
tomcat/site/trunk/xdocs/index.xml
tomcat/site/trunk/xdocs/oldnews.xml
tomcat/site/trunk/xdocs/whichversion.xml

Modified: tomcat/site/trunk/build.properties.default
URL: 
http://svn.apache.org/viewvc/tomcat/site/trunk/build.properties.default?rev=1729134&r1=1729133&r2=1729134&view=diff
==
--- tomcat/site/trunk/build.properties.default (original)
+++ tomcat/site/trunk/build.properties.default Mon Feb  8 11:18:26 2016
@@ -39,7 +39,7 @@ tomcat.loc=http://www.apache.org/dist/to
 tomcat60=6.0.43
 tomcat70=7.0.67
 tomcat80=8.0.30
-tomcat90=9.0.0.M1
+tomcat90=9.0.0.M3
 
 # - Download destination -
 tomcat-site-docs.home=${base.path}/tomcat-site-docs/

Modified: tomcat/site/trunk/docs/download-90.html
URL: 
http://svn.apache.org/viewvc/tomcat/site/trunk/docs/download-90.html?rev=1729134&r1=1729133&r2=1729134&view=diff
==
--- tomcat/site/trunk/docs/download-90.html (original)
+++ tomcat/site/trunk/docs/download-90.html Mon Feb  8 11:18:26 2016
@@ -215,7 +215,7 @@
 Quick Navigation
 
 
-[define v]9.0.0.M1[end]
+[define v]9.0.0.M3[end]
 https://www.apache.org/dist/tomcat/tomcat-9/KEYS";>KEYS |
 [v] |
 Browse |

Modified: tomcat/site/trunk/docs/index.html
URL: 
http://svn.apache.org/viewvc/tomcat/site/trunk/docs/index.html?rev=1729134&r1=1729133&r2=1729134&view=diff
==
--- tomcat/site/trunk/docs/index.html (original)
+++ tomcat/site/trunk/docs/index.html Mon Feb  8 11:18:26 2016
@@ -237,6 +237,43 @@ project logo are trademarks of the Apach
 
 
 
+
+2016-02-05 Tomcat 9.0.0.M3 (alpha) 
Released
+
+
+
+The Apache Tomcat Project is proud to announce the release of version 9.0.0.M3
+(alpha) of Apache Tomcat. The is a milestone release of the 9.0.x branch and 
has
+been made to provide users with early access to the new features in Apache
+Tomcat 9.0.x so that they may provide feedback. The notable changes compared to
+9.0.0.M1 include:
+
+
+
+Added the ability to use OpenSSL with JSSE style TLS configuration
+
+Added support for relative HTTP redirects
+
+Added the ability to access the CredentialHandler via the
+ServletContext
+
+
+
+
+
+Full details of these changes, and all the other changes, are available in the
+Tomcat 9
+changelog.
+
+
+
+
+
+Download
+
+
+
+
 
 2016-01-11 Tomcat Native 1.2.4 Released
 
@@ -374,43 +411,6 @@ changelog.
 
 
 
-
-
-2015-11-19 Tomcat 9.0.0.M1 (alpha) 
Released
-
-
-
-The Apache Tomcat Project is proud to announce the release of version 9.0.0.M1
-(alpha) of Apache Tomcat. The is the first milestone release of the 9.0.x 
branch
-and has been made to provide users with early access to the new features in
-Apache Tomcat 9.0.x so that they may provide feedback.The notable changes
-compared to 8.0.x include:
-
-
-
-Adding support for HTTP/2, and TLS virtual hosting
-
-An implementation of the current draft of the Servlet 4.0 
specification
-
-The BIO connectors, support for Windows Itanium and support for Comet have
-been removed
-
-
-
-
-
-Full details of these changes, and all the other changes, are available in the
-Tomcat 9
-changelog.
-
-
-
-
-
-Download
-
-
-
 
 
 2015-08-11 Tomcat Connectors 1.2.41 
Released

Modified: tomcat/site/trunk/docs/oldnews.html
URL: 
http://svn.apache.org/viewvc/tomcat/site/trunk/docs/oldnews.html?rev=1729134&r1=1729133&r2=1729134&view=diff
==
--- tomcat/site/trunk/docs/oldnews.html (original)
+++ tomcat/site/trunk/docs/oldnews.html Mon Feb  8 11:18:26 2016
@@ -308,6 +308,43 @@ changelog.
 
 
 
+
+2015-11-19 Tomcat 9.0.0.M1 (alpha) 
Released
+
+
+
+The Apache Tomcat Project is proud to announce the release of version 9.0.0.M1
+(alpha) of Apache Tomcat. The is the first milestone release of the 9.0.x 
branch
+and has been made to provide users with early access to the new features in
+Apache Tomcat 9.0.x so that they may provide feedback.The notable changes
+compared to 8.0.x include:
+
+
+
+Adding support for HTTP/2, and TLS virtual hosting
+
+An implementation of the current draft of the Servlet 4.0 
specification
+
+The BIO connectors, support for Windows Itanium and support for Comet have
+been removed
+
+
+
+
+
+Full details of these changes, and all the other changes, are available in the
+Tomcat 9
+changelog.
+
+
+
+
+
+Download
+
+
+
+
 
 2015-11-09 Tomcat Native 1.2.2 Released

[ANN] Apache Tomcat 9.0.0.M3 available

2016-02-08 Thread Mark Thomas
The Apache Tomcat team announces the immediate availability of Apache
Tomcat 9.0.0.M3.

Apache Tomcat 9 is an open source software implementation of the Java
Servlet, JavaServer Pages, Java Unified Expression Language and Java
WebSocket technologies.

Apache Tomcat 9.0.0.M3 is a milestone release of the 9.0.x branch and
has been made to provide users with early access to the new features in
Apache Tomcat 9.0.x so that they may provide feedback. The notable
changes compared to 9.0.0.M1 include:

- Added the ability to use OpenSSL with JSSE style TLS configuration

- Added support for relative HTTP redirects

- Added the ability to access the CredentialHandler via the
  ServletContext

Please refer to the change log for the complete list of changes:
http://tomcat.apache.org/tomcat-9.0-doc/changelog.html

Downloads:
http://tomcat.apache.org/download-90.cgi

Migration guides from Apache Tomcat 5.5.x, 6.0.x, 7.0.x and 8.0.x:
http://tomcat.apache.org/migration.html

Enjoy!

- The Apache Tomcat team

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



Time for Tomcat 7.0.68

2016-02-08 Thread Violeta Georgieva
Hi,

I plan to start preparing Tomcat 7.0.68.
If you plan to add something to this release please reply here.

Regards,
Violeta


svn commit: r12257 - /release/tomcat/tomcat-9/v9.0.0.M1/

2016-02-08 Thread markt
Author: markt
Date: Mon Feb  8 11:36:45 2016
New Revision: 12257

Log:
Drop 9.0.0.M1

Removed:
release/tomcat/tomcat-9/v9.0.0.M1/


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



svn commit: r12258 - /dev/tomcat/tomcat-8/v8.0.32/ /release/tomcat/tomcat-8/v8.0.32/

2016-02-08 Thread markt
Author: markt
Date: Mon Feb  8 11:37:47 2016
New Revision: 12258

Log:
Release Tomcat 8.0.32

Added:
release/tomcat/tomcat-8/v8.0.32/
  - copied from r12202, dev/tomcat/tomcat-8/v8.0.32/
Removed:
dev/tomcat/tomcat-8/v8.0.32/


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



svn commit: r1729144 - in /tomcat/site/trunk: docs/index.html xdocs/index.xml

2016-02-08 Thread markt
Author: markt
Date: Mon Feb  8 11:47:23 2016
New Revision: 1729144

URL: http://svn.apache.org/viewvc?rev=1729144&view=rev
Log:
Fix copy/paste

Modified:
tomcat/site/trunk/docs/index.html
tomcat/site/trunk/xdocs/index.xml

Modified: tomcat/site/trunk/docs/index.html
URL: 
http://svn.apache.org/viewvc/tomcat/site/trunk/docs/index.html?rev=1729144&r1=1729143&r2=1729144&view=diff
==
--- tomcat/site/trunk/docs/index.html (original)
+++ tomcat/site/trunk/docs/index.html Mon Feb  8 11:47:23 2016
@@ -262,7 +262,7 @@ Tomcat 9.0.x so that they may provide fe
 
 
 Full details of these changes, and all the other changes, are available in the
-Tomcat 9
+Tomcat 9
 changelog.
 
 

Modified: tomcat/site/trunk/xdocs/index.xml
URL: 
http://svn.apache.org/viewvc/tomcat/site/trunk/xdocs/index.xml?rev=1729144&r1=1729143&r2=1729144&view=diff
==
--- tomcat/site/trunk/xdocs/index.xml (original)
+++ tomcat/site/trunk/xdocs/index.xml Mon Feb  8 11:47:23 2016
@@ -54,7 +54,7 @@ Tomcat 9.0.x so that they may provide fe
 
 
 Full details of these changes, and all the other changes, are available in the
-Tomcat 9
+Tomcat 9
 changelog.
 
 



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



Re: [VOTE] Release Apache Tomcat 6.0.45

2016-02-08 Thread Rémy Maucherat
2016-02-01 19:52 GMT+01:00 jean-frederic clere :

> The proposed Apache Tomcat 6.0.45 release is now available for voting.
>
> It can be obtained from:
> https://dist.apache.org/repos/dist/dev/tomcat/tomcat-6/v6.0.45/
> The Maven staging repo is:
> https://repository.apache.org/content/repositories/orgapachetomcat-1061/
> The svn tag is:
> http://svn.apache.org/repos/asf/tomcat/tc6.0.x/tags/TOMCAT_6_0_45/
>
> The proposed 6.0.45 release is:
> [ ] Broken - do not release
> [X] Stable - go ahead and release as 6.0.45 Stable
>
> Rémy


Early Access builds of JDK 8u76 b04, JDK 9 & JDK 9 with Project Jigsaw b104 are available on java.net

2016-02-08 Thread Rory O'Donnell



Hi Mark/Mladen,

Early Access b04  for JDK 8u76 is 
available on java.net, summary of  changes are listed here 
.


Early Access b104  for JDK 9 is 
available on java.net, summary of  changes are listed here 
.


JEP 280: Indify String Concatenation [0]

This JEP proposed to change the static |String|-concatenation bytecode 
sequence generated by |javac| to use |invokedynamic| calls to JDK 
library functions. This will enable future optimizations of |String| 
concatenation without requiring further changes to the bytecode emitted 
by |javac|.


Early Access b104  for JDK 9 with Project 
Jigsaw is available on java.net.


Great to meet so many of you at FOSDEM this year,  videos of some of the 
presentations are available [1]


Rgds,Rory

[0] http://openjdk.java.net/jeps/280
[1] http://video.fosdem.org/2016/h1301

--
Rgds,Rory O'Donnell
Quality Engineering Manager
Oracle EMEA , Dublin, Ireland



Re: [VOTE] Release Apache Tomcat 8.0.32

2016-02-08 Thread Christopher Schultz
-BEGIN PGP SIGNED MESSAGE-
Hash: SHA1

Rainer,

On 2/5/16 6:59 PM, Rainer Jung wrote:
> Hi Chris,
> 
> Am 05.02.2016 um 23:56 schrieb Christopher Schultz:
>> -BEGIN PGP SIGNED MESSAGE- Hash: SHA1
>> 
>> Rainer,
>> 
>> On 2/5/16 9:38 AM, Rainer Jung wrote:
>>> Am 04.02.2016 um 23:44 schrieb Rainer Jung:
 Am 03.02.2016 um 10:05 schrieb Mark Thomas:
> The proposed Apache Tomcat 8.0.32 release is now available
> for voting.
> 
> The main changes since 8.0.30 are:
> 
> - Restore the default for mapperContextRootRedirectEnabled
> to true
> 
> - Update the packaged version of the Tomcat Native Library
> to 1.2.4 to pick up the Windows binaries that are based on
> OpenSSL 1.0.2e
> 
> - Expand session attribute filtering on load/unload to all 
> managers
> 
> It can be obtained from: 
> https://dist.apache.org/repos/dist/dev/tomcat/tomcat-8/v8.0.32/
>
>
>>
> 
The Maven staging repo is:
> https://repository.apache.org/content/repositories/orgapachetomcat
- -1
>>
> 
063/
> 
> 
>> The svn tag is:
> http://svn.apache.org/repos/asf/tomcat/tc8.0.x/tags/TOMCAT_8_0_32/
>
>
>
>>
> 
The proposed 8.0.32 release is:
> [ ] Broken - do not release [ ] Stable - go ahead and
> release as 8.0.32
 
 Preliminary result: I see a hang in 
 org.apache.tomcat.util.net.TestSsl for NIO2. It hangs now
 since about 4 hours. Stack:
 
 [junit] "main" prio=3 tid=0x0002a800 nid=0x2 runnable 
 [0xfdf7d000] [junit]java.lang.Thread.State: RUNNABLE
 [junit] at java.net.SocketInputStream.socketRead0(Native
 Method) [junit] at
 java.net.SocketInputStream.read(SocketInputStream.java:152) 
 [junit] at 
 java.net.SocketInputStream.read(SocketInputStream.java:122) 
 [junit] at 
 sun.security.ssl.InputRecord.readFully(InputRecord.java:442) 
 [junit] at 
 sun.security.ssl.InputRecord.read(InputRecord.java:480)
 [junit] at 
 sun.security.ssl.SSLSocketImpl.readRecord(SSLSocketImpl.java:934)


>>
 
[junit] - locked <0xe6b5b818> (a java.lang.Object)
 [junit] at 
 sun.security.ssl.SSLSocketImpl.readDataRecord(SSLSocketImpl.java:89
1)


>>
 
[junit] at
 sun.security.ssl.AppInputStream.read(AppInputStream.java:102)

 
[junit] - locked <0xe6b75ee0> (a
 sun.security.ssl.AppInputStream) [junit] at 
 sun.nio.cs.StreamDecoder.readBytes(StreamDecoder.java:283) 
 [junit] at 
 sun.nio.cs.StreamDecoder.implRead(StreamDecoder.java:325)
 [junit] at
 sun.nio.cs.StreamDecoder.read(StreamDecoder.java:177)
 [junit] - locked <0xe6b76748> (a java.io.InputStreamReader)
 [junit] at
 sun.nio.cs.StreamDecoder.read0(StreamDecoder.java:126)
 [junit] - locked <0xe6b76748> (a java.io.InputStreamReader)
 [junit] at
 sun.nio.cs.StreamDecoder.read(StreamDecoder.java:112)
 [junit] at
 java.io.InputStreamReader.read(InputStreamReader.java:168) 
 [junit] at 
 org.apache.tomcat.util.net.TestSsl.doRequest(TestSsl.java:159)

 
[junit] at
 org.apache.tomcat.util.net.TestSsl.testRenegotiateWorks(TestSsl.jav
a:
>>
 
133)
 
 
 
 
>> Due to truss the thread reads from the following connection
 
 127.0.0.1.47878  127.0.0.1.47877  49152  0 49152 
 0 ESTABLISHED 127.0.0.1.47877  127.0.0.1.47878
 49152 0 49306  0 ESTABLISHED
 
 The thread dump does not contain any frames that belong to
 the client (as far as I can judge).
>>> 
>>> This is somewhat reproducible for me using Java 1.7.0_80. It 
>>> occurred 2 times during 10 iterations of only running TestSsl.
>>> With Java 1.0.8_72 it does not happen during 20 runs. So it
>>> seems to be a Java 7 SSL reneg issue.
>> 
>> Is TestSsl a part of the stock unit tests, or is this your own
>> test? I'd be happy to test in my environment(s) as well.
> 
> It is test/org/apache/tomcat/util/net/TestSsl.java one of our
> standard unit tests.

Ok. FWIW, no issues in my environment (Java 1.8, 64-bit Linux).

- -chris
-BEGIN PGP SIGNATURE-
Comment: GPGTools - http://gpgtools.org
Comment: Using GnuPG with Thunderbird - http://www.enigmail.net/

iEYEARECAAYFAla4pI0ACgkQ9CaO5/Lv0PCxVwCfS+kIml6zfuegay/H1UwV3vaE
hbgAn26WZ5v0XjQZe4TIKWwdznemos2i
=KMlh
-END PGP SIGNATURE-

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



Re: Fwd: website design

2016-02-08 Thread Christopher Schultz
-BEGIN PGP SIGNED MESSAGE-
Hash: SHA1

Mark,

On 2/7/16 1:21 PM, Mark Thomas wrote:
> On 07/02/2016 16:37, rahul bhola wrote:
>> Hi, I think i can help with this one 
>> https://helpwanted.apache.org/task.html?AVK1775LQSo5Erc4e4ld, i 
>> got some free time on me. Where is the code for the site could 
>> not find under git. Also any specific design previously
>> discussed ?
> 
> The source code for the web site is here: 
> http://svn.apache.org/repos/asf/tomcat/site/
> 
> The web site has been updated since that task was created. In
> fact, I can't even find where the ComDev project pulled that
> information from. In fact, it looks like quite a lot of the
> information on that page is wrong. (I didn't create the task, the
> task was created years ago not yesterday, the Bugzilla link is
> wrong...)

Yeah, I was confused by that task as well, for all of the above
reasons. Glad I'm not the only one.

> That said, suggestions for further improvements to our website are
>  always welcome.

I think the current UI is reasonable, but possibly a little tough to
navigate (there are multiple places to find similar information, etc.)
but it's been steadily (and slowly) getting better for the past couple
of years.

+1 for another set of eyes and some new ideas.

- -chris
-BEGIN PGP SIGNATURE-
Comment: GPGTools - http://gpgtools.org
Comment: Using GnuPG with Thunderbird - http://www.enigmail.net/

iEYEARECAAYFAla4qJ4ACgkQ9CaO5/Lv0PAVwwCfX6vdCyeo95LNngvgjWhcbM0x
RdkAmQE9vSoJZFm1m2l9gq7pQGLQtBGs
=gIgD
-END PGP SIGNATURE-

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



svn commit: r1729185 - /tomcat/trunk/test/org/apache/tomcat/websocket/server/TestClose.java

2016-02-08 Thread markt
Author: markt
Date: Mon Feb  8 14:46:57 2016
New Revision: 1729185

URL: http://svn.apache.org/viewvc?rev=1729185&view=rev
Log:
Check was wrong way around. Fix it.

Modified:
tomcat/trunk/test/org/apache/tomcat/websocket/server/TestClose.java

Modified: tomcat/trunk/test/org/apache/tomcat/websocket/server/TestClose.java
URL: 
http://svn.apache.org/viewvc/tomcat/trunk/test/org/apache/tomcat/websocket/server/TestClose.java?rev=1729185&r1=1729184&r2=1729185&view=diff
==
--- tomcat/trunk/test/org/apache/tomcat/websocket/server/TestClose.java 
(original)
+++ tomcat/trunk/test/org/apache/tomcat/websocket/server/TestClose.java Mon Feb 
 8 14:46:57 2016
@@ -108,7 +108,7 @@ public class TestClose extends TomcatBas
 public static void awaitOnError(Class exceptionClazz) 
{
 awaitLatch(events.onErrorCalled, "onError not called");
 Assert.assertTrue(events.onErrorThrowable.getClass().getName(),
-
events.onErrorThrowable.getClass().isAssignableFrom(exceptionClazz));
+
exceptionClazz.isAssignableFrom(events.onErrorThrowable.getClass()));
 }
 
 



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



svn commit: r1729186 - in /tomcat/tc8.0.x/trunk: ./ test/org/apache/tomcat/websocket/server/TestClose.java

2016-02-08 Thread markt
Author: markt
Date: Mon Feb  8 14:47:30 2016
New Revision: 1729186

URL: http://svn.apache.org/viewvc?rev=1729186&view=rev
Log:
Check was wrong way around. Fix it.

Modified:
tomcat/tc8.0.x/trunk/   (props changed)
tomcat/tc8.0.x/trunk/test/org/apache/tomcat/websocket/server/TestClose.java

Propchange: tomcat/tc8.0.x/trunk/
--
--- svn:mergeinfo (original)
+++ svn:mergeinfo Mon Feb  8 14:47:30 2016
@@ -1 +1 @@
-/tomcat/trunk:1636524,1637156,1637176,1637188,1637331,1637684,1637695,1637890,1637892,1638720-1638725,1639653,1640010,1640083-1640084,1640088,1640275,1640322,1640347,1640361,1640365,1640403,1640410,1640652,1640655-1640658,1640688,1640700-1640883,1640903,1640976,1640978,1641000,1641026,1641038-1641039,1641051-1641052,1641058,1641064,1641300,1641369,1641374,1641380,1641486,1641634,1641656-1641692,1641704,1641707-1641718,1641720-1641722,1641735,1641981,1642233,1642280,1642554,1642564,1642595,1642606,1642668,1642679,1642697,1642699,1642766,1643002,1643045,1643054-1643055,1643066,1643121,1643128,1643206,1643209-1643210,1643216,1643249,1643270,1643283,1643309-1643310,1643323,1643365-1643366,1643370-1643371,1643465,1643474,1643536,1643570,1643634,1643649,1643651,1643654,1643675,1643731,1643733-1643734,1643761,1643766,1643814,1643937,1643963,1644017,1644169,1644201-1644203,1644321,1644323,1644516,1644523,1644529,1644535,1644730,1644768,1644784-1644785,1644790,1644793,1644815,1644884,1644886
 
,1644890,1644892,1644910,1644924,1644929-1644930,1644935,1644989,1645011,1645247,1645355,1645357-1645358,1645455,1645465,1645469,1645471,1645473,1645475,1645486-1645488,1645626,1645641,1645685,1645743,1645763,1645951-1645953,1645955,1645993,1646098-1646106,1646178,1646220,1646302,1646304,1646420,1646470-1646471,1646476,1646559,1646717-1646723,1646773,1647026,1647042,1647530,1647655,1648304,1648815,1648907,1649973,1650081,1650365,1651116,1651120,1651280,1651470,1652938,1652970,1653041,1653471,1653550,1653574,1653797,1653815-1653816,1653819,1653840,1653857,1653888,1653972,1654013,1654030,1654050,1654123,1654148,1654159,1654513,1654515,1654517,1654522,1654524,1654725,1654735,1654766,1654785,1654851-1654852,1654978,1655122-1655124,1655126-1655127,1655129-1655130,1655132-1655133,1655312,1655351,1655438,1655441,1655454,168,1656087,1656299,1656319,1656331,1656345,1656350,1656590,1656648-1656650,1656657,1657041,1657054,1657374,1657492,1657510,1657565,1657580,1657584,1657586,1657589,1657
 
592,1657607,1657609,1657682,1657907,1658207,1658734,1658781,1658790,1658799,1658802,1658804,1658833,1658840,1658966,1659043,1659053,1659059,1659174,1659184,1659188-1659189,1659216,1659263,1659293,1659304,1659306-1659307,1659382,1659384,1659428,1659471,1659486,1659505,1659516,1659521,1659524,1659559,1659562,1659803,1659806,1659814,1659833,1659862,1659905,1659919,1659948,1659967,1659983-1659984,1660060,1660074,1660077,1660133,1660168,1660331-1660332,1660353,1660358,1660924,1661386,1661770,1661867,1661972,1661990,1662200,1662308-1662309,1662548,1662614,1662696,1662736,1662985,1662988-1662989,1663264,1663277,1663298,1663534,1663562,1663676,1663715,1663754,1663768,1663772,1663781,1663893,1663995,1664143,1664163,1664174,1664301,1664317,1664347,1664657,1664659,1664710,1664863-1664864,1664866,1665085,1665292,1665559,1665653,1665661,1665672,1665694,1665697,1665736,1665779,1665976-1665977,1665980-1665981,1665985-1665986,1665989,1665998,1666004,1666008,1666013,1666017,1666024,1666116,1666386-1
 
666387,1666494,1666496,1666552,1666569,1666579,137,149,1666757,1666966,1666972,1666985,1666995,1666997,1667292,1667402,1667406,1667546,1667615,1667630,1667636,1667688,1667764,1667871,1668026,1668135,1668193,1668593,1668596,1668630,1668639,1668843,1669353,1669370,1669451,1669800,1669838,1669876,1669882,1670394,1670433,1670591,1670598-1670600,1670610,1670631,1670719,1670724,1670726,1670730,1670940,1671112,1672272,1672284,1673754,1674294,1675461,1675486,1675594,1675830,1676231,1676250-1676251,1676364,1676381,1676393,1676479,1676525,1676552,1676615,1676630,1676634,1676721,1676926,1676943,1677140,1677802,1678011,1678162,1678174,1678339,1678426-1678427,1678694,1678701,1679534,1679708,1679710,1679716,1680034,1680246,1681056,1681123,1681138,1681280,1681283,1681286,1681450,1681697,1681699,1681701,1681729,1681770,1681779,1681793,1681807,1681837-1681838,1681854,1681862,1681958,1682028,1682033,1682311,1682315,1682317,1682320,1682324,1682330,1682842,1684172,1684366,1684383,1684526-168452
 
7,1684549-1684550,1685556,1685591,1685739,1685744,1685772,1685816,1685826,1685891,1687242,1687261,1687268,1687340,1687551,1688563,1688841,1688878,165,1688896,1688901,1689345-1689346,1689357,1689656,1689675-1689677,1689679,1689687,1689825,1689856,1689918,1690011,1690021,1690054,1690080,1690209,1691134,1691487,1691813,1692744-1692747,1692849,1693088,1693105,1693429,1693461,1694058,1694111,1694290,1694501,1694548,1694658,1694660,1694788,1694872,1694878,1695006,1695354,1695371,1695379,1695459,169

svn commit: r1729187 - in /tomcat/tc7.0.x/trunk: ./ test/org/apache/tomcat/websocket/server/TestClose.java

2016-02-08 Thread markt
Author: markt
Date: Mon Feb  8 14:47:53 2016
New Revision: 1729187

URL: http://svn.apache.org/viewvc?rev=1729187&view=rev
Log:
Check was wrong way around. Fix it.

Modified:
tomcat/tc7.0.x/trunk/   (props changed)
tomcat/tc7.0.x/trunk/test/org/apache/tomcat/websocket/server/TestClose.java

Propchange: tomcat/tc7.0.x/trunk/
--
--- svn:mergeinfo (original)
+++ svn:mergeinfo Mon Feb  8 14:47:53 2016
@@ -1,2 +1,2 @@
-/tomcat/tc8.0.x/trunk:1636525,1637336,1637685,1637709,1638726,1640089,1640276,1640349,1640363,1640366,1640642,1640672,1640674,1640689,1640884,1641001,1641065,1641067,1641375,1641638,1641723,1641726,1641729-1641730,1641736,1641988,1642669-1642670,1642698,1642701,1643205,1643215,1643217,1643230,1643232,1643273,1643285,1643329-1643330,1643511,1643513,1643521,1643539,1643571,1643581-1643582,1643635,1643655,1643738,1643964,1644018,1644333,1644954,1644992,1645014,1645360,1645456,1645627,1645642,1645686,1645903-1645904,1645908-1645909,1645913,1645920,1646458,1646460-1646462,1646735,1646738-1646741,1646744,1646746,1646748-1646755,1646757,1646759-1646760,1647043,1648816,1651420-1651422,1651844,1652926,1652939-1652940,1652973,1653798,1653817,1653841,1654042,1654161,1654736,1654767,1654787,1656592,1659907,1662986,1663265,1663278,1663325,1663535,1663567,1663679,1663997,1664175,1664321,1664872,1665061,1665086,1666027,1666395,1666503,1666506,1666560,1666570,1666581,1666759,1666967,1666988,1667553
 
-1667555,1667558,1667617,1667633,1667637,1667747,1667767,1667873,1668028,1668137,1668634,1669432,1669801,1669840,1669895-1669896,1670398,1670435,1670592,1670605-1670607,1670609,1670632,1670720,1670725,1670727,1670731,1671114,1672273,1672285,1673759,1674220,1674295,1675469,1675488,1675595,1675831,1676232,1676367-1676369,1676382,1676394,1676483,1676556,1676635,1678178,1679536,1679988,1680256,1681124,1681182,1681730,1681840,1681864,1681869,1682010,1682034,1682047,1682052-1682053,1682062,1682064,1682070,1682312,1682325,1682331,1682386,1684367,1684385,1685759,1685774,1685827,1685892,1687341,1688904,1689358,1689657,1689921,1692850,1693093,1693108,1693324,1694060,1694115,1694291,1694427,1694431,1694503,1694549,1694789,1694873,1694881,1695356,1695372,1695823-1695825,1696200,1696281,1696379,1696468,1700608,1700871,1700897,1700978,1701094,1701124,1701608,1701668,1701676,1701766,1701944,1702248,1702252,1702314,1702390,1702723,1702725,1702728,1702730,1702733,1702735,1702737,1702739,1702742,1702
 
744,1702748,1702751,1702754,1702758,1702760,1702763,1702766,1708779,1708782,1708806,1709314,1709670,1710347,1710442,1710448,1710490,1710574,1710578,1712226,1712229,1712235,1712255,1712618,1712649,1712655,1712860,1712899,1712903,1712906,1712913,1712926,1712975,1713185,1713262,1713287,1713613,1713621,1713872,1713976,1713994,1713998,1714004,1714013,1714059,1714538,1714580,1715189,1715207,1715544,1715549,1715637,1715639-1715645,1715667,1715683,1715978,1715981,1716216-1716217,1716355,1716414,1716421,1717208-1717209,1717257,1717283,1717288,1717291,1717421,1717517,1717529,1718797,1718840-1718843,1719348,1719357-1719358,1719400,1719491,1719737,1720235,1720396,1720442,1720446,1720450,1720463,1720658-1720660,1720756,1720816,1721813,1721818,1721831,1721861,1721867,1721882,1722523,1722527,1722800,1722926,1722941,1722997,1723130,1723440,1723488,1723890,1724434,1724674,1724792,1724803,1724902,1725128,1725131,1725154,1725167,1725911,1725921,1725929,1725963-1725965,1725970,1725974,1726171-1726173,1
 
726175,1726179-1726182,1726190-1726191,1726195-1726200,1726203,1726226,1726576,1726630,1726992,1727029,1727037,1727671,1727676,1727900,1728028,1728092,1728439,1728449
-/tomcat/trunk:1156115-1157160,1157162-1157859,1157862-1157942,1157945-1160347,1160349-1163716,1163718-1166689,1166691-1174340,1174342-1175596,1175598-1175611,1175613-1175932,1175934-1177783,1177785-1177980,1178006-1180720,1180722-1183094,1183096-1187753,1187755,1187775,1187801,1187806,1187809,1187826-1188312,1188314-1188401,1188646-1188840,1188842-1190176,1190178-1195223,1195225-1195953,1195955,1195957-1201238,1201240-1203345,1203347-1206623,1206625-1208046,1208073,1208096,1208114,1208145,1208772,1209194-1212125,1212127-1220291,1220293,1220295-1221321,1221323-1222329,1222332-1222401,1222405-1222795,1222850-1222950,1222969-1225326,1225328-1225463,1225465,1225627,1225629-1226534,1226536-1228908,1228911-1228923,1228927-1229532,1229534-1230766,1230768-1231625,1231627-1233414,1233419-1235207,1235209-1237425,1237427,1237429-1237977,1237981,1237985,1237995,1238070,1238073,1239024-1239048,1239050-1239062,1239135,1239256,1239258-1239485,1239785-1240046,1240101,1240106,1240109,1240112,1240114
 
,1240116,1240118,1240121,1240329,1240474-1240850,1240857,1241087,1241160,1241408-1241822,1241908-1241909,1241912-1242110,1242371-1292130,1292134-1292458,1292464-1292670,1292672-1292776,1292780-1293392,1293397-1297017,1297019-1297963,1297965-1299820,1300108,1300111-1300460,1300520-1300948,1300997,1301006,1301280,1302332,1302348,

svn commit: r1729188 - /tomcat/tc7.0.x/trunk/test/org/apache/tomcat/websocket/server/TestClose.java

2016-02-08 Thread markt
Author: markt
Date: Mon Feb  8 15:09:53 2016
New Revision: 1729188

URL: http://svn.apache.org/viewvc?rev=1729188&view=rev
Log:
Log the unexpected class rather than the expected one. It makes debugging that 
little bit easier when you don't need a crystal ball.

Modified:
tomcat/tc7.0.x/trunk/test/org/apache/tomcat/websocket/server/TestClose.java

Modified: 
tomcat/tc7.0.x/trunk/test/org/apache/tomcat/websocket/server/TestClose.java
URL: 
http://svn.apache.org/viewvc/tomcat/tc7.0.x/trunk/test/org/apache/tomcat/websocket/server/TestClose.java?rev=1729188&r1=1729187&r2=1729188&view=diff
==
--- tomcat/tc7.0.x/trunk/test/org/apache/tomcat/websocket/server/TestClose.java 
(original)
+++ tomcat/tc7.0.x/trunk/test/org/apache/tomcat/websocket/server/TestClose.java 
Mon Feb  8 15:09:53 2016
@@ -110,7 +110,7 @@ public class TestClose extends TomcatBas
 
 public static void awaitOnError(Class exceptionClazz) 
{
 awaitLatch(events.onErrorCalled, "onError not called");
-Assert.assertTrue(exceptionClazz.getName(),
+Assert.assertTrue(events.onErrorThrowable.getClass().getName(),
 
exceptionClazz.isAssignableFrom(events.onErrorThrowable.getClass()));
 }
 



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



buildbot success in on tomcat-7-trunk

2016-02-08 Thread buildbot
The Buildbot has detected a restored build on builder tomcat-7-trunk while 
building . Full details are available at:
https://ci.apache.org/builders/tomcat-7-trunk/builds/322

Buildbot URL: https://ci.apache.org/

Buildslave for this Build: silvanus_ubuntu

Build Reason: The AnyBranchScheduler scheduler named 'on-tomcat-7-commit' 
triggered this build
Build Source Stamp: [branch tomcat/tc7.0.x/trunk] 1729187
Blamelist: markt

Build succeeded!

Sincerely,
 -The Buildbot




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



buildbot success in on tomcat-8-trunk

2016-02-08 Thread buildbot
The Buildbot has detected a restored build on builder tomcat-8-trunk while 
building . Full details are available at:
https://ci.apache.org/builders/tomcat-8-trunk/builds/440

Buildbot URL: https://ci.apache.org/

Buildslave for this Build: silvanus_ubuntu

Build Reason: The AnyBranchScheduler scheduler named 'on-tomcat-8-commit' 
triggered this build
Build Source Stamp: [branch tomcat/tc8.0.x/trunk] 1729186
Blamelist: markt

Build succeeded!

Sincerely,
 -The Buildbot




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



[GUMP@vmgump]: Project tomcat-tc7.0.x-test-bio (in module tomcat-7.0.x) failed

2016-02-08 Thread Bill Barker
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-tc7.0.x-test-bio 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-tc7.0.x-test-bio :  Tomcat 7.x, a web server implementing Java 
Servlet 3.0,
...


Full details are available at:

http://vmgump.apache.org/gump/public/tomcat-7.0.x/tomcat-tc7.0.x-test-bio/index.html

That said, some information snippets are provided here.

The following annotations (debug/informational/warning/error messages) were 
provided:
 -DEBUG- Dependency on tomcat-tc7.0.x-dbcp exists, no need to add for property 
tomcat-dbcp-src.jar.
 -DEBUG- Dependency on commons-daemon exists, no need to add for property 
commons-daemon.native.src.tgz.
 -DEBUG- Dependency on commons-daemon exists, no need to add for property 
tomcat-native.tar.gz.
 -DEBUG- Dependency on tomcat-tc7.0.x-dbcp exists, no need to add for property 
tomcat-dbcp.home.
 -INFO- Failed with reason build failed
 -INFO- Project Reports in: 
/srv/gump/public/workspace/tomcat-7.0.x/output/logs-BIO
 -INFO- Project Reports in: 
/srv/gump/public/workspace/tomcat-7.0.x/output/test-tmp-BIO/logs



The following work was performed:
http://vmgump.apache.org/gump/public/tomcat-7.0.x/tomcat-tc7.0.x-test-bio/gump_work/build_tomcat-7.0.x_tomcat-tc7.0.x-test-bio.html
Work Name: build_tomcat-7.0.x_tomcat-tc7.0.x-test-bio (Type: Build)
Work ended in a state of : Failed
Elapsed: 29 mins 31 secs
Command Line: /usr/lib/jvm/java-8-oracle/bin/java -Djava.awt.headless=true 
-Dbuild.sysclasspath=only org.apache.tools.ant.Main 
-Dgump.merge=/srv/gump/public/gump/work/merge.xml 
-Dcommons-pool.home=/srv/gump/public/workspace/commons-pool-1.x 
-Dtest.temp=output/test-tmp-BIO 
-Djunit.jar=/srv/gump/public/workspace/junit/target/junit-4.13-SNAPSHOT.jar 
-Dobjenesis.jar=/srv/gump/public/workspace/objenesis/main/target/objenesis-2.3-SNAPSHOT.jar
 -Dexamples.sources.skip=true 
-Dcommons-daemon.jar=/srv/gump/public/workspace/apache-commons/daemon/dist/commons-daemon-20160208.jar
 
-Dtomcat-dbcp-src.jar=/srv/gump/public/workspace/tomcat-7.0.x/tomcat-deps/tomcat-dbcp-src.jar
 -Dtomcat-dbcp.home=/srv/gump/public/workspace/tomcat-7.0.x/tomcat-deps 
-Dtest.excludePerformance=true 
-Dhamcrest.jar=/srv/gump/packages/hamcrest/hamcrest-core-1.3.jar 
-Dcommons-dbcp.home=/srv/gump/public/workspace/commons-dbcp-1.x 
-Dexecute.test.apr=false -Dexecute.test.bio=true 
-Dcommons-daemon.native.src.tgz=/srv/gump/public/wo
 
rkspace/apache-commons/daemon/dist/bin/commons-daemon-20160208-native-src.tar.gz
 -Dtest.reports=output/logs-BIO 
-Dtomcat-native.tar.gz=/srv/gump/public/workspace/apache-commons/daemon/dist/bin/commons-daemon-20160208-native-src.tar.gz
 -Djdt.jar=/srv/gump/packages/eclipse/plugins/R-4.5-201506032000/ecj-4.5.jar 
-Dexecute.test.nio=false -Dtest.accesslog=true 
-Dtomcat-dbcp.jar=/srv/gump/public/workspace/tomcat-7.0.x/tomcat-deps/tomcat-dbcp-20160208.jar
 
-Deasymock.jar=/srv/gump/public/workspace/easymock/core/target/easymock-3.5-SNAPSHOT.jar
 -Dcglib.jar=/srv/gump/packages/cglib/cglib-nodep-2.2.jar test 
[Working Directory: /srv/gump/public/workspace/tomcat-7.0.x]
CLASSPATH: 
/usr/lib/jvm/java-8-oracle/lib/tools.jar:/srv/gump/public/workspace/tomcat-7.0.x/output/build/webapps/examples/WEB-INF/classes:/srv/gump/public/workspace/tomcat-7.0.x/output/testclasses:/srv/gump/public/workspace/ant/dist/lib/ant.jar:/srv/gump/public/workspace/ant/dist/lib/ant-launcher.jar:/srv/gump/public/workspace/ant/dist/lib/ant-jmf.jar:/srv/gump/public/workspace/ant/dist/lib/ant-junit.jar:/srv/gump/public/workspace/ant/dist/lib/ant-junit4.jar:/srv/gump/public/workspace/ant/dist/lib/ant-swing.jar:/srv/gump/public/workspace/ant/dist/lib/ant-apache-resolver.jar:/srv/gump/public/workspace/ant/dist/lib/ant-apache-xalan2.jar:/srv/gump/public/workspace/xml-commons/java/build/resolver.jar:/srv/gump/public/workspace/tomcat-7.0.x/output/build/bin/bootstrap.jar:/srv/gump/public/workspace/tomcat-7.0.x/output/build/bin/tomcat-juli.jar:/srv/gump/public/workspace/tomcat-7.0.x/output/build/lib/annotations-api.jar:/srv/gump/public/workspace/tomcat-7.0.x/output/build/lib/servlet-api.ja
 
r:/srv/gump/public/workspace/tomcat-7.0.x/output/build/lib/jsp-api.jar:/srv/gump/public/workspace/tomcat-7.0.x/output/build/lib/el-api.jar:/srv/gump/public/workspace/tomcat-7.0.x/output/build/lib/catalina.jar:/srv/gump/public/workspace/tomcat-7.0.x/output/build/lib/catalina-ant.jar:/srv/gump/public/workspace/tomcat-7.0.x/output/build/lib/tomcat-coyote.jar:/srv/gump/public/workspace/tomcat-7.0.x/output/build/lib/jasper.jar:/srv/gump/public/workspace/tomcat-7.0.x/output/build/lib/jasper-el.jar:/srv/gump/public/workspace/tomca

[GUMP@vmgump]: Project tomcat-tc7.0.x-test-nio (in module tomcat-7.0.x) failed

2016-02-08 Thread Bill Barker
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-tc7.0.x-test-nio 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-tc7.0.x-test-nio :  Tomcat 7.x, a web server implementing Java 
Servlet 3.0,
...


Full details are available at:

http://vmgump.apache.org/gump/public/tomcat-7.0.x/tomcat-tc7.0.x-test-nio/index.html

That said, some information snippets are provided here.

The following annotations (debug/informational/warning/error messages) were 
provided:
 -DEBUG- Dependency on tomcat-tc7.0.x-dbcp exists, no need to add for property 
tomcat-dbcp-src.jar.
 -DEBUG- Dependency on commons-daemon exists, no need to add for property 
commons-daemon.native.src.tgz.
 -DEBUG- Dependency on commons-daemon exists, no need to add for property 
tomcat-native.tar.gz.
 -DEBUG- Dependency on tomcat-tc7.0.x-dbcp exists, no need to add for property 
tomcat-dbcp.home.
 -INFO- Failed with reason build failed
 -INFO- Project Reports in: 
/srv/gump/public/workspace/tomcat-7.0.x/output/logs-NIO
 -INFO- Project Reports in: 
/srv/gump/public/workspace/tomcat-7.0.x/output/test-tmp-NIO/logs



The following work was performed:
http://vmgump.apache.org/gump/public/tomcat-7.0.x/tomcat-tc7.0.x-test-nio/gump_work/build_tomcat-7.0.x_tomcat-tc7.0.x-test-nio.html
Work Name: build_tomcat-7.0.x_tomcat-tc7.0.x-test-nio (Type: Build)
Work ended in a state of : Failed
Elapsed: 30 mins 40 secs
Command Line: /usr/lib/jvm/java-8-oracle/bin/java -Djava.awt.headless=true 
-Dbuild.sysclasspath=only org.apache.tools.ant.Main 
-Dgump.merge=/srv/gump/public/gump/work/merge.xml 
-Dcommons-pool.home=/srv/gump/public/workspace/commons-pool-1.x 
-Dtest.temp=output/test-tmp-NIO 
-Djunit.jar=/srv/gump/public/workspace/junit/target/junit-4.13-SNAPSHOT.jar 
-Dobjenesis.jar=/srv/gump/public/workspace/objenesis/main/target/objenesis-2.3-SNAPSHOT.jar
 -Dexamples.sources.skip=true 
-Dcommons-daemon.jar=/srv/gump/public/workspace/apache-commons/daemon/dist/commons-daemon-20160208.jar
 
-Dtomcat-dbcp-src.jar=/srv/gump/public/workspace/tomcat-7.0.x/tomcat-deps/tomcat-dbcp-src.jar
 -Dtomcat-dbcp.home=/srv/gump/public/workspace/tomcat-7.0.x/tomcat-deps 
-Dtest.excludePerformance=true 
-Dhamcrest.jar=/srv/gump/packages/hamcrest/hamcrest-core-1.3.jar 
-Dcommons-dbcp.home=/srv/gump/public/workspace/commons-dbcp-1.x 
-Dexecute.test.apr=false -Dexecute.test.bio=false 
-Dcommons-daemon.native.src.tgz=/srv/gump/public/w
 
orkspace/apache-commons/daemon/dist/bin/commons-daemon-20160208-native-src.tar.gz
 -Dtest.reports=output/logs-NIO 
-Dtomcat-native.tar.gz=/srv/gump/public/workspace/apache-commons/daemon/dist/bin/commons-daemon-20160208-native-src.tar.gz
 -Djdt.jar=/srv/gump/packages/eclipse/plugins/R-4.5-201506032000/ecj-4.5.jar 
-Dexecute.test.nio=true -Dtest.accesslog=true 
-Dtomcat-dbcp.jar=/srv/gump/public/workspace/tomcat-7.0.x/tomcat-deps/tomcat-dbcp-20160208.jar
 
-Deasymock.jar=/srv/gump/public/workspace/easymock/core/target/easymock-3.5-SNAPSHOT.jar
 -Dcglib.jar=/srv/gump/packages/cglib/cglib-nodep-2.2.jar test 
[Working Directory: /srv/gump/public/workspace/tomcat-7.0.x]
CLASSPATH: 
/usr/lib/jvm/java-8-oracle/lib/tools.jar:/srv/gump/public/workspace/tomcat-7.0.x/output/build/webapps/examples/WEB-INF/classes:/srv/gump/public/workspace/tomcat-7.0.x/output/testclasses:/srv/gump/public/workspace/ant/dist/lib/ant.jar:/srv/gump/public/workspace/ant/dist/lib/ant-launcher.jar:/srv/gump/public/workspace/ant/dist/lib/ant-jmf.jar:/srv/gump/public/workspace/ant/dist/lib/ant-junit.jar:/srv/gump/public/workspace/ant/dist/lib/ant-junit4.jar:/srv/gump/public/workspace/ant/dist/lib/ant-swing.jar:/srv/gump/public/workspace/ant/dist/lib/ant-apache-resolver.jar:/srv/gump/public/workspace/ant/dist/lib/ant-apache-xalan2.jar:/srv/gump/public/workspace/xml-commons/java/build/resolver.jar:/srv/gump/public/workspace/tomcat-7.0.x/output/build/bin/bootstrap.jar:/srv/gump/public/workspace/tomcat-7.0.x/output/build/bin/tomcat-juli.jar:/srv/gump/public/workspace/tomcat-7.0.x/output/build/lib/annotations-api.jar:/srv/gump/public/workspace/tomcat-7.0.x/output/build/lib/servlet-api.ja
 
r:/srv/gump/public/workspace/tomcat-7.0.x/output/build/lib/jsp-api.jar:/srv/gump/public/workspace/tomcat-7.0.x/output/build/lib/el-api.jar:/srv/gump/public/workspace/tomcat-7.0.x/output/build/lib/catalina.jar:/srv/gump/public/workspace/tomcat-7.0.x/output/build/lib/catalina-ant.jar:/srv/gump/public/workspace/tomcat-7.0.x/output/build/lib/tomcat-coyote.jar:/srv/gump/public/workspace/tomcat-7.0.x/output/build/lib/jasper.jar:/srv/gump/public/workspace/tomcat-7.0.x/output/build/lib/jasper-el.jar:/srv/gump/public/workspace/tomca

svn commit: r1729238 - in /tomcat/tc7.0.x/tags/TOMCAT_7_0_68: ./ build.properties.default

2016-02-08 Thread violetagg
Author: violetagg
Date: Mon Feb  8 20:01:46 2016
New Revision: 1729238

URL: http://svn.apache.org/viewvc?rev=1729238&view=rev
Log:
Tag 7.0.68

Added:
tomcat/tc7.0.x/tags/TOMCAT_7_0_68/   (props changed)
  - copied from r1729236, tomcat/tc7.0.x/trunk/
Modified:
tomcat/tc7.0.x/tags/TOMCAT_7_0_68/build.properties.default

Propchange: tomcat/tc7.0.x/tags/TOMCAT_7_0_68/
--
bugtraq:append = false

Propchange: tomcat/tc7.0.x/tags/TOMCAT_7_0_68/
--
bugtraq:label = Bugzilla ID (optional)

Propchange: tomcat/tc7.0.x/tags/TOMCAT_7_0_68/
--
--- bugtraq:logregex (added)
+++ bugtraq:logregex Mon Feb  8 20:01:46 2016
@@ -0,0 +1,2 @@
+(https?\://(bz|issues)\.apache\.org/bugzilla/show_bug.cgi\?id=\d+|BZ\s?\d+)
+(\d+)

Propchange: tomcat/tc7.0.x/tags/TOMCAT_7_0_68/
--
bugtraq:message = Fix https://bz.apache.org/bugzilla/show_bug.cgi?id=%BUGID%

Propchange: tomcat/tc7.0.x/tags/TOMCAT_7_0_68/
--
bugtraq:url = https://bz.apache.org/bugzilla/show_bug.cgi?id=%BUGID%

Propchange: tomcat/tc7.0.x/tags/TOMCAT_7_0_68/
--
--- svn:ignore (added)
+++ svn:ignore Mon Feb  8 20:01:46 2016
@@ -0,0 +1,7 @@
+.*
+build.properties
+logs
+nbproject
+output
+work
+*.iml

Propchange: tomcat/tc7.0.x/tags/TOMCAT_7_0_68/
--
--- svn:mergeinfo (added)
+++ svn:mergeinfo Mon Feb  8 20:01:46 2016
@@ -0,0 +1,2 @@
+/tomcat/tc8.0.x/trunk:1636525,1637336,1637685,1637709,1638726,1640089,1640276,1640349,1640363,1640366,1640642,1640672,1640674,1640689,1640884,1641001,1641065,1641067,1641375,1641638,1641723,1641726,1641729-1641730,1641736,1641988,1642669-1642670,1642698,1642701,1643205,1643215,1643217,1643230,1643232,1643273,1643285,1643329-1643330,1643511,1643513,1643521,1643539,1643571,1643581-1643582,1643635,1643655,1643738,1643964,1644018,1644333,1644954,1644992,1645014,1645360,1645456,1645627,1645642,1645686,1645903-1645904,1645908-1645909,1645913,1645920,1646458,1646460-1646462,1646735,1646738-1646741,1646744,1646746,1646748-1646755,1646757,1646759-1646760,1647043,1648816,1651420-1651422,1651844,1652926,1652939-1652940,1652973,1653798,1653817,1653841,1654042,1654161,1654736,1654767,1654787,1656592,1659907,1662986,1663265,1663278,1663325,1663535,1663567,1663679,1663997,1664175,1664321,1664872,1665061,1665086,1666027,1666395,1666503,1666506,1666560,1666570,1666581,1666759,1666967,1666988,1667553
 
-1667555,1667558,1667617,1667633,1667637,1667747,1667767,1667873,1668028,1668137,1668634,1669432,1669801,1669840,1669895-1669896,1670398,1670435,1670592,1670605-1670607,1670609,1670632,1670720,1670725,1670727,1670731,1671114,1672273,1672285,1673759,1674220,1674295,1675469,1675488,1675595,1675831,1676232,1676367-1676369,1676382,1676394,1676483,1676556,1676635,1678178,1679536,1679988,1680256,1681124,1681182,1681730,1681840,1681864,1681869,1682010,1682034,1682047,1682052-1682053,1682062,1682064,1682070,1682312,1682325,1682331,1682386,1684367,1684385,1685759,1685774,1685827,1685892,1687341,1688904,1689358,1689657,1689921,1692850,1693093,1693108,1693324,1694060,1694115,1694291,1694427,1694431,1694503,1694549,1694789,1694873,1694881,1695356,1695372,1695823-1695825,1696200,1696281,1696379,1696468,1700608,1700871,1700897,1700978,1701094,1701124,1701608,1701668,1701676,1701766,1701944,1702248,1702252,1702314,1702390,1702723,1702725,1702728,1702730,1702733,1702735,1702737,1702739,1702742,1702
 
744,1702748,1702751,1702754,1702758,1702760,1702763,1702766,1708779,1708782,1708806,1709314,1709670,1710347,1710442,1710448,1710490,1710574,1710578,1712226,1712229,1712235,1712255,1712618,1712649,1712655,1712860,1712899,1712903,1712906,1712913,1712926,1712975,1713185,1713262,1713287,1713613,1713621,1713872,1713976,1713994,1713998,1714004,1714013,1714059,1714538,1714580,1715189,1715207,1715544,1715549,1715637,1715639-1715645,1715667,1715683,1715978,1715981,1716216-1716217,1716355,1716414,1716421,1717208-1717209,1717257,1717283,1717288,1717291,1717421,1717517,1717529,1718797,1718840-1718843,1719348,1719357-1719358,1719400,1719491,1719737,1720235,1720396,1720442,1720446,1720450,1720463,1720658-1720660,1720756,1720816,1721813,1721818,1721831,1721861,1721867,1721882,1722523,1722527,1722800,1722926,1722941,1722997,1723130,1723440,1723488,1723890,1724434,1724674,1724792,1724803,1724902,1725128,1725131,1725154,1725167,1725911,1725921,1725929,1725963-1725965,1725970,1725974,1726171-1726173,1
 
726175,1726179-1726182,1726190-1726191,1726195-1726200,1726203,1726226,1726576,1726630,1726992,1727029,1727037,1727671,1727676,1727900,1728028,1728092,17

regression due to https://bz.apache.org/bugzilla/show_bug.cgi?id=58867 ?

2016-02-08 Thread Romain Manni-Bucau
Hi guys,

in https://bz.apache.org/bugzilla/show_bug.cgi?id=58867 there is this diff:

-if (!docDir.exists()) {
-File warFile = new File(docBase + ".war");
-if (warFile.exists()) {
-URL war =
-new URL("jar:" + warFile.toURI().toURL() + "!/");
+File warFile = new File(docBase + ".war");
+URL war = null;
+if (warFile.exists()) {
+war = new URL("jar:" + warFile.toURI().toURL() + "!/");
+}
+if (docDir.exists()) {
+if (war != null && unpackWARs) {
+// Check if WAR needs to be re-expanded (e.g. if it has
+// changed). Note: HostConfig.deployWar() takes care of
+// ensuring that the correct XML file is used.
+// This will be a NO-OP if the WAR is unchanged.
+ExpandWar.expand(host, war, pathName);
+}
+} else {


so if you were deploying a StandardContext with a docDir set to a correct
path and if the war was next to this path then all was working smoothly ie
the manually exploded folder was deployed.

Now (8.0.32) the war is re-expanded in webapps (by default). Of course a
work around is to set unpackWARs to false but it is a regression in term of
behavior which is quite nasty IMO.

Was it really intended or is it a side effect of the fix?


Romain Manni-Bucau
@rmannibucau  |  Blog
 | Github  |
LinkedIn  | Tomitriber



svn commit: r12280 [2/2] - in /dev/tomcat/tomcat-7/v7.0.68: ./ bin/ bin/embed/ bin/extras/ src/

2016-02-08 Thread violetagg
Added: dev/tomcat/tomcat-7/v7.0.68/bin/embed/apache-tomcat-7.0.68-embed.zip.md5
==
--- dev/tomcat/tomcat-7/v7.0.68/bin/embed/apache-tomcat-7.0.68-embed.zip.md5 
(added)
+++ dev/tomcat/tomcat-7/v7.0.68/bin/embed/apache-tomcat-7.0.68-embed.zip.md5 
Mon Feb  8 21:26:00 2016
@@ -0,0 +1 @@
+85aba791c67f1abdbc236cbf6c128758 *apache-tomcat-7.0.68-embed.zip
\ No newline at end of file

Added: dev/tomcat/tomcat-7/v7.0.68/bin/embed/apache-tomcat-7.0.68-embed.zip.sha1
==
--- dev/tomcat/tomcat-7/v7.0.68/bin/embed/apache-tomcat-7.0.68-embed.zip.sha1 
(added)
+++ dev/tomcat/tomcat-7/v7.0.68/bin/embed/apache-tomcat-7.0.68-embed.zip.sha1 
Mon Feb  8 21:26:00 2016
@@ -0,0 +1 @@
+89a54f5026fe7b9a869247af523d5b7b6ad82f62 *apache-tomcat-7.0.68-embed.zip
\ No newline at end of file

Added: dev/tomcat/tomcat-7/v7.0.68/bin/extras/catalina-jmx-remote.jar
==
Binary file - no diff available.

Propchange: dev/tomcat/tomcat-7/v7.0.68/bin/extras/catalina-jmx-remote.jar
--
svn:mime-type = application/octet-stream

Added: dev/tomcat/tomcat-7/v7.0.68/bin/extras/catalina-jmx-remote.jar.asc
==
--- dev/tomcat/tomcat-7/v7.0.68/bin/extras/catalina-jmx-remote.jar.asc (added)
+++ dev/tomcat/tomcat-7/v7.0.68/bin/extras/catalina-jmx-remote.jar.asc Mon Feb  
8 21:26:00 2016
@@ -0,0 +1,17 @@
+-BEGIN PGP SIGNATURE-
+Version: GnuPG v2
+
+iQIcBAABCgAGBQJWuPpnAAoJECCLCrHWMBHHjxYP/3N/JRn98YenvuVi4YE+pAOF
+4ZBrnJ2D056s7RDUyAXuKc3Ya7lrd7oZcoG0VgBRv749kx95Jg82MNmKMUSorwKz
+mdi2HxwCt54SZpQRnCluq+4YfNrdsovZ7uXfeYVvbwu10m0Q5RldSOZWYYEkRg3M
+vDZfukPbS729/spKP6s7poTDiaTWL2Q5T8VRokrXA8F5DvZX6g9jhNKZRFxRre1A
+KNs+dA9R6Fkt+Px2pH3YXkFFb75OTiQRjVVFro48nFZHI98+sIYLjhdtKV0sihUb
+t2ZJWVhVOO/BhoHQGjBM5ewpq5wg3jOhY62Ujx9+/0fOa2peY2WFjrqj0lzXvLG0
++LO0ZDffmAUr/JryADhVphC3ymTnGEGYh7oxdS75NyoXXOj+cndHfu/jmdOZWxwb
+jOhjmmkgSNIuq/XIH64rtUGwN6ipgRgoe4QpJZUoIPT19UFUP350nY6/rCr6N/8p
+IPaqJKjt5zSUbctMSWocfQw/T5gtIijqzA/yp4QbJ1r5rtoMJUoq2wF+VVY+5N2H
+R9B3jv+stTwypYwedJOI1sspIZODitZhC+be1t81D4+xF1S6uvnPl99IUpaN8NYc
+CjN4FDgt9vb3iqvto/g/Rph5tLGjzU+/NgJCnM3S8HmpNRUQqRD9rAP0sgfGeriu
+mD9SngzmtMGlN3QGrdcQ
+=e+fp
+-END PGP SIGNATURE-

Added: dev/tomcat/tomcat-7/v7.0.68/bin/extras/catalina-jmx-remote.jar.md5
==
--- dev/tomcat/tomcat-7/v7.0.68/bin/extras/catalina-jmx-remote.jar.md5 (added)
+++ dev/tomcat/tomcat-7/v7.0.68/bin/extras/catalina-jmx-remote.jar.md5 Mon Feb  
8 21:26:00 2016
@@ -0,0 +1 @@
+38d2c3cd7e079a721188f40ebc41482f *catalina-jmx-remote.jar
\ No newline at end of file

Added: dev/tomcat/tomcat-7/v7.0.68/bin/extras/catalina-jmx-remote.jar.sha1
==
--- dev/tomcat/tomcat-7/v7.0.68/bin/extras/catalina-jmx-remote.jar.sha1 (added)
+++ dev/tomcat/tomcat-7/v7.0.68/bin/extras/catalina-jmx-remote.jar.sha1 Mon Feb 
 8 21:26:00 2016
@@ -0,0 +1 @@
+41540c77ba16bf990e0ff4e1d76e55576c84dfff *catalina-jmx-remote.jar
\ No newline at end of file

Added: dev/tomcat/tomcat-7/v7.0.68/bin/extras/catalina-ws.jar
==
Binary file - no diff available.

Propchange: dev/tomcat/tomcat-7/v7.0.68/bin/extras/catalina-ws.jar
--
svn:mime-type = application/octet-stream

Added: dev/tomcat/tomcat-7/v7.0.68/bin/extras/catalina-ws.jar.asc
==
--- dev/tomcat/tomcat-7/v7.0.68/bin/extras/catalina-ws.jar.asc (added)
+++ dev/tomcat/tomcat-7/v7.0.68/bin/extras/catalina-ws.jar.asc Mon Feb  8 
21:26:00 2016
@@ -0,0 +1,17 @@
+-BEGIN PGP SIGNATURE-
+Version: GnuPG v2
+
+iQIcBAABCgAGBQJWuPpmAAoJECCLCrHWMBHHnWoP/Rn7szRHe+t+/9Jspa4wuXgL
+T3zWsbEoaOJ2wOf8GFUP42tA/dri4xqB5sGgZutMVoBg+PKQ2gdy1a4y+Q4kBuJY
+GNQWXM1fc9UtWfD9YaOahLWSNCg+h0xDrVGGGbYN2dV5s25tc1lJABurZwIbwxxn
+cJA4UrVBIMZ7zieKgH8JJ2xjSE426dZakrl+77fPzeNT/Nzv4X7YIVq/uKUPtPrM
+thh+yf2G+b1AXV5XNGh+1Qja+bGOAwGQvH1WmTf9iFqqdvIvk6+ESEYq6i9w22jJ
+GtpxCYDywajiLHxzRF61oMZHbqEPSbLjeVPN8u5qMeJtfOIfyh1N7s/bjtOEx1eZ
+wty6NXbZgS9eA/u9W4CqnZ4/BXb860JrNGP11xtV9yYV4vfKW8Nla9pNKr+RfgPa
+hTZbW90VQfRtFp6gtW72lvjcjBbqWjk+GI7ZFHW9Oos8anMDCaTSZWtkxcdmwtoX
+PFppoigAemOAvOli6H4tD2ejTHasIESH1AfWFJGPWJeE3O5IaW/ohNECGu8UBcx0
+Nu/qStN0TrqzapjqTj4aCVoP+f13WLruB0p16J080Q4KquMY7y9MHhlTVaPX8YE1
+QSo7p3Uv9hQJ+vrc31rxVgKYpcG+L/9eMzL0Zmhj4d+CpZd7jZrJ3QRiQJla/o/Z
+726mB3wZhBNIx+kStxeg
+=yOVk
+-END PGP SIGNATURE-

Added: dev/tomcat/tomcat-7/v7.0.68/bin/extras/catalina-ws.jar.md5
===

svn commit: r12280 [1/2] - in /dev/tomcat/tomcat-7/v7.0.68: ./ bin/ bin/embed/ bin/extras/ src/

2016-02-08 Thread violetagg
Author: violetagg
Date: Mon Feb  8 21:26:00 2016
New Revision: 12280

Log:
Stage 7.0.68 RC

Added:
dev/tomcat/tomcat-7/v7.0.68/
dev/tomcat/tomcat-7/v7.0.68/KEYS   (with props)
dev/tomcat/tomcat-7/v7.0.68/README.html   (with props)
dev/tomcat/tomcat-7/v7.0.68/RELEASE-NOTES
dev/tomcat/tomcat-7/v7.0.68/bin/
dev/tomcat/tomcat-7/v7.0.68/bin/README.html   (with props)
dev/tomcat/tomcat-7/v7.0.68/bin/apache-tomcat-7.0.68-deployer.tar.gz   
(with props)
dev/tomcat/tomcat-7/v7.0.68/bin/apache-tomcat-7.0.68-deployer.tar.gz.asc
dev/tomcat/tomcat-7/v7.0.68/bin/apache-tomcat-7.0.68-deployer.tar.gz.md5
dev/tomcat/tomcat-7/v7.0.68/bin/apache-tomcat-7.0.68-deployer.tar.gz.sha1
dev/tomcat/tomcat-7/v7.0.68/bin/apache-tomcat-7.0.68-deployer.zip   (with 
props)
dev/tomcat/tomcat-7/v7.0.68/bin/apache-tomcat-7.0.68-deployer.zip.asc
dev/tomcat/tomcat-7/v7.0.68/bin/apache-tomcat-7.0.68-deployer.zip.md5
dev/tomcat/tomcat-7/v7.0.68/bin/apache-tomcat-7.0.68-deployer.zip.sha1
dev/tomcat/tomcat-7/v7.0.68/bin/apache-tomcat-7.0.68-fulldocs.tar.gz   
(with props)
dev/tomcat/tomcat-7/v7.0.68/bin/apache-tomcat-7.0.68-fulldocs.tar.gz.asc
dev/tomcat/tomcat-7/v7.0.68/bin/apache-tomcat-7.0.68-fulldocs.tar.gz.md5
dev/tomcat/tomcat-7/v7.0.68/bin/apache-tomcat-7.0.68-fulldocs.tar.gz.sha1
dev/tomcat/tomcat-7/v7.0.68/bin/apache-tomcat-7.0.68-windows-i64.zip   
(with props)
dev/tomcat/tomcat-7/v7.0.68/bin/apache-tomcat-7.0.68-windows-i64.zip.asc
dev/tomcat/tomcat-7/v7.0.68/bin/apache-tomcat-7.0.68-windows-i64.zip.md5
dev/tomcat/tomcat-7/v7.0.68/bin/apache-tomcat-7.0.68-windows-i64.zip.sha1
dev/tomcat/tomcat-7/v7.0.68/bin/apache-tomcat-7.0.68-windows-x64.zip   
(with props)
dev/tomcat/tomcat-7/v7.0.68/bin/apache-tomcat-7.0.68-windows-x64.zip.asc
dev/tomcat/tomcat-7/v7.0.68/bin/apache-tomcat-7.0.68-windows-x64.zip.md5
dev/tomcat/tomcat-7/v7.0.68/bin/apache-tomcat-7.0.68-windows-x64.zip.sha1
dev/tomcat/tomcat-7/v7.0.68/bin/apache-tomcat-7.0.68-windows-x86.zip   
(with props)
dev/tomcat/tomcat-7/v7.0.68/bin/apache-tomcat-7.0.68-windows-x86.zip.asc
dev/tomcat/tomcat-7/v7.0.68/bin/apache-tomcat-7.0.68-windows-x86.zip.md5
dev/tomcat/tomcat-7/v7.0.68/bin/apache-tomcat-7.0.68-windows-x86.zip.sha1
dev/tomcat/tomcat-7/v7.0.68/bin/apache-tomcat-7.0.68.exe   (with props)
dev/tomcat/tomcat-7/v7.0.68/bin/apache-tomcat-7.0.68.exe.asc
dev/tomcat/tomcat-7/v7.0.68/bin/apache-tomcat-7.0.68.exe.md5
dev/tomcat/tomcat-7/v7.0.68/bin/apache-tomcat-7.0.68.exe.sha1
dev/tomcat/tomcat-7/v7.0.68/bin/apache-tomcat-7.0.68.tar.gz   (with props)
dev/tomcat/tomcat-7/v7.0.68/bin/apache-tomcat-7.0.68.tar.gz.asc
dev/tomcat/tomcat-7/v7.0.68/bin/apache-tomcat-7.0.68.tar.gz.md5
dev/tomcat/tomcat-7/v7.0.68/bin/apache-tomcat-7.0.68.tar.gz.sha1
dev/tomcat/tomcat-7/v7.0.68/bin/apache-tomcat-7.0.68.zip   (with props)
dev/tomcat/tomcat-7/v7.0.68/bin/apache-tomcat-7.0.68.zip.asc
dev/tomcat/tomcat-7/v7.0.68/bin/apache-tomcat-7.0.68.zip.md5
dev/tomcat/tomcat-7/v7.0.68/bin/apache-tomcat-7.0.68.zip.sha1
dev/tomcat/tomcat-7/v7.0.68/bin/embed/
dev/tomcat/tomcat-7/v7.0.68/bin/embed/apache-tomcat-7.0.68-embed.tar.gz   
(with props)
dev/tomcat/tomcat-7/v7.0.68/bin/embed/apache-tomcat-7.0.68-embed.tar.gz.asc
dev/tomcat/tomcat-7/v7.0.68/bin/embed/apache-tomcat-7.0.68-embed.tar.gz.md5
dev/tomcat/tomcat-7/v7.0.68/bin/embed/apache-tomcat-7.0.68-embed.tar.gz.sha1
dev/tomcat/tomcat-7/v7.0.68/bin/embed/apache-tomcat-7.0.68-embed.zip   
(with props)
dev/tomcat/tomcat-7/v7.0.68/bin/embed/apache-tomcat-7.0.68-embed.zip.asc
dev/tomcat/tomcat-7/v7.0.68/bin/embed/apache-tomcat-7.0.68-embed.zip.md5
dev/tomcat/tomcat-7/v7.0.68/bin/embed/apache-tomcat-7.0.68-embed.zip.sha1
dev/tomcat/tomcat-7/v7.0.68/bin/extras/
dev/tomcat/tomcat-7/v7.0.68/bin/extras/catalina-jmx-remote.jar   (with 
props)
dev/tomcat/tomcat-7/v7.0.68/bin/extras/catalina-jmx-remote.jar.asc
dev/tomcat/tomcat-7/v7.0.68/bin/extras/catalina-jmx-remote.jar.md5
dev/tomcat/tomcat-7/v7.0.68/bin/extras/catalina-jmx-remote.jar.sha1
dev/tomcat/tomcat-7/v7.0.68/bin/extras/catalina-ws.jar   (with props)
dev/tomcat/tomcat-7/v7.0.68/bin/extras/catalina-ws.jar.asc
dev/tomcat/tomcat-7/v7.0.68/bin/extras/catalina-ws.jar.md5
dev/tomcat/tomcat-7/v7.0.68/bin/extras/catalina-ws.jar.sha1
dev/tomcat/tomcat-7/v7.0.68/bin/extras/tomcat-juli-adapters.jar   (with 
props)
dev/tomcat/tomcat-7/v7.0.68/bin/extras/tomcat-juli-adapters.jar.asc
dev/tomcat/tomcat-7/v7.0.68/bin/extras/tomcat-juli-adapters.jar.md5
dev/tomcat/tomcat-7/v7.0.68/bin/extras/tomcat-juli-adapters.jar.sha1
dev/tomcat/tomcat-7/v7.0.68/bin/extras/tomcat-juli.jar   (with props)
dev/tomcat/tomcat-7/v7.0.68/bin/extras/tomcat-juli.jar.asc
dev/tomcat/tomcat-7/v7.0.68/bin/extras/tomcat-juli.jar.md5
dev/tomcat/tomcat-7/v7.0.68/bin/extras/tomcat-juli.jar.sha1
 

Re: regression due to https://bz.apache.org/bugzilla/show_bug.cgi?id=58867 ?

2016-02-08 Thread Mark Thomas
On 8 February 2016 21:21:36 GMT+00:00, Romain Manni-Bucau 
 wrote:
>Hi guys,
>
>in https://bz.apache.org/bugzilla/show_bug.cgi?id=58867 there is this
>diff:
>
>-if (!docDir.exists()) {
>-File warFile = new File(docBase + ".war");
>-if (warFile.exists()) {
>-URL war =
>-new URL("jar:" + warFile.toURI().toURL() +
>"!/");
>+File warFile = new File(docBase + ".war");
>+URL war = null;
>+if (warFile.exists()) {
>+war = new URL("jar:" + warFile.toURI().toURL() +
>"!/");
>+}
>+if (docDir.exists()) {
>+if (war != null && unpackWARs) {
>+// Check if WAR needs to be re-expanded (e.g. if
>it has
>+// changed). Note: HostConfig.deployWar() takes
>care of
>+// ensuring that the correct XML file is used.
>+// This will be a NO-OP if the WAR is unchanged.
>+ExpandWar.expand(host, war, pathName);
>+}
>+} else {
>
>
>so if you were deploying a StandardContext with a docDir set to a
>correct
>path and if the war was next to this path then all was working smoothly
>ie
>the manually exploded folder was deployed.
>
>Now (8.0.32) the war is re-expanded in webapps (by default). Of course
>a
>work around is to set unpackWARs to false but it is a regression in
>term of
>behavior which is quite nasty IMO.
>
>Was it really intended or is it a side effect of the fix?

Can you explain the problem more clearly please. Reference to a specific 
example with file names would help. 

I can make some assumptions about what I think you are reporting but a clearer 
explanation would be a better starting point.

Mark


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



[VOTE] Release Apache Tomcat 7.0.68

2016-02-08 Thread Violeta Georgieva
The proposed Apache Tomcat 7.0.68 release is now available for voting.

It can be obtained from:
https://dist.apache.org/repos/dist/dev/tomcat/tomcat-7/v7.0.68/
The Maven staging repo is:
https://repository.apache.org/content/repositories/orgapachetomcat-1064/
The svn tag is:
http://svn.apache.org/repos/asf/tomcat/tc7.0.x/tags/TOMCAT_7_0_68/

The proposed 7.0.68 release is:
[ ] Broken - do not release
[ ] Stable - go ahead and release as 7.0.68 Stable

Regards,
Violeta


Re: [VOTE] Release Apache Tomcat 6.0.45

2016-02-08 Thread Violeta Georgieva
Hi,

2016-02-01 20:52 GMT+02:00 jean-frederic clere :
>
> The proposed Apache Tomcat 6.0.45 release is now available for voting.
>
> It can be obtained from:
> https://dist.apache.org/repos/dist/dev/tomcat/tomcat-6/v6.0.45/
> The Maven staging repo is:
> https://repository.apache.org/content/repositories/orgapachetomcat-1061/
> The svn tag is:
> http://svn.apache.org/repos/asf/tomcat/tc6.0.x/tags/TOMCAT_6_0_45/
>
> The proposed 6.0.45 release is:
> [ ] Broken - do not release
> [X] Stable - go ahead and release as 6.0.45 Stable

Regards,
Violeta

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


svn commit: r1729323 - in /tomcat/tc7.0.x/trunk: build.properties.default res/maven/mvn.properties.default webapps/docs/changelog.xml

2016-02-08 Thread violetagg
Author: violetagg
Date: Tue Feb  9 07:25:45 2016
New Revision: 1729323

URL: http://svn.apache.org/viewvc?rev=1729323&view=rev
Log:
Prep for next version

Modified:
tomcat/tc7.0.x/trunk/build.properties.default
tomcat/tc7.0.x/trunk/res/maven/mvn.properties.default
tomcat/tc7.0.x/trunk/webapps/docs/changelog.xml

Modified: tomcat/tc7.0.x/trunk/build.properties.default
URL: 
http://svn.apache.org/viewvc/tomcat/tc7.0.x/trunk/build.properties.default?rev=1729323&r1=1729322&r2=1729323&view=diff
==
--- tomcat/tc7.0.x/trunk/build.properties.default (original)
+++ tomcat/tc7.0.x/trunk/build.properties.default Tue Feb  9 07:25:45 2016
@@ -25,7 +25,7 @@
 # - Version Control Flags -
 version.major=7
 version.minor=0
-version.build=68
+version.build=69
 version.patch=0
 version.suffix=-dev
 

Modified: tomcat/tc7.0.x/trunk/res/maven/mvn.properties.default
URL: 
http://svn.apache.org/viewvc/tomcat/tc7.0.x/trunk/res/maven/mvn.properties.default?rev=1729323&r1=1729322&r2=1729323&view=diff
==
--- tomcat/tc7.0.x/trunk/res/maven/mvn.properties.default (original)
+++ tomcat/tc7.0.x/trunk/res/maven/mvn.properties.default Tue Feb  9 07:25:45 
2016
@@ -35,7 +35,7 @@ maven.asf.release.repo.url=https://repos
 maven.asf.release.repo.repositoryId=apache.releases
 
 # Release version info
-maven.asf.release.deploy.version=7.0.68
+maven.asf.release.deploy.version=7.0.69
 
 #Where do we load the libraries from
 tomcat.lib.path=../../output/build/lib

Modified: tomcat/tc7.0.x/trunk/webapps/docs/changelog.xml
URL: 
http://svn.apache.org/viewvc/tomcat/tc7.0.x/trunk/webapps/docs/changelog.xml?rev=1729323&r1=1729322&r2=1729323&view=diff
==
--- tomcat/tc7.0.x/trunk/webapps/docs/changelog.xml (original)
+++ tomcat/tc7.0.x/trunk/webapps/docs/changelog.xml Tue Feb  9 07:25:45 2016
@@ -57,6 +57,8 @@
   They eventually become mixed with the numbered issues. (I.e., numbered
   issues do not "pop up" wrt. others).
 -->
+
+
 
   
 



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



Re: regression due to https://bz.apache.org/bugzilla/show_bug.cgi?id=58867 ?

2016-02-08 Thread Romain Manni-Bucau
Hi mark,

if you put a war in a specific folder then expand it yourself next to the
war and do something like:

StandardContext ctx = new StandardContext();
// several set
ctx.setDocBase("/my/expanded/"); // /my/expanded.war exists since that's
where we come from
host.addChild(ctx);

then you get a duplicated deployment with autodeploy settings and unpackWAR
set to true. It sounds like the wrong behavior to me since the auto deploy
doesnt apply to /my/ folder but ${tomcat.base}/webapps - by default.

Tomcat class does it for instance, TomEE does it too and fixed it
preventing unpacking and several tools around tomcat as well. I guess - can
check if needed - a plain tomcat installation can get it setting an
absolute docBase on  .





Romain Manni-Bucau
@rmannibucau  |  Blog
 | Github  |
LinkedIn  | Tomitriber


2016-02-09 1:35 GMT+01:00 Mark Thomas :

> On 8 February 2016 21:21:36 GMT+00:00, Romain Manni-Bucau <
> rmannibu...@gmail.com> wrote:
> >Hi guys,
> >
> >in https://bz.apache.org/bugzilla/show_bug.cgi?id=58867 there is this
> >diff:
> >
> >-if (!docDir.exists()) {
> >-File warFile = new File(docBase + ".war");
> >-if (warFile.exists()) {
> >-URL war =
> >-new URL("jar:" + warFile.toURI().toURL() +
> >"!/");
> >+File warFile = new File(docBase + ".war");
> >+URL war = null;
> >+if (warFile.exists()) {
> >+war = new URL("jar:" + warFile.toURI().toURL() +
> >"!/");
> >+}
> >+if (docDir.exists()) {
> >+if (war != null && unpackWARs) {
> >+// Check if WAR needs to be re-expanded (e.g. if
> >it has
> >+// changed). Note: HostConfig.deployWar() takes
> >care of
> >+// ensuring that the correct XML file is used.
> >+// This will be a NO-OP if the WAR is unchanged.
> >+ExpandWar.expand(host, war, pathName);
> >+}
> >+} else {
> >
> >
> >so if you were deploying a StandardContext with a docDir set to a
> >correct
> >path and if the war was next to this path then all was working smoothly
> >ie
> >the manually exploded folder was deployed.
> >
> >Now (8.0.32) the war is re-expanded in webapps (by default). Of course
> >a
> >work around is to set unpackWARs to false but it is a regression in
> >term of
> >behavior which is quite nasty IMO.
> >
> >Was it really intended or is it a side effect of the fix?
>
> Can you explain the problem more clearly please. Reference to a specific
> example with file names would help.
>
> I can make some assumptions about what I think you are reporting but a
> clearer explanation would be a better starting point.
>
> Mark
>
>
> -
> To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
> For additional commands, e-mail: dev-h...@tomcat.apache.org
>
>


Re: [VOTE] Release Apache Tomcat 7.0.68

2016-02-08 Thread Violeta Georgieva
2016-02-09 9:18 GMT+02:00 Violeta Georgieva :
>
> The proposed Apache Tomcat 7.0.68 release is now available for voting.
>
> It can be obtained from:
> https://dist.apache.org/repos/dist/dev/tomcat/tomcat-7/v7.0.68/
> The Maven staging repo is:
> https://repository.apache.org/content/repositories/orgapachetomcat-1064/
> The svn tag is:
> http://svn.apache.org/repos/asf/tomcat/tc7.0.x/tags/TOMCAT_7_0_68/
>
> The proposed 7.0.68 release is:
> [ ] Broken - do not release
> [X] Stable - go ahead and release as 7.0.68 Stable

Tested Tomcat in OSGi environment - successful.
Basic performance tests - successful.

> Regards,
> Violeta