Tagging JK 1.2.31
Hi, Seems we are fine for 1.2.31 now that httpd 2.3 compiles without problems. I plan to tag 1.2.31_RC1 and make release candidate set of sources and bin at the ususal place. If voted we would just need to svn mv 1.2.31_RC1 1.2.31 If someone again "needs more time for testing" :) the release process is just good as any. I hope I'll do all that by tomorrow which would give us a plenty of time for a vote, so we can have that out next week. Comments? Regards -- ^TM - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
DO NOT REPLY [Bug 50126] EL for JSF 1.2 doesn't work on JSP-Tag-Files (*.tag)
https://issues.apache.org/bugzilla/show_bug.cgi?id=50126 --- Comment #2 from lofwyr 2010-10-21 05:14:29 EDT --- Thanks for the quick reply. After defining the version in the "implicit.tld" it works fine. -- 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: r1025899 - in /tomcat/trunk: java/org/apache/catalina/ha/session/BackupManager.java webapps/docs/changelog.xml
Author: kfujino Date: Thu Oct 21 09:21:10 2010 New Revision: 1025899 URL: http://svn.apache.org/viewvc?rev=1025899&view=rev Log: Add support for maxActiveSessions attributes to BackupManager. Modified: tomcat/trunk/java/org/apache/catalina/ha/session/BackupManager.java tomcat/trunk/webapps/docs/changelog.xml Modified: tomcat/trunk/java/org/apache/catalina/ha/session/BackupManager.java URL: http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/ha/session/BackupManager.java?rev=1025899&r1=1025898&r2=1025899&view=diff == --- tomcat/trunk/java/org/apache/catalina/ha/session/BackupManager.java (original) +++ tomcat/trunk/java/org/apache/catalina/ha/session/BackupManager.java Thu Oct 21 09:21:10 2010 @@ -242,6 +242,7 @@ public class BackupManager extends Clust result.cluster = cluster; result.notifyListenersOnReplication = notifyListenersOnReplication; result.mapSendOptions = mapSendOptions; +result.maxActiveSessions = maxActiveSessions; return result; } Modified: tomcat/trunk/webapps/docs/changelog.xml URL: http://svn.apache.org/viewvc/tomcat/trunk/webapps/docs/changelog.xml?rev=1025899&r1=1025898&r2=1025899&view=diff == --- tomcat/trunk/webapps/docs/changelog.xml (original) +++ tomcat/trunk/webapps/docs/changelog.xml Thu Oct 21 09:21:10 2010 @@ -73,6 +73,13 @@ + + + +Add support for maxActiveSessions attributes to BackupManager. (kfujino) + + + - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
DO NOT REPLY [Bug 50135] New: IPV6 problem: unable to connect from other host
https://issues.apache.org/bugzilla/show_bug.cgi?id=50135 Summary: IPV6 problem: unable to connect from other host Product: Tomcat Native Version: 1.1.20 Platform: PC Status: NEW Severity: normal Priority: P2 Component: Library AssignedTo: dev@tomcat.apache.org ReportedBy: michael.we...@hsh-berlin.com Hi, sorry please, this is my first contribution here and I'm no developer. OS= Windows 2008 R2 - IPv6 is activ i have a standard installation Tomcat 5.5.29 + Apache 2.2.14 + mod_jk 1.2.30. mod_jk passes in all request in Tomcat my configuration from mod_jk is correct, I have same installation already many paints carried out of other systems (win2003). connect http://localhost:8080/mycontext is go no connect http://localhost/mycontext no connect from a other host with http://mywebserver:8080/mycontext Workaround: I have the file tcnative-1.dll deleted an the Tomcatservive restarted. Now I can already connecting. greetings Michael -- 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: r1025917 - /tomcat/tc6.0.x/trunk/STATUS.txt
Author: kfujino Date: Thu Oct 21 09:59:19 2010 New Revision: 1025917 URL: http://svn.apache.org/viewvc?rev=1025917&view=rev Log: Proposal Modified: tomcat/tc6.0.x/trunk/STATUS.txt Modified: tomcat/tc6.0.x/trunk/STATUS.txt URL: http://svn.apache.org/viewvc/tomcat/tc6.0.x/trunk/STATUS.txt?rev=1025917&r1=1025916&r2=1025917&view=diff == --- tomcat/tc6.0.x/trunk/STATUS.txt (original) +++ tomcat/tc6.0.x/trunk/STATUS.txt Thu Oct 21 09:59:19 2010 @@ -279,3 +279,8 @@ PATCHES PROPOSED TO BACKPORT: http://svn.apache.org/viewvc?rev=1024251&view=rev +1: markt -1: + +* Add support for maxActiveSessions attributes to BackupManager. + http://svn.apache.org/viewvc?rev=1025899&view=rev + +1: kfujino + -1: - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
DO NOT REPLY [Bug 50135] IPV6 problem: unable to connect from other host
https://issues.apache.org/bugzilla/show_bug.cgi?id=50135 michael.we...@hsh-berlin.com changed: What|Removed |Added OS/Version||Windows Server 2008 -- 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: r1025924 - in /tomcat/trunk: java/org/apache/catalina/ha/session/DeltaManager.java webapps/docs/changelog.xml
Author: kfujino
Date: Thu Oct 21 10:15:26 2010
New Revision: 1025924
URL: http://svn.apache.org/viewvc?rev=1025924&view=rev
Log:
Improve sending an access message in DeltaManager.
maxInactiveInterval of not Manager but the session is used.
If maxInactiveInterval is negative, an access message is not sending.
Modified:
tomcat/trunk/java/org/apache/catalina/ha/session/DeltaManager.java
tomcat/trunk/webapps/docs/changelog.xml
Modified: tomcat/trunk/java/org/apache/catalina/ha/session/DeltaManager.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/ha/session/DeltaManager.java?rev=1025924&r1=1025923&r2=1025924&view=diff
==
--- tomcat/trunk/java/org/apache/catalina/ha/session/DeltaManager.java
(original)
+++ tomcat/trunk/java/org/apache/catalina/ha/session/DeltaManager.java Thu Oct
21 10:15:26 2010
@@ -1078,7 +1078,8 @@ public class DeltaManager extends Cluste
//check to see if we need to send out an access message
if (!expires && (msg == null)) {
long replDelta = System.currentTimeMillis() -
session.getLastTimeReplicated();
-if (replDelta > (getMaxInactiveInterval() * 1000)) {
+if (session.getMaxInactiveInterval() >=0 &&
+replDelta > (session.getMaxInactiveInterval() * 1000))
{
counterSend_EVT_SESSION_ACCESSED++;
msg = new SessionMessageImpl(getName(),
SessionMessage.EVT_SESSION_ACCESSED,
Modified: tomcat/trunk/webapps/docs/changelog.xml
URL:
http://svn.apache.org/viewvc/tomcat/trunk/webapps/docs/changelog.xml?rev=1025924&r1=1025923&r2=1025924&view=diff
==
--- tomcat/trunk/webapps/docs/changelog.xml (original)
+++ tomcat/trunk/webapps/docs/changelog.xml Thu Oct 21 10:15:26 2010
@@ -78,6 +78,12 @@
Add support for maxActiveSessions attributes to BackupManager.
(kfujino)
+
+Improve sending an access message in DeltaManager.
+maxInactiveInterval of not Manager but the session is used.
+If maxInactiveInterval is negative, an access message is not sending.
+(kfujino)
+
-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
svn commit: r1025925 - /tomcat/tc6.0.x/trunk/STATUS.txt
Author: kfujino Date: Thu Oct 21 10:19:06 2010 New Revision: 1025925 URL: http://svn.apache.org/viewvc?rev=1025925&view=rev Log: Proposal Modified: tomcat/tc6.0.x/trunk/STATUS.txt Modified: tomcat/tc6.0.x/trunk/STATUS.txt URL: http://svn.apache.org/viewvc/tomcat/tc6.0.x/trunk/STATUS.txt?rev=1025925&r1=1025924&r2=1025925&view=diff == --- tomcat/tc6.0.x/trunk/STATUS.txt (original) +++ tomcat/tc6.0.x/trunk/STATUS.txt Thu Oct 21 10:19:06 2010 @@ -284,3 +284,10 @@ PATCHES PROPOSED TO BACKPORT: http://svn.apache.org/viewvc?rev=1025899&view=rev +1: kfujino -1: + +* Improve sending an access message in DeltaManager. + maxInactiveInterval of not Manager but the session is used. + If maxInactiveInterval is negative, an access message is not sending. + http://svn.apache.org/viewvc?rev=1025924&view=rev + +1: kfujino + -1: - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
svn commit: r1025927 - /tomcat/tc5.5.x/trunk/STATUS.txt
Author: kfujino Date: Thu Oct 21 10:21:02 2010 New Revision: 1025927 URL: http://svn.apache.org/viewvc?rev=1025927&view=rev Log: Proposal Modified: tomcat/tc5.5.x/trunk/STATUS.txt Modified: tomcat/tc5.5.x/trunk/STATUS.txt URL: http://svn.apache.org/viewvc/tomcat/tc5.5.x/trunk/STATUS.txt?rev=1025927&r1=1025926&r2=1025927&view=diff == --- tomcat/tc5.5.x/trunk/STATUS.txt (original) +++ tomcat/tc5.5.x/trunk/STATUS.txt Thu Oct 21 10:21:02 2010 @@ -80,4 +80,10 @@ PATCHES PROPOSED TO BACKPORT: http://svn.apache.org/viewvc?rev=1022134&view=rev +1: markt, kkolinko, rjung, timw -1: - + +* Improve sending an access message in DeltaManager. + maxInactiveInterval of not Manager but the session is used. + If maxInactiveInterval is negative, an access message is not sending. + http://svn.apache.org/viewvc?rev=1025924&view=rev + +1: kfujino + -1: - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
svn commit: r1025932 - /tomcat/tc6.0.x/trunk/STATUS.txt
Author: kfujino Date: Thu Oct 21 10:29:08 2010 New Revision: 1025932 URL: http://svn.apache.org/viewvc?rev=1025932&view=rev Log: vote Modified: tomcat/tc6.0.x/trunk/STATUS.txt Modified: tomcat/tc6.0.x/trunk/STATUS.txt URL: http://svn.apache.org/viewvc/tomcat/tc6.0.x/trunk/STATUS.txt?rev=1025932&r1=1025931&r2=1025932&view=diff == --- tomcat/tc6.0.x/trunk/STATUS.txt (original) +++ tomcat/tc6.0.x/trunk/STATUS.txt Thu Oct 21 10:29:08 2010 @@ -229,7 +229,7 @@ PATCHES PROPOSED TO BACKPORT: Add context option to disable URL re-writing and session parsing from URLs Based on a patch by Wesley. https://issues.apache.org/bugzilla/attachment.cgi?id=26135 - +1: markt, kkolinko + +1: markt, kkolinko, kfujino -1: kkolinko: minor thoughts, not mandatory: - I think in CoyoteAdapter.java the added "if (isURLRewritingDisabled(request))" call - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
svn commit: r1025936 - /tomcat/jk/trunk/native/common/jk_global.h
Author: timw Date: Thu Oct 21 10:52:06 2010 New Revision: 1025936 URL: http://svn.apache.org/viewvc?rev=1025936&view=rev Log: Fixing build for VS 2005 with Apache 2.0 The Apache 2.0 apr.h includes but doesn't include , so we have to explicitly include it. Modified: tomcat/jk/trunk/native/common/jk_global.h Modified: tomcat/jk/trunk/native/common/jk_global.h URL: http://svn.apache.org/viewvc/tomcat/jk/trunk/native/common/jk_global.h?rev=1025936&r1=1025935&r2=1025936&view=diff == --- tomcat/jk/trunk/native/common/jk_global.h (original) +++ tomcat/jk/trunk/native/common/jk_global.h Thu Oct 21 10:52:06 2010 @@ -117,7 +117,6 @@ extern char *strdup(const char *str); #include #include #include -#include #endif /* _WINDOWS_ */ #ifdef _WINDOWS_ #ifndef SIO_RCVALL @@ -127,6 +126,7 @@ extern char *strdup(const char *str); #include #include #include +#include #else /* WIN32 */ #include #if defined(NETWARE) && defined(__NOVELL_LIBC__) @@ -396,3 +396,4 @@ typedef int jk_sock_t; #endif /* __cplusplus */ #endif /* JK_GLOBAL_H */ + - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
Re: Tagging JK 1.2.31
+1 I just committed a minor fix for the Apache 2.0 build with VS 2005 - not a blocker. cheers tim On Thu, Oct 21, 2010 at 8:02 PM, Mladen Turk wrote: > Hi, > > Seems we are fine for 1.2.31 now that httpd 2.3 > compiles without problems. > > I plan to tag 1.2.31_RC1 and make release > candidate set of sources and bin at the ususal place. > If voted we would just need to svn mv 1.2.31_RC1 1.2.31 > > If someone again "needs more time for testing" :) > the release process is just good as any. > I hope I'll do all that by tomorrow which would > give us a plenty of time for a vote, so we can > have that out next week. > > > Comments? > > Regards > -- > ^TM > > - > 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
DO NOT REPLY [Bug 50135] IPV6 problem: unable to connect from other host
https://issues.apache.org/bugzilla/show_bug.cgi?id=50135 Pid changed: What|Removed |Added OS/Version||All --- Comment #1 from Pid 2010-10-21 07:50:49 EDT --- Please ask this question on the Tomcat Users mailing list, don't forget to tell us the Java version you're using. -- 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 50135] IPV6 problem: unable to connect from other host
https://issues.apache.org/bugzilla/show_bug.cgi?id=50135 michael.we...@hsh-berlin.com changed: What|Removed |Added OS/Version|All |Windows Server 2008 --- Comment #2 from michael.we...@hsh-berlin.com 2010-10-21 07:57:14 EDT --- I'm Sorry, Java-version 1.6.0_16 32bit -- 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 50130] Start Tomcat if $CATALINA_PID present and process not found.
https://issues.apache.org/bugzilla/show_bug.cgi?id=50130 Mark Thomas changed: What|Removed |Added Status|NEW |RESOLVED Resolution||DUPLICATE --- Comment #1 from Mark Thomas 2010-10-21 07:58:33 EDT --- *** This bug has been marked as a duplicate of bug 50084 *** -- 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 50084] catalina.sh fix in #49728 breaks PID handling again
https://issues.apache.org/bugzilla/show_bug.cgi?id=50084 Mark Thomas changed: What|Removed |Added CC||mike...@gulik.co.nz --- Comment #5 from Mark Thomas 2010-10-21 07:58:33 EDT --- *** Bug 50130 has been marked as a duplicate of this bug. *** -- 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 50135] IPV6 problem: unable to connect from other host
https://issues.apache.org/bugzilla/show_bug.cgi?id=50135 michael.we...@hsh-berlin.com changed: What|Removed |Added OS/Version||All --- Comment #3 from michael.we...@hsh-berlin.com 2010-10-21 08:02:50 EDT --- Supplement: I have the same behavior with 64bit-version from Java -- 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: Request logging with async examples
On 21/10/2010 01:09, Jeremy Boynes wrote:
> When I run the async1 example in trunk, the request gets logged twice in the
> access log:
> 0:0:0:0:0:0:0:1%0 - - [20/Oct/2010:21:32:39 -0700] "GET
> /examples/async/async1 HTTP/1.1" 200 -
> 0:0:0:0:0:0:0:1%0 - - [20/Oct/2010:21:32:42 -0700] "GET
> /examples/async/async1 HTTP/1.1" 200 863
>
> Is this the expected behaviour or should the post-invoke part of
> AccessLogValve be returning early for the first dispatch (when async has been
> started)?
Looks like a bug to me. It might be a side-effect of the async
refactoring I did but I must confess I didn't test access logging before
or after the refactoring so it might always have been like this. Either
way, please raise a bugzilla issue for this. As always, patches are very
much appreciated.
> However, with async2 which calls complete() from a background thread to
> finish the request, only the first dispatch is logged:
> 0:0:0:0:0:0:0:1%0 - - [20/Oct/2010:22:25:02 -0700] "GET
> /examples/async/async2 HTTP/1.1" 200 -
> It doesn't look like the Valve is being invoked at all when the request is
> completed.
Same as above.
> It also logs the 200 response if I change Async2 to send an error response:
> -actx.getResponse().getWriter().write("Output from
> background thread. Time:"+System.currentTimeMillis()+"\n");
> +((HttpServletResponse)actx.getResponse()).sendError(404);
> which seems problematic as it looks form the log that the request was OK.
> This does not send any data back to the client:
And another one.
While there are probably three separate changes required to fix this,
the issues are so similar lets keep them in a single bug report - at
least to start with. We can always break then out if we need to.
Mark
> $ curl -v http://localhost:8080/examples/async/async2
> * About to connect() to localhost port 8080 (#0)
> * Trying ::1... connected
> * Connected to localhost (::1) port 8080 (#0)
>> GET /examples/async/async2 HTTP/1.1
>> User-Agent: curl/7.19.7 (universal-apple-darwin10.0) libcurl/7.19.7
>> OpenSSL/0.9.8l zlib/1.2.3
>> Host: localhost:8080
>> Accept: */*
>>
> [[ delays for a few seconds ... ]]
> * Empty reply from server
> * Connection #0 to host localhost left intact
> curl: (52) Empty reply from server
> * Closing connection #0
>
> Thanks
> Jeremy
>
>
> -
> 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
DO NOT REPLY [Bug 50135] IPV6 problem: unable to connect from other host
https://issues.apache.org/bugzilla/show_bug.cgi?id=50135 michael.we...@hsh-berlin.com changed: What|Removed |Added OS/Version|All |Windows Server 2008 -- 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: Tagging JK 1.2.31
On 21.10.2010 09:02, Mladen Turk wrote: Hi, Seems we are fine for 1.2.31 now that httpd 2.3 compiles without problems. Yep. I plan to tag 1.2.31_RC1 and make release candidate set of sources and bin at the ususal place. If voted we would just need to svn mv 1.2.31_RC1 1.2.31 Hmmm, the problem with the RCs is: - either we don't want to change any contents of the release between the last RC and the release. Then the RCs do not contain any indication that they are actually RCs. So they might circulate and actually look like an official release. - or we add RC1 or whatever somewhere to the files and version strings. Then we have to reroll after the RC finally is approved (and I think to vote again) So if we do an RC, I would say the RC should be easily identifiable as an RC (version strings, download file names) and the purpose is simply to identify any problems, before we proceed to the real tag and vote. Is that what you want to do? It would be the same we did in the past except for calling it RCX instead of rXX-dev. If someone again "needs more time for testing" :) the release process is just good as any. I hope I'll do all that by tomorrow which would give us a plenty of time for a vote, so we can have that out next week. OK, thanks. Rainer - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
Re: Tagging JK 1.2.31
On 10/21/2010 02:29 PM, Rainer Jung wrote: On 21.10.2010 09:02, Mladen Turk wrote: Hi, Hmmm, the problem with the RCs is: - either we don't want to change any contents of the release between the last RC and the release. Then the RCs do not contain any indication that they are actually RCs. So they might circulate and actually look like an official release. - or we add RC1 or whatever somewhere to the files and version strings. Then we have to reroll after the RC finally is approved (and I think to vote again) Why? I mean tag something like _RC1 if voted fine, just rename the tag to release. It will contain the same thing in there no mater what trunk points to. If not create fixes in the trunk, create _RC2 tag and iterate again. svn mv is just a handy tool for that. If you want't to keep the _RC1 (for what ever reason) then just do a svn cp 1.2.31_RC1 1.2.31 Regards -- ^TM - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
svn commit: r1025975 - /tomcat/jk/trunk/native/common/jk.rc
Author: rjung Date: Thu Oct 21 12:47:58 2010 New Revision: 1025975 URL: http://svn.apache.org/viewvc?rev=1025975&view=rev Log: Set eol-style. Modified: tomcat/jk/trunk/native/common/jk.rc (contents, props changed) Modified: tomcat/jk/trunk/native/common/jk.rc URL: http://svn.apache.org/viewvc/tomcat/jk/trunk/native/common/jk.rc?rev=1025975&r1=1025974&r2=1025975&view=diff == --- tomcat/jk/trunk/native/common/jk.rc (original) +++ tomcat/jk/trunk/native/common/jk.rc Thu Oct 21 12:47:58 2010 @@ -1,74 +1,74 @@ -/* 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. - */ - -#include -#include "jk_version.h" - -#define ASF_COPYRIGHT "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." - -#define ASF_LICENSE "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\r\n\r\n" \ -"http://www.apache.org/licenses/LICENSE-2.0\r\n\r\n"; \ -"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." - - -1 VERSIONINFO - FILEVERSION JK_VERSIONCSV - PRODUCTVERSION JK_VERSIONCSV - FILEFLAGSMASK 0x3fL -#if defined(_DEBUG) - FILEFLAGS 0x01L -#else - FILEFLAGS 0x00L -#endif - FILEOS 0x40004L - FILETYPE 0x1L - FILESUBTYPE 0x0L -BEGIN - BLOCK "StringFileInfo" - BEGIN -BLOCK "040904b0" -BEGIN -VALUE "Comments", ASF_LICENSE "\0" - VALUE "CompanyName", "Apache Software Foundation\0" - VALUE "FileDescription", "Apache Tomcat Connector\0" - VALUE "FileVersion", JK_VERSTRING "\0" - VALUE "InternalName", PACKAGE "\0" - VALUE "LegalCopyright", ASF_COPYRIGHT "\0" - VALUE "OriginalFilename", PACKAGE "." JK_DLL_SUFFIX "\0" - VALUE "ProductName", "Apache Tomcat " PACKAGE " Connector\0" - VALUE "ProductVersion", JK_VERSTRING "\0" -END - END - BLOCK "VarFileInfo" - BEGIN -VALUE "Translation", 0x409, 1200 - END -END - +/* 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. + */ + +#include +#include "jk_version.h" + +#define ASF_COPYRIGHT "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." + +#define ASF_LICENSE "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 " \ +
Re: svn commit: r1025975 - /tomcat/jk/trunk/native/common/jk.rc
On 10/21/2010 02:47 PM, rj...@apache.org wrote: Propchange: tomcat/jk/trunk/native/common/jk.rc -- svn:eol-style = native Not needed, but it doesn't hurt :) rc.exe can compile a .rc with LF line endings. Regards -- ^TM - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
[RESULT] [VOTE] Release Apache Tomcat 7.0.4
This vote passes with 5 votes for beta. They were: markt- PMC member Martin Dubuc - contributor timw - committer funkman - PMC member rjung- PMC member Thanks to everyone who took the time to test this release and vote. I'll move the release artifacts now and announce once the mirrors have had a chance to sync. Cheers, Mark - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
DO NOT REPLY [Bug 50138] New: Lack of synchronization in org.apache.catalina.security.SecurityUtil
https://issues.apache.org/bugzilla/show_bug.cgi?id=50138 Summary: Lack of synchronization in org.apache.catalina.security.SecurityUtil Product: Tomcat 6 Version: 6.0.29 Platform: PC OS/Version: Linux Status: NEW Severity: normal Priority: P2 Component: Catalina AssignedTo: dev@tomcat.apache.org ReportedBy: mikhailov.dmi...@gmail.com Symptom: all processor threads spin madly in: == "tomcat-processor-20" daemon prio=10 tid=0x09210800 nid=0x51fb runnable [0x61b76000] java.lang.Thread.State: RUNNABLE at java.util.HashMap.getEntry(HashMap.java:347) at java.util.HashMap.containsKey(HashMap.java:335) at org.apache.catalina.security.SecurityUtil.doAsPrivilege(SecurityUtil.java:227) at org.apache.catalina.core.ApplicationFilterChain.internalDoFilter(ApplicationFilterChain.java:230) at org.apache.catalina.core.ApplicationFilterChain.access$000(ApplicationFilterChain.java:56) at org.apache.catalina.core.ApplicationFilterChain$1.run(ApplicationFilterChain.java:189) at java.security.AccessController.doPrivileged(Native Method) at org.apache.catalina.core.ApplicationFilterChain.doFilter(ApplicationFilterChain.java:185) ... == Cause: org.apache.catalina.security.SecurityUtil.objectCache is a HashMap, but access to it is not synchronized. The javadoc for HashMap says: = Note that this implementation is not synchronized. If multiple threads access a hash map concurrently, and at least one of the threads modifies the map structurally, it must be synchronized externally. = Proposed solution: change objectCache to ConcurrentHashMap; -- 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: svn commit: r1025975 - /tomcat/jk/trunk/native/common/jk.rc
On 21.10.2010 15:01, Mladen Turk wrote: On 10/21/2010 02:47 PM, rj...@apache.org wrote: Propchange: tomcat/jk/trunk/native/common/jk.rc -- svn:eol-style = native Not needed, but it doesn't hurt :) rc.exe can compile a .rc with LF line endings. Like with our other Windows build files: this is to make editing on non-Windows platform easier. I checked the eol-style of the rc files in httpd land before adding the property. Regards, Rainer - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
Empty maven repos for servletapi / problem building extras
Hi, the maven repos configured in build.properties seems to be empty for the servletapi: http://repo1.maven.org/maven/servletapi/jars/ Should we switch to http://repo1.maven.org/maven2/javax/servlet/servlet-api/2.3/ or is that not a viable alternative? The jar file is needed to build our commons-logging derivative. Regards, Rainer - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
DO NOT REPLY [Bug 50138] Lack of synchronization in org.apache.catalina.security.SecurityUtil
https://issues.apache.org/bugzilla/show_bug.cgi?id=50138
--- Comment #1 from Sebb 2010-10-21 09:51:59 EDT ---
That may not be the only bug.
There are two instances of the following code:
if(objectCache.containsKey(targetObject)){
methodsCache = objectCache.get(targetObject);
If the object is removed between the two statements, then an NPE will follow.
Surely the code should just check whether it got a non-null object?
Also, the private static fields should be final.
--
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: r1026005 - in /tomcat/jk/trunk/native: common/jk_version.h configure.in
Author: mturk
Date: Thu Oct 21 14:08:02 2010
New Revision: 1026005
URL: http://svn.apache.org/viewvc?rev=1026005&view=rev
Log:
Version step needed for a release
Modified:
tomcat/jk/trunk/native/common/jk_version.h
tomcat/jk/trunk/native/configure.in
Modified: tomcat/jk/trunk/native/common/jk_version.h
URL:
http://svn.apache.org/viewvc/tomcat/jk/trunk/native/common/jk_version.h?rev=1026005&r1=1026004&r2=1026005&view=diff
==
--- tomcat/jk/trunk/native/common/jk_version.h (original)
+++ tomcat/jk/trunk/native/common/jk_version.h Thu Oct 21 14:08:02 2010
@@ -29,7 +29,7 @@
#define JK_VERFIX 31
/* set JK_VERISRELEASE to 1 when release (do not forget to commit!) */
-#define JK_VERISRELEASE 0
+#define JK_VERISRELEASE 1
/* Beta number */
#define JK_VERBETA 0
#define JK_BETASTRING "0"
Modified: tomcat/jk/trunk/native/configure.in
URL:
http://svn.apache.org/viewvc/tomcat/jk/trunk/native/configure.in?rev=1026005&r1=1026004&r2=1026005&view=diff
==
--- tomcat/jk/trunk/native/configure.in (original)
+++ tomcat/jk/trunk/native/configure.in Thu Oct 21 14:08:02 2010
@@ -26,7 +26,7 @@ AC_CANONICAL_SYSTEM
dnl package and version. (synchronization with common/jk_version.h ?)
PACKAGE=mod_jk
-VERSION=1.2.29
+VERSION=1.2.31
AM_INIT_AUTOMAKE(${PACKAGE}, ${VERSION})
@@ -209,7 +209,7 @@ elif test "$ac_cv_sizeof_long" = "8"; th
int64_value="long"
elif test "$ac_cv_sizeof_long_long" = "8"; then
# Linux, Solaris, FreeBSD all support ll with printf.
-# BSD 4.4 originated 'q'. Solaris is more popular and
+# BSD 4.4 originated 'q'. Solaris is more popular and
# doesn't support 'q'. Solaris wins. Exceptions can
# go to the OS-dependent section.
int64_t_fmt='#define JK_INT64_T_FMT "lld"'
@@ -278,16 +278,16 @@ case $host in
esac
AC_SUBST(int32_value)
-AC_SUBST(int32_t_fmt)
-AC_SUBST(uint32_t_fmt)
-AC_SUBST(uint32_t_hex_fmt)
+AC_SUBST(int32_t_fmt)
+AC_SUBST(uint32_t_fmt)
+AC_SUBST(uint32_t_hex_fmt)
AC_SUBST(int64_value)
-AC_SUBST(int64_t_fmt)
-AC_SUBST(uint64_t_fmt)
-AC_SUBST(uint64_t_hex_fmt)
-AC_SUBST(pid_t_fmt)
-AC_SUBST(pthread_t_fmt)
-AC_SUBST(pthread_t_value)
+AC_SUBST(int64_t_fmt)
+AC_SUBST(uint64_t_fmt)
+AC_SUBST(uint64_t_hex_fmt)
+AC_SUBST(pid_t_fmt)
+AC_SUBST(pthread_t_fmt)
+AC_SUBST(pthread_t_value)
dnl check for snprintf and vsnprintf.
AC_CHECK_FUNC(snprintf, AC_DEFINE(HAVE_SNPRINTF,1,[Have snprintf()]))
-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
svn commit: r1026009 - in /tomcat/jk/trunk/native: Makefile.am apache-1.3/Makefile.apxs.in apache-1.3/Makefile.in apache-2.0/Makefile.apxs.in apache-2.0/Makefile.in common/Makefile.in
Author: mturk Date: Thu Oct 21 14:17:31 2010 New Revision: 1026009 URL: http://svn.apache.org/viewvc?rev=1026009&view=rev Log: Make maintainer-clean target usable Modified: tomcat/jk/trunk/native/Makefile.am tomcat/jk/trunk/native/apache-1.3/Makefile.apxs.in tomcat/jk/trunk/native/apache-1.3/Makefile.in tomcat/jk/trunk/native/apache-2.0/Makefile.apxs.in tomcat/jk/trunk/native/apache-2.0/Makefile.in tomcat/jk/trunk/native/common/Makefile.in Modified: tomcat/jk/trunk/native/Makefile.am URL: http://svn.apache.org/viewvc/tomcat/jk/trunk/native/Makefile.am?rev=1026009&r1=1026008&r2=1026009&view=diff == --- tomcat/jk/trunk/native/Makefile.am (original) +++ tomcat/jk/trunk/native/Makefile.am Thu Oct 21 14:17:31 2010 @@ -17,7 +17,7 @@ # Tell automake what it should do AUTOMAKE_OPTIONS = foreign MAINTAINERCLEANFILES=config.cache config.status config.log \ -Makefile.in configure +Makefile.in configure common/portable.h.in SUBDIRS = @WEBSERVER@ Modified: tomcat/jk/trunk/native/apache-1.3/Makefile.apxs.in URL: http://svn.apache.org/viewvc/tomcat/jk/trunk/native/apache-1.3/Makefile.apxs.in?rev=1026009&r1=1026008&r2=1026009&view=diff == --- tomcat/jk/trunk/native/apache-1.3/Makefile.apxs.in (original) +++ tomcat/jk/trunk/native/apache-1.3/Makefile.apxs.in Thu Oct 21 14:17:31 2010 @@ -38,3 +38,5 @@ mod_jk.so: clean: rm -f *.o *.lo *.a *.la *.so *.so.* *.slo rm -rf .libs + +maintainer-clean: clean Modified: tomcat/jk/trunk/native/apache-1.3/Makefile.in URL: http://svn.apache.org/viewvc/tomcat/jk/trunk/native/apache-1.3/Makefile.in?rev=1026009&r1=1026008&r2=1026009&view=diff == --- tomcat/jk/trunk/native/apache-1.3/Makefile.in (original) +++ tomcat/jk/trunk/native/apache-1.3/Makefile.in Thu Oct 21 14:17:31 2010 @@ -91,6 +91,8 @@ clean: rm -f *.o *.lo *.a *.la *.so *.so.* *.slo rm -rf .libs +maintainer-clean: clean + # # Compile part. # Modified: tomcat/jk/trunk/native/apache-2.0/Makefile.apxs.in URL: http://svn.apache.org/viewvc/tomcat/jk/trunk/native/apache-2.0/Makefile.apxs.in?rev=1026009&r1=1026008&r2=1026009&view=diff == --- tomcat/jk/trunk/native/apache-2.0/Makefile.apxs.in (original) +++ tomcat/jk/trunk/native/apache-2.0/Makefile.apxs.in Thu Oct 21 14:17:31 2010 @@ -41,3 +41,5 @@ install: mod_jk.la clean: rm -f *.o *.lo *.a *.la *.so *.so.* *.slo rm -rf .libs + +maintainer-clean: clean Modified: tomcat/jk/trunk/native/apache-2.0/Makefile.in URL: http://svn.apache.org/viewvc/tomcat/jk/trunk/native/apache-2.0/Makefile.in?rev=1026009&r1=1026008&r2=1026009&view=diff == --- tomcat/jk/trunk/native/apache-2.0/Makefile.in (original) +++ tomcat/jk/trunk/native/apache-2.0/Makefile.in Thu Oct 21 14:17:31 2010 @@ -95,3 +95,5 @@ install_dynamic: clean: rm -f *.o *.lo *.a *.la *.so *.so.* *.slo rm -rf .libs + +maintainer-clean: clean Modified: tomcat/jk/trunk/native/common/Makefile.in URL: http://svn.apache.org/viewvc/tomcat/jk/trunk/native/common/Makefile.in?rev=1026009&r1=1026008&r2=1026009&view=diff == --- tomcat/jk/trunk/native/common/Makefile.in (original) +++ tomcat/jk/trunk/native/common/Makefile.in Thu Oct 21 14:17:31 2010 @@ -45,3 +45,5 @@ install: clean: rm -f *.o *.lo *.a *.la *.so *.so.* *.slo rm -rf .libs + +maintainer-clean: clean - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
svn commit: r1026011 - /tomcat/jk/trunk/native/Makefile.am
Author: mturk Date: Thu Oct 21 14:22:39 2010 New Revision: 1026011 URL: http://svn.apache.org/viewvc?rev=1026011&view=rev Log: Cleanup everything with maintainer-clean Modified: tomcat/jk/trunk/native/Makefile.am Modified: tomcat/jk/trunk/native/Makefile.am URL: http://svn.apache.org/viewvc/tomcat/jk/trunk/native/Makefile.am?rev=1026011&r1=1026010&r2=1026011&view=diff == --- tomcat/jk/trunk/native/Makefile.am (original) +++ tomcat/jk/trunk/native/Makefile.am Thu Oct 21 14:22:39 2010 @@ -17,7 +17,8 @@ # Tell automake what it should do AUTOMAKE_OPTIONS = foreign MAINTAINERCLEANFILES=config.cache config.status config.log \ -Makefile.in configure common/portable.h.in +config.nice Makefile.in configure common/portable.h.in \ +aclocal.m4 SUBDIRS = @WEBSERVER@ - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
Re: Tagging JK 1.2.31
On 21.10.2010 14:48, Mladen Turk wrote: On 10/21/2010 02:29 PM, Rainer Jung wrote: On 21.10.2010 09:02, Mladen Turk wrote: Hi, Hmmm, the problem with the RCs is: - either we don't want to change any contents of the release between the last RC and the release. Then the RCs do not contain any indication that they are actually RCs. So they might circulate and actually look like an official release. - or we add RC1 or whatever somewhere to the files and version strings. Then we have to reroll after the RC finally is approved (and I think to vote again) Why? I mean tag something like _RC1 if voted fine, just rename the tag to release. It will contain the same thing in there no mater what trunk points to. If not create fixes in the trunk, create _RC2 tag and iterate again. svn mv is just a handy tool for that. If you want't to keep the _RC1 (for what ever reason) then just do a svn cp 1.2.31_RC1 1.2.31 My point is: once we circulate something, it should be clearly distinguishable from anything else we start to circulate. If the RC doesn't contain in it any indication of RC, you will never be able to tell, whether someone is using an RC1, RC2 or final release. All of them will identify itself as 1.2.31. Previously we circulated clearly distinguishable versions to do some pre voting testing and when we had the impression it looks good, we rolled the final version and voted. The other way would be like TC does it, namely tag a version and if it fails tag a new version. I did like our previous approach better. I'm not very comfortable with the possibilities of having RC1, RC2 etc. all of them identifying themselves as the real release. Regards, Rainer - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
Re: Tagging JK 1.2.31
On 21 October 2010 16:02, Rainer Jung wrote: > On 21.10.2010 14:48, Mladen Turk wrote: >> >> On 10/21/2010 02:29 PM, Rainer Jung wrote: >>> >>> On 21.10.2010 09:02, Mladen Turk wrote: Hi, >>> >>> Hmmm, the problem with the RCs is: >>> >>> - either we don't want to change any contents of the release between >>> the last RC and the release. Then the RCs do not contain any >>> indication that they are actually RCs. So they might circulate and >>> actually look like an official release. >>> - or we add RC1 or whatever somewhere to the files and version >>> strings. Then we have to reroll after the RC finally is approved (and >>> I think to vote again) >>> >> >> Why? >> I mean tag something like _RC1 if voted fine, just rename the tag to >> release. >> It will contain the same thing in there no mater what trunk points to. >> If not create fixes in the trunk, create _RC2 tag and iterate again. >> >> svn mv is just a handy tool for that. >> If you want't to keep the _RC1 (for what ever reason) then >> just do a svn cp 1.2.31_RC1 1.2.31 > > My point is: once we circulate something, it should be clearly > distinguishable from anything else we start to circulate. If the RC doesn't > contain in it any indication of RC, you will never be able to tell, whether > someone is using an RC1, RC2 or final release. All of them will identify > itself as 1.2.31. > > Previously we circulated clearly distinguishable versions to do some pre > voting testing and when we had the impression it looks good, we rolled the > final version and voted. > > The other way would be like TC does it, namely tag a version and if it fails > tag a new version. I did like our previous approach better. I'm not very > comfortable with the possibilities of having RC1, RC2 etc. all of them > identifying themselves as the real release. If the archives contain the RCn suffix, would that not be sufficient? The archives should not be put on general release, so it would only be reviewers that have copies and they should know. If you wish to distinguish the contents, then one possible solution is to include the SVN revision somewhere in the code. That would be useful anyway. Also, any separately released items need to have hashes and sigs, so one can distinguish the files if necessary. > > Regards, > > Rainer > > - > 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: Tagging JK 1.2.31
On 10/21/2010 05:02 PM, Rainer Jung wrote: On 21.10.2010 14:48, Mladen Turk wrote: My point is: once we circulate something, ... But the point is that we don't circulate that. It's supposed to be used only by PMC members that would vote or no vote for that release. We are not creating something that goes out. It's simply a mechanism we are using to verify that we won't announce something with broken packaging. Regards -- ^TM - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
Re: Tagging JK 1.2.31
- "Rainer Jung" wrote: > On 21.10.2010 14:48, Mladen Turk wrote: > > On 10/21/2010 02:29 PM, Rainer Jung wrote: > >> On 21.10.2010 09:02, Mladen Turk wrote: > >>> Hi, > >>> > >> > >> Hmmm, the problem with the RCs is: > >> > >> - either we don't want to change any contents of the release > between > >> the last RC and the release. Then the RCs do not contain any > >> indication that they are actually RCs. So they might circulate and > >> actually look like an official release. > >> - or we add RC1 or whatever somewhere to the files and version > >> strings. Then we have to reroll after the RC finally is approved > (and > >> I think to vote again) > >> > > > > Why? > > I mean tag something like _RC1 if voted fine, just rename the tag > to > > release. > > It will contain the same thing in there no mater what trunk points > to. > > If not create fixes in the trunk, create _RC2 tag and iterate > again. > > > > svn mv is just a handy tool for that. > > If you want't to keep the _RC1 (for what ever reason) then > > just do a svn cp 1.2.31_RC1 1.2.31 > > My point is: once we circulate something, it should be clearly > distinguishable from anything else we start to circulate. If the RC > doesn't contain in it any indication of RC, you will never be able to > > tell, whether someone is using an RC1, RC2 or final release. All of > them > will identify itself as 1.2.31. > > Previously we circulated clearly distinguishable versions to do some > pre > voting testing and when we had the impression it looks good, we rolled > > the final version and voted. > > The other way would be like TC does it, namely tag a version and if it > > fails tag a new version. I did like our previous approach better. I'm > > not very comfortable with the possibilities of having RC1, RC2 etc. > all > of them identifying themselves as the real release. http://svnbook.red-bean.com/nightly/en/svn.branchmerge.summary.html tags are cheap (: > Regards, > > Rainer > > - > To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org > For additional commands, e-mail: dev-h...@tomcat.apache.org -- Igor Galić Tel: +43 (0) 664 886 22 883 Mail: i.ga...@brainsware.org URL: http://brainsware.org/ - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
DO NOT REPLY [Bug 50139] New: System tray tool should include a "Restart service" option.
https://issues.apache.org/bugzilla/show_bug.cgi?id=50139 Summary: System tray tool should include a "Restart service" option. Product: Tomcat 6 Version: unspecified Platform: PC OS/Version: Windows Vista Status: NEW Severity: enhancement Priority: P2 Component: Native:Integration AssignedTo: dev@tomcat.apache.org ReportedBy: mrbobsmith...@gmail.com The system tray tool has "Stop service" and "Start service" options already. I would find a "Restart service" option - equivalent to pressing stop and then start - rather useful. -- 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 50139] System tray tool should include a "Restart service" option.
https://issues.apache.org/bugzilla/show_bug.cgi?id=50139 Mladen Turk changed: What|Removed |Added Status|NEW |RESOLVED Resolution||INVALID --- Comment #1 from Mladen Turk 2010-10-21 11:58:11 EDT --- We are using Commons Daemon for service wrapper so rise your question there https://issues.apache.org/jira/browse/DAEMON BTW, since Tomcat doesn't have restart mechanism there's no point of having restart method which would do stop/start That would be cheating :) -- 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: Tagging JK 1.2.31
On 21.10.2010 17:47, Igor Galić wrote: tags are cheap (: I know that slogan, but from a users perspective I think "missing" versions are always strange. It's OK if it happens every now and then but it give a very strange feeling, if a lot of versions are not released. Regards, Rainer - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
svn commit: r1026042 - in /tomcat/trunk: java/org/apache/catalina/security/SecurityUtil.java webapps/docs/changelog.xml
Author: markt
Date: Thu Oct 21 15:58:21 2010
New Revision: 1026042
URL: http://svn.apache.org/viewvc?rev=1026042&view=rev
Log:
Fix https://issues.apache.org/bugzilla/show_bug.cgi?id=50138
Fix threading issues
Modified:
tomcat/trunk/java/org/apache/catalina/security/SecurityUtil.java
tomcat/trunk/webapps/docs/changelog.xml
Modified: tomcat/trunk/java/org/apache/catalina/security/SecurityUtil.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/security/SecurityUtil.java?rev=1026042&r1=1026041&r2=1026042&view=diff
==
--- tomcat/trunk/java/org/apache/catalina/security/SecurityUtil.java (original)
+++ tomcat/trunk/java/org/apache/catalina/security/SecurityUtil.java Thu Oct 21
15:58:21 2010
@@ -23,7 +23,8 @@ import java.lang.reflect.Method;
import java.security.Principal;
import java.security.PrivilegedActionException;
import java.security.PrivilegedExceptionAction;
-import java.util.HashMap;
+import java.util.Map;
+import java.util.concurrent.ConcurrentHashMap;
import javax.security.auth.Subject;
import javax.servlet.Filter;
@@ -66,8 +67,8 @@ public final class SecurityUtil{
/**
* Cache every object for which we are creating method on it.
*/
-private static HashMap objectCache =
-new HashMap();
+private static final Map objectCache =
+new ConcurrentHashMap();
private static final org.apache.juli.logging.Log log=
org.apache.juli.logging.LogFactory.getLog( SecurityUtil.class );
@@ -147,21 +148,20 @@ public final class SecurityUtil{
throws java.lang.Exception{
Method method = null;
-Method[] methodsCache = null;
-if(objectCache.containsKey(targetObject)){
-methodsCache = objectCache.get(targetObject);
+Method[] methodsCache = objectCache.get(targetObject);
+if(methodsCache == null) {
+method = createMethodAndCacheIt(methodsCache,
+methodName,
+targetObject,
+targetType);
+} else {
method = findMethod(methodsCache, methodName);
-if (method == null){
+if (method == null) {
method = createMethodAndCacheIt(methodsCache,
methodName,
targetObject,
targetType);
}
-} else {
-method = createMethodAndCacheIt(methodsCache,
-methodName,
-targetObject,
-targetType);
}
execute(method, targetObject, targetArguments, principal);
@@ -226,23 +226,22 @@ public final class SecurityUtil{
final Object[] targetArguments,
Principal principal)
throws java.lang.Exception{
+
Method method = null;
-
-Method[] methodsCache = null;
-if(objectCache.containsKey(targetObject)){
-methodsCache = objectCache.get(targetObject);
+Method[] methodsCache = objectCache.get(targetObject);
+if(methodsCache == null) {
+method = createMethodAndCacheIt(methodsCache,
+methodName,
+targetObject,
+targetType);
+} else {
method = findMethod(methodsCache, methodName);
-if (method == null){
+if (method == null) {
method = createMethodAndCacheIt(methodsCache,
methodName,
targetObject,
targetType);
}
-} else {
-method = createMethodAndCacheIt(methodsCache,
-methodName,
-targetObject,
-targetType);
}
execute(method, targetObject, targetArguments, principal);
@@ -271,6 +270,7 @@ public final class SecurityUtil{
Subject subject = null;
PrivilegedExceptionAction pea =
new PrivilegedExceptionAction(){
+@Override
public Void run() throws Exception{
method.invoke(targetObject, targetArguments);
return null;
Modified: tomcat/trunk/webapps/docs/changelog.xml
URL:
http://svn.apache.org/viewvc/tomcat/trunk/webapps/docs/c
Re: Tagging JK 1.2.31
On 21.10.2010 17:44, Mladen Turk wrote: On 10/21/2010 05:02 PM, Rainer Jung wrote: On 21.10.2010 14:48, Mladen Turk wrote: My point is: once we circulate something, ... But the point is that we don't circulate that. It's supposed to be used only by PMC members that would vote or no vote for that release. We are not creating something that goes out. It's simply a mechanism we are using to verify that we won't announce something with broken packaging. Would you oppose, if I find a simple way of adding the revision number to the exposed version, like 1.2.31 (r1003456) What file name do you plan for the RC source tarball? Regards, Rainer - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
svn commit: r1026045 - /tomcat/tc6.0.x/trunk/STATUS.txt
Author: markt Date: Thu Oct 21 16:00:27 2010 New Revision: 1026045 URL: http://svn.apache.org/viewvc?rev=1026045&view=rev Log: Proposal Modified: tomcat/tc6.0.x/trunk/STATUS.txt Modified: tomcat/tc6.0.x/trunk/STATUS.txt URL: http://svn.apache.org/viewvc/tomcat/tc6.0.x/trunk/STATUS.txt?rev=1026045&r1=1026044&r2=1026045&view=diff == --- tomcat/tc6.0.x/trunk/STATUS.txt (original) +++ tomcat/tc6.0.x/trunk/STATUS.txt Thu Oct 21 16:00:27 2010 @@ -291,3 +291,9 @@ PATCHES PROPOSED TO BACKPORT: http://svn.apache.org/viewvc?rev=1025924&view=rev +1: kfujino -1: + +* Fix https://issues.apache.org/bugzilla/show_bug.cgi?id=50138 + Correct threading issues in SecurityUtil + http://svn.apache.org/viewvc?rev=1026042&view=rev + +1: markt + -1: - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
DO NOT REPLY [Bug 50138] Lack of synchronization in org.apache.catalina.security.SecurityUtil
https://issues.apache.org/bugzilla/show_bug.cgi?id=50138 --- Comment #2 from Mark Thomas 2010-10-21 12:02:00 EDT --- Thanks for the report. Fixed in trunk for 7.0.5 onwards and proposed for 6.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: Tagging JK 1.2.31
On 10/21/2010 05:58 PM, Rainer Jung wrote: On 21.10.2010 17:47, Igor Galić wrote: tags are cheap (: I know that slogan, but from a users perspective I think "missing" versions are always strange. It's OK if it happens every now and then but it give a very strange feeling, if a lot of versions are not released. ++1 The entire release process (probably for all Tomcat) should be made with the presumption that RM's proposals are just that: *the proposal* Nothing else, nothing more. Think Mark is already using p.a.o for that, and I plan to do the same. Before we were using tomcat.apache.org/dev/dist and this should be axed completely. Regards -- ^TM - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
svn commit: r1026047 - /tomcat/trunk/webapps/docs/appdev/sample/src/mypackage/Hello.java
Author: markt Date: Thu Oct 21 16:07:11 2010 New Revision: 1026047 URL: http://svn.apache.org/viewvc?rev=1026047&view=rev Log: Remove unused imports from webapps Modified: tomcat/trunk/webapps/docs/appdev/sample/src/mypackage/Hello.java Modified: tomcat/trunk/webapps/docs/appdev/sample/src/mypackage/Hello.java URL: http://svn.apache.org/viewvc/tomcat/trunk/webapps/docs/appdev/sample/src/mypackage/Hello.java?rev=1026047&r1=1026046&r2=1026047&view=diff == --- tomcat/trunk/webapps/docs/appdev/sample/src/mypackage/Hello.java (original) +++ tomcat/trunk/webapps/docs/appdev/sample/src/mypackage/Hello.java Thu Oct 21 16:07:11 2010 @@ -18,7 +18,6 @@ package mypackage; import java.io.IOException; import java.io.PrintWriter; -import java.util.Enumeration; import javax.servlet.ServletException; import javax.servlet.http.HttpServlet; - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
Re: Tagging JK 1.2.31
On 10/21/2010 05:59 PM, Rainer Jung wrote: 1.2.31 (r1003456) What file name do you plan for the RC source tarball? The same as a release. I'll put them in the p.a.o/~mturk for potential voters. Again, this is not a release, release candidate or something third. It is my proposal made from the particular tag, which if voted will be promoted to the release. Regards -- ^TM - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
svn commit: r1026049 - in /tomcat/trunk/test/org/apache: el/TestELEvaluation.java el/TestELInJsp.java jasper/compiler/TestAttributeParser.java
Author: markt
Date: Thu Oct 21 16:09:50 2010
New Revision: 1026049
URL: http://svn.apache.org/viewvc?rev=1026049&view=rev
Log:
Allow Checkstyle's unused imports test to be used with the unit testcode
Modified:
tomcat/trunk/test/org/apache/el/TestELEvaluation.java
tomcat/trunk/test/org/apache/el/TestELInJsp.java
tomcat/trunk/test/org/apache/jasper/compiler/TestAttributeParser.java
Modified: tomcat/trunk/test/org/apache/el/TestELEvaluation.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/test/org/apache/el/TestELEvaluation.java?rev=1026049&r1=1026048&r2=1026049&view=diff
==
--- tomcat/trunk/test/org/apache/el/TestELEvaluation.java (original)
+++ tomcat/trunk/test/org/apache/el/TestELEvaluation.java Thu Oct 21 16:09:50
2010
@@ -28,12 +28,12 @@ import javax.el.ValueExpression;
import junit.framework.TestCase;
import org.apache.el.lang.ELSupport;
-import org.apache.jasper.compiler.TestAttributeParser;
import org.apache.jasper.el.ELContextImpl;
/**
* Tests the EL engine directly. Similar tests may be found in
- * {...@link TestAttributeParser} and {...@link TestELInJsp}.
+ * {...@link org.apache.jasper.compiler.TestAttributeParser} and
+ * {...@link TestELInJsp}.
*/
public class TestELEvaluation extends TestCase {
Modified: tomcat/trunk/test/org/apache/el/TestELInJsp.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/test/org/apache/el/TestELInJsp.java?rev=1026049&r1=1026048&r2=1026049&view=diff
==
--- tomcat/trunk/test/org/apache/el/TestELInJsp.java (original)
+++ tomcat/trunk/test/org/apache/el/TestELInJsp.java Thu Oct 21 16:09:50 2010
@@ -21,12 +21,12 @@ import java.io.File;
import org.apache.catalina.startup.Tomcat;
import org.apache.catalina.startup.TomcatBaseTest;
-import org.apache.jasper.compiler.TestAttributeParser;
import org.apache.tomcat.util.buf.ByteChunk;
/**
* Tests EL with an without JSP attributes using a test web application.
Similar
- * tests may be found in {...@link TestELEvaluation} and {...@link
TestAttributeParser}.
+ * tests may be found in {...@link TestELEvaluation} and
+ * {...@link org.apache.jasper.compiler.TestAttributeParser}.
*/
public class TestELInJsp extends TomcatBaseTest {
Modified: tomcat/trunk/test/org/apache/jasper/compiler/TestAttributeParser.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/test/org/apache/jasper/compiler/TestAttributeParser.java?rev=1026049&r1=1026048&r2=1026049&view=diff
==
--- tomcat/trunk/test/org/apache/jasper/compiler/TestAttributeParser.java
(original)
+++ tomcat/trunk/test/org/apache/jasper/compiler/TestAttributeParser.java Thu
Oct 21 16:09:50 2010
@@ -25,14 +25,12 @@ import javax.el.ValueExpression;
import junit.framework.TestCase;
import org.apache.el.ExpressionFactoryImpl;
-import org.apache.el.TestELEvaluation;
-import org.apache.el.TestELInJsp;
import org.apache.el.TesterFunctions;
import org.apache.jasper.el.ELContextImpl;
/**
* Test the EL processing from JSP attributes. Similar tests may be found in
- * {...@link TestELEvaluation} and {...@link TestELInJsp}.
+ * {...@link org.apache.el.TestELEvaluation} and {...@link
org.apache.el.TestELInJsp}.
*/
public class TestAttributeParser extends TestCase {
@@ -62,8 +60,8 @@ public class TestAttributeParser extends
/**
* Test use nested ternary expressions. Full tests in
- * {...@link TestELEvaluation}. This is just a smoke test to ensure JSP
- * attribute processing doesn't cause any additional issues.
+ * {...@link org.apache.el.TestELEvaluation}. This is just a smoke test to
+ * ensure JSP attribute processing doesn't cause any additional issues.
*/
public void testBug44994() {
assertEquals("none",
-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
svn commit: r1026051 - in /tomcat/trunk/java/javax/servlet: ServletRequest.java ServletResponse.java
Author: markt
Date: Thu Oct 21 16:12:42 2010
New Revision: 1026051
URL: http://svn.apache.org/viewvc?rev=1026051&view=rev
Log:
Allow Checkstyle's unused imports test to be used with the api classes
Modified:
tomcat/trunk/java/javax/servlet/ServletRequest.java
tomcat/trunk/java/javax/servlet/ServletResponse.java
Modified: tomcat/trunk/java/javax/servlet/ServletRequest.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/javax/servlet/ServletRequest.java?rev=1026051&r1=1026050&r2=1026051&view=diff
==
--- tomcat/trunk/java/javax/servlet/ServletRequest.java (original)
+++ tomcat/trunk/java/javax/servlet/ServletRequest.java Thu Oct 21 16:12:42 2010
@@ -18,7 +18,6 @@ package javax.servlet;
import java.io.BufferedReader;
import java.io.IOException;
-import java.io.UnsupportedEncodingException;
import java.util.Enumeration;
import java.util.Locale;
import java.util.Map;
@@ -250,7 +249,7 @@ public interface ServletRequest {
* or {...@link #getInputStream} may be called to read the body, not both.
*
* @return a BufferedReader containing the body of the request
- * @exception UnsupportedEncodingException
+ * @exception java.io.UnsupportedEncodingException
*if the character set encoding used is not supported and
*the text cannot be decoded
* @exception IllegalStateException
Modified: tomcat/trunk/java/javax/servlet/ServletResponse.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/javax/servlet/ServletResponse.java?rev=1026051&r1=1026050&r2=1026051&view=diff
==
--- tomcat/trunk/java/javax/servlet/ServletResponse.java (original)
+++ tomcat/trunk/java/javax/servlet/ServletResponse.java Thu Oct 21 16:12:42
2010
@@ -18,7 +18,6 @@ package javax.servlet;
import java.io.IOException;
import java.io.PrintWriter;
-import java.io.UnsupportedEncodingException;
import java.util.Locale;
/**
@@ -121,7 +120,7 @@ public interface ServletResponse {
*
* @return a PrintWriter object that can return character data
* to the client
- * @exception UnsupportedEncodingException
+ * @exception java.io.UnsupportedEncodingException
*if the character encoding returned by
*getCharacterEncoding cannot be used
* @exception IllegalStateException
-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
Re: Tagging JK 1.2.31
On 10/21/2010 06:05 PM, Mladen Turk wrote: Before we were using tomcat.apache.org/dev/dist and this should be axed completely. What I mean, anything that we "dist" *must* be voted before. Since our entire site is mirrored anything on the site must be voted for (even if the readme says "This is development version", it is after all a *version* ) Regards -- ^TM - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
svn commit: r1026054 - in /tomcat/trunk/java/org/apache/tomcat/util: http/fileupload/disk/DiskFileItem.java modeler/ManagedBean.java
Author: markt
Date: Thu Oct 21 16:18:12 2010
New Revision: 1026054
URL: http://svn.apache.org/viewvc?rev=1026054&view=rev
Log:
Allow Checkstyle's unused imports test to be used with the o.a.tomcat.util
classes
Modified:
tomcat/trunk/java/org/apache/tomcat/util/http/fileupload/disk/DiskFileItem.java
tomcat/trunk/java/org/apache/tomcat/util/modeler/ManagedBean.java
Modified:
tomcat/trunk/java/org/apache/tomcat/util/http/fileupload/disk/DiskFileItem.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/tomcat/util/http/fileupload/disk/DiskFileItem.java?rev=1026054&r1=1026053&r2=1026054&view=diff
==
---
tomcat/trunk/java/org/apache/tomcat/util/http/fileupload/disk/DiskFileItem.java
(original)
+++
tomcat/trunk/java/org/apache/tomcat/util/http/fileupload/disk/DiskFileItem.java
Thu Oct 21 16:18:12 2010
@@ -36,9 +36,7 @@ import org.apache.tomcat.util.http.fileu
import org.apache.tomcat.util.http.fileupload.FileItemHeadersSupport;
import org.apache.tomcat.util.http.fileupload.FileUploadException;
import org.apache.tomcat.util.http.fileupload.IOUtils;
-import org.apache.tomcat.util.http.fileupload.InvalidFileNameException;
import org.apache.tomcat.util.http.fileupload.ParameterParser;
-import org.apache.tomcat.util.http.fileupload.RequestContext;
import org.apache.tomcat.util.http.fileupload.util.Streams;
@@ -49,8 +47,8 @@ import org.apache.tomcat.util.http.fileu
* After retrieving an instance of this class from a {...@link
* org.apache.tomcat.util.http.fileupload.FileUpload FileUpload} instance (see
* {...@link org.apache.tomcat.util.http.fileupload.FileUpload
- * #parseRequest(RequestContext)}), you may
- * either request all contents of file at once using {...@link #get()} or
+ * #parseRequest(org.apache.tomcat.util.http.fileupload.RequestContext)}), you
+ * may either request all contents of file at once using {...@link #get()} or
* request an {...@link java.io.InputStream InputStream} with
* {...@link #getInputStream()} and process the file without attempting to load
* it into memory, which may come handy with large files.
@@ -276,10 +274,10 @@ public class DiskFileItem
* Returns the original filename in the client's filesystem.
*
* @return The original filename in the client's filesystem.
- * @throws InvalidFileNameException The file name contains a NUL character,
- * which might be an indicator of a security attack. If you intend to
- * use the file name anyways, catch the exception and use
- * InvalidFileNameException#getName().
+ * @throws org.apache.tomcat.util.http.fileupload.InvalidFileNameException
+ * The file name contains a NUL character, which might be an indicator of
+ * a security attack. If you intend to use the file name anyways, catch
+ * the exception and use InvalidFileNameException#getName().
*/
public String getName() {
return Streams.checkFileName(fileName);
Modified: tomcat/trunk/java/org/apache/tomcat/util/modeler/ManagedBean.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/tomcat/util/modeler/ManagedBean.java?rev=1026054&r1=1026053&r2=1026054&view=diff
==
--- tomcat/trunk/java/org/apache/tomcat/util/modeler/ManagedBean.java (original)
+++ tomcat/trunk/java/org/apache/tomcat/util/modeler/ManagedBean.java Thu Oct
21 16:18:12 2010
@@ -35,7 +35,6 @@ import javax.management.MBeanOperationIn
import javax.management.ReflectionException;
import javax.management.RuntimeOperationsException;
import javax.management.ServiceNotFoundException;
-import javax.management.modelmbean.InvalidTargetObjectTypeException;
/**
@@ -304,8 +303,8 @@ public class ManagedBean implements java
*
* @exception InstanceNotFoundException if the managed resource
* object cannot be found
- * @exception InvalidTargetObjectTypeException if our MBean cannot
- * handle object references (should never happen)
+ * @exception javax.management.modelmbean.InvalidTargetObjectTypeException
+ * if our MBean cannot handle object references (should never happen)
* @exception MBeanException if a problem occurs instantiating the
* ModelMBean instance
* @exception RuntimeOperationsException if a JMX runtime error occurs
@@ -332,8 +331,8 @@ public class ManagedBean implements java
*
* @exception InstanceNotFoundException if the managed resource
* object cannot be found
- * @exception InvalidTargetObjectTypeException if our MBean cannot
- * handle object references (should never happen)
+ * @exception javax.management.modelmbean.InvalidTargetObjectTypeException
+ * if our MBean cannot handle object references (should never happen)
* @exception MBeanException if a problem occurs instantiating the
* ModelMBean instance
*
svn commit: r1026057 - /tomcat/trunk/java/org/apache/naming/SelectorContext.java
Author: markt
Date: Thu Oct 21 16:26:50 2010
New Revision: 1026057
URL: http://svn.apache.org/viewvc?rev=1026057&view=rev
Log:
Allow Checkstyle's unused imports test to be used with this class
Fix Eclipse warnings
Modified:
tomcat/trunk/java/org/apache/naming/SelectorContext.java
Modified: tomcat/trunk/java/org/apache/naming/SelectorContext.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/naming/SelectorContext.java?rev=1026057&r1=1026056&r2=1026057&view=diff
==
--- tomcat/trunk/java/org/apache/naming/SelectorContext.java (original)
+++ tomcat/trunk/java/org/apache/naming/SelectorContext.java Thu Oct 21
16:26:50 2010
@@ -23,15 +23,10 @@ import java.util.Hashtable;
import javax.naming.Binding;
import javax.naming.Context;
import javax.naming.Name;
-import javax.naming.NameAlreadyBoundException;
import javax.naming.NameClassPair;
-import javax.naming.NameNotFoundException;
import javax.naming.NameParser;
import javax.naming.NamingEnumeration;
import javax.naming.NamingException;
-import javax.naming.NotContextException;
-import javax.naming.OperationNotSupportedException;
-import javax.naming.directory.InvalidAttributesException;
/**
* Catalina JNDI Context implementation.
@@ -125,6 +120,7 @@ public class SelectorContext implements
* @return the object bound to name
* @exception NamingException if a naming exception is encountered
*/
+@Override
public Object lookup(Name name)
throws NamingException {
@@ -147,6 +143,7 @@ public class SelectorContext implements
* @return the object bound to name
* @exception NamingException if a naming exception is encountered
*/
+@Override
public Object lookup(String name)
throws NamingException {
@@ -169,11 +166,13 @@ public class SelectorContext implements
*
* @param name the name to bind; may not be empty
* @param obj the object to bind; possibly null
- * @exception NameAlreadyBoundException if name is already bound
- * @exception InvalidAttributesException if object did not supply all
- * mandatory attributes
+ * @exception javax.naming.NameAlreadyBoundException if name is already
+ * bound
+ * @exception javax.naming.InvalidAttributesException if object did not
+ * supply all mandatory attributes
* @exception NamingException if a naming exception is encountered
*/
+@Override
public void bind(Name name, Object obj)
throws NamingException {
getBoundContext().bind(parseName(name), obj);
@@ -185,11 +184,13 @@ public class SelectorContext implements
*
* @param name the name to bind; may not be empty
* @param obj the object to bind; possibly null
- * @exception NameAlreadyBoundException if name is already bound
- * @exception InvalidAttributesException if object did not supply all
- * mandatory attributes
+ * @exception javax.naming.NameAlreadyBoundException if name is already
+ * bound
+ * @exception javax.naming.InvalidAttributesException if object did not
+ * supply all mandatory attributes
* @exception NamingException if a naming exception is encountered
*/
+@Override
public void bind(String name, Object obj)
throws NamingException {
getBoundContext().bind(parseName(name), obj);
@@ -207,10 +208,11 @@ public class SelectorContext implements
*
* @param name the name to bind; may not be empty
* @param obj the object to bind; possibly null
- * @exception InvalidAttributesException if object did not supply all
- * mandatory attributes
+ * @exception javax.naming.InvalidAttributesException if object did not
+ * supply all mandatory attributes
* @exception NamingException if a naming exception is encountered
*/
+@Override
public void rebind(Name name, Object obj)
throws NamingException {
getBoundContext().rebind(parseName(name), obj);
@@ -222,10 +224,11 @@ public class SelectorContext implements
*
* @param name the name to bind; may not be empty
* @param obj the object to bind; possibly null
- * @exception InvalidAttributesException if object did not supply all
- * mandatory attributes
+ * @exception javax.naming.InvalidAttributesException if object did not
+ * supply all mandatory attributes
* @exception NamingException if a naming exception is encountered
*/
+@Override
public void rebind(String name, Object obj)
throws NamingException {
getBoundContext().rebind(parseName(name), obj);
@@ -242,10 +245,11 @@ public class SelectorContext implements
* NameNotFoundException if any of the intermediate contexts do not exist.
*
* @param name the name to bind; may not be empty
- * @exception NameNotFoundException if an intermediate context doe
svn commit: r1026060 - /tomcat/trunk/java/org/apache/naming/resources/BaseDirContext.java
Author: markt
Date: Thu Oct 21 16:39:50 2010
New Revision: 1026060
URL: http://svn.apache.org/viewvc?rev=1026060&view=rev
Log:
Allow Checkstyle's unused imports test to be used with this class
Fix Eclipse warnings
Modified:
tomcat/trunk/java/org/apache/naming/resources/BaseDirContext.java
Modified: tomcat/trunk/java/org/apache/naming/resources/BaseDirContext.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/naming/resources/BaseDirContext.java?rev=1026060&r1=1026059&r2=1026060&view=diff
==
--- tomcat/trunk/java/org/apache/naming/resources/BaseDirContext.java (original)
+++ tomcat/trunk/java/org/apache/naming/resources/BaseDirContext.java Thu Oct
21 16:39:50 2010
@@ -35,20 +35,13 @@ import java.util.zip.ZipEntry;
import javax.naming.Binding;
import javax.naming.Context;
import javax.naming.Name;
-import javax.naming.NameAlreadyBoundException;
import javax.naming.NameClassPair;
import javax.naming.NameNotFoundException;
import javax.naming.NameParser;
import javax.naming.NamingEnumeration;
import javax.naming.NamingException;
-import javax.naming.NotContextException;
-import javax.naming.OperationNotSupportedException;
-import javax.naming.directory.AttributeModificationException;
import javax.naming.directory.Attributes;
import javax.naming.directory.DirContext;
-import javax.naming.directory.InvalidAttributesException;
-import javax.naming.directory.InvalidSearchControlsException;
-import javax.naming.directory.InvalidSearchFilterException;
import javax.naming.directory.ModificationItem;
import javax.naming.directory.SearchControls;
import javax.naming.directory.SearchResult;
@@ -438,6 +431,7 @@ public abstract class BaseDirContext imp
* @return the object bound to name
* @exception NamingException if a naming exception is encountered
*/
+@Override
public final Object lookup(Name name)
throws NamingException {
return lookup(name.toString());
@@ -451,6 +445,7 @@ public abstract class BaseDirContext imp
* @return the object bound to name
* @exception NamingException if a naming exception is encountered
*/
+@Override
public final Object lookup(String name) throws NamingException {
// First check for aliases
if (!aliases.isEmpty()) {
@@ -489,11 +484,13 @@ public abstract class BaseDirContext imp
*
* @param name the name to bind; may not be empty
* @param obj the object to bind; possibly null
- * @exception NameAlreadyBoundException if name is already bound
- * @exception InvalidAttributesException if object did not supply all
- * mandatory attributes
+ * @exception javax.naming.NameAlreadyBoundException if name is already
+ * bound
+ * @exception javax.naming.directory.InvalidAttributesException if object
+ * did not supply all mandatory attributes
* @exception NamingException if a naming exception is encountered
*/
+@Override
public void bind(Name name, Object obj)
throws NamingException {
bind(name.toString(), obj);
@@ -505,11 +502,13 @@ public abstract class BaseDirContext imp
*
* @param name the name to bind; may not be empty
* @param obj the object to bind; possibly null
- * @exception NameAlreadyBoundException if name is already bound
- * @exception InvalidAttributesException if object did not supply all
- * mandatory attributes
+ * @exception javax.naming.NameAlreadyBoundException if name is already
+ * bound
+ * @exception javax.naming.directory.InvalidAttributesException if object
+ * did not supply all mandatory attributes
* @exception NamingException if a naming exception is encountered
*/
+@Override
public void bind(String name, Object obj)
throws NamingException {
bind(name, obj, null);
@@ -527,10 +526,11 @@ public abstract class BaseDirContext imp
*
* @param name the name to bind; may not be empty
* @param obj the object to bind; possibly null
- * @exception InvalidAttributesException if object did not supply all
- * mandatory attributes
+ * @exception javax.naming.directory.InvalidAttributesException if object
+ * did not supply all mandatory attributes
* @exception NamingException if a naming exception is encountered
*/
+@Override
public void rebind(Name name, Object obj)
throws NamingException {
rebind(name.toString(), obj);
@@ -542,10 +542,11 @@ public abstract class BaseDirContext imp
*
* @param name the name to bind; may not be empty
* @param obj the object to bind; possibly null
- * @exception InvalidAttributesException if object did not supply all
- * mandatory attributes
+ * @exception javax.naming.directory.InvalidAttributesException if object
+ * did not supply all mandatory attributes
* @exception
svn commit: r1026061 - in /tomcat/trunk/java/org/apache/naming/resources: DirContextURLStreamHandler.java DirContextURLStreamHandlerFactory.java
Author: markt
Date: Thu Oct 21 16:41:40 2010
New Revision: 1026061
URL: http://svn.apache.org/viewvc?rev=1026061&view=rev
Log:
Fix Eclipse warnings
Modified:
tomcat/trunk/java/org/apache/naming/resources/DirContextURLStreamHandler.java
tomcat/trunk/java/org/apache/naming/resources/DirContextURLStreamHandlerFactory.java
Modified:
tomcat/trunk/java/org/apache/naming/resources/DirContextURLStreamHandler.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/naming/resources/DirContextURLStreamHandler.java?rev=1026061&r1=1026060&r2=1026061&view=diff
==
---
tomcat/trunk/java/org/apache/naming/resources/DirContextURLStreamHandler.java
(original)
+++
tomcat/trunk/java/org/apache/naming/resources/DirContextURLStreamHandler.java
Thu Oct 21 16:41:40 2010
@@ -39,6 +39,7 @@ public class DirContextURLStreamHandler
public DirContextURLStreamHandler() {
+// NOOP
}
Modified:
tomcat/trunk/java/org/apache/naming/resources/DirContextURLStreamHandlerFactory.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/naming/resources/DirContextURLStreamHandlerFactory.java?rev=1026061&r1=1026060&r2=1026061&view=diff
==
---
tomcat/trunk/java/org/apache/naming/resources/DirContextURLStreamHandlerFactory.java
(original)
+++
tomcat/trunk/java/org/apache/naming/resources/DirContextURLStreamHandlerFactory.java
Thu Oct 21 16:41:40 2010
@@ -34,6 +34,7 @@ public class DirContextURLStreamHandlerF
public DirContextURLStreamHandlerFactory() {
+// NOOP
}
@@ -54,6 +55,7 @@ public class DirContextURLStreamHandlerF
* @return a URLStreamHandler for the jndi protocol, or null if the
* protocol is not JNDI
*/
+@Override
public URLStreamHandler createURLStreamHandler(String protocol) {
if (protocol.equals("jndi")) {
return new DirContextURLStreamHandler();
-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
Re: Tagging JK 1.2.31
On 21.10.2010 18:05, Mladen Turk wrote: On 10/21/2010 05:58 PM, Rainer Jung wrote: On 21.10.2010 17:47, Igor Galić wrote: tags are cheap (: I know that slogan, but from a users perspective I think "missing" versions are always strange. It's OK if it happens every now and then but it give a very strange feeling, if a lot of versions are not released. ++1 The entire release process (probably for all Tomcat) should be made with the presumption that RM's proposals are just that: *the proposal* Nothing else, nothing more. Think Mark is already using p.a.o for that, and I plan to do the same. Before we were using tomcat.apache.org/dev/dist and this should be axed completely. I don't think that was Mark's intention. I would expect him to increase the version number each time a vote fails and a change in svn is needed before rerolling. Whether the tarbals are retrieved via /dev/dist or p.a.o seems not relevant to me. So I understand, that you also do not want to burn numbers, but how to do that seems not yet consistent. I will commit a small change to the release script, that will add the svn revision number to the end of JK_EXPOSED_VERSION. For me that is sufficient. If you want to roll with the script from an RC tag but still use a non-rc file name for the tarball, the script will need some adjustments. Regards, Rainer - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
svn commit: r1026064 - /tomcat/jk/trunk/native/common/jk_version.h
Author: rjung Date: Thu Oct 21 16:52:56 2010 New Revision: 1026064 URL: http://svn.apache.org/viewvc?rev=1026064&view=rev Log: Add svn revision to the end of the exposed version. The exposed version is only used during startup logging and in the jk status display. The revision in the jk_version.h file is not necessarily that of the last change to jk. If the jk release script is used, it will update the info. Modified: tomcat/jk/trunk/native/common/jk_version.h Modified: tomcat/jk/trunk/native/common/jk_version.h URL: http://svn.apache.org/viewvc/tomcat/jk/trunk/native/common/jk_version.h?rev=1026064&r1=1026063&r2=1026064&view=diff == --- tomcat/jk/trunk/native/common/jk_version.h (original) +++ tomcat/jk/trunk/native/common/jk_version.h Thu Oct 21 16:52:56 2010 @@ -37,7 +37,7 @@ #define JK_VERRC0 #define JK_RCSTRING "0" /* Source Control Revision as a suffix, e.g. "-r12345" */ -#define JK_REVISION "" +#define JK_REVISION "$Revision$" /** END OF AREA TO MODIFY BEFORE RELEASING */ @@ -65,7 +65,7 @@ #if (JK_VERRC != 0) #define JK_EXPOSED_VERSION JK_EXPOSED_VERSION_INT "-rc-" JK_RCSTRING #elif (JK_VERISRELEASE == 1) -#define JK_EXPOSED_VERSION JK_EXPOSED_VERSION_INT +#define JK_EXPOSED_VERSION JK_EXPOSED_VERSION_INT JK_REVISION #else #define JK_EXPOSED_VERSION JK_EXPOSED_VERSION_INT "-dev" JK_REVISION #endif - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
DO NOT REPLY [Bug 50140] New: Silent installation into wrong target directory
https://issues.apache.org/bugzilla/show_bug.cgi?id=50140 Summary: Silent installation into wrong target directory Product: Tomcat 6 Version: 6.0.26 Platform: PC Status: NEW Severity: normal Priority: P2 Component: Native:Packaging AssignedTo: dev@tomcat.apache.org ReportedBy: m...@3ds.com Incorrect silent installation on Windows 2008 Enterprise: Command: apachetomcat-6.0.26.exe /S /D=c:\tomcat Tomcat files are copied to "c:\Program Files" instead of "c:\tomcat" The installation works fine on Windows XP and Windows 2003 Server systems. -- 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: r1026067 - /tomcat/jk/trunk/tools/jkrelease.sh
Author: rjung
Date: Thu Oct 21 16:57:58 2010
New Revision: 1026067
URL: http://svn.apache.org/viewvc?rev=1026067&view=rev
Log:
Replace JK_REVISION in jk_version.h by the actual
revision of the whole tree when the tar is rolled.
Also do it for release bundles. For those we don't
add the revision to the artefact names, we only add
it to the end of the JK_EXPOSED_VERSION.
Modified:
tomcat/jk/trunk/tools/jkrelease.sh
Modified: tomcat/jk/trunk/tools/jkrelease.sh
URL:
http://svn.apache.org/viewvc/tomcat/jk/trunk/tools/jkrelease.sh?rev=1026067&r1=1026066&r2=1026067&view=diff
==
--- tomcat/jk/trunk/tools/jkrelease.sh (original)
+++ tomcat/jk/trunk/tools/jkrelease.sh Thu Oct 21 16:57:58 2010
@@ -132,8 +132,8 @@ then
echo "No Revision found at '$JK_SVN_URL'"
exit 3
fi
-JK_SUFFIX=${JK_REV}
-JK_DIST=${JK_CVST}-${tag}-dev-${JK_SUFFIX}-src
+JK_SUFFIX=-${JK_REV}
+JK_DIST=${JK_CVST}-${tag}-dev${JK_SUFFIX}-src
elif [ -n "$branch" ]
then
JK_BRANCH=`echo $branch | sed -e 's#/#__#g'`
@@ -144,8 +144,8 @@ then
echo "No Revision found at '$JK_SVN_URL'"
exit 3
fi
-JK_SUFFIX=${JK_BRANCH}-${JK_REV}
-JK_DIST=${JK_CVST}-${tag}-dev-${JK_SUFFIX}-src
+JK_SUFFIX=-${JK_BRANCH}-${JK_REV}
+JK_DIST=${JK_CVST}-${tag}-dev${JK_SUFFIX}-src
elif [ -n "$local_dir" ]
then
JK_SVN_URL="$local_dir"
@@ -155,13 +155,14 @@ then
echo "No Revision found at '$JK_SVN_URL'"
exit 3
fi
-JK_SUFFIX=local-`date +%Y%m%d%H%M%S`-${JK_REV}
-JK_DIST=${JK_CVST}-${tag}-dev-${JK_SUFFIX}-src
+JK_SUFFIX=-local-`date +%Y%m%d%H%M%S`-${JK_REV}
+JK_DIST=${JK_CVST}-${tag}-dev${JK_SUFFIX}-src
else
JK_VER=$tag
JK_TAG=`echo $tag | sed -e 's#^#JK_#' -e 's#\.#_#g'`
JK_SVN_URL="${SVNROOT}/${SVNPROJ}/tags/${JK_TAG}"
-JK_SUFFIX=''
+JK_REV=`svn info $revision ${JK_SVN_URL} | awk '$1 == "Revision:" {print
$2}'`
+JK_SUFFIX=" ($JK_REV)"
JK_DIST=${JK_CVST}-${JK_VER}-src
fi
@@ -190,7 +191,7 @@ cd ../../..
# Update version information
file=${JK_DIST}.tmp/jk/native/common/jk_version.h
cp -p $file $file.orig
-sed -e 's/^#define JK_REVISION .*/#define JK_REVISION "-'$JK_SUFFIX'"/' \
+sed -e 's/^#define JK_REVISION .*/#define JK_REVISION "'"$JK_SUFFIX"'"/' \
$file.orig > $file
rm $file.orig
-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
Re: Tagging JK 1.2.31
On 10/21/2010 06:44 PM, Rainer Jung wrote: On 21.10.2010 18:05, Mladen Turk wrote: > I will commit a small change to the release script, that will add the svn revision number to the end of JK_EXPOSED_VERSION. For me that is sufficient. And this would mean that this cannot be used as a release? So another run, another vote, even if it works perfectly. What a waste of time. Won't do it. IMHO we are just complicating something so simple. Regards -- ^TM - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
Re: svn commit: r1026064 - /tomcat/jk/trunk/native/common/jk_version.h
On 10/21/2010 06:52 PM, rj...@apache.org wrote: Author: rjung /* Source Control Revision as a suffix, e.g. "-r12345" */ -#define JK_REVISION "" +#define JK_REVISION "$Revision$" /** END OF AREA TO MODIFY BEFORE RELEASING */ @@ -65,7 +65,7 @@ #if (JK_VERRC != 0) #define JK_EXPOSED_VERSION JK_EXPOSED_VERSION_INT "-rc-" JK_RCSTRING #elif (JK_VERISRELEASE == 1) -#define JK_EXPOSED_VERSION JK_EXPOSED_VERSION_INT +#define JK_EXPOSED_VERSION JK_EXPOSED_VERSION_INT JK_REVISION It means that we won't have jk-1.2.31 but jk-1.2.31-rSomething even for a release? Please. Regards -- ^TM - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
DO NOT REPLY [Bug 50140] Silent installation into wrong target directory
https://issues.apache.org/bugzilla/show_bug.cgi?id=50140 Mark Thomas changed: What|Removed |Added Status|NEW |RESOLVED Resolution||INVALID OS/Version||All --- Comment #1 from Mark Thomas 2010-10-21 14:01:47 EDT --- That feature is provided directly by the NSIS installer. I checked the NSIS bug tracker but couldn't find anything that looked like this issue. You might want to test with 6.0.29 since that uses a slightly later version of the installer. -- 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: svn commit: r1026064 - /tomcat/jk/trunk/native/common/jk_version.h
On 10/21/2010 06:52 PM, rj...@apache.org wrote: Author: rjung -#define JK_EXPOSED_VERSION JK_EXPOSED_VERSION_INT +#define JK_EXPOSED_VERSION JK_EXPOSED_VERSION_INT JK_REVISION Ok, it seems I have to do it officially, so here it is: -1 veto Please revert adding this to the exposed version. (or at least make it compile time definable) This gives Server: Apache/2.2.3 (Red Hat) mod_jk/1.2.31$Revision: 1026064 $ for a production server! What a mess I started with a simple release proposal :( Regards -- ^TM - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
Re: Tagging JK 1.2.31
On 21.10.2010 19:05, Mladen Turk wrote: On 10/21/2010 06:44 PM, Rainer Jung wrote: On 21.10.2010 18:05, Mladen Turk wrote: > I will commit a small change to the release script, that will add the svn revision number to the end of JK_EXPOSED_VERSION. For me that is sufficient. And this would mean that this cannot be used as a release? So another run, another vote, even if it works perfectly. What a waste of time. Won't do it. No, that's exactly what I want to prevent. I want to make it possible to *not* do another vote, *but* in case we have to do another RC be able to later find out where code in the wild came from. Adding to the EXPOSED version does not add anything to the names of files etc. It is meant to be used only during init logging. That's all. IMHO we are just complicating something so simple. I try to find a good solution. Your observation, that JK_EXPOSED_VERSION is also used when adding the version as a suffix to the apache version will be fixed soon. Also of course it was not intended to add "$Revision: xyz $". I intended to add " (xyz)" and will fix it like that. What do you not like about it? Regards, Rainer - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
Re: svn commit: r1026064 - /tomcat/jk/trunk/native/common/jk_version.h
On 21.10.2010 19:12, Mladen Turk wrote: On 10/21/2010 06:52 PM, rj...@apache.org wrote: Author: rjung /* Source Control Revision as a suffix, e.g. "-r12345" */ -#define JK_REVISION "" +#define JK_REVISION "$Revision$" /** END OF AREA TO MODIFY BEFORE RELEASING */ @@ -65,7 +65,7 @@ #if (JK_VERRC != 0) #define JK_EXPOSED_VERSION JK_EXPOSED_VERSION_INT "-rc-" JK_RCSTRING #elif (JK_VERISRELEASE == 1) -#define JK_EXPOSED_VERSION JK_EXPOSED_VERSION_INT +#define JK_EXPOSED_VERSION JK_EXPOSED_VERSION_INT JK_REVISION It means that we won't have jk-1.2.31 but jk-1.2.31-rSomething even for a release? You mean "It means we won't have?" or "It means we will have?" Guess it's a typo. Please. It is intended as "1.2.31 (xyz)" where xyz is the numeric revision. Why not? It doesn't find its way into the tarball names etc. Regards, Rainer - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
Re: svn commit: r1026064 - /tomcat/jk/trunk/native/common/jk_version.h
On 21.10.2010 20:01, Mladen Turk wrote: On 10/21/2010 06:52 PM, rj...@apache.org wrote: Author: rjung -#define JK_EXPOSED_VERSION JK_EXPOSED_VERSION_INT +#define JK_EXPOSED_VERSION JK_EXPOSED_VERSION_INT JK_REVISION Ok, it seems I have to do it officially, so here it is: -1 veto Please revert adding this to the exposed version. (or at least make it compile time definable) Why? Technical reason? - I do not plan to keep it in this broken format, instead adding " (xyz)" at the end - there will be a difference between the version added at the end of the internal version string of Apache (o suffix) and the one logged during init (with suffix) This gives Server: Apache/2.2.3 (Red Hat) mod_jk/1.2.31$Revision: 1026064 $ for a production server! See above. Regards, Rainer - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
Re: svn commit: r1026064 - /tomcat/jk/trunk/native/common/jk_version.h
On 21/10/2010 20:33, Rainer Jung wrote: On 21.10.2010 19:12, Mladen Turk wrote: It means that we won't have jk-1.2.31 but jk-1.2.31-rSomething even for a release? You mean "It means we won't have?" or "It means we will have?" Guess it's a typo. Well, I meant we wont have just mod_jk-1.2.31 but rather something like mod_jk-1.2.31$Revision: 123456789 $ Please. It is intended as "1.2.31 (xyz)" where xyz is the numeric revision. First it doesn't look like that. Second, what does it mean from the users point of view. Why not? It doesn't find its way into the tarball names etc. But it does on ServerTokens full, in the logs, etc... This is a real mess. Again I really see what is the *problem* you are trying to solve? It's a complete mistery for me. Regards -- ^TM - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
svn commit: r1026100 - in /tomcat/jk/trunk/native: apache-1.3/mod_jk.c apache-2.0/mod_jk.c common/jk_status.c common/jk_version.h iis/jk_isapi_plugin.c netscape/jk_nsapi_plugin.c
Author: rjung
Date: Thu Oct 21 18:53:41 2010
New Revision: 1026100
URL: http://svn.apache.org/viewvc?rev=1026100&view=rev
Log:
Remove revision from JK_EXPOSED_VERSION.
New define JK_FULL_EXPOSED_VERSION contains
the revision number, but only if release
script is used. Keyword substitution doesn't
work, because svn doesn't allow to retrieve
the revision number without any decoration.
The new JK_FULL_EXPOSED_VERSION is used during
init/startup/shutdown logging, not for the short
version numbers.
Modified:
tomcat/jk/trunk/native/apache-1.3/mod_jk.c
tomcat/jk/trunk/native/apache-2.0/mod_jk.c
tomcat/jk/trunk/native/common/jk_status.c
tomcat/jk/trunk/native/common/jk_version.h
tomcat/jk/trunk/native/iis/jk_isapi_plugin.c
tomcat/jk/trunk/native/netscape/jk_nsapi_plugin.c
Modified: tomcat/jk/trunk/native/apache-1.3/mod_jk.c
URL:
http://svn.apache.org/viewvc/tomcat/jk/trunk/native/apache-1.3/mod_jk.c?rev=1026100&r1=1026099&r2=1026100&view=diff
==
--- tomcat/jk/trunk/native/apache-1.3/mod_jk.c (original)
+++ tomcat/jk/trunk/native/apache-1.3/mod_jk.c Thu Oct 21 18:53:41 2010
@@ -2902,7 +2902,7 @@ static void jk_init(server_rec * s, ap_p
#endif
jk_log(conf->log, JK_LOG_INFO,
"%s initialized",
- JK_EXPOSED_VERSION);
+ JK_FULL_EXPOSED_VERSION);
}
else {
jk_error_exit(APLOG_MARK, APLOG_EMERG | APLOG_NOERRNO, s, p,
Modified: tomcat/jk/trunk/native/apache-2.0/mod_jk.c
URL:
http://svn.apache.org/viewvc/tomcat/jk/trunk/native/apache-2.0/mod_jk.c?rev=1026100&r1=1026099&r2=1026100&view=diff
==
--- tomcat/jk/trunk/native/apache-2.0/mod_jk.c (original)
+++ tomcat/jk/trunk/native/apache-2.0/mod_jk.c Thu Oct 21 18:53:41 2010
@@ -3079,7 +3079,7 @@ static void jk_child_init(apr_pool_t * p
jk_shm_name(), rc);
if (JK_IS_DEBUG_LEVEL(conf->log))
-jk_log(conf->log, JK_LOG_DEBUG, "Initialized %s", JK_EXPOSED_VERSION);
+jk_log(conf->log, JK_LOG_DEBUG, "Initialized %s",
JK_FULL_EXPOSED_VERSION);
JK_TRACE_EXIT(conf->log);
}
@@ -3197,7 +3197,7 @@ static int init_jk(apr_pool_t * pconf, j
ap_add_version_component(pconf, JK_EXPOSED_VERSION);
jk_log(conf->log, JK_LOG_INFO,
"%s initialized",
- JK_EXPOSED_VERSION);
+ JK_FULL_EXPOSED_VERSION);
}
else {
ap_log_error(APLOG_MARK, APLOG_EMERG, 0, s,
Modified: tomcat/jk/trunk/native/common/jk_status.c
URL:
http://svn.apache.org/viewvc/tomcat/jk/trunk/native/common/jk_status.c?rev=1026100&r1=1026099&r2=1026100&view=diff
==
--- tomcat/jk/trunk/native/common/jk_status.c (original)
+++ tomcat/jk/trunk/native/common/jk_status.c Thu Oct 21 18:53:41 2010
@@ -4682,7 +4682,7 @@ static int JK_METHOD service(jk_endpoint
}
jk_print_xml_start_elt(s, w, 0, 0, "software");
jk_print_xml_att_string(s, 2, "web_server",
s->server_software);
-jk_print_xml_att_string(s, 2, "jk_version",
JK_EXPOSED_VERSION);
+jk_print_xml_att_string(s, 2, "jk_version",
JK_FULL_EXPOSED_VERSION);
jk_print_xml_stop_elt(s, 0, 1);
}
if (cmd == JK_STATUS_CMD_LIST) {
@@ -4713,7 +4713,7 @@ static int JK_METHOD service(jk_endpoint
}
jk_puts(s, "Software:");
jk_printf(s, " web_server=\"%s\"", s->server_software);
-jk_printf(s, " jk_version=%s", JK_EXPOSED_VERSION);
+jk_printf(s, " jk_version=%s", JK_FULL_EXPOSED_VERSION);
jk_puts(s, "\n");
}
if (cmd == JK_STATUS_CMD_LIST) {
@@ -4739,7 +4739,7 @@ static int JK_METHOD service(jk_endpoint
jk_print_prop_att_long(s, w, NULL, "time_unix",
unix_seconds);
}
jk_print_prop_att_string(s, w, NULL, "web_server",
s->server_software);
-jk_print_prop_att_string(s, w, NULL, "jk_version",
JK_EXPOSED_VERSION);
+jk_print_prop_att_string(s, w, NULL, "jk_version",
JK_FULL_EXPOSED_VERSION);
}
if (cmd == JK_STATUS_CMD_LIST) {
/* Step 2: Display configuration */
@@ -4780,7 +4780,7 @@ static int JK_METHOD service(jk_endpoint
}
jk_puts(s, "\n");
jk_putv(s, "JK Version:",
-JK_EXPOSED_VERSION, "", NULL);
+JK_FULL_EXPOSED_VERSION, "",
NULL);
jk_printf(s, "Unix Seconds:%d", unix_seconds);
jk_puts(s, "\n\n");
}
Modified: tomc
[PROPOSAL] Parallel deployment
All, As most of you are probably aware I work for SpringSource and SpringSource has an application server product - tc Server - that is heavily based on Apache Tomcat. When talking to prospective clients about tc Server, one of the things we often hear is "WebSphere/WebLogic has XYZ feature - does tc Server?" and one of those features is parallel deployment. Parallel deployment is essentially having two (or more) versions of the same application deployed side-by-side. Users with a session in an older version, will continue to use that older version until the session expires. Users without a session, or whose session expires, will use the latest version. Once there are no sessions using the older version it is undeployed. All versions of the application have the same context path so the transition is seamless to the users. Having looked at some implementation options, it quickly became apparent that Tomcat was the right place to implement this rather than as an 'add-on' in tc Server. I have managed to convince senior management that contributing an implementation of parallel deployment to the ASF is the way to go. I currently have a hacked together implementation [1] that works but is very ugly in places under the covers and there is still some significant work to go before it is robust enough to be put into trunk (it changes the mapper and that is an area I think we need to be very careful). A lot of the patch is dealing with the issues around the fact that we currently treat Context.getPath() and Context.getName() as the same thing but with parallel deployment these need to be treated differently. My proposal is therefore: - start committing some of the getPath() / getName() clean-up to trunk along with some of the other hooks - like adding a version attribute to Context that should be minimal risk - continue testing the current patch (e.g. with clustering) and modify as required - discuss the implementation details (like the file naming convention used) on the dev list - decide once we can see the patch without the clean-up if it is safe for 7.0.x or needs to be held back for 7.1.x Depending on how big this patch ends up looking then creating a branch for this work may make sense. I'd like to hold off creating a branch for a few days until the clean-up changes have been made to trunk so the branch can focus on the diffs required for the new feature. As always, any and all feedback welcome. Mark [1] http://people.apache.org/~markt/patches/2010-10-21-parallel-deployment.patch - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
Re: svn commit: r1026064 - /tomcat/jk/trunk/native/common/jk_version.h
On 21/10/2010 20:36, Rainer Jung wrote: On 21.10.2010 20:01, Mladen Turk wrote: On 10/21/2010 06:52 PM, rj...@apache.org wrote: Author: rjung -#define JK_EXPOSED_VERSION JK_EXPOSED_VERSION_INT +#define JK_EXPOSED_VERSION JK_EXPOSED_VERSION_INT JK_REVISION Ok, it seems I have to do it officially, so here it is: -1 veto Please revert adding this to the exposed version. (or at least make it compile time definable) Why? Technical reason? Technical? none. However it looks like some test version with ServerTokens - I do not plan to keep it in this broken format, instead adding " (xyz)" at the end But why? What is your technical reason for adding it? We have *version* already. Adding extra crap at the end is just ... - there will be a difference between the version added at the end of the internal version string of Apache (o suffix) and the one logged during init (with suffix) Don get this line Regards -- ^TM - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
Re: svn commit: r1026100 - in /tomcat/jk/trunk/native: apache-1.3/mod_jk.c apache-2.0/mod_jk.c common/jk_status.c common/jk_version.h iis/jk_isapi_plugin.c netscape/jk_nsapi_plugin.c
On 21/10/2010 20:53, rj...@apache.org wrote: Author: rjung The new JK_FULL_EXPOSED_VERSION is used during init/startup/shutdown logging, not for the short version numbers. Ok that makes more sense, although I still don't get the what's the point and the *problem* you had to solve with adding that. Regards -- ^TM - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
Re: svn commit: r1026064 - /tomcat/jk/trunk/native/common/jk_version.h
On 21.10.2010 20:50, Mladen Turk wrote: On 21/10/2010 20:33, Rainer Jung wrote: On 21.10.2010 19:12, Mladen Turk wrote: It means that we won't have jk-1.2.31 but jk-1.2.31-rSomething even for a release? You mean "It means we won't have?" or "It means we will have?" Guess it's a typo. Well, I meant we wont have just mod_jk-1.2.31 but rather something like mod_jk-1.2.31$Revision: 123456789 $ Please. It is intended as "1.2.31 (xyz)" where xyz is the numeric revision. First it doesn't look like that. Second, what does it mean from the users point of view. Why not? It doesn't find its way into the tarball names etc. But it does on ServerTokens full, in the logs, etc... Agreed for ServerTokens (not nice), but for logs I like it because of the reason given earlier today and repeated below. This is a real mess. Again I really see what is the *problem* you are trying to solve? It's a complete mistery for me. I wrote: "My point is: once we circulate something, it should be clearly distinguishable from anything else we start to circulate. If the RC doesn't contain in it any indication of RC, you will never be able to tell, whether someone is using an RC1, RC2 or final release. All of them will identify itself as 1.2.31." Sebb wrote: "If you wish to distinguish the contents, then one possible solution is to include the SVN revision somewhere in the code. That would be useful anyway." and I liked the idea. I wrote "Would you oppose, if I find a simple way of adding the revision number to the exposed version, like 1.2.31 (r1003456)" and you didn't reply :( I wrote "I want to make it possible to *not* do another vote, *but* in case we have to do another RC be able to later find out where code in the wild came from. Adding to the EXPOSED version does not add anything to the names of files etc. It is meant to be used only during init logging. That's all." OK? Rainer - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
Re: svn commit: r1026064 - /tomcat/jk/trunk/native/common/jk_version.h
On 10/21/2010 09:16 PM, Rainer Jung wrote: On 21.10.2010 20:50, Mladen Turk wrote: OK? OK :) Let's put this to the end. Regards -- ^TM - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
svn commit: r1026111 - /tomcat/jk/trunk/native/common/jk_connect.c
Author: rjung
Date: Thu Oct 21 19:30:57 2010
New Revision: 1026111
URL: http://svn.apache.org/viewvc?rev=1026111&view=rev
Log:
Fix Netware runtime error.
Patch provided by Guenter Knauf.
Modified:
tomcat/jk/trunk/native/common/jk_connect.c
Modified: tomcat/jk/trunk/native/common/jk_connect.c
URL:
http://svn.apache.org/viewvc/tomcat/jk/trunk/native/common/jk_connect.c?rev=1026111&r1=1026110&r2=1026111&view=diff
==
--- tomcat/jk/trunk/native/common/jk_connect.c (original)
+++ tomcat/jk/trunk/native/common/jk_connect.c Thu Oct 21 19:30:57 2010
@@ -55,6 +55,10 @@ static apr_pool_t *jk_apr_pool = NULL;
#define JK_GET_SOCKET_ERRNO() ((void)0)
#endif /* WIN32 */
+#if defined(NETWARE) && defined(__NOVELL_LIBC__)
+#define USE_SOCK_CLOEXEC
+#endif
+
/* our compiler cant deal with char* <-> const char* ... */
#if defined(NETWARE) && !defined(__NOVELL_LIBC__)
typedef char* SET_TYPE;
@@ -71,7 +75,13 @@ typedef const char* SET_TYPE;
static int soblock(jk_sock_t sd)
{
/* BeOS uses setsockopt at present for non blocking... */
-#ifndef WIN32
+#if defined (WIN32) || (defined(NETWARE) && defined(__NOVELL_LIBC__))
+u_long on = 0;
+if (JK_IS_SOCKET_ERROR(ioctlsocket(sd, FIONBIO, &on))) {
+JK_GET_SOCKET_ERRNO();
+return errno;
+}
+#else
int fd_flags;
fd_flags = fcntl(sd, F_GETFL, 0);
@@ -87,13 +97,7 @@ static int soblock(jk_sock_t sd)
if (fcntl(sd, F_SETFL, fd_flags) == -1) {
return errno;
}
-#else
-u_long on = 0;
-if (JK_IS_SOCKET_ERROR(ioctlsocket(sd, FIONBIO, &on))) {
-JK_GET_SOCKET_ERRNO();
-return errno;
-}
-#endif /* WIN32 */
+#endif /* WIN32 || (NETWARE && __NOVELL_LIBC__) */
return 0;
}
@@ -105,7 +109,13 @@ static int soblock(jk_sock_t sd)
*/
static int sononblock(jk_sock_t sd)
{
-#ifndef WIN32
+#if defined (WIN32) || (defined(NETWARE) && defined(__NOVELL_LIBC__))
+u_long on = 1;
+if (JK_IS_SOCKET_ERROR(ioctlsocket(sd, FIONBIO, &on))) {
+JK_GET_SOCKET_ERRNO();
+return errno;
+}
+#else
int fd_flags;
fd_flags = fcntl(sd, F_GETFL, 0);
@@ -121,13 +131,7 @@ static int sononblock(jk_sock_t sd)
if (fcntl(sd, F_SETFL, fd_flags) == -1) {
return errno;
}
-#else
-u_long on = 1;
-if (JK_IS_SOCKET_ERROR(ioctlsocket(sd, FIONBIO, &on))) {
-JK_GET_SOCKET_ERRNO();
-return errno;
-}
-#endif /* WIN32 */
+#endif /* WIN32 || (NETWARE && __NOVELL_LIBC__) */
return 0;
}
-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
Re: [PROPOSAL] Parallel deployment
I discovered this feature a while ago in Weblogic and I found this interesting. But as I always had classloader leaks, I had to restart the JVM anyway so that it defeated the purpose of the feature and I gave up dreaming of zero-downtime deployments. Now with tomcat memory leak protection features, this deployment option might be once again very interesting. Though I can see how this can be done for a standalone tomcat instance, how do you plan to do with clustered sessions ? Should the old version of the application wait for all sessions in the cluster to expire ? Sylvain On 21 oct. 2010, at 20:52, Mark Thomas wrote: > All, > > As most of you are probably aware I work for SpringSource and > SpringSource has an application server product - tc Server - that is > heavily based on Apache Tomcat. When talking to prospective clients > about tc Server, one of the things we often hear is "WebSphere/WebLogic > has XYZ feature - does tc Server?" and one of those features is parallel > deployment. > > Parallel deployment is essentially having two (or more) versions of the > same application deployed side-by-side. Users with a session in an older > version, will continue to use that older version until the session > expires. Users without a session, or whose session expires, will use the > latest version. Once there are no sessions using the older version it is > undeployed. All versions of the application have the same context path > so the transition is seamless to the users. > > Having looked at some implementation options, it quickly became apparent > that Tomcat was the right place to implement this rather than as an > 'add-on' in tc Server. I have managed to convince senior management > that contributing an implementation of parallel deployment to the ASF is > the way to go. I currently have a hacked together implementation [1] > that works but is very ugly in places under the covers and there is > still some significant work to go before it is robust enough to be put > into trunk (it changes the mapper and that is an area I think we need to > be very careful). > > A lot of the patch is dealing with the issues around the fact that we > currently treat Context.getPath() and Context.getName() as the same > thing but with parallel deployment these need to be treated differently. > My proposal is therefore: > > - start committing some of the getPath() / getName() clean-up to trunk > along with some of the other hooks - like adding a version attribute to > Context that should be minimal risk > - continue testing the current patch (e.g. with clustering) and modify > as required > - discuss the implementation details (like the file naming convention > used) on the dev list > - decide once we can see the patch without the clean-up if it is safe > for 7.0.x or needs to be held back for 7.1.x > > Depending on how big this patch ends up looking then creating a branch > for this work may make sense. I'd like to hold off creating a branch for > a few days until the clean-up changes have been made to trunk so the > branch can focus on the diffs required for the new feature. > > As always, any and all feedback welcome. > > Mark > > [1] > http://people.apache.org/~markt/patches/2010-10-21-parallel-deployment.patch > > > > - > 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: r1026119 - /tomcat/jk/trunk/xdocs/miscellaneous/changelog.xml
Author: rjung Date: Thu Oct 21 19:53:34 2010 New Revision: 1026119 URL: http://svn.apache.org/viewvc?rev=1026119&view=rev Log: Update changelog. Modified: tomcat/jk/trunk/xdocs/miscellaneous/changelog.xml Modified: tomcat/jk/trunk/xdocs/miscellaneous/changelog.xml URL: http://svn.apache.org/viewvc/tomcat/jk/trunk/xdocs/miscellaneous/changelog.xml?rev=1026119&r1=1026118&r2=1026119&view=diff == --- tomcat/jk/trunk/xdocs/miscellaneous/changelog.xml (original) +++ tomcat/jk/trunk/xdocs/miscellaneous/changelog.xml Thu Oct 21 19:53:34 2010 @@ -56,6 +56,9 @@ section allowing other threads to use the connection pool during maintenance. (mturk) + +Common: Add svn revision to init log message. (rjung) + Common: Don't destroy errno during trace logging. (rjung) - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
Re: svn commit: r1026064 - /tomcat/jk/trunk/native/common/jk_version.h
On 21.10.2010 21:21, Mladen Turk wrote: On 10/21/2010 09:16 PM, Rainer Jung wrote: On 21.10.2010 20:50, Mladen Turk wrote: OK? OK :) Let's put this to the end. Peace. I hope it works now as expected. Do you have anything to add to the changelog? Regards, Rainer - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
svn commit: r1026132 - /tomcat/jk/trunk/tools/jkrelease.sh
Author: rjung
Date: Thu Oct 21 20:38:51 2010
New Revision: 1026132
URL: http://svn.apache.org/viewvc?rev=1026132&view=rev
Log:
Allow to release from a tag that does not
conform to the format JK_MAJOR_MIDDLE_MINOR.
- changed version number flag from "-t" to "-v".
This is the version that is used inside the
tarball name etc.
By default it is also used to retrieve from
the right tag.
- new optional flag "-t" allows to additionally
provide the name of a non-standard tag from
which to roll the version.
Example: -v 1.2.31 -t JK_1_2_31_RC_1
The given tag is checked, whether it is equal to
the default tag plus suffix. If not the script
barks. If you are sure about using a really
strange tag, force with "-f".
Modified:
tomcat/jk/trunk/tools/jkrelease.sh
Modified: tomcat/jk/trunk/tools/jkrelease.sh
URL:
http://svn.apache.org/viewvc/tomcat/jk/trunk/tools/jkrelease.sh?rev=1026132&r1=1026131&r2=1026132&view=diff
==
--- tomcat/jk/trunk/tools/jkrelease.sh (original)
+++ tomcat/jk/trunk/tools/jkrelease.sh Thu Oct 21 20:38:51 2010
@@ -45,8 +45,10 @@ SIGN_OPTS=""
FUNCTIONS ##
usage() {
-echo "Usage:: $0 -t VERSION [-r revision] [-b BRANCH | -T | -d DIR]"
-echo "-t: version to package"
+echo "Usage:: $0 -v VERSION [-f] [-r revision] [-t tag | -b BRANCH | -T |
-d DIR]"
+echo "-v: version to package"
+echo "-f: force, do not validate tag against version"
+echo "-t: tag to use if different from version"
echo "-r: revision to package"
echo "-b: package from branch BRANCH"
echo "-T: package from trunk"
@@ -70,10 +72,12 @@ copy_files() {
MAIN ##
conflict=0
-while getopts :t:r:b:d:p:T c
+while getopts :v:t:r:b:d:p:Tf c
do
case $c in
-t) tag=$OPTARG;;
+v) version=$OPTARG;;
+t) tag=$OPTARG
+ conflict=$(($conflict+1));;
r) revision=$OPTARG;;
p) SIGN_OPTS="--passphrase=$OPTARG";;
b) branch=$OPTARG
@@ -82,6 +86,7 @@ do
conflict=$(($conflict+1));;
d) local_dir=$OPTARG
conflict=$(($conflict+1));;
+f) force='y';;
\:)usage
exit 2;;
\?)usage
@@ -93,7 +98,7 @@ shift `expr $OPTIND - 1`
if [ $conflict -gt 1 ]
then
usage
-echo "Only one of the options '-b', '-T' and '-d' is allowed."
+echo "Only one of the options '-t', '-b', '-T' and '-d' is allowed."
exit 2
fi
@@ -114,7 +119,7 @@ then
fi
fi
-if [ -z "$tag" ]
+if [ -z "$version" ]
then
usage
exit 2
@@ -158,8 +163,22 @@ then
JK_SUFFIX=-local-`date +%Y%m%d%H%M%S`-${JK_REV}
JK_DIST=${JK_CVST}-${tag}-dev${JK_SUFFIX}-src
else
-JK_VER=$tag
-JK_TAG=`echo $tag | sed -e 's#^#JK_#' -e 's#\.#_#g'`
+JK_VER=$version
+JK_TAG=`echo $version | sed -e 's#^#JK_#' -e 's#\.#_#g'`
+if [ -n $tag ]
+then
+if [ -z $force ]
+then
+echo $tag | grep "^$JK_TAG" > /dev/null 2>&1
+if [ $? -gt 0 ]
+then
+echo "Tag '$tag' doesn't belong to version '$version'."
+echo "Force using '-f' if you are sure."
+exit 5
+fi
+fi
+JK_TAG=$tag
+fi
JK_SVN_URL="${SVNROOT}/${SVNPROJ}/tags/${JK_TAG}"
JK_REV=`svn info $revision ${JK_SVN_URL} | awk '$1 == "Revision:" {print
$2}'`
JK_SUFFIX=" ($JK_REV)"
-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
svn commit: r1026133 - /tomcat/jk/trunk/HOWTO-RELEASE.txt
Author: rjung
Date: Thu Oct 21 20:42:45 2010
New Revision: 1026133
URL: http://svn.apache.org/viewvc?rev=1026133&view=rev
Log:
Fix wrong subversion path in Howto.
Modified:
tomcat/jk/trunk/HOWTO-RELEASE.txt
Modified: tomcat/jk/trunk/HOWTO-RELEASE.txt
URL:
http://svn.apache.org/viewvc/tomcat/jk/trunk/HOWTO-RELEASE.txt?rev=1026133&r1=1026132&r2=1026133&view=diff
==
--- tomcat/jk/trunk/HOWTO-RELEASE.txt (original)
+++ tomcat/jk/trunk/HOWTO-RELEASE.txt Thu Oct 21 20:42:45 2010
@@ -63,13 +63,13 @@ TAG=JK_{MAJOR_REVISION}_{MINOR_REVISION}
svn copy \
https://svn.apache.org/repos/asf/tomcat/jk/trunk/ \
- https://svn.apache.org/repos/asf/tomcat/jk/tags/jk1.2.x/TAG/
+ https://svn.apache.org/repos/asf/tomcat/jk/tags/TAG/
Here is an example for mod_jk 1.2.29
svn copy \
https://svn.apache.org/repos/asf/tomcat/jk/trunk/ \
- https://svn.apache.org/repos/asf/tomcat/jk/tags/jk1.2.x/JK_1.2.29/
+ https://svn.apache.org/repos/asf/tomcat/jk/tags/JK_1.2.29/
Build the mod_jk 1.2 documentation
--
-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
svn commit: r1026134 - /tomcat/jk/tags/JK_1.2.31_JUST_A_TEST/
Author: rjung Date: Thu Oct 21 20:43:45 2010 New Revision: 1026134 URL: http://svn.apache.org/viewvc?rev=1026134&view=rev Log: Just a test for the release script. Tag will be removed soon. Added: tomcat/jk/tags/JK_1.2.31_JUST_A_TEST/ - copied from r1026133, tomcat/jk/trunk/ - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
svn commit: r1026135 - /tomcat/jk/tags/JK_1.2.31_JUST_A_TEST/
Author: rjung Date: Thu Oct 21 20:45:46 2010 New Revision: 1026135 URL: http://svn.apache.org/viewvc?rev=1026135&view=rev Log: Remove test tag, another test needed. Removed: tomcat/jk/tags/JK_1.2.31_JUST_A_TEST/ - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
svn commit: r1026136 - /tomcat/jk/tags/JK_1_2_31_JUST_A_TEST/
Author: rjung Date: Thu Oct 21 20:46:21 2010 New Revision: 1026136 URL: http://svn.apache.org/viewvc?rev=1026136&view=rev Log: Just a test for the release script. Tag will be removed soon. Added: tomcat/jk/tags/JK_1_2_31_JUST_A_TEST/ - copied from r1026135, tomcat/jk/trunk/ - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
svn commit: r1026139 - /tomcat/jk/tags/JK_1_2_31_JUST_A_TEST/
Author: rjung Date: Thu Oct 21 20:58:38 2010 New Revision: 1026139 URL: http://svn.apache.org/viewvc?rev=1026139&view=rev Log: Test done. Removed: tomcat/jk/tags/JK_1_2_31_JUST_A_TEST/ - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
svn commit: r1026142 - /tomcat/jk/trunk/tools/jkrelease.sh
Author: rjung
Date: Thu Oct 21 21:02:24 2010
New Revision: 1026142
URL: http://svn.apache.org/viewvc?rev=1026142&view=rev
Log:
Add a little verbosity to release script.
Fix forgotten renames "tag" to "version".
Modified:
tomcat/jk/trunk/tools/jkrelease.sh
Modified: tomcat/jk/trunk/tools/jkrelease.sh
URL:
http://svn.apache.org/viewvc/tomcat/jk/trunk/tools/jkrelease.sh?rev=1026142&r1=1026141&r2=1026142&view=diff
==
--- tomcat/jk/trunk/tools/jkrelease.sh (original)
+++ tomcat/jk/trunk/tools/jkrelease.sh Thu Oct 21 21:02:24 2010
@@ -138,7 +138,7 @@ then
exit 3
fi
JK_SUFFIX=-${JK_REV}
-JK_DIST=${JK_CVST}-${tag}-dev${JK_SUFFIX}-src
+JK_DIST=${JK_CVST}-${version}-dev${JK_SUFFIX}-src
elif [ -n "$branch" ]
then
JK_BRANCH=`echo $branch | sed -e 's#/#__#g'`
@@ -150,7 +150,7 @@ then
exit 3
fi
JK_SUFFIX=-${JK_BRANCH}-${JK_REV}
-JK_DIST=${JK_CVST}-${tag}-dev${JK_SUFFIX}-src
+JK_DIST=${JK_CVST}-${version}-dev${JK_SUFFIX}-src
elif [ -n "$local_dir" ]
then
JK_SVN_URL="$local_dir"
@@ -161,7 +161,7 @@ then
exit 3
fi
JK_SUFFIX=-local-`date +%Y%m%d%H%M%S`-${JK_REV}
-JK_DIST=${JK_CVST}-${tag}-dev${JK_SUFFIX}-src
+JK_DIST=${JK_CVST}-${version}-dev${JK_SUFFIX}-src
else
JK_VER=$version
JK_TAG=`echo $version | sed -e 's#^#JK_#' -e 's#\.#_#g'`
@@ -185,6 +185,10 @@ else
JK_DIST=${JK_CVST}-${JK_VER}-src
fi
+echo "Using subversion URL: $JK_SVN_URL"
+echo "Rolling into file $JK_DIST.*"
+sleep 2
+
umask 022
rm -rf ${JK_DIST}
-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
Re: [PROPOSAL] Parallel deployment
On 21/10/2010 14:51, Sylvain Laurent wrote: > Though I can see how this can be done for a standalone tomcat instance, how > do you plan to do with clustered sessions ? Should the old version of the > application wait for all sessions in the cluster to expire ? TBD. I haven't looked at this at all yet. There are lots of ways to handle clean-up of older versions. My off-the-cuff idea is periodically poll the manager and see how many sessions are still active. When that hits 0, undelopy the app / stop the app / log a message / do nothing. Even in a cluster, every manager knows how many active sessions there are across the cluster. I haven't tested how this code behaves with a cluster yet. I plan to play with that next week. My suspicion is that there will be a handful of Context.getPath() vs. Context.getName() issues to fix and then it will just work. We'll see :) Mark - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
Changes to jk release script
To simplify Mladen's plan to use RCs for jk release, but not including the RC name in the tarballs I adjusted the jk release script a bit: - flag "-t" is now "-v" for "version" and works as before - new optional flag "-t" allows to explicitely give a tag from which to release in case the default tag is not the right one. The default tag is JK_MAJOR_MIDDLE_MINOR. So e.g. for using an RC1 for 1.2.31 one would do jkrelease.sh -v 1.2.31 -t JK_1_2_31_RC_1 or whatever the name of the tag was. For the default tag it would simply still be jkrelease.sh -v 1.2.31 The script checks, whether a given tag starts with the right version. If one chooses a really strange tag name, one can force its use with "-f". To be able to detect an unofficial RC out in the wild, the subversion revision number used for rolling the tarball will be logged as part of the startup log message in addition to the normal version. Regards, Rainer - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
Re: [PROPOSAL] Parallel deployment
On 21.10.2010 20:52, Mark Thomas wrote: All, As most of you are probably aware I work for SpringSource and SpringSource has an application server product - tc Server - that is heavily based on Apache Tomcat. When talking to prospective clients about tc Server, one of the things we often hear is "WebSphere/WebLogic has XYZ feature - does tc Server?" and one of those features is parallel deployment. Parallel deployment is essentially having two (or more) versions of the same application deployed side-by-side. Users with a session in an older version, will continue to use that older version until the session expires. Users without a session, or whose session expires, will use the latest version. Once there are no sessions using the older version it is undeployed. All versions of the application have the same context path so the transition is seamless to the users. Having looked at some implementation options, it quickly became apparent that Tomcat was the right place to implement this rather than as an 'add-on' in tc Server. I have managed to convince senior management that contributing an implementation of parallel deployment to the ASF is the way to go. I currently have a hacked together implementation [1] that works but is very ugly in places under the covers and there is still some significant work to go before it is robust enough to be put into trunk (it changes the mapper and that is an area I think we need to be very careful). A lot of the patch is dealing with the issues around the fact that we currently treat Context.getPath() and Context.getName() as the same thing but with parallel deployment these need to be treated differently. My proposal is therefore: - start committing some of the getPath() / getName() clean-up to trunk along with some of the other hooks - like adding a version attribute to Context that should be minimal risk - continue testing the current patch (e.g. with clustering) and modify as required - discuss the implementation details (like the file naming convention used) on the dev list - decide once we can see the patch without the clean-up if it is safe for 7.0.x or needs to be held back for 7.1.x Depending on how big this patch ends up looking then creating a branch for this work may make sense. I'd like to hold off creating a branch for a few days until the clean-up changes have been made to trunk so the branch can focus on the diffs required for the new feature. As always, any and all feedback welcome. Great initiative, good plan. Rainer - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
Re: [PROPOSAL] Parallel deployment
On 21.10.2010 23:11, Mark Thomas wrote: On 21/10/2010 14:51, Sylvain Laurent wrote: Though I can see how this can be done for a standalone tomcat instance, how do you plan to do with clustered sessions ? Should the old version of the application wait for all sessions in the cluster to expire ? TBD. I haven't looked at this at all yet. There are lots of ways to handle clean-up of older versions. My off-the-cuff idea is periodically poll the manager and see how many sessions are still active. When that hits 0, undelopy the app / stop the app / log a message / do nothing. Possibly plus manager webapp feature "unload this version now". Even in a cluster, every manager knows how many active sessions there are across the cluster. I haven't tested how this code behaves with a cluster yet. I plan to play with that next week. My suspicion is that there will be a handful of Context.getPath() vs. Context.getName() issues to fix and then it will just work. We'll see :) Yes, apart from code cleanup I also don't expect big problems. Possible small races like node A expired the last session exactly when the user hit another node B and the session message from B reaches A when the context was unloaded. But similar types of races even exist today. Regards, Rainer - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
svn commit: r1026150 - /tomcat/trunk/java/org/apache/naming/resources/FileDirContext.java
Author: markt
Date: Thu Oct 21 21:48:01 2010
New Revision: 1026150
URL: http://svn.apache.org/viewvc?rev=1026150&view=rev
Log:
Allow Checkstyle's unused imports test to be used with this class
Fix Eclipse warnings
Align modifyAttributes() with WARDirContext
Modified:
tomcat/trunk/java/org/apache/naming/resources/FileDirContext.java
Modified: tomcat/trunk/java/org/apache/naming/resources/FileDirContext.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/naming/resources/FileDirContext.java?rev=1026150&r1=1026149&r2=1026150&view=diff
==
--- tomcat/trunk/java/org/apache/naming/resources/FileDirContext.java (original)
+++ tomcat/trunk/java/org/apache/naming/resources/FileDirContext.java Thu Oct
21 21:48:01 2010
@@ -34,14 +34,9 @@ import javax.naming.NameClassPair;
import javax.naming.NameNotFoundException;
import javax.naming.NamingEnumeration;
import javax.naming.NamingException;
-import javax.naming.NotContextException;
import javax.naming.OperationNotSupportedException;
-import javax.naming.directory.AttributeModificationException;
import javax.naming.directory.Attributes;
import javax.naming.directory.DirContext;
-import javax.naming.directory.InvalidAttributesException;
-import javax.naming.directory.InvalidSearchControlsException;
-import javax.naming.directory.InvalidSearchFilterException;
import javax.naming.directory.ModificationItem;
import javax.naming.directory.SearchControls;
import javax.naming.directory.SearchResult;
@@ -359,8 +354,8 @@ public class FileDirContext extends Base
* @param name the name of the context to be destroyed; may not be empty
* @exception NameNotFoundException if an intermediate context does not
* exist
- * @exception NotContextException if the name is bound but does not name
- * a context, or does not name a context of the appropriate type
+ * @exception javax.naming.NotContextException if the name is bound but
does
+ * not name a context, or does not name a context of the appropriate type
*/
@Override
public void destroySubcontext(String name)
@@ -451,14 +446,14 @@ public class FileDirContext extends Base
* REPLACE_ATTRIBUTE, REMOVE_ATTRIBUTE
* @param attrs the attributes to be used for the modification; may not
* be null
- * @exception AttributeModificationException if the modification cannot be
- * completed successfully
+ * @exception javax.naming.directory.AttributeModificationException if the
+ * modification cannot be completed successfully
* @exception NamingException if a naming exception is encountered
*/
@Override
public void modifyAttributes(String name, int mod_op, Attributes attrs)
throws NamingException {
-
+throw new OperationNotSupportedException();
}
@@ -472,14 +467,14 @@ public class FileDirContext extends Base
* @param name the name of the object whose attributes will be updated
* @param mods an ordered sequence of modifications to be performed; may
* not be null
- * @exception AttributeModificationException if the modification cannot be
- * completed successfully
+ * @exception javax.naming.directory.AttributeModificationException if the
+ * modification cannot be completed successfully
* @exception NamingException if a naming exception is encountered
*/
@Override
public void modifyAttributes(String name, ModificationItem[] mods)
throws NamingException {
-
+throw new OperationNotSupportedException();
}
@@ -494,8 +489,8 @@ public class FileDirContext extends Base
* @param obj the object to bind; possibly null
* @param attrs the attributes to associate with the binding
* @exception NameAlreadyBoundException if name is already bound
- * @exception InvalidAttributesException if some "mandatory" attributes
- * of the binding are not supplied
+ * @exception javax.naming.directory.InvalidAttributesException if some
+ * "mandatory" attributes of the binding are not supplied
* @exception NamingException if a naming exception is encountered
*/
@Override
@@ -528,8 +523,8 @@ public class FileDirContext extends Base
* @param name the name to bind; may not be empty
* @param obj the object to bind; possibly null
* @param attrs the attributes to associate with the binding
- * @exception InvalidAttributesException if some "mandatory" attributes
- * of the binding are not supplied
+ * @exception javax.naming.directory.InvalidAttributesException if some
+ * "mandatory" attributes of the binding are not supplied
* @exception NamingException if a naming exception is encountered
*/
@Override
@@ -546,6 +541,7 @@ public class FileDirContext extends Base
try {
is = ((Resource) obj).streamContent();
} catch (IOExcept
svn commit: r1026152 - /tomcat/trunk/java/org/apache/naming/resources/jndi/Handler.java
Author: markt
Date: Thu Oct 21 21:53:09 2010
New Revision: 1026152
URL: http://svn.apache.org/viewvc?rev=1026152&view=rev
Log:
Clean-up
Modified:
tomcat/trunk/java/org/apache/naming/resources/jndi/Handler.java
Modified: tomcat/trunk/java/org/apache/naming/resources/jndi/Handler.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/naming/resources/jndi/Handler.java?rev=1026152&r1=1026151&r2=1026152&view=diff
==
--- tomcat/trunk/java/org/apache/naming/resources/jndi/Handler.java (original)
+++ tomcat/trunk/java/org/apache/naming/resources/jndi/Handler.java Thu Oct 21
21:53:09 2010
@@ -25,15 +25,9 @@ import org.apache.naming.resources.DirCo
* @author mailto:r...@apache.org";>Remy Maucherat
* @version $Revision$
*/
-public class Handler
-extends DirContextURLStreamHandler {
-
-
-// --- Constructors
-
+public class Handler extends DirContextURLStreamHandler {
public Handler() {
+// NOOP
}
-
-
}
-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
svn commit: r1026157 - /tomcat/trunk/java/org/apache/naming/resources/ProxyDirContext.java
Author: markt
Date: Thu Oct 21 22:09:45 2010
New Revision: 1026157
URL: http://svn.apache.org/viewvc?rev=1026157&view=rev
Log:
Allow Checkstyle's unused imports test to be used with this class
Fix Eclipse warnings
Modified:
tomcat/trunk/java/org/apache/naming/resources/ProxyDirContext.java
Modified: tomcat/trunk/java/org/apache/naming/resources/ProxyDirContext.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/naming/resources/ProxyDirContext.java?rev=1026157&r1=1026156&r2=1026157&view=diff
==
--- tomcat/trunk/java/org/apache/naming/resources/ProxyDirContext.java
(original)
+++ tomcat/trunk/java/org/apache/naming/resources/ProxyDirContext.java Thu Oct
21 22:09:45 2010
@@ -26,20 +26,13 @@ import java.util.Hashtable;
import javax.naming.Binding;
import javax.naming.Context;
import javax.naming.Name;
-import javax.naming.NameAlreadyBoundException;
import javax.naming.NameClassPair;
import javax.naming.NameNotFoundException;
import javax.naming.NameParser;
import javax.naming.NamingEnumeration;
import javax.naming.NamingException;
-import javax.naming.NotContextException;
-import javax.naming.OperationNotSupportedException;
-import javax.naming.directory.AttributeModificationException;
import javax.naming.directory.Attributes;
import javax.naming.directory.DirContext;
-import javax.naming.directory.InvalidAttributesException;
-import javax.naming.directory.InvalidSearchControlsException;
-import javax.naming.directory.InvalidSearchFilterException;
import javax.naming.directory.ModificationItem;
import javax.naming.directory.SearchControls;
import javax.naming.directory.SearchResult;
@@ -107,29 +100,6 @@ public class ProxyDirContext implements
}
-/**
- * Builds a clone of this proxy dir context, wrapping the given directory
- * context, and sharing the same cache.
- */
-// TODO: Refactor using the proxy field
-/*
-protected ProxyDirContext(ProxyDirContext proxyDirContext,
- DirContext dirContext, String vPath) {
-this.env = proxyDirContext.env;
-this.dirContext = dirContext;
-this.vPath = vPath;
-this.cache = proxyDirContext.cache;
-this.cacheMaxSize = proxyDirContext.cacheMaxSize;
-this.cacheSize = proxyDirContext.cacheSize;
-this.cacheTTL = proxyDirContext.cacheTTL;
-this.cacheObjectMaxSize = proxyDirContext.cacheObjectMaxSize;
-this.notFoundCache = proxyDirContext.notFoundCache;
-this.hostName = proxyDirContext.hostName;
-this.contextName = proxyDirContext.contextName;
-}
-*/
-
-
// - Instance Variables
@@ -266,6 +236,7 @@ public class ProxyDirContext implements
* @return the object bound to name
* @exception NamingException if a naming exception is encountered
*/
+@Override
public Object lookup(Name name)
throws NamingException {
CacheEntry entry = cacheLookup(name.toString());
@@ -295,6 +266,7 @@ public class ProxyDirContext implements
* @return the object bound to name
* @exception NamingException if a naming exception is encountered
*/
+@Override
public Object lookup(String name)
throws NamingException {
CacheEntry entry = cacheLookup(name);
@@ -329,11 +301,13 @@ public class ProxyDirContext implements
*
* @param name the name to bind; may not be empty
* @param obj the object to bind; possibly null
- * @exception NameAlreadyBoundException if name is already bound
- * @exception InvalidAttributesException if object did not supply all
- * mandatory attributes
+ * @exception javax.naming.NameAlreadyBoundException if name is already
+ * bound
+ * @exception javax.naming.directory.InvalidAttributesException if object
+ * did not supply all mandatory attributes
* @exception NamingException if a naming exception is encountered
*/
+@Override
public void bind(Name name, Object obj)
throws NamingException {
dirContext.bind(parseName(name), obj);
@@ -346,11 +320,13 @@ public class ProxyDirContext implements
*
* @param name the name to bind; may not be empty
* @param obj the object to bind; possibly null
- * @exception NameAlreadyBoundException if name is already bound
- * @exception InvalidAttributesException if object did not supply all
- * mandatory attributes
+ * @exception javax.naming.NameAlreadyBoundException if name is already
+ * bound
+ * @exception javax.naming.directory.InvalidAttributesException if object
+ * did not supply all mandatory attributes
* @exception NamingException if a naming exception is encountered
*/
+@Override
public void bind(String name, Object obj)
throws NamingException {
dirContext.bi
svn commit: r1026163 - in /tomcat/trunk/java/org/apache/naming/resources: RecyclableNamingEnumeration.java Resource.java ResourceAttributes.java ResourceCache.java
Author: markt
Date: Thu Oct 21 22:14:58 2010
New Revision: 1026163
URL: http://svn.apache.org/viewvc?rev=1026163&view=rev
Log:
Fix Eclipse warnings
Modified:
tomcat/trunk/java/org/apache/naming/resources/RecyclableNamingEnumeration.java
tomcat/trunk/java/org/apache/naming/resources/Resource.java
tomcat/trunk/java/org/apache/naming/resources/ResourceAttributes.java
tomcat/trunk/java/org/apache/naming/resources/ResourceCache.java
Modified:
tomcat/trunk/java/org/apache/naming/resources/RecyclableNamingEnumeration.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/naming/resources/RecyclableNamingEnumeration.java?rev=1026163&r1=1026162&r2=1026163&view=diff
==
---
tomcat/trunk/java/org/apache/naming/resources/RecyclableNamingEnumeration.java
(original)
+++
tomcat/trunk/java/org/apache/naming/resources/RecyclableNamingEnumeration.java
Thu Oct 21 22:14:58 2010
@@ -65,6 +65,7 @@ public class RecyclableNamingEnumeration
/**
* Retrieves the next element in the enumeration.
*/
+@Override
public E next()
throws NamingException {
return nextElement();
@@ -74,6 +75,7 @@ public class RecyclableNamingEnumeration
/**
* Determines whether there are any more elements in the enumeration.
*/
+@Override
public boolean hasMore()
throws NamingException {
return enumeration.hasMoreElements();
@@ -83,16 +85,19 @@ public class RecyclableNamingEnumeration
/**
* Closes this enumeration.
*/
-public void close()
-throws NamingException {
+@Override
+public void close() throws NamingException {
+// NO-OP
}
+@Override
public boolean hasMoreElements() {
return enumeration.hasMoreElements();
}
+@Override
public E nextElement() {
return enumeration.nextElement();
}
Modified: tomcat/trunk/java/org/apache/naming/resources/Resource.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/naming/resources/Resource.java?rev=1026163&r1=1026162&r2=1026163&view=diff
==
--- tomcat/trunk/java/org/apache/naming/resources/Resource.java (original)
+++ tomcat/trunk/java/org/apache/naming/resources/Resource.java Thu Oct 21
22:14:58 2010
@@ -34,6 +34,7 @@ public class Resource {
public Resource() {
+// NO-OP
}
@@ -69,9 +70,9 @@ public class Resource {
* Content accessor.
*
* @return InputStream
+ * @throws IOException
*/
-public InputStream streamContent()
-throws IOException {
+public InputStream streamContent() throws IOException {
if (binaryContent != null) {
return new ByteArrayInputStream(binaryContent);
}
Modified: tomcat/trunk/java/org/apache/naming/resources/ResourceAttributes.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/naming/resources/ResourceAttributes.java?rev=1026163&r1=1026162&r2=1026163&view=diff
==
--- tomcat/trunk/java/org/apache/naming/resources/ResourceAttributes.java
(original)
+++ tomcat/trunk/java/org/apache/naming/resources/ResourceAttributes.java Thu
Oct 21 22:14:58 2010
@@ -41,6 +41,7 @@ public class ResourceAttributes implemen
// -- Constants
+private static final long serialVersionUID = 1L;
// Default attribute names
@@ -175,6 +176,7 @@ public class ResourceAttributes implemen
* Default constructor.
*/
public ResourceAttributes() {
+// NO-OP
}
@@ -772,6 +774,7 @@ public class ResourceAttributes implemen
/**
* Get attribute.
*/
+@Override
public Attribute get(String attrID) {
if (attributes == null) {
if (attrID.equals(CREATION_DATE)) {
@@ -829,6 +832,7 @@ public class ResourceAttributes implemen
/**
* Put attribute.
*/
+@Override
public Attribute put(Attribute attribute) {
if (attributes == null) {
try {
@@ -845,6 +849,7 @@ public class ResourceAttributes implemen
/**
* Put attribute.
*/
+@Override
public Attribute put(String attrID, Object val) {
if (attributes == null) {
return null; // No reason to implement this
@@ -857,6 +862,7 @@ public class ResourceAttributes implemen
/**
* Remove attribute.
*/
+@Override
public Attribute remove(String attrID) {
if (attributes == null) {
return null; // No reason to implement this
@@ -869,6 +875,7 @@ public class ResourceAttributes implemen
/**
* Get all attributes.
*/
+@Override
public NamingEnumeration getAll() {
if
svn commit: r1026164 - /tomcat/trunk/java/org/apache/naming/resources/WARDirContext.java
Author: markt Date: Thu Oct 21 22:20:32 2010 New Revision: 1026164 URL: http://svn.apache.org/viewvc?rev=1026164&view=rev Log: Allow Checkstyle's unused imports test to be used with this class Fix Eclipse warnings Modified: tomcat/trunk/java/org/apache/naming/resources/WARDirContext.java Modified: tomcat/trunk/java/org/apache/naming/resources/WARDirContext.java URL: http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/naming/resources/WARDirContext.java?rev=1026164&r1=1026163&r2=1026164&view=diff == --- tomcat/trunk/java/org/apache/naming/resources/WARDirContext.java (original) +++ tomcat/trunk/java/org/apache/naming/resources/WARDirContext.java Thu Oct 21 22:20:32 2010 @@ -34,19 +34,13 @@ import javax.naming.Binding; import javax.naming.CompositeName; import javax.naming.InvalidNameException; import javax.naming.Name; -import javax.naming.NameAlreadyBoundException; import javax.naming.NameClassPair; import javax.naming.NameNotFoundException; import javax.naming.NamingEnumeration; import javax.naming.NamingException; -import javax.naming.NotContextException; import javax.naming.OperationNotSupportedException; -import javax.naming.directory.AttributeModificationException; import javax.naming.directory.Attributes; import javax.naming.directory.DirContext; -import javax.naming.directory.InvalidAttributesException; -import javax.naming.directory.InvalidSearchControlsException; -import javax.naming.directory.InvalidSearchFilterException; import javax.naming.directory.ModificationItem; import javax.naming.directory.SearchControls; import javax.naming.directory.SearchResult; @@ -266,7 +260,8 @@ public class WARDirContext extends BaseD * * @param oldName the name of the existing binding; may not be empty * @param newName the name of the new binding; may not be empty - * @exception NameAlreadyBoundException if newName is already bound + * @exception javax.naming.NameAlreadyBoundException if newName is already + * bound * @exception NamingException if a naming exception is encountered */ @Override @@ -375,8 +370,8 @@ public class WARDirContext extends BaseD * @param name the name of the context to be destroyed; may not be empty * @exception NameNotFoundException if an intermediate context does not * exist - * @exception NotContextException if the name is bound but does not name - * a context, or does not name a context of the appropriate type + * @exception javax.naming.NotContextException if the name is bound but does + * not name a context, or does not name a context of the appropriate type */ @Override public void destroySubcontext(String name) @@ -494,8 +489,8 @@ public class WARDirContext extends BaseD * REPLACE_ATTRIBUTE, REMOVE_ATTRIBUTE * @param attrs the attributes to be used for the modification; may not * be null - * @exception AttributeModificationException if the modification cannot be - * completed successfully + * @exception javax.naming.directory.AttributeModificationException if the + * modification cannot be completed successfully * @exception NamingException if a naming exception is encountered */ @Override @@ -515,8 +510,8 @@ public class WARDirContext extends BaseD * @param name the name of the object whose attributes will be updated * @param mods an ordered sequence of modifications to be performed; may * not be null - * @exception AttributeModificationException if the modification cannot be - * completed successfully + * @exception javax.naming.directory.AttributeModificationException if the + * modification cannot be completed successfully * @exception NamingException if a naming exception is encountered */ @Override @@ -536,9 +531,10 @@ public class WARDirContext extends BaseD * @param name the name to bind; may not be empty * @param obj the object to bind; possibly null * @param attrs the attributes to associate with the binding - * @exception NameAlreadyBoundException if name is already bound - * @exception InvalidAttributesException if some "mandatory" attributes - * of the binding are not supplied + * @exception javax.naming.NameAlreadyBoundException if name is already + * bound + * @exception javax.naming.directory.InvalidAttributesException if some + * "mandatory" attributes of the binding are not supplied * @exception NamingException if a naming exception is encountered */ @Override @@ -562,8 +558,8 @@ public class WARDirContext extends BaseD * @param name the name to bind; may not be empty * @param obj the object to bind; possibly null * @param attrs the attributes to associate with the binding - * @exception InvalidAttributesException if some "mandatory" attributes - * of the binding are not
svn commit: r1026165 - /tomcat/trunk/java/org/apache/naming/NamingContext.java
Author: markt
Date: Thu Oct 21 22:24:01 2010
New Revision: 1026165
URL: http://svn.apache.org/viewvc?rev=1026165&view=rev
Log:
Allow Checkstyle's unused imports test to be used with this class
Fix some Eclipse warnings
Modified:
tomcat/trunk/java/org/apache/naming/NamingContext.java
Modified: tomcat/trunk/java/org/apache/naming/NamingContext.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/naming/NamingContext.java?rev=1026165&r1=1026164&r2=1026165&view=diff
==
--- tomcat/trunk/java/org/apache/naming/NamingContext.java (original)
+++ tomcat/trunk/java/org/apache/naming/NamingContext.java Thu Oct 21 22:24:01
2010
@@ -38,7 +38,6 @@ import javax.naming.NotContextException;
import javax.naming.OperationNotSupportedException;
import javax.naming.Reference;
import javax.naming.Referenceable;
-import javax.naming.directory.InvalidAttributesException;
import javax.naming.spi.NamingManager;
/**
@@ -140,6 +139,7 @@ public class NamingContext implements Co
* @return the object bound to name
* @exception NamingException if a naming exception is encountered
*/
+@Override
public Object lookup(Name name)
throws NamingException {
return lookup(name, true);
@@ -153,6 +153,7 @@ public class NamingContext implements Co
* @return the object bound to name
* @exception NamingException if a naming exception is encountered
*/
+@Override
public Object lookup(String name)
throws NamingException {
return lookup(new CompositeName(name), true);
@@ -167,10 +168,11 @@ public class NamingContext implements Co
* @param name the name to bind; may not be empty
* @param obj the object to bind; possibly null
* @exception NameAlreadyBoundException if name is already bound
- * @exception InvalidAttributesException if object did not supply all
- * mandatory attributes
+ * @exception javax.naming.directory.InvalidAttributesException if object
+ * did not supply all mandatory attributes
* @exception NamingException if a naming exception is encountered
*/
+@Override
public void bind(Name name, Object obj)
throws NamingException {
bind(name, obj, false);
@@ -183,10 +185,11 @@ public class NamingContext implements Co
* @param name the name to bind; may not be empty
* @param obj the object to bind; possibly null
* @exception NameAlreadyBoundException if name is already bound
- * @exception InvalidAttributesException if object did not supply all
- * mandatory attributes
+ * @exception javax.naming.directory.InvalidAttributesException if object
+ * did not supply all mandatory attributes
* @exception NamingException if a naming exception is encountered
*/
+@Override
public void bind(String name, Object obj)
throws NamingException {
bind(new CompositeName(name), obj);
@@ -204,10 +207,11 @@ public class NamingContext implements Co
*
* @param name the name to bind; may not be empty
* @param obj the object to bind; possibly null
- * @exception InvalidAttributesException if object did not supply all
- * mandatory attributes
+ * @exception javax.naming.directory.InvalidAttributesException if object
+ * did not supply all mandatory attributes
* @exception NamingException if a naming exception is encountered
*/
+@Override
public void rebind(Name name, Object obj)
throws NamingException {
bind(name, obj, true);
@@ -219,10 +223,11 @@ public class NamingContext implements Co
*
* @param name the name to bind; may not be empty
* @param obj the object to bind; possibly null
- * @exception InvalidAttributesException if object did not supply all
- * mandatory attributes
+ * @exception javax.naming.directory.InvalidAttributesException if object
+ * did not supply all mandatory attributes
* @exception NamingException if a naming exception is encountered
*/
+@Override
public void rebind(String name, Object obj)
throws NamingException {
rebind(new CompositeName(name), obj);
@@ -243,6 +248,7 @@ public class NamingContext implements Co
* exist
* @exception NamingException if a naming exception is encountered
*/
+@Override
public void unbind(Name name)
throws NamingException {
checkWritable();
@@ -282,6 +288,7 @@ public class NamingContext implements Co
* exist
* @exception NamingException if a naming exception is encountered
*/
+@Override
public void unbind(String name)
throws NamingException {
unbind(new CompositeName(name));
@@ -299,6 +306,7 @@ public class NamingContext implements Co
* @exception NameAlreadyBoundException if newName is already bound
* @exception NamingException if a
svn commit: r1026166 - /tomcat/trunk/webapps/docs/changelog.xml
Author: markt Date: Thu Oct 21 22:28:59 2010 New Revision: 1026166 URL: http://svn.apache.org/viewvc?rev=1026166&view=rev Log: Add release date Modified: tomcat/trunk/webapps/docs/changelog.xml Modified: tomcat/trunk/webapps/docs/changelog.xml URL: http://svn.apache.org/viewvc/tomcat/trunk/webapps/docs/changelog.xml?rev=1026166&r1=1026165&r2=1026166&view=diff == --- tomcat/trunk/webapps/docs/changelog.xml (original) +++ tomcat/trunk/webapps/docs/changelog.xml Thu Oct 21 22:28:59 2010 @@ -115,7 +115,7 @@ - + - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
svn commit: r1026209 - in /tomcat/jk/trunk/native: Makefile.am common/jk_global.h common/portable.h common/portable.h.sample configure.in
Author: mturk
Date: Fri Oct 22 04:31:20 2010
New Revision: 1026209
URL: http://svn.apache.org/viewvc?rev=1026209&view=rev
Log:
Axe portable.h and use config.h guarded by preproc define
Removed:
tomcat/jk/trunk/native/common/portable.h
tomcat/jk/trunk/native/common/portable.h.sample
Modified:
tomcat/jk/trunk/native/Makefile.am
tomcat/jk/trunk/native/common/jk_global.h
tomcat/jk/trunk/native/configure.in
Modified: tomcat/jk/trunk/native/Makefile.am
URL:
http://svn.apache.org/viewvc/tomcat/jk/trunk/native/Makefile.am?rev=1026209&r1=1026208&r2=1026209&view=diff
==
--- tomcat/jk/trunk/native/Makefile.am (original)
+++ tomcat/jk/trunk/native/Makefile.am Fri Oct 22 04:31:20 2010
@@ -17,8 +17,8 @@
# Tell automake what it should do
AUTOMAKE_OPTIONS = foreign
MAINTAINERCLEANFILES=config.cache config.status config.log \
-config.nice Makefile.in configure common/portable.h.in \
-aclocal.m4
+config.nice Makefile.in configure common/config.h.in \
+common/config.h aclocal.m4
SUBDIRS = @WEBSERVER@
Modified: tomcat/jk/trunk/native/common/jk_global.h
URL:
http://svn.apache.org/viewvc/tomcat/jk/trunk/native/common/jk_global.h?rev=1026209&r1=1026208&r2=1026209&view=diff
==
--- tomcat/jk/trunk/native/common/jk_global.h (original)
+++ tomcat/jk/trunk/native/common/jk_global.h Fri Oct 22 04:31:20 2010
@@ -25,8 +25,8 @@
#ifndef JK_GLOBAL_H
#define JK_GLOBAL_H
-#if !defined(WIN32) && !defined(AS400) && !defined(NETWARE)
-#include "portable.h"
+#if defined(HAVE_CONFIG_H)
+#include "config.h"
#endif
#if defined(WIN32)
Modified: tomcat/jk/trunk/native/configure.in
URL:
http://svn.apache.org/viewvc/tomcat/jk/trunk/native/configure.in?rev=1026209&r1=1026208&r2=1026209&view=diff
==
--- tomcat/jk/trunk/native/configure.in (original)
+++ tomcat/jk/trunk/native/configure.in Fri Oct 22 04:31:20 2010
@@ -20,7 +20,7 @@ AC_REVISION($Id$)dnl
AC_PREREQ(2.13)
AC_INIT(common/jk_worker.h)
-AC_CONFIG_HEADER(common/portable.h)
+AC_CONFIG_HEADER(common/config.h)
AC_CONFIG_AUX_DIR(scripts/build/unix)
AC_CANONICAL_SYSTEM
@@ -60,6 +60,10 @@ AC_SUBST(CP)
AC_PATH_PROG(MKDIR,mkdir,$PATH)dnl
AC_SUBST(MKDIR)
+dnl Mark that we have generated config.h
+CFLAGS="${CFLAGS} -DHAVE_CONFIG_H"
+AC_SUBST(CFLAGS)
+
APACHE_CONFIG_VARS=`pwd`/scripts/build/config_vars.mk
WEBSERVER=""
apache_dir=""
-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
svn commit: r1026212 - in /tomcat/jk/trunk/native/netscape: Makefile.linux Makefile.solaris Makefile.vc nsapi.dsp
Author: mturk
Date: Fri Oct 22 05:13:19 2010
New Revision: 1026212
URL: http://svn.apache.org/viewvc?rev=1026212&view=rev
Log:
Unify the server variable across platforms. Oracle is now again calling that
iPlanet, as once originaly was
Modified:
tomcat/jk/trunk/native/netscape/Makefile.linux
tomcat/jk/trunk/native/netscape/Makefile.solaris
tomcat/jk/trunk/native/netscape/Makefile.vc
tomcat/jk/trunk/native/netscape/nsapi.dsp
Modified: tomcat/jk/trunk/native/netscape/Makefile.linux
URL:
http://svn.apache.org/viewvc/tomcat/jk/trunk/native/netscape/Makefile.linux?rev=1026212&r1=1026211&r2=1026212&view=diff
==
--- tomcat/jk/trunk/native/netscape/Makefile.linux (original)
+++ tomcat/jk/trunk/native/netscape/Makefile.linux Fri Oct 22 05:13:19 2010
@@ -31,7 +31,7 @@ CC_CMD=$(CC) $(CFLAGS) $(EXTRA_CFLAGS) \
LD_SHAREDCMD=$(CC) $(LDFLAGS) $(CFLAGS) $(EXTRA_CFLAGS)
OS_TYPE=linux
-INCLUDEDIR=$(SUITSPOT_HOME)/include
+INCLUDEDIR=$(IPLANET_HOME)/include
JAVA_INCLUDE=$(JAVA_HOME)/include
JK_DIR=../common
VPATH=.:$(JK_DIR)
@@ -46,7 +46,7 @@ PLUGIN_OBJ = jk_nsapi_plugin.o
INCLUDE_FLAGS= -I$(JK_DIR) -I$(INCLUDEDIR) -I$(INCLUDEDIR)/base \
-I$(INCLUDEDIR)/frame -I$(JAVA_INCLUDE)
-I$(JAVA_INCLUDE)/$(OS_TYPE)
-all: nsapi_redirector.so
+all: nsapi_redirector.so
nsapi_redirector.so: $(JK_OBJS) $(PLUGIN_OBJ)
Modified: tomcat/jk/trunk/native/netscape/Makefile.solaris
URL:
http://svn.apache.org/viewvc/tomcat/jk/trunk/native/netscape/Makefile.solaris?rev=1026212&r1=1026211&r2=1026212&view=diff
==
--- tomcat/jk/trunk/native/netscape/Makefile.solaris (original)
+++ tomcat/jk/trunk/native/netscape/Makefile.solaris Fri Oct 22 05:13:19 2010
@@ -36,7 +36,6 @@ LDFLAGS=-shared
# Change this according to location where on installed the server.
# Don't forget to do the ./configure --enable-netscape=/opt/SUNWwbsvr/plugins
# before doing gmake -f Makefile.solaris
-SUITSPOT_HOME=/opt/SUNWwbsvr/plugins
CC_CMD=$(CC) $(CFLAGS) $(EXTRA_CFLAGS) \
-DNET_SSL -DSOLARIS -D_REENTRANT -DXP_UNIX -DMCC_HTTPD -DSPAPI20
-DJK_NSAPI
@@ -48,7 +47,7 @@ all:
prepare:
OS_TYPE=solaris
-INCLUDEDIR=$(SUITSPOT_HOME)/include
+INCLUDEDIR=$(IPLANET_HOME)/include
JAVA_INCLUDE=$(JAVA_HOME)/include
JK_DIR=../common
VPATH=.:$(JK_DIR)
@@ -72,7 +71,7 @@ PLUGIN_OBJ = jk_nsapi_plugin.o
INCLUDE_FLAGS= -I$(JK_DIR) -I$(INCLUDEDIR) -I$(INCLUDEDIR)/base \
-I$(INCLUDEDIR)/frame -I$(JAVA_INCLUDE)
-I$(JAVA_INCLUDE)/$(OS_TYPE)
-all: nsapi_redirector.so
+all: nsapi_redirector.so
nsapi_redirector.so: $(JK_OBJS) $(PLUGIN_OBJ)
Modified: tomcat/jk/trunk/native/netscape/Makefile.vc
URL:
http://svn.apache.org/viewvc/tomcat/jk/trunk/native/netscape/Makefile.vc?rev=1026212&r1=1026211&r2=1026212&view=diff
==
--- tomcat/jk/trunk/native/netscape/Makefile.vc (original)
+++ tomcat/jk/trunk/native/netscape/Makefile.vc Fri Oct 22 05:13:19 2010
@@ -2,27 +2,27 @@
!IF "$(CFG)" == ""
CFG=nsapi - Win32 Release
!MESSAGE No configuration specified. Defaulting to nsapi - Win32 Release.
-!ENDIF
+!ENDIF
!IF "$(CFG)" != "nsapi - Win32 Release"
!MESSAGE Invalid configuration "$(CFG)" specified.
!MESSAGE You can specify a configuration when running NMAKE
!MESSAGE by defining the macro CFG on the command line. For example:
-!MESSAGE
+!MESSAGE
!MESSAGE NMAKE /f "nsapi.mak" CFG="nsapi - Win32 Release"
-!MESSAGE
+!MESSAGE
!MESSAGE Possible choices for configuration are:
-!MESSAGE
+!MESSAGE
!MESSAGE "nsapi - Win32 Release" (based on "Win32 (x86) Dynamic-Link Library")
-!MESSAGE
+!MESSAGE
!ERROR An invalid configuration is specified.
-!ENDIF
+!ENDIF
!IF "$(OS)" == "Windows_NT"
NULL=
-!ELSE
+!ELSE
NULL=nul
-!ENDIF
+!ENDIF
OUTDIR=.\nsapi_release
INTDIR=.\nsapi_release
@@ -67,48 +67,48 @@ CLEAN :
if not exist "$(OUTDIR)/$(NULL)" mkdir "$(OUTDIR)"
CPP=cl.exe
-CPP_PROJ=-nologo -MD -W3 -O2 -Ob2 -Oy- -Zi -EHsc /I "..\common" /I
"$(SUNONE_HOME)\include" /I "$(JAVA_HOME)\include" /I
"$(JAVA_HOME)\include\win32" /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /D "_MBCS" /D
"_USRDLL" /D "JK_NSAPI" /D "NSAPI_EXPORTS" /D "XP_WIN32" /D "MCC_HTTPD" /D
"SPAPI20" /Fo"$(INTDIR)\\" /Fd"$(OUTDIR)\nsapi_redirect_src" /FD /c
+CPP_PROJ=-nologo -MD -W3 -O2 -Ob2 -Oy- -Zi -EHsc /I "..\common" /I
"$(IPLANET_HOME)\include" /I "$(JAVA_HOME)\include" /I
"$(JAVA_HOME)\include\win32" /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /D "_MBCS" /D
"_USRDLL" /D "JK_NSAPI" /D "NSAPI_EXPORTS" /D "XP_WIN32" /D "MCC_HTTPD" /D
"SPAPI20" /Fo"$(INTDIR)\\" /Fd"$(OUTDIR)\nsapi_redirect_src" /FD /c
.c{$(INTDIR)}.obj::
$(CPP) @<<
- $(CPP_PROJ) $<
+ $(CPP_PROJ) $<
<<
.cpp{$(INTDIR)}.obj::
$(CPP) @<<
- $(CPP_PROJ) $<
+ $(CPP_PROJ) $<
<<
.cxx{$(INTDIR)}.obj::
$(CPP) @<<
- $(CPP_PROJ) $<
+
svn commit: r1026213 - /tomcat/jk/trunk/native/netscape/README
Author: mturk Date: Fri Oct 22 05:14:15 2010 New Revision: 1026213 URL: http://svn.apache.org/viewvc?rev=1026213&view=rev Log: Update readme as well Modified: tomcat/jk/trunk/native/netscape/README Modified: tomcat/jk/trunk/native/netscape/README URL: http://svn.apache.org/viewvc/tomcat/jk/trunk/native/netscape/README?rev=1026213&r1=1026212&r2=1026213&view=diff == --- tomcat/jk/trunk/native/netscape/README (original) +++ tomcat/jk/trunk/native/netscape/README Fri Oct 22 05:14:15 2010 @@ -1,8 +1,8 @@ ABOUT - -The redirector was originally developed using Visual C++ Ver.6.0, -so having this environment is a prerequisite if you want to perform +The redirector was originally developed using Visual C++ Ver.6.0, +so having this environment is a prerequisite if you want to perform a custom build on Windows systems On Unix system, a Makefile.solaris and Makefile.linux are provided @@ -17,12 +17,12 @@ MS VC 6.0 (+ update, latest service pack BUILDING on Windows --- - + The steps that you need to take are: 1. Change directory to the nsapi redirector plugins source directory. - 2. Set the SUNONE_HOME system environment value to SunONE installation - directory or edit the nsapi.dsp and replace all $(SUNONE_HOME) + 2. Set the IPLANET_HOME system environment value to iPlanet installation + directory or edit the nsapi.dsp and replace all $(IPLANET_HOME) occurrences with the real path 3. Execute the following command: MSDEV nsapi.dsp /MAKE ALL @@ -30,5 +30,5 @@ The steps that you need to take are: This will build both release and debug versions of the redirector plugin. -An alternative will be to open the isapi workspace file (nsapi.dsw) in msdev and +An alternative will be to open the isapi workspace file (nsapi.dsw) in msdev and build it using the build menu. - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
svn commit: r1026216 - /tomcat/jk/trunk/native/apache-2.0/Makefile.vc
Author: mturk Date: Fri Oct 22 05:25:49 2010 New Revision: 1026216 URL: http://svn.apache.org/viewvc?rev=1026216&view=rev Log: Add support for Apache 2.3 Modified: tomcat/jk/trunk/native/apache-2.0/Makefile.vc Modified: tomcat/jk/trunk/native/apache-2.0/Makefile.vc URL: http://svn.apache.org/viewvc/tomcat/jk/trunk/native/apache-2.0/Makefile.vc?rev=1026216&r1=1026215&r2=1026216&view=diff == --- tomcat/jk/trunk/native/apache-2.0/Makefile.vc (original) +++ tomcat/jk/trunk/native/apache-2.0/Makefile.vc Fri Oct 22 05:25:49 2010 @@ -13,20 +13,23 @@ # See the License for the specific language governing permissions and # limitations under the License. -!IFDEF APACHE22 -APACHE2_HOME=$(APACHE22_HOME) -APR_LIB=libapr-1.lib -APU_LIB=libaprutil-1.lib -OUTDIR=.\Release22 -INTDIR=.\Release22 -!ELSE +!IFDEF APACHE20_HOME APR_LIB=libapr.lib APU_LIB=libaprutil.lib OUTDIR=.\Release20 INTDIR=.\Release20 -!IFDEF APACHE20_HOME APACHE2_HOME=$(APACHE20_HOME) +!ELSE +!IFDEF APACHE23_HOME +APACHE2_HOME=$(APACHE23_HOME) +OUTDIR=.\Release23 +INTDIR=.\Release23 +!ELSE +OUTDIR=.\Release22 +INTDIR=.\Release22 !ENDIF +APR_LIB=libapr-1.lib +APU_LIB=libaprutil-1.lib !ENDIF !IFNDEF APACHE2_HOME - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
svn commit: r1026222 - in /tomcat/jk/trunk/native: apache-2.0/Makefile.vc iis/Makefile.x86 iis/jk_isapi_plugin.c
Author: mturk Date: Fri Oct 22 06:35:25 2010 New Revision: 1026222 URL: http://svn.apache.org/viewvc?rev=1026222&view=rev Log: Use version suffix so that RM doesn't need to manually rename files for distribution Modified: tomcat/jk/trunk/native/apache-2.0/Makefile.vc tomcat/jk/trunk/native/iis/Makefile.x86 tomcat/jk/trunk/native/iis/jk_isapi_plugin.c Modified: tomcat/jk/trunk/native/apache-2.0/Makefile.vc URL: http://svn.apache.org/viewvc/tomcat/jk/trunk/native/apache-2.0/Makefile.vc?rev=1026222&r1=1026221&r2=1026222&view=diff == --- tomcat/jk/trunk/native/apache-2.0/Makefile.vc (original) +++ tomcat/jk/trunk/native/apache-2.0/Makefile.vc Fri Oct 22 06:35:25 2010 @@ -19,14 +19,17 @@ APU_LIB=libaprutil.lib OUTDIR=.\Release20 INTDIR=.\Release20 APACHE2_HOME=$(APACHE20_HOME) +HTTPD_VERSION=2.0.52 !ELSE !IFDEF APACHE23_HOME APACHE2_HOME=$(APACHE23_HOME) OUTDIR=.\Release23 INTDIR=.\Release23 +HTTPD_VERSION=2.3.1 !ELSE OUTDIR=.\Release22 INTDIR=.\Release22 +HTTPD_VERSION=2.2.3 !ENDIF APR_LIB=libapr-1.lib APU_LIB=libaprutil-1.lib @@ -36,11 +39,13 @@ APU_LIB=libaprutil-1.lib !ERROR Missing APACHE2_HOME environment variable. !ENDIF +JK_VERSION=1.2.31 +TARGET=mod_jk-$(JK_VERSION)-httpd-$(HTTPD_VERSION) CPP=cl.exe MTL=midl.exe RSC=rc.exe -ALL : "$(OUTDIR)\mod_jk.so" +ALL : "$(OUTDIR)\$(TARGET).so" CLEAN : @@ -71,18 +76,18 @@ CLEAN : -...@erase "$(INTDIR)\mod_jk_src.pdb" -...@erase "$(OUTDIR)\mod_jk.exp" -...@erase "$(OUTDIR)\mod_jk.lib" - -...@erase "$(OUTDIR)\mod_jk.pdb" - -...@erase "$(OUTDIR)\mod_jk.so" + -...@erase "$(OUTDIR)\$(TARGET).pdb" + -...@erase "$(OUTDIR)\$(TARGET).so" "$(OUTDIR)" : if not exist "$(OUTDIR)/$(NULL)" mkdir "$(OUTDIR)" BSC32=bscmake.exe -BSC32_FLAGS=/nologo /o"$(OUTDIR)\mod_jk.bsc" +BSC32_FLAGS=/nologo /o"$(OUTDIR)\$(TARGET).bsc" BSC32_SBRS= \ LINK32=link.exe -LINK32_FLAGS=libhttpd.lib $(APR_LIB) $(APU_LIB) kernel32.lib user32.lib advapi32.lib mswsock.lib ws2_32.lib $(EXTRA_LIBS) /nologo /base:"0x6A6B" /subsystem:windows /dll /incremental:no /pdb:"$(OUTDIR)\mod_jk.pdb" /debug /machine:I386 /out:"$(OUTDIR)\mod_jk.so" /implib:"$(OUTDIR)\mod_jk.lib" /libpath:"$(APACHE2_HOME)\lib" /opt:ref +LINK32_FLAGS=libhttpd.lib $(APR_LIB) $(APU_LIB) kernel32.lib user32.lib advapi32.lib mswsock.lib ws2_32.lib $(EXTRA_LIBS) /nologo /base:"0x6A6B" /subsystem:windows /dll /incremental:no /pdb:"$(OUTDIR)\$(TARGET).pdb" /debug /machine:I386 /out:"$(OUTDIR)\$(TARGET).so" /implib:"$(OUTDIR)\mod_jk.lib" /libpath:"$(APACHE2_HOME)\lib" /opt:ref LINK32_OBJS= \ "$(INTDIR)\jk_ajp12_worker.obj" \ "$(INTDIR)\jk_ajp13.obj" \ @@ -108,12 +113,12 @@ LINK32_OBJS= \ "$(INTDIR)\jk.res" \ "$(INTDIR)\mod_jk.obj" -"$(OUTDIR)\mod_jk.so" : "$(OUTDIR)" $(DEF_FILE) $(LINK32_OBJS) +"$(OUTDIR)\$(TARGET).so" : "$(OUTDIR)" $(DEF_FILE) $(LINK32_OBJS) $(LINK32) @<< $(LINK32_FLAGS) $(LINK32_OBJS) << - @IF EXIST $(OUTDIR)\mod_jk.manifest \ - mt -nologo -manifest $(OUTDIR)\mod_jk.manifest -outputresource:$(OUTDIR)\mod_jk.so;2 + @IF EXIST $(OUTDIR)\$(TARGET).manifest \ + mt -nologo -manifest $(OUTDIR)\$(TARGET).manifest -outputresource:$(OUTDIR)\$(TARGET).so;2 CPP_PROJ=-nologo -MD -W3 -O2 -Ob2 -Oy- -Zi -EHsc /I "..\common" /I "$(JAVA_HOME)\include" /I "$(JAVA_HOME)\include\win32" /I "$(APACHE2_HOME)\include" /D "NDEBUG" /D "WIN32" /D "_WINDOWS" /Fo"$(INTDIR)\\" /Fd"$(INTDIR)\mod_jk_src" /FD /c Modified: tomcat/jk/trunk/native/iis/Makefile.x86 URL: http://svn.apache.org/viewvc/tomcat/jk/trunk/native/iis/Makefile.x86?rev=1026222&r1=1026221&r2=1026222&view=diff == --- tomcat/jk/trunk/native/iis/Makefile.x86 (original) +++ tomcat/jk/trunk/native/iis/Makefile.x86 Fri Oct 22 06:35:25 2010 @@ -13,6 +13,9 @@ # See the License for the specific language governing permissions and # limitations under the License. +JK_VERSION=1.2.31 +TARGET=isapi_redirect-$(JK_VERSION) + CPP=cl.exe MTL=midl.exe RSC=rc.exe @@ -24,11 +27,11 @@ OutDir=.\Release_x86 !IF "$(RECURSE)" == "0" -ALL : "$(OUTDIR)\isapi_redirect.dll" +ALL : "$(OUTDIR)\$(TARGET).dll" !ELSE -ALL : "pcre_x86" "$(OUTDIR)\isapi_redirect.dll" +ALL : "pcre_x86" "$(OUTDIR)\$(TARGET).dll" !ENDIF @@ -63,10 +66,10 @@ CLEAN : -...@erase "$(INTDIR)\jk_url.obj" -...@erase "$(INTDIR)\jk_util.obj" -...@erase "$(INTDIR)\jk_worker.obj" - -...@erase "$(OUTDIR)\isapi_redirect.dll" + -...@erase "$(OUTDIR)\$(TARGET).dll" -...@erase "$(OUTDIR)\isapi_redirect.exp" -...@erase "$(OUTDIR)\isapi_redirect.lib" - -...@erase "$(OUTDIR)\isapi_redirect.pdb" + -...@erase "$(OUTDIR)\$(TARGET).pdb" "$(OUTDIR)" : if not exist "$(OUTDIR)/$(NULL)" mkdir "$(OUTDIR)" @@ -76,7 +79,7
svn commit: r1026223 - in /tomcat/jk/trunk/native/iis: Makefile.amd64 Makefile.ia64
Author: mturk Date: Fri Oct 22 06:37:27 2010 New Revision: 1026223 URL: http://svn.apache.org/viewvc?rev=1026223&view=rev Log: Use version suffix so that RM doesn't need to manually rename files for distribution Modified: tomcat/jk/trunk/native/iis/Makefile.amd64 tomcat/jk/trunk/native/iis/Makefile.ia64 Modified: tomcat/jk/trunk/native/iis/Makefile.amd64 URL: http://svn.apache.org/viewvc/tomcat/jk/trunk/native/iis/Makefile.amd64?rev=1026223&r1=1026222&r2=1026223&view=diff == --- tomcat/jk/trunk/native/iis/Makefile.amd64 (original) +++ tomcat/jk/trunk/native/iis/Makefile.amd64 Fri Oct 22 06:37:27 2010 @@ -18,6 +18,10 @@ # SetEnv.cmd /X64 /RETAIL # nmake -f Makefile.amd64 # + +JK_VERSION=1.2.31 +TARGET=isapi_redirect-$(JK_VERSION) + CPP=cl.exe MTL=midl.exe RSC=rc.exe @@ -29,11 +33,11 @@ OutDir=.\Release_amd64 !IF "$(RECURSE)" == "0" -ALL : "$(OUTDIR)\isapi_redirect.dll" +ALL : "$(OUTDIR)\$(TARGET).dll" !ELSE -ALL : "pcre_amd64" "$(OUTDIR)\isapi_redirect.dll" +ALL : "pcre_amd64" "$(OUTDIR)\$(TARGET).dll" !ENDIF @@ -68,10 +72,10 @@ CLEAN : -...@erase "$(INTDIR)\jk_url.obj" -...@erase "$(INTDIR)\jk_util.obj" -...@erase "$(INTDIR)\jk_worker.obj" - -...@erase "$(OUTDIR)\isapi_redirect.dll" + -...@erase "$(OUTDIR)\$(TARGET).dll" -...@erase "$(OUTDIR)\isapi_redirect.exp" -...@erase "$(OUTDIR)\isapi_redirect.lib" - -...@erase "$(OUTDIR)\isapi_redirect.pdb" + -...@erase "$(OUTDIR)\$(TARGET).pdb" "$(OUTDIR)" : if not exist "$(OUTDIR)/$(NULL)" mkdir "$(OUTDIR)" @@ -81,7 +85,7 @@ BSC32_FLAGS=/nologo /o"$(OUTDIR)\isapi.b BSC32_SBRS= \ LINK32=link.exe -LINK32_FLAGS=kernel32.lib user32.lib advapi32.lib ws2_32.lib mswsock.lib strsafe.lib bufferoverflowu.lib $(EXTRA_LIBS) /nologo /dll /incremental:no /pdb:"$(OUTDIR)\isapi_redirect.pdb" /debug /machine:AMD64 /def:".\isapi.def" /out:"$(OUTDIR)\isapi_redirect.dll" /implib:"$(OUTDIR)\isapi_redirect.lib" +LINK32_FLAGS=kernel32.lib user32.lib advapi32.lib ws2_32.lib mswsock.lib strsafe.lib bufferoverflowu.lib $(EXTRA_LIBS) /nologo /dll /incremental:no /pdb:"$(OUTDIR)\$(TARGET).pdb" /debug /machine:AMD64 /def:".\isapi.def" /out:"$(OUTDIR)\$(TARGET).dll" /implib:"$(OUTDIR)\isapi_redirect.lib" DEF_FILE= \ ".\isapi.def" LINK32_OBJS= \ @@ -111,12 +115,12 @@ LINK32_OBJS= \ "$(INTDIR)\jk.res" \ ".\pcre\Release_amd64\pcre.lib" -"$(OUTDIR)\isapi_redirect.dll" : "$(OUTDIR)" $(DEF_FILE) $(LINK32_OBJS) +"$(OUTDIR)\$(TARGET).dll" : "$(OUTDIR)" $(DEF_FILE) $(LINK32_OBJS) $(LINK32) @<< $(LINK32_FLAGS) $(LINK32_OBJS) << - IF EXIST $(OUTDIR)\isapi_redirect.manifest \ - mt -nologo -manifest $(OUTDIR)\isapi_redirect.manifest -outputresource:$(OUTDIR)\isapi_redirect.dll;2 + IF EXIST $(OUTDIR)\$(TARGET).manifest \ + mt -nologo -manifest $(OUTDIR)\$(TARGET).manifest -outputresource:$(OUTDIR)\$(TARGET).dll;2 CPP_PROJ=-nologo -MD -W3 -O2 -Ob2 -Oy- -Zi -EHsc /I "..\common" /I "pcre" /I "$(JAVA_HOME)\include" /I "$(JAVA_HOME)\include\win32" /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /D "_AMD64_=1" -DWIN64 /D "_WIN64" /Wp64 /FIPRE64PRA.H /D "JK_ISAPI" /D "ISAPI_EXPORTS" /D "HAS_PCRE" /D "PCRE_STATIC" $(CFLAGS) /Fo"$(INTDIR)\\" /Fd"$(INTDIR)\isapi_redirector_src" /FD /c Modified: tomcat/jk/trunk/native/iis/Makefile.ia64 URL: http://svn.apache.org/viewvc/tomcat/jk/trunk/native/iis/Makefile.ia64?rev=1026223&r1=1026222&r2=1026223&view=diff == --- tomcat/jk/trunk/native/iis/Makefile.ia64 (original) +++ tomcat/jk/trunk/native/iis/Makefile.ia64 Fri Oct 22 06:37:27 2010 @@ -18,6 +18,10 @@ # SetEnv.cmd /SRV64 /RETAIL # nmake -f Makefile.ia64 # + +JK_VERSION=1.2.31 +TARGET=isapi_redirect-$(JK_VERSION) + CPP=cl.exe MTL=midl.exe RSC=rc.exe @@ -29,11 +33,11 @@ OutDir=.\Release_ia64 !IF "$(RECURSE)" == "0" -ALL : "$(OUTDIR)\isapi_redirect.dll" +ALL : "$(OUTDIR)\$(TARGET).dll" !ELSE -ALL : "pcre_ia64" "$(OUTDIR)\isapi_redirect.dll" +ALL : "pcre_ia64" "$(OUTDIR)\$(TARGET).dll" !ENDIF @@ -68,10 +72,10 @@ CLEAN : -...@erase "$(INTDIR)\jk_url.obj" -...@erase "$(INTDIR)\jk_util.obj" -...@erase "$(INTDIR)\jk_worker.obj" - -...@erase "$(OUTDIR)\isapi_redirect.dll" + -...@erase "$(OUTDIR)\$(TARGET).dll" -...@erase "$(OUTDIR)\isapi_redirect.exp" -...@erase "$(OUTDIR)\isapi_redirect.lib" - -...@erase "$(OUTDIR)\isapi_redirect.pdb" + -...@erase "$(OUTDIR)\$(TARGET).pdb" "$(OUTDIR)" : if not exist "$(OUTDIR)/$(NULL)" mkdir "$(OUTDIR)" @@ -81,7 +85,7 @@ BSC32_FLAGS=/nologo /o"$(OUTDIR)\isapi.b BSC32_SBRS= \ LINK32=link.exe -LINK32_FLAGS=kernel32.lib user32.lib advapi32.lib ws2_32.lib mswsock.lib strsafe.lib bufferoverflowu.lib $(EXTRA_LIBS) /nologo /dll /incremental:no /pdb:"$(OUTDI
svn commit: r1026224 - in /tomcat/jk/trunk/native/netscape: Makefile.vc jk_nsapi_plugin.c
Author: mturk Date: Fri Oct 22 06:44:06 2010 New Revision: 1026224 URL: http://svn.apache.org/viewvc?rev=1026224&view=rev Log: Use version suffix so that RM doesn't need to manually rename files for distribution Modified: tomcat/jk/trunk/native/netscape/Makefile.vc tomcat/jk/trunk/native/netscape/jk_nsapi_plugin.c Modified: tomcat/jk/trunk/native/netscape/Makefile.vc URL: http://svn.apache.org/viewvc/tomcat/jk/trunk/native/netscape/Makefile.vc?rev=1026224&r1=1026223&r2=1026224&view=diff == --- tomcat/jk/trunk/native/netscape/Makefile.vc (original) +++ tomcat/jk/trunk/native/netscape/Makefile.vc Fri Oct 22 06:44:06 2010 @@ -24,13 +24,16 @@ NULL= NULL=nul !ENDIF +JK_VERSION=1.2.31 +TARGET=nsapi_redirect-$(JK_VERSION) + OUTDIR=.\nsapi_release INTDIR=.\nsapi_release # Begin Custom Macros OutDir=.\nsapi_release # End Custom Macros -ALL : "$(OUTDIR)\nsapi_redirect.dll" +ALL : "$(OUTDIR)\$(TARGET).dll" CLEAN : @@ -56,12 +59,12 @@ CLEAN : -...@erase "$(INTDIR)\jk_url.obj" -...@erase "$(INTDIR)\jk_util.obj" -...@erase "$(INTDIR)\jk_worker.obj" - -...@erase "$(OUTDIR)\nsapi_redirect.dll" + -...@erase "$(OUTDIR)\$(TARGET).dll" -...@erase "$(OUTDIR)\nsapi_redirect.exp" -...@erase "$(OUTDIR)\nsapi_redirect.lib" - -...@erase "$(OUTDIR)\nsapi_redirect.pdb" - -...@erase ".\Release\nsapi_redirect_src.idb" - -...@erase ".\Release\nsapi_redirect_src.pdb" + -...@erase "$(OUTDIR)\$(TARGET).pdb" + -...@erase "$(OUTDIR)\nsapi_redirect_src.idb" + -...@erase "$(OUTDIR)\\nsapi_redirect_src.pdb" "$(OUTDIR)" : if not exist "$(OUTDIR)/$(NULL)" mkdir "$(OUTDIR)" @@ -108,7 +111,7 @@ BSC32_FLAGS=/nologo /o"$(OUTDIR)\nsapi.b BSC32_SBRS= \ LINK32=link.exe -LINK32_FLAGS=ns-httpd40.lib kernel32.lib user32.lib advapi32.lib ws2_32.lib mswsock.lib $(EXTRA_LIBS) /nologo /base:"0x6A6B" /dll /incremental:no /pdb:"$(OUTDIR)\nsapi_redirect.pdb" /debug /machine:I386 /out:"$(OUTDIR)\nsapi_redirect.dll" /implib:"$(OUTDIR)\nsapi_redirect.lib" /libpath:"$(IPLANET_HOME)\lib" +LINK32_FLAGS=ns-httpd40.lib kernel32.lib user32.lib advapi32.lib ws2_32.lib mswsock.lib $(EXTRA_LIBS) /nologo /base:"0x6A6B" /dll /incremental:no /pdb:"$(OUTDIR)\$(TARGET).pdb" /debug /machine:I386 /out:"$(OUTDIR)\$(TARGET).dll" /implib:"$(OUTDIR)\nsapi_redirect.lib" /libpath:"$(IPLANET_HOME)\lib" LINK32_OBJS= \ "$(INTDIR)\jk_ajp12_worker.obj" \ "$(INTDIR)\jk_ajp13.obj" \ @@ -134,12 +137,12 @@ LINK32_OBJS= \ "$(INTDIR)\jk.res" \ "$(INTDIR)\jk_worker.obj" -"$(OUTDIR)\nsapi_redirect.dll" : "$(OUTDIR)" $(DEF_FILE) $(LINK32_OBJS) +"$(OUTDIR)\$(TARGET).dll" : "$(OUTDIR)" $(DEF_FILE) $(LINK32_OBJS) $(LINK32) @<< $(LINK32_FLAGS) $(LINK32_OBJS) << - IF EXIST $(OUTDIR)\nsapi_redirect.manifest \ - mt -nologo -manifest $(OUTDIR)\nsapi_redirect.manifest -outputresource:$(OUTDIR)\nsapi_redirect.dll;2 + IF EXIST $(OUTDIR)\$(TARGET).manifest \ + mt -nologo -manifest $(OUTDIR)\$(TARGET).manifest -outputresource:$(OUTDIR)\$(TARGET).dll;2 !IF "$(CFG)" == "nsapi - Win32 Release" Modified: tomcat/jk/trunk/native/netscape/jk_nsapi_plugin.c URL: http://svn.apache.org/viewvc/tomcat/jk/trunk/native/netscape/jk_nsapi_plugin.c?rev=1026224&r1=1026223&r2=1026224&view=diff == --- tomcat/jk/trunk/native/netscape/jk_nsapi_plugin.c (original) +++ tomcat/jk/trunk/native/netscape/jk_nsapi_plugin.c Fri Oct 22 06:44:06 2010 @@ -21,6 +21,10 @@ * Version: $Revision$ * ***/ +#ifndef _WIN32_WINNT +#define _WIN32_WINNT 0x0500 +#endif +#include #include "nsapi.h" #include "jk_global.h" - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
