portals-jetspeed-dev mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From wea...@apache.org
Subject cvs commit: jakarta-jetspeed-2/portal/src/java/org/apache/jetspeed/tools/pamanager/servletcontainer TomcatManager.java
Date Fri, 09 Jul 2004 18:29:20 GMT
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


Mime
View raw message