Merge branch 'features/atlas' into jira/HZN-754

container/features/pom.xml

@@ -182,6 +182,7 @@
             <feature>opennms-activemq-event-receiver</feature>
             -->
             <feature>opennms-collection-api</feature>
+            <feature>opennms-collection-commands</feature>
             <feature>opennms-collection-persistence-rrd</feature>
             <feature>opennms-config-api</feature>
             <feature>opennms-config</feature>
@@ -196,7 +197,6 @@
             <feature>opennms-discovery-daemon</feature>
             <feature>opennms-events-api</feature>
             <feature>opennms-events-daemon</feature>
-            <feature>opennms-events-traps</feature>
             <feature>opennms-icmp-api</feature>
             <feature>opennms-icmp-jna</feature>
             <feature>opennms-icmp-jni</feature>
@@ -216,6 +216,9 @@
             <feature>opennms-syslogd-handler-default</feature>
             <feature>opennms-syslogd-handler-kafka</feature>
             <feature>opennms-syslogd-handler-minion</feature>
+            <feature>opennms-trapd</feature>
+            <feature>opennms-trapd-handler-default</feature>
+            <feature>opennms-trapd-listener</feature>
             <!-- <feature>opennms-webapp</feature> -->
             <feature>org.json</feature>
             <feature>postgresql</feature>
@@ -347,6 +350,12 @@
       <version>${project.version}</version>
       <scope>provided</scope>
     </dependency>
+    <dependency>
+      <groupId>org.opennms.features.events</groupId>
+      <artifactId>org.opennms.features.events.traps</artifactId>
+      <version>${project.version}</version>
+      <scope>provided</scope>
+    </dependency>
     <dependency>
       <groupId>org.opennms.features</groupId>
       <artifactId>jmxconfiggenerator</artifactId>
@@ -542,6 +551,13 @@
       <type>pom</type>
       <scope>provided</scope>
     </dependency>
+    <dependency>
+      <groupId>org.opennms.features.collection</groupId>
+      <artifactId>org.opennms.features.collection.commands</artifactId>
+      <version>${project.version}</version>
+      <type>pom</type>
+      <scope>provided</scope>
+    </dependency>
     <dependency>
       <groupId>org.opennms.plugins</groupId>
       <artifactId>vaadin-opennms-pluginmanager</artifactId>

container/features/src/main/resources/features-minion.xml

@@ -28,4 +28,19 @@
       <feature>minion-core-api</feature>
       <bundle>blueprint:mvn:org.opennms.features/org.opennms.features.discovery/${project.version}/xml/blueprint-discovery-distPollerDaoMinion</bundle>
     </feature>
+
+    <feature name="opennms-syslogd-handler-minion" description="OpenNMS :: Syslogd :: Handler :: Minion" version="${project.version}">
+      <feature>camel-blueprint</feature>
+      <feature>minion-core-api</feature>
+      <feature>opennms-syslogd</feature>
+      <bundle>blueprint:mvn:org.opennms.features.events/org.opennms.features.events.syslog/${project.version}/xml/blueprint-syslog-handler-minion</bundle>
+    </feature>
+
+    <feature name="opennms-trapd-handler-minion" description="OpenNMS :: Trapd :: Handler :: Minion" version="${project.version}">
+      <feature>camel-blueprint</feature>
+      <feature>minion-core-api</feature>
+      <feature>opennms-trapd</feature>
+      <bundle>blueprint:mvn:org.opennms.features.events/org.opennms.features.events.traps/${project.version}/xml/blueprint-trapd-handler-minion</bundle>
+    </feature>
+
 </features>

container/features/src/main/resources/features.xml

@@ -452,6 +452,11 @@
       <bundle>mvn:org.opennms.features.collection/org.opennms.features.collection.api/${project.version}</bundle>
     </feature>
 
+    <feature name="opennms-collection-commands" description="OpenNMS :: Collection :: Shell Commands" version="${project.version}">
+      <feature>opennms-collection-api</feature>
+      <bundle>mvn:org.opennms.features.collection/org.opennms.features.collection.commands/${project.version}</bundle>
+    </feature>
+
     <feature name="opennms-collection-persistence-rrd" description="OpenNMS :: Collection :: Persistence :: RRD" version="${project.version}">
       <feature>opennms-collection-api</feature>
       <feature>opennms-dao-api</feature>
@@ -561,14 +566,6 @@
       <bundle>mvn:org.opennms.features.events/org.opennms.features.events.daemon/${project.version}</bundle>
     </feature>
 
