[Bug 52055] ChunkedInputFilter is not recycled for servlet 3.0 asynchronous request
https://issues.apache.org/bugzilla/show_bug.cgi?id=52055
--- Comment #13 from Sudhan Moghe ---
Rest of the stack trace is my application code.
I am starting async processing with
if (request.isAsyncSupported()) {
final AsyncContext asyncCtx = request.startAsync(request, response);
final Runnable command = new AsyncRequestProcessor(asyncCtx, this,
this.actionObjects);
Executor executor =
(Executor)request.getServletContext().getAttribute(Constants.ASYNC_REQUEST_EXECUTOR);
executor.execute(command);
}
Next line on stack trace is
ServletUtils.getBytesOfStream(ServletUtils.java:425)
Code of same is
public static ByteArrayInputStreamExt getBytesOfStream(final Map helperMap, final InputStream stream, int len, boolean chunked) throws
IOException {
try {
ByteArrayInputStreamExt bais = (ByteArrayInputStreamExt)
helperMap.get(Constants.DATA);
byte[] tempBuf = null;
if (bais == null) {
tempBuf = new byte[len];
bais = new ByteArrayInputStreamExt(tempBuf);
} else {
tempBuf = bais.getBuffer();
}
int readSoFar = 0;
int bytesRead = 0;
while (len > readSoFar) {
bytesRead = stream.read(tempBuf, readSoFar, (len - readSoFar));
if (bytesRead == -1) {
if (chunked) {
if (readSoFar == 0) {
bais.reset(0);
return bais;
} else {
bais.reset(readSoFar);
return bais;
}
}
throw new IOException("Failed to read from inputstream");
}
readSoFar += bytesRead;
}
bais.reset(len);
return bais;
} catch (OutOfMemoryError th) {
logger.error("Creating a byte array of length: " + len + " has resulted
in OOM error: " + th.getMessage());
}
return null;
}
And this method is called with
ServletUtils.getBytesOfStream(request.getInputStream(), length);
This method is called in a loop reading 10MB at a time. For chunked, loop stops
with EOF. The ByteArrayInputStreamExt handling is for reusing the byte[].
This happens only when client aborts.
Let me know if you need anymore info. Which class should I check if I have to
debug this?
Thanks,
Sudhan
--
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
[Bug 53288] New: Tomcat Windows service goes in "Starting" rather than in "Started" state on Windows 2008 (x64 bit) OS.
https://issues.apache.org/bugzilla/show_bug.cgi?id=53288 Priority: P2 Bug ID: 53288 Assignee: dev@tomcat.apache.org Summary: Tomcat Windows service goes in "Starting" rather than in "Started" state on Windows 2008 (x64 bit) OS. Severity: major Classification: Unclassified Reporter: anand.rashin...@gmail.com Hardware: PC Status: NEW Version: 6.0.35 Component: Catalina Product: Tomcat 6 OS : Windows 2008 R2 (64 bit) JRE : 1.6.10 (32 bit) Tomcat 6.0.14 (32 bit) Also tested with Tomcat version 6.0.35 (32 bit) Tomcat intermittently doesn't start as a windows service and goes to Starting state instead. Following are log excerpts during startup for this issue. [2012-05-24 09:24:33] [debug] ( javajni.c:206 ) loading jvm 'C:\Program Files (x86)\Tomcat_Install\IC72\Java\bin\server\jvm.dll' [2012-05-24 09:24:33] [debug] ( javajni.c:660 ) Jvm Option[0] -Dcatalina.base=C:\Program Files (x86)\Tomcat_Install\IC72\tomcat [2012-05-24 09:24:33] [debug] ( javajni.c:660 ) Jvm Option[1] -Dcatalina.home=C:\Program Files (x86)\Tomcat_Install\IC72\tomcat [2012-05-24 09:24:33] [debug] ( javajni.c:660 ) Jvm Option[2] -Djava.endorsed.dirs=C:\Program Files (x86)\Avaya\IC72\tomcat\common\endorsed [2012-05-24 09:24:33] [debug] ( javajni.c:660 ) Jvm Option[3] -Djava.io.tmpdir=C:\Program Files (x86)\Tomcat_Install\IC72\tomcat\temp [2012-05-24 09:24:33] [debug] ( javajni.c:660 ) Jvm Option[4] -Xbootclasspath/a:C:\Program Files (x86)\Tomcat_Install\IC72\tomcat\common\lib\mail.jar [2012-05-24 09:24:33] [debug] ( javajni.c:660 ) Jvm Option[5] -Dlog4j.configuration=log4j.xml [2012-05-24 09:24:33] [debug] ( javajni.c:660 ) Jvm Option[6] -Dlog4j.debug=true [2012-05-24 09:24:33] [debug] ( javajni.c:660 ) Jvm Option[7] -Dhome=C:\Program Files (x86)\Tomcat_Install\IC72 [2012-05-24 09:24:33] [debug] ( javajni.c:660 ) Jvm Option[8] -Djava.security.auth.login.config=C:\Program Files (x86)\Avaya\IC72\sdk\cup.security [2012-05-24 09:24:33] [debug] ( javajni.c:660 ) Jvm Option[9] -Djava.class.path=C:\Program Files (x86)\Tomcat_Install\IC72\tomcat\bin\bootstrap.jar;. [2012-05-24 09:24:33] [debug] ( javajni.c:660 ) Jvm Option[10] -Xms256m [2012-05-24 09:24:33] [debug] ( javajni.c:660 ) Jvm Option[11] -Xmx768m [2012-05-24 09:24:34] [debug] ( javajni.c:844 ) argv[0] = -config [2012-05-24 09:24:34] [debug] ( javajni.c:844 ) argv[1] = C:\Program Files (x86)\Tomcat_Install\IC72\tomcat\conf\server.sdk.xml [2012-05-24 09:24:34] [debug] ( javajni.c:844 ) argv[2] = start As one can see from above logs , tomcat accepts the application specific arguments and is about to start Java (Worker thread) , but somehow it gets stuck at this point after parsing the variable arguments to Tomcat process , and hence the tomcat windows service goes in Starting state. But it sometimes runs cleanly and goes ahead and starts the worker thread. Are there any specific settings needed for Tomcat 32 bit/JRE 32 bit and Win 2k8 64 combination ? I face this issue 6 out of 10 times. Installed tomcat as a service using the service.bat tomcat utility. I face no issues on WIndows 2003 32 bit OS with same tomcat 6.0.14 (32 bit) and JRE 1.6.10 (32 bit) After a clean startup , following trailing tomcat logs are produced (DEBUG MODE). [2012-05-24 09:32:41] [debug] ( javajni.c:844 ) argv[0] = -config [2012-05-24 09:32:41] [debug] ( javajni.c:844 ) argv[1] = C:\Program Files (x86)\Tomcat_Install\IC72\tomcat\conf\server.icsdk.xml [2012-05-24 09:32:41] [debug] ( javajni.c:844 ) argv[2] = start [2012-05-24 09:32:41] [debug] ( javajni.c:896 ) Java Worker thread started org/apache/catalina/startup/Bootstrap:main [2012-05-24 09:32:42] [debug] ( prunsrv.c:1067) Java started org/apache/catalina/startup/Bootstrap [2012-05-24 09:32:43] [info] ( :0 ) Service started in 3744 ms. [2012-05-24 09:32:43] [debug] ( prunsrv.c:1394) Waiting for worker to finish... -- 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
[Bug 53288] Tomcat Windows service goes in "Starting" rather than in "Started" state on Windows 2008 (x64 bit) OS.
https://issues.apache.org/bugzilla/show_bug.cgi?id=53288 Konstantin Kolinko changed: What|Removed |Added Status|NEW |RESOLVED Resolution|--- |INVALID OS||All --- Comment #1 from Konstantin Kolinko --- 1. Bugzilla is not a support forum. Configuration questions should be asked on the users@ mailing list. http://tomcat.apache.org/bugreport.html#Bugzilla_is_not_a_support_forum Regarding your configuration, I do not see any apparent problems. The only one is that installing into "Program Files" on Vista and later has known problems with permissions. It is mentioned on the "Windows" page of the FAQ. You'd better install it somewhere else and without whitespace in the folder name. 2. The service runner comes from the Apache Commons Daemon project. If there is a bug in it, it is for that project to track and fix it. http://tomcat.apache.org/bugreport.html#Third_party_components -- 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
[Bug 53289] New: Clarify ResourceLink example that uses getConnection(username, password)
https://issues.apache.org/bugzilla/show_bug.cgi?id=53289 Priority: P2 Bug ID: 53289 Assignee: dev@tomcat.apache.org Summary: Clarify ResourceLink example that uses getConnection(username, password) Severity: enhancement Classification: Unclassified OS: Windows XP Reporter: knst.koli...@gmail.com Hardware: PC Status: NEW Version: 7.0.27 Component: Documentation Product: Tomcat 7 It was reported on the users list: http://marc.info/?t=13378053295&r=1&w=2 http://markmail.org/thread/26yhdl7pfhdm2dic In documentation there is example [1] on using a ResourceLink with specific value for the factory, org.apache.naming.factory.DataSourceLinkFactory. It allows to specify custom username and password while reusing connections from a global datasource pool. This feature was added per bug 49543. The problem is that there is an important bit that is lacking from the description: this feature requires support from the pool implementation for getConnection(username, password) method. - In Apache Commons DBCP pool there is no support for that method [2]. An UnsupportedOperationException will be thrown. (DBCP 1.4) - In Apache Tomcat JDBC pool support for this feature is off by default (username and password are ignored). It can be enabled by setting alternateUsernameAllowed="true". [3] [1] http://tomcat.apache.org/tomcat-7.0-doc/config/context.html#Resource_Links [2] http://commons.apache.org/dbcp/apidocs/org/apache/commons/dbcp/BasicDataSource.html#getConnection%28java.lang.String,%20java.lang.String%29 [3] http://tomcat.apache.org/tomcat-7.0-doc/jdbc-pool.html -- 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: r1342010 - in /tomcat/native/branches/1.1.x: ./ native/src/poll.c
2012/5/24 :
> Author: markt
> Date: Wed May 23 20:07:46 2012
> New Revision: 1342010
>
> URL: http://svn.apache.org/viewvc?rev=1342010&view=rev
> Log:
> Renames to make code clearer
> socket_ttl -> socket_last_active
> max_ttl -> default_timeout
> Back port of r1342008
>
> Modified:
> tomcat/native/branches/1.1.x/ (props changed)
> tomcat/native/branches/1.1.x/native/src/poll.c
>
> Propchange: tomcat/native/branches/1.1.x/
> --
> Merged /tomcat/native/trunk:r1342008
>
> Modified: tomcat/native/branches/1.1.x/native/src/poll.c
> URL:
> http://svn.apache.org/viewvc/tomcat/native/branches/1.1.x/native/src/poll.c?rev=1342010&r1=1342009&r2=1342010&view=diff
> ==
> --- tomcat/native/branches/1.1.x/native/src/poll.c (original)
> +++ tomcat/native/branches/1.1.x/native/src/poll.c Wed May 23 20:07:46 2012
> @@ -40,8 +40,8 @@ typedef struct tcn_pollset {
> apr_pollset_t *pollset;
> jlong *set;
> apr_pollfd_t *socket_set;
> - apr_time_t *socket_ttl;
> - apr_interval_time_t max_ttl;
> + apr_time_t *socket_last_active;
> + apr_interval_time_t default_timeout;
> #ifdef TCN_DO_STATISTICS
> int sp_added;
> int sp_max_count;
> @@ -128,12 +128,12 @@ TCN_IMPLEMENT_CALL(jlong, Poll, create)(
> TCN_CHECK_ALLOCATED(tps->set);
> tps->socket_set = apr_palloc(p, size * sizeof(apr_pollfd_t));
> TCN_CHECK_ALLOCATED(tps->socket_set);
> - tps->socket_ttl = apr_palloc(p, size * sizeof(apr_interval_time_t));
> - TCN_CHECK_ALLOCATED(tps->socket_ttl);
> + tps->socket_last_active = apr_palloc(p, size *
> sizeof(apr_interval_time_t));
Looking at the declaration of "socket_last_active" field, the above
should have used sizeof(apr_time_t).
> + TCN_CHECK_ALLOCATED(tps->socket_last_active);
> tps->nelts = 0;
> tps->nalloc = size;
> tps->pool = p;
> - tps->max_ttl = J2T(ttl);
> + tps->default_timeout = J2T(ttl);
> (...)
Best regards,
Konstantin Kolinko
-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
Re: svn commit: r1342010 - in /tomcat/native/branches/1.1.x: ./ native/src/poll.c
2012/5/24 Konstantin Kolinko :
> 2012/5/24 :
>> Author: markt
>> Date: Wed May 23 20:07:46 2012
>> New Revision: 1342010
>>
>> URL: http://svn.apache.org/viewvc?rev=1342010&view=rev
>> Log:
>> Renames to make code clearer
>> socket_ttl -> socket_last_active
>> max_ttl -> default_timeout
>> Back port of r1342008
>>
>> Modified:
>> tomcat/native/branches/1.1.x/ (props changed)
>> tomcat/native/branches/1.1.x/native/src/poll.c
>>
>> Propchange: tomcat/native/branches/1.1.x/
>> --
>> Merged /tomcat/native/trunk:r1342008
>>
>> Modified: tomcat/native/branches/1.1.x/native/src/poll.c
>> URL:
>> http://svn.apache.org/viewvc/tomcat/native/branches/1.1.x/native/src/poll.c?rev=1342010&r1=1342009&r2=1342010&view=diff
>> ==
>> --- tomcat/native/branches/1.1.x/native/src/poll.c (original)
>> +++ tomcat/native/branches/1.1.x/native/src/poll.c Wed May 23 20:07:46 2012
>> @@ -40,8 +40,8 @@ typedef struct tcn_pollset {
>> apr_pollset_t *pollset;
>> jlong *set;
>> apr_pollfd_t *socket_set;
>> - apr_time_t *socket_ttl;
>> - apr_interval_time_t max_ttl;
>> + apr_time_t *socket_last_active;
>> + apr_interval_time_t default_timeout;
>> #ifdef TCN_DO_STATISTICS
>> int sp_added;
>> int sp_max_count;
>> @@ -128,12 +128,12 @@ TCN_IMPLEMENT_CALL(jlong, Poll, create)(
>> TCN_CHECK_ALLOCATED(tps->set);
>> tps->socket_set = apr_palloc(p, size * sizeof(apr_pollfd_t));
>> TCN_CHECK_ALLOCATED(tps->socket_set);
>> - tps->socket_ttl = apr_palloc(p, size * sizeof(apr_interval_time_t));
>> - TCN_CHECK_ALLOCATED(tps->socket_ttl);
>> + tps->socket_last_active = apr_palloc(p, size *
>> sizeof(apr_interval_time_t));
>
> Looking at the declaration of "socket_last_active" field, the above
> should have used sizeof(apr_time_t).
>
I see it is has already been fixed by
http://svn.apache.org/viewvc?view=revision&revision=1342014
Sorry for the noise.
>
>> + TCN_CHECK_ALLOCATED(tps->socket_last_active);
>> tps->nelts = 0;
>> tps->nalloc = size;
>> tps->pool = p;
>> - tps->max_ttl = J2T(ttl);
>> + tps->default_timeout = J2T(ttl);
>> (...)
Best regards,
Konstantin Kolinko
-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
Re: svn commit: r1342010 - in /tomcat/native/branches/1.1.x: ./ native/src/poll.c
On 24/05/2012 05:19, Mladen Turk wrote: > On 05/23/2012 10:07 PM, ma...@apache.org wrote: >> Author: markt >> -apr_time_t*socket_ttl; >> -apr_interval_time_t max_ttl; >> +apr_time_t*socket_last_active; >> +apr_interval_time_t default_timeout; > > Think we should move both socket_last_active and socket_timeout > to tcn_socket_t. They are always bound to socket and we won't have > to allocate two additional arrays and copying won't be needed since > they will be part of apr_pollfd's client_data Makes sense to me although I'm unlikely to get to it any time soon. On a related note, thoughts on a 1.1.24 release? We are going to need that for the 7.0.28 release (although that is still a little way off with 15+ open bugs to fix first). Mark - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
Re: svn commit: r1342010 - in /tomcat/native/branches/1.1.x: ./ native/src/poll.c
On 05/24/2012 04:47 PM, Mark Thomas wrote: On 24/05/2012 05:19, Mladen Turk wrote: On 05/23/2012 10:07 PM, ma...@apache.org wrote: Author: markt -apr_time_t*socket_ttl; -apr_interval_time_t max_ttl; +apr_time_t*socket_last_active; +apr_interval_time_t default_timeout; Think we should move both socket_last_active and socket_timeout to tcn_socket_t. They are always bound to socket and we won't have to allocate two additional arrays and copying won't be needed since they will be part of apr_pollfd's client_data Makes sense to me although I'm unlikely to get to it any time soon. I'll see if I'll catch some time tomorrow. On a related note, thoughts on a 1.1.24 release? We are going to need that for the 7.0.28 release (although that is still a little way off with 15+ open bugs to fix first). Next week? Regards -- ^TM - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
Re: svn commit: r1342010 - in /tomcat/native/branches/1.1.x: ./ native/src/poll.c
On 24/05/2012 16:06, Mladen Turk wrote: > On 05/24/2012 04:47 PM, Mark Thomas wrote: >> On 24/05/2012 05:19, Mladen Turk wrote: >>> On 05/23/2012 10:07 PM, ma...@apache.org wrote: Author: markt -apr_time_t*socket_ttl; -apr_interval_time_t max_ttl; +apr_time_t*socket_last_active; +apr_interval_time_t default_timeout; >>> >>> Think we should move both socket_last_active and socket_timeout >>> to tcn_socket_t. They are always bound to socket and we won't have >>> to allocate two additional arrays and copying won't be needed since >>> they will be part of apr_pollfd's client_data >> >> Makes sense to me although I'm unlikely to get to it any time soon. >> > > I'll see if I'll catch some time tomorrow. > >> On a related note, thoughts on a 1.1.24 release? We are going to need >> that for the 7.0.28 release (although that is still a little way off >> with 15+ open bugs to fix first). >> > > Next week? That works for me. I should be able to run some basic tests with my modified WebSocket coed by then to check that I actually get infinite time outs (not much point releasing if that doesn't work). If I don;t shout, assume all is OK. Mark - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
svn commit: r1342298 - in /tomcat/native/branches/1.1.x/native: include/tcn.h src/poll.c
Author: mturk
Date: Thu May 24 15:28:13 2012
New Revision: 1342298
URL: http://svn.apache.org/viewvc?rev=1342298&view=rev
Log:
Move timeouts to tcn_socket_t since they belog to each one individually
Modified:
tomcat/native/branches/1.1.x/native/include/tcn.h
tomcat/native/branches/1.1.x/native/src/poll.c
Modified: tomcat/native/branches/1.1.x/native/include/tcn.h
URL:
http://svn.apache.org/viewvc/tomcat/native/branches/1.1.x/native/include/tcn.h?rev=1342298&r1=1342297&r2=1342298&view=diff
==
--- tomcat/native/branches/1.1.x/native/include/tcn.h (original)
+++ tomcat/native/branches/1.1.x/native/include/tcn.h Thu May 24 15:28:13 2012
@@ -152,6 +152,8 @@ typedef struct {
char *jsbbuff;
char *jrbbuff;
tcn_nlayer_t *net;
+apr_time_t last_active;
+apr_interval_time_t timeout;
} tcn_socket_t;
/* Private helper functions */
Modified: tomcat/native/branches/1.1.x/native/src/poll.c
URL:
http://svn.apache.org/viewvc/tomcat/native/branches/1.1.x/native/src/poll.c?rev=1342298&r1=1342297&r2=1342298&view=diff
==
--- tomcat/native/branches/1.1.x/native/src/poll.c (original)
+++ tomcat/native/branches/1.1.x/native/src/poll.c Thu May 24 15:28:13 2012
@@ -40,8 +40,6 @@ typedef struct tcn_pollset {
apr_pollset_t *pollset;
jlong *set;
apr_pollfd_t *socket_set;
-apr_time_t*socket_last_active;
-apr_interval_time_t *socket_timeout;
apr_interval_time_t default_timeout;
#ifdef TCN_DO_STATISTICS
int sp_added;
@@ -129,10 +127,6 @@ TCN_IMPLEMENT_CALL(jlong, Poll, create)(
TCN_CHECK_ALLOCATED(tps->set);
tps->socket_set = apr_palloc(p, size * sizeof(apr_pollfd_t));
TCN_CHECK_ALLOCATED(tps->socket_set);
-tps->socket_last_active = apr_palloc(p, size * sizeof(apr_time_t));
-TCN_CHECK_ALLOCATED(tps->socket_last_active);
-tps->socket_timeout = apr_palloc(p, size * sizeof(apr_interval_time_t));
-TCN_CHECK_ALLOCATED(tps->socket_timeout);
tps->nelts = 0;
tps->nalloc = size;
tps->pool = p;
@@ -174,21 +168,21 @@ static apr_status_t do_add(tcn_pollset_t
#endif
return APR_ENOMEM;
}
-memset(&fd, 0, sizeof(apr_pollfd_t));
-fd.desc_type = APR_POLL_SOCKET;
-fd.reqevents = reqevents;
-fd.desc.s= s->sock;
-fd.client_data = s;
-
if (timeout == TCN_NO_SOCKET_TIMEOUT) {
timeout = p->default_timeout;
}
if (timeout > 0)
-p->socket_last_active[p->nelts] = apr_time_now();
+s->last_active = apr_time_now();
else
-p->socket_last_active[p->nelts] = 0;
+s->last_active = 0;
+s->timeout = socket_timeout;
+
+memset(&fd, 0, sizeof(apr_pollfd_t));
+fd.desc_type = APR_POLL_SOCKET;
+fd.reqevents = reqevents;
+fd.desc.s= s->sock;
+fd.client_data = s;
-p->socket_timeout[p->nelts] = socket_timeout;
p->socket_set[p->nelts] = fd;
p->nelts++;
#ifdef TCN_DO_STATISTICS
@@ -232,11 +226,13 @@ static apr_status_t do_remove(tcn_pollse
/* Found an instance of the fd: remove this and any other copies */
apr_int32_t dst = i;
apr_int32_t old_nelts = p->nelts;
+tcn_socket_t *ds = (tcn_socket_t *)p->socket_set[dst].client_data;
p->nelts--;
#ifdef TCN_DO_STATISTICS
p->sp_removed++;
#endif
for (i++; i < old_nelts; i++) {
+tcn_socket_t *ss = (tcn_socket_t
*)p->socket_set[i].client_data;
if (fd->desc.s == p->socket_set[i].desc.s) {
#ifdef TCN_DO_STATISTICS
p->sp_equals++;
@@ -245,8 +241,8 @@ static apr_status_t do_remove(tcn_pollse
}
else {
p->socket_set[dst] = p->socket_set[i];
-p->socket_last_active[dst] = p->socket_last_active[i];
-p->socket_timeout[dst] = p->socket_timeout[i];
+ds->last_active = ss->last_active;
+ds->timeout = ss->timeout;
dst++;
}
}
@@ -262,8 +258,9 @@ static void update_last_active(tcn_polls
for (i = 0; i < p->nelts; i++) {
if (fd->desc.s == p->socket_set[i].desc.s) {
+tcn_socket_t *s = (tcn_socket_t *)p->socket_set[i].client_data;
/* Found an instance of the fd: update last active time */
-p->socket_last_active[i] = t;
+s->last_active = t;
break;
}
}
@@ -327,14 +324,15 @@ TCN_IMPLEMENT_CALL(jint, Poll, poll)(TCN
/* Find the minimum timeout */
for (i = 0; i < p->nelts; i++) {
apr_interval_time_t socket_timeout = 0;
-if (p->socket_timeout[i] == TCN_NO_SOCKET_TIMEOUT) {
+tcn_socket_t *s = (tcn_socket_t *)p->socket_set[i].client_data;
+
Re: svn commit: r1342010 - in /tomcat/native/branches/1.1.x: ./ native/src/poll.c
On 05/24/2012 05:06 PM, Mladen Turk wrote: On 05/24/2012 04:47 PM, Mark Thomas wrote: On 24/05/2012 05:19, Mladen Turk wrote: On 05/23/2012 10:07 PM, ma...@apache.org wrote: Author: markt - apr_time_t *socket_ttl; - apr_interval_time_t max_ttl; + apr_time_t *socket_last_active; + apr_interval_time_t default_timeout; Think we should move both socket_last_active and socket_timeout to tcn_socket_t. They are always bound to socket and we won't have to allocate two additional arrays and copying won't be needed since they will be part of apr_pollfd's client_data Makes sense to me although I'm unlikely to get to it any time soon. I'll see if I'll catch some time tomorrow. Done. It was pretty straightforward. Please check if I didn't break something? Regards -- ^TM - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
Re: svn commit: r1340932 - /tomcat/maven-plugin/trunk/tomcat7-maven-plugin/src/main/java/org/apache/tomcat/maven/plugin/tomcat7/run/AbstractExecWarMojo.java
2012/5/21 :
> Author: olamy
> Date: Mon May 21 08:36:51 2012
> New Revision: 1340932
>
> URL: http://svn.apache.org/viewvc?rev=1340932&view=rev
> Log:
> [MTOMCAT-156] exec-war should allow creation of exec-war in projects with any
> packaging type
> Submitted by Peter Lynch.
>
> Modified:
>
> tomcat/maven-plugin/trunk/tomcat7-maven-plugin/src/main/java/org/apache/tomcat/maven/plugin/tomcat7/run/AbstractExecWarMojo.java
>
Apparently this commit caused error in testsuite run by Jenkins (run #151).
The output can be seen here:
https://builds.apache.org/job/TomcatMavenPlugin-mvn3.x/151/org.apache.tomcat.maven$tomcat7-maven-plugin/testReport/junit/org.apache.tomcat.maven.it/Tomcat7SimpleWarProjectIT/testIt/
java.lang.AssertionError: Received message body must not be null.
at org.junit.Assert.fail(Assert.java:93)
at org.junit.Assert.assertTrue(Assert.java:43)
at org.junit.Assert.assertNotNull(Assert.java:526)
at
org.apache.tomcat.maven.it.AbstractSimpleWarProjectIT.testIt(AbstractSimpleWarProjectIT.java:59)
I do not know why. Just saying that subsequent runs are failing as
well and that run #150 was OK. This seems to be the only change
between the 150 and 151.
Best regards,
Konstantin Kolinko
> Modified:
> tomcat/maven-plugin/trunk/tomcat7-maven-plugin/src/main/java/org/apache/tomcat/maven/plugin/tomcat7/run/AbstractExecWarMojo.java
> URL:
> http://svn.apache.org/viewvc/tomcat/maven-plugin/trunk/tomcat7-maven-plugin/src/main/java/org/apache/tomcat/maven/plugin/tomcat7/run/AbstractExecWarMojo.java?rev=1340932&r1=1340931&r2=1340932&view=diff
> ==
> ---
> tomcat/maven-plugin/trunk/tomcat7-maven-plugin/src/main/java/org/apache/tomcat/maven/plugin/tomcat7/run/AbstractExecWarMojo.java
> (original)
> +++
> tomcat/maven-plugin/trunk/tomcat7-maven-plugin/src/main/java/org/apache/tomcat/maven/plugin/tomcat7/run/AbstractExecWarMojo.java
> Mon May 21 08:36:51 2012
> @@ -311,9 +311,7 @@ public abstract class AbstractExecWarMoj
>
> properties.put( Tomcat7Runner.WARS_KEY,
> StringUtils.removeStart( path, "/" ) + ".war|" + path );
> }
> -
> - if ( "pom".equals( project.getPackaging() ) && (
> warRunDependencies != null
> - && !warRunDependencies.isEmpty() ) )
> + else if ( warRunDependencies != null &&
> !warRunDependencies.isEmpty() )
> {
> for ( WarRunDependency warRunDependency : warRunDependencies )
> {
> @@ -353,8 +351,6 @@ public abstract class AbstractExecWarMoj
> }
> }
>
> - // FIXME if no war has been added here we must stop with a human
> readable and user friendly error message
> -
> if ( serverXml != null && serverXml.exists() )
> {
> os.putArchiveEntry( new JarArchiveEntry( "conf/server.xml" )
> );
>
>
-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
Re: svn commit: r1340918 - /tomcat/maven-plugin/trunk/tomcat7-maven-plugin/src/main/java/org/apache/tomcat/maven/plugin/tomcat7/run/AbstractExecWarMojo.java
2012/5/21 : > Author: olamy > Date: Mon May 21 08:12:53 2012 > New Revision: 1340918 > > URL: http://svn.apache.org/viewvc?rev=1340918&view=rev > Log: > [MTOMCAT-154] support exec-war war run dependencies with classifiers > Submitted by Peter Lynch. > > Modified: > > tomcat/maven-plugin/trunk/tomcat7-maven-plugin/src/main/java/org/apache/tomcat/maven/plugin/tomcat7/run/AbstractExecWarMojo.java > > Modified: > tomcat/maven-plugin/trunk/tomcat7-maven-plugin/src/main/java/org/apache/tomcat/maven/plugin/tomcat7/run/AbstractExecWarMojo.java > URL: > http://svn.apache.org/viewvc/tomcat/maven-plugin/trunk/tomcat7-maven-plugin/src/main/java/org/apache/tomcat/maven/plugin/tomcat7/run/AbstractExecWarMojo.java?rev=1340918&r1=1340917&r2=1340918&view=diff > == > --- > tomcat/maven-plugin/trunk/tomcat7-maven-plugin/src/main/java/org/apache/tomcat/maven/plugin/tomcat7/run/AbstractExecWarMojo.java > (original) > +++ > tomcat/maven-plugin/trunk/tomcat7-maven-plugin/src/main/java/org/apache/tomcat/maven/plugin/tomcat7/run/AbstractExecWarMojo.java > Mon May 21 08:12:53 2012 > @@ -322,9 +322,9 @@ public abstract class AbstractExecWarMoj > Dependency dependency = warRunDependency.dependency; > // String groupId, String artifactId, String version, > String scope, String type The above comment does not match the code anymore. The "scope" is no more used, being replaced by "classifier". I think the comment can be simply removed, as what happens is visible from the code. Best regards, Konstantin Kolinko > Artifact artifact = > - artifactFactory.createArtifact( > dependency.getGroupId(), dependency.getArtifactId(), > - > dependency.getVersion(), dependency.getScope(), > - > dependency.getType() ); > + artifactFactory.createArtifactWithClassifier( > dependency.getGroupId(), dependency.getArtifactId(), > + > dependency.getVersion(), dependency.getType(), > + > dependency.getClassifier() ); > > artifactResolver.resolve( artifact, this.remoteRepos, > this.local ); > File warFile = new File( buildDirectory, > artifact.getFile().getName() ); > > > > - > To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org > For additional commands, e-mail: dev-h...@tomcat.apache.org > - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
mod_jk trying to connect to 0.0.0.0
All, I've recently seen two questions on the users' list and a bunch of questions over on StackExchange/ServerFault about mod_jk trying to connect to 0.0.0.0 instead of some sane IP address. Many have comments saying that reverting to mod_jk 1.2.35 seems to fix the issue. I saw that Mladen recently made a change to jk_util.c (http://svn.apache.org/viewvc?rev=1338797&view=rev) to use memset(0) instead of individually blanking-out the fields in the jk_ws_service_t structure but after checking the patch, it seems that he was very careful to ensure that certain values didn't get set to 0 but some other appropriate value. Also, that change was made after the release of 1.2.36 so it's certainly not the cause. I wonder if anyone can remember some similar change that may, in certain cases, blank-out the server's IP address for mod_jk's workers. There also might be something weird with the lookup of "localhost": on one of the SE questions, the OP did "nslookup localhost" and the request went to a DNS server (which returned NXDOMAIN) and didn't just immediately get 127.0.0.1 from his machine's lookup-service. It seems to be to be pretty stupid for someone to intentionally configure mod_jk to use worker.host=0.0.0.0 (and most have posted configurations indicating otherwise) so maybe there is a weird use-case where host resolves to 0.0.0.0. Any ideas? References: http://markmail.org/message/v2uvl7hgttuje2nf http://serverfault.com/questions/390313/connection-from-apache-to-tomcat-via-mod-jk-not-working http://stackoverflow.com/questions/10663525/apache-tomcat-redirection-error-worker1-connecting-to-backend-failed -chris signature.asc Description: OpenPGP digital signature
Re: mod_jk trying to connect to 0.0.0.0
2012/5/24 Christopher Schultz : > > There also might be something weird with the lookup of "localhost": on > one of the SE questions, the OP did "nslookup localhost" and the request > went to a DNS server (which returned NXDOMAIN) and didn't just > immediately get 127.0.0.1 from his machine's lookup-service. > (OT) That is just how "nslookup" works. It queries DNS server and does not care about "hosts" file. Simple "ping localhost" would be more informative. 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: r1342315 - /tomcat/trunk/java/org/apache/tomcat/util/net/NioEndpoint.java
Author: kkolinko
Date: Thu May 24 16:19:04 2012
New Revision: 1342315
URL: http://svn.apache.org/viewvc?rev=1342315&view=rev
Log:
Followup for r1340215
Move new log message below unreg() call and align it with similar debug
messages, fixing a couple of typos.
Modified:
tomcat/trunk/java/org/apache/tomcat/util/net/NioEndpoint.java
Modified: tomcat/trunk/java/org/apache/tomcat/util/net/NioEndpoint.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/tomcat/util/net/NioEndpoint.java?rev=1342315&r1=1342314&r2=1342315&view=diff
==
--- tomcat/trunk/java/org/apache/tomcat/util/net/NioEndpoint.java (original)
+++ tomcat/trunk/java/org/apache/tomcat/util/net/NioEndpoint.java Thu May 24
16:19:04 2012
@@ -1278,12 +1278,14 @@ public class NioEndpoint extends Abstrac
public boolean processSendfile(SelectionKey sk, KeyAttachment
attachment, boolean reg, boolean event) {
NioChannel sc = null;
-if (log.isTraceEnabled()) {
-log.trace("["+new
java.sql.Date(System.currentTimeMillis()).toGMTString()+"] Processing send
file. ["+sk+"] ");
-}
try {
unreg(sk, attachment, sk.readyOps());
SendfileData sd = attachment.getSendfileData();
+
+if (log.isTraceEnabled()) {
+log.trace("Processing send file for: " + sd.fileName);
+}
+
//setup the file channel
if ( sd.fchannel == null ) {
File f = new File(sd.fileName);
@@ -1322,7 +1324,7 @@ public class NioEndpoint extends Abstrac
}
if ( sd.length <= 0 && sc.getOutboundRemaining()<=0) {
if (log.isDebugEnabled()) {
-log.debug("Send file complete for:"+sd.fileName);
+log.debug("Send file complete for: "+sd.fileName);
}
attachment.setSendfileData(null);
try {
@@ -1345,9 +1347,9 @@ public class NioEndpoint extends Abstrac
cancelledKey(sk,SocketStatus.STOP);
return false;
}
-} else { //if ( attachment.interestOps() == 0 && reg ) {
+} else {
if (log.isDebugEnabled()) {
-log.debug("OP_WRITE for sendilfe:"+sd.fileName);
+log.debug("OP_WRITE for sendfile: " + sd.fileName);
}
if (event) {
add(attachment.getChannel(),SelectionKey.OP_WRITE);
-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
svn commit: r1342320 - in /tomcat/trunk/java/org/apache: coyote/http11/Http11NioProcessor.java tomcat/util/net/NioEndpoint.java
Author: kkolinko
Date: Thu May 24 16:22:29 2012
New Revision: 1342320
URL: http://svn.apache.org/viewvc?rev=1342320&view=rev
Log:
Simplify.
The "req" argument in processSendfile() is always true, and it is no more used
since r1340215
Modified:
tomcat/trunk/java/org/apache/coyote/http11/Http11NioProcessor.java
tomcat/trunk/java/org/apache/tomcat/util/net/NioEndpoint.java
Modified: tomcat/trunk/java/org/apache/coyote/http11/Http11NioProcessor.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/coyote/http11/Http11NioProcessor.java?rev=1342320&r1=1342319&r2=1342320&view=diff
==
--- tomcat/trunk/java/org/apache/coyote/http11/Http11NioProcessor.java
(original)
+++ tomcat/trunk/java/org/apache/coyote/http11/Http11NioProcessor.java Thu May
24 16:22:29 2012
@@ -284,7 +284,7 @@ public class Http11NioProcessor extends
socketWrapper.getSocket().getPoller().getSelector());
//do the first write on this thread, might as well
openSocket =
socketWrapper.getSocket().getPoller().processSendfile(key,
-(KeyAttachment) socketWrapper, true, true);
+(KeyAttachment) socketWrapper, true);
return true;
}
return false;
Modified: tomcat/trunk/java/org/apache/tomcat/util/net/NioEndpoint.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/tomcat/util/net/NioEndpoint.java?rev=1342320&r1=1342319&r2=1342320&view=diff
==
--- tomcat/trunk/java/org/apache/tomcat/util/net/NioEndpoint.java (original)
+++ tomcat/trunk/java/org/apache/tomcat/util/net/NioEndpoint.java Thu May 24
16:22:29 2012
@@ -1230,7 +1230,7 @@ public class NioEndpoint extends Abstrac
NioChannel channel = attachment.getChannel();
if (sk.isReadable() || sk.isWritable() ) {
if ( attachment.getSendfileData() != null ) {
-processSendfile(sk,attachment,true, false);
+processSendfile(sk,attachment, false);
} else if ( attachment.getComet() ) {
//check if thread is available
if ( isWorkerAvailable() ) {
@@ -1276,7 +1276,7 @@ public class NioEndpoint extends Abstrac
return result;
}
-public boolean processSendfile(SelectionKey sk, KeyAttachment
attachment, boolean reg, boolean event) {
+public boolean processSendfile(SelectionKey sk, KeyAttachment
attachment, boolean event) {
NioChannel sc = null;
try {
unreg(sk, attachment, sk.readyOps());
-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
svn commit: r1342327 - /tomcat/maven-plugin/trunk/tomcat7-maven-plugin/src/main/java/org/apache/tomcat/maven/plugin/tomcat7/run/AbstractExecWarMojo.java
Author: olamy
Date: Thu May 24 16:36:34 2012
New Revision: 1342327
URL: http://svn.apache.org/viewvc?rev=1342327&view=rev
Log:
remove not anymore needed comment
Modified:
tomcat/maven-plugin/trunk/tomcat7-maven-plugin/src/main/java/org/apache/tomcat/maven/plugin/tomcat7/run/AbstractExecWarMojo.java
Modified:
tomcat/maven-plugin/trunk/tomcat7-maven-plugin/src/main/java/org/apache/tomcat/maven/plugin/tomcat7/run/AbstractExecWarMojo.java
URL:
http://svn.apache.org/viewvc/tomcat/maven-plugin/trunk/tomcat7-maven-plugin/src/main/java/org/apache/tomcat/maven/plugin/tomcat7/run/AbstractExecWarMojo.java?rev=1342327&r1=1342326&r2=1342327&view=diff
==
---
tomcat/maven-plugin/trunk/tomcat7-maven-plugin/src/main/java/org/apache/tomcat/maven/plugin/tomcat7/run/AbstractExecWarMojo.java
(original)
+++
tomcat/maven-plugin/trunk/tomcat7-maven-plugin/src/main/java/org/apache/tomcat/maven/plugin/tomcat7/run/AbstractExecWarMojo.java
Thu May 24 16:36:34 2012
@@ -318,7 +318,6 @@ public abstract class AbstractExecWarMoj
if ( warRunDependency.dependency != null )
{
Dependency dependency = warRunDependency.dependency;
-// String groupId, String artifactId, String version,
String scope, String type
Artifact artifact =
artifactFactory.createArtifactWithClassifier(
dependency.getGroupId(), dependency.getArtifactId(),
dependency.getVersion(), dependency.getType(),
-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
Re: svn commit: r1340932 - /tomcat/maven-plugin/trunk/tomcat7-maven-plugin/src/main/java/org/apache/tomcat/maven/plugin/tomcat7/run/AbstractExecWarMojo.java
2012/5/24 Konstantin Kolinko :
> 2012/5/21 :
>> Author: olamy
>> Date: Mon May 21 08:36:51 2012
>> New Revision: 1340932
>>
>> URL: http://svn.apache.org/viewvc?rev=1340932&view=rev
>> Log:
>> [MTOMCAT-156] exec-war should allow creation of exec-war in projects with
>> any packaging type
>> Submitted by Peter Lynch.
>>
>> Modified:
>>
>> tomcat/maven-plugin/trunk/tomcat7-maven-plugin/src/main/java/org/apache/tomcat/maven/plugin/tomcat7/run/AbstractExecWarMojo.java
>>
>
> Apparently this commit caused error in testsuite run by Jenkins (run #151).
> The output can be seen here:
>
> https://builds.apache.org/job/TomcatMavenPlugin-mvn3.x/151/org.apache.tomcat.maven$tomcat7-maven-plugin/testReport/junit/org.apache.tomcat.maven.it/Tomcat7SimpleWarProjectIT/testIt/
>
> java.lang.AssertionError: Received message body must not be null.
> at org.junit.Assert.fail(Assert.java:93)
> at org.junit.Assert.assertTrue(Assert.java:43)
> at org.junit.Assert.assertNotNull(Assert.java:526)
> at
> org.apache.tomcat.maven.it.AbstractSimpleWarProjectIT.testIt(AbstractSimpleWarProjectIT.java:59)
>
>
> I do not know why. Just saying that subsequent runs are failing as
> well and that run #150 was OK. This seems to be the only change
> between the 150 and 151.
and #154 is fine without huge changes :-).
And that build locally.
Yup sometimes that fail on jenkins (I don't know why)
>
> Best regards,
> Konstantin Kolinko
>
>> Modified:
>> tomcat/maven-plugin/trunk/tomcat7-maven-plugin/src/main/java/org/apache/tomcat/maven/plugin/tomcat7/run/AbstractExecWarMojo.java
>> URL:
>> http://svn.apache.org/viewvc/tomcat/maven-plugin/trunk/tomcat7-maven-plugin/src/main/java/org/apache/tomcat/maven/plugin/tomcat7/run/AbstractExecWarMojo.java?rev=1340932&r1=1340931&r2=1340932&view=diff
>> ==
>> ---
>> tomcat/maven-plugin/trunk/tomcat7-maven-plugin/src/main/java/org/apache/tomcat/maven/plugin/tomcat7/run/AbstractExecWarMojo.java
>> (original)
>> +++
>> tomcat/maven-plugin/trunk/tomcat7-maven-plugin/src/main/java/org/apache/tomcat/maven/plugin/tomcat7/run/AbstractExecWarMojo.java
>> Mon May 21 08:36:51 2012
>> @@ -311,9 +311,7 @@ public abstract class AbstractExecWarMoj
>>
>> properties.put( Tomcat7Runner.WARS_KEY,
>> StringUtils.removeStart( path, "/" ) + ".war|" + path );
>> }
>> -
>> - if ( "pom".equals( project.getPackaging() ) && (
>> warRunDependencies != null
>> - && !warRunDependencies.isEmpty() ) )
>> + else if ( warRunDependencies != null &&
>> !warRunDependencies.isEmpty() )
>> {
>> for ( WarRunDependency warRunDependency : warRunDependencies
>> )
>> {
>> @@ -353,8 +351,6 @@ public abstract class AbstractExecWarMoj
>> }
>> }
>>
>> - // FIXME if no war has been added here we must stop with a
>> human readable and user friendly error message
>> -
>> if ( serverXml != null && serverXml.exists() )
>> {
>> os.putArchiveEntry( new JarArchiveEntry( "conf/server.xml" )
>> );
>>
>>
>
> -
> To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
> For additional commands, e-mail: dev-h...@tomcat.apache.org
>
--
Olivier Lamy
Talend: http://coders.talend.com
http://twitter.com/olamy | http://linkedin.com/in/olamy
-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
svn commit: r1342332 - /tomcat/maven-plugin/trunk/pom.xml
Author: olamy Date: Thu May 24 16:49:03 2012 New Revision: 1342332 URL: http://svn.apache.org/viewvc?rev=1342332&view=rev Log: site plugin 3.1 Modified: tomcat/maven-plugin/trunk/pom.xml Modified: tomcat/maven-plugin/trunk/pom.xml URL: http://svn.apache.org/viewvc/tomcat/maven-plugin/trunk/pom.xml?rev=1342332&r1=1342331&r2=1342332&view=diff == --- tomcat/maven-plugin/trunk/pom.xml (original) +++ tomcat/maven-plugin/trunk/pom.xml Thu May 24 16:49:03 2012 @@ -602,7 +602,7 @@ org.apache.maven.plugins maven-site-plugin - 3.0 + 3.1 org.apache.maven.wagon - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
Re: mod_jk trying to connect to 0.0.0.0
Konstantin, On 5/24/12 12:14 PM, Konstantin Kolinko wrote: > 2012/5/24 Christopher Schultz : >> >> There also might be something weird with the lookup of "localhost": on >> one of the SE questions, the OP did "nslookup localhost" and the request >> went to a DNS server (which returned NXDOMAIN) and didn't just >> immediately get 127.0.0.1 from his machine's lookup-service. >> > > (OT) That is just how "nslookup" works. It queries DNS server and does > not care about "hosts" file. Simple "ping localhost" would be more > informative. Good point. -chris signature.asc Description: OpenPGP digital signature
[Bug 51294] Since 7.0.12 do not work option unpackWARs=true for WARs outside appBase
https://issues.apache.org/bugzilla/show_bug.cgi?id=51294 --- Comment #11 from aash --- This is a huge deal. It totally screws with our ability to manage our war versions. Why go fixing something that isn't broken? You just removed our ability to do hot fixes and tests on a live system, and still be able to manage our war versions. Can anyone demonstrate how to unpack an external war to the ROOT context? I was trying that as an alternative, and nothing worked. It worked fine unpacking to any other context, but that's utterly useless for me. -- 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: mod_jk trying to connect to 0.0.0.0
On 05/24/2012 06:09 PM, Christopher Schultz wrote: All, I wonder if anyone can remember some similar change that may, in certain cases, blank-out the server's IP address for mod_jk's workers. The only thing that can cause that could be shared memory which has been heavily changed. If worker somehow figures out that address has been changed and it wasn't it'll get updated with all zeros from shared memory. I'll investigate that. Regards -- ^TM - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
Re: native connector tool chain
On 21 May 2012 21:01, Mark Thomas wrote: > On 21/05/2012 17:52, Mladen Turk wrote: >> On 05/21/2012 02:05 PM, Mark Thomas wrote: >>> I am trying to build the 1.1.x native connector from trunk so I can test >>> the changes I plan to make to support per socket time outs. I can build >>> using dynamic linking but not statically. What tool chain are folks >>> currently using to build the native connector binaries we currently ship? >>> >>> My current issue relates to statically linking to OpenSSL. I get the >>> same failure with 1.0.c, 0.9.8x and 0.9.8k. I am using: >>> - Visual Studio 6 + SP6 >>> - Win 2003 r2 Platform SDK >>> - OpenSSL binaries from http://slproweb.com/products/Win32OpenSSL.html >> >> If those binaries were not compiled with VS6 you can't statically link >> them. When I build binaries I build both of those (and apr) with the >> same compiler. >> >> Yeah, it's not trivial task. > > :) Got it working! > > For the benefit of the archives, I ended up using: Maybe this info should also be saved somewhere in SVN? > - Visual Studio 6 + SP6 > - Win 2003 r2 Platform SDK > - OpenSSL source bundle 0.9.x > - APR 1.4.x src (I used the 1.4.6 tag) > - native source (I used the 1.1.x branch) > > OpenSSL 1.x will not work with the VS6 tool chain. > > My aim is to build the 64-bit APR/native DLL. 32-bit should be pretty similar. > > Stage 1: OpenSSL build > This is pretty close to the OpenSSL docs INSTALL.W64 > - Set up the environment to build with the Platform SDK > %PLATFORM_SDK_HOME%\SetEnv.Cmd /X64 /RETAIL > - Follow the OpenSSL build instructions > perl Configure VC-WIN64A > ms\do_win64a > nmake -f ms\nt.mak > > The *.lib files you'll need are in the out32 directory. > > Stage 2: Start VS6 in x64 mode > You'll need a batch file that looks something like this: > call "C:\Program Files\PlatformSDK\SetEnv.Cmd" /X64 /RETAIL > start "" "C:\Program Files (x86)\Microsoft Visual > Studio\Common\MSDev98\Bin\MSDEV.EXE" /useenv > > Stage 3: Open the workspace > Depending on where APR is, you'll need to specify paths to the projects > > Stage 4: Build APR > Make sure you can build the "apr x64" Release target > You may need to tweak src and library paths. > > Stage 5: Create a tcnative x64 target > Copy the Win32 release configuration and name it x64 Release > Add /machine:AMD64 to the link options (you can't remove the I368 option - > just make sure you add the new one after it) > Tweak the src and library paths as required. > > For both stage 4 and 5 you may need to add additional standard libraries. > Google the linking error you get to figure out which. > > HTH, > > Mark > > - > To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org > For additional commands, e-mail: dev-h...@tomcat.apache.org > - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
[Bug 51294] Since 7.0.12 do not work option unpackWARs=true for WARs outside appBase
https://issues.apache.org/bugzilla/show_bug.cgi?id=51294 --- Comment #12 from Pid --- Have you tried using the 'jar' command? -- 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
[Bug 51294] Since 7.0.12 do not work option unpackWARs=true for WARs outside appBase
https://issues.apache.org/bugzilla/show_bug.cgi?id=51294 --- Comment #13 from aash --- (In reply to comment #12) > Have you tried using the 'jar' command? yes.. when i unpack into a webapps/foobar it works fine. the problem is that is must run on the root context, so when i unpack it into webapps/ROOT, it ignores it. -- 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
[Bug 51294] Since 7.0.12 do not work option unpackWARs=true for WARs outside appBase
https://issues.apache.org/bugzilla/show_bug.cgi?id=51294 --- Comment #14 from Pid --- That sounds like a different problem, please ask on the Tomcat Users list. -- 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: r1342468 - in /tomcat/tc7.0.x/trunk: ./ java/org/apache/tomcat/util/net/NioEndpoint.java
Author: kkolinko
Date: Thu May 24 22:42:17 2012
New Revision: 1342468
URL: http://svn.apache.org/viewvc?rev=1342468&view=rev
Log:
Merged revision 1342315 from tomcat/trunk:
Followup for r1340215
Move new log message below unreg() call and align it with similar debug
messages, fixing a couple of typos.
Modified:
tomcat/tc7.0.x/trunk/ (props changed)
tomcat/tc7.0.x/trunk/java/org/apache/tomcat/util/net/NioEndpoint.java
Propchange: tomcat/tc7.0.x/trunk/
--
Merged /tomcat/trunk:r1342315
Modified: tomcat/tc7.0.x/trunk/java/org/apache/tomcat/util/net/NioEndpoint.java
URL:
http://svn.apache.org/viewvc/tomcat/tc7.0.x/trunk/java/org/apache/tomcat/util/net/NioEndpoint.java?rev=1342468&r1=1342467&r2=1342468&view=diff
==
--- tomcat/tc7.0.x/trunk/java/org/apache/tomcat/util/net/NioEndpoint.java
(original)
+++ tomcat/tc7.0.x/trunk/java/org/apache/tomcat/util/net/NioEndpoint.java Thu
May 24 22:42:17 2012
@@ -1278,12 +1278,14 @@ public class NioEndpoint extends Abstrac
public boolean processSendfile(SelectionKey sk, KeyAttachment
attachment, boolean reg, boolean event) {
NioChannel sc = null;
-if (log.isTraceEnabled()) {
-log.trace("["+new
java.sql.Date(System.currentTimeMillis()).toGMTString()+"] Processing send
file. ["+sk+"] ");
-}
try {
unreg(sk, attachment, sk.readyOps());
SendfileData sd = attachment.getSendfileData();
+
+if (log.isTraceEnabled()) {
+log.trace("Processing send file for: " + sd.fileName);
+}
+
//setup the file channel
if ( sd.fchannel == null ) {
File f = new File(sd.fileName);
@@ -1322,7 +1324,7 @@ public class NioEndpoint extends Abstrac
}
if ( sd.length <= 0 && sc.getOutboundRemaining()<=0) {
if (log.isDebugEnabled()) {
-log.debug("Send file complete for:"+sd.fileName);
+log.debug("Send file complete for: "+sd.fileName);
}
attachment.setSendfileData(null);
try {
@@ -1345,9 +1347,9 @@ public class NioEndpoint extends Abstrac
cancelledKey(sk,SocketStatus.STOP,false);
return false;
}
-} else { //if ( attachment.interestOps() == 0 && reg ) {
+} else {
if (log.isDebugEnabled()) {
-log.debug("OP_WRITE for sendilfe:"+sd.fileName);
+log.debug("OP_WRITE for sendfile: " + sd.fileName);
}
if (event) {
add(attachment.getChannel(),SelectionKey.OP_WRITE);
-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
svn commit: r1342473 - in /tomcat/tc7.0.x/trunk: ./ java/org/apache/coyote/http11/Http11NioProcessor.java java/org/apache/tomcat/util/net/NioEndpoint.java
Author: kkolinko
Date: Thu May 24 23:02:12 2012
New Revision: 1342473
URL: http://svn.apache.org/viewvc?rev=1342473&view=rev
Log:
Merged revision 1342320 from tomcat/trunk:
Simplify.
The "req" argument in processSendfile() is always true, and it is no more used
since r1340215
Modified:
tomcat/tc7.0.x/trunk/ (props changed)
tomcat/tc7.0.x/trunk/java/org/apache/coyote/http11/Http11NioProcessor.java
tomcat/tc7.0.x/trunk/java/org/apache/tomcat/util/net/NioEndpoint.java
Propchange: tomcat/tc7.0.x/trunk/
--
Merged /tomcat/trunk:r1342320
Modified:
tomcat/tc7.0.x/trunk/java/org/apache/coyote/http11/Http11NioProcessor.java
URL:
http://svn.apache.org/viewvc/tomcat/tc7.0.x/trunk/java/org/apache/coyote/http11/Http11NioProcessor.java?rev=1342473&r1=1342472&r2=1342473&view=diff
==
--- tomcat/tc7.0.x/trunk/java/org/apache/coyote/http11/Http11NioProcessor.java
(original)
+++ tomcat/tc7.0.x/trunk/java/org/apache/coyote/http11/Http11NioProcessor.java
Thu May 24 23:02:12 2012
@@ -284,7 +284,7 @@ public class Http11NioProcessor extends
socketWrapper.getSocket().getPoller().getSelector());
//do the first write on this thread, might as well
openSocket =
socketWrapper.getSocket().getPoller().processSendfile(key,
-(KeyAttachment) socketWrapper, true, true);
+(KeyAttachment) socketWrapper, true);
return true;
}
return false;
Modified: tomcat/tc7.0.x/trunk/java/org/apache/tomcat/util/net/NioEndpoint.java
URL:
http://svn.apache.org/viewvc/tomcat/tc7.0.x/trunk/java/org/apache/tomcat/util/net/NioEndpoint.java?rev=1342473&r1=1342472&r2=1342473&view=diff
==
--- tomcat/tc7.0.x/trunk/java/org/apache/tomcat/util/net/NioEndpoint.java
(original)
+++ tomcat/tc7.0.x/trunk/java/org/apache/tomcat/util/net/NioEndpoint.java Thu
May 24 23:02:12 2012
@@ -1230,7 +1230,7 @@ public class NioEndpoint extends Abstrac
NioChannel channel = attachment.getChannel();
if (sk.isReadable() || sk.isWritable() ) {
if ( attachment.getSendfileData() != null ) {
-processSendfile(sk,attachment,true, false);
+processSendfile(sk,attachment, false);
} else if ( attachment.getComet() ) {
//check if thread is available
if ( isWorkerAvailable() ) {
@@ -1276,7 +1276,7 @@ public class NioEndpoint extends Abstrac
return result;
}
-public boolean processSendfile(SelectionKey sk, KeyAttachment
attachment, boolean reg, boolean event) {
+public boolean processSendfile(SelectionKey sk, KeyAttachment
attachment, boolean event) {
NioChannel sc = null;
try {
unreg(sk, attachment, sk.readyOps());
-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
svn commit: r1342476 - in /tomcat/trunk: java/org/apache/catalina/core/StandardHost.java webapps/docs/config/host.xml
Author: kkolinko
Date: Thu May 24 23:58:03 2012
New Revision: 1342476
URL: http://svn.apache.org/viewvc?rev=1342476&view=rev
Log:
Fix documentation of default value of "xmlBase" attribute of Host.
The place where it is already documented correctly is Host.getXmlBase() and
Host.setXmlBase().
The actual default value is calculated in HostConfig.configBase()
Modified:
tomcat/trunk/java/org/apache/catalina/core/StandardHost.java
tomcat/trunk/webapps/docs/config/host.xml
Modified: tomcat/trunk/java/org/apache/catalina/core/StandardHost.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/core/StandardHost.java?rev=1342476&r1=1342475&r2=1342476&view=diff
==
--- tomcat/trunk/java/org/apache/catalina/core/StandardHost.java (original)
+++ tomcat/trunk/java/org/apache/catalina/core/StandardHost.java Thu May 24
23:58:03 2012
@@ -240,7 +240,8 @@ public class StandardHost extends Contai
/**
* Return the XML root for this Host. This can be an absolute
* pathname, a relative pathname, or a URL.
- * If null, defaults to ${catalina.base}/conf/ directory
+ * If null, defaults to
+ * ${catalina.base}/conf// directory
*/
@Override
public String getXmlBase() {
@@ -253,7 +254,8 @@ public class StandardHost extends Contai
/**
* Set the Xml root for this Host. This can be an absolute
* pathname, a relative pathname, or a URL.
- * If null, defaults to ${catalina.base}/conf/ directory
+ * If null, defaults to
+ * ${catalina.base}/conf// directory
*
* @param xmlBase The new XML root
*/
Modified: tomcat/trunk/webapps/docs/config/host.xml
URL:
http://svn.apache.org/viewvc/tomcat/trunk/webapps/docs/config/host.xml?rev=1342476&r1=1342475&r2=1342476&view=diff
==
--- tomcat/trunk/webapps/docs/config/host.xml (original)
+++ tomcat/trunk/webapps/docs/config/host.xml Thu May 24 23:58:03 2012
@@ -108,7 +108,7 @@
Automatic Application
Deployment for more information on automatic recognition and
deployment of web applications. If not specified the default of
-[engine_name]/[host_name] will be used.
+conf// will be
used.
-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
Re: svn commit: r1341370 - in /tomcat/tc7.0.x/trunk: java/org/apache/catalina/startup/ContextConfig.java webapps/docs/changelog.xml
2012/5/22 :
> Author: kfujino
> Date: Tue May 22 09:27:00 2012
> New Revision: 1341370
>
> URL: http://svn.apache.org/viewvc?rev=1341370&view=rev
> Log:
> Enable host's xmlBase attribute in ContextConfig.
>
> Modified:
> tomcat/tc7.0.x/trunk/java/org/apache/catalina/startup/ContextConfig.java
> tomcat/tc7.0.x/trunk/webapps/docs/changelog.xml
>
> Modified:
> tomcat/tc7.0.x/trunk/java/org/apache/catalina/startup/ContextConfig.java
> URL:
> http://svn.apache.org/viewvc/tomcat/tc7.0.x/trunk/java/org/apache/catalina/startup/ContextConfig.java?rev=1341370&r1=1341369&r2=1341370&view=diff
> ==
> --- tomcat/tc7.0.x/trunk/java/org/apache/catalina/startup/ContextConfig.java
> (original)
> +++ tomcat/tc7.0.x/trunk/java/org/apache/catalina/startup/ContextConfig.java
> Tue May 22 09:27:00 2012
> @@ -559,9 +559,8 @@ public class ContextConfig implements Li
> "contextConfig.badUrl", defaultContextFile), e);
> }
> }
> -
> - File hostContextFile = new File(getConfigBase(),
> - getHostConfigPath(Constants.HostContextXml));
> +
> + File hostContextFile = new File(getHostConfigBase(),
> Constants.HostContextXml);
> if (hostContextFile.exists()) {
> try {
> URL hostContextUrl = hostContextFile.toURI().toURL();
> @@ -1152,30 +1151,43 @@ public class ContextConfig implements Li
> return configBase;
> }
>
> -
> - protected String getHostConfigPath(String resourceName) {
> - StringBuilder result = new StringBuilder();
> + protected File getHostConfigBase() {
> + File file = null;
> Container container = context;
> - Container host = null;
> - Container engine = null;
> + Host host = null;
> + Engine engine = null;
> while (container != null) {
> - if (container instanceof Host)
> - host = container;
> - if (container instanceof Engine)
> - engine = container;
> + if (container instanceof Host) {
> + host = (Host)container;
> + }
> + if (container instanceof Engine) {
> + engine = (Engine)container;
> + }
> container = container.getParent();
> }
> - if (engine != null) {
> - result.append(engine.getName()).append('/');
> + if (host != null && host.getXmlBase()!=null) {
> + String xmlBase = host.getXmlBase();
> + file = new File(xmlBase);
> + if (!file.isAbsolute())
> + file = new File(new
> File(System.getProperty(Globals.CATALINA_BASE_PROP)),
> + xmlBase);
BTW, ContextConfig could call its own ContextConfig.getBaseDir() here
instead of direct look up of the system property.
The same in 3 other its methods (antiLocking(), fixDocBase(), getConfigBase()).
> + } else {
> + StringBuilder result = new StringBuilder();
> + if (engine != null) {
> + result.append(engine.getName()).append('/');
> + }
> + if (host != null) {
> + result.append(host.getName()).append('/');
> + }
> + file = new File (getConfigBase(), result.toString());
> }
> - if (host != null) {
> - result.append(host.getName()).append('/');
> + try {
> + return file.getCanonicalFile();
> + } catch (IOException e) {
> + return file;
> }
> - result.append(resourceName);
> - return result.toString();
> }
>
> -
> /**
> * Scan the web.xml files that apply to the web application and merge them
> * using the rules defined in the spec. For the global web.xml files,
> @@ -1686,22 +1698,15 @@ public class ContextConfig implements Li
> * it.
> */
> protected InputSource getHostWebXmlSource() {
> - String resourceName = getHostConfigPath(Constants.HostWebXml);
> -
> - // In an embedded environment, configBase might not be set
> - File configBase = getConfigBase();
> - if (configBase == null)
> - return null;
> -
The above "return null" case disappears without replacement.
> String basePath = null;
> try {
> - basePath = configBase.getCanonicalPath();
> + basePath = getHostConfigBase().getCanonicalPath();
getCanonicalFile() is already called inside of getHostConfigBase(), so
there is double work here.
> } catch (IOException e) {
> log.error(sm.getString("contextConfig.baseError"), e);
> return null;
> }
>
> - return getWebXmlSource(resourceName, basePath);
> + return getWebXmlSource(Constants.HostWebXml, basePath);
> }
>
> /**
>
There is code duplication between
HostConfig.configBase()
svn commit: r1342477 - in /tomcat/tc7.0.x/trunk: ./ java/org/apache/catalina/core/StandardHost.java webapps/docs/changelog.xml webapps/docs/config/host.xml
Author: kkolinko
Date: Fri May 25 00:13:03 2012
New Revision: 1342477
URL: http://svn.apache.org/viewvc?rev=1342477&view=rev
Log:
Merged revision 1342476 from tomcat/trunk:
Fix documentation of default value of "xmlBase" attribute of Host.
The place where it is already documented correctly is Host.getXmlBase() and
Host.setXmlBase().
The actual default value is calculated in HostConfig.configBase().
Resolved a merge conflict by reordering StandardHost#getXmlBase() and
#setAppBase(). It aligns with TC trunk.
Corrected typo in changelog.
Modified:
tomcat/tc7.0.x/trunk/ (props changed)
tomcat/tc7.0.x/trunk/java/org/apache/catalina/core/StandardHost.java
tomcat/tc7.0.x/trunk/webapps/docs/changelog.xml
tomcat/tc7.0.x/trunk/webapps/docs/config/host.xml
Propchange: tomcat/tc7.0.x/trunk/
--
Merged /tomcat/trunk:r1342476
Modified: tomcat/tc7.0.x/trunk/java/org/apache/catalina/core/StandardHost.java
URL:
http://svn.apache.org/viewvc/tomcat/tc7.0.x/trunk/java/org/apache/catalina/core/StandardHost.java?rev=1342477&r1=1342476&r2=1342477&view=diff
==
--- tomcat/tc7.0.x/trunk/java/org/apache/catalina/core/StandardHost.java
(original)
+++ tomcat/tc7.0.x/trunk/java/org/apache/catalina/core/StandardHost.java Fri
May 25 00:13:03 2012
@@ -197,30 +197,31 @@ public class StandardHost extends Contai
/**
- * Return the XML root for this Host. This can be an absolute
+ * Set the application root for this Host. This can be an absolute
* pathname, a relative pathname, or a URL.
- * If null, defaults to ${catalina.base}/conf/ directory
+ *
+ * @param appBase The new application root
*/
@Override
-public String getXmlBase() {
+public void setAppBase(String appBase) {
-return (this.xmlBase);
+String oldAppBase = this.appBase;
+this.appBase = appBase;
+support.firePropertyChange("appBase", oldAppBase, this.appBase);
}
/**
- * Set the application root for this Host. This can be an absolute
+ * Return the XML root for this Host. This can be an absolute
* pathname, a relative pathname, or a URL.
- *
- * @param appBase The new application root
+ * If null, defaults to
+ * ${catalina.base}/conf// directory
*/
@Override
-public void setAppBase(String appBase) {
+public String getXmlBase() {
-String oldAppBase = this.appBase;
-this.appBase = appBase;
-support.firePropertyChange("appBase", oldAppBase, this.appBase);
+return (this.xmlBase);
}
@@ -228,7 +229,8 @@ public class StandardHost extends Contai
/**
* Set the Xml root for this Host. This can be an absolute
* pathname, a relative pathname, or a URL.
- * If null, defaults to ${catalina.base}/conf/ directory
+ * If null, defaults to
+ * ${catalina.base}/conf// directory
*
* @param xmlBase The new XML root
*/
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=1342477&r1=1342476&r2=1342477&view=diff
==
--- tomcat/tc7.0.x/trunk/webapps/docs/changelog.xml (original)
+++ tomcat/tc7.0.x/trunk/webapps/docs/changelog.xml Fri May 25 00:13:03 2012
@@ -5257,7 +5257,7 @@
48662: Provide a new option to control the copying of
context
XML descriptors from web applications to the host's xmlBase. Copying of
-XMl descriptors is now disabled by default. (markt)
+XML descriptors is now disabled by default. (markt)
Move comet classes from the org.apache.catalina package to the
Modified: tomcat/tc7.0.x/trunk/webapps/docs/config/host.xml
URL:
http://svn.apache.org/viewvc/tomcat/tc7.0.x/trunk/webapps/docs/config/host.xml?rev=1342477&r1=1342476&r2=1342477&view=diff
==
--- tomcat/tc7.0.x/trunk/webapps/docs/config/host.xml (original)
+++ tomcat/tc7.0.x/trunk/webapps/docs/config/host.xml Fri May 25 00:13:03 2012
@@ -108,7 +108,7 @@
Automatic Application
Deployment for more information on automatic recognition and
deployment of web applications. If not specified the default of
-[engine_name]/[host_name] will be used.
+conf// will be
used.
-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
Re: svn commit: r1340215 - /tomcat/trunk/java/org/apache/tomcat/util/net/NioEndpoint.java
2012/5/21 Filip Hanik Mailing Lists :
>
>
> - Mensaje original -
>> De: "Rainer Jung"
>>>+if (log.isTraceEnabled()) {
>>>+log.trace("["+new
>>> java.sql.Date(System.currentTimeMillis()).toGMTString()+"] Processing send
>>> file. ["+sk+"] ");
>>>+}
>>
>> Was that intentional? I'd say the timestamp should be provided by the
>> log framework and not by java.sql.Date. But maybe the whole message
>> is
>> just a leftover from debugging the issue.
>>
>> The same for the TC 7 backport.
>>
>
> hi Rainer, no, not intentional, it is left over from debugging. I will remove
> the Date object
>
Fixed by
http://svn.apache.org/viewvc?view=revision&revision=1342468
Best regards,
Konstantin Kolinko
-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
Re: svn commit: r1333929 - /tomcat/maven-plugin/trunk/tomcat7-maven-plugin/src/main/java/org/apache/tomcat/maven/plugin/tomcat7/run/AbstractRunMojo.java
2012/5/4 :
> Author: olamy
> Date: Fri May 4 13:06:23 2012
> New Revision: 1333929
>
> URL: http://svn.apache.org/viewvc?rev=1333929&view=rev
> Log:
> [MTOMCAT-150] expose ports used with tomcat7:run as sys props: feature to
> dump ports in a property file to be able to use later with a forked surefire
> execution
>
> Modified:
>
> tomcat/maven-plugin/trunk/tomcat7-maven-plugin/src/main/java/org/apache/tomcat/maven/plugin/tomcat7/run/AbstractRunMojo.java
>
> Modified:
> tomcat/maven-plugin/trunk/tomcat7-maven-plugin/src/main/java/org/apache/tomcat/maven/plugin/tomcat7/run/AbstractRunMojo.java
> URL:
> http://svn.apache.org/viewvc/tomcat/maven-plugin/trunk/tomcat7-maven-plugin/src/main/java/org/apache/tomcat/maven/plugin/tomcat7/run/AbstractRunMojo.java?rev=1333929&r1=1333928&r2=1333929&view=diff
> ==
> ---
> tomcat/maven-plugin/trunk/tomcat7-maven-plugin/src/main/java/org/apache/tomcat/maven/plugin/tomcat7/run/AbstractRunMojo.java
> (original)
> +++
> tomcat/maven-plugin/trunk/tomcat7-maven-plugin/src/main/java/org/apache/tomcat/maven/plugin/tomcat7/run/AbstractRunMojo.java
> Fri May 4 13:06:23 2012
> @@ -31,6 +31,7 @@ import org.apache.catalina.startup.Catal
> import org.apache.catalina.startup.CatalinaProperties;
> import org.apache.catalina.startup.Tomcat;
> import org.apache.catalina.valves.AccessLogValve;
> +import org.apache.commons.io.IOUtils;
> import org.apache.commons.lang.StringUtils;
> import org.apache.maven.artifact.Artifact;
> import org.apache.maven.artifact.resolver.filter.ScopeArtifactFilter;
> @@ -69,6 +70,7 @@ import javax.xml.stream.XMLStreamReader;
> import java.io.File;
> import java.io.FileInputStream;
> import java.io.FileNotFoundException;
> +import java.io.FileOutputStream;
> import java.io.IOException;
> import java.net.MalformedURLException;
> import java.net.URL;
> @@ -78,6 +80,7 @@ import java.util.Collections;
> import java.util.Iterator;
> import java.util.List;
> import java.util.Map;
> +import java.util.Properties;
> import java.util.Set;
>
> /**
> @@ -382,6 +385,14 @@ public abstract class AbstractRunMojo
> */
> protected MavenSession session;
>
> + /**
> + * Will dump port in a properties file (see ports for property names).
> + * If empty no file generated
> + *
> + * @parameter expression="${maven.tomcat.propertiesPortFilePath}"
> + */
> + protected String propertiesPortFilePath;
> +
> // --
> // Fields
> // --
> @@ -952,6 +963,10 @@ public abstract class AbstractRunMojo
>
> embeddedTomcat.start();
>
> + Properties portProperties = new Properties();
> +
> + portProperties.put( "tomcat.maven.http.port",
> Integer.toString( connector.getLocalPort() ) );
> +
> session.getExecutionProperties().put(
> "tomcat.maven.http.port",
> Integer.toString(
> connector.getLocalPort() ) );
> System.setProperty( "tomcat.maven.http.port",
> Integer.toString( connector.getLocalPort() ) );
> @@ -960,6 +975,7 @@ public abstract class AbstractRunMojo
> {
> session.getExecutionProperties().put(
> "tomcat.maven.https.port",
> Integer.toString(
> httpsConnector.getLocalPort() ) );
> + portProperties.put( "tomcat.maven.https.port",
> Integer.toString( connector.getLocalPort() ) );
The above line apparently should have called
httpsConnector.getLocalPort()
> System.setProperty( "tomcat.maven.https.port",
> Integer.toString( httpsConnector.getLocalPort() ) );
> }
>
> (...)
Best regards,
Konstantin Kolinko
-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
[GUMP@vmgump]: Project tomcat-tc7.0.x-test (in module tomcat-7.0.x) failed
To whom it may engage... This is an automated request, but not an unsolicited one. For more information please visit http://gump.apache.org/nagged.html, and/or contact the folk at gene...@gump.apache.org. Project tomcat-tc7.0.x-test has an issue affecting its community integration. This issue affects 1 projects, and has been outstanding for 7 runs. The current state of this project is 'Failed', with reason 'Build Failed'. For reference only, the following projects are affected by this: - tomcat-tc7.0.x-test : Tomcat 7.x, a web server implementing Java Servlet 3.0, ... Full details are available at: http://vmgump.apache.org/gump/public/tomcat-7.0.x/tomcat-tc7.0.x-test/index.html That said, some information snippets are provided here. The following annotations (debug/informational/warning/error messages) were provided: -DEBUG- Dependency on tomcat-tc7.0.x-dbcp exists, no need to add for property tomcat-dbcp-src.jar. -DEBUG- Dependency on commons-daemon exists, no need to add for property commons-daemon.native.src.tgz. -DEBUG- Dependency on commons-daemon exists, no need to add for property tomcat-native.tar.gz. -DEBUG- Dependency on tomcat-tc7.0.x-dbcp exists, no need to add for property tomcat-dbcp.home. -INFO- Failed with reason build failed -INFO- Project Reports in: /srv/gump/public/workspace/tomcat-7.0.x/output/build/logs The following work was performed: http://vmgump.apache.org/gump/public/tomcat-7.0.x/tomcat-tc7.0.x-test/gump_work/build_tomcat-7.0.x_tomcat-tc7.0.x-test.html Work Name: build_tomcat-7.0.x_tomcat-tc7.0.x-test (Type: Build) Work ended in a state of : Failed Elapsed: 23 mins 21 secs Command Line: /usr/lib/jvm/java-6-openjdk/bin/java -Djava.awt.headless=true -Dbuild.sysclasspath=only org.apache.tools.ant.Main -Dgump.merge=/srv/gump/public/gump/work/merge.xml -Djunit.jar=/srv/gump/public/workspace/junit/dist/junit-25052012.jar -Dcommons-daemon.native.src.tgz=/srv/gump/public/workspace/apache-commons/daemon/dist/bin/commons-daemon-25052012-native-src.tar.gz -Dtomcat-native.tar.gz=/srv/gump/public/workspace/apache-commons/daemon/dist/bin/commons-daemon-25052012-native-src.tar.gz -Dexamples.sources.skip=true -Dtomcat-dbcp.home=/srv/gump/public/workspace/tomcat-7.0.x/tomcat-deps -Djdt.jar=/srv/gump/packages/eclipse/plugins/org.eclipse.jdt.core_3.4.2/jdtcore.jar -Dcommons-daemon.jar=/srv/gump/public/workspace/apache-commons/daemon/dist/commons-daemon-25052012.jar -Dtomcat-dbcp-src.jar=/srv/gump/public/workspace/tomcat-7.0.x/tomcat-deps/tomcat-dbcp-src.jar -Dtest.accesslog=true -Dcommons-pool.home=/srv/gump/public/workspace/commons-pool-1.x -Dcommons-dbcp.home=/ srv/gump/public/workspace/commons-dbcp-1.x -Dtomcat-dbcp.jar=/srv/gump/public/workspace/tomcat-7.0.x/tomcat-deps/tomcat-dbcp-25052012.jar test [Working Directory: /srv/gump/public/workspace/tomcat-7.0.x] CLASSPATH: /usr/lib/jvm/java-6-openjdk/lib/tools.jar:/srv/gump/public/workspace/tomcat-7.0.x/output/build/webapps/examples/WEB-INF/classes:/srv/gump/public/workspace/tomcat-7.0.x/output/testclasses:/srv/gump/public/workspace/ant/dist/lib/ant.jar:/srv/gump/public/workspace/ant/dist/lib/ant-launcher.jar:/srv/gump/public/workspace/ant/dist/lib/ant-jmf.jar:/srv/gump/public/workspace/ant/dist/lib/ant-junit.jar:/srv/gump/public/workspace/ant/dist/lib/ant-swing.jar:/srv/gump/public/workspace/ant/dist/lib/ant-apache-resolver.jar:/srv/gump/public/workspace/ant/dist/lib/ant-apache-xalan2.jar:/srv/gump/public/workspace/xml-commons/java/build/resolver.jar:/srv/gump/public/workspace/tomcat-7.0.x/output/build/bin/bootstrap.jar:/srv/gump/public/workspace/tomcat-7.0.x/output/build/bin/tomcat-juli.jar:/srv/gump/public/workspace/tomcat-7.0.x/output/build/lib/annotations-api.jar:/srv/gump/public/workspace/tomcat-7.0.x/output/build/lib/servlet-api.jar:/srv/gump/public/workspace/tomcat-7.0.x/outp ut/build/lib/jsp-api.jar:/srv/gump/public/workspace/tomcat-7.0.x/output/build/lib/el-api.jar:/srv/gump/public/workspace/tomcat-7.0.x/output/build/lib/catalina.jar:/srv/gump/public/workspace/tomcat-7.0.x/output/build/lib/catalina-ant.jar:/srv/gump/public/workspace/tomcat-7.0.x/output/build/lib/tomcat-coyote.jar:/srv/gump/public/workspace/tomcat-7.0.x/output/build/lib/jasper.jar:/srv/gump/public/workspace/tomcat-7.0.x/output/build/lib/jasper-el.jar:/srv/gump/public/workspace/tomcat-7.0.x/output/build/lib/catalina-tribes.jar:/srv/gump/public/workspace/tomcat-7.0.x/output/build/lib/catalina-ha.jar:/srv/gump/public/workspace/tomcat-7.0.x/output/build/lib/tomcat-api.jar:/srv/gump/public/workspace/tomcat-7.0.x/output/build/lib/tomcat-util.jar:/srv/gump/packages/eclipse/plugins/org.eclipse.jdt.core_3.4.2/jdtcore.jar:/srv/gump/public/workspace/tomcat-7.0.x/tomcat-deps/tomcat-dbcp-25052012.jar:/srv/gump/public/workspace/apache-commons/daemon/dist/commons-daemon-25052012.jar:/srv/gump/ public/workspace/junit/dist/junit-25052012.jar - [junit] at org.junit.r
svn commit: r1342498 - /tomcat/trunk/webapps/docs/jndi-resources-howto.xml
Author: kkolinko Date: Fri May 25 05:30:51 2012 New Revision: 1342498 URL: http://svn.apache.org/viewvc?rev=1342498&view=rev Log: Correct typo Modified: tomcat/trunk/webapps/docs/jndi-resources-howto.xml Modified: tomcat/trunk/webapps/docs/jndi-resources-howto.xml URL: http://svn.apache.org/viewvc/tomcat/trunk/webapps/docs/jndi-resources-howto.xml?rev=1342498&r1=1342497&r2=1342498&view=diff == --- tomcat/trunk/webapps/docs/jndi-resources-howto.xml (original) +++ tomcat/trunk/webapps/docs/jndi-resources-howto.xml Fri May 25 05:30:51 2012 @@ -110,7 +110,7 @@ element:- Add a link to a resource defined in the global JNDI context. Use resource links to give a web application access to a resource defined in -the +the child element of the element. - - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
[GUMP@vmgump]: Project tomcat-trunk-test (in module tomcat-trunk) failed
To whom it may engage... This is an automated request, but not an unsolicited one. For more information please visit http://gump.apache.org/nagged.html, and/or contact the folk at gene...@gump.apache.org. Project tomcat-trunk-test has an issue affecting its community integration. This issue affects 1 projects, and has been outstanding for 12 runs. The current state of this project is 'Failed', with reason 'Build Failed'. For reference only, the following projects are affected by this: - tomcat-trunk-test : Tomcat 8.x, a web server implementing Java Servlet 3.1, ... Full details are available at: http://vmgump.apache.org/gump/public/tomcat-trunk/tomcat-trunk-test/index.html That said, some information snippets are provided here. The following annotations (debug/informational/warning/error messages) were provided: -DEBUG- Dependency on tomcat-trunk-dbcp exists, no need to add for property tomcat-dbcp-src.jar. -DEBUG- Dependency on commons-daemon exists, no need to add for property commons-daemon.native.src.tgz. -DEBUG- Dependency on commons-daemon exists, no need to add for property tomcat-native.tar.gz. -DEBUG- Dependency on tomcat-trunk-dbcp exists, no need to add for property tomcat-dbcp.home. -INFO- Failed with reason build failed -INFO- Project Reports in: /srv/gump/public/workspace/tomcat-trunk/output/build/logs The following work was performed: http://vmgump.apache.org/gump/public/tomcat-trunk/tomcat-trunk-test/gump_work/build_tomcat-trunk_tomcat-trunk-test.html Work Name: build_tomcat-trunk_tomcat-trunk-test (Type: Build) Work ended in a state of : Failed Elapsed: 23 mins 18 secs Command Line: /usr/lib/jvm/java-6-openjdk/bin/java -Djava.awt.headless=true -Dbuild.sysclasspath=only org.apache.tools.ant.Main -Dgump.merge=/srv/gump/public/gump/work/merge.xml -Djunit.jar=/srv/gump/public/workspace/junit/dist/junit-25052012.jar -Dcommons-daemon.native.src.tgz=/srv/gump/public/workspace/apache-commons/daemon/dist/bin/commons-daemon-25052012-native-src.tar.gz -Dtomcat-native.tar.gz=/srv/gump/public/workspace/apache-commons/daemon/dist/bin/commons-daemon-25052012-native-src.tar.gz -Dexamples.sources.skip=true -Dtomcat-dbcp.home=/srv/gump/public/workspace/tomcat-trunk/tomcat-deps -Djdt.jar=/srv/gump/packages/eclipse/plugins/org.eclipse.jdt.core_3.4.2/jdtcore.jar -Dcommons-daemon.jar=/srv/gump/public/workspace/apache-commons/daemon/dist/commons-daemon-25052012.jar -Dtomcat-dbcp-src.jar=/srv/gump/public/workspace/tomcat-trunk/tomcat-deps/tomcat-dbcp-src.jar -Dtest.accesslog=true -Dcommons-pool.home=/srv/gump/public/workspace/commons-pool-1.x -Dcommons-dbcp.home=/ srv/gump/public/workspace/commons-dbcp-1.x -Dtomcat-dbcp.jar=/srv/gump/public/workspace/tomcat-trunk/tomcat-deps/tomcat-dbcp-25052012.jar test [Working Directory: /srv/gump/public/workspace/tomcat-trunk] CLASSPATH: /usr/lib/jvm/java-6-openjdk/lib/tools.jar:/srv/gump/public/workspace/tomcat-trunk/output/build/webapps/examples/WEB-INF/classes:/srv/gump/public/workspace/tomcat-trunk/output/testclasses:/srv/gump/public/workspace/ant/dist/lib/ant.jar:/srv/gump/public/workspace/ant/dist/lib/ant-launcher.jar:/srv/gump/public/workspace/ant/dist/lib/ant-jmf.jar:/srv/gump/public/workspace/ant/dist/lib/ant-junit.jar:/srv/gump/public/workspace/ant/dist/lib/ant-swing.jar:/srv/gump/public/workspace/ant/dist/lib/ant-apache-resolver.jar:/srv/gump/public/workspace/ant/dist/lib/ant-apache-xalan2.jar:/srv/gump/public/workspace/xml-commons/java/build/resolver.jar:/srv/gump/public/workspace/tomcat-trunk/output/build/bin/bootstrap.jar:/srv/gump/public/workspace/tomcat-trunk/output/build/bin/tomcat-juli.jar:/srv/gump/public/workspace/tomcat-trunk/output/build/lib/annotations-api.jar:/srv/gump/public/workspace/tomcat-trunk/output/build/lib/servlet-api.jar:/srv/gump/public/workspace/tomcat-trunk/outp ut/build/lib/jsp-api.jar:/srv/gump/public/workspace/tomcat-trunk/output/build/lib/el-api.jar:/srv/gump/public/workspace/tomcat-trunk/output/build/lib/catalina.jar:/srv/gump/public/workspace/tomcat-trunk/output/build/lib/catalina-ant.jar:/srv/gump/public/workspace/tomcat-trunk/output/build/lib/tomcat-coyote.jar:/srv/gump/public/workspace/tomcat-trunk/output/build/lib/jasper.jar:/srv/gump/public/workspace/tomcat-trunk/output/build/lib/jasper-el.jar:/srv/gump/public/workspace/tomcat-trunk/output/build/lib/catalina-tribes.jar:/srv/gump/public/workspace/tomcat-trunk/output/build/lib/catalina-ha.jar:/srv/gump/public/workspace/tomcat-trunk/output/build/lib/tomcat-api.jar:/srv/gump/public/workspace/tomcat-trunk/output/build/lib/tomcat-jni.jar:/srv/gump/public/workspace/tomcat-trunk/output/build/lib/tomcat-util.jar:/srv/gump/packages/javamail-1.4/mail.jar:/srv/gump/packages/javamail-1.4/lib/mailapi.jar:/srv/gump/packages/jaf-1.1ea/activation.jar:/srv/gump/packages/eclipse/plugins/org .eclipse.jdt.core_3.4.2/jdtcore.jar:/srv/gump/public/workspace/tomcat-trunk/tomcat-deps/tomcat-dbcp-25052012.jar:/srv/gump/public/workspac
svn commit: r1342500 - /tomcat/trunk/modules/jdbc-pool/doc/jdbc-pool.xml
Author: kkolinko Date: Fri May 25 05:41:39 2012 New Revision: 1342500 URL: http://svn.apache.org/viewvc?rev=1342500&view=rev Log: Documentation improvements: Add Table of Contents. Amend documentation of jdbcInterceptors attribute, especially that extra whitepaces are ignored. Use this feature to wrap long values. Lessen indent of code samples to reduce width of the document. Fix documentation of username and password attributes, mentioning alternateUsernameAllowed feature. Fix method name typo in InterruptedException handling example. Modified: tomcat/trunk/modules/jdbc-pool/doc/jdbc-pool.xml Modified: tomcat/trunk/modules/jdbc-pool/doc/jdbc-pool.xml URL: http://svn.apache.org/viewvc/tomcat/trunk/modules/jdbc-pool/doc/jdbc-pool.xml?rev=1342500&r1=1342499&r2=1342500&view=diff == --- tomcat/trunk/modules/jdbc-pool/doc/jdbc-pool.xml (original) +++ tomcat/trunk/modules/jdbc-pool/doc/jdbc-pool.xml Fri May 25 05:41:39 2012 @@ -29,6 +29,9 @@ + + + @@ -194,13 +197,19 @@ (String) The connection username to be passed to our JDBC driver to establish a connection. - Note, at this point, DataSource.getConnection(username,password) is not using the credentials passed into the method. + Note that method DataSource.getConnection(username,password) + by default will not use credentials passed into the method, + but will use the ones configured here. See alternateUsernameAllowed + property for more details. (String) The connection password to be passed to our JDBC driver to establish a connection. - Note, at this point, DataSource.getConnection(username,password) is not using the credentials passed into the method. + Note that method DataSource.getConnection(username,password) + by default will not use credentials passed into the method, + but will use the ones configured here. See alternateUsernameAllowed + property for more details. @@ -352,13 +361,26 @@ - (String) A semicolon separated list of classnames extending org.apache.tomcat.jdbc.pool.JdbcInterceptor class. - These interceptors will be inserted as an interceptor into the chain of operations on a java.sql.Connection object. - The default value is null. + (String) A semicolon separated list of classnames extending + org.apache.tomcat.jdbc.pool.JdbcInterceptor class. + See Configuring JDBC interceptors + below for more detailed description of syntaz and examples. + + + These interceptors will be inserted as an interceptor into the chain + of operations on a java.sql.Connection object. + The default value is null. + + Predefined interceptors: - org.apache.tomcat.jdbc.pool.interceptor.ConnectionState - keeps track of auto commit, read only, catalog and transaction isolation level. - org.apache.tomcat.jdbc.pool.interceptor.StatementFinalizer - keeps track of opened statements, and closes them when the connection is returned to the pool. - More predefined interceptors are described in detail in the JDBC Interceptors section. + org.apache.tomcat.jdbc.pool.interceptor.ConnectionState + - keeps track of auto commit, read only, catalog and transaction isolation level. + org.apache.tomcat.jdbc.pool.interceptor.StatementFinalizer + - keeps track of opened statements, and closes them when the connection is returned to the pool. + + + More predefined interceptors are described in detail in the + JDBC Interceptors section. @@ -436,11 +458,17 @@ (boolean) By default, the jdbc-pool will ignore the http://docs.oracle.com/javase/6/docs/api/javax/sql/DataSource.html#getConnection(java.lang.String,%20java.lang.String)">DataSource.getConnection(username,password) call, and simply return a previously pooled connection under the globally configured properties username and password, for performance reasons. - The pool can however be used with different credentials each time a connection is used. Should you request a connection with the credentials user1/password1 and the connection - was previously connected using user2/password2, the connection will be closed, and reopened with the requested credentials. This way, the pool size is still managed - on a global level, and not on a per schema level. To enable the functionality described in the + + + The pool can however be configured to allow use of different credentials + each time a connection is requested. To enable the functionality described in the http://docs.oracle.com/javase/6/docs/api/javax/sql/DataSource.html#getConnection(java.lang.String,%20java.lang.String)">D
svn commit: r1342503 - /tomcat/trunk/webapps/docs/config/context.xml
Author: kkolinko Date: Fri May 25 06:10:23 2012 New Revision: 1342503 URL: http://svn.apache.org/viewvc?rev=1342503&view=rev Log: Fix https://issues.apache.org/bugzilla/show_bug.cgi?id=53289 Clarify ResourceLink example that uses getConnection(username, password) Modified: tomcat/trunk/webapps/docs/config/context.xml Modified: tomcat/trunk/webapps/docs/config/context.xml URL: http://svn.apache.org/viewvc/tomcat/trunk/webapps/docs/config/context.xml?rev=1342503&r1=1342502&r2=1342503&view=diff == --- tomcat/trunk/webapps/docs/config/context.xml (original) +++ tomcat/trunk/webapps/docs/config/context.xml Fri May 25 06:10:23 2012 @@ -1196,16 +1196,26 @@ -Shared Data Source Example +Shared Data Source Example: +Warning: This feature works only if the global DataSource +supports getConnection(username, password) method. +http://commons.apache.org/dbcp/";>Apache Commons DBCP pool that +Tomcat uses by default does not support it. See its Javadoc for +BasicDataSource class. +Apache Tomcat JDBC pool does support it, +but by default this support is disabled and can be enabled by +alternateUsernameAllowed attribute. See its documentation +for details.... - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
svn commit: r1342511 - in /tomcat/tc7.0.x/trunk: ./ modules/ webapps/docs/changelog.xml webapps/docs/config/context.xml webapps/docs/jndi-resources-howto.xml
Author: kkolinko Date: Fri May 25 06:28:10 2012 New Revision: 1342511 URL: http://svn.apache.org/viewvc?rev=1342511&view=rev Log: Merged revisions r1342498 r1342503 from tomcat/trunk, updated jdbc-pool external to r1342500: Fix https://issues.apache.org/bugzilla/show_bug.cgi?id=53289 Clarified ResourceLink example that uses getConnection(username, password) Improved JDBC pool documentation on jdbcInterceptors and alternateUsernameAllowed attributes. Modified: tomcat/tc7.0.x/trunk/ (props changed) tomcat/tc7.0.x/trunk/modules/ (props changed) tomcat/tc7.0.x/trunk/webapps/docs/changelog.xml tomcat/tc7.0.x/trunk/webapps/docs/config/context.xml tomcat/tc7.0.x/trunk/webapps/docs/jndi-resources-howto.xml Propchange: tomcat/tc7.0.x/trunk/ -- Merged /tomcat/trunk:r1342498,1342503 Propchange: tomcat/tc7.0.x/trunk/modules/ -- --- svn:externals (original) +++ svn:externals Fri May 25 06:28:10 2012 @@ -1 +1 @@ -^/tomcat/trunk/modules/jdbc-pool@1340861 jdbc-pool +^/tomcat/trunk/modules/jdbc-pool@1342500 jdbc-pool 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=1342511&r1=1342510&r2=1342511&view=diff == --- tomcat/tc7.0.x/trunk/webapps/docs/changelog.xml (original) +++ tomcat/tc7.0.x/trunk/webapps/docs/changelog.xml Fri May 25 06:28:10 2012 @@ -186,6 +186,11 @@ of connectionTimeout attribute for AJP protocol connectors. (kkolinko) + +53289: Clarify ResourceLink example that +uses DataSource.getConnection(username, password) method. Not all +data source implementations support it. (kkolinko) + Fix several trivial HTML markup errors in sample servlets. (kkolinko) Modified: tomcat/tc7.0.x/trunk/webapps/docs/config/context.xml URL: http://svn.apache.org/viewvc/tomcat/tc7.0.x/trunk/webapps/docs/config/context.xml?rev=1342511&r1=1342510&r2=1342511&view=diff == --- tomcat/tc7.0.x/trunk/webapps/docs/config/context.xml (original) +++ tomcat/tc7.0.x/trunk/webapps/docs/config/context.xml Fri May 25 06:28:10 2012 @@ -1196,16 +1196,26 @@ -Shared Data Source Example +Shared Data Source Example: +Warning: This feature works only if the global DataSource +supports getConnection(username, password) method. +http://commons.apache.org/dbcp/";>Apache Commons DBCP pool that +Tomcat uses by default does not support it. See its Javadoc for +BasicDataSource class. +Apache Tomcat JDBC pool does support it, +but by default this support is disabled and can be enabled by +alternateUsernameAllowed attribute. See its documentation +for details.... Modified: tomcat/tc7.0.x/trunk/webapps/docs/jndi-resources-howto.xml URL: http://svn.apache.org/viewvc/tomcat/tc7.0.x/trunk/webapps/docs/jndi-resources-howto.xml?rev=1342511&r1=1342510&r2=1342511&view=diff == --- tomcat/tc7.0.x/trunk/webapps/docs/jndi-resources-howto.xml (original) +++ tomcat/tc7.0.x/trunk/webapps/docs/jndi-resources-howto.xml Fri May 25 06:28:10 2012 @@ -110,7 +110,7 @@ element: - Add a link to a resource defined in the global JNDI context. Use resource links to give a web application access to a resource defined in -the +the child element of the element. - - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
svn commit: r1342515 - in /tomcat/tc6.0.x/trunk: ./ webapps/docs/changelog.xml webapps/docs/config/context.xml webapps/docs/jndi-resources-howto.xml
Author: kkolinko Date: Fri May 25 06:41:02 2012 New Revision: 1342515 URL: http://svn.apache.org/viewvc?rev=1342515&view=rev Log: CTR: documentation Fix https://issues.apache.org/bugzilla/show_bug.cgi?id=53289 Clarify ResourceLink example that uses getConnection(username, password) Backport of r1342498 r1342503 from trunk. Modified: tomcat/tc6.0.x/trunk/ (props changed) tomcat/tc6.0.x/trunk/webapps/docs/changelog.xml tomcat/tc6.0.x/trunk/webapps/docs/config/context.xml tomcat/tc6.0.x/trunk/webapps/docs/jndi-resources-howto.xml Propchange: tomcat/tc6.0.x/trunk/ -- Merged /tomcat/trunk:r1342498,1342503 Modified: tomcat/tc6.0.x/trunk/webapps/docs/changelog.xml URL: http://svn.apache.org/viewvc/tomcat/tc6.0.x/trunk/webapps/docs/changelog.xml?rev=1342515&r1=1342514&r2=1342515&view=diff == --- tomcat/tc6.0.x/trunk/webapps/docs/changelog.xml (original) +++ tomcat/tc6.0.x/trunk/webapps/docs/changelog.xml Fri May 25 06:41:02 2012 @@ -179,6 +179,11 @@ docs.oracle.com site, instead of obsolete ones (download.oracle.com, java.sun.com). (kkolinko) + +53289: Clarify ResourceLink example that +uses DataSource.getConnection(username, password) method. Not all +data source implementations support it. (kkolinko) + Modified: tomcat/tc6.0.x/trunk/webapps/docs/config/context.xml URL: http://svn.apache.org/viewvc/tomcat/tc6.0.x/trunk/webapps/docs/config/context.xml?rev=1342515&r1=1342514&r2=1342515&view=diff == --- tomcat/tc6.0.x/trunk/webapps/docs/config/context.xml (original) +++ tomcat/tc6.0.x/trunk/webapps/docs/config/context.xml Fri May 25 06:41:02 2012 @@ -925,16 +925,27 @@ -Shared Data Source Example +Shared Data Source Example: +Warning: This feature works only if the global DataSource +supports getConnection(username, password) method. +http://commons.apache.org/dbcp/";>Apache Commons DBCP pool that +Tomcat uses by default does not support it. See its Javadoc for +BasicDataSource class. +http://tomcat.apache.org/tomcat-7.0-doc/jdbc-pool.html";>Apache Tomcat JDBC pool +(included with Tomcat 7 and later) does support it, +but by default this support is disabled and can be enabled by +alternateUsernameAllowed attribute. See its documentation +for details. The example below uses Apache Tomcat JDBC pool.... Modified: tomcat/tc6.0.x/trunk/webapps/docs/jndi-resources-howto.xml URL: http://svn.apache.org/viewvc/tomcat/tc6.0.x/trunk/webapps/docs/jndi-resources-howto.xml?rev=1342515&r1=1342514&r2=1342515&view=diff == --- tomcat/tc6.0.x/trunk/webapps/docs/jndi-resources-howto.xml (original) +++ tomcat/tc6.0.x/trunk/webapps/docs/jndi-resources-howto.xml Fri May 25 06:41:02 2012 @@ -110,7 +110,7 @@ element: - Add a link to a resource defined in the global JNDI context. Use resource links to give a web application access to a resource defined in -the +the child element of the element. - - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
[Bug 53289] Clarify ResourceLink example that uses getConnection(username, password)
https://issues.apache.org/bugzilla/show_bug.cgi?id=53289 Konstantin Kolinko changed: What|Removed |Added Status|NEW |RESOLVED Resolution|--- |FIXED --- Comment #1 from Konstantin Kolinko --- Fixed in trunk r1342503 in 7.0.x r1342511 to be in 7.0.28, in 6.0.x r1342515 to be in 6.0.36. -- 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: r1333929 - /tomcat/maven-plugin/trunk/tomcat7-maven-plugin/src/main/java/org/apache/tomcat/maven/plugin/tomcat7/run/AbstractRunMojo.java
2012/5/25 Konstantin Kolinko :
> 2012/5/4 :
>> Author: olamy
>> Date: Fri May 4 13:06:23 2012
>> New Revision: 1333929
>>
>> URL: http://svn.apache.org/viewvc?rev=1333929&view=rev
>> Log:
>> [MTOMCAT-150] expose ports used with tomcat7:run as sys props: feature to
>> dump ports in a property file to be able to use later with a forked surefire
>> execution
>>
>> Modified:
>>
>> tomcat/maven-plugin/trunk/tomcat7-maven-plugin/src/main/java/org/apache/tomcat/maven/plugin/tomcat7/run/AbstractRunMojo.java
>>
>> Modified:
>> tomcat/maven-plugin/trunk/tomcat7-maven-plugin/src/main/java/org/apache/tomcat/maven/plugin/tomcat7/run/AbstractRunMojo.java
>> URL:
>> http://svn.apache.org/viewvc/tomcat/maven-plugin/trunk/tomcat7-maven-plugin/src/main/java/org/apache/tomcat/maven/plugin/tomcat7/run/AbstractRunMojo.java?rev=1333929&r1=1333928&r2=1333929&view=diff
>> ==
>> ---
>> tomcat/maven-plugin/trunk/tomcat7-maven-plugin/src/main/java/org/apache/tomcat/maven/plugin/tomcat7/run/AbstractRunMojo.java
>> (original)
>> +++
>> tomcat/maven-plugin/trunk/tomcat7-maven-plugin/src/main/java/org/apache/tomcat/maven/plugin/tomcat7/run/AbstractRunMojo.java
>> Fri May 4 13:06:23 2012
>> @@ -31,6 +31,7 @@ import org.apache.catalina.startup.Catal
>> import org.apache.catalina.startup.CatalinaProperties;
>> import org.apache.catalina.startup.Tomcat;
>> import org.apache.catalina.valves.AccessLogValve;
>> +import org.apache.commons.io.IOUtils;
>> import org.apache.commons.lang.StringUtils;
>> import org.apache.maven.artifact.Artifact;
>> import org.apache.maven.artifact.resolver.filter.ScopeArtifactFilter;
>> @@ -69,6 +70,7 @@ import javax.xml.stream.XMLStreamReader;
>> import java.io.File;
>> import java.io.FileInputStream;
>> import java.io.FileNotFoundException;
>> +import java.io.FileOutputStream;
>> import java.io.IOException;
>> import java.net.MalformedURLException;
>> import java.net.URL;
>> @@ -78,6 +80,7 @@ import java.util.Collections;
>> import java.util.Iterator;
>> import java.util.List;
>> import java.util.Map;
>> +import java.util.Properties;
>> import java.util.Set;
>>
>> /**
>> @@ -382,6 +385,14 @@ public abstract class AbstractRunMojo
>> */
>> protected MavenSession session;
>>
>> + /**
>> + * Will dump port in a properties file (see ports for property names).
>> + * If empty no file generated
>> + *
>> + * @parameter expression="${maven.tomcat.propertiesPortFilePath}"
>> + */
>> + protected String propertiesPortFilePath;
>> +
>> // --
>> // Fields
>> // --
>> @@ -952,6 +963,10 @@ public abstract class AbstractRunMojo
>>
>> embeddedTomcat.start();
>>
>> + Properties portProperties = new Properties();
>> +
>> + portProperties.put( "tomcat.maven.http.port",
>> Integer.toString( connector.getLocalPort() ) );
>> +
>> session.getExecutionProperties().put(
>> "tomcat.maven.http.port",
>> Integer.toString(
>> connector.getLocalPort() ) );
>> System.setProperty( "tomcat.maven.http.port",
>> Integer.toString( connector.getLocalPort() ) );
>> @@ -960,6 +975,7 @@ public abstract class AbstractRunMojo
>> {
>> session.getExecutionProperties().put(
>> "tomcat.maven.https.port",
>> Integer.toString(
>> httpsConnector.getLocalPort() ) );
>> + portProperties.put( "tomcat.maven.https.port",
>> Integer.toString( connector.getLocalPort() ) );
>
>
> The above line apparently should have called
> httpsConnector.getLocalPort()
Good catch !
Thanks!
>
>> System.setProperty( "tomcat.maven.https.port",
>> Integer.toString( httpsConnector.getLocalPort() ) );
>> }
>>
>> (...)
>
> Best regards,
> Konstantin Kolinko
>
> -
> To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
> For additional commands, e-mail: dev-h...@tomcat.apache.org
>
--
Olivier Lamy
Talend: http://coders.talend.com
http://twitter.com/olamy | http://linkedin.com/in/olamy
-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
svn commit: r1342517 - /tomcat/maven-plugin/trunk/tomcat7-maven-plugin/src/main/java/org/apache/tomcat/maven/plugin/tomcat7/run/AbstractRunMojo.java
Author: olamy
Date: Fri May 25 06:45:48 2012
New Revision: 1342517
URL: http://svn.apache.org/viewvc?rev=1342517&view=rev
Log:
httpsConnector.localPort needed here
Modified:
tomcat/maven-plugin/trunk/tomcat7-maven-plugin/src/main/java/org/apache/tomcat/maven/plugin/tomcat7/run/AbstractRunMojo.java
Modified:
tomcat/maven-plugin/trunk/tomcat7-maven-plugin/src/main/java/org/apache/tomcat/maven/plugin/tomcat7/run/AbstractRunMojo.java
URL:
http://svn.apache.org/viewvc/tomcat/maven-plugin/trunk/tomcat7-maven-plugin/src/main/java/org/apache/tomcat/maven/plugin/tomcat7/run/AbstractRunMojo.java?rev=1342517&r1=1342516&r2=1342517&view=diff
==
---
tomcat/maven-plugin/trunk/tomcat7-maven-plugin/src/main/java/org/apache/tomcat/maven/plugin/tomcat7/run/AbstractRunMojo.java
(original)
+++
tomcat/maven-plugin/trunk/tomcat7-maven-plugin/src/main/java/org/apache/tomcat/maven/plugin/tomcat7/run/AbstractRunMojo.java
Fri May 25 06:45:48 2012
@@ -975,7 +975,7 @@ public abstract class AbstractRunMojo
{
session.getExecutionProperties().put(
"tomcat.maven.https.port",
Integer.toString(
httpsConnector.getLocalPort() ) );
-portProperties.put( "tomcat.maven.https.port",
Integer.toString( connector.getLocalPort() ) );
+portProperties.put( "tomcat.maven.https.port",
Integer.toString( httpsConnector.getLocalPort() ) );
System.setProperty( "tomcat.maven.https.port",
Integer.toString( httpsConnector.getLocalPort() ) );
}
-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
[Bug 53267] The JreMemoryLeakPreventionListener causes a full GC every hour when gcDaemonProtection=true
https://issues.apache.org/bugzilla/show_bug.cgi?id=53267 Konstantin Kolinko changed: What|Removed |Added Attachment #28809|0 |1 is patch|| Attachment #28809|application/octet-stream|text/plain mime type|| -- 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
