# HG changeset patch
# User cavaliet
# Date 1339085885 -7200
# Node ID acafed2ba9601bc6900cfcf957fc1bdf24aefa05
# Parent  69b3c4d7a7c111082d09a15ccbac82024339c8d5# Parent  dfdd945df4aee0ef14c6ae458a1909f7a9c0bd16
Merge with dfdd945df4aee0ef14c6ae458a1909f7a9c0bd16

diff -r 69b3c4d7a7c1 -r acafed2ba960 .settings/org.eclipse.core.resources.prefs
--- a/.settings/org.eclipse.core.resources.prefs	Thu Jun 07 18:13:34 2012 +0200
+++ b/.settings/org.eclipse.core.resources.prefs	Thu Jun 07 18:18:05 2012 +0200
@@ -1,4 +1,3 @@
-#Thu Feb 09 19:01:11 CET 2012
 eclipse.preferences.version=1
 encoding//src/ldt/ldt/core/migrations/0001_initial.py=utf-8
 encoding//src/ldt/ldt/core/migrations/0002_auto__del_owner.py=utf-8
@@ -12,13 +11,10 @@
 encoding//src/ldt/ldt/ldt_utils/migrations/0010_auto__add_annotationstat.py=utf-8
 encoding//src/ldt/ldt/ldt_utils/migrations/0011_gen_stat_annotation.py=utf-8
 encoding//src/ldt/ldt/ldt_utils/migrations/0015_auto__add_contentstat__del_field_content_last_annotated__del_field_con.py=utf-8
-encoding//src/ldt/ldt/ldt_utils/migrations/0016_one_to_one_stat_annotation.py=utf-8
 encoding//src/ldt/ldt/management/utils.py=utf-8
 encoding//src/ldt/ldt/text/migrations/0001_initial.py=utf-8
 encoding//src/ldt/ldt/user/migrations/0001_initial.py=utf-8
-encoding//src/ldt/ldt/user/migrations/0002_auto__del_irigroup.py=utf-8
-encoding//src/ldt/ldt/user/migrations/0004_fill_language.py=utf-8
-encoding//src/ldt/ldt/user/migrations/0005_add_permission_owner_group.py=utf-8
+encoding//src/ldt/ldt/user/migrations/0008_auto__chg_field_groupprofile_image__chg_field_groupprofile_group__chg_.py.old=utf-8
 encoding//virtualenv/web/env/guardianenv/Lib/site-packages/guardian/migrations/0001_initial.py=utf-8
 encoding//web/ldtplatform/config.py=utf-8
 encoding//web/ldtplatform/settings.py=utf-8
diff -r 69b3c4d7a7c1 -r acafed2ba960 src/ldt/ldt/ldt_utils/urls.py
--- a/src/ldt/ldt/ldt_utils/urls.py	Thu Jun 07 18:13:34 2012 +0200
+++ b/src/ldt/ldt/ldt_utils/urls.py	Thu Jun 07 18:18:05 2012 +0200
@@ -23,8 +23,8 @@
     url(r'^copy/(?P<ldt_id>.*)/(?P<group_id>.*)$', 'views.project.copy_project'),
     url(r'^copy/(?P<ldt_id>.*)$', 'views.project.copy_project'),
     url(r'^update/(?P<ldt_id>.*)$', 'views.project.update_project'),
-    url(r'^cljson/id/(?P<id>.*)$', 'views.json.project_json_id'),
-    url(r'^cljson/externalid/(?P<id>.*)$', 'views.json.project_json_externalid'),
+    url(r'^cljson/id/(?P<id>.*)$', 'views.json.project_json_id', name="projectjson_id"),
+    url(r'^cljson/externalid/(?P<id>.*)$', 'views.json.project_json_externalid', name="projectjson_externalid"),
     url(r'cljson/idcutting/(?P<id>.*)/(?P<cutting_id>.*)$', 'views.json.project_json_cutting_id'),
     url(r'^rdf/id/(?P<ldt_id>.*)$', 'views.rdf.project_annotations_rdf'),
     url(r'^workspace/?$', "views.workspace.home", name="root-view"),
