You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@qpid.apache.org by or...@apache.org on 2015/08/28 18:39:00 UTC
svn commit: r1698368 [2/2] - in /qpid/java/trunk:
broker-core/src/main/java/org/apache/qpid/server/logging/
broker-core/src/main/java/org/apache/qpid/server/model/
broker-core/src/main/java/org/apache/qpid/server/security/
broker-core/src/main/java/org...
Copied: qpid/java/trunk/broker-plugins/management-http/src/main/java/resources/js/qpid/management/loginclusionrule/brokerloginclusionrule/nameandlevel/add.js (from r1698333, 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/loginclusionrule/brokerloginclusionrule/nameandlevel/add.js?p2=qpid/java/trunk/broker-plugins/management-http/src/main/java/resources/js/qpid/management/loginclusionrule/brokerloginclusionrule/nameandlevel/add.js&p1=qpid/java/trunk/broker-plugins/management-http/src/main/java/resources/js/qpid/management/loggerfilter/brokerloggerfilter/nameandlevel/add.js&r1=1698333&r2=1698368&rev=1698368&view=diff
==============================================================================
--- qpid/java/trunk/broker-plugins/management-http/src/main/java/resources/js/qpid/management/loggerfilter/brokerloggerfilter/nameandlevel/add.js (original)
+++ qpid/java/trunk/broker-plugins/management-http/src/main/java/resources/js/qpid/management/loginclusionrule/brokerloginclusionrule/nameandlevel/add.js Fri Aug 28 16:38:58 2015
@@ -24,11 +24,11 @@ define(["dojo/dom",
"dijit/registry",
"qpid/common/util",
"dojo/parser",
- "dojo/text!loggerfilter/nameandlevel/add.html",
+ "dojo/text!loginclusionrule/nameandlevel/add.html",
"dojo/domReady!"],
function (dom, query, array, registry, util, parser, template)
{
- var addFileLogger =
+ var addLogInclusionRule =
{
show: function(data)
{
@@ -38,7 +38,7 @@ define(["dojo/dom",
data.containerNode.innerHTML = template;
return parser.parse(this.containerNode).then(function(instances)
{
- var logLevelWidget = registry.byId("addLoggerFilter.level");
+ var logLevelWidget = registry.byId("addLogInclusionRule.level");
var validValues = that.metadata.getMetaData(data.category, data.type).attributes.level.validValues;
var validValueStore = util.makeTypeStore(validValues);
logLevelWidget.set("store", validValueStore);
@@ -46,6 +46,6 @@ define(["dojo/dom",
}
};
- return addFileLogger;
+ return addLogInclusionRule;
}
);
Copied: qpid/java/trunk/broker-plugins/management-http/src/main/java/resources/js/qpid/management/loginclusionrule/virtualhostloginclusionrule/nameandlevel/add.js (from r1698333, 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/loginclusionrule/virtualhostloginclusionrule/nameandlevel/add.js?p2=qpid/java/trunk/broker-plugins/management-http/src/main/java/resources/js/qpid/management/loginclusionrule/virtualhostloginclusionrule/nameandlevel/add.js&p1=qpid/java/trunk/broker-plugins/management-http/src/main/java/resources/js/qpid/management/loggerfilter/virtualhostloggerfilter/nameandlevel/add.js&r1=1698333&r2=1698368&rev=1698368&view=diff
==============================================================================
--- qpid/java/trunk/broker-plugins/management-http/src/main/java/resources/js/qpid/management/loggerfilter/virtualhostloggerfilter/nameandlevel/add.js (original)
+++ qpid/java/trunk/broker-plugins/management-http/src/main/java/resources/js/qpid/management/loginclusionrule/virtualhostloginclusionrule/nameandlevel/add.js Fri Aug 28 16:38:58 2015
@@ -24,11 +24,11 @@ define(["dojo/dom",
"dijit/registry",
"qpid/common/util",
"dojo/parser",
- "dojo/text!loggerfilter/nameandlevel/add.html",
+ "dojo/text!loginclusionrule/nameandlevel/add.html",
"dojo/domReady!"],
function (dom, query, array, registry, util, parser, template)
{
- var addLoggerFilter =
+ var addLogInclusionRule =
{
show: function(data)
{
@@ -38,7 +38,7 @@ define(["dojo/dom",
data.containerNode.innerHTML = template;
return parser.parse(this.containerNode).then(function(instances)
{
- var logLevelWidget = registry.byId("addLoggerFilter.level");
+ var logLevelWidget = registry.byId("addLogInclusionRule.level");
var validValues = that.metadata.getMetaData(data.category, data.type).attributes.level.validValues;
var validValueStore = util.makeTypeStore(validValues);
logLevelWidget.set("store", validValueStore);
@@ -46,6 +46,6 @@ define(["dojo/dom",
}
};
- return addLoggerFilter;
+ return addLogInclusionRule;
}
);
Copied: qpid/java/trunk/broker-plugins/management-http/src/main/java/resources/loginclusionrule/nameandlevel/add.html (from r1698333, 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/loginclusionrule/nameandlevel/add.html?p2=qpid/java/trunk/broker-plugins/management-http/src/main/java/resources/loginclusionrule/nameandlevel/add.html&p1=qpid/java/trunk/broker-plugins/management-http/src/main/java/resources/loggerfilter/nameandlevel/add.html&r1=1698333&r2=1698368&rev=1698368&view=diff
==============================================================================
--- qpid/java/trunk/broker-plugins/management-http/src/main/java/resources/loggerfilter/nameandlevel/add.html (original)
+++ qpid/java/trunk/broker-plugins/management-http/src/main/java/resources/loginclusionrule/nameandlevel/add.html Fri Aug 28 16:38:58 2015
@@ -19,28 +19,28 @@
<div>
<div class="clear">
- <div class="formLabel-labelCell tableContainer-labelCell">Logger Name:</div>
+ <div class="formLabel-labelCell tableContainer-labelCell">Log Event Source Name:</div>
<div class="formLabel-controlCell tableContainer-valueCell">
- <input type="text" id="addLoggerFilter.loggerName"
+ <input type="text" id="addLogInclusionRule.loggerName"
data-dojo-type="dijit/form/ValidationTextBox"
data-dojo-props="
name: 'loggerName',
placeHolder: 'ROOT',
- promptMessage: 'Enter logger name (usually the package name). To capture loggers from subpackages you must specify the ".*" wildcard at the end (e.g., org.apache.qpid.*)',
- title: 'Enter logger name'"/>
+ promptMessage: 'Enter name of log event source (usually the package name). To capture log events from subpackages you must specify the ".*" wildcard at the end (e.g., org.apache.qpid.*)',
+ title: 'Enter log event source 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"
+ <input type="text" id="addLogInclusionRule.level"
data-dojo-type="dijit/form/FilteringSelect"
data-dojo-props="
name: 'level',
required: false,
placeHolder: 'level',
- promptMessage: 'Select filter level',
- title: 'Select filter level'"/>
+ promptMessage: 'Select log level for this rule',
+ title: 'Select log level for this rule'"/>
</div>
</div>
</div>
Modified: 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=1698368&r1=1698367&r2=1698368&view=diff
==============================================================================
--- qpid/java/trunk/broker-plugins/management-http/src/main/java/resources/showLogger.html (original)
+++ qpid/java/trunk/broker-plugins/management-http/src/main/java/resources/showLogger.html Fri Aug 28 16:38:58 2015
@@ -56,12 +56,12 @@
<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 hidden">Logger will not log anything without filters.</div>
+ <div data-dojo-type="dijit.TitlePane" data-dojo-props="title: 'Log Inclusion Rules'" class="clear">
+ <div class="logInclusionRuleGrid" style="display:none"></div>
+ <div class="logInclusionRuleWarning warningPane hidden">Logger will not log anything without inclusion rules.</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>
+ <button data-dojo-type="dijit.form.Button" class="addLogInclusionRuleButton">Add</button>
+ <button data-dojo-type="dijit.form.Button" class="deleteLogInclusionRuleButton">Delete</button>
</div>
</div>
<br/>
Modified: qpid/java/trunk/broker-plugins/management-jmx/src/main/java/org/apache/qpid/server/jmx/mbeans/LoggingManagementMBean.java
URL: http://svn.apache.org/viewvc/qpid/java/trunk/broker-plugins/management-jmx/src/main/java/org/apache/qpid/server/jmx/mbeans/LoggingManagementMBean.java?rev=1698368&r1=1698367&r2=1698368&view=diff
==============================================================================
--- qpid/java/trunk/broker-plugins/management-jmx/src/main/java/org/apache/qpid/server/jmx/mbeans/LoggingManagementMBean.java (original)
+++ qpid/java/trunk/broker-plugins/management-jmx/src/main/java/org/apache/qpid/server/jmx/mbeans/LoggingManagementMBean.java Fri Aug 28 16:38:58 2015
@@ -42,9 +42,9 @@ import javax.management.openmbean.Tabula
import javax.management.openmbean.TabularType;
import org.apache.qpid.server.logging.BrokerFileLogger;
-import org.apache.qpid.server.logging.BrokerNameAndLevelFilter;
+import org.apache.qpid.server.logging.BrokerNameAndLevelLogInclusionRule;
import org.apache.qpid.server.logging.LogLevel;
-import org.apache.qpid.server.model.BrokerLoggerFilter;
+import org.apache.qpid.server.model.BrokerLogInclusionRule;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
@@ -63,7 +63,7 @@ public class LoggingManagementMBean exte
private static final Logger LOGGER = LoggerFactory.getLogger(LoggingManagementMBean.class);
private static final TabularType LOGGER_LEVEL_TABULAR_TYPE;
private static final CompositeType LOGGER_LEVEL_COMPOSITE_TYPE;
- private static final String UNSUPPORTED_LOGGER_FILTER_TYPE = "<UNSUPPORTED>";
+ private static final String UNSUPPORTED_LOG_INCLUSION_RULE_TYPE = "<UNSUPPORTED>";
static
{
@@ -126,13 +126,13 @@ public class LoggingManagementMBean exte
@Override
public TabularData viewEffectiveRuntimeLoggerLevels()
{
- return getTabularData(findFiltersByDurability(FilterDurability.EITHER));
+ return getTabularData(findRulesByDurability(LogInclusionRuleDurability.EITHER));
}
@Override
public String getRuntimeRootLoggerLevel()
{
- return getLogLevel(ROOT_LOGGER_NAME, FilterDurability.NONDURABLE);
+ return getLogLevel(ROOT_LOGGER_NAME, LogInclusionRuleDurability.NONDURABLE);
}
@Override
@@ -144,25 +144,25 @@ public class LoggingManagementMBean exte
@Override
public boolean setRuntimeLoggerLevel(String logger, String level)
{
- return setLogLevel(logger, level, FilterDurability.NONDURABLE);
+ return setLogLevel(logger, level, LogInclusionRuleDurability.NONDURABLE);
}
@Override
public TabularData viewConfigFileLoggerLevels()
{
- return getTabularData(findFiltersByDurability(FilterDurability.DURABLE));
+ return getTabularData(findRulesByDurability(LogInclusionRuleDurability.DURABLE));
}
@Override
public String getConfigFileRootLoggerLevel() throws IOException
{
- return getLogLevel(ROOT_LOGGER_NAME, FilterDurability.DURABLE);
+ return getLogLevel(ROOT_LOGGER_NAME, LogInclusionRuleDurability.DURABLE);
}
@Override
public boolean setConfigFileLoggerLevel(String logger, String level)
{
- return setLogLevel(logger, level, FilterDurability.DURABLE);
+ return setLogLevel(logger, level, LogInclusionRuleDurability.DURABLE);
}
@Override
@@ -220,32 +220,32 @@ public class LoggingManagementMBean exte
}
}
- private TabularData getTabularData(Collection<BrokerLoggerFilter<?>> filters)
+ private TabularData getTabularData(Collection<BrokerLogInclusionRule<?>> rules)
{
Map<String,String> logToLevelMap = new TreeMap<>();
- for (BrokerLoggerFilter<?> filter: filters)
+ for (BrokerLogInclusionRule<?> rule: rules)
{
- if (filter instanceof BrokerNameAndLevelFilter)
+ if (rule instanceof BrokerNameAndLevelLogInclusionRule)
{
- BrokerNameAndLevelFilter<?> nameAndLevelFilter = (BrokerNameAndLevelFilter)filter;
- logToLevelMap.put(nameAndLevelFilter.getLoggerName(), nameAndLevelFilter.getLevel().name());
+ BrokerNameAndLevelLogInclusionRule<?> nameAndLevelRule = (BrokerNameAndLevelLogInclusionRule)rule;
+ logToLevelMap.put(nameAndLevelRule.getLoggerName(), nameAndLevelRule.getLevel().name());
}
else
{
- logToLevelMap.put(UNSUPPORTED_LOGGER_FILTER_TYPE, "");
+ logToLevelMap.put(UNSUPPORTED_LOG_INCLUSION_RULE_TYPE, "");
}
}
return createTabularDataFromLevelsMap(logToLevelMap);
}
- private String getLogLevel(String loggerName, FilterDurability filterDurability)
+ private String getLogLevel(String loggerName, LogInclusionRuleDurability logInclusionRuleDurability)
{
LogLevel level = LogLevel.OFF;
- List<BrokerNameAndLevelFilter<?>> filters = findFiltersByLoggerNameAndDurability(loggerName, filterDurability);
+ List<BrokerNameAndLevelLogInclusionRule<?>> rules = findRulesByLoggerNameAndDurability(loggerName, logInclusionRuleDurability);
- for(BrokerNameAndLevelFilter<?> filter: filters)
+ for(BrokerNameAndLevelLogInclusionRule<?> rule: rules)
{
- final LogLevel filterLevel = filter.getLevel();
+ final LogLevel filterLevel = rule.getLevel();
if (level.compareTo(filterLevel) > 0)
{
level = filterLevel;
@@ -254,7 +254,7 @@ public class LoggingManagementMBean exte
return level.name();
}
- private boolean setLogLevel(String logger, String level, FilterDurability durability)
+ private boolean setLogLevel(String logger, String level, LogInclusionRuleDurability durability)
{
if (!isValidLogLevel(level))
{
@@ -262,19 +262,19 @@ public class LoggingManagementMBean exte
return false;
}
- List<BrokerNameAndLevelFilter<?>> filters = findFiltersByLoggerNameAndDurability(logger, durability);
- if (filters.isEmpty())
+ List<BrokerNameAndLevelLogInclusionRule<?>> rules = findRulesByLoggerNameAndDurability(logger, durability);
+ if (rules.isEmpty())
{
LOGGER.warn("There is no logger with name '{}' and durability '{}'", logger, durability.name().toLowerCase());
return false;
}
LogLevel targetLevel = LogLevel.valueOf(level);
- for (BrokerNameAndLevelFilter<?> filter: filters)
+ for (BrokerNameAndLevelLogInclusionRule<?> rule: rules)
{
try
{
- filter.setAttributes(Collections.<String, Object>singletonMap(BrokerNameAndLevelFilter.LEVEL, targetLevel));
+ rule.setAttributes(Collections.<String, Object>singletonMap(BrokerNameAndLevelLogInclusionRule.LEVEL, targetLevel));
}
catch(RuntimeException e)
{
@@ -286,41 +286,41 @@ public class LoggingManagementMBean exte
return true;
}
- private List<BrokerLoggerFilter<?>> findFiltersByDurability(FilterDurability durability)
+ private List<BrokerLogInclusionRule<?>> findRulesByDurability(LogInclusionRuleDurability durability)
{
- Collection<BrokerLoggerFilter<?>> filters = _brokerFileLogger.getChildren(BrokerLoggerFilter.class);
- List<BrokerLoggerFilter<?>> results = new ArrayList<>();
+ Collection<BrokerLogInclusionRule<?>> rules = _brokerFileLogger.getChildren(BrokerLogInclusionRule.class);
+ List<BrokerLogInclusionRule<?>> results = new ArrayList<>();
if (durability == durability.EITHER)
{
- results.addAll(filters);
+ results.addAll(rules);
}
else
{
- for (BrokerLoggerFilter<?> filter: filters)
+ for (BrokerLogInclusionRule<?> rule: rules)
{
- if (durability == FilterDurability.valueOf(filter.isDurable()))
+ if (durability == LogInclusionRuleDurability.valueOf(rule.isDurable()))
{
- results.add(filter);
+ results.add(rule);
}
}
}
return results;
}
- private List<BrokerNameAndLevelFilter<?>> findFiltersByLoggerNameAndDurability(String loggerName, FilterDurability filterDurability)
+ private List<BrokerNameAndLevelLogInclusionRule<?>> findRulesByLoggerNameAndDurability(String loggerName, LogInclusionRuleDurability logInclusionRuleDurability)
{
- List<BrokerNameAndLevelFilter<?>> results = new ArrayList<>();
- Collection<BrokerLoggerFilter<?>> filters = findFiltersByDurability(filterDurability);
+ List<BrokerNameAndLevelLogInclusionRule<?>> results = new ArrayList<>();
+ Collection<BrokerLogInclusionRule<?>> rules = findRulesByDurability(logInclusionRuleDurability);
String sanitizedLoggerName = sanitizeLoggerName(loggerName);
- for (BrokerLoggerFilter<?> filter: filters)
+ for (BrokerLogInclusionRule<?> rule: rules)
{
- if (filter instanceof BrokerNameAndLevelFilter)
+ if (rule instanceof BrokerNameAndLevelLogInclusionRule)
{
- BrokerNameAndLevelFilter<?> brokerNameAndLevelFilter = (BrokerNameAndLevelFilter<?>)filter;
- String filterLoggerName = sanitizeLoggerName(brokerNameAndLevelFilter.getLoggerName());
- if (sanitizedLoggerName.equals(filterLoggerName))
+ BrokerNameAndLevelLogInclusionRule<?> brokerNameAndLevelLogInclusionRule = (BrokerNameAndLevelLogInclusionRule<?>)rule;
+ String ruleLoggerName = sanitizeLoggerName(brokerNameAndLevelLogInclusionRule.getLoggerName());
+ if (sanitizedLoggerName.equals(ruleLoggerName))
{
- results.add(brokerNameAndLevelFilter);
+ results.add(brokerNameAndLevelLogInclusionRule);
}
}
}
@@ -336,13 +336,13 @@ public class LoggingManagementMBean exte
return loggerName;
}
- private enum FilterDurability
+ private enum LogInclusionRuleDurability
{
DURABLE,
NONDURABLE,
EITHER;
- public static FilterDurability valueOf(boolean durable)
+ public static LogInclusionRuleDurability valueOf(boolean durable)
{
return durable ? DURABLE : NONDURABLE;
}
Modified: qpid/java/trunk/broker-plugins/management-jmx/src/test/java/org/apache/qpid/server/jmx/mbeans/LoggingManagementMBeanTest.java
URL: http://svn.apache.org/viewvc/qpid/java/trunk/broker-plugins/management-jmx/src/test/java/org/apache/qpid/server/jmx/mbeans/LoggingManagementMBeanTest.java?rev=1698368&r1=1698367&r2=1698368&view=diff
==============================================================================
--- qpid/java/trunk/broker-plugins/management-jmx/src/test/java/org/apache/qpid/server/jmx/mbeans/LoggingManagementMBeanTest.java (original)
+++ qpid/java/trunk/broker-plugins/management-jmx/src/test/java/org/apache/qpid/server/jmx/mbeans/LoggingManagementMBeanTest.java Fri Aug 28 16:38:58 2015
@@ -39,9 +39,9 @@ import javax.management.openmbean.Tabula
import org.apache.qpid.management.common.mbeans.LoggingManagement;
import org.apache.qpid.server.jmx.ManagedObjectRegistry;
import org.apache.qpid.server.logging.BrokerFileLogger;
-import org.apache.qpid.server.logging.BrokerNameAndLevelFilter;
+import org.apache.qpid.server.logging.BrokerNameAndLevelLogInclusionRule;
import org.apache.qpid.server.logging.LogLevel;
-import org.apache.qpid.server.model.BrokerLoggerFilter;
+import org.apache.qpid.server.model.BrokerLogInclusionRule;
import org.apache.qpid.test.utils.QpidTestCase;
public class LoggingManagementMBeanTest extends QpidTestCase
@@ -84,12 +84,12 @@ public class LoggingManagementMBeanTest
public void testViewEffectiveRuntimeLoggerLevels() throws Exception
{
- Collection<BrokerLoggerFilter> filters = new ArrayList<>();
- filters.add(createMockFilter("a.b.D", LogLevel.DEBUG));
- filters.add(createMockFilter("a.b.C", LogLevel.INFO));
- filters.add(createMockFilter("", LogLevel.WARN));
+ Collection<BrokerLogInclusionRule> rules = new ArrayList<>();
+ rules.add(createMockRule("a.b.D", LogLevel.DEBUG));
+ rules.add(createMockRule("a.b.C", LogLevel.INFO));
+ rules.add(createMockRule("", LogLevel.WARN));
- when(_brokerFileLogger.getChildren(BrokerLoggerFilter.class)).thenReturn(filters);
+ when(_brokerFileLogger.getChildren(BrokerLogInclusionRule.class)).thenReturn(rules);
TabularData table = _loggingMBean.viewEffectiveRuntimeLoggerLevels();
assertEquals(3, table.size());
@@ -102,57 +102,57 @@ public class LoggingManagementMBeanTest
assertChannelRow(row3, "", LogLevel.WARN.name());
}
- private BrokerNameAndLevelFilter createMockFilter(String loggerName, LogLevel logLevel, boolean durability)
+ private BrokerNameAndLevelLogInclusionRule createMockRule(String loggerName, LogLevel logLevel, boolean durability)
{
- BrokerNameAndLevelFilter filter = mock(BrokerNameAndLevelFilter.class);
- when(filter.getLevel()).thenReturn(logLevel);
- when(filter.getLoggerName()).thenReturn(loggerName);
- when(filter.isDurable()).thenReturn(durability);
- return filter;
+ BrokerNameAndLevelLogInclusionRule rule = mock(BrokerNameAndLevelLogInclusionRule.class);
+ when(rule.getLevel()).thenReturn(logLevel);
+ when(rule.getLoggerName()).thenReturn(loggerName);
+ when(rule.isDurable()).thenReturn(durability);
+ return rule;
}
- private BrokerNameAndLevelFilter createMockFilter(String loggerName, LogLevel logLevel)
+ private BrokerNameAndLevelLogInclusionRule createMockRule(String loggerName, LogLevel logLevel)
{
- return createMockFilter(loggerName, logLevel, false);
+ return createMockRule(loggerName, logLevel, false);
}
public void testGetRuntimeRootLoggerLevel() throws Exception
{
assertEquals(LogLevel.OFF.toString(), _loggingMBean.getRuntimeRootLoggerLevel());
- BrokerLoggerFilter rootFilterWithNull = createMockFilter(null, LogLevel.WARN);
- when(_brokerFileLogger.getChildren(BrokerLoggerFilter.class)).thenReturn(Collections.singleton(rootFilterWithNull));
+ BrokerLogInclusionRule rootRuleWithNull = createMockRule(null, LogLevel.WARN);
+ when(_brokerFileLogger.getChildren(BrokerLogInclusionRule.class)).thenReturn(Collections.singleton(rootRuleWithNull));
assertEquals(LogLevel.WARN.name(), _loggingMBean.getRuntimeRootLoggerLevel());
- BrokerLoggerFilter rootFilterWithEmptyName = createMockFilter("", LogLevel.ERROR);
- when(_brokerFileLogger.getChildren(BrokerLoggerFilter.class)).thenReturn(Collections.singleton(rootFilterWithEmptyName));
+ BrokerLogInclusionRule rootRuleWithEmptyName = createMockRule("", LogLevel.ERROR);
+ when(_brokerFileLogger.getChildren(BrokerLogInclusionRule.class)).thenReturn(Collections.singleton(rootRuleWithEmptyName));
assertEquals(LogLevel.ERROR.name(), _loggingMBean.getRuntimeRootLoggerLevel());
- BrokerLoggerFilter rootFilterWithRootLoggerName = createMockFilter(ROOT_LOGGER_NAME, LogLevel.DEBUG);
- when(_brokerFileLogger.getChildren(BrokerLoggerFilter.class)).thenReturn(Collections.singleton(rootFilterWithRootLoggerName));
+ BrokerLogInclusionRule rootRuleWithRootLoggerName = createMockRule(ROOT_LOGGER_NAME, LogLevel.DEBUG);
+ when(_brokerFileLogger.getChildren(BrokerLogInclusionRule.class)).thenReturn(Collections.singleton(rootRuleWithRootLoggerName));
assertEquals(LogLevel.DEBUG.name(), _loggingMBean.getRuntimeRootLoggerLevel());
}
public void testSetRuntimeRootLoggerLevel() throws Exception
{
- assertFalse("Should not be able to set runtime root log level without existing filter",
+ assertFalse("Should not be able to set runtime root log level without existing rule",
_loggingMBean.setRuntimeRootLoggerLevel(LogLevel.WARN.name()));
- BrokerLoggerFilter durableRootFilter = createMockFilter(ROOT_LOGGER_NAME, LogLevel.DEBUG, true);
- when(_brokerFileLogger.getChildren(BrokerLoggerFilter.class)).thenReturn(Collections.singleton(durableRootFilter));
- assertFalse("Should not be able to set runtime root log level on durable root filter",
+ BrokerLogInclusionRule durableRootRule = createMockRule(ROOT_LOGGER_NAME, LogLevel.DEBUG, true);
+ when(_brokerFileLogger.getChildren(BrokerLogInclusionRule.class)).thenReturn(Collections.singleton(durableRootRule));
+ assertFalse("Should not be able to set runtime root log level on durable root rule",
_loggingMBean.setRuntimeRootLoggerLevel(LogLevel.WARN.name()));
- BrokerLoggerFilter nonDurableRootFilter = createMockFilter(ROOT_LOGGER_NAME, LogLevel.DEBUG, false);
- when(_brokerFileLogger.getChildren(BrokerLoggerFilter.class)).thenReturn(Collections.singleton(nonDurableRootFilter));
- assertTrue("Should be able to set runtime root log level on non-durable root filter",
+ BrokerLogInclusionRule nonDurableRootRule = createMockRule(ROOT_LOGGER_NAME, LogLevel.DEBUG, false);
+ when(_brokerFileLogger.getChildren(BrokerLogInclusionRule.class)).thenReturn(Collections.singleton(nonDurableRootRule));
+ assertTrue("Should be able to set runtime root log level on non-durable root rule",
_loggingMBean.setRuntimeRootLoggerLevel(LogLevel.WARN.name()));
}
public void testSetRuntimeRootLoggerLevelWhenLoggingLevelUnsupported() throws Exception
{
- BrokerLoggerFilter nonDurableRootFilter = createMockFilter(ROOT_LOGGER_NAME, LogLevel.DEBUG, false);
- when(_brokerFileLogger.getChildren(BrokerLoggerFilter.class)).thenReturn(Collections.singleton(nonDurableRootFilter));
+ BrokerLogInclusionRule nonDurableRootRule = createMockRule(ROOT_LOGGER_NAME, LogLevel.DEBUG, false);
+ when(_brokerFileLogger.getChildren(BrokerLogInclusionRule.class)).thenReturn(Collections.singleton(nonDurableRootRule));
String currentRootLogLevel = _loggingMBean.getRuntimeRootLoggerLevel();
@@ -171,17 +171,17 @@ public class LoggingManagementMBeanTest
public void testSetRuntimeLoggerLevel() throws Exception
{
- assertFalse("Should not be able to set runtime log level without existing filter '" + TEST_LOGGER_NAME + "'",
+ assertFalse("Should not be able to set runtime log level without existing rule '" + TEST_LOGGER_NAME + "'",
_loggingMBean.setRuntimeLoggerLevel(TEST_LOGGER_NAME, LogLevel.WARN.name()));
- BrokerLoggerFilter durableFilter = createMockFilter(TEST_LOGGER_NAME, LogLevel.DEBUG, true);
- when(_brokerFileLogger.getChildren(BrokerLoggerFilter.class)).thenReturn(Collections.singleton(durableFilter));
- assertFalse("Should not be able to set runtime log level on durable filter '" + TEST_LOGGER_NAME + "'",
+ BrokerLogInclusionRule durableRule = createMockRule(TEST_LOGGER_NAME, LogLevel.DEBUG, true);
+ when(_brokerFileLogger.getChildren(BrokerLogInclusionRule.class)).thenReturn(Collections.singleton(durableRule));
+ assertFalse("Should not be able to set runtime log level on durable rule '" + TEST_LOGGER_NAME + "'",
_loggingMBean.setRuntimeLoggerLevel(TEST_LOGGER_NAME, LogLevel.WARN.name()));
- BrokerLoggerFilter nonDurableFilter = createMockFilter(TEST_LOGGER_NAME, LogLevel.DEBUG, false);
- when(_brokerFileLogger.getChildren(BrokerLoggerFilter.class)).thenReturn(Collections.singleton(nonDurableFilter));
- assertTrue("Should be able to set runtime log level on non-durable filter '" + TEST_LOGGER_NAME + "'",
+ BrokerLogInclusionRule nonDurableRule = createMockRule(TEST_LOGGER_NAME, LogLevel.DEBUG, false);
+ when(_brokerFileLogger.getChildren(BrokerLogInclusionRule.class)).thenReturn(Collections.singleton(nonDurableRule));
+ assertTrue("Should be able to set runtime log level on non-durable rule '" + TEST_LOGGER_NAME + "'",
_loggingMBean.setRuntimeLoggerLevel(TEST_LOGGER_NAME, LogLevel.WARN.name()));
}
@@ -196,13 +196,13 @@ public class LoggingManagementMBeanTest
public void testViewEffectiveConfigFileLoggerLevels() throws Exception
{
- Collection<BrokerLoggerFilter> filters = new ArrayList<>();
- filters.add(createMockFilter("a.b.D", LogLevel.DEBUG, true));
- filters.add(createMockFilter("a.b.C", LogLevel.INFO, true));
- filters.add(createMockFilter("", LogLevel.WARN, true));
- filters.add(createMockFilter("a.b.E", LogLevel.WARN, false));
+ Collection<BrokerLogInclusionRule> rules = new ArrayList<>();
+ rules.add(createMockRule("a.b.D", LogLevel.DEBUG, true));
+ rules.add(createMockRule("a.b.C", LogLevel.INFO, true));
+ rules.add(createMockRule("", LogLevel.WARN, true));
+ rules.add(createMockRule("a.b.E", LogLevel.WARN, false));
- when(_brokerFileLogger.getChildren(BrokerLoggerFilter.class)).thenReturn(filters);
+ when(_brokerFileLogger.getChildren(BrokerLogInclusionRule.class)).thenReturn(rules);
TabularData table = _loggingMBean.viewConfigFileLoggerLevels();
assertEquals(3, table.size());
@@ -217,46 +217,46 @@ public class LoggingManagementMBeanTest
public void testGetConfigFileRootLoggerLevel() throws Exception
{
- assertEquals("Unexpected config root logger level when no filter is set", LogLevel.OFF.name(), _loggingMBean.getConfigFileRootLoggerLevel());
+ assertEquals("Unexpected config root logger level when no rule is set", LogLevel.OFF.name(), _loggingMBean.getConfigFileRootLoggerLevel());
- BrokerLoggerFilter rootFilterWithNullName = createMockFilter(null, LogLevel.WARN, true);
- when(_brokerFileLogger.getChildren(BrokerLoggerFilter.class)).thenReturn(Collections.singleton(rootFilterWithNullName));
+ BrokerLogInclusionRule rootRuleWithNullName = createMockRule(null, LogLevel.WARN, true);
+ when(_brokerFileLogger.getChildren(BrokerLogInclusionRule.class)).thenReturn(Collections.singleton(rootRuleWithNullName));
assertEquals("Unexpected config root logger level", LogLevel.WARN.name(), _loggingMBean.getConfigFileRootLoggerLevel());
- BrokerLoggerFilter rootFilterWithEmptyName = createMockFilter("", LogLevel.ERROR, true);
- when(_brokerFileLogger.getChildren(BrokerLoggerFilter.class)).thenReturn(Collections.singleton(rootFilterWithEmptyName));
+ BrokerLogInclusionRule rootRuleWithEmptyName = createMockRule("", LogLevel.ERROR, true);
+ when(_brokerFileLogger.getChildren(BrokerLogInclusionRule.class)).thenReturn(Collections.singleton(rootRuleWithEmptyName));
assertEquals("Unexpected config root logger level", LogLevel.ERROR.name(), _loggingMBean.getConfigFileRootLoggerLevel());
- BrokerLoggerFilter rootFilterWithRootLoggerName = createMockFilter(ROOT_LOGGER_NAME, LogLevel.DEBUG, true);
- when(_brokerFileLogger.getChildren(BrokerLoggerFilter.class)).thenReturn(Collections.singleton(rootFilterWithRootLoggerName));
+ BrokerLogInclusionRule rootRuleWithRootLoggerName = createMockRule(ROOT_LOGGER_NAME, LogLevel.DEBUG, true);
+ when(_brokerFileLogger.getChildren(BrokerLogInclusionRule.class)).thenReturn(Collections.singleton(rootRuleWithRootLoggerName));
assertEquals("Unexpected config root logger level", LogLevel.DEBUG.name(), _loggingMBean.getConfigFileRootLoggerLevel());
- BrokerLoggerFilter nonDurableRootFilter = createMockFilter(ROOT_LOGGER_NAME, LogLevel.DEBUG, false);
- when(_brokerFileLogger.getChildren(BrokerLoggerFilter.class)).thenReturn(Collections.singleton(nonDurableRootFilter));
- assertEquals("Unexpected config root logger level when root filter is non-durable", LogLevel.OFF.name(), _loggingMBean.getConfigFileRootLoggerLevel());
+ BrokerLogInclusionRule nonDurableRootRule = createMockRule(ROOT_LOGGER_NAME, LogLevel.DEBUG, false);
+ when(_brokerFileLogger.getChildren(BrokerLogInclusionRule.class)).thenReturn(Collections.singleton(nonDurableRootRule));
+ assertEquals("Unexpected config root logger level when root rule is non-durable", LogLevel.OFF.name(), _loggingMBean.getConfigFileRootLoggerLevel());
}
public void testSetConfigFileRootLoggerLevel() throws Exception
{
- assertFalse("Should not be able to set config root log level without existing filter",
+ assertFalse("Should not be able to set config root log level without existing rule",
_loggingMBean.setConfigFileRootLoggerLevel(LogLevel.WARN.name()));
- BrokerLoggerFilter durableRootFilter = createMockFilter(ROOT_LOGGER_NAME, LogLevel.DEBUG, true);
- when(_brokerFileLogger.getChildren(BrokerLoggerFilter.class)).thenReturn(Collections.singleton(durableRootFilter));
- assertTrue("Should be able to set config root log level on durable root filter",
+ BrokerLogInclusionRule durableRootRule = createMockRule(ROOT_LOGGER_NAME, LogLevel.DEBUG, true);
+ when(_brokerFileLogger.getChildren(BrokerLogInclusionRule.class)).thenReturn(Collections.singleton(durableRootRule));
+ assertTrue("Should be able to set config root log level on durable root rule",
_loggingMBean.setConfigFileRootLoggerLevel(LogLevel.WARN.name()));
- BrokerLoggerFilter nonDurableRootFilter = createMockFilter(ROOT_LOGGER_NAME, LogLevel.DEBUG, false);
- when(_brokerFileLogger.getChildren(BrokerLoggerFilter.class)).thenReturn(Collections.singleton(nonDurableRootFilter));
- assertFalse("Should not be able to set config root log level on non-durable root filter",
+ BrokerLogInclusionRule nonDurableRootRule = createMockRule(ROOT_LOGGER_NAME, LogLevel.DEBUG, false);
+ when(_brokerFileLogger.getChildren(BrokerLogInclusionRule.class)).thenReturn(Collections.singleton(nonDurableRootRule));
+ assertFalse("Should not be able to set config root log level on non-durable root rule",
_loggingMBean.setConfigFileRootLoggerLevel(LogLevel.WARN.name()));
}
public void testSetConfigFileRootLoggerLevelWhenLoggingLevelUnsupported() throws Exception
{
- BrokerLoggerFilter durableRootFilter = createMockFilter(ROOT_LOGGER_NAME, LogLevel.DEBUG, true);
- when(_brokerFileLogger.getChildren(BrokerLoggerFilter.class)).thenReturn(Collections.singleton(durableRootFilter));
+ BrokerLogInclusionRule durableRootRule = createMockRule(ROOT_LOGGER_NAME, LogLevel.DEBUG, true);
+ when(_brokerFileLogger.getChildren(BrokerLogInclusionRule.class)).thenReturn(Collections.singleton(durableRootRule));
String currentRootLogLevel = _loggingMBean.getConfigFileRootLoggerLevel();
@@ -275,24 +275,24 @@ public class LoggingManagementMBeanTest
public void testSetConfigFileLoggerLevel() throws Exception
{
- assertFalse("Should not be able to set config log level without existing filter",
+ assertFalse("Should not be able to set config log level without existing rule",
_loggingMBean.setConfigFileLoggerLevel(TEST_LOGGER_NAME, LogLevel.WARN.name()));
- BrokerLoggerFilter durableFilter = createMockFilter(TEST_LOGGER_NAME, LogLevel.DEBUG, true);
- when(_brokerFileLogger.getChildren(BrokerLoggerFilter.class)).thenReturn(Collections.singleton(durableFilter));
- assertTrue("Should be able to set config log level on durable filter",
+ BrokerLogInclusionRule durableRule = createMockRule(TEST_LOGGER_NAME, LogLevel.DEBUG, true);
+ when(_brokerFileLogger.getChildren(BrokerLogInclusionRule.class)).thenReturn(Collections.singleton(durableRule));
+ assertTrue("Should be able to set config log level on durable rule",
_loggingMBean.setConfigFileLoggerLevel(TEST_LOGGER_NAME, LogLevel.WARN.name()));
- BrokerLoggerFilter nonDurableFilter = createMockFilter(TEST_LOGGER_NAME, LogLevel.DEBUG, false);
- when(_brokerFileLogger.getChildren(BrokerLoggerFilter.class)).thenReturn(Collections.singleton(nonDurableFilter));
- assertFalse("Should not be able to set config log level on non-durable filter",
+ BrokerLogInclusionRule nonDurableRule = createMockRule(TEST_LOGGER_NAME, LogLevel.DEBUG, false);
+ when(_brokerFileLogger.getChildren(BrokerLogInclusionRule.class)).thenReturn(Collections.singleton(nonDurableRule));
+ assertFalse("Should not be able to set config log level on non-durable rule",
_loggingMBean.setConfigFileLoggerLevel(TEST_LOGGER_NAME, LogLevel.WARN.name()));
}
public void testSetConfigFileLoggerLevelWhenLoggingLevelUnsupported() throws Exception
{
- BrokerLoggerFilter durableFilter = createMockFilter(TEST_LOGGER_NAME, LogLevel.DEBUG, true);
- when(_brokerFileLogger.getChildren(BrokerLoggerFilter.class)).thenReturn(Collections.singleton(durableFilter));
+ BrokerLogInclusionRule durableRule = createMockRule(TEST_LOGGER_NAME, LogLevel.DEBUG, true);
+ when(_brokerFileLogger.getChildren(BrokerLogInclusionRule.class)).thenReturn(Collections.singleton(durableRule));
boolean result = _loggingMBean.setConfigFileLoggerLevel(TEST_LOGGER_NAME, UNSUPPORTED_LOG_LEVEL);
assertFalse("Should not be able to set config root logger level to unsupported value", result);
Modified: qpid/java/trunk/systests/src/main/java/org/apache/qpid/test/utils/QpidBrokerTestCase.java
URL: http://svn.apache.org/viewvc/qpid/java/trunk/systests/src/main/java/org/apache/qpid/test/utils/QpidBrokerTestCase.java?rev=1698368&r1=1698367&r2=1698368&view=diff
==============================================================================
--- qpid/java/trunk/systests/src/main/java/org/apache/qpid/test/utils/QpidBrokerTestCase.java (original)
+++ qpid/java/trunk/systests/src/main/java/org/apache/qpid/test/utils/QpidBrokerTestCase.java Fri Aug 28 16:38:58 2015
@@ -58,9 +58,9 @@ import org.apache.qpid.server.configurat
import org.apache.qpid.server.configuration.updater.TaskExecutor;
import org.apache.qpid.server.configuration.updater.TaskExecutorImpl;
import org.apache.qpid.server.logging.BrokerLogbackSocketLogger;
-import org.apache.qpid.server.logging.BrokerNameAndLevelFilter;
+import org.apache.qpid.server.logging.BrokerNameAndLevelLogInclusionRule;
import org.apache.qpid.server.model.BrokerLogger;
-import org.apache.qpid.server.model.BrokerLoggerFilter;
+import org.apache.qpid.server.model.BrokerLogInclusionRule;
import org.apache.qpid.server.model.ConfiguredObject;
import org.apache.qpid.server.model.Port;
import org.apache.qpid.server.model.Protocol;
@@ -291,23 +291,23 @@ public class QpidBrokerTestCase extends
configuration.addObjectConfiguration(BrokerLogger.class, loggerAttrs);
- Map<String, Object> qpidFilterAttrs = new HashMap<>();
- qpidFilterAttrs.put(BrokerLoggerFilter.NAME, "Qpid");
- qpidFilterAttrs.put(BrokerLoggerFilter.TYPE, BrokerNameAndLevelFilter.TYPE);
- qpidFilterAttrs.put(BrokerNameAndLevelFilter.LEVEL, "DEBUG");
- qpidFilterAttrs.put(BrokerNameAndLevelFilter.LOGGER_NAME, "org.apache.qpid.*");
+ Map<String, Object> qpidRuleAttrs = new HashMap<>();
+ qpidRuleAttrs.put(BrokerLogInclusionRule.NAME, "Qpid");
+ qpidRuleAttrs.put(BrokerLogInclusionRule.TYPE, BrokerNameAndLevelLogInclusionRule.TYPE);
+ qpidRuleAttrs.put(BrokerNameAndLevelLogInclusionRule.LEVEL, "DEBUG");
+ qpidRuleAttrs.put(BrokerNameAndLevelLogInclusionRule.LOGGER_NAME, "org.apache.qpid.*");
configuration.addObjectConfiguration(BrokerLogger.class,
- remotelogback, BrokerLoggerFilter.class, qpidFilterAttrs);
+ remotelogback, BrokerLogInclusionRule.class, qpidRuleAttrs);
- Map<String, Object> operationalLoggingFilterAttrs = new HashMap<>();
- operationalLoggingFilterAttrs.put(BrokerLoggerFilter.NAME, "Operational");
- operationalLoggingFilterAttrs.put(BrokerLoggerFilter.TYPE, BrokerNameAndLevelFilter.TYPE);
- operationalLoggingFilterAttrs.put(BrokerNameAndLevelFilter.LEVEL, "INFO");
- operationalLoggingFilterAttrs.put(BrokerNameAndLevelFilter.LOGGER_NAME, "qpid.message.*");
+ Map<String, Object> operationalLoggingRuleAttrs = new HashMap<>();
+ operationalLoggingRuleAttrs.put(BrokerLogInclusionRule.NAME, "Operational");
+ operationalLoggingRuleAttrs.put(BrokerLogInclusionRule.TYPE, BrokerNameAndLevelLogInclusionRule.TYPE);
+ operationalLoggingRuleAttrs.put(BrokerNameAndLevelLogInclusionRule.LEVEL, "INFO");
+ operationalLoggingRuleAttrs.put(BrokerNameAndLevelLogInclusionRule.LOGGER_NAME, "qpid.message.*");
configuration.addObjectConfiguration(BrokerLogger.class,
- remotelogback, BrokerLoggerFilter.class, operationalLoggingFilterAttrs);
+ remotelogback, BrokerLogInclusionRule.class, operationalLoggingRuleAttrs);
String workDir = System.getProperty("QPID_WORK") + File.separator + TestBrokerConfiguration.ENTRY_NAME_VIRTUAL_HOST + File.separator + actualPort;
configuration.setObjectAttribute(VirtualHostNode.class, TestBrokerConfiguration.ENTRY_NAME_VIRTUAL_HOST, JsonVirtualHostNode.STORE_PATH, workDir);
Modified: qpid/java/trunk/systests/src/test/java/org/apache/qpid/systest/rest/VirtualHostLoggerRestTest.java
URL: http://svn.apache.org/viewvc/qpid/java/trunk/systests/src/test/java/org/apache/qpid/systest/rest/VirtualHostLoggerRestTest.java?rev=1698368&r1=1698367&r2=1698368&view=diff
==============================================================================
--- qpid/java/trunk/systests/src/test/java/org/apache/qpid/systest/rest/VirtualHostLoggerRestTest.java (original)
+++ qpid/java/trunk/systests/src/test/java/org/apache/qpid/systest/rest/VirtualHostLoggerRestTest.java Fri Aug 28 16:38:58 2015
@@ -37,7 +37,7 @@ import org.apache.qpid.util.LogMonitor;
public class VirtualHostLoggerRestTest extends QpidRestTestCase
{
- public void testCreateVirtualHostLoggerAndFilter() throws Exception
+ public void testCreateVirtualHostLoggerAndRule() throws Exception
{
String loggerName = "testLogger1";
String loggerRestUrlBase = "virtualhostlogger/" + TEST1_VIRTUALHOST + "/" + TEST1_VIRTUALHOST;
@@ -50,16 +50,16 @@ public class VirtualHostLoggerRestTest e
getRestTestHelper().submitRequest(loggerRestUrlBase, "PUT", virtualHostLoggerAttributes, HttpServletResponse.SC_CREATED);
Map<String, Object> loggerData = getRestTestHelper().getJsonAsSingletonList(loggerRestUrl);
- String loggerFilterName = "testFilter";
- Map<String, Object> virtualHostFilterAttributes = new HashMap<>();
- virtualHostFilterAttributes.put("name", loggerFilterName);
- virtualHostFilterAttributes.put("level", "DEBUG");
+ String loggerRuleName = "testRule";
+ Map<String, Object> virtualHostRuleAttributes = new HashMap<>();
+ virtualHostRuleAttributes.put("name", loggerRuleName);
+ virtualHostRuleAttributes.put("level", "DEBUG");
- String loggerFilterRestUrlBase = "virtualhostloggerfilter/" + TEST1_VIRTUALHOST + "/" + TEST1_VIRTUALHOST + "/" + loggerName;
- String loggerFilterRestUrl = loggerFilterRestUrlBase + "/" + loggerFilterName;
+ String loggerRuleRestUrlBase = "virtualhostloginclusionrule/" + TEST1_VIRTUALHOST + "/" + TEST1_VIRTUALHOST + "/" + loggerName;
+ String loggerRuleRestUrl = loggerRuleRestUrlBase + "/" + loggerRuleName;
- getRestTestHelper().submitRequest(loggerFilterRestUrlBase, "PUT", virtualHostFilterAttributes, HttpServletResponse.SC_CREATED);
- getRestTestHelper().submitRequest(loggerFilterRestUrl, "GET", HttpServletResponse.SC_OK);
+ getRestTestHelper().submitRequest(loggerRuleRestUrlBase, "PUT", virtualHostRuleAttributes, HttpServletResponse.SC_CREATED);
+ getRestTestHelper().submitRequest(loggerRuleRestUrl, "GET", HttpServletResponse.SC_OK);
String logFileLocation = String.valueOf(loggerData.get(VirtualHostFileLogger.FILE_NAME));
assertNotNull("Log file attribute is not set ", logFileLocation);
@@ -82,7 +82,7 @@ public class VirtualHostLoggerRestTest e
}
}
- public void testDeleteVirtualHostLoggerAndFilter() throws Exception
+ public void testDeleteVirtualHostLoggerAndRule() throws Exception
{
String loggerName = "testLogger1";
Map<String, Object> attributes = new HashMap<>();
Modified: qpid/java/trunk/systests/src/test/java/org/apache/qpid/systest/rest/acl/BrokerACLTest.java
URL: http://svn.apache.org/viewvc/qpid/java/trunk/systests/src/test/java/org/apache/qpid/systest/rest/acl/BrokerACLTest.java?rev=1698368&r1=1698367&r2=1698368&view=diff
==============================================================================
--- qpid/java/trunk/systests/src/test/java/org/apache/qpid/systest/rest/acl/BrokerACLTest.java (original)
+++ qpid/java/trunk/systests/src/test/java/org/apache/qpid/systest/rest/acl/BrokerACLTest.java Fri Aug 28 16:38:58 2015
@@ -30,7 +30,7 @@ import javax.servlet.http.HttpServletRes
import org.apache.qpid.server.logging.BrokerFileLogger;
import org.apache.qpid.server.logging.BrokerMemoryLogger;
-import org.apache.qpid.server.logging.BrokerNameAndLevelFilter;
+import org.apache.qpid.server.logging.BrokerNameAndLevelLogInclusionRule;
import org.apache.qpid.server.management.plugin.servlet.rest.RestServlet;
import org.apache.qpid.server.model.BrokerLogger;
import org.apache.qpid.server.model.ConfiguredObject;
@@ -850,7 +850,7 @@ public class BrokerACLTest extends QpidR
getRestTestHelper().submitRequest("brokerlogger/testLogger1", "GET", HttpServletResponse.SC_OK);
getRestTestHelper().setUsernameAndPassword(DENIED_USER, DENIED_USER);
- attributes.put(BrokerNameAndLevelFilter.NAME, "testLogger2");
+ attributes.put(BrokerNameAndLevelLogInclusionRule.NAME, "testLogger2");
getRestTestHelper().submitRequest("brokerlogger", "PUT", attributes, HttpServletResponse.SC_FORBIDDEN);
getRestTestHelper().submitRequest("brokerlogger/testLogger2", "GET", HttpServletResponse.SC_NOT_FOUND);
}
@@ -915,9 +915,9 @@ public class BrokerACLTest extends QpidR
getRestTestHelper().submitRequest(loggerPath + "/getLogEntries?lastLogId=0", "GET", HttpServletResponse.SC_FORBIDDEN);
}
- /* === Broker Logger Filters === */
+ /* === Broker Log Inclusion Rules === */
- public void testCreateBrokerLoggerFilterAllowedDenied() throws Exception
+ public void testCreateBrokerLoggerRuleAllowedDenied() throws Exception
{
getRestTestHelper().setUsernameAndPassword(ALLOWED_USER, ALLOWED_USER);
@@ -928,20 +928,20 @@ public class BrokerACLTest extends QpidR
Map<String, Object> attributes = new HashMap<>();
- attributes.put(BrokerNameAndLevelFilter.NAME, "filter1");
- attributes.put(ConfiguredObject.TYPE, BrokerNameAndLevelFilter.TYPE);
- attributes.put(BrokerNameAndLevelFilter.LEVEL, "DEBUG");
+ attributes.put(BrokerNameAndLevelLogInclusionRule.NAME, "rule1");
+ attributes.put(ConfiguredObject.TYPE, BrokerNameAndLevelLogInclusionRule.TYPE);
+ attributes.put(BrokerNameAndLevelLogInclusionRule.LEVEL, "DEBUG");
- getRestTestHelper().submitRequest("brokerloggerfilter/testLogger1", "PUT", attributes, HttpServletResponse.SC_CREATED);
- getRestTestHelper().submitRequest("brokerloggerfilter/testLogger1/filter1", "GET", HttpServletResponse.SC_OK);
+ getRestTestHelper().submitRequest("brokerloginclusionrule/testLogger1", "PUT", attributes, HttpServletResponse.SC_CREATED);
+ getRestTestHelper().submitRequest("brokerloginclusionrule/testLogger1/rule1", "GET", HttpServletResponse.SC_OK);
getRestTestHelper().setUsernameAndPassword(DENIED_USER, DENIED_USER);
- attributes.put(BrokerNameAndLevelFilter.NAME, "filter2");
- getRestTestHelper().submitRequest("brokerloggerfilter/testLogger1", "PUT", attributes, HttpServletResponse.SC_FORBIDDEN);
- getRestTestHelper().submitRequest("brokerloggerfilter/testLogger1/filter2", "GET", HttpServletResponse.SC_NOT_FOUND);
+ attributes.put(BrokerNameAndLevelLogInclusionRule.NAME, "rule2");
+ getRestTestHelper().submitRequest("brokerloginclusionrule/testLogger1", "PUT", attributes, HttpServletResponse.SC_FORBIDDEN);
+ getRestTestHelper().submitRequest("brokerloginclusionrule/testLogger1/rule2", "GET", HttpServletResponse.SC_NOT_FOUND);
}
- public void testUpdateBrokerLoggerFilterAllowedDenied() throws Exception
+ public void testUpdateBrokerLoggerRuleAllowedDenied() throws Exception
{
getRestTestHelper().setUsernameAndPassword(ALLOWED_USER, ALLOWED_USER);
@@ -950,30 +950,30 @@ public class BrokerACLTest extends QpidR
loggerAttributes.put(ConfiguredObject.TYPE, BrokerMemoryLogger.TYPE);
getRestTestHelper().submitRequest("brokerlogger", "PUT", loggerAttributes, HttpServletResponse.SC_CREATED);
- Map<String, Object> filterAttributes = new HashMap<>();
- filterAttributes.put(BrokerNameAndLevelFilter.NAME, "filter1");
- filterAttributes.put(ConfiguredObject.TYPE, BrokerNameAndLevelFilter.TYPE);
- filterAttributes.put(BrokerNameAndLevelFilter.LEVEL, "INFO");
- getRestTestHelper().submitRequest("brokerloggerfilter/testLogger1", "PUT", filterAttributes, HttpServletResponse.SC_CREATED);
+ Map<String, Object> ruleAttributes = new HashMap<>();
+ ruleAttributes.put(BrokerNameAndLevelLogInclusionRule.NAME, "rule1");
+ ruleAttributes.put(ConfiguredObject.TYPE, BrokerNameAndLevelLogInclusionRule.TYPE);
+ ruleAttributes.put(BrokerNameAndLevelLogInclusionRule.LEVEL, "INFO");
+ getRestTestHelper().submitRequest("brokerloginclusionrule/testLogger1", "PUT", ruleAttributes, HttpServletResponse.SC_CREATED);
Map<String, Object> attributes = new HashMap<>();
- attributes.put(BrokerNameAndLevelFilter.NAME, "filter1");
- attributes.put(ConfiguredObject.TYPE, BrokerNameAndLevelFilter.TYPE);
- attributes.put(BrokerNameAndLevelFilter.LEVEL, "DEBUG");
+ attributes.put(BrokerNameAndLevelLogInclusionRule.NAME, "rule1");
+ attributes.put(ConfiguredObject.TYPE, BrokerNameAndLevelLogInclusionRule.TYPE);
+ attributes.put(BrokerNameAndLevelLogInclusionRule.LEVEL, "DEBUG");
- getRestTestHelper().submitRequest("brokerloggerfilter/testLogger1/filter1", "PUT", attributes, HttpServletResponse.SC_OK);
- Map<String,Object> resultAfterUpdate = getRestTestHelper().getJsonAsSingletonList("brokerloggerfilter/testLogger1/filter1");
- assertEquals("Log level was not changed", "DEBUG", resultAfterUpdate.get(BrokerNameAndLevelFilter.LEVEL));
+ getRestTestHelper().submitRequest("brokerloginclusionrule/testLogger1/rule1", "PUT", attributes, HttpServletResponse.SC_OK);
+ Map<String,Object> resultAfterUpdate = getRestTestHelper().getJsonAsSingletonList("brokerloginclusionrule/testLogger1/rule1");
+ assertEquals("Log level was not changed", "DEBUG", resultAfterUpdate.get(BrokerNameAndLevelLogInclusionRule.LEVEL));
getRestTestHelper().setUsernameAndPassword(DENIED_USER, DENIED_USER);
- attributes.put(BrokerNameAndLevelFilter.LEVEL, "INFO");
- getRestTestHelper().submitRequest("brokerloggerfilter/testLogger1/filter1", "PUT", attributes, HttpServletResponse.SC_FORBIDDEN);
+ attributes.put(BrokerNameAndLevelLogInclusionRule.LEVEL, "INFO");
+ getRestTestHelper().submitRequest("brokerloginclusionrule/testLogger1/rule1", "PUT", attributes, HttpServletResponse.SC_FORBIDDEN);
- Map<String,Object> resultAfterDeniedUpdate = getRestTestHelper().getJsonAsSingletonList("brokerloggerfilter/testLogger1/filter1");
- assertEquals("Log level was changed by not allowed user", "DEBUG", resultAfterDeniedUpdate.get(BrokerNameAndLevelFilter.LEVEL));
+ Map<String,Object> resultAfterDeniedUpdate = getRestTestHelper().getJsonAsSingletonList("brokerloginclusionrule/testLogger1/rule1");
+ assertEquals("Log level was changed by not allowed user", "DEBUG", resultAfterDeniedUpdate.get(BrokerNameAndLevelLogInclusionRule.LEVEL));
}
- public void testDeleteBrokerLoggerFilterAllowedDenied() throws Exception
+ public void testDeleteBrokerLoggerRuleAllowedDenied() throws Exception
{
getRestTestHelper().setUsernameAndPassword(ALLOWED_USER, ALLOWED_USER);
@@ -984,20 +984,20 @@ public class BrokerACLTest extends QpidR
Map<String, Object> attributes = new HashMap<>();
- attributes.put(BrokerNameAndLevelFilter.NAME, "filter1");
- attributes.put(ConfiguredObject.TYPE, BrokerNameAndLevelFilter.TYPE);
- attributes.put(BrokerNameAndLevelFilter.LEVEL, "DEBUG");
+ attributes.put(BrokerNameAndLevelLogInclusionRule.NAME, "rule1");
+ attributes.put(ConfiguredObject.TYPE, BrokerNameAndLevelLogInclusionRule.TYPE);
+ attributes.put(BrokerNameAndLevelLogInclusionRule.LEVEL, "DEBUG");
- getRestTestHelper().submitRequest("brokerloggerfilter/testLogger1", "PUT", attributes, HttpServletResponse.SC_CREATED);
- getRestTestHelper().submitRequest("brokerloggerfilter/testLogger1/filter1", "GET", HttpServletResponse.SC_OK);
+ getRestTestHelper().submitRequest("brokerloginclusionrule/testLogger1", "PUT", attributes, HttpServletResponse.SC_CREATED);
+ getRestTestHelper().submitRequest("brokerloginclusionrule/testLogger1/rule1", "GET", HttpServletResponse.SC_OK);
getRestTestHelper().setUsernameAndPassword(DENIED_USER, DENIED_USER);
- getRestTestHelper().submitRequest("brokerloggerfilter/testLogger1/filter1", "DELETE", null, HttpServletResponse.SC_FORBIDDEN);
- getRestTestHelper().submitRequest("brokerloggerfilter/testLogger1/filter1", "GET", HttpServletResponse.SC_OK);
+ getRestTestHelper().submitRequest("brokerloginclusionrule/testLogger1/rule1", "DELETE", null, HttpServletResponse.SC_FORBIDDEN);
+ getRestTestHelper().submitRequest("brokerloginclusionrule/testLogger1/rule1", "GET", HttpServletResponse.SC_OK);
getRestTestHelper().setUsernameAndPassword(ALLOWED_USER, ALLOWED_USER);
- getRestTestHelper().submitRequest("brokerloggerfilter/testLogger1/filter1", "DELETE", null, HttpServletResponse.SC_OK);
- getRestTestHelper().submitRequest("brokerloggerfilter/testLogger1/filter1", "GET", HttpServletResponse.SC_NOT_FOUND);
+ getRestTestHelper().submitRequest("brokerloginclusionrule/testLogger1/rule1", "DELETE", null, HttpServletResponse.SC_OK);
+ getRestTestHelper().submitRequest("brokerloginclusionrule/testLogger1/rule1", "GET", HttpServletResponse.SC_NOT_FOUND);
}
/* === Utility Methods === */
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@qpid.apache.org
For additional commands, e-mail: commits-help@qpid.apache.org