date:20180509

Re: svn commit: r1830392 - in /tomcat/tc8.5.x/tags/TOMCAT_8_5_31: ./ build.properties.default webapps/docs/changelog.xml

2018-05-09 Thread Rainer Jung


Am 27.04.2018 um 21:57 schrieb ma...@apache.org:

Author: markt
Date: Fri Apr 27 19:57:27 2018
New Revision: 1830392

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


...


Modified: tomcat/tc8.5.x/tags/TOMCAT_8_5_31/webapps/docs/changelog.xml
URL: 
http://svn.apache.org/viewvc/tomcat/tc8.5.x/tags/TOMCAT_8_5_31/webapps/docs/changelog.xml?rev=1830392&r1=1830391&r2=1830392&view=diff
==
--- tomcat/tc8.5.x/tags/TOMCAT_8_5_31/webapps/docs/changelog.xml (original)
+++ tomcat/tc8.5.x/tags/TOMCAT_8_5_31/webapps/docs/changelog.xml Fri Apr 27 
19:57:27 2018
@@ -1,4 +1,4 @@
-
+ï»¿

Re: svn commit: r1830392 - in /tomcat/tc8.5.x/tags/TOMCAT_8_5_31: ./ build.properties.default webapps/docs/changelog.xml

2018-05-09 Thread Mark Thomas

On 09/05/18 09:26, Rainer Jung wrote:
> Am 27.04.2018 um 21:57 schrieb ma...@apache.org:
>> Author: markt
>> Date: Fri Apr 27 19:57:27 2018
>> New Revision: 1830392
>>
>> URL: http://svn.apache.org/viewvc?rev=1830392&view=rev
>> Log:
>> Tag 8.5.31
>>
> ...
> 
>> Modified: tomcat/tc8.5.x/tags/TOMCAT_8_5_31/webapps/docs/changelog.xml
>> URL:
>> http://svn.apache.org/viewvc/tomcat/tc8.5.x/tags/TOMCAT_8_5_31/webapps/docs/changelog.xml?rev=1830392&r1=1830391&r2=1830392&view=diff
>>
>> ==
>>
>> --- tomcat/tc8.5.x/tags/TOMCAT_8_5_31/webapps/docs/changelog.xml
>> (original)
>> +++ tomcat/tc8.5.x/tags/TOMCAT_8_5_31/webapps/docs/changelog.xml Fri
>> Apr 27 19:57:27 2018
>> @@ -1,4 +1,4 @@
>> -
>> +ï»¿
>>

svn commit: r1831239 - /tomcat/trunk/java/org/apache/catalina/tribes/membership/MembershipServiceBase.java

2018-05-09 Thread markt

Author: markt
Date: Wed May  9 09:42:32 2018
New Revision: 1831239

URL: http://svn.apache.org/viewvc?rev=1831239&view=rev
Log:
ws police

Modified:

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

Modified: 
tomcat/trunk/java/org/apache/catalina/tribes/membership/MembershipServiceBase.java
URL: 
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/tribes/membership/MembershipServiceBase.java?rev=1831239&r1=1831238&r2=1831239&view=diff
==
--- 
tomcat/trunk/java/org/apache/catalina/tribes/membership/MembershipServiceBase.java
 (original)
+++ 
tomcat/trunk/java/org/apache/catalina/tribes/membership/MembershipServiceBase.java
 Wed May  9 09:42:32 2018
@@ -114,7 +114,7 @@ public abstract class MembershipServiceB
 MembershipListener listener = this.listener;
 if (listener != null) listener.memberDisappeared(member);
 }
