portals-jetspeed-dev mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From tay...@apache.org
Subject svn commit: r354516 [2/15] - in /portals/jetspeed-2/trunk: applications/j2-admin/src/java/org/apache/jetspeed/portlets/customizer/ applications/j2-admin/src/webapp/WEB-INF/ applications/j2-admin/src/webapp/WEB-INF/view/customizer/ applications/j2-admin...
Date Tue, 06 Dec 2005 19:30:51 GMT
Added: portals/jetspeed-2/trunk/applications/j2-admin/src/webapp/dojo/src/bootstrap2.js
URL: http://svn.apache.org/viewcvs/portals/jetspeed-2/trunk/applications/j2-admin/src/webapp/dojo/src/bootstrap2.js?rev=354516&view=auto
==============================================================================
--- portals/jetspeed-2/trunk/applications/j2-admin/src/webapp/dojo/src/bootstrap2.js (added)
+++ portals/jetspeed-2/trunk/applications/j2-admin/src/webapp/dojo/src/bootstrap2.js Tue Dec  6 11:29:56 2005
@@ -0,0 +1,67 @@
+/*
+ * bootstrap2.js - runs after the hostenv_*.js file.
+ */
+
+/*
+ * This method taks a "map" of arrays which one can use to optionally load dojo
+ * modules. The map is indexed by the possible dojo.hostenv.name_ values, with
+ * two additional values: "default" and "common". The items in the "default"
+ * array will be loaded if none of the other items have been choosen based on
+ * the hostenv.name_ item. The items in the "common" array will _always_ be
+ * loaded, regardless of which list is chosen.  Here's how it's normally
+ * called:
+ *
+ *	dojo.hostenv.conditionalLoadModule({
+ *		browser: [
+ *			["foo.bar.baz", true, true], // an example that passes multiple args to loadModule()
+ *			"foo.sample.*",
+ *			"foo.test,
+ *		],
+ *		default: [ "foo.sample.*" ],
+ *		common: [ "really.important.module.*" ]
+ *	});
+ */
+dojo.hostenv.conditionalLoadModule = function(modMap){
+	var common = modMap["common"]||[];
+	var result = (modMap[dojo.hostenv.name_]) ? common.concat(modMap[dojo.hostenv.name_]||[]) : common.concat(modMap["default"]||[]);
+
+	for(var x=0; x<result.length; x++){
+		var curr = result[x];
+		if(curr.constructor == Array){
+			dojo.hostenv.loadModule.apply(dojo.hostenv, curr);
+		}else{
+			dojo.hostenv.loadModule(curr);
+		}
+	}
+}
+
+dojo.hostenv.require = dojo.hostenv.loadModule;
+dojo.require = function(){
+	dojo.hostenv.loadModule.apply(dojo.hostenv, arguments);
+}
+
+dojo.requireIf = function(){
+	if((arguments[0] === true)||(arguments[0]=="common")||(dojo.render[arguments[0]].capable)){
+		var args = [];
+		for (var i = 1; i < arguments.length; i++) { args.push(arguments[i]); }
+		dojo.require.apply(dojo, args);
+	}
+}
+
+dojo.conditionalRequire = dojo.requireIf;
+
+dojo.kwCompoundRequire = function(){
+	dojo.hostenv.conditionalLoadModule.apply(dojo.hostenv, arguments);
+}
+
+dojo.hostenv.provide = dojo.hostenv.startPackage;
+dojo.provide = function(){
+	return dojo.hostenv.startPackage.apply(dojo.hostenv, arguments);
+}
+
+dojo.setModulePrefix = function(module, prefix){
+	return dojo.hostenv.setModulePrefix(module, prefix);
+}
+
+// stub
+dojo.profile = { start: function(){}, end: function(){}, dump: function(){} };

Added: portals/jetspeed-2/trunk/applications/j2-admin/src/webapp/dojo/src/browser_debug.js
URL: http://svn.apache.org/viewcvs/portals/jetspeed-2/trunk/applications/j2-admin/src/webapp/dojo/src/browser_debug.js?rev=354516&view=auto
==============================================================================
--- portals/jetspeed-2/trunk/applications/j2-admin/src/webapp/dojo/src/browser_debug.js (added)
+++ portals/jetspeed-2/trunk/applications/j2-admin/src/webapp/dojo/src/browser_debug.js Tue Dec  6 11:29:56 2005
@@ -0,0 +1,62 @@
+dojo.hostenv.loadedUris.push("../src/bootstrap1.js");
+dojo.hostenv.loadedUris.push("../src/hostenv_browser.js");
+dojo.hostenv.loadedUris.push("../src/bootstrap2.js");
+
+// over-write dj_eval to prevent actual loading of subsequent files
+var old_dj_eval = dj_eval;
+dj_eval = function(){ return true; }
+dojo.hostenv.oldLoadUri = dojo.hostenv.loadUri;
+dojo.hostenv.loadUri = function(uri){
+	if(dojo.hostenv.loadedUris[uri]){
+		return;
+	}
+	var contents = this.getText(uri, null, true);
+	if(contents == null){ return 0; }
+	try{
+		var requires = dojo.hostenv.getDepsForEval(contents);
+		var provides = dojo.hostenv.getProvidesForEval(contents);
+		eval(provides.join(";"));
+		eval(requires.join(";"));
+		dojo.hostenv.loadedUris.push(uri);
+		dojo.hostenv.loadedUris[uri] = true;
+	}catch(e){ 
+		alert(e);
+	}
+	return true;
+}
+
+dojo.hostenv.getProvidesForEval = function(contents){
+	if(!contents){ contents = ""; }
+	// check to see if we need to load anything else first. Ugg.
+	var mods = [];
+	var tmp = contents.match( /dojo.hostenv.startPackage\(.*?\)/mg );
+	if(tmp){
+		for(var x=0; x<tmp.length; x++){ mods.push(tmp[x]); }
+	}
+	tmp = contents.match( /dojo.hostenv.provide\((.*?)\)/mg );
+	if(tmp){
+		for(var x=0; x<tmp.length; x++){ mods.push(tmp[x]); }
+	}
+	tmp = contents.match( /dojo.provide\((.*?)\)/mg );
+	if(tmp){
+		for(var x=0; x<tmp.length; x++){ mods.push(tmp[x]); }
+	}
+	return mods;
+}
+
+dojo.hostenv.writeIncludes = function(){
+	var depList = [];
+	var seen = {};
+	for(var x=0; x<dojo.hostenv.loadedUris.length; x++){
+		var curi = dojo.hostenv.loadedUris[x];
+		if(!seen[curi]){
+			seen[curi] = true;
+			depList.push(curi);
+		}
+	}
+
+	for(var x=3; x<depList.length; x++){
+		document.write("<script type='text/javascript' src='"+depList[x]+"'></script>");
+	}
+	dj_eval = old_dj_eval;
+}

Added: portals/jetspeed-2/trunk/applications/j2-admin/src/webapp/dojo/src/collections/ArrayList.js
URL: http://svn.apache.org/viewcvs/portals/jetspeed-2/trunk/applications/j2-admin/src/webapp/dojo/src/collections/ArrayList.js?rev=354516&view=auto
==============================================================================
--- portals/jetspeed-2/trunk/applications/j2-admin/src/webapp/dojo/src/collections/ArrayList.js (added)
+++ portals/jetspeed-2/trunk/applications/j2-admin/src/webapp/dojo/src/collections/ArrayList.js Tue Dec  6 11:29:56 2005
@@ -0,0 +1,87 @@
+dojo.provide("dojo.collections.ArrayList");
+dojo.require("dojo.collections.Collections");
+
+dojo.collections.ArrayList = function(arr){
+	var items = [];
+	if (arr) items = items.concat(arr);
+	this.count = items.length;
+	this.add = function(obj){
+		items.push(obj);
+		this.count = items.length;
+	};
+	this.addRange = function(a){
+		if (a.getIterator) {
+			var e = a.getIterator();
+			while (!e.atEnd) {
+				this.add(e.current);
+				e.moveNext();
+			}
+			this.count = items.length;
+		} else {
+			for (var i=0; i<a.length; i++){
+				items.push(a[i]);
+			}
+			this.count = items.length;
+		}
+	};
+	this.clear = function(){
+		items.splice(0, items.length);
+		this.count = 0;
+	};
+	this.clone = function(){
+		return new dojo.collections.ArrayList(items);
+	};
+	this.contains = function(obj){
+		for (var i = 0; i < items.length; i++){
+			if (items[i] == obj) {
+				return true;
+			}
+		}
+		return false;
+	};
+	this.getIterator = function(){
+		return new dojo.collections.Iterator(items);
+	};
+	this.indexOf = function(obj){
+		for (var i = 0; i < items.length; i++){
+			if (items[i] == obj) {
+				return i;
+			}
+		}
+		return -1;
+	};
+	this.insert = function(i, obj){
+		items.splice(i,0,obj);
+		this.count = items.length;
+	};
+	this.item = function(k){
+		return items[k];
+	};
+	this.remove = function(obj){
+		var i = this.indexOf(obj);
+		if (i >=0) {
+			items.splice(i,1);
+		}
+		this.count = items.length;
+	};
+	this.removeAt = function(i){
+		items.splice(i,1);
+		this.count = items.length;
+	};
+	this.reverse = function(){
+		items.reverse();
+	};
+	this.sort = function(fn){
+		if (fn){
+			items.sort(fn);
+		} else {
+			items.sort();
+		}
+	};
+	this.toArray = function(){
+		return [].concat(items);
+	}
+	this.toString = function(){
+		return items.join(",");
+	};
+};

Added: portals/jetspeed-2/trunk/applications/j2-admin/src/webapp/dojo/src/collections/BinaryTree.js
URL: http://svn.apache.org/viewcvs/portals/jetspeed-2/trunk/applications/j2-admin/src/webapp/dojo/src/collections/BinaryTree.js?rev=354516&view=auto
==============================================================================
--- portals/jetspeed-2/trunk/applications/j2-admin/src/webapp/dojo/src/collections/BinaryTree.js (added)
+++ portals/jetspeed-2/trunk/applications/j2-admin/src/webapp/dojo/src/collections/BinaryTree.js Tue Dec  6 11:29:56 2005
@@ -0,0 +1,190 @@
+dojo.provide("dojo.collections.BinaryTree");
+dojo.require("dojo.collections.Collections");
+
+dojo.collections.BinaryTree = function(data){
+	function node(data, rnode, lnode){
+		this.value = data || null;
+		this.right = rnode || null;
+		this.left = lnode || null;
+		this.clone = function(){
+			var c = new node();
+			if (this.value.value) c.value = this.value.clone();
+			else c.value = this.value;
+			if (this.left) c.left = this.left.clone();
+			if (this.right) c.right = this.right.clone();
+		}
+		this.compare = function(n){
+			if (this.value > n.value) return 1;
+			if (this.value < n.value) return -1;
+			return 0;
+		}
+		this.compareData = function(d){
+			if (this.value > d) return 1;
+			if (this.value < d) return -1;
+			return 0;
+		}
+	}
+
+	function inorderTraversalBuildup(current, a){
+		if (current){
+			inorderTraversalBuildup(current.left, a);
+			a.add(current);
+			inorderTraversalBuildup(current.right, a);
+		}
+	}
+
+	function preorderTraversal(current, sep){
+		var s = "";
+		if (current){
+			s = current.value.toString() + sep;
+			s += preorderTraversal(current.left, sep);
+			s += preorderTraversal(current.right, sep);
+		}
+		return s;
+	}
+	function inorderTraversal(current, sep){
+		var s = "";
+		if (current){
+			s = inorderTraversal(current.left, sep);
+			s += current.value.toString() + sep;
+			s += inorderTraversal(current.right, sep);
+		}
+		return s;
+	}
+	function postorderTraversal(current, sep){
+		var s = "";
+		if (current){
+			s = postorderTraversal(current.left, sep);
+			s += postorderTraversal(current.right, sep);
+			s += current.value.toString() + sep;
+		}
+		return s;
+	}
+	
+	function searchHelper(current, data){
+		if (!current) return null;
+		var i = current.compareData(data);
+		if (i == 0) return current;
+		if (result > 0) return searchHelper(current.left, data);
+		else return searchHelper(current.right, data);
+	}
+
+	this.add = function(data){
+		var n = new node(data);
+		var i;
+		var current = root;
+		var parent = null;
+		while (current){
+			i = current.compare(n);
+			if (i == 0) return;
+			parent = current;
+			if (i > 0) current = current.left;
+			else current = current.right;
+		}
+		this.count++;
+		if (!parent) root = n;
+		else {
+			i = parent.compare(n);
+			if (i > 0) parent.left = n;
+			else parent.right = n;
+		}
+	};
+	this.clear = function(){
+		root = null;
+		this.count = 0;
+	};
+	this.clone = function(){
+		var c = new dojo.collections.BinaryTree();
+		c.root = root.clone();
+		c.count = this.count;
+		return c;
+	};
+	this.contains = function(data){
+		return this.search(data) != null;
+	};
+	this.deleteData = function(data){
+		var current = root;
+		var parent = null;
+		var i = current.compareData(data);
+		while (i != 0 && current != null){
+			if (i > 0){
+				parent = current;
+				current = current.left;
+			} else if (i < 0) {
+				parent = current;
+				current = current.right;
+			}
+			i = current.compareData(data);
+		}
+		if (!current) return;
+		this.count--;
+		if (!current.right) {
+			if (!parent) root = current.left;
+			else {
+				i = parent.compare(current);
+				if (i > 0) parent.left = current.left;
+				else if (i < 0) parent.right = current.left;
+			}
+		} else if (!current.right.left){
+			if (!parent) root = current.right;
+			else {
+				i = parent.compare(current);
+				if (i > 0) parent.left = current.right;
+				else if (i < 0) parent.right = current.right;
+			}
+		} else {
+			var leftmost = current.right.left;
+			var lmParent = current.right;
+			while (leftmost.left != null){
+				lmParent = leftmost;
+				leftmost = leftmost.left;
+			}
+			lmParent.left = leftmost.right;
+			leftmost.left = current.left;
+			leftmost.right = current.right;
+			if (!parent) root = leftmost;
+			else {
+				i = parent.compare(current);
+				if (i > 0) parent.left = leftmost;
+				else if (i < 0) parent.right = leftmost;
+			}
+		}
+	};
+	this.getIterator = function(){
+		var a = new ArrayList();
+		inorderTraversalBuildup(root, a);
+		return a.getIterator();
+	};
+	this.search = function(data){
+		return searchHelper(root, data);
+	};
+	this.toString = function(order, sep){
+		if (!order) var order = dojo.collections.BinaryTree.TraversalMethods.Inorder;
+		if (!sep) var sep = " ";
+		var s = "";
+		switch (order){
+			case dojo.collections.BinaryTree.TraversalMethods.Preorder:
+				s = preorderTraversal(root, sep);
+				break;
+			case dojo.collections.BinaryTree.TraversalMethods.Inorder:
+				s = inorderTraversal(root, sep);
+				break;
+			case dojo.collections.BinaryTree.TraversalMethods.Postorder:
+				s = postorderTraversal(root, sep);
+				break;
+		};
+		if (s.length == 0) return "";
+		else return s.substring(0, s.length - sep.length);
+	};
+
+	this.count = 0;
+	var root = this.root = null;
+	if (data) {
+		this.add(data);
+	}
+}
+dojo.collections.BinaryTree.TraversalMethods = {
+	Preorder : 0,
+	Inorder : 1,
+	Postorder : 2
+};

