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, 9 insertions, 9 deletions

diff --git a/test/executables/puppetbin.rb b/test/executables/puppetbin.rb
index 1752848a8..80ac8c4e7 100755
--- a/test/executables/puppetbin.rb
+++ b/test/executables/puppetbin.rb
@@ -3,7 +3,7 @@
 $:.unshift("../lib").unshift("../../lib") if __FILE__ =~ /\.rb$/
 
 require 'puppet'
-require 'puppet/server'
+require 'puppet/network/server'
 require 'puppet/sslcertificates'
 require 'puppettest'
 
diff --git a/test/executables/puppetca.rb b/test/executables/puppetca.rb
index 92633c01b..028950762 100755
--- a/test/executables/puppetca.rb
+++ b/test/executables/puppetca.rb
@@ -3,7 +3,7 @@
 $:.unshift("../lib").unshift("../../lib") if __FILE__ =~ /\.rb$/
 
 require 'puppet'
-require 'puppet/server'
+require 'puppet/network/server'
 require 'puppet/sslcertificates'
 require 'puppettest'
 
@@ -16,7 +16,7 @@ class TestPuppetCA < Test::Unit::TestCase
     end
     
     def mkca
-        Puppet::Server::CA.new()
+        Puppet::Network::Server::CA.new()
     end
     
     def mkcert(hostname)
diff --git a/test/executables/puppetd.rb b/test/executables/puppetd.rb
index 9ae94b7c0..f8cb89ff6 100755
--- a/test/executables/puppetd.rb
+++ b/test/executables/puppetd.rb
@@ -3,7 +3,7 @@
 $:.unshift("../lib").unshift("../../lib") if __FILE__ =~ /\.rb$/
 
 require 'puppet'
-require 'puppet/server'
+require 'puppet/network/server'
 require 'puppettest'
 require 'socket'
 require 'facter'
@@ -15,7 +15,7 @@ class TestPuppetDExe < Test::Unit::TestCase
         file = startmasterd
 
         # create the client
-        client = Puppet::Client::MasterClient.new(:Server => "localhost", :Port => @@port)
+        client = Puppet::Network::Client::MasterClient.new(:Server => "localhost", :Port => @@port)
 
         # make a new fqdn
         fqdn = client.fqdn.sub(/^\w+\./, "testing.")
diff --git a/test/executables/puppetmasterd.rb b/test/executables/puppetmasterd.rb
index 6fc98137b..4563a0216 100755
--- a/test/executables/puppetmasterd.rb
+++ b/test/executables/puppetmasterd.rb
@@ -3,7 +3,7 @@
 $:.unshift("../lib").unshift("../../lib") if __FILE__ =~ /\.rb$/
 
 require 'puppet'
-require 'puppet/server'
+require 'puppet/network/server'
 require 'puppet/daemon'
 require 'puppettest'
 require 'socket'
@@ -35,7 +35,7 @@ class TestPuppetMasterD < Test::Unit::TestCase
 
         client = nil
         assert_nothing_raised() {
-            client = Puppet::Client::StatusClient.new(
+            client = Puppet::Network::Client::StatusClient.new(
                 :Server => "localhost",
                 :Port => @@port
             )
@@ -65,7 +65,7 @@ class TestPuppetMasterD < Test::Unit::TestCase
 
         # this client shoulduse the same certs
         assert_nothing_raised() {
-            client = Puppet::Client::MasterClient.new(
+            client = Puppet::Network::Client::MasterClient.new(
                 :Server => "localhost",
                 :Port => @@port
             )
diff --git a/test/executables/puppetmodule.rb b/test/executables/puppetmodule.rb
index c70f92fe9..83a20ec30 100755
--- a/test/executables/puppetmodule.rb
+++ b/test/executables/puppetmodule.rb
@@ -3,7 +3,7 @@
 $:.unshift("../lib").unshift("../../lib") if __FILE__ =~ /\.rb$/
 
 require 'puppet'
-require 'puppet/server'
+require 'puppet/network/server'
 require 'puppet/sslcertificates'
 require 'puppettest'