From bb2cda7b341b8e1af6ccfd503260efe43749af0a Mon Sep 17 00:00:00 2001 From: Tomas Cere Date: Mon, 24 Aug 2015 16:27:29 +0200 Subject: [PATCH] Rename config-netconf-connector packages to org.opendaylight.netconf Change-Id: I960ca48cd1942a2e101c12238630a06a39ff0f82 Signed-off-by: Tomas Cere --- .../netconf/config-netconf-connector/pom.xml | 2 +- .../AbstractConfigNetconfOperation.java | 2 +- .../operations/Commit.java | 2 +- .../operations/DiscardChanges.java | 2 +- .../operations/Lock.java | 2 +- .../operations/UnLock.java | 2 +- .../operations/Validate.java | 2 +- .../operations/editconfig/EditConfig.java | 4 ++-- .../editconfig/EditConfigXmlParser.java | 2 +- .../operations/get/Get.java | 4 ++-- .../operations/getconfig/GetConfig.java | 4 ++-- .../operations/runtimerpc/RuntimeRpc.java | 4 ++-- .../osgi/Activator.java | 2 +- .../osgi/NetconfOperationProvider.java | 20 +++++++++---------- .../NetconfOperationServiceFactoryImpl.java | 2 +- .../osgi/NetconfOperationServiceImpl.java | 2 +- .../NetconfMappingTest.java | 18 ++++++++--------- .../ServiceTrackerTest.java | 2 +- .../operations/ValidateTest.java | 2 +- .../operations/editconfig/EditConfigTest.java | 4 ++-- .../MergeEditConfigStrategyTest.java | 2 +- .../ReplaceEditConfigStrategyTest.java | 2 +- .../test/tool/rpc/SimulatedCommit.java | 2 +- .../test/tool/rpc/SimulatedEditConfig.java | 4 ++-- .../netconf/test/tool/rpc/SimulatedGet.java | 2 +- .../test/tool/rpc/SimulatedGetConfig.java | 2 +- .../netconf/test/tool/rpc/SimulatedLock.java | 2 +- .../test/tool/rpc/SimulatedUnLock.java | 2 +- 28 files changed, 51 insertions(+), 51 deletions(-) rename opendaylight/netconf/config-netconf-connector/src/main/java/org/opendaylight/{controller => }/netconf/confignetconfconnector/operations/AbstractConfigNetconfOperation.java (92%) rename opendaylight/netconf/config-netconf-connector/src/main/java/org/opendaylight/{controller => }/netconf/confignetconfconnector/operations/Commit.java (96%) rename opendaylight/netconf/config-netconf-connector/src/main/java/org/opendaylight/{controller => }/netconf/confignetconfconnector/operations/DiscardChanges.java (97%) rename opendaylight/netconf/config-netconf-connector/src/main/java/org/opendaylight/{controller => }/netconf/confignetconfconnector/operations/Lock.java (97%) rename opendaylight/netconf/config-netconf-connector/src/main/java/org/opendaylight/{controller => }/netconf/confignetconfconnector/operations/UnLock.java (96%) rename opendaylight/netconf/config-netconf-connector/src/main/java/org/opendaylight/{controller => }/netconf/confignetconfconnector/operations/Validate.java (97%) rename opendaylight/netconf/config-netconf-connector/src/main/java/org/opendaylight/{controller => }/netconf/confignetconfconnector/operations/editconfig/EditConfig.java (94%) rename opendaylight/netconf/config-netconf-connector/src/main/java/org/opendaylight/{controller => }/netconf/confignetconfconnector/operations/editconfig/EditConfigXmlParser.java (98%) rename opendaylight/netconf/config-netconf-connector/src/main/java/org/opendaylight/{controller => }/netconf/confignetconfconnector/operations/get/Get.java (90%) rename opendaylight/netconf/config-netconf-connector/src/main/java/org/opendaylight/{controller => }/netconf/confignetconfconnector/operations/getconfig/GetConfig.java (92%) rename opendaylight/netconf/config-netconf-connector/src/main/java/org/opendaylight/{controller => }/netconf/confignetconfconnector/operations/runtimerpc/RuntimeRpc.java (96%) rename opendaylight/netconf/config-netconf-connector/src/main/java/org/opendaylight/{controller => }/netconf/confignetconfconnector/osgi/Activator.java (98%) rename opendaylight/netconf/config-netconf-connector/src/main/java/org/opendaylight/{controller => }/netconf/confignetconfconnector/osgi/NetconfOperationProvider.java (69%) rename opendaylight/netconf/config-netconf-connector/src/main/java/org/opendaylight/{controller => }/netconf/confignetconfconnector/osgi/NetconfOperationServiceFactoryImpl.java (97%) rename opendaylight/netconf/config-netconf-connector/src/main/java/org/opendaylight/{controller => }/netconf/confignetconfconnector/osgi/NetconfOperationServiceImpl.java (94%) rename opendaylight/netconf/config-netconf-connector/src/test/java/org/opendaylight/{controller => }/netconf/confignetconfconnector/NetconfMappingTest.java (98%) rename opendaylight/netconf/config-netconf-connector/src/test/java/org/opendaylight/{controller => }/netconf/confignetconfconnector/ServiceTrackerTest.java (93%) rename opendaylight/netconf/config-netconf-connector/src/test/java/org/opendaylight/{controller => }/netconf/confignetconfconnector/operations/ValidateTest.java (98%) rename opendaylight/netconf/config-netconf-connector/src/test/java/org/opendaylight/{controller => }/netconf/confignetconfconnector/operations/editconfig/EditConfigTest.java (97%) rename opendaylight/netconf/config-netconf-connector/src/test/java/org/opendaylight/{controller => }/netconf/confignetconfconnector/operations/editconfig/MergeEditConfigStrategyTest.java (98%) rename opendaylight/netconf/config-netconf-connector/src/test/java/org/opendaylight/{controller => }/netconf/confignetconfconnector/operations/editconfig/ReplaceEditConfigStrategyTest.java (96%) diff --git a/opendaylight/netconf/config-netconf-connector/pom.xml b/opendaylight/netconf/config-netconf-connector/pom.xml index 2628802f8c..b07e9ae51b 100644 --- a/opendaylight/netconf/config-netconf-connector/pom.xml +++ b/opendaylight/netconf/config-netconf-connector/pom.xml @@ -111,7 +111,7 @@ maven-bundle-plugin - org.opendaylight.controller.netconf.confignetconfconnector.osgi.Activator + org.opendaylight.netconf.confignetconfconnector.osgi.Activator diff --git a/opendaylight/netconf/config-netconf-connector/src/main/java/org/opendaylight/controller/netconf/confignetconfconnector/operations/AbstractConfigNetconfOperation.java b/opendaylight/netconf/config-netconf-connector/src/main/java/org/opendaylight/netconf/confignetconfconnector/operations/AbstractConfigNetconfOperation.java similarity index 92% rename from opendaylight/netconf/config-netconf-connector/src/main/java/org/opendaylight/controller/netconf/confignetconfconnector/operations/AbstractConfigNetconfOperation.java rename to opendaylight/netconf/config-netconf-connector/src/main/java/org/opendaylight/netconf/confignetconfconnector/operations/AbstractConfigNetconfOperation.java index 8029a1b0a6..5f95c03dd7 100644 --- a/opendaylight/netconf/config-netconf-connector/src/main/java/org/opendaylight/controller/netconf/confignetconfconnector/operations/AbstractConfigNetconfOperation.java +++ b/opendaylight/netconf/config-netconf-connector/src/main/java/org/opendaylight/netconf/confignetconfconnector/operations/AbstractConfigNetconfOperation.java @@ -6,7 +6,7 @@ * and is available at http://www.eclipse.org/legal/epl-v10.html */ -package org.opendaylight.controller.netconf.confignetconfconnector.operations; +package org.opendaylight.netconf.confignetconfconnector.operations; import org.opendaylight.controller.config.facade.xml.ConfigSubsystemFacade; import org.opendaylight.controller.netconf.util.mapping.AbstractLastNetconfOperation; diff --git a/opendaylight/netconf/config-netconf-connector/src/main/java/org/opendaylight/controller/netconf/confignetconfconnector/operations/Commit.java b/opendaylight/netconf/config-netconf-connector/src/main/java/org/opendaylight/netconf/confignetconfconnector/operations/Commit.java similarity index 96% rename from opendaylight/netconf/config-netconf-connector/src/main/java/org/opendaylight/controller/netconf/confignetconfconnector/operations/Commit.java rename to opendaylight/netconf/config-netconf-connector/src/main/java/org/opendaylight/netconf/confignetconfconnector/operations/Commit.java index 6e295580f9..db1021ec06 100644 --- a/opendaylight/netconf/config-netconf-connector/src/main/java/org/opendaylight/controller/netconf/confignetconfconnector/operations/Commit.java +++ b/opendaylight/netconf/config-netconf-connector/src/main/java/org/opendaylight/netconf/confignetconfconnector/operations/Commit.java @@ -6,7 +6,7 @@ * and is available at http://www.eclipse.org/legal/epl-v10.html */ -package org.opendaylight.controller.netconf.confignetconfconnector.operations; +package org.opendaylight.netconf.confignetconfconnector.operations; import com.google.common.base.Optional; import org.opendaylight.controller.config.api.ConflictingVersionException; diff --git a/opendaylight/netconf/config-netconf-connector/src/main/java/org/opendaylight/controller/netconf/confignetconfconnector/operations/DiscardChanges.java b/opendaylight/netconf/config-netconf-connector/src/main/java/org/opendaylight/netconf/confignetconfconnector/operations/DiscardChanges.java similarity index 97% rename from opendaylight/netconf/config-netconf-connector/src/main/java/org/opendaylight/controller/netconf/confignetconfconnector/operations/DiscardChanges.java rename to opendaylight/netconf/config-netconf-connector/src/main/java/org/opendaylight/netconf/confignetconfconnector/operations/DiscardChanges.java index 3010b4ffe9..7ff9fe5081 100644 --- a/opendaylight/netconf/config-netconf-connector/src/main/java/org/opendaylight/controller/netconf/confignetconfconnector/operations/DiscardChanges.java +++ b/opendaylight/netconf/config-netconf-connector/src/main/java/org/opendaylight/netconf/confignetconfconnector/operations/DiscardChanges.java @@ -6,7 +6,7 @@ * and is available at http://www.eclipse.org/legal/epl-v10.html */ -package org.opendaylight.controller.netconf.confignetconfconnector.operations; +package org.opendaylight.netconf.confignetconfconnector.operations; import com.google.common.base.Optional; import java.util.HashMap; diff --git a/opendaylight/netconf/config-netconf-connector/src/main/java/org/opendaylight/controller/netconf/confignetconfconnector/operations/Lock.java b/opendaylight/netconf/config-netconf-connector/src/main/java/org/opendaylight/netconf/confignetconfconnector/operations/Lock.java similarity index 97% rename from opendaylight/netconf/config-netconf-connector/src/main/java/org/opendaylight/controller/netconf/confignetconfconnector/operations/Lock.java rename to opendaylight/netconf/config-netconf-connector/src/main/java/org/opendaylight/netconf/confignetconfconnector/operations/Lock.java index f9372c0cf3..8a4c5f97b9 100644 --- a/opendaylight/netconf/config-netconf-connector/src/main/java/org/opendaylight/controller/netconf/confignetconfconnector/operations/Lock.java +++ b/opendaylight/netconf/config-netconf-connector/src/main/java/org/opendaylight/netconf/confignetconfconnector/operations/Lock.java @@ -6,7 +6,7 @@ * and is available at http://www.eclipse.org/legal/epl-v10.html */ -package org.opendaylight.controller.netconf.confignetconfconnector.operations; +package org.opendaylight.netconf.confignetconfconnector.operations; import com.google.common.base.Optional; import org.opendaylight.controller.config.facade.xml.Datastore; diff --git a/opendaylight/netconf/config-netconf-connector/src/main/java/org/opendaylight/controller/netconf/confignetconfconnector/operations/UnLock.java b/opendaylight/netconf/config-netconf-connector/src/main/java/org/opendaylight/netconf/confignetconfconnector/operations/UnLock.java similarity index 96% rename from opendaylight/netconf/config-netconf-connector/src/main/java/org/opendaylight/controller/netconf/confignetconfconnector/operations/UnLock.java rename to opendaylight/netconf/config-netconf-connector/src/main/java/org/opendaylight/netconf/confignetconfconnector/operations/UnLock.java index c221273241..9e2456c239 100644 --- a/opendaylight/netconf/config-netconf-connector/src/main/java/org/opendaylight/controller/netconf/confignetconfconnector/operations/UnLock.java +++ b/opendaylight/netconf/config-netconf-connector/src/main/java/org/opendaylight/netconf/confignetconfconnector/operations/UnLock.java @@ -6,7 +6,7 @@ * and is available at http://www.eclipse.org/legal/epl-v10.html */ -package org.opendaylight.controller.netconf.confignetconfconnector.operations; +package org.opendaylight.netconf.confignetconfconnector.operations; import com.google.common.base.Optional; import org.opendaylight.controller.config.facade.xml.Datastore; diff --git a/opendaylight/netconf/config-netconf-connector/src/main/java/org/opendaylight/controller/netconf/confignetconfconnector/operations/Validate.java b/opendaylight/netconf/config-netconf-connector/src/main/java/org/opendaylight/netconf/confignetconfconnector/operations/Validate.java similarity index 97% rename from opendaylight/netconf/config-netconf-connector/src/main/java/org/opendaylight/controller/netconf/confignetconfconnector/operations/Validate.java rename to opendaylight/netconf/config-netconf-connector/src/main/java/org/opendaylight/netconf/confignetconfconnector/operations/Validate.java index 38918b18ca..87c3c179e5 100644 --- a/opendaylight/netconf/config-netconf-connector/src/main/java/org/opendaylight/controller/netconf/confignetconfconnector/operations/Validate.java +++ b/opendaylight/netconf/config-netconf-connector/src/main/java/org/opendaylight/netconf/confignetconfconnector/operations/Validate.java @@ -6,7 +6,7 @@ * and is available at http://www.eclipse.org/legal/epl-v10.html */ -package org.opendaylight.controller.netconf.confignetconfconnector.operations; +package org.opendaylight.netconf.confignetconfconnector.operations; import com.google.common.base.Optional; import java.util.HashMap; diff --git a/opendaylight/netconf/config-netconf-connector/src/main/java/org/opendaylight/controller/netconf/confignetconfconnector/operations/editconfig/EditConfig.java b/opendaylight/netconf/config-netconf-connector/src/main/java/org/opendaylight/netconf/confignetconfconnector/operations/editconfig/EditConfig.java similarity index 94% rename from opendaylight/netconf/config-netconf-connector/src/main/java/org/opendaylight/controller/netconf/confignetconfconnector/operations/editconfig/EditConfig.java rename to opendaylight/netconf/config-netconf-connector/src/main/java/org/opendaylight/netconf/confignetconfconnector/operations/editconfig/EditConfig.java index d9076fa891..083c6fc515 100644 --- a/opendaylight/netconf/config-netconf-connector/src/main/java/org/opendaylight/controller/netconf/confignetconfconnector/operations/editconfig/EditConfig.java +++ b/opendaylight/netconf/config-netconf-connector/src/main/java/org/opendaylight/netconf/confignetconfconnector/operations/editconfig/EditConfig.java @@ -6,7 +6,7 @@ * and is available at http://www.eclipse.org/legal/epl-v10.html */ -package org.opendaylight.controller.netconf.confignetconfconnector.operations.editconfig; +package org.opendaylight.netconf.confignetconfconnector.operations.editconfig; import com.google.common.annotations.VisibleForTesting; import com.google.common.base.Optional; @@ -23,7 +23,7 @@ import org.opendaylight.controller.config.util.xml.DocumentedException.ErrorType import org.opendaylight.controller.config.util.xml.XmlElement; import org.opendaylight.controller.config.util.xml.XmlUtil; import org.opendaylight.controller.netconf.api.xml.XmlNetconfConstants; -import org.opendaylight.controller.netconf.confignetconfconnector.operations.AbstractConfigNetconfOperation; +import org.opendaylight.netconf.confignetconfconnector.operations.AbstractConfigNetconfOperation; import org.slf4j.Logger; import org.slf4j.LoggerFactory; import org.w3c.dom.Document; diff --git a/opendaylight/netconf/config-netconf-connector/src/main/java/org/opendaylight/controller/netconf/confignetconfconnector/operations/editconfig/EditConfigXmlParser.java b/opendaylight/netconf/config-netconf-connector/src/main/java/org/opendaylight/netconf/confignetconfconnector/operations/editconfig/EditConfigXmlParser.java similarity index 98% rename from opendaylight/netconf/config-netconf-connector/src/main/java/org/opendaylight/controller/netconf/confignetconfconnector/operations/editconfig/EditConfigXmlParser.java rename to opendaylight/netconf/config-netconf-connector/src/main/java/org/opendaylight/netconf/confignetconfconnector/operations/editconfig/EditConfigXmlParser.java index 3995a0a5a4..b76dba2764 100644 --- a/opendaylight/netconf/config-netconf-connector/src/main/java/org/opendaylight/controller/netconf/confignetconfconnector/operations/editconfig/EditConfigXmlParser.java +++ b/opendaylight/netconf/config-netconf-connector/src/main/java/org/opendaylight/netconf/confignetconfconnector/operations/editconfig/EditConfigXmlParser.java @@ -6,7 +6,7 @@ * and is available at http://www.eclipse.org/legal/epl-v10.html */ -package org.opendaylight.controller.netconf.confignetconfconnector.operations.editconfig; +package org.opendaylight.netconf.confignetconfconnector.operations.editconfig; import com.google.common.base.Optional; import org.opendaylight.controller.config.facade.xml.ConfigExecution; diff --git a/opendaylight/netconf/config-netconf-connector/src/main/java/org/opendaylight/controller/netconf/confignetconfconnector/operations/get/Get.java b/opendaylight/netconf/config-netconf-connector/src/main/java/org/opendaylight/netconf/confignetconfconnector/operations/get/Get.java similarity index 90% rename from opendaylight/netconf/config-netconf-connector/src/main/java/org/opendaylight/controller/netconf/confignetconfconnector/operations/get/Get.java rename to opendaylight/netconf/config-netconf-connector/src/main/java/org/opendaylight/netconf/confignetconfconnector/operations/get/Get.java index 0b79f5e17c..3a4c932d52 100644 --- a/opendaylight/netconf/config-netconf-connector/src/main/java/org/opendaylight/controller/netconf/confignetconfconnector/operations/get/Get.java +++ b/opendaylight/netconf/config-netconf-connector/src/main/java/org/opendaylight/netconf/confignetconfconnector/operations/get/Get.java @@ -6,13 +6,13 @@ * and is available at http://www.eclipse.org/legal/epl-v10.html */ -package org.opendaylight.controller.netconf.confignetconfconnector.operations.get; +package org.opendaylight.netconf.confignetconfconnector.operations.get; import org.opendaylight.controller.config.facade.xml.ConfigSubsystemFacade; import org.opendaylight.controller.config.util.xml.DocumentedException; import org.opendaylight.controller.config.util.xml.XmlElement; import org.opendaylight.controller.netconf.api.xml.XmlNetconfConstants; -import org.opendaylight.controller.netconf.confignetconfconnector.operations.AbstractConfigNetconfOperation; +import org.opendaylight.netconf.confignetconfconnector.operations.AbstractConfigNetconfOperation; import org.slf4j.Logger; import org.slf4j.LoggerFactory; import org.w3c.dom.Document; diff --git a/opendaylight/netconf/config-netconf-connector/src/main/java/org/opendaylight/controller/netconf/confignetconfconnector/operations/getconfig/GetConfig.java b/opendaylight/netconf/config-netconf-connector/src/main/java/org/opendaylight/netconf/confignetconfconnector/operations/getconfig/GetConfig.java similarity index 92% rename from opendaylight/netconf/config-netconf-connector/src/main/java/org/opendaylight/controller/netconf/confignetconfconnector/operations/getconfig/GetConfig.java rename to opendaylight/netconf/config-netconf-connector/src/main/java/org/opendaylight/netconf/confignetconfconnector/operations/getconfig/GetConfig.java index e5ba3dbb1e..e22fe85420 100644 --- a/opendaylight/netconf/config-netconf-connector/src/main/java/org/opendaylight/controller/netconf/confignetconfconnector/operations/getconfig/GetConfig.java +++ b/opendaylight/netconf/config-netconf-connector/src/main/java/org/opendaylight/netconf/confignetconfconnector/operations/getconfig/GetConfig.java @@ -6,7 +6,7 @@ * and is available at http://www.eclipse.org/legal/epl-v10.html */ -package org.opendaylight.controller.netconf.confignetconfconnector.operations.getconfig; +package org.opendaylight.netconf.confignetconfconnector.operations.getconfig; import com.google.common.base.Optional; import org.opendaylight.controller.config.facade.xml.ConfigSubsystemFacade; @@ -14,7 +14,7 @@ import org.opendaylight.controller.config.facade.xml.Datastore; import org.opendaylight.controller.config.util.xml.DocumentedException; import org.opendaylight.controller.config.util.xml.XmlElement; import org.opendaylight.controller.netconf.api.xml.XmlNetconfConstants; -import org.opendaylight.controller.netconf.confignetconfconnector.operations.AbstractConfigNetconfOperation; +import org.opendaylight.netconf.confignetconfconnector.operations.AbstractConfigNetconfOperation; import org.slf4j.Logger; import org.slf4j.LoggerFactory; import org.w3c.dom.Document; diff --git a/opendaylight/netconf/config-netconf-connector/src/main/java/org/opendaylight/controller/netconf/confignetconfconnector/operations/runtimerpc/RuntimeRpc.java b/opendaylight/netconf/config-netconf-connector/src/main/java/org/opendaylight/netconf/confignetconfconnector/operations/runtimerpc/RuntimeRpc.java similarity index 96% rename from opendaylight/netconf/config-netconf-connector/src/main/java/org/opendaylight/controller/netconf/confignetconfconnector/operations/runtimerpc/RuntimeRpc.java rename to opendaylight/netconf/config-netconf-connector/src/main/java/org/opendaylight/netconf/confignetconfconnector/operations/runtimerpc/RuntimeRpc.java index 2be3308b90..87fa6e4ed5 100644 --- a/opendaylight/netconf/config-netconf-connector/src/main/java/org/opendaylight/controller/netconf/confignetconfconnector/operations/runtimerpc/RuntimeRpc.java +++ b/opendaylight/netconf/config-netconf-connector/src/main/java/org/opendaylight/netconf/confignetconfconnector/operations/runtimerpc/RuntimeRpc.java @@ -6,7 +6,7 @@ * and is available at http://www.eclipse.org/legal/epl-v10.html */ -package org.opendaylight.controller.netconf.confignetconfconnector.operations.runtimerpc; +package org.opendaylight.netconf.confignetconfconnector.operations.runtimerpc; import com.google.common.base.Optional; import com.google.common.base.Preconditions; @@ -20,7 +20,7 @@ import org.opendaylight.controller.config.util.xml.DocumentedException; import org.opendaylight.controller.config.util.xml.XmlElement; import org.opendaylight.controller.config.util.xml.XmlUtil; import org.opendaylight.controller.netconf.api.xml.XmlNetconfConstants; -import org.opendaylight.controller.netconf.confignetconfconnector.operations.AbstractConfigNetconfOperation; +import org.opendaylight.netconf.confignetconfconnector.operations.AbstractConfigNetconfOperation; import org.opendaylight.controller.netconf.mapping.api.HandlingPriority; import org.slf4j.Logger; import org.slf4j.LoggerFactory; diff --git a/opendaylight/netconf/config-netconf-connector/src/main/java/org/opendaylight/controller/netconf/confignetconfconnector/osgi/Activator.java b/opendaylight/netconf/config-netconf-connector/src/main/java/org/opendaylight/netconf/confignetconfconnector/osgi/Activator.java similarity index 98% rename from opendaylight/netconf/config-netconf-connector/src/main/java/org/opendaylight/controller/netconf/confignetconfconnector/osgi/Activator.java rename to opendaylight/netconf/config-netconf-connector/src/main/java/org/opendaylight/netconf/confignetconfconnector/osgi/Activator.java index 5d01b8decd..f5b4fea513 100644 --- a/opendaylight/netconf/config-netconf-connector/src/main/java/org/opendaylight/controller/netconf/confignetconfconnector/osgi/Activator.java +++ b/opendaylight/netconf/config-netconf-connector/src/main/java/org/opendaylight/netconf/confignetconfconnector/osgi/Activator.java @@ -6,7 +6,7 @@ * and is available at http://www.eclipse.org/legal/epl-v10.html */ -package org.opendaylight.controller.netconf.confignetconfconnector.osgi; +package org.opendaylight.netconf.confignetconfconnector.osgi; import java.util.Dictionary; import java.util.Hashtable; diff --git a/opendaylight/netconf/config-netconf-connector/src/main/java/org/opendaylight/controller/netconf/confignetconfconnector/osgi/NetconfOperationProvider.java b/opendaylight/netconf/config-netconf-connector/src/main/java/org/opendaylight/netconf/confignetconfconnector/osgi/NetconfOperationProvider.java similarity index 69% rename from opendaylight/netconf/config-netconf-connector/src/main/java/org/opendaylight/controller/netconf/confignetconfconnector/osgi/NetconfOperationProvider.java rename to opendaylight/netconf/config-netconf-connector/src/main/java/org/opendaylight/netconf/confignetconfconnector/osgi/NetconfOperationProvider.java index b0a62a04dc..7ec9c6d876 100644 --- a/opendaylight/netconf/config-netconf-connector/src/main/java/org/opendaylight/controller/netconf/confignetconfconnector/osgi/NetconfOperationProvider.java +++ b/opendaylight/netconf/config-netconf-connector/src/main/java/org/opendaylight/netconf/confignetconfconnector/osgi/NetconfOperationProvider.java @@ -6,21 +6,21 @@ * and is available at http://www.eclipse.org/legal/epl-v10.html */ -package org.opendaylight.controller.netconf.confignetconfconnector.osgi; +package org.opendaylight.netconf.confignetconfconnector.osgi; import com.google.common.base.Optional; import com.google.common.collect.Sets; import java.util.Set; import org.opendaylight.controller.config.facade.xml.ConfigSubsystemFacade; -import org.opendaylight.controller.netconf.confignetconfconnector.operations.Commit; -import org.opendaylight.controller.netconf.confignetconfconnector.operations.DiscardChanges; -import org.opendaylight.controller.netconf.confignetconfconnector.operations.Lock; -import org.opendaylight.controller.netconf.confignetconfconnector.operations.UnLock; -import org.opendaylight.controller.netconf.confignetconfconnector.operations.Validate; -import org.opendaylight.controller.netconf.confignetconfconnector.operations.editconfig.EditConfig; -import org.opendaylight.controller.netconf.confignetconfconnector.operations.get.Get; -import org.opendaylight.controller.netconf.confignetconfconnector.operations.getconfig.GetConfig; -import org.opendaylight.controller.netconf.confignetconfconnector.operations.runtimerpc.RuntimeRpc; +import org.opendaylight.netconf.confignetconfconnector.operations.Commit; +import org.opendaylight.netconf.confignetconfconnector.operations.DiscardChanges; +import org.opendaylight.netconf.confignetconfconnector.operations.Lock; +import org.opendaylight.netconf.confignetconfconnector.operations.UnLock; +import org.opendaylight.netconf.confignetconfconnector.operations.Validate; +import org.opendaylight.netconf.confignetconfconnector.operations.editconfig.EditConfig; +import org.opendaylight.netconf.confignetconfconnector.operations.get.Get; +import org.opendaylight.netconf.confignetconfconnector.operations.getconfig.GetConfig; +import org.opendaylight.netconf.confignetconfconnector.operations.runtimerpc.RuntimeRpc; import org.opendaylight.controller.netconf.mapping.api.NetconfOperation; final class NetconfOperationProvider { diff --git a/opendaylight/netconf/config-netconf-connector/src/main/java/org/opendaylight/controller/netconf/confignetconfconnector/osgi/NetconfOperationServiceFactoryImpl.java b/opendaylight/netconf/config-netconf-connector/src/main/java/org/opendaylight/netconf/confignetconfconnector/osgi/NetconfOperationServiceFactoryImpl.java similarity index 97% rename from opendaylight/netconf/config-netconf-connector/src/main/java/org/opendaylight/controller/netconf/confignetconfconnector/osgi/NetconfOperationServiceFactoryImpl.java rename to opendaylight/netconf/config-netconf-connector/src/main/java/org/opendaylight/netconf/confignetconfconnector/osgi/NetconfOperationServiceFactoryImpl.java index 6ea628d019..df4ba48ac6 100644 --- a/opendaylight/netconf/config-netconf-connector/src/main/java/org/opendaylight/controller/netconf/confignetconfconnector/osgi/NetconfOperationServiceFactoryImpl.java +++ b/opendaylight/netconf/config-netconf-connector/src/main/java/org/opendaylight/netconf/confignetconfconnector/osgi/NetconfOperationServiceFactoryImpl.java @@ -6,7 +6,7 @@ * and is available at http://www.eclipse.org/legal/epl-v10.html */ -package org.opendaylight.controller.netconf.confignetconfconnector.osgi; +package org.opendaylight.netconf.confignetconfconnector.osgi; import com.google.common.base.Function; import com.google.common.collect.Collections2; diff --git a/opendaylight/netconf/config-netconf-connector/src/main/java/org/opendaylight/controller/netconf/confignetconfconnector/osgi/NetconfOperationServiceImpl.java b/opendaylight/netconf/config-netconf-connector/src/main/java/org/opendaylight/netconf/confignetconfconnector/osgi/NetconfOperationServiceImpl.java similarity index 94% rename from opendaylight/netconf/config-netconf-connector/src/main/java/org/opendaylight/controller/netconf/confignetconfconnector/osgi/NetconfOperationServiceImpl.java rename to opendaylight/netconf/config-netconf-connector/src/main/java/org/opendaylight/netconf/confignetconfconnector/osgi/NetconfOperationServiceImpl.java index 17cbbcace0..89e486801f 100644 --- a/opendaylight/netconf/config-netconf-connector/src/main/java/org/opendaylight/controller/netconf/confignetconfconnector/osgi/NetconfOperationServiceImpl.java +++ b/opendaylight/netconf/config-netconf-connector/src/main/java/org/opendaylight/netconf/confignetconfconnector/osgi/NetconfOperationServiceImpl.java @@ -6,7 +6,7 @@ * and is available at http://www.eclipse.org/legal/epl-v10.html */ -package org.opendaylight.controller.netconf.confignetconfconnector.osgi; +package org.opendaylight.netconf.confignetconfconnector.osgi; import java.util.Set; import org.opendaylight.controller.config.facade.xml.ConfigSubsystemFacade; diff --git a/opendaylight/netconf/config-netconf-connector/src/test/java/org/opendaylight/controller/netconf/confignetconfconnector/NetconfMappingTest.java b/opendaylight/netconf/config-netconf-connector/src/test/java/org/opendaylight/netconf/confignetconfconnector/NetconfMappingTest.java similarity index 98% rename from opendaylight/netconf/config-netconf-connector/src/test/java/org/opendaylight/controller/netconf/confignetconfconnector/NetconfMappingTest.java rename to opendaylight/netconf/config-netconf-connector/src/test/java/org/opendaylight/netconf/confignetconfconnector/NetconfMappingTest.java index 9a9f9c5de1..bac83af45e 100644 --- a/opendaylight/netconf/config-netconf-connector/src/test/java/org/opendaylight/controller/netconf/confignetconfconnector/NetconfMappingTest.java +++ b/opendaylight/netconf/config-netconf-connector/src/test/java/org/opendaylight/netconf/confignetconfconnector/NetconfMappingTest.java @@ -6,7 +6,7 @@ * and is available at http://www.eclipse.org/legal/epl-v10.html */ -package org.opendaylight.controller.netconf.confignetconfconnector; +package org.opendaylight.netconf.confignetconfconnector; import static org.custommonkey.xmlunit.XMLAssert.assertXMLEqual; import static org.hamcrest.CoreMatchers.containsString; @@ -95,14 +95,14 @@ import org.opendaylight.controller.config.yang.test.impl.NetconfTestImplModuleMX import org.opendaylight.controller.config.yang.test.impl.Peers; import org.opendaylight.controller.config.yang.test.impl.TestImplModuleFactory; import org.opendaylight.controller.config.yangjmxgenerator.ModuleMXBeanEntry; -import org.opendaylight.controller.netconf.confignetconfconnector.operations.Commit; -import org.opendaylight.controller.netconf.confignetconfconnector.operations.DiscardChanges; -import org.opendaylight.controller.netconf.confignetconfconnector.operations.Lock; -import org.opendaylight.controller.netconf.confignetconfconnector.operations.UnLock; -import org.opendaylight.controller.netconf.confignetconfconnector.operations.editconfig.EditConfig; -import org.opendaylight.controller.netconf.confignetconfconnector.operations.get.Get; -import org.opendaylight.controller.netconf.confignetconfconnector.operations.getconfig.GetConfig; -import org.opendaylight.controller.netconf.confignetconfconnector.operations.runtimerpc.RuntimeRpc; +import org.opendaylight.netconf.confignetconfconnector.operations.Commit; +import org.opendaylight.netconf.confignetconfconnector.operations.DiscardChanges; +import org.opendaylight.netconf.confignetconfconnector.operations.Lock; +import org.opendaylight.netconf.confignetconfconnector.operations.UnLock; +import org.opendaylight.netconf.confignetconfconnector.operations.editconfig.EditConfig; +import org.opendaylight.netconf.confignetconfconnector.operations.get.Get; +import org.opendaylight.netconf.confignetconfconnector.operations.getconfig.GetConfig; +import org.opendaylight.netconf.confignetconfconnector.operations.runtimerpc.RuntimeRpc; import org.opendaylight.controller.netconf.impl.NetconfServerSession; import org.opendaylight.controller.netconf.impl.NetconfServerSessionListener; import org.opendaylight.controller.netconf.impl.mapping.operations.DefaultCloseSession; diff --git a/opendaylight/netconf/config-netconf-connector/src/test/java/org/opendaylight/controller/netconf/confignetconfconnector/ServiceTrackerTest.java b/opendaylight/netconf/config-netconf-connector/src/test/java/org/opendaylight/netconf/confignetconfconnector/ServiceTrackerTest.java similarity index 93% rename from opendaylight/netconf/config-netconf-connector/src/test/java/org/opendaylight/controller/netconf/confignetconfconnector/ServiceTrackerTest.java rename to opendaylight/netconf/config-netconf-connector/src/test/java/org/opendaylight/netconf/confignetconfconnector/ServiceTrackerTest.java index 0fc738eb38..dfa5d22844 100644 --- a/opendaylight/netconf/config-netconf-connector/src/test/java/org/opendaylight/controller/netconf/confignetconfconnector/ServiceTrackerTest.java +++ b/opendaylight/netconf/config-netconf-connector/src/test/java/org/opendaylight/netconf/confignetconfconnector/ServiceTrackerTest.java @@ -6,7 +6,7 @@ * and is available at http://www.eclipse.org/legal/epl-v10.html */ -package org.opendaylight.controller.netconf.confignetconfconnector; +package org.opendaylight.netconf.confignetconfconnector; import static org.junit.Assert.assertEquals; diff --git a/opendaylight/netconf/config-netconf-connector/src/test/java/org/opendaylight/controller/netconf/confignetconfconnector/operations/ValidateTest.java b/opendaylight/netconf/config-netconf-connector/src/test/java/org/opendaylight/netconf/confignetconfconnector/operations/ValidateTest.java similarity index 98% rename from opendaylight/netconf/config-netconf-connector/src/test/java/org/opendaylight/controller/netconf/confignetconfconnector/operations/ValidateTest.java rename to opendaylight/netconf/config-netconf-connector/src/test/java/org/opendaylight/netconf/confignetconfconnector/operations/ValidateTest.java index f840fe3669..388a974995 100644 --- a/opendaylight/netconf/config-netconf-connector/src/test/java/org/opendaylight/controller/netconf/confignetconfconnector/operations/ValidateTest.java +++ b/opendaylight/netconf/config-netconf-connector/src/test/java/org/opendaylight/netconf/confignetconfconnector/operations/ValidateTest.java @@ -6,7 +6,7 @@ * and is available at http://www.eclipse.org/legal/epl-v10.html */ -package org.opendaylight.controller.netconf.confignetconfconnector.operations; +package org.opendaylight.netconf.confignetconfconnector.operations; import static org.junit.Assert.assertEquals; import static org.mockito.Mockito.doNothing; diff --git a/opendaylight/netconf/config-netconf-connector/src/test/java/org/opendaylight/controller/netconf/confignetconfconnector/operations/editconfig/EditConfigTest.java b/opendaylight/netconf/config-netconf-connector/src/test/java/org/opendaylight/netconf/confignetconfconnector/operations/editconfig/EditConfigTest.java similarity index 97% rename from opendaylight/netconf/config-netconf-connector/src/test/java/org/opendaylight/controller/netconf/confignetconfconnector/operations/editconfig/EditConfigTest.java rename to opendaylight/netconf/config-netconf-connector/src/test/java/org/opendaylight/netconf/confignetconfconnector/operations/editconfig/EditConfigTest.java index b0b9c75286..e04f0c731f 100644 --- a/opendaylight/netconf/config-netconf-connector/src/test/java/org/opendaylight/controller/netconf/confignetconfconnector/operations/editconfig/EditConfigTest.java +++ b/opendaylight/netconf/config-netconf-connector/src/test/java/org/opendaylight/netconf/confignetconfconnector/operations/editconfig/EditConfigTest.java @@ -6,7 +6,7 @@ * and is available at http://www.eclipse.org/legal/epl-v10.html */ -package org.opendaylight.controller.netconf.confignetconfconnector.operations.editconfig; +package org.opendaylight.netconf.confignetconfconnector.operations.editconfig; import static org.mockito.Matchers.any; import static org.mockito.Matchers.anyMapOf; @@ -45,7 +45,7 @@ import org.opendaylight.controller.config.util.ConfigRegistryClient; import org.opendaylight.controller.config.util.ConfigTransactionClient; import org.opendaylight.controller.config.util.xml.XmlElement; import org.opendaylight.controller.config.util.xml.XmlUtil; -import org.opendaylight.controller.netconf.confignetconfconnector.operations.ValidateTest; +import org.opendaylight.netconf.confignetconfconnector.operations.ValidateTest; public class EditConfigTest { diff --git a/opendaylight/netconf/config-netconf-connector/src/test/java/org/opendaylight/controller/netconf/confignetconfconnector/operations/editconfig/MergeEditConfigStrategyTest.java b/opendaylight/netconf/config-netconf-connector/src/test/java/org/opendaylight/netconf/confignetconfconnector/operations/editconfig/MergeEditConfigStrategyTest.java similarity index 98% rename from opendaylight/netconf/config-netconf-connector/src/test/java/org/opendaylight/controller/netconf/confignetconfconnector/operations/editconfig/MergeEditConfigStrategyTest.java rename to opendaylight/netconf/config-netconf-connector/src/test/java/org/opendaylight/netconf/confignetconfconnector/operations/editconfig/MergeEditConfigStrategyTest.java index ab5635603d..7cc0288fe8 100644 --- a/opendaylight/netconf/config-netconf-connector/src/test/java/org/opendaylight/controller/netconf/confignetconfconnector/operations/editconfig/MergeEditConfigStrategyTest.java +++ b/opendaylight/netconf/config-netconf-connector/src/test/java/org/opendaylight/netconf/confignetconfconnector/operations/editconfig/MergeEditConfigStrategyTest.java @@ -6,7 +6,7 @@ * and is available at http://www.eclipse.org/legal/epl-v10.html */ -package org.opendaylight.controller.netconf.confignetconfconnector.operations.editconfig; +package org.opendaylight.netconf.confignetconfconnector.operations.editconfig; import static java.util.Arrays.asList; import static org.junit.Assert.assertEquals; diff --git a/opendaylight/netconf/config-netconf-connector/src/test/java/org/opendaylight/controller/netconf/confignetconfconnector/operations/editconfig/ReplaceEditConfigStrategyTest.java b/opendaylight/netconf/config-netconf-connector/src/test/java/org/opendaylight/netconf/confignetconfconnector/operations/editconfig/ReplaceEditConfigStrategyTest.java similarity index 96% rename from opendaylight/netconf/config-netconf-connector/src/test/java/org/opendaylight/controller/netconf/confignetconfconnector/operations/editconfig/ReplaceEditConfigStrategyTest.java rename to opendaylight/netconf/config-netconf-connector/src/test/java/org/opendaylight/netconf/confignetconfconnector/operations/editconfig/ReplaceEditConfigStrategyTest.java index 269555fc3d..397feece88 100644 --- a/opendaylight/netconf/config-netconf-connector/src/test/java/org/opendaylight/controller/netconf/confignetconfconnector/operations/editconfig/ReplaceEditConfigStrategyTest.java +++ b/opendaylight/netconf/config-netconf-connector/src/test/java/org/opendaylight/netconf/confignetconfconnector/operations/editconfig/ReplaceEditConfigStrategyTest.java @@ -6,7 +6,7 @@ * and is available at http://www.eclipse.org/legal/epl-v10.html */ -package org.opendaylight.controller.netconf.confignetconfconnector.operations.editconfig; +package org.opendaylight.netconf.confignetconfconnector.operations.editconfig; import static org.mockito.Matchers.any; import static org.mockito.Matchers.anyString; diff --git a/opendaylight/netconf/tools/netconf-testtool/src/main/java/org/opendaylight/controller/netconf/test/tool/rpc/SimulatedCommit.java b/opendaylight/netconf/tools/netconf-testtool/src/main/java/org/opendaylight/controller/netconf/test/tool/rpc/SimulatedCommit.java index 3b98de65fa..f1e2073007 100644 --- a/opendaylight/netconf/tools/netconf-testtool/src/main/java/org/opendaylight/controller/netconf/test/tool/rpc/SimulatedCommit.java +++ b/opendaylight/netconf/tools/netconf-testtool/src/main/java/org/opendaylight/controller/netconf/test/tool/rpc/SimulatedCommit.java @@ -13,7 +13,7 @@ import org.opendaylight.controller.config.util.xml.DocumentedException; import org.opendaylight.controller.config.util.xml.XmlElement; import org.opendaylight.controller.config.util.xml.XmlUtil; import org.opendaylight.controller.netconf.api.xml.XmlNetconfConstants; -import org.opendaylight.controller.netconf.confignetconfconnector.operations.AbstractConfigNetconfOperation; +import org.opendaylight.netconf.confignetconfconnector.operations.AbstractConfigNetconfOperation; import org.w3c.dom.Document; import org.w3c.dom.Element; diff --git a/opendaylight/netconf/tools/netconf-testtool/src/main/java/org/opendaylight/controller/netconf/test/tool/rpc/SimulatedEditConfig.java b/opendaylight/netconf/tools/netconf-testtool/src/main/java/org/opendaylight/controller/netconf/test/tool/rpc/SimulatedEditConfig.java index a0b573d0d7..ddb1c2d5a0 100644 --- a/opendaylight/netconf/tools/netconf-testtool/src/main/java/org/opendaylight/controller/netconf/test/tool/rpc/SimulatedEditConfig.java +++ b/opendaylight/netconf/tools/netconf-testtool/src/main/java/org/opendaylight/controller/netconf/test/tool/rpc/SimulatedEditConfig.java @@ -13,8 +13,8 @@ import org.opendaylight.controller.config.util.xml.DocumentedException; import org.opendaylight.controller.config.util.xml.XmlElement; import org.opendaylight.controller.config.util.xml.XmlUtil; import org.opendaylight.controller.netconf.api.xml.XmlNetconfConstants; -import org.opendaylight.controller.netconf.confignetconfconnector.operations.AbstractConfigNetconfOperation; -import org.opendaylight.controller.netconf.confignetconfconnector.operations.editconfig.EditConfigXmlParser; +import org.opendaylight.netconf.confignetconfconnector.operations.AbstractConfigNetconfOperation; +import org.opendaylight.netconf.confignetconfconnector.operations.editconfig.EditConfigXmlParser; import org.w3c.dom.Attr; import org.w3c.dom.Document; import org.w3c.dom.Element; diff --git a/opendaylight/netconf/tools/netconf-testtool/src/main/java/org/opendaylight/controller/netconf/test/tool/rpc/SimulatedGet.java b/opendaylight/netconf/tools/netconf-testtool/src/main/java/org/opendaylight/controller/netconf/test/tool/rpc/SimulatedGet.java index 9474e5e7d5..dee1c4cede 100644 --- a/opendaylight/netconf/tools/netconf-testtool/src/main/java/org/opendaylight/controller/netconf/test/tool/rpc/SimulatedGet.java +++ b/opendaylight/netconf/tools/netconf-testtool/src/main/java/org/opendaylight/controller/netconf/test/tool/rpc/SimulatedGet.java @@ -13,7 +13,7 @@ import org.opendaylight.controller.config.util.xml.DocumentedException; import org.opendaylight.controller.config.util.xml.XmlElement; import org.opendaylight.controller.config.util.xml.XmlUtil; import org.opendaylight.controller.netconf.api.xml.XmlNetconfConstants; -import org.opendaylight.controller.netconf.confignetconfconnector.operations.AbstractConfigNetconfOperation; +import org.opendaylight.netconf.confignetconfconnector.operations.AbstractConfigNetconfOperation; import org.w3c.dom.Document; import org.w3c.dom.Element; diff --git a/opendaylight/netconf/tools/netconf-testtool/src/main/java/org/opendaylight/controller/netconf/test/tool/rpc/SimulatedGetConfig.java b/opendaylight/netconf/tools/netconf-testtool/src/main/java/org/opendaylight/controller/netconf/test/tool/rpc/SimulatedGetConfig.java index ac17e8f8f0..4fc9656ced 100644 --- a/opendaylight/netconf/tools/netconf-testtool/src/main/java/org/opendaylight/controller/netconf/test/tool/rpc/SimulatedGetConfig.java +++ b/opendaylight/netconf/tools/netconf-testtool/src/main/java/org/opendaylight/controller/netconf/test/tool/rpc/SimulatedGetConfig.java @@ -13,7 +13,7 @@ import org.opendaylight.controller.config.util.xml.DocumentedException; import org.opendaylight.controller.config.util.xml.XmlElement; import org.opendaylight.controller.config.util.xml.XmlUtil; import org.opendaylight.controller.netconf.api.xml.XmlNetconfConstants; -import org.opendaylight.controller.netconf.confignetconfconnector.operations.AbstractConfigNetconfOperation; +import org.opendaylight.netconf.confignetconfconnector.operations.AbstractConfigNetconfOperation; import org.w3c.dom.Document; import org.w3c.dom.Element; diff --git a/opendaylight/netconf/tools/netconf-testtool/src/main/java/org/opendaylight/controller/netconf/test/tool/rpc/SimulatedLock.java b/opendaylight/netconf/tools/netconf-testtool/src/main/java/org/opendaylight/controller/netconf/test/tool/rpc/SimulatedLock.java index 831be73733..d7c42fb8b6 100644 --- a/opendaylight/netconf/tools/netconf-testtool/src/main/java/org/opendaylight/controller/netconf/test/tool/rpc/SimulatedLock.java +++ b/opendaylight/netconf/tools/netconf-testtool/src/main/java/org/opendaylight/controller/netconf/test/tool/rpc/SimulatedLock.java @@ -13,7 +13,7 @@ import org.opendaylight.controller.config.util.xml.DocumentedException; import org.opendaylight.controller.config.util.xml.XmlElement; import org.opendaylight.controller.config.util.xml.XmlUtil; import org.opendaylight.controller.netconf.api.xml.XmlNetconfConstants; -import org.opendaylight.controller.netconf.confignetconfconnector.operations.AbstractConfigNetconfOperation; +import org.opendaylight.netconf.confignetconfconnector.operations.AbstractConfigNetconfOperation; import org.w3c.dom.Document; import org.w3c.dom.Element; diff --git a/opendaylight/netconf/tools/netconf-testtool/src/main/java/org/opendaylight/controller/netconf/test/tool/rpc/SimulatedUnLock.java b/opendaylight/netconf/tools/netconf-testtool/src/main/java/org/opendaylight/controller/netconf/test/tool/rpc/SimulatedUnLock.java index a2528c1332..ee40441563 100644 --- a/opendaylight/netconf/tools/netconf-testtool/src/main/java/org/opendaylight/controller/netconf/test/tool/rpc/SimulatedUnLock.java +++ b/opendaylight/netconf/tools/netconf-testtool/src/main/java/org/opendaylight/controller/netconf/test/tool/rpc/SimulatedUnLock.java @@ -13,7 +13,7 @@ import org.opendaylight.controller.config.util.xml.DocumentedException; import org.opendaylight.controller.config.util.xml.XmlElement; import org.opendaylight.controller.config.util.xml.XmlUtil; import org.opendaylight.controller.netconf.api.xml.XmlNetconfConstants; -import org.opendaylight.controller.netconf.confignetconfconnector.operations.AbstractConfigNetconfOperation; +import org.opendaylight.netconf.confignetconfconnector.operations.AbstractConfigNetconfOperation; import org.w3c.dom.Document; import org.w3c.dom.Element; -- 2.36.6