Okay, last file moves for the night. The test code has been moved to match the lib directory, and I have moved a couple of things into network/ instead of network/server, since they did not belong as much.

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

20 files changed, 24 insertions, 23 deletions

diff --git a/lib/puppet/network/server/authconfig.rb b/lib/puppet/network/authconfig.rb
index e4d31d8d8..bf21fb5ce 100644
--- a/lib/puppet/network/server/authconfig.rb
+++ b/lib/puppet/network/authconfig.rb
@@ -1,5 +1,5 @@
 require 'puppet/util/loadedfile'
-require 'puppet/network/server/rights'
+require 'puppet/network/rights'
 
 module Puppet
     class ConfigurationError < Puppet::Error; end
diff --git a/lib/puppet/network/server/authstore.rb b/lib/puppet/network/authstore.rb
index 51ce93d46..51ce93d46 100755
--- a/lib/puppet/network/server/authstore.rb
+++ b/lib/puppet/network/authstore.rb
diff --git a/lib/puppet/network/server/rights.rb b/lib/puppet/network/rights.rb
index 11da3b705..970a7aacf 100755
--- a/lib/puppet/network/server/rights.rb
+++ b/lib/puppet/network/rights.rb
@@ -1,5 +1,5 @@
 require 'ipaddr'
-require 'puppet/network/server/authstore'
+require 'puppet/network/authstore'
 
 # Define a set of rights and who has access to them.
 class Puppet::Network::Rights < Hash
diff --git a/lib/puppet/network/server.rb b/lib/puppet/network/server.rb
index e9205d48b..3f19a88ff 100644
--- a/lib/puppet/network/server.rb
+++ b/lib/puppet/network/server.rb
@@ -191,8 +191,9 @@ module Puppet
     end
 end
 
-require 'puppet/network/server/authstore'
-require 'puppet/network/server/authconfig'
+require 'puppet/network/authstore'
+require 'puppet/network/authconfig'
+require 'puppet/network/rights'
 require 'puppet/network/server/servlet'
 require 'puppet/network/server/master'
 require 'puppet/network/server/ca'
diff --git a/test/client/client.rb b/test/network/client/client.rb
index f9964f096..7fd2afb71 100755
--- a/test/client/client.rb
+++ b/test/network/client/client.rb
@@ -1,6 +1,6 @@
 #!/usr/bin/env ruby
 
-$:.unshift("../lib").unshift("../../lib") if __FILE__ =~ /\.rb$/
+$:.unshift("../../lib") if __FILE__ =~ /\.rb$/
 
 require 'puppettest'
 require 'puppet/network/client'
diff --git a/test/client/master.rb b/test/network/client/master.rb
index b03a3ffd0..de94cd93a 100755
--- a/test/client/master.rb
+++ b/test/network/client/master.rb
@@ -1,6 +1,6 @@
 #!/usr/bin/env ruby
 
-$:.unshift("../lib").unshift("../../lib") if __FILE__ =~ /\.rb$/
+$:.unshift("../../lib") if __FILE__ =~ /\.rb$/
 
 require 'puppettest'
 
diff --git a/test/client/networkclient.rb b/test/network/client/networkclient.rb
index f7920169f..957a1ceda 100755
--- a/test/client/networkclient.rb
+++ b/test/network/client/networkclient.rb
@@ -1,6 +1,6 @@
 #!/usr/bin/env ruby
 
-$:.unshift("../lib").unshift("../../lib") if __FILE__ =~ /\.rb$/
+$:.unshift("../../lib") if __FILE__ =~ /\.rb$/
 
 require 'puppettest'
 require 'puppet/network/client'
diff --git a/test/client/resource.rb b/test/network/client/resource.rb
index 357a0afbe..fcbb367ca 100755
--- a/test/client/resource.rb
+++ b/test/network/client/resource.rb
@@ -1,6 +1,6 @@
 #!/usr/bin/env ruby
 
-$:.unshift("../lib").unshift("../../lib") if __FILE__ =~ /\.rb$/
+$:.unshift("../../lib") if __FILE__ =~ /\.rb$/
 
 require 'puppettest'
 require 'puppet/network/client/resource'
diff --git a/test/server/authconfig.rb b/test/network/server/authconfig.rb
index cc7d6cdfd..c48282973 100755
--- a/test/server/authconfig.rb
+++ b/test/network/server/authconfig.rb
@@ -1,10 +1,10 @@
 #!/usr/bin/env ruby
 
-$:.unshift("../lib").unshift("../../lib") if __FILE__ =~ /\.rb$/
+$:.unshift("../../lib") if __FILE__ =~ /\.rb$/
 
 require 'puppettest'
 
-require 'puppet/network/server/authconfig'
+require 'puppet/network/authconfig'
 
 class TestAuthConfig < Test::Unit::TestCase
 	include PuppetTest
diff --git a/test/server/authstore.rb b/test/network/server/authstore.rb
index d9df9a441..0dc804079 100755
--- a/test/server/authstore.rb
+++ b/test/network/server/authstore.rb
@@ -1,10 +1,10 @@
 #!/usr/bin/env ruby
 
-$:.unshift("../lib").unshift("../../lib") if __FILE__ =~ /\.rb$/
+$:.unshift("../../lib") if __FILE__ =~ /\.rb$/
 
 require 'puppettest'
 
-require 'puppet/network/server/authstore'
+require 'puppet/network/authstore'
 
 class TestAuthStore < Test::Unit::TestCase
 	include PuppetTest
