qpid-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From lqu...@apache.org
Subject svn commit: r1741609 [3/31] - in /qpid/java/trunk: bdbstore/src/main/java/resources/js/qpid/management/virtualhost/bdb/ bdbstore/src/main/java/resources/js/qpid/management/virtualhost/bdb_ha/ bdbstore/src/main/java/resources/js/qpid/management/virtualh...
Date Fri, 29 Apr 2016 11:04:44 GMT
Modified: qpid/java/trunk/broker-plugins/management-http/src/main/java/resources/js/crypto-js/hmac-sha1.js
URL: http://svn.apache.org/viewvc/qpid/java/trunk/broker-plugins/management-http/src/main/java/resources/js/crypto-js/hmac-sha1.js?rev=1741609&r1=1741608&r2=1741609&view=diff
==============================================================================
--- qpid/java/trunk/broker-plugins/management-http/src/main/java/resources/js/crypto-js/hmac-sha1.js (original)
+++ qpid/java/trunk/broker-plugins/management-http/src/main/java/resources/js/crypto-js/hmac-sha1.js Fri Apr 29 11:04:40 2016
@@ -1,17 +1,421 @@
 /*
-CryptoJS v3.1.2
-code.google.com/p/crypto-js
-(c) 2009-2013 by Jeff Mott. All rights reserved.
-code.google.com/p/crypto-js/wiki/License
-*/
-var CryptoJS=CryptoJS||function(g,l){var e={},d=e.lib={},m=function(){},k=d.Base={extend:function(a){m.prototype=this;var c=new m;a&&c.mixIn(a);c.hasOwnProperty("init")||(c.init=function(){c.$super.init.apply(this,arguments)});c.init.prototype=c;c.$super=this;return c},create:function(){var a=this.extend();a.init.apply(a,arguments);return a},init:function(){},mixIn:function(a){for(var c in a)a.hasOwnProperty(c)&&(this[c]=a[c]);a.hasOwnProperty("toString")&&(this.toString=a.toString)},clone:function(){return this.init.prototype.extend(this)}},
-p=d.WordArray=k.extend({init:function(a,c){a=this.words=a||[];this.sigBytes=c!=l?c:4*a.length},toString:function(a){return(a||n).stringify(this)},concat:function(a){var c=this.words,q=a.words,f=this.sigBytes;a=a.sigBytes;this.clamp();if(f%4)for(var b=0;b<a;b++)c[f+b>>>2]|=(q[b>>>2]>>>24-8*(b%4)&255)<<24-8*((f+b)%4);else if(65535<q.length)for(b=0;b<a;b+=4)c[f+b>>>2]=q[b>>>2];else c.push.apply(c,q);this.sigBytes+=a;return this},clamp:function(){var a=this.words,c=this.sigBytes;a[c>>>2]&=4294967295<<
-32-8*(c%4);a.length=g.ceil(c/4)},clone:function(){var a=k.clone.call(this);a.words=this.words.slice(0);return a},random:function(a){for(var c=[],b=0;b<a;b+=4)c.push(4294967296*g.random()|0);return new p.init(c,a)}}),b=e.enc={},n=b.Hex={stringify:function(a){var c=a.words;a=a.sigBytes;for(var b=[],f=0;f<a;f++){var d=c[f>>>2]>>>24-8*(f%4)&255;b.push((d>>>4).toString(16));b.push((d&15).toString(16))}return b.join("")},parse:function(a){for(var c=a.length,b=[],f=0;f<c;f+=2)b[f>>>3]|=parseInt(a.substr(f,
-2),16)<<24-4*(f%8);return new p.init(b,c/2)}},j=b.Latin1={stringify:function(a){var c=a.words;a=a.sigBytes;for(var b=[],f=0;f<a;f++)b.push(String.fromCharCode(c[f>>>2]>>>24-8*(f%4)&255));return b.join("")},parse:function(a){for(var c=a.length,b=[],f=0;f<c;f++)b[f>>>2]|=(a.charCodeAt(f)&255)<<24-8*(f%4);return new p.init(b,c)}},h=b.Utf8={stringify:function(a){try{return decodeURIComponent(escape(j.stringify(a)))}catch(c){throw Error("Malformed UTF-8 data");}},parse:function(a){return j.parse(unescape(encodeURIComponent(a)))}},
-r=d.BufferedBlockAlgorithm=k.extend({reset:function(){this._data=new p.init;this._nDataBytes=0},_append:function(a){"string"==typeof a&&(a=h.parse(a));this._data.concat(a);this._nDataBytes+=a.sigBytes},_process:function(a){var c=this._data,b=c.words,f=c.sigBytes,d=this.blockSize,e=f/(4*d),e=a?g.ceil(e):g.max((e|0)-this._minBufferSize,0);a=e*d;f=g.min(4*a,f);if(a){for(var k=0;k<a;k+=d)this._doProcessBlock(b,k);k=b.splice(0,a);c.sigBytes-=f}return new p.init(k,f)},clone:function(){var a=k.clone.call(this);
-a._data=this._data.clone();return a},_minBufferSize:0});d.Hasher=r.extend({cfg:k.extend(),init:function(a){this.cfg=this.cfg.extend(a);this.reset()},reset:function(){r.reset.call(this);this._doReset()},update:function(a){this._append(a);this._process();return this},finalize:function(a){a&&this._append(a);return this._doFinalize()},blockSize:16,_createHelper:function(a){return function(b,d){return(new a.init(d)).finalize(b)}},_createHmacHelper:function(a){return function(b,d){return(new s.HMAC.init(a,
-d)).finalize(b)}}});var s=e.algo={};return e}(Math);
-(function(){var g=CryptoJS,l=g.lib,e=l.WordArray,d=l.Hasher,m=[],l=g.algo.SHA1=d.extend({_doReset:function(){this._hash=new e.init([1732584193,4023233417,2562383102,271733878,3285377520])},_doProcessBlock:function(d,e){for(var b=this._hash.words,n=b[0],j=b[1],h=b[2],g=b[3],l=b[4],a=0;80>a;a++){if(16>a)m[a]=d[e+a]|0;else{var c=m[a-3]^m[a-8]^m[a-14]^m[a-16];m[a]=c<<1|c>>>31}c=(n<<5|n>>>27)+l+m[a];c=20>a?c+((j&h|~j&g)+1518500249):40>a?c+((j^h^g)+1859775393):60>a?c+((j&h|j&g|h&g)-1894007588):c+((j^h^
-g)-899497514);l=g;g=h;h=j<<30|j>>>2;j=n;n=c}b[0]=b[0]+n|0;b[1]=b[1]+j|0;b[2]=b[2]+h|0;b[3]=b[3]+g|0;b[4]=b[4]+l|0},_doFinalize:function(){var d=this._data,e=d.words,b=8*this._nDataBytes,g=8*d.sigBytes;e[g>>>5]|=128<<24-g%32;e[(g+64>>>9<<4)+14]=Math.floor(b/4294967296);e[(g+64>>>9<<4)+15]=b;d.sigBytes=4*e.length;this._process();return this._hash},clone:function(){var e=d.clone.call(this);e._hash=this._hash.clone();return e}});g.SHA1=d._createHelper(l);g.HmacSHA1=d._createHmacHelper(l)})();
-(function(){var g=CryptoJS,l=g.enc.Utf8;g.algo.HMAC=g.lib.Base.extend({init:function(e,d){e=this._hasher=new e.init;"string"==typeof d&&(d=l.parse(d));var g=e.blockSize,k=4*g;d.sigBytes>k&&(d=e.finalize(d));d.clamp();for(var p=this._oKey=d.clone(),b=this._iKey=d.clone(),n=p.words,j=b.words,h=0;h<g;h++)n[h]^=1549556828,j[h]^=909522486;p.sigBytes=b.sigBytes=k;this.reset()},reset:function(){var e=this._hasher;e.reset();e.update(this._iKey)},update:function(e){this._hasher.update(e);return this},finalize:function(e){var d=
-this._hasher;e=d.finalize(e);d.reset();return d.finalize(this._oKey.clone().concat(e))}})})();
+ CryptoJS v3.1.2
+ code.google.com/p/crypto-js
+ (c) 2009-2013 by Jeff Mott. All rights reserved.
+ code.google.com/p/crypto-js/wiki/License
+ */
+var CryptoJS = CryptoJS || function (g, l)
+    {
+        var e = {}, d = e.lib = {}, m = function ()
+        {
+        }, k = d.Base = {
+            extend: function (a)
+            {
+                m.prototype = this;
+                var c = new m;
+                a && c.mixIn(a);
+                c.hasOwnProperty("init") || (c.init = function ()
+                {
+                    c.$super.init.apply(this, arguments)
+                });
+                c.init.prototype = c;
+                c.$super = this;
+                return c
+            },
+            create: function ()
+            {
+                var a = this.extend();
+                a.init.apply(a, arguments);
+                return a
+            },
+            init: function ()
+            {
+            },
+            mixIn: function (a)
+            {
+                for (var c in a)
+                {
+                    a.hasOwnProperty(c) && (this[c] = a[c]);
+                }
+                a.hasOwnProperty("toString") && (this.toString = a.toString)
+            },
+            clone: function ()
+            {
+                return this.init.prototype.extend(this)
+            }
+        }, p = d.WordArray = k.extend({
+                                          init: function (a, c)
+                                          {
+                                              a = this.words = a || [];
+                                              this.sigBytes = c != l ? c : 4 * a.length
+                                          },
+                                          toString: function (a)
+                                          {
+                                              return (a || n).stringify(this)
+                                          },
+                                          concat: function (a)
+                                          {
+                                              var c = this.words, q = a.words, f = this.sigBytes;
+                                              a = a.sigBytes;
+                                              this.clamp();
+                                              if (f % 4)
+                                              {
+                                                  for (var b = 0; b < a; b++)
+                                                  {
+                                                      c[f + b >>> 2] |=
+                                                          (q[b >>> 2] >>> 24 - 8 * (b % 4) & 255) << 24 - 8 * ((f + b)
+                                                                                                               % 4);
+                                                  }
+                                              }
+                                              else if (65535 < q.length)
+                                              {
+                                                  for (b = 0; b < a; b += 4)
+                                                  {
+                                                      c[f + b >>> 2] = q[b >>> 2];
+                                                  }
+                                              }
+                                              else
+                                              {
+                                                  c.push.apply(c, q);
+                                              }
+                                              this.sigBytes += a;
+                                              return this
+                                          },
+                                          clamp: function ()
+                                          {
+                                              var a = this.words, c = this.sigBytes;
+                                              a[c >>> 2] &= 4294967295 << 32 - 8 * (c % 4);
+                                              a.length = g.ceil(c / 4)
+                                          },
+                                          clone: function ()
+                                          {
+                                              var a = k.clone.call(this);
+                                              a.words = this.words.slice(0);
+                                              return a
+                                          },
+                                          random: function (a)
+                                          {
+                                              for (var c = [], b = 0; b < a; b += 4)
+                                              {
+                                                  c.push(4294967296 * g.random() | 0);
+                                              }
+                                              return new p.init(c, a)
+                                          }
+                                      }), b = e.enc = {}, n = b.Hex = {
+            stringify: function (a)
+            {
+                var c = a.words;
+                a = a.sigBytes;
+                for (var b = [], f = 0; f < a; f++)
+                {
+                    var d = c[f >>> 2] >>> 24 - 8 * (f % 4) & 255;
+                    b.push((d >>> 4).toString(16));
+                    b.push((d & 15).toString(16))
+                }
+                return b.join("")
+            },
+            parse: function (a)
+            {
+                for (var c = a.length, b = [], f = 0; f < c; f += 2)
+                {
+                    b[f >>> 3] |= parseInt(a.substr(f, 2), 16) << 24 - 4 * (f % 8);
+                }
+                return new p.init(b, c / 2)
+            }
+        }, j = b.Latin1 = {
+            stringify: function (a)
+            {
+                var c = a.words;
+                a = a.sigBytes;
+                for (var b = [], f = 0; f < a; f++)
+                {
+                    b.push(String.fromCharCode(c[f >>> 2] >>> 24 - 8 * (f % 4) & 255));
+                }
+                return b.join("")
+            },
+            parse: function (a)
+            {
+                for (var c = a.length, b = [], f = 0; f < c; f++)
+                {
+                    b[f >>> 2] |= (a.charCodeAt(f) & 255) << 24 - 8 * (f % 4);
+                }
+                return new p.init(b, c)
+            }
+        }, h = b.Utf8 = {
+            stringify: function (a)
+            {
+                try
+                {
+                    return decodeURIComponent(escape(j.stringify(a)))
+                }
+                catch (c)
+                {
+                    throw Error("Malformed UTF-8 data");
+                }
+            },
+            parse: function (a)
+            {
+                return j.parse(unescape(encodeURIComponent(a)))
+            }
+        }, r = d.BufferedBlockAlgorithm = k.extend({
+                                                       reset: function ()
+                                                       {
+                                                           this._data = new p.init;
+                                                           this._nDataBytes = 0
+                                                       },
+                                                       _append: function (a)
+                                                       {
+                                                           "string" == typeof a && (a = h.parse(a));
+                                                           this._data.concat(a);
+                                                           this._nDataBytes += a.sigBytes
+                                                       },
+                                                       _process: function (a)
+                                                       {
+                                                           var c = this._data, b = c.words, f = c.sigBytes, d = this.blockSize, e = f
+                                                                                                                                    / (4
+                                                                                                                                       * d), e = a
+                                                               ? g.ceil(e)
+                                                               : g.max((e | 0) - this._minBufferSize, 0);
+                                                           a = e * d;
+                                                           f = g.min(4 * a, f);
+                                                           if (a)
+                                                           {
+                                                               for (var k = 0; k < a; k += d)
+                                                               {
+                                                                   this._doProcessBlock(b, k);
+                                                               }
+                                                               k = b.splice(0, a);
+                                                               c.sigBytes -= f
+                                                           }
+                                                           return new p.init(k, f)
+                                                       },
+                                                       clone: function ()
+                                                       {
+                                                           var a = k.clone.call(this);
+                                                           a._data = this._data.clone();
+                                                           return a
+                                                       },
+                                                       _minBufferSize: 0
+                                                   });
+        d.Hasher = r.extend({
+                                cfg: k.extend(),
+                                init: function (a)
+                                {
+                                    this.cfg = this.cfg.extend(a);
+                                    this.reset()
+                                },
+                                reset: function ()
+                                {
+                                    r.reset.call(this);
+                                    this._doReset()
+                                },
+                                update: function (a)
+                                {
+                                    this._append(a);
+                                    this._process();
+                                    return this
+                                },
+                                finalize: function (a)
+                                {
+                                    a && this._append(a);
+                                    return this._doFinalize()
+                                },
+                                blockSize: 16,
+                                _createHelper: function (a)
+                                {
+                                    return function (b, d)
+                                    {
+                                        return (new a.init(d)).finalize(b)
+                                    }
+                                },
+                                _createHmacHelper: function (a)
+                                {
+                                    return function (b, d)
+                                    {
+                                        return (new s.HMAC.init(a, d)).finalize(b)
+                                    }
+                                }
+                            });
+        var s = e.algo = {};
+        return e
+    }(Math);
+(function ()
+{
+    var g = CryptoJS, l = g.lib, e = l.WordArray, d = l.Hasher, m = [], l = g.algo.SHA1 = d.extend({
+                                                                                                       _doReset: function ()
+                                                                                                       {
+                                                                                                           this._hash =
+                                                                                                               new e.init([1732584193,
+                                                                                                                           4023233417,
+                                                                                                                           2562383102,
+                                                                                                                           271733878,
+                                                                                                                           3285377520])
+                                                                                                       },
+                                                                                                       _doProcessBlock: function (d, e)
+                                                                                                       {
+                                                                                                           for (var b = this._hash.words, n = b[0], j = b[1], h = b[2], g = b[3], l = b[4], a = 0;
+                                                                                                                80 > a;
+                                                                                                                a++)
+                                                                                                           {
+                                                                                                               if (16
+                                                                                                                   > a)
+                                                                                                               {
+                                                                                                                   m[a] =
+                                                                                                                       d[e
+                                                                                                                         + a]
+                                                                                                                       | 0;
+                                                                                                               }
+                                                                                                               else
+                                                                                                               {
+                                                                                                                   var c = m[a
+                                                                                                                             - 3]
+                                                                                                                           ^ m[a
+                                                                                                                               - 8]
+                                                                                                                           ^ m[a
+                                                                                                                               - 14]
+                                                                                                                           ^ m[a
+                                                                                                                               - 16];
+                                                                                                                   m[a] =
+                                                                                                                       c
+                                                                                                                       << 1
+                                                                                                                       | c
+                                                                                                                         >>> 31
+                                                                                                               }
+                                                                                                               c = (n
+                                                                                                                    << 5
+                                                                                                                    | n
+                                                                                                                      >>> 27)
+                                                                                                                   + l
+                                                                                                                   + m[a];
+                                                                                                               c = 20
+                                                                                                                   > a
+                                                                                                                   ? c
+                                                                                                                     + ((j
+                                                                                                                         & h
+                                                                                                                         | ~j
+                                                                                                                           & g)
+                                                                                                                     + 1518500249)
+                                                                                                                   : 40
+                                                                                                                     > a
+                                                                                                                       ? c
+                                                                                                                         + ((j
+                                                                                                                             ^ h
+                                                                                                                             ^ g)
+                                                                                                                         + 1859775393)
+                                                                                                                       : 60
+                                                                                                                         > a
+                                                                                                                         ? c
+                                                                                                                           + ((j
+                                                                                                                               & h
+                                                                                                                               | j
+                                                                                                                                 & g
+                                                                                                                               | h
+                                                                                                                                 & g)
+                                                                                                                              - 1894007588)
+                                                                                                                         : c
+                                                                                                                           + ((j
+                                                                                                                               ^ h
+                                                                                                                               ^ g)
+                                                                                                                              - 899497514);
+                                                                                                               l = g;
+                                                                                                               g = h;
+                                                                                                               h = j
+                                                                                                                   << 30
+                                                                                                                   | j
+                                                                                                                     >>> 2;
+                                                                                                               j = n;
+                                                                                                               n = c
+                                                                                                           }
+                                                                                                           b[0] =
+                                                                                                               b[0] + n
+                                                                                                               | 0;
+                                                                                                           b[1] =
+                                                                                                               b[1] + j
+                                                                                                               | 0;
+                                                                                                           b[2] =
+                                                                                                               b[2] + h
+                                                                                                               | 0;
+                                                                                                           b[3] =
+                                                                                                               b[3] + g
+                                                                                                               | 0;
+                                                                                                           b[4] =
+                                                                                                               b[4] + l
+                                                                                                               | 0
+                                                                                                       },
+                                                                                                       _doFinalize: function ()
+                                                                                                       {
+                                                                                                           var d = this._data, e = d.words, b = 8
+                                                                                                                                                * this._nDataBytes, g = 8
+                                                                                                                                                                        * d.sigBytes;
+                                                                                                           e[g >>> 5] |=
+                                                                                                               128 << 24
+                                                                                                                      - g
+                                                                                                                        % 32;
+                                                                                                           e[(g + 64
+                                                                                                              >>> 9
+                                                                                                              << 4)
+                                                                                                             + 14] =
+                                                                                                               Math.floor(
+                                                                                                                   b
+                                                                                                                   / 4294967296);
+                                                                                                           e[(g + 64
+                                                                                                              >>> 9
+                                                                                                              << 4)
+                                                                                                             + 15] = b;
+                                                                                                           d.sigBytes =
+                                                                                                               4
+                                                                                                               * e.length;
+                                                                                                           this._process();
+                                                                                                           return this._hash
+                                                                                                       },
+                                                                                                       clone: function ()
+                                                                                                       {
+                                                                                                           var e = d.clone.call(
+                                                                                                               this);
+                                                                                                           e._hash =
+                                                                                                               this._hash.clone();
+                                                                                                           return e
+                                                                                                       }
+                                                                                                   });
+    g.SHA1 = d._createHelper(l);
+    g.HmacSHA1 = d._createHmacHelper(l)
+})();
+(function ()
+{
+    var g = CryptoJS, l = g.enc.Utf8;
+    g.algo.HMAC = g.lib.Base.extend({
+                                        init: function (e, d)
+                                        {
+                                            e = this._hasher = new e.init;
+                                            "string" == typeof d && (d = l.parse(d));
+                                            var g = e.blockSize, k = 4 * g;
+                                            d.sigBytes > k && (d = e.finalize(d));
+                                            d.clamp();
+                                            for (var p = this._oKey = d.clone(), b = this._iKey =
+                                                d.clone(), n = p.words, j = b.words, h = 0; h < g; h++)
+                                            {
+                                                n[h] ^= 1549556828, j[h] ^= 909522486;
+                                            }
+                                            p.sigBytes = b.sigBytes = k;
+                                            this.reset()
+                                        },
+                                        reset: function ()
+                                        {
+                                            var e = this._hasher;
+                                            e.reset();
+                                            e.update(this._iKey)
+                                        },
+                                        update: function (e)
+                                        {
+                                            this._hasher.update(e);
+                                            return this
+                                        },
+                                        finalize: function (e)
+                                        {
+                                            var d = this._hasher;
+                                            e = d.finalize(e);
+                                            d.reset();
+                                            return d.finalize(this._oKey.clone().concat(e))
+                                        }
+                                    })
+})();

