Begin reorganizing content for packaging

TODO

@@ -29,4 +29,5 @@ KeyError: ''
 -confetty to do right thing with respect to status updates when run right on a
  console.  It currently clutters up the screen with data that would land in
  a titlebar
--audit log did not show confetty activity for starting console
+-audit log did not show confetty activity for starting console
+-read exclusive and full exclusive console access modes

client/bin/confetty

@@ -59,8 +59,8 @@ path = os.path.dirname(os.path.realpath(__file__))
 path = os.path.realpath(os.path.join(path, '..'))
 sys.path.append(path)
 
-import confluent.common.tlvdata as tlvdata
-import confluent.common.client as client
+import confluent.tlvdata as tlvdata
+import confluent.client as client
 
 conserversequence = '\x05c'  # ctrl-e, c
 

client/bin/nodepower

@@ -22,7 +22,7 @@ path = os.path.dirname(os.path.realpath(__file__))
 path = os.path.realpath(os.path.join(path, '..'))
 sys.path.append(path)
 
-import confluent.common.client as client
+import confluent.client as client
 
 
 node = sys.argv[1]

client/confluent/client.py

@@ -19,7 +19,7 @@ import errno
 import os
 import socket
 import ssl
-import confluent.common.tlvdata as tlvdata
+import confluent.tlvdata as tlvdata
 
 SO_PASSCRED = 16
 

client/requirements.txt

@@ -0,0 +1 @@
+confluent_common>=0.1

confluent_server/bin/confluent

@@ -1,3 +1,4 @@
+#!/usr/bin/env python
 # vim: tabstop=4 shiftwidth=4 softtabstop=4
 
 # Copyright 2014 IBM Corporation
@@ -18,7 +19,9 @@ import sys
 import os
 path = os.path.dirname(os.path.realpath(__file__))
 path = os.path.realpath(os.path.join(path, '..'))
-sys.path.append(path)
+if not path.startswith('/usr'):
+    # if installed into system path, do not muck with things
+    sys.path.append(path)
 from confluent import main
 
 #import cProfile

confluent_server/confluent/sockapi.py

@@ -30,7 +30,7 @@ import eventlet.green.ssl as ssl
 import eventlet
 
 import confluent.auth as auth
-import confluent.common.tlvdata as tlvdata
+import confluent.tlvdata as tlvdata
 import confluent.consoleserver as consoleserver
 import confluent.config.configmanager as configmanager
 import confluent.exceptions as exc