-    <feature name="opennms-events-traps" description="OpenNMS :: Events :: Trap Daemon" version="${project.version}">
-      <feature>opennms-core-daemon</feature>
-      <feature>opennms-dao-api</feature>
-      <feature>opennms-events-api</feature>
-
-      <bundle>mvn:org.opennms.features.events/org.opennms.features.events.traps/${project.version}</bundle>
-    </feature>
-
     <feature name="opennms-icmp-api" description="OpenNMS :: ICMP :: API" version="${project.version}">
       <feature>opennms-core</feature>
 
@@ -745,18 +742,58 @@
       <bundle>blueprint:mvn:org.opennms.features.events/org.opennms.features.events.syslog/${project.version}/xml/blueprint-syslog-handler-default</bundle>
     </feature>
 
-    <feature name="opennms-syslogd-handler-minion" description="OpenNMS :: Syslogd :: Handler :: Minion" version="${project.version}">
+    <feature name="opennms-syslogd-handler-kafka" description="OpenNMS :: Syslogd :: Handler :: Kafka" version="${project.version}">
       <feature>camel-blueprint</feature>
       <feature>opennms-syslogd</feature>
 
-      <bundle>blueprint:mvn:org.opennms.features.events/org.opennms.features.events.syslog/${project.version}/xml/blueprint-syslog-handler-minion</bundle>
+      <bundle>blueprint:mvn:org.opennms.features.events/org.opennms.features.events.syslog/${project.version}/xml/blueprint-syslog-handler-kafka</bundle>
     </feature>
 
-    <feature name="opennms-syslogd-handler-kafka" description="OpenNMS :: Syslogd :: Handler :: Kafka" version="${project.version}">
+    <!-- TrapD feature -->
+    <feature name="opennms-trapd" description="OpenNMS :: Trapd" version="${project.version}">
+      <feature version="[4.0,4.1)">spring</feature>
+      <feature>camel-core</feature>
+      <feature>camel-http</feature>
+      <feature>camel-netty</feature>
+      <feature>activemq-camel</feature>
+
+      <feature>opennms-core</feature>
+      <feature>opennms-core-camel</feature>
+      <feature>opennms-core-daemon</feature>
+      <feature>opennms-core-db</feature>
+      <feature>opennms-config</feature>
+      <feature>opennms-dao-api</feature>
+      <feature>opennms-events-api</feature>
+
+      <bundle>mvn:org.opennms.features.events/org.opennms.features.events.traps/${project.version}</bundle>
+    </feature>
+
+    <!-- TODO: Rename this. It's more of an Dominion-side trap message handler... -->
+    <feature name="opennms-trapd-handler-default" description="OpenNMS :: Trapd :: Handler :: Default" version="${project.version}">
+      <feature>activemq-camel</feature>
       <feature>camel-blueprint</feature>
-      <feature>opennms-syslogd</feature>
+      <feature>camel-http</feature>
 
-      <bundle>blueprint:mvn:org.opennms.features.events/org.opennms.features.events.syslog/${project.version}/xml/blueprint-syslog-handler-kafka</bundle>
+      <!--
+      These classes are in the system classpath inside OpenNMS
+      <feature>opennms-trapd</feature>
+      -->
+
+      <bundle>blueprint:mvn:org.opennms.features.events/org.opennms.features.events.traps/${project.version}/xml/blueprint-trapd-handler-default</bundle>
+    </feature>
+
+    <feature name="opennms-trapd-handler-kafka" description="OpenNMS :: Trapd :: Handler :: Kafka" version="${project.version}">
+      <feature>camel-blueprint</feature>
+      <feature>opennms-trapd</feature>
+
+      <bundle>blueprint:mvn:org.opennms.features.events/org.opennms.features.events.traps/${project.version}/xml/blueprint-trapd-handler-kafka</bundle>
+    </feature>
+
+    <feature name="opennms-trapd-listener" description="OpenNMS :: Trapd :: Listener" version="${project.version}">
+      <feature>camel-blueprint</feature>
+      <feature>opennms-trapd</feature>
+
+      <bundle>blueprint:mvn:org.opennms.features.events/org.opennms.features.events.traps/${project.version}/xml/blueprint-trapd-listener</bundle>
     </feature>
 
     <feature name="opennms-webapp" description="OpenNMS :: Webapp" version="${project.version}">

container/karaf/README.markdown

@@ -10,6 +10,7 @@ To upgrade our container to use a new base Karaf version, follow these steps.
 1. Copy the new Karaf features.xml file into the container project:
         cp $KARAF_DIR/system/org/apache/karaf/assemblies/features/standard/$KARAF_VERSION/standard-$KARAF_VERSION-features.xml $SRC_DIR/container/karaf/src/main/filtered-resources/features/features.xml
 1. Restore the HTTP bridge changes to the features.xml file by making all of the changes between the OPENNMS CUSTOMIZATION comment blocks.