diff --git a/test/server/bucket.rb b/test/network/server/bucket.rb
index 938db748e..c76e35be2 100755
--- a/test/server/bucket.rb
+++ b/test/network/server/bucket.rb
@@ -1,6 +1,6 @@
 #!/usr/bin/env ruby
 
-$:.unshift("../lib").unshift("../../lib") if __FILE__ =~ /\.rb$/
+$:.unshift("../../lib") if __FILE__ =~ /\.rb$/
 
 require 'puppettest'
 require 'base64'
diff --git a/test/server/ca.rb b/test/network/server/ca.rb
index e9cc89cde..31b4994a5 100755
--- a/test/server/ca.rb
+++ b/test/network/server/ca.rb
@@ -1,6 +1,6 @@
 #!/usr/bin/env ruby
 
-$:.unshift("../lib").unshift("../../lib") if __FILE__ =~ /\.rb$/
+$:.unshift("../../lib") if __FILE__ =~ /\.rb$/
 
 require 'puppet/network/server/ca'
 require 'puppet/sslcertificates'
diff --git a/test/server/fileserver.rb b/test/network/server/fileserver.rb
index 25c72a5fb..4186f0e3b 100755
--- a/test/server/fileserver.rb
+++ b/test/network/server/fileserver.rb
@@ -1,6 +1,6 @@
 #!/usr/bin/env ruby
 
-$:.unshift("../lib").unshift("../../lib") if __FILE__ =~ /\.rb$/
+$:.unshift("../../lib") if __FILE__ =~ /\.rb$/
 
 require 'puppettest'
 require 'puppet/network/server/fileserver'
diff --git a/test/server/logger.rb b/test/network/server/logger.rb
index 83e834365..7298062ca 100755
--- a/test/server/logger.rb
+++ b/test/network/server/logger.rb
@@ -1,6 +1,6 @@
 #!/usr/bin/env ruby
 
-$:.unshift("../lib").unshift("../../lib") if __FILE__ =~ /\.rb$/
+$:.unshift("../../lib") if __FILE__ =~ /\.rb$/
 
 require 'puppettest'
 require 'base64'
diff --git a/test/server/master.rb b/test/network/server/master.rb
index ba52908d3..797e75e3d 100755
--- a/test/server/master.rb
+++ b/test/network/server/master.rb
@@ -1,6 +1,6 @@
 #!/usr/bin/env ruby
 
-$:.unshift("../lib").unshift("../../lib") if __FILE__ =~ /\.rb$/
+$:.unshift("../../lib") if __FILE__ =~ /\.rb$/
 
 require 'puppettest'
 require 'puppet/network/server'
diff --git a/test/server/report.rb b/test/network/server/report.rb
index bf652feaf..f61d9f6d4 100755
--- a/test/server/report.rb
+++ b/test/network/server/report.rb
@@ -1,6 +1,6 @@
 #!/usr/bin/env ruby
 
-$:.unshift("../lib").unshift("../../lib") if __FILE__ =~ /\.rb$/
+$:.unshift("../../lib") if __FILE__ =~ /\.rb$/
 
 require 'puppettest'
 require 'puppet/network/server/report'
diff --git a/test/server/resource.rb b/test/network/server/resource.rb
index 8e6581083..579bc609a 100755
--- a/test/server/resource.rb
+++ b/test/network/server/resource.rb
@@ -1,6 +1,6 @@
 #!/usr/bin/env ruby
 
-$:.unshift("../lib").unshift("../../lib") if __FILE__ =~ /\.rb$/
+$:.unshift("../../lib") if __FILE__ =~ /\.rb$/
 
 require 'puppettest'
 require 'puppet/network/server/resource'
diff --git a/test/server/rights.rb b/test/network/server/rights.rb
index e5c65babe..cee0fb9aa 100755
--- a/test/server/rights.rb
+++ b/test/network/server/rights.rb
@@ -1,9 +1,9 @@
 #!/usr/bin/env ruby
 
-$:.unshift("../lib").unshift("../../lib") if __FILE__ =~ /\.rb$/
+$:.unshift("../../lib") if __FILE__ =~ /\.rb$/
 
 require 'puppettest'
-require 'puppet/network/server/rights'
+require 'puppet/network/rights'
 
 class TestRights < Test::Unit::TestCase
 	include PuppetTest
diff --git a/test/server/runner.rb b/test/network/server/runner.rb
index 9d4cf41be..ce782298a 100755
--- a/test/server/runner.rb
+++ b/test/network/server/runner.rb
@@ -1,6 +1,6 @@
 #!/usr/bin/env ruby
 
-$:.unshift("../lib").unshift("../../lib") if __FILE__ =~ /\.rb$/
+$:.unshift("../../lib") if __FILE__ =~ /\.rb$/
 
 require 'puppet/network/server/runner'
 require 'puppettest'
diff --git a/test/server/server.rb b/test/network/server/server.rb
index 4e79e00b7..3e5e7b717 100755
--- a/test/server/server.rb
+++ b/test/network/server/server.rb
@@ -1,6 +1,6 @@
 #!/usr/bin/env ruby
 
-$:.unshift("../lib").unshift("../../lib") if __FILE__ =~ /\.rb$/
+$:.unshift("../../lib") if __FILE__ =~ /\.rb$/
 
 require 'puppettest'
 require 'puppet/network/server'