date:20161004

[Bug 60199] Improve error message if a session attribute could not load due to deserialization problems

2016-10-04 Thread bugzilla

https://bz.apache.org/bugzilla/show_bug.cgi?id=60199

--- Comment #2 from igor.muk...@gmx.de ---
Created attachment 34324
  --> https://bz.apache.org/bugzilla/attachment.cgi?id=34324=edit
Proposed a patch for 8.0.x

Added a patch

-- 
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: r1763320 - in /tomcat/trunk/bin: catalina.bat catalina.sh

2016-10-04 Thread markt

Author: markt
Date: Tue Oct  4 19:32:59 2016
New Revision: 1763320

URL: http://svn.apache.org/viewvc?rev=1763320=rev
Log:
ws police

Modified:
tomcat/trunk/bin/catalina.bat
tomcat/trunk/bin/catalina.sh

Modified: tomcat/trunk/bin/catalina.bat
URL: 
http://svn.apache.org/viewvc/tomcat/trunk/bin/catalina.bat?rev=1763320=1763319=1763320=diff
==
--- tomcat/trunk/bin/catalina.bat (original)
+++ tomcat/trunk/bin/catalina.bat Tue Oct  4 19:32:59 2016
@@ -202,7 +202,7 @@ set JSSE_OPTS="-Djdk.tls.ephemeralDHKeyS
 set "JAVA_OPTS=%JAVA_OPTS% %JSSE_OPTS%"
 
 rem Register custom URL handlers
-rem Do this here so they can be used in the security policy 
+rem Do this here so they can be used in the security policy
 set "JAVA_OPTS=%JAVA_OPTS% 
-Djava.protocol.handler.pkgs=org.apache.catalina.webresources"
 
 if not "%LOGGING_CONFIG%" == "" goto noJuliConfig

Modified: tomcat/trunk/bin/catalina.sh
URL: 
http://svn.apache.org/viewvc/tomcat/trunk/bin/catalina.sh?rev=1763320=1763319=1763320=diff
==
--- tomcat/trunk/bin/catalina.sh (original)
+++ tomcat/trunk/bin/catalina.sh Tue Oct  4 19:32:59 2016
@@ -241,7 +241,7 @@ fi
 JAVA_OPTS="$JAVA_OPTS $JSSE_OPTS"
 
 # Register custom URL handlers
-# Do this here so they can be used in the security policy 
+# Do this here so they can be used in the security policy
 JAVA_OPTS="%JAVA_OPTS% 
-Djava.protocol.handler.pkgs=org.apache.catalina.webresources"
 
 # Set juli LogManager config file if it is present and an override has not 
been issued



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

svn commit: r1763319 - in /tomcat/trunk: bin/catalina.bat bin/catalina.sh build.xml

2016-10-04 Thread markt

Author: markt
Date: Tue Oct  4 19:01:55 2016
New Revision: 1763319

URL: http://svn.apache.org/viewvc?rev=1763319=rev
Log:
Make the custom war URL handler available when processing the security
manager's policy file.
Part of the fix for BZ 60087

Modified:
tomcat/trunk/bin/catalina.bat
tomcat/trunk/bin/catalina.sh
tomcat/trunk/build.xml

Modified: tomcat/trunk/bin/catalina.bat
URL: 
http://svn.apache.org/viewvc/tomcat/trunk/bin/catalina.bat?rev=1763319=1763318=1763319=diff
==
--- tomcat/trunk/bin/catalina.bat (original)
+++ tomcat/trunk/bin/catalina.bat Tue Oct  4 19:01:55 2016
@@ -201,6 +201,10 @@ set JSSE_OPTS="-Djdk.tls.ephemeralDHKeyS
 :gotJsseOpts
 set "JAVA_OPTS=%JAVA_OPTS% %JSSE_OPTS%"
 
+rem Register custom URL handlers
+rem Do this here so they can be used in the security policy 
+set "JAVA_OPTS=%JAVA_OPTS% 
-Djava.protocol.handler.pkgs=org.apache.catalina.webresources"
+
 if not "%LOGGING_CONFIG%" == "" goto noJuliConfig
 set LOGGING_CONFIG=-Dnop
 if not exist "%CATALINA_BASE%\conf\logging.properties" goto noJuliConfig

Modified: tomcat/trunk/bin/catalina.sh
URL: 
http://svn.apache.org/viewvc/tomcat/trunk/bin/catalina.sh?rev=1763319=1763318=1763319=diff
==
--- tomcat/trunk/bin/catalina.sh (original)
+++ tomcat/trunk/bin/catalina.sh Tue Oct  4 19:01:55 2016
@@ -240,6 +240,10 @@ if [ -z "$JSSE_OPTS" ] ; then
 fi
 JAVA_OPTS="$JAVA_OPTS $JSSE_OPTS"
 
+# Register custom URL handlers
+# Do this here so they can be used in the security policy 
+JAVA_OPTS="%JAVA_OPTS% 
-Djava.protocol.handler.pkgs=org.apache.catalina.webresources"
+
 # Set juli LogManager config file if it is present and an override has not 
been issued
 if [ -z "$LOGGING_CONFIG" ]; then
   if [ -r "$CATALINA_BASE"/conf/logging.properties ]; then

Modified: tomcat/trunk/build.xml
URL: 
http://svn.apache.org/viewvc/tomcat/trunk/build.xml?rev=1763319=1763318=1763319=diff
==
--- tomcat/trunk/build.xml (original)
+++ tomcat/trunk/build.xml Tue Oct  4 19:01:55 2016
@@ -333,6 +333,7 @@
 
 
 
+
   
 
   



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

[Bug 60202] Failed LDAP connection triggers lockout realm

2016-10-04 Thread bugzilla

https://bz.apache.org/bugzilla/show_bug.cgi?id=60202

--- Comment #5 from Remy Maucherat  ---
So I want it to behave the way it does, mostly, and especially not fail
requests like that.
-1

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

[Bug 60202] Failed LDAP connection triggers lockout realm

2016-10-04 Thread bugzilla

https://bz.apache.org/bugzilla/show_bug.cgi?id=60202

--- Comment #4 from Christopher Schultz  ---
(In reply to Remy Maucherat from comment #3)
> The realm doesn't and shouldn't throw exceptions at all :) Look at the lock
> out realm code.

How should the Realm behave if there is a communications error? I assert that
throwing an exception is a perfectly reasonable thing to do.

The current Realm code is irrelevant. It will behave however we want it to
behave. I'm suggesting a change to the behavior, not asking why it doesn't
behave in a way that it wasn't programmed to do.

It's not LockOutRealm that you need to read, it's LDAPRealm, which shows that
it catches exceptions like CommunicationException (a transient,
non-authentication-related problem) and returns null which makes it look the
same as an authentication problem, which is isn't.

-- 
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: ECJ and Java 9

2016-10-04 Thread Violeta Georgieva

2016-10-04 20:41 GMT+03:00 Emmanuel Bourg :
>
> Le 4/10/2016 à 19:19, Rémy Maucherat a écrit :
>
> > Does anyone have info on Java 9 support in ECJ ? This is going to be
needed
> > for JSP support (obviously). I tested 4.7Ms [good news: it's a drop in
> > replacement for our current 4.5] but there's no change in that area.
>
> There is a Java 9 branch in the Git repository, I don't know how much
> of the new features it supports though:
>
>   http://git.eclipse.org/c/jdt/eclipse.jdt.core.git/log/?h=BETA_JAVA9
>
> It looks like the beta builds have a tag starting with Y, this one is
> the latest available:
>
>
http://git.eclipse.org/c/jdt/eclipse.jdt.core.git/snapshot/Y20160929-1000.tar.gz

Here [1] and [2] you can find more information for the current development.

Violeta

[1] https://wiki.eclipse.org/Java9
[2] https://wiki.eclipse.org/JDT_Core/Java9

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

Re: ECJ and Java 9

2016-10-04 Thread Emmanuel Bourg

Le 4/10/2016 à 19:19, Rémy Maucherat a écrit :

> Does anyone have info on Java 9 support in ECJ ? This is going to be needed
> for JSP support (obviously). I tested 4.7Ms [good news: it's a drop in
> replacement for our current 4.5] but there's no change in that area.

There is a Java 9 branch in the Git repository, I don't know how much
of the new features it supports though:

  http://git.eclipse.org/c/jdt/eclipse.jdt.core.git/log/?h=BETA_JAVA9

It looks like the beta builds have a tag starting with Y, this one is
the latest available:

  
http://git.eclipse.org/c/jdt/eclipse.jdt.core.git/snapshot/Y20160929-1000.tar.gz

Emmanuel Bourg


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

ECJ and Java 9

2016-10-04 Thread Rémy Maucherat

Hi,

Does anyone have info on Java 9 support in ECJ ? This is going to be needed
for JSP support (obviously). I tested 4.7Ms [good news: it's a drop in
replacement for our current 4.5] but there's no change in that area.

Rémy

