Git Push Summary
Repository: struts Updated Branches: refs/heads/release/2.3.19 [deleted] f7f4915bd
[14/56] [abbrv] struts git commit: Upgrade AngularJS to latest stable AngularJS version 1.2.23
http://git-wip-us.apache.org/repos/asf/struts/blob/810711cc/archetypes/struts2-archetype-angularjs/src/main/resources/archetype-resources/src/main/webapp/js/lib/angular/angular-bootstrap-prettify.min.js
--
diff --git
a/archetypes/struts2-archetype-angularjs/src/main/resources/archetype-resources/src/main/webapp/js/lib/angular/angular-bootstrap-prettify.min.js
b/archetypes/struts2-archetype-angularjs/src/main/resources/archetype-resources/src/main/webapp/js/lib/angular/angular-bootstrap-prettify.min.js
deleted file mode 100644
index 061563f..000
---
a/archetypes/struts2-archetype-angularjs/src/main/resources/archetype-resources/src/main/webapp/js/lib/angular/angular-bootstrap-prettify.min.js
+++ /dev/null
@@ -1,41 +0,0 @@
-/*
- AngularJS v1.0.8
- (c) 2010-2012 Google, Inc. http://angularjs.org
- License: MIT
-*/
-(function(u,s,H){'use strict';function F(c){return
c.replace(/\/g,amp;).replace(/\/g,lt;).replace(/\/g,gt;).replace(//g,quot;)}function
A(c,e){var
b=s.element(pre+e+/pre);c.html();c.append(b.contents());return c}var
w={},x={value:{}},K={angular.js:http://code.angularjs.org/+s.version.full+/angular.min.js,angular-resource.js:http://code.angularjs.org/+s.version.full+/angular-resource.min.js,angular-sanitize.js:http://code.angularjs.org/+s.version.full+/angular-sanitize.min.js;,
-angular-cookies.js:http://code.angularjs.org/+s.version.full+/angular-cookies.min.js};w.jsFiddle=function(c,e,b){return{terminal:!0,link:function(n,a,o){function
d(a,b){return'input type=hidden name='+a+' value='+e(b)+''}var
p={html:,css:,js:};s.forEach(o.jsFiddle.split( ),function(a,b){var
d=a.split(.)[1];p[d]+=d==html?b==0?div
ng-app+(o.module?'='+o.module+'':)+\n+c(a,2):\n\n\n \!-- CACHE FILE:
+a+' --\\n script type=text/ng-template id='+a+'\n'+c(a,
-4)+ \/script\n:c(a)+\n});p.html+=/div\n;A(a,'form class=jsfiddle
method=post action=http://jsfiddle.net/api/post/library/pure/;
target=_blank'+d(title,AngularJS Example: )+d(css,'/style \!-- Ugly
Hack due to jsFiddle issue: http://goo.gl/BUfGZ --\ \nlink rel=stylesheet
href=http://twitter.github.com/bootstrap/assets/css/bootstrap.css;\n'+b.angular+(o.resource?b.resource:)+style\n+p.css)+d(html,p.html)+d(js,p.js)+'button
class=btn btn-primaryi class=icon-white icon-pencil/i Edit
Me/button/form')}}};
-w.code=function(){return{restrict:E,terminal:!0}};w.prettyprint=[reindentCode,function(c){return{restrict:C,terminal:!0,compile:function(e){e.html(u.prettyPrintOne(c(e.html()),H,!0))}}}];w.ngSetText=[getEmbeddedTemplate,function(c){return{restrict:CA,priority:10,compile:function(e,b){A(e,F(c(b.ngSetText)))}}}];w.ngHtmlWrap=[reindentCode,templateMerge,function(c,e){return{compile:function(b,c){var
a={head:,module:,body:b.text()};s.forEach((c.ngHtmlWrap||).split(
),function(b){if(b){var b=
-K[b]||b,d=b.split(/\./).pop();d==css?a.head+='link rel=stylesheet
href='+b+' type=text/css\n':d==js?a.head+='script
src='+b+'\/script\n':a.module='='+b+''}});A(b,F(e(!doctype
html\nhtml ng-app{{module}}\n head\n{{head:4}} /head\n
body\n{{body:4}}
/body\n/html,a)))}}}];w.ngSetHtml=[getEmbeddedTemplate,function(c){return{restrict:CA,priority:10,compile:function(e,b){A(e,c(b.ngSetHtml))}}}];w.ngEvalJavascript=[getEmbeddedTemplate,function(c){return{compile:function(e,
-b){var
n=c(b.ngEvalJavascript);try{u.execScript?u.execScript(n||''):u.eval(n)}catch(a){u.console?u.console.log(n,\n,a):u.alert(a)];w.ngEmbedApp=[$templateCache,$browser,$rootScope,$location,function(c,e,b,n){return{terminal:!0,link:function(a,o,d){var
a=[],p,u;a.push([$provide,function(a){a.value($templateCache,c);a.value($anchorScroll,s.noop);a.value($browser,e);a.provider($location,function(){this.$get=[$rootScope,function(a){b.$on($locationChangeSuccess,function(b,
-d,c){a.$broadcast($locationChangeSuccess,d,c)});return
n}];this.html5Mode=s.noop});a.decorator($timeout,[$rootScope,$delegate,function(a,b){return
s.extend(function(d,c){return
cc50?setTimeout(function(){a.$apply(d)},c):b.apply(this,arguments)},b)}]);a.decorator($rootScope,[$delegate,function(a){p=a;u=b.$watch(function(){p.$digest()});return
p}])}]);d.ngEmbedAppa.push(d.ngEmbedApp);o.bind(click,function(a){a.target.attributes.getNamedItem(ng-click)a.preventDefault()});o.bind($destroy,
-function(){u();p.$destroy()});s.bootstrap(o,a)}}}];x.reindentCode=function(){return
function(c,e){if(!c)return c;for(var b=c.split(/\r?\n/),n=
.substr(0,e||0),a;b.lengthb[0].match(/^\s*$/);)b.shift();for(;b.lengthb[b.length-1].match(/^\s*$/);)b.pop();var
o=999;for(a=0;ab.length;a++){var
d=b[0],p=d.match(/^\s*/)[0];if(p!==dp.lengtho)o=p.length}for(a=0;ab.length;a++)b[a]=n+b[a].substring(o);b.push();return
b.join(\n)}};x.templateMerge=[reindentCode,function(c){return function(e,
-b){return
e.replace(/\{\{(\w+)(?:\:(\d+))?\}\}/g,function(e,a,o){e=b[a];o(e=c(e,o));return
e==H?:e})}}];x.getEmbeddedTemplate=[reindentCode,function(c){return
[12/56] [abbrv] struts git commit: Upgrade AngularJS to latest stable AngularJS version 1.2.23
http://git-wip-us.apache.org/repos/asf/struts/blob/810711cc/archetypes/struts2-archetype-angularjs/src/main/resources/archetype-resources/src/main/webapp/js/lib/angular/angular-resource.js
--
diff --git
a/archetypes/struts2-archetype-angularjs/src/main/resources/archetype-resources/src/main/webapp/js/lib/angular/angular-resource.js
b/archetypes/struts2-archetype-angularjs/src/main/resources/archetype-resources/src/main/webapp/js/lib/angular/angular-resource.js
index f29b379..c14fa4e 100644
---
a/archetypes/struts2-archetype-angularjs/src/main/resources/archetype-resources/src/main/webapp/js/lib/angular/angular-resource.js
+++
b/archetypes/struts2-archetype-angularjs/src/main/resources/archetype-resources/src/main/webapp/js/lib/angular/angular-resource.js
@@ -1,20 +1,72 @@
/**
- * @license AngularJS v1.0.8
- * (c) 2010-2012 Google, Inc. http://angularjs.org
+ * @license AngularJS v1.2.23
+ * (c) 2010-2014 Google, Inc. http://angularjs.org
* License: MIT
*/
-(function(window, angular, undefined) {
-'use strict';
+(function(window, angular, undefined) {'use strict';
+
+var $resourceMinErr = angular.$$minErr('$resource');
+
+// Helper functions and regex to lookup a dotted path on an object
+// stopping at undefined/null. The path must be composed of ASCII
+// identifiers (just like $parse)
+var MEMBER_NAME_REGEX = /^(\.[a-zA-Z_$][0-9a-zA-Z_$]*)+$/;
+
+function isValidDottedPath(path) {
+ return (path != null path !== '' path !== 'hasOwnProperty'
+ MEMBER_NAME_REGEX.test('.' + path));
+}
+
+function lookupDottedPath(obj, path) {
+ if (!isValidDottedPath(path)) {
+throw $resourceMinErr('badmember', 'Dotted member path @{0} is
invalid.', path);
+ }
+ var keys = path.split('.');
+ for (var i = 0, ii = keys.length; i ii obj !== undefined; i++) {
+var key = keys[i];
+obj = (obj !== null) ? obj[key] : undefined;
+ }
+ return obj;
+}
/**
- * @ngdoc overview
+ * Create a shallow copy of an object and clear other fields from the
destination
+ */
+function shallowClearAndCopy(src, dst) {
+ dst = dst || {};
+
+ angular.forEach(dst, function(value, key){
+delete dst[key];
+ });
+
+ for (var key in src) {
+if (src.hasOwnProperty(key) !(key.charAt(0) === '$' key.charAt(1)
=== '$')) {
+ dst[key] = src[key];
+}
+ }
+
+ return dst;
+}
+
+/**
+ * @ngdoc module
* @name ngResource
* @description
+ *
+ * # ngResource
+ *
+ * The `ngResource` module provides interaction support with RESTful services
+ * via the $resource service.
+ *
+ *
+ * div doc-module-components=ngResource/div
+ *
+ * See {@link ngResource.$resource `$resource`} for usage.
*/
/**
- * @ngdoc object
- * @name ngResource.$resource
+ * @ngdoc service
+ * @name $resource
* @requires $http
*
* @description
@@ -24,24 +76,22 @@
* The returned resource object has action methods which provide high-level
behaviors without
* the need to interact with the low level {@link ng.$http $http} service.
*
- * # Installation
- * To use $resource make sure you have included the `angular-resource.js` that
comes in Angular
- * package. You can also find this file on Google CDN, bower as well as at
- * {@link http://code.angularjs.org/ code.angularjs.org}.
- *
- * Finally load the module in your application:
+ * Requires the {@link ngResource `ngResource`} module to be installed.
*
- *angular.module('app', ['ngResource']);
+ * @param {string} url A parametrized URL template with parameters prefixed by
`:` as in
+ * `/user/:username`. If you are using a URL with a port number (e.g.
+ * `http://example.com:8080/api`), it will be respected.
*
- * and you are ready to get started!
- *
- * @param {string} url A parameterized URL template with parameters prefixed
by `:` as in
- * `/user/:username`. If you are using a URL with a port number (e.g.
- * `http://example.com:8080/api`), you'll need to escape the colon character
before the port
- * number, like this: `$resource('http://example.com\\:8080/api')`.
+ * If you are using a url with a suffix, just add the suffix, like this:
+ * `$resource('http://example.com/resource.json')` or
`$resource('http://example.com/:id.json')`
+ * or even `$resource('http://example.com/resource/:resource_id.:format')`
+ * If the parameter before the suffix is empty, :resource_id in this case,
then the `/.` will be
+ * collapsed down to a single `.`. If you need this sequence to appear and
not collapse then you
+ * can escape it with `/\.`.
*
* @param {Object=} paramDefaults Default values for `url` parameters. These
can be overridden in
- * `actions` methods.
+ * `actions` methods. If any of the parameter value is a function, it will
be executed every time
+ * when a param value needs to be obtained for a request (unless the param
was overridden).
*
* Each key value in the parameter object is first bound to url template if
present and
[01/56] [abbrv] struts git commit: Upgrade AngularJS to latest stable AngularJS version 1.2.23
Repository: struts
Updated Branches:
refs/heads/develop 70af4b649 - e1025a207
refs/heads/master d2663cedd - aebdad9f6
http://git-wip-us.apache.org/repos/asf/struts/blob/810711cc/archetypes/struts2-archetype-angularjs/src/main/resources/archetype-resources/src/main/webapp/js/lib/angular/i18n/angular-locale_sv-fi.js
--
diff --git
a/archetypes/struts2-archetype-angularjs/src/main/resources/archetype-resources/src/main/webapp/js/lib/angular/i18n/angular-locale_sv-fi.js
b/archetypes/struts2-archetype-angularjs/src/main/resources/archetype-resources/src/main/webapp/js/lib/angular/i18n/angular-locale_sv-fi.js
index a5e51b6..cbf7195 100644
---
a/archetypes/struts2-archetype-angularjs/src/main/resources/archetype-resources/src/main/webapp/js/lib/angular/i18n/angular-locale_sv-fi.js
+++
b/archetypes/struts2-archetype-angularjs/src/main/resources/archetype-resources/src/main/webapp/js/lib/angular/i18n/angular-locale_sv-fi.js
@@ -1,57 +1,58 @@
+'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: {
- 0: fm,
- 1: em
-},
-DAY: {
- 0: söndag,
- 1: måndag,
- 2: tisdag,
- 3: onsdag,
- 4: torsdag,
- 5: fredag,
- 6: lördag
-},
-MONTH: {
- 0: januari,
- 1: februari,
- 2: mars,
- 3: april,
- 4: maj,
- 5: juni,
- 6: juli,
- 7: augusti,
- 8: september,
- 9: oktober,
- 10: november,
- 11: december
-},
-SHORTDAY: {
- 0: sön,
- 1: mån,
- 2: tis,
- 3: ons,
- 4: tors,
- 5: fre,
- 6: lör
-},
-SHORTMONTH: {
- 0: jan,
- 1: feb,
- 2: mar,
- 3: apr,
- 4: maj,
- 5: jun,
- 6: jul,
- 7: aug,
- 8: sep,
- 9: okt,
- 10: nov,
- 11: dec
-},
+AMPMS: [
+ fm,
+ em
+],
+DAY: [
+ s\u00f6ndag,
+ m\u00e5ndag,
+ tisdag,
+ onsdag,
+ torsdag,
+ fredag,
+ l\u00f6rdag
+],
+MONTH: [
+ januari,
+ februari,
+ mars,
+ april,
+ maj,
+ juni,
+ juli,
+ augusti,
+ september,
+ oktober,
+ november,
+ december
+],
+SHORTDAY: [
+ s\u00f6n,
+ m\u00e5n,
+ tis,
+ ons,
+ tors,
+ fre,
+ l\u00f6r
+],
+SHORTMONTH: [
+ jan,
+ feb,
+ mar,
+ apr,
+ maj,
+ jun,
+ jul,
+ aug,
+ sep,
+ okt,
+ nov,
+ dec
+],
fullDate: 'en' 'den' d:'e' y,
longDate: d y,
medium: d MMM y HH:mm:ss,
@@ -64,9 +65,9 @@ $provide.value($locale, {
NUMBER_FORMATS: {
CURRENCY_SYM: kr,
DECIMAL_SEP: ,,
-GROUP_SEP: Â ,
-PATTERNS: {
- 0: {
+GROUP_SEP: \u00a0,
+PATTERNS: [
+ {
gSize: 3,
lgSize: 3,
macFrac: 0,
@@ -78,7 +79,7 @@ $provide.value($locale, {
posPre: ,
posSuf:
},
- 1: {
+ {
gSize: 3,
lgSize: 3,
macFrac: 0,
@@ -86,11 +87,11 @@ $provide.value($locale, {
minFrac: 2,
minInt: 1,
negPre: -,
-negSuf: Â \u00A4,
+negSuf: \u00a0\u00a4,
posPre: ,
-posSuf: Â \u00A4
+posSuf: \u00a0\u00a4
}
-}
+]
},
id: sv-fi,
pluralCat: function (n) { if (n == 1) { return PLURAL_CATEGORY.ONE; }
return PLURAL_CATEGORY.OTHER;}
http://git-wip-us.apache.org/repos/asf/struts/blob/810711cc/archetypes/struts2-archetype-angularjs/src/main/resources/archetype-resources/src/main/webapp/js/lib/angular/i18n/angular-locale_sv-se.js
--
diff --git
a/archetypes/struts2-archetype-angularjs/src/main/resources/archetype-resources/src/main/webapp/js/lib/angular/i18n/angular-locale_sv-se.js
b/archetypes/struts2-archetype-angularjs/src/main/resources/archetype-resources/src/main/webapp/js/lib/angular/i18n/angular-locale_sv-se.js
index 79f671c..4590ed9 100644
---
a/archetypes/struts2-archetype-angularjs/src/main/resources/archetype-resources/src/main/webapp/js/lib/angular/i18n/angular-locale_sv-se.js
+++
b/archetypes/struts2-archetype-angularjs/src/main/resources/archetype-resources/src/main/webapp/js/lib/angular/i18n/angular-locale_sv-se.js
@@ -1,3 +1,4 @@
+'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, {
http://git-wip-us.apache.org/repos/asf/struts/blob/810711cc/archetypes/struts2-archetype-angularjs/src/main/resources/archetype-resources/src/main/webapp/js/lib/angular/i18n/angular-locale_sv.js
[02/56] [abbrv] struts git commit: Upgrade AngularJS to latest stable AngularJS version 1.2.23
http://git-wip-us.apache.org/repos/asf/struts/blob/810711cc/archetypes/struts2-archetype-angularjs/src/main/resources/archetype-resources/src/main/webapp/js/lib/angular/i18n/angular-locale_nl-nl.js
--
diff --git
a/archetypes/struts2-archetype-angularjs/src/main/resources/archetype-resources/src/main/webapp/js/lib/angular/i18n/angular-locale_nl-nl.js
b/archetypes/struts2-archetype-angularjs/src/main/resources/archetype-resources/src/main/webapp/js/lib/angular/i18n/angular-locale_nl-nl.js
index f24c149..3a3e932 100644
---
a/archetypes/struts2-archetype-angularjs/src/main/resources/archetype-resources/src/main/webapp/js/lib/angular/i18n/angular-locale_nl-nl.js
+++
b/archetypes/struts2-archetype-angularjs/src/main/resources/archetype-resources/src/main/webapp/js/lib/angular/i18n/angular-locale_nl-nl.js
@@ -1,3 +1,4 @@
+'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, {
http://git-wip-us.apache.org/repos/asf/struts/blob/810711cc/archetypes/struts2-archetype-angularjs/src/main/resources/archetype-resources/src/main/webapp/js/lib/angular/i18n/angular-locale_nl-sx.js
--
diff --git
a/archetypes/struts2-archetype-angularjs/src/main/resources/archetype-resources/src/main/webapp/js/lib/angular/i18n/angular-locale_nl-sx.js
b/archetypes/struts2-archetype-angularjs/src/main/resources/archetype-resources/src/main/webapp/js/lib/angular/i18n/angular-locale_nl-sx.js
index 616653c..a4eda9c 100644
---
a/archetypes/struts2-archetype-angularjs/src/main/resources/archetype-resources/src/main/webapp/js/lib/angular/i18n/angular-locale_nl-sx.js
+++
b/archetypes/struts2-archetype-angularjs/src/main/resources/archetype-resources/src/main/webapp/js/lib/angular/i18n/angular-locale_nl-sx.js
@@ -1,3 +1,4 @@
+'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, {
http://git-wip-us.apache.org/repos/asf/struts/blob/810711cc/archetypes/struts2-archetype-angularjs/src/main/resources/archetype-resources/src/main/webapp/js/lib/angular/i18n/angular-locale_nl.js
--
diff --git
a/archetypes/struts2-archetype-angularjs/src/main/resources/archetype-resources/src/main/webapp/js/lib/angular/i18n/angular-locale_nl.js
b/archetypes/struts2-archetype-angularjs/src/main/resources/archetype-resources/src/main/webapp/js/lib/angular/i18n/angular-locale_nl.js
index e5cbbd1..955948c 100644
---
a/archetypes/struts2-archetype-angularjs/src/main/resources/archetype-resources/src/main/webapp/js/lib/angular/i18n/angular-locale_nl.js
+++
b/archetypes/struts2-archetype-angularjs/src/main/resources/archetype-resources/src/main/webapp/js/lib/angular/i18n/angular-locale_nl.js
@@ -1,3 +1,4 @@
+'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, {
http://git-wip-us.apache.org/repos/asf/struts/blob/810711cc/archetypes/struts2-archetype-angularjs/src/main/resources/archetype-resources/src/main/webapp/js/lib/angular/i18n/angular-locale_no.js
--
diff --git
a/archetypes/struts2-archetype-angularjs/src/main/resources/archetype-resources/src/main/webapp/js/lib/angular/i18n/angular-locale_no.js
b/archetypes/struts2-archetype-angularjs/src/main/resources/archetype-resources/src/main/webapp/js/lib/angular/i18n/angular-locale_no.js
index 07e3a79..313e260 100644
---
a/archetypes/struts2-archetype-angularjs/src/main/resources/archetype-resources/src/main/webapp/js/lib/angular/i18n/angular-locale_no.js
+++
b/archetypes/struts2-archetype-angularjs/src/main/resources/archetype-resources/src/main/webapp/js/lib/angular/i18n/angular-locale_no.js
@@ -1,3 +1,4 @@
+'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, {
http://git-wip-us.apache.org/repos/asf/struts/blob/810711cc/archetypes/struts2-archetype-angularjs/src/main/resources/archetype-resources/src/main/webapp/js/lib/angular/i18n/angular-locale_or-in.js
--
diff --git
a/archetypes/struts2-archetype-angularjs/src/main/resources/archetype-resources/src/main/webapp/js/lib/angular/i18n/angular-locale_or-in.js
b/archetypes/struts2-archetype-angularjs/src/main/resources/archetype-resources/src/main/webapp/js/lib/angular/i18n/angular-locale_or-in.js
index 6332a2f..acf991a 100644
---
[09/56] [abbrv] struts git commit: Upgrade AngularJS to latest stable AngularJS version 1.2.23
http://git-wip-us.apache.org/repos/asf/struts/blob/810711cc/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
new file mode 100644
index 000..60fdcef
--- /dev/null
+++
b/archetypes/struts2-archetype-angularjs/src/main/resources/archetype-resources/src/main/webapp/js/lib/angular/angular-touch.js
@@ -0,0 +1,584 @@
+/**
+ * @license AngularJS v1.2.23
+ * (c) 2010-2014 Google, Inc. http://angularjs.org
+ * License: MIT
+ */
+(function(window, angular, undefined) {'use strict';
+
+/**
+ * @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.
+ *
+ * div doc-module-components=ngTouch/div
+ *
+ */
+
+// define ngTouch module
+/* global -ngTouch */
+var ngTouch = angular.module('ngTouch', []);
+
+/* 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 `ngSwipeLeft` and `ngSwipeRight` directives in
`ngTouch`, and by
+ * `ngCarousel` in a separate component.
+ *
+ * # Usage
+ * The `$swipe` service is an object with a single method: `bind`. `bind`
takes an element
+ * which is to be watched for swipes, and an object with four handler
functions. See the
+ * documentation for `bind` below.
+ */
+
+ngTouch.factory('$swipe', [function() {
+ // The total distance in any direction before we make the call on swipe vs.
scroll.
+ var MOVE_BUFFER_RADIUS = 10;
+
+ function getCoordinates(event) {
+var touches = event.touches event.touches.length ? event.touches :
[event];
+var e = (event.changedTouches event.changedTouches[0]) ||
+(event.originalEvent event.originalEvent.changedTouches
+event.originalEvent.changedTouches[0]) ||
+touches[0].originalEvent || touches[0];
+
+return {
+ x: e.clientX,
+ y: e.clientY
+};
+ }
+
+ return {
+/**
+ * @ngdoc method
+ * @name $swipe#bind
+ *
+ * @description
+ * The main method of `$swipe`. It takes an element to be watched for
swipe motions, and an
+ * object containing event handlers.
+ *
+ * The four events are `start`, `move`, `end`, and `cancel`. `start`,
`move`, and `end`
+ * receive as a parameter a coordinates object of the form `{ x: 150, y:
310 }`.
+ *
+ * `start` is called on either `mousedown` or `touchstart`. After this
event, `$swipe` is
+ * watching for `touchmove` or `mousemove` events. These events are
ignored until the total
+ * distance moved in either dimension exceeds a small threshold.
+ *
+ * Once this threshold is exceeded, either the horizontal or vertical
delta is greater.
+ * - If the horizontal distance is greater, this is a swipe and `move` and
`end` events follow.
+ * - If the vertical distance is greater, this is a scroll, and we let the
browser take over.
+ * A `cancel` event is sent.
+ *
+ * `move` is called on `mousemove` and `touchmove` after the above logic
has determined that
+ * a swipe is in progress.
+ *
+ * `end` is called when a swipe is successfully completed with a
`touchend` or `mouseup`.
+ *
+ * `cancel` is called either on a `touchcancel` from the browser, or when
we begin scrolling
+ * as described above.
+ *
+ */
+bind: function(element, eventHandlers) {
+ // Absolute total movement, used to control swipe vs. scroll.
+ var totalX, totalY;
+ // Coordinates of the start position.
+ var startCoords;
+ // Last event's position.
+ var lastPos;
+ // Whether a swipe is active.
+ var active = false;
+
+ element.on('touchstart mousedown', function(event) {
+startCoords = getCoordinates(event);
+active = true;
+totalX = 0;
+totalY = 0;
+lastPos = startCoords;
+eventHandlers['start'] eventHandlers['start'](startCoords, event);
+ });
+
+ element.on('touchcancel', function(event) {
+active = false;
+eventHandlers['cancel'] eventHandlers['cancel'](event);
+
[10/56] [abbrv] struts git commit: Upgrade AngularJS to latest stable AngularJS version 1.2.23
http://git-wip-us.apache.org/repos/asf/struts/blob/810711cc/archetypes/struts2-archetype-angularjs/src/main/resources/archetype-resources/src/main/webapp/js/lib/angular/angular-scenario.js
--
diff --git
a/archetypes/struts2-archetype-angularjs/src/main/resources/archetype-resources/src/main/webapp/js/lib/angular/angular-scenario.js
b/archetypes/struts2-archetype-angularjs/src/main/resources/archetype-resources/src/main/webapp/js/lib/angular/angular-scenario.js
index 577093f..6d2e023 100644
---
a/archetypes/struts2-archetype-angularjs/src/main/resources/archetype-resources/src/main/webapp/js/lib/angular/angular-scenario.js
+++
b/archetypes/struts2-archetype-angularjs/src/main/resources/archetype-resources/src/main/webapp/js/lib/angular/angular-scenario.js
@@ -1,32 +1,39 @@
/*!
- * jQuery JavaScript Library v1.7.2
+ * jQuery JavaScript Library v1.10.2
* http://jquery.com/
*
- * Copyright 2011, John Resig
- * Dual licensed under the MIT or GPL Version 2 licenses.
- * http://jquery.org/license
- *
* Includes Sizzle.js
* http://sizzlejs.com/
- * Copyright 2011, The Dojo Foundation
- * Released under the MIT, BSD, and GPL Licenses.
*
- * Date: Wed Mar 21 12:46:34 2012 -0700
+ * Copyright 2005, 2013 jQuery Foundation, Inc. and other contributors
+ * Released under the MIT license
+ * http://jquery.org/license
+ *
+ * Date: 2013-07-03T13:48Z
*/
-(function( window, undefined ) {
-'use strict';
+(function( window, undefined ) {'use strict';
-// Use the correct document accordingly with window argument (sandbox)
-var document = window.document,
- navigator = window.navigator,
- location = window.location;
-var jQuery = (function() {
+// Can't do this because several apps including ASP.NET trace
+// the stack via arguments.caller.callee and Firefox dies if
+// you try to trace through use strict call chains. (#13335)
+// Support: Firefox 18+
+//
-// Define a local copy of jQuery
-var jQuery = function( selector, context ) {
- // The jQuery object is actually just the init constructor
'enhanced'
- return new jQuery.fn.init( selector, context, rootjQuery );
- },
+var
+ // The deferred used on DOM ready
+ readyList,
+
+ // A central reference to the root jQuery(document)
+ rootjQuery,
+
+ // Support: IE10
+ // For `typeof xmlNode.method` instead of `xmlNode.method !== undefined`
+ core_strundefined = typeof undefined,
+
+ // Use the correct document accordingly with window argument (sandbox)
+ location = window.location,
+ document = window.document,
+ docElem = document.documentElement,
// Map over jQuery in case of overwrite
_jQuery = window.jQuery,
@@ -34,133 +41,136 @@ var jQuery = function( selector, context ) {
// Map over the $ in case of overwrite
_$ = window.$,
- // A central reference to the root jQuery(document)
- rootjQuery,
+ // [[Class]] - type pairs
+ class2type = {},
- // A simple way to check for HTML strings or ID strings
- // Prioritize #id over tag to avoid XSS via location.hash (#9521)
- quickExpr = /^(?:[^#]*([\w\W]+)[^]*$|#([\w\-]*)$)/,
+ // List of deleted data cache ids, so we can reuse them
+ core_deletedIds = [],
+
+ core_version = 1.10.2,
+
+ // Save a reference to some core methods
+ core_concat = core_deletedIds.concat,
+ core_push = core_deletedIds.push,
+ core_slice = core_deletedIds.slice,
+ core_indexOf = core_deletedIds.indexOf,
+ core_toString = class2type.toString,
+ core_hasOwn = class2type.hasOwnProperty,
+ core_trim = core_version.trim,
+
+ // Define a local copy of jQuery
+ jQuery = function( selector, context ) {
+ // The jQuery object is actually just the init constructor
'enhanced'
+ return new jQuery.fn.init( selector, context, rootjQuery );
+ },
+
+ // Used for matching numbers
+ core_pnum = /[+-]?(?:\d*\.|)\d+(?:[eE][+-]?\d+|)/.source,
+
+ // Used for splitting on whitespace
+ core_rnotwhite = /\S+/g,
- // Check if a string has a non-whitespace character in it
- rnotwhite = /\S/,
+ // Make sure we trim BOM and NBSP (here's looking at you, Safari 5.0
and IE)
+ rtrim = /^[\s\uFEFF\xA0]+|[\s\uFEFF\xA0]+$/g,
- // Used for trimming whitespace
- trimLeft = /^\s+/,
- trimRight = /\s+$/,
+ // A simple way to check for HTML strings
+ // Prioritize #id over tag to avoid XSS via location.hash (#9521)
+ // Strict HTML recognition (#11290: must start with )
+ rquickExpr = /^(?:\s*([\w\W]+)[^]*|#([\w-]*))$/,
// Match a standalone tag
- rsingleTag = /^(\w+)\s*\/?(?:\/\1)?$/,
+ rsingleTag = /^(\w+)\s*\/?(?:\/\1|)$/,
// JSON RegExp
rvalidchars = /^[\],:{}\s]*$/,
-
[08/56] [abbrv] struts git commit: Upgrade AngularJS to latest stable AngularJS version 1.2.23
http://git-wip-us.apache.org/repos/asf/struts/blob/810711cc/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
index 719bc64..59f7a96 100644
---
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
@@ -1,29 +1,208 @@
/**
- * @license AngularJS v1.0.8
- * (c) 2010-2012 Google, Inc. http://angularjs.org
+ * @license AngularJS v1.2.23
+ * (c) 2010-2014 Google, Inc. http://angularjs.org
* License: MIT
*/
-(function(window, document, undefined) {
-'use strict';
+(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.
+ * @returns {function(code:string, template:string, ...templateArgs): Error}
minErr instance
+ */
+
+function minErr(module) {
+ return function () {
+var code = arguments[0],
+ prefix = '[' + (module ? module + ':' : '') + code + '] ',
+ template = arguments[1],
+ templateArgs = arguments,
+ stringify = function (obj) {
+if (typeof obj === 'function') {
+ return obj.toString().replace(/ \{[\s\S]*$/, '');
+} else if (typeof obj === 'undefined') {
+ return 'undefined';
+} else if (typeof obj !== 'string') {
+ return JSON.stringify(obj);
+}
+return obj;
+ },
+ message, i;
+
+message = prefix + template.replace(/\{\d+\}/g, function (match) {
+ var index = +match.slice(1, -1), arg;
+
+ if (index + 2 templateArgs.length) {
+arg = templateArgs[index + 2];
+if (typeof arg === 'function') {
+ return arg.toString().replace(/ ?\{[\s\S]*$/, '');
+} else if (typeof arg === 'undefined') {
+ return 'undefined';
+} else if (typeof arg !== 'string') {
+ return toJson(arg);
+}
+return arg;
+ }
+ return match;
+});
+
+message = message + '\nhttp://errors.angularjs.org/1.2.23/' +
+ (module ? module + '/' : '') + code;
+for (i = 2; i arguments.length; i++) {
+ message = message + (i == 2 ? '?' : '') + 'p' + (i-2) + '=' +
+encodeURIComponent(stringify(arguments[i]));
+}
+
+return new Error(message);
+ };
+}
+
+/* We need to tell jshint what variables are being exported */
+/* global angular: true,
+msie: true,
+jqLite: true,
+jQuery: true,
+slice: true,
+push: true,
+toString: true,
+ngMinErr: true,
+angularModule: true,
+nodeName_: true,
+uid: true,
+VALIDITY_STATE_PROPERTY: true,
+
+lowercase: true,
+uppercase: true,
+manualLowercase: true,
+manualUppercase: true,
+nodeName_: true,
+isArrayLike: true,
+forEach: true,
+sortedKeys: true,
+forEachSorted: true,
+reverseParams: true,
+nextUid: true,
+setHashKey: true,
+extend: true,
+int: true,
+inherit: true,
+noop: true,
+identity: true,
+valueFn: true,
+isUndefined: true,
+isDefined: true,
+isObject: true,
+isString: true,
+isNumber: true,
+isDate: true,
+isArray: true,
+isFunction: true,
+isRegExp: true,
+isWindow: true,
+isScope: true,
+isFile: true,
+isBlob: true,
+isBoolean: true,
+isPromiseLike: true,
+trim: true,
+isElement: true,
+makeMap: true,
+map: true,
+size: true,
[11/56] [abbrv] struts git commit: Upgrade AngularJS to latest stable AngularJS version 1.2.23
http://git-wip-us.apache.org/repos/asf/struts/blob/810711cc/archetypes/struts2-archetype-angularjs/src/main/resources/archetype-resources/src/main/webapp/js/lib/angular/angular-route.min.js.map
--
diff --git
a/archetypes/struts2-archetype-angularjs/src/main/resources/archetype-resources/src/main/webapp/js/lib/angular/angular-route.min.js.map
b/archetypes/struts2-archetype-angularjs/src/main/resources/archetype-resources/src/main/webapp/js/lib/angular/angular-route.min.js.map
new file mode 100644
index 000..2645c87
--- /dev/null
+++
b/archetypes/struts2-archetype-angularjs/src/main/resources/archetype-resources/src/main/webapp/js/lib/angular/angular-route.min.js.map
@@ -0,0 +1,8 @@
+{
+version:3,
+file:angular-route.min.js,
+lineCount:13,
+mappings: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
[05/56] [abbrv] struts git commit: Upgrade AngularJS to latest stable AngularJS version 1.2.23
http://git-wip-us.apache.org/repos/asf/struts/blob/810711cc/archetypes/struts2-archetype-angularjs/src/main/resources/archetype-resources/src/main/webapp/js/lib/angular/errors.json
--
diff --git
a/archetypes/struts2-archetype-angularjs/src/main/resources/archetype-resources/src/main/webapp/js/lib/angular/errors.json
b/archetypes/struts2-archetype-angularjs/src/main/resources/archetype-resources/src/main/webapp/js/lib/angular/errors.json
new file mode 100644
index 000..52c3ce0
--- /dev/null
+++
b/archetypes/struts2-archetype-angularjs/src/main/resources/archetype-resources/src/main/webapp/js/lib/angular/errors.json
@@ -0,0 +1 @@
+{id:ng,generated:Fri Aug 22 2014 16:58:16 GMT-0700
(PDT),errors:{$cacheFactory:{iid:CacheId '{0}' is already
taken!},ngModel:{nonassign:Expression '{0}' is non-assignable. Element:
{1}},$sce:{iequirks:Strict Contextual Escaping does not support Internet
Explorer version 9 in quirks mode. You can fix this by adding the text
!doctype html to the top of your HTML document. See
http://docs.angularjs.org/api/ng.$sce for more
information.,insecurl:Blocked loading resource from url not allowed by
$sceDelegate policy. URL: {0},icontext:Attempted to trust a value in
invalid context. Context: {0}; Value: {1},imatcher:Matchers may only be
\self\, string patterns or RegExp objects,iwcard:Illegal sequence *** in
string matcher. String: {0},itype:Attempted to trust a non-string value in
a content requiring a string: Context: {0},unsafe:Attempting to use an
unsafe value in a safe context.},$controller:{noscp:Cannot export
controlle
r '{0}' as '{1}'! No $scope object provided via
`locals`.},$compile:{nodomevents:Interpolations for HTML DOM event
attributes are disallowed. Please use the ng- versions (such as ng-click
instead of onclick) instead.,multidir:Multiple directives [{0}, {1}] asking
for {2} on: {3},nonassign:Expression '{0}' used with directive '{1}' is
non-assignable!,tplrt:Template for directive '{0}' must have exactly one
root element. {1},selmulti:Binding to the 'multiple' attribute is not
supported. Element: {0},tpload:Failed to load template:
{0},iscp:Invalid isolate scope definition for directive '{0}'. Definition:
{... {1}: '{2}' ...},ctreq:Controller '{0}', required by directive '{1}',
can't be found!,uterdir:Unterminated attribute, found '{0}' but no matching
'{1}' found.},$injector:{modulerr:Failed to instantiate module {0} due
to:\n{1},unpr:Unknown provider: {0},itkn:Incorrect injection token!
Expected service name as string, got {0},cd
ep:Circular dependency found: {0},nomod:Module '{0}' is not available!
You either misspelled the module name or forgot to load it. If registering a
module ensure that you specify the dependencies as the second
argument.,pget:Provider '{0}' must define $get factory
method.},$rootScope:{inprog:{0} already in progress,infdig:{0}
$digest() iterations reached. Aborting!\nWatchers fired in the last 5
iterations: {1}},ngPattern:{noregexp:Expected {0} to be a RegExp but was
{1}. Element: {2}},$interpolate:{noconcat:Error while interpolating:
{0}\nStrict Contextual Escaping disallows interpolations that concatenate
multiple expressions when a trusted value is required. See
http://docs.angularjs.org/api/ng.$sce,interr:Can't interpolate:
{0}\n{1}},jqLite:{offargs:jqLite#off() does not support the `selector`
argument,onargs:jqLite#on() does not support the `selector` or `eventData`
parameters,nosel:Looking up elements via selectors is not suppo
rted by jqLite! See:
http://docs.angularjs.org/api/angular.element},ngOptions:{iexp:Expected
expression in form of '_select_ (as _label_)? for (_key_,)?_value_ in
_collection_' but got '{0}'. Element: {1}},ngRepeat:{iidexp:'_item_' in
'_item_ in _collection_' should be an identifier or '(_key_, _value_)'
expression, but got '{0}'.,dupes:Duplicates in a repeater are not allowed.
Use 'track by' expression to specify unique keys. Repeater: {0}, Duplicate key:
{1},iexp:Expected expression in form of '_item_ in _collection_[ track by
_id_]' but got '{0}'.},ng:{areq:Argument '{0}' is {1},cpws:Can't
copy! Making copies of Window or Scope instances is not
supported.,badname:hasOwnProperty is not a valid {0} name,btstrpd:App
Already Bootstrapped with this Element '{0}',cpi:Can't copy! Source and
destination are identical.},$animate:{notcsel:Expecting class selector
starting with '.' got '{0}'.},ngTransclude:{orphan:Illegal use of ngTransc
lude directive in the template! No parent directive that requires a
transclusion found. Element: {0}},$parse:{isecfld:Attempting to access a
disallowed field in Angular expressions! Expression: {0},syntax:Syntax
Error: Token '{0}' {1} at column {2} of the expression [{3}] starting at
[{4}].,isecff:Referencing call, apply or bind in Angular expressions is
disallowed! Expression: {0},isecdom:Referencing DOM nodes in Angular
expressions is
[07/56] [abbrv] struts git commit: Upgrade AngularJS to latest stable AngularJS version 1.2.23
http://git-wip-us.apache.org/repos/asf/struts/blob/810711cc/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
index 4ae11c8..22af422 100644
---
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
@@ -1,163 +1,215 @@
/*
- AngularJS v1.0.8
- (c) 2010-2012 Google, Inc. http://angularjs.org
+ AngularJS v1.2.23
+ (c) 2010-2014 Google, Inc. http://angularjs.org
License: MIT
*/
-(function(P,T,q){'use strict';function m(b,a,c){var d;if(b)if(H(b))for(d in
b)d!=prototyped!=lengthd!=nameb.hasOwnProperty(d)a.call(c,b[d],d);else
if(b.forEachb.forEach!==m)b.forEach(a,c);else if(!b||typeof
b.length!==number?0:typeof b.hasOwnProperty!=functiontypeof
b.constructor!=function||b instanceof L||aab instanceof
aa||ma.call(b)!==[object Object]||typeof
b.callee===function)for(d=0;db.length;d++)a.call(c,b[d],d);else for(d in
b)b.hasOwnProperty(d)a.call(c,b[d],
-d);return b}function nb(b){var a=[],c;for(c in
b)b.hasOwnProperty(c)a.push(c);return a.sort()}function hc(b,a,c){for(var
d=nb(b),e=0;ed.length;e++)a.call(c,b[d[e]],d[e]);return d}function
ob(b){return function(a,c){b(c,a)}}function xa(){for(var
b=Z.length,a;b;){b--;a=Z[b].charCodeAt(0);if(a==57)return
Z[b]=A,Z.join();if(a==90)Z[b]=0;else return
Z[b]=String.fromCharCode(a+1),Z.join()}Z.unshift(0);return
Z.join()}function pb(b,a){a?b.$$hashKey=a:delete b.$$hashKey}function
D(b){var a=
-b.$$hashKey;m(arguments,function(a){a!==bm(a,function(a,c){b[c]=a})});pb(b,a);return
b}function G(b){return parseInt(b,10)}function ya(b,a){return D(new
(D(function(){},{prototype:b})),a)}function s(){}function na(b){return
b}function I(b){return function(){return b}}function u(b){return typeof
b==undefined}function v(b){return typeof b!=undefined}function M(b){return
b!=nulltypeof b==object}function B(b){return typeof b==string}function
Ra(b){return typeof b==number}function oa(b){return ma.apply(b)==
-[object Date]}function E(b){return ma.apply(b)==[object Array]}function
H(b){return typeof b==function}function Sa(b){return ma.apply(b)==[object
RegExp]}function pa(b){return
bb.documentb.locationb.alertb.setInterval}function ic(b){return
b(b.nodeName||b.bindb.find)}function Ta(b,a,c){var
d=[];m(b,function(b,g,h){d.push(a.call(c,b,g,h))});return d}function
za(b,a){if(b.indexOf)return b.indexOf(a);for(var
c=0;cb.length;c++)if(a===b[c])return c;return-1}function Ua(b,a){var c=
-za(b,a);c=0b.splice(c,1);return a}function
U(b,a){if(pa(b)||bb.$evalAsyncb.$watch)throw Error(Can't copy Window or
Scope);if(a){if(b===a)throw Error(Can't copy equivalent objects or
arrays);if(E(b))for(var
c=a.length=0;cb.length;c++)a.push(U(b[c]));else{c=a.$$hashKey;m(a,function(b,c){delete
a[c]});for(var d in
b)a[d]=U(b[d]);pb(a,c)}}else(a=b)(E(b)?a=U(b,[]):oa(b)?a=new
Date(b.getTime()):Sa(b)?a=RegExp(b.source):M(b)(a=U(b,{})));return a}function
jc(b,a){var a=a||{},c;for(c in b)b.hasOwnProperty(c)
-c.substr(0,2)!==$$(a[c]=b[c]);return a}function
ea(b,a){if(b===a)return!0;if(b===null||a===null)return!1;if(b!==ba!==a)return!0;var
c=typeof b,d;if(c==typeof
ac==object)if(E(b)){if(!E(a))return!1;if((c=b.length)==a.length){for(d=0;dc;d++)if(!ea(b[d],a[d]))return!1;return!0}}else
if(oa(b))return oa(a)b.getTime()==a.getTime();else if(Sa(b)Sa(a))return
b.toString()==a.toString();else{if(bb.$evalAsyncb.$watch||aa.$evalAsynca.$watch||pa(b)||pa(a)||E(a))return!1;c={};for(d
in b)if(!(d.charAt(0)===
-$||H(b[d]))){if(!ea(b[d],a[d]))return!1;c[d]=!0}for(d in
a)if(!c[d]d.charAt(0)!==$a[d]!==q!H(a[d]))return!1;return!0}return!1}function
Va(b,a){var c=arguments.length2?ha.call(arguments,2):[];return H(a)!(a
instanceof RegExp)?c.length?function(){return
arguments.length?a.apply(b,c.concat(ha.call(arguments,0))):a.apply(b,c)}:function(){return
arguments.length?a.apply(b,arguments):a.call(b)}:a}function kc(b,a){var
c=a;/^\$+/.test(b)?c=q:pa(a)?c=$WINDOW:aT===a?c=$DOCUMENT:aa.$evalAsync
-a.$watch(c=$SCOPE);return c}function ba(b,a){return typeof
b===undefined?q:JSON.stringify(b,kc,a? :null)}function qb(b){return
B(b)?JSON.parse(b):b}function
Wa(b){bb.length!==0?(b=y(+b),b=!(b==f||b==0||b==false||b==no||b==n||b==[])):b=!1;return
b}function qa(b){b=w(b).clone();try{b.html()}catch(a){}var
c=w(div).append(b).html();try{return
b[0].nodeType===3?y(c):c.match(/^([^]+)/)[1].replace(/^([\w\-]+)/,function(a,b){return+y(b)})}catch(d){return
y(c)}}function rb(b){try{return
[06/56] [abbrv] struts git commit: Upgrade AngularJS to latest stable AngularJS version 1.2.23
http://git-wip-us.apache.org/repos/asf/struts/blob/810711cc/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
new file mode 100644
index 000..8aa40d3
--- /dev/null
+++
b/archetypes/struts2-archetype-angularjs/src/main/resources/archetype-resources/src/main/webapp/js/lib/angular/angular.min.js.map
@@ -0,0 +1,8 @@
+{
+version:3,
+file:angular.min.js,
+lineCount:214,
+mappings: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
[04/56] [abbrv] struts git commit: Upgrade AngularJS to latest stable AngularJS version 1.2.23
http://git-wip-us.apache.org/repos/asf/struts/blob/810711cc/archetypes/struts2-archetype-angularjs/src/main/resources/archetype-resources/src/main/webapp/js/lib/angular/i18n/angular-locale_en-nz.js
--
diff --git
a/archetypes/struts2-archetype-angularjs/src/main/resources/archetype-resources/src/main/webapp/js/lib/angular/i18n/angular-locale_en-nz.js
b/archetypes/struts2-archetype-angularjs/src/main/resources/archetype-resources/src/main/webapp/js/lib/angular/i18n/angular-locale_en-nz.js
index 50858e0..8e01073 100644
---
a/archetypes/struts2-archetype-angularjs/src/main/resources/archetype-resources/src/main/webapp/js/lib/angular/i18n/angular-locale_en-nz.js
+++
b/archetypes/struts2-archetype-angularjs/src/main/resources/archetype-resources/src/main/webapp/js/lib/angular/i18n/angular-locale_en-nz.js
@@ -1,3 +1,4 @@
+'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, {
http://git-wip-us.apache.org/repos/asf/struts/blob/810711cc/archetypes/struts2-archetype-angularjs/src/main/resources/archetype-resources/src/main/webapp/js/lib/angular/i18n/angular-locale_en-ph.js
--
diff --git
a/archetypes/struts2-archetype-angularjs/src/main/resources/archetype-resources/src/main/webapp/js/lib/angular/i18n/angular-locale_en-ph.js
b/archetypes/struts2-archetype-angularjs/src/main/resources/archetype-resources/src/main/webapp/js/lib/angular/i18n/angular-locale_en-ph.js
index f1e7411..647b9e1 100644
---
a/archetypes/struts2-archetype-angularjs/src/main/resources/archetype-resources/src/main/webapp/js/lib/angular/i18n/angular-locale_en-ph.js
+++
b/archetypes/struts2-archetype-angularjs/src/main/resources/archetype-resources/src/main/webapp/js/lib/angular/i18n/angular-locale_en-ph.js
@@ -1,3 +1,4 @@
+'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, {
http://git-wip-us.apache.org/repos/asf/struts/blob/810711cc/archetypes/struts2-archetype-angularjs/src/main/resources/archetype-resources/src/main/webapp/js/lib/angular/i18n/angular-locale_en-pk.js
--
diff --git
a/archetypes/struts2-archetype-angularjs/src/main/resources/archetype-resources/src/main/webapp/js/lib/angular/i18n/angular-locale_en-pk.js
b/archetypes/struts2-archetype-angularjs/src/main/resources/archetype-resources/src/main/webapp/js/lib/angular/i18n/angular-locale_en-pk.js
index 46411ec..bc58648 100644
---
a/archetypes/struts2-archetype-angularjs/src/main/resources/archetype-resources/src/main/webapp/js/lib/angular/i18n/angular-locale_en-pk.js
+++
b/archetypes/struts2-archetype-angularjs/src/main/resources/archetype-resources/src/main/webapp/js/lib/angular/i18n/angular-locale_en-pk.js
@@ -1,3 +1,4 @@
+'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, {
http://git-wip-us.apache.org/repos/asf/struts/blob/810711cc/archetypes/struts2-archetype-angularjs/src/main/resources/archetype-resources/src/main/webapp/js/lib/angular/i18n/angular-locale_en-pr.js
--
diff --git
a/archetypes/struts2-archetype-angularjs/src/main/resources/archetype-resources/src/main/webapp/js/lib/angular/i18n/angular-locale_en-pr.js
b/archetypes/struts2-archetype-angularjs/src/main/resources/archetype-resources/src/main/webapp/js/lib/angular/i18n/angular-locale_en-pr.js
index de5ed1f..6d66c08 100644
---
a/archetypes/struts2-archetype-angularjs/src/main/resources/archetype-resources/src/main/webapp/js/lib/angular/i18n/angular-locale_en-pr.js
+++
b/archetypes/struts2-archetype-angularjs/src/main/resources/archetype-resources/src/main/webapp/js/lib/angular/i18n/angular-locale_en-pr.js
@@ -1,3 +1,4 @@
+'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, {
http://git-wip-us.apache.org/repos/asf/struts/blob/810711cc/archetypes/struts2-archetype-angularjs/src/main/resources/archetype-resources/src/main/webapp/js/lib/angular/i18n/angular-locale_en-pw.js
--
diff --git
a/archetypes/struts2-archetype-angularjs/src/main/resources/archetype-resources/src/main/webapp/js/lib/angular/i18n/angular-locale_en-pw.js
b/archetypes/struts2-archetype-angularjs/src/main/resources/archetype-resources/src/main/webapp/js/lib/angular/i18n/angular-locale_en-pw.js
index 4f1e259..e280faa 100644
---
[22/56] [abbrv] struts git commit: WW-4399 struts2-archetype-angularjs uses absolute paths
WW-4399 struts2-archetype-angularjs uses absolute paths
Project: http://git-wip-us.apache.org/repos/asf/struts/repo
Commit: http://git-wip-us.apache.org/repos/asf/struts/commit/fbf4113c
Tree: http://git-wip-us.apache.org/repos/asf/struts/tree/fbf4113c
Diff: http://git-wip-us.apache.org/repos/asf/struts/diff/fbf4113c
Branch: refs/heads/master
Commit: fbf4113c2e0e256645b1f10a3693111b63e681e8
Parents: b88c5d5
Author: Johannes Geppert joh...@gmail.com
Authored: Sun Aug 31 14:09:38 2014 +0200
Committer: Johannes Geppert joh...@gmail.com
Committed: Sun Aug 31 14:09:38 2014 +0200
--
.../archetype-resources/src/main/webapp/js/bootstrap.js | 4 ++--
.../archetype-resources/src/main/webapp/js/controllers.js| 2 +-
2 files changed, 3 insertions(+), 3 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/struts/blob/fbf4113c/archetypes/struts2-archetype-angularjs/src/main/resources/archetype-resources/src/main/webapp/js/bootstrap.js
--
diff --git
a/archetypes/struts2-archetype-angularjs/src/main/resources/archetype-resources/src/main/webapp/js/bootstrap.js
b/archetypes/struts2-archetype-angularjs/src/main/resources/archetype-resources/src/main/webapp/js/bootstrap.js
index 8983318..501427f 100644
---
a/archetypes/struts2-archetype-angularjs/src/main/resources/archetype-resources/src/main/webapp/js/bootstrap.js
+++
b/archetypes/struts2-archetype-angularjs/src/main/resources/archetype-resources/src/main/webapp/js/bootstrap.js
@@ -24,10 +24,10 @@ var angularStrutsApp = angular.module('angularStrutsApp',
['ngRoute']);
angularStrutsApp.config(['$routeProvider',
function($routeProvider) {
$routeProvider.when('/projects', {
-templateUrl: '/partials/projects.html',
+templateUrl: 'partials/projects.html',
controller: 'ApacheProjectsController'
}).when('/home', {
-templateUrl: '/partials/home.html',
+templateUrl: 'partials/home.html',
controller: 'HomeController'
}).otherwise({ redirectTo: '/home' });
}
http://git-wip-us.apache.org/repos/asf/struts/blob/fbf4113c/archetypes/struts2-archetype-angularjs/src/main/resources/archetype-resources/src/main/webapp/js/controllers.js
--
diff --git
a/archetypes/struts2-archetype-angularjs/src/main/resources/archetype-resources/src/main/webapp/js/controllers.js
b/archetypes/struts2-archetype-angularjs/src/main/resources/archetype-resources/src/main/webapp/js/controllers.js
index 01afe21..9a5b71f 100644
---
a/archetypes/struts2-archetype-angularjs/src/main/resources/archetype-resources/src/main/webapp/js/controllers.js
+++
b/archetypes/struts2-archetype-angularjs/src/main/resources/archetype-resources/src/main/webapp/js/controllers.js
@@ -26,7 +26,7 @@ angularStrutsApp.controller('HomeController', function
($scope) {
angularStrutsApp.controller('ApacheProjectsController', function ($scope,
$http) {
this.init = function() {
-$http({method: 'GET', url: '/projects'}).
+$http({method: 'GET', url: 'projects'}).
success(function(data) {
$scope.projects = data.projectNames;
}).
[17/56] [abbrv] struts git commit: Upgrade AngularJS to latest stable AngularJS version 1.2.23
http://git-wip-us.apache.org/repos/asf/struts/blob/810711cc/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
new file mode 100644
index 000..3768a03
--- /dev/null
+++
b/archetypes/struts2-archetype-angularjs/src/main/resources/archetype-resources/src/main/webapp/js/lib/angular/angular-animate.js
@@ -0,0 +1,1689 @@
+/**
+ * @license AngularJS v1.2.23
+ * (c) 2010-2014 Google, Inc. http://angularjs.org
+ * License: MIT
+ */
+(function(window, angular, undefined) {'use strict';
+
+/* jshint maxlen: false */
+
+/**
+ * @ngdoc module
+ * @name ngAnimate
+ * @description
+ *
+ * # ngAnimate
+ *
+ * The `ngAnimate` module provides support for JavaScript, CSS3 transition and
CSS3 keyframe animation hooks within existing core and custom directives.
+ *
+ *
+ * div doc-module-components=ngAnimate/div
+ *
+ * # Usage
+ *
+ * To see animations in action, all that is required is to define the
appropriate CSS classes
+ * or to register a JavaScript animation via the myModule.animation()
function. The directives that support animation automatically are:
+ * `ngRepeat`, `ngInclude`, `ngIf`, `ngSwitch`, `ngShow`, `ngHide`, `ngView`
and `ngClass`. Custom directives can take advantage of animation
+ * by using the `$animate` service.
+ *
+ * Below is a more detailed breakdown of the supported animation events
provided by pre-existing ng directives:
+ *
+ * | Directive | Supported
Animations |
+ * |--
||
+ * | {@link ng.directive:ngRepeat#usage_animations ngRepeat} | enter,
leave and move |
+ * | {@link ngRoute.directive:ngView#usage_animations ngView}| enter
and leave|
+ * | {@link ng.directive:ngInclude#usage_animations ngInclude} | enter
and leave|
+ * | {@link ng.directive:ngSwitch#usage_animations ngSwitch} | enter
and leave|
+ * | {@link ng.directive:ngIf#usage_animations ngIf} | enter
and leave|
+ * | {@link ng.directive:ngClass#usage_animations ngClass} | add and
remove |
+ * | {@link ng.directive:ngShow#usage_animations ngShow ngHide}| add and
remove (the ng-hide class value) |
+ * | {@link ng.directive:form#usage_animations form} | add and
remove (dirty, pristine, valid, invalid all other validations)
|
+ * | {@link ng.directive:ngModel#usage_animations ngModel} | add and
remove (dirty, pristine, valid, invalid all other validations)
|
+ *
+ * You can find out more information about animations upon visiting each
directive page.
+ *
+ * Below is an example of how to apply animations to a directive that supports
animation hooks:
+ *
+ * ```html
+ * style type=text/css
+ * .slide.ng-enter, .slide.ng-leave {
+ * -webkit-transition:0.5s linear all;
+ * transition:0.5s linear all;
+ * }
+ *
+ * .slide.ng-enter { }/#42; starting animations for enter #42;/
+ * .slide.ng-enter.ng-enter-active { } /#42; terminal animations for enter
#42;/
+ * .slide.ng-leave { }/#42; starting animations for leave #42;/
+ * .slide.ng-leave.ng-leave-active { } /#42; terminal animations for leave
#42;/
+ * /style
+ *
+ * !--
+ * the animate service will automatically add .ng-enter and .ng-leave to the
element
+ * to trigger the CSS transition/animations
+ * --
+ * ANY class=slide ng-include=.../ANY
+ * ```
+ *
+ * Keep in mind that, by default, if an animation is running, any child
elements cannot be animated
+ * until the parent element's animation has completed. This blocking feature
can be overridden by
+ * placing the `ng-animate-children` attribute on a parent container tag.
+ *
+ * ```html
+ * div class=slide-animation ng-if=on ng-animate-children
+ * div class=fade-animation ng-if=on
+ * div class=explode-animation ng-if=on
+ *...
+ * /div
+ * /div
+ * /div
+ * ```
+ *
+ * When the `on` expression value changes and an animation is triggered then
each of the elements within
+ * will all animate without the block being applied to child elements.
+ *
+ * h2CSS-defined Animations/h2
+ * The animate service will automatically apply two CSS classes to the
animated element and these two CSS classes
+ * are designed to contain the start and end
[03/56] [abbrv] struts git commit: Upgrade AngularJS to latest stable AngularJS version 1.2.23
http://git-wip-us.apache.org/repos/asf/struts/blob/810711cc/archetypes/struts2-archetype-angularjs/src/main/resources/archetype-resources/src/main/webapp/js/lib/angular/i18n/angular-locale_fr-rw.js
--
diff --git
a/archetypes/struts2-archetype-angularjs/src/main/resources/archetype-resources/src/main/webapp/js/lib/angular/i18n/angular-locale_fr-rw.js
b/archetypes/struts2-archetype-angularjs/src/main/resources/archetype-resources/src/main/webapp/js/lib/angular/i18n/angular-locale_fr-rw.js
index ef84535..f3688b2 100644
---
a/archetypes/struts2-archetype-angularjs/src/main/resources/archetype-resources/src/main/webapp/js/lib/angular/i18n/angular-locale_fr-rw.js
+++
b/archetypes/struts2-archetype-angularjs/src/main/resources/archetype-resources/src/main/webapp/js/lib/angular/i18n/angular-locale_fr-rw.js
@@ -1,57 +1,58 @@
+'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: {
- 0: AM,
- 1: PM
-},
-DAY: {
- 0: dimanche,
- 1: lundi,
- 2: mardi,
- 3: mercredi,
- 4: jeudi,
- 5: vendredi,
- 6: samedi
-},
-MONTH: {
- 0: janvier,
- 1: f\u00e9vrier,
- 2: mars,
- 3: avril,
- 4: mai,
- 5: juin,
- 6: juillet,
- 7: ao\u00fbt,
- 8: septembre,
- 9: octobre,
- 10: novembre,
- 11: d\u00e9cembre
-},
-SHORTDAY: {
- 0: dim.,
- 1: lun.,
- 2: mar.,
- 3: mer.,
- 4: jeu.,
- 5: ven.,
- 6: sam.
-},
-SHORTMONTH: {
- 0: janv.,
- 1: f\u00e9vr.,
- 2: mars,
- 3: avr.,
- 4: mai,
- 5: juin,
- 6: juil.,
- 7: ao\u00fbt,
- 8: sept.,
- 9: oct.,
- 10: nov.,
- 11: d\u00e9c.
-},
+AMPMS: [
+ AM,
+ PM
+],
+DAY: [
+ dimanche,
+ lundi,
+ mardi,
+ mercredi,
+ jeudi,
+ vendredi,
+ samedi
+],
+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.
+],
fullDate: d y,
longDate: d y,
medium: d MMM y HH:mm:ss,
@@ -65,8 +66,8 @@ $provide.value($locale, {
CURRENCY_SYM: \u20ac,
DECIMAL_SEP: ,,
GROUP_SEP: \u00a0,
-PATTERNS: {
- 0: {
+PATTERNS: [
+ {
gSize: 3,
lgSize: 3,
macFrac: 0,
@@ -78,7 +79,7 @@ $provide.value($locale, {
posPre: ,
posSuf:
},
- 1: {
+ {
gSize: 3,
lgSize: 3,
macFrac: 0,
@@ -90,7 +91,7 @@ $provide.value($locale, {
posPre: ,
posSuf: \u00a0\u00a4
}
-}
+]
},
id: fr-rw,
pluralCat: function (n) { 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/810711cc/archetypes/struts2-archetype-angularjs/src/main/resources/archetype-resources/src/main/webapp/js/lib/angular/i18n/angular-locale_fr-sn.js
--
diff --git
a/archetypes/struts2-archetype-angularjs/src/main/resources/archetype-resources/src/main/webapp/js/lib/angular/i18n/angular-locale_fr-sn.js
b/archetypes/struts2-archetype-angularjs/src/main/resources/archetype-resources/src/main/webapp/js/lib/angular/i18n/angular-locale_fr-sn.js
index ca496da..1ac1399 100644
---
a/archetypes/struts2-archetype-angularjs/src/main/resources/archetype-resources/src/main/webapp/js/lib/angular/i18n/angular-locale_fr-sn.js
+++
b/archetypes/struts2-archetype-angularjs/src/main/resources/archetype-resources/src/main/webapp/js/lib/angular/i18n/angular-locale_fr-sn.js
@@ -1,57 +1,58 @@
+'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: {
- 0: AM,
- 1: PM
-},
-DAY: {
- 0: dimanche,
- 1: lundi,
- 2: mardi,
- 3: mercredi,
- 4: jeudi,
- 5: vendredi,
- 6: samedi
-},
-MONTH: {
- 0: janvier,
- 1: f\u00e9vrier,
- 2: mars,
- 3: avril,
- 4: mai,
- 5: juin,
- 6: juillet,
- 7: ao\u00fbt,
- 8: septembre,
- 9: octobre,
- 10: novembre,
- 11: d\u00e9cembre
-},
-SHORTDAY: {
-
[21/56] [abbrv] struts git commit: WW-4400 Replace outdated AngularJS version with latest stable AngularJS version
WW-4400 Replace outdated AngularJS version with latest stable AngularJS version Project: http://git-wip-us.apache.org/repos/asf/struts/repo Commit: http://git-wip-us.apache.org/repos/asf/struts/commit/b88c5d56 Tree: http://git-wip-us.apache.org/repos/asf/struts/tree/b88c5d56 Diff: http://git-wip-us.apache.org/repos/asf/struts/diff/b88c5d56 Branch: refs/heads/master Commit: b88c5d561f5b89c72c9a63d0c920f436c4f1ceef Parents: da2f2a5 a16cedb Author: Johannes Geppert joh...@gmail.com Authored: Sun Aug 31 14:05:27 2014 +0200 Committer: Johannes Geppert joh...@gmail.com Committed: Sun Aug 31 14:05:27 2014 +0200 -- .../src/main/webapp/WEB-INF/content/hello.jsp | 9 +- .../src/main/webapp/js/bootstrap.js |25 +- .../src/main/webapp/js/controllers.js |25 +- .../webapp/js/lib/angular/angular-animate.js| 1689 + .../js/lib/angular/angular-animate.min.js |28 + .../js/lib/angular/angular-animate.min.js.map | 8 + .../lib/angular/angular-bootstrap-prettify.js | 1845 - .../angular/angular-bootstrap-prettify.min.js |41 - .../webapp/js/lib/angular/angular-bootstrap.js | 175 - .../js/lib/angular/angular-bootstrap.min.js | 9 - .../webapp/js/lib/angular/angular-cookies.js| 104 +- .../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 |24 + .../webapp/js/lib/angular/angular-loader.js | 230 +- .../webapp/js/lib/angular/angular-loader.min.js |10 +- .../js/lib/angular/angular-loader.min.js.map| 8 + .../main/webapp/js/lib/angular/angular-mocks.js | 1250 +- .../webapp/js/lib/angular/angular-resource.js | 540 +- .../js/lib/angular/angular-resource.min.js |17 +- .../js/lib/angular/angular-resource.min.js.map | 8 + .../main/webapp/js/lib/angular/angular-route.js | 925 + .../webapp/js/lib/angular/angular-route.min.js |14 + .../js/lib/angular/angular-route.min.js.map | 8 + .../webapp/js/lib/angular/angular-sanitize.js | 503 +- .../js/lib/angular/angular-sanitize.min.js |22 +- .../js/lib/angular/angular-sanitize.min.js.map | 8 + .../webapp/js/lib/angular/angular-scenario.js | 32603 ++--- .../main/webapp/js/lib/angular/angular-touch.js | 584 + .../webapp/js/lib/angular/angular-touch.min.js |13 + .../js/lib/angular/angular-touch.min.js.map | 8 + .../src/main/webapp/js/lib/angular/angular.js | 18656 +++--- .../main/webapp/js/lib/angular/angular.min.js | 372 +- .../webapp/js/lib/angular/angular.min.js.map| 8 + .../src/main/webapp/js/lib/angular/errors.json | 1 + .../js/lib/angular/i18n/angular-locale_af-na.js | 1 + .../js/lib/angular/i18n/angular-locale_af-za.js | 1 + .../js/lib/angular/i18n/angular-locale_af.js| 1 + .../js/lib/angular/i18n/angular-locale_am-et.js | 1 + .../js/lib/angular/i18n/angular-locale_am.js| 1 + .../lib/angular/i18n/angular-locale_ar-001.js | 1 + .../js/lib/angular/i18n/angular-locale_ar-ae.js | 1 + .../js/lib/angular/i18n/angular-locale_ar-bh.js | 1 + .../js/lib/angular/i18n/angular-locale_ar-dz.js | 1 + .../js/lib/angular/i18n/angular-locale_ar-eg.js | 1 + .../js/lib/angular/i18n/angular-locale_ar-iq.js | 1 + .../js/lib/angular/i18n/angular-locale_ar-jo.js | 1 + .../js/lib/angular/i18n/angular-locale_ar-kw.js | 1 + .../js/lib/angular/i18n/angular-locale_ar-lb.js | 1 + .../js/lib/angular/i18n/angular-locale_ar-ly.js | 1 + .../js/lib/angular/i18n/angular-locale_ar-ma.js | 1 + .../js/lib/angular/i18n/angular-locale_ar-om.js | 1 + .../js/lib/angular/i18n/angular-locale_ar-qa.js | 1 + .../js/lib/angular/i18n/angular-locale_ar-sa.js | 1 + .../js/lib/angular/i18n/angular-locale_ar-sd.js | 1 + .../js/lib/angular/i18n/angular-locale_ar-sy.js | 1 + .../js/lib/angular/i18n/angular-locale_ar-tn.js | 1 + .../js/lib/angular/i18n/angular-locale_ar-ye.js | 1 + .../js/lib/angular/i18n/angular-locale_ar.js| 1 + .../js/lib/angular/i18n/angular-locale_bg-bg.js | 1 + .../js/lib/angular/i18n/angular-locale_bg.js| 1 + .../js/lib/angular/i18n/angular-locale_bn-bd.js | 1 + .../js/lib/angular/i18n/angular-locale_bn-in.js | 1 + .../js/lib/angular/i18n/angular-locale_bn.js| 1 + .../js/lib/angular/i18n/angular-locale_ca-ad.js | 1 + .../js/lib/angular/i18n/angular-locale_ca-es.js | 1 + .../js/lib/angular/i18n/angular-locale_ca.js| 1 + .../js/lib/angular/i18n/angular-locale_chr.js | 4 - .../js/lib/angular/i18n/angular-locale_cs-cz.js | 1 + .../js/lib/angular/i18n/angular-locale_cs.js| 1 + .../js/lib/angular/i18n/angular-locale_cy.js| 4 - .../js/lib/angular/i18n/angular-locale_da-dk.js | 1 +
[16/56] [abbrv] struts git commit: Upgrade AngularJS to latest stable AngularJS version 1.2.23
http://git-wip-us.apache.org/repos/asf/struts/blob/810711cc/archetypes/struts2-archetype-angularjs/src/main/resources/archetype-resources/src/main/webapp/js/lib/angular/angular-animate.min.js
--
diff --git
a/archetypes/struts2-archetype-angularjs/src/main/resources/archetype-resources/src/main/webapp/js/lib/angular/angular-animate.min.js
b/archetypes/struts2-archetype-angularjs/src/main/resources/archetype-resources/src/main/webapp/js/lib/angular/angular-animate.min.js
new file mode 100644
index 000..591544a
--- /dev/null
+++
b/archetypes/struts2-archetype-angularjs/src/main/resources/archetype-resources/src/main/webapp/js/lib/angular/angular-animate.min.js
@@ -0,0 +1,28 @@
+/*
+ AngularJS v1.2.23
+ (c) 2010-2014 Google, Inc. http://angularjs.org
+ License: MIT
+*/
+(function(F,e,O){'use
strict';e.module(ngAnimate,[ng]).directive(ngAnimateChildren,function(){return
function(G,s,g){g=g.ngAnimateChildren;e.isString(g)0===g.length?s.data($$ngAnimateChildren,!0):G.$watch(g,function(e){s.data($$ngAnimateChildren,!!e)})}}).factory($$animateReflow,[$$rAF,$document,function(e,s){return
function(g){return
e(function(){g()})}}]).config([$provide,$animateProvider,function(G,s){function
g(e){for(var g=0;ge.length;g++){var l=e[g];if(l.nodeType==aa)return l}}
+function B(l){return e.element(g(l))}var
m=e.noop,u=e.forEach,P=s.$$selectors,aa=1,l=$$ngAnimateState,V=$$ngAnimateChildren,J=ng-animate,n={running:!0};G.decorator($animate,[$delegate,$injector,$sniffer,$rootElement,$$asyncCallback,$rootScope,$document,function(z,F,$,R,E,H,O){function
K(a){var b=a.data(l)||{};b.running=!0;a.data(l,b)}function L(a){if(a){var
b=[],c={};a=a.substr(1).split(.);($.transitions||$.animations)b.push(F.get(P[]));for(var
d=0;da.length;d++){var f=
+a[d],e=P[f];e!c[f](b.push(F.get(e)),c[f]=!0)}return b}}function
G(a,b,c){function d(a,b){var
c=a[b],d=a[before+b.charAt(0).toUpperCase()+b.substr(1)];if(c||d)returnleave==b(d=c,c=null),n.push({event:b,fn:c}),h.push({event:b,fn:d}),!0}function
f(b,d,e){var f=[];u(b,function(a){a.fnf.push(a)});var
g=0;u(f,function(b,l){var
C=function(){a:{if(d){(d[l]||m)();if(++gf.length)break
a;d=null}e()}};switch(b.event){case setClass:d.push(b.fn(a,A,k,C));break;case
addClass:d.push(b.fn(a,A||c,
+C));break;case
removeClass:d.push(b.fn(a,k||c,C));break;default:d.push(b.fn(a,C))}});d0===d.lengthe()}var
g=a[0];if(g){var
l=setClass==b,p=l||addClass==b||removeClass==b,A,k;e.isArray(c)(A=c[0],k=c[1],c=A+
+k);var x=a.attr(class)+ +c;if(M(x)){var t=m,w=[],h=[],q=m,y=[],n=[],x=(
+x).replace(/\s+/g,.);u(L(x),function(a){!d(a,b)l(d(a,addClass),d(a,removeClass))});return{node:g,event:b,className:c,isClassBased:p,isSetClassOperation:l,before:function(a){t=a;f(h,w,function(){t=
+m;a()})},after:function(a){q=a;f(n,y,function(){q=m;a()})},cancel:function(){w(u(w,function(a){(a||m)(!0)}),t(!0));y(u(y,function(a){(a||m)(!0)}),q(!0))}function
r(a,b,c,d,f,g,n){function p(d){var
e=$animate:+d;q(q[e]0q[e].length)E(function(){c.triggerHandler(e,{event:a,className:b})})}function
A(){p(before)}function m(){p(after)}function
x(){p(close);nE(function(){n()})}function
t(){t.hasBeenRun||(t.hasBeenRun=!0,g())}function
w(){if(!w.hasBeenRun){w.hasBeenRun=!0;var d=
+c.data(l);d(hh.isClassBased?k(c,b):(E(function(){var
d=c.data(l)||{};r==d.indexk(c,b,a)}),c.data(l,d)));x()}}var
h=G(c,a,b);if(h){b=h.className;var
q=e.element._data(h.node),q=qq.events;d||(d=f?f.parent():c.parent());var
y=c.data(l)||{};f=y.active||{};var
z=y.totalActive||0,C=y.last,D;h.isClassBased(D=y.running||y.disabled||C!C.isClassBased);if(D||N(c,d))t(),A(),m(),w();else{d=!1;if(0z){D=[];if(h.isClassBased)setClass==C.event?(D.push(C),k(c,b)):f[b](v=f[b],v.event==a?d=!0:(D.push(v),
+k(c,b)));else if(leave==af[ng-leave])d=!0;else{for(var v in
f)D.push(f[v]),k(c,v);f={};z=0}0D.lengthu(D,function(a){a.cancel()})}!h.isClassBased||(h.isSetClassOperation||d)||(d=addClass==a==c.hasClass(b));if(d)t(),A(),m(),x();else{if(leave==a)c.one($destroy,function(a){a=e.element(this);var
b=a.data(l);b(b=b.active[ng-leave])(b.cancel(),k(a,ng-leave))});c.addClass(J);var
r=Y++;z++;f[b]=h;c.data(l,{last:h,active:f,index:r,totalActive:z});A();h.before(function(d){var
e=c.data(l);
+d=d||!e||!e.active[b]||h.isClassBasede.active[b].event!=a;t();!0===d?w():(m(),h.after(w))})}}}else
t(),A(),m(),w()}function
T(a){if(a=g(a))a=e.isFunction(a.getElementsByClassName)?a.getElementsByClassName(J):a.querySelectorAll(.+J),u(a,function(a){a=e.element(a);(a=a.data(l))a.activeu(a.active,function(a){a.cancel()})})}function
k(a,b){if(g(a)==g(R))n.disabled||(n.running=!1,n.structural=!1);else if(b){var
c=a.data(l)||{},d=!0===b;!d(c.activec.active[b])(c.totalActive--,delete
c.active[b]);
+if(d||!c.totalActive)a.removeClass(J),a.removeData(l)}}function
N(a,b){if(n.disabled)return!0;if(g(a)==g(R))return n.running;var
c,d,f;do{if(0===b.length)break;var
[23/56] [abbrv] struts git commit: Switch to latest bootstrap version 3.2.0 in REST Showcase
http://git-wip-us.apache.org/repos/asf/struts/blob/3826c309/apps/rest-showcase/src/main/webapp/fonts/glyphicons-halflings-regular.eot -- diff --git a/apps/rest-showcase/src/main/webapp/fonts/glyphicons-halflings-regular.eot b/apps/rest-showcase/src/main/webapp/fonts/glyphicons-halflings-regular.eot new file mode 100644 index 000..4a4ca86 Binary files /dev/null and b/apps/rest-showcase/src/main/webapp/fonts/glyphicons-halflings-regular.eot differ http://git-wip-us.apache.org/repos/asf/struts/blob/3826c309/apps/rest-showcase/src/main/webapp/fonts/glyphicons-halflings-regular.svg -- diff --git a/apps/rest-showcase/src/main/webapp/fonts/glyphicons-halflings-regular.svg b/apps/rest-showcase/src/main/webapp/fonts/glyphicons-halflings-regular.svg new file mode 100644 index 000..e3e2dc7 --- /dev/null +++ b/apps/rest-showcase/src/main/webapp/fonts/glyphicons-halflings-regular.svg @@ -0,0 +1,229 @@ +?xml version=1.0 standalone=no? +!DOCTYPE svg PUBLIC -//W3C//DTD SVG 1.1//EN http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd; +svg xmlns=http://www.w3.org/2000/svg; +metadata/metadata +defs +font id=glyphicons_halflingsregular horiz-adv-x=1200 +font-face units-per-em=1200 ascent=960 descent=-240 / +missing-glyph horiz-adv-x=500 / +glyph / +glyph / +glyph unicode=#xd; / +glyph unicode= / +glyph unicode=* d=M100 500v200h259l-183 183l141 141l183 -183v259h200v-259l183 183l141 -141l-183 -183h259v-200h-259l183 -183l-141 -141l-183 183v-259h-200v259l-183 -183l-141 141l183 183h-259z / +glyph unicode=+ d=M0 400v300h400v400h300v-400h400v-300h-400v-400h-300v400h-400z / +glyph unicode=#xa0; / +glyph unicode=#x2000; horiz-adv-x=652 / +glyph unicode=#x2001; horiz-adv-x=1304 / +glyph unicode=#x2002; horiz-adv-x=652 / +glyph unicode=#x2003; horiz-adv-x=1304 / +glyph unicode=#x2004; horiz-adv-x=434 / +glyph unicode=#x2005; horiz-adv-x=326 / +glyph unicode=#x2006; horiz-adv-x=217 / +glyph unicode=#x2007; horiz-adv-x=217 / +glyph unicode=#x2008; horiz-adv-x=163 / +glyph unicode=#x2009; horiz-adv-x=260 / +glyph unicode=#x200a; horiz-adv-x=72 / +glyph unicode=#x202f; horiz-adv-x=260 / +glyph unicode=#x205f; horiz-adv-x=326 / +glyph unicode=#x20ac; d=M100 500l100 100h113q0 47 5 100h-218l100 100h135q37 167 112 257q117 141 297 141q242 0 354 -189q60 -103 66 -209h-181q0 55 -25.5 99t-63.5 68t-75 36.5t-67 12.5q-24 0 -52.5 -10t-62.5 -32t-65.5 -67t-50.5 -107h379l-100 -100h-300q-6 -46 -6 -100h406l-100 -100 h-300q9 -74 33 -132t52.5 -91t62 -54.5t59 -29t46.5 -7.5q29 0 66 13t75 37t63.5 67.5t25.5 96.5h174q-31 -172 -128 -278q-107 -117 -274 -117q-205 0 -324 158q-36 46 -69 131.5t-45 205.5h-217z / +glyph unicode=#x2212; d=M200 400h900v300h-900v-300z / +glyph unicode=#x25fc; horiz-adv-x=500 d=M0 0z / +glyph unicode=#x2601; d=M-14 494q0 -80 56.5 -137t135.5 -57h750q120 0 205 86.5t85 207.5t-85 207t-205 86q-46 0 -90 -14q-44 97 -134.5 156.5t-200.5 59.5q-152 0 -260 -107.5t-108 -260.5q0 -25 2 -37q-66 -14 -108.5 -67.5t-42.5 -122.5z / +glyph unicode=#x2709; d=M0 100l400 400l200 -200l200 200l400 -400h-1200zM0 300v600l300 -300zM0 1100l600 -603l600 603h-1200zM900 600l300 300v-600z / +glyph unicode=#x270f; d=M-13 -13l333 112l-223 223zM187 403l214 -214l614 614l-214 214zM887 1103l214 -214l99 92q13 13 13 32.5t-13 33.5l-153 153q-15 13 -33 13t-33 -13z / +glyph unicode=#xe001; d=M0 1200h1200l-500 -550v-550h300v-100h-800v100h300v550z / +glyph unicode=#xe002; d=M14 84q18 -55 86 -75.5t147 5.5q65 21 109 69t44 90v606l600 155v-521q-64 16 -138 -7q-79 -26 -122.5 -83t-25.5 -111q18 -55 86 -75.5t147 4.5q70 23 111.5 63.5t41.5 95.5v881q0 10 -7 15.5t-17 2.5l-752 -193q-10 -3 -17 -12.5t-7 -19.5v-689q-64 17 -138 -7 q-79 -25 -122.5 -82t-25.5 -112z / +glyph unicode=#xe003; d=M23 693q0 200 142 342t342 142t342 -142t142 -342q0 -142 -78 -261l300 -300q7 -8 7 -18t-7 -18l-109 -109q-8 -7 -18 -7t-18 7l-300 300q-119 -78 -261 -78q-200 0 -342 142t-142 342zM176 693q0 -136 97 -233t234 -97t233.5 96.5t96.5 233.5t-96.5 233.5t-233.5 96.5 t-234 -97t-97 -233z / +glyph unicode=#xe005; d=M100 784q0 64 28 123t73 100.5t104.5 64t119 20.5t120 -38.5t104.5 -104.5q48 69 109.5 105t121.5 38t118.5 -20.5t102.5 -64t71 -100.5t27 -123q0 -57 -33.5 -117.5t-94 -124.5t-126.5 -127.5t-150 -152.5t-146 -174q-62 85 -145.5 174t-149.5 152.5t-126.5 127.5 t-94 124.5t-33.5 117.5z / +glyph unicode=#xe006; d=M-72 800h479l146 400h2l146 -400h472l-382 -278l145 -449l-384 275l-382 -275l146 447zM168 71l2 1z / +glyph unicode=#xe007; d=M-72 800h479l146 400h2l146 -400h472l-382 -278l145 -449l-384 275l-382 -275l146 447zM168 71l2 1zM237 700l196 -142l-73 -226l192 140l195 -141l-74 229l193 140h-235l-77 211l-78 -211h-239z / +glyph unicode=#xe008; d=M0 0v143l400 257v100q-37 0 -68.5 74.5t-31.5 125.5v200q0 124 88 212t212 88t212 -88t88 -212v-200q0 -51 -31.5 -125.5t-68.5 -74.5v-100l400 -257v-143h-1200z / +glyph unicode=#xe009; d=M0 0v1100h1200v-1100h-1200zM100 100h100v100h-100v-100zM100
[15/56] [abbrv] struts git commit: Upgrade AngularJS to latest stable AngularJS version 1.2.23
http://git-wip-us.apache.org/repos/asf/struts/blob/810711cc/archetypes/struts2-archetype-angularjs/src/main/resources/archetype-resources/src/main/webapp/js/lib/angular/angular-bootstrap-prettify.js
--
diff --git
a/archetypes/struts2-archetype-angularjs/src/main/resources/archetype-resources/src/main/webapp/js/lib/angular/angular-bootstrap-prettify.js
b/archetypes/struts2-archetype-angularjs/src/main/resources/archetype-resources/src/main/webapp/js/lib/angular/angular-bootstrap-prettify.js
deleted file mode 100644
index 76d5ab6..000
---
a/archetypes/struts2-archetype-angularjs/src/main/resources/archetype-resources/src/main/webapp/js/lib/angular/angular-bootstrap-prettify.js
+++ /dev/null
@@ -1,1845 +0,0 @@
-/**
- * @license AngularJS v1.0.8
- * (c) 2010-2012 Google, Inc. http://angularjs.org
- * License: MIT
- */
-(function(window, angular, undefined) {
-'use strict';
-
-var directive = {};
-var service = { value: {} };
-
-var DEPENDENCIES = {
- 'angular.js': 'http://code.angularjs.org/' + angular.version.full +
'/angular.min.js',
- 'angular-resource.js': 'http://code.angularjs.org/' + angular.version.full +
'/angular-resource.min.js',
- 'angular-sanitize.js': 'http://code.angularjs.org/' + angular.version.full +
'/angular-sanitize.min.js',
- 'angular-cookies.js': 'http://code.angularjs.org/' + angular.version.full +
'/angular-cookies.min.js'
-};
-
-
-function escape(text) {
- return text.
-replace(/\/g, 'amp;').
-replace(/\/g, 'lt;').
-replace(/\/g, 'gt;').
-replace(//g, 'quot;');
-}
-
-/**
- *
http://stackoverflow.com/questions/451486/pre-tag-loses-line-breaks-when-setting-innerhtml-in-ie
- *
http://stackoverflow.com/questions/195363/inserting-a-newline-into-a-pre-tag-ie-javascript
- */
-function setHtmlIe8SafeWay(element, html) {
- var newElement = angular.element('pre' + html + '/pre');
-
- element.html('');
- element.append(newElement.contents());
- return element;
-}
-
-
-directive.jsFiddle = function(getEmbeddedTemplate, escape, script) {
- return {
-terminal: true,
-link: function(scope, element, attr) {
- var name = '',
-stylesheet = 'link rel=stylesheet
href=http://twitter.github.com/bootstrap/assets/css/bootstrap.css;\n',
-fields = {
- html: '',
- css: '',
- js: ''
-};
-
- angular.forEach(attr.jsFiddle.split(' '), function(file, index) {
-var fileType = file.split('.')[1];
-
-if (fileType == 'html') {
- if (index == 0) {
-fields[fileType] +=
- 'div ng-app' + (attr.module ? '=' + attr.module + '' : '') +
'\n' +
-getEmbeddedTemplate(file, 2);
- } else {
-fields[fileType] += '\n\n\n !-- CACHE FILE: ' + file + ' --\n' +
- ' script type=text/ng-template id=' + file + '\n' +
- getEmbeddedTemplate(file, 4) +
- ' /script\n';
- }
-} else {
- fields[fileType] += getEmbeddedTemplate(file) + '\n';
-}
- });
-
- fields.html += '/div\n';
-
- setHtmlIe8SafeWay(element,
-'form class=jsfiddle method=post
action=http://jsfiddle.net/api/post/library/pure/; target=_blank' +
- hiddenField('title', 'AngularJS Example: ' + name) +
- hiddenField('css', '/style !-- Ugly Hack due to jsFiddle issue:
http://goo.gl/BUfGZ -- \n' +
-stylesheet +
-script.angular +
-(attr.resource ? script.resource : '') +
-'style\n' +
-fields.css) +
- hiddenField('html', fields.html) +
- hiddenField('js', fields.js) +
- 'button class=btn btn-primaryi class=icon-white
icon-pencil/i Edit Me/button' +
- '/form');
-
- function hiddenField(name, value) {
-return 'input type=hidden name=' + name + ' value=' +
escape(value) + '';
- }
-}
- }
-};
-
-
-directive.code = function() {
- return {restrict: 'E', terminal: true};
-};
-
-
-directive.prettyprint = ['reindentCode', function(reindentCode) {
- return {
-restrict: 'C',
-terminal: true,
-compile: function(element) {
- element.html(window.prettyPrintOne(reindentCode(element.html()),
undefined, true));
-}
- };
-}];
-
-
-directive.ngSetText = ['getEmbeddedTemplate', function(getEmbeddedTemplate) {
- return {
-restrict: 'CA',
-priority: 10,
-compile: function(element, attr) {
- setHtmlIe8SafeWay(element, escape(getEmbeddedTemplate(attr.ngSetText)));
-}
- }
-}]
-
-
-directive.ngHtmlWrap = ['reindentCode', 'templateMerge',
function(reindentCode, templateMerge) {
- return {
-compile: function(element, attr) {
- var properties = {
-head: '',
-module: '',
-body: element.text()
- },
-html = !doctype html\nhtml ng-app{{module}}\n head\n{{head:4}}
/head\n body\n{{body:4}} /body\n/html;
-
-
[18/56] [abbrv] struts git commit: Upgrade AngularJS to latest stable AngularJS version 1.2.23
Upgrade AngularJS to latest stable AngularJS version 1.2.23 Project: http://git-wip-us.apache.org/repos/asf/struts/repo Commit: http://git-wip-us.apache.org/repos/asf/struts/commit/810711cc Tree: http://git-wip-us.apache.org/repos/asf/struts/tree/810711cc Diff: http://git-wip-us.apache.org/repos/asf/struts/diff/810711cc Branch: refs/heads/master Commit: 810711ccd2f745df2ee97398f9a8362c06c41e33 Parents: da2f2a5 Author: Johannes Geppert joh...@gmail.com Authored: Sun Aug 31 13:32:45 2014 +0200 Committer: Johannes Geppert joh...@gmail.com Committed: Sun Aug 31 13:32:50 2014 +0200 -- .../webapp/js/lib/angular/angular-animate.js| 1689 + .../js/lib/angular/angular-animate.min.js |28 + .../js/lib/angular/angular-animate.min.js.map | 8 + .../lib/angular/angular-bootstrap-prettify.js | 1845 - .../angular/angular-bootstrap-prettify.min.js |41 - .../webapp/js/lib/angular/angular-bootstrap.js | 175 - .../js/lib/angular/angular-bootstrap.min.js | 9 - .../webapp/js/lib/angular/angular-cookies.js| 104 +- .../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 |24 + .../webapp/js/lib/angular/angular-loader.js | 230 +- .../webapp/js/lib/angular/angular-loader.min.js |10 +- .../js/lib/angular/angular-loader.min.js.map| 8 + .../main/webapp/js/lib/angular/angular-mocks.js | 1250 +- .../webapp/js/lib/angular/angular-resource.js | 540 +- .../js/lib/angular/angular-resource.min.js |17 +- .../js/lib/angular/angular-resource.min.js.map | 8 + .../main/webapp/js/lib/angular/angular-route.js | 925 + .../webapp/js/lib/angular/angular-route.min.js |14 + .../js/lib/angular/angular-route.min.js.map | 8 + .../webapp/js/lib/angular/angular-sanitize.js | 503 +- .../js/lib/angular/angular-sanitize.min.js |22 +- .../js/lib/angular/angular-sanitize.min.js.map | 8 + .../webapp/js/lib/angular/angular-scenario.js | 32603 ++--- .../main/webapp/js/lib/angular/angular-touch.js | 584 + .../webapp/js/lib/angular/angular-touch.min.js |13 + .../js/lib/angular/angular-touch.min.js.map | 8 + .../src/main/webapp/js/lib/angular/angular.js | 18656 +++--- .../main/webapp/js/lib/angular/angular.min.js | 372 +- .../webapp/js/lib/angular/angular.min.js.map| 8 + .../src/main/webapp/js/lib/angular/errors.json | 1 + .../js/lib/angular/i18n/angular-locale_af-na.js | 1 + .../js/lib/angular/i18n/angular-locale_af-za.js | 1 + .../js/lib/angular/i18n/angular-locale_af.js| 1 + .../js/lib/angular/i18n/angular-locale_am-et.js | 1 + .../js/lib/angular/i18n/angular-locale_am.js| 1 + .../lib/angular/i18n/angular-locale_ar-001.js | 1 + .../js/lib/angular/i18n/angular-locale_ar-ae.js | 1 + .../js/lib/angular/i18n/angular-locale_ar-bh.js | 1 + .../js/lib/angular/i18n/angular-locale_ar-dz.js | 1 + .../js/lib/angular/i18n/angular-locale_ar-eg.js | 1 + .../js/lib/angular/i18n/angular-locale_ar-iq.js | 1 + .../js/lib/angular/i18n/angular-locale_ar-jo.js | 1 + .../js/lib/angular/i18n/angular-locale_ar-kw.js | 1 + .../js/lib/angular/i18n/angular-locale_ar-lb.js | 1 + .../js/lib/angular/i18n/angular-locale_ar-ly.js | 1 + .../js/lib/angular/i18n/angular-locale_ar-ma.js | 1 + .../js/lib/angular/i18n/angular-locale_ar-om.js | 1 + .../js/lib/angular/i18n/angular-locale_ar-qa.js | 1 + .../js/lib/angular/i18n/angular-locale_ar-sa.js | 1 + .../js/lib/angular/i18n/angular-locale_ar-sd.js | 1 + .../js/lib/angular/i18n/angular-locale_ar-sy.js | 1 + .../js/lib/angular/i18n/angular-locale_ar-tn.js | 1 + .../js/lib/angular/i18n/angular-locale_ar-ye.js | 1 + .../js/lib/angular/i18n/angular-locale_ar.js| 1 + .../js/lib/angular/i18n/angular-locale_bg-bg.js | 1 + .../js/lib/angular/i18n/angular-locale_bg.js| 1 + .../js/lib/angular/i18n/angular-locale_bn-bd.js | 1 + .../js/lib/angular/i18n/angular-locale_bn-in.js | 1 + .../js/lib/angular/i18n/angular-locale_bn.js| 1 + .../js/lib/angular/i18n/angular-locale_ca-ad.js | 1 + .../js/lib/angular/i18n/angular-locale_ca-es.js | 1 + .../js/lib/angular/i18n/angular-locale_ca.js| 1 + .../js/lib/angular/i18n/angular-locale_chr.js | 4 - .../js/lib/angular/i18n/angular-locale_cs-cz.js | 1 + .../js/lib/angular/i18n/angular-locale_cs.js| 1 + .../js/lib/angular/i18n/angular-locale_cy.js| 4 - .../js/lib/angular/i18n/angular-locale_da-dk.js | 1 + .../js/lib/angular/i18n/angular-locale_da.js| 1 + .../js/lib/angular/i18n/angular-locale_de-at.js | 1 + .../js/lib/angular/i18n/angular-locale_de-be.js | 1 + .../js/lib/angular/i18n/angular-locale_de-ch.js | 1
[36/56] [abbrv] struts git commit: WW-4165 Checks if dynamic attributes don't overlap tag attributes This can be done only in a component as when dynamic attributes are set by a container on the tag,
WW-4165 Checks if dynamic attributes don't overlap tag attributes
This can be done only in a component as when dynamic attributes are set
by a container on the tag, the component wasn't instantiated yet - it
will be created in doStartTag method which is called after all
attributes were set
Project: http://git-wip-us.apache.org/repos/asf/struts/repo
Commit: http://git-wip-us.apache.org/repos/asf/struts/commit/4f4f5260
Tree: http://git-wip-us.apache.org/repos/asf/struts/tree/4f4f5260
Diff: http://git-wip-us.apache.org/repos/asf/struts/diff/4f4f5260
Branch: refs/heads/master
Commit: 4f4f5260029f2074de6c925ae97c5cd6a6bc2a55
Parents: bc78860
Author: Lukasz Lenart lukaszlen...@apache.org
Authored: Mon Sep 22 09:01:11 2014 +0200
Committer: Lukasz Lenart lukaszlen...@apache.org
Committed: Mon Sep 22 09:01:11 2014 +0200
--
.../java/org/apache/struts2/components/UIBean.java| 14 ++
.../apache/struts2/views/jsp/ui/AbstractUITag.java| 4
.../org/apache/struts2/views/jsp/ui/AnchorTest.java | 2 +-
.../apache/struts2/views/jsp/ui/ComponentTest.java| 3 ++-
.../org/apache/struts2/views/jsp/ui/RadioTest.java| 1 -
5 files changed, 9 insertions(+), 15 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/struts/blob/4f4f5260/core/src/main/java/org/apache/struts2/components/UIBean.java
--
diff --git a/core/src/main/java/org/apache/struts2/components/UIBean.java
b/core/src/main/java/org/apache/struts2/components/UIBean.java
index 49d7063..5fd99a9 100644
--- a/core/src/main/java/org/apache/struts2/components/UIBean.java
+++ b/core/src/main/java/org/apache/struts2/components/UIBean.java
@@ -39,16 +39,10 @@ import org.apache.struts2.views.util.ContextUtil;
import javax.servlet.http.HttpServletRequest;
import javax.servlet.http.HttpServletResponse;
import java.io.Writer;
-import java.lang.reflect.Field;
-import java.lang.reflect.Modifier;
import java.util.HashMap;
-import java.util.HashSet;
import java.util.LinkedHashMap;
import java.util.List;
import java.util.Map;
-import java.util.Set;
-import java.util.concurrent.ConcurrentHashMap;
-import java.util.concurrent.ConcurrentMap;
/**
* UIBean is the standard superclass of all Struts UI components.
@@ -1260,8 +1254,12 @@ public abstract class UIBean extends Component {
this.tooltipIconPath = tooltipIconPath;
}
- public void setDynamicAttributes(MapString, Object dynamicAttributes)
{
- this.dynamicAttributes.putAll(dynamicAttributes);
+ public void setDynamicAttributes(MapString, Object
tagDynamicAttributes) {
+for (String key : tagDynamicAttributes.keySet()) {
+if (!isValidTagAttribute(key)) {
+dynamicAttributes.put(key, tagDynamicAttributes.get(key));
+}
+}
}
@Override
http://git-wip-us.apache.org/repos/asf/struts/blob/4f4f5260/core/src/main/java/org/apache/struts2/views/jsp/ui/AbstractUITag.java
--
diff --git
a/core/src/main/java/org/apache/struts2/views/jsp/ui/AbstractUITag.java
b/core/src/main/java/org/apache/struts2/views/jsp/ui/AbstractUITag.java
index d12b3a1..e57932a 100644
--- a/core/src/main/java/org/apache/struts2/views/jsp/ui/AbstractUITag.java
+++ b/core/src/main/java/org/apache/struts2/views/jsp/ui/AbstractUITag.java
@@ -305,10 +305,6 @@ public abstract class AbstractUITag extends
ComponentTagSupport implements Dynam
}
public void setDynamicAttribute(String uri, String localName, Object
value) throws JspException {
-if (component.isValidTagAttribute(localName)) {
-return;
-}
-
if (ComponentUtils.altSyntax(getStack())
ComponentUtils.isExpression(value)) {
dynamicAttributes.put(localName,
String.valueOf(ObjectUtils.defaultIfNull(findValue(value.toString()), value)));
} else {
http://git-wip-us.apache.org/repos/asf/struts/blob/4f4f5260/core/src/test/java/org/apache/struts2/views/jsp/ui/AnchorTest.java
--
diff --git a/core/src/test/java/org/apache/struts2/views/jsp/ui/AnchorTest.java
b/core/src/test/java/org/apache/struts2/views/jsp/ui/AnchorTest.java
index 6511944..bd007e9 100644
--- a/core/src/test/java/org/apache/struts2/views/jsp/ui/AnchorTest.java
+++ b/core/src/test/java/org/apache/struts2/views/jsp/ui/AnchorTest.java
@@ -89,9 +89,9 @@ public class AnchorTest extends AbstractUITagTest {
private AnchorTag createTag() throws JspException {
AnchorTag tag = new AnchorTag();
tag.setPageContext(pageContext);
-tag.doStartTag();
tag.setId(mylink);
return tag;
}
+
}
[19/56] [abbrv] struts git commit: DOCTYPE needs to be in first line for valid HTML5
DOCTYPE needs to be in first line for valid HTML5 Project: http://git-wip-us.apache.org/repos/asf/struts/repo Commit: http://git-wip-us.apache.org/repos/asf/struts/commit/387f8027 Tree: http://git-wip-us.apache.org/repos/asf/struts/tree/387f8027 Diff: http://git-wip-us.apache.org/repos/asf/struts/diff/387f8027 Branch: refs/heads/master Commit: 387f8027fd3cd5d3bab76d9939b34e188b2103a0 Parents: 810711c Author: Johannes Geppert joh...@gmail.com Authored: Sun Aug 31 13:36:08 2014 +0200 Committer: Johannes Geppert joh...@gmail.com Committed: Sun Aug 31 13:36:08 2014 +0200 -- .../archetype-resources/src/main/webapp/WEB-INF/content/hello.jsp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) -- http://git-wip-us.apache.org/repos/asf/struts/blob/387f8027/archetypes/struts2-archetype-angularjs/src/main/resources/archetype-resources/src/main/webapp/WEB-INF/content/hello.jsp -- diff --git a/archetypes/struts2-archetype-angularjs/src/main/resources/archetype-resources/src/main/webapp/WEB-INF/content/hello.jsp b/archetypes/struts2-archetype-angularjs/src/main/resources/archetype-resources/src/main/webapp/WEB-INF/content/hello.jsp index dc960a2..70ca934 100644 --- a/archetypes/struts2-archetype-angularjs/src/main/resources/archetype-resources/src/main/webapp/WEB-INF/content/hello.jsp +++ b/archetypes/struts2-archetype-angularjs/src/main/resources/archetype-resources/src/main/webapp/WEB-INF/content/hello.jsp @@ -1,6 +1,6 @@ +!DOCTYPE html %@ page contentType=text/html; charset=UTF-8 % %@ taglib prefix=s uri=/struts-tags % -!DOCTYPE html html lang=en ng-app=angularstruts head meta charset=utf-8
[25/56] [abbrv] struts git commit: Switch to latest bootstrap version 3.2.0 in REST Showcase
http://git-wip-us.apache.org/repos/asf/struts/blob/3826c309/apps/rest-showcase/src/main/webapp/css/bootstrap.css.map
--
diff --git a/apps/rest-showcase/src/main/webapp/css/bootstrap.css.map
b/apps/rest-showcase/src/main/webapp/css/bootstrap.css.map
new file mode 100644
index 000..bfb5616
--- /dev/null
+++ b/apps/rest-showcase/src/main/webapp/css/bootstrap.css.map
@@ -0,0 +1 @@
+{version:3,file:bootstrap.css,sources:[bootstrap.css,less/normalize.less,less/print.less,less/glyphicons.less,less/scaffolding.less,less/mixins/vendor-prefixes.less,less/mixins/tab-focus.less,less/mixins/image.less,less/type.less,less/mixins/text-emphasis.less,less/mixins/background-variant.less,less/mixins/text-overflow.less,less/code.less,less/grid.less,less/mixins/grid.less,less/mixins/grid-framework.less,less/tables.less,less/mixins/table-row.less,less/forms.less,less/mixins/forms.less,less/buttons.less,less/mixins/buttons.less,less/mixins/opacity.less,less/component-animations.less,less/dropdowns.less,less/mixins/nav-divider.less,less/mixins/reset-filter.less,less/button-groups.less,less/mixins/border-radius.less,less/input-groups.less,less/navs.less,less/navbar.less,less/mixins/nav-vertical-align.less,less/utilities.less,less/breadcrumbs.less,less/pagination.less,less/mixins/pagination.less,less
/pager.less,less/labels.less,less/mixins/labels.less,less/badges.less,less/jumbotron.less,less/thumbnails.less,less/alerts.less,less/mixins/alerts.less,less/progress-bars.less,less/mixins/gradients.less,less/mixins/progress-bar.less,less/media.less,less/list-group.less,less/mixins/list-group.less,less/panels.less,less/mixins/panels.less,less/responsive-embed.less,less/wells.less,less/close.less,less/modals.less,less/tooltip.less,less/popovers.less,less/carousel.less,less/mixins/clearfix.less,less/mixins/center-block.less,less/mixins/hide-text.less,less/responsive-utilities.less,less/mixins/responsive-visibility.less],names:[],mappings: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
[48/56] [abbrv] struts git commit: Update version used by bom
Update version used by bom Project: http://git-wip-us.apache.org/repos/asf/struts/repo Commit: http://git-wip-us.apache.org/repos/asf/struts/commit/8c222622 Tree: http://git-wip-us.apache.org/repos/asf/struts/tree/8c222622 Diff: http://git-wip-us.apache.org/repos/asf/struts/diff/8c222622 Branch: refs/heads/develop Commit: 8c222622e19e3a6bf441261db24be2e0fe4abb7c Parents: 70af4b6 Author: Lukasz Lenart lukaszlen...@apache.org Authored: Fri Nov 14 08:20:46 2014 +0100 Committer: Lukasz Lenart lukaszlen...@apache.org Committed: Fri Nov 14 08:20:46 2014 +0100 -- bom/pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) -- http://git-wip-us.apache.org/repos/asf/struts/blob/8c222622/bom/pom.xml -- diff --git a/bom/pom.xml b/bom/pom.xml index 3ede2ba..ec504d1 100644 --- a/bom/pom.xml +++ b/bom/pom.xml @@ -26,7 +26,7 @@ /licenses properties -struts-version.version2.3.18-SNAPSHOT/struts-version.version +struts-version.version2.3.19-SNAPSHOT/struts-version.version /properties dependencyManagement
[20/56] [abbrv] struts git commit: Adjust archetype to API changes of AngularJS version 1.2.x
Adjust archetype to API changes of AngularJS version 1.2.x
Project: http://git-wip-us.apache.org/repos/asf/struts/repo
Commit: http://git-wip-us.apache.org/repos/asf/struts/commit/a16cedb2
Tree: http://git-wip-us.apache.org/repos/asf/struts/tree/a16cedb2
Diff: http://git-wip-us.apache.org/repos/asf/struts/diff/a16cedb2
Branch: refs/heads/master
Commit: a16cedb26e0e0e1fd0ae02ae245f5854c8c0a7ac
Parents: 387f802
Author: Johannes Geppert joh...@gmail.com
Authored: Sun Aug 31 13:54:33 2014 +0200
Committer: Johannes Geppert joh...@gmail.com
Committed: Sun Aug 31 13:54:33 2014 +0200
--
.../src/main/webapp/WEB-INF/content/hello.jsp | 7 +++---
.../src/main/webapp/js/bootstrap.js | 25 ++--
.../src/main/webapp/js/controllers.js | 25 +---
3 files changed, 28 insertions(+), 29 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/struts/blob/a16cedb2/archetypes/struts2-archetype-angularjs/src/main/resources/archetype-resources/src/main/webapp/WEB-INF/content/hello.jsp
--
diff --git
a/archetypes/struts2-archetype-angularjs/src/main/resources/archetype-resources/src/main/webapp/WEB-INF/content/hello.jsp
b/archetypes/struts2-archetype-angularjs/src/main/resources/archetype-resources/src/main/webapp/WEB-INF/content/hello.jsp
index 70ca934..70cdb14 100644
---
a/archetypes/struts2-archetype-angularjs/src/main/resources/archetype-resources/src/main/webapp/WEB-INF/content/hello.jsp
+++
b/archetypes/struts2-archetype-angularjs/src/main/resources/archetype-resources/src/main/webapp/WEB-INF/content/hello.jsp
@@ -1,7 +1,7 @@
!DOCTYPE html
%@ page contentType=text/html; charset=UTF-8 %
%@ taglib prefix=s uri=/struts-tags %
-html lang=en ng-app=angularstruts
+html lang=en ng-app=angularStrutsApp
head
meta charset=utf-8
titleMy AngularJS Struts2 App/title
@@ -15,12 +15,13 @@
/div
div ng-controller=AppController
- div ng-view/div
+div ng-view/div
/div
script src=s:url value=js/lib/angular/angular.min.js //script
+script src=s:url value=js/lib/angular/angular-route.min.js //script
+script src=s:url value=js/bootstrap.js //script
script src=s:url value=js/directives.js //script
script src=s:url value=js/controllers.js //script
-script src=s:url value=js/bootstrap.js //script
/body
/html
http://git-wip-us.apache.org/repos/asf/struts/blob/a16cedb2/archetypes/struts2-archetype-angularjs/src/main/resources/archetype-resources/src/main/webapp/js/bootstrap.js
--
diff --git
a/archetypes/struts2-archetype-angularjs/src/main/resources/archetype-resources/src/main/webapp/js/bootstrap.js
b/archetypes/struts2-archetype-angularjs/src/main/resources/archetype-resources/src/main/webapp/js/bootstrap.js
index 4daa735..8983318 100644
---
a/archetypes/struts2-archetype-angularjs/src/main/resources/archetype-resources/src/main/webapp/js/bootstrap.js
+++
b/archetypes/struts2-archetype-angularjs/src/main/resources/archetype-resources/src/main/webapp/js/bootstrap.js
@@ -18,16 +18,17 @@
* specific language governing permissions and limitations
* under the License.
*/
-angular.module('angularstruts', [], function ($routeProvider) {
-$routeProvider.when('/projects', {
-templateUrl: '/partials/projects.html',
-controller: ApacheProjectsController
-}).when('/home', {
-templateUrl: '/partials/home.html',
-controller: HomeController
-}).otherwise({ redirectTo: '/home' });
-});
-angular.element(document).ready(function () {
-angular.bootstrap(document, ['angularstruts']);
-});
+var angularStrutsApp = angular.module('angularStrutsApp', ['ngRoute']);
+
+angularStrutsApp.config(['$routeProvider',
+function($routeProvider) {
+$routeProvider.when('/projects', {
+templateUrl: '/partials/projects.html',
+controller: 'ApacheProjectsController'
+}).when('/home', {
+templateUrl: '/partials/home.html',
+controller: 'HomeController'
+}).otherwise({ redirectTo: '/home' });
+}
+]);
http://git-wip-us.apache.org/repos/asf/struts/blob/a16cedb2/archetypes/struts2-archetype-angularjs/src/main/resources/archetype-resources/src/main/webapp/js/controllers.js
--
diff --git
a/archetypes/struts2-archetype-angularjs/src/main/resources/archetype-resources/src/main/webapp/js/controllers.js
b/archetypes/struts2-archetype-angularjs/src/main/resources/archetype-resources/src/main/webapp/js/controllers.js
index b6d698e..01afe21 100644
---
a/archetypes/struts2-archetype-angularjs/src/main/resources/archetype-resources/src/main/webapp/js/controllers.js
+++
[28/56] [abbrv] struts git commit: Switch to latest bootstrap version 3.2.0 in REST Showcase
Switch to latest bootstrap version 3.2.0 in REST Showcase
Project: http://git-wip-us.apache.org/repos/asf/struts/repo
Commit: http://git-wip-us.apache.org/repos/asf/struts/commit/3826c309
Tree: http://git-wip-us.apache.org/repos/asf/struts/tree/3826c309
Diff: http://git-wip-us.apache.org/repos/asf/struts/diff/3826c309
Branch: refs/heads/master
Commit: 3826c3098fe98448799a39713aea2d0400ad13a5
Parents: fbf4113
Author: Johannes Geppert joh...@gmail.com
Authored: Sun Aug 31 14:55:05 2014 +0200
Committer: Johannes Geppert joh...@gmail.com
Committed: Sun Aug 31 14:55:05 2014 +0200
--
.../WEB-INF/content/orders-deleteConfirm.jsp| 25 +-
.../main/webapp/WEB-INF/content/orders-edit.jsp | 57 +-
.../webapp/WEB-INF/content/orders-editNew.jsp | 49 +-
.../webapp/WEB-INF/content/orders-index.jsp | 31 +-
.../main/webapp/WEB-INF/content/orders-show.jsp | 25 +-
.../main/webapp/css/bootstrap-responsive.css| 1058 --
.../webapp/css/bootstrap-responsive.min.css |9 -
.../src/main/webapp/css/bootstrap-theme.css | 442 +
.../src/main/webapp/css/bootstrap-theme.css.map |1 +
.../src/main/webapp/css/bootstrap-theme.min.css |5 +
.../src/main/webapp/css/bootstrap.css | 9865 +-
.../src/main/webapp/css/bootstrap.css.map |1 +
.../src/main/webapp/css/bootstrap.min.css | 12 +-
.../fonts/glyphicons-halflings-regular.eot | Bin 0 - 20335 bytes
.../fonts/glyphicons-halflings-regular.svg | 229 +
.../fonts/glyphicons-halflings-regular.ttf | Bin 0 - 41280 bytes
.../fonts/glyphicons-halflings-regular.woff | Bin 0 - 23320 bytes
.../webapp/img/glyphicons-halflings-white.png | Bin 8777 - 0 bytes
.../main/webapp/img/glyphicons-halflings.png| Bin 12799 - 0 bytes
19 files changed, 5942 insertions(+), 5867 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/struts/blob/3826c309/apps/rest-showcase/src/main/webapp/WEB-INF/content/orders-deleteConfirm.jsp
--
diff --git
a/apps/rest-showcase/src/main/webapp/WEB-INF/content/orders-deleteConfirm.jsp
b/apps/rest-showcase/src/main/webapp/WEB-INF/content/orders-deleteConfirm.jsp
index 021fa92..4ca2487 100644
---
a/apps/rest-showcase/src/main/webapp/WEB-INF/content/orders-deleteConfirm.jsp
+++
b/apps/rest-showcase/src/main/webapp/WEB-INF/content/orders-deleteConfirm.jsp
@@ -4,14 +4,21 @@
html lang=en
head
meta charset=utf-8
-titleOrder ${id}/title
-link href=${pageContext.request.contextPath}/css/bootstrap.css
rel=stylesheet
-link
href=${pageContext.request.contextPath}/css/bootstrap-responsive.css
rel=stylesheet
+meta http-equiv=X-UA-Compatible content=IE=edge
+meta name=viewport content=width=device-width, initial-scale=1
+titleOrders/title
+link href=${pageContext.request.contextPath}/css/bootstrap.min.css
rel=stylesheet
+!-- HTML5 Shim and Respond.js IE8 support of HTML5 elements and media
queries --
+!-- WARNING: Respond.js doesn't work if you view the page via file:// --
+!--[if lt IE 9]
+script
src=https://oss.maxcdn.com/html5shiv/3.7.2/html5shiv.min.js;/script
+script src=https://oss.maxcdn.com/respond/1.4.2/respond.min.js;/script
+![endif]--
/head
body
div class=container-fluid
-div class=row-fluid
-div class=span12
+div class=row
+div class=col-md-12
div class=page-header
h1Delete Order ${id}/h1
@@ -28,11 +35,11 @@
/form
br /
a href=${pageContext.request.contextPath}/orders class=btn
btn-info
- i class=icon icon-arrow-left/i Back to Orders
+ span class=glyphicon glyphicon-arrow-left/span Back
to Orders
/a
-/div!--/row--
-/div!--/span--
-/div!--/row--
+/div!--/col-md-12---
+/div!--/row--
+/div!--/container--
/body
/html
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/struts/blob/3826c309/apps/rest-showcase/src/main/webapp/WEB-INF/content/orders-edit.jsp
--
diff --git a/apps/rest-showcase/src/main/webapp/WEB-INF/content/orders-edit.jsp
b/apps/rest-showcase/src/main/webapp/WEB-INF/content/orders-edit.jsp
index 3ee4e9a..7036f6d 100644
--- a/apps/rest-showcase/src/main/webapp/WEB-INF/content/orders-edit.jsp
+++ b/apps/rest-showcase/src/main/webapp/WEB-INF/content/orders-edit.jsp
@@ -4,52 +4,61 @@
html lang=en
head
meta charset=utf-8
-titleOrder s:property value=id //title
-link href=${pageContext.request.contextPath}/css/bootstrap.css
rel=stylesheet
-link
href=${pageContext.request.contextPath}/css/bootstrap-responsive.css
rel=stylesheet
+meta http-equiv=X-UA-Compatible content=IE=edge
+
[35/56] [abbrv] struts git commit: Adds parent pom to use common DM settings
Adds parent pom to use common DM settings
Project: http://git-wip-us.apache.org/repos/asf/struts/repo
Commit: http://git-wip-us.apache.org/repos/asf/struts/commit/bc78860e
Tree: http://git-wip-us.apache.org/repos/asf/struts/tree/bc78860e
Diff: http://git-wip-us.apache.org/repos/asf/struts/diff/bc78860e
Branch: refs/heads/master
Commit: bc78860efb8f937fc90e6d869d9edc6ca27ca437
Parents: 87c204e
Author: Lukasz Lenart lukaszlen...@apache.org
Authored: Sun Sep 21 12:50:30 2014 +0200
Committer: Lukasz Lenart lukaszlen...@apache.org
Committed: Mon Sep 22 08:43:55 2014 +0200
--
bom/pom.xml | 7 ++-
1 file changed, 6 insertions(+), 1 deletion(-)
--
http://git-wip-us.apache.org/repos/asf/struts/blob/bc78860e/bom/pom.xml
--
diff --git a/bom/pom.xml b/bom/pom.xml
index b2f3e43..3ede2ba 100644
--- a/bom/pom.xml
+++ b/bom/pom.xml
@@ -4,7 +4,12 @@
xmlns:xsi=http://www.w3.org/2001/XMLSchema-instance;
modelVersion4.0.0/modelVersion
-groupIdorg.apache.struts/groupId
+parent
+groupIdorg.apache.struts/groupId
+artifactIdstruts-master/artifactId
+version9/version
+/parent
+
artifactIdstruts2-bom/artifactId
version${struts-version.version}/version
packagingpom/packaging
[46/56] [abbrv] struts git commit: Prepares for next development cycle
Prepares for next development cycle Project: http://git-wip-us.apache.org/repos/asf/struts/repo Commit: http://git-wip-us.apache.org/repos/asf/struts/commit/70af4b64 Tree: http://git-wip-us.apache.org/repos/asf/struts/tree/70af4b64 Diff: http://git-wip-us.apache.org/repos/asf/struts/diff/70af4b64 Branch: refs/heads/master Commit: 70af4b649ad87061dde4a8243212ca83b768d04d Parents: 266f83f Author: Lukasz Lenart lukaszlen...@apache.org Authored: Fri Nov 14 08:17:15 2014 +0100 Committer: Lukasz Lenart lukaszlen...@apache.org Committed: Fri Nov 14 08:17:15 2014 +0100 -- apps/blank/pom.xml | 2 +- apps/jboss-blank/pom.xml| 2 +- apps/mailreader/pom.xml | 2 +- apps/pom.xml| 2 +- apps/portlet/pom.xml| 2 +- apps/rest-showcase/pom.xml | 4 ++-- apps/showcase/pom.xml | 2 +- archetypes/pom.xml | 2 +- archetypes/struts2-archetype-angularjs/pom.xml | 2 +- archetypes/struts2-archetype-blank/pom.xml | 2 +- archetypes/struts2-archetype-convention/pom.xml | 2 +- archetypes/struts2-archetype-dbportlet/pom.xml | 2 +- archetypes/struts2-archetype-plugin/pom.xml | 2 +- archetypes/struts2-archetype-portlet/pom.xml| 2 +- archetypes/struts2-archetype-starter/pom.xml| 2 +- assembly/pom.xml| 2 +- bundles/admin/pom.xml | 2 +- bundles/demo/pom.xml| 2 +- bundles/pom.xml | 2 +- core/pom.xml| 2 +- plugins/cdi/pom.xml | 2 +- plugins/codebehind/pom.xml | 2 +- plugins/config-browser/pom.xml | 2 +- plugins/convention/pom.xml | 2 +- plugins/dojo/pom.xml| 2 +- plugins/dwr/pom.xml | 2 +- plugins/embeddedjsp/pom.xml | 2 +- plugins/gxp/pom.xml | 2 +- plugins/jasperreports/pom.xml | 2 +- plugins/javatemplates/pom.xml | 2 +- plugins/jfreechart/pom.xml | 2 +- plugins/jsf/pom.xml | 2 +- plugins/json/pom.xml| 2 +- plugins/junit/pom.xml | 2 +- plugins/osgi/pom.xml| 2 +- plugins/oval/pom.xml| 2 +- plugins/pell-multipart/pom.xml | 2 +- plugins/plexus/pom.xml | 2 +- plugins/pom.xml | 2 +- plugins/portlet-tiles/pom.xml | 2 +- plugins/portlet/pom.xml | 2 +- plugins/rest/pom.xml| 2 +- plugins/sitegraph/pom.xml | 2 +- plugins/sitemesh/pom.xml| 2 +- plugins/spring/pom.xml | 2 +- plugins/struts1/pom.xml | 2 +- plugins/testng/pom.xml | 2 +- plugins/tiles/pom.xml | 2 +- plugins/tiles3/pom.xml | 2 +- pom.xml | 2 +- xwork-core/pom.xml | 2 +- 51 files changed, 52 insertions(+), 52 deletions(-) -- http://git-wip-us.apache.org/repos/asf/struts/blob/70af4b64/apps/blank/pom.xml -- diff --git a/apps/blank/pom.xml b/apps/blank/pom.xml index 83bec60..943303f 100644 --- a/apps/blank/pom.xml +++ b/apps/blank/pom.xml @@ -26,7 +26,7 @@ parent groupIdorg.apache.struts/groupId artifactIdstruts2-apps/artifactId -version2.3.18-SNAPSHOT/version +version2.3.19-SNAPSHOT/version /parent artifactIdstruts2-blank/artifactId http://git-wip-us.apache.org/repos/asf/struts/blob/70af4b64/apps/jboss-blank/pom.xml -- diff --git a/apps/jboss-blank/pom.xml b/apps/jboss-blank/pom.xml index 3335999..e808b21 100644 --- a/apps/jboss-blank/pom.xml +++ b/apps/jboss-blank/pom.xml @@ -26,7 +26,7 @@ parent groupIdorg.apache.struts/groupId artifactIdstruts2-apps/artifactId -version2.3.18-SNAPSHOT/version +version2.3.19-SNAPSHOT/version /parent artifactIdstruts2-jboss-blank/artifactId http://git-wip-us.apache.org/repos/asf/struts/blob/70af4b64/apps/mailreader/pom.xml -- diff --git a/apps/mailreader/pom.xml b/apps/mailreader/pom.xml index 7275fdf..14c6895 100644 ---
[26/56] [abbrv] struts git commit: Switch to latest bootstrap version 3.2.0 in REST Showcase
http://git-wip-us.apache.org/repos/asf/struts/blob/3826c309/apps/rest-showcase/src/main/webapp/css/bootstrap.css
--
diff --git a/apps/rest-showcase/src/main/webapp/css/bootstrap.css
b/apps/rest-showcase/src/main/webapp/css/bootstrap.css
index 9fa6f76..037dd05 100644
--- a/apps/rest-showcase/src/main/webapp/css/bootstrap.css
+++ b/apps/rest-showcase/src/main/webapp/css/bootstrap.css
@@ -1,13 +1,18 @@
/*!
- * Bootstrap v2.1.1
- *
- * Copyright 2012 Twitter, Inc
- * Licensed under the Apache License v2.0
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Designed and built with all the love in the world @twitter by @mdo and @fat.
+ * Bootstrap v3.2.0 (http://getbootstrap.com)
+ * Copyright 2011-2014 Twitter, Inc.
+ * Licensed under MIT (https://github.com/twbs/bootstrap/blob/master/LICENSE)
*/
+/*! normalize.css v3.0.1 | MIT License | git.io/normalize */
+html {
+ font-family: sans-serif;
+ -webkit-text-size-adjust: 100%;
+ -ms-text-size-adjust: 100%;
+}
+body {
+ margin: 0;
+}
article,
aside,
details,
@@ -16,40 +21,55 @@ figure,
footer,
header,
hgroup,
+main,
nav,
-section {
+section,
+summary {
display: block;
}
-
audio,
canvas,
+progress,
video {
display: inline-block;
- *display: inline;
- *zoom: 1;
+ vertical-align: baseline;
}
-
audio:not([controls]) {
display: none;
+ height: 0;
}
-
-html {
- font-size: 100%;
- -webkit-text-size-adjust: 100%;
- -ms-text-size-adjust: 100%;
+[hidden],
+template {
+ display: none;
}
-
-a:focus {
- outline: thin dotted #333;
- outline: 5px auto -webkit-focus-ring-color;
- outline-offset: -2px;
+a {
+ background: transparent;
}
-
-a:hover,
-a:active {
+a:active,
+a:hover {
outline: 0;
}
-
+abbr[title] {
+ border-bottom: 1px dotted;
+}
+b,
+strong {
+ font-weight: bold;
+}
+dfn {
+ font-style: italic;
+}
+h1 {
+ margin: .67em 0;
+ font-size: 2em;
+}
+mark {
+ color: #000;
+ background: #ff0;
+}
+small {
+ font-size: 80%;
+}
sub,
sup {
position: relative;
@@ -57,2713 +77,3054 @@ sup {
line-height: 0;
vertical-align: baseline;
}
-
sup {
- top: -0.5em;
+ top: -.5em;
}
-
sub {
- bottom: -0.25em;
+ bottom: -.25em;
}
-
img {
- width: auto\9;
- height: auto;
- max-width: 100%;
- vertical-align: middle;
border: 0;
- -ms-interpolation-mode: bicubic;
}
-
-#map_canvas img {
- max-width: none;
+svg:not(:root) {
+ overflow: hidden;
+}
+figure {
+ margin: 1em 40px;
+}
+hr {
+ height: 0;
+ -webkit-box-sizing: content-box;
+ -moz-box-sizing: content-box;
+ box-sizing: content-box;
+}
+pre {
+ overflow: auto;
+}
+code,
+kbd,
+pre,
+samp {
+ font-family: monospace, monospace;
+ font-size: 1em;
}
-
button,
input,
+optgroup,
select,
textarea {
margin: 0;
- font-size: 100%;
- vertical-align: middle;
+ font: inherit;
+ color: inherit;
+}
+button {
+ overflow: visible;
}
-
button,
-input {
- *overflow: visible;
- line-height: normal;
+select {
+ text-transform: none;
+}
+button,
+html input[type=button],
+input[type=reset],
+input[type=submit] {
+ -webkit-appearance: button;
+ cursor: pointer;
+}
+button[disabled],
+html input[disabled] {
+ cursor: default;
}
-
button::-moz-focus-inner,
input::-moz-focus-inner {
padding: 0;
border: 0;
}
-
-button,
-input[type=button],
-input[type=reset],
-input[type=submit] {
- cursor: pointer;
- -webkit-appearance: button;
+input {
+ line-height: normal;
+}
+input[type=checkbox],
+input[type=radio] {
+ -webkit-box-sizing: border-box;
+ -moz-box-sizing: border-box;
+ box-sizing: border-box;
+ padding: 0;
+}
+input[type=number]::-webkit-inner-spin-button,
+input[type=number]::-webkit-outer-spin-button {
+ height: auto;
}
-
input[type=search] {
-webkit-box-sizing: content-box;
-moz-box-sizing: content-box;
box-sizing: content-box;
-webkit-appearance: textfield;
}
-
-input[type=search]::-webkit-search-decoration,
-input[type=search]::-webkit-search-cancel-button {
+input[type=search]::-webkit-search-cancel-button,
+input[type=search]::-webkit-search-decoration {
-webkit-appearance: none;
}
-
+fieldset {
+ padding: .35em .625em .75em;
+ margin: 0 2px;
+ border: 1px solid #c0c0c0;
+}
+legend {
+ padding: 0;
+ border: 0;
+}
textarea {
overflow: auto;
- vertical-align: top;
}
-
-.clearfix {
- *zoom: 1;
+optgroup {
+ font-weight: bold;
}
-
-.clearfix:before,
-.clearfix:after {
- display: table;
- line-height: 0;
- content: ;
+table {
+ border-spacing: 0;
+ border-collapse: collapse;
}
-
-.clearfix:after {
- clear: both;
+td,
+th {
+ padding: 0;
}
+@media print {
+ * {
+color: #000 !important;
+text-shadow: none !important;
+background: transparent !important;
+-webkit-box-shadow: none !important;
+box-shadow: none !important;
+ }
+ a,
+ a:visited {
+text-decoration: underline;
+ }
+ a[href]:after {
+content: ( attr(href) );
+ }
+
[31/56] [abbrv] struts git commit: WW-4347 Adds support for JDK8 lambdas
WW-4347 Adds support for JDK8 lambdas
Project: http://git-wip-us.apache.org/repos/asf/struts/repo
Commit: http://git-wip-us.apache.org/repos/asf/struts/commit/e0110969
Tree: http://git-wip-us.apache.org/repos/asf/struts/tree/e0110969
Diff: http://git-wip-us.apache.org/repos/asf/struts/diff/e0110969
Branch: refs/heads/master
Commit: e01109697f877890b4538d6d540463341fbcbac5
Parents: 63fa04e
Author: Lukasz Lenart lukaszlen...@apache.org
Authored: Tue Sep 16 09:37:37 2014 +0200
Committer: Lukasz Lenart lukaszlen...@apache.org
Committed: Tue Sep 16 09:37:37 2014 +0200
--
pom.xml | 6 +--
xwork-core/pom.xml | 4 +-
.../xwork2/util/finder/ClassFinder.java | 42 +++-
3 files changed, 38 insertions(+), 14 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/struts/blob/e0110969/pom.xml
--
diff --git a/pom.xml b/pom.xml
index 9a20885..a3fbae5 100644
--- a/pom.xml
+++ b/pom.xml
@@ -86,7 +86,7 @@
currentVersion${project.version}/currentVersion
struts2.springPlatformVersion3.0.5.RELEASE/struts2.springPlatformVersion
ognl.version3.0.6/ognl.version
-asm.version3.3/asm.version
+asm.version5.0.2/asm.version
tiles.version2.0.6/tiles.version
!-- SCM Site Configuration --
@@ -564,12 +564,12 @@
version${ognl.version}/version
/dependency
dependency
-groupIdasm/groupId
+groupIdorg.ow2.asm/groupId
artifactIdasm/artifactId
version${asm.version}/version
/dependency
dependency
-groupIdasm/groupId
+groupIdorg.ow2.asm/groupId
artifactIdasm-commons/artifactId
version${asm.version}/version
/dependency
http://git-wip-us.apache.org/repos/asf/struts/blob/e0110969/xwork-core/pom.xml
--
diff --git a/xwork-core/pom.xml b/xwork-core/pom.xml
index d8fdc46..86bb0c1 100644
--- a/xwork-core/pom.xml
+++ b/xwork-core/pom.xml
@@ -126,11 +126,11 @@
artifactIdognl/artifactId
/dependency
dependency
-groupIdasm/groupId
+groupIdorg.ow2.asm/groupId
artifactIdasm/artifactId
/dependency
dependency
-groupIdasm/groupId
+groupIdorg.ow2.asm/groupId
artifactIdasm-commons/artifactId
/dependency
dependency
http://git-wip-us.apache.org/repos/asf/struts/blob/e0110969/xwork-core/src/main/java/com/opensymphony/xwork2/util/finder/ClassFinder.java
--
diff --git
a/xwork-core/src/main/java/com/opensymphony/xwork2/util/finder/ClassFinder.java
b/xwork-core/src/main/java/com/opensymphony/xwork2/util/finder/ClassFinder.java
index 986d89f..f337eb9 100644
---
a/xwork-core/src/main/java/com/opensymphony/xwork2/util/finder/ClassFinder.java
+++
b/xwork-core/src/main/java/com/opensymphony/xwork2/util/finder/ClassFinder.java
@@ -26,7 +26,8 @@ import org.objectweb.asm.AnnotationVisitor;
import org.objectweb.asm.ClassReader;
import org.objectweb.asm.FieldVisitor;
import org.objectweb.asm.MethodVisitor;
-import org.objectweb.asm.commons.EmptyVisitor;
+import org.objectweb.asm.ClassVisitor;
+import org.objectweb.asm.Opcodes;
import java.io.File;
import java.io.IOException;
@@ -714,7 +715,7 @@ public class ClassFinder {
InputStream in = resource.openStream();
try {
ClassReader classReader = new ClassReader(in);
-classReader.accept(new InfoBuildingVisitor(),
ClassReader.SKIP_DEBUG);
+classReader.accept(new InfoBuildingClassVisitor(),
ClassReader.SKIP_DEBUG);
} finally {
in.close();
}
@@ -727,13 +728,15 @@ public class ClassFinder {
}
-public class InfoBuildingVisitor extends EmptyVisitor {
+public class InfoBuildingClassVisitor extends ClassVisitor {
private Info info;
-public InfoBuildingVisitor() {
+public InfoBuildingClassVisitor() {
+super(Opcodes.ASM5);
}
-public InfoBuildingVisitor(Info info) {
+public InfoBuildingClassVisitor(Info info) {
+this();
this.info = info;
}
@@ -785,7 +788,7 @@ public class ClassFinder {
AnnotationInfo annotationInfo = new AnnotationInfo(desc);
info.getAnnotations().add(annotationInfo);
getAnnotationInfos(annotationInfo.getName()).add(info);
-return new
[24/56] [abbrv] struts git commit: Switch to latest bootstrap version 3.2.0 in REST Showcase
http://git-wip-us.apache.org/repos/asf/struts/blob/3826c309/apps/rest-showcase/src/main/webapp/css/bootstrap.min.css
--
diff --git a/apps/rest-showcase/src/main/webapp/css/bootstrap.min.css
b/apps/rest-showcase/src/main/webapp/css/bootstrap.min.css
index 31d8b96..a9f35ce 100644
--- a/apps/rest-showcase/src/main/webapp/css/bootstrap.min.css
+++ b/apps/rest-showcase/src/main/webapp/css/bootstrap.min.css
@@ -1,9 +1,5 @@
/*!
- * Bootstrap v2.1.1
- *
- * Copyright 2012 Twitter, Inc
- * Licensed under the Apache License v2.0
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Designed and built with all the love in the world @twitter by @mdo and @fat.
-
*/article,aside,details,figcaption,figure,footer,header,hgroup,nav,section{display:block}audio,canvas,video{display:inline-block;*display:inline;*zoom:1}audio:not([controls]){display:none}html{font-size:100%;-webkit-text-size-adjust:100%;-ms-text-size-adjust:100%}a:focus{outline:thin
dotted #333;outline:5px auto
-webkit-focus-ring-color;outline-offset:-2px}a:hover,a:active{outline:0}sub,sup{position:relative;font-size:75%;line-height:0;vertical-align:baseline}sup{top:-0.5em}sub{bottom:-0.25em}img{width:auto\9;height:auto;max-width:100%;vertical-align:middle;border:0;-ms-interpolation-mode:bicubic}#map_canvas
img{max-width:none}button,input,select,textarea{margin:0;font-size:100%;vertical-align:middle}button,input{*overflow:visible;line-height:normal}button::-moz-focus-inner,input::-moz-focus-inner{padding:0;border:0}button,input[type=button],input[type=reset],input[type=submit]{cursor:pointer;-webkit-appearance:button}input[type=search]{-webkit-box-sizing:content-box;-moz-b
ox-sizing:content-box;box-sizing:content-box;-webkit-appearance:textfield}input[type=search]::-webkit-search-decoration,input[type=search]::-webkit-search-cancel-button{-webkit-appearance:none}textarea{overflow:auto;vertical-align:top}.clearfix{*zoom:1}.clearfix:before,.clearfix:after{display:table;line-height:0;content:}.clearfix:after{clear:both}.hide-text{font:0/0
a;color:transparent;text-shadow:none;background-color:transparent;border:0}.input-block-level{display:block;width:100%;min-height:30px;-webkit-box-sizing:border-box;-moz-box-sizing:border-box;box-sizing:border-box}body{margin:0;font-family:Helvetica
Neue,Helvetica,Arial,sans-serif;font-size:14px;line-height:20px;color:#333;background-color:#fff}a{color:#08c;text-decoration:none}a:hover{color:#005580;text-decoration:underline}.img-rounded{-webkit-border-radius:6px;-moz-border-radius:6px;border-radius:6px}.img-polaroid{padding:4px;background-color:#fff;border:1px
solid #ccc;border:1px solid rgba(0,0,0,0.2);-webkit
-box-shadow:0 1px 3px rgba(0,0,0,0.1);-moz-box-shadow:0 1px 3px
rgba(0,0,0,0.1);box-shadow:0 1px 3px
rgba(0,0,0,0.1)}.img-circle{-webkit-border-radius:500px;-moz-border-radius:500px;border-radius:500px}.row{margin-left:-20px;*zoom:1}.row:before,.row:after{display:table;line-height:0;content:}.row:after{clear:both}[class*=span]{float:left;min-height:1px;margin-left:20px}.container,.navbar-static-top
.container,.navbar-fixed-top .container,.navbar-fixed-bottom
.container{width:940px}.span12{width:940px}.span11{width:860px}.span10{width:780px}.span9{width:700px}.span8{width:620px}.span7{width:540px}.span6{width:460px}.span5{width:380px}.span4{width:300px}.span3{width:220px}.span2{width:140px}.span1{width:60px}.offset12{margin-left:980px}.offset11{margin-left:900px}.offset10{margin-left:820px}.offset9{margin-left:740px}.offset8{margin-left:660px}.offset7{margin-left:580px}.offset6{margin-left:500px}.offset5{margin-left:420px}.offset4{margin-left:340px}.offset3{margin-left:260px}.off
set2{margin-left:180px}.offset1{margin-left:100px}.row-fluid{width:100%;*zoom:1}.row-fluid:before,.row-fluid:after{display:table;line-height:0;content:}.row-fluid:after{clear:both}.row-fluid
[class*=span]{display:block;float:left;width:100%;min-height:30px;margin-left:2.127659574468085%;*margin-left:2.074468085106383%;-webkit-box-sizing:border-box;-moz-box-sizing:border-box;box-sizing:border-box}.row-fluid
[class*=span]:first-child{margin-left:0}.row-fluid
.span12{width:100%;*width:99.94680851063829%}.row-fluid
.span11{width:91.48936170212765%;*width:91.43617021276594%}.row-fluid
.span10{width:82.97872340425532%;*width:82.92553191489361%}.row-fluid
.span9{width:74.46808510638297%;*width:74.41489361702126%}.row-fluid
.span8{width:65.95744680851064%;*width:65.90425531914893%}.row-fluid
.span7{width:57.44680851063829%;*width:57.39361702127659%}.row-fluid
.span6{width:48.93617021276595%;*width:48.88297872340425%}.row-fluid
.span5{width:40.42553191489362%;*width:40.37234042553192%}
.row-fluid
.span4{width:31.914893617021278%;*width:31.861702127659576%}.row-fluid
.span3{width:23.404255319148934%;*width:23.351063829787233%}.row-fluid
.span2{width:14.893617021276595%;*width:14.840425531914894%}.row-fluid
[30/56] [abbrv] struts git commit: WW-4345 Reverts the commit 8aa4fe860693d29e5ef94026bf2a7532ed74b9ea
WW-4345 Reverts the commit 8aa4fe860693d29e5ef94026bf2a7532ed74b9ea
Project: http://git-wip-us.apache.org/repos/asf/struts/repo
Commit: http://git-wip-us.apache.org/repos/asf/struts/commit/63fa04e8
Tree: http://git-wip-us.apache.org/repos/asf/struts/tree/63fa04e8
Diff: http://git-wip-us.apache.org/repos/asf/struts/diff/63fa04e8
Branch: refs/heads/master
Commit: 63fa04e8146ec02fc256fa35a93454482254dcef
Parents: f49b084
Author: Lukasz Lenart lukaszlen...@apache.org
Authored: Tue Sep 16 08:51:16 2014 +0200
Committer: Lukasz Lenart lukaszlen...@apache.org
Committed: Tue Sep 16 08:51:16 2014 +0200
--
.../apache/struts2/dispatcher/Dispatcher.java | 21 ++--
1 file changed, 2 insertions(+), 19 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/struts/blob/63fa04e8/core/src/main/java/org/apache/struts2/dispatcher/Dispatcher.java
--
diff --git a/core/src/main/java/org/apache/struts2/dispatcher/Dispatcher.java
b/core/src/main/java/org/apache/struts2/dispatcher/Dispatcher.java
index 436490e..c18d055 100644
--- a/core/src/main/java/org/apache/struts2/dispatcher/Dispatcher.java
+++ b/core/src/main/java/org/apache/struts2/dispatcher/Dispatcher.java
@@ -79,8 +79,6 @@ public class Dispatcher {
*/
private static final Logger LOG =
LoggerFactory.getLogger(Dispatcher.class);
-public static final String MULTIPART_FORM_DATA = multipart/form-data;
-
/**
* Provide a thread local instance.
*/
@@ -630,7 +628,7 @@ public class Dispatcher {
Map requestMap = new RequestMap(request);
// parameters map wrapping the http parameters. ActionMapping
parameters are now handled and applied separately
-Map params = prepareParametersMap(request);
+Map params = new HashMap(request.getParameterMap());
// session map wrapping the http session
Map session = new SessionMap(request);
@@ -647,21 +645,6 @@ public class Dispatcher {
}
/**
- * Copies or creates new map to hold request parameters,
- * there is a special treatment when uploading a file see WW-4345
- */
-protected Map prepareParametersMap(HttpServletRequest request) {
-Map params;
-String contentType = request.getContentType();
-if (contentType != null contentType.contains(MULTIPART_FORM_DATA)) {
- params = new HashMap();
- } else {
- params = new HashMap(request.getParameterMap());
- }
-return params;
-}
-
-/**
* @deprecated use version without ServletContext param
*/
@Deprecated
@@ -849,7 +832,7 @@ public class Dispatcher {
}
String content_type = request.getContentType();
-if (content_type != null
content_type.contains(MULTIPART_FORM_DATA)) {
+if (content_type != null
content_type.contains(multipart/form-data)) {
MultiPartRequest mpr = getMultiPartRequest();
LocaleProvider provider =
getContainer().getInstance(LocaleProvider.class);
request = new MultiPartRequestWrapper(mpr, request, getSaveDir(),
provider);
[32/56] [abbrv] struts git commit: WW-4365 Solves problem with matching option id to headerKey
WW-4365 Solves problem with matching option id to headerKey
Project: http://git-wip-us.apache.org/repos/asf/struts/repo
Commit: http://git-wip-us.apache.org/repos/asf/struts/commit/3447eefd
Tree: http://git-wip-us.apache.org/repos/asf/struts/tree/3447eefd
Diff: http://git-wip-us.apache.org/repos/asf/struts/diff/3447eefd
Branch: refs/heads/master
Commit: 3447eefdac3972d77fb3343ea31c9d61754da285
Parents: e011096
Author: Lukasz Lenart lukaszlen...@apache.org
Authored: Tue Sep 16 21:23:37 2014 +0200
Committer: Lukasz Lenart lukaszlen...@apache.org
Committed: Tue Sep 16 21:23:37 2014 +0200
--
.../resources/org/apache/struts2/static/optiontransferselect.js| 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
--
http://git-wip-us.apache.org/repos/asf/struts/blob/3447eefd/core/src/main/resources/org/apache/struts2/static/optiontransferselect.js
--
diff --git
a/core/src/main/resources/org/apache/struts2/static/optiontransferselect.js
b/core/src/main/resources/org/apache/struts2/static/optiontransferselect.js
index 74e27d6..c4024a3 100644
--- a/core/src/main/resources/org/apache/struts2/static/optiontransferselect.js
+++ b/core/src/main/resources/org/apache/struts2/static/optiontransferselect.js
@@ -44,7 +44,7 @@ function compile(ptn) {
if (ptn == '' || !window.RegExp) {
return function(val) { return val == ptn; }
} else {
-var reg = new RegExp(ptn);
+var reg = new RegExp(\\b + ptn);
return function (val) {
if (val == '') { // ignore empty option added by template
return true;
[13/56] [abbrv] struts git commit: Upgrade AngularJS to latest stable AngularJS version 1.2.23
http://git-wip-us.apache.org/repos/asf/struts/blob/810711cc/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
index 2626caa..1266950 100644
---
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
@@ -1,13 +1,14 @@
/**
- * @license AngularJS v1.0.8
- * (c) 2010-2012 Google, Inc. http://angularjs.org
+ * @license AngularJS v1.2.23
+ * (c) 2010-2014 Google, Inc. http://angularjs.org
* License: MIT
- *
- * TODO(vojta): wrap whole file into closure during build
*/
+(function(window, angular, undefined) {
+
+'use strict';
/**
- * @ngdoc overview
+ * @ngdoc object
* @name angular.mock
* @description
*
@@ -18,7 +19,7 @@ angular.mock = {};
/**
* ! This is a private undocumented service !
*
- * @name ngMock.$browser
+ * @name $browser
*
* @description
* This service is a mock implementation of {@link ng.$browser}. It provides
fake
@@ -75,6 +76,12 @@ angular.mock.$Browser = function() {
};
+ /**
+ * @name $browser#defer.now
+ *
+ * @description
+ * Current milliseconds mock time.
+ */
self.defer.now = 0;
@@ -95,8 +102,7 @@ angular.mock.$Browser = function() {
/**
- * @name ngMock.$browser#defer.flush
- * @methodOf ngMock.$browser
+ * @name $browser#defer.flush
*
* @description
* Flushes all pending requests and executes the defer callbacks.
@@ -110,7 +116,7 @@ angular.mock.$Browser = function() {
if (self.deferredFns.length) {
self.defer.now = self.deferredFns[self.deferredFns.length-1].time;
} else {
-throw Error('No deferred tasks to be flushed');
+throw new Error('No deferred tasks to be flushed');
}
}
@@ -118,13 +124,6 @@ angular.mock.$Browser = function() {
self.deferredFns.shift().fn();
}
};
- /**
- * @name ngMock.$browser#defer.now
- * @propertyOf ngMock.$browser
- *
- * @description
- * Current milliseconds mock time.
- */
self.$$baseHref = '';
self.baseHref = function() {
@@ -134,8 +133,7 @@ angular.mock.$Browser = function() {
angular.mock.$Browser.prototype = {
/**
- * @name ngMock.$browser#poll
- * @methodOf ngMock.$browser
+ * @name $browser#poll
*
* @description
* run all fns in pollFns
@@ -162,7 +160,7 @@ angular.mock.$Browser.prototype = {
cookies: function(name, value) {
if (name) {
- if (value == undefined) {
+ if (angular.isUndefined(value)) {
delete this.cookieHash[name];
} else {
if (angular.isString(value)//strings only
@@ -186,17 +184,17 @@ angular.mock.$Browser.prototype = {
/**
- * @ngdoc object
- * @name ngMock.$exceptionHandlerProvider
+ * @ngdoc provider
+ * @name $exceptionHandlerProvider
*
* @description
- * Configures the mock implementation of {@link ng.$exceptionHandler} to
rethrow or to log errors passed
- * into the `$exceptionHandler`.
+ * Configures the mock implementation of {@link ng.$exceptionHandler} to
rethrow or to log errors
+ * passed into the `$exceptionHandler`.
*/
/**
- * @ngdoc object
- * @name ngMock.$exceptionHandler
+ * @ngdoc service
+ * @name $exceptionHandler
*
* @description
* Mock implementation of {@link ng.$exceptionHandler} that rethrows or logs
errors passed
@@ -204,7 +202,7 @@ angular.mock.$Browser.prototype = {
* information.
*
*
- * pre
+ * ```js
* describe('$exceptionHandlerProvider', function() {
*
* it('should capture log messages and exceptions', function() {
@@ -225,7 +223,7 @@ angular.mock.$Browser.prototype = {
* });
* });
* });
- * /pre
+ * ```
*/
angular.mock.$ExceptionHandlerProvider = function() {
@@ -233,8 +231,7 @@ angular.mock.$ExceptionHandlerProvider = function() {
/**
* @ngdoc method
- * @name ngMock.$exceptionHandlerProvider#mode
- * @methodOf ngMock.$exceptionHandlerProvider
+ * @name $exceptionHandlerProvider#mode
*
* @description
* Sets the logging mode.
@@ -244,10 +241,10 @@ angular.mock.$ExceptionHandlerProvider = function() {
* - `rethrow`: If any errors are passed into the handler in tests, it
typically
*means that there is a bug in the application or test, so
this mock will
*make these tests fail.
- * - `log`: Sometimes it is desirable to test that an error is thrown, for
this case the `log` mode stores an
- *array of errors in
[33/56] [abbrv] struts git commit: Solves minor style problems
Solves minor style problems
Project: http://git-wip-us.apache.org/repos/asf/struts/repo
Commit: http://git-wip-us.apache.org/repos/asf/struts/commit/d2b22b91
Tree: http://git-wip-us.apache.org/repos/asf/struts/tree/d2b22b91
Diff: http://git-wip-us.apache.org/repos/asf/struts/diff/d2b22b91
Branch: refs/heads/master
Commit: d2b22b9132cb8d34cd9ad66e5e168cf9f262bfcd
Parents: 3447eef
Author: Lukasz Lenart lukaszlen...@apache.org
Authored: Tue Sep 16 21:25:26 2014 +0200
Committer: Lukasz Lenart lukaszlen...@apache.org
Committed: Tue Sep 16 21:25:26 2014 +0200
--
.../org/apache/struts2/static/optiontransferselect.js | 10 +-
1 file changed, 5 insertions(+), 5 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/struts/blob/d2b22b91/core/src/main/resources/org/apache/struts2/static/optiontransferselect.js
--
diff --git
a/core/src/main/resources/org/apache/struts2/static/optiontransferselect.js
b/core/src/main/resources/org/apache/struts2/static/optiontransferselect.js
index c4024a3..85a2e28 100644
--- a/core/src/main/resources/org/apache/struts2/static/optiontransferselect.js
+++ b/core/src/main/resources/org/apache/struts2/static/optiontransferselect.js
@@ -56,8 +56,8 @@ function compile(ptn) {
}
function moveOptions(objSourceElement, objTargetElement, toSort, chooseFunc) {
-var aryTempSourceOptions = new Array();
-var aryTempTargetOptions = new Array();
+var aryTempSourceOptions = [];
+var aryTempTargetOptions = [];
var x = 0;
//looping through source element to find selected options
@@ -70,7 +70,7 @@ function moveOptions(objSourceElement, objTargetElement,
toSort, chooseFunc) {
}
else {
//storing options that stay to recreate select element
-var objTempValues = new Object();
+var objTempValues = {};
objTempValues.text = objSourceElement.options[i].text;
objTempValues.value = objSourceElement.options[i].value;
aryTempSourceOptions[x] = objTempValues;
@@ -80,7 +80,7 @@ function moveOptions(objSourceElement, objTargetElement,
toSort, chooseFunc) {
//sorting and refilling target list
for (var i = 0; i objTargetElement.length; i++) {
-var objTempValues = new Object();
+var objTempValues = {};
objTempValues.text = objTargetElement.options[i].text;
objTempValues.value = objTargetElement.options[i].value;
aryTempTargetOptions[i] = objTempValues;
@@ -178,7 +178,7 @@ function moveOptionDown(objTargetElement, type, ptn) {
function swapOptions(objTargetElement, first, second) {
var opt = objTargetElement.options;
var temp = new Option(opt[first].text, opt[first].value,
opt[first].defaultSelected, opt[first].selected);
- var temp2= new Option(opt[second].text, opt[second].value,
opt[second].defaultSelected, opt[second].selected);
+ var temp2 = new Option(opt[second].text, opt[second].value,
opt[second].defaultSelected, opt[second].selected);
opt[first] = temp2;
opt[second] = temp;
}
[51/56] [abbrv] struts git commit: [maven-release-plugin] prepare for next development iteration
[maven-release-plugin] prepare for next development iteration Project: http://git-wip-us.apache.org/repos/asf/struts/repo Commit: http://git-wip-us.apache.org/repos/asf/struts/commit/f7f4915b Tree: http://git-wip-us.apache.org/repos/asf/struts/tree/f7f4915b Diff: http://git-wip-us.apache.org/repos/asf/struts/diff/f7f4915b Branch: refs/heads/master Commit: f7f4915bd3dfb500a96db03069900b66988b485d Parents: 0032390 Author: Lukasz Lenart lukaszlen...@apache.org Authored: Fri Nov 14 08:31:27 2014 +0100 Committer: Lukasz Lenart lukaszlen...@apache.org Committed: Fri Nov 14 08:31:27 2014 +0100 -- apps/blank/pom.xml | 2 +- apps/jboss-blank/pom.xml| 2 +- apps/mailreader/pom.xml | 2 +- apps/pom.xml| 2 +- apps/portlet/pom.xml| 2 +- apps/rest-showcase/pom.xml | 4 ++-- apps/showcase/pom.xml | 2 +- archetypes/pom.xml | 2 +- archetypes/struts2-archetype-angularjs/pom.xml | 2 +- archetypes/struts2-archetype-blank/pom.xml | 2 +- archetypes/struts2-archetype-convention/pom.xml | 2 +- archetypes/struts2-archetype-dbportlet/pom.xml | 2 +- archetypes/struts2-archetype-plugin/pom.xml | 2 +- archetypes/struts2-archetype-portlet/pom.xml| 2 +- archetypes/struts2-archetype-starter/pom.xml| 2 +- assembly/pom.xml| 2 +- bom/pom.xml | 9 ++--- bundles/admin/pom.xml | 2 +- bundles/demo/pom.xml| 2 +- bundles/pom.xml | 2 +- core/pom.xml| 2 +- plugins/cdi/pom.xml | 2 +- plugins/codebehind/pom.xml | 2 +- plugins/config-browser/pom.xml | 2 +- plugins/convention/pom.xml | 2 +- plugins/dojo/pom.xml| 2 +- plugins/dwr/pom.xml | 2 +- plugins/embeddedjsp/pom.xml | 2 +- plugins/gxp/pom.xml | 2 +- plugins/jasperreports/pom.xml | 2 +- plugins/javatemplates/pom.xml | 2 +- plugins/jfreechart/pom.xml | 2 +- plugins/jsf/pom.xml | 2 +- plugins/json/pom.xml| 2 +- plugins/junit/pom.xml | 2 +- plugins/osgi/pom.xml| 2 +- plugins/oval/pom.xml| 2 +- plugins/pell-multipart/pom.xml | 2 +- plugins/plexus/pom.xml | 2 +- plugins/pom.xml | 2 +- plugins/portlet-tiles/pom.xml | 2 +- plugins/portlet/pom.xml | 2 +- plugins/rest/pom.xml| 2 +- plugins/sitegraph/pom.xml | 2 +- plugins/sitemesh/pom.xml| 2 +- plugins/spring/pom.xml | 2 +- plugins/struts1/pom.xml | 2 +- plugins/testng/pom.xml | 2 +- plugins/tiles/pom.xml | 2 +- plugins/tiles3/pom.xml | 2 +- pom.xml | 4 ++-- xwork-core/pom.xml | 2 +- 52 files changed, 55 insertions(+), 60 deletions(-) -- http://git-wip-us.apache.org/repos/asf/struts/blob/f7f4915b/apps/blank/pom.xml -- diff --git a/apps/blank/pom.xml b/apps/blank/pom.xml index 3f3a79b..83f664c 100644 --- a/apps/blank/pom.xml +++ b/apps/blank/pom.xml @@ -26,7 +26,7 @@ parent groupIdorg.apache.struts/groupId artifactIdstruts2-apps/artifactId -version2.3.19/version +version2.3.20-SNAPSHOT/version /parent artifactIdstruts2-blank/artifactId http://git-wip-us.apache.org/repos/asf/struts/blob/f7f4915b/apps/jboss-blank/pom.xml -- diff --git a/apps/jboss-blank/pom.xml b/apps/jboss-blank/pom.xml index 7a55287..64d9b30 100644 --- a/apps/jboss-blank/pom.xml +++ b/apps/jboss-blank/pom.xml @@ -26,7 +26,7 @@ parent groupIdorg.apache.struts/groupId artifactIdstruts2-apps/artifactId -version2.3.19/version +version2.3.20-SNAPSHOT/version /parent artifactIdstruts2-jboss-blank/artifactId http://git-wip-us.apache.org/repos/asf/struts/blob/f7f4915b/apps/mailreader/pom.xml -- diff --git a/apps/mailreader/pom.xml
[29/56] [abbrv] struts git commit: WW-4383 Clears output to avoid infinitive loops
WW-4383 Clears output to avoid infinitive loops
Project: http://git-wip-us.apache.org/repos/asf/struts/repo
Commit: http://git-wip-us.apache.org/repos/asf/struts/commit/f49b084f
Tree: http://git-wip-us.apache.org/repos/asf/struts/tree/f49b084f
Diff: http://git-wip-us.apache.org/repos/asf/struts/diff/f49b084f
Branch: refs/heads/master
Commit: f49b084fbe6b97313ad5f56f448e2fab70371692
Parents: 3826c30
Author: Lukasz Lenart lukaszlen...@apache.org
Authored: Tue Sep 16 08:42:11 2014 +0200
Committer: Lukasz Lenart lukaszlen...@apache.org
Committed: Tue Sep 16 08:42:11 2014 +0200
--
.../java/org/apache/struts2/util/FastByteArrayOutputStream.java| 2 ++
1 file changed, 2 insertions(+)
--
http://git-wip-us.apache.org/repos/asf/struts/blob/f49b084f/core/src/main/java/org/apache/struts2/util/FastByteArrayOutputStream.java
--
diff --git
a/core/src/main/java/org/apache/struts2/util/FastByteArrayOutputStream.java
b/core/src/main/java/org/apache/struts2/util/FastByteArrayOutputStream.java
index b116040..eb07fb1 100644
--- a/core/src/main/java/org/apache/struts2/util/FastByteArrayOutputStream.java
+++ b/core/src/main/java/org/apache/struts2/util/FastByteArrayOutputStream.java
@@ -191,6 +191,8 @@ public class FastByteArrayOutputStream extends OutputStream
{
out.flip();
// Output
writer.write(out.toString());
+// clear output to avoid infinitive loops, see WW-4383
+out.clear();
return result;
}
[34/56] [abbrv] struts git commit: WW-3698 Updates JavaDoc about new wrapField parameter
WW-3698 Updates JavaDoc about new wrapField parameter
Project: http://git-wip-us.apache.org/repos/asf/struts/repo
Commit: http://git-wip-us.apache.org/repos/asf/struts/commit/87c204ef
Tree: http://git-wip-us.apache.org/repos/asf/struts/tree/87c204ef
Diff: http://git-wip-us.apache.org/repos/asf/struts/diff/87c204ef
Branch: refs/heads/master
Commit: 87c204ef6c28f918f9c18cdaaec883f1375fa786
Parents: d2b22b9
Author: Lukasz Lenart lukaszlen...@apache.org
Authored: Sun Sep 21 11:05:05 2014 +0200
Committer: Lukasz Lenart lukaszlen...@apache.org
Committed: Sun Sep 21 11:05:05 2014 +0200
--
.../views/jasperreports/JasperReportsResult.java | 17 +++--
1 file changed, 3 insertions(+), 14 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/struts/blob/87c204ef/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 4cb7de6..8c0c901 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
@@ -74,59 +74,48 @@ import java.util.TimeZone;
* p/
* liblocation (default)/b - the location where the compiled jasper
report
* definition is (foo.jasper), relative from current URL./li
- * p/
* libdataSource (required)/b - the EL expression used to retrieve the
* datasource from the value stack (usually a List)./li
- * p/
* libparse/b - true by default. If set to false, the location param will
* not be parsed for EL expressions./li
- * p/
* libformat/b - the format in which the report should be generated.
Valid
* values can be found in {@link JasperReportConstants}. If no format is
* specified, PDF will be used./li
- * p/
* libcontentDisposition/b - disposition (defaults to inline, values
are
* typically ifilename=document.pdf/i)./li
- * p/
* libdocumentName/b - name of the document (will generate the http
header
* codeContent-disposition = X; filename=X.[format]/code)./li
- * p/
* libdelimiter/b - the delimiter used when generating CSV reports. By
* default, the character used is ,./li
- * p/
* libimageServletUrl/b - name of the url that, when prefixed with the
* context page, can return report images./li
- * p/
* li
* breportParameters/b - (2.1.2+) OGNL expression used to retrieve a map of
* report parameters from the value stack. The parameters may be accessed
* in the report via the usual JR mechanism and might include data not
* part of the dataSource, such as the user name of the report creator, etc.
* /li
- * p/
* li
* bexportParameters/b - (2.1.2+) OGNL expression used to retrieve a map of
* JR exporter parameters from the value stack. The export parameters are
* used to customize the JR export. For example, a PDF export might enable
* encryption and set the user password to a string known to the report
creator.
* /li
- * p/
* li
* bconnection/b - (2.1.7+) JDBC Connection which can be passed to the
* report instead of dataSource
* /li
- * p/
+ * libwrapField/b - (2.3.18+) defines if fields should warp with
ValueStackDataSource
+ * see https://issues.apache.org/jira/browse/WW-3698 for more details
+ * /li
* /ul
- * p/
* p
* This result follows the same rules from {@link StrutsResultSupport}.
* Specifically, all parameters will be parsed if the parse parameter
* is not set to false.
* /p
* !-- END SNIPPET: params --
- * p/
* bExample:/b
- * p/
* pre!-- START SNIPPET: example1 --
* lt;result name=success type=jaspergt;
* lt;param name=locationgt;foo.jasperlt;/paramgt;
[55/56] [abbrv] struts git commit: Merge branch 'master' into develop
Merge branch 'master' into develop Project: http://git-wip-us.apache.org/repos/asf/struts/repo Commit: http://git-wip-us.apache.org/repos/asf/struts/commit/77c76dc6 Tree: http://git-wip-us.apache.org/repos/asf/struts/tree/77c76dc6 Diff: http://git-wip-us.apache.org/repos/asf/struts/diff/77c76dc6 Branch: refs/heads/develop Commit: 77c76dc69174117101fbfb0117f25cd01c6a6407 Parents: 70af4b6 aebdad9 Author: Lukasz Lenart lukaszlen...@apache.org Authored: Mon Nov 17 11:31:58 2014 +0100 Committer: Lukasz Lenart lukaszlen...@apache.org Committed: Mon Nov 17 11:31:58 2014 +0100 -- apps/blank/pom.xml | 2 +- apps/jboss-blank/pom.xml| 2 +- apps/mailreader/pom.xml | 2 +- apps/pom.xml| 2 +- apps/portlet/pom.xml| 2 +- apps/rest-showcase/pom.xml | 4 ++-- apps/showcase/pom.xml | 2 +- archetypes/pom.xml | 2 +- archetypes/struts2-archetype-angularjs/pom.xml | 2 +- archetypes/struts2-archetype-blank/pom.xml | 2 +- archetypes/struts2-archetype-convention/pom.xml | 2 +- archetypes/struts2-archetype-dbportlet/pom.xml | 2 +- archetypes/struts2-archetype-plugin/pom.xml | 2 +- archetypes/struts2-archetype-portlet/pom.xml| 2 +- archetypes/struts2-archetype-starter/pom.xml| 2 +- assembly/pom.xml| 2 +- bom/pom.xml | 9 +++-- bundles/admin/pom.xml | 2 +- bundles/demo/pom.xml| 2 +- bundles/pom.xml | 2 +- core/pom.xml| 2 +- plugins/cdi/pom.xml | 2 +- plugins/codebehind/pom.xml | 2 +- plugins/config-browser/pom.xml | 2 +- plugins/convention/pom.xml | 2 +- plugins/dojo/pom.xml| 2 +- plugins/dwr/pom.xml | 2 +- plugins/embeddedjsp/pom.xml | 2 +- plugins/gxp/pom.xml | 2 +- plugins/jasperreports/pom.xml | 2 +- plugins/javatemplates/pom.xml | 2 +- plugins/jfreechart/pom.xml | 2 +- plugins/jsf/pom.xml | 2 +- plugins/json/pom.xml| 2 +- plugins/junit/pom.xml | 2 +- plugins/osgi/pom.xml| 2 +- plugins/oval/pom.xml| 2 +- plugins/pell-multipart/pom.xml | 2 +- plugins/plexus/pom.xml | 2 +- plugins/pom.xml | 2 +- plugins/portlet-tiles/pom.xml | 2 +- plugins/portlet/pom.xml | 2 +- plugins/rest/pom.xml| 2 +- plugins/sitegraph/pom.xml | 2 +- plugins/sitemesh/pom.xml| 2 +- plugins/spring/pom.xml | 2 +- plugins/struts1/pom.xml | 2 +- plugins/testng/pom.xml | 2 +- plugins/tiles/pom.xml | 2 +- plugins/tiles3/pom.xml | 2 +- pom.xml | 5 +++-- xwork-core/pom.xml | 2 +- 52 files changed, 57 insertions(+), 59 deletions(-) --
[49/56] [abbrv] struts git commit: [maven-release-plugin] prepare release STRUTS_2_3_19
[maven-release-plugin] prepare release STRUTS_2_3_19 Project: http://git-wip-us.apache.org/repos/asf/struts/repo Commit: http://git-wip-us.apache.org/repos/asf/struts/commit/0032390e Tree: http://git-wip-us.apache.org/repos/asf/struts/tree/0032390e Diff: http://git-wip-us.apache.org/repos/asf/struts/diff/0032390e Branch: refs/heads/develop Commit: 0032390ee89749c8dc55ac76f44900697aa0c713 Parents: 8c22262 Author: Lukasz Lenart lukaszlen...@apache.org Authored: Fri Nov 14 08:31:12 2014 +0100 Committer: Lukasz Lenart lukaszlen...@apache.org Committed: Fri Nov 14 08:31:12 2014 +0100 -- apps/blank/pom.xml | 2 +- apps/jboss-blank/pom.xml| 2 +- apps/mailreader/pom.xml | 2 +- apps/pom.xml| 2 +- apps/portlet/pom.xml| 2 +- apps/rest-showcase/pom.xml | 4 ++-- apps/showcase/pom.xml | 2 +- archetypes/pom.xml | 2 +- archetypes/struts2-archetype-angularjs/pom.xml | 2 +- archetypes/struts2-archetype-blank/pom.xml | 2 +- archetypes/struts2-archetype-convention/pom.xml | 2 +- archetypes/struts2-archetype-dbportlet/pom.xml | 2 +- archetypes/struts2-archetype-plugin/pom.xml | 2 +- archetypes/struts2-archetype-portlet/pom.xml| 2 +- archetypes/struts2-archetype-starter/pom.xml| 2 +- assembly/pom.xml| 2 +- bom/pom.xml | 12 +++- bundles/admin/pom.xml | 2 +- bundles/demo/pom.xml| 2 +- bundles/pom.xml | 2 +- core/pom.xml| 2 +- plugins/cdi/pom.xml | 2 +- plugins/codebehind/pom.xml | 2 +- plugins/config-browser/pom.xml | 2 +- plugins/convention/pom.xml | 2 +- plugins/dojo/pom.xml| 2 +- plugins/dwr/pom.xml | 2 +- plugins/embeddedjsp/pom.xml | 2 +- plugins/gxp/pom.xml | 2 +- plugins/jasperreports/pom.xml | 2 +- plugins/javatemplates/pom.xml | 2 +- plugins/jfreechart/pom.xml | 2 +- plugins/jsf/pom.xml | 2 +- plugins/json/pom.xml| 2 +- plugins/junit/pom.xml | 2 +- plugins/osgi/pom.xml| 2 +- plugins/oval/pom.xml| 2 +- plugins/pell-multipart/pom.xml | 2 +- plugins/plexus/pom.xml | 2 +- plugins/pom.xml | 2 +- plugins/portlet-tiles/pom.xml | 2 +- plugins/portlet/pom.xml | 2 +- plugins/rest/pom.xml| 2 +- plugins/sitegraph/pom.xml | 2 +- plugins/sitemesh/pom.xml| 2 +- plugins/spring/pom.xml | 2 +- plugins/struts1/pom.xml | 2 +- plugins/testng/pom.xml | 2 +- plugins/tiles/pom.xml | 2 +- plugins/tiles3/pom.xml | 2 +- pom.xml | 5 +++-- xwork-core/pom.xml | 2 +- 52 files changed, 61 insertions(+), 58 deletions(-) -- http://git-wip-us.apache.org/repos/asf/struts/blob/0032390e/apps/blank/pom.xml -- diff --git a/apps/blank/pom.xml b/apps/blank/pom.xml index 943303f..3f3a79b 100644 --- a/apps/blank/pom.xml +++ b/apps/blank/pom.xml @@ -26,7 +26,7 @@ parent groupIdorg.apache.struts/groupId artifactIdstruts2-apps/artifactId -version2.3.19-SNAPSHOT/version +version2.3.19/version /parent artifactIdstruts2-blank/artifactId http://git-wip-us.apache.org/repos/asf/struts/blob/0032390e/apps/jboss-blank/pom.xml -- diff --git a/apps/jboss-blank/pom.xml b/apps/jboss-blank/pom.xml index e808b21..7a55287 100644 --- a/apps/jboss-blank/pom.xml +++ b/apps/jboss-blank/pom.xml @@ -26,7 +26,7 @@ parent groupIdorg.apache.struts/groupId artifactIdstruts2-apps/artifactId -version2.3.19-SNAPSHOT/version +version2.3.19/version /parent artifactIdstruts2-jboss-blank/artifactId http://git-wip-us.apache.org/repos/asf/struts/blob/0032390e/apps/mailreader/pom.xml
[37/56] [abbrv] struts git commit: Adds proper exception handling during calling action This will allow ExceptionHandler to work
Adds proper exception handling during calling action
This will allow ExceptionHandler to work
Project: http://git-wip-us.apache.org/repos/asf/struts/repo
Commit: http://git-wip-us.apache.org/repos/asf/struts/commit/3b9d5861
Tree: http://git-wip-us.apache.org/repos/asf/struts/tree/3b9d5861
Diff: http://git-wip-us.apache.org/repos/asf/struts/diff/3b9d5861
Branch: refs/heads/master
Commit: 3b9d58614f0ad192da8bffa657b820c28cdaa1ef
Parents: 4f4f526
Author: Lukasz Lenart lukaszlen...@apache.org
Authored: Tue Sep 23 21:44:50 2014 +0200
Committer: Lukasz Lenart lukaszlen...@apache.org
Committed: Tue Sep 23 21:44:50 2014 +0200
--
.../xwork2/DefaultActionInvocation.java | 16
1 file changed, 12 insertions(+), 4 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/struts/blob/3b9d5861/xwork-core/src/main/java/com/opensymphony/xwork2/DefaultActionInvocation.java
--
diff --git
a/xwork-core/src/main/java/com/opensymphony/xwork2/DefaultActionInvocation.java
b/xwork-core/src/main/java/com/opensymphony/xwork2/DefaultActionInvocation.java
index 4539e56..dd44b14 100644
---
a/xwork-core/src/main/java/com/opensymphony/xwork2/DefaultActionInvocation.java
+++
b/xwork-core/src/main/java/com/opensymphony/xwork2/DefaultActionInvocation.java
@@ -28,6 +28,8 @@ import com.opensymphony.xwork2.util.ValueStackFactory;
import com.opensymphony.xwork2.util.logging.Logger;
import com.opensymphony.xwork2.util.logging.LoggerFactory;
import com.opensymphony.xwork2.util.profiling.UtilTimerStack;
+import ognl.MethodFailedException;
+import ognl.NoSuchPropertyException;
import ognl.OgnlException;
import java.util.ArrayList;
@@ -439,17 +441,23 @@ public class DefaultActionInvocation implements
ActionInvocation {
}
}
return saveResult(actionConfig, methodResult);
-} catch (OgnlException e) {
+} catch (NoSuchPropertyException e) {
+throw new IllegalArgumentException(The + methodName + () is
not defined in action + getAction().getClass() + );
+} catch (MethodFailedException e) {
// We try to return the source exception.
-//Throwable t = e.getTargetException();
+Throwable t = e.getCause();
if (actionEventListener != null) {
-String result = actionEventListener.handleException(e,
getStack());
+String result = actionEventListener.handleException(t,
getStack());
if (result != null) {
return result;
}
}
-throw e;
+if (t instanceof Exception) {
+throw (Exception) t;
+} else {
+throw e;
+}
} finally {
UtilTimerStack.pop(timerKey);
}
[53/56] [abbrv] struts git commit: Merge branch 'release/2.3.19'
Merge branch 'release/2.3.19' Project: http://git-wip-us.apache.org/repos/asf/struts/repo Commit: http://git-wip-us.apache.org/repos/asf/struts/commit/aebdad9f Tree: http://git-wip-us.apache.org/repos/asf/struts/tree/aebdad9f Diff: http://git-wip-us.apache.org/repos/asf/struts/diff/aebdad9f Branch: refs/heads/master Commit: aebdad9f6cc50abba8555beb2e1604991a53d302 Parents: d2663ce f7f4915 Author: Lukasz Lenart lukaszlen...@apache.org Authored: Mon Nov 17 11:31:52 2014 +0100 Committer: Lukasz Lenart lukaszlen...@apache.org Committed: Mon Nov 17 11:31:52 2014 +0100 -- apps/blank/pom.xml | 7 +- .../blank/src/main/java/example/HelloWorld.java | 7 + apps/blank/src/main/java/example/YesNo.java | 5 + .../main/resources/example/package.properties | 2 + .../src/main/resources/velocity.properties | 1 + .../webapp/WEB-INF/jsp/example/HelloWorld.jsp | 4 +- apps/jboss-blank/pom.xml| 2 +- .../src/main/resources/velocity.properties | 1 + apps/mailreader/pom.xml | 2 +- .../src/main/resources/velocity.properties | 1 + apps/pom.xml| 2 +- apps/portlet/pom.xml| 2 +- .../src/main/resources/velocity.properties | 1 + apps/rest-showcase/pom.xml | 8 +- .../src/main/resources/log4j.properties |13 +- .../src/main/resources/velocity.properties | 1 + .../WEB-INF/content/orders-deleteConfirm.jsp|25 +- .../main/webapp/WEB-INF/content/orders-edit.jsp |57 +- .../webapp/WEB-INF/content/orders-editNew.jsp |49 +- .../webapp/WEB-INF/content/orders-index.jsp |31 +- .../main/webapp/WEB-INF/content/orders-show.jsp |25 +- .../main/webapp/css/bootstrap-responsive.css| 1058 - .../webapp/css/bootstrap-responsive.min.css | 9 - .../src/main/webapp/css/bootstrap-theme.css | 442 + .../src/main/webapp/css/bootstrap-theme.css.map | 1 + .../src/main/webapp/css/bootstrap-theme.min.css | 5 + .../src/main/webapp/css/bootstrap.css | 9865 ++--- .../src/main/webapp/css/bootstrap.css.map | 1 + .../src/main/webapp/css/bootstrap.min.css |12 +- .../fonts/glyphicons-halflings-regular.eot | Bin 0 - 20335 bytes .../fonts/glyphicons-halflings-regular.svg | 229 + .../fonts/glyphicons-halflings-regular.ttf | Bin 0 - 41280 bytes .../fonts/glyphicons-halflings-regular.woff | Bin 0 - 23320 bytes .../webapp/img/glyphicons-halflings-white.png | Bin 8777 - 0 bytes .../main/webapp/img/glyphicons-halflings.png| Bin 12799 - 0 bytes apps/showcase/pom.xml | 2 +- .../src/main/resources/velocity.properties | 1 + apps/showcase/src/main/webapp/index.html|10 + apps/showcase/src/main/webapp/index.jsp | 1 - archetypes/pom.xml | 2 +- archetypes/struts2-archetype-angularjs/pom.xml | 3 +- .../src/main/webapp/WEB-INF/content/hello.jsp | 9 +- .../src/main/webapp/js/bootstrap.js |25 +- .../src/main/webapp/js/controllers.js |27 +- .../webapp/js/lib/angular/angular-animate.js| 1689 + .../js/lib/angular/angular-animate.min.js |28 + .../js/lib/angular/angular-animate.min.js.map | 8 + .../lib/angular/angular-bootstrap-prettify.js | 1845 - .../angular/angular-bootstrap-prettify.min.js |41 - .../webapp/js/lib/angular/angular-bootstrap.js | 175 - .../js/lib/angular/angular-bootstrap.min.js | 9 - .../webapp/js/lib/angular/angular-cookies.js| 104 +- .../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 |24 + .../webapp/js/lib/angular/angular-loader.js | 230 +- .../webapp/js/lib/angular/angular-loader.min.js |10 +- .../js/lib/angular/angular-loader.min.js.map| 8 + .../main/webapp/js/lib/angular/angular-mocks.js | 1250 +- .../webapp/js/lib/angular/angular-resource.js | 540 +- .../js/lib/angular/angular-resource.min.js |17 +- .../js/lib/angular/angular-resource.min.js.map | 8 + .../main/webapp/js/lib/angular/angular-route.js | 925 + .../webapp/js/lib/angular/angular-route.min.js |14 + .../js/lib/angular/angular-route.min.js.map | 8 + .../webapp/js/lib/angular/angular-sanitize.js | 503 +- .../js/lib/angular/angular-sanitize.min.js |22 +- .../js/lib/angular/angular-sanitize.min.js.map | 8 + .../webapp/js/lib/angular/angular-scenario.js | 32603 ++--- .../main/webapp/js/lib/angular/angular-touch.js | 584 + .../webapp/js/lib/angular/angular-touch.min.js |13 + .../js/lib/angular/angular-touch.min.js.map
[52/56] [abbrv] struts git commit: [maven-release-plugin] prepare for next development iteration
[maven-release-plugin] prepare for next development iteration Project: http://git-wip-us.apache.org/repos/asf/struts/repo Commit: http://git-wip-us.apache.org/repos/asf/struts/commit/f7f4915b Tree: http://git-wip-us.apache.org/repos/asf/struts/tree/f7f4915b Diff: http://git-wip-us.apache.org/repos/asf/struts/diff/f7f4915b Branch: refs/heads/develop Commit: f7f4915bd3dfb500a96db03069900b66988b485d Parents: 0032390 Author: Lukasz Lenart lukaszlen...@apache.org Authored: Fri Nov 14 08:31:27 2014 +0100 Committer: Lukasz Lenart lukaszlen...@apache.org Committed: Fri Nov 14 08:31:27 2014 +0100 -- apps/blank/pom.xml | 2 +- apps/jboss-blank/pom.xml| 2 +- apps/mailreader/pom.xml | 2 +- apps/pom.xml| 2 +- apps/portlet/pom.xml| 2 +- apps/rest-showcase/pom.xml | 4 ++-- apps/showcase/pom.xml | 2 +- archetypes/pom.xml | 2 +- archetypes/struts2-archetype-angularjs/pom.xml | 2 +- archetypes/struts2-archetype-blank/pom.xml | 2 +- archetypes/struts2-archetype-convention/pom.xml | 2 +- archetypes/struts2-archetype-dbportlet/pom.xml | 2 +- archetypes/struts2-archetype-plugin/pom.xml | 2 +- archetypes/struts2-archetype-portlet/pom.xml| 2 +- archetypes/struts2-archetype-starter/pom.xml| 2 +- assembly/pom.xml| 2 +- bom/pom.xml | 9 ++--- bundles/admin/pom.xml | 2 +- bundles/demo/pom.xml| 2 +- bundles/pom.xml | 2 +- core/pom.xml| 2 +- plugins/cdi/pom.xml | 2 +- plugins/codebehind/pom.xml | 2 +- plugins/config-browser/pom.xml | 2 +- plugins/convention/pom.xml | 2 +- plugins/dojo/pom.xml| 2 +- plugins/dwr/pom.xml | 2 +- plugins/embeddedjsp/pom.xml | 2 +- plugins/gxp/pom.xml | 2 +- plugins/jasperreports/pom.xml | 2 +- plugins/javatemplates/pom.xml | 2 +- plugins/jfreechart/pom.xml | 2 +- plugins/jsf/pom.xml | 2 +- plugins/json/pom.xml| 2 +- plugins/junit/pom.xml | 2 +- plugins/osgi/pom.xml| 2 +- plugins/oval/pom.xml| 2 +- plugins/pell-multipart/pom.xml | 2 +- plugins/plexus/pom.xml | 2 +- plugins/pom.xml | 2 +- plugins/portlet-tiles/pom.xml | 2 +- plugins/portlet/pom.xml | 2 +- plugins/rest/pom.xml| 2 +- plugins/sitegraph/pom.xml | 2 +- plugins/sitemesh/pom.xml| 2 +- plugins/spring/pom.xml | 2 +- plugins/struts1/pom.xml | 2 +- plugins/testng/pom.xml | 2 +- plugins/tiles/pom.xml | 2 +- plugins/tiles3/pom.xml | 2 +- pom.xml | 4 ++-- xwork-core/pom.xml | 2 +- 52 files changed, 55 insertions(+), 60 deletions(-) -- http://git-wip-us.apache.org/repos/asf/struts/blob/f7f4915b/apps/blank/pom.xml -- diff --git a/apps/blank/pom.xml b/apps/blank/pom.xml index 3f3a79b..83f664c 100644 --- a/apps/blank/pom.xml +++ b/apps/blank/pom.xml @@ -26,7 +26,7 @@ parent groupIdorg.apache.struts/groupId artifactIdstruts2-apps/artifactId -version2.3.19/version +version2.3.20-SNAPSHOT/version /parent artifactIdstruts2-blank/artifactId http://git-wip-us.apache.org/repos/asf/struts/blob/f7f4915b/apps/jboss-blank/pom.xml -- diff --git a/apps/jboss-blank/pom.xml b/apps/jboss-blank/pom.xml index 7a55287..64d9b30 100644 --- a/apps/jboss-blank/pom.xml +++ b/apps/jboss-blank/pom.xml @@ -26,7 +26,7 @@ parent groupIdorg.apache.struts/groupId artifactIdstruts2-apps/artifactId -version2.3.19/version +version2.3.20-SNAPSHOT/version /parent artifactIdstruts2-jboss-blank/artifactId http://git-wip-us.apache.org/repos/asf/struts/blob/f7f4915b/apps/mailreader/pom.xml -- diff --git a/apps/mailreader/pom.xml
[50/56] [abbrv] struts git commit: [maven-release-plugin] prepare release STRUTS_2_3_19
[maven-release-plugin] prepare release STRUTS_2_3_19 Project: http://git-wip-us.apache.org/repos/asf/struts/repo Commit: http://git-wip-us.apache.org/repos/asf/struts/commit/0032390e Tree: http://git-wip-us.apache.org/repos/asf/struts/tree/0032390e Diff: http://git-wip-us.apache.org/repos/asf/struts/diff/0032390e Branch: refs/heads/master Commit: 0032390ee89749c8dc55ac76f44900697aa0c713 Parents: 8c22262 Author: Lukasz Lenart lukaszlen...@apache.org Authored: Fri Nov 14 08:31:12 2014 +0100 Committer: Lukasz Lenart lukaszlen...@apache.org Committed: Fri Nov 14 08:31:12 2014 +0100 -- apps/blank/pom.xml | 2 +- apps/jboss-blank/pom.xml| 2 +- apps/mailreader/pom.xml | 2 +- apps/pom.xml| 2 +- apps/portlet/pom.xml| 2 +- apps/rest-showcase/pom.xml | 4 ++-- apps/showcase/pom.xml | 2 +- archetypes/pom.xml | 2 +- archetypes/struts2-archetype-angularjs/pom.xml | 2 +- archetypes/struts2-archetype-blank/pom.xml | 2 +- archetypes/struts2-archetype-convention/pom.xml | 2 +- archetypes/struts2-archetype-dbportlet/pom.xml | 2 +- archetypes/struts2-archetype-plugin/pom.xml | 2 +- archetypes/struts2-archetype-portlet/pom.xml| 2 +- archetypes/struts2-archetype-starter/pom.xml| 2 +- assembly/pom.xml| 2 +- bom/pom.xml | 12 +++- bundles/admin/pom.xml | 2 +- bundles/demo/pom.xml| 2 +- bundles/pom.xml | 2 +- core/pom.xml| 2 +- plugins/cdi/pom.xml | 2 +- plugins/codebehind/pom.xml | 2 +- plugins/config-browser/pom.xml | 2 +- plugins/convention/pom.xml | 2 +- plugins/dojo/pom.xml| 2 +- plugins/dwr/pom.xml | 2 +- plugins/embeddedjsp/pom.xml | 2 +- plugins/gxp/pom.xml | 2 +- plugins/jasperreports/pom.xml | 2 +- plugins/javatemplates/pom.xml | 2 +- plugins/jfreechart/pom.xml | 2 +- plugins/jsf/pom.xml | 2 +- plugins/json/pom.xml| 2 +- plugins/junit/pom.xml | 2 +- plugins/osgi/pom.xml| 2 +- plugins/oval/pom.xml| 2 +- plugins/pell-multipart/pom.xml | 2 +- plugins/plexus/pom.xml | 2 +- plugins/pom.xml | 2 +- plugins/portlet-tiles/pom.xml | 2 +- plugins/portlet/pom.xml | 2 +- plugins/rest/pom.xml| 2 +- plugins/sitegraph/pom.xml | 2 +- plugins/sitemesh/pom.xml| 2 +- plugins/spring/pom.xml | 2 +- plugins/struts1/pom.xml | 2 +- plugins/testng/pom.xml | 2 +- plugins/tiles/pom.xml | 2 +- plugins/tiles3/pom.xml | 2 +- pom.xml | 5 +++-- xwork-core/pom.xml | 2 +- 52 files changed, 61 insertions(+), 58 deletions(-) -- http://git-wip-us.apache.org/repos/asf/struts/blob/0032390e/apps/blank/pom.xml -- diff --git a/apps/blank/pom.xml b/apps/blank/pom.xml index 943303f..3f3a79b 100644 --- a/apps/blank/pom.xml +++ b/apps/blank/pom.xml @@ -26,7 +26,7 @@ parent groupIdorg.apache.struts/groupId artifactIdstruts2-apps/artifactId -version2.3.19-SNAPSHOT/version +version2.3.19/version /parent artifactIdstruts2-blank/artifactId http://git-wip-us.apache.org/repos/asf/struts/blob/0032390e/apps/jboss-blank/pom.xml -- diff --git a/apps/jboss-blank/pom.xml b/apps/jboss-blank/pom.xml index e808b21..7a55287 100644 --- a/apps/jboss-blank/pom.xml +++ b/apps/jboss-blank/pom.xml @@ -26,7 +26,7 @@ parent groupIdorg.apache.struts/groupId artifactIdstruts2-apps/artifactId -version2.3.19-SNAPSHOT/version +version2.3.19/version /parent artifactIdstruts2-jboss-blank/artifactId http://git-wip-us.apache.org/repos/asf/struts/blob/0032390e/apps/mailreader/pom.xml
[45/56] [abbrv] struts git commit: Polishes how error messages are displayed
Polishes how error messages are displayed
Project: http://git-wip-us.apache.org/repos/asf/struts/repo
Commit: http://git-wip-us.apache.org/repos/asf/struts/commit/266f83f1
Tree: http://git-wip-us.apache.org/repos/asf/struts/tree/266f83f1
Diff: http://git-wip-us.apache.org/repos/asf/struts/diff/266f83f1
Branch: refs/heads/master
Commit: 266f83f15ca8338047a0bdb34a38ebfc8c894a6a
Parents: eeab265
Author: Lukasz Lenart lukaszlen...@apache.org
Authored: Wed Nov 12 09:59:31 2014 +0100
Committer: Lukasz Lenart lukaszlen...@apache.org
Committed: Wed Nov 12 09:59:31 2014 +0100
--
.../xwork2/interceptor/ParametersInterceptor.java | 4 ++--
.../xwork2/security/AcceptedPatternsChecker.java| 12 ++--
.../xwork2/security/DefaultAcceptedPatternsChecker.java | 4 ++--
.../xwork2/security/DefaultExcludedPatternsChecker.java | 2 +-
.../xwork2/security/ExcludedPatternsChecker.java| 12 ++--
5 files changed, 17 insertions(+), 17 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/struts/blob/266f83f1/xwork-core/src/main/java/com/opensymphony/xwork2/interceptor/ParametersInterceptor.java
--
diff --git
a/xwork-core/src/main/java/com/opensymphony/xwork2/interceptor/ParametersInterceptor.java
b/xwork-core/src/main/java/com/opensymphony/xwork2/interceptor/ParametersInterceptor.java
index 4cd5a24..d26d094 100644
---
a/xwork-core/src/main/java/com/opensymphony/xwork2/interceptor/ParametersInterceptor.java
+++
b/xwork-core/src/main/java/com/opensymphony/xwork2/interceptor/ParametersInterceptor.java
@@ -430,14 +430,14 @@ public class ParametersInterceptor extends
MethodFilterInterceptor {
if (result.isAccepted()) {
return true;
}
-notifyDeveloper(Parameter [#0] didn't match accepted pattern [#1]!,
paramName, String.valueOf(result.getAcceptedPattern()));
+notifyDeveloper(Parameter [#0] didn't match accepted pattern [#1]!,
paramName, result.getAcceptedPattern());
return false;
}
protected boolean isExcluded(String paramName) {
ExcludedPatternsChecker.IsExcluded result =
excludedPatterns.isExcluded(paramName);
if (result.isExcluded()) {
-notifyDeveloper(Parameter [#0] matches excluded pattern [#1]!,
paramName, String.valueOf(result.getExcludedPattern()));
+notifyDeveloper(Parameter [#0] matches excluded pattern [#1]!,
paramName, result.getExcludedPattern());
return true;
}
return false;
http://git-wip-us.apache.org/repos/asf/struts/blob/266f83f1/xwork-core/src/main/java/com/opensymphony/xwork2/security/AcceptedPatternsChecker.java
--
diff --git
a/xwork-core/src/main/java/com/opensymphony/xwork2/security/AcceptedPatternsChecker.java
b/xwork-core/src/main/java/com/opensymphony/xwork2/security/AcceptedPatternsChecker.java
index 3e48553..64592fa 100644
---
a/xwork-core/src/main/java/com/opensymphony/xwork2/security/AcceptedPatternsChecker.java
+++
b/xwork-core/src/main/java/com/opensymphony/xwork2/security/AcceptedPatternsChecker.java
@@ -47,17 +47,17 @@ public interface AcceptedPatternsChecker {
public final static class IsAccepted {
private final boolean accepted;
-private final Pattern acceptedPattern;
+private final String acceptedPattern;
-public static IsAccepted yes(Pattern acceptedPattern) {
+public static IsAccepted yes(String acceptedPattern) {
return new IsAccepted(true, acceptedPattern);
}
-public static IsAccepted no() {
-return new IsAccepted(false, null);
+public static IsAccepted no(String acceptedPatterns) {
+return new IsAccepted(false, acceptedPatterns);
}
-private IsAccepted(boolean accepted, Pattern acceptedPattern) {
+private IsAccepted(boolean accepted, String acceptedPattern) {
this.accepted = accepted;
this.acceptedPattern = acceptedPattern;
}
@@ -66,7 +66,7 @@ public interface AcceptedPatternsChecker {
return accepted;
}
-public Pattern getAcceptedPattern() {
+public String getAcceptedPattern() {
return acceptedPattern;
}
http://git-wip-us.apache.org/repos/asf/struts/blob/266f83f1/xwork-core/src/main/java/com/opensymphony/xwork2/security/DefaultAcceptedPatternsChecker.java
--
diff --git
a/xwork-core/src/main/java/com/opensymphony/xwork2/security/DefaultAcceptedPatternsChecker.java
b/xwork-core/src/main/java/com/opensymphony/xwork2/security/DefaultAcceptedPatternsChecker.java
index 9071f67..4992281 100644
---
[39/56] [abbrv] struts git commit: Adds missing info about AcceptedPatternsChecker extension point
Adds missing info about AcceptedPatternsChecker extension point Project: http://git-wip-us.apache.org/repos/asf/struts/repo Commit: http://git-wip-us.apache.org/repos/asf/struts/commit/6098ef03 Tree: http://git-wip-us.apache.org/repos/asf/struts/tree/6098ef03 Diff: http://git-wip-us.apache.org/repos/asf/struts/diff/6098ef03 Branch: refs/heads/master Commit: 6098ef036b2e647e9219c9474a0e1cc37557f5db Parents: 587e3a4 Author: Lukasz Lenart lukaszlen...@apache.org Authored: Tue Sep 30 08:09:30 2014 +0200 Committer: Lukasz Lenart lukaszlen...@apache.org Committed: Tue Sep 30 08:09:30 2014 +0200 -- .../apache/struts2/config/DefaultBeanSelectionProvider.java| 6 ++ 1 file changed, 6 insertions(+) -- http://git-wip-us.apache.org/repos/asf/struts/blob/6098ef03/core/src/main/java/org/apache/struts2/config/DefaultBeanSelectionProvider.java -- diff --git a/core/src/main/java/org/apache/struts2/config/DefaultBeanSelectionProvider.java b/core/src/main/java/org/apache/struts2/config/DefaultBeanSelectionProvider.java index 8999a31..f972979 100644 --- a/core/src/main/java/org/apache/struts2/config/DefaultBeanSelectionProvider.java +++ b/core/src/main/java/org/apache/struts2/config/DefaultBeanSelectionProvider.java @@ -321,6 +321,12 @@ import java.util.StringTokenizer; * tdrequest/td * tdUsed across different interceptors to check if given string matches one of the excluded patterns/td * /tr + * tr + * tdcom.opensymphony.xwork2.AcceptedPatternsChecker/td + * tdstruts.acceptedPatterns.checker/td + * tdrequest/td + * tdUsed across different interceptors to check if given string matches one of the accepted patterns/td + * /tr * /table * * !-- END SNIPPET: extensionPoints --
[38/56] [abbrv] struts git commit: Adds BeanInfo to allow define class attribute in JSPs
Adds BeanInfo to allow define class attribute in JSPs
Project: http://git-wip-us.apache.org/repos/asf/struts/repo
Commit: http://git-wip-us.apache.org/repos/asf/struts/commit/587e3a41
Tree: http://git-wip-us.apache.org/repos/asf/struts/tree/587e3a41
Diff: http://git-wip-us.apache.org/repos/asf/struts/diff/587e3a41
Branch: refs/heads/master
Commit: 587e3a41b1d306eb246aa39d71dce469f4e50e9d
Parents: 3b9d586
Author: Lukasz Lenart lukaszlen...@apache.org
Authored: Tue Sep 23 23:02:31 2014 +0200
Committer: Lukasz Lenart lukaszlen...@apache.org
Committed: Tue Sep 23 23:02:31 2014 +0200
--
.../webapp/WEB-INF/jsp/example/HelloWorld.jsp | 2 +-
.../struts2/views/jsp/ui/AbstractUITag.java | 7 +-
.../views/jsp/ui/AbstractUITagBeanInfo.java | 70
.../apache/struts2/views/jsp/ui/AnchorTest.java | 10 +++
.../struts2/views/jsp/ui/ComponentTest.java | 2 +-
.../struts2/views/jsp/ui/Component-param.txt| 2 +-
.../test/resources/template/test/Component.ftl | 2 +-
.../dojo/views/jsp/ui/TabbedPanelTag.java | 2 +-
8 files changed, 89 insertions(+), 8 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/struts/blob/587e3a41/apps/blank/src/main/webapp/WEB-INF/jsp/example/HelloWorld.jsp
--
diff --git a/apps/blank/src/main/webapp/WEB-INF/jsp/example/HelloWorld.jsp
b/apps/blank/src/main/webapp/WEB-INF/jsp/example/HelloWorld.jsp
index f10fc02..17b0963 100644
--- a/apps/blank/src/main/webapp/WEB-INF/jsp/example/HelloWorld.jsp
+++ b/apps/blank/src/main/webapp/WEB-INF/jsp/example/HelloWorld.jsp
@@ -14,7 +14,7 @@
s:url id=url action=HelloWorld
s:param name=request_localeen/s:param
/s:url
-s:a href=%{url}English/s:a
+s:a class=test href=%{url}English/s:a
/li
li
s:url id=url action=HelloWorld
http://git-wip-us.apache.org/repos/asf/struts/blob/587e3a41/core/src/main/java/org/apache/struts2/views/jsp/ui/AbstractUITag.java
--
diff --git
a/core/src/main/java/org/apache/struts2/views/jsp/ui/AbstractUITag.java
b/core/src/main/java/org/apache/struts2/views/jsp/ui/AbstractUITag.java
index e57932a..65b80cf 100644
--- a/core/src/main/java/org/apache/struts2/views/jsp/ui/AbstractUITag.java
+++ b/core/src/main/java/org/apache/struts2/views/jsp/ui/AbstractUITag.java
@@ -44,7 +44,7 @@ public abstract class AbstractUITag extends
ComponentTagSupport implements Dynam
protected String disabled;
protected String label;
protected String labelSeparator;
-protected String labelPosition;
+protected String labelposition;
protected String requiredPosition;
protected String errorPosition;
protected String name;
@@ -96,7 +96,7 @@ public abstract class AbstractUITag extends
ComponentTagSupport implements Dynam
uiBean.setDisabled(disabled);
uiBean.setLabel(label);
uiBean.setLabelSeparator(labelSeparator);
-uiBean.setLabelposition(labelPosition);
+uiBean.setLabelposition(labelposition);
uiBean.setRequiredPosition(requiredPosition);
uiBean.setErrorPosition(errorPosition);
uiBean.setName(name);
@@ -148,6 +148,7 @@ public abstract class AbstractUITag extends
ComponentTagSupport implements Dynam
public void setCssStyle(String cssStyle) {
this.cssStyle = cssStyle;
}
+
public void setStyle(String cssStyle) {
this.cssStyle = cssStyle;
}
@@ -173,7 +174,7 @@ public abstract class AbstractUITag extends
ComponentTagSupport implements Dynam
}
public void setLabelposition(String labelPosition) {
-this.labelPosition = labelPosition;
+this.labelposition = labelPosition;
}
public void setRequiredPosition(String requiredPosition) {
http://git-wip-us.apache.org/repos/asf/struts/blob/587e3a41/core/src/main/java/org/apache/struts2/views/jsp/ui/AbstractUITagBeanInfo.java
--
diff --git
a/core/src/main/java/org/apache/struts2/views/jsp/ui/AbstractUITagBeanInfo.java
b/core/src/main/java/org/apache/struts2/views/jsp/ui/AbstractUITagBeanInfo.java
new file mode 100644
index 000..87e4105
--- /dev/null
+++
b/core/src/main/java/org/apache/struts2/views/jsp/ui/AbstractUITagBeanInfo.java
@@ -0,0 +1,70 @@
+/*
+ * $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
[54/56] [abbrv] struts git commit: Merge branch 'release/2.3.19'
Merge branch 'release/2.3.19' Project: http://git-wip-us.apache.org/repos/asf/struts/repo Commit: http://git-wip-us.apache.org/repos/asf/struts/commit/aebdad9f Tree: http://git-wip-us.apache.org/repos/asf/struts/tree/aebdad9f Diff: http://git-wip-us.apache.org/repos/asf/struts/diff/aebdad9f Branch: refs/heads/develop Commit: aebdad9f6cc50abba8555beb2e1604991a53d302 Parents: d2663ce f7f4915 Author: Lukasz Lenart lukaszlen...@apache.org Authored: Mon Nov 17 11:31:52 2014 +0100 Committer: Lukasz Lenart lukaszlen...@apache.org Committed: Mon Nov 17 11:31:52 2014 +0100 -- apps/blank/pom.xml | 7 +- .../blank/src/main/java/example/HelloWorld.java | 7 + apps/blank/src/main/java/example/YesNo.java | 5 + .../main/resources/example/package.properties | 2 + .../src/main/resources/velocity.properties | 1 + .../webapp/WEB-INF/jsp/example/HelloWorld.jsp | 4 +- apps/jboss-blank/pom.xml| 2 +- .../src/main/resources/velocity.properties | 1 + apps/mailreader/pom.xml | 2 +- .../src/main/resources/velocity.properties | 1 + apps/pom.xml| 2 +- apps/portlet/pom.xml| 2 +- .../src/main/resources/velocity.properties | 1 + apps/rest-showcase/pom.xml | 8 +- .../src/main/resources/log4j.properties |13 +- .../src/main/resources/velocity.properties | 1 + .../WEB-INF/content/orders-deleteConfirm.jsp|25 +- .../main/webapp/WEB-INF/content/orders-edit.jsp |57 +- .../webapp/WEB-INF/content/orders-editNew.jsp |49 +- .../webapp/WEB-INF/content/orders-index.jsp |31 +- .../main/webapp/WEB-INF/content/orders-show.jsp |25 +- .../main/webapp/css/bootstrap-responsive.css| 1058 - .../webapp/css/bootstrap-responsive.min.css | 9 - .../src/main/webapp/css/bootstrap-theme.css | 442 + .../src/main/webapp/css/bootstrap-theme.css.map | 1 + .../src/main/webapp/css/bootstrap-theme.min.css | 5 + .../src/main/webapp/css/bootstrap.css | 9865 ++--- .../src/main/webapp/css/bootstrap.css.map | 1 + .../src/main/webapp/css/bootstrap.min.css |12 +- .../fonts/glyphicons-halflings-regular.eot | Bin 0 - 20335 bytes .../fonts/glyphicons-halflings-regular.svg | 229 + .../fonts/glyphicons-halflings-regular.ttf | Bin 0 - 41280 bytes .../fonts/glyphicons-halflings-regular.woff | Bin 0 - 23320 bytes .../webapp/img/glyphicons-halflings-white.png | Bin 8777 - 0 bytes .../main/webapp/img/glyphicons-halflings.png| Bin 12799 - 0 bytes apps/showcase/pom.xml | 2 +- .../src/main/resources/velocity.properties | 1 + apps/showcase/src/main/webapp/index.html|10 + apps/showcase/src/main/webapp/index.jsp | 1 - archetypes/pom.xml | 2 +- archetypes/struts2-archetype-angularjs/pom.xml | 3 +- .../src/main/webapp/WEB-INF/content/hello.jsp | 9 +- .../src/main/webapp/js/bootstrap.js |25 +- .../src/main/webapp/js/controllers.js |27 +- .../webapp/js/lib/angular/angular-animate.js| 1689 + .../js/lib/angular/angular-animate.min.js |28 + .../js/lib/angular/angular-animate.min.js.map | 8 + .../lib/angular/angular-bootstrap-prettify.js | 1845 - .../angular/angular-bootstrap-prettify.min.js |41 - .../webapp/js/lib/angular/angular-bootstrap.js | 175 - .../js/lib/angular/angular-bootstrap.min.js | 9 - .../webapp/js/lib/angular/angular-cookies.js| 104 +- .../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 |24 + .../webapp/js/lib/angular/angular-loader.js | 230 +- .../webapp/js/lib/angular/angular-loader.min.js |10 +- .../js/lib/angular/angular-loader.min.js.map| 8 + .../main/webapp/js/lib/angular/angular-mocks.js | 1250 +- .../webapp/js/lib/angular/angular-resource.js | 540 +- .../js/lib/angular/angular-resource.min.js |17 +- .../js/lib/angular/angular-resource.min.js.map | 8 + .../main/webapp/js/lib/angular/angular-route.js | 925 + .../webapp/js/lib/angular/angular-route.min.js |14 + .../js/lib/angular/angular-route.min.js.map | 8 + .../webapp/js/lib/angular/angular-sanitize.js | 503 +- .../js/lib/angular/angular-sanitize.min.js |22 +- .../js/lib/angular/angular-sanitize.min.js.map | 8 + .../webapp/js/lib/angular/angular-scenario.js | 32603 ++--- .../main/webapp/js/lib/angular/angular-touch.js | 584 + .../webapp/js/lib/angular/angular-touch.min.js |13 + .../js/lib/angular/angular-touch.min.js.map
[56/56] [abbrv] struts git commit: WW-4391 reverts changes as this breaks WW-4420
WW-4391 reverts changes as this breaks WW-4420
Project: http://git-wip-us.apache.org/repos/asf/struts/repo
Commit: http://git-wip-us.apache.org/repos/asf/struts/commit/e1025a20
Tree: http://git-wip-us.apache.org/repos/asf/struts/tree/e1025a20
Diff: http://git-wip-us.apache.org/repos/asf/struts/diff/e1025a20
Branch: refs/heads/develop
Commit: e1025a207ddfa1b8971ec6261ea2c09da2af157f
Parents: 77c76dc
Author: Lukasz Lenart lukaszlen...@apache.org
Authored: Mon Nov 17 11:39:38 2014 +0100
Committer: Lukasz Lenart lukaszlen...@apache.org
Committed: Mon Nov 17 11:39:38 2014 +0100
--
.../org/apache/struts2/views/freemarker/FreemarkerResult.java | 5 +
1 file changed, 1 insertion(+), 4 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/struts/blob/e1025a20/core/src/main/java/org/apache/struts2/views/freemarker/FreemarkerResult.java
--
diff --git
a/core/src/main/java/org/apache/struts2/views/freemarker/FreemarkerResult.java
b/core/src/main/java/org/apache/struts2/views/freemarker/FreemarkerResult.java
index 95e4073..3ded53b 100644
---
a/core/src/main/java/org/apache/struts2/views/freemarker/FreemarkerResult.java
+++
b/core/src/main/java/org/apache/struts2/views/freemarker/FreemarkerResult.java
@@ -343,10 +343,7 @@ public class FreemarkerResult extends StrutsResultSupport {
contentType = text/html;
}
-String encoding = response.getCharacterEncoding();
-if(encoding == null) {
-encoding = template.getEncoding();
-}
+String encoding = template.getEncoding();
if (encoding != null) {
contentType = contentType + ; charset= + encoding;
[44/56] [abbrv] struts git commit: Uses default scope to create params checkers
Uses default scope to create params checkers Project: http://git-wip-us.apache.org/repos/asf/struts/repo Commit: http://git-wip-us.apache.org/repos/asf/struts/commit/eeab2652 Tree: http://git-wip-us.apache.org/repos/asf/struts/tree/eeab2652 Diff: http://git-wip-us.apache.org/repos/asf/struts/diff/eeab2652 Branch: refs/heads/master Commit: eeab265282774927dbb7f28829a0cebedd9c5d36 Parents: 1aa2752 Author: Lukasz Lenart lukaszlen...@apache.org Authored: Wed Nov 12 09:59:10 2014 +0100 Committer: Lukasz Lenart lukaszlen...@apache.org Committed: Wed Nov 12 09:59:10 2014 +0100 -- core/src/main/resources/struts-default.xml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) -- http://git-wip-us.apache.org/repos/asf/struts/blob/eeab2652/core/src/main/resources/struts-default.xml -- diff --git a/core/src/main/resources/struts-default.xml b/core/src/main/resources/struts-default.xml index b0689a5..43f69ed 100644 --- a/core/src/main/resources/struts-default.xml +++ b/core/src/main/resources/struts-default.xml @@ -160,8 +160,8 @@ bean type=ognl.PropertyAccessor name=java.util.HashSet class=com.opensymphony.xwork2.ognl.accessor.XWorkCollectionPropertyAccessor / bean type=ognl.PropertyAccessor name=java.util.HashMap class=com.opensymphony.xwork2.ognl.accessor.XWorkMapPropertyAccessor / -bean type=com.opensymphony.xwork2.security.ExcludedPatternsChecker name=struts class=com.opensymphony.xwork2.security.DefaultExcludedPatternsChecker / -bean type=com.opensymphony.xwork2.security.AcceptedPatternsChecker name=struts class=com.opensymphony.xwork2.security.DefaultAcceptedPatternsChecker / +bean type=com.opensymphony.xwork2.security.ExcludedPatternsChecker name=struts class=com.opensymphony.xwork2.security.DefaultExcludedPatternsChecker scope=default / +bean type=com.opensymphony.xwork2.security.AcceptedPatternsChecker name=struts class=com.opensymphony.xwork2.security.DefaultAcceptedPatternsChecker scope=default / package name=struts-default abstract=true result-types
[40/56] [abbrv] struts git commit: Groups fields for better readability
Groups fields for better readability
Project: http://git-wip-us.apache.org/repos/asf/struts/repo
Commit: http://git-wip-us.apache.org/repos/asf/struts/commit/92f38df8
Tree: http://git-wip-us.apache.org/repos/asf/struts/tree/92f38df8
Diff: http://git-wip-us.apache.org/repos/asf/struts/diff/92f38df8
Branch: refs/heads/master
Commit: 92f38df890e02c4534925343a4bb0db287e9f810
Parents: 6098ef0
Author: Lukasz Lenart lukaszlen...@apache.org
Authored: Wed Oct 1 07:50:50 2014 +0200
Committer: Lukasz Lenart lukaszlen...@apache.org
Committed: Wed Oct 1 07:50:50 2014 +0200
--
.../opensymphony/xwork2/interceptor/ParametersInterceptor.java| 3 +--
1 file changed, 1 insertion(+), 2 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/struts/blob/92f38df8/xwork-core/src/main/java/com/opensymphony/xwork2/interceptor/ParametersInterceptor.java
--
diff --git
a/xwork-core/src/main/java/com/opensymphony/xwork2/interceptor/ParametersInterceptor.java
b/xwork-core/src/main/java/com/opensymphony/xwork2/interceptor/ParametersInterceptor.java
index d95c2a7..e2a1b39 100644
---
a/xwork-core/src/main/java/com/opensymphony/xwork2/interceptor/ParametersInterceptor.java
+++
b/xwork-core/src/main/java/com/opensymphony/xwork2/interceptor/ParametersInterceptor.java
@@ -145,14 +145,13 @@ public class ParametersInterceptor extends
MethodFilterInterceptor {
protected static final int PARAM_NAME_MAX_LENGTH = 100;
-private ExcludedPatternsChecker excludedPatterns;
-
private int paramNameMaxLength = PARAM_NAME_MAX_LENGTH;
private boolean devMode = false;
protected boolean ordered = false;
private ValueStackFactory valueStackFactory;
+private ExcludedPatternsChecker excludedPatterns;
private AcceptedPatternsChecker acceptedPatterns;
@Inject
[43/56] [abbrv] struts git commit: Reverts acceptParamNames to previous behaviour
Reverts acceptParamNames to previous behaviour
Project: http://git-wip-us.apache.org/repos/asf/struts/repo
Commit: http://git-wip-us.apache.org/repos/asf/struts/commit/1aa2752d
Tree: http://git-wip-us.apache.org/repos/asf/struts/tree/1aa2752d
Diff: http://git-wip-us.apache.org/repos/asf/struts/diff/1aa2752d
Branch: refs/heads/master
Commit: 1aa2752dec32d76a43bd340286b7bda44d7c8c73
Parents: cc11cc2
Author: Lukasz Lenart lukaszlen...@apache.org
Authored: Mon Nov 10 08:43:04 2014 +0100
Committer: Lukasz Lenart lukaszlen...@apache.org
Committed: Mon Nov 10 08:43:04 2014 +0100
--
.../interceptor/ParametersInterceptor.java | 10 ++--
.../security/AcceptedPatternsChecker.java | 16 ++--
.../DefaultAcceptedPatternsChecker.java | 26 +---
.../DefaultExcludedPatternsChecker.java | 26 +---
.../security/ExcludedPatternsChecker.java | 16 ++--
.../interceptor/ParametersInterceptorTest.java | 2 +-
6 files changed, 43 insertions(+), 53 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/struts/blob/1aa2752d/xwork-core/src/main/java/com/opensymphony/xwork2/interceptor/ParametersInterceptor.java
--
diff --git
a/xwork-core/src/main/java/com/opensymphony/xwork2/interceptor/ParametersInterceptor.java
b/xwork-core/src/main/java/com/opensymphony/xwork2/interceptor/ParametersInterceptor.java
index e2a1b39..4cd5a24 100644
---
a/xwork-core/src/main/java/com/opensymphony/xwork2/interceptor/ParametersInterceptor.java
+++
b/xwork-core/src/main/java/com/opensymphony/xwork2/interceptor/ParametersInterceptor.java
@@ -24,7 +24,6 @@ import com.opensymphony.xwork2.XWorkConstants;
import com.opensymphony.xwork2.conversion.impl.InstantiatingNullHandler;
import com.opensymphony.xwork2.conversion.impl.XWorkConverter;
import com.opensymphony.xwork2.inject.Inject;
-import com.opensymphony.xwork2.util.ArrayUtils;
import com.opensymphony.xwork2.util.ClearableValueStack;
import com.opensymphony.xwork2.util.LocalizedTextUtil;
import com.opensymphony.xwork2.util.MemberAccessValueStack;
@@ -35,14 +34,9 @@ import com.opensymphony.xwork2.util.logging.LoggerFactory;
import com.opensymphony.xwork2.util.reflection.ReflectionContextState;
import java.util.Collection;
-import java.util.Collections;
import java.util.Comparator;
-import java.util.HashSet;
import java.util.Map;
-import java.util.Set;
import java.util.TreeMap;
-import java.util.regex.Matcher;
-import java.util.regex.Pattern;
/**
@@ -487,7 +481,7 @@ public class ParametersInterceptor extends
MethodFilterInterceptor {
* @param commaDelim A comma-delimited list of regular expressions
*/
public void setAcceptParamNames(String commaDelim) {
-acceptedPatterns.addAcceptedPatterns(commaDelim);
+acceptedPatterns.setAcceptedPatterns(commaDelim);
}
/**
@@ -497,7 +491,7 @@ public class ParametersInterceptor extends
MethodFilterInterceptor {
* @param commaDelim A comma-delimited list of regular expressions
*/
public void setExcludeParams(String commaDelim) {
-excludedPatterns.addExcludedPatterns(commaDelim);
+excludedPatterns.setExcludedPatterns(commaDelim);
}
}
http://git-wip-us.apache.org/repos/asf/struts/blob/1aa2752d/xwork-core/src/main/java/com/opensymphony/xwork2/security/AcceptedPatternsChecker.java
--
diff --git
a/xwork-core/src/main/java/com/opensymphony/xwork2/security/AcceptedPatternsChecker.java
b/xwork-core/src/main/java/com/opensymphony/xwork2/security/AcceptedPatternsChecker.java
index 6ea9ec9..3e48553 100644
---
a/xwork-core/src/main/java/com/opensymphony/xwork2/security/AcceptedPatternsChecker.java
+++
b/xwork-core/src/main/java/com/opensymphony/xwork2/security/AcceptedPatternsChecker.java
@@ -17,25 +17,25 @@ public interface AcceptedPatternsChecker {
public IsAccepted isAccepted(String value);
/**
- * Allows add additional excluded patterns during runtime
+ * Sets excluded patterns during runtime
*
* @param commaDelimitedPatterns comma delimited string with patterns
*/
-public void addAcceptedPatterns(String commaDelimitedPatterns);
+public void setAcceptedPatterns(String commaDelimitedPatterns);
/**
- * Allows add additional excluded patterns during runtime
+ * Set excluded patterns during runtime
*
- * @param additionalPatterns array of additional excluded patterns
+ * @param patterns array of additional excluded patterns
*/
-public void addAcceptedPatterns(String[] additionalPatterns);
+public void setAcceptedPatterns(String[] patterns);
/**
- * Allows add additional excluded patterns during runtime
+ *
[41/56] [abbrv] struts git commit: logging missing text keys only after all resource bundles have been searched, see WW-4407
logging missing text keys only after all resource bundles have been
searched, see WW-4407
Project: http://git-wip-us.apache.org/repos/asf/struts/repo
Commit: http://git-wip-us.apache.org/repos/asf/struts/commit/381e9275
Tree: http://git-wip-us.apache.org/repos/asf/struts/tree/381e9275
Diff: http://git-wip-us.apache.org/repos/asf/struts/diff/381e9275
Branch: refs/heads/master
Commit: 381e92757520af833c6cd94dc383a1206296f52d
Parents: 92f38df
Author: cnenning cnenn...@apache.org
Authored: Mon Oct 13 13:19:54 2014 +0200
Committer: cnenning cnenn...@apache.org
Committed: Mon Oct 13 13:19:54 2014 +0200
--
.../com/opensymphony/xwork2/util/LocalizedTextUtil.java | 12 +++-
1 file changed, 7 insertions(+), 5 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/struts/blob/381e9275/xwork-core/src/main/java/com/opensymphony/xwork2/util/LocalizedTextUtil.java
--
diff --git
a/xwork-core/src/main/java/com/opensymphony/xwork2/util/LocalizedTextUtil.java
b/xwork-core/src/main/java/com/opensymphony/xwork2/util/LocalizedTextUtil.java
index ec7860e..b7e147f 100644
---
a/xwork-core/src/main/java/com/opensymphony/xwork2/util/LocalizedTextUtil.java
+++
b/xwork-core/src/main/java/com/opensymphony/xwork2/util/LocalizedTextUtil.java
@@ -215,15 +215,17 @@ public class LocalizedTextUtil {
try {
return bundle.getString(aTextName);
} catch (MissingResourceException e) {
-if (devMode) {
-LOG.warn(Missing key [#0] in bundle [#1]!,
aTextName, bundleName);
-} else if (LOG.isDebugEnabled()) {
-LOG.debug(Missing key [#0] in bundle [#1]!,
aTextName, bundleName);
-}
+ // will be logged when not found in any bundle
}
}
}
+if (devMode) {
+LOG.warn(Missing key [#0] in bundles [#1]!, aTextName,
localList);
+} else if (LOG.isDebugEnabled()) {
+LOG.debug(Missing key [#0] in bundles [#1]!, aTextName,
localList);
+}
+
return null;
}
[47/56] [abbrv] struts git commit: Update version used by bom
Update version used by bom Project: http://git-wip-us.apache.org/repos/asf/struts/repo Commit: http://git-wip-us.apache.org/repos/asf/struts/commit/8c222622 Tree: http://git-wip-us.apache.org/repos/asf/struts/tree/8c222622 Diff: http://git-wip-us.apache.org/repos/asf/struts/diff/8c222622 Branch: refs/heads/master Commit: 8c222622e19e3a6bf441261db24be2e0fe4abb7c Parents: 70af4b6 Author: Lukasz Lenart lukaszlen...@apache.org Authored: Fri Nov 14 08:20:46 2014 +0100 Committer: Lukasz Lenart lukaszlen...@apache.org Committed: Fri Nov 14 08:20:46 2014 +0100 -- bom/pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) -- http://git-wip-us.apache.org/repos/asf/struts/blob/8c222622/bom/pom.xml -- diff --git a/bom/pom.xml b/bom/pom.xml index 3ede2ba..ec504d1 100644 --- a/bom/pom.xml +++ b/bom/pom.xml @@ -26,7 +26,7 @@ /licenses properties -struts-version.version2.3.18-SNAPSHOT/struts-version.version +struts-version.version2.3.19-SNAPSHOT/struts-version.version /properties dependencyManagement
[27/56] [abbrv] struts git commit: Switch to latest bootstrap version 3.2.0 in REST Showcase
http://git-wip-us.apache.org/repos/asf/struts/blob/3826c309/apps/rest-showcase/src/main/webapp/css/bootstrap-theme.css.map
--
diff --git a/apps/rest-showcase/src/main/webapp/css/bootstrap-theme.css.map
b/apps/rest-showcase/src/main/webapp/css/bootstrap-theme.css.map
new file mode 100644
index 000..4cc41ab
--- /dev/null
+++ b/apps/rest-showcase/src/main/webapp/css/bootstrap-theme.css.map
@@ -0,0 +1 @@
+{version:3,file:bootstrap-theme.css,sources:[less/theme.less,less/mixins/vendor-prefixes.less,bootstrap-theme.css,less/mixins/gradients.less,less/mixins/reset-filter.less],names:[],mappings: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:[\n//\n// Load core variables
and mixins\n// --\n\n@import
\variables.less\;\n@import \mixins.less\;\n\n\n\n//\n// Buttons\n//
--\n\n// Common
styles\n.btn-default,\n.btn-primary,\n.btn-success,\n.btn-info,\n.btn-warning,\n.btn-danger
{\n text-shadow: 0 -1px 0 rgba(0,0,0,.2);\n @shadow: inset 0 1px 0
rgba(255,255,255,.15), 0 1px 1px rgba(0,0,0,.075);\n .box-shadow(@shadow);\n\n
// Reset the