+1. Combine the Spring features from $KARAF_DIR/system/org/apache/karaf/assemblies/features/spring/$KARAF_VERSION/spring-$KARAF_VERSION-features.xml with the main features.xml file.
 1. Update $SRC_DIR/pom.xml with new value for <karafVersion/> property.
 
 See commit dea910701c3f48e367636b507fc575b59e70b843 for an example of an upgrade.

container/karaf/src/main/filtered-resources/etc/custom.properties

@@ -45,12 +45,6 @@ org.osgi.framework.system.packages.extra=org.apache.karaf.branding,\
         javax.wsdl.factory;version=${wsdl4jVersion},\
         javax.wsdl.xml;version=${wsdl4jVersion},\
         javax.wsdl;version=${wsdl4jVersion},\
-        javax.xml.bind;version=${springJaxbVersion},\
-        javax.xml.bind.annotation;version=${springJaxbVersion},\
-        javax.xml.bind.annotation.adapters;version=${springJaxbVersion},\
-        javax.xml.bind.attachment;version=${springJaxbVersion},\
-        javax.xml.bind.helpers;version=${springJaxbVersion},\
-        javax.xml.bind.util;version=${springJaxbVersion},\
         antlr;version=${antlr.version},\
         antlr.collections.impl;version=${antlr.version},\
         com.codahale.metrics;version=${dropwizardMetricsVersion},\
@@ -305,6 +299,23 @@ org.osgi.framework.system.packages.extra=org.apache.karaf.branding,\
         org.joda.time;version=${jodaTimeVersion},\
         org.joda.time.format;version=${jodaTimeVersion},\
         org.quartz;version=${quartzVersion},\
+        org.snmp4j;version=${snmp4jVersion},\
+        org.snmp4j.asn1;version=${snmp4jVersion},\
+        org.snmp4j.event;version=${snmp4jVersion},\
+        org.snmp4j.log;version=${snmp4jVersion},\
+        org.snmp4j.mp;version=${snmp4jVersion},\
+        org.snmp4j.security;version=${snmp4jVersion},\
+        org.snmp4j.security.nonstandard;version=${snmp4jVersion},\
+        org.snmp4j.smi;version=${snmp4jVersion},\
+        org.snmp4j.test;version=${snmp4jVersion},\
+        org.snmp4j.tools;version=${snmp4jVersion},\
+        org.snmp4j.tools.console;version=${snmp4jVersion},\
+        org.snmp4j.transport;version=${snmp4jVersion},\
+        org.snmp4j.transport.ssh;version=${snmp4jVersion},\
+        org.snmp4j.transport.tls;version=${snmp4jVersion},\
+        org.snmp4j.uri;version=${snmp4jVersion},\
+        org.snmp4j.util;version=${snmp4jVersion},\
+        org.snmp4j.version;version=${snmp4jVersion},\
         org.springframework;version=${springVersion},\
         org.springframework.aop;version=${springVersion},\
         org.springframework.aop.aspectj;version=${springVersion},\
@@ -648,6 +659,7 @@ org.osgi.framework.system.packages.extra=org.apache.karaf.branding,\
         org.opennms.netmgt.charts;version=${opennms.osgi.version},\
         org.opennms.netmgt.collectd;version=${opennms.osgi.version},\
         org.opennms.netmgt.collection.support;version=${opennms.osgi.version},\
+        org.opennms.netmgt.collection.support.builder;version=${opennms.osgi.version},\
         org.opennms.netmgt.collection.api;version=${opennms.osgi.version},\
         org.opennms.netmgt.config;version=${opennms.osgi.version},\
         org.opennms.netmgt.config.api;version=${opennms.osgi.version},\
@@ -731,8 +743,10 @@ org.osgi.framework.system.packages.extra=org.apache.karaf.branding,\
         org.opennms.netmgt.provision.persist.requisition;version=${opennms.osgi.version},\
         org.opennms.netmgt.rrd;version=${opennms.osgi.version},\
         org.opennms.netmgt.snmp;version=${opennms.osgi.version},\
+        org.opennms.netmgt.snmp.snmp4j;version=${opennms.osgi.version},\
         org.opennms.netmgt.syslogd;version=${opennms.osgi.version},\
         org.opennms.netmgt.ticketd;version=${opennms.osgi.version},\
+        org.opennms.netmgt.trapd;version=${opennms.osgi.version},\
         org.opennms.netmgt.xml.event;version=${opennms.osgi.version},\
         org.opennms.netmgt.xml.eventconf;version=${opennms.osgi.version},\
         org.opennms.netmgt.xml.rtc;version=${opennms.osgi.version},\
