You are viewing a plain text version of this content. The canonical link for it is here.
Posted to dev@struts.apache.org by mr...@apache.org on 2006/04/14 01:47:17 UTC

svn commit: r393978 [15/25] - in /incubator/webwork2/action/src/main/resources/org/apache/struts/action2/static/dojo: ./ demos/ demos/widget/ demos/widget/EditorTree/ demos/widget/EditorTree/static/ demos/widget/Mail/ demos/widget/images/ src/ src/alg/...

Added: incubator/webwork2/action/src/main/resources/org/apache/struts/action2/static/dojo/src/selection.js
URL: http://svn.apache.org/viewcvs/incubator/webwork2/action/src/main/resources/org/apache/struts/action2/static/dojo/src/selection.js?rev=393978&view=auto
==============================================================================
--- incubator/webwork2/action/src/main/resources/org/apache/struts/action2/static/dojo/src/selection.js (added)
+++ incubator/webwork2/action/src/main/resources/org/apache/struts/action2/static/dojo/src/selection.js Thu Apr 13 16:46:55 2006
@@ -0,0 +1,403 @@
+/*
+	Copyright (c) 2004-2005, 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.selection");
+dojo.require("dojo.lang");
+dojo.require("dojo.math");
+
+dojo.selection.Selection = function(items, isCollection) {
+	this.items = [];
+	this.selection = [];
+	this._pivotItems = [];
+	this.clearItems();
+
+	if(items) {
+		if(isCollection) {
+			this.setItemsCollection(items);
+		} else {
+			this.setItems(items);
+		}
+	}
+}
+dojo.lang.extend(dojo.selection.Selection, {
+	items: null, // items to select from, order matters
+
+	selection: null, // items selected, aren't stored in order (see sorted())
+	lastSelected: null, // last item selected
+
+	allowImplicit: true, // if true, grow selection will start from 0th item when nothing is selected
+	length: 0, // number of *selected* items
+
+	_pivotItems: null, // stack of pivot items
+	_pivotItem: null, // item we grow selections from, top of stack
+
+	// event handlers
+	onSelect: function(item) {},
+	onDeselect: function(item) {},
+	onSelectChange: function(item, selected) {},
+
+	_find: function(item, inSelection) {
+		if(inSelection) {
+			return dojo.lang.find(item, this.selection);
+		} else {
+			return dojo.lang.find(item, this.items);
+		}
+	},
+
+	isSelectable: function(item) {
+		// user-customizable, will filter items through this
+		return true;
+	},
+
+	setItems: function(/* ... */) {
+		this.clearItems();
+		this.addItems.call(this, arguments);
+	},
+
+	// this is in case you have an active collection array-like object
+	// (i.e. getElementsByTagName collection) that manages its own order
+	// and item list
+	setItemsCollection: function(collection) {
+		this.items = collection;
+	},
+
+	addItems: function(/* ... */) {
+		var args = dojo.lang.unnest(arguments);
+		for(var i = 0; i < args.length; i++) {
+			this.items.push(args[i]);
+		}
+	},
+
+	addItemsAt: function(item, before /* ... */) {
+		if(this.items.length == 0) { // work for empy case
+			return this.addItems(dojo.lang.toArray(arguments, 2));
+		}
+
+		if(!this.isItem(item)) {
+			item = this.items[item];
+		}
+		if(!item) { throw new Error("addItemsAt: item doesn't exist"); }
+		var idx = this._find(item);
+		if(idx > 0 && before) { idx--; }
+		for(var i = 2; i < arguments.length; i++) {
+			if(!this.isItem(arguments[i])) {
+				this.items.splice(idx++, 0, arguments[i]);
+			}
+		}
+	},
+
+	removeItem: function(item) {
+		// remove item
+		var idx = this._find(item);
+		if(idx > -1) {
+			this.items.splice(i, 1);
+		}
+		// remove from selection
+		// FIXME: do we call deselect? I don't think so because this isn't how
+		// you usually want to deselect an item. For example, if you deleted an
+		// item, you don't really want to deselect it -- you want it gone. -DS
+		id = this._find(item, true);
+		if(idx > -1) {
+			this.selection.splice(i, 1);
+		}
+	},
+
+	clearItems: function() {
+		this.items = [];
+		this.deselectAll();
+	},
+
+	isItem: function(item) {
+		return this._find(item) > -1;
+	},
+
+	isSelected: function(item) {
+		return this._find(item, true) > -1;
+	},
+
+	/**
+	 * allows you to filter item in or out of the selection
+	 * depending on the current selection and action to be taken
+	**/
+	selectFilter: function(item, selection, add, grow) {
+		return true;
+	},
+
+	/**
+	 * update -- manages selections, most selecting should be done here
+	 *  item => item which may be added/grown to/only selected/deselected
+	 *  add => behaves like ctrl in windows selection world
+	 *  grow => behaves like shift
+	 *  noToggle => if true, don't toggle selection on item
+	**/
+	update: function(item, add, grow, noToggle) {
+		if(!this.isItem(item)) { return false; }
+
+		if(grow) {
+			if(!this.isSelected(item)
+				&& this.selectFilter(item, this.selection, false, true)) {
+				this.grow(item);
+				this.lastSelected = item;
+			}
+		} else if(add) {
+			if(this.selectFilter(item, this.selection, true, false)) {
+				if(noToggle) {
+					if(this.select(item)) {
+						this.lastSelected = item;
+					}
+				} else if(this.toggleSelected(item)) {
+					this.lastSelected = item;
+				}
+			}
+		} else {
+			this.deselectAll();
+			this.select(item);
+		}
+
+		this.length = this.selection.length;
+	},
+
+	/**
+	 * Grow a selection.
+	 *  toItem => which item to grow selection to
+	 *  fromItem => which item to start the growth from (it won't be selected)
+	 *
+	 * Any items in (fromItem, lastSelected] that aren't part of
+	 * (fromItem, toItem] will be deselected
+	**/
+	grow: function(toItem, fromItem) {
+		if(arguments.length == 1) {
+			fromItem = this._pivotItem;
+			if(!fromItem && this.allowImplicit) {
+				fromItem = this.items[0];
+			}
+		}
+		if(!toItem || !fromItem) { return false; }
+
+		var fromIdx = this._find(fromItem);
+
+		// get items to deselect (fromItem, lastSelected]
+		var toDeselect = {};
+		var lastIdx = -1;
+		if(this.lastSelected) {
+			lastIdx = this._find(this.lastSelected);
+			var step = fromIdx < lastIdx ? -1 : 1;
+			var range = dojo.math.range(lastIdx, fromIdx, step);
+			for(var i = 0; i < range.length; i++) {
+				toDeselect[range[i]] = true;
+			}
+		}
+
+		// add selection (fromItem, toItem]
+		var toIdx = this._find(toItem);
+		var step = fromIdx < toIdx ? -1 : 1;
+		var shrink = lastIdx >= 0 && step == 1 ? lastIdx < toIdx : lastIdx > toIdx;
+		var range = dojo.math.range(toIdx, fromIdx, step);
+		if(range.length) {
+			for(var i = range.length-1; i >= 0; i--) {
+				var item = this.items[range[i]];
+				if(this.selectFilter(item, this.selection, false, true)) {
+					if(this.select(item, true) || shrink) {
+						this.lastSelected = item;
+					}
+					if(range[i] in toDeselect) {
+						delete toDeselect[range[i]];
+					}
+				}
+			}
+		} else {
+			this.lastSelected = fromItem;
+		}
+
+		// now deselect...
+		for(var i in toDeselect) {
+			if(this.items[i] == this.lastSelected) {
+				dbg("oops!");
+			}
+			this.deselect(this.items[i]);
+		}
+
+		// make sure everything is all kosher after selections+deselections
+		this._updatePivot();
+	},
+
+	/**
+	 * Grow selection upwards one item from lastSelected
+	**/
+	growUp: function() {
+		var idx = this._find(this.lastSelected) - 1;
+		while(idx >= 0) {
+			if(this.selectFilter(this.items[idx], this.selection, false, true)) {
+				this.grow(this.items[idx]);
+				break;
+			}
+			idx--;
+		}
+	},
+
+	/**
+	 * Grow selection downwards one item from lastSelected
+	**/
+	growDown: function() {
+		var idx = this._find(this.lastSelected);
+		if(idx < 0 && this.allowImplicit) {
+			this.select(this.items[0]);
+			idx = 0;
+		}
+		idx++;
+		while(idx > 0 && idx < this.items.length) {
+			if(this.selectFilter(this.items[idx], this.selection, false, true)) {
+				this.grow(this.items[idx]);
+				break;
+			}
+			idx++;
+		}
+	},
+
+	toggleSelected: function(item, noPivot) {
+		if(this.isItem(item)) {
+			if(this.select(item, noPivot)) { return 1; }
+			if(this.deselect(item)) { return -1; }
+		}
+		return 0;
+	},
+
+	select: function(item, noPivot) {
+		if(this.isItem(item) && !this.isSelected(item)
+			&& this.isSelectable(item)) {
+			this.selection.push(item);
+			this.lastSelected = item;
+			this.onSelect(item);
+			this.onSelectChange(item, true);
+			if(!noPivot) {
+				this._addPivot(item);
+			}
+			return true;
+		}
+		return false;
+	},
+
+	deselect: function(item) {
+		var idx = this._find(item, true);
+		if(idx > -1) {
+			this.selection.splice(idx, 1);
+			this.onDeselect(item);
+			this.onSelectChange(item, false);
+			if(item == this.lastSelected) {
+				this.lastSelected = null;
+			}
+
+			this._removePivot(item);
+
+			return true;
+		}
+		return false;
+	},
+
+	selectAll: function() {
+		for(var i = 0; i < this.items.length; i++) {
+			this.select(this.items[i]);
+		}
+	},
+
+	deselectAll: function() {
+		while(this.selection && this.selection.length) {
+			this.deselect(this.selection[0]);
+		}
+	},
+
+	selectNext: function() {
+		var idx = this._find(this.lastSelected);
+		while(idx > -1 && ++idx < this.items.length) {
+			if(this.isSelectable(this.items[idx])) {
+				this.deselectAll();
+				this.select(this.items[idx]);
+				return true;
+			}
+		}
+		return false;
+	},
+
+	selectPrevious: function() {
+		//debugger;
+		var idx = this._find(this.lastSelected);
+		while(idx-- > 0) {
+			if(this.isSelectable(this.items[idx])) {
+				this.deselectAll();
+				this.select(this.items[idx]);
+				return true;
+			}
+		}
+		return false;
+	},
+
+	selectFirst: function() {
+		return this.select(this.items[0]);
+	},
+
+	selectLast: function() {
+		return this.select(this.items[this.items.length-1]);
+	},
+
+	_addPivot: function(item, andClear) {
+		this._pivotItem = item;
+		if(andClear) {
+			this._pivotItems = [item];
+		} else {
+			this._pivotItems.push(item);
+		}
+	},
+
+	_removePivot: function(item) {
+		var i = dojo.lang.find(item, this._pivotItems);
+		if(i > -1) {
+			this._pivotItems.splice(i, 1);
+			this._pivotItem = this._pivotItems[this._pivotItems.length-1];
+		}
+
+		this._updatePivot();
+	},
+
+	_updatePivot: function() {
+		if(this._pivotItems.length == 0) {
+			if(this.lastSelected) {
+				this._addPivot(this.lastSelected);
+			}
+		} else {
+			this._pivotItem = null;
+		}
+	},
+
+	sorted: function() {
+		return dojo.lang.toArray(this.selection).sort(
+			dojo.lang.hitch(this, function(a, b) {
+				var A = this._find(a), B = this._find(b);
+				if(A > B) {
+					return 1;
+				} else if(A < B) {
+					return -1;
+				} else {
+					return 0;
+				}
+			})
+		);
+	},
+
+	// remove any items from the selection that are no longer in this.items
+	updateSelected: function() {
+		for(var i = 0; i < this.selection.length; i++) {
+			if(this._find(this.selection[i]) < 0) {
+				var removed = this.selection.splice(i, 1);
+
+				this._removePivot(removed[0]);
+			}
+		}
+	}
+});

