DO NOT REPLY [Bug 52163] New: Wide classpath for DeployTask
https://issues.apache.org/bugzilla/show_bug.cgi?id=52163 Bug #: 52163 Summary: Wide classpath for DeployTask Product: Tomcat 7 Version: 7.0.19 Platform: PC OS/Version: Linux Status: NEW Severity: normal Priority: P2 Component: Integration AssignedTo: dev@tomcat.apache.org ReportedBy: he...@seznam.cz Classification: Unclassified Before Tomcat 7.0.19 the only jar need to use tomcat's ant tasks was catalina-ant.jar since 7.0.19 it is much wider lib/catalina-ant.jar lib/tomcat-coyote.jar lib/tomcat-util.jar bin/tomcat-juli.jar I did found nothing about it in th doc, so I'm not sure this was intentional. Thus reporting as an issue. -- 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: r1199846 - /tomcat/jk/trunk/native/iis/jk_isapi_plugin.c
Author: mturk
Date: Wed Nov 9 16:58:49 2011
New Revision: 1199846
URL: http://svn.apache.org/viewvc?rev=1199846view=rev
Log:
Bail out early from the loop. No functional change
Modified:
tomcat/jk/trunk/native/iis/jk_isapi_plugin.c
Modified: tomcat/jk/trunk/native/iis/jk_isapi_plugin.c
URL:
http://svn.apache.org/viewvc/tomcat/jk/trunk/native/iis/jk_isapi_plugin.c?rev=1199846r1=1199845r2=1199846view=diff
==
--- tomcat/jk/trunk/native/iis/jk_isapi_plugin.c (original)
+++ tomcat/jk/trunk/native/iis/jk_isapi_plugin.c Wed Nov 9 16:58:49 2011
@@ -2289,75 +2289,72 @@ DWORD WINAPI HttpExtensionProc(LPEXTENSI
s.pool = private_data.p;
if (init_ws_service(private_data, s, worker_name)) {
+jk_endpoint_t *e = NULL;
jk_worker_t *worker = wc_get_worker_for_name(worker_name, logger);
+if (!worker) {
+jk_log(logger, JK_LOG_ERROR,
+ could not get a worker for name %s,
+ worker_name);
+jk_close_pool(private_data.p);
+JK_TRACE_EXIT(logger);
+return rc;
+}
if (JK_IS_DEBUG_LEVEL(logger))
jk_log(logger, JK_LOG_DEBUG,
- %s a worker for name %s,
- worker ? got : could not get, worker_name);
-
-if (worker) {
-jk_endpoint_t *e = NULL;
-if (worker-get_endpoint(worker, e, logger)) {
-int is_error = JK_HTTP_SERVER_ERROR;
-int result;
-if ((result = e-service(e, s, logger, is_error)) 0) {
-if (s.extension.use_server_error_pages
-s.http_response_status =
s.extension.use_server_error_pages) {
-if (JK_IS_DEBUG_LEVEL(logger))
-jk_log(logger, JK_LOG_DEBUG, Forwarding status=%d
-for worker=%s,
- s.http_response_status, worker_name);
-lpEcb-dwHttpStatusCode = s.http_response_status;
-write_error_message(lpEcb, s.http_response_status,
-private_data.err_hdrs);
-}
-else {
-rc = HSE_STATUS_SUCCESS;
-lpEcb-dwHttpStatusCode = s.http_response_status;
-if (JK_IS_DEBUG_LEVEL(logger))
-jk_log(logger, JK_LOG_DEBUG,
- service() returned OK);
-}
+ got a worker for name %s, worker_name);
+if (worker-get_endpoint(worker, e, logger)) {
+int is_error = JK_HTTP_SERVER_ERROR;
+int result;
+if ((result = e-service(e, s, logger, is_error)) 0) {
+if (s.extension.use_server_error_pages
+s.http_response_status =
s.extension.use_server_error_pages) {
+if (JK_IS_DEBUG_LEVEL(logger))
+jk_log(logger, JK_LOG_DEBUG, Forwarding status=%d
+for worker=%s,
+ s.http_response_status, worker_name);
+lpEcb-dwHttpStatusCode = s.http_response_status;
+write_error_message(lpEcb, s.http_response_status,
+private_data.err_hdrs);
}
else {
-if ((result == JK_CLIENT_ERROR) (is_error ==
JK_HTTP_OK)) {
-jk_log(logger, JK_LOG_INFO,
- service() failed because client aborted
connection);
-}
-else {
-jk_log(logger, JK_LOG_ERROR,
- service() failed with http error %d,
is_error);
-}
-lpEcb-dwHttpStatusCode = is_error;
-write_error_message(lpEcb, is_error,
private_data.err_hdrs);
+rc = HSE_STATUS_SUCCESS;
+lpEcb-dwHttpStatusCode = s.http_response_status;
+if (JK_IS_DEBUG_LEVEL(logger))
+jk_log(logger, JK_LOG_DEBUG,
+ service() returned OK);
}
-e-done(e, logger);
}
else {
-jk_log(logger, JK_LOG_ERROR,
-Failed to obtain an endpoint to service request -
-your connection_pool_size is probably less than the
threads in your web server!);
+if ((result == JK_CLIENT_ERROR) (is_error == JK_HTTP_OK)) {
+jk_log(logger, JK_LOG_INFO,
+ service() failed because client aborted
connection);
+}
+else {
+jk_log(logger, JK_LOG_ERROR,
+
svn commit: r1199862 - /tomcat/jk/trunk/native/iis/jk_isapi_plugin.c
Author: mturk
Date: Wed Nov 9 17:07:24 2011
New Revision: 1199862
URL: http://svn.apache.org/viewvc?rev=1199862view=rev
Log:
close workers before we close the map so we have a worker list to close.
Modified:
tomcat/jk/trunk/native/iis/jk_isapi_plugin.c
Modified: tomcat/jk/trunk/native/iis/jk_isapi_plugin.c
URL:
http://svn.apache.org/viewvc/tomcat/jk/trunk/native/iis/jk_isapi_plugin.c?rev=1199862r1=1199861r2=1199862view=diff
==
--- tomcat/jk/trunk/native/iis/jk_isapi_plugin.c (original)
+++ tomcat/jk/trunk/native/iis/jk_isapi_plugin.c Wed Nov 9 17:07:24 2011
@@ -2374,6 +2374,7 @@ BOOL WINAPI TerminateFilter(DWORD dwFlag
CloseHandle(watchdog_handle);
watchdog_handle = NULL;
}
+wc_close(logger);
if (is_mapread) {
uri_worker_map_free(uw_map, logger);
is_mapread = JK_FALSE;
@@ -2395,7 +2396,6 @@ BOOL WINAPI TerminateFilter(DWORD dwFlag
}
jk_map_free(rregexp_map);
}
-wc_close(logger);
jk_shm_close();
EnterCriticalSection(log_cs);
if (logger) {
-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
svn commit: r1199891 - in /tomcat/jk/trunk/native/common: jk_ajp_common.c jk_ajp_common.h
Author: mturk
Date: Wed Nov 9 17:39:01 2011
New Revision: 1199891
URL: http://svn.apache.org/viewvc?rev=1199891view=rev
Log:
Use a special flag for endpoint cache slot instead setting the slot to zero. It
allows to close all sockets on ajp_destory and to speed up ajp_done, since
there is no need to find the empty slot.
Modified:
tomcat/jk/trunk/native/common/jk_ajp_common.c
tomcat/jk/trunk/native/common/jk_ajp_common.h
Modified: tomcat/jk/trunk/native/common/jk_ajp_common.c
URL:
http://svn.apache.org/viewvc/tomcat/jk/trunk/native/common/jk_ajp_common.c?rev=1199891r1=1199890r2=1199891view=diff
==
--- tomcat/jk/trunk/native/common/jk_ajp_common.c (original)
+++ tomcat/jk/trunk/native/common/jk_ajp_common.c Wed Nov 9 17:39:01 2011
@@ -36,6 +36,10 @@
#include novsock2.h
#endif
+/* Macro for checking the availability of the cache slot
+ */
+#define IS_SLOT_AVAIL(s) ((s) != NULL (s)-avail)
+
const char *response_trans_headers[] = {
Content-Type,
Content-Language,
@@ -860,7 +864,8 @@ static int ajp_next_connection(ajp_endpo
unsigned int i;
for (i = 0; i aw-ep_cache_sz; i++) {
/* Find cache slot with usable socket */
-if (aw-ep_cache[i] IS_VALID_SOCKET(aw-ep_cache[i]-sd)) {
+if (IS_SLOT_AVAIL(aw-ep_cache[i])
+IS_VALID_SOCKET(aw-ep_cache[i]-sd)) {
ae-sd = aw-ep_cache[i]-sd;
aw-ep_cache[i]-sd = JK_INVALID_SOCKET;
break;
@@ -1088,8 +1093,10 @@ void jk_ajp_pull(ajp_worker_t * aw, int
if (rc) {
unsigned int i;
for (i = 0; i aw-ep_cache_sz; i++) {
-/* Close all connections in the cache */
-if (aw-ep_cache[i]
IS_VALID_SOCKET(aw-ep_cache[i]-sd)) {
+/* Close all avail connections in the cache
+ * Note that this won't change active connections.
+ */
+if (IS_SLOT_AVAIL(aw-ep_cache[i])
IS_VALID_SOCKET(aw-ep_cache[i]-sd)) {
int sd = aw-ep_cache[i]-sd;
aw-ep_cache[i]-sd = JK_INVALID_SOCKET;
aw-ep_cache[i]-addr_sequence = aw-addr_sequence;
@@ -1153,7 +1160,7 @@ void jk_ajp_push(ajp_worker_t * aw, int
unsigned int i;
for (i = 0; i aw-ep_cache_sz; i++) {
/* Close all connections in the cache */
-if (aw-ep_cache[i] IS_VALID_SOCKET(aw-ep_cache[i]-sd)) {
+if (IS_SLOT_AVAIL(aw-ep_cache[i])
IS_VALID_SOCKET(aw-ep_cache[i]-sd)) {
int sd = aw-ep_cache[i]-sd;
aw-ep_cache[i]-sd = JK_INVALID_SOCKET;
aw-ep_cache[i]-addr_sequence = aw-addr_sequence;
@@ -2740,6 +2747,7 @@ static int ajp_create_endpoint_cache(ajp
}
p-ep_cache[i]-sd = JK_INVALID_SOCKET;
p-ep_cache[i]-reuse = JK_FALSE;
+p-ep_cache[i]-avail = JK_TRUE;
p-ep_cache[i]-hard_close = JK_FALSE;
p-ep_cache[i]-last_access = now;
jk_open_pool((p-ep_cache[i]-pool), p-ep_cache[i]-buf,
@@ -3063,34 +3071,16 @@ int JK_METHOD ajp_done(jk_endpoint_t **e
*e = NULL;
JK_ENTER_CS(w-cs, rc);
if (rc) {
-int i;
-
-for (i = w-ep_cache_sz - 1; i = 0; i--) {
-if (w-ep_cache[i] == NULL) {
-w-ep_cache[i] = p;
-break;
-}
-}
+p-avail = JK_TRUE;
JK_LEAVE_CS(w-cs, rc);
-if (i = 0) {
-if (JK_IS_DEBUG_LEVEL(l))
-jk_log(l, JK_LOG_DEBUG,
-recycling connection pool slot=%u for worker %s,
-i, p-worker-name);
-JK_TRACE_EXIT(l);
-return JK_TRUE;
-}
-/* This should never hapen because
- * there is always free empty cache slot
- */
-jk_log(l, JK_LOG_ERROR,
-could not find empty connection pool slot from %u for
worker %s,
-w-ep_cache_sz, w-name);
+if (JK_IS_DEBUG_LEVEL(l))
+jk_log(l, JK_LOG_DEBUG,
+recycling connection pool for worker %s and socket
%d,
+p-worker-name, (int)p-sd);
JK_TRACE_EXIT(l);
-return JK_FALSE;
+return JK_TRUE;
}
-
jk_log(l, JK_LOG_ERROR,
locking thread (errno=%d), errno);
JK_TRACE_EXIT(l);
@@ -3122,11 +3112,11 @@ int ajp_get_endpoint(jk_worker_t *pThis,
unsigned int slot;
/* Try to find connected socket cache entry */
for (slot = 0; slot aw-ep_cache_sz; slot++) {
-if (aw-ep_cache[slot]
+if
[Tomcat Wiki] Update of PoweredBy by BrunoScatolin
Dear Wiki user,
You have subscribed to a wiki page or wiki category on Tomcat Wiki for change
notification.
The PoweredBy page has been changed by BrunoScatolin:
http://wiki.apache.org/tomcat/PoweredBy?action=diffrev1=379rev2=380
=== Institute for Tourism and Geographic Information Systems ===
[[http://www.itgis.com|Institute for Tourism and Geographic Information
Systems]] - A consulting company; all of our projects are built on Tomcat.
+ === IPHOTEL Hospedagem de Sites ===
+ [[http://www.iphotel.com.br|IPHOTEL Hospedagem de Sites]] - Brazilian
Webhosting Company.
+
=== iPoint Portal ===
{{http://www.ipointportal.com/iPoint/schemes/c2b2/logo1.gif}}
[[http://www.ipointportal.com|The Open Source Collaborative Portal]] - iPoint
Portal is an Open Source Collaborative Portal which is compatible with JSR168
and runs on Tomcat.
-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
DO NOT REPLY [Bug 51181] Add support for Web Sockets
https://issues.apache.org/bugzilla/show_bug.cgi?id=51181 jfclere jfcl...@gmail.com changed: What|Removed |Added CC||jfcl...@gmail.com -- Configure bugmail: https://issues.apache.org/bugzilla/userprefs.cgi?tab=email --- You are receiving this mail because: --- You are the assignee for the bug. - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
DO NOT REPLY [Bug 51181] Add support for Web Sockets
https://issues.apache.org/bugzilla/show_bug.cgi?id=51181 --- Comment #17 from jfclere jfcl...@gmail.com 2011-11-09 21:13:06 UTC --- See http://svn.apache.org/repos/asf/labs/monsoon/trunk/ too -- 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
tagging 6.0.34 tomorrow?
Hi, I plan to prepare the 6.0.34 tomorrow, any important commits to wait for? Cheers Jean-Frederic - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
DO NOT REPLY [Bug 51073] Misconfigured SSLProtocol with an AprEndpoint silently falls back to ALL
https://issues.apache.org/bugzilla/show_bug.cgi?id=51073 Mark Thomas ma...@apache.org changed: What|Removed |Added Component|Servlet JSP API |Connector:Coyote Version|6.0.14 |5.5.33 Product|Tomcat 6|Tomcat 5 Target Milestone|default |--- OS/Version|Linux |All -- 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 6.0.34 tomorrow?
On 09/11/2011 21:20, jean-frederic clere wrote: Hi, I plan to prepare the 6.0.34 tomorrow, any important commits to wait for? The parameters handling changes. I need to update the patch. Konstantin's review comments list the additional commits that need to be added. The performance issue fixes are nice to haves. The GZIP corruption fix really needs to be included. The RequestFilterValve changes would be good to have. I'll vote shortly. Mark - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
svn commit: r1199979 - /tomcat/tc6.0.x/trunk/STATUS.txt
Author: markt Date: Wed Nov 9 21:34:01 2011 New Revision: 1199979 URL: http://svn.apache.org/viewvc?rev=1199979view=rev Log: Votes 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=1199979r1=1199978r2=1199979view=diff == --- tomcat/tc6.0.x/trunk/STATUS.txt (original) +++ tomcat/tc6.0.x/trunk/STATUS.txt Wed Nov 9 21:34:01 2011 @@ -91,7 +91,7 @@ PATCHES PROPOSED TO BACKPORT: Fix possible output corruption when compression is enabled for a connector and the response is flushed. https://issues.apache.org/bugzilla/attachment.cgi?id=27905 - +1: kkolinko + +1: kkolinko, markt -1: * In RequestFilterValve (RemoteAddrValve, RemoteHostValve): @@ -100,7 +100,7 @@ PATCHES PROPOSED TO BACKPORT: Expose previously added isAllowValid, isDenyValid properties as well. (r1198623 in TC7) http://people.apache.org/~kkolinko/patches/2011-11-08_tc6_RequestFilterValve_JMX.patch - +1: kkolinko + +1: kkolinko, markt -1: - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
svn commit: r1199980 - in /tomcat/trunk/java/org/apache: catalina/core/AprLifecycleListener.java catalina/core/LocalStrings.properties tomcat/jni/SSL.java
Author: schultz
Date: Wed Nov 9 21:34:31 2011
New Revision: 1199980
URL: http://svn.apache.org/viewvc?rev=1199980view=rev
Log:
Fixed bug #50570 - Allow explicit use of FIPS mode in APR lifecycle listener
- Added FIPSMode attribute to AprLifecycleListener that causes OpenSSL to go
into FIPS mode
Modified:
tomcat/trunk/java/org/apache/catalina/core/AprLifecycleListener.java
tomcat/trunk/java/org/apache/catalina/core/LocalStrings.properties
tomcat/trunk/java/org/apache/tomcat/jni/SSL.java
Modified: tomcat/trunk/java/org/apache/catalina/core/AprLifecycleListener.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/core/AprLifecycleListener.java?rev=1199980r1=1199979r2=1199980view=diff
==
--- tomcat/trunk/java/org/apache/catalina/core/AprLifecycleListener.java
(original)
+++ tomcat/trunk/java/org/apache/catalina/core/AprLifecycleListener.java Wed
Nov 9 21:34:31 2011
@@ -29,6 +29,7 @@ import org.apache.juli.logging.LogFactor
import org.apache.tomcat.jni.Library;
import org.apache.tomcat.util.ExceptionUtils;
import org.apache.tomcat.util.res.StringManager;
+import org.apache.tomcat.jni.SSL;
@@ -66,11 +67,13 @@ public class AprLifecycleListener
// -- Properties
protected static String SSLEngine = on; //default on
+protected static String FIPSMode = off; // default off, valid only when
SSLEngine=on
protected static String SSLRandomSeed = builtin;
protected static boolean sslInitialized = false;
protected static boolean aprInitialized = false;
protected static boolean sslAvailable = false;
protected static boolean aprAvailable = false;
+protected static boolean fipsModeActive = false;
protected static final Object lock = new Object();
@@ -106,7 +109,7 @@ public class AprLifecycleListener
initializeSSL();
} catch (Throwable t) {
ExceptionUtils.handleThrowable(t);
-log.info(sm.getString(aprListener.sslInit));
+log.error(sm.getString(aprListener.sslInit), t);
}
}
}
@@ -138,6 +141,7 @@ public class AprLifecycleListener
aprInitialized = false;
sslInitialized = false; // Well we cleaned the pool in terminate.
sslAvailable = false; // Well we cleaned the pool in terminate.
+fipsModeActive = false;
}
private static void init()
@@ -220,6 +224,7 @@ public class AprLifecycleListener
//only once per VM
return;
}
+
sslInitialized = true;
String methodName = randSet;
@@ -237,6 +242,25 @@ public class AprLifecycleListener
method = clazz.getMethod(methodName, paramTypes);
method.invoke(null, paramValues);
+if(on.equalsIgnoreCase(AprLifecycleListener.FIPSMode)) {
+log.info(sm.getString(aprListener.initializingFIPS));
+
+int result = SSL.fipsModeSet(1);
+
+// success is defined as return value = 1
+if(1 == result) {
+fipsModeActive = true;
+
+log.info(sm.getString(aprListener.initializeFIPSSuccess));
+} else {
+// This case should be handled by the native method,
+// but we'll make absolutely sure, here.
+log.error(sm.getString(aprListener.initializeFIPSFailed));
+
+throw new
IllegalStateException(sm.getString(aprListener.initializeFIPSFailed));
+}
+}
+
sslAvailable = true;
}
@@ -245,6 +269,10 @@ public class AprLifecycleListener
}
public void setSSLEngine(String SSLEngine) {
+// Ensure that the SSLEngine is consistent with that used for SSL init
+if(sslInitialized)
+throw new
IllegalStateException(sm.getString(aprListener.tooLateForSSLEngine));
+
AprLifecycleListener.SSLEngine = SSLEngine;
}
@@ -253,7 +281,24 @@ public class AprLifecycleListener
}
public void setSSLRandomSeed(String SSLRandomSeed) {
+// Ensure that the random seed is consistent with that used for SSL
init
+if(sslInitialized)
+throw new
IllegalStateException(sm.getString(aprListener.tooLateForSSLRandomSeed));
+
AprLifecycleListener.SSLRandomSeed = SSLRandomSeed;
}
+public void setFIPSMode(String FIPSMode)
+{
+// Ensure that the FIPS mode is consistent with that used for SSL init
+if(sslInitialized)
+throw new
IllegalStateException(sm.getString(aprListener.tooLateForFIPSMode));
+
+AprLifecycleListener.FIPSMode = FIPSMode;
+}
+
+public boolean isFIPSModeActive()
+{
+return fipsModeActive;
+}
}
Modified: tomcat/trunk/java/org/apache/catalina/core/LocalStrings.properties
URL:
svn commit: r1199985 - in /tomcat/tc7.0.x/trunk: java/org/apache/catalina/core/AprLifecycleListener.java java/org/apache/catalina/core/LocalStrings.properties java/org/apache/tomcat/jni/SSL.java webap
Author: schultz
Date: Wed Nov 9 21:43:23 2011
New Revision: 1199985
URL: http://svn.apache.org/viewvc?rev=1199985view=rev
Log:
Fixed bug #50570 - Allow explicit use of FIPS mode in APR lifecycle listener
- Added FIPSMode attribute to AprLifecycleListener that causes OpenSSL to go
into FIPS mode
Modified:
tomcat/tc7.0.x/trunk/java/org/apache/catalina/core/AprLifecycleListener.java
tomcat/tc7.0.x/trunk/java/org/apache/catalina/core/LocalStrings.properties
tomcat/tc7.0.x/trunk/java/org/apache/tomcat/jni/SSL.java
tomcat/tc7.0.x/trunk/webapps/docs/changelog.xml
Modified:
tomcat/tc7.0.x/trunk/java/org/apache/catalina/core/AprLifecycleListener.java
URL:
http://svn.apache.org/viewvc/tomcat/tc7.0.x/trunk/java/org/apache/catalina/core/AprLifecycleListener.java?rev=1199985r1=1199984r2=1199985view=diff
==
---
tomcat/tc7.0.x/trunk/java/org/apache/catalina/core/AprLifecycleListener.java
(original)
+++
tomcat/tc7.0.x/trunk/java/org/apache/catalina/core/AprLifecycleListener.java
Wed Nov 9 21:43:23 2011
@@ -29,6 +29,7 @@ import org.apache.juli.logging.LogFactor
import org.apache.tomcat.jni.Library;
import org.apache.tomcat.util.ExceptionUtils;
import org.apache.tomcat.util.res.StringManager;
+import org.apache.tomcat.jni.SSL;
@@ -66,11 +67,13 @@ public class AprLifecycleListener
// -- Properties
protected static String SSLEngine = on; //default on
+protected static String FIPSMode = off; // default off, valid only when
SSLEngine=on
protected static String SSLRandomSeed = builtin;
protected static boolean sslInitialized = false;
protected static boolean aprInitialized = false;
protected static boolean sslAvailable = false;
protected static boolean aprAvailable = false;
+protected static boolean fipsModeActive = false;
protected static final Object lock = new Object();
@@ -106,7 +109,7 @@ public class AprLifecycleListener
initializeSSL();
} catch (Throwable t) {
ExceptionUtils.handleThrowable(t);
-log.info(sm.getString(aprListener.sslInit));
+log.error(sm.getString(aprListener.sslInit), t);
}
}
}
@@ -138,6 +141,7 @@ public class AprLifecycleListener
aprInitialized = false;
sslInitialized = false; // Well we cleaned the pool in terminate.
sslAvailable = false; // Well we cleaned the pool in terminate.
+fipsModeActive = false;
}
private static void init()
@@ -220,6 +224,7 @@ public class AprLifecycleListener
//only once per VM
return;
}
+
sslInitialized = true;
String methodName = randSet;
@@ -237,6 +242,25 @@ public class AprLifecycleListener
method = clazz.getMethod(methodName, paramTypes);
method.invoke(null, paramValues);
+if(on.equalsIgnoreCase(AprLifecycleListener.FIPSMode)) {
+log.info(sm.getString(aprListener.initializingFIPS));
+
+int result = SSL.fipsModeSet(1);
+
+// success is defined as return value = 1
+if(1 == result) {
+fipsModeActive = true;
+
+log.info(sm.getString(aprListener.initializeFIPSSuccess));
+} else {
+// This case should be handled by the native method,
+// but we'll make absolutely sure, here.
+log.error(sm.getString(aprListener.initializeFIPSFailed));
+
+throw new
IllegalStateException(sm.getString(aprListener.initializeFIPSFailed));
+}
+}
+
sslAvailable = true;
}
@@ -245,6 +269,10 @@ public class AprLifecycleListener
}
public void setSSLEngine(String SSLEngine) {
+// Ensure that the SSLEngine is consistent with that used for SSL init
+if(sslInitialized)
+throw new
IllegalStateException(sm.getString(aprListener.tooLateForSSLEngine));
+
AprLifecycleListener.SSLEngine = SSLEngine;
}
@@ -253,7 +281,24 @@ public class AprLifecycleListener
}
public void setSSLRandomSeed(String SSLRandomSeed) {
+// Ensure that the random seed is consistent with that used for SSL
init
+if(sslInitialized)
+throw new
IllegalStateException(sm.getString(aprListener.tooLateForSSLRandomSeed));
+
AprLifecycleListener.SSLRandomSeed = SSLRandomSeed;
}
+public void setFIPSMode(String FIPSMode)
+{
+// Ensure that the FIPS mode is consistent with that used for SSL init
+if(sslInitialized)
+throw new
IllegalStateException(sm.getString(aprListener.tooLateForFIPSMode));
+
+AprLifecycleListener.FIPSMode = FIPSMode;
+}
+
+public boolean isFIPSModeActive()
+{
+return
buildbot failure in ASF Buildbot on tomcat-7-trunk
The Buildbot has detected a new failure on builder tomcat-7-trunk while building ASF Buildbot. Full details are available at: http://ci.apache.org/builders/tomcat-7-trunk/builds/159 Buildbot URL: http://ci.apache.org/ Buildslave for this Build: bb-vm_ubuntu Build Reason: scheduler Build Source Stamp: [branch tomcat/tc7.0.x/trunk] 1199985 Blamelist: schultz BUILD FAILED: failed compile sincerely, -The Buildbot
svn commit: r1199991 - /tomcat/tc6.0.x/trunk/STATUS.txt
Author: schultz Date: Wed Nov 9 21:52:44 2011 New Revision: 111 URL: http://svn.apache.org/viewvc?rev=111view=rev Log: Added backport 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=111r1=110r2=111view=diff == --- tomcat/tc6.0.x/trunk/STATUS.txt (original) +++ tomcat/tc6.0.x/trunk/STATUS.txt Wed Nov 9 21:52:44 2011 @@ -103,6 +103,12 @@ PATCHES PROPOSED TO BACKPORT: +1: kkolinko, markt -1: +* Fix https://issues.apache.org/bugzilla/show_bug.cgi?id=50570 + Apply FIPS mode patch from TC7: + http://svn.apache.org/viewvc?rev=1199985view=rev + +1: schultz + -1: + PATCHES/ISSUES THAT ARE STALLED - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
DO NOT REPLY [Bug 50570] Allow explicit use of FIPS mode in APR lifecycle listener
https://issues.apache.org/bugzilla/show_bug.cgi?id=50570 Christopher Schultz ch...@christopherschultz.net changed: What|Removed |Added Status|NEW |RESOLVED Resolution||FIXED --- Comment #23 from Christopher Schultz ch...@christopherschultz.net 2011-11-09 21:54:01 UTC --- Fixed in trunk, will be in 7.0.23 and later. 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
svn commit: r1199996 - /tomcat/trunk/java/org/apache/catalina/core/AprLifecycleListener.java
Author: kkolinko
Date: Wed Nov 9 22:02:19 2011
New Revision: 116
URL: http://svn.apache.org/viewvc?rev=116view=rev
Log:
Followup to r1199980
Fix broken checkstyle validation (imports order)
Format new code
Cache result of i18n message lookup
Add getter for the new FIPSMode property
Documentation in listeners.xml still needs updating.
Modified:
tomcat/trunk/java/org/apache/catalina/core/AprLifecycleListener.java
Modified: tomcat/trunk/java/org/apache/catalina/core/AprLifecycleListener.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/core/AprLifecycleListener.java?rev=116r1=115r2=116view=diff
==
--- tomcat/trunk/java/org/apache/catalina/core/AprLifecycleListener.java
(original)
+++ tomcat/trunk/java/org/apache/catalina/core/AprLifecycleListener.java Wed
Nov 9 22:02:19 2011
@@ -27,9 +27,9 @@ import org.apache.catalina.LifecycleList
import org.apache.juli.logging.Log;
import org.apache.juli.logging.LogFactory;
import org.apache.tomcat.jni.Library;
+import org.apache.tomcat.jni.SSL;
import org.apache.tomcat.util.ExceptionUtils;
import org.apache.tomcat.util.res.StringManager;
-import org.apache.tomcat.jni.SSL;
@@ -242,7 +242,7 @@ public class AprLifecycleListener
method = clazz.getMethod(methodName, paramTypes);
method.invoke(null, paramValues);
-if(on.equalsIgnoreCase(AprLifecycleListener.FIPSMode)) {
+if(on.equalsIgnoreCase(FIPSMode)) {
log.info(sm.getString(aprListener.initializingFIPS));
int result = SSL.fipsModeSet(1);
@@ -255,9 +255,9 @@ public class AprLifecycleListener
} else {
// This case should be handled by the native method,
// but we'll make absolutely sure, here.
-log.error(sm.getString(aprListener.initializeFIPSFailed));
-
-throw new
IllegalStateException(sm.getString(aprListener.initializeFIPSFailed));
+String message =
sm.getString(aprListener.initializeFIPSFailed);
+log.error(message);
+throw new IllegalStateException(message);
}
}
@@ -270,8 +270,10 @@ public class AprLifecycleListener
public void setSSLEngine(String SSLEngine) {
// Ensure that the SSLEngine is consistent with that used for SSL init
-if(sslInitialized)
-throw new
IllegalStateException(sm.getString(aprListener.tooLateForSSLEngine));
+if (sslInitialized) {
+throw new IllegalStateException(
+sm.getString(aprListener.tooLateForSSLEngine));
+}
AprLifecycleListener.SSLEngine = SSLEngine;
}
@@ -282,23 +284,29 @@ public class AprLifecycleListener
public void setSSLRandomSeed(String SSLRandomSeed) {
// Ensure that the random seed is consistent with that used for SSL
init
-if(sslInitialized)
-throw new
IllegalStateException(sm.getString(aprListener.tooLateForSSLRandomSeed));
+if (sslInitialized) {
+throw new IllegalStateException(
+sm.getString(aprListener.tooLateForSSLRandomSeed));
+}
AprLifecycleListener.SSLRandomSeed = SSLRandomSeed;
}
-public void setFIPSMode(String FIPSMode)
-{
+public String getFIPSMode() {
+return FIPSMode;
+}
+
+public void setFIPSMode(String FIPSMode) {
// Ensure that the FIPS mode is consistent with that used for SSL init
-if(sslInitialized)
-throw new
IllegalStateException(sm.getString(aprListener.tooLateForFIPSMode));
+if (sslInitialized) {
+throw new IllegalStateException(
+sm.getString(aprListener.tooLateForFIPSMode));
+}
AprLifecycleListener.FIPSMode = FIPSMode;
}
-public boolean isFIPSModeActive()
-{
+public boolean isFIPSModeActive() {
return fipsModeActive;
}
}
-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
svn commit: r1199998 - /tomcat/tc7.0.x/trunk/webapps/docs/changelog.xml
Author: schultz Date: Wed Nov 9 22:04:16 2011 New Revision: 118 URL: http://svn.apache.org/viewvc?rev=118view=rev Log: Fixed poorly-formed XML in changelog. Modified: tomcat/tc7.0.x/trunk/webapps/docs/changelog.xml Modified: tomcat/tc7.0.x/trunk/webapps/docs/changelog.xml URL: http://svn.apache.org/viewvc/tomcat/tc7.0.x/trunk/webapps/docs/changelog.xml?rev=118r1=117r2=118view=diff == --- tomcat/tc7.0.x/trunk/webapps/docs/changelog.xml (original) +++ tomcat/tc7.0.x/trunk/webapps/docs/changelog.xml Wed Nov 9 22:04:16 2011 @@ -65,6 +65,7 @@ fix bug50570/bug: Enable FIPS mode to be set in AprLifecycleListener. Based upon a patch from Chris Beckey. (schultz) + /fix fix bug51744/bug: Throw the correct exception if an application attempts to modify the associated JNDI context. (markt) - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
Re: svn commit: r1199980 - in /tomcat/trunk/java/org/apache: catalina/core/AprLifecycleListener.java catalina/core/LocalStrings.properties tomcat/jni/SSL.java
On 09/11/2011 21:34, schu...@apache.org wrote: Author: schultz Date: Wed Nov 9 21:34:31 2011 New Revision: 1199980 URL: http://svn.apache.org/viewvc?rev=1199980view=rev Log: Fixed bug #50570 - Allow explicit use of FIPS mode in APR lifecycle listener - Added FIPSMode attribute to AprLifecycleListener that causes OpenSSL to go into FIPS mode Isn't this dependent on an tcnative update? Mark - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
Re: svn commit: r1199996 - /tomcat/trunk/java/org/apache/catalina/core/AprLifecycleListener.java
Konstantin, On 11/9/11 2:02 PM, kkoli...@apache.org wrote: Fix broken checkstyle validation (imports order) Format new code Cache result of i18n message lookup Add getter for the new FIPSMode property Thanks. Documentation in listeners.xml still needs updating. I will update this immediately. Thanks, -chris signature.asc Description: OpenPGP digital signature
svn commit: r1200004 - in /tomcat/tc7.0.x/trunk: ./ java/org/apache/catalina/core/AprLifecycleListener.java
Author: kkolinko Date: Wed Nov 9 22:08:08 2011 New Revision: 124 URL: http://svn.apache.org/viewvc?rev=124view=rev Log: Merged revision 116 from tomcat/trunk: Followup to r1199980 Fix broken checkstyle validation (imports order) Format new code Cache result of i18n message lookup Add getter for the new FIPSMode property. Modified: tomcat/tc7.0.x/trunk/ (props changed) tomcat/tc7.0.x/trunk/java/org/apache/catalina/core/AprLifecycleListener.java Propchange: tomcat/tc7.0.x/trunk/ -- --- svn:mergeinfo (original) +++ svn:mergeinfo Wed Nov 9 22:08:08 2011 @@ -1 +1 @@ -/tomcat/trunk:1156115,1156171,1156276,1156304,1156519,1156530,1156602,1157015,1157018,1157151,1157198,1157204,1157810,1157832,1157834,1157847,1157908,1157939,1158155,1158160,1158176,1158195,1158198-1158199,1158227,1158331,1158334-1158335,1158426,1160347,1160592,1160611,1160619,1160626,1160639,1160652,1160720-1160721,1160772,1160774,1160776,1161303,1161310,1161322,1161339,1161486,1161540,1161549,1161584,1162082,1162149,1162169,1162721,1162769,1162836,1162932,1163630,1164419,1164438,1164469,1164480,1164567,1165234,1165247-1165248,1165253,1165273,1165282,1165309,1165331,1165338,1165347,1165360-1165361,1165367-1165368,1165602,1165608,1165677,1165693,1165721,1165723,1165728,1165730,1165738,1165746,1165765,1165777,1165918,1165921,1166077,1166150-1166151,1166290,1166366,1166620,1166686,1166693,1166752,1166757,1167368,1167394,1169447,1170647,1171692,1172233-1172234,1172236,1172269,1172278,1172282,1172556,1172610,1172664,1172689,1172711,1173020-1173021,1173082,1173088,1173090,1173096 ,1173241,1173256,1173288,117,1173342,1173461,1173614,1173630,1173659,1173722,1174061,1174239,1174322,1174325,1174329-1174330,1174337-1174339,1174343,1174353,1174799,1174882,1174884,1174983,1175155,1175158,1175167,1175182,1175190,1175201,1175272,1175275,1175283,1175582,1175589-1175590,1175594,1175602,1175613,1175633,1175690,1175713,1175798,1175889,1175896,1175907,1176584,1176590,1176799,1177050,1177060,1177125,1177152,1177160,1177245,1177850,1177862,1177978,1178209,1178228,1178233,1178449,1178542,1178681,1178684,1178721,1179268,1179274,1180261,1180865,1180891,1180894,1180907,1181028,1181123,1181125,1181136,1181291,1181743,1182796,1183078,1183105,1183142,1183328,1183339-1183340,1183492-1183494,1183605,1184917,1184919,1185018,1185020,1185200,1185588,1185626,1185756,1185758,1186011,1186042-1186045,1186104,1186123,1186137,1186153,1186254,1186257,1186377-1186379,1186479-1186480,1186712,1186743,1186750,1186763,1186890-1186892,1186894,1186949,1187018,1187027-1187028,1187381,1187 755,1187775,1187806,1187827,1188301,1188303-1188305,1188399,1188822,1188930-1188931,1189116,1189129,1189183,1189240,1189256,1189386,1189413-1189414,1189477,1189685,1189805,1189857,1189864,1189882,1190034,1190185,1190279,1190339,1190371,1190388-1190389,1190474,1190481,1194915,1195222-1195223,1195531,1195899,1195905,1195943,1195949,1195953,1195955,1195965,1195968,1196175,1196212,1196223,1196304-1196305,1196735,1196825,1196827,1197158,1197261,1197263,1197299-1197300,1197305,1197339-1197340,1197343,1197382,1197386-1197387,1197480,1197578,1198497,1198528,1198552,1198602,1198604,1198607,1198622,1198640,1199418,1199432,1199436,1199513,1199529 +/tomcat/trunk:1156115,1156171,1156276,1156304,1156519,1156530,1156602,1157015,1157018,1157151,1157198,1157204,1157810,1157832,1157834,1157847,1157908,1157939,1158155,1158160,1158176,1158195,1158198-1158199,1158227,1158331,1158334-1158335,1158426,1160347,1160592,1160611,1160619,1160626,1160639,1160652,1160720-1160721,1160772,1160774,1160776,1161303,1161310,1161322,1161339,1161486,1161540,1161549,1161584,1162082,1162149,1162169,1162721,1162769,1162836,1162932,1163630,1164419,1164438,1164469,1164480,1164567,1165234,1165247-1165248,1165253,1165273,1165282,1165309,1165331,1165338,1165347,1165360-1165361,1165367-1165368,1165602,1165608,1165677,1165693,1165721,1165723,1165728,1165730,1165738,1165746,1165765,1165777,1165918,1165921,1166077,1166150-1166151,1166290,1166366,1166620,1166686,1166693,1166752,1166757,1167368,1167394,1169447,1170647,1171692,1172233-1172234,1172236,1172269,1172278,1172282,1172556,1172610,1172664,1172689,1172711,1173020-1173021,1173082,1173088,1173090,1173096
Re: svn commit: r1199980 - in /tomcat/trunk/java/org/apache: catalina/core/AprLifecycleListener.java catalina/core/LocalStrings.properties tomcat/jni/SSL.java
Mark, On 11/9/11 2:06 PM, Mark Thomas wrote: On 09/11/2011 21:34, schu...@apache.org wrote: Author: schultz Date: Wed Nov 9 21:34:31 2011 New Revision: 1199980 URL: http://svn.apache.org/viewvc?rev=1199980view=rev Log: Fixed bug #50570 - Allow explicit use of FIPS mode in APR lifecycle listener - Added FIPSMode attribute to AprLifecycleListener that causes OpenSSL to go into FIPS mode Isn't this dependent on an tcnative update? Yes, it is. I'm updating the documentation for AprLifecycleListener and I will mention the version dependency in there. If this is not yet appropriate to release, I can roll-back the patch. -chris signature.asc Description: OpenPGP digital signature
Re: svn commit: r1199980 - in /tomcat/trunk/java/org/apache: catalina/core/AprLifecycleListener.java catalina/core/LocalStrings.properties tomcat/jni/SSL.java
-BEGIN PGP SIGNED MESSAGE- Hash: SHA1 On 09/11/2011 22:09, Christopher Schultz wrote: Mark, On 11/9/11 2:06 PM, Mark Thomas wrote: On 09/11/2011 21:34, schu...@apache.org wrote: Author: schultz Date: Wed Nov 9 21:34:31 2011 New Revision: 1199980 URL: http://svn.apache.org/viewvc?rev=1199980view=rev Log: Fixed bug #50570 - Allow explicit use of FIPS mode in APR lifecycle listener - Added FIPSMode attribute to AprLifecycleListener that causes OpenSSL to go into FIPS mode Isn't this dependent on an tcnative update? Yes, it is. I'm updating the documentation for AprLifecycleListener and I will mention the version dependency in there. If this is not yet appropriate to release, I can roll-back the patch. What happens if I try this with 1.1.22? If it blows up, that is bad. If it logs an error, that is fine. If it silently carries on, that is bad. Mark -BEGIN PGP SIGNATURE- Version: GnuPG v1.4.9 (MingW32) Comment: Using GnuPG with Mozilla - http://enigmail.mozdev.org/ iQIcBAEBAgAGBQJOuvrfAAoJEBDAHFovYFnnZxQQANYotg5DUaa2IJlr0wgI2oGr 8ya5N38EsHjwUYLU+0j35b1Q7n1AWi0AxK2GFaW8Gqde54W0MZOdkYfg6/RGHTKB gDIWHACkd3QEmnxSgyRZd+EBqjFrxIn94rGlG3l3Q+uVhI6sT0Ljqh5BwH7f85qv A0PHxby3SJWfk38MdE9168A8+wrBL3JMtdSJU2Wd6mZEANPr8oEp0tJ6EeI3HpfX oc4H7GGmJf1wBfUPzhVBTxZKJ+6RWzxxKqtQPHVm6q/8s2/qT3kHBCIUPAdL2qpd IEsAorUGg9PW2a70nX20l9ANr0WWuR7jjh/AGHhPVd11ahqsNXRc2yw1vxMVPHua xsHx6Hx7g/Zt8iZL3OGhq75x6ewTmAPp6Df4GFUqm4y4foUWJQEH9gdr2F2nTr3C 87KbGgGOhUh10DPArTWyqeZYQqNKb0I369qcClE552zzIhzsYA1wyuwaEECYZRWR 7/RS5Zz3gdT/z/vdYyds6wayIYFny31PQ8vGpfwrAW+e0HmnV8WEjBX6grdXEq51 M8845CaFXKO0U3GwVw2ECnYUcvTCiGm/lWe5s1fHWXXRKTpsCmw0LVGPAPdg/ore M+nVgLN32DKNiUGCUL/koj9v0YJdLYfKDsWJidRsCcXfoJWPodm0VlOsJbwj/1jS jEL/Re/qFpMszaIS6Jpo =Y0eN -END PGP SIGNATURE- - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
buildbot success in ASF Buildbot on tomcat-7-trunk
The Buildbot has detected a restored build on builder tomcat-7-trunk while building ASF Buildbot. Full details are available at: http://ci.apache.org/builders/tomcat-7-trunk/builds/160 Buildbot URL: http://ci.apache.org/ Buildslave for this Build: bb-vm_ubuntu Build Reason: scheduler Build Source Stamp: [branch tomcat/tc7.0.x/trunk] 124 Blamelist: kkolinko,schultz Build succeeded! sincerely, -The Buildbot
Re: svn commit: r1199980 - in /tomcat/trunk/java/org/apache: catalina/core/AprLifecycleListener.java catalina/core/LocalStrings.properties tomcat/jni/SSL.java
2011/11/10 Mark Thomas ma...@apache.org: On 09/11/2011 21:34, schu...@apache.org wrote: Author: schultz Date: Wed Nov 9 21:34:31 2011 New Revision: 1199980 URL: http://svn.apache.org/viewvc?rev=1199980view=rev Log: Fixed bug #50570 - Allow explicit use of FIPS mode in APR lifecycle listener - Added FIPSMode attribute to AprLifecycleListener that causes OpenSSL to go into FIPS mode Isn't this dependent on an tcnative update? Yes, it is. I'm updating the documentation for AprLifecycleListener and I will mention the version dependency in there. If this is not yet appropriate to release, I can roll-back the patch. What happens if I try this with 1.1.22? If it blows up, that is bad. If it logs an error, that is fine. If it silently carries on, that is bad. Just testing this. If I do not set FIPSMode property, all is OK. No difference from previous behaviour. If I set FIPSMode=on, the following happens [[[ 10-Nov-2011 01:13:59.484 INFO [main] org.apache.catalina.core.AprLifecycleListener.init Loaded APR based Apache Tomcat Native library 1.1.22. 10-Nov-2011 01:13:59.500 INFO [main] org.apache.catalina.core.AprLifecycleListener.init APR capabilities: IPv6 [false], sendfile [true], accept filters [false], random [true]. 10-Nov-2011 01:13:59.937 INFO [main] org.apache.catalina.core.AprLifecycleListener.initializeSSL Initializing FIPS mode... 10-Nov-2011 01:13:59.937 SEVERE [main] org.apache.catalina.core.AprLifecycleListener.lifecycleEvent Failed to initialize the SSLEngine. java.lang.UnsatisfiedLinkError: org.apache.tomcat.jni.SSL.fipsModeSet(I)I at org.apache.tomcat.jni.SSL.fipsModeSet(Native Method) at org.apache.catalina.core.AprLifecycleListener.initializeSSL(AprLifecycleListener.java:248) at org.apache.catalina.core.AprLifecycleListener.lifecycleEvent(AprLifecycleListener.java:109) at org.apache.catalina.util.LifecycleSupport.fireLifecycleEvent(LifecycleSupport.java:119) at org.apache.catalina.util.LifecycleBase.fireLifecycleEvent(LifecycleBase.java:90) at org.apache.catalina.util.LifecycleBase.setStateInternal(LifecycleBase.java:389) at org.apache.catalina.util.LifecycleBase.init(LifecycleBase.java:99) at org.apache.catalina.startup.Catalina.load(Catalina.java:573) at org.apache.catalina.startup.Catalina.load(Catalina.java:598) at sun.reflect.NativeMethodAccessorImpl.invoke0(Native Method) at sun.reflect.NativeMethodAccessorImpl.invoke(NativeMethodAccessorImpl.java:39) at sun.reflect.DelegatingMethodAccessorImpl.invoke(DelegatingMethodAccessorImpl.java:25) at java.lang.reflect.Method.invoke(Method.java:597) at org.apache.catalina.startup.Bootstrap.load(Bootstrap.java:281) at org.apache.catalina.startup.Bootstrap.main(Bootstrap.java:449) (...) 10-Nov-2011 01:14:01.203 INFO [main] org.apache.catalina.startup.Catalina.start Server startup in 1030 ms ]]] There is java.lang.UnsatisfiedLinkError (and not the IllegalStateException that the code throws). Despite this error, Tomcat startup sequence continues. I guess that from FIPS PoV the failure to initialize FIPS mode should be more fatal, regardless of its cause. Be it because of native lib returning error code or this tc-native version mismatch. Maybe even throw an error if SSLEngine was not on. Now it just causes the FIPS mode to be ignored. I do not know why UnsatisfiedLinkError error was not enough to break it. Best regards, Konstantin Kolinko - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
svn commit: r1200029 - in /tomcat/site/trunk: docs/svn.html xdocs/svn.xml
Author: kkolinko Date: Wed Nov 9 23:15:46 2011 New Revision: 1200029 URL: http://svn.apache.org/viewvc?rev=1200029view=rev Log: Add TOC. Add link to subversion.apache.org. Correct wording and links. Modified: tomcat/site/trunk/docs/svn.html tomcat/site/trunk/xdocs/svn.xml Modified: tomcat/site/trunk/docs/svn.html URL: http://svn.apache.org/viewvc/tomcat/site/trunk/docs/svn.html?rev=1200029r1=1200028r2=1200029view=diff == --- tomcat/site/trunk/docs/svn.html (original) +++ tomcat/site/trunk/docs/svn.html Wed Nov 9 23:15:46 2011 @@ -181,6 +181,38 @@ !--RIGHT SIDE MAIN BODY--td width=80% valign=top align=left id=mainBody table border=0 cellspacing=0 cellpadding=2 width=100% tr +td bgcolor=#525D76font color=#ff face=arial,helvetica,sanserifa name=Table of Contents +!--()--/aa name=Table_of_ContentsstrongTable of Contents/strong/a/font/td +/tr +tr +td +p +blockquote + +ul +li +a href=#SubversionSubversion/a +/li +li +a href=#Repository_StructureRepository Structure/a +/li +li +a href=#Git_MirrorGit Mirror/a +/li +/ul + +/blockquote +/p +/td +/tr +tr +td +br +/td +/tr +/table +table border=0 cellspacing=0 cellpadding=2 width=100% +tr td bgcolor=#525D76font color=#ff face=arial,helvetica,sanserifa name=SubversionstrongSubversion/strong/a/font/td /tr tr @@ -190,14 +222,14 @@ pAll of the Apache Tomcat source code, documentation and this web site are -managed under version control using Subversion. This page explains the structure -of the Apache Tomcat Subversion repository. The page assumes you are familiar -with the general +managed under version control using a href=http://subversion.apache.org/;Subversion/a. +This page explains the structure of the Apache Tomcat Subversion repository. +The page assumes you are familiar with the general a href=http://www.apache.org/dev/version-control.html#anon-svn;Apache guidance for Subversion/a./p -pAll Subversion links in this page use anonymous access./p +pAll Subversion links on this page use anonymous access./p /blockquote @@ -226,8 +258,9 @@ guidance for Subversion/a./p http://svn.apache.org/repos/asf/tomcat/a./p -pNote: there is also a href=http://svn.apache.org/viewvc/tomcat/;ViewVC-powered view/a -of the repository./p +p +emNote:/em there is also ViewVC-powered +a href=http://svn.apache.org/viewvc/tomcat/;web view of the repository/a./p pThe directories below this level are:/p Modified: tomcat/site/trunk/xdocs/svn.xml URL: http://svn.apache.org/viewvc/tomcat/site/trunk/xdocs/svn.xml?rev=1200029r1=1200028r2=1200029view=diff == --- tomcat/site/trunk/xdocs/svn.xml (original) +++ tomcat/site/trunk/xdocs/svn.xml Wed Nov 9 23:15:46 2011 @@ -7,16 +7,20 @@ body +section name=Table of Contents +toc/ +/section + section name=Subversion pAll of the Apache Tomcat source code, documentation and this web site are -managed under version control using Subversion. This page explains the structure -of the Apache Tomcat Subversion repository. The page assumes you are familiar -with the general +managed under version control using a href=http://subversion.apache.org/;Subversion/a. +This page explains the structure of the Apache Tomcat Subversion repository. +The page assumes you are familiar with the general a href=http://www.apache.org/dev/version-control.html#anon-svn;Apache guidance for Subversion/a./p -pAll Subversion links in this page use anonymous access./p +pAll Subversion links on this page use anonymous access./p /section @@ -26,8 +30,8 @@ guidance for Subversion/a./p a href=http://svn.apache.org/repos/asf/tomcat; http://svn.apache.org/repos/asf/tomcat/a./p -pNote: there is also a href=http://svn.apache.org/viewvc/tomcat/;ViewVC-powered view/a -of the repository./p +pemNote:/em there is also ViewVC-powered +a href=http://svn.apache.org/viewvc/tomcat/;web view of the repository/a./p pThe directories below this level are:/p table - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
Re: svn commit: r1199980 - in /tomcat/trunk/java/org/apache: catalina/core/AprLifecycleListener.java catalina/core/LocalStrings.properties tomcat/jni/SSL.java
Konstantin,
On 11/9/11 2:24 PM, Konstantin Kolinko wrote:
2011/11/10 Mark Thomas ma...@apache.org:
On 09/11/2011 21:34, schu...@apache.org wrote:
Author: schultz Date: Wed Nov 9 21:34:31 2011 New Revision:
1199980
URL: http://svn.apache.org/viewvc?rev=1199980view=rev Log:
Fixed bug #50570 - Allow explicit use of FIPS mode in APR
lifecycle listener - Added FIPSMode attribute to
AprLifecycleListener that causes OpenSSL to go into FIPS mode
Isn't this dependent on an tcnative update?
Yes, it is. I'm updating the documentation for AprLifecycleListener
and I will mention the version dependency in there. If this is not
yet appropriate to release, I can roll-back the patch.
What happens if I try this with 1.1.22? If it blows up, that is bad.
If it logs an error, that is fine. If it silently carries on, that is bad.
Just testing this.
If I do not set FIPSMode property, all is OK. No difference from
previous behaviour.
If I set FIPSMode=on, the following happens
[[[
10-Nov-2011 01:13:59.484 INFO [main]
org.apache.catalina.core.AprLifecycleListener.init Loaded APR based
Apache Tomcat Native library 1.1.22.
10-Nov-2011 01:13:59.500 INFO [main]
org.apache.catalina.core.AprLifecycleListener.init APR capabilities:
IPv6 [false], sendfile [true], accept filters [false], random [true].
10-Nov-2011 01:13:59.937 INFO [main]
org.apache.catalina.core.AprLifecycleListener.initializeSSL
Initializing FIPS mode...
10-Nov-2011 01:13:59.937 SEVERE [main]
org.apache.catalina.core.AprLifecycleListener.lifecycleEvent Failed to
initialize the SSLEngine.
java.lang.UnsatisfiedLinkError: org.apache.tomcat.jni.SSL.fipsModeSet(I)I
at org.apache.tomcat.jni.SSL.fipsModeSet(Native Method)
at
org.apache.catalina.core.AprLifecycleListener.initializeSSL(AprLifecycleListener.java:248)
at
org.apache.catalina.core.AprLifecycleListener.lifecycleEvent(AprLifecycleListener.java:109)
at
org.apache.catalina.util.LifecycleSupport.fireLifecycleEvent(LifecycleSupport.java:119)
at
org.apache.catalina.util.LifecycleBase.fireLifecycleEvent(LifecycleBase.java:90)
at
org.apache.catalina.util.LifecycleBase.setStateInternal(LifecycleBase.java:389)
at org.apache.catalina.util.LifecycleBase.init(LifecycleBase.java:99)
at org.apache.catalina.startup.Catalina.load(Catalina.java:573)
at org.apache.catalina.startup.Catalina.load(Catalina.java:598)
at sun.reflect.NativeMethodAccessorImpl.invoke0(Native Method)
at
sun.reflect.NativeMethodAccessorImpl.invoke(NativeMethodAccessorImpl.java:39)
at
sun.reflect.DelegatingMethodAccessorImpl.invoke(DelegatingMethodAccessorImpl.java:25)
at java.lang.reflect.Method.invoke(Method.java:597)
at org.apache.catalina.startup.Bootstrap.load(Bootstrap.java:281)
at org.apache.catalina.startup.Bootstrap.main(Bootstrap.java:449)
(...)
10-Nov-2011 01:14:01.203 INFO [main]
org.apache.catalina.startup.Catalina.start Server startup in 1030 ms
]]]
There is java.lang.UnsatisfiedLinkError (and not the
IllegalStateException that the code throws).
Despite this error, Tomcat startup sequence continues.
I guess that from FIPS PoV the failure to initialize FIPS mode should
be more fatal, regardless of its cause.
Be it because of native lib returning error code or this tc-native
version mismatch.
Maybe even throw an error if SSLEngine was not on. Now it just
causes the FIPS mode to be ignored.
I do not know why UnsatisfiedLinkError error was not enough to break it.
Because the AprLifecycleListener's code looks like this:
if (Lifecycle.BEFORE_INIT_EVENT.equals(event.getType())) {
synchronized (lock) {
init();
if (aprAvailable) {
try {
initializeSSL();
} catch (Throwable t) {
ExceptionUtils.handleThrowable(t);
log.error(sm.getString(aprListener.sslInit), t);
}
}
}
The error is caught, logged, and execution continues.
I did not feel that this was an appropriate patch to include changes to
exception handling within the AprLivecycleListener.
-chris
signature.asc
Description: OpenPGP digital signature
svn commit: r1200038 - /tomcat/tc6.0.x/trunk/STATUS.txt
Author: jfclere Date: Wed Nov 9 23:34:28 2011 New Revision: 1200038 URL: http://svn.apache.org/viewvc?rev=1200038view=rev Log: My votes. 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=1200038r1=1200037r2=1200038view=diff == --- tomcat/tc6.0.x/trunk/STATUS.txt (original) +++ tomcat/tc6.0.x/trunk/STATUS.txt Wed Nov 9 23:34:28 2011 @@ -76,7 +76,7 @@ PATCHES PROPOSED TO BACKPORT: Patch provided by Taiki Sugawara. http://svn.apache.org/viewvc?rev=1190388view=rev (r1190391 in TC7) - +1: kkolinko, markt + +1: kkolinko, markt, jfclere -1: * Fix https://issues.apache.org/bugzilla/show_bug.cgi?id=52091 @@ -84,7 +84,7 @@ PATCHES PROPOSED TO BACKPORT: Patch provided by Taiki Sugawara. https://issues.apache.org/bugzilla/attachment.cgi?id=27862 (r1190389 in trunk, r1190392 in TC7) - +1: kkolinko, markt + +1: kkolinko, markt, jfclere -1: * Fix https://issues.apache.org/bugzilla/show_bug.cgi?id=52121 @@ -100,13 +100,13 @@ PATCHES PROPOSED TO BACKPORT: Expose previously added isAllowValid, isDenyValid properties as well. (r1198623 in TC7) http://people.apache.org/~kkolinko/patches/2011-11-08_tc6_RequestFilterValve_JMX.patch - +1: kkolinko, markt + +1: kkolinko, markt, jfclere -1: * Fix https://issues.apache.org/bugzilla/show_bug.cgi?id=50570 Apply FIPS mode patch from TC7: http://svn.apache.org/viewvc?rev=1199985view=rev - +1: schultz + +1: schultz, jfclere -1: - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
Re: svn commit: r1199980 - in /tomcat/trunk/java/org/apache: catalina/core/AprLifecycleListener.java catalina/core/LocalStrings.properties tomcat/jni/SSL.java
2011/11/10 Christopher Schultz ch...@christopherschultz.net:
There is java.lang.UnsatisfiedLinkError (and not the
IllegalStateException that the code throws).
Despite this error, Tomcat startup sequence continues.
I guess that from FIPS PoV the failure to initialize FIPS mode should
be more fatal, regardless of its cause.
Be it because of native lib returning error code or this tc-native
version mismatch.
Maybe even throw an error if SSLEngine was not on. Now it just
causes the FIPS mode to be ignored.
I do not know why UnsatisfiedLinkError error was not enough to break it.
Because the AprLifecycleListener's code looks like this:
if (Lifecycle.BEFORE_INIT_EVENT.equals(event.getType())) {
synchronized (lock) {
init();
if (aprAvailable) {
try {
initializeSSL();
} catch (Throwable t) {
ExceptionUtils.handleThrowable(t);
log.error(sm.getString(aprListener.sslInit), t);
}
}
}
The error is caught, logged, and execution continues.
I did not feel that this was an appropriate patch to include changes to
exception handling within the AprLivecycleListener.
Maybe add explicit FIPS mode status check below the above error
handling? Something like:
if (on.equalsIgnoreCase(FIPSMode) !fipsModeActive) {
fail fatally;
}
Best regards,
Konstantin Kolinko
-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
svn commit: r1200048 - /tomcat/trunk/java/org/apache/catalina/Globals.java
Author: kkolinko
Date: Wed Nov 9 23:55:13 2011
New Revision: 1200048
URL: http://svn.apache.org/viewvc?rev=1200048view=rev
Log:
Add constant for the org.apache.tomcat. attribute name prefix.
Move ASYNC_SUPPORTED_ATTR up to other *_ATTR constants.
Modified:
tomcat/trunk/java/org/apache/catalina/Globals.java
Modified: tomcat/trunk/java/org/apache/catalina/Globals.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/Globals.java?rev=1200048r1=1200047r2=1200048view=diff
==
--- tomcat/trunk/java/org/apache/catalina/Globals.java (original)
+++ tomcat/trunk/java/org/apache/catalina/Globals.java Wed Nov 9 23:55:13 2011
@@ -156,6 +156,15 @@ public final class Globals {
/**
+ * All request attributes which names start with this prefix are used by
+ * connector implementations. They are passed down to coyoteRequest and
back
+ * up. See codeRequest.setAttribute(String, Object)/code.
+ */
+public static final String TOMCAT_CONNECTOR_ATTR_PREFIX =
+org.apache.tomcat.;
+
+
+/**
* The request attribute that is set to the value of {@code Boolean.TRUE}
* if connector processing this request supports Comet API.
*/
@@ -226,6 +235,13 @@ public final class Globals {
/**
+ *
+ */
+public static final String ASYNC_SUPPORTED_ATTR =
+org.apache.catalina.ASYNC_SUPPORTED;
+
+
+/**
* The request attribute that is set to {@code Boolean.TRUE} if some
request
* parameters have been ignored during request parameters parsing. It can
* happen, for example, if there is a limit on the total count of parseable
@@ -250,12 +266,6 @@ public final class Globals {
public static final boolean IS_SECURITY_ENABLED =
(System.getSecurityManager() != null);
-/**
- *
- */
-public static final String ASYNC_SUPPORTED_ATTR =
-org.apache.catalina.ASYNC_SUPPORTED;
-
/**
* Default domain for MBeans if none can be determined
-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
svn commit: r1200056 - /tomcat/trunk/java/org/apache/catalina/connector/Request.java
Author: kkolinko
Date: Thu Nov 10 00:10:04 2011
New Revision: 1200056
URL: http://svn.apache.org/viewvc?rev=1200056view=rev
Log:
Change implementation of PARAMETER_PARSE_FAILED_ATTR attribute,
to align with other special attributes. It is now implemented in
Request.getAttribute().
Modified:
tomcat/trunk/java/org/apache/catalina/connector/Request.java
Modified: tomcat/trunk/java/org/apache/catalina/connector/Request.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/connector/Request.java?rev=1200056r1=1200055r2=1200056view=diff
==
--- tomcat/trunk/java/org/apache/catalina/connector/Request.java (original)
+++ tomcat/trunk/java/org/apache/catalina/connector/Request.java Thu Nov 10
00:10:04 2011
@@ -884,6 +884,13 @@ public class Request
return null;
}
+if (name.equals(Globals.PARAMETER_PARSE_FAILED_ATTR)) {
+if (coyoteRequest.getParameters().isParseFailed()) {
+return Boolean.TRUE;
+}
+return null;
+}
+
Object attr=attributes.get(name);
if(attr!=null) {
@@ -951,6 +958,7 @@ public class Request
* li{@link Globals#KEY_SIZE_ATTR} (SSL connections only)/li
* li{@link Globals#SSL_SESSION_ID_ATTR} (SSL connections only)/li
* li{@link Globals#SSL_SESSION_MGR_ATTR} (SSL connections only)/li
+ * li{@link Globals#PARAMETER_PARSE_FAILED_ATTR}/li
* /ul
* The underlying connector may also expose request attributes. These all
* have names starting with org.apache.tomcat and include:
@@ -2383,12 +2391,6 @@ public class Request
}
}
-private void checkParameterParseFailed() {
-if (getCoyoteRequest().getParameters().isParseFailed()) {
-setAttribute(Globals.PARAMETER_PARSE_FAILED_ATTR, Boolean.TRUE);
-}
-}
-
public void cometClose() {
coyoteRequest.action(ActionCode.COMET_CLOSE,getEvent());
setComet(false);
@@ -2602,7 +2604,6 @@ public class Request
if (partsParseException != null || !success) {
parameters.setParseFailed(true);
}
-checkParameterParseFailed();
}
}
@@ -2902,7 +2903,6 @@ public class Request
if (!success) {
parameters.setParseFailed(true);
}
-checkParameterParseFailed();
}
}
-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
Re: svn commit: r1199980 - in /tomcat/trunk/java/org/apache: catalina/core/AprLifecycleListener.java catalina/core/LocalStrings.properties tomcat/jni/SSL.java
Mark, On 11/9/11 2:12 PM, Mark Thomas wrote: What happens if I try this with 1.1.22? Here is the behavior under various circumstances: 1.1.23, openssl-fips, FIPSMode!=on : regular startup 1.1.23, openssl-fips, FIPSMode=on : enter FIPS mode 1.1.23, openssl, FIPSMode!=on : regular startup 1.1.23, openssl, FIPSMode=on, error: java.lang.Exception: FIPS was not available to tcnative at build time. You will need to re-build tcnative against an OpenSSL with FIPS. 1.1.22, any combination: UnsatisfiedLinkError followed by SSL connector configuration NOT in FIPS mode :( Honestly, I am surprised that the Connector comes up when AprLifecycleListener fails to set sslAvailable = true. I think I might need to shut-down the SSL engine if there are any errors coming back from setFIPSMode. I think I might also want to set sslInitialized = true *after* all of the initialization has actually occurred: AprLifecycleListener is/was setting sslInitialized=true *before* any initialization actually occurs. I see several ways to move forward, here, not necessarily mutually exclusive: 1. terminate SSL on FIPS error 2. set sslInitialized after initialization is complete (including FIPS), not before 3. set error state in SSL class to prevent connectors from using an improperly-initialized SSL environment Comments? -chris signature.asc Description: OpenPGP digital signature
Re: svn commit: r1199980 - in /tomcat/trunk/java/org/apache: catalina/core/AprLifecycleListener.java catalina/core/LocalStrings.properties tomcat/jni/SSL.java
All, On 11/9/11 4:32 PM, Christopher Schultz wrote: I see several ways to move forward, here, not necessarily mutually exclusive: 1. terminate SSL on FIPS error 2. set sslInitialized after initialization is complete (including FIPS), not before 3. set error state in SSL class to prevent connectors from using an improperly-initialized SSL environment I forgot one: 4. Have an explicit check in lifecycleEvent() that throws an error instead of merely logging the error. -chris signature.asc Description: OpenPGP digital signature
DO NOT REPLY [Bug 52165] New: javax.naming.NameNotFoundException: Name name is not bound in this Context
https://issues.apache.org/bugzilla/show_bug.cgi?id=52165 Bug #: 52165 Summary: javax.naming.NameNotFoundException: Name name is not bound in this Context Product: Tomcat 6 Version: 6.0.33 Platform: PC OS/Version: Linux Status: NEW Severity: normal Priority: P2 Component: Catalina AssignedTo: dev@tomcat.apache.org ReportedBy: maksim.likha...@thomson.com Classification: Unclassified note: names are obfuscated Context path=/my-web reloadable=true useNaming=true ResourceLink global=jdbc/ttt name=jdbc/ttt type=javax.sql.DataSource / conf/server.xml Resource name=jdbc/ttt type=javax.sql.DataSource name lookup: Caused by: javax.naming.NameNotFoundException: Name ttt is not bound in this Context at org.apache.naming.NamingContext.lookup(NamingContext.java:770) at org.apache.naming.NamingContext.lookup(NamingContext.java:140) at org.apache.naming.NamingContext.lookup(NamingContext.java:781) at org.apache.naming.NamingContext.lookup(NamingContext.java:140) at org.apache.naming.NamingContext.lookup(NamingContext.java:781) at org.apache.naming.NamingContext.lookup(NamingContext.java:140) at org.apache.naming.NamingContext.lookup(NamingContext.java:781) at org.apache.naming.NamingContext.lookup(NamingContext.java:153) at org.apache.naming.SelectorContext.lookup(SelectorContext.java:152) works on tomcat 6.0.32 and all versions bellow this is NOT something that you expect upgrading to new minor release. -- 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: r1199980 - in /tomcat/trunk/java/org/apache: catalina/core/AprLifecycleListener.java catalina/core/LocalStrings.properties tomcat/jni/SSL.java
Konstantin,
On 11/9/11 3:39 PM, Konstantin Kolinko wrote:
2011/11/10 Christopher Schultz ch...@christopherschultz.net:
There is java.lang.UnsatisfiedLinkError (and not the
IllegalStateException that the code throws).
Despite this error, Tomcat startup sequence continues.
I guess that from FIPS PoV the failure to initialize FIPS mode should
be more fatal, regardless of its cause.
Be it because of native lib returning error code or this tc-native
version mismatch.
Maybe even throw an error if SSLEngine was not on. Now it just
causes the FIPS mode to be ignored.
I do not know why UnsatisfiedLinkError error was not enough to break it.
Because the AprLifecycleListener's code looks like this:
if (Lifecycle.BEFORE_INIT_EVENT.equals(event.getType())) {
synchronized (lock) {
init();
if (aprAvailable) {
try {
initializeSSL();
} catch (Throwable t) {
ExceptionUtils.handleThrowable(t);
log.error(sm.getString(aprListener.sslInit), t);
}
}
}
The error is caught, logged, and execution continues.
I did not feel that this was an appropriate patch to include changes to
exception handling within the AprLivecycleListener.
Maybe add explicit FIPS mode status check below the above error
handling? Something like:
if (on.equalsIgnoreCase(FIPSMode) !fipsModeActive) {
fail fatally;
}
I could certainly do that, but I figured that the listener was written
such that it would not fail. I didn't want to alter that behavior just
to add FIPS support.
-chris
signature.asc
Description: OpenPGP digital signature
DO NOT REPLY [Bug 52165] javax.naming.NameNotFoundException: Name name is not bound in this Context
https://issues.apache.org/bugzilla/show_bug.cgi?id=52165 --- Comment #1 from Konstantin Kolinko knst.koli...@gmail.com 2011-11-10 01:20:06 UTC --- If you are able to reproduce this with a simple example on a clean Tomcat installation, then attach configuration file + code + source code here. ResourceLink is used a lot. The only unusual thing in your report is that you define Context element inside server.xml, instead of using a separate XML file like most people do. -- 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: r1200089 - /tomcat/trunk/java/org/apache/catalina/connector/Request.java
Author: kkolinko
Date: Thu Nov 10 01:50:53 2011
New Revision: 1200089
URL: http://svn.apache.org/viewvc?rev=1200089view=rev
Log:
Refactor special attribute names handling,
to use hash table lookup + adapter class, instead of series of name.equals()
tests.
Extracted add/change/remove notification delivery into separate methods.
Modified:
tomcat/trunk/java/org/apache/catalina/connector/Request.java
Modified: tomcat/trunk/java/org/apache/catalina/connector/Request.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/connector/Request.java?rev=1200089r1=1200088r2=1200089view=diff
==
--- tomcat/trunk/java/org/apache/catalina/connector/Request.java (original)
+++ tomcat/trunk/java/org/apache/catalina/connector/Request.java Thu Nov 10
01:50:53 2011
@@ -863,32 +863,10 @@ public class Request
@Override
public Object getAttribute(String name) {
-if (name.equals(Globals.DISPATCHER_TYPE_ATTR)) {
-return (internalDispatcherType == null)
-? DispatcherType.REQUEST
-: internalDispatcherType;
-} else if (name.equals(Globals.DISPATCHER_REQUEST_PATH_ATTR)) {
-return (requestDispatcherPath == null)
-? getRequestPathMB().toString()
-: requestDispatcherPath.toString();
-}
-
-if (name.equals(Globals.ASYNC_SUPPORTED_ATTR)) {
-return asyncSupported;
-}
-
-if (name.equals(Globals.GSS_CREDENTIAL_ATTR)) {
-if (userPrincipal instanceof GenericPrincipal) {
-return ((GenericPrincipal) userPrincipal).getGssCredential();
-}
-return null;
-}
-
-if (name.equals(Globals.PARAMETER_PARSE_FAILED_ATTR)) {
-if (coyoteRequest.getParameters().isParseFailed()) {
-return Boolean.TRUE;
-}
-return null;
+// Special attributes
+SpecialAttributeAdapter adapter = specialAttributes.get(name);
+if (adapter != null) {
+return adapter.get(this, name);
}
Object attr=attributes.get(name);
@@ -1408,9 +1386,6 @@ public class Request
*/
@Override
public void removeAttribute(String name) {
-Object value = null;
-boolean found = false;
-
// Remove the specified attribute
// Check for read only attribute
// requests are per thread so synchronization unnecessary
@@ -1423,37 +1398,16 @@ public class Request
coyoteRequest.getAttributes().remove(name);
}
-found = attributes.containsKey(name);
+boolean found = attributes.containsKey(name);
if (found) {
-value = attributes.get(name);
+Object value = attributes.get(name);
attributes.remove(name);
-} else {
-return;
-}
-// Notify interested application event listeners
-Object listeners[] = context.getApplicationEventListeners();
-if ((listeners == null) || (listeners.length == 0)) {
+// Notify interested application event listeners
+notifyAttributeRemoved(name, value);
+} else {
return;
}
-ServletRequestAttributeEvent event =
- new ServletRequestAttributeEvent(context.getServletContext(),
- getRequest(), name, value);
-for (int i = 0; i listeners.length; i++) {
-if (!(listeners[i] instanceof ServletRequestAttributeListener)) {
-continue;
-}
-ServletRequestAttributeListener listener =
-(ServletRequestAttributeListener) listeners[i];
-try {
-listener.attributeRemoved(event);
-} catch (Throwable t) {
-ExceptionUtils.handleThrowable(t);
-
context.getLogger().error(sm.getString(coyoteRequest.attributeEvent), t);
-// Error valve will pick this exception up and display it to
user
-attributes.put(RequestDispatcher.ERROR_EXCEPTION, t);
-}
-}
}
@@ -1478,21 +1432,13 @@ public class Request
return;
}
-if (name.equals(Globals.DISPATCHER_TYPE_ATTR)) {
-internalDispatcherType = (DispatcherType)value;
-return;
-} else if (name.equals(Globals.DISPATCHER_REQUEST_PATH_ATTR)) {
-requestDispatcherPath = value;
+// Special attributes
+SpecialAttributeAdapter adapter = specialAttributes.get(name);
+if (adapter != null) {
+adapter.set(this, name, value);
return;
}
-if (name.equals(Globals.ASYNC_SUPPORTED_ATTR)) {
-this.asyncSupported = (Boolean)value;
-}
-
-Object oldValue = null;
-boolean replaced = false;
-
//
svn commit: r1200106 - /tomcat/trunk/webapps/docs/config/filter.xml
Author: kkolinko Date: Thu Nov 10 02:57:07 2011 New Revision: 1200106 URL: http://svn.apache.org/viewvc?rev=1200106view=rev Log: Reformat and rearrange code samples to reduce the width of the document, for better readability. Modified: tomcat/trunk/webapps/docs/config/filter.xml Modified: tomcat/trunk/webapps/docs/config/filter.xml URL: http://svn.apache.org/viewvc/tomcat/trunk/webapps/docs/config/filter.xml?rev=1200106r1=1200105r2=1200106view=diff == --- tomcat/trunk/webapps/docs/config/filter.xml (original) +++ tomcat/trunk/webapps/docs/config/filter.xml Thu Nov 10 02:57:07 2011 @@ -380,16 +380,7 @@ The expiry time can be fine-tuned by add codeCache-Control:max-age=/code headers can be unnecessarily tricky to understand. /p - p - iSample : exclude response status codes 302, 500 and 503/i - /p - - source -lt;init-paramgt; - lt;param-namegt;ExpiresExcludedResponseStatusCodeslt;/param-namegt; - lt;param-valuegt;302, 500, 503lt;/param-valuegt; -lt;/init-paramgt; - /source + piSee sample below the table/i/p /attribute attribute name=ExpiresByType lt;content-typegt; required=false @@ -429,22 +420,7 @@ The expiry time can be fine-tuned by add configuration of an expiration with a charset must strongnot/strong include such a space character. /p - p - iSample:/i - /p - - source -lt;init-paramgt; - lt;param-namegt;ExpiresByType text/htmllt;/param-namegt; - lt;param-valuegt;access plus 1 month 15 days 2 hourslt;/param-valuegt; -lt;/init-paramgt; - -lt;init-paramgt; - lt;!-- 2592000 seconds = 30 days --gt; - lt;param-namegt;ExpiresByType image/giflt;/param-namegt; - lt;param-valuegt;A2592000lt;/param-valuegt; -lt;/init-paramgt; - /source + piSee sample below the table/i/p p It overrides, for the specified MIME type ionly/i, any expiration date set by the codeExpiresDefault/code directive. @@ -467,6 +443,30 @@ The expiry time can be fine-tuned by add /attribute /attributes +piSample : exclude response status codes 302, 500 and 503/i/p + +source +lt;init-paramgt; + lt;param-namegt;ExpiresExcludedResponseStatusCodeslt;/param-namegt; + lt;param-valuegt;302, 500, 503lt;/param-valuegt; +lt;/init-paramgt; +/source + +piSample for ExpiresByType initialization parameter/i/p + + source +lt;init-paramgt; + lt;param-namegt;ExpiresByType text/htmllt;/param-namegt; + lt;param-valuegt;access plus 1 month 15 days 2 hourslt;/param-valuegt; +lt;/init-paramgt; + +lt;init-paramgt; + lt;!-- 2592000 seconds = 30 days --gt; + lt;param-namegt;ExpiresByType image/giflt;/param-namegt; + lt;param-valuegt;A2592000lt;/param-valuegt; +lt;/init-paramgt; + /source + /subsection subsection name=Troubleshooting @@ -497,12 +497,14 @@ FINE: Filter initialized with configurat /source p Sample of per-request log message where codeExpiresFilter/code adds an -expiration date: +expiration date is below. The message is on one line and is wrapped here +for better readability. /p source Mar 26, 2010 2:09:47 PM org.apache.catalina.filters.ExpiresFilter onBeforeWriteResponseBody -FINE: Request /tomcat.gif with response status 200 content-type image/gif, set expiration date 3/26/10 2:19 PM +FINE: Request /tomcat.gif with response status 200 + content-type image/gif, set expiration date 3/26/10 2:19 PM /source p Sample of per-request log message where codeExpiresFilter/code does not add @@ -511,7 +513,8 @@ FINE: Request /tomcat.gif with respons source Mar 26, 2010 2:10:27 PM org.apache.catalina.filters.ExpiresFilter onBeforeWriteResponseBody -FINE: Request /docs/config/manager.html with response status 200 content-type text/html, no expiration configured +FINE: Request /docs/config/manager.html with response status 200 + content-type text/html, no expiration configured /source /subsection @@ -580,7 +583,7 @@ FINE: Request /docs/config/manager.html subsection name=Example pTo allow access only for the clients connecting from localhost:/p -pre +source lt;filter lt;filter-nameRemote Address Filterlt;/filter-name lt;filter-classorg.apache.catalina.filters.RemoteAddrFilterlt;/filter-class @@ -593,7 +596,7 @@ FINE: Request /docs/config/manager.html lt;filter-nameRemote Address Filterlt;/filter-name lt;url-pattern/*lt;/url-pattern lt;/filter-mapping -/pre +/source /subsection /section @@ -1122,7 +1125,8 @@ FINE: Request /docs/config/manager.html 1request-dumper.org.apache.juli.FileHandler.prefix = request-dumper. 1request-dumper.org.apache.juli.FileHandler.formatter = org.apache.juli.VerbatimFormatter org.apache.catalina.filters.RequestDumperFilter.level = INFO
svn commit: r1200107 - in /tomcat/trunk: conf/web.xml webapps/docs/config/filter.xml
Author: kkolinko Date: Thu Nov 10 03:00:29 2011 New Revision: 1200107 URL: http://svn.apache.org/viewvc?rev=1200107view=rev Log: Document FailedRequestFilter and add sample configuration to conf/web.xml. Modified: tomcat/trunk/conf/web.xml tomcat/trunk/webapps/docs/config/filter.xml Modified: tomcat/trunk/conf/web.xml URL: http://svn.apache.org/viewvc/tomcat/trunk/conf/web.xml?rev=1200107r1=1200106r2=1200107view=diff == --- tomcat/trunk/conf/web.xml (original) +++ tomcat/trunk/conf/web.xml Thu Nov 10 03:00:29 2011 @@ -388,6 +388,20 @@ !-- == Built In Filter Definitions = -- + !-- A filter that triggers request parameters parsing and rejects the-- + !-- request if some parameters were skipped because of parsing errors or -- + !-- request size limitations.-- +!-- +filter +filter-namefailedRequestFilter/filter-name +filter-class + org.apache.catalina.filters.FailedRequestFilter +/filter-class +async-supportedtrue/async-supported +/filter +-- + + !-- NOTE: An SSI Servlet is also available as an alternative SSI -- !-- implementation. Use either the Servlet or the Filter but NOT both. -- !-- -- @@ -448,6 +462,14 @@ !-- Built In Filter Mappings == -- + !-- The mapping for the Failed Request Filter -- +!-- +filter-mapping +filter-namefailedRequestFilter/filter-name +url-pattern/*/url-pattern +/filter-mapping +-- + !-- The mapping for the SSI Filter -- !-- filter-mapping Modified: tomcat/trunk/webapps/docs/config/filter.xml URL: http://svn.apache.org/viewvc/tomcat/trunk/webapps/docs/config/filter.xml?rev=1200107r1=1200106r2=1200107view=diff == --- tomcat/trunk/webapps/docs/config/filter.xml (original) +++ tomcat/trunk/webapps/docs/config/filter.xml Thu Nov 10 03:00:29 2011 @@ -1207,6 +1207,44 @@ org.apache.catalina.filters.RequestDumpe /section +section name=Failed Request Filter + + subsection name=Introduction + +pThis filter triggers parameters parsing in a request and rejects the +request if some parameters were skipped during parameter parsing because +of parsing errors or request size limitations (such as +codemaxParameterCount/code attribute in a +a href=http.htmlConnector/a). +This filter can be used to ensure that none parameter values submitted by +client are lost./p + +pNote that parameter parsing may consume the body of an HTTP request, so +caution is needed if the servlet protected by this filter uses +coderequest.getInputStream()/code or coderequest.getReader()/code +calls. In general the risk of breaking a web application by adding this +filter is not so high, because parameter parsing does check content type +of the request before consuming the request body./p + + /subsection + + subsection name=Filter Class Name + +pThe filter class name for the Failed Request Filter is +strongcodeorg.apache.catalina.filters.FailedRequestFilter/code +/strong./p + + /subsection + + subsection name=Initialisation parameters + +pThe Failed Request Filter does not support any initialization parameters./p + + /subsection + +/section + + /body - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
svn commit: r1200115 - in /tomcat/tc7.0.x/trunk/webapps/ROOT: WEB-INF/web.xml index.jsp tomcat.css tomcat.svg
Author: kkolinko
Date: Thu Nov 10 03:54:53 2011
New Revision: 1200115
URL: http://svn.apache.org/viewvc?rev=1200115view=rev
Log:
Merging r1187809 - Trailing whitespace removal from /webapps
Part 1 of n. - /webapps/ROOT
Modified:
tomcat/tc7.0.x/trunk/webapps/ROOT/WEB-INF/web.xml
tomcat/tc7.0.x/trunk/webapps/ROOT/index.jsp
tomcat/tc7.0.x/trunk/webapps/ROOT/tomcat.css
tomcat/tc7.0.x/trunk/webapps/ROOT/tomcat.svg
Modified: tomcat/tc7.0.x/trunk/webapps/ROOT/WEB-INF/web.xml
URL:
http://svn.apache.org/viewvc/tomcat/tc7.0.x/trunk/webapps/ROOT/WEB-INF/web.xml?rev=1200115r1=1200114r2=1200115view=diff
==
--- tomcat/tc7.0.x/trunk/webapps/ROOT/WEB-INF/web.xml (original)
+++ tomcat/tc7.0.x/trunk/webapps/ROOT/WEB-INF/web.xml Thu Nov 10 03:54:53 2011
@@ -21,7 +21,7 @@
xsi:schemaLocation=http://java.sun.com/xml/ns/javaee
http://java.sun.com/xml/ns/javaee/web-app_3_0.xsd;
version=3.0
- metadata-complete=true
+ metadata-complete=true
display-nameWelcome to Tomcat/display-name
description
Modified: tomcat/tc7.0.x/trunk/webapps/ROOT/index.jsp
URL:
http://svn.apache.org/viewvc/tomcat/tc7.0.x/trunk/webapps/ROOT/index.jsp?rev=1200115r1=1200114r2=1200115view=diff
==
--- tomcat/tc7.0.x/trunk/webapps/ROOT/index.jsp (original)
+++ tomcat/tc7.0.x/trunk/webapps/ROOT/index.jsp Thu Nov 10 03:54:53 2011
@@ -110,7 +110,7 @@ request.setAttribute(tomcat7ExamplesUrl
pFor security, access to the a
href=/manager/htmlmanager webapp/a is restricted.
Users are defined in:/p
pre$CATALINA_HOME/conf/tomcat-users.xml/pre
-pIn Tomcat 7.0 access to the manager application is
split between
+pIn Tomcat 7.0 access to the manager application is
split between
different users. nbsp; a
href=${tomcat7DocUrl}manager-howto.htmlRead more.../a/p
br /
h4a
href=${tomcat7DocUrl}RELEASE-NOTES.txtRelease Notes/a/h4
Modified: tomcat/tc7.0.x/trunk/webapps/ROOT/tomcat.css
URL:
http://svn.apache.org/viewvc/tomcat/tc7.0.x/trunk/webapps/ROOT/tomcat.css?rev=1200115r1=1200114r2=1200115view=diff
==
--- tomcat/tc7.0.x/trunk/webapps/ROOT/tomcat.css (original)
+++ tomcat/tc7.0.x/trunk/webapps/ROOT/tomcat.css Thu Nov 10 03:54:53 2011
@@ -98,7 +98,7 @@ a img {
border-radius: 10px;
-moz-border-radius: 10px;
-webkit-border-radius: 10px;
--khtml-border-radius: 10px;
+-khtml-border-radius: 10px;
}
#navigation {
Modified: tomcat/tc7.0.x/trunk/webapps/ROOT/tomcat.svg
URL:
http://svn.apache.org/viewvc/tomcat/tc7.0.x/trunk/webapps/ROOT/tomcat.svg?rev=1200115r1=1200114r2=1200115view=diff
==
--- tomcat/tc7.0.x/trunk/webapps/ROOT/tomcat.svg (original)
+++ tomcat/tc7.0.x/trunk/webapps/ROOT/tomcat.svg Thu Nov 10 03:54:53 2011
@@ -29,7 +29,7 @@
!ENTITY ns_svg http://www.w3.org/2000/svg;
!ENTITY ns_xlink http://www.w3.org/1999/xlink;
]
-svg
+svg
xmlns:x=ns_extend; xmlns:i=ns_ai; xmlns:graph=ns_graphs;
i:viewOrigin=176.7139 486.707 i:rulerOrigin=-156 -296 i:pageBounds=156 496
456 296
xmlns=ns_svg; xmlns:xlink=ns_xlink;
xmlns:a=http://ns.adobe.com/AdobeSVGViewerExtensions/3.0/;
width=260.162 height=184.413 viewBox=0 0 260.162 184.413
overflow=visible enable-background=new 0 0 260.162 184.413
@@ -112,10 +112,10 @@
c-48.118-23.977-57.183-84.71-48.977-117.289c2.283,12.454,6.424,20.266,15.394,24.098c19.533-5.591,46.423-6.033,66.231-0.57
c8.255-6.001,11.456-15.169,13.204-23.18C236.029,15.921,235.777,36.055,235.784,36.059z/
g
-rect x=133.209 y=90.51 i:knockout=Off
width=26.245 height=3.239/
-rect x=133.209 y=82.732 i:knockout=Off
width=26.245 height=3.24/
-rect x=213.35 y=90.51 i:knockout=Off
width=26.244 height=3.239/
-rect x=213.35 y=82.732 i:knockout=Off
width=26.244 height=3.24/
+rect x=133.209 y=90.51 i:knockout=Off
width=26.245 height=3.239/
+rect x=133.209 y=82.732 i:knockout=Off
width=26.245 height=3.24/
+rect x=213.35 y=90.51 i:knockout=Off
width=26.244 height=3.239/
+rect x=213.35 y=82.732 i:knockout=Off
width=26.244 height=3.24/
g
path i:knockout=Off
d=M204.1,63.524h-27.188h-3.021h-12.561v-2.917h13.31c1.639-7.018,1.963-13.725-0.014-17.125
svn commit: r1200116 - in /tomcat/tc7.0.x/trunk/webapps/manager/WEB-INF: jsp/403.jsp jsp/sessionDetail.jsp jsp/sessionsList.jsp web.xml
Author: kkolinko Date: Thu Nov 10 03:55:47 2011 New Revision: 1200116 URL: http://svn.apache.org/viewvc?rev=1200116view=rev Log: Merging r1187809 - Trailing whitespace removal from /webapps Part 2. - /webapps/manager Modified: tomcat/tc7.0.x/trunk/webapps/manager/WEB-INF/jsp/403.jsp tomcat/tc7.0.x/trunk/webapps/manager/WEB-INF/jsp/sessionDetail.jsp tomcat/tc7.0.x/trunk/webapps/manager/WEB-INF/jsp/sessionsList.jsp tomcat/tc7.0.x/trunk/webapps/manager/WEB-INF/web.xml Modified: tomcat/tc7.0.x/trunk/webapps/manager/WEB-INF/jsp/403.jsp URL: http://svn.apache.org/viewvc/tomcat/tc7.0.x/trunk/webapps/manager/WEB-INF/jsp/403.jsp?rev=1200116r1=1200115r2=1200116view=diff == --- tomcat/tc7.0.x/trunk/webapps/manager/WEB-INF/jsp/403.jsp (original) +++ tomcat/tc7.0.x/trunk/webapps/manager/WEB-INF/jsp/403.jsp Thu Nov 10 03:55:47 2011 @@ -37,7 +37,7 @@ you have used your browsers back button, used a saved book-mark or similar then you may have triggered the cross-site request forgery (CSRF) protection that has been enabled for the HTML interface of the Manager application. You -will need to reset this protection by returning to the +will need to reset this protection by returning to the a href=%=request.getContextPath()%/htmlmain Manager page/a. Once you return to this page, you will be able to continue using the Manager appliction's HTML interface normally. If you continue to see this access Modified: tomcat/tc7.0.x/trunk/webapps/manager/WEB-INF/jsp/sessionDetail.jsp URL: http://svn.apache.org/viewvc/tomcat/tc7.0.x/trunk/webapps/manager/WEB-INF/jsp/sessionDetail.jsp?rev=1200116r1=1200115r2=1200116view=diff == --- tomcat/tc7.0.x/trunk/webapps/manager/WEB-INF/jsp/sessionDetail.jsp (original) +++ tomcat/tc7.0.x/trunk/webapps/manager/WEB-INF/jsp/sessionDetail.jsp Thu Nov 10 03:55:47 2011 @@ -21,7 +21,7 @@ %@page import=org.apache.catalina.Session % %@page import=org.apache.catalina.manager.JspHelper % %@page import=org.apache.catalina.util.ContextName % -!DOCTYPE html +!DOCTYPE html PUBLIC -//W3C//DTD XHTML 1.0 Strict//EN http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd; %--!DOCTYPE html PUBLIC -//W3C//DTD XHTML 1.1//EN @@ -99,7 +99,7 @@ td%= JspHelper.getDisplayTTLForSession(currentSession) %/td /tr /table - + form method=post action=%= submitUrl % div input type=hidden name=sessionId value=%= currentSessionId % / @@ -113,10 +113,10 @@ %input type=submit value=Refresh / /div /form - + div class=error%= JspHelper.escapeXml(request.getAttribute(error)) %/div div class=message%= JspHelper.escapeXml(request.getAttribute(message)) %/div - + table style=text-align: left; border=1 cellpadding=2 cellspacing=2 % int nAttributes = 0; Enumeration attributeNamesEnumeration = currentHttpSession.getAttributeNames(); Modified: tomcat/tc7.0.x/trunk/webapps/manager/WEB-INF/jsp/sessionsList.jsp URL: http://svn.apache.org/viewvc/tomcat/tc7.0.x/trunk/webapps/manager/WEB-INF/jsp/sessionsList.jsp?rev=1200116r1=1200115r2=1200116view=diff == --- tomcat/tc7.0.x/trunk/webapps/manager/WEB-INF/jsp/sessionsList.jsp (original) +++ tomcat/tc7.0.x/trunk/webapps/manager/WEB-INF/jsp/sessionsList.jsp Thu Nov 10 03:55:47 2011 @@ -22,7 +22,7 @@ %@page import=org.apache.catalina.Session % %@page import=org.apache.catalina.ha.session.DeltaSession % %@page import=org.apache.catalina.util.ContextName % -!DOCTYPE html +!DOCTYPE html PUBLIC -//W3C//DTD XHTML 1.0 Transitional//EN http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd; Modified: tomcat/tc7.0.x/trunk/webapps/manager/WEB-INF/web.xml URL: http://svn.apache.org/viewvc/tomcat/tc7.0.x/trunk/webapps/manager/WEB-INF/web.xml?rev=1200116r1=1200115r2=1200116view=diff == --- tomcat/tc7.0.x/trunk/webapps/manager/WEB-INF/web.xml (original) +++ tomcat/tc7.0.x/trunk/webapps/manager/WEB-INF/web.xml Thu Nov 10 03:55:47 2011 @@ -21,7 +21,7 @@ xsi:schemaLocation=http://java.sun.com/xml/ns/javaee http://java.sun.com/xml/ns/javaee/web-app_3_0.xsd; version=3.0 - metadata-complete=true + metadata-complete=true display-nameTomcat Manager Application/display-name description @@ -103,7 +103,7 @@ filter-nameSetCharacterEncoding/filter-name url-pattern/*/url-pattern /filter-mapping - + filter filter-nameCSRF/filter-name filter-classorg.apache.catalina.filters.CsrfPreventionFilter/filter-class @@ -112,13 +112,13 @@ param-value/html,/html/,/html/list,/index.jsp/param-value /init-param /filter - + filter-mapping filter-nameCSRF/filter-name
svn commit: r1200117 - in /tomcat/tc7.0.x/trunk/webapps/host-manager/WEB-INF: jsp/403.jsp web.xml
Author: kkolinko Date: Thu Nov 10 03:56:23 2011 New Revision: 1200117 URL: http://svn.apache.org/viewvc?rev=1200117view=rev Log: Merging r1187809 - Trailing whitespace removal from /webapps /webapps/host-manager Modified: tomcat/tc7.0.x/trunk/webapps/host-manager/WEB-INF/jsp/403.jsp tomcat/tc7.0.x/trunk/webapps/host-manager/WEB-INF/web.xml Modified: tomcat/tc7.0.x/trunk/webapps/host-manager/WEB-INF/jsp/403.jsp URL: http://svn.apache.org/viewvc/tomcat/tc7.0.x/trunk/webapps/host-manager/WEB-INF/jsp/403.jsp?rev=1200117r1=1200116r2=1200117view=diff == --- tomcat/tc7.0.x/trunk/webapps/host-manager/WEB-INF/jsp/403.jsp (original) +++ tomcat/tc7.0.x/trunk/webapps/host-manager/WEB-INF/jsp/403.jsp Thu Nov 10 03:56:23 2011 @@ -37,7 +37,7 @@ and you have used your browsers back button, used a saved book-mark or similar then you may have triggered the cross-site request forgery (CSRF) protection that has been enabled for the HTML interface of the Host Manager -application. You will need to reset this protection by returning to the +application. You will need to reset this protection by returning to the a href=%=request.getContextPath()%/htmlmain Host Manager page/a. Once you return to this page, you will be able to continue using the Host Manager appliction's HTML interface normally. If you continue to see this Modified: tomcat/tc7.0.x/trunk/webapps/host-manager/WEB-INF/web.xml URL: http://svn.apache.org/viewvc/tomcat/tc7.0.x/trunk/webapps/host-manager/WEB-INF/web.xml?rev=1200117r1=1200116r2=1200117view=diff == --- tomcat/tc7.0.x/trunk/webapps/host-manager/WEB-INF/web.xml (original) +++ tomcat/tc7.0.x/trunk/webapps/host-manager/WEB-INF/web.xml Thu Nov 10 03:56:23 2011 @@ -21,7 +21,7 @@ xsi:schemaLocation=http://java.sun.com/xml/ns/javaee http://java.sun.com/xml/ns/javaee/web-app_3_0.xsd; version=3.0 - metadata-complete=true + metadata-complete=true display-nameTomcat Host Manager Application/display-name description @@ -68,12 +68,12 @@ param-value/html,/html/,/html/list,/index.jsp/param-value /init-param /filter - + filter-mapping filter-nameCSRF/filter-name servlet-nameHTMLHostManager/servlet-name /filter-mapping - + !-- Define the Manager Servlet Mapping -- servlet-mapping servlet-nameHostManager/servlet-name @@ -140,5 +140,5 @@ error-code404/error-code location/WEB-INF/jsp/404.jsp/location /error-page - + /web-app - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
svn commit: r1200118 - in /tomcat/tc7.0.x/trunk/webapps/examples/jsp: ./ async/ cal/ checkbox/ colors/ error/ forward/ include/
Author: kkolinko Date: Thu Nov 10 03:57:58 2011 New Revision: 1200118 URL: http://svn.apache.org/viewvc?rev=1200118view=rev Log: Merging r1187809 - Trailing whitespace removal from /webapps /webapps/examples, 1 of n Modified: tomcat/tc7.0.x/trunk/webapps/examples/jsp/async/index.jsp tomcat/tc7.0.x/trunk/webapps/examples/jsp/cal/cal1.jsp tomcat/tc7.0.x/trunk/webapps/examples/jsp/cal/cal2.jsp tomcat/tc7.0.x/trunk/webapps/examples/jsp/cal/login.html tomcat/tc7.0.x/trunk/webapps/examples/jsp/checkbox/checkresult.jsp tomcat/tc7.0.x/trunk/webapps/examples/jsp/colors/colors.html tomcat/tc7.0.x/trunk/webapps/examples/jsp/colors/colrs.jsp tomcat/tc7.0.x/trunk/webapps/examples/jsp/error/err.jsp tomcat/tc7.0.x/trunk/webapps/examples/jsp/error/errorpge.jsp tomcat/tc7.0.x/trunk/webapps/examples/jsp/forward/forward.jsp tomcat/tc7.0.x/trunk/webapps/examples/jsp/include/include.jsp tomcat/tc7.0.x/trunk/webapps/examples/jsp/index.html Modified: tomcat/tc7.0.x/trunk/webapps/examples/jsp/async/index.jsp URL: http://svn.apache.org/viewvc/tomcat/tc7.0.x/trunk/webapps/examples/jsp/async/index.jsp?rev=1200118r1=1200117r2=1200118view=diff == --- tomcat/tc7.0.x/trunk/webapps/examples/jsp/async/index.jsp (original) +++ tomcat/tc7.0.x/trunk/webapps/examples/jsp/async/index.jsp Thu Nov 10 03:57:58 2011 @@ -19,16 +19,16 @@ pre Use cases: -1. Simple dispatch +1. Simple dispatch - servlet does startAsync() - - background thread calls ctx.dispatch() + - background thread calls ctx.dispatch() a href=%=response.encodeURL(/examples/async/async0)% Async 0 /a - + 2. Simple dispatch - servlet does startAsync() - background thread calls dispatch(/path/to/jsp) a href=%=response.encodeURL(/examples/async/async1)% Async 1 /a - + 3. Simple dispatch - servlet does startAsync() - background thread calls writes and calls complete() @@ -43,27 +43,27 @@ Use cases: 3. Timeout s1 - servlet does a startAsync() - servlet does a setAsyncTimeout - - returns - waits for timeout to happen should return error page - + - returns - waits for timeout to happen should return error page + 4. Timeout s2 - servlet does a startAsync() - servlet does a setAsyncTimeout - servlet does a addAsyncListener - - returns - waits for timeout to happen and listener invoked - + - returns - waits for timeout to happen and listener invoked + 5. Dispatch to asyncSupported=false servlet - servlet1 does a startAsync() - servlet1 dispatches to dispatch(/servlet2) - the container calls complete() after servlet2 is complete - TODO - + 6. Chained dispatch - servlet1 does a startAsync - servlet1 does a dispatch to servlet2 (asyncsupported=true) - servlet2 does a dispatch to servlet3 (asyncsupported=true) - - servlet3 does a dispatch to servlet4 (asyncsupported=false) - - + - servlet3 does a dispatch to servlet4 (asyncsupported=false) + + 7. Stock ticker a href=%=response.encodeURL(/examples/async/stockticker)% StockTicker /a /pre \ No newline at end of file Modified: tomcat/tc7.0.x/trunk/webapps/examples/jsp/cal/cal1.jsp URL: http://svn.apache.org/viewvc/tomcat/tc7.0.x/trunk/webapps/examples/jsp/cal/cal1.jsp?rev=1200118r1=1200117r2=1200118view=diff == --- tomcat/tc7.0.x/trunk/webapps/examples/jsp/cal/cal1.jsp (original) +++ tomcat/tc7.0.x/trunk/webapps/examples/jsp/cal/cal1.jsp Thu Nov 10 03:57:58 2011 @@ -15,7 +15,7 @@ limitations under the License. --% HTML -HEADTITLE +HEADTITLE Calendar: A JSP APPLICATION /TITLE/HEAD @@ -52,13 +52,13 @@ cal.Entry entr = table.getEntries().getEntry(i); % TR -TD +TD A HREF=cal2.jsp?time=%= entr.getHour() % %= entr.getHour() % /A /TD TD BGCOLOR=%= entr.getColor() % % out.print(util.HTMLFilter.filter(entr.getDescription())); % -/TD +/TD /TR % } @@ -70,7 +70,7 @@ !-- footer -- TABLE WIDTH=60% BGCOLOR=yellow CELLPADDING=15 TR -TD ALIGN=CENTER % out.print(util.HTMLFilter.filter(table.getName())); % : +TD ALIGN=CENTER % out.print(util.HTMLFilter.filter(table.getName())); % : % out.print(util.HTMLFilter.filter(table.getEmail())); % /TD /TR /TABLE Modified: tomcat/tc7.0.x/trunk/webapps/examples/jsp/cal/cal2.jsp URL: http://svn.apache.org/viewvc/tomcat/tc7.0.x/trunk/webapps/examples/jsp/cal/cal2.jsp?rev=1200118r1=1200117r2=1200118view=diff == --- tomcat/tc7.0.x/trunk/webapps/examples/jsp/cal/cal2.jsp (original) +++ tomcat/tc7.0.x/trunk/webapps/examples/jsp/cal/cal2.jsp Thu Nov 10 03:57:58 2011 @@ -15,7 +15,7 @@ limitations under the License. --% HTML -HEADTITLE +HEADTITLE Calendar: A JSP APPLICATION /TITLE/HEAD @@ -23,7 +23,7 @@ BODY BGCOLOR=white jsp:useBean id=table scope=session
svn commit: r1200119 - in /tomcat/tc7.0.x/trunk/webapps/examples/jsp/jsp2: el/ jspattribute/ jspx/ misc/ simpletag/ tagfiles/
Author: kkolinko
Date: Thu Nov 10 03:59:06 2011
New Revision: 1200119
URL: http://svn.apache.org/viewvc?rev=1200119view=rev
Log:
Merging r1187809 - Trailing whitespace removal from /webapps
/webapps/examples, 2
Modified:
tomcat/tc7.0.x/trunk/webapps/examples/jsp/jsp2/el/basic-arithmetic.jsp
tomcat/tc7.0.x/trunk/webapps/examples/jsp/jsp2/el/composite.jsp
tomcat/tc7.0.x/trunk/webapps/examples/jsp/jsp2/el/functions.jsp
tomcat/tc7.0.x/trunk/webapps/examples/jsp/jsp2/el/implicit-objects.jsp
tomcat/tc7.0.x/trunk/webapps/examples/jsp/jsp2/jspattribute/jspattribute.jsp
tomcat/tc7.0.x/trunk/webapps/examples/jsp/jsp2/jspattribute/shuffle.jsp
tomcat/tc7.0.x/trunk/webapps/examples/jsp/jsp2/jspx/basic.jspx
tomcat/tc7.0.x/trunk/webapps/examples/jsp/jsp2/jspx/svgexample.html
tomcat/tc7.0.x/trunk/webapps/examples/jsp/jsp2/jspx/textRotate.jspx
tomcat/tc7.0.x/trunk/webapps/examples/jsp/jsp2/misc/config.jsp
tomcat/tc7.0.x/trunk/webapps/examples/jsp/jsp2/misc/dynamicattrs.jsp
tomcat/tc7.0.x/trunk/webapps/examples/jsp/jsp2/simpletag/book.jsp
tomcat/tc7.0.x/trunk/webapps/examples/jsp/jsp2/simpletag/repeat.jsp
tomcat/tc7.0.x/trunk/webapps/examples/jsp/jsp2/tagfiles/hello.jsp
tomcat/tc7.0.x/trunk/webapps/examples/jsp/jsp2/tagfiles/panel.jsp
tomcat/tc7.0.x/trunk/webapps/examples/jsp/jsp2/tagfiles/products.jsp
Modified: tomcat/tc7.0.x/trunk/webapps/examples/jsp/jsp2/el/basic-arithmetic.jsp
URL:
http://svn.apache.org/viewvc/tomcat/tc7.0.x/trunk/webapps/examples/jsp/jsp2/el/basic-arithmetic.jsp?rev=1200119r1=1200118r2=1200119view=diff
==
--- tomcat/tc7.0.x/trunk/webapps/examples/jsp/jsp2/el/basic-arithmetic.jsp
(original)
+++ tomcat/tc7.0.x/trunk/webapps/examples/jsp/jsp2/el/basic-arithmetic.jsp Thu
Nov 10 03:59:06 2011
@@ -22,7 +22,7 @@
h1JSP 2.0 Expression Language - Basic Arithmetic/h1
hr
This example illustrates basic Expression Language arithmetic.
-Addition (+), subtraction (-), multiplication (*), division (/ or div),
+Addition (+), subtraction (-), multiplication (*), division (/ or div),
and modulus (% or mod) are all supported. Error conditions, like
division by zero, are handled gracefully.
br
Modified: tomcat/tc7.0.x/trunk/webapps/examples/jsp/jsp2/el/composite.jsp
URL:
http://svn.apache.org/viewvc/tomcat/tc7.0.x/trunk/webapps/examples/jsp/jsp2/el/composite.jsp?rev=1200119r1=1200118r2=1200119view=diff
==
--- tomcat/tc7.0.x/trunk/webapps/examples/jsp/jsp2/el/composite.jsp (original)
+++ tomcat/tc7.0.x/trunk/webapps/examples/jsp/jsp2/el/composite.jsp Thu Nov 10
03:59:06 2011
@@ -70,7 +70,7 @@
/tr
!--
Undefined values are to be coerced to String, to be ,
- https://issues.apache.org/bugzilla/show_bug.cgi?id=47413
+ https://issues.apache.org/bugzilla/show_bug.cgi?id=47413
--
tr
td\${undefinedFoo}hello world\${undefinedBar}/td
Modified: tomcat/tc7.0.x/trunk/webapps/examples/jsp/jsp2/el/functions.jsp
URL:
http://svn.apache.org/viewvc/tomcat/tc7.0.x/trunk/webapps/examples/jsp/jsp2/el/functions.jsp?rev=1200119r1=1200118r2=1200119view=diff
==
--- tomcat/tc7.0.x/trunk/webapps/examples/jsp/jsp2/el/functions.jsp (original)
+++ tomcat/tc7.0.x/trunk/webapps/examples/jsp/jsp2/el/functions.jsp Thu Nov 10
03:59:06 2011
@@ -26,7 +26,7 @@
hr
An upgrade from the JSTL expression language, the JSP 2.0 EL also
allows for simple function invocation. Functions are defined
-by tag libraries and are implemented by a Java programmer as
+by tag libraries and are implemented by a Java programmer as
static methods.
blockquote
Modified: tomcat/tc7.0.x/trunk/webapps/examples/jsp/jsp2/el/implicit-objects.jsp
URL:
http://svn.apache.org/viewvc/tomcat/tc7.0.x/trunk/webapps/examples/jsp/jsp2/el/implicit-objects.jsp?rev=1200119r1=1200118r2=1200119view=diff
==
--- tomcat/tc7.0.x/trunk/webapps/examples/jsp/jsp2/el/implicit-objects.jsp
(original)
+++ tomcat/tc7.0.x/trunk/webapps/examples/jsp/jsp2/el/implicit-objects.jsp Thu
Nov 10 03:59:06 2011
@@ -23,28 +23,28 @@
body
h1JSP 2.0 Expression Language - Implicit Objects/h1
hr
-This example illustrates some of the implicit objects available
-in the Expression Lanaguage. The following implicit objects are
+This example illustrates some of the implicit objects available
+in the Expression Lanaguage. The following implicit objects are
available (not all illustrated here):
ul
lipageContext - the PageContext object/li
- lipageScope - a Map that maps page-scoped attribute names to
+ lipageScope - a Map that maps page-scoped attribute names to
svn commit: r1200120 - in /tomcat/tc7.0.x/trunk/webapps/examples: jsp/jsptoserv/ jsp/plugin/ jsp/sessions/ jsp/snp/ jsp/tagplugin/ jsp/xml/ servlets/
Author: kkolinko
Date: Thu Nov 10 04:00:19 2011
New Revision: 1200120
URL: http://svn.apache.org/viewvc?rev=1200120view=rev
Log:
Merging r1187809 - Trailing whitespace removal from /webapps
/webapps/examples, 3
Modified:
tomcat/tc7.0.x/trunk/webapps/examples/jsp/jsptoserv/jts.html
tomcat/tc7.0.x/trunk/webapps/examples/jsp/plugin/plugin.jsp
tomcat/tc7.0.x/trunk/webapps/examples/jsp/sessions/carts.html
tomcat/tc7.0.x/trunk/webapps/examples/jsp/sessions/carts.jsp
tomcat/tc7.0.x/trunk/webapps/examples/jsp/snp/snoop.jsp
tomcat/tc7.0.x/trunk/webapps/examples/jsp/tagplugin/choose.jsp
tomcat/tc7.0.x/trunk/webapps/examples/jsp/tagplugin/foreach.jsp
tomcat/tc7.0.x/trunk/webapps/examples/jsp/tagplugin/howto.html
tomcat/tc7.0.x/trunk/webapps/examples/jsp/tagplugin/if.jsp
tomcat/tc7.0.x/trunk/webapps/examples/jsp/tagplugin/notes.html
tomcat/tc7.0.x/trunk/webapps/examples/jsp/xml/xml.jsp
tomcat/tc7.0.x/trunk/webapps/examples/servlets/cookies.html
tomcat/tc7.0.x/trunk/webapps/examples/servlets/reqinfo.html
tomcat/tc7.0.x/trunk/webapps/examples/servlets/reqparams.html
tomcat/tc7.0.x/trunk/webapps/examples/servlets/sessions.html
Modified: tomcat/tc7.0.x/trunk/webapps/examples/jsp/jsptoserv/jts.html
URL:
http://svn.apache.org/viewvc/tomcat/tc7.0.x/trunk/webapps/examples/jsp/jsptoserv/jts.html?rev=1200120r1=1200119r2=1200120view=diff
==
--- tomcat/tc7.0.x/trunk/webapps/examples/jsp/jsptoserv/jts.html (original)
+++ tomcat/tc7.0.x/trunk/webapps/examples/jsp/jsptoserv/jts.html Thu Nov 10
04:00:19 2011
@@ -27,7 +27,7 @@
h3a href=jsptoservlet.jsp.htmlSource Code for JSP calling servlet font
color=#FF/a
/font /h3
-h3a href=servletToJsp.java.htmlSource Code for Servlet calling JSP
+h3a href=servletToJsp.java.htmlSource Code for Servlet calling JSP
font color=#FF/a /font /h3
/body
Modified: tomcat/tc7.0.x/trunk/webapps/examples/jsp/plugin/plugin.jsp
URL:
http://svn.apache.org/viewvc/tomcat/tc7.0.x/trunk/webapps/examples/jsp/plugin/plugin.jsp?rev=1200120r1=1200119r2=1200120view=diff
==
--- tomcat/tc7.0.x/trunk/webapps/examples/jsp/plugin/plugin.jsp (original)
+++ tomcat/tc7.0.x/trunk/webapps/examples/jsp/plugin/plugin.jsp Thu Nov 10
04:00:19 2011
@@ -25,7 +25,7 @@
/jsp:plugin
p
h4
-font color=red
+font color=red
The above applet is loaded using the Java Plugin from a jsp page using the
plugin tag.
/font
Modified: tomcat/tc7.0.x/trunk/webapps/examples/jsp/sessions/carts.html
URL:
http://svn.apache.org/viewvc/tomcat/tc7.0.x/trunk/webapps/examples/jsp/sessions/carts.html?rev=1200120r1=1200119r2=1200120view=diff
==
--- tomcat/tc7.0.x/trunk/webapps/examples/jsp/sessions/carts.html (original)
+++ tomcat/tc7.0.x/trunk/webapps/examples/jsp/sessions/carts.html Thu Nov 10
04:00:19 2011
@@ -47,7 +47,7 @@ Add Item:
INPUT TYPE=submit name=submit value=remove
/form
-
+
/FONT
/body
/html
Modified: tomcat/tc7.0.x/trunk/webapps/examples/jsp/sessions/carts.jsp
URL:
http://svn.apache.org/viewvc/tomcat/tc7.0.x/trunk/webapps/examples/jsp/sessions/carts.jsp?rev=1200120r1=1200119r2=1200120view=diff
==
--- tomcat/tc7.0.x/trunk/webapps/examples/jsp/sessions/carts.jsp (original)
+++ tomcat/tc7.0.x/trunk/webapps/examples/jsp/sessions/carts.jsp Thu Nov 10
04:00:19 2011
@@ -26,11 +26,11 @@
FONT size = 5 COLOR=#CC
br You have the following items in your cart:
ol
-%
+%
String[] items = cart.getItems();
for (int i=0; iitems.length; i++) {
%
-li % out.print(util.HTMLFilter.filter(items[i])); %
+li % out.print(util.HTMLFilter.filter(items[i])); %
%
}
%
Modified: tomcat/tc7.0.x/trunk/webapps/examples/jsp/snp/snoop.jsp
URL:
http://svn.apache.org/viewvc/tomcat/tc7.0.x/trunk/webapps/examples/jsp/snp/snoop.jsp?rev=1200120r1=1200119r2=1200120view=diff
==
--- tomcat/tc7.0.x/trunk/webapps/examples/jsp/snp/snoop.jsp (original)
+++ tomcat/tc7.0.x/trunk/webapps/examples/jsp/snp/snoop.jsp Thu Nov 10 04:00:19
2011
@@ -44,7 +44,7 @@ Remote address: %= util.HTMLFilter.filt
br
Remote host: %= util.HTMLFilter.filter(request.getRemoteHost()) %
br
-Authorization scheme: %= util.HTMLFilter.filter(request.getAuthType()) %
+Authorization scheme: %= util.HTMLFilter.filter(request.getAuthType()) %
br
Locale: %= request.getLocale() %
hr
Modified: tomcat/tc7.0.x/trunk/webapps/examples/jsp/tagplugin/choose.jsp
URL:
http://svn.apache.org/viewvc/tomcat/tc7.0.x/trunk/webapps/examples/jsp/tagplugin/choose.jsp?rev=1200120r1=1200119r2=1200120view=diff
==
---
svn commit: r1200121 - in /tomcat/tc7.0.x/trunk/webapps/examples/WEB-INF/classes: ./ async/ cal/ chat/ colors/ compressionFilters/ dates/ examples/
Author: kkolinko
Date: Thu Nov 10 04:01:40 2011
New Revision: 1200121
URL: http://svn.apache.org/viewvc?rev=1200121view=rev
Log:
Merging r1187809 - Trailing whitespace removal from /webapps
/webapps/examples, 4
Modified:
tomcat/tc7.0.x/trunk/webapps/examples/WEB-INF/classes/CookieExample.java
tomcat/tc7.0.x/trunk/webapps/examples/WEB-INF/classes/async/Async1.java
tomcat/tc7.0.x/trunk/webapps/examples/WEB-INF/classes/async/Async2.java
tomcat/tc7.0.x/trunk/webapps/examples/WEB-INF/classes/async/Async3.java
tomcat/tc7.0.x/trunk/webapps/examples/WEB-INF/classes/async/AsyncStockServlet.java
tomcat/tc7.0.x/trunk/webapps/examples/WEB-INF/classes/async/Stockticker.java
tomcat/tc7.0.x/trunk/webapps/examples/WEB-INF/classes/cal/JspCalendar.java
tomcat/tc7.0.x/trunk/webapps/examples/WEB-INF/classes/chat/ChatServlet.java
tomcat/tc7.0.x/trunk/webapps/examples/WEB-INF/classes/colors/ColorGameBean.java
tomcat/tc7.0.x/trunk/webapps/examples/WEB-INF/classes/compressionFilters/CompressionFilter.java
tomcat/tc7.0.x/trunk/webapps/examples/WEB-INF/classes/compressionFilters/CompressionServletResponseWrapper.java
tomcat/tc7.0.x/trunk/webapps/examples/WEB-INF/classes/dates/JspCalendar.java
tomcat/tc7.0.x/trunk/webapps/examples/WEB-INF/classes/examples/ExampleTagBase.java
tomcat/tc7.0.x/trunk/webapps/examples/WEB-INF/classes/examples/FooTag.java
tomcat/tc7.0.x/trunk/webapps/examples/WEB-INF/classes/examples/FooTagExtraInfo.java
tomcat/tc7.0.x/trunk/webapps/examples/WEB-INF/classes/examples/LogTag.java
tomcat/tc7.0.x/trunk/webapps/examples/WEB-INF/classes/examples/ShowSource.java
Modified:
tomcat/tc7.0.x/trunk/webapps/examples/WEB-INF/classes/CookieExample.java
URL:
http://svn.apache.org/viewvc/tomcat/tc7.0.x/trunk/webapps/examples/WEB-INF/classes/CookieExample.java?rev=1200121r1=1200120r2=1200121view=diff
==
--- tomcat/tc7.0.x/trunk/webapps/examples/WEB-INF/classes/CookieExample.java
(original)
+++ tomcat/tc7.0.x/trunk/webapps/examples/WEB-INF/classes/CookieExample.java
Thu Nov 10 04:01:40 2011
@@ -41,13 +41,13 @@ public class CookieExample extends HttpS
private static final long serialVersionUID = 1L;
private static final ResourceBundle RB =
ResourceBundle.getBundle(LocalStrings);
-
+
@Override
public void doGet(HttpServletRequest request,
HttpServletResponse response)
throws IOException, ServletException
{
-
+
String cookieName = request.getParameter(cookiename);
String cookieValue = request.getParameter(cookievalue);
Cookie aCookie = null;
@@ -72,7 +72,7 @@ public class CookieExample extends HttpS
// XXX
// making these absolute till we work out the
-// addition of a PathInfo issue
+// addition of a PathInfo issue
out.println(a href=\../cookies.html\);
out.println(img src=\../images/code.gif\ height=24 +
@@ -90,7 +90,7 @@ public class CookieExample extends HttpS
Cookie cookie = cookies[i];
out.print(Cookie Name: + HTMLFilter.filter(cookie.getName())
+ br);
-out.println( Cookie Value:
+out.println( Cookie Value:
+ HTMLFilter.filter(cookie.getValue())
+ brbr);
}
@@ -101,12 +101,12 @@ public class CookieExample extends HttpS
if (aCookie != null) {
out.println(P);
out.println(RB.getString(cookies.set) + br);
-out.print(RB.getString(cookies.name) +
+out.print(RB.getString(cookies.name) +
+ HTMLFilter.filter(cookieName) + br);
-out.print(RB.getString(cookies.value) +
+out.print(RB.getString(cookies.value) +
+ HTMLFilter.filter(cookieValue));
}
-
+
out.println(P);
out.println(RB.getString(cookies.make-cookie) + br);
out.print(form action=\);
@@ -116,8 +116,8 @@ public class CookieExample extends HttpS
out.print(RB.getString(cookies.value) + );
out.println(input type=text length=20 name=cookievaluebr);
out.println(input type=submit/form);
-
-
+
+
out.println(/body);
out.println(/html);
}
Modified:
tomcat/tc7.0.x/trunk/webapps/examples/WEB-INF/classes/async/Async1.java
URL:
http://svn.apache.org/viewvc/tomcat/tc7.0.x/trunk/webapps/examples/WEB-INF/classes/async/Async1.java?rev=1200121r1=1200120r2=1200121view=diff
==
--- tomcat/tc7.0.x/trunk/webapps/examples/WEB-INF/classes/async/Async1.java
(original)
+++ tomcat/tc7.0.x/trunk/webapps/examples/WEB-INF/classes/async/Async1.java Thu
Nov 10 04:01:40 2011
@@ -57,6 +57,6 @@
svn commit: r1200123 - in /tomcat/tc7.0.x/trunk/webapps/examples/WEB-INF: ./ classes/ classes/jsp2/examples/ classes/jsp2/examples/el/ classes/jsp2/examples/simpletag/ classes/listeners/ classes/sessi
Author: kkolinko
Date: Thu Nov 10 04:03:27 2011
New Revision: 1200123
URL: http://svn.apache.org/viewvc?rev=1200123view=rev
Log:
Merging r1187809 - Trailing whitespace removal from /webapps
/webapps/examples, 5
Modified:
tomcat/tc7.0.x/trunk/webapps/examples/WEB-INF/classes/RequestHeaderExample.java
tomcat/tc7.0.x/trunk/webapps/examples/WEB-INF/classes/RequestInfoExample.java
tomcat/tc7.0.x/trunk/webapps/examples/WEB-INF/classes/RequestParamExample.java
tomcat/tc7.0.x/trunk/webapps/examples/WEB-INF/classes/SessionExample.java
tomcat/tc7.0.x/trunk/webapps/examples/WEB-INF/classes/jsp2/examples/BookBean.java
tomcat/tc7.0.x/trunk/webapps/examples/WEB-INF/classes/jsp2/examples/FooBean.java
tomcat/tc7.0.x/trunk/webapps/examples/WEB-INF/classes/jsp2/examples/el/Functions.java
tomcat/tc7.0.x/trunk/webapps/examples/WEB-INF/classes/jsp2/examples/simpletag/EchoAttributesTag.java
tomcat/tc7.0.x/trunk/webapps/examples/WEB-INF/classes/jsp2/examples/simpletag/FindBookSimpleTag.java
tomcat/tc7.0.x/trunk/webapps/examples/WEB-INF/classes/jsp2/examples/simpletag/RepeatSimpleTag.java
tomcat/tc7.0.x/trunk/webapps/examples/WEB-INF/classes/jsp2/examples/simpletag/ShuffleSimpleTag.java
tomcat/tc7.0.x/trunk/webapps/examples/WEB-INF/classes/jsp2/examples/simpletag/TileSimpleTag.java
tomcat/tc7.0.x/trunk/webapps/examples/WEB-INF/classes/listeners/SessionListener.java
tomcat/tc7.0.x/trunk/webapps/examples/WEB-INF/classes/sessions/DummyCart.java
tomcat/tc7.0.x/trunk/webapps/examples/WEB-INF/jsp/debug-taglib.tld
tomcat/tc7.0.x/trunk/webapps/examples/WEB-INF/jsp/example-taglib.tld
tomcat/tc7.0.x/trunk/webapps/examples/WEB-INF/tags/displayProducts.tag
tomcat/tc7.0.x/trunk/webapps/examples/WEB-INF/web.xml
Modified:
tomcat/tc7.0.x/trunk/webapps/examples/WEB-INF/classes/RequestHeaderExample.java
URL:
http://svn.apache.org/viewvc/tomcat/tc7.0.x/trunk/webapps/examples/WEB-INF/classes/RequestHeaderExample.java?rev=1200123r1=1200122r2=1200123view=diff
==
---
tomcat/tc7.0.x/trunk/webapps/examples/WEB-INF/classes/RequestHeaderExample.java
(original)
+++
tomcat/tc7.0.x/trunk/webapps/examples/WEB-INF/classes/RequestHeaderExample.java
Thu Nov 10 04:03:27 2011
@@ -41,7 +41,7 @@ public class RequestHeaderExample extend
private static final long serialVersionUID = 1L;
private static final ResourceBundle RB =
ResourceBundle.getBundle(LocalStrings);
-
+
@Override
public void doGet(HttpServletRequest request,
HttpServletResponse response)
@@ -63,7 +63,7 @@ public class RequestHeaderExample extend
// XXX
// making these absolute till we work out the
-// addition of a PathInfo issue
+// addition of a PathInfo issue
out.println(a href=\../reqheaders.html\);
out.println(img src=\../images/code.gif\ height=24 +
Modified:
tomcat/tc7.0.x/trunk/webapps/examples/WEB-INF/classes/RequestInfoExample.java
URL:
http://svn.apache.org/viewvc/tomcat/tc7.0.x/trunk/webapps/examples/WEB-INF/classes/RequestInfoExample.java?rev=1200123r1=1200122r2=1200123view=diff
==
---
tomcat/tc7.0.x/trunk/webapps/examples/WEB-INF/classes/RequestInfoExample.java
(original)
+++
tomcat/tc7.0.x/trunk/webapps/examples/WEB-INF/classes/RequestInfoExample.java
Thu Nov 10 04:03:27 2011
@@ -79,30 +79,30 @@ public class RequestInfoExample extends
out.println(request.getMethod());
out.println(/td/trtrtd);
out.println(RB.getString(requestinfo.label.requesturi));
-out.println(/tdtd);
+out.println(/tdtd);
out.println(HTMLFilter.filter(request.getRequestURI()));
-out.println(/td/trtrtd);
+out.println(/td/trtrtd);
out.println(RB.getString(requestinfo.label.protocol));
-out.println(/tdtd);
+out.println(/tdtd);
out.println(request.getProtocol());
out.println(/td/trtrtd);
out.println(RB.getString(requestinfo.label.pathinfo));
-out.println(/tdtd);
+out.println(/tdtd);
out.println(HTMLFilter.filter(request.getPathInfo()));
out.println(/td/trtrtd);
out.println(RB.getString(requestinfo.label.remoteaddr));
String cipherSuite=
(String)request.getAttribute(javax.servlet.request.cipher_suite);
-out.println(/tdtd);
+out.println(/tdtd);
out.println(request.getRemoteAddr());
out.println(/table);
-
+
if(cipherSuite!=null){
out.println(/td/trtrtd);
out.println(SSLCipherSuite:);
out.println(/td);
-out.println(td);
+out.println(td);
out.println(request.getAttribute(javax.servlet.request.cipher_suite));
svn commit: r1200125 - in /tomcat/tc7.0.x/trunk/webapps/docs/appdev: build.xml.txt project.xml sample/index.html sample/src/mypackage/Hello.java source.xml web.xml.txt
Author: kkolinko Date: Thu Nov 10 04:05:48 2011 New Revision: 1200125 URL: http://svn.apache.org/viewvc?rev=1200125view=rev Log: Merging r1187809 - Trailing whitespace removal from /webapps /webapps/docs, part 1 of n Modified: tomcat/tc7.0.x/trunk/webapps/docs/appdev/build.xml.txt tomcat/tc7.0.x/trunk/webapps/docs/appdev/project.xml tomcat/tc7.0.x/trunk/webapps/docs/appdev/sample/index.html tomcat/tc7.0.x/trunk/webapps/docs/appdev/sample/src/mypackage/Hello.java tomcat/tc7.0.x/trunk/webapps/docs/appdev/source.xml tomcat/tc7.0.x/trunk/webapps/docs/appdev/web.xml.txt Modified: tomcat/tc7.0.x/trunk/webapps/docs/appdev/build.xml.txt URL: http://svn.apache.org/viewvc/tomcat/tc7.0.x/trunk/webapps/docs/appdev/build.xml.txt?rev=1200125r1=1200124r2=1200125view=diff == --- tomcat/tc7.0.x/trunk/webapps/docs/appdev/build.xml.txt (original) +++ tomcat/tc7.0.x/trunk/webapps/docs/appdev/build.xml.txt Thu Nov 10 04:05:48 2011 @@ -474,7 +474,7 @@ NOTE: The /WEB-INF/web.xml web application configuration file is not reread on a reload. If you have made changes to your web.xml file you must stop - then start the web application. + then start the web application. -- Modified: tomcat/tc7.0.x/trunk/webapps/docs/appdev/project.xml URL: http://svn.apache.org/viewvc/tomcat/tc7.0.x/trunk/webapps/docs/appdev/project.xml?rev=1200125r1=1200124r2=1200125view=diff == --- tomcat/tc7.0.x/trunk/webapps/docs/appdev/project.xml (original) +++ tomcat/tc7.0.x/trunk/webapps/docs/appdev/project.xml Thu Nov 10 04:05:48 2011 @@ -24,7 +24,7 @@ The Apache Tomcat Servlet/JSP Container /logo - + body menu name=Links Modified: tomcat/tc7.0.x/trunk/webapps/docs/appdev/sample/index.html URL: http://svn.apache.org/viewvc/tomcat/tc7.0.x/trunk/webapps/docs/appdev/sample/index.html?rev=1200125r1=1200124r2=1200125view=diff == --- tomcat/tc7.0.x/trunk/webapps/docs/appdev/sample/index.html (original) +++ tomcat/tc7.0.x/trunk/webapps/docs/appdev/sample/index.html Thu Nov 10 04:05:48 2011 @@ -21,22 +21,22 @@ /head body h2Sample Application/h2 - p -The example app has been packaged as a war file and can be downloaded -a href=sample.warhere/a (Note: make sure your browser doesn't + p +The example app has been packaged as a war file and can be downloaded +a href=sample.warhere/a (Note: make sure your browser doesn't change file extension or append a new one). /p - p -The easiest way to run this application is simply to move the war file -to your bCATALINA_HOME/webapps/b directory. Tomcat will automatically -expand and deploy the application for you. You can view it with the -following URL (assuming that you're running tomcat on port 8080 + p +The easiest way to run this application is simply to move the war file +to your bCATALINA_HOME/webapps/b directory. Tomcat will automatically +expand and deploy the application for you. You can view it with the +following URL (assuming that you're running tomcat on port 8080 as is the default): br / a href=http://localhost:8080/sample;http://localhost:8080/sample/a /p p -If you just want to browse the contents, you can unpack the war file +If you just want to browse the contents, you can unpack the war file with the bjar/b command. /p pre Modified: tomcat/tc7.0.x/trunk/webapps/docs/appdev/sample/src/mypackage/Hello.java URL: http://svn.apache.org/viewvc/tomcat/tc7.0.x/trunk/webapps/docs/appdev/sample/src/mypackage/Hello.java?rev=1200125r1=1200124r2=1200125view=diff == --- tomcat/tc7.0.x/trunk/webapps/docs/appdev/sample/src/mypackage/Hello.java (original) +++ tomcat/tc7.0.x/trunk/webapps/docs/appdev/sample/src/mypackage/Hello.java Thu Nov 10 04:05:48 2011 @@ -5,9 +5,9 @@ * 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. Modified: tomcat/tc7.0.x/trunk/webapps/docs/appdev/source.xml URL: http://svn.apache.org/viewvc/tomcat/tc7.0.x/trunk/webapps/docs/appdev/source.xml?rev=1200125r1=1200124r2=1200125view=diff == ---
svn commit: r1200126 - in /tomcat/tc7.0.x/trunk/webapps/docs: WEB-INF/ api/ architecture/ architecture/startup/ elapi/ images/ jspapi/ servletapi/
Author: kkolinko Date: Thu Nov 10 04:06:54 2011 New Revision: 1200126 URL: http://svn.apache.org/viewvc?rev=1200126view=rev Log: Merging r1187809 - Trailing whitespace removal from /webapps /webapps/docs, 2 Modified: tomcat/tc7.0.x/trunk/webapps/docs/WEB-INF/web.xml tomcat/tc7.0.x/trunk/webapps/docs/api/index.html tomcat/tc7.0.x/trunk/webapps/docs/architecture/overview.xml tomcat/tc7.0.x/trunk/webapps/docs/architecture/project.xml tomcat/tc7.0.x/trunk/webapps/docs/architecture/startup/serverStartup.txt tomcat/tc7.0.x/trunk/webapps/docs/elapi/index.html tomcat/tc7.0.x/trunk/webapps/docs/images/tomcat.svg tomcat/tc7.0.x/trunk/webapps/docs/jspapi/index.html tomcat/tc7.0.x/trunk/webapps/docs/servletapi/index.html Modified: tomcat/tc7.0.x/trunk/webapps/docs/WEB-INF/web.xml URL: http://svn.apache.org/viewvc/tomcat/tc7.0.x/trunk/webapps/docs/WEB-INF/web.xml?rev=1200126r1=1200125r2=1200126view=diff == --- tomcat/tc7.0.x/trunk/webapps/docs/WEB-INF/web.xml (original) +++ tomcat/tc7.0.x/trunk/webapps/docs/WEB-INF/web.xml Thu Nov 10 04:06:54 2011 @@ -20,7 +20,7 @@ xsi:schemaLocation=http://java.sun.com/xml/ns/javaee http://java.sun.com/xml/ns/javaee/web-app_3_0.xsd; version=3.0 - metadata-complete=true + metadata-complete=true display-nameTomcat Documentation/display-name description Modified: tomcat/tc7.0.x/trunk/webapps/docs/api/index.html URL: http://svn.apache.org/viewvc/tomcat/tc7.0.x/trunk/webapps/docs/api/index.html?rev=1200126r1=1200125r2=1200126view=diff == --- tomcat/tc7.0.x/trunk/webapps/docs/api/index.html (original) +++ tomcat/tc7.0.x/trunk/webapps/docs/api/index.html Thu Nov 10 04:06:54 2011 @@ -23,10 +23,10 @@ body -Tomcat's internal javadoc is not installed by default. Download and install +Tomcat's internal javadoc is not installed by default. Download and install the fulldocs package to get it. -You can also access the javadoc online in the Tomcat +You can also access the javadoc online in the Tomcat a href=http://tomcat.apache.org/tomcat-@VERSION_MAJOR_MINOR@-doc/; documentation bundle/a. Modified: tomcat/tc7.0.x/trunk/webapps/docs/architecture/overview.xml URL: http://svn.apache.org/viewvc/tomcat/tc7.0.x/trunk/webapps/docs/architecture/overview.xml?rev=1200126r1=1200125r2=1200126view=diff == --- tomcat/tc7.0.x/trunk/webapps/docs/architecture/overview.xml (original) +++ tomcat/tc7.0.x/trunk/webapps/docs/architecture/overview.xml Thu Nov 10 04:06:54 2011 @@ -42,7 +42,7 @@ This page provides an overview of the To p In the Tomcat world, a a href=../config/server.htmlServer/a represents the whole container. -Tomcat provides a default implementation of the +Tomcat provides a default implementation of the a href=../api/org/apache/catalina/Server.htmlServer interface/a which is rarely customized by users. /p @@ -81,7 +81,7 @@ e.g. www.yourcompany.com, to the Tomcat multiple hosts, and the Host element also supports network aliases such as yourcompany.com and abc.yourcompany.com. Users rarely create custom a href=../api/org/apache/catalina/Host.htmlHosts/a -because the +because the a href=../api/org/apache/catalina/core/StandardHost.htmlStandardHost implementation/a provides significant additional functionality. /p @@ -92,7 +92,7 @@ implementation/a provides significant A Connector handles communications with the client. There are multiple connectors available with Tomcat. These include the a href=../config/http.htmlHTTP connector/a which is used for -most HTTP traffic, especially when running Tomcat as a standalone server, +most HTTP traffic, especially when running Tomcat as a standalone server, and the a href=../config/ajp.htmlAJP connector/a which implements the AJP procotol used when connecting Tomcat to a web server such as Apache HTTPD server. Creating a customized connector is a significant Modified: tomcat/tc7.0.x/trunk/webapps/docs/architecture/project.xml URL: http://svn.apache.org/viewvc/tomcat/tc7.0.x/trunk/webapps/docs/architecture/project.xml?rev=1200126r1=1200125r2=1200126view=diff == --- tomcat/tc7.0.x/trunk/webapps/docs/architecture/project.xml (original) +++ tomcat/tc7.0.x/trunk/webapps/docs/architecture/project.xml Thu Nov 10 04:06:54 2011 @@ -24,7 +24,7 @@ The Apache Tomcat Servlet/JSP Container /logo - + body menu name=Links Modified: tomcat/tc7.0.x/trunk/webapps/docs/architecture/startup/serverStartup.txt URL: http://svn.apache.org/viewvc/tomcat/tc7.0.x/trunk/webapps/docs/architecture/startup/serverStartup.txt?rev=1200126r1=1200125r2=1200126view=diff ==
svn commit: r1200127 - in /tomcat/tc7.0.x/trunk/webapps/docs: config/ tribes/
Author: kkolinko Date: Thu Nov 10 04:08:49 2011 New Revision: 1200127 URL: http://svn.apache.org/viewvc?rev=1200127view=rev Log: Merging r1187809 - Trailing whitespace removal from /webapps /webapps/docs, 3 Modified: tomcat/tc7.0.x/trunk/webapps/docs/config/cluster-channel.xml tomcat/tc7.0.x/trunk/webapps/docs/config/cluster-deployer.xml tomcat/tc7.0.x/trunk/webapps/docs/config/cluster-interceptor.xml tomcat/tc7.0.x/trunk/webapps/docs/config/cluster-listener.xml tomcat/tc7.0.x/trunk/webapps/docs/config/cluster-manager.xml tomcat/tc7.0.x/trunk/webapps/docs/config/cluster-membership.xml tomcat/tc7.0.x/trunk/webapps/docs/config/cluster-receiver.xml tomcat/tc7.0.x/trunk/webapps/docs/config/cluster-sender.xml tomcat/tc7.0.x/trunk/webapps/docs/config/cluster-valve.xml tomcat/tc7.0.x/trunk/webapps/docs/config/cluster.xml tomcat/tc7.0.x/trunk/webapps/docs/tribes/introduction.xml Modified: tomcat/tc7.0.x/trunk/webapps/docs/config/cluster-channel.xml URL: http://svn.apache.org/viewvc/tomcat/tc7.0.x/trunk/webapps/docs/config/cluster-channel.xml?rev=1200127r1=1200126r2=1200127view=diff == --- tomcat/tc7.0.x/trunk/webapps/docs/config/cluster-channel.xml (original) +++ tomcat/tc7.0.x/trunk/webapps/docs/config/cluster-channel.xml Thu Nov 10 04:08:49 2011 @@ -39,7 +39,7 @@ This framework is then used internally by the components that need to send messages between different Tomcat instances. br/ A few examples of these components would be the SimpleTcpCluster that does the messaging for the DeltaManager, - or the BackupManager that uses a different replication strategy. The ReplicatedContext object does also + or the BackupManager that uses a different replication strategy. The ReplicatedContext object does also use the channel object to communicate context attribute changes. /section section name=Nested Components @@ -47,12 +47,12 @@ The Membership component is responsible for auto discovering new nodes in the cluster and also to provide for notifications for any nodes that have not responded with a heartbeat. The default implementation uses multicast.br/ -In the membership component you configure how your nodes, aka. members, are to be discovered and/or -divided up. +In the membership component you configure how your nodes, aka. members, are to be discovered and/or +divided up. You can always find out more about a href=../tribes/introduction.htmlApache Tribes/a /p pba href=cluster-sender.htmlChannel/Sender/a:/b br/ -The Sender component manages all outbound connections and data messages that are sent +The Sender component manages all outbound connections and data messages that are sent over the network from one node to another. This component allows messages to be sent in parallel. The default implementation uses TCP client sockets, and socket tuning for outgoing messages are @@ -72,7 +72,7 @@ You can always find out more about a href=../tribes/introduction.htmlApache Tribes/a /p pba href=cluster-interceptor.htmlChannel/Interceptor/a:/b br/ -The channel will send messages through an interceptor stack. Because of this, you have the ability to +The channel will send messages through an interceptor stack. Because of this, you have the ability to customize the way messages are sent and received, and even how membership is handled.br/ You can always find out more about a href=../tribes/introduction.htmlApache Tribes/a /p @@ -84,7 +84,7 @@ subsection name=Common Attributes attributes - + attribute name=className required=true The default value here is codeorg.apache.catalina.tribes.group.GroupChannel/code and is currently the only implementation available. Modified: tomcat/tc7.0.x/trunk/webapps/docs/config/cluster-deployer.xml URL: http://svn.apache.org/viewvc/tomcat/tc7.0.x/trunk/webapps/docs/config/cluster-deployer.xml?rev=1200127r1=1200126r2=1200127view=diff == --- tomcat/tc7.0.x/trunk/webapps/docs/config/cluster-deployer.xml (original) +++ tomcat/tc7.0.x/trunk/webapps/docs/config/cluster-deployer.xml Thu Nov 10 04:08:49 2011 @@ -35,7 +35,7 @@ section name=Introduction pTODO - Complete documentation/p - + /section @@ -45,7 +45,7 @@ subsection name=Common Attributes attributes - + attribute name=className required=true /attribute Modified: tomcat/tc7.0.x/trunk/webapps/docs/config/cluster-interceptor.xml URL: http://svn.apache.org/viewvc/tomcat/tc7.0.x/trunk/webapps/docs/config/cluster-interceptor.xml?rev=1200127r1=1200126r2=1200127view=diff == --- tomcat/tc7.0.x/trunk/webapps/docs/config/cluster-interceptor.xml (original) +++
DO NOT REPLY [Bug 52165] javax.naming.NameNotFoundException: Name name is not bound in this Context
https://issues.apache.org/bugzilla/show_bug.cgi?id=52165 --- Comment #2 from maxie maksim.likha...@thomson.com 2011-11-10 04:09:26 UTC --- plain vanila simple example works, real app consistently doesn't, I wonder if spring context somehow affecting this. I'll try to comeup with the example. -- 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: r1200130 - in /tomcat/tc7.0.x/trunk/webapps/docs/config: listeners.xml manager.xml project.xml realm.xml resources.xml server.xml systemprops.xml valve.xml
Author: kkolinko Date: Thu Nov 10 04:11:35 2011 New Revision: 1200130 URL: http://svn.apache.org/viewvc?rev=1200130view=rev Log: Merging r1187809 - Trailing whitespace removal from /webapps /webapps/docs, 5 Modified: tomcat/tc7.0.x/trunk/webapps/docs/config/listeners.xml tomcat/tc7.0.x/trunk/webapps/docs/config/manager.xml tomcat/tc7.0.x/trunk/webapps/docs/config/project.xml tomcat/tc7.0.x/trunk/webapps/docs/config/realm.xml tomcat/tc7.0.x/trunk/webapps/docs/config/resources.xml tomcat/tc7.0.x/trunk/webapps/docs/config/server.xml tomcat/tc7.0.x/trunk/webapps/docs/config/systemprops.xml tomcat/tc7.0.x/trunk/webapps/docs/config/valve.xml Modified: tomcat/tc7.0.x/trunk/webapps/docs/config/listeners.xml URL: http://svn.apache.org/viewvc/tomcat/tc7.0.x/trunk/webapps/docs/config/listeners.xml?rev=1200130r1=1200129r2=1200130view=diff == --- tomcat/tc7.0.x/trunk/webapps/docs/config/listeners.xml (original) +++ tomcat/tc7.0.x/trunk/webapps/docs/config/listeners.xml Thu Nov 10 04:11:35 2011 @@ -38,7 +38,7 @@ actions when specific events occur, usually Tomcat starting or Tomcat stopping./p - pListeners may be nested inside a a href=server.htmlServer/a, + pListeners may be nested inside a a href=server.htmlServer/a, a href=engine.htmlEngine/a, a href=host.htmlHost/a or a href=context.htmlContext/a. Some Listeners are only intended to be nested inside specific elements. These constraints are noted in the @@ -156,7 +156,7 @@ this listener starts as Tomcat's common class loader is the context class loader at that time. It also provides work-arounds for known issues that can result in locked JAR files./p - + pThis listener must only be nested within a href=server.htmlServer/a elements./p @@ -182,12 +182,12 @@ /attribute attribute name=classesToInitialize required=false -pList of comma-separated fully qualified class names to load and initialize -during the startup of this Listener. This allows to pre-load classes that are -known to provoke classloader leaks if they are loaded during a request -processing. Non-JRE classes may be referenced, like +pList of comma-separated fully qualified class names to load and initialize +during the startup of this Listener. This allows to pre-load classes that are +known to provoke classloader leaks if they are loaded during a request +processing. Non-JRE classes may be referenced, like codeoracle.jdbc.driver.OracleTimeoutThreadPerVM/code. -The default value is empty, but specific JRE classes are loaded by other leak +The default value is empty, but specific JRE classes are loaded by other leak protection features managed by other attributes of this Listener./p /attribute @@ -218,24 +218,24 @@ attribute name=ldapPoolProtection required=false pEnables protection so that the PoolCleaner thread started by -codecom.sun.jndi.ldap.LdapPoolManager/code does not result in a -memory leak. The thread is started the first time the -codeLdapPoolManager/code class is used if the system property +codecom.sun.jndi.ldap.LdapPoolManager/code does not result in a +memory leak. The thread is started the first time the +codeLdapPoolManager/code class is used if the system property codecom.sun.jndi.ldap.connect.pool.timeout/code is set to a value -greater than 0. Without this protection, if a web application uses this -class the PoolCleaner thread will be configured with the thread's -context class loader set to the web application class loader which in -turn will trigger a memory leak on reload. Defaults to +greater than 0. Without this protection, if a web application uses this +class the PoolCleaner thread will be configured with the thread's +context class loader set to the web application class loader which in +turn will trigger a memory leak on reload. Defaults to codetrue/code./p /attribute attribute name=securityLoginConfigurationProtection required=false pEnables protection so that usage of the -codejavax.security.auth.login.Configuration/code class by a web -application does not provoke a memory leak. The first access of this -class will trigger the initializer that will retain a static reference -to the context class loader. The protection loads the class with the -system class loader to ensure that the static initializer is not +codejavax.security.auth.login.Configuration/code class by a web +application does not provoke a memory leak. The first access of this +class will trigger the initializer that will retain a static reference +to the context
svn commit: r1200131 - in /tomcat/tc7.0.x/trunk/webapps/docs: aio.xml apr.xml balancer-howto.xml building.xml cgi-howto.xml class-loader-howto.xml cluster-howto.xml connectors.xml
Author: kkolinko Date: Thu Nov 10 04:12:37 2011 New Revision: 1200131 URL: http://svn.apache.org/viewvc?rev=1200131view=rev Log: Merging r1187809 - Trailing whitespace removal from /webapps /webapps/docs, 6 Modified: tomcat/tc7.0.x/trunk/webapps/docs/aio.xml tomcat/tc7.0.x/trunk/webapps/docs/apr.xml tomcat/tc7.0.x/trunk/webapps/docs/balancer-howto.xml tomcat/tc7.0.x/trunk/webapps/docs/building.xml tomcat/tc7.0.x/trunk/webapps/docs/cgi-howto.xml tomcat/tc7.0.x/trunk/webapps/docs/class-loader-howto.xml tomcat/tc7.0.x/trunk/webapps/docs/cluster-howto.xml tomcat/tc7.0.x/trunk/webapps/docs/connectors.xml Modified: tomcat/tc7.0.x/trunk/webapps/docs/aio.xml URL: http://svn.apache.org/viewvc/tomcat/tc7.0.x/trunk/webapps/docs/aio.xml?rev=1200131r1=1200130r2=1200131view=diff == --- tomcat/tc7.0.x/trunk/webapps/docs/aio.xml (original) +++ tomcat/tc7.0.x/trunk/webapps/docs/aio.xml Thu Nov 10 04:12:37 2011 @@ -36,8 +36,8 @@ section name=Introduction p -With usage of APR or NIO APIs as the basis of its connectors, Tomcat is -able to provide a number of extensions over the regular blocking IO +With usage of APR or NIO APIs as the basis of its connectors, Tomcat is +able to provide a number of extensions over the regular blocking IO as provided with support for the Servlet API. /p @@ -60,7 +60,7 @@ /p subsection name=CometEvent - + p Servlets which implement the codeorg.apache.catalina.comet.CometProcessor/code interface will have their event method invoked rather than the usual service @@ -71,38 +71,38 @@ an END or ERROR event. The following event types exist: /p - + ul - liEventType.BEGIN: will be called at the beginning - of the processing of the connection. It can be used to initialize any relevant - fields using the request and response objects. Between the end of the processing + liEventType.BEGIN: will be called at the beginning + of the processing of the connection. It can be used to initialize any relevant + fields using the request and response objects. Between the end of the processing of this event, and the beginning of the processing of the end or error events, it is possible to use the response object to write data on the open connection. - Note that the response object and dependent OutputStream and Writer are still - not synchronized, so when they are accessed by multiple threads, - synchronization is mandatory. After processing the initial event, the request + Note that the response object and dependent OutputStream and Writer are still + not synchronized, so when they are accessed by multiple threads, + synchronization is mandatory. After processing the initial event, the request is considered to be committed./li liEventType.READ: This indicates that input data is available, and that one read can be made without blocking. The available and ready methods of the InputStream or Reader may be used to determine if there is a risk of blocking: the servlet - should read while data is reported available. When encountering a read error, - the servlet should report it by propagating the exception properly. Throwing - an exception will cause the error event to be invoked, and the connection - will be closed. + should read while data is reported available. When encountering a read error, + the servlet should report it by propagating the exception properly. Throwing + an exception will cause the error event to be invoked, and the connection + will be closed. Alternately, it is also possible to catch any exception, perform clean up on any data structure the servlet may be using, and using the close method - of the event. It is not allowed to attempt reading data from the request + of the event. It is not allowed to attempt reading data from the request object outside of the execution of this method.br/ On some platforms, like Windows, a client disconnect is indicated by a READ event. Reading from the stream may result in -1, an IOException or an EOFException. Make sure you properly handle all these three cases. - If you don't catch the IOException, Tomcat will instantly invoke your event chain with an ERROR as + If you don't catch the IOException, Tomcat will instantly invoke your event chain with an ERROR as it catches the error for you, and you will be notified of the error at that time. /li liEventType.END: End may be called to end the processing of the request. Fields that have been initialized in the begin method should be reset. After this event has been processed, the request and response objects, as well as all their dependent - objects will be recycled and
svn commit: r1200133 - in /tomcat/tc7.0.x/trunk/webapps/docs: default-servlet.xml deployer-howto.xml developers.xml extras.xml html-manager-howto.xml jasper-howto.xml jndi-datasource-examples-howto.xm
Author: kkolinko Date: Thu Nov 10 04:13:59 2011 New Revision: 1200133 URL: http://svn.apache.org/viewvc?rev=1200133view=rev Log: Merging r1187809 - Trailing whitespace removal from /webapps /webapps/docs, 7 Modified: tomcat/tc7.0.x/trunk/webapps/docs/default-servlet.xml tomcat/tc7.0.x/trunk/webapps/docs/deployer-howto.xml tomcat/tc7.0.x/trunk/webapps/docs/developers.xml tomcat/tc7.0.x/trunk/webapps/docs/extras.xml tomcat/tc7.0.x/trunk/webapps/docs/html-manager-howto.xml tomcat/tc7.0.x/trunk/webapps/docs/jasper-howto.xml tomcat/tc7.0.x/trunk/webapps/docs/jndi-datasource-examples-howto.xml tomcat/tc7.0.x/trunk/webapps/docs/jndi-resources-howto.xml Modified: tomcat/tc7.0.x/trunk/webapps/docs/default-servlet.xml URL: http://svn.apache.org/viewvc/tomcat/tc7.0.x/trunk/webapps/docs/default-servlet.xml?rev=1200133r1=1200132r2=1200133view=diff == --- tomcat/tc7.0.x/trunk/webapps/docs/default-servlet.xml (original) +++ tomcat/tc7.0.x/trunk/webapps/docs/default-servlet.xml Thu Nov 10 04:13:59 2011 @@ -175,8 +175,8 @@ The DefaultServlet allows the following tr th valign='top'sendfileSize/th td valign='top' -If the connector used supports sendfile, this represents the minimal -file size in KB for which sendfile will be used. Use a negative value +If the connector used supports sendfile, this represents the minimal +file size in KB for which sendfile will be used. Use a negative value to always disable sendfile. [48] /td /tr Modified: tomcat/tc7.0.x/trunk/webapps/docs/deployer-howto.xml URL: http://svn.apache.org/viewvc/tomcat/tc7.0.x/trunk/webapps/docs/deployer-howto.xml?rev=1200133r1=1200132r2=1200133view=diff == --- tomcat/tc7.0.x/trunk/webapps/docs/deployer-howto.xml (original) +++ tomcat/tc7.0.x/trunk/webapps/docs/deployer-howto.xml Thu Nov 10 04:13:59 2011 @@ -36,8 +36,8 @@ section name=Introduction p Deployment is the term used for the process of installing a web -application (either a 3rd party WAR or your own custom web application) -into the Tomcat server. +application (either a 3rd party WAR or your own custom web application) +into the Tomcat server. /p p Web application deployment may be accomplished in a number of ways @@ -45,7 +45,7 @@ ul liStatically; the web application is setup before Tomcat is started/li li -Dynamically; in conjunction with the Tomcat Manager web application or +Dynamically; in conjunction with the Tomcat Manager web application or manipulating already deployed web applications /li /ul @@ -58,20 +58,20 @@ web application resource (WAR) files. /p /section - + section name=Installation p There is no installation required for static deployment of web applications as this is provided out of the box by Tomcat. Nor is any -installation required for deployment functions with the Tomcat Manager, -although some configuration is required as detailed in the +installation required for deployment functions with the Tomcat Manager, +although some configuration is required as detailed in the Tomcat Manager manual. An installation is however required if you wish -to use the Tomcat Client Deployer (TCD). -/p +to use the Tomcat Client Deployer (TCD). +/p p -The TCD is not packaged with the Tomcat core -distribution, and must therefore be downloaded separately from -the Downloads area. The download is usually labelled +The TCD is not packaged with the Tomcat core +distribution, and must therefore be downloaded separately from +the Downloads area. The download is usually labelled iapache-tomcat-7.0.x-deployer/i. /p p @@ -92,25 +92,25 @@ Tomcat Client Deployer/a/li /ol /section - + section name=A word on Contexts p In talking about deployment of web applications, the concept of a -iContext/i is required to be understood. A Context is what Tomcat +iContext/i is required to be understood. A Context is what Tomcat calls a web application. /p p In order to configure a Context within Tomcat a iContext Descriptor/i is required. A Context Descriptor is simply an XML file that contains -Tomcat related configuration for a Context, e.g naming resources or +
svn commit: r1200134 - in /tomcat/tc7.0.x/trunk/webapps/docs: logging.xml manager-howto.xml maven-jars.xml mbeans-descriptor-howto.xml monitoring.xml proxy-howto.xml realm-howto.xml
Author: kkolinko Date: Thu Nov 10 04:15:34 2011 New Revision: 1200134 URL: http://svn.apache.org/viewvc?rev=1200134view=rev Log: Merging r1187809 - Trailing whitespace removal from /webapps /webapps/docs, 8 Modified: tomcat/tc7.0.x/trunk/webapps/docs/logging.xml tomcat/tc7.0.x/trunk/webapps/docs/manager-howto.xml tomcat/tc7.0.x/trunk/webapps/docs/maven-jars.xml tomcat/tc7.0.x/trunk/webapps/docs/mbeans-descriptor-howto.xml tomcat/tc7.0.x/trunk/webapps/docs/monitoring.xml tomcat/tc7.0.x/trunk/webapps/docs/proxy-howto.xml tomcat/tc7.0.x/trunk/webapps/docs/realm-howto.xml Modified: tomcat/tc7.0.x/trunk/webapps/docs/logging.xml URL: http://svn.apache.org/viewvc/tomcat/tc7.0.x/trunk/webapps/docs/logging.xml?rev=1200134r1=1200133r2=1200134view=diff == --- tomcat/tc7.0.x/trunk/webapps/docs/logging.xml (original) +++ tomcat/tc7.0.x/trunk/webapps/docs/logging.xml Thu Nov 10 04:15:34 2011 @@ -343,7 +343,7 @@ org.apache.catalina.core.ContainerBase.[ #org.apache.catalina.util.LifecycleBase.level = FINE /source /p - + p Example logging.properties for the servlet-examples web application to be placed in WEB-INF/classes inside the web application: @@ -420,7 +420,7 @@ java.util.logging.ConsoleHandler.formatt /p ol -liCreate a file called codelog4j.properties/code with the +liCreate a file called codelog4j.properties/code with the following content and save it into code$CATALINA_BASE/lib/code/li /ol source @@ -473,7 +473,7 @@ log4j.logger.org.apache.catalina.core.Co INFO, HOST-MANAGER /source ol start=2 -lia href=http://logging.apache.org/log4j;Download Log4J/a +lia href=http://logging.apache.org/log4j;Download Log4J/a (v1.2 or later)./li lipDownload or build codetomcat-juli.jar/code and @@ -529,10 +529,10 @@ log4j.logger.org.apache.catalina.core.Co /p p - You can (and should) be more picky about which packages to include + You can (and should) be more picky about which packages to include in the logging. Tomcat defines loggers by Engine and Host names. For example, for a more detailed Catalina localhost log, add this to the - end of the log4j.properties above. Note that there are known issues with + end of the log4j.properties above. Note that there are known issues with using this naming convention (with square brackets) in log4j XML based configuration files, so we recommend you use a properties file as described until a future version of log4j allows this convention. @@ -550,12 +550,12 @@ log4j.logger.org.apache.catalina.session /p p - Your web applications should certainly use their own log4j configuration. + Your web applications should certainly use their own log4j configuration. This is valid iwith/i the above configuration. You would place a similar log4j.properties file in your web application's WEB-INF/classes directory, and log4jx.y.z.jar into WEB-INF/lib. Then specify your package level logging. This is a basic setup of log4j which does *not* require - Commons-Logging, and you should consult the + Commons-Logging, and you should consult the a href=http://logging.apache.org/log4j/docs/documentation.html;log4j documentation/a for more options. This page is intended only as a bootstrapping guide. Modified: tomcat/tc7.0.x/trunk/webapps/docs/manager-howto.xml URL: http://svn.apache.org/viewvc/tomcat/tc7.0.x/trunk/webapps/docs/manager-howto.xml?rev=1200134r1=1200133r2=1200134view=diff == --- tomcat/tc7.0.x/trunk/webapps/docs/manager-howto.xml (original) +++ tomcat/tc7.0.x/trunk/webapps/docs/manager-howto.xml Thu Nov 10 04:15:34 2011 @@ -172,7 +172,7 @@ an example of restricting access to the pThe HTML interface is protected against CSRF but the text and JMX interfaces are not. To maintain the CSRF protection:/p - + ul liusers with the codemanager-gui/code role should not be granted either the codemanager-script/code or codemanager-jmx/code roles./li @@ -258,8 +258,8 @@ name or the war file name without the .w application can later be undeployed (and the corresponding application directory removed) by use of the code/undeploy/code command./p -pThe .WAR file may include Tomcat specific deployment configuration, by -including a Context configuration XML file in +pThe .WAR file may include Tomcat specific deployment configuration, by +including a Context configuration XML file in code/META-INF/context.xml/code./p pURL parameters include:/p @@ -759,13 +759,13 @@ error message. Possible causes for prob http://localhost:8080/manager/text/undeploy?path=/examples /source -pstrongfont color=redWARNING/font - This command will delete
svn commit: r1200135 - in /tomcat/tc7.0.x/trunk/webapps/docs: security-howto.xml security-manager-howto.xml setup.xml ssi-howto.xml ssl-howto.xml virtual-hosting-howto.xml windows-auth-howto.xml windo
Author: kkolinko Date: Thu Nov 10 04:16:47 2011 New Revision: 1200135 URL: http://svn.apache.org/viewvc?rev=1200135view=rev Log: Merging r1187809 - Trailing whitespace removal from /webapps /webapps/docs, 9 Modified: tomcat/tc7.0.x/trunk/webapps/docs/security-howto.xml tomcat/tc7.0.x/trunk/webapps/docs/security-manager-howto.xml tomcat/tc7.0.x/trunk/webapps/docs/setup.xml tomcat/tc7.0.x/trunk/webapps/docs/ssi-howto.xml tomcat/tc7.0.x/trunk/webapps/docs/ssl-howto.xml tomcat/tc7.0.x/trunk/webapps/docs/virtual-hosting-howto.xml tomcat/tc7.0.x/trunk/webapps/docs/windows-auth-howto.xml tomcat/tc7.0.x/trunk/webapps/docs/windows-service-howto.xml Modified: tomcat/tc7.0.x/trunk/webapps/docs/security-howto.xml URL: http://svn.apache.org/viewvc/tomcat/tc7.0.x/trunk/webapps/docs/security-howto.xml?rev=1200135r1=1200134r2=1200135view=diff == --- tomcat/tc7.0.x/trunk/webapps/docs/security-howto.xml (original) +++ tomcat/tc7.0.x/trunk/webapps/docs/security-howto.xml Thu Nov 10 04:16:47 2011 @@ -40,7 +40,7 @@ expected impact of changing those options. The intention is to provide a list of configuration options that should be considered when assessing the security of a Tomcat installation./p - + pstrongNote/strong: Reading this page is not a substitute for reading and understanding the detailed configuration documentation. Fuller descriptions of these attributes may be found in the relevant documentation @@ -70,14 +70,14 @@ and outgoing connections to only those connections you expect to be present./p /section - + section name=Default web applications pTomcat ships with a number of web applications by default. Vulnerabilities have been discovered in these applications in the past. Applications that are not required should be removed so the system will not be at risk if another vulnerability is discovered./p /section - + section name=Security manager pEnabling the security manager causes web applications to be run in a sandbox, significantly limiting a web application's ability to perform @@ -97,12 +97,12 @@ application is deployed to a separate Tomcat instance (and ideally separate hosts) to reduce the ability of a malicious web application impacting the availability of other applications./p - + pTomcat is tested with the security manager enabled; but the majority of Tomcat users do not run with a security manager, so Tomcat is not as well user-tested in this configuration. There have been, and continue to be, bugs reported that are triggered by running under a security manager./p - + pThe restrictions imposed by a security manager are likely to break most applications if the security manager is enabled. The security manager should not be used without extensive testing. Ideally, the use of a security @@ -120,47 +120,47 @@ pIf a component type is not listed, then there are no settings for that type that directly impact security./p /subsection - + subsection name=Server pSetting the strongport/strong attribute to code-1/code disables the shutdown port./p pIf the shutdown port is not disabled, a strong password should be configured for strongshutdown/strong./p /subsection - + subsection name=Listeners pThe APR Lifecycle Listener is not stable if compiled on Solaris using gcc. If using the APR/native connector on Solaris, compile it with the Sun Studio compiler./p - - pThe Security Listener should be enabled and configured as appropriate. + + pThe Security Listener should be enabled and configured as appropriate. /p /subsection - + subsection name=Connectors pBy default, an HTTP and an AJP connector are configured. Connectors that will not be used should be removed from server.xml./p - + pThe strongaddress/strong attribute may be used to control which IP address the connector listens on for connections. By default, the connector listens on all configured IP addresses./p - + pThe strongallowTrace/strong attribute may be used to enable TRACE requests which can be useful for debugging. Due to the way some browsers handle the response from a TRACE request (which exposes the browser to an XSS attack), support for TRACE requests is disabled by default./p - + pThe strongmaxPostSize/strong attribute controls the maximum size of a POST request that will be parsed for parameters. The parameters are cached for the duration of the request so this is limited to 2MB by default to reduce exposure to a DOS attack./p - + pThe strongmaxSavePostSize/strong attribute controls the saving of POST requests during FORM and CLIENT-CERT
svn commit: r1200139 - in /tomcat/tc7.0.x/trunk: ./ webapps/docs/index.xml webapps/docs/project.xml webapps/docs/tomcat-docs.xsl
Author: kkolinko Date: Thu Nov 10 04:19:11 2011 New Revision: 1200139 URL: http://svn.apache.org/viewvc?rev=1200139view=rev Log: Merging r1187809 - Trailing whitespace removal from /webapps Last remaining files. Updated mergeinfo. Modified: tomcat/tc7.0.x/trunk/ (props changed) tomcat/tc7.0.x/trunk/webapps/docs/index.xml tomcat/tc7.0.x/trunk/webapps/docs/project.xml tomcat/tc7.0.x/trunk/webapps/docs/tomcat-docs.xsl Propchange: tomcat/tc7.0.x/trunk/ -- --- svn:mergeinfo (original) +++ svn:mergeinfo Thu Nov 10 04:19:11 2011 @@ -1 +1 @@ -/tomcat/trunk:1156115,1156171,1156276,1156304,1156519,1156530,1156602,1157015,1157018,1157151,1157198,1157204,1157810,1157832,1157834,1157847,1157908,1157939,1158155,1158160,1158176,1158195,1158198-1158199,1158227,1158331,1158334-1158335,1158426,1160347,1160592,1160611,1160619,1160626,1160639,1160652,1160720-1160721,1160772,1160774,1160776,1161303,1161310,1161322,1161339,1161486,1161540,1161549,1161584,1162082,1162149,1162169,1162721,1162769,1162836,1162932,1163630,1164419,1164438,1164469,1164480,1164567,1165234,1165247-1165248,1165253,1165273,1165282,1165309,1165331,1165338,1165347,1165360-1165361,1165367-1165368,1165602,1165608,1165677,1165693,1165721,1165723,1165728,1165730,1165738,1165746,1165765,1165777,1165918,1165921,1166077,1166150-1166151,1166290,1166366,1166620,1166686,1166693,1166752,1166757,1167368,1167394,1169447,1170647,1171692,1172233-1172234,1172236,1172269,1172278,1172282,1172556,1172610,1172664,1172689,1172711,1173020-1173021,1173082,1173088,1173090,1173096 ,1173241,1173256,1173288,117,1173342,1173461,1173614,1173630,1173659,1173722,1174061,1174239,1174322,1174325,1174329-1174330,1174337-1174339,1174343,1174353,1174799,1174882,1174884,1174983,1175155,1175158,1175167,1175182,1175190,1175201,1175272,1175275,1175283,1175582,1175589-1175590,1175594,1175602,1175613,1175633,1175690,1175713,1175798,1175889,1175896,1175907,1176584,1176590,1176799,1177050,1177060,1177125,1177152,1177160,1177245,1177850,1177862,1177978,1178209,1178228,1178233,1178449,1178542,1178681,1178684,1178721,1179268,1179274,1180261,1180865,1180891,1180894,1180907,1181028,1181123,1181125,1181136,1181291,1181743,1182796,1183078,1183105,1183142,1183328,1183339-1183340,1183492-1183494,1183605,1184917,1184919,1185018,1185020,1185200,1185588,1185626,1185756,1185758,1186011,1186042-1186045,1186104,1186123,1186137,1186153,1186254,1186257,1186377-1186379,1186479-1186480,1186712,1186743,1186750,1186763,1186890-1186892,1186894,1186949,1187018,1187027-1187028,1187381,1187 755,1187775,1187806,1187827,1188301,1188303-1188305,1188399,1188822,1188930-1188931,1189116,1189129,1189183,1189240,1189256,1189386,1189413-1189414,1189477,1189685,1189805,1189857,1189864,1189882,1190034,1190185,1190279,1190339,1190371,1190388-1190389,1190474,1190481,1194915,1195222-1195223,1195531,1195899,1195905,1195943,1195949,1195953,1195955,1195965,1195968,1196175,1196212,1196223,1196304-1196305,1196735,1196825,1196827,1197158,1197261,1197263,1197299-1197300,1197305,1197339-1197340,1197343,1197382,1197386-1197387,1197480,1197578,1198497,1198528,1198552,1198602,1198604,1198607,1198622,1198640,1199418,1199432,1199436,1199513,1199529,116 +/tomcat/trunk:1156115,1156171,1156276,1156304,1156519,1156530,1156602,1157015,1157018,1157151,1157198,1157204,1157810,1157832,1157834,1157847,1157908,1157939,1158155,1158160,1158176,1158195,1158198-1158199,1158227,1158331,1158334-1158335,1158426,1160347,1160592,1160611,1160619,1160626,1160639,1160652,1160720-1160721,1160772,1160774,1160776,1161303,1161310,1161322,1161339,1161486,1161540,1161549,1161584,1162082,1162149,1162169,1162721,1162769,1162836,1162932,1163630,1164419,1164438,1164469,1164480,1164567,1165234,1165247-1165248,1165253,1165273,1165282,1165309,1165331,1165338,1165347,1165360-1165361,1165367-1165368,1165602,1165608,1165677,1165693,1165721,1165723,1165728,1165730,1165738,1165746,1165765,1165777,1165918,1165921,1166077,1166150-1166151,1166290,1166366,1166620,1166686,1166693,1166752,1166757,1167368,1167394,1169447,1170647,1171692,1172233-1172234,1172236,1172269,1172278,1172282,1172556,1172610,1172664,1172689,1172711,1173020-1173021,1173082,1173088,1173090,1173096
svn commit: r1200143 - in /tomcat/tc7.0.x/trunk: ./ webapps/docs/config/filter.xml
Author: kkolinko Date: Thu Nov 10 04:22:15 2011 New Revision: 1200143 URL: http://svn.apache.org/viewvc?rev=1200143view=rev Log: Merged revision 1200106 from tomcat/trunk: Reformat and rearrange code samples to reduce the width of the document, for better readability. Modified: tomcat/tc7.0.x/trunk/ (props changed) tomcat/tc7.0.x/trunk/webapps/docs/config/filter.xml Propchange: tomcat/tc7.0.x/trunk/ -- --- svn:mergeinfo (original) +++ svn:mergeinfo Thu Nov 10 04:22:15 2011 @@ -1 +1 @@ -/tomcat/trunk:1156115,1156171,1156276,1156304,1156519,1156530,1156602,1157015,1157018,1157151,1157198,1157204,1157810,1157832,1157834,1157847,1157908,1157939,1158155,1158160,1158176,1158195,1158198-1158199,1158227,1158331,1158334-1158335,1158426,1160347,1160592,1160611,1160619,1160626,1160639,1160652,1160720-1160721,1160772,1160774,1160776,1161303,1161310,1161322,1161339,1161486,1161540,1161549,1161584,1162082,1162149,1162169,1162721,1162769,1162836,1162932,1163630,1164419,1164438,1164469,1164480,1164567,1165234,1165247-1165248,1165253,1165273,1165282,1165309,1165331,1165338,1165347,1165360-1165361,1165367-1165368,1165602,1165608,1165677,1165693,1165721,1165723,1165728,1165730,1165738,1165746,1165765,1165777,1165918,1165921,1166077,1166150-1166151,1166290,1166366,1166620,1166686,1166693,1166752,1166757,1167368,1167394,1169447,1170647,1171692,1172233-1172234,1172236,1172269,1172278,1172282,1172556,1172610,1172664,1172689,1172711,1173020-1173021,1173082,1173088,1173090,1173096 ,1173241,1173256,1173288,117,1173342,1173461,1173614,1173630,1173659,1173722,1174061,1174239,1174322,1174325,1174329-1174330,1174337-1174339,1174343,1174353,1174799,1174882,1174884,1174983,1175155,1175158,1175167,1175182,1175190,1175201,1175272,1175275,1175283,1175582,1175589-1175590,1175594,1175602,1175613,1175633,1175690,1175713,1175798,1175889,1175896,1175907,1176584,1176590,1176799,1177050,1177060,1177125,1177152,1177160,1177245,1177850,1177862,1177978,1178209,1178228,1178233,1178449,1178542,1178681,1178684,1178721,1179268,1179274,1180261,1180865,1180891,1180894,1180907,1181028,1181123,1181125,1181136,1181291,1181743,1182796,1183078,1183105,1183142,1183328,1183339-1183340,1183492-1183494,1183605,1184917,1184919,1185018,1185020,1185200,1185588,1185626,1185756,1185758,1186011,1186042-1186045,1186104,1186123,1186137,1186153,1186254,1186257,1186377-1186379,1186479-1186480,1186712,1186743,1186750,1186763,1186890-1186892,1186894,1186949,1187018,1187027-1187028,1187381,1187 755,1187775,1187806,1187809,1187827,1188301,1188303-1188305,1188399,1188822,1188930-1188931,1189116,1189129,1189183,1189240,1189256,1189386,1189413-1189414,1189477,1189685,1189805,1189857,1189864,1189882,1190034,1190185,1190279,1190339,1190371,1190388-1190389,1190474,1190481,1194915,1195222-1195223,1195531,1195899,1195905,1195943,1195949,1195953,1195955,1195965,1195968,1196175,1196212,1196223,1196304-1196305,1196735,1196825,1196827,1197158,1197261,1197263,1197299-1197300,1197305,1197339-1197340,1197343,1197382,1197386-1197387,1197480,1197578,1198497,1198528,1198552,1198602,1198604,1198607,1198622,1198640,1199418,1199432,1199436,1199513,1199529,116 +/tomcat/trunk:1156115,1156171,1156276,1156304,1156519,1156530,1156602,1157015,1157018,1157151,1157198,1157204,1157810,1157832,1157834,1157847,1157908,1157939,1158155,1158160,1158176,1158195,1158198-1158199,1158227,1158331,1158334-1158335,1158426,1160347,1160592,1160611,1160619,1160626,1160639,1160652,1160720-1160721,1160772,1160774,1160776,1161303,1161310,1161322,1161339,1161486,1161540,1161549,1161584,1162082,1162149,1162169,1162721,1162769,1162836,1162932,1163630,1164419,1164438,1164469,1164480,1164567,1165234,1165247-1165248,1165253,1165273,1165282,1165309,1165331,1165338,1165347,1165360-1165361,1165367-1165368,1165602,1165608,1165677,1165693,1165721,1165723,1165728,1165730,1165738,1165746,1165765,1165777,1165918,1165921,1166077,1166150-1166151,1166290,1166366,1166620,1166686,1166693,1166752,1166757,1167368,1167394,1169447,1170647,1171692,1172233-1172234,1172236,1172269,1172278,1172282,1172556,1172610,1172664,1172689,1172711,1173020-1173021,1173082,1173088,1173090,1173096
svn commit: r1200155 - /tomcat/tc7.0.x/trunk/
Author: kkolinko Date: Thu Nov 10 05:19:48 2011 New Revision: 1200155 URL: http://svn.apache.org/viewvc?rev=1200155view=rev Log: Followup to schultz's r1199985: Update mergeinfo marking r1199980 as merged Modified: tomcat/tc7.0.x/trunk/ (props changed) Propchange: tomcat/tc7.0.x/trunk/ -- --- svn:mergeinfo (original) +++ svn:mergeinfo Thu Nov 10 05:19:48 2011 @@ -1 +1 @@ -/tomcat/trunk:1156115,1156171,1156276,1156304,1156519,1156530,1156602,1157015,1157018,1157151,1157198,1157204,1157810,1157832,1157834,1157847,1157908,1157939,1158155,1158160,1158176,1158195,1158198-1158199,1158227,1158331,1158334-1158335,1158426,1160347,1160592,1160611,1160619,1160626,1160639,1160652,1160720-1160721,1160772,1160774,1160776,1161303,1161310,1161322,1161339,1161486,1161540,1161549,1161584,1162082,1162149,1162169,1162721,1162769,1162836,1162932,1163630,1164419,1164438,1164469,1164480,1164567,1165234,1165247-1165248,1165253,1165273,1165282,1165309,1165331,1165338,1165347,1165360-1165361,1165367-1165368,1165602,1165608,1165677,1165693,1165721,1165723,1165728,1165730,1165738,1165746,1165765,1165777,1165918,1165921,1166077,1166150-1166151,1166290,1166366,1166620,1166686,1166693,1166752,1166757,1167368,1167394,1169447,1170647,1171692,1172233-1172234,1172236,1172269,1172278,1172282,1172556,1172610,1172664,1172689,1172711,1173020-1173021,1173082,1173088,1173090,1173096 ,1173241,1173256,1173288,117,1173342,1173461,1173614,1173630,1173659,1173722,1174061,1174239,1174322,1174325,1174329-1174330,1174337-1174339,1174343,1174353,1174799,1174882,1174884,1174983,1175155,1175158,1175167,1175182,1175190,1175201,1175272,1175275,1175283,1175582,1175589-1175590,1175594,1175602,1175613,1175633,1175690,1175713,1175798,1175889,1175896,1175907,1176584,1176590,1176799,1177050,1177060,1177125,1177152,1177160,1177245,1177850,1177862,1177978,1178209,1178228,1178233,1178449,1178542,1178681,1178684,1178721,1179268,1179274,1180261,1180865,1180891,1180894,1180907,1181028,1181123,1181125,1181136,1181291,1181743,1182796,1183078,1183105,1183142,1183328,1183339-1183340,1183492-1183494,1183605,1184917,1184919,1185018,1185020,1185200,1185588,1185626,1185756,1185758,1186011,1186042-1186045,1186104,1186123,1186137,1186153,1186254,1186257,1186377-1186379,1186479-1186480,1186712,1186743,1186750,1186763,1186890-1186892,1186894,1186949,1187018,1187027-1187028,1187381,1187 755,1187775,1187806,1187809,1187827,1188301,1188303-1188305,1188399,1188822,1188930-1188931,1189116,1189129,1189183,1189240,1189256,1189386,1189413-1189414,1189477,1189685,1189805,1189857,1189864,1189882,1190034,1190185,1190279,1190339,1190371,1190388-1190389,1190474,1190481,1194915,1195222-1195223,1195531,1195899,1195905,1195943,1195949,1195953,1195955,1195965,1195968,1196175,1196212,1196223,1196304-1196305,1196735,1196825,1196827,1197158,1197261,1197263,1197299-1197300,1197305,1197339-1197340,1197343,1197382,1197386-1197387,1197480,1197578,1198497,1198528,1198552,1198602,1198604,1198607,1198622,1198640,1199418,1199432,1199436,1199513,1199529,116,1200106 +/tomcat/trunk:1156115,1156171,1156276,1156304,1156519,1156530,1156602,1157015,1157018,1157151,1157198,1157204,1157810,1157832,1157834,1157847,1157908,1157939,1158155,1158160,1158176,1158195,1158198-1158199,1158227,1158331,1158334-1158335,1158426,1160347,1160592,1160611,1160619,1160626,1160639,1160652,1160720-1160721,1160772,1160774,1160776,1161303,1161310,1161322,1161339,1161486,1161540,1161549,1161584,1162082,1162149,1162169,1162721,1162769,1162836,1162932,1163630,1164419,1164438,1164469,1164480,1164567,1165234,1165247-1165248,1165253,1165273,1165282,1165309,1165331,1165338,1165347,1165360-1165361,1165367-1165368,1165602,1165608,1165677,1165693,1165721,1165723,1165728,1165730,1165738,1165746,1165765,1165777,1165918,1165921,1166077,1166150-1166151,1166290,1166366,1166620,1166686,1166693,1166752,1166757,1167368,1167394,1169447,1170647,1171692,1172233-1172234,1172236,1172269,1172278,1172282,1172556,1172610,1172664,1172689,1172711,1173020-1173021,1173082,1173088,1173090,1173096
svn commit: r1200156 - in /tomcat/tc7.0.x/trunk/java/org/apache/catalina: AccessLog.java Authenticator.java CatalinaFactory.java Cluster.java
Author: kkolinko
Date: Thu Nov 10 05:30:28 2011
New Revision: 1200156
URL: http://svn.apache.org/viewvc?rev=1200156view=rev
Log:
Merging revision 1187801 from tomcat/trunk:
Whitespace removal from remaining /java/org/apache/catalina
Part 1 of n
Modified:
tomcat/tc7.0.x/trunk/java/org/apache/catalina/AccessLog.java
tomcat/tc7.0.x/trunk/java/org/apache/catalina/Authenticator.java
tomcat/tc7.0.x/trunk/java/org/apache/catalina/CatalinaFactory.java
tomcat/tc7.0.x/trunk/java/org/apache/catalina/Cluster.java
Modified: tomcat/tc7.0.x/trunk/java/org/apache/catalina/AccessLog.java
URL:
http://svn.apache.org/viewvc/tomcat/tc7.0.x/trunk/java/org/apache/catalina/AccessLog.java?rev=1200156r1=1200155r2=1200156view=diff
==
--- tomcat/tc7.0.x/trunk/java/org/apache/catalina/AccessLog.java (original)
+++ tomcat/tc7.0.x/trunk/java/org/apache/catalina/AccessLog.java Thu Nov 10
05:30:28 2011
@@ -5,9 +5,9 @@
* 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.
@@ -60,26 +60,26 @@ public interface AccessLog {
*/
public static final String SERVER_PORT_ATTRIBUTE =
org.apache.catalina.AccessLog.ServerPort;
-
+
/**
* Add the request/response to the access log using the specified
processing
* time.
- *
+ *
* @param request Request (associated with the response) to log
* @param response Response (associated with the request) to log
* @param time Time taken to process the request/response in
- * milliseconds (use 0 if not known)
+ * milliseconds (use 0 if not known)
*/
public void log(Request request, Response response, long time);
-
+
/**
* Should this valve set request attributes for IP address, Hostname,
* protocol and port used for the request? This are typically used in
* conjunction with the {@link org.apache.catalina.valves.AccessLogValve}
* which will otherwise log the original values.
* Default is codetrue/code.
- *
+ *
* The attributes set are:
* ul
* liorg.apache.catalina.RemoteAddr/li
@@ -87,13 +87,13 @@ public interface AccessLog {
* liorg.apache.catalina.Protocol/li
* liorg.apache.catalina.ServerPost/li
* /ul
- *
+ *
* @param requestAttributesEnabled codetrue/code causes the attributes
* to be set, codefalse/code disables
- * the setting of the attributes.
+ * the setting of the attributes.
*/
public void setRequestAttributesEnabled(boolean requestAttributesEnabled);
-
+
/**
* @see #setRequestAttributesEnabled(boolean)
* @return codetrue/code if the attributes will be logged, otherwise
Modified: tomcat/tc7.0.x/trunk/java/org/apache/catalina/Authenticator.java
URL:
http://svn.apache.org/viewvc/tomcat/tc7.0.x/trunk/java/org/apache/catalina/Authenticator.java?rev=1200156r1=1200155r2=1200156view=diff
==
--- tomcat/tc7.0.x/trunk/java/org/apache/catalina/Authenticator.java (original)
+++ tomcat/tc7.0.x/trunk/java/org/apache/catalina/Authenticator.java Thu Nov 10
05:30:28 2011
@@ -5,9 +5,9 @@
* 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.
@@ -36,7 +36,7 @@ import org.apache.catalina.deploy.LoginC
*/
public interface Authenticator {
-
+
/**
* Authenticate the user making this request, based on the specified
* login configuration. Return codetrue/code if any specified
@@ -52,7 +52,7 @@ public interface Authenticator {
*/
public boolean authenticate(Request request, HttpServletResponse response,
LoginConfig config) throws IOException;
-
+
public void login(String userName, String password, Request request)
throws ServletException;
Modified: tomcat/tc7.0.x/trunk/java/org/apache/catalina/CatalinaFactory.java
URL:
svn commit: r1200157 - in /tomcat/tc7.0.x/trunk/java/org/apache/catalina: comet/CometEvent.java comet/CometFilter.java comet/CometFilterChain.java comet/CometProcessor.java connector/mbeans-descriptor
Author: kkolinko
Date: Thu Nov 10 05:31:27 2011
New Revision: 1200157
URL: http://svn.apache.org/viewvc?rev=1200157view=rev
Log:
Merging revision 1187801 from tomcat/trunk:
Whitespace removal from remaining /java/org/apache/catalina
Part 2
Modified:
tomcat/tc7.0.x/trunk/java/org/apache/catalina/comet/CometEvent.java
tomcat/tc7.0.x/trunk/java/org/apache/catalina/comet/CometFilter.java
tomcat/tc7.0.x/trunk/java/org/apache/catalina/comet/CometFilterChain.java
tomcat/tc7.0.x/trunk/java/org/apache/catalina/comet/CometProcessor.java
tomcat/tc7.0.x/trunk/java/org/apache/catalina/connector/mbeans-descriptors.xml
Modified: tomcat/tc7.0.x/trunk/java/org/apache/catalina/comet/CometEvent.java
URL:
http://svn.apache.org/viewvc/tomcat/tc7.0.x/trunk/java/org/apache/catalina/comet/CometEvent.java?rev=1200157r1=1200156r2=1200157view=diff
==
--- tomcat/tc7.0.x/trunk/java/org/apache/catalina/comet/CometEvent.java
(original)
+++ tomcat/tc7.0.x/trunk/java/org/apache/catalina/comet/CometEvent.java Thu Nov
10 05:31:27 2011
@@ -5,9 +5,9 @@
* 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.
@@ -26,39 +26,39 @@ import javax.servlet.http.HttpServletRes
/**
* The CometEvent interface.
- *
+ *
* @author Filip Hanik
* @author Remy Maucherat
*/
public interface CometEvent {
/**
- * Enumeration describing the major events that the container can invoke
+ * Enumeration describing the major events that the container can invoke
* the CometProcessors event() method with.br
- * BEGIN - will be called at the beginning
- * of the processing of the connection. It can be used to initialize any
relevant
- * fields using the request and response objects. Between the end of the
processing
+ * BEGIN - will be called at the beginning
+ * of the processing of the connection. It can be used to initialize any
relevant
+ * fields using the request and response objects. Between the end of the
processing
* of this event, and the beginning of the processing of the end or error
events,
* it is possible to use the response object to write data on the open
connection.
- * Note that the response object and dependent OutputStream and Writer
are still
- * not synchronized, so when they are accessed by multiple threads,
- * synchronization is mandatory. After processing the initial event, the
request
+ * Note that the response object and dependent OutputStream and Writer
are still
+ * not synchronized, so when they are accessed by multiple threads,
+ * synchronization is mandatory. After processing the initial event, the
request
* is considered to be committed.br
* READ - This indicates that input data is available, and that one read
can be made
* without blocking. The available and ready methods of the InputStream or
* Reader may be used to determine if there is a risk of blocking: the
servlet
- * should read while data is reported available. When encountering a read
error,
- * the servlet should report it by propagating the exception properly.
Throwing
- * an exception will cause the error event to be invoked, and the
connection
- * will be closed.
+ * should read while data is reported available. When encountering a read
error,
+ * the servlet should report it by propagating the exception properly.
Throwing
+ * an exception will cause the error event to be invoked, and the
connection
+ * will be closed.
* Alternately, it is also possible to catch any exception, perform clean
up
* on any data structure the servlet may be using, and using the close
method
- * of the event. It is not allowed to attempt reading data from the
request
+ * of the event. It is not allowed to attempt reading data from the
request
* object outside of the execution of this method.br
* END - End may be called to end the processing of the request. Fields
that have
* been initialized in the begin method should be reset. After this event
has
* been processed, the request and response objects, as well as all their
dependent
- * objects will be recycled and used to process other requests. End will
also be
+ * objects will be recycled and used to process other requests. End will
also be
* called when data is available and the end of file is reached on the
request input
* (this
svn commit: r1200158 - in /tomcat/tc7.0.x/trunk/java/org/apache/catalina: Contained.java Container.java ContainerEvent.java ContainerListener.java ContainerServlet.java Context.java DistributedManager
Author: kkolinko Date: Thu Nov 10 05:32:22 2011 New Revision: 1200158 URL: http://svn.apache.org/viewvc?rev=1200158view=rev Log: Merging revision 1187801 from tomcat/trunk: Whitespace removal from remaining /java/org/apache/catalina Part 3 Modified: tomcat/tc7.0.x/trunk/java/org/apache/catalina/Contained.java tomcat/tc7.0.x/trunk/java/org/apache/catalina/Container.java tomcat/tc7.0.x/trunk/java/org/apache/catalina/ContainerEvent.java tomcat/tc7.0.x/trunk/java/org/apache/catalina/ContainerListener.java tomcat/tc7.0.x/trunk/java/org/apache/catalina/ContainerServlet.java tomcat/tc7.0.x/trunk/java/org/apache/catalina/Context.java tomcat/tc7.0.x/trunk/java/org/apache/catalina/DistributedManager.java Modified: tomcat/tc7.0.x/trunk/java/org/apache/catalina/Contained.java URL: http://svn.apache.org/viewvc/tomcat/tc7.0.x/trunk/java/org/apache/catalina/Contained.java?rev=1200158r1=1200157r2=1200158view=diff == --- tomcat/tc7.0.x/trunk/java/org/apache/catalina/Contained.java (original) +++ tomcat/tc7.0.x/trunk/java/org/apache/catalina/Contained.java Thu Nov 10 05:32:22 2011 @@ -5,9 +5,9 @@ * 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. Modified: tomcat/tc7.0.x/trunk/java/org/apache/catalina/Container.java URL: http://svn.apache.org/viewvc/tomcat/tc7.0.x/trunk/java/org/apache/catalina/Container.java?rev=1200158r1=1200157r2=1200158view=diff == --- tomcat/tc7.0.x/trunk/java/org/apache/catalina/Container.java (original) +++ tomcat/tc7.0.x/trunk/java/org/apache/catalina/Container.java Thu Nov 10 05:32:22 2011 @@ -5,9 +5,9 @@ * 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. @@ -188,11 +188,11 @@ public interface Container extends Lifec @Deprecated public Object getMappingObject(); - + /** * Return the JMX name associated with this container. */ -public ObjectName getObjectName(); +public ObjectName getObjectName(); /** * Return the Pipeline object that manages the Valves associated with @@ -220,10 +220,10 @@ public interface Container extends Lifec /** * Get the delay between the invocation of the backgroundProcess method on * this container and its children. Child containers will not be invoked - * if their delay value is not negative (which would mean they are using - * their own thread). Setting this to a positive value will cause - * a thread to be spawn. After waiting the specified amount of time, - * the thread will invoke the executePeriodic method on this container + * if their delay value is not negative (which would mean they are using + * their own thread). Setting this to a positive value will cause + * a thread to be spawn. After waiting the specified amount of time, + * the thread will invoke the executePeriodic method on this container * and all its children. */ public int getBackgroundProcessorDelay(); @@ -232,8 +232,8 @@ public interface Container extends Lifec /** * Set the delay between the invocation of the execute method on this * container and its children. - * - * @param delay The delay in seconds between the invocation of + * + * @param delay The delay in seconds between the invocation of * backgroundProcess methods */ public void setBackgroundProcessorDelay(int delay); @@ -454,8 +454,8 @@ public interface Container extends Lifec * @param data Event data */ public void fireContainerEvent(String type, Object data); - - + + /** * Log a request/response that was destined for this container but has been * handled earlier in the processing chain so that the request/response @@ -463,14 +463,14 @@ public interface Container extends Lifec * @param request Request (associated with the response) to log * @param response Response (associated with the request) to log * @param time Time
svn commit: r1200159 - in /tomcat/tc7.0.x/trunk/java/org/apache/catalina: Engine.java Executor.java Globals.java Group.java Host.java InstanceEvent.java InstanceListener.java Lifecycle.java
Author: kkolinko
Date: Thu Nov 10 05:33:31 2011
New Revision: 1200159
URL: http://svn.apache.org/viewvc?rev=1200159view=rev
Log:
Merging revision 1187801 from tomcat/trunk:
Whitespace removal from remaining /java/org/apache/catalina
Part 4
Modified:
tomcat/tc7.0.x/trunk/java/org/apache/catalina/Engine.java
tomcat/tc7.0.x/trunk/java/org/apache/catalina/Executor.java
tomcat/tc7.0.x/trunk/java/org/apache/catalina/Globals.java
tomcat/tc7.0.x/trunk/java/org/apache/catalina/Group.java
tomcat/tc7.0.x/trunk/java/org/apache/catalina/Host.java
tomcat/tc7.0.x/trunk/java/org/apache/catalina/InstanceEvent.java
tomcat/tc7.0.x/trunk/java/org/apache/catalina/InstanceListener.java
tomcat/tc7.0.x/trunk/java/org/apache/catalina/Lifecycle.java
Modified: tomcat/tc7.0.x/trunk/java/org/apache/catalina/Engine.java
URL:
http://svn.apache.org/viewvc/tomcat/tc7.0.x/trunk/java/org/apache/catalina/Engine.java?rev=1200159r1=1200158r2=1200159view=diff
==
--- tomcat/tc7.0.x/trunk/java/org/apache/catalina/Engine.java (original)
+++ tomcat/tc7.0.x/trunk/java/org/apache/catalina/Engine.java Thu Nov 10
05:33:31 2011
@@ -5,9 +5,9 @@
* 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.
Modified: tomcat/tc7.0.x/trunk/java/org/apache/catalina/Executor.java
URL:
http://svn.apache.org/viewvc/tomcat/tc7.0.x/trunk/java/org/apache/catalina/Executor.java?rev=1200159r1=1200158r2=1200159view=diff
==
--- tomcat/tc7.0.x/trunk/java/org/apache/catalina/Executor.java (original)
+++ tomcat/tc7.0.x/trunk/java/org/apache/catalina/Executor.java Thu Nov 10
05:33:31 2011
@@ -21,13 +21,13 @@ import java.util.concurrent.TimeUnit;
public interface Executor extends java.util.concurrent.Executor, Lifecycle {
public String getName();
-
+
/**
* Executes the given command at some time in the future. The command
* may execute in a new thread, in a pooled thread, or in the calling
* thread, at the discretion of the ttExecutor/tt implementation.
* If no threads are available, it will be added to the work queue.
- * If the work queue is full, the system will wait for the specified
+ * If the work queue is full, the system will wait for the specified
* time until it throws a RejectedExecutionException
*
* @param command the runnable task
Modified: tomcat/tc7.0.x/trunk/java/org/apache/catalina/Globals.java
URL:
http://svn.apache.org/viewvc/tomcat/tc7.0.x/trunk/java/org/apache/catalina/Globals.java?rev=1200159r1=1200158r2=1200159view=diff
==
--- tomcat/tc7.0.x/trunk/java/org/apache/catalina/Globals.java (original)
+++ tomcat/tc7.0.x/trunk/java/org/apache/catalina/Globals.java Thu Nov 10
05:33:31 2011
@@ -5,9 +5,9 @@
* 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.
@@ -30,9 +30,9 @@ public final class Globals {
/**
* The servlet context attribute under which we store the alternate
- * deployment descriptor for this web application
+ * deployment descriptor for this web application
*/
-public static final String ALT_DD_ATTR =
+public static final String ALT_DD_ATTR =
org.apache.catalina.deploy.alt_dd;
@@ -57,14 +57,14 @@ public final class Globals {
/**
* Request dispatcher state.
*/
-public static final String DISPATCHER_TYPE_ATTR =
+public static final String DISPATCHER_TYPE_ATTR =
org.apache.catalina.core.DISPATCHER_TYPE;
/**
* Request dispatcher path.
*/
-public static final String DISPATCHER_REQUEST_PATH_ATTR =
+public static final String DISPATCHER_REQUEST_PATH_ATTR =
org.apache.catalina.core.DISPATCHER_REQUEST_PATH;
@@ -156,13 +156,13 @@ public final class Globals {
public static final String SUBJECT_ATTR =
javax.security.auth.subject;
-
+
public static final String GSS_CREDENTIAL_ATTR =
svn commit: r1200160 - in /tomcat/tc7.0.x/trunk/java/org/apache/catalina: LifecycleEvent.java LifecycleException.java LifecycleListener.java LifecycleState.java Loader.java Manager.java Pipeline.java
Author: kkolinko
Date: Thu Nov 10 05:35:13 2011
New Revision: 1200160
URL: http://svn.apache.org/viewvc?rev=1200160view=rev
Log:
Merging revision 1187801 from tomcat/trunk:
Whitespace removal from remaining /java/org/apache/catalina
Part 5
Modified:
tomcat/tc7.0.x/trunk/java/org/apache/catalina/LifecycleEvent.java
tomcat/tc7.0.x/trunk/java/org/apache/catalina/LifecycleException.java
tomcat/tc7.0.x/trunk/java/org/apache/catalina/LifecycleListener.java
tomcat/tc7.0.x/trunk/java/org/apache/catalina/LifecycleState.java
tomcat/tc7.0.x/trunk/java/org/apache/catalina/Loader.java
tomcat/tc7.0.x/trunk/java/org/apache/catalina/Manager.java
tomcat/tc7.0.x/trunk/java/org/apache/catalina/Pipeline.java
tomcat/tc7.0.x/trunk/java/org/apache/catalina/Realm.java
tomcat/tc7.0.x/trunk/java/org/apache/catalina/Role.java
Modified: tomcat/tc7.0.x/trunk/java/org/apache/catalina/LifecycleEvent.java
URL:
http://svn.apache.org/viewvc/tomcat/tc7.0.x/trunk/java/org/apache/catalina/LifecycleEvent.java?rev=1200160r1=1200159r2=1200160view=diff
==
--- tomcat/tc7.0.x/trunk/java/org/apache/catalina/LifecycleEvent.java (original)
+++ tomcat/tc7.0.x/trunk/java/org/apache/catalina/LifecycleEvent.java Thu Nov
10 05:35:13 2011
@@ -5,9 +5,9 @@
* 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.
Modified: tomcat/tc7.0.x/trunk/java/org/apache/catalina/LifecycleException.java
URL:
http://svn.apache.org/viewvc/tomcat/tc7.0.x/trunk/java/org/apache/catalina/LifecycleException.java?rev=1200160r1=1200159r2=1200160view=diff
==
--- tomcat/tc7.0.x/trunk/java/org/apache/catalina/LifecycleException.java
(original)
+++ tomcat/tc7.0.x/trunk/java/org/apache/catalina/LifecycleException.java Thu
Nov 10 05:35:13 2011
@@ -5,9 +5,9 @@
* 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.
Modified: tomcat/tc7.0.x/trunk/java/org/apache/catalina/LifecycleListener.java
URL:
http://svn.apache.org/viewvc/tomcat/tc7.0.x/trunk/java/org/apache/catalina/LifecycleListener.java?rev=1200160r1=1200159r2=1200160view=diff
==
--- tomcat/tc7.0.x/trunk/java/org/apache/catalina/LifecycleListener.java
(original)
+++ tomcat/tc7.0.x/trunk/java/org/apache/catalina/LifecycleListener.java Thu
Nov 10 05:35:13 2011
@@ -5,9 +5,9 @@
* 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.
Modified: tomcat/tc7.0.x/trunk/java/org/apache/catalina/LifecycleState.java
URL:
http://svn.apache.org/viewvc/tomcat/tc7.0.x/trunk/java/org/apache/catalina/LifecycleState.java?rev=1200160r1=1200159r2=1200160view=diff
==
--- tomcat/tc7.0.x/trunk/java/org/apache/catalina/LifecycleState.java (original)
+++ tomcat/tc7.0.x/trunk/java/org/apache/catalina/LifecycleState.java Thu Nov
10 05:35:13 2011
@@ -5,9 +5,9 @@
* 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.
@@ -36,15 +36,15 @@ public enum LifecycleState {
FAILED(false, null),
MUST_STOP(true, null),
MUST_DESTROY(false, null);
-
+
private final boolean available;
svn commit: r1200161 - in /tomcat/tc7.0.x/trunk/java/org/apache/catalina/security: Constants.java SecurityClassLoad.java SecurityConfig.java SecurityListener.java SecurityUtil.java
Author: kkolinko
Date: Thu Nov 10 05:36:35 2011
New Revision: 1200161
URL: http://svn.apache.org/viewvc?rev=1200161view=rev
Log:
Merging revision 1187801 from tomcat/trunk:
Whitespace removal from remaining /java/org/apache/catalina
Part 6
Modified:
tomcat/tc7.0.x/trunk/java/org/apache/catalina/security/Constants.java
tomcat/tc7.0.x/trunk/java/org/apache/catalina/security/SecurityClassLoad.java
tomcat/tc7.0.x/trunk/java/org/apache/catalina/security/SecurityConfig.java
tomcat/tc7.0.x/trunk/java/org/apache/catalina/security/SecurityListener.java
tomcat/tc7.0.x/trunk/java/org/apache/catalina/security/SecurityUtil.java
Modified: tomcat/tc7.0.x/trunk/java/org/apache/catalina/security/Constants.java
URL:
http://svn.apache.org/viewvc/tomcat/tc7.0.x/trunk/java/org/apache/catalina/security/Constants.java?rev=1200161r1=1200160r2=1200161view=diff
==
--- tomcat/tc7.0.x/trunk/java/org/apache/catalina/security/Constants.java
(original)
+++ tomcat/tc7.0.x/trunk/java/org/apache/catalina/security/Constants.java Thu
Nov 10 05:36:35 2011
@@ -5,9 +5,9 @@
* 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.
Modified:
tomcat/tc7.0.x/trunk/java/org/apache/catalina/security/SecurityClassLoad.java
URL:
http://svn.apache.org/viewvc/tomcat/tc7.0.x/trunk/java/org/apache/catalina/security/SecurityClassLoad.java?rev=1200161r1=1200160r2=1200161view=diff
==
---
tomcat/tc7.0.x/trunk/java/org/apache/catalina/security/SecurityClassLoad.java
(original)
+++
tomcat/tc7.0.x/trunk/java/org/apache/catalina/security/SecurityClassLoad.java
Thu Nov 10 05:36:35 2011
@@ -5,9 +5,9 @@
* 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.
@@ -36,7 +36,7 @@ public final class SecurityClassLoad {
if( System.getSecurityManager() == null ){
return;
}
-
+
loadCorePackage(loader);
loadCoyotePackage(loader);
loadLoaderPackage(loader);
@@ -44,11 +44,11 @@ public final class SecurityClassLoad {
loadSessionPackage(loader);
loadUtilPackage(loader);
loadJavaxPackage(loader);
-loadConnectorPackage(loader);
+loadConnectorPackage(loader);
loadTomcatPackage(loader);
}
-
-
+
+
private static final void loadCorePackage(ClassLoader loader)
throws Exception {
final String basePackage = org.apache.catalina.core.;
@@ -95,8 +95,8 @@ public final class SecurityClassLoad {
(basePackage +
ApplicationHttpRequest$AttributeNamesEnumerator);
}
-
-
+
+
private static final void loadLoaderPackage(ClassLoader loader)
throws Exception {
final String basePackage = org.apache.catalina.loader.;
@@ -104,8 +104,8 @@ public final class SecurityClassLoad {
(basePackage +
WebappClassLoader$PrivilegedFindResourceByName);
}
-
-
+
+
private static final void loadRealmPackage(ClassLoader loader)
throws Exception {
final String basePackage = org.apache.catalina.realm.;
@@ -126,16 +126,16 @@ public final class SecurityClassLoad {
loader.loadClass
(basePackage + StandardManager$PrivilegedDoUnload);
}
-
-
+
+
private static final void loadUtilPackage(ClassLoader loader)
throws Exception {
final String basePackage = org.apache.catalina.util.;
loader.loadClass(basePackage + Enumerator);
loader.loadClass(basePackage + ParameterMap);
}
-
-
+
+
private static final void loadCoyotePackage(ClassLoader loader)
throws Exception {
final String basePackage = org.apache.coyote.;
@@ -151,7 +151,7 @@ public final class SecurityClassLoad {
throws Exception {
loader.loadClass(javax.servlet.http.Cookie);
}
-
+
private static final void loadConnectorPackage(ClassLoader loader)
throws Exception {
@@ -182,7 +182,7 @@ public final class
svn commit: r1200162 - in /tomcat/tc7.0.x/trunk/java/org/apache/catalina: Server.java Service.java Session.java SessionEvent.java SessionListener.java Store.java User.java UserDatabase.java
Author: kkolinko
Date: Thu Nov 10 05:37:57 2011
New Revision: 1200162
URL: http://svn.apache.org/viewvc?rev=1200162view=rev
Log:
Merging revision 1187801 from tomcat/trunk:
Whitespace removal from remaining /java/org/apache/catalina
Part 7
Modified:
tomcat/tc7.0.x/trunk/java/org/apache/catalina/Server.java
tomcat/tc7.0.x/trunk/java/org/apache/catalina/Service.java
tomcat/tc7.0.x/trunk/java/org/apache/catalina/Session.java
tomcat/tc7.0.x/trunk/java/org/apache/catalina/SessionEvent.java
tomcat/tc7.0.x/trunk/java/org/apache/catalina/SessionListener.java
tomcat/tc7.0.x/trunk/java/org/apache/catalina/Store.java
tomcat/tc7.0.x/trunk/java/org/apache/catalina/User.java
tomcat/tc7.0.x/trunk/java/org/apache/catalina/UserDatabase.java
Modified: tomcat/tc7.0.x/trunk/java/org/apache/catalina/Server.java
URL:
http://svn.apache.org/viewvc/tomcat/tc7.0.x/trunk/java/org/apache/catalina/Server.java?rev=1200162r1=1200161r2=1200162view=diff
==
--- tomcat/tc7.0.x/trunk/java/org/apache/catalina/Server.java (original)
+++ tomcat/tc7.0.x/trunk/java/org/apache/catalina/Server.java Thu Nov 10
05:37:57 2011
@@ -5,9 +5,9 @@
* 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.
@@ -68,7 +68,7 @@ public interface Server extends Lifecycl
/**
* Set the global naming resources.
- *
+ *
* @param globalNamingResources The new global naming resources
*/
public void setGlobalNamingResources
@@ -122,7 +122,7 @@ public interface Server extends Lifecycl
*/
public void setShutdown(String shutdown);
-
+
/**
* Return the parent class loader for this component. If not set, return
* {@link #getCatalina()} {@link Catalina#getParentClassLoader()}. If
@@ -138,17 +138,17 @@ public interface Server extends Lifecycl
*/
public void setParentClassLoader(ClassLoader parent);
-
+
/**
* Return the outer Catalina startup/shutdown component if present.
*/
public Catalina getCatalina();
-
+
/**
* Set the outer Catalina startup/shutdown component if present.
*/
public void setCatalina(Catalina catalina);
-
+
// - Public Methods
Modified: tomcat/tc7.0.x/trunk/java/org/apache/catalina/Service.java
URL:
http://svn.apache.org/viewvc/tomcat/tc7.0.x/trunk/java/org/apache/catalina/Service.java?rev=1200162r1=1200161r2=1200162view=diff
==
--- tomcat/tc7.0.x/trunk/java/org/apache/catalina/Service.java (original)
+++ tomcat/tc7.0.x/trunk/java/org/apache/catalina/Service.java Thu Nov 10
05:37:57 2011
@@ -141,7 +141,7 @@ public interface Service extends Lifecyc
* @return Executor
*/
public Executor getExecutor(String name);
-
+
/**
* Removes an executor from the service
* @param ex Executor
Modified: tomcat/tc7.0.x/trunk/java/org/apache/catalina/Session.java
URL:
http://svn.apache.org/viewvc/tomcat/tc7.0.x/trunk/java/org/apache/catalina/Session.java?rev=1200162r1=1200161r2=1200162view=diff
==
--- tomcat/tc7.0.x/trunk/java/org/apache/catalina/Session.java (original)
+++ tomcat/tc7.0.x/trunk/java/org/apache/catalina/Session.java Thu Nov 10
05:37:57 2011
@@ -5,9 +5,9 @@
* 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.
@@ -132,7 +132,7 @@ public interface Session {
*
* @param idThe new session identifier
* @param notifyShould any associated listeners be notified that a new
- * session has been created?
+ * session has been created?
*/
public void setId(String id, boolean notify);
Modified: tomcat/tc7.0.x/trunk/java/org/apache/catalina/SessionEvent.java
URL:
http://svn.apache.org/viewvc/tomcat/tc7.0.x/trunk/java/org/apache/catalina/SessionEvent.java?rev=1200162r1=1200161r2=1200162view=diff
svn commit: r1200163 - in /tomcat/tc7.0.x/trunk: ./ java/org/apache/catalina/ java/org/apache/catalina/servlets/ java/org/apache/catalina/valves/
Author: kkolinko Date: Thu Nov 10 05:40:04 2011 New Revision: 1200163 URL: http://svn.apache.org/viewvc?rev=1200163view=rev Log: Merging revision 1187801 from tomcat/trunk: Whitespace removal from remaining /java/org/apache/catalina Part 8, the last one. Updated mergeinfo. Modified: tomcat/tc7.0.x/trunk/ (props changed) tomcat/tc7.0.x/trunk/java/org/apache/catalina/Wrapper.java tomcat/tc7.0.x/trunk/java/org/apache/catalina/servlets/CGIServlet.java tomcat/tc7.0.x/trunk/java/org/apache/catalina/servlets/Constants.java tomcat/tc7.0.x/trunk/java/org/apache/catalina/servlets/DefaultServlet.java tomcat/tc7.0.x/trunk/java/org/apache/catalina/servlets/WebdavServlet.java tomcat/tc7.0.x/trunk/java/org/apache/catalina/valves/mbeans-descriptors.xml Propchange: tomcat/tc7.0.x/trunk/ -- --- svn:mergeinfo (original) +++ svn:mergeinfo Thu Nov 10 05:40:04 2011 @@ -1 +1 @@ -/tomcat/trunk:1156115,1156171,1156276,1156304,1156519,1156530,1156602,1157015,1157018,1157151,1157198,1157204,1157810,1157832,1157834,1157847,1157908,1157939,1158155,1158160,1158176,1158195,1158198-1158199,1158227,1158331,1158334-1158335,1158426,1160347,1160592,1160611,1160619,1160626,1160639,1160652,1160720-1160721,1160772,1160774,1160776,1161303,1161310,1161322,1161339,1161486,1161540,1161549,1161584,1162082,1162149,1162169,1162721,1162769,1162836,1162932,1163630,1164419,1164438,1164469,1164480,1164567,1165234,1165247-1165248,1165253,1165273,1165282,1165309,1165331,1165338,1165347,1165360-1165361,1165367-1165368,1165602,1165608,1165677,1165693,1165721,1165723,1165728,1165730,1165738,1165746,1165765,1165777,1165918,1165921,1166077,1166150-1166151,1166290,1166366,1166620,1166686,1166693,1166752,1166757,1167368,1167394,1169447,1170647,1171692,1172233-1172234,1172236,1172269,1172278,1172282,1172556,1172610,1172664,1172689,1172711,1173020-1173021,1173082,1173088,1173090,1173096 ,1173241,1173256,1173288,117,1173342,1173461,1173614,1173630,1173659,1173722,1174061,1174239,1174322,1174325,1174329-1174330,1174337-1174339,1174343,1174353,1174799,1174882,1174884,1174983,1175155,1175158,1175167,1175182,1175190,1175201,1175272,1175275,1175283,1175582,1175589-1175590,1175594,1175602,1175613,1175633,1175690,1175713,1175798,1175889,1175896,1175907,1176584,1176590,1176799,1177050,1177060,1177125,1177152,1177160,1177245,1177850,1177862,1177978,1178209,1178228,1178233,1178449,1178542,1178681,1178684,1178721,1179268,1179274,1180261,1180865,1180891,1180894,1180907,1181028,1181123,1181125,1181136,1181291,1181743,1182796,1183078,1183105,1183142,1183328,1183339-1183340,1183492-1183494,1183605,1184917,1184919,1185018,1185020,1185200,1185588,1185626,1185756,1185758,1186011,1186042-1186045,1186104,1186123,1186137,1186153,1186254,1186257,1186377-1186379,1186479-1186480,1186712,1186743,1186750,1186763,1186890-1186892,1186894,1186949,1187018,1187027-1187028,1187381,1187 755,1187775,1187806,1187809,1187827,1188301,1188303-1188305,1188399,1188822,1188930-1188931,1189116,1189129,1189183,1189240,1189256,1189386,1189413-1189414,1189477,1189685,1189805,1189857,1189864,1189882,1190034,1190185,1190279,1190339,1190371,1190388-1190389,1190474,1190481,1194915,1195222-1195223,1195531,1195899,1195905,1195943,1195949,1195953,1195955,1195965,1195968,1196175,1196212,1196223,1196304-1196305,1196735,1196825,1196827,1197158,1197261,1197263,1197299-1197300,1197305,1197339-1197340,1197343,1197382,1197386-1197387,1197480,1197578,1198497,1198528,1198552,1198602,1198604,1198607,1198622,1198640,1199418,1199432,1199436,1199513,1199529,1199980,116,1200106 +/tomcat/trunk:1156115,1156171,1156276,1156304,1156519,1156530,1156602,1157015,1157018,1157151,1157198,1157204,1157810,1157832,1157834,1157847,1157908,1157939,1158155,1158160,1158176,1158195,1158198-1158199,1158227,1158331,1158334-1158335,1158426,1160347,1160592,1160611,1160619,1160626,1160639,1160652,1160720-1160721,1160772,1160774,1160776,1161303,1161310,1161322,1161339,1161486,1161540,1161549,1161584,1162082,1162149,1162169,1162721,1162769,1162836,1162932,1163630,1164419,1164438,1164469,1164480,1164567,1165234,1165247-1165248,1165253,1165273,1165282,1165309,1165331,1165338,1165347,1165360-1165361,1165367-1165368,1165602,1165608,1165677,1165693,1165721,1165723,1165728,1165730,1165738,1165746,1165765,1165777,1165918,1165921,1166077,1166150-1166151,1166290,1166366,1166620,1166686,1166693,1166752,1166757,1167368,1167394,1169447,1170647,1171692,1172233-1172234,1172236,1172269,1172278,1172282,1172556,1172610,1172664,1172689,1172711,1173020-1173021,1173082,1173088,1173090,1173096
svn commit: r1200164 - in /tomcat/tc7.0.x/trunk/java/org/apache/tomcat: InstanceManager.java JarScanner.java JarScannerCallback.java PeriodicEventListener.java buildutil/Txt2Html.java jni/Directory.ja
Author: kkolinko
Date: Thu Nov 10 05:46:02 2011
New Revision: 1200164
URL: http://svn.apache.org/viewvc?rev=1200164view=rev
Log:
Merging revision 1187781 from tomcat/trunk:
Whitespace removal from /java/org/apache/tomcat
I won't merge all of it (as it spans bcel etc.), but only our code.
Part 1.
Modified:
tomcat/tc7.0.x/trunk/java/org/apache/tomcat/InstanceManager.java
tomcat/tc7.0.x/trunk/java/org/apache/tomcat/JarScanner.java
tomcat/tc7.0.x/trunk/java/org/apache/tomcat/JarScannerCallback.java
tomcat/tc7.0.x/trunk/java/org/apache/tomcat/PeriodicEventListener.java
tomcat/tc7.0.x/trunk/java/org/apache/tomcat/buildutil/Txt2Html.java
tomcat/tc7.0.x/trunk/java/org/apache/tomcat/jni/Directory.java
tomcat/tc7.0.x/trunk/java/org/apache/tomcat/jni/File.java
tomcat/tc7.0.x/trunk/java/org/apache/tomcat/jni/SSLSocket.java
Modified: tomcat/tc7.0.x/trunk/java/org/apache/tomcat/InstanceManager.java
URL:
http://svn.apache.org/viewvc/tomcat/tc7.0.x/trunk/java/org/apache/tomcat/InstanceManager.java?rev=1200164r1=1200163r2=1200164view=diff
==
--- tomcat/tc7.0.x/trunk/java/org/apache/tomcat/InstanceManager.java (original)
+++ tomcat/tc7.0.x/trunk/java/org/apache/tomcat/InstanceManager.java Thu Nov 10
05:46:02 2011
@@ -26,14 +26,14 @@ import javax.naming.NamingException;
public interface InstanceManager {
public Object newInstance(String className)
-throws IllegalAccessException, InvocationTargetException,
NamingException,
+throws IllegalAccessException, InvocationTargetException,
NamingException,
InstantiationException, ClassNotFoundException;
-public Object newInstance(String fqcn, ClassLoader classLoader)
-throws IllegalAccessException, InvocationTargetException,
NamingException,
+public Object newInstance(String fqcn, ClassLoader classLoader)
+throws IllegalAccessException, InvocationTargetException,
NamingException,
InstantiationException, ClassNotFoundException;
-public void newInstance(Object o)
+public void newInstance(Object o)
throws IllegalAccessException, InvocationTargetException,
NamingException;
public void destroyInstance(Object o)
Modified: tomcat/tc7.0.x/trunk/java/org/apache/tomcat/JarScanner.java
URL:
http://svn.apache.org/viewvc/tomcat/tc7.0.x/trunk/java/org/apache/tomcat/JarScanner.java?rev=1200164r1=1200163r2=1200164view=diff
==
--- tomcat/tc7.0.x/trunk/java/org/apache/tomcat/JarScanner.java (original)
+++ tomcat/tc7.0.x/trunk/java/org/apache/tomcat/JarScanner.java Thu Nov 10
05:46:02 2011
@@ -23,14 +23,14 @@ import javax.servlet.ServletContext;
/**
* Scans a web application and classloader hierarchy for JAR files. Uses
* include TLD scanning and web-fragment.xml scanning. Uses a call-back
- * mechanism so the caller can process each JAR found.
+ * mechanism so the caller can process each JAR found.
*/
public interface JarScanner {
/**
* Scan the provided ServletContext and classloader for JAR files. Each JAR
* file found will be passed to the callback handler to be processed.
- *
+ *
* @param context The ServletContext - used to locate and access
* WEB-INF/lib
* @param classloader The classloader - used to access JARs not in
@@ -40,5 +40,5 @@ public interface JarScanner {
*/
public void scan(ServletContext context, ClassLoader classloader,
JarScannerCallback callback, SetString jarsToSkip);
-
+
}
Modified: tomcat/tc7.0.x/trunk/java/org/apache/tomcat/JarScannerCallback.java
URL:
http://svn.apache.org/viewvc/tomcat/tc7.0.x/trunk/java/org/apache/tomcat/JarScannerCallback.java?rev=1200164r1=1200163r2=1200164view=diff
==
--- tomcat/tc7.0.x/trunk/java/org/apache/tomcat/JarScannerCallback.java
(original)
+++ tomcat/tc7.0.x/trunk/java/org/apache/tomcat/JarScannerCallback.java Thu Nov
10 05:46:02 2011
@@ -24,12 +24,12 @@ import java.net.JarURLConnection;
public interface JarScannerCallback {
/**
- *
+ *
* @param urlConn
* @throws IOException
*/
public void scan(JarURLConnection urlConn) throws IOException;
-
+
public void scan(File file) throws IOException ;
}
Modified: tomcat/tc7.0.x/trunk/java/org/apache/tomcat/PeriodicEventListener.java
URL:
http://svn.apache.org/viewvc/tomcat/tc7.0.x/trunk/java/org/apache/tomcat/PeriodicEventListener.java?rev=1200164r1=1200163r2=1200164view=diff
==
--- tomcat/tc7.0.x/trunk/java/org/apache/tomcat/PeriodicEventListener.java
(original)
+++ tomcat/tc7.0.x/trunk/java/org/apache/tomcat/PeriodicEventListener.java Thu
Nov 10 05:46:02 2011
@@ -5,9 +5,9 @@
* The
svn commit: r1200165 - in /tomcat/tc7.0.x/trunk/java/org/apache/tomcat/util: DomUtil.java ExceptionUtils.java IntrospectionUtils.java buf/package.html file/Constants.java file/Matcher.java http/mapper
Author: kkolinko
Date: Thu Nov 10 05:49:16 2011
New Revision: 1200165
URL: http://svn.apache.org/viewvc?rev=1200165view=rev
Log:
Merging revision 1187781 from tomcat/trunk:
Whitespace removal from /java/org/apache/tomcat
I won't merge all of it (as it spans bcel etc.), but only our code.
Part 2.
Modified:
tomcat/tc7.0.x/trunk/java/org/apache/tomcat/util/DomUtil.java
tomcat/tc7.0.x/trunk/java/org/apache/tomcat/util/ExceptionUtils.java
tomcat/tc7.0.x/trunk/java/org/apache/tomcat/util/IntrospectionUtils.java
tomcat/tc7.0.x/trunk/java/org/apache/tomcat/util/buf/package.html
tomcat/tc7.0.x/trunk/java/org/apache/tomcat/util/file/Constants.java
tomcat/tc7.0.x/trunk/java/org/apache/tomcat/util/file/Matcher.java
tomcat/tc7.0.x/trunk/java/org/apache/tomcat/util/http/mapper/Mapper.java
tomcat/tc7.0.x/trunk/java/org/apache/tomcat/util/log/SystemLogHandler.java
Modified: tomcat/tc7.0.x/trunk/java/org/apache/tomcat/util/DomUtil.java
URL:
http://svn.apache.org/viewvc/tomcat/tc7.0.x/trunk/java/org/apache/tomcat/util/DomUtil.java?rev=1200165r1=1200164r2=1200165view=diff
==
--- tomcat/tc7.0.x/trunk/java/org/apache/tomcat/util/DomUtil.java (original)
+++ tomcat/tc7.0.x/trunk/java/org/apache/tomcat/util/DomUtil.java Thu Nov 10
05:49:16 2011
@@ -5,9 +5,9 @@
* 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.
@@ -101,15 +101,15 @@ public class DomUtil {
attNode.setNodeValue( val );
attributes.setNamedItem(attNode);
}
-
+
public static void removeAttribute( Node node, String attName ) {
NamedNodeMap attributes=node.getAttributes();
-attributes.removeNamedItem(attName);
+attributes.removeNamedItem(attName);
}
-
-
-/** Set or replace the text value
- */
+
+
+/** Set or replace the text value
+ */
public static void setText(Node node, String val) {
Node chld=DomUtil.getChild(node, Node.TEXT_NODE);
if( chld == null ) {
@@ -118,35 +118,35 @@ public class DomUtil {
return;
}
// change the value
-chld.setNodeValue(val);
+chld.setNodeValue(val);
}
/** Find the first direct child with a given attribute.
* @param parent
- * @param elemName name of the element, or null for any
+ * @param elemName name of the element, or null for any
* @param attName attribute we're looking for
* @param attVal attribute value or null if we just want any
- */
+ */
public static Node findChildWithAtt(Node parent, String elemName,
String attName, String attVal) {
-
+
Node child=DomUtil.getChild(parent, Node.ELEMENT_NODE);
if( attVal== null ) {
while( child!= null
-( elemName==null || elemName.equals( child.getNodeName()))
+( elemName==null || elemName.equals( child.getNodeName()))
DomUtil.getAttribute(child, attName) != null ) {
child=getNext(child, elemName, Node.ELEMENT_NODE );
}
} else {
-while( child!= null
-( elemName==null || elemName.equals( child.getNodeName()))
+while( child!= null
+( elemName==null || elemName.equals( child.getNodeName()))
! attVal.equals( DomUtil.getAttribute(child, attName)) ) {
child=getNext(child, elemName, Node.ELEMENT_NODE );
}
}
-return child;
-}
-
+return child;
+}
+
/** Get the first child's content ( ie it's included TEXT node ).
*/
@@ -183,14 +183,14 @@ public class DomUtil {
}
/** Return the next sibling with a given name and type
- */
+ */
public static Node getNext( Node current, String name, int type) {
Node first=current.getNextSibling();
if( first==null ) return null;
for (Node node = first; node != null;
node = node.getNextSibling()) {
-
+
if( type = 0 node.getNodeType() != type ) continue;
//System.out.println(getNode: + name + +
node.getNodeName());
if( name==null )
Modified: tomcat/tc7.0.x/trunk/java/org/apache/tomcat/util/ExceptionUtils.java
URL:
svn commit: r1200166 - in /tomcat/tc7.0.x/trunk/java/org/apache/tomcat/util: net/jsse/JSSEImplementation.java net/jsse/JSSEKeyManager.java net/jsse/JSSESocketFactory.java net/jsse/JSSESupport.java net
Author: kkolinko
Date: Thu Nov 10 05:50:36 2011
New Revision: 1200166
URL: http://svn.apache.org/viewvc?rev=1200166view=rev
Log:
Merging revision 1187781 from tomcat/trunk:
Whitespace removal from /java/org/apache/tomcat
I won't merge all of it (as it spans bcel etc.), but only our code.
Part 3.
Modified:
tomcat/tc7.0.x/trunk/java/org/apache/tomcat/util/net/jsse/JSSEImplementation.java
tomcat/tc7.0.x/trunk/java/org/apache/tomcat/util/net/jsse/JSSEKeyManager.java
tomcat/tc7.0.x/trunk/java/org/apache/tomcat/util/net/jsse/JSSESocketFactory.java
tomcat/tc7.0.x/trunk/java/org/apache/tomcat/util/net/jsse/JSSESupport.java
tomcat/tc7.0.x/trunk/java/org/apache/tomcat/util/net/jsse/NioX509KeyManager.java
tomcat/tc7.0.x/trunk/java/org/apache/tomcat/util/res/StringManager.java
Modified:
tomcat/tc7.0.x/trunk/java/org/apache/tomcat/util/net/jsse/JSSEImplementation.java
URL:
http://svn.apache.org/viewvc/tomcat/tc7.0.x/trunk/java/org/apache/tomcat/util/net/jsse/JSSEImplementation.java?rev=1200166r1=1200165r2=1200166view=diff
==
---
tomcat/tc7.0.x/trunk/java/org/apache/tomcat/util/net/jsse/JSSEImplementation.java
(original)
+++
tomcat/tc7.0.x/trunk/java/org/apache/tomcat/util/net/jsse/JSSEImplementation.java
Thu Nov 10 05:50:36 2011
@@ -34,18 +34,18 @@ import org.apache.tomcat.util.net.Server
@author EKR
*/
-
+
public class JSSEImplementation extends SSLImplementation {
@Override
public String getImplementationName(){
return JSSE;
}
-
+
@Override
public ServerSocketFactory getServerSocketFactory(AbstractEndpoint
endpoint) {
return new JSSESocketFactory(endpoint);
-}
+}
@Override
public SSLSupport getSSLSupport(Socket s) {
Modified:
tomcat/tc7.0.x/trunk/java/org/apache/tomcat/util/net/jsse/JSSEKeyManager.java
URL:
http://svn.apache.org/viewvc/tomcat/tc7.0.x/trunk/java/org/apache/tomcat/util/net/jsse/JSSEKeyManager.java?rev=1200166r1=1200165r2=1200166view=diff
==
---
tomcat/tc7.0.x/trunk/java/org/apache/tomcat/util/net/jsse/JSSEKeyManager.java
(original)
+++
tomcat/tc7.0.x/trunk/java/org/apache/tomcat/util/net/jsse/JSSEKeyManager.java
Thu Nov 10 05:50:36 2011
@@ -100,7 +100,7 @@ public final class JSSEKeyManager extend
*/
@Override
public X509Certificate[] getCertificateChain(String alias) {
-return delegate.getCertificateChain(alias);
+return delegate.getCertificateChain(alias);
}
/**
Modified:
tomcat/tc7.0.x/trunk/java/org/apache/tomcat/util/net/jsse/JSSESocketFactory.java
URL:
http://svn.apache.org/viewvc/tomcat/tc7.0.x/trunk/java/org/apache/tomcat/util/net/jsse/JSSESocketFactory.java?rev=1200166r1=1200165r2=1200166view=diff
==
---
tomcat/tc7.0.x/trunk/java/org/apache/tomcat/util/net/jsse/JSSESocketFactory.java
(original)
+++
tomcat/tc7.0.x/trunk/java/org/apache/tomcat/util/net/jsse/JSSESocketFactory.java
Thu Nov 10 05:50:36 2011
@@ -70,7 +70,7 @@ import org.apache.tomcat.util.res.String
* JSSE.br/
* keytool -genkey -alias tomcat -keyalg RSA/br
* Use changeit as password (this is the default we use).
- *
+ *
* @author Harish Prabandham
* @author Costin Manolache
* @author Stefan Freyr Stefansson
@@ -96,7 +96,7 @@ public class JSSESocketFactory implement
private static final int defaultSessionTimeout = 86400;
private static final String ALLOW_ALL_SUPPORTED_CIPHERS = ALL;
public static final String DEFAULT_KEY_PASS = changeit;
-
+
static {
boolean result = false;
SSLContext context;
@@ -150,7 +150,7 @@ public class JSSESocketFactory implement
initServerSocket(socket);
return socket;
}
-
+
@Override
public ServerSocket createSocket (int port, int backlog)
throws IOException
@@ -160,19 +160,19 @@ public class JSSESocketFactory implement
initServerSocket(socket);
return socket;
}
-
+
@Override
public ServerSocket createSocket (int port, int backlog,
InetAddress ifAddress)
throws IOException
-{
+{
init();
ServerSocket socket = sslProxy.createServerSocket(port, backlog,
ifAddress);
initServerSocket(socket);
return socket;
}
-
+
@Override
public Socket acceptSocket(ServerSocket socket)
throws IOException
@@ -185,7 +185,7 @@ public class JSSESocketFactory implement
}
return asock;
}
-
+
@Override
public void handshake(Socket sock) throws IOException {
// We do getSession instead of startHandshake() so we can call this
multiple times
@@ -266,7 +266,7 @@ public
svn commit: r1200167 - in /tomcat/tc7.0.x/trunk/java/org/apache/tomcat/util/net: AbstractEndpoint.java AprEndpoint.java DefaultServerSocketFactory.java JIoEndpoint.java ServerSocketFactory.java Socket
Author: kkolinko
Date: Thu Nov 10 05:52:22 2011
New Revision: 1200167
URL: http://svn.apache.org/viewvc?rev=1200167view=rev
Log:
Merging revision 1187781 from tomcat/trunk:
Whitespace removal from /java/org/apache/tomcat
I won't merge all of it (as it spans bcel etc.), but only our code.
Part 4.
Modified:
tomcat/tc7.0.x/trunk/java/org/apache/tomcat/util/net/AbstractEndpoint.java
tomcat/tc7.0.x/trunk/java/org/apache/tomcat/util/net/AprEndpoint.java
tomcat/tc7.0.x/trunk/java/org/apache/tomcat/util/net/DefaultServerSocketFactory.java
tomcat/tc7.0.x/trunk/java/org/apache/tomcat/util/net/JIoEndpoint.java
tomcat/tc7.0.x/trunk/java/org/apache/tomcat/util/net/ServerSocketFactory.java
tomcat/tc7.0.x/trunk/java/org/apache/tomcat/util/net/SocketProperties.java
tomcat/tc7.0.x/trunk/java/org/apache/tomcat/util/net/SocketStatus.java
tomcat/tc7.0.x/trunk/java/org/apache/tomcat/util/net/SocketWrapper.java
Modified:
tomcat/tc7.0.x/trunk/java/org/apache/tomcat/util/net/AbstractEndpoint.java
URL:
http://svn.apache.org/viewvc/tomcat/tc7.0.x/trunk/java/org/apache/tomcat/util/net/AbstractEndpoint.java?rev=1200167r1=1200166r2=1200167view=diff
==
--- tomcat/tc7.0.x/trunk/java/org/apache/tomcat/util/net/AbstractEndpoint.java
(original)
+++ tomcat/tc7.0.x/trunk/java/org/apache/tomcat/util/net/AbstractEndpoint.java
Thu Nov 10 05:52:22 2011
@@ -56,14 +56,14 @@ public abstract class AbstractEndpoint {
// ASYNC_END (if possible)
OPEN, CLOSED, LONG, ASYNC_END, SENDFILE
}
-
+
/**
* Obtain the GlobalRequestProcessor associated with the handler.
*/
public Object getGlobal();
-
-
+
+
/**
* Recycle resources associated with the handler.
*/
@@ -179,7 +179,7 @@ public abstract class AbstractEndpoint {
* Controls when the Endpoint binds the port. codetrue/code, the
default
* binds the port on {@link #init()} and unbinds it on {@link #destroy()}.
* If set to codefalse/code the port is bound on {@link #start()} and
- * unbound on {@link #stop()}.
+ * unbound on {@link #stop()}.
*/
private boolean bindOnInit = true;
public boolean getBindOnInit() { return bindOnInit; }
@@ -323,7 +323,7 @@ public abstract class AbstractEndpoint {
*/
protected HashMapString, Object attributes =
new HashMapString, Object();
-/**
+/**
* Generic property setter called when a property for which a specific
* setter already exists within the
* {@link org.apache.coyote.ProtocolHandler} needs to be made available to
@@ -368,7 +368,7 @@ public abstract class AbstractEndpoint {
public String getProperty(String name) {
return (String) getAttribute(name);
}
-
+
/**
* Return the amount of threads that are managed by the pool.
*
@@ -516,7 +516,7 @@ public abstract class AbstractEndpoint {
bindState = BindState.BOUND_ON_INIT;
}
}
-
+
public final void start() throws Exception {
if (bindState == BindState.UNBOUND) {
bind();
@@ -593,25 +593,25 @@ public abstract class AbstractEndpoint {
public abstract boolean getUseComet();
public abstract boolean getUseCometTimeout();
public abstract boolean getUsePolling();
-
+
protected LimitLatch initializeConnectionLatch() {
if (connectionLimitLatch==null) {
connectionLimitLatch = new LimitLatch(getMaxConnections());
}
return connectionLimitLatch;
}
-
+
protected void releaseConnectionLatch() {
LimitLatch latch = connectionLimitLatch;
if (latch!=null) latch.releaseAll();
connectionLimitLatch = null;
}
-
+
protected void countUpOrAwaitConnection() throws InterruptedException {
LimitLatch latch = connectionLimitLatch;
if (latch!=null) latch.countUpOrAwait();
}
-
+
protected long countDownConnection() {
LimitLatch latch = connectionLimitLatch;
if (latch!=null) {
@@ -622,14 +622,14 @@ public abstract class AbstractEndpoint {
return result;
} else return -1;
}
-
+
/**
* Provides a common approach for sub-classes to handle exceptions where a
* delay is required to prevent a Thread from entering a tight loop which
* will consume CPU and may also trigger large amounts of logging. For
* example, this can happen with the Acceptor thread if the ulimit for open
* files is reached.
- *
+ *
* @param currentErrorDelay The current delay beign applied on failure
* @return The delay to apply on the next failure
*/
@@ -642,7 +642,7 @@ public abstract class AbstractEndpoint {
// Ignore
}
}
-
+
// On subsequent
svn commit: r1200168 - in /tomcat/tc7.0.x/trunk/java/org/apache/tomcat/util/net: NioBlockingSelector.java NioChannel.java NioEndpoint.java NioSelectorPool.java SecureNioChannel.java
Author: kkolinko
Date: Thu Nov 10 05:53:21 2011
New Revision: 1200168
URL: http://svn.apache.org/viewvc?rev=1200168view=rev
Log:
Merging revision 1187781 from tomcat/trunk:
Whitespace removal from /java/org/apache/tomcat
I won't merge all of it (as it spans bcel etc.), but only our code.
Part 5.
Modified:
tomcat/tc7.0.x/trunk/java/org/apache/tomcat/util/net/NioBlockingSelector.java
tomcat/tc7.0.x/trunk/java/org/apache/tomcat/util/net/NioChannel.java
tomcat/tc7.0.x/trunk/java/org/apache/tomcat/util/net/NioEndpoint.java
tomcat/tc7.0.x/trunk/java/org/apache/tomcat/util/net/NioSelectorPool.java
tomcat/tc7.0.x/trunk/java/org/apache/tomcat/util/net/SecureNioChannel.java
Modified:
tomcat/tc7.0.x/trunk/java/org/apache/tomcat/util/net/NioBlockingSelector.java
URL:
http://svn.apache.org/viewvc/tomcat/tc7.0.x/trunk/java/org/apache/tomcat/util/net/NioBlockingSelector.java?rev=1200168r1=1200167r2=1200168view=diff
==
---
tomcat/tc7.0.x/trunk/java/org/apache/tomcat/util/net/NioBlockingSelector.java
(original)
+++
tomcat/tc7.0.x/trunk/java/org/apache/tomcat/util/net/NioBlockingSelector.java
Thu Nov 10 05:53:21 2011
@@ -38,18 +38,18 @@ import org.apache.tomcat.util.MutableInt
import org.apache.tomcat.util.net.NioEndpoint.KeyAttachment;
public class NioBlockingSelector {
-
+
private static final Log log =
LogFactory.getLog(NioBlockingSelector.class);
-
+
private static int threadCounter = 0;
-
+
protected Selector sharedSelector;
-
+
protected BlockPoller poller;
public NioBlockingSelector() {
-
+
}
-
+
public void open(Selector selector) {
sharedSelector = selector;
poller = new BlockPoller();
@@ -58,7 +58,7 @@ public class NioBlockingSelector {
poller.setName(NioBlockingSelector.BlockPoller-+(++threadCounter));
poller.start();
}
-
+
public void close() {
if (poller!=null) {
poller.disable();
@@ -120,7 +120,7 @@ public class NioBlockingSelector {
if (writeTimeout 0 (keycount == 0))
timedout = (System.currentTimeMillis() - time) =
writeTimeout;
} //while
-if (timedout)
+if (timedout)
throw new SocketTimeoutException();
} finally {
poller.remove(att,SelectionKey.OP_WRITE);
@@ -197,7 +197,7 @@ public class NioBlockingSelector {
return read;
}
-
+
protected static class BlockPoller extends Thread {
protected volatile boolean run = true;
protected Selector selector = null;
@@ -227,7 +227,7 @@ public class NioBlockingSelector {
if
(SelectionKey.OP_READ==(opsSelectionKey.OP_READ))countDown(key.getReadLatch());
}
}
-
+
public void add(final KeyAttachment key, final int ops, final
KeyReference ref) {
Runnable r = new Runnable() {
@Override
@@ -257,7 +257,7 @@ public class NioBlockingSelector {
events.offer(r);
wakeup();
}
-
+
public void remove(final KeyAttachment key, final int ops) {
Runnable r = new Runnable() {
@Override
@@ -318,7 +318,7 @@ public class NioBlockingSelector {
int keyCount = 0;
try {
int i = wakeupCounter.get();
-if (i0)
+if (i0)
keyCount = selector.selectNow();
else {
wakeupCounter.set(-1);
@@ -380,16 +380,16 @@ public class NioBlockingSelector {
if (log.isDebugEnabled())log.debug(,ignore);
}
}
-
+
public void countDown(CountDownLatch latch) {
if ( latch == null ) return;
latch.countDown();
}
}
-
+
public static class KeyReference {
SelectionKey key = null;
-
+
@Override
public void finalize() {
if (key!=null key.isValid()) {
Modified: tomcat/tc7.0.x/trunk/java/org/apache/tomcat/util/net/NioChannel.java
URL:
http://svn.apache.org/viewvc/tomcat/tc7.0.x/trunk/java/org/apache/tomcat/util/net/NioChannel.java?rev=1200168r1=1200167r2=1200168view=diff
==
--- tomcat/tc7.0.x/trunk/java/org/apache/tomcat/util/net/NioChannel.java
(original)
+++ tomcat/tc7.0.x/trunk/java/org/apache/tomcat/util/net/NioChannel.java Thu
Nov 10 05:53:21 2011
@@ -5,9 +5,9 @@
* 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
- *
+ *
*
svn commit: r1200170 - in /tomcat/tc7.0.x/trunk/java/org/apache/tomcat/util: net/ scan/
Author: kkolinko
Date: Thu Nov 10 05:54:22 2011
New Revision: 1200170
URL: http://svn.apache.org/viewvc?rev=1200170view=rev
Log:
Merging revision 1187781 from tomcat/trunk:
Whitespace removal from /java/org/apache/tomcat
I won't merge all of it (as it spans bcel etc.), but only our code.
Part 6.
Modified:
tomcat/tc7.0.x/trunk/java/org/apache/tomcat/util/net/SSLSessionManager.java
tomcat/tc7.0.x/trunk/java/org/apache/tomcat/util/net/SSLSupport.java
tomcat/tc7.0.x/trunk/java/org/apache/tomcat/util/net/SSLUtil.java
tomcat/tc7.0.x/trunk/java/org/apache/tomcat/util/net/URL.java
tomcat/tc7.0.x/trunk/java/org/apache/tomcat/util/scan/Constants.java
tomcat/tc7.0.x/trunk/java/org/apache/tomcat/util/scan/FileUrlJar.java
tomcat/tc7.0.x/trunk/java/org/apache/tomcat/util/scan/Jar.java
tomcat/tc7.0.x/trunk/java/org/apache/tomcat/util/scan/JarFactory.java
tomcat/tc7.0.x/trunk/java/org/apache/tomcat/util/scan/NonClosingJarInputStream.java
tomcat/tc7.0.x/trunk/java/org/apache/tomcat/util/scan/StandardJarScanner.java
tomcat/tc7.0.x/trunk/java/org/apache/tomcat/util/scan/UrlJar.java
Modified:
tomcat/tc7.0.x/trunk/java/org/apache/tomcat/util/net/SSLSessionManager.java
URL:
http://svn.apache.org/viewvc/tomcat/tc7.0.x/trunk/java/org/apache/tomcat/util/net/SSLSessionManager.java?rev=1200170r1=1200169r2=1200170view=diff
==
--- tomcat/tc7.0.x/trunk/java/org/apache/tomcat/util/net/SSLSessionManager.java
(original)
+++ tomcat/tc7.0.x/trunk/java/org/apache/tomcat/util/net/SSLSessionManager.java
Thu Nov 10 05:54:22 2011
@@ -20,7 +20,7 @@ package org.apache.tomcat.util.net;
/**
* Defines an interface used to manage SSL sessions. The manager operates on a
* single session.
- *
+ *
* $Id$
*/
public interface SSLSessionManager {
Modified: tomcat/tc7.0.x/trunk/java/org/apache/tomcat/util/net/SSLSupport.java
URL:
http://svn.apache.org/viewvc/tomcat/tc7.0.x/trunk/java/org/apache/tomcat/util/net/SSLSupport.java?rev=1200170r1=1200169r2=1200170view=diff
==
--- tomcat/tc7.0.x/trunk/java/org/apache/tomcat/util/net/SSLSupport.java
(original)
+++ tomcat/tc7.0.x/trunk/java/org/apache/tomcat/util/net/SSLSupport.java Thu
Nov 10 05:54:22 2011
@@ -54,7 +54,7 @@ public interface SSLSupport {
public static final String SESSION_MGR =
javax.servlet.request.ssl_session_mgr;
-
+
/**
* A mapping table to determine the number of effective bits in the key
* when using a cipher suite containing the specified cipher name. The
@@ -86,7 +86,7 @@ public interface SSLSupport {
/**
* The client certificate chain (if any).
- * @param force If codetrue/code, then re-negotiate the
+ * @param force If codetrue/code, then re-negotiate the
* connection if necessary.
*/
public Object[] getPeerCertificateChain(boolean force)
@@ -119,19 +119,19 @@ public interface SSLSupport {
* corresponding effective key size. The specified phrase must appear in
the
* name of the cipher suite to be recognized.
*/
-
+
final class CipherData {
-
+
public String phrase = null;
-
+
public int keySize = 0;
-
+
public CipherData(String phrase, int keySize) {
this.phrase = phrase;
this.keySize = keySize;
}
-
+
}
-
+
}
Modified: tomcat/tc7.0.x/trunk/java/org/apache/tomcat/util/net/SSLUtil.java
URL:
http://svn.apache.org/viewvc/tomcat/tc7.0.x/trunk/java/org/apache/tomcat/util/net/SSLUtil.java?rev=1200170r1=1200169r2=1200170view=diff
==
--- tomcat/tc7.0.x/trunk/java/org/apache/tomcat/util/net/SSLUtil.java (original)
+++ tomcat/tc7.0.x/trunk/java/org/apache/tomcat/util/net/SSLUtil.java Thu Nov
10 05:54:22 2011
@@ -23,11 +23,11 @@ import javax.net.ssl.TrustManager;
public interface SSLUtil {
-public SSLContext createSSLContext() throws Exception;
+public SSLContext createSSLContext() throws Exception;
public KeyManager[] getKeyManagers() throws Exception;
-
+
public TrustManager[] getTrustManagers() throws Exception;
-
+
public void configureSessionContext(SSLSessionContext sslSessionContext);
}
Modified: tomcat/tc7.0.x/trunk/java/org/apache/tomcat/util/net/URL.java
URL:
http://svn.apache.org/viewvc/tomcat/tc7.0.x/trunk/java/org/apache/tomcat/util/net/URL.java?rev=1200170r1=1200169r2=1200170view=diff
==
--- tomcat/tc7.0.x/trunk/java/org/apache/tomcat/util/net/URL.java (original)
+++ tomcat/tc7.0.x/trunk/java/org/apache/tomcat/util/net/URL.java Thu Nov 10
05:54:22 2011
@@ -49,7 +49,7 @@ public final class URL implements Serial
private static final long serialVersionUID = 1L;
-
svn commit: r1200171 - in /tomcat/tc7.0.x/trunk/java/org/apache/tomcat/util/threads: Constants.java LimitLatch.java ResizableExecutor.java TaskQueue.java TaskThread.java TaskThreadFactory.java ThreadP
Author: kkolinko
Date: Thu Nov 10 05:55:40 2011
New Revision: 1200171
URL: http://svn.apache.org/viewvc?rev=1200171view=rev
Log:
Merging revision 1187781 from tomcat/trunk:
Whitespace removal from /java/org/apache/tomcat
I won't merge all of it (as it spans bcel etc.), but only our code.
Part 7, the last one.
I am not updating mergeinfo, because not all of the original revision was
merged.
Modified:
tomcat/tc7.0.x/trunk/java/org/apache/tomcat/util/threads/Constants.java
tomcat/tc7.0.x/trunk/java/org/apache/tomcat/util/threads/LimitLatch.java
tomcat/tc7.0.x/trunk/java/org/apache/tomcat/util/threads/ResizableExecutor.java
tomcat/tc7.0.x/trunk/java/org/apache/tomcat/util/threads/TaskQueue.java
tomcat/tc7.0.x/trunk/java/org/apache/tomcat/util/threads/TaskThread.java
tomcat/tc7.0.x/trunk/java/org/apache/tomcat/util/threads/TaskThreadFactory.java
tomcat/tc7.0.x/trunk/java/org/apache/tomcat/util/threads/ThreadPoolExecutor.java
Modified:
tomcat/tc7.0.x/trunk/java/org/apache/tomcat/util/threads/Constants.java
URL:
http://svn.apache.org/viewvc/tomcat/tc7.0.x/trunk/java/org/apache/tomcat/util/threads/Constants.java?rev=1200171r1=1200170r2=1200171view=diff
==
--- tomcat/tc7.0.x/trunk/java/org/apache/tomcat/util/threads/Constants.java
(original)
+++ tomcat/tc7.0.x/trunk/java/org/apache/tomcat/util/threads/Constants.java Thu
Nov 10 05:55:40 2011
@@ -5,9 +5,9 @@
* 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.
Modified:
tomcat/tc7.0.x/trunk/java/org/apache/tomcat/util/threads/LimitLatch.java
URL:
http://svn.apache.org/viewvc/tomcat/tc7.0.x/trunk/java/org/apache/tomcat/util/threads/LimitLatch.java?rev=1200171r1=1200170r2=1200171view=diff
==
--- tomcat/tc7.0.x/trunk/java/org/apache/tomcat/util/threads/LimitLatch.java
(original)
+++ tomcat/tc7.0.x/trunk/java/org/apache/tomcat/util/threads/LimitLatch.java
Thu Nov 10 05:55:40 2011
@@ -56,7 +56,7 @@ public class LimitLatch {
private final AtomicLong count;
private volatile long limit;
private volatile boolean released = false;
-
+
/**
* Instantiates a LimitLatch object with an initial limit.
* @param limit - maximum number of concurrent acquisitions of this latch
@@ -83,7 +83,7 @@ public class LimitLatch {
* the new limit. If the limit is increased, threads currently in the queue
* may not be issued one of the newly available shares until the next
* request is made for a latch.
- *
+ *
* @param limit The new limit
*/
public void setLimit(long limit) {
@@ -107,7 +107,7 @@ public class LimitLatch {
sync.releaseShared(0);
return count.get();
}
-
+
/**
* Releases all waiting threads and causes the {@link #limit} to be ignored
* until {@link #reset()} is called.
@@ -116,7 +116,7 @@ public class LimitLatch {
released = true;
return sync.releaseShared(0);
}
-
+
/**
* Resets the latch and initializes the shared acquisition counter to zero.
* @see #releaseAll()
@@ -125,7 +125,7 @@ public class LimitLatch {
this.count.set(0);
released = false;
}
-
+
/**
* Returns codetrue/code if there is at least one thread waiting to
* acquire the shared lock, otherwise returns codefalse/code.
Modified:
tomcat/tc7.0.x/trunk/java/org/apache/tomcat/util/threads/ResizableExecutor.java
URL:
http://svn.apache.org/viewvc/tomcat/tc7.0.x/trunk/java/org/apache/tomcat/util/threads/ResizableExecutor.java?rev=1200171r1=1200170r2=1200171view=diff
==
---
tomcat/tc7.0.x/trunk/java/org/apache/tomcat/util/threads/ResizableExecutor.java
(original)
+++
tomcat/tc7.0.x/trunk/java/org/apache/tomcat/util/threads/ResizableExecutor.java
Thu Nov 10 05:55:40 2011
@@ -5,9 +5,9 @@
* 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.
@@ -26,7 +26,7 @@ public interface
svn commit: r1200173 - in /tomcat/tc7.0.x/trunk/java/org/apache/catalina/connector: ClientAbortException.java CometEventImpl.java Connector.java Constants.java
Author: kkolinko
Date: Thu Nov 10 06:11:10 2011
New Revision: 1200173
URL: http://svn.apache.org/viewvc?rev=1200173view=rev
Log:
Merged revision 1187753 from tomcat/trunk:
Clean-up. No functional change.
Part 1 of n.
Modified:
tomcat/tc7.0.x/trunk/java/org/apache/catalina/connector/ClientAbortException.java
tomcat/tc7.0.x/trunk/java/org/apache/catalina/connector/CometEventImpl.java
tomcat/tc7.0.x/trunk/java/org/apache/catalina/connector/Connector.java
tomcat/tc7.0.x/trunk/java/org/apache/catalina/connector/Constants.java
Modified:
tomcat/tc7.0.x/trunk/java/org/apache/catalina/connector/ClientAbortException.java
URL:
http://svn.apache.org/viewvc/tomcat/tc7.0.x/trunk/java/org/apache/catalina/connector/ClientAbortException.java?rev=1200173r1=1200172r2=1200173view=diff
==
---
tomcat/tc7.0.x/trunk/java/org/apache/catalina/connector/ClientAbortException.java
(original)
+++
tomcat/tc7.0.x/trunk/java/org/apache/catalina/connector/ClientAbortException.java
Thu Nov 10 06:11:10 2011
@@ -5,17 +5,15 @@
* 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.connector;
import java.io.IOException;
@@ -32,7 +30,7 @@ public final class ClientAbortException
private static final long serialVersionUID = 1L;
-
+
// Constructors
/**
@@ -119,12 +117,12 @@ public final class ClientAbortException
*/
@Override
public Throwable getCause() {
-
+
return (throwable);
-
+
}
-
+
/**
* Return a formatted string that describes this exception.
*/
Modified:
tomcat/tc7.0.x/trunk/java/org/apache/catalina/connector/CometEventImpl.java
URL:
http://svn.apache.org/viewvc/tomcat/tc7.0.x/trunk/java/org/apache/catalina/connector/CometEventImpl.java?rev=1200173r1=1200172r2=1200173view=diff
==
--- tomcat/tc7.0.x/trunk/java/org/apache/catalina/connector/CometEventImpl.java
(original)
+++ tomcat/tc7.0.x/trunk/java/org/apache/catalina/connector/CometEventImpl.java
Thu Nov 10 06:11:10 2011
@@ -5,17 +5,15 @@
* 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.connector;
import java.io.IOException;
@@ -45,7 +43,7 @@ public class CometEventImpl implements C
// - Instance Variables
-
+
/**
* Associated request.
*/
@@ -57,18 +55,18 @@ public class CometEventImpl implements C
*/
protected Response response = null;
-
+
/**
* Event type.
*/
protected EventType eventType = EventType.BEGIN;
-
+
/**
* Event sub type.
*/
protected EventSubType eventSubType = null;
-
+
// - Public Methods
@@ -83,11 +81,11 @@ public class CometEventImpl implements C
public void setEventType(EventType eventType) {
this.eventType = eventType;
}
-
+
public void setEventSubType(EventSubType eventSubType) {
this.eventSubType = eventSubType;
}
-
+
@Override
public void close() throws IOException {
if (request == null) {
@@ -125,12 +123,14 @@ public class CometEventImpl implements C
UnsupportedOperationException {
if (request.getAttribute(org.apache.tomcat.comet.timeout.support) ==
Boolean.TRUE) {
request.setAttribute(org.apache.tomcat.comet.timeout,
Integer.valueOf(timeout));
-if (request.isComet()) request.setCometTimeout(timeout);
+if (request.isComet()) {
+request.setCometTimeout(timeout);
+}
} else {
throw new
svn commit: r1200174 - in /tomcat/tc7.0.x/trunk/java/org/apache/catalina/connector: CoyoteAdapter.java CoyoteInputStream.java CoyoteOutputStream.java CoyotePrincipal.java CoyoteReader.java CoyoteWrite
Author: kkolinko
Date: Thu Nov 10 06:12:08 2011
New Revision: 1200174
URL: http://svn.apache.org/viewvc?rev=1200174view=rev
Log:
Merged revision 1187753 from tomcat/trunk:
Clean-up. No functional change.
Part 2.
Modified:
tomcat/tc7.0.x/trunk/java/org/apache/catalina/connector/CoyoteAdapter.java
tomcat/tc7.0.x/trunk/java/org/apache/catalina/connector/CoyoteInputStream.java
tomcat/tc7.0.x/trunk/java/org/apache/catalina/connector/CoyoteOutputStream.java
tomcat/tc7.0.x/trunk/java/org/apache/catalina/connector/CoyotePrincipal.java
tomcat/tc7.0.x/trunk/java/org/apache/catalina/connector/CoyoteReader.java
tomcat/tc7.0.x/trunk/java/org/apache/catalina/connector/CoyoteWriter.java
Modified:
tomcat/tc7.0.x/trunk/java/org/apache/catalina/connector/CoyoteAdapter.java
URL:
http://svn.apache.org/viewvc/tomcat/tc7.0.x/trunk/java/org/apache/catalina/connector/CoyoteAdapter.java?rev=1200174r1=1200173r2=1200174view=diff
==
--- tomcat/tc7.0.x/trunk/java/org/apache/catalina/connector/CoyoteAdapter.java
(original)
+++ tomcat/tc7.0.x/trunk/java/org/apache/catalina/connector/CoyoteAdapter.java
Thu Nov 10 06:12:08 2011
@@ -14,8 +14,6 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-
-
package org.apache.catalina.connector;
import java.io.IOException;
Modified:
tomcat/tc7.0.x/trunk/java/org/apache/catalina/connector/CoyoteInputStream.java
URL:
http://svn.apache.org/viewvc/tomcat/tc7.0.x/trunk/java/org/apache/catalina/connector/CoyoteInputStream.java?rev=1200174r1=1200173r2=1200174view=diff
==
---
tomcat/tc7.0.x/trunk/java/org/apache/catalina/connector/CoyoteInputStream.java
(original)
+++
tomcat/tc7.0.x/trunk/java/org/apache/catalina/connector/CoyoteInputStream.java
Thu Nov 10 06:12:08 2011
@@ -5,17 +5,15 @@
* 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.connector;
import java.io.IOException;
@@ -29,7 +27,7 @@ import org.apache.catalina.security.Secu
/**
* This class handles reading bytes.
- *
+ *
* @author Remy Maucherat
* @author Jean-Francois Arcand
*/
@@ -80,11 +78,11 @@ public class CoyoteInputStream
@Override
public int read()
-throws IOException {
+throws IOException {
if (SecurityUtil.isPackageProtectionEnabled()){
-
+
try{
-Integer result =
+Integer result =
AccessController.doPrivileged(
new PrivilegedExceptionActionInteger(){
@@ -111,10 +109,10 @@ public class CoyoteInputStream
@Override
public int available() throws IOException {
-
+
if (SecurityUtil.isPackageProtectionEnabled()){
try{
-Integer result =
+Integer result =
AccessController.doPrivileged(
new PrivilegedExceptionActionInteger(){
@@ -136,21 +134,21 @@ public class CoyoteInputStream
}
} else {
return ib.available();
-}
+}
}
@Override
public int read(final byte[] b) throws IOException {
-
+
if (SecurityUtil.isPackageProtectionEnabled()){
try{
-Integer result =
+Integer result =
AccessController.doPrivileged(
new PrivilegedExceptionActionInteger(){
@Override
public Integer run() throws IOException{
-Integer integer =
+Integer integer =
Integer.valueOf(ib.read(b, 0, b.length));
return integer;
}
@@ -167,23 +165,23 @@ public class CoyoteInputStream
}
} else {
return ib.read(b, 0, b.length);
- }
+ }
}
@Override
public int read(final byte[] b, final int off, final int len)
throws IOException {
-
+
if (SecurityUtil.isPackageProtectionEnabled()){
try{
-Integer result =
+Integer result =
svn commit: r1200175 - in /tomcat/tc7.0.x/trunk/java/org/apache/catalina/connector: InputBuffer.java MapperListener.java OutputBuffer.java
Author: kkolinko
Date: Thu Nov 10 06:13:21 2011
New Revision: 1200175
URL: http://svn.apache.org/viewvc?rev=1200175view=rev
Log:
Merged revision 1187753 from tomcat/trunk:
Clean-up. No functional change.
Part 3.
Modified:
tomcat/tc7.0.x/trunk/java/org/apache/catalina/connector/InputBuffer.java
tomcat/tc7.0.x/trunk/java/org/apache/catalina/connector/MapperListener.java
tomcat/tc7.0.x/trunk/java/org/apache/catalina/connector/OutputBuffer.java
Modified:
tomcat/tc7.0.x/trunk/java/org/apache/catalina/connector/InputBuffer.java
URL:
http://svn.apache.org/viewvc/tomcat/tc7.0.x/trunk/java/org/apache/catalina/connector/InputBuffer.java?rev=1200175r1=1200174r2=1200175view=diff
==
--- tomcat/tc7.0.x/trunk/java/org/apache/catalina/connector/InputBuffer.java
(original)
+++ tomcat/tc7.0.x/trunk/java/org/apache/catalina/connector/InputBuffer.java
Thu Nov 10 06:13:21 2011
@@ -5,16 +5,15 @@
* 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.connector;
import java.io.IOException;
@@ -35,7 +34,7 @@ import org.apache.tomcat.util.res.String
/**
* The buffer used by Tomcat request. This is a derivative of the Tomcat 3.3
- * OutputBuffer, adapted to handle input instead of output. This allows
+ * OutputBuffer, adapted to handle input instead of output. This allows
* complete recycling of the facade objects (the ServletInputStream and the
* BufferedReader).
*
@@ -55,7 +54,7 @@ public class InputBuffer extends Reader
// -- Constants
-public static final String DEFAULT_ENCODING =
+public static final String DEFAULT_ENCODING =
org.apache.coyote.Constants.DEFAULT_CHARACTER_ENCODING;
public static final int DEFAULT_BUFFER_SIZE = 8*1024;
@@ -71,7 +70,7 @@ public class InputBuffer extends Reader
/**
* The byte buffer.
*/
-private ByteChunk bb;
+private final ByteChunk bb;
/**
@@ -150,7 +149,7 @@ public class InputBuffer extends Reader
/**
* Alternate constructor which allows specifying the initial buffer size.
- *
+ *
* @param size Buffer size to use
*/
public InputBuffer(int size) {
@@ -173,7 +172,7 @@ public class InputBuffer extends Reader
/**
* Associated Coyote request.
- *
+ *
* @param coyoteRequest Associated Coyote request
*/
public void setRequest(Request coyoteRequest) {
@@ -183,7 +182,7 @@ public class InputBuffer extends Reader
/**
* Get associated Coyote request.
- *
+ *
* @return the associated Coyote request
*/
@Deprecated
@@ -199,9 +198,9 @@ public class InputBuffer extends Reader
* Recycle the output buffer.
*/
public void recycle() {
-
+
state = INITIAL_STATE;
-
+
// If usage of mark made the buffer too big, reallocate it
if (cb.getChars().length size) {
cb = new CharChunk(size);
@@ -213,16 +212,16 @@ public class InputBuffer extends Reader
cb.recycle();
}
markPos = -1;
-bb.recycle();
+bb.recycle();
closed = false;
-
+
if (conv != null) {
conv.recycle();
}
-
+
gotEnc = false;
enc = null;
-
+
}
@@ -232,11 +231,11 @@ public class InputBuffer extends Reader
public void clearEncoders() {
encoders.clear();
}
-
-
+
+
/**
* Close the input buffer.
- *
+ *
* @throws IOException An underlying IOException occurred
*/
@Override
@@ -264,26 +263,29 @@ public class InputBuffer extends Reader
// - Bytes Handling Methods
-/**
+/**
* Reads new bytes in the byte chunk.
- *
+ *
* @param cbuf Byte buffer to be written to the response
* @param off Offset
* @param len Length
- *
+ *
* @throws IOException An underlying IOException occurred
*/
@Override
public int realReadBytes(byte cbuf[], int off, int len)
throws IOException {
-if (closed)
+if (closed) {
return -1;
-if (coyoteRequest == null)
+}
+if (coyoteRequest == null) {
return
svn commit: r1200176 - /tomcat/tc7.0.x/trunk/java/org/apache/catalina/connector/Request.java
Author: kkolinko
Date: Thu Nov 10 06:14:08 2011
New Revision: 1200176
URL: http://svn.apache.org/viewvc?rev=1200176view=rev
Log:
Merged revision 1187753 from tomcat/trunk:
Clean-up. No functional change.
Part 4.
Modified:
tomcat/tc7.0.x/trunk/java/org/apache/catalina/connector/Request.java
Modified: tomcat/tc7.0.x/trunk/java/org/apache/catalina/connector/Request.java
URL:
http://svn.apache.org/viewvc/tomcat/tc7.0.x/trunk/java/org/apache/catalina/connector/Request.java?rev=1200176r1=1200175r2=1200176view=diff
==
--- tomcat/tc7.0.x/trunk/java/org/apache/catalina/connector/Request.java
(original)
+++ tomcat/tc7.0.x/trunk/java/org/apache/catalina/connector/Request.java Thu
Nov 10 06:14:08 2011
@@ -5,17 +5,15 @@
* 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.connector;
@@ -109,7 +107,7 @@ public class Request
implements HttpServletRequest {
private static final Log log = LogFactory.getLog(Request.class);
-
+
// --- Constructors
@@ -132,7 +130,7 @@ public class Request
/**
* Set the Coyote request.
- *
+ *
* @param coyoteRequest The Coyote request
*/
public void setCoyoteRequest(org.apache.coyote.Request coyoteRequest) {
@@ -203,7 +201,7 @@ public class Request
/**
* List of read only attributes for this Request.
*/
-private HashMapString,Object readOnlyAttributes =
+private final HashMapString,Object readOnlyAttributes =
new HashMapString,Object();
@@ -225,19 +223,19 @@ public class Request
*/
protected String authType = null;
-
+
/**
* Associated event.
*/
protected CometEventImpl event = null;
-
+
/**
* Comet state
*/
protected boolean comet = false;
-
-
+
+
/**
* The current dispatcher type.
*/
@@ -253,7 +251,7 @@ public class Request
/**
* ServletInputStream.
*/
-protected CoyoteInputStream inputStream =
+protected CoyoteInputStream inputStream =
new CoyoteInputStream(inputBuffer);
@@ -305,7 +303,7 @@ public class Request
*/
protected boolean secure = false;
-
+
/**
* The Subject associated with the current AccessControllerContext
*/
@@ -329,14 +327,14 @@ public class Request
* The parts, if any, uploaded with this request.
*/
protected CollectionPart parts = null;
-
-
+
+
/**
* The exception thrown, if any when parsing the parts.
*/
protected Exception partsParseException = null;
-
-
+
+
/**
* The currently active session for this request.
*/
@@ -382,7 +380,7 @@ public class Request
/**
* The string parser we will use for parsing request lines.
*/
-private StringParser parser = new StringParser();
+private final StringParser parser = new StringParser();
/**
@@ -401,31 +399,31 @@ public class Request
*/
protected String remoteHost = null;
-
+
/**
* Remote port
*/
protected int remotePort = -1;
-
+
/**
* Local address
*/
protected String localAddr = null;
-
+
/**
* Local address
*/
protected String localName = null;
-
+
/**
- * AsyncContext
+ * AsyncContext
*/
protected volatile AsyncContextImpl asyncContext = null;
-
+
protected Boolean asyncSupported = null;
-
-
+
+
/**
* Path parameters
*/
@@ -433,7 +431,7 @@ public class Request
// - Public Methods
-
+
protected void addPathParameter(String name, String value) {
pathParameters.put(name, value);
}
@@ -463,7 +461,7 @@ public class Request
event.clear();
event = null;
}
-
+
authType = null;
inputBuffer.recycle();
usingInputStream = false;
@@ -526,9 +524,11 @@ public class Request
reader = null;
}
}
-
+
asyncSupported = null;
-if (asyncContext!=null) asyncContext.recycle();
+if (asyncContext!=null) {
+asyncContext.recycle();
+}
asyncContext = null;
svn commit: r1200178 - in /tomcat/tc7.0.x/trunk/java/org/apache/catalina/connector: RequestFacade.java Response.java ResponseFacade.java
Author: kkolinko
Date: Thu Nov 10 06:14:46 2011
New Revision: 1200178
URL: http://svn.apache.org/viewvc?rev=1200178view=rev
Log:
Merged revision 1187753 from tomcat/trunk:
Clean-up. No functional change.
Part 5.
Modified:
tomcat/tc7.0.x/trunk/java/org/apache/catalina/connector/RequestFacade.java
tomcat/tc7.0.x/trunk/java/org/apache/catalina/connector/Response.java
tomcat/tc7.0.x/trunk/java/org/apache/catalina/connector/ResponseFacade.java
Modified:
tomcat/tc7.0.x/trunk/java/org/apache/catalina/connector/RequestFacade.java
URL:
http://svn.apache.org/viewvc/tomcat/tc7.0.x/trunk/java/org/apache/catalina/connector/RequestFacade.java?rev=1200178r1=1200177r2=1200178view=diff
==
--- tomcat/tc7.0.x/trunk/java/org/apache/catalina/connector/RequestFacade.java
(original)
+++ tomcat/tc7.0.x/trunk/java/org/apache/catalina/connector/RequestFacade.java
Thu Nov 10 06:14:46 2011
@@ -5,17 +5,15 @@
* 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.connector;
import java.io.BufferedReader;
@@ -46,7 +44,7 @@ import org.apache.catalina.security.Secu
import org.apache.tomcat.util.res.StringManager;
/**
- * Facade class that wraps a Coyote request object.
+ * Facade class that wraps a Coyote request object.
* All methods are delegated to the wrapped request.
*
* @author Craig R. McClanahan
@@ -57,46 +55,46 @@ import org.apache.tomcat.util.res.String
@SuppressWarnings(deprecation)
public class RequestFacade implements HttpServletRequest {
-
-
+
+
// --- DoPrivileged
-
+
private final class GetAttributePrivilegedAction
implements PrivilegedActionEnumerationString {
-
+
@Override
public EnumerationString run() {
return request.getAttributeNames();
-}
+}
}
-
-
+
+
private final class GetParameterMapPrivilegedAction
implements PrivilegedActionMapString,String[] {
-
+
@Override
public MapString,String[] run() {
return request.getParameterMap();
-}
-}
-
-
+}
+}
+
+
private final class GetRequestDispatcherPrivilegedAction
implements PrivilegedActionRequestDispatcher {
-private String path;
+private final String path;
public GetRequestDispatcherPrivilegedAction(String path){
this.path = path;
}
-
+
@Override
-public RequestDispatcher run() {
+public RequestDispatcher run() {
return request.getRequestDispatcher(path);
-}
-}
-
-
+}
+}
+
+
private final class GetParameterPrivilegedAction
implements PrivilegedActionString {
@@ -107,22 +105,22 @@ public class RequestFacade implements Ht
}
@Override
-public String run() {
+public String run() {
return request.getParameter(name);
-}
-}
-
-
+}
+}
+
+
private final class GetParameterNamesPrivilegedAction
implements PrivilegedActionEnumerationString {
-
+
@Override
-public EnumerationString run() {
+public EnumerationString run() {
return request.getParameterNames();
-}
-}
-
-
+}
+}
+
+
private final class GetParameterValuePrivilegedAction
implements PrivilegedActionString[] {
@@ -133,90 +131,90 @@ public class RequestFacade implements Ht
}
@Override
-public String[] run() {
+public String[] run() {
return request.getParameterValues(name);
-}
-}
-
-
+}
+}
+
+
private final class GetCookiesPrivilegedAction
implements PrivilegedActionCookie[] {
-
+
@Override
-public Cookie[] run() {
+public Cookie[] run() {
return request.getCookies();
-}
-}
-
-
+}
+}
+
+
private final class GetCharacterEncodingPrivilegedAction
implements PrivilegedActionString {
-
+
@Override
-
svn commit: r1200180 - in /tomcat/tc7.0.x/trunk/java/org/apache/tomcat/util/buf: Ascii.java B2CConverter.java Constants.java HexUtils.java
Author: kkolinko
Date: Thu Nov 10 06:23:25 2011
New Revision: 1200180
URL: http://svn.apache.org/viewvc?rev=1200180view=rev
Log:
Merged revision 1187753 from tomcat/trunk:
Clean-up. No functional change.
Part 6.
Modified:
tomcat/tc7.0.x/trunk/java/org/apache/tomcat/util/buf/Ascii.java
tomcat/tc7.0.x/trunk/java/org/apache/tomcat/util/buf/B2CConverter.java
tomcat/tc7.0.x/trunk/java/org/apache/tomcat/util/buf/Constants.java
tomcat/tc7.0.x/trunk/java/org/apache/tomcat/util/buf/HexUtils.java
Modified: tomcat/tc7.0.x/trunk/java/org/apache/tomcat/util/buf/Ascii.java
URL:
http://svn.apache.org/viewvc/tomcat/tc7.0.x/trunk/java/org/apache/tomcat/util/buf/Ascii.java?rev=1200180r1=1200179r2=1200180view=diff
==
--- tomcat/tc7.0.x/trunk/java/org/apache/tomcat/util/buf/Ascii.java (original)
+++ tomcat/tc7.0.x/trunk/java/org/apache/tomcat/util/buf/Ascii.java Thu Nov 10
06:23:25 2011
@@ -14,7 +14,6 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-
package org.apache.tomcat.util.buf;
/**
@@ -197,7 +196,7 @@ public final class Ascii {
long n = c - '0';
long m;
-
+
while (--len 0) {
if (!isDigit(c = b[off++])) {
throw new NumberFormatException();
Modified: tomcat/tc7.0.x/trunk/java/org/apache/tomcat/util/buf/B2CConverter.java
URL:
http://svn.apache.org/viewvc/tomcat/tc7.0.x/trunk/java/org/apache/tomcat/util/buf/B2CConverter.java?rev=1200180r1=1200179r2=1200180view=diff
==
--- tomcat/tc7.0.x/trunk/java/org/apache/tomcat/util/buf/B2CConverter.java
(original)
+++ tomcat/tc7.0.x/trunk/java/org/apache/tomcat/util/buf/B2CConverter.java Thu
Nov 10 06:23:25 2011
@@ -14,8 +14,6 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-
-
package org.apache.tomcat.util.buf;
import java.io.IOException;
@@ -30,7 +28,7 @@ import java.util.Map;
import org.apache.tomcat.util.res.StringManager;
/** Efficient conversion of bytes to character .
- *
+ *
* This uses the standard JDK mechanism - a reader - but provides mechanisms
* to recycle all the objects that are used. It is compatible with JDK1.1
* and up,
@@ -41,11 +39,11 @@ import org.apache.tomcat.util.res.String
* be used in a later version or after the remaining optimizations.
*/
public class B2CConverter {
-
-
+
+
private static final org.apache.juli.logging.Log log=
org.apache.juli.logging.LogFactory.getLog( B2CConverter.class );
-
+
private static final StringManager sm =
StringManager.getManager(Constants.Package);
@@ -70,7 +68,7 @@ public class B2CConverter {
String lowerCaseEnc = enc.toLowerCase(Locale.US);
Charset charset = encodingToCharsetCache.get(lowerCaseEnc);
-
+
if (charset == null) {
// Pre-population of the cache means this must be invalid
throw new UnsupportedEncodingException(
@@ -78,14 +76,14 @@ public class B2CConverter {
}
return charset;
}
-
+
private IntermediateInputStream iis;
private ReadConvertor conv;
private String encoding;
protected B2CConverter() {
}
-
+
/** Create a converter, with bytes going to a byte buffer
*/
public B2CConverter(String encoding)
@@ -95,7 +93,7 @@ public class B2CConverter {
reset();
}
-
+
/** Reset the internal state, empty the buffers.
* The encoding remain in effect, the internal buffers remain allocated.
*/
@@ -127,19 +125,22 @@ public class B2CConverter {
int cnt=conv.read( result, 0, size );
if( cnt = 0 ) {
// End of stream ! - we may be in a bad state
-if(log.isDebugEnabled())
+if(log.isDebugEnabled()) {
log.debug(B2CConverter: EOF);
+}
return;
}
-if(log.isDebugEnabled())
+if(log.isDebugEnabled()) {
log.debug(B2CConverter: Converted: +
new String(result, 0, cnt));
+}
cb.append( result, 0, cnt );
limit = limit - (bbLengthBeforeRead - bb.getLength());
}
} catch( IOException ex) {
-if(log.isDebugEnabled())
+if(log.isDebugEnabled()) {
log.debug(B2CConverter: Reseting the converter +
ex.toString());
+}
reset();
throw ex;
}
@@ -161,16 +162,16 @@ public class B2CConverter {
/**
- *
+ *
*/
final class ReadConvertor extends InputStreamReader {
-
+
/** Create a converter.
*/
public
svn commit: r1200181 - in /tomcat/tc7.0.x/trunk/java/org/apache/tomcat/util/buf: ByteChunk.java C2BConverter.java CharChunk.java
Author: kkolinko
Date: Thu Nov 10 06:24:07 2011
New Revision: 1200181
URL: http://svn.apache.org/viewvc?rev=1200181view=rev
Log:
Merged revision 1187753 from tomcat/trunk:
Clean-up. No functional change.
Part 7.
Modified:
tomcat/tc7.0.x/trunk/java/org/apache/tomcat/util/buf/ByteChunk.java
tomcat/tc7.0.x/trunk/java/org/apache/tomcat/util/buf/C2BConverter.java
tomcat/tc7.0.x/trunk/java/org/apache/tomcat/util/buf/CharChunk.java
Modified: tomcat/tc7.0.x/trunk/java/org/apache/tomcat/util/buf/ByteChunk.java
URL:
http://svn.apache.org/viewvc/tomcat/tc7.0.x/trunk/java/org/apache/tomcat/util/buf/ByteChunk.java?rev=1200181r1=1200180r2=1200181view=diff
==
--- tomcat/tc7.0.x/trunk/java/org/apache/tomcat/util/buf/ByteChunk.java
(original)
+++ tomcat/tc7.0.x/trunk/java/org/apache/tomcat/util/buf/ByteChunk.java Thu Nov
10 06:24:07 2011
@@ -14,7 +14,6 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-
package org.apache.tomcat.util.buf;
import java.io.IOException;
@@ -75,9 +74,9 @@ public final class ByteChunk implements
* Same as java.nio.channel.ReadableByteChannel
*/
public static interface ByteInputChannel {
-/**
+/**
* Read new bytes ( usually the internal conversion buffer ).
- * The implementation is allowed to ignore the parameters,
+ * The implementation is allowed to ignore the parameters,
* and mutate the chunk if it wishes to implement its own buffering.
*/
public int realReadBytes(byte cbuf[], int off, int len)
@@ -87,7 +86,7 @@ public final class ByteChunk implements
/** Same as java.nio.channel.WrittableByteChannel.
*/
public static interface ByteOutputChannel {
-/**
+/**
* Send the bytes ( usually the internal conversion buffer ).
* Expect 8k output if the buffer is full.
*/
@@ -99,10 +98,10 @@ public final class ByteChunk implements
/** Default encoding used to convert to strings. It should be UTF8,
as most standards seem to converge, but the servlet API requires
-8859_1, and this object is used mostly for servlets.
+8859_1, and this object is used mostly for servlets.
*/
public static final Charset DEFAULT_CHARSET;
-
+
static {
Charset c = null;
try {
@@ -130,7 +129,7 @@ public final class ByteChunk implements
private ByteOutputChannel out = null;
private boolean optimizedWrite=true;
-
+
/**
* Creates a new, uninitialized ByteChunk object.
*/
@@ -154,7 +153,7 @@ public final class ByteChunk implements
public boolean isNull() {
return ! isSet; // buff==null;
}
-
+
/**
* Resets the message buff to an uninitialized state.
*/
@@ -175,7 +174,7 @@ public final class ByteChunk implements
public void allocate( int initial, int limit ) {
if( buff==null || buff.length initial ) {
buff=new byte[initial];
-}
+}
this.limit=limit;
start=0;
end=0;
@@ -184,7 +183,7 @@ public final class ByteChunk implements
/**
* Sets the message bytes to the specified subarray of bytes.
- *
+ *
* @param b the ascii bytes
* @param off the start offset of the bytes
* @param len the length of the bytes
@@ -238,7 +237,9 @@ public final class ByteChunk implements
}
public void setOffset(int off) {
-if (end off ) end=off;
+if (end off ) {
+end=off;
+}
start=off;
}
@@ -260,7 +261,7 @@ public final class ByteChunk implements
public void setLimit(int limit) {
this.limit=limit;
}
-
+
public int getLimit() {
return limit;
}
@@ -385,11 +386,13 @@ public final class ByteChunk implements
throws IOException {
if ((end - start) == 0) {
-if (in == null)
+if (in == null) {
return -1;
+}
int n = in.realReadBytes( buff, 0, buff.length );
-if (n 0)
+if (n 0) {
return -1;
+}
}
return (buff[start++] 0xFF);
@@ -400,11 +403,13 @@ public final class ByteChunk implements
throws IOException {
if ((end - start) == 0) {
-if (in == null)
+if (in == null) {
return -1;
+}
int n = in.realReadBytes( buff, 0, buff.length );
-if (n 0)
+if (n 0) {
return -1;
+}
}
int len = getLength();
@@ -418,11 +423,13 @@ public final class ByteChunk implements
throws IOException {
if ((end - start) == 0) {
-if (in == null)
+if (in ==
svn commit: r1200182 - in /tomcat/tc7.0.x/trunk/java/org/apache/tomcat/util/buf: MessageBytes.java StringCache.java UDecoder.java UEncoder.java
Author: kkolinko
Date: Thu Nov 10 06:24:38 2011
New Revision: 1200182
URL: http://svn.apache.org/viewvc?rev=1200182view=rev
Log:
Merged revision 1187753 from tomcat/trunk:
Clean-up. No functional change.
Part 8.
Modified:
tomcat/tc7.0.x/trunk/java/org/apache/tomcat/util/buf/MessageBytes.java
tomcat/tc7.0.x/trunk/java/org/apache/tomcat/util/buf/StringCache.java
tomcat/tc7.0.x/trunk/java/org/apache/tomcat/util/buf/UDecoder.java
tomcat/tc7.0.x/trunk/java/org/apache/tomcat/util/buf/UEncoder.java
Modified: tomcat/tc7.0.x/trunk/java/org/apache/tomcat/util/buf/MessageBytes.java
URL:
http://svn.apache.org/viewvc/tomcat/tc7.0.x/trunk/java/org/apache/tomcat/util/buf/MessageBytes.java?rev=1200182r1=1200181r2=1200182view=diff
==
--- tomcat/tc7.0.x/trunk/java/org/apache/tomcat/util/buf/MessageBytes.java
(original)
+++ tomcat/tc7.0.x/trunk/java/org/apache/tomcat/util/buf/MessageBytes.java Thu
Nov 10 06:24:38 2011
@@ -14,7 +14,6 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-
package org.apache.tomcat.util.buf;
import java.io.IOException;
@@ -45,20 +44,20 @@ public final class MessageBytes implemen
was a String */
public static final int T_STR = 1;
/** getType() is T_STR if the the object used to create the MessageBytes
-was a byte[] */
+was a byte[] */
public static final int T_BYTES = 2;
/** getType() is T_STR if the the object used to create the MessageBytes
-was a char[] */
+was a char[] */
public static final int T_CHARS = 3;
private int hashCode=0;
-// did we computed the hashcode ?
+// did we computed the hashcode ?
private boolean hasHashCode=false;
// Internal objects to represent array + offset, and specific methods
-private ByteChunk byteC=new ByteChunk();
-private CharChunk charC=new CharChunk();
-
+private final ByteChunk byteC=new ByteChunk();
+private final CharChunk charC=new CharChunk();
+
// String
private String strValue;
// true if a String value was computed. Probably not needed,
@@ -92,7 +91,7 @@ public final class MessageBytes implemen
return byteC.isNull() charC.isNull() ! hasStrValue;
// bytes==null strValue==null;
}
-
+
/**
* Resets the message bytes to an uninitialized (NULL) state.
*/
@@ -139,7 +138,7 @@ public final class MessageBytes implemen
byteC.setCharset(charset);
}
-/**
+/**
* Sets the content to be a char[]
*
* @param c the bytes
@@ -155,7 +154,7 @@ public final class MessageBytes implemen
hasLongValue=false;
}
-/**
+/**
* Set the content to be a string
*/
public void setString( String s ) {
@@ -178,8 +177,10 @@ public final class MessageBytes implemen
*/
@Override
public String toString() {
-if( hasStrValue ) return strValue;
-
+if( hasStrValue ) {
+return strValue;
+}
+
switch (type) {
case T_CHARS:
strValue=charC.toString();
@@ -200,7 +201,7 @@ public final class MessageBytes implemen
public int getType() {
return type;
}
-
+
/**
* Returns the byte chunk, representing the byte[] and offset/length.
* Valid only if T_BYTES or after a conversion was made.
@@ -252,7 +253,7 @@ public final class MessageBytes implemen
char cc[]=strValue.toCharArray();
charC.setChars(cc, 0, cc.length);
}
-
+
/**
* Returns the length of the original buffer.
@@ -260,15 +261,19 @@ public final class MessageBytes implemen
* in chars.
*/
public int getLength() {
-if(type==T_BYTES)
+if(type==T_BYTES) {
return byteC.getLength();
+}
if(type==T_CHARS) {
return charC.getLength();
}
-if(type==T_STR)
+if(type==T_STR) {
return strValue.length();
+}
toString();
-if( strValue==null ) return 0;
+if( strValue==null ) {
+return 0;
+}
return strValue.length();
}
@@ -282,7 +287,9 @@ public final class MessageBytes implemen
public boolean equals(String s) {
switch (type) {
case T_STR:
-if (strValue == null) return s == null;
+if (strValue == null) {
+return s == null;
+}
return strValue.equals( s );
case T_CHARS:
return charC.equals( s );
@@ -301,7 +308,9 @@ public final class MessageBytes implemen
public boolean equalsIgnoreCase(String s) {
switch (type) {
case T_STR:
-if (strValue == null) return s == null;
+if (strValue == null) {
+return s == null;
+}
svn commit: r1200183 - in /tomcat/tc7.0.x/trunk/java/org/apache/tomcat/util/http: ContentType.java CookieSupport.java Cookies.java ServerCookie.java
Author: kkolinko
Date: Thu Nov 10 06:26:26 2011
New Revision: 1200183
URL: http://svn.apache.org/viewvc?rev=1200183view=rev
Log:
Merged revision 1187753 from tomcat/trunk:
Clean-up. No functional change.
Part 9
Modified:
tomcat/tc7.0.x/trunk/java/org/apache/tomcat/util/http/ContentType.java
tomcat/tc7.0.x/trunk/java/org/apache/tomcat/util/http/CookieSupport.java
tomcat/tc7.0.x/trunk/java/org/apache/tomcat/util/http/Cookies.java
tomcat/tc7.0.x/trunk/java/org/apache/tomcat/util/http/ServerCookie.java
Modified: tomcat/tc7.0.x/trunk/java/org/apache/tomcat/util/http/ContentType.java
URL:
http://svn.apache.org/viewvc/tomcat/tc7.0.x/trunk/java/org/apache/tomcat/util/http/ContentType.java?rev=1200183r1=1200182r2=1200183view=diff
==
--- tomcat/tc7.0.x/trunk/java/org/apache/tomcat/util/http/ContentType.java
(original)
+++ tomcat/tc7.0.x/trunk/java/org/apache/tomcat/util/http/ContentType.java Thu
Nov 10 06:26:26 2011
@@ -14,13 +14,12 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-
package org.apache.tomcat.util.http;
/**
* Useful methods for Content-Type processing
- *
+ *
* @author James Duncan Davidson [dun...@eng.sun.com]
* @author James Todd [go...@eng.sun.com]
* @author Jason Hunter [j...@eng.sun.com]
@@ -38,19 +37,23 @@ public class ContentType {
*/
public static String getCharsetFromContentType(String contentType) {
-if (contentType == null)
+if (contentType == null) {
return (null);
+}
int start = contentType.indexOf(charset=);
-if (start 0)
+if (start 0) {
return (null);
+}
String encoding = contentType.substring(start + 8);
int end = encoding.indexOf(';');
-if (end = 0)
+if (end = 0) {
encoding = encoding.substring(0, end);
+}
encoding = encoding.trim();
if ((encoding.length() 2) (encoding.startsWith(\))
- (encoding.endsWith(\)))
+ (encoding.endsWith(\))) {
encoding = encoding.substring(1, encoding.length() - 1);
+}
return (encoding.trim());
}
Modified:
tomcat/tc7.0.x/trunk/java/org/apache/tomcat/util/http/CookieSupport.java
URL:
http://svn.apache.org/viewvc/tomcat/tc7.0.x/trunk/java/org/apache/tomcat/util/http/CookieSupport.java?rev=1200183r1=1200182r2=1200183view=diff
==
--- tomcat/tc7.0.x/trunk/java/org/apache/tomcat/util/http/CookieSupport.java
(original)
+++ tomcat/tc7.0.x/trunk/java/org/apache/tomcat/util/http/CookieSupport.java
Thu Nov 10 06:26:26 2011
@@ -5,17 +5,15 @@
* The ASF licenses this file to You under the Apache License, Version 2.0
* (the License); you may not use this file except in compliance with
* the License. You may obtain a copy of the License at
- *
+ *
* http://www.apache.org/licenses/LICENSE-2.0
- *
+ *
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an AS IS BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-
-
package org.apache.tomcat.util.http;
@@ -44,7 +42,7 @@ public final class CookieSupport {
* inclusion of / depends on the value of {@link #FWD_SLASH_IS_SEPARATOR}.
*/
public static final boolean ALLOW_HTTP_SEPARATORS_IN_V0;
-
+
/**
* If set to false, we don't use the IE6/7 Max-Age/Expires work around.
* Default is usually true. If STRICT_SERVLET_COMPLIANCE==true then default
@@ -71,7 +69,7 @@ public final class CookieSupport {
*/
private static final char[] V0_SEPARATORS = {',', ';', ' ', '\t'};
private static final boolean[] V0_SEPARATOR_FLAGS = new boolean[128];
-
+
/**
* The list of separators that apply to version 1 cookies. This may or may
* not include '/' depending on the setting of
@@ -79,20 +77,20 @@ public final class CookieSupport {
*/
private static final char[] HTTP_SEPARATORS;
private static final boolean[] HTTP_SEPARATOR_FLAGS = new boolean[128];
-
+
static {
STRICT_SERVLET_COMPLIANCE = Boolean.valueOf(System.getProperty(
org.apache.catalina.STRICT_SERVLET_COMPLIANCE,
false)).booleanValue();
-
+
ALLOW_EQUALS_IN_VALUE = Boolean.valueOf(System.getProperty(
org.apache.tomcat.util.http.ServerCookie.ALLOW_EQUALS_IN_VALUE,
false)).booleanValue();
-
+
ALLOW_HTTP_SEPARATORS_IN_V0 = Boolean.valueOf(System.getProperty(
org.apache.tomcat.util.http.ServerCookie.ALLOW_HTTP_SEPARATORS_IN_V0,
svn commit: r1200184 - in /tomcat/tc7.0.x/trunk: ./ java/org/apache/tomcat/util/http/
Author: kkolinko Date: Thu Nov 10 06:27:27 2011 New Revision: 1200184 URL: http://svn.apache.org/viewvc?rev=1200184view=rev Log: Merged revision 1187753 from tomcat/trunk: Clean-up. No functional change. Part 10, the last one. Updating mergeinfo. Modified: tomcat/tc7.0.x/trunk/ (props changed) tomcat/tc7.0.x/trunk/java/org/apache/tomcat/util/http/FastHttpDateFormat.java tomcat/tc7.0.x/trunk/java/org/apache/tomcat/util/http/HttpMessages.java tomcat/tc7.0.x/trunk/java/org/apache/tomcat/util/http/MimeHeaders.java tomcat/tc7.0.x/trunk/java/org/apache/tomcat/util/http/Parameters.java Propchange: tomcat/tc7.0.x/trunk/ -- --- svn:mergeinfo (original) +++ svn:mergeinfo Thu Nov 10 06:27:27 2011 @@ -1 +1 @@ -/tomcat/trunk:1156115,1156171,1156276,1156304,1156519,1156530,1156602,1157015,1157018,1157151,1157198,1157204,1157810,1157832,1157834,1157847,1157908,1157939,1158155,1158160,1158176,1158195,1158198-1158199,1158227,1158331,1158334-1158335,1158426,1160347,1160592,1160611,1160619,1160626,1160639,1160652,1160720-1160721,1160772,1160774,1160776,1161303,1161310,1161322,1161339,1161486,1161540,1161549,1161584,1162082,1162149,1162169,1162721,1162769,1162836,1162932,1163630,1164419,1164438,1164469,1164480,1164567,1165234,1165247-1165248,1165253,1165273,1165282,1165309,1165331,1165338,1165347,1165360-1165361,1165367-1165368,1165602,1165608,1165677,1165693,1165721,1165723,1165728,1165730,1165738,1165746,1165765,1165777,1165918,1165921,1166077,1166150-1166151,1166290,1166366,1166620,1166686,1166693,1166752,1166757,1167368,1167394,1169447,1170647,1171692,1172233-1172234,1172236,1172269,1172278,1172282,1172556,1172610,1172664,1172689,1172711,1173020-1173021,1173082,1173088,1173090,1173096 ,1173241,1173256,1173288,117,1173342,1173461,1173614,1173630,1173659,1173722,1174061,1174239,1174322,1174325,1174329-1174330,1174337-1174339,1174343,1174353,1174799,1174882,1174884,1174983,1175155,1175158,1175167,1175182,1175190,1175201,1175272,1175275,1175283,1175582,1175589-1175590,1175594,1175602,1175613,1175633,1175690,1175713,1175798,1175889,1175896,1175907,1176584,1176590,1176799,1177050,1177060,1177125,1177152,1177160,1177245,1177850,1177862,1177978,1178209,1178228,1178233,1178449,1178542,1178681,1178684,1178721,1179268,1179274,1180261,1180865,1180891,1180894,1180907,1181028,1181123,1181125,1181136,1181291,1181743,1182796,1183078,1183105,1183142,1183328,1183339-1183340,1183492-1183494,1183605,1184917,1184919,1185018,1185020,1185200,1185588,1185626,1185756,1185758,1186011,1186042-1186045,1186104,1186123,1186137,1186153,1186254,1186257,1186377-1186379,1186479-1186480,1186712,1186743,1186750,1186763,1186890-1186892,1186894,1186949,1187018,1187027-1187028,1187381,1187 755,1187775,1187801,1187806,1187809,1187827,1188301,1188303-1188305,1188399,1188822,1188930-1188931,1189116,1189129,1189183,1189240,1189256,1189386,1189413-1189414,1189477,1189685,1189805,1189857,1189864,1189882,1190034,1190185,1190279,1190339,1190371,1190388-1190389,1190474,1190481,1194915,1195222-1195223,1195531,1195899,1195905,1195943,1195949,1195953,1195955,1195965,1195968,1196175,1196212,1196223,1196304-1196305,1196735,1196825,1196827,1197158,1197261,1197263,1197299-1197300,1197305,1197339-1197340,1197343,1197382,1197386-1197387,1197480,1197578,1198497,1198528,1198552,1198602,1198604,1198607,1198622,1198640,1199418,1199432,1199436,1199513,1199529,1199980,116,1200106 +/tomcat/trunk:1156115,1156171,1156276,1156304,1156519,1156530,1156602,1157015,1157018,1157151,1157198,1157204,1157810,1157832,1157834,1157847,1157908,1157939,1158155,1158160,1158176,1158195,1158198-1158199,1158227,1158331,1158334-1158335,1158426,1160347,1160592,1160611,1160619,1160626,1160639,1160652,1160720-1160721,1160772,1160774,1160776,1161303,1161310,1161322,1161339,1161486,1161540,1161549,1161584,1162082,1162149,1162169,1162721,1162769,1162836,1162932,1163630,1164419,1164438,1164469,1164480,1164567,1165234,1165247-1165248,1165253,1165273,1165282,1165309,1165331,1165338,1165347,1165360-1165361,1165367-1165368,1165602,1165608,1165677,1165693,1165721,1165723,1165728,1165730,1165738,1165746,1165765,1165777,1165918,1165921,1166077,1166150-1166151,1166290,1166366,1166620,1166686,1166693,1166752,1166757,1167368,1167394,1169447,1170647,1171692,1172233-1172234,1172236,1172269,1172278,1172282,1172556,1172610,1172664,1172689,1172711,1173020-1173021,1173082,1173088,1173090,1173096
buildbot failure in ASF Buildbot on tomcat-7-trunk
The Buildbot has detected a new failure on builder tomcat-7-trunk while building ASF Buildbot. Full details are available at: http://ci.apache.org/builders/tomcat-7-trunk/builds/166 Buildbot URL: http://ci.apache.org/ Buildslave for this Build: bb-vm_ubuntu Build Reason: scheduler Build Source Stamp: [branch tomcat/tc7.0.x/trunk] 1200184 Blamelist: kkolinko BUILD FAILED: failed compile sincerely, -The Buildbot
svn commit: r1200186 - /tomcat/tc7.0.x/trunk/java/org/apache/tomcat/util/http/Parameters.java
Author: kkolinko
Date: Thu Nov 10 06:42:00 2011
New Revision: 1200186
URL: http://svn.apache.org/viewvc?rev=1200186view=rev
Log:
Fix compilation failure caused by r1200184
Modified:
tomcat/tc7.0.x/trunk/java/org/apache/tomcat/util/http/Parameters.java
Modified: tomcat/tc7.0.x/trunk/java/org/apache/tomcat/util/http/Parameters.java
URL:
http://svn.apache.org/viewvc/tomcat/tc7.0.x/trunk/java/org/apache/tomcat/util/http/Parameters.java?rev=1200186r1=1200185r2=1200186view=diff
==
--- tomcat/tc7.0.x/trunk/java/org/apache/tomcat/util/http/Parameters.java
(original)
+++ tomcat/tc7.0.x/trunk/java/org/apache/tomcat/util/http/Parameters.java Thu
Nov 10 06:42:00 2011
@@ -281,7 +281,6 @@ public final class Parameters {
break;
}
} while (!parameterComplete pos end);
-}
if (pos == end) {
if (nameEnd == -1) {
-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
buildbot success in ASF Buildbot on tomcat-7-trunk
The Buildbot has detected a restored build on builder tomcat-7-trunk while building ASF Buildbot. Full details are available at: http://ci.apache.org/builders/tomcat-7-trunk/builds/167 Buildbot URL: http://ci.apache.org/ Buildslave for this Build: bb-vm_ubuntu Build Reason: scheduler Build Source Stamp: [branch tomcat/tc7.0.x/trunk] 1200186 Blamelist: kkolinko Build succeeded! sincerely, -The Buildbot