[Bug 60202] Failed LDAP connection triggers lockout realm

2016-10-04 Thread bugzilla

https://bz.apache.org/bugzilla/show_bug.cgi?id=60202

--- Comment #3 from Remy Maucherat  ---
The realm doesn't and shouldn't throw exceptions at all :) Look at the lock out
realm code.

-- 
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: Early Access build 136 for JDK 9 & JDK 9 with Project Jigsaw are available on java.net

2016-10-04 Thread Rory O'Donnell


Hi Mark,

There was an update to JDK-8163449 below:

Caching is enabled by default, but it can be disabled statically (if 
strangely through a non-static api). The fact that files can't be 
deleted on windows is a consequence of this caching, and also that files 
are opened by the Java runtime on windows in a mode that prevents 
deletion. So, really, this isn't a bug and the question is can the 
submitter just disable caching?


Let me know if that works for you ?

Rgds,Rory

On 20/09/2016 11:15, Rory O'Donnell wrote:


Hi Mark,

Early Access b136  for JDK 9 is 
available on java.net, summary of  changes are listed here 
.
Early Access b136  (#5506) for JDK 9 
with Project Jigsaw is available on java.net, summary of  changes are 
listed here 
.


There have been a number of fixes to bugs reported by Open Source 
projects since the last availability email  :


  * 8165723 - b136 - core-libs JarFile::isMultiRelease() method
returns false when it should return true
  * 8165116 - b136 - xml redirect function is not allowed even with
enableExtensionFunctions

NOTE:-  Build 135 included a fix for JDK-8161016 which *has introduced 
a behavioral change to HttpURLConnection, more info:*


The behavior of HttpURLConnection when using a ProxySelector has been 
modified with this JDK release. Currently, HttpURLConnection.connect() 
call would fallback to a DIRECT connection attempt if the configured 
proxy/proxies failed to make a connection. This release introduces a 
change whereby no DIRECT connection will be attempted in such a 
scenario. Instead, the HttpURLConnection.connect() method will fail 
and throw an IOException which occurred from the last proxy tested. 
This behavior now matches with the HTTP connections made by popular 
web browsers. But this change will bring compatibility issues for the 
applications expecting a DIRECT connection when a proxy server is down 
or when wrong proxies are provided.

*

JDK 9 Outreach Survey*

In order to encourage and receive additional feedback from developers 
testing their applications with JDK 9,
the OpenJDK Quality Outreach effort has put together a very brief 
survey about your experiences with JDK 9 so far.


It is available at***https://www.surveymonkey.de/r/JDK9EA*

We would love to hear feedback from you!


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


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

[Bug 60202] Failed LDAP connection triggers lockout realm

2016-10-04 Thread bugzilla

https://bz.apache.org/bugzilla/show_bug.cgi?id=60202

--- Comment #2 from Christopher Schultz  ---
Perhaps the Realm interface could be adjusted to throw a variety of exceptions:

- AuthenticationException (triggers lock-out)
- CommunicationException (does not trigger lock-out)

Honestly, if a Realm throws an exception during authentication, I would think
that should always be considered a transient failure and NOT trigger lock-out.

If the LDAPRealm is returning  when a communications exception occurs, I
think it should instead throw an exception.

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

[Bug 60199] Improve error message if a session attribute could not load due to deserialization problems

2016-10-04 Thread bugzilla

https://bz.apache.org/bugzilla/show_bug.cgi?id=60199

Christopher Schultz  changed:

   What|Removed |Added

 OS||All

--- Comment #1 from Christopher Schultz  ---
Care to prepare a formal patch?

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

[Bug 60193] A child container failed during start

2016-10-04 Thread bugzilla

https://bz.apache.org/bugzilla/show_bug.cgi?id=60193

Christopher Schultz  changed:

   What|Removed |Added

 Status|NEW |NEEDINFO
 OS||All

--- Comment #1 from Christopher Schultz  ---
Looks like you've got an invalid JAR file. Please confirm with a tool like
info-zip, etc. that the file is in tact and readable on the server where you
are getting this error.

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

[Bug 60202] Failed LDAP connection triggers lockout realm

2016-10-04 Thread bugzilla

https://bz.apache.org/bugzilla/show_bug.cgi?id=60202

Mark Thomas  changed:

   What|Removed |Added

 Resolution|--- |WONTFIX
 Status|NEW |RESOLVED

--- Comment #1 from Mark Thomas  ---
Given the way that the LockOutRealm works (as a Realm wrapper with no insight
into the inner workings of the Realm it wraps) there is no easy way to fix this
as it has no way to dertermine why an authentication has failed.

Additionally, most LDAP services implement their own lock out policy for failed
passwords so use of the LockOutRealm may not be necessary in this case.

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

[Bug 60202] New: Failed LDAP connection triggers lockout realm

2016-10-04 Thread bugzilla

https://bz.apache.org/bugzilla/show_bug.cgi?id=60202

Bug ID: 60202
   Summary: Failed LDAP connection triggers lockout realm
   Product: Tomcat 8
   Version: 8.0.37
  Hardware: PC
OS: Linux
Status: NEW
  Severity: normal
  Priority: P2
 Component: Catalina
  Assignee: dev@tomcat.apache.org
  Reporter: b...@zvan.net

It appears that a network or other failure to connect/bind to LDAP counts as an
authentication failure for the purpose of the lockout realm. This means
maintenance on the LDAP system can cause LDAP users to be locked out due to
failed connections with correct passwords.

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

[GUMP@vmgump]: Project tomcat-trunk-validate (in module tomcat-trunk) failed

2016-10-04 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-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 9.x, a web server implementing the Java 
Servlet 4.0,
...


Full details are available at:

http://vmgump.apache.org/gump/public/tomcat-trunk/tomcat-trunk-validate/index.html

That said, some information snippets are provided here.

The following annotations (debug/informational/warning/error messages) were 
provided:
 -DEBUG- Dependency on checkstyle exists, no need to add for property 
checkstyle.jar.
 -INFO- Failed with reason build failed



The following work was performed:
http://vmgump.apache.org/gump/public/tomcat-trunk/tomcat-trunk-validate/gump_work/build_tomcat-trunk_tomcat-trunk-validate.html
Work Name: build_tomcat-trunk_tomcat-trunk-validate (Type: Build)
Work ended in a state of : Failed
Elapsed: 53 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 
-Dbase.path=/srv/gump/public/workspace/tomcat-trunk/tomcat-build-libs 
-Dcheckstyle.jar=/srv/gump/public/workspace/checkstyle/target/checkstyle-7.2-SNAPSHOT.jar
 -Dexecute.validate=true validate 
[Working Directory: /srv/gump/public/workspace/tomcat-trunk]
CLASSPATH: 
/usr/lib/jvm/java-8-oracle/lib/tools.jar:/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/checkstyle/target/checkstyle-7.2-SNAPSHOT.jar:/srv/gump/packages/antlr/antlr-3.1.3.jar:/srv/gump/public/workspace/apache-commons/beanutils/dist/commons-beanutils-20161004.jar:/srv/gump/packages/commons-collections3/commons-collections-3.2.1.jar:/srv/gump/public/workspace/apache-commons/cli/target/commons-cli-1.4-SNAPSHOT.jar:/srv/gump/public/workspace/commons-lang-trunk/target/commons-lang3-3.5-SNAPSHOT.jar
 
:/srv/gump/public/workspace/apache-commons/logging/target/commons-logging-20161004.jar:/srv/gump/public/workspace/apache-commons/logging/target/commons-logging-api-20161004.jar:/srv/gump/public/workspace/google-guava/guava/target/guava-20.0-SNAPSHOT.jar
-
Buildfile: /srv/gump/public/workspace/tomcat-trunk/build.xml

build-prepare:
   [delete] Deleting directory 
/srv/gump/public/workspace/tomcat-trunk/output/build/temp
[mkdir] Created dir: 
/srv/gump/public/workspace/tomcat-trunk/output/build/temp

compile-prepare:

download-validate:

testexist:
 [echo] Testing  for 
/srv/gump/public/workspace/checkstyle/target/checkstyle-7.2-SNAPSHOT.jar

setproxy:

downloadfile:

validate:
[mkdir] Created dir: 
/srv/gump/public/workspace/tomcat-trunk/output/res/checkstyle
[checkstyle] Running Checkstyle 7.2-SNAPSHOT on 3085 files
[checkstyle] [ERROR] /srv/gump/public/workspace/tomcat-trunk/build.xml:382:3: 
File contains tab characters (this is the first instance). [FileTabCharacter]

BUILD FAILED
/srv/gump/public/workspace/tomcat-trunk/build.xml:537: Got 1 errors and 0 
warnings.

Total time: 52 seconds
-

To subscribe to this information via syndicated feeds:
- RSS: 
http://vmgump.apache.org/gump/public/tomcat-trunk/tomcat-trunk-validate/rss.xml
- Atom: 
http://vmgump.apache.org/gump/public/tomcat-trunk/tomcat-trunk-validate/atom.xml

== Gump Tracking Only ===
Produced by Apache Gump(TM) version 2.3.
Gump Run 20161004120026, vmgump.apache.org:vmgump:20161004120026
Gump E-mail Identifier (unique within run) #5.

--
Apache Gump
http://gump.apache.org/ [Instance: vmgump]

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

svn commit: r1763277 - /tomcat/trunk/webapps/docs/security-manager-howto.xml

2016-10-04 Thread markt

Author: markt
Date: Tue Oct  4 13:33:02 2016
New Revision: 1763277

URL: http://svn.apache.org/viewvc?rev=1763277=rev
Log:
Remove additional references to the removed class JndiPermission

Modified:
tomcat/trunk/webapps/docs/security-manager-howto.xml

Modified: tomcat/trunk/webapps/docs/security-manager-howto.xml
URL: 
http://svn.apache.org/viewvc/tomcat/trunk/webapps/docs/security-manager-howto.xml?rev=1763277=1763276=1763277=diff
==
--- tomcat/trunk/webapps/docs/security-manager-howto.xml (original)
+++ tomcat/trunk/webapps/docs/security-manager-howto.xml Tue Oct  4 13:33:02 
2016
@@ -105,40 +105,6 @@
 
   
 
-
-  
-
-Tomcat utilizes a custom permission class called
-org.apache.naming.JndiPermission.  This permission
-controls read access to JNDI named file based resources.  The permission
-name is the JNDI name and there are no actions.  A trailing "*" can be
-used to do wild card matching for a JNDI named file resource when
-granting permission.  For example, you might include the following
-in your policy file:
-permission  org.apache.naming.JndiPermission  
"jndi://localhost/examples/*";
-
-A Permission entry like this is generated dynamically for each web
-application that is deployed, to allow it to read its own static resources
-but disallow it from using file access to read any other files (unless
-permissions for those files are explicitly granted).
-
-Also, Tomcat always dynamically creates the following file 
permissions:
-
-permission java.io.FilePermission "** your application context**", "read";
-
-permission java.io.FilePermission
-  "** application working directory**", "read,write";
-permission java.io.FilePermission
-  "** application working directory**/-", "read,write,delete";
-
-Where **your application context** equals the folder (or WAR file) 
under which
-your application has been deployed and **application working directory** 
is the
-temporary directory provided to your application as required by the
-Servlet Specification.
-
-  
-
-
 
 
 



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

svn commit: r1763276 - /tomcat/trunk/build.xml

2016-10-04 Thread markt

Author: markt
Date: Tue Oct  4 13:26:21 2016
New Revision: 1763276

URL: http://svn.apache.org/viewvc?rev=1763276=rev
Log:
Tab police

Modified:
tomcat/trunk/build.xml

Modified: tomcat/trunk/build.xml
URL: 
http://svn.apache.org/viewvc/tomcat/trunk/build.xml?rev=1763276=1763275=1763276=diff
==
--- tomcat/trunk/build.xml (original)
+++ tomcat/trunk/build.xml Tue Oct  4 13:26:21 2016
@@ -379,9 +379,9 @@
 
 
 
-   
- 
-   
+
+  
+
 
 
 



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

svn commit: r1763272 - /tomcat/trunk/build.xml

2016-10-04 Thread markt

Author: markt
Date: Tue Oct  4 12:40:14 2016
New Revision: 1763272

URL: http://svn.apache.org/viewvc?rev=1763272=rev
Log:
Remove duplicate comment

Modified:
tomcat/trunk/build.xml

Modified: tomcat/trunk/build.xml
URL: 
http://svn.apache.org/viewvc/tomcat/trunk/build.xml?rev=1763272=1763271=1763272=diff
==
--- tomcat/trunk/build.xml (original)
+++ tomcat/trunk/build.xml Tue Oct  4 12:40:14 2016
@@ -375,7 +375,6 @@
 
   
 
-  
   
 
 



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

svn commit: r1763271 - /tomcat/trunk/build.xml

2016-10-04 Thread markt

Author: markt
Date: Tue Oct  4 12:35:48 2016
New Revision: 1763271

URL: http://svn.apache.org/viewvc?rev=1763271=rev
Log:
Exclude files from catalina.jar that are already provided in
bootstrap.jar

Modified:
tomcat/trunk/build.xml

Modified: tomcat/trunk/build.xml
URL: 
http://svn.apache.org/viewvc/tomcat/trunk/build.xml?rev=1763271=1763270=1763271=diff
==
--- tomcat/trunk/build.xml (original)
+++ tomcat/trunk/build.xml Tue Oct  4 12:35:48 2016
@@ -375,9 +375,14 @@
 
   
 
+  
   
 
 
+
+   
+ 
+   
 
 
 



-
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-10-04 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/792

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] 1763266
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 failure in on tomcat-8-trunk

