Merge branch 'master' into packaging v0.9.2
authorKostas Papadimitriou <kpap@grnet.gr>
Fri, 22 Jun 2012 13:42:22 +0000 (16:42 +0300)
committerKostas Papadimitriou <kpap@grnet.gr>
Fri, 22 Jun 2012 13:42:22 +0000 (16:42 +0300)
21 files changed:
.gitignore
docs/source/conf.py
docs/source/index.rst
runtime.properties
snf-pithos-webclient/COPYRIGHT [new file with mode: 0644]
snf-pithos-webclient/Changelog [new file with mode: 0644]
snf-pithos-webclient/MANIFEST.in [new file with mode: 0644]
snf-pithos-webclient/README [new file with mode: 0644]
snf-pithos-webclient/conf/20-snf-pithos-webclient-cloudbar.conf [new file with mode: 0644]
snf-pithos-webclient/conf/20-snf-pithos-webclient-settings.conf [new file with mode: 0644]
snf-pithos-webclient/distribute_setup.py [new file with mode: 0644]
snf-pithos-webclient/pithos_webclient/__init__.py [new file with mode: 0644]
snf-pithos-webclient/pithos_webclient/models.py [new file with mode: 0644]
snf-pithos-webclient/pithos_webclient/settings.py [new file with mode: 0644]
snf-pithos-webclient/pithos_webclient/static/pithos_webclient/.empty [new file with mode: 0644]
snf-pithos-webclient/pithos_webclient/synnefo_settings.py [new file with mode: 0644]
snf-pithos-webclient/pithos_webclient/templates/pithos_webclient/.empty [new file with mode: 0644]
snf-pithos-webclient/pithos_webclient/urls.py [new file with mode: 0644]
snf-pithos-webclient/pithos_webclient/views.py [new file with mode: 0644]
snf-pithos-webclient/setup.py [new file with mode: 0644]
src/gr/grnet/pithos/web/public/index.html

index 94493bd..f1bc3ca 100644 (file)
@@ -11,6 +11,16 @@ war
 .gwt-tmp
 tomcat
 gwt-unitCache
