Adapt imports, metadata, and tests for the github move

hatched · Jun 3, 2014 · 445a79b · 445a79b
1 parent 00e66cc
commit 445a79b
Show file tree

Hide file tree

Showing 967 changed files with 4,124 additions and 4,314 deletions.
diff --git a/.bzrignore → .gitignore b/.bzrignore → .gitignore
@@ -8,3 +8,4 @@ cmd/charmload/charmload
 .emacs.desktop
 .emacs.desktop.lock
 *.test
+*.sw[nop]
diff --git a/.lbox b/.lbox
diff --git a/CONTRIBUTING b/CONTRIBUTING
@@ -47,7 +47,7 @@ All changes to `juju-core` must be performed on a branch, that branch reviewed,
 then submitted. An overview of the commands used to do so follows. These
 examples use the `bzr` command, which is assumed to be aliased to `cobzr`, as
 described above. It is also assumed that your working directory is
-$GOPATH/src/launchpad.net/juju-core.
+$GOPATH/src/github.com/juju/juju.
 
 First, create a branch for your change using the following command
 
@@ -84,8 +84,8 @@ group is alphabetically sorted. eg:
         gc "launchpad.net/gocheck"
         "github.com/juju/loggo"
 
-        "launchpad.net/juju-core/state"
-        "launchpad.net/juju-core/worker"
+        "github.com/juju/juju/state"
+        "github.com/juju/juju/worker"
     )
 
 Because "launchpad.net/gocheck" will be referenced frequently in test suites,
@@ -100,7 +100,7 @@ at http://go.pkgdoc.org/pkg/launchpad.net/gocheck. `gocheck` is integrated
 into the source of each package so the standard `go test` command is used
 to run `gocheck` tests. For example
 
-    go test launchpad.net/juju-core/...
+    go test github.com/juju/juju/...
 
 will run all the tests in the `juju-core` project. By default `gocheck` prints
 only minimal output, and as `gocheck` is hooked into the testing framework via
@@ -127,10 +127,10 @@ to match a subset of test names.
 Finally, because by default `go test` runs the tests in the current package, and
 is not recursive, the following commands are equal, and will produce no output.
 
-    cd $GOPATH/src/launchpad.net/juju-core
+    cd $GOPATH/src/github.com/juju/juju
     go test
 
-    go test launchpad.net/juju-core
+    go test github.com/juju/juju
 
 MongoDB
 -------
@@ -143,7 +143,7 @@ that supports Javascript for map-reduce functions. These functions are not
 supported by juju-mongodb and the associated tests will fail unless disabled
 with an environment variable:
 
-    JUJU_NOTEST_MONGOJS=1 go test launchpad.net/juju-core/...
+    JUJU_NOTEST_MONGOJS=1 go test github.com/juju/juju/...
 
 Proposing
 =========
@@ -222,7 +222,7 @@ lbox hooks
 
 Before proposing, `lbox` runs a number of hooks to improve code quality and
 ensure that code is properly formatted. These checks are in
-`$GOPATH/src/launchpad.net/juju-core/.lbox.check`. They are run automatically
+`$GOPATH/src/github.com/juju/juju/.lbox.check`. They are run automatically
 by `lbox` before proposing or submitting. If these hooks fail you will have
 to resolve those errors before trying again. For example
 
@@ -247,6 +247,6 @@ installation with all freshly downloaded directories.
 The bash commands used to generate it from scratch are as follows:
 
     % export GOPATH=/tmp/juju-build
-    % go get launchpad.net/juju-core/...
-    % go test launchpad.net/juju-core/...
-    % godeps -t $(go list launchpad.net/juju-core/...) > dependencies.tsv
+    % go get github.com/juju/juju/...
+    % go test github.com/juju/juju/...
+    % godeps -t $(go list github.com/juju/juju/...) > dependencies.tsv
diff --git a/Makefile b/Makefile
@@ -6,7 +6,7 @@ ifndef GOPATH
 $(warning You need to set up a GOPATH.  See the README file.)
 endif
 
-PROJECT := launchpad.net/juju-core
+PROJECT := github.com/juju/juju
 PROJECT_DIR := $(shell go list -e -f '{{.Dir}}' $(PROJECT))
 
 ifeq ($(shell uname -p | sed -r 's/.*(x86|armel|armhf).*/golang/'), golang)

diff --git a/README b/README
@@ -64,7 +64,7 @@ Getting juju-core
 
 The easiest way to get the source for `juju-core` is to use the `go get` command.
 
