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

diff --git a/test/language/ast.rb b/test/language/ast.rb
index c3af6739e..2fdba555c 100755
--- a/test/language/ast.rb
+++ b/test/language/ast.rb
@@ -6,7 +6,7 @@ require 'puppet'
 require 'puppet/rails'
 require 'puppet/parser/interpreter'
 require 'puppet/parser/parser'
-require 'puppet/client'
+require 'puppet/network/client'
 require 'puppettest'
 require 'puppettest/resourcetesting'
 require 'puppettest/parsertesting'
diff --git a/test/language/functions.rb b/test/language/functions.rb
index edb7a3004..f565d0ded 100755
--- a/test/language/functions.rb
+++ b/test/language/functions.rb
@@ -5,7 +5,7 @@ $:.unshift("../lib").unshift("../../lib") if __FILE__ =~ /\.rb$/
 require 'puppet'
 require 'puppet/parser/interpreter'
 require 'puppet/parser/parser'
-require 'puppet/client'
+require 'puppet/network/client'
 require 'puppettest'
 require 'puppettest/resourcetesting'
 
diff --git a/test/language/interpreter.rb b/test/language/interpreter.rb
index ab3b97210..b74b15734 100755
--- a/test/language/interpreter.rb
+++ b/test/language/interpreter.rb
@@ -7,7 +7,7 @@ require 'facter'
 require 'puppet'
 require 'puppet/parser/interpreter'
 require 'puppet/parser/parser'
-require 'puppet/client'
+require 'puppet/network/client'
 require 'puppet/rails'
 require 'puppettest'
 require 'puppettest/resourcetesting'
diff --git a/test/language/scope.rb b/test/language/scope.rb
index 05c5e524e..80f838c59 100755
--- a/test/language/scope.rb
+++ b/test/language/scope.rb
@@ -5,7 +5,7 @@ $:.unshift("../lib").unshift("../../lib") if __FILE__ =~ /\.rb$/
 require 'puppet'
 require 'puppet/parser/interpreter'
 require 'puppet/parser/parser'
-require 'puppet/client'
+require 'puppet/network/client'
 require 'puppettest'
 require 'puppettest/parsertesting'
 require 'puppettest/resourcetesting'
diff --git a/test/language/snippets.rb b/test/language/snippets.rb
index 2438083b0..cdea03d3b 100755
--- a/test/language/snippets.rb
+++ b/test/language/snippets.rb
@@ -5,8 +5,8 @@ $:.unshift("../lib").unshift("../../lib") if __FILE__ =~ /\.rb$/
 require 'puppet'
 require 'puppet/parser/interpreter'
 require 'puppet/parser/parser'
-require 'puppet/client'
-require 'puppet/server'
+require 'puppet/network/client'
+require 'puppet/network/server'
 require 'puppettest'
 
 class TestSnippets < Test::Unit::TestCase
@@ -41,7 +41,7 @@ class TestSnippets < Test::Unit::TestCase
         args = {
             :Listen => false
         }
-        Puppet::Client.new(args)
+        Puppet::Network::Client.new(args)
     end
 
     def ast2scope(ast)
@@ -492,11 +492,11 @@ class TestSnippets < Test::Unit::TestCase
             testname = ("test_" + mname).intern
             self.send(:define_method, testname) {
                 # first parse the file
-                server = Puppet::Server::Master.new(
+                server = Puppet::Network::Server::Master.new(
                     :Manifest => snippet(file),
                     :Local => true
                 )
-                client = Puppet::Client::MasterClient.new(
+                client = Puppet::Network::Client::MasterClient.new(
                     :Master => server,
                     :Cache => false
                 )
@@ -506,7 +506,7 @@ class TestSnippets < Test::Unit::TestCase
                     client.getconfig()
                 }
 
-                client = Puppet::Client::MasterClient.new(
+                client = Puppet::Network::Client::MasterClient.new(
                     :Master => server,
                     :Cache => false
                 )