Added: portals/jetspeed-2/trunk/applications/j2-admin/src/webapp/dojo/src/collections/ByteArray.js
URL: http://svn.apache.org/viewcvs/portals/jetspeed-2/trunk/applications/j2-admin/src/webapp/dojo/src/collections/ByteArray.js?rev=354516&view=auto
==============================================================================
--- portals/jetspeed-2/trunk/applications/j2-admin/src/webapp/dojo/src/collections/ByteArray.js (added)
+++ portals/jetspeed-2/trunk/applications/j2-admin/src/webapp/dojo/src/collections/ByteArray.js Tue Dec  6 11:29:56 2005
@@ -0,0 +1,9 @@
+dojo.provide("dojo.collections.ByteArray");
+dojo.require("dojo.collections.Collections");
+
+//	the following is an implementation of a 32 bit Byte Array.
+dojo.collections.ByteArray = function(s){
+
+
+
+}

Added: portals/jetspeed-2/trunk/applications/j2-admin/src/webapp/dojo/src/collections/Collections.js
URL: http://svn.apache.org/viewcvs/portals/jetspeed-2/trunk/applications/j2-admin/src/webapp/dojo/src/collections/Collections.js?rev=354516&view=auto
==============================================================================
--- portals/jetspeed-2/trunk/applications/j2-admin/src/webapp/dojo/src/collections/Collections.js (added)
+++ portals/jetspeed-2/trunk/applications/j2-admin/src/webapp/dojo/src/collections/Collections.js Tue Dec  6 11:29:56 2005
@@ -0,0 +1,57 @@
+dojo.provide("dojo.collections.Collections");
+
+dojo.collections = {Collections:true};
+dojo.collections.DictionaryEntry = function(k,v){
+	this.key = k;
+	this.value = v;
+	this.valueOf = function(){ return this.value; };
+	this.toString = function(){ return this.value; };
+}
+
+dojo.collections.Iterator = function(a){
+	var obj = a;
+	var position = 0;
+	this.current = null;
+	this.atEnd = false;
+	this.moveNext = function(){
+		if(this.atEnd){
+			dojo.raise("dojo.collections.Iterator.moveNext: iterator is at end position.");
+		}
+		this.current = obj[position];
+		if(++position == obj.length){
+			this.atEnd = true;
+		}
+	}
+	this.reset = function(){
+		position = 0;
+		this.atEnd = false;
+	}
+}
+
+dojo.collections.DictionaryIterator = function(obj){
+	var arr = [] ;	//	Create an indexing array
+	for (var p in obj) arr.push(obj[p]) ;	//	fill it up
+	var position = 0 ;
+	this.current = null ;
+	this.entry = null ;
+	this.key = null ;
+	this.value = null ;
+	this.atEnd = false ;
+	this.moveNext = function() { 
+		if(this.atEnd){
+			dojo.raise("dojo.collections.Iterator.moveNext: iterator is at end position.");
+		}
+		this.entry = this.current = arr[position] ;
+		if (this.entry) {
+			this.key = this.entry.key ;
+			this.value = this.entry.value ;
+		}
+		if (++position == arr.length) {
+			this.atEnd = true ;
+		}
+	} ;
+	this.reset = function() { 
+		position = 0 ; 
+		this.atEnd = false ;
+	} ;
+};

Added: portals/jetspeed-2/trunk/applications/j2-admin/src/webapp/dojo/src/collections/Dictionary.js
URL: http://svn.apache.org/viewcvs/portals/jetspeed-2/trunk/applications/j2-admin/src/webapp/dojo/src/collections/Dictionary.js?rev=354516&view=auto
==============================================================================
--- portals/jetspeed-2/trunk/applications/j2-admin/src/webapp/dojo/src/collections/Dictionary.js (added)
+++ portals/jetspeed-2/trunk/applications/j2-admin/src/webapp/dojo/src/collections/Dictionary.js Tue Dec  6 11:29:56 2005
@@ -0,0 +1,65 @@
+dojo.provide("dojo.collections.Dictionary");
+dojo.require("dojo.collections.Collections");
+
+dojo.collections.Dictionary = function(dictionary){
+	var items = {};
+	this.count = 0;
+	if (dictionary){
+		var e = dictionary.getIterator();
+		while (!e.atEnd) {
+			 this.add(e.key, e.value);
+			 e.moveNext();
+		}
+	}
+
+	this.add = function(k,v){
+		items[k] = new dojo.collections.DictionaryEntry(k,v);
+		this.count++;
+	};
+	this.clear = function(){
+		items = {};
+		this.count = 0;
+	};
+	this.clone = function(){
+		return new dojo.collections.Dictionary(this);
+	};
+	this.contains = this.containsKey = function(k){
+		return (items[k] != null);
+	};
+	this.containsValue = function(v){
+		var e = this.getIterator();
+		while (!e.atEnd) {
+			if (e.value == v) return true;
+			e.moveNext();
+		}
+		return false;
+	};
+	this.getKeyList = function(){
+		var arr = [];
+		var e = this.getIterator();
+		while (!e.atEnd) {
+			arr.push(e.key);
+			e.moveNext();
+		}
+		return arr;
+	};
+	this.getValueList = function(){
+		var arr = [];
+		var e = this.getIterator();
+		while (!e.atEnd) {
+			arr.push(e.value);
+			e.moveNext();
+		}
+		return arr;
+	};
+	this.item = function(k){
+		return items[k];
+	};
+	this.getIterator = function(){
+		return new dojo.collections.DictionaryIterator(items);
+	};
+	this.remove = function(k){
+		delete items[k];
+		this.count--;
+	};
+};

Added: portals/jetspeed-2/trunk/applications/j2-admin/src/webapp/dojo/src/collections/Graph.js
URL: http://svn.apache.org/viewcvs/portals/jetspeed-2/trunk/applications/j2-admin/src/webapp/dojo/src/collections/Graph.js?rev=354516&view=auto
==============================================================================
--- portals/jetspeed-2/trunk/applications/j2-admin/src/webapp/dojo/src/collections/Graph.js (added)
+++ portals/jetspeed-2/trunk/applications/j2-admin/src/webapp/dojo/src/collections/Graph.js Tue Dec  6 11:29:56 2005
@@ -0,0 +1,132 @@
+dojo.provide("dojo.collections.Graph");
+dojo.require("dojo.collections.Collections");
+
+dojo.collections.Graph = function(nodes){
+	function node(key, data, neighbors) {
+		this.key = key;
+		this.data = data;
+		this.neighbors = neighbors || new adjacencyList();
+		this.addDirected = function(){
+			if (arguments[0].constructor == edgeToNeighbor){
+				this.neighbors.add(arguments[0]);
+			} else {
+				var n = arguments[0];
+				var cost = arguments[1] || 0;
+				this.neighbors.add(new edgeToNeighbor(n, cost));
+			}
+		}
+	}
+	function nodeList(){
+		var d = new dojo.collections.Dictionary();
+		function nodelistiterator(){
+			var o = [] ;	//	Create an indexing array
+			var e = d.getIterator();
+			while (e.moveNext()) o[o.length] = e.current;
+
+			var position = 0 ;
+			this.current = null ;
+			this.entry = null ;
+			this.key = null ;
+			this.value = null ;
+			this.atEnd = false ;
+			this.moveNext = function() { 
+				if (this.atEnd) return !this.atEnd ;
+				this.entry = this.current = o[position] ;
+				if (this.entry) {
+					this.key = this.entry.key ;
+					this.value = this.entry.data ;
+				}
+				if (position == o.length) this.atEnd = true ;
+				position++ ;
+				return !this.atEnd ;
+			} ;
+			this.reset = function() { 
+				position = 0 ; 
+				this.atEnd = false ;
+			} ;
+		}
+		
+		this.add = function(node){
+			d.add(node.key, node);
+		};
+		this.clear = function(){
+			d.clear();
+		};
+		this.containsKey = function(key){
+			return d.containsKey(key);
+		};
+		this.getIterator = function(){
+			return new nodelistiterator(this);
+		};
+		this.item = function(key){
+			return d.item(key);
+		};
+		this.remove = function(node){
+			d.remove(node.key);
+		};
+	}
+	function edgeToNeighbor(node, cost){
+		this.neighbor = node;
+		this.cost = cost;
+	}
+	function adjacencyList(){
+		var d = [];
+		this.add = function(o){
+			d.push(o);
+		};
+		this.item = function(i){
+			return d[i];
+		};
+		this.getIterator = function(){
+			return new dojo.collections.Iterator([].concat(d));
+		};
+	}
+
+	this.nodes = nodes || new nodeList();
+	this.count = this.nodes.count;
+	this.clear = function(){
+		this.nodes.clear();
+		this.count = 0;
+	};
+	this.addNode = function(){
+		var n = arguments[0];
+		if (arguments.length > 1) {
+			n = new node(arguments[0], arguments[1]);
+		}
+		if (!this.nodes.containsKey(n.key)) {
+			this.nodes.add(n);
+			this.count++;
+		}
+	};
+	this.addDirectedEdge = function(uKey, vKey, cost){
+		var uNode, vNode;
+		if (uKey.constructor != node) {
+			uNode = this.nodes.item(uKey);
+			vNode = this.nodes.item(vKey);
+		} else {
+			uNode = uKey;
+			vNode = vKey;
+		}
+		var c = cost || 0;
+		uNode.addDirected(vNode, c);
+	};
+	this.addUndirectedEdge = function(uKey, vKey, cost){
+		var uNode, vNode;
+		if (uKey.constructor != node) {
+			uNode = this.nodes.item(uKey);
+			vNode = this.nodes.item(vKey);
+		} else {
+			uNode = uKey;
+			vNode = vKey;
+		}
+		var c = cost || 0;
+		uNode.addDirected(vNode, c);
+		vNode.addDirected(uNode, c);
+	};
+	this.contains = function(n){
+		return this.nodes.containsKey(n.key);
+	};
+	this.containsKey = function(k){
+		return this.nodes.containsKey(k);
+	};
+}

Added: portals/jetspeed-2/trunk/applications/j2-admin/src/webapp/dojo/src/collections/List.js
URL: http://svn.apache.org/viewcvs/portals/jetspeed-2/trunk/applications/j2-admin/src/webapp/dojo/src/collections/List.js?rev=354516&view=auto
==============================================================================
--- portals/jetspeed-2/trunk/applications/j2-admin/src/webapp/dojo/src/collections/List.js (added)
+++ portals/jetspeed-2/trunk/applications/j2-admin/src/webapp/dojo/src/collections/List.js Tue Dec  6 11:29:56 2005
@@ -0,0 +1,7 @@
+dojo.provide("dojo.collections.List");
+dojo.require("dojo.collections.Collections");
+
+dojo.collections.List = function(dictionary){
+	dojo.deprecated("dojo.collections.List", "Use dojo.collections.Dictionary instead.");
+	return new dojo.collections.Dictionary(dictionary);
+}

Added: portals/jetspeed-2/trunk/applications/j2-admin/src/webapp/dojo/src/collections/Queue.js
URL: http://svn.apache.org/viewcvs/portals/jetspeed-2/trunk/applications/j2-admin/src/webapp/dojo/src/collections/Queue.js?rev=354516&view=auto
==============================================================================
--- portals/jetspeed-2/trunk/applications/j2-admin/src/webapp/dojo/src/collections/Queue.js (added)
+++ portals/jetspeed-2/trunk/applications/j2-admin/src/webapp/dojo/src/collections/Queue.js Tue Dec  6 11:29:56 2005
@@ -0,0 +1,41 @@
+dojo.provide("dojo.collections.Queue");
+dojo.require("dojo.collections.Collections");
+
+dojo.collections.Queue = function(arr){
+	var q = [];
+	if (arr) q = q.concat(arr);
+	this.count = q.length;
+	this.clear = function(){
+		q = [];
+		this.count = q.length;
+	};
+	this.clone = function(){
+		return new dojo.collections.Queue(q);
+	};
+	this.contains = function(o){
+		for (var i = 0; i < q.length; i++){
+			if (q[i] == o) return true;
+		}
+		return false;
+	};
+	this.copyTo = function(arr, i){
+		arr.splice(i,0,q);
+	};
+	this.dequeue = function(){
+		var r = q.shift();
+		this.count = q.length;
+		return r;
+	};
+	this.enqueue = function(o){
+		this.count = q.push(o);
+	};
+	this.getIterator = function(){
+		return new dojo.collections.Iterator(q);
+	};
+	this.peek = function(){
+		return q[0];
+	};
+	this.toArray = function(){
+		return [].concat(q);
+	};
+};

Added: portals/jetspeed-2/trunk/applications/j2-admin/src/webapp/dojo/src/collections/Set.js
URL: http://svn.apache.org/viewcvs/portals/jetspeed-2/trunk/applications/j2-admin/src/webapp/dojo/src/collections/Set.js?rev=354516&view=auto
==============================================================================
--- portals/jetspeed-2/trunk/applications/j2-admin/src/webapp/dojo/src/collections/Set.js (added)
+++ portals/jetspeed-2/trunk/applications/j2-admin/src/webapp/dojo/src/collections/Set.js Tue Dec  6 11:29:56 2005
@@ -0,0 +1,65 @@
+dojo.provide("dojo.collections.Set");
+dojo.require("dojo.collections.Collections");
+dojo.require("dojo.collections.ArrayList");
+
+//	straight up sets are based on arrays or array-based collections.
+dojo.collections.Set = new function(){
+	this.union = function(setA, setB){
+		if (setA.constructor == Array) var setA = new dojo.collections.ArrayList(setA);
+		if (setB.constructor == Array) var setB = new dojo.collections.ArrayList(setB);
+		if (!setA.toArray || !setB.toArray) dojo.raise("Set operations can only be performed on array-based collections.");
+		var result = new dojo.collections.ArrayList(setA.toArray());
+		var e = setB.getIterator();
+		while (!e.atEnd){
+			if (!result.contains(e.current)) result.add(e.current);
+		}
+		return result;
+	};
+	this.intersection = function(setA, setB){
+		if (setA.constructor == Array) var setA = new dojo.collections.ArrayList(setA);
+		if (setB.constructor == Array) var setB = new dojo.collections.ArrayList(setB);
+		if (!setA.toArray || !setB.toArray) dojo.raise("Set operations can only be performed on array-based collections.");
+		var result = new dojo.collections.ArrayList();
+		var e = setB.getIterator();
+		while (!e.atEnd){
+			if (setA.contains(e.current)) result.add(e.current);
+			e.moveNext();
+		}
+		return result;
+	};
+	//	returns everything in setA that is not in setB.
+	this.difference = function(setA, setB){
+		if (setA.constructor == Array) var setA = new dojo.collections.ArrayList(setA);
+		if (setB.constructor == Array) var setB = new dojo.collections.ArrayList(setB);
+		if (!setA.toArray || !setB.toArray) dojo.raise("Set operations can only be performed on array-based collections.");
+		var result = new dojo.collections.ArrayList();
+		var e = setA.getIterator();
+		while (!e.atEnd){
+			if (!setB.contains(e.current)) result.add(e.current);
+			e.moveNext();
+		}
+		return result;
+	};
+	this.isSubSet = function(setA, setB) {
+		if (setA.constructor == Array) var setA = new dojo.collections.ArrayList(setA);
+		if (setB.constructor == Array) var setB = new dojo.collections.ArrayList(setB);
+		if (!setA.toArray || !setB.toArray) dojo.raise("Set operations can only be performed on array-based collections.");
+		var e = setA.getIterator();
+		while (!e.atEnd){
+			if (!setB.contains(e.current)) return false;
+			e.moveNext();
+		}
+		return true;
+	};
+	this.isSuperSet = function(setA, setB){
+		if (setA.constructor == Array) var setA = new dojo.collections.ArrayList(setA);
+		if (setB.constructor == Array) var setB = new dojo.collections.ArrayList(setB);
+		if (!setA.toArray || !setB.toArray) dojo.raise("Set operations can only be performed on array-based collections.");
+		var e = setB.getIterator();
+		while (!e.atEnd){
+			if (!setA.contains(e.current)) return false;
+			e.moveNext();
+		}
+		return true;
+	};
+}();