Added: incubator/webwork2/action/src/main/resources/org/apache/struts/action2/static/dojo/src/storage.js
URL: http://svn.apache.org/viewcvs/incubator/webwork2/action/src/main/resources/org/apache/struts/action2/static/dojo/src/storage.js?rev=393978&view=auto
==============================================================================
--- incubator/webwork2/action/src/main/resources/org/apache/struts/action2/static/dojo/src/storage.js (added)
+++ incubator/webwork2/action/src/main/resources/org/apache/struts/action2/static/dojo/src/storage.js Thu Apr 13 16:46:55 2006
@@ -0,0 +1,72 @@
+/*
+	Copyright (c) 2004-2005, 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
+*/
+
+// FIXME: should we require JSON here?
+dojo.require("dojo.lang.*");
+dojo.provide("dojo.storage");
+dojo.provide("dojo.storage.StorageProvider");
+
+dojo.storage = new function(){
+	this.provider = null;
+
+	// similar API as with dojo.io.addTransport()
+	this.setProvider = function(obj){
+		this.provider = obj;
+	}
+
+	this.set = function(key, value, namespace){
+		// FIXME: not very expressive, doesn't have a way of indicating queuing
+		if(!this.provider){
+			return false;
+		}
+		return this.provider.set(key, value, namespace);
+	}
+
+	this.get = function(key, namespace){
+		if(!this.provider){
+			return false;
+		}
+		return this.provider.get(key, namespace);
+	}
+
+	this.remove = function(key, namespace){
+		return this.provider.remove(key, namespace);
+	}
+}
+
+dojo.storage.StorageProvider = function(){
+}
+
+dojo.lang.extend(dojo.storage.StorageProvider, {
+	namespace: "*",
+	initialized: false,
+
+	free: function(){
+		dojo.unimplemented("dojo.storage.StorageProvider.free");
+		return 0;
+	},
+
+	freeK: function(){
+		return dojo.math.round(this.free()/1024, 0);
+	},
+
+	set: function(key, value, namespace){
+		dojo.unimplemented("dojo.storage.StorageProvider.set");
+	},
+
+	get: function(key, namespace){
+		dojo.unimplemented("dojo.storage.StorageProvider.get");
+	},
+
+	remove: function(key, value, namespace){
+		dojo.unimplemented("dojo.storage.StorageProvider.set");
+	}
+
+});

Added: incubator/webwork2/action/src/main/resources/org/apache/struts/action2/static/dojo/src/storage/Storage.as
URL: http://svn.apache.org/viewcvs/incubator/webwork2/action/src/main/resources/org/apache/struts/action2/static/dojo/src/storage/Storage.as?rev=393978&view=auto
==============================================================================
--- incubator/webwork2/action/src/main/resources/org/apache/struts/action2/static/dojo/src/storage/Storage.as (added)
+++ incubator/webwork2/action/src/main/resources/org/apache/struts/action2/static/dojo/src/storage/Storage.as Thu Apr 13 16:46:55 2006
@@ -0,0 +1,51 @@
+import flash.external.ExternalInterface;
+
+class Storage {
+	static var app : Storage;
+	var store: SharedObject;
+	static var started: Boolean = false;
+	
+	public function Storage(){
+		ExternalInterface.addCallback("set", null, set);
+		ExternalInterface.addCallback("get", null, get);
+		ExternalInterface.addCallback("free", null, free);
+	}
+
+	public function set(key, value, namespace){
+		var primeForReHide = false;
+		store = SharedObject.getLocal(namespace);
+		store.onStatus = function(status){
+			// ExternalInterface.call("alert", status.code == "SharedObject.Flush.Failed");
+			// ExternalInterface.call("alert", status.code == "SharedObject.Flush.Success");
+			if(primeForReHide){
+				primeForReHide = false;
+				ExternalInterface.call("dojo.storage.provider.hideStore");
+			}
+		}
+		store.data[key] = value;
+		var ret = store.flush();
+		if(typeof ret == "string"){
+			ExternalInterface.call("dojo.storage.provider.unHideStore");
+			primeForReHide = true;
+		}
+		return store.getSize(namespace);
+	}
+
+	public function get(key, namespace){
+		store = SharedObject.getLocal(namespace);
+		return store.data[key];
+	}
+
+	public function free(namespace){
+		return SharedObject.getDiskUsage(namespace);
+	}
+
+	static function main(mc){
+		app = new Storage();
+		if(!started){
+			ExternalInterface.call("dojo.storage.provider.storageOnLoad");
+			started = true;
+		}
+	}
+}
+

Added: incubator/webwork2/action/src/main/resources/org/apache/struts/action2/static/dojo/src/storage/Storage.swf
URL: http://svn.apache.org/viewcvs/incubator/webwork2/action/src/main/resources/org/apache/struts/action2/static/dojo/src/storage/Storage.swf?rev=393978&view=auto
==============================================================================
Binary file - no diff available.

Propchange: incubator/webwork2/action/src/main/resources/org/apache/struts/action2/static/dojo/src/storage/Storage.swf
------------------------------------------------------------------------------
    svn:mime-type = application/octet-stream

