summaryrefslogtreecommitdiffstats
path: root/infra/notification
diff options
context:
space:
mode:
authorMaros Marsalek <mmarsale@cisco.com>2016-07-29 16:27:12 +0200
committerMaros Marsalek <mmarsale@cisco.com>2016-07-29 16:32:17 +0200
commite3c31cee916480b2d9d169c1f5afb1c42efaabe1 (patch)
treec88b0ca3e7296dd7e68628db6d5f33ffd1e1b55e /infra/notification
parent0578156b721fa01c8c645b8f9625ecebdb6449e4 (diff)
HONEYCOMB-130: Rename infra packages(remove vpp/v3po)
Change-Id: Ic5b90e397e3743623d01b206bc60bc5c7df6b981 Signed-off-by: Maros Marsalek <mmarsale@cisco.com>
Diffstat (limited to 'infra/notification')
-rw-r--r--infra/notification/api/src/main/java/io/fd/honeycomb/notification/ManagedNotificationProducer.java (renamed from infra/notification/api/src/main/java/io/fd/honeycomb/v3po/notification/ManagedNotificationProducer.java)2
-rw-r--r--infra/notification/api/src/main/java/io/fd/honeycomb/notification/NotificationCollector.java (renamed from infra/notification/api/src/main/java/io/fd/honeycomb/v3po/notification/NotificationCollector.java)2
-rw-r--r--infra/notification/api/src/main/java/io/fd/honeycomb/notification/NotificationProducer.java (renamed from infra/notification/api/src/main/java/io/fd/honeycomb/v3po/notification/NotificationProducer.java)2
-rw-r--r--infra/notification/api/src/main/yang/notification-api.yang4
-rw-r--r--infra/notification/impl/src/main/config/notification-to-netconf-config.xml4
-rw-r--r--infra/notification/impl/src/main/java/io/fd/honeycomb/notification/impl/HoneycombNotificationCollector.java (renamed from infra/notification/impl/src/main/java/io/fd/honeycomb/v3po/notification/impl/HoneycombNotificationCollector.java)4
-rw-r--r--infra/notification/impl/src/main/java/io/fd/honeycomb/notification/impl/NotificationProducerRegistry.java (renamed from infra/notification/impl/src/main/java/io/fd/honeycomb/v3po/notification/impl/NotificationProducerRegistry.java)6
-rw-r--r--infra/notification/impl/src/main/java/io/fd/honeycomb/notification/impl/NotificationProducerTracker.java (renamed from infra/notification/impl/src/main/java/io/fd/honeycomb/v3po/notification/impl/NotificationProducerTracker.java)6
-rw-r--r--infra/notification/impl/src/main/java/org/opendaylight/yang/gen/v1/urn/honeycomb/params/xml/ns/yang/notification/impl/rev160601/HoneycombNotificationManagerModule.java10
-rw-r--r--infra/notification/impl/src/main/java/org/opendaylight/yang/gen/v1/urn/honeycomb/params/xml/ns/yang/notification/impl/rev160601/HoneycombNotificationToNetconfTranslatorModule.java4
-rw-r--r--infra/notification/impl/src/test/java/io/fd/honeycomb/notification/impl/HoneycombNotificationCollectorTest.java (renamed from infra/notification/impl/src/test/java/io/fd/honeycomb/v3po/notification/impl/HoneycombNotificationCollectorTest.java)4
-rw-r--r--infra/notification/impl/src/test/java/io/fd/honeycomb/notification/impl/NotificationProducerRegistryTest.java (renamed from infra/notification/impl/src/test/java/io/fd/honeycomb/v3po/notification/impl/NotificationProducerRegistryTest.java)4
-rw-r--r--infra/notification/impl/src/test/java/io/fd/honeycomb/notification/impl/NotificationProducerTrackerTest.java (renamed from infra/notification/impl/src/test/java/io/fd/honeycomb/v3po/notification/impl/NotificationProducerTrackerTest.java)6
-rw-r--r--infra/notification/pom.xml1
14 files changed, 30 insertions, 29 deletions
diff --git a/infra/notification/api/src/main/java/io/fd/honeycomb/v3po/notification/ManagedNotificationProducer.java b/infra/notification/api/src/main/java/io/fd/honeycomb/notification/ManagedNotificationProducer.java
index 0f5e28cde..433512164 100644
--- a/infra/notification/api/src/main/java/io/fd/honeycomb/v3po/notification/ManagedNotificationProducer.java
+++ b/infra/notification/api/src/main/java/io/fd/honeycomb/notification/ManagedNotificationProducer.java
@@ -13,7 +13,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package io.fd.honeycomb.v3po.notification;
+package io.fd.honeycomb.notification;
import com.google.common.annotations.Beta;
import javax.annotation.Nonnull;
diff --git a/infra/notification/api/src/main/java/io/fd/honeycomb/v3po/notification/NotificationCollector.java b/infra/notification/api/src/main/java/io/fd/honeycomb/notification/NotificationCollector.java
index 406ab03d2..e40b874d5 100644
--- a/infra/notification/api/src/main/java/io/fd/honeycomb/v3po/notification/NotificationCollector.java
+++ b/infra/notification/api/src/main/java/io/fd/honeycomb/notification/NotificationCollector.java
@@ -13,7 +13,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package io.fd.honeycomb.v3po.notification;
+package io.fd.honeycomb.notification;
import com.google.common.annotations.Beta;
import javax.annotation.Nonnull;
diff --git a/infra/notification/api/src/main/java/io/fd/honeycomb/v3po/notification/NotificationProducer.java b/infra/notification/api/src/main/java/io/fd/honeycomb/notification/NotificationProducer.java
index dab773c45..665318d0e 100644
--- a/infra/notification/api/src/main/java/io/fd/honeycomb/v3po/notification/NotificationProducer.java
+++ b/infra/notification/api/src/main/java/io/fd/honeycomb/notification/NotificationProducer.java
@@ -13,7 +13,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package io.fd.honeycomb.v3po.notification;
+package io.fd.honeycomb.notification;
import com.google.common.annotations.Beta;
import java.util.Collection;
diff --git a/infra/notification/api/src/main/yang/notification-api.yang b/infra/notification/api/src/main/yang/notification-api.yang
index 4e6eb98ae..f0331bc07 100644
--- a/infra/notification/api/src/main/yang/notification-api.yang
+++ b/infra/notification/api/src/main/yang/notification-api.yang
@@ -15,7 +15,7 @@ module notification-api {
identity honeycomb-notification-collector {
base "config:service-type";
- config:java-class io.fd.honeycomb.v3po.notification.NotificationCollector;
+ config:java-class io.fd.honeycomb.notification.NotificationCollector;
}
identity dom-notification-service {
@@ -25,7 +25,7 @@ module notification-api {
identity honeycomb-notification-producer {
base "config:service-type";
- config:java-class io.fd.honeycomb.v3po.notification.ManagedNotificationProducer;
+ config:java-class io.fd.honeycomb.notification.ManagedNotificationProducer;
}
}
diff --git a/infra/notification/impl/src/main/config/notification-to-netconf-config.xml b/infra/notification/impl/src/main/config/notification-to-netconf-config.xml
index d2aac0932..d64de6413 100644
--- a/infra/notification/impl/src/main/config/notification-to-netconf-config.xml
+++ b/infra/notification/impl/src/main/config/notification-to-netconf-config.xml
@@ -29,13 +29,13 @@
<type xmlns:prefix="urn:opendaylight:params:xml:ns:yang:controller:netconf:northbound:notification">
prefix:netconf-notification-registry
</type>
- <name>vpp-netconf-notification-manager</name>
+ <name>honeycomb-netconf-notification-manager</name>
</netconf-notification-registry>
<netconf-notification-collector>
<type xmlns:prefix="urn:opendaylight:params:xml:ns:yang:controller:netconf:northbound:notification">
prefix:netconf-notification-collector
</type>
- <name>vpp-netconf-notification-manager</name>
+ <name>honeycomb-netconf-notification-manager</name>
</netconf-notification-collector>
<schema-service>
<type xmlns:dom="urn:opendaylight:params:xml:ns:yang:controller:md:sal:dom">dom:schema-service</type>
diff --git a/infra/notification/impl/src/main/java/io/fd/honeycomb/v3po/notification/impl/HoneycombNotificationCollector.java b/infra/notification/impl/src/main/java/io/fd/honeycomb/notification/impl/HoneycombNotificationCollector.java
index e7d54e318..c37e6925c 100644
--- a/infra/notification/impl/src/main/java/io/fd/honeycomb/v3po/notification/impl/HoneycombNotificationCollector.java
+++ b/infra/notification/impl/src/main/java/io/fd/honeycomb/notification/impl/HoneycombNotificationCollector.java
@@ -13,9 +13,9 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package io.fd.honeycomb.v3po.notification.impl;
+package io.fd.honeycomb.notification.impl;
-import io.fd.honeycomb.v3po.notification.NotificationCollector;
+import io.fd.honeycomb.notification.NotificationCollector;
import java.util.Collection;
import javax.annotation.Nonnull;
import org.opendaylight.controller.md.sal.binding.api.NotificationPublishService;
diff --git a/infra/notification/impl/src/main/java/io/fd/honeycomb/v3po/notification/impl/NotificationProducerRegistry.java b/infra/notification/impl/src/main/java/io/fd/honeycomb/notification/impl/NotificationProducerRegistry.java
index 8fba700bd..7b46c60b7 100644
--- a/infra/notification/impl/src/main/java/io/fd/honeycomb/v3po/notification/impl/NotificationProducerRegistry.java
+++ b/infra/notification/impl/src/main/java/io/fd/honeycomb/notification/impl/NotificationProducerRegistry.java
@@ -13,15 +13,15 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package io.fd.honeycomb.v3po.notification.impl;
+package io.fd.honeycomb.notification.impl;
import static com.google.common.base.Preconditions.checkArgument;
import com.google.common.collect.HashMultimap;
import com.google.common.collect.Maps;
import com.google.common.collect.Multimap;
-import io.fd.honeycomb.v3po.notification.ManagedNotificationProducer;
-import io.fd.honeycomb.v3po.notification.NotificationProducer;
+import io.fd.honeycomb.notification.ManagedNotificationProducer;
+import io.fd.honeycomb.notification.NotificationProducer;
import java.util.Collection;
import java.util.List;
import java.util.Map;
diff --git a/infra/notification/impl/src/main/java/io/fd/honeycomb/v3po/notification/impl/NotificationProducerTracker.java b/infra/notification/impl/src/main/java/io/fd/honeycomb/notification/impl/NotificationProducerTracker.java
index cefb50ac9..808512c21 100644
--- a/infra/notification/impl/src/main/java/io/fd/honeycomb/v3po/notification/impl/NotificationProducerTracker.java
+++ b/infra/notification/impl/src/main/java/io/fd/honeycomb/notification/impl/NotificationProducerTracker.java
@@ -13,13 +13,13 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package io.fd.honeycomb.v3po.notification.impl;
+package io.fd.honeycomb.notification.impl;
import static com.google.common.base.Preconditions.checkState;
import com.google.common.collect.Sets;
-import io.fd.honeycomb.v3po.notification.ManagedNotificationProducer;
-import io.fd.honeycomb.v3po.notification.NotificationCollector;
+import io.fd.honeycomb.notification.ManagedNotificationProducer;
+import io.fd.honeycomb.notification.NotificationCollector;
import java.util.HashSet;
import java.util.Set;
import java.util.stream.Collectors;
diff --git a/infra/notification/impl/src/main/java/org/opendaylight/yang/gen/v1/urn/honeycomb/params/xml/ns/yang/notification/impl/rev160601/HoneycombNotificationManagerModule.java b/infra/notification/impl/src/main/java/org/opendaylight/yang/gen/v1/urn/honeycomb/params/xml/ns/yang/notification/impl/rev160601/HoneycombNotificationManagerModule.java
index 4a9440cbc..056b38798 100644
--- a/infra/notification/impl/src/main/java/org/opendaylight/yang/gen/v1/urn/honeycomb/params/xml/ns/yang/notification/impl/rev160601/HoneycombNotificationManagerModule.java
+++ b/infra/notification/impl/src/main/java/org/opendaylight/yang/gen/v1/urn/honeycomb/params/xml/ns/yang/notification/impl/rev160601/HoneycombNotificationManagerModule.java
@@ -1,10 +1,10 @@
package org.opendaylight.yang.gen.v1.urn.honeycomb.params.xml.ns.yang.notification.impl.rev160601;
-import io.fd.honeycomb.v3po.notification.NotificationCollector;
-import io.fd.honeycomb.v3po.notification.NotificationProducer;
-import io.fd.honeycomb.v3po.notification.impl.HoneycombNotificationCollector;
-import io.fd.honeycomb.v3po.notification.impl.NotificationProducerRegistry;
-import io.fd.honeycomb.v3po.notification.impl.NotificationProducerTracker;
+import io.fd.honeycomb.notification.NotificationCollector;
+import io.fd.honeycomb.notification.NotificationProducer;
+import io.fd.honeycomb.notification.impl.HoneycombNotificationCollector;
+import io.fd.honeycomb.notification.impl.NotificationProducerRegistry;
+import io.fd.honeycomb.notification.impl.NotificationProducerTracker;
import java.util.Collection;
import org.opendaylight.controller.md.sal.binding.impl.BindingDOMNotificationPublishServiceAdapter;
import org.opendaylight.controller.md.sal.binding.impl.BindingToNormalizedNodeCodec;
diff --git a/infra/notification/impl/src/main/java/org/opendaylight/yang/gen/v1/urn/honeycomb/params/xml/ns/yang/notification/impl/rev160601/HoneycombNotificationToNetconfTranslatorModule.java b/infra/notification/impl/src/main/java/org/opendaylight/yang/gen/v1/urn/honeycomb/params/xml/ns/yang/notification/impl/rev160601/HoneycombNotificationToNetconfTranslatorModule.java
index 4d85d64c5..734d340e8 100644
--- a/infra/notification/impl/src/main/java/org/opendaylight/yang/gen/v1/urn/honeycomb/params/xml/ns/yang/notification/impl/rev160601/HoneycombNotificationToNetconfTranslatorModule.java
+++ b/infra/notification/impl/src/main/java/org/opendaylight/yang/gen/v1/urn/honeycomb/params/xml/ns/yang/notification/impl/rev160601/HoneycombNotificationToNetconfTranslatorModule.java
@@ -1,8 +1,8 @@
package org.opendaylight.yang.gen.v1.urn.honeycomb.params.xml.ns.yang.notification.impl.rev160601;
import com.google.common.annotations.VisibleForTesting;
-import io.fd.honeycomb.v3po.notification.NotificationCollector;
-import io.fd.honeycomb.v3po.notification.impl.NotificationProducerRegistry;
+import io.fd.honeycomb.notification.NotificationCollector;
+import io.fd.honeycomb.notification.impl.NotificationProducerRegistry;
import java.io.IOException;
import java.util.Set;
import java.util.stream.Collectors;
diff --git a/infra/notification/impl/src/test/java/io/fd/honeycomb/v3po/notification/impl/HoneycombNotificationCollectorTest.java b/infra/notification/impl/src/test/java/io/fd/honeycomb/notification/impl/HoneycombNotificationCollectorTest.java
index f55d3abdf..ef9f548b7 100644
--- a/infra/notification/impl/src/test/java/io/fd/honeycomb/v3po/notification/impl/HoneycombNotificationCollectorTest.java
+++ b/infra/notification/impl/src/test/java/io/fd/honeycomb/notification/impl/HoneycombNotificationCollectorTest.java
@@ -13,13 +13,13 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package io.fd.honeycomb.v3po.notification.impl;
+package io.fd.honeycomb.notification.impl;
import static org.mockito.Mockito.atLeast;
import static org.mockito.Mockito.verify;
import com.google.common.collect.Lists;
-import io.fd.honeycomb.v3po.notification.ManagedNotificationProducer;
+import io.fd.honeycomb.notification.ManagedNotificationProducer;
import org.junit.Before;
import org.junit.Test;
import org.mockito.Mock;
diff --git a/infra/notification/impl/src/test/java/io/fd/honeycomb/v3po/notification/impl/NotificationProducerRegistryTest.java b/infra/notification/impl/src/test/java/io/fd/honeycomb/notification/impl/NotificationProducerRegistryTest.java
index 5fdf502b9..a09803f02 100644
--- a/infra/notification/impl/src/test/java/io/fd/honeycomb/v3po/notification/impl/NotificationProducerRegistryTest.java
+++ b/infra/notification/impl/src/test/java/io/fd/honeycomb/notification/impl/NotificationProducerRegistryTest.java
@@ -13,7 +13,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package io.fd.honeycomb.v3po.notification.impl;
+package io.fd.honeycomb.notification.impl;
import static org.hamcrest.CoreMatchers.hasItem;
import static org.hamcrest.CoreMatchers.is;
@@ -21,7 +21,7 @@ import static org.mockito.Mockito.doReturn;
import com.google.common.collect.Lists;
import com.google.common.collect.Multimap;
-import io.fd.honeycomb.v3po.notification.ManagedNotificationProducer;
+import io.fd.honeycomb.notification.ManagedNotificationProducer;
import java.util.ArrayList;
import java.util.Collections;
import java.util.Map;
diff --git a/infra/notification/impl/src/test/java/io/fd/honeycomb/v3po/notification/impl/NotificationProducerTrackerTest.java b/infra/notification/impl/src/test/java/io/fd/honeycomb/notification/impl/NotificationProducerTrackerTest.java
index b62bf0709..4de2e7773 100644
--- a/infra/notification/impl/src/test/java/io/fd/honeycomb/v3po/notification/impl/NotificationProducerTrackerTest.java
+++ b/infra/notification/impl/src/test/java/io/fd/honeycomb/notification/impl/NotificationProducerTrackerTest.java
@@ -13,15 +13,15 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package io.fd.honeycomb.v3po.notification.impl;
+package io.fd.honeycomb.notification.impl;
import static org.mockito.Mockito.doReturn;
import static org.mockito.Mockito.verify;
import com.google.common.collect.Lists;
import com.google.common.collect.Sets;
-import io.fd.honeycomb.v3po.notification.ManagedNotificationProducer;
-import io.fd.honeycomb.v3po.notification.NotificationCollector;
+import io.fd.honeycomb.notification.ManagedNotificationProducer;
+import io.fd.honeycomb.notification.NotificationCollector;
import java.util.Collections;
import java.util.Set;
import org.junit.Before;
diff --git a/infra/notification/pom.xml b/infra/notification/pom.xml
index 81b8aae40..3deb37797 100644
--- a/infra/notification/pom.xml
+++ b/infra/notification/pom.xml
@@ -22,6 +22,7 @@
<relativePath/>
</parent>
+ <groupId>io.fd.honeycomb</groupId>
<artifactId>notification-aggregator</artifactId>
<version>1.0.0-SNAPSHOT</version>
<name>notification</name>