Added: portals/jetspeed-2/trunk/applications/j2-admin/src/webapp/dojo/src/collections/SkipList.js
URL: http://svn.apache.org/viewcvs/portals/jetspeed-2/trunk/applications/j2-admin/src/webapp/dojo/src/collections/SkipList.js?rev=354516&view=auto
==============================================================================
--- portals/jetspeed-2/trunk/applications/j2-admin/src/webapp/dojo/src/collections/SkipList.js (added)
+++ portals/jetspeed-2/trunk/applications/j2-admin/src/webapp/dojo/src/collections/SkipList.js Tue Dec  6 11:29:56 2005
@@ -0,0 +1,133 @@
+dojo.provide("dojo.collections.SkipList");
+dojo.require("dojo.collections.Collections");
+
+dojo.collections.SkipList = function(){
+	function node(height, val){
+		this.value = val;
+		this.height = height;
+		this.nodes = new nodeList(height);
+		this.compare = function(val){
+			if (this.value > val) return 1;
+			if (this.value < val) return -1;
+			return 0;
+		}
+		this.incrementHeight = function(){
+			this.nodes.incrementHeight();
+			this.height++;
+		};
+		this.decrementHeight = function(){
+			this.nodes.decrementHeight();
+			this.height--;
+		};
+	}
+	function nodeList(height){
+		var arr = [];
+		this.height = height;
+		for (var i = 0; i < height; i++) arr[i] = null;
+		this.item = function(i){
+			return arr[i];
+		};
+		this.incrementHeight = function(){
+			this.height++;
+			arr[this.height] = null;
+		};
+		this.decrementHeight = function(){
+			arr.splice(arr.length - 1, 1);
+			this.height--;
+		};
+	}
+	function iterator(list){
+		this.current = list.head;
+		this.atEnd = false;
+		this.moveNext = function(){
+			if (this.atEnd) return !this.atEnd;
+			this.current = this.current.nodes[0];
+			this.atEnd = (current == null);
+			return !this.atEnd;
+		};
+		this.reset = function(){
+			this.current = null;
+		};
+	}
+
+	function chooseRandomHeight(max){
+		var level = 1;
+		while (Math.random() < PROB && level < max) level++;
+		return level;
+	}
+
+	var PROB = 0.5;
+	var comparisons = 0;
+
+	this.head = new node(1);
+	this.count = 0;
+	this.add = function(val){
+		var updates = [];
+		var current = this.head;
+		for (var i = this.head.height; i >= 0; i--){
+			if (!(current.nodes[i] != null && current.nodes[i].compare(val) < 0)) comparisons++;
+			while (current.nodes[i] != null && current.nodes[i].compare(val) < 0){
+				current = current.nodes[i];
+				comparisons++;
+			}
+			updates[i] = current;
+		}
+		if (current.nodes[0] != null && current.nodes[0].compare(val) == 0) return;
+		var n = new node(val, chooseRandomHeight(head.height + 1));
+		this.count++;
+		if (n.height > head.height){
+			head.incrementHeight();
+			head.nodes[head.height - 1] = n;
+		}
+		for (i = 0; i < n.height; i++){
+			if (i < updates.length) {
+				n.nodes[i] = updates[i].nodes[i];
+				updates[i].nodes[i] = n;
+			}
+		}
+	};
+	
+	this.contains = function(val){
+		var current = this.head;
+		var i;
+		for (i = head.height - 1; i >= 0; i--) {
+			while (current.item(i) != null) {
+				comparisons++;
+				var result = current.nodes[i].compare(val);
+				if (result == 0) return true;
+				else if (result < 0) current = current.nodes[i];
+				else break;
+			}
+		}
+		return false;
+	};
+	this.getIterator = function(){
+		return new iterator(this);
+	};
+
+	this.remove = function(val){
+		var updates = [];
+		var current = this.head;
+		for (var i = this.head.height - 1; i >= 0; i--){
+			if (!(current.nodes[i] != null && current.nodes[i].compare(val) < 0)) comparisons++;
+			while (current.nodes[i] != null && current.nodes[i].compare(val) < 0) {
+				current = current.nodes[i];
+				comparisons++;
+			}
+			updates[i] = current;
+		}
+		
+		current = current.nodes[0];
+		if (current != null && current.compare(val) == 0){
+			this.count--;
+			for (var i = 0; i < head.height; i++){
+				if (updates[i].nodes[i] != current) break;
+				else updates[i].nodes[i] = current.nodes[i];
+			}
+			if (head.nodes[head.height - 1] == null) head.decrementHeight();
+		}
+	};
+	this.resetComparisons = function(){ 
+		comparisons = 0; 
+	};
+}

Added: portals/jetspeed-2/trunk/applications/j2-admin/src/webapp/dojo/src/collections/SortedList.js
URL: http://svn.apache.org/viewcvs/portals/jetspeed-2/trunk/applications/j2-admin/src/webapp/dojo/src/collections/SortedList.js?rev=354516&view=auto
==============================================================================
--- portals/jetspeed-2/trunk/applications/j2-admin/src/webapp/dojo/src/collections/SortedList.js (added)
+++ portals/jetspeed-2/trunk/applications/j2-admin/src/webapp/dojo/src/collections/SortedList.js Tue Dec  6 11:29:56 2005
@@ -0,0 +1,129 @@
+dojo.provide("dojo.collections.SortedList");
+dojo.require("dojo.collections.Collections");
+
+dojo.collections.SortedList = function(dictionary){
+	var _this = this;
+	var items = {};
+	var q = [];
+	var sorter = function(a,b){
+		if (a.key > b.key) return 1;
+		if (a.key < b.key) return -1;
+		return 0;
+	};
+	var build = function(){
+		q = [];
+		var e = _this.getIterator();
+		while (!e.atEnd) {
+			q.push(e.entry);
+			e.moveNext();
+		}
+		q.sort(sorter);
+	};
+
+	if (dictionary){
+		var e = dictionary.getIterator();
+		while (!e.atEnd) {
+			q[q.length] = items[e.key] = new dojo.collections.DictionaryEntry(e.key, e.value);
+			e.moveNext();
+		}
+		q.sort(sorter);
+	}
+
+	this.count = q.length;
+	this.add = function(k,v){
+		if (!items[k]) {
+			items[k] = new dojo.collections.DictionaryEntry(k,v);
+			this.count = q.push(items[k]);
+			q.sort(sorter);
+		}
+	};
+	this.clear = function(){
+		items = {};
+		q = [];
+		this.count = q.length;
+	};
+	this.clone = function(){
+		return new dojo.collections.SortedList(this);
+	};
+	this.contains = this.containsKey = function(k){
+		return (items[k] != null);
+	};
+	this.containsValue = function(o){
+		var e = this.getIterator();
+		while (!e.atEnd){
+			if (e.value == o) return true;
+			e.moveNext();
+		}
+		return false;
+	};
+	this.copyTo = function(arr, i){
+		var e = this.getIterator();
+		var idx = i;
+		while (!e.atEnd){
+			arr.splice(idx, 0, e.entry);
+			idx++;
+			e.moveNext();
+		}
+	};
+	this.getByIndex = function(i){
+		return q[i].value;
+	};
+	this.getIterator = function(){
+		return new dojo.collections.DictionaryIterator(items);
+	};
+	this.getKey = function(i){
+		return q[i].key;
+	};
+	this.getKeyList = function(){
+		var arr = [];
+		var e = this.getIterator();
+		while (!e.atEnd){
+			arr.push(e.key);
+			e.moveNext();
+		}
+		return arr;
+	};
+	this.getValueList = function(){
+		var arr = [];
+		var e = this.getIterator();
+		while (!e.atEnd){
+			arr.push(e.value);
+			e.moveNext();
+		}
+		return arr;
+	};
+	this.indexOfKey = function(k){
+		for (var i = 0; i < q.length; i++){
+			if (q[i].key == k) {
+				return i;
+			}
+		}
+		return -1;
+	};
+	this.indexOfValue = function(o){
+		for (var i = 0; i < q.length; i++){
+			if (q[i].value == o) {
+				return i;
+			}
+		}
+		return -1;
+	};
+	this.item = function(k){
+		return items[k];
+	};
+
+	this.remove = function(k){
+		delete items[k];
+		build();
+		this.count = q.length;
+	};
+	this.removeAt = function(i){
+		delete items[q[i].key];
+		build();
+		this.count = q.length;
+	};
+
+	this.setByIndex = function(i,o){
+		items[q[i].key].value = o;
+	};
+}

Added: portals/jetspeed-2/trunk/applications/j2-admin/src/webapp/dojo/src/collections/Stack.js
URL: http://svn.apache.org/viewcvs/portals/jetspeed-2/trunk/applications/j2-admin/src/webapp/dojo/src/collections/Stack.js?rev=354516&view=auto
==============================================================================
--- portals/jetspeed-2/trunk/applications/j2-admin/src/webapp/dojo/src/collections/Stack.js (added)
+++ portals/jetspeed-2/trunk/applications/j2-admin/src/webapp/dojo/src/collections/Stack.js Tue Dec  6 11:29:56 2005
@@ -0,0 +1,41 @@
+dojo.provide("dojo.collections.Stack");
+dojo.require("dojo.collections.Collections");
+
+dojo.collections.Stack = function(arr){
+	var q = [];
+	if (arr) q = q.concat(arr);
+	this.count = q.length;
+	this.clear = function(){
+		q = [];
+		this.count = q.length;
+	};
+	this.clone = function(){
+		return new dojo.collections.Stack(q);
+	};
+	this.contains = function(o){
+		for (var i = 0; i < q.length; i++){
+			if (q[i] == o) return true;
+		}
+		return false;
+	};
+	this.copyTo = function(arr, i){
+		arr.splice(i,0,q);
+	};
+	this.getIterator = function(){
+		return new dojo.collections.Iterator(q);
+	};
+	this.peek = function(){
+		return q[(q.length - 1)];
+	};
+	this.pop = function(){
+		var r = q.pop();
+		this.count = q.length;
+		return r;
+	};
+	this.push = function(o){
+		this.count = q.push(o);
+	};
+	this.toArray = function(){
+		return [].concat(q);
+	};
+}

Added: portals/jetspeed-2/trunk/applications/j2-admin/src/webapp/dojo/src/collections/__package__.js
URL: http://svn.apache.org/viewcvs/portals/jetspeed-2/trunk/applications/j2-admin/src/webapp/dojo/src/collections/__package__.js?rev=354516&view=auto
==============================================================================
--- portals/jetspeed-2/trunk/applications/j2-admin/src/webapp/dojo/src/collections/__package__.js (added)
+++ portals/jetspeed-2/trunk/applications/j2-admin/src/webapp/dojo/src/collections/__package__.js Tue Dec  6 11:29:56 2005
@@ -0,0 +1,12 @@
+dojo.hostenv.conditionalLoadModule({
+	common: [
+		"dojo.collections.Collections",
+		"dojo.collections.SortedList", 
+		"dojo.collections.Dictionary", 
+		"dojo.collections.Queue", 
+		"dojo.collections.ArrayList", 
+		"dojo.collections.Stack",
+		"dojo.collections.Set"
+	]
+});
+dojo.hostenv.moduleLoaded("dojo.collections.*");

