[jBoss-Dev] CVS update: contrib/jetty/src/main/org/jboss/jettyJettyService.java JettyServiceMBean.java

[jBoss CVS Development]

  User: jules   
  Date: 00/12/16 07:29:59

  Modified:    jetty/src/main/org/jboss/jetty JettyService.java
                        JettyServiceMBean.java
  Log:
  Update README
  Publish extractWars? interface to allow forced unpacking of WARs when deployed by 
Jetty (This apparently makes JSP users happy!)
  
  Revision  Changes    Path
  1.7       +21 -3     contrib/jetty/src/main/org/jboss/jetty/JettyService.java
  
  Index: JettyService.java
  ===================================================================
  RCS file: 
/products/cvs/ejboss/contrib/jetty/src/main/org/jboss/jetty/JettyService.java,v
  retrieving revision 1.6
  retrieving revision 1.7
  diff -u -r1.6 -r1.7
  --- JettyService.java 2000/12/12 22:02:21     1.6
  +++ JettyService.java 2000/12/16 15:29:59     1.7
  @@ -31,7 +31,7 @@
    *      
    *   @see <related>
    *   @author <a href="mailto:[EMAIL PROTECTED]">Julian Gosnell</a>
  - *   @version $Revision: 1.6 $
  + *   @version $Revision: 1.7 $
    */
   public class JettyService extends ServiceMBeanSupport
     implements JettyServiceMBean, MBeanRegistration
  @@ -68,6 +68,7 @@
     String       _home       = null;
     Vector       _configs    = new Vector();
     Hashtable    _deployed   = new Hashtable();
  +  boolean      _unpackWars = false;
   
     protected void
       ensureService()
  @@ -209,7 +210,7 @@
       throws DeploymentException
     {
       Log.setLog(log);
  -    Logger.log("Deploying: context="+path+" webapp="+warUrl);
  +    Logger.log("Deploying: context="+path+" webapp="+warUrl+" 
unpackWars="+_unpackWars);
       
       try
       {
  @@ -223,7 +224,8 @@
         
         WebApplicationContext app = _server.addWebApplication(contextPath,
                                                            warDir,
  -                                                         defaultResource);
  +                                                         defaultResource,
  +                                                         _unpackWars);
         
         // Use the same ClassLoader as JBoss - this allows optimisation
         // of calls to EJBs...
  @@ -320,5 +322,21 @@
       _configs.addElement(configUrl);
       Logger.log("Added successfully");
       Log.unsetLog();
  +  }
  +
  +  public void
  +    setUnpackWars(boolean unpackWars)
  +  {
  +    Log.setLog(_log);
  +    Logger.log("Setting unpackWars="+unpackWars);
  +    _unpackWars=unpackWars;
  +    Logger.log("Set successfully");
  +    Log.unsetLog();
  +  }
  +
  +  public boolean
  +    getUnpackWars()
  +  {
  +    return _unpackWars;
     }
   }
  
  
  
  1.3       +4 -1      contrib/jetty/src/main/org/jboss/jetty/JettyServiceMBean.java
  
  Index: JettyServiceMBean.java
  ===================================================================
  RCS file: 
/products/cvs/ejboss/contrib/jetty/src/main/org/jboss/jetty/JettyServiceMBean.java,v
  retrieving revision 1.2
  retrieving revision 1.3
  diff -u -r1.2 -r1.3
  --- JettyServiceMBean.java    2000/12/11 20:01:48     1.2
  +++ JettyServiceMBean.java    2000/12/16 15:29:59     1.3
  @@ -16,7 +16,7 @@
    *      
    *   @see <related>
    *   @author <a href="mailto:[EMAIL PROTECTED]">Sebastien Alborini</a>
  - *   @version $Revision: 1.2 $
  + *   @version $Revision: 1.3 $
    */
   public interface JettyServiceMBean
     extends org.jboss.util.ServiceMBean
  @@ -33,4 +33,7 @@
     public boolean isDeployed(String warUrl);
   
     public void setConfiguration(String configUrl);
  +
  +  public boolean getUnpackWars();
  +  public void setUnpackWars(boolean unpackWars);
   }