brooklyn-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From s...@apache.org
Subject [01/19] brooklyn-client git commit: fix import paths
Date Tue, 25 Oct 2016 19:10:55 GMT
Repository: brooklyn-client
Updated Branches:
  refs/heads/master ed158fdc0 -> 5dd174649


fix import paths


Project: http://git-wip-us.apache.org/repos/asf/brooklyn-client/repo
Commit: http://git-wip-us.apache.org/repos/asf/brooklyn-client/commit/7db8e15d
Tree: http://git-wip-us.apache.org/repos/asf/brooklyn-client/tree/7db8e15d
Diff: http://git-wip-us.apache.org/repos/asf/brooklyn-client/diff/7db8e15d

Branch: refs/heads/master
Commit: 7db8e15d85cc4c8f3cc8f4a7c63e1803da4665bd
Parents: ff8224c
Author: Geoff Macartney <geoff.macartney@cloudsoftcorp.com>
Authored: Tue Oct 11 16:51:24 2016 +0100
Committer: Geoff Macartney <geoff.macartney@cloudsoftcorp.com>
Committed: Tue Oct 11 16:51:24 2016 +0100

----------------------------------------------------------------------
 cli/api/access_control/access_control.go   |  4 ++--
 cli/api/activities/activities.go           |  4 ++--
 cli/api/application/applications.go        |  4 ++--
 cli/api/catalog/catalog.go                 |  4 ++--
 cli/api/entities/entities.go               |  4 ++--
 cli/api/entity_config/config.go            |  4 ++--
 cli/api/entity_effectors/effectors.go      |  4 ++--
 cli/api/entity_policies/policies.go        |  4 ++--
 cli/api/entity_policy_config/config.go     |  4 ++--
 cli/api/entity_sensors/sensors.go          |  4 ++--
 cli/api/locations/locations.go             |  4 ++--
 cli/api/server/server.go                   |  2 +-
 cli/api/usage/usage.go                     |  4 ++--
 cli/api/version/version.go                 |  4 ++--
 cli/app/app.go                             |  6 +++---
 cli/br/brooklyn.go                         | 14 +++++++-------
 cli/command/command.go                     |  4 ++--
 cli/command_factory/factory.go             | 10 +++++-----
 cli/command_runner/runner.go               |  4 ++--
 cli/commands/access.go                     | 10 +++++-----
 cli/commands/activity-stream.go            | 10 +++++-----
 cli/commands/activity.go                   | 16 ++++++++--------
 cli/commands/add-catalog.go                | 10 +++++-----
 cli/commands/add-children.go               | 12 ++++++------
 cli/commands/add-location.go               |  2 +-
 cli/commands/add-policy.go                 |  8 ++++----
 cli/commands/application.go                | 18 +++++++++---------
 cli/commands/catalog-applications.go       |  2 +-
 cli/commands/catalog-entities.go           |  2 +-
 cli/commands/catalog-entity.go             |  2 +-
 cli/commands/catalog-location.go           |  2 +-
 cli/commands/catalog-locations.go          |  2 +-
 cli/commands/catalog-policies.go           |  2 +-
 cli/commands/catalog-policy.go             |  2 +-
 cli/commands/catalog.go                    | 12 ++++++------
 cli/commands/config.go                     | 12 ++++++------
 cli/commands/delete-catalog-application.go |  2 +-
 cli/commands/delete-catalog-entity.go      |  2 +-
 cli/commands/delete-catalog-policy.go      |  2 +-
 cli/commands/delete.go                     | 10 +++++-----
 cli/commands/deploy.go                     | 14 +++++++-------
 cli/commands/destroy-policy.go             | 10 +++++-----
 cli/commands/effector.go                   | 12 ++++++------
 cli/commands/entity.go                     | 14 +++++++-------
 cli/commands/invoke.go                     | 10 +++++-----
 cli/commands/list.go                       | 10 +++++-----
 cli/commands/locations.go                  | 12 ++++++------
 cli/commands/login.go                      | 12 ++++++------
 cli/commands/policy.go                     | 16 ++++++++--------
 cli/commands/rename.go                     | 10 +++++-----
 cli/commands/reset-catalog.go              |  2 +-
 cli/commands/sensor.go                     | 14 +++++++-------
 cli/commands/set.go                        | 10 +++++-----
 cli/commands/spec.go                       | 10 +++++-----
 cli/commands/start-policy.go               | 10 +++++-----
 cli/commands/stop-policy.go                | 10 +++++-----
 cli/commands/tree.go                       | 12 ++++++------
 cli/commands/version.go                    | 10 +++++-----
 cli/io/config.go                           |  2 +-
 cli/release/build.sh                       |  3 +--
 60 files changed, 217 insertions(+), 218 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/brooklyn-client/blob/7db8e15d/cli/api/access_control/access_control.go