Modified: qpid/java/trunk/broker-plugins/management-http/src/main/java/resources/js/crypto-js/hmac-sha256.js
URL: http://svn.apache.org/viewvc/qpid/java/trunk/broker-plugins/management-http/src/main/java/resources/js/crypto-js/hmac-sha256.js?rev=1741609&r1=1741608&r2=1741609&view=diff
==============================================================================
--- qpid/java/trunk/broker-plugins/management-http/src/main/java/resources/js/crypto-js/hmac-sha256.js (original)
+++ qpid/java/trunk/broker-plugins/management-http/src/main/java/resources/js/crypto-js/hmac-sha256.js Fri Apr 29 11:04:40 2016
@@ -1,18 +1,372 @@
 /*
-CryptoJS v3.1.2
-code.google.com/p/crypto-js
-(c) 2009-2013 by Jeff Mott. All rights reserved.
-code.google.com/p/crypto-js/wiki/License
-*/
-var CryptoJS=CryptoJS||function(h,s){var f={},g=f.lib={},q=function(){},m=g.Base={extend:function(a){q.prototype=this;var c=new q;a&&c.mixIn(a);c.hasOwnProperty("init")||(c.init=function(){c.$super.init.apply(this,arguments)});c.init.prototype=c;c.$super=this;return c},create:function(){var a=this.extend();a.init.apply(a,arguments);return a},init:function(){},mixIn:function(a){for(var c in a)a.hasOwnProperty(c)&&(this[c]=a[c]);a.hasOwnProperty("toString")&&(this.toString=a.toString)},clone:function(){return this.init.prototype.extend(this)}},
-r=g.WordArray=m.extend({init:function(a,c){a=this.words=a||[];this.sigBytes=c!=s?c:4*a.length},toString:function(a){return(a||k).stringify(this)},concat:function(a){var c=this.words,d=a.words,b=this.sigBytes;a=a.sigBytes;this.clamp();if(b%4)for(var e=0;e<a;e++)c[b+e>>>2]|=(d[e>>>2]>>>24-8*(e%4)&255)<<24-8*((b+e)%4);else if(65535<d.length)for(e=0;e<a;e+=4)c[b+e>>>2]=d[e>>>2];else c.push.apply(c,d);this.sigBytes+=a;return this},clamp:function(){var a=this.words,c=this.sigBytes;a[c>>>2]&=4294967295<<
-32-8*(c%4);a.length=h.ceil(c/4)},clone:function(){var a=m.clone.call(this);a.words=this.words.slice(0);return a},random:function(a){for(var c=[],d=0;d<a;d+=4)c.push(4294967296*h.random()|0);return new r.init(c,a)}}),l=f.enc={},k=l.Hex={stringify:function(a){var c=a.words;a=a.sigBytes;for(var d=[],b=0;b<a;b++){var e=c[b>>>2]>>>24-8*(b%4)&255;d.push((e>>>4).toString(16));d.push((e&15).toString(16))}return d.join("")},parse:function(a){for(var c=a.length,d=[],b=0;b<c;b+=2)d[b>>>3]|=parseInt(a.substr(b,
-2),16)<<24-4*(b%8);return new r.init(d,c/2)}},n=l.Latin1={stringify:function(a){var c=a.words;a=a.sigBytes;for(var d=[],b=0;b<a;b++)d.push(String.fromCharCode(c[b>>>2]>>>24-8*(b%4)&255));return d.join("")},parse:function(a){for(var c=a.length,d=[],b=0;b<c;b++)d[b>>>2]|=(a.charCodeAt(b)&255)<<24-8*(b%4);return new r.init(d,c)}},j=l.Utf8={stringify:function(a){try{return decodeURIComponent(escape(n.stringify(a)))}catch(c){throw Error("Malformed UTF-8 data");}},parse:function(a){return n.parse(unescape(encodeURIComponent(a)))}},
-u=g.BufferedBlockAlgorithm=m.extend({reset:function(){this._data=new r.init;this._nDataBytes=0},_append:function(a){"string"==typeof a&&(a=j.parse(a));this._data.concat(a);this._nDataBytes+=a.sigBytes},_process:function(a){var c=this._data,d=c.words,b=c.sigBytes,e=this.blockSize,f=b/(4*e),f=a?h.ceil(f):h.max((f|0)-this._minBufferSize,0);a=f*e;b=h.min(4*a,b);if(a){for(var g=0;g<a;g+=e)this._doProcessBlock(d,g);g=d.splice(0,a);c.sigBytes-=b}return new r.init(g,b)},clone:function(){var a=m.clone.call(this);
-a._data=this._data.clone();return a},_minBufferSize:0});g.Hasher=u.extend({cfg:m.extend(),init:function(a){this.cfg=this.cfg.extend(a);this.reset()},reset:function(){u.reset.call(this);this._doReset()},update:function(a){this._append(a);this._process();return this},finalize:function(a){a&&this._append(a);return this._doFinalize()},blockSize:16,_createHelper:function(a){return function(c,d){return(new a.init(d)).finalize(c)}},_createHmacHelper:function(a){return function(c,d){return(new t.HMAC.init(a,
-d)).finalize(c)}}});var t=f.algo={};return f}(Math);
-(function(h){for(var s=CryptoJS,f=s.lib,g=f.WordArray,q=f.Hasher,f=s.algo,m=[],r=[],l=function(a){return 4294967296*(a-(a|0))|0},k=2,n=0;64>n;){var j;a:{j=k;for(var u=h.sqrt(j),t=2;t<=u;t++)if(!(j%t)){j=!1;break a}j=!0}j&&(8>n&&(m[n]=l(h.pow(k,0.5))),r[n]=l(h.pow(k,1/3)),n++);k++}var a=[],f=f.SHA256=q.extend({_doReset:function(){this._hash=new g.init(m.slice(0))},_doProcessBlock:function(c,d){for(var b=this._hash.words,e=b[0],f=b[1],g=b[2],j=b[3],h=b[4],m=b[5],n=b[6],q=b[7],p=0;64>p;p++){if(16>p)a[p]=
-c[d+p]|0;else{var k=a[p-15],l=a[p-2];a[p]=((k<<25|k>>>7)^(k<<14|k>>>18)^k>>>3)+a[p-7]+((l<<15|l>>>17)^(l<<13|l>>>19)^l>>>10)+a[p-16]}k=q+((h<<26|h>>>6)^(h<<21|h>>>11)^(h<<7|h>>>25))+(h&m^~h&n)+r[p]+a[p];l=((e<<30|e>>>2)^(e<<19|e>>>13)^(e<<10|e>>>22))+(e&f^e&g^f&g);q=n;n=m;m=h;h=j+k|0;j=g;g=f;f=e;e=k+l|0}b[0]=b[0]+e|0;b[1]=b[1]+f|0;b[2]=b[2]+g|0;b[3]=b[3]+j|0;b[4]=b[4]+h|0;b[5]=b[5]+m|0;b[6]=b[6]+n|0;b[7]=b[7]+q|0},_doFinalize:function(){var a=this._data,d=a.words,b=8*this._nDataBytes,e=8*a.sigBytes;
-d[e>>>5]|=128<<24-e%32;d[(e+64>>>9<<4)+14]=h.floor(b/4294967296);d[(e+64>>>9<<4)+15]=b;a.sigBytes=4*d.length;this._process();return this._hash},clone:function(){var a=q.clone.call(this);a._hash=this._hash.clone();return a}});s.SHA256=q._createHelper(f);s.HmacSHA256=q._createHmacHelper(f)})(Math);
-(function(){var h=CryptoJS,s=h.enc.Utf8;h.algo.HMAC=h.lib.Base.extend({init:function(f,g){f=this._hasher=new f.init;"string"==typeof g&&(g=s.parse(g));var h=f.blockSize,m=4*h;g.sigBytes>m&&(g=f.finalize(g));g.clamp();for(var r=this._oKey=g.clone(),l=this._iKey=g.clone(),k=r.words,n=l.words,j=0;j<h;j++)k[j]^=1549556828,n[j]^=909522486;r.sigBytes=l.sigBytes=m;this.reset()},reset:function(){var f=this._hasher;f.reset();f.update(this._iKey)},update:function(f){this._hasher.update(f);return this},finalize:function(f){var g=
-this._hasher;f=g.finalize(f);g.reset();return g.finalize(this._oKey.clone().concat(f))}})})();
+ CryptoJS v3.1.2
+ code.google.com/p/crypto-js
+ (c) 2009-2013 by Jeff Mott. All rights reserved.
+ code.google.com/p/crypto-js/wiki/License
+ */
+var CryptoJS = CryptoJS || function (h, s)
+    {
+        var f = {}, g = f.lib = {}, q = function ()
+        {
+        }, m = g.Base = {
+            extend: function (a)
+            {
+                q.prototype = this;
+                var c = new q;
+                a && c.mixIn(a);
+                c.hasOwnProperty("init") || (c.init = function ()
+                {
+                    c.$super.init.apply(this, arguments)
+                });
+                c.init.prototype = c;
+                c.$super = this;
+                return c
+            },
+            create: function ()
+            {
+                var a = this.extend();
+                a.init.apply(a, arguments);
+                return a
+            },
+            init: function ()
+            {
+            },
+            mixIn: function (a)
+            {
+                for (var c in a)
+                {
+                    a.hasOwnProperty(c) && (this[c] = a[c]);
+                }
+                a.hasOwnProperty("toString") && (this.toString = a.toString)
+            },
+            clone: function ()
+            {
+                return this.init.prototype.extend(this)
+            }
+        }, r = g.WordArray = m.extend({
+                                          init: function (a, c)
+                                          {
+                                              a = this.words = a || [];
+                                              this.sigBytes = c != s ? c : 4 * a.length
+                                          },
+                                          toString: function (a)
+                                          {
+                                              return (a || k).stringify(this)
+                                          },
+                                          concat: function (a)
+                                          {
+                                              var c = this.words, d = a.words, b = this.sigBytes;
+                                              a = a.sigBytes;
+                                              this.clamp();
+                                              if (b % 4)
+                                              {
+                                                  for (var e = 0; e < a; e++)
+                                                  {
+                                                      c[b + e >>> 2] |=
+                                                          (d[e >>> 2] >>> 24 - 8 * (e % 4) & 255) << 24 - 8 * ((b + e)
+                                                                                                               % 4);
+                                                  }
+                                              }
+                                              else if (65535 < d.length)
+                                              {
+                                                  for (e = 0; e < a; e += 4)
+                                                  {
+                                                      c[b + e >>> 2] = d[e >>> 2];
+                                                  }
+                                              }
+                                              else
+                                              {
+                                                  c.push.apply(c, d);
+                                              }
+                                              this.sigBytes += a;
+                                              return this
+                                          },
+                                          clamp: function ()
+                                          {
+                                              var a = this.words, c = this.sigBytes;
+                                              a[c >>> 2] &= 4294967295 << 32 - 8 * (c % 4);
+                                              a.length = h.ceil(c / 4)
+                                          },
+                                          clone: function ()
+                                          {
+                                              var a = m.clone.call(this);
+                                              a.words = this.words.slice(0);
+                                              return a
+                                          },
+                                          random: function (a)
+                                          {
+                                              for (var c = [], d = 0; d < a; d += 4)
+                                              {
+                                                  c.push(4294967296 * h.random() | 0);
+                                              }
+                                              return new r.init(c, a)
+                                          }
+                                      }), l = f.enc = {}, k = l.Hex = {
+            stringify: function (a)
+            {
+                var c = a.words;
+                a = a.sigBytes;
+                for (var d = [], b = 0; b < a; b++)
+                {
+                    var e = c[b >>> 2] >>> 24 - 8 * (b % 4) & 255;
+                    d.push((e >>> 4).toString(16));
+                    d.push((e & 15).toString(16))
+                }
+                return d.join("")
+            },
+            parse: function (a)
+            {
+                for (var c = a.length, d = [], b = 0; b < c; b += 2)
+                {
+                    d[b >>> 3] |= parseInt(a.substr(b, 2), 16) << 24 - 4 * (b % 8);
+                }
+                return new r.init(d, c / 2)
+            }
+        }, n = l.Latin1 = {
+            stringify: function (a)
+            {
+                var c = a.words;
+                a = a.sigBytes;
+                for (var d = [], b = 0; b < a; b++)
+                {
+                    d.push(String.fromCharCode(c[b >>> 2] >>> 24 - 8 * (b % 4) & 255));
+                }
+                return d.join("")
+            },
+            parse: function (a)
+            {
+                for (var c = a.length, d = [], b = 0; b < c; b++)
+                {
+                    d[b >>> 2] |= (a.charCodeAt(b) & 255) << 24 - 8 * (b % 4);
+                }
+                return new r.init(d, c)
+            }
+        }, j = l.Utf8 = {
+            stringify: function (a)
+            {
+                try
+                {
+                    return decodeURIComponent(escape(n.stringify(a)))
+                }
+                catch (c)
+                {
+                    throw Error("Malformed UTF-8 data");
+                }
+            },
+            parse: function (a)
+            {
+                return n.parse(unescape(encodeURIComponent(a)))
+            }
+        }, u = g.BufferedBlockAlgorithm = m.extend({
+                                                       reset: function ()
+                                                       {
+                                                           this._data = new r.init;
+                                                           this._nDataBytes = 0
+                                                       },
+                                                       _append: function (a)
+                                                       {
+                                                           "string" == typeof a && (a = j.parse(a));
+                                                           this._data.concat(a);
+                                                           this._nDataBytes += a.sigBytes
+                                                       },
+                                                       _process: function (a)
+                                                       {
+                                                           var c = this._data, d = c.words, b = c.sigBytes, e = this.blockSize, f = b
+                                                                                                                                    / (4
+                                                                                                                                       * e), f = a
+                                                               ? h.ceil(f)
+                                                               : h.max((f | 0) - this._minBufferSize, 0);
+                                                           a = f * e;
+                                                           b = h.min(4 * a, b);
+                                                           if (a)
+                                                           {
+                                                               for (var g = 0; g < a; g += e)
+                                                               {
+                                                                   this._doProcessBlock(d, g);
+                                                               }
+                                                               g = d.splice(0, a);
+                                                               c.sigBytes -= b
+                                                           }
+                                                           return new r.init(g, b)
+                                                       },
+                                                       clone: function ()
+                                                       {
+                                                           var a = m.clone.call(this);
+                                                           a._data = this._data.clone();
+                                                           return a
+                                                       },
+                                                       _minBufferSize: 0
+                                                   });
+        g.Hasher = u.extend({
+                                cfg: m.extend(),
+                                init: function (a)
+                                {
+                                    this.cfg = this.cfg.extend(a);
+                                    this.reset()
+                                },
+                                reset: function ()
+                                {
+                                    u.reset.call(this);
+                                    this._doReset()
+                                },
+                                update: function (a)
+                                {
+                                    this._append(a);
+                                    this._process();
+                                    return this
+                                },
+                                finalize: function (a)
+                                {
+                                    a && this._append(a);
+                                    return this._doFinalize()
+                                },
+                                blockSize: 16,
+                                _createHelper: function (a)
+                                {
+                                    return function (c, d)
+                                    {
+                                        return (new a.init(d)).finalize(c)
+                                    }
+                                },
+                                _createHmacHelper: function (a)
+                                {
+                                    return function (c, d)
+                                    {
+                                        return (new t.HMAC.init(a, d)).finalize(c)
+                                    }
+                                }
+                            });
+        var t = f.algo = {};
+        return f
+    }(Math);
+(function (h)
+{
+    for (var s = CryptoJS, f = s.lib, g = f.WordArray, q = f.Hasher, f = s.algo, m = [], r = [], l = function (a)
+    {
+        return 4294967296 * (a - (a | 0)) | 0
+    }, k = 2, n = 0; 64 > n;)
+    {
+        var j;
+        a:{
+            j = k;
+            for (var u = h.sqrt(j), t = 2; t <= u; t++)
+            {
+                if (!(j % t))
+                {
+                    j = !1;
+                    break a
+                }
+            }
+            j = !0
+        }
+        j && (8 > n && (m[n] = l(h.pow(k, 0.5))), r[n] = l(h.pow(k, 1 / 3)), n++);
+        k++
+    }
+    var a = [], f = f.SHA256 = q.extend({
+                                            _doReset: function ()
+                                            {
+                                                this._hash = new g.init(m.slice(0))
+                                            },
+                                            _doProcessBlock: function (c, d)
+                                            {
+                                                for (var b = this._hash.words, e = b[0], f = b[1], g = b[2], j = b[3], h = b[4], m = b[5], n = b[6], q = b[7], p = 0;
+                                                     64 > p;
+                                                     p++)
+                                                {
+                                                    if (16 > p)
+                                                    {
+                                                        a[p] = c[d + p] | 0;
+                                                    }
+                                                    else
+                                                    {
+                                                        var k = a[p - 15], l = a[p - 2];
+                                                        a[p] =
+                                                            ((k << 25 | k >>> 7) ^ (k << 14 | k >>> 18) ^ k >>> 3) + a[p
+                                                                                                                       - 7]
+                                                            + ((l << 15 | l >>> 17) ^ (l << 13 | l >>> 19) ^ l >>> 10)
+                                                            + a[p - 16]
+                                                    }
+                                                    k = q + ((h << 26 | h >>> 6) ^ (h << 21 | h >>> 11) ^ (h << 7 | h
+                                                                                                                    >>> 25))
+                                                        + (h & m ^ ~h & n) + r[p] + a[p];
+                                                    l = ((e << 30 | e >>> 2) ^ (e << 19 | e >>> 13) ^ (e << 10 | e
+                                                                                                                 >>> 22))
+                                                        + (e & f ^ e & g ^ f & g);
+                                                    q = n;
+                                                    n = m;
+                                                    m = h;
+                                                    h = j + k | 0;
+                                                    j = g;
+                                                    g = f;
+                                                    f = e;
+                                                    e = k + l | 0
+                                                }
+                                                b[0] = b[0] + e | 0;
+                                                b[1] = b[1] + f | 0;
+                                                b[2] = b[2] + g | 0;
+                                                b[3] = b[3] + j | 0;
+                                                b[4] = b[4] + h | 0;
+                                                b[5] = b[5] + m | 0;
+                                                b[6] = b[6] + n | 0;
+                                                b[7] = b[7] + q | 0
+                                            },
+                                            _doFinalize: function ()
+                                            {
+                                                var a = this._data, d = a.words, b = 8 * this._nDataBytes, e = 8
+                                                                                                               * a.sigBytes;
+                                                d[e >>> 5] |= 128 << 24 - e % 32;
+                                                d[(e + 64 >>> 9 << 4) + 14] = h.floor(b / 4294967296);
+                                                d[(e + 64 >>> 9 << 4) + 15] = b;
+                                                a.sigBytes = 4 * d.length;
+                                                this._process();
+                                                return this._hash
+                                            },
+                                            clone: function ()
+                                            {
+                                                var a = q.clone.call(this);
+                                                a._hash = this._hash.clone();
+                                                return a
+                                            }
+                                        });
+    s.SHA256 = q._createHelper(f);
+    s.HmacSHA256 = q._createHmacHelper(f)
+})(Math);
+(function ()
+{
+    var h = CryptoJS, s = h.enc.Utf8;
+    h.algo.HMAC = h.lib.Base.extend({
+                                        init: function (f, g)
+                                        {
+                                            f = this._hasher = new f.init;
+                                            "string" == typeof g && (g = s.parse(g));
+                                            var h = f.blockSize, m = 4 * h;
+                                            g.sigBytes > m && (g = f.finalize(g));
+                                            g.clamp();
+                                            for (var r = this._oKey = g.clone(), l = this._iKey =
+                                                g.clone(), k = r.words, n = l.words, j = 0; j < h; j++)
+                                            {
+                                                k[j] ^= 1549556828, n[j] ^= 909522486;
+                                            }
+                                            r.sigBytes = l.sigBytes = m;
+                                            this.reset()
+                                        },
+                                        reset: function ()
+                                        {
+                                            var f = this._hasher;
+                                            f.reset();
+                                            f.update(this._iKey)
+                                        },
+                                        update: function (f)
+                                        {
+                                            this._hasher.update(f);
+                                            return this
+                                        },
+                                        finalize: function (f)
+                                        {
+                                            var g = this._hasher;
+                                            f = g.finalize(f);
+                                            g.reset();
+                                            return g.finalize(this._oKey.clone().concat(f))
+                                        }
+                                    })
+})();

