svn commit: r1239024 - /tomcat/trunk/java/org/apache/catalina/startup/ContextConfig.java

[markt]

Author: markt
Date: Wed Feb  1 09:43:48 2012
New Revision: 1239024

URL: http://svn.apache.org/viewvc?rev=1239024&view=rev
Log:
Avoid NPE if class / interface is not present

Modified:
tomcat/trunk/java/org/apache/catalina/startup/ContextConfig.java

Modified: tomcat/trunk/java/org/apache/catalina/startup/ContextConfig.java
URL: 
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/startup/ContextConfig.java?rev=1239024&r1=1239023&r2=1239024&view=diff
==
--- tomcat/trunk/java/org/apache/catalina/startup/ContextConfig.java (original)
+++ tomcat/trunk/java/org/apache/catalina/startup/ContextConfig.java Wed Feb  1 
09:43:48 2012
@@ -2101,6 +2101,9 @@ public class ContextConfig implements Li
 String name = className.replace('.', '/') + ".class";
 InputStream is =
 
context.getLoader().getClassLoader().getResourceAsStream(name);
+if (is == null) {
+return;
+}
 ClassParser parser = new ClassParser(is, null);
 try {
 JavaClass clazz = parser.parse();



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

svn commit: r1239025 - in /tomcat/tc7.0.x/trunk: ./ java/org/apache/catalina/startup/ContextConfig.java

[markt]

Author: markt
Date: Wed Feb  1 09:44:55 2012
New Revision: 1239025

URL: http://svn.apache.org/viewvc?rev=1239025&view=rev
Log:
Additional fix for https://issues.apache.org/bugzilla/show_bug.cgi?id=52444
Avoid NPE

Modified:
tomcat/tc7.0.x/trunk/   (props changed)
tomcat/tc7.0.x/trunk/java/org/apache/catalina/startup/ContextConfig.java

Propchange: tomcat/tc7.0.x/trunk/
--
--- svn:mergeinfo (original)
+++ svn:mergeinfo Wed Feb  1 09:44:55 2012
@@ -1 +1 @@
-/tomcat/trunk:1156115,1156171,1156276,1156304,1156519,1156530,1156602,1157015,1157018,1157151,1157198,1157204,1157810,1157832,1157834,1157847,1157908,1157939,1158155,1158160,1158176,1158195,1158198-1158199,1158227,1158331,1158334-1158335,1158426,1160347,1160592,1160611,1160619,1160626,1160639,1160652,1160720-1160721,1160772,1160774,1160776,1161303,1161310,1161322,1161339,1161486,1161540,1161549,1161584,1162082,1162149,1162169,1162721,1162769,1162836,1162932,1163630,1164419,1164438,1164469,1164480,1164567,1165234,1165247-1165248,1165253,1165273,1165282,1165309,1165331,1165338,1165347,1165360-1165361,1165367-1165368,1165602,1165608,1165677,1165693,1165721,1165723,1165728,1165730,1165738,1165746,1165765,1165777,1165918,1165921,1166077,1166150-1166151,1166290,1166366,1166620,1166686,1166693,1166752,1166757,1167368,1167394,1169447,1170647,1171692,1172233-1172234,1172236,1172269,1172278,1172282,1172556,1172610,1172664,1172689,1172711,1173020-1173021,1173082,1173088,1173090,1173096
 
,1173241,1173256,1173288,117,1173342,1173461,1173614,1173630,1173659,1173722,1174061,1174239,1174322,1174325,1174329-1174330,1174337-1174339,1174343,1174353,1174799,1174882,1174884,1174975,1174983,1175155,1175158,1175167,1175182,1175190,1175201,1175272,1175275,1175283,1175582,1175589-1175590,1175594,1175602,1175613,1175633,1175690,1175713,1175798,1175889,1175896,1175907,1176584,1176590,1176799,1177050,1177060,1177125,1177152,1177160,1177245,1177850,1177862,1177978,1178209,1178228,1178233,1178449,1178542,1178681,1178684,1178721,1179268,1179274,1180261,1180865,1180891,1180894,1180907,1181028,1181123,1181125,1181136,1181291,1181743,1182796,1183078,1183105,1183142,1183328,1183339-1183340,1183492-1183494,1183605,1184917,1184919,1185018,1185020,1185200,1185588,1185626,1185756,1185758,1186011,1186042-1186045,1186104,1186123,1186137,1186153,1186254,1186257,1186377-1186379,1186479-1186480,1186712,1186743,1186750,1186763,1186890-1186892,1186894,1186949,1187018,1187027-1187028,1187
 
381,1187753,1187755,1187775,1187801,1187806,1187809,1187827,1188301,1188303-1188305,1188399,1188822,1188930-1188931,1189116,1189129,1189183,1189240,1189256,1189386,1189413-1189414,1189477,1189685,1189805,1189857,1189864,1189882,1190034,1190185,1190279,1190339,1190371,1190388-1190389,1190474,1190481,1194915,1195222-1195223,1195531,1195899,1195905,1195943,1195949,1195953,1195955,1195965,1195968,1196175,1196212,1196223,1196304-1196305,1196735,1196825,1196827,1197158,1197261,1197263,1197299-1197300,1197305,1197339-1197340,1197343,1197382,1197386-1197387,1197480,1197578,1198497,1198528,1198552,1198602,1198604,1198607,1198622,1198640,1198696,1198707,1199418,1199432,1199436,1199513,1199529,1199980,116,1200056,1200089,1200106-1200107,1200263,1200316,1200320,1200398-1200399,1200445-1200446,1200555,1200627,1200696,1200725,1200937,1200941,1201069,1201087,1201180,1201235-1201237,1201508,1201521,1201542,1201545-1201546,1201548,1201555-1201556,1201568,1201576,1201608,1201921-1201922,1
 
201931,1202035,1202039,1202271,1202565,1202578,1202705,1202828,1202860,1203047-1203052,1203078,1203091,1203253,1203278,1204182,1204856,1204867,1204936,1204938,1204982,1205033,1205065,1205082,1205097,1205112,1206200,1207692,1208046,1208073,1208096,1208114,1208145,1208772,1209194,1209277-1209278,1209686-1209731,1210894,1212091,1212095,1212099,1212118,1213469,1213906,1214853,1214855,1214864,1215115,1215118-1215119,1215121,1220293,1220295,1221038,1221842,1222189,101,176,1222300,1222690,1222850,1222852,1222855,1224607,1224617,1224648-1224652,1224657,1224662-1224663,1224682,1224801,1224910,1225000,1225219,1225343,1225465,1225627,1225629,1225634,1226069,1226158-1226159,1226177,1226196,1226214-1226215,1226385,1226394,1226500,1226537-1226538,1226546,1226551,1226975,1228196,1228360,1228376,1228724,1228908,1228918,1228920,1228922,1228929,1228969,1229307,1229536,1229549,1229724,1229726-1229731,1229997,1230539,1230711,1230729,1230762-1230763,1230765,1230955,1230957,1231285,123129
 
0,1231308,1231310,1231337,1231460-1231461,1231542-1231543,1231546-1231547,1231620-1231621,1231624-1231625,1231630,1231654-1231655,1231738,1231740,1231762-1231763,1231856,1231886,1231923,1231947,1232345,1232368,1232380,1232447,1232760,1232813,1232842-1232843,1232869,1233413,1233423,1233426,1234143,1234567,1235207,1236906-1236907,1236914,1237146,1237154-1237156,1237332,1237334,1237425,1237427,1237604,1237975,1237981,1237985,1238070,1238073
+/tomcat/trunk:1156115,1156171,1156276,11563

DO NOT REPLY [Bug 52444] Classloading-based ServletContainerInitializer @HandlesTypes processing can result in long startup times

[bugzilla]

https://issues.apache.org/bugzilla/show_bug.cgi?id=52444

Mark Thomas  changed:

   What|Removed |Added

 Status|REOPENED|RESOLVED
 Resolution||FIXED

--- Comment #13 from Mark Thomas  2012-02-01 09:45:55 UTC ---
Looking at the stack trace I reached the same conclusion as to the fix but
implemented it sightly differently.

This has been fixed in trunk and 7.0.x/trunk and will be included in 7.0.26
onwards.

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

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

DO NOT REPLY [Bug 51181] Add support for Web Sockets

[bugzilla]

https://issues.apache.org/bugzilla/show_bug.cgi?id=51181

--- Comment #28 from Mark Thomas  2012-02-01 10:13:31 UTC ---
An initial implementation has been added to trunk. Once the major TODOs have
been addressed, it will be back-ported to 7.0.x.

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

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

Re: [VOTE] Apache Tomcat Maven plugin 2.0-beta-1

[Olivier Lamy]

Hello,
As the others currently provided tomcat maven artifacts, adding those
in the download section doesn't have (IMHO) sense.
Because to be able to consume it within a maven build, users will have
to install it locally respecting the maven repository format layout.
So when the vote passed the files available in the staging repository
https://repository.apache.org/content/repositories/orgapachetomcat-142/
will be sync to http://repo.maven.apache.org/maven2/org/apache/tomcat/
.

What we can do at least is to add in the ASF download system the
source archive. See files *-source-release.zip* in
https://repository.apache.org/content/repositories/orgapachetomcat-142/org/apache/tomcat/maven/tomcat-maven-plugin/2.0-beta-1/

At least with the file named
tomcat-maven-plugin-2.0-beta-1-source-release.zip you can rebuild the
plugins.

Makes sense ?

2012/1/31 Konstantin Kolinko :
> 2012/1/26 Olivier Lamy :
>> Hi,
>>
>> I'd like to release the Apache Tomcat Maven plugin 2.0-beta-1.
>>
>> The staging repository is available here:
>> https://repository.apache.org/content/repositories/orgapachetomcat-142/
>> The documentation site is available here:
>> http://tomcat.apache.org/maven-plugin-2.0-beta-1/
>>
>> Changelog: http://tomcat.apache.org/maven-plugin-2.0-beta-1/jira-report.html
>>
>> Guide to test a staged release maven plugin:
>> http://maven.apache.org/guides/development/guide-testing-releases.html
>> .
>>
>> [+1]
>> [ 0]
>> [-1]
>>
>
> Where are downloadable artifacts that will be placed to the ASF mirror system?
>
> Best regards,
> Konstantin Kolinko
>
> -
> To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
> For additional commands, e-mail: dev-h...@tomcat.apache.org
>



-- 
Olivier Lamy
Talend: http://coders.talend.com
http://twitter.com/olamy | http://linkedin.com/in/olamy

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

Re: [VOTE] Apache Tomcat Maven plugin 2.0-beta-1

[sebb]

On 26 January 2012 18:05, Olivier Lamy  wrote:
> Hi,
>
> I'd like to release the Apache Tomcat Maven plugin 2.0-beta-1.
>
> The staging repository is available here:
> https://repository.apache.org/content/repositories/orgapachetomcat-142/
> The documentation site is available here:
> http://tomcat.apache.org/maven-plugin-2.0-beta-1/

Looks nice and clean, however:

There's no feather/link to the ASF in the heading.
The About page does not have an Overview as to what the plugin does;
it launches straight into the list of changes for the release

The License link MUST point to http://www.apache.org/licenses/; it
should not point to a local copy of the license.
It would be better if there was a license link at top-level, it's not
as easy to find where it is, though it would not harm to have both.

> Changelog: http://tomcat.apache.org/maven-plugin-2.0-beta-1/jira-report.html
>
> Guide to test a staged release maven plugin:
> http://maven.apache.org/guides/development/guide-testing-releases.html
> .
>
> [+1]
> [ 0]
> [-1]
>
> Here my +1
>
> Thanks
> --
> Olivier Lamy
> Talend: http://coders.talend.com
> http://twitter.com/olamy | http://linkedin.com/in/olamy
>
> -
> To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
> For additional commands, e-mail: dev-h...@tomcat.apache.org
>

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

trunk and Structure 101

[Mark Thomas]

I'm starting to look at trunk with Structure 101 and there are quite a
few dependency tangles that it would be good to clear up. Clearing these
up offers several benefits:
- simpler to modularise parts of Tomcat in the future if we want to
- easier to follow code
- better grouping of functionality in packages

I suspect it won't make sense to address all of the low-level tangles
currently reported. I'll see how things go.

Structure 101 isn't the only thing on my todo list. I plan to continue
the removal of unused code and work on the WebSockets implementation as
well.


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

buildbot failure in ASF Buildbot on tomcat-trunk

[buildbot]

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

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

Buildslave for this Build: bb-vm_ubuntu

Build Reason: scheduler
Build Source Stamp: [branch tomcat/trunk] 1239036
Blamelist: markt

BUILD FAILED: failed compile_1

sincerely,
 -The Buildbot

svn commit: r1239047 - /tomcat/maven-plugin/trunk/src/site/site.xml

[olamy]

Author: olamy
Date: Wed Feb  1 10:47:17 2012
New Revision: 1239047

URL: http://svn.apache.org/viewvc?rev=1239047&view=rev
Log:
banner right must be a link to apache home and use asf logo

Modified:
tomcat/maven-plugin/trunk/src/site/site.xml

Modified: tomcat/maven-plugin/trunk/src/site/site.xml
URL: 
http://svn.apache.org/viewvc/tomcat/maven-plugin/trunk/src/site/site.xml?rev=1239047&r1=1239046&r2=1239047&view=diff
==
--- tomcat/maven-plugin/trunk/src/site/site.xml (original)
+++ tomcat/maven-plugin/trunk/src/site/site.xml Wed Feb  1 10:47:17 2012
@@ -24,11 +24,8 @@
 http://tomcat.apache.org/
   
   
-Apache Tomcat Maven Plugin
-
-http://tomcat.apache.org/maven-plugin/
+http://www.apache.org/images/asf-logo.gif
+http://www.apache.org
   
   
 org.apache.maven.skins



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

svn commit: r1239048 - in /tomcat/trunk: java/org/apache/catalina/core/ java/org/apache/catalina/servlets/ java/org/apache/catalina/ssi/ java/org/apache/catalina/util/ java/org/apache/naming/resources

[markt]

Author: markt
Date: Wed Feb  1 10:47:17 2012
New Revision: 1239048

URL: http://svn.apache.org/viewvc?rev=1239048&view=rev
Log:
Refactor to remove the circular dependency between o.a.catalina and
o.a.naming

Added:
tomcat/trunk/java/org/apache/tomcat/util/http/RequestUtil.java
tomcat/trunk/test/org/apache/tomcat/util/http/TestRequestUtil.java
Modified:
tomcat/trunk/java/org/apache/catalina/core/ApplicationContext.java
tomcat/trunk/java/org/apache/catalina/servlets/WebdavServlet.java
tomcat/trunk/java/org/apache/catalina/ssi/SSIServletExternalResolver.java
tomcat/trunk/java/org/apache/catalina/ssi/SSIServletRequestUtil.java
tomcat/trunk/java/org/apache/catalina/util/RequestUtil.java
tomcat/trunk/java/org/apache/naming/resources/FileDirContext.java
tomcat/trunk/res/checkstyle/org-import-control.xml
tomcat/trunk/test/org/apache/catalina/util/TestRequestUtil.java

Modified: tomcat/trunk/java/org/apache/catalina/core/ApplicationContext.java
URL: 
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/core/ApplicationContext.java?rev=1239048&r1=1239047&r2=1239048&view=diff
==
--- tomcat/trunk/java/org/apache/catalina/core/ApplicationContext.java 
(original)
+++ tomcat/trunk/java/org/apache/catalina/core/ApplicationContext.java Wed Feb  
1 10:47:17 2012
@@ -67,7 +67,6 @@ import org.apache.catalina.Service;
 import org.apache.catalina.Wrapper;
 import org.apache.catalina.connector.Connector;
 import org.apache.catalina.deploy.FilterDef;
-import org.apache.catalina.util.RequestUtil;
 import org.apache.catalina.util.ResourceSet;
 import org.apache.catalina.util.ServerInfo;
 import org.apache.naming.resources.DirContextURLStreamHandler;
@@ -75,6 +74,7 @@ import org.apache.naming.resources.Resou
 import org.apache.tomcat.util.ExceptionUtils;
 import org.apache.tomcat.util.buf.CharChunk;
 import org.apache.tomcat.util.buf.MessageBytes;
+import org.apache.tomcat.util.http.RequestUtil;
 import org.apache.tomcat.util.http.mapper.MappingData;
 import org.apache.tomcat.util.res.StringManager;
 

Modified: tomcat/trunk/java/org/apache/catalina/servlets/WebdavServlet.java
URL: 
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/servlets/WebdavServlet.java?rev=1239048&r1=1239047&r2=1239048&view=diff
==
--- tomcat/trunk/java/org/apache/catalina/servlets/WebdavServlet.java (original)
+++ tomcat/trunk/java/org/apache/catalina/servlets/WebdavServlet.java Wed Feb  
1 10:47:17 2012
@@ -51,13 +51,13 @@ import javax.xml.parsers.ParserConfigura
 
 import org.apache.catalina.util.DOMWriter;
 import org.apache.catalina.util.MD5Encoder;
-import org.apache.catalina.util.RequestUtil;
 import org.apache.catalina.util.XMLWriter;
 import org.apache.naming.resources.CacheEntry;
 import org.apache.naming.resources.Resource;
 import org.apache.naming.resources.ResourceAttributes;
 import org.apache.tomcat.util.buf.B2CConverter;
 import org.apache.tomcat.util.http.FastHttpDateFormat;
+import org.apache.tomcat.util.http.RequestUtil;
 import org.w3c.dom.Document;
 import org.w3c.dom.Element;
 import org.w3c.dom.Node;
@@ -1581,7 +1581,8 @@ public class WebdavServlet
 }
 
 // Remove url encoding from destination