2016-10-04 Thread buildbot

The Buildbot has detected a new failure on builder tomcat-8-trunk while 
building . Full details are available at:
https://ci.apache.org/builders/tomcat-8-trunk/builds/791

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] 1763264
Blamelist: markt

BUILD FAILED: failed compile_1

Sincerely,
 -The Buildbot




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

svn commit: r1763266 - in /tomcat/tc8.0.x/trunk: ./ java/org/apache/catalina/webresources/ java/org/apache/catalina/webresources/war/ test/org/apache/catalina/webresources/ test/org/apache/catalina/we

2016-10-04 Thread markt

Author: markt
Date: Tue Oct  4 11:37:26 2016
New Revision: 1763266

URL: http://svn.apache.org/viewvc?rev=1763266=rev
Log:
Move the WAR handling code to a separate package to provide the option to 
register it via the java.protocol.handler.pkgs system property

Added:
tomcat/tc8.0.x/trunk/java/org/apache/catalina/webresources/war/
  - copied from r1763259, 
tomcat/trunk/java/org/apache/catalina/webresources/war/
tomcat/tc8.0.x/trunk/test/org/apache/catalina/webresources/war/
  - copied from r1763259, 
tomcat/trunk/test/org/apache/catalina/webresources/war/
Removed:

tomcat/tc8.0.x/trunk/java/org/apache/catalina/webresources/WarURLConnection.java

tomcat/tc8.0.x/trunk/java/org/apache/catalina/webresources/WarURLStreamHandler.java

tomcat/tc8.0.x/trunk/test/org/apache/catalina/webresources/TestWarURLConnection.java

tomcat/tc8.0.x/trunk/test/org/apache/catalina/webresources/TestWarURLStreamHandler.java

tomcat/tc8.0.x/trunk/test/org/apache/catalina/webresources/TestWarURLStreamHandlerIntegration.java
Modified:
tomcat/tc8.0.x/trunk/   (props changed)

tomcat/tc8.0.x/trunk/java/org/apache/catalina/webresources/TomcatURLStreamHandlerFactory.java

tomcat/tc8.0.x/trunk/test/org/apache/catalina/webresources/war/TestHandlerIntegration.java

Propchange: tomcat/tc8.0.x/trunk/
--
--- svn:mergeinfo (original)
+++ svn:mergeinfo Tue Oct  4 11:37:26 2016
@@ -1,2 +1,2 @@
 
/tomcat/tc8.5.x/trunk:1735042,1737966,1743139-1743140,1744151,1747537,1747925,1748002,1754614,1754643,1762124,1762183,1762203
-/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

svn commit: r1763265 - in /tomcat/tc8.5.x/trunk: ./ java/org/apache/catalina/webresources/ java/org/apache/catalina/webresources/war/ test/org/apache/catalina/webresources/ test/org/apache/catalina/we

2016-10-04 Thread markt

Author: markt
Date: Tue Oct  4 11:30:22 2016
New Revision: 1763265

URL: http://svn.apache.org/viewvc?rev=1763265=rev
Log:
Move the WAR handling code to a separate package to provide the option to 
register it via the java.protocol.handler.pkgs system property

Added:
tomcat/tc8.5.x/trunk/java/org/apache/catalina/webresources/war/
  - copied from r1763259, 
tomcat/trunk/java/org/apache/catalina/webresources/war/
tomcat/tc8.5.x/trunk/test/org/apache/catalina/webresources/war/
  - copied from r1763259, 
tomcat/trunk/test/org/apache/catalina/webresources/war/
Removed:

tomcat/tc8.5.x/trunk/java/org/apache/catalina/webresources/WarURLConnection.java

tomcat/tc8.5.x/trunk/java/org/apache/catalina/webresources/WarURLStreamHandler.java

tomcat/tc8.5.x/trunk/test/org/apache/catalina/webresources/TestWarURLConnection.java

tomcat/tc8.5.x/trunk/test/org/apache/catalina/webresources/TestWarURLStreamHandler.java

tomcat/tc8.5.x/trunk/test/org/apache/catalina/webresources/TestWarURLStreamHandlerIntegration.java
Modified:
tomcat/tc8.5.x/trunk/   (props changed)