Added: incubator/webwork2/action/src/main/resources/org/apache/struts/action2/static/dojo/src/storage/__package__.js
URL: http://svn.apache.org/viewcvs/incubator/webwork2/action/src/main/resources/org/apache/struts/action2/static/dojo/src/storage/__package__.js?rev=393978&view=auto
==============================================================================
--- incubator/webwork2/action/src/main/resources/org/apache/struts/action2/static/dojo/src/storage/__package__.js (added)
+++ incubator/webwork2/action/src/main/resources/org/apache/struts/action2/static/dojo/src/storage/__package__.js Thu Apr 13 16:46:55 2006
@@ -0,0 +1,16 @@
+/*
+	Copyright (c) 2004-2005, 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.hostenv.conditionalLoadModule({
+	common: ["dojo.storage"],
+	browser: ["dojo.storage.browser"]
+});
+dojo.hostenv.moduleLoaded("dojo.storage.*");
+

Added: incubator/webwork2/action/src/main/resources/org/apache/struts/action2/static/dojo/src/storage/browser.js
URL: http://svn.apache.org/viewcvs/incubator/webwork2/action/src/main/resources/org/apache/struts/action2/static/dojo/src/storage/browser.js?rev=393978&view=auto
==============================================================================
--- incubator/webwork2/action/src/main/resources/org/apache/struts/action2/static/dojo/src/storage/browser.js (added)
+++ incubator/webwork2/action/src/main/resources/org/apache/struts/action2/static/dojo/src/storage/browser.js Thu Apr 13 16:46:55 2006
@@ -0,0 +1,102 @@
+/*
+	Copyright (c) 2004-2005, 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.storage.browser");
+dojo.require("dojo.storage");
+dojo.require("dojo.uri.*");
+
+dojo.storage.browser.StorageProvider = function(){
+	this.initialized = false;
+	this.flash = null;
+	this.backlog = [];
+}
+
+dojo.inherits(	dojo.storage.browser.StorageProvider, 
+				dojo.storage.StorageProvider);
+
+dojo.lang.extend(dojo.storage.browser.StorageProvider, {
+	storageOnLoad: function(){
+		this.initialized = true;
+		this.hideStore();
+		while(this.backlog.length){
+			this.set.apply(this, this.backlog.shift());
+		}
+	},
+
+	unHideStore: function(){
+		var container = dojo.byId("dojo-storeContainer");
+		with(container.style){
+			position = "absolute";
+			overflow = "visible";
+			width = "215px";
+			height = "138px";
+			// FIXME: make these positions dependent on screen size/scrolling!
+			left = "30px"; 
+			top = "30px";
+			visiblity = "visible";
+			zIndex = "20";
+			border = "1px solid black";
+		}
+	},
+
+	hideStore: function(status){
+		var container = dojo.byId("dojo-storeContainer");
+		with(container.style){
+			left = "-300px";
+			top = "-300px";
+		}
+	},
+
+	set: function(key, value, ns){
+		if(!this.initialized){
+			this.backlog.push([key, value, ns]);
+			return "pending";
+		}
+		return this.flash.set(key, value, ns||this.namespace);
+	},
+
+	get: function(key, ns){
+		return this.flash.get(key, ns||this.namespace);
+	},
+
+	writeStorage: function(){
+		var swfloc = dojo.uri.dojoUri("src/storage/Storage.swf").toString();
+		// alert(swfloc);
+		var storeParts = [
+			'<div id="dojo-storeContainer"',
+				'style="position: absolute; left: -300px; top: -300px;">'];
+		if(dojo.render.html.ie){
+			storeParts.push('<object');
+			storeParts.push('	style="border: 1px solid black;"');
+			storeParts.push('	classid="clsid:D27CDB6E-AE6D-11cf-96B8-444553540000"');
+			storeParts.push('	codebase="http://download.macromedia.com/pub/shockwave/cabs/flash/swflash.cab#version=6,0,0,0"');
+			storeParts.push('	width="215" height="138" id="dojoStorage">');
+			storeParts.push('	<param name="movie" value="'+swfloc+'">');
+			storeParts.push('	<param name="quality" value="high">');
+			storeParts.push('</object>');
+		}else{
+			storeParts.push('<embed src="'+swfloc+'" width="215" height="138" ');
+			storeParts.push('	quality="high" ');
+			storeParts.push('	pluginspage="http://www.macromedia.com/go/getflashplayer" ');
+			storeParts.push('	type="application/x-shockwave-flash" ');
+			storeParts.push('	name="dojoStorage">');
+			storeParts.push('</embed>');
+		}
+		storeParts.push('</div>');
+		document.write(storeParts.join(""));
+	}
+});
+
+dojo.storage.setProvider(new dojo.storage.browser.StorageProvider());
+dojo.storage.provider.writeStorage();
+
+dojo.addOnLoad(function(){
+	dojo.storage.provider.flash = (dojo.render.html.ie) ? window["dojoStorage"] : document["dojoStorage"];
+});

Added: incubator/webwork2/action/src/main/resources/org/apache/struts/action2/static/dojo/src/storage/storage.sh
URL: http://svn.apache.org/viewcvs/incubator/webwork2/action/src/main/resources/org/apache/struts/action2/static/dojo/src/storage/storage.sh?rev=393978&view=auto
==============================================================================
--- incubator/webwork2/action/src/main/resources/org/apache/struts/action2/static/dojo/src/storage/storage.sh (added)
+++ incubator/webwork2/action/src/main/resources/org/apache/struts/action2/static/dojo/src/storage/storage.sh Thu Apr 13 16:46:55 2006
@@ -0,0 +1,3 @@
+#! /bin/bash
+
+mtasc -version 8 -swf Storage.swf -main -header 215:138:10 Storage.as 

Added: incubator/webwork2/action/src/main/resources/org/apache/struts/action2/static/dojo/src/string.js
URL: http://svn.apache.org/viewcvs/incubator/webwork2/action/src/main/resources/org/apache/struts/action2/static/dojo/src/string.js?rev=393978&view=auto
==============================================================================
--- incubator/webwork2/action/src/main/resources/org/apache/struts/action2/static/dojo/src/string.js (added)
+++ incubator/webwork2/action/src/main/resources/org/apache/struts/action2/static/dojo/src/string.js Thu Apr 13 16:46:55 2006
@@ -0,0 +1,318 @@
+/*
+	Copyright (c) 2004-2005, 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.string");
+dojo.require("dojo.lang");
+
+/**
+ * Trim whitespace from 'str'. If 'wh' > 0,
+ * only trim from start, if 'wh' < 0, only trim
+ * from end, otherwise trim both ends
+ */
+dojo.string.trim = function(str, wh){
+	if(!dojo.lang.isString(str)){ return str; }
+	if(!str.length){ return str; }
+	if(wh > 0) {
+		return str.replace(/^\s+/, "");
+	} else if(wh < 0) {
+		return str.replace(/\s+$/, "");
+	} else {
+		return str.replace(/^\s+|\s+$/g, "");
+	}
+}
+
+/**
+ * Trim whitespace at the beginning of 'str'
+ */
+dojo.string.trimStart = function(str) {
+	return dojo.string.trim(str, 1);
+}
+
+/**
+ * Trim whitespace at the end of 'str'
+ */
+dojo.string.trimEnd = function(str) {
+	return dojo.string.trim(str, -1);
+}
+
+/**
+ * Parameterized string function
+ * str - formatted string with %{values} to be replaces
+ * pairs - object of name: "value" value pairs
+ * killExtra - remove all remaining %{values} after pairs are inserted
+ */
+dojo.string.paramString = function(str, pairs, killExtra) {
+	for(var name in pairs) {
+		var re = new RegExp("\\%\\{" + name + "\\}", "g");
+		str = str.replace(re, pairs[name]);
+	}
+
+	if(killExtra) { str = str.replace(/%\{([^\}\s]+)\}/g, ""); }
+	return str;
+}
+
+/** Uppercases the first letter of each word */
+dojo.string.capitalize = function (str) {
+	if (!dojo.lang.isString(str)) { return ""; }
+	if (arguments.length == 0) { str = this; }
+	var words = str.split(' ');
+	var retval = "";
+	var len = words.length;
+	for (var i=0; i<len; i++) {
+		var word = words[i];
+		word = word.charAt(0).toUpperCase() + word.substring(1, word.length);
+		retval += word;
+		if (i < len-1)
+			retval += " ";
+	}
+	
+	return new String(retval);
+}
+
+/**
+ * Return true if the entire string is whitespace characters
+ */
+dojo.string.isBlank = function (str) {
+	if(!dojo.lang.isString(str)) { return true; }
+	return (dojo.string.trim(str).length == 0);
+}
+
+dojo.string.encodeAscii = function(str) {
+	if(!dojo.lang.isString(str)) { return str; }
+	var ret = "";
+	var value = escape(str);
+	var match, re = /%u([0-9A-F]{4})/i;
+	while((match = value.match(re))) {
+		var num = Number("0x"+match[1]);
+		var newVal = escape("&#" + num + ";");
+		ret += value.substring(0, match.index) + newVal;
+		value = value.substring(match.index+match[0].length);
+	}
+	ret += value.replace(/\+/g, "%2B");
+	return ret;
+}
+
+// TODO: make an HTML version
+dojo.string.summary = function(str, len) {
+	if(!len || str.length <= len) {
+		return str;
+	} else {
+		return str.substring(0, len).replace(/\.+$/, "") + "...";
+	}
+}
+
+dojo.string.escape = function(type, str) {
+	var args = [];
+	for(var i = 1; i < arguments.length; i++) { args.push(arguments[i]); }
+	switch(type.toLowerCase()) {
+		case "xml":
+		case "html":
+		case "xhtml":
+			return dojo.string.escapeXml.apply(this, args);
+		case "sql":
+			return dojo.string.escapeSql.apply(this, args);
+		case "regexp":
+		case "regex":
+			return dojo.string.escapeRegExp.apply(this, args);
+		case "javascript":
+		case "jscript":
+		case "js":
+			return dojo.string.escapeJavaScript.apply(this, args);
+		case "ascii":
+			// so it's encode, but it seems useful
+			return dojo.string.encodeAscii.apply(this, args);
+		default:
+			return str;
+	}
+}
+
+dojo.string.escapeXml = function(str, noSingleQuotes) {
+	str = str.replace(/&/gm, "&amp;").replace(/</gm, "&lt;")
+		.replace(/>/gm, "&gt;").replace(/"/gm, "&quot;");
+	if(!noSingleQuotes) { str = str.replace(/'/gm, "&#39;"); }
+	return str;
+}
+
+dojo.string.escapeSql = function(str) {
+	return str.replace(/'/gm, "''");
+}
+
+dojo.string.escapeRegExp = function(str) {
+	return str.replace(/\\/gm, "\\\\").replace(/([\f\b\n\t\r])/gm, "\\$1");
+}
+
+dojo.string.escapeJavaScript = function(str) {
+	return str.replace(/(["'\f\b\n\t\r])/gm, "\\$1");
+}
+
+/**
+ * Return 'str' repeated 'count' times, optionally
+ * placing 'separator' between each rep
+ */
+dojo.string.repeat = function(str, count, separator) {
+	var out = "";
+	for(var i = 0; i < count; i++) {
+		out += str;
+		if(separator && i < count - 1) {
+			out += separator;
+		}
+	}
+	return out;
+}
+
+/**
+ * Returns true if 'str' ends with 'end'
+ */
+dojo.string.endsWith = function(str, end, ignoreCase) {
+	if(ignoreCase) {
+		str = str.toLowerCase();
+		end = end.toLowerCase();
+	}
+	return str.lastIndexOf(end) == str.length - end.length;
+}
+
+/**
+ * Returns true if 'str' ends with any of the arguments[2 -> n]
+ */
+dojo.string.endsWithAny = function(str /* , ... */) {
+	for(var i = 1; i < arguments.length; i++) {
+		if(dojo.string.endsWith(str, arguments[i])) {
+			return true;
+		}
+	}
+	return false;
+}
+
+/**
+ * Returns true if 'str' starts with 'start'
+ */
+dojo.string.startsWith = function(str, start, ignoreCase) {
+	if(ignoreCase) {
+		str = str.toLowerCase();
+		start = start.toLowerCase();
+	}
+	return str.indexOf(start) == 0;
+}
+
+/**
+ * Returns true if 'str' starts with any of the arguments[2 -> n]
+ */
+dojo.string.startsWithAny = function(str /* , ... */) {
+	for(var i = 1; i < arguments.length; i++) {
+		if(dojo.string.startsWith(str, arguments[i])) {
+			return true;
+		}
+	}
+	return false;
+}
+
+/**
+ * Returns true if 'str' starts with any of the arguments 2 -> n
+ */
+dojo.string.has = function(str /* , ... */) {
+	for(var i = 1; i < arguments.length; i++) {
+		if(str.indexOf(arguments[i] > -1)) {
+			return true;
+		}
+	}
+	return false;
+}
+
+/**
+ * Pad 'str' to guarantee that it is at least 'len' length
+ * with the character 'c' at either the start (dir=1) or
+ * end (dir=-1) of the string
+ */
+dojo.string.pad = function(str, len/*=2*/, c/*='0'*/, dir/*=1*/) {
+	var out = String(str);
+	if(!c) {
+		c = '0';
+	}
+	if(!dir) {
+		dir = 1;
+	}
+	while(out.length < len) {
+		if(dir > 0) {
+			out = c + out;
+		} else {
+			out += c;
+		}
+	}
+	return out;
+}
+
+/** same as dojo.string.pad(str, len, c, 1) */
+dojo.string.padLeft = function(str, len, c) {
+	return dojo.string.pad(str, len, c, 1);
+}
+
+/** same as dojo.string.pad(str, len, c, -1) */
+dojo.string.padRight = function(str, len, c) {
+	return dojo.string.pad(str, len, c, -1);
+}
+
+dojo.string.normalizeNewlines = function (text,newlineChar) {
+	if (newlineChar == "\n") {
+		text = text.replace(/\r\n/g, "\n");
+		text = text.replace(/\r/g, "\n");
+	} else if (newlineChar == "\r") {
+		text = text.replace(/\r\n/g, "\r");
+		text = text.replace(/\n/g, "\r");
+	} else {
+		text = text.replace(/([^\r])\n/g, "$1\r\n");
+		text = text.replace(/\r([^\n])/g, "\r\n$1");
+	}
+	return text;
+}
+
+dojo.string.splitEscaped = function (str,charac) {
+	var components = [];
+	for (var i = 0, prevcomma = 0; i < str.length; i++) {
+		if (str.charAt(i) == '\\') { i++; continue; }
+		if (str.charAt(i) == charac) {
+			components.push(str.substring(prevcomma, i));
+			prevcomma = i + 1;
+		}
+	}
+	components.push(str.substr(prevcomma));
+	return components;
+}
+
+
+// do we even want to offer this? is it worth it?
+dojo.string.addToPrototype = function() {
+	for(var method in dojo.string) {
+		if(dojo.lang.isFunction(dojo.string[method])) {
+			var func = (function() {
+				var meth = method;
+				switch(meth) {
+					case "addToPrototype":
+						return null;
+						break;
+					case "escape":
+						return function(type) {
+							return dojo.string.escape(type, this);
+						}
+						break;
+					default:
+						return function() {
+							var args = [this];
+							for(var i = 0; i < arguments.length; i++) {
+								args.push(arguments[i]);
+							}
+							dojo.debug(args);
+							return dojo.string[meth].apply(dojo.string, args);
+						}
+				}
+			})();
+			if(func) { String.prototype[method] = func; }
+		}
+	}
+}

Added: incubator/webwork2/action/src/main/resources/org/apache/struts/action2/static/dojo/src/string/Builder.js
URL: http://svn.apache.org/viewcvs/incubator/webwork2/action/src/main/resources/org/apache/struts/action2/static/dojo/src/string/Builder.js?rev=393978&view=auto
==============================================================================
--- incubator/webwork2/action/src/main/resources/org/apache/struts/action2/static/dojo/src/string/Builder.js (added)
+++ incubator/webwork2/action/src/main/resources/org/apache/struts/action2/static/dojo/src/string/Builder.js Thu Apr 13 16:46:55 2006
@@ -0,0 +1,105 @@
+/*
+	Copyright (c) 2004-2005, 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.string.Builder");
+dojo.require("dojo.string");
+
+// NOTE: testing shows that direct "+=" concatenation is *much* faster on
+// Spidermoneky and Rhino, while arr.push()/arr.join() style concatenation is
+// significantly quicker on IE (Jscript/wsh/etc.).
+
+dojo.string.Builder = function(str){
+	this.arrConcat = (dojo.render.html.capable && dojo.render.html["ie"]);
+
+	var a = [];
+	var b = str || "";
+	var length = this.length = b.length;
+
+	if(this.arrConcat){
+		if(b.length > 0){
+			a.push(b);
+		}
+		b = "";
+	}
+
+	this.toString = this.valueOf = function(){ 
+		return (this.arrConcat) ? a.join("") : b;
+	};
+
+	this.append = function(s){
+		if(this.arrConcat){
+			a.push(s);
+		}else{
+			b+=s;
+		}
+		length += s.length;
+		this.length = length;
+		return this;
+	};
+
+	this.clear = function(){
+		a = [];
+		b = "";
+		length = this.length = 0;
+		return this;
+	};
+
+	this.remove = function(f,l){
+		var s = ""; 
+		if(this.arrConcat){
+			b = a.join(""); 
+		}
+		a=[];
+		if(f>0){
+			s = b.substring(0, (f-1));
+		}
+		b = s + b.substring(f + l); 
+		length = this.length = b.length; 
+		if(this.arrConcat){
+			a.push(b);
+			b="";
+		}
+		return this;
+	};
+
+	this.replace = function(o,n){
+		if(this.arrConcat){
+			b = a.join(""); 
+		}
+		a = []; 
+		b = b.replace(o,n); 
+		length = this.length = b.length; 
+		if(this.arrConcat){
+			a.push(b);
+			b="";
+		}
+		return this;
+	};
+
+	this.insert = function(idx,s){
+		if(this.arrConcat){
+			b = a.join(""); 
+		}
+		a=[];
+		if(idx == 0){
+			b = s + b;
+		}else{
+			var t = b.split("");
+			t.splice(idx,0,s);
+			b = t.join("")
+		}
+		length = this.length = b.length; 
+		if(this.arrConcat){
+			a.push(b); 
+			b="";
+		}
+		return this;
+	};
+};

Added: incubator/webwork2/action/src/main/resources/org/apache/struts/action2/static/dojo/src/string/__package__.js
URL: http://svn.apache.org/viewcvs/incubator/webwork2/action/src/main/resources/org/apache/struts/action2/static/dojo/src/string/__package__.js?rev=393978&view=auto
==============================================================================
--- incubator/webwork2/action/src/main/resources/org/apache/struts/action2/static/dojo/src/string/__package__.js (added)
+++ incubator/webwork2/action/src/main/resources/org/apache/struts/action2/static/dojo/src/string/__package__.js Thu Apr 13 16:46:55 2006
@@ -0,0 +1,17 @@
+/*
+	Copyright (c) 2004-2005, 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.hostenv.conditionalLoadModule({
+	common: [
+		"dojo.string",
+		"dojo.string.Builder"
+	]
+});
+dojo.hostenv.moduleLoaded("dojo.string.*");

Added: incubator/webwork2/action/src/main/resources/org/apache/struts/action2/static/dojo/src/style.js
URL: http://svn.apache.org/viewcvs/incubator/webwork2/action/src/main/resources/org/apache/struts/action2/static/dojo/src/style.js?rev=393978&view=auto
==============================================================================
--- incubator/webwork2/action/src/main/resources/org/apache/struts/action2/static/dojo/src/style.js (added)
+++ incubator/webwork2/action/src/main/resources/org/apache/struts/action2/static/dojo/src/style.js Thu Apr 13 16:46:55 2006
@@ -0,0 +1,540 @@
+/*
+	Copyright (c) 2004-2005, 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.style");
+dojo.require("dojo.dom");
+dojo.require("dojo.uri.Uri");
+dojo.require("dojo.graphics.color");
+
+// values: content-box, border-box
+dojo.style.boxSizing = {
+	marginBox: "margin-box",
+	borderBox: "border-box",
+	paddingBox: "padding-box",
+	contentBox: "content-box"
+};
+
+dojo.style.getBoxSizing = function(node) 
+{
+	if (dojo.render.html.ie || dojo.render.html.opera){ 
+		var cm = document["compatMode"];
+		if (cm == "BackCompat" || cm == "QuirksMode"){ 
+			return dojo.style.boxSizing.borderBox; 
+		}else{
+			return dojo.style.boxSizing.contentBox; 
+		}
+	}else{
+		if(arguments.length == 0){ node = document.documentElement; }
+		var sizing = dojo.style.getStyle(node, "-moz-box-sizing");
+		if(!sizing){ sizing = dojo.style.getStyle(node, "box-sizing"); }
+		return (sizing ? sizing : dojo.style.boxSizing.contentBox);
+	}
+}
+
+/*
+
+The following several function use the dimensions shown below
+
+    +-------------------------+
+    |  margin                 |
+    | +---------------------+ |
+    | |  border             | |
+    | | +-----------------+ | |
+    | | |  padding        | | |
+    | | | +-------------+ | | |
+    | | | |   content   | | | |
+    | | | +-------------+ | | |
+    | | +-|-------------|-+ | |
+    | +-|-|-------------|-|-+ |
+    +-|-|-|-------------|-|-|-+
+    | | | |             | | | |
+    | | | |<- content ->| | | |
+    | |<------ inner ------>| |
+    |<-------- outer -------->|
+    +-------------------------+
+
+    * content-box
+
+    |m|b|p|             |p|b|m|
+    | |<------ offset ----->| |
+    | | |<---- client --->| | |
+    | | | |<-- width -->| | | |
+
+    * border-box
+
+    |m|b|p|             |p|b|m|
+    | |<------ offset ----->| |
+    | | |<---- client --->| | |
+    | |<------ width ------>| |
+*/
+
+/*
+	Notes:
+
+	General:
+		- Uncomputable values are returned as NaN.
+		- setOuterWidth/Height return *false* if the outer size could not be computed, otherwise *true*.
+		- I (sjmiles) know no way to find the calculated values for auto-margins. 
+		- All returned values are floating point in 'px' units. If a non-zero computed style value is not specified in 'px', NaN is returned.
+
+	FF:
+		- styles specified as '0' (unitless 0) show computed as '0pt'.
+
+	IE:
+		- clientWidth/Height are unreliable (0 unless the object has 'layout').
+		- margins must be specified in px, or 0 (in any unit) for any sizing function to work. Otherwise margins detect as 'auto'.
+		- padding can be empty or, if specified, must be in px, or 0 (in any unit) for any sizing function to work.
+
+	Safari:
+		- Safari defaults padding values to 'auto'.
+
+	See the unit tests for examples of (un)computable values in a given browser.
+
+*/
+
+// FIXME: these work for most elements (e.g. DIV) but not all (e.g. TEXTAREA)
+
+dojo.style.isBorderBox = function(node)
+{
+	return (dojo.style.getBoxSizing(node) == dojo.style.boxSizing.borderBox);
+}
+
+dojo.style.getUnitValue = function (element, cssSelector, autoIsZero){
+	var result = { value: 0, units: 'px' };
+	var s = dojo.style.getComputedStyle(element, cssSelector);
+	if (s == '' || (s == 'auto' && autoIsZero)){ return result; }
+	if (dojo.lang.isUndefined(s)){ 
+		result.value = NaN;
+	}else{
+		// FIXME: is regex inefficient vs. parseInt or some manual test? 
+		var match = s.match(/([\d.]+)([a-z%]*)/i);
+		if (!match){
+			result.value = NaN;
+		}else{
+			result.value = Number(match[1]);
+			result.units = match[2].toLowerCase();
+		}
+	}
+	return result;		
+}
+
+dojo.style.getPixelValue = function (element, cssSelector, autoIsZero){
+	var result = dojo.style.getUnitValue(element, cssSelector, autoIsZero);
+	// FIXME: there is serious debate as to whether or not this is the right solution
+	if(isNaN(result.value)){ return 0; }
+	// FIXME: code exists for converting other units to px (see Dean Edward's IE7) 
+	// but there are cross-browser complexities
+	if((result.value)&&(result.units != 'px')){ return NaN; }
+	return result.value;
+}
+
+dojo.style.getNumericStyle = dojo.style.getPixelValue; // backward compat
+
+dojo.style.isPositionAbsolute = function(node){
+	return (dojo.style.getComputedStyle(node, 'position') == 'absolute');
+}
+
+dojo.style.getMarginWidth = function(node){
+	var autoIsZero = dojo.style.isPositionAbsolute(node);
+	var left = dojo.style.getPixelValue(node, "margin-left", autoIsZero);
+	var right = dojo.style.getPixelValue(node, "margin-right", autoIsZero);
+	return left + right;
+}
+
+dojo.style.getBorderWidth = function(node){
+	// the removed calculation incorrectly includes scrollbar
+	//if (node.clientWidth){
+	//	return node.offsetWidth - node.clientWidth;
+	//}else
+	{
+		var left = (dojo.style.getStyle(node, 'border-left-style') == 'none' ? 0 : dojo.style.getPixelValue(node, "border-left-width"));
+		var right = (dojo.style.getStyle(node, 'border-right-style') == 'none' ? 0 : dojo.style.getPixelValue(node, "border-right-width"));
+		return left + right;
+	}
+}
+
+dojo.style.getPaddingWidth = function(node){
+	var left = dojo.style.getPixelValue(node, "padding-left", true);
+	var right = dojo.style.getPixelValue(node, "padding-right", true);
+	return left + right;
+}
+
+dojo.style.getContentWidth = function (node){
+	return node.offsetWidth - dojo.style.getPaddingWidth(node) - dojo.style.getBorderWidth(node);
+}
+
+dojo.style.getInnerWidth = function (node){
+	return node.offsetWidth;
+}
+
+dojo.style.getOuterWidth = function (node){
+	return dojo.style.getInnerWidth(node) + dojo.style.getMarginWidth(node);
+}
+
+dojo.style.setOuterWidth = function (node, pxWidth){
+	if (!dojo.style.isBorderBox(node)){
+		pxWidth -= dojo.style.getPaddingWidth(node) + dojo.style.getBorderWidth(node);
+	}
+	pxWidth -= dojo.style.getMarginWidth(node);
+	if (!isNaN(pxWidth) && pxWidth > 0){
+		node.style.width = pxWidth + 'px';
+		return true;
+	}else return false;
+}
+
+// FIXME: these aliases are actually the preferred names
+dojo.style.getContentBoxWidth = dojo.style.getContentWidth;
+dojo.style.getBorderBoxWidth = dojo.style.getInnerWidth;
+dojo.style.getMarginBoxWidth = dojo.style.getOuterWidth;
+dojo.style.setMarginBoxWidth = dojo.style.setOuterWidth;
+
+dojo.style.getMarginHeight = function(node){
+	var autoIsZero = dojo.style.isPositionAbsolute(node);
+	var top = dojo.style.getPixelValue(node, "margin-top", autoIsZero);
+	var bottom = dojo.style.getPixelValue(node, "margin-bottom", autoIsZero);
+	return top + bottom;
+}
+
+dojo.style.getBorderHeight = function(node){
+	// this removed calculation incorrectly includes scrollbar
+//	if (node.clientHeight){
+//		return node.offsetHeight- node.clientHeight;
+//	}else
+	{		
+		var top = (dojo.style.getStyle(node, 'border-top-style') == 'none' ? 0 : dojo.style.getPixelValue(node, "border-top-width"));
+		var bottom = (dojo.style.getStyle(node, 'border-bottom-style') == 'none' ? 0 : dojo.style.getPixelValue(node, "border-bottom-width"));
+		return top + bottom;
+	}
+}
+
+dojo.style.getPaddingHeight = function(node){
+	var top = dojo.style.getPixelValue(node, "padding-top", true);
+	var bottom = dojo.style.getPixelValue(node, "padding-bottom", true);
+	return top + bottom;
+}
+
+dojo.style.getContentHeight = function (node){
+	return node.offsetHeight - dojo.style.getPaddingHeight(node) - dojo.style.getBorderHeight(node);
+}
+
+dojo.style.getInnerHeight = function (node){
+	return node.offsetHeight; // FIXME: does this work?
+}
+
+dojo.style.getOuterHeight = function (node){
+	return dojo.style.getInnerHeight(node) + dojo.style.getMarginHeight(node);
+}
+
+dojo.style.setOuterHeight = function (node, pxHeight){
+	if (!dojo.style.isBorderBox(node)){
+			pxHeight -= dojo.style.getPaddingHeight(node) + dojo.style.getBorderHeight(node);
+	}
+	pxHeight -= dojo.style.getMarginHeight(node);
+	if (!isNaN(pxHeight) && pxHeight > 0){
+		node.style.height = pxHeight + 'px';
+		return true;
+	}else return false;
+}
+
+dojo.style.setContentWidth = function(node, pxWidth){
+
+	if (dojo.style.isBorderBox(node)){
+		pxWidth += dojo.style.getPaddingWidth(node) + dojo.style.getBorderWidth(node);
+	}
+
+	if (!isNaN(pxWidth) && pxWidth > 0){
+		node.style.width = pxWidth + 'px';
+		return true;
+	}else return false;
+}
+
+dojo.style.setContentHeight = function(node, pxHeight){
+
+	if (dojo.style.isBorderBox(node)){
+		pxHeight += dojo.style.getPaddingHeight(node) + dojo.style.getBorderHeight(node);
+	}
+
+	if (!isNaN(pxHeight) && pxHeight > 0){
+		node.style.height = pxHeight + 'px';
+		return true;
+	}else return false;
+}
+
+// FIXME: these aliases are actually the preferred names
+dojo.style.getContentBoxHeight = dojo.style.getContentHeight;
+dojo.style.getBorderBoxHeight = dojo.style.getInnerHeight;
+dojo.style.getMarginBoxHeight = dojo.style.getOuterHeight;
+dojo.style.setMarginBoxHeight = dojo.style.setOuterHeight;
+
+dojo.style.getTotalOffset = function (node, type, includeScroll){
+	var typeStr = (type=="top") ? "offsetTop" : "offsetLeft";
+	var typeScroll = (type=="top") ? "scrollTop" : "scrollLeft";
+	
+	var coord = (type=="top") ? "y" : "x";
+	var offset = 0;
+	if(node["offsetParent"]){
+		
+		// in Safari, if the node is an absolutly positioned child of the body
+		// and the body has a margin the offset of the child and the body
+		// contain the body's margins, so we need to end at the body
+		if (dojo.render.html.safari
+			&& node.style.getPropertyValue("position") == "absolute"
+			&& node.parentNode == dojo.html.body())
+		{
+			var endNode = dojo.html.body();
+		} else {
+			var endNode = dojo.html.body().parentNode;
+		}
+		
+		if(includeScroll && node.parentNode != document.body) {
+			offset -= dojo.style.sumAncestorProperties(node, typeScroll);
+		}
+		// FIXME: this is known not to work sometimes on IE 5.x since nodes
+		// soemtimes need to be "tickled" before they will display their
+		// offset correctly
+		do {
+			offset += node[typeStr];
+			node = node.offsetParent;
+		} while (node != endNode && node != null);
+	}else if(node[coord]){
+		offset += node[coord];
+	}
+	return offset;
+}
+
+dojo.style.sumAncestorProperties = function (node, prop) {
+	if (!node) { return 0; } // FIXME: throw an error?
+	
+	var retVal = 0;
+	while (node) {
+		var val = node[prop];
+		if (val) {
+			retVal += val - 0;
+		}
+		node = node.parentNode;
+	}
+	return retVal;
+}
+
+dojo.style.totalOffsetLeft = function (node, includeScroll){
+	return dojo.style.getTotalOffset(node, "left", includeScroll);
+}
+
+dojo.style.getAbsoluteX = dojo.style.totalOffsetLeft;
+
+dojo.style.totalOffsetTop = function (node, includeScroll){
+	return dojo.style.getTotalOffset(node, "top", includeScroll);
+}
+
+dojo.style.getAbsoluteY = dojo.style.totalOffsetTop;
+
+dojo.style.getAbsolutePosition = function(node, includeScroll) {
+	var position = [
+		dojo.style.getAbsoluteX(node, includeScroll),
+		dojo.style.getAbsoluteY(node, includeScroll)
+	];
+	position.x = position[0];
+	position.y = position[1];
+	return position;
+}
+
+dojo.style.styleSheet = null;
+
+// FIXME: this is a really basic stub for adding and removing cssRules, but
+// it assumes that you know the index of the cssRule that you want to add 
+// or remove, making it less than useful.  So we need something that can 
+// search for the selector that you you want to remove.
+dojo.style.insertCssRule = function (selector, declaration, index) {
+	if (!dojo.style.styleSheet) {
+		if (document.createStyleSheet) { // IE
+			dojo.style.styleSheet = document.createStyleSheet();
+		} else if (document.styleSheets[0]) { // rest
+			// FIXME: should create a new style sheet here
+			// fall back on an exsiting style sheet
+			dojo.style.styleSheet = document.styleSheets[0];
+		} else { return null; } // fail
+	}
+
+	if (arguments.length < 3) { // index may == 0
+		if (dojo.style.styleSheet.cssRules) { // W3
+			index = dojo.style.styleSheet.cssRules.length;
+		} else if (dojo.style.styleSheet.rules) { // IE
+			index = dojo.style.styleSheet.rules.length;
+		} else { return null; } // fail
+	}
+
+	if (dojo.style.styleSheet.insertRule) { // W3
+		var rule = selector + " { " + declaration + " }";
+		return dojo.style.styleSheet.insertRule(rule, index);
+	} else if (dojo.style.styleSheet.addRule) { // IE
+		return dojo.style.styleSheet.addRule(selector, declaration, index);
+	} else { return null; } // fail
+}
+
+dojo.style.removeCssRule = function (index){
+	if(!dojo.style.styleSheet){
+		dojo.debug("no stylesheet defined for removing rules");
+		return false;
+	}
+	if(dojo.render.html.ie){
+		if(!index){
+			index = dojo.style.styleSheet.rules.length;
+			dojo.style.styleSheet.removeRule(index);
+		}
+	}else if(document.styleSheets[0]){
+		if(!index){
+			index = dojo.style.styleSheet.cssRules.length;
+		}
+		dojo.style.styleSheet.deleteRule(index);
+	}
+	return true;
+}
+
+dojo.style.insertCssFile = function (URI, doc, checkDuplicates){
+	if(!URI) { return; }
+	if(!doc){ doc = document; }
+	// Safari doesn't have this property, but it doesn't support
+	// styleSheets.href either so it beomces moot
+	if(doc.baseURI) { URI = new dojo.uri.Uri(doc.baseURI, URI); }
+	if(checkDuplicates && doc.styleSheets){
+		// get the host + port info from location
+		var loc = location.href.split("#")[0].substring(0, location.href.indexOf(location.pathname));
+		for(var i = 0; i < doc.styleSheets.length; i++){
+			if(doc.styleSheets[i].href && URI.toString() ==
+				new dojo.uri.Uri(doc.styleSheets[i].href.toString())) { return; }
+		}
+	}
+	var file = doc.createElement("link");
+	file.setAttribute("type", "text/css");
+	file.setAttribute("rel", "stylesheet");
+	file.setAttribute("href", URI);
+	var head = doc.getElementsByTagName("head")[0];
+	if(head){ // FIXME: why isn't this working on Opera 8?
+		head.appendChild(file);
+	}
+}
+
+dojo.style.getBackgroundColor = function (node) {
+	var color;
+	do{
+		color = dojo.style.getStyle(node, "background-color");
+		// Safari doesn't say "transparent"
+		if(color.toLowerCase() == "rgba(0, 0, 0, 0)") { color = "transparent"; }
+		if(node == document.getElementsByTagName("body")[0]) { node = null; break; }
+		node = node.parentNode;
+	}while(node && dojo.lang.inArray(color, ["transparent", ""]));
+
+	if( color == "transparent" ) {
+		color = [255, 255, 255, 0];
+	} else {
+		color = dojo.graphics.color.extractRGB(color);
+	}
+	return color;
+}
+
+dojo.style.getComputedStyle = function (element, cssSelector, inValue) {
+	var value = inValue;
+	if (element.style.getPropertyValue) { // W3
+		value = element.style.getPropertyValue(cssSelector);
+	}
+	if(!value) {
+		if (document.defaultView) { // gecko
+			var cs = document.defaultView.getComputedStyle(element, "");
+			if (cs) { 
+				value = cs.getPropertyValue(cssSelector);
+			} 
+		} else if (element.currentStyle) { // IE
+			value = element.currentStyle[dojo.style.toCamelCase(cssSelector)];
+		} 
+	}
+	
+	return value;
+}
+
+dojo.style.getStyle = function (element, cssSelector) {
+	var camelCased = dojo.style.toCamelCase(cssSelector);
+	var value = element.style[camelCased]; // dom-ish
+	return (value ? value : dojo.style.getComputedStyle(element, cssSelector, value));
+}
+
+dojo.style.toCamelCase = function (selector) {
+	var arr = selector.split('-'), cc = arr[0];
+	for(var i = 1; i < arr.length; i++) {
+		cc += arr[i].charAt(0).toUpperCase() + arr[i].substring(1);
+	}
+	return cc;		
+}
+
+dojo.style.toSelectorCase = function (selector) {
+	return selector.replace(/([A-Z])/g, "-$1" ).toLowerCase() ;
+}
+
+/* float between 0.0 (transparent) and 1.0 (opaque) */
+dojo.style.setOpacity = function setOpacity (node, opacity, dontFixOpacity) {
+	node = dojo.byId(node);
+	var h = dojo.render.html;
+	if(!dontFixOpacity){
+		if( opacity >= 1.0){
+			if(h.ie){
+				dojo.style.clearOpacity(node);
+				return;
+			}else{
+				opacity = 0.999999;
+			}
+		}else if( opacity < 0.0){ opacity = 0; }
+	}
+	if(h.ie){
+		if(node.nodeName.toLowerCase() == "tr"){
+			// FIXME: is this too naive? will we get more than we want?
+			var tds = node.getElementsByTagName("td");
+			for(var x=0; x<tds.length; x++){
+				tds[x].style.filter = "Alpha(Opacity="+opacity*100+")";
+			}
+		}
+		node.style.filter = "Alpha(Opacity="+opacity*100+")";
+	}else if(h.moz){
+		node.style.opacity = opacity; // ffox 1.0 directly supports "opacity"
+		node.style.MozOpacity = opacity;
+	}else if(h.safari){
+		node.style.opacity = opacity; // 1.3 directly supports "opacity"
+		node.style.KhtmlOpacity = opacity;
+	}else{
+		node.style.opacity = opacity;
+	}
+}
+	
+dojo.style.getOpacity = function getOpacity (node){
+	if(dojo.render.html.ie){
+		var opac = (node.filters && node.filters.alpha &&
+			typeof node.filters.alpha.opacity == "number"
+			? node.filters.alpha.opacity : 100) / 100;
+	}else{
+		var opac = node.style.opacity || node.style.MozOpacity ||
+			node.style.KhtmlOpacity || 1;
+	}
+	return opac >= 0.999999 ? 1.0 : Number(opac);
+}
+
+dojo.style.clearOpacity = function clearOpacity (node) {
+	var h = dojo.render.html;
+	if(h.ie){
+		if( node.filters && node.filters.alpha ) {
+			node.style.filter = ""; // FIXME: may get rid of other filter effects
+		}
+	}else if(h.moz){
+		node.style.opacity = 1;
+		node.style.MozOpacity = 1;
+	}else if(h.safari){
+		node.style.opacity = 1;
+		node.style.KhtmlOpacity = 1;
+	}else{
+		node.style.opacity = 1;
+	}
+}

Added: incubator/webwork2/action/src/main/resources/org/apache/struts/action2/static/dojo/src/svg.js
URL: http://svn.apache.org/viewcvs/incubator/webwork2/action/src/main/resources/org/apache/struts/action2/static/dojo/src/svg.js?rev=393978&view=auto
==============================================================================
--- incubator/webwork2/action/src/main/resources/org/apache/struts/action2/static/dojo/src/svg.js (added)
+++ incubator/webwork2/action/src/main/resources/org/apache/struts/action2/static/dojo/src/svg.js Thu Apr 13 16:46:55 2006
@@ -0,0 +1,277 @@
+/*
+	Copyright (c) 2004-2005, 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.svg");
+dojo.require("dojo.lang");
+dojo.require("dojo.dom");
+
+dojo.lang.mixin(dojo.svg, dojo.dom);
+
+/**
+ *	The Graphics object.  Hopefully gives the user a way into
+ *	XPlatform rendering functions supported correctly and incorrectly.
+**/
+dojo.svg.graphics = dojo.svg.g = new function(d){
+	this.suspend = function(){
+		try { d.documentElement.suspendRedraw(0); } catch(e){ }
+	};
+	this.resume = function(){
+		try { d.documentElement.unsuspendRedraw(0); } catch(e){ }
+	};
+	this.force = function(){
+		try { d.documentElement.forceRedraw(); } catch(e){ }
+	};
+}(document);
+
+/**
+ *	The Animations control object.  Hopefully gives the user a way into
+ *	XPlatform animation functions supported correctly and incorrectly.
+**/
+dojo.svg.animations = dojo.svg.anim = new function(d){
+	this.arePaused = function(){
+		try {
+			return d.documentElement.animationsPaused();
+		} catch(e){
+			return false;
+		}
+	} ;
+	this.pause = function(){
+		try { d.documentElement.pauseAnimations(); } catch(e){ }
+	};
+	this.resume = function(){
+		try { d.documentElement.unpauseAnimations(); } catch(e){ }
+	};
+}(document);
+
+/**
+ *	signatures from dojo.style.
+ */
+dojo.svg.toCamelCase = function(selector){
+	var arr = selector.split('-'), cc = arr[0];
+	for(var i = 1; i < arr.length; i++) {
+		cc += arr[i].charAt(0).toUpperCase() + arr[i].substring(1);
+	}
+	return cc;		
+};
+dojo.svg.toSelectorCase = function (selector) {
+	return selector.replace(/([A-Z])/g, "-$1" ).toLowerCase() ;
+};
+dojo.svg.getStyle = function(node, cssSelector){
+	return document.defaultView.getComputedStyle(node, cssSelector);
+};
+dojo.svg.getNumericStyle = function(node, cssSelector){
+	return parseFloat(dojo.svg.getStyle(node, cssSelector));
+};
+
+/**
+ *	alpha channel operations
+ */
+dojo.svg.getOpacity = function(node){
+	return Math.min(1.0, dojo.svg.getNumericStyle(node, "fill-opacity"));
+};
+dojo.svg.setOpacity = function(node, opacity){
+	node.setAttributeNS(this.xmlns.svg, "fill-opacity", opacity);
+	node.setAttributeNS(this.xmlns.svg, "stroke-opacity", opacity);
+};
+dojo.svg.clearOpacity = function(node){
+	node.setAttributeNS(this.xmlns.svg, "fill-opacity", "1.0");
+	node.setAttributeNS(this.xmlns.svg, "stroke-opacity", "1.0");
+};
+
+/**
+ *	Coordinates and dimensions.
+ */
+dojo.svg.getCoords = function(node){
+	if (node.getBBox) {
+		var box = node.getBBox();
+		return { x: box.x, y: box.y };
+	}
+	return null;
+};
+dojo.svg.setCoords = function(node, coords){
+	var p = dojo.svg.getCoords();
+	if (!p) return;
+	var dx = p.x - coords.x;
+	var dy = p.y - coords.y;
+	dojo.svg.translate(node, dx, dy);
+};
+dojo.svg.getDimensions = function(node){
+	if (node.getBBox){
+		var box = node.getBBox();
+		return { width: box.width, height : box.height };
+	}
+	return null;
+};
+dojo.svg.setDimensions = function(node, dim){
+	//	will only support shape-based and container elements; path-based elements are ignored.
+	if (node.width){
+		node.width.baseVal.value = dim.width;
+		node.height.baseVal.vaule = dim.height;
+	}
+	else if (node.r){
+		node.r.baseVal.value = Math.min(dim.width, dim.height)/2;
+	}
+	else if (node.rx){
+		node.rx.baseVal.value = dim.width/2;
+		node.ry.baseVal.value = dim.height/2;
+	}
+};
+
+/**
+ *	Transformations.
+ */
+dojo.svg.translate = function(node, dx, dy){
+	if (node.transform && node.ownerSVGElement && node.ownerSVGElement.createSVGTransform){
+		var t = node.ownerSVGElement.createSVGTransform();
+		t.setTranslate(dx, dy);
+		node.transform.baseVal.appendItem(t);
+	}
+};
+dojo.svg.scale = function(node, scaleX, scaleY){
+	if (!scaleY) var scaleY = scaleX;
+	if (node.transform && node.ownerSVGElement && node.ownerSVGElement.createSVGTransform){
+		var t = node.ownerSVGElement.createSVGTransform();
+		t.setScale(scaleX, scaleY);
+		node.transform.baseVal.appendItem(t);
+	}
+};
+dojo.svg.rotate = function(node, ang, cx, cy){
+	if (node.transform && node.ownerSVGElement && node.ownerSVGElement.createSVGTransform){
+		var t = node.ownerSVGElement.createSVGTransform();
+		if (!cx) t.setMatrix(t.matrix.rotate(ang));
+		else t.setRotate(ang, cx, cy);
+		node.transform.baseVal.appendItem(t);
+	}
+};
+dojo.svg.skew = function(node, ang, axis){
+	var dir = axis || "x";
+	if (node.transform && node.ownerSVGElement && node.ownerSVGElement.createSVGTransform){
+		var t = node.ownerSVGElement.createSVGTransform();
+		if (dir != "x") t.setSkewY(ang);
+		else t.setSkewX(ang);
+		node.transform.baseVal.appendItem(t);
+	}
+};
+dojo.svg.flip = function(node, axis){
+	var dir = axis || "x";
+	if (node.transform && node.ownerSVGElement && node.ownerSVGElement.createSVGTransform){
+		var t = node.ownerSVGElement.createSVGTransform();
+		t.setMatrix((dir != "x") ? t.matrix.flipY() : t.matrix.flipX());
+		node.transform.baseVal.appendItem(t);
+	}
+};
+dojo.svg.invert = function(node){
+	if (node.transform && node.ownerSVGElement && node.ownerSVGElement.createSVGTransform){
+		var t = node.ownerSVGElement.createSVGTransform();
+		t.setMatrix(t.matrix.inverse());
+		node.transform.baseVal.appendItem(t);
+	}
+};
+dojo.svg.applyMatrix = function(node, a, b, c, d, e, f){
+	if (node.transform && node.ownerSVGElement && node.ownerSVGElement.createSVGTransform){
+		var m;
+		if (b){
+			var m = node.ownerSVGElement.createSVGMatrix();
+			m.a = a;
+			m.b = b;
+			m.c = c;
+			m.d = d;
+			m.e = e;
+			m.f = f;
+		} else m = a;
+		var t = node.ownerSVGElement.createSVGTransform();
+		t.setMatrix(m);
+		node.transform.baseVal.appendItem(t);
+	}
+};
+
+/**
+ *	Grouping and z-index operations.
+ */
+dojo.svg.group = function(nodes){
+	//	expect an array of nodes, attaches the group to the parent of the first node.
+	var p = nodes.item(0).parentNode;
+	var g = document.createElementNS(this.xmlns.svg, "g");
+	for (var i = 0; i < nodes.length; i++) g.appendChild(nodes.item(i));
+	p.appendChild(g);
+	return g;
+};
+dojo.svg.ungroup = function(g){
+	//	puts the children of the group on the same level as group was.
+	var p = g.parentNode;
+	while (g.childNodes.length > 0) p.appendChild(g.childNodes.item(0));
+	p.removeChild(g);
+};
+//	if the node is part of a group, return the group, else return null.
+dojo.svg.getGroup = function(node){
+	//	if the node is part of a group, return the group, else return null.
+	var a = this.getAncestors(node);
+	for (var i = 0; i < a.length; i++){
+		if (a[i].nodeType == this.ELEMENT_NODE && a[i].nodeName.toLowerCase() == "g")
+			return a[i];
+	}
+	return null;
+};
+dojo.svg.bringToFront = function(node){
+	var n = this.getGroup(node) || node;
+	n.ownerSVGElement.appendChild(n);
+};
+dojo.svg.sendToBack = function(node){
+	var n = this.getGroup(node) || node;
+	n.ownerSVGElement.insertBefore(n, n.ownerSVGElement.firstChild);
+};
+//	TODO: possibly push node up a level in the DOM if it's at the beginning or end of the childNodes list.
+dojo.svg.bringForward = function(node){
+	var n = this.getGroup(node) || node;
+	if (this.getLastChildElement(n.parentNode) != n){
+		this.insertAfter(n, this.getNextSiblingElement(n), true);
+	}
+};
+dojo.svg.sendBackward = function(node){
+	var n = this.getGroup(node) || node;
+	if (this.getFirstChildElement(n.parentNode) != n){
+		this.insertBefore(n, this.getPreviousSiblingElement(n), true);
+	}
+};
+//	modded to account for FF 1.5 mixed environment, will try ASVG first, then w3 standard.
+dojo.dom.createNodesFromText = function (txt, wrap){
+	var docFrag;
+	if (window.parseXML) docFrag = parseXML(txt, window.document);
+	else if (window.DOMParser) docFrag = (new DOMParser()).parseFromString(txt, "text/xml");
+	else dojo.raise("dojo.dom.createNodesFromText: environment does not support XML parsing");
+	docFrag.normalize();
+	if(wrap){ 
+		var ret = [docFrag.firstChild.cloneNode(true)];
+		return ret;
+	}
+	var nodes = [];
+	for(var x=0; x<docFrag.childNodes.length; x++){
+		nodes.push(docFrag.childNodes.item(x).cloneNode(true));
+	}
+	// tn.style.display = "none";
+	return nodes;
+}
+
+// FIXME: this should be removed after 0.2 release
+if(!dojo.evalObjPath("dojo.dom.createNodesFromText")) {
+	dojo.dom.createNodesFromText = function() {
+		dojo.deprecated("dojo.dom.createNodesFromText", "use dojo.svg.createNodesFromText instead");
+		dojo.svg.createNodesFromText.apply(dojo.html, arguments);
+	}
+}
+
+//	IE INLINE FIX
+/*
+if (dojo.render.html.ie && dojo.render.svg.adobe){
+	document.write("<object id=\"AdobeSVG\" classid=\"clsid:78156a80-c6a1-4bbf-8e6a-3cd390eeb4e2\"></object>");
+	document.write("<?import namespace=\"svg\" urn=\"http://www.w3.org/2000/svg\" implementation=\"#AdobeSVG\"?>");
+}
+*/
+// vim:ts=4:noet:tw=0:

Added: incubator/webwork2/action/src/main/resources/org/apache/struts/action2/static/dojo/src/text/Builder.js
URL: http://svn.apache.org/viewcvs/incubator/webwork2/action/src/main/resources/org/apache/struts/action2/static/dojo/src/text/Builder.js?rev=393978&view=auto
==============================================================================
--- incubator/webwork2/action/src/main/resources/org/apache/struts/action2/static/dojo/src/text/Builder.js (added)
+++ incubator/webwork2/action/src/main/resources/org/apache/struts/action2/static/dojo/src/text/Builder.js Thu Apr 13 16:46:55 2006
@@ -0,0 +1,16 @@
+/*
+	Copyright (c) 2004-2005, 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.text.Builder");
+dojo.require("dojo.string.Builder");
+
+dj_deprecated("dojo.text.Builder is deprecated, use dojo.string.Builder instead");
+
+dojo.text.Builder = dojo.string.Builder;

Added: incubator/webwork2/action/src/main/resources/org/apache/struts/action2/static/dojo/src/text/String.js
URL: http://svn.apache.org/viewcvs/incubator/webwork2/action/src/main/resources/org/apache/struts/action2/static/dojo/src/text/String.js?rev=393978&view=auto
==============================================================================
--- incubator/webwork2/action/src/main/resources/org/apache/struts/action2/static/dojo/src/text/String.js (added)
+++ incubator/webwork2/action/src/main/resources/org/apache/struts/action2/static/dojo/src/text/String.js Thu Apr 13 16:46:55 2006
@@ -0,0 +1,15 @@
+/*
+	Copyright (c) 2004-2005, 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
+*/
+
+dj_deprecated("dojo.text.String is being replaced by dojo.string");
+dojo.require("dojo.string");
+
+dojo.text = dojo.string;
+dojo.provide("dojo.text.String");

Added: incubator/webwork2/action/src/main/resources/org/apache/struts/action2/static/dojo/src/text/Text.js
URL: http://svn.apache.org/viewcvs/incubator/webwork2/action/src/main/resources/org/apache/struts/action2/static/dojo/src/text/Text.js?rev=393978&view=auto
==============================================================================
--- incubator/webwork2/action/src/main/resources/org/apache/struts/action2/static/dojo/src/text/Text.js (added)
+++ incubator/webwork2/action/src/main/resources/org/apache/struts/action2/static/dojo/src/text/Text.js Thu Apr 13 16:46:55 2006
@@ -0,0 +1,15 @@
+/*
+	Copyright (c) 2004-2005, 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
+*/
+
+dj_deprecated("dojo.text.Text is being replaced by dojo.string");
+dojo.require("dojo.string");
+
+dojo.text = dojo.string;
+dojo.provide("dojo.text.Text");

Added: incubator/webwork2/action/src/main/resources/org/apache/struts/action2/static/dojo/src/text/__package__.js
URL: http://svn.apache.org/viewcvs/incubator/webwork2/action/src/main/resources/org/apache/struts/action2/static/dojo/src/text/__package__.js?rev=393978&view=auto
==============================================================================
--- incubator/webwork2/action/src/main/resources/org/apache/struts/action2/static/dojo/src/text/__package__.js (added)
+++ incubator/webwork2/action/src/main/resources/org/apache/struts/action2/static/dojo/src/text/__package__.js Thu Apr 13 16:46:55 2006
@@ -0,0 +1,17 @@
+/*
+	Copyright (c) 2004-2005, 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.hostenv.conditionalLoadModule({
+	common: [
+		"dojo.text.String",
+		"dojo.text.Builder"
+	]
+});
+dojo.hostenv.moduleLoaded("dojo.text.*");

Added: incubator/webwork2/action/src/main/resources/org/apache/struts/action2/static/dojo/src/text/textDirectory.js
URL: http://svn.apache.org/viewcvs/incubator/webwork2/action/src/main/resources/org/apache/struts/action2/static/dojo/src/text/textDirectory.js?rev=393978&view=auto
==============================================================================
--- incubator/webwork2/action/src/main/resources/org/apache/struts/action2/static/dojo/src/text/textDirectory.js (added)
+++ incubator/webwork2/action/src/main/resources/org/apache/struts/action2/static/dojo/src/text/textDirectory.js Thu Apr 13 16:46:55 2006
@@ -0,0 +1,81 @@
+/*
+	Copyright (c) 2004-2005, 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.text.textDirectory");
+dojo.provide("dojo.text.textDirectory.Property");
+dojo.provide("dojo.text.textDirectory.tokenise");
+dojo.require("dojo.string");
+
+/* adapted from Paul Sowden's iCalendar work */
+
+dojo.textDirectoryTokeniser = function () {}
+
+/*
+ * This class parses a single line from a text/directory file
+ * and returns an object with four named values; name, group, params
+ * and value. name, group and value are strings containing the original
+ * tokens unaltered and values is an array containing name/value pairs
+ * or a single name token packed into arrays.
+ */
+dojo.textDirectoryTokeniser.Property = function (line) {
+	// split into name/value pair
+	var left = dojo.string.trim(line.substring(0, line.indexOf(':')));
+	var right = dojo.string.trim(line.substr(line.indexOf(':') + 1));
+
+	// seperate name and paramters	
+	var parameters = dojo.string.splitEscaped(left,';');
+	this.name = parameters[0]
+	parameters.splice(0, 1);
+
+	// parse paramters
+	this.params = [];
+	for (var i = 0; i < parameters.length; i++) {
+		var arr = parameters[i].split("=");
+		var key = dojo.string.trim(arr[0].toUpperCase());
+		
+		if (arr.length == 1) { this.params.push([key]); continue; }
+		
+		var values = dojo.string.splitEscaped(arr[1],',');
+		for (var j = 0; j < values.length; j++) {
+			if (dojo.string.trim(values[j]) != '') {
+				this.params.push([key, dojo.string.trim(values[j])]);
+			}
+		}
+	}
+
+	// seperate group
+	if (this.name.indexOf('.') > 0) {
+		var arr = this.name.split('.');
+		this.group = arr[0];
+		this.name = arr[1];
+	}
+	
+	// don't do any parsing, leave to implementation
+	this.value = right;
+}
+
+
+// tokeniser, parses into an array of properties.
+dojo.textDirectoryTokeniser.tokenise = function (text) {
+	// normlize to one propterty per line and parse
+	nText = dojo.string.normalizeNewlines(text,"\n");
+	nText = nText.replace(/\n[ \t]/g, '');
+	nText = nText.replace(/\x00/g, '');
+		
+	var lines = nText.split("\n");
+	var properties = []
+
+	for (var i = 0; i < lines.length; i++) {
+		if (dojo.string.trim(lines[i]) == '') { continue; }
+		var prop = new dojo.textDirectoryTokeniser.Property(lines[i]);
+		properties.push(prop);
+	}
+	return properties;
+}

Added: incubator/webwork2/action/src/main/resources/org/apache/struts/action2/static/dojo/src/undo/Manager.js
URL: http://svn.apache.org/viewcvs/incubator/webwork2/action/src/main/resources/org/apache/struts/action2/static/dojo/src/undo/Manager.js?rev=393978&view=auto
==============================================================================
--- incubator/webwork2/action/src/main/resources/org/apache/struts/action2/static/dojo/src/undo/Manager.js (added)
+++ incubator/webwork2/action/src/main/resources/org/apache/struts/action2/static/dojo/src/undo/Manager.js Thu Apr 13 16:46:55 2006
@@ -0,0 +1,91 @@
+/*
+	Copyright (c) 2004-2005, 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.undo.Manager");
+
+dojo.undo.Manager = function () {
+
+	this._undoStack = [];
+	this._redoStack = [];
+
+	this._undoRegistrationLevel = 0;
+}
+
+dojo.undo.Manager.prototype = {
+
+//Registering undo operations
+	//registerUndoWithTarget:selector:object:
+	prepareWithInvocationTarget: function () {},
+	forwardInvocation: function () {},
+
+//Checking undo ability
+	canUndo: false,
+	canRedo: false,
+
+//Performing undo and redo
+	undo: function () {},
+	undoNestedGroup: function () {},
+	redo: function () {},
+
+//Limiting the undo stack
+	setLevelsOfUndo: function (levels) {
+		this.levelsOfUndo = levels;
+		if (levels != 0 && this._undoStack.length > levels) {
+			this._undoStack.splice(levels, this._undoStack.length - levels);
+		}
+	},
+	levelsOfUndo: 0,
+
+//Creating undo groups
+	beginUndoGrouping: function () {},
+	endUndoGrouping: function () {},
+	enableUndoRegistration: function () {
+		if (++this._undoRegistrationLevel >= 0) {
+			this._undoRegistrationLevel = 0;
+			this.isUndoRegistrationEnabled = true;
+		}
+	},
+	groupsByEvent: true,
+	setGroupsByEvent: function (bool) { this.groupsByEvent = bool; },
+	groupingLevel: 0,
+
+//Disabling undo
+	disableUndoRegistration = function () {
+		this.isUndoRegistrationEnabled = false;
+		this._undoRegistrationLevel--;
+	},
+	isUndoRegistrationEnabled: true,
+
+//Checking whether undo or redo is being performed
+	isUndoing: false,
+	isRedoing: false,
+
+//Clearing undo operations
+	removeAllActions: function () {
+		this._undoStack = [];
+		this._redoStack = [];
+	},
+	removeAllActionsWithTarget: function (target) {},
+
+//Setting and getting the action name
+	setActionName: function () {},
+	redoActionName: null,
+	undoActionName: null,
+
+//Getting and localizing menu item title
+	redoMenuItemTitle: null,
+	undoMenuItemTitle: null,
+	redoMenuTitleForUndoActionName: function () {},
+	undoMenuTitleForUndoActionName: function () {},
+      
+//Working with run loops
+	runLoopModes: [],
+	setRunLoopModes: function () {}
+}
\ No newline at end of file

Added: incubator/webwork2/action/src/main/resources/org/apache/struts/action2/static/dojo/src/uri/Uri.js
URL: http://svn.apache.org/viewcvs/incubator/webwork2/action/src/main/resources/org/apache/struts/action2/static/dojo/src/uri/Uri.js?rev=393978&view=auto
==============================================================================
--- incubator/webwork2/action/src/main/resources/org/apache/struts/action2/static/dojo/src/uri/Uri.js (added)
+++ incubator/webwork2/action/src/main/resources/org/apache/struts/action2/static/dojo/src/uri/Uri.js Thu Apr 13 16:46:55 2006
@@ -0,0 +1,108 @@
+/*
+	Copyright (c) 2004-2005, 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.uri.Uri");
+
+dojo.uri = new function() {
+	this.joinPath = function() {
+		// DEPRECATED: use the dojo.uri.Uri object instead
+		var arr = [];
+		for(var i = 0; i < arguments.length; i++) { arr.push(arguments[i]); }
+		return arr.join("/").replace(/\/{2,}/g, "/").replace(/((https*|ftps*):)/i, "$1/");
+	}
+	
+	this.dojoUri = function (uri) {
+		// returns a Uri object resolved relative to the dojo root
+		return new dojo.uri.Uri(dojo.hostenv.getBaseScriptUri(), uri);
+	}
+		
+	this.Uri = function (/*uri1, uri2, [...]*/) {
+		// An object representing a Uri.
+		// Each argument is evaluated in order relative to the next until
+		// a conanical uri is producued. To get an absolute Uri relative
+		// to the current document use
+		//      new dojo.uri.Uri(document.baseURI, uri)
+
+		// TODO: support for IPv6, see RFC 2732
+
+		// resolve uri components relative to each other
+		var uri = arguments[0];
+		for (var i = 1; i < arguments.length; i++) {
+			if(!arguments[i]) { continue; }
+
+			// Safari doesn't support this.constructor so we have to be explicit
+			var relobj = new dojo.uri.Uri(arguments[i].toString());
+			var uriobj = new dojo.uri.Uri(uri.toString());
+
+			if (relobj.path == "" && relobj.scheme == null &&
+				relobj.authority == null && relobj.query == null) {
+				if (relobj.fragment != null) { uriobj.fragment = relobj.fragment; }
+				relobj = uriobj;
+			} else if (relobj.scheme == null) {
+				relobj.scheme = uriobj.scheme;
+			
+				if (relobj.authority == null) {
+					relobj.authority = uriobj.authority;
+					
+					if (relobj.path.charAt(0) != "/") {
+						var path = uriobj.path.substring(0,
+							uriobj.path.lastIndexOf("/") + 1) + relobj.path;
+
+						var segs = path.split("/");
+						for (var j = 0; j < segs.length; j++) {
+							if (segs[j] == ".") {
+								if (j == segs.length - 1) { segs[j] = ""; }
+								else { segs.splice(j, 1); j--; }
+							} else if (j > 0 && !(j == 1 && segs[0] == "") &&
+								segs[j] == ".." && segs[j-1] != "..") {
+
+								if (j == segs.length - 1) { segs.splice(j, 1); segs[j - 1] = ""; }
+								else { segs.splice(j - 1, 2); j -= 2; }
+							}
+						}
+						relobj.path = segs.join("/");
+					}
+				}
+			}
+
+			uri = "";
+			if (relobj.scheme != null) { uri += relobj.scheme + ":"; }
+			if (relobj.authority != null) { uri += "//" + relobj.authority; }
+			uri += relobj.path;
+			if (relobj.query != null) { uri += "?" + relobj.query; }
+			if (relobj.fragment != null) { uri += "#" + relobj.fragment; }
+		}
+
+		this.uri = uri.toString();
+
+		// break the uri into its main components
+		var regexp = "^(([^:/?#]+):)?(//([^/?#]*))?([^?#]*)(\\?([^#]*))?(#(.*))?$";
+	    var r = this.uri.match(new RegExp(regexp));
+
+		this.scheme = r[2] || (r[1] ? "" : null);
+		this.authority = r[4] || (r[3] ? "" : null);
+		this.path = r[5]; // can never be undefined
+		this.query = r[7] || (r[6] ? "" : null);
+		this.fragment  = r[9] || (r[8] ? "" : null);
+		
+		if (this.authority != null) {
+			// server based naming authority
+			regexp = "^((([^:]+:)?([^@]+))@)?([^:]*)(:([0-9]+))?$";
+			r = this.authority.match(new RegExp(regexp));
+			
+			this.user = r[3] || null;
+			this.password = r[4] || null;
+			this.host = r[5];
+			this.port = r[7] || null;
+		}
+	
+		this.toString = function(){ return this.uri; }
+	}
+};

Added: incubator/webwork2/action/src/main/resources/org/apache/struts/action2/static/dojo/src/uri/__package__.js
URL: http://svn.apache.org/viewcvs/incubator/webwork2/action/src/main/resources/org/apache/struts/action2/static/dojo/src/uri/__package__.js?rev=393978&view=auto
==============================================================================
--- incubator/webwork2/action/src/main/resources/org/apache/struts/action2/static/dojo/src/uri/__package__.js (added)
+++ incubator/webwork2/action/src/main/resources/org/apache/struts/action2/static/dojo/src/uri/__package__.js Thu Apr 13 16:46:55 2006
@@ -0,0 +1,14 @@
+/*
+	Copyright (c) 2004-2005, 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.hostenv.conditionalLoadModule({
+	common: ["dojo.uri.Uri", false, false]
+});
+dojo.hostenv.moduleLoaded("dojo.uri.*");



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