From 82bf5fc79e732f6da62fcbeca799116ee4311ca3 Mon Sep 17 00:00:00 2001
From: Mitchell Hashimoto <mitchell.hashimoto@gmail.com>
Date: Tue, 10 Dec 2013 13:59:38 -0800
Subject: [PATCH] plugin/*: update to latest API

---
 plugin/builder-amazon-chroot/main.go         | 7 ++++++-
 plugin/builder-amazon-ebs/main.go            | 7 ++++++-
 plugin/builder-amazon-instance/main.go       | 7 ++++++-
 plugin/builder-digitalocean/main.go          | 7 ++++++-
 plugin/builder-docker/main.go                | 7 ++++++-
 plugin/builder-openstack/main.go             | 7 ++++++-
 plugin/builder-qemu/main.go                  | 7 ++++++-
 plugin/builder-virtualbox/main.go            | 7 ++++++-
 plugin/builder-vmware/main.go                | 7 ++++++-
 plugin/command-build/main.go                 | 7 ++++++-
 plugin/command-fix/main.go                   | 7 ++++++-
 plugin/command-inspect/main.go               | 7 ++++++-
 plugin/command-validate/main.go              | 7 ++++++-
 plugin/post-processor-vagrant/main.go        | 7 ++++++-
 plugin/post-processor-vsphere/main.go        | 7 ++++++-
 plugin/provisioner-ansible-local/main.go     | 7 ++++++-
 plugin/provisioner-chef-solo/main.go         | 7 ++++++-
 plugin/provisioner-file/main.go              | 7 ++++++-
 plugin/provisioner-puppet-masterless/main.go | 7 ++++++-
 plugin/provisioner-salt-masterless/main.go   | 7 ++++++-
 plugin/provisioner-shell/main.go             | 7 ++++++-
 21 files changed, 126 insertions(+), 21 deletions(-)

diff --git a/plugin/builder-amazon-chroot/main.go b/plugin/builder-amazon-chroot/main.go
index b7d71df44..13fa295f7 100644
--- a/plugin/builder-amazon-chroot/main.go
+++ b/plugin/builder-amazon-chroot/main.go
@@ -6,5 +6,10 @@ import (
 )
 
 func main() {
-	plugin.ServeBuilder(new(chroot.Builder))
+	server, err := plugin.Server()
+	if err != nil {
+		panic(err)
+	}
+	server.RegisterBuilder(new(chroot.Builder))
+	server.Serve()
 }
diff --git a/plugin/builder-amazon-ebs/main.go b/plugin/builder-amazon-ebs/main.go
index f0598d749..ba6a6e380 100644
--- a/plugin/builder-amazon-ebs/main.go
+++ b/plugin/builder-amazon-ebs/main.go
@@ -6,5 +6,10 @@ import (
 )
 
 func main() {
-	plugin.ServeBuilder(new(ebs.Builder))
+	server, err := plugin.Server()
+	if err != nil {
+		panic(err)
+	}
+	server.RegisterBuilder(new(ebs.Builder))
+	server.Serve()
 }
diff --git a/plugin/builder-amazon-instance/main.go b/plugin/builder-amazon-instance/main.go
index fc1c66b40..e87654107 100644
--- a/plugin/builder-amazon-instance/main.go
+++ b/plugin/builder-amazon-instance/main.go
@@ -6,5 +6,10 @@ import (
 )
 
 func main() {
-	plugin.ServeBuilder(new(instance.Builder))
+	server, err := plugin.Server()
+	if err != nil {
+		panic(err)
+	}
+	server.RegisterBuilder(new(instance.Builder))
+	server.Serve()
 }
diff --git a/plugin/builder-digitalocean/main.go b/plugin/builder-digitalocean/main.go
index be8d706f0..a41ed3d65 100644
--- a/plugin/builder-digitalocean/main.go
+++ b/plugin/builder-digitalocean/main.go
@@ -6,5 +6,10 @@ import (
 )
 
 func main() {
-	plugin.ServeBuilder(new(digitalocean.Builder))
+	server, err := plugin.Server()
+	if err != nil {
+		panic(err)
+	}
+	server.RegisterBuilder(new(digitalocean.Builder))
+	server.Serve()
 }
diff --git a/plugin/builder-docker/main.go b/plugin/builder-docker/main.go
index a5b69de0b..1ed06dd5e 100644
--- a/plugin/builder-docker/main.go
+++ b/plugin/builder-docker/main.go
@@ -6,5 +6,10 @@ import (
 )
 
 func main() {
-	plugin.ServeBuilder(new(docker.Builder))
+	server, err := plugin.Server()
+	if err != nil {
+		panic(err)
+	}
+	server.RegisterBuilder(new(docker.Builder))
+	server.Serve()
 }
diff --git a/plugin/builder-openstack/main.go b/plugin/builder-openstack/main.go
index 076011003..7753e04ff 100644
--- a/plugin/builder-openstack/main.go
+++ b/plugin/builder-openstack/main.go
@@ -6,5 +6,10 @@ import (
 )
 
 func main() {
-	plugin.ServeBuilder(new(openstack.Builder))
+	server, err := plugin.Server()
+	if err != nil {
+		panic(err)
+	}
+	server.RegisterBuilder(new(openstack.Builder))
+	server.Serve()
 }
diff --git a/plugin/builder-qemu/main.go b/plugin/builder-qemu/main.go
index 710742bad..b823ba501 100644
--- a/plugin/builder-qemu/main.go
+++ b/plugin/builder-qemu/main.go
@@ -6,5 +6,10 @@ import (
 )
 
 func main() {
-	plugin.ServeBuilder(new(qemu.Builder))
+	server, err := plugin.Server()
+	if err != nil {
+		panic(err)
+	}
+	server.RegisterBuilder(new(qemu.Builder))
+	server.Serve()
 }
diff --git a/plugin/builder-virtualbox/main.go b/plugin/builder-virtualbox/main.go
index 1428c5b1d..136b2698e 100644
--- a/plugin/builder-virtualbox/main.go
+++ b/plugin/builder-virtualbox/main.go
@@ -6,5 +6,10 @@ import (
 )
 
 func main() {
-	plugin.ServeBuilder(new(virtualbox.Builder))
+	server, err := plugin.Server()
+	if err != nil {
+		panic(err)
+	}
+	server.RegisterBuilder(new(virtualbox.Builder))
+	server.Serve()
 }
diff --git a/plugin/builder-vmware/main.go b/plugin/builder-vmware/main.go
index a449751b8..14a10cf5c 100644
--- a/plugin/builder-vmware/main.go
+++ b/plugin/builder-vmware/main.go
@@ -6,5 +6,10 @@ import (
 )
 
 func main() {
-	plugin.ServeBuilder(new(vmware.Builder))
+	server, err := plugin.Server()
+	if err != nil {
+		panic(err)
+	}
+	server.RegisterBuilder(new(vmware.Builder))
+	server.Serve()
 }
diff --git a/plugin/command-build/main.go b/plugin/command-build/main.go
index e6a4397fd..1285e1e7a 100644
--- a/plugin/command-build/main.go
+++ b/plugin/command-build/main.go
@@ -6,5 +6,10 @@ import (
 )
 
 func main() {
-	plugin.ServeCommand(new(build.Command))
+	server, err := plugin.Server()
+	if err != nil {
+		panic(err)
+	}
+	server.RegisterCommand(new(build.Command))
+	server.Serve()
 }
diff --git a/plugin/command-fix/main.go b/plugin/command-fix/main.go
index 8ae6d42a0..03677674d 100644
--- a/plugin/command-fix/main.go
+++ b/plugin/command-fix/main.go
@@ -6,5 +6,10 @@ import (
 )
 
 func main() {
-	plugin.ServeCommand(new(fix.Command))
+	server, err := plugin.Server()
+	if err != nil {
+		panic(err)
+	}
+	server.RegisterCommand(new(fix.Command))
+	server.Serve()
 }
diff --git a/plugin/command-inspect/main.go b/plugin/command-inspect/main.go
index 6d2d7d3d5..9aeedc34c 100644
--- a/plugin/command-inspect/main.go
+++ b/plugin/command-inspect/main.go
@@ -6,5 +6,10 @@ import (
 )
 
 func main() {
-	plugin.ServeCommand(new(inspect.Command))
+	server, err := plugin.Server()
+	if err != nil {
+		panic(err)
+	}
+	server.RegisterCommand(new(inspect.Command))
+	server.Serve()
 }
diff --git a/plugin/command-validate/main.go b/plugin/command-validate/main.go
index af093294e..1105ed75e 100644
--- a/plugin/command-validate/main.go
+++ b/plugin/command-validate/main.go
@@ -6,5 +6,10 @@ import (
 )
 
 func main() {
-	plugin.ServeCommand(new(validate.Command))
+	server, err := plugin.Server()
+	if err != nil {
+		panic(err)
+	}
+	server.RegisterCommand(new(validate.Command))
+	server.Serve()
 }
diff --git a/plugin/post-processor-vagrant/main.go b/plugin/post-processor-vagrant/main.go
index 0224d26d1..cf84e3ff1 100644
--- a/plugin/post-processor-vagrant/main.go
+++ b/plugin/post-processor-vagrant/main.go
@@ -6,5 +6,10 @@ import (
 )
 
 func main() {
-	plugin.ServePostProcessor(new(vagrant.PostProcessor))
+	server, err := plugin.Server()
+	if err != nil {
+		panic(err)
+	}
+	server.RegisterPostProcessor(new(vagrant.PostProcessor))
+	server.Serve()
 }
diff --git a/plugin/post-processor-vsphere/main.go b/plugin/post-processor-vsphere/main.go
index 22317ab5d..10e7a8d40 100644
--- a/plugin/post-processor-vsphere/main.go
+++ b/plugin/post-processor-vsphere/main.go
@@ -6,5 +6,10 @@ import (
 )
 
 func main() {
-	plugin.ServePostProcessor(new(vsphere.PostProcessor))
+	server, err := plugin.Server()
+	if err != nil {
+		panic(err)
+	}
+	server.RegisterPostProcessor(new(vsphere.PostProcessor))
+	server.Serve()
 }
diff --git a/plugin/provisioner-ansible-local/main.go b/plugin/provisioner-ansible-local/main.go
index 0caf0427f..5477b1b55 100644
--- a/plugin/provisioner-ansible-local/main.go
+++ b/plugin/provisioner-ansible-local/main.go
@@ -6,5 +6,10 @@ import (
 )
 
 func main() {
-	plugin.ServeProvisioner(new(ansiblelocal.Provisioner))
+	server, err := plugin.Server()
+	if err != nil {
+		panic(err)
+	}
+	server.RegisterProvisioner(new(ansiblelocal.Provisioner))
+	server.Serve()
 }
diff --git a/plugin/provisioner-chef-solo/main.go b/plugin/provisioner-chef-solo/main.go
index 4057f9925..e8a5bf11e 100644
--- a/plugin/provisioner-chef-solo/main.go
+++ b/plugin/provisioner-chef-solo/main.go
@@ -6,5 +6,10 @@ import (
 )
 
 func main() {
-	plugin.ServeProvisioner(new(chefsolo.Provisioner))
+	server, err := plugin.Server()
+	if err != nil {
+		panic(err)
+	}
+	server.RegisterProvisioner(new(chefsolo.Provisioner))
+	server.Serve()
 }
diff --git a/plugin/provisioner-file/main.go b/plugin/provisioner-file/main.go
index 1f5a63413..1b746e050 100644
--- a/plugin/provisioner-file/main.go
+++ b/plugin/provisioner-file/main.go
@@ -6,5 +6,10 @@ import (
 )
 
 func main() {
-	plugin.ServeProvisioner(new(file.Provisioner))
+	server, err := plugin.Server()
+	if err != nil {
+		panic(err)
+	}
+	server.RegisterProvisioner(new(file.Provisioner))
+	server.Serve()
 }
diff --git a/plugin/provisioner-puppet-masterless/main.go b/plugin/provisioner-puppet-masterless/main.go
index c510cbb78..45dba0a31 100644
--- a/plugin/provisioner-puppet-masterless/main.go
+++ b/plugin/provisioner-puppet-masterless/main.go
@@ -6,5 +6,10 @@ import (
 )
 
 func main() {
-	plugin.ServeProvisioner(new(puppetmasterless.Provisioner))
+	server, err := plugin.Server()
+	if err != nil {
+		panic(err)
+	}
+	server.RegisterProvisioner(new(puppetmasterless.Provisioner))
+	server.Serve()
 }
diff --git a/plugin/provisioner-salt-masterless/main.go b/plugin/provisioner-salt-masterless/main.go
index 53ccd771a..584c4657e 100644
--- a/plugin/provisioner-salt-masterless/main.go
+++ b/plugin/provisioner-salt-masterless/main.go
@@ -6,5 +6,10 @@ import (
 )
 
 func main() {
-	plugin.ServeProvisioner(new(saltmasterless.Provisioner))
+	server, err := plugin.Server()
+	if err != nil {
+		panic(err)
+	}
+	server.RegisterProvisioner(new(saltmasterless.Provisioner))
+	server.Serve()
 }
diff --git a/plugin/provisioner-shell/main.go b/plugin/provisioner-shell/main.go
index 07d18472e..03966b67b 100644
--- a/plugin/provisioner-shell/main.go
+++ b/plugin/provisioner-shell/main.go
@@ -6,5 +6,10 @@ import (
 )
 
 func main() {
-	plugin.ServeProvisioner(new(shell.Provisioner))
+	server, err := plugin.Server()
+	if err != nil {
+		panic(err)
+	}
+	server.RegisterProvisioner(new(shell.Provisioner))
+	server.Serve()
 }