+*.pyc
+.DS_Store
+*.egg-info
+*/dist/
+*/build/
+*/pithos_webclient/version.py
+*/pithos_webclient/templates/pithos_webclient/*
+*/pithos_webclient/static/pithos_webclient/*
+distribute*.tar.gz
+distribute*.egg
 docs/build
 pithos-web-client.sublime-project
 pithos-web-client.sublime-workspace
index c200856..431a958 100644 (file)
@@ -182,6 +182,80 @@ latex_documents = [
    u'GRNet', 'manual'),
 ]
 
+
+PREAMBLE = """
+\makeatletter
+    \\fancypagestyle{normal}{
+        \\fancyhf{}
+        \\fancyfoot[RO,LE]{{\py@HeaderFamily\\thepage}}
+        \\fancyfoot[LO]{{\py@HeaderFamily\\nouppercase{\\rightmark}}}
+        \\fancyfoot[RE]{{\py@HeaderFamily\\nouppercase{\leftmark}}}
+        \\fancyhead[LE,RO]{{\py@HeaderFamily \@title, \py@release}}
+        \\fancyhead[LO,RE]{\includegraphics[width=3cm]{../../espa.jpg}}
+    }
+
+
+\\renewcommand{\maketitle}{%
+  \\begin{titlepage}%
+    \let\\footnotesize\small
+    \let\\footnoterule\\relax
+    \\rule{\\textwidth}{1pt}%
+    \ifsphinxpdfoutput
+      \\begingroup
+      % These \defs are required to deal with multi-line authors; it
+      % changes \\\\ to ', ' (comma-space), making it pass muster for
+      % generating document info in the PDF file.
+      \def\\\\{, }
+      \def\\and{and }
+      \pdfinfo{
+        /Author (\@author)
+        /Title (\@title)
+      }
+      \endgroup
+    \\fi
+    \\begin{flushright}%
+      \sphinxlogo%
+      {\\rm\Huge\py@HeaderFamily \@title \par}%
+      {\em\LARGE\py@HeaderFamily \py@release\\releaseinfo \par}
+      \\vfill
+      {\LARGE\py@HeaderFamily
+        \\begin{tabular}[t]{c}
+          \@author
+        \end{tabular}
+        \par}
+      \\vfill\\vfill
+      {\large
+       \@date \par
+       \includegraphics[width=6cm]{../../espa.jpg}
+       \\vfill
+       \py@authoraddress \par
+      }%
+    \end{flushright}%\par
+    \@thanks
+  \end{titlepage}%
+  \cleardoublepage%
+  \setcounter{footnote}{0}%
+  \let\\thanks\\relax\let\maketitle\\relax
+  %\gdef\@thanks{}\gdef\@author{}\gdef\@title{}
+}
+\makeatother
+"""
+
+latex_elements = {
+# The paper size ('letterpaper' or 'a4paper').
+#'papersize': 'letterpaper',
+
+# The font size ('10pt', '11pt' or '12pt').
+#'pointsize': '10pt',
+
+# Additional stuff for the LaTeX preamble.
+'preamble': PREAMBLE,
+
+'classoptions': ',openany,oneside',
+
+'babel': '\\usepackage[english]{babel}'
+}
+
 # The name of an image file (relative to this directory) to place at the top of
 # the title page.
 #latex_logo = None
index 8745bda..864e470 100644 (file)
@@ -13,10 +13,3 @@ Contents:
 
    webclient
 
-Indices and tables
-==================
-
-* :ref:`genindex`
-* :ref:`modindex`
-* :ref:`search`
-
index d656cac..c32f6ff 100644 (file)
@@ -1,9 +1,9 @@
 #!!!!!ATTENTION!!!!! loginUrl MUST end at "next=". You should not give the value of the next parameter. It will be determined automatically 
-loginUrl=/im/login?next=
-CLOUDBAR_ACTIVE_SERVICE = pithos
-CLOUDBAR_LOCATION = /static/im/cloudbar/
-CLOUDBAR_SERVICES = /im/get_services
-CLOUDBAR_MENU = /im/get_menu
-authCookie=_pithos2_a
-feedbackUrl=/feedback
-version=0.9.0
\ No newline at end of file
+loginUrl={{ settings.LOGIN_URL }}
+CLOUDBAR_ACTIVE_SERVICE = {{ settings.CLOUDBAR_ACTIVE }}
+CLOUDBAR_LOCATION = {{ settings.CLOUDBAR_LOCATION }}
+CLOUDBAR_SERVICES = {{ settings.CLOUDBAR_SERVICES_URL }}
+CLOUDBAR_MENU = {{ settings.CLOUDBAR_MENU_URL }}
+authCookie={{ settings.AUTH_COOKIE_NAME }}
+feedbackUrl={{ settings.FEEDBACK_URL }}
+version={{ CLIENT_VERSION }}
diff --git a/snf-pithos-webclient/COPYRIGHT b/snf-pithos-webclient/COPYRIGHT
new file mode 100644 (file)
index 0000000..aa12569
--- /dev/null
@@ -0,0 +1,32 @@
+Copyright 2011-2012 GRNET S.A. All rights reserved.
+
+Redistribution and use in source and binary forms, with or
+without modification, are permitted provided that the following
+conditions are met:
+
+  1. Redistributions of source code must retain the above
+     copyright notice, this list of conditions and the following
+     disclaimer.
+
+  2. Redistributions in binary form must reproduce the above
+     copyright notice, this list of conditions and the following
+     disclaimer in the documentation and/or other materials
+     provided with the distribution.
+
+THIS SOFTWARE IS PROVIDED BY GRNET S.A. ``AS IS'' AND ANY EXPRESS
+OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
+WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
+PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL GRNET S.A OR
+CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
+LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF
+USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED
+AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
+LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN
+ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+POSSIBILITY OF SUCH DAMAGE.
+
+The views and conclusions contained in the software and
+documentation are those of the authors and should not be
+interpreted as representing official policies, either expressed
+or implied, of GRNET S.A.
diff --git a/snf-pithos-webclient/Changelog b/snf-pithos-webclient/Changelog
new file mode 100644 (file)
index 0000000..2e1040e
--- /dev/null
@@ -0,0 +1,15 @@
+Changelog
+=========
+
+v0.8.7
+------
+
+- Use PITHOS_UI_CLOUDBAR_ACTIVE_SERVICE setting to set the cloudbar active
+  service.
+
+v0.8.5
+------
+
+- Django app to serve the index.html
+- Use synnefo.lib.context_processors.cloudbar to display cloudbar
+
diff --git a/snf-pithos-webclient/MANIFEST.in b/snf-pithos-webclient/MANIFEST.in
new file mode 100644 (file)
index 0000000..c5789ce
--- /dev/null
@@ -0,0 +1,8 @@
+include README Changelog
+include distribute_setup.py
+global-include */templates/* */fixtures/* */static/*
+global-exclude */.DS_Store
+recursive-include pithos_webclient/templates/ *.html *.txt
+recursive-include pithos_webclient/static/ *.js *.css *.less *.html *.txt *.png *.gif *.jpg
+prune docs
+prune other
diff --git a/snf-pithos-webclient/README b/snf-pithos-webclient/README
new file mode 100644 (file)
index 0000000..490e832
--- /dev/null
@@ -0,0 +1,80 @@
+snf-pithos-webclient
+********************
+
+This is the python package of the pithos frontend web application. It consists
+of a django application module which includes a prebuilt version of the pithos
+gwt project contained in `../src` directory.
+
+The gwt build files are not included in the repository. Ant hooks has been
+added in setup.py so that each time you run ``python setup.py {develop,
+install, sdist}`` ant build gets executed automatically for you.  Additionally
+after each successfull build, compiled js and other asset files are copied in
+the appropriate locations so that they will get included in the created python
+package.
+
+
+Installation
+============
+
+1. Install the ``snf-pithos-webclient`` python package:
+
+    pip install snf-pithos-webclient -f http://docs.dev.grnet.gr/pypi/
+
+2. Add ``pithos_webclient`` in your django project INSTALLED_APPS setting.
+
+3. Configure your web server to serve package static files placed in
+   pithos_web_client/static/pithos_web_client under the
+   ``/static/pithos_web_client`` url (``/static/`` is the default django
+   MEDIA_URL).
+
+
+Available settings
+==================
+
+The pithos webclient use the following settings 
+
+
+PITHOS_UI_LOGIN_URL
+-------------------
+Web client checks for existing ``PITHOS_UI_AUTH_COOKIE_NAME`` cookie on the
+browser and if found, uses the stored token to make requests to the pithos api
+service. If cookie is not found or if api response with 401 error, the
+application will redirect to the ``PITHOS_UI_LOGIN_URL``. ``next`` parameter
+gets automatically appended in the url by the webclient.
+
+**default value:** ``https://accounts.okeanos.grnet.gr/im/login?next=``
+
+
+PITHOS_UI_FEEDBACK_URL
+----------------------
+Should be set to match your astakos deployment feedback endpoint. This is used
+in error messages, if user want to submit the error as feedback to the service
+administrators.
+
+**default value:** ``https://accounts.okeanos.grnet.gr/im/feedback``
+
+
+PITHOS_UI_AUTH_COOKIE_NAME
+--------------------------
+The cookie name the webclient will check for user authenticity. This
+should match the ``ASTAKOS_COOKIE_NAME`` setting of your astakos deployment.
+
+**default value:** ``_pithos2_a``
+
+
+PITHOS_CLOUDBAR_ACTIVE_SERVICE
+------------------------------
+This is passed as a setting to the cloudbar js script to set focus to the
+appropriate service menu. This should match the `id` key of
+``ASTAKOS_CLOUD_SERVICES`` entry which refers to pithos application.
+
+**default value:** ``pithos``
+
+
+CLOUDBAR_SETTINGS
+-----------------
+Webclient also makes use of the ``cloudbar`` context processor located in
+``snf-common`` package which requires ``CLOUDBAR_ACTIVE``,
+``CLOUDBAR_LOCATION``, ``CLOUDBAR_COOKIE_NAME``, ``CLOUDBAR_SERVICES_URL``,
+``CLOUDBAR_MENU_URL`` settings to be set.
+
diff --git a/snf-pithos-webclient/conf/20-snf-pithos-webclient-cloudbar.conf b/snf-pithos-webclient/conf/20-snf-pithos-webclient-cloudbar.conf
new file mode 100644 (file)
index 0000000..4d89a41
--- /dev/null
@@ -0,0 +1,9 @@
+# cloudbar configuration
+#CLOUDBAR_ACTIVE = True
+#CLOUDBAR_LOCATION = 'https://accounts.okeanos.grnet.gr/static/im/cloudbar/'
+#CLOUDBAR_COOKIE_NAME = '_pithos2_a'
+#CLOUDBAR_SERVICES_URL = 'https://accounts.okeanos.grnet.gr/im/get_services'
+#CLOUDBAR_MENU_URL = 'https://accounts.okeanos.grnet.gr/im/get_menu'
+
+#PITHOS_UI_CLOUDBAR_ACTIVE_SERVICE = 'cloud'
+
diff --git a/snf-pithos-webclient/conf/20-snf-pithos-webclient-settings.conf b/snf-pithos-webclient/conf/20-snf-pithos-webclient-settings.conf
new file mode 100644 (file)
index 0000000..e148dfb
--- /dev/null
@@ -0,0 +1,10 @@
+# loginUrl MUST end at "next=". You should not give the value of the next
+# parameter. It will be determined automatically
+#PITHOS_UI_LOGIN_URL = "https://accounts.okeanos.grnet.gr/im/login?next="
+
+# Feedback url
+#PITHOS_UI_FEEDBACK_URL = "https://accounts.okeanos.grnet.gr/im/feedback"
+
+# Cookie name to check if user is authenticated, this should match your astakos
+# deployment cookie name
+#PITHOS_UI_AUTH_COOKIE_NAME = "_pithos2_a"
diff --git a/snf-pithos-webclient/distribute_setup.py b/snf-pithos-webclient/distribute_setup.py
new file mode 100644 (file)
index 0000000..10d6684
--- /dev/null
@@ -0,0 +1,485 @@
+#!python
+"""Bootstrap distribute installation
+
+If you want to use setuptools in your package's setup.py, just include this
+file in the same directory with it, and add this to the top of your setup.py::
+
+    from distribute_setup import use_setuptools
+    use_setuptools()
+
+If you want to require a specific version of setuptools, set a download
+mirror, or use an alternate download directory, you can do so by supplying
+the appropriate options to ``use_setuptools()``.
+
+This file can also be run as a script to install or upgrade setuptools.
+"""
+import os
+import sys
+import time
+import fnmatch
+import tempfile
+import tarfile
+from distutils import log
+
+try:
+    from site import USER_SITE
+except ImportError:
+    USER_SITE = None
+
+try:
+    import subprocess
+
+    def _python_cmd(*args):
+        args = (sys.executable,) + args
+        return subprocess.call(args) == 0
+
+except ImportError:
+    # will be used for python 2.3
+    def _python_cmd(*args):
+        args = (sys.executable,) + args
+        # quoting arguments if windows
+        if sys.platform == 'win32':
+            def quote(arg):
+                if ' ' in arg:
+                    return '"%s"' % arg
+                return arg
+            args = [quote(arg) for arg in args]
+        return os.spawnl(os.P_WAIT, sys.executable, *args) == 0
+
+DEFAULT_VERSION = "0.6.10"
+DEFAULT_URL = "http://pypi.python.org/packages/source/d/distribute/"
+SETUPTOOLS_FAKED_VERSION = "0.6c11"
+
+SETUPTOOLS_PKG_INFO = """\
+Metadata-Version: 1.0
+Name: setuptools
+Version: %s
+Summary: xxxx
+Home-page: xxx
+Author: xxx
+Author-email: xxx
+License: xxx
+Description: xxx
+""" % SETUPTOOLS_FAKED_VERSION
+
+
+def _install(tarball):
+    # extracting the tarball
+    tmpdir = tempfile.mkdtemp()
+    log.warn('Extracting in %s', tmpdir)
+    old_wd = os.getcwd()
+    try:
+        os.chdir(tmpdir)
+        tar = tarfile.open(tarball)
+        _extractall(tar)
+        tar.close()
+
+        # going in the directory
+        subdir = os.path.join(tmpdir, os.listdir(tmpdir)[0])
+        os.chdir(subdir)
+        log.warn('Now working in %s', subdir)
+
+        # installing
+        log.warn('Installing Distribute')
+        if not _python_cmd('setup.py', 'install'):
+            log.warn('Something went wrong during the installation.')
+            log.warn('See the error message above.')
+    finally:
+        os.chdir(old_wd)
+
+
+def _build_egg(egg, tarball, to_dir):
+    # extracting the tarball
+    tmpdir = tempfile.mkdtemp()
+    log.warn('Extracting in %s', tmpdir)
+    old_wd = os.getcwd()
+    try:
+        os.chdir(tmpdir)
+        tar = tarfile.open(tarball)
+        _extractall(tar)
+        tar.close()
+
+        # going in the directory
+        subdir = os.path.join(tmpdir, os.listdir(tmpdir)[0])
+        os.chdir(subdir)
+        log.warn('Now working in %s', subdir)
+
+        # building an egg
+        log.warn('Building a Distribute egg in %s', to_dir)
+        _python_cmd('setup.py', '-q', 'bdist_egg', '--dist-dir', to_dir)
+
+    finally:
+        os.chdir(old_wd)
+    # returning the result
+    log.warn(egg)
+    if not os.path.exists(egg):
+        raise IOError('Could not build the egg.')
+
+
+def _do_download(version, download_base, to_dir, download_delay):
+    egg = os.path.join(to_dir, 'distribute-%s-py%d.%d.egg'
+                       % (version, sys.version_info[0], sys.version_info[1]))
+    if not os.path.exists(egg):
+        tarball = download_setuptools(version, download_base,
+                                      to_dir, download_delay)
+        _build_egg(egg, tarball, to_dir)
+    sys.path.insert(0, egg)
+    import setuptools
+    setuptools.bootstrap_install_from = egg
+
+
+def use_setuptools(version=DEFAULT_VERSION, download_base=DEFAULT_URL,
+                   to_dir=os.curdir, download_delay=15, no_fake=True):
+    # making sure we use the absolute path
+    to_dir = os.path.abspath(to_dir)
+    was_imported = 'pkg_resources' in sys.modules or \
+        'setuptools' in sys.modules
+    try:
+        try:
+            import pkg_resources
+            if not hasattr(pkg_resources, '_distribute'):
+                if not no_fake:
+                    _fake_setuptools()
+                raise ImportError
+        except ImportError:
+            return _do_download(version, download_base, to_dir, download_delay)
+        try:
+            pkg_resources.require("distribute>="+version)
+            return
+        except pkg_resources.VersionConflict:
+            e = sys.exc_info()[1]
+            if was_imported:
+                sys.stderr.write(
+                "The required version of distribute (>=%s) is not available,\n"
+                "and can't be installed while this script is running. Please\n"
+                "install a more recent version first, using\n"
+                "'easy_install -U distribute'."
+                "\n\n(Currently using %r)\n" % (version, e.args[0]))
+                sys.exit(2)
+            else:
+                del pkg_resources, sys.modules['pkg_resources']    # reload ok
+                return _do_download(version, download_base, to_dir,
+                                    download_delay)
+        except pkg_resources.DistributionNotFound:
+            return _do_download(version, download_base, to_dir,
+                                download_delay)
+    finally:
+        if not no_fake:
+            _create_fake_setuptools_pkg_info(to_dir)
+
+def download_setuptools(version=DEFAULT_VERSION, download_base=DEFAULT_URL,
+                        to_dir=os.curdir, delay=15):
+    """Download distribute from a specified location and return its filename
+
+    `version` should be a valid distribute version number that is available
+    as an egg for download under the `download_base` URL (which should end
+    with a '/'). `to_dir` is the directory where the egg will be downloaded.
+    `delay` is the number of seconds to pause before an actual download
+    attempt.
+    """
+    # making sure we use the absolute path
+    to_dir = os.path.abspath(to_dir)
+    try:
+        from urllib.request import urlopen
+    except ImportError:
+        from urllib2 import urlopen
+    tgz_name = "distribute-%s.tar.gz" % version
+    url = download_base + tgz_name
+    saveto = os.path.join(to_dir, tgz_name)
+    src = dst = None
+    if not os.path.exists(saveto):  # Avoid repeated downloads
+        try:
+            log.warn("Downloading %s", url)
+            src = urlopen(url)
+            # Read/write all in one block, so we don't create a corrupt file
+            # if the download is interrupted.
+            data = src.read()
+            dst = open(saveto, "wb")
+            dst.write(data)
+        finally:
+            if src:
+                src.close()
+            if dst:
+                dst.close()
+    return os.path.realpath(saveto)
+
+def _no_sandbox(function):
+    def __no_sandbox(*args, **kw):
+        try:
+            from setuptools.sandbox import DirectorySandbox
+            if not hasattr(DirectorySandbox, '_old'):
+                def violation(*args):
+                    pass
+                DirectorySandbox._old = DirectorySandbox._violation
+                DirectorySandbox._violation = violation
+                patched = True
+            else:
+                patched = False
+        except ImportError:
+            patched = False
+
+        try:
+            return function(*args, **kw)
+        finally:
+            if patched:
+                DirectorySandbox._violation = DirectorySandbox._old
+                del DirectorySandbox._old
+
+    return __no_sandbox
+
+def _patch_file(path, content):
+    """Will backup the file then patch it"""
+    existing_content = open(path).read()
+    if existing_content == content:
+        # already patched
+        log.warn('Already patched.')
+        return False
+    log.warn('Patching...')
+    _rename_path(path)
+    f = open(path, 'w')
+    try:
+        f.write(content)
+    finally:
+        f.close()
+    return True
+
+_patch_file = _no_sandbox(_patch_file)
+
+def _same_content(path, content):
+    return open(path).read() == content
+
+def _rename_path(path):
+    new_name = path + '.OLD.%s' % time.time()
+    log.warn('Renaming %s into %s', path, new_name)
+    os.rename(path, new_name)
+    return new_name
+
+def _remove_flat_installation(placeholder):
+    if not os.path.isdir(placeholder):
+        log.warn('Unkown installation at %s', placeholder)
+        return False
+    found = False
+    for file in os.listdir(placeholder):
+        if fnmatch.fnmatch(file, 'setuptools*.egg-info'):
+            found = True
+            break
+    if not found:
+        log.warn('Could not locate setuptools*.egg-info')
+        return
+
+    log.warn('Removing elements out of the way...')
+    pkg_info = os.path.join(placeholder, file)
+    if os.path.isdir(pkg_info):
+        patched = _patch_egg_dir(pkg_info)
+    else:
+        patched = _patch_file(pkg_info, SETUPTOOLS_PKG_INFO)
+
+    if not patched:
+        log.warn('%s already patched.', pkg_info)
+        return False
+    # now let's move the files out of the way
+    for element in ('setuptools', 'pkg_resources.py', 'site.py'):
+        element = os.path.join(placeholder, element)
+        if os.path.exists(element):
+            _rename_path(element)
+        else:
+            log.warn('Could not find the %s element of the '
+                     'Setuptools distribution', element)
+    return True
+
+_remove_flat_installation = _no_sandbox(_remove_flat_installation)
+
+def _after_install(dist):
+    log.warn('After install bootstrap.')
+    placeholder = dist.get_command_obj('install').install_purelib
+    _create_fake_setuptools_pkg_info(placeholder)
+
+def _create_fake_setuptools_pkg_info(placeholder):
+    if not placeholder or not os.path.exists(placeholder):
+        log.warn('Could not find the install location')
+        return
+    pyver = '%s.%s' % (sys.version_info[0], sys.version_info[1])
+    setuptools_file = 'setuptools-%s-py%s.egg-info' % \
+            (SETUPTOOLS_FAKED_VERSION, pyver)
+    pkg_info = os.path.join(placeholder, setuptools_file)
+    if os.path.exists(pkg_info):
+        log.warn('%s already exists', pkg_info)
+        return
+
+    log.warn('Creating %s', pkg_info)
+    f = open(pkg_info, 'w')
+    try:
+        f.write(SETUPTOOLS_PKG_INFO)
+    finally:
+        f.close()
+
+    pth_file = os.path.join(placeholder, 'setuptools.pth')
+    log.warn('Creating %s', pth_file)
+    f = open(pth_file, 'w')
+    try:
+        f.write(os.path.join(os.curdir, setuptools_file))
+    finally:
+        f.close()
+
+_create_fake_setuptools_pkg_info = _no_sandbox(_create_fake_setuptools_pkg_info)
+
+def _patch_egg_dir(path):
+    # let's check if it's already patched
+    pkg_info = os.path.join(path, 'EGG-INFO', 'PKG-INFO')
+    if os.path.exists(pkg_info):
+        if _same_content(pkg_info, SETUPTOOLS_PKG_INFO):
+            log.warn('%s already patched.', pkg_info)
+            return False
+    _rename_path(path)
+    os.mkdir(path)
+    os.mkdir(os.path.join(path, 'EGG-INFO'))
+    pkg_info = os.path.join(path, 'EGG-INFO', 'PKG-INFO')
+    f = open(pkg_info, 'w')
+    try:
+        f.write(SETUPTOOLS_PKG_INFO)
+    finally:
+        f.close()
+    return True
+
+_patch_egg_dir = _no_sandbox(_patch_egg_dir)
+
+def _before_install():
+    log.warn('Before install bootstrap.')
+    _fake_setuptools()
+
+
+def _under_prefix(location):
+    if 'install' not in sys.argv:
+        return True
+    args = sys.argv[sys.argv.index('install')+1:]
+    for index, arg in enumerate(args):
+        for option in ('--root', '--prefix'):
+            if arg.startswith('%s=' % option):
+                top_dir = arg.split('root=')[-1]
+                return location.startswith(top_dir)
+            elif arg == option:
+                if len(args) > index:
+                    top_dir = args[index+1]
+                    return location.startswith(top_dir)
+        if arg == '--user' and USER_SITE is not None:
+            return location.startswith(USER_SITE)
+    return True
+
+
+def _fake_setuptools():
+    log.warn('Scanning installed packages')
+    try:
+        import pkg_resources
+    except ImportError:
+        # we're cool
+        log.warn('Setuptools or Distribute does not seem to be installed.')
+        return
+    ws = pkg_resources.working_set
+    try:
+        setuptools_dist = ws.find(pkg_resources.Requirement.parse('setuptools',
+                                  replacement=False))
+    except TypeError:
+        # old distribute API
+        setuptools_dist = ws.find(pkg_resources.Requirement.parse('setuptools'))
+
+    if setuptools_dist is None:
+        log.warn('No setuptools distribution found')
+        return
+    # detecting if it was already faked
+    setuptools_location = setuptools_dist.location
+    log.warn('Setuptools installation detected at %s', setuptools_location)
+
+    # if --root or --preix was provided, and if
+    # setuptools is not located in them, we don't patch it
+    if not _under_prefix(setuptools_location):
+        log.warn('Not patching, --root or --prefix is installing Distribute'
+                 ' in another location')
+        return
+
+    # let's see if its an egg
+    if not setuptools_location.endswith('.egg'):
+        log.warn('Non-egg installation')
+        res = _remove_flat_installation(setuptools_location)
+        if not res:
+            return
+    else:
+        log.warn('Egg installation')
+        pkg_info = os.path.join(setuptools_location, 'EGG-INFO', 'PKG-INFO')
+        if (os.path.exists(pkg_info) and
+            _same_content(pkg_info, SETUPTOOLS_PKG_INFO)):
+            log.warn('Already patched.')
+            return
+        log.warn('Patching...')
+        # let's create a fake egg replacing setuptools one
+        res = _patch_egg_dir(setuptools_location)
+        if not res:
+            return
+    log.warn('Patched done.')
+    _relaunch()
+
+
+def _relaunch():
+    log.warn('Relaunching...')
+    # we have to relaunch the process
+    # pip marker to avoid a relaunch bug
+    if sys.argv[:3] == ['-c', 'install', '--single-version-externally-managed']:
+        sys.argv[0] = 'setup.py'
+    args = [sys.executable] + sys.argv
+    sys.exit(subprocess.call(args))
+
+
+def _extractall(self, path=".", members=None):
+    """Extract all members from the archive to the current working
+       directory and set owner, modification time and permissions on
+       directories afterwards. `path' specifies a different directory
+       to extract to. `members' is optional and must be a subset of the
+       list returned by getmembers().
+    """
+    import copy
+    import operator
+    from tarfile import ExtractError
+    directories = []
+
+    if members is None:
+        members = self
+
+    for tarinfo in members:
+        if tarinfo.isdir():
+            # Extract directories with a safe mode.
+            directories.append(tarinfo)
+            tarinfo = copy.copy(tarinfo)
+            tarinfo.mode = 448 # decimal for oct 0700
+        self.extract(tarinfo, path)
+
+    # Reverse sort directories.
+    if sys.version_info < (2, 4):
+        def sorter(dir1, dir2):
+            return cmp(dir1.name, dir2.name)
+        directories.sort(sorter)
+        directories.reverse()
+    else:
+        directories.sort(key=operator.attrgetter('name'), reverse=True)
+
+    # Set correct owner, mtime and filemode on directories.
+    for tarinfo in directories:
+        dirpath = os.path.join(path, tarinfo.name)
+        try:
+            self.chown(tarinfo, dirpath)
+            self.utime(tarinfo, dirpath)
+            self.chmod(tarinfo, dirpath)
+        except ExtractError:
+            e = sys.exc_info()[1]
+            if self.errorlevel > 1:
+                raise
+            else:
+                self._dbg(1, "tarfile: %s" % e)
+
+
+def main(argv, version=DEFAULT_VERSION):
+    """Install or upgrade setuptools and EasyInstall"""
+    tarball = download_setuptools()
+    _install(tarball)
+
+
+if __name__ == '__main__':
+    main(sys.argv[1:])
diff --git a/snf-pithos-webclient/pithos_webclient/__init__.py b/snf-pithos-webclient/pithos_webclient/__init__.py
new file mode 100644 (file)
index 0000000..e69de29
diff --git a/snf-pithos-webclient/pithos_webclient/models.py b/snf-pithos-webclient/pithos_webclient/models.py
new file mode 100644 (file)
index 0000000..e69de29
diff --git a/snf-pithos-webclient/pithos_webclient/settings.py b/snf-pithos-webclient/pithos_webclient/settings.py
new file mode 100644 (file)
index 0000000..683ccb6
--- /dev/null
@@ -0,0 +1,13 @@
+from django.conf import settings
+
+# !!!!!ATTENTION!!!!!
+# loginUrl MUST end at "next=". You should not give the value of the next
+# parameter. It will be determined automatically
+LOGIN_URL = getattr(settings, 'PITHOS_UI_LOGIN_URL',
+    'https://accounts.okeanos.grnet.gr/im/login?next=')
+FEEDBACK_URL = getattr(settings, 'PITHOS_UI_FEEDBACK_URL',
+    'https://accounts.okeanos.grnet.gr/im/feedback')
+AUTH_COOKIE_NAME = getattr(settings, 'PITHOS_UI_AUTH_COOKIE_NAME',
+    '_pithos2_a')
+CLOUDBAR_ACTIVE_SERVICE = getattr(settings, 'PITHOS_UI_CLOUDBAR_ACTIVE_SERVICE',
+    'pithos')
diff --git a/snf-pithos-webclient/pithos_webclient/static/pithos_webclient/.empty b/snf-pithos-webclient/pithos_webclient/static/pithos_webclient/.empty
new file mode 100644 (file)
index 0000000..e69de29
diff --git a/snf-pithos-webclient/pithos_webclient/synnefo_settings.py b/snf-pithos-webclient/pithos_webclient/synnefo_settings.py
new file mode 100644 (file)
index 0000000..77c8ed0
--- /dev/null
@@ -0,0 +1,56 @@
+# Copyright 2011-2012 GRNET S.A. All rights reserved.
+#
+# Redistribution and use in source and binary forms, with or
+# without modification, are permitted provided that the following
+# conditions are met:
+#
+#   1. Redistributions of source code must retain the above
+#      copyright notice, this list of conditions and the following
+#      disclaimer.
+#
+#   2. Redistributions in binary form must reproduce the above
+#      copyright notice, this list of conditions and the following
+#      disclaimer in the documentation and/or other materials
+#      provided with the distribution.
+#
+# THIS SOFTWARE IS PROVIDED BY GRNET S.A. ``AS IS'' AND ANY EXPRESS
+# OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
+# WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
+# PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL GRNET S.A OR
+# CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+# SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
+# LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF
+# USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED
+# AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
+# LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN
+# ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+# POSSIBILITY OF SUCH DAMAGE.
+#
+# The views and conclusions contained in the software and
+# documentation are those of the authors and should not be
+# interpreted as representing official policies, either expressed
+# or implied, of GRNET S.A.
+#
+
+"""
+Django settings metadata. To be used in setup.py snf-webproject entry points.
+"""
+
+installed_apps = [
+        'pithos_webclient'
+]
+
+static_files = {'pithos_webclient': ''}
+
+context_processors = [
+   'synnefo.lib.context_processors.cloudbar'
+]
+
+# namespace
+from django.conf.urls.defaults import include, patterns
+urlpatterns = patterns('',
+    (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-webclient/pithos_webclient/templates/pithos_webclient/.empty b/snf-pithos-webclient/pithos_webclient/templates/pithos_webclient/.empty
new file mode 100644 (file)
index 0000000..e69de29
diff --git a/snf-pithos-webclient/pithos_webclient/urls.py b/snf-pithos-webclient/pithos_webclient/urls.py
new file mode 100644 (file)
index 0000000..bc41d16
--- /dev/null
@@ -0,0 +1,40 @@
+# Copyright 2011-2012 GRNET S.A. All rights reserved.
+#
+# Redistribution and use in source and binary forms, with or
+# without modification, are permitted provided that the following
+# conditions are met:
+#
+#   1. Redistributions of source code must retain the above
+#      copyright notice, this list of conditions and the following
+#      disclaimer.
+#
+#   2. Redistributions in binary form must reproduce the above
+#      copyright notice, this list of conditions and the following
+#      disclaimer in the documentation and/or other materials
+#      provided with the distribution.
+#
+# THIS SOFTWARE IS PROVIDED BY GRNET S.A. ``AS IS'' AND ANY EXPRESS
+# OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
+# WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
+# PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL GRNET S.A OR
+# CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+# SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
+# LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF
+# USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED
+# AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
+# LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN
+# ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+# POSSIBILITY OF SUCH DAMAGE.
+#
+# The views and conclusions contained in the software and
+# documentation are those of the authors and should not be
+# interpreted as representing official policies, either expressed
+# or implied, of GRNET S.A.
+
+from django.conf.urls.defaults import include, patterns
+
+
+urlpatterns = patterns('',
+    (r'^$', 'pithos_webclient.views.index')
+)
+
diff --git a/snf-pithos-webclient/pithos_webclient/views.py b/snf-pithos-webclient/pithos_webclient/views.py
new file mode 100644 (file)
index 0000000..be6f349
--- /dev/null
@@ -0,0 +1,50 @@
+# Copyright 2011-2012 GRNET S.A. All rights reserved.
+#
+# Redistribution and use in source and binary forms, with or
+# without modification, are permitted provided that the following
+# conditions are met:
+#
+#   1. Redistributions of source code must retain the above
+#      copyright notice, this list of conditions and the following
+#      disclaimer.
+#
+#   2. Redistributions in binary form must reproduce the above
+#      copyright notice, this list of conditions and the following
+#      disclaimer in the documentation and/or other materials
+#      provided with the distribution.
+#
+# THIS SOFTWARE IS PROVIDED BY GRNET S.A. ``AS IS'' AND ANY EXPRESS
+# OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
+# WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
+# PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL GRNET S.A OR
+# CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+# SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
+# LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF
+# USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED
+# AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
+# LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN
+# ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+# POSSIBILITY OF SUCH DAMAGE.
+#
+# The views and conclusions contained in the software and
+# documentation are those of the authors and should not be
+# interpreted as representing official policies, either expressed
+# or implied, of GRNET S.A.
+
+from django.views.generic.simple import direct_to_template
+
+from pithos_webclient import settings
+from pithos_webclient.version import  __version__
+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_webclient/index.html', \
+            {'settings': settings,
+             'MEDIA_URL': MEDIA_URL,
+             'CLIENT_VERSION': __version__,
+             'PITHOS_UI_CLOUDBAR_ACTIVE_SERVICE': settings.CLOUDBAR_ACTIVE_SERVICE
+            })
+
diff --git a/snf-pithos-webclient/setup.py b/snf-pithos-webclient/setup.py
new file mode 100644 (file)
index 0000000..f08248d
--- /dev/null
@@ -0,0 +1,300 @@
+#!/usr/bin/env python
+
+# Copyright 2011-2012 GRNET S.A. All rights reserved.
+#
+# Redistribution and use in source and binary forms, with or
+# without modification, are permitted provided that the following
+# conditions are met:
+#
+#   1. Redistributions of source code must retain the above
+#      copyright notice, this list of conditions and the following
+#      disclaimer.
+#
+#   2. Redistributions in binary form must reproduce the above
+#      copyright notice, this list of conditions and the following
+#      disclaimer in the documentation and/or other materials
+#      provided with the distribution.
+#
+# THIS SOFTWARE IS PROVIDED BY GRNET S.A. ``AS IS'' AND ANY EXPRESS
+# OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
+# WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
+# PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL GRNET S.A OR
+# CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+# SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
+# LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF
+# USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED
+# AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
+# LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN
+# ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+# POSSIBILITY OF SUCH DAMAGE.
+#
+# The views and conclusions contained in the software and
+# documentation are those of the authors and should not be
+# interpreted as representing official policies, either expressed
+# or implied, of GRNET S.A.
+import distribute_setup
+distribute_setup.use_setuptools()
+
+import os
+import sys
+
+from fnmatch import fnmatchcase
+from distutils.util import convert_path
+
+from setuptools import setup, find_packages
+
+
+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_webclient', 'version', HERE)
+except ImportError:
+    pass
+
+from pithos_webclient.version import __version__
+
+# Package info
+VERSION = __version__
+README = open(os.path.join(HERE, 'README')).read()
+CHANGES = open(os.path.join(HERE, 'Changelog')).read()
+SHORT_DESCRIPTION = 'Package short description'
+
+PACKAGES_ROOT = '.'
+PACKAGES = find_packages(PACKAGES_ROOT)
+
+# Package meta
+CLASSIFIERS = [
+        'Development Status :: 3 - Alpha',
+        'Operating System :: OS Independent',
+        'Programming Language :: Python',
+        'Topic :: Utilities',
+        'License :: OSI Approved :: BSD License',
+]
+
+# Package requirements
+INSTALL_REQUIRES = [
+    'Django>=1.2, <1.3',
+    'snf-common>=0.9.0rc'
+]
+
+EXTRAS_REQUIRES = {
+}
+
+TESTS_REQUIRES = [
+]
+
+# Provided as an attribute, so you can append to these instead
+# of replicating them:
+standard_exclude = ["*.py", "*.pyc", "*$py.class", "*~", ".*", "*.bak"]
+standard_exclude_directories = [
+    ".*", "CVS", "_darcs", "./build", "./dist", "EGG-INFO", "*.egg-info", "snf-0.7"
+]
+
+# (c) 2005 Ian Bicking and contributors; written for Paste (http://pythonpaste.org)
+# Licensed under the MIT license: http://www.opensource.org/licenses/mit-license.php
+# Note: you may want to copy this into your setup.py file verbatim, as
+# you can't import this from another package, when you don't know if
+# that package is installed yet.
+def find_package_data(
+    where=".",
+    package="",
+    exclude=standard_exclude,
+    exclude_directories=standard_exclude_directories,
+    only_in_packages=True,
+    show_ignored=False):
+    """
+    Return a dictionary suitable for use in ``package_data``
+    in a distutils ``setup.py`` file.
+
+    The dictionary looks like::
+
+        {"package": [files]}
+
+    Where ``files`` is a list of all the files in that package that
+    don"t match anything in ``exclude``.
+
+    If ``only_in_packages`` is true, then top-level directories that
+    are not packages won"t be included (but directories under packages
+    will).
+
+    Directories matching any pattern in ``exclude_directories`` will
+    be ignored; by default directories with leading ``.``, ``CVS``,
+    and ``_darcs`` will be ignored.
+
+    If ``show_ignored`` is true, then all the files that aren"t
+    included in package data are shown on stderr (for debugging
+    purposes).
+
+    Note patterns use wildcards, or can be exact paths (including
+    leading ``./``), and all searching is case-insensitive.
+    """
+    out = {}
+    stack = [(convert_path(where), "", package, only_in_packages)]
+    while stack:
+        where, prefix, package, only_in_packages = stack.pop(0)
+        for name in os.listdir(where):
+            fn = os.path.join(where, name)
+            if os.path.isdir(fn):
+                bad_name = False
+                for pattern in exclude_directories:
+                    if (fnmatchcase(name, pattern)
+                        or fn.lower() == pattern.lower()):
+                        bad_name = True
+                        if show_ignored:
+                            print >> sys.stderr, (
+                                "Directory %s ignored by pattern %s"
+                                % (fn, pattern))
+                        break
+                if bad_name:
+                    continue
+                if (os.path.isfile(os.path.join(fn, "__init__.py"))
+                    and not prefix):
+                    if not package:
+                        new_package = name
+                    else:
+                        new_package = package + "." + name
+                    stack.append((fn, "", new_package, False))
+                else:
+                    stack.append((fn, prefix + name + "/", package, only_in_packages))
+            elif package or not only_in_packages:
+                # is a file
+                bad_name = False
+                for pattern in exclude:
+                    if (fnmatchcase(name, pattern)
+                        or fn.lower() == pattern.lower()):
+                        bad_name = True
+                        if show_ignored:
+                            print >> sys.stderr, (
+                                "File %s ignored by pattern %s"
+                                % (fn, pattern))
+                        break
+                if bad_name:
+                    continue
+                out.setdefault(package, []).append(prefix+name)
+    return out
+
+
+"""
+Gwt clea/build helpers
+"""
+import subprocess as sp
+import glob
+
+def clean_gwt(root="../", public_dir="bin/www/gr.grnet.pithos.web.Pithos/"):
+    # skip if no build.xml found (debian build process)
+    if not os.path.exists(os.path.join(root, "build.xml")):
+        return
+
+    curdir = os.getcwd()
+    os.chdir(root)
+    rcode = sp.call(["ant", "clean"])
+    if rcode == 1:
+        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_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, "*"))
+
+    # clean dirs
+    if len(clean_static) > 2:
+        sp.call(clean_static)
+    if len(clean_static) > 2:
+        sp.call(clean_templates)
+
+
+def build_gwt(root="../", public_dir="bin/www/gr.grnet.pithos.web.Pithos/"):
+    # skip if no build.xml found (debian build process)
+    if not os.path.exists(os.path.join(root, "build.xml")):
+        return
+
+    curdir = os.getcwd()
+    os.chdir(root)
+    # run ant on root dir
+    rcode = sp.call(["ant"])
+    if rcode == 1:
+        raise Exception("GWT build failed")
+    os.chdir(curdir)
+
+
+    pub_dir = os.path.abspath(os.path.join(root, public_dir))
+    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, "*"))
+
+    # clean dirs
+    if len(clean_static) > 2:
+        sp.call(clean_static)
+    if len(clean_static) > 2:
+        sp.call(clean_templates)
+
+    copy_static = ["cp", "-r"] + glob.glob(os.path.join(pub_dir, "*")) + [static_dir]
+    copy_index = ["cp", os.path.join(pub_dir, "index.html"), templates_dir]
+    sp.call(copy_static)
+    sp.call(copy_index)
+
+    index = os.path.join(templates_dir, "index.html")
+    index_data = file(index).read()
+    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/')
+
+    index_data = index_data.replace("{{ CLOUDBAR_CODE }}", """
+            {{ CLOUDBAR_CODE }}
+            <script>
+            var CLOUDBAR_ACTIVE_SERVICE = "{{ PITHOS_UI_CLOUDBAR_ACTIVE_SERVICE }}"
+            </script>
+    """)
+
+    ifile = file(index, "w+")
+    ifile.write(index_data)
+    ifile.close()
+
+
+# do we need to run ant ???
+if any(x in ''.join(sys.argv) for x in ["sdist", "build", "develop", "install"]):
+    build_gwt()
+
+if any(x in ''.join(sys.argv) for x in ["clean"]):
+    clean_gwt()
+
+
+setup(
+    name='snf-pithos-webclient',
+    version=VERSION,
+    license='BSD',
+    url='http://code.grnet.gr/projects/pithos-web-client',
+    description = SHORT_DESCRIPTION,
+    long_description=README + '\n\n' +  CHANGES,
+    classifiers = CLASSIFIERS,
+    author='GRNET',
+    author_email='pithos@grnet.gr',
+
+    packages=find_packages(),
+    include_package_data=True,
+    package_data=find_package_data('.'),
+    zip_safe=False,
+
+    install_requires = INSTALL_REQUIRES,
+
+    dependency_links = ['http://docs.dev.grnet.gr/pypi'],
+
+    entry_points={
+        'synnefo': [
+             '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'
+        ]
+    }
+)
+
index c8d4f22..8a9dd6b 100644 (file)
                <script type="text/javascript" src="browserplus-min.js"></script>
                <!-- Load plupload and all it's runtimes and finally the jQuery queue widget -->
                <script type="text/javascript" src="plupload/js/plupload.full.js"></script>
-               <script type="text/javascript" src="plupload/js/jquery.plupload.queue/jquery.plupload.queue.js"></script>
-               <script>
-                   var CLOUDBAR_ACTIVE_SERVICE = 'pithos';
-                   var CLOUDBAR_LOCATION = "/static/im/cloudbar/";
-                   var CLOUDBAR_SERVICES = "/im/get_services";
-            var CLOUDBAR_MENU = "/im/get_menu";
-            
-                   $(document).ready(function(){
-                     $.getScript(CLOUDBAR_LOCATION + 'cloudbar.js');
-                   })
-               </script>
-               <script>
+        <script type="text/javascript" src="plupload/js/jquery.plupload.queue/jquery.plupload.queue.js"></script>
+
+        {{ CLOUDBAR_CODE }}
+        
+        <script>
                        var otherProperties = {
                                loginUrl: "/im/login?next=",
                                feedbackUrl: "/feedback",