diff -r 69b3c4d7a7c1 -r acafed2ba960 src/ldt/ldt/management/commands/initfrontproject.py
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/src/ldt/ldt/management/commands/initfrontproject.py	Thu Jun 07 18:18:05 2012 +0200
@@ -0,0 +1,46 @@
+from django.core.management.base import LabelCommand, CommandError
+from ldt.ldt_utils.models import Content
+from optparse import make_option
+from django.db import transaction
+
+class Command(LabelCommand):
+    help = 'init front project for content'    
+    option_list = LabelCommand.option_list + (
+        make_option('--noinput', action='store_false', dest='interactive', default=True,
+            help='Tells to NOT prompt the user for input of any kind.'),
+        make_option('--all-yes', action='store_true', dest='allyes',
+            default=False, help='Answer yes to all question'),
+    )
+
+    def handle_label(self, label, **options):
+        
+        interactive = options.get('interactive')
+        allyes = options.get('allyes')
+            
+        try:   
+            content = Content.objects.get_by_natural_key(label)
+        except Content.DoesNotExist:
+            raise CommandError("Content \"%s\" does not exists." % label)
+        
+        if content is None:
+            raise CommandError("Content \"%s\" does not exists." % label)
+
+        do_delete = allyes
+        if interactive and (not do_delete) and content.front_project is not None:
+            confirm = raw_input("""The content already has a front project. Do you want to delete it ?
+
+    Type 'yes' to delete, or 'no' to keep: """)
+            do_delete = (confirm == "yes")
+        
+        with transaction.commit_on_success():        
+            if do_delete:
+                fp = content.front_project
+                content.front_project = None
+                content.save()
+                fp.contents.clear()
+                fp.delete()
+            
+            content.create_front_project()
+            self.stdout.write('Successfully created front project for content "%s"' % label)
+        
+    
\ No newline at end of file
diff -r 69b3c4d7a7c1 -r acafed2ba960 src/ldt/ldt/security/__init__.py
--- a/src/ldt/ldt/security/__init__.py	Thu Jun 07 18:13:34 2012 +0200
+++ b/src/ldt/ldt/security/__init__.py	Thu Jun 07 18:18:05 2012 +0200
@@ -40,7 +40,7 @@
     current = get_current_user()
     if current:
         return current
-    admin = User.objects.filter(is_superuse=True)[0]
+    admin = User.objects.filter(is_superuser=True)[0]
     return admin
 
 def protect_models():
