Renaming "pelement" to "resource". The old name is a holdover from before we had settled on "resource" as a term.

git-svn-id: https://reductivelabs.com/svn/puppet/trunk@2137 980ebf18-57e1-0310-9a29-db15c13687c0

6 files changed, 24 insertions, 24 deletions

diff --git a/lib/puppet/client.rb b/lib/puppet/client.rb
index 4f2718b7d..de3b3eaec 100644
--- a/lib/puppet/client.rb
+++ b/lib/puppet/client.rb
@@ -187,7 +187,7 @@ module Puppet
         require 'puppet/client/runner'
         require 'puppet/client/status'
         require 'puppet/client/reporter'
-        require 'puppet/client/pelement'
+        require 'puppet/client/resource'
     end
 end
 
diff --git a/lib/puppet/client/pelement.rb b/lib/puppet/client/resource.rb
index 087b61ee4..6081b2b66 100644
--- a/lib/puppet/client/pelement.rb
+++ b/lib/puppet/client/resource.rb
@@ -1,7 +1,7 @@
-class Puppet::Client::PElement < Puppet::Client
-    @drivername = :PElementServer
+class Puppet::Client::Resource < Puppet::Client
+    @drivername = :ResourceServer
 
-    @handler = Puppet::Server::PElement
+    @handler = Puppet::Server::Resource
 
     def apply(bucket)
 
@@ -11,7 +11,7 @@ class Puppet::Client::PElement < Puppet::Client
             tmp.push bucket
             bucket = tmp
             bucket.name = Facter["hostname"].value
-            bucket.type = "pelement"
+            bucket.type = "resource"
         when Puppet::TransBucket
             # nothing
         else
@@ -42,8 +42,8 @@ class Puppet::Client::PElement < Puppet::Client
     end
 
     def initialize(hash = {})
-        if hash.include?(:PElementServer)
-            unless hash[:PElementServer].is_a?(Puppet::Server::PElement)
+        if hash.include?(:ResourceServer)
+            unless hash[:ResourceServer].is_a?(Puppet::Server::Resource)
                 raise Puppet::DevError, "Must pass an actual PElement server object"
             end
         end
diff --git a/lib/puppet/server.rb b/lib/puppet/server.rb
index 3720f25c8..aabc87b50 100644
--- a/lib/puppet/server.rb
+++ b/lib/puppet/server.rb
@@ -212,7 +212,7 @@ require 'puppet/server/master'
 require 'puppet/server/ca'
 require 'puppet/server/fileserver'
 require 'puppet/server/filebucket'
-require 'puppet/server/pelement'
+require 'puppet/server/resource'
 require 'puppet/server/runner'
 require 'puppet/server/logger'
 require 'puppet/server/report'
diff --git a/lib/puppet/server/pelement.rb b/lib/puppet/server/resource.rb
index c97a9d4cc..12a188a18 100755
--- a/lib/puppet/server/pelement.rb
+++ b/lib/puppet/server/resource.rb
@@ -4,10 +4,10 @@ require 'puppet/server'
 module Puppet
 
 # Serve Puppet elements.  Useful for querying, copying, and, um, other stuff.
-class Server::PElement < Server::Handler
+class Server::Resource < Server::Handler
     attr_accessor :local
 
-    @interface = XMLRPC::Service::Interface.new("pelementserver") { |iface|
+    @interface = XMLRPC::Service::Interface.new("resource") { |iface|
         iface.add_method("string apply(string, string)")
         iface.add_method("string describe(string, string, array, array)")
         iface.add_method("string list(string, array, string)")
@@ -183,7 +183,7 @@ class Server::PElement < Server::Handler
     end  
 
     def to_s
-        "pelementserver"
+        "resource"
     end
 end
 end
diff --git a/test/client/pelement.rb b/test/client/resource.rb
index 8c8e76963..51fe7ba7e 100755
--- a/test/client/pelement.rb
+++ b/test/client/resource.rb
@@ -3,19 +3,19 @@
 $:.unshift("../lib").unshift("../../lib") if __FILE__ =~ /\.rb$/
 
 require 'puppet'
-require 'puppet/client/pelement'
+require 'puppet/client/resource'
 require 'puppet/server'
 require 'puppettest'
 
 # $Id$
 
-class TestPElementClient < Test::Unit::TestCase
+class TestResourceClient < Test::Unit::TestCase
     include PuppetTest::ServerTest
 
-    def mkpelementserver
+    def mkresourceserver
         handlers = {
             :CA => {}, # so that certs autogenerate
-            :PElement => {},
+            :Resource => {},
         }
 
         return mkserver(handlers)
@@ -24,19 +24,19 @@ class TestPElementClient < Test::Unit::TestCase
     def mkclient
         client = nil
         assert_nothing_raised {
-            client = Puppet::Client::PElement.new(:Server => "localhost",
+            client = Puppet::Client::Resource.new(:Server => "localhost",
                 :Port => @@port)
         }
 
         return client
     end
 
-    def test_pelements
+    def test_resources
         file = tempfile()
         text = "yayness\n"
         File.open(file, "w") { |f| f.print text }
 
-        mkpelementserver()
+        mkresourceserver()
 
         client = mkclient()
 
diff --git a/test/server/pelement.rb b/test/server/resource.rb
index c86dadc11..218b65f74 100755
--- a/test/server/pelement.rb
+++ b/test/server/resource.rb
@@ -3,12 +3,12 @@
 $:.unshift("../lib").unshift("../../lib") if __FILE__ =~ /\.rb$/
 
 require 'puppet'
-require 'puppet/server/pelement'
+require 'puppet/server/resource'
 require 'puppettest'
 require 'base64'
 require 'cgi'
 
-class TestPElementServer < Test::Unit::TestCase
+class TestResourceServer < Test::Unit::TestCase
     include PuppetTest::ServerTest
 
     def verify_described(type, described)
@@ -39,7 +39,7 @@ class TestPElementServer < Test::Unit::TestCase
         server = nil
 
         assert_nothing_raised do
-            server = Puppet::Server::PElement.new()
+            server = Puppet::Server::Resource.new()
         end
 
         # The first run we create the file on the copy, the second run
@@ -119,7 +119,7 @@ class TestPElementServer < Test::Unit::TestCase
         server = nil
 
         assert_nothing_raised do
-            server = Puppet::Server::PElement.new()
+            server = Puppet::Server::Resource.new()
         end
 
         [   [nil],
@@ -177,7 +177,7 @@ class TestPElementServer < Test::Unit::TestCase
         #Puppet.err Puppet::Type::ParsedType::Port.path
         server = nil
         assert_nothing_raised do
-            server = Puppet::Server::PElement.new()
+            server = Puppet::Server::Resource.new()
         end
 
         require 'etc'
@@ -239,7 +239,7 @@ class TestPElementServer < Test::Unit::TestCase
     def test_apply
         server = nil
         assert_nothing_raised do
-            server = Puppet::Server::PElement.new()
+            server = Puppet::Server::Resource.new()
         end
 
         file = tempfile()