You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@struts.apache.org by lu...@apache.org on 2015/05/22 12:59:02 UTC

[35/50] struts git commit: Moves deprecated plugins to struts-archive repo

http://git-wip-us.apache.org/repos/asf/struts/blob/17d73d21/plugins/dojo/src/main/resources/org/apache/struts2/static/dojo/src/dnd/TreeDragAndDropV3.js
----------------------------------------------------------------------
diff --git a/plugins/dojo/src/main/resources/org/apache/struts2/static/dojo/src/dnd/TreeDragAndDropV3.js b/plugins/dojo/src/main/resources/org/apache/struts2/static/dojo/src/dnd/TreeDragAndDropV3.js
deleted file mode 100644
index fdc57e9..0000000
--- a/plugins/dojo/src/main/resources/org/apache/struts2/static/dojo/src/dnd/TreeDragAndDropV3.js
+++ /dev/null
@@ -1,218 +0,0 @@
-/*
-	Copyright (c) 2004-2006, The Dojo Foundation
-	All Rights Reserved.
-
-	Licensed under the Academic Free License version 2.1 or above OR the
-	modified BSD license. For more information on Dojo licensing, see:
-
-		http://dojotoolkit.org/community/licensing.shtml
-*/
-
-
-
-dojo.provide("dojo.dnd.TreeDragAndDropV3");
-dojo.require("dojo.dnd.HtmlDragAndDrop");
-dojo.require("dojo.lang.func");
-dojo.require("dojo.lang.array");
-dojo.require("dojo.lang.extras");
-dojo.require("dojo.Deferred");
-dojo.require("dojo.html.layout");
-dojo.dnd.TreeDragSourceV3 = function (node, syncController, type, treeNode) {
-	this.controller = syncController;
-	this.treeNode = treeNode;
-	dojo.dnd.HtmlDragSource.call(this, node, type);
-};
-dojo.inherits(dojo.dnd.TreeDragSourceV3, dojo.dnd.HtmlDragSource);
-dojo.dnd.TreeDropTargetV3 = function (domNode, controller, type, treeNode) {
-	this.treeNode = treeNode;
-	this.controller = controller;
-	dojo.dnd.HtmlDropTarget.call(this, domNode, type);
-};
-dojo.inherits(dojo.dnd.TreeDropTargetV3, dojo.dnd.HtmlDropTarget);
-dojo.lang.extend(dojo.dnd.TreeDropTargetV3, {autoExpandDelay:1500, autoExpandTimer:null, position:null, indicatorStyle:"2px black groove", showIndicator:function (position) {
-	if (this.position == position) {
-		return;
-	}
-	this.hideIndicator();
-	this.position = position;
-	var node = this.treeNode;
-	node.contentNode.style.width = dojo.html.getBorderBox(node.labelNode).width + "px";
-	if (position == "onto") {
-		node.contentNode.style.border = this.indicatorStyle;
-	} else {
-		if (position == "before") {
-			node.contentNode.style.borderTop = this.indicatorStyle;
-		} else {
-			if (position == "after") {
-				node.contentNode.style.borderBottom = this.indicatorStyle;
-			}
-		}
-	}
-}, hideIndicator:function () {
-	this.treeNode.contentNode.style.borderBottom = "";
-	this.treeNode.contentNode.style.borderTop = "";
-	this.treeNode.contentNode.style.border = "";
-	this.treeNode.contentNode.style.width = "";
-	this.position = null;
-}, onDragOver:function (e) {
-	var accepts = dojo.dnd.HtmlDropTarget.prototype.onDragOver.apply(this, arguments);
-	if (accepts && this.treeNode.isFolder && !this.treeNode.isExpanded) {
-		this.setAutoExpandTimer();
-	}
-	if (accepts) {
-		this.cacheNodeCoords();
-	}
-	return accepts;
-}, accepts:function (dragObjects) {
-	var accepts = dojo.dnd.HtmlDropTarget.prototype.accepts.apply(this, arguments);
-	if (!accepts) {
-		return false;
-	}
-	for (var i = 0; i < dragObjects.length; i++) {
-		var sourceTreeNode = dragObjects[i].treeNode;
-		if (sourceTreeNode === this.treeNode) {
-			return false;
-		}
-	}
-	return true;
-}, setAutoExpandTimer:function () {
-	var _this = this;
-	var autoExpand = function () {
-		if (dojo.dnd.dragManager.currentDropTarget === _this) {
-			_this.controller.expand(_this.treeNode);
-			dojo.dnd.dragManager.cacheTargetLocations();
-		}
-	};
-	this.autoExpandTimer = dojo.lang.setTimeout(autoExpand, _this.autoExpandDelay);
-}, getAcceptPosition:function (e, dragObjects) {
-	var DndMode = this.treeNode.tree.DndMode;
-	if (DndMode & dojo.widget.TreeV3.prototype.DndModes.ONTO && this.treeNode.actionIsDisabledNow(this.treeNode.actions.ADDCHILD)) {
-		DndMode &= ~dojo.widget.TreeV3.prototype.DndModes.ONTO;
-	}
-	var position = this.getPosition(e, DndMode);
-	if (position == "onto") {
-		return position;
-	}
-	for (var i = 0; i < dragObjects.length; i++) {
-		var source = dragObjects[i].dragSource;
-		if (source.treeNode && this.isAdjacentNode(source.treeNode, position)) {
-			continue;
-		}
-		if (!this.controller.canMove(source.treeNode ? source.treeNode : source, this.treeNode.parent)) {
-			return false;
-		}
-	}
-	return position;
-}, onDropEnd:function (e) {
-	this.clearAutoExpandTimer();
-	this.hideIndicator();
-}, onDragOut:function (e) {
-	this.clearAutoExpandTimer();
-	this.hideIndicator();
-}, clearAutoExpandTimer:function () {
-	if (this.autoExpandTimer) {
-		clearTimeout(this.autoExpandTimer);
-		this.autoExpandTimer = null;
-	}
-}, onDragMove:function (e, dragObjects) {
-	var position = this.getAcceptPosition(e, dragObjects);
-	if (position) {
-		this.showIndicator(position);
-	}
-}, isAdjacentNode:function (sourceNode, position) {
-	if (sourceNode === this.treeNode) {
-		return true;
-	}
-	if (sourceNode.getNextSibling() === this.treeNode && position == "before") {
-		return true;
-	}
-	if (sourceNode.getPreviousSibling() === this.treeNode && position == "after") {
-		return true;
-	}
-	return false;
-}, cacheNodeCoords:function () {
-	var node = this.treeNode.contentNode;
-	this.cachedNodeY = dojo.html.getAbsolutePosition(node).y;
-	this.cachedNodeHeight = dojo.html.getBorderBox(node).height;
-}, getPosition:function (e, DndMode) {
-	var mousey = e.pageY || e.clientY + dojo.body().scrollTop;
-	var relY = mousey - this.cachedNodeY;
-	var p = relY / this.cachedNodeHeight;
-	var position = "";
-	if (DndMode & dojo.widget.TreeV3.prototype.DndModes.ONTO && DndMode & dojo.widget.TreeV3.prototype.DndModes.BETWEEN) {
-		if (p <= 0.33) {
-			position = "before";
-		} else {
-			if (p <= 0.66 || this.treeNode.isExpanded && this.treeNode.children.length && !this.treeNode.isLastChild()) {
-				position = "onto";
-			} else {
-				position = "after";
-			}
-		}
-	} else {
-		if (DndMode & dojo.widget.TreeV3.prototype.DndModes.BETWEEN) {
-			if (p <= 0.5 || this.treeNode.isExpanded && this.treeNode.children.length && !this.treeNode.isLastChild()) {
-				position = "before";
-			} else {
-				position = "after";
-			}
-		} else {
-			if (DndMode & dojo.widget.TreeV3.prototype.DndModes.ONTO) {
-				position = "onto";
-			}
-		}
-	}
-	return position;
-}, getTargetParentIndex:function (source, position) {
-	var index = position == "before" ? this.treeNode.getParentIndex() : this.treeNode.getParentIndex() + 1;
-	if (source.treeNode && this.treeNode.parent === source.treeNode.parent && this.treeNode.getParentIndex() > source.treeNode.getParentIndex()) {
-		index--;
-	}
-	return index;
-}, onDrop:function (e) {
-	var position = this.position;
-	var source = e.dragObject.dragSource;
-	var targetParent, targetIndex;
-	if (position == "onto") {
-		targetParent = this.treeNode;
-		targetIndex = 0;
-	} else {
-		targetIndex = this.getTargetParentIndex(source, position);
-		targetParent = this.treeNode.parent;
-	}
-	var r = this.getDropHandler(e, source, targetParent, targetIndex)();
-	return r;
-}, getDropHandler:function (e, source, targetParent, targetIndex) {
-	var handler;
-	var _this = this;
-	handler = function () {
-		var result;
-		if (source.treeNode) {
-			result = _this.controller.move(source.treeNode, targetParent, targetIndex, true);
-		} else {
-			if (dojo.lang.isFunction(source.onDrop)) {
-				source.onDrop(targetParent, targetIndex);
-			}
-			var treeNode = source.getTreeNode();
-			if (treeNode) {
-				result = _this.controller.createChild(targetParent, targetIndex, treeNode, true);
-			} else {
-				result = true;
-			}
-		}
-		if (result instanceof dojo.Deferred) {
-			var isSuccess = result.fired == 0;
-			if (!isSuccess) {
-				_this.handleDropError(source, targetParent, targetIndex, result);
-			}
-			return isSuccess;
-		} else {
-			return result;
-		}
-	};
-	return handler;
-}, handleDropError:function (source, parent, index, result) {
-	dojo.debug("TreeDropTargetV3.handleDropError: DND error occured");
-	dojo.debugShallow(result);
-}});
-

http://git-wip-us.apache.org/repos/asf/struts/blob/17d73d21/plugins/dojo/src/main/resources/org/apache/struts2/static/dojo/src/dnd/__package__.js
----------------------------------------------------------------------
diff --git a/plugins/dojo/src/main/resources/org/apache/struts2/static/dojo/src/dnd/__package__.js b/plugins/dojo/src/main/resources/org/apache/struts2/static/dojo/src/dnd/__package__.js
deleted file mode 100644
index 2ad58bb..0000000
--- a/plugins/dojo/src/main/resources/org/apache/struts2/static/dojo/src/dnd/__package__.js
+++ /dev/null
@@ -1,15 +0,0 @@
-/*
-	Copyright (c) 2004-2006, The Dojo Foundation
-	All Rights Reserved.
-
-	Licensed under the Academic Free License version 2.1 or above OR the
-	modified BSD license. For more information on Dojo licensing, see:
-
-		http://dojotoolkit.org/community/licensing.shtml
-*/
-
-
-
-dojo.kwCompoundRequire({common:["dojo.dnd.DragAndDrop"], browser:["dojo.dnd.HtmlDragAndDrop"], dashboard:["dojo.dnd.HtmlDragAndDrop"]});
-dojo.provide("dojo.dnd.*");
-

