User: d_jencks
  Date: 01/12/19 17:22:49

  Modified:    src/main/org/jboss/deployment ServiceDeployer.java
                        ServiceDeploymentInfo.java
  Log:
  Made undeploy work a little better
  
  Revision  Changes    Path
  1.19      +25 -6     jboss/src/main/org/jboss/deployment/ServiceDeployer.java
  
  Index: ServiceDeployer.java
  ===================================================================
  RCS file: /cvsroot/jboss/jboss/src/main/org/jboss/deployment/ServiceDeployer.java,v
  retrieving revision 1.18
  retrieving revision 1.19
  diff -u -r1.18 -r1.19
  --- ServiceDeployer.java      2001/12/19 03:36:11     1.18
  +++ ServiceDeployer.java      2001/12/20 01:22:49     1.19
  @@ -49,7 +49,7 @@
   * @author <a href="mailto:[EMAIL PROTECTED]";>Marc Fleury</a>
   * @author <a href="mailto:[EMAIL PROTECTED]";>David Maplesden</a>
   * @author <a href="mailto:[EMAIL PROTECTED]";>David Jencks</a>
  -* @version   $Revision: 1.18 $ <p>
  +* @version   $Revision: 1.19 $ <p>
   *
   *      <b>20010830 marc fleury:</b>
   *      <ul>initial import
  @@ -289,8 +289,8 @@
               if(url.toString().endsWith("/"))  
               {
                  sdi.addClassUrl(url);
  -               sdi.createClassLoader();
  -               sdi.state = ServiceDeploymentInfo.CLASSESLOADED;
  +               sdi.createClassLoader();//sets state also.
  +               //sdi.state = ServiceDeploymentInfo.CLASSESLOADED;
               }
               else // That "service" is a file
               {
  @@ -334,7 +334,7 @@
                        } // end of for ()
                        throw new DeploymentException("No META-INF/jboss-service.xml 
found in alleged sar!");
                     }
  -                  sdi.state = ServiceDeploymentInfo.CLASSESLOADED;
  +                  //sdi.state = ServiceDeploymentInfo.CLASSESLOADED;
                     log.debug("got document jboss-service.xml from cl");
                  }
                  
  @@ -343,7 +343,7 @@
                     || localFile.getName().endsWith(".zip"))
                  {
                     sdi.createClassLoader();
  -                  sdi.state = ServiceDeploymentInfo.CLASSESLOADED;
  +                  //sdi.state = ServiceDeploymentInfo.CLASSESLOADED;
                  }
                  //Not for us.
                  else
  @@ -592,6 +592,7 @@
         // FIXME track the dependencies in the service libraries
         ServiceLibraries.getLibraries().removeClassLoader(sdi.removeClassLoader());
         
  +      //set the state - we've removed the Cl
         //delete the copied directories if possible.
         sdi.cleanup(getLog());
         
  @@ -691,8 +692,26 @@
         {
            ObjectName name = (ObjectName)i.previous();
            log.debug("undeploying mbean " + name);
  +         invoke(getServiceControllerName(),
  +            "stop",
  +            new Object[] {name},
  +            new String[] {"javax.management.ObjectName"});
  +      }
  +      for (ListIterator i = services.listIterator(lastService); i.hasPrevious();)
  +      {
  +         ObjectName name = (ObjectName)i.previous();
  +         log.debug("undeploying mbean " + name);
  +         invoke(getServiceControllerName(),
  +            "destroy",
  +            new Object[] {name},
  +            new String[] {"javax.management.ObjectName"});
  +      }
  +      for (ListIterator i = services.listIterator(lastService); i.hasPrevious();)
  +      {
  +         ObjectName name = (ObjectName)i.previous();
  +         log.debug("undeploying mbean " + name);
            invoke(getServiceControllerName(),
  -            "undeploy",
  +            "remove",
               new Object[] {name},
               new String[] {"javax.management.ObjectName"});
            //we don't supply it any more, maybe someone else will later.
  
  
  
  1.3       +16 -1     jboss/src/main/org/jboss/deployment/ServiceDeploymentInfo.java
  
  Index: ServiceDeploymentInfo.java
  ===================================================================
  RCS file: 
/cvsroot/jboss/jboss/src/main/org/jboss/deployment/ServiceDeploymentInfo.java,v
  retrieving revision 1.2
  retrieving revision 1.3
  diff -u -r1.2 -r1.3
  --- ServiceDeploymentInfo.java        2001/12/19 06:58:43     1.2
  +++ ServiceDeploymentInfo.java        2001/12/20 01:22:49     1.3
  @@ -28,7 +28,7 @@
   * @author <a href="mailto:[EMAIL PROTECTED]";>Marc Fleury</a>
   * @author <a href="mailto:[EMAIL PROTECTED]";>David Maplesden</a>
   * @author <a href="mailto:[EMAIL PROTECTED]";>David Jencks</a>
  -* @version   $Revision: 1.2 $ <p>
  +* @version   $Revision: 1.3 $ <p>
   *
   *      <b>20011211 marc fleury:</b>
   *      <ul>
  @@ -109,17 +109,32 @@
      
      
      
  +   /**
  +    * The <code>createClassLoader</code> method creates a classloader for the urls 
in the 
  +    * package this sdi represents and sets the state to CLASSESLOADED.
  +    *
  +    * @return an <code>URLClassLoader</code> value
  +    */
      public URLClassLoader createClassLoader()
      {
         URL[] urlArray = (URL[])classUrls.toArray(new URL[classUrls.size()]);
         cl = new URLClassLoader(urlArray, key);
  +      state = CLASSESLOADED;
         return cl;
      }
      
  +   
  +   /**
  +    * The <code>removeClassLoader</code> method removes the local classloader and 
  +    * sets the state to EMPTY.
  +    *
  +    * @return an <code>URLClassLoader</code> value
  +    */
      public URLClassLoader removeClassLoader()
      {
         URLClassLoader localcl = cl;
         cl = null;
  +      state = EMPTY;
         return localcl;
      }
      
  
  
  

_______________________________________________
Jboss-development mailing list
[EMAIL PROTECTED]
https://lists.sourceforge.net/lists/listinfo/jboss-development

Reply via email to