Fix xmpp project structure problem
+ error-prone bug fix
Change-Id: I5098f1052a3b287b0990959d4d9d83ab7477cdad
diff --git a/providers/xmpp/device/pom.xml b/providers/xmpp/device/pom.xml
index ec84565..48e08da 100644
--- a/providers/xmpp/device/pom.xml
+++ b/providers/xmpp/device/pom.xml
@@ -5,11 +5,11 @@
<modelVersion>4.0.0</modelVersion>
<parent>
<groupId>org.onosproject</groupId>
- <artifactId>onos-xmpp-providers</artifactId>
+ <artifactId>onos-providers-xmpp</artifactId>
<version>1.13.0-SNAPSHOT</version>
</parent>
- <artifactId>onos-xmpp-provider-device</artifactId>
+ <artifactId>onos-providers-xmpp-device</artifactId>
<packaging>bundle</packaging>
<description>ONOS XMPP protocol Device provider</description>
@@ -41,8 +41,8 @@
</dependency>
<dependency>
<groupId>org.onosproject</groupId>
- <artifactId>onos-xmpp-core-api</artifactId>
- <version>1.13.0-SNAPSHOT</version>
+ <artifactId>onos-protocols-xmpp-core-api</artifactId>
+ <version>${project.version}</version>
</dependency>
</dependencies>
-</project>
\ No newline at end of file
+</project>
diff --git a/providers/xmpp/device/src/test/java/org/onosproject/provider/xmpp/device/impl/XmppDeviceProviderTest.java b/providers/xmpp/device/src/test/java/org/onosproject/provider/xmpp/device/impl/XmppDeviceProviderTest.java
index f5ca6b6..f87694d 100644
--- a/providers/xmpp/device/src/test/java/org/onosproject/provider/xmpp/device/impl/XmppDeviceProviderTest.java
+++ b/providers/xmpp/device/src/test/java/org/onosproject/provider/xmpp/device/impl/XmppDeviceProviderTest.java
@@ -111,7 +111,7 @@
public void deactivate() throws Exception {
provider.deactivate();
assertNull("Device listener should be removed", xmppController.listener);
- assertFalse("Provider should not be registered", deviceRegistry.getProviders().contains(provider));
+ assertFalse("Provider should not be registered", deviceRegistry.getProviders().contains(provider.id()));
assertNull("Provider service should be null", provider.providerService);
}
diff --git a/providers/xmpp/pom.xml b/providers/xmpp/pom.xml
index 3ce40d1..2b15f99 100644
--- a/providers/xmpp/pom.xml
+++ b/providers/xmpp/pom.xml
@@ -9,10 +9,11 @@
</parent>
<modelVersion>4.0.0</modelVersion>
- <artifactId>onos-xmpp-providers</artifactId>
+ <artifactId>onos-providers-xmpp</artifactId>
+ <packaging>pom</packaging>
<modules>
- <module>onos-xmpp-provider-device</module>
+ <module>device</module>
</modules>
-</project>
\ No newline at end of file
+</project>