From 28adfa0ff5eee4bc8a1131d32ba9d07aba816db9 Mon Sep 17 00:00:00 2001 From: Kostas Papadimitriou Date: Mon, 9 Apr 2012 12:33:55 +0300 Subject: [PATCH] Rename snf-pithos-web-client to snf-pithos-webclient --- .../COPYRIGHT | 0 .../Changelog | 0 .../MANIFEST.in | 0 .../README | 0 .../conf/20-snf-pithos-webclient-cloudbar.conf | 0 .../conf/20-snf-pithos-webclient-settings.conf | 0 .../distribute_setup.py | 0 .../pithos_webclient}/__init__.py | 0 .../pithos_webclient}/models.py | 0 .../pithos_webclient}/settings.py | 0 .../static/pithos_webclient}/.empty | 0 .../pithos_webclient}/synnefo_settings.py | 12 +++---- .../templates/pithos_webclient}/.empty | 0 .../pithos_webclient}/urls.py | 2 +- .../pithos_webclient}/views.py | 4 +-- .../setup.py | 38 ++++++++++---------- 16 files changed, 28 insertions(+), 28 deletions(-) rename {snf-pithos-web-client => snf-pithos-webclient}/COPYRIGHT (100%) rename {snf-pithos-web-client => snf-pithos-webclient}/Changelog (100%) rename {snf-pithos-web-client => snf-pithos-webclient}/MANIFEST.in (100%) rename {snf-pithos-web-client => snf-pithos-webclient}/README (100%) rename snf-pithos-web-client/conf/20-snf-pithos-web-client-cloudbar.conf => snf-pithos-webclient/conf/20-snf-pithos-webclient-cloudbar.conf (100%) rename snf-pithos-web-client/conf/20-snf-pithos-web-client-settings.conf => snf-pithos-webclient/conf/20-snf-pithos-webclient-settings.conf (100%) rename {snf-pithos-web-client => snf-pithos-webclient}/distribute_setup.py (100%) rename {snf-pithos-web-client/pithos_web_client => snf-pithos-webclient/pithos_webclient}/__init__.py (100%) rename {snf-pithos-web-client/pithos_web_client => snf-pithos-webclient/pithos_webclient}/models.py (100%) rename {snf-pithos-web-client/pithos_web_client => snf-pithos-webclient/pithos_webclient}/settings.py (100%) rename {snf-pithos-web-client/pithos_web_client/static/pithos_web_client => snf-pithos-webclient/pithos_webclient/static/pithos_webclient}/.empty (100%) rename {snf-pithos-web-client/pithos_web_client => snf-pithos-webclient/pithos_webclient}/synnefo_settings.py (85%) rename {snf-pithos-web-client/pithos_web_client/templates/pithos_web_client => snf-pithos-webclient/pithos_webclient/templates/pithos_webclient}/.empty (100%) rename {snf-pithos-web-client/pithos_web_client => snf-pithos-webclient/pithos_webclient}/urls.py (97%) rename {snf-pithos-web-client/pithos_web_client => snf-pithos-webclient/pithos_webclient}/views.py (94%) rename {snf-pithos-web-client => snf-pithos-webclient}/setup.py (89%) diff --git a/snf-pithos-web-client/COPYRIGHT b/snf-pithos-webclient/COPYRIGHT similarity index 100% rename from snf-pithos-web-client/COPYRIGHT rename to snf-pithos-webclient/COPYRIGHT diff --git a/snf-pithos-web-client/Changelog b/snf-pithos-webclient/Changelog similarity index 100% rename from snf-pithos-web-client/Changelog rename to snf-pithos-webclient/Changelog diff --git a/snf-pithos-web-client/MANIFEST.in b/snf-pithos-webclient/MANIFEST.in similarity index 100% rename from snf-pithos-web-client/MANIFEST.in rename to snf-pithos-webclient/MANIFEST.in diff --git a/snf-pithos-web-client/README b/snf-pithos-webclient/README similarity index 100% rename from snf-pithos-web-client/README rename to snf-pithos-webclient/README diff --git a/snf-pithos-web-client/conf/20-snf-pithos-web-client-cloudbar.conf b/snf-pithos-webclient/conf/20-snf-pithos-webclient-cloudbar.conf similarity index 100% rename from snf-pithos-web-client/conf/20-snf-pithos-web-client-cloudbar.conf rename to snf-pithos-webclient/conf/20-snf-pithos-webclient-cloudbar.conf diff --git a/snf-pithos-web-client/conf/20-snf-pithos-web-client-settings.conf b/snf-pithos-webclient/conf/20-snf-pithos-webclient-settings.conf similarity index 100% rename from snf-pithos-web-client/conf/20-snf-pithos-web-client-settings.conf rename to snf-pithos-webclient/conf/20-snf-pithos-webclient-settings.conf diff --git a/snf-pithos-web-client/distribute_setup.py b/snf-pithos-webclient/distribute_setup.py similarity index 100% rename from snf-pithos-web-client/distribute_setup.py rename to snf-pithos-webclient/distribute_setup.py diff --git a/snf-pithos-web-client/pithos_web_client/__init__.py b/snf-pithos-webclient/pithos_webclient/__init__.py similarity index 100% rename from snf-pithos-web-client/pithos_web_client/__init__.py rename to snf-pithos-webclient/pithos_webclient/__init__.py diff --git a/snf-pithos-web-client/pithos_web_client/models.py b/snf-pithos-webclient/pithos_webclient/models.py similarity index 100% rename from snf-pithos-web-client/pithos_web_client/models.py rename to snf-pithos-webclient/pithos_webclient/models.py diff --git a/snf-pithos-web-client/pithos_web_client/settings.py b/snf-pithos-webclient/pithos_webclient/settings.py similarity index 100% rename from snf-pithos-web-client/pithos_web_client/settings.py rename to snf-pithos-webclient/pithos_webclient/settings.py diff --git a/snf-pithos-web-client/pithos_web_client/static/pithos_web_client/.empty b/snf-pithos-webclient/pithos_webclient/static/pithos_webclient/.empty similarity index 100% rename from snf-pithos-web-client/pithos_web_client/static/pithos_web_client/.empty rename to snf-pithos-webclient/pithos_webclient/static/pithos_webclient/.empty diff --git a/snf-pithos-web-client/pithos_web_client/synnefo_settings.py b/snf-pithos-webclient/pithos_webclient/synnefo_settings.py similarity index 85% rename from snf-pithos-web-client/pithos_web_client/synnefo_settings.py rename to snf-pithos-webclient/pithos_webclient/synnefo_settings.py index 6ecd109..77c8ed0 100644 --- a/snf-pithos-web-client/pithos_web_client/synnefo_settings.py +++ b/snf-pithos-webclient/pithos_webclient/synnefo_settings.py @@ -37,10 +37,10 @@ Django settings metadata. To be used in setup.py snf-webproject entry points. """ installed_apps = [ - 'pithos_web_client' + 'pithos_webclient' ] -static_files = {'pithos_web_client': ''} +static_files = {'pithos_webclient': ''} context_processors = [ 'synnefo.lib.context_processors.cloudbar' @@ -49,8 +49,8 @@ context_processors = [ # namespace from django.conf.urls.defaults import include, patterns urlpatterns = patterns('', - (r'^ui/$', 'pithos_web_client.views.index'), - (r'^ui/index.html$', 'pithos_web_client.views.index'), - (r'^pithos/ui/$', 'pithos_web_client.views.index'), - (r'^pithos/ui/index.html$', 'pithos_web_client.views.index') + (r'^ui/$', 'pithos_webclient.views.index'), + (r'^ui/index.html$', 'pithos_webclient.views.index'), + (r'^pithos/ui/$', 'pithos_webclient.views.index'), + (r'^pithos/ui/index.html$', 'pithos_webclient.views.index') ) diff --git a/snf-pithos-web-client/pithos_web_client/templates/pithos_web_client/.empty b/snf-pithos-webclient/pithos_webclient/templates/pithos_webclient/.empty similarity index 100% rename from snf-pithos-web-client/pithos_web_client/templates/pithos_web_client/.empty rename to snf-pithos-webclient/pithos_webclient/templates/pithos_webclient/.empty diff --git a/snf-pithos-web-client/pithos_web_client/urls.py b/snf-pithos-webclient/pithos_webclient/urls.py similarity index 97% rename from snf-pithos-web-client/pithos_web_client/urls.py rename to snf-pithos-webclient/pithos_webclient/urls.py index d4be3bd..bc41d16 100644 --- a/snf-pithos-web-client/pithos_web_client/urls.py +++ b/snf-pithos-webclient/pithos_webclient/urls.py @@ -35,6 +35,6 @@ from django.conf.urls.defaults import include, patterns urlpatterns = patterns('', - (r'^$', 'pithos_web_client.views.index') + (r'^$', 'pithos_webclient.views.index') ) diff --git a/snf-pithos-web-client/pithos_web_client/views.py b/snf-pithos-webclient/pithos_webclient/views.py similarity index 94% rename from snf-pithos-web-client/pithos_web_client/views.py rename to snf-pithos-webclient/pithos_webclient/views.py index 09c894c..f2db004 100644 --- a/snf-pithos-web-client/pithos_web_client/views.py +++ b/snf-pithos-webclient/pithos_webclient/views.py @@ -33,13 +33,13 @@ from django.views.generic.simple import direct_to_template -from pithos_web_client import settings +from pithos_webclient import settings from django.conf import settings as django_settings MEDIA_URL = getattr(settings, "PITHOS_WEB_CLIENT_MEDIA_URL", \ getattr(django_settings, "MEDIA_URL", "/static/")) def index(request): - return direct_to_template(request, 'pithos_web_client/index.html', \ + return direct_to_template(request, 'pithos_webclient/index.html', \ {'settings': settings, 'MEDIA_URL': MEDIA_URL}) diff --git a/snf-pithos-web-client/setup.py b/snf-pithos-webclient/setup.py similarity index 89% rename from snf-pithos-web-client/setup.py rename to snf-pithos-webclient/setup.py index ce8d38b..9c6c9d8 100644 --- a/snf-pithos-web-client/setup.py +++ b/snf-pithos-webclient/setup.py @@ -48,11 +48,11 @@ HERE = os.path.abspath(os.path.normpath(os.path.dirname(__file__))) try: # try to update the version file from synnefo.util import version - version.update_version('pithos_web_client', 'version', HERE) + version.update_version('pithos_webclient', 'version', HERE) except ImportError: pass -from pithos_web_client.version import __version__ +from pithos_webclient.version import __version__ # Package info VERSION = __version__ @@ -193,10 +193,10 @@ def clean_gwt(root="../", public_dir="bin/www/gr.grnet.pithos.web.Pithos/"): raise Exception("GWT clean failed") os.chdir(curdir) pub_dir = os.path.abspath(os.path.join(root, public_dir)) - static_dir = os.path.abspath(os.path.join("pithos_web_client", "static", \ - "pithos_web_client")) - templates_dir = os.path.abspath(os.path.join("pithos_web_client", \ - "templates", "pithos_web_client")) + static_dir = os.path.abspath(os.path.join("pithos_webclient", "static", \ + "pithos_webclient")) + templates_dir = os.path.abspath(os.path.join("pithos_webclient", \ + "templates", "pithos_webclient")) clean_static = ["rm", "-r"] + glob.glob(os.path.join(static_dir, "*")) clean_templates = ["rm", "-r"] + glob.glob(os.path.join(templates_dir, "*")) @@ -222,10 +222,10 @@ def build_gwt(root="../", public_dir="bin/www/gr.grnet.pithos.web.Pithos/"): pub_dir = os.path.abspath(os.path.join(root, public_dir)) - static_dir = os.path.abspath(os.path.join("pithos_web_client", "static", \ - "pithos_web_client")) - templates_dir = os.path.abspath(os.path.join("pithos_web_client", \ - "templates", "pithos_web_client")) + static_dir = os.path.abspath(os.path.join("pithos_webclient", "static", \ + "pithos_webclient")) + templates_dir = os.path.abspath(os.path.join("pithos_webclient", \ + "templates", "pithos_webclient")) clean_static = ["rm", "-r"] + glob.glob(os.path.join(static_dir, "*")) clean_templates = ["rm", "-r"] + glob.glob(os.path.join(templates_dir, "*")) @@ -243,10 +243,10 @@ def build_gwt(root="../", public_dir="bin/www/gr.grnet.pithos.web.Pithos/"): index = os.path.join(templates_dir, "index.html") index_data = file(index).read() - index_data = index_data.replace('href="', 'href="{{ MEDIA_URL }}pithos_web_client/') - index_data = index_data.replace('" src="', '" src="{{ MEDIA_URL }}pithos_web_client/') - index_data = index_data.replace('\' src=\'', '\' src=\'{{ MEDIA_URL }}pithos_web_client/') - index_data = index_data.replace('url(', 'url({{ MEDIA_URL }}pithos_web_client/') + index_data = index_data.replace('href="', 'href="{{ MEDIA_URL }}pithos_webclient/') + index_data = index_data.replace('" src="', '" src="{{ MEDIA_URL }}pithos_webclient/') + index_data = index_data.replace('\' src=\'', '\' src=\'{{ MEDIA_URL }}pithos_webclient/') + index_data = index_data.replace('url(', 'url({{ MEDIA_URL }}pithos_webclient/') ifile = file(index, "w+") ifile.write(index_data) @@ -262,7 +262,7 @@ if any(x in ''.join(sys.argv) for x in ["clean"]): setup( - name='snf-pithos-web-client', + name='snf-pithos-webclient', version=VERSION, license='BSD', url='http://code.grnet.gr/projects/pithos-web-client', @@ -283,10 +283,10 @@ setup( entry_points={ 'synnefo': [ - 'web_apps = pithos_web_client.synnefo_settings:installed_apps', - 'urls = pithos_web_client.synnefo_settings:urlpatterns', - 'web_static = pithos_web_client.synnefo_settings:static_files', - 'web_context_processors = pithos_web_client.synnefo_settings:context_processors' + 'web_apps = pithos_webclient.synnefo_settings:installed_apps', + 'urls = pithos_webclient.synnefo_settings:urlpatterns', + 'web_static = pithos_webclient.synnefo_settings:static_files', + 'web_context_processors = pithos_webclient.synnefo_settings:context_processors' ] } ) -- 1.7.10.4