[12/53] [partial] struts git commit: WW-4316 Moves archetypes into its own repo
http://git-wip-us.apache.org/repos/asf/struts/blob/7a350b02/archetypes/struts2-archetype-angularjs/src/main/resources/archetype-resources/src/main/webapp/js/lib/angular/i18n/angular-locale_nl-be.js
--
diff --git
a/archetypes/struts2-archetype-angularjs/src/main/resources/archetype-resources/src/main/webapp/js/lib/angular/i18n/angular-locale_nl-be.js
b/archetypes/struts2-archetype-angularjs/src/main/resources/archetype-resources/src/main/webapp/js/lib/angular/i18n/angular-locale_nl-be.js
deleted file mode 100644
index 505cffe..000
---
a/archetypes/struts2-archetype-angularjs/src/main/resources/archetype-resources/src/main/webapp/js/lib/angular/i18n/angular-locale_nl-be.js
+++ /dev/null
@@ -1,143 +0,0 @@
-'use strict';
-angular.module("ngLocale", [], ["$provide", function($provide) {
-var PLURAL_CATEGORY = {ZERO: "zero", ONE: "one", TWO: "two", FEW: "few", MANY:
"many", OTHER: "other"};
-function getDecimals(n) {
- n = n + '';
- var i = n.indexOf('.');
- return (i == -1) ? 0 : n.length - i - 1;
-}
-
-function getVF(n, opt_precision) {
- var v = opt_precision;
-
- if (undefined === v) {
-v = Math.min(getDecimals(n), 3);
- }
-
- var base = Math.pow(10, v);
- var f = ((n * base) | 0) % base;
- return {v: v, f: f};
-}
-
-$provide.value("$locale", {
- "DATETIME_FORMATS": {
-"AMPMS": [
- "a.m.",
- "p.m."
-],
-"DAY": [
- "zondag",
- "maandag",
- "dinsdag",
- "woensdag",
- "donderdag",
- "vrijdag",
- "zaterdag"
-],
-"ERANAMES": [
- "voor Christus",
- "na Christus"
-],
-"ERAS": [
- "v.Chr.",
- "n.Chr."
-],
-"FIRSTDAYOFWEEK": 0,
-"MONTH": [
- "januari",
- "februari",
- "maart",
- "april",
- "mei",
- "juni",
- "juli",
- "augustus",
- "september",
- "oktober",
- "november",
- "december"
-],
-"SHORTDAY": [
- "zo",
- "ma",
- "di",
- "wo",
- "do",
- "vr",
- "za"
-],
-"SHORTMONTH": [
- "jan.",
- "feb.",
- "mrt.",
- "apr.",
- "mei",
- "jun.",
- "jul.",
- "aug.",
- "sep.",
- "okt.",
- "nov.",
- "dec."
-],
-"STANDALONEMONTH": [
- "Januari",
- "Februari",
- "Maart",
- "April",
- "Mei",
- "Juni",
- "Juli",
- "Augustus",
- "September",
- "Oktober",
- "November",
- "December"
-],
-"WEEKENDRANGE": [
- 5,
- 6
-],
-"fullDate": " d y",
-"longDate": "d y",
-"medium": "d MMM y HH:mm:ss",
-"mediumDate": "d MMM y",
-"mediumTime": "HH:mm:ss",
-"short": "d/MM/yy HH:mm",
-"shortDate": "d/MM/yy",
-"shortTime": "HH:mm"
- },
- "NUMBER_FORMATS": {
-"CURRENCY_SYM": "\u20ac",
-"DECIMAL_SEP": ",",
-"GROUP_SEP": ".",
-"PATTERNS": [
- {
-"gSize": 3,
-"lgSize": 3,
-"maxFrac": 3,
-"minFrac": 0,
-"minInt": 1,
-"negPre": "-",
-"negSuf": "",
-"posPre": "",
-"posSuf": ""
- },
- {
-"gSize": 3,
-"lgSize": 3,
-"maxFrac": 2,
-"minFrac": 2,
-"minInt": 1,
-"negPre": "-",
-"negSuf": "\u00a0\u00a4",
-"posPre": "",
-"posSuf": "\u00a0\u00a4"
- }
-]
- },
- "id": "nl-be",
- "localeID": "nl_BE",
- "pluralCat": function(n, opt_precision) { var i = n | 0; var vf = getVF(n,
opt_precision); if (i == 1 && vf.v == 0) {return PLURAL_CATEGORY.ONE; }
return PLURAL_CATEGORY.OTHER;}
-});
-}]);
http://git-wip-us.apache.org/repos/asf/struts/blob/7a350b02/archetypes/struts2-archetype-angularjs/src/main/resources/archetype-resources/src/main/webapp/js/lib/angular/i18n/angular-locale_nl-bq.js
--
diff --git
a/archetypes/struts2-archetype-angularjs/src/main/resources/archetype-resources/src/main/webapp/js/lib/angular/i18n/angular-locale_nl-bq.js
b/archetypes/struts2-archetype-angularjs/src/main/resources/archetype-resources/src/main/webapp/js/lib/angular/i18n/angular-locale_nl-bq.js
deleted file mode 100644
index 28eb5a8..000
---
a/archetypes/struts2-archetype-angularjs/src/main/resources/archetype-resources/src/main/webapp/js/lib/angular/i18n/angular-locale_nl-bq.js
+++ /dev/null
@@ -1,143 +0,0 @@
-'use strict';
-angular.module("ngLocale", [], ["$provide", function($provide) {
-var PLURAL_CATEGORY = {ZERO: "zero", ONE: "one", TWO: "two", FEW: "few", MANY:
"many", OTHER: "other"};
-function getDecimals(n) {
- n = n + '';
- var i = n.indexOf('.');
- return (i == -1) ? 0 : n.length - i - 1;
-}
-
-function getVF(n, opt_precision) {
- var v = opt_precision;
-
- if (undefined === v) {
-v = Math.min(getDecimals(n), 3);
- }
-
- var base = Math.pow(10, v);
- var f = ((n * base) | 0) % base;
- return {v: v, f: f};
-
[46/53] [partial] struts git commit: WW-4316 Moves archetypes into its own repo
http://git-wip-us.apache.org/repos/asf/struts/blob/7a350b02/archetypes/struts2-archetype-angularjs/src/main/resources/archetype-resources/src/main/webapp/js/lib/angular/angular-aria.min.js
--
diff --git
a/archetypes/struts2-archetype-angularjs/src/main/resources/archetype-resources/src/main/webapp/js/lib/angular/angular-aria.min.js
b/archetypes/struts2-archetype-angularjs/src/main/resources/archetype-resources/src/main/webapp/js/lib/angular/angular-aria.min.js
deleted file mode 100644
index cf0fd74..000
---
a/archetypes/struts2-archetype-angularjs/src/main/resources/archetype-resources/src/main/webapp/js/lib/angular/angular-aria.min.js
+++ /dev/null
@@ -1,14 +0,0 @@
-/*
- AngularJS v1.5.0
- (c) 2010-2016 Google, Inc. http://angularjs.org
- License: MIT
-*/
-(function(s,q,t){'use strict';var f="BUTTON A INPUT TEXTAREA SELECT DETAILS
SUMMARY".split("
"),l=function(a,c){if(-1!==c.indexOf(a[0].nodeName))return!0};q.module("ngAria",["ng"]).provider("$aria",function(){function
a(a,h,p,n){return function(d,e,b){var
g=b.$normalize(h);!c[g]||l(e,p)||b[g]||d.$watch(b[a],function(b){b=n?!b:!!b;e.attr(h,b)})}}var
c={ariaHidden:!0,ariaChecked:!0,ariaDisabled:!0,ariaRequired:!0,ariaInvalid:!0,ariaValue:!0,tabindex:!0,bindKeypress:!0,bindRoleForClick:!0};this.config=
-function(a){c=q.extend(c,a)};this.$get=function(){return{config:function(a){return
c[a]},$$watchExpr:a}}}).directive("ngShow",["$aria",function(a){return
a.$$watchExpr("ngShow","aria-hidden",[],!0)}]).directive("ngHide",["$aria",function(a){return
a.$$watchExpr("ngHide","aria-hidden",[],!1)}]).directive("ngValue",["$aria",function(a){return
a.$$watchExpr("ngValue","aria-checked",f,!1)}]).directive("ngChecked",["$aria",function(a){return
a.$$watchExpr("ngChecked","aria-checked",f,!1)}]).directive("ngRequired",
-["$aria",function(a){return
a.$$watchExpr("ngRequired","aria-required",f,!1)}]).directive("ngModel",["$aria",function(a){function
c(c,n,d,e){return a.config(n)&&!d.attr(c)&&(e||!l(d,f))}function
m(a,c){return!c.attr("role")&&c.attr("type")===a&&"INPUT"!==c[0].nodeName}function
h(a,c){var
d=a.type,e=a.role;return"checkbox"===(d||e)||"menuitemcheckbox"===e?"checkbox":"radio"===(d||e)||"menuitemradio"===e?"radio":"range"===d||"progressbar"===e||"slider"===e?"range":""}return{restrict:"A",require:"ngModel",
-priority:200,compile:function(f,n){var
d=h(n,f);return{pre:function(a,b,c,k){"checkbox"===d&&(k.$isEmpty=function(a){return!1===a})},post:function(e,b,g,k){function
f(){return k.$modelValue}function
h(a){b.attr("aria-checked",g.value==k.$viewValue)}function
n(){b.attr("aria-checked",!k.$isEmpty(k.$viewValue))}var
l=c("tabindex","tabindex",b,!1);switch(d){case "radio":case
"checkbox":m(d,b)&&b.attr("role",d);c("aria-checked","ariaChecked",b,!1)&&e.$watch(f,"radio"===d?h:n);l&&b.attr("tabindex",0);
-break;case
"range":m(d,b)&&b.attr("role","slider");if(a.config("ariaValue")){var
p=!b.attr("aria-valuemin")&&(g.hasOwnProperty("min")||g.hasOwnProperty("ngMin")),q=!b.attr("aria-valuemax")&&(g.hasOwnProperty("max")||g.hasOwnProperty("ngMax")),r=!b.attr("aria-valuenow");p&&g.$observe("min",function(a){b.attr("aria-valuemin",a)});q&&g.$observe("max",function(a){b.attr("aria-valuemax",a)});r&&e.$watch(f,function(a){b.attr("aria-valuenow",a)})}l&&b.attr("tabindex",0)}!g.hasOwnProperty("ngRequired")&&
-k.$validators.required&&c("aria-required","ariaRequired",b,!1)&&g.$observe("required",function(){b.attr("aria-required",!!g.required)});c("aria-invalid","ariaInvalid",b,!0)&&e.$watch(function(){return
k.$invalid},function(a){b.attr("aria-invalid",!!a)})}]).directive("ngDisabled",["$aria",function(a){return
a.$$watchExpr("ngDisabled","aria-disabled",f,!1)}]).directive("ngMessages",function(){return{restrict:"A",require:"?ngMessages",link:function(a,c,f,h){c.attr("aria-live")||c.attr("aria-live",
-"assertive")}}}).directive("ngClick",["$aria","$parse",function(a,c){return{restrict:"A",compile:function(m,h){var
p=c(h.ngClick,null,!0);return
function(c,d,e){if(!l(d,f)&&(a.config("bindRoleForClick")&&!d.attr("role")&&d.attr("role","button"),a.config("tabindex")&&!d.attr("tabindex")&&d.attr("tabindex",0),a.config("bindKeypress")&&!e.ngKeypress))d.on("keypress",function(a){function
d(){p(c,{$event:a})}var
e=a.which||a.keyCode;32!==e&&13!==e||c.$apply(d)})]).directive("ngDblclick",["$aria",function(a){return
function(c,
-m,h){!a.config("tabindex")||m.attr("tabindex")||l(m,f)||m.attr("tabindex",0)}}])})(window,window.angular);
-//# sourceMappingURL=angular-aria.min.js.map
http://git-wip-us.apache.org/repos/asf/struts/blob/7a350b02/archetypes/struts2-archetype-angularjs/src/main/resources/archetype-resources/src/main/webapp/js/lib/angular/angular-aria.min.js.map
--
diff --git
a/archetypes/struts2-archetype-angularjs/src/main/resources/archetype-resources/src/main/webapp/js/lib/angular/angu
[30/53] [partial] struts git commit: WW-4316 Moves archetypes into its own repo
http://git-wip-us.apache.org/repos/asf/struts/blob/7a350b02/archetypes/struts2-archetype-angularjs/src/main/resources/archetype-resources/src/main/webapp/js/lib/angular/i18n/angular-locale_ckb-arab-ir.js
--
diff --git
a/archetypes/struts2-archetype-angularjs/src/main/resources/archetype-resources/src/main/webapp/js/lib/angular/i18n/angular-locale_ckb-arab-ir.js
b/archetypes/struts2-archetype-angularjs/src/main/resources/archetype-resources/src/main/webapp/js/lib/angular/i18n/angular-locale_ckb-arab-ir.js
deleted file mode 100644
index 9a83d4a..000
---
a/archetypes/struts2-archetype-angularjs/src/main/resources/archetype-resources/src/main/webapp/js/lib/angular/i18n/angular-locale_ckb-arab-ir.js
+++ /dev/null
@@ -1,143 +0,0 @@
-'use strict';
-angular.module("ngLocale", [], ["$provide", function($provide) {
-var PLURAL_CATEGORY = {ZERO: "zero", ONE: "one", TWO: "two", FEW: "few", MANY:
"many", OTHER: "other"};
-function getDecimals(n) {
- n = n + '';
- var i = n.indexOf('.');
- return (i == -1) ? 0 : n.length - i - 1;
-}
-
-function getVF(n, opt_precision) {
- var v = opt_precision;
-
- if (undefined === v) {
-v = Math.min(getDecimals(n), 3);
- }
-
- var base = Math.pow(10, v);
- var f = ((n * base) | 0) % base;
- return {v: v, f: f};
-}
-
-$provide.value("$locale", {
- "DATETIME_FORMATS": {
-"AMPMS": [
- "\u0628.\u0646",
- "\u062f.\u0646"
-],
-"DAY": [
- "\u06cc\u06d5\u06a9\u0634\u06d5\u0645\u0645\u06d5",
- "\u062f\u0648\u0648\u0634\u06d5\u0645\u0645\u06d5",
- "\u0633\u06ce\u0634\u06d5\u0645\u0645\u06d5",
- "\u0686\u0648\u0627\u0631\u0634\u06d5\u0645\u0645\u06d5",
- "\u067e\u06ce\u0646\u062c\u0634\u06d5\u0645\u0645\u06d5",
- "\u06be\u06d5\u06cc\u0646\u06cc",
- "\u0634\u06d5\u0645\u0645\u06d5"
-],
-"ERANAMES": [
- "\u067e\u06ce\u0634 \u0632\u0627\u06cc\u06cc\u0646",
- "\u0632\u0627\u06cc\u06cc\u0646\u06cc"
-],
-"ERAS": [
- "\u067e\u06ce\u0634 \u0632\u0627\u06cc\u06cc\u06cc\u0646",
- "\u0632"
-],
-"FIRSTDAYOFWEEK": 5,
-"MONTH": [
- "\u06a9\u0627\u0646\u0648\u0648\u0646\u06cc
\u062f\u0648\u0648\u06d5\u0645",
- "\u0634\u0648\u0628\u0627\u062a",
- "\u0626\u0627\u0632\u0627\u0631",
- "\u0646\u06cc\u0633\u0627\u0646",
- "\u0626\u0627\u06cc\u0627\u0631",
- "\u062d\u0648\u0632\u06d5\u06cc\u0631\u0627\u0646",
- "\u062a\u06d5\u0645\u0648\u0648\u0632",
- "\u0626\u0627\u0628",
- "\u0626\u06d5\u06cc\u0644\u0648\u0648\u0644",
- "\u062a\u0634\u0631\u06cc\u0646\u06cc \u06cc\u06d5\u06a9\u06d5\u0645",
- "\u062a\u0634\u0631\u06cc\u0646\u06cc \u062f\u0648\u0648\u06d5\u0645",
- "\u06a9\u0627\u0646\u0648\u0646\u06cc \u06cc\u06d5\u06a9\u06d5\u0645"
-],
-"SHORTDAY": [
- "\u06cc\u06d5\u06a9\u0634\u06d5\u0645\u0645\u06d5",
- "\u062f\u0648\u0648\u0634\u06d5\u0645\u0645\u06d5",
- "\u0633\u06ce\u0634\u06d5\u0645\u0645\u06d5",
- "\u0686\u0648\u0627\u0631\u0634\u06d5\u0645\u0645\u06d5",
- "\u067e\u06ce\u0646\u062c\u0634\u06d5\u0645\u0645\u06d5",
- "\u06be\u06d5\u06cc\u0646\u06cc",
- "\u0634\u06d5\u0645\u0645\u06d5"
-],
-"SHORTMONTH": [
- "\u06a9\u0627\u0646\u0648\u0648\u0646\u06cc
\u062f\u0648\u0648\u06d5\u0645",
- "\u0634\u0648\u0628\u0627\u062a",
- "\u0626\u0627\u0632\u0627\u0631",
- "\u0646\u06cc\u0633\u0627\u0646",
- "\u0626\u0627\u06cc\u0627\u0631",
- "\u062d\u0648\u0632\u06d5\u06cc\u0631\u0627\u0646",
- "\u062a\u06d5\u0645\u0648\u0648\u0632",
- "\u0626\u0627\u0628",
- "\u0626\u06d5\u06cc\u0644\u0648\u0648\u0644",
- "\u062a\u0634\u0631\u06cc\u0646\u06cc \u06cc\u06d5\u06a9\u06d5\u0645",
- "\u062a\u0634\u0631\u06cc\u0646\u06cc \u062f\u0648\u0648\u06d5\u0645",
- "\u06a9\u0627\u0646\u0648\u0646\u06cc \u06cc\u06d5\u06a9\u06d5\u0645"
-],
-"STANDALONEMONTH": [
- "\u06a9\u0627\u0646\u0648\u0648\u0646\u06cc
\u062f\u0648\u0648\u06d5\u0645",
- "\u0634\u0648\u0628\u0627\u062a",
- "\u0626\u0627\u0632\u0627\u0631",
- "\u0646\u06cc\u0633\u0627\u0646",
- "\u0626\u0627\u06cc\u0627\u0631",
- "\u062d\u0648\u0632\u06d5\u06cc\u0631\u0627\u0646",
- "\u062a\u06d5\u0645\u0648\u0648\u0632",
- "\u0626\u0627\u0628",
- "\u0626\u06d5\u06cc\u0644\u0648\u0648\u0644",
- "\u062a\u0634\u0631\u06cc\u0646\u06cc \u06cc\u06d5\u06a9\u06d5\u0645",
- "\u062a\u0634\u0631\u06cc\u0646\u06cc \u062f\u0648\u0648\u06d5\u0645",
- "\u06a9\u0627\u0646\u0648\u0646\u06cc \u06cc\u06d5\u06a9\u06d5\u0645"
-],
-"WEEKENDRANGE": [
- 4,
- 5
-],
-"fullDate": "y d, ",
-"longDate": "d\u06cc \u06cc y",
-"medium": "y MMM d HH:mm:ss",
-"mediumDate": "y MMM d",
-"mediumTime": "HH:mm:ss",
-"short": "y-MM-dd HH:mm",
-"shortDate": "y-MM-dd",
-"shortTime": "HH:mm"
- },
- "NUMBER_FORMATS": {
-"CURRENCY_
[33/53] [partial] struts git commit: WW-4316 Moves archetypes into its own repo
http://git-wip-us.apache.org/repos/asf/struts/blob/7a350b02/archetypes/struts2-archetype-angularjs/src/main/resources/archetype-resources/src/main/webapp/js/lib/angular/i18n/angular-locale_ar-so.js
--
diff --git
a/archetypes/struts2-archetype-angularjs/src/main/resources/archetype-resources/src/main/webapp/js/lib/angular/i18n/angular-locale_ar-so.js
b/archetypes/struts2-archetype-angularjs/src/main/resources/archetype-resources/src/main/webapp/js/lib/angular/i18n/angular-locale_ar-so.js
deleted file mode 100644
index 7ab6a54..000
---
a/archetypes/struts2-archetype-angularjs/src/main/resources/archetype-resources/src/main/webapp/js/lib/angular/i18n/angular-locale_ar-so.js
+++ /dev/null
@@ -1,125 +0,0 @@
-'use strict';
-angular.module("ngLocale", [], ["$provide", function($provide) {
-var PLURAL_CATEGORY = {ZERO: "zero", ONE: "one", TWO: "two", FEW: "few", MANY:
"many", OTHER: "other"};
-$provide.value("$locale", {
- "DATETIME_FORMATS": {
-"AMPMS": [
- "\u0635",
- "\u0645"
-],
-"DAY": [
- "\u0627\u0644\u0623\u062d\u062f",
- "\u0627\u0644\u0627\u062b\u0646\u064a\u0646",
- "\u0627\u0644\u062b\u0644\u0627\u062b\u0627\u0621",
- "\u0627\u0644\u0623\u0631\u0628\u0639\u0627\u0621",
- "\u0627\u0644\u062e\u0645\u064a\u0633",
- "\u0627\u0644\u062c\u0645\u0639\u0629",
- "\u0627\u0644\u0633\u0628\u062a"
-],
-"ERANAMES": [
- "\u0642\u0628\u0644 \u0627\u0644\u0645\u064a\u0644\u0627\u062f",
- "\u0645\u064a\u0644\u0627\u062f\u064a"
-],
-"ERAS": [
- "\u0642.\u0645",
- "\u0645"
-],
-"FIRSTDAYOFWEEK": 0,
-"MONTH": [
- "\u064a\u0646\u0627\u064a\u0631",
- "\u0641\u0628\u0631\u0627\u064a\u0631",
- "\u0645\u0627\u0631\u0633",
- "\u0623\u0628\u0631\u064a\u0644",
- "\u0645\u0627\u064a\u0648",
- "\u064a\u0648\u0646\u064a\u0648",
- "\u064a\u0648\u0644\u064a\u0648",
- "\u0623\u063a\u0633\u0637\u0633",
- "\u0633\u0628\u062a\u0645\u0628\u0631",
- "\u0623\u0643\u062a\u0648\u0628\u0631",
- "\u0646\u0648\u0641\u0645\u0628\u0631",
- "\u062f\u064a\u0633\u0645\u0628\u0631"
-],
-"SHORTDAY": [
- "\u0627\u0644\u0623\u062d\u062f",
- "\u0627\u0644\u0627\u062b\u0646\u064a\u0646",
- "\u0627\u0644\u062b\u0644\u0627\u062b\u0627\u0621",
- "\u0627\u0644\u0623\u0631\u0628\u0639\u0627\u0621",
- "\u0627\u0644\u062e\u0645\u064a\u0633",
- "\u0627\u0644\u062c\u0645\u0639\u0629",
- "\u0627\u0644\u0633\u0628\u062a"
-],
-"SHORTMONTH": [
- "\u064a\u0646\u0627\u064a\u0631",
- "\u0641\u0628\u0631\u0627\u064a\u0631",
- "\u0645\u0627\u0631\u0633",
- "\u0623\u0628\u0631\u064a\u0644",
- "\u0645\u0627\u064a\u0648",
- "\u064a\u0648\u0646\u064a\u0648",
- "\u064a\u0648\u0644\u064a\u0648",
- "\u0623\u063a\u0633\u0637\u0633",
- "\u0633\u0628\u062a\u0645\u0628\u0631",
- "\u0623\u0643\u062a\u0648\u0628\u0631",
- "\u0646\u0648\u0641\u0645\u0628\u0631",
- "\u062f\u064a\u0633\u0645\u0628\u0631"
-],
-"STANDALONEMONTH": [
- "\u064a\u0646\u0627\u064a\u0631",
- "\u0641\u0628\u0631\u0627\u064a\u0631",
- "\u0645\u0627\u0631\u0633",
- "\u0623\u0628\u0631\u064a\u0644",
- "\u0645\u0627\u064a\u0648",
- "\u064a\u0648\u0646\u064a\u0648",
- "\u064a\u0648\u0644\u064a\u0648",
- "\u0623\u063a\u0633\u0637\u0633",
- "\u0633\u0628\u062a\u0645\u0628\u0631",
- "\u0623\u0643\u062a\u0648\u0628\u0631",
- "\u0646\u0648\u0641\u0645\u0628\u0631",
- "\u062f\u064a\u0633\u0645\u0628\u0631"
-],
-"WEEKENDRANGE": [
- 5,
- 6
-],
-"fullDate": "\u060c d \u060c y",
-"longDate": "d \u060c y",
-"medium": "dd\u200f/MM\u200f/y h:mm:ss a",
-"mediumDate": "dd\u200f/MM\u200f/y",
-"mediumTime": "h:mm:ss a",
-"short": "d\u200f/M\u200f/y h:mm a",
-"shortDate": "d\u200f/M\u200f/y",
-"shortTime": "h:mm a"
- },
- "NUMBER_FORMATS": {
-"CURRENCY_SYM": "SOS",
-"DECIMAL_SEP": "\u066b",
-"GROUP_SEP": "\u066c",
-"PATTERNS": [
- {
-"gSize": 3,
-"lgSize": 3,
-"maxFrac": 3,
-"minFrac": 0,
-"minInt": 1,
-"negPre": "-",
-"negSuf": "",
-"posPre": "",
-"posSuf": ""
- },
- {
-"gSize": 3,
-"lgSize": 3,
-"maxFrac": 2,
-"minFrac": 2,
-"minInt": 1,
-"negPre": "-\u00a4\u00a0",
-"negSuf": "",
-"posPre": "\u00a4\u00a0",
-"posSuf": ""
- }
-]
- },
- "id": "ar-so",
- "localeID": "ar_SO",
- "pluralCat": function(n, opt_precision) { if (n == 0) {return
PLURAL_CATEGORY.ZERO; } if (n == 1) {return PLURAL_CATEGORY.ONE; } if
(n == 2) {return PLURAL_CATEGORY.TWO; } if (n % 100 >= 3 && n % 100 <=
10) {return PLURAL_CATEGORY.FEW; } if (n % 100 >= 11 && n % 100 <= 99) {
[29/53] [partial] struts git commit: WW-4316 Moves archetypes into its own repo
http://git-wip-us.apache.org/repos/asf/struts/blob/7a350b02/archetypes/struts2-archetype-angularjs/src/main/resources/archetype-resources/src/main/webapp/js/lib/angular/i18n/angular-locale_de-li.js
--
diff --git
a/archetypes/struts2-archetype-angularjs/src/main/resources/archetype-resources/src/main/webapp/js/lib/angular/i18n/angular-locale_de-li.js
b/archetypes/struts2-archetype-angularjs/src/main/resources/archetype-resources/src/main/webapp/js/lib/angular/i18n/angular-locale_de-li.js
deleted file mode 100644
index fa93e9d..000
---
a/archetypes/struts2-archetype-angularjs/src/main/resources/archetype-resources/src/main/webapp/js/lib/angular/i18n/angular-locale_de-li.js
+++ /dev/null
@@ -1,143 +0,0 @@
-'use strict';
-angular.module("ngLocale", [], ["$provide", function($provide) {
-var PLURAL_CATEGORY = {ZERO: "zero", ONE: "one", TWO: "two", FEW: "few", MANY:
"many", OTHER: "other"};
-function getDecimals(n) {
- n = n + '';
- var i = n.indexOf('.');
- return (i == -1) ? 0 : n.length - i - 1;
-}
-
-function getVF(n, opt_precision) {
- var v = opt_precision;
-
- if (undefined === v) {
-v = Math.min(getDecimals(n), 3);
- }
-
- var base = Math.pow(10, v);
- var f = ((n * base) | 0) % base;
- return {v: v, f: f};
-}
-
-$provide.value("$locale", {
- "DATETIME_FORMATS": {
-"AMPMS": [
- "vorm.",
- "nachm."
-],
-"DAY": [
- "Sonntag",
- "Montag",
- "Dienstag",
- "Mittwoch",
- "Donnerstag",
- "Freitag",
- "Samstag"
-],
-"ERANAMES": [
- "v. Chr.",
- "n. Chr."
-],
-"ERAS": [
- "v. Chr.",
- "n. Chr."
-],
-"FIRSTDAYOFWEEK": 0,
-"MONTH": [
- "Januar",
- "Februar",
- "M\u00e4rz",
- "April",
- "Mai",
- "Juni",
- "Juli",
- "August",
- "September",
- "Oktober",
- "November",
- "Dezember"
-],
-"SHORTDAY": [
- "So.",
- "Mo.",
- "Di.",
- "Mi.",
- "Do.",
- "Fr.",
- "Sa."
-],
-"SHORTMONTH": [
- "Jan.",
- "Feb.",
- "M\u00e4rz",
- "Apr.",
- "Mai",
- "Juni",
- "Juli",
- "Aug.",
- "Sep.",
- "Okt.",
- "Nov.",
- "Dez."
-],
-"STANDALONEMONTH": [
- "Januar",
- "Februar",
- "M\u00e4rz",
- "April",
- "Mai",
- "Juni",
- "Juli",
- "August",
- "September",
- "Oktober",
- "November",
- "Dezember"
-],
-"WEEKENDRANGE": [
- 5,
- 6
-],
-"fullDate": ", d. y",
-"longDate": "d. y",
-"medium": "dd.MM.y HH:mm:ss",
-"mediumDate": "dd.MM.y",
-"mediumTime": "HH:mm:ss",
-"short": "dd.MM.yy HH:mm",
-"shortDate": "dd.MM.yy",
-"shortTime": "HH:mm"
- },
- "NUMBER_FORMATS": {
-"CURRENCY_SYM": "CHF",
-"DECIMAL_SEP": ".",
-"GROUP_SEP": "'",
-"PATTERNS": [
- {
-"gSize": 3,
-"lgSize": 3,
-"maxFrac": 3,
-"minFrac": 0,
-"minInt": 1,
-"negPre": "-",
-"negSuf": "",
-"posPre": "",
-"posSuf": ""
- },
- {
-"gSize": 3,
-"lgSize": 3,
-"maxFrac": 2,
-"minFrac": 2,
-"minInt": 1,
-"negPre": "-\u00a4\u00a0",
-"negSuf": "",
-"posPre": "\u00a4\u00a0",
-"posSuf": ""
- }
-]
- },
- "id": "de-li",
- "localeID": "de_LI",
- "pluralCat": function(n, opt_precision) { var i = n | 0; var vf = getVF(n,
opt_precision); if (i == 1 && vf.v == 0) {return PLURAL_CATEGORY.ONE; }
return PLURAL_CATEGORY.OTHER;}
-});
-}]);
http://git-wip-us.apache.org/repos/asf/struts/blob/7a350b02/archetypes/struts2-archetype-angularjs/src/main/resources/archetype-resources/src/main/webapp/js/lib/angular/i18n/angular-locale_de-lu.js
--
diff --git
a/archetypes/struts2-archetype-angularjs/src/main/resources/archetype-resources/src/main/webapp/js/lib/angular/i18n/angular-locale_de-lu.js
b/archetypes/struts2-archetype-angularjs/src/main/resources/archetype-resources/src/main/webapp/js/lib/angular/i18n/angular-locale_de-lu.js
deleted file mode 100644
index 2bca130..000
---
a/archetypes/struts2-archetype-angularjs/src/main/resources/archetype-resources/src/main/webapp/js/lib/angular/i18n/angular-locale_de-lu.js
+++ /dev/null
@@ -1,143 +0,0 @@
-'use strict';
-angular.module("ngLocale", [], ["$provide", function($provide) {
-var PLURAL_CATEGORY = {ZERO: "zero", ONE: "one", TWO: "two", FEW: "few", MANY:
"many", OTHER: "other"};
-function getDecimals(n) {
- n = n + '';
- var i = n.indexOf('.');
- return (i == -1) ? 0 : n.length - i - 1;
-}
-
-function getVF(n, opt_precision) {
- var v = opt_precision;
-
- if (undefined === v) {
-v = Math.min(getDecimals(n), 3);
- }
-
- var base = Math.pow(10, v);
- var f = ((n * base) | 0) % base;
- return {v: v
[07/53] [partial] struts git commit: WW-4316 Moves archetypes into its own repo
http://git-wip-us.apache.org/repos/asf/struts/blob/7a350b02/archetypes/struts2-archetype-angularjs/src/main/resources/archetype-resources/src/main/webapp/js/lib/angular/i18n/angular-locale_so-so.js
--
diff --git
a/archetypes/struts2-archetype-angularjs/src/main/resources/archetype-resources/src/main/webapp/js/lib/angular/i18n/angular-locale_so-so.js
b/archetypes/struts2-archetype-angularjs/src/main/resources/archetype-resources/src/main/webapp/js/lib/angular/i18n/angular-locale_so-so.js
deleted file mode 100644
index 3278429..000
---
a/archetypes/struts2-archetype-angularjs/src/main/resources/archetype-resources/src/main/webapp/js/lib/angular/i18n/angular-locale_so-so.js
+++ /dev/null
@@ -1,143 +0,0 @@
-'use strict';
-angular.module("ngLocale", [], ["$provide", function($provide) {
-var PLURAL_CATEGORY = {ZERO: "zero", ONE: "one", TWO: "two", FEW: "few", MANY:
"many", OTHER: "other"};
-function getDecimals(n) {
- n = n + '';
- var i = n.indexOf('.');
- return (i == -1) ? 0 : n.length - i - 1;
-}
-
-function getVF(n, opt_precision) {
- var v = opt_precision;
-
- if (undefined === v) {
-v = Math.min(getDecimals(n), 3);
- }
-
- var base = Math.pow(10, v);
- var f = ((n * base) | 0) % base;
- return {v: v, f: f};
-}
-
-$provide.value("$locale", {
- "DATETIME_FORMATS": {
-"AMPMS": [
- "sn.",
- "gn."
-],
-"DAY": [
- "Axad",
- "Isniin",
- "Talaado",
- "Arbaco",
- "Khamiis",
- "Jimco",
- "Sabti"
-],
-"ERANAMES": [
- "Ciise ka hor (CS)",
- "Ciise ka dib (CS)"
-],
-"ERAS": [
- "CK",
- "CD"
-],
-"FIRSTDAYOFWEEK": 0,
-"MONTH": [
- "Bisha Koobaad",
- "Bisha Labaad",
- "Bisha Saddexaad",
- "Bisha Afraad",
- "Bisha Shanaad",
- "Bisha Lixaad",
- "Bisha Todobaad",
- "Bisha Sideedaad",
- "Bisha Sagaalaad",
- "Bisha Tobnaad",
- "Bisha Kow iyo Tobnaad",
- "Bisha Laba iyo Tobnaad"
-],
-"SHORTDAY": [
- "Axd",
- "Isn",
- "Tal",
- "Arb",
- "Kha",
- "Jim",
- "Sab"
-],
-"SHORTMONTH": [
- "Kob",
- "Lab",
- "Sad",
- "Afr",
- "Sha",
- "Lix",
- "Tod",
- "Sid",
- "Sag",
- "Tob",
- "KIT",
- "LIT"
-],
-"STANDALONEMONTH": [
- "Bisha Koobaad",
- "Bisha Labaad",
- "Bisha Saddexaad",
- "Bisha Afraad",
- "Bisha Shanaad",
- "Bisha Lixaad",
- "Bisha Todobaad",
- "Bisha Sideedaad",
- "Bisha Sagaalaad",
- "Bisha Tobnaad",
- "Bisha Kow iyo Tobnaad",
- "Bisha Laba iyo Tobnaad"
-],
-"WEEKENDRANGE": [
- 5,
- 6
-],
-"fullDate": ", dd, y",
-"longDate": "dd y",
-"medium": "dd-MMM-y h:mm:ss a",
-"mediumDate": "dd-MMM-y",
-"mediumTime": "h:mm:ss a",
-"short": "dd/MM/yy h:mm a",
-"shortDate": "dd/MM/yy",
-"shortTime": "h:mm a"
- },
- "NUMBER_FORMATS": {
-"CURRENCY_SYM": "SOS",
-"DECIMAL_SEP": ".",
-"GROUP_SEP": ",",
-"PATTERNS": [
- {
-"gSize": 3,
-"lgSize": 3,
-"maxFrac": 3,
-"minFrac": 0,
-"minInt": 1,
-"negPre": "-",
-"negSuf": "",
-"posPre": "",
-"posSuf": ""
- },
- {
-"gSize": 3,
-"lgSize": 3,
-"maxFrac": 2,
-"minFrac": 2,
-"minInt": 1,
-"negPre": "-\u00a4",
-"negSuf": "",
-"posPre": "\u00a4",
-"posSuf": ""
- }
-]
- },
- "id": "so-so",
- "localeID": "so_SO",
- "pluralCat": function(n, opt_precision) { var i = n | 0; var vf = getVF(n,
opt_precision); if (i == 1 && vf.v == 0) {return PLURAL_CATEGORY.ONE; }
return PLURAL_CATEGORY.OTHER;}
-});
-}]);
http://git-wip-us.apache.org/repos/asf/struts/blob/7a350b02/archetypes/struts2-archetype-angularjs/src/main/resources/archetype-resources/src/main/webapp/js/lib/angular/i18n/angular-locale_so.js
--
diff --git
a/archetypes/struts2-archetype-angularjs/src/main/resources/archetype-resources/src/main/webapp/js/lib/angular/i18n/angular-locale_so.js
b/archetypes/struts2-archetype-angularjs/src/main/resources/archetype-resources/src/main/webapp/js/lib/angular/i18n/angular-locale_so.js
deleted file mode 100644
index 33068e3..000
---
a/archetypes/struts2-archetype-angularjs/src/main/resources/archetype-resources/src/main/webapp/js/lib/angular/i18n/angular-locale_so.js
+++ /dev/null
@@ -1,143 +0,0 @@
-'use strict';
-angular.module("ngLocale", [], ["$provide", function($provide) {
-var PLURAL_CATEGORY = {ZERO: "zero", ONE: "one", TWO: "two", FEW: "few", MANY:
"many", OTHER: "other"};
-function getDecimals(n) {
- n = n + '';
- var i = n.indexOf('.');
- return (i == -1) ? 0 : n.length - i - 1;
-}
-
-function getVF(n, opt_precision) {
- var v = opt_preci
[39/53] [partial] struts git commit: WW-4316 Moves archetypes into its own repo
http://git-wip-us.apache.org/repos/asf/struts/blob/7a350b02/archetypes/struts2-archetype-angularjs/src/main/resources/archetype-resources/src/main/webapp/js/lib/angular/angular-touch.js
--
diff --git
a/archetypes/struts2-archetype-angularjs/src/main/resources/archetype-resources/src/main/webapp/js/lib/angular/angular-touch.js
b/archetypes/struts2-archetype-angularjs/src/main/resources/archetype-resources/src/main/webapp/js/lib/angular/angular-touch.js
deleted file mode 100644
index fc1cf7d..000
---
a/archetypes/struts2-archetype-angularjs/src/main/resources/archetype-resources/src/main/webapp/js/lib/angular/angular-touch.js
+++ /dev/null
@@ -1,729 +0,0 @@
-/**
- * @license AngularJS v1.5.0
- * (c) 2010-2016 Google, Inc. http://angularjs.org
- * License: MIT
- */
-(function(window, angular, undefined) {'use strict';
-
-/* global ngTouchClickDirectiveFactory: false,
- */
-
-/**
- * @ngdoc module
- * @name ngTouch
- * @description
- *
- * # ngTouch
- *
- * The `ngTouch` module provides touch events and other helpers for
touch-enabled devices.
- * The implementation is based on jQuery Mobile touch event handling
- * ([jquerymobile.com](http://jquerymobile.com/)).
- *
- *
- * See {@link ngTouch.$swipe `$swipe`} for usage.
- *
- *
- *
- */
-
-// define ngTouch module
-/* global -ngTouch */
-var ngTouch = angular.module('ngTouch', []);
-
-ngTouch.provider('$touch', $TouchProvider);
-
-function nodeName_(element) {
- return angular.lowercase(element.nodeName || (element[0] &&
element[0].nodeName));
-}
-
-/**
- * @ngdoc provider
- * @name $touchProvider
- *
- * @description
- * The `$touchProvider` allows enabling / disabling {@link ngTouch.ngClick
ngTouch's ngClick directive}.
- */
-$TouchProvider.$inject = ['$provide', '$compileProvider'];
-function $TouchProvider($provide, $compileProvider) {
-
- /**
- * @ngdoc method
- * @name $touchProvider#ngClickOverrideEnabled
- *
- * @param {boolean=} enabled update the ngClickOverrideEnabled state if
provided, otherwise just return the
- * current ngClickOverrideEnabled state
- * @returns {*} current value if used as getter or itself (chaining) if used
as setter
- *
- * @kind function
- *
- * @description
- * Call this method to enable/disable {@link ngTouch.ngClick ngTouch's
ngClick directive}. If enabled,
- * the default ngClick directive will be replaced by a version that
eliminates the 300ms delay for
- * click events on browser for touch-devices.
- *
- * The default is `false`.
- *
- */
- var ngClickOverrideEnabled = false;
- var ngClickDirectiveAdded = false;
- this.ngClickOverrideEnabled = function(enabled) {
-if (angular.isDefined(enabled)) {
-
- if (enabled && !ngClickDirectiveAdded) {
-ngClickDirectiveAdded = true;
-
-// Use this to identify the correct directive in the delegate
-ngTouchClickDirectiveFactory.$$moduleName = 'ngTouch';
-$compileProvider.directive('ngClick', ngTouchClickDirectiveFactory);
-
-$provide.decorator('ngClickDirective', ['$delegate',
function($delegate) {
- if (ngClickOverrideEnabled) {
-// drop the default ngClick directive
-$delegate.shift();
- } else {
-// drop the ngTouch ngClick directive if the override has been
re-disabled (because
-// we cannot de-register added directives)
-var i = $delegate.length - 1;
-while (i >= 0) {
- if ($delegate[i].$$moduleName === 'ngTouch') {
-$delegate.splice(i, 1);
-break;
- }
- i--;
-}
- }
-
- return $delegate;
-}]);
- }
-
- ngClickOverrideEnabled = enabled;
- return this;
-}
-
-return ngClickOverrideEnabled;
- };
-
- /**
- * @ngdoc service
- * @name $touch
- * @kind object
- *
- * @description
- * Provides the {@link ngTouch.$touch#ngClickOverrideEnabled
`ngClickOverrideEnabled`} method.
- *
- */
- this.$get = function() {
-return {
- /**
- * @ngdoc method
- * @name $touch#ngClickOverrideEnabled
- *
- * @returns {*} current value of `ngClickOverrideEnabled` set in the
{@link ngTouch.$touchProvider $touchProvider},
- * i.e. if {@link ngTouch.ngClick ngTouch's ngClick} directive is
enabled.
- *
- * @kind function
- */
- ngClickOverrideEnabled: function() {
-return ngClickOverrideEnabled;
- }
-};
- };
-
-}
-
-/* global ngTouch: false */
-
-/**
- * @ngdoc service
- * @name $swipe
- *
- * @description
- * The `$swipe` service is a service that abstracts the messier details of
hold-and-drag swipe
- * behavior, to make implementing swipe-related directives more convenient.
- *
- * Requires the {@link ngTouch `ngTouch`} module to be installed.
- *
- * `$swipe` is used by the `ngSw
[28/53] [partial] struts git commit: WW-4316 Moves archetypes into its own repo
http://git-wip-us.apache.org/repos/asf/struts/blob/7a350b02/archetypes/struts2-archetype-angularjs/src/main/resources/archetype-resources/src/main/webapp/js/lib/angular/i18n/angular-locale_en-001.js
--
diff --git
a/archetypes/struts2-archetype-angularjs/src/main/resources/archetype-resources/src/main/webapp/js/lib/angular/i18n/angular-locale_en-001.js
b/archetypes/struts2-archetype-angularjs/src/main/resources/archetype-resources/src/main/webapp/js/lib/angular/i18n/angular-locale_en-001.js
deleted file mode 100644
index 568867f..000
---
a/archetypes/struts2-archetype-angularjs/src/main/resources/archetype-resources/src/main/webapp/js/lib/angular/i18n/angular-locale_en-001.js
+++ /dev/null
@@ -1,143 +0,0 @@
-'use strict';
-angular.module("ngLocale", [], ["$provide", function($provide) {
-var PLURAL_CATEGORY = {ZERO: "zero", ONE: "one", TWO: "two", FEW: "few", MANY:
"many", OTHER: "other"};
-function getDecimals(n) {
- n = n + '';
- var i = n.indexOf('.');
- return (i == -1) ? 0 : n.length - i - 1;
-}
-
-function getVF(n, opt_precision) {
- var v = opt_precision;
-
- if (undefined === v) {
-v = Math.min(getDecimals(n), 3);
- }
-
- var base = Math.pow(10, v);
- var f = ((n * base) | 0) % base;
- return {v: v, f: f};
-}
-
-$provide.value("$locale", {
- "DATETIME_FORMATS": {
-"AMPMS": [
- "AM",
- "PM"
-],
-"DAY": [
- "Sunday",
- "Monday",
- "Tuesday",
- "Wednesday",
- "Thursday",
- "Friday",
- "Saturday"
-],
-"ERANAMES": [
- "Before Christ",
- "Anno Domini"
-],
-"ERAS": [
- "BC",
- "AD"
-],
-"FIRSTDAYOFWEEK": 6,
-"MONTH": [
- "January",
- "February",
- "March",
- "April",
- "May",
- "June",
- "July",
- "August",
- "September",
- "October",
- "November",
- "December"
-],
-"SHORTDAY": [
- "Sun",
- "Mon",
- "Tue",
- "Wed",
- "Thu",
- "Fri",
- "Sat"
-],
-"SHORTMONTH": [
- "Jan",
- "Feb",
- "Mar",
- "Apr",
- "May",
- "Jun",
- "Jul",
- "Aug",
- "Sep",
- "Oct",
- "Nov",
- "Dec"
-],
-"STANDALONEMONTH": [
- "January",
- "February",
- "March",
- "April",
- "May",
- "June",
- "July",
- "August",
- "September",
- "October",
- "November",
- "December"
-],
-"WEEKENDRANGE": [
- 5,
- 6
-],
-"fullDate": ", d y",
-"longDate": "d y",
-"medium": "d MMM y h:mm:ss a",
-"mediumDate": "d MMM y",
-"mediumTime": "h:mm:ss a",
-"short": "dd/MM/y h:mm a",
-"shortDate": "dd/MM/y",
-"shortTime": "h:mm a"
- },
- "NUMBER_FORMATS": {
-"CURRENCY_SYM": "$",
-"DECIMAL_SEP": ".",
-"GROUP_SEP": ",",
-"PATTERNS": [
- {
-"gSize": 3,
-"lgSize": 3,
-"maxFrac": 3,
-"minFrac": 0,
-"minInt": 1,
-"negPre": "-",
-"negSuf": "",
-"posPre": "",
-"posSuf": ""
- },
- {
-"gSize": 3,
-"lgSize": 3,
-"maxFrac": 2,
-"minFrac": 2,
-"minInt": 1,
-"negPre": "-\u00a4",
-"negSuf": "",
-"posPre": "\u00a4",
-"posSuf": ""
- }
-]
- },
- "id": "en-001",
- "localeID": "en_001",
- "pluralCat": function(n, opt_precision) { var i = n | 0; var vf = getVF(n,
opt_precision); if (i == 1 && vf.v == 0) {return PLURAL_CATEGORY.ONE; }
return PLURAL_CATEGORY.OTHER;}
-});
-}]);
http://git-wip-us.apache.org/repos/asf/struts/blob/7a350b02/archetypes/struts2-archetype-angularjs/src/main/resources/archetype-resources/src/main/webapp/js/lib/angular/i18n/angular-locale_en-150.js
--
diff --git
a/archetypes/struts2-archetype-angularjs/src/main/resources/archetype-resources/src/main/webapp/js/lib/angular/i18n/angular-locale_en-150.js
b/archetypes/struts2-archetype-angularjs/src/main/resources/archetype-resources/src/main/webapp/js/lib/angular/i18n/angular-locale_en-150.js
deleted file mode 100644
index 0768eb8..000
---
a/archetypes/struts2-archetype-angularjs/src/main/resources/archetype-resources/src/main/webapp/js/lib/angular/i18n/angular-locale_en-150.js
+++ /dev/null
@@ -1,143 +0,0 @@
-'use strict';
-angular.module("ngLocale", [], ["$provide", function($provide) {
-var PLURAL_CATEGORY = {ZERO: "zero", ONE: "one", TWO: "two", FEW: "few", MANY:
"many", OTHER: "other"};
-function getDecimals(n) {
- n = n + '';
- var i = n.indexOf('.');
- return (i == -1) ? 0 : n.length - i - 1;
-}
-
-function getVF(n, opt_precision) {
- var v = opt_precision;
-
- if (undefined === v) {
-v = Math.min(getDecimals(n), 3);
- }
-
- var base = Math.pow(10, v);
- var f = ((n * base) | 0) % base;
- return {v: v, f: f};
-}
-
-$provide.value("$lo
[27/53] [partial] struts git commit: WW-4316 Moves archetypes into its own repo
http://git-wip-us.apache.org/repos/asf/struts/blob/7a350b02/archetypes/struts2-archetype-angularjs/src/main/resources/archetype-resources/src/main/webapp/js/lib/angular/i18n/angular-locale_en-gd.js
--
diff --git
a/archetypes/struts2-archetype-angularjs/src/main/resources/archetype-resources/src/main/webapp/js/lib/angular/i18n/angular-locale_en-gd.js
b/archetypes/struts2-archetype-angularjs/src/main/resources/archetype-resources/src/main/webapp/js/lib/angular/i18n/angular-locale_en-gd.js
deleted file mode 100644
index 1afb4c7..000
---
a/archetypes/struts2-archetype-angularjs/src/main/resources/archetype-resources/src/main/webapp/js/lib/angular/i18n/angular-locale_en-gd.js
+++ /dev/null
@@ -1,143 +0,0 @@
-'use strict';
-angular.module("ngLocale", [], ["$provide", function($provide) {
-var PLURAL_CATEGORY = {ZERO: "zero", ONE: "one", TWO: "two", FEW: "few", MANY:
"many", OTHER: "other"};
-function getDecimals(n) {
- n = n + '';
- var i = n.indexOf('.');
- return (i == -1) ? 0 : n.length - i - 1;
-}
-
-function getVF(n, opt_precision) {
- var v = opt_precision;
-
- if (undefined === v) {
-v = Math.min(getDecimals(n), 3);
- }
-
- var base = Math.pow(10, v);
- var f = ((n * base) | 0) % base;
- return {v: v, f: f};
-}
-
-$provide.value("$locale", {
- "DATETIME_FORMATS": {
-"AMPMS": [
- "AM",
- "PM"
-],
-"DAY": [
- "Sunday",
- "Monday",
- "Tuesday",
- "Wednesday",
- "Thursday",
- "Friday",
- "Saturday"
-],
-"ERANAMES": [
- "Before Christ",
- "Anno Domini"
-],
-"ERAS": [
- "BC",
- "AD"
-],
-"FIRSTDAYOFWEEK": 0,
-"MONTH": [
- "January",
- "February",
- "March",
- "April",
- "May",
- "June",
- "July",
- "August",
- "September",
- "October",
- "November",
- "December"
-],
-"SHORTDAY": [
- "Sun",
- "Mon",
- "Tue",
- "Wed",
- "Thu",
- "Fri",
- "Sat"
-],
-"SHORTMONTH": [
- "Jan",
- "Feb",
- "Mar",
- "Apr",
- "May",
- "Jun",
- "Jul",
- "Aug",
- "Sep",
- "Oct",
- "Nov",
- "Dec"
-],
-"STANDALONEMONTH": [
- "January",
- "February",
- "March",
- "April",
- "May",
- "June",
- "July",
- "August",
- "September",
- "October",
- "November",
- "December"
-],
-"WEEKENDRANGE": [
- 5,
- 6
-],
-"fullDate": ", d y",
-"longDate": "d y",
-"medium": "d MMM y h:mm:ss a",
-"mediumDate": "d MMM y",
-"mediumTime": "h:mm:ss a",
-"short": "dd/MM/y h:mm a",
-"shortDate": "dd/MM/y",
-"shortTime": "h:mm a"
- },
- "NUMBER_FORMATS": {
-"CURRENCY_SYM": "$",
-"DECIMAL_SEP": ".",
-"GROUP_SEP": ",",
-"PATTERNS": [
- {
-"gSize": 3,
-"lgSize": 3,
-"maxFrac": 3,
-"minFrac": 0,
-"minInt": 1,
-"negPre": "-",
-"negSuf": "",
-"posPre": "",
-"posSuf": ""
- },
- {
-"gSize": 3,
-"lgSize": 3,
-"maxFrac": 2,
-"minFrac": 2,
-"minInt": 1,
-"negPre": "-\u00a4",
-"negSuf": "",
-"posPre": "\u00a4",
-"posSuf": ""
- }
-]
- },
- "id": "en-gd",
- "localeID": "en_GD",
- "pluralCat": function(n, opt_precision) { var i = n | 0; var vf = getVF(n,
opt_precision); if (i == 1 && vf.v == 0) {return PLURAL_CATEGORY.ONE; }
return PLURAL_CATEGORY.OTHER;}
-});
-}]);
http://git-wip-us.apache.org/repos/asf/struts/blob/7a350b02/archetypes/struts2-archetype-angularjs/src/main/resources/archetype-resources/src/main/webapp/js/lib/angular/i18n/angular-locale_en-gg.js
--
diff --git
a/archetypes/struts2-archetype-angularjs/src/main/resources/archetype-resources/src/main/webapp/js/lib/angular/i18n/angular-locale_en-gg.js
b/archetypes/struts2-archetype-angularjs/src/main/resources/archetype-resources/src/main/webapp/js/lib/angular/i18n/angular-locale_en-gg.js
deleted file mode 100644
index 973cbc5..000
---
a/archetypes/struts2-archetype-angularjs/src/main/resources/archetype-resources/src/main/webapp/js/lib/angular/i18n/angular-locale_en-gg.js
+++ /dev/null
@@ -1,143 +0,0 @@
-'use strict';
-angular.module("ngLocale", [], ["$provide", function($provide) {
-var PLURAL_CATEGORY = {ZERO: "zero", ONE: "one", TWO: "two", FEW: "few", MANY:
"many", OTHER: "other"};
-function getDecimals(n) {
- n = n + '';
- var i = n.indexOf('.');
- return (i == -1) ? 0 : n.length - i - 1;
-}
-
-function getVF(n, opt_precision) {
- var v = opt_precision;
-
- if (undefined === v) {
-v = Math.min(getDecimals(n), 3);
- }
-
- var base = Math.pow(10, v);
- var f = ((n * base) | 0) % base;
- return {v: v, f: f};
-}
-
-$provide.value("$locale", {
-
[49/53] [partial] struts git commit: WW-4316 Moves archetypes into its own repo
http://git-wip-us.apache.org/repos/asf/struts/blob/7a350b02/archetypes/struts2-archetype-angularjs/src/main/resources/archetype-resources/src/main/webapp/js/lib/angular/angular-animate.js
--
diff --git
a/archetypes/struts2-archetype-angularjs/src/main/resources/archetype-resources/src/main/webapp/js/lib/angular/angular-animate.js
b/archetypes/struts2-archetype-angularjs/src/main/resources/archetype-resources/src/main/webapp/js/lib/angular/angular-animate.js
deleted file mode 100644
index 2778fc5..000
---
a/archetypes/struts2-archetype-angularjs/src/main/resources/archetype-resources/src/main/webapp/js/lib/angular/angular-animate.js
+++ /dev/null
@@ -1,4121 +0,0 @@
-/**
- * @license AngularJS v1.5.0
- * (c) 2010-2016 Google, Inc. http://angularjs.org
- * License: MIT
- */
-(function(window, angular, undefined) {'use strict';
-
-/* jshint ignore:start */
-var noop= angular.noop;
-var copy= angular.copy;
-var extend = angular.extend;
-var jqLite = angular.element;
-var forEach = angular.forEach;
-var isArray = angular.isArray;
-var isString= angular.isString;
-var isObject= angular.isObject;
-var isUndefined = angular.isUndefined;
-var isDefined = angular.isDefined;
-var isFunction = angular.isFunction;
-var isElement = angular.isElement;
-
-var ELEMENT_NODE = 1;
-var COMMENT_NODE = 8;
-
-var ADD_CLASS_SUFFIX = '-add';
-var REMOVE_CLASS_SUFFIX = '-remove';
-var EVENT_CLASS_PREFIX = 'ng-';
-var ACTIVE_CLASS_SUFFIX = '-active';
-var PREPARE_CLASS_SUFFIX = '-prepare';
-
-var NG_ANIMATE_CLASSNAME = 'ng-animate';
-var NG_ANIMATE_CHILDREN_DATA = '$$ngAnimateChildren';
-
-// Detect proper transitionend/animationend event names.
-var CSS_PREFIX = '', TRANSITION_PROP, TRANSITIONEND_EVENT, ANIMATION_PROP,
ANIMATIONEND_EVENT;
-
-// If unprefixed events are not supported but webkit-prefixed are, use the
latter.
-// Otherwise, just use W3C names, browsers not supporting them at all will
just ignore them.
-// Note: Chrome implements `window.onwebkitanimationend` and doesn't implement
`window.onanimationend`
-// but at the same time dispatches the `animationend` event and not
`webkitAnimationEnd`.
-// Register both events in case `window.onanimationend` is not supported
because of that,
-// do the same for `transitionend` as Safari is likely to exhibit similar
behavior.
-// Also, the only modern browser that uses vendor prefixes for
transitions/keyframes is webkit
-// therefore there is no reason to test anymore for other vendor prefixes:
-// http://caniuse.com/#search=transition
-if (isUndefined(window.ontransitionend) &&
isDefined(window.onwebkittransitionend)) {
- CSS_PREFIX = '-webkit-';
- TRANSITION_PROP = 'WebkitTransition';
- TRANSITIONEND_EVENT = 'webkitTransitionEnd transitionend';
-} else {
- TRANSITION_PROP = 'transition';
- TRANSITIONEND_EVENT = 'transitionend';
-}
-
-if (isUndefined(window.onanimationend) &&
isDefined(window.onwebkitanimationend)) {
- CSS_PREFIX = '-webkit-';
- ANIMATION_PROP = 'WebkitAnimation';
- ANIMATIONEND_EVENT = 'webkitAnimationEnd animationend';
-} else {
- ANIMATION_PROP = 'animation';
- ANIMATIONEND_EVENT = 'animationend';
-}
-
-var DURATION_KEY = 'Duration';
-var PROPERTY_KEY = 'Property';
-var DELAY_KEY = 'Delay';
-var TIMING_KEY = 'TimingFunction';
-var ANIMATION_ITERATION_COUNT_KEY = 'IterationCount';
-var ANIMATION_PLAYSTATE_KEY = 'PlayState';
-var SAFE_FAST_FORWARD_DURATION_VALUE = ;
-
-var ANIMATION_DELAY_PROP = ANIMATION_PROP + DELAY_KEY;
-var ANIMATION_DURATION_PROP = ANIMATION_PROP + DURATION_KEY;
-var TRANSITION_DELAY_PROP = TRANSITION_PROP + DELAY_KEY;
-var TRANSITION_DURATION_PROP = TRANSITION_PROP + DURATION_KEY;
-
-var isPromiseLike = function(p) {
- return p && p.then ? true : false;
-};
-
-var ngMinErr = angular.$$minErr('ng');
-function assertArg(arg, name, reason) {
- if (!arg) {
-throw ngMinErr('areq', "Argument '{0}' is {1}", (name || '?'), (reason ||
"required"));
- }
- return arg;
-}
-
-function mergeClasses(a,b) {
- if (!a && !b) return '';
- if (!a) return b;
- if (!b) return a;
- if (isArray(a)) a = a.join(' ');
- if (isArray(b)) b = b.join(' ');
- return a + ' ' + b;
-}
-
-function packageStyles(options) {
- var styles = {};
- if (options && (options.to || options.from)) {
-styles.to = options.to;
-styles.from = options.from;
- }
- return styles;
-}
-
-function pendClasses(classes, fix, isPrefix) {
- var className = '';
- classes = isArray(classes)
- ? classes
- : classes && isString(classes) && classes.length
- ? classes.split(/\s+/)
- : [];
- forEach(classes, function(klass, i) {
-if (klass && klass.length > 0) {
- className += (i > 0) ? ' ' : '';
- className += isPrefix ? fix + klass
-: klass + fix;
-}
- });
- return className;
-}
-
-function removeFromArray(arr, val) {
- var index = arr.indexOf(val);
- i
[25/53] [partial] struts git commit: WW-4316 Moves archetypes into its own repo
http://git-wip-us.apache.org/repos/asf/struts/blob/7a350b02/archetypes/struts2-archetype-angularjs/src/main/resources/archetype-resources/src/main/webapp/js/lib/angular/i18n/angular-locale_en-sh.js
--
diff --git
a/archetypes/struts2-archetype-angularjs/src/main/resources/archetype-resources/src/main/webapp/js/lib/angular/i18n/angular-locale_en-sh.js
b/archetypes/struts2-archetype-angularjs/src/main/resources/archetype-resources/src/main/webapp/js/lib/angular/i18n/angular-locale_en-sh.js
deleted file mode 100644
index 14d81f9..000
---
a/archetypes/struts2-archetype-angularjs/src/main/resources/archetype-resources/src/main/webapp/js/lib/angular/i18n/angular-locale_en-sh.js
+++ /dev/null
@@ -1,143 +0,0 @@
-'use strict';
-angular.module("ngLocale", [], ["$provide", function($provide) {
-var PLURAL_CATEGORY = {ZERO: "zero", ONE: "one", TWO: "two", FEW: "few", MANY:
"many", OTHER: "other"};
-function getDecimals(n) {
- n = n + '';
- var i = n.indexOf('.');
- return (i == -1) ? 0 : n.length - i - 1;
-}
-
-function getVF(n, opt_precision) {
- var v = opt_precision;
-
- if (undefined === v) {
-v = Math.min(getDecimals(n), 3);
- }
-
- var base = Math.pow(10, v);
- var f = ((n * base) | 0) % base;
- return {v: v, f: f};
-}
-
-$provide.value("$locale", {
- "DATETIME_FORMATS": {
-"AMPMS": [
- "AM",
- "PM"
-],
-"DAY": [
- "Sunday",
- "Monday",
- "Tuesday",
- "Wednesday",
- "Thursday",
- "Friday",
- "Saturday"
-],
-"ERANAMES": [
- "Before Christ",
- "Anno Domini"
-],
-"ERAS": [
- "BC",
- "AD"
-],
-"FIRSTDAYOFWEEK": 0,
-"MONTH": [
- "January",
- "February",
- "March",
- "April",
- "May",
- "June",
- "July",
- "August",
- "September",
- "October",
- "November",
- "December"
-],
-"SHORTDAY": [
- "Sun",
- "Mon",
- "Tue",
- "Wed",
- "Thu",
- "Fri",
- "Sat"
-],
-"SHORTMONTH": [
- "Jan",
- "Feb",
- "Mar",
- "Apr",
- "May",
- "Jun",
- "Jul",
- "Aug",
- "Sep",
- "Oct",
- "Nov",
- "Dec"
-],
-"STANDALONEMONTH": [
- "January",
- "February",
- "March",
- "April",
- "May",
- "June",
- "July",
- "August",
- "September",
- "October",
- "November",
- "December"
-],
-"WEEKENDRANGE": [
- 5,
- 6
-],
-"fullDate": ", d y",
-"longDate": "d y",
-"medium": "d MMM y h:mm:ss a",
-"mediumDate": "d MMM y",
-"mediumTime": "h:mm:ss a",
-"short": "dd/MM/y h:mm a",
-"shortDate": "dd/MM/y",
-"shortTime": "h:mm a"
- },
- "NUMBER_FORMATS": {
-"CURRENCY_SYM": "\u00a3",
-"DECIMAL_SEP": ".",
-"GROUP_SEP": ",",
-"PATTERNS": [
- {
-"gSize": 3,
-"lgSize": 3,
-"maxFrac": 3,
-"minFrac": 0,
-"minInt": 1,
-"negPre": "-",
-"negSuf": "",
-"posPre": "",
-"posSuf": ""
- },
- {
-"gSize": 3,
-"lgSize": 3,
-"maxFrac": 2,
-"minFrac": 2,
-"minInt": 1,
-"negPre": "-\u00a4",
-"negSuf": "",
-"posPre": "\u00a4",
-"posSuf": ""
- }
-]
- },
- "id": "en-sh",
- "localeID": "en_SH",
- "pluralCat": function(n, opt_precision) { var i = n | 0; var vf = getVF(n,
opt_precision); if (i == 1 && vf.v == 0) {return PLURAL_CATEGORY.ONE; }
return PLURAL_CATEGORY.OTHER;}
-});
-}]);
http://git-wip-us.apache.org/repos/asf/struts/blob/7a350b02/archetypes/struts2-archetype-angularjs/src/main/resources/archetype-resources/src/main/webapp/js/lib/angular/i18n/angular-locale_en-sl.js
--
diff --git
a/archetypes/struts2-archetype-angularjs/src/main/resources/archetype-resources/src/main/webapp/js/lib/angular/i18n/angular-locale_en-sl.js
b/archetypes/struts2-archetype-angularjs/src/main/resources/archetype-resources/src/main/webapp/js/lib/angular/i18n/angular-locale_en-sl.js
deleted file mode 100644
index 752d458..000
---
a/archetypes/struts2-archetype-angularjs/src/main/resources/archetype-resources/src/main/webapp/js/lib/angular/i18n/angular-locale_en-sl.js
+++ /dev/null
@@ -1,143 +0,0 @@
-'use strict';
-angular.module("ngLocale", [], ["$provide", function($provide) {
-var PLURAL_CATEGORY = {ZERO: "zero", ONE: "one", TWO: "two", FEW: "few", MANY:
"many", OTHER: "other"};
-function getDecimals(n) {
- n = n + '';
- var i = n.indexOf('.');
- return (i == -1) ? 0 : n.length - i - 1;
-}
-
-function getVF(n, opt_precision) {
- var v = opt_precision;
-
- if (undefined === v) {
-v = Math.min(getDecimals(n), 3);
- }
-
- var base = Math.pow(10, v);
- var f = ((n * base) | 0) % base;
- return {v: v, f: f};
-}
-
-$provide.value("$locale"
[32/53] [partial] struts git commit: WW-4316 Moves archetypes into its own repo
http://git-wip-us.apache.org/repos/asf/struts/blob/7a350b02/archetypes/struts2-archetype-angularjs/src/main/resources/archetype-resources/src/main/webapp/js/lib/angular/i18n/angular-locale_be-by.js
--
diff --git
a/archetypes/struts2-archetype-angularjs/src/main/resources/archetype-resources/src/main/webapp/js/lib/angular/i18n/angular-locale_be-by.js
b/archetypes/struts2-archetype-angularjs/src/main/resources/archetype-resources/src/main/webapp/js/lib/angular/i18n/angular-locale_be-by.js
deleted file mode 100644
index dd98e65..000
---
a/archetypes/struts2-archetype-angularjs/src/main/resources/archetype-resources/src/main/webapp/js/lib/angular/i18n/angular-locale_be-by.js
+++ /dev/null
@@ -1,125 +0,0 @@
-'use strict';
-angular.module("ngLocale", [], ["$provide", function($provide) {
-var PLURAL_CATEGORY = {ZERO: "zero", ONE: "one", TWO: "two", FEW: "few", MANY:
"many", OTHER: "other"};
-$provide.value("$locale", {
- "DATETIME_FORMATS": {
-"AMPMS": [
- "\u0434\u0430 \u043f\u0430\u043b\u0443\u0434\u043d\u044f",
- "\u043f\u0430\u0441\u043b\u044f
\u043f\u0430\u043b\u0443\u0434\u043d\u044f"
-],
-"DAY": [
- "\u043d\u044f\u0434\u0437\u0435\u043b\u044f",
- "\u043f\u0430\u043d\u044f\u0434\u0437\u0435\u043b\u0430\u043a",
- "\u0430\u045e\u0442\u043e\u0440\u0430\u043a",
- "\u0441\u0435\u0440\u0430\u0434\u0430",
- "\u0447\u0430\u0446\u0432\u0435\u0440",
- "\u043f\u044f\u0442\u043d\u0456\u0446\u0430",
- "\u0441\u0443\u0431\u043e\u0442\u0430"
-],
-"ERANAMES": [
- "\u0434\u0430 \u043d.\u044d.",
- "\u043d.\u044d."
-],
-"ERAS": [
- "\u0434\u0430 \u043d.\u044d.",
- "\u043d.\u044d."
-],
-"FIRSTDAYOFWEEK": 0,
-"MONTH": [
- "\u0441\u0442\u0443\u0434\u0437\u0435\u043d\u044f",
- "\u043b\u044e\u0442\u0430\u0433\u0430",
- "\u0441\u0430\u043a\u0430\u0432\u0456\u043a\u0430",
- "\u043a\u0440\u0430\u0441\u0430\u0432\u0456\u043a\u0430",
- "\u043c\u0430\u044f",
- "\u0447\u044d\u0440\u0432\u0435\u043d\u044f",
- "\u043b\u0456\u043f\u0435\u043d\u044f",
- "\u0436\u043d\u0456\u045e\u043d\u044f",
- "\u0432\u0435\u0440\u0430\u0441\u043d\u044f",
- "\u043a\u0430\u0441\u0442\u0440\u044b\u0447\u043d\u0456\u043a\u0430",
- "\u043b\u0456\u0441\u0442\u0430\u043f\u0430\u0434\u0430",
- "\u0441\u043d\u0435\u0436\u043d\u044f"
-],
-"SHORTDAY": [
- "\u043d\u0434",
- "\u043f\u043d",
- "\u0430\u045e",
- "\u0441\u0440",
- "\u0447\u0446",
- "\u043f\u0442",
- "\u0441\u0431"
-],
-"SHORTMONTH": [
- "\u0441\u0442\u0443",
- "\u043b\u044e\u0442",
- "\u0441\u0430\u043a",
- "\u043a\u0440\u0430",
- "\u043c\u0430\u044f",
- "\u0447\u044d\u0440",
- "\u043b\u0456\u043f",
- "\u0436\u043d\u0456",
- "\u0432\u0435\u0440",
- "\u043a\u0430\u0441",
- "\u043b\u0456\u0441",
- "\u0441\u043d\u0435"
-],
-"STANDALONEMONTH": [
- "\u0441\u0442\u0443\u0434\u0437\u0435\u043d\u044c",
- "\u043b\u044e\u0442\u044b",
- "\u0441\u0430\u043a\u0430\u0432\u0456\u043a",
- "\u043a\u0440\u0430\u0441\u0430\u0432\u0456\u043a",
- "\u043c\u0430\u0439",
- "\u0447\u044d\u0440\u0432\u0435\u043d\u044c",
- "\u043b\u0456\u043f\u0435\u043d\u044c",
- "\u0436\u043d\u0456\u0432\u0435\u043d\u044c",
- "\u0432\u0435\u0440\u0430\u0441\u0435\u043d\u044c",
- "\u043a\u0430\u0441\u0442\u0440\u044b\u0447\u043d\u0456\u043a",
- "\u043b\u0456\u0441\u0442\u0430\u043f\u0430\u0434",
- "\u0441\u043d\u0435\u0436\u0430\u043d\u044c"
-],
-"WEEKENDRANGE": [
- 5,
- 6
-],
-"fullDate": ", d y",
-"longDate": "d y",
-"medium": "d.M.y HH.mm.ss",
-"mediumDate": "d.M.y",
-"mediumTime": "HH.mm.ss",
-"short": "d.M.yy HH.mm",
-"shortDate": "d.M.yy",
-"shortTime": "HH.mm"
- },
- "NUMBER_FORMATS": {
-"CURRENCY_SYM": "BYR",
-"DECIMAL_SEP": ",",
-"GROUP_SEP": "\u00a0",
-"PATTERNS": [
- {
-"gSize": 3,
-"lgSize": 3,
-"maxFrac": 3,
-"minFrac": 0,
-"minInt": 1,
-"negPre": "-",
-"negSuf": "",
-"posPre": "",
-"posSuf": ""
- },
- {
-"gSize": 3,
-"lgSize": 3,
-"maxFrac": 2,
-"minFrac": 2,
-"minInt": 1,
-"negPre": "-\u00a4",
-"negSuf": "",
-"posPre": "\u00a4",
-"posSuf": ""
- }
-]
- },
- "id": "be-by",
- "localeID": "be_BY",
- "pluralCat": function(n, opt_precision) { if (n % 10 == 1 && n % 100 != 11)
{return PLURAL_CATEGORY.ONE; } if (n % 10 >= 2 && n % 10 <= 4 && (n % 100
< 12 || n % 100 > 14)) {return PLURAL_CATEGORY.FEW; } if (n % 10 == 0 ||
n % 10 >= 5 && n % 10 <= 9 || n % 100 >= 11 && n % 100 <= 14) {return
PLURAL_CATEGORY.MANY; } return PLURAL_CATEGORY.OTHER;}
-});
[05/53] [partial] struts git commit: WW-4316 Moves archetypes into its own repo
http://git-wip-us.apache.org/repos/asf/struts/blob/7a350b02/archetypes/struts2-archetype-angularjs/src/main/resources/archetype-resources/src/main/webapp/js/lib/angular/i18n/angular-locale_teo-ug.js
--
diff --git
a/archetypes/struts2-archetype-angularjs/src/main/resources/archetype-resources/src/main/webapp/js/lib/angular/i18n/angular-locale_teo-ug.js
b/archetypes/struts2-archetype-angularjs/src/main/resources/archetype-resources/src/main/webapp/js/lib/angular/i18n/angular-locale_teo-ug.js
deleted file mode 100644
index bfa1f2a..000
---
a/archetypes/struts2-archetype-angularjs/src/main/resources/archetype-resources/src/main/webapp/js/lib/angular/i18n/angular-locale_teo-ug.js
+++ /dev/null
@@ -1,143 +0,0 @@
-'use strict';
-angular.module("ngLocale", [], ["$provide", function($provide) {
-var PLURAL_CATEGORY = {ZERO: "zero", ONE: "one", TWO: "two", FEW: "few", MANY:
"many", OTHER: "other"};
-function getDecimals(n) {
- n = n + '';
- var i = n.indexOf('.');
- return (i == -1) ? 0 : n.length - i - 1;
-}
-
-function getVF(n, opt_precision) {
- var v = opt_precision;
-
- if (undefined === v) {
-v = Math.min(getDecimals(n), 3);
- }
-
- var base = Math.pow(10, v);
- var f = ((n * base) | 0) % base;
- return {v: v, f: f};
-}
-
-$provide.value("$locale", {
- "DATETIME_FORMATS": {
-"AMPMS": [
- "Taparachu",
- "Ebongi"
-],
-"DAY": [
- "Nakaejuma",
- "Nakaebarasa",
- "Nakaare",
- "Nakauni",
- "Nakaung\u2019on",
- "Nakakany",
- "Nakasabiti"
-],
-"ERANAMES": [
- "Kabla ya Christo",
- "Baada ya Christo"
-],
-"ERAS": [
- "KK",
- "BK"
-],
-"FIRSTDAYOFWEEK": 0,
-"MONTH": [
- "Orara",
- "Omuk",
- "Okwamg\u2019",
- "Odung\u2019el",
- "Omaruk",
- "Omodok\u2019king\u2019ol",
- "Ojola",
- "Opedel",
- "Osokosokoma",
- "Otibar",
- "Olabor",
- "Opoo"
-],
-"SHORTDAY": [
- "Jum",
- "Bar",
- "Aar",
- "Uni",
- "Ung",
- "Kan",
- "Sab"
-],
-"SHORTMONTH": [
- "Rar",
- "Muk",
- "Kwa",
- "Dun",
- "Mar",
- "Mod",
- "Jol",
- "Ped",
- "Sok",
- "Tib",
- "Lab",
- "Poo"
-],
-"STANDALONEMONTH": [
- "Orara",
- "Omuk",
- "Okwamg\u2019",
- "Odung\u2019el",
- "Omaruk",
- "Omodok\u2019king\u2019ol",
- "Ojola",
- "Opedel",
- "Osokosokoma",
- "Otibar",
- "Olabor",
- "Opoo"
-],
-"WEEKENDRANGE": [
- 5,
- 6
-],
-"fullDate": ", d y",
-"longDate": "d y",
-"medium": "d MMM y h:mm:ss a",
-"mediumDate": "d MMM y",
-"mediumTime": "h:mm:ss a",
-"short": "dd/MM/y h:mm a",
-"shortDate": "dd/MM/y",
-"shortTime": "h:mm a"
- },
- "NUMBER_FORMATS": {
-"CURRENCY_SYM": "UGX",
-"DECIMAL_SEP": ".",
-"GROUP_SEP": ",",
-"PATTERNS": [
- {
-"gSize": 3,
-"lgSize": 3,
-"maxFrac": 3,
-"minFrac": 0,
-"minInt": 1,
-"negPre": "-",
-"negSuf": "",
-"posPre": "",
-"posSuf": ""
- },
- {
-"gSize": 3,
-"lgSize": 3,
-"maxFrac": 2,
-"minFrac": 2,
-"minInt": 1,
-"negPre": "-\u00a4",
-"negSuf": "",
-"posPre": "\u00a4",
-"posSuf": ""
- }
-]
- },
- "id": "teo-ug",
- "localeID": "teo_UG",
- "pluralCat": function(n, opt_precision) { var i = n | 0; var vf = getVF(n,
opt_precision); if (i == 1 && vf.v == 0) {return PLURAL_CATEGORY.ONE; }
return PLURAL_CATEGORY.OTHER;}
-});
-}]);
http://git-wip-us.apache.org/repos/asf/struts/blob/7a350b02/archetypes/struts2-archetype-angularjs/src/main/resources/archetype-resources/src/main/webapp/js/lib/angular/i18n/angular-locale_teo.js
--
diff --git
a/archetypes/struts2-archetype-angularjs/src/main/resources/archetype-resources/src/main/webapp/js/lib/angular/i18n/angular-locale_teo.js
b/archetypes/struts2-archetype-angularjs/src/main/resources/archetype-resources/src/main/webapp/js/lib/angular/i18n/angular-locale_teo.js
deleted file mode 100644
index 80c2663..000
---
a/archetypes/struts2-archetype-angularjs/src/main/resources/archetype-resources/src/main/webapp/js/lib/angular/i18n/angular-locale_teo.js
+++ /dev/null
@@ -1,143 +0,0 @@
-'use strict';
-angular.module("ngLocale", [], ["$provide", function($provide) {
-var PLURAL_CATEGORY = {ZERO: "zero", ONE: "one", TWO: "two", FEW: "few", MANY:
"many", OTHER: "other"};
-function getDecimals(n) {
- n = n + '';
- var i = n.indexOf('.');
- return (i == -1) ? 0 : n.length - i - 1;
-}
-
-function getVF(n, opt_precision) {
- var v = opt_precision;
-
- if (undefined === v) {
-v = Math.min(getDecimals(n), 3);
- }
-
- var base = Math.pow(10, v);
-
[11/53] [partial] struts git commit: WW-4316 Moves archetypes into its own repo
http://git-wip-us.apache.org/repos/asf/struts/blob/7a350b02/archetypes/struts2-archetype-angularjs/src/main/resources/archetype-resources/src/main/webapp/js/lib/angular/i18n/angular-locale_om-et.js
--
diff --git
a/archetypes/struts2-archetype-angularjs/src/main/resources/archetype-resources/src/main/webapp/js/lib/angular/i18n/angular-locale_om-et.js
b/archetypes/struts2-archetype-angularjs/src/main/resources/archetype-resources/src/main/webapp/js/lib/angular/i18n/angular-locale_om-et.js
deleted file mode 100644
index 83ab18d..000
---
a/archetypes/struts2-archetype-angularjs/src/main/resources/archetype-resources/src/main/webapp/js/lib/angular/i18n/angular-locale_om-et.js
+++ /dev/null
@@ -1,143 +0,0 @@
-'use strict';
-angular.module("ngLocale", [], ["$provide", function($provide) {
-var PLURAL_CATEGORY = {ZERO: "zero", ONE: "one", TWO: "two", FEW: "few", MANY:
"many", OTHER: "other"};
-function getDecimals(n) {
- n = n + '';
- var i = n.indexOf('.');
- return (i == -1) ? 0 : n.length - i - 1;
-}
-
-function getVF(n, opt_precision) {
- var v = opt_precision;
-
- if (undefined === v) {
-v = Math.min(getDecimals(n), 3);
- }
-
- var base = Math.pow(10, v);
- var f = ((n * base) | 0) % base;
- return {v: v, f: f};
-}
-
-$provide.value("$locale", {
- "DATETIME_FORMATS": {
-"AMPMS": [
- "WD",
- "WB"
-],
-"DAY": [
- "Dilbata",
- "Wiixata",
- "Qibxata",
- "Roobii",
- "Kamiisa",
- "Jimaata",
- "Sanbata"
-],
-"ERANAMES": [
- "KD",
- "KB"
-],
-"ERAS": [
- "KD",
- "KB"
-],
-"FIRSTDAYOFWEEK": 0,
-"MONTH": [
- "Amajjii",
- "Guraandhala",
- "Bitooteessa",
- "Elba",
- "Caamsa",
- "Waxabajjii",
- "Adooleessa",
- "Hagayya",
- "Fuulbana",
- "Onkololeessa",
- "Sadaasa",
- "Muddee"
-],
-"SHORTDAY": [
- "Dil",
- "Wix",
- "Qib",
- "Rob",
- "Kam",
- "Jim",
- "San"
-],
-"SHORTMONTH": [
- "Ama",
- "Gur",
- "Bit",
- "Elb",
- "Cam",
- "Wax",
- "Ado",
- "Hag",
- "Ful",
- "Onk",
- "Sad",
- "Mud"
-],
-"STANDALONEMONTH": [
- "Amajjii",
- "Guraandhala",
- "Bitooteessa",
- "Elba",
- "Caamsa",
- "Waxabajjii",
- "Adooleessa",
- "Hagayya",
- "Fuulbana",
- "Onkololeessa",
- "Sadaasa",
- "Muddee"
-],
-"WEEKENDRANGE": [
- 5,
- 6
-],
-"fullDate": ", d, y",
-"longDate": "dd y",
-"medium": "dd-MMM-y h:mm:ss a",
-"mediumDate": "dd-MMM-y",
-"mediumTime": "h:mm:ss a",
-"short": "dd/MM/yy h:mm a",
-"shortDate": "dd/MM/yy",
-"shortTime": "h:mm a"
- },
- "NUMBER_FORMATS": {
-"CURRENCY_SYM": "Birr",
-"DECIMAL_SEP": ".",
-"GROUP_SEP": ",",
-"PATTERNS": [
- {
-"gSize": 3,
-"lgSize": 3,
-"maxFrac": 3,
-"minFrac": 0,
-"minInt": 1,
-"negPre": "-",
-"negSuf": "",
-"posPre": "",
-"posSuf": ""
- },
- {
-"gSize": 3,
-"lgSize": 3,
-"maxFrac": 2,
-"minFrac": 2,
-"minInt": 1,
-"negPre": "-\u00a4",
-"negSuf": "",
-"posPre": "\u00a4",
-"posSuf": ""
- }
-]
- },
- "id": "om-et",
- "localeID": "om_ET",
- "pluralCat": function(n, opt_precision) { var i = n | 0; var vf = getVF(n,
opt_precision); if (i == 1 && vf.v == 0) {return PLURAL_CATEGORY.ONE; }
return PLURAL_CATEGORY.OTHER;}
-});
-}]);
http://git-wip-us.apache.org/repos/asf/struts/blob/7a350b02/archetypes/struts2-archetype-angularjs/src/main/resources/archetype-resources/src/main/webapp/js/lib/angular/i18n/angular-locale_om-ke.js
--
diff --git
a/archetypes/struts2-archetype-angularjs/src/main/resources/archetype-resources/src/main/webapp/js/lib/angular/i18n/angular-locale_om-ke.js
b/archetypes/struts2-archetype-angularjs/src/main/resources/archetype-resources/src/main/webapp/js/lib/angular/i18n/angular-locale_om-ke.js
deleted file mode 100644
index 0d74a9a..000
---
a/archetypes/struts2-archetype-angularjs/src/main/resources/archetype-resources/src/main/webapp/js/lib/angular/i18n/angular-locale_om-ke.js
+++ /dev/null
@@ -1,143 +0,0 @@
-'use strict';
-angular.module("ngLocale", [], ["$provide", function($provide) {
-var PLURAL_CATEGORY = {ZERO: "zero", ONE: "one", TWO: "two", FEW: "few", MANY:
"many", OTHER: "other"};
-function getDecimals(n) {
- n = n + '';
- var i = n.indexOf('.');
- return (i == -1) ? 0 : n.length - i - 1;
-}
-
-function getVF(n, opt_precision) {
- var v = opt_precision;
-
- if (undefined === v) {
-v = Math.min(getDecimals(n), 3);
- }
-
- var base = Math.pow(10, v);
- var f = ((n * base) | 0) % base;
- return {v: v, f: f}
[51/53] [partial] struts git commit: WW-4316 Moves archetypes into its own repo
WW-4316 Moves archetypes into its own repo Project: http://git-wip-us.apache.org/repos/asf/struts/repo Commit: http://git-wip-us.apache.org/repos/asf/struts/commit/7a350b02 Tree: http://git-wip-us.apache.org/repos/asf/struts/tree/7a350b02 Diff: http://git-wip-us.apache.org/repos/asf/struts/diff/7a350b02 Branch: refs/heads/master Commit: 7a350b02afd0476de371b78b6cd8dbdfb29d163e Parents: f21a3fd Author: Lukasz Lenart Authored: Thu Jul 14 19:48:13 2016 +0200 Committer: Lukasz Lenart Committed: Thu Jul 14 19:48:15 2016 +0200 -- archetypes/pom.xml |63 - .../struts2-archetype-angularjs/README.txt |61 - archetypes/struts2-archetype-angularjs/pom.xml |86 - .../META-INF/maven/archetype-metadata.xml |68 - .../main/resources/META-INF/maven/archetype.xml | 7 - .../resources/archetype-resources/LICENSE.txt | 174 - .../resources/archetype-resources/NOTICE.txt| 6 - .../main/resources/archetype-resources/pom.xml | 177 - .../src/main/java/actions/Index.java|42 - .../main/java/actions/data/ProjectsAction.java |72 - .../main/java/actions/data/package-info.java|24 - .../src/main/resources/jshint.conf.js |13 - .../src/main/resources/log4j2.xml |16 - .../src/main/resources/package.properties | 1 - .../src/main/resources/package_es.properties| 1 - .../src/main/resources/struts.xml |16 - .../src/main/webapp/WEB-INF/content/index.jsp |38 - .../src/main/webapp/WEB-INF/web.xml |20 - .../src/main/webapp/index.jsp | 1 - .../src/main/webapp/js/app.js |26 - .../src/main/webapp/js/config.js|40 - .../js/controllers/ApacheProjectsController.js |40 - .../main/webapp/js/controllers/AppController.js |29 - .../webapp/js/controllers/HomeController.js |30 - .../webapp/js/lib/angular/angular-animate.js| 4121 -- .../js/lib/angular/angular-animate.min.js |56 - .../js/lib/angular/angular-animate.min.js.map | 8 - .../main/webapp/js/lib/angular/angular-aria.js | 398 - .../webapp/js/lib/angular/angular-aria.min.js |14 - .../js/lib/angular/angular-aria.min.js.map | 8 - .../webapp/js/lib/angular/angular-cookies.js| 322 - .../js/lib/angular/angular-cookies.min.js | 9 - .../js/lib/angular/angular-cookies.min.js.map | 8 - .../main/webapp/js/lib/angular/angular-csp.css |21 - .../webapp/js/lib/angular/angular-loader.js | 484 - .../webapp/js/lib/angular/angular-loader.min.js |10 - .../js/lib/angular/angular-loader.min.js.map| 8 - .../js/lib/angular/angular-message-format.js| 980 - .../lib/angular/angular-message-format.min.js |26 - .../angular/angular-message-format.min.js.map | 8 - .../webapp/js/lib/angular/angular-messages.js | 687 - .../js/lib/angular/angular-messages.min.js |12 - .../js/lib/angular/angular-messages.min.js.map | 8 - .../main/webapp/js/lib/angular/angular-mocks.js | 2842 -- .../webapp/js/lib/angular/angular-resource.js | 768 - .../js/lib/angular/angular-resource.min.js |15 - .../js/lib/angular/angular-resource.min.js.map | 8 - .../main/webapp/js/lib/angular/angular-route.js | 1016 - .../webapp/js/lib/angular/angular-route.min.js |15 - .../js/lib/angular/angular-route.min.js.map | 8 - .../webapp/js/lib/angular/angular-sanitize.js | 717 - .../js/lib/angular/angular-sanitize.min.js |15 - .../js/lib/angular/angular-sanitize.min.js.map | 8 - .../webapp/js/lib/angular/angular-scenario.js | 41849 - .../main/webapp/js/lib/angular/angular-touch.js | 729 - .../webapp/js/lib/angular/angular-touch.min.js |14 - .../js/lib/angular/angular-touch.min.js.map | 8 - .../src/main/webapp/js/lib/angular/angular.js | 30428 .../main/webapp/js/lib/angular/angular.min.js | 307 - .../webapp/js/lib/angular/angular.min.js.map| 8 - .../src/main/webapp/js/lib/angular/errors.json | 1 - .../js/lib/angular/i18n/angular-locale_aa-dj.js | 128 - .../js/lib/angular/i18n/angular-locale_aa-er.js | 128 - .../js/lib/angular/i18n/angular-locale_aa-et.js | 128 - .../js/lib/angular/i18n/angular-locale_aa.js| 128 - .../js/lib/angular/i18n/angular-locale_af-na.js | 125 - .../js/lib/angular/i18n/angular-locale_af-za.js | 125 - .../js/lib/angular/i18n/angular-locale_af.js| 125 - .../lib/angular/i18n/angular-locale_agq-cm.js | 143 - .../js/lib/angular/i18n/angular-locale_agq.js | 143 - .../js/lib/angular/i18n/angular-locale_ak-gh.js | 143 - .../js/lib/angular/i18n/angular-locale_ak.js| 143 - .../js/lib/angular/i18n/angular-locale_am-et.js | 125 - .../js/lib/angular/i18n/angular-locale_am.js| 125 -
[15/53] [partial] struts git commit: WW-4316 Moves archetypes into its own repo
http://git-wip-us.apache.org/repos/asf/struts/blob/7a350b02/archetypes/struts2-archetype-angularjs/src/main/resources/archetype-resources/src/main/webapp/js/lib/angular/i18n/angular-locale_lkt-us.js
--
diff --git
a/archetypes/struts2-archetype-angularjs/src/main/resources/archetype-resources/src/main/webapp/js/lib/angular/i18n/angular-locale_lkt-us.js
b/archetypes/struts2-archetype-angularjs/src/main/resources/archetype-resources/src/main/webapp/js/lib/angular/i18n/angular-locale_lkt-us.js
deleted file mode 100644
index 8f0f754..000
---
a/archetypes/struts2-archetype-angularjs/src/main/resources/archetype-resources/src/main/webapp/js/lib/angular/i18n/angular-locale_lkt-us.js
+++ /dev/null
@@ -1,143 +0,0 @@
-'use strict';
-angular.module("ngLocale", [], ["$provide", function($provide) {
-var PLURAL_CATEGORY = {ZERO: "zero", ONE: "one", TWO: "two", FEW: "few", MANY:
"many", OTHER: "other"};
-function getDecimals(n) {
- n = n + '';
- var i = n.indexOf('.');
- return (i == -1) ? 0 : n.length - i - 1;
-}
-
-function getVF(n, opt_precision) {
- var v = opt_precision;
-
- if (undefined === v) {
-v = Math.min(getDecimals(n), 3);
- }
-
- var base = Math.pow(10, v);
- var f = ((n * base) | 0) % base;
- return {v: v, f: f};
-}
-
-$provide.value("$locale", {
- "DATETIME_FORMATS": {
-"AMPMS": [
- "AM",
- "PM"
-],
-"DAY": [
- "A\u014bp\u00e9tuwak\u021fa\u014b",
- "A\u014bp\u00e9tuwa\u014b\u017ei",
- "A\u014bp\u00e9tunu\u014bpa",
- "A\u014bp\u00e9tuyamni",
- "A\u014bp\u00e9tutopa",
- "A\u014bp\u00e9tuzapta\u014b",
- "Ow\u00e1\u014bgyu\u017ea\u017eapi"
-],
-"ERANAMES": [
- "BCE",
- "CE"
-],
-"ERAS": [
- "BCE",
- "CE"
-],
-"FIRSTDAYOFWEEK": 0,
-"MONTH": [
- "Wi\u00f3the\u021fika W\u00ed",
- "Thiy\u00f3\u021feyu\u014bka W\u00ed",
- "I\u0161t\u00e1wi\u010dhayaza\u014b W\u00ed",
- "P\u021fe\u017e\u00edt\u021fo W\u00ed",
- "\u010cha\u014bw\u00e1pet\u021fo W\u00ed",
- "W\u00edpazuk\u021fa-wa\u0161t\u00e9 W\u00ed",
- "\u010cha\u014bp\u021f\u00e1sapa W\u00ed",
- "Was\u00fat\u021fu\u014b W\u00ed",
- "\u010cha\u014bw\u00e1pe\u01e7i W\u00ed",
- "\u010cha\u014bw\u00e1pe-kasn\u00e1 W\u00ed",
- "Wan\u00edyetu W\u00ed",
- "T\u021fah\u00e9kap\u0161u\u014b W\u00ed"
-],
-"SHORTDAY": [
- "A\u014bp\u00e9tuwak\u021fa\u014b",
- "A\u014bp\u00e9tuwa\u014b\u017ei",
- "A\u014bp\u00e9tunu\u014bpa",
- "A\u014bp\u00e9tuyamni",
- "A\u014bp\u00e9tutopa",
- "A\u014bp\u00e9tuzapta\u014b",
- "Ow\u00e1\u014bgyu\u017ea\u017eapi"
-],
-"SHORTMONTH": [
- "Wi\u00f3the\u021fika W\u00ed",
- "Thiy\u00f3\u021feyu\u014bka W\u00ed",
- "I\u0161t\u00e1wi\u010dhayaza\u014b W\u00ed",
- "P\u021fe\u017e\u00edt\u021fo W\u00ed",
- "\u010cha\u014bw\u00e1pet\u021fo W\u00ed",
- "W\u00edpazuk\u021fa-wa\u0161t\u00e9 W\u00ed",
- "\u010cha\u014bp\u021f\u00e1sapa W\u00ed",
- "Was\u00fat\u021fu\u014b W\u00ed",
- "\u010cha\u014bw\u00e1pe\u01e7i W\u00ed",
- "\u010cha\u014bw\u00e1pe-kasn\u00e1 W\u00ed",
- "Wan\u00edyetu W\u00ed",
- "T\u021fah\u00e9kap\u0161u\u014b W\u00ed"
-],
-"STANDALONEMONTH": [
- "Wi\u00f3the\u021fika W\u00ed",
- "Thiy\u00f3\u021feyu\u014bka W\u00ed",
- "I\u0161t\u00e1wi\u010dhayaza\u014b W\u00ed",
- "P\u021fe\u017e\u00edt\u021fo W\u00ed",
- "\u010cha\u014bw\u00e1pet\u021fo W\u00ed",
- "W\u00edpazuk\u021fa-wa\u0161t\u00e9 W\u00ed",
- "\u010cha\u014bp\u021f\u00e1sapa W\u00ed",
- "Was\u00fat\u021fu\u014b W\u00ed",
- "\u010cha\u014bw\u00e1pe\u01e7i W\u00ed",
- "\u010cha\u014bw\u00e1pe-kasn\u00e1 W\u00ed",
- "Wan\u00edyetu W\u00ed",
- "T\u021fah\u00e9kap\u0161u\u014b W\u00ed"
-],
-"WEEKENDRANGE": [
- 5,
- 6
-],
-"fullDate": ", d, y",
-"longDate": " d, y",
-"medium": "MMM d, y h:mm:ss a",
-"mediumDate": "MMM d, y",
-"mediumTime": "h:mm:ss a",
-"short": "M/d/yy h:mm a",
-"shortDate": "M/d/yy",
-"shortTime": "h:mm a"
- },
- "NUMBER_FORMATS": {
-"CURRENCY_SYM": "$",
-"DECIMAL_SEP": ".",
-"GROUP_SEP": ",",
-"PATTERNS": [
- {
-"gSize": 3,
-"lgSize": 3,
-"maxFrac": 3,
-"minFrac": 0,
-"minInt": 1,
-"negPre": "-",
-"negSuf": "",
-"posPre": "",
-"posSuf": ""
- },
- {
-"gSize": 3,
-"lgSize": 3,
-"maxFrac": 2,
-"minFrac": 2,
-"minInt": 1,
-"negPre": "-\u00a4\u00a0",
-"negSuf": "",
-"posPre": "\u00a4\u00a0",
-"posSuf": ""
- }
-]
- },
- "id": "lkt-us",
- "localeID": "lkt_US",
- "pluralCat": function(n, opt_precision) { var i = n | 0; var vf = getVF(n,
opt_precision); if (i == 1 && vf.v == 0) {retu
[17/53] [partial] struts git commit: WW-4316 Moves archetypes into its own repo
http://git-wip-us.apache.org/repos/asf/struts/blob/7a350b02/archetypes/struts2-archetype-angularjs/src/main/resources/archetype-resources/src/main/webapp/js/lib/angular/i18n/angular-locale_ki-ke.js
--
diff --git
a/archetypes/struts2-archetype-angularjs/src/main/resources/archetype-resources/src/main/webapp/js/lib/angular/i18n/angular-locale_ki-ke.js
b/archetypes/struts2-archetype-angularjs/src/main/resources/archetype-resources/src/main/webapp/js/lib/angular/i18n/angular-locale_ki-ke.js
deleted file mode 100644
index b049763..000
---
a/archetypes/struts2-archetype-angularjs/src/main/resources/archetype-resources/src/main/webapp/js/lib/angular/i18n/angular-locale_ki-ke.js
+++ /dev/null
@@ -1,143 +0,0 @@
-'use strict';
-angular.module("ngLocale", [], ["$provide", function($provide) {
-var PLURAL_CATEGORY = {ZERO: "zero", ONE: "one", TWO: "two", FEW: "few", MANY:
"many", OTHER: "other"};
-function getDecimals(n) {
- n = n + '';
- var i = n.indexOf('.');
- return (i == -1) ? 0 : n.length - i - 1;
-}
-
-function getVF(n, opt_precision) {
- var v = opt_precision;
-
- if (undefined === v) {
-v = Math.min(getDecimals(n), 3);
- }
-
- var base = Math.pow(10, v);
- var f = ((n * base) | 0) % base;
- return {v: v, f: f};
-}
-
-$provide.value("$locale", {
- "DATETIME_FORMATS": {
-"AMPMS": [
- "Kiroko",
- "Hwa\u0129-in\u0129"
-],
-"DAY": [
- "Kiumia",
- "Njumatat\u0169",
- "Njumaine",
- "Njumatana",
- "Aramithi",
- "Njumaa",
- "Njumamothi"
-],
-"ERANAMES": [
- "Mbere ya Kristo",
- "Thutha wa Kristo"
-],
-"ERAS": [
- "MK",
- "TK"
-],
-"FIRSTDAYOFWEEK": 0,
-"MONTH": [
- "Njenuar\u0129",
- "Mwere wa ker\u0129",
- "Mwere wa gatat\u0169",
- "Mwere wa kana",
- "Mwere wa gatano",
- "Mwere wa gatandat\u0169",
- "Mwere wa m\u0169gwanja",
- "Mwere wa kanana",
- "Mwere wa kenda",
- "Mwere wa ik\u0169mi",
- "Mwere wa ik\u0169mi na \u0169mwe",
- "Ndithemba"
-],
-"SHORTDAY": [
- "KMA",
- "NTT",
- "NMN",
- "NMT",
- "ART",
- "NMA",
- "NMM"
-],
-"SHORTMONTH": [
- "JEN",
- "WKR",
- "WGT",
- "WKN",
- "WTN",
- "WTD",
- "WMJ",
- "WNN",
- "WKD",
- "WIK",
- "WMW",
- "DIT"
-],
-"STANDALONEMONTH": [
- "Njenuar\u0129",
- "Mwere wa ker\u0129",
- "Mwere wa gatat\u0169",
- "Mwere wa kana",
- "Mwere wa gatano",
- "Mwere wa gatandat\u0169",
- "Mwere wa m\u0169gwanja",
- "Mwere wa kanana",
- "Mwere wa kenda",
- "Mwere wa ik\u0169mi",
- "Mwere wa ik\u0169mi na \u0169mwe",
- "Ndithemba"
-],
-"WEEKENDRANGE": [
- 5,
- 6
-],
-"fullDate": ", d y",
-"longDate": "d y",
-"medium": "d MMM y h:mm:ss a",
-"mediumDate": "d MMM y",
-"mediumTime": "h:mm:ss a",
-"short": "dd/MM/y h:mm a",
-"shortDate": "dd/MM/y",
-"shortTime": "h:mm a"
- },
- "NUMBER_FORMATS": {
-"CURRENCY_SYM": "Ksh",
-"DECIMAL_SEP": ".",
-"GROUP_SEP": ",",
-"PATTERNS": [
- {
-"gSize": 3,
-"lgSize": 3,
-"maxFrac": 3,
-"minFrac": 0,
-"minInt": 1,
-"negPre": "-",
-"negSuf": "",
-"posPre": "",
-"posSuf": ""
- },
- {
-"gSize": 3,
-"lgSize": 3,
-"maxFrac": 2,
-"minFrac": 2,
-"minInt": 1,
-"negPre": "-\u00a4",
-"negSuf": "",
-"posPre": "\u00a4",
-"posSuf": ""
- }
-]
- },
- "id": "ki-ke",
- "localeID": "ki_KE",
- "pluralCat": function(n, opt_precision) { var i = n | 0; var vf = getVF(n,
opt_precision); if (i == 1 && vf.v == 0) {return PLURAL_CATEGORY.ONE; }
return PLURAL_CATEGORY.OTHER;}
-});
-}]);
http://git-wip-us.apache.org/repos/asf/struts/blob/7a350b02/archetypes/struts2-archetype-angularjs/src/main/resources/archetype-resources/src/main/webapp/js/lib/angular/i18n/angular-locale_ki.js
--
diff --git
a/archetypes/struts2-archetype-angularjs/src/main/resources/archetype-resources/src/main/webapp/js/lib/angular/i18n/angular-locale_ki.js
b/archetypes/struts2-archetype-angularjs/src/main/resources/archetype-resources/src/main/webapp/js/lib/angular/i18n/angular-locale_ki.js
deleted file mode 100644
index f79a457..000
---
a/archetypes/struts2-archetype-angularjs/src/main/resources/archetype-resources/src/main/webapp/js/lib/angular/i18n/angular-locale_ki.js
+++ /dev/null
@@ -1,143 +0,0 @@
-'use strict';
-angular.module("ngLocale", [], ["$provide", function($provide) {
-var PLURAL_CATEGORY = {ZERO: "zero", ONE: "one", TWO: "two", FEW: "few", MANY:
"many", OTHER: "other"};
-function getDecimals(n) {
- n = n + '';
- var i = n.indexOf('.');
- r
[02/53] [partial] struts git commit: WW-4316 Moves archetypes into its own repo
http://git-wip-us.apache.org/repos/asf/struts/blob/7a350b02/archetypes/struts2-archetype-angularjs/src/main/resources/archetype-resources/src/main/webapp/js/lib/angular/i18n/angular-locale_yi-001.js
--
diff --git
a/archetypes/struts2-archetype-angularjs/src/main/resources/archetype-resources/src/main/webapp/js/lib/angular/i18n/angular-locale_yi-001.js
b/archetypes/struts2-archetype-angularjs/src/main/resources/archetype-resources/src/main/webapp/js/lib/angular/i18n/angular-locale_yi-001.js
deleted file mode 100644
index 8698143..000
---
a/archetypes/struts2-archetype-angularjs/src/main/resources/archetype-resources/src/main/webapp/js/lib/angular/i18n/angular-locale_yi-001.js
+++ /dev/null
@@ -1,143 +0,0 @@
-'use strict';
-angular.module("ngLocale", [], ["$provide", function($provide) {
-var PLURAL_CATEGORY = {ZERO: "zero", ONE: "one", TWO: "two", FEW: "few", MANY:
"many", OTHER: "other"};
-function getDecimals(n) {
- n = n + '';
- var i = n.indexOf('.');
- return (i == -1) ? 0 : n.length - i - 1;
-}
-
-function getVF(n, opt_precision) {
- var v = opt_precision;
-
- if (undefined === v) {
-v = Math.min(getDecimals(n), 3);
- }
-
- var base = Math.pow(10, v);
- var f = ((n * base) | 0) % base;
- return {v: v, f: f};
-}
-
-$provide.value("$locale", {
- "DATETIME_FORMATS": {
-"AMPMS": [
- "\u05e4\u05d0\u05e8\u05de\u05d9\u05d8\u05d0\u05d2",
- "\u05e0\u05d0\u05db\u05de\u05d9\u05d8\u05d0\u05d2"
-],
-"DAY": [
- "\u05d6\u05d5\u05e0\u05d8\u05d9\u05e7",
- "\u05de\u05d0\u05b8\u05e0\u05d8\u05d9\u05e7",
- "\u05d3\u05d9\u05e0\u05e1\u05d8\u05d9\u05e7",
- "\u05de\u05d9\u05d8\u05d5\u05d5\u05d0\u05da",
- "\u05d3\u05d0\u05e0\u05e2\u05e8\u05e9\u05d8\u05d9\u05e7",
- "\u05e4\u05bf\u05e8\u05f2\u05b7\u05d8\u05d9\u05e7",
- "\u05e9\u05d1\u05ea"
-],
-"ERANAMES": [
- "BCE",
- "CE"
-],
-"ERAS": [
- "BCE",
- "CE"
-],
-"FIRSTDAYOFWEEK": 0,
-"MONTH": [
- "\u05d9\u05d0\u05b7\u05e0\u05d5\u05d0\u05b7\u05e8",
- "\u05e4\u05bf\u05e2\u05d1\u05e8\u05d5\u05d0\u05b7\u05e8",
- "\u05de\u05e2\u05e8\u05e5",
- "\u05d0\u05b7\u05e4\u05bc\u05e8\u05d9\u05dc",
- "\u05de\u05d9\u05d9",
- "\u05d9\u05d5\u05e0\u05d9",
- "\u05d9\u05d5\u05dc\u05d9",
- "\u05d0\u05d5\u05d9\u05d2\u05d5\u05e1\u05d8",
- "\u05e1\u05e2\u05e4\u05bc\u05d8\u05e2\u05de\u05d1\u05e2\u05e8",
- "\u05d0\u05e7\u05d8\u05d0\u05d1\u05e2\u05e8",
- "\u05e0\u05d0\u05d5\u05d5\u05e2\u05de\u05d1\u05e2\u05e8",
- "\u05d3\u05e2\u05e6\u05e2\u05de\u05d1\u05e2\u05e8"
-],
-"SHORTDAY": [
- "\u05d6\u05d5\u05e0\u05d8\u05d9\u05e7",
- "\u05de\u05d0\u05b8\u05e0\u05d8\u05d9\u05e7",
- "\u05d3\u05d9\u05e0\u05e1\u05d8\u05d9\u05e7",
- "\u05de\u05d9\u05d8\u05d5\u05d5\u05d0\u05da",
- "\u05d3\u05d0\u05e0\u05e2\u05e8\u05e9\u05d8\u05d9\u05e7",
- "\u05e4\u05bf\u05e8\u05f2\u05b7\u05d8\u05d9\u05e7",
- "\u05e9\u05d1\u05ea"
-],
-"SHORTMONTH": [
- "\u05d9\u05d0\u05b7\u05e0\u05d5\u05d0\u05b7\u05e8",
- "\u05e4\u05bf\u05e2\u05d1\u05e8\u05d5\u05d0\u05b7\u05e8",
- "\u05de\u05e2\u05e8\u05e5",
- "\u05d0\u05b7\u05e4\u05bc\u05e8\u05d9\u05dc",
- "\u05de\u05d9\u05d9",
- "\u05d9\u05d5\u05e0\u05d9",
- "\u05d9\u05d5\u05dc\u05d9",
- "\u05d0\u05d5\u05d9\u05d2\u05d5\u05e1\u05d8",
- "\u05e1\u05e2\u05e4\u05bc\u05d8\u05e2\u05de\u05d1\u05e2\u05e8",
- "\u05d0\u05e7\u05d8\u05d0\u05d1\u05e2\u05e8",
- "\u05e0\u05d0\u05d5\u05d5\u05e2\u05de\u05d1\u05e2\u05e8",
- "\u05d3\u05e2\u05e6\u05e2\u05de\u05d1\u05e2\u05e8"
-],
-"STANDALONEMONTH": [
- "\u05d9\u05d0\u05b7\u05e0\u05d5\u05d0\u05b7\u05e8",
- "\u05e4\u05bf\u05e2\u05d1\u05e8\u05d5\u05d0\u05b7\u05e8",
- "\u05de\u05e2\u05e8\u05e5",
- "\u05d0\u05b7\u05e4\u05bc\u05e8\u05d9\u05dc",
- "\u05de\u05d9\u05d9",
- "\u05d9\u05d5\u05e0\u05d9",
- "\u05d9\u05d5\u05dc\u05d9",
- "\u05d0\u05d5\u05d9\u05d2\u05d5\u05e1\u05d8",
- "\u05e1\u05e2\u05e4\u05bc\u05d8\u05e2\u05de\u05d1\u05e2\u05e8",
- "\u05d0\u05e7\u05d8\u05d0\u05d1\u05e2\u05e8",
- "\u05e0\u05d0\u05d5\u05d5\u05e2\u05de\u05d1\u05e2\u05e8",
- "\u05d3\u05e2\u05e6\u05e2\u05de\u05d1\u05e2\u05e8"
-],
-"WEEKENDRANGE": [
- 5,
- 6
-],
-"fullDate": ", d\u05d8\u05df y",
-"longDate": "d\u05d8\u05df y",
-"medium": "d\u05d8\u05df MMM y HH:mm:ss",
-"mediumDate": "d\u05d8\u05df MMM y",
-"mediumTime": "HH:mm:ss",
-"short": "dd/MM/yy HH:mm",
-"shortDate": "dd/MM/yy",
-"shortTime": "HH:mm"
- },
- "NUMBER_FORMATS": {
-"CURRENCY_SYM": "$",
-"DECIMAL_SEP": ".",
-"GROUP_SEP": ",",
-"PATTERNS": [
- {
-"gSize": 3,
-"lgSize": 3,
-"maxFrac": 3,
-"minFrac": 0,
-"minInt": 1,
-"negPre": "-",
-"negSuf": "",
-"posPre": "",
-
[37/53] [partial] struts git commit: WW-4316 Moves archetypes into its own repo
http://git-wip-us.apache.org/repos/asf/struts/blob/7a350b02/archetypes/struts2-archetype-angularjs/src/main/resources/archetype-resources/src/main/webapp/js/lib/angular/angular.min.js
--
diff --git
a/archetypes/struts2-archetype-angularjs/src/main/resources/archetype-resources/src/main/webapp/js/lib/angular/angular.min.js
b/archetypes/struts2-archetype-angularjs/src/main/resources/archetype-resources/src/main/webapp/js/lib/angular/angular.min.js
deleted file mode 100644
index dcb1a13..000
---
a/archetypes/struts2-archetype-angularjs/src/main/resources/archetype-resources/src/main/webapp/js/lib/angular/angular.min.js
+++ /dev/null
@@ -1,307 +0,0 @@
-/*
- AngularJS v1.5.0
- (c) 2010-2016 Google, Inc. http://angularjs.org
- License: MIT
-*/
-(function(O,W,v){'use strict';function H(a){return function(){var
b=arguments[0],d;d="["+(a?a+":":"")+b+"]
http://errors.angularjs.org/1.5.0/"+(a?a+"/":"")+b;for(b=1;b").append(a).html();try{return
a[0].nodeType===Pa?G(d):d.match(/^(<[^>]+>)/)[1].replace(/^<([\w\-]+)/,function(a,b){return"<"+G(b)})}catch(c){return
G(d)}}function yc(a){try{return decodeURIComponent(a)}catch(b){}}function
zc(a){var b=
-{};n((a||"").split("&"),function(a){var
c,e,f;a&&(e=a=a.replace(/\+/g,"%20"),c=a.indexOf("="),-1!==c&&(e=a.substring(0,c),f=a.substring(c+1)),e=yc(e),y(e)&&(f=y(f)?yc(f):!0,sa.call(b,e)?L(b[e])?b[e].push(f):b[e]=[b[e],f]:b[e]=f))});return
b}function Ub(a){var
b=[];n(a,function(a,c){L(a)?n(a,function(a){b.push(ha(c,!0)+(!0===a?"":"="+ha(a,!0)))}):b.push(ha(c,!0)+(!0===a?"":"="+ha(a,!0)))});return
b.length?b.join("&"):""}function qb(a){return
ha(a,!0).replace(/%26/gi,"&").replace(/%3D/gi,"=").replace(/%2B/gi,
-"+")}function ha(a,b){return
encodeURIComponent(a).replace(/%40/gi,"@").replace(/%3A/gi,":").replace(/%24/g,"$").replace(/%2C/gi,",").replace(/%3B/gi,";").replace(/%20/g,b?"%20":"+")}function
ee(a,b){var
d,c,e=Qa.length;for(c=0;c/,">"));}b=b||[];b.unshift(["$provide",function(b){b.value("$rootElement",a)}]);d.debugInfoEnabled&&b.push(["$compileProvider",function(a){a.debugInfoEnabled(!0)}]);b.unshift("ng");c=fb(b,d.strictDi);c.invoke(["$rootScope","$rootElement",
-"$compile","$injector",function(a,b,c,d){a.$apply(function(){b.data("$injector",d);c(b)(a)})}]);return
c},e=/^NG_ENABLE_DEBUG_INFO!/,f=/^NG_DEFER_BOOTSTRAP!/;O&&e.test(O.name)&&(d.debugInfoEnabled=!0,O.name=O.name.replace(e,""));if(O&&!f.test(O.name))return
c();O.name=O.name.replace(f,"");ia.resumeBootstrap=function(a){n(a,function(a){b.push(a)});return
c()};D(ia.resumeDeferredBootstrap)&&ia.resumeDeferredBootstrap()}function
ge(){O.name="NG_ENABLE_DEBUG_INFO!"+O.name;O.location.reload()}function he(a){a=
-ia.element(a).injector();if(!a)throw Da("test");return
a.get("$$testability")}function Bc(a,b){b=b||"_";return
a.replace(ie,function(a,c){return(c?b:"")+a.toLowerCase()})}function je(){var
a;if(!Cc){var
b=rb();(ua=x(b)?O.jQuery:b?O[b]:v)&&ua.fn.on?(C=ua,T(ua.fn,{scope:Ra.scope,isolateScope:Ra.isolateScope,controller:Ra.controller,injector:Ra.injector,inheritedData:Ra.inheritedData}),a=ua.cleanData,ua.cleanData=function(b){for(var
c,e=0,f;null!=(f=b[e]);e++)(c=ua._data(f,"events"))&&c.$destroy&&ua(f).triggerHandler("$destroy");
-a(b)}):C=U;ia.element=C;Cc=!0}}function sb(a,b,d){if(!a)throw
Da("areq",b||"?",d||"required");return a}function
Sa(a,b,d){d&&L(a)&&(a=a[a.length-1]);sb(D(a),b,"not a function, got
"+(a&&"object"===typeof a?a.constructor.name||"Object":typeof a));return
a}function Ta(a,b){if("hasOwnProperty"===a)throw Da("badname",b);}function
Dc(a,b,d){if(!b)return a;b=b.split(".");for(var
c,e=a,f=b.length,g=0;g")+c[2];for(c=c[0];c--;)d=d.lastChild;f=db(f,d.childNodes);d=e.firstChild;d.textContent=""}else
f.push(b.createTextNode(a));e.textContent="";e.innerHTML="";n(f,function(a){e.appendChild(a)});return
e}function Oc(a,
-b){var d=a.parentNode;d&&d.replaceChild(b,a);b.appendChild(a)}function
U(a){if(a instanceof U)return a;var b;F(a)&&(a=X(a),b=!0);if(!(this instanceof
U)){if(b&&"<"!=a.charAt(0))throw Xb("nosel");return new U(a)}if(b){b=W;var
d;a=(d=Nf.exec(a))?[b.createElement(d[1])]:(d=Nc(a,b))?d.childNodes:[]}Pc(this,a)}function
Yb(a){return a.cloneNode(!0)}function
wb(a,b){b||hb(a);if(a.querySelectorAll)for(var
d=a.querySelectorAll("*"),c=0,e=d.length;c=xa?!1:"function"===typeof
a&&/^(?:class\s|constructor\()/.test(Function.prototype.toString.call(a));return
d?(c.unshift(null),new
(Function.prototype.bind.apply(a,c))):a.apply(b,c)},instantiate:function(a,b,c){var
d=L(a)?a[a.length-1]:a;a=e(a,b,c);a.unshift(null);return new
(Function.prototype.bind.apply(d,a))},get:d,annotate:fb.$$annotate,has:function(b){return
r.hasOwnProperty(b+
-"Provider")||a.hasOwnProperty(b)}}}b=!0===b;var k={},l=[],m=new
Ua([],!0),r={$provide:{provider:d(c),factory:d(f),service:d(function(a,b){return
f(a,["$injector",function(a){return
a.instantiate(b)}])}),value:d(function(a,b){return
f(a,ba(b),!1)}
[16/53] [partial] struts git commit: WW-4316 Moves archetypes into its own repo
http://git-wip-us.apache.org/repos/asf/struts/blob/7a350b02/archetypes/struts2-archetype-angularjs/src/main/resources/archetype-resources/src/main/webapp/js/lib/angular/i18n/angular-locale_ks-arab-in.js
--
diff --git
a/archetypes/struts2-archetype-angularjs/src/main/resources/archetype-resources/src/main/webapp/js/lib/angular/i18n/angular-locale_ks-arab-in.js
b/archetypes/struts2-archetype-angularjs/src/main/resources/archetype-resources/src/main/webapp/js/lib/angular/i18n/angular-locale_ks-arab-in.js
deleted file mode 100644
index 0ab04e6..000
---
a/archetypes/struts2-archetype-angularjs/src/main/resources/archetype-resources/src/main/webapp/js/lib/angular/i18n/angular-locale_ks-arab-in.js
+++ /dev/null
@@ -1,143 +0,0 @@
-'use strict';
-angular.module("ngLocale", [], ["$provide", function($provide) {
-var PLURAL_CATEGORY = {ZERO: "zero", ONE: "one", TWO: "two", FEW: "few", MANY:
"many", OTHER: "other"};
-function getDecimals(n) {
- n = n + '';
- var i = n.indexOf('.');
- return (i == -1) ? 0 : n.length - i - 1;
-}
-
-function getVF(n, opt_precision) {
- var v = opt_precision;
-
- if (undefined === v) {
-v = Math.min(getDecimals(n), 3);
- }
-
- var base = Math.pow(10, v);
- var f = ((n * base) | 0) % base;
- return {v: v, f: f};
-}
-
-$provide.value("$locale", {
- "DATETIME_FORMATS": {
-"AMPMS": [
- "AM",
- "PM"
-],
-"DAY": [
- "\u0627\u064e\u062a\u06be\u0648\u0627\u0631",
- "\u0698\u0654\u0646\u065b\u062f\u0631\u0655\u0631\u0648\u0627\u0631",
- "\u0628\u0648\u065a\u0645\u0648\u0627\u0631",
- "\u0628\u0648\u062f\u0648\u0627\u0631",
- "\u0628\u0631\u065b\u066e\u06ea\u0633\u0648\u0627\u0631",
- "\u062c\u064f\u0645\u06c1",
- "\u0628\u0679\u0648\u0627\u0631"
-],
-"ERANAMES": [
- "\u0642\u0628\u0655\u0644 \u0645\u0633\u06cc\u0656\u062d",
- "\u0639\u06cc\u0656\u0633\u0648\u06cc \u0633\u0646\u06c1\u0655"
-],
-"ERAS": [
- "\u0628\u06cc \u0633\u06cc",
- "\u0627\u06d2 \u0688\u06cc"
-],
-"FIRSTDAYOFWEEK": 6,
-"MONTH": [
- "\u062c\u0646\u0624\u0631\u06cc",
- "\u0641\u0631\u0624\u0631\u06cc",
- "\u0645\u0627\u0631\u0655\u0686",
- "\u0627\u067e\u0631\u06cc\u0644",
- "\u0645\u06cc\u0654",
- "\u062c\u0648\u0657\u0646",
- "\u062c\u0648\u0657\u0644\u0627\u06cc\u06cc",
- "\u0627\u06af\u0633\u062a",
- "\u0633\u062a\u0645\u0628\u0631",
- "\u0627\u06a9\u062a\u0648\u0657\u0628\u0631",
- "\u0646\u0648\u0645\u0628\u0631",
- "\u062f\u0633\u0645\u0628\u0631"
-],
-"SHORTDAY": [
- "\u0622\u062a\u06be\u0648\u0627\u0631",
- "\u0698\u0654\u0646\u065b\u062f\u0655\u0631\u0648\u0627\u0631",
- "\u0628\u0648\u065a\u0645\u0648\u0627\u0631",
- "\u0628\u0648\u062f\u0648\u0627\u0631",
- "\u0628\u0631\u065b\u066e\u06ea\u0633\u0648\u0627\u0631",
- "\u062c\u064f\u0645\u06c1",
- "\u0628\u0679\u0648\u0627\u0631"
-],
-"SHORTMONTH": [
- "\u062c\u0646\u0624\u0631\u06cc",
- "\u0641\u0631\u0624\u0631\u06cc",
- "\u0645\u0627\u0631\u0655\u0686",
- "\u0627\u067e\u0631\u06cc\u0644",
- "\u0645\u06cc\u0654",
- "\u062c\u0648\u0657\u0646",
- "\u062c\u0648\u0657\u0644\u0627\u06cc\u06cc",
- "\u0627\u06af\u0633\u062a",
- "\u0633\u062a\u0645\u0628\u0631",
- "\u0627\u06a9\u062a\u0648\u0657\u0628\u0631",
- "\u0646\u0648\u0645\u0628\u0631",
- "\u062f\u0633\u0645\u0628\u0631"
-],
-"STANDALONEMONTH": [
- "\u062c\u0646\u0624\u0631\u06cc",
- "\u0641\u0631\u0624\u0631\u06cc",
- "\u0645\u0627\u0631\u0655\u0686",
- "\u0627\u067e\u0631\u06cc\u0644",
- "\u0645\u06cc\u0654",
- "\u062c\u0648\u0657\u0646",
- "\u062c\u0648\u0657\u0644\u0627\u06cc\u06cc",
- "\u0627\u06af\u0633\u062a",
- "\u0633\u062a\u0645\u0628\u0631",
- "\u0627\u06a9\u062a\u0648\u0657\u0628\u0631",
- "\u0646\u0648\u0645\u0628\u0631",
- "\u062f\u0633\u0645\u0628\u0631"
-],
-"WEEKENDRANGE": [
- 6,
- 6
-],
-"fullDate": ", d, y",
-"longDate": " d, y",
-"medium": "MMM d, y h:mm:ss a",
-"mediumDate": "MMM d, y",
-"mediumTime": "h:mm:ss a",
-"short": "M/d/yy h:mm a",
-"shortDate": "M/d/yy",
-"shortTime": "h:mm a"
- },
- "NUMBER_FORMATS": {
-"CURRENCY_SYM": "\u20b9",
-"DECIMAL_SEP": "\u066b",
-"GROUP_SEP": "\u066c",
-"PATTERNS": [
- {
-"gSize": 2,
-"lgSize": 3,
-"maxFrac": 3,
-"minFrac": 0,
-"minInt": 1,
-"negPre": "-",
-"negSuf": "",
-"posPre": "",
-"posSuf": ""
- },
- {
-"gSize": 2,
-"lgSize": 3,
-"maxFrac": 2,
-"minFrac": 2,
-"minInt": 1,
-"negPre": "-\u00a4\u00a0",
-"negSuf": "",
-"posPre": "\u00a4\u00a0",
-"posSuf": ""
- }
-]
- },
- "id": "ks
[53/53] struts git commit: Updates assemblies
Updates assemblies Project: http://git-wip-us.apache.org/repos/asf/struts/repo Commit: http://git-wip-us.apache.org/repos/asf/struts/commit/889e6db5 Tree: http://git-wip-us.apache.org/repos/asf/struts/tree/889e6db5 Diff: http://git-wip-us.apache.org/repos/asf/struts/diff/889e6db5 Branch: refs/heads/master Commit: 889e6db56203cbb642bc6ad3a927dbc46f8cf594 Parents: d948a85 Author: Lukasz Lenart Authored: Thu Jul 14 20:14:11 2016 +0200 Committer: Lukasz Lenart Committed: Thu Jul 14 20:14:11 2016 +0200 -- assembly/src/main/assembly/all.xml | 29 - assembly/src/main/assembly/apps.xml| 7 --- assembly/src/main/assembly/lib.xml | 7 --- assembly/src/main/assembly/min-lib.xml | 7 +-- assembly/src/main/assembly/src.xml | 16 5 files changed, 5 insertions(+), 61 deletions(-) -- http://git-wip-us.apache.org/repos/asf/struts/blob/889e6db5/assembly/src/main/assembly/all.xml -- diff --git a/assembly/src/main/assembly/all.xml b/assembly/src/main/assembly/all.xml index ef9e682..8a05030 100644 --- a/assembly/src/main/assembly/all.xml +++ b/assembly/src/main/assembly/all.xml @@ -80,13 +80,6 @@ - ../plugins/struts1/src/main/resources - - -ANTLR-LICENSE.txt - - - ../plugins/oval/src/main/resources @@ -102,12 +95,6 @@ - - - ../xwork-core/target/apidocs - docs/xwork-apidocs - - ../core/target/site @@ -257,14 +244,6 @@ - ../apps/portlet - src/apps/portlet - -pom.xml -src/ - - - ../apps/showcase src/apps/showcase @@ -297,14 +276,6 @@ - ../xwork-core - src/xwork-core - -pom.xml -src/ - - - ../plugins src/plugins http://git-wip-us.apache.org/repos/asf/struts/blob/889e6db5/assembly/src/main/assembly/apps.xml -- diff --git a/assembly/src/main/assembly/apps.xml b/assembly/src/main/assembly/apps.xml index 0e09196..37ec61a 100644 --- a/assembly/src/main/assembly/apps.xml +++ b/assembly/src/main/assembly/apps.xml @@ -75,12 +75,5 @@ SITEMESH-LICENSE.txt - - ../plugins/struts1/src/main/resources - - -ANTLR-LICENSE.txt - - http://git-wip-us.apache.org/repos/asf/struts/blob/889e6db5/assembly/src/main/assembly/lib.xml -- diff --git a/assembly/src/main/assembly/lib.xml b/assembly/src/main/assembly/lib.xml index a19e2ab..7aa42dd 100644 --- a/assembly/src/main/assembly/lib.xml +++ b/assembly/src/main/assembly/lib.xml @@ -80,13 +80,6 @@ - ../plugins/struts1/src/main/resources - - -ANTLR-LICENSE.txt - - - ../plugins/oval/src/main/resources http://git-wip-us.apache.org/repos/asf/struts/blob/889e6db5/assembly/src/main/assembly/min-lib.xml -- diff --git a/assembly/src/main/assembly/min-lib.xml b/assembly/src/main/assembly/min-lib.xml index ec1417d..10a18ff 100644 --- a/assembly/src/main/assembly/min-lib.xml +++ b/assembly/src/main/assembly/min-lib.xml @@ -38,11 +38,14 @@ org.apache.struts:struts2-core org.freemarker:freemarker org.apache.commons:commons-lang3 +org.apache.logging.log4j:log4j-api ognl:ognl -javassist:javassist +org.ow2.asm:asm +org.ow2.asm:asm-tree +org.ow2.asm:asm-commons +org.javassist:javassist commons-fileupload:commons-fileupload commons-io:commons-io -commons-logging:commons-logging http://git-wip-us.apache.org/repos/asf/struts/blob/889e6db5/assembly/src/main/assembly/src.xml -- diff --git a/assembly/src/main/assembly/src.xml b/assembly/src/main/assembly/src.xml index e36840c..c520129 100644 --- a/assembly/src/main/assembly/src.xml +++ b/assembly/src/main/assembly/src.xml @@ -67,14 +67,6 @@ -../apps/portlet -src/apps/portlet - - pom.xml - src/ - - - ../apps/showcase src/apps/showcase @@ -107,14 +99,6 @@ -../xwork-core -src/xwork-core - - pom.xml - src/ - - - ../plugins src/plugins
[50/53] [partial] struts git commit: WW-4316 Moves archetypes into its own repo
http://git-wip-us.apache.org/repos/asf/struts/blob/7a350b02/archetypes/struts2-archetype-angularjs/src/main/resources/archetype-resources/src/main/java/actions/data/ProjectsAction.java
--
diff --git
a/archetypes/struts2-archetype-angularjs/src/main/resources/archetype-resources/src/main/java/actions/data/ProjectsAction.java
b/archetypes/struts2-archetype-angularjs/src/main/resources/archetype-resources/src/main/java/actions/data/ProjectsAction.java
deleted file mode 100644
index 996d089..000
---
a/archetypes/struts2-archetype-angularjs/src/main/resources/archetype-resources/src/main/java/actions/data/ProjectsAction.java
+++ /dev/null
@@ -1,72 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-package ${package}.actions.data;
-
-import com.opensymphony.xwork2.ActionSupport;
-import org.apache.struts2.convention.annotation.Result;
-
-import org.apache.logging.log4j.LogManager;
-import org.apache.logging.log4j.Logger;
-
-import java.util.ArrayList;
-import java.util.List;
-
-/**
- * List Apache projects.
- */
-@Result(type = "json")
-public class ProjectsAction extends ActionSupport {
-
-private static final long serialVersionUID = 9037336532369476225L;
-private static final Logger log =
LogManager.getLogger(ProjectsAction.class);
-
-private List projectNames;
-
-public String execute() throws Exception {
-
-projectNames = new ArrayList();
-projectNames.add("Apache Struts");
-projectNames.add("Apache Log4j");
-projectNames.add("Apache Tomcat");
-projectNames.add("Apache Maven");
-projectNames.add("Apache Ant");
-projectNames.add("Apache Log4Net");
-projectNames.add("Apache Log4Cxx");
-projectNames.add("Apache Chainsaw");
-projectNames.add("Apache Incubator");
-projectNames.add("Apache Hadoop");
-projectNames.add("Apache OpenOffice");
-projectNames.add("Apache Mahout");
-projectNames.add("Apache Tapestry");
-projectNames.add("Apache Jena");
-projectNames.add("Apache Solr");
-projectNames.add("Apache Cayenne");
-projectNames.add("Apache OpenEJB");
-projectNames.add("Apache Deltaspike");
-projectNames.add("Apache Cordova");
-
-log.debug("Return {} Apache projects", projectNames.size());
-
-return SUCCESS;
-}
-
-public List getProjectNames() {
-return projectNames;
-}
-}
http://git-wip-us.apache.org/repos/asf/struts/blob/7a350b02/archetypes/struts2-archetype-angularjs/src/main/resources/archetype-resources/src/main/java/actions/data/package-info.java
--
diff --git
a/archetypes/struts2-archetype-angularjs/src/main/resources/archetype-resources/src/main/java/actions/data/package-info.java
b/archetypes/struts2-archetype-angularjs/src/main/resources/archetype-resources/src/main/java/actions/data/package-info.java
deleted file mode 100644
index 3e4af32..000
---
a/archetypes/struts2-archetype-angularjs/src/main/resources/archetype-resources/src/main/java/actions/data/package-info.java
+++ /dev/null
@@ -1,24 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-@ParentPackage("data")
-@Namespace("/data")
-package ${package}.actions.data;
-
-import org.apache.struts2.convention.annotation.Namespace;
-import org.apache.struts2.con
[45/53] [partial] struts git commit: WW-4316 Moves archetypes into its own repo
http://git-wip-us.apache.org/repos/asf/struts/blob/7a350b02/archetypes/struts2-archetype-angularjs/src/main/resources/archetype-resources/src/main/webapp/js/lib/angular/angular-message-format.js
--
diff --git
a/archetypes/struts2-archetype-angularjs/src/main/resources/archetype-resources/src/main/webapp/js/lib/angular/angular-message-format.js
b/archetypes/struts2-archetype-angularjs/src/main/resources/archetype-resources/src/main/webapp/js/lib/angular/angular-message-format.js
deleted file mode 100644
index 0c3c6c1..000
---
a/archetypes/struts2-archetype-angularjs/src/main/resources/archetype-resources/src/main/webapp/js/lib/angular/angular-message-format.js
+++ /dev/null
@@ -1,980 +0,0 @@
-/**
- * @license AngularJS v1.5.0
- * (c) 2010-2016 Google, Inc. http://angularjs.org
- * License: MIT
- */
-(function(window, angular, undefined) {'use strict';
-
-// NOTE: ADVANCED_OPTIMIZATIONS mode.
-//
-// This file is compiled with Closure compiler's ADVANCED_OPTIMIZATIONS flag!
Be wary of using
-// constructs incompatible with that mode.
-
-var $interpolateMinErr = window['angular']['$interpolateMinErr'];
-
-var noop = window['angular']['noop'],
-isFunction = window['angular']['isFunction'],
-toJson = window['angular']['toJson'];
-
-function stringify(value) {
- if (value == null /* null/undefined */) { return ''; }
- switch (typeof value) {
-case 'string': return value;
-case 'number': return '' + value;
-default: return toJson(value);
- }
-}
-
-// Convert an index into the string into line/column for use in error messages
-// As such, this doesn't have to be efficient.
-function indexToLineAndColumn(text, index) {
- var lines = text.split(/\n/g);
- for (var i=0; i < lines.length; i++) {
-var line=lines[i];
-if (index >= line.length) {
- index -= line.length;
-} else {
- return { line: i + 1, column: index + 1 };
-}
- }
-}
-var PARSE_CACHE_FOR_TEXT_LITERALS = Object.create(null);
-
-function parseTextLiteral(text) {
- var cachedFn = PARSE_CACHE_FOR_TEXT_LITERALS[text];
- if (cachedFn != null) {
-return cachedFn;
- }
- function parsedFn(context) { return text; }
- parsedFn['$$watchDelegate'] = function watchDelegate(scope, listener,
objectEquality) {
-var unwatch = scope['$watch'](noop,
-function textLiteralWatcher() {
- if (isFunction(listener)) { listener.call(null, text, text, scope); }
- unwatch();
-},
-objectEquality);
-return unwatch;
- };
- PARSE_CACHE_FOR_TEXT_LITERALS[text] = parsedFn;
- parsedFn['exp'] = text; // Needed to pretend to be $interpolate for tests
copied from interpolateSpec.js
- parsedFn['expressions'] = []; // Require this to call
$compile.$$addBindingInfo() which allows Protractor to find elements by binding.
- return parsedFn;
-}
-
-function subtractOffset(expressionFn, offset) {
- if (offset === 0) {
-return expressionFn;
- }
- function minusOffset(value) {
-return (value == void 0) ? value : value - offset;
- }
- function parsedFn(context) { return minusOffset(expressionFn(context)); }
- var unwatch;
- parsedFn['$$watchDelegate'] = function watchDelegate(scope, listener,
objectEquality) {
-unwatch = scope['$watch'](expressionFn,
-function pluralExpressionWatchListener(newValue, oldValue) {
- if (isFunction(listener)) { listener.call(null,
minusOffset(newValue), minusOffset(oldValue), scope); }
-},
-objectEquality);
-return unwatch;
- };
- return parsedFn;
-}
-
-// NOTE: ADVANCED_OPTIMIZATIONS mode.
-//
-// This file is compiled with Closure compiler's ADVANCED_OPTIMIZATIONS flag!
Be wary of using
-// constructs incompatible with that mode.
-
-/* global $interpolateMinErr: false */
-/* global isFunction: false */
-/* global noop: false */
-
-/**
- * @constructor
- * @private
- */
-function MessageSelectorBase(expressionFn, choices) {
- var self = this;
- this.expressionFn = expressionFn;
- this.choices = choices;
- if (choices["other"] === void 0) {
-throw $interpolateMinErr('reqother', 'âotherâ is a required option.');
- }
- this.parsedFn = function(context) { return self.getResult(context); };
- this.parsedFn['$$watchDelegate'] = function $$watchDelegate(scope, listener,
objectEquality) {
-return self.watchDelegate(scope, listener, objectEquality);
- };
- this.parsedFn['exp'] = expressionFn['exp'];
- this.parsedFn['expressions'] = expressionFn['expressions'];
-}
-
-MessageSelectorBase.prototype.getMessageFn = function getMessageFn(value) {
- return this.choices[this.categorizeValue(value)];
-};
-
-MessageSelectorBase.prototype.getResult = function getResult(context) {
- return this.getMessageFn(this.expressionFn(context))(context);
-};
-
-MessageSelectorBase.prototype.watchDelegate = function watchDelegate(scope,
listener, objectEquality) {
- var watchers = new MessageSelectorWatchers(th
[13/53] [partial] struts git commit: WW-4316 Moves archetypes into its own repo
http://git-wip-us.apache.org/repos/asf/struts/blob/7a350b02/archetypes/struts2-archetype-angularjs/src/main/resources/archetype-resources/src/main/webapp/js/lib/angular/i18n/angular-locale_mr.js
--
diff --git
a/archetypes/struts2-archetype-angularjs/src/main/resources/archetype-resources/src/main/webapp/js/lib/angular/i18n/angular-locale_mr.js
b/archetypes/struts2-archetype-angularjs/src/main/resources/archetype-resources/src/main/webapp/js/lib/angular/i18n/angular-locale_mr.js
deleted file mode 100644
index 868b0d0..000
---
a/archetypes/struts2-archetype-angularjs/src/main/resources/archetype-resources/src/main/webapp/js/lib/angular/i18n/angular-locale_mr.js
+++ /dev/null
@@ -1,125 +0,0 @@
-'use strict';
-angular.module("ngLocale", [], ["$provide", function($provide) {
-var PLURAL_CATEGORY = {ZERO: "zero", ONE: "one", TWO: "two", FEW: "few", MANY:
"many", OTHER: "other"};
-$provide.value("$locale", {
- "DATETIME_FORMATS": {
-"AMPMS": [
- "\u092e.\u092a\u0942.",
- "\u092e.\u0909."
-],
-"DAY": [
- "\u0930\u0935\u093f\u0935\u093e\u0930",
- "\u0938\u094b\u092e\u0935\u093e\u0930",
- "\u092e\u0902\u0917\u0933\u0935\u093e\u0930",
- "\u092c\u0941\u0927\u0935\u093e\u0930",
- "\u0917\u0941\u0930\u0941\u0935\u093e\u0930",
- "\u0936\u0941\u0915\u094d\u0930\u0935\u093e\u0930",
- "\u0936\u0928\u093f\u0935\u093e\u0930"
-],
-"ERANAMES": [
- "\u0908\u0938\u0935\u0940\u0938\u0928\u092a\u0942\u0930\u094d\u0935",
- "\u0908\u0938\u0935\u0940\u0938\u0928"
-],
-"ERAS": [
- "\u0907. \u0938. \u092a\u0942.",
- "\u0907. \u0938."
-],
-"FIRSTDAYOFWEEK": 6,
-"MONTH": [
- "\u091c\u093e\u0928\u0947\u0935\u093e\u0930\u0940",
- "\u092b\u0947\u092c\u094d\u0930\u0941\u0935\u093e\u0930\u0940",
- "\u092e\u093e\u0930\u094d\u091a",
- "\u090f\u092a\u094d\u0930\u093f\u0932",
- "\u092e\u0947",
- "\u091c\u0942\u0928",
- "\u091c\u0941\u0932\u0948",
- "\u0911\u0917\u0938\u094d\u091f",
- "\u0938\u092a\u094d\u091f\u0947\u0902\u092c\u0930",
- "\u0911\u0915\u094d\u091f\u094b\u092c\u0930",
- "\u0928\u094b\u0935\u094d\u0939\u0947\u0902\u092c\u0930",
- "\u0921\u093f\u0938\u0947\u0902\u092c\u0930"
-],
-"SHORTDAY": [
- "\u0930\u0935\u093f",
- "\u0938\u094b\u092e",
- "\u092e\u0902\u0917\u0933",
- "\u092c\u0941\u0927",
- "\u0917\u0941\u0930\u0941",
- "\u0936\u0941\u0915\u094d\u0930",
- "\u0936\u0928\u093f"
-],
-"SHORTMONTH": [
- "\u091c\u093e\u0928\u0947",
- "\u092b\u0947\u092c\u094d\u0930\u0941",
- "\u092e\u093e\u0930\u094d\u091a",
- "\u090f\u092a\u094d\u0930\u093f",
- "\u092e\u0947",
- "\u091c\u0942\u0928",
- "\u091c\u0941\u0932\u0948",
- "\u0911\u0917",
- "\u0938\u092a\u094d\u091f\u0947\u0902",
- "\u0911\u0915\u094d\u091f\u094b",
- "\u0928\u094b\u0935\u094d\u0939\u0947\u0902",
- "\u0921\u093f\u0938\u0947\u0902"
-],
-"STANDALONEMONTH": [
- "\u091c\u093e\u0928\u0947\u0935\u093e\u0930\u0940",
- "\u092b\u0947\u092c\u094d\u0930\u0941\u0935\u093e\u0930\u0940",
- "\u092e\u093e\u0930\u094d\u091a",
- "\u090f\u092a\u094d\u0930\u093f\u0932",
- "\u092e\u0947",
- "\u091c\u0942\u0928",
- "\u091c\u0941\u0932\u0948",
- "\u0911\u0917\u0938\u094d\u091f",
- "\u0938\u092a\u094d\u091f\u0947\u0902\u092c\u0930",
- "\u0911\u0915\u094d\u091f\u094b\u092c\u0930",
- "\u0928\u094b\u0935\u094d\u0939\u0947\u0902\u092c\u0930",
- "\u0921\u093f\u0938\u0947\u0902\u092c\u0930"
-],
-"WEEKENDRANGE": [
- 6,
- 6
-],
-"fullDate": ", d , y",
-"longDate": "d , y",
-"medium": "d MMM, y h:mm:ss a",
-"mediumDate": "d MMM, y",
-"mediumTime": "h:mm:ss a",
-"short": "d/M/yy h:mm a",
-"shortDate": "d/M/yy",
-"shortTime": "h:mm a"
- },
- "NUMBER_FORMATS": {
-"CURRENCY_SYM": "\u20b9",
-"DECIMAL_SEP": ".",
-"GROUP_SEP": ",",
-"PATTERNS": [
- {
-"gSize": 2,
-"lgSize": 3,
-"maxFrac": 3,
-"minFrac": 0,
-"minInt": 1,
-"negPre": "-",
-"negSuf": "",
-"posPre": "",
-"posSuf": ""
- },
- {
-"gSize": 3,
-"lgSize": 3,
-"maxFrac": 2,
-"minFrac": 2,
-"minInt": 1,
-"negPre": "-\u00a4",
-"negSuf": "",
-"posPre": "\u00a4",
-"posSuf": ""
- }
-]
- },
- "id": "mr",
- "localeID": "mr",
- "pluralCat": function(n, opt_precision) { var i = n | 0; if (i == 0 || n
== 1) {return PLURAL_CATEGORY.ONE; } return PLURAL_CATEGORY.OTHER;}
-});
-}]);
http://git-wip-us.apache.org/repos/asf/struts/blob/7a350b02/archetypes/struts2-archetype-angularjs/src/main/resources/archetype-resources/src/main/webapp/js/lib/angular/i18n/angular-locale_ms-latn-bn.js
---
[47/53] [partial] struts git commit: WW-4316 Moves archetypes into its own repo
http://git-wip-us.apache.org/repos/asf/struts/blob/7a350b02/archetypes/struts2-archetype-angularjs/src/main/resources/archetype-resources/src/main/webapp/js/lib/angular/angular-animate.min.js.map
--
diff --git
a/archetypes/struts2-archetype-angularjs/src/main/resources/archetype-resources/src/main/webapp/js/lib/angular/angular-animate.min.js.map
b/archetypes/struts2-archetype-angularjs/src/main/resources/archetype-resources/src/main/webapp/js/lib/angular/angular-animate.min.js.map
deleted file mode 100644
index 1d4f7a6..000
---
a/archetypes/struts2-archetype-angularjs/src/main/resources/archetype-resources/src/main/webapp/js/lib/angular/angular-animate.min.js.map
+++ /dev/null
@@ -1,8 +0,0 @@
-{
-"version":3,
-"file":"angular-animate.min.js",
-"lineCount":55,
-"mappings":"A;aAKC,SAAQ,CAACA,CAAD,CAASC,CAAT,CAAkBC,EAAlB,CAA6B,CA4EtCC,QAASA,GAAS,CAACC,CAAD,CAAMC,CAAN,CAAYC,CAAZ,CAAoB,CACpC,GAAKF,C,CAAL,CACE,KAAMG,GAAA,CAAS,MAAT,CAA2CF,CAA3C,EAAmD,GAAnD,CAA0DC,CAA1D,EAAoE,UAApE,CAAN,CAEF,MAAOF,EAJ6B,CAOtCI,QAASA,GAAY,CAACC,CAAD,CAAGC,CAAH,CAAM,CACzB,GAAKD,C,CAAL,EAAWC,C,CAAX,CAAc,MAAO,EACrB,IAAKD,C,CAAL,CAAQ,MAAOC,EACf,IAAKA,C,CAAL,CAAQ,MAAOD,EACXE,GAAA,CAAQF,CAAR,CAAJ,GAAgBA,CAAhB,CAAoBA,CAAAG,KAAA,CAAO,GAAP,CAApB,CACID,GAAA,CAAQD,CAAR,CAAJ,GAAgBA,CAAhB,CAAoBA,CAAAE,KAAA,CAAO,GAAP,CAApB,CACA,OAAOH,EAAP,CAAW,GAAX,CAAiBC,CANQ,CAS3BG,QAASA,GAAa,CAACC,CAAD,CAAU,CAC9B,IAAIC,EAAS,EACTD,EAAJ,GAAgBA,CAAAE,GAAhB,EAA8BF,CAAAG,KAA9B,IACEF,CAAAC,GACA,CADYF,CAAAE,GACZ,CAAAD,CAAAE,KAAA,CAAcH,CAAAG,KAFhB,CAIA,OAAOF,EANuB,CAShCG,QAASA,EAAW,CAACC,CAAD,CAAUC,CAAV,CAAeC,CAAf,CAAyB,CAC3C,IAAIC,EAAY,EAChBH,EAAA,CAAUR,EAAA,CAAQQ,CAAR,CAAA,CACJA,CADI,CAEJA,CAAA,EAAWI,CAAA,CAASJ,CAAT,CAAX,EAAgCA,CAAAK,OAAhC,CACIL,CAAAM,MAAA,CAAc,KAAd,CADJ,CA
EI,EACVC,EAAA,CAAQP,CAAR,CAAiB,QAAQ,CAACQ,CAAD,CAAQC,CAAR,CAAW,CAC9BD,CAAJ,EAA4B,CAA5B,CAAaA,CAAAH,OAAb,GACEF,CACA,EADkB,CAAL,CAACM,CAAD,CAAU,GAAV,CAAgB,EAC7B,CAAAN,CAAA,EAAaD,CAAA,CAAWD,CAAX,CAAiBO,CAAjB,CACWA,CADX,CACmBP,CAHlC,CADkC,CAApC,CAOA,OAAOE,EAdoC,CAwB7CO,QAASA,GAAwB,CAACC,CAAD,CAAU,CACzC,GAAIA,CAAJ,WAAuBC,EAAvB,CACE,OAAQD,CAAAN,OAAR,EACE,KAAK,CAAL,CACE,MAAO,EAGT;KAAK,CAAL,CAIE,GAxHWQ,CAwHX,GAAIF,CAAA,CAAQ,CAAR,CAAAG,SAAJ,CACE,MAAOH,EAET,MAEF,SACE,MAAOC,EAAA,CAAOG,EAAA,CAAmBJ,CAAnB,CAAP,CAfX,CAoBF,GAnIiBE,CAmIjB,GAAIF,CAAAG,SAAJ,CACE,MAAOF,EAAA,CAAOD,CAAP,CAvBgC,CA2B3CI,QAASA,GAAkB,CAACJ,CAAD,CAAU,CACnC,GAAK,C,CAAA,CAAQ,CAAR,CAAL,CAAiB,MAAOA,EACxB,KAAS,IAAAF,EAAI,CAAb,CAAgBA,CAAhB,CAAoBE,CAAAN,OAApB,CAAoCI,CAAA,EAApC,CAAyC,CACvC,IAAIO,EAAML,CAAA,CAAQF,CAAR,CACV,IA5IeI,CA4If,EAAIG,CAAAF,SAAJ,CACE,MAAOE,EAH8B,CAFN,CAUrCC,QAASA,GAAU,CAACC,CAAD,CAAWP,CAAX,CAAoBR,CAApB,CAA+B,CAChDI,CAAA,CAAQI,CAAR,CAAiB,QAAQ,CAACK,CAAD,CAAM,CAC7BE,CAAAC,SAAA,CAAkBH,CAAlB,CAAuBb,CAAvB,CAD6B,
CAA/B,CADgD,CAMlDiB,QAASA,GAAa,CAACF,CAAD,CAAWP,CAAX,CAAoBR,CAApB,CAA+B,CACnDI,CAAA,CAAQI,CAAR,CAAiB,QAAQ,CAACK,CAAD,CAAM,CAC7BE,CAAAG,YAAA,CAAqBL,CAArB,CAA0Bb,CAA1B,CAD6B,CAA/B,CADmD,CAMrDmB,QAASA,EAA4B,CAACJ,CAAD,CAAW,CAC9C,MAAO,SAAQ,CAACP,CAAD,CAAUhB,CAAV,CAAmB,CAC5BA,CAAAwB,SAAJ,GACEF,EAAA,CAAWC,CAAX,CAAqBP,CAArB,CAA8BhB,CAAAwB,SAA9B,CACA,CAAAxB,CAAAwB,SAAA,CAAmB,IAFrB,CAIIxB,EAAA0B,YAAJ,GACED,EAAA,CAAcF,CAAd,CAAwBP,CAAxB,CAAiChB,CAAA0B,YAAjC,CACA,CAAA1B,CAAA0B,YAAA,CAAsB,IAFxB,CALgC,CADY,CAahDE,QAASA,GAAuB,CAAC5B,CAAD,CAAU,CACxCA,CAAA,CAAUA,CAAV,EAAqB,EACrB,IAAK6B,CAAA7B,CAAA6B,WAAL,CAAyB,CACvB,IAAIC,EAAe9B,CAAA8B,aAAfA;AAAuCC,CAC3C/B,EAAA8B,aAAA,CAAuBE,QAAQ,EAAG,CAChChC,CAAAiC,oBAAA,CAA8B,CAAA,CAC9BH,EAAA,EACAA,EAAA,CAAeC,CAHiB,CAKlC/B,EAAA6B,WAAA,CAAqB,CAAA,CAPE,CASzB,MAAO7B,EAXiC,CAc1CkC,QAASA,GAAoB,CAAClB,CAAD,CAAUhB,CAAV,CAAmB,CAC9CmC,EAAA,CAAyBnB,CAAzB,CAAkChB,CAAlC,CACAoC,GAAA,CAAuBpB,CAAvB,CAAgChB,CAAhC,CAF8C,CAKhDmC,QAASA,GAAwB,CAACnB,CAAD,CAAUhB,CAAV,CAAmB,CAC9CA,CAAA
G,KAAJ,GACEa,CAAAqB,IAAA,CAAYrC,CAAAG,KAAZ,CACA,CAAAH,CAAAG,KAAA,CAAe,IAFjB,CADkD,CAOpDiC,QAASA,GAAsB,CAACpB,CAAD,CAAUhB,CAAV,CAAmB,CAC5CA,CAAAE,GAAJ,GACEc,CAAAqB,IAAA,CAAYrC,CAAAE,GAAZ,CACA,CAAAF,CAAAE,GAAA,CAAa,IAFf,CADgD,CAOlDoC,QAASA,EAAqB,CAACtB,CAAD,CAAUuB,CAAV,CAAwBC,CAAxB,CAAsC,CAClE,IAAIC,EAASF,CAAAvC,QAATyC,EAAiC,EACjCC,E,CAAaF,CAAAxC,QAAb0C,EAAqC,EAEzC,KAAIC,GAASF,CAAAjB,SAATmB,EAA4B,EAA5BA,EAAkC,GAAlCA,EAAyCD,CAAAlB,SAAzCmB,EAAgE,EAAhEA,CAAJ,CACIC,GAAYH,CAAAf,YAAZkB,EAAkC,EAAlCA,EAAwC,GAAxCA,EAA+CF,CAAAhB,YAA/CkB,EAAyE,EAAzEA,CACAvC,E,CAAUwC,EAAA,CAAsB7B,CAAA8B,KAAA,CAAa,OAAb,CAAtB,CAA6CH,CAA7C,CAAoDC,CAApD,CAEVF,EAAAK,mBAAJ,GACEN,CAAAM,mBACA,CAD4BC,EAAA,CAAgBN,CAAAK,mBAAhB,CAA+CN,CAAAM,mBAA/C,CAC5B,CAAA,OAAOL,CAAAK,mBAFT,CAMIE;C,CAAmBR,CAAAX,aAAA,GAAwBC,CAAxB,CAA+BU,CAAAX,aAA/B,CAAqD,IAE5EoB,GAAA,CAAOT,CAAP,CAAeC,CAAf,CAGIO,EAAJ,GACER,CAAAX,aADF,CACwBmB,CADxB,CAKER,EAAAjB,SAAA,CADEnB,CAAAmB,SAAJ,CACoBnB,CAAAmB,SADpB,CAGoB,IAIlBiB,EAAAf,YAAA,CADErB,CAAAqB,YAA
J,CACuBrB,CAAAqB,YADvB,CAGuB,IAGvBa,EAAAf,SAAA,CAAwBiB,CAAAjB,SACxBe,EAAAb,YAAA,CAA2Be,CAAAf,YAE3B,OAAOe,EAtC2D,CAyCpEI,QAASA,GAAqB,CAACM,CAAD,CAAWR,CAA
[20/53] [partial] struts git commit: WW-4316 Moves archetypes into its own repo
http://git-wip-us.apache.org/repos/asf/struts/blob/7a350b02/archetypes/struts2-archetype-angularjs/src/main/resources/archetype-resources/src/main/webapp/js/lib/angular/i18n/angular-locale_gd.js
--
diff --git
a/archetypes/struts2-archetype-angularjs/src/main/resources/archetype-resources/src/main/webapp/js/lib/angular/i18n/angular-locale_gd.js
b/archetypes/struts2-archetype-angularjs/src/main/resources/archetype-resources/src/main/webapp/js/lib/angular/i18n/angular-locale_gd.js
deleted file mode 100644
index e44083e..000
---
a/archetypes/struts2-archetype-angularjs/src/main/resources/archetype-resources/src/main/webapp/js/lib/angular/i18n/angular-locale_gd.js
+++ /dev/null
@@ -1,143 +0,0 @@
-'use strict';
-angular.module("ngLocale", [], ["$provide", function($provide) {
-var PLURAL_CATEGORY = {ZERO: "zero", ONE: "one", TWO: "two", FEW: "few", MANY:
"many", OTHER: "other"};
-function getDecimals(n) {
- n = n + '';
- var i = n.indexOf('.');
- return (i == -1) ? 0 : n.length - i - 1;
-}
-
-function getVF(n, opt_precision) {
- var v = opt_precision;
-
- if (undefined === v) {
-v = Math.min(getDecimals(n), 3);
- }
-
- var base = Math.pow(10, v);
- var f = ((n * base) | 0) % base;
- return {v: v, f: f};
-}
-
-$provide.value("$locale", {
- "DATETIME_FORMATS": {
-"AMPMS": [
- "m",
- "f"
-],
-"DAY": [
- "DiD\u00f2mhnaich",
- "DiLuain",
- "DiM\u00e0irt",
- "DiCiadain",
- "DiarDaoin",
- "DihAoine",
- "DiSathairne"
-],
-"ERANAMES": [
- "Ro Chr\u00ecosta",
- "An d\u00e8idh Chr\u00ecosta"
-],
-"ERAS": [
- "RC",
- "AD"
-],
-"FIRSTDAYOFWEEK": 0,
-"MONTH": [
- "dhen Fhaoilleach",
- "dhen Ghearran",
- "dhen Mh\u00e0rt",
- "dhen Ghiblean",
- "dhen Ch\u00e8itean",
- "dhen \u00d2gmhios",
- "dhen Iuchar",
- "dhen L\u00f9nastal",
- "dhen t-Sultain",
- "dhen D\u00e0mhair",
- "dhen t-Samhain",
- "dhen D\u00f9bhlachd"
-],
-"SHORTDAY": [
- "DiD",
- "DiL",
- "DiM",
- "DiC",
- "Dia",
- "Dih",
- "DiS"
-],
-"SHORTMONTH": [
- "Faoi",
- "Gearr",
- "M\u00e0rt",
- "Gibl",
- "C\u00e8it",
- "\u00d2gmh",
- "Iuch",
- "L\u00f9na",
- "Sult",
- "D\u00e0mh",
- "Samh",
- "D\u00f9bh"
-],
-"STANDALONEMONTH": [
- "Am Faoilleach",
- "An Gearran",
- "Am M\u00e0rt",
- "An Giblean",
- "An C\u00e8itean",
- "An t-\u00d2gmhios",
- "An t-Iuchar",
- "An L\u00f9nastal",
- "An t-Sultain",
- "An D\u00e0mhair",
- "An t-Samhain",
- "An D\u00f9bhlachd"
-],
-"WEEKENDRANGE": [
- 5,
- 6
-],
-"fullDate": ", d'mh' y",
-"longDate": "d'mh' y",
-"medium": "d MMM y HH:mm:ss",
-"mediumDate": "d MMM y",
-"mediumTime": "HH:mm:ss",
-"short": "dd/MM/y HH:mm",
-"shortDate": "dd/MM/y",
-"shortTime": "HH:mm"
- },
- "NUMBER_FORMATS": {
-"CURRENCY_SYM": "\u00a3",
-"DECIMAL_SEP": ".",
-"GROUP_SEP": ",",
-"PATTERNS": [
- {
-"gSize": 3,
-"lgSize": 3,
-"maxFrac": 3,
-"minFrac": 0,
-"minInt": 1,
-"negPre": "-",
-"negSuf": "",
-"posPre": "",
-"posSuf": ""
- },
- {
-"gSize": 3,
-"lgSize": 3,
-"maxFrac": 2,
-"minFrac": 2,
-"minInt": 1,
-"negPre": "-\u00a4",
-"negSuf": "",
-"posPre": "\u00a4",
-"posSuf": ""
- }
-]
- },
- "id": "gd",
- "localeID": "gd",
- "pluralCat": function(n, opt_precision) { var i = n | 0; var vf = getVF(n,
opt_precision); if (i == 1 && vf.v == 0) {return PLURAL_CATEGORY.ONE; }
return PLURAL_CATEGORY.OTHER;}
-});
-}]);
http://git-wip-us.apache.org/repos/asf/struts/blob/7a350b02/archetypes/struts2-archetype-angularjs/src/main/resources/archetype-resources/src/main/webapp/js/lib/angular/i18n/angular-locale_gl-es.js
--
diff --git
a/archetypes/struts2-archetype-angularjs/src/main/resources/archetype-resources/src/main/webapp/js/lib/angular/i18n/angular-locale_gl-es.js
b/archetypes/struts2-archetype-angularjs/src/main/resources/archetype-resources/src/main/webapp/js/lib/angular/i18n/angular-locale_gl-es.js
deleted file mode 100644
index 9c68a40..000
---
a/archetypes/struts2-archetype-angularjs/src/main/resources/archetype-resources/src/main/webapp/js/lib/angular/i18n/angular-locale_gl-es.js
+++ /dev/null
@@ -1,143 +0,0 @@
-'use strict';
-angular.module("ngLocale", [], ["$provide", function($provide) {
-var PLURAL_CATEGORY = {ZERO: "zero", ONE: "one", TWO: "two", FEW: "few", MANY:
"many", OTHER: "other"};
-function getDecimals(n) {
- n = n + '';
- var i = n.indexOf('.');
- return (i == -1) ? 0 : n.length - i -
[10/53] [partial] struts git commit: WW-4316 Moves archetypes into its own repo
http://git-wip-us.apache.org/repos/asf/struts/blob/7a350b02/archetypes/struts2-archetype-angularjs/src/main/resources/archetype-resources/src/main/webapp/js/lib/angular/i18n/angular-locale_pt-mo.js
--
diff --git
a/archetypes/struts2-archetype-angularjs/src/main/resources/archetype-resources/src/main/webapp/js/lib/angular/i18n/angular-locale_pt-mo.js
b/archetypes/struts2-archetype-angularjs/src/main/resources/archetype-resources/src/main/webapp/js/lib/angular/i18n/angular-locale_pt-mo.js
deleted file mode 100644
index 1ab1912..000
---
a/archetypes/struts2-archetype-angularjs/src/main/resources/archetype-resources/src/main/webapp/js/lib/angular/i18n/angular-locale_pt-mo.js
+++ /dev/null
@@ -1,125 +0,0 @@
-'use strict';
-angular.module("ngLocale", [], ["$provide", function($provide) {
-var PLURAL_CATEGORY = {ZERO: "zero", ONE: "one", TWO: "two", FEW: "few", MANY:
"many", OTHER: "other"};
-$provide.value("$locale", {
- "DATETIME_FORMATS": {
-"AMPMS": [
- "da manh\u00e3",
- "da tarde"
-],
-"DAY": [
- "domingo",
- "segunda-feira",
- "ter\u00e7a-feira",
- "quarta-feira",
- "quinta-feira",
- "sexta-feira",
- "s\u00e1bado"
-],
-"ERANAMES": [
- "antes de Cristo",
- "depois de Cristo"
-],
-"ERAS": [
- "a.C.",
- "d.C."
-],
-"FIRSTDAYOFWEEK": 6,
-"MONTH": [
- "janeiro",
- "fevereiro",
- "mar\u00e7o",
- "abril",
- "maio",
- "junho",
- "julho",
- "agosto",
- "setembro",
- "outubro",
- "novembro",
- "dezembro"
-],
-"SHORTDAY": [
- "dom",
- "seg",
- "ter",
- "qua",
- "qui",
- "sex",
- "s\u00e1b"
-],
-"SHORTMONTH": [
- "jan",
- "fev",
- "mar",
- "abr",
- "mai",
- "jun",
- "jul",
- "ago",
- "set",
- "out",
- "nov",
- "dez"
-],
-"STANDALONEMONTH": [
- "janeiro",
- "fevereiro",
- "mar\u00e7o",
- "abril",
- "maio",
- "junho",
- "julho",
- "agosto",
- "setembro",
- "outubro",
- "novembro",
- "dezembro"
-],
-"WEEKENDRANGE": [
- 5,
- 6
-],
-"fullDate": ", d 'de' 'de' y",
-"longDate": "d 'de' 'de' y",
-"medium": "dd/MM/y HH:mm:ss",
-"mediumDate": "dd/MM/y",
-"mediumTime": "HH:mm:ss",
-"short": "dd/MM/yy HH:mm",
-"shortDate": "dd/MM/yy",
-"shortTime": "HH:mm"
- },
- "NUMBER_FORMATS": {
-"CURRENCY_SYM": "MOP",
-"DECIMAL_SEP": ",",
-"GROUP_SEP": "\u00a0",
-"PATTERNS": [
- {
-"gSize": 3,
-"lgSize": 3,
-"maxFrac": 3,
-"minFrac": 0,
-"minInt": 1,
-"negPre": "-",
-"negSuf": "",
-"posPre": "",
-"posSuf": ""
- },
- {
-"gSize": 3,
-"lgSize": 3,
-"maxFrac": 2,
-"minFrac": 2,
-"minInt": 1,
-"negPre": "-",
-"negSuf": "\u00a0\u00a4",
-"posPre": "",
-"posSuf": "\u00a0\u00a4"
- }
-]
- },
- "id": "pt-mo",
- "localeID": "pt_MO",
- "pluralCat": function(n, opt_precision) { if (n >= 0 && n <= 2 && n != 2) {
return PLURAL_CATEGORY.ONE; } return PLURAL_CATEGORY.OTHER;}
-});
-}]);
http://git-wip-us.apache.org/repos/asf/struts/blob/7a350b02/archetypes/struts2-archetype-angularjs/src/main/resources/archetype-resources/src/main/webapp/js/lib/angular/i18n/angular-locale_pt-mz.js
--
diff --git
a/archetypes/struts2-archetype-angularjs/src/main/resources/archetype-resources/src/main/webapp/js/lib/angular/i18n/angular-locale_pt-mz.js
b/archetypes/struts2-archetype-angularjs/src/main/resources/archetype-resources/src/main/webapp/js/lib/angular/i18n/angular-locale_pt-mz.js
deleted file mode 100644
index 18c42f7..000
---
a/archetypes/struts2-archetype-angularjs/src/main/resources/archetype-resources/src/main/webapp/js/lib/angular/i18n/angular-locale_pt-mz.js
+++ /dev/null
@@ -1,125 +0,0 @@
-'use strict';
-angular.module("ngLocale", [], ["$provide", function($provide) {
-var PLURAL_CATEGORY = {ZERO: "zero", ONE: "one", TWO: "two", FEW: "few", MANY:
"many", OTHER: "other"};
-$provide.value("$locale", {
- "DATETIME_FORMATS": {
-"AMPMS": [
- "da manh\u00e3",
- "da tarde"
-],
-"DAY": [
- "domingo",
- "segunda-feira",
- "ter\u00e7a-feira",
- "quarta-feira",
- "quinta-feira",
- "sexta-feira",
- "s\u00e1bado"
-],
-"ERANAMES": [
- "antes de Cristo",
- "depois de Cristo"
-],
-"ERAS": [
- "a.C.",
- "d.C."
-],
-"FIRSTDAYOFWEEK": 6,
-"MONTH": [
- "janeiro",
- "fevereiro",
- "mar\u00e7o",
- "abril",
- "maio",
- "junho",
- "julho",
- "agosto",
- "setembro",
- "outubro",
-
[04/53] [partial] struts git commit: WW-4316 Moves archetypes into its own repo
http://git-wip-us.apache.org/repos/asf/struts/blob/7a350b02/archetypes/struts2-archetype-angularjs/src/main/resources/archetype-resources/src/main/webapp/js/lib/angular/i18n/angular-locale_twq-ne.js
--
diff --git
a/archetypes/struts2-archetype-angularjs/src/main/resources/archetype-resources/src/main/webapp/js/lib/angular/i18n/angular-locale_twq-ne.js
b/archetypes/struts2-archetype-angularjs/src/main/resources/archetype-resources/src/main/webapp/js/lib/angular/i18n/angular-locale_twq-ne.js
deleted file mode 100644
index 77c78dc..000
---
a/archetypes/struts2-archetype-angularjs/src/main/resources/archetype-resources/src/main/webapp/js/lib/angular/i18n/angular-locale_twq-ne.js
+++ /dev/null
@@ -1,143 +0,0 @@
-'use strict';
-angular.module("ngLocale", [], ["$provide", function($provide) {
-var PLURAL_CATEGORY = {ZERO: "zero", ONE: "one", TWO: "two", FEW: "few", MANY:
"many", OTHER: "other"};
-function getDecimals(n) {
- n = n + '';
- var i = n.indexOf('.');
- return (i == -1) ? 0 : n.length - i - 1;
-}
-
-function getVF(n, opt_precision) {
- var v = opt_precision;
-
- if (undefined === v) {
-v = Math.min(getDecimals(n), 3);
- }
-
- var base = Math.pow(10, v);
- var f = ((n * base) | 0) % base;
- return {v: v, f: f};
-}
-
-$provide.value("$locale", {
- "DATETIME_FORMATS": {
-"AMPMS": [
- "Subbaahi",
- "Zaarikay b"
-],
-"DAY": [
- "Alhadi",
- "Atinni",
- "Atalaata",
- "Alarba",
- "Alhamiisa",
- "Alzuma",
- "Asibti"
-],
-"ERANAMES": [
- "Isaa jine",
- "Isaa zamanoo"
-],
-"ERAS": [
- "IJ",
- "IZ"
-],
-"FIRSTDAYOFWEEK": 0,
-"MONTH": [
- "\u017danwiye",
- "Feewiriye",
- "Marsi",
- "Awiril",
- "Me",
- "\u017duwe\u014b",
- "\u017duyye",
- "Ut",
- "Sektanbur",
- "Oktoobur",
- "Noowanbur",
- "Deesanbur"
-],
-"SHORTDAY": [
- "Alh",
- "Ati",
- "Ata",
- "Ala",
- "Alm",
- "Alz",
- "Asi"
-],
-"SHORTMONTH": [
- "\u017dan",
- "Fee",
- "Mar",
- "Awi",
- "Me",
- "\u017duw",
- "\u017duy",
- "Ut",
- "Sek",
- "Okt",
- "Noo",
- "Dee"
-],
-"STANDALONEMONTH": [
- "\u017danwiye",
- "Feewiriye",
- "Marsi",
- "Awiril",
- "Me",
- "\u017duwe\u014b",
- "\u017duyye",
- "Ut",
- "Sektanbur",
- "Oktoobur",
- "Noowanbur",
- "Deesanbur"
-],
-"WEEKENDRANGE": [
- 5,
- 6
-],
-"fullDate": " d y",
-"longDate": "d y",
-"medium": "d MMM y HH:mm:ss",
-"mediumDate": "d MMM y",
-"mediumTime": "HH:mm:ss",
-"short": "d/M/y HH:mm",
-"shortDate": "d/M/y",
-"shortTime": "HH:mm"
- },
- "NUMBER_FORMATS": {
-"CURRENCY_SYM": "CFA",
-"DECIMAL_SEP": ".",
-"GROUP_SEP": "\u00a0",
-"PATTERNS": [
- {
-"gSize": 3,
-"lgSize": 3,
-"maxFrac": 3,
-"minFrac": 0,
-"minInt": 1,
-"negPre": "-",
-"negSuf": "",
-"posPre": "",
-"posSuf": ""
- },
- {
-"gSize": 3,
-"lgSize": 3,
-"maxFrac": 2,
-"minFrac": 2,
-"minInt": 1,
-"negPre": "-",
-"negSuf": "\u00a4",
-"posPre": "",
-"posSuf": "\u00a4"
- }
-]
- },
- "id": "twq-ne",
- "localeID": "twq_NE",
- "pluralCat": function(n, opt_precision) { var i = n | 0; var vf = getVF(n,
opt_precision); if (i == 1 && vf.v == 0) {return PLURAL_CATEGORY.ONE; }
return PLURAL_CATEGORY.OTHER;}
-});
-}]);
http://git-wip-us.apache.org/repos/asf/struts/blob/7a350b02/archetypes/struts2-archetype-angularjs/src/main/resources/archetype-resources/src/main/webapp/js/lib/angular/i18n/angular-locale_twq.js
--
diff --git
a/archetypes/struts2-archetype-angularjs/src/main/resources/archetype-resources/src/main/webapp/js/lib/angular/i18n/angular-locale_twq.js
b/archetypes/struts2-archetype-angularjs/src/main/resources/archetype-resources/src/main/webapp/js/lib/angular/i18n/angular-locale_twq.js
deleted file mode 100644
index 8fb664e..000
---
a/archetypes/struts2-archetype-angularjs/src/main/resources/archetype-resources/src/main/webapp/js/lib/angular/i18n/angular-locale_twq.js
+++ /dev/null
@@ -1,143 +0,0 @@
-'use strict';
-angular.module("ngLocale", [], ["$provide", function($provide) {
-var PLURAL_CATEGORY = {ZERO: "zero", ONE: "one", TWO: "two", FEW: "few", MANY:
"many", OTHER: "other"};
-function getDecimals(n) {
- n = n + '';
- var i = n.indexOf('.');
- return (i == -1) ? 0 : n.length - i - 1;
-}
-
-function getVF(n, opt_precision) {
- var v = opt_precision;
-
- if (undefined === v) {
-v = Math.min(getDecimals(n), 3);
- }
-
- var base = Math.pow(10, v);
- var f = ((n * base) | 0) % base
[24/53] [partial] struts git commit: WW-4316 Moves archetypes into its own repo
http://git-wip-us.apache.org/repos/asf/struts/blob/7a350b02/archetypes/struts2-archetype-angularjs/src/main/resources/archetype-resources/src/main/webapp/js/lib/angular/i18n/angular-locale_eo.js
--
diff --git
a/archetypes/struts2-archetype-angularjs/src/main/resources/archetype-resources/src/main/webapp/js/lib/angular/i18n/angular-locale_eo.js
b/archetypes/struts2-archetype-angularjs/src/main/resources/archetype-resources/src/main/webapp/js/lib/angular/i18n/angular-locale_eo.js
deleted file mode 100644
index 7ca8ade..000
---
a/archetypes/struts2-archetype-angularjs/src/main/resources/archetype-resources/src/main/webapp/js/lib/angular/i18n/angular-locale_eo.js
+++ /dev/null
@@ -1,143 +0,0 @@
-'use strict';
-angular.module("ngLocale", [], ["$provide", function($provide) {
-var PLURAL_CATEGORY = {ZERO: "zero", ONE: "one", TWO: "two", FEW: "few", MANY:
"many", OTHER: "other"};
-function getDecimals(n) {
- n = n + '';
- var i = n.indexOf('.');
- return (i == -1) ? 0 : n.length - i - 1;
-}
-
-function getVF(n, opt_precision) {
- var v = opt_precision;
-
- if (undefined === v) {
-v = Math.min(getDecimals(n), 3);
- }
-
- var base = Math.pow(10, v);
- var f = ((n * base) | 0) % base;
- return {v: v, f: f};
-}
-
-$provide.value("$locale", {
- "DATETIME_FORMATS": {
-"AMPMS": [
- "atm",
- "ptm"
-],
-"DAY": [
- "diman\u0109o",
- "lundo",
- "mardo",
- "merkredo",
- "\u0135a\u016ddo",
- "vendredo",
- "sabato"
-],
-"ERANAMES": [
- "aK",
- "pK"
-],
-"ERAS": [
- "aK",
- "pK"
-],
-"FIRSTDAYOFWEEK": 0,
-"MONTH": [
- "januaro",
- "februaro",
- "marto",
- "aprilo",
- "majo",
- "junio",
- "julio",
- "a\u016dgusto",
- "septembro",
- "oktobro",
- "novembro",
- "decembro"
-],
-"SHORTDAY": [
- "di",
- "lu",
- "ma",
- "me",
- "\u0135a",
- "ve",
- "sa"
-],
-"SHORTMONTH": [
- "jan",
- "feb",
- "mar",
- "apr",
- "maj",
- "jun",
- "jul",
- "a\u016dg",
- "sep",
- "okt",
- "nov",
- "dec"
-],
-"STANDALONEMONTH": [
- "januaro",
- "februaro",
- "marto",
- "aprilo",
- "majo",
- "junio",
- "julio",
- "a\u016dgusto",
- "septembro",
- "oktobro",
- "novembro",
- "decembro"
-],
-"WEEKENDRANGE": [
- 5,
- 6
-],
-"fullDate": ", d-'a' 'de' y",
-"longDate": "y--dd",
-"medium": "y-MMM-dd HH:mm:ss",
-"mediumDate": "y-MMM-dd",
-"mediumTime": "HH:mm:ss",
-"short": "yy-MM-dd HH:mm",
-"shortDate": "yy-MM-dd",
-"shortTime": "HH:mm"
- },
- "NUMBER_FORMATS": {
-"CURRENCY_SYM": "$",
-"DECIMAL_SEP": ",",
-"GROUP_SEP": "\u00a0",
-"PATTERNS": [
- {
-"gSize": 3,
-"lgSize": 3,
-"maxFrac": 3,
-"minFrac": 0,
-"minInt": 1,
-"negPre": "-",
-"negSuf": "",
-"posPre": "",
-"posSuf": ""
- },
- {
-"gSize": 3,
-"lgSize": 3,
-"maxFrac": 2,
-"minFrac": 2,
-"minInt": 1,
-"negPre": "-\u00a4\u00a0",
-"negSuf": "",
-"posPre": "\u00a4\u00a0",
-"posSuf": ""
- }
-]
- },
- "id": "eo",
- "localeID": "eo",
- "pluralCat": function(n, opt_precision) { var i = n | 0; var vf = getVF(n,
opt_precision); if (i == 1 && vf.v == 0) {return PLURAL_CATEGORY.ONE; }
return PLURAL_CATEGORY.OTHER;}
-});
-}]);
http://git-wip-us.apache.org/repos/asf/struts/blob/7a350b02/archetypes/struts2-archetype-angularjs/src/main/resources/archetype-resources/src/main/webapp/js/lib/angular/i18n/angular-locale_es-419.js
--
diff --git
a/archetypes/struts2-archetype-angularjs/src/main/resources/archetype-resources/src/main/webapp/js/lib/angular/i18n/angular-locale_es-419.js
b/archetypes/struts2-archetype-angularjs/src/main/resources/archetype-resources/src/main/webapp/js/lib/angular/i18n/angular-locale_es-419.js
deleted file mode 100644
index ed247e7..000
---
a/archetypes/struts2-archetype-angularjs/src/main/resources/archetype-resources/src/main/webapp/js/lib/angular/i18n/angular-locale_es-419.js
+++ /dev/null
@@ -1,125 +0,0 @@
-'use strict';
-angular.module("ngLocale", [], ["$provide", function($provide) {
-var PLURAL_CATEGORY = {ZERO: "zero", ONE: "one", TWO: "two", FEW: "few", MANY:
"many", OTHER: "other"};
-$provide.value("$locale", {
- "DATETIME_FORMATS": {
-"AMPMS": [
- "a. m.",
- "p. m."
-],
-"DAY": [
- "domingo",
- "lunes",
- "martes",
- "mi\u00e9rcoles",
- "jueves",
- "viernes",
- "s\u00e1bado"
-],
-"ERANAMES": [
- "antes de Cristo",
- "despu\u00e9s de Cristo"
-],
-
[08/53] [partial] struts git commit: WW-4316 Moves archetypes into its own repo
http://git-wip-us.apache.org/repos/asf/struts/blob/7a350b02/archetypes/struts2-archetype-angularjs/src/main/resources/archetype-resources/src/main/webapp/js/lib/angular/i18n/angular-locale_ses.js
--
diff --git
a/archetypes/struts2-archetype-angularjs/src/main/resources/archetype-resources/src/main/webapp/js/lib/angular/i18n/angular-locale_ses.js
b/archetypes/struts2-archetype-angularjs/src/main/resources/archetype-resources/src/main/webapp/js/lib/angular/i18n/angular-locale_ses.js
deleted file mode 100644
index 816e7d8..000
---
a/archetypes/struts2-archetype-angularjs/src/main/resources/archetype-resources/src/main/webapp/js/lib/angular/i18n/angular-locale_ses.js
+++ /dev/null
@@ -1,143 +0,0 @@
-'use strict';
-angular.module("ngLocale", [], ["$provide", function($provide) {
-var PLURAL_CATEGORY = {ZERO: "zero", ONE: "one", TWO: "two", FEW: "few", MANY:
"many", OTHER: "other"};
-function getDecimals(n) {
- n = n + '';
- var i = n.indexOf('.');
- return (i == -1) ? 0 : n.length - i - 1;
-}
-
-function getVF(n, opt_precision) {
- var v = opt_precision;
-
- if (undefined === v) {
-v = Math.min(getDecimals(n), 3);
- }
-
- var base = Math.pow(10, v);
- var f = ((n * base) | 0) % base;
- return {v: v, f: f};
-}
-
-$provide.value("$locale", {
- "DATETIME_FORMATS": {
-"AMPMS": [
- "Adduha",
- "Aluula"
-],
-"DAY": [
- "Alhadi",
- "Atinni",
- "Atalaata",
- "Alarba",
- "Alhamiisa",
- "Alzuma",
- "Asibti"
-],
-"ERANAMES": [
- "Isaa jine",
- "Isaa zamanoo"
-],
-"ERAS": [
- "IJ",
- "IZ"
-],
-"FIRSTDAYOFWEEK": 0,
-"MONTH": [
- "\u017danwiye",
- "Feewiriye",
- "Marsi",
- "Awiril",
- "Me",
- "\u017duwe\u014b",
- "\u017duyye",
- "Ut",
- "Sektanbur",
- "Oktoobur",
- "Noowanbur",
- "Deesanbur"
-],
-"SHORTDAY": [
- "Alh",
- "Ati",
- "Ata",
- "Ala",
- "Alm",
- "Alz",
- "Asi"
-],
-"SHORTMONTH": [
- "\u017dan",
- "Fee",
- "Mar",
- "Awi",
- "Me",
- "\u017duw",
- "\u017duy",
- "Ut",
- "Sek",
- "Okt",
- "Noo",
- "Dee"
-],
-"STANDALONEMONTH": [
- "\u017danwiye",
- "Feewiriye",
- "Marsi",
- "Awiril",
- "Me",
- "\u017duwe\u014b",
- "\u017duyye",
- "Ut",
- "Sektanbur",
- "Oktoobur",
- "Noowanbur",
- "Deesanbur"
-],
-"WEEKENDRANGE": [
- 5,
- 6
-],
-"fullDate": " d y",
-"longDate": "d y",
-"medium": "d MMM, y HH:mm:ss",
-"mediumDate": "d MMM, y",
-"mediumTime": "HH:mm:ss",
-"short": "d/M/y HH:mm",
-"shortDate": "d/M/y",
-"shortTime": "HH:mm"
- },
- "NUMBER_FORMATS": {
-"CURRENCY_SYM": "CFA",
-"DECIMAL_SEP": ".",
-"GROUP_SEP": "\u00a0",
-"PATTERNS": [
- {
-"gSize": 3,
-"lgSize": 3,
-"maxFrac": 3,
-"minFrac": 0,
-"minInt": 1,
-"negPre": "-",
-"negSuf": "",
-"posPre": "",
-"posSuf": ""
- },
- {
-"gSize": 3,
-"lgSize": 3,
-"maxFrac": 2,
-"minFrac": 2,
-"minInt": 1,
-"negPre": "-",
-"negSuf": "\u00a4",
-"posPre": "",
-"posSuf": "\u00a4"
- }
-]
- },
- "id": "ses",
- "localeID": "ses",
- "pluralCat": function(n, opt_precision) { var i = n | 0; var vf = getVF(n,
opt_precision); if (i == 1 && vf.v == 0) {return PLURAL_CATEGORY.ONE; }
return PLURAL_CATEGORY.OTHER;}
-});
-}]);
http://git-wip-us.apache.org/repos/asf/struts/blob/7a350b02/archetypes/struts2-archetype-angularjs/src/main/resources/archetype-resources/src/main/webapp/js/lib/angular/i18n/angular-locale_sg-cf.js
--
diff --git
a/archetypes/struts2-archetype-angularjs/src/main/resources/archetype-resources/src/main/webapp/js/lib/angular/i18n/angular-locale_sg-cf.js
b/archetypes/struts2-archetype-angularjs/src/main/resources/archetype-resources/src/main/webapp/js/lib/angular/i18n/angular-locale_sg-cf.js
deleted file mode 100644
index 8cb4ce0..000
---
a/archetypes/struts2-archetype-angularjs/src/main/resources/archetype-resources/src/main/webapp/js/lib/angular/i18n/angular-locale_sg-cf.js
+++ /dev/null
@@ -1,143 +0,0 @@
-'use strict';
-angular.module("ngLocale", [], ["$provide", function($provide) {
-var PLURAL_CATEGORY = {ZERO: "zero", ONE: "one", TWO: "two", FEW: "few", MANY:
"many", OTHER: "other"};
-function getDecimals(n) {
- n = n + '';
- var i = n.indexOf('.');
- return (i == -1) ? 0 : n.length - i - 1;
-}
-
-function getVF(n, opt_precision) {
- var v = opt_precision;
-
- if (undefined === v) {
-v = Math.min(getDecimals(n), 3);
- }
-
- var base = Math.pow(10, v);
- var f = ((n * base) | 0) % base;
- return {v
[3/3] struts git commit: WW-4653 Drops duplicated source jar deployment
WW-4653 Drops duplicated source jar deployment Project: http://git-wip-us.apache.org/repos/asf/struts/repo Commit: http://git-wip-us.apache.org/repos/asf/struts/commit/79beb567 Tree: http://git-wip-us.apache.org/repos/asf/struts/tree/79beb567 Diff: http://git-wip-us.apache.org/repos/asf/struts/diff/79beb567 Branch: refs/heads/master Commit: 79beb5679aa70957b597a48c0711c75f4c0d8703 Parents: 889e6db b67bed6 Author: Lukasz Lenart Authored: Fri Jul 15 09:23:58 2016 +0200 Committer: Lukasz Lenart Committed: Fri Jul 15 09:23:58 2016 +0200 -- core/pom.xml| 8 .../struts2/components/ServletUrlRenderer.java | 2 +- pom.xml | 20 3 files changed, 13 insertions(+), 17 deletions(-) -- http://git-wip-us.apache.org/repos/asf/struts/blob/79beb567/core/pom.xml -- http://git-wip-us.apache.org/repos/asf/struts/blob/79beb567/pom.xml --
[2/3] struts git commit: action parameters should be included when building URL to action
action parameters should be included when building URL to action
Project: http://git-wip-us.apache.org/repos/asf/struts/repo
Commit: http://git-wip-us.apache.org/repos/asf/struts/commit/b67bed67
Tree: http://git-wip-us.apache.org/repos/asf/struts/tree/b67bed67
Diff: http://git-wip-us.apache.org/repos/asf/struts/diff/b67bed67
Branch: refs/heads/master
Commit: b67bed674a5bcab83ac685d54670174c2c2f5f83
Parents: 516d3d5
Author: Przemek Bruski
Authored: Tue Jun 21 16:19:40 2016 +0200
Committer: Przemek Bruski
Committed: Tue Jun 21 16:19:40 2016 +0200
--
.../java/org/apache/struts2/components/ServletUrlRenderer.java | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
--
http://git-wip-us.apache.org/repos/asf/struts/blob/b67bed67/core/src/main/java/org/apache/struts2/components/ServletUrlRenderer.java
--
diff --git
a/core/src/main/java/org/apache/struts2/components/ServletUrlRenderer.java
b/core/src/main/java/org/apache/struts2/components/ServletUrlRenderer.java
index 5b63cd4..314f3de 100644
--- a/core/src/main/java/org/apache/struts2/components/ServletUrlRenderer.java
+++ b/core/src/main/java/org/apache/struts2/components/ServletUrlRenderer.java
@@ -204,7 +204,7 @@ public class ServletUrlRenderer implements UrlRenderer {
LOG.warn("No configuration found for the specified action:
'{}' in namespace: '{}'. Form action defaulting to 'action' attribute's literal
value.", actionName, namespace);
}
-String result = urlHelper.buildUrl(action, formComponent.request,
formComponent.response, null, scheme, formComponent.includeContext, true);
+String result = urlHelper.buildUrl(action, formComponent.request,
formComponent.response, actionParams, scheme, formComponent.includeContext,
true);
formComponent.addParameter("action", result);
// namespace: cut out anything between the start and the last /
[1/3] struts git commit: sync up execution ids with top-level Apache pom, otherwise the sources are deployed twice during release
Repository: struts Updated Branches: refs/heads/master 889e6db56 -> 79beb5679 sync up execution ids with top-level Apache pom, otherwise the sources are deployed twice during release Project: http://git-wip-us.apache.org/repos/asf/struts/repo Commit: http://git-wip-us.apache.org/repos/asf/struts/commit/516d3d51 Tree: http://git-wip-us.apache.org/repos/asf/struts/tree/516d3d51 Diff: http://git-wip-us.apache.org/repos/asf/struts/diff/516d3d51 Branch: refs/heads/master Commit: 516d3d5136f0ef563feb6b3e0207244745a73a4c Parents: a2de255 Author: Przemek Bruski Authored: Tue Jun 21 16:10:29 2016 +0200 Committer: Przemek Bruski Committed: Tue Jun 21 16:10:29 2016 +0200 -- core/pom.xml | 8 pom.xml | 20 2 files changed, 12 insertions(+), 16 deletions(-) -- http://git-wip-us.apache.org/repos/asf/struts/blob/516d3d51/core/pom.xml -- diff --git a/core/pom.xml b/core/pom.xml index 9864cb1..790fd48 100644 --- a/core/pom.xml +++ b/core/pom.xml @@ -185,14 +185,6 @@ org.apache.maven.plugins maven-source-plugin - - -attach-source - -jar - - - http://git-wip-us.apache.org/repos/asf/struts/blob/516d3d51/pom.xml -- diff --git a/pom.xml b/pom.xml index 713f5d6..ceea82a 100644 --- a/pom.xml +++ b/pom.xml @@ -216,6 +216,18 @@ maven-dependency-plugin 2.10 + +org.apache.maven.plugins +maven-source-plugin + + +attach-sources + +jar + + + + @@ -247,14 +259,6 @@ org.apache.maven.plugins maven-source-plugin - - -attach-source - -jar - - - org.apache.maven.plugins
[2/2] struts git commit: WW-4653 Drops duplicated source jar deployment
WW-4653 Drops duplicated source jar deployment Project: http://git-wip-us.apache.org/repos/asf/struts/repo Commit: http://git-wip-us.apache.org/repos/asf/struts/commit/ca42e4ea Tree: http://git-wip-us.apache.org/repos/asf/struts/tree/ca42e4ea Diff: http://git-wip-us.apache.org/repos/asf/struts/diff/ca42e4ea Branch: refs/heads/master Commit: ca42e4ea56b9ef9005a005407c40a480a6765403 Parents: 79beb56 04c98e7 Author: Lukasz Lenart Authored: Fri Jul 15 09:33:53 2016 +0200 Committer: Lukasz Lenart Committed: Fri Jul 15 09:33:53 2016 +0200 -- --
[1/2] struts git commit: sync up execution ids with top-level Apache pom, otherwise the sources are deployed twice during release
Repository: struts Updated Branches: refs/heads/master 79beb5679 -> ca42e4ea5 sync up execution ids with top-level Apache pom, otherwise the sources are deployed twice during release Project: http://git-wip-us.apache.org/repos/asf/struts/repo Commit: http://git-wip-us.apache.org/repos/asf/struts/commit/04c98e7d Tree: http://git-wip-us.apache.org/repos/asf/struts/tree/04c98e7d Diff: http://git-wip-us.apache.org/repos/asf/struts/diff/04c98e7d Branch: refs/heads/master Commit: 04c98e7dc90ce1b305ad10d55debdf51d75e90ef Parents: a2de255 Author: Przemek Bruski Authored: Tue Jun 21 16:26:50 2016 +0200 Committer: Przemek Bruski Committed: Tue Jun 21 16:26:50 2016 +0200 -- core/pom.xml | 8 pom.xml | 20 2 files changed, 12 insertions(+), 16 deletions(-) -- http://git-wip-us.apache.org/repos/asf/struts/blob/04c98e7d/core/pom.xml -- diff --git a/core/pom.xml b/core/pom.xml index 9864cb1..790fd48 100644 --- a/core/pom.xml +++ b/core/pom.xml @@ -185,14 +185,6 @@ org.apache.maven.plugins maven-source-plugin - - -attach-source - -jar - - - http://git-wip-us.apache.org/repos/asf/struts/blob/04c98e7d/pom.xml -- diff --git a/pom.xml b/pom.xml index 713f5d6..ceea82a 100644 --- a/pom.xml +++ b/pom.xml @@ -216,6 +216,18 @@ maven-dependency-plugin 2.10 + +org.apache.maven.plugins +maven-source-plugin + + +attach-sources + +jar + + + + @@ -247,14 +259,6 @@ org.apache.maven.plugins maven-source-plugin - - -attach-source - -jar - - - org.apache.maven.plugins
[1/2] struts git commit: action parameters should be included when building the URL to action
Repository: struts
Updated Branches:
refs/heads/master ca42e4ea5 -> 7f5c8b620
action parameters should be included when building the URL to action
Project: http://git-wip-us.apache.org/repos/asf/struts/repo
Commit: http://git-wip-us.apache.org/repos/asf/struts/commit/4eca2463
Tree: http://git-wip-us.apache.org/repos/asf/struts/tree/4eca2463
Diff: http://git-wip-us.apache.org/repos/asf/struts/diff/4eca2463
Branch: refs/heads/master
Commit: 4eca24631baafcf738f077469e120af611078d9d
Parents: a2de255
Author: Przemek Bruski
Authored: Tue Jun 21 16:27:46 2016 +0200
Committer: Przemek Bruski
Committed: Tue Jun 21 16:27:46 2016 +0200
--
.../java/org/apache/struts2/components/ServletUrlRenderer.java | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
--
http://git-wip-us.apache.org/repos/asf/struts/blob/4eca2463/core/src/main/java/org/apache/struts2/components/ServletUrlRenderer.java
--
diff --git
a/core/src/main/java/org/apache/struts2/components/ServletUrlRenderer.java
b/core/src/main/java/org/apache/struts2/components/ServletUrlRenderer.java
index 5b63cd4..314f3de 100644
--- a/core/src/main/java/org/apache/struts2/components/ServletUrlRenderer.java
+++ b/core/src/main/java/org/apache/struts2/components/ServletUrlRenderer.java
@@ -204,7 +204,7 @@ public class ServletUrlRenderer implements UrlRenderer {
LOG.warn("No configuration found for the specified action:
'{}' in namespace: '{}'. Form action defaulting to 'action' attribute's literal
value.", actionName, namespace);
}
-String result = urlHelper.buildUrl(action, formComponent.request,
formComponent.response, null, scheme, formComponent.includeContext, true);
+String result = urlHelper.buildUrl(action, formComponent.request,
formComponent.response, actionParams, scheme, formComponent.includeContext,
true);
formComponent.addParameter("action", result);
// namespace: cut out anything between the start and the last /
[2/2] struts git commit: WW-4654 Includes params when bulding URL to action
WW-4654 Includes params when bulding URL to action Project: http://git-wip-us.apache.org/repos/asf/struts/repo Commit: http://git-wip-us.apache.org/repos/asf/struts/commit/7f5c8b62 Tree: http://git-wip-us.apache.org/repos/asf/struts/tree/7f5c8b62 Diff: http://git-wip-us.apache.org/repos/asf/struts/diff/7f5c8b62 Branch: refs/heads/master Commit: 7f5c8b620d7c72e4c2432b93266ae932e6783941 Parents: ca42e4e 4eca246 Author: Lukasz Lenart Authored: Fri Jul 15 10:40:19 2016 +0200 Committer: Lukasz Lenart Committed: Fri Jul 15 10:40:19 2016 +0200 -- --
[2/2] struts git commit: WW-4652 Fixes concurrency issue in addDefaultResourceBundle
WW-4652 Fixes concurrency issue in addDefaultResourceBundle Project: http://git-wip-us.apache.org/repos/asf/struts/repo Commit: http://git-wip-us.apache.org/repos/asf/struts/commit/cdbf697a Tree: http://git-wip-us.apache.org/repos/asf/struts/tree/cdbf697a Diff: http://git-wip-us.apache.org/repos/asf/struts/diff/cdbf697a Branch: refs/heads/master Commit: cdbf697ad82a5682956fb0bfbe10528c26bbbaf4 Parents: 7f5c8b6 39ec62a Author: Lukasz Lenart Authored: Fri Jul 15 10:48:36 2016 +0200 Committer: Lukasz Lenart Committed: Fri Jul 15 10:48:36 2016 +0200 -- .../java/com/opensymphony/xwork2/util/LocalizedTextUtil.java | 8 1 file changed, 4 insertions(+), 4 deletions(-) --
[1/2] struts git commit: WW-4652 fixed a concurrency issue in addDefaultResourceBundle
Repository: struts
Updated Branches:
refs/heads/master 7f5c8b620 -> cdbf697ad
WW-4652 fixed a concurrency issue in addDefaultResourceBundle
Project: http://git-wip-us.apache.org/repos/asf/struts/repo
Commit: http://git-wip-us.apache.org/repos/asf/struts/commit/39ec62ac
Tree: http://git-wip-us.apache.org/repos/asf/struts/tree/39ec62ac
Diff: http://git-wip-us.apache.org/repos/asf/struts/diff/39ec62ac
Branch: refs/heads/master
Commit: 39ec62ac35a775687a7e0f81e80f77b2992068b3
Parents: d066891
Author: Przemek Bruski
Authored: Fri Jul 1 16:36:36 2016 +0200
Committer: Przemek Bruski
Committed: Fri Jul 1 16:36:36 2016 +0200
--
.../java/com/opensymphony/xwork2/util/LocalizedTextUtil.java | 8
1 file changed, 4 insertions(+), 4 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/struts/blob/39ec62ac/core/src/main/java/com/opensymphony/xwork2/util/LocalizedTextUtil.java
--
diff --git
a/core/src/main/java/com/opensymphony/xwork2/util/LocalizedTextUtil.java
b/core/src/main/java/com/opensymphony/xwork2/util/LocalizedTextUtil.java
index 29fbd2a..ad3a713 100644
--- a/core/src/main/java/com/opensymphony/xwork2/util/LocalizedTextUtil.java
+++ b/core/src/main/java/com/opensymphony/xwork2/util/LocalizedTextUtil.java
@@ -38,6 +38,7 @@ import java.text.MessageFormat;
import java.util.*;
import java.util.concurrent.ConcurrentHashMap;
import java.util.concurrent.ConcurrentMap;
+import java.util.concurrent.CopyOnWriteArrayList;
/**
@@ -141,14 +142,13 @@ public class LocalizedTextUtil {
*/
public static void addDefaultResourceBundle(String resourceBundleName) {
//make sure this doesn't get added more than once
-ClassLoader ccl;
+final ClassLoader ccl = getCurrentThreadContextClassLoader();
synchronized (XWORK_MESSAGES_BUNDLE) {
-ccl = getCurrentThreadContextClassLoader();
List bundles = classLoaderMap.get(ccl.hashCode());
if (bundles == null) {
-bundles = new ArrayList();
-classLoaderMap.put(ccl.hashCode(), bundles);
+bundles = new CopyOnWriteArrayList<>();
bundles.add(XWORK_MESSAGES_BUNDLE);
+classLoaderMap.put(ccl.hashCode(), bundles);
}
bundles.remove(resourceBundleName);
bundles.add(0, resourceBundleName);
[12/50] [abbrv] struts git commit: fix conflict
fix conflict
Project: http://git-wip-us.apache.org/repos/asf/struts/repo
Commit: http://git-wip-us.apache.org/repos/asf/struts/commit/e9bd9453
Tree: http://git-wip-us.apache.org/repos/asf/struts/tree/e9bd9453
Diff: http://git-wip-us.apache.org/repos/asf/struts/diff/e9bd9453
Branch: refs/heads/master
Commit: e9bd9453d592d50f5cde5d76f5e0544fa708e147
Parents: a446cda
Author: Victor Sosa
Authored: Mon Jan 4 15:31:54 2016 -0400
Committer: Lukasz Lenart
Committed: Tue Jan 19 16:18:00 2016 +0100
--
.../struts2/views/jasperreports/JasperReportsResult.java | 6 ++
1 file changed, 6 insertions(+)
--
http://git-wip-us.apache.org/repos/asf/struts/blob/e9bd9453/plugins/jasperreports/src/main/java/org/apache/struts2/views/jasperreports/JasperReportsResult.java
--
diff --git
a/plugins/jasperreports/src/main/java/org/apache/struts2/views/jasperreports/JasperReportsResult.java
b/plugins/jasperreports/src/main/java/org/apache/struts2/views/jasperreports/JasperReportsResult.java
index bee69d6..312604d 100644
---
a/plugins/jasperreports/src/main/java/org/apache/struts2/views/jasperreports/JasperReportsResult.java
+++
b/plugins/jasperreports/src/main/java/org/apache/struts2/views/jasperreports/JasperReportsResult.java
@@ -385,6 +385,12 @@ public class JasperReportsResult extends
StrutsResultSupport implements JasperRe
} catch (JRException e) {
LOG.error("Error producing {} report for uri {}", format,
systemId, e);
throw new ServletException(e.getMessage(), e);
+} finally {
+try {
+conn.close();
+} catch (Exception e) {
+LOG.warn("Could not close db connection properly", e);
+}
}
response.setContentLength(output.size());
[13/50] [abbrv] struts git commit: Ports solution from 2.3.x branch
Ports solution from 2.3.x branch
Project: http://git-wip-us.apache.org/repos/asf/struts/repo
Commit: http://git-wip-us.apache.org/repos/asf/struts/commit/bdf4f0b5
Tree: http://git-wip-us.apache.org/repos/asf/struts/tree/bdf4f0b5
Diff: http://git-wip-us.apache.org/repos/asf/struts/diff/bdf4f0b5
Branch: refs/heads/master
Commit: bdf4f0b534fa3f6c620be6e4c500b1bad3579baf
Parents: adb8a13
Author: Lukasz Lenart
Authored: Tue Jan 12 08:51:03 2016 +0100
Committer: Lukasz Lenart
Committed: Tue Jan 19 16:18:01 2016 +0100
--
.../tiles/StrutsTilesContainerFactory.java | 37 ---
.../struts2/tiles/StrutsTilesInitializer.java | 3 +-
...sWildcardServletTilesApplicationContext.java | 106 +++
3 files changed, 129 insertions(+), 17 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/struts/blob/bdf4f0b5/plugins/tiles/src/main/java/org/apache/struts2/tiles/StrutsTilesContainerFactory.java
--
diff --git
a/plugins/tiles/src/main/java/org/apache/struts2/tiles/StrutsTilesContainerFactory.java
b/plugins/tiles/src/main/java/org/apache/struts2/tiles/StrutsTilesContainerFactory.java
index 1b01a8d..785082b 100644
---
a/plugins/tiles/src/main/java/org/apache/struts2/tiles/StrutsTilesContainerFactory.java
+++
b/plugins/tiles/src/main/java/org/apache/struts2/tiles/StrutsTilesContainerFactory.java
@@ -27,6 +27,7 @@ import org.apache.tiles.TilesContainer;
import org.apache.tiles.context.ChainedTilesRequestContextFactory;
import org.apache.tiles.context.TilesRequestContext;
import org.apache.tiles.context.TilesRequestContextFactory;
+import org.apache.tiles.definition.DefinitionsFactory;
import org.apache.tiles.definition.DefinitionsFactoryException;
import org.apache.tiles.definition.pattern.DefinitionPatternMatcherFactory;
import org.apache.tiles.definition.pattern.PatternDefinitionResolver;
@@ -59,6 +60,7 @@ import org.apache.tiles.renderer.AttributeRenderer;
import org.apache.tiles.renderer.TypeDetectingAttributeRenderer;
import org.apache.tiles.renderer.impl.BasicRendererFactory;
import org.apache.tiles.renderer.impl.ChainedDelegateAttributeRenderer;
+import org.apache.tiles.servlet.context.ServletUtil;
import org.apache.tiles.util.URLUtil;
import javax.el.ArrayELResolver;
@@ -68,9 +70,9 @@ import javax.el.ELResolver;
import javax.el.ListELResolver;
import javax.el.MapELResolver;
import javax.el.ResourceBundleELResolver;
+import javax.servlet.ServletContext;
import java.io.IOException;
import java.net.URL;
-import java.util.HashSet;
import java.util.List;
import java.util.Map;
import java.util.Set;
@@ -98,9 +100,17 @@ public class StrutsTilesContainerFactory extends
BasicTilesContainerFactory {
public static final String PATTERN_WILDCARD = "WILDCARD";
public static final String PATTERN_REGEXP = "REGEXP";
+/**
+ * Default pattern to be used to collect Tiles definitions if user didn't
configure any
+ */
+public static final String TILES_DEFAULT_PATTERN = "tiles*.xml";
+
@Override
protected BasicTilesContainer instantiateContainer(TilesApplicationContext
applicationContext) {
-return new CachingTilesContainer();
+CachingTilesContainer tilesContainer = new CachingTilesContainer();
+ServletContext servletContext = (ServletContext)
applicationContext.getContext();
+ServletUtil.setContainer(servletContext, tilesContainer);
+return tilesContainer;
}
@Override
@@ -181,7 +191,7 @@ public class StrutsTilesContainerFactory extends
BasicTilesContainerFactory {
DefinitionPatternMatcherFactory wildcardFactory = new
WildcardDefinitionPatternMatcherFactory();
DefinitionPatternMatcherFactory regexpFactory = new
RegexpDefinitionPatternMatcherFactory();
-PrefixedPatternDefinitionResolver resolver = new
PrefixedPatternDefinitionResolver<>();
+PrefixedPatternDefinitionResolver resolver = new
PrefixedPatternDefinitionResolver();
resolver.registerDefinitionPatternMatcherFactory(PATTERN_WILDCARD,
wildcardFactory);
resolver.registerDefinitionPatternMatcherFactory(PATTERN_REGEXP,
regexpFactory);
@@ -189,19 +199,9 @@ public class StrutsTilesContainerFactory extends
BasicTilesContainerFactory {
}
@Override
-protected List getSourceURLs(TilesApplicationContext
applicationContext,
- TilesRequestContextFactory
contextFactory) {
+protected List getSourceURLs(TilesApplicationContext
applicationContext, TilesRequestContextFactory contextFactory) {
try {
-Set finalSet = new HashSet<>();
-Set webINFSet =
applicationContext.getResources("/WEB-INF/**/tiles*.xml");
-Set metaINFSet =
applicationContext.getResources("classpath*:META-INF/**/tiles*.x
[09/50] [abbrv] struts git commit: Update JasperReportsResult.java
Update JasperReportsResult.java
Project: http://git-wip-us.apache.org/repos/asf/struts/repo
Commit: http://git-wip-us.apache.org/repos/asf/struts/commit/bccf099c
Tree: http://git-wip-us.apache.org/repos/asf/struts/tree/bccf099c
Diff: http://git-wip-us.apache.org/repos/asf/struts/diff/bccf099c
Branch: refs/heads/master
Commit: bccf099c0470925bb0d971a76915839dfdfef62d
Parents: 8966787
Author: victor sosa
Authored: Mon Jan 4 12:23:44 2016 -0400
Committer: Lukasz Lenart
Committed: Tue Jan 19 16:18:00 2016 +0100
--
.../struts2/views/jasperreports/JasperReportsResult.java | 6 --
1 file changed, 6 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/struts/blob/bccf099c/plugins/jasperreports/src/main/java/org/apache/struts2/views/jasperreports/JasperReportsResult.java
--
diff --git
a/plugins/jasperreports/src/main/java/org/apache/struts2/views/jasperreports/JasperReportsResult.java
b/plugins/jasperreports/src/main/java/org/apache/struts2/views/jasperreports/JasperReportsResult.java
index e0ea121..e356506 100644
---
a/plugins/jasperreports/src/main/java/org/apache/struts2/views/jasperreports/JasperReportsResult.java
+++
b/plugins/jasperreports/src/main/java/org/apache/struts2/views/jasperreports/JasperReportsResult.java
@@ -385,12 +385,6 @@ public class JasperReportsResult extends
StrutsResultSupport implements JasperRe
} catch (JRException e) {
LOG.error("Error producing {} report for uri {}", format,
systemId, e);
throw new ServletException(e.getMessage(), e);
-} finally {
-try {
-conn.close();
-} catch (Exception e) {
-LOG.warn("Could not close db connection properly", e);
-}
}
response.setContentLength(output.size());
[10/50] [abbrv] struts git commit: WW-3710 Adds test to proof support for wildcards in
WW-3710 Adds test to proof support for wildcards in
Project: http://git-wip-us.apache.org/repos/asf/struts/repo
Commit: http://git-wip-us.apache.org/repos/asf/struts/commit/dad437bd
Tree: http://git-wip-us.apache.org/repos/asf/struts/tree/dad437bd
Diff: http://git-wip-us.apache.org/repos/asf/struts/diff/dad437bd
Branch: refs/heads/master
Commit: dad437bd06a015c673157097d41c7c5f25b7f84f
Parents: fd33dc8
Author: Lukasz Lenart
Authored: Tue Jan 5 08:16:26 2016 +0100
Committer: Lukasz Lenart
Committed: Tue Jan 19 16:18:00 2016 +0100
--
.../providers/XmlConfigurationProviderTest.java | 16
.../providers/xwork-test-include-wildcard.xml | 8
2 files changed, 24 insertions(+)
--
http://git-wip-us.apache.org/repos/asf/struts/blob/dad437bd/core/src/test/java/com/opensymphony/xwork2/config/providers/XmlConfigurationProviderTest.java
--
diff --git
a/core/src/test/java/com/opensymphony/xwork2/config/providers/XmlConfigurationProviderTest.java
b/core/src/test/java/com/opensymphony/xwork2/config/providers/XmlConfigurationProviderTest.java
index b161d02..6d324cf 100644
---
a/core/src/test/java/com/opensymphony/xwork2/config/providers/XmlConfigurationProviderTest.java
+++
b/core/src/test/java/com/opensymphony/xwork2/config/providers/XmlConfigurationProviderTest.java
@@ -31,6 +31,7 @@ import java.net.URL;
import java.util.ArrayList;
import java.util.Iterator;
import java.util.List;
+import java.util.Set;
public class XmlConfigurationProviderTest extends ConfigurationTestBase {
@@ -198,4 +199,19 @@ public class XmlConfigurationProviderTest extends
ConfigurationTestBase {
assertTrue(!provider.needsReload());
}
+public void testIncludeWithWildcard() throws Exception {
+String configFile =
"com/opensymphony/xwork2/config/providers/xwork-test-include-wildcard.xml";
+buildConfigurationProvider(configFile);
+
+Set loadedFileNames = configuration.getLoadedFileNames();
+assertEquals(8, loadedFileNames.size());
+
assertTrue(loadedFileNames.contains("com/opensymphony/xwork2/config/providers/xwork-include-after-package.xml"));
+
assertTrue(loadedFileNames.contains("com/opensymphony/xwork2/config/providers/xwork-include-after-package-2.xml"));
+
assertTrue(loadedFileNames.contains("com/opensymphony/xwork2/config/providers/xwork-include-before-package.xml"));
+
assertTrue(loadedFileNames.contains("com/opensymphony/xwork2/config/providers/xwork-include-before-package-2.xml"));
+
assertTrue(loadedFileNames.contains("com/opensymphony/xwork2/config/providers/xwork-include-parent.xml"));
+
assertTrue(loadedFileNames.contains("com/opensymphony/xwork2/config/providers/xwork-test-include-wildcard.xml"));
+assertTrue(loadedFileNames.contains("xwork-test-beans.xml"));
+assertTrue(loadedFileNames.contains("xwork-test-default.xml"));
+}
}
http://git-wip-us.apache.org/repos/asf/struts/blob/dad437bd/core/src/test/resources/com/opensymphony/xwork2/config/providers/xwork-test-include-wildcard.xml
--
diff --git
a/core/src/test/resources/com/opensymphony/xwork2/config/providers/xwork-test-include-wildcard.xml
b/core/src/test/resources/com/opensymphony/xwork2/config/providers/xwork-test-include-wildcard.xml
new file mode 100644
index 000..6bf5cc6
--- /dev/null
+++
b/core/src/test/resources/com/opensymphony/xwork2/config/providers/xwork-test-include-wildcard.xml
@@ -0,0 +1,8 @@
+http://struts.apache.org/dtds/xwork-2.1.dtd";
+>
+
+
+
+
[37/50] [abbrv] struts git commit: WW-4381 - exclude org.olap4j:olap4j for compile, to fix broken builds behind Maven mirror
WW-4381 - exclude org.olap4j:olap4j for compile, to fix broken builds behind Maven mirror Project: http://git-wip-us.apache.org/repos/asf/struts/repo Commit: http://git-wip-us.apache.org/repos/asf/struts/commit/dd849e82 Tree: http://git-wip-us.apache.org/repos/asf/struts/tree/dd849e82 Diff: http://git-wip-us.apache.org/repos/asf/struts/diff/dd849e82 Branch: refs/heads/master Commit: dd849e82f37d938a788554b80393f752aaf0b3bf Parents: 50c95d4 Author: Rene Gielen Authored: Thu Jan 14 18:04:29 2016 +0100 Committer: Lukasz Lenart Committed: Tue Jan 19 16:19:19 2016 +0100 -- plugins/jasperreports/pom.xml | 7 +++ 1 file changed, 7 insertions(+) -- http://git-wip-us.apache.org/repos/asf/struts/blob/dd849e82/plugins/jasperreports/pom.xml -- diff --git a/plugins/jasperreports/pom.xml b/plugins/jasperreports/pom.xml index 612f0bb..f6a8cd6 100644 --- a/plugins/jasperreports/pom.xml +++ b/plugins/jasperreports/pom.xml @@ -43,6 +43,13 @@ jasperreports 6.0.3 provided + + + +org.olap4j +olap4j + +
[05/50] [abbrv] struts git commit: Patch WW-3266
Patch WW-3266
getFieldValue() method of ValueStackDataSource uses getDescription() to
get field value may not appropriate
Project: http://git-wip-us.apache.org/repos/asf/struts/repo
Commit: http://git-wip-us.apache.org/repos/asf/struts/commit/c0670209
Tree: http://git-wip-us.apache.org/repos/asf/struts/tree/c0670209
Diff: http://git-wip-us.apache.org/repos/asf/struts/diff/c0670209
Branch: refs/heads/master
Commit: c0670209bac3d911b6f76850a6d36dbea64b91e2
Parents: b84fd6f
Author: Victor Sosa
Authored: Thu Jan 7 11:09:58 2016 -0400
Committer: Lukasz Lenart
Committed: Tue Jan 19 16:18:00 2016 +0100
--
.../struts2/views/jasperreports/ValueStackDataSource.java | 7 +--
1 file changed, 1 insertion(+), 6 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/struts/blob/c0670209/plugins/jasperreports/src/main/java/org/apache/struts2/views/jasperreports/ValueStackDataSource.java
--
diff --git
a/plugins/jasperreports/src/main/java/org/apache/struts2/views/jasperreports/ValueStackDataSource.java
b/plugins/jasperreports/src/main/java/org/apache/struts2/views/jasperreports/ValueStackDataSource.java
index 81641a5..c39b34e 100644
---
a/plugins/jasperreports/src/main/java/org/apache/struts2/views/jasperreports/ValueStackDataSource.java
+++
b/plugins/jasperreports/src/main/java/org/apache/struts2/views/jasperreports/ValueStackDataSource.java
@@ -92,12 +92,7 @@ public class ValueStackDataSource implements
JRRewindableDataSource {
//TODO: move the code to return a ValueStackDataSource to a seperate
// method when and if the JRDataSource interface is updated to
support
// this.
-String expression = field.getDescription();
-
-if (expression == null) {
-//Description is optional so use the field name as a default
-expression = field.getName();
-}
+String expression = field.getName();
Object value = valueStack.findValue(expression);
LOG.debug("Field [{}] = [{}]", field.getName(), value);
[02/50] [abbrv] struts git commit: Patch WW-3462
Patch WW-3462
connection open after report generation
Now the connection is close after been used.
Project: http://git-wip-us.apache.org/repos/asf/struts/repo
Commit: http://git-wip-us.apache.org/repos/asf/struts/commit/94207898
Tree: http://git-wip-us.apache.org/repos/asf/struts/tree/94207898
Diff: http://git-wip-us.apache.org/repos/asf/struts/diff/94207898
Branch: refs/heads/master
Commit: 9420789862ffe073b05a5028aa792d160e334918
Parents: 8d4bb89
Author: Victor Sosa
Authored: Sun Jan 3 07:34:00 2016 -0400
Committer: Lukasz Lenart
Committed: Tue Jan 19 16:17:09 2016 +0100
--
.../apache/struts2/views/jasperreports/JasperReportsResult.java| 2 ++
1 file changed, 2 insertions(+)
--
http://git-wip-us.apache.org/repos/asf/struts/blob/94207898/plugins/jasperreports/src/main/java/org/apache/struts2/views/jasperreports/JasperReportsResult.java
--
diff --git
a/plugins/jasperreports/src/main/java/org/apache/struts2/views/jasperreports/JasperReportsResult.java
b/plugins/jasperreports/src/main/java/org/apache/struts2/views/jasperreports/JasperReportsResult.java
index e356506..921a010 100644
---
a/plugins/jasperreports/src/main/java/org/apache/struts2/views/jasperreports/JasperReportsResult.java
+++
b/plugins/jasperreports/src/main/java/org/apache/struts2/views/jasperreports/JasperReportsResult.java
@@ -385,6 +385,8 @@ public class JasperReportsResult extends
StrutsResultSupport implements JasperRe
} catch (JRException e) {
LOG.error("Error producing {} report for uri {}", format,
systemId, e);
throw new ServletException(e.getMessage(), e);
+} finally {
+conn.close();
}
response.setContentLength(output.size());
[24/50] [abbrv] struts git commit: Uses new way to access TileContainer
Uses new way to access TileContainer
Project: http://git-wip-us.apache.org/repos/asf/struts/repo
Commit: http://git-wip-us.apache.org/repos/asf/struts/commit/07488866
Tree: http://git-wip-us.apache.org/repos/asf/struts/tree/07488866
Diff: http://git-wip-us.apache.org/repos/asf/struts/diff/07488866
Branch: refs/heads/master
Commit: 07488866b665a30ba66602a48071d03076a81994
Parents: 9249aac
Author: Lukasz Lenart
Authored: Tue Jan 12 10:14:11 2016 +0100
Committer: Lukasz Lenart
Committed: Tue Jan 19 16:18:42 2016 +0100
--
.../apache/struts2/views/tiles/TilesResult.java| 17 -
1 file changed, 12 insertions(+), 5 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/struts/blob/07488866/plugins/tiles/src/main/java/org/apache/struts2/views/tiles/TilesResult.java
--
diff --git
a/plugins/tiles/src/main/java/org/apache/struts2/views/tiles/TilesResult.java
b/plugins/tiles/src/main/java/org/apache/struts2/views/tiles/TilesResult.java
index 72d7916..a402869 100644
---
a/plugins/tiles/src/main/java/org/apache/struts2/views/tiles/TilesResult.java
+++
b/plugins/tiles/src/main/java/org/apache/struts2/views/tiles/TilesResult.java
@@ -30,7 +30,11 @@ import org.apache.struts2.result.ServletDispatcherResult;
import org.apache.tiles.TilesContainer;
import com.opensymphony.xwork2.ActionInvocation;
-import org.apache.tiles.servlet.context.ServletUtil;
+import org.apache.tiles.access.TilesAccess;
+import org.apache.tiles.request.ApplicationContext;
+import org.apache.tiles.request.Request;
+import org.apache.tiles.request.servlet.ServletRequest;
+import org.apache.tiles.request.servlet.ServletUtil;
/**
*
@@ -99,11 +103,14 @@ public class TilesResult extends ServletDispatcherResult {
ServletContext servletContext =
ServletActionContext.getServletContext();
-TilesContainer container = ServletUtil.getContainer(servletContext);
+ApplicationContext applicationContext =
ServletUtil.getApplicationContext(servletContext);
+TilesContainer container =
TilesAccess.getContainer(applicationContext);
-HttpServletRequest request = ServletActionContext.getRequest();
-HttpServletResponse response = ServletActionContext.getResponse();
+HttpServletRequest httpRequest = ServletActionContext.getRequest();
+HttpServletResponse httpResponse = ServletActionContext.getResponse();
-container.render(location, request, response);
+Request request = new ServletRequest(applicationContext, httpRequest,
httpResponse);
+
+container.render(location, request);
}
}
[19/50] [abbrv] struts git commit: Adds new result 'JSONActionRedirectResult' to json-plugin. Contains tests and example in showcase app. The new result type is intended to be used along with existing
Adds new result 'JSONActionRedirectResult' to json-plugin. Contains tests and
example in showcase app. The new result type is intended to be used along with
existing JSONValidationInterceptor. It makes it possible to do form validation
via ajax and handle form submitting, action execution and redirect evaluation
all in one request inside JS context.
Project: http://git-wip-us.apache.org/repos/asf/struts/repo
Commit: http://git-wip-us.apache.org/repos/asf/struts/commit/a35a9a82
Tree: http://git-wip-us.apache.org/repos/asf/struts/tree/a35a9a82
Diff: http://git-wip-us.apache.org/repos/asf/struts/diff/a35a9a82
Branch: refs/heads/master
Commit: a35a9a82291bd86483cca0d5bd477ed54f511a30
Parents: 61f9b07
Author: cnenning
Authored: Mon Jan 11 14:36:32 2016 +0100
Committer: Lukasz Lenart
Committed: Tue Jan 19 16:18:01 2016 +0100
--
.../validation/AjaxFormSubmitAction.java| 152
.../validation/AjaxFormSubmitSuccessAction.java | 7 +
.../src/main/resources/struts-validation.xml| 13 ++
.../ajaxErrorContainers/actionerror.ftl | 46 +
.../ajaxErrorContainers/controlfooter.ftl | 39
.../ajaxErrorContainers/controlheader-core.ftl | 80 +
.../ajaxErrorContainers/theme.properties| 21 +++
.../src/main/webapp/WEB-INF/decorators/main.jsp | 2 +
.../WEB-INF/validation/ajaxFormSubmit.jsp | 177 +++
.../validation/ajaxFormSubmitSuccess.jsp| 17 ++
.../struts2/json/JSONActionRedirectResult.java | 71
.../struts2/json/JSONValidationInterceptor.java | 6 +-
.../json/src/main/resources/struts-plugin.xml | 1 +
.../json/JSONActionRedirectResultTest.java | 105 +++
14 files changed, 735 insertions(+), 2 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/struts/blob/a35a9a82/apps/showcase/src/main/java/org/apache/struts2/showcase/validation/AjaxFormSubmitAction.java
--
diff --git
a/apps/showcase/src/main/java/org/apache/struts2/showcase/validation/AjaxFormSubmitAction.java
b/apps/showcase/src/main/java/org/apache/struts2/showcase/validation/AjaxFormSubmitAction.java
new file mode 100644
index 000..b179370
--- /dev/null
+++
b/apps/showcase/src/main/java/org/apache/struts2/showcase/validation/AjaxFormSubmitAction.java
@@ -0,0 +1,152 @@
+package org.apache.struts2.showcase.validation;
+
+import java.sql.Date;
+
+import com.opensymphony.xwork2.validator.annotations.DateRangeFieldValidator;
+import com.opensymphony.xwork2.validator.annotations.EmailValidator;
+import com.opensymphony.xwork2.validator.annotations.FieldExpressionValidator;
+import com.opensymphony.xwork2.validator.annotations.IntRangeFieldValidator;
+import com.opensymphony.xwork2.validator.annotations.RegexFieldValidator;
+import com.opensymphony.xwork2.validator.annotations.RequiredFieldValidator;
+import com.opensymphony.xwork2.validator.annotations.RequiredStringValidator;
+import
com.opensymphony.xwork2.validator.annotations.StringLengthFieldValidator;
+import com.opensymphony.xwork2.validator.annotations.UrlValidator;
+
+/**
+ *
+ */
+/**
+ * Example Action that shows how forms can be validated and submitted via AJAX
+ * only. Form-submit-and-page-reload functionality of browsers is not used for
+ * this action.
+ * Some things to note:
+ *
+ * Depends on json-plugin.
+ * Requires jsonValidationInterceptor to be on stack.
+ * Uses a special json redirect result type.
+ * Uses http parameters struts.enableJSONValidation=true
and struts.validateOnly=false.
+ * Uses a customized theme to make sure html elements required as error
containers are always present and easily selectable in JS.
+ * Uses some custom JS code depending on jQuery to issue AJAX request
and to render errors in html.
+ * Shows visual feedback while waiting for AJAX response.
+ *
+ *
+ *
+ */
+public class AjaxFormSubmitAction extends AbstractValidationActionSupport {
+
+private String requiredValidatorField = null;
+private String requiredStringValidatorField = null;
+private Integer integerValidatorField = null;
+private Date dateValidatorField = null;
+private String emailValidatorField = null;
+private String urlValidatorField = null;
+private String stringLengthValidatorField = null;
+private String regexValidatorField = null;
+private String fieldExpressionValidatorField = null;
+
+@Override
+public void validate() {
+if (hasFieldErrors()) {
+addActionError("Errors present!");
+}
+}
+
+public Date getDateValidatorField() {
+return dateValidatorField;
+}
+
+@DateRangeFieldValidator(
+min="01/01/1990",
+max="01/01/2000",
+message="must be a min 01-01-1990 max 01-01-2000 if supplied")
+public voi
[06/50] [abbrv] struts git commit: WW-4583 JakartaStreamMultiPartRequest fails on short file name and on empty file input
WW-4583 JakartaStreamMultiPartRequest fails on short file name and on empty
file input
Project: http://git-wip-us.apache.org/repos/asf/struts/repo
Commit: http://git-wip-us.apache.org/repos/asf/struts/commit/b84fd6fe
Tree: http://git-wip-us.apache.org/repos/asf/struts/tree/b84fd6fe
Diff: http://git-wip-us.apache.org/repos/asf/struts/diff/b84fd6fe
Branch: refs/heads/master
Commit: b84fd6fe0ca1d159da831df8444ee18bb9727e1b
Parents: 6fd37d8
Author: Aleksandr Mashchenko
Authored: Wed Jan 6 19:24:56 2016 +0200
Committer: Lukasz Lenart
Committed: Tue Jan 19 16:18:00 2016 +0100
--
.../multipart/JakartaStreamMultiPartRequest.java | 10 ++
1 file changed, 10 insertions(+)
--
http://git-wip-us.apache.org/repos/asf/struts/blob/b84fd6fe/core/src/main/java/org/apache/struts2/dispatcher/multipart/JakartaStreamMultiPartRequest.java
--
diff --git
a/core/src/main/java/org/apache/struts2/dispatcher/multipart/JakartaStreamMultiPartRequest.java
b/core/src/main/java/org/apache/struts2/dispatcher/multipart/JakartaStreamMultiPartRequest.java
index 6727f3e..f4c4665 100644
---
a/core/src/main/java/org/apache/struts2/dispatcher/multipart/JakartaStreamMultiPartRequest.java
+++
b/core/src/main/java/org/apache/struts2/dispatcher/multipart/JakartaStreamMultiPartRequest.java
@@ -384,6 +384,12 @@ public class JakartaStreamMultiPartRequest implements
MultiPartRequest {
* @param location location
*/
private void processFileItemStreamAsFileField(FileItemStream itemStream,
String location) {
+// Skip file uploads that don't have a file name - meaning that no
file was selected.
+if (itemStream.getName() == null ||
itemStream.getName().trim().length() < 1) {
+LOG.debug("No file has been uploaded for the field: {}",
itemStream.getFieldName());
+return;
+}
+
File file = null;
try {
// Create the temporary upload file.
@@ -424,6 +430,10 @@ public class JakartaStreamMultiPartRequest implements
MultiPartRequest {
suffix = name.substring(name.lastIndexOf('.'));
}
+if (prefix.length() < 3) {
+prefix = UUID.randomUUID().toString();
+}
+
File file = File.createTempFile(prefix + "_", suffix, new
File(location));
LOG.debug("Creating temporary file '{}' (originally '{}').",
file.getName(), fileName);
return file;
[16/50] [abbrv] struts git commit: Prevents eval expressions at all
Prevents eval expressions at all
Project: http://git-wip-us.apache.org/repos/asf/struts/repo
Commit: http://git-wip-us.apache.org/repos/asf/struts/commit/61f9b07a
Tree: http://git-wip-us.apache.org/repos/asf/struts/tree/61f9b07a
Diff: http://git-wip-us.apache.org/repos/asf/struts/diff/61f9b07a
Branch: refs/heads/master
Commit: 61f9b07a788292b03ccdfae727f19bf2d7d47ad9
Parents: 46f3cf2
Author: Lukasz Lenart
Authored: Sun Jan 10 12:00:10 2016 +0100
Committer: Lukasz Lenart
Committed: Tue Jan 19 16:18:01 2016 +0100
--
.../java/com/opensymphony/xwork2/ognl/OgnlUtil.java | 8 ++--
.../com/opensymphony/xwork2/ognl/OgnlValueStack.java| 12
2 files changed, 6 insertions(+), 14 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/struts/blob/61f9b07a/core/src/main/java/com/opensymphony/xwork2/ognl/OgnlUtil.java
--
diff --git a/core/src/main/java/com/opensymphony/xwork2/ognl/OgnlUtil.java
b/core/src/main/java/com/opensymphony/xwork2/ognl/OgnlUtil.java
index f6f2ea8..8143613 100644
--- a/core/src/main/java/com/opensymphony/xwork2/ognl/OgnlUtil.java
+++ b/core/src/main/java/com/opensymphony/xwork2/ognl/OgnlUtil.java
@@ -273,14 +273,10 @@ public class OgnlUtil {
*
* @throws OgnlException in case of ognl errors
*/
-public void setValue(String name, Map context, Object
root, Object value) throws OgnlException {
-setValue(name, context, root, value, true);
-}
-
-protected void setValue(String name, final Map context,
final Object root, final Object value, final boolean evalName) throws
OgnlException {
+public void setValue(final String name, final Map context,
final Object root, final Object value) throws OgnlException {
compileAndExecute(name, context, new OgnlTask() {
public Void execute(Object tree) throws OgnlException {
-if (!evalName && isEvalExpression(tree, context)) {
+if (isEvalExpression(tree, context)) {
throw new OgnlException("Eval expression cannot be used as
parameter name");
}
Ognl.setValue(tree, context, root, value);
http://git-wip-us.apache.org/repos/asf/struts/blob/61f9b07a/core/src/main/java/com/opensymphony/xwork2/ognl/OgnlValueStack.java
--
diff --git
a/core/src/main/java/com/opensymphony/xwork2/ognl/OgnlValueStack.java
b/core/src/main/java/com/opensymphony/xwork2/ognl/OgnlValueStack.java
index af7fbc5..4394d03 100644
--- a/core/src/main/java/com/opensymphony/xwork2/ognl/OgnlValueStack.java
+++ b/core/src/main/java/com/opensymphony/xwork2/ognl/OgnlValueStack.java
@@ -148,7 +148,7 @@ public class OgnlValueStack implements Serializable,
ValueStack, ClearableValueS
* @see com.opensymphony.xwork2.util.ValueStack#setParameter(String,
Object)
*/
public void setParameter(String expr, Object value) {
-setValue(expr, value, devMode, false);
+setValue(expr, value, devMode);
}
/**
@@ -164,13 +164,9 @@ public class OgnlValueStack implements Serializable,
ValueStack, ClearableValueS
* @see com.opensymphony.xwork2.util.ValueStack#setValue(java.lang.String,
java.lang.Object, boolean)
*/
public void setValue(String expr, Object value, boolean
throwExceptionOnFailure) {
-setValue(expr, value, throwExceptionOnFailure, true);
-}
-
-private void setValue(String expr, Object value, boolean
throwExceptionOnFailure, boolean evalExpression) {
Map context = getContext();
try {
-trySetValue(expr, value, throwExceptionOnFailure, context,
evalExpression);
+trySetValue(expr, value, throwExceptionOnFailure, context);
} catch (OgnlException e) {
handleOgnlException(expr, value, throwExceptionOnFailure, e);
} catch (RuntimeException re) { //XW-281
@@ -180,10 +176,10 @@ public class OgnlValueStack implements Serializable,
ValueStack, ClearableValueS
}
}
-private void trySetValue(String expr, Object value, boolean
throwExceptionOnFailure, Map context, boolean evalExpression)
throws OgnlException {
+private void trySetValue(String expr, Object value, boolean
throwExceptionOnFailure, Map context) throws OgnlException {
context.put(XWorkConverter.CONVERSION_PROPERTY_FULLNAME, expr);
context.put(REPORT_ERRORS_ON_NO_PROP, (throwExceptionOnFailure) ?
Boolean.TRUE : Boolean.FALSE);
-ognlUtil.setValue(expr, context, root, value, evalExpression);
+ognlUtil.setValue(expr, context, root, value);
}
private void cleanUpContext(Map context) {
[29/50] [abbrv] struts git commit: WW-4403 - add JDK 8 profile, disabling JavaDoc lint checker when building with JDK8 (cherry picked from commit 7c4bb7e)
WW-4403 - add JDK 8 profile, disabling JavaDoc lint checker when building with JDK8 (cherry picked from commit 7c4bb7e) Project: http://git-wip-us.apache.org/repos/asf/struts/repo Commit: http://git-wip-us.apache.org/repos/asf/struts/commit/50c95d43 Tree: http://git-wip-us.apache.org/repos/asf/struts/tree/50c95d43 Diff: http://git-wip-us.apache.org/repos/asf/struts/diff/50c95d43 Branch: refs/heads/master Commit: 50c95d43de024e37d66dc9242037a00b2fe78de5 Parents: 4720f46 Author: Rene Gielen Authored: Thu Jan 14 17:43:20 2016 +0100 Committer: Lukasz Lenart Committed: Tue Jan 19 16:19:19 2016 +0100 -- pom.xml | 19 +++ 1 file changed, 19 insertions(+) -- http://git-wip-us.apache.org/repos/asf/struts/blob/50c95d43/pom.xml -- diff --git a/pom.xml b/pom.xml index 5d836d3..08c94b4 100644 --- a/pom.xml +++ b/pom.xml @@ -149,6 +149,25 @@ --> + +jdk8 + +1.8 + + + + + +org.apache.maven.plugins +maven-javadoc-plugin + + -Xdoclint:none + + + + + +
[42/50] [abbrv] struts git commit: Extracts constants representing expression languages
Extracts constants representing expression languages
Project: http://git-wip-us.apache.org/repos/asf/struts/repo
Commit: http://git-wip-us.apache.org/repos/asf/struts/commit/4771dfa6
Tree: http://git-wip-us.apache.org/repos/asf/struts/tree/4771dfa6
Diff: http://git-wip-us.apache.org/repos/asf/struts/diff/4771dfa6
Branch: refs/heads/master
Commit: 4771dfa63da7c4c1329319201050f4abc1aa0df2
Parents: 6274820
Author: Lukasz Lenart
Authored: Fri Jan 15 08:45:54 2016 +0100
Committer: Lukasz Lenart
Committed: Tue Jan 19 16:19:20 2016 +0100
--
.../apache/struts2/tiles/StrutsTilesContainerFactory.java | 10 --
1 file changed, 8 insertions(+), 2 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/struts/blob/4771dfa6/plugins/tiles/src/main/java/org/apache/struts2/tiles/StrutsTilesContainerFactory.java
--
diff --git
a/plugins/tiles/src/main/java/org/apache/struts2/tiles/StrutsTilesContainerFactory.java
b/plugins/tiles/src/main/java/org/apache/struts2/tiles/StrutsTilesContainerFactory.java
index 57594af..8403610 100644
---
a/plugins/tiles/src/main/java/org/apache/struts2/tiles/StrutsTilesContainerFactory.java
+++
b/plugins/tiles/src/main/java/org/apache/struts2/tiles/StrutsTilesContainerFactory.java
@@ -97,6 +97,12 @@ public class StrutsTilesContainerFactory extends
BasicTilesContainerFactory {
*/
public static final String TILES_DEFAULT_PATTERN = "tiles*.xml";
+/**
+ * Supported expression languages
+ */
+public static final String OGNL = "OGNL";
+public static final String EL = "EL";
+
@Override
public TilesContainer createDecoratedContainer(TilesContainer
originalContainer, ApplicationContext applicationContext) {
return new CachingTilesContainer(originalContainer);
@@ -137,8 +143,8 @@ public class StrutsTilesContainerFactory extends
BasicTilesContainerFactory {
LocaleResolver resolver) {
BasicAttributeEvaluatorFactory attributeEvaluatorFactory = new
BasicAttributeEvaluatorFactory(new DirectAttributeEvaluator());
-attributeEvaluatorFactory.registerAttributeEvaluator("OGNL",
createOGNLEvaluator());
-attributeEvaluatorFactory.registerAttributeEvaluator("EL",
createELEvaluator(applicationContext));
+attributeEvaluatorFactory.registerAttributeEvaluator(OGNL,
createOGNLEvaluator());
+attributeEvaluatorFactory.registerAttributeEvaluator(EL,
createELEvaluator(applicationContext));
return attributeEvaluatorFactory;
}
[41/50] [abbrv] struts git commit: Uses existing constants instead of literals
Uses existing constants instead of literals
Project: http://git-wip-us.apache.org/repos/asf/struts/repo
Commit: http://git-wip-us.apache.org/repos/asf/struts/commit/6274820e
Tree: http://git-wip-us.apache.org/repos/asf/struts/tree/6274820e
Diff: http://git-wip-us.apache.org/repos/asf/struts/diff/6274820e
Branch: refs/heads/master
Commit: 6274820e8013bb8d5919ac1033ef77f3bb0ed5f0
Parents: 5eaef08
Author: Lukasz Lenart
Authored: Fri Jan 15 08:44:25 2016 +0100
Committer: Lukasz Lenart
Committed: Tue Jan 19 16:19:20 2016 +0100
--
.../org/apache/struts2/tiles/StrutsTilesContainerFactory.java| 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/struts/blob/6274820e/plugins/tiles/src/main/java/org/apache/struts2/tiles/StrutsTilesContainerFactory.java
--
diff --git
a/plugins/tiles/src/main/java/org/apache/struts2/tiles/StrutsTilesContainerFactory.java
b/plugins/tiles/src/main/java/org/apache/struts2/tiles/StrutsTilesContainerFactory.java
index 2c9b094..57594af 100644
---
a/plugins/tiles/src/main/java/org/apache/struts2/tiles/StrutsTilesContainerFactory.java
+++
b/plugins/tiles/src/main/java/org/apache/struts2/tiles/StrutsTilesContainerFactory.java
@@ -149,8 +149,8 @@ public class StrutsTilesContainerFactory extends
BasicTilesContainerFactory {
DefinitionPatternMatcherFactory regexpFactory = new
RegexpDefinitionPatternMatcherFactory();
PrefixedPatternDefinitionResolver resolver = new
PrefixedPatternDefinitionResolver<>();
-resolver.registerDefinitionPatternMatcherFactory("WILDCARD",
wildcardFactory);
-resolver.registerDefinitionPatternMatcherFactory("REGEXP",
regexpFactory);
+resolver.registerDefinitionPatternMatcherFactory(PATTERN_WILDCARD,
wildcardFactory);
+resolver.registerDefinitionPatternMatcherFactory(PATTERN_REGEXP,
regexpFactory);
return resolver;
}
[39/50] [abbrv] struts git commit: Simplifies logging
Simplifies logging
Project: http://git-wip-us.apache.org/repos/asf/struts/repo
Commit: http://git-wip-us.apache.org/repos/asf/struts/commit/8b607857
Tree: http://git-wip-us.apache.org/repos/asf/struts/tree/8b607857
Diff: http://git-wip-us.apache.org/repos/asf/struts/diff/8b607857
Branch: refs/heads/master
Commit: 8b6078570ebec52bfd23f3667d9736fc30bbc8d3
Parents: 47c6467
Author: Lukasz Lenart
Authored: Sun Jan 17 10:25:36 2016 +0100
Committer: Lukasz Lenart
Committed: Tue Jan 19 16:19:20 2016 +0100
--
.../struts2/tiles/StrutsWildcardServletApplicationContext.java | 5 ++---
1 file changed, 2 insertions(+), 3 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/struts/blob/8b607857/plugins/tiles/src/main/java/org/apache/struts2/tiles/StrutsWildcardServletApplicationContext.java
--
diff --git
a/plugins/tiles/src/main/java/org/apache/struts2/tiles/StrutsWildcardServletApplicationContext.java
b/plugins/tiles/src/main/java/org/apache/struts2/tiles/StrutsWildcardServletApplicationContext.java
index 2f67f04..0fa1bc3 100644
---
a/plugins/tiles/src/main/java/org/apache/struts2/tiles/StrutsWildcardServletApplicationContext.java
+++
b/plugins/tiles/src/main/java/org/apache/struts2/tiles/StrutsWildcardServletApplicationContext.java
@@ -24,7 +24,6 @@ import com.opensymphony.xwork2.util.WildcardUtil;
import com.opensymphony.xwork2.util.finder.ResourceFinder;
import org.apache.logging.log4j.LogManager;
import org.apache.logging.log4j.Logger;
-import org.apache.logging.log4j.message.MessageFormatMessage;
import org.apache.tiles.request.ApplicationResource;
import org.apache.tiles.request.servlet.ServletApplicationContext;
@@ -89,7 +88,7 @@ public class StrutsWildcardServletApplicationContext extends
ServletApplicationC
try {
resources.addAll(findResources(path));
} catch (IOException e) {
-LOG.error(new MessageFormatMessage("Cannot find resources for
[{}]", path), e);
+LOG.error("Cannot find resources for [{}]", path, e);
}
return resources;
@@ -101,7 +100,7 @@ public class StrutsWildcardServletApplicationContext
extends ServletApplicationC
try {
return new StrutsApplicationResource(URI.create("file://" +
localePath).toURL());
} catch (MalformedURLException e) {
-LOG.warn(new MessageFormatMessage("Cannot access [{}]",
localePath), e);
+LOG.warn("Cannot access [{}]", localePath, e);
return null;
}
}
[30/50] [abbrv] struts git commit: Adds missing dependencies to tiles-request
Adds missing dependencies to tiles-request
Project: http://git-wip-us.apache.org/repos/asf/struts/repo
Commit: http://git-wip-us.apache.org/repos/asf/struts/commit/375faa41
Tree: http://git-wip-us.apache.org/repos/asf/struts/tree/375faa41
Diff: http://git-wip-us.apache.org/repos/asf/struts/diff/375faa41
Branch: refs/heads/master
Commit: 375faa41d4494108b04bb57a02511650cd1fad4e
Parents: 21a1e8b
Author: Lukasz Lenart
Authored: Wed Jan 13 12:04:43 2016 +0100
Committer: Lukasz Lenart
Committed: Tue Jan 19 16:19:19 2016 +0100
--
plugins/tiles/pom.xml | 18 +-
pom.xml | 15 +++
2 files changed, 32 insertions(+), 1 deletion(-)
--
http://git-wip-us.apache.org/repos/asf/struts/blob/375faa41/plugins/tiles/pom.xml
--
diff --git a/plugins/tiles/pom.xml b/plugins/tiles/pom.xml
index 09cd71e..0b964af 100644
--- a/plugins/tiles/pom.xml
+++ b/plugins/tiles/pom.xml
@@ -48,8 +48,19 @@
org.apache.tiles
+tiles-request-api
+
+
+org.apache.tiles
+tiles-request-jsp
+
+
+org.apache.tiles
+tiles-request-servlet
+
+
+org.apache.tiles
tiles-jsp
-runtime
org.apache.tiles
@@ -68,6 +79,11 @@
javax.el
true
+
+javax.servlet
+jsp-api
+provided
+
UTF-8
http://git-wip-us.apache.org/repos/asf/struts/blob/375faa41/pom.xml
--
diff --git a/pom.xml b/pom.xml
index 1e0f708..5d836d3 100644
--- a/pom.xml
+++ b/pom.xml
@@ -626,6 +626,21 @@
org.apache.tiles
+tiles-request-api
+${tiles-request.version}
+
+
+org.apache.tiles
+tiles-request-jsp
+${tiles-request.version}
+
+
+org.apache.tiles
+tiles-request-servlet
+${tiles-request.version}
+
+
+org.apache.tiles
tiles-jsp
${tiles.version}
[04/50] [abbrv] struts git commit: make test passed for people not using GMT.
make test passed for people not using GMT.
Project: http://git-wip-us.apache.org/repos/asf/struts/repo
Commit: http://git-wip-us.apache.org/repos/asf/struts/commit/49a7fe14
Tree: http://git-wip-us.apache.org/repos/asf/struts/tree/49a7fe14
Diff: http://git-wip-us.apache.org/repos/asf/struts/diff/49a7fe14
Branch: refs/heads/master
Commit: 49a7fe14d57c5dd607dee9d99d94a796f0b37c11
Parents: cee303a
Author: donghui
Authored: Mon Jan 4 11:23:51 2016 +0800
Committer: Lukasz Lenart
Committed: Tue Jan 19 16:17:09 2016 +0100
--
.../apache/struts2/rest/DefaultHttpHeadersTest.java | 16
1 file changed, 12 insertions(+), 4 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/struts/blob/49a7fe14/plugins/rest/src/test/java/org/apache/struts2/rest/DefaultHttpHeadersTest.java
--
diff --git
a/plugins/rest/src/test/java/org/apache/struts2/rest/DefaultHttpHeadersTest.java
b/plugins/rest/src/test/java/org/apache/struts2/rest/DefaultHttpHeadersTest.java
index 57e9d67..d800536 100644
---
a/plugins/rest/src/test/java/org/apache/struts2/rest/DefaultHttpHeadersTest.java
+++
b/plugins/rest/src/test/java/org/apache/struts2/rest/DefaultHttpHeadersTest.java
@@ -27,6 +27,8 @@ import org.springframework.mock.web.MockHttpServletResponse;
import java.text.SimpleDateFormat;
import java.util.Date;
+import java.util.Locale;
+import java.util.TimeZone;
import static javax.servlet.http.HttpServletResponse.*;
@@ -130,7 +132,7 @@ public class DefaultHttpHeadersTest extends TestCase {
Date now = new Date();
DefaultHttpHeaders headers = new DefaultHttpHeaders()
.lastModified(now);
-mockRequest.addHeader("If-Modified-Since", new SimpleDateFormat("EEE,
dd MMM HH:mm:ss zzz").format(now));
+mockRequest.addHeader("If-Modified-Since",
getGMTDateFormat().format(now));
headers.apply(mockRequest, mockResponse, new Object());
assertEquals(SC_NOT_MODIFIED, mockResponse.getStatus());
@@ -149,7 +151,7 @@ public class DefaultHttpHeadersTest extends TestCase {
public void testLastModifiedSince() {
Date now = new Date();
DefaultHttpHeaders headers = new
DefaultHttpHeaders().lastModified(now);
-mockRequest.addHeader("If-Modified-Since", new SimpleDateFormat("EEE,
dd MMM HH:mm:ss zzz").format(now));
+mockRequest.addHeader("If-Modified-Since",
getGMTDateFormat().format(now));
headers.apply(mockRequest, mockResponse, new Object());
assertEquals(SC_NOT_MODIFIED, mockResponse.getStatus());
@@ -158,7 +160,7 @@ public class DefaultHttpHeadersTest extends TestCase {
public void testLastModifiedSinceIsOlder() {
Date now = new Date();
DefaultHttpHeaders headers = new
DefaultHttpHeaders().lastModified(now);
-mockRequest.addHeader("If-Modified-Since", new SimpleDateFormat("EEE,
dd MMM HH:mm:ss zzz").format(new Date(now.getTime() - 1000 * 60 * 60)));
+mockRequest.addHeader("If-Modified-Since",
getGMTDateFormat().format(new Date(now.getTime() - 1000 * 60 * 60)));
headers.apply(mockRequest, mockResponse, new Object());
assertEquals(SC_NOT_MODIFIED, mockResponse.getStatus());
@@ -170,7 +172,7 @@ public class DefaultHttpHeadersTest extends TestCase {
.lastModified(now)
.withETag("asdf");
mockRequest.addHeader("If-None-Match", "asdf");
-mockRequest.addHeader("If-Modified-Since", new SimpleDateFormat("EEE,
dd MMM HH:mm:ss zzz").format(now));
+mockRequest.addHeader("If-Modified-Since",
getGMTDateFormat().format(now));
headers.apply(mockRequest, mockResponse, new Object());
assertEquals(SC_NOT_MODIFIED, mockResponse.getStatus());
@@ -216,4 +218,10 @@ public class DefaultHttpHeadersTest extends TestCase {
assertEquals(SC_OK, mockResponse.getStatus());
}
+
+private SimpleDateFormat getGMTDateFormat() {
+SimpleDateFormat format = new SimpleDateFormat("EEE, dd MMM
HH:mm:ss zzz", Locale.US);
+format.setTimeZone(TimeZone.getTimeZone("GMT"));
+return format;
+}
}
[33/50] [abbrv] struts git commit: WW-4507 - clone Tomcat UDecoder and use it for in query string handling (cherry picked from commit 5421930)
WW-4507 - clone Tomcat UDecoder and use it for in query string handling
(cherry picked from commit 5421930)
Project: http://git-wip-us.apache.org/repos/asf/struts/repo
Commit: http://git-wip-us.apache.org/repos/asf/struts/commit/76f18840
Tree: http://git-wip-us.apache.org/repos/asf/struts/tree/76f18840
Diff: http://git-wip-us.apache.org/repos/asf/struts/diff/76f18840
Branch: refs/heads/master
Commit: 76f188406eb9f17a06afcb5f49f0c44d749da0d2
Parents: b0613a6
Author: Rene Gielen
Authored: Thu Jan 14 14:52:03 2016 +0100
Committer: Lukasz Lenart
Committed: Tue Jan 19 16:19:19 2016 +0100
--
.../dispatcher/mapper/Restful2ActionMapper.java | 6 +-
.../dispatcher/mapper/RestfulActionMapper.java | 6 +-
.../org/apache/struts2/util/URLDecoderUtil.java | 22 +
.../apache/struts2/util/tomcat/buf/Ascii.java | 255 +
.../struts2/util/tomcat/buf/B2CConverter.java | 201
.../struts2/util/tomcat/buf/ByteChunk.java | 935 +++
.../struts2/util/tomcat/buf/CharChunk.java | 700 ++
.../struts2/util/tomcat/buf/HexUtils.java | 113 +++
.../struts2/util/tomcat/buf/MessageBytes.java | 546 +++
.../struts2/util/tomcat/buf/StringCache.java| 695 ++
.../struts2/util/tomcat/buf/UDecoder.java | 421 +
.../struts2/util/tomcat/buf/Utf8Decoder.java| 293 ++
.../struts2/views/util/DefaultUrlHelper.java| 7 +-
.../apache/struts2/util/URLDecoderUtilTest.java | 71 ++
14 files changed, 4262 insertions(+), 9 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/struts/blob/76f18840/core/src/main/java/org/apache/struts2/dispatcher/mapper/Restful2ActionMapper.java
--
diff --git
a/core/src/main/java/org/apache/struts2/dispatcher/mapper/Restful2ActionMapper.java
b/core/src/main/java/org/apache/struts2/dispatcher/mapper/Restful2ActionMapper.java
index b474913..c2a9bfc 100644
---
a/core/src/main/java/org/apache/struts2/dispatcher/mapper/Restful2ActionMapper.java
+++
b/core/src/main/java/org/apache/struts2/dispatcher/mapper/Restful2ActionMapper.java
@@ -27,9 +27,9 @@ import org.apache.commons.lang3.StringUtils;
import org.apache.logging.log4j.LogManager;
import org.apache.logging.log4j.Logger;
import org.apache.struts2.StrutsConstants;
+import org.apache.struts2.util.URLDecoderUtil;
import javax.servlet.http.HttpServletRequest;
-import java.net.URLDecoder;
import java.util.HashMap;
import java.util.StringTokenizer;
@@ -132,10 +132,10 @@ public class Restful2ActionMapper extends
DefaultActionMapper {
while (st.hasMoreTokens()) {
if (isNameTok) {
-paramName = URLDecoder.decode(st.nextToken(),
"UTF-8");
+paramName = URLDecoderUtil.decode(st.nextToken(),
"UTF-8");
isNameTok = false;
} else {
-paramValue = URLDecoder.decode(st.nextToken(),
"UTF-8");
+paramValue = URLDecoderUtil.decode(st.nextToken(),
"UTF-8");
if ((paramName != null) && (paramName.length() >
0)) {
parameters.put(paramName, paramValue);
http://git-wip-us.apache.org/repos/asf/struts/blob/76f18840/core/src/main/java/org/apache/struts2/dispatcher/mapper/RestfulActionMapper.java
--
diff --git
a/core/src/main/java/org/apache/struts2/dispatcher/mapper/RestfulActionMapper.java
b/core/src/main/java/org/apache/struts2/dispatcher/mapper/RestfulActionMapper.java
index d7ae2c0..9db58e3 100644
---
a/core/src/main/java/org/apache/struts2/dispatcher/mapper/RestfulActionMapper.java
+++
b/core/src/main/java/org/apache/struts2/dispatcher/mapper/RestfulActionMapper.java
@@ -25,9 +25,9 @@ import com.opensymphony.xwork2.config.ConfigurationManager;
import org.apache.logging.log4j.LogManager;
import org.apache.logging.log4j.Logger;
import org.apache.struts2.RequestUtils;
+import org.apache.struts2.util.URLDecoderUtil;
import javax.servlet.http.HttpServletRequest;
-import java.net.URLDecoder;
import java.util.HashMap;
import java.util.Map;
import java.util.StringTokenizer;
@@ -67,10 +67,10 @@ public class RestfulActionMapper implements ActionMapper {
while (st.hasMoreTokens()) {
if (isNameTok) {
-paramName = URLDecoder.decode(st.nextToken(), "UTF-8");
+paramName = URLDecoderUtil.decode(st.nextToken(), "UTF-8");
isNameTok = false;
} else {
-paramValue = URLDecoder.decode(st.nextToken(), "UTF-8");
+paramValue = URLDecoderUtil.decode(st.nextToken(),
"UTF-8");
[11/50] [abbrv] struts git commit: Fix for WW-4312
Fix for WW-4312
A problem on Iterator tag
and WW-3010 s:iterator fails to iterate over collections containing
null
Project: http://git-wip-us.apache.org/repos/asf/struts/repo
Commit: http://git-wip-us.apache.org/repos/asf/struts/commit/fd33dc84
Tree: http://git-wip-us.apache.org/repos/asf/struts/tree/fd33dc84
Diff: http://git-wip-us.apache.org/repos/asf/struts/diff/fd33dc84
Branch: refs/heads/master
Commit: fd33dc84a674edbeecfc5638995da9a13816dafc
Parents: e9bd945
Author: Victor Sosa
Authored: Mon Jan 4 18:03:47 2016 -0400
Committer: Lukasz Lenart
Committed: Tue Jan 19 16:18:00 2016 +0100
--
.../main/java/org/apache/struts2/components/IteratorComponent.java | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
--
http://git-wip-us.apache.org/repos/asf/struts/blob/fd33dc84/core/src/main/java/org/apache/struts2/components/IteratorComponent.java
--
diff --git
a/core/src/main/java/org/apache/struts2/components/IteratorComponent.java
b/core/src/main/java/org/apache/struts2/components/IteratorComponent.java
index b62424f..1474fe9 100644
--- a/core/src/main/java/org/apache/struts2/components/IteratorComponent.java
+++ b/core/src/main/java/org/apache/struts2/components/IteratorComponent.java
@@ -304,7 +304,7 @@ public class IteratorComponent extends ContextBean {
String var = getVar();
-if ((var != null) && (currentValue != null)) {
+if ((var != null)) {
putInContext(currentValue);
}
[32/50] [abbrv] struts git commit: WW-4507 - clone Tomcat UDecoder and use it for in query string handling (cherry picked from commit 5421930)
http://git-wip-us.apache.org/repos/asf/struts/blob/76f18840/core/src/main/java/org/apache/struts2/util/tomcat/buf/MessageBytes.java
--
diff --git
a/core/src/main/java/org/apache/struts2/util/tomcat/buf/MessageBytes.java
b/core/src/main/java/org/apache/struts2/util/tomcat/buf/MessageBytes.java
new file mode 100644
index 000..df07284
--- /dev/null
+++ b/core/src/main/java/org/apache/struts2/util/tomcat/buf/MessageBytes.java
@@ -0,0 +1,546 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package org.apache.struts2.util.tomcat.buf;
+
+import java.io.IOException;
+import java.io.Serializable;
+import java.nio.ByteBuffer;
+import java.nio.charset.Charset;
+import java.util.Locale;
+
+/**
+ * This class is used to represent a subarray of bytes in an HTTP message.
+ * It represents all request/response elements. The byte/char conversions are
+ * delayed and cached. Everything is recyclable.
+ *
+ * The object can represent a byte[], a char[], or a (sub) String. All
+ * operations can be made in case sensitive mode or not.
+ *
+ * @author d...@eng.sun.com
+ * @author James Todd [go...@eng.sun.com]
+ * @author Costin Manolache
+ */
+public final class MessageBytes implements Cloneable, Serializable {
+private static final long serialVersionUID = 1L;
+
+// primary type ( whatever is set as original value )
+private int type = T_NULL;
+
+public static final int T_NULL = 0;
+/** getType() is T_STR if the the object used to create the MessageBytes
+was a String */
+public static final int T_STR = 1;
+/** getType() is T_STR if the the object used to create the MessageBytes
+was a byte[] */
+public static final int T_BYTES = 2;
+/** getType() is T_STR if the the object used to create the MessageBytes
+was a char[] */
+public static final int T_CHARS = 3;
+
+private int hashCode=0;
+// did we compute the hashcode ?
+private boolean hasHashCode=false;
+
+// Internal objects to represent array + offset, and specific methods
+private final ByteChunk byteC=new ByteChunk();
+private final CharChunk charC=new CharChunk();
+
+// String
+private String strValue;
+// true if a String value was computed. Probably not needed,
+// strValue!=null is the same
+private boolean hasStrValue=false;
+
+/**
+ * Creates a new, uninitialized MessageBytes object.
+ * Use static newInstance() in order to allow
+ * future hooks.
+ */
+private MessageBytes() {
+}
+
+/** Construct a new MessageBytes instance
+ */
+public static MessageBytes newInstance() {
+return factory.newInstance();
+}
+
+public boolean isNull() {
+// should we check also hasStrValue ???
+return byteC.isNull() && charC.isNull() && ! hasStrValue;
+// bytes==null && strValue==null;
+}
+
+/**
+ * Resets the message bytes to an uninitialized (NULL) state.
+ */
+public void recycle() {
+type=T_NULL;
+byteC.recycle();
+charC.recycle();
+
+strValue=null;
+
+hasStrValue=false;
+hasHashCode=false;
+hasLongValue=false;
+}
+
+
+/**
+ * Sets the content to the specified subarray of bytes.
+ *
+ * @param b the bytes
+ * @param off the start offset of the bytes
+ * @param len the length of the bytes
+ */
+public void setBytes(byte[] b, int off, int len) {
+byteC.setBytes( b, off, len );
+type=T_BYTES;
+hasStrValue=false;
+hasHashCode=false;
+hasLongValue=false;
+}
+
+/**
+ * Sets the content to be a char[]
+ *
+ * @param c the bytes
+ * @param off the start offset of the bytes
+ * @param len the length of the bytes
+ */
+public void setChars( char[] c, int off, int len ) {
+charC.setChars( c, off, len );
+type=T_CHARS;
+hasStrValue=false;
+hasHashCode=false;
+hasLongValue=false;
+}
+
+/**
+ * Set the content to be a string
+ */
+public void setString( String s ) {
+strValue=s;
+hasHashCode=false;
+
[20/50] [abbrv] struts git commit: Adjusts code to Tiles 3
Adjusts code to Tiles 3
Project: http://git-wip-us.apache.org/repos/asf/struts/repo
Commit: http://git-wip-us.apache.org/repos/asf/struts/commit/9249aacd
Tree: http://git-wip-us.apache.org/repos/asf/struts/tree/9249aacd
Diff: http://git-wip-us.apache.org/repos/asf/struts/diff/9249aacd
Branch: refs/heads/master
Commit: 9249aacded1449c967c76ae58985e4dd22274d48
Parents: 0737d72
Author: Lukasz Lenart
Authored: Tue Jan 12 10:13:51 2016 +0100
Committer: Lukasz Lenart
Committed: Tue Jan 19 16:18:42 2016 +0100
--
.../StrutsFreeMarkerAttributeRenderer.java | 75 -
.../tiles/StrutsTilesContainerFactory.java | 163 +++
.../struts2/tiles/StrutsTilesInitializer.java | 6 +-
...sWildcardServletTilesApplicationContext.java | 34 ++--
4 files changed, 110 insertions(+), 168 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/struts/blob/9249aacd/plugins/tiles/src/main/java/org/apache/struts2/tiles/StrutsFreeMarkerAttributeRenderer.java
--
diff --git
a/plugins/tiles/src/main/java/org/apache/struts2/tiles/StrutsFreeMarkerAttributeRenderer.java
b/plugins/tiles/src/main/java/org/apache/struts2/tiles/StrutsFreeMarkerAttributeRenderer.java
index 849053a..48592e0 100644
---
a/plugins/tiles/src/main/java/org/apache/struts2/tiles/StrutsFreeMarkerAttributeRenderer.java
+++
b/plugins/tiles/src/main/java/org/apache/struts2/tiles/StrutsFreeMarkerAttributeRenderer.java
@@ -33,68 +33,53 @@ import org.apache.struts2.views.JspSupportServlet;
import org.apache.struts2.views.freemarker.FreemarkerManager;
import org.apache.struts2.views.freemarker.FreemarkerResult;
import org.apache.struts2.views.freemarker.StrutsBeanWrapper;
-import org.apache.tiles.Attribute;
-import org.apache.tiles.context.TilesRequestContext;
import org.apache.tiles.freemarker.template.TilesFMModelRepository;
import org.apache.tiles.impl.InvalidTemplateException;
-import org.apache.tiles.renderer.impl.AbstractTypeDetectingAttributeRenderer;
-import org.apache.tiles.servlet.context.ServletTilesRequestContext;
-import org.apache.tiles.servlet.context.ServletUtil;
+import org.apache.tiles.request.Request;
+import org.apache.tiles.request.render.Renderer;
import javax.servlet.ServletContext;
import javax.servlet.http.HttpServletRequest;
import java.io.IOException;
-public class StrutsFreeMarkerAttributeRenderer extends
AbstractTypeDetectingAttributeRenderer {
+public class StrutsFreeMarkerAttributeRenderer implements Renderer {
private static Logger LOG =
LogManager.getLogger(StrutsFreeMarkerAttributeRenderer.class);
@Override
-public void write(Object value, Attribute attribute, TilesRequestContext
request) throws IOException {
-if (value != null) {
-if (value instanceof String) {
-LOG.trace("Rendering freemarker tile ...");
-
-ServletTilesRequestContext servletRequest =
ServletUtil.getServletRequest(request);
-HttpServletRequest httpRequest = servletRequest.getRequest();
-
-ActionContext ctx =
ServletActionContext.getActionContext(httpRequest);
-if (ctx == null) {
-throw new ConfigurationException("There is no
ActionContext for current request!");
-}
-
-registerTilesBeanModel(ctx);
-
-String include = (String) value;
-FreemarkerResult result = new FreemarkerResult(include);
-result.setWriter(request.getWriter());
-
-Container container = ctx.getContainer();
-container.inject(result);
-
-try {
-ActionInvocation invocation = ctx.getActionInvocation();
-result.doExecute(include, invocation);
-} catch (TemplateException e) {
-LOG.error("Exception was thrown during rendering value {}:
{}", value, e.getMessage());
-throw new InvalidTemplateException(e);
-}
-} else {
-LOG.error("Value {} is not a String, cannot render template!",
value);
-throw new InvalidTemplateException("Cannot render a template
that is not a string: " + String.valueOf(value));
+public void render(String path, Request request) throws IOException {
+if (path != null) {
+LOG.trace("Rendering freemarker tile ...");
+
+ActionContext ctx =
ServletActionContext.getActionContext((HttpServletRequest) request);
+if (ctx == null) {
+throw new ConfigurationException("There is no ActionContext
for current request!");
+}
+
+registerTilesBeanModel(ctx);
+
+FreemarkerResult result = new FreemarkerResult(path);
+result.set
[22/50] [abbrv] struts git commit: Upgrade Tiles dependencies
Upgrade Tiles dependencies
Project: http://git-wip-us.apache.org/repos/asf/struts/repo
Commit: http://git-wip-us.apache.org/repos/asf/struts/commit/4e3f950b
Tree: http://git-wip-us.apache.org/repos/asf/struts/tree/4e3f950b
Diff: http://git-wip-us.apache.org/repos/asf/struts/diff/4e3f950b
Branch: refs/heads/master
Commit: 4e3f950b279b6ad9e24cf1b46ec7c0b58a031c80
Parents: bdf4f0b
Author: Lukasz Lenart
Authored: Tue Jan 12 08:51:14 2016 +0100
Committer: Lukasz Lenart
Committed: Tue Jan 19 16:18:42 2016 +0100
--
plugins/tiles/pom.xml | 13 -
pom.xml | 13 +
2 files changed, 1 insertion(+), 25 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/struts/blob/4e3f950b/plugins/tiles/pom.xml
--
diff --git a/plugins/tiles/pom.xml b/plugins/tiles/pom.xml
index 45a9b7e..be39762 100644
--- a/plugins/tiles/pom.xml
+++ b/plugins/tiles/pom.xml
@@ -49,14 +49,6 @@
org.apache.tiles
-tiles-servlet-wildcard
-
-
-org.apache.tiles
-tiles-jsp
-
-
-org.apache.tiles
tiles-freemarker
@@ -68,11 +60,6 @@
tiles-el
-javax.servlet
-jsp-api
-provided
-
-
org.glassfish
javax.el
true
http://git-wip-us.apache.org/repos/asf/struts/blob/4e3f950b/pom.xml
--
diff --git a/pom.xml b/pom.xml
index 6d59057..4edd1fd 100644
--- a/pom.xml
+++ b/pom.xml
@@ -88,7 +88,7 @@
3.1.2
3.3
5.0.2
-2.2.2
+3.0.5
2.5
@@ -622,17 +622,6 @@
org.apache.tiles
tiles-jsp
${tiles.version}
-runtime
-
-
-org.apache.tiles
-tiles-servlet-wildcard
-${tiles.version}
-
-
-org.apache.tiles
-tiles-jsp
-${tiles.version}
org.apache.tiles
[23/50] [abbrv] struts git commit: Ports solution to resolve problem with EL functions
Ports solution to resolve problem with EL functions
Project: http://git-wip-us.apache.org/repos/asf/struts/repo
Commit: http://git-wip-us.apache.org/repos/asf/struts/commit/8d83dc2f
Tree: http://git-wip-us.apache.org/repos/asf/struts/tree/8d83dc2f
Diff: http://git-wip-us.apache.org/repos/asf/struts/diff/8d83dc2f
Branch: refs/heads/master
Commit: 8d83dc2f964a7af332df16b63a1380db5a26ced0
Parents: 4e3f950
Author: Lukasz Lenart
Authored: Tue Jan 12 08:51:34 2016 +0100
Committer: Lukasz Lenart
Committed: Tue Jan 19 16:18:42 2016 +0100
--
.../java/org/apache/struts2/views/freemarker/FreemarkerManager.java | 1 +
1 file changed, 1 insertion(+)
--
http://git-wip-us.apache.org/repos/asf/struts/blob/8d83dc2f/core/src/main/java/org/apache/struts2/views/freemarker/FreemarkerManager.java
--
diff --git
a/core/src/main/java/org/apache/struts2/views/freemarker/FreemarkerManager.java
b/core/src/main/java/org/apache/struts2/views/freemarker/FreemarkerManager.java
index ddc7669..3323302 100644
---
a/core/src/main/java/org/apache/struts2/views/freemarker/FreemarkerManager.java
+++
b/core/src/main/java/org/apache/struts2/views/freemarker/FreemarkerManager.java
@@ -350,6 +350,7 @@ public class FreemarkerManager {
servletContext.setAttribute(ATTR_APPLICATION_MODEL,
servletContextModel);
}
TaglibFactory taglibs = new TaglibFactory(servletContext);
+taglibs.setObjectWrapper(wrapper);
servletContext.setAttribute(ATTR_JSP_TAGLIBS_MODEL, taglibs);
}
model.put(KEY_APPLICATION, servletContextModel);
[28/50] [abbrv] struts git commit: WW-4507 - adjust Tomcat url decoding code to Log4j 2 logging used in Struts
WW-4507 - adjust Tomcat url decoding code to Log4j 2 logging used in Struts
Project: http://git-wip-us.apache.org/repos/asf/struts/repo
Commit: http://git-wip-us.apache.org/repos/asf/struts/commit/4720f46a
Tree: http://git-wip-us.apache.org/repos/asf/struts/tree/4720f46a
Diff: http://git-wip-us.apache.org/repos/asf/struts/diff/4720f46a
Branch: refs/heads/master
Commit: 4720f46a63caaf9db97ba27dc51ac5ad21e66bdc
Parents: 76f1884
Author: Rene Gielen
Authored: Thu Jan 14 15:24:34 2016 +0100
Committer: Lukasz Lenart
Committed: Tue Jan 19 16:19:19 2016 +0100
--
.../java/org/apache/struts2/util/tomcat/buf/StringCache.java | 6 +++---
.../main/java/org/apache/struts2/util/tomcat/buf/UDecoder.java | 6 +++---
2 files changed, 6 insertions(+), 6 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/struts/blob/4720f46a/core/src/main/java/org/apache/struts2/util/tomcat/buf/StringCache.java
--
diff --git
a/core/src/main/java/org/apache/struts2/util/tomcat/buf/StringCache.java
b/core/src/main/java/org/apache/struts2/util/tomcat/buf/StringCache.java
index 3a72d49..f982b7d 100644
--- a/core/src/main/java/org/apache/struts2/util/tomcat/buf/StringCache.java
+++ b/core/src/main/java/org/apache/struts2/util/tomcat/buf/StringCache.java
@@ -16,8 +16,8 @@
*/
package org.apache.struts2.util.tomcat.buf;
-import com.opensymphony.xwork2.util.logging.Logger;
-import com.opensymphony.xwork2.util.logging.LoggerFactory;
+import org.apache.logging.log4j.LogManager;
+import org.apache.logging.log4j.Logger;
import java.nio.charset.Charset;
import java.util.ArrayList;
@@ -33,7 +33,7 @@ import java.util.TreeMap;
public class StringCache {
-private static final Logger log =
LoggerFactory.getLogger(StringCache.class);
+private static final Logger log = LogManager.getLogger(StringCache.class);
// --- Static Variables
http://git-wip-us.apache.org/repos/asf/struts/blob/4720f46a/core/src/main/java/org/apache/struts2/util/tomcat/buf/UDecoder.java
--
diff --git
a/core/src/main/java/org/apache/struts2/util/tomcat/buf/UDecoder.java
b/core/src/main/java/org/apache/struts2/util/tomcat/buf/UDecoder.java
index b52cda7..7f9beec 100644
--- a/core/src/main/java/org/apache/struts2/util/tomcat/buf/UDecoder.java
+++ b/core/src/main/java/org/apache/struts2/util/tomcat/buf/UDecoder.java
@@ -16,9 +16,9 @@
*/
package org.apache.struts2.util.tomcat.buf;
-import com.opensymphony.xwork2.util.logging.LoggerFactory;
+import org.apache.logging.log4j.LogManager;
+import org.apache.logging.log4j.Logger;
-import com.opensymphony.xwork2.util.logging.Logger;
import java.io.CharConversionException;
import java.io.IOException;
import java.io.UnsupportedEncodingException;
@@ -33,7 +33,7 @@ import java.io.UnsupportedEncodingException;
*/
public final class UDecoder {
-private static final Logger log = LoggerFactory.getLogger(UDecoder.class);
+private static final Logger log = LogManager.getLogger(UDecoder.class);
public static final boolean ALLOW_ENCODED_SLASH =
Boolean.parseBoolean(System.getProperty("org.apache.tomcat.util.buf.UDecoder.ALLOW_ENCODED_SLASH",
"false"));
[43/50] [abbrv] struts git commit: Adds support for I18N
Adds support for I18N
Project: http://git-wip-us.apache.org/repos/asf/struts/repo
Commit: http://git-wip-us.apache.org/repos/asf/struts/commit/47c6467f
Tree: http://git-wip-us.apache.org/repos/asf/struts/tree/47c6467f
Diff: http://git-wip-us.apache.org/repos/asf/struts/diff/47c6467f
Branch: refs/heads/master
Commit: 47c6467fe024b4164709f840187b89fbcb0a7ac7
Parents: 42628da
Author: Lukasz Lenart
Authored: Fri Jan 15 10:12:25 2016 +0100
Committer: Lukasz Lenart
Committed: Tue Jan 19 16:19:20 2016 +0100
--
.../tiles/StrutsApplicationResource.java| 55
...StrutsWildcardServletApplicationContext.java | 15 --
2 files changed, 67 insertions(+), 3 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/struts/blob/47c6467f/plugins/tiles/src/main/java/org/apache/struts2/tiles/StrutsApplicationResource.java
--
diff --git
a/plugins/tiles/src/main/java/org/apache/struts2/tiles/StrutsApplicationResource.java
b/plugins/tiles/src/main/java/org/apache/struts2/tiles/StrutsApplicationResource.java
new file mode 100644
index 000..6884e9a
--- /dev/null
+++
b/plugins/tiles/src/main/java/org/apache/struts2/tiles/StrutsApplicationResource.java
@@ -0,0 +1,55 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+
+package org.apache.struts2.tiles;
+
+import org.apache.tiles.request.locale.PostfixedApplicationResource;
+
+import java.io.File;
+import java.io.IOException;
+import java.io.InputStream;
+import java.net.URL;
+
+public class StrutsApplicationResource extends PostfixedApplicationResource {
+
+private final URL url;
+
+public StrutsApplicationResource(URL url) {
+super(url.getPath());
+this.url = url;
+}
+
+@Override
+public InputStream getInputStream() throws IOException {
+if (new File(url.getPath()).exists()) {
+return url.openStream();
+}
+return null;
+}
+
+@Override
+public long getLastModified() throws IOException {
+File file = new File(url.getPath());
+if (file.exists()) {
+return file.lastModified();
+}
+return 0;
+}
+
+}
http://git-wip-us.apache.org/repos/asf/struts/blob/47c6467f/plugins/tiles/src/main/java/org/apache/struts2/tiles/StrutsWildcardServletApplicationContext.java
--
diff --git
a/plugins/tiles/src/main/java/org/apache/struts2/tiles/StrutsWildcardServletApplicationContext.java
b/plugins/tiles/src/main/java/org/apache/struts2/tiles/StrutsWildcardServletApplicationContext.java
index b8f10f9..2f67f04 100644
---
a/plugins/tiles/src/main/java/org/apache/struts2/tiles/StrutsWildcardServletApplicationContext.java
+++
b/plugins/tiles/src/main/java/org/apache/struts2/tiles/StrutsWildcardServletApplicationContext.java
@@ -26,13 +26,13 @@ import org.apache.logging.log4j.LogManager;
import org.apache.logging.log4j.Logger;
import org.apache.logging.log4j.message.MessageFormatMessage;
import org.apache.tiles.request.ApplicationResource;
-import org.apache.tiles.request.locale.URLApplicationResource;
import org.apache.tiles.request.servlet.ServletApplicationContext;
import javax.servlet.ServletContext;
import java.io.File;
import java.io.IOException;
import java.net.MalformedURLException;
+import java.net.URI;
import java.net.URL;
import java.util.Collection;
import java.util.Enumeration;
@@ -96,7 +96,16 @@ public class StrutsWildcardServletApplicationContext extends
ServletApplicationC
}
public ApplicationResource getResource(ApplicationResource base, Locale
locale) {
-return base;
+String localePath = base.getLocalePath(locale);
+if (new File(localePath).exists()) {
+try {
+return new StrutsApplicationResource(URI.create("file://" +
localePath).toURL());
+} catch (MalformedURLException e) {
+LOG.warn(new MessageFormatMessage("Cannot access [{}]",
localePath), e);
+return null;
+
[14/50] [abbrv] struts git commit: Removes module
Removes module Project: http://git-wip-us.apache.org/repos/asf/struts/repo Commit: http://git-wip-us.apache.org/repos/asf/struts/commit/adb8a136 Tree: http://git-wip-us.apache.org/repos/asf/struts/tree/adb8a136 Diff: http://git-wip-us.apache.org/repos/asf/struts/diff/adb8a136 Branch: refs/heads/master Commit: adb8a1365cb74796363d649f10623205e9a6f54f Parents: 9f665f7 Author: Lukasz Lenart Authored: Tue Jan 12 08:19:52 2016 +0100 Committer: Lukasz Lenart Committed: Tue Jan 19 16:18:01 2016 +0100 -- plugins/pom.xml | 1 - 1 file changed, 1 deletion(-) -- http://git-wip-us.apache.org/repos/asf/struts/blob/adb8a136/plugins/pom.xml -- diff --git a/plugins/pom.xml b/plugins/pom.xml index 2f1fe76..ba44181 100644 --- a/plugins/pom.xml +++ b/plugins/pom.xml @@ -59,7 +59,6 @@ spring testng tiles -tiles3
[08/50] [abbrv] struts git commit: Patch WW-4381
Patch WW-4381
upgrade to jasperreports 6.0
to 6.0.3
Project: http://git-wip-us.apache.org/repos/asf/struts/repo
Commit: http://git-wip-us.apache.org/repos/asf/struts/commit/a446cdac
Tree: http://git-wip-us.apache.org/repos/asf/struts/tree/a446cdac
Diff: http://git-wip-us.apache.org/repos/asf/struts/diff/a446cdac
Branch: refs/heads/master
Commit: a446cdacc0f6d9168d03d7602a751b48ce066f1a
Parents: bccf099
Author: Victor Sosa
Authored: Mon Jan 4 13:50:41 2016 -0400
Committer: Lukasz Lenart
Committed: Tue Jan 19 16:18:00 2016 +0100
--
plugins/jasperreports/pom.xml| 4 ++--
.../apache/struts2/views/jasperreports/JasperReportsResult.java | 2 +-
2 files changed, 3 insertions(+), 3 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/struts/blob/a446cdac/plugins/jasperreports/pom.xml
--
diff --git a/plugins/jasperreports/pom.xml b/plugins/jasperreports/pom.xml
index fc32d73..612f0bb 100644
--- a/plugins/jasperreports/pom.xml
+++ b/plugins/jasperreports/pom.xml
@@ -39,9 +39,9 @@
commons-lang3
-jasperreports
+net.sf.jasperreports
jasperreports
-3.1.2
+6.0.3
provided
http://git-wip-us.apache.org/repos/asf/struts/blob/a446cdac/plugins/jasperreports/src/main/java/org/apache/struts2/views/jasperreports/JasperReportsResult.java
--
diff --git
a/plugins/jasperreports/src/main/java/org/apache/struts2/views/jasperreports/JasperReportsResult.java
b/plugins/jasperreports/src/main/java/org/apache/struts2/views/jasperreports/JasperReportsResult.java
index e356506..bee69d6 100644
---
a/plugins/jasperreports/src/main/java/org/apache/struts2/views/jasperreports/JasperReportsResult.java
+++
b/plugins/jasperreports/src/main/java/org/apache/struts2/views/jasperreports/JasperReportsResult.java
@@ -311,7 +311,7 @@ public class JasperReportsResult extends
StrutsResultSupport implements JasperRe
// Fill the report and produce a print object
try {
-JasperReport jasperReport = (JasperReport)
JRLoader.loadObject(systemId);
+JasperReport jasperReport = (JasperReport) JRLoader.loadObject(new
File(systemId));
if (conn == null) {
jasperPrint = JasperFillManager.fillReport(jasperReport,
parameters, stackDataSource);
}
[01/50] [abbrv] struts git commit: A proper way to close the db connection
Repository: struts
Updated Branches:
refs/heads/master cdbf697ad -> 70fdc00f6
A proper way to close the db connection
Project: http://git-wip-us.apache.org/repos/asf/struts/repo
Commit: http://git-wip-us.apache.org/repos/asf/struts/commit/cee303a4
Tree: http://git-wip-us.apache.org/repos/asf/struts/tree/cee303a4
Diff: http://git-wip-us.apache.org/repos/asf/struts/diff/cee303a4
Branch: refs/heads/master
Commit: cee303a4c449f66cb3245de4cfe3915e220b8549
Parents: 9420789
Author: Victor Sosa
Authored: Sun Jan 3 08:05:03 2016 -0400
Committer: Lukasz Lenart
Committed: Tue Jan 19 16:17:09 2016 +0100
--
.../struts2/views/jasperreports/JasperReportsResult.java | 6 +-
1 file changed, 5 insertions(+), 1 deletion(-)
--
http://git-wip-us.apache.org/repos/asf/struts/blob/cee303a4/plugins/jasperreports/src/main/java/org/apache/struts2/views/jasperreports/JasperReportsResult.java
--
diff --git
a/plugins/jasperreports/src/main/java/org/apache/struts2/views/jasperreports/JasperReportsResult.java
b/plugins/jasperreports/src/main/java/org/apache/struts2/views/jasperreports/JasperReportsResult.java
index 921a010..e0ea121 100644
---
a/plugins/jasperreports/src/main/java/org/apache/struts2/views/jasperreports/JasperReportsResult.java
+++
b/plugins/jasperreports/src/main/java/org/apache/struts2/views/jasperreports/JasperReportsResult.java
@@ -386,7 +386,11 @@ public class JasperReportsResult extends
StrutsResultSupport implements JasperRe
LOG.error("Error producing {} report for uri {}", format,
systemId, e);
throw new ServletException(e.getMessage(), e);
} finally {
-conn.close();
+try {
+conn.close();
+} catch (Exception e) {
+LOG.warn("Could not close db connection properly", e);
+}
}
response.setContentLength(output.size());
[35/50] [abbrv] struts git commit: Extends logging
Extends logging
Project: http://git-wip-us.apache.org/repos/asf/struts/repo
Commit: http://git-wip-us.apache.org/repos/asf/struts/commit/e53a119c
Tree: http://git-wip-us.apache.org/repos/asf/struts/tree/e53a119c
Diff: http://git-wip-us.apache.org/repos/asf/struts/diff/e53a119c
Branch: refs/heads/master
Commit: e53a119c2cd6929883e22e8b4bcf06d6b7e46a9b
Parents: 828b237
Author: Lukasz Lenart
Authored: Wed Jan 13 17:22:36 2016 +0100
Committer: Lukasz Lenart
Committed: Tue Jan 19 16:19:19 2016 +0100
--
.../struts2/tiles/StrutsFreeMarkerAttributeRenderer.java | 6 +-
1 file changed, 5 insertions(+), 1 deletion(-)
--
http://git-wip-us.apache.org/repos/asf/struts/blob/e53a119c/plugins/tiles/src/main/java/org/apache/struts2/tiles/StrutsFreeMarkerAttributeRenderer.java
--
diff --git
a/plugins/tiles/src/main/java/org/apache/struts2/tiles/StrutsFreeMarkerAttributeRenderer.java
b/plugins/tiles/src/main/java/org/apache/struts2/tiles/StrutsFreeMarkerAttributeRenderer.java
index fbc5416..0b19b1d 100644
---
a/plugins/tiles/src/main/java/org/apache/struts2/tiles/StrutsFreeMarkerAttributeRenderer.java
+++
b/plugins/tiles/src/main/java/org/apache/struts2/tiles/StrutsFreeMarkerAttributeRenderer.java
@@ -51,7 +51,7 @@ public class StrutsFreeMarkerAttributeRenderer implements
Renderer {
@Override
public void render(String path, Request request) throws IOException {
if (path != null) {
-LOG.trace("Rendering freemarker tile ...");
+LOG.trace("Rendering freemarker tile [{}]", path);
ActionContext ctx = readActionContext(request);
@@ -83,6 +83,8 @@ public class StrutsFreeMarkerAttributeRenderer implements
Renderer {
protected ActionContext readActionContext(Request request) {
ActionContext ctx = null;
+LOG.debug("Obtaining HttpServletRequest based on [{}]",
request.getClass().getName());
+
if (request instanceof ServletRequest) {
HttpServletRequest httpRequest = ((ServletRequest)
request).getRequest();
ctx = ServletActionContext.getActionContext(httpRequest);
@@ -93,6 +95,7 @@ public class StrutsFreeMarkerAttributeRenderer implements
Renderer {
}
if (ctx == null) {
+LOG.error("Cannot obtain HttpServletRequest from [{}]",
request.getClass().getName());
throw new ConfigurationException("There is no ActionContext for
current request!");
}
@@ -101,6 +104,7 @@ public class StrutsFreeMarkerAttributeRenderer implements
Renderer {
@Override
public boolean isRenderable(String path, Request request) {
+LOG.trace("Checking if path [{}] can be rendered", path);
return path != null && path.startsWith("/") && path.endsWith(".ftl");
}
[45/50] [abbrv] struts git commit: Merge branch 'master' into http-parameters
Merge branch 'master' into http-parameters Conflicts: core/src/main/java/com/opensymphony/xwork2/util/CompoundRoot.java Project: http://git-wip-us.apache.org/repos/asf/struts/repo Commit: http://git-wip-us.apache.org/repos/asf/struts/commit/abd8c6bf Tree: http://git-wip-us.apache.org/repos/asf/struts/tree/abd8c6bf Diff: http://git-wip-us.apache.org/repos/asf/struts/diff/abd8c6bf Branch: refs/heads/master Commit: abd8c6bfb5fc3a9e3f9f3767bb10acd9b7c4836d Parents: 8b60785 3163d6c Author: Lukasz Lenart Authored: Tue Jan 19 16:21:00 2016 +0100 Committer: Lukasz Lenart Committed: Tue Jan 19 16:21:00 2016 +0100 -- .../org/apache/struts2/json/JSONResultTest.java | 24 ++-- 1 file changed, 12 insertions(+), 12 deletions(-) --
[31/50] [abbrv] struts git commit: Overrides method to use defined base instead of fetching it again
Overrides method to use defined base instead of fetching it again
Project: http://git-wip-us.apache.org/repos/asf/struts/repo
Commit: http://git-wip-us.apache.org/repos/asf/struts/commit/828b2376
Tree: http://git-wip-us.apache.org/repos/asf/struts/tree/828b2376
Diff: http://git-wip-us.apache.org/repos/asf/struts/diff/828b2376
Branch: refs/heads/master
Commit: 828b237649368b5415508efc4bf5c0cc3436dc4f
Parents: 4c6e51b
Author: Lukasz Lenart
Authored: Wed Jan 13 12:05:58 2016 +0100
Committer: Lukasz Lenart
Committed: Tue Jan 19 16:19:19 2016 +0100
--
.../struts2/tiles/StrutsWildcardServletApplicationContext.java | 4
1 file changed, 4 insertions(+)
--
http://git-wip-us.apache.org/repos/asf/struts/blob/828b2376/plugins/tiles/src/main/java/org/apache/struts2/tiles/StrutsWildcardServletApplicationContext.java
--
diff --git
a/plugins/tiles/src/main/java/org/apache/struts2/tiles/StrutsWildcardServletApplicationContext.java
b/plugins/tiles/src/main/java/org/apache/struts2/tiles/StrutsWildcardServletApplicationContext.java
index abd78a2..b8f10f9 100644
---
a/plugins/tiles/src/main/java/org/apache/struts2/tiles/StrutsWildcardServletApplicationContext.java
+++
b/plugins/tiles/src/main/java/org/apache/struts2/tiles/StrutsWildcardServletApplicationContext.java
@@ -95,6 +95,10 @@ public class StrutsWildcardServletApplicationContext extends
ServletApplicationC
return resources;
}
+public ApplicationResource getResource(ApplicationResource base, Locale
locale) {
+return base;
+}
+
protected Set findResources(String path) throws
IOException {
Set resources = new HashSet<>();
[48/50] [abbrv] struts git commit: Fixes test to use HttpParameters instead of Map
Fixes test to use HttpParameters instead of Map
Project: http://git-wip-us.apache.org/repos/asf/struts/repo
Commit: http://git-wip-us.apache.org/repos/asf/struts/commit/b48082a8
Tree: http://git-wip-us.apache.org/repos/asf/struts/tree/b48082a8
Diff: http://git-wip-us.apache.org/repos/asf/struts/diff/b48082a8
Branch: refs/heads/master
Commit: b48082a8115dee04f33c6db29aacee64973424c6
Parents: 31826bc
Author: Lukasz Lenart
Authored: Sat Mar 12 16:14:45 2016 +0100
Committer: Lukasz Lenart
Committed: Sat Mar 12 16:14:45 2016 +0100
--
.../interceptor/MessageStorePreResultListenerTest.java | 9 -
1 file changed, 4 insertions(+), 5 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/struts/blob/b48082a8/core/src/test/java/org/apache/struts2/interceptor/MessageStorePreResultListenerTest.java
--
diff --git
a/core/src/test/java/org/apache/struts2/interceptor/MessageStorePreResultListenerTest.java
b/core/src/test/java/org/apache/struts2/interceptor/MessageStorePreResultListenerTest.java
index 4e46b3a..3737c46 100644
---
a/core/src/test/java/org/apache/struts2/interceptor/MessageStorePreResultListenerTest.java
+++
b/core/src/test/java/org/apache/struts2/interceptor/MessageStorePreResultListenerTest.java
@@ -6,6 +6,7 @@ import com.opensymphony.xwork2.ActionInvocation;
import com.opensymphony.xwork2.ActionSupport;
import org.apache.struts2.ServletActionContext;
import org.apache.struts2.StrutsInternalTestCase;
+import org.apache.struts2.dispatcher.HttpParameters;
import org.apache.struts2.result.ServletActionRedirectResult;
import org.easymock.EasyMock;
@@ -96,7 +97,6 @@ public class MessageStorePreResultListenerTest extends
StrutsInternalTestCase {
MessageStorePreResultListener listener = new
MessageStorePreResultListener(interceptor);
-Map paramMap = new LinkedHashMap();
Map sessionMap = new LinkedHashMap();
ActionSupport action = new ActionSupport();
@@ -108,7 +108,7 @@ public class MessageStorePreResultListenerTest extends
StrutsInternalTestCase {
action.addFieldError("field2", "some field error 2");
ActionContext actionContext = new ActionContext(new HashMap());
-actionContext.put(ActionContext.PARAMETERS, paramMap);
+actionContext.setParameters(HttpParameters.createEmpty().build());
actionContext.put(ActionContext.SESSION, sessionMap);
HttpSession mockedSession =
EasyMock.createControl().createMock(HttpSession.class);
@@ -172,7 +172,6 @@ public class MessageStorePreResultListenerTest extends
StrutsInternalTestCase {
MessageStorePreResultListener listener = new
MessageStorePreResultListener(interceptor);
-Map paramMap = new LinkedHashMap();
Map sessionMap = new LinkedHashMap();
ActionSupport action = new ActionSupport();
@@ -184,8 +183,8 @@ public class MessageStorePreResultListenerTest extends
StrutsInternalTestCase {
action.addFieldError("field2", "some field error 2");
ActionContext actionContext = new ActionContext(new HashMap());
-actionContext.put(ActionContext.PARAMETERS, paramMap);
-actionContext.put(ActionContext.SESSION, sessionMap);
+actionContext.setParameters(HttpParameters.createEmpty().build());
+actionContext.setSession(sessionMap);
HttpSession mockedSession =
EasyMock.createControl().createMock(HttpSession.class);
HttpServletRequest mockedRequest =
EasyMock.createControl().createMock(HttpServletRequest.class);
[25/50] [abbrv] struts git commit: made methods non static and private, javadoc updates
made methods non static and private, javadoc updates
Project: http://git-wip-us.apache.org/repos/asf/struts/repo
Commit: http://git-wip-us.apache.org/repos/asf/struts/commit/8a2f083d
Tree: http://git-wip-us.apache.org/repos/asf/struts/tree/8a2f083d
Diff: http://git-wip-us.apache.org/repos/asf/struts/diff/8a2f083d
Branch: refs/heads/master
Commit: 8a2f083d5dc2a20abd267e3c3fa3bd696da804e5
Parents: f6d0e15
Author: cnenning
Authored: Tue Jan 12 14:14:09 2016 +0100
Committer: Lukasz Lenart
Committed: Tue Jan 19 16:19:18 2016 +0100
--
.../validation/AjaxFormSubmitAction.java| 2 +-
.../struts2/json/JSONActionRedirectResult.java | 23 ++--
2 files changed, 12 insertions(+), 13 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/struts/blob/8a2f083d/apps/showcase/src/main/java/org/apache/struts2/showcase/validation/AjaxFormSubmitAction.java
--
diff --git
a/apps/showcase/src/main/java/org/apache/struts2/showcase/validation/AjaxFormSubmitAction.java
b/apps/showcase/src/main/java/org/apache/struts2/showcase/validation/AjaxFormSubmitAction.java
index b179370..50ff53f 100644
---
a/apps/showcase/src/main/java/org/apache/struts2/showcase/validation/AjaxFormSubmitAction.java
+++
b/apps/showcase/src/main/java/org/apache/struts2/showcase/validation/AjaxFormSubmitAction.java
@@ -23,7 +23,7 @@ import
com.opensymphony.xwork2.validator.annotations.UrlValidator;
*
* Depends on json-plugin.
* Requires jsonValidationInterceptor to be on stack.
- * Uses a special json redirect result type.
+ * Uses result type jsonActionRedirect.
* Uses http parameters struts.enableJSONValidation=true
and struts.validateOnly=false.
* Uses a customized theme to make sure html elements required as error
containers are always present and easily selectable in JS.
* Uses some custom JS code depending on jQuery to issue AJAX request
and to render errors in html.
http://git-wip-us.apache.org/repos/asf/struts/blob/8a2f083d/plugins/json/src/main/java/org/apache/struts2/json/JSONActionRedirectResult.java
--
diff --git
a/plugins/json/src/main/java/org/apache/struts2/json/JSONActionRedirectResult.java
b/plugins/json/src/main/java/org/apache/struts2/json/JSONActionRedirectResult.java
index f0f3f39..40aa092 100644
---
a/plugins/json/src/main/java/org/apache/struts2/json/JSONActionRedirectResult.java
+++
b/plugins/json/src/main/java/org/apache/struts2/json/JSONActionRedirectResult.java
@@ -16,13 +16,12 @@ import
org.apache.struts2.result.ServletActionRedirectResult;
* don't pass them to JS handlers. So this result produces a JSON response
* containing redirect data.
*
- *
- * To be used along with {@link JSONValidationInterceptor}.
- *
- *
- * Response JSON looks like this:
- * {"location": "$redirect url$"}
- *
+ * To be used along with {@link JSONValidationInterceptor}.
+ *
+ * Response JSON looks like this:
+ *
+ * {"location": "$redirect url$"}
+ *
*
*/
public class JSONActionRedirectResult extends ServletActionRedirectResult {
@@ -30,7 +29,7 @@ public class JSONActionRedirectResult extends
ServletActionRedirectResult {
private static final long serialVersionUID = 3107276294073879542L;
@Override
- protected void sendRedirect(HttpServletResponse response, String
finalLocation) throws IOException {
+protected void sendRedirect(HttpServletResponse response, String
finalLocation) throws IOException {
if (sendJsonInsteadOfRedirect()) {
printJson(response, finalLocation);
} else {
@@ -45,12 +44,12 @@ public class JSONActionRedirectResult extends
ServletActionRedirectResult {
* @return true if a JSON response shall be generated, false if a redirect
* shall be sent.
*/
-static boolean sendJsonInsteadOfRedirect() {
+private boolean sendJsonInsteadOfRedirect() {
HttpServletRequest request = ServletActionContext.getRequest();
return isJsonEnabled(request) && !isValidateOnly(request);
}
-static void printJson(HttpServletResponse response, String finalLocation)
throws IOException {
+private void printJson(HttpServletResponse response, String finalLocation)
throws IOException {
response.setStatus(HttpServletResponse.SC_OK);
response.setContentType("application/json");
response.setHeader("Location", finalLocation);
@@ -61,11 +60,11 @@ public class JSONActionRedirectResult extends
ServletActionRedirectResult {
writer.close();
}
-private static boolean isJsonEnabled(HttpServletRequest request) {
+private boolean isJsonEnabled(HttpServletRequest request) {
return
"true".equals(request.getParameter(JSONValidationInterceptor.VALIDA
[46/50] [abbrv] struts git commit: Merge remote-tracking branch 'upstream/master' into http-parameters
Merge remote-tracking branch 'upstream/master' into http-parameters Conflicts: core/src/main/java/com/opensymphony/xwork2/interceptor/ParametersInterceptor.java core/src/test/java/com/opensymphony/xwork2/interceptor/I18nInterceptorTest.java core/src/test/java/com/opensymphony/xwork2/interceptor/ParameterRemoverInterceptorTest.java core/src/test/java/org/apache/struts2/interceptor/MessageStoreInterceptorTest.java core/src/test/java/org/apache/struts2/interceptor/ServletConfigInterceptorTest.java core/src/test/java/org/apache/struts2/views/jsp/ActionTagTest.java Project: http://git-wip-us.apache.org/repos/asf/struts/repo Commit: http://git-wip-us.apache.org/repos/asf/struts/commit/bb21dbe4 Tree: http://git-wip-us.apache.org/repos/asf/struts/tree/bb21dbe4 Diff: http://git-wip-us.apache.org/repos/asf/struts/diff/bb21dbe4 Branch: refs/heads/master Commit: bb21dbe4929cf88a4c2565fdbd359d0e0b067e1f Parents: abd8c6b fc2179c Author: Lukasz Lenart Authored: Sat Mar 12 16:03:42 2016 +0100 Committer: Lukasz Lenart Committed: Sat Mar 12 16:03:42 2016 +0100 -- .gitignore | 1 - apps/portlet/pom.xml| 2 +- .../struts2/portlet/test/BasePortletTest.java | 6 +- .../portlet/test/Struts2PortletTest.java| 2 + .../org/demo/rest/example/IndexController.java | 16 ++ apps/rest-showcase/src/main/webapp/index.jsp| 2 - .../showcase/tiles/TilesAnnotationsAction.java | 40 +++ apps/showcase/src/main/webapp/WEB-INF/tiles.xml | 10 +- .../src/main/webapp/WEB-INF/tiles/body.jsp | 3 + .../webapp/WEB-INF/tiles/layout-annotations.jsp | 14 ++ .../WEB-INF/validation/ajaxFormSubmit.jsp | 7 +- assembly/pom.xml| 5 - assembly/src/main/assembly/all.xml | 4 - assembly/src/main/assembly/docs.xml | 4 - bom/pom.xml | 5 - .../xwork2/DefaultActionInvocation.java | 7 +- .../com/opensymphony/xwork2/XWorkConstants.java | 1 + ...ervletContextAwareConfigurationProvider.java | 32 +++ .../xwork2/config/entities/ActionConfig.java| 1 + .../xwork2/config/entities/AllowedMethods.java | 30 +++ .../xwork2/config/entities/PackageConfig.java | 2 +- .../xwork2/config/impl/ActionConfigMatcher.java | 1 + .../providers/XmlConfigurationProvider.java | 32 +-- .../interceptor/DefaultWorkflowInterceptor.java | 4 +- .../xwork2/interceptor/I18nInterceptor.java | 5 + .../interceptor/ParametersInterceptor.java | 29 +-- .../com/opensymphony/xwork2/ognl/OgnlUtil.java | 15 +- .../xwork2/ognl/OgnlValueStack.java | 1 + .../xwork2/ognl/SecurityMemberAccess.java | 16 +- .../xwork2/util/LocalizedTextUtil.java | 31 ++- .../validator/DelegatingValidatorContext.java | 7 +- .../org/apache/struts2/StrutsConstants.java | 1 + .../apache/struts2/components/Component.java| 6 +- .../org/apache/struts2/components/UIBean.java | 4 +- .../template/VelocityTemplateEngine.java| 2 +- .../config/DefaultBeanSelectionProvider.java| 1 + .../apache/struts2/dispatcher/Dispatcher.java | 3 + .../struts2/dispatcher/PrepareOperations.java | 2 + .../multipart/JakartaMultiPartRequest.java | 12 +- .../struts2/interceptor/CookieInterceptor.java | 12 +- .../interceptor/MessageStoreInterceptor.java| 58 + .../MessageStorePreResultListener.java | 95 +++ .../org/apache/struts2/util/ComponentUtils.java | 9 +- .../struts2/views/jsp/ui/AbstractUITag.java | 2 +- core/src/main/resources/struts-default.xml | 20 +- .../resources/template/simple/checkboxlist.ftl | 7 +- .../main/resources/template/simple/radiomap.ftl | 5 +- .../xwork2/DefaultActionInvocationTest.java | 3 + .../config/entities/ActionConfigTest.java | 4 +- .../config/entities/AllowedMethodsTest.java | 15 ++ .../config/impl/ActionConfigMatcherTest.java| 16 +- ...ConfigurationProviderAllowedMethodsTest.java | 38 ++- .../XmlConfigurationProviderResultsTest.java| 54 .../xwork2/config/providers/XmlHelperTest.java | 234 ++--- .../xwork2/interceptor/I18nInterceptorTest.java | 16 +- .../ParameterRemoverInterceptorTest.java| 23 +- .../PrefixMethodInvocationUtilTest.java | 135 -- .../interceptor/PrepareInterceptorTest.java | 83 +++--- .../xwork2/ognl/SecurityMemberAccessTest.java | 20 +- .../validator/VisitorFieldValidatorTest.java| 2 +- .../org/apache/struts2/RequestUtilsTest.java| 66 +++-- .../interceptor/CookieInterceptorTest.java | 124 - .../interceptor/I18nInterceptorTest.java| 16 +- .../MessageStoreInterceptorTest.java| 183 +++--- .../MessageStorePreResultListenerTest.java
[47/50] [abbrv] struts git commit: Drops unused import
Drops unused import Project: http://git-wip-us.apache.org/repos/asf/struts/repo Commit: http://git-wip-us.apache.org/repos/asf/struts/commit/31826bc1 Tree: http://git-wip-us.apache.org/repos/asf/struts/tree/31826bc1 Diff: http://git-wip-us.apache.org/repos/asf/struts/diff/31826bc1 Branch: refs/heads/master Commit: 31826bc117e53eb65668866623f626cdb6f50760 Parents: bb21dbe Author: Lukasz Lenart Authored: Sat Mar 12 16:14:25 2016 +0100 Committer: Lukasz Lenart Committed: Sat Mar 12 16:14:25 2016 +0100 -- .../xwork2/interceptor/ParameterRemoverInterceptorTest.java| 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) -- http://git-wip-us.apache.org/repos/asf/struts/blob/31826bc1/core/src/test/java/com/opensymphony/xwork2/interceptor/ParameterRemoverInterceptorTest.java -- diff --git a/core/src/test/java/com/opensymphony/xwork2/interceptor/ParameterRemoverInterceptorTest.java b/core/src/test/java/com/opensymphony/xwork2/interceptor/ParameterRemoverInterceptorTest.java index 5412fb8..854aed6 100644 --- a/core/src/test/java/com/opensymphony/xwork2/interceptor/ParameterRemoverInterceptorTest.java +++ b/core/src/test/java/com/opensymphony/xwork2/interceptor/ParameterRemoverInterceptorTest.java @@ -5,7 +5,7 @@ import com.opensymphony.xwork2.ActionInvocation; import com.opensymphony.xwork2.ActionSupport; import junit.framework.TestCase; import org.apache.struts2.dispatcher.HttpParameters; -import org.easymock.MockControl; + import static org.easymock.EasyMock.*; import java.util.LinkedHashMap;
[49/50] [abbrv] struts git commit: Merge branch 'master' into http-parameters
Merge branch 'master' into http-parameters Project: http://git-wip-us.apache.org/repos/asf/struts/repo Commit: http://git-wip-us.apache.org/repos/asf/struts/commit/9ad0dfba Tree: http://git-wip-us.apache.org/repos/asf/struts/tree/9ad0dfba Diff: http://git-wip-us.apache.org/repos/asf/struts/diff/9ad0dfba Branch: refs/heads/master Commit: 9ad0dfba1d74f494e33b1ba5fab1ce8c7d3f6412 Parents: b48082a 104bd92 Author: Lukasz Lenart Authored: Wed May 18 14:57:38 2016 +0200 Committer: Lukasz Lenart Committed: Wed May 18 14:57:38 2016 +0200 -- .travis.yml |9 + README.md |5 + apps/pom.xml|2 +- apps/portlet/pom.xml|2 +- .../src/main/webapp/WEB-INF/view/index.jsp |4 +- .../struts2/portlet/test/BasePortletTest.java | 20 +- apps/rest-showcase/pom.xml |4 +- apps/showcase/pom.xml |2 +- archetypes/pom.xml |2 +- archetypes/struts2-archetype-angularjs/pom.xml |2 +- .../webapp/js/lib/angular/angular-animate.js| 915 ++-- .../js/lib/angular/angular-animate.min.js | 104 +- .../js/lib/angular/angular-animate.min.js.map |4 +- .../main/webapp/js/lib/angular/angular-aria.js | 171 +- .../webapp/js/lib/angular/angular-aria.min.js | 19 +- .../js/lib/angular/angular-aria.min.js.map |6 +- .../webapp/js/lib/angular/angular-cookies.js| 19 +- .../js/lib/angular/angular-cookies.min.js | 10 +- .../js/lib/angular/angular-cookies.min.js.map |4 +- .../webapp/js/lib/angular/angular-loader.js | 51 +- .../webapp/js/lib/angular/angular-loader.min.js | 10 +- .../js/lib/angular/angular-loader.min.js.map|4 +- .../js/lib/angular/angular-message-format.js|4 +- .../lib/angular/angular-message-format.min.js |4 +- .../webapp/js/lib/angular/angular-messages.js | 21 +- .../js/lib/angular/angular-messages.min.js | 15 +- .../js/lib/angular/angular-messages.min.js.map |6 +- .../main/webapp/js/lib/angular/angular-mocks.js | 478 +- .../webapp/js/lib/angular/angular-resource.js | 167 +- .../js/lib/angular/angular-resource.min.js | 20 +- .../js/lib/angular/angular-resource.min.js.map |6 +- .../main/webapp/js/lib/angular/angular-route.js | 47 +- .../webapp/js/lib/angular/angular-route.min.js | 22 +- .../js/lib/angular/angular-route.min.js.map |4 +- .../webapp/js/lib/angular/angular-sanitize.js | 526 ++- .../js/lib/angular/angular-sanitize.min.js | 23 +- .../js/lib/angular/angular-sanitize.min.js.map |6 +- .../webapp/js/lib/angular/angular-scenario.js | 4387 +++-- .../main/webapp/js/lib/angular/angular-touch.js | 129 +- .../webapp/js/lib/angular/angular-touch.min.js | 19 +- .../js/lib/angular/angular-touch.min.js.map |6 +- .../src/main/webapp/js/lib/angular/angular.js | 4400 -- .../main/webapp/js/lib/angular/angular.min.js | 592 +-- .../webapp/js/lib/angular/angular.min.js.map|6 +- .../src/main/webapp/js/lib/angular/errors.json |2 +- .../js/lib/angular/i18n/angular-locale_af-na.js | 15 + .../js/lib/angular/i18n/angular-locale_af-za.js | 15 + .../js/lib/angular/i18n/angular-locale_af.js| 15 + .../lib/angular/i18n/angular-locale_agq-cm.js | 15 + .../js/lib/angular/i18n/angular-locale_agq.js | 15 + .../js/lib/angular/i18n/angular-locale_ak-gh.js | 15 + .../js/lib/angular/i18n/angular-locale_ak.js| 15 + .../js/lib/angular/i18n/angular-locale_am-et.js | 15 + .../js/lib/angular/i18n/angular-locale_am.js| 15 + .../lib/angular/i18n/angular-locale_ar-001.js | 15 + .../js/lib/angular/i18n/angular-locale_ar-ae.js | 15 + .../js/lib/angular/i18n/angular-locale_ar-bh.js | 15 + .../js/lib/angular/i18n/angular-locale_ar-dj.js | 15 + .../js/lib/angular/i18n/angular-locale_ar-dz.js | 15 + .../js/lib/angular/i18n/angular-locale_ar-eg.js | 15 + .../js/lib/angular/i18n/angular-locale_ar-eh.js | 15 + .../js/lib/angular/i18n/angular-locale_ar-er.js | 15 + .../js/lib/angular/i18n/angular-locale_ar-il.js | 15 + .../js/lib/angular/i18n/angular-locale_ar-iq.js | 15 + .../js/lib/angular/i18n/angular-locale_ar-jo.js | 15 + .../js/lib/angular/i18n/angular-locale_ar-km.js | 15 + .../js/lib/angular/i18n/angular-locale_ar-kw.js | 15 + .../js/lib/angular/i18n/angular-locale_ar-lb.js | 15 + .../js/lib/angular/i18n/angular-locale_ar-ly.js | 15 + .../js/lib/angular/i18n/angular-locale_ar-ma.js | 15 + .../js/lib/angular/i18n/angular-locale_ar-mr.js | 15 + .../js/lib/angular/i18n/angular-locale_ar-om.js | 15 + .../js/lib/angular/i18n/angular-locale_ar-ps.js | 15 + .../js/lib/angular/i18n/angular-locale_ar-qa.js | 15 + .../js/lib/angul
[40/50] [abbrv] struts git commit: WW-4585 Struts2 Rest plugin doesn't handle JSESSIONID with DMI
WW-4585 Struts2 Rest plugin doesn't handle JSESSIONID with DMI
Project: http://git-wip-us.apache.org/repos/asf/struts/repo
Commit: http://git-wip-us.apache.org/repos/asf/struts/commit/5eaef08e
Tree: http://git-wip-us.apache.org/repos/asf/struts/tree/5eaef08e
Diff: http://git-wip-us.apache.org/repos/asf/struts/diff/5eaef08e
Branch: refs/heads/master
Commit: 5eaef08e52fbb46e1659b46435172d8e52b8b090
Parents: dd849e8
Author: Aleksandr Mashchenko
Authored: Thu Jan 14 20:01:57 2016 +0200
Committer: Lukasz Lenart
Committed: Tue Jan 19 16:19:20 2016 +0100
--
.../apache/struts2/rest/RestActionMapper.java | 15 --
.../struts2/rest/RestActionMapperTest.java | 29
2 files changed, 42 insertions(+), 2 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/struts/blob/5eaef08e/plugins/rest/src/main/java/org/apache/struts2/rest/RestActionMapper.java
--
diff --git
a/plugins/rest/src/main/java/org/apache/struts2/rest/RestActionMapper.java
b/plugins/rest/src/main/java/org/apache/struts2/rest/RestActionMapper.java
index 816843a..d25b725 100644
--- a/plugins/rest/src/main/java/org/apache/struts2/rest/RestActionMapper.java
+++ b/plugins/rest/src/main/java/org/apache/struts2/rest/RestActionMapper.java
@@ -308,9 +308,20 @@ public class RestActionMapper extends DefaultActionMapper {
private void handleDynamicMethodInvocation(ActionMapping mapping, String
name) {
int exclamation = name.lastIndexOf("!");
if (exclamation != -1) {
-mapping.setName(name.substring(0, exclamation));
+String actionName = name.substring(0, exclamation);
+String actionMethod = name.substring(exclamation + 1);
+
+// WW-4585
+// add any ; appendix to name, it will be handled later in
getMapping method
+int scPos = actionMethod.indexOf(';');
+if (scPos != -1) {
+actionName = actionName + actionMethod.substring(scPos);
+actionMethod = actionMethod.substring(0, scPos);
+}
+
+mapping.setName(actionName);
if (allowDynamicMethodCalls) {
-mapping.setMethod(name.substring(exclamation + 1));
+mapping.setMethod(actionMethod);
} else {
mapping.setMethod(null);
}
http://git-wip-us.apache.org/repos/asf/struts/blob/5eaef08e/plugins/rest/src/test/java/org/apache/struts2/rest/RestActionMapperTest.java
--
diff --git
a/plugins/rest/src/test/java/org/apache/struts2/rest/RestActionMapperTest.java
b/plugins/rest/src/test/java/org/apache/struts2/rest/RestActionMapperTest.java
index 8d39cc1..9903265 100644
---
a/plugins/rest/src/test/java/org/apache/struts2/rest/RestActionMapperTest.java
+++
b/plugins/rest/src/test/java/org/apache/struts2/rest/RestActionMapperTest.java
@@ -179,6 +179,35 @@ public class RestActionMapperTest extends TestCase {
assertEquals("show", mapping.getMethod());
}
+public void testGetJsessionIdSemicolonMappingWithMethod() throws Exception
{
+
req.setRequestURI("/myapp/animals/dog/fido!update;jsessionid=29fefpv23do1g");
+req.setServletPath("/animals/dog/fido");
+req.setMethod("GET");
+
+ActionMapping mapping = mapper.getMapping(req, configManager);
+
+assertEquals("/animals", mapping.getNamespace());
+assertEquals("dog", mapping.getName());
+assertEquals("fido", ((String[]) mapping.getParams().get("id"))[0]);
+assertEquals("show", mapping.getMethod());
+}
+
+public void testGetJsessionIdSemicolonMappingWithMethodAllowDMI() throws
Exception {
+
req.setRequestURI("/myapp/animals/dog/fido!update;jsessionid=29fefpv23do1g");
+req.setServletPath("/animals/dog/fido");
+req.setMethod("GET");
+
+// allow DMI
+mapper.setAllowDynamicMethodCalls("true");
+
+ActionMapping mapping = mapper.getMapping(req, configManager);
+
+assertEquals("/animals", mapping.getNamespace());
+assertEquals("dog", mapping.getName());
+assertEquals("fido", ((String[]) mapping.getParams().get("id"))[0]);
+assertEquals("update", mapping.getMethod());
+}
+
public void testParseNameAndNamespace() {
tryUri("/foo/23", "", "foo/23");
tryUri("/foo/", "", "foo/");
[38/50] [abbrv] struts git commit: increased visibilty of methods and constants for better extensibility
increased visibilty of methods and constants for better extensibility
Project: http://git-wip-us.apache.org/repos/asf/struts/repo
Commit: http://git-wip-us.apache.org/repos/asf/struts/commit/b0613a60
Tree: http://git-wip-us.apache.org/repos/asf/struts/tree/b0613a60
Diff: http://git-wip-us.apache.org/repos/asf/struts/diff/b0613a60
Branch: refs/heads/master
Commit: b0613a60ed48540cfa749c482c902872b03517c5
Parents: 4e36a54
Author: cnenning
Authored: Thu Jan 14 09:33:50 2016 +0100
Committer: Lukasz Lenart
Committed: Tue Jan 19 16:19:19 2016 +0100
--
.../org/apache/struts2/json/JSONActionRedirectResult.java| 8
.../org/apache/struts2/json/JSONValidationInterceptor.java | 8
2 files changed, 8 insertions(+), 8 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/struts/blob/b0613a60/plugins/json/src/main/java/org/apache/struts2/json/JSONActionRedirectResult.java
--
diff --git
a/plugins/json/src/main/java/org/apache/struts2/json/JSONActionRedirectResult.java
b/plugins/json/src/main/java/org/apache/struts2/json/JSONActionRedirectResult.java
index 40aa092..4b8b948 100644
---
a/plugins/json/src/main/java/org/apache/struts2/json/JSONActionRedirectResult.java
+++
b/plugins/json/src/main/java/org/apache/struts2/json/JSONActionRedirectResult.java
@@ -44,12 +44,12 @@ public class JSONActionRedirectResult extends
ServletActionRedirectResult {
* @return true if a JSON response shall be generated, false if a redirect
* shall be sent.
*/
-private boolean sendJsonInsteadOfRedirect() {
+protected boolean sendJsonInsteadOfRedirect() {
HttpServletRequest request = ServletActionContext.getRequest();
return isJsonEnabled(request) && !isValidateOnly(request);
}
-private void printJson(HttpServletResponse response, String finalLocation)
throws IOException {
+protected void printJson(HttpServletResponse response, String
finalLocation) throws IOException {
response.setStatus(HttpServletResponse.SC_OK);
response.setContentType("application/json");
response.setHeader("Location", finalLocation);
@@ -60,11 +60,11 @@ public class JSONActionRedirectResult extends
ServletActionRedirectResult {
writer.close();
}
-private boolean isJsonEnabled(HttpServletRequest request) {
+protected boolean isJsonEnabled(HttpServletRequest request) {
return
"true".equals(request.getParameter(JSONValidationInterceptor.VALIDATE_JSON_PARAM));
}
-private boolean isValidateOnly(HttpServletRequest request) {
+protected boolean isValidateOnly(HttpServletRequest request) {
return
"true".equals(request.getParameter(JSONValidationInterceptor.VALIDATE_ONLY_PARAM));
}
}
http://git-wip-us.apache.org/repos/asf/struts/blob/b0613a60/plugins/json/src/main/java/org/apache/struts2/json/JSONValidationInterceptor.java
--
diff --git
a/plugins/json/src/main/java/org/apache/struts2/json/JSONValidationInterceptor.java
b/plugins/json/src/main/java/org/apache/struts2/json/JSONValidationInterceptor.java
index 0fc7902..20ffb50 100644
---
a/plugins/json/src/main/java/org/apache/struts2/json/JSONValidationInterceptor.java
+++
b/plugins/json/src/main/java/org/apache/struts2/json/JSONValidationInterceptor.java
@@ -74,11 +74,11 @@ public class JSONValidationInterceptor extends
MethodFilterInterceptor {
private static final Logger LOG =
LogManager.getLogger(JSONValidationInterceptor.class);
-static final String VALIDATE_ONLY_PARAM = "struts.validateOnly";
-static final String VALIDATE_JSON_PARAM = "struts.enableJSONValidation";
-private static final String NO_ENCODING_SET_PARAM =
"struts.JSONValidation.no.encoding";
+public static final String VALIDATE_ONLY_PARAM = "struts.validateOnly";
+public static final String VALIDATE_JSON_PARAM =
"struts.enableJSONValidation";
+public static final String NO_ENCODING_SET_PARAM =
"struts.JSONValidation.no.encoding";
-private static final String DEFAULT_ENCODING = "UTF-8";
+public static final String DEFAULT_ENCODING = "UTF-8";
private int validationFailedStatus = -1;
[27/50] [abbrv] struts git commit: Renames class to match pattern used in Tiles
Renames class to match pattern used in Tiles
Project: http://git-wip-us.apache.org/repos/asf/struts/repo
Commit: http://git-wip-us.apache.org/repos/asf/struts/commit/21a1e8b9
Tree: http://git-wip-us.apache.org/repos/asf/struts/tree/21a1e8b9
Diff: http://git-wip-us.apache.org/repos/asf/struts/diff/21a1e8b9
Branch: refs/heads/master
Commit: 21a1e8b9a5e658944b9abb7de4ac9c58adeff8dc
Parents: 8a2f083
Author: Lukasz Lenart
Authored: Tue Jan 12 22:16:06 2016 +0100
Committer: Lukasz Lenart
Committed: Tue Jan 19 16:19:18 2016 +0100
--
.../struts2/tiles/StrutsTilesInitializer.java | 2 +-
...StrutsWildcardServletApplicationContext.java | 117 +++
...sWildcardServletTilesApplicationContext.java | 116 --
3 files changed, 118 insertions(+), 117 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/struts/blob/21a1e8b9/plugins/tiles/src/main/java/org/apache/struts2/tiles/StrutsTilesInitializer.java
--
diff --git
a/plugins/tiles/src/main/java/org/apache/struts2/tiles/StrutsTilesInitializer.java
b/plugins/tiles/src/main/java/org/apache/struts2/tiles/StrutsTilesInitializer.java
index 37fe1d1..d0f32f0 100644
---
a/plugins/tiles/src/main/java/org/apache/struts2/tiles/StrutsTilesInitializer.java
+++
b/plugins/tiles/src/main/java/org/apache/struts2/tiles/StrutsTilesInitializer.java
@@ -34,7 +34,7 @@ public class StrutsTilesInitializer extends
AbstractTilesInitializer {
@Override
protected ApplicationContext
createTilesApplicationContext(ApplicationContext preliminaryContext) {
LOG.debug("Initializing Tiles wildcard support ...");
-return new
StrutsWildcardServletTilesApplicationContext((ServletContext)
preliminaryContext.getContext());
+return new StrutsWildcardServletApplicationContext((ServletContext)
preliminaryContext.getContext());
}
@Override
http://git-wip-us.apache.org/repos/asf/struts/blob/21a1e8b9/plugins/tiles/src/main/java/org/apache/struts2/tiles/StrutsWildcardServletApplicationContext.java
--
diff --git
a/plugins/tiles/src/main/java/org/apache/struts2/tiles/StrutsWildcardServletApplicationContext.java
b/plugins/tiles/src/main/java/org/apache/struts2/tiles/StrutsWildcardServletApplicationContext.java
new file mode 100644
index 000..abd78a2
--- /dev/null
+++
b/plugins/tiles/src/main/java/org/apache/struts2/tiles/StrutsWildcardServletApplicationContext.java
@@ -0,0 +1,117 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+
+package org.apache.struts2.tiles;
+
+import com.opensymphony.xwork2.config.ConfigurationException;
+import com.opensymphony.xwork2.util.WildcardUtil;
+import com.opensymphony.xwork2.util.finder.ResourceFinder;
+import org.apache.logging.log4j.LogManager;
+import org.apache.logging.log4j.Logger;
+import org.apache.logging.log4j.message.MessageFormatMessage;
+import org.apache.tiles.request.ApplicationResource;
+import org.apache.tiles.request.locale.URLApplicationResource;
+import org.apache.tiles.request.servlet.ServletApplicationContext;
+
+import javax.servlet.ServletContext;
+import java.io.File;
+import java.io.IOException;
+import java.net.MalformedURLException;
+import java.net.URL;
+import java.util.Collection;
+import java.util.Enumeration;
+import java.util.HashSet;
+import java.util.Locale;
+import java.util.Map;
+import java.util.Set;
+import java.util.regex.Pattern;
+
+public class StrutsWildcardServletApplicationContext extends
ServletApplicationContext {
+
+private static final Logger LOG =
LogManager.getLogger(StrutsWildcardServletApplicationContext.class);
+
+private ResourceFinder finder;
+
+public StrutsWildcardServletApplicationContext(ServletContext context) {
+super(context);
+
+Set urls = new HashSet<>();
+
+for (Object path : context.getResourcePaths("/")) {
+try {
+URL url = new
File(context.getRealPath(String.valueOf(path))).toURI().toURL();
+urls.ad
[18/50] [abbrv] struts git commit: WW-3731 Uses import to reduce noise in code
WW-3731 Uses import to reduce noise in code
Project: http://git-wip-us.apache.org/repos/asf/struts/repo
Commit: http://git-wip-us.apache.org/repos/asf/struts/commit/bdb3b2ec
Tree: http://git-wip-us.apache.org/repos/asf/struts/tree/bdb3b2ec
Diff: http://git-wip-us.apache.org/repos/asf/struts/diff/bdb3b2ec
Branch: refs/heads/master
Commit: bdb3b2ec24eeb60fc6bcdc7037918934d05ced55
Parents: a35a9a8
Author: Lukasz Lenart
Authored: Tue Jan 12 08:11:08 2016 +0100
Committer: Lukasz Lenart
Committed: Tue Jan 19 16:18:01 2016 +0100
--
.../com/opensymphony/xwork2/util/AnnotationUtils.java | 10 +-
1 file changed, 5 insertions(+), 5 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/struts/blob/bdb3b2ec/core/src/main/java/com/opensymphony/xwork2/util/AnnotationUtils.java
--
diff --git
a/core/src/main/java/com/opensymphony/xwork2/util/AnnotationUtils.java
b/core/src/main/java/com/opensymphony/xwork2/util/AnnotationUtils.java
index 2144bc8..ef0ee53 100644
--- a/core/src/main/java/com/opensymphony/xwork2/util/AnnotationUtils.java
+++ b/core/src/main/java/com/opensymphony/xwork2/util/AnnotationUtils.java
@@ -15,6 +15,8 @@
*/
package com.opensymphony.xwork2.util;
+import org.apache.commons.lang3.ArrayUtils;
+
import java.lang.annotation.Annotation;
import java.lang.reflect.AnnotatedElement;
import java.lang.reflect.Field;
@@ -42,8 +44,6 @@ public class AnnotationUtils {
private static final Pattern SETTER_PATTERN =
Pattern.compile("set([A-Z][A-Za-z0-9]*)$");
private static final Pattern GETTER_PATTERN =
Pattern.compile("(get|is|has)([A-Z][A-Za-z0-9]*)$");
-
-
/**
* Adds all fields with the specified Annotation of class clazz and its
superclasses to allFields
*
@@ -122,9 +122,9 @@ public class AnnotationUtils {
Collection toReturn = new HashSet<>();
for (Method m : clazz.getMethods()) {
-if (org.apache.commons.lang3.ArrayUtils.isNotEmpty(annotation) &&
isAnnotatedBy(m, annotation)) {
+if (ArrayUtils.isNotEmpty(annotation) && isAnnotatedBy(m,
annotation)) {
toReturn.add(m);
-} else if (org.apache.commons.lang3.ArrayUtils.isEmpty(annotation)
&& org.apache.commons.lang3.ArrayUtils.isNotEmpty(m.getAnnotations())) {
+} else if (ArrayUtils.isEmpty(annotation) &&
ArrayUtils.isNotEmpty(m.getAnnotations())) {
toReturn.add(m);
}
}
@@ -140,7 +140,7 @@ public class AnnotationUtils {
* @see AnnotatedElement
*/
public static boolean isAnnotatedBy(AnnotatedElement annotatedElement,
Class... annotation) {
-if (org.apache.commons.lang3.ArrayUtils.isEmpty(annotation)) {
+if (ArrayUtils.isEmpty(annotation)) {
return false;
}
[36/50] [abbrv] struts git commit: Simplifies logic to fetch HttpServletRequest
Simplifies logic to fetch HttpServletRequest
Project: http://git-wip-us.apache.org/repos/asf/struts/repo
Commit: http://git-wip-us.apache.org/repos/asf/struts/commit/4e36a545
Tree: http://git-wip-us.apache.org/repos/asf/struts/tree/4e36a545
Diff: http://git-wip-us.apache.org/repos/asf/struts/diff/4e36a545
Branch: refs/heads/master
Commit: 4e36a54549d5d5f42b86315730c2d09312b85ea3
Parents: e53a119
Author: Lukasz Lenart
Authored: Thu Jan 14 08:17:50 2016 +0100
Committer: Lukasz Lenart
Committed: Tue Jan 19 16:19:19 2016 +0100
--
.../tiles/StrutsFreeMarkerAttributeRenderer.java | 15 +++
1 file changed, 3 insertions(+), 12 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/struts/blob/4e36a545/plugins/tiles/src/main/java/org/apache/struts2/tiles/StrutsFreeMarkerAttributeRenderer.java
--
diff --git
a/plugins/tiles/src/main/java/org/apache/struts2/tiles/StrutsFreeMarkerAttributeRenderer.java
b/plugins/tiles/src/main/java/org/apache/struts2/tiles/StrutsFreeMarkerAttributeRenderer.java
index 0b19b1d..5102ead 100644
---
a/plugins/tiles/src/main/java/org/apache/struts2/tiles/StrutsFreeMarkerAttributeRenderer.java
+++
b/plugins/tiles/src/main/java/org/apache/struts2/tiles/StrutsFreeMarkerAttributeRenderer.java
@@ -36,9 +36,8 @@ import org.apache.struts2.views.freemarker.StrutsBeanWrapper;
import org.apache.tiles.freemarker.template.TilesFMModelRepository;
import org.apache.tiles.impl.InvalidTemplateException;
import org.apache.tiles.request.Request;
-import org.apache.tiles.request.jsp.JspRequest;
import org.apache.tiles.request.render.Renderer;
-import org.apache.tiles.request.servlet.ServletRequest;
+import org.apache.tiles.request.servlet.ServletUtil;
import javax.servlet.ServletContext;
import javax.servlet.http.HttpServletRequest;
@@ -81,18 +80,10 @@ public class StrutsFreeMarkerAttributeRenderer implements
Renderer {
* or a ServletRequest (FreeMarker)
*/
protected ActionContext readActionContext(Request request) {
-ActionContext ctx = null;
-
LOG.debug("Obtaining HttpServletRequest based on [{}]",
request.getClass().getName());
-if (request instanceof ServletRequest) {
-HttpServletRequest httpRequest = ((ServletRequest)
request).getRequest();
-ctx = ServletActionContext.getActionContext(httpRequest);
-}
-if (request instanceof JspRequest) {
-HttpServletRequest httpRequest = (HttpServletRequest)
((JspRequest) request).getPageContext().getRequest();
-ctx = ServletActionContext.getActionContext(httpRequest);
-}
+HttpServletRequest httpRequest =
ServletUtil.getServletRequest(request).getRequest();
+ActionContext ctx = ServletActionContext.getActionContext(httpRequest);
if (ctx == null) {
LOG.error("Cannot obtain HttpServletRequest from [{}]",
request.getClass().getName());
[21/50] [abbrv] struts git commit: Adds missing Tiles API dependency
Adds missing Tiles API dependency
Project: http://git-wip-us.apache.org/repos/asf/struts/repo
Commit: http://git-wip-us.apache.org/repos/asf/struts/commit/0737d728
Tree: http://git-wip-us.apache.org/repos/asf/struts/tree/0737d728
Diff: http://git-wip-us.apache.org/repos/asf/struts/diff/0737d728
Branch: refs/heads/master
Commit: 0737d7281cffc0b869282a41f921b23189f2425d
Parents: 8d83dc2
Author: Lukasz Lenart
Authored: Tue Jan 12 10:13:38 2016 +0100
Committer: Lukasz Lenart
Committed: Tue Jan 19 16:18:42 2016 +0100
--
plugins/tiles/pom.xml | 4
pom.xml | 5 +
2 files changed, 9 insertions(+)
--
http://git-wip-us.apache.org/repos/asf/struts/blob/0737d728/plugins/tiles/pom.xml
--
diff --git a/plugins/tiles/pom.xml b/plugins/tiles/pom.xml
index be39762..09cd71e 100644
--- a/plugins/tiles/pom.xml
+++ b/plugins/tiles/pom.xml
@@ -36,6 +36,10 @@
org.apache.tiles
+tiles-api
+
+
+org.apache.tiles
tiles-core
http://git-wip-us.apache.org/repos/asf/struts/blob/0737d728/pom.xml
--
diff --git a/pom.xml b/pom.xml
index 4edd1fd..3732ad1 100644
--- a/pom.xml
+++ b/pom.xml
@@ -605,6 +605,11 @@
org.apache.tiles
+tiles-api
+${tiles.version}
+
+
+org.apache.tiles
tiles-core
${tiles.version}
[50/50] [abbrv] struts git commit: Merge remote-tracking branch 'upstream/master' into http-parameters
Merge remote-tracking branch 'upstream/master' into http-parameters Project: http://git-wip-us.apache.org/repos/asf/struts/repo Commit: http://git-wip-us.apache.org/repos/asf/struts/commit/70fdc00f Tree: http://git-wip-us.apache.org/repos/asf/struts/tree/70fdc00f Diff: http://git-wip-us.apache.org/repos/asf/struts/diff/70fdc00f Branch: refs/heads/master Commit: 70fdc00f664947732840e16f4de06ea0cf10487a Parents: 9ad0dfb cdbf697 Author: Lukasz Lenart Authored: Fri Jul 15 10:53:50 2016 +0200 Committer: Lukasz Lenart Committed: Fri Jul 15 10:53:50 2016 +0200 -- .gitignore |12 +- apps/pom.xml| 3 +- apps/portlet/README.txt |22 - apps/portlet/pom.xml| 218 - apps/portlet/src/main/etc/exo/web.xml |63 - .../main/etc/gridsphere/README-gridsphere.txt | 2 - .../main/etc/gridsphere/gridsphere-portlet.xml |24 - apps/portlet/src/main/etc/gridsphere/group.xml |10 - apps/portlet/src/main/etc/gridsphere/layout.xml |19 - .../src/main/etc/gridsphere/struts-portlet | 0 apps/portlet/src/main/etc/gridsphere/web.xml|63 - .../src/main/etc/jbossportal2.0/jboss-app.xml | 3 - .../main/etc/jbossportal2.0/jboss-portlet.xml |12 - .../src/main/etc/jbossportal2.0/jboss-web.xml | 3 - .../etc/jbossportal2.0/portlet-instances.xml|11 - .../etc/jbossportal2.0/struts-portlet-pages.xml |18 - .../src/main/etc/jbossportal2.2/jboss-app.xml | 3 - .../main/etc/jbossportal2.2/jboss-portlet.xml |12 - .../src/main/etc/jbossportal2.2/jboss-web.xml | 3 - .../jbossportal2.2/struts-portlet-object.xml|25 - .../src/main/etc/jetspeed2/README-jetspeed2.txt | 1 - .../src/main/etc/jetspeed2/struts-portlet.psml |20 - apps/portlet/src/main/etc/liferay3.6.1/web.xml |75 - .../struts2/portlet/example/ExampleAction.java |39 - .../struts2/portlet/example/FormExample.java|50 - .../portlet/example/FormExampleModelDriven.java |37 - .../example/FormExampleWithValidation.java |47 - .../portlet/example/FormResultAction.java |49 - .../struts2/portlet/example/FormTestAction.java |36 - .../portlet/example/SavePrefsAction.java|62 - .../portlet/example/eventing/ProcessAction.java |61 - .../portlet/example/eventing/PublishAction.java |52 - .../example/fileupload/FileUploadAction.java|81 - .../struts2/portlet/example/model/Name.java |18 - .../portlet/example/spring/SpringAction.java|58 - .../portlet/example/spring/ThingManager.java|38 - apps/portlet/src/main/resources/LICENSE.txt | 174 - apps/portlet/src/main/resources/NOTICE.txt | 5 - apps/portlet/src/main/resources/log4j2.xml |15 - .../FormExample-formExamplePrg-validation.xml |13 - ...processTilesFreemarkerExample-validation.xml |13 - ...mple-processValidationExample-validation.xml |13 - .../pluto-portal-driver-services-config.xml | 155 - apps/portlet/src/main/resources/struts-edit.xml |48 - .../src/main/resources/struts-eventing.xml |21 - apps/portlet/src/main/resources/struts-help.xml |14 - .../portlet/src/main/resources/struts-tiles.xml |27 - apps/portlet/src/main/resources/struts-view.xml | 130 - apps/portlet/src/main/resources/struts.xml |12 - .../template/xhtml/components/checkbox.vm |12 - .../template/xhtml/components/datefield.vm | 8 - .../template/xhtml/components/mytextfield.vm|15 - apps/portlet/src/main/resources/validators.xml |18 - .../src/main/resources/velocity.properties | 1 - .../main/webapp/WEB-INF/applicationContext.xml |22 - .../main/webapp/WEB-INF/edit/defaultEdit.jsp| 5 - .../main/webapp/WEB-INF/edit/formExample.jsp| 5 - .../webapp/WEB-INF/edit/formExampleInput.jsp| 8 - .../src/main/webapp/WEB-INF/edit/index.jsp |11 - .../main/webapp/WEB-INF/edit/namespaceTest.jsp | 4 - .../src/main/webapp/WEB-INF/edit/prefsForm.jsp | 6 - .../src/main/webapp/WEB-INF/edit/prefsSaved.jsp | 5 - .../src/main/webapp/WEB-INF/edit/test.jsp | 4 - .../src/main/webapp/WEB-INF/eventing/index.jsp |11 - .../main/webapp/WEB-INF/eventing/process.jsp|12 - .../main/webapp/WEB-INF/help/defaultHelp.jsp| 1 - .../src/main/webapp/WEB-INF/help/index.jsp | 1 - .../webapp/WEB-INF/jetty-pluto-web-default.xml | 384 - .../portlet/src/main/webapp/WEB-INF/portlet.xml | 214 - apps/portlet/src/main/webapp/WEB-INF/readme.txt |10 - apps/portlet/src/main/webapp/WEB-INF/tiles.xml |46 - .../src/main/webapp/WEB-INF/view/fileUpload.jsp |13 - .../webapp/WEB-INF/view/fileUploadSuccess.jsp |14 - .../main/webapp/WEB-INF/view/formExample.jsp|
[15/50] [abbrv] struts git commit: Drops Tiles 3 plugin
Drops Tiles 3 plugin
Project: http://git-wip-us.apache.org/repos/asf/struts/repo
Commit: http://git-wip-us.apache.org/repos/asf/struts/commit/9f665f7b
Tree: http://git-wip-us.apache.org/repos/asf/struts/tree/9f665f7b
Diff: http://git-wip-us.apache.org/repos/asf/struts/diff/9f665f7b
Branch: refs/heads/master
Commit: 9f665f7b239b9c1a266832c7274d9e38c1c0137f
Parents: bdb3b2e
Author: Lukasz Lenart
Authored: Tue Jan 12 08:19:26 2016 +0100
Committer: Lukasz Lenart
Committed: Tue Jan 19 16:18:01 2016 +0100
--
plugins/tiles3/pom.xml | 60 ---
.../apache/struts2/views/tiles/TilesResult.java | 81 -
plugins/tiles3/src/main/resources/LICENSE.txt | 174 ---
plugins/tiles3/src/main/resources/NOTICE.txt| 5 -
.../tiles3/src/main/resources/struts-plugin.xml | 34
plugins/tiles3/src/site/site.xml| 57 --
6 files changed, 411 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/struts/blob/9f665f7b/plugins/tiles3/pom.xml
--
diff --git a/plugins/tiles3/pom.xml b/plugins/tiles3/pom.xml
deleted file mode 100644
index a029dff..000
--- a/plugins/tiles3/pom.xml
+++ /dev/null
@@ -1,60 +0,0 @@
-
-
-http://maven.apache.org/POM/4.0.0";
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance";
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0
http://maven.apache.org/maven-v4_0_0.xsd";>
-4.0.0
-
-org.apache.struts
-struts2-plugins
-2.5-SNAPSHOT
-
-
-struts2-tiles3-plugin
-jar
-Struts 2 Tiles 3 Plugin
-
-
-3.0.1
-UTF-8
-
-
-
-
-org.apache.tiles
-tiles-core
-${tiles3.version}
-
-
-org.apache.tiles
-tiles-extras
-${tiles3.version}
-
-
-org.apache.tiles
-tiles-jsp
-${tiles3.version}
-runtime
-
-
-
-
http://git-wip-us.apache.org/repos/asf/struts/blob/9f665f7b/plugins/tiles3/src/main/java/org/apache/struts2/views/tiles/TilesResult.java
--
diff --git
a/plugins/tiles3/src/main/java/org/apache/struts2/views/tiles/TilesResult.java
b/plugins/tiles3/src/main/java/org/apache/struts2/views/tiles/TilesResult.java
deleted file mode 100644
index 6bc15bb..000
---
a/plugins/tiles3/src/main/java/org/apache/struts2/views/tiles/TilesResult.java
+++ /dev/null
@@ -1,81 +0,0 @@
-/*
- * $Id$
- *
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-
-package org.apache.struts2.views.tiles;
-
-import com.opensymphony.xwork2.ActionInvocation;
-import org.apache.struts2.ServletActionContext;
-import org.apache.struts2.result.ServletDispatcherResult;
-import org.apache.tiles.TilesContainer;
-import org.apache.tiles.access.TilesAccess;
-import org.apache.tiles.request.ApplicationContext;
-import org.apache.tiles.request.servlet.ServletRequest;
-import org.apache.tiles.request.servlet.ServletUtil;
-
-import javax.servlet.ServletContext;
-import javax.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpServletResponse;
-
-/**
- * First implementation of Tiles 3 support
- *
- * Please follow the link to read more how to configure the result
- *
http://stackoverflow.com/questions/13337938/how-to-integrate-struts-2-with-tiles-3
- *
- * or check the docs
- *
- * https://cwiki.apache.org/confluence/display/WW/Tiles+3+Plugin
- *
- *
- * @author Ken McWilliams
- */
-public class TilesResult extends ServletDispatcherResult {
-
-public TilesResult() {
-super();
-}
-
-public TilesResult(String location) {
-super(location);
-}
-
-@Override
-public void doExecute(String location, ActionInvocation invocation) throws
Exception {
-ServletContext context = ServletActionContext.getServletContext();
-HttpServletRequest request = ServletActionContext.getRequest();
-HttpServletResponse response = ServletActionContext.getResponse();
[07/50] [abbrv] struts git commit: added testcase for WW-4312 / #69
added testcase for WW-4312 / #69
Project: http://git-wip-us.apache.org/repos/asf/struts/repo
Commit: http://git-wip-us.apache.org/repos/asf/struts/commit/6fd37d86
Tree: http://git-wip-us.apache.org/repos/asf/struts/tree/6fd37d86
Diff: http://git-wip-us.apache.org/repos/asf/struts/diff/6fd37d86
Branch: refs/heads/master
Commit: 6fd37d86cceeae43a3481ed70ba2f500778249a4
Parents: dad437b
Author: cnenning
Authored: Tue Jan 5 13:47:15 2016 +0100
Committer: Lukasz Lenart
Committed: Tue Jan 19 16:18:00 2016 +0100
--
.../components/IteratorComponentTest.java | 38
1 file changed, 38 insertions(+)
--
http://git-wip-us.apache.org/repos/asf/struts/blob/6fd37d86/core/src/test/java/org/apache/struts2/components/IteratorComponentTest.java
--
diff --git
a/core/src/test/java/org/apache/struts2/components/IteratorComponentTest.java
b/core/src/test/java/org/apache/struts2/components/IteratorComponentTest.java
index 1115493..c9a075a 100644
---
a/core/src/test/java/org/apache/struts2/components/IteratorComponentTest.java
+++
b/core/src/test/java/org/apache/struts2/components/IteratorComponentTest.java
@@ -76,6 +76,44 @@ public class IteratorComponentTest extends
StrutsInternalTestCase {
assertEquals("item2 item3 item4 ", out.getBuffer().toString());
}
+public void testIteratorWithNulls() throws Exception {
+// given
+final ValueStack stack = ActionContext.getContext().getValueStack();
+stack.push(new FooAction() {
+private List items = Arrays.asList("1", "2", null, "4");
+
+public List getItems() {
+return items;
+}
+});
+
+StringWriter out = new StringWriter();
+
+IteratorComponent ic = new IteratorComponent(stack);
+ic.setValue("items");
+ic.setVar("val");
+Property prop = new Property(stack);
+
+ic.getComponentStack().push(prop);
+ic.getComponentStack().push(prop);
+ic.getComponentStack().push(prop);
+ic.getComponentStack().push(prop);
+
+String body = ", ";
+
+// when
+assertTrue(ic.start(out));
+
+for (int i = 0; i < 4; i++) {
+prop.start(out);
+prop.end(out, body);
+ic.end(out, null);
+}
+
+// then
+assertEquals("1, 2, , 4, ", out.getBuffer().toString());
+}
+
static class FooAction {
private List items;
[17/50] [abbrv] struts git commit: Adds additional pattern to prevent access to getClass method
Adds additional pattern to prevent access to getClass method
Project: http://git-wip-us.apache.org/repos/asf/struts/repo
Commit: http://git-wip-us.apache.org/repos/asf/struts/commit/46f3cf24
Tree: http://git-wip-us.apache.org/repos/asf/struts/tree/46f3cf24
Diff: http://git-wip-us.apache.org/repos/asf/struts/diff/46f3cf24
Branch: refs/heads/master
Commit: 46f3cf24c4e87b07988068195cda0f7c4fc450f5
Parents: c067020
Author: Lukasz Lenart
Authored: Sun Jan 10 11:46:46 2016 +0100
Committer: Lukasz Lenart
Committed: Tue Jan 19 16:18:01 2016 +0100
--
.../xwork2/security/DefaultExcludedPatternsChecker.java | 1 +
.../xwork2/interceptor/ParametersInterceptorTest.java | 9 ++---
2 files changed, 7 insertions(+), 3 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/struts/blob/46f3cf24/core/src/main/java/com/opensymphony/xwork2/security/DefaultExcludedPatternsChecker.java
--
diff --git
a/core/src/main/java/com/opensymphony/xwork2/security/DefaultExcludedPatternsChecker.java
b/core/src/main/java/com/opensymphony/xwork2/security/DefaultExcludedPatternsChecker.java
index 13e091e..84840f5 100644
---
a/core/src/main/java/com/opensymphony/xwork2/security/DefaultExcludedPatternsChecker.java
+++
b/core/src/main/java/com/opensymphony/xwork2/security/DefaultExcludedPatternsChecker.java
@@ -17,6 +17,7 @@ public class DefaultExcludedPatternsChecker implements
ExcludedPatternsChecker {
public static final String[] EXCLUDED_PATTERNS = {
"(^|\\%\\{)((#?)(top(\\.|\\['|\\[\")|\\[\\d\\]\\.)?)(dojo|struts|session|request|response|application|servlet(Request|Response|Context)|parameters|context|_memberAccess)(\\.|\\[).*",
+".*(^|\\.|\\[|\\'|\"|get)class(\\(\\.|\\[|\\'|\").*",
"^(action|method):.*"
};
http://git-wip-us.apache.org/repos/asf/struts/blob/46f3cf24/core/src/test/java/com/opensymphony/xwork2/interceptor/ParametersInterceptorTest.java
--
diff --git
a/core/src/test/java/com/opensymphony/xwork2/interceptor/ParametersInterceptorTest.java
b/core/src/test/java/com/opensymphony/xwork2/interceptor/ParametersInterceptorTest.java
index b025784..cdd8003 100644
---
a/core/src/test/java/com/opensymphony/xwork2/interceptor/ParametersInterceptorTest.java
+++
b/core/src/test/java/com/opensymphony/xwork2/interceptor/ParametersInterceptorTest.java
@@ -84,6 +84,7 @@ public class ParametersInterceptorTest extends XWorkTestCase {
"java.lang.Boolean(false),
#_memberAccess[\"allowStaticMethodAccess\"]= new java.lang.Boolean(true), " +
"@java.lang.Runtime@getRuntime().exec('mkdir
/tmp/PWNAGE'))(meh)");
put("top['name'](0)", "true");
+put("expression",
"#f=#_memberAccess.getClass().getDeclaredField('allowStaticMethodAccess'),#f.setAccessible(true),#f.set(#_memberAccess,true),#req=@org.apache.struts2.ServletActionContext@getRequest(),#resp=@org.apache.struts2.ServletActionContext@getResponse().getWriter(),#resp.println(#req.getRealPath('/')),#resp.close()");
}
};
@@ -96,13 +97,15 @@ public class ParametersInterceptorTest extends
XWorkTestCase {
pi.setParameters(action, vs, HttpParameters.create(params).build());
// then
-assertEquals(2, action.getActionMessages().size());
+assertEquals(3, action.getActionMessages().size());
String msg1 = action.getActionMessage(0);
String msg2 = action.getActionMessage(1);
+String msg3 = action.getActionMessage(2);
-assertEquals("Error setting expression 'name' with value
'(#context[\"xwork.MethodAccessor.denyMethodExecution\"]= new
java.lang.Boolean(false), #_memberAccess[\"allowStaticMethodAccess\"]= new
java.lang.Boolean(true), @java.lang.Runtime@getRuntime().exec('mkdir
/tmp/PWNAGE'))(meh)'", msg1);
-assertEquals("Error setting expression 'top['name'](0)' with value
'true'", msg2);
+assertEquals("Error setting expression 'expression' with value
'#f=#_memberAccess.getClass().getDeclaredField('allowStaticMethodAccess'),#f.setAccessible(true),#f.set(#_memberAccess,true),#req=@org.apache.struts2.ServletActionContext@getRequest(),#resp=@org.apache.struts2.ServletActionContext@getResponse().getWriter(),#resp.println(#req.getRealPath('/')),#resp.close()'",
msg1);
+assertEquals("Error setting expression 'name' with value
'(#context[\"xwork.MethodAccessor.denyMethodExecution\"]= new
java.lang.Boolean(false), #_memberAccess[\"allowStaticMethodAccess\"]= new
java.lang.Boolean(true), @java.lang.Runtime@getRuntime().exec('mkdir
/tmp/PWNAGE'))(meh)'", msg2);
+assertEquals("Error setting expression 'top['name'](0)' with value
'true'", msg3);
assertNull(
[26/50] [abbrv] struts git commit: Migrates tiles-portlet to the same version
Migrates tiles-portlet to the same version
Project: http://git-wip-us.apache.org/repos/asf/struts/repo
Commit: http://git-wip-us.apache.org/repos/asf/struts/commit/f6d0e15f
Tree: http://git-wip-us.apache.org/repos/asf/struts/tree/f6d0e15f
Diff: http://git-wip-us.apache.org/repos/asf/struts/diff/f6d0e15f
Branch: refs/heads/master
Commit: f6d0e15f6b1a3a6fd0f9c46c00671d0aadf00a81
Parents: 0748886
Author: Lukasz Lenart
Authored: Tue Jan 12 10:36:46 2016 +0100
Committer: Lukasz Lenart
Committed: Tue Jan 19 16:19:18 2016 +0100
--
plugins/portlet-tiles/pom.xml | 2 +-
.../struts2/views/tiles/PortletTilesResult.java | 50 +++-
pom.xml | 5 +-
3 files changed, 41 insertions(+), 16 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/struts/blob/f6d0e15f/plugins/portlet-tiles/pom.xml
--
diff --git a/plugins/portlet-tiles/pom.xml b/plugins/portlet-tiles/pom.xml
index 9e9a81f..8b710b2 100644
--- a/plugins/portlet-tiles/pom.xml
+++ b/plugins/portlet-tiles/pom.xml
@@ -44,7 +44,7 @@
org.apache.tiles
-tiles-portlet
+tiles-request-portlet
javax.servlet
http://git-wip-us.apache.org/repos/asf/struts/blob/f6d0e15f/plugins/portlet-tiles/src/main/java/org/apache/struts2/views/tiles/PortletTilesResult.java
--
diff --git
a/plugins/portlet-tiles/src/main/java/org/apache/struts2/views/tiles/PortletTilesResult.java
b/plugins/portlet-tiles/src/main/java/org/apache/struts2/views/tiles/PortletTilesResult.java
index 83fcd4e..f12274b 100644
---
a/plugins/portlet-tiles/src/main/java/org/apache/struts2/views/tiles/PortletTilesResult.java
+++
b/plugins/portlet-tiles/src/main/java/org/apache/struts2/views/tiles/PortletTilesResult.java
@@ -22,22 +22,20 @@
package org.apache.struts2.views.tiles;
import com.opensymphony.xwork2.ActionInvocation;
-import freemarker.template.TemplateException;
-import org.apache.struts2.ServletActionContext;
-import org.apache.struts2.result.ServletDispatcherResult;
import org.apache.struts2.portlet.PortletConstants;
import org.apache.struts2.portlet.context.PortletActionContext;
+import org.apache.struts2.result.ServletDispatcherResult;
import org.apache.tiles.TilesContainer;
import org.apache.tiles.TilesException;
import org.apache.tiles.access.TilesAccess;
-import org.apache.tiles.portlet.context.PortletUtil;
+import org.apache.tiles.request.ApplicationContext;
+import org.apache.tiles.request.Request;
+import org.apache.tiles.request.portlet.RenderPortletRequest;
import javax.portlet.ActionResponse;
-import javax.portlet.PortletException;
-import javax.servlet.ServletContext;
-import javax.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpServletResponse;
-import java.io.IOException;
+import javax.portlet.PortletContext;
+import javax.portlet.RenderRequest;
+import javax.portlet.RenderResponse;
import java.util.Map;
/**
@@ -68,12 +66,15 @@ public class PortletTilesResult extends
ServletDispatcherResult {
protected void executeRenderResult(String location) throws TilesException {
setLocation(location);
-TilesContainer container =
PortletUtil.getContainer(PortletActionContext.getPortletContext());
+PortletContext portletContext =
PortletActionContext.getPortletContext();
+RenderRequest request = PortletActionContext.getRenderRequest();
+RenderResponse response = PortletActionContext.getRenderResponse();
-HttpServletRequest request = ServletActionContext.getRequest();
-HttpServletResponse response = ServletActionContext.getResponse();
+TilesContainer container = getCurrentContainer(request,
portletContext);
+ApplicationContext applicationContext =
container.getApplicationContext();
+Request currentRequest = new RenderPortletRequest(applicationContext,
portletContext, request, response);
-container.render(location, request, response);
+container.render(location, currentRequest);
}
protected void executeActionResult(String location, ActionInvocation
invocation) {
@@ -87,4 +88,27 @@ public class PortletTilesResult extends
ServletDispatcherResult {
res.setRenderParameter(PortletConstants.MODE_PARAM,
PortletActionContext.getRequest().getPortletMode().toString());
}
+protected TilesContainer getCurrentContainer(javax.portlet.PortletRequest
request, PortletContext context) {
+
+TilesContainer container = (TilesContainer)
request.getAttribute(TilesAccess.CURRENT_CONTAINER_ATTRIBUTE_NAME);
+
+if (container == null) {
+container = getContainer(context);
+reque
[44/50] [abbrv] struts git commit: Adds support to use Struts' Locale
Adds support to use Struts' Locale
Project: http://git-wip-us.apache.org/repos/asf/struts/repo
Commit: http://git-wip-us.apache.org/repos/asf/struts/commit/42628da3
Tree: http://git-wip-us.apache.org/repos/asf/struts/tree/42628da3
Diff: http://git-wip-us.apache.org/repos/asf/struts/diff/42628da3
Branch: refs/heads/master
Commit: 42628da3c34dca808817ec00fd76d89922c6d006
Parents: 4771dfa
Author: Lukasz Lenart
Authored: Fri Jan 15 10:12:15 2016 +0100
Committer: Lukasz Lenart
Committed: Tue Jan 19 16:19:20 2016 +0100
--
.../tiles/StrutsTilesContainerFactory.java | 4 ++
.../tiles/StrutsTilesLocaleResolver.java| 54
2 files changed, 58 insertions(+)
--
http://git-wip-us.apache.org/repos/asf/struts/blob/42628da3/plugins/tiles/src/main/java/org/apache/struts2/tiles/StrutsTilesContainerFactory.java
--
diff --git
a/plugins/tiles/src/main/java/org/apache/struts2/tiles/StrutsTilesContainerFactory.java
b/plugins/tiles/src/main/java/org/apache/struts2/tiles/StrutsTilesContainerFactory.java
index 8403610..0cb14f3 100644
---
a/plugins/tiles/src/main/java/org/apache/struts2/tiles/StrutsTilesContainerFactory.java
+++
b/plugins/tiles/src/main/java/org/apache/struts2/tiles/StrutsTilesContainerFactory.java
@@ -161,6 +161,10 @@ public class StrutsTilesContainerFactory extends
BasicTilesContainerFactory {
return resolver;
}
+protected LocaleResolver createLocaleResolver(ApplicationContext
applicationContext) {
+return new StrutsTilesLocaleResolver();
+}
+
@Override
protected List getSources(ApplicationContext
applicationContext) {
Collection resources =
applicationContext.getResources(getTilesDefinitionPattern(applicationContext.getInitParams()));
http://git-wip-us.apache.org/repos/asf/struts/blob/42628da3/plugins/tiles/src/main/java/org/apache/struts2/tiles/StrutsTilesLocaleResolver.java
--
diff --git
a/plugins/tiles/src/main/java/org/apache/struts2/tiles/StrutsTilesLocaleResolver.java
b/plugins/tiles/src/main/java/org/apache/struts2/tiles/StrutsTilesLocaleResolver.java
new file mode 100644
index 000..2c0ef9d
--- /dev/null
+++
b/plugins/tiles/src/main/java/org/apache/struts2/tiles/StrutsTilesLocaleResolver.java
@@ -0,0 +1,54 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+
+package org.apache.struts2.tiles;
+
+import com.opensymphony.xwork2.ActionContext;
+import com.opensymphony.xwork2.LocaleProvider;
+import com.opensymphony.xwork2.config.ConfigurationException;
+import org.apache.logging.log4j.LogManager;
+import org.apache.logging.log4j.Logger;
+import org.apache.struts2.ServletActionContext;
+import org.apache.tiles.locale.LocaleResolver;
+import org.apache.tiles.request.Request;
+import org.apache.tiles.request.servlet.ServletUtil;
+
+import javax.servlet.http.HttpServletRequest;
+import java.util.Locale;
+
+public class StrutsTilesLocaleResolver implements LocaleResolver {
+
+private static Logger LOG =
LogManager.getLogger(StrutsTilesLocaleResolver.class);
+
+@Override
+public Locale resolveLocale(Request request) {
+HttpServletRequest httpRequest =
ServletUtil.getServletRequest(request).getRequest();
+ActionContext ctx = ServletActionContext.getActionContext(httpRequest);
+
+if (ctx == null) {
+LOG.error("Cannot obtain HttpServletRequest from [{}]",
request.getClass().getName());
+throw new ConfigurationException("There is no ActionContext for
current request!");
+}
+
+LocaleProvider provider = ctx.getInstance(LocaleProvider.class);
+
+return provider.getLocale();
+}
+
+}
[34/50] [abbrv] struts git commit: Defines helper method to fetch ActionContext from request
Defines helper method to fetch ActionContext from request
Project: http://git-wip-us.apache.org/repos/asf/struts/repo
Commit: http://git-wip-us.apache.org/repos/asf/struts/commit/4c6e51b3
Tree: http://git-wip-us.apache.org/repos/asf/struts/tree/4c6e51b3
Diff: http://git-wip-us.apache.org/repos/asf/struts/diff/4c6e51b3
Branch: refs/heads/master
Commit: 4c6e51b302a50215b06a79051dfe12e19a4bce91
Parents: 375faa4
Author: Lukasz Lenart
Authored: Wed Jan 13 12:05:03 2016 +0100
Committer: Lukasz Lenart
Committed: Tue Jan 19 16:19:19 2016 +0100
--
.../StrutsFreeMarkerAttributeRenderer.java | 30 +---
1 file changed, 26 insertions(+), 4 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/struts/blob/4c6e51b3/plugins/tiles/src/main/java/org/apache/struts2/tiles/StrutsFreeMarkerAttributeRenderer.java
--
diff --git
a/plugins/tiles/src/main/java/org/apache/struts2/tiles/StrutsFreeMarkerAttributeRenderer.java
b/plugins/tiles/src/main/java/org/apache/struts2/tiles/StrutsFreeMarkerAttributeRenderer.java
index 48592e0..fbc5416 100644
---
a/plugins/tiles/src/main/java/org/apache/struts2/tiles/StrutsFreeMarkerAttributeRenderer.java
+++
b/plugins/tiles/src/main/java/org/apache/struts2/tiles/StrutsFreeMarkerAttributeRenderer.java
@@ -36,7 +36,9 @@ import org.apache.struts2.views.freemarker.StrutsBeanWrapper;
import org.apache.tiles.freemarker.template.TilesFMModelRepository;
import org.apache.tiles.impl.InvalidTemplateException;
import org.apache.tiles.request.Request;
+import org.apache.tiles.request.jsp.JspRequest;
import org.apache.tiles.request.render.Renderer;
+import org.apache.tiles.request.servlet.ServletRequest;
import javax.servlet.ServletContext;
import javax.servlet.http.HttpServletRequest;
@@ -51,10 +53,7 @@ public class StrutsFreeMarkerAttributeRenderer implements
Renderer {
if (path != null) {
LOG.trace("Rendering freemarker tile ...");
-ActionContext ctx =
ServletActionContext.getActionContext((HttpServletRequest) request);
-if (ctx == null) {
-throw new ConfigurationException("There is no ActionContext
for current request!");
-}
+ActionContext ctx = readActionContext(request);
registerTilesBeanModel(ctx);
@@ -77,6 +76,29 @@ public class StrutsFreeMarkerAttributeRenderer implements
Renderer {
}
}
+/**
+ * Depending how Tiles definition was defined, request can an instance of
JspRequest (for JSPs)
+ * or a ServletRequest (FreeMarker)
+ */
+protected ActionContext readActionContext(Request request) {
+ActionContext ctx = null;
+
+if (request instanceof ServletRequest) {
+HttpServletRequest httpRequest = ((ServletRequest)
request).getRequest();
+ctx = ServletActionContext.getActionContext(httpRequest);
+}
+if (request instanceof JspRequest) {
+HttpServletRequest httpRequest = (HttpServletRequest)
((JspRequest) request).getPageContext().getRequest();
+ctx = ServletActionContext.getActionContext(httpRequest);
+}
+
+if (ctx == null) {
+throw new ConfigurationException("There is no ActionContext for
current request!");
+}
+
+return ctx;
+}
+
@Override
public boolean isRenderable(String path, Request request) {
return path != null && path.startsWith("/") && path.endsWith(".ftl");
[03/50] [abbrv] struts git commit: fix for WW-4573
fix for WW-4573 NPE/ concurrent modification exception using a CopyOnWriteArrayList. This is to keep Memory consistency on the ValueStack. Project: http://git-wip-us.apache.org/repos/asf/struts/repo Commit: http://git-wip-us.apache.org/repos/asf/struts/commit/8d4bb890 Tree: http://git-wip-us.apache.org/repos/asf/struts/tree/8d4bb890 Diff: http://git-wip-us.apache.org/repos/asf/struts/diff/8d4bb890 Branch: refs/heads/master Commit: 8d4bb890abb004a70a539ad4a3d0fc51dd53b407 Parents: 3a29bc3 Author: Victor Sosa Authored: Sat Jan 2 15:18:37 2016 -0400 Committer: Lukasz Lenart Committed: Tue Jan 19 16:17:09 2016 +0100 -- core/src/main/java/com/opensymphony/xwork2/util/CompoundRoot.java | 1 - 1 file changed, 1 deletion(-) -- http://git-wip-us.apache.org/repos/asf/struts/blob/8d4bb890/core/src/main/java/com/opensymphony/xwork2/util/CompoundRoot.java -- diff --git a/core/src/main/java/com/opensymphony/xwork2/util/CompoundRoot.java b/core/src/main/java/com/opensymphony/xwork2/util/CompoundRoot.java index e548a00..49b47da 100644 --- a/core/src/main/java/com/opensymphony/xwork2/util/CompoundRoot.java +++ b/core/src/main/java/com/opensymphony/xwork2/util/CompoundRoot.java @@ -15,7 +15,6 @@ */ package com.opensymphony.xwork2.util; -import java.util.ArrayList; import java.util.List; import java.util.concurrent.CopyOnWriteArrayList;
struts-site git commit: Adds announcements for 2.3.30 & 2.5.2
Repository: struts-site
Updated Branches:
refs/heads/master 7f198004e -> bcf478d46
Adds announcements for 2.3.30 & 2.5.2
Project: http://git-wip-us.apache.org/repos/asf/struts-site/repo
Commit: http://git-wip-us.apache.org/repos/asf/struts-site/commit/bcf478d4
Tree: http://git-wip-us.apache.org/repos/asf/struts-site/tree/bcf478d4
Diff: http://git-wip-us.apache.org/repos/asf/struts-site/diff/bcf478d4
Branch: refs/heads/master
Commit: bcf478d465e2da66c39130bdd183750cb14d43d0
Parents: 7f19800
Author: Lukasz Lenart
Authored: Fri Jul 15 09:17:35 2016 +0200
Committer: Lukasz Lenart
Committed: Fri Jul 15 09:17:35 2016 +0200
--
_config.yml | 8 +++---
source/announce.md| 67 +-
source/download.html | 40 +--
source/downloads.html | 24 +
source/index.html | 6 ++---
5 files changed, 112 insertions(+), 33 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/struts-site/blob/bcf478d4/_config.yml
--
diff --git a/_config.yml b/_config.yml
index 4162fd8..e8d7d72 100644
--- a/_config.yml
+++ b/_config.yml
@@ -22,10 +22,10 @@ kramdown:
root:
# Simplifies introducing changes related to the latest release
-current_version: 2.5.1
-current_version_short: 251
+current_version: 2.5.2
+current_version_short: 252
current_beta_version: 2.5-BETA3
current_beta_version_short: 25B3
-release_date: 18 june 2016
-release_date_short: 20160618
+release_date: 07 july 2016
+release_date_short: 20160707
beta_release_date_short: 20160126
http://git-wip-us.apache.org/repos/asf/struts-site/blob/bcf478d4/source/announce.md
--
diff --git a/source/announce.md b/source/announce.md
index ec994b7..87ed6fb 100644
--- a/source/announce.md
+++ b/source/announce.md
@@ -8,6 +8,61 @@ title: Announcements
Skip to: Announcements - 2015
+ 7 July 2016 - Struts 2.5.2 General Availability {#a20160707}
+
+The Apache Struts group is pleased to announce that Struts 2.5.2 is available
as a "General Availability"
+release. The GA designation is our highest quality grade.
+
+Apache Struts 2 is an elegant, extensible framework for creating
enterprise-ready Java web applications.
+The framework is designed to streamline the full development cycle, from
building, to deploying,
+to maintaining applications over time.
+
+Struts 2.5.2 release contains several improvements just to mention few of them:
+
+ - SecurityMemberAccess exclude class design issue, see WW-4645
+ - Json deserialization does not work in 2.5.1, see WW-4650
+ - Negative number is considered an arithmetic expression, see WW-4651
+ - Wildcard redirect and path `/static/`, see WW-4656
+ - Upgrade commons-fileupload to the latest version, see WW-4648
+ - Cleans up logic in `StreamResult` and update docs, see WW-4655
+
+**All developers are strongly advised to perform this action.**
+
+The 2.5.x series of the Apache Struts framework has a minimum requirement of
the following specification versions:
+Servlet API 2.4, JSP API 2.0, and Java 7.
+
+Should any issues arise with your use of any version of the Struts framework,
please post your comments
+to the user list, and, if appropriate, file a tracking ticket.
+
+You can download this version from our [download](download.cgi#struts-ga) page.
+
+ 7 July 2016 - Struts 2.3.30 General Availability {#a20160707-2}
+
+The Apache Struts group is pleased to announce that Struts 2.3.30 is available
as a "General Availability"
+release. The GA designation is our highest quality grade.
+
+Apache Struts 2 is an elegant, extensible framework for creating
enterprise-ready Java web applications.
+The framework is designed to streamline the full development cycle, from
building, to deploying,
+to maintaining applications over time.
+
+This release contains several breaking changes and improvements just to
mention few of them:
+
+ - Pre-evaluation of "name" attribute stopped working, see WW-4641
+ - Unable to retrieve `s:hidden` field values, see WW-4642
+ - SecurityMemberAccess exclude class design issue, see WW-4645
+ - Negative number is considered an arithmetic expression, see WW-4651
+ - Upgrade commons-fileupload to the latest version, see WW-4648
+
+**All developers are strongly advised to perform this action.**
+
+The 2.3.x series of the Apache Struts framework has a minimum requirement of
the following specification versions:
+Servlet API 2.4, JSP API 2.0, and Java 6.
+
+Should any issues arise with your use of any version of the Struts framework,
please post your comments
+to the user list, and, if appropriate, file a tracking ticket.
+
+You can download this version from our [download](download.cgi#struts-2330)
page.
+
18 June 2016 - Struts 2.5
[01/53] [partial] struts git commit: WW-4316 Moves archetypes into its own repo
Repository: struts Updated Branches: refs/heads/master f21a3fd10 -> 889e6db56 http://git-wip-us.apache.org/repos/asf/struts/blob/7a350b02/archetypes/struts2-archetype-angularjs/src/main/resources/archetype-resources/src/main/webapp/js/lib/angular/version.txt -- diff --git a/archetypes/struts2-archetype-angularjs/src/main/resources/archetype-resources/src/main/webapp/js/lib/angular/version.txt b/archetypes/struts2-archetype-angularjs/src/main/resources/archetype-resources/src/main/webapp/js/lib/angular/version.txt deleted file mode 100644 index 3e1ad72..000 --- a/archetypes/struts2-archetype-angularjs/src/main/resources/archetype-resources/src/main/webapp/js/lib/angular/version.txt +++ /dev/null @@ -1 +0,0 @@ -1.5.0 \ No newline at end of file
[43/53] [partial] struts git commit: WW-4316 Moves archetypes into its own repo
http://git-wip-us.apache.org/repos/asf/struts/blob/7a350b02/archetypes/struts2-archetype-angularjs/src/main/resources/archetype-resources/src/main/webapp/js/lib/angular/angular-mocks.js
--
diff --git
a/archetypes/struts2-archetype-angularjs/src/main/resources/archetype-resources/src/main/webapp/js/lib/angular/angular-mocks.js
b/archetypes/struts2-archetype-angularjs/src/main/resources/archetype-resources/src/main/webapp/js/lib/angular/angular-mocks.js
deleted file mode 100644
index 34d3608..000
---
a/archetypes/struts2-archetype-angularjs/src/main/resources/archetype-resources/src/main/webapp/js/lib/angular/angular-mocks.js
+++ /dev/null
@@ -1,2842 +0,0 @@
-/**
- * @license AngularJS v1.5.0
- * (c) 2010-2016 Google, Inc. http://angularjs.org
- * License: MIT
- */
-(function(window, angular, undefined) {
-
-'use strict';
-
-/**
- * @ngdoc object
- * @name angular.mock
- * @description
- *
- * Namespace from 'angular-mocks.js' which contains testing related code.
- */
-angular.mock = {};
-
-/**
- * ! This is a private undocumented service !
- *
- * @name $browser
- *
- * @description
- * This service is a mock implementation of {@link ng.$browser}. It provides
fake
- * implementation for commonly used browser apis that are hard to test, e.g.
setTimeout, xhr,
- * cookies, etc...
- *
- * The api of this service is the same as that of the real {@link ng.$browser
$browser}, except
- * that there are several helper methods available which can be used in tests.
- */
-angular.mock.$BrowserProvider = function() {
- this.$get = function() {
-return new angular.mock.$Browser();
- };
-};
-
-angular.mock.$Browser = function() {
- var self = this;
-
- this.isMock = true;
- self.$$url = "http://server/";;
- self.$$lastUrl = self.$$url; // used by url polling fn
- self.pollFns = [];
-
- // TODO(vojta): remove this temporary api
- self.$$completeOutstandingRequest = angular.noop;
- self.$$incOutstandingRequestCount = angular.noop;
-
-
- // register url polling fn
-
- self.onUrlChange = function(listener) {
-self.pollFns.push(
- function() {
-if (self.$$lastUrl !== self.$$url || self.$$state !==
self.$$lastState) {
- self.$$lastUrl = self.$$url;
- self.$$lastState = self.$$state;
- listener(self.$$url, self.$$state);
-}
- }
-);
-
-return listener;
- };
-
- self.$$applicationDestroyed = angular.noop;
- self.$$checkUrlChange = angular.noop;
-
- self.deferredFns = [];
- self.deferredNextId = 0;
-
- self.defer = function(fn, delay) {
-delay = delay || 0;
-self.deferredFns.push({time:(self.defer.now + delay), fn:fn, id:
self.deferredNextId});
-self.deferredFns.sort(function(a, b) { return a.time - b.time;});
-return self.deferredNextId++;
- };
-
-
- /**
- * @name $browser#defer.now
- *
- * @description
- * Current milliseconds mock time.
- */
- self.defer.now = 0;
-
-
- self.defer.cancel = function(deferId) {
-var fnIndex;
-
-angular.forEach(self.deferredFns, function(fn, index) {
- if (fn.id === deferId) fnIndex = index;
-});
-
-if (angular.isDefined(fnIndex)) {
- self.deferredFns.splice(fnIndex, 1);
- return true;
-}
-
-return false;
- };
-
-
- /**
- * @name $browser#defer.flush
- *
- * @description
- * Flushes all pending requests and executes the defer callbacks.
- *
- * @param {number=} number of milliseconds to flush. See {@link #defer.now}
- */
- self.defer.flush = function(delay) {
-if (angular.isDefined(delay)) {
- self.defer.now += delay;
-} else {
- if (self.deferredFns.length) {
-self.defer.now = self.deferredFns[self.deferredFns.length - 1].time;
- } else {
-throw new Error('No deferred tasks to be flushed');
- }
-}
-
-while (self.deferredFns.length && self.deferredFns[0].time <=
self.defer.now) {
- self.deferredFns.shift().fn();
-}
- };
-
- self.$$baseHref = '/';
- self.baseHref = function() {
-return this.$$baseHref;
- };
-};
-angular.mock.$Browser.prototype = {
-
-/**
- * @name $browser#poll
- *
- * @description
- * run all fns in pollFns
- */
- poll: function poll() {
-angular.forEach(this.pollFns, function(pollFn) {
- pollFn();
-});
- },
-
- url: function(url, replace, state) {
-if (angular.isUndefined(state)) {
- state = null;
-}
-if (url) {
- this.$$url = url;
- // Native pushState serializes & copies the object; simulate it.
- this.$$state = angular.copy(state);
- return this;
-}
-
-return this.$$url;
- },
-
- state: function() {
-return this.$$state;
- },
-
- notifyWhenNoOutstandingRequests: function(fn) {
-fn();
- }
-};
-
-
-/**
- * @ngdoc provider
- * @name $exceptionHandlerProvider
- *
- * @description
- * Configures the mock implementation of {@link ng.$exceptionHandler} to
rethrow or to log errors
- * passe
[14/53] [partial] struts git commit: WW-4316 Moves archetypes into its own repo
http://git-wip-us.apache.org/repos/asf/struts/blob/7a350b02/archetypes/struts2-archetype-angularjs/src/main/resources/archetype-resources/src/main/webapp/js/lib/angular/i18n/angular-locale_mas.js
--
diff --git
a/archetypes/struts2-archetype-angularjs/src/main/resources/archetype-resources/src/main/webapp/js/lib/angular/i18n/angular-locale_mas.js
b/archetypes/struts2-archetype-angularjs/src/main/resources/archetype-resources/src/main/webapp/js/lib/angular/i18n/angular-locale_mas.js
deleted file mode 100644
index a1557f5..000
---
a/archetypes/struts2-archetype-angularjs/src/main/resources/archetype-resources/src/main/webapp/js/lib/angular/i18n/angular-locale_mas.js
+++ /dev/null
@@ -1,143 +0,0 @@
-'use strict';
-angular.module("ngLocale", [], ["$provide", function($provide) {
-var PLURAL_CATEGORY = {ZERO: "zero", ONE: "one", TWO: "two", FEW: "few", MANY:
"many", OTHER: "other"};
-function getDecimals(n) {
- n = n + '';
- var i = n.indexOf('.');
- return (i == -1) ? 0 : n.length - i - 1;
-}
-
-function getVF(n, opt_precision) {
- var v = opt_precision;
-
- if (undefined === v) {
-v = Math.min(getDecimals(n), 3);
- }
-
- var base = Math.pow(10, v);
- var f = ((n * base) | 0) % base;
- return {v: v, f: f};
-}
-
-$provide.value("$locale", {
- "DATETIME_FORMATS": {
-"AMPMS": [
- "\u0190nkak\u025bny\u00e1",
- "\u0190nd\u00e1m\u00e2"
-],
-"DAY": [
- "Jumap\u00edl\u00ed",
- "Jumat\u00e1tu",
- "Jumane",
- "Jumat\u00e1n\u0254",
- "Ala\u00e1misi",
- "Jum\u00e1a",
- "Jumam\u00f3si"
-],
-"ERANAMES": [
- "Me\u00edn\u014d Y\u025b\u0301s\u0289",
- "E\u00edn\u014d Y\u025b\u0301s\u0289"
-],
-"ERAS": [
- "MY",
- "EY"
-],
-"FIRSTDAYOFWEEK": 0,
-"MONTH": [
- "Oladal\u0289\u0301",
- "Ar\u00e1t",
- "\u0186\u025bn\u0268\u0301\u0254\u0268\u014b\u0254k",
- "Olodoy\u00ed\u00f3r\u00ed\u00ea ink\u00f3k\u00fa\u00e2",
- "Oloil\u00e9p\u016bny\u012b\u0113 ink\u00f3k\u00fa\u00e2",
- "K\u00faj\u00fa\u0254r\u0254k",
- "M\u00f3rus\u00e1sin",
- "\u0186l\u0254\u0301\u0268\u0301b\u0254\u0301r\u00e1r\u025b",
- "K\u00fash\u00een",
- "Olg\u00edsan",
- "P\u0289sh\u0289\u0301ka",
- "Nt\u0289\u0301\u014b\u0289\u0301s"
-],
-"SHORTDAY": [
- "Jpi",
- "Jtt",
- "Jnn",
- "Jtn",
- "Alh",
- "Iju",
- "Jmo"
-],
-"SHORTMONTH": [
- "Dal",
- "Ar\u00e1",
- "\u0186\u025bn",
- "Doy",
- "L\u00e9p",
- "Rok",
- "S\u00e1s",
- "B\u0254\u0301r",
- "K\u00fas",
- "G\u00eds",
- "Sh\u0289\u0301",
- "Nt\u0289\u0301"
-],
-"STANDALONEMONTH": [
- "Oladal\u0289\u0301",
- "Ar\u00e1t",
- "\u0186\u025bn\u0268\u0301\u0254\u0268\u014b\u0254k",
- "Olodoy\u00ed\u00f3r\u00ed\u00ea ink\u00f3k\u00fa\u00e2",
- "Oloil\u00e9p\u016bny\u012b\u0113 ink\u00f3k\u00fa\u00e2",
- "K\u00faj\u00fa\u0254r\u0254k",
- "M\u00f3rus\u00e1sin",
- "\u0186l\u0254\u0301\u0268\u0301b\u0254\u0301r\u00e1r\u025b",
- "K\u00fash\u00een",
- "Olg\u00edsan",
- "P\u0289sh\u0289\u0301ka",
- "Nt\u0289\u0301\u014b\u0289\u0301s"
-],
-"WEEKENDRANGE": [
- 5,
- 6
-],
-"fullDate": ", d y",
-"longDate": "d y",
-"medium": "d MMM y h:mm:ss a",
-"mediumDate": "d MMM y",
-"mediumTime": "h:mm:ss a",
-"short": "dd/MM/y h:mm a",
-"shortDate": "dd/MM/y",
-"shortTime": "h:mm a"
- },
- "NUMBER_FORMATS": {
-"CURRENCY_SYM": "Ksh",
-"DECIMAL_SEP": ".",
-"GROUP_SEP": ",",
-"PATTERNS": [
- {
-"gSize": 3,
-"lgSize": 3,
-"maxFrac": 3,
-"minFrac": 0,
-"minInt": 1,
-"negPre": "-",
-"negSuf": "",
-"posPre": "",
-"posSuf": ""
- },
- {
-"gSize": 3,
-"lgSize": 3,
-"maxFrac": 2,
-"minFrac": 2,
-"minInt": 1,
-"negPre": "-\u00a4",
-"negSuf": "",
-"posPre": "\u00a4",
-"posSuf": ""
- }
-]
- },
- "id": "mas",
- "localeID": "mas",
- "pluralCat": function(n, opt_precision) { var i = n | 0; var vf = getVF(n,
opt_precision); if (i == 1 && vf.v == 0) {return PLURAL_CATEGORY.ONE; }
return PLURAL_CATEGORY.OTHER;}
-});
-}]);
http://git-wip-us.apache.org/repos/asf/struts/blob/7a350b02/archetypes/struts2-archetype-angularjs/src/main/resources/archetype-resources/src/main/webapp/js/lib/angular/i18n/angular-locale_mer-ke.js
--
diff --git
a/archetypes/struts2-archetype-angularjs/src/main/resources/archetype-resources/src/main/webapp/js/lib/angular/i18n/angular-locale_mer-ke.js
b/archetypes/struts2-archetype-angularjs/src/main/resources/archetype-resources/src/main/webapp/js/lib/angular/i18n/angular-locale_mer-ke.js
[22/53] [partial] struts git commit: WW-4316 Moves archetypes into its own repo
http://git-wip-us.apache.org/repos/asf/struts/blob/7a350b02/archetypes/struts2-archetype-angularjs/src/main/resources/archetype-resources/src/main/webapp/js/lib/angular/i18n/angular-locale_fr-bi.js
--
diff --git
a/archetypes/struts2-archetype-angularjs/src/main/resources/archetype-resources/src/main/webapp/js/lib/angular/i18n/angular-locale_fr-bi.js
b/archetypes/struts2-archetype-angularjs/src/main/resources/archetype-resources/src/main/webapp/js/lib/angular/i18n/angular-locale_fr-bi.js
deleted file mode 100644
index 52bb8fc..000
---
a/archetypes/struts2-archetype-angularjs/src/main/resources/archetype-resources/src/main/webapp/js/lib/angular/i18n/angular-locale_fr-bi.js
+++ /dev/null
@@ -1,125 +0,0 @@
-'use strict';
-angular.module("ngLocale", [], ["$provide", function($provide) {
-var PLURAL_CATEGORY = {ZERO: "zero", ONE: "one", TWO: "two", FEW: "few", MANY:
"many", OTHER: "other"};
-$provide.value("$locale", {
- "DATETIME_FORMATS": {
-"AMPMS": [
- "AM",
- "PM"
-],
-"DAY": [
- "dimanche",
- "lundi",
- "mardi",
- "mercredi",
- "jeudi",
- "vendredi",
- "samedi"
-],
-"ERANAMES": [
- "avant J\u00e9sus-Christ",
- "apr\u00e8s J\u00e9sus-Christ"
-],
-"ERAS": [
- "av. J.-C.",
- "ap. J.-C."
-],
-"FIRSTDAYOFWEEK": 0,
-"MONTH": [
- "janvier",
- "f\u00e9vrier",
- "mars",
- "avril",
- "mai",
- "juin",
- "juillet",
- "ao\u00fbt",
- "septembre",
- "octobre",
- "novembre",
- "d\u00e9cembre"
-],
-"SHORTDAY": [
- "dim.",
- "lun.",
- "mar.",
- "mer.",
- "jeu.",
- "ven.",
- "sam."
-],
-"SHORTMONTH": [
- "janv.",
- "f\u00e9vr.",
- "mars",
- "avr.",
- "mai",
- "juin",
- "juil.",
- "ao\u00fbt",
- "sept.",
- "oct.",
- "nov.",
- "d\u00e9c."
-],
-"STANDALONEMONTH": [
- "Janvier",
- "F\u00e9vrier",
- "Mars",
- "Avril",
- "Mai",
- "Juin",
- "Juillet",
- "Ao\u00fbt",
- "Septembre",
- "Octobre",
- "Novembre",
- "D\u00e9cembre"
-],
-"WEEKENDRANGE": [
- 5,
- 6
-],
-"fullDate": " d y",
-"longDate": "d y",
-"medium": "d MMM y HH:mm:ss",
-"mediumDate": "d MMM y",
-"mediumTime": "HH:mm:ss",
-"short": "dd/MM/y HH:mm",
-"shortDate": "dd/MM/y",
-"shortTime": "HH:mm"
- },
- "NUMBER_FORMATS": {
-"CURRENCY_SYM": "FBu",
-"DECIMAL_SEP": ",",
-"GROUP_SEP": "\u00a0",
-"PATTERNS": [
- {
-"gSize": 3,
-"lgSize": 3,
-"maxFrac": 3,
-"minFrac": 0,
-"minInt": 1,
-"negPre": "-",
-"negSuf": "",
-"posPre": "",
-"posSuf": ""
- },
- {
-"gSize": 3,
-"lgSize": 3,
-"maxFrac": 2,
-"minFrac": 2,
-"minInt": 1,
-"negPre": "-",
-"negSuf": "\u00a0\u00a4",
-"posPre": "",
-"posSuf": "\u00a0\u00a4"
- }
-]
- },
- "id": "fr-bi",
- "localeID": "fr_BI",
- "pluralCat": function(n, opt_precision) { var i = n | 0; if (i == 0 || i
== 1) {return PLURAL_CATEGORY.ONE; } return PLURAL_CATEGORY.OTHER;}
-});
-}]);
http://git-wip-us.apache.org/repos/asf/struts/blob/7a350b02/archetypes/struts2-archetype-angularjs/src/main/resources/archetype-resources/src/main/webapp/js/lib/angular/i18n/angular-locale_fr-bj.js
--
diff --git
a/archetypes/struts2-archetype-angularjs/src/main/resources/archetype-resources/src/main/webapp/js/lib/angular/i18n/angular-locale_fr-bj.js
b/archetypes/struts2-archetype-angularjs/src/main/resources/archetype-resources/src/main/webapp/js/lib/angular/i18n/angular-locale_fr-bj.js
deleted file mode 100644
index 19ee686..000
---
a/archetypes/struts2-archetype-angularjs/src/main/resources/archetype-resources/src/main/webapp/js/lib/angular/i18n/angular-locale_fr-bj.js
+++ /dev/null
@@ -1,125 +0,0 @@
-'use strict';
-angular.module("ngLocale", [], ["$provide", function($provide) {
-var PLURAL_CATEGORY = {ZERO: "zero", ONE: "one", TWO: "two", FEW: "few", MANY:
"many", OTHER: "other"};
-$provide.value("$locale", {
- "DATETIME_FORMATS": {
-"AMPMS": [
- "AM",
- "PM"
-],
-"DAY": [
- "dimanche",
- "lundi",
- "mardi",
- "mercredi",
- "jeudi",
- "vendredi",
- "samedi"
-],
-"ERANAMES": [
- "avant J\u00e9sus-Christ",
- "apr\u00e8s J\u00e9sus-Christ"
-],
-"ERAS": [
- "av. J.-C.",
- "ap. J.-C."
-],
-"FIRSTDAYOFWEEK": 0,
-"MONTH": [
- "janvier",
- "f\u00e9vrier",
- "mars",
- "avril",
- "mai",
- "juin",
- "juillet",
- "ao\u00fbt",
- "septembre",
- "octobre",
- "novembre",
-
[36/53] [partial] struts git commit: WW-4316 Moves archetypes into its own repo
http://git-wip-us.apache.org/repos/asf/struts/blob/7a350b02/archetypes/struts2-archetype-angularjs/src/main/resources/archetype-resources/src/main/webapp/js/lib/angular/angular.min.js.map
--
diff --git
a/archetypes/struts2-archetype-angularjs/src/main/resources/archetype-resources/src/main/webapp/js/lib/angular/angular.min.js.map
b/archetypes/struts2-archetype-angularjs/src/main/resources/archetype-resources/src/main/webapp/js/lib/angular/angular.min.js.map
deleted file mode 100644
index 07fc1ce..000
---
a/archetypes/struts2-archetype-angularjs/src/main/resources/archetype-resources/src/main/webapp/js/lib/angular/angular.min.js.map
+++ /dev/null
@@ -1,8 +0,0 @@
-{
-"version":3,
-"file":"angular.min.js",
-"lineCount":306,
-"mappings":"A;aAKC,SAAQ,CAACA,CAAD,CAASC,CAAT,CAAmBC,CAAnB,CAA8B,CAgCvCC,Q,E,C,C,C,C,M,S,E,C,I,E,S,C,C,C,C,C,E,C,G,E,C,C,C,C,G,C,E,E,C,C,sC,E,C,C,C,C,G,C,E,E,C,K,C,C,C,C,C,C,S,O,C,C,E,C,C,C,C,C,E,C,E,C,C,G,C,G,E,G,E,C,C,C,E,G,K,E,kB,C,C,E,C,S,C,C,C,E,C,U,E,M,E,C,C,S,E,Q,C,a,C,E,C,C,W,E,M,E,C,W,C,Q,E,M,E,C,I,U,C,C,C,C,C,E,E,C,C,C,C,C,M,M,C,C,C,C,CAmNAC,QAASA,GAAW,CAACC,CAAD,CAAM,CAGxB,GAAW,IAAX,EAAIA,CAAJ,EAAmBC,EAAA,CAASD,CAAT,CAAnB,CAAkC,MAAO,C
AAA,CAMzC,IAAIE,CAAA,CAAQF,CAAR,CAAJ,EAAoBG,CAAA,CAASH,CAAT,CAApB,EAAsCI,CAAtC,EAAgDJ,CAAhD,WAA+DI,EAA/D,CAAwE,MAAO,CAAA,CAI/E;IAAIC,EAAS,QAATA,EAAqBC,OAAA,CAAON,CAAP,CAArBK,EAAoCL,CAAAK,OAIxC,OAAOE,EAAA,CAASF,CAAT,CAAP,GACa,CADb,EACGA,CADH,GACoBA,CADpB,CAC6B,CAD7B,GACmCL,EADnC,EAC0CA,CAD1C,WACyDQ,MADzD,GACsF,UADtF,EACmE,MAAOR,EAAAS,KAD1E,CAjBwB,CAyD1BC,QAASA,EAAO,CAACV,CAAD,CAAMW,CAAN,CAAgBC,CAAhB,CAAyB,CAAA,IACnCC,CADmC,CAC9BR,CACT,IAAIL,CAAJ,CACE,GAAIc,CAAA,CAAWd,CAAX,CAAJ,CACE,IAAKa,CAAL,GAAYb,EAAZ,CAGa,WAAX,EAAIa,CAAJ,EAAiC,QAAjC,EAA0BA,CAA1B,EAAoD,MAApD,EAA6CA,CAA7C,EAAgEb,CAAAe,eAAhE,EAAsF,CAAAf,CAAAe,eAAA,CAAmBF,CAAnB,CAAtF,EACEF,CAAAK,KAAA,CAAcJ,CAAd,CAAuBZ,CAAA,CAAIa,CAAJ,CAAvB,CAAiCA,CAAjC,CAAsCb,CAAtC,CALN,KAQO,IAAIE,CAAA,CAAQF,CAAR,CAAJ,EAAoBD,EAAA,CAAYC,CAAZ,CAApB,CAAsC,CAC3C,IAAIiB,EAA6B,QAA7BA,GAAc,MAAOjB,EACpBa,EAAA,CAAM,CAAX,KAAcR,CAAd,CAAuBL,CAAAK,OAAvB,CAAmCQ,CAAnC,CAAyCR,CAAzC,CAAiDQ,CAAA,EAAjD,CACE,CAAII,CAAJ,EAAmBJ,CAAnB,GAA0Bb,EAA1B,GACEW,CAAAK,KAAA,CAAcJ,CAA
d,CAAuBZ,CAAA,CAAIa,CAAJ,CAAvB,CAAiCA,CAAjC,CAAsCb,CAAtC,CAJuC,CAAtC,IAOA,IAAIA,CAAAU,QAAJ,EAAmBV,CAAAU,QAAnB,GAAmCA,CAAnC,CACHV,CAAAU,QAAA,CAAYC,CAAZ,CAAsBC,CAAtB,CAA+BZ,CAA/B,CADG,KAEA,IAAIkB,EAAA,CAAclB,CAAd,CAAJ,CAEL,IAAKa,CAAL,GAAYb,EAAZ,CACEW,CAAAK,KAAA,CAAcJ,CAAd,CAAuBZ,CAAA,CAAIa,CAAJ,CAAvB,CAAiCA,CAAjC,CAAsCb,CAAtC,CAHG,KAKA,IAAkC,UAAlC,GAAI,MAAOA,EAAAe,eAAX,CAEL,IAAKF,CAAL,GAAYb,EAAZ,CACMA,CAAAe,eAAA,CAAmBF,CAAnB,CAAJ;AACEF,CAAAK,KAAA,CAAcJ,CAAd,CAAuBZ,CAAA,CAAIa,CAAJ,CAAvB,CAAiCA,CAAjC,CAAsCb,CAAtC,CAJC,KASL,KAAKa,CAAL,GAAYb,EAAZ,CACMe,EAAAC,KAAA,CAAoBhB,CAApB,CAAyBa,CAAzB,CAAJ,EACEF,CAAAK,KAAA,CAAcJ,CAAd,CAAuBZ,CAAA,CAAIa,CAAJ,CAAvB,CAAiCA,CAAjC,CAAsCb,CAAtC,CAKR,OAAOA,EAzCgC,CA4CzCmB,QAASA,GAAa,CAACnB,CAAD,CAAMW,CAAN,CAAgBC,CAAhB,CAAyB,CAE7C,IADA,IAAIQ,EAAOd,MAAAc,KAAA,CAAYpB,CAAZ,CAAAqB,KAAA,EAAX,CACSC,EAAI,CAAb,CAAgBA,CAAhB,CAAoBF,CAAAf,OAApB,CAAiCiB,CAAA,EAAjC,CACEX,CAAAK,KAAA,CAAcJ,CAAd,CAAuBZ,CAAA,CAAIoB,CAAA,CAAKE,CAAL,CAAJ,CAAvB,CAAqCF,CAAA,CAAKE,CAAL,CAArC,CAEF,
OAAOF,EALsC,CAc/CG,QAASA,GAAa,CAACC,CAAD,CAAa,CACjC,MAAO,SAAQ,CAACC,CAAD,CAAQZ,CAAR,CAAa,CAACW,CAAA,CAAWX,CAAX,CAAgBY,CAAhB,CAAD,CADK,CAcnCC,QAASA,GAAO,EAAG,CACjB,MAAO,EAAEC,EADQ,CAmBnBC,QAASA,GAAU,CAACC,CAAD,CAAMC,CAAN,CAAYC,CAAZ,CAAkB,CAGnC,IAFA,IAAIC,EAAIH,CAAAI,UAAR,CAESX,EAAI,CAFb,CAEgBY,EAAKJ,CAAAzB,OAArB,CAAkCiB,CAAlC,CAAsCY,CAAtC,CAA0C,EAAEZ,CAA5C,CAA+C,CAC7C,IAAItB,EAAM8B,CAAA,CAAKR,CAAL,CACV,IAAKa,CAAA,CAASnC,CAAT,CAAL,EAAuBc,CAAA,CAAWd,CAAX,CAAvB,CAEA,IADA,IAAIoB,EAAOd,MAAAc,KAAA,CAAYpB,CAAZ,CAAX,CACSoC,EAAI,CADb,CACgBC,EAAKjB,CAAAf,OAArB,CAAkC+B,CAAlC,CAAsCC,CAAtC,CAA0CD,CAAA,EAA1C,CAA+C,CAC7C,IAAIvB,EAAMO,CAAA,CAAKgB,CAAL,CAAV,CACIE,EAAMtC,CAAA,CAAIa,CAAJ,CAENkB,EAAJ,EAAYI,CAAA,CAASG,CAAT,CAAZ,CACMC,CAAA,CAAOD,CAAP,CAAJ,CACET,CAAA,CAAIhB,CAAJ,CADF,CACa,IAAI2B,IAAJ,CAASF,CAAAG,QAAA,EAAT,CADb,CAEWC,EAAA,CAASJ,CAAT,CAAJ,CACLT,CAAA,CAAIhB,CAAJ,CADK,CACM,IAAI8B,MAAJ,CAAWL,CAAX,CADN,CAEIA,CAAAM,SAAJ,CACLf,CAAA,CAAIhB,CAAJ,CADK,CACMyB,CAAAO,UAAA,CAAc,CAAA,CAAd,CADN;AAEIC,EAAA,
CAAUR,CAAV,CAAJ,CACLT,CAAA,CAAIhB,CAAJ,CADK,CACMyB,CAAAS,MAAA,EADN,EAGAZ,CAAA,CAASN,CAAA,CAAIhB,CAAJ,CAAT,CACL,GADyBgB,CAAA,CAAIhB,CAAJ,CACzB,CADoCX,CAAA,CAAQoC,CAAR,CAAA,CAAe,EAAf,CAAoB,EACx
[34/53] [partial] struts git commit: WW-4316 Moves archetypes into its own repo
http://git-wip-us.apache.org/repos/asf/struts/blob/7a350b02/archetypes/struts2-archetype-angularjs/src/main/resources/archetype-resources/src/main/webapp/js/lib/angular/i18n/angular-locale_ar-eg.js
--
diff --git
a/archetypes/struts2-archetype-angularjs/src/main/resources/archetype-resources/src/main/webapp/js/lib/angular/i18n/angular-locale_ar-eg.js
b/archetypes/struts2-archetype-angularjs/src/main/resources/archetype-resources/src/main/webapp/js/lib/angular/i18n/angular-locale_ar-eg.js
deleted file mode 100644
index 07e7007..000
---
a/archetypes/struts2-archetype-angularjs/src/main/resources/archetype-resources/src/main/webapp/js/lib/angular/i18n/angular-locale_ar-eg.js
+++ /dev/null
@@ -1,125 +0,0 @@
-'use strict';
-angular.module("ngLocale", [], ["$provide", function($provide) {
-var PLURAL_CATEGORY = {ZERO: "zero", ONE: "one", TWO: "two", FEW: "few", MANY:
"many", OTHER: "other"};
-$provide.value("$locale", {
- "DATETIME_FORMATS": {
-"AMPMS": [
- "\u0635",
- "\u0645"
-],
-"DAY": [
- "\u0627\u0644\u0623\u062d\u062f",
- "\u0627\u0644\u0627\u062b\u0646\u064a\u0646",
- "\u0627\u0644\u062b\u0644\u0627\u062b\u0627\u0621",
- "\u0627\u0644\u0623\u0631\u0628\u0639\u0627\u0621",
- "\u0627\u0644\u062e\u0645\u064a\u0633",
- "\u0627\u0644\u062c\u0645\u0639\u0629",
- "\u0627\u0644\u0633\u0628\u062a"
-],
-"ERANAMES": [
- "\u0642\u0628\u0644 \u0627\u0644\u0645\u064a\u0644\u0627\u062f",
- "\u0645\u064a\u0644\u0627\u062f\u064a"
-],
-"ERAS": [
- "\u0642.\u0645",
- "\u0645"
-],
-"FIRSTDAYOFWEEK": 5,
-"MONTH": [
- "\u064a\u0646\u0627\u064a\u0631",
- "\u0641\u0628\u0631\u0627\u064a\u0631",
- "\u0645\u0627\u0631\u0633",
- "\u0623\u0628\u0631\u064a\u0644",
- "\u0645\u0627\u064a\u0648",
- "\u064a\u0648\u0646\u064a\u0648",
- "\u064a\u0648\u0644\u064a\u0648",
- "\u0623\u063a\u0633\u0637\u0633",
- "\u0633\u0628\u062a\u0645\u0628\u0631",
- "\u0623\u0643\u062a\u0648\u0628\u0631",
- "\u0646\u0648\u0641\u0645\u0628\u0631",
- "\u062f\u064a\u0633\u0645\u0628\u0631"
-],
-"SHORTDAY": [
- "\u0627\u0644\u0623\u062d\u062f",
- "\u0627\u0644\u0627\u062b\u0646\u064a\u0646",
- "\u0627\u0644\u062b\u0644\u0627\u062b\u0627\u0621",
- "\u0627\u0644\u0623\u0631\u0628\u0639\u0627\u0621",
- "\u0627\u0644\u062e\u0645\u064a\u0633",
- "\u0627\u0644\u062c\u0645\u0639\u0629",
- "\u0627\u0644\u0633\u0628\u062a"
-],
-"SHORTMONTH": [
- "\u064a\u0646\u0627\u064a\u0631",
- "\u0641\u0628\u0631\u0627\u064a\u0631",
- "\u0645\u0627\u0631\u0633",
- "\u0623\u0628\u0631\u064a\u0644",
- "\u0645\u0627\u064a\u0648",
- "\u064a\u0648\u0646\u064a\u0648",
- "\u064a\u0648\u0644\u064a\u0648",
- "\u0623\u063a\u0633\u0637\u0633",
- "\u0633\u0628\u062a\u0645\u0628\u0631",
- "\u0623\u0643\u062a\u0648\u0628\u0631",
- "\u0646\u0648\u0641\u0645\u0628\u0631",
- "\u062f\u064a\u0633\u0645\u0628\u0631"
-],
-"STANDALONEMONTH": [
- "\u064a\u0646\u0627\u064a\u0631",
- "\u0641\u0628\u0631\u0627\u064a\u0631",
- "\u0645\u0627\u0631\u0633",
- "\u0623\u0628\u0631\u064a\u0644",
- "\u0645\u0627\u064a\u0648",
- "\u064a\u0648\u0646\u064a\u0648",
- "\u064a\u0648\u0644\u064a\u0648",
- "\u0623\u063a\u0633\u0637\u0633",
- "\u0633\u0628\u062a\u0645\u0628\u0631",
- "\u0623\u0643\u062a\u0648\u0628\u0631",
- "\u0646\u0648\u0641\u0645\u0628\u0631",
- "\u062f\u064a\u0633\u0645\u0628\u0631"
-],
-"WEEKENDRANGE": [
- 4,
- 5
-],
-"fullDate": "\u060c d \u060c y",
-"longDate": "d \u060c y",
-"medium": "dd\u200f/MM\u200f/y h:mm:ss a",
-"mediumDate": "dd\u200f/MM\u200f/y",
-"mediumTime": "h:mm:ss a",
-"short": "d\u200f/M\u200f/y h:mm a",
-"shortDate": "d\u200f/M\u200f/y",
-"shortTime": "h:mm a"
- },
- "NUMBER_FORMATS": {
-"CURRENCY_SYM": "\u00a3",
-"DECIMAL_SEP": "\u066b",
-"GROUP_SEP": "\u066c",
-"PATTERNS": [
- {
-"gSize": 3,
-"lgSize": 3,
-"maxFrac": 3,
-"minFrac": 0,
-"minInt": 1,
-"negPre": "-",
-"negSuf": "",
-"posPre": "",
-"posSuf": ""
- },
- {
-"gSize": 3,
-"lgSize": 3,
-"maxFrac": 2,
-"minFrac": 2,
-"minInt": 1,
-"negPre": "-\u00a4\u00a0",
-"negSuf": "",
-"posPre": "\u00a4\u00a0",
-"posSuf": ""
- }
-]
- },
- "id": "ar-eg",
- "localeID": "ar_EG",
- "pluralCat": function(n, opt_precision) { if (n == 0) {return
PLURAL_CATEGORY.ZERO; } if (n == 1) {return PLURAL_CATEGORY.ONE; } if
(n == 2) {return PLURAL_CATEGORY.TWO; } if (n % 100 >= 3 && n % 100 <=
10) {return PLURAL_CATEGORY.FEW; } if (n % 100 >= 11 && n % 100 <= 99)
[23/53] [partial] struts git commit: WW-4316 Moves archetypes into its own repo
http://git-wip-us.apache.org/repos/asf/struts/blob/7a350b02/archetypes/struts2-archetype-angularjs/src/main/resources/archetype-resources/src/main/webapp/js/lib/angular/i18n/angular-locale_es.js
--
diff --git
a/archetypes/struts2-archetype-angularjs/src/main/resources/archetype-resources/src/main/webapp/js/lib/angular/i18n/angular-locale_es.js
b/archetypes/struts2-archetype-angularjs/src/main/resources/archetype-resources/src/main/webapp/js/lib/angular/i18n/angular-locale_es.js
deleted file mode 100644
index 07c4d2a..000
---
a/archetypes/struts2-archetype-angularjs/src/main/resources/archetype-resources/src/main/webapp/js/lib/angular/i18n/angular-locale_es.js
+++ /dev/null
@@ -1,125 +0,0 @@
-'use strict';
-angular.module("ngLocale", [], ["$provide", function($provide) {
-var PLURAL_CATEGORY = {ZERO: "zero", ONE: "one", TWO: "two", FEW: "few", MANY:
"many", OTHER: "other"};
-$provide.value("$locale", {
- "DATETIME_FORMATS": {
-"AMPMS": [
- "a. m.",
- "p. m."
-],
-"DAY": [
- "domingo",
- "lunes",
- "martes",
- "mi\u00e9rcoles",
- "jueves",
- "viernes",
- "s\u00e1bado"
-],
-"ERANAMES": [
- "antes de Cristo",
- "despu\u00e9s de Cristo"
-],
-"ERAS": [
- "a. C.",
- "d. C."
-],
-"FIRSTDAYOFWEEK": 0,
-"MONTH": [
- "enero",
- "febrero",
- "marzo",
- "abril",
- "mayo",
- "junio",
- "julio",
- "agosto",
- "septiembre",
- "octubre",
- "noviembre",
- "diciembre"
-],
-"SHORTDAY": [
- "dom.",
- "lun.",
- "mar.",
- "mi\u00e9.",
- "jue.",
- "vie.",
- "s\u00e1b."
-],
-"SHORTMONTH": [
- "ene.",
- "feb.",
- "mar.",
- "abr.",
- "may.",
- "jun.",
- "jul.",
- "ago.",
- "sept.",
- "oct.",
- "nov.",
- "dic."
-],
-"STANDALONEMONTH": [
- "Enero",
- "Febrero",
- "Marzo",
- "Abril",
- "Mayo",
- "Junio",
- "Julio",
- "Agosto",
- "Septiembre",
- "Octubre",
- "Noviembre",
- "Diciembre"
-],
-"WEEKENDRANGE": [
- 5,
- 6
-],
-"fullDate": ", d 'de' 'de' y",
-"longDate": "d 'de' 'de' y",
-"medium": "d MMM y H:mm:ss",
-"mediumDate": "d MMM y",
-"mediumTime": "H:mm:ss",
-"short": "d/M/yy H:mm",
-"shortDate": "d/M/yy",
-"shortTime": "H:mm"
- },
- "NUMBER_FORMATS": {
-"CURRENCY_SYM": "\u20ac",
-"DECIMAL_SEP": ",",
-"GROUP_SEP": ".",
-"PATTERNS": [
- {
-"gSize": 3,
-"lgSize": 3,
-"maxFrac": 3,
-"minFrac": 0,
-"minInt": 1,
-"negPre": "-",
-"negSuf": "",
-"posPre": "",
-"posSuf": ""
- },
- {
-"gSize": 3,
-"lgSize": 3,
-"maxFrac": 2,
-"minFrac": 2,
-"minInt": 1,
-"negPre": "-",
-"negSuf": "\u00a0\u00a4",
-"posPre": "",
-"posSuf": "\u00a0\u00a4"
- }
-]
- },
- "id": "es",
- "localeID": "es",
- "pluralCat": function(n, opt_precision) { if (n == 1) {return
PLURAL_CATEGORY.ONE; } return PLURAL_CATEGORY.OTHER;}
-});
-}]);
http://git-wip-us.apache.org/repos/asf/struts/blob/7a350b02/archetypes/struts2-archetype-angularjs/src/main/resources/archetype-resources/src/main/webapp/js/lib/angular/i18n/angular-locale_et-ee.js
--
diff --git
a/archetypes/struts2-archetype-angularjs/src/main/resources/archetype-resources/src/main/webapp/js/lib/angular/i18n/angular-locale_et-ee.js
b/archetypes/struts2-archetype-angularjs/src/main/resources/archetype-resources/src/main/webapp/js/lib/angular/i18n/angular-locale_et-ee.js
deleted file mode 100644
index d891b9d..000
---
a/archetypes/struts2-archetype-angularjs/src/main/resources/archetype-resources/src/main/webapp/js/lib/angular/i18n/angular-locale_et-ee.js
+++ /dev/null
@@ -1,143 +0,0 @@
-'use strict';
-angular.module("ngLocale", [], ["$provide", function($provide) {
-var PLURAL_CATEGORY = {ZERO: "zero", ONE: "one", TWO: "two", FEW: "few", MANY:
"many", OTHER: "other"};
-function getDecimals(n) {
- n = n + '';
- var i = n.indexOf('.');
- return (i == -1) ? 0 : n.length - i - 1;
-}
-
-function getVF(n, opt_precision) {
- var v = opt_precision;
-
- if (undefined === v) {
-v = Math.min(getDecimals(n), 3);
- }
-
- var base = Math.pow(10, v);
- var f = ((n * base) | 0) % base;
- return {v: v, f: f};
-}
-
-$provide.value("$locale", {
- "DATETIME_FORMATS": {
-"AMPMS": [
- "AM",
- "PM"
-],
-"DAY": [
- "p\u00fchap\u00e4ev",
- "esmasp\u00e4ev",
- "teisip\u00e4ev",
- "kolmap\u00e4ev",
- "neljap\u00e4ev",
- "reede",
- "laup\u00e4ev"
-],
-"ERANAMES": [
- "enne meie aega",
- "meie aja j\u00e4rgi"
-
[09/53] [partial] struts git commit: WW-4316 Moves archetypes into its own repo
http://git-wip-us.apache.org/repos/asf/struts/blob/7a350b02/archetypes/struts2-archetype-angularjs/src/main/resources/archetype-resources/src/main/webapp/js/lib/angular/i18n/angular-locale_ru-md.js
--
diff --git
a/archetypes/struts2-archetype-angularjs/src/main/resources/archetype-resources/src/main/webapp/js/lib/angular/i18n/angular-locale_ru-md.js
b/archetypes/struts2-archetype-angularjs/src/main/resources/archetype-resources/src/main/webapp/js/lib/angular/i18n/angular-locale_ru-md.js
deleted file mode 100644
index 7f1e9aa..000
---
a/archetypes/struts2-archetype-angularjs/src/main/resources/archetype-resources/src/main/webapp/js/lib/angular/i18n/angular-locale_ru-md.js
+++ /dev/null
@@ -1,143 +0,0 @@
-'use strict';
-angular.module("ngLocale", [], ["$provide", function($provide) {
-var PLURAL_CATEGORY = {ZERO: "zero", ONE: "one", TWO: "two", FEW: "few", MANY:
"many", OTHER: "other"};
-function getDecimals(n) {
- n = n + '';
- var i = n.indexOf('.');
- return (i == -1) ? 0 : n.length - i - 1;
-}
-
-function getVF(n, opt_precision) {
- var v = opt_precision;
-
- if (undefined === v) {
-v = Math.min(getDecimals(n), 3);
- }
-
- var base = Math.pow(10, v);
- var f = ((n * base) | 0) % base;
- return {v: v, f: f};
-}
-
-$provide.value("$locale", {
- "DATETIME_FORMATS": {
-"AMPMS": [
- "AM",
- "PM"
-],
-"DAY": [
- "\u0432\u043e\u0441\u043a\u0440\u0435\u0441\u0435\u043d\u044c\u0435",
- "\u043f\u043e\u043d\u0435\u0434\u0435\u043b\u044c\u043d\u0438\u043a",
- "\u0432\u0442\u043e\u0440\u043d\u0438\u043a",
- "\u0441\u0440\u0435\u0434\u0430",
- "\u0447\u0435\u0442\u0432\u0435\u0440\u0433",
- "\u043f\u044f\u0442\u043d\u0438\u0446\u0430",
- "\u0441\u0443\u0431\u0431\u043e\u0442\u0430"
-],
-"ERANAMES": [
- "\u0434\u043e \u043d. \u044d.",
- "\u043d. \u044d."
-],
-"ERAS": [
- "\u0434\u043e \u043d. \u044d.",
- "\u043d. \u044d."
-],
-"FIRSTDAYOFWEEK": 0,
-"MONTH": [
- "\u044f\u043d\u0432\u0430\u0440\u044f",
- "\u0444\u0435\u0432\u0440\u0430\u043b\u044f",
- "\u043c\u0430\u0440\u0442\u0430",
- "\u0430\u043f\u0440\u0435\u043b\u044f",
- "\u043c\u0430\u044f",
- "\u0438\u044e\u043d\u044f",
- "\u0438\u044e\u043b\u044f",
- "\u0430\u0432\u0433\u0443\u0441\u0442\u0430",
- "\u0441\u0435\u043d\u0442\u044f\u0431\u0440\u044f",
- "\u043e\u043a\u0442\u044f\u0431\u0440\u044f",
- "\u043d\u043e\u044f\u0431\u0440\u044f",
- "\u0434\u0435\u043a\u0430\u0431\u0440\u044f"
-],
-"SHORTDAY": [
- "\u0432\u0441",
- "\u043f\u043d",
- "\u0432\u0442",
- "\u0441\u0440",
- "\u0447\u0442",
- "\u043f\u0442",
- "\u0441\u0431"
-],
-"SHORTMONTH": [
- "\u044f\u043d\u0432.",
- "\u0444\u0435\u0432\u0440.",
- "\u043c\u0430\u0440\u0442\u0430",
- "\u0430\u043f\u0440.",
- "\u043c\u0430\u044f",
- "\u0438\u044e\u043d\u044f",
- "\u0438\u044e\u043b\u044f",
- "\u0430\u0432\u0433.",
- "\u0441\u0435\u043d\u0442.",
- "\u043e\u043a\u0442.",
- "\u043d\u043e\u044f\u0431.",
- "\u0434\u0435\u043a."
-],
-"STANDALONEMONTH": [
- "\u044f\u043d\u0432\u0430\u0440\u044c",
- "\u0444\u0435\u0432\u0440\u0430\u043b\u044c",
- "\u043c\u0430\u0440\u0442",
- "\u0430\u043f\u0440\u0435\u043b\u044c",
- "\u043c\u0430\u0439",
- "\u0438\u044e\u043d\u044c",
- "\u0438\u044e\u043b\u044c",
- "\u0430\u0432\u0433\u0443\u0441\u0442",
- "\u0441\u0435\u043d\u0442\u044f\u0431\u0440\u044c",
- "\u043e\u043a\u0442\u044f\u0431\u0440\u044c",
- "\u043d\u043e\u044f\u0431\u0440\u044c",
- "\u0434\u0435\u043a\u0430\u0431\u0440\u044c"
-],
-"WEEKENDRANGE": [
- 5,
- 6
-],
-"fullDate": ", d y '\u0433'.",
-"longDate": "d y '\u0433'.",
-"medium": "d MMM y '\u0433'. H:mm:ss",
-"mediumDate": "d MMM y '\u0433'.",
-"mediumTime": "H:mm:ss",
-"short": "dd.MM.yy H:mm",
-"shortDate": "dd.MM.yy",
-"shortTime": "H:mm"
- },
- "NUMBER_FORMATS": {
-"CURRENCY_SYM": "MDL",
-"DECIMAL_SEP": ",",
-"GROUP_SEP": "\u00a0",
-"PATTERNS": [
- {
-"gSize": 3,
-"lgSize": 3,
-"maxFrac": 3,
-"minFrac": 0,
-"minInt": 1,
-"negPre": "-",
-"negSuf": "",
-"posPre": "",
-"posSuf": ""
- },
- {
-"gSize": 3,
-"lgSize": 3,
-"maxFrac": 2,
-"minFrac": 2,
-"minInt": 1,
-"negPre": "-",
-"negSuf": "\u00a0\u00a4",
-"posPre": "",
-"posSuf": "\u00a0\u00a4"
- }
-]
- },
- "id": "ru-md",
- "localeID": "ru_MD",
- "pluralCat": function(n, opt_precision) { var i = n | 0; var vf = getVF(n,
opt_precision); if (vf.v == 0 && i % 10 == 1 && i % 100 != 11) {return
PLURAL_CATEGORY.ONE; } if (vf.v ==
[44/53] [partial] struts git commit: WW-4316 Moves archetypes into its own repo
http://git-wip-us.apache.org/repos/asf/struts/blob/7a350b02/archetypes/struts2-archetype-angularjs/src/main/resources/archetype-resources/src/main/webapp/js/lib/angular/angular-messages.js
--
diff --git
a/archetypes/struts2-archetype-angularjs/src/main/resources/archetype-resources/src/main/webapp/js/lib/angular/angular-messages.js
b/archetypes/struts2-archetype-angularjs/src/main/resources/archetype-resources/src/main/webapp/js/lib/angular/angular-messages.js
deleted file mode 100644
index 0d20623..000
---
a/archetypes/struts2-archetype-angularjs/src/main/resources/archetype-resources/src/main/webapp/js/lib/angular/angular-messages.js
+++ /dev/null
@@ -1,687 +0,0 @@
-/**
- * @license AngularJS v1.5.0
- * (c) 2010-2016 Google, Inc. http://angularjs.org
- * License: MIT
- */
-(function(window, angular, undefined) {'use strict';
-
-/* jshint ignore:start */
-// this code is in the core, but not in angular-messages.js
-var isArray = angular.isArray;
-var forEach = angular.forEach;
-var isString = angular.isString;
-var jqLite = angular.element;
-/* jshint ignore:end */
-
-/**
- * @ngdoc module
- * @name ngMessages
- * @description
- *
- * The `ngMessages` module provides enhanced support for displaying messages
within templates
- * (typically within forms or when rendering message objects that return
key/value data).
- * Instead of relying on JavaScript code and/or complex ng-if statements
within your form template to
- * show and hide error messages specific to the state of an input field, the
`ngMessages` and
- * `ngMessage` directives are designed to handle the complexity, inheritance
and priority
- * sequencing based on the order of how the messages are defined in the
template.
- *
- * Currently, the ngMessages module only contains the code for the
`ngMessages`, `ngMessagesInclude`
- * `ngMessage` and `ngMessageExp` directives.
- *
- * # Usage
- * The `ngMessages` directive listens on a key/value collection which is set
on the ngMessages attribute.
- * Since the {@link ngModel ngModel} directive exposes an `$error` object,
this error object can be
- * used with `ngMessages` to display control error messages in an easier way
than with just regular angular
- * template directives.
- *
- * ```html
- *
- *
- * Enter text:
- *
- *
- *
- * You did not enter a field
- *
- * Your email must be between 5 and 100 characters long
- *
- *
- *
- * ```
- *
- * Now whatever key/value entries are present within the provided object (in
this case `$error`) then
- * the ngMessages directive will render the inner first ngMessage directive
(depending if the key values
- * match the attribute value present on each ngMessage directive). In other
words, if your errors
- * object contains the following data:
- *
- * ```javascript
- *
- * myField.$error = { minlength : true, required : true };
- * ```
- *
- * Then the `required` message will be displayed first. When required is false
then the `minlength` message
- * will be displayed right after (since these messages are ordered this way in
the template HTML code).
- * The prioritization of each message is determined by what order they're
present in the DOM.
- * Therefore, instead of having custom JavaScript code determine the priority
of what errors are
- * present before others, the presentation of the errors are handled within
the template.
- *
- * By default, ngMessages will only display one error at a time. However, if
you wish to display all
- * messages then the `ng-messages-multiple` attribute flag can be used on the
element containing the
- * ngMessages directive to make this happen.
- *
- * ```html
- *
- * ...
- *
- *
- * ...
- * ```
- *
- * ## Reusing and Overriding Messages
- * In addition to prioritization, ngMessages also allows for including
messages from a remote or an inline
- * template. This allows for generic collection of messages to be reused
across multiple parts of an
- * application.
- *
- * ```html
- *
- * This field is required
- * This field is too short
- *
- *
- *
- *
- *
- * ```
- *
- * However, including generic messages may not be useful enough to match all
input fields, therefore,
- * `ngMessages` provides the ability to override messages defined in the
remote template by redefining
- * them within the directive container.
- *
- * ```html
- *
- *
- * This field is required
- * This field is too short
- *
- *
- *
- *
- * Email address
- *
- *
- *
- *
- *
- * You did not enter your email address
- *
- *
- * Your email address is invalid
- *
- *
- *
- *
- *
- * ```
- *
- * In the example HTML code above the message that is set on required will
override the corresponding
- * required message defined withi
[38/53] [partial] struts git commit: WW-4316 Moves archetypes into its own repo
http://git-wip-us.apache.org/repos/asf/struts/blob/7a350b02/archetypes/struts2-archetype-angularjs/src/main/resources/archetype-resources/src/main/webapp/js/lib/angular/angular.js
--
diff --git
a/archetypes/struts2-archetype-angularjs/src/main/resources/archetype-resources/src/main/webapp/js/lib/angular/angular.js
b/archetypes/struts2-archetype-angularjs/src/main/resources/archetype-resources/src/main/webapp/js/lib/angular/angular.js
deleted file mode 100644
index a8aad46..000
---
a/archetypes/struts2-archetype-angularjs/src/main/resources/archetype-resources/src/main/webapp/js/lib/angular/angular.js
+++ /dev/null
@@ -1,30428 +0,0 @@
-/**
- * @license AngularJS v1.5.0
- * (c) 2010-2016 Google, Inc. http://angularjs.org
- * License: MIT
- */
-(function(window, document, undefined) {'use strict';
-
-/**
- * @description
- *
- * This object provides a utility for producing rich Error messages within
- * Angular. It can be called as follows:
- *
- * var exampleMinErr = minErr('example');
- * throw exampleMinErr('one', 'This {0} is {1}', foo, bar);
- *
- * The above creates an instance of minErr in the example namespace. The
- * resulting error will have a namespaced error code of example.one. The
- * resulting error will replace {0} with the value of foo, and {1} with the
- * value of bar. The object is not restricted in the number of arguments it can
- * take.
- *
- * If fewer arguments are specified than necessary for interpolation, the extra
- * interpolation markers will be preserved in the final string.
- *
- * Since data will be parsed statically during a build step, some restrictions
- * are applied with respect to how minErr instances are created and called.
- * Instances should have names of the form namespaceMinErr for a minErr created
- * using minErr('namespace') . Error codes, namespaces and template strings
- * should all be static strings, not variables or general expressions.
- *
- * @param {string} module The namespace to use for the new minErr instance.
- * @param {function} ErrorConstructor Custom error constructor to be
instantiated when returning
- * error from returned function, for cases when a particular type of error
is useful.
- * @returns {function(code:string, template:string, ...templateArgs): Error}
minErr instance
- */
-
-function minErr(module, ErrorConstructor) {
- ErrorConstructor = ErrorConstructor || Error;
- return function() {
-var SKIP_INDEXES = 2;
-
-var templateArgs = arguments,
- code = templateArgs[0],
- message = '[' + (module ? module + ':' : '') + code + '] ',
- template = templateArgs[1],
- paramPrefix, i;
-
-message += template.replace(/\{\d+\}/g, function(match) {
- var index = +match.slice(1, -1),
-shiftedIndex = index + SKIP_INDEXES;
-
- if (shiftedIndex < templateArgs.length) {
-return toDebugString(templateArgs[shiftedIndex]);
- }
-
- return match;
-});
-
-message += '\nhttp://errors.angularjs.org/1.5.0/' +
- (module ? module + '/' : '') + code;
-
-for (i = SKIP_INDEXES, paramPrefix = '?'; i < templateArgs.length; i++,
paramPrefix = '&') {
- message += paramPrefix + 'p' + (i - SKIP_INDEXES) + '=' +
-encodeURIComponent(toDebugString(templateArgs[i]));
-}
-
-return new ErrorConstructor(message);
- };
-}
-
-/* We need to tell jshint what variables are being exported */
-/* global angular: true,
- msie: true,
- jqLite: true,
- jQuery: true,
- slice: true,
- splice: true,
- push: true,
- toString: true,
- ngMinErr: true,
- angularModule: true,
- uid: true,
- REGEX_STRING_REGEXP: true,
- VALIDITY_STATE_PROPERTY: true,
-
- lowercase: true,
- uppercase: true,
- manualLowercase: true,
- manualUppercase: true,
- nodeName_: true,
- isArrayLike: true,
- forEach: true,
- forEachSorted: true,
- reverseParams: true,
- nextUid: true,
- setHashKey: true,
- extend: true,
- toInt: true,
- inherit: true,
- merge: true,
- noop: true,
- identity: true,
- valueFn: true,
- isUndefined: true,
- isDefined: true,
- isObject: true,
- isBlankObject: true,
- isString: true,
- isNumber: true,
- isDate: true,
- isArray: true,
- isFunction: true,
- isRegExp: true,
- isWindow: true,
- isScope: true,
- isFile: true,
- isFormData: true,
- isBlob: true,
- isBoolean: true,
- isPromiseLike: true,
- trim: true,
- escapeForRegexp: true,
- isElement: true,
- makeMap: true,
- includes: true,
- arrayRemove: true,
- copy: true,
- shallowCopy: true,
- equals: true,
- csp: true,
- jq: true,
- concat: true,
- sliceArgs: true,
- bind: true,
- toJsonReplacer: true,
- toJson: true,
- fromJson: true,
- convertTimezoneToLocal: true,
- timezoneToOffset: true,
- startingTag: true,
- tryDecodeURIComponent: true,
- parseKeyValue: true,
- toKeyValue: true,
- encodeUriSegment: true,
- encodeUriQuery: true,
- angularInit: true,
- bootstrap: true,
- getTes
