Moved files around to simplify deployment

18 files changed, 14 insertions, 16 deletions

diff --git a/src/common/__init__.py b/src/collagen/__init__.py
index e69de29..e69de29 100644
--- a/src/common/__init__.py
+++ b/src/collagen/__init__.py
diff --git a/src/matchbox/db/main/__init__.py b/src/collagen/common/__init__.py
index e69de29..e69de29 100644
--- a/src/matchbox/db/main/__init__.py
+++ b/src/collagen/common/__init__.py
diff --git a/src/common/exceptions.py b/src/collagen/common/exceptions.py
index 8933bf4..8933bf4 100644
--- a/src/common/exceptions.py
+++ b/src/collagen/common/exceptions.py
diff --git a/src/matchbox/__init__.py b/src/collagen/matchbox/__init__.py
index 35eb1a2..27a7c7a 100644
--- a/src/matchbox/__init__.py
+++ b/src/collagen/matchbox/__init__.py
@@ -1,6 +1,6 @@
 import socket
 import thread
-import protocol
+
 try:
     import cPickle as pickle
 except ImportError:
@@ -12,9 +12,9 @@ import time
 import portage
 import random
 
-import matchbox.db
-import matchbox.db.main.models as dbm
-from matchbox.db import DjangoDB
+import collagen.protocol as protocol
+import db.main.models as dbm
+from db import DjangoDB
 
 class MatchboxServer(object):
     """
diff --git a/src/matchbox/db/__init__.py b/src/collagen/matchbox/db/__init__.py
index be52239..6dca0b1 100644
--- a/src/matchbox/db/__init__.py
+++ b/src/collagen/matchbox/db/__init__.py
@@ -2,7 +2,7 @@ import sys
 import os
 import settings as config
 from django.conf import settings
-os.environ["DJANGO_SETTINGS_MODULE"]="matchbox.db.settings"
+os.environ["DJANGO_SETTINGS_MODULE"]="db_config"
 
 
 
diff --git a/src/collagen/matchbox/db/main/__init__.py b/src/collagen/matchbox/db/main/__init__.py
new file mode 100644
index 0000000..e69de29
--- /dev/null
+++ b/src/collagen/matchbox/db/main/__init__.py
diff --git a/src/matchbox/db/main/initial_data.json b/src/collagen/matchbox/db/main/initial_data.json
index 613b7a5..613b7a5 100644
--- a/src/matchbox/db/main/initial_data.json
+++ b/src/collagen/matchbox/db/main/initial_data.json
diff --git a/src/matchbox/db/main/models.py b/src/collagen/matchbox/db/main/models.py
index 9263470..9263470 100644
--- a/src/matchbox/db/main/models.py
+++ b/src/collagen/matchbox/db/main/models.py
diff --git a/src/matchbox/db/manage.py b/src/collagen/matchbox/db/manage.py
index 5e78ea9..5e78ea9 100644
--- a/src/matchbox/db/manage.py
+++ b/src/collagen/matchbox/db/manage.py
diff --git a/src/protocol/__init__.py b/src/collagen/protocol/__init__.py
index 6841b88..6841b88 100644
--- a/src/protocol/__init__.py
+++ b/src/collagen/protocol/__init__.py
diff --git a/src/tinderbox/__init__.py b/src/collagen/tinderbox/__init__.py
index 641e12d..c5d235d 100644
--- a/src/tinderbox/__init__.py
+++ b/src/collagen/tinderbox/__init__.py
@@ -1,5 +1,5 @@
 import sys
-import protocol
+
 import socket
 try:
     import cPickle as pickle
@@ -14,6 +14,7 @@ import re
 import string
 from string import atoi
 from traceback import print_exc, format_exc
+from logger import log, init_logging
 
 import portage
 try:
@@ -21,11 +22,11 @@ try:
 except ImportError:
     import portage.sets as psets
 
+import collagen.protocol as protocol
+from collagen.util import WritableObject, flatten_deps
+from collagen.common.exceptions import ChrootPreparationException
+import tinderbox_config as config
 
-from util import WritableObject, flatten_deps
-from common.exceptions import ChrootPreparationException
-import config
-from logger import log, init_logging
 
 
 
diff --git a/src/tinderbox/logger.py b/src/collagen/tinderbox/logger.py
index a90f578..a90f578 100644
--- a/src/tinderbox/logger.py
+++ b/src/collagen/tinderbox/logger.py
diff --git a/src/tinderbox/test/TinderboxTest.py b/src/collagen/tinderbox/test/TinderboxTest.py
index d06b8c1..d06b8c1 100644
--- a/src/tinderbox/test/TinderboxTest.py
+++ b/src/collagen/tinderbox/test/TinderboxTest.py
diff --git a/src/util/__init__.py b/src/collagen/util/__init__.py
index e57d4f4..e57d4f4 100644
--- a/src/util/__init__.py
+++ b/src/collagen/util/__init__.py
diff --git a/src/matchbox/db/settings.py b/src/db_config.py
index d0397e6..627ce46 100644
--- a/src/matchbox/db/settings.py
+++ b/src/db_config.py
@@ -5,4 +5,4 @@ DATABASE_USER = 'username'             # Not used with sqlite3.
 DATABASE_PASSWORD = 'password'         # Not used with sqlite3.
 DATABASE_HOST = ''             # Set to empty string for localhost. Not used with sqlite3.
 DATABASE_PORT = ''             # Set to empty string for default. Not used with sqlite3.
-INSTALLED_APPS = ('matchbox.db.main')
+INSTALLED_APPS = ('collagen.matchbox.db.main')
diff --git a/src/matchbox.py b/src/matchbox.py
index 8bd6da5..dbafaef 100644
--- a/src/matchbox.py
+++ b/src/matchbox.py
@@ -1,4 +1,4 @@
-from matchbox import MatchboxServer as ms
+from collagen.matchbox import MatchboxServer as ms
 
 s = ms('localhost',10000)
 
diff --git a/src/tinderbox.py b/src/tinderbox.py
index 29c82c7..83d138a 100644
--- a/src/tinderbox.py
+++ b/src/tinderbox.py
@@ -1,7 +1,4 @@
-import protocol
-import socket
-import pickle
-from tinderbox import Tinderbox, Package
+from collagen.tinderbox import Tinderbox, Package
 
 tb = Tinderbox()
 tb.start_tinderbox()
diff --git a/src/tinderbox/config.py b/src/tinderbox_config.py
index d6c1d48..d6c1d48 100644
--- a/src/tinderbox/config.py
+++ b/src/tinderbox_config.py