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:58:54 UTC

[27/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/loader.js
----------------------------------------------------------------------
diff --git a/plugins/dojo/src/main/resources/org/apache/struts2/static/dojo/src/loader.js b/plugins/dojo/src/main/resources/org/apache/struts2/static/dojo/src/loader.js
deleted file mode 100644
index b7de143..0000000
--- a/plugins/dojo/src/main/resources/org/apache/struts2/static/dojo/src/loader.js
+++ /dev/null
@@ -1,448 +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
-*/
-
-
-
-(function () {
-	var _addHostEnv = {pkgFileName:"__package__", loading_modules_:{}, loaded_modules_:{}, addedToLoadingCount:[], removedFromLoadingCount:[], inFlightCount:0, modulePrefixes_:{dojo:{name:"dojo", value:"src"}}, setModulePrefix:function (module, prefix) {
-		this.modulePrefixes_[module] = {name:module, value:prefix};
-	}, moduleHasPrefix:function (module) {
-		var mp = this.modulePrefixes_;
-		return Boolean(mp[module] && mp[module].value);
-	}, getModulePrefix:function (module) {
-		if (this.moduleHasPrefix(module)) {
-			return this.modulePrefixes_[module].value;
-		}
-		return module;
-	}, getTextStack:[], loadUriStack:[], loadedUris:[], post_load_:false, modulesLoadedListeners:[], unloadListeners:[], loadNotifying:false};
-	for (var param in _addHostEnv) {
-		dojo.hostenv[param] = _addHostEnv[param];
-	}
-})();
-dojo.hostenv.loadPath = function (relpath, module, cb) {
-	var uri;
-	if (relpath.charAt(0) == "/" || relpath.match(/^\w+:/)) {
-		uri = relpath;
-	} else {
-		uri = this.getBaseScriptUri() + relpath;
-	}
-	if (djConfig.cacheBust && dojo.render.html.capable) {
-		uri += "?" + String(djConfig.cacheBust).replace(/\W+/g, "");
-	}
-	try {
-		return !module ? this.loadUri(uri, cb) : this.loadUriAndCheck(uri, module, cb);
-	}
-	catch (e) {
-		dojo.debug(e);
-		return false;
-	}
-};
-dojo.hostenv.loadUri = function (uri, cb) {
-	if (this.loadedUris[uri]) {
-		return true;
-	}
-	var contents = this.getText(uri, null, true);
-	if (!contents) {
-		return false;
-	}
-	this.loadedUris[uri] = true;
-	if (cb) {
-		contents = "(" + contents + ")";
-	}
-	var value = dj_eval(contents);
-	if (cb) {
-		cb(value);
-	}
-	return true;
-};
-dojo.hostenv.loadUriAndCheck = function (uri, moduleName, cb) {
-	var ok = true;
-	try {
-		ok = this.loadUri(uri, cb);
-	}
-	catch (e) {
-		dojo.debug("failed loading ", uri, " with error: ", e);
-	}
-	return Boolean(ok && this.findModule(moduleName, false));
-};
-dojo.loaded = function () {
-};
-dojo.unloaded = function () {
-};
-dojo.hostenv.loaded = function () {
-	this.loadNotifying = true;
-	this.post_load_ = true;
-	var mll = this.modulesLoadedListeners;
-	for (var x = 0; x < mll.length; x++) {
-		mll[x]();
-	}
-	this.modulesLoadedListeners = [];
-	this.loadNotifying = false;
-	dojo.loaded();
-};
-dojo.hostenv.unloaded = function () {
-	var mll = this.unloadListeners;
-	while (mll.length) {
-		(mll.pop())();
-	}
-	dojo.unloaded();
-};
-dojo.addOnLoad = function (obj, functionName) {
-	var dh = dojo.hostenv;
-	if (arguments.length == 1) {
-		dh.modulesLoadedListeners.push(obj);
-	} else {
-		if (arguments.length > 1) {
-			dh.modulesLoadedListeners.push(function () {
-				obj[functionName]();
-			});
-		}
-	}
-	if (dh.post_load_ && dh.inFlightCount == 0 && !dh.loadNotifying) {
-		dh.callLoaded();
-	}
-};
-dojo.addOnUnload = function (obj, functionName) {
-	var dh = dojo.hostenv;
-	if (arguments.length == 1) {
-		dh.unloadListeners.push(obj);
-	} else {
-		if (arguments.length > 1) {
-			dh.unloadListeners.push(function () {
-				obj[functionName]();
-			});
-		}
-	}
-};
-dojo.hostenv.modulesLoaded = function () {
-	if (this.post_load_) {
-		return;
-	}
-	if (this.loadUriStack.length == 0 && this.getTextStack.length == 0) {
-		if (this.inFlightCount > 0) {
-			dojo.debug("files still in flight!");
-			return;
-		}
-		dojo.hostenv.callLoaded();
-	}
-};
-dojo.hostenv.callLoaded = function () {
-	if (typeof setTimeout == "object" || (djConfig["useXDomain"] && dojo.render.html.opera)) {
-		setTimeout("dojo.hostenv.loaded();", 0);
-	} else {
-		dojo.hostenv.loaded();
-	}
-};
-dojo.hostenv.getModuleSymbols = function (modulename) {
-	var syms = modulename.split(".");
-	for (var i = syms.length; i > 0; i--) {
-		var parentModule = syms.slice(0, i).join(".");
-		if ((i == 1) && !this.moduleHasPrefix(parentModule)) {
-			syms[0] = "../" + syms[0];
-		} else {
-			var parentModulePath = this.getModulePrefix(parentModule);
-			if (parentModulePath != parentModule) {
-				syms.splice(0, i, parentModulePath);
-				break;
-			}
-		}
-	}
-	return syms;
-};
-dojo.hostenv._global_omit_module_check = false;
-dojo.hostenv.loadModule = function (moduleName, exactOnly, omitModuleCheck) {
-	if (!moduleName) {
-		return;
-	}
-	omitModuleCheck = this._global_omit_module_check || omitModuleCheck;
-	var module = this.findModule(moduleName, false);
-	if (module) {
-		return module;
-	}
-	if (dj_undef(moduleName, this.loading_modules_)) {
-		this.addedToLoadingCount.push(moduleName);
-	}
-	this.loading_modules_[moduleName] = 1;
-	var relpath = moduleName.replace(/\./g, "/") + ".js";
-	var nsyms = moduleName.split(".");
-	var syms = this.getModuleSymbols(moduleName);
-	var startedRelative = ((syms[0].charAt(0) != "/") && !syms[0].match(/^\w+:/));
-	var last = syms[syms.length - 1];
-	var ok;
-	if (last == "*") {
-		moduleName = nsyms.slice(0, -1).join(".");
-		while (syms.length) {
-			syms.pop();
-			syms.push(this.pkgFileName);
-			relpath = syms.join("/") + ".js";
-			if (startedRelative && relpath.charAt(0) == "/") {
-				relpath = relpath.slice(1);
-			}
-			ok = this.loadPath(relpath, !omitModuleCheck ? moduleName : null);
-			if (ok) {
-				break;
-			}
-			syms.pop();
-		}
-	} else {
-		relpath = syms.join("/") + ".js";
-		moduleName = nsyms.join(".");
-		var modArg = !omitModuleCheck ? moduleName : null;
-		ok = this.loadPath(relpath, modArg);
-		if (!ok && !exactOnly) {
-			syms.pop();
-			while (syms.length) {
-				relpath = syms.join("/") + ".js";
-				ok = this.loadPath(relpath, modArg);
-				if (ok) {
-					break;
-				}
-				syms.pop();
-				relpath = syms.join("/") + "/" + this.pkgFileName + ".js";
-				if (startedRelative && relpath.charAt(0) == "/") {
-					relpath = relpath.slice(1);
-				}
-				ok = this.loadPath(relpath, modArg);
-				if (ok) {
-					break;
-				}
-			}
-		}
-		if (!ok && !omitModuleCheck) {
-			dojo.raise("Could not load '" + moduleName + "'; last tried '" + relpath + "'");
-		}
-	}
-	if (!omitModuleCheck && !this["isXDomain"]) {
-		module = this.findModule(moduleName, false);
-		if (!module) {
-			dojo.raise("symbol '" + moduleName + "' is not defined after loading '" + relpath + "'");
-		}
-	}
-	return module;
-};
-dojo.hostenv.startPackage = function (packageName) {
-	var fullPkgName = String(packageName);
-	var strippedPkgName = fullPkgName;
-	var syms = packageName.split(/\./);
-	if (syms[syms.length - 1] == "*") {
-		syms.pop();
-		strippedPkgName = syms.join(".");
-	}
-	var evaledPkg = dojo.evalObjPath(strippedPkgName, true);
-	this.loaded_modules_[fullPkgName] = evaledPkg;
-	this.loaded_modules_[strippedPkgName] = evaledPkg;
-	return evaledPkg;
-};
-dojo.hostenv.findModule = function (moduleName, mustExist) {
-	var lmn = String(moduleName);
-	if (this.loaded_modules_[lmn]) {
-		return this.loaded_modules_[lmn];
-	}
-	if (mustExist) {
-		dojo.raise("no loaded module named '" + moduleName + "'");
-	}
-	return null;
-};
-dojo.kwCompoundRequire = function (modMap) {
-	var common = modMap["common"] || [];
-	var result = modMap[dojo.hostenv.name_] ? common.concat(modMap[dojo.hostenv.name_] || []) : common.concat(modMap["default"] || []);
-	for (var x = 0; x < result.length; x++) {
-		var curr = result[x];
-		if (curr.constructor == Array) {
-			dojo.hostenv.loadModule.apply(dojo.hostenv, curr);
-		} else {
-			dojo.hostenv.loadModule(curr);
-		}
-	}
-};
-dojo.require = function (resourceName) {
-	dojo.hostenv.loadModule.apply(dojo.hostenv, arguments);
-};
-dojo.requireIf = function (condition, resourceName) {
-	var arg0 = arguments[0];
-	if ((arg0 === true) || (arg0 == "common") || (arg0 && dojo.render[arg0].capable)) {
-		var args = [];
-		for (var i = 1; i < arguments.length; i++) {
-			args.push(arguments[i]);
-		}
-		dojo.require.apply(dojo, args);
-	}
-};
-dojo.requireAfterIf = dojo.requireIf;
-dojo.provide = function (resourceName) {
-	return dojo.hostenv.startPackage.apply(dojo.hostenv, arguments);
-};
-dojo.registerModulePath = function (module, prefix) {
-	return dojo.hostenv.setModulePrefix(module, prefix);
-};
-if (djConfig["modulePaths"]) {
-	for (var param in djConfig["modulePaths"]) {
-		dojo.registerModulePath(param, djConfig["modulePaths"][param]);
-	}
-}
-dojo.setModulePrefix = function (module, prefix) {
-	dojo.deprecated("dojo.setModulePrefix(\"" + module + "\", \"" + prefix + "\")", "replaced by dojo.registerModulePath", "0.5");
-	return dojo.registerModulePath(module, prefix);
-};
-dojo.exists = function (obj, name) {
-	var p = name.split(".");
-	for (var i = 0; i < p.length; i++) {
-		if (!obj[p[i]]) {
-			return false;
-		}
-		obj = obj[p[i]];
-	}
-	return true;
-};
-dojo.hostenv.normalizeLocale = function (locale) {
-	var result = locale ? locale.toLowerCase() : dojo.locale;
-	if (result == "root") {
-		result = "ROOT";
-	}
-	return result;
-};
-dojo.hostenv.searchLocalePath = function (locale, down, searchFunc) {
-	locale = dojo.hostenv.normalizeLocale(locale);
-	var elements = locale.split("-");
-	var searchlist = [];
-	for (var i = elements.length; i > 0; i--) {
-		searchlist.push(elements.slice(0, i).join("-"));
-	}
-	searchlist.push(false);
-	if (down) {
-		searchlist.reverse();
-	}
-	for (var j = searchlist.length - 1; j >= 0; j--) {
-		var loc = searchlist[j] || "ROOT";
-		var stop = searchFunc(loc);
-		if (stop) {
-			break;
-		}
-	}
-};
-dojo.hostenv.localesGenerated;
-dojo.hostenv.registerNlsPrefix = function () {
-	dojo.registerModulePath("nls", "nls");
-};
-dojo.hostenv.preloadLocalizations = function () {
-	if (dojo.hostenv.localesGenerated) {
-		dojo.hostenv.registerNlsPrefix();
-		function preload(locale) {
-			locale = dojo.hostenv.normalizeLocale(locale);
-			dojo.hostenv.searchLocalePath(locale, true, function (loc) {
-				for (var i = 0; i < dojo.hostenv.localesGenerated.length; i++) {
-					if (dojo.hostenv.localesGenerated[i] == loc) {
-						dojo["require"]("nls.dojo_" + loc);
-						return true;
-					}
-				}
-				return false;
-			});
-		}
-		preload();
-		var extra = djConfig.extraLocale || [];
-		for (var i = 0; i < extra.length; i++) {
-			preload(extra[i]);
-		}
-	}
-	dojo.hostenv.preloadLocalizations = function () {
-	};
-};
-dojo.requireLocalization = function (moduleName, bundleName, locale, availableFlatLocales) {
-	dojo.hostenv.preloadLocalizations();
-	var targetLocale = dojo.hostenv.normalizeLocale(locale);
-	var bundlePackage = [moduleName, "nls", bundleName].join(".");
-	var bestLocale = "";
-	if (availableFlatLocales) {
-		var flatLocales = availableFlatLocales.split(",");
-		for (var i = 0; i < flatLocales.length; i++) {
-			if (targetLocale.indexOf(flatLocales[i]) == 0) {
-				if (flatLocales[i].length > bestLocale.length) {
-					bestLocale = flatLocales[i];
-				}
-			}
-		}
-		if (!bestLocale) {
-			bestLocale = "ROOT";
-		}
-	}
-	var tempLocale = availableFlatLocales ? bestLocale : targetLocale;
-	var bundle = dojo.hostenv.findModule(bundlePackage);
-	var localizedBundle = null;
-	if (bundle) {
-		if (djConfig.localizationComplete && bundle._built) {
-			return;
-		}
-		var jsLoc = tempLocale.replace("-", "_");
-		var translationPackage = bundlePackage + "." + jsLoc;
-		localizedBundle = dojo.hostenv.findModule(translationPackage);
-	}
-	if (!localizedBundle) {
-		bundle = dojo.hostenv.startPackage(bundlePackage);
-		var syms = dojo.hostenv.getModuleSymbols(moduleName);
-		var modpath = syms.concat("nls").join("/");
-		var parent;
-		dojo.hostenv.searchLocalePath(tempLocale, availableFlatLocales, function (loc) {
-			var jsLoc = loc.replace("-", "_");
-			var translationPackage = bundlePackage + "." + jsLoc;
-			var loaded = false;
-			if (!dojo.hostenv.findModule(translationPackage)) {
-				dojo.hostenv.startPackage(translationPackage);
-				var module = [modpath];
-				if (loc != "ROOT") {
-					module.push(loc);
-				}
-				module.push(bundleName);
-				var filespec = module.join("/") + ".js";
-				loaded = dojo.hostenv.loadPath(filespec, null, function (hash) {
-					var clazz = function () {
-					};
-					clazz.prototype = parent;
-					bundle[jsLoc] = new clazz();
-					for (var j in hash) {
-						bundle[jsLoc][j] = hash[j];
-					}
-				});
-			} else {
-				loaded = true;
-			}
-			if (loaded && bundle[jsLoc]) {
-				parent = bundle[jsLoc];
-			} else {
-				bundle[jsLoc] = parent;
-			}
-			if (availableFlatLocales) {
-				return true;
-			}
-		});
-	}
-	if (availableFlatLocales && targetLocale != bestLocale) {
-		bundle[targetLocale.replace("-", "_")] = bundle[bestLocale.replace("-", "_")];
-	}
-};
-(function () {
-	var extra = djConfig.extraLocale;
-	if (extra) {
-		if (!extra instanceof Array) {
-			extra = [extra];
-		}
-		var req = dojo.requireLocalization;
-		dojo.requireLocalization = function (m, b, locale, availableFlatLocales) {
-			req(m, b, locale, availableFlatLocales);
-			if (locale) {
-				return;
-			}
-			for (var i = 0; i < extra.length; i++) {
-				req(m, b, extra[i], availableFlatLocales);
-			}
-		};
-	}
-})();
-

http://git-wip-us.apache.org/repos/asf/struts/blob/17d73d21/plugins/dojo/src/main/resources/org/apache/struts2/static/dojo/src/loader_xd.js
----------------------------------------------------------------------
diff --git a/plugins/dojo/src/main/resources/org/apache/struts2/static/dojo/src/loader_xd.js b/plugins/dojo/src/main/resources/org/apache/struts2/static/dojo/src/loader_xd.js
deleted file mode 100644
index 6113cf2..0000000
--- a/plugins/dojo/src/main/resources/org/apache/struts2/static/dojo/src/loader_xd.js
+++ /dev/null
@@ -1,408 +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.hostenv.resetXd = function () {
-	this.isXDomain = djConfig.useXDomain || false;
-	this.xdTimer = 0;
-	this.xdInFlight = {};
-	this.xdOrderedReqs = [];
-	this.xdDepMap = {};
-	this.xdContents = [];
-	this.xdDefList = [];
-};
-dojo.hostenv.resetXd();
-dojo.hostenv.createXdPackage = function (contents, resourceName, resourcePath) {
-	var deps = [];
-	var depRegExp = /dojo.(requireLocalization|require|requireIf|requireAll|provide|requireAfterIf|requireAfter|kwCompoundRequire|conditionalRequire|hostenv\.conditionalLoadModule|.hostenv\.loadModule|hostenv\.moduleLoaded)\(([\w\W]*?)\)/mg;
-	var match;
-	while ((match = depRegExp.exec(contents)) != null) {
-		if (match[1] == "requireLocalization") {
-			eval(match[0]);
-		} else {
-			deps.push("\"" + match[1] + "\", " + match[2]);
-		}
-	}
-	var output = [];
-	output.push("dojo.hostenv.packageLoaded({\n");
-	if (deps.length > 0) {
-		output.push("depends: [");
-		for (var i = 0; i < deps.length; i++) {
-			if (i > 0) {
-				output.push(",\n");
-			}
-			output.push("[" + deps[i] + "]");
-		}
-		output.push("],");
-	}
-	output.push("\ndefinePackage: function(dojo){");
-	output.push(contents);
-	output.push("\n}, resourceName: '" + resourceName + "', resourcePath: '" + resourcePath + "'});");
-	return output.join("");
-};
-dojo.hostenv.loadPath = function (relpath, module, cb) {
-	var colonIndex = relpath.indexOf(":");
-	var slashIndex = relpath.indexOf("/");
-	var uri;
-	var currentIsXDomain = false;
-	if (colonIndex > 0 && colonIndex < slashIndex) {
-		uri = relpath;
-		this.isXDomain = currentIsXDomain = true;
-	} else {
-		uri = this.getBaseScriptUri() + relpath;
-		colonIndex = uri.indexOf(":");
-		slashIndex = uri.indexOf("/");
-		if (colonIndex > 0 && colonIndex < slashIndex && (!location.host || uri.indexOf("http://" + location.host) != 0)) {
-			this.isXDomain = currentIsXDomain = true;
-		}
-	}
-	if (djConfig.cacheBust && dojo.render.html.capable) {
-		uri += "?" + String(djConfig.cacheBust).replace(/\W+/g, "");
-	}
-	try {
-		return ((!module || this.isXDomain) ? this.loadUri(uri, cb, currentIsXDomain, module) : this.loadUriAndCheck(uri, module, cb));
-	}
-	catch (e) {
-		dojo.debug(e);
-		return false;
-	}
-};
-dojo.hostenv.loadUri = function (uri, cb, currentIsXDomain, module) {
-	if (this.loadedUris[uri]) {
-		return 1;
-	}
-	if (this.isXDomain && module) {
-		if (uri.indexOf("__package__") != -1) {
-			module += ".*";
-		}
-		this.xdOrderedReqs.push(module);
-		if (currentIsXDomain || uri.indexOf("/nls/") == -1) {
-			this.xdInFlight[module] = true;
-			this.inFlightCount++;
-		}
-		if (!this.xdTimer) {
-			this.xdTimer = setInterval("dojo.hostenv.watchInFlightXDomain();", 100);
-		}
-		this.xdStartTime = (new Date()).getTime();
-	}
-	if (currentIsXDomain) {
-		var lastIndex = uri.lastIndexOf(".");
-		if (lastIndex <= 0) {
-			lastIndex = uri.length - 1;
-		}
-		var xdUri = uri.substring(0, lastIndex) + ".xd";
-		if (lastIndex != uri.length - 1) {
-			xdUri += uri.substring(lastIndex, uri.length);
-		}
-		var element = document.createElement("script");
-		element.type = "text/javascript";
-		element.src = xdUri;
-		if (!this.headElement) {
-			this.headElement = document.getElementsByTagName("head")[0];
-			if (!this.headElement) {
-				this.headElement = document.getElementsByTagName("html")[0];
-			}
-		}
-		this.headElement.appendChild(element);
-	} else {
-		var contents = this.getText(uri, null, true);
-		if (contents == null) {
-			return 0;
-		}
-		if (this.isXDomain && uri.indexOf("/nls/") == -1) {
-			var pkg = this.createXdPackage(contents, module, uri);
-			dj_eval(pkg);
-		} else {
-			if (cb) {
-				contents = "(" + contents + ")";
-			}
-			var value = dj_eval(contents);
-			if (cb) {
-				cb(value);
-			}
-		}
-	}
-	this.loadedUris[uri] = true;
-	return 1;
-};
-dojo.hostenv.packageLoaded = function (pkg) {
-	var deps = pkg.depends;
-	var requireList = null;
-	var requireAfterList = null;
-	var provideList = [];
-	if (deps && deps.length > 0) {
-		var dep = null;
-		var insertHint = 0;
-		var attachedPackage = false;
-		for (var i = 0; i < deps.length; i++) {
-			dep = deps[i];
-			if (dep[0] == "provide" || dep[0] == "hostenv.moduleLoaded") {
-				provideList.push(dep[1]);
-			} else {
-				if (!requireList) {
-					requireList = [];
-				}
-				if (!requireAfterList) {
-					requireAfterList = [];
-				}
-				var unpackedDeps = this.unpackXdDependency(dep);
-				if (unpackedDeps.requires) {
-					requireList = requireList.concat(unpackedDeps.requires);
-				}
-				if (unpackedDeps.requiresAfter) {
-					requireAfterList = requireAfterList.concat(unpackedDeps.requiresAfter);
-				}
-			}
-			var depType = dep[0];
-			var objPath = depType.split(".");
-			if (objPath.length == 2) {
-				dojo[objPath[0]][objPath[1]].apply(dojo[objPath[0]], dep.slice(1));
-			} else {
-				dojo[depType].apply(dojo, dep.slice(1));
-			}
-		}
-		var contentIndex = this.xdContents.push({content:pkg.definePackage, resourceName:pkg["resourceName"], resourcePath:pkg["resourcePath"], isDefined:false}) - 1;
-		for (var i = 0; i < provideList.length; i++) {
-			this.xdDepMap[provideList[i]] = {requires:requireList, requiresAfter:requireAfterList, contentIndex:contentIndex};
-		}
-		for (var i = 0; i < provideList.length; i++) {
-			this.xdInFlight[provideList[i]] = false;
-		}
-	}
-};
-dojo.hostenv.xdLoadFlattenedBundle = function (moduleName, bundleName, locale, bundleData) {
-	locale = locale || "root";
-	var jsLoc = dojo.hostenv.normalizeLocale(locale).replace("-", "_");
-	var bundlePackage = [moduleName, "nls", bundleName].join(".");
-	var bundle = dojo.hostenv.startPackage(bundlePackage);
-	bundle[jsLoc] = bundleData;
-	var mapName = [moduleName, jsLoc, bundleName].join(".");
-	var bundleMap = dojo.hostenv.xdBundleMap[mapName];
-	if (bundleMap) {
-		for (var param in bundleMap) {
-			bundle[param] = bundleData;
-		}
-	}
-};
-dojo.hostenv.xdBundleMap = {};
-dojo.xdRequireLocalization = function (moduleName, bundleName, locale, availableFlatLocales) {
-	var locales = availableFlatLocales.split(",");
-	var jsLoc = dojo.hostenv.normalizeLocale(locale);
-	var bestLocale = "";
-	for (var i = 0; i < locales.length; i++) {
-		if (jsLoc.indexOf(locales[i]) == 0) {
-			if (locales[i].length > bestLocale.length) {
-				bestLocale = locales[i];
-			}
-		}
-	}
-	var fixedBestLocale = bestLocale.replace("-", "_");
-	var bundlePackage = dojo.evalObjPath([moduleName, "nls", bundleName].join("."));
-	if (bundlePackage && bundlePackage[fixedBestLocale]) {
-		bundle[jsLoc.replace("-", "_")] = bundlePackage[fixedBestLocale];
-	} else {
-		var mapName = [moduleName, (fixedBestLocale || "root"), bundleName].join(".");
-		var bundleMap = dojo.hostenv.xdBundleMap[mapName];
-		if (!bundleMap) {
-			bundleMap = dojo.hostenv.xdBundleMap[mapName] = {};
-		}
-		bundleMap[jsLoc.replace("-", "_")] = true;
-		dojo.require(moduleName + ".nls" + (bestLocale ? "." + bestLocale : "") + "." + bundleName);
-	}
-};
-(function () {
-	var extra = djConfig.extraLocale;
-	if (extra) {
-		if (!extra instanceof Array) {
-			extra = [extra];
-		}
-		dojo._xdReqLoc = dojo.xdRequireLocalization;
-		dojo.xdRequireLocalization = function (m, b, locale, fLocales) {
-			dojo._xdReqLoc(m, b, locale, fLocales);
-			if (locale) {
-				return;
-			}
-			for (var i = 0; i < extra.length; i++) {
-				dojo._xdReqLoc(m, b, extra[i], fLocales);
-			}
-		};
-	}
-})();
-dojo.hostenv.unpackXdDependency = function (dep) {
-	var newDeps = null;
-	var newAfterDeps = null;
-	switch (dep[0]) {
-	  case "requireIf":
-	  case "requireAfterIf":
-	  case "conditionalRequire":
-		if ((dep[1] === true) || (dep[1] == "common") || (dep[1] && dojo.render[dep[1]].capable)) {
-			newDeps = [{name:dep[2], content:null}];
-		}
-		break;
-	  case "requireAll":
-		dep.shift();
-		newDeps = dep;
-		dojo.hostenv.flattenRequireArray(newDeps);
-		break;
-	  case "kwCompoundRequire":
-	  case "hostenv.conditionalLoadModule":
-		var modMap = dep[1];
-		var common = modMap["common"] || [];
-		var newDeps = (modMap[dojo.hostenv.name_]) ? common.concat(modMap[dojo.hostenv.name_] || []) : common.concat(modMap["default"] || []);
-		dojo.hostenv.flattenRequireArray(newDeps);
-		break;
-	  case "require":
-	  case "requireAfter":
-	  case "hostenv.loadModule":
-		newDeps = [{name:dep[1], content:null}];
-		break;
-	}
-	if (dep[0] == "requireAfterIf" || dep[0] == "requireIf") {
-		newAfterDeps = newDeps;
-		newDeps = null;
-	}
-	return {requires:newDeps, requiresAfter:newAfterDeps};
-};
-dojo.hostenv.xdWalkReqs = function () {
-	var reqChain = null;
-	var req;
-	for (var i = 0; i < this.xdOrderedReqs.length; i++) {
-		req = this.xdOrderedReqs[i];
-		if (this.xdDepMap[req]) {
-			reqChain = [req];
-			reqChain[req] = true;
-			this.xdEvalReqs(reqChain);
-		}
-	}
-};
-dojo.hostenv.xdEvalReqs = function (reqChain) {
-	while (reqChain.length > 0) {
-		var req = reqChain[reqChain.length - 1];
-		var pkg = this.xdDepMap[req];
-		if (pkg) {
-			var reqs = pkg.requires;
-			if (reqs && reqs.length > 0) {
-				var nextReq;
-				for (var i = 0; i < reqs.length; i++) {
-					nextReq = reqs[i].name;
-					if (nextReq && !reqChain[nextReq]) {
-						reqChain.push(nextReq);
-						reqChain[nextReq] = true;
-						this.xdEvalReqs(reqChain);
-					}
-				}
-			}
-			var contents = this.xdContents[pkg.contentIndex];
-			if (!contents.isDefined) {
-				var content = contents.content;
-				content["resourceName"] = contents["resourceName"];
-				content["resourcePath"] = contents["resourcePath"];
-				this.xdDefList.push(content);
-				contents.isDefined = true;
-			}
-			this.xdDepMap[req] = null;
-			var reqs = pkg.requiresAfter;
-			if (reqs && reqs.length > 0) {
-				var nextReq;
-				for (var i = 0; i < reqs.length; i++) {
-					nextReq = reqs[i].name;
-					if (nextReq && !reqChain[nextReq]) {
-						reqChain.push(nextReq);
-						reqChain[nextReq] = true;
-						this.xdEvalReqs(reqChain);
-					}
-				}
-			}
-		}
-		reqChain.pop();
-	}
-};
-dojo.hostenv.clearXdInterval = function () {
-	clearInterval(this.xdTimer);
-	this.xdTimer = 0;
-};
-dojo.hostenv.watchInFlightXDomain = function () {
-	var waitInterval = (djConfig.xdWaitSeconds || 15) * 1000;
-	if (this.xdStartTime + waitInterval < (new Date()).getTime()) {
-		this.clearXdInterval();
-		var noLoads = "";
-		for (var param in this.xdInFlight) {
-			if (this.xdInFlight[param]) {
-				noLoads += param + " ";
-			}
-		}
-		dojo.raise("Could not load cross-domain packages: " + noLoads);
-	}
-	for (var param in this.xdInFlight) {
-		if (this.xdInFlight[param]) {
-			return;
-		}
-	}
-	this.clearXdInterval();
-	this.xdWalkReqs();
-	var defLength = this.xdDefList.length;
-	for (var i = 0; i < defLength; i++) {
-		var content = dojo.hostenv.xdDefList[i];
-		if (djConfig["debugAtAllCosts"] && content["resourceName"]) {
-			if (!this["xdDebugQueue"]) {
-				this.xdDebugQueue = [];
-			}
-			this.xdDebugQueue.push({resourceName:content.resourceName, resourcePath:content.resourcePath});
-		} else {
-			content(dojo);
-		}
-	}
-	for (var i = 0; i < this.xdContents.length; i++) {
-		var current = this.xdContents[i];
-		if (current.content && !current.isDefined) {
-			current.content(dojo);
-		}
-	}
-	this.resetXd();
-	if (this["xdDebugQueue"] && this.xdDebugQueue.length > 0) {
-		this.xdDebugFileLoaded();
-	} else {
-		this.xdNotifyLoaded();
-	}
-};
-dojo.hostenv.xdNotifyLoaded = function () {
-	this.inFlightCount = 0;
-	if (this._djInitFired && !this.loadNotifying) {
-		this.callLoaded();
-	}
-};
-dojo.hostenv.flattenRequireArray = function (target) {
-	if (target) {
-		for (var i = 0; i < target.length; i++) {
-			if (target[i] instanceof Array) {
-				target[i] = {name:target[i][0], content:null};
-			} else {
-				target[i] = {name:target[i], content:null};
-			}
-		}
-	}
-};
-dojo.hostenv.xdHasCalledPreload = false;
-dojo.hostenv.xdRealCallLoaded = dojo.hostenv.callLoaded;
-dojo.hostenv.callLoaded = function () {
-	if (this.xdHasCalledPreload || dojo.hostenv.getModulePrefix("dojo") == "src" || !this.localesGenerated) {
-		this.xdRealCallLoaded();
-	} else {
-		if (this.localesGenerated) {
-			this.registerNlsPrefix = function () {
-				dojo.registerModulePath("nls", dojo.hostenv.getModulePrefix("dojo") + "/../nls");
-			};
-			this.preloadLocalizations();
-		}
-	}
-	this.xdHasCalledPreload = true;
-};
-

http://git-wip-us.apache.org/repos/asf/struts/blob/17d73d21/plugins/dojo/src/main/resources/org/apache/struts2/static/dojo/src/logging/ConsoleLogger.js
----------------------------------------------------------------------
diff --git a/plugins/dojo/src/main/resources/org/apache/struts2/static/dojo/src/logging/ConsoleLogger.js b/plugins/dojo/src/main/resources/org/apache/struts2/static/dojo/src/logging/ConsoleLogger.js
deleted file mode 100644
index 673b4d8..0000000
--- a/plugins/dojo/src/main/resources/org/apache/struts2/static/dojo/src/logging/ConsoleLogger.js
+++ /dev/null
@@ -1,86 +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.logging.ConsoleLogger");
-dojo.require("dojo.logging.Logger");
-dojo.lang.extend(dojo.logging.MemoryLogHandler, {debug:function () {
-	dojo.hostenv.println.apply(this, arguments);
-}, info:function () {
-	dojo.hostenv.println.apply(this, arguments);
-}, warn:function () {
-	dojo.hostenv.println.apply(this, arguments);
-}, error:function () {
-	dojo.hostenv.println.apply(this, arguments);
-}, critical:function () {
-	dojo.hostenv.println.apply(this, arguments);
-}, emit:function (record) {
-	if (!djConfig.isDebug) {
-		return;
-	}
-	var funcName = null;
-	switch (record.level) {
-	  case 1:
-		funcName = "debug";
-		break;
-	  case 2:
-		funcName = "info";
-		break;
-	  case 3:
-		funcName = "warn";
-		break;
-	  case 4:
-		funcName = "error";
-		break;
-	  case 5:
-		funcName = "critical";
-		break;
-	  default:
-		funcName = "debug";
-	}
-	var logStr = String(dojo.log.getLevelName(record.level) + ": " + record.time.toLocaleTimeString()) + ": " + record.message;
-	if (record.msgArgs && record.msgArgs.length > 0) {
-		this[funcName].call(this, logStr, record.msgArgs);
-	} else {
-		this[funcName].call(this, logStr);
-	}
-	this.data.push(record);
-	if (this.numRecords != -1) {
-		while (this.data.length > this.numRecords) {
-			this.data.shift();
-		}
-	}
-}});
-if (!dj_undef("console") && !dj_undef("info", console)) {
-	dojo.lang.extend(dojo.logging.MemoryLogHandler, {debug:function () {
-		console.debug.apply(this, arguments);
-	}, info:function () {
-		console.info.apply(this, arguments);
-	}, warn:function () {
-		console.warn.apply(this, arguments);
-	}, error:function () {
-		console.error.apply(this, arguments);
-	}, critical:function () {
-		console.error.apply(this, arguments);
-	}});
-	dojo.lang.extend(dojo.logging.Logger, {exception:function (msg, e, squelch) {
-		var args = [msg];
-		if (e) {
-			msg += " : " + e.name + " " + (e.description || e.message);
-			args.push(e);
-		}
-		this.logType("ERROR", args);
-		if (!squelch) {
-			throw e;
-		}
-	}});
-}
-

http://git-wip-us.apache.org/repos/asf/struts/blob/17d73d21/plugins/dojo/src/main/resources/org/apache/struts2/static/dojo/src/logging/Logger.js
----------------------------------------------------------------------
diff --git a/plugins/dojo/src/main/resources/org/apache/struts2/static/dojo/src/logging/Logger.js b/plugins/dojo/src/main/resources/org/apache/struts2/static/dojo/src/logging/Logger.js
deleted file mode 100644
index ba00b29..0000000
--- a/plugins/dojo/src/main/resources/org/apache/struts2/static/dojo/src/logging/Logger.js
+++ /dev/null
@@ -1,216 +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.logging.Logger");
-dojo.provide("dojo.logging.LogFilter");
-dojo.provide("dojo.logging.Record");
-dojo.provide("dojo.log");
-dojo.require("dojo.lang.common");
-dojo.require("dojo.lang.declare");
-dojo.logging.Record = function (logLevel, message) {
-	this.level = logLevel;
-	this.message = "";
-	this.msgArgs = [];
-	this.time = new Date();
-	if (dojo.lang.isArray(message)) {
-		if (message.length > 0 && dojo.lang.isString(message[0])) {
-			this.message = message.shift();
-		}
-		this.msgArgs = message;
-	} else {
-		this.message = message;
-	}
-};
-dojo.logging.LogFilter = function (loggerChain) {
-	this.passChain = loggerChain || "";
-	this.filter = function (record) {
-		return true;
-	};
-};
-dojo.logging.Logger = function () {
-	this.cutOffLevel = 0;
-	this.propagate = true;
-	this.parent = null;
-	this.data = [];
-	this.filters = [];
-	this.handlers = [];
-};
-dojo.extend(dojo.logging.Logger, {_argsToArr:function (args) {
-	var ret = [];
-	for (var x = 0; x < args.length; x++) {
-		ret.push(args[x]);
-	}
-	return ret;
-}, setLevel:function (lvl) {
-	this.cutOffLevel = parseInt(lvl);
-}, isEnabledFor:function (lvl) {
-	return parseInt(lvl) >= this.cutOffLevel;
-}, getEffectiveLevel:function () {
-	if ((this.cutOffLevel == 0) && (this.parent)) {
-		return this.parent.getEffectiveLevel();
-	}
-	return this.cutOffLevel;
-}, addFilter:function (flt) {
-	this.filters.push(flt);
-	return this.filters.length - 1;
-}, removeFilterByIndex:function (fltIndex) {
-	if (this.filters[fltIndex]) {
-		delete this.filters[fltIndex];
-		return true;
-	}
-	return false;
-}, removeFilter:function (fltRef) {
-	for (var x = 0; x < this.filters.length; x++) {
-		if (this.filters[x] === fltRef) {
-			delete this.filters[x];
-			return true;
-		}
-	}
-	return false;
-}, removeAllFilters:function () {
-	this.filters = [];
-}, filter:function (rec) {
-	for (var x = 0; x < this.filters.length; x++) {
-		if ((this.filters[x]["filter"]) && (!this.filters[x].filter(rec)) || (rec.level < this.cutOffLevel)) {
-			return false;
-		}
-	}
-	return true;
-}, addHandler:function (hdlr) {
-	this.handlers.push(hdlr);
-	return this.handlers.length - 1;
-}, handle:function (rec) {
-	if ((!this.filter(rec)) || (rec.level < this.cutOffLevel)) {
-		return false;
-	}
-	for (var x = 0; x < this.handlers.length; x++) {
-		if (this.handlers[x]["handle"]) {
-			this.handlers[x].handle(rec);
-		}
-	}
-	return true;
-}, log:function (lvl, msg) {
-	if ((this.propagate) && (this.parent) && (this.parent.rec.level >= this.cutOffLevel)) {
-		this.parent.log(lvl, msg);
-		return false;
-	}
-	this.handle(new dojo.logging.Record(lvl, msg));
-	return true;
-}, debug:function (msg) {
-	return this.logType("DEBUG", this._argsToArr(arguments));
-}, info:function (msg) {
-	return this.logType("INFO", this._argsToArr(arguments));
-}, warning:function (msg) {
-	return this.logType("WARNING", this._argsToArr(arguments));
-}, error:function (msg) {
-	return this.logType("ERROR", this._argsToArr(arguments));
-}, critical:function (msg) {
-	return this.logType("CRITICAL", this._argsToArr(arguments));
-}, exception:function (msg, e, squelch) {
-	if (e) {
-		var eparts = [e.name, (e.description || e.message)];
-		if (e.fileName) {
-			eparts.push(e.fileName);
-			eparts.push("line " + e.lineNumber);
-		}
-		msg += " " + eparts.join(" : ");
-	}
-	this.logType("ERROR", msg);
-	if (!squelch) {
-		throw e;
-	}
-}, logType:function (type, args) {
-	return this.log.apply(this, [dojo.logging.log.getLevel(type), args]);
-}, warn:function () {
-	this.warning.apply(this, arguments);
-}, err:function () {
-	this.error.apply(this, arguments);
-}, crit:function () {
-	this.critical.apply(this, arguments);
-}});
-dojo.logging.LogHandler = function (level) {
-	this.cutOffLevel = (level) ? level : 0;
-	this.formatter = null;
-	this.data = [];
-	this.filters = [];
-};
-dojo.lang.extend(dojo.logging.LogHandler, {setFormatter:function (formatter) {
-	dojo.unimplemented("setFormatter");
-}, flush:function () {
-}, close:function () {
-}, handleError:function () {
-	dojo.deprecated("dojo.logging.LogHandler.handleError", "use handle()", "0.6");
-}, handle:function (record) {
-	if ((this.filter(record)) && (record.level >= this.cutOffLevel)) {
-		this.emit(record);
-	}
-}, emit:function (record) {
-	dojo.unimplemented("emit");
-}});
-void (function () {
-	var names = ["setLevel", "addFilter", "removeFilterByIndex", "removeFilter", "removeAllFilters", "filter"];
-	var tgt = dojo.logging.LogHandler.prototype;
-	var src = dojo.logging.Logger.prototype;
-	for (var x = 0; x < names.length; x++) {
-		tgt[names[x]] = src[names[x]];
-	}
-})();
-dojo.logging.log = new dojo.logging.Logger();
-dojo.logging.log.levels = [{"name":"DEBUG", "level":1}, {"name":"INFO", "level":2}, {"name":"WARNING", "level":3}, {"name":"ERROR", "level":4}, {"name":"CRITICAL", "level":5}];
-dojo.logging.log.loggers = {};
-dojo.logging.log.getLogger = function (name) {
-	if (!this.loggers[name]) {
-		this.loggers[name] = new dojo.logging.Logger();
-		this.loggers[name].parent = this;
-	}
-	return this.loggers[name];
-};
-dojo.logging.log.getLevelName = function (lvl) {
-	for (var x = 0; x < this.levels.length; x++) {
-		if (this.levels[x].level == lvl) {
-			return this.levels[x].name;
-		}
-	}
-	return null;
-};
-dojo.logging.log.getLevel = function (name) {
-	for (var x = 0; x < this.levels.length; x++) {
-		if (this.levels[x].name.toUpperCase() == name.toUpperCase()) {
-			return this.levels[x].level;
-		}
-	}
-	return null;
-};
-dojo.declare("dojo.logging.MemoryLogHandler", dojo.logging.LogHandler, {initializer:function (level, recordsToKeep, postType, postInterval) {
-	dojo.logging.LogHandler.call(this, level);
-	this.numRecords = (typeof djConfig["loggingNumRecords"] != "undefined") ? djConfig["loggingNumRecords"] : ((recordsToKeep) ? recordsToKeep : -1);
-	this.postType = (typeof djConfig["loggingPostType"] != "undefined") ? djConfig["loggingPostType"] : (postType || -1);
-	this.postInterval = (typeof djConfig["loggingPostInterval"] != "undefined") ? djConfig["loggingPostInterval"] : (postType || -1);
-}, emit:function (record) {
-	if (!djConfig.isDebug) {
-		return;
-	}
-	var logStr = String(dojo.log.getLevelName(record.level) + ": " + record.time.toLocaleTimeString()) + ": " + record.message;
-	if (!dj_undef("println", dojo.hostenv)) {
-		dojo.hostenv.println(logStr, record.msgArgs);
-	}
-	this.data.push(record);
-	if (this.numRecords != -1) {
-		while (this.data.length > this.numRecords) {
-			this.data.shift();
-		}
-	}
-}});
-dojo.logging.logQueueHandler = new dojo.logging.MemoryLogHandler(0, 50, 0, 10000);
-dojo.logging.log.addHandler(dojo.logging.logQueueHandler);
-dojo.log = dojo.logging.log;
-

http://git-wip-us.apache.org/repos/asf/struts/blob/17d73d21/plugins/dojo/src/main/resources/org/apache/struts2/static/dojo/src/logging/__package__.js
----------------------------------------------------------------------
diff --git a/plugins/dojo/src/main/resources/org/apache/struts2/static/dojo/src/logging/__package__.js b/plugins/dojo/src/main/resources/org/apache/struts2/static/dojo/src/logging/__package__.js
deleted file mode 100644
index 0cfa7c3..0000000
--- a/plugins/dojo/src/main/resources/org/apache/struts2/static/dojo/src/logging/__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.logging.Logger", false, false]], rhino:["dojo.logging.RhinoLogger"]});
-dojo.provide("dojo.logging.*");
-

http://git-wip-us.apache.org/repos/asf/struts/blob/17d73d21/plugins/dojo/src/main/resources/org/apache/struts2/static/dojo/src/math.js
----------------------------------------------------------------------
diff --git a/plugins/dojo/src/main/resources/org/apache/struts2/static/dojo/src/math.js b/plugins/dojo/src/main/resources/org/apache/struts2/static/dojo/src/math.js
deleted file mode 100644
index ef20bba..0000000
--- a/plugins/dojo/src/main/resources/org/apache/struts2/static/dojo/src/math.js
+++ /dev/null
@@ -1,108 +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.math");
-dojo.math.degToRad = function (x) {
-	return (x * Math.PI) / 180;
-};
-dojo.math.radToDeg = function (x) {
-	return (x * 180) / Math.PI;
-};
-dojo.math.factorial = function (n) {
-	if (n < 1) {
-		return 0;
-	}
-	var retVal = 1;
-	for (var i = 1; i <= n; i++) {
-		retVal *= i;
-	}
-	return retVal;
-};
-dojo.math.permutations = function (n, k) {
-	if (n == 0 || k == 0) {
-		return 1;
-	}
-	return (dojo.math.factorial(n) / dojo.math.factorial(n - k));
-};
-dojo.math.combinations = function (n, r) {
-	if (n == 0 || r == 0) {
-		return 1;
-	}
-	return (dojo.math.factorial(n) / (dojo.math.factorial(n - r) * dojo.math.factorial(r)));
-};
-dojo.math.bernstein = function (t, n, i) {
-	return (dojo.math.combinations(n, i) * Math.pow(t, i) * Math.pow(1 - t, n - i));
-};
-dojo.math.gaussianRandom = function () {
-	var k = 2;
-	do {
-		var i = 2 * Math.random() - 1;
-		var j = 2 * Math.random() - 1;
-		k = i * i + j * j;
-	} while (k >= 1);
-	k = Math.sqrt((-2 * Math.log(k)) / k);
-	return i * k;
-};
-dojo.math.mean = function () {
-	var array = dojo.lang.isArray(arguments[0]) ? arguments[0] : arguments;
-	var mean = 0;
-	for (var i = 0; i < array.length; i++) {
-		mean += array[i];
-	}
-	return mean / array.length;
-};
-dojo.math.round = function (number, places) {
-	if (!places) {
-		var shift = 1;
-	} else {
-		var shift = Math.pow(10, places);
-	}
-	return Math.round(number * shift) / shift;
-};
-dojo.math.sd = dojo.math.standardDeviation = function () {
-	var array = dojo.lang.isArray(arguments[0]) ? arguments[0] : arguments;
-	return Math.sqrt(dojo.math.variance(array));
-};
-dojo.math.variance = function () {
-	var array = dojo.lang.isArray(arguments[0]) ? arguments[0] : arguments;
-	var mean = 0, squares = 0;
-	for (var i = 0; i < array.length; i++) {
-		mean += array[i];
-		squares += Math.pow(array[i], 2);
-	}
-	return (squares / array.length) - Math.pow(mean / array.length, 2);
-};
-dojo.math.range = function (a, b, step) {
-	if (arguments.length < 2) {
-		b = a;
-		a = 0;
-	}
-	if (arguments.length < 3) {
-		step = 1;
-	}
-	var range = [];
-	if (step > 0) {
-		for (var i = a; i < b; i += step) {
-			range.push(i);
-		}
-	} else {
-		if (step < 0) {
-			for (var i = a; i > b; i += step) {
-				range.push(i);
-			}
-		} else {
-			throw new Error("dojo.math.range: step must be non-zero");
-		}
-	}
-	return range;
-};
-

http://git-wip-us.apache.org/repos/asf/struts/blob/17d73d21/plugins/dojo/src/main/resources/org/apache/struts2/static/dojo/src/math/__package__.js
----------------------------------------------------------------------
diff --git a/plugins/dojo/src/main/resources/org/apache/struts2/static/dojo/src/math/__package__.js b/plugins/dojo/src/main/resources/org/apache/struts2/static/dojo/src/math/__package__.js
deleted file mode 100644
index 21493db..0000000
--- a/plugins/dojo/src/main/resources/org/apache/struts2/static/dojo/src/math/__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.math", false, false], ["dojo.math.curves", false, false], ["dojo.math.points", false, false]]});
-dojo.provide("dojo.math.*");
-

http://git-wip-us.apache.org/repos/asf/struts/blob/17d73d21/plugins/dojo/src/main/resources/org/apache/struts2/static/dojo/src/math/curves.js
----------------------------------------------------------------------
diff --git a/plugins/dojo/src/main/resources/org/apache/struts2/static/dojo/src/math/curves.js b/plugins/dojo/src/main/resources/org/apache/struts2/static/dojo/src/math/curves.js
deleted file mode 100644
index a2649e9..0000000
--- a/plugins/dojo/src/main/resources/org/apache/struts2/static/dojo/src/math/curves.js
+++ /dev/null
@@ -1,184 +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.math.curves");
-dojo.require("dojo.math");
-dojo.math.curves = {Line:function (start, end) {
-	this.start = start;
-	this.end = end;
-	this.dimensions = start.length;
-	for (var i = 0; i < start.length; i++) {
-		start[i] = Number(start[i]);
-	}
-	for (var i = 0; i < end.length; i++) {
-		end[i] = Number(end[i]);
-	}
-	this.getValue = function (n) {
-		var retVal = new Array(this.dimensions);
-		for (var i = 0; i < this.dimensions; i++) {
-			retVal[i] = ((this.end[i] - this.start[i]) * n) + this.start[i];
-		}
-		return retVal;
-	};
-	return this;
-}, Bezier:function (pnts) {
-	this.getValue = function (step) {
-		if (step >= 1) {
-			return this.p[this.p.length - 1];
-		}
-		if (step <= 0) {
-			return this.p[0];
-		}
-		var retVal = new Array(this.p[0].length);
-		for (var k = 0; j < this.p[0].length; k++) {
-			retVal[k] = 0;
-		}
-		for (var j = 0; j < this.p[0].length; j++) {
-			var C = 0;
-			var D = 0;
-			for (var i = 0; i < this.p.length; i++) {
-				C += this.p[i][j] * this.p[this.p.length - 1][0] * dojo.math.bernstein(step, this.p.length, i);
-			}
-			for (var l = 0; l < this.p.length; l++) {
-				D += this.p[this.p.length - 1][0] * dojo.math.bernstein(step, this.p.length, l);
-			}
-			retVal[j] = C / D;
-		}
-		return retVal;
-	};
-	this.p = pnts;
-	return this;
-}, CatmullRom:function (pnts, c) {
-	this.getValue = function (step) {
-		var percent = step * (this.p.length - 1);
-		var node = Math.floor(percent);
-		var progress = percent - node;
-		var i0 = node - 1;
-		if (i0 < 0) {
-			i0 = 0;
-		}
-		var i = node;
-		var i1 = node + 1;
-		if (i1 >= this.p.length) {
-			i1 = this.p.length - 1;
-		}
-		var i2 = node + 2;
-		if (i2 >= this.p.length) {
-			i2 = this.p.length - 1;
-		}
-		var u = progress;
-		var u2 = progress * progress;
-		var u3 = progress * progress * progress;
-		var retVal = new Array(this.p[0].length);
-		for (var k = 0; k < this.p[0].length; k++) {
-			var x1 = (-this.c * this.p[i0][k]) + ((2 - this.c) * this.p[i][k]) + ((this.c - 2) * this.p[i1][k]) + (this.c * this.p[i2][k]);
-			var x2 = (2 * this.c * this.p[i0][k]) + ((this.c - 3) * this.p[i][k]) + ((3 - 2 * this.c) * this.p[i1][k]) + (-this.c * this.p[i2][k]);
-			var x3 = (-this.c * this.p[i0][k]) + (this.c * this.p[i1][k]);
-			var x4 = this.p[i][k];
-			retVal[k] = x1 * u3 + x2 * u2 + x3 * u + x4;
-		}
-		return retVal;
-	};
-	if (!c) {
-		this.c = 0.7;
-	} else {
-		this.c = c;
-	}
-	this.p = pnts;
-	return this;
-}, Arc:function (start, end, ccw) {
-	var center = dojo.math.points.midpoint(start, end);
-	var sides = dojo.math.points.translate(dojo.math.points.invert(center), start);
-	var rad = Math.sqrt(Math.pow(sides[0], 2) + Math.pow(sides[1], 2));
-	var theta = dojo.math.radToDeg(Math.atan(sides[1] / sides[0]));
-	if (sides[0] < 0) {
-		theta -= 90;
-	} else {
-		theta += 90;
-	}
-	dojo.math.curves.CenteredArc.call(this, center, rad, theta, theta + (ccw ? -180 : 180));
-}, CenteredArc:function (center, radius, start, end) {
-	this.center = center;
-	this.radius = radius;
-	this.start = start || 0;
-	this.end = end;
-	this.getValue = function (n) {
-		var retVal = new Array(2);
-		var theta = dojo.math.degToRad(this.start + ((this.end - this.start) * n));
-		retVal[0] = this.center[0] + this.radius * Math.sin(theta);
-		retVal[1] = this.center[1] - this.radius * Math.cos(theta);
-		return retVal;
-	};
-	return this;
-}, Circle:function (center, radius) {
-	dojo.math.curves.CenteredArc.call(this, center, radius, 0, 360);
-	return this;
-}, Path:function () {
-	var curves = [];
-	var weights = [];
-	var ranges = [];
-	var totalWeight = 0;
-	this.add = function (curve, weight) {
-		if (weight < 0) {
-			dojo.raise("dojo.math.curves.Path.add: weight cannot be less than 0");
-		}
-		curves.push(curve);
-		weights.push(weight);
-		totalWeight += weight;
-		computeRanges();
-	};
-	this.remove = function (curve) {
-		for (var i = 0; i < curves.length; i++) {
-			if (curves[i] == curve) {
-				curves.splice(i, 1);
-				totalWeight -= weights.splice(i, 1)[0];
-				break;
-			}
-		}
-		computeRanges();
-	};
-	this.removeAll = function () {
-		curves = [];
-		weights = [];
-		totalWeight = 0;
-	};
-	this.getValue = function (n) {
-		var found = false, value = 0;
-		for (var i = 0; i < ranges.length; i++) {
-			var r = ranges[i];
-			if (n >= r[0] && n < r[1]) {
-				var subN = (n - r[0]) / r[2];
-				value = curves[i].getValue(subN);
-				found = true;
-				break;
-			}
-		}
-		if (!found) {
-			value = curves[curves.length - 1].getValue(1);
-		}
-		for (var j = 0; j < i; j++) {
-			value = dojo.math.points.translate(value, curves[j].getValue(1));
-		}
-		return value;
-	};
-	function computeRanges() {
-		var start = 0;
-		for (var i = 0; i < weights.length; i++) {
-			var end = start + weights[i] / totalWeight;
-			var len = end - start;
-			ranges[i] = [start, end, len];
-			start = end;
-		}
-	}
-	return this;
-}};
-

http://git-wip-us.apache.org/repos/asf/struts/blob/17d73d21/plugins/dojo/src/main/resources/org/apache/struts2/static/dojo/src/math/matrix.js
----------------------------------------------------------------------
diff --git a/plugins/dojo/src/main/resources/org/apache/struts2/static/dojo/src/math/matrix.js b/plugins/dojo/src/main/resources/org/apache/struts2/static/dojo/src/math/matrix.js
deleted file mode 100644
index 551203a..0000000
--- a/plugins/dojo/src/main/resources/org/apache/struts2/static/dojo/src/math/matrix.js
+++ /dev/null
@@ -1,303 +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.math.matrix");
-dojo.math.matrix.iDF = 0;
-dojo.math.matrix.ALMOST_ZERO = 1e-10;
-dojo.math.matrix.multiply = function (a, b) {
-	var ay = a.length;
-	var ax = a[0].length;
-	var by = b.length;
-	var bx = b[0].length;
-	if (ax != by) {
-		dojo.debug("Can't multiply matricies of sizes " + ax + "," + ay + " and " + bx + "," + by);
-		return [[0]];
-	}
-	var c = [];
-	for (var k = 0; k < ay; k++) {
-		c[k] = [];
-		for (var i = 0; i < bx; i++) {
-			c[k][i] = 0;
-			for (var m = 0; m < ax; m++) {
-				c[k][i] += a[k][m] * b[m][i];
-			}
-		}
-	}
-	return c;
-};
-dojo.math.matrix.product = function () {
-	if (arguments.length == 0) {
-		dojo.debug("can't multiply 0 matrices!");
-		return 1;
-	}
-	var result = arguments[0];
-	for (var i = 1; i < arguments.length; i++) {
-		result = dojo.math.matrix.multiply(result, arguments[i]);
-	}
-	return result;
-};
-dojo.math.matrix.sum = function () {
-	if (arguments.length == 0) {
-		dojo.debug("can't sum 0 matrices!");
-		return 0;
-	}
-	var result = dojo.math.matrix.copy(arguments[0]);
-	var rows = result.length;
-	if (rows == 0) {
-		dojo.debug("can't deal with matrices of 0 rows!");
-		return 0;
-	}
-	var cols = result[0].length;
-	if (cols == 0) {
-		dojo.debug("can't deal with matrices of 0 cols!");
-		return 0;
-	}
-	for (var i = 1; i < arguments.length; ++i) {
-		var arg = arguments[i];
-		if (arg.length != rows || arg[0].length != cols) {
-			dojo.debug("can't add matrices of different dimensions: first dimensions were " + rows + "x" + cols + ", current dimensions are " + arg.length + "x" + arg[0].length);
-			return 0;
-		}
-		for (var r = 0; r < rows; r++) {
-			for (var c = 0; c < cols; c++) {
-				result[r][c] += arg[r][c];
-			}
-		}
-	}
-	return result;
-};
-dojo.math.matrix.inverse = function (a) {
-	if (a.length == 1 && a[0].length == 1) {
-		return [[1 / a[0][0]]];
-	}
-	var tms = a.length;
-	var m = dojo.math.matrix.create(tms, tms);
-	var mm = dojo.math.matrix.adjoint(a);
-	var det = dojo.math.matrix.determinant(a);
-	var dd = 0;
-	if (det == 0) {
-		dojo.debug("Determinant Equals 0, Not Invertible.");
-		return [[0]];
-	} else {
-		dd = 1 / det;
-	}
-	for (var i = 0; i < tms; i++) {
-		for (var j = 0; j < tms; j++) {
-			m[i][j] = dd * mm[i][j];
-		}
-	}
-	return m;
-};
-dojo.math.matrix.determinant = function (a) {
-	if (a.length != a[0].length) {
-		dojo.debug("Can't calculate the determiant of a non-squre matrix!");
-		return 0;
-	}
-	var tms = a.length;
-	var det = 1;
-	var b = dojo.math.matrix.upperTriangle(a);
-	for (var i = 0; i < tms; i++) {
-		var bii = b[i][i];
-		if (Math.abs(bii) < dojo.math.matrix.ALMOST_ZERO) {
-			return 0;
-		}
-		det *= bii;
-	}
-	det = det * dojo.math.matrix.iDF;
-	return det;
-};
-dojo.math.matrix.upperTriangle = function (m) {
-	m = dojo.math.matrix.copy(m);
-	var f1 = 0;
-	var temp = 0;
-	var tms = m.length;
-	var v = 1;
-	dojo.math.matrix.iDF = 1;
-	for (var col = 0; col < tms - 1; col++) {
-		if (typeof m[col][col] != "number") {
-			dojo.debug("non-numeric entry found in a numeric matrix: m[" + col + "][" + col + "]=" + m[col][col]);
-		}
-		v = 1;
-		var stop_loop = 0;
-		while ((m[col][col] == 0) && !stop_loop) {
-			if (col + v >= tms) {
-				dojo.math.matrix.iDF = 0;
-				stop_loop = 1;
-			} else {
-				for (var r = 0; r < tms; r++) {
-					temp = m[col][r];
-					m[col][r] = m[col + v][r];
-					m[col + v][r] = temp;
-				}
-				v++;
-				dojo.math.matrix.iDF *= -1;
-			}
-		}
-		for (var row = col + 1; row < tms; row++) {
-			if (typeof m[row][col] != "number") {
-				dojo.debug("non-numeric entry found in a numeric matrix: m[" + row + "][" + col + "]=" + m[row][col]);
-			}
-			if (typeof m[col][row] != "number") {
-				dojo.debug("non-numeric entry found in a numeric matrix: m[" + col + "][" + row + "]=" + m[col][row]);
-			}
-			if (m[col][col] != 0) {
-				var f1 = (-1) * m[row][col] / m[col][col];
-				for (var i = col; i < tms; i++) {
-					m[row][i] = f1 * m[col][i] + m[row][i];
-				}
-			}
-		}
-	}
-	return m;
-};
-dojo.math.matrix.create = function (a, b, value) {
-	if (!value) {
-		value = 0;
-	}
-	var m = [];
-	for (var i = 0; i < b; i++) {
-		m[i] = [];
-		for (var j = 0; j < a; j++) {
-			m[i][j] = value;
-		}
-	}
-	return m;
-};
-dojo.math.matrix.ones = function (a, b) {
-	return dojo.math.matrix.create(a, b, 1);
-};
-dojo.math.matrix.zeros = function (a, b) {
-	return dojo.math.matrix.create(a, b, 0);
-};
-dojo.math.matrix.identity = function (size, scale) {
-	if (!scale) {
-		scale = 1;
-	}
-	var m = [];
-	for (var i = 0; i < size; i++) {
-		m[i] = [];
-		for (var j = 0; j < size; j++) {
-			m[i][j] = (i == j ? scale : 0);
-		}
-	}
-	return m;
-};
-dojo.math.matrix.adjoint = function (a) {
-	var tms = a.length;
-	if (tms <= 1) {
-		dojo.debug("Can't find the adjoint of a matrix with a dimension less than 2");
-		return [[0]];
-	}
-	if (a.length != a[0].length) {
-		dojo.debug("Can't find the adjoint of a non-square matrix");
-		return [[0]];
-	}
-	var m = dojo.math.matrix.create(tms, tms);
-	var ii = 0;
-	var jj = 0;
-	var ia = 0;
-	var ja = 0;
-	var det = 0;
-	var ap = dojo.math.matrix.create(tms - 1, tms - 1);
-	for (var i = 0; i < tms; i++) {
-		for (var j = 0; j < tms; j++) {
-			ia = 0;
-			for (ii = 0; ii < tms; ii++) {
-				if (ii == i) {
-					continue;
-				}
-				ja = 0;
-				for (jj = 0; jj < tms; jj++) {
-					if (jj == j) {
-						continue;
-					}
-					ap[ia][ja] = a[ii][jj];
-					ja++;
-				}
-				ia++;
-			}
-			det = dojo.math.matrix.determinant(ap);
-			m[i][j] = Math.pow(-1, (i + j)) * det;
-		}
-	}
-	m = dojo.math.matrix.transpose(m);
-	return m;
-};
-dojo.math.matrix.transpose = function (a) {
-	var m = dojo.math.matrix.create(a.length, a[0].length);
-	for (var i = 0; i < a.length; i++) {
-		for (var j = 0; j < a[i].length; j++) {
-			m[j][i] = a[i][j];
-		}
-	}
-	return m;
-};
-dojo.math.matrix.format = function (a, decimal_points) {
-	if (arguments.length <= 1) {
-		decimal_points = 5;
-	}
-	function format_int(x, dp) {
-		var fac = Math.pow(10, dp);
-		var a = Math.round(x * fac) / fac;
-		var b = a.toString();
-		if (b.charAt(0) != "-") {
-			b = " " + b;
-		}
-		var has_dp = 0;
-		for (var i = 1; i < b.length; i++) {
-			if (b.charAt(i) == ".") {
-				has_dp = 1;
-			}
-		}
-		if (!has_dp) {
-			b += ".";
-		}
-		while (b.length < dp + 3) {
-			b += "0";
-		}
-		return b;
-	}
-	var ya = a.length;
-	var xa = ya > 0 ? a[0].length : 0;
-	var buffer = "";
-	for (var y = 0; y < ya; y++) {
-		buffer += "| ";
-		for (var x = 0; x < xa; x++) {
-			buffer += format_int(a[y][x], decimal_points) + " ";
-		}
-		buffer += "|\n";
-	}
-	return buffer;
-};
-dojo.math.matrix.copy = function (a) {
-	var ya = a.length;
-	var xa = a[0].length;
-	var m = dojo.math.matrix.create(xa, ya);
-	for (var y = 0; y < ya; y++) {
-		for (var x = 0; x < xa; x++) {
-			m[y][x] = a[y][x];
-		}
-	}
-	return m;
-};
-dojo.math.matrix.scale = function (k, a) {
-	a = dojo.math.matrix.copy(a);
-	var ya = a.length;
-	var xa = a[0].length;
-	for (var y = 0; y < ya; y++) {
-		for (var x = 0; x < xa; x++) {
-			a[y][x] *= k;
-		}
-	}
-	return a;
-};
-

http://git-wip-us.apache.org/repos/asf/struts/blob/17d73d21/plugins/dojo/src/main/resources/org/apache/struts2/static/dojo/src/math/points.js
----------------------------------------------------------------------
diff --git a/plugins/dojo/src/main/resources/org/apache/struts2/static/dojo/src/math/points.js b/plugins/dojo/src/main/resources/org/apache/struts2/static/dojo/src/math/points.js
deleted file mode 100644
index bc00252..0000000
--- a/plugins/dojo/src/main/resources/org/apache/struts2/static/dojo/src/math/points.js
+++ /dev/null
@@ -1,42 +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.math.points");
-dojo.require("dojo.math");
-dojo.math.points = {translate:function (a, b) {
-	if (a.length != b.length) {
-		dojo.raise("dojo.math.translate: points not same size (a:[" + a + "], b:[" + b + "])");
-	}
-	var c = new Array(a.length);
-	for (var i = 0; i < a.length; i++) {
-		c[i] = a[i] + b[i];
-	}
-	return c;
-}, midpoint:function (a, b) {
-	if (a.length != b.length) {
-		dojo.raise("dojo.math.midpoint: points not same size (a:[" + a + "], b:[" + b + "])");
-	}
-	var c = new Array(a.length);
-	for (var i = 0; i < a.length; i++) {
-		c[i] = (a[i] + b[i]) / 2;
-	}
-	return c;
-}, invert:function (a) {
-	var b = new Array(a.length);
-	for (var i = 0; i < a.length; i++) {
-		b[i] = -a[i];
-	}
-	return b;
-}, distance:function (a, b) {
-	return Math.sqrt(Math.pow(b[0] - a[0], 2) + Math.pow(b[1] - a[1], 2));
-}};
-

http://git-wip-us.apache.org/repos/asf/struts/blob/17d73d21/plugins/dojo/src/main/resources/org/apache/struts2/static/dojo/src/namespaces/dojo.js
----------------------------------------------------------------------
diff --git a/plugins/dojo/src/main/resources/org/apache/struts2/static/dojo/src/namespaces/dojo.js b/plugins/dojo/src/main/resources/org/apache/struts2/static/dojo/src/namespaces/dojo.js
deleted file mode 100644
index d4c7f10..0000000
--- a/plugins/dojo/src/main/resources/org/apache/struts2/static/dojo/src/namespaces/dojo.js
+++ /dev/null
@@ -1,163 +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.namespaces.dojo");
-dojo.require("dojo.ns");
-
-(function(){
-	// Mapping of all widget short names to their full package names
-	// This is used for widget autoloading - no dojo.require() is necessary.
-	// If you use a widget in markup or create one dynamically, then this
-	// mapping is used to find and load any dependencies not already loaded.
-	// You should use your own namespace for any custom widgets.
-	// For extra widgets you use, dojo.declare() may be used to explicitly load them.
-	// Experimental and deprecated widgets are not included in this table
-	var map = {
-		html: {
-			"accordioncontainer": "dojo.widget.AccordionContainer",
-			"animatedpng": "dojo.widget.AnimatedPng",
-			"button": "dojo.widget.Button",
-			"chart": "dojo.widget.Chart",
-			"checkbox": "dojo.widget.Checkbox",
-			"clock": "dojo.widget.Clock",
-			"colorpalette": "dojo.widget.ColorPalette",
-			"combobox": "dojo.widget.ComboBox",
-			"combobutton": "dojo.widget.Button",
-			"contentpane": "dojo.widget.ContentPane",
-			"currencytextbox": "dojo.widget.CurrencyTextbox",
-			"datepicker": "dojo.widget.DatePicker",
-			"datetextbox": "dojo.widget.DateTextbox",
-			"debugconsole": "dojo.widget.DebugConsole",
-			"dialog": "dojo.widget.Dialog",
-			"dropdownbutton": "dojo.widget.Button",
-			"dropdowndatepicker": "dojo.widget.DropdownDatePicker",
-			"dropdowntimepicker": "dojo.widget.DropdownTimePicker",
-			"emaillisttextbox": "dojo.widget.InternetTextbox",
-			"emailtextbox": "dojo.widget.InternetTextbox",
-			"editor": "dojo.widget.Editor",
-			"editor2": "dojo.widget.Editor2",
-			"filteringtable": "dojo.widget.FilteringTable",
-			"fisheyelist": "dojo.widget.FisheyeList",
-			"fisheyelistitem": "dojo.widget.FisheyeList",
-			"floatingpane": "dojo.widget.FloatingPane",
-			"modalfloatingpane": "dojo.widget.FloatingPane",
-			"form": "dojo.widget.Form",
-			"googlemap": "dojo.widget.GoogleMap",
-			"inlineeditbox": "dojo.widget.InlineEditBox",
-			"integerspinner": "dojo.widget.Spinner",
-			"integertextbox": "dojo.widget.IntegerTextbox",
-			"ipaddresstextbox": "dojo.widget.InternetTextbox",
-			"layoutcontainer": "dojo.widget.LayoutContainer",
-			"linkpane": "dojo.widget.LinkPane",
-			"popupmenu2": "dojo.widget.Menu2",
-			"menuitem2": "dojo.widget.Menu2",
-			"menuseparator2": "dojo.widget.Menu2",
-			"menubar2": "dojo.widget.Menu2",
-			"menubaritem2": "dojo.widget.Menu2",
-			"pagecontainer": "dojo.widget.PageContainer",
-			"pagecontroller": "dojo.widget.PageContainer",
-			"popupcontainer": "dojo.widget.PopupContainer",
-			"progressbar": "dojo.widget.ProgressBar",
-			"radiogroup": "dojo.widget.RadioGroup",
-			"realnumbertextbox": "dojo.widget.RealNumberTextbox",
-			"regexptextbox": "dojo.widget.RegexpTextbox",
-			"repeater": "dojo.widget.Repeater", 
-			"resizabletextarea": "dojo.widget.ResizableTextarea",
-			"richtext": "dojo.widget.RichText",
-			"select": "dojo.widget.Select",
-			"show": "dojo.widget.Show",
-			"showaction": "dojo.widget.ShowAction",
-			"showslide": "dojo.widget.ShowSlide",
-			"slidervertical": "dojo.widget.Slider",
-			"sliderhorizontal": "dojo.widget.Slider",
-			"slider":"dojo.widget.Slider",
-			"slideshow": "dojo.widget.SlideShow",
-			"sortabletable": "dojo.widget.SortableTable",
-			"splitcontainer": "dojo.widget.SplitContainer",
-			"tabcontainer": "dojo.widget.TabContainer",
-			"tabcontroller": "dojo.widget.TabContainer",
-			"taskbar": "dojo.widget.TaskBar",
-			"textbox": "dojo.widget.Textbox",
-			"timepicker": "dojo.widget.TimePicker",
-			"timetextbox": "dojo.widget.DateTextbox",
-			"titlepane": "dojo.widget.TitlePane",
-			"toaster": "dojo.widget.Toaster",
-			"toggler": "dojo.widget.Toggler",
-			"toolbar": "dojo.widget.Toolbar",
-			"toolbarcontainer": "dojo.widget.Toolbar",
-			"toolbaritem": "dojo.widget.Toolbar",
-			"toolbarbuttongroup": "dojo.widget.Toolbar",
-			"toolbarbutton": "dojo.widget.Toolbar",
-			"toolbardialog": "dojo.widget.Toolbar",
-			"toolbarmenu": "dojo.widget.Toolbar",
-			"toolbarseparator": "dojo.widget.Toolbar",
-			"toolbarspace": "dojo.widget.Toolbar",
-			"toolbarselect": "dojo.widget.Toolbar",
-			"toolbarcolordialog": "dojo.widget.Toolbar",
-			"tooltip": "dojo.widget.Tooltip",
-			"tree": "dojo.widget.Tree",
-			"treebasiccontroller": "dojo.widget.TreeBasicController",
-			"treecontextmenu": "dojo.widget.TreeContextMenu",
-			"treedisablewrapextension": "dojo.widget.TreeDisableWrapExtension",
-			"treedociconextension": "dojo.widget.TreeDocIconExtension",
-			"treeeditor": "dojo.widget.TreeEditor",
-			"treeemphasizeonselect": "dojo.widget.TreeEmphasizeOnSelect",
-			"treeexpandtonodeonselect": "dojo.widget.TreeExpandToNodeOnSelect",
-			"treelinkextension": "dojo.widget.TreeLinkExtension",
-			"treeloadingcontroller": "dojo.widget.TreeLoadingController",
-			"treemenuitem": "dojo.widget.TreeContextMenu",
-			"treenode": "dojo.widget.TreeNode",
-			"treerpccontroller": "dojo.widget.TreeRPCController",
-			"treeselector": "dojo.widget.TreeSelector",
-			"treetoggleonselect": "dojo.widget.TreeToggleOnSelect",
-			"treev3": "dojo.widget.TreeV3",
-			"treebasiccontrollerv3": "dojo.widget.TreeBasicControllerV3",
-			"treecontextmenuv3": "dojo.widget.TreeContextMenuV3",
-			"treedndcontrollerv3": "dojo.widget.TreeDndControllerV3",
-			"treeloadingcontrollerv3": "dojo.widget.TreeLoadingControllerV3",
-			"treemenuitemv3": "dojo.widget.TreeContextMenuV3",
-			"treerpccontrollerv3": "dojo.widget.TreeRpcControllerV3",
-			"treeselectorv3": "dojo.widget.TreeSelectorV3",
-			"urltextbox": "dojo.widget.InternetTextbox",
-			"usphonenumbertextbox": "dojo.widget.UsTextbox",
-			"ussocialsecuritynumbertextbox": "dojo.widget.UsTextbox",
-			"usstatetextbox": "dojo.widget.UsTextbox",
-			"usziptextbox": "dojo.widget.UsTextbox",
-			"validationtextbox": "dojo.widget.ValidationTextbox",
-			"treeloadingcontroller": "dojo.widget.TreeLoadingController",
-			"wizardcontainer": "dojo.widget.Wizard",
-			"wizardpane": "dojo.widget.Wizard",
-			"yahoomap": "dojo.widget.YahooMap"
-		},
-		svg: {
-			"chart": "dojo.widget.svg.Chart"
-		},
-		vml: {
-			"chart": "dojo.widget.vml.Chart"
-		}
-	};
-
-	dojo.addDojoNamespaceMapping = function(/*String*/shortName, /*String*/packageName){
-	// summary:
-	//	Add an entry to the mapping table for the dojo: namespace
-	//
-	// shortName: the name to be used as the widget's tag name in the dojo: namespace
-	// packageName: the path to the Javascript module in dotted package notation
-		map[shortName]=packageName;    
-	};
-	
-	function dojoNamespaceResolver(name, domain){
-		if(!domain){ domain="html"; }
-		if(!map[domain]){ return null; }
-		return map[domain][name];    
-	}
-
-	dojo.registerNamespaceResolver("dojo", dojoNamespaceResolver);
-})();

http://git-wip-us.apache.org/repos/asf/struts/blob/17d73d21/plugins/dojo/src/main/resources/org/apache/struts2/static/dojo/src/ns.js
----------------------------------------------------------------------
diff --git a/plugins/dojo/src/main/resources/org/apache/struts2/static/dojo/src/ns.js b/plugins/dojo/src/main/resources/org/apache/struts2/static/dojo/src/ns.js
deleted file mode 100644
index f76f02b..0000000
--- a/plugins/dojo/src/main/resources/org/apache/struts2/static/dojo/src/ns.js
+++ /dev/null
@@ -1,100 +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.ns");
-dojo.ns = {namespaces:{}, failed:{}, loading:{}, loaded:{}, register:function (name, module, resolver, noOverride) {
-	if (!noOverride || !this.namespaces[name]) {
-		this.namespaces[name] = new dojo.ns.Ns(name, module, resolver);
-	}
-}, allow:function (name) {
-	if (this.failed[name]) {
-		return false;
-	}
-	if ((djConfig.excludeNamespace) && (dojo.lang.inArray(djConfig.excludeNamespace, name))) {
-		return false;
-	}
-	return ((name == this.dojo) || (!djConfig.includeNamespace) || (dojo.lang.inArray(djConfig.includeNamespace, name)));
-}, get:function (name) {
-	return this.namespaces[name];
-}, require:function (name) {
-	var ns = this.namespaces[name];
-	if ((ns) && (this.loaded[name])) {
-		return ns;
-	}
-	if (!this.allow(name)) {
-		return false;
-	}
-	if (this.loading[name]) {
-		dojo.debug("dojo.namespace.require: re-entrant request to load namespace \"" + name + "\" must fail.");
-		return false;
-	}
-	var req = dojo.require;
-	this.loading[name] = true;
-	try {
-		if (name == "dojo") {
-			req("dojo.namespaces.dojo");
-		} else {
-			if (!dojo.hostenv.moduleHasPrefix(name)) {
-				dojo.registerModulePath(name, "../" + name);
-			}
-			req([name, "manifest"].join("."), false, true);
-		}
-		if (!this.namespaces[name]) {
-			this.failed[name] = true;
-		}
-	}
-	finally {
-		this.loading[name] = false;
-	}
-	return this.namespaces[name];
-}};
-dojo.ns.Ns = function (name, module, resolver) {
-	this.name = name;
-	this.module = module;
-	this.resolver = resolver;
-	this._loaded = [];
-	this._failed = [];
-};
-dojo.ns.Ns.prototype.resolve = function (name, domain, omitModuleCheck) {
-	if (!this.resolver || djConfig["skipAutoRequire"]) {
-		return false;
-	}
-	var fullName = this.resolver(name, domain);
-	if ((fullName) && (!this._loaded[fullName]) && (!this._failed[fullName])) {
-		var req = dojo.require;
-		req(fullName, false, true);
-		if (dojo.hostenv.findModule(fullName, false)) {
-			this._loaded[fullName] = true;
-		} else {
-			if (!omitModuleCheck) {
-				dojo.raise("dojo.ns.Ns.resolve: module '" + fullName + "' not found after loading via namespace '" + this.name + "'");
-			}
-			this._failed[fullName] = true;
-		}
-	}
-	return Boolean(this._loaded[fullName]);
-};
-dojo.registerNamespace = function (name, module, resolver) {
-	dojo.ns.register.apply(dojo.ns, arguments);
-};
-dojo.registerNamespaceResolver = function (name, resolver) {
-	var n = dojo.ns.namespaces[name];
-	if (n) {
-		n.resolver = resolver;
-	}
-};
-dojo.registerNamespaceManifest = function (module, path, name, widgetModule, resolver) {
-	dojo.registerModulePath(name, path);
-	dojo.registerNamespace(name, widgetModule, resolver);
-};
-dojo.registerNamespace("dojo", "dojo.widget");
-

http://git-wip-us.apache.org/repos/asf/struts/blob/17d73d21/plugins/dojo/src/main/resources/org/apache/struts2/static/dojo/src/profile.js
----------------------------------------------------------------------
diff --git a/plugins/dojo/src/main/resources/org/apache/struts2/static/dojo/src/profile.js b/plugins/dojo/src/main/resources/org/apache/struts2/static/dojo/src/profile.js
deleted file mode 100644
index c53cd38..0000000
--- a/plugins/dojo/src/main/resources/org/apache/struts2/static/dojo/src/profile.js
+++ /dev/null
@@ -1,104 +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.profile");
-dojo.profile = {_profiles:{}, _pns:[], start:function (name) {
-	if (!this._profiles[name]) {
-		this._profiles[name] = {iters:0, total:0};
-		this._pns[this._pns.length] = name;
-	} else {
-		if (this._profiles[name]["start"]) {
-			this.end(name);
-		}
-	}
-	this._profiles[name].end = null;
-	this._profiles[name].start = new Date();
-}, end:function (name) {
-	var ed = new Date();
-	if ((this._profiles[name]) && (this._profiles[name]["start"])) {
-		with (this._profiles[name]) {
-			end = ed;
-			total += (end - start);
-			start = null;
-			iters++;
-		}
-	} else {
-		return true;
-	}
-}, dump:function (appendToDoc) {
-	var tbl = document.createElement("table");
-	with (tbl.style) {
-		border = "1px solid black";
-		borderCollapse = "collapse";
-	}
-	var hdr = tbl.createTHead();
-	var hdrtr = hdr.insertRow(0);
-	var cols = ["Identifier", "Calls", "Total", "Avg"];
-	for (var x = 0; x < cols.length; x++) {
-		var ntd = hdrtr.insertCell(x);
-		with (ntd.style) {
-			backgroundColor = "#225d94";
-			color = "white";
-			borderBottom = "1px solid black";
-			borderRight = "1px solid black";
-			fontFamily = "tahoma";
-			fontWeight = "bolder";
-			paddingLeft = paddingRight = "5px";
-		}
-		ntd.appendChild(document.createTextNode(cols[x]));
-	}
-	for (var x = 0; x < this._pns.length; x++) {
-		var prf = this._profiles[this._pns[x]];
-		this.end(this._pns[x]);
-		if (prf.iters > 0) {
-			var bdytr = tbl.insertRow(true);
-			var vals = [this._pns[x], prf.iters, prf.total, parseInt(prf.total / prf.iters)];
-			for (var y = 0; y < vals.length; y++) {
-				var cc = bdytr.insertCell(y);
-				cc.appendChild(document.createTextNode(vals[y]));
-				with (cc.style) {
-					borderBottom = "1px solid gray";
-					paddingLeft = paddingRight = "5px";
-					if (x % 2) {
-						backgroundColor = "#e1f1ff";
-					}
-					if (y > 0) {
-						textAlign = "right";
-						borderRight = "1px solid gray";
-					} else {
-						borderRight = "1px solid black";
-					}
-				}
-			}
-		}
-	}
-	if (appendToDoc) {
-		var ne = document.createElement("div");
-		ne.id = "profileOutputTable";
-		with (ne.style) {
-			fontFamily = "Courier New, monospace";
-			fontSize = "12px";
-			lineHeight = "16px";
-			borderTop = "1px solid black";
-			padding = "10px";
-		}
-		if (document.getElementById("profileOutputTable")) {
-			dojo.body().replaceChild(ne, document.getElementById("profileOutputTable"));
-		} else {
-			dojo.body().appendChild(ne);
-		}
-		ne.appendChild(tbl);
-	}
-	return tbl;
-}};
-dojo.profile.stop = dojo.profile.end;
-

http://git-wip-us.apache.org/repos/asf/struts/blob/17d73d21/plugins/dojo/src/main/resources/org/apache/struts2/static/dojo/src/regexp.js
----------------------------------------------------------------------
diff --git a/plugins/dojo/src/main/resources/org/apache/struts2/static/dojo/src/regexp.js b/plugins/dojo/src/main/resources/org/apache/struts2/static/dojo/src/regexp.js
deleted file mode 100644
index 32d95b1..0000000
--- a/plugins/dojo/src/main/resources/org/apache/struts2/static/dojo/src/regexp.js
+++ /dev/null
@@ -1,365 +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.regexp");
-dojo.evalObjPath("dojo.regexp.us", true);
-dojo.regexp.tld = function (flags) {
-	flags = (typeof flags == "object") ? flags : {};
-	if (typeof flags.allowCC != "boolean") {
-		flags.allowCC = true;
-	}
-	if (typeof flags.allowInfra != "boolean") {
-		flags.allowInfra = true;
-	}
-	if (typeof flags.allowGeneric != "boolean") {
-		flags.allowGeneric = true;
-	}
-	var infraRE = "arpa";
-	var genericRE = "aero|biz|com|coop|edu|gov|info|int|mil|museum|name|net|org|pro|travel|xxx|jobs|mobi|post";
-	var ccRE = "ac|ad|ae|af|ag|ai|al|am|an|ao|aq|ar|as|at|au|aw|az|ba|bb|bd|be|bf|bg|bh|bi|bj|bm|bn|bo|br|" + "bs|bt|bv|bw|by|bz|ca|cc|cd|cf|cg|ch|ci|ck|cl|cm|cn|co|cr|cu|cv|cx|cy|cz|de|dj|dk|dm|do|dz|" + "ec|ee|eg|er|eu|es|et|fi|fj|fk|fm|fo|fr|ga|gd|ge|gf|gg|gh|gi|gl|gm|gn|gp|gq|gr|gs|gt|gu|gw|" + "gy|hk|hm|hn|hr|ht|hu|id|ie|il|im|in|io|ir|is|it|je|jm|jo|jp|ke|kg|kh|ki|km|kn|kr|kw|ky|kz|" + "la|lb|lc|li|lk|lr|ls|lt|lu|lv|ly|ma|mc|md|mg|mh|mk|ml|mm|mn|mo|mp|mq|mr|ms|mt|mu|mv|mw|mx|" + "my|mz|na|nc|ne|nf|ng|ni|nl|no|np|nr|nu|nz|om|pa|pe|pf|pg|ph|pk|pl|pm|pn|pr|ps|pt|pw|py|qa|" + "re|ro|ru|rw|sa|sb|sc|sd|se|sg|sh|si|sk|sl|sm|sn|sr|st|su|sv|sy|sz|tc|td|tf|tg|th|tj|tk|tm|" + "tn|to|tr|tt|tv|tw|tz|ua|ug|uk|us|uy|uz|va|vc|ve|vg|vi|vn|vu|wf|ws|ye|yt|yu|za|zm|zw";
-	var a = [];
-	if (flags.allowInfra) {
-		a.push(infraRE);
-	}
-	if (flags.allowGeneric) {
-		a.push(genericRE);
-	}
-	if (flags.allowCC) {
-		a.push(ccRE);
-	}
-	var tldRE = "";
-	if (a.length > 0) {
-		tldRE = "(" + a.join("|") + ")";
-	}
-	return tldRE;
-};
-dojo.regexp.ipAddress = function (flags) {
-	flags = (typeof flags == "object") ? flags : {};
-	if (typeof flags.allowDottedDecimal != "boolean") {
-		flags.allowDottedDecimal = true;
-	}
-	if (typeof flags.allowDottedHex != "boolean") {
-		flags.allowDottedHex = true;
-	}
-	if (typeof flags.allowDottedOctal != "boolean") {
-		flags.allowDottedOctal = true;
-	}
-	if (typeof flags.allowDecimal != "boolean") {
-		flags.allowDecimal = true;
-	}
-	if (typeof flags.allowHex != "boolean") {
-		flags.allowHex = true;
-	}
-	if (typeof flags.allowIPv6 != "boolean") {
-		flags.allowIPv6 = true;
-	}
-	if (typeof flags.allowHybrid != "boolean") {
-		flags.allowHybrid = true;
-	}
-	var dottedDecimalRE = "((\\d|[1-9]\\d|1\\d\\d|2[0-4]\\d|25[0-5])\\.){3}(\\d|[1-9]\\d|1\\d\\d|2[0-4]\\d|25[0-5])";
-	var dottedHexRE = "(0[xX]0*[\\da-fA-F]?[\\da-fA-F]\\.){3}0[xX]0*[\\da-fA-F]?[\\da-fA-F]";
-	var dottedOctalRE = "(0+[0-3][0-7][0-7]\\.){3}0+[0-3][0-7][0-7]";
-	var decimalRE = "(0|[1-9]\\d{0,8}|[1-3]\\d{9}|4[01]\\d{8}|42[0-8]\\d{7}|429[0-3]\\d{6}|" + "4294[0-8]\\d{5}|42949[0-5]\\d{4}|429496[0-6]\\d{3}|4294967[01]\\d{2}|42949672[0-8]\\d|429496729[0-5])";
-	var hexRE = "0[xX]0*[\\da-fA-F]{1,8}";
-	var ipv6RE = "([\\da-fA-F]{1,4}\\:){7}[\\da-fA-F]{1,4}";
-	var hybridRE = "([\\da-fA-F]{1,4}\\:){6}" + "((\\d|[1-9]\\d|1\\d\\d|2[0-4]\\d|25[0-5])\\.){3}(\\d|[1-9]\\d|1\\d\\d|2[0-4]\\d|25[0-5])";
-	var a = [];
-	if (flags.allowDottedDecimal) {
-		a.push(dottedDecimalRE);
-	}
-	if (flags.allowDottedHex) {
-		a.push(dottedHexRE);
-	}
-	if (flags.allowDottedOctal) {
-		a.push(dottedOctalRE);
-	}
-	if (flags.allowDecimal) {
-		a.push(decimalRE);
-	}
-	if (flags.allowHex) {
-		a.push(hexRE);
-	}
-	if (flags.allowIPv6) {
-		a.push(ipv6RE);
-	}
-	if (flags.allowHybrid) {
-		a.push(hybridRE);
-	}
-	var ipAddressRE = "";
-	if (a.length > 0) {
-		ipAddressRE = "(" + a.join("|") + ")";
-	}
-	return ipAddressRE;
-};
-dojo.regexp.host = function (flags) {
-	flags = (typeof flags == "object") ? flags : {};
-	if (typeof flags.allowIP != "boolean") {
-		flags.allowIP = true;
-	}
-	if (typeof flags.allowLocal != "boolean") {
-		flags.allowLocal = false;
-	}
-	if (typeof flags.allowPort != "boolean") {
-		flags.allowPort = true;
-	}
-	var domainNameRE = "([0-9a-zA-Z]([-0-9a-zA-Z]{0,61}[0-9a-zA-Z])?\\.)+" + dojo.regexp.tld(flags);
-	var portRE = (flags.allowPort) ? "(\\:" + dojo.regexp.integer({signed:false}) + ")?" : "";
-	var hostNameRE = domainNameRE;
-	if (flags.allowIP) {
-		hostNameRE += "|" + dojo.regexp.ipAddress(flags);
-	}
-	if (flags.allowLocal) {
-		hostNameRE += "|localhost";
-	}
-	return "(" + hostNameRE + ")" + portRE;
-};
-dojo.regexp.url = function (flags) {
-	flags = (typeof flags == "object") ? flags : {};
-	if (typeof flags.scheme == "undefined") {
-		flags.scheme = [true, false];
-	}
-	var protocolRE = dojo.regexp.buildGroupRE(flags.scheme, function (q) {
-		if (q) {
-			return "(https?|ftps?)\\://";
-		}
-		return "";
-	});
-	var pathRE = "(/([^?#\\s/]+/)*)?([^?#\\s/]+(\\?[^?#\\s/]*)?(#[A-Za-z][\\w.:-]*)?)?";
-	return protocolRE + dojo.regexp.host(flags) + pathRE;
-};
-dojo.regexp.emailAddress = function (flags) {
-	flags = (typeof flags == "object") ? flags : {};
-	if (typeof flags.allowCruft != "boolean") {
-		flags.allowCruft = false;
-	}
-	flags.allowPort = false;
-	var usernameRE = "([\\da-z]+[-._+&'])*[\\da-z]+";
-	var emailAddressRE = usernameRE + "@" + dojo.regexp.host(flags);
-	if (flags.allowCruft) {
-		emailAddressRE = "<?(mailto\\:)?" + emailAddressRE + ">?";
-	}
-	return emailAddressRE;
-};
-dojo.regexp.emailAddressList = function (flags) {
-	flags = (typeof flags == "object") ? flags : {};
-	if (typeof flags.listSeparator != "string") {
-		flags.listSeparator = "\\s;,";
-	}
-	var emailAddressRE = dojo.regexp.emailAddress(flags);
-	var emailAddressListRE = "(" + emailAddressRE + "\\s*[" + flags.listSeparator + "]\\s*)*" + emailAddressRE + "\\s*[" + flags.listSeparator + "]?\\s*";
-	return emailAddressListRE;
-};
-dojo.regexp.integer = function (flags) {
-	flags = (typeof flags == "object") ? flags : {};
-	if (typeof flags.signed == "undefined") {
-		flags.signed = [true, false];
-	}
-	if (typeof flags.separator == "undefined") {
-		flags.separator = "";
-	} else {
-		if (typeof flags.groupSize == "undefined") {
-			flags.groupSize = 3;
-		}
-	}
-	var signRE = dojo.regexp.buildGroupRE(flags.signed, function (q) {
-		return q ? "[-+]" : "";
-	});
-	var numberRE = dojo.regexp.buildGroupRE(flags.separator, function (sep) {
-		if (sep == "") {
-			return "(0|[1-9]\\d*)";
-		}
-		var grp = flags.groupSize, grp2 = flags.groupSize2;
-		if (typeof grp2 != "undefined") {
-			var grp2RE = "(0|[1-9]\\d{0," + (grp2 - 1) + "}([" + sep + "]\\d{" + grp2 + "})*[" + sep + "]\\d{" + grp + "})";
-			return ((grp - grp2) > 0) ? "(" + grp2RE + "|(0|[1-9]\\d{0," + (grp - 1) + "}))" : grp2RE;
-		}
-		return "(0|[1-9]\\d{0," + (grp - 1) + "}([" + sep + "]\\d{" + grp + "})*)";
-	});
-	return signRE + numberRE;
-};
-dojo.regexp.realNumber = function (flags) {
-	flags = (typeof flags == "object") ? flags : {};
-	if (typeof flags.places != "number") {
-		flags.places = Infinity;
-	}
-	if (typeof flags.decimal != "string") {
-		flags.decimal = ".";
-	}
-	if (typeof flags.fractional == "undefined") {
-		flags.fractional = [true, false];
-	}
-	if (typeof flags.exponent == "undefined") {
-		flags.exponent = [true, false];
-	}
-	if (typeof flags.eSigned == "undefined") {
-		flags.eSigned = [true, false];
-	}
-	var integerRE = dojo.regexp.integer(flags);
-	var decimalRE = dojo.regexp.buildGroupRE(flags.fractional, function (q) {
-		var re = "";
-		if (q && (flags.places > 0)) {
-			re = "\\" + flags.decimal;
-			if (flags.places == Infinity) {
-				re = "(" + re + "\\d+)?";
-			} else {
-				re = re + "\\d{" + flags.places + "}";
-			}
-		}
-		return re;
-	});
-	var exponentRE = dojo.regexp.buildGroupRE(flags.exponent, function (q) {
-		if (q) {
-			return "([eE]" + dojo.regexp.integer({signed:flags.eSigned}) + ")";
-		}
-		return "";
-	});
-	return integerRE + decimalRE + exponentRE;
-};
-dojo.regexp.currency = function (flags) {
-	flags = (typeof flags == "object") ? flags : {};
-	if (typeof flags.signed == "undefined") {
-		flags.signed = [true, false];
-	}
-	if (typeof flags.symbol == "undefined") {
-		flags.symbol = "$";
-	}
-	if (typeof flags.placement != "string") {
-		flags.placement = "before";
-	}
-	if (typeof flags.signPlacement != "string") {
-		flags.signPlacement = "before";
-	}
-	if (typeof flags.separator == "undefined") {
-		flags.separator = ",";
-	}
-	if (typeof flags.fractional == "undefined" && typeof flags.cents != "undefined") {
-		dojo.deprecated("dojo.regexp.currency: flags.cents", "use flags.fractional instead", "0.5");
-		flags.fractional = flags.cents;
-	}
-	if (typeof flags.decimal != "string") {
-		flags.decimal = ".";
-	}
-	var signRE = dojo.regexp.buildGroupRE(flags.signed, function (q) {
-		if (q) {
-			return "[-+]";
-		}
-		return "";
-	});
-	var symbolRE = dojo.regexp.buildGroupRE(flags.symbol, function (symbol) {
-		return "\\s?" + symbol.replace(/([.$?*!=:|\\\/^])/g, "\\$1") + "\\s?";
-	});
-	switch (flags.signPlacement) {
-	  case "before":
-		symbolRE = signRE + symbolRE;
-		break;
-	  case "after":
-		symbolRE = symbolRE + signRE;
-		break;
-	}
-	var flagsCopy = flags;
-	flagsCopy.signed = false;
-	flagsCopy.exponent = false;
-	var numberRE = dojo.regexp.realNumber(flagsCopy);
-	var currencyRE;
-	switch (flags.placement) {
-	  case "before":
-		currencyRE = symbolRE + numberRE;
-		break;
-	  case "after":
-		currencyRE = numberRE + symbolRE;
-		break;
-	}
-	switch (flags.signPlacement) {
-	  case "around":
-		currencyRE = "(" + currencyRE + "|" + "\\(" + currencyRE + "\\)" + ")";
-		break;
-	  case "begin":
-		currencyRE = signRE + currencyRE;
-		break;
-	  case "end":
-		currencyRE = currencyRE + signRE;
-		break;
-	}
-	return currencyRE;
-};
-dojo.regexp.us.state = function (flags) {
-	flags = (typeof flags == "object") ? flags : {};
-	if (typeof flags.allowTerritories != "boolean") {
-		flags.allowTerritories = true;
-	}
-	if (typeof flags.allowMilitary != "boolean") {
-		flags.allowMilitary = true;
-	}
-	var statesRE = "AL|AK|AZ|AR|CA|CO|CT|DE|DC|FL|GA|HI|ID|IL|IN|IA|KS|KY|LA|ME|MD|MA|MI|MN|MS|MO|MT|" + "NE|NV|NH|NJ|NM|NY|NC|ND|OH|OK|OR|PA|RI|SC|SD|TN|TX|UT|VT|VA|WA|WV|WI|WY";
-	var territoriesRE = "AS|FM|GU|MH|MP|PW|PR|VI";
-	var militaryRE = "AA|AE|AP";
-	if (flags.allowTerritories) {
-		statesRE += "|" + territoriesRE;
-	}
-	if (flags.allowMilitary) {
-		statesRE += "|" + militaryRE;
-	}
-	return "(" + statesRE + ")";
-};
-dojo.regexp.time = function (flags) {
-	dojo.deprecated("dojo.regexp.time", "Use dojo.date.parse instead", "0.5");
-	flags = (typeof flags == "object") ? flags : {};
-	if (typeof flags.format == "undefined") {
-		flags.format = "h:mm:ss t";
-	}
-	if (typeof flags.amSymbol != "string") {
-		flags.amSymbol = "AM";
-	}
-	if (typeof flags.pmSymbol != "string") {
-		flags.pmSymbol = "PM";
-	}
-	var timeRE = function (format) {
-		format = format.replace(/([.$?*!=:|{}\(\)\[\]\\\/^])/g, "\\$1");
-		var amRE = flags.amSymbol.replace(/([.$?*!=:|{}\(\)\[\]\\\/^])/g, "\\$1");
-		var pmRE = flags.pmSymbol.replace(/([.$?*!=:|{}\(\)\[\]\\\/^])/g, "\\$1");
-		format = format.replace("hh", "(0[1-9]|1[0-2])");
-		format = format.replace("h", "([1-9]|1[0-2])");
-		format = format.replace("HH", "([01][0-9]|2[0-3])");
-		format = format.replace("H", "([0-9]|1[0-9]|2[0-3])");
-		format = format.replace("mm", "([0-5][0-9])");
-		format = format.replace("m", "([1-5][0-9]|[0-9])");
-		format = format.replace("ss", "([0-5][0-9])");
-		format = format.replace("s", "([1-5][0-9]|[0-9])");
-		format = format.replace("t", "\\s?(" + amRE + "|" + pmRE + ")\\s?");
-		return format;
-	};
-	return dojo.regexp.buildGroupRE(flags.format, timeRE);
-};
-dojo.regexp.numberFormat = function (flags) {
-	flags = (typeof flags == "object") ? flags : {};
-	if (typeof flags.format == "undefined") {
-		flags.format = "###-###-####";
-	}
-	var digitRE = function (format) {
-		format = format.replace(/([.$*!=:|{}\(\)\[\]\\\/^])/g, "\\$1");
-		format = format.replace(/\?/g, "\\d?");
-		format = format.replace(/#/g, "\\d");
-		return format;
-	};
-	return dojo.regexp.buildGroupRE(flags.format, digitRE);
-};
-dojo.regexp.buildGroupRE = function (a, re) {
-	if (!(a instanceof Array)) {
-		return re(a);
-	}
-	var b = [];
-	for (var i = 0; i < a.length; i++) {
-		b.push(re(a[i]));
-	}
-	return "(" + b.join("|") + ")";
-};
-

http://git-wip-us.apache.org/repos/asf/struts/blob/17d73d21/plugins/dojo/src/main/resources/org/apache/struts2/static/dojo/src/rpc/Deferred.js
----------------------------------------------------------------------
diff --git a/plugins/dojo/src/main/resources/org/apache/struts2/static/dojo/src/rpc/Deferred.js b/plugins/dojo/src/main/resources/org/apache/struts2/static/dojo/src/rpc/Deferred.js
deleted file mode 100644
index d356fbb..0000000
--- a/plugins/dojo/src/main/resources/org/apache/struts2/static/dojo/src/rpc/Deferred.js
+++ /dev/null
@@ -1,18 +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.rpc.Deferred");
-dojo.require("dojo.Deferred");
-dojo.deprecated("dojo.rpc.Deferred", "replaced by dojo.Deferred", "0.6");
-dojo.rpc.Deferred = dojo.Deferred;
-dojo.rpc.Deferred.prototype = dojo.Deferred.prototype;
-

http://git-wip-us.apache.org/repos/asf/struts/blob/17d73d21/plugins/dojo/src/main/resources/org/apache/struts2/static/dojo/src/rpc/JotService.js
----------------------------------------------------------------------
diff --git a/plugins/dojo/src/main/resources/org/apache/struts2/static/dojo/src/rpc/JotService.js b/plugins/dojo/src/main/resources/org/apache/struts2/static/dojo/src/rpc/JotService.js
deleted file mode 100644
index 1923f78..0000000
--- a/plugins/dojo/src/main/resources/org/apache/struts2/static/dojo/src/rpc/JotService.js
+++ /dev/null
@@ -1,27 +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.rpc.JotService");
-dojo.require("dojo.rpc.RpcService");
-dojo.require("dojo.rpc.JsonService");
-dojo.require("dojo.json");
-dojo.rpc.JotService = function () {
-	this.serviceUrl = "/_/jsonrpc";
-};
-dojo.inherits(dojo.rpc.JotService, dojo.rpc.JsonService);
-dojo.lang.extend(dojo.rpc.JotService, {bind:function (method, parameters, deferredRequestHandler, url) {
-	dojo.io.bind({url:url || this.serviceUrl, content:{json:this.createRequest(method, parameters)}, method:"POST", mimetype:"text/json", load:this.resultCallback(deferredRequestHandler), error:this.errorCallback(deferredRequestHandler), preventCache:true});
-}, createRequest:function (method, params) {
-	var req = {"params":params, "method":method, "id":this.lastSubmissionId++};
-	return dojo.json.serialize(req);
-}});
-