Copied: qpid/java/trunk/broker-plugins/management-http/src/main/java/resources/js/qpid/management/logger/brokerlogger/memory/show.js (from r1687110, qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/logging/LogLevel.java) URL: http://svn.apache.org/viewvc/qpid/java/trunk/broker-plugins/management-http/src/main/java/resources/js/qpid/management/logger/brokerlogger/memory/show.js?p2=qpid/java/trunk/broker-plugins/management-http/src/main/java/resources/js/qpid/management/logger/brokerlogger/memory/show.js&p1=qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/logging/LogLevel.java&r1=1687110&r2=1687140&rev=1687140&view=diff ============================================================================== --- qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/logging/LogLevel.java (original) +++ qpid/java/trunk/broker-plugins/management-http/src/main/java/resources/js/qpid/management/logger/brokerlogger/memory/show.js Tue Jun 23 21:49:46 2015 @@ -18,9 +18,19 @@ * under the License. * */ -package org.apache.qpid.server.logging; +define(["qpid/common/util", + "dojo/query", + "dojox/html/entities", + "dojo/text!logger/memory/show.html", + "qpid/common/TypeTabExtension", + "dojo/domReady!"], + function (util, query, entities, template, TypeTabExtension) + { + function BrokerMemoryLogger(params) + { + TypeTabExtension.call(this, params.containerNode, template, "BrokerLogger", "Memory", params.metadata, params.data); + } -public enum LogLevel -{ - ALL, TRACE, DEBUG, INFO, WARN, ERROR, OFF -} + return util.extend(BrokerMemoryLogger, TypeTabExtension); + } +);
Added: qpid/java/trunk/broker-plugins/management-http/src/main/java/resources/js/qpid/management/logger/brokerlogger/show.js URL: http://svn.apache.org/viewvc/qpid/java/trunk/broker-plugins/management-http/src/main/java/resources/js/qpid/management/logger/brokerlogger/show.js?rev=1687140&view=auto ============================================================================== --- qpid/java/trunk/broker-plugins/management-http/src/main/java/resources/js/qpid/management/logger/brokerlogger/show.js (added) +++ qpid/java/trunk/broker-plugins/management-http/src/main/java/resources/js/qpid/management/logger/brokerlogger/show.js Tue Jun 23 21:49:46 2015 @@ -0,0 +1,49 @@ +/* + * + * Licensed to the Apache Software Foundation (ASF) under one + * or more contributor license agreements. See the NOTICE file + * distributed with this work for additional information + * regarding copyright ownership. The ASF licenses this file + * to you under the Apache License, Version 2.0 (the + * "License"); you may not use this file except in compliance + * with the License. You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, + * software distributed under the License is distributed on an + * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY + * KIND, either express or implied. See the License for the + * specific language governing permissions and limitations + * under the License. + * + */ + define(["qpid/common/util", + "dojo/query", + "dojo/text!logger/brokerlogger/show.html", + "qpid/common/CategoryTabExtension", + "dojo/domReady!"], + function (util, query, template, CategoryTabExtension) + { + function BrokerLogger(params) + { + CategoryTabExtension.call(this, params.containerNode, template, "typeSpecificAttributes", params.metadata, params.data, "qpid/management/logger/brokerlogger/"); + } + + util.extend(BrokerLogger, CategoryTabExtension); + + BrokerLogger.prototype.postParse = function(containerNode) + { + this.virtualHostLogEventExcludedCheckboxContainer = query(".virtualHostLogEventExcluded", containerNode)[0]; + } + + BrokerLogger.prototype.update = function(restData) + { + var data = restData || {}; + this.virtualHostLogEventExcludedCheckboxContainer.innerHTML = util.buildCheckboxMarkup(data.virtualHostLogEventExcluded); + CategoryTabExtension.prototype.update.call(this, restData); + } + + return BrokerLogger; + } + ); Copied: qpid/java/trunk/broker-plugins/management-http/src/main/java/resources/js/qpid/management/logger/virtualhostlogger/add.js (from r1687110, qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/logging/LogLevel.java) URL: http://svn.apache.org/viewvc/qpid/java/trunk/broker-plugins/management-http/src/main/java/resources/js/qpid/management/logger/virtualhostlogger/add.js?p2=qpid/java/trunk/broker-plugins/management-http/src/main/java/resources/js/qpid/management/logger/virtualhostlogger/add.js&p1=qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/logging/LogLevel.java&r1=1687110&r2=1687140&rev=1687140&view=diff ============================================================================== --- qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/logging/LogLevel.java (original) +++ qpid/java/trunk/broker-plugins/management-http/src/main/java/resources/js/qpid/management/logger/virtualhostlogger/add.js Tue Jun 23 21:49:46 2015 @@ -18,9 +18,20 @@ * under the License. * */ -package org.apache.qpid.server.logging; +define(["dojo/Deferred", + "dojo/domReady!"], + function (Deferred) + { + var addVirtualHostLogger = + { + show: function(data) + { + var deferred = new Deferred(); + deferred.resolve("noop"); + return deferred; + } + }; -public enum LogLevel -{ - ALL, TRACE, DEBUG, INFO, WARN, ERROR, OFF -} + return addVirtualHostLogger; + } +); Copied: qpid/java/trunk/broker-plugins/management-http/src/main/java/resources/js/qpid/management/logger/virtualhostlogger/file/add.js (from r1687110, qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/logging/LogLevel.java) URL: http://svn.apache.org/viewvc/qpid/java/trunk/broker-plugins/management-http/src/main/java/resources/js/qpid/management/logger/virtualhostlogger/file/add.js?p2=qpid/java/trunk/broker-plugins/management-http/src/main/java/resources/js/qpid/management/logger/virtualhostlogger/file/add.js&p1=qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/logging/LogLevel.java&r1=1687110&r2=1687140&rev=1687140&view=diff ============================================================================== --- qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/logging/LogLevel.java (original) +++ qpid/java/trunk/broker-plugins/management-http/src/main/java/resources/js/qpid/management/logger/virtualhostlogger/file/add.js Tue Jun 23 21:49:46 2015 @@ -18,9 +18,25 @@ * under the License. * */ -package org.apache.qpid.server.logging; +define(["dojo/dom", + "dojo/query", + "dojo/_base/array", + "dijit/registry", + "qpid/common/util", + "dojo/parser", + "dojo/text!logger/file/add.html", + "dojo/domReady!"], + function (dom, query, array, registry, util, parser, template) + { + var addFileLogger = + { + show: function(data) + { + data.containerNode.innerHTML = template; + return parser.parse(data.containerNode); + } + }; -public enum LogLevel -{ - ALL, TRACE, DEBUG, INFO, WARN, ERROR, OFF -} + return addFileLogger; + } +); Copied: qpid/java/trunk/broker-plugins/management-http/src/main/java/resources/js/qpid/management/logger/virtualhostlogger/file/show.js (from r1687110, qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/logging/LogLevel.java) URL: http://svn.apache.org/viewvc/qpid/java/trunk/broker-plugins/management-http/src/main/java/resources/js/qpid/management/logger/virtualhostlogger/file/show.js?p2=qpid/java/trunk/broker-plugins/management-http/src/main/java/resources/js/qpid/management/logger/virtualhostlogger/file/show.js&p1=qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/logging/LogLevel.java&r1=1687110&r2=1687140&rev=1687140&view=diff ============================================================================== --- qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/logging/LogLevel.java (original) +++ qpid/java/trunk/broker-plugins/management-http/src/main/java/resources/js/qpid/management/logger/virtualhostlogger/file/show.js Tue Jun 23 21:49:46 2015 @@ -18,9 +18,19 @@ * under the License. * */ -package org.apache.qpid.server.logging; +define(["qpid/common/util", + "dojo/query", + "dojox/html/entities", + "dojo/text!logger/file/show.html", + "qpid/common/TypeTabExtension", + "dojo/domReady!"], + function (util, query, entities, template, TypeTabExtension) + { + function VirtualHostFileLogger(params) + { + TypeTabExtension.call(this, params.containerNode, template, "VirtualHostLogger", "File", params.metadata, params.data); + } -public enum LogLevel -{ - ALL, TRACE, DEBUG, INFO, WARN, ERROR, OFF -} + return util.extend(VirtualHostFileLogger, TypeTabExtension); + } +); Copied: qpid/java/trunk/broker-plugins/management-http/src/main/java/resources/js/qpid/management/logger/virtualhostlogger/show.js (from r1687110, qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/logging/LogLevel.java) URL: http://svn.apache.org/viewvc/qpid/java/trunk/broker-plugins/management-http/src/main/java/resources/js/qpid/management/logger/virtualhostlogger/show.js?p2=qpid/java/trunk/broker-plugins/management-http/src/main/java/resources/js/qpid/management/logger/virtualhostlogger/show.js&p1=qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/logging/LogLevel.java&r1=1687110&r2=1687140&rev=1687140&view=diff ============================================================================== --- qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/logging/LogLevel.java (original) +++ qpid/java/trunk/broker-plugins/management-http/src/main/java/resources/js/qpid/management/logger/virtualhostlogger/show.js Tue Jun 23 21:49:46 2015 @@ -18,9 +18,18 @@ * under the License. * */ -package org.apache.qpid.server.logging; +define(["qpid/common/util", + "dojo/query", + "dojo/text!logger/virtualhostlogger/show.html", + "qpid/common/CategoryTabExtension", + "dojo/domReady!"], + function (util, query, template, CategoryTabExtension) + { + function VirtualHostLogger(params) + { + CategoryTabExtension.call(this, params.containerNode, template, "typeSpecificAttributes", params.metadata, params.data, "qpid/management/logger/virtualhostlogger/"); + } -public enum LogLevel -{ - ALL, TRACE, DEBUG, INFO, WARN, ERROR, OFF -} + return util.extend(VirtualHostLogger, CategoryTabExtension); + } +); Added: qpid/java/trunk/broker-plugins/management-http/src/main/java/resources/js/qpid/management/loggerfilter/brokerloggerfilter/nameandlevel/add.js URL: http://svn.apache.org/viewvc/qpid/java/trunk/broker-plugins/management-http/src/main/java/resources/js/qpid/management/loggerfilter/brokerloggerfilter/nameandlevel/add.js?rev=1687140&view=auto ============================================================================== --- qpid/java/trunk/broker-plugins/management-http/src/main/java/resources/js/qpid/management/loggerfilter/brokerloggerfilter/nameandlevel/add.js (added) +++ qpid/java/trunk/broker-plugins/management-http/src/main/java/resources/js/qpid/management/loggerfilter/brokerloggerfilter/nameandlevel/add.js Tue Jun 23 21:49:46 2015 @@ -0,0 +1,51 @@ +/* + * + * Licensed to the Apache Software Foundation (ASF) under one + * or more contributor license agreements. See the NOTICE file + * distributed with this work for additional information + * regarding copyright ownership. The ASF licenses this file + * to you under the Apache License, Version 2.0 (the + * "License"); you may not use this file except in compliance + * with the License. You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, + * software distributed under the License is distributed on an + * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY + * KIND, either express or implied. See the License for the + * specific language governing permissions and limitations + * under the License. + * + */ +define(["dojo/dom", + "dojo/query", + "dojo/_base/array", + "dijit/registry", + "qpid/common/util", + "dojo/parser", + "dojo/text!loggerfilter/nameandlevel/add.html", + "dojo/domReady!"], + function (dom, query, array, registry, util, parser, template) + { + var addFileLogger = + { + show: function(data) + { + var that = this; + this.metadata = data.metadata; + this.containerNode = data.containerNode; + data.containerNode.innerHTML = template; + return parser.parse(this.containerNode).then(function(instances) + { + var logLevelWidget = registry.byId("addLoggerFilter.level"); + var validValues = that.metadata.getMetaData(data.category, data.type).attributes.level.validValues; + var validValueStore = util.makeTypeStore(validValues); + logLevelWidget.set("store", validValueStore); + }); + } + }; + + return addFileLogger; + } +); Added: qpid/java/trunk/broker-plugins/management-http/src/main/java/resources/js/qpid/management/loggerfilter/virtualhostloggerfilter/nameandlevel/add.js URL: http://svn.apache.org/viewvc/qpid/java/trunk/broker-plugins/management-http/src/main/java/resources/js/qpid/management/loggerfilter/virtualhostloggerfilter/nameandlevel/add.js?rev=1687140&view=auto ============================================================================== --- qpid/java/trunk/broker-plugins/management-http/src/main/java/resources/js/qpid/management/loggerfilter/virtualhostloggerfilter/nameandlevel/add.js (added) +++ qpid/java/trunk/broker-plugins/management-http/src/main/java/resources/js/qpid/management/loggerfilter/virtualhostloggerfilter/nameandlevel/add.js Tue Jun 23 21:49:46 2015 @@ -0,0 +1,51 @@ +/* + * + * Licensed to the Apache Software Foundation (ASF) under one + * or more contributor license agreements. See the NOTICE file + * distributed with this work for additional information + * regarding copyright ownership. The ASF licenses this file + * to you under the Apache License, Version 2.0 (the + * "License"); you may not use this file except in compliance + * with the License. You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, + * software distributed under the License is distributed on an + * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY + * KIND, either express or implied. See the License for the + * specific language governing permissions and limitations + * under the License. + * + */ +define(["dojo/dom", + "dojo/query", + "dojo/_base/array", + "dijit/registry", + "qpid/common/util", + "dojo/parser", + "dojo/text!loggerfilter/nameandlevel/add.html", + "dojo/domReady!"], + function (dom, query, array, registry, util, parser, template) + { + var addFileLogger = + { + show: function(data) + { + var that = this; + this.metadata = data.metadata; + this.containerNode = data.containerNode; + data.containerNode.innerHTML = template; + return parser.parse(this.containerNode).then(function(instances) + { + var logLevelWidget = registry.byId("addLoggerFilter.level"); + var validValues = that.metadata.getMetaData(data.category, data.type).attributes.level.validValues; + var validValueStore = util.makeTypeStore(validValues); + logLevelWidget.set("store", validValueStore); + }); + } + }; + + return addFileLogger; + } +); Modified: qpid/java/trunk/broker-plugins/management-http/src/main/java/resources/js/qpid/management/treeView.js URL: http://svn.apache.org/viewvc/qpid/java/trunk/broker-plugins/management-http/src/main/java/resources/js/qpid/management/treeView.js?rev=1687140&r1=1687139&r2=1687140&view=diff ============================================================================== --- qpid/java/trunk/broker-plugins/management-http/src/main/java/resources/js/qpid/management/treeView.js (original) +++ qpid/java/trunk/broker-plugins/management-http/src/main/java/resources/js/qpid/management/treeView.js Tue Jun 23 21:49:46 2015 @@ -296,6 +296,10 @@ define([ controller.show("preferencesprovider", details.preferencesprovider, details.parent, theItem.id); } else if (details.type == "virtualhostnode") { controller.show("virtualhostnode", details.virtualhostnode, details.parent, theItem.id); + } else if (details.type == "brokerlogger") { + controller.show("brokerlogger", details.brokerlogger, details.parent, theItem.id); + } else if (details.type == "virtualhostlogger") { + controller.show("virtualhostlogger", details.virtualhostlogger, details.parent, theItem.id); } }; Added: qpid/java/trunk/broker-plugins/management-http/src/main/java/resources/logger/brokerlogger/add.html URL: http://svn.apache.org/viewvc/qpid/java/trunk/broker-plugins/management-http/src/main/java/resources/logger/brokerlogger/add.html?rev=1687140&view=auto ============================================================================== --- qpid/java/trunk/broker-plugins/management-http/src/main/java/resources/logger/brokerlogger/add.html (added) +++ qpid/java/trunk/broker-plugins/management-http/src/main/java/resources/logger/brokerlogger/add.html Tue Jun 23 21:49:46 2015 @@ -0,0 +1,36 @@ +<!-- + - + - Licensed to the Apache Software Foundation (ASF) under one + - or more contributor license agreements. See the NOTICE file + - distributed with this work for additional information + - regarding copyright ownership. The ASF licenses this file + - to you under the Apache License, Version 2.0 (the + - "License"); you may not use this file except in compliance + - with the License. You may obtain a copy of the License at + - + - http://www.apache.org/licenses/LICENSE-2.0 + - + - Unless required by applicable law or agreed to in writing, + - software distributed under the License is distributed on an + - "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY + - KIND, either express or implied. See the License for the + - specific language governing permissions and limitations + - under the License. + - + --> +<div> + <div class="clear"> + <div class="formLabel-labelCell tableContainer-labelCell">Exclude VirtualHost Events:</div> + <div class="formLabel-controlCell tableContainer-valueCell"> + <input type="checkbox" id="addLogger.virtualHostLogEventExcluded" + data-dojo-type="dijit/form/CheckBox" + data-dojo-props=" + name: 'virtualHostLogEventExcluded', + required: false"/> + <div data-dojo-type="dijit/Tooltip" + data-dojo-props="connectId: ['addLogger.virtualHostLogEventExcluded'], + label: 'If selected, virtual host log events will not be appended to the logger'"> + </div> + </div> + </div> +</div> \ No newline at end of file Added: qpid/java/trunk/broker-plugins/management-http/src/main/java/resources/logger/brokerlogger/show.html URL: http://svn.apache.org/viewvc/qpid/java/trunk/broker-plugins/management-http/src/main/java/resources/logger/brokerlogger/show.html?rev=1687140&view=auto ============================================================================== --- qpid/java/trunk/broker-plugins/management-http/src/main/java/resources/logger/brokerlogger/show.html (added) +++ qpid/java/trunk/broker-plugins/management-http/src/main/java/resources/logger/brokerlogger/show.html Tue Jun 23 21:49:46 2015 @@ -0,0 +1,27 @@ +<!-- + - + - Licensed to the Apache Software Foundation (ASF) under one + - or more contributor license agreements. See the NOTICE file + - distributed with this work for additional information + - regarding copyright ownership. The ASF licenses this file + - to you under the Apache License, Version 2.0 (the + - "License"); you may not use this file except in compliance + - with the License. You may obtain a copy of the License at + - + - http://www.apache.org/licenses/LICENSE-2.0 + - + - Unless required by applicable law or agreed to in writing, + - software distributed under the License is distributed on an + - "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY + - KIND, either express or implied. See the License for the + - specific language governing permissions and limitations + - under the License. + - + --> +<div> + <div class="clear"> + <div class="formLabel-labelCell">Exclude VirtualHost Events:</div> + <div class="virtualHostLogEventExcluded"><input type="checkbox"/></div> + </div> + <div class="typeSpecificAttributes"></div> +</div> Added: qpid/java/trunk/broker-plugins/management-http/src/main/java/resources/logger/console/add.html URL: http://svn.apache.org/viewvc/qpid/java/trunk/broker-plugins/management-http/src/main/java/resources/logger/console/add.html?rev=1687140&view=auto ============================================================================== --- qpid/java/trunk/broker-plugins/management-http/src/main/java/resources/logger/console/add.html (added) +++ qpid/java/trunk/broker-plugins/management-http/src/main/java/resources/logger/console/add.html Tue Jun 23 21:49:46 2015 @@ -0,0 +1,33 @@ +<!-- + ~ Licensed to the Apache Software Foundation (ASF) under one + ~ or more contributor license agreements. See the NOTICE file + ~ distributed with this work for additional information + ~ regarding copyright ownership. The ASF licenses this file + ~ to you under the Apache License, Version 2.0 (the + ~ "License"); you may not use this file except in compliance + ~ with the License. You may obtain a copy of the License at + ~ + ~ http://www.apache.org/licenses/LICENSE-2.0 + ~ + ~ Unless required by applicable law or agreed to in writing, + ~ software distributed under the License is distributed on an + ~ "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY + ~ KIND, either express or implied. See the License for the + ~ specific language governing permissions and limitations + ~ under the License. + --> + +<div> + <div class="clear"> + <div class="formLabel-labelCell tableContainer-labelCell">Log Message Format:</div> + <div class="formLabel-controlCell tableContainer-valueCell"> + <input type="text" id="addLogger.console.layout" + data-dojo-type="dijit/form/ValidationTextBox" + data-dojo-props=" + name: 'layout', + placeHolder: '%d %-5p [%t] \(%c{2}\) - %m%n', + promptMessage: 'Enter the format of the log messages using logback formating', + title: 'Enter the format of the log messages using logback formating'"/> + </div> + </div> +</div> Added: qpid/java/trunk/broker-plugins/management-http/src/main/java/resources/logger/console/show.html URL: http://svn.apache.org/viewvc/qpid/java/trunk/broker-plugins/management-http/src/main/java/resources/logger/console/show.html?rev=1687140&view=auto ============================================================================== --- qpid/java/trunk/broker-plugins/management-http/src/main/java/resources/logger/console/show.html (added) +++ qpid/java/trunk/broker-plugins/management-http/src/main/java/resources/logger/console/show.html Tue Jun 23 21:49:46 2015 @@ -0,0 +1,26 @@ +<!-- + - + - Licensed to the Apache Software Foundation (ASF) under one + - or more contributor license agreements. See the NOTICE file + - distributed with this work for additional information + - regarding copyright ownership. The ASF licenses this file + - to you under the Apache License, Version 2.0 (the + - "License"); you may not use this file except in compliance + - with the License. You may obtain a copy of the License at + - + - http://www.apache.org/licenses/LICENSE-2.0 + - + - Unless required by applicable law or agreed to in writing, + - software distributed under the License is distributed on an + - "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY + - KIND, either express or implied. See the License for the + - specific language governing permissions and limitations + - under the License. + - + --> +<div> + <div class="clear"> + <div class="formLabel-labelCell">Log Message Format:</div> + <div class="layout"></div> + </div> +</div> Added: qpid/java/trunk/broker-plugins/management-http/src/main/java/resources/logger/file/add.html URL: http://svn.apache.org/viewvc/qpid/java/trunk/broker-plugins/management-http/src/main/java/resources/logger/file/add.html?rev=1687140&view=auto ============================================================================== --- qpid/java/trunk/broker-plugins/management-http/src/main/java/resources/logger/file/add.html (added) +++ qpid/java/trunk/broker-plugins/management-http/src/main/java/resources/logger/file/add.html Tue Jun 23 21:49:46 2015 @@ -0,0 +1,118 @@ +<!-- + ~ Licensed to the Apache Software Foundation (ASF) under one + ~ or more contributor license agreements. See the NOTICE file + ~ distributed with this work for additional information + ~ regarding copyright ownership. The ASF licenses this file + ~ to you under the Apache License, Version 2.0 (the + ~ "License"); you may not use this file except in compliance + ~ with the License. You may obtain a copy of the License at + ~ + ~ http://www.apache.org/licenses/LICENSE-2.0 + ~ + ~ Unless required by applicable law or agreed to in writing, + ~ software distributed under the License is distributed on an + ~ "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY + ~ KIND, either express or implied. See the License for the + ~ specific language governing permissions and limitations + ~ under the License. + --> + +<div> + <div class="clear"> + <div class="formLabel-labelCell tableContainer-labelCell">File Name:</div> + <div class="formLabel-controlCell tableContainer-valueCell"> + <input type="text" id="addLogger.fileName" + data-dojo-type="dijit/form/ValidationTextBox" + data-dojo-props=" + name: 'fileName', + required: false, + placeHolder: 'path to the logfile', + promptMessage: 'Enter the log file path', + title: 'Path to the log file on the file system'"/> + </div> + + <div class="formBox"> + <fieldset> + <legend>Rolling Options</legend> + <div class="clear"> + <div class="formLabel-labelCell tableContainer-labelCell">Roll Daily:</div> + <div class="formLabel-controlCell tableContainer-valueCell"> + <input type="checkbox" id="addLogger.rollDaily" + data-dojo-type="dijit/form/CheckBox" + data-dojo-props=" + name: 'rollDaily', + required: false"/> + <div data-dojo-type="dijit/Tooltip" + data-dojo-props="connectId: ['addLogger.rollDaily'], + label: 'If selected, files will be rolled over daily'"> + </div> + </div> + </div> + <div class="clear"> + <div class="formLabel-labelCell tableContainer-labelCell">Roll on Restart:</div> + <div class="formLabel-controlCell tableContainer-valueCell"> + <input type="checkbox" id="addLogger.rollOnRestart" + data-dojo-type="dijit/form/CheckBox" + data-dojo-props=" + name: 'rollOnRestart', + required: false"/> + <div data-dojo-type="dijit/Tooltip" + data-dojo-props="connectId: ['addLogger.rollOnRestart'], + label: 'If selected, files will be rolled over on every restart'"> + </div> + </div> + </div> + <div class="clear"> + <div class="formLabel-labelCell tableContainer-labelCell">Compress Rolled Files:</div> + <div class="formLabel-controlCell tableContainer-valueCell"> + <input type="checkbox" id="addLogger.compressOldFiles" + data-dojo-type="dijit/form/CheckBox" + data-dojo-props=" + name: 'compressOldFiles', + required: false"/> + <div data-dojo-type="dijit/Tooltip" + data-dojo-props="connectId: ['addLogger.compressOldFiles'], + label: 'If selected, rolled over files will be compressed'"> + </div> + </div> + </div> + <div class="clear"> + <div class="formLabel-labelCell tableContainer-labelCell">Maximum Number of Rolled Files:</div> + <div class="formLabel-controlCell tableContainer-valueCell"> + <input type="text" id="addLogger.maxHistory" + data-dojo-type="dijit/form/NumberTextBox" + data-dojo-props=" + name: 'maxHistory', + placeHolder: 'maximum number of files to keep in history', + promptMessage: 'Enter the maximum number of files to keep in history', + title: 'Enter the maximum number of files to keep in history'"/> + </div> + </div> + <div class="clear"> + <div class="formLabel-labelCell tableContainer-labelCell">Maximum File Size:</div> + <div class="formLabel-controlCell tableContainer-valueCell"> + <input type="text" id="addLogger.maxFileSize" + data-dojo-type="dijit/form/ValidationTextBox" + data-dojo-props=" + name: 'maxFileSize', + placeHolder: 'maximum file size', + promptMessage: 'Enter file size limit of log files before they roll over. You cann append logback size specifiers (e.g., mb or kb)', + title: 'Enter file size limit of logfiles before they roll over'"/> + </div> + </div> + <div class="clear"> + <div class="formLabel-labelCell tableContainer-labelCell">Log Message Format:</div> + <div class="formLabel-controlCell tableContainer-valueCell"> + <input type="text" id="addLogger.layout" + data-dojo-type="dijit/form/ValidationTextBox" + data-dojo-props=" + name: 'layout', + placeHolder: '%d %-5p [%t] \(%c{2}\) - %m%n', + promptMessage: 'Enter the format of the log messages using logback formating', + title: 'Enter the format of the log messages using logback formating'"/> + </div> + </div> + </fieldset> + </div> + </div> +</div> Added: qpid/java/trunk/broker-plugins/management-http/src/main/java/resources/logger/file/show.html URL: http://svn.apache.org/viewvc/qpid/java/trunk/broker-plugins/management-http/src/main/java/resources/logger/file/show.html?rev=1687140&view=auto ============================================================================== --- qpid/java/trunk/broker-plugins/management-http/src/main/java/resources/logger/file/show.html (added) +++ qpid/java/trunk/broker-plugins/management-http/src/main/java/resources/logger/file/show.html Tue Jun 23 21:49:46 2015 @@ -0,0 +1,59 @@ +<!-- + - + - Licensed to the Apache Software Foundation (ASF) under one + - or more contributor license agreements. See the NOTICE file + - distributed with this work for additional information + - regarding copyright ownership. The ASF licenses this file + - to you under the Apache License, Version 2.0 (the + - "License"); you may not use this file except in compliance + - with the License. You may obtain a copy of the License at + - + - http://www.apache.org/licenses/LICENSE-2.0 + - + - Unless required by applicable law or agreed to in writing, + - software distributed under the License is distributed on an + - "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY + - KIND, either express or implied. See the License for the + - specific language governing permissions and limitations + - under the License. + - + --> +<div> + <div class="clear"> + <div class="formLabel-labelCell">File Name:</div> + <div class="fileName"></div> + </div> + <div class="formBox"> + <fieldset> + <legend>Rolling Options</legend> + <div class="alignLeft"> + <div class="clear"> + <div class="formLabel-labelCell">Rolling Daily:</div> + <div class="rollDaily formValue-valueCell"></div> + </div> + <div class="clear"> + <div class="formLabel-labelCell">Compress Rolled Files:</div> + <div class="compressOldFiles formValue-valueCell"></div> + </div> + <div class="clear"> + <div class="formLabel-labelCell">Maximum Number of Rolled Files:</div> + <div class="maxHistory formValue-valueCell"></div> + </div> + </div> + <div class="alignRight"> + <div class="clear"> + <div class="formLabel-labelCell">Roll on Restart:</div> + <div class="rollOnRestart formValue-valueCell"></div> + </div> + <div class="clear"> + <div class="formLabel-labelCell">Maximum File Size:</div> + <div class="maxFileSize formValue-valueCell"></div> + </div> + <div class="clear"> + <div class="formLabel-labelCell">Log Message Format:</div> + <div class="layout formValue-valueCell"></div> + </div> + </div> + </fieldset> + </div> +</div> Added: qpid/java/trunk/broker-plugins/management-http/src/main/java/resources/logger/memory/add.html URL: http://svn.apache.org/viewvc/qpid/java/trunk/broker-plugins/management-http/src/main/java/resources/logger/memory/add.html?rev=1687140&view=auto ============================================================================== --- qpid/java/trunk/broker-plugins/management-http/src/main/java/resources/logger/memory/add.html (added) +++ qpid/java/trunk/broker-plugins/management-http/src/main/java/resources/logger/memory/add.html Tue Jun 23 21:49:46 2015 @@ -0,0 +1,34 @@ +<!-- + ~ Licensed to the Apache Software Foundation (ASF) under one + ~ or more contributor license agreements. See the NOTICE file + ~ distributed with this work for additional information + ~ regarding copyright ownership. The ASF licenses this file + ~ to you under the Apache License, Version 2.0 (the + ~ "License"); you may not use this file except in compliance + ~ with the License. You may obtain a copy of the License at + ~ + ~ http://www.apache.org/licenses/LICENSE-2.0 + ~ + ~ Unless required by applicable law or agreed to in writing, + ~ software distributed under the License is distributed on an + ~ "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY + ~ KIND, either express or implied. See the License for the + ~ specific language governing permissions and limitations + ~ under the License. + --> + +<div> + <div class="clear"> + <div class="formLabel-labelCell tableContainer-labelCell">Maximum number of records to cache:</div> + <div class="formLabel-controlCell tableContainer-valueCell"> + <input type="text" id="addLogger.maxRecords" + data-dojo-type="dijit/form/NumberTextBox" + data-dojo-props=" + name: 'maxRecords', + required: false, + placeHolder: 'maximum number of logs', + promptMessage: 'Enter maximum number of log records to hold in memory', + title: 'Maximum number of log records to hold in memory'"/> + </div> + </div> +</div> Added: qpid/java/trunk/broker-plugins/management-http/src/main/java/resources/logger/memory/show.html URL: http://svn.apache.org/viewvc/qpid/java/trunk/broker-plugins/management-http/src/main/java/resources/logger/memory/show.html?rev=1687140&view=auto ============================================================================== --- qpid/java/trunk/broker-plugins/management-http/src/main/java/resources/logger/memory/show.html (added) +++ qpid/java/trunk/broker-plugins/management-http/src/main/java/resources/logger/memory/show.html Tue Jun 23 21:49:46 2015 @@ -0,0 +1,26 @@ +<!-- + - + - Licensed to the Apache Software Foundation (ASF) under one + - or more contributor license agreements. See the NOTICE file + - distributed with this work for additional information + - regarding copyright ownership. The ASF licenses this file + - to you under the Apache License, Version 2.0 (the + - "License"); you may not use this file except in compliance + - with the License. You may obtain a copy of the License at + - + - http://www.apache.org/licenses/LICENSE-2.0 + - + - Unless required by applicable law or agreed to in writing, + - software distributed under the License is distributed on an + - "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY + - KIND, either express or implied. See the License for the + - specific language governing permissions and limitations + - under the License. + - + --> +<div> + <div class="clear"> + <div class="formLabel-labelCell">Maximum number of records to cache:</div> + <div class="maxRecords"></div> + </div> +</div> Added: qpid/java/trunk/broker-plugins/management-http/src/main/java/resources/logger/virtualhostlogger/show.html URL: http://svn.apache.org/viewvc/qpid/java/trunk/broker-plugins/management-http/src/main/java/resources/logger/virtualhostlogger/show.html?rev=1687140&view=auto ============================================================================== --- qpid/java/trunk/broker-plugins/management-http/src/main/java/resources/logger/virtualhostlogger/show.html (added) +++ qpid/java/trunk/broker-plugins/management-http/src/main/java/resources/logger/virtualhostlogger/show.html Tue Jun 23 21:49:46 2015 @@ -0,0 +1,23 @@ +<!-- + - + - Licensed to the Apache Software Foundation (ASF) under one + - or more contributor license agreements. See the NOTICE file + - distributed with this work for additional information + - regarding copyright ownership. The ASF licenses this file + - to you under the Apache License, Version 2.0 (the + - "License"); you may not use this file except in compliance + - with the License. You may obtain a copy of the License at + - + - http://www.apache.org/licenses/LICENSE-2.0 + - + - Unless required by applicable law or agreed to in writing, + - software distributed under the License is distributed on an + - "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY + - KIND, either express or implied. See the License for the + - specific language governing permissions and limitations + - under the License. + - + --> +<div> + <div class="typeSpecificAttributes"></div> +</div> Added: qpid/java/trunk/broker-plugins/management-http/src/main/java/resources/loggerfilter/nameandlevel/add.html URL: http://svn.apache.org/viewvc/qpid/java/trunk/broker-plugins/management-http/src/main/java/resources/loggerfilter/nameandlevel/add.html?rev=1687140&view=auto ============================================================================== --- qpid/java/trunk/broker-plugins/management-http/src/main/java/resources/loggerfilter/nameandlevel/add.html (added) +++ qpid/java/trunk/broker-plugins/management-http/src/main/java/resources/loggerfilter/nameandlevel/add.html Tue Jun 23 21:49:46 2015 @@ -0,0 +1,46 @@ +<!-- + ~ Licensed to the Apache Software Foundation (ASF) under one + ~ or more contributor license agreements. See the NOTICE file + ~ distributed with this work for additional information + ~ regarding copyright ownership. The ASF licenses this file + ~ to you under the Apache License, Version 2.0 (the + ~ "License"); you may not use this file except in compliance + ~ with the License. You may obtain a copy of the License at + ~ + ~ http://www.apache.org/licenses/LICENSE-2.0 + ~ + ~ Unless required by applicable law or agreed to in writing, + ~ software distributed under the License is distributed on an + ~ "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY + ~ KIND, either express or implied. See the License for the + ~ specific language governing permissions and limitations + ~ under the License. + --> + +<div> + <div class="clear"> + <div class="formLabel-labelCell tableContainer-labelCell">Logger Name:</div> + <div class="formLabel-controlCell tableContainer-valueCell"> + <input type="text" id="addLoggerFilter.loggerName" + data-dojo-type="dijit/form/ValidationTextBox" + data-dojo-props=" + name: 'loggerName', + placeHolder: 'xxx.yyy.zzz', + promptMessage: 'Enter logger name. .* wildcard can be specified on the end of logger name to include the logger hierarchy. if not set a root logger will be used', + title: 'Enter logger name'"/> + </div> + </div> + <div class="clear"> + <div class="formLabel-labelCell tableContainer-labelCell">Level:</div> + <div class="formLabel-controlCell tableContainer-valueCell"> + <input type="text" id="addLoggerFilter.level" + data-dojo-type="dijit/form/FilteringSelect" + data-dojo-props=" + name: 'level', + required: false, + placeHolder: 'level', + promptMessage: 'Select filter level', + title: 'Select filter level'"/> + </div> + </div> +</div> Modified: qpid/java/trunk/broker-plugins/management-http/src/main/java/resources/showBroker.html URL: http://svn.apache.org/viewvc/qpid/java/trunk/broker-plugins/management-http/src/main/java/resources/showBroker.html?rev=1687140&r1=1687139&r2=1687140&view=diff ============================================================================== --- qpid/java/trunk/broker-plugins/management-http/src/main/java/resources/showBroker.html (original) +++ qpid/java/trunk/broker-plugins/management-http/src/main/java/resources/showBroker.html Tue Jun 23 21:49:46 2015 @@ -99,6 +99,12 @@ <button data-dojo-type="dijit.form.Button" class="deletePort">Delete Port</button> </div> <br/> + <div data-dojo-type="dijit.TitlePane" data-dojo-props="title: 'Broker Loggers'"> + <div class="broker-loggers"></div> + <button data-dojo-type="dijit.form.Button" class="addBrokerLogger">Add Broker Logger</button> + <button data-dojo-type="dijit.form.Button" class="deleteBrokerLogger">Delete Broker Logger</button> + </div> + <br/> <div data-dojo-type="dijit.TitlePane" data-dojo-props="title: 'Authentication Providers'"> <div class="broker-authentication-providers"></div> <button data-dojo-type="dijit.form.Button" class="addAuthenticationProvider">Add Provider</button> Added: qpid/java/trunk/broker-plugins/management-http/src/main/java/resources/showLogger.html URL: http://svn.apache.org/viewvc/qpid/java/trunk/broker-plugins/management-http/src/main/java/resources/showLogger.html?rev=1687140&view=auto ============================================================================== --- qpid/java/trunk/broker-plugins/management-http/src/main/java/resources/showLogger.html (added) +++ qpid/java/trunk/broker-plugins/management-http/src/main/java/resources/showLogger.html Tue Jun 23 21:49:46 2015 @@ -0,0 +1,58 @@ +<!-- + - + - Licensed to the Apache Software Foundation (ASF) under one + - or more contributor license agreements. See the NOTICE file + - distributed with this work for additional information + - regarding copyright ownership. The ASF licenses this file + - to you under the Apache License, Version 2.0 (the + - "License"); you may not use this file except in compliance + - with the License. You may obtain a copy of the License at + - + - http://www.apache.org/licenses/LICENSE-2.0 + - + - Unless required by applicable law or agreed to in writing, + - software distributed under the License is distributed on an + - "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY + - KIND, either express or implied. See the License for the + - specific language governing permissions and limitations + - under the License. + - + --> +<div> + <div data-dojo-type="dijit.TitlePane" data-dojo-props="title: 'Logger Attributes', open: false"> + <div class="clear"> + <div class="formLabel-labelCell">Name:</div> + <div class="name"></div> + </div> + <div class="clear"> + <div class="formLabel-labelCell">Type:</div> + <div class="type"></div> + </div> + <div class="clear"> + <div class="formLabel-labelCell">State:</div> + <div class="state"></div> + </div> + <div class="clear"> + <div class="formLabel-labelCell">Durable:</div> + <div class="durable"><input type="checkbox"/></div> + </div> + <div class="clear loggerAttributes"></div> + <div class="clear"></div> + </div> + <div class="dijitDialogPaneActionBar"> + <button data-dojo-type="dijit.form.Button" class="editLoggerButton" type="button" data-dojo-props="iconClass: 'dijitIconEdit'">Edit</button> + <button data-dojo-type="dijit.form.Button" class="deleteLoggerButton" data-dojo-props="iconClass: 'dijitIconDelete'">Delete</button> + </div> + <br/> + <div data-dojo-type="dijit.TitlePane" data-dojo-props="title: 'Filters'" class="clear filterGridPanel"> + <div class="filterGrid" style="display:none"></div> + <div class="filterWarning warningPane" style="display:none"><div class="warningIcon"></div><div class="warningMessage">Logger will not log anything without filters.</div></div> + <div class="clear"> + <button data-dojo-type="dijit.form.Button" class="addFilterButton">Add</button> + <button data-dojo-type="dijit.form.Button" class="deleteFilterButton">Delete</button> + </div> + </div> + <br/> + <div class="loggerExtra"></div> +</div> + Added: qpid/java/trunk/broker-plugins/management-http/src/main/java/resources/showLoggerFilter.html URL: http://svn.apache.org/viewvc/qpid/java/trunk/broker-plugins/management-http/src/main/java/resources/showLoggerFilter.html?rev=1687140&view=auto ============================================================================== --- qpid/java/trunk/broker-plugins/management-http/src/main/java/resources/showLoggerFilter.html (added) +++ qpid/java/trunk/broker-plugins/management-http/src/main/java/resources/showLoggerFilter.html Tue Jun 23 21:49:46 2015 @@ -0,0 +1,43 @@ +<!-- + - + - Licensed to the Apache Software Foundation (ASF) under one + - or more contributor license agreements. See the NOTICE file + - distributed with this work for additional information + - regarding copyright ownership. The ASF licenses this file + - to you under the Apache License, Version 2.0 (the + - "License"); you may not use this file except in compliance + - with the License. You may obtain a copy of the License at + - + - http://www.apache.org/licenses/LICENSE-2.0 + - + - Unless required by applicable law or agreed to in writing, + - software distributed under the License is distributed on an + - "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY + - KIND, either express or implied. See the License for the + - specific language governing permissions and limitations + - under the License. + - + --> +<div> + <div data-dojo-type="dijit.TitlePane" data-dojo-props="title: 'Logger Filter Attributes', open: true"> + <div class="clear"> + <div class="formLabel-labelCell">Name:</div> + <div class="name"></div> + </div> + <div class="clear"> + <div class="formLabel-labelCell">Type:</div> + <div class="type"></div> + </div> + <div class="clear"> + <div class="formLabel-labelCell">State:</div> + <div class="state"></div> + </div> + <div class="clear loggerFilterAttributes"></div> + <div class="clear"></div> + </div> + <div class="dijitDialogPaneActionBar"> + <button data-dojo-type="dijit.form.Button" class="editButton" type="button" data-dojo-props="iconClass: 'dijitIconEdit'">Edit</button> + <button data-dojo-type="dijit.form.Button" class="deleteButton" data-dojo-props="iconClass: 'dijitIconDelete'">Delete</button> + </div> +</div> + Modified: qpid/java/trunk/broker-plugins/management-http/src/main/java/resources/showVirtualHost.html URL: http://svn.apache.org/viewvc/qpid/java/trunk/broker-plugins/management-http/src/main/java/resources/showVirtualHost.html?rev=1687140&r1=1687139&r2=1687140&view=diff ============================================================================== --- qpid/java/trunk/broker-plugins/management-http/src/main/java/resources/showVirtualHost.html (original) +++ qpid/java/trunk/broker-plugins/management-http/src/main/java/resources/showVirtualHost.html Tue Jun 23 21:49:46 2015 @@ -135,6 +135,13 @@ <div data-dojo-type="dijit.TitlePane" data-dojo-props="title: 'Connections'" class="virtualHostConnections"> <div class="connections"></div> </div> + <br/> + <div data-dojo-type="dijit.TitlePane" data-dojo-props="title: 'Virtual Host Loggers'"> + <div class="loggers"></div> + <button data-dojo-type="dijit.form.Button" class="addVirtualHostLogger">Add Virtual Host Logger</button> + <button data-dojo-type="dijit.form.Button" class="deleteVirtualHostLogger">Delete Virtual Host Logger</button> + </div> + <br/> </div> </div> --------------------------------------------------------------------- To unsubscribe, e-mail: [email protected] For additional commands, e-mail: [email protected]
