minor cleanup

diff --git a/.gitignore b/.gitignore
index 9acfb22..7e5b62e 100644 (file)
--- a/.gitignore
+++ b/.gitignore
@@ -15,3 +15,4 @@ sfa/client/*.version
 *.pkey
 *.cert
 *.cred
+.DS_Store

diff --git a/CHANGES-0.2-to-0.8.txt b/CHANGES-0.2-to-0.8.txt
deleted file mode 100644 (file)
index 0064632..0000000
--- a/CHANGES-0.2-to-0.8.txt
+++ /dev/null
@@ -1,56 +0,0 @@
-====================
-changes between 0.2 and 0.8 from a user's perspective
-====================
-
---------------------
-- 3 packages named
--- sfa (libraries)
--- sfa-plc (server side)
--- sfa-client (client-side)
-
--------------------- new names for commands
-gimport.py          ->   sfa-import-plc.py
-plc.py              ->   sfa-server.py
-geni-config-tty      ->          sfa-config-tty
-
--------------------- new names for config files & miscell
-/etc/geni                      -> /etc/sfa
-/etc/geni/configSfi.sh         ->  /etc/sfa/sfa_config
-/etc/init.d/geniwrapper                -> /etc/init.d/sfa
-
-/etc/sfa/config_sfa, 
-/etc/sfa/config_sfi, 
-/etc/sfa/aggregates.xml, 
-/etc/sfa/registries.xml
-       are now preserved across rpm updates
-
-
-====================
-changes between 0.2 and 0.8 from a devel's perspective
-====================
-
-cmdline/ has moved to 
-           sfa/client
-first-class objects involved in the server side 
-           sfa/server
-plc-dependent code has moved to
-           sfa/plc
-basic identification/authentication objects (up to credentials) have moved to
-           sfa/trust
-           (this also holds in trusted_roots the CA certs of PLC-PLE)
-code for the methods have remained in
-            sfa/methods
-
-init.d instscript is now in
-            sfa/init.d
-
-config files and utilities are in
-            config/ 
-           (should this move under sfa ?)
-
--------------------- deprecated
-gacks/
-gui/
-dummy/
-
-some apparently test-related stuff formerly in cmdline hace moved to tests/client

diff --git a/sfa.spec b/sfa.spec
index 95e56a3..4f10df4 100644 (file)
--- a/sfa.spec
+++ b/sfa.spec
@@ -46,13 +46,13 @@ Requires: python-dateutil
 #%endif
 
 %package cm
-Summary: the SFA wrapper around MyPLC NodeManager
+Summary: the SFA layer around MyPLC NodeManager
 Group: Applications/System
 Requires: sfa
 Requires: pyOpenSSL >= 0.6
 
 %package plc
-Summary: the SFA wrapper arounf MyPLC
+Summary: the SFA layer around MyPLC
 Group: Applications/System
 Requires: sfa
 Requires: python-psycopg2

diff --git a/sfa/server/sfa-server.py b/sfa/server/sfa-server.py
index c46dfe6..fadb1d3 100755 (executable)
--- a/sfa/server/sfa-server.py
+++ b/sfa/server/sfa-server.py
@@ -1,13 +1,12 @@
 #!/usr/bin/python
 #
-# SFA PLC Wrapper
+# PlanetLab SFA implementation
 #
-# This wrapper implements the SFA Registry and Slice Interfaces on PLC.
+# This implements the SFA Registry and Slice Interfaces on PLC.
 # Depending on command line options, it starts some combination of a
 # Registry, an Aggregate Manager, and a Slice Manager.
 #
-# There are several items that need to be done before starting the wrapper
-# server.
+# There are several items that need to be done before starting the servers.
 #
 # NOTE:  Many configuration settings, including the PLC maintenance account
 # credentials, URI of the PLCAPI, and PLC DB URI and admin credentials are initialized

diff --git a/sfa/util/parameter.py b/sfa/util/parameter.py
index 00d9319..7e38419 100644 (file)
--- a/sfa/util/parameter.py
+++ b/sfa/util/parameter.py
@@ -4,11 +4,6 @@
 # Mark Huang <mlhuang@cs.princeton.edu>
 # Copyright (C) 2006 The Trustees of Princeton University
 #
-# $Id$
-#
-
-### $Id$
-### $URL$
 
 from types import *
 from sfa.util.faults import *

diff --git a/tests/client/README b/tests/client/README
deleted file mode 100644 (file)
index 6d4ae3d..0000000
--- a/tests/client/README
+++ /dev/null
@@ -1 +0,0 @@
-these files used to be in geniwrapper/cmdline