Modified: qpid/java/trunk/broker-plugins/management-http/src/main/java/resources/js/qpid/addVirtualHostAlias.js
URL: http://svn.apache.org/viewvc/qpid/java/trunk/broker-plugins/management-http/src/main/java/resources/js/qpid/addVirtualHostAlias.js?rev=1741609&r1=1741608&r2=1741609&view=diff
==============================================================================
--- qpid/java/trunk/broker-plugins/management-http/src/main/java/resources/js/qpid/addVirtualHostAlias.js (original)
+++ qpid/java/trunk/broker-plugins/management-http/src/main/java/resources/js/qpid/addVirtualHostAlias.js Fri Apr 29 11:04:40 2016
@@ -42,155 +42,194 @@ define(["dojo/_base/lang",
         "dijit/form/Form",
         "dijit/layout/ContentPane",
         "dojox/layout/TableContainer",
-        "dojo/domReady!"],
-    function (lang, dom, construct, registry, parser, memory, array, event, json, util, template)
-    {
-        var addLogInclusionRule =
-        {
-            init: function()
-            {
-                var that=this;
-                this.containerNode = construct.create("div", {innerHTML: template});
-                parser.parse(this.containerNode).then(function(instances) { that._postParse(); });
-            },
-            _postParse: function()
-            {
-                var that=this;
-                this.name = registry.byId("addLogInclusionRule.name");
-                this.name.set("regExpGen", util.nameOrContextVarRegexp);
-
-                this.dialog = registry.byId("addLogInclusionRule");
-                this.addButton = registry.byId("addLogInclusionRule.addButton");
-                this.cancelButton = registry.byId("addLogInclusionRule.cancelButton");
-                this.cancelButton.on("click", function(e){that._cancel(e);});
-                this.addButton.on("click", function(e){that._add(e);});
-
-                this.typeFieldsContainer = dom.byId("addLogInclusionRule.typeFields");
-                this.form = registry.byId("addLogInclusionRule.form");
-                this.form.on("submit", function(){return false;});
-
-                this.logInclusionRuleType = registry.byId("addLogInclusionRule.type");
-                this.logInclusionRuleType.on("change", function(type){that._typeChanged(type);});
-
-                this.durable = registry.byId("addLogInclusionRule.durable");
-                this.allFieldsContainer = dom.byId("addLogInclusionRule.contentPane");
-            },
-            show: function(management, modelObj, category, actualData)
-            {
-                this.management = management;
-                this.modelObj = modelObj;
-                var metadata = management.metadata;
-                this.category = category;
-                this.configured = false;
-                this._destroyTypeFields(this.typeFieldsContainer);
-                this.logInclusionRuleType.set("store", util.makeTypeStoreFromMetadataByCategory(management.metadata, category));
-                this.form.reset();
-
-                this.initialData = actualData;
-                this.isNew = !actualData;
-
-                this.name.set("disabled", !this.isNew);
-                this.logInclusionRuleType.set("disabled", !this.isNew);
-                this.durable.set("disabled", !this.isNew);
-                this.dialog.set("title", this.isNew ? "Add Log Inclusion Rule" : "Edit Log Inclusion Rule - " + actualData.name);
-
-                if (actualData)
-                {
-                    this._configure(actualData.type);
-                }
-
-                this.dialog.show();
-            },
-            _cancel: function(e)
-            {
-                event.stop(e);
-                this._destroyTypeFields(this.typeFieldsContainer);
-                this.dialog.hide();
-            },
-            _add: function(e)
-            {
-                event.stop(e);
-                this._submit();
-            },
-            _submit: function()
-            {
-                if (this.form.validate())
-                {
-                    var that = this;
-                    var formData = util.getFormWidgetValues(this.form, this.initialData);
-
-                    if (this.isNew)
-                    {
-                        this.management.create(this.category, this.modelObj, formData).then(function(x){that.dialog.hide();});
-                    }
-                    else
-                    {
-                        this.management.update(this.modelObj, formData).then(function(x){that.dialog.hide();});
-                    }
-                }
-                else
-                {
-                    alert('Form contains invalid data. Please correct first');
-                }
-            },
-            _destroyTypeFields: function(typeFieldsContainer)
-            {
-                var widgets = registry.findWidgets(typeFieldsContainer);
-                array.forEach(widgets, function(item) { item.destroyRecursive();});
-                construct.empty(typeFieldsContainer);
-            },
-            _typeChanged: function(type)
-            {
-                this._destroyTypeFields(this.typeFieldsContainer);
-
-                if (type)
-                {
-                    this._configure(type);
-                    var that = this;
-                    require(["qpid/management/loginclusionrule/" + this.category.toLowerCase() + "/" + type.toLowerCase() + "/add"], function(typeUI)
-                    {
-                        try
-                        {
-                            var metadata = that.management.metadata;
-                            var promise = typeUI.show({containerNode:that.typeFieldsContainer, data: that.initialData, metadata: metadata, category: that.category, type: type});
-                            if (promise)
-                            {
-                                promise.then(
-                                    function(instances)
-                                    {
-                                        util.applyToWidgets(that.typeFieldsContainer, that.category, type, that.initialData, metadata);
-                                        if (!that.isNew)
-                                        {
-                                            util.disableWidgetsForImmutableFields(that.allFieldsContainer, that.category, type, metadata);
-                                        }
-                                    });
-                            }
-                        }
-                        catch(e)
-                        {
-                            console.warn(e);
-                        }
-                    });
-                }
-            },
-            _configure: function(type)
-            {
-                if (!this.configured)
-                {
-                    var metadata = this.management.metadata;
-                    util.applyToWidgets(this.allFieldsContainer, this.category, type, this.initialData, metadata);
-                    this.configured = true;
-                }
-            }
-        };
-
-        try
-        {
-            addLogInclusionRule.init();
-        }
-        catch(e)
-        {
-            console.warn(e);
-        }
-        return addLogInclusionRule;
-    });
+        "dojo/domReady!"], function (lang, dom, construct, registry, parser, memory, array, event, json, util, template)
+       {
+           var addLogInclusionRule = {
+               init: function ()
+               {
+                   var that = this;
+                   this.containerNode = construct.create("div", {innerHTML: template});
+                   parser.parse(this.containerNode).then(function (instances)
+                                                         {
+                                                             that._postParse();
+                                                         });
+               },
+               _postParse: function ()
+               {
+                   var that = this;
+                   this.name = registry.byId("addLogInclusionRule.name");
+                   this.name.set("regExpGen", util.nameOrContextVarRegexp);
+
+                   this.dialog = registry.byId("addLogInclusionRule");
+                   this.addButton = registry.byId("addLogInclusionRule.addButton");
+                   this.cancelButton = registry.byId("addLogInclusionRule.cancelButton");
+                   this.cancelButton.on("click", function (e)
+                   {
+                       that._cancel(e);
+                   });
+                   this.addButton.on("click", function (e)
+                   {
+                       that._add(e);
+                   });
+
+                   this.typeFieldsContainer = dom.byId("addLogInclusionRule.typeFields");
+                   this.form = registry.byId("addLogInclusionRule.form");
+                   this.form.on("submit", function ()
+                   {
+                       return false;
+                   });
+
+                   this.logInclusionRuleType = registry.byId("addLogInclusionRule.type");
+                   this.logInclusionRuleType.on("change", function (type)
+                   {
+                       that._typeChanged(type);
+                   });
+
+                   this.durable = registry.byId("addLogInclusionRule.durable");
+                   this.allFieldsContainer = dom.byId("addLogInclusionRule.contentPane");
+               },
+               show: function (management, modelObj, category, actualData)
+               {
+                   this.management = management;
+                   this.modelObj = modelObj;
+                   var metadata = management.metadata;
+                   this.category = category;
+                   this.configured = false;
+                   this._destroyTypeFields(this.typeFieldsContainer);
+                   this.logInclusionRuleType.set("store",
+                                                 util.makeTypeStoreFromMetadataByCategory(management.metadata,
+                                                                                          category));
+                   this.form.reset();
+
+                   this.initialData = actualData;
+                   this.isNew = !actualData;
+
+                   this.name.set("disabled", !this.isNew);
+                   this.logInclusionRuleType.set("disabled", !this.isNew);
+                   this.durable.set("disabled", !this.isNew);
+                   this.dialog.set("title",
+                                   this.isNew ? "Add Log Inclusion Rule" : "Edit Log Inclusion Rule - "
+                                                                           + actualData.name);
+
+                   if (actualData)
+                   {
+                       this._configure(actualData.type);
+                   }
+
+                   this.dialog.show();
+               },
+               _cancel: function (e)
+               {
+                   event.stop(e);
+                   this._destroyTypeFields(this.typeFieldsContainer);
+                   this.dialog.hide();
+               },
+               _add: function (e)
+               {
+                   event.stop(e);
+                   this._submit();
+               },
+               _submit: function ()
+               {
+                   if (this.form.validate())
+                   {
+                       var that = this;
+                       var formData = util.getFormWidgetValues(this.form, this.initialData);
+
+                       if (this.isNew)
+                       {
+                           this.management.create(this.category, this.modelObj, formData).then(function (x)
+                                                                                               {
+                                                                                                   that.dialog.hide();
+                                                                                               });
+                       }
+                       else
+                       {
+                           this.management.update(this.modelObj, formData).then(function (x)
+                                                                                {
+                                                                                    that.dialog.hide();
+                                                                                });
+                       }
+                   }
+                   else
+                   {
+                       alert('Form contains invalid data. Please correct first');
+                   }
+               },
+               _destroyTypeFields: function (typeFieldsContainer)
+               {
+                   var widgets = registry.findWidgets(typeFieldsContainer);
+                   array.forEach(widgets, function (item)
+                   {
+                       item.destroyRecursive();
+                   });
+                   construct.empty(typeFieldsContainer);
+               },
+               _typeChanged: function (type)
+               {
+                   this._destroyTypeFields(this.typeFieldsContainer);
+
+                   if (type)
+                   {
+                       this._configure(type);
+                       var that = this;
+                       require(["qpid/management/loginclusionrule/" + this.category.toLowerCase() + "/"
+                                + type.toLowerCase() + "/add"], function (typeUI)
+                               {
+                                   try
+                                   {
+                                       var metadata = that.management.metadata;
+                                       var promise = typeUI.show({
+                                                                     containerNode: that.typeFieldsContainer,
+                                                                     data: that.initialData,
+                                                                     metadata: metadata,
+                                                                     category: that.category,
+                                                                     type: type
+                                                                 });
+                                       if (promise)
+                                       {
+                                           promise.then(function (instances)
+                                                        {
+                                                            util.applyToWidgets(that.typeFieldsContainer,
+                                                                                that.category,
+                                                                                type,
+                                                                                that.initialData,
+                                                                                metadata);
+                                                            if (!that.isNew)
+                                                            {
+                                                                util.disableWidgetsForImmutableFields(that.allFieldsContainer,
+                                                                                                      that.category,
+                                                                                                      type,
+                                                                                                      metadata);
+                                                            }
+                                                        });
+                                       }
+                                   }
+                                   catch (e)
+                                   {
+                                       console.warn(e);
+                                   }
+                               });
+                   }
+               },
+               _configure: function (type)
+               {
+                   if (!this.configured)
+                   {
+                       var metadata = this.management.metadata;
+                       util.applyToWidgets(this.allFieldsContainer, this.category, type, this.initialData, metadata);
+                       this.configured = true;
+                   }
+               }
+           };
+
+           try
+           {
+               addLogInclusionRule.init();
+           }
+           catch (e)
+           {
+               console.warn(e);
+           }
+           return addLogInclusionRule;
+       });