-    go get -v launchpad.net/juju-core/...
+    go get -v github.com/juju/juju/...
 
 This command will checkout the source of `juju-core` and inspect it for any unmet
 Go package dependencies, downloading those as well. `go get` will also build and
@@ -74,16 +74,16 @@ install `juju-core` and its dependencies. To checkout without installing, use th
     go help get
 
 At this point you will have the bzr working copy of the `juju-core` source at
-`$GOPATH/launchpad.net/juju-core`. The source for any dependent packages will
+`$GOPATH/github.com/juju/juju`. The source for any dependent packages will
 also be available inside `$GOPATH`. You can use `bzr pull`, or the less convenient
-`go get -u launchpad.net/juju-core/...` to update the source from time to time.
+`go get -u github.com/juju/juju/...` to update the source from time to time.
 If you want to know more about contributing to `juju-core`, please read the
 `CONTRIBUTING` companion to this file.
 
 Building juju-core
 ==================
 
-    go install -v launchpad.net/juju-core/...
+    go install -v github.com/juju/juju/...
 
 Will build juju and install the binary commands into `$GOPATH/bin`. It is likely
 if you have just completed the previous step to get the `juju-core` source, the

diff --git a/agent/agent.go b/agent/agent.go
@@ -18,12 +18,12 @@ import (
 	"github.com/juju/errors"
 	"github.com/juju/loggo"
 
-	"launchpad.net/juju-core/instance"
-	"launchpad.net/juju-core/state"
-	"launchpad.net/juju-core/state/api"
-	"launchpad.net/juju-core/state/api/params"
-	"launchpad.net/juju-core/utils"
-	"launchpad.net/juju-core/version"
+	"github.com/juju/juju/instance"
+	"github.com/juju/juju/state"
+	"github.com/juju/juju/state/api"
+	"github.com/juju/juju/state/api/params"
+	"github.com/juju/juju/utils"
+	"github.com/juju/juju/version"
 )
 
 var logger = loggo.GetLogger("juju.agent")