tomcat/tc8.5.x/trunk/java/org/apache/catalina/webresources/TomcatURLStreamHandlerFactory.java

Propchange: tomcat/tc8.5.x/trunk/
--
--- svn:mergeinfo (original)
+++ svn:mergeinfo Tue Oct  4 11:30:22 2016
@@ -1 +1 @@
-/tomcat/trunk:1734785,1734799,1734845,1734928,1735041,1735044,1735480,1735577,1735597,1735599-1735600,1735615,1736145,1736162,1736209,1736280,1736297,1736299,1736489,1736646,1736703,1736836,1736849,1737104-1737105,1737112,1737117,1737119-1737120,1737155,1737157,1737192,1737280,1737339,1737632,1737664,1737715,1737748,1737785,1737834,1737860,1737903,1737959,1738005,1738007,1738014-1738015,1738018,1738022,1738039,1738043,1738059-1738060,1738147,1738149,1738174-1738175,1738261,1738589,1738623-1738625,1738643,1738816,1738850,1738855,1738946-1738948,1738953-1738954,1738979,1738982,1739079-1739081,1739087,1739113,1739153,1739172,1739176,1739191,1739474,1739726,1739762,1739775,1739814,1739817-1739818,1739975,1740131,1740324,1740465,1740495,1740508-1740509,1740520,1740535,1740707,1740803,1740810,1740969,1740980,1740991,1740997,1741015,1741033,1741036,1741058,1741060,1741080,1741147,1741159,1741164,1741173,1741181,1741190,1741197,1741202,1741208,1741213,1741221,1741225,1741232,1741409,1741501
 
,1741677,1741892,1741896,1741984,1742023,1742042,1742071,1742090,1742093,1742101,1742105,1742111,1742139,1742146,1742148,1742166,1742181,1742184,1742187,1742246,1742248-1742251,1742263-1742264,1742268,1742276,1742369,1742387,1742448,1742509-1742512,1742917,1742919,1742933,1742975-1742976,1742984,1742986,1743019,1743115,1743117,1743124-1743125,1743134,1743425,1743554,1743679,1743696-1743698,1743700-1743701,1744058,1744064-1744065,1744125,1744194,1744229,1744270,1744323,1744432,1744684,1744697,1744705,1744713,1744760,1744786,1745083,1745142-1745143,1745145,1745177,1745179-1745180,1745227,1745248,1745254,1745337,1745467,1745473,1745576,1745735,1745744,1746304,1746306-1746307,1746319,1746327,1746338,1746340-1746341,1746344,1746427,1746441,1746473,1746490,1746492,1746495-1746496,1746499-1746501,1746503-1746507,1746509,1746549,1746551,1746554,1746556,1746558,1746584,1746620,1746649,1746724,1746939,1746989,1747014,1747028,1747035,1747210,1747225,1747234,1747253,1747404,1747506,1747536,1747
 
924,1747980,1747993,1748001,1748253,1748452,1748547,1748629,1748676,1748715,1749287,1749296,1749328,1749373,1749465,1749506,1749508,1749665-1749666,1749763,1749865-1749866,1749898,1749978,1749980,1750011,1750015,1750056,1750480,1750617,1750634,1750692,1750697,1750700,1750703,1750707,1750714,1750718,1750723,1750774,1750899,1750975,1750995,1751061,1751097,1751173,1751438,1751447,1751463,1751702,1752212,1752737,1752745,1753078,1753080,1753358,1753363,1754111,1754140-1754141,1754281,1754310,1754445,1754467,1754494,1754496,1754528,1754532-1754533,1754613,1754714,1754874,1754941,1754944,1754950-1754951,1755005,1755007,1755009,1755132,1755180-1755181,1755185,1755190,1755204-1755206,1755208,1755214,1755224,1755227,1755230,1755629,1755646-1755647,1755650,1755653,1755675,1755680,1755683,1755693,1755717,1755731-1755737,1755812,1755828,1755884,1755890,1755918-1755919,1755942,1755958,1755960,1755970,1755993,1756013,1756019,1756039,1756056,1756083-1756114,1756175,1756288-1756289,1756408-1756410,1

svn commit: r1763264 - in /tomcat/tc8.0.x/trunk: ./ java/org/apache/catalina/webresources/WarURLConnection.java java/org/apache/catalina/webresources/WarURLStreamHandler.java test/org/apache/catalina/

2016-10-04 Thread markt

Author: markt
Date: Tue Oct  4 11:29:43 2016
New Revision: 1763264

URL: http://svn.apache.org/viewvc?rev=1763264=rev
Log:
Further preparation for fixing BZ 60087.
With the war->jar conversion taking place in the WarURLStreamHandler, a URL 
constructed from a String would have an external form that was not that same as 
the original String.
Resolve this by moving the conversion of the war URL to a jar URL to the 
WarURLConnection and add some unit tests to confirm the behavior is now as 
expected. 

Modified:
tomcat/tc8.0.x/trunk/   (props changed)

tomcat/tc8.0.x/trunk/java/org/apache/catalina/webresources/WarURLConnection.java

tomcat/tc8.0.x/trunk/java/org/apache/catalina/webresources/WarURLStreamHandler.java

tomcat/tc8.0.x/trunk/test/org/apache/catalina/webresources/TestWarURLStreamHandler.java

Propchange: tomcat/tc8.0.x/trunk/
--
--- svn:mergeinfo (original)
+++ svn:mergeinfo Tue Oct  4 11:29:43 2016
@@ -1,2 +1,2 @@
 
/tomcat/tc8.5.x/trunk:1735042,1737966,1743139-1743140,1744151,1747537,1747925,1748002,1754614,1754643,1762124,1762183,1762203
-/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

svn commit: r1763262 - in /tomcat/tc8.5.x/trunk: ./ java/org/apache/catalina/webresources/WarURLConnection.java java/org/apache/catalina/webresources/WarURLStreamHandler.java test/org/apache/catalina/

2016-10-04 Thread markt

Author: markt
Date: Tue Oct  4 11:29:31 2016
New Revision: 1763262

URL: http://svn.apache.org/viewvc?rev=1763262=rev
Log:
Further preparation for fixing BZ 60087.
With the war->jar conversion taking place in the WarURLStreamHandler, a URL 
constructed from a String would have an external form that was not that same as 
the original String.
Resolve this by moving the conversion of the war URL to a jar URL to the 
WarURLConnection and add some unit tests to confirm the behavior is now as 
expected. 

Modified:
tomcat/tc8.5.x/trunk/   (props changed)

tomcat/tc8.5.x/trunk/java/org/apache/catalina/webresources/WarURLConnection.java

tomcat/tc8.5.x/trunk/java/org/apache/catalina/webresources/WarURLStreamHandler.java

tomcat/tc8.5.x/trunk/test/org/apache/catalina/webresources/TestWarURLStreamHandler.java

Propchange: tomcat/tc8.5.x/trunk/
--
--- svn:mergeinfo (original)
+++ svn:mergeinfo Tue Oct  4 11:29:31 2016
@@ -1 +1 @@
-/tomcat/trunk:1734785,1734799,1734845,1734928,1735041,1735044,1735480,1735577,1735597,1735599-1735600,1735615,1736145,1736162,1736209,1736280,1736297,1736299,1736489,1736646,1736703,1736836,1736849,1737104-1737105,1737112,1737117,1737119-1737120,1737155,1737157,1737192,1737280,1737339,1737632,1737664,1737715,1737748,1737785,1737834,1737860,1737903,1737959,1738005,1738007,1738014-1738015,1738018,1738022,1738039,1738043,1738059-1738060,1738147,1738149,1738174-1738175,1738261,1738589,1738623-1738625,1738643,1738816,1738850,1738855,1738946-1738948,1738953-1738954,1738979,1738982,1739079-1739081,1739087,1739113,1739153,1739172,1739176,1739191,1739474,1739726,1739762,1739775,1739814,1739817-1739818,1739975,1740131,1740324,1740465,1740495,1740508-1740509,1740520,1740535,1740707,1740803,1740810,1740969,1740980,1740991,1740997,1741015,1741033,1741036,1741058,1741060,1741080,1741147,1741159,1741164,1741173,1741181,1741190,1741197,1741202,1741208,1741213,1741221,1741225,1741232,1741409,1741501
 
,1741677,1741892,1741896,1741984,1742023,1742042,1742071,1742090,1742093,1742101,1742105,1742111,1742139,1742146,1742148,1742166,1742181,1742184,1742187,1742246,1742248-1742251,1742263-1742264,1742268,1742276,1742369,1742387,1742448,1742509-1742512,1742917,1742919,1742933,1742975-1742976,1742984,1742986,1743019,1743115,1743117,1743124-1743125,1743134,1743425,1743554,1743679,1743696-1743698,1743700-1743701,1744058,1744064-1744065,1744125,1744194,1744229,1744270,1744323,1744432,1744684,1744697,1744705,1744713,1744760,1744786,1745083,1745142-1745143,1745145,1745177,1745179-1745180,1745227,1745248,1745254,1745337,1745467,1745473,1745576,1745735,1745744,1746304,1746306-1746307,1746319,1746327,1746338,1746340-1746341,1746344,1746427,1746441,1746473,1746490,1746492,1746495-1746496,1746499-1746501,1746503-1746507,1746509,1746549,1746551,1746554,1746556,1746558,1746584,1746620,1746649,1746724,1746939,1746989,1747014,1747028,1747035,1747210,1747225,1747234,1747253,1747404,1747506,1747536,1747
 
