Moving all of the client and server code into a single network/ directory. In other words, more code structure cleanup.

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

5 files changed, 18 insertions, 18 deletions

diff --git a/bin/puppet b/bin/puppet
index 609a6e2e4..492c7f88b 100755
--- a/bin/puppet
+++ b/bin/puppet
@@ -60,8 +60,8 @@
 # Licensed under the GNU Public License
 
 require 'puppet'
-require 'puppet/server'
-require 'puppet/client'
+require 'puppet/network/server'
+require 'puppet/network/client'
 require 'getoptlong'
 
 options = [
@@ -179,8 +179,8 @@ if loadclasses
 end
 
 begin
-    server = Puppet::Server::Master.new(master)
-    client = Puppet::Client::MasterClient.new(
+    server = Puppet::Network::Server::Master.new(master)
+    client = Puppet::Network::Client::MasterClient.new(
         :Master => server,
         :Cache => false
     )
diff --git a/bin/puppetd b/bin/puppetd
index 62973260b..afb30b55b 100755
--- a/bin/puppetd
+++ b/bin/puppetd
@@ -155,8 +155,8 @@ trap(:INT) do
 end
 
 require 'puppet'
-require 'puppet/server'
-require 'puppet/client'
+require 'puppet/network/server'
+require 'puppet/network/client'
 require 'getoptlong'
 
 options = [
@@ -205,7 +205,7 @@ begin
             when "--disable"
                 options[:disable] = true
             when "--serve"
-                if klass = Puppet::Server::Handler.handler(arg)
+                if klass = Puppet::Network::Server::Handler.handler(arg)
                     options[:serve][klass.name] = klass
                 end
             when "--enable"
@@ -305,7 +305,7 @@ end
 
 # We need tomake the client either way, we just don't start it
 # if --no-client is set.
-client = Puppet::Client::MasterClient.new(args)
+client = Puppet::Network::Client::MasterClient.new(args)
 if options[:enable]
     client.enable
 elsif options[:disable]
@@ -327,7 +327,7 @@ end
 unless client.readcert
     # If we don't already have the certificate, then create a client to
     # request one.
-    caclient = Puppet::Client::CA.new(args)
+    caclient = Puppet::Network::Client::CA.new(args)
     if options[:waitforcert] > 0
         begin
             while ! caclient.requestcert do
@@ -387,7 +387,7 @@ if Puppet[:listen] and ! options[:onetime]
     args[:Port] = Puppet[:puppetport]
 
     begin
-        server = Puppet::Server.new(args)
+        server = Puppet::Network::Server.new(args)
     rescue => detail
         $stderr.puts detail
         puts detail.backtrace
diff --git a/bin/puppetdoc b/bin/puppetdoc
index c248b25f0..8da37b35f 100755
--- a/bin/puppetdoc
+++ b/bin/puppetdoc
@@ -265,7 +265,7 @@ path.
 end
 
 def self.reports
-    puts Puppet::Server::Report.reportdocs
+    puts Puppet::Network::Server::Report.reportdocs
 end
 
 def self.functions
diff --git a/bin/puppetmasterd b/bin/puppetmasterd
index ecacf480a..83e2b08ed 100755
--- a/bin/puppetmasterd
+++ b/bin/puppetmasterd
@@ -83,7 +83,7 @@ end
 
 require 'getoptlong'
 require 'puppet'
-require 'puppet/server'
+require 'puppet/network/server'
 
 options = [
 	[ "--daemonize", "-D",			GetoptLong::NO_ARGUMENT ],
@@ -230,7 +230,7 @@ end
 
 if Puppet[:parseonly]
     begin
-        Puppet::Server::Master.new(master)
+        Puppet::Network::Server::Master.new(master)
     rescue => detail
         if Puppet[:trace]
             puts detail.backtrace
@@ -256,8 +256,8 @@ args[:Handlers] = handlers
 
 begin
     # use the default, um, everything
-    #server = Puppet::Server.new(:CA => ca)
-    server = Puppet::Server.new(args)
+    #server = Puppet::Network::Server.new(:CA => ca)
+    server = Puppet::Network::Server.new(args)
 rescue => detail
     if Puppet[:trace]
         puts detail.backtrace
diff --git a/bin/puppetrun b/bin/puppetrun
index 8df673eea..a432fe01d 100755
--- a/bin/puppetrun
+++ b/bin/puppetrun
@@ -137,8 +137,8 @@ rescue LoadError
     $stderr.puts "Failed to load ruby LDAP library. LDAP functionality will not be available"
 end
 require 'puppet'
-require 'puppet/server'
-require 'puppet/client'
+require 'puppet/network/server'
+require 'puppet/network/client'
 require 'getoptlong'
 
 
@@ -340,7 +340,7 @@ while go
                 $stderr.print "Could not contact %s\n" % host
                 next
             end
-            client = Puppet::Client::Runner.new(
+            client = Puppet::Network::Client::Runner.new(
                 :Server => host,
                 :Port => Puppet[:puppetport]
             )