Removed models from API.

diff --git a/pithos/api/admin.py b/pithos/api/admin.py
deleted file mode 100755 (executable)
index 1518109..0000000
--- a/pithos/api/admin.py
+++ /dev/null
@@ -1,10 +0,0 @@
-#\r
-# Copyright (c) 2011 Greek Research and Technology Network\r
-#\r
-\r
-from api.models import Container, Object, Metadata\r
-from django.contrib import admin\r
-\r
-admin.site.register(Container)\r
-admin.site.register(Object)\r
-admin.site.register(Metadata)
\ No newline at end of file

diff --git a/pithos/api/models.py b/pithos/api/models.py
index 3f69d7e..71a8362 100644 (file)
--- a/pithos/api/models.py
+++ b/pithos/api/models.py
@@ -1,33 +1,3 @@
-#\r
-# Copyright (c) 2011 Greek Research and Technology Network\r
-#\r
-\r
-from django.db import models\r
-\r
-class Container(models.Model):\r
-    account = models.CharField(max_length = 256)\r
-    name = models.CharField(max_length = 256)\r
-    date_created = models.DateTimeField(auto_now_add = True)\r
-    \r
-    def __unicode__(self):\r
-        return self.name\r
-\r
-class Object(models.Model):\r
-    container = models.ForeignKey(Container)\r
-    name = models.CharField(max_length = 1024)\r
-    length = models.IntegerField()\r
-    type = models.CharField(max_length = 256)\r
-    hash = models.CharField(max_length = 256)\r
-    data = models.FileField(upload_to = 'data', max_length = 256)\r
-    date_created = models.DateTimeField(auto_now_add = True)\r
-    date_modified = models.DateTimeField(auto_now = True)\r
-    \r
-    def __unicode__(self):\r
-        return self.name\r
-\r
-class Metadata(models.Model):\r
-    object = models.ForeignKey(Object)\r
-    name = models.CharField(max_length = 256)\r
-    value = models.CharField(max_length = 1024)\r
-    date_created = models.DateTimeField(auto_now_add = True)\r
-    date_modified = models.DateTimeField(auto_now = True)
\ No newline at end of file
+from django.db import models
+
+# Create your models here.

diff --git a/pithos/settings.py.dist b/pithos/settings.py.dist
index 5af9e3f..6c6d97c 100644 (file)
--- a/pithos/settings.py.dist
+++ b/pithos/settings.py.dist
@@ -100,7 +100,7 @@ INSTALLED_APPS = (
     'django.contrib.sessions',\r
     'django.contrib.sites',\r
     'django.contrib.messages',\r
-    'django.contrib.admin',\r
-    'django.contrib.admindocs',\r
+#    'django.contrib.admin',\r
+#    'django.contrib.admindocs',\r
     'api'\r
 )\r

diff --git a/pithos/urls.py b/pithos/urls.py
index ad40ed3..1a85f8a 100755 (executable)
--- a/pithos/urls.py
+++ b/pithos/urls.py
@@ -3,12 +3,7 @@
 #\r
 \r
 from django.conf.urls.defaults import *\r
-from django.contrib import admin\r
-\r
-admin.autodiscover()\r
 \r
 urlpatterns = patterns('',\r
-    (r'^v1/', include('pithos.api.urls')),\r
-    (r'^admin/doc/', include('django.contrib.admindocs.urls')),\r
-    (r'^admin/', include(admin.site.urls))\r
+    (r'^v1/', include('pithos.api.urls'))\r
 )\r