Merge pull request #25 from gcsolaroli/master

Initial integration of /beta and /gamma with a single backend
author: Giulio Cesare Solaroli <giulio.cesare@clipperz.com> 2012-02-11 23:48:42 (UTC)
committer: Giulio Cesare Solaroli <giulio.cesare@clipperz.com> 2012-02-11 23:48:42 (UTC)
commit: a0661c3b02aa26d6b08ff13dc321e09478868159 (patch) (side-by-side diff)
tree: 87bd0af25a0732adb9d14a34d25f9d5479fdf5ee /frontend/gamma/js
parent: 96d01919d3ff42c3fdd7f6186a0500caccd3c140 (diff)
parent: 7804333809bf725e32a08c531a06acd7d668e190 (diff)
download: clipperz-a0661c3b02aa26d6b08ff13dc321e09478868159.zip
clipperz-a0661c3b02aa26d6b08ff13dc321e09478868159.tar.gz
clipperz-a0661c3b02aa26d6b08ff13dc321e09478868159.tar.bz2
2 files changed, 14 insertions, 7 deletions
diff --git a/frontend/gamma/js/Clipperz/Async.js b/frontend/gamma/js/Clipperz/Async.js
index 7c9d783..97d8ecf 100644
--- a/frontend/gamma/js/Clipperz/Async.js
+++ b/frontend/gamma/js/Clipperz/Async.js
@@ -17,152 +17,158 @@ refer to http://www.clipperz.com.
   warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
   See the GNU Affero General Public License for more details.
 
 * You should have received a copy of the GNU Affero General Public
   License along with Clipperz Community Edition.  If not, see
   <http://www.gnu.org/licenses/>.
 
 */
 
 //Clipperz.Async = MochiKit.Async;
 
 
 if (typeof(Clipperz) == 'undefined') { Clipperz = {}; }
 if (typeof(Clipperz.Async) == 'undefined') { Clipperz.Async = {}; }
 
 Clipperz.Async.VERSION = "0.1";
 Clipperz.Async.NAME = "Clipperz.Async";
 
 Clipperz.Async.Deferred = function(aName, args) {
 	args = args || {};
 
 	Clipperz.Async.Deferred.superclass.constructor.call(this, args.canceller);
 
 	this._args = args;
 	this._name = aName || "Anonymous deferred";
 	this._count = 0;
 	this._shouldTrace = ((CLIPPERZ_DEFERRED_TRACING_ENABLED === true) || (args.trace === true));
 	this._vars = null;
 
 	return this;
 }
 
 //=============================================================================
 
 Clipperz.Base.extend(Clipperz.Async.Deferred, MochiKit.Async.Deferred, {
 
 	'name': function () {
 		return this._name;
 	},
 
 	'args': function () {
 		return this._args;
 	},
 
 	//-----------------------------------------------------------------------------
 
 	'callback': function (aValue) {
 		if (this._shouldTrace) {
-			Clipperz.log("CALLBACK " + this._name, aValue);
+		//	Clipperz.log("CALLBACK " + this._name, aValue);
+			console.log("CALLBACK " + this._name, aValue);
 		}
 
 		if (this.chained == false) {
 			var message;
 			
 			message = "ERROR [" + this._name + "]";
 			this.addErrback(function(aResult) {
 				if (! (aResult instanceof MochiKit.Async.CancelledError)) {
 					Clipperz.log(message, aResult);
 				}
 				return aResult;
 			});
 
 			if (this._shouldTrace) {
 				var resultMessage;
 
 				resultMessage = "RESULT   " + this._name + " <==";
 //				this.addCallback(function(aResult) {
 				Clipperz.Async.Deferred.superclass.addCallback.call(this, function(aResult) {
-					Clipperz.log(resultMessage, aResult);
+				//	Clipperz.log(resultMessage, aResult);
+					console.log(resultMessage, aResult);
 
 					return aResult;
 				});
 			}
 		}
 
 		if (CLIPPERZ_DEFERRED_CALL_LOGGING_ENABLED === true) {
 			Clipperz.log("callback " + this._name, this);
 		}
 
 		return Clipperz.Async.Deferred.superclass.callback.apply(this, arguments);
 	},
 
 	//-----------------------------------------------------------------------------
 
 	'addCallback': function () {
 		var message;
 		
 		if (this._shouldTrace) {
 			this._count ++;
 			message = "[" + this._count + "] " + this._name + " ";
 //			this.addBoth(function(aResult) {Clipperz.log(message + "-->", aResult); return aResult;});
 			this.addCallbacks(
-				function(aResult) {Clipperz.log("-OK- " + message + "-->"/*, aResult*/); return aResult;},
-				function(aResult) {Clipperz.log("FAIL " + message + "-->"/*, aResult*/); return aResult;}
+			//	function(aResult) {Clipperz.log("-OK- " + message + "-->"/*, aResult*/); return aResult;},
+				function(aResult) {console.log("-OK- " + message + "-->"/*, aResult*/); return aResult;},
+			//	function(aResult) {Clipperz.log("FAIL " + message + "-->"/*, aResult*/); return aResult;}
+				function(aResult) {console.log("FAIL " + message + "-->"/*, aResult*/); return aResult;}
 			);
 		}
 
 		Clipperz.Async.Deferred.superclass.addCallback.apply(this, arguments);
 
 		if (this._shouldTrace) {
 //			this.addBoth(function(aResult) {Clipperz.log(message + "<--", aResult); return aResult;});
 			this.addCallbacks(
-				function(aResult) {Clipperz.log("-OK- " + message + "<--", aResult); return aResult;},
-				function(aResult) {Clipperz.log("FAIL " + message + "<--", aResult); return aResult;}
+			//	function(aResult) {Clipperz.log("-OK- " + message + "<--", aResult); return aResult;},
+				function(aResult) {console.log("-OK- " + message + "<--", aResult); return aResult;},
+			//	function(aResult) {Clipperz.log("FAIL " + message + "<--", aResult); return aResult;}
+				function(aResult) {console.log("FAIL " + message + "<--", aResult); return aResult;}
 			);
 		}
 	},
 
 	//=============================================================================
 
 	'addCallbackPass': function() {
 		var passFunction;
 
 		passFunction = MochiKit.Base.partial.apply(null, arguments);
 
 		this.addCallback(function() {
 			var result;
 
 			result = arguments[arguments.length -1];
 			passFunction();
 
 			return result;
 		});
 	},
 
 	//-----------------------------------------------------------------------------
 
 	'addErrbackPass': function() {
 		var passFunction;
 
 		passFunction = MochiKit.Base.partial.apply(null, arguments);
 
 		this.addErrback(function() {
 			var result;
 
 			result = arguments[arguments.length -1];
 			passFunction();
 
 			return result;
 		});
 	},
 
 	//-----------------------------------------------------------------------------
 
 	'addBothPass': function() {
 		var passFunction;
 
 		passFunction = MochiKit.Base.partial.apply(null, arguments);
 
 		this.addBoth(function() {
 			var result;
 
@@ -361,96 +367,97 @@ MochiKit.Base.update(Clipperz.Async.DeferredSynchronizer.prototype, {
 	'run': function(args, aValue) {
 		var deferredResults;
 		var i, c;
 		
 		deferredResults = [];
 		args = args || {};
 
 		c = this.methods().length;
 		for (i=0; i<c; i++) {
 			var deferredResult;
 			var	methodCalls;
 			var ii, cc;
 
 //console.log("TYPEOF", typeof(this.methods()[i]));
 			if (typeof(this.methods()[i]) == 'function') {
 				methodCalls = [ this.methods()[i] ];
 			} else {
 				methodCalls = this.methods()[i];
 			}
 			
 			cc = methodCalls.length;
 			deferredResult = new Clipperz.Async.Deferred("Clipperz.Async.DeferredSynchronizer.run => " + this.name() + "[" + i + "]", args);
 			for (ii=0; ii<cc; ii++) {
 				deferredResult.addCallback(methodCalls[ii]);
 			}
 			deferredResult.addBoth(MochiKit.Base.method(this, 'handleMethodCallDone', i));
 
 			deferredResults.push(deferredResult);
 		}
 		
 		for (i=0; i<c; i++) {
 			deferredResults[i].callback(aValue);
 		}
 		
 		return this.result();
 	},
 	
 	//-----------------------------------------------------------------------------
 
 	'handleMethodCallDone': function(anIndexValue, aResult) {
 		this.incrementNumberOfMethodsDone();
 		this.methodResults()[anIndexValue] = aResult;
 		
 		if (this.numberOfMethodsDone() < this.methods().length) {
 			//	nothing to do here other than possibly log something
 		} else if (this.numberOfMethodsDone() == this.methods().length) {
 			this.result().callback();
 		} else if (this.numberOfMethodsDone() > this.methods().length) {
+			alert("Clipperz.Async.Deferred.handleMethodCallDone -> WTF!");
 			//	WTF!!! :(
 		}
 		
 	},
 
 	//-----------------------------------------------------------------------------
 
 	__syntaxFix__: "syntax fix"
 });
 
 //#############################################################################
 
 MochiKit.Base.update(Clipperz.Async, {
 
 	'callbacks': function (aName, someFunctions, someArguments, aCallbackValue) {
 		var deferredResult;
 		var i, c;
 		
 		deferredResult = new Clipperz.Async.Deferred(aName, someArguments);
 		c = someFunctions.length;
 		for (i=0; i<c; i++) {
 			deferredResult.addCallback(someFunctions[i]);
 		}
 		deferredResult.callback(aCallbackValue);
 
 		return deferredResult;
 	},
 
 	//-------------------------------------------------------------------------
 
 	'forkAndJoin': function (aName, someMethods, args) {
 		return MochiKit.Base.partial(function (aName, someMethods, args, aValue) {
 			var synchronizer;
 			var	result;
 		
 			args = args || {};
 			synchronizer = new Clipperz.Async.DeferredSynchronizer(aName, someMethods);
 			result = synchronizer.run(args, aValue);
 		
 			return result;
 		}, aName, someMethods, args);
 	},
 	
 	//-------------------------------------------------------------------------
 
 	'collectResults': function(aName, someRequests, args) {
 		return MochiKit.Base.partial(function(aName, someRequests, args, aValue) {
 			var deferredResult;
diff --git a/frontend/gamma/js/Clipperz/PM/Proxy.js b/frontend/gamma/js/Clipperz/PM/Proxy.js
index 190bffd..9817eac 100644
--- a/frontend/gamma/js/Clipperz/PM/Proxy.js
+++ b/frontend/gamma/js/Clipperz/PM/Proxy.js
@@ -97,73 +97,73 @@ Clipperz.PM.Proxy.prototype = MochiKit.Base.update(null, {
 //console.log("<<< Proxy.payToll");
 
 		return deferredResult;
 	},
 
 	//-------------------------------------------------------------------------
 
 	'addToll': function(aToll) {
 //console.log(">>> Proxy.addToll", aToll);
 		this.tolls()[aToll.requestType()].push(aToll);
 //console.log("<<< Proxy.addToll");
 	},
 
 	//=========================================================================
 
 	'setTollCallback': function(someParameters) {
 //console.log(">>> Proxy.setTollCallback", someParameters);
 		if (typeof(someParameters['toll']) != 'undefined') {
 //console.log("added a new toll", someParameters['toll']);
 			this.addToll(new Clipperz.PM.Toll(someParameters['toll']));
 		}
 //console.log("<<< Proxy.setTallCallback", someParameters['result']);
 		return someParameters['result'];
 	},
 
 	//=========================================================================
 
 	'registration': function (someParameters) {
 		return this.processMessage('registration', someParameters, 'REGISTER');
 	},
 
 	'handshake': function (someParameters) {
 		return this.processMessage('handshake', someParameters, 'CONNECT');
 	},
 
 	'message': function (someParameters) {
 		return this.processMessage('message', someParameters, 'MESSAGE');
 	},
 
 	'logout': function (someParameters) {
 		return this.processMessage('logout', someParameters, 'MESSAGE');
 	},
 
 	//=========================================================================
 
 	'processMessage': function (aFunctionName, someParameters, aRequestType) {
 		var	deferredResult;
 
-		deferredResult = new Clipperz.Async.Deferred("Proxy.processMessage", {trace:false});
+		deferredResult = new Clipperz.Async.Deferred("Proxy.processMessage", {trace:true});
 		deferredResult.addMethod(this, 'payToll', aRequestType);
 		deferredResult.addMethod(this, 'sendMessage', aFunctionName);
 		deferredResult.addMethod(this, 'setTollCallback');
 		deferredResult.callback(someParameters);
 		
 		return deferredResult;		
 	},
 
 	//=========================================================================
 
 	'sendMessage': function () {
 		throw Clipperz.Base.exception.AbstractMethod;		
 	},
 
 	//=========================================================================
 
 	'isReadOnly': function () {
 		return false;
 	},
 
 	//=========================================================================
 	__syntaxFix__: "syntax fix"
 	
 });
author	Giulio Cesare Solaroli <giulio.cesare@clipperz.com>	2012-02-11 23:48:42 (UTC)
committer	Giulio Cesare Solaroli <giulio.cesare@clipperz.com>	2012-02-11 23:48:42 (UTC)
commit	a0661c3b02aa26d6b08ff13dc321e09478868159 (patch) (side-by-side diff)
tree	87bd0af25a0732adb9d14a34d25f9d5479fdf5ee /frontend/gamma/js
parent	96d01919d3ff42c3fdd7f6186a0500caccd3c140 (diff)
parent	7804333809bf725e32a08c531a06acd7d668e190 (diff)
download	clipperz-a0661c3b02aa26d6b08ff13dc321e09478868159.zip clipperz-a0661c3b02aa26d6b08ff13dc321e09478868159.tar.gz clipperz-a0661c3b02aa26d6b08ff13dc321e09478868159.tar.bz2