Modified: qpid/java/trunk/broker-plugins/management-http/src/main/java/resources/js/qpid/common/CategoryTabExtension.js
URL: http://svn.apache.org/viewvc/qpid/java/trunk/broker-plugins/management-http/src/main/java/resources/js/qpid/common/CategoryTabExtension.js?rev=1741609&r1=1741608&r2=1741609&view=diff
==============================================================================
--- qpid/java/trunk/broker-plugins/management-http/src/main/java/resources/js/qpid/common/CategoryTabExtension.js (original)
+++ qpid/java/trunk/broker-plugins/management-http/src/main/java/resources/js/qpid/common/CategoryTabExtension.js Fri Apr 29 11:04:40 2016
@@ -18,25 +18,22 @@
  * under the License.
  *
  */
-define(["qpid/common/util",
-    "dojo/query",
-    "dojo/domReady!"],
-  function (util, query)
-  {
+define(["qpid/common/util", "dojo/query", "dojo/domReady!"], function (util, query)
+{
     function CategoryTabExtension(params)
     {
-      var that = this;
-      this.base = params.baseUrl;
-      this.metadata = params.metadata;
-      this.management = params.management;
-      this.typeSpecificDetailsContainer = params.typeSpecificDetailsNode;
-      this.modelObj = params.modelObj;
-      util.parse(params.containerNode, params.template,
-        function()
+        var that = this;
+        this.base = params.baseUrl;
+        this.metadata = params.metadata;
+        this.management = params.management;
+        this.typeSpecificDetailsContainer = params.typeSpecificDetailsNode;
+        this.modelObj = params.modelObj;
+        util.parse(params.containerNode, params.template, function ()
         {
-          that.typeSpecificAttributesContainer = query("." + params.typeSpecificAttributesClassName, params.containerNode)[0];
-          that.postParse(params.containerNode);
-          that.update(params.data)
+            that.typeSpecificAttributesContainer =
+                query("." + params.typeSpecificAttributesClassName, params.containerNode)[0];
+            that.postParse(params.containerNode);
+            that.update(params.data)
         });
     }
 
@@ -47,34 +44,30 @@ define(["qpid/common/util",
 
     CategoryTabExtension.prototype.update = function (restData)
     {
-      var data = restData || {};
-      if (!this.details)
-      {
-        if (data.type)
+        var data = restData || {};
+        if (!this.details)
         {
-          var that = this;
-          require([this.base + data.type.toLowerCase() + "/show"],
-            function(Details)
+            if (data.type)
             {
-              that.details = new Details(
+                var that = this;
+                require([this.base + data.type.toLowerCase() + "/show"], function (Details)
                 {
-                  containerNode: that.typeSpecificAttributesContainer,
-                  typeSpecificDetailsNode: that.typeSpecificDetailsContainer,
-                  metadata: that.metadata,
-                  data:data,
-                  management: that.management,
-                  modelObj: that.modelObj
+                    that.details = new Details({
+                        containerNode: that.typeSpecificAttributesContainer,
+                        typeSpecificDetailsNode: that.typeSpecificDetailsContainer,
+                        metadata: that.metadata,
+                        data: data,
+                        management: that.management,
+                        modelObj: that.modelObj
+                    });
                 });
             }
-          );
         }
-      }
-      else
-      {
-        this.details.update(data);
-      }
+        else
+        {
+            this.details.update(data);
+        }
     }
 
     return CategoryTabExtension;
-  }
-);
+});

Modified: qpid/java/trunk/broker-plugins/management-http/src/main/java/resources/js/qpid/common/ConsoleHelper.js
URL: http://svn.apache.org/viewvc/qpid/java/trunk/broker-plugins/management-http/src/main/java/resources/js/qpid/common/ConsoleHelper.js?rev=1741609&r1=1741608&r2=1741609&view=diff
==============================================================================
--- qpid/java/trunk/broker-plugins/management-http/src/main/java/resources/js/qpid/common/ConsoleHelper.js (original)
+++ qpid/java/trunk/broker-plugins/management-http/src/main/java/resources/js/qpid/common/ConsoleHelper.js Fri Apr 29 11:04:40 2016
@@ -18,72 +18,83 @@
  * under the License.
  *
  */
-define(["dojo/domReady!"], function () {
+define(["dojo/domReady!"], function ()
+{
 
     var preferencesDialog = null;
     var helpURL = null;
 
     return {
-        showPreferencesDialog: function () {
-          if (preferencesDialog == null)
-          {
-             require(["qpid/management/Preferences", "dojo/ready"], function(PreferencesDialog, ready){
-                ready(function(){
-                  preferencesDialog = new PreferencesDialog(this.management);
-                  preferencesDialog.showDialog();
+        showPreferencesDialog: function ()
+        {
+            if (preferencesDialog == null)
+            {
+                require(["qpid/management/Preferences", "dojo/ready"], function (PreferencesDialog, ready)
+                {
+                    ready(function ()
+                          {
+                              preferencesDialog = new PreferencesDialog(this.management);
+                              preferencesDialog.showDialog();
+                          });
                 });
-             });
-          }
-          else
-          {
-              preferencesDialog.showDialog();
-          }
+            }
+            else
+            {
+                preferencesDialog.showDialog();
+            }
         },
-        getHelpUrl: function(callback)
+        getHelpUrl: function (callback)
         {
-            this.management.load({type: "broker"}, {depth: 1}).then(
-             function(data) {
-              var broker = data[0];
-              if ("context" in broker && "qpid.helpURL" in broker["context"] )
-              {
-                helpURL = broker["context"]["qpid.helpURL"];
-              }
-              else
-              {
-                helpURL = "http://qpid.apache.org/";
-              }
-              if (callback)
-              {
-                callback(helpURL);
-              }
-             });
+            this.management.load({type: "broker"}, {depth: 1}).then(function (data)
+                                                                    {
+                                                                        var broker = data[0];
+                                                                        if ("context" in broker && "qpid.helpURL"
+                                                                                                   in broker["context"])
+                                                                        {
+                                                                            helpURL = broker["context"]["qpid.helpURL"];
+                                                                        }
+                                                                        else
+                                                                        {
+                                                                            helpURL = "http://qpid.apache.org/";
+                                                                        }
+                                                                        if (callback)
+                                                                        {
+                                                                            callback(helpURL);
+                                                                        }
+                                                                    });
         },
-        showHelp: function()
+        showHelp: function ()
         {
-          var openWindow = function(url)
-          {
-              var newWindow = window.open(url,'QpidHelp','height=600,width=600,scrollbars=1,location=1,resizable=1,status=0,toolbar=0,titlebar=1,menubar=0', true);
-              newWindow.focus();
-          }
+            var openWindow = function (url)
+            {
+                var newWindow = window.open(url,
+                                            'QpidHelp',
+                                            'height=600,width=600,scrollbars=1,location=1,resizable=1,status=0,toolbar=0,titlebar=1,menubar=0',
+                                            true);
+                newWindow.focus();
+            }
 
-          if (helpURL)
-          {
-            openWindow(helpURL)
-          }
-          else
-          {
-            this.getHelpUrl(openWindow);
-          }
+            if (helpURL)
+            {
+                openWindow(helpURL)
+            }
+            else
+            {
+                this.getHelpUrl(openWindow);
+            }
         },
-        showAPI: function()
+        showAPI: function ()
         {
-          var openWindow = function(url)
-          {
-            var newWindow = window.open(url,'Qpid REST API','height=800,width=800,scrollbars=1,location=1,resizable=1,status=0,toolbar=1,titlebar=1,menubar=1', true);
-            newWindow.focus();
-          }
+            var openWindow = function (url)
+            {
+                var newWindow = window.open(url,
+                                            'Qpid REST API',
+                                            'height=800,width=800,scrollbars=1,location=1,resizable=1,status=0,toolbar=1,titlebar=1,menubar=1',
+                                            true);
+                newWindow.focus();
+            }
 
-          openWindow("/apidocs");
+            openWindow("/apidocs");
         }
 
     };




---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@qpid.apache.org
For additional commands, e-mail: commits-help@qpid.apache.org


Mime
View raw message