- 
+
 @Override
 public void broadcast(ChannelMessage message) throws ChannelException {
 // no-op



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

svn commit: r1831240 - /tomcat/trunk/java/org/apache/catalina/tribes/membership/McastServiceImpl.java

2018-05-09 Thread markt

Author: markt
Date: Wed May  9 09:43:27 2018
New Revision: 1831240

URL: http://svn.apache.org/viewvc?rev=1831240&view=rev
Log:
Fix IDE nags

Modified:

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

Modified: 
tomcat/trunk/java/org/apache/catalina/tribes/membership/McastServiceImpl.java
URL: 
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/tribes/membership/McastServiceImpl.java?rev=1831240&r1=1831239&r2=1831240&view=diff
==
--- 
tomcat/trunk/java/org/apache/catalina/tribes/membership/McastServiceImpl.java 
(original)
+++ 
tomcat/trunk/java/org/apache/catalina/tribes/membership/McastServiceImpl.java 
Wed May  9 09:43:27 2018
@@ -253,6 +253,7 @@ public class McastServiceImpl extends Me
  * @throws IOException if the service fails to start
  * @throws IllegalStateException if the service is already started
  */
+@Override
 public synchronized void start(int level) throws IOException {
 boolean valid = false;
 if ( (level & Channel.MBR_RX_SEQ)==Channel.MBR_RX_SEQ ) {
@@ -305,6 +306,7 @@ public class McastServiceImpl extends Me
  * @return true if the stop is complete
  * @throws IOException if the service fails to disconnect from the sockets
  */
+@Override
 public synchronized boolean stop(int level) throws IOException {
 boolean valid = false;
 



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

svn commit: r1831242 - in /tomcat/site/trunk: ./ docs/ xdocs/

2018-05-09 Thread violetagg

Author: violetagg
Date: Wed May  9 10:12:55 2018
New Revision: 1831242

URL: http://svn.apache.org/viewvc?rev=1831242&view=rev
Log:
Updates (excluding docs) for 8.0.52 release

Modified:
tomcat/site/trunk/build.properties.default
tomcat/site/trunk/docs/doap_Tomcat.rdf
tomcat/site/trunk/docs/download-80.html
tomcat/site/trunk/docs/index.html
tomcat/site/trunk/docs/migration-8.html
tomcat/site/trunk/docs/oldnews.html
tomcat/site/trunk/docs/whichversion.html
tomcat/site/trunk/xdocs/doap_Tomcat.rdf
tomcat/site/trunk/xdocs/download-80.xml
tomcat/site/trunk/xdocs/index.xml
tomcat/site/trunk/xdocs/migration-8.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=1831242&r1=1831241&r2=1831242&view=diff
==
--- tomcat/site/trunk/build.properties.default (original)
+++ tomcat/site/trunk/build.properties.default Wed May  9 10:12:55 2018
@@ -37,7 +37,7 @@ tomcat.loc=http://www.apache.org/dist/to
 
 # - Tomcat versions -
 tomcat70=7.0.86
-tomcat80=8.0.51
+tomcat80=8.0.52
 tomcat85=8.5.31
 tomcat90=9.0.8
 

Modified: tomcat/site/trunk/docs/doap_Tomcat.rdf
URL: 
http://svn.apache.org/viewvc/tomcat/site/trunk/docs/doap_Tomcat.rdf?rev=1831242&r1=1831241&r2=1831242&view=diff
==
--- tomcat/site/trunk/docs/doap_Tomcat.rdf (original)
+++ tomcat/site/trunk/docs/doap_Tomcat.rdf Wed May  9 10:12:55 2018
@@ -74,8 +74,8 @@
 
   
 Latest Stable 8.0.x Release
-2018-04-13
-8.0.51
+2018-05-08
+8.0.52
   
 
 

Modified: tomcat/site/trunk/docs/download-80.html
URL: 
http://svn.apache.org/viewvc/tomcat/site/trunk/docs/download-80.html?rev=1831242&r1=1831241&r2=1831242&view=diff
==
--- tomcat/site/trunk/docs/download-80.html (original)
+++ tomcat/site/trunk/docs/download-80.html Wed May  9 10:12:55 2018
@@ -234,7 +234,7 @@
 
 
 [define v]8.5.31[end]
-[define w]8.0.51[end]
+[define w]8.0.52[end]
 https://www.apache.org/dist/tomcat/tomcat-8/KEYS";>KEYS |
 [v] |
 [w] |

Modified: tomcat/site/trunk/docs/index.html
URL: 
http://svn.apache.org/viewvc/tomcat/site/trunk/docs/index.html?rev=1831242&r1=1831241&r2=1831242&view=diff
==
--- tomcat/site/trunk/docs/index.html (original)
+++ tomcat/site/trunk/docs/index.html Wed May  9 10:12:55 2018
@@ -248,6 +248,50 @@ project logo are trademarks of the Apach
 
 
 
+
+2018-05-08 Tomcat 8.0.52 Released
+
+
+
+The Apache Tomcat Project is proud to announce the release of version 8.0.52
+of Apache Tomcat. Apache Tomcat 8.0.52 includes fixes for issues identified in
+8.0.51 as well as other enhancements and changes. The notable changes compared
+to 8.0.51 include:
+
+
+
+Implement configuration options to work-around specification non-compliant
+user agents (including all the major browsers) that do not correctly %nn
+encode URI paths and query strings as required by RFC 7230 and RFC 
3986
+
+Enable the CrawlerSessionManagerValve to correctly handle bots that crawl
+multiple hosts and/or web applications when the Valve is configured on a
+Host or an Engine.
+
+
+
+
+
+Full details of these changes, and all the other changes, are available in the
+Tomcat 8
+changelog.
+
+
+
+
+Note: End of life date for Apache Tomcat 8.0.x is announced.
+Read more...
+
+
+
+
+
+
+https://tomcat.apache.org/download-80.cgi";>Download
+
+
+
+
 
 2018-05-03 Tomcat 9.0.8 Released
 
@@ -366,45 +410,6 @@ is available. See bug 
-2018-04-13 Tomcat 8.0.51 Released
-
-
-
-The Apache Tomcat Project is proud to announce the release of version 8.0.51
-of Apache Tomcat. Apache Tomcat 8.0.51 includes fixes for issues identified in
-8.0.50 as well as other enhancements and changes. The notable changes compared
-to 8.0.50 include:
-
-
-
-Avoid infinite recursion, when trying to validate a session while loading
-it with PersistentManager.
-
-
-
-
-
-Full details of these changes, and all the other changes, are available in the
-Tomcat 8
-changelog.
-
-
-
-
-Note: End of life date for Apache Tomcat 8.0.x is announced.
-Read more...
-
-
-
-
-
-
-https://tomcat.apache.org/download-80.cgi";>Download
-
-
-
 
 
 2018-03-06 Tomcat Connectors 1.2.43 
Released

Modified: tomcat/site/trunk/docs/migration-8.html
URL: 
http://svn.apache.org/viewvc/tomcat/site/trunk/docs/migration-8.html?rev=1831242&r1=1831241&r2=1831242&view=diff
==
--- tomcat/site/trunk/docs/migration-8.html (original)
+++ tomcat/site/trunk/docs/migration-8.html Wed May  9 10:12:55 2018
@@ -829,7

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

2018-05-09 Thread violetagg

Author: violetagg
Date: Wed May  9 10:27:06 2018
New Revision: 1831243

URL: http://svn.apache.org/viewvc?rev=1831243&view=rev
Log:
Update docs for Apache Tomcat 8.0.52 release.


[This commit notification would consist of 68 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

svn commit: r26787 - in /release/tomcat/tomcat-8: v8.0.51/ v8.5.30/

2018-05-09 Thread violetagg

Author: violetagg
Date: Wed May  9 10:33:35 2018
New Revision: 26787

Log:
Remove 8.0.51 & 8.5.30

Removed:
release/tomcat/tomcat-8/v8.0.51/
release/tomcat/tomcat-8/v8.5.30/


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

[ANN] Apache Tomcat 8.0.52 released

2018-05-09 Thread Violeta Georgieva

The Apache Tomcat team announces the immediate availability of Apache
Tomcat 8.0.52.

Please note that Apache Tomcat 8.x users should normally be using 8.5.x
releases in preference to 8.0.x releases. The Apache Tomcat team
announced that support for Apache Tomcat 8.0.x will end on
30 June 2018.

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

Apache Tomcat 8.0.52 includes fixes for issues identified in 8.0.51 as
well as other enhancements and changes. The notable changes since
8.0.51 include:


- Implement configuration options to work-around specification
  non-compliant user agents (including all the major browsers) that do
  not correctly %nn encode URI paths and query strings as required by
  RFC 7230 and RFC 3986

- Enable the CrawlerSessionManagerValve to correctly handle bots that
  crawl multiple hosts and/or web applications when the Valve is
  configured on a Host or an Engine.


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

Apache Tomcat website:
http://tomcat.apache.org

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

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

Enjoy

The Apache Tomcat team

Re: [VOTE] Release Apache Tomcat 7.0.88

2018-05-09 Thread Violeta Georgieva

2018-05-07 15:06 GMT+03:00 Violeta Georgieva :
>
> The proposed Apache Tomcat 7.0.88 release is now available for voting.
>
> It can be obtained from:
> https://dist.apache.org/repos/dist/dev/tomcat/tomcat-7/v7.0.88/
> The Maven staging repo is:
> https://repository.apache.org/content/repositories/orgapachetomcat-1184/
> The svn tag is:
> http://svn.apache.org/repos/asf/tomcat/tc7.0.x/tags/TOMCAT_7_0_88/
>
> The proposed 7.0.88 release is:
> [ ] Broken - do not release
> [X] Stable - go ahead and release as 7.0.88 Stable

+1

Regards,
Violeta

svn commit: r1831251 - in /tomcat/trunk: java/org/apache/catalina/deploy/NamingResourcesImpl.java webapps/docs/changelog.xml

2018-05-09 Thread markt

Author: markt
Date: Wed May  9 14:55:33 2018
New Revision: 1831251

URL: http://svn.apache.org/viewvc?rev=1831251&view=rev
Log:
JNDI resources that are defined with injection targets but no value are now 
treated as if the resource is not defined.

Modified:
tomcat/trunk/java/org/apache/catalina/deploy/NamingResourcesImpl.java
tomcat/trunk/webapps/docs/changelog.xml

Modified: tomcat/trunk/java/org/apache/catalina/deploy/NamingResourcesImpl.java
URL: 
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/deploy/NamingResourcesImpl.java?rev=1831251&r1=1831250&r2=1831251&view=diff
==
--- tomcat/trunk/java/org/apache/catalina/deploy/NamingResourcesImpl.java 
(original)
+++ tomcat/trunk/java/org/apache/catalina/deploy/NamingResourcesImpl.java Wed 
May  9 14:55:33 2018
@@ -262,6 +262,12 @@ public class NamingResourcesImpl extends
 }
 }
 
+// Entries with injection targets but no value are effectively ignored
+if (environment.getInjectionTargets() != null && 
environment.getInjectionTargets().size() > 0 &&
+(environment.getValue() == null || 
environment.getValue().length() == 0)) {
+return;
+}
+
 if (!checkResourceType(environment)) {
 throw new IllegalArgumentException(sm.getString(
 "namingResources.resourceTypeFail", environment.getName(),

Modified: tomcat/trunk/webapps/docs/changelog.xml
URL: 
http://svn.apache.org/viewvc/tomcat/trunk/webapps/docs/changelog.xml?rev=1831251&r1=1831250&r2=1831251&view=diff
==
--- tomcat/trunk/webapps/docs/changelog.xml (original)
+++ tomcat/trunk/webapps/docs/changelog.xml Wed May  9 14:55:33 2018
@@ -67,6 +67,10 @@
 getProtocol() are not corrupted by the processing of the
 saved request body. (markt)
   
+  
+JNDI resources that are defined with injection targets but no value are
+now treated as if the resource is not defined. (markt)
+  
 
   
   



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

svn commit: r1831252 - in /tomcat/tc8.5.x/trunk: ./ java/org/apache/catalina/deploy/NamingResourcesImpl.java webapps/docs/changelog.xml

2018-05-09 Thread markt

Author: markt
Date: Wed May  9 14:57:58 2018
New Revision: 1831252

URL: http://svn.apache.org/viewvc?rev=1831252&view=rev
Log:
JNDI resources that are defined with injection targets but no value are now 
treated as if the resource is not defined.

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

tomcat/tc8.5.x/trunk/java/org/apache/catalina/deploy/NamingResourcesImpl.java
tomcat/tc8.5.x/trunk/webapps/docs/changelog.xml

Propchange: tomcat/tc8.5.x/trunk/
--
--- svn:mergeinfo (original)
+++ svn:mergeinfo Wed May  9 14:57:58 2018
@@ -1,2 +1,2 @@
 /tomcat/tc8.0.x/trunk:1809644
-/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,1739492,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,1744149,1744194,1744229,1744270,1744323,1744432,1744684,1744697,1744705,1744713,1744760,1744786,1745083,1745142-1745143,1745145,1745177,1745179-1745180,1745227,1745248,1745254,1745337,1745467,1745473,1745535,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,1747
 
404,1747506,1747536,1747924,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-1
 
756289,1756408-1756410,1756778,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,1757790,1757799,1757813,1757853,1757883,1757903,1757976,1757997,1758000,1758058,1758072-1758075,1758078-1758079,1758223,1758257,1758261,1758276,1758292,1758369,1758378-1758383,1758421,1758423,1758425-1758427,1758430,1758443,1758448,1758459,1758483,1758486-1758487,1758499,1758525,1758556,1758580,1758582,1758584,1758588,1758842,1759019,1759212,1759224,1759227,1759252,1759274,1759513-1759516,1759611,1759757,1759785-1759790,1760005,1760022,1760109-1760110,1760135,1760200-1760201,1760227,1760300,1760397,1760446,1760454,1760640,1760648,1761057,1761422,1761491,1761498,1761500-1761501,1761550,1761553,1761572,1761574,1761625-1761626,1761628,1761682,1761740,1761752,1762051-176205
 
3,1762123,1762168,1762172,1762182,1762201-1762202,1762204,1762208,1762288,1762296,1762324,1762348,1762353,1762362,1762374,1762492,1762503,1762505,1762541,1762608,1762710,1762753,1762766,1762769,1762944,1762947,1762953,1763167,1763179,1763232,1763259,1763271-1763272,1763276-1763277,1763319-1763320,1763370,1763372,1763375,17633

svn commit: r1831253 - in /tomcat/tc8.0.x/trunk: ./ java/org/apache/catalina/deploy/NamingResourcesImpl.java webapps/docs/changelog.xml

2018-05-09 Thread markt

Author: markt
Date: Wed May  9 14:58:22 2018
New Revision: 1831253

URL: http://svn.apache.org/viewvc?rev=1831253&view=rev
Log:
JNDI resources that are defined with injection targets but no value are now 
treated as if the resource is not defined.

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

tomcat/tc8.0.x/trunk/java/org/apache/catalina/deploy/NamingResourcesImpl.java
tomcat/tc8.0.x/trunk/webapps/docs/changelog.xml

Propchange: tomcat/tc8.0.x/trunk/
--
--- svn:mergeinfo (original)
+++ svn:mergeinfo Wed May  9 14:58:22 2018
@@ -1,2 +1,2 @@
 
/tomcat/tc8.5.x/trunk:1735042,1737966,1743139-1743140,1744151,1747537,1747925,1748002,1754614,1754643,1762124,1762183,1762203,1763792,1772948,1777014,1779719,1782037,1782240,1782386-1782387,1785669,1786845,1788249,1788324,1788905,1789216,1789335,1791528,1791558,1796697-1796698,1797521,1798543,1799162,1800143,1801693,1802805,1806799,1807079-1807080,1808880,1809831,1812093,1812143,1812145,1812319,1814975,1815945,1815956,1820207,1822186,1823164,1823497,1824960,1826872-1826873,1827862,1829310,1829777,1829796,1829935,1830215,1830991,1831042
-/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

svn commit: r1831254 - in /tomcat/tc7.0.x/trunk: ./ java/org/apache/catalina/deploy/NamingResources.java webapps/docs/changelog.xml

2018-05-09 Thread markt

Author: markt
Date: Wed May  9 15:02:26 2018
New Revision: 1831254

URL: http://svn.apache.org/viewvc?rev=1831254&view=rev
Log:
JNDI resources that are defined with injection targets but no value are now 
treated as if the resource is not defined.

Modified:
tomcat/tc7.0.x/trunk/   (props changed)
tomcat/tc7.0.x/trunk/java/org/apache/catalina/deploy/NamingResources.java
tomcat/tc7.0.x/trunk/webapps/docs/changelog.xml

Propchange: tomcat/tc7.0.x/trunk/
--
--- svn:mergeinfo (original)
+++ svn:mergeinfo Wed May  9 15:02:26 2018
@@ -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,1644525,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,1702
 
739,1702742,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,1
 
725974,1726171-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,1758563,1759565,1761686,1762173,1762206,1766280,1767507-1767508,1767653,1767656,1769267,1772949,1773521,1773527,1774104,1777015,1777213,1779330,1783151,1784188,1784966,1785670,1786846,1788260,1788999,1789140,1789402,1791529,1791559,1795291,1796906,1797523,1799214,1800998-1800999,1801003,1801007-1801008,1801017,1801020,1802808,180281
 
4,1803618,1806107,1806733,1807082-1807083,1808707,1808884,1809267,1809644,1809832,1809904,1809915,1809924,1810283,1810328,1810574,1810576-1810577,1810584,1810588,1811141,1811842,1812090,1812096,1812150,1812511,1814976,1814983,1815072,1815453,1815946,1815957,1816143,1816682,1817229,1817287,1820200,1820209,1820283,1820305,1821303-1821311,1821313,1821316,1821330,

svn commit: r1831256 - in /tomcat/trunk: java/org/apache/tomcat/util/descriptor/web/LocalStrings.properties java/org/apache/tomcat/util/descriptor/web/ResourceBase.java webapps/docs/changelog.xml

2018-05-09 Thread markt

Author: markt
Date: Wed May  9 15:11:41 2018
New Revision: 1831256

URL: http://svn.apache.org/viewvc?rev=1831256&view=rev
Log:
Ensure that JNDI names used for  entries in web.xml and for lookup 
elements of @Resource annotations specify a name with an explicit java: 
namespace. 

Modified:

tomcat/trunk/java/org/apache/tomcat/util/descriptor/web/LocalStrings.properties
tomcat/trunk/java/org/apache/tomcat/util/descriptor/web/ResourceBase.java
tomcat/trunk/webapps/docs/changelog.xml

Modified: 
tomcat/trunk/java/org/apache/tomcat/util/descriptor/web/LocalStrings.properties
URL: 
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/tomcat/util/descriptor/web/LocalStrings.properties?rev=1831256&r1=1831255&r2=1831256&view=diff
==
--- 
tomcat/trunk/java/org/apache/tomcat/util/descriptor/web/LocalStrings.properties 
(original)
+++ 
tomcat/trunk/java/org/apache/tomcat/util/descriptor/web/LocalStrings.properties 
Wed May  9 15:11:41 2018
@@ -15,6 +15,7 @@
 
 filterDef.invalidFilterName=Invalid  [{0}] in filter definition.
 
+resourceBase.lookupNotJava=Lookup-name values must explicitly reference the 
java: namespace but [{0}] does not
 securityConstraint.uncoveredHttpMethod=For security constraints with URL 
pattern [{0}] only the HTTP methods [{1}] are covered. All other methods are 
uncovered.
 securityConstraint.uncoveredHttpMethodFix=Adding security constraints with URL 
pattern [{0}] to deny access with the uncovered HTTP methods that are not one 
of the following [{1}]
 securityConstraint.uncoveredHttpOmittedMethod=For security constraints with 
URL pattern [{0}] the HTTP methods [{1}] are uncovered.

Modified: 
tomcat/trunk/java/org/apache/tomcat/util/descriptor/web/ResourceBase.java
URL: 
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/tomcat/util/descriptor/web/ResourceBase.java?rev=1831256&r1=1831255&r2=1831256&view=diff
==
--- tomcat/trunk/java/org/apache/tomcat/util/descriptor/web/ResourceBase.java 
(original)
+++ tomcat/trunk/java/org/apache/tomcat/util/descriptor/web/ResourceBase.java 
Wed May  9 15:11:41 2018
@@ -23,6 +23,8 @@ import java.util.Iterator;
 import java.util.List;
 import java.util.Map;
 
+import org.apache.tomcat.util.res.StringManager;
+
 
 /**
  * Representation of an Context element
@@ -33,9 +35,11 @@ public class ResourceBase implements Ser
 
 private static final long serialVersionUID = 1L;
 
-// - Properties
+private static final StringManager sm = 
StringManager.getManager(ResourceBase.class);
 
 
+// - Properties
+
 /**
  * The description of this resource.
  */
@@ -87,6 +91,15 @@ public class ResourceBase implements Ser
 }
 
 public void setLookupName(String lookupName) {
+// EE.5.3.3: Must explicitly use java: namespace
+if (lookupName == null || lookupName.length() == 0) {
+this.lookupName = null;
+return;
+}
+if (!lookupName.startsWith("java:")) {
+throw new IllegalArgumentException(
+sm.getString("resourceBase.lookupNotJava", lookupName));
+}
 this.lookupName = lookupName;
 }
 

Modified: tomcat/trunk/webapps/docs/changelog.xml
URL: 
http://svn.apache.org/viewvc/tomcat/trunk/webapps/docs/changelog.xml?rev=1831256&r1=1831255&r2=1831256&view=diff
==
--- tomcat/trunk/webapps/docs/changelog.xml (original)
+++ tomcat/trunk/webapps/docs/changelog.xml Wed May  9 15:11:41 2018
@@ -71,6 +71,12 @@
 JNDI resources that are defined with injection targets but no value are
 now treated as if the resource is not defined. (markt)
   
+  
+Ensure that JNDI names used for  
entries
+in web.xml and for lookup elements of
+@Resource annotations specify a name with an explicit
+java: namespace. (markt)
+  
 
   
   



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

svn commit: r1831257 - in /tomcat/tc8.5.x/trunk: ./ java/org/apache/tomcat/util/descriptor/web/LocalStrings.properties java/org/apache/tomcat/util/descriptor/web/ResourceBase.java webapps/docs/changel

2018-05-09 Thread markt

Author: markt
Date: Wed May  9 15:12:11 2018
New Revision: 1831257

URL: http://svn.apache.org/viewvc?rev=1831257&view=rev
Log:
Ensure that JNDI names used for  entries in web.xml and for lookup 
elements of @Resource annotations specify a name with an explicit java: 
namespace. 

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

tomcat/tc8.5.x/trunk/java/org/apache/tomcat/util/descriptor/web/LocalStrings.properties

tomcat/tc8.5.x/trunk/java/org/apache/tomcat/util/descriptor/web/ResourceBase.java
tomcat/tc8.5.x/trunk/webapps/docs/changelog.xml

Propchange: tomcat/tc8.5.x/trunk/
--
--- svn:mergeinfo (original)
+++ svn:mergeinfo Wed May  9 15:12:11 2018
@@ -1,2 +1,2 @@
 /tomcat/tc8.0.x/trunk:1809644
-/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,1739492,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,1744149,1744194,1744229,1744270,1744323,1744432,1744684,1744697,1744705,1744713,1744760,1744786,1745083,1745142-1745143,1745145,1745177,1745179-1745180,1745227,1745248,1745254,1745337,1745467,1745473,1745535,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,1747
 
404,1747506,1747536,1747924,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-1
 
756289,1756408-1756410,1756778,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,1757790,1757799,1757813,1757853,1757883,1757903,1757976,1757997,1758000,1758058,1758072-1758075,1758078-1758079,1758223,1758257,1758261,1758276,1758292,1758369,1758378-1758383,1758421,1758423,1758425-1758427,1758430,1758443,1758448,1758459,1758483,1758486-1758487,1758499,1758525,1758556,1758580,1758582,1758584,1758588,1758842,1759019,1759212,1759224,1759227,1759252,1759274,1759513-1759516,1759611,1759757,1759785-1759790,1760005,1760022,1760109-1760110,1760135,1760200-1760201,1760227,1760300,1760397,1760446,1760454,1760640,1760648,1761057,1761422,1761491,1761498,1761500-1761501,1761550,1761553,1761572,1761574,1761625-1761626,1761628,1761682,1761740,1761752,1762051-176205
 
3,1762123,1762168,1762172,1762182,1762201-1762202,1762204,1762208,1762288,1762296,1762324,1762348,1762353,1762362,1762374,1762492,1762503,1762505,1762541,1762608,1762710,1762753,1762766,1762769,176

svn commit: r1831258 - in /tomcat/tc8.0.x/trunk: ./ java/org/apache/tomcat/util/descriptor/web/LocalStrings.properties java/org/apache/tomcat/util/descriptor/web/ResourceBase.java webapps/docs/changel

2018-05-09 Thread markt

Author: markt
Date: Wed May  9 15:12:32 2018
New Revision: 1831258

URL: http://svn.apache.org/viewvc?rev=1831258&view=rev
Log:
Ensure that JNDI names used for  entries in web.xml and for lookup 
elements of @Resource annotations specify a name with an explicit java: 
namespace. 

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

tomcat/tc8.0.x/trunk/java/org/apache/tomcat/util/descriptor/web/LocalStrings.properties

tomcat/tc8.0.x/trunk/java/org/apache/tomcat/util/descriptor/web/ResourceBase.java
tomcat/tc8.0.x/trunk/webapps/docs/changelog.xml

Propchange: tomcat/tc8.0.x/trunk/
--
--- svn:mergeinfo (original)
+++ svn:mergeinfo Wed May  9 15:12:32 2018
@@ -1,2 +1,2 @@
 
/tomcat/tc8.5.x/trunk:1735042,1737966,1743139-1743140,1744151,1747537,1747925,1748002,1754614,1754643,1762124,1762183,1762203,1763792,1772948,1777014,1779719,1782037,1782240,1782386-1782387,1785669,1786845,1788249,1788324,1788905,1789216,1789335,1791528,1791558,1796697-1796698,1797521,1798543,1799162,1800143,1801693,1802805,1806799,1807079-1807080,1808880,1809831,1812093,1812143,1812145,1812319,1814975,1815945,1815956,1820207,1822186,1823164,1823497,1824960,1826872-1826873,1827862,1829310,1829777,1829796,1829935,1830215,1830991,1831042
-/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,16795

svn commit: r1831259 - in /tomcat/tc7.0.x/trunk: ./ java/org/apache/catalina/deploy/LocalStrings.properties java/org/apache/catalina/deploy/ResourceBase.java webapps/docs/changelog.xml

2018-05-09 Thread markt

Author: markt
Date: Wed May  9 15:16:00 2018
New Revision: 1831259

URL: http://svn.apache.org/viewvc?rev=1831259&view=rev
Log:
Ensure that JNDI names used for  entries in web.xml and for lookup 
elements of @Resource annotations specify a name with an explicit java: 
namespace. 

Modified:
tomcat/tc7.0.x/trunk/   (props changed)
tomcat/tc7.0.x/trunk/java/org/apache/catalina/deploy/LocalStrings.properties
tomcat/tc7.0.x/trunk/java/org/apache/catalina/deploy/ResourceBase.java
tomcat/tc7.0.x/trunk/webapps/docs/changelog.xml

Propchange: tomcat/tc7.0.x/trunk/
--
--- svn:mergeinfo (original)
+++ svn:mergeinfo Wed May  9 15:16:00 2018
@@ -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,1644525,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,1702
 
739,1702742,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,1
 
725974,1726171-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,1758563,1759565,1761686,1762173,1762206,1766280,1767507-1767508,1767653,1767656,1769267,1772949,1773521,1773527,1774104,1777015,1777213,1779330,1783151,1784188,1784966,1785670,1786846,1788260,1788999,1789140,1789402,1791529,1791559,1795291,1796906,1797523,1799214,1800998-1800999,1801003,1801007-1801008,1801017,1801020,1802808,180281
 
4,1803618,1806107,1806733,1807082-1807083,1808707,1808884,1809267,1809644,1809832,1809904,1809915,1809924,1810283,1810328,1810574,1810576-1810577,1810584,1810588,1811141,1811842,1812090,1812096,1812150,1812511,1814976,1814983,1815072,1815453,1815946,1

svn commit: r1831262 - in /tomcat/trunk/java/org/apache/naming: LookupRef.java factory/Constants.java factory/LocalStrings.properties factory/LookupFactory.java

2018-05-09 Thread markt

Author: markt
Date: Wed May  9 15:46:02 2018
New Revision: 1831262

URL: http://svn.apache.org/viewvc?rev=1831262&view=rev
Log:
Towards the fix for BZ 50019
Add the remaining plumbing necessary to support lookup-name.
Based on a patch by Gurkan Erdogdu

Added:
tomcat/trunk/java/org/apache/naming/LookupRef.java   (with props)
tomcat/trunk/java/org/apache/naming/factory/LookupFactory.java   (with 
props)
Modified:
tomcat/trunk/java/org/apache/naming/factory/Constants.java
tomcat/trunk/java/org/apache/naming/factory/LocalStrings.properties

Added: tomcat/trunk/java/org/apache/naming/LookupRef.java
URL: 
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/naming/LookupRef.java?rev=1831262&view=auto
==
--- tomcat/trunk/java/org/apache/naming/LookupRef.java (added)
+++ tomcat/trunk/java/org/apache/naming/LookupRef.java Wed May  9 15:46:02 2018
@@ -0,0 +1,53 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements.  See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License.  You may obtain a copy of the License at
+ *
+ *  http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package org.apache.naming;
+
+import javax.naming.RefAddr;
+import javax.naming.StringRefAddr;
+
+/**
+ * Represents a reference to lookup.
+ */
+public class LookupRef extends AbstractRef {
+
+private static final long serialVersionUID = 1L;
+
+/**
+ * JNDI name for the lookup
+ */
+public static final String LOOKUP_NAME = "lookup-name";
+
+
+public LookupRef(String resourceType, String lookupName) {
+this(resourceType, null, null, lookupName);
+}
+
+
+public LookupRef(String resourceType, String factory, String 
factoryLocation, String lookupName) {
+super(resourceType, factory, factoryLocation);
+if (lookupName != null && !lookupName.equals("")) {
+RefAddr ref = new StringRefAddr(LOOKUP_NAME, lookupName);
+add(ref);
+}
+}
+
+
+@Override
+protected String getDefaultFactoryClassName() {
+return org.apache.naming.factory.Constants.DEFAULT_LOOKUP_JNDI_FACTORY;
+}
+}

Propchange: tomcat/trunk/java/org/apache/naming/LookupRef.java
--
svn:eol-style = native

Modified: tomcat/trunk/java/org/apache/naming/factory/Constants.java
URL: 
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/naming/factory/Constants.java?rev=1831262&r1=1831261&r2=1831262&view=diff
==
--- tomcat/trunk/java/org/apache/naming/factory/Constants.java (original)
+++ tomcat/trunk/java/org/apache/naming/factory/Constants.java Wed May  9 
15:46:02 2018
@@ -42,6 +42,8 @@ public final class Constants {
 
 public static final String OPENEJB_EJB_FACTORY = Package + 
".OpenEjbFactory";
 
+public static final String DEFAULT_LOOKUP_JNDI_FACTORY = Package + 
".LookupFactory";
+
 public static final String FACTORY = "factory";
 
 }

Modified: tomcat/trunk/java/org/apache/naming/factory/LocalStrings.properties
URL: 
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/naming/factory/LocalStrings.properties?rev=1831262&r1=1831261&r2=1831262&view=diff
==
--- tomcat/trunk/java/org/apache/naming/factory/LocalStrings.properties 
(original)
+++ tomcat/trunk/java/org/apache/naming/factory/LocalStrings.properties Wed May 
 9 15:46:02 2018
@@ -13,6 +13,11 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
+lookupFactory.circularReference=Found a circular reference involving [{0}]
+lookupFactory.createFailed=Could not create instance of JNDI lookup factory 
class
+lookupFactory.loadFailed=Could not load JNDI lookup factory class
+lookupFactory.typeMismatch=The JNDI reference [{0}] was expected to be of type 
[{1}] but the lookup [{2}] return an object of type [{3}]
+
 resourceLinkFactory.nullType=The local resource link [{0}] that refers to 
global resource [{1}] does not specify the required attribute type
 resourceLinkFactory.unknownType=The local resource link [{0}] that refers to 
global resource [{1}] specified the unknown type [{2}]
 resourceLinkFactory.wrongType=The local resource link [{0

svn commit: r1831263 - in /tomcat/tc8.5.x/trunk: ./ java/org/apache/naming/LookupRef.java java/org/apache/naming/factory/Constants.java java/org/apache/naming/factory/LocalStrings.properties java/org/

2018-05-09 Thread markt

Author: markt
Date: Wed May  9 15:46:35 2018
New Revision: 1831263

URL: http://svn.apache.org/viewvc?rev=1831263&view=rev
Log:
Towards the fix for BZ 50019
Add the remaining plumbing necessary to support lookup-name.
Based on a patch by Gurkan Erdogdu

Added:
tomcat/tc8.5.x/trunk/java/org/apache/naming/LookupRef.java
  - copied unchanged from r1831262, 
tomcat/trunk/java/org/apache/naming/LookupRef.java
tomcat/tc8.5.x/trunk/java/org/apache/naming/factory/LookupFactory.java
  - copied unchanged from r1831262, 
tomcat/trunk/java/org/apache/naming/factory/LookupFactory.java
Modified:
tomcat/tc8.5.x/trunk/   (props changed)
tomcat/tc8.5.x/trunk/java/org/apache/naming/factory/Constants.java
tomcat/tc8.5.x/trunk/java/org/apache/naming/factory/LocalStrings.properties

Propchange: tomcat/tc8.5.x/trunk/
--
--- svn:mergeinfo (original)
+++ svn:mergeinfo Wed May  9 15:46:35 2018
@@ -1,2 +1,2 @@
 /tomcat/tc8.0.x/trunk:1809644
-/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,1739492,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,1744149,1744194,1744229,1744270,1744323,1744432,1744684,1744697,1744705,1744713,1744760,1744786,1745083,1745142-1745143,1745145,1745177,1745179-1745180,1745227,1745248,1745254,1745337,1745467,1745473,1745535,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,1747
 
404,1747506,1747536,1747924,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-1
 
756289,1756408-1756410,1756778,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,1757790,1757799,1757813,1757853,1757883,1757903,1757976,1757997,1758000,1758058,1758072-1758075,1758078-1758079,1758223,1758257,1758261,1758276,1758292,1758369,1758378-1758383,1758421,1758423,1758425-1758427,1758430,1758443,1758448,1758459,1758483,1758486-1758487,1758499,1758525,1758556,1758580,1758582,1758584,1758588,1758842,1759019,1759212,1759224,1759227,1759252,1759274,1759513-1759516,1759611,1759757,1759785-1759790,1760005,1760022,1760109-1760110,1760135,1760200-1760201,1760227,1760300,1760397,1760446,1760454,1760640,1760648,1761057,1761422,1761491,1761498,1761500-1761501,1761550,1761553,1761572,1761574,1761625-1761626,1761628,176168

svn commit: r1831264 - in /tomcat/tc8.5.x/trunk: ./ java/org/apache/naming/ webapps/docs/

2018-05-09 Thread markt

Author: markt
Date: Wed May  9 15:50:16 2018
New Revision: 1831264

URL: http://svn.apache.org/viewvc?rev=1831264&view=rev
Log:
Clean up.
Refactoring to add a base class to:
- reduce duplication in the getFactoryClassName() method
- reduce duplication in the toString()method where present
- provide each type of Ref with a consistent toString() implementation

Added:
tomcat/tc8.5.x/trunk/java/org/apache/naming/AbstractRef.java
  - copied unchanged from r1771226, 
tomcat/trunk/java/org/apache/naming/AbstractRef.java
Modified:
tomcat/tc8.5.x/trunk/   (props changed)
tomcat/tc8.5.x/trunk/java/org/apache/naming/EjbRef.java
tomcat/tc8.5.x/trunk/java/org/apache/naming/HandlerRef.java
tomcat/tc8.5.x/trunk/java/org/apache/naming/ResourceEnvRef.java
tomcat/tc8.5.x/trunk/java/org/apache/naming/ResourceLinkRef.java
tomcat/tc8.5.x/trunk/java/org/apache/naming/ResourceRef.java
tomcat/tc8.5.x/trunk/java/org/apache/naming/ServiceRef.java
tomcat/tc8.5.x/trunk/java/org/apache/naming/TransactionRef.java
tomcat/tc8.5.x/trunk/webapps/docs/changelog.xml

Propchange: tomcat/tc8.5.x/trunk/
--
--- svn:mergeinfo (original)
+++ svn:mergeinfo Wed May  9 15:50:16 2018
@@ -1,2 +1,2 @@
 /tomcat/tc8.0.x/trunk:1809644
-/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,1739492,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,1744149,1744194,1744229,1744270,1744323,1744432,1744684,1744697,1744705,1744713,1744760,1744786,1745083,1745142-1745143,1745145,1745177,1745179-1745180,1745227,1745248,1745254,1745337,1745467,1745473,1745535,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,1747
 
404,1747506,1747536,1747924,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-1
 
756289,1756408-1756410,1756778,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,1757790,1757799,1757813,1757853,1757883,1757903,1757976,1757997,1758000,1758058,1758072-1758075,1758078-1758079,1758223,1758257,1758261,1758276,1758292,1758369,1758378-1758383,1758421,1758423,1758425-1758427,1758430,1758443,1758448,1758459,1758483,1758486-1758487,1758499,1758525,1758556,1758580,1758582,1758584,1758588,1758842,1759019,1759212,1759224,17

svn commit: r1831265 - in /tomcat/tc8.0.x/trunk: ./ java/org/apache/naming/ webapps/docs/

2018-05-09 Thread markt

Author: markt
Date: Wed May  9 15:53:19 2018
New Revision: 1831265

URL: http://svn.apache.org/viewvc?rev=1831265&view=rev
Log:
Clean up.
Refactoring to add a base class to:
- reduce duplication in the getFactoryClassName() method
- reduce duplication in the toString()method where present
- provide each type of Ref with a consistent toString() implementation

Added:
tomcat/tc8.0.x/trunk/java/org/apache/naming/AbstractRef.java
  - copied unchanged from r1771226, 
tomcat/trunk/java/org/apache/naming/AbstractRef.java
Modified:
tomcat/tc8.0.x/trunk/   (props changed)
tomcat/tc8.0.x/trunk/java/org/apache/naming/EjbRef.java
tomcat/tc8.0.x/trunk/java/org/apache/naming/HandlerRef.java
tomcat/tc8.0.x/trunk/java/org/apache/naming/ResourceEnvRef.java
tomcat/tc8.0.x/trunk/java/org/apache/naming/ResourceLinkRef.java
tomcat/tc8.0.x/trunk/java/org/apache/naming/ResourceRef.java
tomcat/tc8.0.x/trunk/java/org/apache/naming/ServiceRef.java
tomcat/tc8.0.x/trunk/java/org/apache/naming/TransactionRef.java
tomcat/tc8.0.x/trunk/webapps/docs/changelog.xml

Propchange: tomcat/tc8.0.x/trunk/
--
--- svn:mergeinfo (original)
+++ svn:mergeinfo Wed May  9 15:53:19 2018
@@ -1,2 +1,2 @@
 
/tomcat/tc8.5.x/trunk:1735042,1737966,1743139-1743140,1744151,1747537,1747925,1748002,1754614,1754643,1762124,1762183,1762203,1763792,1772948,1777014,1779719,1782037,1782240,1782386-1782387,1785669,1786845,1788249,1788324,1788905,1789216,1789335,1791528,1791558,1796697-1796698,1797521,1798543,1799162,1800143,1801693,1802805,1806799,1807079-1807080,1808880,1809831,1812093,1812143,1812145,1812319,1814975,1815945,1815956,1820207,1822186,1823164,1823497,1824960,1826872-1826873,1827862,1829310,1829777,1829796,1829935,1830215,1830991,1831042
-/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,1

svn commit: r1831266 - in /tomcat/tc8.0.x/trunk: ./ java/org/apache/naming/LookupRef.java java/org/apache/naming/factory/Constants.java java/org/apache/naming/factory/LocalStrings.properties java/org/

2018-05-09 Thread markt

Author: markt
Date: Wed May  9 15:54:09 2018
New Revision: 1831266

URL: http://svn.apache.org/viewvc?rev=1831266&view=rev
Log:
Towards the fix for BZ 50019
Add the remaining plumbing necessary to support lookup-name.
Based on a patch by Gurkan Erdogdu

Added:
tomcat/tc8.0.x/trunk/java/org/apache/naming/LookupRef.java
  - copied unchanged from r1831262, 
tomcat/trunk/java/org/apache/naming/LookupRef.java
tomcat/tc8.0.x/trunk/java/org/apache/naming/factory/LookupFactory.java
  - copied unchanged from r1831262, 
tomcat/trunk/java/org/apache/naming/factory/LookupFactory.java
Modified:
tomcat/tc8.0.x/trunk/   (props changed)
tomcat/tc8.0.x/trunk/java/org/apache/naming/factory/Constants.java
tomcat/tc8.0.x/trunk/java/org/apache/naming/factory/LocalStrings.properties

Propchange: tomcat/tc8.0.x/trunk/
--
--- svn:mergeinfo (original)
+++ svn:mergeinfo Wed May  9 15:54:09 2018
@@ -1,2 +1,2 @@
 
/tomcat/tc8.5.x/trunk:1735042,1737966,1743139-1743140,1744151,1747537,1747925,1748002,1754614,1754643,1762124,1762183,1762203,1763792,1772948,1777014,1779719,1782037,1782240,1782386-1782387,1785669,1786845,1788249,1788324,1788905,1789216,1789335,1791528,1791558,1796697-1796698,1797521,1798543,1799162,1800143,1801693,1802805,1806799,1807079-1807080,1808880,1809831,1812093,1812143,1812145,1812319,1814975,1815945,1815956,1820207,1822186,1823164,1823497,1824960,1826872-1826873,1827862,1829310,1829777,1829796,1829935,1830215,1830991,1831042
-/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,16754

svn commit: r1831267 [1/2] - in /tomcat/tc7.0.x/trunk: ./ java/org/apache/naming/ webapps/docs/

2018-05-09 Thread markt

Author: markt
Date: Wed May  9 16:14:21 2018
New Revision: 1831267

URL: http://svn.apache.org/viewvc?rev=1831267&view=rev
Log:
Clean up.
Refactoring to add a base class to:
- reduce duplication in the getFactoryClassName() method
- reduce duplication in the toString()method where present
- provide each type of Ref with a consistent toString() implementation

Added:
tomcat/tc7.0.x/trunk/java/org/apache/naming/AbstractRef.java
  - copied unchanged from r1831265, 
tomcat/tc8.0.x/trunk/java/org/apache/naming/AbstractRef.java
Modified:
tomcat/tc7.0.x/trunk/   (props changed)
tomcat/tc7.0.x/trunk/java/org/apache/naming/EjbRef.java
tomcat/tc7.0.x/trunk/java/org/apache/naming/HandlerRef.java
tomcat/tc7.0.x/trunk/java/org/apache/naming/ResourceEnvRef.java
tomcat/tc7.0.x/trunk/java/org/apache/naming/ResourceLinkRef.java
tomcat/tc7.0.x/trunk/java/org/apache/naming/ResourceRef.java
tomcat/tc7.0.x/trunk/java/org/apache/naming/ServiceRef.java
tomcat/tc7.0.x/trunk/java/org/apache/naming/TransactionRef.java
tomcat/tc7.0.x/trunk/webapps/docs/changelog.xml

Propchange: tomcat/tc7.0.x/trunk/
--
--- svn:mergeinfo (original)
+++ svn:mergeinfo Wed May  9 16:14:21 2018
@@ -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,1644525,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,1702
 
739,1702742,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,1
 
725974,1726171-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,1758563,1759565,1761686,1762173,1

svn commit: r1831267 [2/2] - in /tomcat/tc7.0.x/trunk: ./ java/org/apache/naming/ webapps/docs/

2018-05-09 Thread markt

Modified: tomcat/tc7.0.x/trunk/java/org/apache/naming/ServiceRef.java
URL: 
http://svn.apache.org/viewvc/tomcat/tc7.0.x/trunk/java/org/apache/naming/ServiceRef.java?rev=1831267&r1=1831266&r2=1831267&view=diff
==
--- tomcat/tc7.0.x/trunk/java/org/apache/naming/ServiceRef.java (original)
+++ tomcat/tc7.0.x/trunk/java/org/apache/naming/ServiceRef.java Wed May  9 
16:14:21 2018
@@ -5,25 +5,19 @@
  * The ASF licenses this file to You under the Apache License, Version 2.0
  * (the "License"); you may not use this file except in compliance with
  * the License.  You may obtain a copy of the License at
- * 
+ *
  *  http://www.apache.org/licenses/LICENSE-2.0
- * 
+ *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS,
  * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
  * See the License for the specific language governing permissions and
  * limitations under the License.
- */ 
-
-
+ */
 package org.apache.naming;
 
-import java.util.Enumeration;
 import java.util.Vector;
 
-import javax.naming.Context;
-import javax.naming.RefAddr;
-import javax.naming.Reference;
 import javax.naming.StringRefAddr;
 
 /**
@@ -31,18 +25,16 @@ import javax.naming.StringRefAddr;
  *
  * @author Fabien Carrion
  */
-
-public class ServiceRef extends Reference {
+public class ServiceRef extends AbstractRef {
 
 private static final long serialVersionUID = 1L;
 
-// -- Constants
 
 /**
  * Default factory for this reference.
  */
-public static final String DEFAULT_FACTORY = 
-org.apache.naming.factory.Constants.DEFAULT_SERVICE_FACTORY;
+public static final String DEFAULT_FACTORY =
+org.apache.naming.factory.Constants.DEFAULT_SERVICE_FACTORY;
 
 
 /**
@@ -61,7 +53,7 @@ public class ServiceRef extends Referenc
 /**
  * Wsdl Location address type.
  */
-public static final String WSDL  = "wsdl";
+public static final String WSDL = "wsdl";
 
 
 /**
@@ -83,21 +75,21 @@ public class ServiceRef extends Referenc
 
 
 /**
- * The vector to save the handler Reference objects, because they can't be 
saved in the addrs vector.
+ * The vector to save the handler Reference objects, because they can't be
+ * saved in the addrs vector.
  */
-private Vector handlers = new Vector();
+private final Vector handlers = new Vector();
 
 
-// --- Constructors
-
-public ServiceRef(String refname, String serviceInterface, String[] 
serviceQname, 
+public ServiceRef(String refname, String serviceInterface, String[] 
serviceQname,
String wsdl, String jaxrpcmapping) {
 this(refname, serviceInterface, serviceQname, wsdl, jaxrpcmapping,
 null, null);
 }
 
+
 public ServiceRef(@SuppressWarnings("unused") String refname,
-   String serviceInterface, String[] serviceQname, 
+   String serviceInterface, String[] serviceQname,
String wsdl, String jaxrpcmapping,
String factory, String factoryLocation) {
 super(serviceInterface, factory, factoryLocation);
@@ -125,14 +117,9 @@ public class ServiceRef extends Referenc
 }
 
 
-// - Instance Variables
-
-
-// -- Reference Methods
-
-
 /**
  * Add and Get Handlers classes.
+ * @return the handler
  */
 public HandlerRef getHandler() {
 return handlers.remove(0);
@@ -149,58 +136,8 @@ public class ServiceRef extends Referenc
 }
 
 
-/**
- * Retrieves the class name of the factory of the object to which this 
- * reference refers.
- */
-@Override
-public String getFactoryClassName() {
-String factory = super.getFactoryClassName();
-if (factory != null) {
-return factory;
-} else {
-factory = System.getProperty(Context.OBJECT_FACTORIES);
-if (factory != null) {
-return null;
-} else {
-return DEFAULT_FACTORY;
-}
-}
-}
-
-
-// - Public Methods
-
-
-/**
- * Return a String rendering of this object.
- */
 @Override
-public String toString() {
-
-StringBuilder sb = new StringBuilder("ServiceRef[");
-sb.append("className=");
-sb.append(getClassName());
-sb.append(",factoryClassLocation=");
-sb.append(getFactoryClassLocation());
-sb.append(",factoryClassName=");
-sb.append(getFactoryClassName());
-Enumeration refAddrs =

svn commit: r1831268 - in /tomcat/tc7.0.x/trunk: ./ java/org/apache/naming/LookupRef.java java/org/apache/naming/factory/Constants.java java/org/apache/naming/factory/LocalStrings.properties java/org/

2018-05-09 Thread markt

Author: markt
Date: Wed May  9 16:16:07 2018
New Revision: 1831268

URL: http://svn.apache.org/viewvc?rev=1831268&view=rev
Log:
Towards the fix for BZ 50019
Add the remaining plumbing necessary to support lookup-name.
Based on a patch by Gurkan Erdogdu

Added:
tomcat/tc7.0.x/trunk/java/org/apache/naming/LookupRef.java
  - copied unchanged from r1831266, 
tomcat/tc8.0.x/trunk/java/org/apache/naming/LookupRef.java
tomcat/tc7.0.x/trunk/java/org/apache/naming/factory/LookupFactory.java
  - copied unchanged from r1831266, 
tomcat/tc8.0.x/trunk/java/org/apache/naming/factory/LookupFactory.java
Modified:
tomcat/tc7.0.x/trunk/   (props changed)
tomcat/tc7.0.x/trunk/java/org/apache/naming/factory/Constants.java
tomcat/tc7.0.x/trunk/java/org/apache/naming/factory/LocalStrings.properties

Propchange: tomcat/tc7.0.x/trunk/
--
--- svn:mergeinfo (original)
+++ svn:mergeinfo Wed May  9 16:16:07 2018
@@ -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,1644525,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,1702
 
739,1702742,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,1
 
725974,1726171-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,1758563,1759565,1761686,1762173,1762206,1766280,1767507-1767508,1767653,1767656,1769267,1772949,1773521,1773527,1774104,1777015,1777213,1779330,1783151,1784188,1784966,1785670,1786846,1788260,1788999,1789140,1789402,1791529,1791559,1795291,1796906,1797523,1799214,1800998-1800999,1801003,1801007-1801008,1801017,18010

buildbot failure in on tomcat-7-trunk

2018-05-09 Thread buildbot

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

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

BUILD FAILED: failed compile

Sincerely,
 -The Buildbot




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

svn commit: r1831274 - /tomcat/tc8.0.x/trunk/res/checkstyle/org-import-control.xml

2018-05-09 Thread markt

Author: markt
Date: Wed May  9 18:13:26 2018
New Revision: 1831274

URL: http://svn.apache.org/viewvc?rev=1831274&view=rev
Log:
Fix imports

Modified:
tomcat/tc8.0.x/trunk/res/checkstyle/org-import-control.xml

Modified: tomcat/tc8.0.x/trunk/res/checkstyle/org-import-control.xml
URL: 
http://svn.apache.org/viewvc/tomcat/tc8.0.x/trunk/res/checkstyle/org-import-control.xml?rev=1831274&r1=1831273&r2=1831274&view=diff
==
--- tomcat/tc8.0.x/trunk/res/checkstyle/org-import-control.xml (original)
+++ tomcat/tc8.0.x/trunk/res/checkstyle/org-import-control.xml Wed May  9 
18:13:26 2018
@@ -113,6 +113,7 @@
   
 
 
+
 
 
 
@@ -174,4 +175,4 @@
   
 
   
-
\ No newline at end of file
+



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

svn commit: r1831275 - in /tomcat/tc7.0.x/trunk: ./ java/org/apache/naming/factory/LookupFactory.java

2018-05-09 Thread markt

Author: markt
Date: Wed May  9 18:14:23 2018
New Revision: 1831275

URL: http://svn.apache.org/viewvc?rev=1831275&view=rev
Log:
Fix back-port for Java 6

Modified:
tomcat/tc7.0.x/trunk/   (props changed)
tomcat/tc7.0.x/trunk/java/org/apache/naming/factory/LookupFactory.java

Propchange: tomcat/tc7.0.x/trunk/
--
--- svn:mergeinfo (original)
+++ svn:mergeinfo Wed May  9 18:14:23 2018
@@ -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,1644525,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,1702
 
739,1702742,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,1
 
725974,1726171-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,1758563,1759565,1761686,1762173,1762206,1766280,1767507-1767508,1767653,1767656,1769267,1772949,1773521,1773527,1774104,1777015,1777213,1779330,1783151,1784188,1784966,1785670,1786846,1788260,1788999,1789140,1789402,1791529,1791559,1795291,1796906,1797523,1799214,1800998-1800999,1801003,1801007-1801008,1801017,1801020,1802808,180281
 
4,1803618,1806107,1806733,1807082-1807083,1808707,1808884,1809267,1809644,1809832,1809904,1809915,1809924,1810283,1810328,1810574,1810576-1810577,1810584,1810588,1811141,1811842,1812090,1812096,1812150,1812511,1814976,1814983,1815072,1815453,1815946,1815957,1816143,1816682,1817229,1817287,1820200,1820209,1820283,1820305,1821303-1821311,1821313,1821316,1821330,1821365,1822235,1823165,1823341,1823490,1823493,1823498,1824299,1824313,1825715,1825874,1826367,1826379,1826690,1826830,1826874-1826875,1827864,1828020

svn commit: r1831276 - /tomcat/tc7.0.x/trunk/res/checkstyle/org-import-control.xml

2018-05-09 Thread markt

Author: markt
Date: Wed May  9 18:14:38 2018
New Revision: 1831276

URL: http://svn.apache.org/viewvc?rev=1831276&view=rev
Log:
Allow additional import

Modified:
tomcat/tc7.0.x/trunk/res/checkstyle/org-import-control.xml

Modified: tomcat/tc7.0.x/trunk/res/checkstyle/org-import-control.xml
URL: 
http://svn.apache.org/viewvc/tomcat/tc7.0.x/trunk/res/checkstyle/org-import-control.xml?rev=1831276&r1=1831275&r2=1831276&view=diff
==
--- tomcat/tc7.0.x/trunk/res/checkstyle/org-import-control.xml (original)
+++ tomcat/tc7.0.x/trunk/res/checkstyle/org-import-control.xml Wed May  9 
18:14:38 2018
@@ -107,6 +107,7 @@
   
 
 
+
 
 
 
@@ -154,4 +155,4 @@
   
 
   
-
\ No newline at end of file
+



-
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

2018-05-09 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/1086

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

Re: svn commit: r1830392 - in /tomcat/tc8.5.x/tags/TOMCAT_8_5_31: ./ build.properties.default webapps/docs/changelog.xml

Re: svn commit: r1830392 - in /tomcat/tc8.5.x/tags/TOMCAT_8_5_31: ./ build.properties.default webapps/docs/changelog.xml

svn commit: r1831239 - /tomcat/trunk/java/org/apache/catalina/tribes/membership/MembershipServiceBase.java

svn commit: r1831240 - /tomcat/trunk/java/org/apache/catalina/tribes/membership/McastServiceImpl.java

svn commit: r1831242 - in /tomcat/site/trunk: ./ docs/ xdocs/

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

svn commit: r26787 - in /release/tomcat/tomcat-8: v8.0.51/ v8.5.30/

[ANN] Apache Tomcat 8.0.52 released

Re: [VOTE] Release Apache Tomcat 7.0.88

svn commit: r1831251 - in /tomcat/trunk: java/org/apache/catalina/deploy/NamingResourcesImpl.java webapps/docs/changelog.xml

svn commit: r1831252 - in /tomcat/tc8.5.x/trunk: ./ java/org/apache/catalina/deploy/NamingResourcesImpl.java webapps/docs/changelog.xml

svn commit: r1831253 - in /tomcat/tc8.0.x/trunk: ./ java/org/apache/catalina/deploy/NamingResourcesImpl.java webapps/docs/changelog.xml

svn commit: r1831254 - in /tomcat/tc7.0.x/trunk: ./ java/org/apache/catalina/deploy/NamingResources.java webapps/docs/changelog.xml

svn commit: r1831256 - in /tomcat/trunk: java/org/apache/tomcat/util/descriptor/web/LocalStrings.properties java/org/apache/tomcat/util/descriptor/web/ResourceBase.java webapps/docs/changelog.xml

svn commit: r1831257 - in /tomcat/tc8.5.x/trunk: ./ java/org/apache/tomcat/util/descriptor/web/LocalStrings.properties java/org/apache/tomcat/util/descriptor/web/ResourceBase.java webapps/docs/changel

svn commit: r1831258 - in /tomcat/tc8.0.x/trunk: ./ java/org/apache/tomcat/util/descriptor/web/LocalStrings.properties java/org/apache/tomcat/util/descriptor/web/ResourceBase.java webapps/docs/changel

svn commit: r1831259 - in /tomcat/tc7.0.x/trunk: ./ java/org/apache/catalina/deploy/LocalStrings.properties java/org/apache/catalina/deploy/ResourceBase.java webapps/docs/changelog.xml

svn commit: r1831262 - in /tomcat/trunk/java/org/apache/naming: LookupRef.java factory/Constants.java factory/LocalStrings.properties factory/LookupFactory.java

svn commit: r1831263 - in /tomcat/tc8.5.x/trunk: ./ java/org/apache/naming/LookupRef.java java/org/apache/naming/factory/Constants.java java/org/apache/naming/factory/LocalStrings.properties java/org/

svn commit: r1831264 - in /tomcat/tc8.5.x/trunk: ./ java/org/apache/naming/ webapps/docs/

svn commit: r1831265 - in /tomcat/tc8.0.x/trunk: ./ java/org/apache/naming/ webapps/docs/

svn commit: r1831266 - in /tomcat/tc8.0.x/trunk: ./ java/org/apache/naming/LookupRef.java java/org/apache/naming/factory/Constants.java java/org/apache/naming/factory/LocalStrings.properties java/org/

svn commit: r1831267 [1/2] - in /tomcat/tc7.0.x/trunk: ./ java/org/apache/naming/ webapps/docs/

svn commit: r1831267 [2/2] - in /tomcat/tc7.0.x/trunk: ./ java/org/apache/naming/ webapps/docs/

svn commit: r1831268 - in /tomcat/tc7.0.x/trunk: ./ java/org/apache/naming/LookupRef.java java/org/apache/naming/factory/Constants.java java/org/apache/naming/factory/LocalStrings.properties java/org/

buildbot failure in on tomcat-7-trunk

svn commit: r1831274 - /tomcat/tc8.0.x/trunk/res/checkstyle/org-import-control.xml

svn commit: r1831275 - in /tomcat/tc7.0.x/trunk: ./ java/org/apache/naming/factory/LookupFactory.java

svn commit: r1831276 - /tomcat/tc7.0.x/trunk/res/checkstyle/org-import-control.xml

buildbot success in on tomcat-7-trunk

30 matches

Site Navigation

Mail list logo

Footer information