----------------------------------------------------------------------
diff --git a/cli/api/access_control/access_control.go b/cli/api/access_control/access_control.go
index c68eecf..f8350db 100644
--- a/cli/api/access_control/access_control.go
+++ b/cli/api/access_control/access_control.go
@@ -21,8 +21,8 @@ package access_control
 import (
 	"encoding/json"
 	"fmt"
-	"github.com/apache/brooklyn-client/models"
-	"github.com/apache/brooklyn-client/net"
+	"github.com/apache/brooklyn-client/cli/models"
+	"github.com/apache/brooklyn-client/cli/net"
 )
 
 func Access(network *net.Network) (models.AccessSummary, error) {

http://git-wip-us.apache.org/repos/asf/brooklyn-client/blob/7db8e15d/cli/api/activities/activities.go
----------------------------------------------------------------------
diff --git a/cli/api/activities/activities.go b/cli/api/activities/activities.go
index 0364dcb..0080829 100644
--- a/cli/api/activities/activities.go
+++ b/cli/api/activities/activities.go
@@ -21,8 +21,8 @@ package activities
 import (
 	"encoding/json"
 	"fmt"
-	"github.com/apache/brooklyn-client/models"
-	"github.com/apache/brooklyn-client/net"
+	"github.com/apache/brooklyn-client/cli/models"
+	"github.com/apache/brooklyn-client/cli/net"
 )
 
 func Activity(network *net.Network, activity string) (models.TaskSummary, error) {

http://git-wip-us.apache.org/repos/asf/brooklyn-client/blob/7db8e15d/cli/api/application/applications.go
----------------------------------------------------------------------
diff --git a/cli/api/application/applications.go b/cli/api/application/applications.go
index f46ebac..ae0d307 100644
--- a/cli/api/application/applications.go
+++ b/cli/api/application/applications.go
@@ -21,8 +21,8 @@ package application
 import (
 	"encoding/json"
 	"fmt"
-	"github.com/apache/brooklyn-client/models"
-	"github.com/apache/brooklyn-client/net"
+	"github.com/apache/brooklyn-client/cli/models"
+	"github.com/apache/brooklyn-client/cli/net"
 )
 
 //WIP

http://git-wip-us.apache.org/repos/asf/brooklyn-client/blob/7db8e15d/cli/api/catalog/catalog.go
----------------------------------------------------------------------
diff --git a/cli/api/catalog/catalog.go b/cli/api/catalog/catalog.go
index dd5b75a..3db32ce 100644
--- a/cli/api/catalog/catalog.go
+++ b/cli/api/catalog/catalog.go
@@ -21,8 +21,8 @@ package catalog
 import (
 	"encoding/json"
 	"fmt"
-	"github.com/apache/brooklyn-client/models"
-	"github.com/apache/brooklyn-client/net"
+	"github.com/apache/brooklyn-client/cli/models"
+	"github.com/apache/brooklyn-client/cli/net"
 )
 
 func Icon(network *net.Network, itemId string) ([]byte, error) {

http://git-wip-us.apache.org/repos/asf/brooklyn-client/blob/7db8e15d/cli/api/entities/entities.go
----------------------------------------------------------------------
diff --git a/cli/api/entities/entities.go b/cli/api/entities/entities.go
index 90dbb49..9e0323a 100644
--- a/cli/api/entities/entities.go
+++ b/cli/api/entities/entities.go
@@ -21,8 +21,8 @@ package entities
 import (
 	"encoding/json"
 	"fmt"
-	"github.com/apache/brooklyn-client/models"
-	"github.com/apache/brooklyn-client/net"
+	"github.com/apache/brooklyn-client/cli/models"
+	"github.com/apache/brooklyn-client/cli/net"
 	"net/url"
 )
 

http://git-wip-us.apache.org/repos/asf/brooklyn-client/blob/7db8e15d/cli/api/entity_config/config.go
----------------------------------------------------------------------
diff --git a/cli/api/entity_config/config.go b/cli/api/entity_config/config.go
index 66cd1d5..fcdf148 100644
--- a/cli/api/entity_config/config.go
+++ b/cli/api/entity_config/config.go
@@ -21,8 +21,8 @@ package entity_config
 import (
 	"encoding/json"
 	"fmt"
-	"github.com/apache/brooklyn-client/models"
-	"github.com/apache/brooklyn-client/net"
+	"github.com/apache/brooklyn-client/cli/models"
+	"github.com/apache/brooklyn-client/cli/net"
 )
 
 func ConfigValue(network *net.Network, application, entity, config string) (interface{}, error) {

http://git-wip-us.apache.org/repos/asf/brooklyn-client/blob/7db8e15d/cli/api/entity_effectors/effectors.go
----------------------------------------------------------------------
diff --git a/cli/api/entity_effectors/effectors.go b/cli/api/entity_effectors/effectors.go
index 488a5b1..557928d 100644
--- a/cli/api/entity_effectors/effectors.go
+++ b/cli/api/entity_effectors/effectors.go
@@ -23,8 +23,8 @@ import (
 	"encoding/json"
 	"errors"
 	"fmt"
-	"github.com/apache/brooklyn-client/models"
-	"github.com/apache/brooklyn-client/net"
+	"github.com/apache/brooklyn-client/cli/models"
+	"github.com/apache/brooklyn-client/cli/net"
 	"net/url"
 	"strconv"
 	"strings"

http://git-wip-us.apache.org/repos/asf/brooklyn-client/blob/7db8e15d/cli/api/entity_policies/policies.go
----------------------------------------------------------------------
diff --git a/cli/api/entity_policies/policies.go b/cli/api/entity_policies/policies.go
index d776a05..d4673a1 100644
--- a/cli/api/entity_policies/policies.go
+++ b/cli/api/entity_policies/policies.go
@@ -22,8 +22,8 @@ import (
 	"bytes"
 	"encoding/json"
 	"fmt"
-	"github.com/apache/brooklyn-client/models"
-	"github.com/apache/brooklyn-client/net"
+	"github.com/apache/brooklyn-client/cli/models"
+	"github.com/apache/brooklyn-client/cli/net"
 	"net/url"
 	"strconv"
 )

http://git-wip-us.apache.org/repos/asf/brooklyn-client/blob/7db8e15d/cli/api/entity_policy_config/config.go
----------------------------------------------------------------------
diff --git a/cli/api/entity_policy_config/config.go b/cli/api/entity_policy_config/config.go
index 0cf40fe..7b0b318 100644
--- a/cli/api/entity_policy_config/config.go
+++ b/cli/api/entity_policy_config/config.go
@@ -21,8 +21,8 @@ package entity_policy_config
 import (
 	"encoding/json"
 	"fmt"
-	"github.com/apache/brooklyn-client/models"
-	"github.com/apache/brooklyn-client/net"
+	"github.com/apache/brooklyn-client/cli/models"
+	"github.com/apache/brooklyn-client/cli/net"
 )
 
 func CurrentState(network *net.Network, application, entity, policy string) (string, error) {

http://git-wip-us.apache.org/repos/asf/brooklyn-client/blob/7db8e15d/cli/api/entity_sensors/sensors.go
----------------------------------------------------------------------
diff --git a/cli/api/entity_sensors/sensors.go b/cli/api/entity_sensors/sensors.go
index ddb0d5b..1a32bf8 100644
--- a/cli/api/entity_sensors/sensors.go
+++ b/cli/api/entity_sensors/sensors.go
@@ -21,8 +21,8 @@ package entity_sensors
 import (
 	"encoding/json"
 	"fmt"
-	"github.com/apache/brooklyn-client/models"
-	"github.com/apache/brooklyn-client/net"
+	"github.com/apache/brooklyn-client/cli/models"
+	"github.com/apache/brooklyn-client/cli/net"
 )
 
 func SensorValue(network *net.Network, application, entity, sensor string) (interface{}, error) {

http://git-wip-us.apache.org/repos/asf/brooklyn-client/blob/7db8e15d/cli/api/locations/locations.go
----------------------------------------------------------------------
diff --git a/cli/api/locations/locations.go b/cli/api/locations/locations.go
index 9bbb9b3..f85ea97 100644
--- a/cli/api/locations/locations.go
+++ b/cli/api/locations/locations.go
@@ -21,8 +21,8 @@ package locations
 import (
 	"encoding/json"
 	"fmt"
-	"github.com/apache/brooklyn-client/models"
-	"github.com/apache/brooklyn-client/net"
+	"github.com/apache/brooklyn-client/cli/models"
+	"github.com/apache/brooklyn-client/cli/net"
 )
 
 func LocatedLocations(network *net.Network) (string, error) {

http://git-wip-us.apache.org/repos/asf/brooklyn-client/blob/7db8e15d/cli/api/server/server.go
----------------------------------------------------------------------
diff --git a/cli/api/server/server.go b/cli/api/server/server.go
index a46b705..b1b49b5 100644
--- a/cli/api/server/server.go
+++ b/cli/api/server/server.go
@@ -20,7 +20,7 @@ package server
 
 import (
 	"fmt"
-	"github.com/apache/brooklyn-client/net"
+	"github.com/apache/brooklyn-client/cli/net"
 )
 
 func Up(network *net.Network) (string, error) {

http://git-wip-us.apache.org/repos/asf/brooklyn-client/blob/7db8e15d/cli/api/usage/usage.go
----------------------------------------------------------------------
diff --git a/cli/api/usage/usage.go b/cli/api/usage/usage.go
index f49a517..26289ee 100644
--- a/cli/api/usage/usage.go
+++ b/cli/api/usage/usage.go
@@ -21,8 +21,8 @@ package usage
 import (
 	"encoding/json"
 	"fmt"
-	"github.com/apache/brooklyn-client/models"
-	"github.com/apache/brooklyn-client/net"
+	"github.com/apache/brooklyn-client/cli/models"
+	"github.com/apache/brooklyn-client/cli/net"
 )
 
 func Application(network *net.Network, application string) (string, error) {

http://git-wip-us.apache.org/repos/asf/brooklyn-client/blob/7db8e15d/cli/api/version/version.go
----------------------------------------------------------------------
diff --git a/cli/api/version/version.go b/cli/api/version/version.go
index c3f1c70..622068d 100644
--- a/cli/api/version/version.go
+++ b/cli/api/version/version.go
@@ -20,8 +20,8 @@ package version
 
 import (
 	"encoding/json"
-	"github.com/apache/brooklyn-client/models"
-	"github.com/apache/brooklyn-client/net"
+	"github.com/apache/brooklyn-client/cli/models"
+	"github.com/apache/brooklyn-client/cli/net"
 )
 
 func Version(network *net.Network) (models.VersionSummary, error) {

http://git-wip-us.apache.org/repos/asf/brooklyn-client/blob/7db8e15d/cli/app/app.go
----------------------------------------------------------------------
diff --git a/cli/app/app.go b/cli/app/app.go
index afdb41d..4fb39a2 100644
--- a/cli/app/app.go
+++ b/cli/app/app.go
@@ -20,9 +20,9 @@ package app
 
 import (
 	"fmt"
-	"github.com/apache/brooklyn-client/command_metadata"
-	"github.com/apache/brooklyn-client/command_runner"
-	"github.com/apache/brooklyn-client/error_handler"
+	"github.com/apache/brooklyn-client/cli/command_metadata"
+	"github.com/apache/brooklyn-client/cli/command_runner"
+	"github.com/apache/brooklyn-client/cli/error_handler"
 	"github.com/urfave/cli"
 	"os"
 	"strings"

http://git-wip-us.apache.org/repos/asf/brooklyn-client/blob/7db8e15d/cli/br/brooklyn.go
----------------------------------------------------------------------
diff --git a/cli/br/brooklyn.go b/cli/br/brooklyn.go
index 7f5eed5..1ffb765 100644
--- a/cli/br/brooklyn.go
+++ b/cli/br/brooklyn.go
@@ -19,13 +19,13 @@
 package main
 
 import (
-	"github.com/apache/brooklyn-client/app"
-	"github.com/apache/brooklyn-client/command_factory"
-	"github.com/apache/brooklyn-client/command_runner"
-	"github.com/apache/brooklyn-client/error_handler"
-	"github.com/apache/brooklyn-client/io"
-	"github.com/apache/brooklyn-client/net"
-	"github.com/apache/brooklyn-client/scope"
+	"github.com/apache/brooklyn-client/cli/app"
+	"github.com/apache/brooklyn-client/cli/command_factory"
+	"github.com/apache/brooklyn-client/cli/command_runner"
+	"github.com/apache/brooklyn-client/cli/error_handler"
+	"github.com/apache/brooklyn-client/cli/io"
+	"github.com/apache/brooklyn-client/cli/net"
+	"github.com/apache/brooklyn-client/cli/scope"
 	"os"
 	"path/filepath"
 )

http://git-wip-us.apache.org/repos/asf/brooklyn-client/blob/7db8e15d/cli/command/command.go
----------------------------------------------------------------------
diff --git a/cli/command/command.go b/cli/command/command.go
index 1a16282..c19cc98 100644
--- a/cli/command/command.go
+++ b/cli/command/command.go
@@ -19,8 +19,8 @@
 package command
 
 import (
-	"github.com/apache/brooklyn-client/command_metadata"
-	"github.com/apache/brooklyn-client/scope"
+	"github.com/apache/brooklyn-client/cli/command_metadata"
+	"github.com/apache/brooklyn-client/cli/scope"
 	"github.com/urfave/cli"
 )
 

http://git-wip-us.apache.org/repos/asf/brooklyn-client/blob/7db8e15d/cli/command_factory/factory.go
----------------------------------------------------------------------
diff --git a/cli/command_factory/factory.go b/cli/command_factory/factory.go
index 7a46eb9..ae1634d 100644
--- a/cli/command_factory/factory.go
+++ b/cli/command_factory/factory.go
@@ -20,11 +20,11 @@ package command_factory
 
 import (
 	"errors"
-	"github.com/apache/brooklyn-client/command"
-	"github.com/apache/brooklyn-client/command_metadata"
-	"github.com/apache/brooklyn-client/commands"
-	"github.com/apache/brooklyn-client/io"
-	"github.com/apache/brooklyn-client/net"
+	"github.com/apache/brooklyn-client/cli/command"
+	"github.com/apache/brooklyn-client/cli/command_metadata"
+	"github.com/apache/brooklyn-client/cli/commands"
+	"github.com/apache/brooklyn-client/cli/io"
+	"github.com/apache/brooklyn-client/cli/net"
 	"sort"
 	"strings"
 )

http://git-wip-us.apache.org/repos/asf/brooklyn-client/blob/7db8e15d/cli/command_runner/runner.go
----------------------------------------------------------------------
diff --git a/cli/command_runner/runner.go b/cli/command_runner/runner.go
index c123b5f..4ab5c78 100644
--- a/cli/command_runner/runner.go
+++ b/cli/command_runner/runner.go
@@ -19,8 +19,8 @@
 package command_runner
 
 import (
-	"github.com/apache/brooklyn-client/command_factory"
-	"github.com/apache/brooklyn-client/scope"
+	"github.com/apache/brooklyn-client/cli/command_factory"
+	"github.com/apache/brooklyn-client/cli/scope"
 	"github.com/urfave/cli"
 )
 

http://git-wip-us.apache.org/repos/asf/brooklyn-client/blob/7db8e15d/cli/commands/access.go
----------------------------------------------------------------------
diff --git a/cli/commands/access.go b/cli/commands/access.go
index 87e26cd..8a8b850 100644
--- a/cli/commands/access.go
+++ b/cli/commands/access.go
@@ -20,11 +20,11 @@ package commands
 
 import (
 	"fmt"
-	"github.com/apache/brooklyn-client/api/access_control"
-	"github.com/apache/brooklyn-client/command_metadata"
-	"github.com/apache/brooklyn-client/error_handler"
-	"github.com/apache/brooklyn-client/net"
-	"github.com/apache/brooklyn-client/scope"
+	"github.com/apache/brooklyn-client/cli/api/access_control"
+	"github.com/apache/brooklyn-client/cli/command_metadata"
+	"github.com/apache/brooklyn-client/cli/error_handler"
+	"github.com/apache/brooklyn-client/cli/net"
+	"github.com/apache/brooklyn-client/cli/scope"
 	"github.com/urfave/cli"
 )
 

http://git-wip-us.apache.org/repos/asf/brooklyn-client/blob/7db8e15d/cli/commands/activity-stream.go
----------------------------------------------------------------------
diff --git a/cli/commands/activity-stream.go b/cli/commands/activity-stream.go
index eceadc4..75a8286 100644
--- a/cli/commands/activity-stream.go
+++ b/cli/commands/activity-stream.go
@@ -20,11 +20,11 @@ package commands
 
 import (
 	"fmt"
-	"github.com/apache/brooklyn-client/api/activities"
-	"github.com/apache/brooklyn-client/command_metadata"
-	"github.com/apache/brooklyn-client/error_handler"
-	"github.com/apache/brooklyn-client/net"
-	"github.com/apache/brooklyn-client/scope"
+	"github.com/apache/brooklyn-client/cli/api/activities"
+	"github.com/apache/brooklyn-client/cli/command_metadata"
+	"github.com/apache/brooklyn-client/cli/error_handler"
+	"github.com/apache/brooklyn-client/cli/net"
+	"github.com/apache/brooklyn-client/cli/scope"
 	"github.com/urfave/cli"
 )
 

http://git-wip-us.apache.org/repos/asf/brooklyn-client/blob/7db8e15d/cli/commands/activity.go
----------------------------------------------------------------------
diff --git a/cli/commands/activity.go b/cli/commands/activity.go
index d748c1a..1d82dac 100644
--- a/cli/commands/activity.go
+++ b/cli/commands/activity.go
@@ -20,14 +20,14 @@ package commands
 
 import (
 	"fmt"
-	"github.com/apache/brooklyn-client/api/activities"
-	"github.com/apache/brooklyn-client/api/entities"
-	"github.com/apache/brooklyn-client/command_metadata"
-	"github.com/apache/brooklyn-client/error_handler"
-	"github.com/apache/brooklyn-client/models"
-	"github.com/apache/brooklyn-client/net"
-	"github.com/apache/brooklyn-client/scope"
-	"github.com/apache/brooklyn-client/terminal"
+	"github.com/apache/brooklyn-client/cli/api/activities"
+	"github.com/apache/brooklyn-client/cli/api/entities"
+	"github.com/apache/brooklyn-client/cli/command_metadata"
+	"github.com/apache/brooklyn-client/cli/error_handler"
+	"github.com/apache/brooklyn-client/cli/models"
+	"github.com/apache/brooklyn-client/cli/net"
+	"github.com/apache/brooklyn-client/cli/scope"
+	"github.com/apache/brooklyn-client/cli/terminal"
 	"github.com/urfave/cli"
 	"sort"
 	"strconv"

http://git-wip-us.apache.org/repos/asf/brooklyn-client/blob/7db8e15d/cli/commands/add-catalog.go
----------------------------------------------------------------------
diff --git a/cli/commands/add-catalog.go b/cli/commands/add-catalog.go
index b161f8b..9a29328 100644
--- a/cli/commands/add-catalog.go
+++ b/cli/commands/add-catalog.go
@@ -20,11 +20,11 @@ package commands
 
 import (
 	"fmt"
-	"github.com/apache/brooklyn-client/api/catalog"
-	"github.com/apache/brooklyn-client/command_metadata"
-	"github.com/apache/brooklyn-client/error_handler"
-	"github.com/apache/brooklyn-client/net"
-	"github.com/apache/brooklyn-client/scope"
+	"github.com/apache/brooklyn-client/cli/api/catalog"
+	"github.com/apache/brooklyn-client/cli/command_metadata"
+	"github.com/apache/brooklyn-client/cli/error_handler"
+	"github.com/apache/brooklyn-client/cli/net"
+	"github.com/apache/brooklyn-client/cli/scope"
 	"github.com/urfave/cli"
 )
 

http://git-wip-us.apache.org/repos/asf/brooklyn-client/blob/7db8e15d/cli/commands/add-children.go
----------------------------------------------------------------------
diff --git a/cli/commands/add-children.go b/cli/commands/add-children.go
index d05a114..da87b44 100644
--- a/cli/commands/add-children.go
+++ b/cli/commands/add-children.go
@@ -19,12 +19,12 @@
 package commands
 
 import (
-	"github.com/apache/brooklyn-client/api/entities"
-	"github.com/apache/brooklyn-client/command_metadata"
-	"github.com/apache/brooklyn-client/error_handler"
-	"github.com/apache/brooklyn-client/net"
-	"github.com/apache/brooklyn-client/scope"
-	"github.com/apache/brooklyn-client/terminal"
+	"github.com/apache/brooklyn-client/cli/api/entities"
+	"github.com/apache/brooklyn-client/cli/command_metadata"
+	"github.com/apache/brooklyn-client/cli/error_handler"
+	"github.com/apache/brooklyn-client/cli/net"
+	"github.com/apache/brooklyn-client/cli/scope"
+	"github.com/apache/brooklyn-client/cli/terminal"
 	"github.com/urfave/cli"
 	"time"
 )

http://git-wip-us.apache.org/repos/asf/brooklyn-client/blob/7db8e15d/cli/commands/add-location.go
----------------------------------------------------------------------
diff --git a/cli/commands/add-location.go b/cli/commands/add-location.go
index 32c2db0..0c76823 100644
--- a/cli/commands/add-location.go
+++ b/cli/commands/add-location.go
@@ -19,7 +19,7 @@
 package commands
 
 import (
-	"github.com/apache/brooklyn-client/net"
+	"github.com/apache/brooklyn-client/cli/net"
 )
 
 type AddLocation struct {

http://git-wip-us.apache.org/repos/asf/brooklyn-client/blob/7db8e15d/cli/commands/add-policy.go
----------------------------------------------------------------------
diff --git a/cli/commands/add-policy.go b/cli/commands/add-policy.go
index 35de8c4..d026153 100644
--- a/cli/commands/add-policy.go
+++ b/cli/commands/add-policy.go
@@ -20,10 +20,10 @@ package commands
 
 import (
 	"github.com/urfave/cli"
-	//"github.com/apache/brooklyn-client/api/entity_policies"
-	"github.com/apache/brooklyn-client/command_metadata"
-	"github.com/apache/brooklyn-client/net"
-	"github.com/apache/brooklyn-client/scope"
+	//"github.com/apache/brooklyn-client/cli/api/entity_policies"
+	"github.com/apache/brooklyn-client/cli/command_metadata"
+	"github.com/apache/brooklyn-client/cli/net"
+	"github.com/apache/brooklyn-client/cli/scope"
 )
 
 type AddPolicy struct {

http://git-wip-us.apache.org/repos/asf/brooklyn-client/blob/7db8e15d/cli/commands/application.go
----------------------------------------------------------------------
diff --git a/cli/commands/application.go b/cli/commands/application.go
index c321227..0e9be1f 100644
--- a/cli/commands/application.go
+++ b/cli/commands/application.go
@@ -20,15 +20,15 @@ package commands
 
 import (
 	"fmt"
-	"github.com/apache/brooklyn-client/api/application"
-	"github.com/apache/brooklyn-client/api/entities"
-	"github.com/apache/brooklyn-client/api/entity_sensors"
-	"github.com/apache/brooklyn-client/api/locations"
-	"github.com/apache/brooklyn-client/command_metadata"
-	"github.com/apache/brooklyn-client/error_handler"
-	"github.com/apache/brooklyn-client/net"
-	"github.com/apache/brooklyn-client/scope"
-	"github.com/apache/brooklyn-client/terminal"
+	"github.com/apache/brooklyn-client/cli/api/application"
+	"github.com/apache/brooklyn-client/cli/api/entities"
+	"github.com/apache/brooklyn-client/cli/api/entity_sensors"
+	"github.com/apache/brooklyn-client/cli/api/locations"
+	"github.com/apache/brooklyn-client/cli/command_metadata"
+	"github.com/apache/brooklyn-client/cli/error_handler"
+	"github.com/apache/brooklyn-client/cli/net"
+	"github.com/apache/brooklyn-client/cli/scope"
+	"github.com/apache/brooklyn-client/cli/terminal"
 	"github.com/urfave/cli"
 	"strings"
 )

http://git-wip-us.apache.org/repos/asf/brooklyn-client/blob/7db8e15d/cli/commands/catalog-applications.go
----------------------------------------------------------------------
diff --git a/cli/commands/catalog-applications.go b/cli/commands/catalog-applications.go
index 19a4373..21e07e0 100644
--- a/cli/commands/catalog-applications.go
+++ b/cli/commands/catalog-applications.go
@@ -19,7 +19,7 @@
 package commands
 
 import (
-	"github.com/apache/brooklyn-client/net"
+	"github.com/apache/brooklyn-client/cli/net"
 )
 
 type CatalogApplication struct {

http://git-wip-us.apache.org/repos/asf/brooklyn-client/blob/7db8e15d/cli/commands/catalog-entities.go
----------------------------------------------------------------------
diff --git a/cli/commands/catalog-entities.go b/cli/commands/catalog-entities.go
index dbec760..7615461 100644
--- a/cli/commands/catalog-entities.go
+++ b/cli/commands/catalog-entities.go
@@ -19,7 +19,7 @@
 package commands
 
 import (
-	"github.com/apache/brooklyn-client/net"
+	"github.com/apache/brooklyn-client/cli/net"
 )
 
 type CatalogEntities struct {

http://git-wip-us.apache.org/repos/asf/brooklyn-client/blob/7db8e15d/cli/commands/catalog-entity.go
----------------------------------------------------------------------
diff --git a/cli/commands/catalog-entity.go b/cli/commands/catalog-entity.go
index 23cc295..142d250 100644
--- a/cli/commands/catalog-entity.go
+++ b/cli/commands/catalog-entity.go
@@ -19,7 +19,7 @@
 package commands
 
 import (
-	"github.com/apache/brooklyn-client/net"
+	"github.com/apache/brooklyn-client/cli/net"
 )
 
 type CatalogEntity struct {

http://git-wip-us.apache.org/repos/asf/brooklyn-client/blob/7db8e15d/cli/commands/catalog-location.go
----------------------------------------------------------------------
diff --git a/cli/commands/catalog-location.go b/cli/commands/catalog-location.go
index 40babdd..ecf8ea6 100644
--- a/cli/commands/catalog-location.go
+++ b/cli/commands/catalog-location.go
@@ -19,7 +19,7 @@
 package commands
 
 import (
-	"github.com/apache/brooklyn-client/net"
+	"github.com/apache/brooklyn-client/cli/net"
 )
 
 type CatalogLocation struct {

http://git-wip-us.apache.org/repos/asf/brooklyn-client/blob/7db8e15d/cli/commands/catalog-locations.go
----------------------------------------------------------------------
diff --git a/cli/commands/catalog-locations.go b/cli/commands/catalog-locations.go
index e1791e8..c474b32 100644
--- a/cli/commands/catalog-locations.go
+++ b/cli/commands/catalog-locations.go
@@ -19,7 +19,7 @@
 package commands
 
 import (
-	"github.com/apache/brooklyn-client/net"
+	"github.com/apache/brooklyn-client/cli/net"
 )
 
 type CatalogLocations struct {

http://git-wip-us.apache.org/repos/asf/brooklyn-client/blob/7db8e15d/cli/commands/catalog-policies.go
----------------------------------------------------------------------
diff --git a/cli/commands/catalog-policies.go b/cli/commands/catalog-policies.go
index 3e245db..1dfa1df 100644
--- a/cli/commands/catalog-policies.go
+++ b/cli/commands/catalog-policies.go
@@ -19,7 +19,7 @@
 package commands
 
 import (
-	"github.com/apache/brooklyn-client/net"
+	"github.com/apache/brooklyn-client/cli/net"
 )
 
 type CatalogPolicies struct {

http://git-wip-us.apache.org/repos/asf/brooklyn-client/blob/7db8e15d/cli/commands/catalog-policy.go
----------------------------------------------------------------------
diff --git a/cli/commands/catalog-policy.go b/cli/commands/catalog-policy.go
index 82e8a95..d64c73d 100644
--- a/cli/commands/catalog-policy.go
+++ b/cli/commands/catalog-policy.go
@@ -19,7 +19,7 @@
 package commands
 
 import (
-	"github.com/apache/brooklyn-client/net"
+	"github.com/apache/brooklyn-client/cli/net"
 )
 
 type CatalogPolicy struct {

http://git-wip-us.apache.org/repos/asf/brooklyn-client/blob/7db8e15d/cli/commands/catalog.go
----------------------------------------------------------------------
diff --git a/cli/commands/catalog.go b/cli/commands/catalog.go
index fd1d8ad..eab08b8 100644
--- a/cli/commands/catalog.go
+++ b/cli/commands/catalog.go
@@ -19,12 +19,12 @@
 package commands
 
 import (
-	"github.com/apache/brooklyn-client/api/catalog"
-	"github.com/apache/brooklyn-client/command_metadata"
-	"github.com/apache/brooklyn-client/error_handler"
-	"github.com/apache/brooklyn-client/net"
-	"github.com/apache/brooklyn-client/scope"
-	"github.com/apache/brooklyn-client/terminal"
+	"github.com/apache/brooklyn-client/cli/api/catalog"
+	"github.com/apache/brooklyn-client/cli/command_metadata"
+	"github.com/apache/brooklyn-client/cli/error_handler"
+	"github.com/apache/brooklyn-client/cli/net"
+	"github.com/apache/brooklyn-client/cli/scope"
+	"github.com/apache/brooklyn-client/cli/terminal"
 	"github.com/urfave/cli"
 )
 

http://git-wip-us.apache.org/repos/asf/brooklyn-client/blob/7db8e15d/cli/commands/config.go
----------------------------------------------------------------------
diff --git a/cli/commands/config.go b/cli/commands/config.go
index 33d9cba..7766251 100644
--- a/cli/commands/config.go
+++ b/cli/commands/config.go
@@ -20,12 +20,12 @@ package commands
 
 import (
 	"fmt"
-	"github.com/apache/brooklyn-client/api/entity_config"
-	"github.com/apache/brooklyn-client/command_metadata"
-	"github.com/apache/brooklyn-client/error_handler"
-	"github.com/apache/brooklyn-client/net"
-	"github.com/apache/brooklyn-client/scope"
-	"github.com/apache/brooklyn-client/terminal"
+	"github.com/apache/brooklyn-client/cli/api/entity_config"
+	"github.com/apache/brooklyn-client/cli/command_metadata"
+	"github.com/apache/brooklyn-client/cli/error_handler"
+	"github.com/apache/brooklyn-client/cli/net"
+	"github.com/apache/brooklyn-client/cli/scope"
+	"github.com/apache/brooklyn-client/cli/terminal"
 	"github.com/urfave/cli"
 )
 

http://git-wip-us.apache.org/repos/asf/brooklyn-client/blob/7db8e15d/cli/commands/delete-catalog-application.go
----------------------------------------------------------------------
diff --git a/cli/commands/delete-catalog-application.go b/cli/commands/delete-catalog-application.go
index f289bbd..fd8ac3b 100644
--- a/cli/commands/delete-catalog-application.go
+++ b/cli/commands/delete-catalog-application.go
@@ -19,7 +19,7 @@
 package commands
 
 import (
-	"github.com/apache/brooklyn-client/net"
+	"github.com/apache/brooklyn-client/cli/net"
 )
 
 type DeleteCatalogApplication struct {

http://git-wip-us.apache.org/repos/asf/brooklyn-client/blob/7db8e15d/cli/commands/delete-catalog-entity.go
----------------------------------------------------------------------
diff --git a/cli/commands/delete-catalog-entity.go b/cli/commands/delete-catalog-entity.go
index 5953fff..4f207c5 100644
--- a/cli/commands/delete-catalog-entity.go
+++ b/cli/commands/delete-catalog-entity.go
@@ -19,7 +19,7 @@
 package commands
 
 import (
-	"github.com/apache/brooklyn-client/net"
+	"github.com/apache/brooklyn-client/cli/net"
 )
 
 type DeleteCatalogEntity struct {

http://git-wip-us.apache.org/repos/asf/brooklyn-client/blob/7db8e15d/cli/commands/delete-catalog-policy.go
----------------------------------------------------------------------
diff --git a/cli/commands/delete-catalog-policy.go b/cli/commands/delete-catalog-policy.go
index c6b29a6..26c5d71 100644
--- a/cli/commands/delete-catalog-policy.go
+++ b/cli/commands/delete-catalog-policy.go
@@ -19,7 +19,7 @@
 package commands
 
 import (
-	"github.com/apache/brooklyn-client/net"
+	"github.com/apache/brooklyn-client/cli/net"
 )
 
 type DeleteCatalogPolicy struct {

http://git-wip-us.apache.org/repos/asf/brooklyn-client/blob/7db8e15d/cli/commands/delete.go
----------------------------------------------------------------------
diff --git a/cli/commands/delete.go b/cli/commands/delete.go
index 90c60f9..d3f30a4 100644
--- a/cli/commands/delete.go
+++ b/cli/commands/delete.go
@@ -20,11 +20,11 @@ package commands
 
 import (
 	"fmt"
-	"github.com/apache/brooklyn-client/api/application"
-	"github.com/apache/brooklyn-client/command_metadata"
-	"github.com/apache/brooklyn-client/error_handler"
-	"github.com/apache/brooklyn-client/net"
-	"github.com/apache/brooklyn-client/scope"
+	"github.com/apache/brooklyn-client/cli/api/application"
+	"github.com/apache/brooklyn-client/cli/command_metadata"
+	"github.com/apache/brooklyn-client/cli/error_handler"
+	"github.com/apache/brooklyn-client/cli/net"
+	"github.com/apache/brooklyn-client/cli/scope"
 	"github.com/urfave/cli"
 )
 

http://git-wip-us.apache.org/repos/asf/brooklyn-client/blob/7db8e15d/cli/commands/deploy.go
----------------------------------------------------------------------
diff --git a/cli/commands/deploy.go b/cli/commands/deploy.go
index bc42b08..46b1395 100644
--- a/cli/commands/deploy.go
+++ b/cli/commands/deploy.go
@@ -19,13 +19,13 @@
 package commands
 
 import (
-	"github.com/apache/brooklyn-client/api/application"
-	"github.com/apache/brooklyn-client/command_metadata"
-	"github.com/apache/brooklyn-client/error_handler"
-	"github.com/apache/brooklyn-client/models"
-	"github.com/apache/brooklyn-client/net"
-	"github.com/apache/brooklyn-client/scope"
-	"github.com/apache/brooklyn-client/terminal"
+	"github.com/apache/brooklyn-client/cli/api/application"
+	"github.com/apache/brooklyn-client/cli/command_metadata"
+	"github.com/apache/brooklyn-client/cli/error_handler"
+	"github.com/apache/brooklyn-client/cli/models"
+	"github.com/apache/brooklyn-client/cli/net"
+	"github.com/apache/brooklyn-client/cli/scope"
+	"github.com/apache/brooklyn-client/cli/terminal"
 	"github.com/urfave/cli"
 	"io/ioutil"
 	"os"

http://git-wip-us.apache.org/repos/asf/brooklyn-client/blob/7db8e15d/cli/commands/destroy-policy.go
----------------------------------------------------------------------
diff --git a/cli/commands/destroy-policy.go b/cli/commands/destroy-policy.go
index 4ea37ec..808d777 100644
--- a/cli/commands/destroy-policy.go
+++ b/cli/commands/destroy-policy.go
@@ -20,11 +20,11 @@ package commands
 
 import (
 	"fmt"
-	"github.com/apache/brooklyn-client/api/entity_policies"
-	"github.com/apache/brooklyn-client/command_metadata"
-	"github.com/apache/brooklyn-client/error_handler"
-	"github.com/apache/brooklyn-client/net"
-	"github.com/apache/brooklyn-client/scope"
+	"github.com/apache/brooklyn-client/cli/api/entity_policies"
+	"github.com/apache/brooklyn-client/cli/command_metadata"
+	"github.com/apache/brooklyn-client/cli/error_handler"
+	"github.com/apache/brooklyn-client/cli/net"
+	"github.com/apache/brooklyn-client/cli/scope"
 	"github.com/urfave/cli"
 )
 

http://git-wip-us.apache.org/repos/asf/brooklyn-client/blob/7db8e15d/cli/commands/effector.go
----------------------------------------------------------------------
diff --git a/cli/commands/effector.go b/cli/commands/effector.go
index aeff664..98fd561 100644
--- a/cli/commands/effector.go
+++ b/cli/commands/effector.go
@@ -19,12 +19,12 @@
 package commands
 
 import (
-	"github.com/apache/brooklyn-client/api/entity_effectors"
-	"github.com/apache/brooklyn-client/command_metadata"
-	"github.com/apache/brooklyn-client/error_handler"
-	"github.com/apache/brooklyn-client/net"
-	"github.com/apache/brooklyn-client/scope"
-	"github.com/apache/brooklyn-client/terminal"
+	"github.com/apache/brooklyn-client/cli/api/entity_effectors"
+	"github.com/apache/brooklyn-client/cli/command_metadata"
+	"github.com/apache/brooklyn-client/cli/error_handler"
+	"github.com/apache/brooklyn-client/cli/net"
+	"github.com/apache/brooklyn-client/cli/scope"
+	"github.com/apache/brooklyn-client/cli/terminal"
 	"github.com/urfave/cli"
 	"strings"
 )

http://git-wip-us.apache.org/repos/asf/brooklyn-client/blob/7db8e15d/cli/commands/entity.go
----------------------------------------------------------------------
diff --git a/cli/commands/entity.go b/cli/commands/entity.go
index e5903c9..8820023 100644
--- a/cli/commands/entity.go
+++ b/cli/commands/entity.go
@@ -20,13 +20,13 @@ package commands
 
 import (
 	"fmt"
-	"github.com/apache/brooklyn-client/api/entities"
-	"github.com/apache/brooklyn-client/api/entity_sensors"
-	"github.com/apache/brooklyn-client/command_metadata"
-	"github.com/apache/brooklyn-client/error_handler"
-	"github.com/apache/brooklyn-client/net"
-	"github.com/apache/brooklyn-client/scope"
-	"github.com/apache/brooklyn-client/terminal"
+	"github.com/apache/brooklyn-client/cli/api/entities"
+	"github.com/apache/brooklyn-client/cli/api/entity_sensors"
+	"github.com/apache/brooklyn-client/cli/command_metadata"
+	"github.com/apache/brooklyn-client/cli/error_handler"
+	"github.com/apache/brooklyn-client/cli/net"
+	"github.com/apache/brooklyn-client/cli/scope"
+	"github.com/apache/brooklyn-client/cli/terminal"
 	"github.com/urfave/cli"
 	"os"
 )

http://git-wip-us.apache.org/repos/asf/brooklyn-client/blob/7db8e15d/cli/commands/invoke.go
----------------------------------------------------------------------
diff --git a/cli/commands/invoke.go b/cli/commands/invoke.go
index a719ed7..61a4edc 100644
--- a/cli/commands/invoke.go
+++ b/cli/commands/invoke.go
@@ -21,11 +21,11 @@ package commands
 import (
 	"errors"
 	"fmt"
-	"github.com/apache/brooklyn-client/api/entity_effectors"
-	"github.com/apache/brooklyn-client/command_metadata"
-	"github.com/apache/brooklyn-client/error_handler"
-	"github.com/apache/brooklyn-client/net"
-	"github.com/apache/brooklyn-client/scope"
+	"github.com/apache/brooklyn-client/cli/api/entity_effectors"
+	"github.com/apache/brooklyn-client/cli/command_metadata"
+	"github.com/apache/brooklyn-client/cli/error_handler"
+	"github.com/apache/brooklyn-client/cli/net"
+	"github.com/apache/brooklyn-client/cli/scope"
 	"github.com/urfave/cli"
 	"io/ioutil"
 	"strings"

http://git-wip-us.apache.org/repos/asf/brooklyn-client/blob/7db8e15d/cli/commands/list.go
----------------------------------------------------------------------
diff --git a/cli/commands/list.go b/cli/commands/list.go
index 7758568..dc63891 100644
--- a/cli/commands/list.go
+++ b/cli/commands/list.go
@@ -20,11 +20,11 @@ package commands
 
 import (
 	"fmt"
-	"github.com/apache/brooklyn-client/command"
-	"github.com/apache/brooklyn-client/command_metadata"
-	"github.com/apache/brooklyn-client/error_handler"
-	"github.com/apache/brooklyn-client/net"
-	"github.com/apache/brooklyn-client/scope"
+	"github.com/apache/brooklyn-client/cli/command"
+	"github.com/apache/brooklyn-client/cli/command_metadata"
+	"github.com/apache/brooklyn-client/cli/error_handler"
+	"github.com/apache/brooklyn-client/cli/net"
+	"github.com/apache/brooklyn-client/cli/scope"
 	"github.com/urfave/cli"
 	"strings"
 )

http://git-wip-us.apache.org/repos/asf/brooklyn-client/blob/7db8e15d/cli/commands/locations.go
----------------------------------------------------------------------
diff --git a/cli/commands/locations.go b/cli/commands/locations.go
index f197130..c0a21d6 100644
--- a/cli/commands/locations.go
+++ b/cli/commands/locations.go
@@ -19,12 +19,12 @@
 package commands
 
 import (
-	"github.com/apache/brooklyn-client/api/locations"
-	"github.com/apache/brooklyn-client/command_metadata"
-	"github.com/apache/brooklyn-client/error_handler"
-	"github.com/apache/brooklyn-client/net"
-	"github.com/apache/brooklyn-client/scope"
-	"github.com/apache/brooklyn-client/terminal"
+	"github.com/apache/brooklyn-client/cli/api/locations"
+	"github.com/apache/brooklyn-client/cli/command_metadata"
+	"github.com/apache/brooklyn-client/cli/error_handler"
+	"github.com/apache/brooklyn-client/cli/net"
+	"github.com/apache/brooklyn-client/cli/scope"
+	"github.com/apache/brooklyn-client/cli/terminal"
 	"github.com/urfave/cli"
 )
 

http://git-wip-us.apache.org/repos/asf/brooklyn-client/blob/7db8e15d/cli/commands/login.go
----------------------------------------------------------------------
diff --git a/cli/commands/login.go b/cli/commands/login.go
index df63b33..349b0d8 100644
--- a/cli/commands/login.go
+++ b/cli/commands/login.go
@@ -20,12 +20,12 @@ package commands
 
 import (
 	"fmt"
-	"github.com/apache/brooklyn-client/api/version"
-	"github.com/apache/brooklyn-client/command_metadata"
-	"github.com/apache/brooklyn-client/error_handler"
-	"github.com/apache/brooklyn-client/io"
-	"github.com/apache/brooklyn-client/net"
-	"github.com/apache/brooklyn-client/scope"
+	"github.com/apache/brooklyn-client/cli/api/version"
+	"github.com/apache/brooklyn-client/cli/command_metadata"
+	"github.com/apache/brooklyn-client/cli/error_handler"
+	"github.com/apache/brooklyn-client/cli/io"
+	"github.com/apache/brooklyn-client/cli/net"
+	"github.com/apache/brooklyn-client/cli/scope"
 	"github.com/urfave/cli"
 	"golang.org/x/crypto/ssh/terminal"
 	"syscall"

http://git-wip-us.apache.org/repos/asf/brooklyn-client/blob/7db8e15d/cli/commands/policy.go
----------------------------------------------------------------------
diff --git a/cli/commands/policy.go b/cli/commands/policy.go
index 1d587fd..e6d0bcf 100644
--- a/cli/commands/policy.go
+++ b/cli/commands/policy.go
@@ -19,14 +19,14 @@
 package commands
 
 import (
-	"github.com/apache/brooklyn-client/api/entity_policies"
-	"github.com/apache/brooklyn-client/api/entity_policy_config"
-	"github.com/apache/brooklyn-client/command_metadata"
-	"github.com/apache/brooklyn-client/error_handler"
-	"github.com/apache/brooklyn-client/models"
-	"github.com/apache/brooklyn-client/net"
-	"github.com/apache/brooklyn-client/scope"
-	"github.com/apache/brooklyn-client/terminal"
+	"github.com/apache/brooklyn-client/cli/api/entity_policies"
+	"github.com/apache/brooklyn-client/cli/api/entity_policy_config"
+	"github.com/apache/brooklyn-client/cli/command_metadata"
+	"github.com/apache/brooklyn-client/cli/error_handler"
+	"github.com/apache/brooklyn-client/cli/models"
+	"github.com/apache/brooklyn-client/cli/net"
+	"github.com/apache/brooklyn-client/cli/scope"
+	"github.com/apache/brooklyn-client/cli/terminal"
 	"github.com/urfave/cli"
 	"sort"
 )

http://git-wip-us.apache.org/repos/asf/brooklyn-client/blob/7db8e15d/cli/commands/rename.go
----------------------------------------------------------------------
diff --git a/cli/commands/rename.go b/cli/commands/rename.go
index 7891971..f7f6aed 100644
--- a/cli/commands/rename.go
+++ b/cli/commands/rename.go
@@ -20,11 +20,11 @@ package commands
 
 import (
 	"fmt"
-	"github.com/apache/brooklyn-client/api/entities"
-	"github.com/apache/brooklyn-client/command_metadata"
-	"github.com/apache/brooklyn-client/error_handler"
-	"github.com/apache/brooklyn-client/net"
-	"github.com/apache/brooklyn-client/scope"
+	"github.com/apache/brooklyn-client/cli/api/entities"
+	"github.com/apache/brooklyn-client/cli/command_metadata"
+	"github.com/apache/brooklyn-client/cli/error_handler"
+	"github.com/apache/brooklyn-client/cli/net"
+	"github.com/apache/brooklyn-client/cli/scope"
 	"github.com/urfave/cli"
 )
 

http://git-wip-us.apache.org/repos/asf/brooklyn-client/blob/7db8e15d/cli/commands/reset-catalog.go
----------------------------------------------------------------------
diff --git a/cli/commands/reset-catalog.go b/cli/commands/reset-catalog.go
index 6830399..d7dfcae 100644
--- a/cli/commands/reset-catalog.go
+++ b/cli/commands/reset-catalog.go
@@ -19,7 +19,7 @@
 package commands
 
 import (
-	"github.com/apache/brooklyn-client/net"
+	"github.com/apache/brooklyn-client/cli/net"
 )
 
 type ResetCatalog struct {

http://git-wip-us.apache.org/repos/asf/brooklyn-client/blob/7db8e15d/cli/commands/sensor.go
----------------------------------------------------------------------
diff --git a/cli/commands/sensor.go b/cli/commands/sensor.go
index ac75660..144b4af 100644
--- a/cli/commands/sensor.go
+++ b/cli/commands/sensor.go
@@ -20,13 +20,13 @@ package commands
 
 import (
 	"fmt"
-	"github.com/apache/brooklyn-client/api/entity_sensors"
-	"github.com/apache/brooklyn-client/command_metadata"
-	"github.com/apache/brooklyn-client/error_handler"
-	"github.com/apache/brooklyn-client/models"
-	"github.com/apache/brooklyn-client/net"
-	"github.com/apache/brooklyn-client/scope"
-	"github.com/apache/brooklyn-client/terminal"
+	"github.com/apache/brooklyn-client/cli/api/entity_sensors"
+	"github.com/apache/brooklyn-client/cli/command_metadata"
+	"github.com/apache/brooklyn-client/cli/error_handler"
+	"github.com/apache/brooklyn-client/cli/models"
+	"github.com/apache/brooklyn-client/cli/net"
+	"github.com/apache/brooklyn-client/cli/scope"
+	"github.com/apache/brooklyn-client/cli/terminal"
 	"github.com/urfave/cli"
 	"sort"
 )

http://git-wip-us.apache.org/repos/asf/brooklyn-client/blob/7db8e15d/cli/commands/set.go
----------------------------------------------------------------------
diff --git a/cli/commands/set.go b/cli/commands/set.go
index ae1a594..80aa4cb 100644
--- a/cli/commands/set.go
+++ b/cli/commands/set.go
@@ -20,11 +20,11 @@ package commands
 
 import (
 	"fmt"
-	"github.com/apache/brooklyn-client/api/entity_config"
-	"github.com/apache/brooklyn-client/command_metadata"
-	"github.com/apache/brooklyn-client/error_handler"
-	"github.com/apache/brooklyn-client/net"
-	"github.com/apache/brooklyn-client/scope"
+	"github.com/apache/brooklyn-client/cli/api/entity_config"
+	"github.com/apache/brooklyn-client/cli/command_metadata"
+	"github.com/apache/brooklyn-client/cli/error_handler"
+	"github.com/apache/brooklyn-client/cli/net"
+	"github.com/apache/brooklyn-client/cli/scope"
 	"github.com/urfave/cli"
 )
 

http://git-wip-us.apache.org/repos/asf/brooklyn-client/blob/7db8e15d/cli/commands/spec.go
----------------------------------------------------------------------
diff --git a/cli/commands/spec.go b/cli/commands/spec.go
index 06819b9..ddedbb3 100644
--- a/cli/commands/spec.go
+++ b/cli/commands/spec.go
@@ -20,11 +20,11 @@ package commands
 
 import (
 	"fmt"
-	"github.com/apache/brooklyn-client/api/entities"
-	"github.com/apache/brooklyn-client/command_metadata"
-	"github.com/apache/brooklyn-client/error_handler"
-	"github.com/apache/brooklyn-client/net"
-	"github.com/apache/brooklyn-client/scope"
+	"github.com/apache/brooklyn-client/cli/api/entities"
+	"github.com/apache/brooklyn-client/cli/command_metadata"
+	"github.com/apache/brooklyn-client/cli/error_handler"
+	"github.com/apache/brooklyn-client/cli/net"
+	"github.com/apache/brooklyn-client/cli/scope"
 	"github.com/urfave/cli"
 )
 

http://git-wip-us.apache.org/repos/asf/brooklyn-client/blob/7db8e15d/cli/commands/start-policy.go
----------------------------------------------------------------------
diff --git a/cli/commands/start-policy.go b/cli/commands/start-policy.go
index 68dbec7..c7a6d09 100644
--- a/cli/commands/start-policy.go
+++ b/cli/commands/start-policy.go
@@ -20,11 +20,11 @@ package commands
 
 import (
 	"fmt"
-	"github.com/apache/brooklyn-client/api/entity_policies"
-	"github.com/apache/brooklyn-client/command_metadata"
-	"github.com/apache/brooklyn-client/error_handler"
-	"github.com/apache/brooklyn-client/net"
-	"github.com/apache/brooklyn-client/scope"
+	"github.com/apache/brooklyn-client/cli/api/entity_policies"
+	"github.com/apache/brooklyn-client/cli/command_metadata"
+	"github.com/apache/brooklyn-client/cli/error_handler"
+	"github.com/apache/brooklyn-client/cli/net"
+	"github.com/apache/brooklyn-client/cli/scope"
 	"github.com/urfave/cli"
 )
 

http://git-wip-us.apache.org/repos/asf/brooklyn-client/blob/7db8e15d/cli/commands/stop-policy.go
----------------------------------------------------------------------
diff --git a/cli/commands/stop-policy.go b/cli/commands/stop-policy.go
index 2700802..7738d39 100644
--- a/cli/commands/stop-policy.go
+++ b/cli/commands/stop-policy.go
@@ -20,11 +20,11 @@ package commands
 
 import (
 	"fmt"
-	"github.com/apache/brooklyn-client/api/entity_policies"
-	"github.com/apache/brooklyn-client/command_metadata"
-	"github.com/apache/brooklyn-client/error_handler"
-	"github.com/apache/brooklyn-client/net"
-	"github.com/apache/brooklyn-client/scope"
+	"github.com/apache/brooklyn-client/cli/api/entity_policies"
+	"github.com/apache/brooklyn-client/cli/command_metadata"
+	"github.com/apache/brooklyn-client/cli/error_handler"
+	"github.com/apache/brooklyn-client/cli/net"
+	"github.com/apache/brooklyn-client/cli/scope"
 	"github.com/urfave/cli"
 )
 

http://git-wip-us.apache.org/repos/asf/brooklyn-client/blob/7db8e15d/cli/commands/tree.go
----------------------------------------------------------------------
diff --git a/cli/commands/tree.go b/cli/commands/tree.go
index 5665997..e2f9535 100644
--- a/cli/commands/tree.go
+++ b/cli/commands/tree.go
@@ -20,12 +20,12 @@ package commands
 
 import (
 	"fmt"
-	"github.com/apache/brooklyn-client/api/application"
-	"github.com/apache/brooklyn-client/command_metadata"
-	"github.com/apache/brooklyn-client/error_handler"
-	"github.com/apache/brooklyn-client/models"
-	"github.com/apache/brooklyn-client/net"
-	"github.com/apache/brooklyn-client/scope"
+	"github.com/apache/brooklyn-client/cli/api/application"
+	"github.com/apache/brooklyn-client/cli/command_metadata"
+	"github.com/apache/brooklyn-client/cli/error_handler"
+	"github.com/apache/brooklyn-client/cli/models"
+	"github.com/apache/brooklyn-client/cli/net"
+	"github.com/apache/brooklyn-client/cli/scope"
 	"github.com/urfave/cli"
 )
 

http://git-wip-us.apache.org/repos/asf/brooklyn-client/blob/7db8e15d/cli/commands/version.go
----------------------------------------------------------------------
diff --git a/cli/commands/version.go b/cli/commands/version.go
index 39de4b6..6cbdf1d 100644
--- a/cli/commands/version.go
+++ b/cli/commands/version.go
@@ -20,11 +20,11 @@ package commands
 
 import (
 	"fmt"
-	"github.com/apache/brooklyn-client/api/version"
-	"github.com/apache/brooklyn-client/command_metadata"
-	"github.com/apache/brooklyn-client/error_handler"
-	"github.com/apache/brooklyn-client/net"
-	"github.com/apache/brooklyn-client/scope"
+	"github.com/apache/brooklyn-client/cli/api/version"
+	"github.com/apache/brooklyn-client/cli/command_metadata"
+	"github.com/apache/brooklyn-client/cli/error_handler"
+	"github.com/apache/brooklyn-client/cli/net"
+	"github.com/apache/brooklyn-client/cli/scope"
 	"github.com/urfave/cli"
 )
 

http://git-wip-us.apache.org/repos/asf/brooklyn-client/blob/7db8e15d/cli/io/config.go
----------------------------------------------------------------------
diff --git a/cli/io/config.go b/cli/io/config.go
index ea9ca01..12d2803 100644
--- a/cli/io/config.go
+++ b/cli/io/config.go
@@ -23,7 +23,7 @@ import (
 	"os"
 	"path/filepath"
 
-	"github.com/apache/brooklyn-client/error_handler"
+	"github.com/apache/brooklyn-client/cli/error_handler"
 )
 
 type Config struct {

http://git-wip-us.apache.org/repos/asf/brooklyn-client/blob/7db8e15d/cli/release/build.sh
----------------------------------------------------------------------
diff --git a/cli/release/build.sh b/cli/release/build.sh
index dfee050..6f91ed4 100755
--- a/cli/release/build.sh
+++ b/cli/release/build.sh
@@ -23,8 +23,7 @@
 OSVALUES="darwin freebsd linux netbsd openbsd windows"
 ARCHVALUES="386 amd64"
 BRNAME="br"
-GOPACKAGE="github.com/apache/brooklyn-client/${BRNAME}"
-PROJECT="github.com/apache/brooklyn-client"
+PROJECT="github.com/apache/brooklyn-client/cli"
 CLI_PACKAGE="${PROJECT}/${BRNAME}"
 GOBIN=go
 GLIDE=glide


Mime
View raw message