Move services to subpackage.

cmd/influxd/run/config.go

@@ -13,15 +13,15 @@ import (
 	"time"
 
 	"github.com/BurntSushi/toml"
-	"github.com/influxdb/influxdb/admin"
 	"github.com/influxdb/influxdb/cluster"
-	"github.com/influxdb/influxdb/collectd"
-	"github.com/influxdb/influxdb/graphite"
-	"github.com/influxdb/influxdb/httpd"
 	"github.com/influxdb/influxdb/meta"
-	"github.com/influxdb/influxdb/meta/continuous_querier"
-	"github.com/influxdb/influxdb/monitor"
-	"github.com/influxdb/influxdb/opentsdb"
+	"github.com/influxdb/influxdb/services/admin"
+	"github.com/influxdb/influxdb/services/collectd"
+	"github.com/influxdb/influxdb/services/continuous_querier"
+	"github.com/influxdb/influxdb/services/graphite"
+	"github.com/influxdb/influxdb/services/httpd"
+	"github.com/influxdb/influxdb/services/monitor"
+	"github.com/influxdb/influxdb/services/opentsdb"
 	"github.com/influxdb/influxdb/tsdb"
 )
 

cmd/influxd/run/server.go

@@ -4,13 +4,13 @@ import (
 	"fmt"
 	"net"
 
-	"github.com/influxdb/influxdb/admin"
 	"github.com/influxdb/influxdb/cluster"
-	"github.com/influxdb/influxdb/collectd"
-	"github.com/influxdb/influxdb/graphite"
-	"github.com/influxdb/influxdb/httpd"
 	"github.com/influxdb/influxdb/meta"
-	"github.com/influxdb/influxdb/opentsdb"
+	"github.com/influxdb/influxdb/services/admin"
+	"github.com/influxdb/influxdb/services/collectd"
+	"github.com/influxdb/influxdb/services/graphite"
+	"github.com/influxdb/influxdb/services/httpd"
+	"github.com/influxdb/influxdb/services/opentsdb"
 	"github.com/influxdb/influxdb/tsdb"
 )
 

services/admin/config_test.go

@@ -4,7 +4,7 @@ import (
 	"testing"
 
 	"github.com/BurntSushi/toml"
-	"github.com/influxdb/influxdb/admin"
+	"github.com/influxdb/influxdb/services/admin"
 )
 
 func TestConfig_Parse(t *testing.T) {

services/admin/service_test.go

@@ -5,7 +5,7 @@ import (
 	"net/http"
 	"testing"
 
-	"github.com/influxdb/influxdb/admin"
+	"github.com/influxdb/influxdb/services/admin"
 )
 
 // Ensure service can serve the root index page of the admin.

services/collectd/collectd_test.go

@@ -7,7 +7,7 @@ import (
 	"testing"
 	"time"
 
-	"github.com/influxdb/influxdb/collectd"
+	"github.com/influxdb/influxdb/services/collectd"
 	"github.com/influxdb/influxdb/tsdb"
 	"github.com/kimor79/gollectd"
 )

services/collectd/config_test.go

@@ -4,7 +4,7 @@ import (
 	"testing"
 
 	"github.com/BurntSushi/toml"
-	"github.com/influxdb/influxdb/collectd"
+	"github.com/influxdb/influxdb/services/collectd"
 )
 
 func TestConfig_Parse(t *testing.T) {

services/continuous_querier/config_test.go

@@ -5,7 +5,7 @@ import (
 	"time"
 
 	"github.com/BurntSushi/toml"
-	"github.com/influxdb/influxdb/meta/continuous_querier"
+	"github.com/influxdb/influxdb/services/continuous_querier"
 )
 
 func TestConfig_Parse(t *testing.T) {

services/graphite/config_test.go

@@ -4,7 +4,7 @@ import (
 	"testing"
 
 	"github.com/BurntSushi/toml"
-	"github.com/influxdb/influxdb/httpd"
+	"github.com/influxdb/influxdb/services/httpd"
 )
 
 func TestConfig_Parse(t *testing.T) {

services/graphite/graphite_test.go

@@ -5,7 +5,7 @@ import (
 	"testing"
 	"time"
 
-	"github.com/influxdb/influxdb/graphite"
+	"github.com/influxdb/influxdb/services/graphite"
 )
 
 func Test_DecodeNameAndTags(t *testing.T) {

services/httpd/config_test.go

@@ -4,7 +4,7 @@ import (
 	"testing"
 
 	"github.com/BurntSushi/toml"
-	"github.com/influxdb/influxdb/httpd"
+	"github.com/influxdb/influxdb/services/httpd"
 )
 
 func TestConfig_Parse(t *testing.T) {

services/httpd/handler_test.go

@@ -12,9 +12,9 @@ import (
 	"time"
 
 	"github.com/influxdb/influxdb/client"
-	"github.com/influxdb/influxdb/httpd"
 	"github.com/influxdb/influxdb/influxql"
 	"github.com/influxdb/influxdb/meta"
+	"github.com/influxdb/influxdb/services/httpd"
 	"github.com/influxdb/influxdb/tsdb"
 )
 

services/opentsdb/config_test.go

@@ -4,7 +4,7 @@ import (
 	"testing"
 
 	"github.com/BurntSushi/toml"
-	"github.com/influxdb/influxdb/opentsdb"
+	"github.com/influxdb/influxdb/services/opentsdb"
 )
 
 func TestConfig_Parse(t *testing.T) {