diff -r 69b3c4d7a7c1 -r acafed2ba960 src/ldt/ldt/user/migrations/0008_auto__chg_field_groupprofile_image__chg_field_groupprofile_group__chg_.py
--- a/src/ldt/ldt/user/migrations/0008_auto__chg_field_groupprofile_image__chg_field_groupprofile_group__chg_.py	Thu Jun 07 18:13:34 2012 +0200
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,85 +0,0 @@
-#@PydevCodeAnalysisIgnore
-# encoding: utf-8
-import datetime
-from south.db import db
-from south.v2 import SchemaMigration
-from django.db import models
-
-class Migration(SchemaMigration):
-
-    def forwards(self, orm):
-        
-        # Changing field 'GroupProfile.image'
-        db.alter_column('user_groupprofile', 'image', self.gf('sorl.thumbnail.fields.ImageField')(max_length=200))
-
-        # Changing field 'UserProfile.image'
-        db.alter_column('user_userprofile', 'image', self.gf('sorl.thumbnail.fields.ImageField')(max_length=200))
-
-
-    def backwards(self, orm):
-        
-        # Changing field 'GroupProfile.image'
-        db.alter_column('user_groupprofile', 'image', self.gf('sorl.thumbnail.fields.ImageField')(max_length=100))
-
-        # Changing field 'UserProfile.image'
-        db.alter_column('user_userprofile', 'image', self.gf('sorl.thumbnail.fields.ImageField')(max_length=100))
-
-
-    models = {
-        'auth.group': {
-            'Meta': {'object_name': 'Group'},
-            'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
-            'name': ('django.db.models.fields.CharField', [], {'unique': 'True', 'max_length': '80'}),
-            'permissions': ('django.db.models.fields.related.ManyToManyField', [], {'to': "orm['auth.Permission']", 'symmetrical': 'False', 'blank': 'True'})
-        },
-        'auth.permission': {
-            'Meta': {'ordering': "('content_type__app_label', 'content_type__model', 'codename')", 'unique_together': "(('content_type', 'codename'),)", 'object_name': 'Permission'},
-            'codename': ('django.db.models.fields.CharField', [], {'max_length': '100'}),
-            'content_type': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['contenttypes.ContentType']"}),
-            'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
-            'name': ('django.db.models.fields.CharField', [], {'max_length': '50'})
-        },
-        'auth.user': {
-            'Meta': {'object_name': 'User'},
-            'date_joined': ('django.db.models.fields.DateTimeField', [], {'default': 'datetime.datetime.now'}),
-            'email': ('django.db.models.fields.EmailField', [], {'max_length': '75', 'blank': 'True'}),
-            'first_name': ('django.db.models.fields.CharField', [], {'max_length': '30', 'blank': 'True'}),
-            'groups': ('django.db.models.fields.related.ManyToManyField', [], {'to': "orm['auth.Group']", 'symmetrical': 'False', 'blank': 'True'}),
-            'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
-            'is_active': ('django.db.models.fields.BooleanField', [], {'default': 'True'}),
-            'is_staff': ('django.db.models.fields.BooleanField', [], {'default': 'False'}),
-            'is_superuser': ('django.db.models.fields.BooleanField', [], {'default': 'False'}),
-            'last_login': ('django.db.models.fields.DateTimeField', [], {'default': 'datetime.datetime.now'}),
-            'last_name': ('django.db.models.fields.CharField', [], {'max_length': '30', 'blank': 'True'}),
-            'password': ('django.db.models.fields.CharField', [], {'max_length': '128'}),
-            'user_permissions': ('django.db.models.fields.related.ManyToManyField', [], {'to': "orm['auth.Permission']", 'symmetrical': 'False', 'blank': 'True'}),
-            'username': ('django.db.models.fields.CharField', [], {'unique': 'True', 'max_length': '30'})
-        },
-        'contenttypes.contenttype': {
-            'Meta': {'ordering': "('name',)", 'unique_together': "(('app_label', 'model'),)", 'object_name': 'ContentType', 'db_table': "'django_content_type'"},
-            'app_label': ('django.db.models.fields.CharField', [], {'max_length': '100'}),
-            'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
-            'model': ('django.db.models.fields.CharField', [], {'max_length': '100'}),
-            'name': ('django.db.models.fields.CharField', [], {'max_length': '100'})
-        },
-        'user.groupprofile': {
-            'Meta': {'object_name': 'GroupProfile'},
-            'description': ('django.db.models.fields.TextField', [], {}),
-            'group': ('django.db.models.fields.related.OneToOneField', [], {'related_name': "'profile'", 'unique': 'True', 'to': "orm['auth.Group']"}),
-            'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
-            'image': ('sorl.thumbnail.fields.ImageField', [], {'default': "'thumbnails/groups/group_default_icon.png'", 'max_length': '200'})
-        },
-        'user.ldt': {
-            'Meta': {'object_name': 'Ldt', '_ormbases': ['auth.User']},
-            'user_ptr': ('django.db.models.fields.related.OneToOneField', [], {'to': "orm['auth.User']", 'unique': 'True', 'primary_key': 'True'})
-        },
-        'user.userprofile': {
-            'Meta': {'object_name': 'UserProfile'},
-            'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
-            'image': ('sorl.thumbnail.fields.ImageField', [], {'default': "'thumbnails/users/user_default_icon.png'", 'max_length': '200'}),
-            'language': ('django.db.models.fields.CharField', [], {'default': "'fr'", 'max_length': '2'}),
-            'user': ('django.db.models.fields.related.OneToOneField', [], {'to': "orm['auth.User']", 'unique': 'True'})
-        }
-    }
-
-    complete_apps = ['user']
diff -r 69b3c4d7a7c1 -r acafed2ba960 src/ldt/ldt/user/migrations/0008_auto__chg_field_groupprofile_image__chg_field_groupprofile_group__chg_.py.old
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/src/ldt/ldt/user/migrations/0008_auto__chg_field_groupprofile_image__chg_field_groupprofile_group__chg_.py.old	Thu Jun 07 18:18:05 2012 +0200
@@ -0,0 +1,85 @@
+#@PydevCodeAnalysisIgnore
+# encoding: utf-8
+import datetime
+from south.db import db
+from south.v2 import SchemaMigration
+from django.db import models
+
+class Migration(SchemaMigration):
+
+    def forwards(self, orm):
+        
+        # Changing field 'GroupProfile.image'
+        db.alter_column('user_groupprofile', 'image', self.gf('sorl.thumbnail.fields.ImageField')(max_length=200))
+
+        # Changing field 'UserProfile.image'
+        db.alter_column('user_userprofile', 'image', self.gf('sorl.thumbnail.fields.ImageField')(max_length=200))
+
+
+    def backwards(self, orm):
+        
+        # Changing field 'GroupProfile.image'
+        db.alter_column('user_groupprofile', 'image', self.gf('sorl.thumbnail.fields.ImageField')(max_length=100))
+
+        # Changing field 'UserProfile.image'
+        db.alter_column('user_userprofile', 'image', self.gf('sorl.thumbnail.fields.ImageField')(max_length=100))
+
+
+    models = {
+        'auth.group': {
+            'Meta': {'object_name': 'Group'},
+            'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
+            'name': ('django.db.models.fields.CharField', [], {'unique': 'True', 'max_length': '80'}),
+            'permissions': ('django.db.models.fields.related.ManyToManyField', [], {'to': "orm['auth.Permission']", 'symmetrical': 'False', 'blank': 'True'})
+        },
+        'auth.permission': {
+            'Meta': {'ordering': "('content_type__app_label', 'content_type__model', 'codename')", 'unique_together': "(('content_type', 'codename'),)", 'object_name': 'Permission'},
+            'codename': ('django.db.models.fields.CharField', [], {'max_length': '100'}),
+            'content_type': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['contenttypes.ContentType']"}),
+            'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
+            'name': ('django.db.models.fields.CharField', [], {'max_length': '50'})
+        },
+        'auth.user': {
+            'Meta': {'object_name': 'User'},
+            'date_joined': ('django.db.models.fields.DateTimeField', [], {'default': 'datetime.datetime.now'}),
+            'email': ('django.db.models.fields.EmailField', [], {'max_length': '75', 'blank': 'True'}),
+            'first_name': ('django.db.models.fields.CharField', [], {'max_length': '30', 'blank': 'True'}),
+            'groups': ('django.db.models.fields.related.ManyToManyField', [], {'to': "orm['auth.Group']", 'symmetrical': 'False', 'blank': 'True'}),
+            'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
+            'is_active': ('django.db.models.fields.BooleanField', [], {'default': 'True'}),
+            'is_staff': ('django.db.models.fields.BooleanField', [], {'default': 'False'}),
+            'is_superuser': ('django.db.models.fields.BooleanField', [], {'default': 'False'}),
+            'last_login': ('django.db.models.fields.DateTimeField', [], {'default': 'datetime.datetime.now'}),
+            'last_name': ('django.db.models.fields.CharField', [], {'max_length': '30', 'blank': 'True'}),
+            'password': ('django.db.models.fields.CharField', [], {'max_length': '128'}),
+            'user_permissions': ('django.db.models.fields.related.ManyToManyField', [], {'to': "orm['auth.Permission']", 'symmetrical': 'False', 'blank': 'True'}),
+            'username': ('django.db.models.fields.CharField', [], {'unique': 'True', 'max_length': '30'})
+        },
+        'contenttypes.contenttype': {
+            'Meta': {'ordering': "('name',)", 'unique_together': "(('app_label', 'model'),)", 'object_name': 'ContentType', 'db_table': "'django_content_type'"},
+            'app_label': ('django.db.models.fields.CharField', [], {'max_length': '100'}),
+            'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
+            'model': ('django.db.models.fields.CharField', [], {'max_length': '100'}),
+            'name': ('django.db.models.fields.CharField', [], {'max_length': '100'})
+        },
+        'user.groupprofile': {
+            'Meta': {'object_name': 'GroupProfile'},
+            'description': ('django.db.models.fields.TextField', [], {}),
+            'group': ('django.db.models.fields.related.OneToOneField', [], {'related_name': "'profile'", 'unique': 'True', 'to': "orm['auth.Group']"}),
+            'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
+            'image': ('sorl.thumbnail.fields.ImageField', [], {'default': "'thumbnails/groups/group_default_icon.png'", 'max_length': '200'})
+        },
+        'user.ldt': {
+            'Meta': {'object_name': 'Ldt', '_ormbases': ['auth.User']},
+            'user_ptr': ('django.db.models.fields.related.OneToOneField', [], {'to': "orm['auth.User']", 'unique': 'True', 'primary_key': 'True'})
+        },
+        'user.userprofile': {
+            'Meta': {'object_name': 'UserProfile'},
+            'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
+            'image': ('sorl.thumbnail.fields.ImageField', [], {'default': "'thumbnails/users/user_default_icon.png'", 'max_length': '200'}),
+            'language': ('django.db.models.fields.CharField', [], {'default': "'fr'", 'max_length': '2'}),
+            'user': ('django.db.models.fields.related.OneToOneField', [], {'to': "orm['auth.User']", 'unique': 'True'})
+        }
+    }
+
+    complete_apps = ['user']
diff -r 69b3c4d7a7c1 -r acafed2ba960 src/ldt/ldt/user/models.py
--- a/src/ldt/ldt/user/models.py	Thu Jun 07 18:13:34 2012 +0200
+++ b/src/ldt/ldt/user/models.py	Thu Jun 07 18:18:05 2012 +0200
@@ -41,7 +41,7 @@
     def create_user_profile(sender, instance, created, **kwargs):
         if created:
             UserProfile.objects.create(user=instance)