Added: portals/jetspeed-2/trunk/applications/j2-admin/src/webapp/dojo/src/crypto.js
URL: http://svn.apache.org/viewcvs/portals/jetspeed-2/trunk/applications/j2-admin/src/webapp/dojo/src/crypto.js?rev=354516&view=auto
==============================================================================
--- portals/jetspeed-2/trunk/applications/j2-admin/src/webapp/dojo/src/crypto.js (added)
+++ portals/jetspeed-2/trunk/applications/j2-admin/src/webapp/dojo/src/crypto.js Tue Dec  6 11:29:56 2005
@@ -0,0 +1,83 @@
+dojo.provide("dojo.crypto");
+
+dojo.crypto.toBase64 = function (data){
+	if (typeof(data) == "string") data = this.toByteArray(data) ;
+	var base64Enc = ['A', 'B', 'C', 'D', 'E', 'F', 'G', 'H', 'I', 'J', 'K', 'L', 'M', 'N', 'O', 'P', 'Q', 'R', 'S', 'T', 'U', 'V', 'W', 'X', 'Y', 'Z', 'a', 'b', 'c', 'd', 'e', 'f', 'g', 'h', 'i', 'j', 'k', 'l', 'm', 'n', 'o', 'p', 'q', 'r', 's', 't', 'u', 'v', 'w', 'x', 'y', 'z', '0', '1', '2', '3', '4', '5', '6', '7', '8', '9', '+', '/', '=' ];
+	var PADDING_CHAR = 64;		// index of padding char
+	var output = [] ;			// total output
+	var oc = 0;					// index accumulator for output
+	var len	= data.length;
+	for (var i = 0; i < len;) {
+		var now  = data[i++] << 16;	
+		now |= data[i++] << 8;	
+		now |= data[i++];	
+		output[oc++] = base64Enc[now >>> 18 & 63]; 	// 23..18
+		output[oc++] = base64Enc[now >>> 12 & 63]; 	// 17..12
+		output[oc++] = base64Enc[now >>> 6  & 63]; 	// 11..6
+		output[oc++] = base64Enc[now        & 63]; 	// 5..0
+	}
+	var padAmount = i - len;
+	if (padAmount > 0)  oc -= padAmount; 
+	padAmount = Math.abs(padAmount);	// how much to pad
+	while (padAmount-- > 0) output[oc++] = base64Enc[PADDING_CHAR];
+	return output.join("");
+}
+
+dojo.crypto.fromBase64 = function (data){
+	if (typeof(data) == "string") data = data.split("") ;
+	var base64Dec = { 'A': 0, 'B': 1, 'C': 2, 'D': 3, 'E': 4, 'F': 5, 'G': 6, 'H': 7, 'I': 8, 'J': 9, 'K':10, 'L':11, 'M':12, 'N':13, 'O':14, 'P':15, 'Q':16, 'R':17, 'S':18, 'T':19, 'U':20, 'V':21, 'W':22, 'X':23, 'Y':24, 'Z':25, 'a':26, 'b':27, 'c':28, 'd':29, 'e':30, 'f':31, 'g':32, 'h':33, 'i':34, 'j':35, 'k':36, 'l':37, 'm':38, 'n':39, 'o':40, 'p':41, 'q':42, 'r':43, 's':44, 't':45, 'u':46, 'v':47, 'w':48, 'x':49, 'y':50, 'z':51, '0':52, '1':53, '2':54, '3':55, '4':56, '5':57, '6':58, '7':59, '8':60, '9':61, '+':62, '/':63, '=':64 };
+	var PADDING_CHAR = 64;		// index of padding char
+	var output = [] ;			// total output
+	var oc = 0;					// index accumulator for input
+	var len = data.length;		// 0..len-1
+	while (data[--len] == base64Dec[PADDING_CHAR]) { /* nothing */ };
+	for (var i = 0; i < len; /* nothing */ ) {	
+		var now = base64Dec[data[i++]] << 18;	// 23..18
+		now    |= base64Dec[data[i++]] << 12;	// 17..12
+		now    |= base64Dec[data[i++]] << 6;	// 11..5
+		now    |= base64Dec[data[i++]];		// 5..0
+		output[oc++] = now >>> 16 & 255; 	// 23..16
+		output[oc++] = now >>> 8  & 255; 	// 15..8
+		output[oc++] = now        & 255; 	// 7..0
+	}
+	return output ;
+}
+
+dojo.crypto.toByteArray = function(data){
+	var bin=[] ;
+	for (var i=0; i<data.length; i++){
+		bin.push(data.charCodeAt(i));
+	}
+	return bin;
+}
+
+dojo.crypto.fromByteArray = function(data){
+	var s=[];
+	for (var i=0; i<data.length; i++){
+		s.push(String.fromCharCode(data[i]));
+	}
+	return s.join("");
+}
+
+dojo.crypto.toDWordArray = function(data){
+	var chrsz=8 ;
+	var bin=[] ;
+	var mask=(1<<chrsz)-1;
+	for (var i=0; i<data.length*chrsz; i+=chrsz){
+		bin[i>>5]|=(data.charCodeAt(i/chrsz)&mask)<<(i%32);
+	}
+	return bin;
+}
+
+dojo.crypto.fromDWordArray = function(data){
+	var chrsz=8;
+	var s=[];
+	var mask = (1 << chrsz) - 1;
+	for (var i=0; i<data.length*32; i+=chrsz){
+		s.push(String.fromCharCode((data[i>>5]>>>(i%32))&mask));
+	}
+	while(s[s.length-1] == "\x00"){
+		s.pop();
+	}
+	return s.join("");
+}

