cvs commit: jakarta-avalon-apps/sevak/src/java/org/apache/avalon/apps/sevak/blocks/jetty JettySevak.java

[hammant]

hammant     2002/12/01 08:15:19

  Modified:    sevak/src/java/org/apache/avalon/apps/sevak/blocks/jetty
                        JettySevak.java
  Log:
  Jetty/Sevak works but with many jars in primordial clasloader.
  
  Revision  Changes    Path
  1.7       +14 -3     
jakarta-avalon-apps/sevak/src/java/org/apache/avalon/apps/sevak/blocks/jetty/JettySevak.java
  
  Index: JettySevak.java
  ===================================================================
  RCS file: 
/home/cvs/jakarta-avalon-apps/sevak/src/java/org/apache/avalon/apps/sevak/blocks/jetty/JettySevak.java,v
  retrieving revision 1.6
  retrieving revision 1.7
  diff -u -r1.6 -r1.7
  --- JettySevak.java   29 Nov 2002 23:50:10 -0000      1.6
  +++ JettySevak.java   1 Dec 2002 16:15:18 -0000       1.7
  @@ -139,6 +139,7 @@
        */
       public void deploy(String context, File pathToWebAppFolder) throws 
SevakException
       {
  +
           try
           {
               String webAppURL = pathToWebAppFolder.toURL().toString();
  @@ -147,11 +148,13 @@
   
               System.out.println("deploying context=" + context + ", webapp=" 
+ webAppURL + " to host="
                       + m_hostName);
  +            ctx.setExtractWAR(true);
               m_webapps.put(context, ctx);
  +            ctx.start();
           }
  -        catch (IOException ioe)
  +        catch (Exception e)
           {
  -            throw new SevakException("Problem deploying web application in 
Jetty", ioe);
  +            throw new SevakException("Problem deploying web application in 
Jetty", e);
           }
       }
   
  @@ -163,7 +166,15 @@
       public void undeploy(String context) throws SevakException
       {
           WebApplicationContext ctx = (WebApplicationContext) 
m_webapps.get(context);
  -             m_server.removeContext(ctx);
  +        try
  +        {
  +            ctx.stop();
  +        }
  +        catch (InterruptedException e)
  +        {
  +            throw new SevakException("Problem stopping web application in 
Jetty", e);
  +        }
  +        m_server.removeContext(ctx);
           ctx.destroy();
           m_webapps.remove(context);
       }
  
  
  

--
To unsubscribe, e-mail:   <mailto:[EMAIL PROTECTED]>
For additional commands, e-mail: <mailto:[EMAIL PROTECTED]>