Merge remote-tracking branch 'origin/foundation' into release-16.0.0

Conflicts:
	opennms-services/src/main/java/org/opennms/netmgt/capsd/jmx/Capsd.java
	opennms-services/src/test/java/org/opennms/netmgt/xmlrpcd/XmlrpcdTest.java

core/daemon/src/test/java/org/opennms/netmgt/vmmgr/InvokerTest.java

@@ -141,7 +141,7 @@ private static Service[] getServiceList() throws Exception {
         		"    <class-name>mx4j.tools.adaptor.http.HttpAdaptor</class-name>\n" + 
         		"    <attribute>\n" + 
         		"      <name>Port</name>\n" + 
-        		"      <value type=\"java.lang.Integer\">58180</value>\n" + 
+        		"      <value type=\"java.lang.Integer\">0</value>\n" +
         		"    </attribute>\n" + 
         		"    <attribute>\n" + 
         		"      <name>Host</name>\n" + 
@@ -167,7 +167,7 @@ private static Service[] getServiceList() throws Exception {
         		"    <class-name>mx4j.tools.adaptor.http.HttpAdaptor</class-name>\n" + 
         		"    <attribute>\n" + 
         		"      <name>Port</name>\n" + 
-        		"      <value type=\"java.lang.Integer\">58181</value>\n" + 
+        		"      <value type=\"java.lang.Integer\">0</value>\n" +
         		"    </attribute>\n" + 
         		"    <attribute>\n" + 
         		"      <name>Host</name>\n" + 

features/nrtg/nrtbroker-jms/src/main/java/org/opennms/nrtg/nrtbroker/jms/internal/JmsExceptionListener.java

@@ -38,7 +38,7 @@
  * @author Markus Neumann
  */
 public class JmsExceptionListener implements ExceptionListener {
-    private static Logger logger = LoggerFactory.getLogger("OpenNMS.WEB." + JmsExceptionListener.class);
+    private static Logger logger = LoggerFactory.getLogger(JmsExceptionListener.class);
 
     @Override
     public void onException(final JMSException e) {

features/nrtg/nrtbroker-jms/src/main/java/org/opennms/nrtg/nrtbroker/jms/internal/NrtBrokerJms.java

@@ -55,7 +55,7 @@
  */
 public class NrtBrokerJms implements NrtBroker {
 
-    private static Logger logger = LoggerFactory.getLogger("OpenNMS.WEB." + NrtBrokerJms.class);
+    private static Logger logger = LoggerFactory.getLogger(NrtBrokerJms.class);
 
     private JmsTemplate m_jmsTemplate;
     private final SimpleMessageConverter simpleMessageConverter = new SimpleMessageConverter();

features/nrtg/nrtbroker-local/src/main/java/org/opennms/nrtg/nrtbroker/local/internal/NrtBrokerLocal.java

@@ -103,7 +103,7 @@ private synchronized Integer getAmountOfMeasurementSets() {
         }
     }
 
-    private static Logger logger = LoggerFactory.getLogger("OpenNMS.WEB." + NrtBrokerLocal.class);
+    private static Logger logger = LoggerFactory.getLogger(NrtBrokerLocal.class);
 
     private List<ProtocolCollector> m_protocolCollectors;
     private TimedOutMap m_measurementSets = new TimedOutMap();

features/nrtg/web/src/main/java/org/opennms/nrtg/web/internal/NrtController.java

@@ -64,7 +64,7 @@
  */
 public class NrtController {
 
-    private static Logger logger = LoggerFactory.getLogger("OpenNMS.WEB." + NrtController.class);
+    private static Logger logger = LoggerFactory.getLogger(NrtController.class);
     private GraphDao m_graphDao;
     private NodeDao m_nodeDao;
     private ResourceDao m_resourceDao;

features/reporting/availability/src/main/java/org/opennms/reporting/datablock/Outage.java

@@ -38,7 +38,7 @@ public class Outage extends Object {
     /**
      * The log4j category used to log debug messsages and statements.
      */
-    private static final String LOG4J_CATEGORY = "OpenNMS.Report";
+    private static final String LOG4J_CATEGORY = "reports";
 
     /**
      * Time at which the service was lost.

features/reporting/dao/src/main/java/org/opennms/features/reporting/dao/LegacyLocalReportsDao.java

@@ -57,7 +57,7 @@ public class LegacyLocalReportsDao implements LocalReportsDao {
     /**
      * Logging
      */
-    private Logger logger = LoggerFactory.getLogger("OpenNMS.Report." + LegacyLocalReportsDao.class.getName());
+    private Logger logger = LoggerFactory.getLogger(LegacyLocalReportsDao.class);
 
     /**
      * List of generic report definitions

features/reporting/dao/src/main/java/org/opennms/features/reporting/dao/jasper/LegacyLocalJasperReportsDao.java

@@ -57,7 +57,7 @@ public class LegacyLocalJasperReportsDao implements LocalJasperReportsDao {
     /**
      * Logging
      */
-    private Logger logger = LoggerFactory.getLogger("OpenNMS.Report." + LegacyLocalJasperReportsDao.class.getName());
+    private Logger logger = LoggerFactory.getLogger(LegacyLocalJasperReportsDao.class);
 
     /**
      * List of generic report definitions

features/reporting/dao/src/main/java/org/opennms/features/reporting/dao/remoterepository/DefaultRemoteRepositoryConfigDao.java

@@ -60,7 +60,7 @@ public class DefaultRemoteRepositoryConfigDao implements
     /**
      * Logging
      */
-    private Logger logger = LoggerFactory.getLogger("OpenNMS.Report." + DefaultRemoteRepositoryConfigDao.class.getName());
+    private Logger logger = LoggerFactory.getLogger(DefaultRemoteRepositoryConfigDao.class);
 
     /**
      * Config resource for remote repository configuration file

features/reporting/repository/src/main/java/org/opennms/features/reporting/repository/global/DefaultGlobalReportRepository.java

@@ -56,7 +56,7 @@ public class DefaultGlobalReportRepository implements GlobalReportRepository {
     /**
      * Logging
      */
-    private final Logger logger = LoggerFactory.getLogger("OpenNMS.Report." + DefaultGlobalReportRepository.class.getName());
+    private final Logger logger = LoggerFactory.getLogger(DefaultGlobalReportRepository.class);
 
     /**
      * Configuration DAO to get configured remote-repositories.

features/reporting/repository/src/main/java/org/opennms/features/reporting/repository/local/LegacyLocalReportRepository.java

@@ -60,7 +60,7 @@ public class LegacyLocalReportRepository implements ReportRepository {
     /**
      * Logging
      */
-    private Logger logger = LoggerFactory.getLogger("OpenNMS.Report." + LegacyLocalReportRepository.class.getName());
+    private Logger logger = LoggerFactory.getLogger(LegacyLocalReportRepository.class);
 
     /**
      * Data access to database-reports.xml

features/reporting/repository/src/main/java/org/opennms/features/reporting/repository/remote/DefaultRemoteRepository.java

@@ -62,7 +62,7 @@ public class DefaultRemoteRepository implements ReportRepository {
     /**
      * Logging
      */
-    private Logger logger = LoggerFactory.getLogger("OpenNMS.Report." + DefaultRemoteRepository.class.getName());
+    private Logger logger = LoggerFactory.getLogger(DefaultRemoteRepository.class);
 
     /**
      * Model for repository configuration for remote-repository.xml

features/reporting/sdo/src/main/java/org/opennms/features/reporting/sdo/SDOMapper.java

@@ -37,7 +37,7 @@
 
 public abstract class SDOMapper {
 
-	private static Logger logger = LoggerFactory.getLogger("OpenNMS.Report." + SDOMapper.class.getName());
+	private static Logger logger = LoggerFactory.getLogger(SDOMapper.class);
 
 	public static RemoteReportSDO getSDO(Object bean) {
 		RemoteReportSDO reportResult = new RemoteReportSDO();

integrations/opennms-jasper-extensions/src/main/java/org/opennms/netmgt/jasper/helper/SnmpInformantOidResolver.java

@@ -44,7 +44,7 @@
 public class SnmpInformantOidResolver extends JRDefaultScriptlet {
 
     // Logging to reporting log
-    private final Logger logger = LoggerFactory.getLogger("OpenNMS.Report." + SnmpInformantOidResolver.class.getName());
+    private final Logger logger = LoggerFactory.getLogger(SnmpInformantOidResolver.class);
 
     /**
      * Convert a name of specific device to a decimal ASCII string as

integrations/opennms-vmware/src/main/java/org/opennms/netmgt/collectd/VmwareCimCollector.java

@@ -84,7 +84,7 @@ public class VmwareCimCollector implements ServiceCollector {
     /**
      * logging for VMware CIM data collection
      */
-    private final Logger logger = LoggerFactory.getLogger("OpenNMS.VMware." + VmwareCimCollector.class.getName());
+    private final Logger logger = LoggerFactory.getLogger(VmwareCimCollector.class);
 
     /**
      * the attribute groups

integrations/opennms-vmware/src/main/java/org/opennms/netmgt/collectd/VmwareCollector.java

@@ -80,7 +80,7 @@ public class VmwareCollector implements ServiceCollector {
     /**
      * logging for VMware data collection
      */
-    private final Logger logger = LoggerFactory.getLogger("OpenNMS.VMware." + VmwareCollector.class.getName());
+    private final Logger logger = LoggerFactory.getLogger(VmwareCollector.class);
 
     /**
      * the node dao object for retrieving assets

integrations/opennms-vmware/src/main/java/org/opennms/netmgt/collectd/vmware/cim/VmwareCimMultiInstanceCollectionResource.java

@@ -40,7 +40,7 @@ public class VmwareCimMultiInstanceCollectionResource extends VmwareCimCollectio
     /**
      * logging for VMware data collection
      */
-    private final Logger logger = LoggerFactory.getLogger("OpenNMS.VMware." + VmwareCimMultiInstanceCollectionResource.class.getName());
+    private final Logger logger = LoggerFactory.getLogger(VmwareCimMultiInstanceCollectionResource.class);
 
     private final String m_inst;
     private final String m_name;

integrations/opennms-vmware/src/main/java/org/opennms/netmgt/collectd/vmware/vijava/VmwareMultiInstanceCollectionResource.java

@@ -40,7 +40,7 @@ public class VmwareMultiInstanceCollectionResource extends VmwareCollectionResou
     /**
      * logging for VMware data collection
      */
-    private final Logger logger = LoggerFactory.getLogger("OpenNMS.VMware." + VmwareMultiInstanceCollectionResource.class.getName());
+    private final Logger logger = LoggerFactory.getLogger(VmwareMultiInstanceCollectionResource.class);
 
     private final String m_inst;
     private final String m_name;

integrations/opennms-vmware/src/main/java/org/opennms/netmgt/poller/monitors/VmwareCimMonitor.java

@@ -76,7 +76,7 @@ public class VmwareCimMonitor extends AbstractServiceMonitor {
     /**
      * logging for VMware data collection
      */
-    private final Logger logger = LoggerFactory.getLogger("OpenNMS.VMware." + VmwareCimMonitor.class.getName());
+    private final Logger logger = LoggerFactory.getLogger(VmwareCimMonitor.class);
 
     /**
      * the node dao object for retrieving assets

integrations/opennms-vmware/src/main/java/org/opennms/netmgt/poller/monitors/VmwareMonitor.java

@@ -66,7 +66,7 @@ public class VmwareMonitor extends AbstractServiceMonitor {
     /**
      * logging for VMware monitor
      */
-    private final Logger logger = LoggerFactory.getLogger("OpenNMS.VMware." + VmwareMonitor.class.getName());
+    private final Logger logger = LoggerFactory.getLogger(VmwareMonitor.class);
 
     /**
      * the node dao object for retrieving assets

integrations/opennms-vmware/src/main/java/org/opennms/protocols/vmware/VmwareViJavaAccess.java

@@ -117,7 +117,7 @@ public class VmwareViJavaAccess {
     /**
      * logging for VMware library VI Java
      */
-    private final Logger logger = LoggerFactory.getLogger("OpenNMS.VMware." + VmwareViJavaAccess.class.getName());
+    private final Logger logger = LoggerFactory.getLogger(VmwareViJavaAccess.class);
 
     /**
      * the config dao

opennms-asterisk/src/main/java/org/opennms/netmgt/asterisk/agi/jmx/AsteriskGateway.java

@@ -35,7 +35,7 @@ public class AsteriskGateway extends AbstractSpringContextJmxServiceDaemon<org.o
     /** {@inheritDoc} */
     @Override
     protected String getLoggingPrefix() {
-        return "OpenNMS.AsteriskGateway";
+        return "asterisk-gateway";
     }
 
     /** {@inheritDoc} */

opennms-base-assembly/src/main/filtered/etc/rrd-configuration.properties

@@ -152,11 +152,11 @@
 
 
 #
-# This property defines which log4j category to use when printing the queue
+# This property defines which log4j2 routing prefix to use when printing the queue
 # statistics
 #
 # The default setting is for the queueing daemon
-#org.opennms.rrd.queuing.category=OpenNMS.Queued
+#org.opennms.rrd.queuing.category=queued
 
 #
 # The following constants are related to how long a write thread lingers before