Added: portals/jetspeed-2/trunk/applications/j2-admin/src/webapp/dojo/src/crypto/Blowfish.js
URL: http://svn.apache.org/viewcvs/portals/jetspeed-2/trunk/applications/j2-admin/src/webapp/dojo/src/crypto/Blowfish.js?rev=354516&view=auto
==============================================================================
--- portals/jetspeed-2/trunk/applications/j2-admin/src/webapp/dojo/src/crypto/Blowfish.js (added)
+++ portals/jetspeed-2/trunk/applications/j2-admin/src/webapp/dojo/src/crypto/Blowfish.js Tue Dec  6 11:29:56 2005
@@ -0,0 +1,281 @@
+dojo.require("dojo.crypto");
+dojo.provide("dojo.crypto.Blowfish");
+
+dojo.crypto.Blowfish = new function(){
+	var nRounds=16;
+	var boxes = {
+		p:[
+			0x243f6a88, 0x85a308d3, 0x13198a2e, 0x03707344, 0xa4093822, 0x299f31d0, 0x082efa98, 0xec4e6c89, 
+			0x452821e6, 0x38d01377, 0xbe5466cf, 0x34e90c6c, 0xc0ac29b7, 0xc97c50dd, 0x3f84d5b5, 0xb5470917, 
+			0x9216d5d9, 0x8979fb1b
+		],
+		s0:[
+			0xd1310ba6, 0x98dfb5ac, 0x2ffd72db, 0xd01adfb7, 0xb8e1afed, 0x6a267e96, 0xba7c9045, 0xf12c7f99,
+			0x24a19947, 0xb3916cf7, 0x0801f2e2, 0x858efc16, 0x636920d8, 0x71574e69, 0xa458fea3, 0xf4933d7e,
+			0x0d95748f, 0x728eb658, 0x718bcd58, 0x82154aee, 0x7b54a41d, 0xc25a59b5, 0x9c30d539, 0x2af26013,
+			0xc5d1b023, 0x286085f0, 0xca417918, 0xb8db38ef, 0x8e79dcb0, 0x603a180e, 0x6c9e0e8b, 0xb01e8a3e,
+			0xd71577c1, 0xbd314b27, 0x78af2fda, 0x55605c60, 0xe65525f3, 0xaa55ab94, 0x57489862, 0x63e81440,
+			0x55ca396a, 0x2aab10b6, 0xb4cc5c34, 0x1141e8ce, 0xa15486af, 0x7c72e993, 0xb3ee1411, 0x636fbc2a,
+			0x2ba9c55d, 0x741831f6, 0xce5c3e16, 0x9b87931e, 0xafd6ba33, 0x6c24cf5c, 0x7a325381, 0x28958677,
+			0x3b8f4898, 0x6b4bb9af, 0xc4bfe81b, 0x66282193, 0x61d809cc, 0xfb21a991, 0x487cac60, 0x5dec8032,
+			0xef845d5d, 0xe98575b1, 0xdc262302, 0xeb651b88, 0x23893e81, 0xd396acc5, 0x0f6d6ff3, 0x83f44239,
+			0x2e0b4482, 0xa4842004, 0x69c8f04a, 0x9e1f9b5e, 0x21c66842, 0xf6e96c9a, 0x670c9c61, 0xabd388f0,
+			0x6a51a0d2, 0xd8542f68, 0x960fa728, 0xab5133a3, 0x6eef0b6c, 0x137a3be4, 0xba3bf050, 0x7efb2a98, 
+			0xa1f1651d, 0x39af0176, 0x66ca593e, 0x82430e88, 0x8cee8619, 0x456f9fb4, 0x7d84a5c3, 0x3b8b5ebe, 
+			0xe06f75d8, 0x85c12073, 0x401a449f, 0x56c16aa6, 0x4ed3aa62, 0x363f7706, 0x1bfedf72, 0x429b023d, 
+			0x37d0d724, 0xd00a1248, 0xdb0fead3, 0x49f1c09b, 0x075372c9, 0x80991b7b, 0x25d479d8, 0xf6e8def7,
+			0xe3fe501a, 0xb6794c3b, 0x976ce0bd, 0x04c006ba, 0xc1a94fb6, 0x409f60c4, 0x5e5c9ec2, 0x196a2463,
+			0x68fb6faf, 0x3e6c53b5, 0x1339b2eb, 0x3b52ec6f, 0x6dfc511f, 0x9b30952c, 0xcc814544, 0xaf5ebd09,
+			0xbee3d004, 0xde334afd, 0x660f2807, 0x192e4bb3, 0xc0cba857, 0x45c8740f, 0xd20b5f39, 0xb9d3fbdb, 
+			0x5579c0bd, 0x1a60320a, 0xd6a100c6, 0x402c7279, 0x679f25fe, 0xfb1fa3cc, 0x8ea5e9f8, 0xdb3222f8, 
+			0x3c7516df, 0xfd616b15, 0x2f501ec8, 0xad0552ab, 0x323db5fa, 0xfd238760, 0x53317b48, 0x3e00df82, 
+			0x9e5c57bb, 0xca6f8ca0, 0x1a87562e, 0xdf1769db, 0xd542a8f6, 0x287effc3, 0xac6732c6, 0x8c4f5573, 
+			0x695b27b0, 0xbbca58c8, 0xe1ffa35d, 0xb8f011a0, 0x10fa3d98, 0xfd2183b8, 0x4afcb56c, 0x2dd1d35b,
+			0x9a53e479, 0xb6f84565, 0xd28e49bc, 0x4bfb9790, 0xe1ddf2da, 0xa4cb7e33, 0x62fb1341, 0xcee4c6e8, 
+			0xef20cada, 0x36774c01, 0xd07e9efe, 0x2bf11fb4, 0x95dbda4d, 0xae909198, 0xeaad8e71, 0x6b93d5a0,
+			0xd08ed1d0, 0xafc725e0, 0x8e3c5b2f, 0x8e7594b7, 0x8ff6e2fb, 0xf2122b64, 0x8888b812, 0x900df01c, 
+			0x4fad5ea0, 0x688fc31c, 0xd1cff191, 0xb3a8c1ad, 0x2f2f2218, 0xbe0e1777, 0xea752dfe, 0x8b021fa1,
+			0xe5a0cc0f, 0xb56f74e8, 0x18acf3d6, 0xce89e299, 0xb4a84fe0, 0xfd13e0b7, 0x7cc43b81, 0xd2ada8d9,
+			0x165fa266, 0x80957705, 0x93cc7314, 0x211a1477, 0xe6ad2065, 0x77b5fa86, 0xc75442f5, 0xfb9d35cf,
+			0xebcdaf0c, 0x7b3e89a0, 0xd6411bd3, 0xae1e7e49, 0x00250e2d, 0x2071b35e, 0x226800bb, 0x57b8e0af,
+			0x2464369b, 0xf009b91e, 0x5563911d, 0x59dfa6aa, 0x78c14389, 0xd95a537f, 0x207d5ba2, 0x02e5b9c5,
+			0x83260376, 0x6295cfa9, 0x11c81968, 0x4e734a41, 0xb3472dca, 0x7b14a94a, 0x1b510052, 0x9a532915,
+			0xd60f573f, 0xbc9bc6e4, 0x2b60a476, 0x81e67400, 0x08ba6fb5, 0x571be91f, 0xf296ec6b, 0x2a0dd915,
+			0xb6636521, 0xe7b9f9b6, 0xff34052e, 0xc5855664, 0x53b02d5d, 0xa99f8fa1, 0x08ba4799, 0x6e85076a
+		],
+		s1:[
+			0x4b7a70e9, 0xb5b32944, 0xdb75092e, 0xc4192623, 0xad6ea6b0, 0x49a7df7d, 0x9cee60b8, 0x8fedb266,
+			0xecaa8c71, 0x699a17ff, 0x5664526c, 0xc2b19ee1, 0x193602a5, 0x75094c29, 0xa0591340, 0xe4183a3e,
+			0x3f54989a, 0x5b429d65, 0x6b8fe4d6, 0x99f73fd6, 0xa1d29c07, 0xefe830f5, 0x4d2d38e6, 0xf0255dc1,
+			0x4cdd2086, 0x8470eb26, 0x6382e9c6, 0x021ecc5e, 0x09686b3f, 0x3ebaefc9, 0x3c971814, 0x6b6a70a1,
+			0x687f3584, 0x52a0e286, 0xb79c5305, 0xaa500737, 0x3e07841c, 0x7fdeae5c, 0x8e7d44ec, 0x5716f2b8,
+			0xb03ada37, 0xf0500c0d, 0xf01c1f04, 0x0200b3ff, 0xae0cf51a, 0x3cb574b2, 0x25837a58, 0xdc0921bd,
+			0xd19113f9, 0x7ca92ff6, 0x94324773, 0x22f54701, 0x3ae5e581, 0x37c2dadc, 0xc8b57634, 0x9af3dda7,
+			0xa9446146, 0x0fd0030e, 0xecc8c73e, 0xa4751e41, 0xe238cd99, 0x3bea0e2f, 0x3280bba1, 0x183eb331, 
+			0x4e548b38, 0x4f6db908, 0x6f420d03, 0xf60a04bf, 0x2cb81290, 0x24977c79, 0x5679b072, 0xbcaf89af, 
+			0xde9a771f, 0xd9930810, 0xb38bae12, 0xdccf3f2e, 0x5512721f, 0x2e6b7124, 0x501adde6, 0x9f84cd87,
+			0x7a584718, 0x7408da17, 0xbc9f9abc, 0xe94b7d8c, 0xec7aec3a, 0xdb851dfa, 0x63094366, 0xc464c3d2, 
+			0xef1c1847, 0x3215d908, 0xdd433b37, 0x24c2ba16, 0x12a14d43, 0x2a65c451, 0x50940002, 0x133ae4dd,
+			0x71dff89e, 0x10314e55, 0x81ac77d6, 0x5f11199b, 0x043556f1, 0xd7a3c76b, 0x3c11183b, 0x5924a509, 
+			0xf28fe6ed, 0x97f1fbfa, 0x9ebabf2c, 0x1e153c6e, 0x86e34570, 0xeae96fb1, 0x860e5e0a, 0x5a3e2ab3, 
+			0x771fe71c, 0x4e3d06fa, 0x2965dcb9, 0x99e71d0f, 0x803e89d6, 0x5266c825, 0x2e4cc978, 0x9c10b36a,
+			0xc6150eba, 0x94e2ea78, 0xa5fc3c53, 0x1e0a2df4, 0xf2f74ea7, 0x361d2b3d, 0x1939260f, 0x19c27960, 
+			0x5223a708, 0xf71312b6, 0xebadfe6e, 0xeac31f66, 0xe3bc4595, 0xa67bc883, 0xb17f37d1, 0x018cff28,
+			0xc332ddef, 0xbe6c5aa5, 0x65582185, 0x68ab9802, 0xeecea50f, 0xdb2f953b, 0x2aef7dad, 0x5b6e2f84, 
+			0x1521b628, 0x29076170, 0xecdd4775, 0x619f1510, 0x13cca830, 0xeb61bd96, 0x0334fe1e, 0xaa0363cf,
+			0xb5735c90, 0x4c70a239, 0xd59e9e0b, 0xcbaade14, 0xeecc86bc, 0x60622ca7, 0x9cab5cab, 0xb2f3846e, 
+			0x648b1eaf, 0x19bdf0ca, 0xa02369b9, 0x655abb50, 0x40685a32, 0x3c2ab4b3, 0x319ee9d5, 0xc021b8f7, 
+			0x9b540b19, 0x875fa099, 0x95f7997e, 0x623d7da8, 0xf837889a, 0x97e32d77, 0x11ed935f, 0x16681281, 
+			0x0e358829, 0xc7e61fd6, 0x96dedfa1, 0x7858ba99, 0x57f584a5, 0x1b227263, 0x9b83c3ff, 0x1ac24696,
+			0xcdb30aeb, 0x532e3054, 0x8fd948e4, 0x6dbc3128, 0x58ebf2ef, 0x34c6ffea, 0xfe28ed61, 0xee7c3c73,
+			0x5d4a14d9, 0xe864b7e3, 0x42105d14, 0x203e13e0, 0x45eee2b6, 0xa3aaabea, 0xdb6c4f15, 0xfacb4fd0, 
+			0xc742f442, 0xef6abbb5, 0x654f3b1d, 0x41cd2105, 0xd81e799e, 0x86854dc7, 0xe44b476a, 0x3d816250,
+			0xcf62a1f2, 0x5b8d2646, 0xfc8883a0, 0xc1c7b6a3, 0x7f1524c3, 0x69cb7492, 0x47848a0b, 0x5692b285,
+			0x095bbf00, 0xad19489d, 0x1462b174, 0x23820e00, 0x58428d2a, 0x0c55f5ea, 0x1dadf43e, 0x233f7061,
+			0x3372f092, 0x8d937e41, 0xd65fecf1, 0x6c223bdb, 0x7cde3759, 0xcbee7460, 0x4085f2a7, 0xce77326e,
+			0xa6078084, 0x19f8509e, 0xe8efd855, 0x61d99735, 0xa969a7aa, 0xc50c06c2, 0x5a04abfc, 0x800bcadc,
+			0x9e447a2e, 0xc3453484, 0xfdd56705, 0x0e1e9ec9, 0xdb73dbd3, 0x105588cd, 0x675fda79, 0xe3674340,
+			0xc5c43465, 0x713e38d8, 0x3d28f89e, 0xf16dff20, 0x153e21e7, 0x8fb03d4a, 0xe6e39f2b, 0xdb83adf7
+		],
+		s2:[
+			0xe93d5a68, 0x948140f7, 0xf64c261c, 0x94692934, 0x411520f7, 0x7602d4f7, 0xbcf46b2e, 0xd4a20068,
+			0xd4082471, 0x3320f46a, 0x43b7d4b7, 0x500061af, 0x1e39f62e, 0x97244546, 0x14214f74, 0xbf8b8840,
+			0x4d95fc1d, 0x96b591af, 0x70f4ddd3, 0x66a02f45, 0xbfbc09ec, 0x03bd9785, 0x7fac6dd0, 0x31cb8504,
+			0x96eb27b3, 0x55fd3941, 0xda2547e6, 0xabca0a9a, 0x28507825, 0x530429f4, 0x0a2c86da, 0xe9b66dfb,
+			0x68dc1462, 0xd7486900, 0x680ec0a4, 0x27a18dee, 0x4f3ffea2, 0xe887ad8c, 0xb58ce006, 0x7af4d6b6,
+			0xaace1e7c, 0xd3375fec, 0xce78a399, 0x406b2a42, 0x20fe9e35, 0xd9f385b9, 0xee39d7ab, 0x3b124e8b,
+			0x1dc9faf7, 0x4b6d1856, 0x26a36631, 0xeae397b2, 0x3a6efa74, 0xdd5b4332, 0x6841e7f7, 0xca7820fb,
+			0xfb0af54e, 0xd8feb397, 0x454056ac, 0xba489527, 0x55533a3a, 0x20838d87, 0xfe6ba9b7, 0xd096954b,
+			0x55a867bc, 0xa1159a58, 0xcca92963, 0x99e1db33, 0xa62a4a56, 0x3f3125f9, 0x5ef47e1c, 0x9029317c,
+			0xfdf8e802, 0x04272f70, 0x80bb155c, 0x05282ce3, 0x95c11548, 0xe4c66d22, 0x48c1133f, 0xc70f86dc,
+			0x07f9c9ee, 0x41041f0f, 0x404779a4, 0x5d886e17, 0x325f51eb, 0xd59bc0d1, 0xf2bcc18f, 0x41113564,
+			0x257b7834, 0x602a9c60, 0xdff8e8a3, 0x1f636c1b, 0x0e12b4c2, 0x02e1329e, 0xaf664fd1, 0xcad18115,
+			0x6b2395e0, 0x333e92e1, 0x3b240b62, 0xeebeb922, 0x85b2a20e, 0xe6ba0d99, 0xde720c8c, 0x2da2f728,
+			0xd0127845, 0x95b794fd, 0x647d0862, 0xe7ccf5f0, 0x5449a36f, 0x877d48fa, 0xc39dfd27, 0xf33e8d1e,
+			0x0a476341, 0x992eff74, 0x3a6f6eab, 0xf4f8fd37, 0xa812dc60, 0xa1ebddf8, 0x991be14c, 0xdb6e6b0d,
+			0xc67b5510, 0x6d672c37, 0x2765d43b, 0xdcd0e804, 0xf1290dc7, 0xcc00ffa3, 0xb5390f92, 0x690fed0b,
+			0x667b9ffb, 0xcedb7d9c, 0xa091cf0b, 0xd9155ea3, 0xbb132f88, 0x515bad24, 0x7b9479bf, 0x763bd6eb,
+			0x37392eb3, 0xcc115979, 0x8026e297, 0xf42e312d, 0x6842ada7, 0xc66a2b3b, 0x12754ccc, 0x782ef11c,
+			0x6a124237, 0xb79251e7, 0x06a1bbe6, 0x4bfb6350, 0x1a6b1018, 0x11caedfa, 0x3d25bdd8, 0xe2e1c3c9,
+			0x44421659, 0x0a121386, 0xd90cec6e, 0xd5abea2a, 0x64af674e, 0xda86a85f, 0xbebfe988, 0x64e4c3fe,
+			0x9dbc8057, 0xf0f7c086, 0x60787bf8, 0x6003604d, 0xd1fd8346, 0xf6381fb0, 0x7745ae04, 0xd736fccc, 
+			0x83426b33, 0xf01eab71, 0xb0804187, 0x3c005e5f, 0x77a057be, 0xbde8ae24, 0x55464299, 0xbf582e61,
+			0x4e58f48f, 0xf2ddfda2, 0xf474ef38, 0x8789bdc2, 0x5366f9c3, 0xc8b38e74, 0xb475f255, 0x46fcd9b9,
+			0x7aeb2661, 0x8b1ddf84, 0x846a0e79, 0x915f95e2, 0x466e598e, 0x20b45770, 0x8cd55591, 0xc902de4c, 
+			0xb90bace1, 0xbb8205d0, 0x11a86248, 0x7574a99e, 0xb77f19b6, 0xe0a9dc09, 0x662d09a1, 0xc4324633, 
+			0xe85a1f02, 0x09f0be8c, 0x4a99a025, 0x1d6efe10, 0x1ab93d1d, 0x0ba5a4df, 0xa186f20f, 0x2868f169, 
+			0xdcb7da83, 0x573906fe, 0xa1e2ce9b, 0x4fcd7f52, 0x50115e01, 0xa70683fa, 0xa002b5c4, 0x0de6d027, 
+			0x9af88c27, 0x773f8641, 0xc3604c06, 0x61a806b5, 0xf0177a28, 0xc0f586e0, 0x006058aa, 0x30dc7d62,
+			0x11e69ed7, 0x2338ea63, 0x53c2dd94, 0xc2c21634, 0xbbcbee56, 0x90bcb6de, 0xebfc7da1, 0xce591d76,
+			0x6f05e409, 0x4b7c0188, 0x39720a3d, 0x7c927c24, 0x86e3725f, 0x724d9db9, 0x1ac15bb4, 0xd39eb8fc, 
+			0xed545578, 0x08fca5b5, 0xd83d7cd3, 0x4dad0fc4, 0x1e50ef5e, 0xb161e6f8, 0xa28514d9, 0x6c51133c,
+			0x6fd5c7e7, 0x56e14ec4, 0x362abfce, 0xddc6c837, 0xd79a3234, 0x92638212, 0x670efa8e, 0x406000e0
+		],
+		s3:[
+			0x3a39ce37, 0xd3faf5cf, 0xabc27737, 0x5ac52d1b, 0x5cb0679e, 0x4fa33742, 0xd3822740, 0x99bc9bbe,
+			0xd5118e9d, 0xbf0f7315, 0xd62d1c7e, 0xc700c47b, 0xb78c1b6b, 0x21a19045, 0xb26eb1be, 0x6a366eb4,
+			0x5748ab2f, 0xbc946e79, 0xc6a376d2, 0x6549c2c8, 0x530ff8ee, 0x468dde7d, 0xd5730a1d, 0x4cd04dc6, 
+			0x2939bbdb, 0xa9ba4650, 0xac9526e8, 0xbe5ee304, 0xa1fad5f0, 0x6a2d519a, 0x63ef8ce2, 0x9a86ee22,
+			0xc089c2b8, 0x43242ef6, 0xa51e03aa, 0x9cf2d0a4, 0x83c061ba, 0x9be96a4d, 0x8fe51550, 0xba645bd6, 
+			0x2826a2f9, 0xa73a3ae1, 0x4ba99586, 0xef5562e9, 0xc72fefd3, 0xf752f7da, 0x3f046f69, 0x77fa0a59, 
+			0x80e4a915, 0x87b08601, 0x9b09e6ad, 0x3b3ee593, 0xe990fd5a, 0x9e34d797, 0x2cf0b7d9, 0x022b8b51,
+			0x96d5ac3a, 0x017da67d, 0xd1cf3ed6, 0x7c7d2d28, 0x1f9f25cf, 0xadf2b89b, 0x5ad6b472, 0x5a88f54c, 
+			0xe029ac71, 0xe019a5e6, 0x47b0acfd, 0xed93fa9b, 0xe8d3c48d, 0x283b57cc, 0xf8d56629, 0x79132e28, 
+			0x785f0191, 0xed756055, 0xf7960e44, 0xe3d35e8c, 0x15056dd4, 0x88f46dba, 0x03a16125, 0x0564f0bd, 
+			0xc3eb9e15, 0x3c9057a2, 0x97271aec, 0xa93a072a, 0x1b3f6d9b, 0x1e6321f5, 0xf59c66fb, 0x26dcf319,
+			0x7533d928, 0xb155fdf5, 0x03563482, 0x8aba3cbb, 0x28517711, 0xc20ad9f8, 0xabcc5167, 0xccad925f, 
+			0x4de81751, 0x3830dc8e, 0x379d5862, 0x9320f991, 0xea7a90c2, 0xfb3e7bce, 0x5121ce64, 0x774fbe32, 
+			0xa8b6e37e, 0xc3293d46, 0x48de5369, 0x6413e680, 0xa2ae0810, 0xdd6db224, 0x69852dfd, 0x09072166, 
+			0xb39a460a, 0x6445c0dd, 0x586cdecf, 0x1c20c8ae, 0x5bbef7dd, 0x1b588d40, 0xccd2017f, 0x6bb4e3bb,
+			0xdda26a7e, 0x3a59ff45, 0x3e350a44, 0xbcb4cdd5, 0x72eacea8, 0xfa6484bb, 0x8d6612ae, 0xbf3c6f47,
+			0xd29be463, 0x542f5d9e, 0xaec2771b, 0xf64e6370, 0x740e0d8d, 0xe75b1357, 0xf8721671, 0xaf537d5d, 
+			0x4040cb08, 0x4eb4e2cc, 0x34d2466a, 0x0115af84, 0xe1b00428, 0x95983a1d, 0x06b89fb4, 0xce6ea048,
+			0x6f3f3b82, 0x3520ab82, 0x011a1d4b, 0x277227f8, 0x611560b1, 0xe7933fdc, 0xbb3a792b, 0x344525bd, 
+			0xa08839e1, 0x51ce794b, 0x2f32c9b7, 0xa01fbac9, 0xe01cc87e, 0xbcc7d1f6, 0xcf0111c3, 0xa1e8aac7, 
+			0x1a908749, 0xd44fbd9a, 0xd0dadecb, 0xd50ada38, 0x0339c32a, 0xc6913667, 0x8df9317c, 0xe0b12b4f, 
+			0xf79e59b7, 0x43f5bb3a, 0xf2d519ff, 0x27d9459c, 0xbf97222c, 0x15e6fc2a, 0x0f91fc71, 0x9b941525, 
+			0xfae59361, 0xceb69ceb, 0xc2a86459, 0x12baa8d1, 0xb6c1075e, 0xe3056a0c, 0x10d25065, 0xcb03a442,
+			0xe0ec6e0e, 0x1698db3b, 0x4c98a0be, 0x3278e964, 0x9f1f9532, 0xe0d392df, 0xd3a0342b, 0x8971f21e, 
+			0x1b0a7441, 0x4ba3348c, 0xc5be7120, 0xc37632d8, 0xdf359f8d, 0x9b992f2e, 0xe60b6f47, 0x0fe3f11d,
+			0xe54cda54, 0x1edad891, 0xce6279cf, 0xcd3e7e6f, 0x1618b166, 0xfd2c1d05, 0x848fd2c5, 0xf6fb2299, 
+			0xf523f357, 0xa6327623, 0x93a83531, 0x56cccd02, 0xacf08162, 0x5a75ebb5, 0x6e163697, 0x88d273cc, 
+			0xde966292, 0x81b949d0, 0x4c50901b, 0x71c65614, 0xe6c6c7bd, 0x327a140a, 0x45e1d006, 0xc3f27b9a, 
+			0xc9aa53fd, 0x62a80f00, 0xbb25bfe2, 0x35bdd2f6, 0x71126905, 0xb2040222, 0xb6cbcf7c, 0xcd769c2b, 
+			0x53113ec0, 0x1640e3d3, 0x38abbd60, 0x2547adf0, 0xba38209c, 0xf746ce76, 0x77afa1c5, 0x20756060,
+			0x85cbfe4e, 0x8ae88dd8, 0x7aaaf9b0, 0x4cf9aa7e, 0x1948c25c, 0x02fb8a8c, 0x01c36ae4, 0xd6ebe1f9,
+			0x90d4f869, 0xa65cdea0, 0x3f09252d, 0xc208e69f, 0xb74e6132, 0xce77e25b, 0x578fdfe3, 0x3ac372e6
+		]
+	}
+
+	function r(x, box){
+		return add(add(box.s0[(x>>>24)&0xff], box.s1[(x>>>16)&0xff])^box.s2[(x>>>8)&0xff],box.s3[x&0xff]);
+	}
+	function add(a, b){
+		var n=(a&0xffff)+(b&0xffff);
+		return ((a>>16)+(b>>16)+(n>>16)<<16)|(n&0xffff);
+	}
+	function parseLongAt(s, i){
+		return s.charCodeAt(i<<2)
+			+ (s.charCodeAt((i<<2)+1)<<8)
+			+ (s.charCodeAt((i<<2)+2)<<16)
+			+ (s.charCodeAt((i<<2)+3)<<24);
+	}
+	function getBlock(s){
+		return {left:parseLongAt(s,0), right:parseLongAt(s,1)};
+	}
+	function fromBlock(o){
+		return String.fromCharCode(
+			o.left&0xff, (o.left>>>8)&0xff, (o.left>>>16)&0xff, (o.left>>>24)&0xff, 
+			o.right&0xff, (o.right>>>8)&0xff, (o.right>>>16)&0xff, (o.right>>>24)&0xff
+		);
+	}
+	
+	function initialize(key){
+		var box = { p:[], s0:[], s1:[], s2:[], s3:[] };
+		for(var i=0; i<boxes.p.length; i++) box.p.push(boxes.p[i]);
+		for(var i=0; i<boxes.s0.length; i++) box.s0.push(boxes.s0[i]);
+		for(var i=0; i<boxes.s1.length; i++) box.s1.push(boxes.s1[i]);
+		for(var i=0; i<boxes.s2.length; i++) box.s2.push(boxes.s2[i]);
+		for(var i=0; i<boxes.s3.length; i++) box.s3.push(boxes.s3[i]);
+
+		var pos=0;
+		var data = 0x00000000;
+		for(var i=0; i<nRounds+2; i++){
+			data = ((data<<8)&0xffffffff)|parseLongAt(key,pos);
+			pos++;
+			if(pos>=key.length) pos=0;
+			box.p[i]^=data;
+		}
+		var res={ left:0x00000000, right:0x00000000 };
+		for(var i=0; i<nRounds+2; i+=2){
+			encryptBlock(res, box);
+			box.p[i]=res.left;
+			box.p[i+1]=res.right;
+		}
+		for (var i=0; i<4; i++){
+			for(var j=0; j<256; j+=2){
+				encryptBlock(res, box);
+				box["s"+i][j]=res.left;
+				box["s"+i][j+1]=res.right;
+			}
+		}
+		return box;
+	}
+
+	function encryptBlock(o, box){
+		o.left^=box.p[0];
+		o.right^=r(o.left,box) ^box.p[1];
+		o.left ^=r(o.right,box)^box.p[2];
+		o.right^=r(o.left,box) ^box.p[3];
+		o.left ^=r(o.right,box)^box.p[4];
+		o.right^=r(o.left,box) ^box.p[5];
+		o.left ^=r(o.right,box)^box.p[6];
+		o.right^=r(o.left,box) ^box.p[7];
+		o.left ^=r(o.right,box)^box.p[8];
+		o.right^=r(o.left,box) ^box.p[9];
+		o.left ^=r(o.right,box)^box.p[10];
+		o.right^=r(o.left,box) ^box.p[11];
+		o.left ^=r(o.right,box)^box.p[12];
+		o.right^=r(o.left,box) ^box.p[13];
+		o.left ^=r(o.right,box)^box.p[14];
+		o.right^=r(o.left,box) ^box.p[15];
+		o.left ^=r(o.right,box);
+
+		var left=o.right^box.p[17];
+		var right=o.left^box.p[16];
+		o.left=left;
+		o.right=right;
+	}
+
+	function decryptBlock(o, box){
+		o.left ^=box.p[17];
+		o.right^=r(o.left,box) ^box.p[16];
+		o.left ^=r(o.right,box)^box.p[15];
+		o.right^=r(o.left,box) ^box.p[14];
+		o.left ^=r(o.right,box)^box.p[13];
+		o.right^=r(o.left,box) ^box.p[12];
+		o.left ^=r(o.right,box)^box.p[11];
+		o.right^=r(o.left,box) ^box.p[10];
+		o.left ^=r(o.right,box)^box.p[9];
+		o.right^=r(o.left,box) ^box.p[8];
+		o.left ^=r(o.right,box)^box.p[7];
+		o.right^=r(o.left,box) ^box.p[6];
+		o.left ^=r(o.right,box)^box.p[5];
+		o.right^=r(o.left,box) ^box.p[4];
+		o.left ^=r(o.right,box)^box.p[3];
+		o.right^=r(o.left,box) ^box.p[2];
+		o.left ^=r(o.right,box);
+
+		var left = o.right^box.p[0];
+		var right= o.left^box.p[1];
+		o.left=left;
+		o.right=right;
+	};
+
+	this.encrypt = function(plaintext, key){
+		var bx = initialize(key);
+		var ciphertext="";
+		//	fixme: double check to make sure the following uses the right chars for padding in other langs.
+		var padding = 8 - (plaintext.length & 7);
+		for (var i=0; i<padding; i++) plaintext+=String.fromCharCode(padding);
+		for(var i=0; i<plaintext.length; i+=8){
+			var o=getBlock(plaintext.substr(i,8));
+			encryptBlock(o, bx);
+			ciphertext+=fromBlock(o);
+		}
+		return ciphertext;
+	};
+
+	this.decrypt = function(ciphertext, key){
+		var bx = initialize(key);
+		var plaintext="";
+		var l=ciphertext.length;
+		for(var i=0; i<l; i+=8){
+			var o=getBlock(ciphertext.substr(i,8));
+			decryptBlock(o, bx);
+			plaintext+=fromBlock(o);
+		}
+		// fixme: double check to make sure this is part of the original def.
+		return plaintext.substr(0,l-(ciphertext.charCodeAt(l-1)));
+	};
+}();