924,1747980,1747993,1748001,1748253,1748452,1748547,1748629,1748676,1748715,1749287,1749296,1749328,1749373,1749465,1749506,1749508,1749665-1749666,1749763,1749865-1749866,1749898,1749978,1749980,1750011,1750015,1750056,1750480,1750617,1750634,1750692,1750697,1750700,1750703,1750707,1750714,1750718,1750723,1750774,1750899,1750975,1750995,1751061,1751097,1751173,1751438,1751447,1751463,1751702,1752212,1752737,1752745,1753078,1753080,1753358,1753363,1754111,1754140-1754141,1754281,1754310,1754445,1754467,1754494,1754496,1754528,1754532-1754533,1754613,1754714,1754874,1754941,1754944,1754950-1754951,1755005,1755007,1755009,1755132,1755180-1755181,1755185,1755190,1755204-1755206,1755208,1755214,1755224,1755227,1755230,1755629,1755646-1755647,1755650,1755653,1755675,1755680,1755683,1755693,1755717,1755731-1755737,1755812,1755828,1755884,1755890,1755918-1755919,1755942,1755958,1755960,1755970,1755993,1756013,1756019,1756039,1756056,1756083-1756114,1756175,1756288-1756289,1756408-1756410,1
 
756778,1756798,1756878,1756898,1756939,1757123-1757124,1757126,1757128,1757132-1757133,1757136,1757145,1757167-1757168,1757175,1757180,1757182,1757195,1757271,1757278,1757347,1757353-1757354,1757363,1757374,1757399,1757406,1757408,1757485,1757495,1757499,1757527,1757578,1757684,1757722,1757727,1757853,1757903,1757997,1758072-1758075,1758078-1758079,1758292,1758369,1758423,1758425-1758427,1758430,1758459,1758483,1758486-1758487,1758499,1758525,1758556,1758582,1758584,1758588,1758842,1759019,1759212,1759224,1759227,1759252,1759274,1759513-1759516,1759611,1760005,1760022,1760300,1760397,1760446,1760454,1760640,1760648,1761057,1761422,1761491,1761498,1761500-1761501,1761550,1761553,1761572,1761574,1761625-1761626,1761628,1761682,1761740,1761752,1762123,1762168,1762172,1762182,1762202,1762288,1762296,1762348,1762353,1762374,1762503,1762505,1762541,1762608,1762710,1762753,1762766,1762769,1762944,1762947,1762953,1763167,1763232

svn commit: r1763259 - in /tomcat/trunk: java/org/apache/catalina/webresources/ java/org/apache/catalina/webresources/war/ test/org/apache/catalina/webresources/ test/org/apache/catalina/webresources/

2016-10-04 Thread markt

Author: markt
Date: Tue Oct  4 11:01:44 2016
New Revision: 1763259

URL: http://svn.apache.org/viewvc?rev=1763259=rev
Log:
Move the WAR handling code to a separate package to provide the option to 
register it via the java.protocol.handler.pkgs system property

Added:
tomcat/trunk/java/org/apache/catalina/webresources/war/
tomcat/trunk/java/org/apache/catalina/webresources/war/Handler.java
  - copied, changed from r1763193, 
tomcat/trunk/java/org/apache/catalina/webresources/WarURLStreamHandler.java
tomcat/trunk/java/org/apache/catalina/webresources/war/WarURLConnection.java
  - copied, changed from r1763255, 
tomcat/trunk/java/org/apache/catalina/webresources/WarURLConnection.java
tomcat/trunk/test/org/apache/catalina/webresources/war/
tomcat/trunk/test/org/apache/catalina/webresources/war/TestHandler.java
  - copied, changed from r1763193, 
tomcat/trunk/test/org/apache/catalina/webresources/TestWarURLStreamHandler.java

tomcat/trunk/test/org/apache/catalina/webresources/war/TestHandlerIntegration.java
  - copied, changed from r1763193, 
tomcat/trunk/test/org/apache/catalina/webresources/TestWarURLStreamHandlerIntegration.java

tomcat/trunk/test/org/apache/catalina/webresources/war/TestWarURLConnection.java
  - copied, changed from r1763193, 
tomcat/trunk/test/org/apache/catalina/webresources/TestWarURLConnection.java
Removed:
tomcat/trunk/java/org/apache/catalina/webresources/WarURLConnection.java
tomcat/trunk/java/org/apache/catalina/webresources/WarURLStreamHandler.java
tomcat/trunk/test/org/apache/catalina/webresources/TestWarURLConnection.java

tomcat/trunk/test/org/apache/catalina/webresources/TestWarURLStreamHandler.java

tomcat/trunk/test/org/apache/catalina/webresources/TestWarURLStreamHandlerIntegration.java
Modified:

tomcat/trunk/java/org/apache/catalina/webresources/TomcatURLStreamHandlerFactory.java

Modified: 
tomcat/trunk/java/org/apache/catalina/webresources/TomcatURLStreamHandlerFactory.java
URL: 
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/webresources/TomcatURLStreamHandlerFactory.java?rev=1763259=1763258=1763259=diff
==
--- 
tomcat/trunk/java/org/apache/catalina/webresources/TomcatURLStreamHandlerFactory.java
 (original)
+++ 
tomcat/trunk/java/org/apache/catalina/webresources/TomcatURLStreamHandlerFactory.java
 Tue Oct  4 11:01:44 2016
@@ -22,6 +22,8 @@ import java.net.URLStreamHandlerFactory;
 import java.util.List;
 import java.util.concurrent.CopyOnWriteArrayList;
 
