updated manifold API to support the move to SSL for the backend

diff --git a/manifold/manifoldapi.py b/manifold/manifoldapi.py
index 35fd3d7..f23ba20 100644 (file)
--- a/manifold/manifoldapi.py
+++ b/manifold/manifoldapi.py
@@ -55,7 +55,11 @@ class ManifoldAPI:
             try:
                 if debug:
                     print "====> ManifoldAPI.%s"%methodName,"auth",self.auth,"args",args,"kwds",kwds
-                result=getattr(self.server, methodName)(self.auth, *args, **kwds)
+                annotations = {
+                    'authentication': self.auth
+                }
+                args += (annotations,)
+                result=getattr(self.server, methodName)(*args, **kwds)
                 if debug:
                     print '<==== backend call %s(*%s,**%s) returned'%(methodName,args,kwds),
                     print '.ctd. Authmethod=',self.auth['AuthMethod'], self.url,'->',

diff --git a/manifold/metadata.py b/manifold/metadata.py
index 420821c..4fbbc06 100644 (file)
--- a/manifold/metadata.py
+++ b/manifold/metadata.py
@@ -34,7 +34,8 @@ class MetaData:
         #          'column.resource_type', 'column.value_type',
         #          'column.allowed_values', 'column.platforms.platform',
         #          'column.platforms.platform_url']
-        result = manifold_api.Get({
+        result = manifold_api.forward({
+            'action': 'get',
             'object': 'local:object', # proposed to replace metadata:table
             'fields':     fields 
         })

diff --git a/myslice/config.py b/myslice/config.py
index 53295c4..04f4aaf 100644 (file)
--- a/myslice/config.py
+++ b/myslice/config.py
@@ -18,10 +18,10 @@ class Config(object):
 
     # the OpenLab-wide backend as managed by UPMC
     # xxx production should probably use https of course
-    default_manifold_url = "http://test.myslice.info:7080/"
-    # the devel/unstable version runs on "http://dev.myslice.info:7080/"
+    default_manifold_url = "https://test.myslice.info:7080/"
+    # the devel/unstable version runs on "https://dev.myslice.info:7080/"
     # if you use a development backend running on this box, use "http://localhost:7080/"
-    # the INRIA setup is with "http://manifold.pl.sophia.inria.fr:7080/"
+    # the INRIA setup is with "https://manifold.pl.sophia.inria.fr:7080/"
 
     default_manifold_admin_user     = 'admin'
     default_manifold_admin_password = 'demo'

diff --git a/myslice/myslice.ini.localhost b/myslice/myslice.ini.localhost
index c22836e..0467c0b 100644 (file)
--- a/myslice/myslice.ini.localhost
+++ b/myslice/myslice.ini.localhost
@@ -1,4 +1,4 @@
 [manifold]
-url = http://localhost:7080
+url = https://localhost:7080
 admin_user = admin
 admin_password = admin