Added: portals/jetspeed-2/trunk/applications/j2-admin/src/webapp/dojo/src/crypto/MD5.js
URL: http://svn.apache.org/viewcvs/portals/jetspeed-2/trunk/applications/j2-admin/src/webapp/dojo/src/crypto/MD5.js?rev=354516&view=auto
==============================================================================
--- portals/jetspeed-2/trunk/applications/j2-admin/src/webapp/dojo/src/crypto/MD5.js (added)
+++ portals/jetspeed-2/trunk/applications/j2-admin/src/webapp/dojo/src/crypto/MD5.js Tue Dec  6 11:29:56 2005
@@ -0,0 +1,168 @@
+dojo.require("dojo.crypto");
+dojo.provide("dojo.crypto.MD5");
+
+//	rewritten based entirely on RFC 1321, with word functions borrowed from Paul Johnstone.
+//	compute will return a Base64 encoded string.
+dojo.crypto.MD5 = new function(){
+	function decode(data){
+		var chrsz=8 ;
+		var bin=[] ;
+		var mask=(1<<chrsz)-1;
+		for (var i=0; i<data.length*chrsz; i+=chrsz){
+			bin[i>>5]|=(data.charCodeAt(i/chrsz)&mask)<<(i%32);
+		}
+		return bin;
+	}
+
+	//	encode
+	function encodeBase64(ba){
+		var tab = "ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789+/";
+		var s = "";
+		for(var i=0; i<ba.length*4; i+=3){
+			var t = (((ba[i>>2]>>8*(i%4))&0xFF)<<16)
+				|(((ba[i+1>>2]>>8*((i+1)%4))&0xFF)<<8)
+				|((ba[i+2>>2]>>8*((i+2)%4))&0xFF);
+			for(var j=0; j<4; j++){
+				if(i*8+j*6>ba.length*32) s+="=";
+				else s+=tab.charAt((t>>6*(3-j))&0x3F);
+			}
+		}
+		return s;
+	}
+
+	//	rounds functions.
+	function add(x,y){
+		var lsw = (x & 0xFFFF) + (y & 0xFFFF);
+		var msw = (x >> 16) + (y >> 16) + (lsw >> 16);
+		return (msw << 16) | (lsw & 0xFFFF);
+	}
+	function RL(x, n){ return ((x<<n)|(x>>(32-n))); }
+	function RR(x, n){ return ((x>>n)|(x<<(32-n))); }
+	function F(x, y, z){ return (x & y)|(~x & z); }
+	function G(x, y, z){ return (x & z)|(y & ~z); }
+	function H(x, y, z){ return x ^ y ^ z; }
+	function I(x, y, z){ return y ^ (x | ~z); }
+	function FF(a, b, c, d, x, s, ac){
+		a = add(a,add(add(F(b, c, d),x),ac));
+		return add(RL(a,s),b);
+	}
+	function GG(a, b, c, d, x, s, ac){
+		a = add(a,add(add(G(b, c, d),x),ac));
+		return add(RL(a,s),b);
+	}
+	function HH(a, b, c, d, x, s, ac){
+		a = add(a,add(add(H(b, c, d),x),ac));
+		return add(RL(a,s),b);
+	}
+	function II(a, b, c, d, x, s, ac){
+		a = add(a,add(add(I(b, c, d),x),ac));
+		return add(RL(a,s),b);
+	}
+
+	this.compute = function(data, bDoNotEncode){
+		var state = [ 0x67452301, 0xefcdab89, 0x98badcfe, 0x10325476 ];
+		var t = data.split("");
+		var len = data.length;
+		
+		//	pad the data to congruent to 448 bits, mod 512
+		var padTo = ((Math.floor(len/64)+1)*64)-8;
+		t.push(String.fromCharCode(8));
+		while(t.length < padTo) t.push(String.fromCharCode(0));
+		
+		//	now convert the length to 2 32 byte words and append.
+		var rep = "0000000000000000" + len.toString(16);
+		rep = rep.substr(rep.length-16, 16);
+		for (var i=0; i<rep.length; i+=2) {
+			t.push(rep.substr(i,2));
+		}
+		data = t.join("");
+		var x = decode(data);
+
+		//	do the digest.
+		var a = state[0];
+		var b = state[1];
+		var c = state[2];
+		var d = state[3];
+
+		for(var i=0; i<x.length; i+=16){
+			/* Round 1 */
+			a = FF(a, b, c, d, x[i+ 0],  7, 0xd76aa478); /* 1 */
+			d = FF(d, a, b, c, x[i+ 1], 12, 0xe8c7b756); /* 2 */
+			c = FF(c, d, a, b, x[i+ 2], 17, 0x242070db); /* 3 */
+			b = FF(b, c, d, a, x[i+ 3], 22, 0xc1bdceee); /* 4 */
+			a = FF(a, b, c, d, x[i+ 4],  7, 0xf57c0faf); /* 5 */
+			d = FF(d, a, b, c, x[i+ 5], 12, 0x4787c62a); /* 6 */
+			c = FF(c, d, a, b, x[i+ 6], 17, 0xa8304613); /* 7 */
+			b = FF(b, c, d, a, x[i+ 7], 22, 0xfd469501); /* 8 */
+			a = FF(a, b, c, d, x[i+ 8],  7, 0x698098d8); /* 9 */
+			d = FF(d, a, b, c, x[i+ 9], 12, 0x8b44f7af); /* 10 */
+			c = FF(c, d, a, b, x[i+10], 17, 0xffff5bb1); /* 11 */
+			b = FF(b, c, d, a, x[i+11], 22, 0x895cd7be); /* 12 */
+			a = FF(a, b, c, d, x[i+12],  7, 0x6b901122); /* 13 */
+			d = FF(d, a, b, c, x[i+13], 12, 0xfd987193); /* 14 */
+			c = FF(c, d, a, b, x[i+14], 17, 0xa679438e); /* 15 */
+			b = FF(b, c, d, a, x[i+15], 22, 0x49b40821); /* 16 */
+
+			/* Round 2 */
+			a = GG(a, b, c, d, x[i+ 1],  5, 0xf61e2562); /* 17 */
+			d = GG(d, a, b, c, x[i+ 6],  9, 0xc040b340); /* 18 */
+			c = GG(c, d, a, b, x[i+11], 14, 0x265e5a51); /* 19 */
+			b = GG(b, c, d, a, x[i+ 0], 20, 0xe9b6c7aa); /* 20 */
+			a = GG(a, b, c, d, x[i+ 5],  5, 0xd62f105d); /* 21 */
+			d = GG(d, a, b, c, x[i+10],  9,  0x2441453); /* 22 */
+			c = GG(c, d, a, b, x[i+15], 14, 0xd8a1e681); /* 23 */
+			b = GG(b, c, d, a, x[i+ 4], 20, 0xe7d3fbc8); /* 24 */
+			a = GG(a, b, c, d, x[i+ 9],  5, 0x21e1cde6); /* 25 */
+			d = GG(d, a, b, c, x[i+14],  9, 0xc33707d6); /* 26 */
+			c = GG(c, d, a, b, x[i+ 3], 14, 0xf4d50d87); /* 27 */
+			b = GG(b, c, d, a, x[i+ 8], 20, 0x455a14ed); /* 28 */
+			a = GG(a, b, c, d, x[i+13],  5, 0xa9e3e905); /* 29 */
+			d = GG(d, a, b, c, x[i+ 2],  9, 0xfcefa3f8); /* 30 */
+			c = GG(c, d, a, b, x[i+ 7], 14, 0x676f02d9); /* 31 */
+			b = GG(b, c, d, a, x[i+12], 20, 0x8d2a4c8a); /* 32 */
+
+			/* Round 3 */
+			a = HH(a, b, c, d, x[i+ 5],  4, 0xfffa3942); /* 33 */
+			d = HH(d, a, b, c, x[i+ 8], 11, 0x8771f681); /* 34 */
+			c = HH(c, d, a, b, x[i+11], 16, 0x6d9d6122); /* 35 */
+			b = HH(b, c, d, a, x[i+14], 23, 0xfde5380c); /* 36 */
+			a = HH(a, b, c, d, x[i+ 1],  4, 0xa4beea44); /* 37 */
+			d = HH(d, a, b, c, x[i+ 4], 11, 0x4bdecfa9); /* 38 */
+			c = HH(c, d, a, b, x[i+ 7], 16, 0xf6bb4b60); /* 39 */
+			b = HH(b, c, d, a, x[i+10], 23, 0xbebfbc70); /* 40 */
+			a = HH(a, b, c, d, x[i+13],  4, 0x289b7ec6); /* 41 */
+			d = HH(d, a, b, c, x[i+ 0], 11, 0xeaa127fa); /* 42 */
+			c = HH(c, d, a, b, x[i+ 3], 16, 0xd4ef3085); /* 43 */
+			b = HH(b, c, d, a, x[i+ 6], 23,  0x4881d05); /* 44 */
+			a = HH(a, b, c, d, x[i+ 9],  4, 0xd9d4d039); /* 45 */
+			d = HH(d, a, b, c, x[i+12], 11, 0xe6db99e5); /* 46 */
+			c = HH(c, d, a, b, x[i+15], 16, 0x1fa27cf8); /* 47 */
+			b = HH(b, c, d, a, x[i+ 2], 23, 0xc4ac5665); /* 48 */
+
+			/* Round 4 */
+			a = II(a, b, c, d, x[i+ 0],  6, 0xf4292244); /* 49 */
+			d = II(d, a, b, c, x[i+ 7], 10, 0x432aff97); /* 50 */
+			c = II(c, d, a, b, x[i+14], 15, 0xab9423a7); /* 51 */
+			b = II(b, c, d, a, x[i+ 5], 21, 0xfc93a039); /* 52 */
+			a = II(a, b, c, d, x[i+12],  6, 0x655b59c3); /* 53 */
+			d = II(d, a, b, c, x[i+ 3], 10, 0x8f0ccc92); /* 54 */
+			c = II(c, d, a, b, x[i+10], 15, 0xffeff47d); /* 55 */
+			b = II(b, c, d, a, x[i+ 1], 21, 0x85845dd1); /* 56 */
+			a = II(a, b, c, d, x[i+ 8],  6, 0x6fa87e4f); /* 57 */
+			d = II(d, a, b, c, x[i+15], 10, 0xfe2ce6e0); /* 58 */
+			c = II(c, d, a, b, x[i+ 6], 15, 0xa3014314); /* 59 */
+			b = II(b, c, d, a, x[i+13], 21, 0x4e0811a1); /* 60 */
+			a = II(a, b, c, d, x[i+ 4],  6, 0xf7537e82); /* 61 */
+			d = II(d, a, b, c, x[i+11], 10, 0xbd3af235); /* 62 */
+			c = II(c, d, a, b, x[i+ 2], 15, 0x2ad7d2bb); /* 63 */
+			b = II(b, c, d, a, x[i+ 9], 21, 0xeb86d391); /* 64 */
+
+			state[0] = add(state[0],a);
+			state[1] = add(state[1],b);
+			state[2] = add(state[2],c);
+			state[3] = add(state[3],d);
+		}
+		if (bDoNotEncode) return state;
+		return encodeBase64(state);
+	}
+}();

