geronimo-scm mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From djen...@apache.org
Subject cvs commit: incubator-geronimo/modules/kernel/src/java/org/apache/geronimo/kernel/deployment AbstractDeploymentPlanner.java
Date Fri, 02 Jan 2004 04:34:39 GMT
djencks     2004/01/01 20:34:39

  Modified:    modules/kernel/src/java/org/apache/geronimo/kernel/deployment
                        AbstractDeploymentPlanner.java
  Log:
  minor cleanup
  
  Revision  Changes    Path
  1.6       +10 -18    incubator-geronimo/modules/kernel/src/java/org/apache/geronimo/kernel/deployment/AbstractDeploymentPlanner.java
  
  Index: AbstractDeploymentPlanner.java
  ===================================================================
  RCS file: /home/cvs/incubator-geronimo/modules/kernel/src/java/org/apache/geronimo/kernel/deployment/AbstractDeploymentPlanner.java,v
  retrieving revision 1.5
  retrieving revision 1.6
  diff -u -r1.5 -r1.6
  --- AbstractDeploymentPlanner.java	14 Dec 2003 16:20:23 -0000	1.5
  +++ AbstractDeploymentPlanner.java	2 Jan 2004 04:34:39 -0000	1.6
  @@ -56,34 +56,30 @@
   
   package org.apache.geronimo.kernel.deployment;
   
  -import java.util.Set;
  +import java.net.URI;
   import java.util.HashSet;
   import java.util.Iterator;
  -import java.net.URI;
  +import java.util.Set;
   
   import javax.management.MBeanServer;
   import javax.management.ObjectName;
   
  -import org.apache.geronimo.kernel.service.GeronimoMBeanInfo;
  -import org.apache.geronimo.kernel.service.GeronimoOperationInfo;
  -import org.apache.geronimo.kernel.service.GeronimoParameterInfo;
  -import org.apache.geronimo.kernel.service.GeronimoMBeanTarget;
  -import org.apache.geronimo.kernel.service.GeronimoMBeanContext;
  -import org.apache.geronimo.kernel.deployment.goal.DeploymentGoal;
   import org.apache.geronimo.kernel.deployment.goal.DeployURL;
  +import org.apache.geronimo.kernel.deployment.goal.DeploymentGoal;
   import org.apache.geronimo.kernel.deployment.goal.RedeployURL;
   import org.apache.geronimo.kernel.deployment.goal.UndeployURL;
   import org.apache.geronimo.kernel.deployment.service.MBeanMetadata;
  -import org.apache.commons.logging.Log;
  -import org.apache.commons.logging.LogFactory;
  +import org.apache.geronimo.kernel.service.GeronimoMBeanContext;
  +import org.apache.geronimo.kernel.service.GeronimoMBeanInfo;
  +import org.apache.geronimo.kernel.service.GeronimoMBeanTarget;
  +import org.apache.geronimo.kernel.service.GeronimoOperationInfo;
  +import org.apache.geronimo.kernel.service.GeronimoParameterInfo;
   
   /**
    * @version $Revision$ $Date$
    */
   public abstract class AbstractDeploymentPlanner implements DeploymentPlanner, GeronimoMBeanTarget
{
   
  -    private static final Log log = LogFactory.getLog(AbstractDeploymentPlanner.class);
  -
       private GeronimoMBeanContext context;
   
       /**
  @@ -94,7 +90,7 @@
           GeronimoMBeanInfo mbeanInfo = new GeronimoMBeanInfo();
           mbeanInfo.setTargetClass(subclassName);
           mbeanInfo.addOperationInfo(new GeronimoOperationInfo("plan",
  -                new GeronimoParameterInfo[] {
  +                new GeronimoParameterInfo[]{
                       new GeronimoParameterInfo("Goals",
                               java.util.Set.class.getName(),
                               "Goals needing deployment"),
  @@ -104,18 +100,14 @@
                   },
                   0,
                   "Plan to deploy as many goals as possible"));
  -
           return mbeanInfo;
       }
   
  -
       public boolean plan(Set goals, Set plans) throws DeploymentException {
  -//        log.info(context.getObjectName().toString() + " Got to plan method with goals
" + goals);
           boolean progress = false;
           Set x = new HashSet(goals);
           for (Iterator i = x.iterator(); i.hasNext();) {
               DeploymentGoal goal = (DeploymentGoal) i.next();
  -//            log.info("Considering goal " + goal + " by planner " + context.getObjectName());
               if (goal instanceof DeployURL) {
                   progress = addURL((DeployURL) goal, goals, plans);
               } else if (goal instanceof RedeployURL) {
  
  
  

Mime
View raw message