archive util directory

diff --git a/util/__init__.py b/archive/util/__init__.py
similarity index 100%
rename from util/__init__.py
rename to archive/util/__init__.py

diff --git a/util/cert.py b/archive/util/cert.py
similarity index 100%
rename from util/cert.py
rename to archive/util/cert.py

diff --git a/util/config.py b/archive/util/config.py
similarity index 100%
rename from util/config.py
rename to archive/util/config.py

diff --git a/util/credential.py b/archive/util/credential.py
similarity index 100%
rename from util/credential.py
rename to archive/util/credential.py

diff --git a/util/excep.py b/archive/util/excep.py
similarity index 100%
rename from util/excep.py
rename to archive/util/excep.py

diff --git a/util/geni_config b/archive/util/geni_config
similarity index 100%
rename from util/geni_config
rename to archive/util/geni_config

diff --git a/util/geniclient.py b/archive/util/geniclient.py
similarity index 100%
rename from util/geniclient.py
rename to archive/util/geniclient.py

diff --git a/util/geniserver.py b/archive/util/geniserver.py
similarity index 100%
rename from util/geniserver.py
rename to archive/util/geniserver.py

diff --git a/util/genitable.py b/archive/util/genitable.py
similarity index 100%
rename from util/genitable.py
rename to archive/util/genitable.py

diff --git a/util/geniticket.py b/archive/util/geniticket.py
similarity index 100%
rename from util/geniticket.py
rename to archive/util/geniticket.py

diff --git a/util/gid.py b/archive/util/gid.py
similarity index 100%
rename from util/gid.py
rename to archive/util/gid.py

diff --git a/util/hierarchy.py b/archive/util/hierarchy.py
similarity index 100%
rename from util/hierarchy.py
rename to archive/util/hierarchy.py

diff --git a/util/misc.py b/archive/util/misc.py
similarity index 100%
rename from util/misc.py
rename to archive/util/misc.py

diff --git a/util/record.py b/archive/util/record.py
similarity index 100%
rename from util/record.py
rename to archive/util/record.py

diff --git a/util/remoteshell.py b/archive/util/remoteshell.py
similarity index 100%
rename from util/remoteshell.py
rename to archive/util/remoteshell.py

diff --git a/util/report.py b/archive/util/report.py
similarity index 100%
rename from util/report.py
rename to archive/util/report.py

diff --git a/util/rights.py b/archive/util/rights.py
similarity index 100%
rename from util/rights.py
rename to archive/util/rights.py

diff --git a/util/rspec.py b/archive/util/rspec.py
similarity index 100%
rename from util/rspec.py
rename to archive/util/rspec.py

diff --git a/util/trustedroot.py b/archive/util/trustedroot.py
similarity index 100%
rename from util/trustedroot.py
rename to archive/util/trustedroot.py

diff --git a/util/util.py b/archive/util/util.py
similarity index 100%
rename from util/util.py
rename to archive/util/util.py

diff --git a/geni/aggregate.py b/geni/aggregate.py
index 8bf4be2..87746ce 100644 (file)
--- a/geni/aggregate.py
+++ b/geni/aggregate.py
@@ -39,7 +39,7 @@ class Aggregate(GeniServer):
         GeniServer.__init__(self, ip, port, key_file, cert_file)
         self.conf = Config(config)
         basedir = self.conf.GENI_BASE_DIR + os.sep
-        server_basedir = basedir + os.sep + "plc" + os.sep
+        server_basedir = basedir + os.sep + "geni" + os.sep
         self.hrn = self.conf.GENI_INTERFACE_HRN
         self.nodes_file = os.sep.join([server_basedir, 'components', self.hrn + '.comp'])
         self.whitelist_file = os.sep.join([server_basedir, 'policy', 'whitelist'])