diff --git a/agent/agent_test.go b/agent/agent_test.go
@@ -10,13 +10,13 @@ import (
 	jc "github.com/juju/testing/checkers"
 	gc "launchpad.net/gocheck"
 
-	"launchpad.net/juju-core/agent"
-	"launchpad.net/juju-core/instance"
-	"launchpad.net/juju-core/state"
-	"launchpad.net/juju-core/state/api"
-	"launchpad.net/juju-core/state/api/params"
-	"launchpad.net/juju-core/testing"
-	"launchpad.net/juju-core/version"
+	"github.com/juju/juju/agent"
+	"github.com/juju/juju/instance"
+	"github.com/juju/juju/state"
+	"github.com/juju/juju/state/api"
+	"github.com/juju/juju/state/api/params"
+	"github.com/juju/juju/testing"
+	"github.com/juju/juju/version"
 )
 
 type suite struct {

diff --git a/agent/bootstrap.go b/agent/bootstrap.go
@@ -6,14 +6,14 @@ package agent
 import (
 	"fmt"
 
-	"launchpad.net/juju-core/constraints"
-	"launchpad.net/juju-core/environs/config"
-	"launchpad.net/juju-core/instance"
-	"launchpad.net/juju-core/names"
-	"launchpad.net/juju-core/state"
-	"launchpad.net/juju-core/state/api/params"
-	"launchpad.net/juju-core/utils"
-	"launchpad.net/juju-core/version"
+	"github.com/juju/juju/constraints"
+	"github.com/juju/juju/environs/config"
+	"github.com/juju/juju/instance"
+	"github.com/juju/juju/names"
+	"github.com/juju/juju/state"
+	"github.com/juju/juju/state/api/params"
+	"github.com/juju/juju/utils"
+	"github.com/juju/juju/version"
 )
 
 // InitializeState should be called on the bootstrap machine's agent

diff --git a/agent/bootstrap_test.go b/agent/bootstrap_test.go
@@ -7,17 +7,17 @@ import (
 	jc "github.com/juju/testing/checkers"
 	gc "launchpad.net/gocheck"
 
-	"launchpad.net/juju-core/agent"
-	"launchpad.net/juju-core/constraints"
-	"launchpad.net/juju-core/environs"
-	"launchpad.net/juju-core/environs/config"
-	"launchpad.net/juju-core/instance"
-	"launchpad.net/juju-core/provider/dummy"
-	"launchpad.net/juju-core/state"
-	"launchpad.net/juju-core/state/api/params"
-	"launchpad.net/juju-core/testing"
-	"launchpad.net/juju-core/utils"
-	"launchpad.net/juju-core/version"
+	"github.com/juju/juju/agent"
+	"github.com/juju/juju/constraints"
+	"github.com/juju/juju/environs"
+	"github.com/juju/juju/environs/config"
+	"github.com/juju/juju/instance"
+	"github.com/juju/juju/provider/dummy"
+	"github.com/juju/juju/state"
+	"github.com/juju/juju/state/api/params"
+	"github.com/juju/juju/testing"
+	"github.com/juju/juju/utils"
+	"github.com/juju/juju/version"
 )
 
 type bootstrapSuite struct {

diff --git a/agent/export_test.go b/agent/export_test.go
@@ -7,7 +7,7 @@ import (
 	"fmt"
 	"os"
 
-	"launchpad.net/juju-core/state/api/params"
+	"github.com/juju/juju/state/api/params"
 )
 
 func Password(config Config) string {

diff --git a/agent/format-1.16.go b/agent/format-1.16.go
@@ -11,8 +11,8 @@ import (
 
 	"launchpad.net/goyaml"
 
-	"launchpad.net/juju-core/state/api/params"
-	"launchpad.net/juju-core/version"
+	"github.com/juju/juju/state/api/params"
+	"github.com/juju/juju/version"
 )
 
 var format_1_16 = formatter_1_16{}

diff --git a/agent/format-1.16_whitebox_test.go b/agent/format-1.16_whitebox_test.go
@@ -14,9 +14,9 @@ import (
 	jc "github.com/juju/testing/checkers"
 	gc "launchpad.net/gocheck"
 
-	"launchpad.net/juju-core/testing"
-	"launchpad.net/juju-core/utils"
-	"launchpad.net/juju-core/version"
+	"github.com/juju/juju/testing"
+	"github.com/juju/juju/utils"
+	"github.com/juju/juju/version"
 )
 
 type format_1_16Suite struct {

diff --git a/agent/format-1.18.go b/agent/format-1.18.go
@@ -10,8 +10,8 @@ import (
 
 	"launchpad.net/goyaml"
 
-	"launchpad.net/juju-core/state/api/params"
-	"launchpad.net/juju-core/version"
+	"github.com/juju/juju/state/api/params"
+	"github.com/juju/juju/version"
 )
 
 var format_1_18 = formatter_1_18{}

diff --git a/agent/format-1.18_whitebox_test.go b/agent/format-1.18_whitebox_test.go
@@ -13,10 +13,10 @@ import (
 	jc "github.com/juju/testing/checkers"
 	gc "launchpad.net/gocheck"
 
-	"launchpad.net/juju-core/state/api/params"
-	"launchpad.net/juju-core/testing"
-	"launchpad.net/juju-core/utils"
-	"launchpad.net/juju-core/version"
+	"github.com/juju/juju/state/api/params"
+	"github.com/juju/juju/testing"
+	"github.com/juju/juju/utils"
+	"github.com/juju/juju/version"
 )
 
 type format_1_18Suite struct {

diff --git a/agent/format.go b/agent/format.go
@@ -8,7 +8,7 @@ import (
 	"fmt"
 	"strings"
 
-	"launchpad.net/juju-core/utils"
+	"github.com/juju/juju/utils"
 )
 
 // Current agent config format is defined as follows:

diff --git a/agent/format_whitebox_test.go b/agent/format_whitebox_test.go
@@ -10,9 +10,9 @@ import (
 	jc "github.com/juju/testing/checkers"
 	gc "launchpad.net/gocheck"
 
-	"launchpad.net/juju-core/state/api/params"
-	"launchpad.net/juju-core/testing"
-	"launchpad.net/juju-core/version"
+	"github.com/juju/juju/state/api/params"
+	"github.com/juju/juju/testing"
+	"github.com/juju/juju/version"
 )
 
 type formatSuite struct {

diff --git a/agent/identity.go b/agent/identity.go
@@ -7,7 +7,7 @@ import (
 	"fmt"
 	"os"
 
-	"launchpad.net/juju-core/utils"
+	"github.com/juju/juju/utils"
 )
 
 func WriteSystemIdentityFile(c Config) error {

diff --git a/agent/identity_test.go b/agent/identity_test.go
@@ -9,9 +9,9 @@ import (
 
 	gc "launchpad.net/gocheck"
 
-	"launchpad.net/juju-core/state/api/params"
-	"launchpad.net/juju-core/testing"
-	"launchpad.net/juju-core/version"
+	"github.com/juju/juju/state/api/params"
+	"github.com/juju/juju/testing"
+	"github.com/juju/juju/version"
 )
 
 type identitySuite struct {

diff --git a/agent/mongo/mongo.go b/agent/mongo/mongo.go
@@ -17,13 +17,13 @@ import (
 	"github.com/juju/loggo"
 	"labix.org/v2/mgo"
 
-	"launchpad.net/juju-core/instance"
-	"launchpad.net/juju-core/replicaset"
-	"launchpad.net/juju-core/state/api/params"
-	"launchpad.net/juju-core/upstart"
-	"launchpad.net/juju-core/utils"
-	"launchpad.net/juju-core/utils/apt"
-	"launchpad.net/juju-core/version"
+	"github.com/juju/juju/instance"
+	"github.com/juju/juju/replicaset"
+	"github.com/juju/juju/state/api/params"
+	"github.com/juju/juju/upstart"
+	"github.com/juju/juju/utils"
+	"github.com/juju/juju/utils/apt"
+	"github.com/juju/juju/version"
 )
 
 const (

diff --git a/agent/mongo/mongo_test.go b/agent/mongo/mongo_test.go
@@ -18,13 +18,13 @@ import (
 	jc "github.com/juju/testing/checkers"
 	gc "launchpad.net/gocheck"
 
-	"launchpad.net/juju-core/agent/mongo"
-	"launchpad.net/juju-core/instance"
-	"launchpad.net/juju-core/state/api/params"
-	coretesting "launchpad.net/juju-core/testing"
-	"launchpad.net/juju-core/upstart"
-	"launchpad.net/juju-core/utils"
-	"launchpad.net/juju-core/version"
+	"github.com/juju/juju/agent/mongo"
+	"github.com/juju/juju/instance"
+	"github.com/juju/juju/state/api/params"
+	coretesting "github.com/juju/juju/testing"
+	"github.com/juju/juju/upstart"
+	"github.com/juju/juju/utils"
+	"github.com/juju/juju/version"
 )
 
 func Test(t *stdtesting.T) { gc.TestingT(t) }

diff --git a/agent/mongo/upgrade.go b/agent/mongo/upgrade.go
@@ -12,7 +12,7 @@ import (
 
 	"labix.org/v2/mgo"
 
-	"launchpad.net/juju-core/upstart"
+	"github.com/juju/juju/upstart"
 )
 
 const mongoSocketTimeout = 10 * time.Second

diff --git a/agent/mongo/upgrade_test.go b/agent/mongo/upgrade_test.go
@@ -14,9 +14,9 @@ import (
 	"labix.org/v2/mgo"
 	gc "launchpad.net/gocheck"
 
-	"launchpad.net/juju-core/agent/mongo"
-	coretesting "launchpad.net/juju-core/testing"
-	"launchpad.net/juju-core/upstart"
+	"github.com/juju/juju/agent/mongo"
+	coretesting "github.com/juju/juju/testing"
+	"github.com/juju/juju/upstart"
 )
 
 type EnsureAdminSuite struct {

diff --git a/agent/package_test.go b/agent/package_test.go
@@ -6,7 +6,7 @@ package agent_test
 import (
 	stdtesting "testing"
 
-	"launchpad.net/juju-core/testing"
+	"github.com/juju/juju/testing"
 )
 
 func Test(t *stdtesting.T) {

diff --git a/agent/tools/diskmanager.go b/agent/tools/diskmanager.go
@@ -6,8 +6,8 @@ package tools
 import (
 	"io"
 
-	"launchpad.net/juju-core/tools"
-	"launchpad.net/juju-core/version"
+	"github.com/juju/juju/tools"
+	"github.com/juju/juju/version"
 )
 
 // DiskManager keeps track of a collections of Juju agent tools in a directory
-Original file line number
+Diff line change
@@ Expand Up / @@ -7,7 +7,7 @@ import ( @@
     	"fmt"
     	"os"
-    	"launchpad.net/juju-core/state/api/params"
+    	"github.com/juju/juju/state/api/params"
     )
     func Password(config Config) string {
@@ Expand Down @@