svn commit: r699210 - /tomcat/connectors/trunk/jk/native/common/jk_uri_worker_map.c
Author: rjung Date: Fri Sep 26 01:11:43 2008 New Revision: 699210 URL: http://svn.apache.org/viewvc?rev=699210&view=rev Log: Fix wrong log message in unreleased extension feature. Modified: tomcat/connectors/trunk/jk/native/common/jk_uri_worker_map.c Modified: tomcat/connectors/trunk/jk/native/common/jk_uri_worker_map.c URL: http://svn.apache.org/viewvc/tomcat/connectors/trunk/jk/native/common/jk_uri_worker_map.c?rev=699210&r1=699209&r2=699210&view=diff == --- tomcat/connectors/trunk/jk/native/common/jk_uri_worker_map.c (original) +++ tomcat/connectors/trunk/jk/native/common/jk_uri_worker_map.c Fri Sep 26 01:11:43 2008 @@ -631,7 +631,7 @@ if (uwr->extensions.fail_on_status_str) jk_log(l, JK_LOG_WARNING, "extension '%s' in uri worker map only allowed once", - JK_UWMAP_EXTENSION_ACTIVE); + JK_UWMAP_EXTENSION_FAIL_ON_STATUS); else uwr->extensions.fail_on_status_str = param + strlen(JK_UWMAP_EXTENSION_FAIL_ON_STATUS); } - To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
DO NOT REPLY [Bug 45872] warning message for fail_on_status extension is incorrect
https://issues.apache.org/bugzilla/show_bug.cgi?id=45872 Rainer Jung <[EMAIL PROTECTED]> changed: What|Removed |Added Status|NEW |RESOLVED Resolution||FIXED --- Comment #2 from Rainer Jung <[EMAIL PROTECTED]> 2008-09-26 01:12:50 PST --- Committed in revision 699210. It will be part of 1.2.27, which is also the first release, that will have the underlying feature. Thanks for testing and reporting! -- 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: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
svn commit: r699234 - /tomcat/tc6.0.x/trunk/java/org/apache/jasper/compiler/Parser.java
Author: markt Date: Fri Sep 26 02:08:29 2008 New Revision: 699234 URL: http://svn.apache.org/viewvc?rev=699234&view=rev Log: Restore import that is still required (EL patches were applied out of order) Modified: tomcat/tc6.0.x/trunk/java/org/apache/jasper/compiler/Parser.java Modified: tomcat/tc6.0.x/trunk/java/org/apache/jasper/compiler/Parser.java URL: http://svn.apache.org/viewvc/tomcat/tc6.0.x/trunk/java/org/apache/jasper/compiler/Parser.java?rev=699234&r1=699233&r2=699234&view=diff == --- tomcat/tc6.0.x/trunk/java/org/apache/jasper/compiler/Parser.java (original) +++ tomcat/tc6.0.x/trunk/java/org/apache/jasper/compiler/Parser.java Fri Sep 26 02:08:29 2008 @@ -27,6 +27,7 @@ import javax.servlet.jsp.tagext.TagInfo; import javax.servlet.jsp.tagext.TagLibraryInfo; +import org.apache.jasper.Constants; import org.apache.jasper.JasperException; import org.apache.jasper.JspCompilationContext; import org.xml.sax.Attributes; - To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
svn commit: r699236 - in /tomcat/tc6.0.x/trunk: STATUS.txt java/org/apache/el/lang/ELSupport.java
Author: rjung
Date: Fri Sep 26 02:11:17 2008
New Revision: 699236
URL: http://svn.apache.org/viewvc?rev=699236&view=rev
Log:
Backport r649637: "Remove unused code" in ELSupport.java.
Modified:
tomcat/tc6.0.x/trunk/STATUS.txt
tomcat/tc6.0.x/trunk/java/org/apache/el/lang/ELSupport.java
Modified: tomcat/tc6.0.x/trunk/STATUS.txt
URL:
http://svn.apache.org/viewvc/tomcat/tc6.0.x/trunk/STATUS.txt?rev=699236&r1=699235&r2=699236&view=diff
==
--- tomcat/tc6.0.x/trunk/STATUS.txt (original)
+++ tomcat/tc6.0.x/trunk/STATUS.txt Fri Sep 26 02:11:17 2008
@@ -189,12 +189,6 @@
+1: jclere, markt, remm
-1:
-* Backport "Remove unused code" in ELSupport.java.
- Keeps trunk and tc6 in sync and is no risk.
- http://svn.apache.org/viewvc?rev=649637&view=rev
- +1: rjung, markt, remm (but cosmetic changes should stop in this branch)
- -1:
-
* Partial fix for https://issues.apache.org/bugzilla/show_bug.cgi?id=45878
Add proper manifests (regression from 5.5.x) and LICENSE & NOTICE files
Lots of ways to do this. Alternative/better suggestions welcome
Modified: tomcat/tc6.0.x/trunk/java/org/apache/el/lang/ELSupport.java
URL:
http://svn.apache.org/viewvc/tomcat/tc6.0.x/trunk/java/org/apache/el/lang/ELSupport.java?rev=699236&r1=699235&r2=699236&view=diff
==
--- tomcat/tc6.0.x/trunk/java/org/apache/el/lang/ELSupport.java (original)
+++ tomcat/tc6.0.x/trunk/java/org/apache/el/lang/ELSupport.java Fri Sep 26
02:11:17 2008
@@ -36,8 +36,6 @@
*/
public class ELSupport {
-private final static ELSupport REF = new ELSupport();
-
private final static Long ZERO = new Long(0L);
public final static void throwUnhandled(Object base, Object property)
@@ -433,9 +431,8 @@
public final static boolean isStringFloat(final String str) {
int len = str.length();
if (len > 1) {
-char c = 0;
for (int i = 0; i < len; i++) {
-switch (c = str.charAt(i)) {
+switch (str.charAt(i)) {
case 'E':
return true;
case 'e':
-
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
svn commit: r699258 - in /tomcat/tc6.0.x/trunk: ./ STATUS.txt conf/logging.properties
Author: markt
Date: Fri Sep 26 03:33:55 2008
New Revision: 699258
URL: http://svn.apache.org/viewvc?rev=699258&view=rev
Log:
Remove the admin app from the logging configuration
Modified:
tomcat/tc6.0.x/trunk/ (props changed)
tomcat/tc6.0.x/trunk/STATUS.txt
tomcat/tc6.0.x/trunk/conf/logging.properties
Propchange: tomcat/tc6.0.x/trunk/
--
--- svn:mergeinfo (original)
+++ svn:mergeinfo Fri Sep 26 03:33:55 2008
@@ -1 +1 @@
-/tomcat/trunk:673796,673820,683982,684001,684081,684234,684269-684270,687503,687645,690781,691805,692748,695053,695311,698227,698236
+/tomcat/trunk:673796,673820,683982,684001,684081,684234,684269-684270,687503,687645,690781,691805,692748,695053,695311,698012,698227,698236
Modified: tomcat/tc6.0.x/trunk/STATUS.txt
URL:
http://svn.apache.org/viewvc/tomcat/tc6.0.x/trunk/STATUS.txt?rev=699258&r1=699257&r2=699258&view=diff
==
--- tomcat/tc6.0.x/trunk/STATUS.txt (original)
+++ tomcat/tc6.0.x/trunk/STATUS.txt Fri Sep 26 03:33:55 2008
@@ -167,11 +167,6 @@
+1: rjung, mturk, markt
0: remm (also partially applies to the two other AJP connectors)
-* Remove admin app from logging configuration
- http://svn.apache.org/viewvc?rev=698012&view=rev
- +1: markt, rjung, remm
- -1:
-
* Add CombinedRealm and LockOutRealm with docs
http://people.apache.org/~markt/patches/2008-09-24-lockout-realm.patch
+1: markt, remm (but you should stop adding features at some point)
Modified: tomcat/tc6.0.x/trunk/conf/logging.properties
URL:
http://svn.apache.org/viewvc/tomcat/tc6.0.x/trunk/conf/logging.properties?rev=699258&r1=699257&r2=699258&view=diff
==
--- tomcat/tc6.0.x/trunk/conf/logging.properties (original)
+++ tomcat/tc6.0.x/trunk/conf/logging.properties Fri Sep 26 03:33:55 2008
@@ -13,7 +13,7 @@
# See the License for the specific language governing permissions and
# limitations under the License.
-handlers = 1catalina.org.apache.juli.FileHandler,
2localhost.org.apache.juli.FileHandler, 3manager.org.apache.juli.FileHandler,
4admin.org.apache.juli.FileHandler, 5host-manager.org.apache.juli.FileHandler,
java.util.logging.ConsoleHandler
+handlers = 1catalina.org.apache.juli.FileHandler,
2localhost.org.apache.juli.FileHandler, 3manager.org.apache.juli.FileHandler,
4host-manager.org.apache.juli.FileHandler, java.util.logging.ConsoleHandler
.handlers = 1catalina.org.apache.juli.FileHandler,
java.util.logging.ConsoleHandler
@@ -34,13 +34,9 @@
3manager.org.apache.juli.FileHandler.directory = ${catalina.base}/logs
3manager.org.apache.juli.FileHandler.prefix = manager.
-4admin.org.apache.juli.FileHandler.level = FINE
-4admin.org.apache.juli.FileHandler.directory = ${catalina.base}/logs
-4admin.org.apache.juli.FileHandler.prefix = admin.
-
-5host-manager.org.apache.juli.FileHandler.level = FINE
-5host-manager.org.apache.juli.FileHandler.directory = ${catalina.base}/logs
-5host-manager.org.apache.juli.FileHandler.prefix = host-manager.
+4host-manager.org.apache.juli.FileHandler.level = FINE
+4host-manager.org.apache.juli.FileHandler.directory = ${catalina.base}/logs
+4host-manager.org.apache.juli.FileHandler.prefix = host-manager.
java.util.logging.ConsoleHandler.level = FINE
java.util.logging.ConsoleHandler.formatter = java.util.logging.SimpleFormatter
@@ -57,11 +53,8 @@
org.apache.catalina.core.ContainerBase.[Catalina].[localhost].[/manager].level
= INFO
org.apache.catalina.core.ContainerBase.[Catalina].[localhost].[/manager].handlers
= 3manager.org.apache.juli.FileHandler
-org.apache.catalina.core.ContainerBase.[Catalina].[localhost].[/admin].level =
INFO
-org.apache.catalina.core.ContainerBase.[Catalina].[localhost].[/admin].handlers
= 4admin.org.apache.juli.FileHandler
-
org.apache.catalina.core.ContainerBase.[Catalina].[localhost].[/host-manager].level
= INFO
-org.apache.catalina.core.ContainerBase.[Catalina].[localhost].[/host-manager].handlers
= 5host-manager.org.apache.juli.FileHandler
+org.apache.catalina.core.ContainerBase.[Catalina].[localhost].[/host-manager].handlers
= 4host-manager.org.apache.juli.FileHandler
# For example, set the com.xyz.foo logger to only log SEVERE
# messages:
-
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
svn commit: r699260 - in /tomcat/tc6.0.x/trunk: ./ STATUS.txt res/tomcat.nsi webapps/docs/changelog.xml
Author: markt Date: Fri Sep 26 03:39:42 2008 New Revision: 699260 URL: http://svn.apache.org/viewvc?rev=699260&view=rev Log: Fix https://issues.apache.org/bugzilla/show_bug.cgi?id=45852 Add special handing to the Windows installer for a charset that doesn't follow the standard naming convention. Modified: tomcat/tc6.0.x/trunk/ (props changed) tomcat/tc6.0.x/trunk/STATUS.txt tomcat/tc6.0.x/trunk/res/tomcat.nsi tomcat/tc6.0.x/trunk/webapps/docs/changelog.xml Propchange: tomcat/tc6.0.x/trunk/ -- --- svn:mergeinfo (original) +++ svn:mergeinfo Fri Sep 26 03:39:42 2008 @@ -1 +1 @@ -/tomcat/trunk:673796,673820,683982,684001,684081,684234,684269-684270,687503,687645,690781,691805,692748,695053,695311,698012,698227,698236 +/tomcat/trunk:673796,673820,683982,684001,684081,684234,684269-684270,687503,687645,690781,691805,692748,695053,695311,698012,698227,698236,698613 Modified: tomcat/tc6.0.x/trunk/STATUS.txt URL: http://svn.apache.org/viewvc/tomcat/tc6.0.x/trunk/STATUS.txt?rev=699260&r1=699259&r2=699260&view=diff == --- tomcat/tc6.0.x/trunk/STATUS.txt (original) +++ tomcat/tc6.0.x/trunk/STATUS.txt Fri Sep 26 03:39:42 2008 @@ -172,13 +172,6 @@ +1: markt, remm (but you should stop adding features at some point) -1: -* Fix https://issues.apache.org/bugzilla/show_bug.cgi?id=45852 - Add special handing to the Windows installer for a charset that doesn't follow - the standard naming convention - http://svn.apache.org/viewvc?rev=698613&view=rev - +1: markt, mturk, remm (arg, hack) - -1: - * Update tc-native to lastest version: http://people.apache.org/~jfclere/patches/patch.new-tcnative +1: jclere, markt, remm Modified: tomcat/tc6.0.x/trunk/res/tomcat.nsi URL: http://svn.apache.org/viewvc/tomcat/tc6.0.x/trunk/res/tomcat.nsi?rev=699260&r1=699259&r2=699260&view=diff == --- tomcat/tc6.0.x/trunk/res/tomcat.nsi (original) +++ tomcat/tc6.0.x/trunk/res/tomcat.nsi Fri Sep 26 03:39:42 2008 @@ -590,8 +590,11 @@ FileOpen $R9 "$INSTDIR\conf\tomcat-users.xml" w ; File will be written using current windows codepage System::Call 'Kernel32::GetACP() i .r18' - FileWrite $R9 "$\r$\n" - + StrCmp $R8 "932" 0 +3 +; Special case where Java uses non-standard name for character set +FileWrite $R9 "$\r$\n" +Goto +2 +FileWrite $R9 "$\r$\n" Push "$TEMP\confinstall\tomcat-users_1.xml" Call copyFile FileWrite $R9 $R5 Modified: tomcat/tc6.0.x/trunk/webapps/docs/changelog.xml URL: http://svn.apache.org/viewvc/tomcat/tc6.0.x/trunk/webapps/docs/changelog.xml?rev=699260&r1=699259&r2=699260&view=diff == --- tomcat/tc6.0.x/trunk/webapps/docs/changelog.xml (original) +++ tomcat/tc6.0.x/trunk/webapps/docs/changelog.xml Fri Sep 26 03:39:42 2008 @@ -151,6 +151,10 @@ +45852: Add special handling for cp932 (aka ms932) when +creating tomcat-users.xml with Windows installer. (markt) + + 45879: Move NOTICE file from documentation webapp to the installation directory. (markt) - To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
DO NOT REPLY [Bug 45852] conf/tomcat-users.xml has invalid encoding "cp932".
https://issues.apache.org/bugzilla/show_bug.cgi?id=45852 Mark Thomas <[EMAIL PROTECTED]> changed: What|Removed |Added Status|ASSIGNED|RESOLVED Resolution||FIXED --- Comment #5 from Mark Thomas <[EMAIL PROTECTED]> 2008-09-26 03:39:55 PST --- The fix has been applied to 6.0.x and will be in 6.0.19 onwards. -- Configure bugmail: https://issues.apache.org/bugzilla/userprefs.cgi?tab=email --- You are receiving this mail because: --- You are the assignee for the bug. - To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
svn commit: r699287 - in /tomcat/trunk: java/org/apache/catalina/core/ java/org/apache/naming/resources/ webapps/docs/config/
Author: markt
Date: Fri Sep 26 04:56:42 2008
New Revision: 699287
URL: http://svn.apache.org/viewvc?rev=699287&view=rev
Log:
Allow the maximum allowed size of a resource that is cached to be configured.
The default of cacheMaxSize/20 gave too high a value for large caches.
Modified:
tomcat/trunk/java/org/apache/catalina/core/StandardContext.java
tomcat/trunk/java/org/apache/catalina/core/mbeans-descriptors.xml
tomcat/trunk/java/org/apache/naming/resources/BaseDirContext.java
tomcat/trunk/java/org/apache/naming/resources/ProxyDirContext.java
tomcat/trunk/webapps/docs/config/context.xml
Modified: tomcat/trunk/java/org/apache/catalina/core/StandardContext.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/core/StandardContext.java?rev=699287&r1=699286&r2=699287&view=diff
==
--- tomcat/trunk/java/org/apache/catalina/core/StandardContext.java (original)
+++ tomcat/trunk/java/org/apache/catalina/core/StandardContext.java Fri Sep 26
04:56:42 2008
@@ -626,6 +626,12 @@
/**
+ * Cache object max size in KB.
+ */
+protected int cacheObjectMaxSize = 512; // 512K
+
+
+/**
* Cache TTL in ms.
*/
protected int cacheTTL = 5000;
@@ -789,6 +795,22 @@
/**
+ * Return the maximum size of objects to be cached in KB.
+ */
+public int getCacheObjectMaxSize() {
+return cacheObjectMaxSize;
+}
+
+
+/**
+ * Set the maximum size of objects to be placed the cache in KB.
+ */
+public void setCacheObjectMaxSize(int cacheObjectMaxSize) {
+this.cacheObjectMaxSize = cacheObjectMaxSize;
+}
+
+
+/**
* Return the "follow standard delegation model" flag used to configure
* our ClassLoader.
*/
@@ -1830,6 +1852,8 @@
((BaseDirContext) resources).setCached(isCachingAllowed());
((BaseDirContext) resources).setCacheTTL(getCacheTTL());
((BaseDirContext) resources).setCacheMaxSize(getCacheMaxSize());
+((BaseDirContext) resources).setCacheObjectMaxSize(
+getCacheObjectMaxSize());
}
if (resources instanceof FileDirContext) {
filesystemBased = true;
Modified: tomcat/trunk/java/org/apache/catalina/core/mbeans-descriptors.xml
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/core/mbeans-descriptors.xml?rev=699287&r1=699286&r2=699287&view=diff
==
--- tomcat/trunk/java/org/apache/catalina/core/mbeans-descriptors.xml (original)
+++ tomcat/trunk/java/org/apache/catalina/core/mbeans-descriptors.xml Fri Sep
26 04:56:42 2008
@@ -57,6 +57,10 @@
description="Maximum cache size in KB"
type="int"/>
+
+
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=699287&r1=699286&r2=699287&view=diff
==
--- tomcat/trunk/java/org/apache/naming/resources/BaseDirContext.java (original)
+++ tomcat/trunk/java/org/apache/naming/resources/BaseDirContext.java Fri Sep
26 04:56:42 2008
@@ -105,11 +105,17 @@
/**
- * Max size of resources which will have their content cached.
+ * Max size of cache for resources.
*/
protected int cacheMaxSize = 10240; // 10 MB
+/**
+ * Max size of resources that will be content cached.
+ */
+protected int cacheObjectMaxSize = 512; // 512 K
+
+
// - Properties
@@ -192,6 +198,22 @@
}
+/**
+ * Return the maximum size of objects to be cached in KB.
+ */
+public int getCacheObjectMaxSize() {
+return cacheObjectMaxSize;
+}
+
+
+/**
+ * Set the maximum size of objects to be placed the cache in KB.
+ */
+public void setCacheObjectMaxSize(int cacheObjectMaxSize) {
+this.cacheObjectMaxSize = cacheObjectMaxSize;
+}
+
+
// - Public Methods
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=699287&r1=699286&r2=699287&view=diff
==
--- tomcat/trunk/java/org/apache/naming/resources/ProxyDirContext.java
(original)
+++ tomcat/trunk/java/org/apache/naming/resources/ProxyDirContext.java Fri Sep
26 04:56:42 2008
@@ -78,7 +78,12 @@
}
cache.setCacheMaxSize(baseDirContext.getCacheMaxSize());
cacheTTL = baseDirContext.getCacheTTL();
-cacheObjectMaxSize = baseDirCon
svn commit: r699296 - in /tomcat/trunk/java/org/apache/catalina/ha/deploy: FarmWarDeployer.java WarWatcher.java
Author: markt
Date: Fri Sep 26 05:20:03 2008
New Revision: 699296
URL: http://svn.apache.org/viewvc?rev=699296&view=rev
Log:
Code clean up in o.a.c.h.deploy
No functional change
Modified:
tomcat/trunk/java/org/apache/catalina/ha/deploy/FarmWarDeployer.java
tomcat/trunk/java/org/apache/catalina/ha/deploy/WarWatcher.java
Modified: tomcat/trunk/java/org/apache/catalina/ha/deploy/FarmWarDeployer.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/ha/deploy/FarmWarDeployer.java?rev=699296&r1=699295&r2=699296&view=diff
==
--- tomcat/trunk/java/org/apache/catalina/ha/deploy/FarmWarDeployer.java
(original)
+++ tomcat/trunk/java/org/apache/catalina/ha/deploy/FarmWarDeployer.java Fri
Sep 26 05:20:03 2008
@@ -70,7 +70,8 @@
protected boolean started = false; //default 5 seconds
-protected HashMap fileFactories = new HashMap();
+protected HashMap fileFactories =
+new HashMap();
protected String deployDir;
@@ -212,7 +213,7 @@
*/
public void messageReceived(ClusterMessage msg) {
try {
-if (msg instanceof FileMessage && msg != null) {
+if (msg instanceof FileMessage) {
FileMessage fmsg = (FileMessage) msg;
if (log.isDebugEnabled())
log.debug("receive cluster deployment [ path: "
@@ -250,7 +251,7 @@
removeFactory(fmsg);
}
}
-} else if (msg instanceof UndeployMessage && msg != null) {
+} else if (msg instanceof UndeployMessage) {
try {
UndeployMessage umsg = (UndeployMessage) msg;
String path = umsg.getContextPath();
@@ -291,8 +292,7 @@
throws java.io.FileNotFoundException, java.io.IOException {
File tmpFile = new File(msg.getFileName());
File writeToFile = new File(getTempDir(), tmpFile.getName());
-FileMessageFactory factory = (FileMessageFactory) fileFactories.get(msg
-.getFileName());
+FileMessageFactory factory = fileFactories.get(msg.getFileName());
if (factory == null) {
factory = FileMessageFactory.getInstance(writeToFile, true);
fileFactories.put(msg.getFileName(), factory);
@@ -450,7 +450,7 @@
} catch (Exception x) {
log.error("No removal", x);
}
-install(contextName, deployWar.toURL());
+install(contextName, deployWar.toURI().toURL());
} catch (Exception x) {
log.error("Unable to install WAR file", x);
}
Modified: tomcat/trunk/java/org/apache/catalina/ha/deploy/WarWatcher.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/ha/deploy/WarWatcher.java?rev=699296&r1=699295&r2=699296&view=diff
==
--- tomcat/trunk/java/org/apache/catalina/ha/deploy/WarWatcher.java (original)
+++ tomcat/trunk/java/org/apache/catalina/ha/deploy/WarWatcher.java Fri Sep 26
05:20:03 2008
@@ -54,7 +54,8 @@
/**
* Currently deployed files
*/
-protected Map currentStatus = new HashMap();
+protected Map currentStatus =
+new HashMap();
/*--Constructor-*/
@@ -83,9 +84,10 @@
}
//check all the status codes and update the FarmDeployer
-for (Iterator i = currentStatus.entrySet().iterator(); i.hasNext();) {
-Map.Entry entry = (Map.Entry) i.next();
-WarInfo info = (WarInfo) entry.getValue();
+for (Iterator> i =
+currentStatus.entrySet().iterator(); i.hasNext();) {
+Map.Entry entry = i.next();
+WarInfo info = entry.getValue();
int check = info.check();
if (check == 1) {
listener.fileModified(info.getWar());
@@ -103,7 +105,7 @@
* @param warfile
*/
protected void addWarInfo(File warfile) {
-WarInfo info = (WarInfo) currentStatus.get(warfile.getAbsolutePath());
+WarInfo info = currentStatus.get(warfile.getAbsolutePath());
if (info == null) {
info = new WarInfo(warfile);
info.setLastState(-1); //assume file is non existent
-
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
DO NOT REPLY [Bug 45285] RESOURCES DECLARED IN PARENT CLASSES ARE NOT INJECTED
https://issues.apache.org/bugzilla/show_bug.cgi?id=45285 Firstname Lastname <[EMAIL PROTECTED]> changed: What|Removed |Added Status|RESOLVED|REOPENED Resolution|FIXED | --- Comment #4 from Firstname Lastname <[EMAIL PROTECTED]> 2008-09-26 08:55:24 PST --- I downloaded Tomcat 6.0.18 yesterday and tried again. With the workaround mentioned in the JSF bug, which is to add the context-param for injectionProvider, the problem is still there com.sun.faces.injectionProvider com.sun.faces.vendor.WebContainerInjectionProvider Your comments indicated that this bug is fixed in 6.0.18. -- 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: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
svn commit: r699427 - in /tomcat/trunk/java/org/apache/catalina/ha/deploy: FarmWarDeployer.java FileMessageFactory.java
Author: markt
Date: Fri Sep 26 10:37:34 2008
New Revision: 699427
URL: http://svn.apache.org/viewvc?rev=699427&view=rev
Log:
Fix https://issues.apache.org/bugzilla/show_bug.cgi?id=45851
Correct NPE when cluster is defined at engine level
Ensure that only 1 thread writes the replicated WAR to disk and that the
messages containing the WAR are processed in the correct order.
Modified:
tomcat/trunk/java/org/apache/catalina/ha/deploy/FarmWarDeployer.java
tomcat/trunk/java/org/apache/catalina/ha/deploy/FileMessageFactory.java
Modified: tomcat/trunk/java/org/apache/catalina/ha/deploy/FarmWarDeployer.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/ha/deploy/FarmWarDeployer.java?rev=699427&r1=699426&r2=699427&view=diff
==
--- tomcat/trunk/java/org/apache/catalina/ha/deploy/FarmWarDeployer.java
(original)
+++ tomcat/trunk/java/org/apache/catalina/ha/deploy/FarmWarDeployer.java Fri
Sep 26 10:37:34 2008
@@ -158,6 +158,7 @@
}else {
engine = (Engine)parent;
hostname = engine.getDefaultHost();
+host = (Host) engine.findChild(hostname);
}
try {
oname = new ObjectName(engine.getName() + ":type=Deployer,host="
Modified:
tomcat/trunk/java/org/apache/catalina/ha/deploy/FileMessageFactory.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/ha/deploy/FileMessageFactory.java?rev=699427&r1=699426&r2=699427&view=diff
==
--- tomcat/trunk/java/org/apache/catalina/ha/deploy/FileMessageFactory.java
(original)
+++ tomcat/trunk/java/org/apache/catalina/ha/deploy/FileMessageFactory.java Fri
Sep 26 10:37:34 2008
@@ -22,6 +22,9 @@
import java.io.FileInputStream;
import java.io.FileOutputStream;
import java.io.FileNotFoundException;
+import java.util.Map;
+import java.util.concurrent.ConcurrentHashMap;
+import java.util.concurrent.atomic.AtomicLong;
/**
* This factory is used to read files and write files by splitting them up into
@@ -74,7 +77,7 @@
protected FileOutputStream out;
/**
- * The number of messages we have read or written
+ * The number of messages we have written
*/
protected int nrOfMessagesProcessed = 0;
@@ -87,6 +90,19 @@
* The total number of packets that we split this file into
*/
protected long totalNrOfMessages = 0;
+
+/**
+ * The number of the last message procssed. Message IDs are 1 based.
+ */
+protected AtomicLong lastMessageProcessed = new AtomicLong(0);
+
+/**
+ * Messages received out of order are held in the buffer until required. If
+ * everything is worked as expected, messages will spend very little time
in
+ * the buffer.
+ */
+protected Map msgBuffer =
+new ConcurrentHashMap();
/**
* The bytes that we hold the data in, not thread safe.
@@ -94,6 +110,12 @@
protected byte[] data = new byte[READ_SIZE];
/**
+ * Flag that indicates if a thread is writing messages to disk. Access to
+ * this flag must be synchronised.
+ */
+protected boolean isWriting = false;
+
+/**
* Private constructor, either instantiates a factory to read or write.
* When openForWrite==true, then a the file, f, will be created and an
* output stream is opened to write to it.
@@ -205,25 +227,65 @@
if (log.isDebugEnabled())
log.debug("Message " + msg + " data " + msg.getData()
+ " data length " + msg.getDataLength() + " out " + out);
-if (out != null) {
-out.write(msg.getData(), 0, msg.getDataLength());
-nrOfMessagesProcessed++;
+
+if (msg.getMessageNumber() <= lastMessageProcessed.get()) {
+// Duplicate of message already processed
+log.warn("Receive Message again -- Sender ActTimeout too short [
path: "
++ msg.getContextPath()
++ " war: "
++ msg.getFileName()
++ " data: "
++ msg.getData()
++ " data length: " + msg.getDataLength() + " ]");
+return false;
+}
+
+FileMessage previous =
+msgBuffer.put(new Long(msg.getMessageNumber()), msg);
+if (previous !=null) {
+// Duplicate of message not yet processed
+log.warn("Receive Message again -- Sender ActTimeout too short [
path: "
++ msg.getContextPath()
++ " war: "
++ msg.getFileName()
++ " data: "
++ msg.getData()
++ " data length: " + msg.getDataLength() + " ]");
+return false;
+}
+
+FileMessage next = null;
+synchronized (this) {
+if (!
DO NOT REPLY [Bug 45851] FarmWarDeployer fails to properly unpack copied war on target node
https://issues.apache.org/bugzilla/show_bug.cgi?id=45851 --- Comment #2 from Mark Thomas <[EMAIL PROTECTED]> 2008-09-26 10:38:56 PST --- I've fixed the issues issues I could see in the FarmWarDeployer. Any additional testing much appreciated. I will propose the fix for inclusion in 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: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
DO NOT REPLY [Bug 45851] FarmWarDeployer fails to properly unpack copied war on target node
https://issues.apache.org/bugzilla/show_bug.cgi?id=45851 --- Comment #3 from Paul McGurn <[EMAIL PROTECTED]> 2008-09-26 10:45:04 PST --- I can definitely test that more. If this ends up in the next point release, I'll upgrade my development environment and test. -- 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: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
DO NOT REPLY [Bug 45285] RESOURCES DECLARED IN PARENT CLASSES ARE NOT INJECTED
https://issues.apache.org/bugzilla/show_bug.cgi?id=45285 --- Comment #5 from Mark Thomas <[EMAIL PROTECTED]> 2008-09-26 11:06:26 PST --- Sorry - my bad. The fixed missed the preDestroy and postContruct methods. I'll get that fixed. -- 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: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
svn commit: r699443 - /tomcat/tc6.0.x/trunk/STATUS.txt
Author: markt Date: Fri Sep 26 11:17:46 2008 New Revision: 699443 URL: http://svn.apache.org/viewvc?rev=699443&view=rev Log: Proposals 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=699443&r1=699442&r2=699443&view=diff == --- tomcat/tc6.0.x/trunk/STATUS.txt (original) +++ tomcat/tc6.0.x/trunk/STATUS.txt Fri Sep 26 11:17:46 2008 @@ -183,3 +183,20 @@ http://svn.apache.org/viewvc?rev=699128&view=rev +1: markt -1: + +* Make the size limit on objects placed in the static resource cache configurable + http://svn.apache.org/viewvc?rev=699287&view=rev + +1: markt + -1: + +* Fix https://issues.apache.org/bugzilla/show_bug.cgi?id=45851 + Fix NPE and outof order message processing issues + http://svn.apache.org/viewvc?rev=699427&view=rev + +1: markt + -1: + +* Fix https://issues.apache.org/bugzilla/show_bug.cgi?id=45285 + Check super class for preDestroy and postContruct + http://people.apache.org/~markt/patches/2008-09-26-bug45285.patch + +1: markt + -1: - To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
Findbugs results when run against Tomcat6
Just out of curiosity, I ran Findbugs 1.3.5 on Tomcat 6.0.18. The default settings generated some 1400 warnings about possible bugs. Quite a few of them look serious - assuming that the code which contains them is being used. For example, there are quite a few public static fields which are not final. There are several instances of problems with String handling, e.g. using == to compare Strings or using String.replace() without assigning the result. And there are a few instances of methods which synchronize on a field in what appears to be an attempt to guard against simultaneous updates to that field. But guarding a field gets a lock on the referenced object, not on the field. This is probably not what was intended. I can provide a listing of the analyis if required, but it might be easier to use a FindBugs IDE plugin. - To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
svn commit: r699523 - in /tomcat/trunk: java/org/apache/catalina/mbeans/ webapps/docs/config/
Author: markt
Date: Fri Sep 26 15:20:51 2008
New Revision: 699523
URL: http://svn.apache.org/viewvc?rev=699523&view=rev
Log:
Add a new listener that enables the JMX ports to be fixed. This makes using
jconsole etc through a firewall / SSH tunnel etc. a lot easier. As a bonus, the
config docs include all the current listeners as well.
Added:
tomcat/trunk/java/org/apache/catalina/mbeans/Constants.java (with props)
tomcat/trunk/java/org/apache/catalina/mbeans/JmxRemoteLifecycleListener.java
(with props)
tomcat/trunk/java/org/apache/catalina/mbeans/LocalStrings.properties
(with props)
tomcat/trunk/webapps/docs/config/listeners.xml (with props)
Modified:
tomcat/trunk/webapps/docs/config/project.xml
Added: tomcat/trunk/java/org/apache/catalina/mbeans/Constants.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/mbeans/Constants.java?rev=699523&view=auto
==
--- tomcat/trunk/java/org/apache/catalina/mbeans/Constants.java (added)
+++ tomcat/trunk/java/org/apache/catalina/mbeans/Constants.java Fri Sep 26
15:20:51 2008
@@ -0,0 +1,27 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+
+package org.apache.catalina.mbeans;
+
+
+public class Constants {
+
+public static final String Package = "org.apache.catalina.mbeans";
+
+}
+
Propchange: tomcat/trunk/java/org/apache/catalina/mbeans/Constants.java
--
svn:eol-style = native
Added:
tomcat/trunk/java/org/apache/catalina/mbeans/JmxRemoteLifecycleListener.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/mbeans/JmxRemoteLifecycleListener.java?rev=699523&view=auto
==
---
tomcat/trunk/java/org/apache/catalina/mbeans/JmxRemoteLifecycleListener.java
(added)
+++
tomcat/trunk/java/org/apache/catalina/mbeans/JmxRemoteLifecycleListener.java
Fri Sep 26 15:20:51 2008
@@ -0,0 +1,207 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package org.apache.catalina.mbeans;
+
+import java.io.IOException;
+import java.lang.management.ManagementFactory;
+import java.net.MalformedURLException;
+import java.rmi.RemoteException;
+import java.rmi.registry.LocateRegistry;
+import java.util.HashMap;
+
+import javax.management.MBeanServer;
+import javax.management.remote.JMXConnectorServer;
+import javax.management.remote.JMXConnectorServerFactory;
+import javax.management.remote.JMXServiceURL;
+import javax.management.remote.rmi.RMIConnectorServer;
+import javax.rmi.ssl.SslRMIClientSocketFactory;
+import javax.rmi.ssl.SslRMIServerSocketFactory;
+
+import org.apache.catalina.Lifecycle;
+import org.apache.catalina.LifecycleEvent;
+import org.apache.catalina.LifecycleListener;
+import org.apache.catalina.util.StringManager;
+import org.apache.juli.logging.Log;
+import org.apache.juli.logging.LogFactory;
+
+/**
+ * This listener fixes the port used by JMX/RMI Server making things much
+ * simpler if you need to connect jconsole or similar to a remote Tomcat
+ * instance that is running behind a firewall. Only this port is configured via
+ * the listener. The remainder of the configuration is via the standard system
+ * properties for configuring JMX.
+ */
+public class JmxRemoteLifecycleListener implements LifecycleListener {
+
+private static L
DO NOT REPLY [Bug 45403] Tomcat does not reload application
https://issues.apache.org/bugzilla/show_bug.cgi?id=45403 Mark Thomas <[EMAIL PROTECTED]> changed: What|Removed |Added Attachment #22478|0 |1 is obsolete|| -- 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: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
Re: Findbugs results when run against Tomcat6
Findbugs does a real bad job of findings real security bugs - I would recommend running the codebase against Fortify + include the new Cigital rulepack. Or take a look at the results of the Fortify Open Source Analysis project https://opensource.fortify.com/teamserver/welcome.fhtml - Jim Just out of curiosity, I ran Findbugs 1.3.5 on Tomcat 6.0.18. The default settings generated some 1400 warnings about possible bugs. Quite a few of them look serious - assuming that the code which contains them is being used. For example, there are quite a few public static fields which are not final. There are several instances of problems with String handling, e.g. using == to compare Strings or using String.replace() without assigning the result. And there are a few instances of methods which synchronize on a field in what appears to be an attempt to guard against simultaneous updates to that field. But guarding a field gets a lock on the referenced object, not on the field. This is probably not what was intended. I can provide a listing of the analyis if required, but it might be easier to use a FindBugs IDE plugin. - To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED] - To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
Re: Findbugs results when run against Tomcat6
You can also set this up to run as part of the Gump build and get the warnings/errors etc... recorded as part of a standard build. Jon. 2008/9/26 sebb <[EMAIL PROTECTED]> > Just out of curiosity, I ran Findbugs 1.3.5 on Tomcat 6.0.18. The > default settings generated some 1400 warnings about possible bugs. > > Quite a few of them look serious - assuming that the code which > contains them is being used. > > For example, there are quite a few public static fields which are not > final. > > There are several instances of problems with String handling, e.g. > using == to compare Strings or using String.replace() without > assigning the result. > > And there are a few instances of methods which synchronize on a field > in what appears to be an attempt to guard against simultaneous updates > to that field. But guarding a field gets a lock on the referenced > object, not on the field. This is probably not what was intended. > > I can provide a listing of the analyis if required, but it might be > easier to use a FindBugs IDE plugin. > > - > To unsubscribe, e-mail: [EMAIL PROTECTED] > For additional commands, e-mail: [EMAIL PROTECTED] > > -- Web: http://www.jonathanholloway.co.uk Mail: [EMAIL PROTECTED] IM:[EMAIL PROTECTED]
svn commit: r699569 - in /tomcat/connectors/trunk/jk: native/iis/jk_isapi_plugin.c xdocs/miscellaneous/changelog.xml
Author: mturk
Date: Fri Sep 26 23:41:56 2008
New Revision: 699569
URL: http://svn.apache.org/viewvc?rev=699569&view=rev
Log:
Add INSTANCE_ID to the unique shared memory name
Modified:
tomcat/connectors/trunk/jk/native/iis/jk_isapi_plugin.c
tomcat/connectors/trunk/jk/xdocs/miscellaneous/changelog.xml
Modified: tomcat/connectors/trunk/jk/native/iis/jk_isapi_plugin.c
URL:
http://svn.apache.org/viewvc/tomcat/connectors/trunk/jk/native/iis/jk_isapi_plugin.c?rev=699569&r1=699568&r2=699569&view=diff
==
--- tomcat/connectors/trunk/jk/native/iis/jk_isapi_plugin.c (original)
+++ tomcat/connectors/trunk/jk/native/iis/jk_isapi_plugin.c Fri Sep 26 23:41:56
2008
@@ -25,7 +25,9 @@
***/
// This define is needed to include wincrypt,h, needed to get client
certificates
+#ifndef _WIN32_WINNT
#define _WIN32_WINNT 0x0400
+#endif
#include
#include
@@ -113,6 +115,7 @@
#define BAD_REQUEST -1
#define BAD_PATH-2
#define MAX_SERVERNAME 128
+#define MAX_INSTANCEID 32
#define MAX_PACKET_SIZE 65536
char HTML_ERROR_400[] = "\n"
@@ -184,6 +187,7 @@
static jk_logger_t *logger = NULL;
static char *SERVER_NAME = "SERVER_NAME";
static char *SERVER_SOFTWARE = "SERVER_SOFTWARE";
+static char *INSTANCE_ID = "INSTANCE_ID";
static char *CONTENT_TYPE = "Content-Type:text/html\r\n\r\n";
static char extension_uri[INTERNET_MAX_URL_LENGTH] =
@@ -1138,12 +1142,22 @@
{
/* Initialise jk */
if (is_inited && !is_mapread) {
-char serverName[MAX_SERVERNAME];
-DWORD dwLen = sizeof(serverName);
+char serverName[MAX_SERVERNAME] = "";
+char instanceId[MAX_INSTANCEID] = "";
+DWORD dwLen = MAX_SERVERNAME - MAX_INSTANCEID - 1;
if (pfc->GetServerVariable(pfc, SERVER_NAME, serverName, &dwLen)) {
-if (dwLen > 0)
+if (dwLen > 0) {
serverName[dwLen - 1] = '\0';
+dwLen = MAX_INSTANCEID;
+if (pfc->GetServerVariable(pfc, INSTANCE_ID, instanceId,
&dwLen)) {
+if (dwLen > 0) {
+instanceId[dwLen - 1] = '\0';
+StringCbCat(serverName, MAX_SERVERNAME, "_");
+StringCbCat(serverName, MAX_SERVERNAME, instanceId);
+}
+}
+}
if (init_jk(serverName))
is_mapread = JK_TRUE;
}
Modified: tomcat/connectors/trunk/jk/xdocs/miscellaneous/changelog.xml
URL:
http://svn.apache.org/viewvc/tomcat/connectors/trunk/jk/xdocs/miscellaneous/changelog.xml?rev=699569&r1=699568&r2=699569&view=diff
==
--- tomcat/connectors/trunk/jk/xdocs/miscellaneous/changelog.xml (original)
+++ tomcat/connectors/trunk/jk/xdocs/miscellaneous/changelog.xml Fri Sep 26
23:41:56 2008
@@ -43,6 +43,13 @@
+
+IIS: SERVER_NAME variable can be the same for
+multiple different server instances if requests
+are handled according to the ip:port combination.
+Use INSTANCE_ID variable to which the request
+belongs instead. (mturk)
+
Allow forwarding server error pages. This can be done
on per-uri basis using new use_server_errors extension.
-
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
