Return-Path: Delivered-To: apmail-jakarta-jetspeed-dev-archive@www.apache.org Received: (qmail 23306 invoked from network); 9 Jul 2004 18:29:24 -0000 Received: from hermes.apache.org (HELO mail.apache.org) (209.237.227.199) by minotaur-2.apache.org with SMTP; 9 Jul 2004 18:29:24 -0000 Received: (qmail 41723 invoked by uid 500); 9 Jul 2004 18:29:22 -0000 Delivered-To: apmail-jakarta-jetspeed-dev-archive@jakarta.apache.org Received: (qmail 41673 invoked by uid 500); 9 Jul 2004 18:29:22 -0000 Mailing-List: contact jetspeed-dev-help@jakarta.apache.org; run by ezmlm Precedence: bulk List-Unsubscribe: List-Subscribe: List-Help: List-Post: List-Id: "Jetspeed Developers List" Reply-To: "Jetspeed Developers List" Delivered-To: mailing list jetspeed-dev@jakarta.apache.org Received: (qmail 41654 invoked by uid 500); 9 Jul 2004 18:29:22 -0000 Received: (qmail 41645 invoked by uid 500); 9 Jul 2004 18:29:22 -0000 Received: (qmail 41632 invoked by uid 99); 9 Jul 2004 18:29:22 -0000 X-ASF-Spam-Status: No, hits=0.5 required=10.0 tests=ALL_TRUSTED,NO_REAL_NAME X-Spam-Check-By: apache.org Received: from [209.237.227.194] (HELO minotaur.apache.org) (209.237.227.194) by apache.org (qpsmtpd/0.27.1) with SMTP; Fri, 09 Jul 2004 11:29:21 -0700 Received: (qmail 23252 invoked by uid 1642); 9 Jul 2004 18:29:20 -0000 Date: 9 Jul 2004 18:29:20 -0000 Message-ID: <20040709182920.23251.qmail@minotaur.apache.org> From: weaver@apache.org To: jakarta-jetspeed-2-cvs@apache.org Subject: cvs commit: jakarta-jetspeed-2/portal/src/java/org/apache/jetspeed/tools/pamanager/servletcontainer TomcatManager.java X-Virus-Checked: Checked X-Spam-Rating: minotaur-2.apache.org 1.6.2 0/1000/N weaver 2004/07/09 11:29:20 Modified: portal/src/java/org/apache/jetspeed/tools/pamanager/servletcontainer TomcatManager.java Log: Modified the way reload works Revision Changes Path 1.6 +15 -6 jakarta-jetspeed-2/portal/src/java/org/apache/jetspeed/tools/pamanager/servletcontainer/TomcatManager.java Index: TomcatManager.java =================================================================== RCS file: /home/cvs/jakarta-jetspeed-2/portal/src/java/org/apache/jetspeed/tools/pamanager/servletcontainer/TomcatManager.java,v retrieving revision 1.5 retrieving revision 1.6 diff -u -r1.5 -r1.6 --- TomcatManager.java 2 Jul 2004 14:36:33 -0000 1.5 +++ TomcatManager.java 9 Jul 2004 18:29:20 -0000 1.6 @@ -153,14 +153,23 @@ { try { - reload.setQueryString(buildPathQueryArgs(appPath)); - client.executeMethod(reload); - return reload.getResponseBodyAsString(); + // reload.setQueryString(buildPathQueryArgs(appPath)); + // This is the only way to get changes made to web.xml to + // be picked up, reload DOES NOT reload the web.xml + stop(appPath); + Thread.sleep(1500); + return start(appPath); + } + catch (InterruptedException e) + { + return "FAIL - "+e.toString(); } finally { - reload.recycle(); - reload.setPath(reloadPath); + stop.recycle(); + stop.setPath(reloadPath); + start.recycle(); + start.setPath(reloadPath); } } --------------------------------------------------------------------- To unsubscribe, e-mail: jetspeed-dev-unsubscribe@jakarta.apache.org For additional commands, e-mail: jetspeed-dev-help@jakarta.apache.org