You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@jena.apache.org by ij...@apache.org on 2013/11/06 23:43:23 UTC

svn commit: r1539488 - /jena/branches/jena-fuseki-new-ui/pages/js/app/models/fuseki-server.js

Author: ijd
Date: Wed Nov  6 22:43:23 2013
New Revision: 1539488

URL: http://svn.apache.org/r1539488
Log:
Stubbed out call to server while we decide strategy on CORS/management path

Modified:
    jena/branches/jena-fuseki-new-ui/pages/js/app/models/fuseki-server.js

Modified: jena/branches/jena-fuseki-new-ui/pages/js/app/models/fuseki-server.js
URL: http://svn.apache.org/viewvc/jena/branches/jena-fuseki-new-ui/pages/js/app/models/fuseki-server.js?rev=1539488&r1=1539487&r2=1539488&view=diff
==============================================================================
--- jena/branches/jena-fuseki-new-ui/pages/js/app/models/fuseki-server.js (original)
+++ jena/branches/jena-fuseki-new-ui/pages/js/app/models/fuseki-server.js Wed Nov  6 22:43:23 2013
@@ -36,7 +36,10 @@ define(
 
       /** Load and cache the remote server description. Trigger change event when done */
       loadServerDescription: function() {
-        return this.getJSON( "datasets" ).then( this.saveServerDescription );
+        var self = this;
+        return this.getJSON( "datasets" ).then( function() {
+                                                  self.saveServerDescription( this );
+                                                } );
       },
 
       /** Store the server description in this model */
@@ -47,7 +50,7 @@ define(
           return new Dataset( d, baseURL );
         } );
 
-        self.set( {server: serverDesc.server, datasets: datasets} );
+        this.set( {server: serverDesc.server, datasets: datasets} );
       },
 
       /**
@@ -55,6 +58,35 @@ define(
        * complete with the JSON object denoted by the path.
        */
       getJSON: function( path, data ) {
+        // debugging - also temp hack while we sort out the CORS issue
+        if (true) {
+          return new $.Deferred().resolveWith(
+                  { "datasets" : [ {"ds.name" : "/testing" ,
+                                    "ds.services" :
+                                      [ { "srv.endpoints" :
+                                            [ "query" ,
+                                              "sparql"
+                                            ] ,
+                                          "srv.type" : "query"
+                                        }  ,
+                                        { "srv.endpoints" : [ "update" ] ,
+                                          "srv.type" : "update"
+                                        }  ,
+                                        { "srv.endpoints" : [ "upload" ] ,
+                                          "srv.type" : "upload"
+                                        }  ,
+                                        { "srv.endpoints" : [ ] ,
+                                          "srv.type" : "gspRead"
+                                        }  ,
+                                        { "srv.endpoints" : [ "data" ] ,
+                                          "srv.type" : "gspReadWrite"
+                                        }
+                                      ]
+                                  }  ] ,
+                    "server" : { "port" : 3030 }
+            } );
+        }
+
         var url = this.managementURL();
         if (url) {
           return $.getJSON( sprintf( url, path ), data );