← Back to branch summary

~themue/juju-core/053-env-more-script-friendly

« back to all changes in this revision

Viewing changes to environs/dummy/environs.go

Sequestering server.

Show diffs side-by-side

added added

removed removed

Lines of Context:
environs/dummy/environs.go
28
28
        "launchpad.net/juju-core/schema"
29
29
        "launchpad.net/juju-core/state"
30
30
        "launchpad.net/juju-core/state/api"
 
31
        "launchpad.net/juju-core/state/api/server"
31
32
        "launchpad.net/juju-core/testing"
32
33
        "launchpad.net/juju-core/trivial"
33
34
        "launchpad.net/juju-core/version"
119
120
        storage       *storage
120
121
        publicStorage *storage
121
122
        httpListener  net.Listener
122
 
        apiServer     *api.Server
 
123
        apiServer     *server.Server
123
124
        apiState      *state.State
124
125
}
125
126
 
475
476
                if err != nil {
476
477
                        panic(err)
477
478
                }
478
 
                e.state.apiServer, err = api.NewServer(st, "localhost:0", []byte(testing.ServerCert), []byte(testing.ServerKey))
 
479
                e.state.apiServer, err = server.NewServer(st, "localhost:0", []byte(testing.ServerCert), []byte(testing.ServerKey))
479
480
                if err != nil {
480
481
                        panic(err)
481
482
                }