Merge dev/fluorine work across to master

[unimgr.git] / cisco-xr-driver / src / main / java / org / opendaylight / unimgr / mef / nrp / cisco / xr / common / FixedServiceNaming.java

diff --git a/impl/src/main/java/org/opendaylight/unimgr/mef/nrp/common/FixedServiceNaming.java b/cisco-xr-driver/src/main/java/org/opendaylight/unimgr/mef/nrp/cisco/xr/common/FixedServiceNaming.java
similarity index 86%
rename from impl/src/main/java/org/opendaylight/unimgr/mef/nrp/common/FixedServiceNaming.java
rename to cisco-xr-driver/src/main/java/org/opendaylight/unimgr/mef/nrp/cisco/xr/common/FixedServiceNaming.java
index 0d33868dc42687ab0b23b788fb9e89cc7272ece6..d2166fc5c366d105e3b189cbddf3441516866e94 100644 (file)
--- a/impl/src/main/java/org/opendaylight/unimgr/mef/nrp/common/FixedServiceNaming.java
+++ b/cisco-xr-driver/src/main/java/org/opendaylight/unimgr/mef/nrp/cisco/xr/common/FixedServiceNaming.java
@@ -6,7 +6,9 @@
  * and is available at http://www.eclipse.org/legal/epl-v10.html
  */
 
-package org.opendaylight.unimgr.mef.nrp.common;
+package org.opendaylight.unimgr.mef.nrp.cisco.xr.common;
+
+import org.opendaylight.unimgr.mef.nrp.common.ServiceNaming;
 
 /**
  * This is a placeholder class for implementing service naming when activating and deactivating MEF services.