Author: jsdelfino
Date: Sun Oct 28 21:37:49 2007
New Revision: 589490
URL: http://svn.apache.org/viewvc?rev=589490&view=rev
Log:
Do not require the caller of new JSONRpcClient() to know the name of the
binding used on the server side as the binding name is internal to the server
side composition. For example this prevented Widget references to be created
correctly, as they were not supposed to know the name of the binding on the
target service.
Added:
incubator/tuscany/java/sca/modules/domain-impl/src/main/resources/webroot/binding-jsonrpc.js
(with props)
Modified:
incubator/tuscany/java/sca/modules/binding-jsonrpc/src/main/java/org/apache/tuscany/sca/binding/jsonrpc/JSONRPCServiceServlet.java
incubator/tuscany/java/sca/modules/binding-jsonrpc/src/main/java/org/apache/tuscany/sca/binding/jsonrpc/ScaDomainScriptServlet.java
incubator/tuscany/java/sca/modules/domain-impl/src/main/resources/domain.composite
incubator/tuscany/java/sca/modules/domain-impl/src/main/resources/webroot/index.html
incubator/tuscany/java/sca/modules/implementation-widget/src/main/java/org/apache/tuscany/sca/implementation/widget/WidgetReferenceServlet.java
incubator/tuscany/java/sca/modules/node-impl/src/main/resources/node.composite
incubator/tuscany/java/sca/modules/node-impl/src/main/resources/webroot/index.html
Modified:
incubator/tuscany/java/sca/modules/binding-jsonrpc/src/main/java/org/apache/tuscany/sca/binding/jsonrpc/JSONRPCServiceServlet.java
URL:
http://svn.apache.org/viewvc/incubator/tuscany/java/sca/modules/binding-jsonrpc/src/main/java/org/apache/tuscany/sca/binding/jsonrpc/JSONRPCServiceServlet.java?rev=589490&r1=589489&r2=589490&view=diff
==============================================================================
---
incubator/tuscany/java/sca/modules/binding-jsonrpc/src/main/java/org/apache/tuscany/sca/binding/jsonrpc/JSONRPCServiceServlet.java
(original)
+++
incubator/tuscany/java/sca/modules/binding-jsonrpc/src/main/java/org/apache/tuscany/sca/binding/jsonrpc/JSONRPCServiceServlet.java
Sun Oct 28 21:37:49 2007
@@ -176,7 +176,7 @@
HttpSession session = request.getSession();
JSONRPCBridge jsonrpcBridge = new JSONRPCBridge();
- jsonrpcBridge.registerObject(serviceName, serviceInstance,
serviceInterface);
+ jsonrpcBridge.registerObject("Service", serviceInstance,
serviceInterface);
session.setAttribute("JSONRPCBridge", jsonrpcBridge);
org.json.JSONObject jsonReq = null;
@@ -189,7 +189,7 @@
String method = jsonReq.getString("method");
if ((method != null) && (method.indexOf('.') < 0)) {
- jsonReq.putOpt("method", serviceName + "." + method);
+ jsonReq.putOpt("method", "Service" + "." + method);
}
// invoke the request
@@ -208,7 +208,7 @@
// Extract the method
method = jsonReq.getString("method");
if ((method != null) && (method.indexOf('.') < 0)) {
- jsonReq.putOpt("method", serviceName + "." + method);
+ jsonReq.putOpt("method", "Service" + "." + method);
}
// Extract the arguments
Modified:
incubator/tuscany/java/sca/modules/binding-jsonrpc/src/main/java/org/apache/tuscany/sca/binding/jsonrpc/ScaDomainScriptServlet.java
URL:
http://svn.apache.org/viewvc/incubator/tuscany/java/sca/modules/binding-jsonrpc/src/main/java/org/apache/tuscany/sca/binding/jsonrpc/ScaDomainScriptServlet.java?rev=589490&r1=589489&r2=589490&view=diff
==============================================================================
---
incubator/tuscany/java/sca/modules/binding-jsonrpc/src/main/java/org/apache/tuscany/sca/binding/jsonrpc/ScaDomainScriptServlet.java
(original)
+++
incubator/tuscany/java/sca/modules/binding-jsonrpc/src/main/java/org/apache/tuscany/sca/binding/jsonrpc/ScaDomainScriptServlet.java
Sun Oct 28 21:37:49 2007
@@ -79,7 +79,7 @@
// A slight hack to make the service function available with a
variable named 'serviceName'
// to do that the JSONRpcClient is added to the scaDomain and then
the service function is got from that
out.println("scaDomain." + serviceName + " = " + "new
JSONRpcClient(\"" + serviceName + "\");");
- out.println(serviceName + " = scaDomain." + serviceName + "." +
serviceName + ";");
+ out.println(serviceName + " = scaDomain." + serviceName +
".Service;");
}
out.println();
Modified:
incubator/tuscany/java/sca/modules/domain-impl/src/main/resources/domain.composite
URL:
http://svn.apache.org/viewvc/incubator/tuscany/java/sca/modules/domain-impl/src/main/resources/domain.composite?rev=589490&r1=589489&r2=589490&view=diff
==============================================================================
---
incubator/tuscany/java/sca/modules/domain-impl/src/main/resources/domain.composite
(original)
+++
incubator/tuscany/java/sca/modules/domain-impl/src/main/resources/domain.composite
Sun Oct 28 21:37:49 2007
@@ -18,15 +18,14 @@
* under the License.
-->
<composite xmlns="http://www.osoa.org/xmlns/sca/1.0";
- targetNamespace="http://sample";
- xmlns:sample="http://sample";
- xmlns:tuscany="http://tuscany.apache.org/xmlns/sca/1.0";
+ targetNamespace="http://tuscany.apache.org/xmlns/tuscany/1.0";
+ xmlns:t="http://tuscany.apache.org/xmlns/sca/1.0";
name="Domain">
<component name="domain">
- <tuscany:implementation.resource location="webroot"/>
+ <t:implementation.resource location="webroot"/>
<service name="Resource">
- <tuscany:binding.http uri="http://localhost:9999/domain"/>
+ <t:binding.http/>
</service>
</component>
@@ -38,11 +37,11 @@
</service>
<service name="DomainManagerNodeEventService">
<interface.java
interface="org.apache.tuscany.sca.domain.DomainManagerNodeEventService"/>
- <binding.ws
uri="http://localhost:9999/DomainManagerComponent/DomainManagerNodeEventService"/>
+ <binding.ws/>
</service>
<service name="DomainManagementService">
<interface.java
interface="org.apache.tuscany.sca.domain.management.DomainManagementService"/>
- <tuscany:binding.jsonrpc
uri="http://localhost:9999/DomainManagerComponent/DomainManagementService"/>
+ <t:binding.jsonrpc/>
</service>
</component>
Added:
incubator/tuscany/java/sca/modules/domain-impl/src/main/resources/webroot/binding-jsonrpc.js
URL:
http://svn.apache.org/viewvc/incubator/tuscany/java/sca/modules/domain-impl/src/main/resources/webroot/binding-jsonrpc.js?rev=589490&view=auto
==============================================================================
---
incubator/tuscany/java/sca/modules/domain-impl/src/main/resources/webroot/binding-jsonrpc.js
(added)
+++
incubator/tuscany/java/sca/modules/domain-impl/src/main/resources/webroot/binding-jsonrpc.js
Sun Oct 28 21:37:49 2007
@@ -0,0 +1,492 @@
+/*
+ * JSON-RPC JavaScript client
+ *
+ * $Id: jsonrpc.js,v 1.36.2.3 2006/03/08 15:09:37 mclark Exp $
+ *
+ * Copyright (c) 2003-2004 Jan-Klaas Kollhof
+ * Copyright (c) 2005 Michael Clark, Metaparadigm Pte Ltd
+ *
+ * This code is based on Jan-Klaas' JavaScript o lait library (jsolait).
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ *
+ */
+
+/*
+ * Modifications for Apache Tuscany:
+ * - JSONRpcClient_createMethod changed so callback is last arg
+ */
+
+/* escape a character */
+
+escapeJSONChar =
+function escapeJSONChar(c)
+{
+ if(c == "\"" || c == "\\") return "\\" + c;
+ else if (c == "\b") return "\\b";
+ else if (c == "\f") return "\\f";
+ else if (c == "\n") return "\\n";
+ else if (c == "\r") return "\\r";
+ else if (c == "\t") return "\\t";
+ var hex = c.charCodeAt(0).toString(16);
+ if(hex.length == 1) return "\\u000" + hex;
+ else if(hex.length == 2) return "\\u00" + hex;
+ else if(hex.length == 3) return "\\u0" + hex;
+ else return "\\u" + hex;
+};
+
+
+/* encode a string into JSON format */
+
+escapeJSONString =
+function escapeJSONString(s)
+{
+ /* The following should suffice but Safari's regex is b0rken
+ (doesn't support callback substitutions)
+ return "\"" + s.replace(/([^\u0020-\u007f]|[\\\"])/g,
+ escapeJSONChar) + "\"";
+ */
+
+ /* Rather inefficient way to do it */
+ var parts = s.split("");
+ for(var i=0; i < parts.length; i++) {
+ var c =parts[i];
+ if(c == '"' ||
+ c == '\\' ||
+ c.charCodeAt(0) < 32 ||
+ c.charCodeAt(0) >= 128)
+ parts[i] = escapeJSONChar(parts[i]);
+ }
+ return "\"" + parts.join("") + "\"";
+};
+
+
+/* Marshall objects to JSON format */
+
+toJSON = function toJSON(o)
+{
+ if(o == null) {
+ return "null";
+ } else if(o.constructor == String) {
+ return escapeJSONString(o);
+ } else if(o.constructor == Number) {
+ return o.toString();
+ } else if(o.constructor == Boolean) {
+ return o.toString();
+ } else if(o.constructor == Date) {
+ return '{javaClass: "java.util.Date", time: ' + o.valueOf() +'}';
+ } else if(o.constructor == Array) {
+ var v = [];
+ for(var i = 0; i < o.length; i++) v.push(toJSON(o[i]));
+ return "[" + v.join(", ") + "]";
+ } else {
+ var v = [];
+ for(attr in o) {
+ if(o[attr] == null) v.push("\"" + attr + "\": null");
+ else if(typeof o[attr] == "function"); /* skip */
+ else v.push(escapeJSONString(attr) + ": " + toJSON(o[attr]));
+ }
+ return "{" + v.join(", ") + "}";
+ }
+};
+
+
+/* JSONRpcClient constructor */
+
+JSONRpcClient =
+function JSONRpcClient_ctor(serverURL, user, pass, objectID)
+{
+ this.serverURL = serverURL;
+ this.user = user;
+ this.pass = pass;
+ this.objectID = objectID;
+
+ /* Add standard methods */
+ if(this.objectID) {
+ this._addMethods(["listMethods"]);
+ var req = this._makeRequest("listMethods", []);
+ } else {
+ this._addMethods(["system.listMethods"]);
+ var req = this._makeRequest("system.listMethods", []);
+ }
+ var m = this._sendRequest(req);
+ this._addMethods(m);
+};
+
+
+/* JSONRpcCLient.Exception */
+
+JSONRpcClient.Exception =
+function JSONRpcClient_Exception_ctor(code, message, javaStack)
+{
+ this.code = code;
+ var name;
+ if(javaStack) {
+ this.javaStack = javaStack;
+ var m = javaStack.match(/^([^:]*)/);
+ if(m) name = m[0];
+ }
+ if(name) this.name = name;
+ else this.name = "JSONRpcClientException";
+ this.message = message;
+};
+
+JSONRpcClient.Exception.CODE_REMOTE_EXCEPTION = 490;
+JSONRpcClient.Exception.CODE_ERR_CLIENT = 550;
+JSONRpcClient.Exception.CODE_ERR_PARSE = 590;
+JSONRpcClient.Exception.CODE_ERR_NOMETHOD = 591;
+JSONRpcClient.Exception.CODE_ERR_UNMARSHALL = 592;
+JSONRpcClient.Exception.CODE_ERR_MARSHALL = 593;
+
+JSONRpcClient.Exception.prototype = new Error();
+
+JSONRpcClient.Exception.prototype.toString =
+function JSONRpcClient_Exception_toString(code, msg)
+{
+ return this.name + ": " + this.message;
+};
+
+
+/* Default top level exception handler */
+
+JSONRpcClient.default_ex_handler =
+function JSONRpcClient_default_ex_handler(e) { alert(e); };
+
+
+/* Client settable variables */
+
+JSONRpcClient.toplevel_ex_handler = JSONRpcClient.default_ex_handler;
+JSONRpcClient.profile_async = false;
+JSONRpcClient.max_req_active = 1;
+JSONRpcClient.requestId = 1;
+
+
+/* JSONRpcClient implementation */
+
+JSONRpcClient.prototype._createMethod =
+function JSONRpcClient_createMethod(methodName)
+{
+ var fn=function()
+ {
+ var args = [];
+ var callback = null;
+ for(var i=0;i<arguments.length;i++) args.push(arguments[i]);
+
+/* TUSCANY change callback to be last arg instead of first to match
binding.ajax
+ if(typeof args[0] == "function") callback = args.shift();
+*/
+ if(typeof args[arguments.length-1] == "function") callback = args.pop();
+
+ var req = fn.client._makeRequest.call(fn.client, fn.methodName,
+ args, callback);
+ if(callback == null) {
+ return fn.client._sendRequest.call(fn.client, req);
+ } else {
+ JSONRpcClient.async_requests.push(req);
+ JSONRpcClient.kick_async();
+ return req.requestId;
+ }
+ };
+ fn.client = this;
+ fn.methodName = methodName;
+ return fn;
+};
+
+JSONRpcClient.prototype._addMethods =
+function JSONRpcClient_addMethods(methodNames)
+{
+ for(var i=0; i<methodNames.length; i++) {
+ var obj = this;
+ var names = methodNames[i].split(".");
+ for(var n=0; n<names.length-1; n++) {
+ var name = names[n];
+ if(obj[name]) {
+ obj = obj[name];
+ } else {
+ obj[name] = new Object();
+ obj = obj[name];
+ }
+ }
+ var name = names[names.length-1];
+ if(!obj[name]) {
+ var method = this._createMethod(methodNames[i]);
+ obj[name] = method;
+ }
+ }
+};
+
+JSONRpcClient._getCharsetFromHeaders =
+function JSONRpcClient_getCharsetFromHeaders(http)
+{
+ try {
+ var contentType = http.getResponseHeader("Content-type");
+ var parts = contentType.split(/\s*;\s*/);
+ for(var i =0; i < parts.length; i++) {
+ if(parts[i].substring(0, 8) == "charset=")
+ return parts[i].substring(8, parts[i].length);
+ }
+ } catch (e) {}
+ return "UTF-8"; /* default */
+};
+
+/* Async queue globals */
+JSONRpcClient.async_requests = [];
+JSONRpcClient.async_inflight = {};
+JSONRpcClient.async_responses = [];
+JSONRpcClient.async_timeout = null;
+JSONRpcClient.num_req_active = 0;
+
+JSONRpcClient._async_handler =
+function JSONRpcClient_async_handler()
+{
+ JSONRpcClient.async_timeout = null;
+
+ while(JSONRpcClient.async_responses.length > 0) {
+ var res = JSONRpcClient.async_responses.shift();
+ if(res.canceled) continue;
+ if(res.profile) res.profile.dispatch = new Date();
+ try {
+ res.cb(res.result, res.ex, res.profile);
+ } catch(e) {
+ JSONRpcClient.toplevel_ex_handler(e);
+ }
+ }
+
+ while(JSONRpcClient.async_requests.length > 0 &&
+ JSONRpcClient.num_req_active < JSONRpcClient.max_req_active) {
+ var req = JSONRpcClient.async_requests.shift();
+ if(req.canceled) continue;
+ req.client._sendRequest.call(req.client, req);
+ }
+};
+
+JSONRpcClient.kick_async =
+function JSONRpcClient_kick_async()
+{
+ if(JSONRpcClient.async_timeout == null)
+ JSONRpcClient.async_timeout =
+ setTimeout(JSONRpcClient._async_handler, 0);
+};
+
+JSONRpcClient.cancelRequest =
+function JSONRpcClient_cancelRequest(requestId)
+{
+ /* If it is in flight then mark it as canceled in the inflight map
+ and the XMLHttpRequest callback will discard the reply. */
+ if(JSONRpcClient.async_inflight[requestId]) {
+ JSONRpcClient.async_inflight[requestId].canceled = true;
+ return true;
+ }
+
+ /* If its not in flight yet then we can just mark it as canceled in
+ the the request queue and it will get discarded before being sent. */
+ for(var i in JSONRpcClient.async_requests) {
+ if(JSONRpcClient.async_requests[i].requestId == requestId) {
+ JSONRpcClient.async_requests[i].canceled = true;
+ return true;
+ }
+ }
+
+ /* It may have returned from the network and be waiting for its callback
+ to be dispatched, so mark it as canceled in the response queue
+ and the response will get discarded before calling the callback. */
+ for(var i in JSONRpcClient.async_responses) {
+ if(JSONRpcClient.async_responses[i].requestId == requestId) {
+ JSONRpcClient.async_responses[i].canceled = true;
+ return true;
+ }
+ }
+
+ return false;
+};
+
+JSONRpcClient.prototype._makeRequest =
+function JSONRpcClient_makeRequest(methodName, args, cb)
+{
+ var req = {};
+ req.client = this;
+ req.requestId = JSONRpcClient.requestId++;
+
+ var obj = {};
+ obj.id = req.requestId;
+ if (this.objectID)
+ obj.method = ".obj#" + this.objectID + "." + methodName;
+ else
+ obj.method = methodName;
+ obj.params = args;
+
+ if (cb) req.cb = cb;
+ if (JSONRpcClient.profile_async)
+ req.profile = { "submit": new Date() };
+ req.data = toJSON(obj);
+
+ return req;
+};
+
+JSONRpcClient.prototype._sendRequest =
+function JSONRpcClient_sendRequest(req)
+{
+ if(req.profile) req.profile.start = new Date();
+
+ /* Get free http object from the pool */
+ var http = JSONRpcClient.poolGetHTTPRequest();
+ JSONRpcClient.num_req_active++;
+
+ /* Send the request */
+ if (typeof(this.user) == "undefined") {
+ http.open("POST", this.serverURL, (req.cb != null));
+ } else {
+ http.open("POST", this.serverURL, (req.cb != null), this.user,
this.pass);
+ }
+
+ /* setRequestHeader is missing in Opera 8 Beta */
+ try { http.setRequestHeader("Content-type", "text/plain"); } catch(e) {}
+
+ /* Construct call back if we have one */
+ if(req.cb) {
+ var self = this;
+ http.onreadystatechange = function() {
+ if(http.readyState == 4) {
+ http.onreadystatechange = function () {};
+ var res = { "cb": req.cb, "result": null, "ex": null};
+ if (req.profile) {
+ res.profile = req.profile;
+ res.profile.end = new Date();
+ }
+ try { res.result = self._handleResponse(http); }
+ catch(e) { res.ex = e; }
+ if(!JSONRpcClient.async_inflight[req.requestId].canceled)
+ JSONRpcClient.async_responses.push(res);
+ delete JSONRpcClient.async_inflight[req.requestId];
+ JSONRpcClient.kick_async();
+ }
+ };
+ } else {
+ http.onreadystatechange = function() {};
+ }
+
+ JSONRpcClient.async_inflight[req.requestId] = req;
+
+ try {
+ http.send(req.data);
+ } catch(e) {
+ JSONRpcClient.poolReturnHTTPRequest(http);
+ JSONRpcClient.num_req_active--;
+ throw new JSONRpcClient.Exception
+ (JSONRpcClient.Exception.CODE_ERR_CLIENT, "Connection failed");
+ }
+
+ if(!req.cb) return this._handleResponse(http);
+};
+
+JSONRpcClient.prototype._handleResponse =
+function JSONRpcClient_handleResponse(http)
+{
+ /* Get the charset */
+ if(!this.charset) {
+ this.charset = JSONRpcClient._getCharsetFromHeaders(http);
+ }
+
+ /* Get request results */
+ var status, statusText, data;
+ try {
+ status = http.status;
+ statusText = http.statusText;
+ data = http.responseText;
+ } catch(e) {
+ JSONRpcClient.poolReturnHTTPRequest(http);
+ JSONRpcClient.num_req_active--;
+ JSONRpcClient.kick_async();
+ throw new JSONRpcClient.Exception
+ (JSONRpcClient.Exception.CODE_ERR_CLIENT, "Connection failed");
+ }
+
+ /* Return http object to the pool; */
+ JSONRpcClient.poolReturnHTTPRequest(http);
+ JSONRpcClient.num_req_active--;
+
+ /* Unmarshall the response */
+ if(status != 200) {
+ throw new JSONRpcClient.Exception(status, statusText);
+ }
+ var obj;
+ try {
+ eval("obj = " + data);
+ } catch(e) {
+ throw new JSONRpcClient.Exception(550, "error parsing result");
+ }
+ if(obj.error)
+ throw new JSONRpcClient.Exception(obj.error.code, obj.error.msg,
+ obj.error.trace);
+ var res = obj.result;
+
+ /* Handle CallableProxy */
+ if(res && res.objectID && res.JSONRPCType == "CallableReference")
+ return new JSONRpcClient(this.serverURL, this.user,
+ this.pass, res.objectID);
+
+ return res;
+};
+
+
+/* XMLHttpRequest wrapper code */
+
+/* XMLHttpRequest pool globals */
+JSONRpcClient.http_spare = [];
+JSONRpcClient.http_max_spare = 8;
+
+JSONRpcClient.poolGetHTTPRequest =
+function JSONRpcClient_pool_getHTTPRequest()
+{
+ if(JSONRpcClient.http_spare.length > 0) {
+ return JSONRpcClient.http_spare.pop();
+ }
+ return JSONRpcClient.getHTTPRequest();
+};
+
+JSONRpcClient.poolReturnHTTPRequest =
+function JSONRpcClient_poolReturnHTTPRequest(http)
+{
+ if(JSONRpcClient.http_spare.length >= JSONRpcClient.http_max_spare)
+ delete http;
+ else
+ JSONRpcClient.http_spare.push(http);
+};
+
+JSONRpcClient.msxmlNames = [ "MSXML2.XMLHTTP.5.0",
+ "MSXML2.XMLHTTP.4.0",
+ "MSXML2.XMLHTTP.3.0",
+ "MSXML2.XMLHTTP",
+ "Microsoft.XMLHTTP" ];
+
+JSONRpcClient.getHTTPRequest =
+function JSONRpcClient_getHTTPRequest()
+{
+ /* Mozilla XMLHttpRequest */
+ try {
+ JSONRpcClient.httpObjectName = "XMLHttpRequest";
+ return new XMLHttpRequest();
+ } catch(e) {}
+
+ /* Microsoft MSXML ActiveX */
+ for (var i=0;i < JSONRpcClient.msxmlNames.length; i++) {
+ try {
+ JSONRpcClient.httpObjectName = JSONRpcClient.msxmlNames[i];
+ return new ActiveXObject(JSONRpcClient.msxmlNames[i]);
+ } catch (e) {}
+ }
+
+ /* None found */
+ JSONRpcClient.httpObjectName = null;
+ throw new JSONRpcClient.Exception(0, "Can't create XMLHttpRequest object");
+};
Propchange:
incubator/tuscany/java/sca/modules/domain-impl/src/main/resources/webroot/binding-jsonrpc.js
------------------------------------------------------------------------------
svn:eol-style = native
Propchange:
incubator/tuscany/java/sca/modules/domain-impl/src/main/resources/webroot/binding-jsonrpc.js
------------------------------------------------------------------------------
svn:keywords = Rev Date
Modified:
incubator/tuscany/java/sca/modules/domain-impl/src/main/resources/webroot/index.html
URL:
http://svn.apache.org/viewvc/incubator/tuscany/java/sca/modules/domain-impl/src/main/resources/webroot/index.html?rev=589490&r1=589489&r2=589490&view=diff
==============================================================================
---
incubator/tuscany/java/sca/modules/domain-impl/src/main/resources/webroot/index.html
(original)
+++
incubator/tuscany/java/sca/modules/domain-impl/src/main/resources/webroot/index.html
Sun Oct 28 21:37:49 2007
@@ -20,15 +20,15 @@
<head>
<title>Apache Tuscany Domain</TITLE>
- <script type="text/javascript" src="../SCADomain/scaDomain.js"></script>
-
+ <script type="text/javascript" src="binding-jsonrpc.js"></script>
+
<script language="JavaScript">
- domainManager = new
JSONRpcClient("../DomainManagerComponent/DomainManagementService");
+ domainManager = new
JSONRpcClient("../DomainManagerComponent/DomainManagementService").Service;
var domainInfo;
function getDomainInfo() {
-
domainManager.DomainManagementService.getDomainDescription(handleGetDomainInfo);
+ domainManager.getDomainDescription(handleGetDomainInfo);
}
function handleGetDomainInfo(result) {
@@ -83,7 +83,7 @@
}
function getNodeInfo(nodeURI) {
- domainManager.DomainManagementService.getNodeDescription(nodeURI,
handleGetNodeInfo);
+ domainManager.getNodeDescription(nodeURI, handleGetNodeInfo);
}
function handleGetNodeInfo(result) {
Modified:
incubator/tuscany/java/sca/modules/implementation-widget/src/main/java/org/apache/tuscany/sca/implementation/widget/WidgetReferenceServlet.java
URL:
http://svn.apache.org/viewvc/incubator/tuscany/java/sca/modules/implementation-widget/src/main/java/org/apache/tuscany/sca/implementation/widget/WidgetReferenceServlet.java?rev=589490&r1=589489&r2=589490&view=diff
==============================================================================
---
incubator/tuscany/java/sca/modules/implementation-widget/src/main/java/org/apache/tuscany/sca/implementation/widget/WidgetReferenceServlet.java
(original)
+++
incubator/tuscany/java/sca/modules/implementation-widget/src/main/java/org/apache/tuscany/sca/implementation/widget/WidgetReferenceServlet.java
Sun Oct 28 21:37:49 2007
@@ -20,6 +20,7 @@
import java.io.IOException;
import java.io.InputStream;
+import java.net.URI;
import java.net.URL;
import javax.servlet.ServletOutputStream;
@@ -109,10 +110,15 @@
if( binding != null) {
String proxyClient =
WidgetProxyHelper.getJavaScriptProxyClient(binding.getClass().getName());
if(proxyClient != null) {
+ URI uri = URI.create(binding.getURI());
+ String path = uri.getPath();
+ if (!path.startsWith("/")) {
+ path = "/" + path;
+ }
if(proxyClient.equals("JSONRpcClient")) {
- os.println("referenceMap." + referenceName + " = new "
+ proxyClient + "(\".." + binding.getURI() + "\")." +
binding.getURI().substring(1) + ";");
+ os.println("referenceMap." + referenceName + " = new "
+ proxyClient + "(\"" + path + "\").Service;");
} else {
- os.println("referenceMap." + referenceName + " = new "
+ proxyClient + "(\".." + binding.getURI() + "\");");
+ os.println("referenceMap." + referenceName + " = new "
+ proxyClient + "(\"" + path + "\");");
}
}
}
Modified:
incubator/tuscany/java/sca/modules/node-impl/src/main/resources/node.composite
URL:
http://svn.apache.org/viewvc/incubator/tuscany/java/sca/modules/node-impl/src/main/resources/node.composite?rev=589490&r1=589489&r2=589490&view=diff
==============================================================================
---
incubator/tuscany/java/sca/modules/node-impl/src/main/resources/node.composite
(original)
+++
incubator/tuscany/java/sca/modules/node-impl/src/main/resources/node.composite
Sun Oct 28 21:37:49 2007
@@ -25,10 +25,9 @@
in the in memory model. So don;t rely on the values here.
-->
<composite xmlns="http://www.osoa.org/xmlns/sca/1.0";
- targetNamespace="http://management";
- xmlns:sample="http://management";
- xmlns:tuscany="http://tuscany.apache.org/xmlns/sca/1.0";
- name="Management">
+ targetNamespace="http://tuscany.apache.org/xmlns/tuscany/1.0";
+ xmlns:t="http://tuscany.apache.org/xmlns/sca/1.0";
+ name="node">
<component name="DomainManagerComponent">
<implementation.java
class="org.apache.tuscany.sca.node.impl.DomainManagerServiceImpl"/>
@@ -50,14 +49,14 @@
</service>
<service name="ComponentManagerService">
<interface.java
interface="org.apache.tuscany.sca.node.ComponentManagerService"/>
- <tuscany:binding.jsonrpc
uri="http://localhost:9000/NodeManagerComponent/ComponentManagerJson"/>
+ <t:binding.jsonrpc
uri="http://localhost:9000/NodeManagerComponent/ComponentManagerJson"/>
</service>
</component>
<component name="node">
- <tuscany:implementation.resource location="webroot"/>
+ <t:implementation.resource location="webroot"/>
<service name="Resource">
- <tuscany:binding.http uri="http://localhost:9000/node"/>
+ <t:binding.http uri="http://localhost:9000/node"/>
</service>
</component>
Modified:
incubator/tuscany/java/sca/modules/node-impl/src/main/resources/webroot/index.html
URL:
http://svn.apache.org/viewvc/incubator/tuscany/java/sca/modules/node-impl/src/main/resources/webroot/index.html?rev=589490&r1=589489&r2=589490&view=diff
==============================================================================
---
incubator/tuscany/java/sca/modules/node-impl/src/main/resources/webroot/index.html
(original)
+++
incubator/tuscany/java/sca/modules/node-impl/src/main/resources/webroot/index.html
Sun Oct 28 21:37:49 2007
@@ -24,11 +24,11 @@
<script language="JavaScript">
- nodeManager = new
JSONRpcClient("../NodeManagerComponent/NodeManagerJson");
- componentManager = new
JSONRpcClient("../NodeManagerComponent/ComponentManagerJson");
+ nodeManager = new
JSONRpcClient("../NodeManagerComponent/NodeManagerJson").Service;
+ componentManager = new
JSONRpcClient("../NodeManagerComponent/ComponentManagerJson").Service;
function getNodeUri() {
- nodeManager.NodeManagerService.getNodeUri(handleGetNodeUri);
+ nodeManager.getNodeUri(handleGetNodeUri);
getComponentInfos()
}
@@ -37,7 +37,7 @@
}
function getComponentInfos() {
-
componentManager.ComponentManagerService.getComponentInfos(handleGetComponentInfos);
+ componentManager.getComponentInfos(handleGetComponentInfos);
}
function handleGetComponentInfos(result) {
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