http://git-wip-us.apache.org/repos/asf/struts/blob/17d73d21/plugins/dojo/src/main/resources/org/apache/struts2/static/dojo/src/docs.js
----------------------------------------------------------------------
diff --git a/plugins/dojo/src/main/resources/org/apache/struts2/static/dojo/src/docs.js b/plugins/dojo/src/main/resources/org/apache/struts2/static/dojo/src/docs.js
deleted file mode 100644
index 7f872bf..0000000
--- a/plugins/dojo/src/main/resources/org/apache/struts2/static/dojo/src/docs.js
+++ /dev/null
@@ -1,671 +0,0 @@
-/*
-	Copyright (c) 2004-2006, The Dojo Foundation
-	All Rights Reserved.
-
-	Licensed under the Academic Free License version 2.1 or above OR the
-	modified BSD license. For more information on Dojo licensing, see:
-
-		http://dojotoolkit.org/community/licensing.shtml
-*/
-
-dojo.provide("dojo.docs");
-dojo.require("dojo.io.*");
-dojo.require("dojo.event.topic");
-dojo.require("dojo.rpc.JotService");
-dojo.require("dojo.dom");
-dojo.require("dojo.uri.Uri");
-dojo.require("dojo.Deferred");
-dojo.require("dojo.DeferredList");
-
-/*
- * TODO:
- *
- * Package summary needs to compensate for "is"
- * Handle host environments
- * Deal with dojo.widget weirdness
- * Parse parameters
- * Limit function parameters to only the valid ones (Involves packing parameters onto meta during rewriting)
- *
- */
-
-dojo.docs = new function() {
-	this._url = dojo.uri.dojoUri("docscripts");
-	this._rpc = new dojo.rpc.JotService;
-	this._rpc.serviceUrl = dojo.uri.dojoUri("docscripts/jsonrpc.php");
-};
-dojo.lang.mixin(dojo.docs, {
-	_count: 0,
-	_callbacks: {function_names: []},
-	_cache: {}, // Saves the JSON objects in cache
-	require: function(/*String*/ require, /*bool*/ sync) {
-		dojo.debug("require(): " + require);
-		var parts = require.split("/");
-		
-		var size = parts.length;
-		var deferred = new dojo.Deferred;
-		var args = {
-			mimetype: "text/json",
-			load: function(type, data){
-				dojo.debug("require(): loaded for " + require);
-				
-				if(parts[0] != "function_names") {
-					for(var i = 0, part; part = parts[i]; i++){
-						data = data[part];
-					}
-				}
-				deferred.callback(data);
-			},
-			error: function(){
-				deferred.errback();
-			}
-		};
-
-		if(location.protocol == "file:"){
-			if(size){
-				if(parts[parts.length - 1] == "documentation"){
-					parts[parts.length - 1] = "meta";
-				}
-			
-				if(parts[0] == "function_names"){
-					args.url = [this._url, "local_json", "function_names"].join("/");
-				}else{
-					var dirs = parts[0].split(".");
-					args.url = [this._url, "local_json", dirs[0]].join("/");
-					if(dirs.length > 1){
-						args.url = [args.url, dirs[1]].join(".");
-					}
-				}
-			}
-		}
-		
-		dojo.io.bind(args);
-		return deferred;
-	},
-	getFunctionNames: function(){
-		return this.require("function_names"); // dojo.Deferred
-	},
-	unFormat: function(/*String*/ string){
-		var fString = string;
-		if(string.charAt(string.length - 1) == "_"){
-			fString = [string.substring(0, string.length - 1), "*"].join("");
-		}
-		return fString;
-	},
-	getMeta: function(/*String*/ pkg, /*String*/ name, /*Function*/ callback, /*String?*/ id){
-		// summary: Gets information about a function in regards to its meta data
-		if(typeof name == "function"){
-			// pId: a
-			// pkg: ignore
-			id = callback;
-			callback = name;
-			name = pkg;
-			pkg = null;
-			dojo.debug("getMeta(" + name + ")");
-		}else{
-			dojo.debug("getMeta(" + pkg + "/" + name + ")");
-		}
-		
-		if(!id){
-			id = "_";
-		}
-	},
-	_withPkg: function(/*String*/ type, /*Object*/ data, /*Object*/ evt, /*Object*/ input, /*String*/ newType){
-		dojo.debug("_withPkg(" + evt.name + ") has package: " + data[0]);
-		evt.pkg = data[0];
-		if("load" == type && evt.pkg){
-			evt.type = newType;
-		}else{
-			if(evt.callbacks && evt.callbacks.length){
-				evt.callbacks.shift()("error", {}, evt, evt.input);
-			}
-		}
-	},
-	_gotMeta: function(/*String*/ type, /*Object*/ data, /*Object*/ evt){
-		dojo.debug("_gotMeta(" + evt.name + ")");
-
-		var cached = dojo.docs._getCache(evt.pkg, evt.name, "meta", "functions", evt.id);
-		if(cached.summary){
-			data.summary = cached.summary;
-		}
-		if(evt.callbacks && evt.callbacks.length){
-			evt.callbacks.shift()(type, data, evt, evt.input);
-		}
-	},
-	getSrc: function(/*String*/ name, /*Function*/ callback, /*String?*/ id){
-		// summary: Gets src file (created by the doc parser)
-		dojo.debug("getSrc(" + name + ")");
-		if(!id){
-			id = "_";
-		}
-	},
-	getDoc: function(/*String*/ name, /*Function*/ callback, /*String?*/ id){
-		// summary: Gets external documentation stored on Jot for a given function
-		dojo.debug("getDoc(" + name  + ")");
-
-		if(!id){
-			id = "_";
-		}
-
-		var input = {};
-
-		input.type = "doc";
-		input.name = name;
-		input.callbacks = [callback];
-	},
-	_gotDoc: function(/*String*/ type, /*Array*/ data, /*Object*/ evt, /*Object*/ input){
-		dojo.debug("_gotDoc(" + evt.type + ")");
-		
-		evt[evt.type] = data;
-		if(evt.expects && evt.expects.doc){
-			for(var i = 0, expect; expect = evt.expects.doc[i]; i++){
-				if(!(expect in evt)){
-					dojo.debug("_gotDoc() waiting for more data");
-					return;
-				}
-			}
-		}
-		
-		var cache = dojo.docs._getCache(evt.pkg, "meta", "functions", evt.name, evt.id, "meta");
-
-		var description = evt.fn.description;
-		cache.description = description;
-		data = {
-			returns: evt.fn.returns,
-			id: evt.id,
-			variables: []
-		}
-		if(!cache.parameters){
-			cache.parameters = {};
-		}
-		for(var i = 0, param; param = evt.param[i]; i++){
-			var fName = param["DocParamForm/name"];
-			if(!cache.parameters[fName]){
-				cache.parameters[fName] = {};
-			}
-			cache.parameters[fName].description = param["DocParamForm/desc"]
-		}
-
-		data.description = cache.description;
-		data.parameters = cache.parameters;
-		
-		evt.type = "doc";
-	
-		if(evt.callbacks && evt.callbacks.length){
-			evt.callbacks.shift()("load", data, evt, input);
-		}
-	},
-	getPkgDoc: function(/*String*/ name, /*Function*/ callback){
-		// summary: Gets external documentation stored on Jot for a given package
-		dojo.debug("getPkgDoc(" + name + ")");
-		var input = {};
-	},
-	getPkgInfo: function(/*String*/ name, /*Function*/ callback){
-		// summary: Gets a combination of the metadata and external documentation for a given package
-		dojo.debug("getPkgInfo(" + name + ")");
-
-		var input = {
-			expects: {
-				pkginfo: ["pkgmeta", "pkgdoc"]
-			},
-			callback: callback
-		};
-		dojo.docs.getPkgMeta(input, name, dojo.docs._getPkgInfo);
-		dojo.docs.getPkgDoc(input, name, dojo.docs._getPkgInfo);
-	},
-	_getPkgInfo: function(/*String*/ type, /*Object*/ data, /*Object*/ evt){
-		dojo.debug("_getPkgInfo() for " + evt.type);
-		var input = {};
-		var results = {};
-		if(typeof key == "object"){
-			input = key;
-			input[evt.type] = data;
-			if(input.expects && input.expects.pkginfo){
-				for(var i = 0, expect; expect = input.expects.pkginfo[i]; i++){
-					if(!(expect in input)){
-						dojo.debug("_getPkgInfo() waiting for more data");
-						return;
-					}
-				}
-			}
-			results = input.pkgmeta;
-			results.description = input.pkgdoc;
-		}
-
-		if(input.callback){
-			input.callback("load", results, evt);
-		}
-	},
-	getInfo: function(/*String*/ name, /*Function*/ callback){
-		dojo.debug("getInfo(" + name + ")");
-		var input = {
-			expects: {
-				"info": ["meta", "doc"]
-			},
-			callback: callback
-		}
-		dojo.docs.getMeta(input, name, dojo.docs._getInfo);
-		dojo.docs.getDoc(input, name, dojo.docs._getInfo);
-	},
-	_getInfo: function(/*String*/ type, /*String*/ data, /*Object*/ evt, /*Object*/ input){
-		dojo.debug("_getInfo(" + evt.type + ")");
-		if(input && input.expects && input.expects.info){
-			input[evt.type] = data;
-			for(var i = 0, expect; expect = input.expects.info[i]; i++){
-				if(!(expect in input)){
-					dojo.debug("_getInfo() waiting for more data");
-					return;
-				}
-			}
-		}
-
-		if(input.callback){
-			input.callback("load", dojo.docs._getCache(evt.pkg, "meta", "functions", evt.name, evt.id, "meta"), evt, input);
-		}
-	},
-	_getMainText: function(/*String*/ text){
-		// summary: Grabs the innerHTML from a Jot Rech Text node
-		dojo.debug("_getMainText()");
-		return text.replace(/^<html[^<]*>/, "").replace(/<\/html>$/, "").replace(/<\w+\s*\/>/g, "");
-	},
-	getPackageMeta: function(/*Object*/ input){
-		dojo.debug("getPackageMeta(): " + input.package);
-		return this.require(input.package + "/meta", input.sync);
-	},
-	getFunctionMeta: function(/*Object*/ input){
-		var package = input.package || "";
-		var name = input.name;
-		var id = input.id || "_";
-		dojo.debug("getFunctionMeta(): " + name);
-
-		if(!name) return;
-
-		if(package){
-			return this.require(package + "/meta/functions/" + name + "/" + id + "/meta");
-		}else{
-			this.getFunctionNames();
-		}
-	},
-	getFunctionDocumentation: function(/*Object*/ input){
-		var package = input.package || "";
-		var name = input.name;
-		var id = input.id || "_";
-		dojo.debug("getFunctionDocumentation(): " + name);
-		
-		if(!name) return;
-		
-		if(package){
-			return this.require(package + "/meta/functions/" + name + "/" + id + "/documentation");
-		}
-	},
-	_onDocSearch: function(/*Object*/ input){
-		var _this = this;
-		var name = input.name.toLowerCase();
-		if(!name) return;
-
-		this.getFunctionNames().addCallback(function(data){
-			dojo.debug("_onDocSearch(): function names loaded for " + name);
-
-			var output = [];
-			var list = [];
-			var closure = function(pkg, fn) {
-				return function(data){
-					dojo.debug("_onDocSearch(): package meta loaded for: " + pkg);
-					if(data.functions){
-						var functions = data.functions;
-						for(var key in functions){
-							if(fn == key){
-								var ids = functions[key];
-								for(var id in ids){
-									var fnMeta = ids[id];
-									output.push({
-										package: pkg,
-										name: fn,
-										id: id,
-										summary: fnMeta.summary
-									});
-								}
-							}
-						}
-					}
-					return output;
-				}
-			}
-
-			pkgLoop:
-			for(var pkg in data){
-				if(pkg.toLowerCase() == name){
-					name = pkg;
-					dojo.debug("_onDocSearch found a package");
-					//dojo.docs._onDocSelectPackage(input);
-					return;
-				}
-				for(var i = 0, fn; fn = data[pkg][i]; i++){
-					if(fn.toLowerCase().indexOf(name) != -1){
-						dojo.debug("_onDocSearch(): Search matched " + fn);
-						var meta = _this.getPackageMeta({package: pkg});
-						meta.addCallback(closure(pkg, fn));
-						list.push(meta);
-
-						// Build a list of all packages that need to be loaded and their loaded state.
-						continue pkgLoop;
-					}
-				}
-			}
-			
-			list = new dojo.DeferredList(list);
-			list.addCallback(function(results){
-				dojo.debug("_onDocSearch(): All packages loaded");
-				_this._printFunctionResults(results[0][1]);
-			});
-		});
-	},
-	_onDocSearchFn: function(/*String*/ type, /*Array*/ data, /*Object*/ evt){
-		dojo.debug("_onDocSearchFn(" + evt.name + ")");
-
-		var name = evt.name || evt.pkg;
-
-		dojo.debug("_onDocSearchFn found a function");
-
-		evt.pkgs = packages;
-		evt.pkg = name;
-		evt.loaded = 0;
-		for(var i = 0, pkg; pkg = packages[i]; i++){
-			dojo.docs.getPkgMeta(evt, pkg, dojo.docs._onDocResults);
-		}
-	},
-	_onPkgResults: function(/*String*/ type, /*Object*/ data, /*Object*/ evt, /*Object*/ input){
-		dojo.debug("_onPkgResults(" + evt.type + ")");
-		var description = "";
-		var path = "";
-		var methods = {};
-		var requires = {};
-		if(input){
-			input[evt.type] = data;
-			if(input.expects && input.expects.pkgresults){
-				for(var i = 0, expect; expect = input.expects.pkgresults[i]; i++){
-					if(!(expect in input)){
-						dojo.debug("_onPkgResults() waiting for more data");
-						return;
-					}
-				}
-			}
-			path = input.pkgdoc.path;
-			description = input.pkgdoc.description;
-			methods = input.pkgmeta.methods;
-			requires = input.pkgmeta.requires;
-		}
-		var pkg = evt.name.replace("_", "*");
-		var results = {
-			path: path,
-			description: description,
-			size: 0,
-			methods: [],
-			pkg: pkg,
-			requires: requires
-		}
-		var rePrivate = /_[^.]+$/;
-		for(var method in methods){
-			if(!rePrivate.test(method)){
-				for(var pId in methods[method]){
-					results.methods.push({
-						pkg: pkg,
-						name: method,
-						id: pId,
-						summary: methods[method][pId].summary
-					})
-				}
-			}
-		}
-		results.size = results.methods.length;
-		dojo.docs._printPkgResult(results);
-	},
-	_onDocResults: function(/*String*/ type, /*Object*/ data, /*Object*/ evt, /*Object*/ input){
-		dojo.debug("_onDocResults(" + evt.name + "/" + input.pkg + ") " + type);
-		++input.loaded;
-
-		if(input.loaded == input.pkgs.length){
-			var pkgs = input.pkgs;
-			var name = input.pkg;
-			var results = {methods: []};
-			var rePrivate = /_[^.]+$/;
-			data = dojo.docs._cache;
-
-			for(var i = 0, pkg; pkg = pkgs[i]; i++){
-				var methods = dojo.docs._getCache(pkg, "meta", "methods");
-				for(var fn in methods){
-					if(fn.toLowerCase().indexOf(name) == -1){
-						continue;
-					}
-					if(fn != "requires" && !rePrivate.test(fn)){
-						for(var pId in methods[fn]){
-							var result = {
-								pkg: pkg,
-								name: fn,
-								id: "_",
-								summary: ""
-							}
-							if(methods[fn][pId].summary){
-								result.summary = methods[fn][pId].summary;
-							}
-							results.methods.push(result);
-						}
-					}
-				}
-			}
-
-			dojo.debug("Publishing docResults");
-			dojo.docs._printFnResults(results);
-		}
-	},
-	_printFunctionResults: function(results){
-		dojo.debug("_printFnResults(): called");
-		// summary: Call this function to send the /docs/function/results topic
-	},
-	_printPkgResult: function(results){
-		dojo.debug("_printPkgResult(): called");
-	},
-	_onDocSelectFunction: function(/*Object*/ input){
-		// summary: Get doc, meta, and src
-		var name = input.name;
-		var package = input.package || "";
-		var id = input.id || "_";
-		dojo.debug("_onDocSelectFunction(" + name + ")");
-		if(!name || !package) return false;
-
-		var pkgMeta = this.getPackageMeta({package: package});
-		var meta = this.getFunctionMeta({package: package, name: name, id: id});
-		var doc = this.getFunctionDocumentation({package: package, name: name, id: id});
-		
-		var list = new dojo.DeferredList([pkgMeta, meta, doc]);
-		list.addCallback(function(results){
-			dojo.debug("_onDocSelectFunction() loaded");
-			for(var i = 0, result; result = results[i]; i++){
-				dojo.debugShallow(result[1]);
-			}
-		});
-		
-		return list;
-	},
-	_onDocSelectPackage: function(/*Object*/ input){
-		dojo.debug("_onDocSelectPackage(" + input.name + ")")
-		input.expects = {
-			"pkgresults": ["pkgmeta", "pkgdoc"]
-		};
-		dojo.docs.getPkgMeta(input, input.name, dojo.docs._onPkgResults);
-		dojo.docs.getPkgDoc(input, input.name, dojo.docs._onPkgResults);
-	},
-	_onDocSelectResults: function(/*String*/ type, /*Object*/ data, /*Object*/ evt, /*Object*/ input){
-		dojo.debug("_onDocSelectResults(" + evt.type + ", " + evt.name + ")");
-		if(evt.type == "meta"){
-			dojo.docs.getPkgMeta(input, evt.pkg, dojo.docs._onDocSelectResults);
-		}
-		if(input){
-			input[evt.type] = data;
-			if(input.expects && input.expects.docresults){
-				for(var i = 0, expect; expect = input.expects.docresults[i]; i++){
-					if(!(expect in input)){
-						dojo.debug("_onDocSelectResults() waiting for more data");
-						return;
-					}
-				}
-			}
-		}
-
-		dojo.docs._printFunctionDetail(input);
-	},
-	
-	_printFunctionDetail: function(results) {
-		// summary: Call this function to send the /docs/function/detail topic event
-	},
-
-	selectFunction: function(/*String*/ name, /*String?*/ id){
-		// summary: The combined information
-	},
-	savePackage: function(/*Object*/ callbackObject, /*String*/ callback, /*Object*/ parameters){
-		dojo.event.kwConnect({
-			srcObj: dojo.docs,
-			srcFunc: "_savedPkgRpc",
-			targetObj: callbackObject,
-			targetFunc: callback,
-			once: true
-		});
-		
-		var props = {};
-		var cache = dojo.docs._getCache(parameters.pkg, "meta");
-
-		var i = 1;
-
-		if(!cache.path){
-			var path = "id";
-			props[["pname", i].join("")] = "DocPkgForm/require";
-			props[["pvalue", i++].join("")] = parameters.pkg;
-		}else{
-			var path = cache.path;
-		}
-
-		props.form = "//DocPkgForm";
-		props.path = ["/WikiHome/DojoDotDoc/", path].join("");
-
-		if(parameters.description){
-			props[["pname", i].join("")] = "main/text";
-			props[["pvalue", i++].join("")] = parameters.description;
-		}
-		
-		dojo.docs._rpc.callRemote("saveForm",	props).addCallbacks(dojo.docs._pkgRpc, dojo.docs._pkgRpc);
-	},
-	_pkgRpc: function(data){
-		if(data.name){
-			dojo.docs._getCache(data["DocPkgForm/require"], "meta").path = data.name;
-			dojo.docs._savedPkgRpc("load");
-		}else{
-			dojo.docs._savedPkgRpc("error");
-		}
-	},
-	_savedPkgRpc: function(type){
-	},
-	functionPackages: function(/*String*/ name, /*Function*/ callback, /*Object*/ input){
-		// summary: Gets the package associated with a function and stores it in the .pkg value of input
-		dojo.debug("functionPackages() name: " + name);
-
-		if(!input){
-			input = {};
-		}
-		if(!input.callbacks){
-			input.callbacks = [];
-		}
-
-		input.type = "function_names";
-		input.name = name;
-		input.callbacks.unshift(callback);
-		input.callbacks.unshift(dojo.docs._functionPackages);
-	},
-	_functionPackages: function(/*String*/ type, /*Array*/ data, /*Object*/ evt){
-		dojo.debug("_functionPackages() name: " + evt.name);
-		evt.pkg = '';
-
-		var results = [];
-		var data = dojo.docs._cache['function_names'];
-		for(var key in data){
-			if(dojo.lang.inArray(data[key], evt.name)){
-				dojo.debug("_functionPackages() package: " + key);
-				results.push(key);
-			}
-		}
-
-		if(evt.callbacks && evt.callbacks.length){
-			evt.callbacks.shift()(type, results, evt, evt.input);
-		}
-	},
-	setUserName: function(/*String*/ name){
-		dojo.docs._userName = name;
-		if(name && dojo.docs._password){
-			dojo.docs._logIn();
-		}
-	},
-	setPassword: function(/*String*/ password){
-		dojo.docs._password = password;
-		if(password && dojo.docs._userName){
-			dojo.docs._logIn();
-		}
-	},
-	_logIn: function(){
-		dojo.io.bind({
-			url: dojo.docs._rpc.serviceUrl.toString(),
-			method: "post",
-			mimetype: "text/json",
-			content: {
-				username: dojo.docs._userName,
-				password: dojo.docs._password
-			},
-			load: function(type, data){
-				if(data.error){
-					dojo.docs.logInSuccess();
-				}else{
-					dojo.docs.logInFailure();
-				}
-			},
-			error: function(){
-				dojo.docs.logInFailure();
-			}
-		});
-	},
-	logInSuccess: function(){},
-	logInFailure: function(){},
-	_set: function(/*Object*/ base, /*String...*/ keys, /*String*/ value){
-		var args = [];
-		for(var i = 0, arg; arg = arguments[i]; i++){
-			args.push(arg);
-		}
-
-		if(args.length < 3) return;
-		base = args.shift();
-		value = args.pop();
-		var key = args.pop();
-		for(var i = 0, arg; arg = args[i]; i++){
-			if(typeof base[arg] != "object"){
-				base[arg] = {};
-			}
-			base = base[arg];
-		}
-		base[key] = value;
-	},
-	_getCache: function(/*String...*/ keys){
-		var obj = dojo.docs._cache;
-		for(var i = 0; i < arguments.length; i++){
-			var arg = arguments[i];
-			if(!obj[arg]){
-				obj[arg] = {};
-			}
-			obj = obj[arg];
-		}
-		return obj;
-	}
-});
-
-dojo.event.topic.subscribe("/docs/search", dojo.docs, "_onDocSearch");
-dojo.event.topic.subscribe("/docs/function/select", dojo.docs, "_onDocSelectFunction");
-dojo.event.topic.subscribe("/docs/package/select", dojo.docs, "_onDocSelectPackage");
-
-dojo.event.topic.registerPublisher("/docs/function/results", dojo.docs, "_printFunctionResults");
-dojo.event.topic.registerPublisher("/docs/function/detail", dojo.docs, "_printFunctionDetail");
-dojo.event.topic.registerPublisher("/docs/package/detail", dojo.docs, "_printPkgResult");