Added: portals/jetspeed-2/trunk/applications/j2-admin/src/webapp/dojo/src/crypto/Rijndael.js
URL: http://svn.apache.org/viewcvs/portals/jetspeed-2/trunk/applications/j2-admin/src/webapp/dojo/src/crypto/Rijndael.js?rev=354516&view=auto
==============================================================================
--- portals/jetspeed-2/trunk/applications/j2-admin/src/webapp/dojo/src/crypto/Rijndael.js (added)
+++ portals/jetspeed-2/trunk/applications/j2-admin/src/webapp/dojo/src/crypto/Rijndael.js Tue Dec  6 11:29:56 2005
@@ -0,0 +1,11 @@
+dojo.provide("dojo.crypto.Rijndael");
+dojo.require("dojo.crypto");
+
+dojo.crypto.Rijndael = new function(){
+	this.encrypt=function(plaintext, key){
+	};
+	this.decrypt=function(ciphertext, key){
+	};
+}();
+
+dojo.crypto.AES = dojo.crypto.Rijndael;	//	alias

Added: portals/jetspeed-2/trunk/applications/j2-admin/src/webapp/dojo/src/crypto/SHA.js
URL: http://svn.apache.org/viewcvs/portals/jetspeed-2/trunk/applications/j2-admin/src/webapp/dojo/src/crypto/SHA.js?rev=354516&view=auto
==============================================================================
--- portals/jetspeed-2/trunk/applications/j2-admin/src/webapp/dojo/src/crypto/SHA.js (added)
+++ portals/jetspeed-2/trunk/applications/j2-admin/src/webapp/dojo/src/crypto/SHA.js Tue Dec  6 11:29:56 2005
@@ -0,0 +1,7 @@
+dojo.provide("dojo.crypto.SHA");
+dojo.require("dojo.crypto");
+
+dojo.crypto.SHA = new function(){
+	this.compute=function(s){
+	};
+}();

Added: portals/jetspeed-2/trunk/applications/j2-admin/src/webapp/dojo/src/crypto/SHA256.js
URL: http://svn.apache.org/viewcvs/portals/jetspeed-2/trunk/applications/j2-admin/src/webapp/dojo/src/crypto/SHA256.js?rev=354516&view=auto
==============================================================================
--- portals/jetspeed-2/trunk/applications/j2-admin/src/webapp/dojo/src/crypto/SHA256.js (added)
+++ portals/jetspeed-2/trunk/applications/j2-admin/src/webapp/dojo/src/crypto/SHA256.js Tue Dec  6 11:29:56 2005
@@ -0,0 +1,7 @@
+dojo.provide("dojo.crypto.SHA256");
+dojo.require("dojo.crypto");
+
+dojo.crypto.SHA256 = new function(){
+	this.compute=function(s){
+	};
+}();

Added: portals/jetspeed-2/trunk/applications/j2-admin/src/webapp/dojo/src/crypto/__package__.js
URL: http://svn.apache.org/viewcvs/portals/jetspeed-2/trunk/applications/j2-admin/src/webapp/dojo/src/crypto/__package__.js?rev=354516&view=auto
==============================================================================
--- portals/jetspeed-2/trunk/applications/j2-admin/src/webapp/dojo/src/crypto/__package__.js (added)
+++ portals/jetspeed-2/trunk/applications/j2-admin/src/webapp/dojo/src/crypto/__package__.js Tue Dec  6 11:29:56 2005
@@ -0,0 +1,7 @@
+dojo.hostenv.conditionalLoadModule({
+	common: [
+		"dojo.crypto",
+		"dojo.crypto.MD5"
+	]
+});
+dojo.hostenv.moduleLoaded("dojo.crypto.*");

Added: portals/jetspeed-2/trunk/applications/j2-admin/src/webapp/dojo/src/data.js
URL: http://svn.apache.org/viewcvs/portals/jetspeed-2/trunk/applications/j2-admin/src/webapp/dojo/src/data.js?rev=354516&view=auto
==============================================================================
--- portals/jetspeed-2/trunk/applications/j2-admin/src/webapp/dojo/src/data.js (added)
+++ portals/jetspeed-2/trunk/applications/j2-admin/src/webapp/dojo/src/data.js Tue Dec  6 11:29:56 2005
@@ -0,0 +1,5 @@
+dojo.provide("dojo.data");
+
+// currently a stub for dojo.data
+
+dojo.data = {};

Added: portals/jetspeed-2/trunk/applications/j2-admin/src/webapp/dojo/src/data/__package__.js
URL: http://svn.apache.org/viewcvs/portals/jetspeed-2/trunk/applications/j2-admin/src/webapp/dojo/src/data/__package__.js?rev=354516&view=auto
==============================================================================
--- portals/jetspeed-2/trunk/applications/j2-admin/src/webapp/dojo/src/data/__package__.js (added)
+++ portals/jetspeed-2/trunk/applications/j2-admin/src/webapp/dojo/src/data/__package__.js Tue Dec  6 11:29:56 2005
@@ -0,0 +1,4 @@
+dojo.hostenv.conditionalLoadModule({
+	common: ["dojo.data"]
+});
+dojo.hostenv.moduleLoaded("dojo.data.*");

Added: portals/jetspeed-2/trunk/applications/j2-admin/src/webapp/dojo/src/date.js
URL: http://svn.apache.org/viewcvs/portals/jetspeed-2/trunk/applications/j2-admin/src/webapp/dojo/src/date.js?rev=354516&view=auto
==============================================================================
--- portals/jetspeed-2/trunk/applications/j2-admin/src/webapp/dojo/src/date.js (added)
+++ portals/jetspeed-2/trunk/applications/j2-admin/src/webapp/dojo/src/date.js Tue Dec  6 11:29:56 2005
@@ -0,0 +1,231 @@
+dojo.provide("dojo.date");
+
+/**
+ * Sets the current Date object to the time given in an ISO 8601 date/time
+ * stamp
+ *
+ * @param string The date/time formted as an ISO 8601 string
+ */
+dojo.date.setIso8601 = function (dateObject, string) {
+	var comps = string.split('T');
+	dojo.date.setIso8601Date(dateObject, comps[0]);
+	if (comps.length == 2) { dojo.date.setIso8601Time(dateObject, comps[1]); }
+	return dateObject;
+}
+
+dojo.date.fromIso8601 = function (string) {
+	return dojo.date.setIso8601(new Date(0), string);
+}
+
+/**
+ * Sets the current Date object to the date given in an ISO 8601 date
+ * stamp. The time is left unchanged.
+ *
+ * @param string The date formted as an ISO 8601 string
+ */
+dojo.date.setIso8601Date = function (dateObject, string) {
+	var regexp = "^([0-9]{4})((-?([0-9]{2})(-?([0-9]{2}))?)|" +
+			"(-?([0-9]{3}))|(-?W([0-9]{2})(-?([1-7]))?))?$";
+	var d = string.match(new RegExp(regexp));
+
+	var year = d[1];
+	var month = d[4];
+	var date = d[6];
+	var dayofyear = d[8];
+	var week = d[10];
+	var dayofweek = (d[12]) ? d[12] : 1;
+
+	dateObject.setYear(year);
+	
+	if (dayofyear) { dojo.date.setDayOfYear(dateObject, Number(dayofyear)); }
+	else if (week) {
+		dateObject.setMonth(0);
+		dateObject.setDate(1);
+		var gd = dateObject.getDay();
+		var day =  (gd) ? gd : 7;
+		var offset = Number(dayofweek) + (7 * Number(week));
+		
+		if (day <= 4) { dateObject.setDate(offset + 1 - day); }
+		else { dateObject.setDate(offset + 8 - day); }
+	} else {
+		if (month) { dateObject.setMonth(month - 1); }
+		if (date) { dateObject.setDate(date); }
+	}
+	
+	return dateObject;
+}
+
+dojo.date.fromIso8601Date = function (string) {
+	return dojo.date.setIso8601Date(new Date(0), string);
+}
+
+/**
+ * Sets the current Date object to the date given in an ISO 8601 time
+ * stamp. The date is left unchanged.
+ *
+ * @param string The time formted as an ISO 8601 string
+ */
+dojo.date.setIso8601Time = function (dateObject, string) {
+	// first strip timezone info from the end
+	var timezone = "Z|(([-+])([0-9]{2})(:?([0-9]{2}))?)$";
+	var d = string.match(new RegExp(timezone));
+
+	var offset = 0; // local time if no tz info
+	if (d) {
+		if (d[0] != 'Z') {
+			offset = (Number(d[3]) * 60) + Number(d[5]);
+			offset *= ((d[2] == '-') ? 1 : -1);
+		}
+		offset -= dateObject.getTimezoneOffset()
+		string = string.substr(0, string.length - d[0].length);
+	}
+
+	// then work out the time
+	var regexp = "^([0-9]{2})(:?([0-9]{2})(:?([0-9]{2})(\.([0-9]+))?)?)?$";
+	var d = string.match(new RegExp(regexp));
+
+	var hours = d[1];
+	var mins = Number((d[3]) ? d[3] : 0) + offset;
+	var secs = (d[5]) ? d[5] : 0;
+	var ms = d[7] ? (Number("0." + d[7]) * 1000) : 0;
+
+	dateObject.setHours(hours);
+	dateObject.setMinutes(mins);
+	dateObject.setSeconds(secs);
+	dateObject.setMilliseconds(ms);
+	
+	return dateObject;
+}
+
+dojo.date.fromIso8601Time = function (string) {
+	return dojo.date.setIso8601Time(new Date(0), string);
+}
+
+/**
+ * Sets the date to the day of year
+ *
+ * @param date The day of year
+ */
+dojo.date.setDayOfYear = function (dateObject, dayofyear) {
+	dateObject.setMonth(0);
+	dateObject.setDate(dayofyear);
+}
+
+/**
+ * Retrieves the day of the year the Date is set to.
+ *
+ * @return The day of the year
+ */
+dojo.date.getDayOfYear = function (dateObject) {
+	var tmpdate = new Date(0);
+	tmpdate.setMonth(dateObject.getMonth());
+	tmpdate.setDate(dateObject.getDate());
+	return Number(tmpdate) / 86400000; // # milliseconds in a day
+}
+
+
+/**
+ * Returns the number of days in the given month. Leap years are accounted
+ * for.
+ *
+ * @param month The month
+ * @param year  The year
+ * @return The number of days in the given month
+ */
+dojo.date.daysInMonth = function (month, year) {
+	/*
+	 * Leap years are years with an additional day YYYY-02-29, where the year
+	 * number is a multiple of four with the following exception: If a year
+	 * is a multiple of 100, then it is only a leap year if it is also a
+	 * multiple of 400. For example, 1900 was not a leap year, but 2000 is one.
+	 */
+	var days = [31, 28, 31, 30, 31, 30, 31, 31, 30, 31, 30, 31];
+	if (month == 1 && year) {
+		if ((!(year % 4) && (year % 100)) ||
+			(!(year % 4) && !(year % 100) && !(year % 400))) { return 29; }
+		else { return 28; }
+	} else { return days[month]; }
+}
+
+dojo.date.months = ["January", "February", "March", "April", "May", "June",
+	"July", "August", "September", "October", "November", "December"];
+dojo.date.shortMonths = ["Jan", "Feb", "Mar", "Apr", "May", "June", "July", "Aug", "Sep", "Oct", "Nov", "Dec"];
+dojo.date.days = ["Sunday", "Monday", "Tuesday", "Wednesday", "Thursday", "Friday", "Saturday"];
+dojo.date.shortDays = ["Sun", "Mon", "Tues", "Wed", "Thur", "Fri", "Sat"];
+
+/**
+ *
+ * Returns a string of the date in the version "January 1, 2004"
+ *
+ * @param date The date object
+ */
+dojo.date.toLongDateString = function(date) {
+	return dojo.date.months[date.getMonth()] + " " + date.getDate() + ", " + date.getFullYear();
+}
+
+/**
+ *
+ * Returns a string of the date in the version "Jan 1, 2004"
+ *
+ * @param date The date object
+ */
+dojo.date.toShortDateString = function(date) {
+	return dojo.date.shortMonths[date.getMonth()] + " " + date.getDate() + ", " + date.getFullYear();
+}
+
+/**
+ *
+ * Returns military formatted time
+ *
+ * @param date the date object
+ */
+dojo.date.toMilitaryTimeString = function(date){
+	var h = "00" + date.getHours();
+	var m = "00" + date.getMinutes();
+	var s = "00" + date.getSeconds();
+	return h.substr(h.length-2,2) + ":" + m.substr(m.length-2,2) + ":" + s.substr(s.length-2,2);
+}
+
+/**
+ *
+ * Returns a string of the date relative to the current date.
+ *
+ * @param date The date object
+ *
+ * Example returns:
+ * - "1 minute ago"
+ * - "4 minutes ago"
+ * - "Yesterday"
+ * - "2 days ago"
+ */
+dojo.date.toRelativeString = function(date) {
+	var now = new Date();
+	var diff = (now - date) / 1000;
+	var end = " ago";
+	var future = false;
+	if(diff < 0) {
+		future = true;
+		end = " from now";
+		diff = -diff;
+	}
+
+	if(diff < 60) {
+		diff = Math.round(diff);
+		return diff + " second" + (diff == 1 ? "" : "s") + end;
+	} else if(diff < 3600) {
+		diff = Math.round(diff/60);
+		return diff + " minute" + (diff == 1 ? "" : "s") + end;
+	} else if(diff < 3600*24 && date.getDay() == now.getDay()) {
+		diff = Math.round(diff/3600);
+		return diff + " hour" + (diff == 1 ? "" : "s") + end;
+	} else if(diff < 3600*24*7) {
+		diff = Math.round(diff/(3600*24));
+		if(diff == 1) {
+			return future ? "Tomorrow" : "Yesterday";
+		} else {
+			return diff + " days" + end;
+		}
+	} else {
+		return dojo.date.toShortDateString(date);
+	}
+}