-            everyone = Group.objects.get(name=settings.PUBLIC_GROUP_NAME)
+            everyone, _ = Group.objects.get_or_create(name=settings.PUBLIC_GROUP_NAME)
             instance.groups.add(everyone)
 
 class GroupProfile(models.Model):
diff -r 69b3c4d7a7c1 -r acafed2ba960 virtualenv/res/lib/lib_create_env.py
--- a/virtualenv/res/lib/lib_create_env.py	Thu Jun 07 18:13:34 2012 +0200
+++ b/virtualenv/res/lib/lib_create_env.py	Thu Jun 07 18:18:05 2012 +0200
@@ -16,28 +16,26 @@
     #'': {'setup': '', 'url':'', 'local':''},
     'DISTRIBUTE': {'setup': 'distribute', 'url':'http://pypi.python.org/packages/source/d/distribute/distribute-0.6.14.tar.gz', 'local':"distribute-0.6.14.tar.gz"},
     'DJANGO': {'setup': 'django', 'url': 'http://www.djangoproject.com/download/1.4/tarball/', 'local':"Django-1.4.tar.gz"},
-    'DJANGO-EXTENSIONS': { 'setup': 'django-extensions', 'url':'https://github.com/django-extensions/django-extensions/tarball/0.6', 'local':"django-extensions-0.6.tar.gz"},
-    'DJANGO-REGISTRATION': { 'setup': 'django-registration', 'url':'http://bitbucket.org/ubernostrum/django-registration/get/tip.tar.gz', 'local':"django-registration.tar.gz"},
+    'DJANGO-EXTENSIONS': { 'setup': 'django-extensions', 'url':'https://github.com/django-extensions/django-extensions/tarball/0.8', 'local':"django-extensions-0.8.tar.gz"},
+    'DJANGO-REGISTRATION': { 'setup': 'django-registration', 'url':'https://bitbucket.org/ubernostrum/django-registration/get/v0.8.tar.gz', 'local':"django-registration-0.8.tar.gz"},
     'DJANGO-TAGGING': { 'setup': 'django-tagging', 'url':'http://django-tagging.googlecode.com/files/django-tagging-0.3.1.tar.gz', 'local':"django-tagging-0.3.1.tar.gz"},
