juju: remove dependency on api/params

state/apiserver/apiserver.go

 package apiserver
 
 import (
         "code.google.com/p/go.net/websocket"
         "fmt"
         "launchpad.net/juju-core/charm"
         "launchpad.net/juju-core/juju"
         "launchpad.net/juju-core/log"
         "launchpad.net/juju-core/state"
         "launchpad.net/juju-core/state/api"
@@ skipping 267 matching lines @@
                 Deltas: deltas,
         }, err
 }
 
 func (aw srvClientAllWatcher) Stop() error {
         return aw.w.(*multiwatcher.Watcher).Stop()
 }
 
 // ServiceSet implements the server side of Client.ServerSet.
 func (c *srvClient) ServiceSet(p params.ServiceSet) error {
-        return juju.ServiceSet(c.root.srv.state, p)
+        svc, err := c.root.srv.state.Service(p.ServiceName)
+        if err != nil {
+                return err
+        }
+        return svc.Set(p.Options)
 }
 
 // ServiceSetYAML implements the server side of Client.ServerSetYAML.
 func (c *srvClient) ServiceSetYAML(p params.ServiceSetYAML) error {
-        return juju.ServiceSetYAML(c.root.srv.state, p)
+        svc, err := c.root.srv.state.Service(p.ServiceName)
+        if err != nil {
+                return err
+        }
+        return svc.SetYAML([]byte(p.Config))
 }
 
 // ServiceGet returns the configuration for a service.
 func (c *srvClient) ServiceGet(args params.ServiceGet) (params.ServiceGetResults, error) {
         return statecmd.ServiceGet(c.root.srv.state, args)
 }
 
 // Resolved implements the server side of Client.Resolved.
 func (c *srvClient) Resolved(p params.Resolved) error {
-        return statecmd.Resolved(c.root.srv.state, p)
+        unit, err := c.root.srv.state.Unit(p.UnitName)
+        if err != nil {
+                return err
+        }
+        return unit.Resolve(p.Retry)
 }
 
 // ServiceExpose changes the juju-managed firewall to expose any ports that
 // were also explicitly marked by units as open.
 func (c *srvClient) ServiceExpose(args params.ServiceExpose) error {
         return statecmd.ServiceExpose(c.root.srv.state, args)
 }
 
 // ServiceUnexpose changes the juju-managed firewall to unexpose any ports that
 // were also explicitly marked by units as open.
@@ skipping 342 matching lines @@
 func (ws *watchers) stopAll() {
         ws.mu.Lock()
         defer ws.mu.Unlock()
         for _, w := range ws.ws {
                 if err := w.w.Stop(); err != nil {
                         log.Errorf("state/api: error stopping %T watcher: %v", w, err)
                 }
         }
         ws.ws = make(map[string]*srvWatcher)
 }