Added: portals/jetspeed-2/trunk/applications/j2-admin/src/webapp/dojo/src/dnd/DragAndDrop.js
URL: http://svn.apache.org/viewcvs/portals/jetspeed-2/trunk/applications/j2-admin/src/webapp/dojo/src/dnd/DragAndDrop.js?rev=354516&view=auto
==============================================================================
--- portals/jetspeed-2/trunk/applications/j2-admin/src/webapp/dojo/src/dnd/DragAndDrop.js (added)
+++ portals/jetspeed-2/trunk/applications/j2-admin/src/webapp/dojo/src/dnd/DragAndDrop.js Tue Dec  6 11:29:56 2005
@@ -0,0 +1,130 @@
+dojo.require("dojo.lang");
+dojo.provide("dojo.dnd.DragSource");
+dojo.provide("dojo.dnd.DropTarget");
+dojo.provide("dojo.dnd.DragObject");
+dojo.provide("dojo.dnd.DragManager");
+dojo.provide("dojo.dnd.DragAndDrop");
+
+dojo.dnd.DragSource = function(){
+	dojo.dnd.dragManager.registerDragSource(this);
+}
+
+dojo.lang.extend(dojo.dnd.DragSource, {
+	type: "",
+	
+	onDragEnd: function(){
+	},
+	
+	onDragStart: function(){
+	},
+
+	unregister: function(){
+		dojo.dnd.dragManager.unregisterDragSource(this);
+	},
+
+	reregister: function(){
+		dojo.dnd.dragManager.registerDragSource(this);
+	}
+});
+
+dojo.dnd.DragObject = function(){
+	dojo.dnd.dragManager.registerDragObject(this);
+}
+
+dojo.lang.extend(dojo.dnd.DragObject, {
+	type: "",
+	
+	onDragStart: function(){
+		// gets called directly after being created by the DragSource
+		// default action is to clone self as icon
+	},
+	
+	onDragMove: function(){
+		// this changes the UI for the drag icon
+		//	"it moves itself"
+	},
+
+	onDragOver: function(){
+	},
+	
+	onDragOut: function(){
+	},
+	
+	onDragEnd: function(){
+	},
+
+	// normal aliases
+	onDragLeave: this.onDragOut,
+	onDragEnter: this.onDragOver,
+
+	// non-camel aliases
+	ondragout: this.onDragOut,
+	ondragover: this.onDragOver
+});
+
+dojo.dnd.DropTarget = function(){
+	if (this.constructor == dojo.dnd.DropTarget) { return; } // need to be subclassed
+	dojo.dnd.dragManager.registerDropTarget(this);
+}
+
+dojo.lang.extend(dojo.dnd.DropTarget, {
+	acceptedTypes: [],
+
+	onDragOver: function(){
+	},
+	
+	onDragOut: function(){
+	},
+	
+	onDragMove: function(){
+	},
+	
+	onDrop: function(){
+	}
+});
+
+// NOTE: this interface is defined here for the convenience of the DragManager
+// implementor. It is expected that in most cases it will be satisfied by
+// extending a native event (DOM event in HTML and SVG).
+dojo.dnd.DragEvent = function(){
+	this.dragSource = null;
+	this.dragObject = null;
+	this.target = null;
+	this.eventStatus = "success"; 
+	//
+	// can be one of:
+	//	[	"dropSuccess", "dropFailure", "dragMove", 
+	//		"dragStart", "dragEnter", "dragLeave"]
+	//
+}
+
+dojo.dnd.DragManager = function(){
+	/* 
+	 *	The DragManager handles listening for low-level events and dispatching
+	 *	them to higher-level primitives like drag sources and drop targets. In
+	 *	order to do this, it must keep a list of the items.
+	 */
+}
+
+dojo.lang.extend(dojo.dnd.DragManager, {
+	selectedSources: [],
+	dragObjects: [],
+	dragSources: [],
+	registerDragSource: function(){},
+	dropTargets: [],
+	registerDropTarget: function(){},
+	lastDragTarget: null,
+	currentDragTarget: null,
+	onKeyDown: function(){},
+	onMouseOut: function(){},
+	onMouseMove: function(){},
+	onMouseUp: function(){}
+});
+
+// NOTE: despite the existance of the DragManager class, there will be a
+// singleton drag manager provided by the renderer-specific D&D support code.
+// It is therefore sane for us to assign instance variables to the DragManager
+// prototype
+
+// The renderer-specific file will define the following object:
+dojo.dnd.dragManager = null;

Added: portals/jetspeed-2/trunk/applications/j2-admin/src/webapp/dojo/src/dnd/HtmlDragAndDrop.js
URL: http://svn.apache.org/viewcvs/portals/jetspeed-2/trunk/applications/j2-admin/src/webapp/dojo/src/dnd/HtmlDragAndDrop.js?rev=354516&view=auto
==============================================================================
--- portals/jetspeed-2/trunk/applications/j2-admin/src/webapp/dojo/src/dnd/HtmlDragAndDrop.js (added)
+++ portals/jetspeed-2/trunk/applications/j2-admin/src/webapp/dojo/src/dnd/HtmlDragAndDrop.js Tue Dec  6 11:29:56 2005
@@ -0,0 +1,257 @@
+/* Copyright (c) 2004-2005 The Dojo Foundation, Licensed under the Academic Free License version 2.1 or above */dojo.provide("dojo.dnd.HtmlDragAndDrop");
+dojo.provide("dojo.dnd.HtmlDragSource");
+dojo.provide("dojo.dnd.HtmlDropTarget");
+dojo.provide("dojo.dnd.HtmlDragObject");
+dojo.require("dojo.dnd.HtmlDragManager");
+dojo.require("dojo.animation.*");
+dojo.require("dojo.dom");
+dojo.require("dojo.style");
+dojo.require("dojo.html");
+dojo.require("dojo.lang");
+
+dojo.dnd.HtmlDragSource = function(node, type){
+	if(node){
+		this.domNode = node;
+		this.dragObject = node;
+
+		// register us
+		dojo.dnd.DragSource.call(this);
+
+		// set properties that might have been clobbered by the mixin
+		this.type = type||this.domNode.nodeName.toLowerCase();
+	}
+}
+
+dojo.lang.extend(dojo.dnd.HtmlDragSource, {
+	onDragStart: function(){
+		return new dojo.dnd.HtmlDragObject(this.dragObject, this.type);
+	},
+	setDragHandle: function(node){
+		dojo.dnd.dragManager.unregisterDragSource(this);
+		this.domNode = node;
+		dojo.dnd.dragManager.registerDragSource(this);
+	},
+	setDragTarget: function(node){
+		this.dragObject = node;
+	}
+});
+
+dojo.dnd.HtmlDragObject = function(node, type){
+	this.type = type;
+	this.domNode = node;
+}
+
+dojo.lang.extend(dojo.dnd.HtmlDragObject, {  
+	/**
+	 * Creates a clone of this node and replaces this node with the clone in the
+	 * DOM tree. This is done to prevent the browser from selecting the textual
+	 * content of the node. This node is then set to opaque and drags around as
+	 * the intermediate representation.
+	 */
+	onDragStart: function (e){
+		dojo.html.clearSelection();
+		
+		this.scrollOffset = {
+			top: dojo.html.getScrollTop(), // document.documentElement.scrollTop,
+			left: dojo.html.getScrollLeft() // document.documentElement.scrollLeft
+		};
+	
+		this.dragStartPosition = {top: dojo.style.getAbsoluteY(this.domNode, true) + this.scrollOffset.top,
+			left: dojo.style.getAbsoluteX(this.domNode, true) + this.scrollOffset.left};
+		
+		this.dragOffset = {top: this.dragStartPosition.top - e.clientY,
+			left: this.dragStartPosition.left - e.clientX};
+
+		this.dragClone = this.domNode.cloneNode(true);
+		//this.domNode.parentNode.replaceChild(this.dragClone, this.domNode);
+		
+		// set up for dragging
+		with(this.dragClone.style){
+			position = "absolute";
+			top = this.dragOffset.top + e.clientY + "px";
+			left = this.dragOffset.left + e.clientX + "px";
+		}
+		dojo.style.setOpacity(this.dragClone, 0.5);
+		dojo.html.body().appendChild(this.dragClone);
+	},
+
+	updateDragOffset: function() {
+		var sTop = dojo.html.getScrollTop(); // document.documentElement.scrollTop;
+		var sLeft = dojo.html.getScrollLeft(); // document.documentElement.scrollLeft;
+		if(sTop != this.scrollOffset.top) {
+			var diff = sTop - this.scrollOffset.top;
+			this.dragOffset.top += diff;
+			this.scrollOffset.top = sTop;
+		}
+	},
+	
+	/** Moves the node to follow the mouse */
+	onDragMove: function (e) {
+		this.dragClone.style.top = this.dragOffset.top + e.clientY + "px";
+		this.dragClone.style.left = this.dragOffset.left + e.clientX + "px";
+	},
+
+	/**
+	 * If the drag operation returned a success we reomve the clone of
+	 * ourself from the original position. If the drag operation returned
+	 * failure we slide back over to where we came from and end the operation
+	 * with a little grace.
+	 */
+	onDragEnd: function(e){
+		switch(e.dragStatus){
+
+			case "dropSuccess":
+				dojo.dom.removeNode(this.dragClone);
+				this.dragClone = null;
+				break;
+		
+			case "dropFailure": // slide back to the start
+				var startCoords = [dojo.style.getAbsoluteX(this.dragClone), 
+							dojo.style.getAbsoluteY(this.dragClone)];
+				// offset the end so the effect can be seen
+				var endCoords = [this.dragStartPosition.left + 1,
+					this.dragStartPosition.top + 1];
+	
+				// animate
+				var line = new dojo.math.curves.Line(startCoords, endCoords);
+				var anim = new dojo.animation.Animation(line, 300, 0, 0);
+				var dragObject = this;
+				dojo.event.connect(anim, "onAnimate", function(e) {
+					dragObject.dragClone.style.left = e.x + "px";
+					dragObject.dragClone.style.top = e.y + "px";
+				});
+				dojo.event.connect(anim, "onEnd", function (e) {
+					// pause for a second (not literally) and disappear
+					dojo.lang.setTimeout(dojo.dom.removeNode, 200,
+						dragObject.dragClone);
+				});
+				anim.play();
+				break;
+		}
+	}
+});
+
+dojo.dnd.HtmlDropTarget = function(node, types){
+	if (arguments.length == 0) { return; }
+	this.domNode = node;
+	dojo.dnd.DropTarget.call(this);
+	this.acceptedTypes = types || [];
+}
+dojo.inherits(dojo.dnd.HtmlDropTarget, dojo.dnd.DropTarget);
+
+dojo.lang.extend(dojo.dnd.HtmlDropTarget, {  
+	onDragOver: function(e){
+		if (!dojo.lang.inArray(this.acceptedTypes, "*")) { // wildcard
+			for (var i = 0; i < e.dragObjects.length; i++) {
+				if (!dojo.lang.inArray(this.acceptedTypes,
+					e.dragObjects[i].type)) { return false; }
+			}
+		}
+		
+		// cache the positions of the child nodes
+		this.childBoxes = [];
+		for (var i = 0, child; i < this.domNode.childNodes.length; i++) {
+			child = this.domNode.childNodes[i];
+			if (child.nodeType != dojo.dom.ELEMENT_NODE) { continue; }
+			var top = dojo.style.getAbsoluteY(child);
+			var bottom = top + dojo.style.getInnerHeight(child);
+			var left = dojo.style.getAbsoluteX(child);
+			var right = left + dojo.style.getInnerWidth(child);
+			this.childBoxes.push({top: top, bottom: bottom,
+				left: left, right: right, node: child});
+		}
+		
+		// TODO: use dummy node
+		
+		return true;
+	},
+	
+	_getNodeUnderMouse: function (e) {
+		var mousex = e.pageX || e.clientX + dojo.html.body().scrollLeft;
+		var mousey = e.pageY || e.clientY + dojo.html.body().scrollTop;
+
+		// find the child
+		for (var i = 0, child; i < this.childBoxes.length; i++) {
+			with (this.childBoxes[i]) {
+				if (mousex >= left && mousex <= right &&
+					mousey >= top && mousey <= bottom) { return i; }
+			}
+		}
+		
+		return -1;
+	},
+	
+	onDragMove: function(e) {
+		var i = this._getNodeUnderMouse(e);
+		
+		if (!this.dropIndicator) {
+			this.dropIndicator = document.createElement("div");
+			with (this.dropIndicator.style) {
+				position = "absolute";
+				zIndex = 1;
+				borderTopWidth = "1px";
+				borderTopColor = "black";
+				borderTopStyle = "solid";
+				width = dojo.style.getInnerWidth(this.domNode) + "px";
+				left = dojo.style.getAbsoluteX(this.domNode) + "px";
+			}
+		}
+
+		with (this.dropIndicator.style) {
+			if (i < 0) {
+				if (this.childBoxes.length) {
+					top = ((dojo.html.gravity(this.childBoxes[0].node, e) & dojo.html.gravity.NORTH)
+						? this.childBoxes[0].top : this.childBoxes[this.childBoxes.length - 1].bottom) + "px";
+				} else {
+					top = dojo.style.getAbsoluteY(this.domNode) + "px";
+				}
+			} else {
+				var child = this.childBoxes[i];
+				top = ((dojo.html.gravity(child.node, e) & dojo.html.gravity.NORTH)
+					? child.top : child.bottom) + "px";
+			}
+		}
+		
+		if (!this.dropIndicator.parentNode) {
+			dojo.html.body().appendChild(this.dropIndicator);
+		}
+	},
+
+	onDragOut: function(e) {
+		dojo.dom.removeNode(this.dropIndicator);
+		delete this.dropIndicator;
+	},
+	
+	/**
+	 * Inserts the DragObject as a child of this node relative to the
+	 * position of the mouse.
+	 *
+	 * @return true if the DragObject was inserted, false otherwise
+	 */
+	onDrop: function(e){
+		this.onDragOut(e);
+		
+		var i = this._getNodeUnderMouse(e);
+
+		if (i < 0) {
+			if (this.childBoxes.length) {
+				if (dojo.html.gravity(this.childBoxes[0].node, e) & dojo.html.gravity.NORTH) {
+					return dojo.dom.insertBefore(e.dragObject.domNode, 
+						this.childBoxes[0].node);
+				} else {
+					return dojo.dom.insertAfter(e.dragObject.domNode, 
+						this.childBoxes[this.childBoxes.length - 1].node);
+				}
+			}
+			this.domNode.appendChild(e.dragObject.domNode);
+			return	true;
+		}
+		
+		var child = this.childBoxes[i];
+		if (dojo.html.gravity(child.node, e) & dojo.html.gravity.NORTH) {
+			return dojo.dom.insertBefore(e.dragObject.domNode, child.node);
+		} else {
+			return dojo.dom.insertAfter(e.dragObject.domNode, child.node);
+		}
+	}
+});



---------------------------------------------------------------------
To unsubscribe, e-mail: jetspeed-dev-unsubscribe@portals.apache.org
For additional commands, e-mail: jetspeed-dev-help@portals.apache.org


Mime
View raw message