-    'DJANGO-PISTON': { 'setup': 'django-piston', 'url':"django-piston-0.2.2-modified.tar.gz", 'local':"django-piston-0.2.2-modified.tar.gz"},
-    'OAUTH2': { 'setup': 'python-oauth2', 'url':"http://pypi.python.org/packages/source/o/oauth2/oauth2-1.5.168.tar.gz", 'local':"oauth2-1.5.167.tar.gz"},
-    'HTTPLIB2': { 'setup': 'python-httplib2', 'url':'http://httplib2.googlecode.com/files/httplib2-0.6.0.tar.gz', 'local':"httplib2-0.6.0.tar.gz"},
+    'DJANGO-PISTON': { 'setup': 'django-piston', 'url':'django-piston-7c90898072ce-modifed.tar.gz', 'local':'django-piston-7c90898072ce-modifed.tar.gz'},
+    'OAUTH2': { 'setup': 'python-oauth2', 'url':"https://github.com/simplegeo/python-oauth2/tarball/hudson-python-oauth2-211", 'local':"oauth2-1.5.211.tar.gz"},
+    'HTTPLIB2': { 'setup': 'python-httplib2', 'url':'http://code.google.com/p/httplib2/downloads/detail?name=httplib2-0.7.4.tar.gz&can=2&q=', 'local':"httplib2-0.7.4.tar.gz"},
     'DJANGO-OAUTH-PLUS': { 'setup': 'django-oauth-plus', 'url':'http://bitbucket.org/david/django-oauth-plus/get/f314f018e473.gz', 'local':"django-oauth-plus.tar.gz"},
     'MYSQL': { 'setup': 'mysql-python', 'url': 'http://sourceforge.net/projects/mysql-python/files/mysql-python/1.2.3/MySQL-python-1.2.3.tar.gz/download', 'local':"MySQL-python-1.2.3.tar.gz"},
     'OPENID': {'setup':'openid', 'url':'http://pypi.python.org/packages/source/p/python-openid/python-openid-2.2.5.tar.gz', 'local':"python-openid-2.2.5.tar.gz"},
     'DJANGO_OPENID_CONSUMER': {'setup':'django_openid_consumer', 'url':'http://pypi.python.org/packages/source/d/django-openid-consumer/django-openid-consumer-0.1.1.tar.gz', 'local':"django-openid-consumer-0.1.1.tar.gz"},
     'SOCIAL_AUTH': {'setup':'social_auth', 'url':'https://github.com/omab/django-social-auth/tarball/v0.3.10', 'local':"omab-django-social-auth-v0.3.10-modified.tar.gz"},
