You are viewing a plain text version of this content. The canonical link for it is here.
Posted to dev@tapestry.apache.org by jk...@apache.org on 2006/09/29 05:43:06 UTC
svn commit: r451106 [20/40] - in /tapestry/tapestry4/trunk: ./
tapestry-framework/src/java/org/apache/tapestry/asset/
tapestry-framework/src/js/dojo/ tapestry-framework/src/js/dojo/src/
tapestry-framework/src/js/dojo/src/animation/ tapestry-framework/s...
Added: tapestry/tapestry4/trunk/tapestry-framework/src/js/dojo/src/logging/Logger.js
URL: http://svn.apache.org/viewvc/tapestry/tapestry4/trunk/tapestry-framework/src/js/dojo/src/logging/Logger.js?view=auto&rev=451106
==============================================================================
--- tapestry/tapestry4/trunk/tapestry-framework/src/js/dojo/src/logging/Logger.js (added)
+++ tapestry/tapestry4/trunk/tapestry-framework/src/js/dojo/src/logging/Logger.js Thu Sep 28 20:42:39 2006
@@ -0,0 +1,397 @@
+/*
+ Copyright (c) 2004-2006, The Dojo Foundation
+ All Rights Reserved.
+
+ Licensed under the Academic Free License version 2.1 or above OR the
+ modified BSD license. For more information on Dojo licensing, see:
+
+ http://dojotoolkit.org/community/licensing.shtml
+*/
+
+/* This is the dojo logging facility, which is imported from nWidgets
+ (written by Alex Russell, CLA on file), which is patterned on the
+ Python logging module, which in turn has been heavily influenced by
+ log4j (execpt with some more pythonic choices, which we adopt as well).
+
+ While the dojo logging facilities do provide a set of familiar
+ interfaces, many of the details are changed to reflect the constraints
+ of the browser environment. Mainly, file and syslog-style logging
+ facilites are not provided, with HTTP POST and GET requests being the
+ only ways of getting data from the browser back to a server. Minimal
+ support for this (and XML serialization of logs) is provided, but may
+ not be of practical use in a deployment environment.
+
+ The Dojo logging classes are agnostic of any environment, and while
+ default loggers are provided for browser-based interpreter
+ environments, this file and the classes it define are explicitly
+ designed to be portable to command-line interpreters and other
+ ECMA-262v3 envrionments.
+
+ the logger needs to accomidate:
+ log "levels"
+ type identifiers
+ file?
+ message
+ tic/toc?
+
+ The logger should ALWAYS record:
+ time/date logged
+ message
+ type
+ level
+*/
+// TODO: conver documentation to javadoc style once we confirm that is our choice
+// TODO: define DTD for XML-formatted log messages
+// TODO: write XML Formatter class
+// TODO: write HTTP Handler which uses POST to send log lines/sections
+
+// Filename: LogCore.js
+// Purpose: a common logging infrastructure for dojo
+// Classes: dojo.logging, dojo.logging.Logger, dojo.logging.Record, dojo.logging.LogFilter
+// Global Objects: dojo.logging
+// Dependencies: none
+
+dojo.provide("dojo.logging.Logger");
+dojo.provide("dojo.log");
+dojo.require("dojo.lang.common");
+
+/*
+ A simple data structure class that stores information for and about
+ a logged event. Objects of this type are created automatically when
+ an event is logged and are the internal format in which information
+ about log events is kept.
+*/
+
+dojo.logging.Record = function(lvl, msg){
+ this.level = lvl;
+ this.message = msg;
+ this.time = new Date();
+ // FIXME: what other information can we receive/discover here?
+}
+
+// an empty parent (abstract) class which concrete filters should inherit from.
+dojo.logging.LogFilter = function(loggerChain){
+ this.passChain = loggerChain || "";
+ this.filter = function(record){
+ // FIXME: need to figure out a way to enforce the loggerChain
+ // restriction
+ return true; // pass all records
+ }
+}
+
+dojo.logging.Logger = function(){
+ this.cutOffLevel = 0;
+ this.propagate = true;
+ this.parent = null;
+ // storage for dojo.logging.Record objects seen and accepted by this logger
+ this.data = [];
+ this.filters = [];
+ this.handlers = [];
+}
+
+dojo.extend(dojo.logging.Logger, {
+ argsToArr: function(args){
+ // utility function, reproduced from __util__ here to remove dependency
+ var ret = [];
+ for(var x=0; x<args.length; x++){
+ ret.push(args[x]);
+ }
+ return ret;
+ },
+
+ setLevel: function(lvl){
+ this.cutOffLevel = parseInt(lvl);
+ },
+
+ isEnabledFor: function(lvl){
+ return parseInt(lvl) >= this.cutOffLevel;
+ },
+
+ getEffectiveLevel: function(){
+ if((this.cutOffLevel==0)&&(this.parent)){
+ return this.parent.getEffectiveLevel();
+ }
+ return this.cutOffLevel;
+ },
+
+ addFilter: function(flt){
+ this.filters.push(flt);
+ return this.filters.length-1;
+ },
+
+ removeFilterByIndex: function(fltIndex){
+ if(this.filters[fltIndex]){
+ delete this.filters[fltIndex];
+ return true;
+ }
+ return false;
+ },
+
+ removeFilter: function(fltRef){
+ for(var x=0; x<this.filters.length; x++){
+ if(this.filters[x]===fltRef){
+ delete this.filters[x];
+ return true;
+ }
+ }
+ return false;
+ },
+
+ removeAllFilters: function(){
+ this.filters = []; // clobber all of them
+ },
+
+ filter: function(rec){
+ for(var x=0; x<this.filters.length; x++){
+ if((this.filters[x]["filter"])&&
+ (!this.filters[x].filter(rec))||
+ (rec.level<this.cutOffLevel)){
+ return false;
+ }
+ }
+ return true;
+ },
+
+ addHandler: function(hdlr){
+ this.handlers.push(hdlr);
+ return this.handlers.length-1;
+ },
+
+ handle: function(rec){
+ if((!this.filter(rec))||(rec.level<this.cutOffLevel)){ return false; }
+ for(var x=0; x<this.handlers.length; x++){
+ if(this.handlers[x]["handle"]){
+ this.handlers[x].handle(rec);
+ }
+ }
+ // FIXME: not sure what to do about records to be propagated that may have
+ // been modified by the handlers or the filters at this logger. Should
+ // parents always have pristine copies? or is passing the modified record
+ // OK?
+ // if((this.propagate)&&(this.parent)){ this.parent.handle(rec); }
+ return true;
+ },
+
+ // the heart and soul of the logging system
+ log: function(lvl, msg){
+ if( (this.propagate)&&(this.parent)&&
+ (this.parent.rec.level>=this.cutOffLevel)){
+ this.parent.log(lvl, msg);
+ return false;
+ }
+ // FIXME: need to call logging providers here!
+ this.handle(new dojo.logging.Record(lvl, msg));
+ return true;
+ },
+
+ // logger helpers
+ debug:function(msg){
+ return this.logType("DEBUG", this.argsToArr(arguments));
+ },
+
+ info: function(msg){
+ return this.logType("INFO", this.argsToArr(arguments));
+ },
+
+ warning: function(msg){
+ return this.logType("WARNING", this.argsToArr(arguments));
+ },
+
+ error: function(msg){
+ return this.logType("ERROR", this.argsToArr(arguments));
+ },
+
+ critical: function(msg){
+ return this.logType("CRITICAL", this.argsToArr(arguments));
+ },
+
+ exception: function(msg, e, squelch){
+ // FIXME: this needs to be modified to put the exception in the msg
+ // if we're on Moz, we can get the following from the exception object:
+ // lineNumber
+ // message
+ // fileName
+ // stack
+ // name
+ // on IE, we get:
+ // name
+ // message (from MDA?)
+ // number
+ // description (same as message!)
+ if(e){
+ var eparts = [e.name, (e.description||e.message)];
+ if(e.fileName){
+ eparts.push(e.fileName);
+ eparts.push("line "+e.lineNumber);
+ // eparts.push(e.stack);
+ }
+ msg += " "+eparts.join(" : ");
+ }
+
+ this.logType("ERROR", msg);
+ if(!squelch){
+ throw e;
+ }
+ },
+
+ logType: function(type, args){
+ if (!dojo.lang.isArray(args)){
+ args = this.argsToArr(args);
+ }
+ return this.log.apply(this, [dojo.logging.log.getLevel(type),
+ args.join('')]);
+ }
+});
+
+void(function(){
+ var ptype = dojo.logging.Logger.prototype;
+ ptype.warn = ptype.warning;
+ ptype.err = ptype.error;
+ ptype.crit = ptype.critical;
+})();
+
+// the Handler class
+dojo.logging.LogHandler = function(level){
+ this.cutOffLevel = (level) ? level : 0;
+ this.formatter = null; // FIXME: default formatter?
+ this.data = [];
+ this.filters = [];
+}
+
+dojo.logging.LogHandler.prototype.setFormatter = function(fmtr){
+ // FIXME: need to vet that it is indeed a formatter object
+ dojo.unimplemented("setFormatter");
+}
+
+dojo.logging.LogHandler.prototype.flush = function(){
+ dojo.unimplemented("flush");
+}
+
+dojo.logging.LogHandler.prototype.close = function(){
+ dojo.unimplemented("close");
+}
+
+dojo.logging.LogHandler.prototype.handleError = function(){
+ dojo.unimplemented("handleError");
+}
+
+dojo.logging.LogHandler.prototype.handle = function(record){
+ // emits the passed record if it passes this object's filters
+ if((this.filter(record))&&(record.level>=this.cutOffLevel)){
+ this.emit(record);
+ }
+}
+
+dojo.logging.LogHandler.prototype.emit = function(record){
+ // do whatever is necessaray to actually log the record
+ dojo.unimplemented("emit");
+}
+
+// set aliases since we don't want to inherit from dojo.logging.Logger
+void(function(){ // begin globals protection closure
+ var names = [
+ "setLevel", "addFilter", "removeFilterByIndex", "removeFilter",
+ "removeAllFilters", "filter"
+ ];
+ var tgt = dojo.logging.LogHandler.prototype;
+ var src = dojo.logging.Logger.prototype;
+ for(var x=0; x<names.length; x++){
+ tgt[names[x]] = src[names[x]];
+ }
+})(); // end globals protection closure
+
+dojo.logging.log = new dojo.logging.Logger();
+
+// an associative array of logger objects. This object inherits from
+// a list of level names with their associated numeric levels
+dojo.logging.log.levels = [ {"name": "DEBUG", "level": 1},
+ {"name": "INFO", "level": 2},
+ {"name": "WARNING", "level": 3},
+ {"name": "ERROR", "level": 4},
+ {"name": "CRITICAL", "level": 5} ];
+
+dojo.logging.log.loggers = {};
+
+dojo.logging.log.getLogger = function(name){
+ if(!this.loggers[name]){
+ this.loggers[name] = new dojo.logging.Logger();
+ this.loggers[name].parent = this;
+ }
+ return this.loggers[name];
+}
+
+dojo.logging.log.getLevelName = function(lvl){
+ for(var x=0; x<this.levels.length; x++){
+ if(this.levels[x].level == lvl){
+ return this.levels[x].name;
+ }
+ }
+ return null;
+}
+
+dojo.logging.log.addLevelName = function(name, lvl){
+ if(this.getLevelName(name)){
+ this.err("could not add log level "+name+" because a level with that name already exists");
+ return false;
+ }
+ this.levels.append({"name": name, "level": parseInt(lvl)});
+ return true;
+}
+
+dojo.logging.log.getLevel = function(name){
+ for(var x=0; x<this.levels.length; x++){
+ if(this.levels[x].name.toUpperCase() == name.toUpperCase()){
+ return this.levels[x].level;
+ }
+ }
+ return null;
+}
+
+// a default handler class, it simply saves all of the handle()'d records in
+// memory. Useful for attaching to with dojo.event.connect()
+dojo.logging.MemoryLogHandler = function(level, recordsToKeep, postType, postInterval){
+ // mixin style inheritance
+ dojo.logging.LogHandler.call(this, level);
+ // default is unlimited
+ this.numRecords = (typeof djConfig['loggingNumRecords'] != 'undefined') ? djConfig['loggingNumRecords'] : ((recordsToKeep) ? recordsToKeep : -1);
+ // 0=count, 1=time, -1=don't post TODO: move this to a better location for prefs
+ this.postType = (typeof djConfig['loggingPostType'] != 'undefined') ? djConfig['loggingPostType'] : ( postType || -1);
+ // milliseconds for time, interger for number of records, -1 for non-posting,
+ this.postInterval = (typeof djConfig['loggingPostInterval'] != 'undefined') ? djConfig['loggingPostInterval'] : ( postType || -1);
+
+}
+// prototype inheritance
+dojo.logging.MemoryLogHandler.prototype = new dojo.logging.LogHandler();
+
+// FIXME
+// dojo.inherits(dojo.logging.MemoryLogHandler,
+
+// over-ride base-class
+dojo.logging.MemoryLogHandler.prototype.emit = function(record){
+ this.data.push(record);
+ if(this.numRecords != -1){
+ while(this.data.length>this.numRecords){
+ this.data.shift();
+ }
+ }
+}
+
+dojo.logging.logQueueHandler = new dojo.logging.MemoryLogHandler(0,50,0,10000);
+// actual logging event handler
+dojo.logging.logQueueHandler.emit = function(record){
+ if (!djConfig.isDebug) { return; }
+ // we should probably abstract this in the future
+ var logStr = String(dojo.log.getLevelName(record.level)+": "+record.time.toLocaleTimeString())+": "+record.message;
+ if(!dj_undef("println", dojo.hostenv)){
+ dojo.hostenv.println(logStr);
+ }
+ this.data.push(record);
+ if(this.numRecords != -1){
+ while(this.data.length>this.numRecords){
+ this.data.shift();
+ }
+ }
+}
+
+dojo.logging.log.addHandler(dojo.logging.logQueueHandler);
+dojo.log = dojo.logging.log;
Propchange: tapestry/tapestry4/trunk/tapestry-framework/src/js/dojo/src/logging/Logger.js
------------------------------------------------------------------------------
svn:eol-style = native
Added: tapestry/tapestry4/trunk/tapestry-framework/src/js/dojo/src/logging/__package__.js
URL: http://svn.apache.org/viewvc/tapestry/tapestry4/trunk/tapestry-framework/src/js/dojo/src/logging/__package__.js?view=auto&rev=451106
==============================================================================
--- tapestry/tapestry4/trunk/tapestry-framework/src/js/dojo/src/logging/__package__.js (added)
+++ tapestry/tapestry4/trunk/tapestry-framework/src/js/dojo/src/logging/__package__.js Thu Sep 28 20:42:39 2006
@@ -0,0 +1,15 @@
+/*
+ Copyright (c) 2004-2006, The Dojo Foundation
+ All Rights Reserved.
+
+ Licensed under the Academic Free License version 2.1 or above OR the
+ modified BSD license. For more information on Dojo licensing, see:
+
+ http://dojotoolkit.org/community/licensing.shtml
+*/
+
+dojo.kwCompoundRequire({
+ common: [["dojo.logging.Logger", false, false]],
+ rhino: ["dojo.logging.RhinoLogger"]
+});
+dojo.provide("dojo.logging.*");
Propchange: tapestry/tapestry4/trunk/tapestry-framework/src/js/dojo/src/logging/__package__.js
------------------------------------------------------------------------------
svn:eol-style = native
Added: tapestry/tapestry4/trunk/tapestry-framework/src/js/dojo/src/math.js
URL: http://svn.apache.org/viewvc/tapestry/tapestry4/trunk/tapestry-framework/src/js/dojo/src/math.js?view=auto&rev=451106
==============================================================================
--- tapestry/tapestry4/trunk/tapestry-framework/src/js/dojo/src/math.js (added)
+++ tapestry/tapestry4/trunk/tapestry-framework/src/js/dojo/src/math.js Thu Sep 28 20:42:39 2006
@@ -0,0 +1,127 @@
+/*
+ Copyright (c) 2004-2006, The Dojo Foundation
+ All Rights Reserved.
+
+ Licensed under the Academic Free License version 2.1 or above OR the
+ modified BSD license. For more information on Dojo licensing, see:
+
+ http://dojotoolkit.org/community/licensing.shtml
+*/
+
+dojo.provide("dojo.math");
+
+dojo.math.degToRad = function(/* float */x) {
+ // summary
+ // Converts degrees to radians.
+ return (x*Math.PI) / 180; // float
+}
+dojo.math.radToDeg = function(/* float */x) {
+ // summary
+ // Converts radians to degrees.
+ return (x*180) / Math.PI; // float
+}
+
+dojo.math.factorial = function(/* integer */n){
+ // summary
+ // Returns n!
+ if(n<1){ return 0; }
+ var retVal = 1;
+ for(var i=1;i<=n;i++){ retVal *= i; }
+ return retVal; // integer
+}
+
+dojo.math.permutations = function(/* integer */n, /* integer */k) {
+ // summary
+ // The number of ways of obtaining an ordered subset of k elements from a set of n elements
+ if(n==0 || k==0) return 1;
+ return (dojo.math.factorial(n) / dojo.math.factorial(n-k)); // float
+}
+
+dojo.math.combinations = function (/* integer */n, /* integer */r) {
+ // summary
+ // The number of ways of picking n unordered outcomes from r possibilities
+ if(n==0 || r==0) return 1;
+ return (dojo.math.factorial(n) / (dojo.math.factorial(n-r) * dojo.math.factorial(r))); // float
+}
+
+dojo.math.bernstein = function(/* float */t, /* float */n, /* float */i) {
+ // summary
+ // Calculates a weighted average based on the Bernstein theorem.
+ return (dojo.math.combinations(n,i) * Math.pow(t,i) * Math.pow(1-t,n-i)); // float
+}
+
+dojo.math.gaussianRandom = function(){
+ // summary
+ // Returns random numbers with a Gaussian distribution, with the mean set at 0 and the variance set at 1.
+ var k = 2;
+ do {
+ var i = 2 * Math.random() - 1;
+ var j = 2 * Math.random() - 1;
+ k = i * i + j * j;
+ } while (k >= 1);
+ k = Math.sqrt((-2 * Math.log(k)) / k);
+ return i * k; // float
+}
+
+dojo.math.mean = function() {
+ // summary
+ // Calculates the mean of an Array of numbers.
+ var array = dojo.lang.isArray(arguments[0]) ? arguments[0] : arguments;
+ var mean = 0;
+ for (var i = 0; i < array.length; i++) { mean += array[i]; }
+ return mean / array.length; // float
+}
+
+dojo.math.round = function(/* float */number, /* integer */places) {
+ // summary
+ // Extends Math.round by adding a second argument specifying the number of decimal places to round to.
+ // TODO: add support for significant figures
+ if (!places) { var shift = 1; }
+ else { var shift = Math.pow(10, places); }
+ return Math.round(number * shift) / shift; // float
+}
+
+dojo.math.sd = dojo.math.standardDeviation = function(/* array */){
+ // summary
+ // Calculates the standard deviation of an Array of numbers
+ var array = dojo.lang.isArray(arguments[0]) ? arguments[0] : arguments;
+ return Math.sqrt(dojo.math.variance(array)); // float
+}
+
+dojo.math.variance = function(/* array */) {
+ // summary
+ // Calculates the variance of an Array of numbers
+ var array = dojo.lang.isArray(arguments[0]) ? arguments[0] : arguments;
+ var mean = 0, squares = 0;
+ for (var i = 0; i < array.length; i++) {
+ mean += array[i];
+ squares += Math.pow(array[i], 2);
+ }
+ return (squares / array.length) - Math.pow(mean / array.length, 2); // float
+}
+
+dojo.math.range = function(/* integer */a, /* integer */b, /* integer */step) {
+ // summary
+ // implementation of Python's range()
+ if(arguments.length < 2) {
+ b = a;
+ a = 0;
+ }
+ if(arguments.length < 3) {
+ step = 1;
+ }
+
+ var range = [];
+ if(step > 0) {
+ for(var i = a; i < b; i += step) {
+ range.push(i);
+ }
+ } else if(step < 0) {
+ for(var i = a; i > b; i += step) {
+ range.push(i);
+ }
+ } else {
+ throw new Error("dojo.math.range: step must be non-zero");
+ }
+ return range; // array
+}
Propchange: tapestry/tapestry4/trunk/tapestry-framework/src/js/dojo/src/math.js
------------------------------------------------------------------------------
svn:eol-style = native
Added: tapestry/tapestry4/trunk/tapestry-framework/src/js/dojo/src/math/__package__.js
URL: http://svn.apache.org/viewvc/tapestry/tapestry4/trunk/tapestry-framework/src/js/dojo/src/math/__package__.js?view=auto&rev=451106
==============================================================================
--- tapestry/tapestry4/trunk/tapestry-framework/src/js/dojo/src/math/__package__.js (added)
+++ tapestry/tapestry4/trunk/tapestry-framework/src/js/dojo/src/math/__package__.js Thu Sep 28 20:42:39 2006
@@ -0,0 +1,18 @@
+/*
+ Copyright (c) 2004-2006, The Dojo Foundation
+ All Rights Reserved.
+
+ Licensed under the Academic Free License version 2.1 or above OR the
+ modified BSD license. For more information on Dojo licensing, see:
+
+ http://dojotoolkit.org/community/licensing.shtml
+*/
+
+dojo.kwCompoundRequire({
+ common: [
+ ["dojo.math", false, false],
+ ["dojo.math.curves", false, false],
+ ["dojo.math.points", false, false]
+ ]
+});
+dojo.provide("dojo.math.*");
Propchange: tapestry/tapestry4/trunk/tapestry-framework/src/js/dojo/src/math/__package__.js
------------------------------------------------------------------------------
svn:eol-style = native
Added: tapestry/tapestry4/trunk/tapestry-framework/src/js/dojo/src/math/curves.js
URL: http://svn.apache.org/viewvc/tapestry/tapestry4/trunk/tapestry-framework/src/js/dojo/src/math/curves.js?view=auto&rev=451106
==============================================================================
--- tapestry/tapestry4/trunk/tapestry-framework/src/js/dojo/src/math/curves.js (added)
+++ tapestry/tapestry4/trunk/tapestry-framework/src/js/dojo/src/math/curves.js Thu Sep 28 20:42:39 2006
@@ -0,0 +1,242 @@
+/*
+ Copyright (c) 2004-2006, The Dojo Foundation
+ All Rights Reserved.
+
+ Licensed under the Academic Free License version 2.1 or above OR the
+ modified BSD license. For more information on Dojo licensing, see:
+
+ http://dojotoolkit.org/community/licensing.shtml
+*/
+
+dojo.provide("dojo.math.curves");
+dojo.require("dojo.math");
+
+/* Curves from Dan's 13th lib stuff.
+ * See: http://pupius.co.uk/js/Toolkit.Drawing.js
+ * http://pupius.co.uk/dump/dojo/Dojo.Math.js
+ */
+
+dojo.math.curves = {
+ Line: function(/* array */start, /* array */end) {
+ // summary
+ // Creates a straight line object
+ this.start = start;
+ this.end = end;
+ this.dimensions = start.length;
+
+ for(var i = 0; i < start.length; i++) {
+ start[i] = Number(start[i]);
+ }
+
+ for(var i = 0; i < end.length; i++) {
+ end[i] = Number(end[i]);
+ }
+
+ //simple function to find point on an n-dimensional, straight line
+ this.getValue = function(/* float */n){
+ // summary
+ // Returns the point at point N (in terms of percentage) on this line.
+ var retVal = new Array(this.dimensions);
+ for(var i=0;i<this.dimensions;i++)
+ retVal[i] = ((this.end[i] - this.start[i]) * n) + this.start[i];
+ return retVal; // array
+ }
+ return this; // dojo.math.curves.Line
+ },
+
+ Bezier: function(/* array */pnts) {
+ // summary
+ // Creates a bezier curve
+ // Takes an array of points, the first is the start point, the last is end point and the ones in
+ // between are the Bezier control points.
+ this.getValue = function(/* float */step) {
+ // summary
+ // Returns the point at point N (in terms of percentage) on this curve.
+ if(step >= 1) return this.p[this.p.length-1]; // if step>=1 we must be at the end of the curve
+ if(step <= 0) return this.p[0]; // if step<=0 we must be at the start of the curve
+ var retVal = new Array(this.p[0].length);
+ for(var k=0;j<this.p[0].length;k++) { retVal[k]=0; }
+ for(var j=0;j<this.p[0].length;j++) {
+ var C=0; var D=0;
+ for(var i=0;i<this.p.length;i++) {
+ C += this.p[i][j] * this.p[this.p.length-1][0]
+ * dojo.math.bernstein(step,this.p.length,i);
+ }
+ for(var l=0;l<this.p.length;l++) {
+ D += this.p[this.p.length-1][0] * dojo.math.bernstein(step,this.p.length,l);
+ }
+ retVal[j] = C/D;
+ }
+ return retVal; // array
+ }
+ this.p = pnts;
+ return this; // dojo.math.curves.Bezier
+ },
+
+ CatmullRom : function(/* array */pnts, /* float */c) {
+ // summary
+ // Creates a catmull-rom spline curve with c tension.
+ this.getValue = function(/* float */step) {
+ // summary
+ // Returns the point at point N (in terms of percentage) on this curve.
+ var percent = step * (this.p.length-1);
+ var node = Math.floor(percent);
+ var progress = percent - node;
+
+ var i0 = node-1; if(i0 < 0) i0 = 0;
+ var i = node;
+ var i1 = node+1; if(i1 >= this.p.length) i1 = this.p.length-1;
+ var i2 = node+2; if(i2 >= this.p.length) i2 = this.p.length-1;
+
+ var u = progress;
+ var u2 = progress*progress;
+ var u3 = progress*progress*progress;
+
+ var retVal = new Array(this.p[0].length);
+ for(var k=0;k<this.p[0].length;k++) {
+ var x1 = ( -this.c * this.p[i0][k] ) + ( (2 - this.c) * this.p[i][k] ) + ( (this.c-2) * this.p[i1][k] ) + ( this.c * this.p[i2][k] );
+ var x2 = ( 2 * this.c * this.p[i0][k] ) + ( (this.c-3) * this.p[i][k] ) + ( (3 - 2 * this.c) * this.p[i1][k] ) + ( -this.c * this.p[i2][k] );
+ var x3 = ( -this.c * this.p[i0][k] ) + ( this.c * this.p[i1][k] );
+ var x4 = this.p[i][k];
+
+ retVal[k] = x1*u3 + x2*u2 + x3*u + x4;
+ }
+ return retVal; // array
+ }
+
+ if(!c) this.c = 0.7;
+ else this.c = c;
+ this.p = pnts;
+
+ return this; // dojo.math.curves.CatmullRom
+ },
+
+ // FIXME: This is the bad way to do a partial-arc with 2 points. We need to have the user
+ // supply the radius, otherwise we always get a half-circle between the two points.
+ Arc : function(/* array */start, /* array */end, /* boolean? */ccw) {
+ // summary
+ // Creates an arc with a counter clockwise switch
+ var center = dojo.math.points.midpoint(start, end);
+ var sides = dojo.math.points.translate(dojo.math.points.invert(center), start);
+ var rad = Math.sqrt(Math.pow(sides[0], 2) + Math.pow(sides[1], 2));
+ var theta = dojo.math.radToDeg(Math.atan(sides[1]/sides[0]));
+ if( sides[0] < 0 ) {
+ theta -= 90;
+ } else {
+ theta += 90;
+ }
+ dojo.math.curves.CenteredArc.call(this, center, rad, theta, theta+(ccw?-180:180));
+ },
+
+ CenteredArc : function(/* array */center, /* float */radius, /* array */start, /* array */end) {
+ // summary
+ // Creates an arc object, with center and radius (Top of arc = 0 degrees, increments clockwise)
+ // center => 2D point for center of arc
+ // radius => scalar quantity for radius of arc
+ // start => to define an arc specify start angle (default: 0)
+ // end => to define an arc specify start angle
+ this.center = center;
+ this.radius = radius;
+ this.start = start || 0;
+ this.end = end;
+
+ this.getValue = function(/* float */n) {
+ // summary
+ // Returns the point at point N (in terms of percentage) on this curve.
+ var retVal = new Array(2);
+ var theta = dojo.math.degToRad(this.start+((this.end-this.start)*n));
+
+ retVal[0] = this.center[0] + this.radius*Math.sin(theta);
+ retVal[1] = this.center[1] - this.radius*Math.cos(theta);
+
+ return retVal; // array
+ }
+
+ return this; // dojo.math.curves.CenteredArc
+ },
+
+ Circle : function(/* array */center, /* float */radius) {
+ // summary
+ // Special case of Arc (start = 0, end = 360)
+ dojo.math.curves.CenteredArc.call(this, center, radius, 0, 360);
+ return this; // dojo.math.curves.Circle
+ },
+
+ Path : function() {
+ // summary
+ // Generic path shape, created from curve segments
+ var curves = [];
+ var weights = [];
+ var ranges = [];
+ var totalWeight = 0;
+
+ this.add = function(/* dojo.math.curves.* */curve, /* float */weight) {
+ // summary
+ // Add a curve segment to this path
+ if( weight < 0 ) { dojo.raise("dojo.math.curves.Path.add: weight cannot be less than 0"); }
+ curves.push(curve);
+ weights.push(weight);
+ totalWeight += weight;
+ computeRanges();
+ }
+
+ this.remove = function(/* dojo.math.curves.* */curve) {
+ // summary
+ // Remove a curve segment from this path
+ for(var i = 0; i < curves.length; i++) {
+ if( curves[i] == curve ) {
+ curves.splice(i, 1);
+ totalWeight -= weights.splice(i, 1)[0];
+ break;
+ }
+ }
+ computeRanges();
+ }
+
+ this.removeAll = function() {
+ // summary
+ // Remove all curve segments
+ curves = [];
+ weights = [];
+ totalWeight = 0;
+ }
+
+ this.getValue = function(/* float */n) {
+ // summary
+ // Returns the point at point N (in terms of percentage) on this curve.
+ var found = false, value = 0;
+ for(var i = 0; i < ranges.length; i++) {
+ var r = ranges[i];
+ //w(r.join(" ... "));
+ if( n >= r[0] && n < r[1] ) {
+ var subN = (n - r[0]) / r[2];
+ value = curves[i].getValue(subN);
+ found = true;
+ break;
+ }
+ }
+
+ // FIXME: Do we want to assume we're at the end?
+ if( !found ) {
+ value = curves[curves.length-1].getValue(1);
+ }
+
+ for(var j = 0; j < i; j++) {
+ value = dojo.math.points.translate(value, curves[j].getValue(1));
+ }
+ return value; // array
+ }
+
+ function computeRanges() {
+ var start = 0;
+ for(var i = 0; i < weights.length; i++) {
+ var end = start + weights[i] / totalWeight;
+ var len = end - start;
+ ranges[i] = [start, end, len];
+ start = end;
+ }
+ }
+
+ return this; // dojo.math.curves.Path
+ }
+};
Propchange: tapestry/tapestry4/trunk/tapestry-framework/src/js/dojo/src/math/curves.js
------------------------------------------------------------------------------
svn:eol-style = native
Added: tapestry/tapestry4/trunk/tapestry-framework/src/js/dojo/src/math/matrix.js
URL: http://svn.apache.org/viewvc/tapestry/tapestry4/trunk/tapestry-framework/src/js/dojo/src/math/matrix.js?view=auto&rev=451106
==============================================================================
--- tapestry/tapestry4/trunk/tapestry-framework/src/js/dojo/src/math/matrix.js (added)
+++ tapestry/tapestry4/trunk/tapestry-framework/src/js/dojo/src/math/matrix.js Thu Sep 28 20:42:39 2006
@@ -0,0 +1,377 @@
+/*
+ Copyright (c) 2004-2006, The Dojo Foundation
+ All Rights Reserved.
+
+ Licensed under the Academic Free License version 2.1 or above OR the
+ modified BSD license. For more information on Dojo licensing, see:
+
+ http://dojotoolkit.org/community/licensing.shtml
+*/
+
+dojo.provide("dojo.math.matrix");
+
+// some of this code is based on
+// http://www.mkaz.com/math/MatrixCalculator.java
+// (published under a BSD Open Source License)
+//
+// the rest is from my vague memory of matricies in school [cal]
+//
+// the copying of arguments is a little excessive, and could be trimmed back in
+// the case where a function doesn't modify them at all (but some do!)
+//
+// 2006-06-25: Some enhancements submitted by Erel Segal:
+// * addition: a tolerance constant for determinant calculations.
+// * performance fix: removed unnecessary argument copying.
+// * addition: function "product" for multiplying more than 2 matrices
+// * addition: function "sum" for adding any number of matrices
+// * bug fix: inversion of a 1x1 matrix without using the adjoint
+// * performance fixes: upperTriangle
+// * addition: argument "value" to function create, to initialize the matrix with a custom val
+// * addition: functions "ones" and "zeros" - like Matlab[TM] functions with the same name.
+// * addition: function "identity" for creating an identity matrix of a given size.
+// * addition: argument "decimal_points" to function format
+// * bug fix: adjoint of a 0-size matrix
+// * performance fixes: adjoint
+//
+
+dojo.math.matrix.iDF = 0;
+
+// Erel: values lower than this value are considered zero (in detereminant calculations).
+// It is analogous to Maltab[TM]'s "eps".
+dojo.math.matrix.ALMOST_ZERO = 1e-10;
+dojo.math.matrix.multiply = function(a, b){
+ var ay = a.length;
+ var ax = a[0].length;
+ var by = b.length;
+ var bx = b[0].length;
+
+ if (ax != by){
+ dojo.debug("Can't multiply matricies of sizes "+ax+','+ay+' and '+bx+','+by);
+ return [[0]];
+ }
+
+ var c = [];
+ for(var k=0; k<ay; k++){
+ c[k] = [];
+ for(var i=0; i<bx; i++){
+ c[k][i] = 0;
+ for(var m=0; m<ax; m++){
+ c[k][i] += a[k][m]*b[m][i];
+ }
+ }
+ }
+ return c;
+}
+
+// Erel: added a "product" function to calculate product of more than 2 matrices:
+dojo.math.matrix.product = function() {
+ if (arguments.length==0) {
+ dojo.debug ("can't multiply 0 matrices!");
+ return 1;
+ }
+ var result = arguments[0];
+ for (var i=1; i<arguments.length; i++){
+ result = dojo.math.matrix.multiply(result,arguments[i]);
+ }
+ return result;
+}
+
+// Erel: added a "sum" function to calculate sum of more than 2 matrices:
+dojo.math.matrix.sum = function() {
+ if (arguments.length==0) {
+ dojo.debug ("can't sum 0 matrices!");
+ return 0;
+ }
+ var result = dojo.math.matrix.copy(arguments[0]);
+ var rows = result.length;
+ if (rows==0) {
+ dojo.debug ("can't deal with matrices of 0 rows!");
+ return 0;
+ }
+ var cols = result[0].length;
+ if (cols==0) {
+ dojo.debug ("can't deal with matrices of 0 cols!");
+ return 0;
+ }
+ for (var i=1; i<arguments.length; ++i) {
+ var arg = arguments[i];
+ if (arg.length!=rows || arg[0].length!=cols) {
+ dojo.debug ("can't add matrices of different dimensions: first dimensions were " + rows + "x" + cols + ", current dimensions are "+arg.length + "x" + arg[0].length);
+ return 0;
+ }
+
+ // The actual addition:
+ for (var r=0; r<rows; r++){
+ for (var c=0; c<cols; c++){
+ result[r][c] += arg[r][c];
+ }
+ }
+ }
+ return result;
+}
+
+
+dojo.math.matrix.inverse = function(a){
+ // Erel: added special case: inverse of a 1x1 matrix can't be calculated by adjoint
+ if (a.length==1 && a[0].length==1){
+ return [[ 1 / a[0][0] ]];
+ }
+
+ // Formula used to Calculate Inverse:
+ // inv(A) = 1/det(A) * adj(A)
+
+ var tms = a.length;
+ var m = dojo.math.matrix.create(tms, tms);
+ var mm = dojo.math.matrix.adjoint(a);
+ var det = dojo.math.matrix.determinant(a);
+ var dd = 0;
+
+ if(det == 0){
+ dojo.debug("Determinant Equals 0, Not Invertible.");
+ return [[0]];
+ }else{
+ dd = 1 / det;
+ }
+
+ for (var i = 0; i < tms; i++){
+ for (var j = 0; j < tms; j++) {
+ m[i][j] = dd * mm[i][j];
+ }
+ }
+ return m;
+}
+
+dojo.math.matrix.determinant = function(a){
+ if (a.length != a[0].length){
+ dojo.debug("Can't calculate the determiant of a non-squre matrix!");
+ return 0;
+ }
+
+ var tms = a.length;
+ var det = 1;
+ var b = dojo.math.matrix.upperTriangle(a);
+
+ for (var i=0; i < tms; i++){
+ var bii = b[i][i];
+ if (Math.abs(bii) < dojo.math.matrix.ALMOST_ZERO){
+ return 0;
+ }
+ det *= bii;
+ }
+ det = det * dojo.math.matrix.iDF;
+ return det;
+}
+
+dojo.math.matrix.upperTriangle = function(m){
+ m = dojo.math.matrix.copy(m); // Copy m, because m is changed!
+ var f1 = 0;
+ var temp = 0;
+ var tms = m.length;
+ var v = 1;
+
+ //Erel: why use a global variable and not a local variable?
+ dojo.math.matrix.iDF = 1;
+
+ for (var col = 0; col < tms - 1; col++) {
+ if (typeof m[col][col] != 'number'){
+ dojo.debug("non-numeric entry found in a numeric matrix: m["+col+"]["+col+"]="+m[col][col]);
+ }
+ v = 1;
+ var stop_loop = 0;
+
+ // check if there is a 0 in diagonal
+ while ((m[col][col] == 0) && !stop_loop) {
+ // if so, switch rows until there is no 0 in diagonal:
+ if (col + v >= tms){
+ // check if switched all rows
+ dojo.math.matrix.iDF = 0;
+ stop_loop = 1;
+ }else{
+ for (var r = 0; r < tms; r++) {
+ temp = m[col][r];
+ m[col][r] = m[col + v][r]; // switch rows
+ m[col + v][r] = temp;
+ }
+ v++; // count row switchs
+ dojo.math.matrix.iDF *= -1; // each switch changes determinant factor
+ }
+ }
+
+ // loop over lower-right triangle (where row>col):
+ // for each row, make m[row][col] = 0 by linear operations that don't change the determinant:
+ for (var row = col + 1; row < tms; row++) {
+ if (typeof m[row][col] != 'number'){
+ dojo.debug("non-numeric entry found in a numeric matrix: m["+row+"]["+col+"]="+m[row][col]);
+ }
+ if (typeof m[col][row] != 'number'){
+ dojo.debug("non-numeric entry found in a numeric matrix: m["+col+"]["+row+"]="+m[col][row]);
+ }
+ if (m[col][col] != 0) {
+ var f1 = (-1) * m[row][col] / m[col][col];
+ // this should make m[row][col] zero:
+ // m[row] += f1 * m[col];
+ for (var i = col; i < tms; i++) {
+ m[row][i] = f1 * m[col][i] + m[row][i];
+ }
+ }
+ }
+ }
+ return m;
+}
+
+// Erel: added parameter "value" - a custom default value to fill the matrix with.
+dojo.math.matrix.create = function(a, b, value){
+ if(!value){
+ value = 0;
+ }
+ var m = [];
+ for(var i=0; i<b; i++){
+ m[i] = [];
+ for(var j=0; j<a; j++){
+ m[i][j] = value;
+ }
+ }
+ return m;
+}
+
+// Erel implement Matlab[TM] functions "ones" and "zeros"
+dojo.math.matrix.ones = function(a,b) {
+ return dojo.math.matrix.create(a,b,1);
+}
+dojo.math.matrix.zeros = function(a,b) {
+ return dojo.math.matrix.create(a,b,0);
+}
+
+// Erel: added function that returns identity matrix.
+// size = number of rows and cols in the matrix.
+// scale = an optional value to multiply the matrix by (default is 1).
+dojo.math.matrix.identity = function(size, scale){
+ if (!scale){
+ scale = 1;
+ }
+ var m = [];
+ for(var i=0; i<size; i++){
+ m[i] = [];
+ for(var j=0; j<size; j++){
+ m[i][j] = (i==j? scale: 0);
+ }
+ }
+ return m;
+}
+
+dojo.math.matrix.adjoint = function(a){
+ var tms = a.length;
+
+ // Erel: added "<=" to catch zero-size matrix
+ if (tms <= 1){
+ dojo.debug("Can't find the adjoint of a matrix with a dimension less than 2");
+ return [[0]];
+ }
+
+ if (a.length != a[0].length){
+ dojo.debug("Can't find the adjoint of a non-square matrix");
+ return [[0]];
+ }
+
+ var m = dojo.math.matrix.create(tms, tms);
+
+ var ii = 0;
+ var jj = 0;
+ var ia = 0;
+ var ja = 0;
+ var det = 0;
+ var ap = dojo.math.matrix.create(tms-1, tms-1);
+
+ for (var i = 0; i < tms; i++){
+ for (var j = 0; j < tms; j++){
+ ia = 0;
+ for (ii = 0; ii < tms; ii++) { // create a temporary matrix for determinant calc
+ if (ii==i){
+ continue; // skip current row
+ }
+ ja = 0;
+ for (jj = 0; jj < tms; jj++) {
+ if (jj==j){
+ continue; // skip current col
+ }
+ ap[ia][ja] = a[ii][jj];
+ ja++;
+ }
+ ia++;
+ }
+
+ det = dojo.math.matrix.determinant(ap);
+ m[i][j] = Math.pow(-1 , (i + j)) * det;
+ }
+ }
+ m = dojo.math.matrix.transpose(m);
+ return m;
+}
+
+dojo.math.matrix.transpose = function(a){
+ var m = dojo.math.matrix.create(a.length, a[0].length);
+ for (var i = 0; i < a.length; i++){
+ for (var j = 0; j < a[i].length; j++){
+ m[j][i] = a[i][j];
+ }
+ }
+ return m;
+}
+
+// Erel: added decimal_points argument
+dojo.math.matrix.format = function(a, decimal_points){
+ if (arguments.length<=1){
+ decimal_points = 5;
+ }
+
+ function format_int(x, dp){
+ var fac = Math.pow(10 , dp);
+ var a = Math.round(x*fac)/fac;
+ var b = a.toString();
+ if (b.charAt(0) != '-'){ b = ' ' + b;}
+ var has_dp = 0;
+ for(var i=1; i<b.length; i++){
+ if (b.charAt(i) == '.'){ has_dp = 1; }
+ }
+ if (!has_dp){ b += '.'; }
+ while(b.length < dp+3){ b += '0'; }
+ return b;
+ }
+
+ var ya = a.length;
+ var xa = ya>0? a[0].length: 0;
+ var buffer = '';
+ for (var y=0; y<ya; y++){
+ buffer += '| ';
+ for (var x=0; x<xa; x++){
+ buffer += format_int(a[y][x], decimal_points) + ' ';
+ }
+ buffer += '|\n';
+ }
+ return buffer;
+}
+
+dojo.math.matrix.copy = function(a){
+ var ya = a.length;
+ var xa = a[0].length;
+ var m = dojo.math.matrix.create(xa, ya);
+ for (var y=0; y<ya; y++){
+ for (var x=0; x<xa; x++){
+ m[y][x] = a[y][x];
+ }
+ }
+ return m;
+}
+
+dojo.math.matrix.scale = function(k, a){
+ a = dojo.math.matrix.copy(a); // Copy a because a is changed!
+ var ya = a.length;
+ var xa = a[0].length;
+
+ for (var y=0; y<ya; y++){
+ for (var x=0; x<xa; x++){
+ a[y][x] *= k;
+ }
+ }
+ return a;
+}
Propchange: tapestry/tapestry4/trunk/tapestry-framework/src/js/dojo/src/math/matrix.js
------------------------------------------------------------------------------
svn:eol-style = native
Added: tapestry/tapestry4/trunk/tapestry-framework/src/js/dojo/src/math/points.js
URL: http://svn.apache.org/viewvc/tapestry/tapestry4/trunk/tapestry-framework/src/js/dojo/src/math/points.js?view=auto&rev=451106
==============================================================================
--- tapestry/tapestry4/trunk/tapestry-framework/src/js/dojo/src/math/points.js (added)
+++ tapestry/tapestry4/trunk/tapestry-framework/src/js/dojo/src/math/points.js Thu Sep 28 20:42:39 2006
@@ -0,0 +1,54 @@
+/*
+ Copyright (c) 2004-2006, The Dojo Foundation
+ All Rights Reserved.
+
+ Licensed under the Academic Free License version 2.1 or above OR the
+ modified BSD license. For more information on Dojo licensing, see:
+
+ http://dojotoolkit.org/community/licensing.shtml
+*/
+
+dojo.provide("dojo.math.points");
+dojo.require("dojo.math");
+
+dojo.math.points = {
+ translate: function(/* array */a, /* array */b) {
+ // summary
+ // translate a by b, and return the result.
+ if( a.length != b.length ) {
+ dojo.raise("dojo.math.translate: points not same size (a:[" + a + "], b:[" + b + "])");
+ }
+ var c = new Array(a.length);
+ for(var i = 0; i < a.length; i++) {
+ c[i] = a[i] + b[i];
+ }
+ return c; // array
+ },
+
+ midpoint: function(/* array */a, /* array */b) {
+ // summary
+ // Find the point midway between a and b
+ if( a.length != b.length ) {
+ dojo.raise("dojo.math.midpoint: points not same size (a:[" + a + "], b:[" + b + "])");
+ }
+ var c = new Array(a.length);
+ for(var i = 0; i < a.length; i++) {
+ c[i] = (a[i] + b[i]) / 2;
+ }
+ return c; // array
+ },
+
+ invert: function(/* array */a) {
+ // summary
+ // invert the values in a and return it.
+ var b = new Array(a.length);
+ for(var i = 0; i < a.length; i++) { b[i] = -a[i]; }
+ return b; // array
+ },
+
+ distance: function(/* array */a, /* array */b) {
+ // summary
+ // Calculate the distance between point a and point b
+ return Math.sqrt(Math.pow(b[0]-a[0], 2) + Math.pow(b[1]-a[1], 2)); // float
+ }
+};
Propchange: tapestry/tapestry4/trunk/tapestry-framework/src/js/dojo/src/math/points.js
------------------------------------------------------------------------------
svn:eol-style = native
Added: tapestry/tapestry4/trunk/tapestry-framework/src/js/dojo/src/namespace.js
URL: http://svn.apache.org/viewvc/tapestry/tapestry4/trunk/tapestry-framework/src/js/dojo/src/namespace.js?view=auto&rev=451106
==============================================================================
--- tapestry/tapestry4/trunk/tapestry-framework/src/js/dojo/src/namespace.js (added)
+++ tapestry/tapestry4/trunk/tapestry-framework/src/js/dojo/src/namespace.js Thu Sep 28 20:42:39 2006
@@ -0,0 +1,168 @@
+/*
+ Copyright (c) 2004-2006, The Dojo Foundation
+ All Rights Reserved.
+
+ Licensed under the Academic Free License version 2.1 or above OR the
+ modified BSD license. For more information on Dojo licensing, see:
+
+ http://dojotoolkit.org/community/licensing.shtml
+*/
+
+dojo.provide("dojo.namespace");
+
+dojo["namespace"] = {
+ dojo: "dojo",
+ namespaces: {},
+ failed: {},
+ loading: {},
+ loaded: {},
+ register: function(name, module, resolver /*optional*/, noOverride) {
+ if((!noOverride)||(!this.namespaces[name])){
+ this.namespaces[name] = new dojo["namespace"].Namespace(name, module, resolver);
+ }
+ },
+ allow: function(name) {
+ // summary: Return false if 'name' is filtered by configuration or has failed to load, true otherwise
+ if(this.failed[name]){return false;} // if this namespace is known unloadable
+ // if the user has specified that this namespace be disallowed, return false.
+ var excl = djConfig.excludeNamespace;
+ if((excl)&&(dojo.lang.inArray(excl, name))){return false;}
+ // If the namespace is "dojo", or the user has not specified allowed namespaces return true.
+ // Otherwise, if the user has specifically allowed this namespace, return true, otherwise false.
+ var incl = djConfig.includeNamespace;
+ return((name==this.dojo)||(!incl)||(dojo.lang.inArray(incl, name)));
+ },
+ get: function(name){
+ // summary
+ // Return Namespace object registered to 'name', if any
+ return this.namespaces[name];
+ },
+ require: function(name){
+ // summary
+ // Try to ensure that 'name' is registered by loading a namespace manifest
+ var ns = this.namespaces[name];
+ if((ns)&&(this.loaded[name])){return ns;}
+ if(!this.allow(name)){return false;}
+ if(this.loading[name]){
+ // FIXME: do we really ever have re-entrancy situation? this would appear to be really bad
+ // original code did not throw an exception, although that seems the only course
+ // adding debug output here to track if this occurs.
+ dojo.debug('dojo.namespace.require: re-entrant request to load namespace "' + name + '" must fail.');
+ return false;
+ }
+ // workaround so we don't break the build system
+ var req = dojo.require;
+ this.loading[name] = true;
+ try {
+ //dojo namespace file is always in the Dojo namespace folder, not a custom namespace folder
+ if(name==this.dojo){
+ req("dojo.namespaces.dojo");
+ }else{
+ // if no registered module prefix, use ../<name> by convention
+ if(!dojo.hostenv.moduleHasPrefix(name)){
+ dojo.registerModulePath(name, "../" + name);
+ }
+ req([name, 'manifest'].join('.'), false, true);
+ }
+ if(!this.namespaces[name]){
+ this.failed[name] = true; //only look for a namespace once
+ }
+ }finally{
+ this.loading[name]=false;
+ }
+ return this.namespaces[name];
+ }
+}
+
+dojo.registerNamespace = function(/*String*/name, /*String*/module, /*Function?*/resolver){
+ // summary: maps a module name to a namespace for widgets, and optionally maps widget names to modules for auto-loading
+ // description: An unregistered namespace is mapped to an eponymous module.
+ // For example, namespace acme is mapped to module acme, and widgets are
+ // assumed to belong to acme.widget. If you want to use a different widget
+ // module, use dojo.registerNamespace.
+ dojo["namespace"].register.apply(dojo["namespace"], arguments);
+}
+
+dojo.registerNamespaceResolver = function(/*String*/name, /*Function*/resolver){
+ // summary: a resolver function maps widget names to modules, so the
+ // widget manager can auto-load needed widget implementations
+ // description: The resolver provides information to allow Dojo
+ // to load widget modules on demand. When a widget is created,
+ // a namespace resolver can tell Dojo what module to require
+ // to ensure that the widget implementation code is loaded.
+ //
+ // The input string in the name argument will always be lower-case.
+ //
+ // dojo.registerNamespaceResolver("acme",
+ // function(name){
+ // return "acme.widget."+dojo.string.capitalize(name);
+ // }
+ // );
+ var n = dojo["namespace"].namespaces[name];
+ if(n){
+ n.resolver = resolver;
+ }
+}
+
+dojo.registerNamespaceManifest = function(module, path, name, widgetModule, resolver /*optional*/){
+ dojo.registerModulePath(name, path);
+ dojo.registerNamespace(name, widgetModule, resolver);
+}
+
+dojo.defineNamespace = function(objRoot, location, nsPrefix, resolver /*optional*/, widgetPackage /*optional*/){
+ dojo.deprecated("dojo.defineNamespace", " is replaced by other systems. See the Dojo Wiki [http://dojo.jot.com/WikiHome/Modules & Namespaces].", "0.5");
+ dojo.registerNamespaceManifest(objRoot, location, nsPrefix, widgetPackage, resolver);
+}
+
+// namespace bookkeeping object
+
+dojo["namespace"].Namespace = function(name, module, resolver){
+ this.name = name;
+ this.module = module;
+ this.resolver = resolver;
+}
+
+dojo["namespace"].Namespace.prototype._loaded = {};
+dojo["namespace"].Namespace.prototype._failed = {};
+
+// map component with 'name' and 'domain' to a module via
+// namespace resolver, if specified
+dojo["namespace"].Namespace.prototype.resolve = function(name, domain, omit_module_check){
+ if(!this.resolver){return false;}
+ var fullName = this.resolver(name,domain);
+ //only load a widget once. This is a quicker check than dojo.require does
+ if((fullName)&&(!this._loaded[fullName])&&(!this._failed[fullName])){
+ //workaround so we don't break the build system
+ var req = dojo.require;
+ req(fullName, false, true); //omit the module check, we'll do it ourselves.
+ if(dojo.hostenv.findModule(fullName, false)){
+ this._loaded[fullName] = true;
+ }else{
+ if(!dj_undef(omit_module_check) & !omit_module_check){dojo.raise("dojo.namespace.Namespace.resolve: module '" + fullName + "' not found after loading via namespace '" + this.name + "'");}
+ this._failed[fullName] = true;
+ }
+ }
+ return Boolean(this._loaded[fullName]);
+}
+
+dojo["namespace"].Namespace.prototype.getModule = function(widgetName){
+ if (!this.module) {return null;}
+ if (!dojo.lang.isArray(this.module)){ return this.module; }
+ if (this.module.length <= 0) { return null; }
+ if (!this.resolver){return this.module[0];}
+
+ var fullName = this.resolver(widgetName);
+ if(!fullName){ return this.module[0]; }
+
+ var modpos=fullName.lastIndexOf(".");
+ if(modpos > -1){
+ return fullName.substr(0, modpos);
+ } else {
+ return this.module[0];
+ }
+
+ return null;
+}
+
+// NOTE: rather put this in dojo.widget.Widget, but that fubars debugAtAllCosts
+dojo.registerNamespace("dojo", ["dojo.widget","dojo.widget.validate"]);
\ No newline at end of file
Propchange: tapestry/tapestry4/trunk/tapestry-framework/src/js/dojo/src/namespace.js
------------------------------------------------------------------------------
svn:eol-style = native
Added: tapestry/tapestry4/trunk/tapestry-framework/src/js/dojo/src/namespaces/dojo.js
URL: http://svn.apache.org/viewvc/tapestry/tapestry4/trunk/tapestry-framework/src/js/dojo/src/namespaces/dojo.js?view=auto&rev=451106
==============================================================================
--- tapestry/tapestry4/trunk/tapestry-framework/src/js/dojo/src/namespaces/dojo.js (added)
+++ tapestry/tapestry4/trunk/tapestry-framework/src/js/dojo/src/namespaces/dojo.js Thu Sep 28 20:42:39 2006
@@ -0,0 +1,155 @@
+/*
+ Copyright (c) 2004-2006, The Dojo Foundation
+ All Rights Reserved.
+
+ Licensed under the Academic Free License version 2.1 or above OR the
+ modified BSD license. For more information on Dojo licensing, see:
+
+ http://dojotoolkit.org/community/licensing.shtml
+*/
+
+dojo.provide("dojo.namespaces.dojo");
+dojo.require("dojo.namespace");
+
+(function(){
+ //mapping of all widget short names to their full package names
+ // This is used for widget autoloading - no dojo.require() is necessary.
+ // If you use a widget in markup or create one dynamically, then this
+ // mapping is used to find and load any dependencies not already loaded.
+ // You should use your own namespace for any custom widgets.
+ // For extra widgets you use, dojo.declare() may be used to explicitly load them.
+ var map = {
+ html: {
+ "accordioncontainer": "dojo.widget.AccordionContainer",
+ "treerpccontroller": "dojo.widget.TreeRPCController",
+ "accordionpane": "dojo.widget.AccordionPane",
+ "button": "dojo.widget.Button",
+ "chart": "dojo.widget.Chart",
+ "checkbox": "dojo.widget.Checkbox",
+ "colorpalette": "dojo.widget.ColorPalette",
+ "combobox": "dojo.widget.ComboBox",
+ "combobutton": "dojo.widget.Button",
+ "contentpane": "dojo.widget.ContentPane",
+ "contextmenu": "dojo.widget.ContextMenu",
+ "currencytextbox": "dojo.widget.validate.CurrencyTextbox",
+ "datepicker": "dojo.widget.DatePicker",
+ "datetextbox": "dojo.widget.validate.DateTextbox",
+ "debugconsole": "dojo.widget.DebugConsole",
+ "dialog": "dojo.widget.Dialog",
+ "docpane": "dojo.widget.DocPane",
+ "dropdownbutton": "dojo.widget.Button",
+ "dropdowndatepicker": "dojo.widget.DropdownDatePicker",
+ "dropdowntimepicker": "dojo.widget.DropdownTimePicker",
+ "emaillisttextbox": "dojo.widget.validate.EmailListTextbox",
+ "emailtextbox": "dojo.widget.validate.EmailTextbox",
+ "editor2": "dojo.widget.Editor2",
+ "editor2toolbar": "dojo.widget.Editor2Toolbar",
+ "editor": "dojo.widget.Editor",
+ "editortree": "dojo.widget.EditorTree",
+ "editortreecontextmenu": "dojo.widget.EditorTreeContextMenu",
+ "editortreenode": "dojo.widget.EditorTreeNode",
+ "filteringtable": "dojo.widget.FilteringTable",
+ "fisheyelist": "dojo.widget.FisheyeList",
+ "editortreecontroller": "dojo.widget.EditorTreeController",
+ "googlemap": "dojo.widget.GoogleMap",
+ "editortreeselector": "dojo.widget.EditorTreeSelector",
+ "floatingpane": "dojo.widget.FloatingPane",
+ "formcontainer": "dojo.widget.FormContainer",
+ "hslcolorpicker": "dojo.widget.HslColorPicker",
+ "inlineeditbox": "dojo.widget.InlineEditBox",
+ "integertextbox": "dojo.widget.validate.IntegerTextbox",
+ "ipaddresstextbox": "dojo.widget.validate.IpAddressTextbox",
+ "layoutcontainer": "dojo.widget.LayoutContainer",
+ "linkpane": "dojo.widget.LinkPane",
+ "pagecontainer": "dojo.widget.PageContainer",
+ "pagecontroller": "dojo.widget.PageContainer",
+ "popupcontainer": "dojo.widget.Menu2",
+ "popupmenu2": "dojo.widget.Menu2",
+ "menuitem2": "dojo.widget.Menu2",
+ "menuseparator2": "dojo.widget.Menu2",
+ "menubar2": "dojo.widget.Menu2",
+ "menubaritem2": "dojo.widget.Menu2",
+ "monthlyCalendar": "dojo.widget.MonthlyCalendar",
+ "radiogroup": "dojo.widget.RadioGroup",
+ "realnumbertextbox": "dojo.widget.validate.RealNumberTextbox",
+ "regexptextbox": "dojo.widget.validate.RegexpTextbox",
+ "repeatercontainer": "dojo.widget.RepeaterContainer",
+ "richtext": "dojo.widget.RichText",
+ "remotetabcontroller": "dojo.widget.RemoteTabController",
+ "resizehandle": "dojo.widget.ResizeHandle",
+ "resizabletextarea": "dojo.widget.ResizableTextarea",
+ "select": "dojo.widget.Select",
+ "slideshow": "dojo.widget.SlideShow",
+ "sortabletable": "dojo.widget.SortableTable",
+ "splitcontainer": "dojo.widget.SplitContainer",
+ "svgbutton": "dojo.widget.SvgButton",
+ "tabcontainer": "dojo.widget.TabContainer",
+ "tabcontroller": "dojo.widget.TabContainer",
+ "taskbar": "dojo.widget.TaskBar",
+ "textbox": "dojo.widget.validate.Textbox",
+ "timepicker": "dojo.widget.TimePicker",
+ "timetextbox": "dojo.widget.validate.TimeTextbox",
+ "titlepane": "dojo.widget.TitlePane",
+ "toaster": "dojo.widget.Toaster",
+ "toggler": "dojo.widget.Toggler",
+ "toolbar": "dojo.widget.Toolbar",
+ "tooltip": "dojo.widget.Tooltip",
+ "tree": "dojo.widget.Tree",
+ "treebasiccontroller": "dojo.widget.TreeBasicController",
+ "treecontextmenu": "dojo.widget.TreeContextMenu",
+ "treeselector": "dojo.widget.TreeSelector",
+ "treecontrollerextension": "dojo.widget.TreeControllerExtension",
+ "treenode": "dojo.widget.TreeNode",
+
+ "treebasiccontrollerv3": "dojo.widget.TreeBasicControllerV3",
+ "treecontextmenuv3": "dojo.widget.TreeContextMenuV3",
+ "treedeselectondblselect": "dojo.widget.TreeDeselectOnDblselect",
+ "treedisablewrapextension": "dojo.widget.TreeDisableWrapExtension",
+ "treedndcontrollerv3": "dojo.widget.TreeDndControllerV3",
+ "treedociconextension": "dojo.widget.TreeDocIconExtension",
+ "treeeditor": "dojo.widget.TreeEditor",
+ "treeemphaseonselect": "dojo.widget.TreeEmphaseOnSelect",
+ "treelinkextension": "dojo.widget.TreeLinkExtension",
+ "treeloadingcontrollerv3": "dojo.widget.TreeLoadingControllerV3",
+ "treemenuitemv3": "dojo.widget.TreeMenuItemV3",
+ "treerpccontrollerv3": "dojo.widget.TreeRpcControllerV3",
+ "treeselectorv3": "dojo.widget.TreeSelectorV3",
+ "treev3": "dojo.widget.TreeV3",
+
+ "urltextbox": "dojo.widget.validate.UrlTextbox",
+ "usphonenumbertextbox": "dojo.widget.validate.UsPhoneNumberTextbox",
+ "ussocialsecuritynumbertextbox": "dojo.widget.validate.UsSocialSecurityNumberTextbox",
+ "usstatetextbox": "dojo.widget.validate.UsStateTextbox",
+ "usziptextbox": "dojo.widget.validate.UsZipTextbox",
+ "validationtextbox": "dojo.widget.validate.ValidationTextbox",
+ "treeloadingcontroller": "dojo.widget.TreeLoadingController",
+ "widget": "dojo.widget.Widget",
+ "wizard": "dojo.widget.Wizard",
+ "yahoomap": "dojo.widget.YahooMap"
+ },
+ svg: {
+ "chart": "dojo.widget.svg.Chart",
+ "hslcolorpicker": "dojo.widget.svg.HslColorPicker"
+ },
+ vml: {
+ "chart": "dojo.widget.vml.Chart"
+ }
+ };
+
+ dojo.addDojoNamespaceMapping = function(/*String*/shortName, /*String*/packageName){
+ // summary:
+ // Add an entry to the mapping table for the dojo: namespace
+ //
+ // shortName: the name to be used as the widget's tag name in the dojo: namespace
+ // packageName: the path to the Javascript module in dotted package notation
+ map[shortName]=packageName;
+ };
+
+ function dojoNamespaceResolver(name, domain){
+ if(!domain){ domain="html"; }
+ if(!map[domain]){ return null; }
+ return map[domain][name];
+ }
+
+ dojo.registerNamespaceResolver("dojo", dojoNamespaceResolver);
+})();
Propchange: tapestry/tapestry4/trunk/tapestry-framework/src/js/dojo/src/namespaces/dojo.js
------------------------------------------------------------------------------
svn:eol-style = native
Added: tapestry/tapestry4/trunk/tapestry-framework/src/js/dojo/src/profile.js
URL: http://svn.apache.org/viewvc/tapestry/tapestry4/trunk/tapestry-framework/src/js/dojo/src/profile.js?view=auto&rev=451106
==============================================================================
--- tapestry/tapestry4/trunk/tapestry-framework/src/js/dojo/src/profile.js (added)
+++ tapestry/tapestry4/trunk/tapestry-framework/src/js/dojo/src/profile.js Thu Sep 28 20:42:39 2006
@@ -0,0 +1,120 @@
+/*
+ Copyright (c) 2004-2006, The Dojo Foundation
+ All Rights Reserved.
+
+ Licensed under the Academic Free License version 2.1 or above OR the
+ modified BSD license. For more information on Dojo licensing, see:
+
+ http://dojotoolkit.org/community/licensing.shtml
+*/
+
+dojo.provide("dojo.profile");
+
+
+
+
+dojo.profile = new function(){
+ var profiles = {};
+ var pns = [];
+
+ this.start = function(name){
+ if(!profiles[name]){
+ profiles[name] = {iters: 0, total: 0};
+ pns[pns.length] = name;
+ }else{
+ if(profiles[name]["start"]){
+ this.end(name);
+ }
+ }
+ profiles[name].end = null;
+ profiles[name].start = new Date();
+ }
+
+ this.end = function(name){
+ var ed = new Date();
+ if((profiles[name])&&(profiles[name]["start"])){
+ with(profiles[name]){
+ end = ed;
+ total += (end - start);
+ start = null;
+ iters++;
+ }
+ }else{
+ // oops! bad call to end(), what should we do here?
+ return true;
+ }
+ }
+
+ this.stop = this.end;
+
+ this.dump = function(appendToDoc){
+ var tbl = document.createElement("table");
+ with(tbl.style){
+ border = "1px solid black";
+ borderCollapse = "collapse";
+ }
+ var hdr = tbl.createTHead();
+ var hdrtr = hdr.insertRow(0);
+ // document.createElement("tr");
+ var cols = ["Identifier","Calls","Total","Avg"];
+ for(var x=0; x<cols.length; x++){
+ var ntd = hdrtr.insertCell(x);
+ with(ntd.style){
+ backgroundColor = "#225d94";
+ color = "white";
+ borderBottom = "1px solid black";
+ borderRight = "1px solid black";
+ fontFamily = "tahoma";
+ fontWeight = "bolder";
+ paddingLeft = paddingRight = "5px";
+ }
+ ntd.appendChild(document.createTextNode(cols[x]));
+ }
+
+ for(var x=0; x < pns.length; x++){
+ var prf = profiles[pns[x]];
+ this.end(pns[x]);
+ if(prf.iters>0){
+ var bdytr = tbl.insertRow(true);
+ var vals = [pns[x], prf.iters, prf.total, parseInt(prf.total/prf.iters)];
+ for(var y=0; y<vals.length; y++){
+ var cc = bdytr.insertCell(y);
+ cc.appendChild(document.createTextNode(vals[y]));
+ with(cc.style){
+ borderBottom = "1px solid gray";
+ paddingLeft = paddingRight = "5px";
+ if(x%2){
+ backgroundColor = "#e1f1ff";
+ }
+ if(y>0){
+ textAlign = "right";
+ borderRight = "1px solid gray";
+ }else{
+ borderRight = "1px solid black";
+ }
+ }
+ }
+ }
+ }
+
+ if(appendToDoc){
+ var ne = document.createElement("div");
+ ne.id = "profileOutputTable";
+ with(ne.style){
+ fontFamily = "Courier New, monospace";
+ fontSize = "12px";
+ lineHeight = "16px";
+ borderTop = "1px solid black";
+ padding = "10px";
+ }
+ if(document.getElementById("profileOutputTable")){
+ dojo.body().replaceChild(ne, document.getElementById("profileOutputTable"));
+ }else{
+ dojo.body().appendChild(ne);
+ }
+ ne.appendChild(tbl);
+ }
+
+ return tbl;
+ }
+}
Propchange: tapestry/tapestry4/trunk/tapestry-framework/src/js/dojo/src/profile.js
------------------------------------------------------------------------------
svn:eol-style = native
Added: tapestry/tapestry4/trunk/tapestry-framework/src/js/dojo/src/regexp.js
URL: http://svn.apache.org/viewvc/tapestry/tapestry4/trunk/tapestry-framework/src/js/dojo/src/regexp.js?view=auto&rev=451106
==============================================================================
--- tapestry/tapestry4/trunk/tapestry-framework/src/js/dojo/src/regexp.js (added)
+++ tapestry/tapestry4/trunk/tapestry-framework/src/js/dojo/src/regexp.js Thu Sep 28 20:42:39 2006
@@ -0,0 +1,573 @@
+/*
+ Copyright (c) 2004-2006, The Dojo Foundation
+ All Rights Reserved.
+
+ Licensed under the Academic Free License version 2.1 or above OR the
+ modified BSD license. For more information on Dojo licensing, see:
+
+ http://dojotoolkit.org/community/licensing.shtml
+*/
+
+dojo.provide("dojo.regexp");
+dojo.provide("dojo.regexp.us");
+
+// *** Regular Expression Generators ***
+
+dojo.regexp.tld = function(/*Object?*/flags){
+ // summary: Builds a RE that matches a top-level domain
+ //
+ // flags:
+ // flags.allowCC Include 2 letter country code domains. Default is true.
+ // flags.allowGeneric Include the generic domains. Default is true.
+ // flags.allowInfra Include infrastructure domains. Default is true.
+
+ // assign default values to missing paramters
+ flags = (typeof flags == "object") ? flags : {};
+ if(typeof flags.allowCC != "boolean"){ flags.allowCC = true; }
+ if(typeof flags.allowInfra != "boolean"){ flags.allowInfra = true; }
+ if(typeof flags.allowGeneric != "boolean"){ flags.allowGeneric = true; }
+
+ // Infrastructure top-level domain - only one at present
+ var infraRE = "arpa";
+
+ // Generic top-level domains RE.
+ var genericRE =
+ "aero|biz|com|coop|edu|gov|info|int|mil|museum|name|net|org|pro|travel|xxx|jobs|mobi|post";
+
+ // Country Code top-level domains RE
+ var ccRE =
+ "ac|ad|ae|af|ag|ai|al|am|an|ao|aq|ar|as|at|au|aw|az|ba|bb|bd|be|bf|bg|bh|bi|bj|bm|bn|bo|br|" +
+ "bs|bt|bv|bw|by|bz|ca|cc|cd|cf|cg|ch|ci|ck|cl|cm|cn|co|cr|cu|cv|cx|cy|cz|de|dj|dk|dm|do|dz|" +
+ "ec|ee|eg|er|es|et|fi|fj|fk|fm|fo|fr|ga|gd|ge|gf|gg|gh|gi|gl|gm|gn|gp|gq|gr|gs|gt|gu|gw|gy|" +
+ "hk|hm|hn|hr|ht|hu|id|ie|il|im|in|io|ir|is|it|je|jm|jo|jp|ke|kg|kh|ki|km|kn|kr|kw|ky|kz|la|" +
+ "lb|lc|li|lk|lr|ls|lt|lu|lv|ly|ma|mc|md|mg|mh|mk|ml|mm|mn|mo|mp|mq|mr|ms|mt|mu|mv|mw|mx|my|" +
+ "mz|na|nc|ne|nf|ng|ni|nl|no|np|nr|nu|nz|om|pa|pe|pf|pg|ph|pk|pl|pm|pn|pr|ps|pt|pw|py|qa|re|" +
+ "ro|ru|rw|sa|sb|sc|sd|se|sg|sh|si|sk|sl|sm|sn|sr|st|su|sv|sy|sz|tc|td|tf|tg|th|tj|tk|tm|tn|" +
+ "to|tr|tt|tv|tw|tz|ua|ug|uk|us|uy|uz|va|vc|ve|vg|vi|vn|vu|wf|ws|ye|yt|yu|za|zm|zw";
+
+ // Build top-level domain RE
+ var a = [];
+ if(flags.allowInfra){ a.push(infraRE); }
+ if(flags.allowGeneric){ a.push(genericRE); }
+ if(flags.allowCC){ a.push(ccRE); }
+
+ var tldRE = "";
+ if (a.length > 0) {
+ tldRE = "(" + a.join("|") + ")";
+ }
+
+ return tldRE; // String
+}
+
+dojo.regexp.ipAddress = function(/*Object?*/flags){
+ // summary: Builds a RE that matches an IP Address
+ //
+ // description:
+ // Supports 5 formats for IPv4: dotted decimal, dotted hex, dotted octal, decimal and hexadecimal.
+ // Supports 2 formats for Ipv6.
+ //
+ // flags An object. All flags are boolean with default = true.
+ // flags.allowDottedDecimal Example, 207.142.131.235. No zero padding.
+ // flags.allowDottedHex Example, 0x18.0x11.0x9b.0x28. Case insensitive. Zero padding allowed.
+ // flags.allowDottedOctal Example, 0030.0021.0233.0050. Zero padding allowed.
+ // flags.allowDecimal Example, 3482223595. A decimal number between 0-4294967295.
+ // flags.allowHex Example, 0xCF8E83EB. Hexadecimal number between 0x0-0xFFFFFFFF.
+ // Case insensitive. Zero padding allowed.
+ // flags.allowIPv6 IPv6 address written as eight groups of four hexadecimal digits.
+ // flags.allowHybrid IPv6 address written as six groups of four hexadecimal digits
+ // followed by the usual 4 dotted decimal digit notation of IPv4. x:x:x:x:x:x:d.d.d.d
+
+ // assign default values to missing paramters
+ flags = (typeof flags == "object") ? flags : {};
+ if(typeof flags.allowDottedDecimal != "boolean"){ flags.allowDottedDecimal = true; }
+ if(typeof flags.allowDottedHex != "boolean"){ flags.allowDottedHex = true; }
+ if(typeof flags.allowDottedOctal != "boolean"){ flags.allowDottedOctal = true; }
+ if(typeof flags.allowDecimal != "boolean"){ flags.allowDecimal = true; }
+ if(typeof flags.allowHex != "boolean"){ flags.allowHex = true; }
+ if(typeof flags.allowIPv6 != "boolean"){ flags.allowIPv6 = true; }
+ if(typeof flags.allowHybrid != "boolean"){ flags.allowHybrid = true; }
+
+ // decimal-dotted IP address RE.
+ var dottedDecimalRE =
+ // Each number is between 0-255. Zero padding is not allowed.
+ "((\\d|[1-9]\\d|1\\d\\d|2[0-4]\\d|25[0-5])\\.){3}(\\d|[1-9]\\d|1\\d\\d|2[0-4]\\d|25[0-5])";
+
+ // dotted hex IP address RE. Each number is between 0x0-0xff. Zero padding is allowed, e.g. 0x00.
+ var dottedHexRE = "(0[xX]0*[\\da-fA-F]?[\\da-fA-F]\\.){3}0[xX]0*[\\da-fA-F]?[\\da-fA-F]";
+
+ // dotted octal IP address RE. Each number is between 0000-0377.
+ // Zero padding is allowed, but each number must have at least 4 characters.
+ var dottedOctalRE = "(0+[0-3][0-7][0-7]\\.){3}0+[0-3][0-7][0-7]";
+
+ // decimal IP address RE. A decimal number between 0-4294967295.
+ var decimalRE = "(0|[1-9]\\d{0,8}|[1-3]\\d{9}|4[01]\\d{8}|42[0-8]\\d{7}|429[0-3]\\d{6}|" +
+ "4294[0-8]\\d{5}|42949[0-5]\\d{4}|429496[0-6]\\d{3}|4294967[01]\\d{2}|42949672[0-8]\\d|429496729[0-5])";
+
+ // hexadecimal IP address RE.
+ // A hexadecimal number between 0x0-0xFFFFFFFF. Case insensitive. Zero padding is allowed.
+ var hexRE = "0[xX]0*[\\da-fA-F]{1,8}";
+
+ // IPv6 address RE.
+ // The format is written as eight groups of four hexadecimal digits, x:x:x:x:x:x:x:x,
+ // where x is between 0000-ffff. Zero padding is optional. Case insensitive.
+ var ipv6RE = "([\\da-fA-F]{1,4}\\:){7}[\\da-fA-F]{1,4}";
+
+ // IPv6/IPv4 Hybrid address RE.
+ // The format is written as six groups of four hexadecimal digits,
+ // followed by the 4 dotted decimal IPv4 format. x:x:x:x:x:x:d.d.d.d
+ var hybridRE = "([\\da-fA-F]{1,4}\\:){6}" +
+ "((\\d|[1-9]\\d|1\\d\\d|2[0-4]\\d|25[0-5])\\.){3}(\\d|[1-9]\\d|1\\d\\d|2[0-4]\\d|25[0-5])";
+
+ // Build IP Address RE
+ var a = [];
+ if(flags.allowDottedDecimal){ a.push(dottedDecimalRE); }
+ if(flags.allowDottedHex){ a.push(dottedHexRE); }
+ if(flags.allowDottedOctal){ a.push(dottedOctalRE); }
+ if(flags.allowDecimal){ a.push(decimalRE); }
+ if(flags.allowHex){ a.push(hexRE); }
+ if(flags.allowIPv6){ a.push(ipv6RE); }
+ if(flags.allowHybrid){ a.push(hybridRE); }
+
+ var ipAddressRE = "";
+ if(a.length > 0){
+ ipAddressRE = "(" + a.join("|") + ")";
+ }
+
+ return ipAddressRE; // String
+}
+
+dojo.regexp.host = function(/*Object?*/flags){
+ // summary: Builds a RE that matches a host
+ // description: A host is a domain name or an IP address, possibly followed by a port number.
+ // flags: An object.
+ // flags.allowIP Allow an IP address for hostname. Default is true.
+ // flags.allowLocal Allow the host to be "localhost". Default is false.
+ // flags.allowPort Allow a port number to be present. Default is true.
+ // flags in regexp.ipAddress can be applied.
+ // flags in regexp.tld can be applied.
+
+ // assign default values to missing paramters
+ flags = (typeof flags == "object") ? flags : {};
+ if(typeof flags.allowIP != "boolean"){ flags.allowIP = true; }
+ if(typeof flags.allowLocal != "boolean"){ flags.allowLocal = false; }
+ if(typeof flags.allowPort != "boolean"){ flags.allowPort = true; }
+
+ // Domain names can not end with a dash.
+ var domainNameRE = "([0-9a-zA-Z]([-0-9a-zA-Z]{0,61}[0-9a-zA-Z])?\\.)+" + dojo.regexp.tld(flags);
+
+ // port number RE
+ var portRE = ( flags.allowPort ) ? "(\\:" + dojo.regexp.integer({signed: false}) + ")?" : "";
+
+ // build host RE
+ var hostNameRE = domainNameRE;
+ if(flags.allowIP){ hostNameRE += "|" + dojo.regexp.ipAddress(flags); }
+ if(flags.allowLocal){ hostNameRE += "|localhost"; }
+
+ return "(" + hostNameRE + ")" + portRE; // String
+}
+
+dojo.regexp.url = function(/*Object?*/flags){
+ // summary: Builds a regular expression that matches a URL
+ //
+ // flags: An object
+ // flags.scheme Can be true, false, or [true, false].
+ // This means: required, not allowed, or match either one.
+ // flags in regexp.host can be applied.
+ // flags in regexp.ipAddress can be applied.
+ // flags in regexp.tld can be applied.
+
+ // assign default values to missing paramters
+ flags = (typeof flags == "object") ? flags : {};
+ if(typeof flags.scheme == "undefined"){ flags.scheme = [true, false]; }
+
+ // Scheme RE
+ var protocolRE = dojo.regexp.buildGroupRE(flags.scheme,
+ function(q){ if(q){ return "(https?|ftps?)\\://"; } return ""; }
+ );
+
+ // Path and query and anchor RE
+ var pathRE = "(/([^?#\\s/]+/)*)?([^?#\\s/]+(\\?[^?#\\s/]*)?(#[A-Za-z][\\w.:-]*)?)?";
+
+ return protocolRE + dojo.regexp.host(flags) + pathRE;
+}
+
+
+dojo.regexp.emailAddress = function(/*Object?*/flags){
+ // summary: Builds a regular expression that matches an email address
+ //
+ //flags: An object
+ // flags.allowCruft Allow address like <ma...@yahoo.com>. Default is false.
+ // flags in regexp.host can be applied.
+ // flags in regexp.ipAddress can be applied.
+ // flags in regexp.tld can be applied.
+
+ // assign default values to missing paramters
+ flags = (typeof flags == "object") ? flags : {};
+ if (typeof flags.allowCruft != "boolean") { flags.allowCruft = false; }
+ flags.allowPort = false; // invalid in email addresses
+
+ // user name RE - apostrophes are valid if there's not 2 in a row
+ var usernameRE = "([\\da-z]+[-._+&'])*[\\da-z]+";
+
+ // build emailAddress RE
+ var emailAddressRE = usernameRE + "@" + dojo.regexp.host(flags);
+
+ // Allow email addresses with cruft
+ if ( flags.allowCruft ) {
+ emailAddressRE = "<?(mailto\\:)?" + emailAddressRE + ">?";
+ }
+
+ return emailAddressRE; // String
+}
+
+dojo.regexp.emailAddressList = function(/*Object?*/flags){
+ // summary: Builds a regular expression that matches a list of email addresses.
+ //
+ // flags: An object.
+ // flags.listSeparator The character used to separate email addresses. Default is ";", ",", "\n" or " ".
+ // flags in regexp.emailAddress can be applied.
+ // flags in regexp.host can be applied.
+ // flags in regexp.ipAddress can be applied.
+ // flags in regexp.tld can be applied.
+
+ // assign default values to missing paramters
+ flags = (typeof flags == "object") ? flags : {};
+ if(typeof flags.listSeparator != "string"){ flags.listSeparator = "\\s;,"; }
+
+ // build a RE for an Email Address List
+ var emailAddressRE = dojo.regexp.emailAddress(flags);
+ var emailAddressListRE = "(" + emailAddressRE + "\\s*[" + flags.listSeparator + "]\\s*)*" +
+ emailAddressRE + "\\s*[" + flags.listSeparator + "]?\\s*";
+
+ return emailAddressListRE; // String
+}
+
+dojo.regexp.integer = function(/*Object?*/flags){
+ // summary: Builds a regular expression that matches an integer
+ //
+ // flags: An object
+ // flags.signed The leading plus-or-minus sign. Can be true, false, or [true, false].
+ // Default is [true, false], (i.e. will match if it is signed or unsigned).
+ // flags.separator The character used as the thousands separator. Default is no separator.
+ // For more than one symbol use an array, e.g. [",", ""], makes ',' optional.
+ // flags.groupSize group size between separators
+ // flags.groupSize2 second grouping (for India)
+
+ // assign default values to missing paramters
+ flags = (typeof flags == "object") ? flags : {};
+ if(typeof flags.signed == "undefined"){ flags.signed = [true, false]; }
+ if(typeof flags.separator == "undefined"){
+ flags.separator = "";
+ } else if(typeof flags.groupSize == "undefined"){
+ flags.groupSize = 3;
+ }
+ // build sign RE
+ var signRE = dojo.regexp.buildGroupRE(flags.signed,
+ function(q) { return q ? "[-+]" : ""; }
+ );
+
+ // number RE
+ var numberRE = dojo.regexp.buildGroupRE(flags.separator,
+ function(sep){
+ if(sep == ""){
+ return "(0|[1-9]\\d*)";
+ }
+ var grp = flags.groupSize, grp2 = flags.groupSize2;
+ if(typeof grp2 != "undefined"){
+ var grp2RE = "(0|[1-9]\\d{0," + (grp2-1) + "}([" + sep + "]\\d{" + grp2 + "})*[" + sep + "]\\d{" + grp + "})";
+ return ((grp-grp2) > 0) ? "(" + grp2RE + "|(0|[1-9]\\d{0," + (grp-1) + "}))" : grp2RE;
+ }
+ return "(0|[1-9]\\d{0," + (grp-1) + "}([" + sep + "]\\d{" + grp + "})*)";
+ }
+ );
+
+ // integer RE
+ return signRE + numberRE; // String
+}
+
+dojo.regexp.realNumber = function(/*Object?*/flags){
+ // summary: Builds a regular expression to match a real number in exponential notation
+ //
+ // flags:An object
+ // flags.places The integer number of decimal places.
+ // If not given, the decimal part is optional and the number of places is unlimited.
+ // flags.decimal A string for the character used as the decimal point. Default is ".".
+ // flags.fractional Whether decimal places are allowed.
+ // Can be true, false, or [true, false]. Default is [true, false]
+ // flags.exponent Express in exponential notation. Can be true, false, or [true, false].
+ // Default is [true, false], (i.e. will match if the exponential part is present are not).
+ // flags.eSigned The leading plus-or-minus sign on the exponent. Can be true, false,
+ // or [true, false]. Default is [true, false], (i.e. will match if it is signed or unsigned).
+ // flags in regexp.integer can be applied.
+
+ // assign default values to missing paramters
+ flags = (typeof flags == "object") ? flags : {};
+ if(typeof flags.places != "number"){ flags.places = Infinity; }
+ if(typeof flags.decimal != "string"){ flags.decimal = "."; }
+ if(typeof flags.fractional == "undefined"){ flags.fractional = [true, false]; }
+ if(typeof flags.exponent == "undefined"){ flags.exponent = [true, false]; }
+ if(typeof flags.eSigned == "undefined"){ flags.eSigned = [true, false]; }
+
+ // integer RE
+ var integerRE = dojo.regexp.integer(flags);
+
+ // decimal RE
+ var decimalRE = dojo.regexp.buildGroupRE(flags.fractional,
+ function(q){
+ var re = "";
+ if(q && (flags.places > 0)){
+ re = "\\" + flags.decimal;
+ if(flags.places == Infinity){
+ re = "(" + re + "\\d+)?";
+ }else{
+ re = re + "\\d{" + flags.places + "}";
+ }
+ }
+
+ return re;
+ }
+ );
+
+ // exponent RE
+ var exponentRE = dojo.regexp.buildGroupRE(flags.exponent,
+ function(q){
+ if(q){ return "([eE]" + dojo.regexp.integer({ signed: flags.eSigned}) + ")"; }
+ return "";
+ }
+ );
+
+ // real number RE
+ return integerRE + decimalRE + exponentRE; // String
+}
+
+dojo.regexp.currency = function(/*Object?*/flags){
+ // summary: Builds a regular expression to match a monetary value
+ //
+ // flags: An object
+ // flags.symbol A currency symbol such as Yen "�", Pound "�", or the Euro sign "�".
+ // Default is "$". For more than one symbol use an array, e.g. ["$", ""], makes $ optional.
+ // flags.placement The symbol can come "before" the number or "after" the number. Default is "before".
+ // flags.signPlacement The sign can come "before" the number or "after" the sign,
+ // "around" to put parentheses around negative values, or "end" for the final char. Default is "before".
+ // flags.cents deprecated, in favor of flags.fractional
+ // flags in regexp.realNumber can be applied except exponent, eSigned.
+
+ // assign default values to missing paramters
+ flags = (typeof flags == "object") ? flags : {};
+ if(typeof flags.signed == "undefined"){ flags.signed = [true, false]; }
+ if(typeof flags.symbol == "undefined"){ flags.symbol = "$"; }
+ if(typeof flags.placement != "string"){ flags.placement = "before"; }
+ if(typeof flags.signPlacement != "string"){ flags.signPlacement = "before"; }
+ if(typeof flags.separator == "undefined"){ flags.separator = ","; }
+ if(typeof flags.fractional == "undefined" && typeof flags.cents != "undefined"){
+ dojo.deprecated("dojo.regexp.currency: flags.cents", "use flags.fractional instead", "0.5");
+ flags.fractional = flags.cents;
+ }
+ if(typeof flags.decimal != "string"){ flags.decimal = "."; }
+
+ // build sign RE
+ var signRE = dojo.regexp.buildGroupRE(flags.signed,
+ function(q){ if (q){ return "[-+]"; } return ""; }
+ );
+
+ // build symbol RE
+ var symbolRE = dojo.regexp.buildGroupRE(flags.symbol,
+ function(symbol){
+ // escape all special characters
+ return "\\s?" + symbol.replace( /([.$?*!=:|\\\/^])/g, "\\$1") + "\\s?";
+ }
+ );
+
+ switch (flags.signPlacement){
+ case "before":
+ symbolRE = signRE + symbolRE;
+ break;
+ case "after":
+ symbolRE = symbolRE + signRE;
+ break;
+ }
+
+ // number RE
+ var flagsCopy = flags; //TODO: copy by value?
+ flagsCopy.signed = false; flagsCopy.exponent = false;
+ var numberRE = dojo.regexp.realNumber(flagsCopy);
+
+ // build currency RE
+ var currencyRE;
+ switch (flags.placement){
+ case "before":
+ currencyRE = symbolRE + numberRE;
+ break;
+ case "after":
+ currencyRE = numberRE + symbolRE;
+ break;
+ }
+
+ switch (flags.signPlacement){
+ case "around":
+ currencyRE = "(" + currencyRE + "|" + "\\(" + currencyRE + "\\)" + ")";
+ break;
+ case "begin":
+ currencyRE = signRE + currencyRE;
+ break;
+ case "end":
+ currencyRE = currencyRE + signRE;
+ break;
+ }
+ return currencyRE; // String
+}
+
+dojo.regexp.us.state = function(/*Object?*/flags){
+ // summary: A regular expression to match US state and territory abbreviations
+ //
+ // flags An object.
+ // flags.allowTerritories Allow Guam, Puerto Rico, etc. Default is true.
+ // flags.allowMilitary Allow military 'states', e.g. Armed Forces Europe (AE). Default is true.
+
+ // assign default values to missing paramters
+ flags = (typeof flags == "object") ? flags : {};
+ if(typeof flags.allowTerritories != "boolean"){ flags.allowTerritories = true; }
+ if(typeof flags.allowMilitary != "boolean"){ flags.allowMilitary = true; }
+
+ // state RE
+ var statesRE =
+ "AL|AK|AZ|AR|CA|CO|CT|DE|DC|FL|GA|HI|ID|IL|IN|IA|KS|KY|LA|ME|MD|MA|MI|MN|MS|MO|MT|" +
+ "NE|NV|NH|NJ|NM|NY|NC|ND|OH|OK|OR|PA|RI|SC|SD|TN|TX|UT|VT|VA|WA|WV|WI|WY";
+
+ // territories RE
+ var territoriesRE = "AS|FM|GU|MH|MP|PW|PR|VI";
+
+ // military states RE
+ var militaryRE = "AA|AE|AP";
+
+ // Build states and territories RE
+ if(flags.allowTerritories){ statesRE += "|" + territoriesRE; }
+ if(flags.allowMilitary){ statesRE += "|" + militaryRE; }
+
+ return "(" + statesRE + ")"; // String
+}
+
+dojo.regexp.time = function(/*Object?*/flags){
+ // summary: Builds a regular expression to match any International format for time
+ // description: The RE can match one format or one of multiple formats.
+ //
+ // Format
+ // h 12 hour, no zero padding.
+ // hh 12 hour, has leading zero.
+ // H 24 hour, no zero padding.
+ // HH 24 hour, has leading zero.
+ // m minutes, no zero padding.
+ // mm minutes, has leading zero.
+ // s seconds, no zero padding.
+ // ss seconds, has leading zero.
+ // t am or pm, case insensitive.
+ // All other characters must appear literally in the expression.
+ //
+ // Example
+ // "h:m:s t" -> 2:5:33 PM
+ // "HH:mm:ss" -> 14:05:33
+ //
+ // flags: An object
+ // flags.format A string or an array of strings. Default is "h:mm:ss t".
+ // flags.amSymbol The symbol used for AM. Default is "AM".
+ // flags.pmSymbol The symbol used for PM. Default is "PM".
+
+ // assign default values to missing paramters
+ flags = (typeof flags == "object") ? flags : {};
+ if(typeof flags.format == "undefined"){ flags.format = "h:mm:ss t"; }
+ if(typeof flags.amSymbol != "string"){ flags.amSymbol = "AM"; }
+ if(typeof flags.pmSymbol != "string"){ flags.pmSymbol = "PM"; }
+
+ // Converts a time format to a RE
+ var timeRE = function(format){
+ // escape all special characters
+ format = format.replace( /([.$?*!=:|{}\(\)\[\]\\\/^])/g, "\\$1");
+ var amRE = flags.amSymbol.replace( /([.$?*!=:|{}\(\)\[\]\\\/^])/g, "\\$1");
+ var pmRE = flags.pmSymbol.replace( /([.$?*!=:|{}\(\)\[\]\\\/^])/g, "\\$1");
+
+ // replace tokens with Regular Expressions
+ format = format.replace("hh", "(0[1-9]|1[0-2])");
+ format = format.replace("h", "([1-9]|1[0-2])");
+ format = format.replace("HH", "([01][0-9]|2[0-3])");
+ format = format.replace("H", "([0-9]|1[0-9]|2[0-3])");
+ format = format.replace("mm", "([0-5][0-9])");
+ format = format.replace("m", "([1-5][0-9]|[0-9])");
+ format = format.replace("ss", "([0-5][0-9])");
+ format = format.replace("s", "([1-5][0-9]|[0-9])");
+ format = format.replace("t", "\\s?(" + amRE + "|" + pmRE + ")\\s?" );
+
+ return format; // String
+ };
+
+ // build RE for multiple time formats
+ return dojo.regexp.buildGroupRE(flags.format, timeRE); // String
+}
+
+dojo.regexp.numberFormat = function(/*Object?*/flags){
+ // summary: Builds a regular expression to match any sort of number based format
+ // description:
+ // Use this method for phone numbers, social security numbers, zip-codes, etc.
+ // The RE can match one format or one of multiple formats.
+ //
+ // Format
+ // # Stands for a digit, 0-9.
+ // ? Stands for an optional digit, 0-9 or nothing.
+ // All other characters must appear literally in the expression.
+ //
+ // Example
+ // "(###) ###-####" -> (510) 542-9742
+ // "(###) ###-#### x#???" -> (510) 542-9742 x153
+ // "###-##-####" -> 506-82-1089 i.e. social security number
+ // "#####-####" -> 98225-1649 i.e. zip code
+ //
+ // flags: An object
+ // flags.format A string or an Array of strings for multiple formats.
+
+ // assign default values to missing paramters
+ flags = (typeof flags == "object") ? flags : {};
+ if(typeof flags.format == "undefined"){ flags.format = "###-###-####"; }
+
+ // Converts a number format to RE.
+ var digitRE = function(format){
+ // escape all special characters, except '?'
+ format = format.replace( /([.$*!=:|{}\(\)\[\]\\\/^])/g, "\\$1");
+
+ // Now replace '?' with Regular Expression
+ format = format.replace(/\?/g, "\\d?");
+
+ // replace # with Regular Expression
+ format = format.replace(/#/g, "\\d");
+
+ return format; // String
+ };
+
+ // build RE for multiple number formats
+ return dojo.regexp.buildGroupRE(flags.format, digitRE); //String
+}
+
+
+dojo.regexp.buildGroupRE = function(/*value or Array of values*/a, /*Function(x) returns a regular expression as a String*/re){
+ // summary: Builds a regular expression that groups subexpressions
+ // description: A utility function used by some of the RE generators.
+ // The subexpressions are constructed by the function, re, in the second parameter.
+ // re builds one subexpression for each elem in the array a, in the first parameter.
+ // Returns a string for a regular expression that groups all the subexpressions.
+ //
+ // a: A single value or an array of values.
+ // re: A function. Takes one parameter and converts it to a regular expression.
+
+ // case 1: a is a single value.
+ if(!(a instanceof Array)){
+ return re(a); // String
+ }
+
+ // case 2: a is an array
+ var b = [];
+ for (var i = 0; i < a.length; i++){
+ // convert each elem to a RE
+ b.push(re(a[i]));
+ }
+
+ // join the REs as alternatives in a RE group.
+ return "(" + b.join("|") + ")"; // String
+}
Propchange: tapestry/tapestry4/trunk/tapestry-framework/src/js/dojo/src/regexp.js
------------------------------------------------------------------------------
svn:eol-style = native
Added: tapestry/tapestry4/trunk/tapestry-framework/src/js/dojo/src/rpc/Deferred.js
URL: http://svn.apache.org/viewvc/tapestry/tapestry4/trunk/tapestry-framework/src/js/dojo/src/rpc/Deferred.js?view=auto&rev=451106
==============================================================================
--- tapestry/tapestry4/trunk/tapestry-framework/src/js/dojo/src/rpc/Deferred.js (added)
+++ tapestry/tapestry4/trunk/tapestry-framework/src/js/dojo/src/rpc/Deferred.js Thu Sep 28 20:42:39 2006
@@ -0,0 +1,16 @@
+/*
+ Copyright (c) 2004-2006, The Dojo Foundation
+ All Rights Reserved.
+
+ Licensed under the Academic Free License version 2.1 or above OR the
+ modified BSD license. For more information on Dojo licensing, see:
+
+ http://dojotoolkit.org/community/licensing.shtml
+*/
+
+dojo.provide("dojo.rpc.Deferred");
+dojo.require("dojo.Deferred");
+
+dojo.deprecated("dojo.rpc.Deferred", "replaced by dojo.Deferred", "0.6");
+dojo.rpc.Deferred = dojo.Deferred;
+dojo.rpc.Deferred.prototype = dojo.Deferred.prototype;
Propchange: tapestry/tapestry4/trunk/tapestry-framework/src/js/dojo/src/rpc/Deferred.js
------------------------------------------------------------------------------
svn:eol-style = native
Added: tapestry/tapestry4/trunk/tapestry-framework/src/js/dojo/src/rpc/JotService.js
URL: http://svn.apache.org/viewvc/tapestry/tapestry4/trunk/tapestry-framework/src/js/dojo/src/rpc/JotService.js?view=auto&rev=451106
==============================================================================
--- tapestry/tapestry4/trunk/tapestry-framework/src/js/dojo/src/rpc/JotService.js (added)
+++ tapestry/tapestry4/trunk/tapestry-framework/src/js/dojo/src/rpc/JotService.js Thu Sep 28 20:42:39 2006
@@ -0,0 +1,41 @@
+/*
+ Copyright (c) 2004-2006, The Dojo Foundation
+ All Rights Reserved.
+
+ Licensed under the Academic Free License version 2.1 or above OR the
+ modified BSD license. For more information on Dojo licensing, see:
+
+ http://dojotoolkit.org/community/licensing.shtml
+*/
+
+dojo.provide("dojo.rpc.JotService");
+dojo.require("dojo.rpc.RpcService");
+dojo.require("dojo.rpc.JsonService");
+dojo.require("dojo.json");
+
+dojo.rpc.JotService = function(){
+ this.serviceUrl = "/_/jsonrpc";
+}
+
+dojo.inherits(dojo.rpc.JotService, dojo.rpc.JsonService);
+
+dojo.lang.extend(dojo.rpc.JotService, {
+ bind: function(method, parameters, deferredRequestHandler, url){
+ dojo.io.bind({
+ url: url||this.serviceUrl,
+ content: {
+ json: this.createRequest(method, parameters)
+ },
+ method: "POST",
+ mimetype: "text/json",
+ load: this.resultCallback(deferredRequestHandler),
+ error: this.errorCallback(deferredRequestHandler),
+ preventCache: true
+ });
+ },
+
+ createRequest: function(method, params){
+ var req = { "params": params, "method": method, "id": this.lastSubmissionId++ };
+ return dojo.json.serialize(req);
+ }
+});
Propchange: tapestry/tapestry4/trunk/tapestry-framework/src/js/dojo/src/rpc/JotService.js
------------------------------------------------------------------------------
svn:eol-style = native
Added: tapestry/tapestry4/trunk/tapestry-framework/src/js/dojo/src/rpc/JsonService.js
URL: http://svn.apache.org/viewvc/tapestry/tapestry4/trunk/tapestry-framework/src/js/dojo/src/rpc/JsonService.js?view=auto&rev=451106
==============================================================================
--- tapestry/tapestry4/trunk/tapestry-framework/src/js/dojo/src/rpc/JsonService.js (added)
+++ tapestry/tapestry4/trunk/tapestry-framework/src/js/dojo/src/rpc/JsonService.js Thu Sep 28 20:42:39 2006
@@ -0,0 +1,106 @@
+/*
+ Copyright (c) 2004-2006, The Dojo Foundation
+ All Rights Reserved.
+
+ Licensed under the Academic Free License version 2.1 or above OR the
+ modified BSD license. For more information on Dojo licensing, see:
+
+ http://dojotoolkit.org/community/licensing.shtml
+*/
+
+dojo.provide("dojo.rpc.JsonService");
+dojo.require("dojo.rpc.RpcService");
+dojo.require("dojo.io.*");
+dojo.require("dojo.json");
+dojo.require("dojo.lang.common");
+
+dojo.rpc.JsonService = function(args){
+ // passing just the URL isn't terribly useful. It's expected that at
+ // various times folks will want to specify:
+ // - just the serviceUrl (for use w/ remoteCall())
+ // - the text of the SMD to evaluate
+ // - a raw SMD object
+ // - the SMD URL
+ if(args){
+ if(dojo.lang.isString(args)){
+ // we assume it's an SMD file to be processed, since this was the
+ // earlier function signature
+
+ // FIXME: also accept dojo.uri.Uri objects?
+ this.connect(args);
+ }else{
+ // otherwise we assume it's an arguments object with the following
+ // (optional) properties:
+ // - serviceUrl
+ // - strictArgChecks
+ // - smdUrl
+ // - smdStr
+ // - smdObj
+ if(args["smdUrl"]){
+ this.connect(args.smdUrl);
+ }
+ if(args["smdStr"]){
+ this.processSmd(dj_eval("("+args.smdStr+")"));
+ }
+ if(args["smdObj"]){
+ this.processSmd(args.smdObj);
+ }
+ if(args["serviceUrl"]){
+ this.serviceUrl = args.serviceUrl;
+ }
+ if(typeof args["strictArgChecks"] != "undefined"){
+ this.strictArgChecks = args.strictArgChecks;
+ }
+ }
+ }
+}
+
+dojo.inherits(dojo.rpc.JsonService, dojo.rpc.RpcService);
+
+dojo.extend(dojo.rpc.JsonService, {
+
+ bustCache: false,
+
+ contentType: "application/json-rpc",
+
+ lastSubmissionId: 0,
+
+ callRemote: function(method, params){
+ var deferred = new dojo.Deferred();
+ this.bind(method, params, deferred);
+ return deferred;
+ },
+
+ bind: function(method, parameters, deferredRequestHandler, url){
+ dojo.io.bind({
+ url: url||this.serviceUrl,
+ postContent: this.createRequest(method, parameters),
+ method: "POST",
+ contentType: this.contentType,
+ mimetype: "text/json",
+ load: this.resultCallback(deferredRequestHandler),
+ error: this.errorCallback(deferredRequestHandler),
+ preventCache:this.bustCache
+ });
+ },
+
+ createRequest: function(method, params){
+ var req = { "params": params, "method": method, "id": ++this.lastSubmissionId };
+ var data = dojo.json.serialize(req);
+ dojo.debug("JsonService: JSON-RPC Request: " + data);
+ return data;
+ },
+
+ parseResults: function(obj){
+ if(!obj){ return; }
+ if (obj["Result"]!=null){
+ return obj["Result"];
+ }else if(obj["result"]!=null){
+ return obj["result"];
+ }else if(obj["ResultSet"]){
+ return obj["ResultSet"];
+ }else{
+ return obj;
+ }
+ }
+});
Propchange: tapestry/tapestry4/trunk/tapestry-framework/src/js/dojo/src/rpc/JsonService.js
------------------------------------------------------------------------------
svn:eol-style = native