Add a composed base class for commands.

cmd/jujud/machine.go

 package main
 
 import (
         "fmt"
         "launchpad.net/gnuflag"
         "launchpad.net/juju-core/cmd"
         "launchpad.net/juju-core/environs/agent"
         _ "launchpad.net/juju-core/environs/ec2"
+        _ "launchpad.net/juju-core/environs/openstack"
         "launchpad.net/juju-core/log"
         "launchpad.net/juju-core/state"
-        "launchpad.net/juju-core/state/api"
+        "launchpad.net/juju-core/state/apiserver"
         "launchpad.net/juju-core/worker"
         "launchpad.net/juju-core/worker/firewaller"
         "launchpad.net/juju-core/worker/provisioner"
         "launchpad.net/tomb"
         "time"
 )
 
 var retryDelay = 3 * time.Second
 
 // MachineAgent is a cmd.Command responsible for running a machine agent.
@@ skipping 145 matching lines @@
         // If the configuration does not have the required information,
         // it is currently not a recoverable error, so we kill the whole
         // agent, potentially enabling human intervention to fix
         // the agent's configuration file. In the future, we may retrieve
         // the state server certificate and key from the state, and
         // this should then change.
         if len(conf.StateServerCert) == 0 || len(conf.StateServerKey) == 0 {
                 return &fatalError{"configuration does not have state server cert/key"}
         }
         log.Printf("cmd/jujud: running API server job")
-        srv, err := api.NewServer(st, fmt.Sprintf(":%d", conf.APIPort), conf.StateServerCert, conf.StateServerKey)
+        srv, err := apiserver.NewServer(st, fmt.Sprintf(":%d", conf.APIPort), conf.StateServerCert, conf.StateServerKey)
         if err != nil {
                 return err
         }
         select {
         case <-a.tomb.Dying():
         case <-srv.Dead():
                 log.Printf("jujud: API server has died: %v", srv.Stop())
         }
         return srv.Stop()
 }