@@ -751,20 +765,3 @@ org.osgi.framework.system.packages.extra=org.apache.karaf.branding,\
         org.opennms.web.svclayer.model;version=${opennms.osgi.version},\
         org.opennms.web.svclayer.support;version=${opennms.osgi.version},\
         org.opennms.web.springframework.security;version=${opennms.osgi.version}
-
-
-
-#	org.snmp4j;version=1.11.1,\
-#	org.snmp4j.asn1;version=1.11.1,\
-#	org.snmp4j.doc-files;version=1.11.1,\
-#	org.snmp4j.event;version=1.11.1,\
-#	org.snmp4j.log;version=1.11.1,\
-#	org.snmp4j.mp;version=1.11.1,\
-#	org.snmp4j.security;version=1.11.1,\
-#	org.snmp4j.smi;version=1.11.1,\
-#	org.snmp4j.smi;version=1.11.1,\
-#	org.snmp4j.test;version=1.11.1,\
-#	org.snmp4j.tools.console;version=1.11.1,\
-#	org.snmp4j.transport;version=1.11.1,\
-#	org.snmp4j.util;version=1.11.1,\
-#	org.snmp4j.version;version=1.11.1

container/karaf/src/main/filtered-resources/etc/org.apache.karaf.features.cfg

@@ -17,23 +17,27 @@
 #
 ################################################################################
 
-respectStartLvlDuringFeatureStartup=false
+#
+# Defines if the startlvl should be respected during feature startup. The default value is for 3.x is true.
+# The default behavior for 2.x is false (!) for this property
+#
+#respectStartLvlDuringFeatureStartup = false
 
 #
 # Comma separated list of features repositories to register by default
 #
-#featuresRepositories=mvn:org.apache.karaf.assemblies.features/standard/${karafVersion}/xml/features,mvn:org.apache.karaf.assemblies.features/enterprise/${karafVersion}/xml/features
+#featuresRepositories = mvn:org.apache.karaf.assemblies.features/standard/${karafVersion}/xml/features,mvn:org.apache.karaf.assemblies.features/spring/${karafVersion}/xml/features,mvn:org.apache.karaf.assemblies.features/enterprise/${karafVersion}/xml/features
 #
 # Override the default Karaf features.xml with our customized version with the HTTP bridge code
-featuresRepositories=mvn:${project.groupId}/${project.artifactId}/${project.version}/xml/features
+featuresRepositories = mvn:${project.groupId}/${project.artifactId}/${project.version}/xml/features
 
 #
 # Comma separated list of features to install at startup
 #
-#featuresBoot=config,ssh,management,kar
-featuresBoot=config,ssh,http,http-whiteboard,deployer
+#featuresBoot = karaf-framework,shell,features,service-security,admin,config,ssh,management,kar,deployer,diagnostic
+featuresBoot = config,ssh,http,http-whiteboard,deployer
 
 #
 # Defines if the boot features are started in asynchronous mode (in a dedicated thread)
 #
-featuresBootAsynchronous=false
+featuresBootAsynchronous = false

container/karaf/src/main/filtered-resources/etc/org.apache.karaf.shell.cfg

@@ -24,39 +24,38 @@
 #
 # Via sshPort and sshHost you define the address you can login into Karaf.
 #
-sshPort=8101
-sshHost=127.0.0.1
+sshPort = 8101
+sshHost = 127.0.0.1
 
 #
 # The sshIdleTimeout defines the inactivity timeout to logout the SSH session.
 # The sshIdleTimeout is in milliseconds, and the default is set to 30 minutes.
 #
-sshIdleTimeout=1800000
+sshIdleTimeout = 1800000
 
 #
 # sshRealm defines which JAAS domain to use for password authentication.
 #
-sshRealm=karaf
+sshRealm = karaf
 
 #
 # The location of the hostKey file defines where the private/public key of the server
 # is located. If no file is at the defined location it will be ignored.
 #
-hostKey=${karaf.base}/etc/host.key
-
-#
-# Role name used for SSH access authorization
-# If not set, this defaults to the ${karaf.admin.role} configured in etc/system.properties
-#
-# sshRole=admin
+hostKey = ${karaf.etc}/host.key
 
 #
 # Self defined key size in 1024, 2048, 3072, or 4096
 # If not set, this defaults to 1024.
 #
-# keySize=1024
+# keySize = 1024
 
 #
 # Specify host key algorithm, defaults to DSA
 #
-# algorithm=DSA
+# algorithm = DSA
+
+# Specify an additional welcome banner to be displayed when a user logs into the server.
+#
+# welcomeBanner =
+