-destinationPath = RequestUtil.URLDecode(destinationPath, "UTF8");
+destinationPath = org.apache.catalina.util.RequestUtil.URLDecode(
+destinationPath, "UTF8");
 
 int protocolIndex = destinationPath.indexOf("://");
 if (protocolIndex >= 0) {

Modified: 
tomcat/trunk/java/org/apache/catalina/ssi/SSIServletExternalResolver.java
URL: 
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/ssi/SSIServletExternalResolver.java?rev=1239048&r1=1239047&r2=1239048&view=diff
==
--- tomcat/trunk/java/org/apache/catalina/ssi/SSIServletExternalResolver.java 
(original)
+++ tomcat/trunk/java/org/apache/catalina/ssi/SSIServletExternalResolver.java 
Wed Feb  1 10:47:17 2012
@@ -34,9 +34,9 @@ import javax.servlet.http.HttpServletReq
 import javax.servlet.http.HttpServletResponse;
 
 import org.apache.catalina.connector.Request;
-import org.apache.catalina.util.RequestUtil;
 import org.apache.coyote.Constants;
 import org.apache.tomcat.util.buf.B2CConverter;
+import org.apache.tomcat.util.http.RequestUtil;
 
 /**
  * An implementation of SSIExternalResolver that is used with servlets.

Modified: tomcat/trunk/java/org/apache/catalina/ssi/SSIServletRequestUtil.java
URL: 
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/ssi/SSIServletRequestUtil.java?rev=1239048&r1=1239047&r2=1239048&view=diff
==
--- tomcat/trunk/java/org/apache/catalina/ssi/SSIServletRequestUtil.java 
(original)
+++ tomcat/trunk/java/org/a

svn commit: r1239049 - /tomcat/trunk/java/org/apache/catalina/util/RequestUtil.java

[markt]

Author: markt
Date: Wed Feb  1 10:47:58 2012
New Revision: 1239049

URL: http://svn.apache.org/viewvc?rev=1239049&view=rev
Log:
Remove the deprecated code

Modified:
tomcat/trunk/java/org/apache/catalina/util/RequestUtil.java

Modified: tomcat/trunk/java/org/apache/catalina/util/RequestUtil.java
URL: 
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/util/RequestUtil.java?rev=1239049&r1=1239048&r2=1239049&view=diff
==
--- tomcat/trunk/java/org/apache/catalina/util/RequestUtil.java (original)
+++ tomcat/trunk/java/org/apache/catalina/util/RequestUtil.java Wed Feb  1 
10:47:58 2012
@@ -84,46 +84,6 @@ public final class RequestUtil {
 
 
 /**
- * Normalize a relative URI path that may have relative values ("/./",
- * "/../", and so on ) it it.  WARNING - This method is
- * useful only for normalizing application-generated paths.  It does not
- * try to perform security checks for malicious input.
- *
- * @param path Relative path to be normalized
- *
- * @deprecated Deprecated to resolve a circular package dependency and will
- * be removed in Tomcat 8.0.x. Use {@link
- * org.apache.tomcat.util.http.RequestUtil#normalize(String)} 
as
- * a replacement.
- */
-@Deprecated
-public static String normalize(String path) {
-return org.apache.tomcat.util.http.RequestUtil.normalize(path);
-}
-
-
-/**
- * Normalize a relative URI path that may have relative values ("/./",
- * "/../", and so on ) it it.  WARNING - This method is
- * useful only for normalizing application-generated paths.  It does not
- * try to perform security checks for malicious input.
- *
- * @param path Relative path to be normalized
- * @param replaceBackSlash Should '\\' be replaced with '/'
- *
- * @deprecated Deprecated to resolve a circular package dependency and will
- * be removed in Tomcat 8.0.x. Use {@link
- * org.apache.tomcat.util.http.RequestUtil#normalize(String,
- * boolean)} as a replacement.
- */
-@Deprecated
-public static String normalize(String path, boolean replaceBackSlash) {
-return org.apache.tomcat.util.http.RequestUtil.normalize(path,
-replaceBackSlash);
-}
-
-
-/**
  * Append request parameters from the specified String to the specified
  * Map.  It is presumed that the specified Map is not accessed from any
  * other thread, so no synchronization is performed.



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

svn commit: r1239050 - in /tomcat/trunk: java/org/apache/tomcat/util/http/RequestUtil.java test/org/apache/tomcat/util/http/TestRequestUtil.java

[markt]

Author: markt
Date: Wed Feb  1 10:49:25 2012
New Revision: 1239050

URL: http://svn.apache.org/viewvc?rev=1239050&view=rev
Log:
Fix eol style again

Modified:
tomcat/trunk/java/org/apache/tomcat/util/http/RequestUtil.java   (contents, 
props changed)
tomcat/trunk/test/org/apache/tomcat/util/http/TestRequestUtil.java   
(contents, props changed)

Modified: tomcat/trunk/java/org/apache/tomcat/util/http/RequestUtil.java
URL: 
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/tomcat/util/http/RequestUtil.java?rev=1239050&r1=1239049&r2=1239050&view=diff
==
--- tomcat/trunk/java/org/apache/tomcat/util/http/RequestUtil.java (original)
+++ tomcat/trunk/java/org/apache/tomcat/util/http/RequestUtil.java Wed Feb  1 
10:49:25 2012
@@ -1,99 +1,99 @@
-/*
- * 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.tomcat.util.http;
-
-public class RequestUtil {
-
-private RequestUtil() {
-// Hide default constructor as this is a utility class
-}
-
-
-/**
- * Normalize a relative URI path that may have relative values ("/./",
- * "/../", and so on ) it it.  WARNING - This method is
- * useful only for normalizing application-generated paths.  It does not
- * try to perform security checks for malicious input.
- *
- * @param path Relative path to be normalized
- */
-public static String normalize(String path) {
-return normalize(path, true);
-}
-
-
-/**
- * Normalize a relative URI path that may have relative values ("/./",
- * "/../", and so on ) it it.  WARNING - This method is
- * useful only for normalizing application-generated paths.  It does not
- * try to perform security checks for malicious input.
- *
- * @param path Relative path to be normalized
- * @param replaceBackSlash Should '\\' be replaced with '/'
- */
-public static String normalize(String path, boolean replaceBackSlash) {
-
-if (path == null)
-return null;
-
-// Create a place for the normalized path
-String normalized = path;
-
-if (replaceBackSlash && normalized.indexOf('\\') >= 0)
-normalized = normalized.replace('\\', '/');
-
-if (normalized.equals("/."))
-return "/";
-
-// Add a leading "/" if necessary
-if (!normalized.startsWith("/"))
-normalized = "/" + normalized;
-
-// Resolve occurrences of "//" in the normalized path
-while (true) {
-int index = normalized.indexOf("//");
-if (index < 0)
-break;
-normalized = normalized.substring(0, index) +
-normalized.substring(index + 1);
-}
-
-// Resolve occurrences of "/./" in the normalized path
-while (true) {
-int index = normalized.indexOf("/./");
-if (index < 0)
-break;
-normalized = normalized.substring(0, index) +
-normalized.substring(index + 2);
-}
-
-// Resolve occurrences of "/../" in the normalized path
-while (true) {
-int index = normalized.indexOf("/../");
-if (index < 0)
-break;
-if (index == 0)
-return (null);  // Trying to go outside our context
-int index2 = normalized.lastIndexOf('/', index - 1);
-normalized = normalized.substring(0, index2) +
-normalized.substring(index + 3);
-}
-
-// Return the normalized path that we have completed
-return (normalized);
-}
-}
+/*
+ * 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 writi

svn commit: r1239053 - in /tomcat/tc7.0.x/trunk: ./ java/org/apache/catalina/core/ java/org/apache/catalina/servlets/ java/org/apache/catalina/ssi/ java/org/apache/catalina/util/ java/org/apache/namin

[markt]

Author: markt
Date: Wed Feb  1 10:52:00 2012
New Revision: 1239053

URL: http://svn.apache.org/viewvc?rev=1239053&view=rev
Log:
Refactor to remove the circular dependency between o.a.catalina and
o.a.naming

Added:
tomcat/tc7.0.x/trunk/java/org/apache/tomcat/util/http/RequestUtil.java   
(contents, props changed)
  - copied, changed from r1239048, 
tomcat/trunk/java/org/apache/tomcat/util/http/RequestUtil.java
tomcat/tc7.0.x/trunk/test/org/apache/tomcat/util/http/TestRequestUtil.java  
 (contents, props changed)
  - copied, changed from r1239048, 
tomcat/trunk/test/org/apache/tomcat/util/http/TestRequestUtil.java
Modified:
tomcat/tc7.0.x/trunk/   (props changed)
tomcat/tc7.0.x/trunk/java/org/apache/catalina/core/ApplicationContext.java
tomcat/tc7.0.x/trunk/java/org/apache/catalina/servlets/WebdavServlet.java

tomcat/tc7.0.x/trunk/java/org/apache/catalina/ssi/SSIServletExternalResolver.java
tomcat/tc7.0.x/trunk/java/org/apache/catalina/ssi/SSIServletRequestUtil.java
tomcat/tc7.0.x/trunk/java/org/apache/catalina/util/RequestUtil.java
tomcat/tc7.0.x/trunk/java/org/apache/naming/resources/FileDirContext.java
tomcat/tc7.0.x/trunk/res/checkstyle/org-import-control.xml
tomcat/tc7.0.x/trunk/test/org/apache/catalina/util/TestRequestUtil.java
tomcat/tc7.0.x/trunk/webapps/docs/changelog.xml

Propchange: tomcat/tc7.0.x/trunk/
--
--- svn:mergeinfo (original)
+++ svn:mergeinfo Wed Feb  1 10:52:00 2012
@@ -1 +1 @@
-/tomcat/trunk:1156115,1156171,1156276,1156304,1156519,1156530,1156602,1157015,1157018,1157151,1157198,1157204,1157810,1157832,1157834,1157847,1157908,1157939,1158155,1158160,1158176,1158195,1158198-1158199,1158227,1158331,1158334-1158335,1158426,1160347,1160592,1160611,1160619,1160626,1160639,1160652,1160720-1160721,1160772,1160774,1160776,1161303,1161310,1161322,1161339,1161486,1161540,1161549,1161584,1162082,1162149,1162169,1162721,1162769,1162836,1162932,1163630,1164419,1164438,1164469,1164480,1164567,1165234,1165247-1165248,1165253,1165273,1165282,1165309,1165331,1165338,1165347,1165360-1165361,1165367-1165368,1165602,1165608,1165677,1165693,1165721,1165723,1165728,1165730,1165738,1165746,1165765,1165777,1165918,1165921,1166077,1166150-1166151,1166290,1166366,1166620,1166686,1166693,1166752,1166757,1167368,1167394,1169447,1170647,1171692,1172233-1172234,1172236,1172269,1172278,1172282,1172556,1172610,1172664,1172689,1172711,1173020-1173021,1173082,1173088,1173090,1173096
 
,1173241,1173256,1173288,117,1173342,1173461,1173614,1173630,1173659,1173722,1174061,1174239,1174322,1174325,1174329-1174330,1174337-1174339,1174343,1174353,1174799,1174882,1174884,1174975,1174983,1175155,1175158,1175167,1175182,1175190,1175201,1175272,1175275,1175283,1175582,1175589-1175590,1175594,1175602,1175613,1175633,1175690,1175713,1175798,1175889,1175896,1175907,1176584,1176590,1176799,1177050,1177060,1177125,1177152,1177160,1177245,1177850,1177862,1177978,1178209,1178228,1178233,1178449,1178542,1178681,1178684,1178721,1179268,1179274,1180261,1180865,1180891,1180894,1180907,1181028,1181123,1181125,1181136,1181291,1181743,1182796,1183078,1183105,1183142,1183328,1183339-1183340,1183492-1183494,1183605,1184917,1184919,1185018,1185020,1185200,1185588,1185626,1185756,1185758,1186011,1186042-1186045,1186104,1186123,1186137,1186153,1186254,1186257,1186377-1186379,1186479-1186480,1186712,1186743,1186750,1186763,1186890-1186892,1186894,1186949,1187018,1187027-1187028,1187
 
381,1187753,1187755,1187775,1187801,1187806,1187809,1187827,1188301,1188303-1188305,1188399,1188822,1188930-1188931,1189116,1189129,1189183,1189240,1189256,1189386,1189413-1189414,1189477,1189685,1189805,1189857,1189864,1189882,1190034,1190185,1190279,1190339,1190371,1190388-1190389,1190474,1190481,1194915,1195222-1195223,1195531,1195899,1195905,1195943,1195949,1195953,1195955,1195965,1195968,1196175,1196212,1196223,1196304-1196305,1196735,1196825,1196827,1197158,1197261,1197263,1197299-1197300,1197305,1197339-1197340,1197343,1197382,1197386-1197387,1197480,1197578,1198497,1198528,1198552,1198602,1198604,1198607,1198622,1198640,1198696,1198707,1199418,1199432,1199436,1199513,1199529,1199980,116,1200056,1200089,1200106-1200107,1200263,1200316,1200320,1200398-1200399,1200445-1200446,1200555,1200627,1200696,1200725,1200937,1200941,1201069,1201087,1201180,1201235-1201237,1201508,1201521,1201542,1201545-1201546,1201548,1201555-1201556,1201568,1201576,1201608,1201921-1201922,1
 
201931,1202035,1202039,1202271,1202565,1202578,1202705,1202828,1202860,1203047-1203052,1203078,1203091,1203253,1203278,1204182,1204856,1204867,1204936,1204938,1204982,1205033,1205065,1205082,1205097,1205112,1206200,1207692,1208046,1208073,1208096,1208114,1208145,1208772,1209194,1209277-1209278,1209686-1209731,1210894,1212091,1212095,1212099,1212118,1213469,1213906,1214853,1214855,1214864,1215115,1215118-1215119,1215121,1220293,1220295,1221038,1221842,1222189,1222

svn commit: r1239057 - /tomcat/maven-plugin/trunk/pom.xml

[olamy]

Author: olamy
Date: Wed Feb  1 10:58:21 2012
New Revision: 1239057

URL: http://svn.apache.org/viewvc?rev=1239057&view=rev
Log:
don't use local LICENSE local copy in license report but link to file in asf 
web site

Modified:
tomcat/maven-plugin/trunk/pom.xml

Modified: tomcat/maven-plugin/trunk/pom.xml
URL: 
http://svn.apache.org/viewvc/tomcat/maven-plugin/trunk/pom.xml?rev=1239057&r1=1239056&r2=1239057&view=diff
==
--- tomcat/maven-plugin/trunk/pom.xml (original)
+++ tomcat/maven-plugin/trunk/pom.xml Wed Feb  1 10:58:21 2012
@@ -652,6 +652,14 @@
 
   
 org.apache.maven.plugins
+maven-project-info-reports-plugin
+2.4
+
+  true
+
+  
+  
+org.apache.maven.plugins
 maven-plugin-plugin
 2.9
 



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

svn commit: r1239060 - in /tomcat/trunk/java/org/apache/catalina: CatalinaFactory.java core/ContainerBase.java

[markt]

Author: markt
Date: Wed Feb  1 11:03:14 2012
New Revision: 1239060

URL: http://svn.apache.org/viewvc?rev=1239060&view=rev
Log:
Prep to remove a circular dependency

Modified:
tomcat/trunk/java/org/apache/catalina/CatalinaFactory.java
tomcat/trunk/java/org/apache/catalina/core/ContainerBase.java

Modified: tomcat/trunk/java/org/apache/catalina/CatalinaFactory.java
URL: 
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/CatalinaFactory.java?rev=1239060&r1=1239059&r2=1239060&view=diff
==
--- tomcat/trunk/java/org/apache/catalina/CatalinaFactory.java (original)
+++ tomcat/trunk/java/org/apache/catalina/CatalinaFactory.java Wed Feb  1 
11:03:14 2012
@@ -26,7 +26,8 @@ import org.apache.catalina.core.Standard
  * there is demand it can be extended to support alternative factories and/or
  * alternative defaults.
  *
- * TODO: Create the other standard components via this factory
+ * @deprecated There was no demand for this capability and it will be removed 
in
+ * Tomact 8.0.x
  */
 public class CatalinaFactory {
 

Modified: tomcat/trunk/java/org/apache/catalina/core/ContainerBase.java
URL: 
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/core/ContainerBase.java?rev=1239060&r1=1239059&r2=1239060&view=diff
==
--- tomcat/trunk/java/org/apache/catalina/core/ContainerBase.java (original)
+++ tomcat/trunk/java/org/apache/catalina/core/ContainerBase.java Wed Feb  1 
11:03:14 2012
@@ -40,7 +40,6 @@ import javax.management.ObjectName;
 import javax.naming.directory.DirContext;
 
 import org.apache.catalina.AccessLog;
-import org.apache.catalina.CatalinaFactory;
 import org.apache.catalina.Cluster;
 import org.apache.catalina.Container;
 import org.apache.catalina.ContainerEvent;
@@ -228,8 +227,7 @@ public abstract class ContainerBase exte
 /**
  * The Pipeline object with which this Container is associated.
  */
-protected Pipeline pipeline =
-CatalinaFactory.getFactory().createPipeline(this);
+protected Pipeline pipeline = new StandardPipeline(this);
 
 
 /**



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

svn commit: r1239063 - /tomcat/trunk/java/org/apache/catalina/CatalinaFactory.java

[markt]

Author: markt
Date: Wed Feb  1 11:04:03 2012
New Revision: 1239063

URL: http://svn.apache.org/viewvc?rev=1239063&view=rev
Log:
Remove deprecated code

Removed:
tomcat/trunk/java/org/apache/catalina/CatalinaFactory.java


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

svn commit: r1239064 - /tomcat/maven-plugin/trunk/src/site/site.xml

[olamy]

Author: olamy
Date: Wed Feb  1 11:04:10 2012
New Revision: 1239064

URL: http://svn.apache.org/viewvc?rev=1239064&view=rev
Log:
add a breadcrumb item pointed to main Apache web site

Modified:
tomcat/maven-plugin/trunk/src/site/site.xml

Modified: tomcat/maven-plugin/trunk/src/site/site.xml
URL: 
http://svn.apache.org/viewvc/tomcat/maven-plugin/trunk/src/site/site.xml?rev=1239064&r1=1239063&r2=1239064&view=diff
==
--- tomcat/maven-plugin/trunk/src/site/site.xml (original)
+++ tomcat/maven-plugin/trunk/src/site/site.xml Wed Feb  1 11:04:10 2012
@@ -37,6 +37,7 @@
 
   
 
+  http://www.apache.org/"; />
   http://tomcat.apache.org/"; />
   
 



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

svn commit: r1239065 - in /tomcat/trunk/java/org/apache/catalina: Context.java core/StandardContext.java startup/FailedContext.java

[markt]

Author: markt
Date: Wed Feb  1 11:04:47 2012
New Revision: 1239065

URL: http://svn.apache.org/viewvc?rev=1239065&view=rev
Log:
Use interface rather than internal implementation

Modified:
tomcat/trunk/java/org/apache/catalina/Context.java
tomcat/trunk/java/org/apache/catalina/core/StandardContext.java
tomcat/trunk/java/org/apache/catalina/startup/FailedContext.java

Modified: tomcat/trunk/java/org/apache/catalina/Context.java
URL: 
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/Context.java?rev=1239065&r1=1239064&r2=1239065&view=diff
==
--- tomcat/trunk/java/org/apache/catalina/Context.java (original)
+++ tomcat/trunk/java/org/apache/catalina/Context.java Wed Feb  1 11:04:47 2012
@@ -14,21 +14,18 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-
-
 package org.apache.catalina;
 
-
 import java.net.URL;
 import java.util.Set;
 
 import javax.servlet.ServletContainerInitializer;
 import javax.servlet.ServletContext;
+import javax.servlet.ServletRegistration;
 import javax.servlet.ServletRequest;
 import javax.servlet.ServletSecurityElement;
 import javax.servlet.descriptor.JspConfigDescriptor;
 
-import org.apache.catalina.core.ApplicationServletRegistration;
 import org.apache.catalina.deploy.ApplicationParameter;
 import org.apache.catalina.deploy.ErrorPage;
 import org.apache.catalina.deploy.FilterDef;
@@ -40,7 +37,6 @@ import org.apache.catalina.util.CharsetM
 import org.apache.tomcat.JarScanner;
 import org.apache.tomcat.util.http.mapper.Mapper;
 
-
 /**
  * A Context is a Container that represents a servlet context, and
  * therefore an individual web application, in the Catalina servlet engine.
@@ -60,7 +56,6 @@ import org.apache.tomcat.util.http.mappe
  * @author Craig R. McClanahan
  * @version $Id$
  */
-
 public interface Context extends Container {
 
 
@@ -1320,7 +1315,7 @@ public interface Context extends Contain
  * @return urls currently mapped to this registration that are already
  * present in web.xml
  */
-Set addServletSecurity(ApplicationServletRegistration registration,
+Set addServletSecurity(ServletRegistration.Dynamic registration,
 ServletSecurityElement servletSecurityElement);
 
 /**

Modified: tomcat/trunk/java/org/apache/catalina/core/StandardContext.java
URL: 
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/core/StandardContext.java?rev=1239065&r1=1239064&r2=1239065&view=diff
==
--- tomcat/trunk/java/org/apache/catalina/core/StandardContext.java (original)
+++ tomcat/trunk/java/org/apache/catalina/core/StandardContext.java Wed Feb  1 
11:04:47 2012
@@ -5563,7 +5563,7 @@ public class StandardContext extends Con
 
 @Override
 public Set addServletSecurity(
-ApplicationServletRegistration registration,
+ServletRegistration.Dynamic registration,
 ServletSecurityElement servletSecurityElement) {
 
 Set conflicts = new HashSet();

Modified: tomcat/trunk/java/org/apache/catalina/startup/FailedContext.java
URL: 
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/startup/FailedContext.java?rev=1239065&r1=1239064&r2=1239065&view=diff
==
--- tomcat/trunk/java/org/apache/catalina/startup/FailedContext.java (original)
+++ tomcat/trunk/java/org/apache/catalina/startup/FailedContext.java Wed Feb  1 
11:04:47 2012
@@ -23,6 +23,7 @@ import java.util.Set;
 import javax.naming.directory.DirContext;
 import javax.servlet.ServletContainerInitializer;
 import javax.servlet.ServletContext;
+import javax.servlet.ServletRegistration;
 import javax.servlet.ServletRequest;
 import javax.servlet.ServletSecurityElement;
 import javax.servlet.descriptor.JspConfigDescriptor;
@@ -42,7 +43,6 @@ import org.apache.catalina.Valve;
 import org.apache.catalina.Wrapper;
 import org.apache.catalina.connector.Request;
 import org.apache.catalina.connector.Response;
-import org.apache.catalina.core.ApplicationServletRegistration;
 import org.apache.catalina.deploy.ApplicationParameter;
 import org.apache.catalina.deploy.ErrorPage;
 import org.apache.catalina.deploy.FilterDef;
@@ -604,7 +604,7 @@ public class FailedContext extends Lifec
 
 @Override
 public Set addServletSecurity(
-ApplicationServletRegistration registration,
+ServletRegistration.Dynamic registration,
 ServletSecurityElement servletSecurityElement) { return null; }
 
 @Override



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

svn commit: r1239066 - in /tomcat/tc7.0.x/trunk: ./ java/org/apache/catalina/CatalinaFactory.java java/org/apache/catalina/core/ContainerBase.java

[markt]

Author: markt
Date: Wed Feb  1 11:05:58 2012
New Revision: 1239066

URL: http://svn.apache.org/viewvc?rev=1239066&view=rev
Log:
Deprecate code that will be removed

Modified:
tomcat/tc7.0.x/trunk/   (props changed)
tomcat/tc7.0.x/trunk/java/org/apache/catalina/CatalinaFactory.java
tomcat/tc7.0.x/trunk/java/org/apache/catalina/core/ContainerBase.java

Propchange: tomcat/tc7.0.x/trunk/
--
--- svn:mergeinfo (original)
+++ svn:mergeinfo Wed Feb  1 11:05:58 2012
@@ -1 +1 @@
-/tomcat/trunk:1156115,1156171,1156276,1156304,1156519,1156530,1156602,1157015,1157018,1157151,1157198,1157204,1157810,1157832,1157834,1157847,1157908,1157939,1158155,1158160,1158176,1158195,1158198-1158199,1158227,1158331,1158334-1158335,1158426,1160347,1160592,1160611,1160619,1160626,1160639,1160652,1160720-1160721,1160772,1160774,1160776,1161303,1161310,1161322,1161339,1161486,1161540,1161549,1161584,1162082,1162149,1162169,1162721,1162769,1162836,1162932,1163630,1164419,1164438,1164469,1164480,1164567,1165234,1165247-1165248,1165253,1165273,1165282,1165309,1165331,1165338,1165347,1165360-1165361,1165367-1165368,1165602,1165608,1165677,1165693,1165721,1165723,1165728,1165730,1165738,1165746,1165765,1165777,1165918,1165921,1166077,1166150-1166151,1166290,1166366,1166620,1166686,1166693,1166752,1166757,1167368,1167394,1169447,1170647,1171692,1172233-1172234,1172236,1172269,1172278,1172282,1172556,1172610,1172664,1172689,1172711,1173020-1173021,1173082,1173088,1173090,1173096
 
,1173241,1173256,1173288,117,1173342,1173461,1173614,1173630,1173659,1173722,1174061,1174239,1174322,1174325,1174329-1174330,1174337-1174339,1174343,1174353,1174799,1174882,1174884,1174975,1174983,1175155,1175158,1175167,1175182,1175190,1175201,1175272,1175275,1175283,1175582,1175589-1175590,1175594,1175602,1175613,1175633,1175690,1175713,1175798,1175889,1175896,1175907,1176584,1176590,1176799,1177050,1177060,1177125,1177152,1177160,1177245,1177850,1177862,1177978,1178209,1178228,1178233,1178449,1178542,1178681,1178684,1178721,1179268,1179274,1180261,1180865,1180891,1180894,1180907,1181028,1181123,1181125,1181136,1181291,1181743,1182796,1183078,1183105,1183142,1183328,1183339-1183340,1183492-1183494,1183605,1184917,1184919,1185018,1185020,1185200,1185588,1185626,1185756,1185758,1186011,1186042-1186045,1186104,1186123,1186137,1186153,1186254,1186257,1186377-1186379,1186479-1186480,1186712,1186743,1186750,1186763,1186890-1186892,1186894,1186949,1187018,1187027-1187028,1187
 
381,1187753,1187755,1187775,1187801,1187806,1187809,1187827,1188301,1188303-1188305,1188399,1188822,1188930-1188931,1189116,1189129,1189183,1189240,1189256,1189386,1189413-1189414,1189477,1189685,1189805,1189857,1189864,1189882,1190034,1190185,1190279,1190339,1190371,1190388-1190389,1190474,1190481,1194915,1195222-1195223,1195531,1195899,1195905,1195943,1195949,1195953,1195955,1195965,1195968,1196175,1196212,1196223,1196304-1196305,1196735,1196825,1196827,1197158,1197261,1197263,1197299-1197300,1197305,1197339-1197340,1197343,1197382,1197386-1197387,1197480,1197578,1198497,1198528,1198552,1198602,1198604,1198607,1198622,1198640,1198696,1198707,1199418,1199432,1199436,1199513,1199529,1199980,116,1200056,1200089,1200106-1200107,1200263,1200316,1200320,1200398-1200399,1200445-1200446,1200555,1200627,1200696,1200725,1200937,1200941,1201069,1201087,1201180,1201235-1201237,1201508,1201521,1201542,1201545-1201546,1201548,1201555-1201556,1201568,1201576,1201608,1201921-1201922,1
 
201931,1202035,1202039,1202271,1202565,1202578,1202705,1202828,1202860,1203047-1203052,1203078,1203091,1203253,1203278,1204182,1204856,1204867,1204936,1204938,1204982,1205033,1205065,1205082,1205097,1205112,1206200,1207692,1208046,1208073,1208096,1208114,1208145,1208772,1209194,1209277-1209278,1209686-1209731,1210894,1212091,1212095,1212099,1212118,1213469,1213906,1214853,1214855,1214864,1215115,1215118-1215119,1215121,1220293,1220295,1221038,1221842,1222189,101,176,1222300,1222690,1222850,1222852,1222855,1224607,1224617,1224648-1224652,1224657,1224662-1224663,1224682,1224801,1224910,1225000,1225219,1225343,1225465,1225627,1225629,1225634,1226069,1226158-1226159,1226177,1226196,1226214-1226215,1226385,1226394,1226500,1226537-1226538,1226546,1226551,1226975,1228196,1228360,1228376,1228724,1228908,1228918,1228920,1228922,1228929,1228969,1229307,1229536,1229549,1229724,1229726-1229731,1229997,1230539,1230711,1230729,1230762-1230763,1230765,1230955,1230957,1231285,123129
 
0,1231308,1231310,1231337,1231460-1231461,1231542-1231543,1231546-1231547,1231620-1231621,1231624-1231625,1231630,1231654-1231655,1231738,1231740,1231762-1231763,1231856,1231886,1231923,1231947,1232345,1232368,1232380,1232447,1232760,1232813,1232842-1232843,1232869,1233413,1233423,1233426,1234143,1234567,1235207,1236906-1236907,1236914,1237146,1237154-1237156,1237332,1237334,1237425,1237427,1237604,1237975,1237981,1237985,1238070,1238073,1239024,1239048,1239050
+/

svn commit: r1239069 - /tomcat/maven-plugin/trunk/src/site/site.xml

[olamy]

Author: olamy
Date: Wed Feb  1 11:06:33 2012
New Revision: 1239069

URL: http://svn.apache.org/viewvc?rev=1239069&view=rev
Log:
add a menu item to asf licenses page

Modified:
tomcat/maven-plugin/trunk/src/site/site.xml

Modified: tomcat/maven-plugin/trunk/src/site/site.xml
URL: 
http://svn.apache.org/viewvc/tomcat/maven-plugin/trunk/src/site/site.xml?rev=1239069&r1=1239068&r2=1239069&view=diff
==
--- tomcat/maven-plugin/trunk/src/site/site.xml (original)
+++ tomcat/maven-plugin/trunk/src/site/site.xml Wed Feb  1 11:06:33 2012
@@ -51,7 +51,7 @@
   
   
   
-
+  http://www.apache.org/licenses/"/>
 
 
 



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

Re: [VOTE] Apache Tomcat Maven plugin 2.0-beta-1

[Olivier Lamy]

Hello,
Thanks for those suggestions !
2012/2/1 sebb :
> On 26 January 2012 18:05, Olivier Lamy  wrote:
>> Hi,
>>
>> I'd like to release the Apache Tomcat Maven plugin 2.0-beta-1.
>>
>> The staging repository is available here:
>> https://repository.apache.org/content/repositories/orgapachetomcat-142/
>> The documentation site is available here:
>> http://tomcat.apache.org/maven-plugin-2.0-beta-1/
>
> Looks nice and clean, however:
>
> There's no feather/link to the ASF in the heading.
Agree and fixed in trunk.
> The About page does not have an Overview as to what the plugin does;
> it launches straight into the list of changes for the release
This page http://tomcat.apache.org/maven-plugin-2.0-beta-1/ is not an
enough summary of what the plugins (tomcat6/7) does ?
>
> The License link MUST point to http://www.apache.org/licenses/; it
> should not point to a local copy of the license.
fixed too in trunk
> It would be better if there was a license link at top-level, it's not
> as easy to find where it is, though it would not harm to have both.
fixed too in trunk
>
>> Changelog: http://tomcat.apache.org/maven-plugin-2.0-beta-1/jira-report.html
>>
>> Guide to test a staged release maven plugin:
>> http://maven.apache.org/guides/development/guide-testing-releases.html
>> .
>>
>> [+1]
>> [ 0]
>> [-1]
>>
>> Here my +1
>>
>> Thanks
>> --
>> Olivier Lamy
>> Talend: http://coders.talend.com
>> http://twitter.com/olamy | http://linkedin.com/in/olamy
>>
>> -
>> To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
>> For additional commands, e-mail: dev-h...@tomcat.apache.org
>>
>
> -
> To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
> For additional commands, e-mail: dev-h...@tomcat.apache.org
>



-- 
Olivier Lamy
Talend: http://coders.talend.com
http://twitter.com/olamy | http://linkedin.com/in/olamy

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

svn commit: r1239082 - in /tomcat/trunk/java/org/apache/catalina: core/LocalStrings.properties core/StandardContext.java loader/WebappLoader.java

[markt]

Author: markt
Date: Wed Feb  1 11:32:56 2012
New Revision: 1239082

URL: http://svn.apache.org/viewvc?rev=1239082&view=rev
Log:
Remove dependency on StandardContext from WebappLoader

Modified:
tomcat/trunk/java/org/apache/catalina/core/LocalStrings.properties
tomcat/trunk/java/org/apache/catalina/core/StandardContext.java
tomcat/trunk/java/org/apache/catalina/loader/WebappLoader.java

Modified: tomcat/trunk/java/org/apache/catalina/core/LocalStrings.properties
URL: 
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/core/LocalStrings.properties?rev=1239082&r1=1239081&r2=1239082&view=diff
==
--- tomcat/trunk/java/org/apache/catalina/core/LocalStrings.properties 
(original)
+++ tomcat/trunk/java/org/apache/catalina/core/LocalStrings.properties Wed Feb  
1 11:32:56 2012
@@ -123,6 +123,7 @@ standardContext.startFailed=Context [{0}
 standardContext.startingContext=Exception starting Context with name [{0}]
 standardContext.stoppingContext=Exception stopping Context with name [{0}]
 standardContext.urlPattern.patternWarning=WARNING: URL pattern {0} must start 
with a ''/'' in Servlet 2.4
+standardContext.webappClassLoader.missingProperty=Unable to set the web 
application class loader property [{0}] to [{1}] as the property does not exist.
 standardContext.workPath=Exception obtaining work path for context [{0}]
 standardContext.workCreateException=Failed to determine absolute work 
directory from directory [{0}] and CATALINA_HOME [{1}] for context [{2}]
 standardContext.workCreateFail=Failed to create work directory [{0}] for 
context [{1}]

Modified: tomcat/trunk/java/org/apache/catalina/core/StandardContext.java
URL: 
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/core/StandardContext.java?rev=1239082&r1=1239081&r2=1239082&view=diff
==
--- tomcat/trunk/java/org/apache/catalina/core/StandardContext.java (original)
+++ tomcat/trunk/java/org/apache/catalina/core/StandardContext.java Wed Feb  1 
11:32:56 2012
@@ -116,6 +116,7 @@ import org.apache.naming.resources.WARDi
 import org.apache.tomcat.InstanceManager;
 import org.apache.tomcat.JarScanner;
 import org.apache.tomcat.util.ExceptionUtils;
+import org.apache.tomcat.util.IntrospectionUtils;
 import org.apache.tomcat.util.modeler.Registry;
 import org.apache.tomcat.util.scan.StandardJarScanner;
 
@@ -5032,6 +5033,16 @@ public class StandardContext extends Con
 
 // since the loader just started, the webapp classloader is now
 // created.
+setClassLoaderProperty("antiJARLocking", getAntiJARLocking());
+setClassLoaderProperty("clearReferencesStatic",
+getClearReferencesStatic());
+setClassLoaderProperty("clearReferencesStopThreads",
+getClearReferencesStopThreads());
+setClassLoaderProperty("clearReferencesStopTimerThreads",
+getClearReferencesStopTimerThreads());
+
setClassLoaderProperty("clearReferencesHttpClientKeepAliveThread",
+getClearReferencesHttpClientKeepAliveThread());
+
 // By calling unbindThread and bindThread in a row, we setup 
the
 // current Thread CCL to be the webapp classloader
 unbindThread(oldCCL);
@@ -5232,6 +5243,16 @@ public class StandardContext extends Con
 }
 }
 
+private void setClassLoaderProperty(String name, boolean value) {
+ClassLoader cl = getLoader().getClassLoader();
+if (IntrospectionUtils.setProperty(cl, name, Boolean.toString(value))) 
{
+// Failed to set
+log.info(sm.getString(
+"standardContext.webappClassLoader.missingProperty",
+name, Boolean.toString(value)));
+}
+}
+
 private Map> buildInjectionMap(NamingResources 
namingResources) {
 Map> injectionMap = new HashMap>();
 for (Injectable resource: namingResources.findLocalEjbs()) {

Modified: tomcat/trunk/java/org/apache/catalina/loader/WebappLoader.java
URL: 
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/loader/WebappLoader.java?rev=1239082&r1=1239081&r2=1239082&view=diff
==
--- tomcat/trunk/java/org/apache/catalina/loader/WebappLoader.java (original)
+++ tomcat/trunk/java/org/apache/catalina/loader/WebappLoader.java Wed Feb  1 
11:32:56 2012
@@ -53,7 +53,6 @@ import org.apache.catalina.Lifecycle;
 import org.apache.catalina.LifecycleException;
 import org.apache.catalina.LifecycleState;
 import org.apache.catalina.Loader;
-import org.apache.catalina.core.StandardContext;
 import org.apache.catalina.mbeans.MBeanUtils;
 import org.apache.catalina.util.LifecycleMBeanBase;
 import org.apache.naming.r

Re: [VOTE] Apache Tomcat Maven plugin 2.0-beta-1

[sebb]

On 1 February 2012 11:13, Olivier Lamy  wrote:
> Hello,
> Thanks for those suggestions !
> 2012/2/1 sebb :
>> On 26 January 2012 18:05, Olivier Lamy  wrote:
>>> Hi,
>>>
>>> I'd like to release the Apache Tomcat Maven plugin 2.0-beta-1.
>>>
>>> The staging repository is available here:
>>> https://repository.apache.org/content/repositories/orgapachetomcat-142/
>>> The documentation site is available here:
>>> http://tomcat.apache.org/maven-plugin-2.0-beta-1/
>>
>> Looks nice and clean, however:
>>
>> There's no feather/link to the ASF in the heading.
> Agree and fixed in trunk.
>> The About page does not have an Overview as to what the plugin does;
>> it launches straight into the list of changes for the release
> This page http://tomcat.apache.org/maven-plugin-2.0-beta-1/ is not an
> enough summary of what the plugins (tomcat6/7) does ?

There are brief details, but they are buried amongst details of the
recent changes.

The overview needs to come before the changes, and be clearly
identified as such, for example:

>>>
*Apache Tomcat Maven Plugin*

This is the new home for the Tomcat Maven Plugin (previously hosted at
Codehaus).

The Tomcat Maven Plugin provides goals to manipulate WAR projects
within the Apache Tomcat servlet container.

Or to run your war project in an embeded Apache Tomcat. The run goal
give you the opportunity to develop quickly your application without
any huge install to do manually. More details and features: see
documentation.

*Recent Changes*

Version 2.0-beta-1 has the following new features:
etc.
<<<


>>
>> The License link MUST point to http://www.apache.org/licenses/; it
>> should not point to a local copy of the license.
> fixed too in trunk
>> It would be better if there was a license link at top-level, it's not
>> as easy to find where it is, though it would not harm to have both.
> fixed too in trunk
>>
>>> Changelog: http://tomcat.apache.org/maven-plugin-2.0-beta-1/jira-report.html
>>>
>>> Guide to test a staged release maven plugin:
>>> http://maven.apache.org/guides/development/guide-testing-releases.html
>>> .
>>>
>>> [+1]
>>> [ 0]
>>> [-1]
>>>
>>> Here my +1
>>>
>>> Thanks
>>> --
>>> Olivier Lamy
>>> Talend: http://coders.talend.com
>>> http://twitter.com/olamy | http://linkedin.com/in/olamy
>>>
>>> -
>>> To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
>>> For additional commands, e-mail: dev-h...@tomcat.apache.org
>>>
>>
>> -
>> To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
>> For additional commands, e-mail: dev-h...@tomcat.apache.org
>>
>
>
>
> --
> Olivier Lamy
> Talend: http://coders.talend.com
> http://twitter.com/olamy | http://linkedin.com/in/olamy
>
> -
> To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
> For additional commands, e-mail: dev-h...@tomcat.apache.org
>

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

Re: [VOTE] Apache Tomcat Maven plugin 2.0-beta-1

[sebb]

On 1 February 2012 10:14, Olivier Lamy  wrote:
> Hello,
> As the others currently provided tomcat maven artifacts, adding those
> in the download section doesn't have (IMHO) sense.
> Because to be able to consume it within a maven build, users will have
> to install it locally respecting the maven repository format layout.
> So when the vote passed the files available in the staging repository
> https://repository.apache.org/content/repositories/orgapachetomcat-142/
> will be sync to http://repo.maven.apache.org/maven2/org/apache/tomcat/
> .
>
> What we can do at least is to add in the ASF download system the
> source archive. See files *-source-release.zip* in
> https://repository.apache.org/content/repositories/orgapachetomcat-142/org/apache/tomcat/maven/tomcat-maven-plugin/2.0-beta-1/
>
> At least with the file named
> tomcat-maven-plugin-2.0-beta-1-source-release.zip you can rebuild the
> plugins.
>
> Makes sense ?

Apache Commons also releases code which is mainly consumed by Maven users.
All the components are released to the Apache mirrors (as source and
binary archives) as well as to Maven Central (as jars, with additional
src and javadoc jars).
Same as Tomcat itself, really.

> 2012/1/31 Konstantin Kolinko :
>> 2012/1/26 Olivier Lamy :
>>> Hi,
>>>
>>> I'd like to release the Apache Tomcat Maven plugin 2.0-beta-1.
>>>
>>> The staging repository is available here:
>>> https://repository.apache.org/content/repositories/orgapachetomcat-142/
>>> The documentation site is available here:
>>> http://tomcat.apache.org/maven-plugin-2.0-beta-1/
>>>
>>> Changelog: http://tomcat.apache.org/maven-plugin-2.0-beta-1/jira-report.html
>>>
>>> Guide to test a staged release maven plugin:
>>> http://maven.apache.org/guides/development/guide-testing-releases.html
>>> .
>>>
>>> [+1]
>>> [ 0]
>>> [-1]
>>>
>>
>> Where are downloadable artifacts that will be placed to the ASF mirror 
>> system?
>>
>> Best regards,
>> Konstantin Kolinko
>>
>> -
>> To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
>> For additional commands, e-mail: dev-h...@tomcat.apache.org
>>
>
>
>
> --
> Olivier Lamy
> Talend: http://coders.talend.com
> http://twitter.com/olamy | http://linkedin.com/in/olamy
>
> -
> To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
> For additional commands, e-mail: dev-h...@tomcat.apache.org
>

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

Re: [VOTE] Apache Tomcat Maven plugin 2.0-beta-1

[Olivier Lamy]

2012/2/1 sebb :
> On 1 February 2012 10:14, Olivier Lamy  wrote:
>> Hello,
>> As the others currently provided tomcat maven artifacts, adding those
>> in the download section doesn't have (IMHO) sense.
>> Because to be able to consume it within a maven build, users will have
>> to install it locally respecting the maven repository format layout.
>> So when the vote passed the files available in the staging repository
>> https://repository.apache.org/content/repositories/orgapachetomcat-142/
>> will be sync to http://repo.maven.apache.org/maven2/org/apache/tomcat/
>> .
>>
>> What we can do at least is to add in the ASF download system the
>> source archive. See files *-source-release.zip* in
>> https://repository.apache.org/content/repositories/orgapachetomcat-142/org/apache/tomcat/maven/tomcat-maven-plugin/2.0-beta-1/
>>
>> At least with the file named
>> tomcat-maven-plugin-2.0-beta-1-source-release.zip you can rebuild the
>> plugins.
>>
>> Makes sense ?
>
> Apache Commons also releases code which is mainly consumed by Maven users.
> All the components are released to the Apache mirrors (as source and
> binary archives) as well as to Maven Central (as jars, with additional
> src and javadoc jars).
> Same as Tomcat itself, really.

For commons it's artifacts/jars which can be consume "manually" but
AFAIK consuming "manually" maven plugins jars doesn't have sense IMHO.
If the case of a Maven plugin, I can put the jars in something like
http://apache.multidist.com/tomcat/maven-plugin/ but so how will you
use it ? installing manually using mvn install: ?

And If I go here : http://apache.multidist.com/tomcat/tomcat-7/v7.0.25/bin/
I don't see maven artifacts which are available here:
http://repo.maven.apache.org/maven2/org/apache/tomcat/tomcat-api/7.0.25/
or here 
http://repo.maven.apache.org/maven2/org/apache/tomcat/embed/tomcat-embed-core/7.0.25/
etc...




>
>> 2012/1/31 Konstantin Kolinko :
>>> 2012/1/26 Olivier Lamy :
 Hi,

 I'd like to release the Apache Tomcat Maven plugin 2.0-beta-1.

 The staging repository is available here:
 https://repository.apache.org/content/repositories/orgapachetomcat-142/
 The documentation site is available here:
 http://tomcat.apache.org/maven-plugin-2.0-beta-1/

 Changelog: 
 http://tomcat.apache.org/maven-plugin-2.0-beta-1/jira-report.html

 Guide to test a staged release maven plugin:
 http://maven.apache.org/guides/development/guide-testing-releases.html
 .

 [+1]
 [ 0]
 [-1]

>>>
>>> Where are downloadable artifacts that will be placed to the ASF mirror 
>>> system?
>>>
>>> Best regards,
>>> Konstantin Kolinko
>>>
>>> -
>>> To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
>>> For additional commands, e-mail: dev-h...@tomcat.apache.org
>>>
>>
>>
>>
>> --
>> Olivier Lamy
>> Talend: http://coders.talend.com
>> http://twitter.com/olamy | http://linkedin.com/in/olamy
>>
>> -
>> To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
>> For additional commands, e-mail: dev-h...@tomcat.apache.org
>>
>
> -
> To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
> For additional commands, e-mail: dev-h...@tomcat.apache.org
>



-- 
Olivier Lamy
Talend: http://coders.talend.com
http://twitter.com/olamy | http://linkedin.com/in/olamy

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

Re: [VOTE] Apache Tomcat Maven plugin 2.0-beta-1

[sebb]

On 1 February 2012 11:56, Olivier Lamy  wrote:
> 2012/2/1 sebb :
>> On 1 February 2012 10:14, Olivier Lamy  wrote:
>>> Hello,
>>> As the others currently provided tomcat maven artifacts, adding those
>>> in the download section doesn't have (IMHO) sense.
>>> Because to be able to consume it within a maven build, users will have
>>> to install it locally respecting the maven repository format layout.
>>> So when the vote passed the files available in the staging repository
>>> https://repository.apache.org/content/repositories/orgapachetomcat-142/
>>> will be sync to http://repo.maven.apache.org/maven2/org/apache/tomcat/
>>> .
>>>
>>> What we can do at least is to add in the ASF download system the
>>> source archive. See files *-source-release.zip* in
>>> https://repository.apache.org/content/repositories/orgapachetomcat-142/org/apache/tomcat/maven/tomcat-maven-plugin/2.0-beta-1/
>>>
>>> At least with the file named
>>> tomcat-maven-plugin-2.0-beta-1-source-release.zip you can rebuild the
>>> plugins.
>>>
>>> Makes sense ?
>>
>> Apache Commons also releases code which is mainly consumed by Maven users.
>> All the components are released to the Apache mirrors (as source and
>> binary archives) as well as to Maven Central (as jars, with additional
>> src and javadoc jars).
>> Same as Tomcat itself, really.
>
> For commons it's artifacts/jars which can be consume "manually" but
> AFAIK consuming "manually" maven plugins jars doesn't have sense IMHO.

The ASF releases source - from which it must be possible to build the plugin.
That's not generally easy or even possible from the jars that are
released to Maven Central.

> If the case of a Maven plugin, I can put the jars in something like
> http://apache.multidist.com/tomcat/maven-plugin/ but so how will you
> use it ? installing manually using mvn install: ?

You don't; you use the copies in Maven Central.

> And If I go here : http://apache.multidist.com/tomcat/tomcat-7/v7.0.25/bin/
> I don't see maven artifacts which are available here:
> http://repo.maven.apache.org/maven2/org/apache/tomcat/tomcat-api/7.0.25/

Exactly.

Tomcat (as Commons) releases are made to *both* the mirrors *and* Maven Central.

The ASF mirrors are for source and binary archives.
The Maven Central repo is used for the binary jars, along with pom and
accompanying source/javadoc jars.

> or here 
> http://repo.maven.apache.org/maven2/org/apache/tomcat/embed/tomcat-embed-core/7.0.25/
> etc...
>
>
>
>
>>
>>> 2012/1/31 Konstantin Kolinko :
 2012/1/26 Olivier Lamy :
> Hi,
>
> I'd like to release the Apache Tomcat Maven plugin 2.0-beta-1.
>
> The staging repository is available here:
> https://repository.apache.org/content/repositories/orgapachetomcat-142/
> The documentation site is available here:
> http://tomcat.apache.org/maven-plugin-2.0-beta-1/
>
> Changelog: 
> http://tomcat.apache.org/maven-plugin-2.0-beta-1/jira-report.html
>
> Guide to test a staged release maven plugin:
> http://maven.apache.org/guides/development/guide-testing-releases.html
> .
>
> [+1]
> [ 0]
> [-1]
>

 Where are downloadable artifacts that will be placed to the ASF mirror 
 system?

 Best regards,
 Konstantin Kolinko

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

>>>
>>>
>>>
>>> --
>>> Olivier Lamy
>>> Talend: http://coders.talend.com
>>> http://twitter.com/olamy | http://linkedin.com/in/olamy
>>>
>>> -
>>> To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
>>> For additional commands, e-mail: dev-h...@tomcat.apache.org
>>>
>>
>> -
>> To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
>> For additional commands, e-mail: dev-h...@tomcat.apache.org
>>
>
>
>
> --
> Olivier Lamy
> Talend: http://coders.talend.com
> http://twitter.com/olamy | http://linkedin.com/in/olamy
>
> -
> To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
> For additional commands, e-mail: dev-h...@tomcat.apache.org
>

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

Re: [VOTE] Apache Tomcat Maven plugin 2.0-beta-1

[Mark Thomas]

On 01/02/2012 13:01, sebb wrote:
> On 1 February 2012 11:56, Olivier Lamy  wrote:
>> 2012/2/1 sebb :
>>> On 1 February 2012 10:14, Olivier Lamy  wrote:
 Hello,
 As the others currently provided tomcat maven artifacts, adding those
 in the download section doesn't have (IMHO) sense.
 Because to be able to consume it within a maven build, users will have
 to install it locally respecting the maven repository format layout.
 So when the vote passed the files available in the staging repository
 https://repository.apache.org/content/repositories/orgapachetomcat-142/
 will be sync to http://repo.maven.apache.org/maven2/org/apache/tomcat/
 .

 What we can do at least is to add in the ASF download system the
 source archive. See files *-source-release.zip* in
 https://repository.apache.org/content/repositories/orgapachetomcat-142/org/apache/tomcat/maven/tomcat-maven-plugin/2.0-beta-1/

 At least with the file named
 tomcat-maven-plugin-2.0-beta-1-source-release.zip you can rebuild the
 plugins.

 Makes sense ?
>>>
>>> Apache Commons also releases code which is mainly consumed by Maven users.
>>> All the components are released to the Apache mirrors (as source and
>>> binary archives) as well as to Maven Central (as jars, with additional
>>> src and javadoc jars).
>>> Same as Tomcat itself, really.
>>
>> For commons it's artifacts/jars which can be consume "manually" but
>> AFAIK consuming "manually" maven plugins jars doesn't have sense IMHO.
> 
> The ASF releases source - from which it must be possible to build the plugin.
> That's not generally easy or even possible from the jars that are
> released to Maven Central.
> 
>> If the case of a Maven plugin, I can put the jars in something like
>> http://apache.multidist.com/tomcat/maven-plugin/ but so how will you
>> use it ? installing manually using mvn install: ?
> 
> You don't; you use the copies in Maven Central.
> 
>> And If I go here : http://apache.multidist.com/tomcat/tomcat-7/v7.0.25/bin/
>> I don't see maven artifacts which are available here:
>> http://repo.maven.apache.org/maven2/org/apache/tomcat/tomcat-api/7.0.25/
> 
> Exactly.
> 
> Tomcat (as Commons) releases are made to *both* the mirrors *and* Maven 
> Central.
> 
> The ASF mirrors are for source and binary archives.
> The Maven Central repo is used for the binary jars, along with pom and
> accompanying source/javadoc jars.

+1

The primary/master/whatever Tomcat release is the source that we voted
on. It comes in two formats .zip and .tar.gz. Everything else (the
binaries, the Maven artefacts, the docs) is (and can be by anyone who
cares to) derived from that source release.

Every Apache release *must* have a source form from which everything
else may be derived. Without that, the release is invalid.

Mark

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

Re: [VOTE] Apache Tomcat Maven plugin 2.0-beta-1

[Olivier Lamy]

2012/2/1 Mark Thomas :
> On 01/02/2012 13:01, sebb wrote:
>> On 1 February 2012 11:56, Olivier Lamy  wrote:
>>> 2012/2/1 sebb :
 On 1 February 2012 10:14, Olivier Lamy  wrote:
> Hello,
> As the others currently provided tomcat maven artifacts, adding those
> in the download section doesn't have (IMHO) sense.
> Because to be able to consume it within a maven build, users will have
> to install it locally respecting the maven repository format layout.
> So when the vote passed the files available in the staging repository
> https://repository.apache.org/content/repositories/orgapachetomcat-142/
> will be sync to http://repo.maven.apache.org/maven2/org/apache/tomcat/
> .
>
> What we can do at least is to add in the ASF download system the
> source archive. See files *-source-release.zip* in
> https://repository.apache.org/content/repositories/orgapachetomcat-142/org/apache/tomcat/maven/tomcat-maven-plugin/2.0-beta-1/
>
> At least with the file named
> tomcat-maven-plugin-2.0-beta-1-source-release.zip you can rebuild the
> plugins.
>
> Makes sense ?

 Apache Commons also releases code which is mainly consumed by Maven users.
 All the components are released to the Apache mirrors (as source and
 binary archives) as well as to Maven Central (as jars, with additional
 src and javadoc jars).
 Same as Tomcat itself, really.
>>>
>>> For commons it's artifacts/jars which can be consume "manually" but
>>> AFAIK consuming "manually" maven plugins jars doesn't have sense IMHO.
>>
>> The ASF releases source - from which it must be possible to build the plugin.
>> That's not generally easy or even possible from the jars that are
>> released to Maven Central.
>>
>>> If the case of a Maven plugin, I can put the jars in something like
>>> http://apache.multidist.com/tomcat/maven-plugin/ but so how will you
>>> use it ? installing manually using mvn install: ?
>>
>> You don't; you use the copies in Maven Central.
>>
>>> And If I go here : http://apache.multidist.com/tomcat/tomcat-7/v7.0.25/bin/
>>> I don't see maven artifacts which are available here:
>>> http://repo.maven.apache.org/maven2/org/apache/tomcat/tomcat-api/7.0.25/
>>
>> Exactly.
>>
>> Tomcat (as Commons) releases are made to *both* the mirrors *and* Maven 
>> Central.
>>
>> The ASF mirrors are for source and binary archives.
>> The Maven Central repo is used for the binary jars, along with pom and
>> accompanying source/javadoc jars.
>
> +1
>
> The primary/master/whatever Tomcat release is the source that we voted
> on. It comes in two formats .zip and .tar.gz. Everything else (the
> binaries, the Maven artefacts, the docs) is (and can be by anyone who
> cares to) derived from that source release.
>
> Every Apache release *must* have a source form from which everything
> else may be derived. Without that, the release is invalid.

Yup I proposed to add
https://repository.apache.org/content/repositories/orgapachetomcat-142/org/apache/tomcat/maven/tomcat-maven-plugin/2.0-beta-1/tomcat-maven-plugin-2.0-beta-1-source-release.zip

In http://www.apache.org/dist/tomcat/maven-plugin/ ?

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



-- 
Olivier Lamy
Talend: http://coders.talend.com
http://twitter.com/olamy | http://linkedin.com/in/olamy

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

svn commit: r1239135 - /tomcat/trunk/java/org/apache/catalina/session/StandardSession.java

[markt]

Author: markt
Date: Wed Feb  1 14:07:44 2012
New Revision: 1239135

URL: http://svn.apache.org/viewvc?rev=1239135&view=rev
Log:
Deprecate unnecessary code that references StandardContext

Modified:
tomcat/trunk/java/org/apache/catalina/session/StandardSession.java

Modified: tomcat/trunk/java/org/apache/catalina/session/StandardSession.java
URL: 
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/session/StandardSession.java?rev=1239135&r1=1239134&r2=1239135&view=diff
==
--- tomcat/trunk/java/org/apache/catalina/session/StandardSession.java 
(original)
+++ tomcat/trunk/java/org/apache/catalina/session/StandardSession.java Wed Feb  
1 14:07:44 2012
@@ -14,11 +14,8 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-
-
 package org.apache.catalina.session;
 
-
 import java.beans.PropertyChangeSupport;
 import java.io.IOException;
 import java.io.NotSerializableException;
@@ -415,19 +412,15 @@ public class StandardSession implements 
 HttpSessionListener listener =
 (HttpSessionListener) listeners[i];
 try {
-fireContainerEvent(context,
-   "beforeSessionCreated",
-   listener);
+context.fireContainerEvent("beforeSessionCreated",
+listener);
 listener.sessionCreated(event);
-fireContainerEvent(context,
-   "afterSessionCreated",
-   listener);
+context.fireContainerEvent("afterSessionCreated", 
listener);
 } catch (Throwable t) {
 ExceptionUtils.handleThrowable(t);
 try {
-fireContainerEvent(context,
-   "afterSessionCreated",
-   listener);
+context.fireContainerEvent("afterSessionCreated",
+listener);
 } catch (Exception e) {
 // Ignore
 }
@@ -789,19 +782,16 @@ public class StandardSession implements 
 HttpSessionListener listener =
 (HttpSessionListener) listeners[j];
 try {
-fireContainerEvent(context,
-   "beforeSessionDestroyed",
-   listener);
+
context.fireContainerEvent("beforeSessionDestroyed",
+listener);
 listener.sessionDestroyed(event);
-fireContainerEvent(context,
-   "afterSessionDestroyed",
-   listener);
+context.fireContainerEvent("afterSessionDestroyed",
+listener);
 } catch (Throwable t) {
 ExceptionUtils.handleThrowable(t);
 try {
-fireContainerEvent(context,
-   "afterSessionDestroyed",
-   listener);
+context.fireContainerEvent(
+"afterSessionDestroyed", listener);
 } catch (Exception e) {
 // Ignore
 }
@@ -1479,41 +1469,35 @@ public class StandardSession implements 
 (HttpSessionAttributeListener) listeners[i];
 try {
 if (unbound != null) {
-fireContainerEvent(context,
-   "beforeSessionAttributeReplaced",
-   listener);
+
context.fireContainerEvent("beforeSessionAttributeReplaced",
+listener);
 if (event == null) {
 event = new HttpSessionBindingEvent
 (getSession(), name, unbound);
 }
 listener.attributeReplaced(event);
-fireContainerEvent(context,
-   "afterSessionAttributeReplaced",
-   listener);
+context.fireContainerEvent("afterSessionAttributeReplaced",
+listener);
 } else {
-fireContainerEvent(context,
-   "befo

svn commit: r1239136 - /tomcat/trunk/java/org/apache/catalina/session/StandardSession.java

[markt]

Author: markt
Date: Wed Feb  1 14:08:24 2012
New Revision: 1239136

URL: http://svn.apache.org/viewvc?rev=1239136&view=rev
Log:
Remove deprecated code

Modified:
tomcat/trunk/java/org/apache/catalina/session/StandardSession.java

Modified: tomcat/trunk/java/org/apache/catalina/session/StandardSession.java
URL: 
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/session/StandardSession.java?rev=1239136&r1=1239135&r2=1239136&view=diff
==
--- tomcat/trunk/java/org/apache/catalina/session/StandardSession.java 
(original)
+++ tomcat/trunk/java/org/apache/catalina/session/StandardSession.java Wed Feb  
1 14:08:24 2012
@@ -52,7 +52,6 @@ import org.apache.catalina.Manager;
 import org.apache.catalina.Session;
 import org.apache.catalina.SessionEvent;
 import org.apache.catalina.SessionListener;
-import org.apache.catalina.core.StandardContext;
 import org.apache.catalina.realm.GenericPrincipal;
 import org.apache.catalina.security.SecurityUtil;
 import org.apache.tomcat.util.ExceptionUtils;
@@ -1686,32 +1685,6 @@ public class StandardSession implements 
 
 // -- Protected Methods
 
-
-/**
- * Fire container events if the Context implementation is the
- * org.apache.catalina.core.StandardContext.
- *
- * @param context Context for which to fire events
- * @param type Event type
- * @param data Event data
- *
- * @exception Exception occurred during event firing
- *
- * @deprecated  No longer necessary since {@link StandardContext} 
implements
- *  the {@link org.apache.catalina.Container} interface.
- *
- */
-@Deprecated
-protected void fireContainerEvent(Context context,
-String type, Object data)
-throws Exception {
-
-if (context instanceof StandardContext) {
-((StandardContext) context).fireContainerEvent(type, data);
-}
-}
-
-
 /**
  * Notify all session event listeners that a particular event has
  * occurred for this Session.  The default implementation performs



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

svn commit: r1239138 - in /tomcat/tc7.0.x/trunk: ./ java/org/apache/catalina/session/StandardSession.java

[markt]

Author: markt
Date: Wed Feb  1 14:09:59 2012
New Revision: 1239138

URL: http://svn.apache.org/viewvc?rev=1239138&view=rev
Log:
Refactor to remove dep on StandardContext

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

Propchange: tomcat/tc7.0.x/trunk/
--
--- svn:mergeinfo (original)
+++ svn:mergeinfo Wed Feb  1 14:09:59 2012
@@ -1 +1 @@
-/tomcat/trunk:1156115,1156171,1156276,1156304,1156519,1156530,1156602,1157015,1157018,1157151,1157198,1157204,1157810,1157832,1157834,1157847,1157908,1157939,1158155,1158160,1158176,1158195,1158198-1158199,1158227,1158331,1158334-1158335,1158426,1160347,1160592,1160611,1160619,1160626,1160639,1160652,1160720-1160721,1160772,1160774,1160776,1161303,1161310,1161322,1161339,1161486,1161540,1161549,1161584,1162082,1162149,1162169,1162721,1162769,1162836,1162932,1163630,1164419,1164438,1164469,1164480,1164567,1165234,1165247-1165248,1165253,1165273,1165282,1165309,1165331,1165338,1165347,1165360-1165361,1165367-1165368,1165602,1165608,1165677,1165693,1165721,1165723,1165728,1165730,1165738,1165746,1165765,1165777,1165918,1165921,1166077,1166150-1166151,1166290,1166366,1166620,1166686,1166693,1166752,1166757,1167368,1167394,1169447,1170647,1171692,1172233-1172234,1172236,1172269,1172278,1172282,1172556,1172610,1172664,1172689,1172711,1173020-1173021,1173082,1173088,1173090,1173096
 
,1173241,1173256,1173288,117,1173342,1173461,1173614,1173630,1173659,1173722,1174061,1174239,1174322,1174325,1174329-1174330,1174337-1174339,1174343,1174353,1174799,1174882,1174884,1174975,1174983,1175155,1175158,1175167,1175182,1175190,1175201,1175272,1175275,1175283,1175582,1175589-1175590,1175594,1175602,1175613,1175633,1175690,1175713,1175798,1175889,1175896,1175907,1176584,1176590,1176799,1177050,1177060,1177125,1177152,1177160,1177245,1177850,1177862,1177978,1178209,1178228,1178233,1178449,1178542,1178681,1178684,1178721,1179268,1179274,1180261,1180865,1180891,1180894,1180907,1181028,1181123,1181125,1181136,1181291,1181743,1182796,1183078,1183105,1183142,1183328,1183339-1183340,1183492-1183494,1183605,1184917,1184919,1185018,1185020,1185200,1185588,1185626,1185756,1185758,1186011,1186042-1186045,1186104,1186123,1186137,1186153,1186254,1186257,1186377-1186379,1186479-1186480,1186712,1186743,1186750,1186763,1186890-1186892,1186894,1186949,1187018,1187027-1187028,1187
 
381,1187753,1187755,1187775,1187801,1187806,1187809,1187827,1188301,1188303-1188305,1188399,1188822,1188930-1188931,1189116,1189129,1189183,1189240,1189256,1189386,1189413-1189414,1189477,1189685,1189805,1189857,1189864,1189882,1190034,1190185,1190279,1190339,1190371,1190388-1190389,1190474,1190481,1194915,1195222-1195223,1195531,1195899,1195905,1195943,1195949,1195953,1195955,1195965,1195968,1196175,1196212,1196223,1196304-1196305,1196735,1196825,1196827,1197158,1197261,1197263,1197299-1197300,1197305,1197339-1197340,1197343,1197382,1197386-1197387,1197480,1197578,1198497,1198528,1198552,1198602,1198604,1198607,1198622,1198640,1198696,1198707,1199418,1199432,1199436,1199513,1199529,1199980,116,1200056,1200089,1200106-1200107,1200263,1200316,1200320,1200398-1200399,1200445-1200446,1200555,1200627,1200696,1200725,1200937,1200941,1201069,1201087,1201180,1201235-1201237,1201508,1201521,1201542,1201545-1201546,1201548,1201555-1201556,1201568,1201576,1201608,1201921-1201922,1
 
201931,1202035,1202039,1202271,1202565,1202578,1202705,1202828,1202860,1203047-1203052,1203078,1203091,1203253,1203278,1204182,1204856,1204867,1204936,1204938,1204982,1205033,1205065,1205082,1205097,1205112,1206200,1207692,1208046,1208073,1208096,1208114,1208145,1208772,1209194,1209277-1209278,1209686-1209731,1210894,1212091,1212095,1212099,1212118,1213469,1213906,1214853,1214855,1214864,1215115,1215118-1215119,1215121,1220293,1220295,1221038,1221842,1222189,101,176,1222300,1222690,1222850,1222852,1222855,1224607,1224617,1224648-1224652,1224657,1224662-1224663,1224682,1224801,1224910,1225000,1225219,1225343,1225465,1225627,1225629,1225634,1226069,1226158-1226159,1226177,1226196,1226214-1226215,1226385,1226394,1226500,1226537-1226538,1226546,1226551,1226975,1228196,1228360,1228376,1228724,1228908,1228918,1228920,1228922,1228929,1228969,1229307,1229536,1229549,1229724,1229726-1229731,1229997,1230539,1230711,1230729,1230762-1230763,1230765,1230955,1230957,1231285,123129
 
0,1231308,1231310,1231337,1231460-1231461,1231542-1231543,1231546-1231547,1231620-1231621,1231624-1231625,1231630,1231654-1231655,1231738,1231740,1231762-1231763,1231856,1231886,1231923,1231947,1232345,1232368,1232380,1232447,1232760,1232813,1232842-1232843,1232869,1233413,1233423,1233426,1234143,1234567,1235207,1236906-1236907,1236914,1237146,1237154-1237156,1237332,1237334,1237425,1237427,1237604,1237975,1237981,1237985,1238070,1238073,1239024,1239048,1239050,1239060
+/tomcat/trunk:1156115,1156171,1156276,1156304,1156519

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

[Bill Barker]

To whom it may engage...

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

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


Full details are available at:

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

That said, some information snippets are provided here.

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



The following work was performed:
http://vmgump.apache.org/gump/public/tomcat-trunk/tomcat-trunk-test/gump_work/build_tomcat-trunk_tomcat-trunk-test.html
Work Name: build_tomcat-trunk_tomcat-trunk-test (Type: Build)
Work ended in a state of : Failed
Elapsed: 20 mins 40 secs
Command Line: /usr/lib/jvm/java-6-openjdk/bin/java -Djava.awt.headless=true 
-Dbuild.sysclasspath=only org.apache.tools.ant.Main 
-Dgump.merge=/srv/gump/public/gump/work/merge.xml 
-Djunit.jar=/srv/gump/public/workspace/junit/dist/junit-01022012.jar 
-Dcommons-daemon.native.src.tgz=/srv/gump/public/workspace/apache-commons/daemon/dist/bin/commons-daemon-01022012-native-src.tar.gz
 
-Dtomcat-native.tar.gz=/srv/gump/public/workspace/apache-commons/daemon/dist/bin/commons-daemon-01022012-native-src.tar.gz
 -Dexamples.sources.skip=true 
-Dtomcat-dbcp.home=/srv/gump/public/workspace/tomcat-trunk/tomcat-deps 
-Djdt.jar=/srv/gump/packages/eclipse/plugins/org.eclipse.jdt.core_3.4.2/jdtcore.jar
 
-Dcommons-daemon.jar=/srv/gump/public/workspace/apache-commons/daemon/dist/commons-daemon-01022012.jar
 
-Dtomcat-dbcp-src.jar=/srv/gump/public/workspace/tomcat-trunk/tomcat-deps/tomcat-dbcp-src.jar
 -Dtest.accesslog=true 
-Dcommons-pool.home=/srv/gump/public/workspace/commons-pool-1.x 
-Dcommons-dbcp.home=/
 srv/gump/public/workspace/commons-dbcp-1.x 
-Dtomcat-dbcp.jar=/srv/gump/public/workspace/tomcat-trunk/tomcat-deps/tomcat-dbcp-01022012.jar
 test 
[Working Directory: /srv/gump/public/workspace/tomcat-trunk]
CLASSPATH: 
/usr/lib/jvm/java-6-openjdk/lib/tools.jar:/srv/gump/public/workspace/tomcat-trunk/output/build/webapps/examples/WEB-INF/classes:/srv/gump/public/workspace/tomcat-trunk/output/testclasses:/srv/gump/public/workspace/ant/dist/lib/ant.jar:/srv/gump/public/workspace/ant/dist/lib/ant-launcher.jar:/srv/gump/public/workspace/ant/dist/lib/ant-jmf.jar:/srv/gump/public/workspace/ant/dist/lib/ant-junit.jar:/srv/gump/public/workspace/ant/dist/lib/ant-swing.jar:/srv/gump/public/workspace/ant/dist/lib/ant-apache-resolver.jar:/srv/gump/public/workspace/ant/dist/lib/ant-apache-xalan2.jar:/srv/gump/public/workspace/xml-commons/java/build/resolver.jar:/srv/gump/public/workspace/tomcat-trunk/output/build/bin/bootstrap.jar:/srv/gump/public/workspace/tomcat-trunk/output/build/bin/tomcat-juli.jar:/srv/gump/public/workspace/tomcat-trunk/output/build/lib/annotations-api.jar:/srv/gump/public/workspace/tomcat-trunk/output/build/lib/servlet-api.jar:/srv/gump/public/workspace/tomcat-trunk/outp
 
ut/build/lib/jsp-api.jar:/srv/gump/public/workspace/tomcat-trunk/output/build/lib/el-api.jar:/srv/gump/public/workspace/tomcat-trunk/output/build/lib/catalina.jar:/srv/gump/public/workspace/tomcat-trunk/output/build/lib/catalina-ant.jar:/srv/gump/public/workspace/tomcat-trunk/output/build/lib/tomcat-coyote.jar:/srv/gump/public/workspace/tomcat-trunk/output/build/lib/jasper.jar:/srv/gump/public/workspace/tomcat-trunk/output/build/lib/jasper-el.jar:/srv/gump/public/workspace/tomcat-trunk/output/build/lib/catalina-tribes.jar:/srv/gump/public/workspace/tomcat-trunk/output/build/lib/catalina-ha.jar:/srv/gump/public/workspace/tomcat-trunk/output/build/lib/tomcat-api.jar:/srv/gump/public/workspace/tomcat-trunk/output/build/lib/tomcat-util.jar:/srv/gump/packages/javamail-1.4/mail.jar:/srv/gump/packages/javamail-1.4/lib/mailapi.jar:/srv/gump/packages/jaf-1.1ea/activation.jar:/srv/gump/packages/eclipse/plugins/org.eclipse.jdt.core_3.4.2/jdtcore.jar:/srv/gump/public/workspace/tomcat-tr
 
unk/tomcat-deps/tomcat-dbcp-01022012.jar:/srv/gump/public/workspace/apache-commons/daemon/dist/commons-daemon-01022012.jar:/srv/gump/public/workspace/junit/dist/junit-01022012.j

svn commit: r1239255 - in /tomcat/trunk/java/org/apache/catalina: core/StandardService.java startup/Catalina.java startup/Embedded.java

[markt]

Author: markt
Date: Wed Feb  1 18:42:19 2012
New Revision: 1239255

URL: http://svn.apache.org/viewvc?rev=1239255&view=rev
Log:
Remove deprecated Embedded class and the references to it

Removed:
tomcat/trunk/java/org/apache/catalina/startup/Embedded.java
Modified:
tomcat/trunk/java/org/apache/catalina/core/StandardService.java
tomcat/trunk/java/org/apache/catalina/startup/Catalina.java

Modified: tomcat/trunk/java/org/apache/catalina/core/StandardService.java
URL: 
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/core/StandardService.java?rev=1239255&r1=1239254&r2=1239255&view=diff
==
--- tomcat/trunk/java/org/apache/catalina/core/StandardService.java (original)
+++ tomcat/trunk/java/org/apache/catalina/core/StandardService.java Wed Feb  1 
18:42:19 2012
@@ -89,9 +89,7 @@ public class StandardService extends Lif
 protected ArrayList executors = new ArrayList();
 
 /**
- * The Container associated with this Service. (In the case of the
- * org.apache.catalina.startup.Embedded subclass, this holds the most
- * recently added Engine.)
+ * The Container associated with this Service.
  */
 protected Container container = null;
 

Modified: tomcat/trunk/java/org/apache/catalina/startup/Catalina.java
URL: 
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/startup/Catalina.java?rev=1239255&r1=1239254&r2=1239255&view=diff
==
--- tomcat/trunk/java/org/apache/catalina/startup/Catalina.java (original)
+++ tomcat/trunk/java/org/apache/catalina/startup/Catalina.java Wed Feb  1 
18:42:19 2012
@@ -64,8 +64,6 @@ import org.xml.sax.SAXParseException;
  * stop   - Stop the currently running instance of Catalina.
  * 
  *
- * Should do the same thing as Embedded, but using a server.xml file.
- *
  * @author Craig R. McClanahan
  * @author Remy Maucherat
  * @version $Id$
@@ -748,11 +746,7 @@ public class Catalina {
 
 String catalinaHome = System.getProperty(Globals.CATALINA_HOME_PROP);
 if (catalinaHome == null) {
-// Backwards compatibility patch for J2EE RI 1.3
-String j2eeHome = System.getProperty("com.sun.enterprise.home");
-if (j2eeHome != null) {
-catalinaHome=System.getProperty("com.sun.enterprise.home");
-} else if (System.getProperty(Globals.CATALINA_BASE_PROP) != null) 
{
+if (System.getProperty(Globals.CATALINA_BASE_PROP) != null) {
 catalinaHome = System.getProperty(Globals.CATALINA_BASE_PROP);
 } else {
 // Use IntrospectionUtils and guess the dir



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

svn commit: r1239256 - /tomcat/trunk/java/org/apache/catalina/Globals.java

[markt]

Author: markt
Date: Wed Feb  1 18:42:58 2012
New Revision: 1239256

URL: http://svn.apache.org/viewvc?rev=1239256&view=rev
Log:
Deprecate unused constants

Modified:
tomcat/trunk/java/org/apache/catalina/Globals.java

Modified: tomcat/trunk/java/org/apache/catalina/Globals.java
URL: 
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/Globals.java?rev=1239256&r1=1239255&r2=1239256&view=diff
==
--- tomcat/trunk/java/org/apache/catalina/Globals.java (original)
+++ tomcat/trunk/java/org/apache/catalina/Globals.java Wed Feb  1 18:42:58 2012
@@ -112,7 +112,9 @@ public final class Globals {
 /**
  * The servlet context attribute under which the managed bean Registry
  * will be stored for privileged contexts (if enabled).
+ * @deprecated Unused. Will be removed in Tomcat 8.0.x.
  */
+@Deprecated
 public static final String MBEAN_REGISTRY_ATTR =
 "org.apache.catalina.Registry";
 
@@ -120,7 +122,9 @@ public final class Globals {
 /**
  * The servlet context attribute under which the MBeanServer will be stored
  * for privileged contexts (if enabled).
+ * @deprecated Unused. Will be removed in Tomcat 8.0.x.
  */
+@Deprecated
 public static final String MBEAN_SERVER_ATTR =
 "org.apache.catalina.MBeanServer";
 
@@ -159,7 +163,9 @@ public final class Globals {
  * All request attributes which names start with this prefix are used by
  * connector implementations. They are passed down to coyoteRequest and 
back
  * up. See Request.setAttribute(String, Object).
+ * @deprecated Unused. Will be removed in Tomcat 8.0.x.
  */
+@Deprecated
 public static final String TOMCAT_CONNECTOR_ATTR_PREFIX =
 "org.apache.tomcat.";
 



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

svn commit: r1239257 - /tomcat/trunk/java/org/apache/catalina/Globals.java

[markt]

Author: markt
Date: Wed Feb  1 18:43:32 2012
New Revision: 1239257

URL: http://svn.apache.org/viewvc?rev=1239257&view=rev
Log:
Remove deprecated code

Modified:
tomcat/trunk/java/org/apache/catalina/Globals.java

Modified: tomcat/trunk/java/org/apache/catalina/Globals.java
URL: 
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/Globals.java?rev=1239257&r1=1239256&r2=1239257&view=diff
==
--- tomcat/trunk/java/org/apache/catalina/Globals.java (original)
+++ tomcat/trunk/java/org/apache/catalina/Globals.java Wed Feb  1 18:43:32 2012
@@ -110,26 +110,6 @@ public final class Globals {
 
 
 /**
- * The servlet context attribute under which the managed bean Registry
- * will be stored for privileged contexts (if enabled).
- * @deprecated Unused. Will be removed in Tomcat 8.0.x.
- */
-@Deprecated
-public static final String MBEAN_REGISTRY_ATTR =
-"org.apache.catalina.Registry";
-
-
-/**
- * The servlet context attribute under which the MBeanServer will be stored
- * for privileged contexts (if enabled).
- * @deprecated Unused. Will be removed in Tomcat 8.0.x.
- */
-@Deprecated
-public static final String MBEAN_SERVER_ATTR =
-"org.apache.catalina.MBeanServer";
-
-
-/**
  * The request attribute under which we store the servlet name on a
  * named dispatcher request.
  */
@@ -160,17 +140,6 @@ public final class Globals {
 
 
 /**
- * All request attributes which names start with this prefix are used by
- * connector implementations. They are passed down to coyoteRequest and 
back
- * up. See Request.setAttribute(String, Object).
- * @deprecated Unused. Will be removed in Tomcat 8.0.x.
- */
-@Deprecated
-public static final String TOMCAT_CONNECTOR_ATTR_PREFIX =
-"org.apache.tomcat.";
-
-
-/**
  * The request attribute that is set to the value of {@code Boolean.TRUE}
  * if connector processing this request supports Comet API.
  */



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

Re: [VOTE] Apache Tomcat Maven plugin 2.0-beta-1

[sebb]

On 1 February 2012 13:33, Olivier Lamy  wrote:
> 2012/2/1 Mark Thomas :
>> On 01/02/2012 13:01, sebb wrote:
>>> On 1 February 2012 11:56, Olivier Lamy  wrote:
 2012/2/1 sebb :
> On 1 February 2012 10:14, Olivier Lamy  wrote:
>> Hello,
>> As the others currently provided tomcat maven artifacts, adding those
>> in the download section doesn't have (IMHO) sense.
>> Because to be able to consume it within a maven build, users will have
>> to install it locally respecting the maven repository format layout.
>> So when the vote passed the files available in the staging repository
>> https://repository.apache.org/content/repositories/orgapachetomcat-142/
>> will be sync to http://repo.maven.apache.org/maven2/org/apache/tomcat/
>> .
>>
>> What we can do at least is to add in the ASF download system the
>> source archive. See files *-source-release.zip* in
>> https://repository.apache.org/content/repositories/orgapachetomcat-142/org/apache/tomcat/maven/tomcat-maven-plugin/2.0-beta-1/
>>
>> At least with the file named
>> tomcat-maven-plugin-2.0-beta-1-source-release.zip you can rebuild the
>> plugins.
>>
>> Makes sense ?
>
> Apache Commons also releases code which is mainly consumed by Maven users.
> All the components are released to the Apache mirrors (as source and
> binary archives) as well as to Maven Central (as jars, with additional
> src and javadoc jars).
> Same as Tomcat itself, really.

 For commons it's artifacts/jars which can be consume "manually" but
 AFAIK consuming "manually" maven plugins jars doesn't have sense IMHO.
>>>
>>> The ASF releases source - from which it must be possible to build the 
>>> plugin.
>>> That's not generally easy or even possible from the jars that are
>>> released to Maven Central.
>>>
 If the case of a Maven plugin, I can put the jars in something like
 http://apache.multidist.com/tomcat/maven-plugin/ but so how will you
 use it ? installing manually using mvn install: ?
>>>
>>> You don't; you use the copies in Maven Central.
>>>
 And If I go here : http://apache.multidist.com/tomcat/tomcat-7/v7.0.25/bin/
 I don't see maven artifacts which are available here:
 http://repo.maven.apache.org/maven2/org/apache/tomcat/tomcat-api/7.0.25/
>>>
>>> Exactly.
>>>
>>> Tomcat (as Commons) releases are made to *both* the mirrors *and* Maven 
>>> Central.
>>>
>>> The ASF mirrors are for source and binary archives.
>>> The Maven Central repo is used for the binary jars, along with pom and
>>> accompanying source/javadoc jars.
>>
>> +1
>>
>> The primary/master/whatever Tomcat release is the source that we voted
>> on. It comes in two formats .zip and .tar.gz. Everything else (the
>> binaries, the Maven artefacts, the docs) is (and can be by anyone who
>> cares to) derived from that source release.
>>
>> Every Apache release *must* have a source form from which everything
>> else may be derived. Without that, the release is invalid.
>
> Yup I proposed to add
> https://repository.apache.org/content/repositories/orgapachetomcat-142/org/apache/tomcat/maven/tomcat-maven-plugin/2.0-beta-1/tomcat-maven-plugin-2.0-beta-1-source-release.zip
>
> In http://www.apache.org/dist/tomcat/maven-plugin/ ?

Not forgetting the corresponding .asc/.md5/.sha1 as well.

[But you can & should omit the .asc.md5 and .asc.sha1 files which are useless]

>>
>> Mark
>>
>> -
>> To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
>> For additional commands, e-mail: dev-h...@tomcat.apache.org
>>
>
>
>
> --
> Olivier Lamy
> Talend: http://coders.talend.com
> http://twitter.com/olamy | http://linkedin.com/in/olamy
>
> -
> To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
> For additional commands, e-mail: dev-h...@tomcat.apache.org
>

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

svn commit: r1239263 - /tomcat/tc7.0.x/trunk/java/org/apache/catalina/Globals.java

[markt]

Author: markt
Date: Wed Feb  1 18:51:14 2012
New Revision: 1239263

URL: http://svn.apache.org/viewvc?rev=1239263&view=rev
Log:
Mark unused code as deprecated

Modified:
tomcat/tc7.0.x/trunk/java/org/apache/catalina/Globals.java

Modified: tomcat/tc7.0.x/trunk/java/org/apache/catalina/Globals.java
URL: 
http://svn.apache.org/viewvc/tomcat/tc7.0.x/trunk/java/org/apache/catalina/Globals.java?rev=1239263&r1=1239262&r2=1239263&view=diff
==
--- tomcat/tc7.0.x/trunk/java/org/apache/catalina/Globals.java (original)
+++ tomcat/tc7.0.x/trunk/java/org/apache/catalina/Globals.java Wed Feb  1 
18:51:14 2012
@@ -118,7 +118,9 @@ public final class Globals {
 /**
  * The servlet context attribute under which the managed bean Registry
  * will be stored for privileged contexts (if enabled).
+ * @deprecated Unused. Will be removed in Tomcat 8.0.x.
  */
+@Deprecated
 public static final String MBEAN_REGISTRY_ATTR =
 "org.apache.catalina.Registry";
 
@@ -126,7 +128,9 @@ public final class Globals {
 /**
  * The servlet context attribute under which the MBeanServer will be stored
  * for privileged contexts (if enabled).
+ * @deprecated Unused. Will be removed in Tomcat 8.0.x.
  */
+@Deprecated
 public static final String MBEAN_SERVER_ATTR =
 "org.apache.catalina.MBeanServer";
 



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

Re: svn commit: r1239256 - /tomcat/trunk/java/org/apache/catalina/Globals.java

[Konstantin Kolinko]

2012/2/1  :
> Author: markt
> Date: Wed Feb  1 18:42:58 2012
> New Revision: 1239256
>
> URL: http://svn.apache.org/viewvc?rev=1239256&view=rev
> Log:
> Deprecate unused constants

Please check first whether the string values of those constants are used or not!

TOMCAT_CONNECTOR_ATTR_PREFIX (and some names below it) was added to
better document Tomcat-internal attribute names and further replace
string values with these constants. (But I did not find time to test &
finish).


I cannot say anything about those two MBEAN_* constants - I do not
remember seeing them before and I have not searched for them.



>
> Modified:
>    tomcat/trunk/java/org/apache/catalina/Globals.java
>
> Modified: tomcat/trunk/java/org/apache/catalina/Globals.java
> URL: 
> http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/Globals.java?rev=1239256&r1=1239255&r2=1239256&view=diff
> ==
> --- tomcat/trunk/java/org/apache/catalina/Globals.java (original)
> +++ tomcat/trunk/java/org/apache/catalina/Globals.java Wed Feb  1 18:42:58 
> 2012
> @@ -112,7 +112,9 @@ public final class Globals {
>     /**
>      * The servlet context attribute under which the managed bean Registry
>      * will be stored for privileged contexts (if enabled).
> +     * @deprecated Unused. Will be removed in Tomcat 8.0.x.
>      */
> +    @Deprecated
>     public static final String MBEAN_REGISTRY_ATTR =
>         "org.apache.catalina.Registry";
>
> @@ -120,7 +122,9 @@ public final class Globals {
>     /**
>      * The servlet context attribute under which the MBeanServer will be 
> stored
>      * for privileged contexts (if enabled).
> +     * @deprecated Unused. Will be removed in Tomcat 8.0.x.
>      */
> +    @Deprecated
>     public static final String MBEAN_SERVER_ATTR =
>         "org.apache.catalina.MBeanServer";
>
> @@ -159,7 +163,9 @@ public final class Globals {
>      * All request attributes which names start with this prefix are used by
>      * connector implementations. They are passed down to coyoteRequest and 
> back
>      * up. See Request.setAttribute(String, Object).
> +     * @deprecated Unused. Will be removed in Tomcat 8.0.x.
>      */
> +    @Deprecated
>     public static final String TOMCAT_CONNECTOR_ATTR_PREFIX =
>         "org.apache.tomcat.";
>
>
>
>
> -
> To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
> For additional commands, e-mail: dev-h...@tomcat.apache.org
>

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

Re: svn commit: r1239256 - /tomcat/trunk/java/org/apache/catalina/Globals.java

[Mark Thomas]

On 01/02/2012 19:32, Konstantin Kolinko wrote:
> 2012/2/1  :
>> Author: markt
>> Date: Wed Feb  1 18:42:58 2012
>> New Revision: 1239256
>>
>> URL: http://svn.apache.org/viewvc?rev=1239256&view=rev
>> Log:
>> Deprecate unused constants
> 
> Please check first whether the string values of those constants are used or 
> not!

I did! There aren't!

Mark

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

Re: svn commit: r1239256 - /tomcat/trunk/java/org/apache/catalina/Globals.java

[Mark Thomas]

On 01/02/2012 19:34, Mark Thomas wrote:
> On 01/02/2012 19:32, Konstantin Kolinko wrote:
>> 2012/2/1  :
>>> Author: markt
>>> Date: Wed Feb  1 18:42:58 2012
>>> New Revision: 1239256
>>>
>>> URL: http://svn.apache.org/viewvc?rev=1239256&view=rev
>>> Log:
>>> Deprecate unused constants
>>
>> Please check first whether the string values of those constants are used or 
>> not!
> 
> I did! There aren't!

Grrr. s/There/They/

Mark

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

Re: buildbot failure in ASF Buildbot on tomcat-trunk

[Konstantin Kolinko]

The trunk Buildbot continues to display test failures since this.

http://ci.apache.org/builders/tomcat-trunk/

The only failing test:
Test org.apache.catalina.websocket.TestWebSocket FAILED

Is it supposed to succeed, or it is work in progress?
Maybe add the test to the exclusion pattern in build.xml or annotate
it with @Ignored?


Best regards,
Konstantin Kolinko

2012/2/1  :
> The Buildbot has detected a new failure on builder tomcat-trunk while 
> building ASF Buildbot.
> Full details are available at:
>  http://ci.apache.org/builders/tomcat-trunk/builds/2691
>
> Buildbot URL: http://ci.apache.org/
>
> Buildslave for this Build: bb-vm_ubuntu
>
> Build Reason: scheduler
> Build Source Stamp: [branch tomcat/trunk] 1239036
> Blamelist: markt
>
> BUILD FAILED: failed compile_1
>
> sincerely,
>  -The Buildbot
>
>
>

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

svn commit: r1239285 - in /tomcat/trunk/java/org/apache: catalina/Globals.java catalina/connector/Request.java catalina/core/StandardWrapperValve.java coyote/Constants.java coyote/http11/AbstractHttp1

[markt]

Author: markt
Date: Wed Feb  1 19:44:00 2012
New Revision: 1239285

URL: http://svn.apache.org/viewvc?rev=1239285&view=rev
Log:
Start to hook up unused constants

Modified:
tomcat/trunk/java/org/apache/catalina/Globals.java
tomcat/trunk/java/org/apache/catalina/connector/Request.java
tomcat/trunk/java/org/apache/catalina/core/StandardWrapperValve.java
tomcat/trunk/java/org/apache/coyote/Constants.java
tomcat/trunk/java/org/apache/coyote/http11/AbstractHttp11Processor.java

Modified: tomcat/trunk/java/org/apache/catalina/Globals.java
URL: 
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/Globals.java?rev=1239285&r1=1239284&r2=1239285&view=diff
==
--- tomcat/trunk/java/org/apache/catalina/Globals.java (original)
+++ tomcat/trunk/java/org/apache/catalina/Globals.java Wed Feb  1 19:44:00 2012
@@ -142,9 +142,10 @@ public final class Globals {
 /**
  * The request attribute that is set to the value of {@code Boolean.TRUE}
  * if connector processing this request supports Comet API.
+ * Duplicated here for neater code in the catalina packages.
  */
 public static final String COMET_SUPPORTED_ATTR =
-"org.apache.tomcat.comet.support";
+org.apache.coyote.Constants.COMET_SUPPORTED_ATTR;
 
 
 /**

Modified: tomcat/trunk/java/org/apache/catalina/connector/Request.java
URL: 
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/connector/Request.java?rev=1239285&r1=1239284&r2=1239285&view=diff
==
--- tomcat/trunk/java/org/apache/catalina/connector/Request.java (original)
+++ tomcat/trunk/java/org/apache/catalina/connector/Request.java Wed Feb  1 
19:44:00 2012
@@ -943,7 +943,7 @@ public class Request
  * have names starting with "org.apache.tomcat" and include:
  * 
  * org.apache.tomcat.sendfile.support
- * org.apache.tomcat.comet.support
+ * {@link Globals#COMET_SUPPORTED_ATTR
  * org.apache.tomcat.comet.timeout.support
  * 
  * Connector implementations may return some, all or none of these

Modified: tomcat/trunk/java/org/apache/catalina/core/StandardWrapperValve.java
URL: 
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/core/StandardWrapperValve.java?rev=1239285&r1=1239284&r2=1239285&view=diff
==
--- tomcat/trunk/java/org/apache/catalina/core/StandardWrapperValve.java 
(original)
+++ tomcat/trunk/java/org/apache/catalina/core/StandardWrapperValve.java Wed 
Feb  1 19:44:00 2012
@@ -29,6 +29,7 @@ import javax.servlet.UnavailableExceptio
 import javax.servlet.http.HttpServletResponse;
 
 import org.apache.catalina.Context;
+import org.apache.catalina.Globals;
 import org.apache.catalina.LifecycleException;
 import org.apache.catalina.comet.CometEvent;
 import org.apache.catalina.comet.CometProcessor;
@@ -165,8 +166,8 @@ final class StandardWrapperValve
 
 // Identify if the request is Comet related now that the servlet has 
been allocated
 boolean comet = false;
-if (servlet instanceof CometProcessor
-&& request.getAttribute("org.apache.tomcat.comet.support") == 
Boolean.TRUE) {
+if (servlet instanceof CometProcessor && request.getAttribute(
+Globals.COMET_SUPPORTED_ATTR) == Boolean.TRUE) {
 comet = true;
 request.setComet(true);
 }

Modified: tomcat/trunk/java/org/apache/coyote/Constants.java
URL: 
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/coyote/Constants.java?rev=1239285&r1=1239284&r2=1239285&view=diff
==
--- tomcat/trunk/java/org/apache/coyote/Constants.java (original)
+++ tomcat/trunk/java/org/apache/coyote/Constants.java Wed Feb  1 19:44:00 2012
@@ -59,4 +59,12 @@ public final class Constants {
 Boolean.valueOf(System.getProperty(
 "org.apache.coyote.USE_CUSTOM_STATUS_MSG_IN_HEADER",
 "false")).booleanValue();
+
+/**
+ * The request attribute that is set to the value of {@code Boolean.TRUE}
+ * if connector processing this request supports Comet API.
+ */
+public static final String COMET_SUPPORTED_ATTR =
+"org.apache.tomcat.comet.support";
+
 }

Modified: 
tomcat/trunk/java/org/apache/coyote/http11/AbstractHttp11Processor.java
URL: 
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/coyote/http11/AbstractHttp11Processor.java?rev=1239285&r1=1239284&r2=1239285&view=diff
==
--- tomcat/trunk/java/org/apache/coyote/http11/AbstractHttp11Processor.java 
(original)
+++ tomcat/trunk/java/org/apache/coyote/http11/AbstractHttp11Processor.java Wed 
Feb  1 19:44:00 2012
@@ -1279,7 +1279,8 @@ public abstract class AbstractHt

Re: buildbot failure in ASF Buildbot on tomcat-trunk

[Mark Thomas]

On 01/02/2012 19:35, Konstantin Kolinko wrote:
> The trunk Buildbot continues to display test failures since this.
> 
> http://ci.apache.org/builders/tomcat-trunk/
> 
> The only failing test:
> Test org.apache.catalina.websocket.TestWebSocket FAILED
> 
> Is it supposed to succeed, or it is work in progress?
> Maybe add the test to the exclusion pattern in build.xml or annotate
> it with @Ignored?

I'll add a dummy test with a TODO comment.

Mark

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

svn commit: r1239295 - /tomcat/trunk/test/org/apache/catalina/websocket/TestWebSocket.java

[markt]

Author: markt
Date: Wed Feb  1 20:09:25 2012
New Revision: 1239295

URL: http://svn.apache.org/viewvc?rev=1239295&view=rev
Log:
Fix CI build

Modified:
tomcat/trunk/test/org/apache/catalina/websocket/TestWebSocket.java

Modified: tomcat/trunk/test/org/apache/catalina/websocket/TestWebSocket.java
URL: 
http://svn.apache.org/viewvc/tomcat/trunk/test/org/apache/catalina/websocket/TestWebSocket.java?rev=1239295&r1=1239294&r2=1239295&view=diff
==
--- tomcat/trunk/test/org/apache/catalina/websocket/TestWebSocket.java 
(original)
+++ tomcat/trunk/test/org/apache/catalina/websocket/TestWebSocket.java Wed Feb  
1 20:09:25 2012
@@ -21,10 +21,17 @@ import java.io.Reader;
 import java.nio.ByteBuffer;
 import java.nio.CharBuffer;
 
+import org.junit.Test;
+
 import org.apache.catalina.startup.TomcatBaseTest;
 
 public class TestWebSocket extends TomcatBaseTest {
 
+@Test
+public void testSimple() {
+// TODO: Write a test
+}
+
 private static final class StreamingWebSocketServlet
 extends WebSocketServlet {
 



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

svn commit: r1239296 - in /tomcat/trunk/java/org/apache: catalina/Globals.java catalina/connector/CometEventImpl.java catalina/connector/Request.java coyote/Constants.java coyote/http11/AbstractHttp11

[markt]

Author: markt
Date: Wed Feb  1 20:10:21 2012
New Revision: 1239296

URL: http://svn.apache.org/viewvc?rev=1239296&view=rev
Log:
Hook up a few more constants

Modified:
tomcat/trunk/java/org/apache/catalina/Globals.java
tomcat/trunk/java/org/apache/catalina/connector/CometEventImpl.java
tomcat/trunk/java/org/apache/catalina/connector/Request.java
tomcat/trunk/java/org/apache/coyote/Constants.java
tomcat/trunk/java/org/apache/coyote/http11/AbstractHttp11Processor.java
tomcat/trunk/java/org/apache/coyote/http11/Http11NioProcessor.java

Modified: tomcat/trunk/java/org/apache/catalina/Globals.java
URL: 
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/Globals.java?rev=1239296&r1=1239295&r2=1239296&view=diff
==
--- tomcat/trunk/java/org/apache/catalina/Globals.java (original)
+++ tomcat/trunk/java/org/apache/catalina/Globals.java Wed Feb  1 20:10:21 2012
@@ -154,9 +154,11 @@ public final class Globals {
  * per-connection request timeout through Comet API.
  *
  * @see org.apache.catalina.comet.CometEvent#setTimeout(int)
+ *
+ * Duplicated here for neater code in the catalina packages.
  */
 public static final String COMET_TIMEOUT_SUPPORTED_ATTR =
-"org.apache.tomcat.comet.timeout.support";
+org.apache.coyote.Constants.COMET_TIMEOUT_SUPPORTED_ATTR;
 
 
 /**
@@ -165,9 +167,11 @@ public final class Globals {
  * timeout for Comet API. The value is in milliseconds.
  *
  * @see org.apache.catalina.comet.CometEvent#setTimeout(int)
+ *
+ * Duplicated here for neater code in the catalina packages.
  */
 public static final String COMET_TIMEOUT_ATTR =
-"org.apache.tomcat.comet.timeout";
+org.apache.coyote.Constants.COMET_TIMEOUT_ATTR;
 
 
 /**

Modified: tomcat/trunk/java/org/apache/catalina/connector/CometEventImpl.java
URL: 
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/connector/CometEventImpl.java?rev=1239296&r1=1239295&r2=1239296&view=diff
==
--- tomcat/trunk/java/org/apache/catalina/connector/CometEventImpl.java 
(original)
+++ tomcat/trunk/java/org/apache/catalina/connector/CometEventImpl.java Wed Feb 
 1 20:10:21 2012
@@ -22,6 +22,7 @@ import javax.servlet.ServletException;
 import javax.servlet.http.HttpServletRequest;
 import javax.servlet.http.HttpServletResponse;
 
+import org.apache.catalina.Globals;
 import org.apache.catalina.comet.CometEvent;
 import org.apache.tomcat.util.res.StringManager;
 
@@ -121,8 +122,10 @@ public class CometEventImpl implements C
 @Override
 public void setTimeout(int timeout) throws IOException, ServletException,
 UnsupportedOperationException {
-if (request.getAttribute("org.apache.tomcat.comet.timeout.support") == 
Boolean.TRUE) {
-request.setAttribute("org.apache.tomcat.comet.timeout", 
Integer.valueOf(timeout));
+if (request.getAttribute(Globals.COMET_TIMEOUT_SUPPORTED_ATTR) ==
+Boolean.TRUE) {
+request.setAttribute(Globals.COMET_TIMEOUT_ATTR,
+Integer.valueOf(timeout));
 if (request.isComet()) {
 request.setCometTimeout(timeout);
 }

Modified: tomcat/trunk/java/org/apache/catalina/connector/Request.java
URL: 
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/connector/Request.java?rev=1239296&r1=1239295&r2=1239296&view=diff
==
--- tomcat/trunk/java/org/apache/catalina/connector/Request.java (original)
+++ tomcat/trunk/java/org/apache/catalina/connector/Request.java Wed Feb  1 
20:10:21 2012
@@ -942,9 +942,9 @@ public class Request
  * The underlying connector may also expose request attributes. These all
  * have names starting with "org.apache.tomcat" and include:
  * 
- * org.apache.tomcat.sendfile.support
- * {@link Globals#COMET_SUPPORTED_ATTR
- * org.apache.tomcat.comet.timeout.support
+ * {@link Globals#SENDFILE_SUPPORTED_ATTR}
+ * {@link Globals#COMET_SUPPORTED_ATTR}
+ * {@link Globals#COMET_TIMEOUT_SUPPORTED_ATTR}
  * 
  * Connector implementations may return some, all or none of these
  * attributes and may also support additional attributes.

Modified: tomcat/trunk/java/org/apache/coyote/Constants.java
URL: 
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/coyote/Constants.java?rev=1239296&r1=1239295&r2=1239296&view=diff
==
--- tomcat/trunk/java/org/apache/coyote/Constants.java (original)
+++ tomcat/trunk/java/org/apache/coyote/Constants.java Wed Feb  1 20:10:21 2012
@@ -67,4 +67,25 @@ public final class Constants {
 public static final String COMET_SUPPORTED_ATTR =
 "org.apache.tomcat.

svn commit: r1239298 - in /tomcat/trunk/java/org/apache: catalina/ catalina/connector/ catalina/servlets/ catalina/valves/ coyote/ coyote/http11/

[markt]

Author: markt
Date: Wed Feb  1 20:11:26 2012
New Revision: 1239298

URL: http://svn.apache.org/viewvc?rev=1239298&view=rev
Log:
Plumb in the remaining constants

Modified:
tomcat/trunk/java/org/apache/catalina/Globals.java
tomcat/trunk/java/org/apache/catalina/connector/Request.java
tomcat/trunk/java/org/apache/catalina/servlets/DefaultServlet.java
tomcat/trunk/java/org/apache/catalina/valves/AccessLogValve.java
tomcat/trunk/java/org/apache/coyote/Constants.java
tomcat/trunk/java/org/apache/coyote/http11/AbstractHttp11Processor.java
tomcat/trunk/java/org/apache/coyote/http11/Http11AprProcessor.java
tomcat/trunk/java/org/apache/coyote/http11/Http11NioProcessor.java

Modified: tomcat/trunk/java/org/apache/catalina/Globals.java
URL: 
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/Globals.java?rev=1239298&r1=1239297&r2=1239298&view=diff
==
--- tomcat/trunk/java/org/apache/catalina/Globals.java (original)
+++ tomcat/trunk/java/org/apache/catalina/Globals.java Wed Feb  1 20:11:26 2012
@@ -177,9 +177,11 @@ public final class Globals {
 /**
  * The request attribute that is set to the value of {@code Boolean.TRUE}
  * if connector processing this request supports use of sendfile.
+ *
+ * Duplicated here for neater code in the catalina packages.
  */
 public static final String SENDFILE_SUPPORTED_ATTR =
-"org.apache.tomcat.sendfile.support";
+org.apache.coyote.Constants.SENDFILE_SUPPORTED_ATTR;
 
 
 /**
@@ -187,9 +189,11 @@ public final class Globals {
  * to the connector the name of the file that is to be served
  * by sendfile. The value should be {@code java.lang.String}
  * that is {@code File.getCanonicalPath()} of the file to be served.
+ *
+ * Duplicated here for neater code in the catalina packages.
  */
 public static final String SENDFILE_FILENAME_ATTR =
-"org.apache.tomcat.sendfile.filename";
+org.apache.coyote.Constants.SENDFILE_FILENAME_ATTR;
 
 
 /**
@@ -198,9 +202,11 @@ public final class Globals {
  * that is to be served by sendfile. The value should be
  * {@code java.lang.Long}. To serve complete file
  * the value should be {@code Long.valueOf(0)}.
+ *
+ * Duplicated here for neater code in the catalina packages.
  */
 public static final String SENDFILE_FILE_START_ATTR =
-"org.apache.tomcat.sendfile.start";
+org.apache.coyote.Constants.SENDFILE_FILE_START_ATTR;
 
 
 /**
@@ -209,9 +215,11 @@ public final class Globals {
  * of a file that is to be served by sendfile. The value should be
  * {@code java.lang.Long}. To serve complete file
  * the value should be equal to the length of the file.
+ *
+ * Duplicated here for neater code in the catalina packages.
  */
 public static final String SENDFILE_FILE_END_ATTR =
-"org.apache.tomcat.sendfile.end";
+org.apache.coyote.Constants.SENDFILE_FILE_END_ATTR;
 
 
 /**

Modified: tomcat/trunk/java/org/apache/catalina/connector/Request.java
URL: 
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/connector/Request.java?rev=1239298&r1=1239297&r2=1239298&view=diff
==
--- tomcat/trunk/java/org/apache/catalina/connector/Request.java (original)
+++ tomcat/trunk/java/org/apache/catalina/connector/Request.java Wed Feb  1 
20:11:26 2012
@@ -1449,7 +1449,7 @@ public class Request
 
 // Do the security check before any updates are made
 if (Globals.IS_SECURITY_ENABLED &&
-name.equals("org.apache.tomcat.sendfile.filename")) {
+name.equals(Globals.SENDFILE_FILENAME_ATTR)) {
 // Use the canonical file name to avoid any possible symlink and
 // relative path issues
 String canonicalPath;

Modified: tomcat/trunk/java/org/apache/catalina/servlets/DefaultServlet.java
URL: 
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/servlets/DefaultServlet.java?rev=1239298&r1=1239297&r2=1239298&view=diff
==
--- tomcat/trunk/java/org/apache/catalina/servlets/DefaultServlet.java 
(original)
+++ tomcat/trunk/java/org/apache/catalina/servlets/DefaultServlet.java Wed Feb  
1 20:11:26 2012
@@ -1641,16 +1641,16 @@ public class DefaultServlet
 && (entry.resource != null)
 && ((length > sendfileSize) || (entry.resource.getContent() == 
null))
 && (entry.attributes.getCanonicalPath() != null)
-&& (Boolean.TRUE == 
request.getAttribute("org.apache.tomcat.sendfile.support"))
+&& (Boolean.TRUE == 
request.getAttribute(Globals.SENDFILE_SUPPORTED_ATTR))
 && 
(request.getClass().getName().equals("org.apache.catalina.connector.RequestF

Re: [VOTE] Apache Tomcat Maven plugin 2.0-beta-1

[Olivier Lamy]

Is it possible to have karma on
https://dist.apache.org/repos/dist/release/tomcat ?

mbp-olamy:archiva olamy$ svn mkdir
https://dist.apache.org/repos/dist/release/tomcat/maven-plugin
Authentication realm:  ASF Committers
Password for 'olamy':
svn: access to '/repos/dist/!svn/ver/463/release/tomcat' forbidden

2012/2/1 sebb :
> On 1 February 2012 13:33, Olivier Lamy  wrote:
>> 2012/2/1 Mark Thomas :
>>> On 01/02/2012 13:01, sebb wrote:
 On 1 February 2012 11:56, Olivier Lamy  wrote:
> 2012/2/1 sebb :
>> On 1 February 2012 10:14, Olivier Lamy  wrote:
>>> Hello,
>>> As the others currently provided tomcat maven artifacts, adding those
>>> in the download section doesn't have (IMHO) sense.
>>> Because to be able to consume it within a maven build, users will have
>>> to install it locally respecting the maven repository format layout.
>>> So when the vote passed the files available in the staging repository
>>> https://repository.apache.org/content/repositories/orgapachetomcat-142/
>>> will be sync to http://repo.maven.apache.org/maven2/org/apache/tomcat/
>>> .
>>>
>>> What we can do at least is to add in the ASF download system the
>>> source archive. See files *-source-release.zip* in
>>> https://repository.apache.org/content/repositories/orgapachetomcat-142/org/apache/tomcat/maven/tomcat-maven-plugin/2.0-beta-1/
>>>
>>> At least with the file named
>>> tomcat-maven-plugin-2.0-beta-1-source-release.zip you can rebuild the
>>> plugins.
>>>
>>> Makes sense ?
>>
>> Apache Commons also releases code which is mainly consumed by Maven 
>> users.
>> All the components are released to the Apache mirrors (as source and
>> binary archives) as well as to Maven Central (as jars, with additional
>> src and javadoc jars).
>> Same as Tomcat itself, really.
>
> For commons it's artifacts/jars which can be consume "manually" but
> AFAIK consuming "manually" maven plugins jars doesn't have sense IMHO.

 The ASF releases source - from which it must be possible to build the 
 plugin.
 That's not generally easy or even possible from the jars that are
 released to Maven Central.

> If the case of a Maven plugin, I can put the jars in something like
> http://apache.multidist.com/tomcat/maven-plugin/ but so how will you
> use it ? installing manually using mvn install: ?

 You don't; you use the copies in Maven Central.

> And If I go here : 
> http://apache.multidist.com/tomcat/tomcat-7/v7.0.25/bin/
> I don't see maven artifacts which are available here:
> http://repo.maven.apache.org/maven2/org/apache/tomcat/tomcat-api/7.0.25/

 Exactly.

 Tomcat (as Commons) releases are made to *both* the mirrors *and* Maven 
 Central.

 The ASF mirrors are for source and binary archives.
 The Maven Central repo is used for the binary jars, along with pom and
 accompanying source/javadoc jars.
>>>
>>> +1
>>>
>>> The primary/master/whatever Tomcat release is the source that we voted
>>> on. It comes in two formats .zip and .tar.gz. Everything else (the
>>> binaries, the Maven artefacts, the docs) is (and can be by anyone who
>>> cares to) derived from that source release.
>>>
>>> Every Apache release *must* have a source form from which everything
>>> else may be derived. Without that, the release is invalid.
>>
>> Yup I proposed to add
>> https://repository.apache.org/content/repositories/orgapachetomcat-142/org/apache/tomcat/maven/tomcat-maven-plugin/2.0-beta-1/tomcat-maven-plugin-2.0-beta-1-source-release.zip
>>
>> In http://www.apache.org/dist/tomcat/maven-plugin/ ?
>
> Not forgetting the corresponding .asc/.md5/.sha1 as well.
>
> [But you can & should omit the .asc.md5 and .asc.sha1 files which are useless]
>
>>>
>>> Mark
>>>
>>> -
>>> To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
>>> For additional commands, e-mail: dev-h...@tomcat.apache.org
>>>
>>
>>
>>
>> --
>> Olivier Lamy
>> Talend: http://coders.talend.com
>> http://twitter.com/olamy | http://linkedin.com/in/olamy
>>
>> -
>> To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
>> For additional commands, e-mail: dev-h...@tomcat.apache.org
>>
>
> -
> To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
> For additional commands, e-mail: dev-h...@tomcat.apache.org
>

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

buildbot success in ASF Buildbot on tomcat-trunk

[buildbot]

The Buildbot has detected a restored build on builder tomcat-trunk while 
building ASF Buildbot.
Full details are available at:
 http://ci.apache.org/builders/tomcat-trunk/builds/2698

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

Buildslave for this Build: bb-vm_ubuntu

Build Reason: scheduler
Build Source Stamp: [branch tomcat/trunk] 1239298
Blamelist: markt

Build succeeded!

sincerely,
 -The Buildbot

Re: [VOTE] Apache Tomcat Maven plugin 2.0-beta-1

[Mark Thomas]

On 01/02/2012 20:36, Olivier Lamy wrote:
> Is it possible to have karma on
> https://dist.apache.org/repos/dist/release/tomcat ?

Access to that repo is limited to PMC members of the respective projects.

If you put the signed files in your home dir on people.a.o in the
structure you want I'll add them to dist (assuming that the sigs are valid).

Mark

> 
> mbp-olamy:archiva olamy$ svn mkdir
> https://dist.apache.org/repos/dist/release/tomcat/maven-plugin
> Authentication realm:  ASF Committers
> Password for 'olamy':
> svn: access to '/repos/dist/!svn/ver/463/release/tomcat' forbidden
> 
> 2012/2/1 sebb :
>> On 1 February 2012 13:33, Olivier Lamy  wrote:
>>> 2012/2/1 Mark Thomas :
 On 01/02/2012 13:01, sebb wrote:
> On 1 February 2012 11:56, Olivier Lamy  wrote:
>> 2012/2/1 sebb :
>>> On 1 February 2012 10:14, Olivier Lamy  wrote:
 Hello,
 As the others currently provided tomcat maven artifacts, adding those
 in the download section doesn't have (IMHO) sense.
 Because to be able to consume it within a maven build, users will have
 to install it locally respecting the maven repository format layout.
 So when the vote passed the files available in the staging repository
 https://repository.apache.org/content/repositories/orgapachetomcat-142/
 will be sync to http://repo.maven.apache.org/maven2/org/apache/tomcat/
 .

 What we can do at least is to add in the ASF download system the
 source archive. See files *-source-release.zip* in
 https://repository.apache.org/content/repositories/orgapachetomcat-142/org/apache/tomcat/maven/tomcat-maven-plugin/2.0-beta-1/

 At least with the file named
 tomcat-maven-plugin-2.0-beta-1-source-release.zip you can rebuild the
 plugins.

 Makes sense ?
>>>
>>> Apache Commons also releases code which is mainly consumed by Maven 
>>> users.
>>> All the components are released to the Apache mirrors (as source and
>>> binary archives) as well as to Maven Central (as jars, with additional
>>> src and javadoc jars).
>>> Same as Tomcat itself, really.
>>
>> For commons it's artifacts/jars which can be consume "manually" but
>> AFAIK consuming "manually" maven plugins jars doesn't have sense IMHO.
>
> The ASF releases source - from which it must be possible to build the 
> plugin.
> That's not generally easy or even possible from the jars that are
> released to Maven Central.
>
>> If the case of a Maven plugin, I can put the jars in something like
>> http://apache.multidist.com/tomcat/maven-plugin/ but so how will you
>> use it ? installing manually using mvn install: ?
>
> You don't; you use the copies in Maven Central.
>
>> And If I go here : 
>> http://apache.multidist.com/tomcat/tomcat-7/v7.0.25/bin/
>> I don't see maven artifacts which are available here:
>> http://repo.maven.apache.org/maven2/org/apache/tomcat/tomcat-api/7.0.25/
>
> Exactly.
>
> Tomcat (as Commons) releases are made to *both* the mirrors *and* Maven 
> Central.
>
> The ASF mirrors are for source and binary archives.
> The Maven Central repo is used for the binary jars, along with pom and
> accompanying source/javadoc jars.

 +1

 The primary/master/whatever Tomcat release is the source that we voted
 on. It comes in two formats .zip and .tar.gz. Everything else (the
 binaries, the Maven artefacts, the docs) is (and can be by anyone who
 cares to) derived from that source release.

 Every Apache release *must* have a source form from which everything
 else may be derived. Without that, the release is invalid.
>>>
>>> Yup I proposed to add
>>> https://repository.apache.org/content/repositories/orgapachetomcat-142/org/apache/tomcat/maven/tomcat-maven-plugin/2.0-beta-1/tomcat-maven-plugin-2.0-beta-1-source-release.zip
>>>
>>> In http://www.apache.org/dist/tomcat/maven-plugin/ ?
>>
>> Not forgetting the corresponding .asc/.md5/.sha1 as well.
>>
>> [But you can & should omit the .asc.md5 and .asc.sha1 files which are 
>> useless]
>>

 Mark

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

>>>
>>>
>>>
>>> --
>>> Olivier Lamy
>>> Talend: http://coders.talend.com
>>> http://twitter.com/olamy | http://linkedin.com/in/olamy
>>>
>>> -
>>> To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
>>> For additional commands, e-mail: dev-h...@tomcat.apache.org
>>>
>>
>> -
>> To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
>> For additional c

[RESULT] [VOTE] Apache Tomcat Maven plugin 2.0-beta-1

[Olivier Lamy]

Hello,
The vote has passed with the following results.

+1 (binding): Henri Gomez, Jean-Frederic Clere, Peter Roßbach
+1 (non binding): Russ Tremain, Olivier Lamy

I will close the staged repository (as it artifacts will available in
Maven Central repository).

Mark if you could put
http://people.apache.org/~olamy/tomcat/maven-plugin/ in
https://dist.apache.org/repos/dist/release/tomcat/

Thanks,
-- 
Olivier Lamy
Talend: http://coders.talend.com
http://twitter.com/olamy | http://linkedin.com/in/olamy

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

svn commit: r1239317 - /tomcat/site/trunk/xdocs/maven-plugin.xml

[olamy]

Author: olamy
Date: Wed Feb  1 20:56:13 2012
New Revision: 1239317

URL: http://svn.apache.org/viewvc?rev=1239317&view=rev
Log:
link to maven plugin released version 2.0-beta-1

Modified:
tomcat/site/trunk/xdocs/maven-plugin.xml

Modified: tomcat/site/trunk/xdocs/maven-plugin.xml
URL: 
http://svn.apache.org/viewvc/tomcat/site/trunk/xdocs/maven-plugin.xml?rev=1239317&r1=1239316&r2=1239317&view=diff
==
--- tomcat/site/trunk/xdocs/maven-plugin.xml (original)
+++ tomcat/site/trunk/xdocs/maven-plugin.xml Wed Feb  1 20:56:13 2012
@@ -18,6 +18,7 @@
 More details are available in the Maven generated site :
 
   http://tomcat.apache.org/maven-plugin-2.0-SNAPSHOT/";>Version 
2.0-SNAPSHOT (under developpement)
+  http://tomcat.apache.org/maven-plugin-2.0-beta-1/";>Version 2.0-beta-1 
(released version)
 
   
   



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

svn commit: r1239318 - /tomcat/site/trunk/docs/maven-plugin.html

[olamy]

Author: olamy
Date: Wed Feb  1 20:56:38 2012
New Revision: 1239318

URL: http://svn.apache.org/viewvc?rev=1239318&view=rev
Log:
link to maven plugin released version 2.0-beta-1

Modified:
tomcat/site/trunk/docs/maven-plugin.html

Modified: tomcat/site/trunk/docs/maven-plugin.html
URL: 
http://svn.apache.org/viewvc/tomcat/site/trunk/docs/maven-plugin.html?rev=1239318&r1=1239317&r2=1239318&view=diff
==
--- tomcat/site/trunk/docs/maven-plugin.html (original)
+++ tomcat/site/trunk/docs/maven-plugin.html Wed Feb  1 20:56:38 2012
@@ -204,6 +204,9 @@
   
 
 http://tomcat.apache.org/maven-plugin-2.0-SNAPSHOT/";>Version 
2.0-SNAPSHOT (under developpement)
+  
+
+http://tomcat.apache.org/maven-plugin-2.0-beta-1/";>Version 
2.0-beta-1 (released version)
 
 
   



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

DO NOT REPLY [Bug 52500] Improve client certificate authentication

[bugzilla]

https://issues.apache.org/bugzilla/show_bug.cgi?id=52500

--- Comment #16 from Christopher Schultz  
2012-02-01 20:57:49 UTC ---
(In reply to comment #11)
> - I have provided a default transformation that is the same as the current 
> code
> - DefaultSubjectDnRetriever 
> 
> Any case, I strongly recommend to add additional transformations out of the 
> box
> since it will allow to use Tomcat for the client certificate authentication.
> It will allow easy configuration to do it. See and the examples below: 
>  x509UserIdentifierRetrieveFieldPart="otherName" />

I think the idea was that you would be able to configure the realm like this:



(Where my example shown above is the default)

That way, the x509UserItentifierRetriever can support whatever requirements are
necessary in the deployment environment, rather than having a large list of
attributes for RealmBase to juggle-around.

> I also can contribute the attached x509Configuration.docx for better
> explanation.

In the future, please provide more democratic documentation. For instance,
plain-text or OpenDocument format. Plain text is better because it does not
require a viewer external to the we browser.

> In addition, I strongly recommend to add out of the box
> SubjectAlternativeNameRetriever.

Let's get the interface nailed-down first, then we can implement as many
UserIdentifierRetrievers as are appropriate.

-- 
Configure bugmail: https://issues.apache.org/bugzilla/userprefs.cgi?tab=email
--- You are receiving this mail because: ---
You are the assignee for the bug.
-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org

svn commit: r1239320 - in /tomcat/site/trunk: docs/maven-plugin.html xdocs/maven-plugin.xml

[olamy]

Author: olamy
Date: Wed Feb  1 20:59:19 2012
New Revision: 1239320

URL: http://svn.apache.org/viewvc?rev=1239320&view=rev
Log:
maven plugin add release date

Modified:
tomcat/site/trunk/docs/maven-plugin.html
tomcat/site/trunk/xdocs/maven-plugin.xml

Modified: tomcat/site/trunk/docs/maven-plugin.html
URL: 
http://svn.apache.org/viewvc/tomcat/site/trunk/docs/maven-plugin.html?rev=1239320&r1=1239319&r2=1239320&view=diff
==
--- tomcat/site/trunk/docs/maven-plugin.html (original)
+++ tomcat/site/trunk/docs/maven-plugin.html Wed Feb  1 20:59:19 2012
@@ -206,7 +206,7 @@
 http://tomcat.apache.org/maven-plugin-2.0-SNAPSHOT/";>Version 
2.0-SNAPSHOT (under developpement)
   
 
-http://tomcat.apache.org/maven-plugin-2.0-beta-1/";>Version 
2.0-beta-1 (released version)
+http://tomcat.apache.org/maven-plugin-2.0-beta-1/";>Version 
2.0-beta-1 (released version: 2012-02-01)
 
 
   

Modified: tomcat/site/trunk/xdocs/maven-plugin.xml
URL: 
http://svn.apache.org/viewvc/tomcat/site/trunk/xdocs/maven-plugin.xml?rev=1239320&r1=1239319&r2=1239320&view=diff
==
--- tomcat/site/trunk/xdocs/maven-plugin.xml (original)
+++ tomcat/site/trunk/xdocs/maven-plugin.xml Wed Feb  1 20:59:19 2012
@@ -18,7 +18,7 @@
 More details are available in the Maven generated site :
 
   http://tomcat.apache.org/maven-plugin-2.0-SNAPSHOT/";>Version 
2.0-SNAPSHOT (under developpement)
-  http://tomcat.apache.org/maven-plugin-2.0-beta-1/";>Version 2.0-beta-1 
(released version)
+  http://tomcat.apache.org/maven-plugin-2.0-beta-1/";>Version 2.0-beta-1 
(released version: 2012-02-01)
 
   
   



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

Tomcat-native patch for NPN support

[Costin Manolache]

Hi,

I have a patch to the jni library, I uploaded it to github for easy
commenting:

https://github.com/costinm/tomcat-native/commit/5e7d4b45bfa542e4b099bfdc2bda423b9a6cc85d

Please let me know if it looks ok - I included a 'cmake' build, which can
generate a libtcnative.so with no
external dependencies - NPN requires the latest openssl1.0.1beta2, it may
be trickier to install with the normal
platform dependencies. ( only tested cmake on linux64 - when new ssl gets
included in more platforms it won't be
needed.)

Also included are some native methods for ssl session reuse ( to support
distributed session cache or tickets ).

( I have a separate change to tomcat-trunk that depents on this, for spdy
support )

Costin

Re: [RESULT] [VOTE] Apache Tomcat Maven plugin 2.0-beta-1

[Mark Thomas]

On 01/02/2012 20:51, Olivier Lamy wrote:
> Hello,
> The vote has passed with the following results.
> 
> +1 (binding): Henri Gomez, Jean-Frederic Clere, Peter Roßbach
> +1 (non binding): Russ Tremain, Olivier Lamy
> 
> I will close the staged repository (as it artifacts will available in
> Maven Central repository).
> 
> Mark if you could put
> http://people.apache.org/~olamy/tomcat/maven-plugin/ in
> https://dist.apache.org/repos/dist/release/tomcat/

All ready to go but you need to include a KEYS file, especially since
your key is not in the ASF web of trust.

Mark

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

Re: [RESULT] [VOTE] Apache Tomcat Maven plugin 2.0-beta-1

[Olivier Lamy]

2012/2/1 Mark Thomas :
> On 01/02/2012 20:51, Olivier Lamy wrote:
>> Hello,
>> The vote has passed with the following results.
>>
>> +1 (binding): Henri Gomez, Jean-Frederic Clere, Peter Roßbach
>> +1 (non binding): Russ Tremain, Olivier Lamy
>>
>> I will close the staged repository (as it artifacts will available in
>> Maven Central repository).
>>
>> Mark if you could put
>> http://people.apache.org/~olamy/tomcat/maven-plugin/ in
>> https://dist.apache.org/repos/dist/release/tomcat/
>
> All ready to go but you need to include a KEYS file, especially since
> your key is not in the ASF web of trust.
My key is in various places:
http://svn.apache.org/repos/asf/maven/project/KEYS
http://svn.apache.org/repos/asf/archiva/project/KEYS
http://svn.apache.org/repos/asf/continuum/project/KEYS

I miss you with "ASF web of trust" ? Is there a more generic place (I
could be happy) ?

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



-- 
Olivier Lamy
Talend: http://coders.talend.com
http://twitter.com/olamy | http://linkedin.com/in/olamy

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

Re: [RESULT] [VOTE] Apache Tomcat Maven plugin 2.0-beta-1

[Mark Thomas]

On 01/02/2012 21:09, Olivier Lamy wrote:
> 2012/2/1 Mark Thomas :
>> On 01/02/2012 20:51, Olivier Lamy wrote:
>>> Hello,
>>> The vote has passed with the following results.
>>>
>>> +1 (binding): Henri Gomez, Jean-Frederic Clere, Peter Roßbach
>>> +1 (non binding): Russ Tremain, Olivier Lamy
>>>
>>> I will close the staged repository (as it artifacts will available in
>>> Maven Central repository).
>>>
>>> Mark if you could put
>>> http://people.apache.org/~olamy/tomcat/maven-plugin/ in
>>> https://dist.apache.org/repos/dist/release/tomcat/
>>
>> All ready to go but you need to include a KEYS file, especially since
>> your key is not in the ASF web of trust.
> My key is in various places:
> http://svn.apache.org/repos/asf/maven/project/KEYS
> http://svn.apache.org/repos/asf/archiva/project/KEYS
> http://svn.apache.org/repos/asf/continuum/project/KEYS

It needs to be in /dist/release/tomcat/maven-plugin

Add the file to people.a.o and I'll pull it in.

> I miss you with "ASF web of trust" ? Is there a more generic place (I
> could be happy) ?

You need to get your key signed by someone else in the ASF web of trust
otherwise there is relatively little that confirms that you are in fact
who you say you are. For example, compare your key to mine and you'll
see it has been signed by a whole bunch of people - all of whom checked
my government issued photo ID before they signed it.

Mark

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

Re: [RESULT] [VOTE] Apache Tomcat Maven plugin 2.0-beta-1

[Olivier Lamy]

2012/2/1 Mark Thomas :
> On 01/02/2012 21:09, Olivier Lamy wrote:
>> 2012/2/1 Mark Thomas :
>>> On 01/02/2012 20:51, Olivier Lamy wrote:
 Hello,
 The vote has passed with the following results.

 +1 (binding): Henri Gomez, Jean-Frederic Clere, Peter Roßbach
 +1 (non binding): Russ Tremain, Olivier Lamy

 I will close the staged repository (as it artifacts will available in
 Maven Central repository).

 Mark if you could put
 http://people.apache.org/~olamy/tomcat/maven-plugin/ in
 https://dist.apache.org/repos/dist/release/tomcat/
>>>
>>> All ready to go but you need to include a KEYS file, especially since
>>> your key is not in the ASF web of trust.
>> My key is in various places:
>> http://svn.apache.org/repos/asf/maven/project/KEYS
>> http://svn.apache.org/repos/asf/archiva/project/KEYS
>> http://svn.apache.org/repos/asf/continuum/project/KEYS
>
> It needs to be in /dist/release/tomcat/maven-plugin
>
> Add the file to people.a.o and I'll pull it in.

/home/olamy/public_html/tomcat/maven-plugin

>
>> I miss you with "ASF web of trust" ? Is there a more generic place (I
>> could be happy) ?
>
> You need to get your key signed by someone else in the ASF web of trust
> otherwise there is relatively little that confirms that you are in fact
> who you say you are. For example, compare your key to mine and you'll
> see it has been signed by a whole bunch of people - all of whom checked
> my government issued photo ID before they signed it.

So I need to find friends :-)

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



-- 
Olivier Lamy
Talend: http://coders.talend.com
http://twitter.com/olamy | http://linkedin.com/in/olamy

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

Re: [RESULT] [VOTE] Apache Tomcat Maven plugin 2.0-beta-1

[Mark Thomas]

On 01/02/2012 21:26, Olivier Lamy wrote:
> 2012/2/1 Mark Thomas :
>> Add the file to people.a.o and I'll pull it in.
> 
> /home/olamy/public_html/tomcat/maven-plugin

Not there yet.

>>> I miss you with "ASF web of trust" ? Is there a more generic place (I
>>> could be happy) ?
>>
>> You need to get your key signed by someone else in the ASF web of trust
>> otherwise there is relatively little that confirms that you are in fact
>> who you say you are. For example, compare your key to mine and you'll
>> see it has been signed by a whole bunch of people - all of whom checked
>> my government issued photo ID before they signed it.
> 
> So I need to find friends :-)

:)

Mark

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

DO NOT REPLY [Bug 52563] Incorrect behavior while checking the thread binding in DirContextURLStreamHandler

[bugzilla]

https://issues.apache.org/bugzilla/show_bug.cgi?id=52563

--- Comment #2 from Christopher Schultz  
2012-02-01 21:52:59 UTC ---
As mentioned in the user list, this code seems to work just fine -- it's just
slightly unclear while reading the code what is going on.

Is there a legitimate bug, here?

If so, please clearly state the steps-to-reproduce.

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

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

Re: [RESULT] [VOTE] Apache Tomcat Maven plugin 2.0-beta-1

[Olivier Lamy]

2012/2/1 Mark Thomas :
> On 01/02/2012 21:26, Olivier Lamy wrote:
>> 2012/2/1 Mark Thomas :
>>> Add the file to people.a.o and I'll pull it in.
>>
>> /home/olamy/public_html/tomcat/maven-plugin
>
> Not there yet.

KEYS file is now there.

>
 I miss you with "ASF web of trust" ? Is there a more generic place (I
 could be happy) ?
>>>
>>> You need to get your key signed by someone else in the ASF web of trust
>>> otherwise there is relatively little that confirms that you are in fact
>>> who you say you are. For example, compare your key to mine and you'll
>>> see it has been signed by a whole bunch of people - all of whom checked
>>> my government issued photo ID before they signed it.
>>
>> So I need to find friends :-)
>
> :)
>
> Mark
>
> -
> To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
> For additional commands, e-mail: dev-h...@tomcat.apache.org
>



-- 
Olivier Lamy
Talend: http://coders.talend.com
http://twitter.com/olamy | http://linkedin.com/in/olamy

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

SPDY support

[Costin Manolache]

Hi,

Some initial patch for SPDY - using the NPN SSL extension, as required by
chrome/firefox.

I used github so it's easy to add comments or test:

https://github.com/costinm/tomcat/commit/e97def3314216c083cc4b68ad9731e5a94b2af28

Basic 'hello world' works in both jio and apr, looking for opinions on the
integration with tomcat connectors.
Please let me know :-)

Costin

Re: WebSocket progress report

[Petr Praus]

Hello,
we're group of three CS grad students taking a course in advanced
networking. As a course project, each of us has implemented a basic
websocket server in Java with functionality roughly equal to the current
state of Mark's patch. The next stage of the project is to continue in a
group and get the implementation as far as possible. Since building our own
standalone websocket server (that does just websocket) doesn't really make
sense, we'd like to join in the effort to make websocket available in
Tomcat.

We've a few questions:
1) Is there an interest in our help?
2) What are the priority TODOs we should start considering?
3) Some examples (e.g. echo server) of how to use the current
implementation to write a servlet would be nice. It'd help us to get up to
speed more quickly.

Also, please note that although this is a course project sanctioned by the
professor, we're not really doing this as a course requirement but rather
out of our personal interest in contributing to open source. The scope of
the class project is 2-3 weeks but that of course doesn't mean we'll
abandon the code after that :)

Thanks,
Petr Praus

svn commit: r473 - in /release/tomcat/maven-plugin: ./ v2.0-beta-1/

[markt]

Author: markt
Date: Wed Feb  1 21:58:12 2012
New Revision: 473

Log:
maven plugin 2.0-beta-1 release

Added:
release/tomcat/maven-plugin/
release/tomcat/maven-plugin/KEYS.txt   (with props)
release/tomcat/maven-plugin/v2.0-beta-1/

release/tomcat/maven-plugin/v2.0-beta-1/tomcat-maven-plugin-2.0-beta-1-source-release.zip
   (with props)

release/tomcat/maven-plugin/v2.0-beta-1/tomcat-maven-plugin-2.0-beta-1-source-release.zip.asc

release/tomcat/maven-plugin/v2.0-beta-1/tomcat-maven-plugin-2.0-beta-1-source-release.zip.md5

release/tomcat/maven-plugin/v2.0-beta-1/tomcat-maven-plugin-2.0-beta-1-source-release.zip.sha1

Added: release/tomcat/maven-plugin/KEYS.txt
==
--- release/tomcat/maven-plugin/KEYS.txt (added)
+++ release/tomcat/maven-plugin/KEYS.txt Wed Feb  1 21:58:12 2012
@@ -0,0 +1,36 @@
+pub   1024D/B4372146 2007-12-10
+uid  Olivier Lamy 
+sig 3B4372146 2007-12-10  Olivier Lamy 
+sub   2048g/B615D06C 2007-12-10
+sig  B4372146 2007-12-10  Olivier Lamy 
+
+-BEGIN PGP PUBLIC KEY BLOCK-
+Version: GnuPG v2.0.4 (FreeBSD)
+
+mQGiBEdddbQRBADRgstdUZq7ceq3NYcR5kpoU2tN2Zvg1vptE9FxpDbL73gdLWnI
+C7IAx+NNjdG7Ncdg+u10UZv6OSmhWAd8ubWcD9JxKtS4UXkNPHxhHFHqVPHuCwsQ
+q2AaCtuOk6q9OtthQX6LfOuGqwbv9uH/KLUDn91PrgKuHPVfVveiF30ZvwCggutX
+D0jTGRHzUJl7F1wViuckHJcD/2z76t0ObSuTnENi0IUjF3Toe4tv+qO+Ljs0knvK
+tu1b8A5Bs+kxNcbEqV+zdIph+6gCL9jy+dB9J+t6uZg6ACJexbIkDPsutNtbAVDV
+w5AtM7JR8930dRHfEt26ahFohFi+73V8RiA7LrmMjA8rX4zuo5Pr48xt/RR1Y/VE
+8ohCA/wOqul9eHHevxeEMDYoGVjGl2EiuIThg4eYuQDDSisBNb9a6dhE8ECQFFBx
+mGz32+I8gXSTKFAkkQUI4HmJmTX35nGJql6E7Bn5yM2OaOG04PV+xkhScJll5ZxZ
+BNEccFDL/aI4N33cwrLHyk+wFNZHBL1hnHpxpjFZYv5xfEBjmbQfT2xpdmllciBM
+YW15IDxvbGFteUBhcGFjaGUub3JnPohgBBMRAgAgBQJHXXW0AhsDBgsJCAcDAgQV
+AggDBBYCAwECHgECF4AACgkQhzqOhrQ3IUaI7gCdFVmlYsAVIhWT46nNDgiPgiqf
+GooAnR92fjMe/bHtbEXCnw8B/9TwetwpuQINBEdddc8QCADKoTPd4EQqJntVsCP3
+oe0i8a58pN1nQREm2t087gVQZUFxemmG2c+f4k5aiazNQqQos7jHbg5oMIb9IQ2w
+/L4153jCMEH7i5XRgRzlefyC2zeDhnmn5iJW75pZ5g88LkE9TrW1Wpz33qL1liRm
+Jg6z0Xln50qjOTcrBVyKNoKvQhAyMC0n83vTNxyI/bcqGs31nc2fnhebsZ7MPSfF
+NQY/yAzv3MoedWEMGm2vEhP9p0LNT39RfdRUBBx2rzoV/NMSmoUbdMzvkcFNCAeK
+EiSSKvO6sT6K+HppoXdQnCYMF7la7eC/EXpGXQlr9gE2SQKI5eeBdLHC9RRHwok7
+TtEbAAMGCADE4VXYN8wexMG776Aon3gvpWMRN9UURg+jt7i07ZmfZSfN3HPYGhMl
+xBjSPr8zdOX2ELCE5JVUvwCj/CnXKSOBefBXi/PRt7h39kwv4oXXnH7zvfQftOH5
+pH5SDoroqGynxcjKmYslxiBgsPTY+VKcPEKr0Vu/QkOVuvq1uwmJXOhGOD5Y0QgH
+cgisltMiI4WtEGGWiKdiii3bXpAnWsjadCkwQGVK5fp/iNgXoXtfh0BjhXiiGMV4
+kJvpJiQpuPhxqoED05WuPe+Hy/+8BQoMHympWGlpmJwWkx3akQRhUwRTiLWwsTdf
+vfL1FG5ok688DHYcdPwyVaOwOY11jYyDiEkEGBECAAkFAkdddc8CGwwACgkQhzqO
+hrQ3IUZkrACcDtB3CttHYgGrF31KCocX/gwCiYEAn18D875QwNruE4Qkt/W0Rhy/
+QRIZ
+=r87y
+-END PGP PUBLIC KEY BLOCK-

Propchange: release/tomcat/maven-plugin/KEYS.txt
--
svn:eol-style = native

Added: 
release/tomcat/maven-plugin/v2.0-beta-1/tomcat-maven-plugin-2.0-beta-1-source-release.zip
==
Binary file - no diff available.

Propchange: 
release/tomcat/maven-plugin/v2.0-beta-1/tomcat-maven-plugin-2.0-beta-1-source-release.zip
--
svn:mime-type = application/octet-stream

Added: 
release/tomcat/maven-plugin/v2.0-beta-1/tomcat-maven-plugin-2.0-beta-1-source-release.zip.asc
==
--- 
release/tomcat/maven-plugin/v2.0-beta-1/tomcat-maven-plugin-2.0-beta-1-source-release.zip.asc
 (added)
+++ 
release/tomcat/maven-plugin/v2.0-beta-1/tomcat-maven-plugin-2.0-beta-1-source-release.zip.asc
 Wed Feb  1 21:58:12 2012
@@ -0,0 +1,7 @@
+-BEGIN PGP SIGNATURE-
+Version: GnuPG v1.4.11 (Darwin)
+
+iEYEABECAAYFAk8hZ1QACgkQhzqOhrQ3IUb4egCeLkkPzLxESng3YgfR8NuL9op8
+gGIAnjuyccui9tTQnMjzF/MpbXWywrSB
+=bo6M
+-END PGP SIGNATURE-

Added: 
release/tomcat/maven-plugin/v2.0-beta-1/tomcat-maven-plugin-2.0-beta-1-source-release.zip.md5
==
--- 
release/tomcat/maven-plugin/v2.0-beta-1/tomcat-maven-plugin-2.0-beta-1-source-release.zip.md5
 (added)
+++ 
release/tomcat/maven-plugin/v2.0-beta-1/tomcat-maven-plugin-2.0-beta-1-source-release.zip.md5
 Wed Feb  1 21:58:12 2012
@@ -0,0 +1 @@
+10a3dc1afd49a373e093ab0baadb1e75
\ No newline at end of file

Added: 
release/tomcat/maven-plugin/v2.0-beta-1/tomcat-maven-plugin-2.0-beta-1-source-release.zip.sha1
==
--- 
release/tomcat/maven-plugin/v2.0-beta-1/tomcat-maven-plugin-2.0-beta-1-source-release.zip.sha1
 (added)
+++ 
release/tomcat/maven-plugin/v2.0-beta-1/tomcat-maven-plugin-2.0-beta-1-source-release.zip.sha1
 Wed Feb  1 21:58:12 2012
@@ -0,0 +1 @@
+3eca1d1a969a4e2c6ceb2f4975d2e04

svn commit: r473 - in /release/tomcat/maven-plugin: ./ v2.0-beta-1/

[markt]

Author: markt
Date: Wed Feb  1 21:58:12 2012
New Revision: 473

Log:
maven plugin 2.0-beta-1 release

Added:
release/tomcat/maven-plugin/
release/tomcat/maven-plugin/KEYS.txt   (with props)
release/tomcat/maven-plugin/v2.0-beta-1/

release/tomcat/maven-plugin/v2.0-beta-1/tomcat-maven-plugin-2.0-beta-1-source-release.zip
   (with props)

release/tomcat/maven-plugin/v2.0-beta-1/tomcat-maven-plugin-2.0-beta-1-source-release.zip.asc

release/tomcat/maven-plugin/v2.0-beta-1/tomcat-maven-plugin-2.0-beta-1-source-release.zip.md5

release/tomcat/maven-plugin/v2.0-beta-1/tomcat-maven-plugin-2.0-beta-1-source-release.zip.sha1

Added: release/tomcat/maven-plugin/KEYS.txt
==
--- release/tomcat/maven-plugin/KEYS.txt (added)
+++ release/tomcat/maven-plugin/KEYS.txt Wed Feb  1 21:58:12 2012
@@ -0,0 +1,36 @@
+pub   1024D/B4372146 2007-12-10
+uid  Olivier Lamy 
+sig 3B4372146 2007-12-10  Olivier Lamy 
+sub   2048g/B615D06C 2007-12-10
+sig  B4372146 2007-12-10  Olivier Lamy 
+
+-BEGIN PGP PUBLIC KEY BLOCK-
+Version: GnuPG v2.0.4 (FreeBSD)
+
+mQGiBEdddbQRBADRgstdUZq7ceq3NYcR5kpoU2tN2Zvg1vptE9FxpDbL73gdLWnI
+C7IAx+NNjdG7Ncdg+u10UZv6OSmhWAd8ubWcD9JxKtS4UXkNPHxhHFHqVPHuCwsQ
+q2AaCtuOk6q9OtthQX6LfOuGqwbv9uH/KLUDn91PrgKuHPVfVveiF30ZvwCggutX
+D0jTGRHzUJl7F1wViuckHJcD/2z76t0ObSuTnENi0IUjF3Toe4tv+qO+Ljs0knvK
+tu1b8A5Bs+kxNcbEqV+zdIph+6gCL9jy+dB9J+t6uZg6ACJexbIkDPsutNtbAVDV
+w5AtM7JR8930dRHfEt26ahFohFi+73V8RiA7LrmMjA8rX4zuo5Pr48xt/RR1Y/VE
+8ohCA/wOqul9eHHevxeEMDYoGVjGl2EiuIThg4eYuQDDSisBNb9a6dhE8ECQFFBx
+mGz32+I8gXSTKFAkkQUI4HmJmTX35nGJql6E7Bn5yM2OaOG04PV+xkhScJll5ZxZ
+BNEccFDL/aI4N33cwrLHyk+wFNZHBL1hnHpxpjFZYv5xfEBjmbQfT2xpdmllciBM
+YW15IDxvbGFteUBhcGFjaGUub3JnPohgBBMRAgAgBQJHXXW0AhsDBgsJCAcDAgQV
+AggDBBYCAwECHgECF4AACgkQhzqOhrQ3IUaI7gCdFVmlYsAVIhWT46nNDgiPgiqf
+GooAnR92fjMe/bHtbEXCnw8B/9TwetwpuQINBEdddc8QCADKoTPd4EQqJntVsCP3
+oe0i8a58pN1nQREm2t087gVQZUFxemmG2c+f4k5aiazNQqQos7jHbg5oMIb9IQ2w
+/L4153jCMEH7i5XRgRzlefyC2zeDhnmn5iJW75pZ5g88LkE9TrW1Wpz33qL1liRm
+Jg6z0Xln50qjOTcrBVyKNoKvQhAyMC0n83vTNxyI/bcqGs31nc2fnhebsZ7MPSfF
+NQY/yAzv3MoedWEMGm2vEhP9p0LNT39RfdRUBBx2rzoV/NMSmoUbdMzvkcFNCAeK
+EiSSKvO6sT6K+HppoXdQnCYMF7la7eC/EXpGXQlr9gE2SQKI5eeBdLHC9RRHwok7
+TtEbAAMGCADE4VXYN8wexMG776Aon3gvpWMRN9UURg+jt7i07ZmfZSfN3HPYGhMl
+xBjSPr8zdOX2ELCE5JVUvwCj/CnXKSOBefBXi/PRt7h39kwv4oXXnH7zvfQftOH5
+pH5SDoroqGynxcjKmYslxiBgsPTY+VKcPEKr0Vu/QkOVuvq1uwmJXOhGOD5Y0QgH
+cgisltMiI4WtEGGWiKdiii3bXpAnWsjadCkwQGVK5fp/iNgXoXtfh0BjhXiiGMV4
+kJvpJiQpuPhxqoED05WuPe+Hy/+8BQoMHympWGlpmJwWkx3akQRhUwRTiLWwsTdf
+vfL1FG5ok688DHYcdPwyVaOwOY11jYyDiEkEGBECAAkFAkdddc8CGwwACgkQhzqO
+hrQ3IUZkrACcDtB3CttHYgGrF31KCocX/gwCiYEAn18D875QwNruE4Qkt/W0Rhy/
+QRIZ
+=r87y
+-END PGP PUBLIC KEY BLOCK-

Propchange: release/tomcat/maven-plugin/KEYS.txt
--
svn:eol-style = native

Added: 
release/tomcat/maven-plugin/v2.0-beta-1/tomcat-maven-plugin-2.0-beta-1-source-release.zip
==
Binary file - no diff available.

Propchange: 
release/tomcat/maven-plugin/v2.0-beta-1/tomcat-maven-plugin-2.0-beta-1-source-release.zip
--
svn:mime-type = application/octet-stream

Added: 
release/tomcat/maven-plugin/v2.0-beta-1/tomcat-maven-plugin-2.0-beta-1-source-release.zip.asc
==
--- 
release/tomcat/maven-plugin/v2.0-beta-1/tomcat-maven-plugin-2.0-beta-1-source-release.zip.asc
 (added)
+++ 
release/tomcat/maven-plugin/v2.0-beta-1/tomcat-maven-plugin-2.0-beta-1-source-release.zip.asc
 Wed Feb  1 21:58:12 2012
@@ -0,0 +1,7 @@
+-BEGIN PGP SIGNATURE-
+Version: GnuPG v1.4.11 (Darwin)
+
+iEYEABECAAYFAk8hZ1QACgkQhzqOhrQ3IUb4egCeLkkPzLxESng3YgfR8NuL9op8
+gGIAnjuyccui9tTQnMjzF/MpbXWywrSB
+=bo6M
+-END PGP SIGNATURE-

Added: 
release/tomcat/maven-plugin/v2.0-beta-1/tomcat-maven-plugin-2.0-beta-1-source-release.zip.md5
==
--- 
release/tomcat/maven-plugin/v2.0-beta-1/tomcat-maven-plugin-2.0-beta-1-source-release.zip.md5
 (added)
+++ 
release/tomcat/maven-plugin/v2.0-beta-1/tomcat-maven-plugin-2.0-beta-1-source-release.zip.md5
 Wed Feb  1 21:58:12 2012
@@ -0,0 +1 @@
+10a3dc1afd49a373e093ab0baadb1e75
\ No newline at end of file

Added: 
release/tomcat/maven-plugin/v2.0-beta-1/tomcat-maven-plugin-2.0-beta-1-source-release.zip.sha1
==
--- 
release/tomcat/maven-plugin/v2.0-beta-1/tomcat-maven-plugin-2.0-beta-1-source-release.zip.sha1
 (added)
+++ 
release/tomcat/maven-plugin/v2.0-beta-1/tomcat-maven-plugin-2.0-beta-1-source-release.zip.sha1
 Wed Feb  1 21:58:12 2012
@@ -0,0 +1 @@
+3eca1d1a969a4e2c6ceb2f4975d2e04

Re: [RESULT] [VOTE] Apache Tomcat Maven plugin 2.0-beta-1

[Mark Thomas]

On 01/02/2012 21:53, Olivier Lamy wrote:
> 2012/2/1 Mark Thomas :
>> On 01/02/2012 21:26, Olivier Lamy wrote:
>>> 2012/2/1 Mark Thomas :
 Add the file to people.a.o and I'll pull it in.
>>>
>>> /home/olamy/public_html/tomcat/maven-plugin
>>
>> Not there yet.
> 
> KEYS file is now there.

Dist is live.

I put the files under a v2.0-beta-1 directory so the archive is tidier
when there are multiple versions.

Mark

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

Re: [RESULT] [VOTE] Apache Tomcat Maven plugin 2.0-beta-1

[Olivier Lamy]

2012/2/1 Mark Thomas :
> On 01/02/2012 21:53, Olivier Lamy wrote:
>> 2012/2/1 Mark Thomas :
>>> On 01/02/2012 21:26, Olivier Lamy wrote:
 2012/2/1 Mark Thomas :
> Add the file to people.a.o and I'll pull it in.

 /home/olamy/public_html/tomcat/maven-plugin
>>>
>>> Not there yet.
>>
>> KEYS file is now there.
>
> Dist is live.
Thanks !
>
> I put the files under a v2.0-beta-1 directory so the archive is tidier
> when there are multiple versions.
>
> Mark
>
> -
> To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
> For additional commands, e-mail: dev-h...@tomcat.apache.org
>



-- 
Olivier Lamy
Talend: http://coders.talend.com
http://twitter.com/olamy | http://linkedin.com/in/olamy

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

Re: WebSocket progress report

[Mark Thomas]

On 01/02/2012 21:57, Petr Praus wrote:
> Hello,
> we're group of three CS grad students taking a course in advanced
> networking. As a course project, each of us has implemented a basic
> websocket server in Java with functionality roughly equal to the current
> state of Mark's patch. The next stage of the project is to continue in a
> group and get the implementation as far as possible. Since building our own
> standalone websocket server (that does just websocket) doesn't really make
> sense, we'd like to join in the effort to make websocket available in
> Tomcat.
> 
> We've a few questions:
> 1) Is there an interest in our help?

Absolutely.

> 2) What are the priority TODOs we should start considering?

See [1]. In my view the priority is:
- handle the other control messages - especially close.
- handle multi-frame messages
then
- follow-up on Costin's comments re a lighter-weight approach of
wrapping the socket
- more and better examples
- a lot more JavaDoc
- let the API bed down a little and then talk to Jetty about possibly
aligning APIs

> 3) Some examples (e.g. echo server) of how to use the current
> implementation to write a servlet would be nice. It'd help us to get up to
> speed more quickly.

See [2]. Two very simple examples that need some expansion but it should
give you the general idea.

> Also, please note that although this is a course project sanctioned by the
> professor, we're not really doing this as a course requirement but rather
> out of our personal interest in contributing to open source. The scope of
> the class project is 2-3 weeks but that of course doesn't mean we'll
> abandon the code after that :)

Glad to hear it :)

Kind regards,

Mark

[1]
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/websocket/StreamInbound.java?view=annotate

[2]
http://svn.apache.org/viewvc/tomcat/trunk/webapps/examples/WEB-INF/classes/websocket/

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

Re: [RESULT] [VOTE] Apache Tomcat Maven plugin 2.0-beta-1

[Henri Gomez]

There is many ASFers in Paris, so a signing / beer party should be easy

Le 1 févr. 2012 à 22:26, Olivier Lamy  a écrit :

> 2012/2/1 Mark Thomas :
>> On 01/02/2012 21:09, Olivier Lamy wrote:
>>> 2012/2/1 Mark Thomas :
 On 01/02/2012 20:51, Olivier Lamy wrote:
> Hello,
> The vote has passed with the following results.
> 
> +1 (binding): Henri Gomez, Jean-Frederic Clere, Peter Roßbach
> +1 (non binding): Russ Tremain, Olivier Lamy
> 
> I will close the staged repository (as it artifacts will available in
> Maven Central repository).
> 
> Mark if you could put
> http://people.apache.org/~olamy/tomcat/maven-plugin/ in
> https://dist.apache.org/repos/dist/release/tomcat/
 
 All ready to go but you need to include a KEYS file, especially since
 your key is not in the ASF web of trust.
>>> My key is in various places:
>>> http://svn.apache.org/repos/asf/maven/project/KEYS
>>> http://svn.apache.org/repos/asf/archiva/project/KEYS
>>> http://svn.apache.org/repos/asf/continuum/project/KEYS
>> 
>> It needs to be in /dist/release/tomcat/maven-plugin
>> 
>> Add the file to people.a.o and I'll pull it in.
> 
> /home/olamy/public_html/tomcat/maven-plugin
> 
>> 
>>> I miss you with "ASF web of trust" ? Is there a more generic place (I
>>> could be happy) ?
>> 
>> You need to get your key signed by someone else in the ASF web of trust
>> otherwise there is relatively little that confirms that you are in fact
>> who you say you are. For example, compare your key to mine and you'll
>> see it has been signed by a whole bunch of people - all of whom checked
>> my government issued photo ID before they signed it.
> 
> So I need to find friends :-)
> 
>> 
>> Mark
>> 
>> -
>> To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
>> For additional commands, e-mail: dev-h...@tomcat.apache.org
>> 
> 
> 
> 
> -- 
> Olivier Lamy
> Talend: http://coders.talend.com
> http://twitter.com/olamy | http://linkedin.com/in/olamy
> 
> -
> To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
> For additional commands, e-mail: dev-h...@tomcat.apache.org
> 

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

Re: SPDY support

[Henri Gomez]

Github :-)

Le 1 févr. 2012 à 22:54, Costin Manolache  a écrit :

> Hi,
> 
> Some initial patch for SPDY - using the NPN SSL extension, as required by
> chrome/firefox.
> 
> I used github so it's easy to add comments or test:
> 
> https://github.com/costinm/tomcat/commit/e97def3314216c083cc4b68ad9731e5a94b2af28
> 
> Basic 'hello world' works in both jio and apr, looking for opinions on the
> integration with tomcat connectors.
> Please let me know :-)
> 
> Costin

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

DO NOT REPLY [Bug 52577] New: Response output written in filter can be truncated

[bugzilla]

https://issues.apache.org/bugzilla/show_bug.cgi?id=52577

 Bug #: 52577
   Summary: Response output written in filter can be truncated
   Product: Tomcat 7
   Version: 7.0.25
  Platform: PC
OS/Version: Linux
Status: NEW
  Severity: normal
  Priority: P2
 Component: Catalina
AssignedTo: dev@tomcat.apache.org
ReportedBy: dmitry.neve...@gmail.com
Classification: Unclassified


Due to changes 1229726, 1229727 and 1229728 output written to response in the
filter can be truncated up to 8192 bytes. Consider the following scenario:

- you have a filter that invoke getWriter() before chain.doFilter(request,
responseWrapper)


- responseWrapper overrides getWriter() method and returns some
  buffered writer, not the real one


- during execution of chain.doFilter there is a forward


Before the forward ApplicationDispather calls resetBuffer on response, which in
turn calls reset() on OutputBuffer, which sets gotEnc field to false. This
field is initialized in the setConverter() method which is called from
response.getWriter(), but since our wrapperResponse overrides getWriter(),
OutputBuffer.setConverter() never called and OutputBuffer still has gotEnc =
false.


Response's close() and flushBuffer() methods call OutputBuffer's flush(), but
since gotEnc == false, conv.flushBuffer() is not called:


if (gotEnc && conv != null) {
conv.flushBuffer();
}


A workaround for us is to implement getWriter() method in responseWrapper like
this:


public Writer getWriter() {
  Writer originalWriter = originalResponse.getWriter();//save for future
processing
  return ourWriter;
}


Maybe you should change flushing to something like that:


if (conv != null) {
conv.flushBuffer();
}


because you invoke conv.convert() without any checks in the write*() methods
and it seems like conv is never null.

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

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

[ANN] Apache Tomcat Maven Plugin 2.0-beta-1 Released

[Olivier Lamy]

Hello,
The Apache Tomcat team is pleased to announce the release of Tomcat
Maven Plugin 2.0-beta-1.

The Apache Tomcat Maven Plugin provides goals to manipulate WAR
projects within the Apache Tomcat servlet container.
Documentation site: http://tomcat.apache.org/maven-plugin-2.0-beta-1/

You should specify the version in your project's plugin configuration:


  org.apache.tomcat.maven
  tomcat6-maven-plugin
  2.0-beta-1

or

  org.apache.tomcat.maven
  tomcat7-maven-plugin
  2.0-beta-1


Release Notes - Apache Tomcat Maven Plugin - Version 2.0-beta-1

** New Feature
* [MTOMCAT-70] - Make useNaming=false the default for the embedded
Tomcat and make it configurable
* [MTOMCAT-77] - Add support for using the test classpath instead
of the compile classpath with tomcat:run
* [MTOMCAT-87] - Make http protocol configurable for the embedded Tomcat
* [MTOMCAT-102] - Add a mojo to build a standalone jar to run a
web application
* [MTOMCAT-110] - Support Slf4j bridge logger

** Bug
* [MTOMCAT-85] - Perfoming tomcat:redeploy is not reflected in log messages
* [MTOMCAT-103] - Executable War fails to run with a NullPointerException
* [MTOMCAT-104] - Running java -jar from a parent directory causes
a Zip file error
* [MTOMCAT-106] - tomcat7-maven-plugin extraDependency not working
with class not found
* [MTOMCAT-108] - THe httpsPort flag starts another http thread
not an https thread
* [MTOMCAT-109] -
org.apache.coyote.http11.Http11NioProtocol not
honoured

** Improvement
* [MTOMCAT-15] - Add dependency scanning support to tomcat:run
* [MTOMCAT-43] - Allow configuration of URI encoding for tomcat run goals
* [MTOMCAT-62] - Support Tomcat 7
* [MTOMCAT-78] - Upgrade to tomcat 6.0.32
* [MTOMCAT-95] - Add directories to the embedded tomcat
classloader (equivalent to shared.loader property in regular tomcat
instance).
* [MTOMCAT-100] - support war overlay to add war external
dependencies in tomcat run
* [MTOMCAT-111] - Make extract directory configurable
* [MTOMCAT-113] - Show progress on WAR uploads
* [MTOMCAT-114] - Add an archetype project sample
* [MTOMCAT-115] - Allow configuration of URI encoding for executable war


Have Fun!
-- 
The Apache Tomcat Team

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