-    'SOUTH': { 'setup': 'South', 'url':'http://www.aeracode.org/releases/south/south-0.7.3.tar.gz', 'local':"south-0.7.3.tar.gz"},
+    'SOUTH': { 'setup': 'South', 'url':'http://www.aeracode.org/releases/south/south-0.7.5.tar.gz', 'local':"south-0.7.5.tar.gz"},
     'DJANGO_GUARDIAN' : { 'setup': 'django-guardian', 'url':'http://pypi.python.org/packages/source/d/django-guardian/django-guardian-1.0.3.tar.gz', 'local':"django-guardian-1.0.3.tar.gz"},
     'SORL_THUMBNAIL' : { 'setup': 'sorl-thumbnail', 'url':'http://pypi.python.org/packages/source/s/sorl-thumbnail/sorl-thumbnail-11.12.tar.gz', 'local':"sorl-thumbnail-v10.12.1.tar.gz"},
     'LIBJPEG': {'setup': None, 'url':'jpegsrc.v8d.tar.gz', 'local':'jpegsrc.v8d.tar.gz'},
-    'ZLIB': {'setup': None, 'url':'zlib-1.2.6.tar.gz', 'local':'zlib-1.2.6.tar.gz'},
+    'ZLIB': {'setup': None, 'url':'zlib-1.2.7.tar.gz', 'local':'zlib-1.2.7.tar.gz'},
     'PYCRYPTO': {'setup': 'pycrypto', 'url':'https://ftp.dlitz.net/pub/dlitz/crypto/pycrypto/pycrypto-2.6.tar.gz', 'local':'pycrypto-2.6.tar.gz'},
-    'SSH': {'setup': 'ssh', 'url':'http://pypi.python.org/packages/source/s/ssh/ssh-1.7.13.tar.gz#md5=26800ef2c1ee3f185f48fd05258302f4', 'local':'ssh-1.7.13.tar.gz'},
-    'FABRIC': {'setup': 'fabric', 'url':'https://github.com/fabric/fabric/tarball/1.4.1', 'local':'fabric-1.4.1.tar.gz'},
-    'MERCURIAL': {'setup': 'mercurial', 'url':'http://mercurial.selenic.com/release/mercurial-2.2.1.tar.gz', 'local':'mercurial-2.2.1.tar.gz'},
-    'MEMCHACHED': {'setup': 'python-memcached', 'url':'http://ftp.tummy.com/pub/python-memcached/old-releases/python-memcached-1.48.tar.gz', 'local':'python-memcached-1.48.tar.gz'},
-    'UWSGI': {'setup': 'uwsgi', 'url': 'http://projects.unbit.it/downloads/uwsgi-1.2.3.tar.gz', 'local':'uwsgi-1.2.3.tar.gz'}
+    'SSH': {'setup': 'ssh', 'url':'http://pypi.python.org/packages/source/s/ssh/ssh-1.7.14.tar.gz#md5=4cdd0549ef4699bd67b96264d3b21427', 'local':'ssh-1.7.14.tar.gz'},
+    'FABRIC': {'setup': 'fabric', 'url':'https://github.com/fabric/fabric/tarball/1.4.2', 'local':'fabric-1.4.2.tar.gz'},
+    'MERCURIAL': {'setup': 'mercurial', 'url':'http://mercurial.selenic.com/release/mercurial-2.2.2.tar.gz', 'local':'mercurial-2.2.2.tar.gz'},
 }
 
 if system_str == 'Windows':
