kkolinko [Sun, 14 Nov 2010 22:48:23 +0000 (22:48 +0000)]
Remove "modern.exe" reference from Uninstall section.
There is no such file. It was just part of an old example.
E.g. mentioned here: http://forums.winamp.com/showthread.php?t=150064
git-svn-id: https://svn.apache.org/repos/asf/tomcat/trunk@
1035093 13f79535-47bb-0310-9956-
ffa450edef68
kkolinko [Sun, 14 Nov 2010 22:28:31 +0000 (22:28 +0000)]
Move 'FileOpen' command outside from the InstallRetry loop.
git-svn-id: https://svn.apache.org/repos/asf/tomcat/trunk@
1035088 13f79535-47bb-0310-9956-
ffa450edef68
kkolinko [Sun, 14 Nov 2010 21:59:23 +0000 (21:59 +0000)]
Define a variable to hold a handle to the service-install.log file.
Using $R7 was not clean, because it can be reused in different methods along the way.
Append to the file, instead of overwriting it.
git-svn-id: https://svn.apache.org/repos/asf/tomcat/trunk@
1035083 13f79535-47bb-0310-9956-
ffa450edef68
kkolinko [Sun, 14 Nov 2010 21:18:29 +0000 (21:18 +0000)]
Simplify logic
git-svn-id: https://svn.apache.org/repos/asf/tomcat/trunk@
1035071 13f79535-47bb-0310-9956-
ffa450edef68
kkolinko [Sun, 14 Nov 2010 21:05:41 +0000 (21:05 +0000)]
- SetOutPath creates the empty folders for us. Thus 'File /nonfatal' trick is not needed.
- Simplify deletion patterns in the Uninstall section
git-svn-id: https://svn.apache.org/repos/asf/tomcat/trunk@
1035068 13f79535-47bb-0310-9956-
ffa450edef68
kkolinko [Sun, 14 Nov 2010 20:38:40 +0000 (20:38 +0000)]
- Move SecMenu section back to its place,
but extract its code into a separate method.
(The "components" page of the installer lists sections in the order they apprear in the script file).
- Fix processing of tomcat-user.xml, server.xml broken by r1034926. Using 'ReserveFile' was not enough. A 'File' statement must be used as well.
- Fix control type for the "password" field.
- Simplify several logical expressions.
git-svn-id: https://svn.apache.org/repos/asf/tomcat/trunk@
1035062 13f79535-47bb-0310-9956-
ffa450edef68
kkolinko [Sun, 14 Nov 2010 19:10:22 +0000 (19:10 +0000)]
Rename 'Service' section -> 'Service Startup' in the installer, to make its intent more clear.
It is port of r451508 from TC 5.5
git-svn-id: https://svn.apache.org/repos/asf/tomcat/trunk@
1035051 13f79535-47bb-0310-9956-
ffa450edef68
kkolinko [Sun, 14 Nov 2010 02:25:36 +0000 (02:25 +0000)]
Move server.xml and tomcat-users.xml to the top of the installer archive (aka reserving them).
Those were installed among the first files ('configure' was called from Core section), but this code is near the end of the script and thus the files were packed near the end of the archive. The delay while extracting server.xml was noticeable. With this fix that step completes nearly instantly.
git-svn-id: https://svn.apache.org/repos/asf/tomcat/trunk@
1034926 13f79535-47bb-0310-9956-
ffa450edef68
kkolinko [Sun, 14 Nov 2010 02:05:56 +0000 (02:05 +0000)]
When installing on Windows,
do not leave undeleted stale files in $TEMP/src/res/confinstall/
The cause is that there are two confinstall folders in $dist: '/confinstall' and '/src/res/confinstall'
The 'File /r confinstall' directive was selecting both paths (like issues fixed in r611660),
but subsequent 'RMDir /r "$TEMP\confinstall"' removed only one of them.
New implementaion selects only one copy of the files, and places them into $PLUGINSDIR.
Also,
added DetailPrint statements for operations that take noticeable time
(file copying and spawning external programs).
git-svn-id: https://svn.apache.org/repos/asf/tomcat/trunk@
1034924 13f79535-47bb-0310-9956-
ffa450edef68
kkolinko [Sat, 13 Nov 2010 23:39:57 +0000 (23:39 +0000)]
Reimplemented the Windows installer GUI using nsDialogs and MUI2 libraries,
instead of deprecated InstallOptions.
The *.ini files are no more used. All is specified in the nsi script.
Migration was straightforward, except for a DirRequest field
(the field on the JVM selection page that displays path to JRE):
I had to create the Browse button explicitly and implement an OnClick handler. It is not spelled in the docs, but is discussed a lot on forums.
Other improvements:
- Added a textfield to display/edit the roles for the user that we add to tomcat-user.xml
- The roles are calculated depending on what webapps are installed (manager, host-manager, or both).
- I do not display "username", "password", "roles" fields when neither manager nor host-manager are selected. In the previous version we showed them as disabled. Now I do not show them on screen.
- Implemented creating Windows Shortcuts for the Manager, Host Manager apps and Documentation. There was implementation for that already (Manager and Docs shortcut only), but it was not working: it used IfFileExist check that always evaluated to false, because shortcuts were created before those files were installed.
- Added support for the '/?' command line option. It displays a message box with some short text about the /S and /D options. See .onInit function in tomcat.nsi for details.
- Using LogicLib.nsh for logic. I hope that the script became more easily readable.
git-svn-id: https://svn.apache.org/repos/asf/tomcat/trunk@
1034911 13f79535-47bb-0310-9956-
ffa450edef68
markt [Sat, 13 Nov 2010 12:46:30 +0000 (12:46 +0000)]
Revert r1031709
Parallel deployment implementation is changing as a result of discussion on the dev list and this re-ordering was specific to the previous implementation.
git-svn-id: https://svn.apache.org/repos/asf/tomcat/trunk@
1034748 13f79535-47bb-0310-9956-
ffa450edef68
markt [Fri, 12 Nov 2010 18:29:12 +0000 (18:29 +0000)]
Fix https://issues.apache.org/bugzilla/show_bug.cgi?id=50192
Improve performance for EL when running under a security manager.
Based on a patch by Robert Goff.
git-svn-id: https://svn.apache.org/repos/asf/tomcat/trunk@
1034500 13f79535-47bb-0310-9956-
ffa450edef68
markt [Fri, 12 Nov 2010 16:52:02 +0000 (16:52 +0000)]
Additional tests and fixes for https://issues.apache.org/bugzilla/show_bug.cgi?id=49297
Duplicate attribute rules for the page directive are slightly different.
Based on a patch by genspring
git-svn-id: https://svn.apache.org/repos/asf/tomcat/trunk@
1034468 13f79535-47bb-0310-9956-
ffa450edef68
markt [Fri, 12 Nov 2010 15:11:25 +0000 (15:11 +0000)]
Re-organise tests for bugs 49nnn
git-svn-id: https://svn.apache.org/repos/asf/tomcat/trunk@
1034416 13f79535-47bb-0310-9956-
ffa450edef68
markt [Fri, 12 Nov 2010 14:39:11 +0000 (14:39 +0000)]
Organise
git-svn-id: https://svn.apache.org/repos/asf/tomcat/trunk@
1034408 13f79535-47bb-0310-9956-
ffa450edef68
markt [Thu, 11 Nov 2010 22:10:25 +0000 (22:10 +0000)]
Fix https://issues.apache.org/bugzilla/show_bug.cgi?id=50230
Add new DistributedManager interface that is implemented by the Backup Manager to remove circular dependency between tomcat-catalina-ha and tomcat-catalina modules. Also allows third-party distributed Manager implementations to report full session information through the HTML Manager.
git-svn-id: https://svn.apache.org/repos/asf/tomcat/trunk@
1034174 13f79535-47bb-0310-9956-
ffa450edef68
markt [Thu, 11 Nov 2010 14:04:06 +0000 (14:04 +0000)]
Fix broken links
git-svn-id: https://svn.apache.org/repos/asf/tomcat/trunk@
1033941 13f79535-47bb-0310-9956-
ffa450edef68
markt [Thu, 11 Nov 2010 13:00:52 +0000 (13:00 +0000)]
Fix https://issues.apache.org/bugzilla/show_bug.cgi?id=50252
Prevent ClassCastException when using a <ResourceLink>.
Patch provided by Eiji Takahashi.
git-svn-id: https://svn.apache.org/repos/asf/tomcat/trunk@
1033925 13f79535-47bb-0310-9956-
ffa450edef68
markt [Thu, 11 Nov 2010 12:51:35 +0000 (12:51 +0000)]
Fix https://issues.apache.org/bugzilla/show_bug.cgi?id=50183
BIO sender was not scheduling tasks to the executor during normal operation.
Patch provided by Ariel.
git-svn-id: https://svn.apache.org/repos/asf/tomcat/trunk@
1033920 13f79535-47bb-0310-9956-
ffa450edef68
markt [Thu, 11 Nov 2010 12:41:54 +0000 (12:41 +0000)]
Clean-up
git-svn-id: https://svn.apache.org/repos/asf/tomcat/trunk@
1033916 13f79535-47bb-0310-9956-
ffa450edef68
markt [Thu, 11 Nov 2010 12:40:15 +0000 (12:40 +0000)]
Clean-up
git-svn-id: https://svn.apache.org/repos/asf/tomcat/trunk@
1033915 13f79535-47bb-0310-9956-
ffa450edef68
markt [Thu, 11 Nov 2010 12:33:07 +0000 (12:33 +0000)]
Clean-up
git-svn-id: https://svn.apache.org/repos/asf/tomcat/trunk@
1033913 13f79535-47bb-0310-9956-
ffa450edef68
markt [Thu, 11 Nov 2010 12:29:40 +0000 (12:29 +0000)]
Fix https://issues.apache.org/bugzilla/show_bug.cgi?id=50169
Ensure that when a Container is started that it doesn't try and register with the mapper unless its parent has already started.
Patch provided by Eiji Takahashi.
git-svn-id: https://svn.apache.org/repos/asf/tomcat/trunk@
1033912 13f79535-47bb-0310-9956-
ffa450edef68
markt [Thu, 11 Nov 2010 12:00:02 +0000 (12:00 +0000)]
Consistency.
git-svn-id: https://svn.apache.org/repos/asf/tomcat/trunk@
1033906 13f79535-47bb-0310-9956-
ffa450edef68
markt [Thu, 11 Nov 2010 11:58:11 +0000 (11:58 +0000)]
Update changelog
git-svn-id: https://svn.apache.org/repos/asf/tomcat/trunk@
1033905 13f79535-47bb-0310-9956-
ffa450edef68
markt [Thu, 11 Nov 2010 11:49:51 +0000 (11:49 +0000)]
Restore the ability (via an option) to edit the contents of WEB-INF and META-INF via WebDAV
git-svn-id: https://svn.apache.org/repos/asf/tomcat/trunk@
1033897 13f79535-47bb-0310-9956-
ffa450edef68
kkolinko [Thu, 11 Nov 2010 11:07:02 +0000 (11:07 +0000)]
Remove unused function.
Update changelog for r1027504, r1033856, r1033882.
git-svn-id: https://svn.apache.org/repos/asf/tomcat/trunk@
1033884 13f79535-47bb-0310-9956-
ffa450edef68
kkolinko [Thu, 11 Nov 2010 11:01:26 +0000 (11:01 +0000)]
Improvement for r1027504
Read PE header from jvm.dll to autodetect the target CPU architecture
Note: function findCpuType is no more used. Should I delete it?
git-svn-id: https://svn.apache.org/repos/asf/tomcat/trunk@
1033882 13f79535-47bb-0310-9956-
ffa450edef68
markt [Thu, 11 Nov 2010 10:16:13 +0000 (10:16 +0000)]
Typo / line-length
git-svn-id: https://svn.apache.org/repos/asf/tomcat/trunk@
1033868 13f79535-47bb-0310-9956-
ffa450edef68
markt [Thu, 11 Nov 2010 10:14:21 +0000 (10:14 +0000)]
Simpler code / fix Eclipse warnings
git-svn-id: https://svn.apache.org/repos/asf/tomcat/trunk@
1033867 13f79535-47bb-0310-9956-
ffa450edef68
markt [Thu, 11 Nov 2010 10:07:21 +0000 (10:07 +0000)]
Fix Eclipse warnings
git-svn-id: https://svn.apache.org/repos/asf/tomcat/trunk@
1033865 13f79535-47bb-0310-9956-
ffa450edef68
kkolinko [Thu, 11 Nov 2010 09:40:26 +0000 (09:40 +0000)]
Folloup to
1027504:
NSIS docs say that using relative offset in Goto does not play well with macros, because those may be expanded into several lines. Use a label instead.
git-svn-id: https://svn.apache.org/repos/asf/tomcat/trunk@
1033856 13f79535-47bb-0310-9956-
ffa450edef68
kkolinko [Thu, 11 Nov 2010 08:53:01 +0000 (08:53 +0000)]
Followup to implementation of https://issues.apache.org/bugzilla/show_bug.cgi?id=49860
Use local variable instead of array access.
git-svn-id: https://svn.apache.org/repos/asf/tomcat/trunk@
1033842 13f79535-47bb-0310-9956-
ffa450edef68
markt [Wed, 10 Nov 2010 13:02:55 +0000 (13:02 +0000)]
Fix https://issues.apache.org/bugzilla/show_bug.cgi?id=50222
Pin the system rather than the common class loader in memory which will work better in an embedded environment.
git-svn-id: https://svn.apache.org/repos/asf/tomcat/trunk@
1033448 13f79535-47bb-0310-9956-
ffa450edef68
markt [Wed, 10 Nov 2010 12:20:59 +0000 (12:20 +0000)]
Fix https://issues.apache.org/bugzilla/show_bug.cgi?id=50242
Provide sample log4j config that is a closer match to the default config
git-svn-id: https://svn.apache.org/repos/asf/tomcat/trunk@
1033432 13f79535-47bb-0310-9956-
ffa450edef68
markt [Wed, 10 Nov 2010 12:05:28 +0000 (12:05 +0000)]
Update
git-svn-id: https://svn.apache.org/repos/asf/tomcat/trunk@
1033423 13f79535-47bb-0310-9956-
ffa450edef68
markt [Wed, 10 Nov 2010 11:48:46 +0000 (11:48 +0000)]
Fix Eclipse warnings
git-svn-id: https://svn.apache.org/repos/asf/tomcat/trunk@
1033420 13f79535-47bb-0310-9956-
ffa450edef68
markt [Wed, 10 Nov 2010 11:08:44 +0000 (11:08 +0000)]
Additional fix for https://issues.apache.org/bugzilla/show_bug.cgi?id=49860
Need to store headers in a separate buffer - the contents of the read buffer may not be static for the life of the request
git-svn-id: https://svn.apache.org/repos/asf/tomcat/trunk@
1033415 13f79535-47bb-0310-9956-
ffa450edef68
markt [Wed, 10 Nov 2010 11:08:31 +0000 (11:08 +0000)]
kkolinko's additional test case for https://issues.apache.org/bugzilla/show_bug.cgi?id=49860
Test for correct handling if read buffer is filled and then re-used
git-svn-id: https://svn.apache.org/repos/asf/tomcat/trunk@
1033414 13f79535-47bb-0310-9956-
ffa450edef68
markt [Tue, 9 Nov 2010 17:08:25 +0000 (17:08 +0000)]
Fix https://issues.apache.org/bugzilla/show_bug.cgi?id=50184
Add an option to the RpcChannel to enable the Channel send options to be set for the reply message.
Based on a patch by Ariel.
git-svn-id: https://svn.apache.org/repos/asf/tomcat/trunk@
1033102 13f79535-47bb-0310-9956-
ffa450edef68
markt [Tue, 9 Nov 2010 16:59:24 +0000 (16:59 +0000)]
Fix warnings
git-svn-id: https://svn.apache.org/repos/asf/tomcat/trunk@
1033097 13f79535-47bb-0310-9956-
ffa450edef68
markt [Tue, 9 Nov 2010 15:53:16 +0000 (15:53 +0000)]
Suppress warnings
git-svn-id: https://svn.apache.org/repos/asf/tomcat/trunk@
1033042 13f79535-47bb-0310-9956-
ffa450edef68
markt [Tue, 9 Nov 2010 15:31:19 +0000 (15:31 +0000)]
Fix https://issues.apache.org/bugzilla/show_bug.cgi?id=50232
Remove dependency between StoreBase and PersistentManager and associated code clean-up.
Patch provided by Tiago Batista.
git-svn-id: https://svn.apache.org/repos/asf/tomcat/trunk@
1033024 13f79535-47bb-0310-9956-
ffa450edef68
markt [Tue, 9 Nov 2010 09:48:46 +0000 (09:48 +0000)]
Fix infinite loop reported on users list
git-svn-id: https://svn.apache.org/repos/asf/tomcat/trunk@
1032901 13f79535-47bb-0310-9956-
ffa450edef68
kkolinko [Mon, 8 Nov 2010 03:31:12 +0000 (03:31 +0000)]
Link to the local copy of documentatin (as in other places on the page).
git-svn-id: https://svn.apache.org/repos/asf/tomcat/trunk@
1032459 13f79535-47bb-0310-9956-
ffa450edef68
kkolinko [Sun, 7 Nov 2010 19:07:45 +0000 (19:07 +0000)]
Write attribute names in bold.
git-svn-id: https://svn.apache.org/repos/asf/tomcat/trunk@
1032350 13f79535-47bb-0310-9956-
ffa450edef68
kkolinko [Sun, 7 Nov 2010 17:48:41 +0000 (17:48 +0000)]
Remove obsolete link
git-svn-id: https://svn.apache.org/repos/asf/tomcat/trunk@
1032332 13f79535-47bb-0310-9956-
ffa450edef68
kkolinko [Sun, 7 Nov 2010 17:36:31 +0000 (17:36 +0000)]
Align documents list with the menu. Two of them were missing from the list, but present on the menu.
git-svn-id: https://svn.apache.org/repos/asf/tomcat/trunk@
1032324 13f79535-47bb-0310-9956-
ffa450edef68
kkolinko [Sun, 7 Nov 2010 09:21:48 +0000 (09:21 +0000)]
changelog for r1032232
git-svn-id: https://svn.apache.org/repos/asf/tomcat/trunk@
1032234 13f79535-47bb-0310-9956-
ffa450edef68
kkolinko [Sun, 7 Nov 2010 09:11:00 +0000 (09:11 +0000)]
Fix https://issues.apache.org/bugzilla/show_bug.cgi?id=50228
Clear the reference to a writer when BodyContentImpl is recycled.
By the way, this calls BodyContentImpl.clear() which recycles the buffer if it is grown too big. Recycling it early is good.
git-svn-id: https://svn.apache.org/repos/asf/tomcat/trunk@
1032232 13f79535-47bb-0310-9956-
ffa450edef68
markt [Fri, 5 Nov 2010 21:08:09 +0000 (21:08 +0000)]
Parallel deployment
Additional Context.get[Name|Path]() clean up
git-svn-id: https://svn.apache.org/repos/asf/tomcat/trunk@
1031795 13f79535-47bb-0310-9956-
ffa450edef68
markt [Fri, 5 Nov 2010 18:49:28 +0000 (18:49 +0000)]
Parallel deployment
Re-order postParseRequest in preparation for patch that does the real parallel deployment work
The order may look a little odd now, all will be clear with the patch
git-svn-id: https://svn.apache.org/repos/asf/tomcat/trunk@
1031709 13f79535-47bb-0310-9956-
ffa450edef68
markt [Fri, 5 Nov 2010 18:38:23 +0000 (18:38 +0000)]
Parallel deployment
Additional Context.get[Name|Path]() clean up
git-svn-id: https://svn.apache.org/repos/asf/tomcat/trunk@
1031706 13f79535-47bb-0310-9956-
ffa450edef68
markt [Fri, 5 Nov 2010 18:17:56 +0000 (18:17 +0000)]
Parallel deployment
Additional Context.get[Name|Path]() clean up
git-svn-id: https://svn.apache.org/repos/asf/tomcat/trunk@
1031690 13f79535-47bb-0310-9956-
ffa450edef68
markt [Fri, 5 Nov 2010 17:59:51 +0000 (17:59 +0000)]
Remove unused method
git-svn-id: https://svn.apache.org/repos/asf/tomcat/trunk@
1031683 13f79535-47bb-0310-9956-
ffa450edef68
pero [Fri, 5 Nov 2010 15:50:51 +0000 (15:50 +0000)]
Make attribute enabled changeable via JMX at AccessLogValve
git-svn-id: https://svn.apache.org/repos/asf/tomcat/trunk@
1031643 13f79535-47bb-0310-9956-
ffa450edef68
rjung [Fri, 5 Nov 2010 12:27:49 +0000 (12:27 +0000)]
BZ50219: Fix typo in jndi-resources-howto.xml.
git-svn-id: https://svn.apache.org/repos/asf/tomcat/trunk@
1031535 13f79535-47bb-0310-9956-
ffa450edef68
markt [Thu, 4 Nov 2010 23:03:26 +0000 (23:03 +0000)]
https://issues.apache.org/bugzilla/show_bug.cgi?id=50168
Add a DESTROYING state and associated events and use them to ensure Contexts are only destroyed once.
git-svn-id: https://svn.apache.org/repos/asf/tomcat/trunk@
1031335 13f79535-47bb-0310-9956-
ffa450edef68
markt [Thu, 4 Nov 2010 19:58:43 +0000 (19:58 +0000)]
Use the local copy of the docs
git-svn-id: https://svn.apache.org/repos/asf/tomcat/trunk@
1031196 13f79535-47bb-0310-9956-
ffa450edef68
markt [Thu, 4 Nov 2010 19:53:15 +0000 (19:53 +0000)]
Typos.
git-svn-id: https://svn.apache.org/repos/asf/tomcat/trunk@
1031194 13f79535-47bb-0310-9956-
ffa450edef68
markt [Thu, 4 Nov 2010 19:51:30 +0000 (19:51 +0000)]
Fix https://issues.apache.org/bugzilla/show_bug.cgi?id=50127
Also fix all the other Eclipse warnings
git-svn-id: https://svn.apache.org/repos/asf/tomcat/trunk@
1031190 13f79535-47bb-0310-9956-
ffa450edef68
markt [Thu, 4 Nov 2010 17:59:20 +0000 (17:59 +0000)]
https://issues.apache.org/bugzilla/show_bug.cgi?id=50159
Add a new attribute for <Resource> elements, singleton that controls whether or not a new object is created every time a JNDI lookup is performed to obtain the resource. The default value is true, which will return the same instance of the resource in every JNDI lookup.
git-svn-id: https://svn.apache.org/repos/asf/tomcat/trunk@
1031112 13f79535-47bb-0310-9956-
ffa450edef68
markt [Thu, 4 Nov 2010 17:42:41 +0000 (17:42 +0000)]
List bugs in numerical order
git-svn-id: https://svn.apache.org/repos/asf/tomcat/trunk@
1031099 13f79535-47bb-0310-9956-
ffa450edef68
funkman [Thu, 4 Nov 2010 15:47:56 +0000 (15:47 +0000)]
Allow for configest
Now one may type in bin/configtest.sh and then check the
exit code.
This will try to use the default loggers so it may spew
"a lot" to stdout/err so as to avoid clobbering existing
log files in use.
Potential future todo
- Making the parsing of server.xml more finicky as to avoid
bad values being ignored (example - use 'x8005' as the
shutdown port - and tomcat still starts up fine )
git-svn-id: https://svn.apache.org/repos/asf/tomcat/trunk@
1031043 13f79535-47bb-0310-9956-
ffa450edef68
markt [Thu, 4 Nov 2010 00:50:41 +0000 (00:50 +0000)]
Ensure embedded jars contain all the necessary classes
Re-order things so it is easier to check all are present
git-svn-id: https://svn.apache.org/repos/asf/tomcat/trunk@
1030783 13f79535-47bb-0310-9956-
ffa450edef68
markt [Wed, 3 Nov 2010 12:19:46 +0000 (12:19 +0000)]
Typos
git-svn-id: https://svn.apache.org/repos/asf/tomcat/trunk@
1030433 13f79535-47bb-0310-9956-
ffa450edef68
markt [Wed, 3 Nov 2010 12:18:27 +0000 (12:18 +0000)]
Typos
git-svn-id: https://svn.apache.org/repos/asf/tomcat/trunk@
1030431 13f79535-47bb-0310-9956-
ffa450edef68
kkolinko [Tue, 2 Nov 2010 22:04:44 +0000 (22:04 +0000)]
Improve handling of nulls in StandardEngine.logAccess()
This takes care of the case when findChild(getDefaultHost()) returns null.
git-svn-id: https://svn.apache.org/repos/asf/tomcat/trunk@
1030253 13f79535-47bb-0310-9956-
ffa450edef68
rjung [Tue, 2 Nov 2010 13:30:52 +0000 (13:30 +0000)]
Log the right JSP.
git-svn-id: https://svn.apache.org/repos/asf/tomcat/trunk@
1030037 13f79535-47bb-0310-9956-
ffa450edef68
rjung [Tue, 2 Nov 2010 12:14:43 +0000 (12:14 +0000)]
Add logging and JMX support to JSP unloading.
Also need to make getContent() public in
FastRemovalDequeue to support logging.
git-svn-id: https://svn.apache.org/repos/asf/tomcat/trunk@
1030014 13f79535-47bb-0310-9956-
ffa450edef68
rjung [Tue, 2 Nov 2010 10:57:26 +0000 (10:57 +0000)]
Fix some MBean descriptors:
- "asyncSupported" needs is="true" for Valves
- "containerName" is gone in valves since r940802
- "enabled" uses "get" instead of "is"
git-svn-id: https://svn.apache.org/repos/asf/tomcat/trunk@
1030000 13f79535-47bb-0310-9956-
ffa450edef68
rjung [Tue, 2 Nov 2010 10:55:05 +0000 (10:55 +0000)]
Fix MBean description.
git-svn-id: https://svn.apache.org/repos/asf/tomcat/trunk@
1029999 13f79535-47bb-0310-9956-
ffa450edef68
rjung [Tue, 2 Nov 2010 10:32:59 +0000 (10:32 +0000)]
The jspFile attribute is no longer available
in the StandardWrapper as of r1003589.
git-svn-id: https://svn.apache.org/repos/asf/tomcat/trunk@
1029996 13f79535-47bb-0310-9956-
ffa450edef68
markt [Mon, 1 Nov 2010 17:51:19 +0000 (17:51 +0000)]
Review comment from kkolinko
Make sure we initialize StandardEngine.accessLog
git-svn-id: https://svn.apache.org/repos/asf/tomcat/trunk@
1029767 13f79535-47bb-0310-9956-
ffa450edef68
markt [Mon, 1 Nov 2010 17:22:33 +0000 (17:22 +0000)]
Make Tomcat more tolerant of nulls when generating JMX names for Valves.
git-svn-id: https://svn.apache.org/repos/asf/tomcat/trunk@
1029755 13f79535-47bb-0310-9956-
ffa450edef68
funkman [Mon, 1 Nov 2010 15:53:22 +0000 (15:53 +0000)]
changelog update
git-svn-id: https://svn.apache.org/repos/asf/tomcat/trunk@
1029720 13f79535-47bb-0310-9956-
ffa450edef68
funkman [Mon, 1 Nov 2010 15:48:32 +0000 (15:48 +0000)]
bug 49180
Add option to disable log rotation in FileHandler
credit: Pid (pidster at apache )
git-svn-id: https://svn.apache.org/repos/asf/tomcat/trunk@
1029719 13f79535-47bb-0310-9956-
ffa450edef68
funkman [Mon, 1 Nov 2010 15:30:48 +0000 (15:30 +0000)]
redesign of home page
by Pid (pidster at apache )
git-svn-id: https://svn.apache.org/repos/asf/tomcat/trunk@
1029708 13f79535-47bb-0310-9956-
ffa450edef68
markt [Mon, 1 Nov 2010 11:26:00 +0000 (11:26 +0000)]
Parallel deployment
Fix regression that broke WAR deployments
git-svn-id: https://svn.apache.org/repos/asf/tomcat/trunk@
1029616 13f79535-47bb-0310-9956-
ffa450edef68
markt [Mon, 1 Nov 2010 02:04:53 +0000 (02:04 +0000)]
Parallel deployment
- More work separating Context.name & Context.path
- Review use of Context.getName() and Context.getPath() and use the correct one
- Start to add webappVersion property to Context (many components not version aware - e.g. Manager app)
- Set version when deploying apps if version is specified
- Include version in Context.name if version is specified
- New ContextName util class to handle all path/name/version etc translations
In most cases the behaviour is unchanged if the version is not specified. The one exception is JMX ObjectNames that used to contain a key value pair "path=...". Since context path is no longer unique when using versions, this has been changed to "context=..." and the context name used which is unique.
git-svn-id: https://svn.apache.org/repos/asf/tomcat/trunk@
1029527 13f79535-47bb-0310-9956-
ffa450edef68
kkolinko [Sun, 31 Oct 2010 15:22:12 +0000 (15:22 +0000)]
Remove space char from the end of a line
git-svn-id: https://svn.apache.org/repos/asf/tomcat/trunk@
1029380 13f79535-47bb-0310-9956-
ffa450edef68
markt [Sun, 31 Oct 2010 13:11:55 +0000 (13:11 +0000)]
Parallel deployment
Start to separate context.name and context.path
Currently name==path but eventually name may include a version element but path will not.
git-svn-id: https://svn.apache.org/repos/asf/tomcat/trunk@
1029330 13f79535-47bb-0310-9956-
ffa450edef68
rjung [Fri, 29 Oct 2010 23:53:15 +0000 (23:53 +0000)]
Make sure, we mention the unit "seconds" for
jspIdleTimeout everywhere.
git-svn-id: https://svn.apache.org/repos/asf/tomcat/trunk@
1028950 13f79535-47bb-0310-9956-
ffa450edef68
rjung [Fri, 29 Oct 2010 23:34:37 +0000 (23:34 +0000)]
Document jspIdleTimeout.
git-svn-id: https://svn.apache.org/repos/asf/tomcat/trunk@
1028944 13f79535-47bb-0310-9956-
ffa450edef68
rjung [Fri, 29 Oct 2010 23:22:35 +0000 (23:22 +0000)]
Add new JSP init parameter "jspIdleTimeout".
If set > 0 (default -1), a background task
will unload all JSPs being idle longer than this
time in seconds.
git-svn-id: https://svn.apache.org/repos/asf/tomcat/trunk@
1028940 13f79535-47bb-0310-9956-
ffa450edef68
rjung [Fri, 29 Oct 2010 23:08:59 +0000 (23:08 +0000)]
We will no longer continuously update the jspQueue
order. Instead only update each JSP once between
background task runs.
Changes to JspRuntimeContext:
- Rename "ticket" to "unloadHandle"
- Rename "lastCheck" to "lastCompileCheck" to clarify purpose
- Add lastJspQueueUpdate which contains the time of
the last run of checkUnload()
- Add getter for lastJspQueueUpdate
- Background task checkUnload() now only tracks the time
of its last execution.
Changes to JspServletWrapper:
- Rename "ticket" to "unloadHandle"
- Replace options.getMaxLoadedJsps() with final field "unloadByCount"
- Do no longer move wrapper in jspQueue on each access.
Only move once after each run of the background task checkUnload().
git-svn-id: https://svn.apache.org/repos/asf/tomcat/trunk@
1028939 13f79535-47bb-0310-9956-
ffa450edef68
rjung [Fri, 29 Oct 2010 22:44:52 +0000 (22:44 +0000)]
Changes to FastRemovalDequeue:
- Make queue thread safe and remove external synchronisation
- Provide maximal size to queue
- Include size checking when adding entries
- Return handle to displaced entries when queue overflows
while adding a new entry
- Explicitely invalidate queue entries on removal by using
new field "valid"
Changes to JspRuntimeContext:
- Initialize FastRemovalDequeue with correct size
- No more external synchronisation for FastRemovalDequeue
- Private utility method to unload a wrapper
- Check for displaced wrapper when adding a new wrapper
to the queue and unload it
Changes to JspServletWrapper:
- No more explicit overflow check for the queue. It's now
done implicitely when adding to the queue.
git-svn-id: https://svn.apache.org/repos/asf/tomcat/trunk@
1028935 13f79535-47bb-0310-9956-
ffa450edef68
rjung [Fri, 29 Oct 2010 17:54:27 +0000 (17:54 +0000)]
Simplify JSP limiter:
- inline getJspForUnload
It is only used privately and only in one place
plus the code gets easier to understand.
- remove compilation interval check from
background method checkUnload(). Better to run
on every iteration of the background job.
- Do not check JSP count against the size of
the wrapper list (jsps). Instead check against
the queue length.
git-svn-id: https://svn.apache.org/repos/asf/tomcat/trunk@
1028863 13f79535-47bb-0310-9956-
ffa450edef68
rjung [Fri, 29 Oct 2010 17:47:01 +0000 (17:47 +0000)]
Rearrange placement of JSP limter code in JSP
servlet wrapper. Do everything in one place:
- add to the queue if this is the first time
and only then check for the size and shrink
if necessary
- move to the front of the queue otherwise
Move this in front of the actual servlet service.
git-svn-id: https://svn.apache.org/repos/asf/tomcat/trunk@
1028862 13f79535-47bb-0310-9956-
ffa450edef68
rjung [Fri, 29 Oct 2010 17:41:05 +0000 (17:41 +0000)]
Improve Jsp limiter:
- Under high load entries removed from the jspQueue
were already re-added via moveFirst by some other
concurrent request, before the JspWrapper was
unregistered. Add "valid" field to the Entry
object to mark as invalid during removal.
- Improve comment about thread-safetyness and add
comment about the new "valid" field.
- Add new getSize(). Will be used soon.
- Reorder getters and setters of Entry.
git-svn-id: https://svn.apache.org/repos/asf/tomcat/trunk@
1028861 13f79535-47bb-0310-9956-
ffa450edef68
funkman [Fri, 29 Oct 2010 13:43:30 +0000 (13:43 +0000)]
for resourceOnlyServlets allow whitespace in the comma
seperated list.
git-svn-id: https://svn.apache.org/repos/asf/tomcat/trunk@
1028737 13f79535-47bb-0310-9956-
ffa450edef68
kkolinko [Fri, 29 Oct 2010 01:13:43 +0000 (01:13 +0000)]
Add changelog entry for r1005802
Also corrected a typo
git-svn-id: https://svn.apache.org/repos/asf/tomcat/trunk@
1028575 13f79535-47bb-0310-9956-
ffa450edef68
kkolinko [Fri, 29 Oct 2010 00:56:05 +0000 (00:56 +0000)]
Use correct arguments for an error message in TagLibraryInfoImpl.
It is a followup to r937791
git-svn-id: https://svn.apache.org/repos/asf/tomcat/trunk@
1028565 13f79535-47bb-0310-9956-
ffa450edef68
markt [Thu, 28 Oct 2010 22:34:52 +0000 (22:34 +0000)]
Missing closing tag
git-svn-id: https://svn.apache.org/repos/asf/tomcat/trunk@
1028523 13f79535-47bb-0310-9956-
ffa450edef68
markt [Thu, 28 Oct 2010 22:33:45 +0000 (22:33 +0000)]
Add new feature
git-svn-id: https://svn.apache.org/repos/asf/tomcat/trunk@
1028522 13f79535-47bb-0310-9956-
ffa450edef68
markt [Thu, 28 Oct 2010 22:29:25 +0000 (22:29 +0000)]
Provide configuration option to work around new welcome file mapping requirements of section 10.10 Servlet 3.0 that break a lot of existing apps. The default configuration retains the current Tomcat 6.0.x behaviour. Enabling STRICT_SERVLET_COMPLILANCE enforces the new requirements by default. Includes test cases.
git-svn-id: https://svn.apache.org/repos/asf/tomcat/trunk@
1028521 13f79535-47bb-0310-9956-
ffa450edef68
rjung [Thu, 28 Oct 2010 17:30:28 +0000 (17:30 +0000)]
Move Entry to an inner class of FastRemovalDequeue.
All implementation details of Entry are now opaque
to the consumer of the FastRemovalDequeue.
Remove double generification when using the inner
class.
git-svn-id: https://svn.apache.org/repos/asf/tomcat/trunk@
1028396 13f79535-47bb-0310-9956-
ffa450edef68
rjung [Thu, 28 Oct 2010 17:13:25 +0000 (17:13 +0000)]
Reduce visibility. All those are only needed
by the Queue implementation, not by the consumer
of the collection.
git-svn-id: https://svn.apache.org/repos/asf/tomcat/trunk@
1028389 13f79535-47bb-0310-9956-
ffa450edef68
rjung [Thu, 28 Oct 2010 16:27:31 +0000 (16:27 +0000)]
Overhaul JspQueue, no functional change for Jasper.
- Rename class to FastRemovalDequeue, because
it can be used gnerally. Nothing jsp related in it.
- Rename "head" to "first" as a better match for the
existing "last"
- Switch previous and next: "previous" was
pointing from first to last, "next" from
last to first. Mind-bending.
- Add a bit to the description. Remove "ticket"
language.
- Use more standard terminology "push" to
insert in front and "pop" to remove from last
- Add methods shift and unshift for the operations
at the other ends. Not used yet.
- Add remove() method (not used yet).
- Rename makeYoungest() to moveFirst() and add
moveLast() (not used yet). This data structure
doesn't actually know about young or old.
Add "Entry-" prefix to Entry.toString().
Rename makeFirst() in JspRuntimeContext to
makeYoungest(), because there we actually are using
timestamp information.
git-svn-id: https://svn.apache.org/repos/asf/tomcat/trunk@
1028377 13f79535-47bb-0310-9956-
ffa450edef68
markt [Thu, 28 Oct 2010 12:31:07 +0000 (12:31 +0000)]
Remove unused code
git-svn-id: https://svn.apache.org/repos/asf/tomcat/trunk@
1028276 13f79535-47bb-0310-9956-
ffa450edef68