Renaming applications, mostly removing 'puppet'

Signed-off-by: Luke Kanies <luke@madstop.com>

7 files changed, 7 insertions, 7 deletions

diff --git a/lib/puppet/application/puppetd.rb b/lib/puppet/application/agent.rb
index ed2c450ee..ec6fc8088 100644
--- a/lib/puppet/application/puppetd.rb
+++ b/lib/puppet/application/agent.rb
@@ -5,7 +5,7 @@ require 'puppet/daemon'
 require 'puppet/configurer'
 require 'puppet/network/client'
 
-Puppet::Application.new(:puppetd) do
+Puppet::Application.new(:agent) do
 
     should_parse_config
 
diff --git a/lib/puppet/application/puppetca.rb b/lib/puppet/application/ca.rb
index 7362f2a18..ab7f607ee 100644
--- a/lib/puppet/application/puppetca.rb
+++ b/lib/puppet/application/ca.rb
@@ -2,7 +2,7 @@ require 'puppet'
 require 'puppet/application'
 require 'puppet/ssl/certificate_authority'
 
-Puppet::Application.new(:puppetca) do
+Puppet::Application.new(:ca) do
 
     should_parse_config
 
diff --git a/lib/puppet/application/puppetdoc.rb b/lib/puppet/application/doc.rb
index e0033277f..32f9ba75c 100644
--- a/lib/puppet/application/puppetdoc.rb
+++ b/lib/puppet/application/doc.rb
@@ -7,7 +7,7 @@ require 'puppet/util/rdoc'
 $tab = "    "
 Reference = Puppet::Util::Reference
 
-Puppet::Application.new(:puppetdoc) do
+Puppet::Application.new(:doc) do
 
     should_not_parse_config
 
diff --git a/lib/puppet/application/puppetqd.rb b/lib/puppet/application/queue.rb
index c9c62c068..13fb3e107 100644
--- a/lib/puppet/application/puppetqd.rb
+++ b/lib/puppet/application/queue.rb
@@ -5,7 +5,7 @@ require 'puppet/resource/catalog'
 require 'puppet/indirector/catalog/queue'
 require 'puppet/util'
 
-Puppet::Application.new(:puppetqd) do
+Puppet::Application.new(:queue) do
     extend Puppet::Util
     should_parse_config
 
diff --git a/lib/puppet/application/ralsh.rb b/lib/puppet/application/resource.rb
index b9f7a587c..f914a1b53 100644
--- a/lib/puppet/application/ralsh.rb
+++ b/lib/puppet/application/resource.rb
@@ -2,7 +2,7 @@ require 'puppet'
 require 'puppet/application'
 require 'facter'
 
-Puppet::Application.new(:ralsh) do
+Puppet::Application.new(:resource) do
 
     should_not_parse_config
 
diff --git a/lib/puppet/application/puppetrun.rb b/lib/puppet/application/run.rb
index 4febcf524..f08fade8d 100644
--- a/lib/puppet/application/puppetrun.rb
+++ b/lib/puppet/application/run.rb
@@ -4,7 +4,7 @@ require 'puppet/application'
 Puppet.warning "RubyGems not installed" unless Puppet.features.rubygems?
 Puppet.warning "Failed to load ruby LDAP library. LDAP functionality will not be available" unless Puppet.features.ldap?
 
-Puppet::Application.new(:puppetrun) do
+Puppet::Application.new(:run) do
 
     should_not_parse_config
 
diff --git a/lib/puppet/application/puppetmasterd.rb b/lib/puppet/application/server.rb
index 9b0bf30ce..57d29e0ee 100644
--- a/lib/puppet/application/puppetmasterd.rb
+++ b/lib/puppet/application/server.rb
@@ -4,7 +4,7 @@ require 'puppet/daemon'
 require 'puppet/network/server'
 require 'puppet/network/http/rack' if Puppet.features.rack?
 
-Puppet::Application.new(:puppetmasterd) do
+Puppet::Application.new(:server) do
 
     should_parse_config