@@ -50,10 +48,10 @@
     })
 else:
     URLS.update({
-        'PSYCOPG2': {'setup': 'psycopg2','url': 'http://www.psycopg.org/psycopg/tarballs/PSYCOPG-2-4/psycopg2-2.4.tar.gz', 'local':"psycopg2-2.4.tar.gz"},
-        'PYLUCENE': {'setup': 'pylucene', 'url': 'http://apache.crihan.fr/dist//lucene/pylucene/pylucene-3.1.0-1-src.tar.gz', 'local':"pylucene-3.1.0-1-src.tar.gz"},
+        'PSYCOPG2': {'setup': 'psycopg2','url': 'http://www.psycopg.org/psycopg/tarballs/PSYCOPG-2-4/psycopg2-2.4.5.tar.gz', 'local':"psycopg2-2.4.5.tar.gz"},
+        'PYLUCENE': {'setup': 'pylucene', 'url': 'http://mirrors.ircam.fr/pub/apache/lucene/pylucene/pylucene-3.6.0-2-src.tar.gz', 'local':"pylucene-3.6.0-2-src.tar.gz"},
         'PIL': {'setup': 'pil', 'url': 'http://effbot.org/downloads/Imaging-1.1.7.tar.gz', 'local':"Imaging-1.1.7.tar.gz"},
-        'LXML': {'setup': 'lxml', 'url':"lxml-2.3.1.tar.bz2", 'local':"lxml-2.3.1.tar.bz2"}
+        'LXML': {'setup': 'lxml', 'url':"lxml-2.3.4.tar.bz2", 'local':"lxml-2.3.4.tar.bz2"}
     })
 
 
diff -r 69b3c4d7a7c1 -r acafed2ba960 virtualenv/res/src/django-extensions-0.6.tar.gz
Binary file virtualenv/res/src/django-extensions-0.6.tar.gz has changed
diff -r 69b3c4d7a7c1 -r acafed2ba960 virtualenv/res/src/django-extensions-0.8.tar.gz
Binary file virtualenv/res/src/django-extensions-0.8.tar.gz has changed
diff -r 69b3c4d7a7c1 -r acafed2ba960 virtualenv/res/src/django-piston-0.2.2-modified.tar.gz
Binary file virtualenv/res/src/django-piston-0.2.2-modified.tar.gz has changed
diff -r 69b3c4d7a7c1 -r acafed2ba960 virtualenv/res/src/django-piston-7c90898072ce-modifed.tar.gz
Binary file virtualenv/res/src/django-piston-7c90898072ce-modifed.tar.gz has changed
diff -r 69b3c4d7a7c1 -r acafed2ba960 virtualenv/res/src/django-registration-0.8.tar.gz
Binary file virtualenv/res/src/django-registration-0.8.tar.gz has changed
diff -r 69b3c4d7a7c1 -r acafed2ba960 virtualenv/res/src/django-registration.tar.gz
Binary file virtualenv/res/src/django-registration.tar.gz has changed
diff -r 69b3c4d7a7c1 -r acafed2ba960 virtualenv/res/src/fabric-1.4.1.tar.gz
Binary file virtualenv/res/src/fabric-1.4.1.tar.gz has changed
diff -r 69b3c4d7a7c1 -r acafed2ba960 virtualenv/res/src/fabric-1.4.2.tar.gz
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/virtualenv/res/src/fabric-1.4.2.tar.gz	Thu Jun 07 18:18:05 2012 +0200
@@ -0,0 +1,1 @@
+<html><body>You are being <a href="https://nodeload.github.com/fabric/fabric/tarball/1.4.2">redirected</a>.</body></html>
\ No newline at end of file
diff -r 69b3c4d7a7c1 -r acafed2ba960 virtualenv/res/src/httplib2-0.6.0.tar.gz
Binary file virtualenv/res/src/httplib2-0.6.0.tar.gz has changed
diff -r 69b3c4d7a7c1 -r acafed2ba960 virtualenv/res/src/httplib2-0.7.4.tar.gz
Binary file virtualenv/res/src/httplib2-0.7.4.tar.gz has changed
diff -r 69b3c4d7a7c1 -r acafed2ba960 virtualenv/res/src/lxml-2.3.1.tar.bz2
Binary file virtualenv/res/src/lxml-2.3.1.tar.bz2 has changed
diff -r 69b3c4d7a7c1 -r acafed2ba960 virtualenv/res/src/lxml-2.3.4.tar.bz2
Binary file virtualenv/res/src/lxml-2.3.4.tar.bz2 has changed
diff -r 69b3c4d7a7c1 -r acafed2ba960 virtualenv/res/src/mercurial-2.2.1.tar.gz
Binary file virtualenv/res/src/mercurial-2.2.1.tar.gz has changed
diff -r 69b3c4d7a7c1 -r acafed2ba960 virtualenv/res/src/mercurial-2.2.2.tar.gz
Binary file virtualenv/res/src/mercurial-2.2.2.tar.gz has changed
diff -r 69b3c4d7a7c1 -r acafed2ba960 virtualenv/res/src/oauth2-1.5.167.tar.gz
Binary file virtualenv/res/src/oauth2-1.5.167.tar.gz has changed
diff -r 69b3c4d7a7c1 -r acafed2ba960 virtualenv/res/src/oauth2-1.5.211.tar.gz
Binary file virtualenv/res/src/oauth2-1.5.211.tar.gz has changed
diff -r 69b3c4d7a7c1 -r acafed2ba960 virtualenv/res/src/psycopg2-2.4.5.tar.gz
Binary file virtualenv/res/src/psycopg2-2.4.5.tar.gz has changed
diff -r 69b3c4d7a7c1 -r acafed2ba960 virtualenv/res/src/psycopg2-2.4.tar.gz
Binary file virtualenv/res/src/psycopg2-2.4.tar.gz has changed
diff -r 69b3c4d7a7c1 -r acafed2ba960 virtualenv/res/src/pycrypto-2.6.tar.gz
Binary file virtualenv/res/src/pycrypto-2.6.tar.gz has changed
diff -r 69b3c4d7a7c1 -r acafed2ba960 virtualenv/res/src/pylucene-3.1.0-1-src.tar.gz
Binary file virtualenv/res/src/pylucene-3.1.0-1-src.tar.gz has changed
diff -r 69b3c4d7a7c1 -r acafed2ba960 virtualenv/res/src/pylucene-3.6.0-2-src.tar.gz
Binary file virtualenv/res/src/pylucene-3.6.0-2-src.tar.gz has changed
diff -r 69b3c4d7a7c1 -r acafed2ba960 virtualenv/res/src/south-0.7.3.tar.gz
Binary file virtualenv/res/src/south-0.7.3.tar.gz has changed
diff -r 69b3c4d7a7c1 -r acafed2ba960 virtualenv/res/src/south-0.7.5.tar.gz
Binary file virtualenv/res/src/south-0.7.5.tar.gz has changed
diff -r 69b3c4d7a7c1 -r acafed2ba960 virtualenv/res/src/ssh-1.7.13.tar.gz
Binary file virtualenv/res/src/ssh-1.7.13.tar.gz has changed
diff -r 69b3c4d7a7c1 -r acafed2ba960 virtualenv/res/src/ssh-1.7.14.tar.gz
Binary file virtualenv/res/src/ssh-1.7.14.tar.gz has changed
diff -r 69b3c4d7a7c1 -r acafed2ba960 virtualenv/res/src/zlib-1.2.6.tar.gz
Binary file virtualenv/res/src/zlib-1.2.6.tar.gz has changed
diff -r 69b3c4d7a7c1 -r acafed2ba960 virtualenv/res/src/zlib-1.2.7.tar.gz
Binary file virtualenv/res/src/zlib-1.2.7.tar.gz has changed
diff -r 69b3c4d7a7c1 -r acafed2ba960 virtualenv/web/res/res_create_env.py
--- a/virtualenv/web/res/res_create_env.py	Thu Jun 07 18:13:34 2012 +0200
+++ b/virtualenv/web/res/res_create_env.py	Thu Jun 07 18:18:05 2012 +0200
@@ -28,7 +28,7 @@
     ('DJANGO-EXTENSIONS', 'pip', None, None),
     ('DJANGO-REGISTRATION', 'easy_install', '-Z', None),
     ('DJANGO-TAGGING', 'pip', None, None),
