Re: ApacheMeetupsNa11 tomcat one?
On 10/21/2011 05:30 PM, Christopher Schultz wrote: All, On 10/20/2011 4:32 PM, Christopher Schultz wrote: I'm arriving at 12:47 local time on Tuesday and I've got nothing to do until the next morning besides check-into the hotel. If anyone is interested in getting together for some drinks or exploring the city (I've never been to Vancouver) on Thursday s/Thursday/Tuesday/ Sorry for the confusion. Ok it is scheduled for Thursday, See http://wiki.apache.org/apachecon/ApacheMeetupsNa11 I have already added the ones part of the mail thread. Please register at https://docs.google.com/spreadsheet/viewform?hl=en_US&formkey=dEJLcHk3c1ZrRm8tWUNYeXZZckN0Vnc6MA#gid=0 Cheers Jean-Frederic -chris - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
Re: Publishing zips to the maven repo
>> So I have just commit some stuff in r 1187561. >> Note: Sources layout not touched. >> Currently only maven artifacts are build (I will work later on distrib). >> >> to test it on the top of >> https://svn.apache.org/repos/asf/tomcat/tc7.0.x/trunk. >> Just use: mvn -f maven/pom.xml clean install. >> Currently some unit tests are failing (so use -DskipTests). >> I will try to fix that too. Tried you Maven build and it works pretty well. Do you plan to add filtering to update sources as it's done today on build.xml ? @see : - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
svn commit: r1188097 - in /tomcat/jk/trunk: native/common/jk_lb_worker.c native/common/jk_service.h xdocs/ajp/ajpv13a.xml
Author: kkolinko Date: Mon Oct 24 11:46:27 2011 New Revision: 1188097 URL: http://svn.apache.org/viewvc?rev=1188097&view=rev Log: Correct a pair of comment typos Modified: tomcat/jk/trunk/native/common/jk_lb_worker.c tomcat/jk/trunk/native/common/jk_service.h tomcat/jk/trunk/xdocs/ajp/ajpv13a.xml Modified: tomcat/jk/trunk/native/common/jk_lb_worker.c URL: http://svn.apache.org/viewvc/tomcat/jk/trunk/native/common/jk_lb_worker.c?rev=1188097&r1=1188096&r2=1188097&view=diff == --- tomcat/jk/trunk/native/common/jk_lb_worker.c (original) +++ tomcat/jk/trunk/native/common/jk_lb_worker.c Mon Oct 24 11:46:27 2011 @@ -506,7 +506,7 @@ static char *get_sessionid(jk_ws_service return val; } -// set sesson_path +// set session_path session_path = (s->extension.session_path) ? s->extension.session_path : p->session_path; // set session_cookie Modified: tomcat/jk/trunk/native/common/jk_service.h URL: http://svn.apache.org/viewvc/tomcat/jk/trunk/native/common/jk_service.h?rev=1188097&r1=1188096&r2=1188097&view=diff == --- tomcat/jk/trunk/native/common/jk_service.h (original) +++ tomcat/jk/trunk/native/common/jk_service.h Mon Oct 24 11:46:27 2011 @@ -97,9 +97,9 @@ struct svc_extension int *fail_on_status; /* Use server error pages for responses >= 400. */ int use_server_error_pages; -/* sesson_cookie overwrite */ +/* session_cookie overwrite */ char *session_cookie; -/* sesson_path overwrite */ +/* session_path overwrite */ char *session_path; }; typedef struct svc_extension svc_extension_t; Modified: tomcat/jk/trunk/xdocs/ajp/ajpv13a.xml URL: http://svn.apache.org/viewvc/tomcat/jk/trunk/xdocs/ajp/ajpv13a.xml?rev=1188097&r1=1188096&r2=1188097&view=diff == --- tomcat/jk/trunk/xdocs/ajp/ajpv13a.xml (original) +++ tomcat/jk/trunk/xdocs/ajp/ajpv13a.xml Mon Oct 24 11:46:27 2011 @@ -553,7 +553,7 @@ additional methods, even if they are not corresponding pieces of HTTP and HTTPS. The route, as I understand it, is used to support sticky - sessions -- associating a user's sesson with a particular Tomcat instance + sessions -- associating a user's session with a particular Tomcat instance in the presence of multiple, load-balancing servers. I don't know the details. - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
Re: svn commit: r1187916 - in /tomcat/jk/trunk: native/iis/jk_isapi_plugin.c xdocs/miscellaneous/changelog.xml
Old code used stristr.
New code uses strncmp.
If I understand correctly, the old one is case-insensitive, while the
new one is case-sensitive.
Best regards,
Konstantin Kolinko
2011/10/23 :
> Author: rjung
> Date: Sun Oct 23 16:19:59 2011
> New Revision: 1187916
>
> URL: http://svn.apache.org/viewvc?rev=1187916&view=rev
> Log:
> BZ 51769: IIS: Allow URIs which contain "META-INF" or
> "WEB-INF" as long as they are not path components of the URI.
>
> I kept the old stristr function, because it
> could be useful for something else.
>
> Modified:
> tomcat/jk/trunk/native/iis/jk_isapi_plugin.c
> tomcat/jk/trunk/xdocs/miscellaneous/changelog.xml
>
> Modified: tomcat/jk/trunk/native/iis/jk_isapi_plugin.c
> URL:
> http://svn.apache.org/viewvc/tomcat/jk/trunk/native/iis/jk_isapi_plugin.c?rev=1187916&r1=1187915&r2=1187916&view=diff
> ==
> --- tomcat/jk/trunk/native/iis/jk_isapi_plugin.c (original)
> +++ tomcat/jk/trunk/native/iis/jk_isapi_plugin.c Sun Oct 23 16:19:59 2011
> @@ -842,12 +842,30 @@ static char *stristr(const char *s, cons
> return ((char *)s);
> }
>
> +/*
> + * Find the first occurrence of path in uri tokenized by "/".
> + * The comparison is done case insensitive.
> + */
> +static const char *find_path_in_uri(const char *uri, const char *path)
> +{
> + size_t len = strlen(path);
> + while (uri = strchr(uri, '/')) {
> + uri++;
> + if (!strncmp(uri, path, len) &&
> + (*(uri + len) == '/' ||
> + strlen(uri) == len)) {
> + return uri;
> + }
> + }
> + return NULL;
> +}
> +
> static int uri_is_web_inf(const char *uri)
> {
> - if (stristr(uri, "/web-inf")) {
> + if (find_path_in_uri(uri, "web-inf")) {
> return JK_TRUE;
> }
> - if (stristr(uri, "/meta-inf")) {
> + if (find_path_in_uri(uri, "meta-inf")) {
> return JK_TRUE;
> }
>
>
> Modified: tomcat/jk/trunk/xdocs/miscellaneous/changelog.xml
> URL:
> http://svn.apache.org/viewvc/tomcat/jk/trunk/xdocs/miscellaneous/changelog.xml?rev=1187916&r1=1187915&r2=1187916&view=diff
> ==
> --- tomcat/jk/trunk/xdocs/miscellaneous/changelog.xml (original)
> +++ tomcat/jk/trunk/xdocs/miscellaneous/changelog.xml Sun Oct 23 16:19:59 2011
> @@ -45,6 +45,10 @@
>
>
>
> + 51769: IIS: Allow URIs which contain "META-INF" or
> + "WEB-INF" as long as they are not path components of the URI. (rjung)
> +
> +
> 52056: HTTPD: JK request log does not always log
> correct response status. Fixed by refactoring JK request
> log to use the standard request log hook. (rjung)
>
>
>
> -
> 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: r1187916 - in /tomcat/jk/trunk: native/iis/jk_isapi_plugin.c xdocs/miscellaneous/changelog.xml
On 24.10.2011 13:54, Konstantin Kolinko wrote: > Old code used stristr. > New code uses strncmp. > > If I understand correctly, the old one is case-insensitive, while the > new one is case-sensitive. Looks like I had tomatoes on my eyes. Will fix. Thanks! Rainer - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
AW: Bug 51334 - Federation support for Tomcat
Hi all I was looking into apache extras and noticed the following statement: >>> Projects hosted on Apache Extras are not considered official Apache Software Foundation projects and they are also not associated, allied, or otherwise organizationally related to The Apache Software Foundation. Therefore, we require project owners to respect the Apache Software Foundation trademark policy, including 1) not using Apache or an existing Apache project name in your Apache Extras project name, and 2) not using org.apache as the prefix for your bundle or package name. In general, projects hosted on Apache Extras must not portray themselves as official Apache Software Foundation projects. >>> I was not aware that these projects have no correlation to the apache projects. Thus, I see the following todo's: - refactor the code because I used org.apache.catalina... - create a new project at apache extras - description and link to the project on the apache tomcat site (what shall I provide?) - post a message to us...@tomcat.apache.org (APL 2.0 is already used). Anything else? One comment on this: > If the enterprise is using Microsoft AD then Tomcat can plug directly > into that via the built-in Kerberos support. See [1]. The addition of > that feature had the right balance of user demand and minimal code > additions / changes to Tomcat. This is possible but I'd choose the federation approach for the following reasons: - authentication is externalized to the IDP (reduces complexity for tomcat, especially with kerberos) - users and tomcat can run (not a must) in the same kerberos realm or use another authentication mechanism with no exposue to the Tomcat container and app - role and other user information can be provided as part of the issued security token (ex. SAML 1.1, SAML 2.0, ...) Thanks Oli Von: Olivier Lamy [ol...@apache.org] Gesendet: Freitag, 21. Oktober 2011 09:15 Bis: Tomcat Developers List Betreff: Re: AW: AW: Bug 51334 - Federation support for Tomcat Hello, Even if it's a good addition, I understand the fact about not integrate this in the standard Apache Tomcat distribution (option 1) to prevent having too huge distribution with some new external dependencies. 2011/10/19 Oliver Wulff : > I get the impression, rightly or wrongly, that this is an attempt to to get a > jump > start for a little used SSO solution by getting it included in the > Tomcat build. That isn't the way the ASF works. > This is not the case. It's the other way around. The federation plugin should > help Tomcat to better compete with the big closed source solutions by > supporting an industry standard. In constrast to buy and integrate a security > product where you have to deploy custom agents to all sort of containers to > be able to integrate with the centrally running security component (usually > the communication between the agents and the central security component is > proprietary). > > What would be the next steps to go with Apache Extras? Here we/I can help you for project creation etc... I just wonder about the package names to use and maven coordinate. Not sure if Apache extras stuff can use org.apache.* namespace especially for maven deployment in this groupId org.apache.* . (org.apache.extras.* ?) What can we use ? org.talend.tomcat.extras ? > > This is not my decision, it is the community's decision. I am just one > voice in that community with a tendency to state an opinion given the > opportunity. You need to convince the community that this is worth > doing. Actually, that isn't strictly true. Since this is a code change > any committer could veto it. I'd suggest leaving it a few days to see if > any of the other committers comment. > +1 > > Thanks > Oliver > > Von: Mark Thomas [ma...@apache.org] > Gesendet: Mittwoch, 19. Oktober 2011 16:41 > Bis: Tomcat Developers List > Betreff: Re: AW: AW: Bug 51334 - Federation support for Tomcat > > On 19/10/2011 15:16, Oliver Wulff wrote: >> Hi Mark >> > >> The lack of demand argument applies equally to WS-Federation >> considered in isolation. I'd like to see that there was at least some >> traction behind this in the Tomcat community before going with option >> 2. >> >> I understand where you're coming from. >> >> IMHO, the federation functionality gives a lot of added value to >> tomcat for being able to support single sign across within an >> enterprise as well as across enterprises or in the cloud. Thus tomcat >> can even better compete with big application servers because you get >> enterprise SSO only by also using the identity suite. > > There are plenty of other SSO options out there that ship with the > necessary modules for Tomcat. That, combined with the minimal interest > in WS-Federation seen in the community to date, makes me think that a > separate project is the right place for this. It is a model that has > worked well f
svn commit: r1188226 - /tomcat/jk/trunk/native/iis/jk_isapi_plugin.c
Author: rjung
Date: Mon Oct 24 16:54:05 2011
New Revision: 1188226
URL: http://svn.apache.org/viewvc?rev=1188226&view=rev
Log:
Fix bug introduced by r1187916 (case insensitive
comparison switched to case sensitive).
Modified:
tomcat/jk/trunk/native/iis/jk_isapi_plugin.c
Modified: tomcat/jk/trunk/native/iis/jk_isapi_plugin.c
URL:
http://svn.apache.org/viewvc/tomcat/jk/trunk/native/iis/jk_isapi_plugin.c?rev=1188226&r1=1188225&r2=1188226&view=diff
==
--- tomcat/jk/trunk/native/iis/jk_isapi_plugin.c (original)
+++ tomcat/jk/trunk/native/iis/jk_isapi_plugin.c Mon Oct 24 16:54:05 2011
@@ -851,7 +851,7 @@ static const char *find_path_in_uri(cons
size_t len = strlen(path);
while (uri = strchr(uri, '/')) {
uri++;
-if (!strncmp(uri, path, len) &&
+if (!strnicmp(uri, path, len) &&
(*(uri + len) == '/' ||
strlen(uri) == len)) {
return uri;
-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
DO NOT REPLY [Bug 43968] [patch] support ipv6 with mod_jk
https://issues.apache.org/bugzilla/show_bug.cgi?id=43968 --- Comment #8 from Rainer Jung 2011-10-24 18:37:25 UTC --- Hi Eiji, in jk_connect.c your removed a big block, which was executed when HAVE_APR was defined. Below the block it saqys we should use gethostbyname_r in a multi-threaded environment, which works here at least when using APR, because then we fall back to using APR. When removing the block this is no longer true. Can you comment, why you removed that block starting at line 350? Another question: will your patch only work for Apache, or also for IIS and NSAPI? Even without that it is an improvement, just trying to understand. Regards, Rainer -- 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: Removing whitespace from *.xsd and *.dtd files
On 23/10/2011 23:13, Konstantin Kolinko wrote: > BTW, reviewing properties changes, note the *.properties files in > http://svn.apache.org/viewvc?limit_changes=0&view=revision&revision=1187803 > > See "jsp.error.usebean.missing.type", > "jsp.error.usebean.prohibited.as.session", > "jsp.error.usebean.not.both", "jsp.error.page.nomapping.language". > > They all ended with ":" + space. From quick search though it looks > that most of them, if not all, are unused. I went looking for an Eclipse feature / plug-in that fixes this automatically. The closest I got was JInto but that requires some setup and operates package by package so is a little clunky for our use case. In the end, I installed the community edition of IntelliJ that has unused property detection built-in. I cleaned out a bunch of old properties and spotted a few typos / errors along the way. I'll be committing those changes shortly. Mark P.S. Your were correct. None of those properties were used. - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
svn commit: r1188301 - /tomcat/trunk/build.xml
Author: markt
Date: Mon Oct 24 19:11:26 2011
New Revision: 1188301
URL: http://svn.apache.org/viewvc?rev=1188301&view=rev
Log:
Ignore .git dir when building src distro
Modified:
tomcat/trunk/build.xml
Modified: tomcat/trunk/build.xml
URL:
http://svn.apache.org/viewvc/tomcat/trunk/build.xml?rev=1188301&r1=1188300&r2=1188301&view=diff
==
--- tomcat/trunk/build.xml (original)
+++ tomcat/trunk/build.xml Mon Oct 24 19:11:26 2011
@@ -1632,6 +1632,7 @@ Apache Tomcat ${version} native binaries
+
-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
svn commit: r1188303 - in /tomcat/trunk/java/org/apache/catalina: core/LocalStrings.properties core/LocalStrings_es.properties deploy/LocalStrings.properties ha/deploy/LocalStrings.properties
Author: markt
Date: Mon Oct 24 19:12:25 2011
New Revision: 1188303
URL: http://svn.apache.org/viewvc?rev=1188303&view=rev
Log:
Correct parameter usage in messages.
Modified:
tomcat/trunk/java/org/apache/catalina/core/LocalStrings.properties
tomcat/trunk/java/org/apache/catalina/core/LocalStrings_es.properties
tomcat/trunk/java/org/apache/catalina/deploy/LocalStrings.properties
tomcat/trunk/java/org/apache/catalina/ha/deploy/LocalStrings.properties
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=1188303&r1=1188302&r2=1188303&view=diff
==
--- tomcat/trunk/java/org/apache/catalina/core/LocalStrings.properties
(original)
+++ tomcat/trunk/java/org/apache/catalina/core/LocalStrings.properties Mon Oct
24 19:12:25 2011
@@ -30,7 +30,7 @@ applicationContext.setAttribute.namenull
applicationContext.addSessionCookieConfig.ise=Session Cookie configuration
cannot be set for context {0} as the context has been initialised
applicationContext.setSessionTracking.ise=The session tracking modes for
context {0} cannot be set whilst the context is running
applicationContext.setSessionTracking.iae.invalid=The session tracking mode
{0} requested for context {1} is not supported by that context
-applicationContext.setSessionTracking.iae.ssl=The session tracking modes
requested for context {1} included SSL and at least one other mode. SSL may not
be configured with other modes.
+applicationContext.setSessionTracking.iae.ssl=The session tracking modes
requested for context {0} included SSL and at least one other mode. SSL may not
be configured with other modes.
applicationContext.lookup.error=Failed to locate resource [{0}] in context
[{1}]
applicationDispatcher.allocateException=Allocate exception for servlet {0}
applicationDispatcher.deallocateException=Deallocate exception for servlet {0}
Modified: tomcat/trunk/java/org/apache/catalina/core/LocalStrings_es.properties
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/core/LocalStrings_es.properties?rev=1188303&r1=1188302&r2=1188303&view=diff
==
--- tomcat/trunk/java/org/apache/catalina/core/LocalStrings_es.properties
(original)
+++ tomcat/trunk/java/org/apache/catalina/core/LocalStrings_es.properties Mon
Oct 24 19:12:25 2011
@@ -29,7 +29,7 @@ applicationContext.setAttribute.namenull
applicationContext.addSessionCookieConfig.ise = No se puede poner la
configuraci\u00F3n de Cookie de Sesi\u00F3n para el contexto {0}, una vez que
\u00E9ste ha sido inicializado.
applicationContext.setSessionTracking.ise = No se pueden poner los modos de
seguimiento de sesi\u00F3n para el contexto {0} mientras el contexto se
est\u00E1 ejecutando.
applicationContext.setSessionTracking.iae.invalid = El modo de seguimiento de
sesi\u00F3n {0} requerido para el contexto {1} no est\u00E1 soportado por este
contexto
-applicationContext.setSessionTracking.iae.ssl = Los modos de seguimiento de
sesi\u00F3n requeridos para el contexto {1}, incluy\u00F3 SSL y al menos otro
modo. SSL no se puede configurar con otros modos.
+applicationContext.setSessionTracking.iae.ssl = Los modos de seguimiento de
sesi\u00F3n requeridos para el contexto {0}, incluy\u00F3 SSL y al menos otro
modo. SSL no se puede configurar con otros modos.
applicationContext.lookup.error = No pude localizar el recurso [{0}] en el
contexto [{1}]
applicationDispatcher.allocateException = Excepci\u00F3n de reserva de espacio
para servlet {0}
applicationDispatcher.deallocateException = Excepci\u00F3n de
recuperaci\u00F3n de espacio para servlet {0}
Modified: tomcat/trunk/java/org/apache/catalina/deploy/LocalStrings.properties
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/deploy/LocalStrings.properties?rev=1188303&r1=1188302&r2=1188303&view=diff
==
--- tomcat/trunk/java/org/apache/catalina/deploy/LocalStrings.properties
(original)
+++ tomcat/trunk/java/org/apache/catalina/deploy/LocalStrings.properties Mon
Oct 24 19:12:25 2011
@@ -24,7 +24,7 @@ webXml.reservedName=A web.xml file was d
webXml.mergeConflictDisplayName=The display name was defined in multiple
fragments with different values including fragment with name [{0}] located at
[{1}]
webXml.mergeConflictErrorPage=The Error Page for [{0}] was defined
inconsistently in multiple fragments including fragment with name [{1}] located
at [{2}]
webXml.mergeConflictFilter=The Filter [{0}] was defined inconsistently in
multiple fragments including fragment with name [{1}] located at [{2}]
-webXml.mergeConflictLoginConfig=A LoginConfig was defined inconsistently in
multiple fragments including fragment with name [{1}] located at [{2}]
svn commit: r1188304 - /tomcat/trunk/java/org/apache/catalina/core/DefaultInstanceManager.java
Author: markt
Date: Mon Oct 24 19:13:03 2011
New Revision: 1188304
URL: http://svn.apache.org/viewvc?rev=1188304&view=rev
Log:
Correct a property name
Modified:
tomcat/trunk/java/org/apache/catalina/core/DefaultInstanceManager.java
Modified: tomcat/trunk/java/org/apache/catalina/core/DefaultInstanceManager.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/core/DefaultInstanceManager.java?rev=1188304&r1=1188303&r2=1188304&view=diff
==
--- tomcat/trunk/java/org/apache/catalina/core/DefaultInstanceManager.java
(original)
+++ tomcat/trunk/java/org/apache/catalina/core/DefaultInstanceManager.java Mon
Oct 24 19:13:03 2011
@@ -110,7 +110,7 @@ public class DefaultInstanceManager impl
if (is != null) {
restrictedFilters.load(is);
} else {
-
catalinaContext.getLogger().error(sm.getString("defaultInstanceManager.restrictedFiltersResources"));
+
catalinaContext.getLogger().error(sm.getString("defaultInstanceManager.restrictedFiltersResource"));
}
} catch (IOException e) {
catalinaContext.getLogger().error(sm.getString("defaultInstanceManager.restrictedServletsResources"),
e);
-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
svn commit: r1188305 - /tomcat/trunk/java/org/apache/catalina/deploy/WebXml.java
Author: markt
Date: Mon Oct 24 19:13:41 2011
New Revision: 1188305
URL: http://svn.apache.org/viewvc?rev=1188305&view=rev
Log:
Add missing i18n lookups
Modified:
tomcat/trunk/java/org/apache/catalina/deploy/WebXml.java
Modified: tomcat/trunk/java/org/apache/catalina/deploy/WebXml.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/deploy/WebXml.java?rev=1188305&r1=1188304&r2=1188305&view=diff
==
--- tomcat/trunk/java/org/apache/catalina/deploy/WebXml.java (original)
+++ tomcat/trunk/java/org/apache/catalina/deploy/WebXml.java Mon Oct 24
19:13:41 2011
@@ -2193,14 +2193,16 @@ public class WebXml {
if (!before.equals(WebXml.ORDER_OTHERS) &&
order.contains(before) &&
order.indexOf(before) < order.indexOf(name)) {
-throw new IllegalArgumentException(sm.getString(""));
+throw new IllegalArgumentException(
+sm.getString("webXml.mergeConflictOrder"));
}
}
for (String after : fragment.getAfterOrdering()) {
if (!after.equals(WebXml.ORDER_OTHERS) &&
order.contains(after) &&
order.indexOf(after) > order.indexOf(name)) {
-throw new IllegalArgumentException();
+throw new IllegalArgumentException(
+sm.getString("webXml.mergeConflictOrder"));
}
}
}
-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
svn commit: r1188313 [5/5] - in /tomcat/trunk/java: javax/el/ org/apache/catalina/authenticator/ org/apache/catalina/connector/ org/apache/catalina/core/ org/apache/catalina/deploy/ org/apache/catalin
Modified:
tomcat/trunk/java/org/apache/jasper/resources/LocalStrings_ja.properties
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/jasper/resources/LocalStrings_ja.properties?rev=1188313&r1=1188312&r2=1188313&view=diff
==
--- tomcat/trunk/java/org/apache/jasper/resources/LocalStrings_ja.properties
(original)
+++ tomcat/trunk/java/org/apache/jasper/resources/LocalStrings_ja.properties
Mon Oct 24 19:18:39 2011
@@ -18,7 +18,6 @@
# Default localized string information
# Localized this the Default Locale as is ja_JP
-jsp.error.bad.servlet.engine=\u30b5\u30fc\u30d6\u30ec\u30c3\u30c8\u30a8\u30f3\u30b8\u30f3\u306e\u30d0\u30fc\u30b8\u30e7\u30f3\u304c\u6b63\u3057\u304f\u3042\u308a\u307e\u305b\u3093
jsp.error.no.scratch.dir=JSP\u30a8\u30f3\u30b8\u30f3\u306b\u30c7\u30d5\u30a9\u30eb\u30c8\u306escratchDir\u304c\u8a2d\u5b9a\u3055\u308c\u3066\u3044\u307e\u305b\u3093\u3002\
\n
\u3053\u306e\u30b3\u30f3\u30c6\u30ad\u30b9\u30c8\u306eservlets.properties\u30d5\u30a1\u30a4\u30eb\u306b\u3001\
\n \"jsp.initparams=scratchdir=\"
\u3092\u8ffd\u52a0\u3057\u3066\u304f\u3060\u3055\u3044\u3002
@@ -26,36 +25,17 @@ jsp.error.bad.scratch.dir=\u3042\u306a\u
jsp.message.scratch.dir.is=JSP\u30a8\u30f3\u30b8\u30f3\u306eScratchdir: {0}
jsp.message.parent_class_loader_is=\u89aa\u30af\u30e9\u30b9\u30ed\u30fc\u30c0:
{0}
jsp.message.dont.modify.servlets=\u91cd\u8981:
\u751f\u6210\u3055\u308c\u305f\u30b5\u30fc\u30d6\u30ec\u30c3\u30c8\u3092\u5909\u66f4\u3057\u3066\u306f\u3044\u3051\u307e\u305b\u3093
-jsp.error.not.impl.comments=\u5185\u90e8\u30a8\u30e9\u30fc:
Comments\u306f\u5b9f\u88c5\u3055\u308c\u3066\u3044\u307e\u305b\u3093
-jsp.error.not.impl.directives=\u5185\u90e8\u30a8\u30e9\u30fc:
Directives\u306f\u5b9f\u88c5\u3055\u308c\u3066\u3044\u307e\u305b\u3093
-jsp.error.not.impl.declarations=\u5185\u90e8\u30a8\u30e9\u30fc:
Declarations\u306f\u5b9f\u88c5\u3055\u308c\u3066\u3044\u307e\u305b\u3093
-jsp.error.not.impl.expressions=\u5185\u90e8\u30a8\u30e9\u30fc:
Expressions\u306f\u5b9f\u88c5\u3055\u308c\u3066\u3044\u307e\u305b\u3093
-jsp.error.not.impl.scriptlets=\u5185\u90e8\u30a8\u30e9\u30fc:
Scriptlets\u306f\u5b9f\u88c5\u3055\u308c\u3066\u3044\u307e\u305b\u3093
-jsp.error.not.impl.usebean=\u5185\u90e8\u30a8\u30e9\u30fc:
useBean\u306f\u5b9f\u88c5\u3055\u308c\u3066\u3044\u307e\u305b\u3093
-jsp.error.not.impl.getp=\u5185\u90e8\u30a8\u30e9\u30fc:
getProperty\u306f\u5b9f\u88c5\u3055\u308c\u3066\u3044\u307e\u305b\u3093
-jsp.error.not.impl.setp=\u5185\u90e8\u30a8\u30e9\u30fc:
setProperty\u306f\u5b9f\u88c5\u3055\u308c\u3066\u3044\u307e\u305b\u3093
-jsp.error.not.impl.plugin=\u5185\u90e8\u30a8\u30e9\u30fc:
plugin\u306f\u5b9f\u88c5\u3055\u308c\u3066\u3044\u307e\u305b\u3093
-jsp.error.not.impl.forward=\u5185\u90e8\u30a8\u30e9\u30fc:
forward\u306f\u5b9f\u88c5\u3055\u308c\u3066\u3044\u307e\u305b\u3093
-jsp.error.not.impl.include=\u5185\u90e8\u30a8\u30e9\u30fc:
include\u306f\u5b9f\u88c5\u3055\u308c\u3066\u3044\u307e\u305b\u3093
jsp.error.unavailable=JSP\u306f\u5229\u7528\u4e0d\u53ef\u3068\u30de\u30fc\u30af\u3055\u308c\u3066\u3044\u307e\u3059
-jsp.error.usebean.missing.attribute=useBean:
id\u5c5e\u6027\u304c\u5b58\u5728\u3057\u306a\u3044\u304b\u3001\u30b9\u30da\u30eb\u30df\u30b9\u3067\u3059
-jsp.error.usebean.missing.type=useBean ({0}):
class\u5c5e\u6027\u304btype\u5c5e\u6027\u3092\u6307\u5b9a\u3057\u3066\u304f\u3060\u3055\u3044:
jsp.error.usebean.duplicate=useBean:
beanName\u5c5e\u6027\u304c\u91cd\u8907\u3057\u3066\u3044\u307e\u3059: {0}
-jsp.error.usebean.prohibited.as.session=\u4ee5\u524d\u306b\u5b9a\u7fa9\u3057\u305fJSP\u6307\u793a\u5b50\u306b\u3088\u3063\u3066\u7981\u6b62\u3055\u308c\u3066\u3044\u308b\u305f\u3081\u306b\u3001session
bean {0} \u3068\u3057\u3066\u4f7f\u7528\u3067\u304d\u307e\u305b\u3093:
-jsp.error.usebean.not.both=useBean:
class\u5c5e\u6027\u3068beanName\u5c5e\u6027\u306e\u4e21\u65b9\u3092\u540c\u6642\u306b\u6307\u5b9a\u3067\u304d\u307e\u305b\u3093:
-jsp.error.usebean.bad.type.cast=useBean ({0}): type ({1}) \u306fclass ({2})
\u304b\u3089\u5272\u308a\u5f53\u3066\u3089\u308c\u307e\u305b\u3093
jsp.error.invalid.scope='scope'\u5c5e\u6027\u306e\u5024\u304c\u7121\u52b9\u3067\u3059:
{0}
(\"page\"\u3001\"request\"\u3001\"session\"\u53c8\u306f\"application\"\u306e\u3069\u308c\u304b\u3067\u306a\u3051\u308c\u3070\u3044\u3051\u307e\u305b\u3093)
jsp.error.classname=.class\u30d5\u30a1\u30a4\u30eb\u304b\u3089\u30af\u30e9\u30b9\u540d\u3092\u6c7a\u5b9a\u3067\u304d\u307e\u305b\u3093
-jsp.warning.bad.type=\u8b66\u544a:
.class\u30d5\u30a1\u30a4\u30eb\u4e2d\u306e\u578b\u304c\u9055\u3044\u307e\u3059
jsp.error.data.file.write=\u30c7\u30fc\u30bf\u30d5\u30a1\u30a4\u30eb\u3092\u66f8\u304d\u8fbc\u307f\u4e2d\u306e\u30a8\u30e9\u30fc\u3067\u3059
jsp.error.page.conflict.contenttype=page\u6307\u793a\u5b50:
'contentType'\u3092\u7570\u306a\u308b\u5024\u3067\u8907\u6570\u56de\u6307\u5b9a\u3059\u308b\u306e\u306f\u7121\u52b9\u3067\u3059
(\u65e7:
svn commit: r1188314 - in /tomcat/tc7.0.x/trunk: ./ java/org/apache/catalina/core/ java/org/apache/catalina/deploy/ java/org/apache/catalina/ha/deploy/ webapps/docs/
Author: markt Date: Mon Oct 24 19:19:32 2011 New Revision: 1188314 URL: http://svn.apache.org/viewvc?rev=1188314&view=rev Log: i18n resource fixes Modified: tomcat/tc7.0.x/trunk/ (props changed) tomcat/tc7.0.x/trunk/java/org/apache/catalina/core/DefaultInstanceManager.java tomcat/tc7.0.x/trunk/java/org/apache/catalina/core/LocalStrings.properties tomcat/tc7.0.x/trunk/java/org/apache/catalina/core/LocalStrings_es.properties tomcat/tc7.0.x/trunk/java/org/apache/catalina/deploy/LocalStrings.properties tomcat/tc7.0.x/trunk/java/org/apache/catalina/deploy/WebXml.java tomcat/tc7.0.x/trunk/java/org/apache/catalina/ha/deploy/LocalStrings.properties tomcat/tc7.0.x/trunk/webapps/docs/changelog.xml Propchange: tomcat/tc7.0.x/trunk/ -- --- svn:mergeinfo (original) +++ svn:mergeinfo Mon Oct 24 19:19:32 2011 @@ -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,1174983,1175155,1175158,1175167,1175182,1175190,1175201,1175272,1175275,1175283,1175582,1175589-1175590,1175594,1175602,1175613,1175633,1175690,1175713,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,1187381 +/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,1174983,1175155,1175158,1175167,1175182,1175190,1175201,1175272,1175275,1175283,1175582,1175589-1175590,1175594,1175602,1175613,1175633,1175690,1175713,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,1187381,1188303-1188 305 Modified: tomcat/tc7.0.x/trunk/java/org/apache/catalina/core/DefaultInstanceManager.java URL: http://svn
Re: Publishing zips to the maven repo
2011/10/24 Henri Gomez : >>> So I have just commit some stuff in r 1187561. >>> Note: Sources layout not touched. >>> Currently only maven artifacts are build (I will work later on distrib). >>> >>> to test it on the top of >>> https://svn.apache.org/repos/asf/tomcat/tc7.0.x/trunk. >>> Just use: mvn -f maven/pom.xml clean install. >>> Currently some unit tests are failing (so use -DskipTests). >>> I will try to fix that too. > > Tried you Maven build and it works pretty well. > > Do you plan to add filtering to update sources as it's done today on > build.xml ? > > @see : > > > > > > > > > > I have to search what it's done exactly with that. (BTW version is defined in poms with maven). I will try to work on that later this week. > > - > To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org > For additional commands, e-mail: dev-h...@tomcat.apache.org > > -- Olivier Lamy Talend : http://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: r1188346 - /tomcat/maven-plugin/trunk/src/site/apt/index.apt
Author: olamy Date: Mon Oct 24 20:09:26 2011 New Revision: 1188346 URL: http://svn.apache.org/viewvc?rev=1188346&view=rev Log: more documentation on groupId change an how to configure that in pom Modified: tomcat/maven-plugin/trunk/src/site/apt/index.apt Modified: tomcat/maven-plugin/trunk/src/site/apt/index.apt URL: http://svn.apache.org/viewvc/tomcat/maven-plugin/trunk/src/site/apt/index.apt?rev=1188346&r1=1188345&r2=1188346&view=diff == --- tomcat/maven-plugin/trunk/src/site/apt/index.apt (original) +++ tomcat/maven-plugin/trunk/src/site/apt/index.apt Mon Oct 24 20:09:26 2011 @@ -35,6 +35,36 @@ Apache Tomcat Maven Plugin Since version 2.0 tomcat mojos has been renamed to tomcat6 and tomcat7 with the same goals. + You must configure your pom to use this new groupId + ++-- + + + + org.apache.tomcat.maven + tomcat6-maven-plugin + 2.0-SNAPSHOT + + + org.apache.tomcat.maven + tomcat7-maven-plugin + 2.0-SNAPSHOT + + + ++-- + + Or add the groupId in your settings.xml + ++-- + + +org.apache.tomcat.maven + + ++-- + + * Goals Overview The goals for this plugin come in two categories: - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
svn commit: r1188347 - in /tomcat/maven-plugin/trunk/src/site/apt: index.apt index.apt.vm
Author: olamy
Date: Mon Oct 24 20:09:53 2011
New Revision: 1188347
URL: http://svn.apache.org/viewvc?rev=1188347&view=rev
Log:
use .apt.vm to have pom sample up2date with real plugin version
Added:
tomcat/maven-plugin/trunk/src/site/apt/index.apt.vm (contents, props
changed)
- copied, changed from r1188346,
tomcat/maven-plugin/trunk/src/site/apt/index.apt
Removed:
tomcat/maven-plugin/trunk/src/site/apt/index.apt
Copied: tomcat/maven-plugin/trunk/src/site/apt/index.apt.vm (from r1188346,
tomcat/maven-plugin/trunk/src/site/apt/index.apt)
URL:
http://svn.apache.org/viewvc/tomcat/maven-plugin/trunk/src/site/apt/index.apt.vm?p2=tomcat/maven-plugin/trunk/src/site/apt/index.apt.vm&p1=tomcat/maven-plugin/trunk/src/site/apt/index.apt&r1=1188346&r2=1188347&rev=1188347&view=diff
==
--- tomcat/maven-plugin/trunk/src/site/apt/index.apt (original)
+++ tomcat/maven-plugin/trunk/src/site/apt/index.apt.vm Mon Oct 24 20:09:53 2011
@@ -43,12 +43,12 @@ Apache Tomcat Maven Plugin
org.apache.tomcat.maven
tomcat6-maven-plugin
- 2.0-SNAPSHOT
+ ${project.version}
org.apache.tomcat.maven
tomcat7-maven-plugin
- 2.0-SNAPSHOT
+ ${project.version}
Propchange: tomcat/maven-plugin/trunk/src/site/apt/index.apt.vm
--
svn:eol-style = native
Propchange: tomcat/maven-plugin/trunk/src/site/apt/index.apt.vm
--
svn:keywords = Author Date Id Revision
-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
svn commit: r1188399 - in /tomcat/trunk/java/org/apache/catalina: authenticator/ connector/
Author: markt
Date: Mon Oct 24 21:46:24 2011
New Revision: 1188399
URL: http://svn.apache.org/viewvc?rev=1188399&view=rev
Log:
Review javax.* and o.a.catalina.[ant-connectors] for unused code using
UCDetector and mark unused code as deprecated.
Modified:
tomcat/trunk/java/org/apache/catalina/authenticator/Constants.java
tomcat/trunk/java/org/apache/catalina/authenticator/SingleSignOn.java
tomcat/trunk/java/org/apache/catalina/connector/InputBuffer.java
tomcat/trunk/java/org/apache/catalina/connector/MapperListener.java
tomcat/trunk/java/org/apache/catalina/connector/OutputBuffer.java
tomcat/trunk/java/org/apache/catalina/connector/Request.java
tomcat/trunk/java/org/apache/catalina/connector/Response.java
Modified: tomcat/trunk/java/org/apache/catalina/authenticator/Constants.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/authenticator/Constants.java?rev=1188399&r1=1188398&r2=1188399&view=diff
==
--- tomcat/trunk/java/org/apache/catalina/authenticator/Constants.java
(original)
+++ tomcat/trunk/java/org/apache/catalina/authenticator/Constants.java Mon Oct
24 21:46:24 2011
@@ -25,9 +25,13 @@ public class Constants {
// Authentication methods for login configuration
// Servlet spec schemes
+@Deprecated
public static final String BASIC_METHOD = "BASIC";
+@Deprecated
public static final String CERT_METHOD = "CLIENT_CERT";
+@Deprecated
public static final String DIGEST_METHOD = "DIGEST";
+@Deprecated
public static final String FORM_METHOD = "FORM";
// Vendor specific schemes
public static final String SPNEGO_METHOD = "SPNEGO";
Modified: tomcat/trunk/java/org/apache/catalina/authenticator/SingleSignOn.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/authenticator/SingleSignOn.java?rev=1188399&r1=1188398&r2=1188399&view=diff
==
--- tomcat/trunk/java/org/apache/catalina/authenticator/SingleSignOn.java
(original)
+++ tomcat/trunk/java/org/apache/catalina/authenticator/SingleSignOn.java Mon
Oct 24 21:46:24 2011
@@ -93,6 +93,7 @@ public class SingleSignOn extends ValveB
/**
* The string manager for this package.
*/
+@Deprecated
protected static final StringManager sm =
StringManager.getManager(Constants.Package);
Modified: tomcat/trunk/java/org/apache/catalina/connector/InputBuffer.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/connector/InputBuffer.java?rev=1188399&r1=1188398&r2=1188399&view=diff
==
--- tomcat/trunk/java/org/apache/catalina/connector/InputBuffer.java (original)
+++ tomcat/trunk/java/org/apache/catalina/connector/InputBuffer.java Mon Oct 24
21:46:24 2011
@@ -185,6 +185,7 @@ public class InputBuffer extends Reader
*
* @return the associated Coyote request
*/
+@Deprecated
public Request getRequest() {
return this.coyoteRequest;
}
Modified: tomcat/trunk/java/org/apache/catalina/connector/MapperListener.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/connector/MapperListener.java?rev=1188399&r1=1188398&r2=1188399&view=diff
==
--- tomcat/trunk/java/org/apache/catalina/connector/MapperListener.java
(original)
+++ tomcat/trunk/java/org/apache/catalina/connector/MapperListener.java Mon Oct
24 21:46:24 2011
@@ -85,6 +85,7 @@ public class MapperListener extends Life
// - Public Methods
+@Deprecated
public String getConnectorName() {
return this.connector.toString();
}
Modified: tomcat/trunk/java/org/apache/catalina/connector/OutputBuffer.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/connector/OutputBuffer.java?rev=1188399&r1=1188398&r2=1188399&view=diff
==
--- tomcat/trunk/java/org/apache/catalina/connector/OutputBuffer.java (original)
+++ tomcat/trunk/java/org/apache/catalina/connector/OutputBuffer.java Mon Oct
24 21:46:24 2011
@@ -178,6 +178,7 @@ public class OutputBuffer extends Writer
*
* @return the associated Coyote response
*/
+@Deprecated
public Response getResponse() {
return this.coyoteResponse;
}
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=1188399&r1=1188398&r2=1188399&view=diff
==
--- tomcat/trunk/java/org/apache/catalina/connector/Request.java (original)
+++ tomcat/trunk/ja
svn commit: r1188401 - in /tomcat/tc7.0.x/trunk: ./ java/org/apache/catalina/authenticator/ java/org/apache/catalina/connector/ webapps/docs/
Author: markt Date: Mon Oct 24 21:50:26 2011 New Revision: 1188401 URL: http://svn.apache.org/viewvc?rev=1188401&view=rev Log: Start deprecating unused / unnecessary code Modified: tomcat/tc7.0.x/trunk/ (props changed) tomcat/tc7.0.x/trunk/java/org/apache/catalina/authenticator/Constants.java tomcat/tc7.0.x/trunk/java/org/apache/catalina/authenticator/SingleSignOn.java tomcat/tc7.0.x/trunk/java/org/apache/catalina/connector/InputBuffer.java tomcat/tc7.0.x/trunk/java/org/apache/catalina/connector/MapperListener.java tomcat/tc7.0.x/trunk/java/org/apache/catalina/connector/OutputBuffer.java tomcat/tc7.0.x/trunk/java/org/apache/catalina/connector/Request.java tomcat/tc7.0.x/trunk/java/org/apache/catalina/connector/Response.java tomcat/tc7.0.x/trunk/webapps/docs/changelog.xml Propchange: tomcat/tc7.0.x/trunk/ -- --- svn:mergeinfo (original) +++ svn:mergeinfo Mon Oct 24 21:50:26 2011 @@ -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,1174983,1175155,1175158,1175167,1175182,1175190,1175201,1175272,1175275,1175283,1175582,1175589-1175590,1175594,1175602,1175613,1175633,1175690,1175713,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,1187381,1188303-1188 305 +/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,1174983,1175155,1175158,1175167,1175182,1175190,1175201,1175272,1175275,1175283,1175582,1175589-1175590,1175594,1175602,1175613,1175633,1175690,1175713,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,1187381,1188303-1188 305,11
svn commit: r1188402 - in /tomcat/trunk/java/org/apache/catalina: authenticator/ connector/ realm/
Author: markt
Date: Mon Oct 24 21:53:36 2011
New Revision: 1188402
URL: http://svn.apache.org/viewvc?rev=1188402&view=rev
Log:
Remove code that was deprecated in r1188399
Modified:
tomcat/trunk/java/org/apache/catalina/authenticator/BasicAuthenticator.java
tomcat/trunk/java/org/apache/catalina/authenticator/Constants.java
tomcat/trunk/java/org/apache/catalina/authenticator/DigestAuthenticator.java
tomcat/trunk/java/org/apache/catalina/authenticator/FormAuthenticator.java
tomcat/trunk/java/org/apache/catalina/authenticator/SSLAuthenticator.java
tomcat/trunk/java/org/apache/catalina/authenticator/SingleSignOnEntry.java
tomcat/trunk/java/org/apache/catalina/connector/InputBuffer.java
tomcat/trunk/java/org/apache/catalina/connector/MapperListener.java
tomcat/trunk/java/org/apache/catalina/connector/OutputBuffer.java
tomcat/trunk/java/org/apache/catalina/connector/Request.java
tomcat/trunk/java/org/apache/catalina/connector/Response.java
tomcat/trunk/java/org/apache/catalina/connector/mbeans-descriptors.xml
tomcat/trunk/java/org/apache/catalina/realm/JAASMemoryLoginModule.java
tomcat/trunk/java/org/apache/catalina/realm/JAASRealm.java
Modified:
tomcat/trunk/java/org/apache/catalina/authenticator/BasicAuthenticator.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/authenticator/BasicAuthenticator.java?rev=1188402&r1=1188401&r2=1188402&view=diff
==
--- tomcat/trunk/java/org/apache/catalina/authenticator/BasicAuthenticator.java
(original)
+++ tomcat/trunk/java/org/apache/catalina/authenticator/BasicAuthenticator.java
Mon Oct 24 21:53:36 2011
@@ -22,6 +22,7 @@ package org.apache.catalina.authenticato
import java.io.IOException;
import java.security.Principal;
+import javax.servlet.http.HttpServletRequest;
import javax.servlet.http.HttpServletResponse;
import org.apache.catalina.connector.Request;
@@ -136,8 +137,8 @@ public class BasicAuthenticator
principal = context.getRealm().authenticate(username, password);
if (principal != null) {
-register(request, response, principal, Constants.BASIC_METHOD,
- username, password);
+register(request, response, principal,
+HttpServletRequest.BASIC_AUTH, username, password);
return (true);
}
}
@@ -159,6 +160,6 @@ public class BasicAuthenticator
@Override
protected String getAuthMethod() {
-return Constants.BASIC_METHOD;
+return HttpServletRequest.BASIC_AUTH;
}
}
Modified: tomcat/trunk/java/org/apache/catalina/authenticator/Constants.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/authenticator/Constants.java?rev=1188402&r1=1188401&r2=1188402&view=diff
==
--- tomcat/trunk/java/org/apache/catalina/authenticator/Constants.java
(original)
+++ tomcat/trunk/java/org/apache/catalina/authenticator/Constants.java Mon Oct
24 21:53:36 2011
@@ -24,15 +24,7 @@ public class Constants {
public static final String Package = "org.apache.catalina.authenticator";
// Authentication methods for login configuration
-// Servlet spec schemes
-@Deprecated
-public static final String BASIC_METHOD = "BASIC";
-@Deprecated
-public static final String CERT_METHOD = "CLIENT_CERT";
-@Deprecated
-public static final String DIGEST_METHOD = "DIGEST";
-@Deprecated
-public static final String FORM_METHOD = "FORM";
+// Servlet spec schemes are defined in HttpServletRequest
// Vendor specific schemes
public static final String SPNEGO_METHOD = "SPNEGO";
Modified:
tomcat/trunk/java/org/apache/catalina/authenticator/DigestAuthenticator.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/authenticator/DigestAuthenticator.java?rev=1188402&r1=1188401&r2=1188402&view=diff
==
---
tomcat/trunk/java/org/apache/catalina/authenticator/DigestAuthenticator.java
(original)
+++
tomcat/trunk/java/org/apache/catalina/authenticator/DigestAuthenticator.java
Mon Oct 24 21:53:36 2011
@@ -257,8 +257,7 @@ public class DigestAuthenticator extends
if (principal != null) {
String username = parseUsername(authorization);
register(request, response, principal,
- Constants.DIGEST_METHOD,
- username, null);
+HttpServletRequest.DIGEST_AUTH, username, null);
return (true);
}
}
@@ -280,7 +279,7 @@ public class DigestAuthenticator extends
@Override
protected String getAuthMethod() {
-return Constants.DIGEST_METHOD;
+return HttpServletRequest.DI
buildbot failure in ASF Buildbot on tomcat-trunk
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/2407 Buildbot URL: http://ci.apache.org/ Buildslave for this Build: bb-vm_ubuntu Build Reason: scheduler Build Source Stamp: [branch tomcat/trunk] 1188399 Blamelist: markt BUILD FAILED: failed compile_1 sincerely, -The Buildbot
buildbot success in ASF Buildbot on tomcat-trunk
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/2408 Buildbot URL: http://ci.apache.org/ Buildslave for this Build: bb-vm_ubuntu Build Reason: scheduler Build Source Stamp: [branch tomcat/trunk] 1188402 Blamelist: markt Build succeeded! sincerely, -The Buildbot
DO NOT REPLY [Bug 38346] InputBuffer breaks request.readLine()
https://issues.apache.org/bugzilla/show_bug.cgi?id=38346 --- Comment #8 from naani...@gmail.com 2011-10-25 06:49:15 UTC --- thi issue still occurs with tomcat 5.5.28. Could you please let me know, how to apply this patch to 5.5.28? -- 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
