HZN-939: Refactor Discovery to use the Ping Sweep RPC module.

OpenNMS · Nov 12, 2016 · 9c63cbd · 9c63cbd
1 parent 51ad940
commit 9c63cbd
Show file tree

Hide file tree

Showing 51 changed files with 648 additions and 2,476 deletions.
diff --git a/container/features/pom.xml b/container/features/pom.xml
@@ -205,7 +205,6 @@
             <feature>opennms-dao-api</feature>
             <feature>opennms-dao</feature>
             <feature>opennms-discovery</feature>
-            <feature>opennms-discovery-daemon</feature>
             <feature>opennms-events-api</feature>
             <feature>opennms-events-daemon</feature>
             <feature>opennms-events-commands</feature>

diff --git a/container/features/src/main/resources/features-minion.xml b/container/features/src/main/resources/features-minion.xml
@@ -19,14 +19,6 @@
       <bundle>mvn:org.opennms/opennms-dao-minion/${project.version}</bundle>
     </feature>
 
-    <feature name="opennms-discoverer" description="OpenNMS :: Discovery :: Discoverer" version="${project.version}">
-      <feature>minion-core-api</feature>
-      <feature>opennms-dao-minion</feature>
-      <feature>opennms-discovery</feature>
-      <feature>opennms-icmp-jna</feature>
-      <bundle>blueprint:mvn:org.opennms.features/org.opennms.features.discovery/${project.version}/xml/blueprint-discoverer</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>

diff --git a/container/features/src/main/resources/features.xml b/container/features/src/main/resources/features.xml
@@ -608,26 +608,16 @@
     <feature name="opennms-discovery" description="OpenNMS :: Discovery" version="${project.version}">
       <feature>castor</feature>
       <feature version="${guavaVersion}">guava</feature>
-      <feature>camel-core</feature>
-      <feature>camel-blueprint</feature>
-      <feature>activemq-camel</feature>
+      <feature>opennms-core-ipc-rpc</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>
-      <!-- TODO: Remove this dependency -->
-      <feature>minion-core-api</feature>
 
       <bundle>mvn:org.opennms.features/org.opennms.features.discovery/${project.version}</bundle>
     </feature>
 
-    <feature name="opennms-discovery-daemon" description="OpenNMS :: Discovery :: Daemon" version="${project.version}">
-      <feature>opennms-discovery</feature>
-      <bundle>blueprint:mvn:org.opennms.features/org.opennms.features.discovery/${project.version}/xml/blueprint-discovery</bundle>
-    </feature>
-
     <feature name="opennms-events-api" description="OpenNMS :: Events :: API" version="${project.version}">
       <feature version="[4.0,4.1)">spring</feature>
 

diff --git a/features/discovery/blueprint-discoverer.xml b/features/discovery/blueprint-discoverer.xml
diff --git a/features/discovery/blueprint-discovery.xml b/features/discovery/blueprint-discovery.xml