-    ('DJANGO-PISTON', 'pip', None, None),
+    ('DJANGO-PISTON', 'easy_install', None, None),
     ('HTTPLIB2', 'pip', None, None),
     ('OAUTH2', 'easy_install', None, None),
     ('DJANGO-OAUTH-PLUS', 'pip', None, None),
diff -r 69b3c4d7a7c1 -r acafed2ba960 web/ldtplatform/settings.py
--- a/web/ldtplatform/settings.py	Thu Jun 07 18:13:34 2012 +0200
+++ b/web/ldtplatform/settings.py	Thu Jun 07 18:18:05 2012 +0200
@@ -200,17 +200,6 @@
 SOCIAL_AUTH_COMPLETE_URL_NAME  = 'complete'
 SOCIAL_AUTH_ASSOCIATE_URL_NAME = 'associate_complete'
 
-# twitter testing
-TEST_TWITTER_USER = 'jacquesverrier@gmail.com'
-TEST_TWITTER_PASSWORD = ''
-
-# facebook testing
-#TEST_FACEBOOK_USER = 'testing_account'
-#TEST_FACEBOOK_PASSWORD = 'password_for_testing_account'
-
-# google testing
-TEST_GOOGLE_USER = 'jacquesverrier@gmail.com'
-TEST_GOOGLE_PASSWORD = ''
 
 AUTO_INDEX_AFTER_SAVE = True