Removed new features, too early to commit

2 files changed, 0 insertions, 150 deletions

diff --git a/src/lib/Server/Admin/Examples.py b/src/lib/Server/Admin/Examples.py
deleted file mode 100644
index 3335c5e10..000000000
--- a/src/lib/Server/Admin/Examples.py
+++ /dev/null
@@ -1,71 +0,0 @@
-import dulwich
-import time
-import tarfile
-from subprocess import Popen
-import Bcfg2.Server.Admin
-from Bcfg2.Server.Plugins.Metadata import MetadataConsistencyError
-
-class Examples(Bcfg2.Server.Admin.MetadataCore):
-    __shorthelp__ = "Pulls in the data from the Bcfg2 sample repository"
-    __longhelp__ = (__shorthelp__ + "\n\nbcfg2-admin examples pull\n"
-                                    "\n\nbcfg2-admin examples update\n"
-                                    "bcfg2-admin examples backup")
-    __usage__ = ("bcfg2-admin examples [options] [add|del|update|list] [attr=val]")
-
-    def __init__(self, configfile):
-        Bcfg2.Server.Admin.MetadataCore.__init__(self, configfile,
-                                                 self.__usage__)
-
-    def __call__(self, args):
-        Bcfg2.Server.Admin.MetadataCore.__call__(self, args)
-
-
-        Bcfg2.Server.Plugin.Plugin.__init__(self, core, datastore)
-        Bcfg2.Server.Plugin.Version.__init__(self)
-        self.core = core
-        self.datastore = datastore
-
-        if len(args) == 0:
-            self.errExit("No argument specified.\n"
-                         "Please see bcfg2-admin examples help for usage.")
-
-        if args[0] == 'pull':
-            try:
-            # FIXME: Repo URL is hardcoded for now
-                Popen(['git', 'clone', 'https://github.com/solj/bcfg2-repo.git', datastore])
-            except MetadataConsistencyError:
-                print "Error in pulling examples."
-                raise SystemExit(1)
-
-#fatal: destination path 'bcfg2-test' already exists and is not an empty directory.
-
-        elif args[0] == 'backup':
-            try:
-                self.metadata.add_group(args[1], attr_d)
-            except MetadataConsistencyError:
-                print "Error in adding group"
-                raise SystemExit(1)
-
-
-        elif args[0] == 'backup':
-            try:
-                self.metadata.add_group(args[1], attr_d)
-            except MetadataConsistencyError:
-                print "Error in adding group"
-                raise SystemExit(1)
-
-        else:
-            print "No command specified"
-            raise SystemExit(1)
-
-    def repobackup():
-        """Make a backup of the existing files in the Bcfg2 repo directory."""
-        if os.path.isdir(datastore):
-            print 'Backup in progress...'
-            target = time.strftime('%Y%m%d%H%M%S')
-            
-            
-             out = tarfile.open(filename, w.gz)            
-        else:
-            logger.error("%s doesn't exist." % datastore)
-            #raise Bcfg2.Server.Plugin.PluginInitError
diff --git a/src/lib/Server/Admin/Web.py b/src/lib/Server/Admin/Web.py
deleted file mode 100644
index 5ad14f2b9..000000000
--- a/src/lib/Server/Admin/Web.py
+++ /dev/null
@@ -1,79 +0,0 @@
-import os
-import sys
-import BaseHTTPServer
-import SimpleHTTPServer
-import daemon
-import Bcfg2.Server.Admin
-import Bcfg2.Options
-
-# For debugging output only
-import logging
-logger = logging.getLogger('Bcfg2.Server.Admin.Web')
-
-class Web(Bcfg2.Server.Admin.Mode):
-    __shorthelp__ = "A simple webserver to display the content of the Bcfg2 repos."
-    __longhelp__ = (__shorthelp__ + "\n\nbcfg2-admin web start\n"
-                                    "\n\nbcfg2-admin web stop")
-    __usage__ = ("bcfg2-admin web [start|stop]")
-
-    def __init__(self, configfile):
-        Bcfg2.Server.Admin.Mode.__init__(self, configfile)
-
-    def __call__(self, args):
-        Bcfg2.Server.Admin.Mode.__call__(self, args)
-        opts = {'repo': Bcfg2.Options.SERVER_REPOSITORY}
-        setup = Bcfg2.Options.OptionParser(opts)
-        setup.parse(sys.argv[1:])
-        repo = setup['repo']
-
-        if len(args) == 0 or args[0] == '-h':
-            print(self.__usage__)
-            raise SystemExit(0)
-
-        if len(args) == 0:
-            self.errExit("No argument specified.\n"
-                         "Please see bcfg2-admin web help for usage.")
-
-        if args[0] in ['start', 'up']:
-            # Change directory to the Bcfg2 repo
-            if not os.path.exists(repo):
-                #print "Path '%s' doesn't exisit" % repo
-                logger.error("%s doesn't exist" % repo)
-            else:
-                os.chdir(repo)
-                self.start_web()
-
-        elif args[0] in ['stop', 'down']:
-            self.stop_web()
-
-        else:
-            print "No command specified"
-            raise SystemExit(1)
-
-    # The web server part with hardcoded port number
-    def start_web(self, port=6788):
-        """Starts the webserver for directory listing of the Bcfg2 repo."""
-        try:
-            server_class  = BaseHTTPServer.HTTPServer
-            handler_class = SimpleHTTPServer.SimpleHTTPRequestHandler
-            server_address = ('', port)
-            server = server_class(server_address, handler_class)
-            #server.serve_forever()
-            # Make the context manager for becoming a daemon process
-            daemon_context = daemon.DaemonContext()
-            daemon_context.files_preserve = [server.fileno()]
-
-            # Become a daemon process
-            with daemon_context:
-                server.serve_forever()
-        except:
-            logger.error("Failed to start webserver")
-            #raise Bcfg2.Server.Admin.AdminInitError
-
-    def stop_web(self):
-        """Stops the webserver."""
-#        self.shutdown = 1
-        self.shutdown()
- #       self.stopped = True
-#        self.serve_forever()
-