http://git-wip-us.apache.org/repos/asf/struts/blob/17d73d21/plugins/dojo/src/main/resources/org/apache/struts2/static/dojo/src/dom.js
----------------------------------------------------------------------
diff --git a/plugins/dojo/src/main/resources/org/apache/struts2/static/dojo/src/dom.js b/plugins/dojo/src/main/resources/org/apache/struts2/static/dojo/src/dom.js
deleted file mode 100644
index 52179e2..0000000
--- a/plugins/dojo/src/main/resources/org/apache/struts2/static/dojo/src/dom.js
+++ /dev/null
@@ -1,381 +0,0 @@
-/*
-	Copyright (c) 2004-2006, The Dojo Foundation
-	All Rights Reserved.
-
-	Licensed under the Academic Free License version 2.1 or above OR the
-	modified BSD license. For more information on Dojo licensing, see:
-
-		http://dojotoolkit.org/community/licensing.shtml
-*/
-
-
-
-dojo.provide("dojo.dom");
-dojo.dom.ELEMENT_NODE = 1;
-dojo.dom.ATTRIBUTE_NODE = 2;
-dojo.dom.TEXT_NODE = 3;
-dojo.dom.CDATA_SECTION_NODE = 4;
-dojo.dom.ENTITY_REFERENCE_NODE = 5;
-dojo.dom.ENTITY_NODE = 6;
-dojo.dom.PROCESSING_INSTRUCTION_NODE = 7;
-dojo.dom.COMMENT_NODE = 8;
-dojo.dom.DOCUMENT_NODE = 9;
-dojo.dom.DOCUMENT_TYPE_NODE = 10;
-dojo.dom.DOCUMENT_FRAGMENT_NODE = 11;
-dojo.dom.NOTATION_NODE = 12;
-dojo.dom.dojoml = "http://www.dojotoolkit.org/2004/dojoml";
-dojo.dom.xmlns = {svg:"http://www.w3.org/2000/svg", smil:"http://www.w3.org/2001/SMIL20/", mml:"http://www.w3.org/1998/Math/MathML", cml:"http://www.xml-cml.org", xlink:"http://www.w3.org/1999/xlink", xhtml:"http://www.w3.org/1999/xhtml", xul:"http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul", xbl:"http://www.mozilla.org/xbl", fo:"http://www.w3.org/1999/XSL/Format", xsl:"http://www.w3.org/1999/XSL/Transform", xslt:"http://www.w3.org/1999/XSL/Transform", xi:"http://www.w3.org/2001/XInclude", xforms:"http://www.w3.org/2002/01/xforms", saxon:"http://icl.com/saxon", xalan:"http://xml.apache.org/xslt", xsd:"http://www.w3.org/2001/XMLSchema", dt:"http://www.w3.org/2001/XMLSchema-datatypes", xsi:"http://www.w3.org/2001/XMLSchema-instance", rdf:"http://www.w3.org/1999/02/22-rdf-syntax-ns#", rdfs:"http://www.w3.org/2000/01/rdf-schema#", dc:"http://purl.org/dc/elements/1.1/", dcq:"http://purl.org/dc/qualifiers/1.0", "soap-env":"http://schemas.xmlsoap.org/soap/envelope/", wsdl:"ht
 tp://schemas.xmlsoap.org/wsdl/", AdobeExtensions:"http://ns.adobe.com/AdobeSVGViewerExtensions/3.0/"};
-dojo.dom.isNode = function (wh) {
-	if (typeof Element == "function") {
-		try {
-			return wh instanceof Element;
-		}
-		catch (e) {
-		}
-	} else {
-		return wh && !isNaN(wh.nodeType);
-	}
-};
-dojo.dom.getUniqueId = function () {
-	var _document = dojo.doc();
-	do {
-		var id = "dj_unique_" + (++arguments.callee._idIncrement);
-	} while (_document.getElementById(id));
-	return id;
-};
-dojo.dom.getUniqueId._idIncrement = 0;
-dojo.dom.firstElement = dojo.dom.getFirstChildElement = function (parentNode, tagName) {
-	var node = parentNode.firstChild;
-	while (node && node.nodeType != dojo.dom.ELEMENT_NODE) {
-		node = node.nextSibling;
-	}
-	if (tagName && node && node.tagName && node.tagName.toLowerCase() != tagName.toLowerCase()) {
-		node = dojo.dom.nextElement(node, tagName);
-	}
-	return node;
-};
-dojo.dom.lastElement = dojo.dom.getLastChildElement = function (parentNode, tagName) {
-	var node = parentNode.lastChild;
-	while (node && node.nodeType != dojo.dom.ELEMENT_NODE) {
-		node = node.previousSibling;
-	}
-	if (tagName && node && node.tagName && node.tagName.toLowerCase() != tagName.toLowerCase()) {
-		node = dojo.dom.prevElement(node, tagName);
-	}
-	return node;
-};
-dojo.dom.nextElement = dojo.dom.getNextSiblingElement = function (node, tagName) {
-	if (!node) {
-		return null;
-	}
-	do {
-		node = node.nextSibling;
-	} while (node && node.nodeType != dojo.dom.ELEMENT_NODE);
-	if (node && tagName && tagName.toLowerCase() != node.tagName.toLowerCase()) {
-		return dojo.dom.nextElement(node, tagName);
-	}
-	return node;
-};
-dojo.dom.prevElement = dojo.dom.getPreviousSiblingElement = function (node, tagName) {
-	if (!node) {
-		return null;
-	}
-	if (tagName) {
-		tagName = tagName.toLowerCase();
-	}
-	do {
-		node = node.previousSibling;
-	} while (node && node.nodeType != dojo.dom.ELEMENT_NODE);
-	if (node && tagName && tagName.toLowerCase() != node.tagName.toLowerCase()) {
-		return dojo.dom.prevElement(node, tagName);
-	}
-	return node;
-};
-dojo.dom.moveChildren = function (srcNode, destNode, trim) {
-	var count = 0;
-	if (trim) {
-		while (srcNode.hasChildNodes() && srcNode.firstChild.nodeType == dojo.dom.TEXT_NODE) {
-			srcNode.removeChild(srcNode.firstChild);
-		}
-		while (srcNode.hasChildNodes() && srcNode.lastChild.nodeType == dojo.dom.TEXT_NODE) {
-			srcNode.removeChild(srcNode.lastChild);
-		}
-	}
-	while (srcNode.hasChildNodes()) {
-		destNode.appendChild(srcNode.firstChild);
-		count++;
-	}
-	return count;
-};
-dojo.dom.copyChildren = function (srcNode, destNode, trim) {
-	var clonedNode = srcNode.cloneNode(true);
-	return this.moveChildren(clonedNode, destNode, trim);
-};
-dojo.dom.replaceChildren = function (node, newChild) {
-	var nodes = [];
-	if (dojo.render.html.ie) {
-		for (var i = 0; i < node.childNodes.length; i++) {
-			nodes.push(node.childNodes[i]);
-		}
-	}
-	dojo.dom.removeChildren(node);
-	node.appendChild(newChild);
-	for (var i = 0; i < nodes.length; i++) {
-		dojo.dom.destroyNode(nodes[i]);
-	}
-};
-dojo.dom.removeChildren = function (node) {
-	var count = node.childNodes.length;
-	while (node.hasChildNodes()) {
-		dojo.dom.removeNode(node.firstChild);
-	}
-	return count;
-};
-dojo.dom.replaceNode = function (node, newNode) {
-	return node.parentNode.replaceChild(newNode, node);
-};
-dojo.dom.destroyNode = function (node) {
-	if (node.parentNode) {
-		node = dojo.dom.removeNode(node);
-	}
-	if (node.nodeType != 3) {
-		if (dojo.evalObjPath("dojo.event.browser.clean", false)) {
-			dojo.event.browser.clean(node);
-		}
-		if (dojo.render.html.ie) {
-			node.outerHTML = "";
-		}
-	}
-};
-dojo.dom.removeNode = function (node) {
-	if (node && node.parentNode) {
-		return node.parentNode.removeChild(node);
-	}
-};
-dojo.dom.getAncestors = function (node, filterFunction, returnFirstHit) {
-	var ancestors = [];
-	var isFunction = (filterFunction && (filterFunction instanceof Function || typeof filterFunction == "function"));
-	while (node) {
-		if (!isFunction || filterFunction(node)) {
-			ancestors.push(node);
-		}
-		if (returnFirstHit && ancestors.length > 0) {
-			return ancestors[0];
-		}
-		node = node.parentNode;
-	}
-	if (returnFirstHit) {
-		return null;
-	}
-	return ancestors;
-};
-dojo.dom.getAncestorsByTag = function (node, tag, returnFirstHit) {
-	tag = tag.toLowerCase();
-	return dojo.dom.getAncestors(node, function (el) {
-		return ((el.tagName) && (el.tagName.toLowerCase() == tag));
-	}, returnFirstHit);
-};
-dojo.dom.getFirstAncestorByTag = function (node, tag) {
-	return dojo.dom.getAncestorsByTag(node, tag, true);
-};
-dojo.dom.isDescendantOf = function (node, ancestor, guaranteeDescendant) {
-	if (guaranteeDescendant && node) {
-		node = node.parentNode;
-	}
-	while (node) {
-		if (node == ancestor) {
-			return true;
-		}
-		node = node.parentNode;
-	}
-	return false;
-};
-dojo.dom.innerXML = function (node) {
-	if (node.innerXML) {
-		return node.innerXML;
-	} else {
-		if (node.xml) {
-			return node.xml;
-		} else {
-			if (typeof XMLSerializer != "undefined") {
-				return (new XMLSerializer()).serializeToString(node);
-			}
-		}
-	}
-};
-dojo.dom.createDocument = function () {
-	var doc = null;
-	var _document = dojo.doc();
-	if (!dj_undef("ActiveXObject")) {
-		var prefixes = ["MSXML2", "Microsoft", "MSXML", "MSXML3"];
-		for (var i = 0; i < prefixes.length; i++) {
-			try {
-				doc = new ActiveXObject(prefixes[i] + ".XMLDOM");
-			}
-			catch (e) {
-			}
-			if (doc) {
-				break;
-			}
-		}
-	} else {
-		if ((_document.implementation) && (_document.implementation.createDocument)) {
-			doc = _document.implementation.createDocument("", "", null);
-		}
-	}
-	return doc;
-};
-dojo.dom.createDocumentFromText = function (str, mimetype) {
-	if (!mimetype) {
-		mimetype = "text/xml";
-	}
-	if (!dj_undef("DOMParser")) {
-		var parser = new DOMParser();
-		return parser.parseFromString(str, mimetype);
-	} else {
-		if (!dj_undef("ActiveXObject")) {
-			var domDoc = dojo.dom.createDocument();
-			if (domDoc) {
-				domDoc.async = false;
-				domDoc.loadXML(str);
-				return domDoc;
-			} else {
-				dojo.debug("toXml didn't work?");
-			}
-		} else {
-			var _document = dojo.doc();
-			if (_document.createElement) {
-				var tmp = _document.createElement("xml");
-				tmp.innerHTML = str;
-				if (_document.implementation && _document.implementation.createDocument) {
-					var xmlDoc = _document.implementation.createDocument("foo", "", null);
-					for (var i = 0; i < tmp.childNodes.length; i++) {
-						xmlDoc.importNode(tmp.childNodes.item(i), true);
-					}
-					return xmlDoc;
-				}
-				return ((tmp.document) && (tmp.document.firstChild ? tmp.document.firstChild : tmp));
-			}
-		}
-	}
-	return null;
-};
-dojo.dom.prependChild = function (node, parent) {
-	if (parent.firstChild) {
-		parent.insertBefore(node, parent.firstChild);
-	} else {
-		parent.appendChild(node);
-	}
-	return true;
-};
-dojo.dom.insertBefore = function (node, ref, force) {
-	if ((force != true) && (node === ref || node.nextSibling === ref)) {
-		return false;
-	}
-	var parent = ref.parentNode;
-	parent.insertBefore(node, ref);
-	return true;
-};
-dojo.dom.insertAfter = function (node, ref, force) {
-	var pn = ref.parentNode;
-	if (ref == pn.lastChild) {
-		if ((force != true) && (node === ref)) {
-			return false;
-		}
-		pn.appendChild(node);
-	} else {
-		return this.insertBefore(node, ref.nextSibling, force);
-	}
-	return true;
-};
-dojo.dom.insertAtPosition = function (node, ref, position) {
-	if ((!node) || (!ref) || (!position)) {
-		return false;
-	}
-	switch (position.toLowerCase()) {
-	  case "before":
-		return dojo.dom.insertBefore(node, ref);
-	  case "after":
-		return dojo.dom.insertAfter(node, ref);
-	  case "first":
-		if (ref.firstChild) {
-			return dojo.dom.insertBefore(node, ref.firstChild);
-		} else {
-			ref.appendChild(node);
-			return true;
-		}
-		break;
-	  default:
-		ref.appendChild(node);
-		return true;
-	}
-};
-dojo.dom.insertAtIndex = function (node, containingNode, insertionIndex) {
-	var siblingNodes = containingNode.childNodes;
-	if (!siblingNodes.length || siblingNodes.length == insertionIndex) {
-		containingNode.appendChild(node);
-		return true;
-	}
-	if (insertionIndex == 0) {
-		return dojo.dom.prependChild(node, containingNode);
-	}
-	return dojo.dom.insertAfter(node, siblingNodes[insertionIndex - 1]);
-};
-dojo.dom.textContent = function (node, text) {
-	if (arguments.length > 1) {
-		var _document = dojo.doc();
-		dojo.dom.replaceChildren(node, _document.createTextNode(text));
-		return text;
-	} else {
-		if (node.textContent != undefined) {
-			return node.textContent;
-		}
-		var _result = "";
-		if (node == null) {
-			return _result;
-		}
-		for (var i = 0; i < node.childNodes.length; i++) {
-			switch (node.childNodes[i].nodeType) {
-			  case 1:
-			  case 5:
-				_result += dojo.dom.textContent(node.childNodes[i]);
-				break;
-			  case 3:
-			  case 2:
-			  case 4:
-				_result += node.childNodes[i].nodeValue;
-				break;
-			  default:
-				break;
-			}
-		}
-		return _result;
-	}
-};
-dojo.dom.hasParent = function (node) {
-	return Boolean(node && node.parentNode && dojo.dom.isNode(node.parentNode));
-};
-dojo.dom.isTag = function (node) {
-	if (node && node.tagName) {
-		for (var i = 1; i < arguments.length; i++) {
-			if (node.tagName == String(arguments[i])) {
-				return String(arguments[i]);
-			}
-		}
-	}
-	return "";
-};
-dojo.dom.setAttributeNS = function (elem, namespaceURI, attrName, attrValue) {
-	if (elem == null || ((elem == undefined) && (typeof elem == "undefined"))) {
-		dojo.raise("No element given to dojo.dom.setAttributeNS");
-	}
-	if (!((elem.setAttributeNS == undefined) && (typeof elem.setAttributeNS == "undefined"))) {
-		elem.setAttributeNS(namespaceURI, attrName, attrValue);
-	} else {
-		var ownerDoc = elem.ownerDocument;
-		var attribute = ownerDoc.createNode(2, attrName, namespaceURI);
-		attribute.nodeValue = attrValue;
-		elem.setAttributeNode(attribute);
-	}
-};
-

http://git-wip-us.apache.org/repos/asf/struts/blob/17d73d21/plugins/dojo/src/main/resources/org/apache/struts2/static/dojo/src/event.js
----------------------------------------------------------------------
diff --git a/plugins/dojo/src/main/resources/org/apache/struts2/static/dojo/src/event.js b/plugins/dojo/src/main/resources/org/apache/struts2/static/dojo/src/event.js
deleted file mode 100644
index 43fe345..0000000
--- a/plugins/dojo/src/main/resources/org/apache/struts2/static/dojo/src/event.js
+++ /dev/null
@@ -1,16 +0,0 @@
-/*
-	Copyright (c) 2004-2006, The Dojo Foundation
-	All Rights Reserved.
-
-	Licensed under the Academic Free License version 2.1 or above OR the
-	modified BSD license. For more information on Dojo licensing, see:
-
-		http://dojotoolkit.org/community/licensing.shtml
-*/
-
-
-
-dojo.provide("dojo.event");
-dojo.require("dojo.event.*");
-dojo.deprecated("dojo.event", "replaced by dojo.event.*", "0.5");
-

http://git-wip-us.apache.org/repos/asf/struts/blob/17d73d21/plugins/dojo/src/main/resources/org/apache/struts2/static/dojo/src/event/__package__.js
----------------------------------------------------------------------
diff --git a/plugins/dojo/src/main/resources/org/apache/struts2/static/dojo/src/event/__package__.js b/plugins/dojo/src/main/resources/org/apache/struts2/static/dojo/src/event/__package__.js
deleted file mode 100644
index 90addbc..0000000
--- a/plugins/dojo/src/main/resources/org/apache/struts2/static/dojo/src/event/__package__.js
+++ /dev/null
@@ -1,15 +0,0 @@
-/*
-	Copyright (c) 2004-2006, The Dojo Foundation
-	All Rights Reserved.
-
-	Licensed under the Academic Free License version 2.1 or above OR the
-	modified BSD license. For more information on Dojo licensing, see:
-
-		http://dojotoolkit.org/community/licensing.shtml
-*/
-
-
-
-dojo.kwCompoundRequire({common:["dojo.event.common", "dojo.event.topic"], browser:["dojo.event.browser"], dashboard:["dojo.event.browser"]});
-dojo.provide("dojo.event.*");
-

http://git-wip-us.apache.org/repos/asf/struts/blob/17d73d21/plugins/dojo/src/main/resources/org/apache/struts2/static/dojo/src/event/browser.js
----------------------------------------------------------------------
diff --git a/plugins/dojo/src/main/resources/org/apache/struts2/static/dojo/src/event/browser.js b/plugins/dojo/src/main/resources/org/apache/struts2/static/dojo/src/event/browser.js
deleted file mode 100644
index 44ab779..0000000
--- a/plugins/dojo/src/main/resources/org/apache/struts2/static/dojo/src/event/browser.js
+++ /dev/null
@@ -1,491 +0,0 @@
-/*
-	Copyright (c) 2004-2006, The Dojo Foundation
-	All Rights Reserved.
-
-	Licensed under the Academic Free License version 2.1 or above OR the
-	modified BSD license. For more information on Dojo licensing, see:
-
-		http://dojotoolkit.org/community/licensing.shtml
-*/
-
-
-
-dojo.provide("dojo.event.browser");
-dojo.require("dojo.event.common");
-dojo._ie_clobber = new function () {
-	this.clobberNodes = [];
-	function nukeProp(node, prop) {
-		try {
-			node[prop] = null;
-		}
-		catch (e) {
-		}
-		try {
-			delete node[prop];
-		}
-		catch (e) {
-		}
-		try {
-			node.removeAttribute(prop);
-		}
-		catch (e) {
-		}
-	}
-	this.clobber = function (nodeRef) {
-		var na;
-		var tna;
-		if (nodeRef) {
-			tna = nodeRef.all || nodeRef.getElementsByTagName("*");
-			na = [nodeRef];
-			for (var x = 0; x < tna.length; x++) {
-				if (tna[x]["__doClobber__"]) {
-					na.push(tna[x]);
-				}
-			}
-		} else {
-			try {
-				window.onload = null;
-			}
-			catch (e) {
-			}
-			na = (this.clobberNodes.length) ? this.clobberNodes : document.all;
-		}
-		tna = null;
-		var basis = {};
-		for (var i = na.length - 1; i >= 0; i = i - 1) {
-			var el = na[i];
-			try {
-				if (el && el["__clobberAttrs__"]) {
-					for (var j = 0; j < el.__clobberAttrs__.length; j++) {
-						nukeProp(el, el.__clobberAttrs__[j]);
-					}
-					nukeProp(el, "__clobberAttrs__");
-					nukeProp(el, "__doClobber__");
-				}
-			}
-			catch (e) {
-			}
-		}
-		na = null;
-	};
-};
-if (dojo.render.html.ie) {
-	dojo.addOnUnload(function () {
-		dojo._ie_clobber.clobber();
-		try {
-			if ((dojo["widget"]) && (dojo.widget["manager"])) {
-				dojo.widget.manager.destroyAll();
-			}
-		}
-		catch (e) {
-		}
-		if (dojo.widget) {
-			for (var name in dojo.widget._templateCache) {
-				if (dojo.widget._templateCache[name].node) {
-					dojo.dom.destroyNode(dojo.widget._templateCache[name].node);
-					dojo.widget._templateCache[name].node = null;
-					delete dojo.widget._templateCache[name].node;
-				}
-			}
-		}
-		try {
-			window.onload = null;
-		}
-		catch (e) {
-		}
-		try {
-			window.onunload = null;
-		}
-		catch (e) {
-		}
-		dojo._ie_clobber.clobberNodes = [];
-	});
-}
-dojo.event.browser = new function () {
-	var clobberIdx = 0;
-	this.normalizedEventName = function (eventName) {
-		switch (eventName) {
-		  case "CheckboxStateChange":
-		  case "DOMAttrModified":
-		  case "DOMMenuItemActive":
-		  case "DOMMenuItemInactive":
-		  case "DOMMouseScroll":
-		  case "DOMNodeInserted":
-		  case "DOMNodeRemoved":
-		  case "RadioStateChange":
-			return eventName;
-			break;
-		  default:
-			var lcn = eventName.toLowerCase();
-			return (lcn.indexOf("on") == 0) ? lcn.substr(2) : lcn;
-			break;
-		}
-	};
-	this.clean = function (node) {
-		if (dojo.render.html.ie) {
-			dojo._ie_clobber.clobber(node);
-		}
-	};
-	this.addClobberNode = function (node) {
-		if (!dojo.render.html.ie) {
-			return;
-		}
-		if (!node["__doClobber__"]) {
-			node.__doClobber__ = true;
-			dojo._ie_clobber.clobberNodes.push(node);
-			node.__clobberAttrs__ = [];
-		}
-	};
-	this.addClobberNodeAttrs = function (node, props) {
-		if (!dojo.render.html.ie) {
-			return;
-		}
-		this.addClobberNode(node);
-		for (var x = 0; x < props.length; x++) {
-			node.__clobberAttrs__.push(props[x]);
-		}
-	};
-	this.removeListener = function (node, evtName, fp, capture) {
-		if (!capture) {
-			var capture = false;
-		}
-		evtName = dojo.event.browser.normalizedEventName(evtName);
-		if (evtName == "key") {
-			if (dojo.render.html.ie) {
-				this.removeListener(node, "onkeydown", fp, capture);
-			}
-			evtName = "keypress";
-		}
-		if (node.removeEventListener) {
-			node.removeEventListener(evtName, fp, capture);
-		}
-	};
-	this.addListener = function (node, evtName, fp, capture, dontFix) {
-		if (!node) {
-			return;
-		}
-		if (!capture) {
-			var capture = false;
-		}
-		evtName = dojo.event.browser.normalizedEventName(evtName);
-		if (evtName == "key") {
-			if (dojo.render.html.ie) {
-				this.addListener(node, "onkeydown", fp, capture, dontFix);
-			}
-			evtName = "keypress";
-		}
-		if (!dontFix) {
-			var newfp = function (evt) {
-				if (!evt) {
-					evt = window.event;
-				}
-				var ret = fp(dojo.event.browser.fixEvent(evt, this));
-				if (capture) {
-					dojo.event.browser.stopEvent(evt);
-				}
-				return ret;
-			};
-		} else {
-			newfp = fp;
-		}
-		if (node.addEventListener) {
-			node.addEventListener(evtName, newfp, capture);
-			return newfp;
-		} else {
-			evtName = "on" + evtName;
-			if (typeof node[evtName] == "function") {
-				var oldEvt = node[evtName];
-				node[evtName] = function (e) {
-					oldEvt(e);
-					return newfp(e);
-				};
-			} else {
-				node[evtName] = newfp;
-			}
-			if (dojo.render.html.ie) {
-				this.addClobberNodeAttrs(node, [evtName]);
-			}
-			return newfp;
-		}
-	};
-	this.isEvent = function (obj) {
-		return (typeof obj != "undefined") && (obj) && (typeof Event != "undefined") && (obj.eventPhase);
-	};
-	this.currentEvent = null;
-	this.callListener = function (listener, curTarget) {
-		if (typeof listener != "function") {
-			dojo.raise("listener not a function: " + listener);
-		}
-		dojo.event.browser.currentEvent.currentTarget = curTarget;
-		return listener.call(curTarget, dojo.event.browser.currentEvent);
-	};
-	this._stopPropagation = function () {
-		dojo.event.browser.currentEvent.cancelBubble = true;
-	};
-	this._preventDefault = function () {
-		dojo.event.browser.currentEvent.returnValue = false;
-	};
-	this.keys = {KEY_BACKSPACE:8, KEY_TAB:9, KEY_CLEAR:12, KEY_ENTER:13, KEY_SHIFT:16, KEY_CTRL:17, KEY_ALT:18, KEY_PAUSE:19, KEY_CAPS_LOCK:20, KEY_ESCAPE:27, KEY_SPACE:32, KEY_PAGE_UP:33, KEY_PAGE_DOWN:34, KEY_END:35, KEY_HOME:36, KEY_LEFT_ARROW:37, KEY_UP_ARROW:38, KEY_RIGHT_ARROW:39, KEY_DOWN_ARROW:40, KEY_INSERT:45, KEY_DELETE:46, KEY_HELP:47, KEY_LEFT_WINDOW:91, KEY_RIGHT_WINDOW:92, KEY_SELECT:93, KEY_NUMPAD_0:96, KEY_NUMPAD_1:97, KEY_NUMPAD_2:98, KEY_NUMPAD_3:99, KEY_NUMPAD_4:100, KEY_NUMPAD_5:101, KEY_NUMPAD_6:102, KEY_NUMPAD_7:103, KEY_NUMPAD_8:104, KEY_NUMPAD_9:105, KEY_NUMPAD_MULTIPLY:106, KEY_NUMPAD_PLUS:107, KEY_NUMPAD_ENTER:108, KEY_NUMPAD_MINUS:109, KEY_NUMPAD_PERIOD:110, KEY_NUMPAD_DIVIDE:111, KEY_F1:112, KEY_F2:113, KEY_F3:114, KEY_F4:115, KEY_F5:116, KEY_F6:117, KEY_F7:118, KEY_F8:119, KEY_F9:120, KEY_F10:121, KEY_F11:122, KEY_F12:123, KEY_F13:124, KEY_F14:125, KEY_F15:126, KEY_NUM_LOCK:144, KEY_SCROLL_LOCK:145};
-	this.revKeys = [];
-	for (var key in this.keys) {
-		this.revKeys[this.keys[key]] = key;
-	}
-	this.fixEvent = function (evt, sender) {
-		if (!evt) {
-			if (window["event"]) {
-				evt = window.event;
-			}
-		}
-		if ((evt["type"]) && (evt["type"].indexOf("key") == 0)) {
-			evt.keys = this.revKeys;
-			for (var key in this.keys) {
-				evt[key] = this.keys[key];
-			}
-			if (evt["type"] == "keydown" && dojo.render.html.ie) {
-				switch (evt.keyCode) {
-				  case evt.KEY_SHIFT:
-				  case evt.KEY_CTRL:
-				  case evt.KEY_ALT:
-				  case evt.KEY_CAPS_LOCK:
-				  case evt.KEY_LEFT_WINDOW:
-				  case evt.KEY_RIGHT_WINDOW:
-				  case evt.KEY_SELECT:
-				  case evt.KEY_NUM_LOCK:
-				  case evt.KEY_SCROLL_LOCK:
-				  case evt.KEY_NUMPAD_0:
-				  case evt.KEY_NUMPAD_1:
-				  case evt.KEY_NUMPAD_2:
-				  case evt.KEY_NUMPAD_3:
-				  case evt.KEY_NUMPAD_4:
-				  case evt.KEY_NUMPAD_5:
-				  case evt.KEY_NUMPAD_6:
-				  case evt.KEY_NUMPAD_7:
-				  case evt.KEY_NUMPAD_8:
-				  case evt.KEY_NUMPAD_9:
-				  case evt.KEY_NUMPAD_PERIOD:
-					break;
-				  case evt.KEY_NUMPAD_MULTIPLY:
-				  case evt.KEY_NUMPAD_PLUS:
-				  case evt.KEY_NUMPAD_ENTER:
-				  case evt.KEY_NUMPAD_MINUS:
-				  case evt.KEY_NUMPAD_DIVIDE:
-					break;
-				  case evt.KEY_PAUSE:
-				  case evt.KEY_TAB:
-				  case evt.KEY_BACKSPACE:
-				  case evt.KEY_ENTER:
-				  case evt.KEY_ESCAPE:
-				  case evt.KEY_PAGE_UP:
-				  case evt.KEY_PAGE_DOWN:
-				  case evt.KEY_END:
-				  case evt.KEY_HOME:
-				  case evt.KEY_LEFT_ARROW:
-				  case evt.KEY_UP_ARROW:
-				  case evt.KEY_RIGHT_ARROW:
-				  case evt.KEY_DOWN_ARROW:
-				  case evt.KEY_INSERT:
-				  case evt.KEY_DELETE:
-				  case evt.KEY_F1:
-				  case evt.KEY_F2:
-				  case evt.KEY_F3:
-				  case evt.KEY_F4:
-				  case evt.KEY_F5:
-				  case evt.KEY_F6:
-				  case evt.KEY_F7:
-				  case evt.KEY_F8:
-				  case evt.KEY_F9:
-				  case evt.KEY_F10:
-				  case evt.KEY_F11:
-				  case evt.KEY_F12:
-				  case evt.KEY_F12:
-				  case evt.KEY_F13:
-				  case evt.KEY_F14:
-				  case evt.KEY_F15:
-				  case evt.KEY_CLEAR:
-				  case evt.KEY_HELP:
-					evt.key = evt.keyCode;
-					break;
-				  default:
-					if (evt.ctrlKey || evt.altKey) {
-						var unifiedCharCode = evt.keyCode;
-						if (unifiedCharCode >= 65 && unifiedCharCode <= 90 && evt.shiftKey == false) {
-							unifiedCharCode += 32;
-						}
-						if (unifiedCharCode >= 1 && unifiedCharCode <= 26 && evt.ctrlKey) {
-							unifiedCharCode += 96;
-						}
-						evt.key = String.fromCharCode(unifiedCharCode);
-					}
-				}
-			} else {
-				if (evt["type"] == "keypress") {
-					if (dojo.render.html.opera) {
-						if (evt.which == 0) {
-							evt.key = evt.keyCode;
-						} else {
-							if (evt.which > 0) {
-								switch (evt.which) {
-								  case evt.KEY_SHIFT:
-								  case evt.KEY_CTRL:
-								  case evt.KEY_ALT:
-								  case evt.KEY_CAPS_LOCK:
-								  case evt.KEY_NUM_LOCK:
-								  case evt.KEY_SCROLL_LOCK:
-									break;
-								  case evt.KEY_PAUSE:
-								  case evt.KEY_TAB:
-								  case evt.KEY_BACKSPACE:
-								  case evt.KEY_ENTER:
-								  case evt.KEY_ESCAPE:
-									evt.key = evt.which;
-									break;
-								  default:
-									var unifiedCharCode = evt.which;
-									if ((evt.ctrlKey || evt.altKey || evt.metaKey) && (evt.which >= 65 && evt.which <= 90 && evt.shiftKey == false)) {
-										unifiedCharCode += 32;
-									}
-									evt.key = String.fromCharCode(unifiedCharCode);
-								}
-							}
-						}
-					} else {
-						if (dojo.render.html.ie) {
-							if (!evt.ctrlKey && !evt.altKey && evt.keyCode >= evt.KEY_SPACE) {
-								evt.key = String.fromCharCode(evt.keyCode);
-							}
-						} else {
-							if (dojo.render.html.safari) {
-								switch (evt.keyCode) {
-								  case 25:
-									evt.key = evt.KEY_TAB;
-									evt.shift = true;
-									break;
-								  case 63232:
-									evt.key = evt.KEY_UP_ARROW;
-									break;
-								  case 63233:
-									evt.key = evt.KEY_DOWN_ARROW;
-									break;
-								  case 63234:
-									evt.key = evt.KEY_LEFT_ARROW;
-									break;
-								  case 63235:
-									evt.key = evt.KEY_RIGHT_ARROW;
-									break;
-								  case 63236:
-									evt.key = evt.KEY_F1;
-									break;
-								  case 63237:
-									evt.key = evt.KEY_F2;
-									break;
-								  case 63238:
-									evt.key = evt.KEY_F3;
-									break;
-								  case 63239:
-									evt.key = evt.KEY_F4;
-									break;
-								  case 63240:
-									evt.key = evt.KEY_F5;
-									break;
-								  case 63241:
-									evt.key = evt.KEY_F6;
-									break;
-								  case 63242:
-									evt.key = evt.KEY_F7;
-									break;
-								  case 63243:
-									evt.key = evt.KEY_F8;
-									break;
-								  case 63244:
-									evt.key = evt.KEY_F9;
-									break;
-								  case 63245:
-									evt.key = evt.KEY_F10;
-									break;
-								  case 63246:
-									evt.key = evt.KEY_F11;
-									break;
-								  case 63247:
-									evt.key = evt.KEY_F12;
-									break;
-								  case 63250:
-									evt.key = evt.KEY_PAUSE;
-									break;
-								  case 63272:
-									evt.key = evt.KEY_DELETE;
-									break;
-								  case 63273:
-									evt.key = evt.KEY_HOME;
-									break;
-								  case 63275:
-									evt.key = evt.KEY_END;
-									break;
-								  case 63276:
-									evt.key = evt.KEY_PAGE_UP;
-									break;
-								  case 63277:
-									evt.key = evt.KEY_PAGE_DOWN;
-									break;
-								  case 63302:
-									evt.key = evt.KEY_INSERT;
-									break;
-								  case 63248:
-								  case 63249:
-								  case 63289:
-									break;
-								  default:
-									evt.key = evt.charCode >= evt.KEY_SPACE ? String.fromCharCode(evt.charCode) : evt.keyCode;
-								}
-							} else {
-								evt.key = evt.charCode > 0 ? String.fromCharCode(evt.charCode) : evt.keyCode;
-							}
-						}
-					}
-				}
-			}
-		}
-		if (dojo.render.html.ie) {
-			if (!evt.target) {
-				evt.target = evt.srcElement;
-			}
-			if (!evt.currentTarget) {
-				evt.currentTarget = (sender ? sender : evt.srcElement);
-			}
-			if (!evt.layerX) {
-				evt.layerX = evt.offsetX;
-			}
-			if (!evt.layerY) {
-				evt.layerY = evt.offsetY;
-			}
-			var doc = (evt.srcElement && evt.srcElement.ownerDocument) ? evt.srcElement.ownerDocument : document;
-			var docBody = ((dojo.render.html.ie55) || (doc["compatMode"] == "BackCompat")) ? doc.body : doc.documentElement;
-			if (!evt.pageX) {
-				evt.pageX = evt.clientX + (docBody.scrollLeft || 0);
-			}
-			if (!evt.pageY) {
-				evt.pageY = evt.clientY + (docBody.scrollTop || 0);
-			}
-			if (evt.type == "mouseover") {
-				evt.relatedTarget = evt.fromElement;
-			}
-			if (evt.type == "mouseout") {
-				evt.relatedTarget = evt.toElement;
-			}
-			this.currentEvent = evt;
-			evt.callListener = this.callListener;
-			evt.stopPropagation = this._stopPropagation;
-			evt.preventDefault = this._preventDefault;
-		}
-		return evt;
-	};
-	this.stopEvent = function (evt) {
-		if (window.event) {
-			evt.cancelBubble = true;
-			evt.returnValue = false;
-		} else {
-			evt.preventDefault();
-			evt.stopPropagation();
-		}
-	};
-};
-

http://git-wip-us.apache.org/repos/asf/struts/blob/17d73d21/plugins/dojo/src/main/resources/org/apache/struts2/static/dojo/src/event/common.js
----------------------------------------------------------------------
diff --git a/plugins/dojo/src/main/resources/org/apache/struts2/static/dojo/src/event/common.js b/plugins/dojo/src/main/resources/org/apache/struts2/static/dojo/src/event/common.js
deleted file mode 100644
index 99b5b22..0000000
--- a/plugins/dojo/src/main/resources/org/apache/struts2/static/dojo/src/event/common.js
+++ /dev/null
@@ -1,560 +0,0 @@
-/*
-	Copyright (c) 2004-2006, The Dojo Foundation
-	All Rights Reserved.
-
-	Licensed under the Academic Free License version 2.1 or above OR the
-	modified BSD license. For more information on Dojo licensing, see:
-
-		http://dojotoolkit.org/community/licensing.shtml
-*/
-
-
-
-dojo.provide("dojo.event.common");
-dojo.require("dojo.lang.array");
-dojo.require("dojo.lang.extras");
-dojo.require("dojo.lang.func");
-dojo.event = new function () {
-	this._canTimeout = dojo.lang.isFunction(dj_global["setTimeout"]) || dojo.lang.isAlien(dj_global["setTimeout"]);
-	function interpolateArgs(args, searchForNames) {
-		var dl = dojo.lang;
-		var ao = {srcObj:dj_global, srcFunc:null, adviceObj:dj_global, adviceFunc:null, aroundObj:null, aroundFunc:null, adviceType:(args.length > 2) ? args[0] : "after", precedence:"last", once:false, delay:null, rate:0, adviceMsg:false, maxCalls:-1};
-		switch (args.length) {
-		  case 0:
-			return;
-		  case 1:
-			return;
-		  case 2:
-			ao.srcFunc = args[0];
-			ao.adviceFunc = args[1];
-			break;
-		  case 3:
-			if ((dl.isObject(args[0])) && (dl.isString(args[1])) && (dl.isString(args[2]))) {
-				ao.adviceType = "after";
-				ao.srcObj = args[0];
-				ao.srcFunc = args[1];
-				ao.adviceFunc = args[2];
-			} else {
-				if ((dl.isString(args[1])) && (dl.isString(args[2]))) {
-					ao.srcFunc = args[1];
-					ao.adviceFunc = args[2];
-				} else {
-					if ((dl.isObject(args[0])) && (dl.isString(args[1])) && (dl.isFunction(args[2]))) {
-						ao.adviceType = "after";
-						ao.srcObj = args[0];
-						ao.srcFunc = args[1];
-						var tmpName = dl.nameAnonFunc(args[2], ao.adviceObj, searchForNames);
-						ao.adviceFunc = tmpName;
-					} else {
-						if ((dl.isFunction(args[0])) && (dl.isObject(args[1])) && (dl.isString(args[2]))) {
-							ao.adviceType = "after";
-							ao.srcObj = dj_global;
-							var tmpName = dl.nameAnonFunc(args[0], ao.srcObj, searchForNames);
-							ao.srcFunc = tmpName;
-							ao.adviceObj = args[1];
-							ao.adviceFunc = args[2];
-						}
-					}
-				}
-			}
-			break;
-		  case 4:
-			if ((dl.isObject(args[0])) && (dl.isObject(args[2]))) {
-				ao.adviceType = "after";
-				ao.srcObj = args[0];
-				ao.srcFunc = args[1];
-				ao.adviceObj = args[2];
-				ao.adviceFunc = args[3];
-			} else {
-				if ((dl.isString(args[0])) && (dl.isString(args[1])) && (dl.isObject(args[2]))) {
-					ao.adviceType = args[0];
-					ao.srcObj = dj_global;
-					ao.srcFunc = args[1];
-					ao.adviceObj = args[2];
-					ao.adviceFunc = args[3];
-				} else {
-					if ((dl.isString(args[0])) && (dl.isFunction(args[1])) && (dl.isObject(args[2]))) {
-						ao.adviceType = args[0];
-						ao.srcObj = dj_global;
-						var tmpName = dl.nameAnonFunc(args[1], dj_global, searchForNames);
-						ao.srcFunc = tmpName;
-						ao.adviceObj = args[2];
-						ao.adviceFunc = args[3];
-					} else {
-						if ((dl.isString(args[0])) && (dl.isObject(args[1])) && (dl.isString(args[2])) && (dl.isFunction(args[3]))) {
-							ao.srcObj = args[1];
-							ao.srcFunc = args[2];
-							var tmpName = dl.nameAnonFunc(args[3], dj_global, searchForNames);
-							ao.adviceObj = dj_global;
-							ao.adviceFunc = tmpName;
-						} else {
-							if (dl.isObject(args[1])) {
-								ao.srcObj = args[1];
-								ao.srcFunc = args[2];
-								ao.adviceObj = dj_global;
-								ao.adviceFunc = args[3];
-							} else {
-								if (dl.isObject(args[2])) {
-									ao.srcObj = dj_global;
-									ao.srcFunc = args[1];
-									ao.adviceObj = args[2];
-									ao.adviceFunc = args[3];
-								} else {
-									ao.srcObj = ao.adviceObj = ao.aroundObj = dj_global;
-									ao.srcFunc = args[1];
-									ao.adviceFunc = args[2];
-									ao.aroundFunc = args[3];
-								}
-							}
-						}
-					}
-				}
-			}
-			break;
-		  case 6:
-			ao.srcObj = args[1];
-			ao.srcFunc = args[2];
-			ao.adviceObj = args[3];
-			ao.adviceFunc = args[4];
-			ao.aroundFunc = args[5];
-			ao.aroundObj = dj_global;
-			break;
-		  default:
-			ao.srcObj = args[1];
-			ao.srcFunc = args[2];
-			ao.adviceObj = args[3];
-			ao.adviceFunc = args[4];
-			ao.aroundObj = args[5];
-			ao.aroundFunc = args[6];
-			ao.once = args[7];
-			ao.delay = args[8];
-			ao.rate = args[9];
-			ao.adviceMsg = args[10];
-			ao.maxCalls = (!isNaN(parseInt(args[11]))) ? args[11] : -1;
-			break;
-		}
-		if (dl.isFunction(ao.aroundFunc)) {
-			var tmpName = dl.nameAnonFunc(ao.aroundFunc, ao.aroundObj, searchForNames);
-			ao.aroundFunc = tmpName;
-		}
-		if (dl.isFunction(ao.srcFunc)) {
-			ao.srcFunc = dl.getNameInObj(ao.srcObj, ao.srcFunc);
-		}
-		if (dl.isFunction(ao.adviceFunc)) {
-			ao.adviceFunc = dl.getNameInObj(ao.adviceObj, ao.adviceFunc);
-		}
-		if ((ao.aroundObj) && (dl.isFunction(ao.aroundFunc))) {
-			ao.aroundFunc = dl.getNameInObj(ao.aroundObj, ao.aroundFunc);
-		}
-		if (!ao.srcObj) {
-			dojo.raise("bad srcObj for srcFunc: " + ao.srcFunc);
-		}
-		if (!ao.adviceObj) {
-			dojo.raise("bad adviceObj for adviceFunc: " + ao.adviceFunc);
-		}
-		if (!ao.adviceFunc) {
-			dojo.debug("bad adviceFunc for srcFunc: " + ao.srcFunc);
-			dojo.debugShallow(ao);
-		}
-		return ao;
-	}
-	this.connect = function () {
-		if (arguments.length == 1) {
-			var ao = arguments[0];
-		} else {
-			var ao = interpolateArgs(arguments, true);
-		}
-		if (dojo.lang.isString(ao.srcFunc) && (ao.srcFunc.toLowerCase() == "onkey")) {
-			if (dojo.render.html.ie) {
-				ao.srcFunc = "onkeydown";
-				this.connect(ao);
-			}
-			ao.srcFunc = "onkeypress";
-		}
-		if (dojo.lang.isArray(ao.srcObj) && ao.srcObj != "") {
-			var tmpAO = {};
-			for (var x in ao) {
-				tmpAO[x] = ao[x];
-			}
-			var mjps = [];
-			dojo.lang.forEach(ao.srcObj, function (src) {
-				if ((dojo.render.html.capable) && (dojo.lang.isString(src))) {
-					src = dojo.byId(src);
-				}
-				tmpAO.srcObj = src;
-				mjps.push(dojo.event.connect.call(dojo.event, tmpAO));
-			});
-			return mjps;
-		}
-		var mjp = dojo.event.MethodJoinPoint.getForMethod(ao.srcObj, ao.srcFunc);
-		if (ao.adviceFunc) {
-			var mjp2 = dojo.event.MethodJoinPoint.getForMethod(ao.adviceObj, ao.adviceFunc);
-		}
-		mjp.kwAddAdvice(ao);
-		return mjp;
-	};
-	this.log = function (a1, a2) {
-		var kwArgs;
-		if ((arguments.length == 1) && (typeof a1 == "object")) {
-			kwArgs = a1;
-		} else {
-			kwArgs = {srcObj:a1, srcFunc:a2};
-		}
-		kwArgs.adviceFunc = function () {
-			var argsStr = [];
-			for (var x = 0; x < arguments.length; x++) {
-				argsStr.push(arguments[x]);
-			}
-			dojo.debug("(" + kwArgs.srcObj + ")." + kwArgs.srcFunc, ":", argsStr.join(", "));
-		};
-		this.kwConnect(kwArgs);
-	};
-	this.connectBefore = function () {
-		var args = ["before"];
-		for (var i = 0; i < arguments.length; i++) {
-			args.push(arguments[i]);
-		}
-		return this.connect.apply(this, args);
-	};
-	this.connectAround = function () {
-		var args = ["around"];
-		for (var i = 0; i < arguments.length; i++) {
-			args.push(arguments[i]);
-		}
-		return this.connect.apply(this, args);
-	};
-	this.connectOnce = function () {
-		var ao = interpolateArgs(arguments, true);
-		ao.once = true;
-		return this.connect(ao);
-	};
-	this.connectRunOnce = function () {
-		var ao = interpolateArgs(arguments, true);
-		ao.maxCalls = 1;
-		return this.connect(ao);
-	};
-	this._kwConnectImpl = function (kwArgs, disconnect) {
-		var fn = (disconnect) ? "disconnect" : "connect";
-		if (typeof kwArgs["srcFunc"] == "function") {
-			kwArgs.srcObj = kwArgs["srcObj"] || dj_global;
-			var tmpName = dojo.lang.nameAnonFunc(kwArgs.srcFunc, kwArgs.srcObj, true);
-			kwArgs.srcFunc = tmpName;
-		}
-		if (typeof kwArgs["adviceFunc"] == "function") {
-			kwArgs.adviceObj = kwArgs["adviceObj"] || dj_global;
-			var tmpName = dojo.lang.nameAnonFunc(kwArgs.adviceFunc, kwArgs.adviceObj, true);
-			kwArgs.adviceFunc = tmpName;
-		}
-		kwArgs.srcObj = kwArgs["srcObj"] || dj_global;
-		kwArgs.adviceObj = kwArgs["adviceObj"] || kwArgs["targetObj"] || dj_global;
-		kwArgs.adviceFunc = kwArgs["adviceFunc"] || kwArgs["targetFunc"];
-		return dojo.event[fn](kwArgs);
-	};
-	this.kwConnect = function (kwArgs) {
-		return this._kwConnectImpl(kwArgs, false);
-	};
-	this.disconnect = function () {
-		if (arguments.length == 1) {
-			var ao = arguments[0];
-		} else {
-			var ao = interpolateArgs(arguments, true);
-		}
-		if (!ao.adviceFunc) {
-			return;
-		}
-		if (dojo.lang.isString(ao.srcFunc) && (ao.srcFunc.toLowerCase() == "onkey")) {
-			if (dojo.render.html.ie) {
-				ao.srcFunc = "onkeydown";
-				this.disconnect(ao);
-			}
-			ao.srcFunc = "onkeypress";
-		}
-		if (!ao.srcObj[ao.srcFunc]) {
-			return null;
-		}
-		var mjp = dojo.event.MethodJoinPoint.getForMethod(ao.srcObj, ao.srcFunc, true);
-		mjp.removeAdvice(ao.adviceObj, ao.adviceFunc, ao.adviceType, ao.once);
-		return mjp;
-	};
-	this.kwDisconnect = function (kwArgs) {
-		return this._kwConnectImpl(kwArgs, true);
-	};
-};
-dojo.event.MethodInvocation = function (join_point, obj, args) {
-	this.jp_ = join_point;
-	this.object = obj;
-	this.args = [];
-	for (var x = 0; x < args.length; x++) {
-		this.args[x] = args[x];
-	}
-	this.around_index = -1;
-};
-dojo.event.MethodInvocation.prototype.proceed = function () {
-	this.around_index++;
-	if (this.around_index >= this.jp_.around.length) {
-		return this.jp_.object[this.jp_.methodname].apply(this.jp_.object, this.args);
-	} else {
-		var ti = this.jp_.around[this.around_index];
-		var mobj = ti[0] || dj_global;
-		var meth = ti[1];
-		return mobj[meth].call(mobj, this);
-	}
-};
-dojo.event.MethodJoinPoint = function (obj, funcName) {
-	this.object = obj || dj_global;
-	this.methodname = funcName;
-	this.methodfunc = this.object[funcName];
-	this.squelch = false;
-};
-dojo.event.MethodJoinPoint.getForMethod = function (obj, funcName) {
-	if (!obj) {
-		obj = dj_global;
-	}
-	var ofn = obj[funcName];
-	if (!ofn) {
-		ofn = obj[funcName] = function () {
-		};
-		if (!obj[funcName]) {
-			dojo.raise("Cannot set do-nothing method on that object " + funcName);
-		}
-	} else {
-		if ((typeof ofn != "function") && (!dojo.lang.isFunction(ofn)) && (!dojo.lang.isAlien(ofn))) {
-			return null;
-		}
-	}
-	var jpname = funcName + "$joinpoint";
-	var jpfuncname = funcName + "$joinpoint$method";
-	var joinpoint = obj[jpname];
-	if (!joinpoint) {
-		var isNode = false;
-		if (dojo.event["browser"]) {
-			if ((obj["attachEvent"]) || (obj["nodeType"]) || (obj["addEventListener"])) {
-				isNode = true;
-				dojo.event.browser.addClobberNodeAttrs(obj, [jpname, jpfuncname, funcName]);
-			}
-		}
-		var origArity = ofn.length;
-		obj[jpfuncname] = ofn;
-		joinpoint = obj[jpname] = new dojo.event.MethodJoinPoint(obj, jpfuncname);
-		if (!isNode) {
-			obj[funcName] = function () {
-				return joinpoint.run.apply(joinpoint, arguments);
-			};
-		} else {
-			obj[funcName] = function () {
-				var args = [];
-				if (!arguments.length) {
-					var evt = null;
-					try {
-						if (obj.ownerDocument) {
-							evt = obj.ownerDocument.parentWindow.event;
-						} else {
-							if (obj.documentElement) {
-								evt = obj.documentElement.ownerDocument.parentWindow.event;
-							} else {
-								if (obj.event) {
-									evt = obj.event;
-								} else {
-									evt = window.event;
-								}
-							}
-						}
-					}
-					catch (e) {
-						evt = window.event;
-					}
-					if (evt) {
-						args.push(dojo.event.browser.fixEvent(evt, this));
-					}
-				} else {
-					for (var x = 0; x < arguments.length; x++) {
-						if ((x == 0) && (dojo.event.browser.isEvent(arguments[x]))) {
-							args.push(dojo.event.browser.fixEvent(arguments[x], this));
-						} else {
-							args.push(arguments[x]);
-						}
-					}
-				}
-				return joinpoint.run.apply(joinpoint, args);
-			};
-		}
-		obj[funcName].__preJoinArity = origArity;
-	}
-	return joinpoint;
-};
-dojo.lang.extend(dojo.event.MethodJoinPoint, {squelch:false, unintercept:function () {
-	this.object[this.methodname] = this.methodfunc;
-	this.before = [];
-	this.after = [];
-	this.around = [];
-}, disconnect:dojo.lang.forward("unintercept"), run:function () {
-	var obj = this.object || dj_global;
-	var args = arguments;
-	var aargs = [];
-	for (var x = 0; x < args.length; x++) {
-		aargs[x] = args[x];
-	}
-	var unrollAdvice = function (marr) {
-		if (!marr) {
-			dojo.debug("Null argument to unrollAdvice()");
-			return;
-		}
-		var callObj = marr[0] || dj_global;
-		var callFunc = marr[1];
-		if (!callObj[callFunc]) {
-			dojo.raise("function \"" + callFunc + "\" does not exist on \"" + callObj + "\"");
-		}
-		var aroundObj = marr[2] || dj_global;
-		var aroundFunc = marr[3];
-		var msg = marr[6];
-		var maxCount = marr[7];
-		if (maxCount > -1) {
-			if (maxCount == 0) {
-				return;
-			}
-			marr[7]--;
-		}
-		var undef;
-		var to = {args:[], jp_:this, object:obj, proceed:function () {
-			return callObj[callFunc].apply(callObj, to.args);
-		}};
-		to.args = aargs;
-		var delay = parseInt(marr[4]);
-		var hasDelay = ((!isNaN(delay)) && (marr[4] !== null) && (typeof marr[4] != "undefined"));
-		if (marr[5]) {
-			var rate = parseInt(marr[5]);
-			var cur = new Date();
-			var timerSet = false;
-			if ((marr["last"]) && ((cur - marr.last) <= rate)) {
-				if (dojo.event._canTimeout) {
-					if (marr["delayTimer"]) {
-						clearTimeout(marr.delayTimer);
-					}
-					var tod = parseInt(rate * 2);
-					var mcpy = dojo.lang.shallowCopy(marr);
-					marr.delayTimer = setTimeout(function () {
-						mcpy[5] = 0;
-						unrollAdvice(mcpy);
-					}, tod);
-				}
-				return;
-			} else {
-				marr.last = cur;
-			}
-		}
-		if (aroundFunc) {
-			aroundObj[aroundFunc].call(aroundObj, to);
-		} else {
-			if ((hasDelay) && ((dojo.render.html) || (dojo.render.svg))) {
-				dj_global["setTimeout"](function () {
-					if (msg) {
-						callObj[callFunc].call(callObj, to);
-					} else {
-						callObj[callFunc].apply(callObj, args);
-					}
-				}, delay);
-			} else {
-				if (msg) {
-					callObj[callFunc].call(callObj, to);
-				} else {
-					callObj[callFunc].apply(callObj, args);
-				}
-			}
-		}
-	};
-	var unRollSquelch = function () {
-		if (this.squelch) {
-			try {
-				return unrollAdvice.apply(this, arguments);
-			}
-			catch (e) {
-				dojo.debug(e);
-			}
-		} else {
-			return unrollAdvice.apply(this, arguments);
-		}
-	};
-	if ((this["before"]) && (this.before.length > 0)) {
-		dojo.lang.forEach(this.before.concat(new Array()), unRollSquelch);
-	}
-	var result;
-	try {
-		if ((this["around"]) && (this.around.length > 0)) {
-			var mi = new dojo.event.MethodInvocation(this, obj, args);
-			result = mi.proceed();
-		} else {
-			if (this.methodfunc) {
-				result = this.object[this.methodname].apply(this.object, args);
-			}
-		}
-	}
-	catch (e) {
-		if (!this.squelch) {
-			dojo.debug(e, "when calling", this.methodname, "on", this.object, "with arguments", args);
-			dojo.raise(e);
-		}
-	}
-	if ((this["after"]) && (this.after.length > 0)) {
-		dojo.lang.forEach(this.after.concat(new Array()), unRollSquelch);
-	}
-	return (this.methodfunc) ? result : null;
-}, getArr:function (kind) {
-	var type = "after";
-	if ((typeof kind == "string") && (kind.indexOf("before") != -1)) {
-		type = "before";
-	} else {
-		if (kind == "around") {
-			type = "around";
-		}
-	}
-	if (!this[type]) {
-		this[type] = [];
-	}
-	return this[type];
-}, kwAddAdvice:function (args) {
-	this.addAdvice(args["adviceObj"], args["adviceFunc"], args["aroundObj"], args["aroundFunc"], args["adviceType"], args["precedence"], args["once"], args["delay"], args["rate"], args["adviceMsg"], args["maxCalls"]);
-}, addAdvice:function (thisAdviceObj, thisAdvice, thisAroundObj, thisAround, adviceType, precedence, once, delay, rate, asMessage, maxCalls) {
-	var arr = this.getArr(adviceType);
-	if (!arr) {
-		dojo.raise("bad this: " + this);
-	}
-	var ao = [thisAdviceObj, thisAdvice, thisAroundObj, thisAround, delay, rate, asMessage, maxCalls];
-	if (once) {
-		if (this.hasAdvice(thisAdviceObj, thisAdvice, adviceType, arr) >= 0) {
-			return;
-		}
-	}
-	if (precedence == "first") {
-		arr.unshift(ao);
-	} else {
-		arr.push(ao);
-	}
-}, hasAdvice:function (thisAdviceObj, thisAdvice, adviceType, arr) {
-	if (!arr) {
-		arr = this.getArr(adviceType);
-	}
-	var ind = -1;
-	for (var x = 0; x < arr.length; x++) {
-		var aao = (typeof thisAdvice == "object") ? (new String(thisAdvice)).toString() : thisAdvice;
-		var a1o = (typeof arr[x][1] == "object") ? (new String(arr[x][1])).toString() : arr[x][1];
-		if ((arr[x][0] == thisAdviceObj) && (a1o == aao)) {
-			ind = x;
-		}
-	}
-	return ind;
-}, removeAdvice:function (thisAdviceObj, thisAdvice, adviceType, once) {
-	var arr = this.getArr(adviceType);
-	var ind = this.hasAdvice(thisAdviceObj, thisAdvice, adviceType, arr);
-	if (ind == -1) {
-		return false;
-	}
-	while (ind != -1) {
-		arr.splice(ind, 1);
-		if (once) {
-			break;
-		}
-		ind = this.hasAdvice(thisAdviceObj, thisAdvice, adviceType, arr);
-	}
-	return true;
-}});
-

http://git-wip-us.apache.org/repos/asf/struts/blob/17d73d21/plugins/dojo/src/main/resources/org/apache/struts2/static/dojo/src/event/topic.js
----------------------------------------------------------------------
diff --git a/plugins/dojo/src/main/resources/org/apache/struts2/static/dojo/src/event/topic.js b/plugins/dojo/src/main/resources/org/apache/struts2/static/dojo/src/event/topic.js
deleted file mode 100644
index e96128d..0000000
--- a/plugins/dojo/src/main/resources/org/apache/struts2/static/dojo/src/event/topic.js
+++ /dev/null
@@ -1,79 +0,0 @@
-/*
-	Copyright (c) 2004-2006, The Dojo Foundation
-	All Rights Reserved.
-
-	Licensed under the Academic Free License version 2.1 or above OR the
-	modified BSD license. For more information on Dojo licensing, see:
-
-		http://dojotoolkit.org/community/licensing.shtml
-*/
-
-
-
-dojo.require("dojo.event.common");
-dojo.provide("dojo.event.topic");
-dojo.event.topic = new function () {
-	this.topics = {};
-	this.getTopic = function (topic) {
-		if (!this.topics[topic]) {
-			this.topics[topic] = new this.TopicImpl(topic);
-		}
-		return this.topics[topic];
-	};
-	this.registerPublisher = function (topic, obj, funcName) {
-		var topic = this.getTopic(topic);
-		topic.registerPublisher(obj, funcName);
-	};
-	this.subscribe = function (topic, obj, funcName) {
-		var topic = this.getTopic(topic);
-		topic.subscribe(obj, funcName);
-	};
-	this.unsubscribe = function (topic, obj, funcName) {
-		var topic = this.getTopic(topic);
-		topic.unsubscribe(obj, funcName);
-	};
-	this.destroy = function (topic) {
-		this.getTopic(topic).destroy();
-		delete this.topics[topic];
-	};
-	this.publishApply = function (topic, args) {
-		var topic = this.getTopic(topic);
-		topic.sendMessage.apply(topic, args);
-	};
-	this.publish = function (topic, message) {
-		var topic = this.getTopic(topic);
-		var args = [];
-		for (var x = 1; x < arguments.length; x++) {
-			args.push(arguments[x]);
-		}
-		topic.sendMessage.apply(topic, args);
-	};
-};
-dojo.event.topic.TopicImpl = function (topicName) {
-	this.topicName = topicName;
-	this.subscribe = function (listenerObject, listenerMethod) {
-		var tf = listenerMethod || listenerObject;
-		var to = (!listenerMethod) ? dj_global : listenerObject;
-		return dojo.event.kwConnect({srcObj:this, srcFunc:"sendMessage", adviceObj:to, adviceFunc:tf});
-	};
-	this.unsubscribe = function (listenerObject, listenerMethod) {
-		var tf = (!listenerMethod) ? listenerObject : listenerMethod;
-		var to = (!listenerMethod) ? null : listenerObject;
-		return dojo.event.kwDisconnect({srcObj:this, srcFunc:"sendMessage", adviceObj:to, adviceFunc:tf});
-	};
-	this._getJoinPoint = function () {
-		return dojo.event.MethodJoinPoint.getForMethod(this, "sendMessage");
-	};
-	this.setSquelch = function (shouldSquelch) {
-		this._getJoinPoint().squelch = shouldSquelch;
-	};
-	this.destroy = function () {
-		this._getJoinPoint().disconnect();
-	};
-	this.registerPublisher = function (publisherObject, publisherMethod) {
-		dojo.event.connect(publisherObject, publisherMethod, this, "sendMessage");
-	};
-	this.sendMessage = function (message) {
-	};
-};
-

http://git-wip-us.apache.org/repos/asf/struts/blob/17d73d21/plugins/dojo/src/main/resources/org/apache/struts2/static/dojo/src/experimental.js
----------------------------------------------------------------------
diff --git a/plugins/dojo/src/main/resources/org/apache/struts2/static/dojo/src/experimental.js b/plugins/dojo/src/main/resources/org/apache/struts2/static/dojo/src/experimental.js
deleted file mode 100644
index 19e3d4d..0000000
--- a/plugins/dojo/src/main/resources/org/apache/struts2/static/dojo/src/experimental.js
+++ /dev/null
@@ -1,22 +0,0 @@
-/*
-	Copyright (c) 2004-2006, The Dojo Foundation
-	All Rights Reserved.
-
-	Licensed under the Academic Free License version 2.1 or above OR the
-	modified BSD license. For more information on Dojo licensing, see:
-
-		http://dojotoolkit.org/community/licensing.shtml
-*/
-
-
-
-dojo.provide("dojo.experimental");
-dojo.experimental = function (moduleName, extra) {
-	var message = "EXPERIMENTAL: " + moduleName;
-	message += " -- Not yet ready for use.  APIs subject to change without notice.";
-	if (extra) {
-		message += " " + extra;
-	}
-	dojo.debug(message);
-};
-