date:20120505

svn commit: r1334348 - in /tomcat/jk/trunk: native/common/jk_ajp_common.c native/common/jk_lb_worker.c native/common/jk_shm.c native/common/jk_shm.h xdocs/miscellaneous/changelog.xml

2012-05-05 Thread mturk

Author: mturk
Date: Sat May  5 08:50:28 2012
New Revision: 1334348

URL: http://svn.apache.org/viewvc?rev=1334348&view=rev
Log:
Fix shared memory by using named objects instead relying on configuration order

Modified:
tomcat/jk/trunk/native/common/jk_ajp_common.c
tomcat/jk/trunk/native/common/jk_lb_worker.c
tomcat/jk/trunk/native/common/jk_shm.c
tomcat/jk/trunk/native/common/jk_shm.h
tomcat/jk/trunk/xdocs/miscellaneous/changelog.xml

Modified: tomcat/jk/trunk/native/common/jk_ajp_common.c
URL: 
http://svn.apache.org/viewvc/tomcat/jk/trunk/native/common/jk_ajp_common.c?rev=1334348&r1=1334347&r2=1334348&view=diff
==
--- tomcat/jk/trunk/native/common/jk_ajp_common.c (original)
+++ tomcat/jk/trunk/native/common/jk_ajp_common.c Sat May  5 08:50:28 2012
@@ -1064,7 +1064,7 @@ void jk_ajp_pull(ajp_worker_t * aw, int 
 if (locked == JK_FALSE)
 jk_shm_unlock();
 
-if (address_change == JK_TRUE) {
+if (address_change == JK_TRUE && port != 0) {
 if (!jk_resolve(host, port, &inet_addr,
 aw->worker.we->pool, l)) {
 jk_log(l, JK_LOG_ERROR,
@@ -1120,7 +1120,10 @@ void jk_ajp_push(ajp_worker_t * aw, int 
 aw->s->retries = aw->retries;
 aw->s->retry_interval = aw->retry_interval;
 aw->s->max_packet_size = aw->max_packet_size;
-aw->s->h.sequence = aw->sequence;
+/* Force squence update on push
+ */
+ ++aw->s->h.sequence;
+aw->sequence = aw->s->h.sequence;
 if (aw->s->addr_sequence != aw->addr_sequence) {
 address_change = JK_TRUE;
 strncpy(aw->s->host, aw->host, JK_SHM_STR_SIZ);
@@ -2681,36 +2684,45 @@ int ajp_validate(jk_worker_t *pThis,
p->name, p->host, p->port);
 /* Copy the contact to shm
  */
-strncpy(p->s->host, p->host, JK_SHM_STR_SIZ);
-p->s->port = p->port;
-p->s->addr_sequence = p->addr_sequence = 0;
-/* Resolve if port > 0.
- */
-if (p->port > 0) {
-if (jk_resolve(p->host, p->port, &p->worker_inet_addr, we->pool, 
l)) {
-JK_TRACE_EXIT(l);
-return JK_TRUE;
+if (p->sequence == 0) {
+/* Initial setup.
+ * Invalidate addr_sequence so that the address in resolved.
+ */
+if (p->port > 0) {
+if (!jk_resolve(p->host, p->port, &p->worker_inet_addr, 
we->pool, l)) {
+jk_log(l, JK_LOG_ERROR,
+   "worker %s can't resolve tomcat address %s",
+   p->name, p->host);
+p->s->port = p->port = 0;
+if (JK_IS_DEBUG_LEVEL(l))
+jk_log(l, JK_LOG_DEBUG,
+   "worker %s contact is disabled",
+   p->name);
+}
+else {
+p->s->port = p->port = 0;
+if (JK_IS_DEBUG_LEVEL(l))
+jk_log(l, JK_LOG_DEBUG,
+   "worker %s contact is disabled",
+p->name);
+}
 }
-jk_log(l, JK_LOG_ERROR,
-   "worker %s can't resolve tomcat address %s",
-   p->name, p->host);
-p->s->port = p->port = 0;
-if (JK_IS_DEBUG_LEVEL(l))
-jk_log(l, JK_LOG_DEBUG,
-   "worker %s contact is disabled",
-   p->name);
-JK_TRACE_EXIT(l);
-return JK_TRUE;
+p->addr_sequence = p->s->addr_sequence;
+p->s->last_maintain_time = time(NULL);
+p->s->last_reset = p->s->last_maintain_time;
+jk_ajp_push(p, JK_TRUE, l);
 }
 else {
-p->s->port = p->port = 0;
+/* Somebody already setup this worker.
+ */
 if (JK_IS_DEBUG_LEVEL(l))
 jk_log(l, JK_LOG_DEBUG,
-   "worker %s contact is disabled",
-   p->name);
-JK_TRACE_EXIT(l);
-return JK_TRUE;
-}
+   "worker %s contact already configured (%u->%u",
+p->name, p->s->addr_sequence, p->addr_sequence);
+jk_ajp_pull(p, JK_TRUE, l);
+}
+JK_TRACE_EXIT(l);
+return JK_TRUE;
 }
 else {
 JK_LOG_NULL_PARAMS(l);
@@ -2869,9 +2881,6 @@ int ajp_init(jk_worker_t *pThis,
 p->maintain_time = jk_get_worker_maintain_time(props);
 if(p->maintain_time < 0)
 p->maintain_time = 0;
-p->s->last_maintain_time = time(NULL);
-p->s->last_reset = p->s->last_maintain_time;
-
 if (JK_IS_DEBUG_LEVEL(l)) {
 
 jk_log(l, JK_LOG_DEBUG,
@@ -2999,7 +3008,7 @@ int JK_METHOD ajp_worker_factory(jk_work
 
 *w = &

svn commit: r1334392 - in /tomcat/jk/trunk/native/common: jk_ajp_common.c jk_shm.c

2012-05-05 Thread mturk

Author: mturk
Date: Sat May  5 10:49:41 2012
New Revision: 1334392

URL: http://svn.apache.org/viewvc?rev=1334392&view=rev
Log:
Make sure address is correctly resolved

Modified:
tomcat/jk/trunk/native/common/jk_ajp_common.c
tomcat/jk/trunk/native/common/jk_shm.c

Modified: tomcat/jk/trunk/native/common/jk_ajp_common.c
URL: 
http://svn.apache.org/viewvc/tomcat/jk/trunk/native/common/jk_ajp_common.c?rev=1334392&r1=1334391&r2=1334392&view=diff
==
--- tomcat/jk/trunk/native/common/jk_ajp_common.c (original)
+++ tomcat/jk/trunk/native/common/jk_ajp_common.c Sat May  5 10:49:41 2012
@@ -1065,11 +1065,15 @@ void jk_ajp_pull(ajp_worker_t * aw, int 
 jk_shm_unlock();
 
 if (address_change == JK_TRUE && port != 0) {
+aw->port = port;
+strncpy(aw->host, host, JK_SHM_STR_SIZ);
 if (!jk_resolve(host, port, &inet_addr,
 aw->worker.we->pool, l)) {
 jk_log(l, JK_LOG_ERROR,
"Failed resolving address '%s:%d' for worker '%s'.",
host, port, aw->name);
+/* Disable contact */
+aw->port = 0;
 }
 else {
 unsigned int i;
@@ -1086,8 +1090,6 @@ void jk_ajp_pull(ajp_worker_t * aw, int 
 aw->s->connected--;
 }
 }
-aw->port = port;
-strncpy(aw->host, host, JK_SHM_STR_SIZ);
 memcpy(&(aw->worker_inet_addr), &inet_addr, sizeof(inet_addr));
 JK_LEAVE_CS(&aw->cs);
 }
@@ -2684,9 +2686,8 @@ int ajp_validate(jk_worker_t *pThis,
p->name, p->host, p->port);
 /* Copy the contact to shm
  */
-if (p->sequence == 0) {
+if (p->s->h.sequence == 0) {
 /* Initial setup.
- * Invalidate addr_sequence so that the address in resolved.
  */
 if (p->port > 0) {
 if (!jk_resolve(p->host, p->port, &p->worker_inet_addr, 
we->pool, l)) {
@@ -2699,15 +2700,8 @@ int ajp_validate(jk_worker_t *pThis,
"worker %s contact is disabled",
p->name);
 }
-else {
-p->s->port = p->port = 0;
-if (JK_IS_DEBUG_LEVEL(l))
-jk_log(l, JK_LOG_DEBUG,
-   "worker %s contact is disabled",
-p->name);
-}
 }
-p->addr_sequence = p->s->addr_sequence;
+p->s->addr_sequence = 1;
 p->s->last_maintain_time = time(NULL);
 p->s->last_reset = p->s->last_maintain_time;
 jk_ajp_push(p, JK_TRUE, l);
@@ -2719,8 +2713,8 @@ int ajp_validate(jk_worker_t *pThis,
 jk_log(l, JK_LOG_DEBUG,
"worker %s contact already configured (%u->%u",
 p->name, p->s->addr_sequence, p->addr_sequence);
-jk_ajp_pull(p, JK_TRUE, l);
-}
+jk_ajp_pull(p, JK_TRUE, l);
+}
 JK_TRACE_EXIT(l);
 return JK_TRUE;
 }

Modified: tomcat/jk/trunk/native/common/jk_shm.c
URL: 
http://svn.apache.org/viewvc/tomcat/jk/trunk/native/common/jk_shm.c?rev=1334392&r1=1334391&r2=1334392&view=diff
==
--- tomcat/jk/trunk/native/common/jk_shm.c (original)
+++ tomcat/jk/trunk/native/common/jk_shm.c Sat May  5 10:49:41 2012
@@ -295,6 +295,7 @@ int jk_shm_open(const char *fname, int s
  * if the number of workers change between
  * open and attach or between two attach operations.
  */
+#if 0
 if (jk_shmem.hdr->h.data.childs > 1) {
 if (JK_IS_DEBUG_LEVEL(l)) {
 jk_log(l, JK_LOG_DEBUG,
@@ -302,7 +303,6 @@ int jk_shm_open(const char *fname, int s
jk_shmem.hdr->h.data.childs);
 }
 }
-#if 0
 jk_shmem.hdr->h.data.pos = 0;
 jk_shmem.hdr->h.data.workers = 0;
 #endif
@@ -316,9 +316,11 @@ int jk_shm_open(const char *fname, int s
 JK_LEAVE_CS(&jk_shmem.cs);
 if (JK_IS_DEBUG_LEVEL(l))
 jk_log(l, JK_LOG_DEBUG,
-   "%s shared memory %s size=%u workers=%d free=%u addr=%#lx",
+   "%s shared memory %s [%d] size=%u workers=%d free=%u addr=%#lx",
attached ? "Attached" : "Initialized",
-   jk_shm_name(), jk_shmem.size, jk_shmem.hdr->h.data.workers,
+   jk_shm_name(),
+   jk_shmem.hdr->h.data.childs,
+   jk_shmem.size, jk_shmem.hdr->h.data.workers - 1,
jk_shmem.hdr->h.data.size - jk_shmem.hdr->h.data.pos,
jk_shmem.hdr);
 JK_TRACE_EXIT(l);
@@ -626,16 +628,17 @@ static int do_shm_open(const char *fname
jk_shmem.hdr);
 }

svn commit: r1334395 - /tomcat/jk/trunk/native/common/jk_ajp_common.c

2012-05-05 Thread mturk

Author: mturk
Date: Sat May  5 10:57:55 2012
New Revision: 1334395

URL: http://svn.apache.org/viewvc?rev=1334395&view=rev
Log:
Make sure we have thread lock inside validate

Modified:
tomcat/jk/trunk/native/common/jk_ajp_common.c

Modified: tomcat/jk/trunk/native/common/jk_ajp_common.c
URL: 
http://svn.apache.org/viewvc/tomcat/jk/trunk/native/common/jk_ajp_common.c?rev=1334395&r1=1334394&r2=1334395&view=diff
==
--- tomcat/jk/trunk/native/common/jk_ajp_common.c (original)
+++ tomcat/jk/trunk/native/common/jk_ajp_common.c Sat May  5 10:57:55 2012
@@ -2937,16 +2937,6 @@ int ajp_init(jk_worker_t *pThis,
  *  of the following loop
  */
 p->secret = jk_get_worker_secret(props, p->name);
-/* Initialize cache slots
- */
-JK_INIT_CS(&(p->cs), rc);
-if (!rc) {
-jk_log(l, JK_LOG_ERROR,
-   "creating thread lock (errno=%d)",
-   errno);
-JK_TRACE_EXIT(l);
-return JK_FALSE;
-}
 if (!ajp_create_endpoint_cache(p, proto, l)) {
 jk_log(l, JK_LOG_ERROR,
"allocating connection pool of size %u",
@@ -2967,6 +2957,7 @@ int ajp_init(jk_worker_t *pThis,
 int JK_METHOD ajp_worker_factory(jk_worker_t **w,
  const char *name, jk_logger_t *l)
 {
+int rc;
 ajp_worker_t *aw;
 
 JK_TRACE_ENTER(l);
@@ -3011,6 +3002,17 @@ int JK_METHOD ajp_worker_factory(jk_work
 JK_TRACE_EXIT(l);
 return JK_FALSE;
 }
+JK_INIT_CS(&aw->cs, rc);
+if (!rc) {
+jk_log(l, JK_LOG_ERROR,
+   "creating thread lock (errno=%d)",
+   errno);
+jk_close_pool(&aw->p);
+free(aw);
+JK_TRACE_EXIT(l);
+return JK_FALSE;
+}
+
 JK_TRACE_EXIT(l);
 return JK_TRUE;
 }



-
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

2012-05-05 Thread Bill Barker

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 2 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: 21 mins 47 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-05052012.jar 
-Dcommons-daemon.native.src.tgz=/srv/gump/public/workspace/apache-commons/daemon/dist/bin/commons-daemon-05052012-native-src.tar.gz
 
-Dtomcat-native.tar.gz=/srv/gump/public/workspace/apache-commons/daemon/dist/bin/commons-daemon-05052012-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-05052012.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-05052012.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-05052012.jar:/srv/gump/public/workspace/apache-commons/daemon/dist/commons-daemon-05052012.jar:/srv/gump/
 public/workspace/junit/dist/junit-05052012.jar
-
[junit] May 5, 2012 11:05:5

svn commit: r1334399 - /tomcat/jk/trunk/native/common/jk_ajp_common.c

2012-05-05 Thread mturk

Author: mturk
Date: Sat May  5 11:19:36 2012
New Revision: 1334399

URL: http://svn.apache.org/viewvc?rev=1334399&view=rev
Log:
make sure connections count doesn't go negative. Decrement only if socket was 
actually open

Modified:
tomcat/jk/trunk/native/common/jk_ajp_common.c

Modified: tomcat/jk/trunk/native/common/jk_ajp_common.c
URL: 
http://svn.apache.org/viewvc/tomcat/jk/trunk/native/common/jk_ajp_common.c?rev=1334399&r1=1334398&r2=1334399&view=diff
==
--- tomcat/jk/trunk/native/common/jk_ajp_common.c (original)
+++ tomcat/jk/trunk/native/common/jk_ajp_common.c Sat May  5 11:19:36 2012
@@ -768,8 +768,8 @@ static void ajp_abort_endpoint(ajp_endpo
 else {
 jk_shutdown_socket(ae->sd, l);
 }
+ae->worker->s->connected--;
 }
-ae->worker->s->connected--;
 ae->sd = JK_INVALID_SOCKET;
 ae->last_op = JK_AJP13_END_RESPONSE;
 JK_TRACE_EXIT(l);



-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org

svn commit: r1334401 - /tomcat/jk/trunk/native/common/jk_ajp_common.c

2012-05-05 Thread mturk

Author: mturk
Date: Sat May  5 11:25:45 2012
New Revision: 1334401

URL: http://svn.apache.org/viewvc?rev=1334401&view=rev
Log:
Few more places that needs to decrement the connection counter when the socket 
is closed

Modified:
tomcat/jk/trunk/native/common/jk_ajp_common.c

Modified: tomcat/jk/trunk/native/common/jk_ajp_common.c
URL: 
http://svn.apache.org/viewvc/tomcat/jk/trunk/native/common/jk_ajp_common.c?rev=1334401&r1=1334400&r2=1334401&view=diff
==
--- tomcat/jk/trunk/native/common/jk_ajp_common.c (original)
+++ tomcat/jk/trunk/native/common/jk_ajp_common.c Sat May  5 11:25:45 2012
@@ -806,6 +806,7 @@ void ajp_close_endpoint(ajp_endpoint_t *
ae->worker->name, ae->sd, ae->reuse ? "" : " (socket 
shutdown)");
 if (IS_VALID_SOCKET(ae->sd)) {
 jk_shutdown_socket(ae->sd, l);
+ae->worker->s->connected--;
 }
 ae->sd = JK_INVALID_SOCKET;
 jk_close_pool(&(ae->pool));
@@ -831,8 +832,10 @@ static int ajp_next_connection(ajp_endpo
 
 /* Close previous socket
  */
-if (IS_VALID_SOCKET(ae->sd))
+if (IS_VALID_SOCKET(ae->sd)) {
 jk_shutdown_socket(ae->sd, l);
+ae->worker->s->connected--;
+}
 /* Mark existing endpoint socket as closed
  */
 ae->sd = JK_INVALID_SOCKET;
@@ -3302,7 +3305,10 @@ int JK_METHOD ajp_maintain(jk_worker_t *
  * called from the watchdog thread.
  */
 for (m = 0; m < m_count; m++) {
-jk_shutdown_socket(m_sock[m], l);
+if (m_sock[m] != JK_INVALID_SOCKET) {
+jk_shutdown_socket(m_sock[m], l);
+aw->s->connected--;
+}
 }
 free(m_sock);
 if (n && JK_IS_DEBUG_LEVEL(l))



-
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

2012-05-05 Thread Bill Barker

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 5 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: 22 mins 10 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-05052012.jar 
-Dcommons-daemon.native.src.tgz=/srv/gump/public/workspace/apache-commons/daemon/dist/bin/commons-daemon-05052012-native-src.tar.gz
 
-Dtomcat-native.tar.gz=/srv/gump/public/workspace/apache-commons/daemon/dist/bin/commons-daemon-05052012-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-05052012.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-05052012.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-05052012.jar:/srv/gump/public/workspace

svn commit: r1334403 - /tomcat/jk/trunk/native/common/jk_uri_worker_map.c

2012-05-05 Thread mturk

Author: mturk
Date: Sat May  5 11:39:40 2012
New Revision: 1334403

URL: http://svn.apache.org/viewvc?rev=1334403&view=rev
Log:
Style police. No functional change

Modified:
tomcat/jk/trunk/native/common/jk_uri_worker_map.c

Modified: tomcat/jk/trunk/native/common/jk_uri_worker_map.c
URL: 
http://svn.apache.org/viewvc/tomcat/jk/trunk/native/common/jk_uri_worker_map.c?rev=1334403&r1=1334402&r2=1334403&view=diff
==
--- tomcat/jk/trunk/native/common/jk_uri_worker_map.c (original)
+++ tomcat/jk/trunk/native/common/jk_uri_worker_map.c Sat May  5 11:39:40 2012
@@ -394,7 +394,7 @@ static void extract_activation(jk_pool_t
 #else
 for (worker = strtok(worker, ", "); worker; worker = strtok(NULL, ", ")) {
 #endif
-for (i=0; inum_of_workers; i++) {
+for (i = 0; i < lb->num_of_workers; i++) {
 if (!strcmp(worker, lb->lb_workers[i].name)) {
 if (activations[i] != JK_LB_ACTIVATION_UNSET)
 jk_log(l, JK_LOG_WARNING,
@@ -432,7 +432,7 @@ static void extension_fix_fail_on_status
 
 JK_TRACE_ENTER(l);
 
-for (i=0; ifail_on_status_str); i++) {
+for (i = 0; i < (unsigned int)strlen(extensions->fail_on_status_str); i++) 
{
 if (extensions->fail_on_status_str[i] == ',' ||
 extensions->fail_on_status_str[i] == ' ')
 cnt++;



-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org

svn commit: r1334417 - /tomcat/jk/trunk/native/apache-2.0/mod_jk.c

2012-05-05 Thread mturk

Author: mturk
Date: Sat May  5 12:44:05 2012
New Revision: 1334417

URL: http://svn.apache.org/viewvc?rev=1334417&view=rev
Log:
Suppress compiler warings. No functional change

Modified:
tomcat/jk/trunk/native/apache-2.0/mod_jk.c

Modified: tomcat/jk/trunk/native/apache-2.0/mod_jk.c
URL: 
http://svn.apache.org/viewvc/tomcat/jk/trunk/native/apache-2.0/mod_jk.c?rev=1334417&r1=1334416&r2=1334417&view=diff
==
--- tomcat/jk/trunk/native/apache-2.0/mod_jk.c (original)
+++ tomcat/jk/trunk/native/apache-2.0/mod_jk.c Sat May  5 12:44:05 2012
@@ -937,7 +937,7 @@ static int init_ws_service(apache_privat
 break;
 
 case JK_OPT_FWDURIPROXY:
-size = 3 * strlen(r->uri) + 1;
+size = 3 * (int)strlen(r->uri) + 1;
 s->req_uri = apr_palloc(r->pool, size);
 jk_canonenc(r->uri, s->req_uri, size);
 break;
@@ -982,7 +982,7 @@ static int init_ws_service(apache_privat
 }
 
 if (s->ssl_cert) {
-s->ssl_cert_len = strlen(s->ssl_cert);
+s->ssl_cert_len = (unsigned int)strlen(s->ssl_cert);
 if (JK_IS_DEBUG_LEVEL(conf->log)) {
 jk_log(conf->log, JK_LOG_DEBUG,
"SSL client certificate (%d bytes): %s",
@@ -1588,7 +1588,7 @@ static int request_log_transaction(reque
 strs[i] = process_item(r, &items[i]);
 }
 for (i = 0; i < format->nelts; ++i) {
-len += strl[i] = strlen(strs[i]);
+len += strl[i] = (int)strlen(strs[i]);
 }
 str = apr_palloc(r->pool, len + 1);
 for (i = 0, s = str; i < format->nelts; ++i) {
@@ -3645,7 +3645,7 @@ static int jk_translate(request_rec * r)
 char *index = clean_uri;
 char *suffix = strchr(index + 1, '/');
 if (suffix != NULL) {
-int size = suffix - index;
+int size = (int)(suffix - index);
 context_dir = apr_pstrndup(r->pool, index, size);
 /* Get the context child directory name */
 index = index + size + 1;
@@ -3704,7 +3704,7 @@ static int jk_translate(request_rec * r)
 }
 else {
 /* Deny access to war files in web app directory */
-int size = strlen(context_dir);
+int size = (int)strlen(context_dir);
 if (size > 4
 && !strcasecmp(context_dir + (size - 4),
".war")) {



-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org

Re: svn commit: r1334417 - /tomcat/jk/trunk/native/apache-2.0/mod_jk.c

2012-05-05 Thread Guilherme Vanz

Unregister

Re: svn commit: r1334417 - /tomcat/jk/trunk/native/apache-2.0/mod_jk.c

2012-05-05 Thread Mladen Turk


On 05/05/2012 03:39 PM, Guilherme Vanz wrote:

Unregister



Unregister you too :)
Are you just annoying or darn stupid.

Each message you receive from any of the ASF mailing
lists has a clear instructions how to unsubscribe.
Should be much easier then the effort you took while
subscribing at the first place.


Regards
--
^TM

-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org

svn commit: r1334348 - in /tomcat/jk/trunk: native/common/jk_ajp_common.c native/common/jk_lb_worker.c native/common/jk_shm.c native/common/jk_shm.h xdocs/miscellaneous/changelog.xml

svn commit: r1334392 - in /tomcat/jk/trunk/native/common: jk_ajp_common.c jk_shm.c

svn commit: r1334395 - /tomcat/jk/trunk/native/common/jk_ajp_common.c

[GUMP@vmgump]: Project tomcat-tc7.0.x-test (in module tomcat-7.0.x) failed

svn commit: r1334399 - /tomcat/jk/trunk/native/common/jk_ajp_common.c

svn commit: r1334401 - /tomcat/jk/trunk/native/common/jk_ajp_common.c

[GUMP@vmgump]: Project tomcat-trunk-test (in module tomcat-trunk) failed

svn commit: r1334403 - /tomcat/jk/trunk/native/common/jk_uri_worker_map.c

svn commit: r1334417 - /tomcat/jk/trunk/native/apache-2.0/mod_jk.c

Re: svn commit: r1334417 - /tomcat/jk/trunk/native/apache-2.0/mod_jk.c

Re: svn commit: r1334417 - /tomcat/jk/trunk/native/apache-2.0/mod_jk.c

11 matches

Site Navigation

Mail list logo

Footer information