+import org.apache.catalina.webresources.war.Handler;
+
 public class TomcatURLStreamHandlerFactory implements URLStreamHandlerFactory {
 
 private static final String WAR_PROTOCOL = "war";
@@ -155,7 +157,7 @@ public class TomcatURLStreamHandlerFacto
 // Tomcat's handler always takes priority so applications can't 
override
 // it.
 if (WAR_PROTOCOL.equals(protocol)) {
-return new WarURLStreamHandler();
+return new Handler();
 } else if (CLASSPTH_PROTOCOL.equals(protocol)) {
 return new ClasspathURLStreamHandler();
 }

Copied: tomcat/trunk/java/org/apache/catalina/webresources/war/Handler.java 
(from r1763193, 
tomcat/trunk/java/org/apache/catalina/webresources/WarURLStreamHandler.java)
URL: 
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/webresources/war/Handler.java?p2=tomcat/trunk/java/org/apache/catalina/webresources/war/Handler.java=tomcat/trunk/java/org/apache/catalina/webresources/WarURLStreamHandler.java=1763193=1763259=1763259=diff
==
--- tomcat/trunk/java/org/apache/catalina/webresources/WarURLStreamHandler.java 
(original)
+++ tomcat/trunk/java/org/apache/catalina/webresources/war/Handler.java Tue Oct 
 4 11:01:44 2016
@@ -14,14 +14,14 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.apache.catalina.webresources;
+package org.apache.catalina.webresources.war;
 
 import java.io.IOException;
 import java.net.URL;
 import java.net.URLConnection;
 import java.net.URLStreamHandler;
 
-public class WarURLStreamHandler extends URLStreamHandler {
+public class Handler extends URLStreamHandler {
 
 @Override
 protected URLConnection openConnection(URL u) throws IOException {

Copied: 
tomcat/trunk/java/org/apache/catalina/webresources/war/WarURLConnection.java 
(from r1763255, 
tomcat/trunk/java/org/apache/catalina/webresources/WarURLConnection.java)
URL: 
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/webresources/war/WarURLConnection.java?p2=tomcat/trunk/java/org/apache/catalina/webresources/war/WarURLConnection.java=tomcat/trunk/java/org/apache/catalina/webresources/WarURLConnection.java=1763255=1763259=1763259=diff

[Bug 60199] New: Improve error message if a session attribute could not load due to deserialization problems

2016-10-04 Thread bugzilla

https://bz.apache.org/bugzilla/show_bug.cgi?id=60199

Bug ID: 60199
   Summary: Improve error message if a session attribute could not
load due to deserialization problems
   Product: Tomcat 8
   Version: 8.0.37
  Hardware: PC
Status: NEW
  Severity: normal
  Priority: P2
 Component: Catalina
  Assignee: dev@tomcat.apache.org
  Reporter: igor.muk...@gmx.de

Again and again I find myself in searching for classes that do not implement
Serializable interface but are set into session. When you have such a class you
just see in the log at tomcat start that there was a problem while
deserializing the session object. I would be very helpful if the log would say
which attribute have caused the problem.

Sample implementation StandardSession.java in doReadObject(ObjectInputStream
stream):

Instead of:

for (int i = 0; i < n; i++) {
String name = (String) stream.readObject();
Object value = stream.readObject();
if ((value instanceof String) && (value.equals(NOT_SERIALIZED)))
continue;
if (manager.getContext().getLogger().isDebugEnabled())
manager.getContext().getLogger().debug("  loading attribute '"
+ name +
"' with value '" + value + "'");
attributes.put(name, value);
}

do:


for (int i = 0; i < n; i++) {
String name = (String) stream.readObject();

Object value = null;
try {
value = stream.readObject();
} catch (Exception e) {
manager.getContext().getLogger().error(String.format("Attribute
%s could not be deserialized due to %s", name, e.getMessage()));
}

if ((value instanceof String) && (value.equals(NOT_SERIALIZED)))
continue;

if (manager.getContext().getLogger().isDebugEnabled())
manager.getContext().getLogger().debug("  loading attribute '"
+ name +
"' with value '" + value + "'");
attributes.put(name, value);
}

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

[GUMP@vmgump]: Project tomcat-trunk-test-apr (in module tomcat-trunk) failed

2016-10-04 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-trunk-test-apr 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-test-apr :  Tomcat 9.x, a web server implementing the Java 
Servlet 4.0,
...


Full details are available at:

http://vmgump.apache.org/gump/public/tomcat-trunk/tomcat-trunk-test-apr/index.html

That said, some information snippets are provided here.

The following annotations (debug/informational/warning/error messages) were 
provided:
 -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.
 -INFO- Failed with reason build failed
 -INFO- Project Reports in: 
/srv/gump/public/workspace/tomcat-trunk/output/logs-APR
 -INFO- Project Reports in: 
/srv/gump/public/workspace/tomcat-trunk/output/test-tmp-APR/logs
 -WARNING- No directory 
[/srv/gump/public/workspace/tomcat-trunk/output/test-tmp-APR/logs]



The following work was performed:
http://vmgump.apache.org/gump/public/tomcat-trunk/tomcat-trunk-test-apr/gump_work/build_tomcat-trunk_tomcat-trunk-test-apr.html
Work Name: build_tomcat-trunk_tomcat-trunk-test-apr (Type: Build)
Work ended in a state of : Failed
Elapsed: 28 mins 51 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 
-Dbase.path=/srv/gump/public/workspace/tomcat-trunk/tomcat-build-libs 
-Dtest.temp=output/test-tmp-APR 
-Djunit.jar=/srv/gump/public/workspace/junit/target/junit-4.13-SNAPSHOT.jar 
-Dtest.accesslog=true 
-Dobjenesis.jar=/srv/gump/public/workspace/objenesis/main/target/objenesis-2.5-SNAPSHOT.jar
 -Dexamples.sources.skip=true 
-Dcommons-daemon.jar=/srv/gump/public/workspace/apache-commons/daemon/dist/commons-daemon-20161004.jar
 
-Dtest.openssl.path=/srv/gump/public/workspace/openssl-master/dest-20161004/bin/openssl
 -Dexecute.test.nio=false 
-Dhamcrest.jar=/srv/gump/packages/hamcrest/hamcrest-core-1.3.jar 
-Dexecute.test.apr=true -Dexecute.test.nio2=false 
-Dcommons-daemon.native.src.tgz=/srv/gump/public/workspace/apache-commons/daemon/dist/bin/commons-daemon-20161004-native-src.tar.gz
 -Dtest.reports=output/logs-APR -Dtomc
 
at-native.tar.gz=/srv/gump/public/workspace/apache-commons/daemon/dist/bin/commons-daemon-20161004-native-src.tar.gz
 -Djdt.jar=/srv/gump/packages/eclipse/plugins/R-4.5-201506032000/ecj-4.5.jar 
-Dtest.apr.loc=/srv/gump/public/workspace/tomcat-native-trunk/dest-20161004/lib 
-Dtest.relaxTiming=true -Dtest.excludePerformance=true 
-Djava.net.preferIPv4Stack=/srv/gump/public/workspace/tomcat-trunk/true 
-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-trunk]
CLASSPATH: 
/usr/lib/jvm/java-8-oracle/lib/tools.jar:/srv/gump/public/workspace/tomcat-trunk/output/build/webapps/examples/WEB-INF/classes:/srv/gump/public/workspace/tomcat-trunk/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-trunk/output/build/bin/bootstrap.jar:/srv/gump/public/workspace/tomcat-trunk/output/build/bin/tomcat-juli.jar:/srv/gump/public/workspace/tomcat-trunk/output/build/lib/annotations-api.jar:/srv/gump/public/workspace/tomcat-trunk/output/build/lib/servlet-api.ja
 
r:/srv/gump/public/workspace/tomcat-trunk/output/build/lib/jsp-api.jar:/srv/gump/public/workspace/tomcat-trunk/output/build/lib/el-api.jar:/srv/gump/public/workspace/tomcat-trunk/output/build/lib/websocket-api.jar:/srv/gump/public/workspace/tomcat-trunk/output/build/lib/jaspic-api.jar:/srv/gump/public/workspace/tomcat-trunk/output/build/lib/catalina.jar:/srv/gump/public/workspace/tomcat-trunk/output/build/lib/catalina-ant.jar:/srv/gump/public/workspace/tomcat-trunk/output/build/lib/catalina-storeconfig.jar:/srv/gump/public/workspace/tomcat-trunk/output/build/lib/tomcat-coyote.jar:/srv/gump/public/workspace/tomcat-trunk/output/build/lib/jasper.jar:/srv/gump/public/workspace/tomcat-trunk/output/build/lib/jasper-el.jar

buildbot success in on tomcat-7-trunk

2016-10-04 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/564

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

svn commit: r1763237 - in /tomcat/tc6.0.x/trunk: ./ java/org/apache/naming/factory/ResourceLinkFactory.java webapps/docs/changelog.xml

2016-10-04 Thread markt

Author: markt
Date: Tue Oct  4 06:46:40 2016
New Revision: 1763237

URL: http://svn.apache.org/viewvc?rev=1763237=rev
Log:
Improve the access checks for linked global resources to handle the case where 
the current class loader is a child of the web application class loader.

Modified:
tomcat/tc6.0.x/trunk/   (props changed)
tomcat/tc6.0.x/trunk/java/org/apache/naming/factory/ResourceLinkFactory.java
tomcat/tc6.0.x/trunk/webapps/docs/changelog.xml

Propchange: tomcat/tc6.0.x/trunk/
--
--- svn:mergeinfo (original)
+++ svn:mergeinfo Tue Oct  4 06:46:40 2016
@@ -1,4 +1,4 @@
-/tomcat/tc7.0.x/trunk:1190476,1224802,1243045,1298635,1304471,1311997,1312007,1331772,1333164,1333176,1348992,1354866,1371298,1371302,1371620,1402110,1409014,1413553,1413557,1413563,1430083,1438415,1446641-1446660,1447013,1453106,1453119,1484919,1486877,1500065,1503852,1505844,1513151,1521040,1524796,1526470,1536524,1539176-1539177,1544469,1544473,1552805,1558894,1558917,1561368,1561382,1561386,1561552,1561561,1561636,1561641,1561643,1561737,1562748,1564317,1568922,1570163,1577328,1577464-1577465,1578814,1586659,1586897,1586960,1588199,1588997,1589740,1589851,1589997,1590019,1590028,1590337,1590492,1590651,1590838,1590845,1590848,1590912,1593262,1593288,1593371,1593835,1594230,1595174,1595366,1600956,1601333,1601856,1601909,1609079,1609606,1617364,1617374,1617433,1617457-1617458,1624249,1626579,1627420,1627469,1632586,1637686,1637711,1640675,1642045,1643515,1643540,1643572,1643585-1643586,1643642,1643647,1644019,1648817,1656301,1658815,1659523,1659564,1664001,1664176,1665087,1666968
 
,1666989,1668541,1668635,1669802,1676557,1681183,1681841,1681865,1681867,1685829,1693109,1694293,1694433,1694875,1696381,1701945,1710353,1712656,1713873,1714000,1714005,1714540,1715213,1716221,1716417,1717107,1717210,1717212,1720236,1720398,1720443,1720464,1721814,1721883,1722645,1722801,1723151,1724435,1724553,1724675,1724797,1724806,1725931,1726631,1726808,1726813,1726815,1726817,1726819,1726917,1726919,1726922-1726924,1727031,1727034,1727043,1727158,1727672,1727903,1728450,1729363,1731010,1731119,1731956,1731978,1732362,1732674-1732675,1733942,1734116,1734134,1734532,1737249,1737253,1737968,1738049,1738186,1739778,1741178,1741184,1741193,1741211,1741218,1741228,1741235,1742281,1743121,1743142,1743649,1744061,1744129,1744155,1744241,1744383,1744689,1745230,1746942,1746994,1749377,1750018,1750980,1751066,1754114,1754147,1754728,1754880,1754891,1754898,1754902,1756030,1756417,1756420,1756423,1756942,1757275,1757284,1757503,1758490,1758495,1761631,1761748,1762772
+/tomcat/tc7.0.x/trunk:1190476,1224802,1243045,1298635,1304471,1311997,1312007,1331772,1333164,1333176,1348992,1354866,1371298,1371302,1371620,1402110,1409014,1413553,1413557,1413563,1430083,1438415,1446641-1446660,1447013,1453106,1453119,1484919,1486877,1500065,1503852,1505844,1513151,1521040,1524796,1526470,1536524,1539176-1539177,1544469,1544473,1552805,1558894,1558917,1561368,1561382,1561386,1561552,1561561,1561636,1561641,1561643,1561737,1562748,1564317,1568922,1570163,1577328,1577464-1577465,1578814,1586659,1586897,1586960,1588199,1588997,1589740,1589851,1589997,1590019,1590028,1590337,1590492,1590651,1590838,1590845,1590848,1590912,1593262,1593288,1593371,1593835,1594230,1595174,1595366,1600956,1601333,1601856,1601909,1609079,1609606,1617364,1617374,1617433,1617457-1617458,1624249,1626579,1627420,1627469,1632586,1637686,1637711,1640675,1642045,1643515,1643540,1643572,1643585-1643586,1643642,1643647,1644019,1648817,1656301,1658815,1659523,1659564,1664001,1664176,1665087,1666968
 
,1666989,1668541,1668635,1669802,1676557,1681183,1681841,1681865,1681867,1685829,1693109,1694293,1694433,1694875,1696381,1701945,1710353,1712656,1713873,1714000,1714005,1714540,1715213,1716221,1716417,1717107,1717210,1717212,1720236,1720398,1720443,1720464,1721814,1721883,1722645,1722801,1723151,1724435,1724553,1724675,1724797,1724806,1725931,1726631,1726808,1726813,1726815,1726817,1726819,1726917,1726919,1726922-1726924,1727031,1727034,1727043,1727158,1727672,1727903,1728450,1729363,1731010,1731119,1731956,1731978,1732362,1732674-1732675,1733942,1734116,1734134,1734532,1737249,1737253,1737968,1738049,1738186,1739778,1741178,1741184,1741193,1741211,1741218,1741228,1741235,1742281,1743121,1743142,1743649,1744061,1744129,1744155,1744241,1744383,1744689,1745230,1746942,1746994,1749377,1750018,1750980,1751066,1754114,1754147,1754728,1754880,1754891,1754898,1754902,1756030,1756417,1756420,1756423,1756942,1757275,1757284,1757503,1758490,1758495,1761631,1761748,1762772,1763236

svn commit: r1763236 - in /tomcat/tc7.0.x/trunk: ./ java/org/apache/naming/factory/ResourceLinkFactory.java webapps/docs/changelog.xml

2016-10-04 Thread markt

Author: markt
Date: Tue Oct  4 06:45:11 2016
New Revision: 1763236

URL: http://svn.apache.org/viewvc?rev=1763236=rev
Log:
Improve the access checks for linked global resources to handle the case where 
the current class loader is a child of the web application class loader.

Modified:
tomcat/tc7.0.x/trunk/   (props changed)
tomcat/tc7.0.x/trunk/java/org/apache/naming/factory/ResourceLinkFactory.java
tomcat/tc7.0.x/trunk/webapps/docs/changelog.xml

Propchange: tomcat/tc7.0.x/trunk/
--
--- svn:mergeinfo (original)
+++ svn:mergeinfo Tue Oct  4 06:45:11 2016
@@ -1,3 +1,3 @@
 
/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,1681703,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,1702
 
742,1702744,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,1715866,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,1
 
726171-1726173,1726175,1726179-1726182,1726190-1726191,1726195-1726200,1726203,1726226,1726576,1726630,1726992,1727029,1727037,1727671,1727676,1727900,1728028,1728092,1728439,1728449,1729186,1729362,1731009,1731303,1731867,1731872,1731874,1731876,1731885,1731947,1731955,1731959,1731977,1731984,1732360,1732490,1732672,1732902,1733166,1733603,1733619,1733735,1733752,1733764,1733915,1733941,1733964,1734115,1734133,1734261,1734421,1734531,1736286,1737967,1738173,1738182,1738992,1739039,1739089-1739091,1739294,1739777,1739821,1739981,1740513,1740726,1741019,1741162,1741217,1743647,1743681,1744152,1744272,1746732,1746750,1752739,1754615,1755886,1756018,1759565,1761686,1762173,1762206

svn commit: r1763234 - in /tomcat/tc8.0.x/trunk: ./ java/org/apache/naming/factory/ResourceLinkFactory.java webapps/docs/changelog.xml

2016-10-04 Thread markt

Author: markt
Date: Tue Oct  4 06:40:54 2016
New Revision: 1763234

URL: http://svn.apache.org/viewvc?rev=1763234=rev
Log:
Improve the access checks for linked global resources to handle the case where 
the current class loader is a child of the web application class loader.

Modified:
tomcat/tc8.0.x/trunk/   (props changed)
tomcat/tc8.0.x/trunk/java/org/apache/naming/factory/ResourceLinkFactory.java
tomcat/tc8.0.x/trunk/webapps/docs/changelog.xml

Propchange: tomcat/tc8.0.x/trunk/
--
--- svn:mergeinfo (original)
+++ svn:mergeinfo Tue Oct  4 06:40:54 2016
@@ -1,2 +1,2 @@
 
/tomcat/tc8.5.x/trunk:1735042,1737966,1743139-1743140,1744151,1747537,1747925,1748002,1754614,1754643,1762124,1762183,1762203
-/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

svn commit: r1763233 - in /tomcat/tc8.5.x/trunk: ./ java/org/apache/naming/factory/ResourceLinkFactory.java webapps/docs/changelog.xml

2016-10-04 Thread markt

Author: markt
Date: Tue Oct  4 06:40:32 2016
New Revision: 1763233

URL: http://svn.apache.org/viewvc?rev=1763233=rev
Log:
Improve the access checks for linked global resources to handle the case where 
the current class loader is a child of the web application class loader.

Modified:
tomcat/tc8.5.x/trunk/   (props changed)
tomcat/tc8.5.x/trunk/java/org/apache/naming/factory/ResourceLinkFactory.java
tomcat/tc8.5.x/trunk/webapps/docs/changelog.xml

Propchange: tomcat/tc8.5.x/trunk/
--
--- svn:mergeinfo (original)
+++ svn:mergeinfo Tue Oct  4 06:40:32 2016
@@ -1 +1 @@
-/tomcat/trunk:1734785,1734799,1734845,1734928,1735041,1735044,1735480,1735577,1735597,1735599-1735600,1735615,1736145,1736162,1736209,1736280,1736297,1736299,1736489,1736646,1736703,1736836,1736849,1737104-1737105,1737112,1737117,1737119-1737120,1737155,1737157,1737192,1737280,1737339,1737632,1737664,1737715,1737748,1737785,1737834,1737860,1737903,1737959,1738005,1738007,1738014-1738015,1738018,1738022,1738039,1738043,1738059-1738060,1738147,1738149,1738174-1738175,1738261,1738589,1738623-1738625,1738643,1738816,1738850,1738855,1738946-1738948,1738953-1738954,1738979,1738982,1739079-1739081,1739087,1739113,1739153,1739172,1739176,1739191,1739474,1739726,1739762,1739775,1739814,1739817-1739818,1739975,1740131,1740324,1740465,1740495,1740508-1740509,1740520,1740535,1740707,1740803,1740810,1740969,1740980,1740991,1740997,1741015,1741033,1741036,1741058,1741060,1741080,1741147,1741159,1741164,1741173,1741181,1741190,1741197,1741202,1741208,1741213,1741221,1741225,1741232,1741409,1741501
 
,1741677,1741892,1741896,1741984,1742023,1742042,1742071,1742090,1742093,1742101,1742105,1742111,1742139,1742146,1742148,1742166,1742181,1742184,1742187,1742246,1742248-1742251,1742263-1742264,1742268,1742276,1742369,1742387,1742448,1742509-1742512,1742917,1742919,1742933,1742975-1742976,1742984,1742986,1743019,1743115,1743117,1743124-1743125,1743134,1743425,1743554,1743679,1743696-1743698,1743700-1743701,1744058,1744064-1744065,1744125,1744194,1744229,1744270,1744323,1744432,1744684,1744697,1744705,1744713,1744760,1744786,1745083,1745142-1745143,1745145,1745177,1745179-1745180,1745227,1745248,1745254,1745337,1745467,1745473,1745576,1745735,1745744,1746304,1746306-1746307,1746319,1746327,1746338,1746340-1746341,1746344,1746427,1746441,1746473,1746490,1746492,1746495-1746496,1746499-1746501,1746503-1746507,1746509,1746549,1746551,1746554,1746556,1746558,1746584,1746620,1746649,1746724,1746939,1746989,1747014,1747028,1747035,1747210,1747225,1747234,1747253,1747404,1747506,1747536,1747
 
924,1747980,1747993,1748001,1748253,1748452,1748547,1748629,1748676,1748715,1749287,1749296,1749328,1749373,1749465,1749506,1749508,1749665-1749666,1749763,1749865-1749866,1749898,1749978,1749980,1750011,1750015,1750056,1750480,1750617,1750634,1750692,1750697,1750700,1750703,1750707,1750714,1750718,1750723,1750774,1750899,1750975,1750995,1751061,1751097,1751173,1751438,1751447,1751463,1751702,1752212,1752737,1752745,1753078,1753080,1753358,1753363,1754111,1754140-1754141,1754281,1754310,1754445,1754467,1754494,1754496,1754528,1754532-1754533,1754613,1754714,1754874,1754941,1754944,1754950-1754951,1755005,1755007,1755009,1755132,1755180-1755181,1755185,1755190,1755204-1755206,1755208,1755214,1755224,1755227,1755230,1755629,1755646-1755647,1755650,1755653,1755675,1755680,1755683,1755693,1755717,1755731-1755737,1755812,1755828,1755884,1755890,1755918-1755919,1755942,1755958,1755960,1755970,1755993,1756013,1756019,1756039,1756056,1756083-1756114,1756175,1756288-1756289,1756408-1756410,1
 
756778,1756798,1756878,1756898,1756939,1757123-1757124,1757126,1757128,1757132-1757133,1757136,1757145,1757167-1757168,1757175,1757180,1757182,1757195,1757271,1757278,1757347,1757353-1757354,1757363,1757374,1757399,1757406,1757408,1757485,1757495,1757499,1757527,1757578,1757684,1757722,1757727,1757853,1757903,1757997,1758072-1758075,1758078-1758079,1758292,1758369,1758423,1758425-1758427,1758430,1758459,1758483,1758486-1758487,1758499,1758525,1758556,1758582,1758584,1758588,1758842,1759019,1759212,1759224,1759227,1759252,1759274,1759513-1759516,1759611,1760005,1760022,1760300,1760397,1760446,1760454,1760640,1760648,1761057,1761422,1761491,1761498,1761500-1761501,1761550,1761553,1761572,1761574,1761625-1761626,1761628,1761682,1761740,1761752,1762123,1762168,1762172,1762182,1762202,1762288,1762296,1762348,1762353,1762374,1762503,1762505,1762541,1762608,1762710,1762753,1762766,1762769,1762944,1762947,1762953,1763167

svn commit: r1763232 - in /tomcat/trunk: java/org/apache/naming/factory/ResourceLinkFactory.java webapps/docs/changelog.xml

2016-10-04 Thread markt

Author: markt
Date: Tue Oct  4 06:39:10 2016
New Revision: 1763232

URL: http://svn.apache.org/viewvc?rev=1763232=rev
Log:
Improve the access checks for linked global resources to handle the case where 
the current class loader is a child of the web application class loader.

Modified:
tomcat/trunk/java/org/apache/naming/factory/ResourceLinkFactory.java
tomcat/trunk/webapps/docs/changelog.xml

Modified: tomcat/trunk/java/org/apache/naming/factory/ResourceLinkFactory.java
URL: 
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/naming/factory/ResourceLinkFactory.java?rev=1763232=1763231=1763232=diff
==
--- tomcat/trunk/java/org/apache/naming/factory/ResourceLinkFactory.java 
(original)
+++ tomcat/trunk/java/org/apache/naming/factory/ResourceLinkFactory.java Tue 
Oct  4 06:39:10 2016
@@ -109,9 +109,12 @@ public class ResourceLinkFactory impleme
 
 private static boolean validateGlobalResourceAccess(String globalName) {
 ClassLoader cl = Thread.currentThread().getContextClassLoader();
-Map registrations = globalResourceRegistrations.get(cl);
-if (registrations != null && registrations.containsValue(globalName)) {
-return true;
+while (cl != null) {
+Map registrations = 
globalResourceRegistrations.get(cl);
+if (registrations != null && 
registrations.containsValue(globalName)) {
+return true;
+}
+cl = cl.getParent();
 }
 return false;
 }

Modified: tomcat/trunk/webapps/docs/changelog.xml
URL: 
http://svn.apache.org/viewvc/tomcat/trunk/webapps/docs/changelog.xml?rev=1763232=1763231=1763232=diff
==
--- tomcat/trunk/webapps/docs/changelog.xml (original)
+++ tomcat/trunk/webapps/docs/changelog.xml Tue Oct  4 06:39:10 2016
@@ -102,6 +102,11 @@
 When starting web resources, ensure that class resources are only
 started once. (markt)
   
+  
+Improve the access checks for linked global resources to handle the 
case
+where the current class loader is a child of the web application class
+loader. (markt)
+  
 
   
   



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

[Bug 60199] Improve error message if a session attribute could not load due to deserialization problems

svn commit: r1763320 - in /tomcat/trunk/bin: catalina.bat catalina.sh

svn commit: r1763319 - in /tomcat/trunk: bin/catalina.bat bin/catalina.sh build.xml

[Bug 60202] Failed LDAP connection triggers lockout realm

[Bug 60202] Failed LDAP connection triggers lockout realm

Re: ECJ and Java 9

Re: ECJ and Java 9

ECJ and Java 9

[Bug 60202] Failed LDAP connection triggers lockout realm

Re: Early Access build 136 for JDK 9 & JDK 9 with Project Jigsaw are available on java.net

[Bug 60202] Failed LDAP connection triggers lockout realm

[Bug 60199] Improve error message if a session attribute could not load due to deserialization problems

[Bug 60193] A child container failed during start

[Bug 60202] Failed LDAP connection triggers lockout realm

[Bug 60202] New: Failed LDAP connection triggers lockout realm

[GUMP@vmgump]: Project tomcat-trunk-validate (in module tomcat-trunk) failed

svn commit: r1763277 - /tomcat/trunk/webapps/docs/security-manager-howto.xml

svn commit: r1763276 - /tomcat/trunk/build.xml

svn commit: r1763272 - /tomcat/trunk/build.xml

svn commit: r1763271 - /tomcat/trunk/build.xml

buildbot success in on tomcat-8-trunk

buildbot failure in on tomcat-8-trunk

svn commit: r1763266 - in /tomcat/tc8.0.x/trunk: ./ java/org/apache/catalina/webresources/ java/org/apache/catalina/webresources/war/ test/org/apache/catalina/webresources/ test/org/apache/catalina/we

svn commit: r1763265 - in /tomcat/tc8.5.x/trunk: ./ java/org/apache/catalina/webresources/ java/org/apache/catalina/webresources/war/ test/org/apache/catalina/webresources/ test/org/apache/catalina/we

svn commit: r1763264 - in /tomcat/tc8.0.x/trunk: ./ java/org/apache/catalina/webresources/WarURLConnection.java java/org/apache/catalina/webresources/WarURLStreamHandler.java test/org/apache/catalina/

svn commit: r1763262 - in /tomcat/tc8.5.x/trunk: ./ java/org/apache/catalina/webresources/WarURLConnection.java java/org/apache/catalina/webresources/WarURLStreamHandler.java test/org/apache/catalina/

svn commit: r1763259 - in /tomcat/trunk: java/org/apache/catalina/webresources/ java/org/apache/catalina/webresources/war/ test/org/apache/catalina/webresources/ test/org/apache/catalina/webresources/

[Bug 60199] New: Improve error message if a session attribute could not load due to deserialization problems

[GUMP@vmgump]: Project tomcat-trunk-test-apr (in module tomcat-trunk) failed

buildbot success in on tomcat-7-trunk

svn commit: r1763237 - in /tomcat/tc6.0.x/trunk: ./ java/org/apache/naming/factory/ResourceLinkFactory.java webapps/docs/changelog.xml

svn commit: r1763236 - in /tomcat/tc7.0.x/trunk: ./ java/org/apache/naming/factory/ResourceLinkFactory.java webapps/docs/changelog.xml

svn commit: r1763234 - in /tomcat/tc8.0.x/trunk: ./ java/org/apache/naming/factory/ResourceLinkFactory.java webapps/docs/changelog.xml

svn commit: r1763233 - in /tomcat/tc8.5.x/trunk: ./ java/org/apache/naming/factory/ResourceLinkFactory.java webapps/docs/changelog.xml

svn commit: r1763232 - in /tomcat/trunk: java/org/apache/naming/factory/ResourceLinkFactory.java webapps/docs/changelog.xml

35 matches

Site Navigation

Mail list logo

Footer information