Return-Path: X-Original-To: archive-asf-public-internal@cust-asf2.ponee.io Delivered-To: archive-asf-public-internal@cust-asf2.ponee.io Received: from cust-asf.ponee.io (cust-asf.ponee.io [163.172.22.183]) by cust-asf2.ponee.io (Postfix) with ESMTP id 38EE1200ACC for ; Mon, 2 May 2016 18:38:35 +0200 (CEST) Received: by cust-asf.ponee.io (Postfix) id 378A81609B0; Mon, 2 May 2016 18:38:35 +0200 (CEST) Delivered-To: archive-asf-public@cust-asf.ponee.io Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by cust-asf.ponee.io (Postfix) with SMTP id 83BB31609A6 for ; Mon, 2 May 2016 18:38:34 +0200 (CEST) Received: (qmail 88434 invoked by uid 500); 2 May 2016 16:38:33 -0000 Mailing-List: contact commits-help@qpid.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: dev@qpid.apache.org Delivered-To: mailing list commits@qpid.apache.org Received: (qmail 88425 invoked by uid 99); 2 May 2016 16:38:33 -0000 Received: from pnap-us-west-generic-nat.apache.org (HELO spamd2-us-west.apache.org) (209.188.14.142) by apache.org (qpsmtpd/0.29) with ESMTP; Mon, 02 May 2016 16:38:33 +0000 Received: from localhost (localhost [127.0.0.1]) by spamd2-us-west.apache.org (ASF Mail Server at spamd2-us-west.apache.org) with ESMTP id 61A6D1A076D for ; Mon, 2 May 2016 16:38:33 +0000 (UTC) X-Virus-Scanned: Debian amavisd-new at spamd2-us-west.apache.org X-Spam-Flag: NO X-Spam-Score: 0.999 X-Spam-Level: X-Spam-Status: No, score=0.999 tagged_above=-999 required=6.31 tests=[KAM_LAZY_DOMAIN_SECURITY=1, RP_MATCHES_RCVD=-0.001] autolearn=disabled Received: from mx2-lw-us.apache.org ([10.40.0.8]) by localhost (spamd2-us-west.apache.org [10.40.0.9]) (amavisd-new, port 10024) with ESMTP id HAUUeT-XT4Fd for ; Mon, 2 May 2016 16:38:31 +0000 (UTC) Received: from mailrelay1-us-west.apache.org (mailrelay1-us-west.apache.org [209.188.14.139]) by mx2-lw-us.apache.org (ASF Mail Server at mx2-lw-us.apache.org) with ESMTP id 0BD2A5F60E for ; Mon, 2 May 2016 16:38:31 +0000 (UTC) Received: from svn01-us-west.apache.org (svn.apache.org [10.41.0.6]) by mailrelay1-us-west.apache.org (ASF Mail Server at mailrelay1-us-west.apache.org) with ESMTP id C4702E009C for ; Mon, 2 May 2016 16:38:29 +0000 (UTC) Received: from svn01-us-west.apache.org (localhost [127.0.0.1]) by svn01-us-west.apache.org (ASF Mail Server at svn01-us-west.apache.org) with ESMTP id C343B3A0056 for ; Mon, 2 May 2016 16:38:28 +0000 (UTC) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r1742004 - /qpid/java/trunk/broker-plugins/management-http/src/main/java/resources/js/qpid/management/accesscontrolprovider/AclFile.js Date: Mon, 02 May 2016 16:38:27 -0000 To: commits@qpid.apache.org From: lquack@apache.org X-Mailer: svnmailer-1.0.9 Message-Id: <20160502163828.C343B3A0056@svn01-us-west.apache.org> archived-at: Mon, 02 May 2016 16:38:35 -0000 Author: lquack Date: Mon May 2 16:38:24 2016 New Revision: 1742004 URL: http://svn.apache.org/viewvc?rev=1742004&view=rev Log: QPID-7239: [Java Broker, WMC] Fix merging error in AclFile AccessControlProvider Modified: qpid/java/trunk/broker-plugins/management-http/src/main/java/resources/js/qpid/management/accesscontrolprovider/AclFile.js Modified: qpid/java/trunk/broker-plugins/management-http/src/main/java/resources/js/qpid/management/accesscontrolprovider/AclFile.js URL: http://svn.apache.org/viewvc/qpid/java/trunk/broker-plugins/management-http/src/main/java/resources/js/qpid/management/accesscontrolprovider/AclFile.js?rev=1742004&r1=1742003&r2=1742004&view=diff ============================================================================== --- qpid/java/trunk/broker-plugins/management-http/src/main/java/resources/js/qpid/management/accesscontrolprovider/AclFile.js (original) +++ qpid/java/trunk/broker-plugins/management-http/src/main/java/resources/js/qpid/management/accesscontrolprovider/AclFile.js Mon May 2 16:38:24 2016 @@ -27,6 +27,7 @@ define(["dojo/_base/xhr", "dojo/_base/window", "dojo/_base/event", "dojo/_base/json", + "dojo/_base/lang", "dijit/registry", "dojox/html/entities", "qpid/common/util", @@ -55,6 +56,7 @@ define(["dojo/_base/xhr", win, event, json, + lang, registry, entities, util, @@ -143,7 +145,7 @@ define(["dojo/_base/xhr", }; var url = this.management.buildObjectURL(modelObj); this.management.post({url: url}, {}); - } + }; return AclFile; }); --------------------------------------------------------------------- To unsubscribe, e-mail: commits-unsubscribe@qpid.apache.org For additional commands, e-mail: commits-help@qpid.apache.org